diff --git a/emacs.d/.mc-lists.el b/emacs.d/.mc-lists.el
new file mode 100644
index 0000000..e01a98e
--- /dev/null
+++ b/emacs.d/.mc-lists.el
@@ -0,0 +1,11 @@
+;; This file is automatically generated by the multiple-cursors extension.
+;; It keeps track of your preferences for running commands with multiple cursors.
+
+(setq mc/cmds-to-run-for-all
+      '(
+        ))
+
+(setq mc/cmds-to-run-once
+      '(
+        end-of-buffer
+        ))
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-autoloads.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-autoloads.el
deleted file mode 100644
index 49ed786..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-autoloads.el
+++ /dev/null
@@ -1,81 +0,0 @@
-;;; alchemist-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "alchemist" "alchemist.el" (21898 47984 0 0))
-;;; Generated autoloads from alchemist.el
-
-(autoload 'alchemist-version "alchemist" "\
-Display Alchemist's version.
-
-\(fn &optional SHOW-VERSION)" t nil)
-
-(autoload 'alchemist-mode "alchemist" "\
-Toggle alchemist mode.
-
-Key bindings:
-\\{alchemist-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "alchemist-iex" "alchemist-iex.el" (21898 47984
-;;;;;;  0 0))
-;;; Generated autoloads from alchemist-iex.el
-
-(defalias 'run-elixir 'alchemist-iex-run)
-
-(autoload 'alchemist-iex-run "alchemist-iex" "\
-Start an IEx process.
-Show the IEx buffer if an IEx process is already run.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'alchemist-iex-project-run "alchemist-iex" "\
-Start an IEx process with mix 'iex -S mix' in the
-context of an Elixir project.
-Show the IEx buffer if an IEx process is already run.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "alchemist-test-mode" "alchemist-test-mode.el"
-;;;;;;  (21898 47984 0 0))
-;;; Generated autoloads from alchemist-test-mode.el
-
-(autoload 'alchemist-test-mode "alchemist-test-mode" "\
-Minor mode for Elixir ExUnit files.
-
-The following commands are available:
-
-\\{alchemist-test-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'alchemist-test-enable-mode "alchemist-test-mode" "\
-
-
-\(fn)" nil nil)
-
-(dolist (hook '(alchemist-mode-hook)) (add-hook hook 'alchemist-test-enable-mode))
-
-;;;***
-
-;;;### (autoloads nil nil ("alchemist-buffer.el" "alchemist-company.el"
-;;;;;;  "alchemist-compile.el" "alchemist-complete.el" "alchemist-eval.el"
-;;;;;;  "alchemist-execute.el" "alchemist-goto.el" "alchemist-help.el"
-;;;;;;  "alchemist-hooks.el" "alchemist-message.el" "alchemist-mix.el"
-;;;;;;  "alchemist-pkg.el" "alchemist-project.el" "alchemist-server.el"
-;;;;;;  "alchemist-utils.el") (21898 47984 781999 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; alchemist-autoloads.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-buffer.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-buffer.el
deleted file mode 100644
index e9b2afd..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-buffer.el
+++ /dev/null
@@ -1,152 +0,0 @@
-;;; alchemist-buffer.el --- Custom compilation mode for Alchemist
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;  Custom compilation mode for Alchemist
-
-;;; Code:
-
-(require 'compile)
-(require 'ansi-color)
-
-;; Variables
-
-(defgroup alchemist-buffer nil
-  "Custom compilation mode for Alchemist."
-  :prefix "alchemist-buffer-"
-  :group 'alchemist)
-
-(defcustom alchemist-buffer-status-modeline t
-  "if t, the face of local `mode-name' variable will change with compilation status.
-
-For example, when `alchemist-mix-test' failes, the `mode-name' will be
-formated with the `alchemist-buffer--failed-face' face, to symbolize failing tests."
-  :type 'boolean
-  :group 'alchemist-buffer)
-
-(defvar alchemist-buffer--mode-name-face 'mode-line)
-
-(defvar alchemist-buffer--buffer-name nil
-  "Used to store compilation name so recompilation works as expected.")
-(make-variable-buffer-local 'alchemist-buffer--buffer-name)
-
-(defvar alchemist-buffer--error-link-options
-  '(elixir "\\([-A-Za-z0-9./_]+\\):\\([0-9]+\\)\\(?: warning\\)?" 1 2 nil (3) 1)
-  "File link matcher for `compilation-error-regexp-alist-alist' (matches path/to/file:line).")
-
-;; Faces
-
-(defface alchemist-buffer--success-face
-  '((t (:inherit font-lock-variable-name-face :bold t :background "darkgreen" :foreground "#e0ff00")))
-  "Face for successful compilation run."
-  :group 'alchemist-buffer)
-
-(defface alchemist-buffer--failed-face
-  '((t (:inherit font-lock-variable-name-face :bold t :background "red" :foreground "white")))
-  "Face for failed compilation run."
-  :group 'alchemist-buffer)
-
-(defface alchemist-buffer--running-face
-  '((t (:inherit font-lock-variable-name-face :bold nil :background "gray" :foreground "black")))
-  "Face for running compilation."
-  :group 'alchemist-buffer)
-
-(defun alchemist-buffer--kill-any-orphan-proc ()
-  "Ensure any dangling buffer process is killed."
-  (let ((orphan-proc (get-buffer-process (buffer-name))))
-    (when orphan-proc
-      (kill-process orphan-proc))))
-
-;; Private functions
-
-(defvar alchemist-buffer--save-buffers-predicate
-  (lambda ()
-    (not (string= (substring (buffer-name) 0 1) "*"))))
-
-(defun alchemist-buffer-init-test-report (buffer status)
-  (when (string= "*alchemist-test-report*" (buffer-name buffer))
-    (alchemist-test-mode)))
-
-(defun alchemist-buffer--remove-dispensable-output ()
-  (delete-matching-lines "\\(-*- mode:\\|Compiled \\|elixir-compilation;\\|Elixir started\\|^$\\)" (point-min) (point-max))
-  (remove-hook 'compilation-filter-hook 'alchemist-buffer--remove-dispensable-output t))
-
-(defun alchemist-buffer--remove-dispensable-output-after-finish (buffer msg)
-  (delete-matching-lines "\\(Excluding tags\\|Including tags\\|Elixir exited\\|Elixir finished\\)" (point-min) (point-max)))
-
-(defun alchemist-buffer--handle-compilation ()
-  (ansi-color-apply-on-region (point-min) (point-max)))
-
-(defun alchemist-buffer--set-modeline-color (buffer status)
-  (setq alchemist-buffer--mode-name-face
-        (if (string-prefix-p "finished" status)
-            'alchemist-buffer--success-face
-          'alchemist-buffer--failed-face))
-
-  (remove-hook 'compilation-finish-functions 'alchemist-buffer--set-modeline-color))
-
-;; Public functions
-
-(defun alchemist-buffer-initialize-modeline ()
-  "Initialize the mode-line face."
-  (setq mode-name
-         '(:eval (propertize "Elixir" 'face alchemist-buffer--mode-name-face))))
-
-(defun alchemist-buffer-reset-modeline ()
-  "Reset the current mode-line face to default."
-  (setq mode-name "Elixir"))
-
-(define-compilation-mode alchemist-buffer-mode "Elixir"
-  "Elixir compilation mode."
-  (progn
-    (font-lock-add-keywords nil
-                            '(("^Finished in .*$" . font-lock-string-face)))
-    ;; Set any bound buffer name buffer-locally
-    (setq alchemist-buffer--buffer-name alchemist-buffer--buffer-name)
-    (set (make-local-variable 'kill-buffer-hook)
-         'alchemist-buffer--kill-any-orphan-proc)))
-
-(defun alchemist-buffer-run (cmdlist buffer-name)
-  "Run CMDLIST in `alchemist-buffer-mode'.
-Returns the compilation buffer.
-Argument BUFFER-NAME for the compilation."
-  (save-some-buffers (not compilation-ask-about-save) alchemist-buffer--save-buffers-predicate)
-  (let* ((alchemist-buffer--buffer-name buffer-name)
-         (compilation-filter-start (point-min)))
-    (with-current-buffer
-        (compilation-start (mapconcat 'concat cmdlist " ")
-                           'alchemist-buffer-mode
-                           (lambda (b) alchemist-buffer--buffer-name))
-      (set (make-local-variable 'compilation-error-regexp-alist-alist)
-           (cons alchemist-buffer--error-link-options compilation-error-regexp-alist-alist))
-      (set (make-local-variable 'compilation-error-regexp-alist)
-           (cons 'elixir compilation-error-regexp-alist))
-      (add-hook 'compilation-filter-hook 'alchemist-buffer--handle-compilation nil t)
-      (add-hook 'compilation-filter-hook 'alchemist-buffer--remove-dispensable-output nil t)
-      (add-to-list 'compilation-finish-functions 'alchemist-buffer-init-test-report)
-      (add-to-list 'compilation-finish-functions 'alchemist-buffer--remove-dispensable-output-after-finish)
-      (when alchemist-buffer-status-modeline
-        (add-hook 'compilation-finish-functions 'alchemist-buffer--set-modeline-color nil t)))))
-
-(provide 'alchemist-buffer)
-
-;;; alchemist-buffer.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-company.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-company.el
deleted file mode 100644
index 1d54663..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-company.el
+++ /dev/null
@@ -1,83 +0,0 @@
-;;; alchemist-company.el --- Elixir company-mode backend -*- lexical-binding: t -*-
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Elixir company-mode backend.
-
-;;; Code:
-
-(require 'company)
-
-(defgroup alchemist-company nil
-  "Elixir company-mode backend."
-  :prefix "alchemist-company-"
-  :group 'alchemist)
-
-;; Variables
-
-(defcustom alchemist-company-show-annotation t
-  "Show an annotation inline with the candidate."
-  :type 'boolean
-  :group 'alchemist-company)
-
-(defun alchemist-company--show-documentation (selected)
-  (interactive)
-  (company--electric-do
-    (let* ((candidate (format "%s%s" selected (alchemist-company--annotation selected))))
-      (alchemist-help--execute-without-complete candidate))))
-(put 'alchemist-company--show-documentation 'company-keep t)
-
-(defun alchemist-company--open-definition (selected)
-  (interactive)
-  (company--electric-do
-    (alchemist-goto--open-definition selected)))
-(put 'alchemist-company--open-definition 'company-keep t)
-
-(defun alchemist-company--annotation (candidate)
-  (get-text-property 0 'meta candidate))
-
-(defun alchemist-company (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for Elixir."
-  (interactive (list 'interactive))
-  (when alchemist-company-show-annotation
-    (set 'company-tooltip-align-annotations t))
-  (case command
-    (interactive (company-begin-backend 'alchemist-company))
-    (init (when (or (eq major-mode 'elixir-mode)
-                    (string= mode-name "Alchemist-IEx"))))
-    (prefix (and (or (eq major-mode 'elixir-mode)
-                     (string= mode-name "Alchemist-IEx"))
-                 (alchemist-help--exp-at-point)))
-    (doc-buffer (alchemist-company--show-documentation arg))
-    (location (alchemist-company--open-definition arg))
-    (candidates (cons :async
-                      (lambda (cb)
-                        (setq alchemist-server-company-callback cb)
-                        (alchemist-server-complete-candidates arg))))
-    (annotation (when alchemist-company-show-annotation
-                  (alchemist-company--annotation arg)))))
-
-(add-to-list 'company-backends 'alchemist-company)
-
-(provide 'alchemist-company)
-
-;;; alchemist-company.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-compile.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-compile.el
deleted file mode 100644
index 5dc5369..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-compile.el
+++ /dev/null
@@ -1,73 +0,0 @@
-;;; alchemist-compile.el --- Elixir compilation functionality
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Elixir compilation functionality.
-
-;;; Code:
-
-(defgroup alchemist-compile nil
-  "Elixir compilation functionality."
-  :prefix "alchemist-compile-"
-  :group 'alchemist)
-
-;; Variables
-
-(defcustom alchemist-compile-command "elixirc"
-  "The shell command for elixirc."
-  :type 'string
-  :group 'alchemist-compile)
-
-(defvar alchemist-compile-buffer-name "*elixirc*"
-  "Name of the elixir output buffer.")
-
-;; Private functions
-
-(defun alchemist-compile--file (filename)
-  (cond ((not (file-exists-p filename)) (error "The given file doesn't exist"))
-        ((string-match "\.exs$" filename) (error "The given file is an Elixir Script"))
-        (t (alchemist-compile (list alchemist-compile-command (expand-file-name filename))))))
-
-(defun alchemist-compile--read-command (command)
-  (read-shell-command "elixirc command: " (concat command " ")))
-
-;; Public functions
-
-(defun alchemist-compile-this-buffer ()
-  "Compile the current buffer with elixirc."
-  (interactive)
-  (alchemist-compile--file buffer-file-name))
-
-(defun alchemist-compile-file (filename)
-  "Compile the given FILENAME."
-  (interactive "Felixirc: ")
-  (alchemist-compile--file (expand-file-name filename)))
-
-(defun alchemist-compile (cmdlist)
-  "Compile CMDLIST with elixirc."
-  (interactive (list (alchemist-compile--read-command alchemist-compile-command)))
-  (alchemist-buffer-run (alchemist-utils--build-runner-cmdlist cmdlist)
-                        alchemist-compile-buffer-name))
-
-(provide 'alchemist-compile)
-
-;;; alchemist-compile.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-complete.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-complete.el
deleted file mode 100644
index c7e07c2..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-complete.el
+++ /dev/null
@@ -1,135 +0,0 @@
-;;; alchemist-complete.el --- Complete functionality for Elixir source code -*- lexical-binding: t -*-
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Complete functionality for Elixir and Erlang source code.
-
-;;; Code:
-
-(defgroup alchemist-complete nil
-  "Complete functionality for Elixir source code."
-  :prefix "alchemist-complete-"
-  :group 'alchemist)
-
-(defun alchemist-complete--concat-prefix-with-functions (prefix functions &optional add-prefix)
-  (let* ((prefix (mapconcat 'concat (butlast (split-string prefix "\\.") 1) "."))
-         (candidates (mapcar (lambda (c) (concat prefix "." c)) (cdr functions))))
-    (if add-prefix
-        (push prefix candidates)
-      candidates)))
-
-(defun alchemist-complete--add-prefix-to-function (prefix function)
-  (let* ((prefix (mapconcat 'concat (butlast (split-string prefix "\\.") 1) "."))
-         (candidate (concat prefix "." function)))
-    candidate))
-
-(defun alchemist-complete--build-candidates (a-list)
-  (let* ((search-term (car a-list))
-         (candidates (if (string-match-p "^.+\/" search-term)
-                         a-list
-                       (cdr a-list)))
-         (candidates (mapcar (lambda (f)
-                               (let* ((candidate f)
-                                      (meta (if (string-match-p "^.+/" f)
-                                                (replace-regexp-in-string "^.+/" "/" f)
-                                              "")))
-                                 (cond
-                                  ((and (string-match-p "^:" search-term)
-                                        (not (string-match-p "\\.$" search-term)))
-                                   (propertize (concat ":" candidate)))
-                                  ((string-match-p "\\." search-term)
-                                   (propertize (alchemist-complete--add-prefix-to-function search-term
-                                                                                           (replace-regexp-in-string "/[0-9]$" "" candidate)) 'meta meta))
-                                  (t (propertize (replace-regexp-in-string "/[0-9]$" "" candidate) 'meta meta)))))
-                             candidates)))
-    candidates))
-
-(defun alchemist-complete--build-help-candidates (a-list)
-  (let* ((search-term (car a-list))
-         (candidates (cond ((> (alchemist-utils--count-char-in-str "\\." search-term) 1)
-                            (let ((search (if (string-match-p "\\.[a-z0-9_\?!]+$" search-term)
-                                              (list (replace-regexp-in-string "\\.[a-z0-9_\?!]+$" "" search-term))
-                                            (list (replace-regexp-in-string "\\.$" "" search-term))))
-                                  (candidates (mapcar (lambda (c)
-                                                        (if (string-match-p "\\.[a-z0-9_\?!]+$" search-term)
-                                                            (concat (replace-regexp-in-string "\\.[a-z0-9_\?!]+$" "." search-term) c)
-                                                          (concat search-term c)))
-                                                      (cdr a-list))))
-                              (append search candidates)))
-                            ((string-match-p "\\.$" search-term)
-                            (alchemist-complete--concat-prefix-with-functions search-term a-list t))
-                           ((string-match-p "\\.[a-z0-9_\?!]+$" search-term)
-                            (alchemist-complete--concat-prefix-with-functions search-term a-list))
-                           (t
-                            a-list))))
-    (delete-dups candidates)))
-
-(defun alchemist-complete--output-to-list (output)
-  (let* ((output (replace-regexp-in-string "^cmp:" "" output))
-         (output (split-string output))
-         (output (delete nil output)))
-    output)
-  )
-
-(defun alchemist-complete--clear-buffer (buffer)
-  "Clears the BUFFER from not used lines."
-  (with-current-buffer buffer
-    (delete-non-matching-lines "^cmp:" (point-min) (point-max))))
-
-(defun alchemist-complete--completing-prompt (initial completing-collection)
-  (let* ((completing-collection (alchemist-complete--build-help-candidates completing-collection)))
-    (cond ((equal (length completing-collection) 1)
-           (car completing-collection))
-          (completing-collection
-           (completing-read
-            "Elixir help: "
-            completing-collection
-            nil
-            nil
-            (replace-regexp-in-string "\\.$" "" initial)))
-          (t initial))))
-
-(defun alchemsit-complete--dabbrev-code-candidates ()
-  "This function uses a piece of functionality of company-dabbrev-code backend.
-
-Please have a look at the company-dabbrev-code function for more
-detailed information."
-  (let ((case-fold-search company-dabbrev-code-ignore-case)
-        (candidates (company-dabbrev--search
-                     (company-dabbrev-code--make-regexp alchemist-server--last-completion-exp)
-                     company-dabbrev-code-time-limit
-                     (pcase company-dabbrev-code-other-buffers
-                       (`t (list major-mode))
-                       (`code company-dabbrev-code-modes)
-                       (`all `all))
-                     t)))
-    (delete-dups candidates)))
-
-(defun alchemist-complete--serve-candidates-to-company (candidates)
-  (let ((candidates (if candidates
-                        candidates
-                      (alchemsit-complete--dabbrev-code-candidates))))
-    (funcall alchemist-server-company-callback candidates)))
-
-(provide 'alchemist-complete)
-
-;;; alchemist-complete.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-eval.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-eval.el
deleted file mode 100644
index f376d65..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-eval.el
+++ /dev/null
@@ -1,185 +0,0 @@
-;;; alchemist-eval.el --- Elixir code inline evaluation functionality
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Elixir code inline evaluation functionality
-
-;;; Code:
-
-(defgroup alchemist-eval nil
-  "Elixir code inline evaluation functionality."
-  :prefix "alchemist-eval-"
-  :group 'alchemist)
-
-;; Private functions
-
-(defun alchemist-eval--insert (string)
-  (let ((lines (split-string string "\n")))
-    (if (> (length lines) 1)
-        (progn
-          (save-excursion
-            (end-of-line)
-            (mapc (lambda (s)
-                    (newline)
-                    (insert (format "# => %s" s))
-                    (indent-according-to-mode))
-                  lines)))
-      (save-excursion
-        (end-of-line)
-        (insert (format "  # => %s" string))))))
-
-(defun alchemist-eval--evaluate-code (string)
-  (let ((tmp-file ".alchemist-eval.exs")
-        (old-directory default-directory))
-    (when (alchemist-project-p)
-      (alchemist-project--establish-root-directory))
-    (with-temp-file tmp-file
-      (insert string))
-    (let ((output (shell-command-to-string
-                   (alchemist-eval--build-code-evaluation-command tmp-file))))
-      (delete-file tmp-file)
-      (cd old-directory)
-      (alchemist-utils--remove-newline-at-end output))))
-
-(defun alchemist-eval--evaluate-code-as-quoted (string)
-  (let ((tmp-file ".alchemist-eval.exs")
-        (old-directory default-directory))
-    (when (alchemist-project-p)
-      (alchemist-project--establish-root-directory))
-    (with-temp-file tmp-file
-      (insert string))
-    (let ((output (shell-command-to-string
-                   (alchemist-eval--build-code-evaluation-as-quoted-command tmp-file))))
-      (delete-file tmp-file)
-      (cd old-directory)
-      (alchemist-utils--remove-newline-at-end output))))
-
-(defun alchemist-eval--expression (expression)
-  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
-    (with-temp-file file
-      (insert expression))
-    (alchemist-server-eval file)))
-
-(defun alchemist-eval--expression-and-print (expression)
-  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
-    (with-temp-file file
-      (insert expression))
-    (alchemist-server-eval-and-insert file)))
-
-(defun alchemist-eval--quote-expression (expression)
-  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
-    (with-temp-file file
-      (insert expression))
-    (alchemist-server-eval-quote file)))
-
-(defun alchemist-eval--quote-expression-and-print (expression)
-  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
-    (with-temp-file file
-      (insert expression))
-    (alchemist-server-eval-quote-and-insert file)))
-
-;; Public functions
-
-(defun alchemist-eval-current-line ()
-  "Evaluate the Elixir code on the current line."
-  (interactive)
-  (alchemist-eval--expression (thing-at-point 'line)))
-
-(defun alchemist-eval-print-current-line ()
-  "Evaluate the Elixir code on the current line and insert the result."
-  (interactive)
-  (alchemist-eval--expression-and-print (thing-at-point 'line)))
-
-(defun alchemist-eval-region (beg end)
-  "Evaluate the Elixir code on marked region."
-  (interactive (list (point) (mark)))
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let ((string (buffer-substring-no-properties beg end)))
-    (alchemist-eval--expression string)))
-
-(defun alchemist-eval-print-region (beg end)
-  "Evaluate the Elixir code on marked region and insert the result."
-  (interactive (list (point) (mark)))
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let ((string (buffer-substring-no-properties beg end)))
-    (when (> end beg)
-      (exchange-point-and-mark))
-    (alchemist-eval--expression-and-print string)))
-
-(defun alchemist-eval-buffer ()
-  "Evaluate the Elixir code in the current buffer."
-  (interactive)
-  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
-    (alchemist-eval--expression string)))
-
-(defun alchemist-eval-print-buffer ()
-  "Evaluate the Elixir code in the current buffer and insert the result."
-  (interactive)
-  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
-    (end-of-buffer)
-    (alchemist-eval--expression-and-print string)))
-
-(defun alchemist-eval-quoted-current-line ()
-  "Get the Elixir code representation of the expression on the current line."
-  (interactive)
-  (alchemist-eval--quote-expression (thing-at-point 'line)))
-
-(defun alchemist-eval-print-quoted-current-line ()
-  "Get the Elixir code representation of the expression on the current line and insert the result."
-  (interactive)
-  (alchemist-eval--quote-expression-and-print (thing-at-point 'line)))
-
-(defun alchemist-eval-quoted-region (beg end)
-  "Get the Elixir code representation of the expression on marked region."
-  (interactive (list (point) (mark)))
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let ((string (buffer-substring-no-properties beg end)))
-    (alchemist-eval--quote-expression string)))
-
-(defun alchemist-eval-print-quoted-region (beg end)
-  "Get the Elixir code representation of the expression on marked region and insert the result."
-  (interactive (list (point) (mark)))
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let ((string (buffer-substring-no-properties beg end)))
-    (when (> end beg)
-      (exchange-point-and-mark))
-    (alchemist-eval--quote-expression-and-print string)))
-
-(defun alchemist-eval-quoted-buffer ()
-  "Get the Elixir code representation of the expression in the current buffer."
-  (interactive)
-  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
-    (alchemist-eval--quote-expression string)))
-
-(defun alchemist-eval-print-quoted-buffer ()
-  "Get the Elixir code representation of the expression in the current buffer and insert result."
-  (interactive)
-  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
-    (alchemist-eval--quote-expression-and-print string)))
-
-(provide 'alchemist-eval)
-
-;;; alchemist-eval.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-execute.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-execute.el
deleted file mode 100644
index 6481695..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-execute.el
+++ /dev/null
@@ -1,73 +0,0 @@
-;;; alchemist-execute.el --- Elixir's script execution integration
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Elixir's script execution integration
-
-;;; Code:
-
-(defgroup alchemist-execute nil
-  "Elixir's script execution integration."
-  :prefix "alchemist-execute-"
-  :group 'alchemist)
-
-;; Variables
-
-(defcustom alchemist-execute-command "elixir"
-  "The shell command for elixir."
-  :type 'string
-  :group 'alchemist-execute)
-
-(defvar alchemist-execute-buffer-name "*elixir*"
-  "Name of the elixir output buffer.")
-
-;; Private functions
-
-(defun alchemist-execute--file (filename)
-  (when (not (file-exists-p filename))
-    (error "The given file doesn't exists"))
-  (alchemist-execute (list alchemist-execute-command (expand-file-name filename))))
-
-(defun alchemist-execute--read-command (command)
-  (read-shell-command "elixir command: " (concat command " ")))
-
-;; Public functions
-
-(defun alchemist-execute-this-buffer ()
-  "Run the current buffer through elixir."
-  (interactive)
-  (alchemist-execute--file buffer-file-name))
-
-(defun alchemist-execute-file (filename)
-  "Run elixir with the given FILENAME."
-  (interactive "Felixir: ")
-  (alchemist-execute--file (expand-file-name filename)))
-
-(defun alchemist-execute (cmdlist)
-  "Run a elixir with CMDLIST."
-  (interactive (list (alchemist-execute--read-command alchemist-execute-command)))
-  (alchemist-buffer-run (alchemist-utils--build-runner-cmdlist cmdlist)
-                        alchemist-execute-buffer-name))
-
-(provide 'alchemist-execute)
-
-;;; alchemist-execute.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-goto.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-goto.el
deleted file mode 100644
index c36d0a1..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-goto.el
+++ /dev/null
@@ -1,336 +0,0 @@
-;;; alchemist-goto.el --- Functionality to jump modules and function definitions
-
-;; Copyright © 2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Functionality to jump modules and function definitions
-
-;;; Code:
-
-(require 'etags)
-
-(defgroup alchemist-goto nil
-  "Functionality to jump modules and function definitions."
-  :prefix "alchemist-goto-"
-  :group 'alchemist)
-
-;; Variables
-
-(defcustom alchemist-goto-erlang-source-dir ""
-  "Path to the erlang source code."
-  :type 'string
-  :group 'alchemist-goto)
-
-(defcustom alchemist-goto-elixir-source-dir ""
-  "Path to the elixir source code."
-  :type 'string
-  :group 'alchemist-goto)
-
-(defvar alchemist-goto--symbol-list '())
-(defvar alchemist-goto--symbol-name-and-pos '())
-(defvar alchemist-goto--symbol-list-bare '())
-(defvar alchemist-goto--symbol-name-and-pos-bare '())
-
-;; Private functions
-
-(defun alchemist-goto--current-module-name ()
-  "Searches backward in the current buffer until a module
-declaration has been found."
-  (save-excursion
-    (let ((found-flag-p nil)
-          (module-name ""))
-      (save-match-data
-        (while (and (not found-flag-p)
-                    (re-search-backward "defmodule \\([A-Za-z\._]+\\)\s+" nil t))
-          (when (not (alchemist-goto--string-at-point-p))
-            (setq module-name (match-string 1))
-            (setq found-flag-p t))
-          (when (equal 1 (line-number-at-pos (point)))
-            (setq found-flag-p t)))
-        module-name))))
-
-(defun alchemist-goto--use-modules-in-the-current-module-context ()
-  (let ((modules '())
-        (context (alchemist-goto--current-module-name)))
-    (save-excursion
-      (while (re-search-backward "^\s+use\s+\\([A-Za-z0-9\.]+\\)" nil t)
-        (if (and (match-string 1)
-                 (not (alchemist-goto--string-at-point-p))
-                 (equal context (alchemist-goto--current-module-name)))
-            (setq modules (add-to-list 'modules (substring-no-properties (match-string 1))))
-            ))
-      modules)))
-
-(defun alchemist-goto--import-modules-in-the-current-module-context ()
-  (let ((modules '())
-        (context (alchemist-goto--current-module-name)))
-    (save-excursion
-      (while (re-search-backward "^\s+import\s+\\([A-Za-z0-9\.]+\\)" nil t)
-        (if (and (match-string 1)
-                 (not (alchemist-goto--string-at-point-p))
-                 (equal context (alchemist-goto--current-module-name)))
-            (setq modules (add-to-list 'modules (substring-no-properties (match-string 1))))
-            ))
-    modules)))
-
-(defun alchemist-goto--extract-module (code)
-  "Extract module from CODE."
-  (let* ((parts (split-string code "\\."))
-         (function (car (last parts)))
-         (case-fold-search nil))
-    (when (string-match-p "^[a-z_\?!]+" function)
-      (delete function parts))
-    (unless (string-match-p "^[a-z_\?!]+" (car parts))
-      (replace-regexp-in-string "\\.$" "" (mapconcat 'concat parts ".")))))
-
-(defun alchemist-goto--extract-function (code)
-  "Extract function from CODE."
-  (let* ((parts (split-string code "\\."))
-         (function (car (last parts)))
-         (case-fold-search nil))
-    (when (and function
-               (string-match-p "^[a-z_\?!]+" function))
-      function)))
-
-(defun alchemist-goto--build-elixir-ex-core-file (file)
-  (when (string-match "\\/\\(lib\\/.+\\/lib\\)\\/.+\.ex$" file)
-    (let* ((file (substring-no-properties file (match-beginning 1)))
-           (source-directory (expand-file-name alchemist-goto-elixir-source-dir)))
-      (concat source-directory file))))
-
-(defun alchemist-goto--build-elixir-erl-core-file (file)
-  (when (string-match "\\/\\(lib\\/.+\\/src\\)\\/.+\.erl$" file)
-    (let* ((file (substring-no-properties file (match-beginning 1)))
-           (source-directory (expand-file-name alchemist-goto-elixir-source-dir)))
-      (concat source-directory file))))
-
-(defun alchemist-goto--build-erlang-core-file (file)
-  (when (string-match "\\/\\(lib\\/.+\\/src\\)\\/.+\.erl$" file)
-    (let* ((file (substring-no-properties file (match-beginning 1)))
-           (source-directory (expand-file-name alchemist-goto-erlang-source-dir)))
-      (concat source-directory file))))
-
-(defun alchemist-goto--elixir-file-p (file)
-  (string-match-p  "\\.ex\\(s\\)?$" file))
-
-(defun alchemist-goto--erlang-file-p (file)
-  (string-match-p  "\\.erl$" file))
-
-(defun alchemist-goto--get-full-path-of-alias (module)
-  (if (not (alchemist-utils--empty-string-p module))
-      (let* ((aliases (mapcar (lambda (m)
-                                (when (string-match-p (format "^%s" (car (cdr m))) module)
-                                  (replace-regexp-in-string (format "^%s" (car (cdr m))) (car m) module t)))
-                              (alchemist-goto--alises-of-current-buffer)))
-             (aliases (delete nil aliases)))
-        (if aliases
-            (car aliases)
-          module))))
-
-(defun alchemist-goto--string-at-point-p (&optional complete)
-  "Return non-nil if cursor is at a string."
-  (save-excursion
-  (or (and (nth 3 (save-excursion
-                    (let ((pos (point)))
-                      (when complete
-                        (end-of-buffer))
-                      (parse-partial-sexp 1 pos))))
-           (nth 8 (save-excursion
-                    (let ((pos (point)))
-                      (when complete
-                        (end-of-buffer))
-                      (parse-partial-sexp 1 pos)))))
-      (and (looking-at "\"\"\"\\|'''\\|\"\\|\'")
-           (match-beginning 0)))))
-
-(defun alchemist-goto--symbol-definition-p (symbol)
-  (alchemist-goto--fetch-symbol-definitions)
-  (if (member symbol alchemist-goto--symbol-list-bare)
-      t
-    nil))
-
-(defun alchemist-goto--goto-symbol (symbol)
-  (let ((position (cdr (assoc symbol alchemist-goto--symbol-name-and-pos-bare))))
-    (goto-char (if (overlayp position) (overlay-start position) position))))
-
-(defun alchemist-goto-list-symbol-definitions ()
-  "List all symbol definitions in the current file like functions/macros/modules.
-
-It will jump to the position of the symbol definition after selection."
-  (interactive)
-  (alchemist-goto--fetch-symbol-definitions)
-  (ring-insert find-tag-marker-ring (point-marker))
-  (let* ((selected-def (completing-read "Symbol definitions:" alchemist-goto--symbol-list))
-        (position (cdr (assoc selected-def alchemist-goto--symbol-name-and-pos))))
-    (goto-char (if (overlayp position) (overlay-start position) position))))
-
-(defun alchemist-goto--fetch-symbol-definitions ()
-  (alchemist-goto--search-for-symbols "^\\s-*\\(defp?\\|defmacrop?\\|defmodule\\)\s.*"))
-
-(defface alchemist-goto--def-face
-  '((t (:inherit font-lock-constant-face)))
-  ""
-  :group 'alchemist-goto)
-
-(defface alchemist-goto--name-face
-  '((t (:bold t)))
-  ""
-  :group 'alchemist-goto)
-
-(defvar alchemist-goto--symbol-def-extract-regex
-  "^\\s-*\\(defp?\\|defmacrop?\\|defmodule\\)[ \n\t]+\\([a-z_\?!]+\\)\\(.*\\)\\(do\\|\n\\)?$")
-
-(defun alchemist-goto--extract-symbol (str)
-  (save-match-data
-    (when (string-match alchemist-goto--symbol-def-extract-regex str)
-      (let ((type (substring str (match-beginning 1) (match-end 1)))
-            (name (substring str (match-beginning 2) (match-end 2)))
-            (arguments (substring str (match-beginning 3) (match-end 3))))
-        (concat
-         (propertize type
-                     'face 'alchemist-goto--def-face)
-         " "
-         (propertize name
-                     'face 'alchemist-goto--name-face)
-         (replace-regexp-in-string ",?\s+do:.*$" "" (replace-regexp-in-string "\s+do$" "" arguments)))))))
-
-(defun alchemist-goto--extract-symbol-bare (str)
-  (save-match-data
-    (when (string-match alchemist-goto--symbol-def-extract-regex str)
-      (let ((type (substring str (match-beginning 1) (match-end 1)))
-            (name (substring str (match-beginning 2) (match-end 2)))
-            (arguments (substring str (match-beginning 3) (match-end 3))))
-        name))))
-
-(defun alchemist-goto--get-symbol-from-position (position)
-  (with-current-buffer (buffer-name)
-    (save-excursion
-      (goto-char position)
-      (end-of-line)
-      (let* ((end-position (point))
-             (line (buffer-substring-no-properties position end-position)))
-        (alchemist-goto--extract-symbol line)))))
-
-(defun alchemist-goto--get-symbol-from-position-bare (position)
-  (with-current-buffer (buffer-name)
-    (save-excursion
-      (goto-char position)
-      (end-of-line)
-      (let* ((end-position (point))
-             (line (buffer-substring-no-properties position end-position)))
-        (alchemist-goto--extract-symbol-bare line)))))
-
-(defun alchemist-goto--search-for-symbols (regex)
-  (setq alchemist-goto--symbol-list '())
-  (setq alchemist-goto--symbol-name-and-pos '())
-  (with-current-buffer (buffer-name)
-    (save-excursion
-      (goto-char (point-max))
-      (goto-char (point-min))
-      (let ()
-        (save-match-data
-          (while (re-search-forward regex nil t)
-            (when (not (alchemist-goto--string-at-point-p t))
-              (when (alchemist-goto--get-symbol-from-position (car (match-data)))
-                (let* ((position (car (match-data)))
-                       (symbol (alchemist-goto--get-symbol-from-position position))
-                       (symbol-bare (alchemist-goto--get-symbol-from-position-bare position)))
-                  (setq alchemist-goto--symbol-list (append alchemist-goto--symbol-list (list symbol)))
-                  (setq alchemist-goto--symbol-name-and-pos (append alchemist-goto--symbol-name-and-pos (list (cons symbol position))))
-                  (setq alchemist-goto--symbol-list-bare (append alchemist-goto--symbol-list-bare (list symbol-bare)))
-                  (setq alchemist-goto--symbol-name-and-pos-bare (append alchemist-goto--symbol-name-and-pos-bare (list (cons symbol-bare position)))))))))))))
-
-(defun alchemist-goto--open-definition (expr)
-  (let* ((module (alchemist-goto--extract-module expr))
-         (module (alchemist-goto--get-full-path-of-alias module))
-         (module (if module module "nil"))
-         (function (alchemist-goto--extract-function expr))
-         (function (if function function "\"\"")))
-    (ring-insert find-tag-marker-ring (point-marker))
-    (cond
-     ((and (string-equal module "nil")
-           (string-equal major-mode "elixir-mode")
-           (alchemist-goto--symbol-definition-p function))
-      (alchemist-goto--goto-symbol function))
-     (t (alchemist-server-goto module function expr)
-        ))))
-
-(defun alchemist-goto--open-file (file module function)
-  (let* ((buf (find-file-noselect file)))
-    (switch-to-buffer buf)
-    (beginning-of-buffer)
-    (cond ((alchemist-goto--elixir-file-p file)
-           (alchemist-goto--jump-to-elixir-source module function))
-          ((alchemist-goto--erlang-file-p file)
-           (alchemist-goto--jump-to-erlang-source module function)))))
-
-(defun alchemist-gogo--symbol-definition-regex (symbol)
-  (format "^\s+\\(defp?\s+%s\(?\\|defmacrop?\s+%s\(?\\)" symbol symbol))
-
-(defun alchemist-goto--jump-to-elixir-source (module function)
-  (let ((function (replace-regexp-in-string "\?" "\\?" function)))
-    (when (re-search-forward (alchemist-gogo--symbol-definition-regex function) nil t)
-      (goto-char (match-beginning 0)))
-    (when (re-search-forward (format "\\(defmodule\\|defimpl\\|defprotocol\\)\s+%s\s+do" module) nil t)
-      (goto-char (match-beginning 0)))))
-
-(defun alchemist-goto--jump-to-erlang-source (module function)
-  (when (re-search-forward (format "\\(^%s\(\\)" function) nil t)
-    (goto-char (match-beginning 0)))
-  (when (re-search-forward (format "\\(^-module\(%s\)\\)" (substring module 1)) nil t)
-    (goto-char (match-beginning 0))))
-
-(defun alchemist-goto--context-exists-p ()
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (if (re-search-forward "defmodule \\([A-Za-z\._]+\\)\s+" nil t)
-        t
-      nil)))
-
-(defun alchemist-goto--alises-of-current-buffer ()
-  (let* ((aliases '()))
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward "^\s+alias\s+\\([-:_A-Za-z0-9,\.\?!\]+\\)\\(\s*,\s*as:\s*\\)?\\([-_A-Za-z0-9,\.\?!\]+\\)?\n" nil t)
-        (let* ((alias (match-string 1))
-               (as (if (match-string 3) (match-string 3) nil))
-               (as (if as as (car (last (split-string alias "\\."))))))
-          (setq aliases (append aliases (list (list alias as)))))))
-    aliases))
-
-;; Public functions
-
-(defun alchemist-goto-definition-at-point ()
-  "Jump to the elixir expression definition at point."
-  (interactive)
-  (let (p1 p2)
-    (skip-chars-backward "-_A-Za-z0-9.?!:")
-    (setq p1 (point))
-    (skip-chars-forward "-_A-Za-z0-9.?!:")
-    (setq p2 (point))
-    (alchemist-goto--open-definition (buffer-substring-no-properties p1 p2))))
-
-(defalias 'alchemist-goto-jump-back 'pop-tag-mark)
-
-(provide 'alchemist-goto)
-
-;;; alchemist-goto.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-help.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-help.el
deleted file mode 100644
index 5d670cc..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-help.el
+++ /dev/null
@@ -1,204 +0,0 @@
-;;; alchemist-help.el --- Functionality for Elixir documentation lookup -*- lexical-binding: t -*-
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Functionality for Elixir documentation lookup.
-
-;;; Code:
-
-(defgroup alchemist-help nil
-  "Functionality for Elixir documentation lookup."
-  :prefix "alchemist-help-"
-  :group 'alchemist)
-
-;; Variables
-
-(defcustom alchemist-help-buffer-name "*elixir help*"
-  "Name of the Elixir help buffer."
-  :type 'string
-  :group 'alchemist-help)
-
-(defvar alchemist-help-search-history '()
-  "Storage for the search history.")
-
-(defvar alchemist-help-current-search-text '()
-  "Stores the current search.")
-
-;; Faces
-
-(defface alchemist-help--key-face
-  '((t (:inherit font-lock-variable-name-face :bold t :foreground "red")))
-  "Fontface for the letter keys in the summary."
-  :group 'alchemist-help)
-
-(defun alchemist-help--exp-at-point ()
-  "Return the expression under the cursor."
-  (let (p1 p2)
-    (save-excursion
-      (skip-chars-backward "-_A-Za-z0-9.?!:")
-      (setq p1 (point))
-      (skip-chars-forward "-_A-Za-z0-9.?!:")
-      (setq p2 (point))
-      (buffer-substring-no-properties p1 p2))))
-
-(defun alchemist-help--execute (search)
-  (alchemist-server-help-with-complete search))
-
-(defun alchemist-help--execute-without-complete (search)
-  (alchemist-server-help-without-complete search))
-
-(defun alchemist-help--bad-search-output-p (string)
-  (let ((match (or (string-match-p "No documentation for " string)
-                   (string-match-p "Invalid arguments for h helper" string)
-                   (string-match-p "** (TokenMissingError)" string)
-                   (string-match-p "** (SyntaxError)" string)
-                   (string-match-p "** (FunctionClauseError)" string)
-                   (string-match-p "** (CompileError)" string)
-                   (string-match-p "Could not load module" string))))
-    (if match
-        t
-      nil)))
-
-(defun alchemist-help--initialize-buffer (content)
-  (let ((default-directory (if (alchemist-project-root)
-                               (alchemist-project-root)
-                             default-directory)))
-    (cond
-     ((alchemist-help--bad-search-output-p content)
-             (message (propertize
-                       (format "No documentation for [ %s ] found." alchemist-help-current-search-text)
-                       'face 'alchemist-help--key-face)))
-     (t
-      (if (get-buffer alchemist-help-buffer-name)
-          (kill-buffer alchemist-help-buffer-name))
-      (pop-to-buffer alchemist-help-buffer-name)
-      (setq buffer-undo-list nil)
-      (let ((inhibit-read-only t)
-            (buffer-undo-list t))
-        (erase-buffer)
-        (insert content)
-        (unless (memq 'alchemist-help-current-search-text alchemist-help-search-history)
-          (add-to-list 'alchemist-help-search-history alchemist-help-current-search-text))
-        (delete-matching-lines "do not show this result in output" (point-min) (point-max))
-        (delete-matching-lines "^Compiled lib\\/" (point-min) (point-max))
-        (ansi-color-apply-on-region (point-min) (point-max))
-        (read-only-mode 1)
-        (alchemist-help-minor-mode 1))))))
-
-(defun alchemist-help-minor-mode-key-binding-summary ()
-  (interactive)
-  (message
-   (concat "[" (propertize "q" 'face 'alchemist-help--key-face)
-           "]-quit ["
-           (propertize "e" 'face 'alchemist-help--key-face)
-           "]-search-at-point ["
-           (propertize "m" 'face 'alchemist-help--key-face)
-           "]-search-marked-region ["
-           (propertize "s" 'face 'alchemist-help--key-face)
-           "]-search ["
-           (propertize "h" 'face 'alchemist-help--key-face)
-           "]-history ["
-           (propertize "?" 'face 'alchemist-help--key-face)
-           "]-keys")))
-
-(defun alchemist-help-search-at-point ()
-  "Search through `alchemist-help' with the expression under the cursor."
-  (interactive)
-  (let* ((expr (alchemist-help--exp-at-point))
-         (module (alchemist-goto--extract-module expr))
-         (module (alchemist-goto--get-full-path-of-alias module))
-         (module (if module module ""))
-         (function (alchemist-goto--extract-function expr))
-         (function (if function function ""))
-         (expr (cond
-                ((and (not (alchemist-utils--empty-string-p module))
-                      (not (alchemist-utils--empty-string-p function)))
-                 (format "%s.%s" module function))
-                ((not (alchemist-utils--empty-string-p module))
-                 module)
-                (t
-                 expr))))
-    (alchemist-help--execute expr)))
-
-(defun alchemist-help-search-marked-region (begin end)
-  "Run `alchemist-help' with the marked region.
-Argument BEGIN where the mark starts.
-Argument END where the mark ends."
-  (interactive "r")
-  (let* ((expr (filter-buffer-substring begin end))
-        (module (alchemist-goto--extract-module expr))
-        (module (alchemist-goto--get-full-path-of-alias module))
-        (module (if module module ""))
-        (function (alchemist-goto--extract-function expr))
-        (function (if function function ""))
-        (expr (cond
-               ((and (not (alchemist-utils--empty-string-p module))
-                     (not (alchemist-utils--empty-string-p function)))
-                (format "%s.%s" module function))
-               ((not (alchemist-utils--empty-string-p module))
-                module)
-               (t
-                expr))))
-    (alchemist-help--execute expr)))
-
-(defun alchemist-help--elixir-modules-to-list (str)
-  (let* ((modules (split-string str))
-         (modules (mapcar (lambda (m)
-                            (when (string-match-p "Elixir\\." m)
-                              (replace-regexp-in-string "Elixir\\." "" m))) modules))
-         (modules (delete nil modules))
-         (modules (cl-sort modules 'string-lessp :key 'downcase))
-         (modules (delete-dups modules)))
-    modules))
-
-(defvar alchemist-help-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "q") #'quit-window)
-    (define-key map (kbd "e") #'alchemist-help-search-at-point)
-    (define-key map (kbd "m") #'alchemist-help-search-marked-region)
-    (define-key map (kbd "s") #'alchemist-help)
-    (define-key map (kbd "h") #'alchemist-help-history)
-    (define-key map (kbd "M-.") #'alchemist-goto-definition-at-point)
-    (define-key map (kbd "?") #'alchemist-help-minor-mode-key-binding-summary)
-    map)
-  "Keymap for `alchemist-help-minor-mode'.")
-
-(define-minor-mode alchemist-help-minor-mode
-  "Minor mode for displaying elixir help."
-  :group 'alchemist-help
-  :keymap alchemist-help-minor-mode-map)
-
-(defun alchemist-help ()
-  "Load Elixir documentation for SEARCH."
-  (interactive)
-  (alchemist-server-help))
-
-(defun alchemist-help-history (search)
-  "Load Elixir from the documentation history for SEARCH."
-  (interactive
-   (list
-    (completing-read "Elixir help history: " alchemist-help-search-history nil nil "")))
-  (alchemist-help--execute-without-complete search))
-
-(provide 'alchemist-help)
-
-;;; alchemist-help.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-hooks.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-hooks.el
deleted file mode 100644
index 3d45bf1..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-hooks.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; alchemist-hooks.el --- Hooks functionality
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-;;         Dave Thomas <http://pragdave.me>
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Hooks functionality
-
-;;; Code:
-
-(defgroup alchemist-hooks nil
-  "Hooks"
-  :prefix "alchemist-hooks-"
-  :group 'alchemist)
-
-(defcustom alchemist-hooks-test-on-save nil
-  "If t, run `alchemist-mix-test' on save."
-  :type 'boolean
-  :group 'alchemist-hooks)
-
-(defun alchemist-hooks--test-on-save ()
-  (when (and alchemist-hooks-test-on-save
-             (alchemist-utils--elixir-project-root))
-    (alchemist-mix-test)))
-
-(eval-after-load 'elixir-mode
-  '(progn
-     (add-hook 'after-save-hook 'alchemist-hooks--test-on-save nil nil)))
-
-(provide 'alchemist-hooks)
-
-;;; alchemist-hooks.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-iex.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-iex.el
deleted file mode 100644
index 3c78d67..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-iex.el
+++ /dev/null
@@ -1,201 +0,0 @@
-;;; alchemist-help.el --- Interaction with an Elixir IEx process
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Interaction with an Elixir IEx process
-
-;;; Code:
-
-(require 'comint)
-
-(defgroup alchemist-iex nil
-  "Interaction with an Elixir IEx process."
-  :prefix "alchemist-iex-"
-  :group 'alchemist)
-
-(defcustom alchemist-iex-program-name "iex"
-  "The shell command for iex."
-  :type 'string
-  :group 'alchemist-iex)
-
-(defcustom alchemist-iex-prompt-read-only t
-  "If non-nil, the prompt will be read-only."
-  :type 'boolean
-  :group 'alchemist-iex)
-
-(defvar alchemist-iex-buffer nil
-  "The buffer in which the Elixir IEx process is running.")
-
-(defvar alchemist-iex-mode-hook nil
-  "Hook for customizing `alchemist-iex-mode'.")
-
-(defvar alchemist-iex-mode-map
-  (let ((map (nconc (make-sparse-keymap) comint-mode-map)))
-    (define-key map "\t" 'completion-at-point)
-    (define-key map (kbd (format "%s i r" alchemist-key-command-prefix)) 'alchemist-iex-open-input-ring)
-    (define-key map (kbd (format "%s i c" alchemist-key-command-prefix)) 'alchemist-iex-clear-buffer)
-    (define-key map (kbd (format "%s h e" alchemist-key-command-prefix)) 'alchemist-help-search-at-point)
-    (define-key map (kbd (format "%s h m" alchemist-key-command-prefix)) 'alchemist-help-search-marked-region)
-    (define-key map (kbd "M-.") 'alchemist-goto-definition-at-point)
-    map))
-
-(eval-after-load 'company
-  '(progn
-     (defun alchemist-iex--set-company-as-completion-at-point-function ()
-       (setq completion-at-point-functions '(company-complete)))
-     (add-hook 'alchemist-iex-mode-hook 'alchemist-iex--set-company-as-completion-at-point-function)))
-
-(define-derived-mode alchemist-iex-mode comint-mode "Alchemist-IEx"
-  "Major mode for interacting with an Elixir IEx process.
-
-\\<alchemist-iex-mode-map>"
-  nil "Alchemist-IEx"
-  (set (make-local-variable 'comint-prompt-regexp) "^iex\(.+\)>")
-  (set (make-local-variable 'comint-prompt-read-only) alchemist-iex-prompt-read-only)
-  (set (make-local-variable 'comint-input-autoexpand) nil))
-
-(defun alchemist-iex-command (arg)
-  (split-string-and-unquote
-   (if (null arg) alchemist-iex-program-name
-     (read-string "Command to run Elixir IEx: " (concat alchemist-iex-program-name arg)))))
-
-(defun alchemist-iex-start-process (command)
-  "Start an IEX process.
-With universal prefix \\[universal-argument], prompts for a COMMAND,
-otherwise uses `alchemist-iex-program-name'.
-It runs the hook `alchemist-iex-mode-hook' after starting the process and
-setting up the IEx buffer."
-  (interactive (list (alchemist-iex-command current-prefix-arg)))
-  (setq alchemist-iex-buffer
-        (apply 'make-comint "Alchemist-IEx" (car command) nil (cdr command)))
-  (with-current-buffer alchemist-iex-buffer
-    (alchemist-iex-mode)
-    (run-hooks 'alchemist-iex-mode-hook)))
-
-(defun alchemist-iex-process (&optional arg)
-  (or (if (buffer-live-p alchemist-iex-buffer)
-          (get-buffer-process alchemist-iex-buffer))
-      (progn
-        (let ((current-prefix-arg arg))
-          (call-interactively 'alchemist-iex-start-process))
-        (alchemist-iex-process arg))))
-
-(defun alchemist-iex--remove-newlines (string)
-  (replace-regexp-in-string "\n" " " string))
-
-(defun alchemist-iex-send-last-sexp ()
-  "Send the previous sexp to the inferior IEx process."
-  (interactive)
-  (alchemist-iex-send-region (save-excursion (backward-sexp) (point)) (point)))
-
-(defun alchemist-iex-send-current-line ()
-  "Sends the current line to the IEx process."
-  (interactive)
-  (let ((str (thing-at-point 'line)))
-    (alchemist-iex--send-command (alchemist-iex-process) str)))
-
-(defun alchemist-iex-send-current-line-and-go ()
-  "Sends the current line to the inferior IEx process
-and jump to the buffer."
-  (interactive)
-  (call-interactively 'alchemist-iex-send-current-line)
-  (pop-to-buffer (process-buffer (alchemist-iex-process))))
-
-(defun alchemist-iex-send-region-and-go ()
-  "Sends the marked region to the inferior IEx process
-and jump to the buffer."
-  (interactive)
-  (call-interactively 'alchemist-iex-send-region)
-  (pop-to-buffer (process-buffer (alchemist-iex-process))))
-
-(defun alchemist-iex-send-region (beg end)
-  "Sends the marked region to the IEx process."
-  (interactive (list (point) (mark)))
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let* ((region (buffer-substring-no-properties beg end)))
-    (alchemist-iex--send-command (alchemist-iex-process) region)))
-
-(defun alchemist-iex-compile-this-buffer ()
-  "Compiles the current buffer in the IEx process."
-  (interactive)
-  (let ((str (format "c(\"%s\")" (buffer-file-name))))
-    (alchemist-iex--send-command (alchemist-iex-process) str)))
-
-(defun alchemist-iex-recompile-this-buffer ()
-  "Recompiles and reloads the current buffer in the IEx process."
-  (interactive)
-  (let ((str (format "r(\"%s\")" (buffer-file-name))))
-    (alchemist-iex--send-command (alchemist-iex-process) str)))
-
-(defun alchemist-iex--send-command (proc str)
-  (let ((str-no-newline (concat (alchemist-iex--remove-newlines str) "\n"))
-        (str (concat str "\n")))
-    (with-current-buffer (process-buffer proc)
-      (goto-char (process-mark proc))
-      (insert-before-markers str)
-      (move-marker comint-last-input-end (point))
-      (comint-send-string proc str-no-newline))))
-
-(defun alchemist-iex-clear-buffer ()
-  "Clear the current iex process buffer."
-  (interactive)
-  (let ((comint-buffer-maximum-size 0))
-    (comint-truncate-buffer)))
-
-(defun alchemist-iex-open-input-ring ()
-    "Open the buffer containing the input history."
-    (interactive)
-    (progn
-      (comint-dynamic-list-input-ring)
-      (other-window 1)))
-
-;;;###autoload
-(defalias 'run-elixir 'alchemist-iex-run)
-(defalias 'inferior-elixir 'alchemist-iex-run)
-
-;;;###autoload
-(defun alchemist-iex-run (&optional arg)
-  "Start an IEx process.
-Show the IEx buffer if an IEx process is already run."
-  (interactive "P")
-  (let ((proc (alchemist-iex-process arg)))
-    (pop-to-buffer (process-buffer proc))))
-
-;;;###autoload
-(defun alchemist-iex-project-run ()
-  "Start an IEx process with mix 'iex -S mix' in the
-context of an Elixir project.
-Show the IEx buffer if an IEx process is already run."
-  (interactive)
-  (let ((old-directory default-directory))
-  (if (alchemist-project-p)
-      (progn
-        (alchemist-project--establish-root-directory)
-        (let ((proc (alchemist-iex-process " -S mix")))
-          (cd old-directory)
-          (pop-to-buffer (process-buffer proc))))
-    (message "No mix.exs file available. Please use `alchemist-iex-run' instead."))))
-
-(provide 'alchemist-iex)
-
-;;; alchemist-iex.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-mix.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-mix.el
deleted file mode 100644
index 7375c82..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-mix.el
+++ /dev/null
@@ -1,217 +0,0 @@
-;;; alchemist-mix.el --- Emacs integration for Elixir's mix
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Emacs integration for Elixir's mix
-
-;;; Code:
-
-(defgroup alchemist-mix nil
-  "Emacs integration for Elixir's mix."
-  :prefix "alchemist-mix-"
-  :group 'alchemist)
-
-;; Variables
-
-(defcustom alchemist-mix-command "mix"
-  "The shell command for mix."
-  :type 'string
-  :group 'alchemist-mix)
-
-(defcustom alchemist-mix-test-default-options '("--exclude pending:true")
-  "Default options for alchemist test command."
-  :type '(repeat string)
-  :group 'alchemist-mix)
-
-(defcustom alchemist-mix-env nil
-  "The default mix env to run mix commands with.  If nil, the mix env is
-not set explicitly."
-  :type '(string boolean)
-  :group 'alchemist-mix)
-
-(defvar alchemist-mix-buffer-name "*mix*"
-  "Name of the mix output buffer.")
-
-(defvar alchemist-mix--envs '("dev" "prod" "test")
-  "The list of mix envs to use as defaults.")
-
-(defvar alchemist-mix--deps-commands
-  '("deps" "deps.clean" "deps.compile" "deps.get" "deps.unlock" "deps.unlock")
-  "List of all deps.* available commands.")
-
-(defvar alchemist-mix--local-commands
-  '("local" "local.install" "local.rebar" "local.uninstall")
-  "List of all local.* available commands.")
-
-(defvar alchemist-mix--local-install-option-types '("path" "url")
-  "List of local.install option types.")
-
-;; Private functions
-
-(defun alchemist-mix--completing-read (prompt cmdlist)
-  (completing-read prompt cmdlist nil t nil nil (car cmdlist)))
-
-(defun alchemist-mix--test-file (filename)
-  "Run a specific FILENAME as argument for the mix command test."
-  (when (not (file-exists-p filename))
-    (error "The given file doesn't exists"))
-  (alchemist-mix-execute `("test" ,(expand-file-name filename) ,@alchemist-mix-test-default-options)
-                         alchemist-test-mode-buffer-name))
-
-(defun alchemist-mix--commands ()
-  (let ((mix-cmd-list (shell-command-to-string (format "%s help" alchemist-mix-command))))
-    (mapcar (lambda (s)
-              (cdr (split-string (car (split-string s "#")))))
-            (cdr (split-string mix-cmd-list "\n")))))
-
-;; Public functions
-
-(defun alchemist-mix-display-mix-buffer ()
-  "Display the mix buffer when exists."
-  (interactive)
-  (when (get-buffer alchemist-mix-buffer-name)
-    (display-buffer alchemist-mix-buffer-name)))
-
-(defun alchemist-mix-new (name)
-  "Create a new elixir project named by NAME."
-  (interactive "Gmix new: ")
-  (alchemist-mix-execute (list "new" (expand-file-name name))
-                         alchemist-mix-buffer-name))
-
-(defun alchemist-mix-test ()
-  "Run the whole elixir test suite."
-  (interactive)
-  (alchemist-mix-execute `("test" ,@alchemist-mix-test-default-options)
-                         alchemist-test-mode-buffer-name))
-
-(defun alchemist-mix-test-this-buffer ()
-  "Run the current buffer through mix test."
-  (interactive)
-  (alchemist-mix--test-file buffer-file-name))
-
-(defun alchemist-mix-test-file (filename)
-  "Run `alchemist-mix--test-file' with the FILENAME."
-  (interactive "Fmix test: ")
-  (alchemist-mix--test-file (expand-file-name filename)))
-
-(defun alchemist-mix-test-at-point ()
-  "Run the test at point."
-  (interactive)
-  (let* ((line (line-number-at-pos (point)))
-         (file-and-line (format "%s:%s" buffer-file-name line)))
-    (alchemist-mix-execute (list "test" file-and-line)
-                           alchemist-test-mode-buffer-name)))
-
-(defun alchemist-mix-compile (command &optional prefix)
-  "Compile the whole elixir project. Prompt for the mix env if the prefix
-arg is set."
-  (interactive "Mmix compile: \nP")
-  (alchemist-mix-execute (list "compile" command)
-                         alchemist-mix-buffer-name prefix))
-
-(defun alchemist-mix-run (command &optional prefix)
-  "Runs the given file or expression in the context of the application.
-Prompt for the mix env if the prefix arg is set."
-  (interactive "Mmix run: \nP")
-  (alchemist-mix-execute (list "run" command)
-                         alchemist-mix-buffer-name prefix))
-
-(defun alchemist-mix-deps-with-prompt (command &optional prefix)
-  "Prompt for mix deps commands."
-  (interactive
-   (list (alchemist-mix--completing-read "mix deps: " alchemist-mix--deps-commands)
-         current-prefix-arg))
-  (alchemist-mix-execute (list command)
-                         alchemist-mix-buffer-name prefix))
-
-(defun alchemist-mix (command &optional prefix)
-  "Prompt for mix commands. Prompt for the mix env if the prefix arg is set."
-  (interactive
-   (list (alchemist-mix--completing-read "mix: " (alchemist-mix--commands))
-         current-prefix-arg))
-  (let ((command (read-string "mix " (concat command " "))))
-    (alchemist-mix-execute (list command)
-                           alchemist-mix-buffer-name prefix)))
-
-(defun alchemist-mix-local-with-prompt (command)
-  "Prompt for mix local commands."
-  (interactive
-   (list (alchemist-mix--completing-read "mix local: " alchemist-mix--local-commands)))
-  (if (string= command "local.install")
-      (call-interactively 'alchemist-mix-local-install)
-    (alchemist-mix-execute (list command)
-                           alchemist-mix-buffer-name)))
-
-(defun alchemist-mix-local-install (path-or-url)
-  "Prompt for mix local.install PATH-OR-URL."
-  (interactive
-   (list (completing-read "mix local.install FORMAT: "
-                          alchemist-mix--local-install-option-types
-                          nil t nil nil (car alchemist-mix--local-install-option-types))))
-  (if (string= path-or-url (car alchemist-mix--local-install-option-types))
-      (call-interactively 'alchemist-mix-local-install-with-path)
-    (call-interactively 'alchemist-mix-local-install-with-url)))
-
-(defun alchemist-mix-local-install-with-path (path)
-  "Runs local.install and prompt for a PATH as argument."
-  (interactive "fmix local.install PATH: ")
-  (alchemist-mix-execute (list "local.install" path)
-                         alchemist-mix-buffer-name))
-
-(defun alchemist-mix-local-install-with-url (url)
-  "Runs local.install and prompt for a URL as argument."
-  (interactive "Mmix local.install URL: ")
-  (alchemist-mix-execute (list "local.install" url)
-                         alchemist-mix-buffer-name))
-
-(defun alchemist-mix-hex-search (command &optional prefix)
-  "Display packages matching the given search query. Prompt for the mix env
-if the prefix arg is set."
-  (interactive "Mmix hex.search: \nP")
-  (alchemist-mix-execute (list "hex.search" command)
-                         alchemist-mix-buffer-name prefix))
-
-(defun alchemist-mix-help (command &optional prefix)
-  "Show help output for a specific mix command. Prompt for the mix env if
-the prefix arg is set."
-  (interactive "Mmix help: \nP")
-  (alchemist-mix-execute (list "help" command)
-                         alchemist-mix-buffer-name prefix))
-
-(defun alchemist-mix-execute (cmdlist buffer-name &optional prefix)
-  "Run a mix command. Prompt for the mix env if the prefix arg is set."
-  (interactive "Mmix: \nP")
-  (let ((old-directory default-directory)
-        (mix-env (if prefix
-                     (completing-read "mix env: "
-                                      alchemist-mix--envs nil nil alchemist-mix-env)
-                   alchemist-mix-env)))
-    (alchemist-project--establish-root-directory)
-    (alchemist-buffer-run (alchemist-utils--build-runner-cmdlist
-                           (list (if mix-env (concat "MIX_ENV=" mix-env) "")
-                                 alchemist-mix-command cmdlist))
-                          buffer-name)
-    (cd old-directory)))
-
-(provide 'alchemist-mix)
-
-;;; alchemist-mix.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-pkg.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-pkg.el
deleted file mode 100644
index 4cee708..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-pkg.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(define-package "alchemist" "20150624.159" "Elixir tooling integration into Emacs"
-  '((emacs "24"))
-  :url "http://www.github.com/tonini/alchemist.el" :keywords
-  '("languages" "mix" "elixir" "elixirc" "hex"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-project.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-project.el
deleted file mode 100644
index b643ff0..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-project.el
+++ /dev/null
@@ -1,163 +0,0 @@
-;;; alchemist-project.el --- API to identify Elixir mix projects.
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; API to identify Elixir mix projects.
-
-;;; Code:
-
-(require 'cl)
-
-(defgroup alchemist-project nil
-  "API to identify Elixir mix projects."
-  :prefix "alchemist-help-"
-  :group 'alchemist)
-
-(defvar alchemist-project-root-indicators
-  '("mix.exs")
-  "list of file-/directory-names which indicate a root of a elixir project")
-
-(defvar alchemist-project-deps-indicators
-  '(".hex")
-  "list of file-/directory-names which indicate a root of a elixir project")
-
-(defun alchemist-project-p ()
-  "Returns whether alchemist has access to a elixir project root or not"
-  (stringp (alchemist-project-root)))
-
-(defun alchemist-project-parent-directory (a-directory)
-  "Returns the directory of which a-directory is a child"
-  (file-name-directory (directory-file-name a-directory)))
-
-(defun alchemist-project-root-directory-p (a-directory)
-  "Returns t if a-directory is the root"
-  (equal a-directory (alchemist-project-parent-directory a-directory)))
-
-(defun alchemist-project-root (&optional directory)
-  "Finds the root directory of the project by walking the directory tree until it finds a project root indicator."
-  (let* ((directory (file-name-as-directory (or directory (expand-file-name default-directory))))
-         (present-files (directory-files directory)))
-    (cond ((alchemist-project-root-directory-p directory) nil)
-          ((> (length (intersection present-files alchemist-project-deps-indicators :test 'string=)) 0)
-           (alchemist-project-root (file-name-directory (directory-file-name directory))))
-          ((> (length (intersection present-files alchemist-project-root-indicators :test 'string=)) 0) directory)
-          (t (alchemist-project-root (file-name-directory (directory-file-name directory)))))))
-
-(defun alchemist-project--establish-root-directory ()
-  "Set the default-directory to the Elixir project root."
-  (let ((project-root (alchemist-project-root)))
-    (when project-root
-      (setq default-directory project-root))))
-
-(defun alchemist-project-toggle-file-and-tests-other-window ()
-  "Toggle between a file and its tests in other window."
-  (interactive)
-  (if (alchemist-utils--is-test-file-p)
-      (alchemist--project-open-file-for-current-tests 'find-file-other-window)
-    (alchemist--project-open-tests-for-current-file 'find-file-other-window)))
-
-(defun alchemist-project-toggle-file-and-tests ()
-  "Toggle between a file and its tests in the current window."
-  (interactive)
-  (if (alchemist-utils--is-test-file-p)
-      (alchemist--project-open-file-for-current-tests 'find-file)
-    (alchemist--project-open-tests-for-current-file 'find-file)))
-
-(defun alchemist--project-open-file-for-current-tests (toggler)
-  "Open the appropriate implementation file for the current buffer by calling TOGGLER with filename."
-  (let* ((filename (file-relative-name (buffer-file-name) (alchemist-project-root)))
-         (filename (replace-regexp-in-string "^test/" "lib/" filename))
-         (filename (replace-regexp-in-string "_test\.exs$" "\.ex" filename))
-         (filename (format "%s/%s" (alchemist-project-root) filename)))
-    (funcall toggler filename)))
-
-(defun alchemist--project-open-tests-for-current-file (toggler)
-  "Opens the appropriate test file by calling TOGGLER with filename."
-  (let* ((filename (file-relative-name (buffer-file-name) (alchemist-project-root)))
-         (filename (replace-regexp-in-string "^lib/" "test/" filename))
-         (filename (replace-regexp-in-string "\.ex$" "_test\.exs" filename))
-         (filename (format "%s/%s" (alchemist-project-root) filename)))
-    (if (file-exists-p filename)
-        (funcall toggler filename)
-      (if (y-or-n-p "No test file found; create one now?")
-          (alchemist-project--create-test-for-current-file
-           filename (current-buffer))
-        (message "No test file found.")))))
-
-(defun alchemist-project--create-test-for-current-file (filename buffer)
-  "Creates and populates a test module, FILENAME, for the code in BUFFER.
-The module name given to the test module is determined from the name of the
-first module defined in BUFFER."
-  (let* ((directory-name (file-name-directory filename))
-         (module-name (alchemist-project--grok-module-name buffer))
-         (test-module-name (concat module-name "Test")))
-    (unless (file-exists-p directory-name)
-      (make-directory (file-name-directory filename) t))
-    (alchemist-project--insert-test-boilerplate
-     (find-file-other-window filename) test-module-name)))
-
-(defun alchemist-project--grok-module-name (buffer)
-  "Determines the name of the first module defined in BUFFER."
-  (save-excursion
-    (set-buffer buffer)
-    (goto-line 1)
-    (re-search-forward "defmodule\\s-\\(.+?\\)\\s-?,?\\s-do")
-    (match-string 1)))
-
-(defun alchemist-project--insert-test-boilerplate (buffer module)
-  "Inserts ExUnit boilerplate for MODULE in BUFFER.
-Point is left in a convenient location."
-  (set-buffer buffer)
-  (insert (concat "defmodule " module " do\n"
-                  "  use ExUnit.Case\n"
-                  "\n"
-                  "end\n"))
-  (goto-char (point-min))
-  (beginning-of-line 3))
-
-(defun alchemist-project-find-test ()
-  "Open project test directory and list all test files."
-  (interactive)
-  (when (alchemist-project-p)
-    (find-file (alchemist-project--open-directory-files "test"))))
-
-(defun alchemist-project--open-directory-files (directory)
-  (let ((directory (concat (replace-regexp-in-string "\/?$" "" (concat (alchemist-project-root) directory) "/"))))
-    (message directory)
-    (concat directory "/" (completing-read (concat directory ": ")
-                                           (mapcar (lambda (path)
-                                                     (replace-regexp-in-string (concat "^" (regexp-quote directory) "/") "" path))
-                                                   (split-string
-                                                    (shell-command-to-string
-                                                     (concat
-                                                      "find \"" directory
-                                                      "\" -type f | grep \"_test\.exs\" | grep -v \"/.git/\""))))))))
-
-(defun alchemist-project-name ()
-  "Return the name of the current Elixir project."
-  (if (alchemist-project-p)
-      (car (cdr (reverse (split-string (alchemist-project-root) "/"))))
-    ""))
-
-(provide 'alchemist-project)
-
-;;; alchemist-project.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-server.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-server.el
deleted file mode 100644
index 7753e22..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-server.el
+++ /dev/null
@@ -1,308 +0,0 @@
-;;; alchemist-server.el --- -*- lexical-binding: t -*-
-
-;; Copyright © 2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(defvar alchemist-server
-  (concat (file-name-directory load-file-name) "server/server.exs")
-  "Script file with alchemist server.")
-
-(defvar alchemist-server--processes '())
-(defvar alchemist-server--env "dev")
-
-(defvar alchemist-server-command
-  (format "elixir %s %s" alchemist-server alchemist-server--env))
-
-(defun alchemist-server-start (env)
-  "Start alchemist server for the current mix project in specific ENV."
-  (interactive (list
-                (completing-read (format "(Alchemist-Server) run in environment: (default: %s) " alchemist-server--env)
-                                 alchemist-mix--envs nil nil nil)))
-  (when (alchemist-server--process-p)
-    (kill-process (alchemist-server--process)))
-  (alchemist-server--start-with-env env))
-
-(defun alchemist-server--start ()
-  (unless (alchemist-server--process-p)
-    (alchemist-server--start-with-env alchemist-server--env)))
-
-(defun alchemist-server--start-with-env (env)
-  (let* ((process-name (alchemist-server--process-name))
-         (default-directory (if (string= process-name "alchemist-server")
-                                default-directory
-                              process-name))
-         (server-command (format "elixir %s %s" alchemist-server env))
-         (process (start-process-shell-command process-name "*alchemist-server*" server-command)))
-    (set-process-query-on-exit-flag process nil)
-    (alchemist-server--store-process process)))
-
-(defun alchemist-server--store-process (process)
-  (let ((process-name (alchemist-server--process-name)))
-    (if (cdr (assoc process-name alchemist-server--processes))
-        (setq alchemist-server--processes
-              (delq (assoc process-name alchemist-server--processes) alchemist-server--processes)))
-    (add-to-list 'alchemist-server--processes (cons process-name process))))
-
-(defun alchemist-server--process-p ()
-  (process-live-p (alchemist-server--process)))
-
-(defun alchemist-server--process ()
-  (cdr (assoc (alchemist-server--process-name) alchemist-server--processes)))
-
-(defun alchemist-server--process-name ()
-  (let* ((process-name (alchemist-project-root))
-         (process-name (if process-name
-                           process-name
-                         "alchemist-server")))
-    process-name))
-
-(defun alchemist-server-eval-filter (process output)
-  (setq alchemist-server--output (cons output alchemist-server--output))
-  (if (string-match "END-OF-EVAL$" output)
-      (let* ((output (apply #'concat (reverse alchemist-server--output)))
-             (output (replace-regexp-in-string "END-OF-EVAL" "" output))
-             (output (replace-regexp-in-string "\n$" "" output)))
-        (funcall alchemist-server-eval-callback output))))
-
-(defun alchemist-server-eval-quoted-filter (process output)
-  (setq alchemist-server--output (cons output alchemist-server--output))
-  (if (string-match "END-OF-QUOTE$" output)
-      (let* ((output (apply #'concat (reverse alchemist-server--output)))
-             (output (replace-regexp-in-string "END-OF-QUOTE" "" output))
-             (output (replace-regexp-in-string "\n$" "" output)))
-        (funcall alchemist-server-eval-callback output))))
-
-(defun alchemist-server-doc-filter (process output)
-  (setq alchemist-server--output (cons output alchemist-server--output))
-  (if (string-match "END-OF-DOC$" output)
-      (let* ((string (apply #'concat (reverse alchemist-server--output)))
-             (string (replace-regexp-in-string "END-OF-DOC$" "" string)))
-        (alchemist-help--initialize-buffer string))))
-
-(defun alchemist-server-complete-canidates-filter (process output)
-  (setq alchemist-server--output (cons output alchemist-server--output))
-  (unless (alchemist-utils--empty-string-p output)
-    (if (string-match "END-OF-COMPLETE$" output)
-        (let* ((string (apply #'concat (reverse alchemist-server--output)))
-               (string (replace-regexp-in-string "END-OF-COMPLETE$" "" string))
-               (candidates (if (not (alchemist-utils--empty-string-p string))
-                               (alchemist-complete--output-to-list
-                                (alchemist--utils-clear-ansi-sequences string))
-                             '()))
-               (candidates (if candidates
-                               (remove-duplicates candidates)
-                             '()))
-               (candidates (if candidates
-                               (alchemist-complete--build-candidates candidates)
-                             '())))
-          (alchemist-complete--serve-candidates-to-company candidates)))))
-
-(defun alchemist-server-complete-canidates-filter-with-context (process output)
-  (setq alchemist-server--output (cons output alchemist-server--output))
-  (if (string-match "END-OF-COMPLETE-WITH-CONTEXT$" output)
-      (let* ((string (apply #'concat (reverse alchemist-server--output)))
-             (string (replace-regexp-in-string "END-OF-COMPLETE-WITH-CONTEXT$" "" string))
-             (candidates (if (not (alchemist-utils--empty-string-p string))
-                             (alchemist-complete--output-to-list
-                              (alchemist--utils-clear-ansi-sequences string))
-                           '()))
-             (candidates (if candidates
-                             (remove-duplicates candidates)
-                           '()))
-             (candidates (if candidates
-                             (alchemist-complete--build-candidates candidates)
-                           '())))
-        (alchemist-complete--serve-candidates-to-company candidates))))
-
-(defun alchemist-server-complete-filter (process output)
-  (with-local-quit
-    (setq alchemist-server--output (cons output alchemist-server--output))
-    (if (string-match "END-OF-COMPLETE$" output)
-        (let* ((string (apply #'concat (reverse alchemist-server--output)))
-               (string (replace-regexp-in-string "END-OF-COMPLETE$" "" string))
-               (candidates (alchemist-complete--output-to-list
-                            (alchemist--utils-clear-ansi-sequences string))))
-          (funcall alchemist-server-help-callback candidates)))))
-
-(defun alchemist-server-help-complete-modules-filter (process output)
-  (with-local-quit
-    (setq alchemist-server--output (cons output alchemist-server--output))
-    (if (string-match "END-OF-MODULES$" output)
-        (let* ((output (apply #'concat (reverse alchemist-server--output)))
-               (modules (alchemist-help--elixir-modules-to-list output))
-               (search (completing-read
-                        "Elixir help: "
-                        modules
-                        nil
-                        nil
-                        nil)))
-          (alchemist-help--execute (if (string-match-p "\\.$" search)
-                                       search
-                                     (concat search ".")))))))
-
-(defun alchemist-server-goto-filter (process output)
-  (setq alchemist-server--output (cons output alchemist-server--output))
-  (if (string-match "END-OF-SOURCE$" output)
-      (let* ((output (apply #'concat (reverse alchemist-server--output)))
-             (output (replace-regexp-in-string "END-OF-SOURCE" "" output))
-             (output (replace-regexp-in-string "\n" "" output))
-             (file (replace-regexp-in-string "source-file-path:" "" output)))
-        (funcall alchemist-server-goto-callback file))))
-
-(defun alchemist-server-goto (module function expr)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server-goto-callback (lambda (file)
-                                         (cond ((alchemist-utils--empty-string-p file)
-                                                (message "Don't know how to find: %s" expr))
-                                               ((file-exists-p file)
-                                                (alchemist-goto--open-file file module function))
-                                               ((alchemist-goto--elixir-file-p file)
-                                                (let* ((elixir-source-file (alchemist-goto--build-elixir-ex-core-file file)))
-                                                  (if (file-exists-p elixir-source-file)
-                                                      (alchemist-goto--open-file elixir-source-file module function)
-                                                    (message "Don't know how to find: %s" expr))))
-                                               ((alchemist-goto--erlang-file-p file)
-                                                (let* ((elixir-source-file (alchemist-goto--build-elixir-erl-core-file file))
-                                                       (erlang-source-file (alchemist-goto--build-erlang-core-file file)))
-                                                  (cond ((file-exists-p elixir-source-file)
-                                                         (alchemist-goto--open-file elixir-source-file module function))
-                                                        ((file-exists-p erlang-source-file)
-                                                         (alchemist-goto--open-file erlang-source-file module function))
-                                                        (t
-                                                         (message "Don't know how to find: %s" expr)))))
-                                               (t
-                                                (pop-tag-mark)
-                                                (message "Don't know how to find: %s" expr)))))
-  (set-process-filter (alchemist-server--process) #'alchemist-server-goto-filter)
-  (process-send-string (alchemist-server--process) (format "SOURCE %s,%s\n" module function)))
-
-(defun alchemist-server-help ()
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (set-process-filter (alchemist-server--process) #'alchemist-server-help-complete-modules-filter)
-  (process-send-string (alchemist-server--process) "MODULES\n"))
-
-(defun alchemist-server-eval (exp)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server-eval-callback (lambda (string)
-                                         (message "%s" string)))
-  (set-process-filter (alchemist-server--process) #'alchemist-server-eval-filter)
-  (process-send-string (alchemist-server--process) (format "EVAL %s\n" exp)))
-
-(defun alchemist-server-eval-and-insert (exp)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server-eval-callback (lambda (string)
-                                         (alchemist-eval--insert string)))
-  (set-process-filter (alchemist-server--process) #'alchemist-server-eval-filter)
-  (process-send-string (alchemist-server--process) (format "EVAL %s\n" exp)))
-
-(defun alchemist-server-eval-quote (exp)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server-eval-callback (lambda (string)
-                                         (message "%s" string)))
-  (set-process-filter (alchemist-server--process) #'alchemist-server-eval-quoted-filter)
-  (process-send-string (alchemist-server--process) (format "QUOTE %s\n" exp)))
-
-(defun alchemist-server-eval-quote-and-insert (exp)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server-eval-callback (lambda (string)
-                                         (alchemist-eval--insert string)))
-  (set-process-filter (alchemist-server--process) #'alchemist-server-eval-quoted-filter)
-  (process-send-string (alchemist-server--process) (format "QUOTE %s\n" exp)))
-
-(defun alchemist-server-complete-candidates (exp)
-  (setq alchemist-server--output nil)
-  (setq alchemist-server--last-completion-exp exp)
-  (alchemist-server--start)
-  (if (or (equal major-mode 'alchemist-iex-mode)
-          (not (alchemist-goto--context-exists-p)))
-      (alchemist-server--iex-complete exp)
-    (alchemist-server--complete-with-context exp)))
-
-(defun alchemist-server--complete-with-context (exp)
-  (let* ((module (alchemist-goto--current-module-name))
-         (modules '())
-         (aliases (mapcar (lambda (a)
-                            (if (not (or (alchemist-utils--empty-string-p (replace-regexp-in-string "\\.$" "" (car (cdr a))))
-                                         (string= (replace-regexp-in-string "\\.$" "" (car (cdr a)))
-                                                  (replace-regexp-in-string "\\.$" "" (car a)))))
-                                (format "{%s, %s}"
-                                        (if (alchemist-utils--empty-string-p (replace-regexp-in-string "\\.$" "" (car (cdr a))))
-                                            (replace-regexp-in-string "\\.$" "" (car a))
-                                          (replace-regexp-in-string "\\.$" "" (car (cdr a))))
-                                        (replace-regexp-in-string "\\.$" "" (car a))
-                                        ))) (alchemist-goto--alises-of-current-buffer)))
-         (use-modules (alchemist-goto--use-modules-in-the-current-module-context))
-         (import-modules (alchemist-goto--import-modules-in-the-current-module-context)))
-    (if (not (alchemist-utils--empty-string-p module))
-        (push module modules))
-    (push use-modules modules)
-    (push import-modules modules)
-    (if (not modules)
-        (progn
-          (set-process-filter (alchemist-server--process) #'alchemist-server-complete-canidates-filter)
-          (process-send-string (alchemist-server--process) (format "COMPLETE %s\n" exp)))
-      (progn
-        (set-process-filter (alchemist-server--process) #'alchemist-server-complete-canidates-filter-with-context)
-        (process-send-string (alchemist-server--process) (format "COMPLETE-WITH-CONTEXT %s;[%s];%s\n"
-                                                                 exp
-                                                                 (mapconcat #'identity (alchemist-utils--flatten modules) ",")
-                                                                 (format "[%s]" (if (mapconcat #'identity aliases ",")
-                                                                                    (mapconcat #'identity aliases ",")
-                                                                                  ""))))))))
-
-(defun alchemist-server--iex-complete (exp)
-  (set-process-filter (alchemist-server--process) #'alchemist-server-complete-canidates-filter)
-  (process-send-string (alchemist-server--process) (format "COMPLETE %s\n" exp)))
-
-(defun alchemist-server-help-with-complete (search)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server-help-callback (lambda (candidates)
-                                         (if candidates
-                                             (let* ((search (alchemist-complete--completing-prompt search candidates)))
-                                               (alchemist-server-help-without-complete search))
-                                           (message "No documentation found for '%s'" search))
-                                         ))
-  (set-process-filter (alchemist-server--process) #'alchemist-server-complete-filter)
-  (process-send-string (alchemist-server--process) (format "COMPLETE %s\n" search)))
-
-(defun alchemist-server-help-without-complete (search)
-  (setq alchemist-help-current-search-text search)
-  (setq alchemist-server--output nil)
-  (alchemist-server--start)
-  (setq alchemist-server--output nil)
-  (set-process-filter (alchemist-server--process) #'alchemist-server-doc-filter)
-  (process-send-string (alchemist-server--process) (format "DOC %s\n" search)))
-
-
-(provide 'alchemist-server)
-
-;;; alchemist-server.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-test-mode.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-test-mode.el
deleted file mode 100644
index 0b04d18..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-test-mode.el
+++ /dev/null
@@ -1,169 +0,0 @@
-;;; alchemist-test-mode.el --- Minor mode for Elixir test files.
-
-;; Copyright © 2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Minor mode for Elixir test files.
-
-;;; Code:
-
-(defgroup alchemist-test-mode nil
-  "Minor mode for Elixir ExUnit files."
-  :prefix "alchemist-test-mode-"
-  :group 'alchemist)
-
-;; Variables
-
-(defvar alchemist-test-mode-buffer-name "*alchemist-test-report*"
-  "Name of the test report buffer.")
-
-(defcustom alchemist-test-mode-highlight-tests t
-  "Non-nil means that specific functions for testing will
-be highlighted with more significant font faces."
-  :type 'boolean
-  :group 'alchemist-test-mode)
-
-(defvar alchemist-test-at-point #'alchemist-mix-test-at-point)
-(defvar alchemist-test-this-buffer #'alchemist-mix-test-this-buffer)
-(defvar alchemist-test #'alchemist-mix-test)
-(defvar alchemist-test-file #'alchemist-mix-test-file)
-(defvar alchemist-test-jump-to-previous-test #'alchemist-test-mode-jump-to-previous-test)
-(defvar alchemist-test-jump-to-next-test #'alchemist-test-mode-jump-to-next-test)
-(defvar alchemist-test-list-tests #'alchemist-test-mode-list-tests)
-
-(defvar alchemist-test-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c , s") alchemist-test-at-point)
-    (define-key map (kbd "C-c , v") alchemist-test-this-buffer)
-    (define-key map (kbd "C-c , a") alchemist-test)
-    (define-key map (kbd "C-c , f") alchemist-test-file)
-    (define-key map (kbd "C-c , p") alchemist-test-jump-to-previous-test)
-    (define-key map (kbd "C-c , n") alchemist-test-jump-to-next-test)
-    (define-key map (kbd "C-c , l") alchemist-test-list-tests)
-    map)
-  "Keymap for `alchemist-test-mode'.")
-
-(let ((whitespace-opt "[[:space:]]*")
-      (whitespace "[[:space:]]+"))
-  (setq alchemist-test-mode--test-regex
-        (concat
-         "\\(^" whitespace-opt "test" whitespace "\\(?10:.+\\)" whitespace "do" whitespace-opt "$"
-         "\\|"
-         whitespace " [0-9]+) test .+\\)")))
-
-;; Private functions
-
-(defun alchemist-test-mode--buffer-contains-tests-p ()
-  "Return nil if the current buffer contains no tests, non-nil if it does."
-  (save-excursion
-    (save-match-data
-      (beginning-of-buffer)
-      (re-search-forward alchemist-test-mode--test-regex nil t))))
-
-(defun alchemist-test-mode--jump-to-test (search-fn reset-fn)
-  "Move the point to the next/previous test, based on `search-fn' (which is the
-function that searches for the next test, can be re-search-forward or
-re-search-backward) and `reset-fn' (which is used when wrapping at the
-beginning/end of the buffer if no results were found)."
-  (when (alchemist-test-mode--buffer-contains-tests-p)
-    (save-match-data
-      (unless (funcall search-fn alchemist-test-mode--test-regex nil t)
-        (funcall reset-fn)
-        (funcall search-fn alchemist-test-mode--test-regex nil t))
-      (back-to-indentation))))
-
-(defun alchemist-test-mode--tests-in-buffer ()
-  "Return an alist of tests in this buffer.
-
-The keys in the list are the test names (e.g., the string passed to the test/2
-macro) while the values are the position at which the test matched."
-  (save-match-data
-    (save-excursion
-      (beginning-of-buffer)
-      (let ((tests '()))
-        (while (re-search-forward alchemist-test-mode--test-regex nil t)
-          (let* ((position (car (match-data)))
-                 (matched-string (match-string 10)))
-            (set-text-properties 0 (length matched-string) nil matched-string)
-            (add-to-list 'tests (cons matched-string position) t)))
-        tests))))
-
-;; Public functions
-
-(defun alchemist-test-mode-jump-to-next-test ()
-  "Jump to the next ExUnit test. If there are no tests after the current
-position, jump to the first test in the buffer. Do nothing if there are no tests
-in this buffer."
-  (interactive)
-  (alchemist-test-mode--jump-to-test 're-search-forward 'beginning-of-buffer))
-
-(defun alchemist-test-mode-jump-to-previous-test ()
-  "Jump to the previous ExUnit test. If there are no tests before the current
-position, jump to the last test in the buffer. Do nothing if there are no tests
-in this buffer."
-  (interactive)
-  (alchemist-test-mode--jump-to-test 're-search-backward 'end-of-buffer))
-
-(defun alchemist-test-mode-list-tests ()
-  "List ExUnit tests (calls to the test/2 macro) in the current buffer and jump
-to the selected one."
-  (interactive)
-  (let* ((tests (alchemist-test-mode--tests-in-buffer))
-         (selected (completing-read "Test: " tests))
-         (position (cdr (assoc selected tests))))
-    (goto-char position)
-    (back-to-indentation)))
-
-(defun alchemist-test-mode--highlight-syntax ()
-  (if alchemist-test-mode-highlight-tests
-      (font-lock-add-keywords nil
-                              '(("^\s+\\(test\\)\s+" 1
-                                 font-lock-variable-name-face t)
-                                ("^\s+\\(assert[_a-z]*\\|refute[_a-z]*\\)\s+" 1
-                                 font-lock-type-face t)
-                                ("^\s+\\(assert[_a-z]*\\|refute[_a-z]*\\)\(" 1
-                                 font-lock-type-face t)))))
-
-
-;;;###autoload
-(define-minor-mode alchemist-test-mode
-  "Minor mode for Elixir ExUnit files.
-
-The following commands are available:
-
-\\{alchemist-test-mode-map}"
-  :lighter "" :keymap alchemist-test-mode-map
-  :group 'alchemist
-  (when alchemist-test-mode
-    (alchemist-test-mode--highlight-syntax)))
-
-;;;###autoload
-(defun alchemist-test-enable-mode ()
-  (if (alchemist-utils--is-test-file-p)
-      (alchemist-test-mode)))
-
-;;;###autoload
-(dolist (hook '(alchemist-mode-hook))
-  (add-hook hook 'alchemist-test-enable-mode))
-
-(provide 'alchemist-test-mode)
-
-;;; alchemist-test-mode.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-utils.el b/emacs.d/elpa/alchemist-20150624.159/alchemist-utils.el
deleted file mode 100644
index f45cebc..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist-utils.el
+++ /dev/null
@@ -1,94 +0,0 @@
-;;; alchemist-utils.el ---
-
-;; Copyright © 2014-2015 Samuel Tonini
-
-;; Author: Samuel Tonini <tonini.samuel@gmail.com
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'ansi-color)
-
-(defvar alchemist-utils--elixir-project-root-indicator
-  "mix.exs"
-  "The file which indicate an elixir project root.")
-
-(defun alchemist-utils--elixir-project-root ()
-  "Finds the root directory of the project.
-It walks the directory tree until it finds a elixir project root indicator."
-  (let* ((file (file-name-as-directory (expand-file-name default-directory))))
-    (locate-dominating-file file alchemist-utils--elixir-project-root-indicator)))
-
-(defun alchemist-utils--flatten (alist)
-  (cond ((null alist) nil)
-        ((atom alist) (list alist))
-        (t (append (alchemist-utils--flatten (car alist))
-                   (alchemist-utils--flatten (cdr alist))))))
-
-(defun alchemist-utils--build-runner-cmdlist (command)
-  "Build the commands list for the runner."
-  (remove "" (alchemist-utils--flatten
-              (list (if (stringp command)
-                        (split-string command)
-                      command)))))
-
-(defun alchemist-utils--clear-search-text (search-text)
-  (let* ((search-text (replace-regexp-in-string  "\\.$" "" search-text))
-         (search-text (replace-regexp-in-string  "^\\.$" "" search-text))
-         (search-text (replace-regexp-in-string  ",$" "" search-text))
-         (search-text (replace-regexp-in-string  "^,$" "" search-text)))
-    search-text))
-
-(defun alchemist-utils--erase-buffer (buffer)
-  "Use `erase-buffer' inside BUFFER."
-  (with-current-buffer buffer
-    (erase-buffer)))
-
-(defun alchemist-utils--get-buffer-content (buffer)
-  "Return the content of BUFFER."
-  (with-current-buffer buffer
-    (buffer-substring (point-min) (point-max))))
-
-(defun alchemist--utils-clear-ansi-sequences (string)
-  "Clear STRING from all ansi escape sequences."
-  (ansi-color-filter-apply string))
-
-(defun alchemist-utils--remove-newline-at-end (string)
-  (replace-regexp-in-string "\n$" "" string))
-
-(defun alchemist-utils--count-char-in-str (regexp str)
-  (loop with start = 0
-        for count from 0
-        while (string-match regexp str start)
-        do (setq start (match-end 0))
-        finally return count))
-
-(defun alchemist-utils--is-test-file-p ()
-  "Check wether the visited file is a test file."
-  (string-match "_test\.exs$" (or (buffer-file-name) "")))
-
-(defun alchemist-utils--empty-string-p (string)
-  (or (null string)
-      (let* ((string (replace-regexp-in-string "^\s+" "" string ))
-             (string (replace-regexp-in-string "\s+$" "" string)))
-        (string= string ""))))
-
-(provide 'alchemist-utils)
-
-;;; alchemist-utils.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist.el b/emacs.d/elpa/alchemist-20150624.159/alchemist.el
deleted file mode 100644
index 811a4f2..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/alchemist.el
+++ /dev/null
@@ -1,224 +0,0 @@
-;;; alchemist.el --- Elixir tooling integration into Emacs
-
-;; Copyright © 2014-2015 Samuel Tonini
-;;
-;; Author: Samuel Tonini <tonini.samuel@gmail.com>
-
-;; URL: http://www.github.com/tonini/alchemist.el
-;; Version: 1.1.0
-;; Package-Requires: ((emacs "24"))
-;; Keywords: languages, mix, elixir, elixirc, hex
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Alchemist integrate Elixir's tooling into Emacs
-
-;;; Code:
-
-(require 'easymenu)
-
-(defgroup alchemist nil
-  "Elixir Tooling Integration Into Emacs."
-  :prefix "alchemist-"
-  :group 'applications
-  :link '(url-link :tag "Github" "https://github.com/tonini/alchemist.el")
-  :link '(emacs-commentary-link :tag "Commentary" "alchemist"))
-
-(defcustom alchemist-key-command-prefix
-  (kbd "C-c a")
-  "The prefix for alchemist related key commands."
-  :type 'string
-  :group 'alchemist)
-
-(require 'alchemist-utils)
-(require 'alchemist-project)
-(require 'alchemist-server)
-(require 'alchemist-buffer)
-(require 'alchemist-compile)
-(require 'alchemist-execute)
-(require 'alchemist-mix)
-(require 'alchemist-hooks)
-(require 'alchemist-help)
-(require 'alchemist-complete)
-(require 'alchemist-message)
-(require 'alchemist-iex)
-(require 'alchemist-eval)
-(require 'alchemist-goto)
-(require 'alchemist-test-mode)
-
-(eval-after-load 'company
-  '(progn
-     (require 'alchemist-company)))
-
-(defun alchemist-mode-hook ()
-  "Hook which enables `alchemist-mode'"
-  (alchemist-mode 1))
-
-(defvar alchemist--version "1.1.0")
-
-;;;###autoload
-(defun alchemist-version (&optional show-version)
-  "Display Alchemist's version."
-  (interactive)
-  (message "Alchemist %s" (replace-regexp-in-string "-cvs" "snapshot" alchemist--version)))
-
-(define-prefix-command 'alchemist-mode-keymap)
-
-;;;###autoload
-(define-minor-mode alchemist-mode
-  "Toggle alchemist mode.
-
-Key bindings:
-\\{alchemist-mode-map}"
-  nil
-  ;; The indicator for the mode line.
-  " alchemist"
-  :group 'alchemist
-  :global nil
-  :keymap `((,alchemist-key-command-prefix . alchemist-mode-keymap))
-  (cond (alchemist-mode
-         (alchemist-buffer-initialize-modeline))
-        (t
-         (alchemist-buffer-reset-modeline))))
-
-(let ((map alchemist-mode-keymap))
-  (define-key map (kbd "x") 'alchemist-mix)
-  (define-key map (kbd "t") 'alchemist-mix-test)
-  (define-key map (kbd "m c") 'alchemist-mix-compile)
-  (define-key map (kbd "m t f") 'alchemist-mix-test-file)
-  (define-key map (kbd "m t b") 'alchemist-mix-test-this-buffer)
-  (define-key map (kbd "m t .") 'alchemist-mix-test-at-point)
-  (define-key map (kbd "c c") 'alchemist-compile)
-  (define-key map (kbd "c f") 'alchemist-compile-file)
-  (define-key map (kbd "c b") 'alchemist-compile-this-buffer)
-  (define-key map (kbd "e e") 'alchemist-execute)
-  (define-key map (kbd "e f") 'alchemist-execute-file)
-  (define-key map (kbd "e b") 'alchemist-execute-this-buffer)
-  (define-key map (kbd "h h") 'alchemist-help)
-  (define-key map (kbd "h i") 'alchemist-help-history)
-  (define-key map (kbd "h e") 'alchemist-help-search-at-point)
-  (define-key map (kbd "h m") 'alchemist-help-search-marked-region)
-  (define-key map (kbd "p f") 'alchemist-project-find-test)
-  (define-key map (kbd "p s") 'alchemist-project-toggle-file-and-tests)
-  (define-key map (kbd "p o") 'alchemist-project-toggle-file-and-tests-other-window)
-  (define-key map (kbd "i i") 'alchemist-iex-run)
-  (define-key map (kbd "i p") 'alchemist-iex-project-run)
-  (define-key map (kbd "i l") 'alchemist-iex-send-current-line)
-  (define-key map (kbd "i c") 'alchemist-iex-send-current-line-and-go)
-  (define-key map (kbd "i r") 'alchemist-iex-send-region)
-  (define-key map (kbd "i m") 'alchemist-iex-send-region-and-go)
-  (define-key map (kbd "i b") 'alchemist-iex-compile-this-buffer)
-  (define-key map (kbd "v l") 'alchemist-eval-current-line)
-  (define-key map (kbd "v k") 'alchemist-eval-print-current-line)
-  (define-key map (kbd "v j") 'alchemist-eval-quoted-current-line)
-  (define-key map (kbd "v h") 'alchemist-eval-print-quoted-current-line)
-  (define-key map (kbd "v o") 'alchemist-eval-region)
-  (define-key map (kbd "v i") 'alchemist-eval-print-region)
-  (define-key map (kbd "v u") 'alchemist-eval-quoted-region)
-  (define-key map (kbd "v y") 'alchemist-eval-print-quoted-region)
-  (define-key map (kbd "v q") 'alchemist-eval-buffer)
-  (define-key map (kbd "v w") 'alchemist-eval-print-buffer)
-  (define-key map (kbd "v e") 'alchemist-eval-quoted-buffer)
-  (define-key map (kbd "v r") 'alchemist-eval-print-quoted-buffer))
-
-(define-key alchemist-mode-map (kbd "M-.") 'alchemist-goto-definition-at-point)
-(define-key alchemist-mode-map (kbd "M-,") 'alchemist-goto-jump-back)
-(define-key alchemist-mode-map (kbd "C-c , .") 'alchemist-goto-list-symbol-definitions)
-
-(easy-menu-define alchemist-mode-menu alchemist-mode-map
-  "Alchemist mode menu."
-  '("Alchemist"
-    ("Goto"
-     ["Jump to definiton at point" alchemist-goto-definition-at-point]
-     ["Jump back" alchemist-goto-jump-back])
-    ("Evaluate"
-     ["Evaluate current line" alchemist-eval-current-line]
-     ["Evaluate current line and print" alchemist-eval-print-current-line]
-     ["Evaluate quoted current line" alchemist-eval-quoted-current-line]
-     ["Evaluate quoted current line and print" alchemist-eval-print-quoted-current-line]
-     "---"
-     ["Evaluate region" alchemist-eval-region]
-     ["Evaluate region and print" alchemist-eval-print-region]
-     ["Evaluate quoted region" alchemist-eval-quoted-region]
-     ["Evaluate quoted region and print" alchemist-eval-print-quoted-region]
-     "---"
-     ["Evaluate buffer" alchemist-eval-buffer]
-     ["Evaluate buffer and print" alchemist-eval-print-buffer]
-     ["Evaluate quoted buffer" alchemist-eval-quoted-buffer]
-     ["Evaluate quoted buffer and print" alchemist-eval-print-quoted-buffer])
-    ("Compile"
-     ["Compile..." alchemist-compile]
-     ["Compile this buffer" alchemist-compile-this-buffer]
-     ["Compile file" alchemist-compile-file])
-    ("Execute"
-     ["Execute..." alchemist-compile]
-     ["Execute this buffer" alchemist-execute-this-buffer]
-     ["Execute file" alchemist-execute-file])
-    ("Mix"
-     ["Mix deps..." alchemist-mix-deps-with-prompt]
-     ["Mix compile..." alchemist-mix-compile]
-     ["Mix run..." alchemist-mix-run]
-     "---"
-     ["Mix test this buffer" alchemist-mix-test-this-buffer]
-     ["Mix test file..." alchemist-mix-test-file]
-     ["Mix test at point" alchemist-mix-test-at-point]
-     "---"
-     ["Mix..." alchemist-mix]
-     ["Mix new..." alchemist-mix-new]
-     ["Mix hex search..." alchemist-mix-hex-search]
-     "---"
-     ["Mix local..." alchemist-mix-local-with-prompt]
-     ["Mix local install..." alchemist-mix-local-install]
-     ["Mix local install (Path)..." alchemist-mix-local-install-with-path]
-     ["Mix local install (URL)..." alchemist-mix-local-install-with-url]
-     "---"
-     ["Display mix buffer" alchemist-mix-display-mix-buffer]
-     "---"
-     ["Mix help..." alchemist-mix-help])
-    ("IEx"
-     ["IEx send current line" alchemist-iex-send-current-line]
-     ["IEx send current line and go" alchemist-iex-send-current-line-and-go]
-     "---"
-     ["IEx send last region" alchemist-iex-send-last-sexp]
-     ["IEx send region" alchemist-iex-send-region]
-     ["IEx send region and go" alchemist-iex-send-region-and-go]
-     "---"
-     ["IEx compile this buffer" alchemist-iex-compile-this-buffer]
-     ["IEx recompile this buffer" alchemist-iex-recompile-this-buffer]
-     "---"
-     ["IEx run" alchemist-iex-run])
-    ("Project"
-     ["Project find all tests" alchemist-project-find-test]
-     ["Project toggle between file and test" alchemist-project-toggle-file-and-tests]
-     ["Project toggle between file and test in other window" alchemist-project-toggle-file-and-tests-other-window]
-     "---"
-     ["Project toggle compile when needed" alchemist-project-toggle-compile-when-needed
-      :style toggle :selected alchemist-project-compile-when-needed])
-    ("Documentation"
-     ["Documentation search..." alchemist-help]
-     ["Documentation search history..." alchemist-help-history]
-     "---"
-     ["Documentation search at point..." alchemist-help-search-at-point]
-     ["Documentation search marked region..." alchemist-help-search-marked-region])
-    ))
-
-(add-hook 'elixir-mode-hook 'alchemist-mode-hook)
-
-(provide 'alchemist)
-
-;;; alchemist.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/server/case.exs b/emacs.d/elpa/alchemist-20150624.159/server/case.exs
deleted file mode 100644
index 3131346..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/server/case.exs
+++ /dev/null
@@ -1,96 +0,0 @@
-defmodule Alchemist.Case do
-
-  alias Alchemist.Completer
-  alias Alchemist.Utils
-  alias Alchemist.Informant
-
-  defmodule Complete do
-    def process! do
-      :ets.insert(:alchemist, {"aliases", []})
-      Completer.run('')
-      |> Enum.map &IO.puts('cmp:' ++ &1)
-      print_end_of_complete_signal
-    end
-
-    def process!(hint) do
-      :ets.insert(:alchemist, {"aliases", []})
-      Completer.run(hint)
-      |> Enum.map &IO.puts('cmp:' ++ &1)
-      print_end_of_complete_signal
-    end
-
-    defp print_end_of_complete_signal do
-      IO.puts "END-OF-COMPLETE"
-    end
-
-    def process_with_context!(hint) do
-      [hint, modules, aliases] = String.split(hint, ";", parts: 3)
-      modules = Utils.clear_context_list(modules)
-      {modules, _} = Code.eval_string(modules)
-      {aliases, _} = Code.eval_string(aliases)
-      :ets.insert(:alchemist, {"aliases", aliases})
-
-      Completer.run(hint)
-      |> Enum.map &IO.puts('cmp:' ++ &1)
-      Enum.each modules, fn(module) ->
-        Informant.get_functions(module, hint)
-        |> Enum.map &IO.puts('cmp:' ++ &1)
-      end
-      IO.puts "END-OF-COMPLETE-WITH-CONTEXT"
-    end
-  end
-
-  defmodule Modules do
-    def process! do
-      Informant.get_modules |> Enum.map &IO.puts/1
-      IO.puts "END-OF-MODULES"
-    end
-  end
-
-  defmodule Doc do
-    def process!(exp) do
-      Code.eval_string("import IEx.Helpers \nApplication.put_env(:iex, :colors, [enabled: true])\nh(#{exp})", [], __ENV__)
-      IO.puts "END-OF-DOC"
-    end
-  end
-
-  defmodule Eval do
-    def process!(file) do
-      try do
-        File.read!("#{file}")
-        |> Code.eval_string
-        |> Tuple.to_list
-        |> List.first
-        |> IO.inspect
-      rescue
-        e -> IO.inspect e
-      end
-      IO.puts "END-OF-EVAL"
-    end
-  end
-
-  defmodule Quote do
-    def process!(file) do
-      try do
-        File.read!("#{file}")
-        |> Code.string_to_quoted
-        |> Tuple.to_list
-        |> List.last
-        |> IO.inspect
-      rescue
-        e -> IO.inspect e
-      end
-      IO.puts "END-OF-QUOTE"
-    end
-  end
-
-  defmodule Find do
-    def process!(exp) do
-      [module, function] = String.split(exp, ",", parts: 2)
-      module = String.to_char_list module
-      function = String.to_atom function
-      Code.eval_string("Alchemist.Source.find(#{module}, :#{function})", [], __ENV__)
-      IO.puts "END-OF-SOURCE"
-    end
-  end
-end
diff --git a/emacs.d/elpa/alchemist-20150624.159/server/completer.exs b/emacs.d/elpa/alchemist-20150624.159/server/completer.exs
deleted file mode 100644
index 2e94a66..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/server/completer.exs
+++ /dev/null
@@ -1,340 +0,0 @@
-defmodule Alchemist.Completer do
-  @moduledoc false
-
-  def run(exp) do
-    code = case is_bitstring(exp) do
-             true -> exp |> String.to_char_list
-             _ -> exp
-           end
-
-    {status, result, list } = expand(code |> Enum.reverse)
-
-    case { status, result, list } do
-      { :no, _, _ }  -> ''
-      { :yes, [], _ } -> List.insert_at(list, 0, exp)
-      { :yes, _,  _ } -> run(code ++ result)
-    end
-  end
-
-  def expand('') do
-    expand_import("")
-  end
-
-  def expand([h|t]=expr) do
-    cond do
-      h === ?. and t != []->
-        expand_dot(reduce(t))
-      h === ?: ->
-        expand_erlang_modules()
-      identifier?(h) ->
-        expand_expr(reduce(expr))
-      (h == ?/) and t != [] and identifier?(hd(t)) ->
-        expand_expr(reduce(t))
-      h in '([{' ->
-        expand('')
-      true ->
-        no()
-    end
-  end
-
-  defp identifier?(h) do
-  (h in ?a..?z) or (h in ?A..?Z) or (h in ?0..?9) or h in [?_, ??, ?!]
-  end
-
-  defp expand_dot(expr) do
-    case Code.string_to_quoted expr do
-      {:ok, atom} when is_atom(atom) ->
-        expand_call(atom, "")
-      {:ok, {:__aliases__, _, list}} ->
-        expand_elixir_modules(list, "")
-      _ ->
-        no()
-    end
-  end
-
-  defp expand_expr(expr) do
-    case Code.string_to_quoted expr do
-      {:ok, atom} when is_atom(atom) ->
-        expand_erlang_modules(Atom.to_string(atom))
-      {:ok, {atom, _, nil}} when is_atom(atom) ->
-        expand_import(Atom.to_string(atom))
-      {:ok, {:__aliases__, _, [root]}} ->
-        expand_elixir_modules([], Atom.to_string(root))
-      {:ok, {:__aliases__, _, [h|_] = list}} when is_atom(h) ->
-        hint = Atom.to_string(List.last(list))
-        list = Enum.take(list, length(list) - 1)
-        expand_elixir_modules(list, hint)
-      {:ok, {{:., _, [mod, fun]}, _, []}} when is_atom(fun) ->
-        expand_call(mod, Atom.to_string(fun))
-      _ ->
-        no()
-    end
-  end
-
-  defp reduce(expr) do
-    Enum.reverse Enum.reduce ' ([{', expr, fn token, acc ->
-      hd(:string.tokens(acc, [token]))
-    end
-  end
-
-  defp yes(hint, entries) do
-    {:yes, String.to_char_list(hint), Enum.map(entries, &String.to_char_list/1)}
-  end
-
-  defp no do
-    {:no, '', []}
-  end
-
-  ## Formatting
-
-  defp format_expansion([], _) do
-    no()
-  end
-
-  defp format_expansion([uniq], hint) do
-    case to_hint(uniq, hint) do
-      ""   -> yes("", to_uniq_entries(uniq))
-      hint -> yes(hint, [])
-    end
-  end
-
-  defp format_expansion([first|_]=entries, hint) do
-    binary = Enum.map(entries, &(&1.name))
-    length = byte_size(hint)
-    prefix = :binary.longest_common_prefix(binary)
-    if prefix in [0, length] do
-      yes("", Enum.flat_map(entries, &to_entries/1))
-    else
-      yes(:binary.part(first.name, prefix, length-prefix), [])
-    end
-  end
-
-  ## Expand calls
-
-  # :atom.fun
-  defp expand_call(mod, hint) when is_atom(mod) do
-    expand_require(mod, hint)
-  end
-
-  # Elixir.fun
-  defp expand_call({:__aliases__, _, list}, hint) do
-    expand_alias(list)
-    |> normalize_module
-    |> expand_require(hint)
-  end
-
-  defp expand_call(_, _) do
-    no()
-  end
-
-  defp expand_require(mod, hint) do
-    format_expansion match_module_funs(mod, hint), hint
-  end
-
-  defp expand_import(hint) do
-    funs = match_module_funs(IEx.Helpers, hint) ++
-      match_module_funs(Kernel, hint) ++
-      match_module_funs(Kernel.SpecialForms, hint)
-    format_expansion funs, hint
-  end
-
-  ## Erlang modules
-
-  defp expand_erlang_modules(hint \\ "") do
-    format_expansion match_erlang_modules(hint), hint
-  end
-
-  defp match_erlang_modules(hint) do
-    for mod <- match_modules(hint, true) do
-      %{kind: :module, name: mod, type: :erlang}
-    end
-  end
-
-  ## Elixir modules
-
-  defp expand_elixir_modules([], hint) do
-    expand_elixir_modules(Elixir, hint, match_aliases(hint))
-  end
-
-  defp expand_elixir_modules(list, hint) do
-    expand_alias(list)
-    |> normalize_module
-    |> expand_elixir_modules(hint, [])
-  end
-
-  defp expand_elixir_modules(mod, hint, aliases) do
-    aliases
-    |> Kernel.++(match_elixir_modules(mod, hint))
-    |> Kernel.++(match_module_funs(mod, hint))
-    |> format_expansion(hint)
-  end
-
-  defp expand_alias([name | rest] = list) do
-    module = Module.concat(Elixir, name)
-    Enum.find_value env_aliases(), list, fn {alias, mod} ->
-      if alias === module do
-        case Atom.to_string(mod) do
-          "Elixir." <> mod ->
-            Module.concat [mod|rest]
-          _ ->
-            mod
-        end
-      end
-    end
-  end
-
-  defp env_aliases() do
-    :ets.lookup(:alchemist, "aliases")
-    |> format_ets_aliases
-  end
-
-  defp format_ets_aliases([{"aliases", []}]) do
-    []
-  end
-
-  defp format_ets_aliases(list) do
-    list
-    |> List.first
-    |> Tuple.to_list
-    |> List.last
-  end
-
-  defp match_aliases(hint) do
-    for {alias, _mod} <- env_aliases(),
-    [name] = Module.split(alias),
-    starts_with?(name, hint) do
-      %{kind: :module, type: :alias, name: name}
-    end
-  end
-
-  defp match_elixir_modules(module, hint) do
-    name  = Atom.to_string(module)
-    depth = length(String.split(name, ".")) + 1
-    base  = name <> "." <> hint
-
-    for mod <- match_modules(base, module === Elixir),
-    parts = String.split(mod, "."),
-    depth <= length(parts) do
-      %{kind: :module, type: :elixir, name: Enum.at(parts, depth-1)}
-    end
-    |> Enum.uniq
-  end
-
-  ## Helpers
-
-   defp normalize_module(mod) do
-    if is_list(mod) do
-      Module.concat(mod)
-    else
-      mod
-    end
-  end
-
-  defp match_modules(hint, root) do
-    get_modules(root)
-    |> :lists.usort()
-    |> Enum.drop_while(& not starts_with?(&1, hint))
-    |> Enum.take_while(& starts_with?(&1, hint))
-  end
-
-  defp get_modules(true) do
-    ["Elixir.Elixir"] ++ get_modules(false)
-  end
-
-  defp get_modules(false) do
-    modules = Enum.map(:code.all_loaded(), &Atom.to_string(elem(&1, 0)))
-    case :code.get_mode() do
-      :interactive -> modules ++ get_modules_from_applications()
-      _otherwise -> modules
-    end
-  end
-
-  defp get_modules_from_applications do
-    for [app] <- loaded_applications(),
-    {:ok, modules} = :application.get_key(app, :modules),
-    module <- modules do
-      Atom.to_string(module)
-    end
-  end
-
-  defp loaded_applications do
-    # If we invoke :application.loaded_applications/0,
-    # it can error if we don't call safe_fixtable before.
-    # Since in both cases we are reaching over the
-    # application controller internals, we choose to match
-    # for performance.
-    :ets.match(:ac_tab, {{:loaded, :"$1"}, :_})
-  end
-
-  defp match_module_funs(mod, hint) do
-    case ensure_loaded(mod) do
-      {:module, _} ->
-        falist = get_module_funs(mod)
-
-      list = Enum.reduce falist, [], fn {f, a}, acc ->
-        case :lists.keyfind(f, 1, acc) do
-          {f, aa} -> :lists.keyreplace(f, 1, acc, {f, [a|aa]})
-          false -> [{f, [a]}|acc]
-        end
-      end
-
-      for {fun, arities} <- list,
-      name = Atom.to_string(fun),
-      starts_with?(name, hint) do
-        %{kind: :function, name: name, arities: arities}
-      end |> :lists.sort()
-
-      _otherwise -> []
-    end
-  end
-
-  defp get_module_funs(mod) do
-    if function_exported?(mod, :__info__, 1) do
-      if docs = Code.get_docs(mod, :docs) do
-        for {tuple, _line, _kind, _sign, doc} <- docs, doc != false, do: tuple
-      else
-        mod.__info__(:macros) ++ (mod.__info__(:functions) -- [__info__: 1])
-      end
-    else
-      mod.module_info(:exports)
-    end
-  end
-
-  defp ensure_loaded(Elixir), do: {:error, :nofile}
-  defp ensure_loaded(mod),
-  do: Code.ensure_compiled(mod)
-
-  defp starts_with?(_string, ""),  do: true
-  defp starts_with?(string, hint), do: String.starts_with?(string, hint)
-
-  ## Ad-hoc conversions
-
-  defp to_entries(%{kind: :module, name: name}) do
-    [name]
-  end
-
-  defp to_entries(%{kind: :function, name: name, arities: arities}) do
-    for a <- :lists.sort(arities), do: "#{name}/#{a}"
-  end
-
-  defp to_uniq_entries(%{kind: :module}) do
-    []
-  end
-
-  defp to_uniq_entries(%{kind: :function} = fun) do
-    to_entries(fun)
-  end
-
-  defp to_hint(%{kind: :module, name: name}, hint) do
-    format_hint(name, hint) <> "."
-  end
-
-  defp to_hint(%{kind: :function, name: name}, hint) do
-    format_hint(name, hint)
-  end
-
-  defp format_hint(name, hint) do
-    hint_size = byte_size(hint)
-    :binary.part(name, hint_size, byte_size(name) - hint_size)
-  end
-end
diff --git a/emacs.d/elpa/alchemist-20150624.159/server/informant.exs b/emacs.d/elpa/alchemist-20150624.159/server/informant.exs
deleted file mode 100644
index f32f18d..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/server/informant.exs
+++ /dev/null
@@ -1,55 +0,0 @@
-defmodule Alchemist.Informant do
-  def get_functions(mod, hint) do
-    {mod, _} = Code.eval_string(mod)
-    falist = get_module_funs(mod)
-
-    list = Enum.reduce falist, [], fn({f, a}, acc) ->
-      case :lists.keyfind(f, 1, acc) do
-        {f, aa} -> :lists.keyreplace(f, 1, acc, {f, [a|aa]})
-        false -> [{f, [a]}|acc]
-      end
-    end
-
-    case hint do
-      "" ->
-        for {fun, arities} <- list,
-        name = Atom.to_string(fun) do
-          "#{name}/#{List.first(arities)}"
-        end |> :lists.sort()
-      _otherwise ->
-        for {fun, arities} <- list,
-        name = Atom.to_string(fun),
-        String.starts_with?(name, hint) do
-          "#{name}/#{List.first(arities)}"
-        end |> :lists.sort()
-    end
-  end
-
-  defp get_module_funs(mod) do
-    case Code.ensure_loaded(mod) do
-      {:module, _} ->
-        mod.module_info(:functions) ++ mod.__info__(:macros)
-      _otherwise ->
-        []
-    end
-  end
-
-  def get_modules do
-    modules = Enum.map(:code.all_loaded, fn({m, _}) -> Atom.to_string(m) end)
-
-    if :code.get_mode() === :interactive do
-      modules ++ get_modules_from_applications()
-    else
-      modules
-    end
-  end
-
-  defp get_modules_from_applications do
-    for {app, _, _} <- :application.loaded_applications,
-    {_, modules} = :application.get_key(app, :modules),
-    module <- modules,
-    has_doc = Code.get_docs(module, :moduledoc), elem(has_doc, 1) do
-      Atom.to_string(module)
-    end
-  end
-end
diff --git a/emacs.d/elpa/alchemist-20150624.159/server/server.exs b/emacs.d/elpa/alchemist-20150624.159/server/server.exs
deleted file mode 100644
index 098ec99..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/server/server.exs
+++ /dev/null
@@ -1,92 +0,0 @@
-Code.require_file "utils.exs", __DIR__
-Code.require_file "completer.exs", __DIR__
-Code.require_file "informant.exs", __DIR__
-Code.require_file "source.exs", __DIR__
-Code.require_file "case.exs", __DIR__
-
-defmodule Alchemist.Server do
-
-  alias Alchemist.Case
-
-  def start([env]) do
-    # Preload Enum so we load basic Elixir/Erlang code
-    IEx.Autocomplete.expand('.munE')
-    :ets.new(:alchemist, [:named_table])
-    loop(all_loaded(), env)
-  end
-
-  def loop(loaded, env) do
-    line  = IO.gets("") |> String.rstrip()
-    paths = load_paths(env)
-    apps  = load_apps(env)
-
-    read_input(line)
-
-    purge_modules(loaded)
-    purge_paths(paths)
-    purge_apps(apps)
-
-    :ets.delete_all_objects(:alchemist)
-
-    loop(loaded, env)
-  end
-
-  def read_input(line) do
-    case line |> String.split(" ", parts: 2) do
-      ["COMPLETE"] ->
-        Case.Complete.process!
-      ["COMPLETE", hint] ->
-        Case.Complete.process!(hint)
-      ["COMPLETE-WITH-CONTEXT", hint] ->
-        Case.Complete.process_with_context!(hint)
-      ["DOC", exp] ->
-        Case.Doc.process!(exp)
-      ["MODULES"] ->
-        Case.Modules.process!
-      ["EVAL", exp] ->
-        Case.Eval.process!(exp)
-      ["QUOTE", file] ->
-        Case.Quote.process!(file)
-      ["SOURCE", exp] ->
-        Case.Find.process!(exp)
-      _ ->
-        nil
-    end
-  end
-
-  defp all_loaded() do
-    for {m,_} <- :code.all_loaded, do: m
-  end
-
-  defp load_paths(env) do
-    for path <- Path.wildcard("_build/#{env}/lib/*/ebin") do
-      Code.prepend_path(path)
-      path
-    end
-  end
-
-  defp load_apps(env) do
-    for path <- Path.wildcard("_build/#{env}/lib/*/ebin/*.app") do
-      app = path |> Path.basename() |> Path.rootname() |> String.to_atom
-      Application.load(app)
-      app
-    end
-  end
-
-  defp purge_modules(loaded) do
-    for m <- (all_loaded() -- loaded) do
-      :code.delete(m)
-      :code.purge(m)
-    end
-  end
-
-  defp purge_paths(paths) do
-    for p <- paths, do: Code.delete_path(p)
-  end
-
-  defp purge_apps(apps) do
-    for a <- apps, do: Application.unload(a)
-  end
-end
-
-Alchemist.Server.start([System.argv])
diff --git a/emacs.d/elpa/alchemist-20150624.159/server/source.exs b/emacs.d/elpa/alchemist-20150624.159/server/source.exs
deleted file mode 100644
index 5ec5c1c..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/server/source.exs
+++ /dev/null
@@ -1,46 +0,0 @@
-defmodule Alchemist.Source do
-  def find(nil, function) do
-    cond do
-      List.keymember?(get_module_funs(Kernel), function, 0) ->
-        IO.puts source(Kernel)
-      List.keymember?(get_module_funs(Kernel.SpecialForms), function, 0) ->
-        IO.puts source(Kernel.SpecialForms)
-      true ->
-        IO.puts ""
-    end
-  end
-
-  def find(module, function) do
-    cond do
-      Code.ensure_loaded?(module) ->
-        IO.puts source(module)
-      List.keymember?(Kernel.module_info[:exports], function, 0) ->
-        IO.puts source(Kernel)
-      List.keymember?(Kernel.SpecialForms.module_info[:exports], function, 0) ->
-        IO.puts source(Kernel.SpecialForms)
-      true ->
-        IO.puts ""
-    end
-  end
-
-  defp source(module) do
-    source = module.module_info(:compile)[:source]
-
-    case source do
-      nil -> nil
-      source -> "source-file-path:" <> List.to_string(source)
-    end
-  end
-
-  defp get_module_funs(mod) do
-    if function_exported?(mod, :__info__, 1) do
-      if docs = Code.get_docs(mod, :docs) do
-        for {tuple, _line, _kind, _sign, doc} <- docs, doc != false, do: tuple
-      else
-      (mod.__info__(:functions) -- [__info__: 1]) ++ mod.__info__(:macros)
-      end
-    else
-      mod.module_info(:exports)
-    end
-  end
-end
diff --git a/emacs.d/elpa/alchemist-20150624.159/server/utils.exs b/emacs.d/elpa/alchemist-20150624.159/server/utils.exs
deleted file mode 100644
index 3165e79..0000000
--- a/emacs.d/elpa/alchemist-20150624.159/server/utils.exs
+++ /dev/null
@@ -1,6 +0,0 @@
-defmodule Alchemist.Utils do
-  def clear_context_list(modules) do
-    cleared = Regex.replace ~r/\.\]/, modules, "]"
-    Regex.replace ~r/\.\,/, cleared, ","
-  end
-end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-autoloads.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-autoloads.el
new file mode 100644
index 0000000..8235240
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-autoloads.el
@@ -0,0 +1,116 @@
+;;; alchemist-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "alchemist" "alchemist.el" (22171 46586 0 0))
+;;; Generated autoloads from alchemist.el
+
+(autoload 'alchemist-mode "alchemist" "\
+Toggle alchemist mode.
+
+Key bindings:
+\\{alchemist-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "alchemist-iex" "alchemist-iex.el" (22171 46586
+;;;;;;  0 0))
+;;; Generated autoloads from alchemist-iex.el
+
+(defalias 'run-elixir 'alchemist-iex-run)
+
+(autoload 'alchemist-iex-run "alchemist-iex" "\
+Start an IEx process.
+Show the IEx buffer if an IEx process is already run.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'alchemist-iex-project-run "alchemist-iex" "\
+Start an IEx process with mix 'iex -S mix' in the
+context of an Elixir project.
+Show the IEx buffer if an IEx process is already run.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "alchemist-phoenix" "alchemist-phoenix.el"
+;;;;;;  (22171 46586 0 0))
+;;; Generated autoloads from alchemist-phoenix.el
+
+(autoload 'alchemist-phoenix-project-p "alchemist-phoenix" "\
+Return non-nil if `default-directory' is inside an Phoenix project.
+
+\(fn)" nil nil)
+
+(autoload 'alchemist-phoenix-mode "alchemist-phoenix" "\
+Minor mode for Elixir Phoenix web framework projects.
+
+The following commands are available:
+
+\\{alchemist-phoenix-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'alchemist-phoenix-enable-mode "alchemist-phoenix" "\
+
+
+\(fn)" nil nil)
+
+(dolist (hook '(alchemist-mode-hook)) (add-hook hook 'alchemist-phoenix-enable-mode))
+
+;;;***
+
+;;;### (autoloads nil "alchemist-refcard" "alchemist-refcard.el"
+;;;;;;  (22171 46586 0 0))
+;;; Generated autoloads from alchemist-refcard.el
+
+(autoload 'alchemist-refcard "alchemist-refcard" "\
+Generate an Alchemist refcard of all the features.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "alchemist-test-mode" "alchemist-test-mode.el"
+;;;;;;  (22171 46586 0 0))
+;;; Generated autoloads from alchemist-test-mode.el
+
+(autoload 'alchemist-test-mode "alchemist-test-mode" "\
+Minor mode for Elixir ExUnit files.
+
+The following commands are available:
+
+\\{alchemist-test-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'alchemist-test-enable-mode "alchemist-test-mode" "\
+
+
+\(fn)" nil nil)
+
+(dolist (hook '(alchemist-mode-hook)) (add-hook hook 'alchemist-test-enable-mode))
+
+;;;***
+
+;;;### (autoloads nil nil ("alchemist-company.el" "alchemist-compile.el"
+;;;;;;  "alchemist-complete.el" "alchemist-eval.el" "alchemist-execute.el"
+;;;;;;  "alchemist-file.el" "alchemist-goto.el" "alchemist-help.el"
+;;;;;;  "alchemist-hooks.el" "alchemist-info.el" "alchemist-interact.el"
+;;;;;;  "alchemist-key.el" "alchemist-macroexpand.el" "alchemist-message.el"
+;;;;;;  "alchemist-mix.el" "alchemist-pkg.el" "alchemist-project.el"
+;;;;;;  "alchemist-report.el" "alchemist-scope.el" "alchemist-server.el"
+;;;;;;  "alchemist-utils.el") (22171 46586 526902 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; alchemist-autoloads.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-company.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-company.el
new file mode 100644
index 0000000..113f33d
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-company.el
@@ -0,0 +1,146 @@
+;;; alchemist-company.el --- Elixir company-mode backend -*- lexical-binding: t -*-
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Elixir company-mode backend.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'company)
+(require 'alchemist-help)
+(require 'alchemist-goto)
+(require 'alchemist-scope)
+(require 'alchemist-server)
+(require 'alchemist-complete)
+
+(defgroup alchemist-company nil
+  "Elixir company-mode backend."
+  :prefix "alchemist-company-"
+  :group 'alchemist)
+
+;; Variables
+
+(defcustom alchemist-company-show-annotation t
+  "Show an annotation inline with the candidate."
+  :type 'boolean
+  :group 'alchemist-company)
+
+(defvar alchemist-company-callback nil)
+(defvar alchemist-company-filter-output nil)
+(defvar alchemist-company-last-completion nil)
+(defvar alchemist-company-doc-lookup-done nil)
+
+(defun alchemist-company--wait-for-doc-buffer ()
+  (while (not alchemist-company-doc-lookup-done)
+    (sit-for 0.01)))
+
+(defun alchemist-company-show-documentation (candidate)
+  (interactive)
+  (let* ((annotation (alchemist-company--annotation candidate))
+         (candidate (if annotation
+                        (format "%s%s" candidate annotation)
+                      candidate))
+         (candidate (alchemist-help--prepare-search-expr candidate)))
+    (setq alchemist-company-doc-lookup-done nil)
+    (alchemist-server-help (alchemist-help--server-arguments candidate) #'alchemist-company-doc-buffer-filter)
+    (alchemist-company--wait-for-doc-buffer)
+    (get-buffer alchemist-help-buffer-name)))
+
+(defun alchemist-company-open-definition (candidate)
+  (interactive)
+  (alchemist-goto--open-definition candidate))
+
+(defun alchemist-company--annotation (candidate)
+  (get-text-property 0 'meta candidate))
+
+(defun alchemist-company-build-scope-arg (arg)
+  "Build informations about the current context."
+  (let* ((modules (alchemist-utils-prepare-modules-for-elixir
+                   (alchemist-scope-all-modules)))
+         (aliases (alchemist-utils-prepare-aliases-for-elixir
+                   (alchemist-scope-aliases))))
+    (format "{ \"%s\", [ context: Elixir, imports: %s, aliases: %s ] }" arg modules aliases)))
+
+(defun alchemist-company-build-server-arg (arg)
+  (if (not (equal major-mode 'alchemist-iex-mode))
+      (alchemist-company-build-scope-arg arg)
+    (format "{ \"%s\", [ context: [], imports: [], aliases: [] ] }" arg)))
+
+(defun alchemist-company-filter (_process output)
+  (setq alchemist-company-filter-output (cons output alchemist-company-filter-output))
+  (if (alchemist-server-contains-end-marker-p output)
+      (let* ((candidates (alchemist-complete--build-candidates-from-process-output alchemist-company-filter-output)))
+        (setq alchemist-company-filter-output nil)
+        (alchemist-company-serve-candidates-to-callback (-distinct candidates)))))
+
+(defun alchemist-company-doc-buffer-filter (_process output)
+  (setq alchemist-company-filter-output (cons output alchemist-company-filter-output))
+  (if (alchemist-server-contains-end-marker-p output)
+      (let ((string (alchemist-server-prepare-filter-output alchemist-company-filter-output)))
+        (setq alchemist-company-filter-output nil)
+        (if (get-buffer alchemist-help-buffer-name)
+            (kill-buffer alchemist-help-buffer-name))
+        (with-current-buffer (get-buffer-create alchemist-help-buffer-name)
+          (insert string)
+          (ansi-color-apply-on-region (point-min) (point-max))
+          (alchemist-help-minor-mode 1))
+        (setq alchemist-company-doc-lookup-done t))))
+
+(defun alchemist-company-serve-candidates-to-callback (candidates)
+  (let* ((candidates (if candidates
+                        candidates
+                      (alchemsit-complete--dabbrev-code-candidates)))
+         (candidates (if (eq (length candidates) 1)
+                        (-insert-at 0 company-prefix candidates)
+                       candidates))
+         (candidates (-distinct candidates)))
+    (funcall alchemist-company-callback candidates)))
+
+(defun alchemist-company (command &optional arg &rest ignored)
+  "`company-mode' completion back-end for Elixir."
+  (interactive (list 'interactive))
+  (when alchemist-company-show-annotation
+    (set 'company-tooltip-align-annotations t))
+  (cl-case command
+    (interactive (company-begin-backend 'alchemist-company))
+    (init (or (eq major-mode 'elixir-mode)
+              (string= mode-name "Alchemist-IEx")))
+    (prefix (and (or (eq major-mode 'elixir-mode)
+                     (string= mode-name "Alchemist-IEx"))
+                 (alchemist-scope-expression)))
+    (doc-buffer (alchemist-company-show-documentation arg))
+    (location (alchemist-company-open-definition arg))
+    (candidates (cons :async
+                      (lambda (cb)
+                        (setq alchemist-company-last-completion arg)
+                        (setq alchemist-company-callback cb)
+                        (alchemist-server-complete-candidates (alchemist-company-build-server-arg arg)
+                                                              #'alchemist-company-filter))))
+    (annotation (when alchemist-company-show-annotation
+                  (alchemist-company--annotation arg)))))
+
+(add-to-list 'company-backends 'alchemist-company)
+
+(provide 'alchemist-company)
+
+;;; alchemist-company.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-compile.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-compile.el
new file mode 100644
index 0000000..6d7bdc9
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-compile.el
@@ -0,0 +1,89 @@
+;;; alchemist-compile.el --- Elixir compilation functionality
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Elixir compilation functionality.
+
+;;; Code:
+
+(require 'alchemist-utils)
+(require 'alchemist-report)
+
+(defgroup alchemist-compile nil
+  "Elixir compilation functionality."
+  :prefix "alchemist-compile-"
+  :group 'alchemist)
+
+;; Variables
+
+(defcustom alchemist-compile-command "elixirc"
+  "The shell command for elixirc."
+  :type 'string
+  :group 'alchemist-compile)
+
+(defvar alchemist-compile-buffer-name "*alchemist elixirc*"
+  "Name of the elixir output buffer.")
+
+(defvar alchemist-compile-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "q" #'quit-window)
+    map))
+
+;; Private functions
+
+(defun alchemist-compile--file (filename)
+  (cond ((not (file-exists-p filename)) (error "The given file doesn't exist"))
+        ((string-match "\.exs$" filename) (error "The given file is an Elixir Script"))
+        (t (alchemist-compile (list alchemist-compile-command (expand-file-name filename))))))
+
+(defun alchemist-compile--read-command (command)
+  (read-shell-command "elixirc command: " (concat command " ")))
+
+;; Public functions
+
+(defun alchemist-compile-this-buffer ()
+  "Compile the current buffer with elixirc."
+  (interactive)
+  (alchemist-compile--file buffer-file-name))
+
+(defun alchemist-compile-file (filename)
+  "Compile the given FILENAME."
+  (interactive "Felixirc: ")
+  (alchemist-compile--file (expand-file-name filename)))
+
+(define-derived-mode alchemist-compile-mode fundamental-mode "Elixir Compile Mode"
+  "Major mode for compiling Elixir files.
+
+\\{alchemist-compile-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil))
+
+(defun alchemist-compile (cmdlist)
+  "Compile CMDLIST with elixirc."
+  (interactive (list (alchemist-compile--read-command alchemist-compile-command)))
+  (let ((command (alchemist-utils-build-command cmdlist)))
+    (alchemist-report-run command "alchemist-compile-report" alchemist-compile-buffer-name 'alchemist-compile-mode)))
+
+(provide 'alchemist-compile)
+
+;;; alchemist-compile.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-complete.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-complete.el
new file mode 100644
index 0000000..053ef16
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-complete.el
@@ -0,0 +1,142 @@
+;;; alchemist-complete.el --- Complete functionality for Elixir source code -*- lexical-binding: t -*-
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Complete functionality for Elixir and Erlang source code.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'dash)
+(require 'ansi-color)
+(require 'company-dabbrev-code)
+(require 'alchemist-utils)
+
+(defgroup alchemist-complete nil
+  "Complete functionality for Elixir source code."
+  :prefix "alchemist-complete-"
+  :group 'alchemist)
+
+(defvar alchemist-company-last-completion nil)
+
+(defun alchemist-complete--concat-prefix-with-functions (prefix functions &optional add-prefix)
+  (let* ((prefix (mapconcat 'concat (butlast (split-string prefix "\\.") 1) "."))
+         (candidates (-map (lambda (c) (concat prefix "." c)) (cdr functions))))
+    (if add-prefix
+        (push prefix candidates)
+      candidates)))
+
+(defun alchemist-complete--add-prefix-to-function (prefix function)
+  (let* ((prefix (mapconcat 'concat (butlast (split-string prefix "\\.") 1) "."))
+         (candidate (concat prefix "." function)))
+    candidate))
+
+(defun alchemist-complete--build-candidates (a-list)
+  (let* ((search-term (car a-list))
+         (candidates a-list)
+         (candidates (-map (lambda (f)
+                               (let* ((candidate f)
+                                      (meta (if (string-match-p "^.+/" f)
+                                                (replace-regexp-in-string "^.+/" "/" f)
+                                              "")))
+                                 (cond
+                                  ((and (string-match-p "^:" search-term)
+                                        (not (string-match-p "\\." search-term)))
+                                   (unless (string= search-term candidate)
+                                     (propertize (concat ":" candidate))
+                                     ))
+                                  ((string-match-p "\\." search-term)
+                                   (unless (string= search-term candidate)
+                                     (propertize (alchemist-complete--add-prefix-to-function (concat (alchemist-scope-extract-module search-term) ".")
+                                                                                             (replace-regexp-in-string "/[0-9]$" "" candidate)) 'meta meta)))
+                                  (t (propertize (replace-regexp-in-string "/[0-9]$" "" candidate) 'meta meta)))))
+                             candidates))
+         (candidates (-remove 'null candidates)))
+    (cond
+     ((and (string-match-p "\\.$" search-term)
+           (not (string-match-p "\\.$" alchemist-company-last-completion)))
+      (push (alchemist-utils-remove-dot-at-the-end search-term) candidates))
+     (t candidates))))
+
+(defun alchemist-complete--build-help-candidates (a-list)
+  (let* ((search-term (car a-list))
+         (candidates (cond ((> (alchemist-utils-count-char-occurence "\\." search-term) 1)
+                            (let ((search (if (string-match-p "\\.[a-z0-9_\?!]+$" search-term)
+                                              (list (replace-regexp-in-string "\\.[a-z0-9_\?!]+$" "" search-term))
+                                            (list (alchemist-utils-remove-dot-at-the-end search-term))))
+                                  (candidates (-map (lambda (c)
+                                                        (if (string-match-p "\\.[a-z0-9_\?!]+$" search-term)
+                                                            (concat (replace-regexp-in-string "\\.[a-z0-9_\?!]+$" "." search-term) c)
+                                                          (concat search-term c)))
+                                                      (cdr a-list))))
+                              (append search candidates)))
+                            ((string-match-p "\\.$" search-term)
+                            (alchemist-complete--concat-prefix-with-functions search-term a-list t))
+                           ((string-match-p "\\.[a-z0-9_\?!]+$" search-term)
+                            (alchemist-complete--concat-prefix-with-functions search-term a-list))
+                           (t
+                            a-list))))
+    (-distinct candidates)))
+
+(defun alchemist-complete--output-to-list (output)
+  (let* ((output (split-string output)))
+    (-remove 'null output)))
+
+(defun alchemist-complete--build-candidates-from-process-output (output)
+  (let* ((output (alchemist-server-prepare-filter-output output))
+         (candidates (if (not (alchemist-utils-empty-string-p output))
+                         (alchemist-complete--output-to-list
+                          (ansi-color-filter-apply output))
+                       '()))
+         (candidates (if candidates
+                         (alchemist-complete--build-candidates candidates)
+                       '())))
+    candidates))
+
+(defun alchemist-complete--completing-prompt (initial completing-collection)
+  (let* ((completing-collection (alchemist-complete--build-help-candidates completing-collection)))
+    (cond ((equal (length completing-collection) 1)
+           (car completing-collection))
+          (completing-collection
+           (completing-read
+            "Elixir help: "
+            completing-collection
+            nil
+            nil
+            (replace-regexp-in-string "\\.$" "" initial)))
+          (t initial))))
+
+(defun alchemsit-complete--dabbrev-code-candidates ()
+  "This function uses a piece of functionality of company-dabbrev-code backend.
+
+Please have a look at the company-dabbrev-code function for more
+detailed information."
+  (let ((case-fold-search nil))
+    (-distinct (company-dabbrev--search
+                (company-dabbrev-code--make-regexp alchemist-company-last-completion)
+                company-dabbrev-code-time-limit
+                (list major-mode)
+                t))))
+
+(provide 'alchemist-complete)
+
+;;; alchemist-complete.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-eval.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-eval.el
new file mode 100644
index 0000000..a3c4c5d
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-eval.el
@@ -0,0 +1,219 @@
+;;; alchemist-eval.el --- Elixir code inline evaluation functionality
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Elixir code inline evaluation functionality
+
+;;; Code:
+
+(require 'elixir-mode)
+(require 'alchemist-server)
+(require 'alchemist-interact)
+
+(defgroup alchemist-eval nil
+  "Elixir code inline evaluation functionality."
+  :prefix "alchemist-eval-"
+  :group 'alchemist)
+
+(defconst alchemist-eval-buffer-name "*alchemist-eval-mode*"
+  "Name of the Elixir evaluation buffer.")
+
+(defvar alchemist-eval-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "q") #'quit-window)
+    map)
+  "Keymap for `alchemist-eval-mode'.")
+
+(defvar alchemist-eval-filter-output nil)
+
+;; Private functions
+
+(defun alchemist-eval--insert (string)
+  (let ((lines (split-string string "\n")))
+    (if (> (length lines) 1)
+        (progn
+          (save-excursion
+            (end-of-line)
+            (mapc (lambda (s)
+                    (newline)
+                    (insert (format "# => %s" s))
+                    (indent-according-to-mode))
+                  lines)))
+      (save-excursion
+        (end-of-line)
+        (insert (format "  # => %s" string))))))
+
+(defun alchemist-eval--expression (expression)
+  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
+    (with-temp-file file
+      (insert expression))
+    (alchemist-server-eval (format "{ :eval, '%s' }" file) #'alchemist-eval-filter)))
+
+(defun alchemist-eval--expression-and-print (expression)
+  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
+    (with-temp-file file
+      (insert expression))
+    (alchemist-server-eval (format "{ :eval, '%s' }" file) #'alchemist-eval-insert-filter)))
+
+(defun alchemist-eval--quote-expression (expression)
+  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
+    (with-temp-file file
+      (insert expression))
+    (alchemist-server-eval (format "{ :quote, '%s' }" file) #'alchemist-eval-quoted-filter)))
+
+(defun alchemist-eval--quote-expression-and-print (expression)
+  (let ((file (make-temp-file "alchemist-eval" nil ".exs")))
+    (with-temp-file file
+      (insert expression))
+    (alchemist-server-eval (format "{ :quote, '%s' }" file) #'alchemist-eval-quoted-insert-filter)))
+
+(defun alchemist-eval-filter (_process output)
+  (setq alchemist-eval-filter-output (cons output alchemist-eval-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-create-popup alchemist-eval-buffer-name
+                                     (alchemist-server-prepare-filter-output alchemist-eval-filter-output)
+                                     #'(lambda ()
+                                         (elixir-mode)
+                                         (alchemist-eval-mode)
+                                         (ansi-color-apply-on-region (point-min) (point-max))))
+    (setq alchemist-eval-filter-output nil)))
+
+(defun alchemist-eval-insert-filter (_process output)
+  (setq alchemist-eval-filter-output (cons output alchemist-eval-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-insert-as-comment
+     (alchemist-server-prepare-filter-output alchemist-eval-filter-output))
+    (setq alchemist-eval-filter-output nil)))
+
+(defun alchemist-eval-quoted-filter (_process output)
+  (setq alchemist-eval-filter-output (cons output alchemist-eval-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-create-popup alchemist-eval-buffer-name
+                                     (alchemist-server-prepare-filter-output alchemist-eval-filter-output)
+                                     #'alchemist-eval-mode)
+    (setq alchemist-eval-filter-output nil)))
+
+(defun alchemist-eval-quoted-insert-filter (_process output)
+  (setq alchemist-eval-filter-output (cons output alchemist-eval-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-insert-as-comment
+     (alchemist-server-prepare-filter-output alchemist-eval-filter-output))
+    (setq alchemist-eval-filter-output nil)))
+
+;; Public functions
+
+(defun alchemist-eval-current-line ()
+  "Evaluate the Elixir code on the current line."
+  (interactive)
+  (alchemist-eval--expression (thing-at-point 'line)))
+
+(defun alchemist-eval-print-current-line ()
+  "Evaluate the Elixir code on the current line and insert the result."
+  (interactive)
+  (alchemist-eval--expression-and-print (thing-at-point 'line)))
+
+(defun alchemist-eval-region (beg end)
+  "Evaluate the Elixir code on marked region."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (alchemist-eval--expression string)))
+
+(defun alchemist-eval-print-region (beg end)
+  "Evaluate the Elixir code on marked region and insert the result."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (when (> end beg)
+      (exchange-point-and-mark))
+    (alchemist-eval--expression-and-print string)))
+
+(defun alchemist-eval-buffer ()
+  "Evaluate the Elixir code in the current buffer."
+  (interactive)
+  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
+    (alchemist-eval--expression string)))
+
+(defun alchemist-eval-print-buffer ()
+  "Evaluate the Elixir code in the current buffer and insert the result."
+  (interactive)
+  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
+    (goto-char (point-max))
+    (alchemist-eval--expression-and-print string)))
+
+(defun alchemist-eval-quoted-current-line ()
+  "Get the Elixir code representation of the expression on the current line."
+  (interactive)
+  (alchemist-eval--quote-expression (thing-at-point 'line)))
+
+(defun alchemist-eval-print-quoted-current-line ()
+  "Get the Elixir code representation of the expression on the current line and insert the result."
+  (interactive)
+  (alchemist-eval--quote-expression-and-print (thing-at-point 'line)))
+
+(defun alchemist-eval-quoted-region (beg end)
+  "Get the Elixir code representation of the expression on marked region."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (alchemist-eval--quote-expression string)))
+
+(defun alchemist-eval-print-quoted-region (beg end)
+  "Get the Elixir code representation of the expression on marked region and insert the result."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (when (> end beg)
+      (exchange-point-and-mark))
+    (alchemist-eval--quote-expression-and-print string)))
+
+(defun alchemist-eval-quoted-buffer ()
+  "Get the Elixir code representation of the expression in the current buffer."
+  (interactive)
+  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
+    (alchemist-eval--quote-expression string)))
+(defun alchemist-eval-print-quoted-buffer ()
+  "Get the Elixir code representation of the expression in the current buffer and insert result."
+  (interactive)
+  (let ((string (buffer-substring-no-properties (point-min) (point-max))))
+    (alchemist-eval--quote-expression-and-print string)))
+
+(defun alchemist-eval-close-popup ()
+  "Quit the evaluation buffer window."
+  (interactive)
+  (quit-windows-on alchemist-eval-buffer-name))
+
+(define-minor-mode alchemist-eval-mode
+  "Minor mode for Alchemist Elixir code evaluation.
+
+\\{alchemist-eval-mode-map}"
+  nil
+  " Alchemist-Eval"
+  alchemist-eval-mode-map)
+
+(provide 'alchemist-eval)
+
+;;; alchemist-eval.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-execute.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-execute.el
new file mode 100644
index 0000000..4cd0eda
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-execute.el
@@ -0,0 +1,93 @@
+;;; alchemist-execute.el --- Elixir's script execution integration
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Elixir's script execution integration
+
+;;; Code:
+
+(require 'alchemist-utils)
+(require 'alchemist-test-mode)
+(require 'alchemist-report)
+
+(defgroup alchemist-execute nil
+  "Elixir's script execution integration."
+  :prefix "alchemist-execute-"
+  :group 'alchemist)
+
+;; Variables
+
+(defcustom alchemist-execute-command "elixir"
+  "The shell command for elixir."
+  :type 'string
+  :group 'alchemist-execute)
+
+(defvar alchemist-execute-buffer-name "*alchemist elixir*"
+  "Name of the elixir output buffer.")
+
+(defvar alchemist-execute-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "q" #'quit-window)
+    map))
+
+;; Private functions
+
+(defun alchemist-execute--file (filename)
+  (when (not (file-exists-p filename))
+    (error "The given file doesn't exist"))
+  (alchemist-execute (list alchemist-execute-command (expand-file-name filename))))
+
+(defun alchemist-execute--read-command (command)
+  (read-shell-command "elixir command: " (concat command " ")))
+
+;; Public functions
+
+(defun alchemist-execute-this-buffer ()
+  "Run the current buffer through elixir."
+  (interactive)
+  (alchemist-execute--file buffer-file-name))
+
+(defun alchemist-execute-file (filename)
+  "Run elixir with the given FILENAME."
+  (interactive "Felixir: ")
+  (alchemist-execute--file (expand-file-name filename)))
+
+(define-derived-mode alchemist-execute-mode fundamental-mode "Elixir Execute Mode"
+  "Major mode for execute Elixir files.
+
+\\{alchemist-execute-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil))
+
+(defun alchemist-execute (cmdlist)
+  "Run a elixir with CMDLIST."
+  (interactive (list (alchemist-execute--read-command alchemist-execute-command)))
+  (let ((command (alchemist-utils-build-command cmdlist)))
+    (alchemist-report-run command
+                          "alchemist-execute-report"
+                          alchemist-execute-buffer-name
+                          'alchemist-execute-mode)))
+
+(provide 'alchemist-execute)
+
+;;; alchemist-execute.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-file.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-file.el
new file mode 100644
index 0000000..5a021d5
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-file.el
@@ -0,0 +1,57 @@
+;;; alchemist-file.el --- Functionality to work with directory content
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Functionality to work with directory content.
+
+;;; Code:
+
+(defgroup alchemist-file nil
+  "Functionality to work with directory content."
+  :prefix "alchemist-file-"
+  :group 'alchemist)
+
+(defun alchemist-file-find-files (root directory)
+  "Open DIRECTORY inside ROOT and prompt for a file."
+  (let* ((files (alchemist-file-read-dir root directory))
+         (root-name (car (cdr (reverse (split-string root "/")))))
+         (file (completing-read (format "[%s] %s: " root-name directory) files)))
+    (find-file (expand-file-name file root))))
+
+(defun alchemist-file-read-dir (root directory)
+  "Return all files in DIRECTORY and use ROOT as `default-directory'."
+  (let ((default-directory root))
+    (-map (lambda (file) (file-relative-name file root))
+          (alchemist-file--files-from directory))))
+
+(defun alchemist-file--files-from (directory)
+  (--mapcat
+   (if (file-directory-p it)
+       (unless (or (equal (file-relative-name it directory) "..")
+                   (equal (file-relative-name it directory) "."))
+         (alchemist-file--files-from it))
+     (list it))
+   (directory-files directory t)))
+
+(provide 'alchemist-file)
+
+;;; alchemist-file.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-goto.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-goto.el
new file mode 100644
index 0000000..2f461b0
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-goto.el
@@ -0,0 +1,297 @@
+;;; alchemist-goto.el --- Functionality to jump modules and function definitions -*- lexical-binding: t -*-
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Functionality to jump modules and function definitions
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'etags)
+(require 'dash)
+(require 'alchemist-utils)
+(require 'alchemist-server)
+(require 'alchemist-scope)
+
+(defgroup alchemist-goto nil
+  "Functionality to jump modules and function definitions."
+  :prefix "alchemist-goto-"
+  :group 'alchemist)
+
+;; Variables
+
+(defcustom alchemist-goto-erlang-source-dir ""
+  "Path to the erlang source code."
+  :type 'string
+  :group 'alchemist-goto)
+
+(defcustom alchemist-goto-elixir-source-dir ""
+  "Path to the elixir source code."
+  :type 'string
+  :group 'alchemist-goto)
+
+(defvar alchemist-goto--symbol-list '())
+(defvar alchemist-goto--symbol-name-and-pos '())
+(defvar alchemist-goto--symbol-list-bare '())
+(defvar alchemist-goto--symbol-name-and-pos-bare '())
+(defvar alchemist-goto-filter-output nil)
+(defvar alchemist-goto-callback nil)
+
+(defconst alchemist-goto--symbol-def-extract-regex
+  "^\\s-*\\(defp?\\|defmacrop?\\|defmodule\\|defimpl\\)[ \n\t]+\\([a-z_\?!]+\\)\\(.*\\)\\(do\\|\n\\)?$")
+
+(defconst alchemist-goto--symbol-def-regex
+  "^[[:space:]]*\\(defmodule\\|defmacrop?\\|defimpl\\|defp?\\)")
+
+;; Faces
+
+(defface alchemist-goto--def-face
+  '((t (:inherit font-lock-constant-face)))
+  "Face for def* symbols."
+  :group 'alchemist-goto)
+
+(defface alchemist-goto--name-face
+  '((t (:bold t)))
+  "Face for def* symbol names."
+  :group 'alchemist-goto)
+
+;; Private functions
+
+(defun alchemist-goto--build-elixir-ex-core-file (file)
+  (when (string-match "\\/\\(lib\\/.+\\/lib\\)\\/.+\.ex$" file)
+    (let* ((file (substring-no-properties file (match-beginning 1)))
+           (source-directory (alchemist-utils-add-trailing-slash
+                              (expand-file-name alchemist-goto-elixir-source-dir))))
+      (concat source-directory file))))
+
+(defun alchemist-goto--build-elixir-erl-core-file (file)
+  (when (string-match "\\/\\(lib\\/.+\\/src\\)\\/.+\.erl$" file)
+    (let* ((file (substring-no-properties file (match-beginning 1)))
+           (source-directory (alchemist-utils-add-trailing-slash
+                              (expand-file-name alchemist-goto-elixir-source-dir))))
+      (concat source-directory file))))
+
+(defun alchemist-goto--build-erlang-core-file (file)
+  (when (string-match "\\/\\(lib\\/.+\\/src\\)\\/.+\.erl$" file)
+    (let* ((file (substring-no-properties file (match-beginning 1)))
+           (source-directory (alchemist-utils-add-trailing-slash
+                              (expand-file-name alchemist-goto-erlang-source-dir))))
+      (concat source-directory file))))
+
+(defun alchemist-goto-elixir-file-p (file)
+  "Return non-nil if FILE is an Elixir file type."
+  (string-match-p "\\.ex\\(s\\)?$" file))
+
+(defun alchemist-goto-erlang-file-p (file)
+  "Return non-nil if FILE is an Erlang file type."
+  (string-match-p "\\.erl$" file))
+
+(defun alchemist-goto--symbol-definition-p (symbol)
+  (alchemist-goto--fetch-symbol-definitions)
+  (if (member symbol alchemist-goto--symbol-list-bare)
+      t
+    nil))
+
+(defun alchemist-goto--fetch-symbols-from-propertize-list (symbol)
+  (-remove 'null (-map (lambda (e)
+                         (when (string-match-p (format "^\\s-*\\(defp?\\|defmacrop?\\|defimpl\\|defmodule\\)\s+%s\\((.*\\)?$" symbol) e)
+                           e)) alchemist-goto--symbol-list)))
+
+(defun alchemist-goto--goto-symbol (symbol)
+  (let ((amount (length (-remove 'null (-map (lambda (e) (when (string= symbol e) e))
+                                             alchemist-goto--symbol-list-bare)))))
+    (if (> amount 1)
+        (let* ((selected-def (completing-read "Symbol definitions:"
+                                              (alchemist-goto--fetch-symbols-from-propertize-list symbol)))
+               (position (cdr (assoc selected-def alchemist-goto--symbol-name-and-pos))))
+          (goto-char (if (overlayp position) (overlay-start position) position)))
+      (let* ((position (cdr (assoc symbol alchemist-goto--symbol-name-and-pos-bare)))
+             (position (if (overlayp position) (overlay-start position) position)))
+        (when (not (equal (line-number-at-pos)
+                     (line-number-at-pos position)))
+          (goto-char position))))))
+
+(defun alchemist-goto-list-symbol-definitions ()
+  "List all symbol definitions in the current file like functions/macros/modules.
+
+It will jump to the position of the symbol definition after selection."
+  (interactive)
+  (alchemist-goto--fetch-symbol-definitions)
+  (ring-insert find-tag-marker-ring (point-marker))
+  (let* ((selected-def (completing-read "Symbol definitions:" alchemist-goto--symbol-list))
+         (position (cdr (assoc selected-def alchemist-goto--symbol-name-and-pos))))
+    (goto-char (if (overlayp position) (overlay-start position) position))))
+
+(defun alchemist-goto--fetch-symbol-definitions ()
+  (alchemist-goto--search-for-symbols "^\\s-*\\(defp?\\|defmacrop?\\|defimpl\\|defstruct\\|defmodule\\)\s.*"))
+
+(defun alchemist-goto--extract-symbol (str)
+  (save-match-data
+    (when (string-match alchemist-goto--symbol-def-extract-regex str)
+      (let ((type (substring str (match-beginning 1) (match-end 1)))
+            (name (substring str (match-beginning 2) (match-end 2)))
+            (arguments (substring str (match-beginning 3) (match-end 3))))
+        (concat
+         (propertize type
+                     'face 'alchemist-goto--def-face)
+         " "
+         (propertize name
+                     'face 'alchemist-goto--name-face)
+         (replace-regexp-in-string ",?\s+do:.*$" "" (replace-regexp-in-string "\s+do$" "" arguments)))))))
+
+(defun alchemist-goto--file-contains-defs-p ()
+  (alchemist-utils-occur-in-buffer-p (current-buffer) alchemist-goto--symbol-def-extract-regex))
+
+(defun alchemist-goto-jump-to-next-def-symbol ()
+  (interactive)
+  (alchemist-utils-jump-to-next-matching-line alchemist-goto--symbol-def-regex 'back-to-indentation))
+
+(defun alchemist-goto-jump-to-previous-def-symbol ()
+  (interactive)
+  (alchemist-utils-jump-to-previous-matching-line alchemist-goto--symbol-def-regex 'back-to-indentation))
+
+(defun alchemist-goto--extract-symbol-bare (str)
+  (save-match-data
+    (when (string-match alchemist-goto--symbol-def-extract-regex str)
+      (let ((name (substring str (match-beginning 2) (match-end 2))))
+        name))))
+
+(defun alchemist-goto--get-symbol-from-position (position)
+  (goto-char position)
+  (end-of-line)
+  (let* ((end-position (point))
+         (line (buffer-substring-no-properties position end-position)))
+    (alchemist-goto--extract-symbol line)))
+
+(defun alchemist-goto--get-symbol-from-position-bare (position)
+  (with-current-buffer (buffer-name)
+    (save-excursion
+      (goto-char position)
+      (end-of-line)
+      (let* ((end-position (point))
+             (line (buffer-substring-no-properties position end-position)))
+        (alchemist-goto--extract-symbol-bare line)))))
+
+(defun alchemist-goto--search-for-symbols (regex)
+  (setq alchemist-goto--symbol-list '())
+  (setq alchemist-goto--symbol-name-and-pos '())
+  (setq alchemist-goto--symbol-list-bare '())
+  (setq alchemist-goto--symbol-name-and-pos-bare '())
+  (with-current-buffer (buffer-name)
+    (save-excursion
+      (goto-char (point-min))
+      (save-match-data
+        (while (re-search-forward regex nil t)
+          (when (not (alchemist-scope-inside-string-p))
+            (when (alchemist-goto--get-symbol-from-position (car (match-data)))
+              (let* ((position (car (match-data)))
+                     (symbol (alchemist-goto--get-symbol-from-position position))
+                     (symbol-bare (alchemist-goto--get-symbol-from-position-bare position)))
+                (setq alchemist-goto--symbol-list (append alchemist-goto--symbol-list (list symbol)))
+                (setq alchemist-goto--symbol-name-and-pos (append alchemist-goto--symbol-name-and-pos (list (cons symbol position))))
+                (setq alchemist-goto--symbol-list-bare (append alchemist-goto--symbol-list-bare (list symbol-bare)))
+                (setq alchemist-goto--symbol-name-and-pos-bare (append alchemist-goto--symbol-name-and-pos-bare (list (cons symbol-bare position))))))))))))
+
+(defun alchemist-goto--open-definition (expr)
+  (let* ((module (alchemist-scope-extract-module expr))
+         (aliases (alchemist-utils-prepare-aliases-for-elixir
+                   (alchemist-scope-aliases)))
+         (function (alchemist-scope-extract-function expr))
+         (modules (alchemist-utils-prepare-modules-for-elixir
+                   (alchemist-scope-all-modules))))
+    (ring-insert find-tag-marker-ring (point-marker))
+    (cond
+     ((and (null module)
+           (alchemist-goto--symbol-definition-p function)
+           (not (string= (buffer-name) alchemist-help-buffer-name)))
+      (alchemist-goto--goto-symbol function))
+     (t
+      (setq alchemist-goto-callback (lambda (file)
+                                      (cond ((alchemist-utils-empty-string-p file)
+                                             (message "Don't know how to find: %s" expr))
+                                            ((file-exists-p file)
+                                             (alchemist-goto--open-file file module function))
+                                            ((alchemist-goto-elixir-file-p file)
+                                             (let* ((elixir-source-file (alchemist-goto--build-elixir-ex-core-file file)))
+                                               (if (file-exists-p elixir-source-file)
+                                                   (alchemist-goto--open-file elixir-source-file module function)
+                                                 (message "Don't know how to find: %s" expr))))
+                                            ((alchemist-goto-erlang-file-p file)
+                                             (let* ((elixir-source-file (alchemist-goto--build-elixir-erl-core-file file))
+                                                    (erlang-source-file (alchemist-goto--build-erlang-core-file file)))
+                                               (cond ((file-exists-p elixir-source-file)
+                                                      (alchemist-goto--open-file elixir-source-file module function))
+                                                     ((file-exists-p erlang-source-file)
+                                                      (alchemist-goto--open-file erlang-source-file module function))
+                                                     (t
+                                                      (message "Don't know how to find: %s" expr)))))
+                                            (t
+                                             (pop-tag-mark)
+                                             (message "Don't know how to find: %s" expr)))))
+      (alchemist-server-goto (format "{ \"%s,%s\", [ context: Elixir, imports: %s, aliases: %s ] }" module function modules aliases)
+                             #'alchemist-goto-filter)))))
+
+(defun alchemist-goto--open-file (file module function)
+  (let ((buf (find-file-noselect file)))
+    (switch-to-buffer buf)
+    (goto-char (point-min))
+    (cond ((alchemist-goto-elixir-file-p file)
+           (alchemist-goto--jump-to-elixir-source module function))
+          ((alchemist-goto-erlang-file-p file)
+           (alchemist-goto--jump-to-erlang-source module function)))))
+
+(defun alchemist-goto--jump-to-elixir-source (module function)
+  (cond
+   (function
+    (alchemist-goto--fetch-symbol-definitions)
+    (alchemist-goto--goto-symbol function))
+   (t
+    (when (re-search-forward (format "\\(defmodule\\|defimpl\\|defprotocol\\)\s+%s\s+do" module) nil t)
+      (goto-char (match-beginning 0))))))
+
+(defun alchemist-goto--jump-to-erlang-source (module function)
+  (when (re-search-forward (format "\\(^%s\(\\)" function) nil t)
+    (goto-char (match-beginning 0)))
+  (when (re-search-forward (format "\\(^-module\(%s\)\\)" (substring module 1)) nil t)
+    (goto-char (match-beginning 0))))
+
+(defun alchemist-goto-filter (_process output)
+  (with-local-quit
+    (setq alchemist-goto-filter-output (cons output alchemist-goto-filter-output))
+    (if (alchemist-server-contains-end-marker-p output)
+        (let* ((output (alchemist-server-prepare-filter-output alchemist-goto-filter-output))
+               (file output))
+          (setq alchemist-goto-filter-output nil)
+          (funcall alchemist-goto-callback file)))))
+
+;; Public functions
+
+(defun alchemist-goto-definition-at-point ()
+  "Jump to the elixir expression definition at point."
+  (interactive)
+  (alchemist-goto--open-definition (alchemist-scope-expression)))
+
+(defalias 'alchemist-goto-jump-back 'pop-tag-mark)
+
+(provide 'alchemist-goto)
+
+;;; alchemist-goto.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-help.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-help.el
new file mode 100644
index 0000000..c96be2f
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-help.el
@@ -0,0 +1,266 @@
+;;; alchemist-help.el --- Functionality for Elixir documentation lookup -*- lexical-binding: t -*-
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Functionality for Elixir documentation lookup.
+
+;;; Code:
+
+(require 'dash)
+(require 'ansi-color)
+(require 'alchemist-utils)
+(require 'alchemist-project)
+(require 'alchemist-server)
+(require 'alchemist-scope)
+(require 'alchemist-goto)
+
+(defgroup alchemist-help nil
+  "Functionality for Elixir documentation lookup."
+  :prefix "alchemist-help-"
+  :group 'alchemist)
+
+(defcustom alchemist-help-buffer-name "*alchemist help*"
+  "Name of the Elixir help buffer."
+  :type 'string
+  :group 'alchemist-help)
+
+(defvar alchemist-help-search-history '()
+  "Storage for the search history.")
+
+(defvar alchemist-help-current-search-text '()
+  "Stores the current search.")
+
+(defvar alchemist-help-filter-output nil)
+
+(defface alchemist-help-key-face
+  '((t (:inherit font-lock-variable-name-face :bold t :foreground "red")))
+  "Face for the letter keys in the summary."
+  :group 'alchemist-help)
+
+(defun alchemist-help-lookup-doc (search)
+  "Lookup Elixir documentation for SEARCH."
+  (setq alchemist-help-current-search-text search)
+  (setq alchemist-help-filter-output nil)
+  (if (not (alchemist-utils-empty-string-p search))
+      (alchemist-server-complete-candidates
+       (alchemist-help--completion-server-arguments search)
+       #'alchemist-help-complete-filter-output)
+    (message "No documentation for [%s] found." search)))
+
+(defun alchemist-help-no-doc-available-p (string)
+  "Return non-nil if STRING contains Elixir no documentation message."
+  (or (string-match-p "No documentation for" string)
+      (string-match-p "Could not load module" string)
+      (string-match-p "it does not have Elixir-style docs" string)
+      (alchemist-utils-empty-string-p string)))
+
+(defun alchemist-help-store-search-in-history ()
+  "Store the last `alchemist-help-current-search-text' in `alchemist-help-search-history'."
+  (unless (memq 'alchemist-help-current-search-text alchemist-help-search-history)
+    (add-to-list 'alchemist-help-search-history alchemist-help-current-search-text)))
+
+(defun alchemist-help-display-doc (content)
+  "Initialize the `alchemist-help-buffer-name' and insert CONTENT."
+  (let ((default-directory (alchemist-project-root-or-default-dir))
+        (buffer (get-buffer-create alchemist-help-buffer-name)))
+    (cond
+     ((alchemist-help-no-doc-available-p content)
+      (message (format "No documentation for [%s] found."
+                       alchemist-help-current-search-text)))
+     (t
+      (alchemist-help-store-search-in-history)
+      (with-current-buffer buffer
+        (let ((inhibit-read-only t))
+          (goto-char (point-min))
+          (erase-buffer)
+          (insert content)
+          (goto-char (point-min))
+          (ansi-color-apply-on-region (point-min) (point-max))
+          (alchemist-help-minor-mode)))
+      (pop-to-buffer buffer)))))
+
+(defun alchemist-help--search-at-point ()
+  "Search through `alchemist-help' with the expression under the cursor"
+  (let* ((expr (alchemist-scope-expression)))
+    (alchemist-help-lookup-doc (alchemist-help--prepare-search-expr expr))))
+
+(defun alchemist-help--search-marked-region (begin end)
+  "Run `alchemist-help' with the marked region.
+Argument BEGIN where the mark starts.
+Argument END where the mark ends."
+  (let ((expr (buffer-substring-no-properties begin end)))
+    (alchemist-help-lookup-doc (alchemist-help--prepare-search-expr expr))))
+
+(defun alchemist-help--prepare-search-expr (expr)
+  (let* ((module (alchemist-scope-extract-module expr))
+         (module (alchemist-scope-alias-full-path module))
+         (module (if module module ""))
+         (function (alchemist-scope-extract-function expr))
+         (function (if function function ""))
+         (expr (cond
+                ((and (not (alchemist-utils-empty-string-p module))
+                      (not (alchemist-utils-empty-string-p function)))
+                 (format "%s.%s" module function))
+                ((not (alchemist-utils-empty-string-p module))
+                 module)
+                (t
+                 expr))))
+    expr))
+
+(defun alchemist-help--elixir-modules-to-list (str)
+  (let* ((str (replace-regexp-in-string "^Elixir\\." "" str))
+         (modules (split-string str))
+         (modules (delete nil modules))
+         (modules (cl-sort modules 'string-lessp :key 'downcase))
+         (modules (-distinct modules)))
+    modules))
+
+(defun alchemist-help-minor-mode-key-binding-summary ()
+  (interactive)
+  (message
+   (concat "[" (propertize "q" 'face 'alchemist-help-key-face)
+           "]-quit ["
+           (propertize "e" 'face 'alchemist-help-key-face)
+           "]-search-at-point ["
+           (propertize "s" 'face 'alchemist-help-key-face)
+           "]-search ["
+           (propertize "h" 'face 'alchemist-help-key-face)
+           "]-history ["
+           (propertize "?" 'face 'alchemist-help-key-face)
+           "]-keys")))
+
+(defun alchemist-help--server-arguments (args)
+  (if (and (not (equal major-mode 'alchemist-iex-mode))
+           (not (bound-and-true-p alchemist-help-minor-mode)))
+      (let* ((modules (alchemist-utils-prepare-modules-for-elixir
+                       (alchemist-scope-all-modules))))
+        (format "{ \"%s\", [ context: Elixir, imports: %s, aliases: [] ] }" args modules))
+    (format "{ \"%s\", [ context: Elixir, imports: [], aliases: [] ] }" args)))
+
+(defun alchemist-help--completion-server-arguments (args)
+  "Build informations about the current context."
+  (if (and (not (equal major-mode 'alchemist-iex-mode))
+           (not (bound-and-true-p alchemist-help-minor-mode)))
+      (let* ((modules (alchemist-utils-prepare-modules-for-elixir
+                       (alchemist-scope-all-modules)))
+             (aliases (alchemist-utils-prepare-aliases-for-elixir
+                       (alchemist-scope-aliases))))
+        (format "{ \"%s\", [ context: Elixir, imports: %s, aliases: %s ] }" args modules aliases))
+    (format "{ \"%s\", [ context: Elixir, imports: [], aliases: [] ] }" args)))
+
+(defun alchemist-help-complete-filter-output (_process output)
+  (with-local-quit
+    (setq alchemist-help-filter-output (cons output alchemist-help-filter-output))
+    (if (alchemist-server-contains-end-marker-p output)
+        (let* ((string (alchemist-server-prepare-filter-output alchemist-help-filter-output))
+               (candidates (alchemist-complete--output-to-list
+                            (ansi-color-filter-apply string)))
+               (candidates (if (= (length candidates) 2)
+                               nil
+                             candidates)))
+          (setq alchemist-help-filter-output nil)
+          (if candidates
+              (let* ((search (alchemist-complete--completing-prompt alchemist-help-current-search-text candidates)))
+                (setq alchemist-help-current-search-text search)
+                (alchemist-server-help (alchemist-help--server-arguments search) #'alchemist-help-filter-output))
+            (alchemist-server-help (alchemist-help--server-arguments alchemist-help-current-search-text) #'alchemist-help-filter-output))))))
+
+(defun alchemist-help-filter-output (_process output)
+  (setq alchemist-help-filter-output (cons output alchemist-help-filter-output))
+  (if (alchemist-server-contains-end-marker-p output)
+      (let ((string (alchemist-server-prepare-filter-output alchemist-help-filter-output)))
+        (alchemist-help-display-doc string)
+        (setq alchemist-help-current-search-text nil)
+        (setq alchemist-help-filter-output nil))))
+
+(defun alchemist-help-modules-filter (_process output)
+  (with-local-quit
+    (setq alchemist-help-filter-output (cons output alchemist-help-filter-output))
+    (if (alchemist-server-contains-end-marker-p output)
+        (let* ((output (alchemist-server-prepare-filter-output alchemist-help-filter-output))
+               (modules (alchemist-help--elixir-modules-to-list output))
+               (search (completing-read
+                        "Elixir help: "
+                        modules
+                        nil
+                        nil
+                        nil))
+               (module (alchemist-scope-extract-module search))
+               (function (alchemist-scope-extract-function search))
+               (search (cond
+                        ((and module function)
+                         search)
+                        ((and module
+                              (not (string-match-p "[\/0-9]+$" module)))
+                         (concat module "."))
+                        (t
+                         search))))
+          (alchemist-help-lookup-doc (alchemist-utils-remove-dot-at-the-end search))))))
+
+;; Public functions
+
+(defun alchemist-help-search-at-point ()
+  "Search through `alchemist-help' with the expression under the cursor.
+
+If the buffer local variable `mark-active' is non-nil,
+the actively marked region will be used for passing to `alchemist-help'."
+  (interactive)
+  (if mark-active
+      (alchemist-help--search-marked-region (region-beginning) (region-end))
+      (alchemist-help--search-at-point)))
+
+(defvar alchemist-help-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "q") #'quit-window)
+    (define-key map (kbd "e") #'alchemist-help-search-at-point)
+    (define-key map (kbd "s") #'alchemist-help)
+    (define-key map (kbd "h") #'alchemist-help-history)
+    (define-key map (kbd "M-.") #'alchemist-goto-definition-at-point)
+    (define-key map (kbd "?") #'alchemist-help-minor-mode-key-binding-summary)
+    map)
+  "Keymap for `alchemist-help-minor-mode'.")
+
+(define-minor-mode alchemist-help-minor-mode
+  "Minor mode for displaying elixir help."
+  :group 'alchemist-help
+  :keymap alchemist-help-minor-mode-map
+  (cond (alchemist-help-minor-mode
+         (setq buffer-read-only t))
+        (t
+         (setq buffer-read-only nil))))
+
+(defun alchemist-help ()
+  "Load Elixir documentation for SEARCH."
+  (interactive)
+  (setq alchemist-help-filter-output nil)
+  (alchemist-server-info "{ :type, :modules }" #'alchemist-help-modules-filter))
+
+(defun alchemist-help-history (search)
+  "Load Elixir from the documentation history for SEARCH."
+  (interactive
+   (list
+    (completing-read "Elixir help history: " alchemist-help-search-history nil nil "")))
+  (alchemist-help-lookup-doc search))
+
+(provide 'alchemist-help)
+
+;;; alchemist-help.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-hooks.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-hooks.el
new file mode 100644
index 0000000..5418054
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-hooks.el
@@ -0,0 +1,60 @@
+;;; alchemist-hooks.el --- Hooks functionality
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+;;         Dave Thomas <http://pragdave.me>
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Hooks functionality
+
+;;; Code:
+
+(require 'alchemist-project)
+(require 'alchemist-mix)
+(require 'alchemist-report)
+(require 'alchemist-test-mode)
+
+(defgroup alchemist-hooks nil
+  "Hooks"
+  :prefix "alchemist-hooks-"
+  :group 'alchemist)
+
+(defcustom alchemist-hooks-test-on-save nil
+  "If t, run `alchemist-mix-test' on save."
+  :type 'boolean
+  :group 'alchemist-hooks)
+
+(defun alchemist-hooks-test-on-save ()
+  (when (and alchemist-hooks-test-on-save
+             (alchemist-project-p))
+    (alchemist-report-run "mix test"
+                          alchemist-test-report-process-name
+                          alchemist-test-report-buffer-name
+                          #'alchemist-test-report-mode
+                          #'alchemist-test--handle-exit
+                          t)))
+
+(eval-after-load 'elixir-mode
+  '(progn
+     (add-hook 'after-save-hook 'alchemist-hooks-test-on-save nil nil)))
+
+(provide 'alchemist-hooks)
+
+;;; alchemist-hooks.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-iex.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-iex.el
new file mode 100644
index 0000000..e5dc498
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-iex.el
@@ -0,0 +1,229 @@
+;;; alchemist-help.el --- Interaction with an Elixir IEx process
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Interaction with an Elixir IEx process
+
+;;; Code:
+
+(require 'comint)
+(require 'company)
+(require 'alchemist-key)
+(require 'alchemist-scope)
+(require 'alchemist-project)
+
+(defgroup alchemist-iex nil
+  "Interaction with an Elixir IEx process."
+  :prefix "alchemist-iex-"
+  :group 'alchemist)
+
+(defcustom alchemist-iex-program-name "iex"
+  "The shell command for iex."
+  :type 'string
+  :group 'alchemist-iex)
+
+(defcustom alchemist-iex-prompt-read-only t
+  "If non-nil, the prompt will be read-only."
+  :type 'boolean
+  :group 'alchemist-iex)
+
+(defvar alchemist-iex-buffer nil
+  "The buffer in which the Elixir IEx process is running.")
+
+(defvar alchemist-iex-mode-hook nil
+  "Hook for customizing `alchemist-iex-mode'.")
+
+(defvar alchemist-iex-mode-map
+  (let ((map (nconc (make-sparse-keymap) comint-mode-map)))
+    (define-key map "\t" 'completion-at-point)
+    (define-key map (kbd (format "%s i r" alchemist-key-command-prefix)) 'alchemist-iex-open-input-ring)
+    (define-key map (kbd (format "%s i c" alchemist-key-command-prefix)) 'alchemist-iex-clear-buffer)
+    (define-key map (kbd (format "%s h e" alchemist-key-command-prefix)) 'alchemist-help-search-at-point)
+    (define-key map (kbd "M-.") 'alchemist-goto-definition-at-point)
+    map))
+
+(eval-after-load 'company
+  '(progn
+     (defun alchemist-iex--set-company-as-completion-at-point-function ()
+       (setq completion-at-point-functions '(company-complete)))
+     (add-hook 'alchemist-iex-mode-hook 'alchemist-iex--set-company-as-completion-at-point-function)))
+
+(define-derived-mode alchemist-iex-mode comint-mode "Alchemist-IEx"
+  "Major mode for interacting with an Elixir IEx process.
+
+\\<alchemist-iex-mode-map>"
+  nil "Alchemist-IEx"
+  (set (make-local-variable 'comint-prompt-regexp) "^\\(iex\\|\.\.\.\\)\(.+\)>")
+  (set (make-local-variable 'comint-prompt-read-only) alchemist-iex-prompt-read-only)
+  (set (make-local-variable 'comint-input-autoexpand) nil)
+  (set (make-local-variable 'comint-input-sender) 'alchemist-iex--send-command)
+  (add-hook 'comint-output-filter-functions 'alchemist-iex-spot-prompt nil t))
+
+(defun alchemist-iex-command (arg)
+  (split-string-and-unquote
+   (if (null arg) alchemist-iex-program-name
+     (read-string "Command to run Elixir IEx: " (concat alchemist-iex-program-name arg)))))
+
+(defun alchemist-iex-start-process (command)
+  "Start an IEX process.
+With universal prefix \\[universal-argument], prompts for a COMMAND,
+otherwise uses `alchemist-iex-program-name'.
+It runs the hook `alchemist-iex-mode-hook' after starting the process and
+setting up the IEx buffer."
+  (interactive (list (alchemist-iex-command current-prefix-arg)))
+  (setq alchemist-iex-buffer
+        (apply 'make-comint "Alchemist-IEx" (car command) nil (cdr command)))
+  (with-current-buffer alchemist-iex-buffer
+    (alchemist-iex-mode)
+    (run-hooks 'alchemist-iex-mode-hook)))
+
+(defun alchemist-iex-process (&optional arg)
+  (or (if (buffer-live-p alchemist-iex-buffer)
+          (get-buffer-process alchemist-iex-buffer))
+      (progn
+        (let ((current-prefix-arg arg))
+          (call-interactively 'alchemist-iex-start-process))
+        (alchemist-iex-process arg))))
+
+(defun alchemist-iex--remove-newlines (string)
+  (replace-regexp-in-string "\n" " " string))
+
+(defun alchemist-iex-send-last-sexp ()
+  "Send the previous sexp to the inferior IEx process."
+  (interactive)
+  (alchemist-iex-send-region (save-excursion (backward-sexp) (point)) (point)))
+
+(defun alchemist-iex-send-current-line ()
+  "Sends the current line to the IEx process."
+  (interactive)
+  (let ((str (thing-at-point 'line)))
+    (alchemist-iex--send-command (alchemist-iex-process) str)))
+
+(defun alchemist-iex-send-current-line-and-go ()
+  "Sends the current line to the inferior IEx process
+and jump to the buffer."
+  (interactive)
+  (call-interactively 'alchemist-iex-send-current-line)
+  (pop-to-buffer (process-buffer (alchemist-iex-process))))
+
+(defun alchemist-iex-send-region-and-go ()
+  "Sends the marked region to the inferior IEx process
+and jump to the buffer."
+  (interactive)
+  (call-interactively 'alchemist-iex-send-region)
+  (pop-to-buffer (process-buffer (alchemist-iex-process))))
+
+(defun alchemist-iex-send-region (beg end)
+  "Sends the marked region to the IEx process."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let* ((region (buffer-substring-no-properties beg end)))
+    (alchemist-iex--send-command (alchemist-iex-process) region)))
+
+(defun alchemist-iex-compile-this-buffer ()
+  "Compiles the current buffer in the IEx process."
+  (interactive)
+  (let ((str (format "c(\"%s\")" (buffer-file-name))))
+    (alchemist-iex--send-command (alchemist-iex-process) str)))
+
+(defun alchemist-iex-reload-module ()
+  "Recompiles and reloads the current module in the IEx process."
+  (interactive)
+  (let ((str (format "r(%s)" (alchemist-scope-module))))
+    (alchemist-iex--send-command (alchemist-iex-process) str)))
+
+(defun alchemist-iex--send-command (proc str)
+  (let ((lines (split-string str "\n" nil)))
+    (with-current-buffer (process-buffer proc)
+      (-map (lambda (line)
+              (alchemist-iex-wait-for-prompt proc)
+              (goto-char (process-mark proc))
+              (insert-before-markers (concat line "\n"))
+              (move-marker comint-last-input-end (point))
+              (comint-send-string proc (concat line "\n"))) lines))))
+
+(defvar alchemist-iex-seen-prompt nil)
+(make-variable-buffer-local 'alchemist-iex-seen-prompt)
+
+(defun alchemist-iex-spot-prompt (_string)
+  (let ((proc (get-buffer-process (current-buffer))))
+    (when proc
+      (save-excursion
+        (goto-char (process-mark proc))
+        (if (re-search-backward comint-prompt-regexp
+                                (line-beginning-position) t)
+            (setq alchemist-iex-seen-prompt t))))))
+
+(defun alchemist-iex-wait-for-prompt (proc &optional timeout)
+  "Wait until PROC sends us a prompt.
+The process PROC should be associated to a comint buffer."
+  (with-current-buffer (process-buffer proc)
+    (while (progn
+             (goto-char comint-last-input-end)
+             (not (or alchemist-iex-seen-prompt
+                      (setq alchemist-iex-seen-prompt
+                            (re-search-forward comint-prompt-regexp nil t))
+                      (not (accept-process-output proc timeout))))))
+    (unless alchemist-iex-seen-prompt
+      (error "Can't find the IEx prompt"))
+    (setq alchemist-iex-seen-prompt nil)))
+
+(defun alchemist-iex-clear-buffer ()
+  "Clear the current iex process buffer."
+  (interactive)
+  (let ((comint-buffer-maximum-size 0))
+    (comint-truncate-buffer)))
+
+(defun alchemist-iex-open-input-ring ()
+    "Open the buffer containing the input history."
+    (interactive)
+    (progn
+      (comint-dynamic-list-input-ring)
+      (other-window 1)))
+
+;;;###autoload
+(defalias 'run-elixir 'alchemist-iex-run)
+(defalias 'inferior-elixir 'alchemist-iex-run)
+
+;;;###autoload
+(defun alchemist-iex-run (&optional arg)
+  "Start an IEx process.
+Show the IEx buffer if an IEx process is already run."
+  (interactive "P")
+  (let ((proc (alchemist-iex-process arg)))
+    (pop-to-buffer (process-buffer proc))))
+
+;;;###autoload
+(defun alchemist-iex-project-run ()
+  "Start an IEx process with mix 'iex -S mix' in the
+context of an Elixir project.
+Show the IEx buffer if an IEx process is already run."
+  (interactive)
+  (if (alchemist-project-p)
+      (let ((default-directory (alchemist-project-root)))
+        (pop-to-buffer (process-buffer (alchemist-iex-process " -S mix"))))
+    (message "No mix.exs file available. Please use `alchemist-iex-run' instead.")))
+
+(provide 'alchemist-iex)
+
+;;; alchemist-iex.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-info.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-info.el
new file mode 100644
index 0000000..8fdf79b
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-info.el
@@ -0,0 +1,95 @@
+;;; alchemist-info.el --- Getting informations from the server.  -*- lexical-binding: t -*-
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Getting informations from the server.
+
+;;; Code:
+
+(require 'ansi-color)
+
+(defgroup alchemist-info nil
+  "Getting informations from the server."
+  :prefix "alchemist-info-"
+  :group 'alchemist)
+
+(defconst alchemist-info-buffer-name "*alchemist-info-mode*"
+  "Name of the Elixir info buffer.")
+
+(defvar alchemist-info-filter-output nil)
+
+(defvar alchemist-info-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "q") #'quit-window)
+    map)
+  "Keymap for `alchemist-info-mode'.")
+
+(defun alchemist-info-datatype-filter (_process output)
+  (setq alchemist-info-filter-output (cons output alchemist-info-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-create-popup alchemist-info-buffer-name
+                                     (alchemist-server-prepare-filter-output alchemist-info-filter-output)
+                                     #'(lambda ()
+                                         (alchemist-info-mode)
+                                         (ansi-color-apply-on-region (point-min) (point-max))))
+    (setq alchemist-info-filter-output nil)))
+
+(defun alchemist-info-expression-at-point ()
+  "Return the expression under the cursor."
+  (let (p1 p2)
+    (save-excursion
+      (skip-chars-backward "-_A-Za-z0-9.?!:@\'\"")
+      (setq p1 (point))
+      (skip-chars-forward "-_A-Za-z0-9.?!:@\'\"")
+      (setq p2 (point))
+      (buffer-substring-no-properties p1 p2))))
+
+(defun alchemist-info-datatype-at-point ()
+  "Return information about any datatype under the cursor."
+  (interactive)
+  (let ((expr (if mark-active
+                  (buffer-substring-no-properties (region-beginning) (region-end))
+                (alchemist-info-expression-at-point))))
+    (alchemist-server-info (format "{ :type, :info, '%s' }" expr) #'alchemist-info-datatype-filter)))
+
+(defun alchemist-info-types-at-point ()
+  "Return information of types under the cursor."
+  (interactive)
+  (let ((expr (alchemist-info-expression-at-point)))
+    (alchemist-server-info (format "{ :type, :types, '%s' }" expr) #'alchemist-info-datatype-filter)))
+
+(defun alchemist-info-close-popup ()
+  "Quit the information buffer window."
+  (interactive)
+  (quit-windows-on alchemist-info-buffer-name))
+
+(define-minor-mode alchemist-info-mode
+  "Minor mode for Alchemist server information.
+
+\\{alchemist-info-mode-map}"
+  nil
+  " Alchemist-Info"
+  alchemist-info-mode-map)
+
+(provide 'alchemist-info)
+
+;;; alchemist-info.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-interact.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-interact.el
new file mode 100644
index 0000000..2188dd5
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-interact.el
@@ -0,0 +1,64 @@
+;;; alchemist-interact.el --- Interaction interface -*- lexical-binding: t -*-
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Interaction interface.
+
+;;; Code:
+
+(defgroup alchemist-interact nil
+  "Interaction interface."
+  :prefix "alchemist-interact-"
+  :group 'alchemist)
+
+(defun alchemist-interact-insert-as-comment (string)
+  "Insert STRING at point as comment."
+  (let ((lines (split-string string "\n")))
+    (if (> (length lines) 1)
+        (save-excursion
+          (end-of-line)
+          (mapc (lambda (s)
+                  (newline)
+                  (insert (format "# => %s" s))
+                  (indent-according-to-mode))
+                lines))
+      (save-excursion
+        (end-of-line)
+        (insert (format "  # => %s" string))))))
+
+(defun alchemist-interact-create-popup (name content mode)
+  "Create a NAME buffer and insert CONTENT.
+Call the MODE afterwards."
+  (let ((buffer (get-buffer-create name)))
+    (with-current-buffer buffer
+      (with-current-buffer-window
+       buffer (cons 'display-buffer-below-selected
+                    '((window-height . fit-window-to-buffer)))
+       (lambda (_window _buffer))
+       (let ((inhibit-read-only t))
+         (insert content)
+         (goto-char (point-min))
+         (funcall mode))))))
+
+(provide 'alchemist-interact)
+
+;;; alchemist-interact.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-key.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-key.el
new file mode 100644
index 0000000..2a58f9a
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-key.el
@@ -0,0 +1,40 @@
+;;; alchemist-key.el --- Key prefix setup for Alchemist related key commands
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Key prefix setup for Alchemist related key commands.
+
+;;; Code:
+
+(defgroup alchemist-key nil
+  "Key prefix setup for Alchemist related key commands."
+  :prefix "alchemist-key-"
+  :group 'alchemist)
+
+(defcustom alchemist-key-command-prefix (kbd "C-c a")
+  "The prefix for Alchemist related key commands."
+  :type 'string
+  :group 'alchemist)
+
+(provide 'alchemist-key)
+
+;;; alchemist-key.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-macroexpand.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-macroexpand.el
new file mode 100644
index 0000000..7513372
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-macroexpand.el
@@ -0,0 +1,156 @@
+;;; alchemist-macroexpand.el --- Macro expansion support -*- lexical-binding: t -*-
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Macro expansion support
+
+;;; Code:
+
+(require 'alchemist-server)
+(require 'alchemist-interact)
+
+(defgroup alchemist-macroexpand nil
+  "Macro expansion support."
+  :prefix "alchemist-macroexpand-"
+  :group 'alchemist)
+
+(defvar alchemist-macroexpand-filter-output nil)
+
+(defconst alchemist-macroexpand-buffer-name "*alchemist macroexpand*"
+  "Name of the Elixir Macro expand buffer.")
+
+(defun alchemist-macroexpand-filter (_process output)
+  (setq alchemist-macroexpand-filter-output (cons output alchemist-macroexpand-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-create-popup alchemist-macroexpand-buffer-name
+                                     (alchemist-server-prepare-filter-output alchemist-macroexpand-filter-output)
+                                     #'(lambda ()
+                                         (elixir-mode)
+                                         (alchemist-macroexpand-mode)))
+    (setq alchemist-macroexpand-filter-output nil)))
+
+(defun alchemist-macroexpand-insert-filter (_process output)
+  (setq alchemist-macroexpand-filter-output (cons output alchemist-macroexpand-filter-output))
+  (when (alchemist-server-contains-end-marker-p output)
+    (alchemist-interact-insert-as-comment
+     (alchemist-server-prepare-filter-output alchemist-macroexpand-filter-output))
+    (setq alchemist-macroexpand-filter-output nil)))
+
+(defun alchemist-macroexpand-expand-request (expr)
+  (let ((file (make-temp-file "alchemist-expand" nil ".exs")))
+    (with-temp-file file
+      (insert expr))
+    (alchemist-server-eval (format "{ :expand, '%s' }" file) #'alchemist-macroexpand-filter)))
+
+(defun alchemist-macroexpand-expand-and-print-request (expr)
+  (let ((file (make-temp-file "alchemist-expand" nil ".exs")))
+    (with-temp-file file
+      (insert expr))
+    (alchemist-server-eval (format "{ :expand, '%s' }" file) #'alchemist-macroexpand-insert-filter)))
+
+(defun alchemist-macroexpand-expand-once-request (expr)
+  (let ((file (make-temp-file "alchemist-expand-once" nil ".exs")))
+    (with-temp-file file
+      (insert expr))
+    (alchemist-server-eval (format "{ :expand_once, '%s' }" file) #'alchemist-macroexpand-filter)))
+
+(defun alchemist-macroexpand-expand-once-and-print-request (expr)
+  (let ((file (make-temp-file "alchemist-expand-once" nil ".exs")))
+    (with-temp-file file
+      (insert expr))
+    (alchemist-server-eval (format "{ :expand_once, '%s' }" file) #'alchemist-macroexpand-insert-filter)))
+
+(defun alchemist-macroexpand-current-line ()
+  "Macro expand the Elixir code on the current line."
+  (interactive)
+  (alchemist-macroexpand-expand-request (thing-at-point 'line)))
+
+(defun alchemist-macroexpand-print-current-line ()
+  "Macro expand the Elixir code on the current line and insert the result."
+  (interactive)
+  (alchemist-macroexpand-expand-and-print-request (thing-at-point 'line)))
+
+(defun alchemist-macroexpand-once-current-line ()
+  "Macro expand the Elixir code on the current line."
+  (interactive)
+  (alchemist-macroexpand-expand-once-request (thing-at-point 'line)))
+
+(defun alchemist-macroexpand-once-print-current-line ()
+  "Macro expand the Elixir code on the current line and insert the result."
+  (interactive)
+  (alchemist-macroexpand-expand-once-and-print-request (thing-at-point 'line)))
+
+(defun alchemist-macroexpand-print-region (beg end)
+  "Macro expand the Elixir code on marked region and insert the result."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (when (> end beg)
+      (exchange-point-and-mark))
+    (alchemist-macroexpand-expand-and-print-request string)))
+
+(defun alchemist-macroexpand-region (beg end)
+  "Macro expand the Elixir code on marked region."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (alchemist-macroexpand-expand-request string)))
+
+(defun alchemist-macroexpand-once-print-region (beg end)
+  "Macro expand the Elixir code on marked region once and insert the result."
+  (interactive "r")
+  (let ((string (buffer-substring-no-properties beg end)))
+    (when (> end beg)
+      (exchange-point-and-mark))
+    (alchemist-macroexpand-expand-once-and-print-request string)))
+
+(defun alchemist-macroexpand-once-region (beg end)
+  "Macro expand the Elixir code on marked region once."
+  (interactive (list (point) (mark)))
+  (unless (and beg end)
+    (error "The mark is not set now, so there is no region"))
+  (let ((string (buffer-substring-no-properties beg end)))
+    (alchemist-macroexpand-expand-once-request string)))
+
+(defun alchemist-macroexpand-close-popup ()
+  "Quit the macroexpand buffer window."
+  (interactive)
+  (quit-windows-on alchemist-macroexpand-buffer-name))
+
+(defvar alchemist-macroexpand-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "q") #'quit-window)
+    map)
+  "Keymap for `alchemist-macroexpand-mode'.")
+
+(define-minor-mode alchemist-macroexpand-mode
+  "Minor mode for Alchemist Elixir macroexpand functionality.
+
+\\{alchemist-macroexpand-mode-map}"
+  nil
+  alchemist-macroexpand-mode-map)
+
+(provide 'alchemist-macroexpand)
+
+;;; alchemist-macroexpand.el ends here
diff --git a/emacs.d/elpa/alchemist-20150624.159/alchemist-message.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-message.el
similarity index 100%
rename from emacs.d/elpa/alchemist-20150624.159/alchemist-message.el
rename to emacs.d/elpa/alchemist-20160111.2340/alchemist-message.el
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-mix.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-mix.el
new file mode 100644
index 0000000..5585bd4
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-mix.el
@@ -0,0 +1,227 @@
+;;; alchemist-mix.el --- Interface to run Elixir mix tasks inside Emacs
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Interface to run Elixir mix tasks inside Emacs.
+
+;;; Code:
+
+(require 'alchemist-utils)
+(require 'alchemist-project)
+(require 'alchemist-test-mode)
+(require 'alchemist-server)
+
+(defgroup alchemist-mix nil
+  "Emacs integration for Elixir's mix."
+  :prefix "alchemist-mix-"
+  :group 'alchemist)
+
+;; Variables
+
+(defvar alchemist-last-run-test nil)
+(defvar alchemist-mix-filter-output nil)
+
+(defcustom alchemist-mix-command "mix"
+  "The shell command for mix."
+  :type 'string
+  :group 'alchemist-mix)
+
+(defcustom alchemist-mix-test-task "test"
+  "Default task to run tests."
+  :type 'string
+  :group 'alchemist-mix)
+
+(defcustom alchemist-mix-test-default-options '()
+  "Default options for alchemist test command."
+  :type '(repeat string)
+  :group 'alchemist-mix)
+
+(defcustom alchemist-mix-env nil
+  "The default mix env to run mix commands with.  If nil, the mix env is
+not set explicitly."
+  :type '(string boolean)
+  :group 'alchemist-mix)
+
+(defvar alchemist-mix-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "q" #'quit-window)
+    (define-key map "i" #'alchemist-mix-send-input-to-mix-process)
+    map))
+
+(defvar alchemist-mix-buffer-name "*alchemist mix*"
+  "Name of the mix output buffer.")
+
+(defvar alchemist-mix--envs '("dev" "prod" "test")
+  "The list of mix envs to use as defaults.")
+
+;; Private functions
+
+(defun alchemist-mix--completing-read (prompt cmdlist)
+  (completing-read prompt cmdlist nil t nil nil (car cmdlist)))
+
+(defun alchemist-mix--execute-test (&optional what)
+  "Execute 'mix test' on the given `WHAT'.
+
+`WHAT' could be a filename, a filename:line string or the empty string (meaning
+run all tests)."
+  (if what
+      (setq alchemist-last-run-test what)
+    (setq alchemist-last-run-test ""))
+  (alchemist-test-execute (list "mix"
+                                alchemist-mix-test-task
+                                what
+                                alchemist-mix-test-default-options)))
+
+(defun alchemist-mix--test-file (filename)
+  "Run a specific FILENAME as argument for the mix command test."
+  (when (not (file-exists-p filename))
+    (error "The given file doesn't exist"))
+  (alchemist-mix--execute-test (expand-file-name filename)))
+
+;; Public functions
+
+(defun alchemist-mix ()
+  "Prompt for a specific mix task to run.
+
+If the command `universal-argument' is called before `alchemist-mix',
+a prompt for a specific mix environment in which the task will be
+executed, gets called."
+  (interactive)
+  (alchemist-server-info "{ :type, :mixtasks }" #'alchemist-mix-filter))
+
+(defun alchemist-mix-display-mix-buffer ()
+  "Display the mix buffer when exists."
+  (interactive)
+  (when (get-buffer alchemist-mix-buffer-name)
+    (display-buffer alchemist-mix-buffer-name)))
+
+(defun alchemist-mix-test ()
+  "Run the whole elixir test suite."
+  (interactive)
+  (alchemist-mix--execute-test))
+
+(defun alchemist-mix-test-this-buffer ()
+  "Run the current buffer through mix test."
+  (interactive)
+  (alchemist-mix--test-file buffer-file-name))
+
+(defun alchemist-mix-test-file (filename)
+  "Run `alchemist-mix--test-file' with the FILENAME."
+  (interactive "Fmix test: ")
+  (alchemist-mix--test-file (expand-file-name filename)))
+
+(defun alchemist-mix-test-at-point ()
+  "Run the test at point."
+  (interactive)
+  (let* ((line (line-number-at-pos (point)))
+         (file-and-line (format "%s:%s" buffer-file-name line)))
+    (alchemist-mix--execute-test file-and-line)))
+
+(defun alchemist-mix-rerun-last-test ()
+  "Rerun the last test that was run by alchemist.
+
+When no tests had been run before calling this function, do nothing."
+  (interactive)
+  (if alchemist-last-run-test
+      (alchemist-mix--execute-test alchemist-last-run-test)
+    (message "No tests have been run yet")))
+
+(defun alchemist-mix-compile (command &optional prefix)
+  "Compile the whole elixir project. Prompt for the mix env if the prefix
+arg is set."
+  (interactive "Mmix compile: \nP")
+  (alchemist-mix-execute (list "compile" command) prefix))
+
+(defun alchemist-mix-run (command &optional prefix)
+  "Runs the given file or expression in the context of the application."
+  (interactive "Mmix run: \nP")
+  (alchemist-mix-execute (list "run" command) prefix))
+
+(defun alchemist-mix-send-input-to-mix-process (input)
+  "Send INPUT to the current running mix task process."
+  (interactive "MSend to running mix task: ")
+  (let* ((buffer (get-buffer alchemist-mix-buffer-name))
+         (process (get-buffer-process buffer)))
+    (if (and process (eq (process-status process) 'run))
+        (with-current-buffer buffer
+          (let ((inhibit-read-only t))
+            (goto-char (point-max))
+            (insert (concat input "\n\n"))
+            (set-marker (process-mark process) (point)))
+          (comint-send-string process (concat input "\n")))
+      (error "No %s process is running" alchemist-mix-buffer-name))))
+
+(defun alchemist-mix-help () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-help" "alchemist-mix"))
+(defun alchemist-mix-new () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-new" "alchemist-mix"))
+(defun alchemist-mix-deps () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-deps" "alchemist-mix"))
+(defun alchemist-mix-deps-with-prompt () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-deps-with-prompt" "alchemist-mix"))
+(defun alchemist-mix-local-with-prompt () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-local-with-prompt" "alchemist-mix"))
+(defun alchemist-mix-local () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-local" "alchemist-mix"))
+(defun alchemist-mix-local-install () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-local-install" "alchemist-mix"))
+(defun alchemist-mix-local-with-url () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-local-with-url" "alchemist-mix"))
+(defun alchemist-mix-local-with-path () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-local-with-path" "alchemist-mix"))
+(defun alchemist-mix-hex-search () (interactive)
+       (alchemist-utils-deprecated-message "alchemist-mix-local-hex-search" "alchemist-mix"))
+
+(defun alchemist-mix-filter (_process output)
+  (with-local-quit
+    (setq alchemist-mix-filter-output (cons output alchemist-mix-filter-output))
+    (when (alchemist-server-contains-end-marker-p output)
+      (let* ((output (alchemist-server-prepare-filter-output alchemist-mix-filter-output))
+             (tasks (split-string output "\n"))
+             (selected-task (alchemist-mix--completing-read "mix: " tasks))
+             (command (read-shell-command "mix " (concat selected-task " "))))
+        (setq alchemist-mix-filter-output nil)
+        (alchemist-mix-execute (list command) current-prefix-arg)))))
+
+(define-derived-mode alchemist-mix-mode fundamental-mode "Mix Mode"
+  "Major mode for presenting Mix tasks.
+
+\\{alchemist-mix-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil))
+
+(defun alchemist-mix-execute (command-list &optional prefix)
+  "Run a mix task specified by COMMAND-LIST.
+
+If PREFIX is non-nil, prompt for a mix environment variable."
+  (let* ((mix-env (if prefix
+                      (completing-read "mix env: " alchemist-mix--envs nil nil alchemist-mix-env)
+                    alchemist-mix-env))
+         (command (alchemist-utils-build-command
+                   (list (when mix-env (concat "MIX_ENV=" mix-env))
+                         alchemist-mix-command command-list))))
+    (alchemist-report-run command "alchemist-mix-report" alchemist-mix-buffer-name 'alchemist-mix-mode)))
+
+(provide 'alchemist-mix)
+
+;;; alchemist-mix.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-phoenix.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-phoenix.el
new file mode 100644
index 0000000..1d06004
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-phoenix.el
@@ -0,0 +1,145 @@
+;;; alchemist-phoenix.el --- Minor mode for the Phoenix web framework
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Minor mode for the Phoenix web framework
+
+;;; Code:
+
+(require 'alchemist-key)
+(require 'alchemist-project)
+
+(defgroup alchemist-phoenix nil
+  "Minor mode for the Phoenix web framework."
+  :prefix "alchemist-phoenix-"
+  :group 'alchemist)
+
+;;;###autoload
+(defun alchemist-phoenix-project-p ()
+  "Return non-nil if `default-directory' is inside an Phoenix project."
+  (and (alchemist-project-p)
+       (file-directory-p (concat (alchemist-project-root) "web"))))
+
+(defun alchemist-phoenix-find-dir (directory)
+  (unless (alchemist-phoenix-project-p)
+    (error "Could not find an Phoenix Mix project root."))
+  (alchemist-file-find-files (alchemist-project-root) directory))
+
+(defun alchemist-phoenix-find-web ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web"))
+
+(defun alchemist-phoenix-find-views ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web/views"))
+
+(defun alchemist-phoenix-find-controllers ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web/controllers"))
+
+(defun alchemist-phoenix-find-channels ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web/channels"))
+
+(defun alchemist-phoenix-find-templates ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web/templates"))
+
+(defun alchemist-phoenix-find-models ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web/models"))
+
+(defun alchemist-phoenix-find-static ()
+  (interactive)
+  (alchemist-phoenix-find-dir "web/static"))
+
+(defun alchemist-phoenix-routes (&optional prefix)
+  (interactive)
+  "Run the Mix task 'phoenix.routes' and list all available Phoenix routes."
+  (alchemist-mix-execute '("phoenix.routes") prefix))
+
+(defun alchemist-phoenix-router ()
+  "Open the 'router.ex' file from 'web' directory."
+  (interactive)
+  (unless (alchemist-phoenix-project-p)
+    (error "Could not find an Phoenix Mix project root."))
+  (find-file (concat (alchemist-project-root) "web/router.ex")))
+
+(defvar alchemist-phoenix-command-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "n w") #'alchemist-phoenix-find-web)
+    (define-key map (kbd "n v") #'alchemist-phoenix-find-views)
+    (define-key map (kbd "n c") #'alchemist-phoenix-find-controllers)
+    (define-key map (kbd "n l") #'alchemist-phoenix-find-channels)
+    (define-key map (kbd "n t") #'alchemist-phoenix-find-templates)
+    (define-key map (kbd "n m") #'alchemist-phoenix-find-models)
+    (define-key map (kbd "n s") #'alchemist-phoenix-find-static)
+    (define-key map (kbd "n r") #'alchemist-phoenix-router)
+    (define-key map (kbd "n R") #'alchemist-phoenix-routes)
+    map)
+  "Keymap for Alchemist Phoenix commands after `alchemist-key-command-prefix'.")
+(fset 'alchemist-phoenix-command-map alchemist-phoenix-command-map)
+
+(defvar alchemist-phoenix-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map alchemist-key-command-prefix 'alchemist-phoenix-command-map)
+    map)
+  "Keymap for Alchemist Phoenix minor mode.")
+
+(easy-menu-define alchemist-mode-menu alchemist-phoenix-mode-map
+  "Menu for Alchemist-Phoenix mode."
+  '("Phoenix"
+    ("Directory lookup"
+     ["Lookup 'web' " alchemist-phoenix-find-web]
+     ["Lookup 'web/views' " alchemist-phoenix-find-views]
+     ["Lookup 'web/controllers' " alchemist-phoenix-find-controllers]
+     ["Lookup 'web/channels' " alchemist-phoenix-find-channels]
+     ["Lookup 'web/templates' " alchemist-phoenix-find-templates]
+     ["Lookup 'web/models' " alchemist-phoenix-find-models]
+     ["Lookup 'web/static'" alchemist-phoenix-find-static])
+    ("Mix tasks"
+     ["Run 'phoenix.routes'" alchemist-phoenix-routes])
+    ["Open the 'router.ex' file" alchemist-phoenix-router]))
+
+;;;###autoload
+(define-minor-mode alchemist-phoenix-mode
+  "Minor mode for Elixir Phoenix web framework projects.
+
+The following commands are available:
+
+\\{alchemist-phoenix-mode-map}"
+  :lighter " alchemist-phoenix"
+  :keymap alchemist-phoenix-mode-map
+  :group 'alchemist)
+
+;;;###autoload
+(defun alchemist-phoenix-enable-mode ()
+  (when (alchemist-phoenix-project-p)
+    (alchemist-phoenix-mode)))
+
+;;;###autoload
+(dolist (hook '(alchemist-mode-hook))
+  (add-hook hook 'alchemist-phoenix-enable-mode))
+
+(provide 'alchemist-phoenix)
+
+;;; alchemist-phoenix.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-pkg.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-pkg.el
new file mode 100644
index 0000000..c155e2d
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-pkg.el
@@ -0,0 +1,11 @@
+(define-package "alchemist" "20160111.2340" "Elixir tooling integration into Emacs"
+  '((elixir-mode "2.2.5")
+    (dash "2.11.0")
+    (emacs "24.4")
+    (company "0.8.0")
+    (pkg-info "0.4"))
+  :url "http://www.github.com/tonini/alchemist.el" :keywords
+  '("languages" "elixir" "elixirc" "mix" "hex" "alchemist"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-project.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-project.el
new file mode 100644
index 0000000..0aa19c5
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-project.el
@@ -0,0 +1,222 @@
+;;; alchemist-project.el --- API to identify Elixir mix projects.
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; API to identify Elixir mix projects.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'dash)
+(require 'alchemist-utils)
+(require 'alchemist-file)
+
+(defgroup alchemist-project nil
+  "API to identify Elixir mix projects."
+  :prefix "alchemist-help-"
+  :group 'alchemist)
+
+(defconst alchemist-project-mix-project-indicator "mix.exs"
+  "File which indicates the root directory of an Elixir Mix project.")
+
+(defconst alchemist-project-hex-pkg-indicator ".hex"
+  "File which indicates the root directory of an Elixir Hex package.")
+
+(defun alchemist-project-elixir-p ()
+  "Return non-nil if `default-directory' is inside the Elixir source codebase."
+  (stringp (alchemist-project-elixir-root)))
+
+(defun alchemist-project-elixir-root (&optional dir)
+  "Return root directory of the Elixir source."
+  (let* ((dir (file-name-as-directory (or dir (expand-file-name default-directory))))
+         (present-files (directory-files dir)))
+    (cond ((alchemist-project-top-level-dir-p dir)
+           nil)
+          ((and (-contains-p present-files "eex")
+                (-contains-p present-files "elixir")
+                (-contains-p present-files "logger")
+                (-contains-p present-files "mix")
+                (-contains-p present-files "iex")
+                (-contains-p present-files "ex_unit"))
+           (file-name-directory (directory-file-name dir)))
+          (t (alchemist-project-elixir-root (file-name-directory (directory-file-name dir)))))))
+
+(defun alchemist-project-p ()
+  "Return non-nil if `default-directory' is inside an Elixir Mix project."
+  (stringp (alchemist-project-root)))
+
+(defun alchemist-project-top-level-dir-p (dir)
+  "Return non-nil if DIR is the top level directory."
+  (equal dir (file-name-directory (directory-file-name dir))))
+
+(defun alchemist-project-root (&optional dir)
+  "Return root directory of the current Elixir Mix project.
+
+It starts walking the directory tree to find the Elixir Mix root directory
+from `default-directory'. If DIR is non-nil it starts walking the
+directory from there instead."
+  (let* ((dir (file-name-as-directory (or dir (expand-file-name default-directory))))
+         (present-files (directory-files dir)))
+    (cond ((alchemist-project-top-level-dir-p dir)
+           nil)
+          ((-contains-p present-files alchemist-project-hex-pkg-indicator)
+           (alchemist-project-root (file-name-directory (directory-file-name dir))))
+          ((-contains-p present-files alchemist-project-mix-project-indicator)
+           dir)
+          (t
+           (alchemist-project-root (file-name-directory (directory-file-name dir)))))))
+
+(defun alchemist-project-root-or-default-dir ()
+  "Return the current Elixir mix project root or `default-directory'."
+  (let* ((project-root (alchemist-project-root))
+         (dir (if project-root
+                  project-root
+                default-directory)))
+    dir))
+
+(defun alchemist-project-toggle-file-and-tests-other-window ()
+  "Toggle between a file and its tests in other window."
+  (interactive)
+  (if (alchemist-utils-test-file-p)
+      (alchemist-project-open-file-for-current-tests 'find-file-other-window)
+    (alchemist-project-open-tests-for-current-file 'find-file-other-window)))
+
+(defun alchemist-project-toggle-file-and-tests ()
+  "Toggle between a file and its tests in the current window."
+  (interactive)
+  (if (alchemist-utils-test-file-p)
+      (alchemist-project-open-file-for-current-tests 'find-file)
+    (alchemist-project-open-tests-for-current-file 'find-file)))
+
+(defun alchemist-project-file-under-test (file directory)
+  "Return the file which are tested by FILE.
+DIRECTORY is the place where the file under test is located."
+  (let* ((filename (file-relative-name file (alchemist-project-root)))
+         (filename (replace-regexp-in-string "^test" directory filename))
+         (filename (replace-regexp-in-string "_test\.exs$" "\.ex" filename)))
+    (concat (alchemist-project-root) filename)))
+
+(defun alchemist-project-open-file-for-current-tests (opener)
+  "Visit the implementation file for the current buffer with OPENER."
+  (let* ((filename (alchemist-project-file-under-test (buffer-file-name) "web"))
+         (filename (if (file-exists-p filename)
+                       filename
+                     (alchemist-project-file-under-test (buffer-file-name) "lib"))))
+    (funcall opener filename)))
+
+(defun alchemist-project-open-tests-for-current-file (opener)
+  "Visit the test file for the current buffer with OPENER."
+  (let* ((filename (file-relative-name (buffer-file-name) (alchemist-project-root)))
+         (filename (replace-regexp-in-string "^lib/" "test/" filename))
+         (filename (replace-regexp-in-string "^web/" "test/" filename))
+         (filename (replace-regexp-in-string "\.ex$" "_test\.exs" filename))
+         (filename (format "%s/%s" (alchemist-project-root) filename)))
+    (if (file-exists-p filename)
+        (funcall opener filename)
+      (if (y-or-n-p "No test file found; create one now?")
+          (alchemist-project--create-test-for-current-file
+           filename (current-buffer))
+        (message "No test file found.")))))
+
+(defun alchemist-project--create-test-for-current-file (filename buffer)
+  "Creates and populates a test module, FILENAME, for the code in BUFFER.
+The module name given to the test module is determined from the name of the
+first module defined in BUFFER."
+  (let* ((directory-name (file-name-directory filename))
+         (module-name (alchemist-project--grok-module-name buffer))
+         (test-module-name (concat module-name "Test")))
+    (unless (file-exists-p directory-name)
+      (make-directory (file-name-directory filename) t))
+    (alchemist-project--insert-test-boilerplate
+     (find-file-other-window filename) test-module-name)))
+
+(defun alchemist-project--grok-module-name (buffer)
+  "Determines the name of the first module defined in BUFFER."
+  (save-excursion
+    (with-current-buffer buffer
+      (goto-char (point-min))
+      (re-search-forward "defmodule\\s-\\(.+?\\)\\s-?,?\\s-do")
+      (match-string 1))))
+
+(defun alchemist-project--insert-test-boilerplate (buffer module)
+  "Inserts ExUnit boilerplate for MODULE in BUFFER.
+Point is left in a convenient location."
+  (with-current-buffer buffer
+    (insert (concat "defmodule " module " do\n"
+                    "  use ExUnit.Case\n\n\n"
+                    "end\n"))
+    (goto-char (point-min))
+    (beginning-of-line 4)
+    (indent-according-to-mode)))
+
+(defun alchemist-project-run-tests-for-current-file ()
+  "Run the tests related to the current file."
+  (interactive)
+  (alchemist-project-open-tests-for-current-file 'alchemist-mix-test-file))
+
+(defun alchemist-project-create-file ()
+  "Create a file under lib/ in the current project.
+
+The newly created buffer is filled with a module definition based on the file name."
+  (interactive)
+  (let ((root (alchemist-project-root)))
+    (if (not root)
+        (message "You're not in a Mix project")
+      (let* ((lib-path (concat root "lib/"))
+             (abs-path (read-file-name "New file in lib/: " lib-path))
+             (abs-path (alchemist-utils-add-ext-to-path-if-not-present abs-path ".ex"))
+             (relative-path (file-relative-name abs-path lib-path)))
+        (if (file-readable-p abs-path)
+            (message "%s already exists" relative-path)
+          (make-directory (file-name-directory abs-path) t)
+          (find-file abs-path)
+          (insert (concat "defmodule "
+                          (alchemist-utils-path-to-module-name relative-path)
+                          " do\n"
+                          "  \n"
+                          "end\n"))
+          (goto-char (point-min))
+          (beginning-of-line 2)
+          (back-to-indentation))))))
+
+(defun alchemist-project-name ()
+  "Return the name of the current Elixir Mix project."
+  (if (alchemist-project-p)
+      (car (cdr (reverse (split-string (alchemist-project-root) "/"))))
+    ""))
+
+(defun alchemist-project-find-dir (directory)
+  (unless (alchemist-project-p)
+    (error "Could not find an Elixir Mix project root."))
+  (alchemist-file-find-files (alchemist-project-root) directory))
+
+(defun alchemist-project-find-lib ()
+  (interactive)
+  (alchemist-project-find-dir "lib"))
+
+(defun alchemist-project-find-test ()
+  (interactive)
+  (alchemist-project-find-dir "test"))
+
+(provide 'alchemist-project)
+
+;;; alchemist-project.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-refcard.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-refcard.el
new file mode 100644
index 0000000..1ca791f
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-refcard.el
@@ -0,0 +1,201 @@
+;;; alchemist-refcard.el --- Generates a refcard of alchemist functionality
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Generates a refcard of alchemist functionality
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'dash)
+(require 'tabulated-list)
+
+;; Tell the byte compiler about autoloaded functions from packages
+(eval-when-compile
+  (declare-function alchemist-mode "alchemist.el")
+  (declare-function alchemist-version "alchemist.el"))
+
+(defgroup alchemist-refcard nil
+  "Generate a refcard of alchemist functionality."
+  :prefix "alchemist-"
+  :group 'applications)
+
+(defconst alchemist-refcard--buffer-name "*alchemist-refcard*"
+  "Name of Alchemist-Refcard mode buffer.")
+
+(defconst alchemist-refcard-list-format
+  [("" 55 t)
+   ("" 35 t)]
+  "List format.")
+
+(defvar alchemist-refcard-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "i") 'alchemist-refcard--describe-funtion-at-point)
+    (define-key map (kbd "q") 'quit-window)
+    map)
+  "Keymap for `alchemist-refcard-mode'.")
+
+(defun alchemist-refcard--get-keybinding (function-name)
+  (let* ((keys (where-is-internal (intern function-name)))
+         (keys (-map (lambda (k)
+                       (let ((key (format "%s" k)))
+                         (if (string-match-p "menu-bar" key)
+                             nil
+                           k))) keys))
+         (keys (-remove 'null keys)))
+    (if keys
+        (progn
+          (mapconcat (lambda (k) (key-description k)) keys " , "))
+      "")))
+
+(defun alchemist-refcard--tabulated-list-entries ()
+  (alchemist-mode +1) ;; needs to be enabled for fetching current keybindings
+  (let ((rows (list (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-refcard-title-row (format "Alchemist Refcard v%s" (alchemist-version)))
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Mix")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-compile")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-run")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Testing")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-test")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-rerun-last-test")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-test-file")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-test-this-buffer")
+                    (alchemist-refcard--build-tabulated-row "alchemist-mix-test-at-point")
+                    (alchemist-refcard--build-tabulated-row "alchemist-test-toggle-test-report-display")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Compilation")
+                    (alchemist-refcard--build-tabulated-row "alchemist-compile")
+                    (alchemist-refcard--build-tabulated-row "alchemist-compile-file")
+                    (alchemist-refcard--build-tabulated-row "alchemist-compile-this-buffer")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Execution")
+                    (alchemist-refcard--build-tabulated-row "alchemist-execute")
+                    (alchemist-refcard--build-tabulated-row "alchemist-execute-file")
+                    (alchemist-refcard--build-tabulated-row "alchemist-execute-this-buffer")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Documentation Lookup")
+                    (alchemist-refcard--build-tabulated-row "alchemist-help")
+                    (alchemist-refcard--build-tabulated-row "alchemist-help-history")
+                    (alchemist-refcard--build-tabulated-row "alchemist-help-search-at-point")
+                    (alchemist-refcard--build-tabulated-row "alchemist-refcard")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Definition Lookup")
+                    (alchemist-refcard--build-tabulated-row "alchemist-goto-definition-at-point")
+                    (alchemist-refcard--build-tabulated-row "alchemist-goto-jump-back")
+                    (alchemist-refcard--build-tabulated-row "alchemist-goto-jump-to-previous-def-symbol")
+                    (alchemist-refcard--build-tabulated-row "alchemist-goto-jump-to-next-def-symbol")
+                    (alchemist-refcard--build-tabulated-row "alchemist-goto-list-symbol-definitions")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Project")
+                    (alchemist-refcard--build-tabulated-row "alchemist-project-find-test")
+                    (alchemist-refcard--build-tabulated-row "alchemist-project-toggle-file-and-tests")
+                    (alchemist-refcard--build-tabulated-row "alchemist-project-toggle-file-and-tests-other-window")
+                    (alchemist-refcard--build-tabulated-row "alchemist-project-run-tests-for-current-file")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "IEx")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-run")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-project-run")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-send-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-send-current-line-and-go")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-send-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-send-region-and-go")
+                    (alchemist-refcard--build-tabulated-row "alchemist-iex-compile-this-buffer")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Eval")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-print-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-quoted-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-print-quoted-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-print-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-quoted-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-print-quoted-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-buffer")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-print-buffer")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-quoted-buffer")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-print-quoted-buffer")
+                    (alchemist-refcard--build-tabulated-row "alchemist-eval-close-popup")
+                    (alchemist-refcard--build-empty-tabulated-row)
+                    (alchemist-refcard--build-tabulated-title-row "Macroexpand")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-once-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-once-print-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-print-current-line")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-once-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-once-print-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-print-region")
+                    (alchemist-refcard--build-tabulated-row "alchemist-macroexpand-close-popup"))))
+    (alchemist-mode -1) ;; disable it after getting the current keybindings
+    rows))
+
+(defun alchemist-refcard--build-empty-tabulated-row ()
+  (list "" `[,"" ""]))
+
+(defun alchemist-refcard--build-tabulated-row (function-name)
+  (list function-name `[,function-name
+                        ,(propertize (alchemist-refcard--get-keybinding function-name) 'face font-lock-builtin-face)]))
+
+(defun alchemist-refcard--build-tabulated-refcard-title-row (title)
+  (list "" `[,(propertize title 'face font-lock-variable-name-face) ""]))
+
+(defun alchemist-refcard--build-tabulated-title-row (title)
+  (list "" `[,(propertize title 'face font-lock-constant-face) ""]))
+
+(defun alchemist-refcard--describe-funtion-at-point ()
+  (interactive)
+  (let ((function-name (get-text-property (point) 'tabulated-list-id)))
+    (when (not (alchemist-utils-empty-string-p function-name))
+      (describe-function (intern function-name)))))
+
+(defun alchemist-refcard--buffer ()
+  "Return alchemist-refcard buffer if it exists."
+  (get-buffer alchemist-refcard--buffer-name))
+
+(define-derived-mode alchemist-refcard-mode tabulated-list-mode "Alchemist"
+  "Alchemist refcard mode."
+  (buffer-disable-undo)
+  (kill-all-local-variables)
+  (setq truncate-lines t)
+  (setq mode-name "Alchemist-Refcard")
+  (setq-local alchemist-test-status-modeline nil)
+  (use-local-map alchemist-refcard-mode-map)
+  (setq tabulated-list-format alchemist-refcard-list-format)
+  (setq tabulated-list-entries 'alchemist-refcard--tabulated-list-entries)
+  (tabulated-list-print))
+
+;;;###autoload
+(defun alchemist-refcard ()
+  "Generate an Alchemist refcard of all the features."
+  (interactive)
+  (let ((buffer-p (alchemist-refcard--buffer))
+        (buffer (get-buffer-create alchemist-refcard--buffer-name)))
+    (pop-to-buffer buffer)
+    (unless buffer-p
+      (alchemist-refcard-mode))))
+
+(provide 'alchemist-refcard)
+
+;;; alchemist-refcard.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-report.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-report.el
new file mode 100644
index 0000000..d5f4023
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-report.el
@@ -0,0 +1,167 @@
+;;; alchemist-report.el --- Run command in a process and handles buffer of it
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Run command in a process and handles buffer output and display
+
+;;; Code:
+
+(require 'ansi-color)
+(require 'alchemist-project)
+
+(defgroup alchemist-report nil
+  "Run command in a process and handles buffer output and display"
+  :prefix "alchemist-report-"
+  :group 'alchemist)
+
+(defvar alchemist-report-on-exit nil)
+(defvar alchemist-report-on-exit-function nil)
+(defvar alchemist-report-on-render nil)
+(defvar alchemist-report-on-render-function nil)
+(defvar alchemist-report--last-run-status nil)
+(defvar alchemist-report-mode-name nil)
+
+(defun alchemist-report--kill-process (process)
+  "Interrupt and kill the running report PROCESS."
+  (when process
+    (let ((mode-name (replace-regexp-in-string ":.+$" "" mode-name)))
+      (if (or (not (eq (process-status process) 'run))
+              (eq (process-query-on-exit-flag process) nil)
+              (yes-or-no-p
+               (format "A %s process already running; kill it? "
+                       mode-name)))
+          (condition-case ()
+              (progn
+                (interrupt-process process)
+                (sit-for 1)
+                (delete-process process))
+            (error nil))
+        (error "Cannot have two processes in `%s' at once"
+               (buffer-name))))))
+
+(defun alchemist-report--sentinel (process status)
+  "Sentinel for test report buffer."
+  (if (memq (process-status process) '(exit signal))
+      (let ((buffer (process-buffer process)))
+        (if (null (buffer-name buffer))
+            (set-process-buffer process nil)
+          (progn
+            (alchemist-report--render-report buffer)
+            (alchemist-report--handle-exit status buffer)
+            (alchemist-report-update-mode-name process)
+            (delete-process process))))))
+
+(defun alchemist-report--render-report (buffer)
+  "Call the defined render functions for the BUFFER."
+  (when alchemist-report-on-render-function
+    (funcall alchemist-report-on-render-function buffer)))
+
+(defun alchemist-report--handle-exit (status buffer)
+  "Call the defined exit function specified in `alchemist-report-on-exit-function'.
+Argument for the exit function is the STATUS and BUFFER of the finished process."
+  (alchemist-report--store-process-status status)
+  (when alchemist-report-on-exit-function
+    (funcall alchemist-report-on-exit-function status buffer)))
+
+(defun alchemist-report--store-process-status (status)
+  "Store STATUS of the last finished process."
+  (setq alchemist-report--last-run-status status))
+
+(defun alchemist-report--last-run-successful-p ()
+  "Return non-nil if the last process successfully finished."
+  (when (string-prefix-p "finished" alchemist-report--last-run-status) t))
+
+(defun alchemist-report-filter (process output)
+  "Process filter for report buffers."
+  (with-current-buffer (process-buffer process)
+    (let* ((buffer-read-only nil)
+           (output (if (string= (process-name process) alchemist-test-report-process-name)
+                       (alchemist-test-clean-compilation-output output)
+                     output))
+           (moving (= (point) (process-mark process))))
+      (save-excursion
+        (goto-char (process-mark process))
+        (insert output)
+        (set-marker (process-mark process) (point))
+        (ansi-color-apply-on-region (point-min) (point-max)))
+      (if moving (goto-char (process-mark process))))))
+
+(defun alchemist-report-update-mode-name (process)
+  "Update the `mode-name' with the status of PROCESS."
+  (with-current-buffer (process-buffer process)
+    (setq-local mode-name (format "%s:%s"
+                                  (replace-regexp-in-string ":.+$" "" mode-name)
+                                  (process-status process)))))
+
+(defun alchemist-report-interrupt-current-process ()
+  "Interrupt the current running report process."
+  (interactive)
+  (let ((buffer (current-buffer))
+        (name (replace-regexp-in-string ":.+" "" mode-name)))
+    (if (get-buffer-process buffer)
+        (interrupt-process (get-buffer-process buffer))
+      (error "The [%s] process is not running" (downcase name)))))
+
+(defun alchemist-report-cleanup-process-buffer (buffer)
+  "Clean the content BUFFER of process.
+If there is already a running process, ask for interrupting it."
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t)
+          (process (get-buffer-process buffer)))
+      (erase-buffer))))
+
+(defun alchemist-report-display-buffer (buffer)
+  "Display the BUFFER."
+  (display-buffer buffer))
+
+(defun alchemist-report-activate-mode (mode buffer)
+  "Enable MODE inside BUFFER."
+  (with-current-buffer buffer
+    (funcall mode)
+    (setq-local truncate-lines t) ;; Do not display continuation lines.
+    (setq-local window-point-insertion-type t)))
+
+(defun alchemist-report-run (command process-name buffer-name mode &optional on-exit hidden)
+  "Run COMMAND in a new process called PROCESS-NAME.
+The output of PROCESS-NAME will be displayed in BUFFER-NAME.
+After displaying BUFFER-NAME, the MODE function will be called within.
+
+Optional ON-EXIT and HIDDEN functions could be defined.
+The function ON-EXIT will be called when PROCESS-NAME is finished.
+The HIDDEN variable defines if PROCESS-NAME should run in the background."
+  (let* ((buffer (get-buffer-create buffer-name))
+         (default-directory (alchemist-project-root-or-default-dir)))
+    (alchemist-report-cleanup-process-buffer buffer)
+    (alchemist-report--kill-process (get-buffer-process buffer))
+    (start-process-shell-command process-name buffer command)
+    (when on-exit
+      (setq alchemist-report-on-exit-function on-exit))
+    (set-process-sentinel (get-buffer-process buffer) 'alchemist-report--sentinel)
+    (set-process-filter (get-buffer-process buffer) 'alchemist-report-filter)
+    (alchemist-report-activate-mode mode buffer)
+    (if (not hidden)
+        (alchemist-report-display-buffer buffer))
+    (alchemist-report-update-mode-name (get-buffer-process buffer))))
+
+(provide 'alchemist-report)
+
+;;; alchemist-report.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-scope.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-scope.el
new file mode 100644
index 0000000..c1fafa3
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-scope.el
@@ -0,0 +1,205 @@
+;;; alchemist-scope.el --- Provides information about Elixir source code context   -*- lexical-binding: t -*-
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Provides information about the Elixir source code context.
+
+;;; Code:
+
+(require 'dash)
+
+(defgroup alchemist-scope nil
+  "Provides information about the Elixir source code context."
+  :prefix "alchemist-scope-"
+  :group 'alchemist)
+
+(defconst alchemist-scope-defmodule-regex "defmodule \\([A-Za-z\._]+\\)\s+"
+  "The regex for matching Elixir defmodule macro.")
+
+(defconst alchemist-scope-alias-regex
+  "^\s+alias\s+\\([-:_A-Za-z0-9,\.\?!\]+\\)\\(\s*,\s*as:\s*\\)?\\([-_A-Za-z0-9,\.\?!\]+\\)?\n"
+  "The regex for matching Elixir alias definitions.
+   Example:
+   alias Phoenix.Router.Resource, as: Special")
+
+(defconst alchemist-scope-alias-regex-two
+  "^\s+alias\s+\\([-:_A-Za-z0-9,\.\?!\]+\\)\.{\\([-:_A-Za-z0-9\s,\.\?!\]+\\)}\n"
+  "The regex for matching Elixir alias definitions.
+   Example:
+   alias List.Chars.{Atom, Float}")
+
+(defconst alchemist-scope-use-regex
+  "^\s+use\s+\\([A-Za-z0-9\.]+\\)"
+  "The regex for matching Elixir use definitions.")
+
+(defconst alchemist-scope-import-regex
+  "^\s+import\s+\\([A-Za-z0-9\.]+\\)"
+  "The regex for matching Elixir import definitions.")
+
+(defun alchemist-scope-inside-string-p ()
+  "Return non-nil if `point' is inside a string or heredoc."
+  (let* ((pos (point))
+         (parse-info (syntax-ppss pos)))
+    (or (and (nth 3 parse-info)
+             (nth 8 parse-info))
+        (and (looking-at "\"\"\"\\|'''\\|\"\\|\'")
+             (match-beginning 0)))))
+
+(defun alchemist-scope-inside-module-p ()
+  "Return non-nil if `point' is currently inside a module."
+  (save-excursion
+    (end-of-line)
+    (let ((found-flag-p nil)
+          (found-p nil))
+      (while (and (not found-flag-p)
+                  (re-search-backward alchemist-scope-defmodule-regex nil t))
+        (when (not (alchemist-scope-inside-string-p))
+          (setq found-flag-p t)
+          (setq found-p t)))
+      found-p)))
+
+(defun alchemist-scope-module ()
+  "Return name from the current defmodule."
+  (save-excursion
+    (let ((found-flag-p nil)
+          (module-name ""))
+      (save-match-data
+        (while (and (not found-flag-p)
+                    (re-search-backward alchemist-scope-defmodule-regex nil t))
+          (when (not (alchemist-scope-inside-string-p))
+            (setq module-name (match-string 1))
+            (setq found-flag-p t))
+          (when (equal 1 (line-number-at-pos (point)))
+            (setq found-flag-p t)))
+        module-name))))
+
+(defun alchemist-scope-aliases ()
+  "Return aliases from the current module."
+  (let* ((aliases '())
+         (context (alchemist-scope-module)))
+    (save-excursion
+      (when (alchemist-scope-inside-module-p)
+        (end-of-line)
+        ;; alias definition like:
+        ;;
+        ;;   alias Phoenix.Router.Resource, as: Special
+        (while (re-search-backward alchemist-scope-alias-regex nil t)
+          (when (and
+                 (not (alchemist-scope-inside-string-p))
+                 (equal context (alchemist-scope-module)))
+            (let* ((alias (match-string 1))
+                   (as (if (match-string 3) (match-string 3) nil))
+                   (as (if as as (car (last (split-string alias "\\."))))))
+              (setq aliases (append aliases (list (list (alchemist-utils-remove-dot-at-the-end alias)
+                                                        (alchemist-utils-remove-dot-at-the-end as))))))))
+        ;; alias definition like:
+        ;;
+        ;;   alias List.Chars.{Atom, Float}
+        (while (re-search-backward alchemist-scope-alias-regex-two nil t)
+          (when (and
+                 (not (alchemist-scope-inside-string-p))
+                 (equal context (alchemist-scope-module)))
+            (let* ((prefix (match-string 1))
+                   (alias-collection (if (match-string 2) (split-string (match-string 2) ",") nil)))
+              (-map (lambda (alias)
+                      (let* ((alias (replace-regexp-in-string "\s+" "" alias))
+                             (namespace (format "%s.%s" prefix alias)))
+                        (setq aliases (append aliases (list (list (alchemist-utils-remove-dot-at-the-end namespace)
+                                                                  (alchemist-utils-remove-dot-at-the-end alias)))))))
+                    alias-collection))))))
+    aliases))
+
+(defun alchemist-scope--modules (regex)
+  (let ((modules '())
+        (context (alchemist-scope-module)))
+    (save-excursion
+      (when (not (alchemist-utils-empty-string-p context))
+        (while (re-search-backward regex nil t)
+          (when (and (match-string 1)
+                     (not (alchemist-scope-inside-string-p))
+                     (equal context (alchemist-scope-module)))
+            (cl-pushnew (substring-no-properties (match-string 1)) modules))))
+      modules)))
+
+(defun alchemist-scope-use-modules ()
+  "Return `use' introduced module names from the current module."
+  (alchemist-scope--modules alchemist-scope-use-regex))
+
+(defun alchemist-scope-import-modules ()
+  "Return `import' introduced module names from the current module."
+  (alchemist-scope--modules alchemist-scope-import-regex))
+
+(defun alchemist-scope-all-modules ()
+  "Return `use' and `import' introduced modules from the current module."
+  (let ((current (alchemist-scope-module))
+        (use (alchemist-scope-use-modules))
+        (import (alchemist-scope-import-modules))
+        (modules '()))
+    (push current modules)
+    (push use modules)
+    (push import modules)
+    (-flatten modules)))
+
+(defun alchemist-scope-extract-module (expr)
+  "Extract module from EXPR."
+  (let* ((parts (split-string expr "\\."))
+         (function (car (last parts)))
+         (case-fold-search nil))
+    (when (string-match-p "^[a-z_\?!]+" function)
+      (delete function parts))
+    (unless (string-match-p "^[a-z_\?!]+" (car parts))
+      (alchemist-utils-remove-dot-at-the-end (mapconcat 'concat parts ".")))))
+
+(defun alchemist-scope-extract-function (expr)
+  "Extract function from EXPR."
+  (let* ((parts (split-string expr "\\."))
+         (function (car (last parts)))
+         (case-fold-search nil))
+    (when (and function
+               (string-match-p "^[a-z_\?!]+" function))
+      function)))
+
+(defun alchemist-scope-alias-full-path (module)
+  "Solve the full path for the MODULE alias."
+  (if (not (alchemist-utils-empty-string-p module))
+      (let* ((aliases (-map (lambda (m)
+                              (when (string-match-p (format "^%s" (car (cdr m))) module)
+                                (replace-regexp-in-string (format "^%s" (car (cdr m))) (car m) module t)))
+                            (alchemist-scope-aliases)))
+             (aliases (delete nil aliases)))
+        (if aliases
+            (car aliases)
+          module))))
+
+(defun alchemist-scope-expression ()
+  "Return the expression under the cursor."
+  (let (p1 p2)
+    (save-excursion
+      (skip-chars-backward "-_A-Za-z0-9.?!:@")
+      (setq p1 (point))
+      (skip-chars-forward "-_A-Za-z0-9.?!:@")
+      (setq p2 (point))
+      (buffer-substring-no-properties p1 p2))))
+
+(provide 'alchemist-scope)
+
+;;; alchemist-scope.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server.el
new file mode 100644
index 0000000..1f5fd45
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server.el
@@ -0,0 +1,211 @@
+;;; alchemist-server.el --- Interface to the Alchemist Elixir server. -*- lexical-binding: t -*-
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Interface to the Alchemist Elixir server.
+
+;;; Code:
+
+(require 'alchemist-execute)
+
+(defgroup alchemist-server nil
+  "Interface to the Alchemist Elixir server."
+  :prefix "alchemist-server-"
+  :group 'alchemist)
+
+(defvar alchemist-server-processes '()
+  "Store running Alchemist server processes.")
+
+(defvar alchemist-server-env "dev"
+  "Default environment in for the Alchemist server.")
+
+(defvar alchemist-server-envs '("dev" "prod" "test" "shared")
+  "List of available Alchemist server environments.")
+
+(defconst alchemist-server
+  (concat (file-name-directory load-file-name) "alchemist-server/run.exs")
+  "Path to the Alchemist server file.")
+
+(defconst alchemist-server-command
+  (format "%s %s %s"
+          alchemist-execute-command
+          alchemist-server
+          alchemist-server-env)
+  "Alchemist server command.")
+
+(defconst alchemist-server-codes '((server-eval "EVAL")
+                                   (server-defl "DEFL")
+                                   (server-info "INFO")
+                                   (server-docl "DOCL")
+                                   (server-comp "COMP"))
+  "Alchemist server API codes.")
+
+(defun alchemist-server-start (env)
+  "Start alchemist server for the current mix project in specific ENV.
+
+If a server already running, the current one will be killed and new one
+will be started instead."
+  (interactive (list
+                (completing-read (format "(Alchemist-Server) run in environment: (default: %s) " alchemist-server-env)
+                                 alchemist-server-envs nil nil nil)))
+  (when (alchemist-server-process-p)
+    (kill-process (alchemist-server-process)))
+  (alchemist-server-start-in-env env))
+
+(defun alchemist-server-start-if-not-running ()
+  "Start a new Alchemist server if not already running.
+
+An Alchemist server will be started for the current Elixir mix project."
+  (unless (alchemist-server-process-p)
+    (alchemist-server-start-in-env alchemist-server-env)))
+
+(defun alchemist-server-start-in-env (env)
+  "Start an Alchemist server with the ENV."
+  (let* ((process-name (alchemist-server-process-name))
+         (default-directory (if (string= process-name "alchemist-server")
+                                default-directory
+                              process-name))
+         (server-command (format "elixir %s %s" alchemist-server env))
+         (process (start-process-shell-command process-name "*alchemist-server*" server-command)))
+    (set-process-query-on-exit-flag process nil)
+    (alchemist-server--store-process process)))
+
+(defun alchemist-server--store-process (process)
+  "Store PROCESS in `alchemist-server-processes'."
+  (let ((process-name (alchemist-server-process-name)))
+    (if (cdr (assoc process-name alchemist-server-processes))
+        (setq alchemist-server-processes
+              (delq (assoc process-name alchemist-server-processes) alchemist-server-processes)))
+    (add-to-list 'alchemist-server-processes (cons process-name process))))
+
+(defun alchemist-server-process-p ()
+  "Return non-nil if a process for the current
+Elixir mix project is live."
+  (process-live-p (alchemist-server-process)))
+
+(defun alchemist-server-process ()
+  "Return process for the current Elixir mix project."
+  (cdr (assoc (alchemist-server-process-name) alchemist-server-processes)))
+
+(defun alchemist-server-process-name ()
+  "Return process name for the current Elixir mix project."
+  (let* ((process-name (if (alchemist-project-elixir-p)
+                           "alchemist-server"
+                         (alchemist-project-root)))
+         (process-name (if process-name
+                           process-name
+                         "alchemist-server")))
+    process-name))
+
+(defun alchemist-server-api-code (symbol)
+  "Return Alchemist server API code for SYMBOL."
+  (car (cdr (assoc symbol alchemist-server-codes))))
+
+(defconst alchemist-server-code-end-marker-regex
+  (format "END-OF-\\(%s\\|%s\\|%s\\|%s\\|%s\\)$"
+          (alchemist-server-api-code 'server-eval)
+          (alchemist-server-api-code 'server-defl)
+          (alchemist-server-api-code 'server-info)
+          (alchemist-server-api-code 'server-docl)
+          (alchemist-server-api-code 'server-comp))
+  "Regular expression to identify Alchemist server API end markers.")
+
+(defun alchemist-server-contains-end-marker-p (string)
+  "Return non-nil if STRING contain an Alchemist server API end marker."
+  (string-match-p alchemist-server-code-end-marker-regex string))
+
+(defun alchemist-server-build-request-string (code &optional args)
+  "Build Alchemist server request string for CODE.
+
+If ARGS available add them to the request string."
+  (let* ((code (car (cdr (assoc code alchemist-server-codes)))))
+    (if args
+        (format "%s %s\n" code args)
+      (format "%s\n" code))))
+
+(defun alchemist-server-prepare-filter-output (output)
+  "Clean OUTPUT by remove Alchemist server API end markes."
+  (let* ((output (apply #'concat (reverse output)))
+         (output (replace-regexp-in-string alchemist-server-code-end-marker-regex "" output))
+         (output (replace-regexp-in-string "\n+$" "" output)))
+    output))
+
+(defun alchemist-server-send-request (string filter)
+  "Send STRING to Alchemist server API and set FILTER to process."
+  (alchemist-server-start-if-not-running)
+  (set-process-filter (alchemist-server-process) filter)
+  (process-send-string (alchemist-server-process) string))
+
+(defun alchemist-server-goto (args filter)
+  "Make an Alchemist server source request with ARGS.
+
+Process server respond with FILTER."
+  (alchemist-server-start-if-not-running)
+  (alchemist-server-send-request (alchemist-server-build-request-string 'server-defl args) filter))
+
+(defun alchemist-server-info (args filter)
+  "Make an Alchemist server mix request.
+
+Process server respond with FILTER."
+  (alchemist-server-start-if-not-running)
+  (alchemist-server-send-request (alchemist-server-build-request-string 'server-info args) filter))
+
+(defun alchemist-server-help-with-modules (filter)
+  "Make an Alchemist server modules request.
+
+Process server respond with FILTER."
+  (alchemist-server-start-if-not-running)
+  (alchemist-server-send-request (alchemist-server-build-request-string 'server-info) filter))
+
+(defun alchemist-server-help (args filter)
+  "Make an Alchemist server doc request with ARGS.
+
+Process server respond with FILTER."
+  (alchemist-server-start-if-not-running)
+  (alchemist-server-send-request (alchemist-server-build-request-string 'server-docl args) filter))
+
+(defun alchemist-server-eval (args filter)
+  "Make an Alchemist server evaluate request with FILE.
+
+Process server respond with FILTER."
+  (alchemist-server-start-if-not-running)
+  (alchemist-server-send-request (alchemist-server-build-request-string 'server-eval args) filter))
+
+(defun alchemist-server-complete-candidates (args filter)
+  "Make an Alchemist server complete request with ARGS.
+
+Process server respond with FILTER."
+  (alchemist-server-start-if-not-running)
+  (alchemist-server-send-request (alchemist-server-build-request-string 'server-comp args) filter))
+
+(defun alchemist-server-status ()
+  "Report the server status for the current Elixir project."
+  (interactive)
+  (message "Alchemist-Server-Status: [Project: %s Status: %s]"
+           (alchemist-server-process-name)
+           (if (alchemist-server-process-p)
+               "Connected"
+             "Not Connected")))
+
+(provide 'alchemist-server)
+
+;;; alchemist-server.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/.gitignore b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/.gitignore
new file mode 100644
index 0000000..5663f4d
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/.gitignore
@@ -0,0 +1,2 @@
+test/sandbox
+.cask
\ No newline at end of file
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/.travis.yml b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/.travis.yml
new file mode 100644
index 0000000..7839941
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/.travis.yml
@@ -0,0 +1,12 @@
+language: elixir
+elixir:
+  - 1.1.1
+  - 1.2.0-rc.0
+otp_release:
+  - 18.0
+sudo: false
+install: mix local.hex --force
+script:
+  - make
+notifications:
+  irc: "irc.freenode.org#emacs-elixir"
\ No newline at end of file
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/Makefile b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/Makefile
new file mode 100644
index 0000000..6e02908
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/Makefile
@@ -0,0 +1,35 @@
+ELIXIR = elixir
+
+VERSION = $(shell git describe --tags --abbrev=0 | sed 's/^v//')
+
+NO_COLOR=\033[0m
+INFO_COLOR=\033[2;32m
+STAT_COLOR=\033[2;33m
+
+all: test
+
+test:	test_server
+	${MAKE} test_helpers
+	${MAKE} test_api
+
+test_server:
+	@ echo "\n$(INFO_COLOR)Run server tests: $(NO_COLOR)\n"
+	$(ELIXIR) test/server_test.exs
+
+test_helpers:
+	@ echo "\n$(INFO_COLOR)Run helper tests: $(NO_COLOR)\n"
+	$(ELIXIR) test/helpers/module_info_test.exs
+	$(ELIXIR) test/helpers/complete_test.exs
+
+test_api:
+	@ echo "\n$(INFO_COLOR)Run api tests: $(NO_COLOR)\n"
+	$(ELIXIR) test/api/docl_test.exs
+	$(ELIXIR) test/api/comp_test.exs
+	$(ELIXIR) test/api/defl_test.exs
+
+api_completer:
+	@ echo "\n$(INFO_COLOR)Run api tests: $(NO_COLOR)\n"
+	$(ELIXIR) test/api_test.exs
+
+
+.PHONY: test test_server test_helpers test_api
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/README.md b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/README.md
new file mode 100644
index 0000000..cbc2a1a
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/README.md
@@ -0,0 +1,161 @@
+[![License GPL 3](https://img.shields.io/badge/license-GPL_3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)
+[![Build Status](https://img.shields.io/travis/tonini/alchemist-server.svg)](https://travis-ci.org/tonini/alchemist-server)
+
+**INFO:** The Alchemist-Server is in Beta status and the API will most likey change until the first release. Feedback and critic are highly appreciated though.
+
+# Alchemist Server
+
+The Alchemist-Server operates as an informant for a specific desired
+Elixir Mix project and serves with informations as the following:
+
+* Completion for Modules and functions.
+* Documentation lookup for Modules and functions.
+* Code evaluation and quoted representation of code.
+* Definition lookup of code.
+* Listing of all available Mix tasks.
+* Listing of all available Modules with documentation.
+
+# Usage
+
+The server needs to be started inside an Elixir mix project like below:
+
+```
+$ cd elixir_project
+$ elixir path/to/alchemist-server/run.exs dev
+```
+
+The Alchemist-Server API is `STDIN/STDOUT` based, when input sent to a
+running server process it responds by sending information back to the `STDOUT`.
+
+A request consisting of two parts, the request type and the request arguments.
+
+Example for a completion request:
+
+```
+[type]   [arguments]
+
+COMP { "def", [ context: Elixir, imports: [Enum], aliases: [{MyList, List}] ] }
+```
+
+# API
+
+## Completion
+
+Return a completion list of all the available candidates.
+
+```
+COMP
+COMP { "def", [ context: Elixir, imports: [], aliases: [] ] }
+COMP { "List.fla", [ context: Elixir, imports: [], aliases: [] ] }
+```
+
+## Documentation lookup
+
+Return the documentation.
+
+```
+DOCL { "defmodule", [ context: Elixir, imports: [], aliases: [] ] }
+DOCL { "List.flatten/1", [ context: Elixir, imports: [], aliases: [] ] }
+```
+
+## Evaluation, Quoted & Macro expand
+
+### Evaluation
+
+Return the evaluation result of the code from the file.
+
+```
+EVAL { :eval, 'path/to/file/which/holds/content/to/eval.tmp' }
+```
+
+### Quoted
+
+Return the code from the file quoted.
+
+```
+EVAL { :quote, 'path/to/file/which/holds/content/to/quote.tmp' }
+```
+
+### Macro expand
+
+Return the code from the file expanded.
+
+```
+EVAL { :expand, 'path/to/file/which/holds/content/to/expand.tmp' }
+```
+
+Return the code from the file expanded once.
+
+```
+EVAL { :expand_once, 'path/to/file/which/holds/content/to/expand_once.tmp' }
+```
+
+## Definition lookup
+
+Return the path to the source file which holds the definition.
+
+```
+DEFL  { "List,flatten", [ context: Elixir, imports: [], aliases: [] ] }
+DEFL  { "nil,defmacro", [ context: Elixir, imports: [], aliases: [] ] }
+DEFL  { "nil,create_file", [ context: Elixir, imports: [Mix.Generator], aliases: [] ] }
+DEFL  { "MyList,nil", [ context: Elixir, imports: [], aliases: [{MyList, List}] ] }
+```
+
+## Informations
+
+### Mix tasks
+
+Return a list of all available mix tasks.
+
+```
+INFO { :type, :mixtasks }
+```
+
+### Modules
+
+Return a list of all available modules which has documentation.
+
+```
+INFO { :type, :modules }
+```
+
+### Datatype Information
+
+Return information about any datatype.
+
+```
+INFO { :type, :info, List }
+```
+
+### Module Or Function/Arity Types Information
+
+Return types for a module or function/arity pair.
+
+```
+INFO { :type, :types, 'List' }
+INFO { :type, :types, 'Enum.t' }
+INFO { :type, :types, 'Agent.on_start/0' }
+```
+
+## End Markers
+
+Each request type ends with a specific end marker tag to notify that the request is done.
+
+An end tag looks like the following:
+
+```
+END-OF-<REQUEST TYPE>
+```
+
+For example, after the following request an end tag would look like this:
+
+```
+INFO { :type, :modules }
+List
+String
+Enum
+.
+...
+....
+END-OF-INFO
+```
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/comp.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/comp.exs
new file mode 100644
index 0000000..2740f68
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/comp.exs
@@ -0,0 +1,41 @@
+Code.require_file "../helpers/complete.exs", __DIR__
+
+defmodule Alchemist.API.Comp do
+
+  @moduledoc false
+
+  alias Alchemist.Helpers.Complete
+
+  def request(args) do
+    args
+    |> normalize
+    |> process
+  end
+
+  def process([nil, _, imports, _]) do
+    Complete.run('', imports) ++ Complete.run('')
+    |> print
+  end
+
+  def process([hint, _context, imports, aliases]) do
+    Application.put_env(:"alchemist.el", :aliases, aliases)
+
+    Complete.run(hint, imports) ++ Complete.run(hint)
+    |> print
+  end
+
+  defp normalize(request) do
+    {{hint, [ context: context,
+              imports: imports,
+              aliases: aliases ]}, _} =  Code.eval_string(request)
+    [hint, context, imports, aliases]
+  end
+
+  defp print(result) do
+    result
+    |> Enum.uniq
+    |> Enum.map(&IO.puts/1)
+
+    IO.puts "END-OF-COMP"
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/defl.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/defl.exs
new file mode 100644
index 0000000..db7e8f8
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/defl.exs
@@ -0,0 +1,80 @@
+Code.require_file "../helpers/module_info.exs", __DIR__
+
+defmodule Alchemist.API.Defl do
+
+  @moduledoc false
+
+  alias Alchemist.Helpers.ModuleInfo
+
+  def request(args) do
+    args
+    |> normalize
+    |> process
+    |> IO.puts
+
+    IO.puts "END-OF-DEFL"
+  end
+
+  def process([nil, function, [context: _, imports: [], aliases: _]]) do
+    look_for_kernel_functions(function)
+  end
+
+  def process([nil, function, [context: _, imports: imports, aliases: _ ]]) do
+    module = Enum.filter(imports, &ModuleInfo.has_function?(&1, function))
+    |> List.first
+
+    case module do
+      nil -> look_for_kernel_functions(function)
+      _   -> source(module)
+    end
+  end
+
+  def process([module, _function, [context: _, imports: _, aliases: aliases]]) do
+    if elixir_module?(module) do
+      module
+      |> Module.split
+      |> ModuleInfo.expand_alias(aliases)
+    else
+      module
+    end |> source
+  end
+
+  defp elixir_module?(module) do
+    module == Module.concat(Elixir, module)
+  end
+
+  defp look_for_kernel_functions(function) do
+    cond do
+      ModuleInfo.docs?(Kernel, function) ->
+        source(Kernel)
+      ModuleInfo.docs?(Kernel.SpecialForms, function) ->
+        source(Kernel.SpecialForms)
+      true -> ""
+    end
+  end
+
+  defp source([]), do: nil
+  defp source(module) when is_list(module) do
+    module
+    |> Module.concat
+    |> do_source
+  end
+  defp source(module), do: do_source(module)
+
+  defp do_source(module) do
+    if Code.ensure_loaded? module do
+      case module.module_info(:compile)[:source] do
+        nil    -> nil
+        source -> List.to_string(source)
+      end
+    end
+  end
+
+  defp normalize(request) do
+    {{expr, context_info}, _} = Code.eval_string(request)
+    [module, function]        = String.split(expr, ",", parts: 2)
+    {module, _}               = Code.eval_string(module)
+    function                  = String.to_atom function
+    [module, function, context_info]
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/docl.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/docl.exs
new file mode 100644
index 0000000..5467030
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/docl.exs
@@ -0,0 +1,78 @@
+Code.require_file "../helpers/module_info.exs", __DIR__
+
+defmodule Alchemist.API.Docl do
+
+  @moduledoc false
+
+  import IEx.Helpers, warn: false
+
+  alias Alchemist.Helpers.ModuleInfo
+
+  def request(args) do
+    Application.put_env(:iex, :colors, [enabled: true])
+
+    args
+    |> normalize
+    |> process
+
+    IO.puts "END-OF-DOCL"
+  end
+
+  def process([expr, modules, aliases]) do
+    search(expr, modules, aliases)
+  end
+
+  def search(nil), do: true
+  def search(expr) do
+    try do
+      Code.eval_string("h(#{expr})", [], __ENV__)
+    rescue
+      _e -> nil
+    end
+  end
+
+  def search(expr, modules, []) do
+    expr = to_string expr
+    unless function?(expr) do
+      search(expr)
+    else
+      search_with_context(modules, expr)
+    end
+  end
+
+  def search(expr, modules, aliases) do
+    unless function?(expr) do
+      String.split(expr, ".")
+      |> ModuleInfo.expand_alias(aliases)
+      |> search
+    else
+      search_with_context(modules, expr)
+    end
+  end
+
+  defp search_with_context(modules, expr) do
+    modules ++ [Kernel, Kernel.SpecialForms]
+    |> build_search(expr)
+    |> search
+  end
+
+  defp build_search(modules, search) do
+    function = Regex.replace(~r/\/[0-9]$/, search, "")
+    function = String.to_atom(function)
+    for module <- modules,
+    ModuleInfo.docs?(module, function) do
+      "#{module}.#{search}"
+    end |> List.first
+  end
+
+  defp function?(expr) do
+    Regex.match?(~r/^[a-z_]/, expr)
+  end
+
+  defp normalize(request) do
+    {{expr, [ context: _,
+              imports: imports,
+              aliases: aliases]}, _} = Code.eval_string(request)
+    [expr, imports, aliases]
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/eval.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/eval.exs
new file mode 100644
index 0000000..9269be1
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/eval.exs
@@ -0,0 +1,63 @@
+defmodule Alchemist.API.Eval do
+
+  @moduledoc false
+
+  def request(args) do
+    args
+    |> normalize
+    |> process
+
+    IO.puts "END-OF-EVAL"
+  end
+
+  def process({:eval, file}) do
+    try do
+      File.read!("#{file}")
+      |> Code.eval_string
+      |> Tuple.to_list
+      |> List.first
+      |> IO.inspect
+    rescue
+      e -> IO.inspect e
+    end
+  end
+
+  def process({:quote, file}) do
+    try do
+      File.read!("#{file}")
+      |> Code.string_to_quoted
+      |> Tuple.to_list
+      |> List.last
+      |> IO.inspect
+    rescue
+      e -> IO.inspect e
+    end
+  end
+
+  def process({:expand, file}) do
+    try do
+      {_, expr} = File.read!("#{file}")
+      |> Code.string_to_quoted
+      res = Macro.expand(expr, __ENV__)
+      IO.puts Macro.to_string(res)
+    rescue
+      e -> IO.inspect e
+    end
+  end
+
+  def process({:expand_once, file}) do
+    try do
+      {_, expr} = File.read!("#{file}")
+      |> Code.string_to_quoted
+      res = Macro.expand_once(expr, __ENV__)
+      IO.puts Macro.to_string(res)
+    rescue
+      e -> IO.inspect e
+    end
+  end
+
+  def normalize(request) do
+    {expr , _} = Code.eval_string(request)
+    expr
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/info.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/info.exs
new file mode 100644
index 0000000..13d7c2c
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/api/info.exs
@@ -0,0 +1,86 @@
+Code.require_file "../helpers/module_info.exs", __DIR__
+Code.require_file "../helpers/complete.exs", __DIR__
+
+defmodule Alchemist.API.Info do
+
+  @moduledoc false
+
+  import IEx.Helpers, warn: false
+
+  alias Alchemist.Helpers.ModuleInfo
+  alias Alchemist.Helpers.Complete
+
+  def request(args) do
+    args
+    |> normalize
+    |> process
+  end
+
+  def process(:modules) do
+    modules = ModuleInfo.all_applications_modules
+    |> Enum.uniq
+    |> Enum.reject(&is_nil/1)
+    |> Enum.filter(&ModuleInfo.moduledoc?/1)
+
+    functions = Complete.run('')
+
+    modules ++ functions
+    |> Enum.uniq
+    |> Enum.map(&IO.puts/1)
+
+    IO.puts "END-OF-INFO"
+  end
+
+  def process(:mixtasks) do
+    # append things like hex or phoenix archives to the load_path
+    Mix.Local.append_archives
+
+    :code.get_path
+    |> Mix.Task.load_tasks
+    |> Enum.map(&Mix.Task.task_name/1)
+    |> Enum.sort
+    |> Enum.map(&IO.puts/1)
+
+    IO.puts "END-OF-INFO"
+  end
+
+  def process({:info, arg}) do
+    try do
+      Code.eval_string("i(#{arg})", [], __ENV__)
+    rescue
+      _e -> nil
+    end
+
+    IO.puts "END-OF-INFO"
+  end
+
+  def process({:types, arg}) do
+    try do
+      Code.eval_string("t(#{arg})", [], __ENV__)
+    rescue
+      _e -> nil
+    end
+
+    IO.puts "END-OF-INFO"
+  end
+
+  def process(nil) do
+    IO.puts "END-OF-INFO"
+  end
+
+  def normalize(request) do
+    try do
+      Code.eval_string(request)
+    rescue
+      _e -> nil
+    else
+      {{_, type }, _}     -> type
+      {{_, type, arg}, _} ->
+        if Version.match?(System.version, ">=1.2.0-rc") do
+          {type, arg}
+        else
+          nil
+        end
+    end
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/helpers/complete.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/helpers/complete.exs
new file mode 100644
index 0000000..3ca1586
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/helpers/complete.exs
@@ -0,0 +1,351 @@
+Code.require_file "module_info.exs", __DIR__
+
+defmodule Alchemist.Helpers.Complete do
+
+  alias Alchemist.Helpers.ModuleInfo
+
+  @moduledoc """
+  This Alchemist.Completer holds a codebase copy of the
+  IEx.Autocomplete because for the use of context specific
+  aliases.
+
+  With the release of Elixir v1.1 the IEx.Autocomplete will
+  look for aliases in a certain environment variable
+  `Application.get_env(:iex, :autocomplete_server)` and until
+  then we'll use our own autocomplete codebase.
+  """
+
+  def run(exp) do
+    code = case is_bitstring(exp) do
+             true -> exp |> String.to_char_list
+             _ -> exp
+           end
+
+    {status, result, list } = expand(code |> Enum.reverse)
+
+    case { status, result, list } do
+      { :no, _, _ }  -> ''
+      { :yes, [], _ } -> List.insert_at(list, 0, exp)
+      { :yes, _,  _ } -> run(code ++ result)
+    end
+  end
+
+  def run(hint, modules) do
+    for module <- modules do
+      ModuleInfo.get_functions(module, hint)
+    end |> List.flatten
+  end
+
+  def expand('') do
+    expand_import("")
+  end
+
+  def expand([h|t]=expr) do
+    cond do
+      h === ?. and t != []->
+        expand_dot(reduce(t))
+      h === ?: ->
+        expand_erlang_modules()
+      identifier?(h) ->
+        expand_expr(reduce(expr))
+      (h == ?/) and t != [] and identifier?(hd(t)) ->
+        expand_expr(reduce(t))
+      h in '([{' ->
+        expand('')
+      true ->
+        no()
+    end
+  end
+
+  defp identifier?(h) do
+    (h in ?a..?z) or (h in ?A..?Z) or (h in ?0..?9) or h in [?_, ??, ?!]
+  end
+
+  defp expand_dot(expr) do
+    case Code.string_to_quoted expr do
+      {:ok, atom} when is_atom(atom) ->
+        expand_call(atom, "")
+      {:ok, {:__aliases__, _, list}} ->
+        expand_elixir_modules(list, "")
+      _ ->
+        no()
+    end
+  end
+
+  defp expand_expr(expr) do
+    case Code.string_to_quoted expr do
+      {:ok, atom} when is_atom(atom) ->
+        expand_erlang_modules(Atom.to_string(atom))
+      {:ok, {atom, _, nil}} when is_atom(atom) ->
+        expand_import(Atom.to_string(atom))
+      {:ok, {:__aliases__, _, [root]}} ->
+        expand_elixir_modules([], Atom.to_string(root))
+      {:ok, {:__aliases__, _, [h|_] = list}} when is_atom(h) ->
+        hint = Atom.to_string(List.last(list))
+        list = Enum.take(list, length(list) - 1)
+        expand_elixir_modules(list, hint)
+      {:ok, {{:., _, [mod, fun]}, _, []}} when is_atom(fun) ->
+        expand_call(mod, Atom.to_string(fun))
+      _ ->
+        no()
+    end
+  end
+
+  defp reduce(expr) do
+    Enum.reverse Enum.reduce ' ([{', expr, fn token, acc ->
+      hd(:string.tokens(acc, [token]))
+    end
+  end
+
+  defp yes(hint, entries) do
+    {:yes, String.to_char_list(hint), Enum.map(entries, &String.to_char_list/1)}
+  end
+
+  defp no do
+    {:no, '', []}
+  end
+
+  ## Formatting
+
+  defp format_expansion([], _) do
+    no()
+  end
+
+  defp format_expansion([uniq], hint) do
+    case to_hint(uniq, hint) do
+      ""   -> yes("", to_uniq_entries(uniq))
+      hint -> yes(hint, [])
+    end
+  end
+
+  defp format_expansion([first|_]=entries, hint) do
+    binary = Enum.map(entries, &(&1.name))
+    length = byte_size(hint)
+    prefix = :binary.longest_common_prefix(binary)
+    if prefix in [0, length] do
+      yes("", Enum.flat_map(entries, &to_entries/1))
+    else
+      yes(:binary.part(first.name, prefix, length-prefix), [])
+    end
+  end
+
+  ## Expand calls
+
+  # :atom.fun
+  defp expand_call(mod, hint) when is_atom(mod) do
+    expand_require(mod, hint)
+  end
+
+  # Elixir.fun
+  defp expand_call({:__aliases__, _, list}, hint) do
+    expand_alias(list)
+    |> normalize_module
+    |> expand_require(hint)
+  end
+
+  defp expand_call(_, _) do
+    no()
+  end
+
+  defp expand_require(mod, hint) do
+    format_expansion match_module_funs(mod, hint), hint
+  end
+
+  defp expand_import(hint) do
+    funs = match_module_funs(IEx.Helpers, hint) ++
+      match_module_funs(Kernel, hint) ++
+      match_module_funs(Kernel.SpecialForms, hint)
+    format_expansion funs, hint
+  end
+
+  ## Erlang modules
+
+  defp expand_erlang_modules(hint \\ "") do
+    format_expansion match_erlang_modules(hint), hint
+  end
+
+  defp match_erlang_modules(hint) do
+    for mod <- match_modules(hint, true) do
+      %{kind: :module, name: mod, type: :erlang}
+    end
+  end
+
+  ## Elixir modules
+
+  defp expand_elixir_modules([], hint) do
+    expand_elixir_modules(Elixir, hint, match_aliases(hint))
+  end
+
+  defp expand_elixir_modules(list, hint) do
+    expand_alias(list)
+    |> normalize_module
+    |> expand_elixir_modules(hint, [])
+  end
+
+  defp expand_elixir_modules(mod, hint, aliases) do
+    aliases
+    |> Kernel.++(match_elixir_modules(mod, hint))
+    |> Kernel.++(match_module_funs(mod, hint))
+    |> format_expansion(hint)
+  end
+
+  defp expand_alias([name | rest] = list) do
+    module = Module.concat(Elixir, name)
+    Enum.find_value env_aliases(), list, fn {alias, mod} ->
+      if alias === module do
+        case Atom.to_string(mod) do
+          "Elixir." <> mod ->
+            Module.concat [mod|rest]
+          _ ->
+            mod
+        end
+      end
+    end
+  end
+
+  defp env_aliases() do
+    Application.get_env(:"alchemist.el", :aliases)
+    |> format_aliases
+  end
+
+  defp format_aliases(nil), do: []
+  defp format_aliases(list), do: list
+
+  defp match_aliases(hint) do
+    for {alias, _mod} <- env_aliases(),
+    [name] = Module.split(alias),
+    starts_with?(name, hint) do
+      %{kind: :module, type: :alias, name: name}
+    end
+  end
+
+  defp match_elixir_modules(module, hint) do
+    name  = Atom.to_string(module)
+    depth = length(String.split(name, ".")) + 1
+    base  = name <> "." <> hint
+
+    for mod <- match_modules(base, module === Elixir),
+    parts = String.split(mod, "."),
+    depth <= length(parts) do
+      %{kind: :module, type: :elixir, name: Enum.at(parts, depth-1)}
+    end
+    |> Enum.uniq
+  end
+
+  ## Helpers
+
+   defp normalize_module(mod) do
+    if is_list(mod) do
+      Module.concat(mod)
+    else
+      mod
+    end
+  end
+
+  defp match_modules(hint, root) do
+    get_modules(root)
+    |> :lists.usort()
+    |> Enum.drop_while(& not starts_with?(&1, hint))
+    |> Enum.take_while(& starts_with?(&1, hint))
+  end
+
+  defp get_modules(true) do
+    ["Elixir.Elixir"] ++ get_modules(false)
+  end
+
+  defp get_modules(false) do
+    modules = Enum.map(:code.all_loaded(), &Atom.to_string(elem(&1, 0)))
+    case :code.get_mode() do
+      :interactive -> modules ++ get_modules_from_applications()
+      _otherwise -> modules
+    end
+  end
+
+  defp get_modules_from_applications do
+    for [app] <- loaded_applications(),
+    {:ok, modules} = :application.get_key(app, :modules),
+    module <- modules do
+      Atom.to_string(module)
+    end
+  end
+
+  defp loaded_applications do
+    # If we invoke :application.loaded_applications/0,
+    # it can error if we don't call safe_fixtable before.
+    # Since in both cases we are reaching over the
+    # application controller internals, we choose to match
+    # for performance.
+    :ets.match(:ac_tab, {{:loaded, :"$1"}, :_})
+  end
+
+  defp match_module_funs(mod, hint) do
+    case ensure_loaded(mod) do
+      {:module, _} ->
+        falist = get_module_funs(mod)
+
+      list = Enum.reduce falist, [], fn {f, a}, acc ->
+        case :lists.keyfind(f, 1, acc) do
+          {f, aa} -> :lists.keyreplace(f, 1, acc, {f, [a|aa]})
+          false -> [{f, [a]}|acc]
+        end
+      end
+
+      for {fun, arities} <- list,
+      name = Atom.to_string(fun),
+      starts_with?(name, hint) do
+        %{kind: :function, name: name, arities: arities}
+      end |> :lists.sort()
+
+      _otherwise -> []
+    end
+  end
+
+  defp get_module_funs(mod) do
+    if function_exported?(mod, :__info__, 1) do
+      if docs = Code.get_docs(mod, :docs) do
+        for {tuple, _line, _kind, _sign, doc} <- docs, doc != false, do: tuple
+      else
+        mod.__info__(:macros) ++ (mod.__info__(:functions) -- [__info__: 1])
+      end
+    else
+      mod.module_info(:exports)
+    end
+  end
+
+  defp ensure_loaded(Elixir), do: {:error, :nofile}
+  defp ensure_loaded(mod), do: Code.ensure_compiled(mod)
+
+  defp starts_with?(_string, ""),  do: true
+  defp starts_with?(string, hint), do: String.starts_with?(string, hint)
+
+  ## Ad-hoc conversions
+
+  defp to_entries(%{kind: :module, name: name}) do
+    [name]
+  end
+
+  defp to_entries(%{kind: :function, name: name, arities: arities}) do
+    for a <- :lists.sort(arities), do: "#{name}/#{a}"
+  end
+
+  defp to_uniq_entries(%{kind: :module}) do
+    []
+  end
+
+  defp to_uniq_entries(%{kind: :function} = fun) do
+    to_entries(fun)
+  end
+
+  defp to_hint(%{kind: :module, name: name}, hint) do
+    format_hint(name, hint) <> "."
+  end
+
+  defp to_hint(%{kind: :function, name: name}, hint) do
+    format_hint(name, hint)
+  end
+
+  defp format_hint(name, hint) do
+    hint_size = byte_size(hint)
+    :binary.part(name, hint_size, byte_size(name) - hint_size)
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/helpers/module_info.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/helpers/module_info.exs
new file mode 100644
index 0000000..c8de52e
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/helpers/module_info.exs
@@ -0,0 +1,117 @@
+defmodule Alchemist.Helpers.ModuleInfo do
+
+  @moduledoc false
+
+  def moduledoc?(module) do
+    case Code.get_docs module, :moduledoc do
+      {_, doc} -> is_binary doc
+      _ -> false
+    end
+  end
+
+  def docs?(module, function) do
+    docs = Code.get_docs module, :docs
+    do_docs?(docs, function)
+  end
+
+  def expand_alias([name | rest] = list, aliases) do
+    module = Module.concat(Elixir, name)
+    Enum.find_value(aliases, list, fn {alias, mod} ->
+      if alias === module do
+        case Atom.to_string(mod) do
+          "Elixir." <> mod ->
+            Module.concat [mod|rest]
+          _ ->
+            mod
+        end
+      end
+    end) |> normalize_module
+  end
+
+  def get_functions(module, hint) do
+    hint        = to_string hint
+    {module, _} = Code.eval_string(module)
+    functions   = get_module_funs(module)
+
+    list = Enum.reduce functions, [], fn({f, a}, acc) ->
+      case :lists.keyfind(f, 1, acc) do
+        {f, aa} -> :lists.keyreplace(f, 1, acc, {f, [a|aa]})
+        false -> [{f, [a]}|acc]
+      end
+    end
+
+    do_get_functions(list, hint) |> :lists.sort()
+  end
+
+  def has_function?(module, function) do
+    List.keymember? get_module_funs(module), function, 0
+  end
+
+  defp do_get_functions(list, "") do
+    all_functions(list)
+  end
+
+  defp do_get_functions(list, hint) do
+    all_functions(list, hint)
+  end
+
+  defp get_module_funs(module) do
+    case Code.ensure_loaded(module) do
+      {:module, _} ->
+        module.module_info(:functions) ++ module.__info__(:macros)
+      _otherwise ->
+        []
+    end
+  end
+
+  defp all_functions(list) do
+    for {fun, arities} <- list, name = Atom.to_string(fun) do
+      "#{name}/#{List.first(arities)}"
+    end
+  end
+
+  defp all_functions(list, hint) do
+    for {fun, arities} <- list,
+    name = Atom.to_string(fun),
+    String.starts_with?(name, hint) do
+      "#{name}/#{List.first(arities)}"
+    end
+  end
+
+  def all_applications_modules do
+    for [app] <- loaded_applications(),
+    {:ok, modules} = :application.get_key(app, :modules),
+    module <- modules do
+      module
+    end
+  end
+
+  defp do_docs?([head|tail], function) do
+    {{func, _}, _, _, _, doc} = head
+    if func == function and is_binary(doc) do
+      true
+    else
+      do_docs?(tail, function)
+    end
+  end
+  defp do_docs?([], _function), do: false
+  defp do_docs?(nil, _function), do: false
+
+  defp loaded_applications do
+    # If we invoke :application.loaded_applications/0,
+    # it can error if we don't call safe_fixtable before.
+    # Since in both cases we are reaching over the
+    # application controller internals, we choose to match
+    # for performance.
+    :ets.match(:ac_tab, {{:loaded, :"$1"}, :_})
+  end
+
+  defp normalize_module(mod) do
+    if is_list(mod) do
+      Module.concat(mod)
+    else
+      mod
+    end
+  end
+
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/server.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/server.exs
new file mode 100644
index 0000000..09ae6de
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/lib/server.exs
@@ -0,0 +1,93 @@
+Code.require_file "api/comp.exs", __DIR__
+Code.require_file "api/docl.exs", __DIR__
+Code.require_file "api/defl.exs", __DIR__
+Code.require_file "api/eval.exs", __DIR__
+Code.require_file "api/info.exs", __DIR__
+
+defmodule Alchemist.Server do
+
+  @version "0.1.0-beta"
+
+  @moduledoc """
+  The Alchemist-Server operates as an informant for a specific desired
+  Elixir Mix project and serves with informations as the following:
+
+    * Completion for Modules and functions.
+    * Documentation lookup for Modules and functions.
+    * Code evaluation and quoted representation of code.
+    * Definition lookup of code.
+    * Listing of all available Mix tasks.
+    * Listing of all available Modules with documentation.
+  """
+
+  alias Alchemist.API
+
+  def start([env]) do
+    loop(all_loaded(), env)
+  end
+
+  def loop(loaded, env) do
+    line  = IO.gets("") |> String.rstrip()
+    paths = load_paths(env)
+    apps  = load_apps(env)
+
+    read_input(line)
+
+    purge_modules(loaded)
+    purge_paths(paths)
+    purge_apps(apps)
+
+    loop(loaded, env)
+  end
+
+  def read_input(line) do
+    case line |> String.split(" ", parts: 2) do
+      ["COMP", args] ->
+        API.Comp.request(args)
+      ["DOCL", args] ->
+        API.Docl.request(args)
+      ["INFO", args] ->
+        API.Info.request(args)
+      ["EVAL", args] ->
+        API.Eval.request(args)
+      ["DEFL", args] ->
+        API.Defl.request(args)
+      _ ->
+        nil
+    end
+  end
+
+  defp all_loaded() do
+    for {m,_} <- :code.all_loaded, do: m
+  end
+
+  defp load_paths(env) do
+    for path <- Path.wildcard("_build/#{env}/lib/*/ebin") do
+      Code.prepend_path(path)
+      path
+    end
+  end
+
+  defp load_apps(env) do
+    for path <- Path.wildcard("_build/#{env}/lib/*/ebin/*.app") do
+      app = path |> Path.basename() |> Path.rootname() |> String.to_atom
+      Application.load(app)
+      app
+    end
+  end
+
+  defp purge_modules(loaded) do
+    for m <- (all_loaded() -- loaded) do
+      :code.delete(m)
+      :code.purge(m)
+    end
+  end
+
+  defp purge_paths(paths) do
+    for p <- paths, do: Code.delete_path(p)
+  end
+
+  defp purge_apps(apps) do
+    for a <- apps, do: Application.unload(a)
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/run.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/run.exs
new file mode 100644
index 0000000..4616198
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/run.exs
@@ -0,0 +1,3 @@
+Code.require_file "lib/server.exs", __DIR__
+
+Alchemist.Server.start([System.argv])
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/comp_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/comp_test.exs
new file mode 100644
index 0000000..e9d0c8a
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/comp_test.exs
@@ -0,0 +1,57 @@
+Code.require_file "../test_helper.exs", __DIR__
+Code.require_file "../../lib/api/comp.exs", __DIR__
+
+defmodule Alchemist.API.CompTest do
+
+  use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
+
+  alias Alchemist.API.Comp
+
+  test "COMP request with empty hint" do
+    assert capture_io(fn ->
+      Comp.process([nil, Elixir, [], [] ])
+    end) =~ """
+    import/2
+    quote/2
+    require/2
+    END-OF-COMP
+    """
+  end
+
+  test "COMP request without empty hint" do
+    assert capture_io(fn ->
+      Comp.process(['is_b', Elixir, [], []])
+    end) =~ """
+    is_b
+    is_binary/1
+    is_bitstring/1
+    is_boolean/1
+    END-OF-COMP
+    """
+  end
+
+  test "COMP request with an alias" do
+    assert capture_io(fn ->
+      Comp.process(['MyList.flat', Elixir, [], [{MyList, List}]])
+    end) =~ """
+    MyList.flatten
+    flatten/1
+    flatten/2
+    END-OF-COMP
+    """
+  end
+
+  test "COMP request with a module hint" do
+    assert capture_io(fn ->
+      Comp.process(['Str', Elixir, [], []])
+    end) =~ """
+    Str
+    Stream
+    String
+    StringIO
+    END-OF-COMP
+    """
+  end
+
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/defl_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/defl_test.exs
new file mode 100644
index 0000000..d0ead2f
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/defl_test.exs
@@ -0,0 +1,45 @@
+Code.require_file "../test_helper.exs", __DIR__
+Code.require_file "../../lib/api/defl.exs", __DIR__
+
+defmodule Alchemist.API.DeflTest do
+
+  use ExUnit.Case
+
+  alias Alchemist.API.Defl
+
+  test "DEFL request call for defmodule" do
+    context = [context: Elixir, imports: [], aliases: []]
+    assert Defl.process([nil, :defmodule, context]) =~ "lib/elixir/lib/kernel.ex"
+  end
+
+  test "DEFL request call for import" do
+    context = [context: Elixir, imports: [], aliases: []]
+    assert Defl.process([nil, :import, context]) =~ "lib/elixir/lib/kernel/special_forms.ex"
+  end
+
+  test "DEFL request call for create_file with available import" do
+    context = [context: Elixir, imports: [Mix.Generator], aliases: []]
+    assert Defl.process([nil, :create_file, context]) =~ "lib/mix/lib/mix/generator.ex"
+  end
+
+  test "DEFL request call for MyList.flatten with available aliases" do
+    context = [context: Elixir, imports: [], aliases: [{MyList, List}]]
+    assert Defl.process([MyList, :flatten, context]) =~ "lib/elixir/lib/list.ex"
+  end
+
+  test "DEFL request call for String module" do
+    context = [context: Elixir, imports: [], aliases: []]
+    assert Defl.process([String, nil, context]) =~ "lib/elixir/lib/string.ex"
+  end
+
+  test "DEFL request call for erlang module" do
+    context = [ context: Elixir, imports: [], aliases: [] ]
+    assert Defl.process([:lists, :duplicate, context]) =~ "lib/stdlib/src/lists.erl"
+  end
+
+  test "DEFL request call for none existing module" do
+    context = [ context: Elixir, imports: [], aliases: [] ]
+    assert Defl.process([Rock, :duplicate, context]) == nil
+  end
+
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/docl_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/docl_test.exs
new file mode 100644
index 0000000..fc1eaa5
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api/docl_test.exs
@@ -0,0 +1,73 @@
+Code.require_file "../test_helper.exs", __DIR__
+Code.require_file "../../lib/api/comp.exs", __DIR__
+Code.require_file "../../lib/api/docl.exs", __DIR__
+
+defmodule Alchemist.API.DoclTest do
+
+  use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
+
+  alias Alchemist.API.Docl
+
+  test "DOCL request" do
+    assert capture_io(fn ->
+      Docl.process(['defmodule', [], []])
+    end) =~ """
+    Defines a module given by name with the given contents.
+    """
+  end
+
+  test "DOCL request for List.flatten" do
+    assert capture_io(fn ->
+      Docl.process(["List.flatten", [], []])
+    end) =~ """
+    Flattens the given \e[36mlist\e[0m of nested lists.
+    \e[0m
+    \e[33mExamples\e[0m
+    \e[0m
+    \e[36m\e[1m┃ iex> List.flatten([1, [[2], 3]])
+    """
+  end
+
+  test "DOCL request for MyCustomList.flatten with alias" do
+    assert capture_io(fn ->
+      Docl.process(["MyCustomList.flatten", [], [{MyCustomList, List}]])
+    end) =~ """
+    Flattens the given \e[36mlist\e[0m of nested lists.
+    \e[0m
+    \e[33mExamples\e[0m
+    \e[0m
+    \e[36m\e[1m┃ iex> List.flatten([1, [[2], 3]])
+    """
+  end
+
+  test "DOCL request for search create_file with import" do
+    assert capture_io(fn ->
+      Docl.process(["create_file", [Mix.Generator], []])
+    end) =~ """
+    def create_file(path, contents, opts \\\\ [])                   \e[0m
+    \e[0m
+    Creates a file with the given contents. If the file already exists, asks for
+    user confirmation.
+    \e[0m
+    """
+  end
+
+  test "DOCL request for defmacro" do
+    assert capture_io(fn ->
+      Docl.process(["defmacro", [], []])
+    end) =~ """
+    \e[7m\e[33m                      defmacro defmacro(call, expr \\\\ nil)                      \e[0m
+    """
+  end
+
+  test "DOCL request for Path.basename/1" do
+    assert capture_io(fn ->
+      Docl.process(["Path.basename/1", [], []])
+    end) =~ """
+    Returns the last component of the path or the path itself if it does not
+    contain any directory separators.
+    """
+  end
+
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api_test.exs
new file mode 100644
index 0000000..7928920
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/api_test.exs
@@ -0,0 +1,19 @@
+Code.require_file "test_helper.exs", __DIR__
+Code.require_file "../lib/api/comp.exs", __DIR__
+Code.require_file "../lib/api/docl.exs", __DIR__
+
+defmodule APITest do
+  use ExUnit.Case, async: true
+  import ExUnit.CaptureIO
+
+  alias Alchemist.API
+
+  test "DOCL request" do
+    assert capture_io(fn ->
+      API.Docl.process(['defmodule', [], []])
+    end) =~ """
+    Defines a module given by name with the given contents.
+    """
+  end
+
+end
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/enh-ruby-mode b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/fixtures/.gitkeep
old mode 100755
new mode 100644
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/enh-ruby-mode
rename to emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/fixtures/.gitkeep
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/helpers/complete_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/helpers/complete_test.exs
new file mode 100644
index 0000000..1c10e12
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/helpers/complete_test.exs
@@ -0,0 +1,41 @@
+Code.require_file "../test_helper.exs", __DIR__
+Code.require_file "../../lib/helpers/complete.exs", __DIR__
+
+defmodule CompleteTest do
+  use ExUnit.Case, async: true
+
+  import Alchemist.Helpers.Complete
+
+  defmodule MyModule do
+    def say_hi, do: true
+  end
+
+  test "return completion candidates for 'List'" do
+    assert run('List') == ['List.', 'Chars', 'first/1', 'last/1', 'to_atom/1',
+                           'to_existing_atom/1', 'to_float/1', 'to_string/1', 'to_tuple/1',
+                           'wrap/1', 'zip/1', 'delete/2', 'delete_at/2', 'duplicate/2',
+                           'keysort/2', 'flatten/1', 'flatten/2', 'to_integer/1',
+                           'to_integer/2', 'foldl/3', 'foldr/3', 'insert_at/3', 'keydelete/3',
+                           'keymember?/3', 'keytake/3', 'replace_at/3', 'update_at/3',
+                           'keyfind/4', 'keyreplace/4', 'keystore/4']
+  end
+
+  test "return completion candidates for 'Str'" do
+    assert run('Str') == ['Str', 'Stream', 'String', 'StringIO']
+  end
+
+  test "return completion candidates for 'List.del'" do
+    assert run('List.del') == ['List.delete', 'delete/2', 'delete_at/2']
+  end
+
+  test "return completion candidates for module with alias" do
+    Application.put_env(:"alchemist.el", :aliases, [{MyList, List}])
+
+    assert run('MyList.del') == ['MyList.delete', 'delete/2', 'delete_at/2']
+  end
+
+  test "return completion candidates for functions from import" do
+    imports = [MyModule]
+    assert run('say', imports) == ["say_hi/0"]
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/helpers/module_info_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/helpers/module_info_test.exs
new file mode 100644
index 0000000..4bbf645
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/helpers/module_info_test.exs
@@ -0,0 +1,45 @@
+Code.require_file "../test_helper.exs", __DIR__
+Code.require_file "../../lib/helpers/module_info.exs", __DIR__
+
+defmodule Alchemist.Helpers.ModuleTest do
+
+  use ExUnit.Case
+
+  alias Alchemist.Helpers.ModuleInfo
+
+  test "moduledoc? returns true" do
+    assert ModuleInfo.moduledoc?(List) == true
+  end
+
+  test "moduledoc? returns false" do
+    assert ModuleInfo.moduledoc?(List.Chars.Atom) == false
+  end
+
+  test "docs? returns true" do
+    assert ModuleInfo.docs?(List, :flatten) == true
+    assert ModuleInfo.docs?(Kernel, :def) == true
+  end
+
+  test "docs? returns false" do
+    assert ModuleInfo.docs?(List, :dance) == false
+    assert ModuleInfo.docs?(nil, :dance) == false
+  end
+
+  test "expand_alias return expanded module alias" do
+    aliases = [{MyList, List}, {MyGenServer, :gen_server}]
+
+    assert ModuleInfo.expand_alias([MyList], aliases) == List
+    assert ModuleInfo.expand_alias([MyGenServer], aliases) == :gen_server
+    assert ModuleInfo.expand_alias([MyList], aliases) == List
+  end
+
+  test "has_function? return true" do
+    assert ModuleInfo.has_function?(List, :flatten) == true
+    assert ModuleInfo.has_function?(List, :to_string) == true
+  end
+
+  test "has_function? return false" do
+    assert ModuleInfo.has_function?(List, :split) == false
+    assert ModuleInfo.has_function?(List, :map) == false
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/server_test.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/server_test.exs
new file mode 100644
index 0000000..0f09f76
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/server_test.exs
@@ -0,0 +1,126 @@
+Code.require_file "test_helper.exs", __DIR__
+Code.require_file "../lib/server.exs", __DIR__
+
+defmodule ServerTest do
+  use ExUnit.Case
+  import ExUnit.CaptureIO
+
+  setup_all do
+    on_exit fn ->
+      {_status, files} = File.ls Path.expand("fixtures", __DIR__)
+      files |> Enum.each(fn(file) ->
+        unless file == ".gitkeep" do
+          File.rm Path.expand("fixtures/#{file}", __DIR__)
+        end
+      end)
+    end
+  end
+
+  test "Expression completion" do
+    assert send_signal("COMP { 'def', [context: Elixir, imports: [], aliases: []]}") =~ """
+    defoverridable/1
+    """
+  end
+
+  test "Documentation lookup" do
+    assert send_signal("DOCL { 'List', [context: Elixir, imports: [], aliases: []]}") =~ """
+    \e[0m\n\e[7m\e[33m                                      List                                      \e[0m\n\e[0m
+    """
+  end
+
+  test "Getting the definition source file information of code" do
+    assert send_signal("DEFL {\"List,delete\", [context: Elixir, imports: [], aliases: []]}") =~ "/lib/elixir/lib/list.ex"
+  end
+
+  test "Evaluate the content of a file" do
+    filename = Path.expand("fixtures/eval_fixture.exs", __DIR__)
+    File.write(filename, "1+1")
+    assert send_signal("EVAL { :eval, '#{filename}' }") =~ "2"
+  end
+
+  test "Evaluate and quote the content of a file" do
+    filename = Path.expand("fixtures/eval_and_quote_fixture.exs", __DIR__)
+    File.write(filename, "[4,2,1,3] |> Enum.sort")
+    assert send_signal("EVAL { :quote, '#{filename}' }") =~ """
+    {{:., [line: 1], [{:__aliases__, [counter: 0, line: 1], [:Enum]}, :sort]},\n   [line: 1], []}]}
+    """
+  end
+
+  test "Expand macro once" do
+    filename = Path.expand("fixtures/macro_expand_once_fixture.exs", __DIR__)
+    File.write(filename, "unless true, do: IO.puts \"this should never be printed\"")
+    assert send_signal("EVAL { :expand_once, '#{filename}' }") =~ """
+    if(true) do
+      nil
+    else
+      IO.puts("this should never be printed")
+    end
+    """
+  end
+
+  test "Expand macro" do
+    filename = Path.expand("fixtures/macro_expand_fixture.exs", __DIR__)
+    File.write(filename, "unless true, do: IO.puts \"this should never be printed\"")
+    assert send_signal("EVAL { :expand, '#{filename}' }") =~ """
+    case(true) do
+      x when x in [false, nil] ->
+        IO.puts("this should never be printed")
+      _ ->
+        nil
+    end
+    """
+  end
+
+  test "Get all available application modules" do
+    assert send_signal("INFO { :type, :modules }") =~ """
+    Elixir.Logger
+    Elixir.Logger.Formatter
+    Elixir.Logger.Translator
+    """
+  end
+
+  test "Get all available mix tasks by name" do
+    assert send_signal("INFO { :type, :mixtasks }") =~ """
+    app.start
+    archive
+    archive.build
+    archive.install
+    archive.uninstall
+    clean
+    cmd
+    compile
+    """
+  end
+
+  # The IEx.Helpers.t and IEx.Helpers.i are functionality which come with
+  # Elixir version 1.2.0
+  if Version.match?(System.version, ">=1.2.0-rc") do
+    test "Get information from data type" do
+      assert send_signal("INFO { :type, :info, List}") =~ """
+      Reference modules\e[0m\n\e[22m  Module, Atom\e[0m\nEND-OF-INFO
+      """
+    end
+
+    test "Don't crash server if data type argument is faulty" do
+      assert send_signal("INFO { :type, :info, whatever}") =~ """
+      END-OF-INFO
+      """
+    end
+
+    test "Prints the types for the given module or for the given function/arity pair" do
+      assert send_signal("INFO { :type, :types, 'Agent'}") =~ """
+      @type agent() :: pid() | {atom(), node()} | name()\e[0m\n\e[22m@type state() :: term()\e[0m\nEND-OF-INFO
+      """
+
+      assert send_signal("INFO { :type, :types, 'Agent.on_start/0'}") =~ """
+      @type on_start() :: {:ok, pid()} | {:error, {:already_started, pid()} | term()}\e[0m
+      """
+    end
+  end
+
+  defp send_signal(signal) do
+    capture_io(fn ->
+      Alchemist.Server.read_input(signal)
+    end)
+  end
+end
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/test_helper.exs b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/test_helper.exs
new file mode 100644
index 0000000..869559e
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-server/test/test_helper.exs
@@ -0,0 +1 @@
+ExUnit.start()
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-test-mode.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-test-mode.el
new file mode 100644
index 0000000..f9bd0fd
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-test-mode.el
@@ -0,0 +1,373 @@
+;;; alchemist-test-mode.el --- Minor mode for Elixir test files.
+
+;; Copyright © 2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Minor mode for Elixir test files.
+
+;;; Code:
+
+(require 'dash)
+(require 'alchemist-project)
+
+(defgroup alchemist-test-mode nil
+  "Minor mode for Elixir ExUnit files."
+  :prefix "alchemist-test-mode-"
+  :group 'alchemist)
+
+;; Variables
+
+(defcustom alchemist-test-mode-highlight-tests t
+  "Non-nil means that specific functions for testing will
+be highlighted with more significant font faces."
+  :type 'boolean
+  :group 'alchemist-test-mode)
+
+(defcustom alchemist-test-display-compilation-output nil
+  "if Non-nil, compilation informations will be displayed
+in the test report buffer."
+  :type 'boolean
+  :group 'alchemist-test-mode)
+
+(defcustom alchemist-test-status-modeline t
+  "if Non-nil, the face of local `mode-name' variable will change with test run status.
+
+For example, when `alchemist-mix-test' fails, the `mode-name' will be
+formatted with the `alchemist-test--failed-face' face, to symbolize failing tests."
+  :type 'boolean
+  :group 'alchemist-test)
+
+(defcustom alchemist-test-ask-about-save t
+  "Non-nil means 'alchemist-test-excute` asks which buffers to save before running.
+Otherwise, it saves all modified buffers without asking."
+  :type 'boolean
+  :group 'alchemist-test)
+
+(defvar alchemist-test--last-run-status "")
+
+(defconst alchemist-test-report-buffer-name "*alchemist test report*"
+  "Name of the test report buffer.")
+
+(defconst alchemist-test-report-process-name "alchemist-test-process"
+  "Name of the test report process.")
+
+(defconst alchemist-test--failing-files-regex
+  "\\(  [0-9]+).+\n\s+\\)\\([-A-Za-z0-9./_]+:[0-9]+\\)$")
+(defconst alchemist-test--stacktrace-files-regex
+  "\\(       \\)\\([-A-Za-z0-9./_]+:[0-9]+\\).*")
+
+;; Faces
+
+(defface alchemist-test--test-file-and-location-face
+  '((t (:inherit font-lock-variable-name-face :weight bold)))
+  "Face for the file where the failed test are."
+  :group 'alchemist-test)
+
+(defface alchemist-test--stacktrace-file-and-location-face
+  '((t (:inherit font-lock-keyword-face :weight bold)))
+  "Face for the stacktrace files."
+  :group 'alchemist-test)
+
+(defface alchemist-test--success-face
+  '((t (:inherit font-lock-variable-name-face :bold t :background "darkgreen" :foreground "white")))
+  "Face for successful compilation run."
+  :group 'alchemist-test)
+
+(defface alchemist-test--failed-face
+  '((t (:inherit font-lock-variable-name-face :bold t :background "red" :foreground "white")))
+  "Face for failed compilation run."
+  :group 'alchemist-test)
+
+(defvar alchemist-test--mode-name-face 'mode-line)
+
+(defvar alchemist-test-at-point #'alchemist-mix-test-at-point)
+(defvar alchemist-test-this-buffer #'alchemist-mix-test-this-buffer)
+(defvar alchemist-test #'alchemist-mix-test)
+(defvar alchemist-test-file #'alchemist-mix-test-file)
+(defvar alchemist-test-jump-to-previous-test #'alchemist-test-mode-jump-to-previous-test)
+(defvar alchemist-test-jump-to-next-test #'alchemist-test-mode-jump-to-next-test)
+(defvar alchemist-test-list-tests #'alchemist-test-mode-list-tests)
+
+(defvar alchemist-test-report-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "q" #'quit-window)
+    (define-key map "t" #'toggle-truncate-lines)
+    (define-key map "r" #'alchemist-mix-rerun-last-test)
+    (define-key map (kbd "M-n") #'alchemist-test-next-result)
+    (define-key map (kbd "M-p") #'alchemist-test-previous-result)
+    (define-key map (kbd "M-N") #'alchemist-test-next-stacktrace-file)
+    (define-key map (kbd "M-P") #'alchemist-test-previous-stacktrace-file)
+    (define-key map (kbd "C-c C-k") #'alchemist-report-interrupt-current-process)
+    map))
+
+(defvar alchemist-test-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c , s") alchemist-test-at-point)
+    (define-key map (kbd "C-c , v") alchemist-test-this-buffer)
+    (define-key map (kbd "C-c , a") alchemist-test)
+    (define-key map (kbd "C-c , f") alchemist-test-file)
+    (define-key map (kbd "C-c , p") alchemist-test-jump-to-previous-test)
+    (define-key map (kbd "C-c , n") alchemist-test-jump-to-next-test)
+    (define-key map (kbd "C-c , l") alchemist-test-list-tests)
+    map)
+  "Keymap for `alchemist-test-mode'.")
+
+(defconst alchemist-test-mode--test-regex
+  (let ((whitespace-opt "[[:space:]]*")
+        (whitespace "[[:space:]]+"))
+    (concat "\\(^" whitespace-opt "test" whitespace "\\(?10:.+\\)" whitespace "do" whitespace-opt "$"
+            "\\|"
+            whitespace " [0-9]+) test .+\\)")))
+
+;; Private functions
+
+(defun alchemist-test--set-modeline-color (status)
+  (setq alchemist-test--mode-name-face
+        (if (string-prefix-p "finished" status)
+            'alchemist-test--success-face
+          'alchemist-test--failed-face)))
+
+(defun alchemist-test--render-report (buffer)
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t))
+      (alchemist-test--render-files))))
+
+(defun alchemist-test--render-files ()
+  (alchemist-test--render-test-failing-files)
+  (alchemist-test--render-stacktrace-files))
+
+(defun alchemist-test--render-test-failing-files ()
+  (alchemist-test--render-file alchemist-test--failing-files-regex
+                               'alchemist-test--test-file-and-location-face))
+
+(defun alchemist-test--render-stacktrace-files ()
+  (alchemist-test--render-file alchemist-test--stacktrace-files-regex
+                               'alchemist-test--stacktrace-file-and-location-face))
+
+(defun alchemist-test--render-file (regex face)
+  (save-excursion
+    (goto-char (point-min))
+    (while (re-search-forward regex nil t)
+      (let ((file (buffer-substring-no-properties (match-beginning 2) (match-end 2))))
+        (goto-char (match-beginning 2))
+        (replace-match "" nil nil nil 2)
+        (insert-text-button file
+                            'face face
+                            'file file
+                            'follow-link t
+                            'action #'alchemist-test--open-file
+                            'help-echo "visit the source location")))))
+
+(defun alchemist-test--open-file (button)
+  (save-match-data
+    (string-match "\\([-A-Za-z0-9./_]+\\):\\([0-9]+\\)" (button-get button 'file))
+    (let* ((file-with-line (button-get button 'file))
+           (file (substring-no-properties file-with-line (match-beginning 1) (match-end 1)))
+           (line (string-to-number (substring-no-properties file-with-line (match-beginning 2) (match-end 2))))
+           (file-path (if (file-exists-p file)
+                          file
+                        (expand-file-name (concat (alchemist-project-root) file)))))
+      (with-current-buffer (find-file-other-window file-path)
+        (goto-char (point-min))
+        (forward-line (- line 1))))))
+
+(defun alchemist-test--handle-exit (status buffer)
+  (when alchemist-test-status-modeline
+    (alchemist-test--set-modeline-color status))
+  (with-current-buffer buffer
+    (let ((inhibit-read-only t))
+      (alchemist-test--render-files))))
+
+(defun alchemist-test-mode--buffer-contains-tests-p ()
+  "Return nil if the current buffer contains no tests, non-nil if it does."
+  (alchemist-utils-occur-in-buffer-p (current-buffer) alchemist-test-mode--test-regex))
+
+(defun alchemist-test-mode--tests-in-buffer ()
+  "Return an alist of tests in this buffer.
+
+The keys in the list are the test names (e.g., the string passed to the test/2
+macro) while the values are the position at which the test matched."
+  (save-match-data
+    (save-excursion
+      (goto-char (point-min))
+      (let ((tests '()))
+        (while (re-search-forward alchemist-test-mode--test-regex nil t)
+          (let* ((position (car (match-data)))
+                 (matched-string (match-string 10)))
+            (set-text-properties 0 (length matched-string) nil matched-string)
+            (add-to-list 'tests (cons matched-string position) t)))
+        tests))))
+
+(defun alchemist-test-mode--highlight-syntax ()
+  (if alchemist-test-mode-highlight-tests
+      (font-lock-add-keywords nil
+                              '(("^\s+\\(test\\)\s+" 1
+                                 font-lock-variable-name-face t)
+                                ("^\s+\\(assert[_a-z]*\\|refute[_a-z]*\\|flunk\\)\s+" 1
+                                 font-lock-type-face t)
+                                ("^\s+\\(assert[_a-z]*\\|refute[_a-z]*\\|flunk\\)\(" 1
+                                 font-lock-type-face t)))))
+
+;; Public functions
+
+(define-derived-mode alchemist-test-report-mode fundamental-mode "Alchemist Test Report"
+  "Major mode for presenting Elixir test results.
+
+\\{alchemist-test-report-mode-map}"
+  (setq buffer-read-only t)
+  (setq-local truncate-lines t)
+  (setq-local electric-indent-chars nil))
+
+(defun alchemist-test-save-buffers ()
+  "Save some modified file-visiting buffers."
+  (save-some-buffers (not alchemist-test-ask-about-save) nil))
+
+(defun alchemist-test-clean-compilation-output (output)
+  (if (not alchemist-test-display-compilation-output)
+      (with-temp-buffer
+        (insert output)
+        (delete-matching-lines "^Compiled .+" (point-min) (point-max))
+        (delete-matching-lines "^Generated .+" (point-min) (point-max))
+        (buffer-substring-no-properties (point-min) (point-max)))
+  output))
+
+(defun alchemist-test-execute (command-list)
+  (message "Testing...")
+  (let* ((command (mapconcat 'concat (-flatten command-list) " ")))
+    (alchemist-test-save-buffers)
+    (alchemist-report-run command
+                          alchemist-test-report-process-name
+                          alchemist-test-report-buffer-name
+                          'alchemist-test-report-mode
+                          #'alchemist-test--handle-exit)))
+
+(defun alchemist-test-initialize-modeline ()
+  "Initialize the mode-line face."
+  (when alchemist-test-status-modeline
+    (setq mode-name
+          '(:eval (propertize "Elixir" 'face alchemist-test--mode-name-face)))))
+
+(defun alchemist-test-reset-modeline ()
+  "Reset the current mode-line face to default."
+  (setq mode-name "Elixir"))
+
+(defun alchemist-test-mode-jump-to-next-test ()
+  "Jump to the next ExUnit test. If there are no tests after the current
+position, jump to the first test in the buffer. Do nothing if there are no tests
+in this buffer."
+  (interactive)
+  (alchemist-utils-jump-to-next-matching-line alchemist-test-mode--test-regex 'back-to-indentation))
+
+(defun alchemist-test-mode-jump-to-previous-test ()
+  "Jump to the previous ExUnit test. If there are no tests before the current
+position, jump to the last test in the buffer. Do nothing if there are no tests
+in this buffer."
+  (interactive)
+  (alchemist-utils-jump-to-previous-matching-line alchemist-test-mode--test-regex 'back-to-indentation))
+
+(defun alchemist-test-next-result ()
+  "Jump to the next error in the test report.
+
+If there are no error after the current position,
+jump to the first error in the test report.
+Do nothing if there are no error in this test report."
+  (interactive)
+  (alchemist-utils-jump-to-next-matching-line alchemist-test--failing-files-regex
+                                               'back-to-indentation))
+
+(defun alchemist-test-previous-result ()
+  "Jump to the previous error in the test report.
+
+If there are no error before the current position,
+jump to the first error in the test report.
+Do nothing if there are no error in this test report."
+  (interactive)
+  (alchemist-utils-jump-to-previous-matching-line alchemist-test--failing-files-regex
+                                                   #'(lambda ()
+                                                       (forward-line 1)
+                                                       (back-to-indentation))))
+
+(defun alchemist-test-next-stacktrace-file ()
+  "Jump to the next stacktrace file in the test report.
+
+If there are no stacktrace file after the current position,
+jump to the first stacktrace file in the test report.
+Do nothing if there are no stacktrace file in this test report."
+  (interactive)
+  (alchemist-utils-jump-to-next-matching-line alchemist-test--stacktrace-files-regex
+                                               'back-to-indentation))
+
+(defun alchemist-test-previous-stacktrace-file ()
+  "Jump to the previous stacktrace file in the test report.
+
+If there are no stacktrace file before the current position,
+jump to the first stacktrace file in the test report.
+Do nothing if there are no stacktrace file in this test report."
+  (interactive)
+  (alchemist-utils-jump-to-previous-matching-line alchemist-test--stacktrace-files-regex
+                                                   'back-to-indentation))
+
+(defun alchemist-test-mode-list-tests ()
+  "List ExUnit tests (calls to the test/2 macro) in the current buffer and jump
+to the selected one."
+  (interactive)
+  (let* ((tests (alchemist-test-mode--tests-in-buffer))
+         (selected (completing-read "Test: " tests))
+         (position (cdr (assoc selected tests))))
+    (goto-char position)
+    (back-to-indentation)))
+
+(defun alchemist-test-toggle-test-report-display ()
+  "Toggle between display or hidding `alchemist-test-report-buffer-name' buffer."
+  (interactive)
+  (let* ((buffer (get-buffer alchemist-test-report-buffer-name))
+         (window (get-buffer-window buffer)))
+    (if buffer
+        (if window
+            (quit-window nil window)
+          (display-buffer buffer))
+      (message "No Alchemist test report buffer exists."))))
+
+;;;###autoload
+(define-minor-mode alchemist-test-mode
+  "Minor mode for Elixir ExUnit files.
+
+The following commands are available:
+
+\\{alchemist-test-mode-map}"
+  :lighter ""
+  :keymap alchemist-test-mode-map
+  :group 'alchemist
+  (when alchemist-test-mode
+    (alchemist-test-mode--highlight-syntax)))
+
+;;;###autoload
+(defun alchemist-test-enable-mode ()
+  (if (alchemist-utils-test-file-p)
+      (alchemist-test-mode)))
+
+;;;###autoload
+(dolist (hook '(alchemist-mode-hook))
+  (add-hook hook 'alchemist-test-enable-mode))
+
+(provide 'alchemist-test-mode)
+
+;;; alchemist-test-mode.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist-utils.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist-utils.el
new file mode 100644
index 0000000..3c16bc5
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist-utils.el
@@ -0,0 +1,162 @@
+;;; alchemist-utils.el --- Common utility functions that don't belong anywhere else -*- lexical-binding: t -*-
+
+;; Copyright © 2014-2015 Samuel Tonini
+
+;; Author: Samuel Tonini <tonini.samuel@gmail.com
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Common utility functions that don't belong anywhere else
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'dash)
+
+(defface alchemist-utils--deprecated-face
+  '((t (:inherit font-lock-variable-name-face :bold t :foreground "red")))
+  "Face for 'deprecated' word inside deprecated message."
+  :group 'alchemist)
+
+(defun alchemist-utils-deprecated-message (function new-function)
+  (message "'%s is %s in favor of '%s"
+           function (propertize "deprecated"
+                                'face 'alchemist-utils--deprecated-face)
+           new-function))
+
+(defun alchemist-utils-build-command (command-list)
+  "Build the commands list for the runner."
+  (let* ((command-list (-flatten (if (stringp command-list)
+                                     (split-string command-list)
+                                   command-list)))
+         (command (-remove (lambda (e) (equal e "")) command-list)))
+    (mapconcat 'concat command " ")))
+
+(defun alchemist-utils-count-char-occurence (regexp str)
+  "Count occurrence of char with REGEXP inside STR."
+  (cl-loop with start = 0
+           for count from 0
+           while (string-match regexp str start)
+           do (setq start (match-end 0))
+           finally return count))
+
+(defun alchemist-utils-test-file-p ()
+  "Return non-nil `current-buffer' holds an Elixir test file."
+  (string-match "_test\\.exs$" (or (buffer-file-name) "")))
+
+(defun alchemist-utils-remove-dot-at-the-end (string)
+  "Remove dot character at the end of STRING."
+  (replace-regexp-in-string "\\.$" "" string))
+
+(defun alchemist-utils-empty-string-p (string)
+  "Return non-nil if STRING is null, blank or whitespace only."
+  (or (null string)
+      (string= string "")
+      (if (string-match-p "^\s+$" string) t)))
+
+(defun alchemist-utils-prepare-aliases-for-elixir (aliases)
+  (let* ((aliases (-map (lambda (a)
+                            (let ((module (alchemist-utils-remove-dot-at-the-end (car a)))
+                                  (alias (alchemist-utils-remove-dot-at-the-end (car (cdr a)))))
+                            (if (not (or (alchemist-utils-empty-string-p alias)
+                                         (string= alias module)))
+                                (format "{%s, %s}"
+                                        (if (alchemist-utils-empty-string-p alias)
+                                            module
+                                          alias)
+                                        module)))) aliases))
+         (aliases (mapconcat #'identity aliases ",")))
+    (format "[%s]" aliases)))
+
+(defun alchemist-utils-prepare-modules-for-elixir (modules)
+  (let* ((modules (mapconcat #'identity modules ",")))
+    (format "[%s]" modules)))
+
+(defun alchemist-utils--snakecase-to-camelcase (str)
+  "Convert a snake_case string STR to a CamelCase string.
+
+This function is useful for converting file names like my_module to Elixir
+module names (MyModule)."
+  (mapconcat 'capitalize (split-string str "_") ""))
+
+(defun alchemist-utils-add-ext-to-path-if-not-present (path ext)
+  "Add EXT to PATH if PATH doesn't already ends with EXT."
+  (if (string-suffix-p ext path)
+      path
+    (concat path ext)))
+
+(defun alchemist-utils-path-to-module-name (path)
+  "Convert PATH to its Elixir module name equivalent.
+
+For example, convert 'my_app/my_module.ex' to 'MyApp.MyModule'."
+  (let* ((path (file-name-sans-extension path))
+         (path (split-string path "/"))
+         (path (-remove (lambda (str) (equal str "")) path)))
+    (mapconcat #'alchemist-utils--snakecase-to-camelcase path ".")))
+
+(defun alchemist-utils-add-trailing-slash (path)
+  "Add trailing slash to PATH if not already contain."
+  (if (not (string-match-p "/$" path))
+      (format "%s/" path)
+    path))
+
+(defun alchemist-utils-occur-in-buffer-p (buffer regex)
+  "Return non-nil if BUFFER contains at least one occurrence of REGEX."
+  (with-current-buffer buffer
+    (save-excursion
+      (save-match-data
+        (goto-char (point-min))
+        (re-search-forward regex nil t)))))
+
+(defun alchemist-utils-jump-to-regex (regex before-fn after-fn search-fn reset-fn)
+  "Jump to REGEX using SEARCH-FN to search for it.
+A common use case would be to use `re-search-forward' as the SEARCH-FN.
+Call RESET-FN if the regex isn't found at the first try. BEFORE-FN is called
+before performing the search while AFTER-FN after."
+  (when (alchemist-utils-occur-in-buffer-p (current-buffer) regex)
+    (save-match-data
+      (funcall before-fn)
+      (unless (funcall search-fn regex nil t)
+        (funcall reset-fn)
+        (funcall search-fn regex nil t))
+      (funcall after-fn))))
+
+(defun alchemist-utils-jump-to-next-matching-line (regex after-fn)
+  "Jump to the next line matching REGEX.
+Call AFTER-FN after performing the search."
+  (alchemist-utils-jump-to-regex regex 'end-of-line after-fn 're-search-forward 'beginning-of-buffer))
+
+(defun alchemist-utils-jump-to-previous-matching-line (regex after-fn)
+  "Jump to the previous line matching REGEX.
+
+Call AFTER-FN after performing the search."
+  (alchemist-utils-jump-to-regex regex 'beginning-of-line after-fn 're-search-backward 'end-of-buffer))
+
+(defun alchemist-utils-elixir-version ()
+  "Return the current Elixir version on the system."
+  (let* ((output (shell-command-to-string (format "%s --version" alchemist-execute-command)))
+         (output (split-string output "\n"))
+         (output (-remove (lambda (string) (alchemist-utils-empty-string-p string))
+                          output))
+         (version (-last-item output))
+         (version (replace-regexp-in-string "Elixir " "" version)))
+    version))
+
+(provide 'alchemist-utils)
+
+;;; alchemist-utils.el ends here
diff --git a/emacs.d/elpa/alchemist-20160111.2340/alchemist.el b/emacs.d/elpa/alchemist-20160111.2340/alchemist.el
new file mode 100644
index 0000000..28342b8
--- /dev/null
+++ b/emacs.d/elpa/alchemist-20160111.2340/alchemist.el
@@ -0,0 +1,282 @@
+;;; alchemist.el --- Elixir tooling integration into Emacs
+
+;; Copyright © 2014-2015 Samuel Tonini
+;;
+;; Author: Samuel Tonini <tonini.samuel@gmail.com>
+;; Maintainer: Samuel Tonini <tonini.samuel@gmail.com>
+;; URL: http://www.github.com/tonini/alchemist.el
+;; Version: 1.7.0
+;; Package-Requires: ((elixir-mode "2.2.5") (dash "2.11.0") (emacs "24.4") (company "0.8.0") (pkg-info "0.4"))
+;; Keywords: languages, elixir, elixirc, mix, hex, alchemist
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;;  What Does Alchemist Do For You?
+;;
+;;    Alchemist brings you all the Elixir tooling and power inside your Emacs editor.
+;;
+;;  Alchemist comes with a bunch of features, which are:
+;;
+;;    * Mix integration
+;;    * Compile & Execution of Elixir code
+;;    * Inline code evaluation
+;;    * Inline macro expanding
+;;    * Documentation lookup
+;;    * Definition lookup
+;;    * Powerful IEx integration
+;;    * Smart code completion
+;;    * Elixir project management
+;;    * Phoenix support
+
+;;; Code:
+
+;; Tell the byte compiler about autoloaded functions from packages
+(declare-function pkg-info-version-info "pkg-info" (package))
+
+(defgroup alchemist nil
+  "Elixir Tooling Integration Into Emacs."
+  :prefix "alchemist-"
+  :group 'applications
+  :link '(url-link :tag "Website" "http://www.alchemist-elixir.org")
+  :link '(url-link :tag "Github" "https://github.com/tonini/alchemist.el")
+  :link '(emacs-commentary-link :tag "Commentary" "alchemist"))
+
+(defvar alchemist-mode-keymap nil)
+
+(require 'easymenu)
+(require 'company)
+(require 'elixir-mode)
+(require 'alchemist-utils)
+(require 'alchemist-key)
+(require 'alchemist-eval)
+(require 'alchemist-goto)
+(require 'alchemist-info)
+(require 'alchemist-report)
+(require 'alchemist-mix)
+(require 'alchemist-hooks)
+(require 'alchemist-message)
+(require 'alchemist-iex)
+(require 'alchemist-compile)
+(require 'alchemist-refcard)
+(require 'alchemist-complete)
+(require 'alchemist-company)
+(require 'alchemist-macroexpand)
+(require 'alchemist-phoenix)
+
+(defun alchemist-mode-hook ()
+  "Hook which enables `alchemist-mode'"
+  (alchemist-mode 1))
+
+(defun alchemist-version (&optional show-version)
+  "Get the Alchemist version as string.
+
+If called interactively or if SHOW-VERSION is non-nil, show the
+version in the echo area and the messages buffer.
+
+The returned string includes both, the version from package.el
+and the library version, if both a present and different.
+
+If the version number could not be determined, signal an error,
+if called interactively, or if SHOW-VERSION is non-nil, otherwise
+just return nil."
+  (interactive (list t))
+  (let ((version (pkg-info-version-info 'alchemist)))
+    (when show-version
+      (message "Alchemist version: %s" version))
+    version))
+
+(defun alchemist-elixir-version ()
+  "Display the current Elixir version on the system."
+  (interactive)
+  (message "Elixir %s" (alchemist-utils-elixir-version)))
+
+(define-prefix-command 'alchemist-mode-keymap)
+
+;;;###autoload
+(define-minor-mode alchemist-mode
+  "Toggle alchemist mode.
+
+Key bindings:
+\\{alchemist-mode-map}"
+  nil
+  ;; The indicator for the mode line.
+  " alchemist"
+  :group 'alchemist
+  :global nil
+  :keymap `((,alchemist-key-command-prefix . alchemist-mode-keymap))
+  (cond (alchemist-mode
+         (alchemist-server-start-if-not-running)
+         (alchemist-test-initialize-modeline))
+        (t
+         (alchemist-test-reset-modeline))))
+
+(let ((map alchemist-mode-keymap))
+  (define-key map (kbd "x") 'alchemist-mix)
+  (define-key map (kbd "t") 'alchemist-mix-test)
+  (define-key map (kbd "r") 'alchemist-mix-rerun-last-test)
+
+  (define-key map (kbd "m c") 'alchemist-mix-compile)
+  (define-key map (kbd "m r") 'alchemist-mix-run)
+  (define-key map (kbd "m t f") 'alchemist-mix-test-file)
+  (define-key map (kbd "m t b") 'alchemist-mix-test-this-buffer)
+  (define-key map (kbd "m t .") 'alchemist-mix-test-at-point)
+
+  (define-key map (kbd "c c") 'alchemist-compile)
+  (define-key map (kbd "c f") 'alchemist-compile-file)
+  (define-key map (kbd "c b") 'alchemist-compile-this-buffer)
+
+  (define-key map (kbd "e e") 'alchemist-execute)
+  (define-key map (kbd "e f") 'alchemist-execute-file)
+  (define-key map (kbd "e b") 'alchemist-execute-this-buffer)
+
+  (define-key map (kbd "h h") 'alchemist-help)
+  (define-key map (kbd "h i") 'alchemist-help-history)
+  (define-key map (kbd "h e") 'alchemist-help-search-at-point)
+  (define-key map (kbd "h r") 'alchemist-refcard)
+
+  (define-key map (kbd "p s") 'alchemist-project-toggle-file-and-tests)
+  (define-key map (kbd "p o") 'alchemist-project-toggle-file-and-tests-other-window)
+  (define-key map (kbd "p t") 'alchemist-project-run-tests-for-current-file)
+  (define-key map (kbd "p l") 'alchemist-project-find-lib)
+  (define-key map (kbd "p f") 'alchemist-project-find-test)
+
+  (define-key map (kbd "i i") 'alchemist-iex-run)
+  (define-key map (kbd "i p") 'alchemist-iex-project-run)
+  (define-key map (kbd "i l") 'alchemist-iex-send-current-line)
+  (define-key map (kbd "i c") 'alchemist-iex-send-current-line-and-go)
+  (define-key map (kbd "i r") 'alchemist-iex-send-region)
+  (define-key map (kbd "i m") 'alchemist-iex-send-region-and-go)
+  (define-key map (kbd "i b") 'alchemist-iex-compile-this-buffer)
+  (define-key map (kbd "i R") 'alchemist-iex-reload-module)
+
+  (define-key map (kbd "v l") 'alchemist-eval-current-line)
+  (define-key map (kbd "v k") 'alchemist-eval-print-current-line)
+  (define-key map (kbd "v j") 'alchemist-eval-quoted-current-line)
+  (define-key map (kbd "v h") 'alchemist-eval-print-quoted-current-line)
+  (define-key map (kbd "v o") 'alchemist-eval-region)
+  (define-key map (kbd "v i") 'alchemist-eval-print-region)
+  (define-key map (kbd "v u") 'alchemist-eval-quoted-region)
+  (define-key map (kbd "v y") 'alchemist-eval-print-quoted-region)
+  (define-key map (kbd "v q") 'alchemist-eval-buffer)
+  (define-key map (kbd "v w") 'alchemist-eval-print-buffer)
+  (define-key map (kbd "v e") 'alchemist-eval-quoted-buffer)
+  (define-key map (kbd "v r") 'alchemist-eval-print-quoted-buffer)
+  (define-key map (kbd "v !") 'alchemist-eval-close-popup)
+
+  (define-key map (kbd "o l") 'alchemist-macroexpand-once-current-line)
+  (define-key map (kbd "o L") 'alchemist-macroexpand-once-print-current-line)
+  (define-key map (kbd "o k") 'alchemist-macroexpand-current-line)
+  (define-key map (kbd "o K") 'alchemist-macroexpand-print-current-line)
+  (define-key map (kbd "o i") 'alchemist-macroexpand-once-region)
+  (define-key map (kbd "o I") 'alchemist-macroexpand-once-print-region)
+  (define-key map (kbd "o r") 'alchemist-macroexpand-region)
+  (define-key map (kbd "o R") 'alchemist-macroexpand-print-region)
+  (define-key map (kbd "o !") 'alchemist-macroexpand-close-popup)
+
+  (define-key map (kbd "n i") 'alchemist-info-datatype-at-point)
+  (define-key map (kbd "n t") 'alchemist-info-types-at-point))
+
+(define-key alchemist-mode-map (kbd "M-.") 'alchemist-goto-definition-at-point)
+(define-key alchemist-mode-map (kbd "M-,") 'alchemist-goto-jump-back)
+(define-key alchemist-mode-map (kbd "C-c , .") 'alchemist-goto-list-symbol-definitions)
+(define-key alchemist-mode-map (kbd "M-P") 'alchemist-goto-jump-to-previous-def-symbol)
+(define-key alchemist-mode-map (kbd "M-N") 'alchemist-goto-jump-to-next-def-symbol)
+(define-key alchemist-mode-map (kbd "C-c M-r") 'alchemist-test-toggle-test-report-display)
+
+(easy-menu-define alchemist-mode-menu alchemist-mode-map
+  "Alchemist mode menu."
+  '("Alchemist"
+    ("Goto"
+     ["Jump to definition at point" alchemist-goto-definition-at-point]
+     ["Jump back" alchemist-goto-jump-back])
+    ("Evaluate"
+     ["Evaluate current line" alchemist-eval-current-line]
+     ["Evaluate current line and print" alchemist-eval-print-current-line]
+     ["Evaluate quoted current line" alchemist-eval-quoted-current-line]
+     ["Evaluate quoted current line and print" alchemist-eval-print-quoted-current-line]
+     "---"
+     ["Evaluate region" alchemist-eval-region]
+     ["Evaluate region and print" alchemist-eval-print-region]
+     ["Evaluate quoted region" alchemist-eval-quoted-region]
+     ["Evaluate quoted region and print" alchemist-eval-print-quoted-region]
+     "---"
+     ["Evaluate buffer" alchemist-eval-buffer]
+     ["Evaluate buffer and print" alchemist-eval-print-buffer]
+     ["Evaluate quoted buffer" alchemist-eval-quoted-buffer]
+     ["Evaluate quoted buffer and print" alchemist-eval-print-quoted-buffer])
+    ("Macroexpand"
+     ["Macro expand once current line" alchemist-macroexpand-once-current-line]
+     ["Macro expand once current line and print" alchemist-macroexpand-print-current-line]
+     ["Macro expand current line" alchemist-macroexpand-current-line]
+     ["Macro expand current line and print" alchemist-macroexpand-print-current-line]
+     "---"
+     ["Macro expand once region" alchemist-macroexpand-once-region]
+     ["Macro expand once region and print" alchemist-macroexpand-print-region]
+     ["Macro expand region" alchemist-macroexpand-region]
+     ["Macro expand region and print" alchemist-macroexpand-print-region])
+    ("Compile"
+     ["Compile..." alchemist-compile]
+     ["Compile this buffer" alchemist-compile-this-buffer]
+     ["Compile file" alchemist-compile-file])
+    ("Execute"
+     ["Execute..." alchemist-compile]
+     ["Execute this buffer" alchemist-execute-this-buffer]
+     ["Execute file" alchemist-execute-file])
+    ("Mix"
+     ["Mix compile..." alchemist-mix-compile]
+     ["Mix run..." alchemist-mix-run]
+     "---"
+     ["Mix test this buffer" alchemist-mix-test-this-buffer]
+     ["Mix test file..." alchemist-mix-test-file]
+     ["Mix test at point" alchemist-mix-test-at-point]
+     "---"
+     ["Mix..." alchemist-mix]
+     "---"
+     ["Display mix buffer" alchemist-mix-display-mix-buffer]
+     "---"
+     ["Mix help..." alchemist-mix-help])
+    ("IEx"
+     ["IEx send current line" alchemist-iex-send-current-line]
+     ["IEx send current line and go" alchemist-iex-send-current-line-and-go]
+     "---"
+     ["IEx send last region" alchemist-iex-send-last-sexp]
+     ["IEx send region" alchemist-iex-send-region]
+     ["IEx send region and go" alchemist-iex-send-region-and-go]
+     "---"
+     ["IEx compile this buffer" alchemist-iex-compile-this-buffer]
+     ["IEx recompile this buffer" alchemist-iex-recompile-this-buffer]
+     "---"
+     ["IEx run" alchemist-iex-run])
+    ("Project"
+     ["Project list all files inside test directory" alchemist-project-find-test]
+     ["Project list all files inside lib directory" alchemist-project-find-lib]
+     ["Project toggle between file and test" alchemist-project-toggle-file-and-tests]
+     ["Project toggle between file and test in other window" alchemist-project-toggle-file-and-tests-other-window])
+    ("Documentation"
+     ["Documentation search..." alchemist-help]
+     ["Documentation search history..." alchemist-help-history]
+     "---"
+     ["Documentation search at point..." alchemist-help-search-at-point])
+    ("About"
+     ["Show Alchemist version" alchemist-version t])))
+
+(add-hook 'elixir-mode-hook 'alchemist-mode-hook)
+
+(provide 'alchemist)
+
+;;; alchemist.el ends here
diff --git a/emacs.d/elpa/async-20150529.529/async-autoloads.el b/emacs.d/elpa/async-20150529.529/async-autoloads.el
deleted file mode 100644
index b0268d2..0000000
--- a/emacs.d/elpa/async-20150529.529/async-autoloads.el
+++ /dev/null
@@ -1,129 +0,0 @@
-;;; async-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "async" "async.el" (21898 47984 0 0))
-;;; Generated autoloads from async.el
-
-(autoload 'async-start-process "async" "\
-Start the executable PROGRAM asynchronously.  See `async-start'.
-PROGRAM is passed PROGRAM-ARGS, calling FINISH-FUNC with the
-process object when done.  If FINISH-FUNC is nil, the future
-object will return the process object when the program is
-finished.  Set DEFAULT-DIRECTORY to change PROGRAM's current
-working directory.
-
-\(fn NAME PROGRAM FINISH-FUNC &rest PROGRAM-ARGS)" nil nil)
-
-(autoload 'async-start "async" "\
-Execute START-FUNC (often a lambda) in a subordinate Emacs process.
-When done, the return value is passed to FINISH-FUNC.  Example:
-
-    (async-start
-       ;; What to do in the child process
-       (lambda ()
-         (message \"This is a test\")
-         (sleep-for 3)
-         222)
-
-       ;; What to do when it finishes
-       (lambda (result)
-         (message \"Async process done, result should be 222: %s\"
-                  result)))
-
-If FINISH-FUNC is nil or missing, a future is returned that can
-be inspected using `async-get', blocking until the value is
-ready.  Example:
-
-    (let ((proc (async-start
-                   ;; What to do in the child process
-                   (lambda ()
-                     (message \"This is a test\")
-                     (sleep-for 3)
-                     222))))
-
-        (message \"I'm going to do some work here\") ;; ....
-
-        (message \"Waiting on async process, result should be 222: %s\"
-                 (async-get proc)))
-
-If you don't want to use a callback, and you don't care about any
-return value form the child process, pass the `ignore' symbol as
-the second argument (if you don't, and never call `async-get', it
-will leave *emacs* process buffers hanging around):
-
-    (async-start
-     (lambda ()
-       (delete-file \"a remote file on a slow link\" nil))
-     'ignore)
-
-Note: Even when FINISH-FUNC is present, a future is still
-returned except that it yields no value (since the value is
-passed to FINISH-FUNC).  Call `async-get' on such a future always
-returns nil.  It can still be useful, however, as an argument to
-`async-ready' or `async-wait'.
-
-\(fn START-FUNC &optional FINISH-FUNC)" nil t)
-
-;;;***
-
-;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (21898
-;;;;;;  47984 0 0))
-;;; Generated autoloads from async-bytecomp.el
-
-(autoload 'async-byte-recompile-directory "async-bytecomp" "\
-Compile all *.el files in DIRECTORY asynchronously.
-All *.elc files are systematically deleted before proceeding.
-
-\(fn DIRECTORY &optional QUIET)" nil nil)
-
-(defvar async-bytecomp-package-mode nil "\
-Non-nil if Async-Bytecomp-Package mode is enabled.
-See the command `async-bytecomp-package-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 `async-bytecomp-package-mode'.")
-
-(custom-autoload 'async-bytecomp-package-mode "async-bytecomp" nil)
-
-(autoload 'async-bytecomp-package-mode "async-bytecomp" "\
-Byte compile asynchronously packages installed with package.el.
-Async compilation of packages can be controlled by
-`async-bytecomp-allowed-packages'.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "dired-async" "dired-async.el" (21898 47984
-;;;;;;  0 0))
-;;; Generated autoloads from dired-async.el
-
-(defvar dired-async-mode nil "\
-Non-nil if Dired-Async mode is enabled.
-See the command `dired-async-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 `dired-async-mode'.")
-
-(custom-autoload 'dired-async-mode "dired-async" nil)
-
-(autoload 'dired-async-mode "dired-async" "\
-Do dired actions asynchronously.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (21898
-;;;;;;  47984 290337 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; async-autoloads.el ends here
diff --git a/emacs.d/elpa/async-20150529.529/async-bytecomp.el b/emacs.d/elpa/async-20150529.529/async-bytecomp.el
deleted file mode 100644
index 0004347..0000000
--- a/emacs.d/elpa/async-20150529.529/async-bytecomp.el
+++ /dev/null
@@ -1,160 +0,0 @@
-;;; async-bytecomp.el --- Async functions to compile elisp files async
-
-;; Copyright (C) 2014 John Wiegley
-;; Copyright (C) 2014 Thierry Volpiatto
-
-;; Authors: John Wiegley <jwiegley@gmail.com>
-;;          Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; Keywords: dired async byte-compile
-;; X-URL: https://github.com/jwiegley/dired-async
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-;;
-;;  This package provide the `async-byte-recompile-directory' function
-;;  which allows, as the name says to recompile a directory outside of
-;;  your running emacs.
-;;  The benefit is your files will be compiled in a clean environment without
-;;  the old *.el files loaded.
-;;  Among other things, this fix a bug in package.el which recompile
-;;  the new files in the current environment with the old files loaded, creating
-;;  errors in most packages after upgrades.
-;;
-;;  NB: This package is advicing the function `package--compile'.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'async)
-
-(defcustom async-bytecomp-allowed-packages '(async helm)
-  "Packages in this list will be compiled asynchronously by `package--compile'.
-All the dependencies of these packages will be compiled async too,
-so no need to add dependencies to this list.
-The value of this variable can also be a list with a single element,
-the symbol `all', in this case packages are always compiled asynchronously."
-  :group 'async
-  :type '(repeat (choice symbol)))
-
-(defvar async-byte-compile-log-file "~/.emacs.d/async-bytecomp.log")
-
-;;;###autoload
-(defun async-byte-recompile-directory (directory &optional quiet)
-  "Compile all *.el files in DIRECTORY asynchronously.
-All *.elc files are systematically deleted before proceeding."
-  (cl-loop with dir = (directory-files directory t "\\.elc\\'")
-           unless dir return nil
-           for f in dir
-           when (file-exists-p f) do (delete-file f))
-  ;; Ensure async is reloaded when async.elc is deleted.
-  ;; This happen when recompiling its own directory.
-  (load "async")
-  (let ((call-back
-         `(lambda (&optional ignore)
-            (if (file-exists-p async-byte-compile-log-file)
-                (let ((buf (get-buffer-create byte-compile-log-buffer))
-                      (n 0))
-                  (with-current-buffer buf
-                    (goto-char (point-max))
-                    (let ((inhibit-read-only t))
-                      (insert-file-contents async-byte-compile-log-file)
-                      (compilation-mode))
-                    (display-buffer buf)
-                    (delete-file async-byte-compile-log-file)
-                    (unless ,quiet
-                      (save-excursion
-                        (goto-char (point-min))
-                        (while (re-search-forward "^.*:Error:" nil t)
-                          (cl-incf n)))
-                      (if (> n 0)
-                          (message "Failed to compile %d files in directory `%s'" n ,directory)
-                          (message "Directory `%s' compiled asynchronously with warnings" ,directory)))))
-                (unless ,quiet
-                  (message "Directory `%s' compiled asynchronously with success" ,directory))))))
-    (async-start
-     `(lambda ()
-        (require 'bytecomp)
-        ,(async-inject-variables "\\`\\(load-path\\)\\|byte\\'")
-        (let ((default-directory (file-name-as-directory ,directory))
-              error-data)
-          (add-to-list 'load-path default-directory)
-          (byte-recompile-directory ,directory 0 t)
-          (when (get-buffer byte-compile-log-buffer)
-            (setq error-data (with-current-buffer byte-compile-log-buffer
-                               (buffer-substring-no-properties (point-min) (point-max))))
-            (unless (string= error-data "")
-              (with-temp-file ,async-byte-compile-log-file
-                (erase-buffer)
-                (insert error-data))))))
-     call-back)
-    (unless quiet (message "Started compiling asynchronously directory %s" directory))))
-
-(defvar package-archive-contents)
-(declare-function package-desc-reqs "package.el" (cl-x))
-
-(defun async-bytecomp--get-package-deps (pkg &optional only)
-  (let* ((pkg-desc (cadr (assq pkg package-archive-contents)))
-         (direct-deps (cl-loop for p in (package-desc-reqs pkg-desc)
-                               for name = (car p)
-                               when (assq name package-archive-contents)
-                               collect name))
-         (indirect-deps (unless (eq only 'direct)
-                          (delete-dups
-                           (cl-loop for p in direct-deps append
-                                    (async-bytecomp--get-package-deps p))))))
-    (cl-case only
-      (direct   direct-deps)
-      (separate (list direct-deps indirect-deps))
-      (indirect indirect-deps)
-      (t        (delete-dups (append direct-deps indirect-deps))))))
-
-(defun async-bytecomp-get-allowed-pkgs ()
-  (when (and async-bytecomp-allowed-packages
-             (listp async-bytecomp-allowed-packages))
-    (cl-loop for p in async-bytecomp-allowed-packages
-             append (async-bytecomp--get-package-deps p) into reqs
-             finally return
-             (delete-dups
-              (append async-bytecomp-allowed-packages reqs)))))
-
-(defadvice package--compile (around byte-compile-async)
-  (let ((cur-package (package-desc-name pkg-desc)))
-    (if (or (equal async-bytecomp-allowed-packages '(all))
-            (memq cur-package (async-bytecomp-get-allowed-pkgs)))
-        (progn
-          (when (eq cur-package 'async)
-            (fmakunbound 'async-byte-recompile-directory))
-          (package-activate-1 pkg-desc)
-          (load "async-bytecomp") ; emacs-24.3 don't reload new files.
-          (async-byte-recompile-directory (package-desc-dir pkg-desc) t))
-        ad-do-it)))
-
-;;;###autoload
-(define-minor-mode async-bytecomp-package-mode
-    "Byte compile asynchronously packages installed with package.el.
-Async compilation of packages can be controlled by
-`async-bytecomp-allowed-packages'."
-  :group 'async
-  :global t
-  (if async-bytecomp-package-mode
-      (ad-activate 'package--compile)
-      (ad-deactivate 'package--compile)))
-
-(provide 'async-bytecomp)
-
-;;; async-bytecomp.el ends here
diff --git a/emacs.d/elpa/async-20150529.529/async-pkg.el b/emacs.d/elpa/async-20150529.529/async-pkg.el
deleted file mode 100644
index da89a15..0000000
--- a/emacs.d/elpa/async-20150529.529/async-pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(define-package "async" "20150529.529" "Asynchronous processing in Emacs" 'nil)
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/async-20150529.529/async.el b/emacs.d/elpa/async-20150529.529/async.el
deleted file mode 100644
index be9c04e..0000000
--- a/emacs.d/elpa/async-20150529.529/async.el
+++ /dev/null
@@ -1,292 +0,0 @@
-;;; async --- Asynchronous processing in Emacs
-
-;; Copyright (C) 2012~2014 John Wiegley
-
-;; Author: John Wiegley <jwiegley@gmail.com>
-;; Created: 18 Jun 2012
-
-;; Keywords: async
-;; X-URL: https://github.com/jwiegley/emacs-async
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; Adds the ability to call asynchronous functions and process with ease.  See
-;; the documentation for `async-start' and `async-start-process'.
-
-;;; Code:
-
-(defgroup async nil
-  "Simple asynchronous processing in Emacs"
-  :group 'emacs)
-
-(defvar async-debug nil)
-(defvar async-send-over-pipe t)
-(defvar async-in-child-emacs nil)
-(defvar async-callback nil)
-(defvar async-callback-for-process nil)
-(defvar async-callback-value nil)
-(defvar async-callback-value-set nil)
-(defvar async-current-process nil)
-
-(defun async-inject-variables
-  (include-regexp &optional predicate exclude-regexp)
-  "Return a `setq' form that replicates part of the calling environment.
-It sets the value for every variable matching INCLUDE-REGEXP and
-also PREDICATE.  It will not perform injection for any variable
-matching EXCLUDE-REGEXP (if present).  It is intended to be used
-as follows:
-
-    (async-start
-       `(lambda ()
-          (require 'smtpmail)
-          (with-temp-buffer
-            (insert ,(buffer-substring-no-properties (point-min) (point-max)))
-            ;; Pass in the variable environment for smtpmail
-            ,(async-inject-variables \"\\`\\(smtpmail\\|\\(user-\\)?mail\\)-\")
-            (smtpmail-send-it)))
-       'ignore)"
-  `(setq
-    ,@(let (bindings)
-        (mapatoms
-         (lambda (sym)
-           (if (and (boundp sym)
-                    (or (null include-regexp)
-                        (string-match include-regexp (symbol-name sym)))
-                    (not (string-match
-                          (or exclude-regexp "-syntax-table\\'")
-                          (symbol-name sym))))
-               (let ((value (symbol-value sym)))
-                 (when (or (null predicate)
-                           (funcall predicate sym))
-                   (setq bindings (cons `(quote ,value) bindings)
-                         bindings (cons sym bindings)))))))
-        bindings)))
-
-(defalias 'async-inject-environment 'async-inject-variables)
-
-(defun async-handle-result (func result buf)
-  (if (null func)
-      (progn
-        (set (make-local-variable 'async-callback-value) result)
-        (set (make-local-variable 'async-callback-value-set) t))
-    (unwind-protect
-        (if (and (listp result)
-                 (eq 'async-signal (nth 0 result)))
-            (signal (car (nth 1 result))
-                    (cdr (nth 1 result)))
-          (funcall func result))
-      (unless async-debug
-        (kill-buffer buf)))))
-
-(defun async-when-done (proc &optional change)
-  "Process sentinal used to retrieve the value from the child process."
-  (when (eq 'exit (process-status proc))
-    (with-current-buffer (process-buffer proc)
-      (let ((async-current-process proc))
-        (if (= 0 (process-exit-status proc))
-            (if async-callback-for-process
-                (if async-callback
-                    (prog1
-                        (funcall async-callback proc)
-                      (unless async-debug
-                        (kill-buffer (current-buffer))))
-                  (set (make-local-variable 'async-callback-value) proc)
-                  (set (make-local-variable 'async-callback-value-set) t))
-              (goto-char (point-max))
-              (backward-sexp)
-              (async-handle-result async-callback (read (current-buffer))
-                                   (current-buffer)))
-          (set (make-local-variable 'async-callback-value)
-               (list 'error
-                     (format "Async process '%s' failed with exit code %d"
-                             (process-name proc) (process-exit-status proc))))
-          (set (make-local-variable 'async-callback-value-set) t))))))
-
-(defun async--receive-sexp (&optional stream)
-  (let ((sexp (decode-coding-string (base64-decode-string
-                                     (read stream)) 'utf-8-unix)))
-    (if async-debug
-        (message "Received sexp {{{%s}}}" (pp-to-string sexp)))
-    (setq sexp (read sexp))
-    (if async-debug
-        (message "Read sexp {{{%s}}}" (pp-to-string sexp)))
-    (eval sexp)))
-
-(defun async--insert-sexp (sexp)
-  (prin1 sexp (current-buffer))
-  ;; Just in case the string we're sending might contain EOF
-  (encode-coding-region (point-min) (point-max) 'utf-8-unix)
-  (base64-encode-region (point-min) (point-max) t)
-  (goto-char (point-min)) (insert ?\")
-  (goto-char (point-max)) (insert ?\" ?\n))
-
-(defun async--transmit-sexp (process sexp)
-  (with-temp-buffer
-    (if async-debug
-        (message "Transmitting sexp {{{%s}}}" (pp-to-string sexp)))
-    (async--insert-sexp sexp)
-    (process-send-region process (point-min) (point-max))))
-
-(defun async-batch-invoke ()
-  "Called from the child Emacs process' command-line."
-  (setq async-in-child-emacs t
-        debug-on-error async-debug)
-  (if debug-on-error
-      (prin1 (funcall
-              (async--receive-sexp (unless async-send-over-pipe
-                                     command-line-args-left))))
-    (condition-case err
-        (prin1 (funcall
-                (async--receive-sexp (unless async-send-over-pipe
-                                       command-line-args-left))))
-      (error
-       (prin1 (list 'async-signal err))))))
-
-(defun async-ready (future)
-  "Query a FUTURE to see if the ready is ready -- i.e., if no blocking
-would result from a call to `async-get' on that FUTURE."
-  (and (memq (process-status future) '(exit signal))
-       (with-current-buffer (process-buffer future)
-         async-callback-value-set)))
-
-(defun async-wait (future)
-  "Wait for FUTURE to become ready."
-  (while (not (async-ready future))
-    (sit-for 0.05)))
-
-(defun async-get (future)
-  "Get the value from an asynchronously function when it is ready.
-FUTURE is returned by `async-start' or `async-start-process' when
-its FINISH-FUNC is nil."
-  (async-wait future)
-  (with-current-buffer (process-buffer future)
-    (async-handle-result #'identity async-callback-value (current-buffer))))
-
-(defun async-message-p (value)
-  "Return true of VALUE is an async.el message packet."
-  (and (listp value)
-       (plist-get value :async-message)))
-
-(defun async-send (&rest args)
-  "Send the given messages to the asychronous Emacs PROCESS."
-  (let ((args (append args '(:async-message t))))
-    (if async-in-child-emacs
-        (if async-callback
-            (funcall async-callback args))
-      (async--transmit-sexp (car args) (list 'quote (cdr args))))))
-
-(defun async-receive (&rest args)
-  "Send the given messages to the asychronous Emacs PROCESS."
-  (async--receive-sexp))
-
-;;;###autoload
-(defun async-start-process (name program finish-func &rest program-args)
-  "Start the executable PROGRAM asynchronously.  See `async-start'.
-PROGRAM is passed PROGRAM-ARGS, calling FINISH-FUNC with the
-process object when done.  If FINISH-FUNC is nil, the future
-object will return the process object when the program is
-finished.  Set DEFAULT-DIRECTORY to change PROGRAM's current
-working directory."
-  (let* ((buf (generate-new-buffer (concat "*" name "*")))
-         (proc (let ((process-connection-type nil))
-                 (apply #'start-process name buf program program-args))))
-    (with-current-buffer buf
-      (set (make-local-variable 'async-callback) finish-func)
-      (set-process-sentinel proc #'async-when-done)
-      (unless (string= name "emacs")
-        (set (make-local-variable 'async-callback-for-process) t))
-      proc)))
-
-;;;###autoload
-(defmacro async-start (start-func &optional finish-func)
-  "Execute START-FUNC (often a lambda) in a subordinate Emacs process.
-When done, the return value is passed to FINISH-FUNC.  Example:
-
-    (async-start
-       ;; What to do in the child process
-       (lambda ()
-         (message \"This is a test\")
-         (sleep-for 3)
-         222)
-
-       ;; What to do when it finishes
-       (lambda (result)
-         (message \"Async process done, result should be 222: %s\"
-                  result)))
-
-If FINISH-FUNC is nil or missing, a future is returned that can
-be inspected using `async-get', blocking until the value is
-ready.  Example:
-
-    (let ((proc (async-start
-                   ;; What to do in the child process
-                   (lambda ()
-                     (message \"This is a test\")
-                     (sleep-for 3)
-                     222))))
-
-        (message \"I'm going to do some work here\") ;; ....
-
-        (message \"Waiting on async process, result should be 222: %s\"
-                 (async-get proc)))
-
-If you don't want to use a callback, and you don't care about any
-return value form the child process, pass the `ignore' symbol as
-the second argument (if you don't, and never call `async-get', it
-will leave *emacs* process buffers hanging around):
-
-    (async-start
-     (lambda ()
-       (delete-file \"a remote file on a slow link\" nil))
-     'ignore)
-
-Note: Even when FINISH-FUNC is present, a future is still
-returned except that it yields no value (since the value is
-passed to FINISH-FUNC).  Call `async-get' on such a future always
-returns nil.  It can still be useful, however, as an argument to
-`async-ready' or `async-wait'."
-  (require 'find-func)
-  (let ((procvar (make-symbol "proc")))
-    `(let* ((sexp ,start-func)
-            (,procvar
-             (async-start-process
-              "emacs" (file-truename
-                       (expand-file-name invocation-name
-                                         invocation-directory))
-              ,finish-func
-              "-Q" "-l"
-              ;; Using `locate-library' ensure we use the right file
-              ;; when the .elc have been deleted.
-              ,(locate-library "async")
-              "-batch" "-f" "async-batch-invoke"
-              (if async-send-over-pipe
-                  "<none>"
-                (with-temp-buffer
-                  (async--insert-sexp (list 'quote sexp))
-                  (buffer-string))))))
-       (if async-send-over-pipe
-           (async--transmit-sexp ,procvar (list 'quote sexp)))
-       ,procvar)))
-
-(defmacro async-sandbox(func)
-  "Evaluate FUNC in a separate Emacs process, synchronously."
-  `(async-get (async-start ,func)))
-
-(provide 'async)
-
-;;; async.el ends here
diff --git a/emacs.d/elpa/async-20150529.529/dired-async.el b/emacs.d/elpa/async-20150529.529/dired-async.el
deleted file mode 100644
index d37c5cb..0000000
--- a/emacs.d/elpa/async-20150529.529/dired-async.el
+++ /dev/null
@@ -1,282 +0,0 @@
-;;; dired-async.el --- Copy/move/delete asynchronously in dired.
-
-;; Copyright (C) 2012~2014 John Wiegley
-;; Copyright (C) 2012~2014 Thierry Volpiatto
-
-;; Authors: John Wiegley <jwiegley@gmail.com>
-;;          Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; Keywords: dired async network
-;; X-URL: https://github.com/jwiegley/dired-async
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; This file provide a redefinition of `dired-create-file' function,
-;; which must be loaded *after* dired-aux.el, performs copies,
-;; moves and all what is handled by `dired-create-file' in the background
-;; using a slave Emacs process, by means of the async.el module.
-;; To use it, put this in your .emacs:
-;;
-;;   (eval-after-load "dired-aux"
-;;     '(require 'dired-async))
-;;
-;;
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'dired-aux)
-(require 'async)
-
-(eval-when-compile
-  (defvar async-callback))
-(defvar dired-async-operation nil)
-
-(defgroup dired-async nil
-  "Copy rename files asynchronously from dired."
-  :group 'dired)
-
-(defcustom dired-async-env-variables-regexp
-  "\\`\\(tramp-\\(default\\|connection\\|remote\\)\\|ange-ftp\\)-.*"
-  "Variables matching this regexp will be loaded on Child Emacs."
-  :type  'regexp
-  :group 'dired-async)
-
-(defcustom dired-async-message-function 'dired-async-mode-line-message
-  "Function to use to notify result when operation finish.
-Should take same args as `message'."
-  :group 'dired-async
-  :type  'function)
-
-(defcustom dired-async-log-file "/tmp/dired-async.log"
-  "File use to communicate errors from Child Emacs to host Emacs."
-  :group 'dired-async
-  :type 'string)
-
-(defface dired-async-message
-    '((t (:foreground "yellow")))
-  "Face used for mode-line message."
-  :group 'dired-async)
-
-(defface dired-async-mode-message
-    '((t (:background "Firebrick1")))
-  "Face used for `dired-async--modeline-mode' lighter."
-  :group 'dired-async)
-
-(define-minor-mode dired-async--modeline-mode
-    "Notify mode-line that an async process run."
-  :group 'dired-async
-  :global t
-  :lighter (:eval (propertize (format " [%s Async job(s) running]"
-                                      (length (dired-async-processes)))
-                              'face 'dired-async-mode-message))
-  (unless dired-async--modeline-mode
-    (let ((visible-bell t)) (ding))))
-
-(defun dired-async-mode-line-message (text &rest args)
-  "Notify end of operation in `mode-line'."
-  (message nil)
-  (let ((mode-line-format (concat
-                           " " (propertize
-                                (if args
-                                    (apply #'format text args)
-                                    text)
-                                'face 'dired-async-message))))
-    (force-mode-line-update)
-    (sit-for 3)
-    (force-mode-line-update)))
-
-(defun dired-async-processes ()
-  (cl-loop for p in (process-list)
-           when (cl-loop for c in (process-command p) thereis
-                         (string= "async-batch-invoke" c))
-           collect p))
-
-(defun dired-async-kill-process ()
-  (interactive)
-  (let* ((processes (dired-async-processes))
-         (proc (car (last processes))))
-    (delete-process proc)
-    (unless (> (length processes) 1)
-      (dired-async--modeline-mode -1))))
-
-(defun dired-async-after-file-create (len-flist)
-  "Callback function used for operation handled by `dired-create-file'."
-  (unless (dired-async-processes)
-    ;; Turn off mode-line notification
-    ;; only when last process end.
-    (dired-async--modeline-mode -1))
-  (when dired-async-operation
-    (if (file-exists-p dired-async-log-file)
-        (progn
-          (pop-to-buffer (get-buffer-create "*dired async*"))
-          (erase-buffer)
-          (insert "Error: ")
-          (insert-file-contents dired-async-log-file)
-          (delete-file dired-async-log-file))
-        (run-with-timer
-         0.1 nil
-         dired-async-message-function "Asynchronous %s of %s file(s) on %s file(s) done"
-         (car dired-async-operation) (cadr dired-async-operation) len-flist))))
-
-(defun dired-async-maybe-kill-ftp ()
-  "Return a form to kill ftp process in child emacs."
-  (quote
-   (progn
-     (require 'cl-lib)
-     (let ((buf (cl-loop for b in (buffer-list)
-                         thereis (and (string-match
-                                       "\\`\\*ftp.*"
-                                       (buffer-name b)) b))))
-       (when buf (kill-buffer buf))))))
-
-(defun dired-async-create-files (file-creator operation fn-list name-constructor
-                                 &optional marker-char)
-  "Same as `dired-create-files' but asynchronous.
-
-See `dired-create-files' for the behavior of arguments."
-  (setq dired-async-operation nil)
-  (let (dired-create-files-failures failures async-fn-list
-                                    skipped (success-count 0) (total (length fn-list))
-                                    (callback `(lambda (&optional ignore)
-                                                 (dired-async-after-file-create ,(length fn-list)))))
-    (let (to overwrite-query
-             overwrite-backup-query)    ; for dired-handle-overwrite
-      (dolist (from fn-list)
-        (setq to (funcall name-constructor from))
-        (if (equal to from)
-            (progn
-              (setq to nil)
-              (dired-log "Cannot %s to same file: %s\n"
-                         (downcase operation) from)))
-        (if (not to)
-            (setq skipped (cons (dired-make-relative from) skipped))
-            (let* ((overwrite (file-exists-p to))
-                   (dired-overwrite-confirmed ; for dired-handle-overwrite
-                    (and overwrite
-                         (let ((help-form '(format "\
-Type SPC or `y' to overwrite file `%s',
-DEL or `n' to skip to next,
-ESC or `q' to not overwrite any of the remaining files,
-`!' to overwrite all remaining files with no more questions." to)))
-                           (dired-query 'overwrite-query
-                                        "Overwrite `%s'?" to))))
-                   ;; must determine if FROM is marked before file-creator
-                   ;; gets a chance to delete it (in case of a move).
-                   (actual-marker-char
-                    (cond  ((integerp marker-char) marker-char)
-                           (marker-char (dired-file-marker from)) ; slow
-                           (t nil))))
-              ;; Handle the `dired-copy-file' file-creator specially
-              ;; When copying a directory to another directory or
-              ;; possibly to itself or one of its subdirectories.
-              ;; e.g "~/foo/" => "~/test/"
-              ;; or "~/foo/" =>"~/foo/"
-              ;; or "~/foo/ => ~/foo/bar/")
-              ;; In this case the 'name-constructor' have set the destination
-              ;; TO to "~/test/foo" because the old emacs23 behavior
-              ;; of `copy-directory' was to not create the subdirectory
-              ;; and instead copy the contents.
-              ;; With the new behavior of `copy-directory'
-              ;; (similar to the `cp' shell command) we don't
-              ;; need such a construction of the target directory,
-              ;; so modify the destination TO to "~/test/" instead of "~/test/foo/".
-              (let ((destname (file-name-directory to)))
-                (when (and (file-directory-p from)
-                           (file-directory-p to)
-                           (eq file-creator 'dired-copy-file))
-                  (setq to destname))
-                ;; If DESTNAME is a subdirectory of FROM, not a symlink,
-                ;; and the method in use is copying, signal an error.
-                (and (eq t (car (file-attributes destname)))
-                     (eq file-creator 'dired-copy-file)
-                     (file-in-directory-p destname from)
-                     (error "Cannot copy `%s' into its subdirectory `%s'"
-                            from to)))
-              (if overwrite
-                  (or (and dired-overwrite-confirmed
-                           (push (cons from to) async-fn-list))
-                      (progn
-                        (push (dired-make-relative from) failures)
-                        (dired-log "%s `%s' to `%s' failed"
-                                   operation from to)))
-                  (push (cons from to) async-fn-list))))))
-    ;; Handle error happening in host emacs.
-    (cond
-      (dired-create-files-failures
-       (setq failures (nconc failures dired-create-files-failures))
-       (dired-log-summary
-        (format "%s failed for %d file%s in %d requests"
-                operation (length failures)
-                (dired-plural-s (length failures))
-                total)
-        failures))
-      (failures
-       (dired-log-summary
-        (format "%s failed for %d of %d file%s"
-                operation (length failures)
-                total (dired-plural-s total))
-        failures))
-      (skipped
-       (dired-log-summary
-        (format "%s: %d of %d file%s skipped"
-                operation (length skipped) total
-                (dired-plural-s total))
-        skipped))
-      (t (message "%s: %s file%s"
-                  operation success-count (dired-plural-s success-count))))
-    ;; Start async process.
-    (when async-fn-list
-      (async-start `(lambda ()
-                      (require 'cl-lib) (require 'dired-aux) (require 'dired-x)
-                      ,(async-inject-variables dired-async-env-variables-regexp)
-                      (condition-case err
-                          (let ((dired-recursive-copies (quote always)))
-                            (cl-loop for (f . d) in (quote ,async-fn-list)
-                                     do (funcall (quote ,file-creator) f d t)))
-                        (file-error
-                         (with-temp-file ,dired-async-log-file
-                           (insert (format "%S" err)))))
-                      ,(dired-async-maybe-kill-ftp))
-                   callback)
-      ;; Run mode-line notifications while process running.
-      (dired-async--modeline-mode 1)
-      (setq dired-async-operation (list operation (length async-fn-list)))
-      (message "%s proceeding asynchronously..." operation))))
-
-(defadvice dired-create-files (around dired-async)
-  (dired-async-create-files file-creator operation fn-list
-                            name-constructor marker-char))
-
-;;;###autoload
-(define-minor-mode dired-async-mode
-    "Do dired actions asynchronously."
-  :group 'dired-async
-  :global t
-  (if dired-async-mode
-      (if (fboundp 'advice-add)
-          (advice-add 'dired-create-files :override #'dired-async-create-files)
-          (ad-activate 'dired-create-files))
-      (if (fboundp 'advice-remove)
-          (advice-remove 'dired-create-files #'dired-async-create-files)
-          (ad-deactivate 'dired-create-files))))
-
-
-(provide 'dired-async)
-
-;;; dired-async.el ends here
diff --git a/emacs.d/elpa/async-20150529.529/smtpmail-async.el b/emacs.d/elpa/async-20150529.529/smtpmail-async.el
deleted file mode 100644
index d487f93..0000000
--- a/emacs.d/elpa/async-20150529.529/smtpmail-async.el
+++ /dev/null
@@ -1,73 +0,0 @@
-;;; smtpmail-async --- Send e-mail with smtpmail.el asynchronously
-
-;; Copyright (C) 2012~2014 John Wiegley
-
-;; Author: John Wiegley <jwiegley@gmail.com>
-;; Created: 18 Jun 2012
-
-;; Keywords: email async
-;; X-URL: https://github.com/jwiegley/emacs-async
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; Send e-mail with smtpmail.el asynchronously.  To use:
-;;
-;;   (require 'smtpmail-async)
-;;
-;;   (setq send-mail-function 'async-smtpmail-send-it
-;;         message-send-mail-function 'async-smtpmail-send-it)
-;;
-;; This assumes you already have smtpmail.el working.
-
-;;; Code:
-
-(defgroup smtpmail-async nil
-  "Send e-mail with smtpmail.el asynchronously"
-  :group 'smptmail)
-
-(require 'async)
-(require 'smtpmail)
-(require 'message)
-
-(defvar async-smtpmail-before-send-hook nil
-  "Hook running in the child emacs in `async-smtpmail-send-it'.
-It is called just before calling `smtpmail-send-it'.")
-
-(defun async-smtpmail-send-it ()
-  (let ((to          (message-field-value "To"))
-        (buf-content (buffer-substring-no-properties
-                      (point-min) (point-max))))
-    (message "Delivering message to %s..." to)
-    (async-start
-     `(lambda ()
-        (require 'smtpmail)
-        (with-temp-buffer
-          (insert ,buf-content)
-          (set-buffer-multibyte nil)
-          ;; Pass in the variable environment for smtpmail
-          ,(async-inject-variables
-            "\\`\\(smtpmail\\|async-smtpmail\\|\\(user-\\)?mail\\)-\\|auth-sources"
-            nil "\\`\\(mail-header-format-function\\|smtpmail-address-buffer\\|mail-mode-abbrev-table\\)")
-          (run-hooks 'async-smtpmail-before-send-hook)
-          (smtpmail-send-it)))
-     `(lambda (&optional ignore)
-        (message "Delivering message to %s...done" ,to)))))
-
-(provide 'smtpmail-async)
-
-;;; smtpmail-async.el ends here
diff --git a/emacs.d/elpa/async-20160108.1249/async-autoloads.el b/emacs.d/elpa/async-20160108.1249/async-autoloads.el
new file mode 100644
index 0000000..dd498c3
--- /dev/null
+++ b/emacs.d/elpa/async-20160108.1249/async-autoloads.el
@@ -0,0 +1,129 @@
+;;; async-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "async" "async.el" (22171 46585 0 0))
+;;; Generated autoloads from async.el
+
+(autoload 'async-start-process "async" "\
+Start the executable PROGRAM asynchronously.  See `async-start'.
+PROGRAM is passed PROGRAM-ARGS, calling FINISH-FUNC with the
+process object when done.  If FINISH-FUNC is nil, the future
+object will return the process object when the program is
+finished.  Set DEFAULT-DIRECTORY to change PROGRAM's current
+working directory.
+
+\(fn NAME PROGRAM FINISH-FUNC &rest PROGRAM-ARGS)" nil nil)
+
+(autoload 'async-start "async" "\
+Execute START-FUNC (often a lambda) in a subordinate Emacs process.
+When done, the return value is passed to FINISH-FUNC.  Example:
+
+    (async-start
+       ;; What to do in the child process
+       (lambda ()
+         (message \"This is a test\")
+         (sleep-for 3)
+         222)
+
+       ;; What to do when it finishes
+       (lambda (result)
+         (message \"Async process done, result should be 222: %s\"
+                  result)))
+
+If FINISH-FUNC is nil or missing, a future is returned that can
+be inspected using `async-get', blocking until the value is
+ready.  Example:
+
+    (let ((proc (async-start
+                   ;; What to do in the child process
+                   (lambda ()
+                     (message \"This is a test\")
+                     (sleep-for 3)
+                     222))))
+
+        (message \"I'm going to do some work here\") ;; ....
+
+        (message \"Waiting on async process, result should be 222: %s\"
+                 (async-get proc)))
+
+If you don't want to use a callback, and you don't care about any
+return value form the child process, pass the `ignore' symbol as
+the second argument (if you don't, and never call `async-get', it
+will leave *emacs* process buffers hanging around):
+
+    (async-start
+     (lambda ()
+       (delete-file \"a remote file on a slow link\" nil))
+     'ignore)
+
+Note: Even when FINISH-FUNC is present, a future is still
+returned except that it yields no value (since the value is
+passed to FINISH-FUNC).  Call `async-get' on such a future always
+returns nil.  It can still be useful, however, as an argument to
+`async-ready' or `async-wait'.
+
+\(fn START-FUNC &optional FINISH-FUNC)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil "async-bytecomp" "async-bytecomp.el" (22171
+;;;;;;  46585 0 0))
+;;; Generated autoloads from async-bytecomp.el
+
+(autoload 'async-byte-recompile-directory "async-bytecomp" "\
+Compile all *.el files in DIRECTORY asynchronously.
+All *.elc files are systematically deleted before proceeding.
+
+\(fn DIRECTORY &optional QUIET)" nil nil)
+
+(defvar async-bytecomp-package-mode nil "\
+Non-nil if Async-Bytecomp-Package mode is enabled.
+See the command `async-bytecomp-package-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 `async-bytecomp-package-mode'.")
+
+(custom-autoload 'async-bytecomp-package-mode "async-bytecomp" nil)
+
+(autoload 'async-bytecomp-package-mode "async-bytecomp" "\
+Byte compile asynchronously packages installed with package.el.
+Async compilation of packages can be controlled by
+`async-bytecomp-allowed-packages'.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "dired-async" "dired-async.el" (22171 46585
+;;;;;;  0 0))
+;;; Generated autoloads from dired-async.el
+
+(defvar dired-async-mode nil "\
+Non-nil if Dired-Async mode is enabled.
+See the command `dired-async-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 `dired-async-mode'.")
+
+(custom-autoload 'dired-async-mode "dired-async" nil)
+
+(autoload 'dired-async-mode "dired-async" "\
+Do dired actions asynchronously.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("async-pkg.el" "smtpmail-async.el") (22171
+;;;;;;  46585 642069 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; async-autoloads.el ends here
diff --git a/emacs.d/elpa/async-20160108.1249/async-bytecomp.el b/emacs.d/elpa/async-20160108.1249/async-bytecomp.el
new file mode 100644
index 0000000..54313c0
--- /dev/null
+++ b/emacs.d/elpa/async-20160108.1249/async-bytecomp.el
@@ -0,0 +1,177 @@
+;;; async-bytecomp.el --- Async functions to compile elisp files async
+
+;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+
+;; Authors: John Wiegley <jwiegley@gmail.com>
+;;          Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Keywords: dired async byte-compile
+;; X-URL: https://github.com/jwiegley/dired-async
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;;  This package provide the `async-byte-recompile-directory' function
+;;  which allows, as the name says to recompile a directory outside of
+;;  your running emacs.
+;;  The benefit is your files will be compiled in a clean environment without
+;;  the old *.el files loaded.
+;;  Among other things, this fix a bug in package.el which recompile
+;;  the new files in the current environment with the old files loaded, creating
+;;  errors in most packages after upgrades.
+;;
+;;  NB: This package is advicing the function `package--compile'.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'async)
+
+(defcustom async-bytecomp-allowed-packages
+  '(async helm helm-core helm-ls-git helm-ls-hg magit)
+  "Packages in this list will be compiled asynchronously by `package--compile'.
+All the dependencies of these packages will be compiled async too,
+so no need to add dependencies to this list.
+The value of this variable can also be a list with a single element,
+the symbol `all', in this case packages are always compiled asynchronously."
+  :group 'async
+  :type '(repeat (choice symbol)))
+
+(defvar async-byte-compile-log-file "~/.emacs.d/async-bytecomp.log")
+
+;;;###autoload
+(defun async-byte-recompile-directory (directory &optional quiet)
+  "Compile all *.el files in DIRECTORY asynchronously.
+All *.elc files are systematically deleted before proceeding."
+  (cl-loop with dir = (directory-files directory t "\\.elc\\'")
+           unless dir return nil
+           for f in dir
+           when (file-exists-p f) do (delete-file f))
+  ;; Ensure async is reloaded when async.elc is deleted.
+  ;; This happen when recompiling its own directory.
+  (load "async")
+  (let ((call-back
+         `(lambda (&optional ignore)
+            (if (file-exists-p async-byte-compile-log-file)
+                (let ((buf (get-buffer-create byte-compile-log-buffer))
+                      (n 0))
+                  (with-current-buffer buf
+                    (goto-char (point-max))
+                    (let ((inhibit-read-only t))
+                      (insert-file-contents async-byte-compile-log-file)
+                      (compilation-mode))
+                    (display-buffer buf)
+                    (delete-file async-byte-compile-log-file)
+                    (unless ,quiet
+                      (save-excursion
+                        (goto-char (point-min))
+                        (while (re-search-forward "^.*:Error:" nil t)
+                          (cl-incf n)))
+                      (if (> n 0)
+                          (message "Failed to compile %d files in directory `%s'" n ,directory)
+                          (message "Directory `%s' compiled asynchronously with warnings" ,directory)))))
+                (unless ,quiet
+                  (message "Directory `%s' compiled asynchronously with success" ,directory))))))
+    (async-start
+     `(lambda ()
+        (require 'bytecomp)
+        ,(async-inject-variables "\\`\\(load-path\\)\\|byte\\'")
+        (let ((default-directory (file-name-as-directory ,directory))
+              error-data)
+          (add-to-list 'load-path default-directory)
+          (byte-recompile-directory ,directory 0 t)
+          (when (get-buffer byte-compile-log-buffer)
+            (setq error-data (with-current-buffer byte-compile-log-buffer
+                               (buffer-substring-no-properties (point-min) (point-max))))
+            (unless (string= error-data "")
+              (with-temp-file ,async-byte-compile-log-file
+                (erase-buffer)
+                (insert error-data))))))
+     call-back)
+    (unless quiet (message "Started compiling asynchronously directory %s" directory))))
+
+(defvar package-archive-contents)
+(defvar package-alist)
+(declare-function package-desc-reqs "package.el" (cl-x))
+
+(defun async-bytecomp--get-package-deps (pkg &optional only)
+  ;; Same as `package--get-deps' but parse instead `package-archive-contents'
+  ;; because PKG is not already installed and not present in `package-alist'.
+  ;; However fallback to `package-alist' in case PKG no more present
+  ;; in `package-archive-contents' due to modification to `package-archives'.
+  ;; See issue #58.
+  (let* ((pkg-desc (cadr (or (assq pkg package-archive-contents)
+                             (assq pkg package-alist))))
+         (direct-deps (cl-loop for p in (package-desc-reqs pkg-desc)
+                               for name = (car p)
+                               when (or (assq name package-archive-contents)
+                                        (assq name package-alist))
+                               collect name))
+         (indirect-deps (unless (eq only 'direct)
+                          (delete-dups
+                           (cl-loop for p in direct-deps append
+                                    (async-bytecomp--get-package-deps p))))))
+    (cl-case only
+      (direct   direct-deps)
+      (separate (list direct-deps indirect-deps))
+      (indirect indirect-deps)
+      (t        (delete-dups (append direct-deps indirect-deps))))))
+
+(defun async-bytecomp-get-allowed-pkgs ()
+  (when (and async-bytecomp-allowed-packages
+             (listp async-bytecomp-allowed-packages))
+    (if package-archive-contents
+        (cl-loop for p in async-bytecomp-allowed-packages
+                 when (assq p package-archive-contents)
+                 append (async-bytecomp--get-package-deps p) into reqs
+                 finally return
+                 (delete-dups
+                  (append async-bytecomp-allowed-packages reqs)))
+        async-bytecomp-allowed-packages)))
+
+(defadvice package--compile (around byte-compile-async)
+  (let ((cur-package (package-desc-name pkg-desc))
+        (pkg-dir (package-desc-dir pkg-desc)))
+    (if (or (equal async-bytecomp-allowed-packages '(all))
+            (memq cur-package (async-bytecomp-get-allowed-pkgs)))
+        (progn
+          (when (eq cur-package 'async)
+            (fmakunbound 'async-byte-recompile-directory))
+          ;; Add to `load-path' the latest version of async and
+          ;; reload it when reinstalling async.
+          (when (string= cur-package "async")
+            (cl-pushnew pkg-dir load-path)
+            (load "async-bytecomp"))
+          ;; `async-byte-recompile-directory' will add directory
+          ;; as needed to `load-path'.
+          (async-byte-recompile-directory (package-desc-dir pkg-desc) t))
+        ad-do-it)))
+
+;;;###autoload
+(define-minor-mode async-bytecomp-package-mode
+    "Byte compile asynchronously packages installed with package.el.
+Async compilation of packages can be controlled by
+`async-bytecomp-allowed-packages'."
+  :group 'async
+  :global t
+  (if async-bytecomp-package-mode
+      (ad-activate 'package--compile)
+      (ad-deactivate 'package--compile)))
+
+(provide 'async-bytecomp)
+
+;;; async-bytecomp.el ends here
diff --git a/emacs.d/elpa/async-20160108.1249/async-pkg.el b/emacs.d/elpa/async-20160108.1249/async-pkg.el
new file mode 100644
index 0000000..b042040
--- /dev/null
+++ b/emacs.d/elpa/async-20160108.1249/async-pkg.el
@@ -0,0 +1,6 @@
+(define-package "async" "20160108.1249" "Asynchronous processing in Emacs" 'nil :keywords
+  '("async")
+  :url "http://elpa.gnu.org/packages/async.html")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/async-20160108.1249/async.el b/emacs.d/elpa/async-20160108.1249/async.el
new file mode 100644
index 0000000..24db2a1
--- /dev/null
+++ b/emacs.d/elpa/async-20160108.1249/async.el
@@ -0,0 +1,303 @@
+;;; async.el --- Asynchronous processing in Emacs
+
+;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+
+;; Author: John Wiegley <jwiegley@gmail.com>
+;; Created: 18 Jun 2012
+;; Version: 1.6
+
+;; Keywords: async
+;; X-URL: https://github.com/jwiegley/emacs-async
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Adds the ability to call asynchronous functions and process with ease.  See
+;; the documentation for `async-start' and `async-start-process'.
+
+;;; Code:
+
+(defgroup async nil
+  "Simple asynchronous processing in Emacs"
+  :group 'emacs)
+
+(defvar async-debug nil)
+(defvar async-send-over-pipe t)
+(defvar async-in-child-emacs nil)
+(defvar async-callback nil)
+(defvar async-callback-for-process nil)
+(defvar async-callback-value nil)
+(defvar async-callback-value-set nil)
+(defvar async-current-process nil)
+(defvar async--procvar nil)
+
+(defun async-inject-variables
+  (include-regexp &optional predicate exclude-regexp)
+  "Return a `setq' form that replicates part of the calling environment.
+It sets the value for every variable matching INCLUDE-REGEXP and
+also PREDICATE.  It will not perform injection for any variable
+matching EXCLUDE-REGEXP (if present).  It is intended to be used
+as follows:
+
+    (async-start
+       `(lambda ()
+          (require 'smtpmail)
+          (with-temp-buffer
+            (insert ,(buffer-substring-no-properties (point-min) (point-max)))
+            ;; Pass in the variable environment for smtpmail
+            ,(async-inject-variables \"\\`\\(smtpmail\\|\\(user-\\)?mail\\)-\")
+            (smtpmail-send-it)))
+       'ignore)"
+  `(setq
+    ,@(let (bindings)
+        (mapatoms
+         (lambda (sym)
+           (if (and (boundp sym)
+                    (or (null include-regexp)
+                        (string-match include-regexp (symbol-name sym)))
+                    (not (string-match
+                          (or exclude-regexp "-syntax-table\\'")
+                          (symbol-name sym))))
+               (let ((value (symbol-value sym)))
+                 (when (or (null predicate)
+                           (funcall predicate sym))
+                   (setq bindings (cons `(quote ,value) bindings)
+                         bindings (cons sym bindings)))))))
+        bindings)))
+
+(defalias 'async-inject-environment 'async-inject-variables)
+
+(defun async-handle-result (func result buf)
+  (if (null func)
+      (progn
+        (set (make-local-variable 'async-callback-value) result)
+        (set (make-local-variable 'async-callback-value-set) t))
+    (unwind-protect
+        (if (and (listp result)
+                 (eq 'async-signal (nth 0 result)))
+            (signal (car (nth 1 result))
+                    (cdr (nth 1 result)))
+          (funcall func result))
+      (unless async-debug
+        (kill-buffer buf)))))
+
+(defun async-when-done (proc &optional change)
+  "Process sentinal used to retrieve the value from the child process."
+  (when (eq 'exit (process-status proc))
+    (with-current-buffer (process-buffer proc)
+      (let ((async-current-process proc))
+        (if (= 0 (process-exit-status proc))
+            (if async-callback-for-process
+                (if async-callback
+                    (prog1
+                        (funcall async-callback proc)
+                      (unless async-debug
+                        (kill-buffer (current-buffer))))
+                  (set (make-local-variable 'async-callback-value) proc)
+                  (set (make-local-variable 'async-callback-value-set) t))
+              (goto-char (point-max))
+              (backward-sexp)
+              (async-handle-result async-callback (read (current-buffer))
+                                   (current-buffer)))
+          (set (make-local-variable 'async-callback-value)
+               (list 'error
+                     (format "Async process '%s' failed with exit code %d"
+                             (process-name proc) (process-exit-status proc))))
+          (set (make-local-variable 'async-callback-value-set) t))))))
+
+(defun async--receive-sexp (&optional stream)
+  (let ((sexp (decode-coding-string (base64-decode-string
+                                     (read stream)) 'utf-8-unix))
+	;; Parent expects UTF-8 encoded text.
+	(coding-system-for-write 'utf-8-unix))
+    (if async-debug
+        (message "Received sexp {{{%s}}}" (pp-to-string sexp)))
+    (setq sexp (read sexp))
+    (if async-debug
+        (message "Read sexp {{{%s}}}" (pp-to-string sexp)))
+    (eval sexp)))
+
+(defun async--insert-sexp (sexp)
+  (let (print-level
+	print-length
+	(print-escape-nonascii t)
+	(print-circle t))
+    (prin1 sexp (current-buffer))
+    ;; Just in case the string we're sending might contain EOF
+    (encode-coding-region (point-min) (point-max) 'utf-8-unix)
+    (base64-encode-region (point-min) (point-max) t)
+    (goto-char (point-min)) (insert ?\")
+    (goto-char (point-max)) (insert ?\" ?\n)))
+
+(defun async--transmit-sexp (process sexp)
+  (with-temp-buffer
+    (if async-debug
+        (message "Transmitting sexp {{{%s}}}" (pp-to-string sexp)))
+    (async--insert-sexp sexp)
+    (process-send-region process (point-min) (point-max))))
+
+(defun async-batch-invoke ()
+  "Called from the child Emacs process' command-line."
+  ;; Make sure 'message' and 'prin1' encode stuff in UTF-8, as parent
+  ;; process expects.
+  (let ((coding-system-for-write 'utf-8-unix))
+    (setq async-in-child-emacs t
+	  debug-on-error async-debug)
+    (if debug-on-error
+	(prin1 (funcall
+		(async--receive-sexp (unless async-send-over-pipe
+				       command-line-args-left))))
+      (condition-case err
+	  (prin1 (funcall
+		  (async--receive-sexp (unless async-send-over-pipe
+					 command-line-args-left))))
+	(error
+	 (prin1 (list 'async-signal err)))))))
+
+(defun async-ready (future)
+  "Query a FUTURE to see if the ready is ready -- i.e., if no blocking
+would result from a call to `async-get' on that FUTURE."
+  (and (memq (process-status future) '(exit signal))
+       (with-current-buffer (process-buffer future)
+         async-callback-value-set)))
+
+(defun async-wait (future)
+  "Wait for FUTURE to become ready."
+  (while (not (async-ready future))
+    (sit-for 0.05)))
+
+(defun async-get (future)
+  "Get the value from an asynchronously function when it is ready.
+FUTURE is returned by `async-start' or `async-start-process' when
+its FINISH-FUNC is nil."
+  (async-wait future)
+  (with-current-buffer (process-buffer future)
+    (async-handle-result #'identity async-callback-value (current-buffer))))
+
+(defun async-message-p (value)
+  "Return true of VALUE is an async.el message packet."
+  (and (listp value)
+       (plist-get value :async-message)))
+
+(defun async-send (&rest args)
+  "Send the given messages to the asychronous Emacs PROCESS."
+  (let ((args (append args '(:async-message t))))
+    (if async-in-child-emacs
+        (if async-callback
+            (funcall async-callback args))
+      (async--transmit-sexp (car args) (list 'quote (cdr args))))))
+
+(defun async-receive (&rest args)
+  "Send the given messages to the asychronous Emacs PROCESS."
+  (async--receive-sexp))
+
+;;;###autoload
+(defun async-start-process (name program finish-func &rest program-args)
+  "Start the executable PROGRAM asynchronously.  See `async-start'.
+PROGRAM is passed PROGRAM-ARGS, calling FINISH-FUNC with the
+process object when done.  If FINISH-FUNC is nil, the future
+object will return the process object when the program is
+finished.  Set DEFAULT-DIRECTORY to change PROGRAM's current
+working directory."
+  (let* ((buf (generate-new-buffer (concat "*" name "*")))
+         (proc (let ((process-connection-type nil))
+                 (apply #'start-process name buf program program-args))))
+    (with-current-buffer buf
+      (set (make-local-variable 'async-callback) finish-func)
+      (set-process-sentinel proc #'async-when-done)
+      (unless (string= name "emacs")
+        (set (make-local-variable 'async-callback-for-process) t))
+      proc)))
+
+;;;###autoload
+(defun async-start (start-func &optional finish-func)
+  "Execute START-FUNC (often a lambda) in a subordinate Emacs process.
+When done, the return value is passed to FINISH-FUNC.  Example:
+
+    (async-start
+       ;; What to do in the child process
+       (lambda ()
+         (message \"This is a test\")
+         (sleep-for 3)
+         222)
+
+       ;; What to do when it finishes
+       (lambda (result)
+         (message \"Async process done, result should be 222: %s\"
+                  result)))
+
+If FINISH-FUNC is nil or missing, a future is returned that can
+be inspected using `async-get', blocking until the value is
+ready.  Example:
+
+    (let ((proc (async-start
+                   ;; What to do in the child process
+                   (lambda ()
+                     (message \"This is a test\")
+                     (sleep-for 3)
+                     222))))
+
+        (message \"I'm going to do some work here\") ;; ....
+
+        (message \"Waiting on async process, result should be 222: %s\"
+                 (async-get proc)))
+
+If you don't want to use a callback, and you don't care about any
+return value form the child process, pass the `ignore' symbol as
+the second argument (if you don't, and never call `async-get', it
+will leave *emacs* process buffers hanging around):
+
+    (async-start
+     (lambda ()
+       (delete-file \"a remote file on a slow link\" nil))
+     'ignore)
+
+Note: Even when FINISH-FUNC is present, a future is still
+returned except that it yields no value (since the value is
+passed to FINISH-FUNC).  Call `async-get' on such a future always
+returns nil.  It can still be useful, however, as an argument to
+`async-ready' or `async-wait'."
+  (let ((sexp start-func)
+	;; Subordinate Emacs will send text encoded in UTF-8.
+	(coding-system-for-read 'utf-8-unix))
+    (setq async--procvar
+          (async-start-process
+           "emacs" (file-truename
+                    (expand-file-name invocation-name
+                                      invocation-directory))
+           finish-func
+           "-Q" "-l"
+           ;; Using `locate-library' ensure we use the right file
+           ;; when the .elc have been deleted.
+           (locate-library "async")
+           "-batch" "-f" "async-batch-invoke"
+           (if async-send-over-pipe
+               "<none>"
+               (with-temp-buffer
+                 (async--insert-sexp (list 'quote sexp))
+                 (buffer-string)))))
+    (if async-send-over-pipe
+        (async--transmit-sexp async--procvar (list 'quote sexp)))
+    async--procvar))
+
+(defmacro async-sandbox(func)
+  "Evaluate FUNC in a separate Emacs process, synchronously."
+  `(async-get (async-start ,func)))
+
+(provide 'async)
+
+;;; async.el ends here
diff --git a/emacs.d/elpa/async-20160108.1249/dired-async.el b/emacs.d/elpa/async-20160108.1249/dired-async.el
new file mode 100644
index 0000000..ecab9cb
--- /dev/null
+++ b/emacs.d/elpa/async-20160108.1249/dired-async.el
@@ -0,0 +1,290 @@
+;;; dired-async.el --- Copy/move/delete asynchronously in dired.
+
+;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+
+;; Authors: John Wiegley <jwiegley@gmail.com>
+;;          Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Keywords: dired async network
+;; X-URL: https://github.com/jwiegley/dired-async
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This file provide a redefinition of `dired-create-file' function,
+;; performs copies, moves and all what is handled by `dired-create-file'
+;; in the background using a slave Emacs process,
+;; by means of the async.el module.
+;; To use it, put this in your .emacs:
+
+;;     (dired-async-mode 1)
+
+;; This will enable async copy/rename etc...
+;; in dired and helm.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'dired-aux)
+(require 'async)
+
+(eval-when-compile
+  (defvar async-callback))
+(defvar dired-async-operation nil)
+
+(defgroup dired-async nil
+  "Copy rename files asynchronously from dired."
+  :group 'dired)
+
+(defcustom dired-async-env-variables-regexp
+  "\\`\\(tramp-\\(default\\|connection\\|remote\\)\\|ange-ftp\\)-.*"
+  "Variables matching this regexp will be loaded on Child Emacs."
+  :type  'regexp
+  :group 'dired-async)
+
+(defcustom dired-async-message-function 'dired-async-mode-line-message
+  "Function to use to notify result when operation finish.
+Should take same args as `message'."
+  :group 'dired-async
+  :type  'function)
+
+(defcustom dired-async-log-file "/tmp/dired-async.log"
+  "File use to communicate errors from Child Emacs to host Emacs."
+  :group 'dired-async
+  :type 'string)
+
+(defface dired-async-message
+    '((t (:foreground "yellow")))
+  "Face used for mode-line message."
+  :group 'dired-async)
+
+(defface dired-async-mode-message
+    '((t (:foreground "Gold")))
+  "Face used for `dired-async--modeline-mode' lighter."
+  :group 'dired-async)
+
+(define-minor-mode dired-async--modeline-mode
+    "Notify mode-line that an async process run."
+  :group 'dired-async
+  :global t
+  :lighter (:eval (propertize (format " [%s Async job(s) running]"
+                                      (length (dired-async-processes)))
+                              'face 'dired-async-mode-message))
+  (unless dired-async--modeline-mode
+    (let ((visible-bell t)) (ding))))
+
+(defun dired-async-mode-line-message (text &rest args)
+  "Notify end of operation in `mode-line'."
+  (message nil)
+  (let ((mode-line-format (concat
+                           " " (propertize
+                                (if args
+                                    (apply #'format text args)
+                                    text)
+                                'face 'dired-async-message))))
+    (force-mode-line-update)
+    (sit-for 3)
+    (force-mode-line-update)))
+
+(defun dired-async-processes ()
+  (cl-loop for p in (process-list)
+           when (cl-loop for c in (process-command p) thereis
+                         (string= "async-batch-invoke" c))
+           collect p))
+
+(defun dired-async-kill-process ()
+  (interactive)
+  (let* ((processes (dired-async-processes))
+         (proc (car (last processes))))
+    (delete-process proc)
+    (unless (> (length processes) 1)
+      (dired-async--modeline-mode -1))))
+
+(defun dired-async-after-file-create (len-flist)
+  "Callback function used for operation handled by `dired-create-file'."
+  (unless (dired-async-processes)
+    ;; Turn off mode-line notification
+    ;; only when last process end.
+    (dired-async--modeline-mode -1))
+  (when dired-async-operation
+    (if (file-exists-p dired-async-log-file)
+        (progn
+          (pop-to-buffer (get-buffer-create "*dired async*"))
+          (erase-buffer)
+          (insert "Error: ")
+          (insert-file-contents dired-async-log-file)
+          (delete-file dired-async-log-file))
+        (run-with-timer
+         0.1 nil
+         dired-async-message-function "Asynchronous %s of %s file(s) on %s file(s) done"
+         (car dired-async-operation) (cadr dired-async-operation) len-flist))))
+
+(defun dired-async-maybe-kill-ftp ()
+  "Return a form to kill ftp process in child emacs."
+  (quote
+   (progn
+     (require 'cl-lib)
+     (let ((buf (cl-loop for b in (buffer-list)
+                         thereis (and (string-match
+                                       "\\`\\*ftp.*"
+                                       (buffer-name b)) b))))
+       (when buf (kill-buffer buf))))))
+
+(defun dired-async-create-files (file-creator operation fn-list name-constructor
+                                 &optional marker-char)
+  "Same as `dired-create-files' but asynchronous.
+
+See `dired-create-files' for the behavior of arguments."
+  (setq dired-async-operation nil)
+  (let (dired-create-files-failures
+        failures async-fn-list
+        skipped (success-count 0)
+        (total (length fn-list))
+        callback)
+    (let (to overwrite-query
+             overwrite-backup-query)    ; for dired-handle-overwrite
+      (dolist (from fn-list)
+        (setq to (funcall name-constructor from))
+        (if (equal to from)
+            (progn
+              (setq to nil)
+              (dired-log "Cannot %s to same file: %s\n"
+                         (downcase operation) from)))
+        (if (not to)
+            (setq skipped (cons (dired-make-relative from) skipped))
+            (let* ((overwrite (file-exists-p to))
+                   (dired-overwrite-confirmed ; for dired-handle-overwrite
+                    (and overwrite
+                         (let ((help-form '(format "\
+Type SPC or `y' to overwrite file `%s',
+DEL or `n' to skip to next,
+ESC or `q' to not overwrite any of the remaining files,
+`!' to overwrite all remaining files with no more questions." to)))
+                           (dired-query 'overwrite-query
+                                        "Overwrite `%s'?" to))))
+                   ;; must determine if FROM is marked before file-creator
+                   ;; gets a chance to delete it (in case of a move).
+                   (actual-marker-char
+                    (cond  ((integerp marker-char) marker-char)
+                           (marker-char (dired-file-marker from)) ; slow
+                           (t nil))))
+              ;; Handle the `dired-copy-file' file-creator specially
+              ;; When copying a directory to another directory or
+              ;; possibly to itself or one of its subdirectories.
+              ;; e.g "~/foo/" => "~/test/"
+              ;; or "~/foo/" =>"~/foo/"
+              ;; or "~/foo/ => ~/foo/bar/")
+              ;; In this case the 'name-constructor' have set the destination
+              ;; TO to "~/test/foo" because the old emacs23 behavior
+              ;; of `copy-directory' was to not create the subdirectory
+              ;; and instead copy the contents.
+              ;; With the new behavior of `copy-directory'
+              ;; (similar to the `cp' shell command) we don't
+              ;; need such a construction of the target directory,
+              ;; so modify the destination TO to "~/test/" instead of "~/test/foo/".
+              (let ((destname (file-name-directory to)))
+                (when (and (file-directory-p from)
+                           (file-directory-p to)
+                           (eq file-creator 'dired-copy-file))
+                  (setq to destname))
+                ;; If DESTNAME is a subdirectory of FROM, not a symlink,
+                ;; and the method in use is copying, signal an error.
+                (and (eq t (car (file-attributes destname)))
+                     (eq file-creator 'dired-copy-file)
+                     (file-in-directory-p destname from)
+                     (error "Cannot copy `%s' into its subdirectory `%s'"
+                            from to)))
+              (if overwrite
+                  (or (and dired-overwrite-confirmed
+                           (push (cons from to) async-fn-list))
+                      (progn
+                        (push (dired-make-relative from) failures)
+                        (dired-log "%s `%s' to `%s' failed"
+                                   operation from to)))
+                  (push (cons from to) async-fn-list)))))
+      (setq callback
+            `(lambda (&optional ignore)
+               (dired-async-after-file-create ,total)
+               (when (string= ,(downcase operation) "rename")
+                 (cl-loop for (file . to) in ',async-fn-list
+                          do (and (get-file-buffer file)
+                                  (with-current-buffer (get-file-buffer file)
+                                    (set-visited-file-name to nil t))))))))
+    ;; Handle error happening in host emacs.
+    (cond
+      (dired-create-files-failures
+       (setq failures (nconc failures dired-create-files-failures))
+       (dired-log-summary
+        (format "%s failed for %d file%s in %d requests"
+                operation (length failures)
+                (dired-plural-s (length failures))
+                total)
+        failures))
+      (failures
+       (dired-log-summary
+        (format "%s failed for %d of %d file%s"
+                operation (length failures)
+                total (dired-plural-s total))
+        failures))
+      (skipped
+       (dired-log-summary
+        (format "%s: %d of %d file%s skipped"
+                operation (length skipped) total
+                (dired-plural-s total))
+        skipped))
+      (t (message "%s: %s file%s"
+                  operation success-count (dired-plural-s success-count))))
+    ;; Start async process.
+    (when async-fn-list
+      (async-start `(lambda ()
+                      (require 'cl-lib) (require 'dired-aux) (require 'dired-x)
+                      ,(async-inject-variables dired-async-env-variables-regexp)
+                      (condition-case err
+                          (let ((dired-recursive-copies (quote always)))
+                            (cl-loop for (f . d) in (quote ,async-fn-list)
+                                     do (funcall (quote ,file-creator) f d t)))
+                        (file-error
+                         (with-temp-file ,dired-async-log-file
+                           (insert (format "%S" err)))))
+                      ,(dired-async-maybe-kill-ftp))
+                   callback)
+      ;; Run mode-line notifications while process running.
+      (dired-async--modeline-mode 1)
+      (setq dired-async-operation (list operation (length async-fn-list)))
+      (message "%s proceeding asynchronously..." operation))))
+
+(defadvice dired-create-files (around dired-async)
+  (dired-async-create-files file-creator operation fn-list
+                            name-constructor marker-char))
+
+;;;###autoload
+(define-minor-mode dired-async-mode
+    "Do dired actions asynchronously."
+  :group 'dired-async
+  :global t
+  (if dired-async-mode
+      (if (fboundp 'advice-add)
+          (advice-add 'dired-create-files :override #'dired-async-create-files)
+          (ad-activate 'dired-create-files))
+      (if (fboundp 'advice-remove)
+          (advice-remove 'dired-create-files #'dired-async-create-files)
+          (ad-deactivate 'dired-create-files))))
+
+
+(provide 'dired-async)
+
+;;; dired-async.el ends here
diff --git a/emacs.d/elpa/async-20160108.1249/smtpmail-async.el b/emacs.d/elpa/async-20160108.1249/smtpmail-async.el
new file mode 100644
index 0000000..5ac426d
--- /dev/null
+++ b/emacs.d/elpa/async-20160108.1249/smtpmail-async.el
@@ -0,0 +1,73 @@
+;;; smtpmail-async.el --- Send e-mail with smtpmail.el asynchronously
+
+;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+
+;; Author: John Wiegley <jwiegley@gmail.com>
+;; Created: 18 Jun 2012
+
+;; Keywords: email async
+;; X-URL: https://github.com/jwiegley/emacs-async
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Send e-mail with smtpmail.el asynchronously.  To use:
+;;
+;;   (require 'smtpmail-async)
+;;
+;;   (setq send-mail-function 'async-smtpmail-send-it
+;;         message-send-mail-function 'async-smtpmail-send-it)
+;;
+;; This assumes you already have smtpmail.el working.
+
+;;; Code:
+
+(defgroup smtpmail-async nil
+  "Send e-mail with smtpmail.el asynchronously"
+  :group 'smptmail)
+
+(require 'async)
+(require 'smtpmail)
+(require 'message)
+
+(defvar async-smtpmail-before-send-hook nil
+  "Hook running in the child emacs in `async-smtpmail-send-it'.
+It is called just before calling `smtpmail-send-it'.")
+
+(defun async-smtpmail-send-it ()
+  (let ((to          (message-field-value "To"))
+        (buf-content (buffer-substring-no-properties
+                      (point-min) (point-max))))
+    (message "Delivering message to %s..." to)
+    (async-start
+     `(lambda ()
+        (require 'smtpmail)
+        (with-temp-buffer
+          (insert ,buf-content)
+          (set-buffer-multibyte nil)
+          ;; Pass in the variable environment for smtpmail
+          ,(async-inject-variables
+            "\\`\\(smtpmail\\|async-smtpmail\\|\\(user-\\)?mail\\)-\\|auth-sources\\|epg"
+            nil "\\`\\(mail-header-format-function\\|smtpmail-address-buffer\\|mail-mode-abbrev-table\\)")
+          (run-hooks 'async-smtpmail-before-send-hook)
+          (smtpmail-send-it)))
+     `(lambda (&optional ignore)
+        (message "Delivering message to %s...done" ,to)))))
+
+(provide 'smtpmail-async)
+
+;;; smtpmail-async.el ends here
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-autoloads.el b/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-autoloads.el
deleted file mode 100644
index 66046c4..0000000
--- a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-autoloads.el
+++ /dev/null
@@ -1,64 +0,0 @@
-;;; auto-complete-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "auto-complete" "auto-complete.el" (21898 47983
-;;;;;;  0 0))
-;;; Generated autoloads from auto-complete.el
-
-(autoload 'auto-complete "auto-complete" "\
-Start auto-completion at current point.
-
-\(fn &optional SOURCES)" t nil)
-
-(autoload 'auto-complete-mode "auto-complete" "\
-AutoComplete mode
-
-\(fn &optional ARG)" t nil)
-
-(defvar global-auto-complete-mode nil "\
-Non-nil if Global-Auto-Complete mode is enabled.
-See the command `global-auto-complete-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-auto-complete-mode'.")
-
-(custom-autoload 'global-auto-complete-mode "auto-complete" nil)
-
-(autoload 'global-auto-complete-mode "auto-complete" "\
-Toggle Auto-Complete mode in all buffers.
-With prefix ARG, enable Global-Auto-Complete mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Auto-Complete mode is enabled in all buffers where
-`auto-complete-mode-maybe' would do it.
-See `auto-complete-mode' for more information on Auto-Complete mode.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "auto-complete-config" "auto-complete-config.el"
-;;;;;;  (21898 47983 0 0))
-;;; Generated autoloads from auto-complete-config.el
-
-(autoload 'ac-config-default "auto-complete-config" "\
-
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("auto-complete-pkg.el") (21898 47983 747280
-;;;;;;  0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; auto-complete-autoloads.el ends here
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-pkg.el b/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-pkg.el
deleted file mode 100644
index 1b402b0..0000000
--- a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-pkg.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(define-package "auto-complete" "20150618.1949" "Auto Completion for GNU Emacs"
-  '((popup "0.5.0")
-    (cl-lib "0.5")))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete.el b/emacs.d/elpa/auto-complete-20150618.1949/auto-complete.el
deleted file mode 100644
index 380ac6a..0000000
--- a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete.el
+++ /dev/null
@@ -1,2162 +0,0 @@
-;;; auto-complete.el --- Auto Completion for GNU Emacs
-
-;; Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015  Tomohiro Matsuyama
-
-;; Author: Tomohiro Matsuyama <m2ym.pub@gmail.com>
-;; URL: https://github.com/auto-complete/auto-complete
-;; Keywords: completion, convenience
-;; Version: 1.5.0
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; This extension provides a way to complete with popup menu like:
-;;
-;;     def-!-
-;;     +-----------------+
-;;     |defun::::::::::::|
-;;     |defvar           |
-;;     |defmacro         |
-;;     |       ...       |
-;;     +-----------------+
-;;
-;; You can complete by typing and selecting menu.
-;;
-;; Entire documents are located in doc/ directory.
-;; Take a look for information.
-;;
-;; Enjoy!
-
-;;; Code:
-
-
-
-(defconst ac-version "1.5.0"
-  "Version of auto-complete in string format.
-Use `version-to-list' to get version component.")
-
-(defconst ac-version-major (car (version-to-list ac-version))
-  "Major version number of auto-complete")
-
-(defconst ac-version-minor (cadr (version-to-list ac-version))
-  "Minor version number of auto-complete")
-
-(require 'cl-lib)
-(require 'popup)
-
-;;;; Global stuff
-
-(defun ac-error (&optional var)
-  "Report an error and disable `auto-complete-mode'."
-  (ignore-errors
-    (message "auto-complete error: %s" var)
-    (auto-complete-mode -1)
-    var))
-
-
-
-;;;; Customization
-
-(defgroup auto-complete nil
-  "Auto completion."
-  :group 'completion
-  :prefix "ac-")
-
-(defcustom ac-delay 0.1
-  "Delay to completions will be available."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-auto-show-menu 0.8
-  "Non-nil means completion menu will be automatically shown."
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "Never" nil)
-                 (float :tag "Timer"))
-  :group 'auto-complete)
-
-(defcustom ac-show-menu-immediately-on-auto-complete t
-  "Non-nil means menu will be showed immediately on `auto-complete'."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-expand-on-auto-complete t
-  "Non-nil means expand whole common part on first time `auto-complete'."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-disable-faces '(font-lock-comment-face font-lock-string-face font-lock-doc-face)
-  "Non-nil means disable automatic completion on specified faces."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-stop-flymake-on-completing t
-  "Non-nil means disble flymake temporarily on completing."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-flycheck-poll-completion-end-interval 0.5
-  "Polling interval to restart automatically flycheck's checking after completion is end."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-use-fuzzy (and (locate-library "fuzzy") t)
-  "Non-nil means use fuzzy matching."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-fuzzy-cursor-color "red"
-  "Cursor color in fuzzy mode."
-  :type 'string
-  :group 'auto-complete)
-
-(defcustom ac-use-comphist t
-  "Non-nil means use intelligent completion history."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-comphist-threshold 0.7
-  "Percentage of ignoring low scored candidates."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-comphist-file
-  (expand-file-name (concat (if (boundp 'user-emacs-directory)
-                                user-emacs-directory
-                              "~/.emacs.d/")
-                            "/ac-comphist.dat"))
-  "Completion history file name."
-  :type 'string
-  :group 'auto-complete)
-
-(defcustom ac-user-dictionary nil
-  "User defined dictionary"
-  :type '(repeat string)
-  :group 'auto-complete)
-
-(defcustom ac-dictionary-files '("~/.dict")
-  "Dictionary files."
-  :type '(repeat string)
-  :group 'auto-complete)
-(defvaralias 'ac-user-dictionary-files 'ac-dictionary-files)
-
-(defcustom ac-dictionary-directories
-  (ignore-errors
-    (when load-file-name
-      (let ((installed-dir (file-name-directory load-file-name)))
-        (cl-loop for name in '("ac-dict" "dict")
-              for dir = (concat installed-dir name)
-              if (file-directory-p dir)
-              collect dir))))
-  "Dictionary directories."
-  :type '(repeat string)
-  :group 'auto-complete)
-
-(defcustom ac-use-quick-help t
-  "Non-nil means use quick help."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-quick-help-delay 1.5
-  "Delay to show quick help."
-  :type 'float
-  :group 'auto-complete)
-
-(defcustom ac-menu-height 10
-  "Max height of candidate menu."
-  :type 'integer
-  :group 'auto-complete)
-(defvaralias 'ac-candidate-menu-height 'ac-menu-height)
-
-(defcustom ac-quick-help-height 20
-  "Max height of quick help."
-  :type 'integer
-  :group 'auto-complete)
-
-(defcustom ac-quick-help-prefer-pos-tip t
-  "Prefer native tooltip with pos-tip than overlay popup for displaying quick help."
-  :type 'boolean
-  :group 'auto-complete)
-(defvaralias 'ac-quick-help-prefer-x 'ac-quick-help-prefer-pos-tip)
-
-(defcustom ac-candidate-limit nil
-  "Limit number of candidates. Non-integer means no limit."
-  :type 'integer
-  :group 'auto-complete)
-(defvaralias 'ac-candidate-max 'ac-candidate-limit)
-
-(defcustom ac-modes
-  '(emacs-lisp-mode lisp-mode lisp-interaction-mode
-    slime-repl-mode
-    c-mode cc-mode c++-mode go-mode
-    java-mode malabar-mode clojure-mode clojurescript-mode  scala-mode
-    scheme-mode
-    ocaml-mode tuareg-mode coq-mode haskell-mode agda-mode agda2-mode
-    perl-mode cperl-mode python-mode ruby-mode lua-mode tcl-mode
-    ecmascript-mode javascript-mode js-mode js2-mode php-mode css-mode scss-mode less-css-mode
-    makefile-mode sh-mode fortran-mode f90-mode ada-mode
-    xml-mode sgml-mode web-mode
-    ts-mode
-    sclang-mode
-    verilog-mode
-    qml-mode)
-  "Major modes `auto-complete-mode' can run on."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-compatible-packages-regexp
-  "^ac-"
-  "Regexp to indicate what packages can work with auto-complete."
-  :type 'string
-  :group 'auto-complete)
-
-(defcustom ac-non-trigger-commands
-  '(*table--cell-self-insert-command
-    electric-buffer-list)
-  "Commands that can't be used as triggers of `auto-complete'."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-trigger-commands
-  '(self-insert-command)
-  "Trigger commands that specify whether `auto-complete' should start or not."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-trigger-commands-on-completing
-  '(delete-backward-char
-    backward-delete-char
-    backward-delete-char-untabify
-    ;; autopair
-    autopair-backspace
-    ;; paredit
-    paredit-backward-delete
-    paredit-backward-delete-word)
-  "Trigger commands that specify whether `auto-complete' should continue or not."
-  :type '(repeat symbol)
-  :group 'auto-complete)
-
-(defcustom ac-trigger-key nil
-  "Non-nil means `auto-complete' will start by typing this key.
-If you specify this TAB, for example, `auto-complete' will start by typing TAB,
-and if there is no completions, an original command will be fallbacked."
-  :type '(choice (const :tag "None" nil)
-                 (string :tag "Key"))
-  :group 'auto-complete
-  :set (lambda (symbol value)
-         (set-default symbol value)
-         (when (and value
-                    (fboundp 'ac-set-trigger-key))
-           (ac-set-trigger-key value))))
-
-(defcustom ac-auto-start 2
-  "Non-nil means completion will be started automatically.
-Positive integer means if a length of a word you entered is larger than the value,
-completion will be started automatically.
-If you specify `nil', never be started automatically."
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "Never" nil)
-                 (integer :tag "Require"))
-  :group 'auto-complete)
-
-(defcustom ac-stop-words nil
-  "List of string to stop completion."
-  :type '(repeat string)
-  :group 'auto-complete)
-(defvaralias 'ac-ignores 'ac-stop-words)
-
-(defcustom ac-use-dictionary-as-stop-words t
-  "Non-nil means a buffer related dictionary will be thought of as stop words."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-ignore-case 'smart
-  "Non-nil means auto-complete ignores case.
-If this value is `smart', auto-complete ignores case only when
-a prefix doesn't contain any upper case letters."
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "Smart" smart)
-                 (const :tag "No" nil))
-  :group 'auto-complete)
-
-(defcustom ac-dwim t
-  "Non-nil means `auto-complete' works based on Do What I Mean."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-use-menu-map nil
-  "Non-nil means a special keymap `ac-menu-map' on completing menu will be used."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-use-overriding-local-map nil
-  "Non-nil means `overriding-local-map' will be used to hack for overriding key events on auto-completion."
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-disable-inline nil
-  "Non-nil disable inline completion visibility"
-  :type 'boolean
-  :group 'auto-complete)
-
-(defcustom ac-candidate-menu-min 1
-  "Number of candidates required to display menu"
-  :type 'integer
-  :group 'auto-complete)
-
-(defcustom ac-max-width nil
-  "Maximum width for auto-complete menu to have"
-  :type '(choice (const :tag "No limit" nil)
-                 (const :tag "Character Limit" 25)
-                 (const :tag "Window Ratio Limit" 0.5))
-  :group 'auto-complete)
-
-(defface ac-completion-face
-  '((t (:foreground "darkgray" :underline t)))
-  "Face for inline completion"
-  :group 'auto-complete)
-
-(defface ac-candidate-face
-  '((t (:inherit popup-face)))
-  "Face for candidate."
-  :group 'auto-complete)
-
-(defface ac-candidate-mouse-face
-  '((t (:inherit popup-menu-mouse-face)))
-  "Mouse face for candidate."
-  :group 'auto-complete)
-
-(defface ac-selection-face
-  '((t (:inherit popup-menu-selection-face)))
-  "Face for selected candidate."
-  :group 'auto-complete)
-
-(defvar auto-complete-mode-hook nil
-  "Hook for `auto-complete-mode'.")
-
-
-
-;;;; Internal variables
-
-(defvar auto-complete-mode nil
-  "Dummy variable to suppress compiler warnings.")
-
-(defvar ac-cursor-color nil
-  "Old cursor color.")
-
-(defvar ac-inline nil
-  "Inline completion instance.")
-
-(defvar ac-menu nil
-  "Menu instance.")
-
-(defvar ac-show-menu nil
-  "Flag to show menu on timer tick.")
-
-(defvar ac-last-completion nil
-  "Cons of prefix marker and selected item of last completion.")
-
-(defvar ac-quick-help nil
-  "Quick help instance")
-
-(defvar ac-completing nil
-  "Non-nil means `auto-complete-mode' is now working on completion.")
-
-(defvar ac-buffer nil
-  "Buffer where auto-complete is started.")
-
-(defvar ac-point nil
-  "Start point of prefix.")
-
-(defvar ac-last-point nil
-  "Last point of updating pattern.")
-
-(defvar ac-prefix nil
-  "Prefix string.")
-(defvaralias 'ac-target 'ac-prefix)
-
-(defvar ac-selected-candidate nil
-  "Last selected candidate.")
-
-(defvar ac-common-part nil
-  "Common part string of meaningful candidates.
-If there is no common part, this will be nil.")
-
-(defvar ac-whole-common-part nil
-  "Common part string of whole candidates.
-If there is no common part, this will be nil.")
-
-(defvar ac-prefix-overlay nil
-  "Overlay for prefix string.")
-
-(defvar ac-timer nil
-  "Completion idle timer.")
-
-(defvar ac-show-menu-timer nil
-  "Show menu idle timer.")
-
-(defvar ac-quick-help-timer nil
-  "Quick help idle timer.")
-
-(defvar ac-triggered nil
-  "Flag to update.")
-
-(defvar ac-limit nil
-  "Limit number of candidates for each sources.")
-
-(defvar ac-candidates nil
-  "Current candidates.")
-
-(defvar ac-candidates-cache nil
-  "Candidates cache for individual sources.")
-
-(defvar ac-fuzzy-enable nil
-  "Non-nil means fuzzy matching is enabled.")
-
-(defvar ac-dwim-enable nil
-  "Non-nil means DWIM completion will be allowed.")
-
-(defvar ac-mode-map (make-sparse-keymap)
-  "Auto-complete mode map. It is also used for trigger key command. See also `ac-trigger-key'.")
-
-(defvar ac-completing-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\t" 'ac-expand)
-    (define-key map [tab] 'ac-expand)
-    (define-key map "\r" 'ac-complete)
-    (define-key map (kbd "M-TAB") 'auto-complete)
-
-    (define-key map "\M-n" 'ac-next)
-    (define-key map "\M-p" 'ac-previous)
-    (define-key map [down] 'ac-next)
-    (define-key map [up] 'ac-previous)
-
-    (define-key map [f1] 'ac-help)
-    (define-key map [M-f1] 'ac-persist-help)
-    (define-key map (kbd "C-?") 'ac-help)
-    (define-key map (kbd "C-M-?") 'ac-persist-help)
-
-    (define-key map [C-down] 'ac-quick-help-scroll-down)
-    (define-key map [C-up] 'ac-quick-help-scroll-up)
-    (define-key map "\C-\M-n" 'ac-quick-help-scroll-down)
-    (define-key map "\C-\M-p" 'ac-quick-help-scroll-up)
-
-    (dotimes (i 9)
-      (let ((symbol (intern (format "ac-complete-select-%d" (1+ i)))))
-        (fset symbol
-              `(lambda ()
-                 (interactive)
-                 (when (and (ac-menu-live-p) (popup-select ac-menu ,i))
-                   (ac-complete))))
-        (define-key map (read-kbd-macro (format "M-%s" (1+ i))) symbol)))
-
-    map)
-  "Keymap for completion.")
-(defvaralias 'ac-complete-mode-map 'ac-completing-map)
-
-(defvar ac-menu-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map ac-completing-map)
-    (define-key map (kbd "RET") 'ac-complete)
-    (define-key map "\C-n" 'ac-next)
-    (define-key map "\C-p" 'ac-previous)
-    (define-key map "\C-s" 'ac-isearch)
-    (define-key map [mouse-1] 'ac-mouse-1)
-    (define-key map [down-mouse-1] 'ac-ignore)
-    (define-key map [mouse-4] 'ac-mouse-4)
-    (define-key map [mouse-5] 'ac-mouse-5)
-    map)
-  "Keymap for completion on completing menu.")
-
-(defvar ac-current-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map ac-completing-map)
-    map))
-
-(defvar ac-match-function 'all-completions
-  "Default match function.")
-
-(defvar ac-prefix-definitions
-  '((symbol . ac-prefix-symbol)
-    (file . ac-prefix-file)
-    (valid-file . ac-prefix-valid-file)
-    (c-dot . ac-prefix-c-dot)
-    (c-dot-ref . ac-prefix-c-dot-ref)
-    (cc-member . ac-prefix-cc-member))
-  "Prefix definitions for common use.")
-
-(defvar ac-sources '(ac-source-words-in-same-mode-buffers)
-  "Sources for completion.")
-(make-variable-buffer-local 'ac-sources)
-
-(defvar ac-compiled-sources nil
-  "Compiled source of `ac-sources'.")
-
-(defvar ac-current-sources nil
-  "Current working sources. This is sublist of `ac-compiled-sources'.")
-
-(defvar ac-omni-completion-sources nil
-  "Do not use this anymore.")
-
-(defvar ac-current-prefix-def nil)
-
-(defvar ac-ignoring-prefix-def nil)
-
-
-
-;;;; Intelligent completion history
-
-(defvar ac-comphist nil
-  "Database of completion history.")
-
-(defsubst ac-comphist-make-tab ()
-  (make-hash-table :test 'equal))
-
-(defsubst ac-comphist-tab (db)
-  (nth 0 db))
-
-(defsubst ac-comphist-cache (db)
-  (nth 1 db))
-
-(defun ac-comphist-make (&optional tab)
-  (list (or tab (ac-comphist-make-tab)) (make-hash-table :test 'equal :weakness t)))
-
-(defun ac-comphist-get (db string &optional create)
-  (let* ((tab (ac-comphist-tab db))
-         (index (gethash string tab)))
-    (when (and create (null index))
-      (setq index (make-vector (length string) 0))
-      (puthash string index tab))
-    index))
-
-(defun ac-comphist-add (db string prefix)
-  (setq prefix (min prefix (1- (length string))))
-  (when (<= 0 prefix)
-    (setq string (substring-no-properties string))
-    (let ((stat (ac-comphist-get db string t)))
-      (cl-incf (aref stat prefix))
-      (remhash string (ac-comphist-cache db)))))
-
-(defun ac-comphist-score (db string prefix)
-  (setq prefix (min prefix (1- (length string))))
-  (if (<= 0 prefix)
-      (let ((cache (gethash string (ac-comphist-cache db))))
-        (or (and cache (aref cache prefix))
-            (let ((stat (ac-comphist-get db string))
-                  (score 0.0))
-              (when stat
-                (cl-loop for p from 0 below (length string)
-                      ;; sigmoid function
-                      with a = 5
-                      with b = (/ 700.0 a) ; bounds for avoiding range error in `exp'
-                      with d = (/ 6.0 a)
-                      for x = (max (- b) (min b (- d (abs (- prefix p)))))
-                      for r = (/ 1.0 (1+ (exp (* (- a) x))))
-                      do
-                      (cl-incf score (* (aref stat p) r))))
-              ;; Weight by distance
-              (cl-incf score (max 0.0 (- 0.3 (/ (- (length string) prefix) 100.0))))
-              (unless cache
-                (setq cache (make-vector (length string) nil))
-                (puthash string cache (ac-comphist-cache db)))
-              (aset cache prefix score)
-              score)))
-    0.0))
-
-(defun ac-comphist-sort (db collection prefix &optional threshold)
-  (let (result
-        (n 0)
-        (total 0)
-        (cur 0))
-    (setq result (mapcar (lambda (a)
-                           (when (and cur threshold)
-                             (if (>= cur (* total threshold))
-                                 (setq cur nil)
-                               (cl-incf n)
-                               (cl-incf cur (cdr a))))
-                           (car a))
-                         (sort (mapcar (lambda (string)
-                                         (let ((score (ac-comphist-score db string prefix)))
-                                           (cl-incf total score)
-                                           (cons string score)))
-                                       collection)
-                               (lambda (a b) (< (cdr b) (cdr a))))))
-    (if threshold
-        (cons n result)
-      result)))
-
-(defun ac-comphist-serialize (db)
-  (let (alist)
-    (maphash (lambda (k v)
-               (push (cons k v) alist))
-             (ac-comphist-tab db))
-    (list alist)))
-
-(defun ac-comphist-deserialize (sexp)
-  (condition-case nil
-      (ac-comphist-make (let ((tab (ac-comphist-make-tab)))
-                          (mapc (lambda (cons)
-                                  (puthash (car cons) (cdr cons) tab))
-                                (nth 0 sexp))
-                          tab))
-    (error (message "Invalid comphist db.") nil)))
-
-(defun ac-comphist-init ()
-  (ac-comphist-load)
-  (add-hook 'kill-emacs-hook 'ac-comphist-save))
-
-(defun ac-comphist-load ()
-  (interactive)
-  (let ((db (if (file-exists-p ac-comphist-file)
-                (ignore-errors
-                  (with-temp-buffer
-                    (insert-file-contents ac-comphist-file)
-                    (goto-char (point-min))
-                    (ac-comphist-deserialize (read (current-buffer))))))))
-    (setq ac-comphist (or db (ac-comphist-make)))))
-
-(defun ac-comphist-save ()
-  (interactive)
-  (require 'pp)
-  (ignore-errors
-    (with-temp-buffer
-      (pp (ac-comphist-serialize ac-comphist) (current-buffer))
-      (write-region (point-min) (point-max) ac-comphist-file))))
-
-
-
-;;;; Dictionary
-(defvar ac-buffer-dictionary nil)
-(defvar ac-file-dictionary (make-hash-table :test 'equal))
-
-(defun ac-clear-dictionary-cache ()
-  (interactive)
-  (dolist (buffer (buffer-list))
-    (with-current-buffer buffer
-      (if (local-variable-p 'ac-buffer-dictionary)
-          (kill-local-variable 'ac-buffer-dictionary))))
-  (clrhash ac-file-dictionary))
-
-(defun ac-file-dictionary (filename)
-  (let ((cache (gethash filename ac-file-dictionary 'none)))
-    (if (and cache (not (eq cache 'none)))
-        cache
-      (let (result)
-        (ignore-errors
-          (with-temp-buffer
-            (insert-file-contents filename)
-            (setq result (split-string (buffer-string) "\n" t))))
-        (puthash filename result ac-file-dictionary)
-        result))))
-
-(defun ac-mode-dictionary (mode)
-  (cl-loop for name in (cons (symbol-name mode)
-                          (ignore-errors (list (file-name-extension (buffer-file-name)))))
-        append (cl-loop for dir in ac-dictionary-directories
-                     for file = (concat dir "/" name)
-                     if (file-exists-p file)
-                     append (ac-file-dictionary file))))
-
-(defun ac-buffer-dictionary (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (if (local-variable-p 'ac-buffer-dictionary)
-        ac-buffer-dictionary
-      (make-local-variable 'ac-buffer-dictionary)
-      (setq ac-buffer-dictionary
-            (apply 'append
-                   ac-user-dictionary
-                   (ac-mode-dictionary major-mode)
-                   (mapcar 'ac-file-dictionary ac-dictionary-files))))))
-
-
-
-;;;; Auto completion internals
-
-(defun ac-menu-at-wrapper-line-p ()
-  "Return non-nil if current line is long and wrapped to next visual line."
-  (and (not truncate-lines)
-       (eq (line-beginning-position)
-           (save-excursion
-             (vertical-motion 1)
-             (line-beginning-position)))))
-
-(defun ac-stop-word-p (word)
-  (or (member word ac-stop-words)
-      (if ac-use-dictionary-as-stop-words
-          (member word (ac-buffer-dictionary)))))
-
-(defun ac-prefix-default ()
-  "Same as `ac-prefix-symbol' but ignore a number prefix."
-  (let ((start (ac-prefix-symbol)))
-    (when start
-      (cl-loop with end = (point)
-            for pos from start below end
-            for c = (char-after pos)
-            if (not (and (<= ?0 c) (<= c ?9)))
-            return start))))
-
-(defun ac-prefix-symbol ()
-  "Default prefix definition function."
-  (require 'thingatpt)
-  (car-safe (bounds-of-thing-at-point 'symbol)))
-
-(defun ac-prefix-file ()
-  "File prefix."
-  (let ((point (re-search-backward "[\"<>' \t\r\n]" nil t)))
-    (if point (1+ point))))
-
-(defsubst ac-windows-remote-file-p (file)
-  (and (memq system-type '(ms-dos windows-nt cygwin))
-       (string-match-p "\\`\\(?://\\|\\\\\\\\\\)" file)))
-
-(defun ac-prefix-valid-file ()
-  "Existed (or to be existed) file prefix."
-  (let* ((line-beg (line-beginning-position))
-         (end (point))
-         (start (or (let ((point (re-search-backward "[\"<>'= \t\r\n]" line-beg t)))
-                      (if point (1+ point)))
-                    line-beg))
-         (file (buffer-substring start end)))
-    (if (and file (or (string-match "^/" file)
-                      (and (setq file (and (string-match "^[^/]*/" file)
-                                           (match-string 0 file)))
-                           (file-directory-p file))))
-        (unless (ac-windows-remote-file-p file)
-          start))))
-
-(defun ac-prefix-c-dot ()
-  "C-like languages dot(.) prefix."
-  (if (re-search-backward "\\.\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
-      (match-beginning 1)))
-
-(defun ac-prefix-c-dot-ref ()
-  "C-like languages dot(.) and reference(->) prefix."
-  (if (re-search-backward "\\(?:\\.\\|->\\)\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
-      (match-beginning 1)))
-
-(defun ac-prefix-cc-member ()
-  "C-like languages member(.)(->)(::) prefix."
-  (when (re-search-backward "\\(?:\\.\\|->\\|::\\)\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
-    (match-beginning 1)))
-
-(defun ac-define-prefix (name prefix)
-  "Define new prefix definition.
-You can not use it in source definition like (prefix . `NAME')."
-  (push (cons name prefix) ac-prefix-definitions))
-
-(defun ac-match-substring (prefix candidates)
-  (cl-loop with regexp = (regexp-quote prefix)
-           for candidate in candidates
-           if (string-match regexp candidate)
-           collect candidate))
-
-(defsubst ac-source-entity (source)
-  (if (symbolp source)
-      (symbol-value source)
-    source))
-
-(defun ac-source-available-p (source)
-  (if (and (symbolp source)
-           (get source 'available))
-      (eq (get source 'available) t)
-    (let* ((src (ac-source-entity source))
-           (avail-pair (assq 'available src))
-           (avail-cond (cdr avail-pair))
-           (available (and (if avail-pair
-                               (cond
-                                ((symbolp avail-cond)
-                                 (funcall avail-cond))
-                                ((listp avail-cond)
-                                 (eval avail-cond)))
-                             t)
-                           (cl-loop for feature in (assoc-default 'depends src)
-                                    unless (require feature nil t) return nil
-                                    finally return t))))
-      (if (symbolp source)
-          (put source 'available (if available t 'no)))
-      available)))
-
-(defun ac-compile-sources (sources)
-  "Compiled `SOURCES' into expanded sources style."
-  (cl-loop for source in sources
-           if (ac-source-available-p source)
-           do
-           (setq source (ac-source-entity source))
-           ;; prefix
-           (let* ((prefix (assoc 'prefix source))
-                  (real (assoc-default (cdr prefix) ac-prefix-definitions)))
-             (cond
-              (real
-               (add-to-list 'source (cons 'prefix real)))
-              ((null prefix)
-               (add-to-list 'source (cons 'prefix 'ac-prefix-default)))))
-           ;; match
-           (let ((match (assq 'match source)))
-             (cond
-              ((eq (cdr match) 'substring)
-               (setcdr match 'ac-match-substring))))
-           and collect source))
-
-(defun ac-compiled-sources ()
-  (or ac-compiled-sources
-      (setq ac-compiled-sources
-            (ac-compile-sources ac-sources))))
-
-(defsubst ac-menu-live-p ()
-  (popup-live-p ac-menu))
-
-(defun ac-menu-create (point width height)
-  (setq ac-menu
-        (popup-create point width height
-                      :around t
-                      :face 'ac-candidate-face
-                      :max-width ac-max-width
-                      :mouse-face 'ac-candidate-mouse-face
-                      :selection-face 'ac-selection-face
-                      :symbol t
-                      :scroll-bar t
-                      :margin-left 1
-                      :keymap ac-menu-map
-                      )))
-
-(defun ac-menu-delete ()
-  (when ac-menu
-    (popup-delete ac-menu)
-    (setq ac-menu)))
-
-(defsubst ac-inline-overlay ()
-  (nth 0 ac-inline))
-
-(defsubst ac-inline-live-p ()
-  (and ac-inline (ac-inline-overlay) t))
-
-(defun ac-inline-show (point string)
-  (unless ac-inline
-    (setq ac-inline (list nil)))
-  (save-excursion
-    (let ((overlay (ac-inline-overlay))
-          (width 0)
-          (string-width (string-width string))
-          (length 0)
-          (original-string string))
-      ;; Calculate string space to show completion
-      (goto-char point)
-      (let (c)
-        (while (and (not (eolp))
-                    (< width string-width)
-                    (setq c (char-after))
-                    (not (eq c ?\t)))   ; special case for tab
-        (cl-incf width (char-width c))
-        (cl-incf length)
-        (forward-char)))
-
-      ;; Show completion
-      (goto-char point)
-      (cond
-       ((= width 0)
-        ;; End-of-line
-        ;; Do nothing
-        )
-       ((<= width string-width)
-        ;; No space to show
-        ;; Do nothing
-        )
-       ((> width string-width)
-        ;; Need to fill space
-        (setq string (concat string (make-string (- width string-width) ? )))))
-      (setq string (propertize string 'face 'ac-completion-face))
-      (if overlay
-          (progn
-            (move-overlay overlay point (+ point length))
-            (overlay-put overlay 'invisible nil))
-        (setq overlay (make-overlay point (+ point length)))
-        (setf (nth 0 ac-inline)  overlay)
-        (overlay-put overlay 'priority 9999)
-        ;; Help prefix-overlay in some cases
-        (overlay-put overlay 'keymap ac-current-map))
-      ;; TODO no width but char
-      (if (eq length 0)
-          ;; Case: End-of-line
-          (progn
-            (put-text-property 0 1 'cursor t string)
-            (overlay-put overlay 'after-string string))
-        (let ((display (substring string 0 1))
-              (after-string (substring string 1)))
-          (overlay-put overlay 'display display)
-          (overlay-put overlay 'after-string after-string)))
-      (overlay-put overlay 'string original-string))))
-
-(defun ac-inline-delete ()
-  (when (ac-inline-live-p)
-    (ac-inline-hide)
-    (delete-overlay (ac-inline-overlay))
-    (setq ac-inline nil)))
-
-(defun ac-inline-hide ()
-  (when (ac-inline-live-p)
-    (let ((overlay (ac-inline-overlay))
-          (buffer-undo-list t))
-      (when overlay
-        (move-overlay overlay (point-min) (point-min))
-        (overlay-put overlay 'invisible t)
-        (overlay-put overlay 'display nil)
-        (overlay-put overlay 'after-string nil)))))
-
-(defun ac-inline-update ()
-  (if (and ac-completing ac-prefix (stringp ac-common-part))
-      (let ((common-part-length (length ac-common-part))
-            (prefix-length (length ac-prefix)))
-        (if (> common-part-length prefix-length)
-            (progn
-              (ac-inline-hide)
-              (ac-inline-show (point) (substring ac-common-part prefix-length)))
-          (ac-inline-delete)))
-    (ac-inline-delete)))
-
-(defun ac-put-prefix-overlay ()
-  (unless ac-prefix-overlay
-    (let (newline)
-      ;; Insert newline to make sure that cursor always on the overlay
-      (when (eobp)
-        (popup-save-buffer-state
-          (insert "\n"))
-        (setq newline t))
-      (setq ac-prefix-overlay (make-overlay ac-point (1+ (point)) nil t t))
-      (overlay-put ac-prefix-overlay 'priority 9999)
-      (overlay-put ac-prefix-overlay 'keymap (make-sparse-keymap))
-      (overlay-put ac-prefix-overlay 'newline newline))))
-
-(defun ac-remove-prefix-overlay ()
-  (when ac-prefix-overlay
-    (when (overlay-get ac-prefix-overlay 'newline)
-      ;; Remove inserted newline
-      (popup-save-buffer-state
-        (goto-char (point-max))
-        (if (eq (char-before) ?\n)
-            (delete-char -1))))
-    (delete-overlay ac-prefix-overlay)))
-
-(defun ac-activate-completing-map ()
-  (if (and ac-show-menu ac-use-menu-map)
-      (set-keymap-parent ac-current-map ac-menu-map))
-  (when (and ac-use-overriding-local-map
-             (null overriding-terminal-local-map))
-    (setq overriding-terminal-local-map ac-current-map))
-  (when ac-prefix-overlay
-    (set-keymap-parent (overlay-get ac-prefix-overlay 'keymap) ac-current-map)))
-
-(defun ac-deactivate-completing-map ()
-  (set-keymap-parent ac-current-map ac-completing-map)
-  (when (and ac-use-overriding-local-map
-             (eq overriding-terminal-local-map ac-current-map))
-    (setq overriding-terminal-local-map nil))
-  (when ac-prefix-overlay
-    (set-keymap-parent (overlay-get ac-prefix-overlay 'keymap) nil)))
-
-(defsubst ac-selected-candidate ()
-  (if ac-menu
-      (popup-selected-item ac-menu)))
-
-(defun ac-prefix (requires ignore-list)
-  (cl-loop with current = (point)
-           with point
-           with point-def
-           with prefix-def
-           with sources
-           for source in (ac-compiled-sources)
-           for prefix = (assoc-default 'prefix source)
-           for req = (or (assoc-default 'requires source) requires 1)
-
-           do
-           (unless (member prefix ignore-list)
-             (save-excursion
-               (setq point (cond
-                            ((symbolp prefix)
-                             (funcall prefix))
-                            ((stringp prefix)
-                             (and (re-search-backward (concat prefix "\\=") nil t)
-                                  (or (match-beginning 1) (match-beginning 0))))
-                            ((stringp (car-safe prefix))
-                             (let ((regexp (nth 0 prefix))
-                                   (end (nth 1 prefix))
-                                   (group (nth 2 prefix)))
-                               (and (re-search-backward (concat regexp "\\=") nil t)
-                                    (funcall (if end 'match-end 'match-beginning)
-                                             (or group 0)))))
-                            (t
-                             (eval prefix))))
-               (if (and point
-                        (integerp req)
-                        (< (- current point) req))
-                   (setq point nil))
-               (when point
-                 (if (null prefix-def)
-                     (setq prefix-def prefix
-                           point-def point))
-                 (if (equal point point-def)
-                     (push source sources)))))
-
-           finally return
-           (and point-def (list prefix-def point-def (nreverse sources)))))
-
-(defun ac-init ()
-  "Initialize current sources to start completion."
-  (setq ac-candidates-cache nil)
-  (cl-loop for source in ac-current-sources
-           for function = (assoc-default 'init source)
-           if function do
-           (save-excursion
-             (cond
-              ((functionp function)
-               (funcall function))
-              (t
-               (eval function))))))
-
-(defun ac-candidates-1 (source)
-  (let* ((do-cache (assq 'cache source))
-         (function (assoc-default 'candidates source))
-         (action (assoc-default 'action source))
-         (document (assoc-default 'document source))
-         (symbol (assoc-default 'symbol source))
-         (ac-limit (or (assoc-default 'limit source) ac-limit))
-         (face (or (assoc-default 'face source) (assoc-default 'candidate-face source)))
-         (selection-face (assoc-default 'selection-face source))
-         (cache (and do-cache (assq source ac-candidates-cache)))
-         (candidates (cdr cache)))
-    (unless cache
-      (setq candidates (save-excursion
-                         (cond
-                          ((functionp function)
-                           (funcall function))
-                          (t
-                           (eval function)))))
-      ;; Convert (name value) format candidates into name with text properties.
-      (setq candidates (mapcar (lambda (candidate)
-                                 (if (consp candidate)
-                                     (propertize (car candidate) 'value (cdr candidate))
-                                   candidate))
-                               candidates))
-      (when do-cache
-        (push (cons source candidates) ac-candidates-cache)))
-    (setq candidates (funcall (or (assoc-default 'match source)
-                                  ac-match-function)
-                              ac-prefix candidates))
-    ;; Remove extra items regarding to ac-limit
-    (if (and (integerp ac-limit) (> ac-limit 1) (> (length candidates) ac-limit))
-        (setcdr (nthcdr (1- ac-limit) candidates) nil))
-    ;; Put candidate properties
-    (setq candidates (mapcar (lambda (candidate)
-                               (popup-item-propertize candidate
-                                                      'action action
-                                                      'symbol symbol
-                                                      'document document
-                                                      'popup-face face
-                                                      'selection-face selection-face))
-                             candidates))
-    candidates))
-
-(defun ac-delete-duplicated-candidates (candidates)
-  (cl-delete-duplicates
-   candidates
-   :test (lambda (x y)
-           ;; We assume two candidates are same if their titles are
-           ;; equal and their actions are equal.
-           (and (equal x y)
-                (eq (popup-item-property x 'action)
-                    (popup-item-property y 'action))))
-   :from-end t))
-
-(defun ac-reduce-candidates (candidates)
-  ;; Call `ac-delete-duplicated-candidates' on first portion of
-  ;; candidate list for speed.
-  (let ((size 20))
-    (if (< (length candidates) size)
-        (ac-delete-duplicated-candidates candidates)
-      (cl-loop for c on candidates by 'cdr
-               repeat (1- size)
-               finally return
-               (let ((rest (cdr c)))
-                 (setcdr c nil)
-                 (append (ac-delete-duplicated-candidates candidates) (copy-sequence rest)))))))
-
-(defun ac-candidates ()
-  "Produce candidates for current sources."
-  (cl-loop with completion-ignore-case = (or (eq ac-ignore-case t)
-                                             (and (eq ac-ignore-case 'smart)
-                                                  (let ((case-fold-search nil)) (not (string-match "[[:upper:]]" ac-prefix)))))
-           with case-fold-search = completion-ignore-case
-           with prefix-len = (length ac-prefix)
-           for source in ac-current-sources
-           append (ac-candidates-1 source) into candidates
-           finally return
-           (progn
-             (if (and ac-use-comphist ac-comphist)
-                 (if ac-show-menu
-                     (let* ((pair (ac-comphist-sort ac-comphist candidates prefix-len ac-comphist-threshold))
-                            (n (car pair))
-                            (result (ac-reduce-candidates (cdr pair)))
-                            (cons (if (> n 0) (nthcdr (1- n) result)))
-                            (cdr (cdr cons)))
-                       ;; XXX ugly
-                       (if cons (setcdr cons nil))
-                       (setq ac-common-part (try-completion ac-prefix result))
-                       (setq ac-whole-common-part (try-completion ac-prefix candidates))
-                       (if cons (setcdr cons cdr))
-                       result)
-                   (setq candidates (ac-comphist-sort ac-comphist candidates prefix-len))
-                   (setq ac-common-part (if candidates (popup-x-to-string (car candidates))))
-                   (setq ac-whole-common-part (try-completion ac-prefix candidates))
-                   candidates)
-               (when ac-show-menu
-                 (setq candidates (ac-reduce-candidates candidates)))
-               (setq ac-common-part (try-completion ac-prefix candidates))
-               (setq ac-whole-common-part ac-common-part)
-               candidates))))
-
-(defun ac-update-candidates (cursor scroll-top)
-  "Update candidates of menu to `ac-candidates' and redraw it."
-  (setf (popup-cursor ac-menu) cursor
-        (popup-scroll-top ac-menu) scroll-top)
-  (setq ac-dwim-enable (= (length ac-candidates) 1))
-  (if ac-candidates
-      (progn
-        (setq ac-completing t)
-        (ac-activate-completing-map))
-    (setq ac-completing nil)
-    (ac-deactivate-completing-map))
-  (unless ac-disable-inline
-    (ac-inline-update))
-  (popup-set-list ac-menu ac-candidates)
-  (if (and (not ac-fuzzy-enable)
-           (<= (length ac-candidates) ac-candidate-menu-min))
-      (popup-hide ac-menu)
-    (if ac-show-menu
-        (popup-draw ac-menu))))
-
-(defun ac-reposition ()
-  "Force to redraw candidate menu with current `ac-candidates'."
-  (let ((cursor (popup-cursor ac-menu))
-        (scroll-top (popup-scroll-top ac-menu))
-        (height (popup-height ac-menu)))
-    (ac-menu-delete)
-    (ac-menu-create ac-point (popup-preferred-width ac-candidates) height)
-    (ac-update-candidates cursor scroll-top)))
-
-(defun ac-cleanup ()
-  "Cleanup auto completion."
-  (if ac-cursor-color
-      (set-cursor-color ac-cursor-color))
-  (when (and ac-use-comphist ac-comphist)
-    (when (and (null ac-selected-candidate)
-               (member ac-prefix ac-candidates))
-      ;; Assume candidate is selected by just typing
-      (setq ac-selected-candidate ac-prefix)
-      (setq ac-last-point ac-point))
-    (when ac-selected-candidate
-      (ac-comphist-add ac-comphist
-                       ac-selected-candidate
-                       (if ac-last-point
-                           (- ac-last-point ac-point)
-                         (length ac-prefix)))))
-  (ac-deactivate-completing-map)
-  (ac-remove-prefix-overlay)
-  (ac-remove-quick-help)
-  (ac-inline-delete)
-  (ac-menu-delete)
-  (ac-cancel-timer)
-  (ac-cancel-show-menu-timer)
-  (ac-cancel-quick-help-timer)
-  (setq ac-cursor-color nil
-        ac-inline nil
-        ac-show-menu nil
-        ac-menu nil
-        ac-completing nil
-        ac-point nil
-        ac-last-point nil
-        ac-prefix nil
-        ac-prefix-overlay nil
-        ac-selected-candidate nil
-        ac-common-part nil
-        ac-whole-common-part nil
-        ac-triggered nil
-        ac-limit nil
-        ac-candidates nil
-        ac-candidates-cache nil
-        ac-fuzzy-enable nil
-        ac-dwim-enable nil
-        ac-compiled-sources nil
-        ac-current-sources nil
-        ac-current-prefix-def nil
-        ac-ignoring-prefix-def nil))
-
-(defsubst ac-abort ()
-  "Abort completion."
-  (ac-cleanup))
-
-(defun ac-extend-region-to-delete (string)
-  "Determine the boundary of the region to delete before
-inserting the completed string. This will be either the position
-of current point, or the end of the symbol at point, if the text
-from point to end of symbol is the right part of the completed
-string."
-  (let* ((end-of-symbol (or (cdr-safe (bounds-of-thing-at-point 'symbol))
-                            (point)))
-         (remaindar (buffer-substring-no-properties (point) end-of-symbol))
-         (remaindar-length (length remaindar)))
-    (if (and (>= (length string) remaindar-length)
-             (string= (substring-no-properties string (- remaindar-length))
-                      remaindar))
-        end-of-symbol
-      (point))))
-
-(defun ac-expand-string (string &optional remove-undo-boundary)
-  "Expand `STRING' into the buffer and update `ac-prefix' to `STRING'.
-This function records deletion and insertion sequences by `undo-boundary'.
-If `remove-undo-boundary' is non-nil, this function also removes `undo-boundary'
-that have been made before in this function.  When `buffer-undo-list' is
-`t', `remove-undo-boundary' has no effect."
-  (when (eq buffer-undo-list t)
-    (setq remove-undo-boundary nil))
-  (when (not (equal string (buffer-substring ac-point (point))))
-    (undo-boundary)
-    ;; We can't use primitive-undo since it undoes by
-    ;; groups, divided by boundaries.
-    ;; We don't want boundary between deletion and insertion.
-    ;; So do it manually.
-    ;; Delete region silently for undo:
-    (if remove-undo-boundary
-        (progn
-          (let (buffer-undo-list)
-            (save-excursion
-              (delete-region ac-point (ac-extend-region-to-delete string))))
-          (setq buffer-undo-list
-                (nthcdr 2 buffer-undo-list)))
-      (delete-region ac-point (ac-extend-region-to-delete string)))
-    (insert (substring-no-properties string))
-    ;; Sometimes, possible when omni-completion used, (insert) added
-    ;; to buffer-undo-list strange record about position changes.
-    ;; Delete it here:
-    (when (and remove-undo-boundary
-               (integerp (cadr buffer-undo-list)))
-      (setcdr buffer-undo-list (nthcdr 2 buffer-undo-list)))
-    (undo-boundary)
-    (setq ac-selected-candidate string)
-    (setq ac-prefix string)))
-
-(defun ac-set-trigger-key (key)
-  "Set `ac-trigger-key' to `KEY'. It is recommemded to use this function instead of calling `setq'."
-  ;; Remove old mapping
-  (when ac-trigger-key
-    (define-key ac-mode-map (read-kbd-macro ac-trigger-key) nil))
-
-  ;; Make new mapping
-  (setq ac-trigger-key key)
-  (when key
-    (define-key ac-mode-map (read-kbd-macro key) 'ac-trigger-key-command)))
-
-(defun ac-set-timer ()
-  (unless ac-timer
-    (setq ac-timer (run-with-idle-timer ac-delay ac-delay 'ac-update-greedy))))
-
-(defun ac-cancel-timer ()
-  (when (timerp ac-timer)
-    (cancel-timer ac-timer)
-    (setq ac-timer nil)))
-
-(defun ac-update (&optional force)
-  (when (and auto-complete-mode
-             ac-prefix
-             (or ac-triggered
-                 force)
-             (not isearch-mode))
-    (ac-put-prefix-overlay)
-    (setq ac-candidates (ac-candidates))
-    (let ((preferred-width (popup-preferred-width ac-candidates)))
-      ;; Reposition if needed
-      (when (or (null ac-menu)
-                (>= (popup-width ac-menu) preferred-width)
-                (<= (popup-width ac-menu) (- preferred-width 10))
-                (and (> (popup-direction ac-menu) 0)
-                     (ac-menu-at-wrapper-line-p)))
-        (ac-inline-hide) ; Hide overlay to calculate correct column
-        (ac-remove-quick-help)
-        (ac-menu-delete)
-        (ac-menu-create ac-point preferred-width ac-menu-height)))
-    (ac-update-candidates 0 0)
-    t))
-
-(defun ac-update-greedy (&optional force)
-  (let (result)
-    (while (when (and (setq result (ac-update force))
-                      (null ac-candidates))
-             (add-to-list 'ac-ignoring-prefix-def ac-current-prefix-def)
-             (ac-start :force-init t)
-             ac-current-prefix-def))
-    result))
-
-(defun ac-set-show-menu-timer ()
-  (when (and (or (integerp ac-auto-show-menu) (floatp ac-auto-show-menu))
-             (null ac-show-menu-timer))
-    (setq ac-show-menu-timer (run-with-idle-timer ac-auto-show-menu ac-auto-show-menu 'ac-show-menu))))
-
-(defun ac-cancel-show-menu-timer ()
-  (when (timerp ac-show-menu-timer)
-    (cancel-timer ac-show-menu-timer)
-    (setq ac-show-menu-timer nil)))
-
-(defun ac-show-menu ()
-  (when (not (eq ac-show-menu t))
-    (setq ac-show-menu t)
-    (ac-inline-hide)
-    (ac-remove-quick-help)
-    (ac-update t)))
-
-(defun ac-help (&optional persist)
-  (interactive "P")
-  (when ac-menu
-    (popup-menu-show-help ac-menu persist)))
-
-(defun ac-persist-help ()
-  (interactive)
-  (ac-help t))
-
-(defun ac-last-help (&optional persist)
-  (interactive "P")
-  (when ac-last-completion
-    (popup-item-show-help (cdr ac-last-completion) persist)))
-
-(defun ac-last-persist-help ()
-  (interactive)
-  (ac-last-help t))
-
-(defun ac-set-quick-help-timer ()
-  (when (and ac-use-quick-help
-             (null ac-quick-help-timer))
-    (setq ac-quick-help-timer (run-with-idle-timer ac-quick-help-delay ac-quick-help-delay 'ac-quick-help))))
-
-(defun ac-cancel-quick-help-timer ()
-  (when (timerp ac-quick-help-timer)
-    (cancel-timer ac-quick-help-timer)
-    (setq ac-quick-help-timer nil)))
-
-(defun ac-pos-tip-show-quick-help (menu &optional item &rest args)
-  (let* ((point (plist-get args :point))
-         (around nil)
-         (parent-offset (popup-offset menu))
-         (doc (popup-menu-documentation menu item)))
-    (when (stringp doc)
-      (if (popup-hidden-p menu)
-          (setq around t)
-        (setq point nil))
-      (with-no-warnings
-        (pos-tip-show doc
-                      'popup-tip-face
-                      (or point
-                          (and menu
-                               (popup-child-point menu parent-offset))
-                          (point))
-                      nil 300
-                      popup-tip-max-width
-                      nil nil
-                      (and (not around) 0))
-        (unless (plist-get args :nowait)
-          (clear-this-command-keys)
-          (unwind-protect
-              (push (read-event (plist-get args :prompt)) unread-command-events)
-            (pos-tip-hide))
-          t)))))
-
-(defun ac-quick-help-use-pos-tip-p ()
-  (and ac-quick-help-prefer-pos-tip
-       window-system
-       (featurep 'pos-tip)))
-
-(defun ac-quick-help (&optional force)
-  (interactive)
-  ;; TODO don't use FORCE
-  (when (and (or force
-                 (with-no-warnings
-                   ;; called-interactively-p can take no args
-                   (called-interactively-p))
-                 ;; ac-isearch'ing
-                 (null this-command))
-             (ac-menu-live-p)
-             (null ac-quick-help))
-      (setq ac-quick-help
-            (funcall (if (ac-quick-help-use-pos-tip-p)
-                         'ac-pos-tip-show-quick-help
-                       'popup-menu-show-quick-help)
-                     ac-menu nil
-                     :point ac-point
-                     :height ac-quick-help-height
-                     :nowait t))))
-
-(defun ac-remove-quick-help ()
-  (when (ac-quick-help-use-pos-tip-p)
-    (with-no-warnings
-      (pos-tip-hide)))
-  (when ac-quick-help
-    (popup-delete ac-quick-help)
-    (setq ac-quick-help nil)))
-
-(defun ac-last-quick-help ()
-  (interactive)
-  (when (and ac-last-completion
-             (eq (marker-buffer (car ac-last-completion))
-                 (current-buffer)))
-    (let ((doc (popup-item-documentation (cdr ac-last-completion)))
-          (point (marker-position (car ac-last-completion))))
-      (when (stringp doc)
-        (if (ac-quick-help-use-pos-tip-p)
-            (with-no-warnings (pos-tip-show doc nil point nil 300))
-          (popup-tip doc
-                     :point point
-                     :around t
-                     :scroll-bar t
-                     :margin t))))))
-
-(defmacro ac-define-quick-help-command (name arglist &rest body)
-  (declare (indent 2))
-  `(progn
-     (defun ,name ,arglist ,@body)
-     (put ',name 'ac-quick-help-command t)))
-
-(ac-define-quick-help-command ac-quick-help-scroll-down ()
-  (interactive)
-  (when ac-quick-help
-    (popup-scroll-down ac-quick-help)))
-
-(ac-define-quick-help-command ac-quick-help-scroll-up ()
-  (interactive)
-  (when ac-quick-help
-    (popup-scroll-up ac-quick-help)))
-
-
-
-;;;; Auto completion isearch
-
-(defun ac-isearch-callback (list)
-  (setq ac-dwim-enable (eq (length list) 1)))
-
-(defun ac-isearch ()
-  (interactive)
-  (when (ac-menu-live-p)
-    (ac-cancel-show-menu-timer)
-    (ac-show-menu)
-    (if ac-use-quick-help
-        (let ((popup-menu-show-quick-help-function
-               (if (ac-quick-help-use-pos-tip-p)
-                   'ac-pos-tip-show-quick-help
-                 'popup-menu-show-quick-help)))
-          (popup-isearch ac-menu
-                         :callback 'ac-isearch-callback
-                         :help-delay ac-quick-help-delay))
-      (popup-isearch ac-menu :callback 'ac-isearch-callback))))
-
-
-
-;;;; Auto completion commands
-
-(cl-defun auto-complete-1 (&key sources (triggered 'command))
-  (let ((menu-live (ac-menu-live-p))
-        (inline-live (ac-inline-live-p))
-        started)
-    (ac-abort)
-    (let ((ac-sources (or sources ac-sources)))
-      (if (or ac-show-menu-immediately-on-auto-complete
-              inline-live)
-          (setq ac-show-menu t))
-      (setq started (ac-start :triggered triggered)))
-    (when (ac-update-greedy t)
-      ;; TODO Not to cause inline completion to be disrupted.
-      (if (ac-inline-live-p)
-          (ac-inline-hide))
-      ;; Not to expand when it is first time to complete
-      (when (and (or (and (not ac-expand-on-auto-complete)
-                          (> (length ac-candidates) 1)
-                          (not menu-live))
-                     (not (let ((ac-common-part ac-whole-common-part))
-                            (ac-expand-common))))
-                 ac-use-fuzzy
-                 (null ac-candidates))
-        (ac-fuzzy-complete)))
-    started))
-
-;;;###autoload
-(defun auto-complete (&optional sources)
-  "Start auto-completion at current point."
-  (interactive)
-  (auto-complete-1 :sources sources))
-
-(defun ac-fuzzy-complete ()
-  "Start fuzzy completion at current point."
-  (interactive)
-  (if (not (require 'fuzzy nil t))
-      (message "Please install fuzzy.el if you use fuzzy completion")
-    (unless (ac-menu-live-p)
-      (ac-start))
-    (let ((ac-match-function 'fuzzy-all-completions))
-      (when ac-fuzzy-cursor-color
-        (unless ac-cursor-color
-          (setq ac-cursor-color (frame-parameter (selected-frame) 'cursor-color)))
-        (set-cursor-color ac-fuzzy-cursor-color))
-      (setq ac-show-menu t)
-      (setq ac-fuzzy-enable t)
-      (setq ac-triggered nil)
-      (ac-update t)))
-  t)
-
-(defun ac-next ()
-  "Select next candidate."
-  (interactive)
-  (when (ac-menu-live-p)
-    (when (popup-hidden-p ac-menu)
-      (ac-show-menu))
-    (popup-next ac-menu)
-    (if (eq this-command 'ac-next)
-        (setq ac-dwim-enable t))))
-
-(defun ac-previous ()
-  "Select previous candidate."
-  (interactive)
-  (when (ac-menu-live-p)
-    (when (popup-hidden-p ac-menu)
-      (ac-show-menu))
-    (popup-previous ac-menu)
-    (if (eq this-command 'ac-previous)
-        (setq ac-dwim-enable t))))
-
-(defun ac-expand (arg)
-  "Try expand, and if expanded twice, select next candidate.
-If given a prefix argument, select the previous candidate."
-  (interactive "P")
-  (unless (ac-expand-common)
-    (let ((string (ac-selected-candidate)))
-      (when string
-        (when (equal ac-prefix string)
-          (if (not arg)
-              (ac-next)
-            (ac-previous))
-          (setq string (ac-selected-candidate)))
-        (ac-expand-string string
-                          (or (eq last-command 'ac-expand)
-                             (eq last-command 'ac-expand-previous)))
-        ;; Do reposition if menu at long line
-        (if (and (> (popup-direction ac-menu) 0)
-               (ac-menu-at-wrapper-line-p))
-            (ac-reposition))
-        (setq ac-show-menu t)
-        string))))
-
-(defun ac-expand-previous (arg)
-  "Like `ac-expand', but select previous candidate."
-  (interactive "P")
-  (ac-expand (not arg)))
-
-(defun ac-expand-common ()
-  "Try to expand meaningful common part."
-  (interactive)
-  (if (and ac-dwim ac-dwim-enable)
-      (ac-complete)
-    (when (and (ac-inline-live-p)
-               ac-common-part)
-      (ac-inline-hide)
-      (ac-expand-string ac-common-part (eq last-command this-command))
-      (setq ac-common-part nil)
-      t)))
-
-(defun ac-complete-1 (candidate)
-  (let ((action (popup-item-property candidate 'action))
-        (fallback nil))
-    (when candidate
-      (unless (ac-expand-string candidate)
-        (setq fallback t))
-      ;; Remember to show help later
-      (when (and ac-point candidate)
-        (unless ac-last-completion
-          (setq ac-last-completion (cons (make-marker) nil)))
-        (set-marker (car ac-last-completion) ac-point ac-buffer)
-        (setcdr ac-last-completion candidate)))
-    (ac-abort)
-    (cond
-     (action
-      (funcall action))
-     (fallback
-      (ac-fallback-command)))
-    candidate))
-
-(defun ac-complete ()
-  "Try complete."
-  (interactive)
-  (ac-complete-1 (ac-selected-candidate)))
-
-(cl-defun ac-start (&key
-                    requires
-                    force-init
-                    (triggered (or ac-triggered t)))
-  "Start completion."
-  (interactive)
-  (if (not auto-complete-mode)
-      (message "auto-complete-mode is not enabled")
-    (let* ((info (ac-prefix requires ac-ignoring-prefix-def))
-           (prefix-def (nth 0 info))
-           (point (nth 1 info))
-           (sources (nth 2 info))
-           prefix
-           (init (or force-init (not (eq ac-point point)))))
-      (if (or (null point)
-              (progn
-                (setq prefix (buffer-substring-no-properties point (point)))
-                (and (not (eq triggered 'command))
-                     (ac-stop-word-p prefix))))
-          (prog1 nil
-            (ac-abort))
-        (when (and ac-use-fuzzy ac-fuzzy-cursor-color)
-          (unless ac-cursor-color
-            (setq ac-cursor-color (frame-parameter (selected-frame) 'cursor-color))))
-        (setq ac-show-menu (or ac-show-menu (if (eq ac-auto-show-menu t) t))
-              ac-current-sources sources
-              ac-buffer (current-buffer)
-              ac-point point
-              ac-prefix prefix
-              ac-limit ac-candidate-limit
-              ac-triggered triggered
-              ac-current-prefix-def prefix-def)
-        (when (or init (null ac-prefix-overlay))
-          (ac-init))
-        (ac-set-timer)
-        (ac-set-show-menu-timer)
-        (ac-set-quick-help-timer)
-        (ac-put-prefix-overlay)
-        t))))
-
-(defun ac-stop ()
-  "Stop completiong."
-  (interactive)
-  (setq ac-selected-candidate nil)
-  (ac-abort))
-
-(defun ac-ignore (&rest ignore)
-  "Same as `ignore'."
-  (interactive))
-
-(defun ac-mouse-1 (event)
-  (interactive "e")
-  (popup-awhen (popup-menu-item-of-mouse-event event)
-    (ac-complete-1 it)))
-
-(defun ac-mouse-4 (event)
-  (interactive "e")
-  (ac-previous))
-
-(defun ac-mouse-5 (event)
-  (interactive "e")
-  (ac-next))
-
-(defun ac-trigger-key-command (&optional force)
-  (interactive "P")
-  (let (started)
-    (when (or force (ac-trigger-command-p last-command))
-      (setq started (auto-complete-1 :triggered 'trigger-key)))
-    (unless started
-      (ac-fallback-command 'ac-trigger-key-command))))
-
-
-
-;;;; Basic cache facility
-
-(defvar ac-clear-variables-every-minute-timer nil)
-(defvar ac-clear-variables-after-save nil)
-(defvar ac-clear-variables-every-minute nil)
-(defvar ac-minutes-counter 0)
-
-(defun ac-clear-variable-after-save (variable &optional pred)
-  (add-to-list 'ac-clear-variables-after-save (cons variable pred)))
-
-(defun ac-clear-variables-after-save ()
-  (dolist (pair ac-clear-variables-after-save)
-    (if (or (null (cdr pair))
-            (funcall (cdr pair)))
-        (set (car pair) nil))))
-
-(defun ac-clear-variable-every-minutes (variable minutes)
-  (add-to-list 'ac-clear-variables-every-minute (cons variable minutes)))
-
-(defun ac-clear-variable-every-minute (variable)
-  (ac-clear-variable-every-minutes variable 1))
-
-(defun ac-clear-variable-every-10-minutes (variable)
-  (ac-clear-variable-every-minutes variable 10))
-
-(defun ac-clear-variables-every-minute ()
-  (cl-incf ac-minutes-counter)
-  (dolist (pair ac-clear-variables-every-minute)
-    (if (eq (% ac-minutes-counter (cdr pair)) 0)
-        (set (car pair) nil))))
-
-
-
-;;;; Auto complete mode
-
-(defun ac-cursor-on-diable-face-p (&optional point)
-  (memq (get-text-property (or point (point)) 'face) ac-disable-faces))
-
-(defun ac-trigger-command-p (command)
-  "Return non-nil if `COMMAND' is a trigger command."
-  (and (symbolp command)
-       (not (memq command ac-non-trigger-commands))
-       (or (memq command ac-trigger-commands)
-           (string-match "self-insert-command" (symbol-name command))
-           (string-match "electric" (symbol-name command)))))
-
-(defun ac-fallback-key-sequence ()
-  (setq unread-command-events
-        (append (this-single-command-raw-keys)
-                unread-command-events))
-  (read-key-sequence-vector ""))
-
-(defun ac-fallback-command (&optional except-command)
-  (let* ((auto-complete-mode nil)
-         (keys (ac-fallback-key-sequence))
-         (command (and keys (key-binding keys))))
-    (when (and (commandp command)
-               (not (eq command except-command)))
-      (setq this-command command)
-      (call-interactively command))))
-
-(defun ac-compatible-package-command-p (command)
-  "Return non-nil if `COMMAND' is compatible with auto-complete."
-  (and (symbolp command)
-       (string-match ac-compatible-packages-regexp (symbol-name command))))
-
-(defun ac-handle-pre-command ()
-  (condition-case var
-      (if (or (setq ac-triggered (and (not ac-fuzzy-enable) ; ignore key storkes in fuzzy mode
-                                      (or (eq this-command 'auto-complete) ; special case
-                                          (ac-trigger-command-p this-command)
-                                          (and ac-completing
-                                               (memq this-command ac-trigger-commands-on-completing)))
-                                      (not (ac-cursor-on-diable-face-p))
-                                      (or ac-triggered t)))
-              (ac-compatible-package-command-p this-command))
-          (progn
-            (if (or (not (symbolp this-command))
-                    (not (get this-command 'ac-quick-help-command)))
-                (ac-remove-quick-help))
-            ;; Not to cause inline completion to be disrupted.
-            (ac-inline-hide))
-        (ac-abort))
-    (error (ac-error var))))
-
-(defun ac-handle-post-command ()
-  (condition-case var
-      (when (and ac-triggered
-                 (or ac-auto-start
-                     ac-completing)
-                 (not isearch-mode))
-        (setq ac-last-point (point))
-        (ac-start :requires (unless ac-completing ac-auto-start))
-        (unless ac-disable-inline
-          (ac-inline-update)))
-    (error (ac-error var))))
-
-(defvar ac-flycheck-poll-completion-end-timer nil
-  "Timer to poll end of completion.")
-
-(defun ac-syntax-checker-workaround ()
-  (if ac-stop-flymake-on-completing
-      (progn
-        (make-local-variable 'ac-flycheck-poll-completion-end-timer)
-        (when (require 'flymake nil t)
-          (defadvice flymake-on-timer-event (around ac-flymake-stop-advice activate)
-            (unless ac-completing
-              ad-do-it)))
-        (when (require 'flycheck nil t)
-          (defadvice flycheck-handle-idle-change (around ac-flycheck-stop-advice activate)
-            (if ac-completing
-                (setq ac-flycheck-poll-completion-end-timer
-                      (run-at-time ac-flycheck-poll-completion-end-interval
-                                   nil
-                                   #'flycheck-handle-idle-change))
-              ad-do-it))))
-    (when (featurep 'flymake)
-      (ad-disable-advice 'flymake-on-timer-event 'around 'ac-flymake-stop-advice))
-    (when (featurep 'flycheck)
-      (ad-disable-advice 'flycheck-handle-idle-change 'around 'ac-flycheck-stop-advice))))
-
-(defun ac-setup ()
-  (if ac-trigger-key
-      (ac-set-trigger-key ac-trigger-key))
-  (if ac-use-comphist
-      (ac-comphist-init))
-  (unless ac-clear-variables-every-minute-timer
-    (setq ac-clear-variables-every-minute-timer (run-with-timer 60 60 'ac-clear-variables-every-minute)))
-  (ac-syntax-checker-workaround))
-
-;;;###autoload
-(define-minor-mode auto-complete-mode
-  "AutoComplete mode"
-  :lighter " AC"
-  :keymap ac-mode-map
-  :group 'auto-complete
-  (if auto-complete-mode
-      (progn
-        (ac-setup)
-        (add-hook 'pre-command-hook 'ac-handle-pre-command nil t)
-        (add-hook 'post-command-hook 'ac-handle-post-command nil t)
-        (add-hook 'after-save-hook 'ac-clear-variables-after-save nil t)
-        (run-hooks 'auto-complete-mode-hook))
-    (remove-hook 'pre-command-hook 'ac-handle-pre-command t)
-    (remove-hook 'post-command-hook 'ac-handle-post-command t)
-    (remove-hook 'after-save-hook 'ac-clear-variables-after-save t)
-    (ac-abort)))
-
-(defun auto-complete-mode-maybe ()
-  "What buffer `auto-complete-mode' prefers."
-  (if (and (not (minibufferp (current-buffer)))
-           (memq major-mode ac-modes))
-      (auto-complete-mode 1)))
-
-;;;###autoload
-(define-global-minor-mode global-auto-complete-mode
-  auto-complete-mode auto-complete-mode-maybe
-  :group 'auto-complete)
-
-
-
-;;;; Compatibilities with other extensions
-
-(defun ac-flyspell-workaround ()
-  "Flyspell uses `sit-for' for delaying its process. Unfortunatelly,
-it stops auto completion which is trigger with `run-with-idle-timer'.
-This workaround avoid flyspell processes when auto completion is being started."
-  (interactive)
-  (defadvice flyspell-post-command-hook (around ac-flyspell-workaround activate)
-    (unless ac-triggered
-      ad-do-it)))
-
-(defun ac-linum-workaround ()
-  "linum-mode tries to display the line numbers even for the
-completion menu. This workaround stops that annoying behavior."
-  (interactive)
-  (defadvice linum-update (around ac-linum-update-workaround activate)
-    (unless ac-completing
-      ad-do-it)))
-
-
-
-;;;; Standard sources
-
-(defmacro ac-define-source (name source)
-  "Source definition macro. It defines a complete command also."
-  (declare (indent 1))
-  `(progn
-     (defvar ,(intern (format "ac-source-%s" name)))
-     ;; Use `setq' to reset ac-source-NAME every time
-     ;; `ac-define-source' is called.  This is useful, for example
-     ;; when evaluating `ac-define-source' using C-M-x (`eval-defun').
-     (setq ,(intern (format "ac-source-%s" name)) ,source)
-     (defun ,(intern (format "ac-complete-%s" name)) ()
-       (interactive)
-       (auto-complete '(,(intern (format "ac-source-%s" name)))))))
-
-;; Words in buffer source
-(defvar ac-word-index nil)
-
-(defun ac-candidate-words-in-buffer (point prefix limit)
-  (let ((i 0)
-        candidate
-        candidates
-        (regexp (concat "\\_<" (regexp-quote prefix) "\\(\\sw\\|\\s_\\)+\\_>")))
-    (save-excursion
-      ;; Search backward
-      (goto-char point)
-      (while (and (or (not (integerp limit)) (< i limit))
-                  (re-search-backward regexp nil t))
-        (setq candidate (match-string-no-properties 0))
-        (unless (member candidate candidates)
-          (push candidate candidates)
-          (cl-incf i)))
-      ;; Search backward
-      (goto-char (+ point (length prefix)))
-      (while (and (or (not (integerp limit)) (< i limit))
-                  (re-search-forward regexp nil t))
-        (setq candidate (match-string-no-properties 0))
-        (unless (member candidate candidates)
-          (push candidate candidates)
-          (cl-incf i)))
-      (nreverse candidates))))
-
-(defun ac-incremental-update-word-index ()
-  (unless (local-variable-p 'ac-word-index)
-    (make-local-variable 'ac-word-index))
-  (if (null ac-word-index)
-      (setq ac-word-index (cons nil nil)))
-  ;; Mark incomplete
-  (if (car ac-word-index)
-      (setcar ac-word-index nil))
-  (let ((index (cdr ac-word-index))
-        (words (ac-candidate-words-in-buffer ac-point ac-prefix (or (and (integerp ac-limit) ac-limit) 10))))
-    (dolist (word words)
-      (unless (member word index)
-        (push word index)
-        (setcdr ac-word-index index)))))
-
-(defun ac-update-word-index-1 ()
-  (unless (local-variable-p 'ac-word-index)
-    (make-local-variable 'ac-word-index))
-  (when (and (not (car ac-word-index))
-             (< (buffer-size) 1048576))
-    ;; Complete index
-    (setq ac-word-index
-          (cons t
-                (split-string (buffer-substring-no-properties (point-min) (point-max))
-                              "\\(?:^\\|\\_>\\).*?\\(?:\\_<\\|$\\)")))))
-
-(defun ac-update-word-index ()
-  (dolist (buffer (buffer-list))
-    (when (or ac-fuzzy-enable
-              (not (eq buffer (current-buffer))))
-      (with-current-buffer buffer
-        (ac-update-word-index-1)))))
-
-(defun ac-word-candidates (&optional buffer-pred)
-  (cl-loop initially (unless ac-fuzzy-enable (ac-incremental-update-word-index))
-           for buffer in (buffer-list)
-           if (and (or (not (integerp ac-limit)) (< (length candidates) ac-limit))
-                   (if buffer-pred (funcall buffer-pred buffer) t))
-           append (funcall ac-match-function
-                           ac-prefix
-                           (and (local-variable-p 'ac-word-index buffer)
-                                (cdr (buffer-local-value 'ac-word-index buffer))))
-           into candidates
-           finally return (delete-dups candidates)))
-
-(ac-define-source words-in-buffer
-  '((candidates . ac-word-candidates)))
-
-(ac-define-source words-in-all-buffer
-  '((init . ac-update-word-index)
-    (candidates . ac-word-candidates)))
-
-(ac-define-source words-in-same-mode-buffers
-  '((init . ac-update-word-index)
-    (candidates . (ac-word-candidates
-                   (lambda (buffer)
-                     (derived-mode-p (buffer-local-value 'major-mode buffer)))))))
-
-;; Lisp symbols source
-(defvar ac-symbols-cache nil)
-(ac-clear-variable-every-10-minutes 'ac-symbols-cache)
-
-(defun ac-symbol-file (symbol type)
-  (if (fboundp 'find-lisp-object-file-name)
-      (find-lisp-object-file-name symbol type)
-    (let ((file-name (with-no-warnings
-                       (describe-simplify-lib-file-name
-                        (symbol-file symbol type)))))
-      (when (equal file-name "loaddefs.el")
-        ;; Find the real def site of the preloaded object.
-        (let ((location (condition-case nil
-                            (if (eq type 'defun)
-                                (find-function-search-for-symbol symbol nil
-                                                                 "loaddefs.el")
-                              (find-variable-noselect symbol file-name))
-                          (error nil))))
-          (when location
-            (with-current-buffer (car location)
-              (when (cdr location)
-                (goto-char (cdr location)))
-              (when (re-search-backward
-                     "^;;; Generated autoloads from \\(.*\\)" nil t)
-                (setq file-name (match-string 1)))))))
-      (if (and (null file-name)
-               (or (eq type 'defun)
-                   (integerp (get symbol 'variable-documentation))))
-          ;; It's a object not defined in Elisp but in C.
-          (if (get-buffer " *DOC*")
-              (if (eq type 'defun)
-                  (help-C-file-name (symbol-function symbol) 'subr)
-                (help-C-file-name symbol 'var))
-            'C-source)
-        file-name))))
-
-(defun ac-symbol-documentation (symbol)
-  (if (stringp symbol)
-      (setq symbol (intern-soft symbol)))
-  (ignore-errors
-    (with-temp-buffer
-      (let ((standard-output (current-buffer)))
-        (prin1 symbol)
-        (princ " is ")
-        (cond
-         ((fboundp symbol)
-          ;; import help-xref-following
-          (require 'help-mode)
-          (let ((help-xref-following t)
-                (major-mode 'help-mode)) ; avoid error in Emacs 24
-            (describe-function-1 symbol))
-          (buffer-string))
-         ((boundp symbol)
-          (let ((file-name  (ac-symbol-file symbol 'defvar)))
-            (princ "a variable")
-            (when file-name
-              (princ " defined in `")
-              (princ (if (eq file-name 'C-source)
-                         "C source code"
-                       (file-name-nondirectory file-name))))
-            (princ "'.\n\n")
-            (princ (or (documentation-property symbol 'variable-documentation t)
-                       "Not documented."))
-            (buffer-string)))
-         ((facep symbol)
-          (let ((file-name  (ac-symbol-file symbol 'defface)))
-            (princ "a face")
-            (when file-name
-              (princ " defined in `")
-              (princ (if (eq file-name 'C-source)
-                         "C source code"
-                       (file-name-nondirectory file-name))))
-            (princ "'.\n\n")
-            (princ (or (documentation-property symbol 'face-documentation t)
-                       "Not documented."))
-            (buffer-string)))
-         (t
-          (let ((doc (documentation-property symbol 'group-documentation t)))
-            (when doc
-              (princ "a group.\n\n")
-              (princ doc)
-              (buffer-string)))))))))
-
-(defun ac-symbol-candidates ()
-  (or ac-symbols-cache
-      (setq ac-symbols-cache
-            (cl-loop for x being the symbols
-                     if (or (fboundp x)
-                            (boundp x)
-                            (symbol-plist x))
-                     collect (symbol-name x)))))
-
-(ac-define-source symbols
-  '((candidates . ac-symbol-candidates)
-    (document . ac-symbol-documentation)
-    (symbol . "s")
-    (cache)))
-
-;; Lisp functions source
-(defvar ac-functions-cache nil)
-(ac-clear-variable-every-10-minutes 'ac-functions-cache)
-
-(defun ac-function-candidates ()
-  (or ac-functions-cache
-      (setq ac-functions-cache
-            (cl-loop for x being the symbols
-                     if (fboundp x)
-                     collect (symbol-name x)))))
-
-(ac-define-source functions
-  '((candidates . ac-function-candidates)
-    (document . ac-symbol-documentation)
-    (symbol . "f")
-    (prefix . "(\\(\\(?:\\sw\\|\\s_\\)+\\)")
-    (cache)))
-
-;; Lisp variables source
-(defvar ac-variables-cache nil)
-(ac-clear-variable-every-10-minutes 'ac-variables-cache)
-
-(defun ac-variable-candidates ()
-  (or ac-variables-cache
-      (setq ac-variables-cache
-            (cl-loop for x being the symbols
-                     if (boundp x)
-                     collect (symbol-name x)))))
-
-(ac-define-source variables
-  '((candidates . ac-variable-candidates)
-    (document . ac-symbol-documentation)
-    (symbol . "v")
-    (cache)))
-
-;; Lisp features source
-(defvar ac-emacs-lisp-features nil)
-(ac-clear-variable-every-10-minutes 'ac-emacs-lisp-features)
-
-(defun ac-emacs-lisp-feature-candidates ()
-  (or ac-emacs-lisp-features
-      (if (fboundp 'find-library-suffixes)
-          (let ((suffix (concat (regexp-opt (find-library-suffixes) t) "\\'")))
-            (setq ac-emacs-lisp-features
-                  (append (mapcar 'prin1-to-string features)
-                          (cl-loop for dir in load-path
-                                   if (file-directory-p dir)
-                                   append (cl-loop for file in (directory-files dir)
-                                                   if (string-match suffix file)
-                                                   collect (substring file 0 (match-beginning 0))))))))))
-
-(ac-define-source features
-  '((depends find-func)
-    (candidates . ac-emacs-lisp-feature-candidates)
-    (prefix . "require +'\\(\\(?:\\sw\\|\\s_\\)*\\)")
-    (requires . 0)))
-
-(defvaralias 'ac-source-emacs-lisp-features 'ac-source-features)
-
-;; Abbrev source
-(ac-define-source abbrev
-  '((candidates . (mapcar 'popup-x-to-string (append (vconcat local-abbrev-table global-abbrev-table) nil)))
-    (action . expand-abbrev)
-    (symbol . "a")
-    (cache)))
-
-;; Files in current directory source
-(ac-define-source files-in-current-dir
-  '((candidates . (directory-files default-directory))
-    (cache)))
-
-;; Filename source
-(defvar ac-filename-cache nil)
-
-(defun ac-filename-candidate ()
-  (let (file-name-handler-alist)
-    (unless (or (and comment-start-skip
-                     (string-match comment-start-skip ac-prefix))
-                (file-regular-p ac-prefix))
-      (ignore-errors
-        (cl-loop with dir = (file-name-directory ac-prefix)
-                 with files = (or (assoc-default dir ac-filename-cache)
-                                  (let ((files (directory-files dir nil "^[^.]")))
-                                    (push (cons dir files) ac-filename-cache)
-                                    files))
-                 for file in files
-                 for path = (concat dir file)
-                 collect (if (file-directory-p path)
-                             (concat path "/")
-                           path))))))
-
-(ac-define-source filename
-  '((init . (setq ac-filename-cache nil))
-    (candidates . ac-filename-candidate)
-    (prefix . valid-file)
-    (requires . 0)
-    (action . ac-start)
-    (limit . nil)))
-
-;; Dictionary source
-(ac-define-source dictionary
-  '((candidates . ac-buffer-dictionary)
-    (symbol . "d")))
-
-(provide 'auto-complete)
-;;; auto-complete.el ends here
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/python-mode b/emacs.d/elpa/auto-complete-20150618.1949/dict/python-mode
deleted file mode 100644
index 4d7b706..0000000
--- a/emacs.d/elpa/auto-complete-20150618.1949/dict/python-mode
+++ /dev/null
@@ -1,380 +0,0 @@
-ArithmeticError
-AssertionError
-AttributeError
-BaseException
-BufferError
-BytesWarning
-DeprecationWarning
-EOFError
-Ellipsis
-EnvironmentError
-Exception
-False
-FloatingPointError
-FutureWarning
-GeneratorExit
-IOError
-ImportError
-ImportWarning
-IndentationError
-IndexError
-KeyError
-KeyboardInterrupt
-LookupError
-MemoryError
-NameError
-None
-NotImplemented
-NotImplementedError
-OSError
-OverflowError
-PendingDeprecationWarning
-ReferenceError
-RuntimeError
-RuntimeWarning
-StandardError
-StopIteration
-SyntaxError
-SyntaxWarning
-SystemError
-SystemExit
-TabError
-True
-TypeError
-UnboundLocalError
-UnicodeDecodeError
-UnicodeEncodeError
-UnicodeError
-UnicodeTranslateError
-UnicodeWarning
-UserWarning
-ValueError
-Warning
-ZeroDivisionError
-__builtins__
-__debug__
-__doc__
-__file__
-__future__
-__import__
-__init__
-__main__
-__name__
-__package__
-_dummy_thread
-_thread
-abc
-abs
-aifc
-all
-and
-any
-apply
-argparse
-array
-as
-assert
-ast
-asynchat
-asyncio
-asyncore
-atexit
-audioop
-base64
-basestring
-bdb
-bin
-binascii
-binhex
-bisect
-bool
-break
-buffer
-builtins
-bytearray
-bytes
-bz2
-calendar
-callable
-cgi
-cgitb
-chr
-chuck
-class
-classmethod
-cmath
-cmd
-cmp
-code
-codecs
-codeop
-coerce
-collections
-colorsys
-compile
-compileall
-complex
-concurrent
-configparser
-contextlib
-continue
-copy
-copyreg
-copyright
-credits
-crypt
-csv
-ctypes
-curses
-datetime
-dbm
-decimal
-def
-del
-delattr
-dict
-difflib
-dir
-dis
-distutils
-divmod
-doctest
-dummy_threading
-elif
-else
-email
-enumerate
-ensurepip
-enum
-enumerat
-errno
-eval
-except
-exec
-execfile
-exit
-faulthandler
-fcntl
-file
-filecmp
-fileinput
-filter
-finally
-float
-fnmatch
-for
-format
-formatter
-fpectl
-fractions
-from
-frozenset
-ftplib
-functools
-gc
-getattr
-getopt
-getpass
-gettext
-glob
-global
-globals
-grp
-gzip
-hasattr
-hash
-hashlib
-heapq
-help
-hex
-hmac
-html
-http
-id
-if
-imghdr
-imp
-impalib
-import
-importlib
-in
-input
-inspect
-int
-intern
-io
-ipaddress
-is
-isinstance
-issubclass
-iter
-itertools
-json
-keyword
-lambda
-len
-license
-linecache
-list
-locale
-locals
-logging
-long
-lzma
-macpath
-mailbox
-mailcap
-map
-marshal
-math
-max
-memoryview
-mimetypes
-min
-mmap
-modulefinder
-msilib
-msvcrt
-multiprocessing
-netrc
-next
-nis
-nntplib
-not
-numbers
-object
-oct
-open
-operator
-optparse
-or
-ord
-os
-ossaudiodev
-parser
-pass
-pathlib
-pdb
-pickle
-pickletools
-pipes
-pkgutil
-platform
-plistlib
-poplib
-posix
-pow
-pprint
-print
-profile
-property
-pty
-pwd
-py_compiler
-pyclbr
-pydoc
-queue
-quit
-quopri
-raise
-random
-range
-raw_input
-re
-readline
-reduce
-reload
-repr
-reprlib
-resource
-return
-reversed
-rlcompleter
-round
-runpy
-sched
-select
-selectors
-self
-set
-setattr
-shelve
-shlex
-shutil
-signal
-site
-slice
-smtpd
-smtplib
-sndhdr
-socket
-socketserver
-sorted
-spwd
-sqlite3
-ssl
-stat
-staticmethod
-statistics
-str
-string
-stringprep
-struct
-subprocess
-sum
-sunau
-super
-symbol
-symtable
-sys
-sysconfig
-syslog
-tabnanny
-tarfile
-telnetlib
-tempfile
-termios
-test
-textwrap
-threading
-time
-timeit
-tkinter
-token
-tokenize
-trace
-traceback
-tracemalloc
-try
-tty
-tuple
-turtle
-type
-types
-unichr
-unicode
-unicodedata
-unittest
-urllib
-uu
-uuid
-vars
-venv
-warnings
-wave
-weakref
-webbrowser
-while
-winsound
-winreg
-with
-wsgiref
-xdrlib
-xml
-xmlrpc
-xrange
-yield
-zip
-zipfile
-zipimport
-zlib
diff --git a/emacs.d/elpa/auto-complete-20160107.8/auto-complete-autoloads.el b/emacs.d/elpa/auto-complete-20160107.8/auto-complete-autoloads.el
new file mode 100644
index 0000000..963e0f2
--- /dev/null
+++ b/emacs.d/elpa/auto-complete-20160107.8/auto-complete-autoloads.el
@@ -0,0 +1,64 @@
+;;; auto-complete-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "auto-complete" "auto-complete.el" (22171 46584
+;;;;;;  0 0))
+;;; Generated autoloads from auto-complete.el
+
+(autoload 'auto-complete "auto-complete" "\
+Start auto-completion at current point.
+
+\(fn &optional SOURCES)" t nil)
+
+(autoload 'auto-complete-mode "auto-complete" "\
+AutoComplete mode
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-auto-complete-mode nil "\
+Non-nil if Global-Auto-Complete mode is enabled.
+See the command `global-auto-complete-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-auto-complete-mode'.")
+
+(custom-autoload 'global-auto-complete-mode "auto-complete" nil)
+
+(autoload 'global-auto-complete-mode "auto-complete" "\
+Toggle Auto-Complete mode in all buffers.
+With prefix ARG, enable Global-Auto-Complete mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Auto-Complete mode is enabled in all buffers where
+`auto-complete-mode-maybe' would do it.
+See `auto-complete-mode' for more information on Auto-Complete mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "auto-complete-config" "auto-complete-config.el"
+;;;;;;  (22171 46584 0 0))
+;;; Generated autoloads from auto-complete-config.el
+
+(autoload 'ac-config-default "auto-complete-config" "\
+
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("auto-complete-pkg.el") (22171 46584 590372
+;;;;;;  0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; auto-complete-autoloads.el ends here
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/auto-complete-config.el b/emacs.d/elpa/auto-complete-20160107.8/auto-complete-config.el
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/auto-complete-config.el
rename to emacs.d/elpa/auto-complete-20160107.8/auto-complete-config.el
diff --git a/emacs.d/elpa/auto-complete-20160107.8/auto-complete-pkg.el b/emacs.d/elpa/auto-complete-20160107.8/auto-complete-pkg.el
new file mode 100644
index 0000000..797a9e9
--- /dev/null
+++ b/emacs.d/elpa/auto-complete-20160107.8/auto-complete-pkg.el
@@ -0,0 +1,6 @@
+(define-package "auto-complete" "20160107.8" "Auto Completion for GNU Emacs"
+  '((popup "0.5.0")
+    (cl-lib "0.5")))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/auto-complete-20160107.8/auto-complete.el b/emacs.d/elpa/auto-complete-20160107.8/auto-complete.el
new file mode 100644
index 0000000..f497e29
--- /dev/null
+++ b/emacs.d/elpa/auto-complete-20160107.8/auto-complete.el
@@ -0,0 +1,2163 @@
+;;; auto-complete.el --- Auto Completion for GNU Emacs
+
+;; Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015  Tomohiro Matsuyama
+
+;; Author: Tomohiro Matsuyama <m2ym.pub@gmail.com>
+;; URL: https://github.com/auto-complete/auto-complete
+;; Keywords: completion, convenience
+;; Version: 1.5.0
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This extension provides a way to complete with popup menu like:
+;;
+;;     def-!-
+;;     +-----------------+
+;;     |defun::::::::::::|
+;;     |defvar           |
+;;     |defmacro         |
+;;     |       ...       |
+;;     +-----------------+
+;;
+;; You can complete by typing and selecting menu.
+;;
+;; Entire documents are located in doc/ directory.
+;; Take a look for information.
+;;
+;; Enjoy!
+
+;;; Code:
+
+
+
+(defconst ac-version "1.5.0"
+  "Version of auto-complete in string format.
+Use `version-to-list' to get version component.")
+
+(defconst ac-version-major (car (version-to-list ac-version))
+  "Major version number of auto-complete")
+
+(defconst ac-version-minor (cadr (version-to-list ac-version))
+  "Minor version number of auto-complete")
+
+(require 'cl-lib)
+(require 'popup)
+
+;;;; Global stuff
+
+(defun ac-error (&optional var)
+  "Report an error and disable `auto-complete-mode'."
+  (ignore-errors
+    (message "auto-complete error: %s" var)
+    (auto-complete-mode -1)
+    var))
+
+
+
+;;;; Customization
+
+(defgroup auto-complete nil
+  "Auto completion."
+  :group 'completion
+  :prefix "ac-")
+
+(defcustom ac-delay 0.1
+  "Delay to completions will be available."
+  :type 'float
+  :group 'auto-complete)
+
+(defcustom ac-auto-show-menu 0.8
+  "Non-nil means completion menu will be automatically shown."
+  :type '(choice (const :tag "Yes" t)
+                 (const :tag "Never" nil)
+                 (float :tag "Timer"))
+  :group 'auto-complete)
+
+(defcustom ac-show-menu-immediately-on-auto-complete t
+  "Non-nil means menu will be showed immediately on `auto-complete'."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-expand-on-auto-complete t
+  "Non-nil means expand whole common part on first time `auto-complete'."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-disable-faces '(font-lock-comment-face font-lock-string-face font-lock-doc-face)
+  "Non-nil means disable automatic completion on specified faces."
+  :type '(repeat symbol)
+  :group 'auto-complete)
+
+(defcustom ac-stop-flymake-on-completing t
+  "Non-nil means disble flymake temporarily on completing."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-flycheck-poll-completion-end-interval 0.5
+  "Polling interval to restart automatically flycheck's checking after completion is end."
+  :type 'float
+  :group 'auto-complete)
+
+(defcustom ac-use-fuzzy (and (locate-library "fuzzy") t)
+  "Non-nil means use fuzzy matching."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-fuzzy-cursor-color "red"
+  "Cursor color in fuzzy mode."
+  :type 'string
+  :group 'auto-complete)
+
+(defcustom ac-use-comphist t
+  "Non-nil means use intelligent completion history."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-comphist-threshold 0.7
+  "Percentage of ignoring low scored candidates."
+  :type 'float
+  :group 'auto-complete)
+
+(defcustom ac-comphist-file
+  (expand-file-name (concat (if (boundp 'user-emacs-directory)
+                                user-emacs-directory
+                              "~/.emacs.d/")
+                            "/ac-comphist.dat"))
+  "Completion history file name."
+  :type 'string
+  :group 'auto-complete)
+
+(defcustom ac-user-dictionary nil
+  "User defined dictionary"
+  :type '(repeat string)
+  :group 'auto-complete)
+
+(defcustom ac-dictionary-files '("~/.dict")
+  "Dictionary files."
+  :type '(repeat string)
+  :group 'auto-complete)
+(defvaralias 'ac-user-dictionary-files 'ac-dictionary-files)
+
+(defcustom ac-dictionary-directories
+  (ignore-errors
+    (when load-file-name
+      (let ((installed-dir (file-name-directory load-file-name)))
+        (cl-loop for name in '("ac-dict" "dict")
+              for dir = (concat installed-dir name)
+              if (file-directory-p dir)
+              collect dir))))
+  "Dictionary directories."
+  :type '(repeat string)
+  :group 'auto-complete)
+
+(defcustom ac-use-quick-help t
+  "Non-nil means use quick help."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-quick-help-delay 1.5
+  "Delay to show quick help."
+  :type 'float
+  :group 'auto-complete)
+
+(defcustom ac-menu-height 10
+  "Max height of candidate menu."
+  :type 'integer
+  :group 'auto-complete)
+(defvaralias 'ac-candidate-menu-height 'ac-menu-height)
+
+(defcustom ac-quick-help-height 20
+  "Max height of quick help."
+  :type 'integer
+  :group 'auto-complete)
+
+(defcustom ac-quick-help-prefer-pos-tip t
+  "Prefer native tooltip with pos-tip than overlay popup for displaying quick help."
+  :type 'boolean
+  :group 'auto-complete)
+(defvaralias 'ac-quick-help-prefer-x 'ac-quick-help-prefer-pos-tip)
+
+(defcustom ac-candidate-limit nil
+  "Limit number of candidates. Non-integer means no limit."
+  :type 'integer
+  :group 'auto-complete)
+(defvaralias 'ac-candidate-max 'ac-candidate-limit)
+
+(defcustom ac-modes
+  '(emacs-lisp-mode lisp-mode lisp-interaction-mode
+    slime-repl-mode
+    c-mode cc-mode c++-mode go-mode
+    java-mode malabar-mode clojure-mode clojurescript-mode  scala-mode
+    scheme-mode
+    ocaml-mode tuareg-mode coq-mode haskell-mode agda-mode agda2-mode
+    perl-mode cperl-mode python-mode ruby-mode lua-mode tcl-mode
+    ecmascript-mode javascript-mode js-mode js2-mode php-mode css-mode scss-mode less-css-mode
+    makefile-mode sh-mode fortran-mode f90-mode ada-mode
+    xml-mode sgml-mode web-mode
+    ts-mode
+    sclang-mode
+    verilog-mode
+    qml-mode
+    apples-mode)
+  "Major modes `auto-complete-mode' can run on."
+  :type '(repeat symbol)
+  :group 'auto-complete)
+
+(defcustom ac-compatible-packages-regexp
+  "^ac-"
+  "Regexp to indicate what packages can work with auto-complete."
+  :type 'string
+  :group 'auto-complete)
+
+(defcustom ac-non-trigger-commands
+  '(*table--cell-self-insert-command
+    electric-buffer-list)
+  "Commands that can't be used as triggers of `auto-complete'."
+  :type '(repeat symbol)
+  :group 'auto-complete)
+
+(defcustom ac-trigger-commands
+  '(self-insert-command)
+  "Trigger commands that specify whether `auto-complete' should start or not."
+  :type '(repeat symbol)
+  :group 'auto-complete)
+
+(defcustom ac-trigger-commands-on-completing
+  '(delete-backward-char
+    backward-delete-char
+    backward-delete-char-untabify
+    ;; autopair
+    autopair-backspace
+    ;; paredit
+    paredit-backward-delete
+    paredit-backward-delete-word)
+  "Trigger commands that specify whether `auto-complete' should continue or not."
+  :type '(repeat symbol)
+  :group 'auto-complete)
+
+(defcustom ac-trigger-key nil
+  "Non-nil means `auto-complete' will start by typing this key.
+If you specify this TAB, for example, `auto-complete' will start by typing TAB,
+and if there is no completions, an original command will be fallbacked."
+  :type '(choice (const :tag "None" nil)
+                 (string :tag "Key"))
+  :group 'auto-complete
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (when (and value
+                    (fboundp 'ac-set-trigger-key))
+           (ac-set-trigger-key value))))
+
+(defcustom ac-auto-start 2
+  "Non-nil means completion will be started automatically.
+Positive integer means if a length of a word you entered is larger than the value,
+completion will be started automatically.
+If you specify `nil', never be started automatically."
+  :type '(choice (const :tag "Yes" t)
+                 (const :tag "Never" nil)
+                 (integer :tag "Require"))
+  :group 'auto-complete)
+
+(defcustom ac-stop-words nil
+  "List of string to stop completion."
+  :type '(repeat string)
+  :group 'auto-complete)
+(defvaralias 'ac-ignores 'ac-stop-words)
+
+(defcustom ac-use-dictionary-as-stop-words t
+  "Non-nil means a buffer related dictionary will be thought of as stop words."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-ignore-case 'smart
+  "Non-nil means auto-complete ignores case.
+If this value is `smart', auto-complete ignores case only when
+a prefix doesn't contain any upper case letters."
+  :type '(choice (const :tag "Yes" t)
+                 (const :tag "Smart" smart)
+                 (const :tag "No" nil))
+  :group 'auto-complete)
+
+(defcustom ac-dwim t
+  "Non-nil means `auto-complete' works based on Do What I Mean."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-use-menu-map nil
+  "Non-nil means a special keymap `ac-menu-map' on completing menu will be used."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-use-overriding-local-map nil
+  "Non-nil means `overriding-local-map' will be used to hack for overriding key events on auto-completion."
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-disable-inline nil
+  "Non-nil disable inline completion visibility"
+  :type 'boolean
+  :group 'auto-complete)
+
+(defcustom ac-candidate-menu-min 1
+  "Number of candidates required to display menu"
+  :type 'integer
+  :group 'auto-complete)
+
+(defcustom ac-max-width nil
+  "Maximum width for auto-complete menu to have"
+  :type '(choice (const :tag "No limit" nil)
+                 (const :tag "Character Limit" 25)
+                 (const :tag "Window Ratio Limit" 0.5))
+  :group 'auto-complete)
+
+(defface ac-completion-face
+  '((t (:foreground "darkgray" :underline t)))
+  "Face for inline completion"
+  :group 'auto-complete)
+
+(defface ac-candidate-face
+  '((t (:inherit popup-face)))
+  "Face for candidate."
+  :group 'auto-complete)
+
+(defface ac-candidate-mouse-face
+  '((t (:inherit popup-menu-mouse-face)))
+  "Mouse face for candidate."
+  :group 'auto-complete)
+
+(defface ac-selection-face
+  '((t (:inherit popup-menu-selection-face)))
+  "Face for selected candidate."
+  :group 'auto-complete)
+
+(defvar auto-complete-mode-hook nil
+  "Hook for `auto-complete-mode'.")
+
+
+
+;;;; Internal variables
+
+(defvar auto-complete-mode nil
+  "Dummy variable to suppress compiler warnings.")
+
+(defvar ac-cursor-color nil
+  "Old cursor color.")
+
+(defvar ac-inline nil
+  "Inline completion instance.")
+
+(defvar ac-menu nil
+  "Menu instance.")
+
+(defvar ac-show-menu nil
+  "Flag to show menu on timer tick.")
+
+(defvar ac-last-completion nil
+  "Cons of prefix marker and selected item of last completion.")
+
+(defvar ac-quick-help nil
+  "Quick help instance")
+
+(defvar ac-completing nil
+  "Non-nil means `auto-complete-mode' is now working on completion.")
+
+(defvar ac-buffer nil
+  "Buffer where auto-complete is started.")
+
+(defvar ac-point nil
+  "Start point of prefix.")
+
+(defvar ac-last-point nil
+  "Last point of updating pattern.")
+
+(defvar ac-prefix nil
+  "Prefix string.")
+(defvaralias 'ac-target 'ac-prefix)
+
+(defvar ac-selected-candidate nil
+  "Last selected candidate.")
+
+(defvar ac-common-part nil
+  "Common part string of meaningful candidates.
+If there is no common part, this will be nil.")
+
+(defvar ac-whole-common-part nil
+  "Common part string of whole candidates.
+If there is no common part, this will be nil.")
+
+(defvar ac-prefix-overlay nil
+  "Overlay for prefix string.")
+
+(defvar ac-timer nil
+  "Completion idle timer.")
+
+(defvar ac-show-menu-timer nil
+  "Show menu idle timer.")
+
+(defvar ac-quick-help-timer nil
+  "Quick help idle timer.")
+
+(defvar ac-triggered nil
+  "Flag to update.")
+
+(defvar ac-limit nil
+  "Limit number of candidates for each sources.")
+
+(defvar ac-candidates nil
+  "Current candidates.")
+
+(defvar ac-candidates-cache nil
+  "Candidates cache for individual sources.")
+
+(defvar ac-fuzzy-enable nil
+  "Non-nil means fuzzy matching is enabled.")
+
+(defvar ac-dwim-enable nil
+  "Non-nil means DWIM completion will be allowed.")
+
+(defvar ac-mode-map (make-sparse-keymap)
+  "Auto-complete mode map. It is also used for trigger key command. See also `ac-trigger-key'.")
+
+(defvar ac-completing-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\t" 'ac-expand)
+    (define-key map [tab] 'ac-expand)
+    (define-key map "\r" 'ac-complete)
+    (define-key map (kbd "M-TAB") 'auto-complete)
+
+    (define-key map "\M-n" 'ac-next)
+    (define-key map "\M-p" 'ac-previous)
+    (define-key map [down] 'ac-next)
+    (define-key map [up] 'ac-previous)
+
+    (define-key map [f1] 'ac-help)
+    (define-key map [M-f1] 'ac-persist-help)
+    (define-key map (kbd "C-?") 'ac-help)
+    (define-key map (kbd "C-M-?") 'ac-persist-help)
+
+    (define-key map [C-down] 'ac-quick-help-scroll-down)
+    (define-key map [C-up] 'ac-quick-help-scroll-up)
+    (define-key map "\C-\M-n" 'ac-quick-help-scroll-down)
+    (define-key map "\C-\M-p" 'ac-quick-help-scroll-up)
+
+    (dotimes (i 9)
+      (let ((symbol (intern (format "ac-complete-select-%d" (1+ i)))))
+        (fset symbol
+              `(lambda ()
+                 (interactive)
+                 (when (and (ac-menu-live-p) (popup-select ac-menu ,i))
+                   (ac-complete))))
+        (define-key map (read-kbd-macro (format "M-%s" (1+ i))) symbol)))
+
+    map)
+  "Keymap for completion.")
+(defvaralias 'ac-complete-mode-map 'ac-completing-map)
+
+(defvar ac-menu-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map ac-completing-map)
+    (define-key map (kbd "RET") 'ac-complete)
+    (define-key map "\C-n" 'ac-next)
+    (define-key map "\C-p" 'ac-previous)
+    (define-key map "\C-s" 'ac-isearch)
+    (define-key map [mouse-1] 'ac-mouse-1)
+    (define-key map [down-mouse-1] 'ac-ignore)
+    (define-key map [mouse-4] 'ac-mouse-4)
+    (define-key map [mouse-5] 'ac-mouse-5)
+    map)
+  "Keymap for completion on completing menu.")
+
+(defvar ac-current-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map ac-completing-map)
+    map))
+
+(defvar ac-match-function 'all-completions
+  "Default match function.")
+
+(defvar ac-prefix-definitions
+  '((symbol . ac-prefix-symbol)
+    (file . ac-prefix-file)
+    (valid-file . ac-prefix-valid-file)
+    (c-dot . ac-prefix-c-dot)
+    (c-dot-ref . ac-prefix-c-dot-ref)
+    (cc-member . ac-prefix-cc-member))
+  "Prefix definitions for common use.")
+
+(defvar ac-sources '(ac-source-words-in-same-mode-buffers)
+  "Sources for completion.")
+(make-variable-buffer-local 'ac-sources)
+
+(defvar ac-compiled-sources nil
+  "Compiled source of `ac-sources'.")
+
+(defvar ac-current-sources nil
+  "Current working sources. This is sublist of `ac-compiled-sources'.")
+
+(defvar ac-omni-completion-sources nil
+  "Do not use this anymore.")
+
+(defvar ac-current-prefix-def nil)
+
+(defvar ac-ignoring-prefix-def nil)
+
+
+
+;;;; Intelligent completion history
+
+(defvar ac-comphist nil
+  "Database of completion history.")
+
+(defsubst ac-comphist-make-tab ()
+  (make-hash-table :test 'equal))
+
+(defsubst ac-comphist-tab (db)
+  (nth 0 db))
+
+(defsubst ac-comphist-cache (db)
+  (nth 1 db))
+
+(defun ac-comphist-make (&optional tab)
+  (list (or tab (ac-comphist-make-tab)) (make-hash-table :test 'equal :weakness t)))
+
+(defun ac-comphist-get (db string &optional create)
+  (let* ((tab (ac-comphist-tab db))
+         (index (gethash string tab)))
+    (when (and create (null index))
+      (setq index (make-vector (length string) 0))
+      (puthash string index tab))
+    index))
+
+(defun ac-comphist-add (db string prefix)
+  (setq prefix (min prefix (1- (length string))))
+  (when (<= 0 prefix)
+    (setq string (substring-no-properties string))
+    (let ((stat (ac-comphist-get db string t)))
+      (cl-incf (aref stat prefix))
+      (remhash string (ac-comphist-cache db)))))
+
+(defun ac-comphist-score (db string prefix)
+  (setq prefix (min prefix (1- (length string))))
+  (if (<= 0 prefix)
+      (let ((cache (gethash string (ac-comphist-cache db))))
+        (or (and cache (aref cache prefix))
+            (let ((stat (ac-comphist-get db string))
+                  (score 0.0))
+              (when stat
+                (cl-loop for p from 0 below (length string)
+                      ;; sigmoid function
+                      with a = 5
+                      with b = (/ 700.0 a) ; bounds for avoiding range error in `exp'
+                      with d = (/ 6.0 a)
+                      for x = (max (- b) (min b (- d (abs (- prefix p)))))
+                      for r = (/ 1.0 (1+ (exp (* (- a) x))))
+                      do
+                      (cl-incf score (* (aref stat p) r))))
+              ;; Weight by distance
+              (cl-incf score (max 0.0 (- 0.3 (/ (- (length string) prefix) 100.0))))
+              (unless cache
+                (setq cache (make-vector (length string) nil))
+                (puthash string cache (ac-comphist-cache db)))
+              (aset cache prefix score)
+              score)))
+    0.0))
+
+(defun ac-comphist-sort (db collection prefix &optional threshold)
+  (let (result
+        (n 0)
+        (total 0)
+        (cur 0))
+    (setq result (mapcar (lambda (a)
+                           (when (and cur threshold)
+                             (if (>= cur (* total threshold))
+                                 (setq cur nil)
+                               (cl-incf n)
+                               (cl-incf cur (cdr a))))
+                           (car a))
+                         (sort (mapcar (lambda (string)
+                                         (let ((score (ac-comphist-score db string prefix)))
+                                           (cl-incf total score)
+                                           (cons string score)))
+                                       collection)
+                               (lambda (a b) (< (cdr b) (cdr a))))))
+    (if threshold
+        (cons n result)
+      result)))
+
+(defun ac-comphist-serialize (db)
+  (let (alist)
+    (maphash (lambda (k v)
+               (push (cons k v) alist))
+             (ac-comphist-tab db))
+    (list alist)))
+
+(defun ac-comphist-deserialize (sexp)
+  (condition-case nil
+      (ac-comphist-make (let ((tab (ac-comphist-make-tab)))
+                          (mapc (lambda (cons)
+                                  (puthash (car cons) (cdr cons) tab))
+                                (nth 0 sexp))
+                          tab))
+    (error (message "Invalid comphist db.") nil)))
+
+(defun ac-comphist-init ()
+  (ac-comphist-load)
+  (add-hook 'kill-emacs-hook 'ac-comphist-save))
+
+(defun ac-comphist-load ()
+  (interactive)
+  (let ((db (if (file-exists-p ac-comphist-file)
+                (ignore-errors
+                  (with-temp-buffer
+                    (insert-file-contents ac-comphist-file)
+                    (goto-char (point-min))
+                    (ac-comphist-deserialize (read (current-buffer))))))))
+    (setq ac-comphist (or db (ac-comphist-make)))))
+
+(defun ac-comphist-save ()
+  (interactive)
+  (require 'pp)
+  (ignore-errors
+    (with-temp-buffer
+      (pp (ac-comphist-serialize ac-comphist) (current-buffer))
+      (write-region (point-min) (point-max) ac-comphist-file))))
+
+
+
+;;;; Dictionary
+(defvar ac-buffer-dictionary nil)
+(defvar ac-file-dictionary (make-hash-table :test 'equal))
+
+(defun ac-clear-dictionary-cache ()
+  (interactive)
+  (dolist (buffer (buffer-list))
+    (with-current-buffer buffer
+      (if (local-variable-p 'ac-buffer-dictionary)
+          (kill-local-variable 'ac-buffer-dictionary))))
+  (clrhash ac-file-dictionary))
+
+(defun ac-file-dictionary (filename)
+  (let ((cache (gethash filename ac-file-dictionary 'none)))
+    (if (and cache (not (eq cache 'none)))
+        cache
+      (let (result)
+        (ignore-errors
+          (with-temp-buffer
+            (insert-file-contents filename)
+            (setq result (split-string (buffer-string) "\n" t))))
+        (puthash filename result ac-file-dictionary)
+        result))))
+
+(defun ac-mode-dictionary (mode)
+  (cl-loop for name in (cons (symbol-name mode)
+                          (ignore-errors (list (file-name-extension (buffer-file-name)))))
+        append (cl-loop for dir in ac-dictionary-directories
+                     for file = (concat dir "/" name)
+                     if (file-exists-p file)
+                     append (ac-file-dictionary file))))
+
+(defun ac-buffer-dictionary (&optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (if (local-variable-p 'ac-buffer-dictionary)
+        ac-buffer-dictionary
+      (make-local-variable 'ac-buffer-dictionary)
+      (setq ac-buffer-dictionary
+            (apply 'append
+                   ac-user-dictionary
+                   (ac-mode-dictionary major-mode)
+                   (mapcar 'ac-file-dictionary ac-dictionary-files))))))
+
+
+
+;;;; Auto completion internals
+
+(defun ac-menu-at-wrapper-line-p ()
+  "Return non-nil if current line is long and wrapped to next visual line."
+  (and (not truncate-lines)
+       (eq (line-beginning-position)
+           (save-excursion
+             (vertical-motion 1)
+             (line-beginning-position)))))
+
+(defun ac-stop-word-p (word)
+  (or (member word ac-stop-words)
+      (if ac-use-dictionary-as-stop-words
+          (member word (ac-buffer-dictionary)))))
+
+(defun ac-prefix-default ()
+  "Same as `ac-prefix-symbol' but ignore a number prefix."
+  (let ((start (ac-prefix-symbol)))
+    (when start
+      (cl-loop with end = (point)
+            for pos from start below end
+            for c = (char-after pos)
+            if (not (and (<= ?0 c) (<= c ?9)))
+            return start))))
+
+(defun ac-prefix-symbol ()
+  "Default prefix definition function."
+  (require 'thingatpt)
+  (car-safe (bounds-of-thing-at-point 'symbol)))
+
+(defun ac-prefix-file ()
+  "File prefix."
+  (let ((point (re-search-backward "[\"<>' \t\r\n]" nil t)))
+    (if point (1+ point))))
+
+(defsubst ac-windows-remote-file-p (file)
+  (and (memq system-type '(ms-dos windows-nt cygwin))
+       (string-match-p "\\`\\(?://\\|\\\\\\\\\\)" file)))
+
+(defun ac-prefix-valid-file ()
+  "Existed (or to be existed) file prefix."
+  (let* ((line-beg (line-beginning-position))
+         (end (point))
+         (start (or (let ((point (re-search-backward "[\"<>'= \t\r\n]" line-beg t)))
+                      (if point (1+ point)))
+                    line-beg))
+         (file (buffer-substring start end)))
+    (if (and file (or (string-match "^/" file)
+                      (and (setq file (and (string-match "^[^/]*/" file)
+                                           (match-string 0 file)))
+                           (file-directory-p file))))
+        (unless (ac-windows-remote-file-p file)
+          start))))
+
+(defun ac-prefix-c-dot ()
+  "C-like languages dot(.) prefix."
+  (if (re-search-backward "\\.\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
+      (match-beginning 1)))
+
+(defun ac-prefix-c-dot-ref ()
+  "C-like languages dot(.) and reference(->) prefix."
+  (if (re-search-backward "\\(?:\\.\\|->\\)\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
+      (match-beginning 1)))
+
+(defun ac-prefix-cc-member ()
+  "C-like languages member(.)(->)(::) prefix."
+  (when (re-search-backward "\\(?:\\.\\|->\\|::\\)\\(\\(?:[a-zA-Z0-9][_a-zA-Z0-9]*\\)?\\)\\=" nil t)
+    (match-beginning 1)))
+
+(defun ac-define-prefix (name prefix)
+  "Define new prefix definition.
+You can not use it in source definition like (prefix . `NAME')."
+  (push (cons name prefix) ac-prefix-definitions))
+
+(defun ac-match-substring (prefix candidates)
+  (cl-loop with regexp = (regexp-quote prefix)
+           for candidate in candidates
+           if (string-match regexp candidate)
+           collect candidate))
+
+(defsubst ac-source-entity (source)
+  (if (symbolp source)
+      (symbol-value source)
+    source))
+
+(defun ac-source-available-p (source)
+  (if (and (symbolp source)
+           (get source 'available))
+      (eq (get source 'available) t)
+    (let* ((src (ac-source-entity source))
+           (avail-pair (assq 'available src))
+           (avail-cond (cdr avail-pair))
+           (available (and (if avail-pair
+                               (cond
+                                ((symbolp avail-cond)
+                                 (funcall avail-cond))
+                                ((listp avail-cond)
+                                 (eval avail-cond)))
+                             t)
+                           (cl-loop for feature in (assoc-default 'depends src)
+                                    unless (require feature nil t) return nil
+                                    finally return t))))
+      (if (symbolp source)
+          (put source 'available (if available t 'no)))
+      available)))
+
+(defun ac-compile-sources (sources)
+  "Compiled `SOURCES' into expanded sources style."
+  (cl-loop for source in sources
+           if (ac-source-available-p source)
+           do
+           (setq source (ac-source-entity source))
+           ;; prefix
+           (let* ((prefix (assoc 'prefix source))
+                  (real (assoc-default (cdr prefix) ac-prefix-definitions)))
+             (cond
+              (real
+               (add-to-list 'source (cons 'prefix real)))
+              ((null prefix)
+               (add-to-list 'source (cons 'prefix 'ac-prefix-default)))))
+           ;; match
+           (let ((match (assq 'match source)))
+             (cond
+              ((eq (cdr match) 'substring)
+               (setcdr match 'ac-match-substring))))
+           and collect source))
+
+(defun ac-compiled-sources ()
+  (or ac-compiled-sources
+      (setq ac-compiled-sources
+            (ac-compile-sources ac-sources))))
+
+(defsubst ac-menu-live-p ()
+  (popup-live-p ac-menu))
+
+(defun ac-menu-create (point width height)
+  (setq ac-menu
+        (popup-create point width height
+                      :around t
+                      :face 'ac-candidate-face
+                      :max-width ac-max-width
+                      :mouse-face 'ac-candidate-mouse-face
+                      :selection-face 'ac-selection-face
+                      :symbol t
+                      :scroll-bar t
+                      :margin-left 1
+                      :keymap ac-menu-map
+                      )))
+
+(defun ac-menu-delete ()
+  (when ac-menu
+    (popup-delete ac-menu)
+    (setq ac-menu nil)))
+
+(defsubst ac-inline-overlay ()
+  (nth 0 ac-inline))
+
+(defsubst ac-inline-live-p ()
+  (and ac-inline (ac-inline-overlay) t))
+
+(defun ac-inline-show (point string)
+  (unless ac-inline
+    (setq ac-inline (list nil)))
+  (save-excursion
+    (let ((overlay (ac-inline-overlay))
+          (width 0)
+          (string-width (string-width string))
+          (length 0)
+          (original-string string))
+      ;; Calculate string space to show completion
+      (goto-char point)
+      (let (c)
+        (while (and (not (eolp))
+                    (< width string-width)
+                    (setq c (char-after))
+                    (not (eq c ?\t)))   ; special case for tab
+        (cl-incf width (char-width c))
+        (cl-incf length)
+        (forward-char)))
+
+      ;; Show completion
+      (goto-char point)
+      (cond
+       ((= width 0)
+        ;; End-of-line
+        ;; Do nothing
+        )
+       ((<= width string-width)
+        ;; No space to show
+        ;; Do nothing
+        )
+       ((> width string-width)
+        ;; Need to fill space
+        (setq string (concat string (make-string (- width string-width) ? )))))
+      (setq string (propertize string 'face 'ac-completion-face))
+      (if overlay
+          (progn
+            (move-overlay overlay point (+ point length))
+            (overlay-put overlay 'invisible nil))
+        (setq overlay (make-overlay point (+ point length)))
+        (setf (nth 0 ac-inline)  overlay)
+        (overlay-put overlay 'priority 9999)
+        ;; Help prefix-overlay in some cases
+        (overlay-put overlay 'keymap ac-current-map))
+      ;; TODO no width but char
+      (if (eq length 0)
+          ;; Case: End-of-line
+          (progn
+            (put-text-property 0 1 'cursor t string)
+            (overlay-put overlay 'after-string string))
+        (let ((display (substring string 0 1))
+              (after-string (substring string 1)))
+          (overlay-put overlay 'display display)
+          (overlay-put overlay 'after-string after-string)))
+      (overlay-put overlay 'string original-string))))
+
+(defun ac-inline-delete ()
+  (when (ac-inline-live-p)
+    (ac-inline-hide)
+    (delete-overlay (ac-inline-overlay))
+    (setq ac-inline nil)))
+
+(defun ac-inline-hide ()
+  (when (ac-inline-live-p)
+    (let ((overlay (ac-inline-overlay))
+          (buffer-undo-list t))
+      (when overlay
+        (move-overlay overlay (point-min) (point-min))
+        (overlay-put overlay 'invisible t)
+        (overlay-put overlay 'display nil)
+        (overlay-put overlay 'after-string nil)))))
+
+(defun ac-inline-update ()
+  (if (and ac-completing ac-prefix (stringp ac-common-part))
+      (let ((common-part-length (length ac-common-part))
+            (prefix-length (length ac-prefix)))
+        (if (> common-part-length prefix-length)
+            (progn
+              (ac-inline-hide)
+              (ac-inline-show (point) (substring ac-common-part prefix-length)))
+          (ac-inline-delete)))
+    (ac-inline-delete)))
+
+(defun ac-put-prefix-overlay ()
+  (unless ac-prefix-overlay
+    (let (newline)
+      ;; Insert newline to make sure that cursor always on the overlay
+      (when (eobp)
+        (popup-save-buffer-state
+          (insert "\n"))
+        (setq newline t))
+      (setq ac-prefix-overlay (make-overlay ac-point (1+ (point)) nil t t))
+      (overlay-put ac-prefix-overlay 'priority 9999)
+      (overlay-put ac-prefix-overlay 'keymap (make-sparse-keymap))
+      (overlay-put ac-prefix-overlay 'newline newline))))
+
+(defun ac-remove-prefix-overlay ()
+  (when ac-prefix-overlay
+    (when (overlay-get ac-prefix-overlay 'newline)
+      ;; Remove inserted newline
+      (popup-save-buffer-state
+        (goto-char (point-max))
+        (if (eq (char-before) ?\n)
+            (delete-char -1))))
+    (delete-overlay ac-prefix-overlay)))
+
+(defun ac-activate-completing-map ()
+  (if (and ac-show-menu ac-use-menu-map)
+      (set-keymap-parent ac-current-map ac-menu-map))
+  (when (and ac-use-overriding-local-map
+             (null overriding-terminal-local-map))
+    (setq overriding-terminal-local-map ac-current-map))
+  (when ac-prefix-overlay
+    (set-keymap-parent (overlay-get ac-prefix-overlay 'keymap) ac-current-map)))
+
+(defun ac-deactivate-completing-map ()
+  (set-keymap-parent ac-current-map ac-completing-map)
+  (when (and ac-use-overriding-local-map
+             (eq overriding-terminal-local-map ac-current-map))
+    (setq overriding-terminal-local-map nil))
+  (when ac-prefix-overlay
+    (set-keymap-parent (overlay-get ac-prefix-overlay 'keymap) nil)))
+
+(defsubst ac-selected-candidate ()
+  (if ac-menu
+      (popup-selected-item ac-menu)))
+
+(defun ac-prefix (requires ignore-list)
+  (cl-loop with current = (point)
+           with point
+           with point-def
+           with prefix-def
+           with sources
+           for source in (ac-compiled-sources)
+           for prefix = (assoc-default 'prefix source)
+           for req = (or (assoc-default 'requires source) requires 1)
+
+           do
+           (unless (member prefix ignore-list)
+             (save-excursion
+               (setq point (cond
+                            ((symbolp prefix)
+                             (funcall prefix))
+                            ((stringp prefix)
+                             (and (re-search-backward (concat prefix "\\=") nil t)
+                                  (or (match-beginning 1) (match-beginning 0))))
+                            ((stringp (car-safe prefix))
+                             (let ((regexp (nth 0 prefix))
+                                   (end (nth 1 prefix))
+                                   (group (nth 2 prefix)))
+                               (and (re-search-backward (concat regexp "\\=") nil t)
+                                    (funcall (if end 'match-end 'match-beginning)
+                                             (or group 0)))))
+                            (t
+                             (eval prefix))))
+               (if (and point
+                        (integerp req)
+                        (< (- current point) req))
+                   (setq point nil))
+               (when point
+                 (if (null prefix-def)
+                     (setq prefix-def prefix
+                           point-def point))
+                 (if (equal point point-def)
+                     (push source sources)))))
+
+           finally return
+           (and point-def (list prefix-def point-def (nreverse sources)))))
+
+(defun ac-init ()
+  "Initialize current sources to start completion."
+  (setq ac-candidates-cache nil)
+  (cl-loop for source in ac-current-sources
+           for function = (assoc-default 'init source)
+           if function do
+           (save-excursion
+             (cond
+              ((functionp function)
+               (funcall function))
+              (t
+               (eval function))))))
+
+(defun ac-candidates-1 (source)
+  (let* ((do-cache (assq 'cache source))
+         (function (assoc-default 'candidates source))
+         (action (assoc-default 'action source))
+         (document (assoc-default 'document source))
+         (symbol (assoc-default 'symbol source))
+         (ac-limit (or (assoc-default 'limit source) ac-limit))
+         (face (or (assoc-default 'face source) (assoc-default 'candidate-face source)))
+         (selection-face (assoc-default 'selection-face source))
+         (cache (and do-cache (assq source ac-candidates-cache)))
+         (candidates (cdr cache)))
+    (unless cache
+      (setq candidates (save-excursion
+                         (cond
+                          ((functionp function)
+                           (funcall function))
+                          (t
+                           (eval function)))))
+      ;; Convert (name value) format candidates into name with text properties.
+      (setq candidates (mapcar (lambda (candidate)
+                                 (if (consp candidate)
+                                     (propertize (car candidate) 'value (cdr candidate))
+                                   candidate))
+                               candidates))
+      (when do-cache
+        (push (cons source candidates) ac-candidates-cache)))
+    (setq candidates (funcall (or (assoc-default 'match source)
+                                  ac-match-function)
+                              ac-prefix candidates))
+    ;; Remove extra items regarding to ac-limit
+    (if (and (integerp ac-limit) (> ac-limit 1) (> (length candidates) ac-limit))
+        (setcdr (nthcdr (1- ac-limit) candidates) nil))
+    ;; Put candidate properties
+    (setq candidates (mapcar (lambda (candidate)
+                               (popup-item-propertize candidate
+                                                      'action action
+                                                      'symbol symbol
+                                                      'document document
+                                                      'popup-face face
+                                                      'selection-face selection-face))
+                             candidates))
+    candidates))
+
+(defun ac-delete-duplicated-candidates (candidates)
+  (cl-delete-duplicates
+   candidates
+   :test (lambda (x y)
+           ;; We assume two candidates are same if their titles are
+           ;; equal and their actions are equal.
+           (and (equal x y)
+                (eq (popup-item-property x 'action)
+                    (popup-item-property y 'action))))
+   :from-end t))
+
+(defun ac-reduce-candidates (candidates)
+  ;; Call `ac-delete-duplicated-candidates' on first portion of
+  ;; candidate list for speed.
+  (let ((size 20))
+    (if (< (length candidates) size)
+        (ac-delete-duplicated-candidates candidates)
+      (cl-loop for c on candidates by 'cdr
+               repeat (1- size)
+               finally return
+               (let ((rest (cdr c)))
+                 (setcdr c nil)
+                 (append (ac-delete-duplicated-candidates candidates) (copy-sequence rest)))))))
+
+(defun ac-candidates ()
+  "Produce candidates for current sources."
+  (cl-loop with completion-ignore-case = (or (eq ac-ignore-case t)
+                                             (and (eq ac-ignore-case 'smart)
+                                                  (let ((case-fold-search nil)) (not (string-match "[[:upper:]]" ac-prefix)))))
+           with case-fold-search = completion-ignore-case
+           with prefix-len = (length ac-prefix)
+           for source in ac-current-sources
+           append (ac-candidates-1 source) into candidates
+           finally return
+           (progn
+             (if (and ac-use-comphist ac-comphist)
+                 (if ac-show-menu
+                     (let* ((pair (ac-comphist-sort ac-comphist candidates prefix-len ac-comphist-threshold))
+                            (n (car pair))
+                            (result (ac-reduce-candidates (cdr pair)))
+                            (cons (if (> n 0) (nthcdr (1- n) result)))
+                            (cdr (cdr cons)))
+                       ;; XXX ugly
+                       (if cons (setcdr cons nil))
+                       (setq ac-common-part (try-completion ac-prefix result))
+                       (setq ac-whole-common-part (try-completion ac-prefix candidates))
+                       (if cons (setcdr cons cdr))
+                       result)
+                   (setq candidates (ac-comphist-sort ac-comphist candidates prefix-len))
+                   (setq ac-common-part (if candidates (popup-x-to-string (car candidates))))
+                   (setq ac-whole-common-part (try-completion ac-prefix candidates))
+                   candidates)
+               (when ac-show-menu
+                 (setq candidates (ac-reduce-candidates candidates)))
+               (setq ac-common-part (try-completion ac-prefix candidates))
+               (setq ac-whole-common-part ac-common-part)
+               candidates))))
+
+(defun ac-update-candidates (cursor scroll-top)
+  "Update candidates of menu to `ac-candidates' and redraw it."
+  (setf (popup-cursor ac-menu) cursor
+        (popup-scroll-top ac-menu) scroll-top)
+  (setq ac-dwim-enable (= (length ac-candidates) 1))
+  (if ac-candidates
+      (progn
+        (setq ac-completing t)
+        (ac-activate-completing-map))
+    (setq ac-completing nil)
+    (ac-deactivate-completing-map))
+  (unless ac-disable-inline
+    (ac-inline-update))
+  (popup-set-list ac-menu ac-candidates)
+  (if (and (not ac-fuzzy-enable)
+           (<= (length ac-candidates) ac-candidate-menu-min))
+      (popup-hide ac-menu)
+    (if ac-show-menu
+        (popup-draw ac-menu))))
+
+(defun ac-reposition ()
+  "Force to redraw candidate menu with current `ac-candidates'."
+  (let ((cursor (popup-cursor ac-menu))
+        (scroll-top (popup-scroll-top ac-menu))
+        (height (popup-height ac-menu)))
+    (ac-menu-delete)
+    (ac-menu-create ac-point (popup-preferred-width ac-candidates) height)
+    (ac-update-candidates cursor scroll-top)))
+
+(defun ac-cleanup ()
+  "Cleanup auto completion."
+  (if ac-cursor-color
+      (set-cursor-color ac-cursor-color))
+  (when (and ac-use-comphist ac-comphist)
+    (when (and (null ac-selected-candidate)
+               (member ac-prefix ac-candidates))
+      ;; Assume candidate is selected by just typing
+      (setq ac-selected-candidate ac-prefix)
+      (setq ac-last-point ac-point))
+    (when ac-selected-candidate
+      (ac-comphist-add ac-comphist
+                       ac-selected-candidate
+                       (if ac-last-point
+                           (- ac-last-point ac-point)
+                         (length ac-prefix)))))
+  (ac-deactivate-completing-map)
+  (ac-remove-prefix-overlay)
+  (ac-remove-quick-help)
+  (ac-inline-delete)
+  (ac-menu-delete)
+  (ac-cancel-timer)
+  (ac-cancel-show-menu-timer)
+  (ac-cancel-quick-help-timer)
+  (setq ac-cursor-color nil
+        ac-inline nil
+        ac-show-menu nil
+        ac-menu nil
+        ac-completing nil
+        ac-point nil
+        ac-last-point nil
+        ac-prefix nil
+        ac-prefix-overlay nil
+        ac-selected-candidate nil
+        ac-common-part nil
+        ac-whole-common-part nil
+        ac-triggered nil
+        ac-limit nil
+        ac-candidates nil
+        ac-candidates-cache nil
+        ac-fuzzy-enable nil
+        ac-dwim-enable nil
+        ac-compiled-sources nil
+        ac-current-sources nil
+        ac-current-prefix-def nil
+        ac-ignoring-prefix-def nil))
+
+(defsubst ac-abort ()
+  "Abort completion."
+  (ac-cleanup))
+
+(defun ac-extend-region-to-delete (string)
+  "Determine the boundary of the region to delete before
+inserting the completed string. This will be either the position
+of current point, or the end of the symbol at point, if the text
+from point to end of symbol is the right part of the completed
+string."
+  (let* ((end-of-symbol (or (cdr-safe (bounds-of-thing-at-point 'symbol))
+                            (point)))
+         (remaindar (buffer-substring-no-properties (point) end-of-symbol))
+         (remaindar-length (length remaindar)))
+    (if (and (>= (length string) remaindar-length)
+             (string= (substring-no-properties string (- remaindar-length))
+                      remaindar))
+        end-of-symbol
+      (point))))
+
+(defun ac-expand-string (string &optional remove-undo-boundary)
+  "Expand `STRING' into the buffer and update `ac-prefix' to `STRING'.
+This function records deletion and insertion sequences by `undo-boundary'.
+If `remove-undo-boundary' is non-nil, this function also removes `undo-boundary'
+that have been made before in this function.  When `buffer-undo-list' is
+`t', `remove-undo-boundary' has no effect."
+  (when (eq buffer-undo-list t)
+    (setq remove-undo-boundary nil))
+  (when (not (equal string (buffer-substring ac-point (point))))
+    (undo-boundary)
+    ;; We can't use primitive-undo since it undoes by
+    ;; groups, divided by boundaries.
+    ;; We don't want boundary between deletion and insertion.
+    ;; So do it manually.
+    ;; Delete region silently for undo:
+    (if remove-undo-boundary
+        (progn
+          (let (buffer-undo-list)
+            (save-excursion
+              (delete-region ac-point (ac-extend-region-to-delete string))))
+          (setq buffer-undo-list
+                (nthcdr 2 buffer-undo-list)))
+      (delete-region ac-point (ac-extend-region-to-delete string)))
+    (insert (substring-no-properties string))
+    ;; Sometimes, possible when omni-completion used, (insert) added
+    ;; to buffer-undo-list strange record about position changes.
+    ;; Delete it here:
+    (when (and remove-undo-boundary
+               (integerp (cadr buffer-undo-list)))
+      (setcdr buffer-undo-list (nthcdr 2 buffer-undo-list)))
+    (undo-boundary)
+    (setq ac-selected-candidate string)
+    (setq ac-prefix string)))
+
+(defun ac-set-trigger-key (key)
+  "Set `ac-trigger-key' to `KEY'. It is recommemded to use this function instead of calling `setq'."
+  ;; Remove old mapping
+  (when ac-trigger-key
+    (define-key ac-mode-map (read-kbd-macro ac-trigger-key) nil))
+
+  ;; Make new mapping
+  (setq ac-trigger-key key)
+  (when key
+    (define-key ac-mode-map (read-kbd-macro key) 'ac-trigger-key-command)))
+
+(defun ac-set-timer ()
+  (unless ac-timer
+    (setq ac-timer (run-with-idle-timer ac-delay ac-delay 'ac-update-greedy))))
+
+(defun ac-cancel-timer ()
+  (when (timerp ac-timer)
+    (cancel-timer ac-timer)
+    (setq ac-timer nil)))
+
+(defun ac-update (&optional force)
+  (when (and auto-complete-mode
+             ac-prefix
+             (or ac-triggered
+                 force)
+             (not isearch-mode))
+    (ac-put-prefix-overlay)
+    (setq ac-candidates (ac-candidates))
+    (let ((preferred-width (popup-preferred-width ac-candidates)))
+      ;; Reposition if needed
+      (when (or (null ac-menu)
+                (>= (popup-width ac-menu) preferred-width)
+                (<= (popup-width ac-menu) (- preferred-width 10))
+                (and (> (popup-direction ac-menu) 0)
+                     (ac-menu-at-wrapper-line-p)))
+        (ac-inline-hide) ; Hide overlay to calculate correct column
+        (ac-remove-quick-help)
+        (ac-menu-delete)
+        (ac-menu-create ac-point preferred-width ac-menu-height)))
+    (ac-update-candidates 0 0)
+    t))
+
+(defun ac-update-greedy (&optional force)
+  (let (result)
+    (while (when (and (setq result (ac-update force))
+                      (null ac-candidates))
+             (add-to-list 'ac-ignoring-prefix-def ac-current-prefix-def)
+             (ac-start :force-init t)
+             ac-current-prefix-def))
+    result))
+
+(defun ac-set-show-menu-timer ()
+  (when (and (or (integerp ac-auto-show-menu) (floatp ac-auto-show-menu))
+             (null ac-show-menu-timer))
+    (setq ac-show-menu-timer (run-with-idle-timer ac-auto-show-menu ac-auto-show-menu 'ac-show-menu))))
+
+(defun ac-cancel-show-menu-timer ()
+  (when (timerp ac-show-menu-timer)
+    (cancel-timer ac-show-menu-timer)
+    (setq ac-show-menu-timer nil)))
+
+(defun ac-show-menu ()
+  (when (not (eq ac-show-menu t))
+    (setq ac-show-menu t)
+    (ac-inline-hide)
+    (ac-remove-quick-help)
+    (ac-update t)))
+
+(defun ac-help (&optional persist)
+  (interactive "P")
+  (when ac-menu
+    (popup-menu-show-help ac-menu persist)))
+
+(defun ac-persist-help ()
+  (interactive)
+  (ac-help t))
+
+(defun ac-last-help (&optional persist)
+  (interactive "P")
+  (when ac-last-completion
+    (popup-item-show-help (cdr ac-last-completion) persist)))
+
+(defun ac-last-persist-help ()
+  (interactive)
+  (ac-last-help t))
+
+(defun ac-set-quick-help-timer ()
+  (when (and ac-use-quick-help
+             (null ac-quick-help-timer))
+    (setq ac-quick-help-timer (run-with-idle-timer ac-quick-help-delay ac-quick-help-delay 'ac-quick-help))))
+
+(defun ac-cancel-quick-help-timer ()
+  (when (timerp ac-quick-help-timer)
+    (cancel-timer ac-quick-help-timer)
+    (setq ac-quick-help-timer nil)))
+
+(defun ac-pos-tip-show-quick-help (menu &optional item &rest args)
+  (let* ((point (plist-get args :point))
+         (around nil)
+         (parent-offset (popup-offset menu))
+         (doc (popup-menu-documentation menu item)))
+    (when (stringp doc)
+      (if (popup-hidden-p menu)
+          (setq around t)
+        (setq point nil))
+      (with-no-warnings
+        (pos-tip-show doc
+                      'popup-tip-face
+                      (or point
+                          (and menu
+                               (popup-child-point menu parent-offset))
+                          (point))
+                      nil 300
+                      popup-tip-max-width
+                      nil nil
+                      (and (not around) 0))
+        (unless (plist-get args :nowait)
+          (clear-this-command-keys)
+          (unwind-protect
+              (push (read-event (plist-get args :prompt)) unread-command-events)
+            (pos-tip-hide))
+          t)))))
+
+(defun ac-quick-help-use-pos-tip-p ()
+  (and ac-quick-help-prefer-pos-tip
+       window-system
+       (featurep 'pos-tip)))
+
+(defun ac-quick-help (&optional force)
+  (interactive)
+  ;; TODO don't use FORCE
+  (when (and (or force
+                 (with-no-warnings
+                   ;; called-interactively-p can take no args
+                   (called-interactively-p))
+                 ;; ac-isearch'ing
+                 (null this-command))
+             (ac-menu-live-p)
+             (null ac-quick-help))
+      (setq ac-quick-help
+            (funcall (if (ac-quick-help-use-pos-tip-p)
+                         'ac-pos-tip-show-quick-help
+                       'popup-menu-show-quick-help)
+                     ac-menu nil
+                     :point ac-point
+                     :height ac-quick-help-height
+                     :nowait t))))
+
+(defun ac-remove-quick-help ()
+  (when (ac-quick-help-use-pos-tip-p)
+    (with-no-warnings
+      (pos-tip-hide)))
+  (when ac-quick-help
+    (popup-delete ac-quick-help)
+    (setq ac-quick-help nil)))
+
+(defun ac-last-quick-help ()
+  (interactive)
+  (when (and ac-last-completion
+             (eq (marker-buffer (car ac-last-completion))
+                 (current-buffer)))
+    (let ((doc (popup-item-documentation (cdr ac-last-completion)))
+          (point (marker-position (car ac-last-completion))))
+      (when (stringp doc)
+        (if (ac-quick-help-use-pos-tip-p)
+            (with-no-warnings (pos-tip-show doc nil point nil 300))
+          (popup-tip doc
+                     :point point
+                     :around t
+                     :scroll-bar t
+                     :margin t))))))
+
+(defmacro ac-define-quick-help-command (name arglist &rest body)
+  (declare (indent 2))
+  `(progn
+     (defun ,name ,arglist ,@body)
+     (put ',name 'ac-quick-help-command t)))
+
+(ac-define-quick-help-command ac-quick-help-scroll-down ()
+  (interactive)
+  (when ac-quick-help
+    (popup-scroll-down ac-quick-help)))
+
+(ac-define-quick-help-command ac-quick-help-scroll-up ()
+  (interactive)
+  (when ac-quick-help
+    (popup-scroll-up ac-quick-help)))
+
+
+
+;;;; Auto completion isearch
+
+(defun ac-isearch-callback (list)
+  (setq ac-dwim-enable (eq (length list) 1)))
+
+(defun ac-isearch ()
+  (interactive)
+  (when (ac-menu-live-p)
+    (ac-cancel-show-menu-timer)
+    (ac-show-menu)
+    (if ac-use-quick-help
+        (let ((popup-menu-show-quick-help-function
+               (if (ac-quick-help-use-pos-tip-p)
+                   'ac-pos-tip-show-quick-help
+                 'popup-menu-show-quick-help)))
+          (popup-isearch ac-menu
+                         :callback 'ac-isearch-callback
+                         :help-delay ac-quick-help-delay))
+      (popup-isearch ac-menu :callback 'ac-isearch-callback))))
+
+
+
+;;;; Auto completion commands
+
+(cl-defun auto-complete-1 (&key sources (triggered 'command))
+  (let ((menu-live (ac-menu-live-p))
+        (inline-live (ac-inline-live-p))
+        started)
+    (ac-abort)
+    (let ((ac-sources (or sources ac-sources)))
+      (if (or ac-show-menu-immediately-on-auto-complete
+              inline-live)
+          (setq ac-show-menu t))
+      (setq started (ac-start :triggered triggered)))
+    (when (ac-update-greedy t)
+      ;; TODO Not to cause inline completion to be disrupted.
+      (if (ac-inline-live-p)
+          (ac-inline-hide))
+      ;; Not to expand when it is first time to complete
+      (when (and (or (and (not ac-expand-on-auto-complete)
+                          (> (length ac-candidates) 1)
+                          (not menu-live))
+                     (not (let ((ac-common-part ac-whole-common-part))
+                            (ac-expand-common))))
+                 ac-use-fuzzy
+                 (null ac-candidates))
+        (ac-fuzzy-complete)))
+    started))
+
+;;;###autoload
+(defun auto-complete (&optional sources)
+  "Start auto-completion at current point."
+  (interactive)
+  (auto-complete-1 :sources sources))
+
+(defun ac-fuzzy-complete ()
+  "Start fuzzy completion at current point."
+  (interactive)
+  (if (not (require 'fuzzy nil t))
+      (message "Please install fuzzy.el if you use fuzzy completion")
+    (unless (ac-menu-live-p)
+      (ac-start))
+    (let ((ac-match-function 'fuzzy-all-completions))
+      (when ac-fuzzy-cursor-color
+        (unless ac-cursor-color
+          (setq ac-cursor-color (frame-parameter (selected-frame) 'cursor-color)))
+        (set-cursor-color ac-fuzzy-cursor-color))
+      (setq ac-show-menu t)
+      (setq ac-fuzzy-enable t)
+      (setq ac-triggered nil)
+      (ac-update t)))
+  t)
+
+(defun ac-next ()
+  "Select next candidate."
+  (interactive)
+  (when (ac-menu-live-p)
+    (when (popup-hidden-p ac-menu)
+      (ac-show-menu))
+    (popup-next ac-menu)
+    (if (eq this-command 'ac-next)
+        (setq ac-dwim-enable t))))
+
+(defun ac-previous ()
+  "Select previous candidate."
+  (interactive)
+  (when (ac-menu-live-p)
+    (when (popup-hidden-p ac-menu)
+      (ac-show-menu))
+    (popup-previous ac-menu)
+    (if (eq this-command 'ac-previous)
+        (setq ac-dwim-enable t))))
+
+(defun ac-expand (arg)
+  "Try expand, and if expanded twice, select next candidate.
+If given a prefix argument, select the previous candidate."
+  (interactive "P")
+  (unless (ac-expand-common)
+    (let ((string (ac-selected-candidate)))
+      (when string
+        (when (equal ac-prefix string)
+          (if (not arg)
+              (ac-next)
+            (ac-previous))
+          (setq string (ac-selected-candidate)))
+        (ac-expand-string string
+                          (or (eq last-command 'ac-expand)
+                             (eq last-command 'ac-expand-previous)))
+        ;; Do reposition if menu at long line
+        (if (and (> (popup-direction ac-menu) 0)
+               (ac-menu-at-wrapper-line-p))
+            (ac-reposition))
+        (setq ac-show-menu t)
+        string))))
+
+(defun ac-expand-previous (arg)
+  "Like `ac-expand', but select previous candidate."
+  (interactive "P")
+  (ac-expand (not arg)))
+
+(defun ac-expand-common ()
+  "Try to expand meaningful common part."
+  (interactive)
+  (if (and ac-dwim ac-dwim-enable)
+      (ac-complete)
+    (when (and (ac-inline-live-p)
+               ac-common-part)
+      (ac-inline-hide)
+      (ac-expand-string ac-common-part (eq last-command this-command))
+      (setq ac-common-part nil)
+      t)))
+
+(defun ac-complete-1 (candidate)
+  (let ((action (popup-item-property candidate 'action))
+        (fallback nil))
+    (when candidate
+      (unless (ac-expand-string candidate)
+        (setq fallback t))
+      ;; Remember to show help later
+      (when (and ac-point candidate)
+        (unless ac-last-completion
+          (setq ac-last-completion (cons (make-marker) nil)))
+        (set-marker (car ac-last-completion) ac-point ac-buffer)
+        (setcdr ac-last-completion candidate)))
+    (ac-abort)
+    (cond
+     (action
+      (funcall action))
+     (fallback
+      (ac-fallback-command)))
+    candidate))
+
+(defun ac-complete ()
+  "Try complete."
+  (interactive)
+  (ac-complete-1 (ac-selected-candidate)))
+
+(cl-defun ac-start (&key
+                    requires
+                    force-init
+                    (triggered (or ac-triggered t)))
+  "Start completion."
+  (interactive)
+  (if (not auto-complete-mode)
+      (message "auto-complete-mode is not enabled")
+    (let* ((info (ac-prefix requires ac-ignoring-prefix-def))
+           (prefix-def (nth 0 info))
+           (point (nth 1 info))
+           (sources (nth 2 info))
+           prefix
+           (init (or force-init (not (eq ac-point point)))))
+      (if (or (null point)
+              (progn
+                (setq prefix (buffer-substring-no-properties point (point)))
+                (and (not (eq triggered 'command))
+                     (ac-stop-word-p prefix))))
+          (prog1 nil
+            (ac-abort))
+        (when (and ac-use-fuzzy ac-fuzzy-cursor-color)
+          (unless ac-cursor-color
+            (setq ac-cursor-color (frame-parameter (selected-frame) 'cursor-color))))
+        (setq ac-show-menu (or ac-show-menu (if (eq ac-auto-show-menu t) t))
+              ac-current-sources sources
+              ac-buffer (current-buffer)
+              ac-point point
+              ac-prefix prefix
+              ac-limit ac-candidate-limit
+              ac-triggered triggered
+              ac-current-prefix-def prefix-def)
+        (when (or init (null ac-prefix-overlay))
+          (ac-init))
+        (ac-set-timer)
+        (ac-set-show-menu-timer)
+        (ac-set-quick-help-timer)
+        (ac-put-prefix-overlay)
+        t))))
+
+(defun ac-stop ()
+  "Stop completing."
+  (interactive)
+  (setq ac-selected-candidate nil)
+  (ac-abort))
+
+(defun ac-ignore (&rest ignore)
+  "Same as `ignore'."
+  (interactive))
+
+(defun ac-mouse-1 (event)
+  (interactive "e")
+  (popup-awhen (popup-menu-item-of-mouse-event event)
+    (ac-complete-1 it)))
+
+(defun ac-mouse-4 (event)
+  (interactive "e")
+  (ac-previous))
+
+(defun ac-mouse-5 (event)
+  (interactive "e")
+  (ac-next))
+
+(defun ac-trigger-key-command (&optional force)
+  (interactive "P")
+  (let (started)
+    (when (or force (ac-trigger-command-p last-command))
+      (setq started (auto-complete-1 :triggered 'trigger-key)))
+    (unless started
+      (ac-fallback-command 'ac-trigger-key-command))))
+
+
+
+;;;; Basic cache facility
+
+(defvar ac-clear-variables-every-minute-timer nil)
+(defvar ac-clear-variables-after-save nil)
+(defvar ac-clear-variables-every-minute nil)
+(defvar ac-minutes-counter 0)
+
+(defun ac-clear-variable-after-save (variable &optional pred)
+  (add-to-list 'ac-clear-variables-after-save (cons variable pred)))
+
+(defun ac-clear-variables-after-save ()
+  (dolist (pair ac-clear-variables-after-save)
+    (if (or (null (cdr pair))
+            (funcall (cdr pair)))
+        (set (car pair) nil))))
+
+(defun ac-clear-variable-every-minutes (variable minutes)
+  (add-to-list 'ac-clear-variables-every-minute (cons variable minutes)))
+
+(defun ac-clear-variable-every-minute (variable)
+  (ac-clear-variable-every-minutes variable 1))
+
+(defun ac-clear-variable-every-10-minutes (variable)
+  (ac-clear-variable-every-minutes variable 10))
+
+(defun ac-clear-variables-every-minute ()
+  (cl-incf ac-minutes-counter)
+  (dolist (pair ac-clear-variables-every-minute)
+    (if (eq (% ac-minutes-counter (cdr pair)) 0)
+        (set (car pair) nil))))
+
+
+
+;;;; Auto complete mode
+
+(defun ac-cursor-on-diable-face-p (&optional point)
+  (memq (get-text-property (or point (point)) 'face) ac-disable-faces))
+
+(defun ac-trigger-command-p (command)
+  "Return non-nil if `COMMAND' is a trigger command."
+  (and (symbolp command)
+       (not (memq command ac-non-trigger-commands))
+       (or (memq command ac-trigger-commands)
+           (string-match "self-insert-command" (symbol-name command))
+           (string-match "electric" (symbol-name command)))))
+
+(defun ac-fallback-key-sequence ()
+  (setq unread-command-events
+        (append (this-single-command-raw-keys)
+                unread-command-events))
+  (read-key-sequence-vector ""))
+
+(defun ac-fallback-command (&optional except-command)
+  (let* ((auto-complete-mode nil)
+         (keys (ac-fallback-key-sequence))
+         (command (and keys (key-binding keys))))
+    (when (and (commandp command)
+               (not (eq command except-command)))
+      (setq this-command command)
+      (call-interactively command))))
+
+(defun ac-compatible-package-command-p (command)
+  "Return non-nil if `COMMAND' is compatible with auto-complete."
+  (and (symbolp command)
+       (string-match ac-compatible-packages-regexp (symbol-name command))))
+
+(defun ac-handle-pre-command ()
+  (condition-case var
+      (if (or (setq ac-triggered (and (not ac-fuzzy-enable) ; ignore key storkes in fuzzy mode
+                                      (or (eq this-command 'auto-complete) ; special case
+                                          (ac-trigger-command-p this-command)
+                                          (and ac-completing
+                                               (memq this-command ac-trigger-commands-on-completing)))
+                                      (not (ac-cursor-on-diable-face-p))
+                                      (or ac-triggered t)))
+              (ac-compatible-package-command-p this-command))
+          (progn
+            (if (or (not (symbolp this-command))
+                    (not (get this-command 'ac-quick-help-command)))
+                (ac-remove-quick-help))
+            ;; Not to cause inline completion to be disrupted.
+            (ac-inline-hide))
+        (ac-abort))
+    (error (ac-error var))))
+
+(defun ac-handle-post-command ()
+  (condition-case var
+      (when (and ac-triggered
+                 (or ac-auto-start
+                     ac-completing)
+                 (not isearch-mode))
+        (setq ac-last-point (point))
+        (ac-start :requires (unless ac-completing ac-auto-start))
+        (unless ac-disable-inline
+          (ac-inline-update)))
+    (error (ac-error var))))
+
+(defvar ac-flycheck-poll-completion-end-timer nil
+  "Timer to poll end of completion.")
+
+(defun ac-syntax-checker-workaround ()
+  (if ac-stop-flymake-on-completing
+      (progn
+        (make-local-variable 'ac-flycheck-poll-completion-end-timer)
+        (when (require 'flymake nil t)
+          (defadvice flymake-on-timer-event (around ac-flymake-stop-advice activate)
+            (unless ac-completing
+              ad-do-it)))
+        (when (require 'flycheck nil t)
+          (defadvice flycheck-handle-idle-change (around ac-flycheck-stop-advice activate)
+            (if ac-completing
+                (setq ac-flycheck-poll-completion-end-timer
+                      (run-at-time ac-flycheck-poll-completion-end-interval
+                                   nil
+                                   #'flycheck-handle-idle-change))
+              ad-do-it))))
+    (when (featurep 'flymake)
+      (ad-disable-advice 'flymake-on-timer-event 'around 'ac-flymake-stop-advice))
+    (when (featurep 'flycheck)
+      (ad-disable-advice 'flycheck-handle-idle-change 'around 'ac-flycheck-stop-advice))))
+
+(defun ac-setup ()
+  (if ac-trigger-key
+      (ac-set-trigger-key ac-trigger-key))
+  (if ac-use-comphist
+      (ac-comphist-init))
+  (unless ac-clear-variables-every-minute-timer
+    (setq ac-clear-variables-every-minute-timer (run-with-timer 60 60 'ac-clear-variables-every-minute)))
+  (ac-syntax-checker-workaround))
+
+;;;###autoload
+(define-minor-mode auto-complete-mode
+  "AutoComplete mode"
+  :lighter " AC"
+  :keymap ac-mode-map
+  :group 'auto-complete
+  (if auto-complete-mode
+      (progn
+        (ac-setup)
+        (add-hook 'pre-command-hook 'ac-handle-pre-command nil t)
+        (add-hook 'post-command-hook 'ac-handle-post-command nil t)
+        (add-hook 'after-save-hook 'ac-clear-variables-after-save nil t)
+        (run-hooks 'auto-complete-mode-hook))
+    (remove-hook 'pre-command-hook 'ac-handle-pre-command t)
+    (remove-hook 'post-command-hook 'ac-handle-post-command t)
+    (remove-hook 'after-save-hook 'ac-clear-variables-after-save t)
+    (ac-abort)))
+
+(defun auto-complete-mode-maybe ()
+  "What buffer `auto-complete-mode' prefers."
+  (if (and (not (minibufferp (current-buffer)))
+           (memq major-mode ac-modes))
+      (auto-complete-mode 1)))
+
+;;;###autoload
+(define-global-minor-mode global-auto-complete-mode
+  auto-complete-mode auto-complete-mode-maybe
+  :group 'auto-complete)
+
+
+
+;;;; Compatibilities with other extensions
+
+(defun ac-flyspell-workaround ()
+  "Flyspell uses `sit-for' for delaying its process. Unfortunatelly,
+it stops auto completion which is trigger with `run-with-idle-timer'.
+This workaround avoid flyspell processes when auto completion is being started."
+  (interactive)
+  (defadvice flyspell-post-command-hook (around ac-flyspell-workaround activate)
+    (unless ac-triggered
+      ad-do-it)))
+
+(defun ac-linum-workaround ()
+  "linum-mode tries to display the line numbers even for the
+completion menu. This workaround stops that annoying behavior."
+  (interactive)
+  (defadvice linum-update (around ac-linum-update-workaround activate)
+    (unless ac-completing
+      ad-do-it)))
+
+
+
+;;;; Standard sources
+
+(defmacro ac-define-source (name source)
+  "Source definition macro. It defines a complete command also."
+  (declare (indent 1))
+  `(progn
+     (defvar ,(intern (format "ac-source-%s" name)))
+     ;; Use `setq' to reset ac-source-NAME every time
+     ;; `ac-define-source' is called.  This is useful, for example
+     ;; when evaluating `ac-define-source' using C-M-x (`eval-defun').
+     (setq ,(intern (format "ac-source-%s" name)) ,source)
+     (defun ,(intern (format "ac-complete-%s" name)) ()
+       (interactive)
+       (auto-complete '(,(intern (format "ac-source-%s" name)))))))
+
+;; Words in buffer source
+(defvar ac-word-index nil)
+
+(defun ac-candidate-words-in-buffer (point prefix limit)
+  (let ((i 0)
+        candidate
+        candidates
+        (regexp (concat "\\_<" (regexp-quote prefix) "\\(\\sw\\|\\s_\\)+\\_>")))
+    (save-excursion
+      ;; Search backward
+      (goto-char point)
+      (while (and (or (not (integerp limit)) (< i limit))
+                  (re-search-backward regexp nil t))
+        (setq candidate (match-string-no-properties 0))
+        (unless (member candidate candidates)
+          (push candidate candidates)
+          (cl-incf i)))
+      ;; Search backward
+      (goto-char (+ point (length prefix)))
+      (while (and (or (not (integerp limit)) (< i limit))
+                  (re-search-forward regexp nil t))
+        (setq candidate (match-string-no-properties 0))
+        (unless (member candidate candidates)
+          (push candidate candidates)
+          (cl-incf i)))
+      (nreverse candidates))))
+
+(defun ac-incremental-update-word-index ()
+  (unless (local-variable-p 'ac-word-index)
+    (make-local-variable 'ac-word-index))
+  (if (null ac-word-index)
+      (setq ac-word-index (cons nil nil)))
+  ;; Mark incomplete
+  (if (car ac-word-index)
+      (setcar ac-word-index nil))
+  (let ((index (cdr ac-word-index))
+        (words (ac-candidate-words-in-buffer ac-point ac-prefix (or (and (integerp ac-limit) ac-limit) 10))))
+    (dolist (word words)
+      (unless (member word index)
+        (push word index)
+        (setcdr ac-word-index index)))))
+
+(defun ac-update-word-index-1 ()
+  (unless (local-variable-p 'ac-word-index)
+    (make-local-variable 'ac-word-index))
+  (when (and (not (car ac-word-index))
+             (< (buffer-size) 1048576))
+    ;; Complete index
+    (setq ac-word-index
+          (cons t
+                (split-string (buffer-substring-no-properties (point-min) (point-max))
+                              "\\(?:^\\|\\_>\\).*?\\(?:\\_<\\|$\\)")))))
+
+(defun ac-update-word-index ()
+  (dolist (buffer (buffer-list))
+    (when (or ac-fuzzy-enable
+              (not (eq buffer (current-buffer))))
+      (with-current-buffer buffer
+        (ac-update-word-index-1)))))
+
+(defun ac-word-candidates (&optional buffer-pred)
+  (cl-loop initially (unless ac-fuzzy-enable (ac-incremental-update-word-index))
+           for buffer in (buffer-list)
+           if (and (or (not (integerp ac-limit)) (< (length candidates) ac-limit))
+                   (if buffer-pred (funcall buffer-pred buffer) t))
+           append (funcall ac-match-function
+                           ac-prefix
+                           (and (local-variable-p 'ac-word-index buffer)
+                                (cdr (buffer-local-value 'ac-word-index buffer))))
+           into candidates
+           finally return (delete-dups candidates)))
+
+(ac-define-source words-in-buffer
+  '((candidates . ac-word-candidates)))
+
+(ac-define-source words-in-all-buffer
+  '((init . ac-update-word-index)
+    (candidates . ac-word-candidates)))
+
+(ac-define-source words-in-same-mode-buffers
+  '((init . ac-update-word-index)
+    (candidates . (ac-word-candidates
+                   (lambda (buffer)
+                     (derived-mode-p (buffer-local-value 'major-mode buffer)))))))
+
+;; Lisp symbols source
+(defvar ac-symbols-cache nil)
+(ac-clear-variable-every-10-minutes 'ac-symbols-cache)
+
+(defun ac-symbol-file (symbol type)
+  (if (fboundp 'find-lisp-object-file-name)
+      (find-lisp-object-file-name symbol type)
+    (let ((file-name (with-no-warnings
+                       (describe-simplify-lib-file-name
+                        (symbol-file symbol type)))))
+      (when (equal file-name "loaddefs.el")
+        ;; Find the real def site of the preloaded object.
+        (let ((location (condition-case nil
+                            (if (eq type 'defun)
+                                (find-function-search-for-symbol symbol nil
+                                                                 "loaddefs.el")
+                              (find-variable-noselect symbol file-name))
+                          (error nil))))
+          (when location
+            (with-current-buffer (car location)
+              (when (cdr location)
+                (goto-char (cdr location)))
+              (when (re-search-backward
+                     "^;;; Generated autoloads from \\(.*\\)" nil t)
+                (setq file-name (match-string 1)))))))
+      (if (and (null file-name)
+               (or (eq type 'defun)
+                   (integerp (get symbol 'variable-documentation))))
+          ;; It's a object not defined in Elisp but in C.
+          (if (get-buffer " *DOC*")
+              (if (eq type 'defun)
+                  (help-C-file-name (symbol-function symbol) 'subr)
+                (help-C-file-name symbol 'var))
+            'C-source)
+        file-name))))
+
+(defun ac-symbol-documentation (symbol)
+  (if (stringp symbol)
+      (setq symbol (intern-soft symbol)))
+  (ignore-errors
+    (with-temp-buffer
+      (let ((standard-output (current-buffer)))
+        (prin1 symbol)
+        (princ " is ")
+        (cond
+         ((fboundp symbol)
+          ;; import help-xref-following
+          (require 'help-mode)
+          (let ((help-xref-following t)
+                (major-mode 'help-mode)) ; avoid error in Emacs 24
+            (describe-function-1 symbol))
+          (buffer-string))
+         ((boundp symbol)
+          (let ((file-name  (ac-symbol-file symbol 'defvar)))
+            (princ "a variable")
+            (when file-name
+              (princ " defined in `")
+              (princ (if (eq file-name 'C-source)
+                         "C source code"
+                       (file-name-nondirectory file-name))))
+            (princ "'.\n\n")
+            (princ (or (documentation-property symbol 'variable-documentation t)
+                       "Not documented."))
+            (buffer-string)))
+         ((facep symbol)
+          (let ((file-name  (ac-symbol-file symbol 'defface)))
+            (princ "a face")
+            (when file-name
+              (princ " defined in `")
+              (princ (if (eq file-name 'C-source)
+                         "C source code"
+                       (file-name-nondirectory file-name))))
+            (princ "'.\n\n")
+            (princ (or (documentation-property symbol 'face-documentation t)
+                       "Not documented."))
+            (buffer-string)))
+         (t
+          (let ((doc (documentation-property symbol 'group-documentation t)))
+            (when doc
+              (princ "a group.\n\n")
+              (princ doc)
+              (buffer-string)))))))))
+
+(defun ac-symbol-candidates ()
+  (or ac-symbols-cache
+      (setq ac-symbols-cache
+            (cl-loop for x being the symbols
+                     if (or (fboundp x)
+                            (boundp x)
+                            (symbol-plist x))
+                     collect (symbol-name x)))))
+
+(ac-define-source symbols
+  '((candidates . ac-symbol-candidates)
+    (document . ac-symbol-documentation)
+    (symbol . "s")
+    (cache)))
+
+;; Lisp functions source
+(defvar ac-functions-cache nil)
+(ac-clear-variable-every-10-minutes 'ac-functions-cache)
+
+(defun ac-function-candidates ()
+  (or ac-functions-cache
+      (setq ac-functions-cache
+            (cl-loop for x being the symbols
+                     if (fboundp x)
+                     collect (symbol-name x)))))
+
+(ac-define-source functions
+  '((candidates . ac-function-candidates)
+    (document . ac-symbol-documentation)
+    (symbol . "f")
+    (prefix . "(\\(\\(?:\\sw\\|\\s_\\)+\\)")
+    (cache)))
+
+;; Lisp variables source
+(defvar ac-variables-cache nil)
+(ac-clear-variable-every-10-minutes 'ac-variables-cache)
+
+(defun ac-variable-candidates ()
+  (or ac-variables-cache
+      (setq ac-variables-cache
+            (cl-loop for x being the symbols
+                     if (boundp x)
+                     collect (symbol-name x)))))
+
+(ac-define-source variables
+  '((candidates . ac-variable-candidates)
+    (document . ac-symbol-documentation)
+    (symbol . "v")
+    (cache)))
+
+;; Lisp features source
+(defvar ac-emacs-lisp-features nil)
+(ac-clear-variable-every-10-minutes 'ac-emacs-lisp-features)
+
+(defun ac-emacs-lisp-feature-candidates ()
+  (or ac-emacs-lisp-features
+      (if (fboundp 'find-library-suffixes)
+          (let ((suffix (concat (regexp-opt (find-library-suffixes) t) "\\'")))
+            (setq ac-emacs-lisp-features
+                  (append (mapcar 'prin1-to-string features)
+                          (cl-loop for dir in load-path
+                                   if (file-directory-p dir)
+                                   append (cl-loop for file in (directory-files dir)
+                                                   if (string-match suffix file)
+                                                   collect (substring file 0 (match-beginning 0))))))))))
+
+(ac-define-source features
+  '((depends find-func)
+    (candidates . ac-emacs-lisp-feature-candidates)
+    (prefix . "require +'\\(\\(?:\\sw\\|\\s_\\)*\\)")
+    (requires . 0)))
+
+(defvaralias 'ac-source-emacs-lisp-features 'ac-source-features)
+
+;; Abbrev source
+(ac-define-source abbrev
+  '((candidates . (mapcar 'popup-x-to-string (append (vconcat local-abbrev-table global-abbrev-table) nil)))
+    (action . expand-abbrev)
+    (symbol . "a")
+    (cache)))
+
+;; Files in current directory source
+(ac-define-source files-in-current-dir
+  '((candidates . (directory-files default-directory))
+    (cache)))
+
+;; Filename source
+(defvar ac-filename-cache nil)
+
+(defun ac-filename-candidate ()
+  (let (file-name-handler-alist)
+    (unless (or (and comment-start-skip
+                     (string-match comment-start-skip ac-prefix))
+                (file-regular-p ac-prefix))
+      (ignore-errors
+        (cl-loop with dir = (file-name-directory ac-prefix)
+                 with files = (or (assoc-default dir ac-filename-cache)
+                                  (let ((files (directory-files dir nil "^[^.]")))
+                                    (push (cons dir files) ac-filename-cache)
+                                    files))
+                 for file in files
+                 for path = (concat dir file)
+                 collect (if (file-directory-p path)
+                             (concat path "/")
+                           path))))))
+
+(ac-define-source filename
+  '((init . (setq ac-filename-cache nil))
+    (candidates . ac-filename-candidate)
+    (prefix . valid-file)
+    (requires . 0)
+    (action . ac-start)
+    (limit . nil)))
+
+;; Dictionary source
+(ac-define-source dictionary
+  '((candidates . ac-buffer-dictionary)
+    (symbol . "d")))
+
+(provide 'auto-complete)
+;;; auto-complete.el ends here
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/ada-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/ada-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/ada-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/ada-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/c++-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/c++-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/c++-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/c++-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/c-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/c-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/c-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/c-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/caml-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/caml-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/caml-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/caml-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/clojure-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/clojure-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/clojure-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/clojure-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/clojurescript-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/clojurescript-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/clojurescript-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/clojurescript-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/coq-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/coq-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/coq-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/coq-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/css-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/css-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/css-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/css-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/erlang-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/erlang-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/erlang-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/erlang-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/go-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/go-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/go-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/go-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/haskell-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/haskell-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/haskell-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/haskell-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/java-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/java-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/java-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/java-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/js-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/js-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/js-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/js-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/lua-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/lua-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/lua-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/lua-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/octave-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/octave-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/octave-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/octave-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/php-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/php-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/php-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/php-mode
diff --git a/emacs.d/elpa/auto-complete-20160107.8/dict/python-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/python-mode
new file mode 100644
index 0000000..09e936c
--- /dev/null
+++ b/emacs.d/elpa/auto-complete-20160107.8/dict/python-mode
@@ -0,0 +1,379 @@
+ArithmeticError
+AssertionError
+AttributeError
+BaseException
+BufferError
+BytesWarning
+DeprecationWarning
+EOFError
+Ellipsis
+EnvironmentError
+Exception
+False
+FloatingPointError
+FutureWarning
+GeneratorExit
+IOError
+ImportError
+ImportWarning
+IndentationError
+IndexError
+KeyError
+KeyboardInterrupt
+LookupError
+MemoryError
+NameError
+None
+NotImplemented
+NotImplementedError
+OSError
+OverflowError
+PendingDeprecationWarning
+ReferenceError
+RuntimeError
+RuntimeWarning
+StandardError
+StopIteration
+SyntaxError
+SyntaxWarning
+SystemError
+SystemExit
+TabError
+True
+TypeError
+UnboundLocalError
+UnicodeDecodeError
+UnicodeEncodeError
+UnicodeError
+UnicodeTranslateError
+UnicodeWarning
+UserWarning
+ValueError
+Warning
+ZeroDivisionError
+__builtins__
+__debug__
+__doc__
+__file__
+__future__
+__import__
+__init__
+__main__
+__name__
+__package__
+_dummy_thread
+_thread
+abc
+abs
+aifc
+all
+and
+any
+apply
+argparse
+array
+as
+assert
+ast
+asynchat
+asyncio
+asyncore
+atexit
+audioop
+base64
+basestring
+bdb
+bin
+binascii
+binhex
+bisect
+bool
+break
+buffer
+builtins
+bytearray
+bytes
+bz2
+calendar
+callable
+cgi
+cgitb
+chr
+chuck
+class
+classmethod
+cmath
+cmd
+cmp
+code
+codecs
+codeop
+coerce
+collections
+colorsys
+compile
+compileall
+complex
+concurrent
+configparser
+contextlib
+continue
+copy
+copyreg
+copyright
+credits
+crypt
+csv
+ctypes
+curses
+datetime
+dbm
+decimal
+def
+del
+delattr
+dict
+difflib
+dir
+dis
+distutils
+divmod
+doctest
+dummy_threading
+elif
+else
+email
+enumerate
+ensurepip
+enum
+errno
+eval
+except
+exec
+execfile
+exit
+faulthandler
+fcntl
+file
+filecmp
+fileinput
+filter
+finally
+float
+fnmatch
+for
+format
+formatter
+fpectl
+fractions
+from
+frozenset
+ftplib
+functools
+gc
+getattr
+getopt
+getpass
+gettext
+glob
+global
+globals
+grp
+gzip
+hasattr
+hash
+hashlib
+heapq
+help
+hex
+hmac
+html
+http
+id
+if
+imghdr
+imp
+impalib
+import
+importlib
+in
+input
+inspect
+int
+intern
+io
+ipaddress
+is
+isinstance
+issubclass
+iter
+itertools
+json
+keyword
+lambda
+len
+license
+linecache
+list
+locale
+locals
+logging
+long
+lzma
+macpath
+mailbox
+mailcap
+map
+marshal
+math
+max
+memoryview
+mimetypes
+min
+mmap
+modulefinder
+msilib
+msvcrt
+multiprocessing
+netrc
+next
+nis
+nntplib
+not
+numbers
+object
+oct
+open
+operator
+optparse
+or
+ord
+os
+ossaudiodev
+parser
+pass
+pathlib
+pdb
+pickle
+pickletools
+pipes
+pkgutil
+platform
+plistlib
+poplib
+posix
+pow
+pprint
+print
+profile
+property
+pty
+pwd
+py_compiler
+pyclbr
+pydoc
+queue
+quit
+quopri
+raise
+random
+range
+raw_input
+re
+readline
+reduce
+reload
+repr
+reprlib
+resource
+return
+reversed
+rlcompleter
+round
+runpy
+sched
+select
+selectors
+self
+set
+setattr
+shelve
+shlex
+shutil
+signal
+site
+slice
+smtpd
+smtplib
+sndhdr
+socket
+socketserver
+sorted
+spwd
+sqlite3
+ssl
+stat
+staticmethod
+statistics
+str
+string
+stringprep
+struct
+subprocess
+sum
+sunau
+super
+symbol
+symtable
+sys
+sysconfig
+syslog
+tabnanny
+tarfile
+telnetlib
+tempfile
+termios
+test
+textwrap
+threading
+time
+timeit
+tkinter
+token
+tokenize
+trace
+traceback
+tracemalloc
+try
+tty
+tuple
+turtle
+type
+types
+unichr
+unicode
+unicodedata
+unittest
+urllib
+uu
+uuid
+vars
+venv
+warnings
+wave
+weakref
+webbrowser
+while
+winsound
+winreg
+with
+wsgiref
+xdrlib
+xml
+xmlrpc
+xrange
+yield
+zip
+zipfile
+zipimport
+zlib
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/qml-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/qml-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/qml-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/qml-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/ruby-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/ruby-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/ruby-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/ruby-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/scala-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/scala-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/scala-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/scala-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/scheme-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/scheme-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/scheme-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/scheme-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/sclang-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/sclang-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/sclang-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/sclang-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/sh-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/sh-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/sh-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/sh-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/tcl-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/tcl-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/tcl-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/tcl-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/ts-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/ts-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/ts-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/ts-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/tuareg-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/tuareg-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/tuareg-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/tuareg-mode
diff --git a/emacs.d/elpa/auto-complete-20150618.1949/dict/verilog-mode b/emacs.d/elpa/auto-complete-20160107.8/dict/verilog-mode
similarity index 100%
rename from emacs.d/elpa/auto-complete-20150618.1949/dict/verilog-mode
rename to emacs.d/elpa/auto-complete-20160107.8/dict/verilog-mode
diff --git a/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode-autoloads.el b/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode-autoloads.el
deleted file mode 100644
index b2d5df0..0000000
--- a/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode-autoloads.el
+++ /dev/null
@@ -1,23 +0,0 @@
-;;; centered-cursor-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "centered-cursor-mode" "centered-cursor-mode.el"
-;;;;;;  (21837 24217 0 0))
-;;; Generated autoloads from centered-cursor-mode.el
-
-(autoload 'centered-cursor-mode "centered-cursor-mode" "\
-Makes the cursor stay vertically in a defined
-position (usually centered).
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; centered-cursor-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode-pkg.el b/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode-pkg.el
deleted file mode 100644
index 73d54db..0000000
--- a/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "centered-cursor-mode" "20150420.1942" "cursor stays vertically centered" 'nil :url "http://www.emacswiki.org/emacs/centered-cursor-mode.el" :keywords '("convenience"))
diff --git a/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode.el b/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode.el
deleted file mode 100644
index 0174c02..0000000
--- a/emacs.d/elpa/centered-cursor-mode-20150420.1942/centered-cursor-mode.el
+++ /dev/null
@@ -1,430 +0,0 @@
-;;; centered-cursor-mode.el --- cursor stays vertically centered
-
-;; Copyright (C) 2007  André Riemann
-
-;; Author: André Riemann <andre.riemann@web.de>
-;; Maintainer: André Riemann <andre.riemann@web.de>
-;; Created: 2007-09-14
-;; Keywords: convenience
-;; Package-Version: 20150420.1942
-
-;; URL: http://www.emacswiki.org/emacs/centered-cursor-mode.el
-;; Compatibility: tested with GNU Emacs 23.0, 24
-;; Version: 0.5.4
-;; Last-Updated: 2015-04-20
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;; MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; Makes the cursor stay vertically in a defined position (usually
-;; centered). The vertical position can be altered, see key definition
-;; below.
-
-;; To load put that in .emacs:
-;;     (require 'centered-cursor-mode)
-;; To activate do:
-;;     M-x centered-cursor-mode
-;; for buffer local or
-;;     M-x global-centered-cursor-mode
-;; for global minor mode.
-;; Also possible: put that in .emacs
-;;     (and
-;;      (require 'centered-cursor-mode)
-;;      (global-centered-cursor-mode +1))
-;; to always have centered-cursor-mode on in all buffers.
-
-;;; TODO:
-;; - the code is a mess
-;; - ccm-vpos-inverted doesn't work with ccm-vpos == 0, because first
-;;   position from top is 0 and from bottom -1
-;; - interactive first start isn't animated when calling global-...
-;;   because it starts the modes for each buffer and interactive-p fails
-;;   for that
-;; - more bugs?
-
-;;; Change Log:
-;; 2015-04-20  andre-r
-;;   * corrected URL in header
-;; 2015-03-01  andre-r
-;;   * fixed bug where Emacs without X support (emacs-nox) didn't find mouse-wheel-mode
-;; 2009-08-31  andre-r
-;;   * replaced window-body-height with window-text-height
-;;     (partially visible lines are not counted in window-text-height)
-;;   * bug fixed in ccm-vpos-recenter
-;;     (some parentheses where wrong after the last update)
-;; 2009-02-23  andre-r
-;;   * some simplifications
-;; 2009-02-22  andre-r
-;;   * some tips from Drew Adams:
-;;     - new local variable coding:utf-8
-;;     - made recenter-sequence a defvar
-;;     - added groups scrolling and convenience
-;;     - replaced mouse-4 and mouse-5 with
-;;       mouse-wheel-up-event and mouse-wheel-down-event
-;;     - added scroll-bar-toolkit-scroll to ccm-ignored-commands
-;;     - made ccm-ignored-commands customisable
-;;   * removed a bug where it didn't work with more than one window
-;;     displaying the same buffer
-;;   * added function for page up and down scrolling
-;;     (standard ones didn't work well with this mode)
-;;   * made the animation delay customisable
-;;   * made the initial vertical position customisable
-;;   * made the behaviour at the end of the file customisable
-;; 2008-02-02  andre-r
-;;   * fixed bug that led to wrong-type-argument
-;;     when opening a new buffer
-;;   * some other minor stuff
-;; 2007-09-24  andre-r
-;;   * added global minor mode
-;; 2007-09-21  andre-r
-;;   * not recentering at end of buffer
-;;   * defvar animate-first-start-p
-;; 2007-09-14  andre-r
-;;   * inital release
-
-;; This file is *NOT* part of GNU Emacs.
-
-;;; Code:
-
-
-(require 'mouse-wheel-mode nil 'noerror)
-
-(defgroup centered-cursor nil
-  "Makes the cursor stay vertically in a defined position (usually centered).
-Instead the cursor the text moves around the cursor."
-  :group 'scrolling
-  :group 'convenience
-  :link '(emacs-library-link :tag "Source Lisp File" "centered-cursor-mode.el")
-  :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki/centered-cursor-mode.el"))
-
-(defcustom ccm-step-size 2
-  "Step size when animated recentering."
-  :group 'centered-cursor
-  :tag "Animation step size"
-  :type 'integer)
-
-(defcustom ccm-step-delay 0.02
-  "Delay between animation steps.
-If you want a different animation speed."
-  :group 'centered-cursor
-  :tag "Animation step delay"
-  :type 'number)
-
-(defcustom ccm-ignored-commands '(mouse-drag-region
-                                  mouse-set-point
-                                  widget-button-click
-                                  scroll-bar-toolkit-scroll)
-  "After these commands recentering is ignored.
-This is to prevent unintentional jumping (especially when mouse
-clicking). Following commands (except the ignored ones) will
-cause an animated recentering to give a feedback and not just
-jumping to the center."
-  :group 'centered-cursor
-  :tag "Ignored commands"
-  :type '(repeat (symbol :tag "Command")))
-
-(defcustom ccm-vpos-init '(round (window-text-height) 2)
-  "This is the screen line position where the cursor initially stays."
-  :group 'centered-cursor
-  :tag "Vertical cursor position"
-  :type '(choice (const :tag "Center" (round (window-text-height) 2))
-                 (const :tag "Golden ratio" (round (* 21 (window-text-height)) 34))
-                 (integer :tag "Lines from top" :value 10)))
-(make-variable-buffer-local 'ccm-vpos-init)
-
-(defcustom ccm-vpos-inverted 1
-  "Inverted vertical cursor position.
-Defines if the initial vertical position `ccm-vpos-init' is
-measured from the bottom instead from the top."
-  :group 'centered-cursor
-  :tag "Inverted cursor position"
-  :type '(choice (const :tag "Inverted" -1)
-                 (const :tag "Not inverted" 1)))
-(make-variable-buffer-local 'ccm-vpos-inverted)
-
-(defcustom ccm-recenter-at-end-of-file nil
-  "Recenter at the end of the file.
-If non-nil the end of the file is recentered. If nil the end of
-the file stays at the end of the window."
-  :group 'centered-cursor
-  :tag "Recenter at EOF"
-  :type '(choice (const :tag "Don't recenter at the end of the file" nil)
-                 (const :tag "Recenter at the end of the file" t)))
-(make-variable-buffer-local 'ccm-recenter-end-of-file)
-
-(defvar ccm-vpos nil
-  "This is the screen line position where the cursor stays.")
-(make-variable-buffer-local 'ccm-vpos)
-
-(defvar animate-first-start-p nil
-  "Whether or not to animate at first start. It is set to nil, if
-centered-cursor-mode is called non-interactively.")
-(make-variable-buffer-local 'animate-first-start-p)
-
-(defvar recenter-sequence nil
-  "Before animated recentering a list is generated first with positions
-to successively recenter to")
-(make-variable-buffer-local 'recenter-sequence)
-
-(defvar ccm-map
-  (let ((ccm-map (make-sparse-keymap)))
-    (define-key ccm-map [(control meta -)]  'ccm-vpos-up)
-    (define-key ccm-map [(control meta +)]  'ccm-vpos-down)
-    (define-key ccm-map [(control meta =)]  'ccm-vpos-down)
-    (define-key ccm-map [(control meta ?0)] 'ccm-vpos-recenter)
-    (when (and (boundp 'mouse-wheel-mode) mouse-wheel-mode)
-      (mapc (lambda (key)
-              (define-key ccm-map key 'ccm-mwheel-scroll))
-            (list (vector mouse-wheel-up-event)
-                  (vector mouse-wheel-down-event)
-                  (vector (list 'control mouse-wheel-up-event))
-                  (vector (list 'control mouse-wheel-down-event))
-                  (vector (list 'shift mouse-wheel-up-event))
-                  (vector (list 'shift mouse-wheel-down-event)))))
-    (define-key ccm-map [(meta v)] 'ccm-scroll-down)
-    (define-key ccm-map [(control v)] 'ccm-scroll-up)
-    (define-key ccm-map [prior] 'ccm-scroll-down)
-    (define-key ccm-map [next] 'ccm-scroll-up)
-   ccm-map)
-  "Keymap used in centered-cursor-mode.")
-
-
-(defun ccm-mwheel-scroll (event)
-  "Very similar to `mwheel-scroll', but does not use `scroll-down'
-and `scroll-up' but `previous-line' and `next-line', that is, the
-cursor is moved and thus the text in the window is scrolled
-due to `recenter'.
-
-The customizable variable `mouse-wheel-scroll-amount' is used to
-determine how much to scroll, where nil instead of a number means
-the same as in mwheel-scroll, scroll by a near full screen.
-
-This command exists, because mwheel-scroll caused strange
-behaviour with automatic recentering."
-;;  (interactive (list last-input-event))
-  (interactive "e")
-  (let* ((mods (delq 'click (delq 'double (delq 'triple (event-modifiers event)))))
-         (amt (assoc mods mouse-wheel-scroll-amount)))
-    ;;(message "%S" mods)
-    (if amt
-        (setq amt (or (cdr amt)
-                      (- (window-text-height)
-                         next-screen-context-lines)))
-      (let ((list-elt mouse-wheel-scroll-amount))
-        (while (consp (setq amt (pop list-elt))))))
-    (if mouse-wheel-follow-mouse
-        (select-window (posn-window (event-start event))))
-    (let ((button (mwheel-event-button event)))
-      (cond
-       ((eq button mouse-wheel-down-event)
-        (forward-line (- amt)))
-        ;;(princ amt))
-       ((eq button mouse-wheel-up-event)
-        (forward-line amt))
-         ;;(princ amt))
-       (t (error "Bad binding in ccm-mwheel-scroll"))))))
-
-(defun ccm-scroll-down (&optional arg)
-  "Replaces `scroll-down' because with scroll-down
-`centered-cursor-mode' sometimes doesn't reach the top of the
-buffer. This version actually moves the cursor with
-`previous-line'. Since with centered-cursor-mode the cursor is in
-a fixed position the movement appears as page up."
-  (interactive "P")
-  (let ((amt (or arg (- (window-text-height)
-                        next-screen-context-lines))))
-    (forward-line (- amt))))
-
-(defun ccm-scroll-up (&optional arg)
-  "Replaces `scroll-up' to be consistent with `ccm-scroll-down'.
-This version actually moves the cursor with `previous-line'.
-Since with centered-cursor-mode the cursor is in a fixed position
-the movement appears as page up."
-  (interactive "P")
-  (let ((amt (or arg (- (window-text-height)
-                        next-screen-context-lines))))
-    (forward-line amt)))
-
-
-(defun ccm-vpos-down (arg)
-  "Adjust the value of the screen line (where the cursor stays) by arg.
-Negative values for arg are possible. Just the variable ccm-vpos
-is set."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (let ((new-pos (if (< ccm-vpos 0)
-                     (- ccm-vpos arg)
-                   (+ ccm-vpos arg)))
-        ;; see pos-visible-in-window-p
-        (vpos-max (if (< ccm-vpos 0)
-                      -1
-                    (- (window-text-height) 1)))
-        (vpos-min (if (< ccm-vpos 0)
-                      (- (window-text-height))
-                    0)))
-    (setq ccm-vpos
-          (cond
-           ((< new-pos vpos-min)
-            vpos-min)
-           ((> new-pos vpos-max)
-            vpos-max)
-           (t
-            new-pos)))))
-
-(defun ccm-vpos-up (arg)
-  "See `ccm-vpos-down'."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (ccm-vpos-down (- arg)))
-
-(defun ccm-vpos-recenter ()
-  "Set the value of the screen line (where the cursor stays) in
-the center. Just the variable ccm-vpos is set."
-  (interactive)
-  (if (equal (current-buffer)
-             (window-buffer (selected-window)))
-      (setq ccm-vpos (* (eval ccm-vpos-init)
-                        ccm-vpos-inverted))))
-
-(defun ccm-position-cursor ()
-  "Do the actual recentering at the position `ccm-vpos'."
-  (unless (member this-command ccm-ignored-commands)
-    (unless ccm-vpos
-      (ccm-vpos-recenter))
-    (unless (minibufferp (current-buffer))
-      (if (equal (current-buffer)
-                 (window-buffer (selected-window)))
-          (let* ((current-line
-                  (if (< ccm-vpos 0)
-                      ;; one-based, from bottom, negative
-                      (- (count-lines (point)
-                                      ;; window-end is sometimes < 0
-                                      ;; when opening a help buffer
-                                      (if (> (window-end) 0)
-                                          (window-end)
-                                        1)))
-                    ;; zero-based, from top, positive
-                    (+ (count-lines (window-start) (point))
-                       ;; count-lines returns different value in column 0
-                       (if (= (current-column) 0) 0 -1))))
-                 (diff (- ccm-vpos current-line))
-                 (step-size ccm-step-size)
-                 (step-delay ccm-step-delay)
-                 (vpos-inverted ccm-vpos-inverted)
-                 (recenter-at-end-of-file ccm-recenter-at-end-of-file))
-
-            (let* ((bottom-vpos (if (< ccm-vpos 0)
-                                    (- ccm-vpos)
-                                  (- (window-text-height) ccm-vpos)))
-                   (correction (save-excursion
-                                 (if (or (= (point) (point-max))
-                                         (progn
-                                           (goto-char (point-max))
-                                           (zerop (current-column))))
-                                     1 0)))
-                   ;; lines from point to end of buffer
-                   (bottom-lines (+ (count-lines (point) (point-max))
-                                    correction)))
-
-              ;; only animate if the point was moved rather far away
-              ;; before by a mouseclick (see ccm-ignored-commands)
-              ;; or if minor mode is just entered interactively
-              (if (not (and (> (abs diff) 4)
-                            (or (member last-command ccm-ignored-commands)
-                                animate-first-start-p)))
-
-                  (recenter (if (and (< bottom-lines bottom-vpos)
-                                     (not recenter-at-end-of-file))
-                                ;; if near the bottom, recenter in the
-                                ;; negative screen line that equals the
-                                ;; bottom buffer line, i.e. if we are in
-                                ;; the second last line (-2) of the
-                                ;; buffer, the cursor will be recentered
-                                ;; in -2
-                                (- bottom-lines)
-                              ccm-vpos))
-
-                (setq animate-first-start-p nil)
-                ;; first build a list with positions to successively recenter to
-                (setq recenter-sequence
-                      ;; reverse: because we build the list not FROM -> TO but
-                      ;; TO -> FROM because if step size in number-sequence is
-                      ;; bigger than one, TO might not included, that means the
-                      ;; ccm-vpos would not be reached
-                      ;; cdr: don't recenter the current-line
-                      (if (and (< bottom-lines bottom-vpos)
-                               (not recenter-at-end-of-file))
-                          ;; this one is for animation near the bottom
-                          (cdr (reverse (number-sequence
-                                         (- bottom-lines)
-                                         (if (< ccm-vpos 0)
-                                             current-line
-                                           (- (- (window-text-height) current-line)))
-                                         (* (/ diff (abs diff)) (- step-size)))))
-                        (cdr (reverse (number-sequence
-                                       ccm-vpos
-                                       current-line
-                                       (* (/ diff (abs diff)) (- step-size)))))))
-                ;; (message "%d %d %d (%d): %S" current-line ccm-vpos bottom-lines diff recenter-sequence)
-                (while recenter-sequence
-                  ;; actual animation
-                  (recenter (pop recenter-sequence))
-                  (if (car recenter-sequence) (sit-for step-delay t))))))))))
-
-(defun ccm-first-start (animate)
-  "Called from centered-cursor-mode. Animate at first start, if
-centered-cursor-mode is called interactively."
-  (let ((animate-first-start-p animate))
-    (ccm-vpos-recenter)
-    (ccm-position-cursor)))
-
-;;(defalias 'ccm 'centered-cursor-mode)
-;;;###autoload
-(define-minor-mode centered-cursor-mode
-  "Makes the cursor stay vertically in a defined
-position (usually centered)."
-  :init-value nil
-;;  :lighter nil
-  :lighter " ¢"
-  :keymap ccm-map
-  (cond
-   (centered-cursor-mode
-    (ccm-first-start (interactive-p))
-    (add-hook 'post-command-hook 'ccm-position-cursor t t)
-    (add-hook 'window-configuration-change-hook 'ccm-vpos-recenter t t))
-   (t
-    (remove-hook 'post-command-hook 'ccm-position-cursor t)
-    (remove-hook 'window-configuration-change-hook 'ccm-vpos-recenter t))))
-
-
-(define-global-minor-mode global-centered-cursor-mode centered-cursor-mode
-  centered-cursor-mode)
-
-(provide 'centered-cursor-mode)
-
-;;; Help:
-;; (info "(elisp)Defining Minor Modes")
-;; (info "(elisp)Screen Lines")
-;; (info "(elisp)Hooks")
-;; (info "(elisp)Customization")
-;; (find-function 'mwheel-scroll)
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
-;;; centered-cursor-mode.el ends here
diff --git a/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode-autoloads.el b/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode-autoloads.el
new file mode 100644
index 0000000..79e2254
--- /dev/null
+++ b/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode-autoloads.el
@@ -0,0 +1,23 @@
+;;; centered-cursor-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "centered-cursor-mode" "centered-cursor-mode.el"
+;;;;;;  (22171 46582 0 0))
+;;; Generated autoloads from centered-cursor-mode.el
+
+(autoload 'centered-cursor-mode "centered-cursor-mode" "\
+Makes the cursor stay vertically in a defined
+position (usually centered).
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; centered-cursor-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode-pkg.el b/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode-pkg.el
new file mode 100644
index 0000000..b899942
--- /dev/null
+++ b/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "centered-cursor-mode" "20151001.634" "cursor stays vertically centered" 'nil :url "http://www.emacswiki.org/cgi-bin/wiki/centered-cursor-mode.el" :keywords '("convenience"))
diff --git a/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode.el b/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode.el
new file mode 100644
index 0000000..1e2f615
--- /dev/null
+++ b/emacs.d/elpa/centered-cursor-mode-20151001.634/centered-cursor-mode.el
@@ -0,0 +1,436 @@
+;;; centered-cursor-mode.el --- cursor stays vertically centered
+
+;; Copyright (C) 2007  André Riemann
+
+;; Author: André Riemann <andre.riemann@web.de>
+;; Maintainer: André Riemann <andre.riemann@web.de>
+;; Created: 2007-09-14
+;; Keywords: convenience
+;; Package-Version: 20151001.634
+;; Package-X-Original-Version: 20150302.831
+
+;; URL: http://www.emacswiki.org/cgi-bin/wiki/centered-cursor-mode.el
+;; Compatibility: tested with GNU Emacs 23.0, 24
+;; Version: 0.5.4
+;; Last-Updated: 2015-10-01
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Makes the cursor stay vertically in a defined position (usually
+;; centered). The vertical position can be altered, see key definition
+;; below.
+
+;; To load put that in .emacs:
+;;     (require 'centered-cursor-mode)
+;; To activate do:
+;;     M-x centered-cursor-mode
+;; for buffer local or
+;;     M-x global-centered-cursor-mode
+;; for global minor mode.
+;; Also possible: put that in .emacs
+;;     (and
+;;      (require 'centered-cursor-mode)
+;;      (global-centered-cursor-mode +1))
+;; to always have centered-cursor-mode on in all buffers.
+
+;;; TODO:
+;; - the code is a mess
+;; - ccm-vpos-inverted doesn't work with ccm-vpos == 0, because first
+;;   position from top is 0 and from bottom -1
+;; - interactive first start isn't animated when calling global-...
+;;   because it starts the modes for each buffer and interactive-p fails
+;;   for that
+;; - more bugs?
+
+;;; Change Log:
+;; 2015-10-01 Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
+;;   * Avoided calling count-lines when unnecessary, which
+;;     fixes slow scrolling in large files
+;; 2015-03-01  andre-r
+;;   * fixed bug where Emacs without X support (emacs-nox) didn't find mouse-wheel-mode
+;; 2009-08-31  andre-r
+;;   * replaced window-body-height with window-text-height
+;;     (partially visible lines are not counted in window-text-height)
+;;   * bug fixed in ccm-vpos-recenter
+;;     (some parentheses where wrong after the last update)
+;; 2009-02-23  andre-r
+;;   * some simplifications
+;; 2009-02-22  andre-r
+;;   * some tips from Drew Adams:
+;;     - new local variable coding:utf-8
+;;     - made recenter-sequence a defvar
+;;     - added groups scrolling and convenience
+;;     - replaced mouse-4 and mouse-5 with
+;;       mouse-wheel-up-event and mouse-wheel-down-event
+;;     - added scroll-bar-toolkit-scroll to ccm-ignored-commands
+;;     - made ccm-ignored-commands customisable
+;;   * removed a bug where it didn't work with more than one window
+;;     displaying the same buffer
+;;   * added function for page up and down scrolling
+;;     (standard ones didn't work well with this mode)
+;;   * made the animation delay customisable
+;;   * made the initial vertical position customisable
+;;   * made the behaviour at the end of the file customisable
+;; 2008-02-02  andre-r
+;;   * fixed bug that led to wrong-type-argument
+;;     when opening a new buffer
+;;   * some other minor stuff
+;; 2007-09-24  andre-r
+;;   * added global minor mode
+;; 2007-09-21  andre-r
+;;   * not recentering at end of buffer
+;;   * defvar animate-first-start-p
+;; 2007-09-14  andre-r
+;;   * inital release
+
+;; This file is *NOT* part of GNU Emacs.
+
+;;; Code:
+
+
+(require 'mouse-wheel-mode nil 'noerror)
+
+(defgroup centered-cursor nil
+  "Makes the cursor stay vertically in a defined position (usually centered).
+Instead the cursor the text moves around the cursor."
+  :group 'scrolling
+  :group 'convenience
+  :link '(emacs-library-link :tag "Source Lisp File" "centered-cursor-mode.el")
+  :link '(url-link "http://www.emacswiki.org/cgi-bin/wiki/centered-cursor-mode.el"))
+
+(defcustom ccm-step-size 2
+  "Step size when animated recentering."
+  :group 'centered-cursor
+  :tag "Animation step size"
+  :type 'integer)
+
+(defcustom ccm-step-delay 0.02
+  "Delay between animation steps.
+If you want a different animation speed."
+  :group 'centered-cursor
+  :tag "Animation step delay"
+  :type 'number)
+
+(defcustom ccm-ignored-commands '(mouse-drag-region
+                                  mouse-set-point
+                                  widget-button-click
+                                  scroll-bar-toolkit-scroll)
+  "After these commands recentering is ignored.
+This is to prevent unintentional jumping (especially when mouse
+clicking). Following commands (except the ignored ones) will
+cause an animated recentering to give a feedback and not just
+jumping to the center."
+  :group 'centered-cursor
+  :tag "Ignored commands"
+  :type '(repeat (symbol :tag "Command")))
+
+(defcustom ccm-vpos-init '(round (window-text-height) 2)
+  "This is the screen line position where the cursor initially stays."
+  :group 'centered-cursor
+  :tag "Vertical cursor position"
+  :type '(choice (const :tag "Center" (round (window-text-height) 2))
+                 (const :tag "Golden ratio" (round (* 21 (window-text-height)) 34))
+                 (integer :tag "Lines from top" :value 10)))
+(make-variable-buffer-local 'ccm-vpos-init)
+
+(defcustom ccm-vpos-inverted 1
+  "Inverted vertical cursor position.
+Defines if the initial vertical position `ccm-vpos-init' is
+measured from the bottom instead from the top."
+  :group 'centered-cursor
+  :tag "Inverted cursor position"
+  :type '(choice (const :tag "Inverted" -1)
+                 (const :tag "Not inverted" 1)))
+(make-variable-buffer-local 'ccm-vpos-inverted)
+
+(defcustom ccm-recenter-at-end-of-file nil
+  "Recenter at the end of the file.
+If non-nil the end of the file is recentered. If nil the end of
+the file stays at the end of the window."
+  :group 'centered-cursor
+  :tag "Recenter at EOF"
+  :type '(choice (const :tag "Don't recenter at the end of the file" nil)
+                 (const :tag "Recenter at the end of the file" t)))
+(make-variable-buffer-local 'ccm-recenter-end-of-file)
+
+(defvar ccm-vpos nil
+  "This is the screen line position where the cursor stays.")
+(make-variable-buffer-local 'ccm-vpos)
+
+(defvar animate-first-start-p nil
+  "Whether or not to animate at first start. It is set to nil, if
+centered-cursor-mode is called non-interactively.")
+(make-variable-buffer-local 'animate-first-start-p)
+
+(defvar recenter-sequence nil
+  "Before animated recentering a list is generated first with positions
+to successively recenter to")
+(make-variable-buffer-local 'recenter-sequence)
+
+(defvar ccm-map
+  (let ((ccm-map (make-sparse-keymap)))
+    (define-key ccm-map [(control meta -)]  'ccm-vpos-up)
+    (define-key ccm-map [(control meta +)]  'ccm-vpos-down)
+    (define-key ccm-map [(control meta =)]  'ccm-vpos-down)
+    (define-key ccm-map [(control meta ?0)] 'ccm-vpos-recenter)
+    (when (and (boundp 'mouse-wheel-mode) mouse-wheel-mode)
+      (mapc (lambda (key)
+              (define-key ccm-map key 'ccm-mwheel-scroll))
+            (list (vector mouse-wheel-up-event)
+                  (vector mouse-wheel-down-event)
+                  (vector (list 'control mouse-wheel-up-event))
+                  (vector (list 'control mouse-wheel-down-event))
+                  (vector (list 'shift mouse-wheel-up-event))
+                  (vector (list 'shift mouse-wheel-down-event)))))
+    (define-key ccm-map [(meta v)] 'ccm-scroll-down)
+    (define-key ccm-map [(control v)] 'ccm-scroll-up)
+    (define-key ccm-map [prior] 'ccm-scroll-down)
+    (define-key ccm-map [next] 'ccm-scroll-up)
+   ccm-map)
+  "Keymap used in centered-cursor-mode.")
+
+
+(defun ccm-mwheel-scroll (event)
+  "Very similar to `mwheel-scroll', but does not use `scroll-down'
+and `scroll-up' but `previous-line' and `next-line', that is, the
+cursor is moved and thus the text in the window is scrolled
+due to `recenter'.
+
+The customizable variable `mouse-wheel-scroll-amount' is used to
+determine how much to scroll, where nil instead of a number means
+the same as in mwheel-scroll, scroll by a near full screen.
+
+This command exists, because mwheel-scroll caused strange
+behaviour with automatic recentering."
+;;  (interactive (list last-input-event))
+  (interactive "e")
+  (let* ((mods (delq 'click (delq 'double (delq 'triple (event-modifiers event)))))
+         (amt (assoc mods mouse-wheel-scroll-amount)))
+    ;;(message "%S" mods)
+    (if amt
+        (setq amt (or (cdr amt)
+                      (- (window-text-height)
+                         next-screen-context-lines)))
+      (let ((list-elt mouse-wheel-scroll-amount))
+        (while (consp (setq amt (pop list-elt))))))
+    (if mouse-wheel-follow-mouse
+        (select-window (posn-window (event-start event))))
+    (let ((button (mwheel-event-button event)))
+      (cond
+       ((eq button mouse-wheel-down-event)
+        (forward-line (- amt)))
+        ;;(princ amt))
+       ((eq button mouse-wheel-up-event)
+        (forward-line amt))
+         ;;(princ amt))
+       (t (error "Bad binding in ccm-mwheel-scroll"))))))
+
+(defun ccm-scroll-down (&optional arg)
+  "Replaces `scroll-down' because with scroll-down
+`centered-cursor-mode' sometimes doesn't reach the top of the
+buffer. This version actually moves the cursor with
+`previous-line'. Since with centered-cursor-mode the cursor is in
+a fixed position the movement appears as page up."
+  (interactive "P")
+  (let ((amt (or arg (- (window-text-height)
+                        next-screen-context-lines))))
+    (forward-line (- amt))))
+
+(defun ccm-scroll-up (&optional arg)
+  "Replaces `scroll-up' to be consistent with `ccm-scroll-down'.
+This version actually moves the cursor with `previous-line'.
+Since with centered-cursor-mode the cursor is in a fixed position
+the movement appears as page up."
+  (interactive "P")
+  (let ((amt (or arg (- (window-text-height)
+                        next-screen-context-lines))))
+    (forward-line amt)))
+
+
+(defun ccm-vpos-down (arg)
+  "Adjust the value of the screen line (where the cursor stays) by arg.
+Negative values for arg are possible. Just the variable ccm-vpos
+is set."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (let ((new-pos (if (< ccm-vpos 0)
+                     (- ccm-vpos arg)
+                   (+ ccm-vpos arg)))
+        ;; see pos-visible-in-window-p
+        (vpos-max (if (< ccm-vpos 0)
+                      -1
+                    (- (window-text-height) 1)))
+        (vpos-min (if (< ccm-vpos 0)
+                      (- (window-text-height))
+                    0)))
+    (setq ccm-vpos
+          (cond
+           ((< new-pos vpos-min)
+            vpos-min)
+           ((> new-pos vpos-max)
+            vpos-max)
+           (t
+            new-pos)))))
+
+(defun ccm-vpos-up (arg)
+  "See `ccm-vpos-down'."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (ccm-vpos-down (- arg)))
+
+(defun ccm-vpos-recenter ()
+  "Set the value of the screen line (where the cursor stays) in
+the center. Just the variable ccm-vpos is set."
+  (interactive)
+  (if (equal (current-buffer)
+             (window-buffer (selected-window)))
+      (setq ccm-vpos (* (eval ccm-vpos-init)
+                        ccm-vpos-inverted))))
+
+(defun ccm-position-cursor ()
+  "Do the actual recentering at the position `ccm-vpos'."
+  (unless (member this-command ccm-ignored-commands)
+    (unless ccm-vpos
+      (ccm-vpos-recenter))
+    (unless (minibufferp (current-buffer))
+      (if (equal (current-buffer)
+                 (window-buffer (selected-window)))
+          (let* ((current-line
+                  (if (< ccm-vpos 0)
+                      ;; one-based, from bottom, negative
+                      (- (count-lines (point)
+                                      ;; window-end is sometimes < 0
+                                      ;; when opening a help buffer
+                                      (if (> (window-end) 0)
+                                          (window-end)
+                                        1)))
+                    ;; zero-based, from top, positive
+                    (+ (count-lines (window-start) (point))
+                       ;; count-lines returns different value in column 0
+                       (if (= (current-column) 0) 0 -1))))
+                 (diff (- ccm-vpos current-line))
+                 (step-size ccm-step-size)
+                 (step-delay ccm-step-delay)
+                 (vpos-inverted ccm-vpos-inverted)
+                 (recenter-at-end-of-file ccm-recenter-at-end-of-file))
+
+            (let* ((bottom-vpos (if (< ccm-vpos 0)
+                                    (- ccm-vpos)
+                                  (- (window-text-height) ccm-vpos)))
+                   (correction (save-excursion
+                                 (if (or (= (point) (point-max))
+                                         (progn
+                                           (goto-char (point-max))
+                                           (zerop (current-column))))
+                                     1 0)))
+                   (window-is-at-bottom (= (window-end) (point-max)))
+                   ;; lines from point to end of buffer
+                   (bottom-lines (if window-is-at-bottom
+                                     (+ (count-lines (point) (point-max))
+                                        correction))))
+
+              ;; only animate if the point was moved rather far away
+              ;; before by a mouseclick (see ccm-ignored-commands)
+              ;; or if minor mode is just entered interactively
+              (if (not (and (> (abs diff) 4)
+                            (or (member last-command ccm-ignored-commands)
+                                animate-first-start-p)))
+
+                  (recenter (if (and window-is-at-bottom
+                                     (< bottom-lines bottom-vpos)
+                                     (not recenter-at-end-of-file))
+                                ;; if near the bottom, recenter in the
+                                ;; negative screen line that equals the
+                                ;; bottom buffer line, i.e. if we are in
+                                ;; the second last line (-2) of the
+                                ;; buffer, the cursor will be recentered
+                                ;; in -2
+                                (- bottom-lines)
+                              ccm-vpos))
+
+                (setq animate-first-start-p nil)
+                ;; first build a list with positions to successively recenter to
+                (setq recenter-sequence
+                      ;; reverse: because we build the list not FROM -> TO but
+                      ;; TO -> FROM because if step size in number-sequence is
+                      ;; bigger than one, TO might not included, that means the
+                      ;; ccm-vpos would not be reached
+                      ;; cdr: don't recenter the current-line
+                      (if (and window-is-at-bottom
+                               (< bottom-lines bottom-vpos)
+                               (not recenter-at-end-of-file))
+                          ;; this one is for animation near the bottom
+                          (cdr (reverse (number-sequence
+                                         (- bottom-lines)
+                                         (if (< ccm-vpos 0)
+                                             current-line
+                                           (- (- (window-text-height) current-line)))
+                                         (* (/ diff (abs diff)) (- step-size)))))
+                        (cdr (reverse (number-sequence
+                                       ccm-vpos
+                                       current-line
+                                       (* (/ diff (abs diff)) (- step-size)))))))
+                ;; (message "%d %d %d (%d): %S" current-line ccm-vpos bottom-lines diff recenter-sequence)
+                (while recenter-sequence
+                  ;; actual animation
+                  (recenter (pop recenter-sequence))
+                  (if (car recenter-sequence) (sit-for step-delay t))))))))))
+
+(defun ccm-first-start (animate)
+  "Called from centered-cursor-mode. Animate at first start, if
+centered-cursor-mode is called interactively."
+  (let ((animate-first-start-p animate))
+    (ccm-vpos-recenter)
+    (ccm-position-cursor)))
+
+;;(defalias 'ccm 'centered-cursor-mode)
+;;;###autoload
+(define-minor-mode centered-cursor-mode
+  "Makes the cursor stay vertically in a defined
+position (usually centered)."
+  :init-value nil
+;;  :lighter nil
+  :lighter " ¢"
+  :keymap ccm-map
+  (cond
+   (centered-cursor-mode
+    (ccm-first-start (interactive-p))
+    (add-hook 'post-command-hook 'ccm-position-cursor t t)
+    (add-hook 'window-configuration-change-hook 'ccm-vpos-recenter t t))
+   (t
+    (remove-hook 'post-command-hook 'ccm-position-cursor t)
+    (remove-hook 'window-configuration-change-hook 'ccm-vpos-recenter t))))
+
+
+(define-global-minor-mode global-centered-cursor-mode centered-cursor-mode
+  centered-cursor-mode)
+
+(provide 'centered-cursor-mode)
+
+;;; Help:
+;; (info "(elisp)Defining Minor Modes")
+;; (info "(elisp)Screen Lines")
+;; (info "(elisp)Hooks")
+;; (info "(elisp)Customization")
+;; (find-function 'mwheel-scroll)
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;;; centered-cursor-mode.el ends here
diff --git a/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode-autoloads.el b/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode-autoloads.el
new file mode 100644
index 0000000..408a7f5
--- /dev/null
+++ b/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode-autoloads.el
@@ -0,0 +1,32 @@
+;;; coffee-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "coffee-mode" "coffee-mode.el" (22171 46582
+;;;;;;  0 0))
+;;; Generated autoloads from coffee-mode.el
+
+(autoload 'coffee-mode "coffee-mode" "\
+Major mode for editing CoffeeScript.
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.coffee\\'" . coffee-mode))
+
+(add-to-list 'auto-mode-alist '("\\.iced\\'" . coffee-mode))
+
+(add-to-list 'auto-mode-alist '("Cakefile\\'" . coffee-mode))
+
+(add-to-list 'auto-mode-alist '("\\.cson\\'" . coffee-mode))
+
+(add-to-list 'interpreter-mode-alist '("coffee" . coffee-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; coffee-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode-pkg.el b/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode-pkg.el
new file mode 100644
index 0000000..7bec4e0
--- /dev/null
+++ b/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "coffee-mode" "20160111.332" "Major mode to edit CoffeeScript files in Emacs" '((emacs "24.1") (cl-lib "0.5")) :url "http://github.com/defunkt/coffee-mode" :keywords '("coffeescript" "major" "mode"))
diff --git a/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode.el b/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode.el
new file mode 100644
index 0000000..d53c5ee
--- /dev/null
+++ b/emacs.d/elpa/coffee-mode-20160111.332/coffee-mode.el
@@ -0,0 +1,1332 @@
+;;; coffee-mode.el --- Major mode to edit CoffeeScript files in Emacs -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2010 Chris Wanstrath
+
+;; Version: 0.6.2
+;; Package-Version: 20160111.332
+;; Keywords: CoffeeScript major mode
+;; Author: Chris Wanstrath <chris@ozmm.org>
+;; URL: http://github.com/defunkt/coffee-mode
+;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, 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, write to the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary
+
+;; Provides syntax highlighting, indentation support, imenu support,
+;; compiling to JavaScript, REPL, a menu bar, and a few cute commands.
+
+;;; Code:
+
+(require 'comint)
+(require 'easymenu)
+(require 'font-lock)
+(require 'rx)
+
+(require 'cl-lib)
+
+;;
+;; Customizable Variables
+;;
+
+(defconst coffee-mode-version "0.6.2"
+  "The version of `coffee-mode'.")
+
+(defgroup coffee nil
+  "A CoffeeScript major mode."
+  :group 'languages)
+
+(defcustom coffee-tab-width tab-width
+  "The tab width to use when indenting."
+  :type 'integer
+  :group 'coffee
+  :safe 'integerp)
+
+(defcustom coffee-command "coffee"
+  "The CoffeeScript command used for evaluating code."
+  :type 'string
+  :group 'coffee)
+
+(defcustom coffee-js-directory ""
+  "The directory for compiled JavaScript files output. This can
+be an absolute path starting with a `/`, or it can be path
+relative to the directory containing the coffeescript sources to
+be compiled."
+  :type 'string
+  :group 'coffee)
+
+(defcustom js2coffee-command "js2coffee"
+  "The js2coffee command used for evaluating code."
+  :type 'string
+  :group 'coffee)
+
+(defcustom coffee-args-repl '("-i")
+  "The arguments to pass to `coffee-command' to start a REPL."
+  :type 'list
+  :group 'coffee)
+
+(defcustom coffee-args-compile '("-c" "--no-header")
+  "The arguments to pass to `coffee-command' to compile a file."
+  :type 'list
+  :group 'coffee)
+
+(defcustom coffee-compiled-buffer-name "*coffee-compiled*"
+  "The name of the scratch buffer used for compiled CoffeeScript."
+  :type 'string
+  :group 'coffee)
+
+(defcustom coffee-repl-buffer "*CoffeeREPL*"
+  "The name of the CoffeeREPL buffer."
+  :type 'string
+  :group 'coffee)
+
+(defcustom coffee-compile-jump-to-error t
+  "Whether to jump to the first error if compilation fails.
+Since the coffee compiler does not always include a line number in
+its error messages, this is not always possible."
+  :type 'boolean
+  :group 'coffee)
+
+(defcustom coffee-watch-buffer-name "*coffee-watch*"
+  "The name of the scratch buffer used when using the --watch flag
+with CoffeeScript."
+  :type 'string
+  :group 'coffee)
+
+(defcustom coffee-mode-hook nil
+  "Hook called by `coffee-mode'.  Examples:
+
+      ;; Compile '.coffee' files on every save
+      (and (file-exists-p (buffer-file-name))
+           (file-exists-p (coffee-compiled-file-name))
+           (coffee-cos-mode t)))"
+  :type 'hook
+  :group 'coffee)
+
+(defcustom coffee-indent-tabs-mode nil
+  "Indentation can insert tabs if this is t."
+  :group 'coffee
+  :type 'boolean)
+
+(defcustom coffee-after-compile-hook nil
+  "Hook called after compile to Javascript"
+  :type 'hook
+  :group 'coffee)
+
+(defcustom coffee-indent-like-python-mode nil
+  "Indent like python-mode."
+  :type 'boolean
+  :group 'coffee)
+
+(defcustom coffee-switch-to-compile-buffer nil
+  "Switch to compilation buffer `coffee-compiled-buffer-name' after compiling
+a buffer or region."
+  :type 'boolean
+  :group 'coffee)
+
+(defvar coffee-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; key bindings
+    (define-key map (kbd "A-r") 'coffee-compile-buffer)
+    (define-key map (kbd "C-c C-k") 'coffee-compile-buffer)
+    (define-key map (kbd "A-R") 'coffee-compile-region)
+    (define-key map (kbd "A-M-r") 'coffee-repl)
+    (define-key map (kbd "C-c C-z") 'coffee-repl)
+    (define-key map [remap comment-dwim] 'coffee-comment-dwim)
+    (define-key map [remap newline-and-indent] 'coffee-newline-and-indent)
+    (define-key map "\C-m" 'coffee-newline-and-indent)
+    (define-key map "\C-c\C-o\C-s" 'coffee-cos-mode)
+    (define-key map "\177" 'coffee-dedent-line-backspace)
+    (define-key map (kbd "C-c C-<") 'coffee-indent-shift-left)
+    (define-key map (kbd "C-c C->") 'coffee-indent-shift-right)
+    (define-key map (kbd "C-c C-l") 'coffee-send-line)
+    (define-key map (kbd "C-c C-r") 'coffee-send-region)
+    (define-key map (kbd "C-c C-b") 'coffee-send-buffer)
+    (define-key map (kbd "<backtab>") 'coffee-indent-shift-left)
+    (define-key map (kbd "C-M-a") 'coffee-beginning-of-defun)
+    (define-key map (kbd "C-M-e") 'coffee-end-of-block)
+    (define-key map (kbd "C-M-h") 'coffee-mark-defun)
+    map)
+  "Keymap for CoffeeScript major mode.")
+
+;;
+;; Commands
+;;
+
+(defun coffee-comint-filter (string)
+  (ansi-color-apply
+   (replace-regexp-in-string
+    "\uFF00" "\n"
+    (replace-regexp-in-string "\x1b\\[.[GJK]" "" string))))
+
+(defun coffee-repl ()
+  "Launch a CoffeeScript REPL using `coffee-command' as an inferior mode."
+  (interactive)
+
+  (unless (comint-check-proc coffee-repl-buffer)
+    (set-buffer
+     (apply 'make-comint "CoffeeREPL"
+            "env"
+            nil
+            "NODE_NO_READLINE=1"
+            coffee-command
+            coffee-args-repl))
+    ;; Workaround for ansi colors
+    (add-hook 'comint-preoutput-filter-functions 'coffee-comint-filter nil t))
+
+  (pop-to-buffer coffee-repl-buffer))
+
+(defun coffee-compiled-file-name (&optional filename)
+  ;; Returns the name of the JavaScript file compiled from a CoffeeScript file.
+  ;; If FILENAME is omitted, the current buffer's file name is used.
+  (let ((input (expand-file-name (or filename (buffer-file-name)))))
+    (unless (string= coffee-js-directory "")
+      (setq input
+            (expand-file-name
+             (concat (unless (file-name-absolute-p coffee-js-directory)
+                       (file-name-directory input))
+                     (file-name-as-directory coffee-js-directory)
+                     (file-name-nondirectory input)))))
+    (concat (file-name-sans-extension input) ".js")))
+
+(defun coffee-revert-buffer-compiled-file (file-name)
+  "Revert a buffer of compiled file when the buffer exist and is not modified."
+  (let ((buffer (find-buffer-visiting file-name)))
+    (when (and buffer (not (buffer-modified-p buffer)))
+      (with-current-buffer buffer
+        (revert-buffer nil t)))))
+
+(defun coffee-parse-error-output (compiler-errstr)
+  (let* ((msg (car (split-string compiler-errstr "[\n\r]+")))
+         line column)
+    (message msg)
+    (when (or (string-match "on line \\([0-9]+\\)" msg)
+              (string-match ":\\([0-9]+\\):\\([0-9]+\\): error:" msg))
+      (setq line (string-to-number (match-string 1 msg)))
+      (when (match-string 2 msg)
+        (setq column (string-to-number (match-string 2 msg))))
+
+      (when coffee-compile-jump-to-error
+        (goto-char (point-min))
+        (forward-line (1- line))
+        (when column
+          (move-to-column (1- column)))))))
+
+(defun coffee-compile-file ()
+  "Compiles and saves the current file to disk in a file of the same
+base name, with extension `.js'.  Subsequent runs will overwrite the
+file.
+
+If there are compilation errors, point is moved to the first
+See `coffee-compile-jump-to-error'."
+  (interactive)
+  (let* ((input (buffer-file-name))
+         (basename (file-name-sans-extension input))
+         (output (when (string-match-p "\\.js\\'" basename) ;; for Rails '.js.coffee' file
+                   basename))
+         (compile-cmd (coffee-command-compile input output))
+         (compiler-output (shell-command-to-string compile-cmd)))
+    (if (string= compiler-output "")
+        (let ((file-name (coffee-compiled-file-name (buffer-file-name))))
+          (message "Compiled and saved %s" (or output (concat basename ".js")))
+          (coffee-revert-buffer-compiled-file file-name))
+      (coffee-parse-error-output compiler-output))))
+
+(defun coffee-compile-buffer ()
+  "Compiles the current buffer and displays the JavaScript in a buffer
+called `coffee-compiled-buffer-name'."
+  (interactive)
+  (coffee-compile-region (point-min) (point-max)))
+
+(defsubst coffee-generate-sourcemap-p ()
+  (cl-find-if (lambda (opt) (member opt '("-m" "--map"))) coffee-args-compile))
+
+(defun coffee--coffeescript-version ()
+  (with-temp-buffer
+    (unless (zerop (process-file coffee-command nil t nil "--version"))
+      (error "Failed: 'coffee --version'"))
+    (goto-char (point-min))
+    (let ((line (buffer-substring-no-properties (point) (line-end-position))))
+      (when (string-match "[0-9.]+\\'" line)
+        (match-string-no-properties 0 line)))))
+
+(defun coffee--map-file-name (coffee-file)
+  (let* ((version (coffee--coffeescript-version))
+         (extension (if (version<= "1.8" version) ".js.map" ".map")))
+    ;; foo.js: foo.js.map(>= 1.8), foo.map(< 1.8)
+    (concat (file-name-sans-extension coffee-file) extension)))
+
+(defmacro coffee-save-window-if (bool &rest body)
+  `(if ,bool (save-selected-window ,@body) ,@body))
+(put 'coffee-save-window-if 'lisp-indent-function 1)
+
+(defun coffee-compile-sentinel (buffer file line column)
+  (lambda (proc _event)
+    (when (eq (process-status proc) 'exit)
+      (coffee-save-window-if (not coffee-switch-to-compile-buffer)
+        (pop-to-buffer (get-buffer coffee-compiled-buffer-name))
+        (ansi-color-apply-on-region (point-min) (point-max))
+        (goto-char (point-min))
+        (if (not (= (process-exit-status proc) 0))
+            (let ((compile-output (buffer-string)))
+              (with-current-buffer buffer
+                (coffee-parse-error-output compile-output)))
+          (let ((props (list :sourcemap (coffee--map-file-name file)
+                             :line line :column column :source file)))
+            (let ((buffer-file-name "tmp.js"))
+              (setq buffer-read-only t)
+              (set-auto-mode)
+              (run-hook-with-args 'coffee-after-compile-hook props))))))))
+
+(defun coffee-start-compile-process (curbuf line column)
+  (lambda (start end)
+    (let ((proc (apply 'start-file-process "coffee-mode"
+                       (get-buffer-create coffee-compiled-buffer-name)
+                       coffee-command (append coffee-args-compile '("-s" "-p"))))
+          (curfile (buffer-file-name curbuf)))
+      (set-process-query-on-exit-flag proc nil)
+      (set-process-sentinel
+       proc (coffee-compile-sentinel curbuf curfile line column))
+      (with-current-buffer curbuf
+        (process-send-region proc start end))
+      (process-send-eof proc))))
+
+(defun coffee-start-generate-sourcemap-process (start end)
+  ;; so that sourcemap generation reads from the current buffer
+  (save-buffer)
+  (let* ((file (buffer-file-name))
+         (sourcemap-buf (get-buffer-create "*coffee-sourcemap*"))
+         (proc (start-file-process "coffee-sourcemap" sourcemap-buf
+                                   coffee-command "-m" file))
+         (curbuf (current-buffer))
+         (line (line-number-at-pos))
+         (column (current-column)))
+    (set-process-query-on-exit-flag proc nil)
+    (set-process-sentinel
+     proc
+     (lambda (proc _event)
+       (when (eq (process-status proc) 'exit)
+         (if (not (= (process-exit-status proc) 0))
+             (let ((sourcemap-output
+                    (with-current-buffer sourcemap-buf (buffer-string))))
+               (with-current-buffer curbuf
+                 (coffee-parse-error-output sourcemap-output)))
+           (kill-buffer sourcemap-buf)
+           (funcall (coffee-start-compile-process curbuf line column) start end)))))))
+
+(defun coffee-cleanup-compile-buffer ()
+  (let ((buffer (get-buffer coffee-compiled-buffer-name)))
+    (when buffer
+      (with-current-buffer buffer
+        (setq buffer-read-only nil)
+        (erase-buffer)))))
+
+(defun coffee-compile-region (start end)
+  "Compiles a region and displays the JavaScript in a buffer called
+`coffee-compiled-buffer-name'."
+  (interactive "r")
+  (coffee-cleanup-compile-buffer)
+  (if (coffee-generate-sourcemap-p)
+      (coffee-start-generate-sourcemap-process start end)
+    (funcall (coffee-start-compile-process
+              (current-buffer) (line-number-at-pos) (current-column))
+             start end)))
+
+(defun coffee-get-repl-proc ()
+  (unless (comint-check-proc coffee-repl-buffer)
+    (coffee-repl)
+    ;; see issue #332
+    (sleep-for 0 100))
+  (get-buffer-process coffee-repl-buffer))
+
+(defun coffee-send-line ()
+  "Send the current line to the inferior Coffee process."
+  (interactive)
+  (coffee-send-region (line-beginning-position) (line-end-position)))
+
+(defun coffee-send-region (start end)
+  "Send the current region to the inferior Coffee process."
+  (interactive "r")
+  (deactivate-mark t)
+  (let* ((string (buffer-substring-no-properties start end))
+         (proc (coffee-get-repl-proc))
+         (multiline-escaped-string
+          (replace-regexp-in-string "\n" "\uFF00" string)))
+    (comint-simple-send proc multiline-escaped-string)))
+
+(defun coffee-send-buffer ()
+  "Send the current buffer to the inferior Coffee process."
+  (interactive)
+  (coffee-send-region (point-min) (point-max)))
+
+(defun coffee-js2coffee-replace-region (start end)
+  "Convert JavaScript in the region into CoffeeScript."
+  (interactive "r")
+
+  (let ((buffer (get-buffer coffee-compiled-buffer-name)))
+    (when buffer
+      (kill-buffer buffer)))
+
+  (call-process-region start end
+                       js2coffee-command t
+                       (current-buffer)))
+
+(defun coffee-version ()
+  "Show the `coffee-mode' version in the echo area."
+  (interactive)
+  (message (concat "coffee-mode version " coffee-mode-version)))
+
+(defun coffee-watch (dir-or-file)
+  "Run `coffee-run-cmd' with the --watch flag on a directory or file."
+  (interactive "fDirectory or File: ")
+  (let ((coffee-compiled-buffer-name coffee-watch-buffer-name)
+        (args (mapconcat 'identity (append coffee-args-compile (list "--watch" (expand-file-name dir-or-file))) " ")))
+    (coffee-run-cmd args)))
+
+;;
+;; Menubar
+;;
+
+(easy-menu-define coffee-mode-menu coffee-mode-map
+  "Menu for CoffeeScript mode"
+  '("CoffeeScript"
+    ["Compile File" coffee-compile-file]
+    ["Compile Buffer" coffee-compile-buffer]
+    ["Compile Region" coffee-compile-region]
+    ["REPL" coffee-repl]
+    "---"
+    ["Version" coffee-version]
+    ))
+
+;;
+;; Define Language Syntax
+;;
+
+;; Instance variables (implicit this)
+(defvar coffee-this-regexp "\\(?:@[_[:word:]]+\\|\\<this\\)\\>")
+
+;; Prototype::access
+(defvar coffee-prototype-regexp "[_[:word:].$]+?::")
+
+;; Assignment
+(defvar coffee-assign-regexp "\\(@?[_[:word:].$]+?\\)\\s-*:")
+
+;; Local Assignment
+(defvar coffee-local-assign-regexp "\\s-*\\([_[:word:].$]+\\)\\s-*\\??=\\(?:[^>=]\\|$\\)")
+
+;; Lambda
+(defvar coffee-lambda-regexp "\\(?:([^)]*)\\)?\\s-*\\(->\\|=>\\)")
+
+;; Namespaces
+(defvar coffee-namespace-regexp "\\b\\(?:class\\s-+\\(\\S-+\\)\\)\\b")
+
+;; Booleans
+(defvar coffee-boolean-regexp
+  (rx (or bol (not (any ".")))
+      (group symbol-start
+             (or "true" "false" "yes" "no" "on" "off" "null" "undefined")
+             symbol-end)))
+
+;; Regular expressions
+(eval-and-compile
+  (defvar coffee-regexp-regexp "\\s/\\(\\(?:\\\\/\\|[^/\n\r]\\)*\\)\\s/"))
+
+;; JavaScript Keywords
+(defvar coffee-js-keywords
+  '("if" "else" "new" "return" "try" "catch"
+    "finally" "throw" "break" "continue" "for" "in" "while"
+    "delete" "instanceof" "typeof" "switch" "super" "extends"
+    "class" "until" "loop" "yield"))
+
+;; Reserved keywords either by JS or CS.
+(defvar coffee-js-reserved
+  '("case" "default" "do" "function" "var" "void" "with"
+    "const" "let" "debugger" "enum" "export" "import" "native"
+    "__extends" "__hasProp"))
+
+;; CoffeeScript keywords.
+(defvar coffee-cs-keywords
+  '("then" "unless" "and" "or" "is" "own"
+    "isnt" "not" "of" "by" "when"))
+
+;; Iced CoffeeScript keywords
+(defvar iced-coffee-cs-keywords
+  '("await" "defer"))
+
+;; Regular expression combining the above three lists.
+(defvar coffee-keywords-regexp
+  ;; keywords can be member names.
+  (concat "\\(?:^\\|[^.]\\)"
+          (regexp-opt (append coffee-js-reserved
+                              coffee-js-keywords
+                              coffee-cs-keywords
+                              iced-coffee-cs-keywords) 'symbols)))
+
+;; Create the list for font-lock. Each class of keyword is given a
+;; particular face.
+(defvar coffee-font-lock-keywords
+  ;; *Note*: order below matters. `coffee-keywords-regexp' goes last
+  ;; because otherwise the keyword "state" in the function
+  ;; "state_entry" would be highlighted.
+  `((,coffee-regexp-regexp . font-lock-constant-face)
+    (,coffee-this-regexp . font-lock-variable-name-face)
+    (,coffee-prototype-regexp . font-lock-type-face)
+    (,coffee-assign-regexp . font-lock-type-face)
+    (,coffee-local-assign-regexp 1 font-lock-variable-name-face)
+    (,coffee-boolean-regexp 1 font-lock-constant-face)
+    (,coffee-lambda-regexp 1 font-lock-function-name-face)
+    (,coffee-keywords-regexp 1 font-lock-keyword-face)
+    (,(lambda (limit)
+        (let ((res nil)
+              start)
+          (while (and (not res) (search-forward "#{" limit t))
+            (let ((restart-pos (match-end 0)))
+              (setq start (match-beginning 0))
+              (let (finish)
+                (while (and (not finish) (search-forward "}" limit t))
+                  (let ((end-pos (point)))
+                    (save-excursion
+                      (when (and (ignore-errors (backward-list 1))
+                                 (= start (1- (point))))
+                        (setq res end-pos finish t)))))
+                (unless finish
+                  (goto-char restart-pos)))))
+          (when (and res start)
+            (set-match-data (list start res)))
+          res))
+     (0 font-lock-variable-name-face t))))
+
+;;
+;; Helper Functions
+;;
+
+(defun coffee-comment-dwim (arg)
+  "Comment or uncomment current line or region in a smart way.
+For details, see `comment-dwim'."
+  (interactive "*P")
+  (require 'newcomment)
+  (let ((deactivate-mark nil) (comment-start "#") (comment-end ""))
+    (comment-dwim arg)
+    (deactivate-mark t)))
+
+(defsubst coffee-command-compile-arg-as-string (output)
+  (mapconcat 'identity
+             (or (and output (append coffee-args-compile (list "-j" output)))
+                 coffee-args-compile)
+             " "))
+
+(defun coffee-command-compile (input &optional output)
+  "Run `coffee-command' to compile FILE-NAME to file with default
+.js output file, or optionally to OUTPUT-FILE-NAME."
+  (let* ((full-file-name (expand-file-name input))
+         (output-file (coffee-compiled-file-name full-file-name))
+         (output-dir (file-name-directory output-file)))
+    (unless (file-directory-p output-dir)
+      (make-directory output-dir t))
+    (format "%s %s -o %s %s"
+            (shell-quote-argument coffee-command)
+            (coffee-command-compile-arg-as-string output)
+            (shell-quote-argument output-dir)
+            (shell-quote-argument full-file-name))))
+
+(defun coffee-run-cmd (args)
+  "Run `coffee-command' with the given arguments, and display the
+output in a compilation buffer."
+  (interactive "sArguments: ")
+  (let ((compilation-buffer-name-function
+         (lambda (_this-mode)
+           (generate-new-buffer-name coffee-compiled-buffer-name))))
+    (compile (concat coffee-command " " args))))
+
+(defun coffee-toggle-fatness ()
+  "Toggle fatness of a coffee function arrow."
+  (interactive)
+  (save-excursion
+    (when (re-search-backward "[-=]>" nil t)
+      (cond ((looking-at "=") (replace-match "-"))
+            ((looking-at "-") (replace-match "="))))))
+
+;;
+;; imenu support
+;;
+
+(defconst coffee-imenu-index-regexp
+  (concat "^\\(\\s-*\\)" ; $1
+          "\\(?:"
+          coffee-assign-regexp ; $2
+          "\\s-*"
+          coffee-lambda-regexp
+          "\\|"
+          coffee-namespace-regexp ; $4
+          "\\|"
+          "\\(@?[_[:word:]:.$]+\\)\\s-*=\\(?:[^>]\\|$\\)" ; $5 match prototype access too
+          "\\(?:" "\\s-*" "\\(" coffee-lambda-regexp "\\)" "\\)?" ; $6
+          "\\)"))
+
+(defun coffee-imenu-create-index ()
+  "Create an imenu index of all methods in the buffer."
+  (interactive)
+
+  ;; This function is called within a `save-excursion' so we're safe.
+  (goto-char (point-min))
+
+  (let ((index-alist '())
+        (ns-indent 0)
+        ns-name)
+    ;; Go through every assignment that includes -> or => on the same
+    ;; line or starts with `class'.
+    (while (re-search-forward coffee-imenu-index-regexp nil t)
+      (let ((current-indent (- (match-end 1) (match-beginning 1)))
+            (property-name (match-string-no-properties 2))
+            (class-name (match-string-no-properties 4))
+            (variable-name (match-string-no-properties 5))
+            (func-assign (match-string-no-properties 6)))
+
+        ;; If this is the start of a new namespace, save the namespace's
+        ;; indentation level and name.
+        (if class-name
+            (setq ns-name (concat class-name "::")
+                  ns-indent current-indent)
+          (when (and variable-name (<= current-indent ns-indent))
+            (setq ns-name (concat variable-name ".")
+                  ns-indent current-indent)))
+
+        (if func-assign
+            (push (cons variable-name (match-beginning 5)) index-alist)
+          (when (and ns-name property-name)
+            (let ((index-pos (match-beginning 2)))
+              (if (<= current-indent ns-indent)
+                  ;; Clear the namespace if we're no longer indented deeper
+                  (setq ns-name nil ns-indent nil)
+                ;; Register as index-name if we are within the context of a namespace
+                (push (cons (concat ns-name property-name) index-pos) index-alist)))))))
+    index-alist))
+
+;;
+;; Indentation
+;;
+
+(defsubst coffee-insert-spaces (count)
+  (if coffee-indent-tabs-mode
+      (insert-char (string-to-char "\t")  (floor count coffee-tab-width))
+    (insert-char ?  count)))
+
+;;; The theory is explained in the README.
+
+(defsubst coffee--in-string-or-comment-p ()
+  (nth 8 (syntax-ppss)))
+
+(defun coffee--block-type ()
+  (save-excursion
+    (back-to-indentation)
+    (unless (coffee--in-string-or-comment-p)
+      (cond ((looking-at-p "else\\(\\s-+if\\)?\\_>") 'if-else)
+            ((looking-at-p "\\(?:catch\\|finally\\)\\_>") 'try-catch)))))
+
+(defun coffee--closed-if-else-p (curindent if-indent)
+  (let (else-if-p else-p)
+    (when (looking-at "else\\(?:\\s-+\\(if\\)\\)?\\_>")
+      (if (string= (match-string 1) "if")
+          (setq else-if-p t)
+        (setq else-p t)))
+    (or (and (not (or else-p else-if-p)) (<= curindent if-indent))
+        (and else-p (= curindent if-indent)))))
+
+(defun coffee--closed-try-catch-p (curindent if-indent)
+  (and (not (looking-at-p "\\(?:finally\\|catch\\)\\_>"))
+       (<= curindent if-indent)))
+
+(defun coffee--closed-block-p (type if-indent limit)
+  (let ((limit-line (line-number-at-pos limit))
+        (closed-pred (cl-case type
+                       (if-else 'coffee--closed-if-else-p)
+                       (try-catch 'coffee--closed-try-catch-p)))
+        finish)
+    (save-excursion
+      (while (and (not finish) (< (point) limit))
+        (forward-line 1)
+        (when (< (line-number-at-pos) limit-line)
+          (let ((curindent (current-indentation)))
+            (unless (coffee--in-string-or-comment-p)
+              (back-to-indentation)
+              (when (funcall closed-pred curindent if-indent)
+                (setq finish t))))))
+      finish)))
+
+(defun coffee--find-if-else-indents (limit cmpfn)
+  (let (indents)
+    (while (re-search-forward "^\\s-*if\\_>" limit t)
+      (let ((indent (current-indentation)))
+        (unless (coffee--closed-block-p 'if-else indent limit)
+          (push indent indents))))
+    (sort indents cmpfn)))
+
+(defun coffee--find-try-catch-indents (limit cmpfn)
+  (let (indents)
+    (while (re-search-forward "^\\s-*try\\_>" limit t)
+      (let ((indent (current-indentation)))
+        (unless (coffee--closed-block-p 'try-catch indent limit)
+          (push indent indents))))
+    (sort indents cmpfn)))
+
+(defun coffee--find-indents (type limit cmpfn)
+  (save-excursion
+    (coffee-beginning-of-defun 1)
+    (cl-case type
+      (if-else (coffee--find-if-else-indents limit cmpfn))
+      (try-catch (coffee--find-try-catch-indents limit cmpfn)))))
+
+(defsubst coffee--decide-indent (curindent if-indents cmpfn)
+  (cl-loop for if-indent in if-indents
+           when (funcall cmpfn if-indent curindent)
+           return if-indent
+           finally
+           return (car if-indents)))
+
+(defun coffee--indent-insert-spaces (indent-size)
+  (unless (= (current-indentation) indent-size)
+    (save-excursion
+      (goto-char (line-beginning-position))
+      (delete-horizontal-space)
+      (coffee-insert-spaces indent-size)))
+  (when (< (current-column) (current-indentation))
+    (back-to-indentation)))
+
+(defun coffee--indent-line-like-python-mode (prev-indent repeated)
+  (let ((next-indent (- (current-indentation) coffee-tab-width))
+        (indent-p (coffee-line-wants-indent)))
+    (if repeated
+        (if (< next-indent 0)
+            (+ prev-indent (if indent-p coffee-tab-width 0))
+          next-indent)
+      (+ prev-indent (if indent-p coffee-tab-width 0)))))
+
+(defun coffee-indent-line ()
+  "Indent current line as CoffeeScript."
+  (interactive)
+  (let* ((curindent (current-indentation))
+         (limit (+ (line-beginning-position) curindent))
+         (type (coffee--block-type))
+         indent-size
+         begin-indents)
+    (if (and type (setq begin-indents (coffee--find-indents type limit '<)))
+        (setq indent-size (coffee--decide-indent curindent begin-indents '>))
+      (if coffee-indent-like-python-mode
+          (setq indent-size
+                (coffee--indent-line-like-python-mode
+                 (coffee-previous-indent) (eq last-command this-command)))
+        (let ((prev-indent (coffee-previous-indent))
+              (next-indent-size (+ curindent coffee-tab-width)))
+          (if (> (- next-indent-size prev-indent) coffee-tab-width)
+              (setq indent-size 0)
+            (setq indent-size (+ curindent coffee-tab-width))))))
+    (coffee--indent-insert-spaces indent-size)))
+
+(defun coffee-previous-indent ()
+  "Return the indentation level of the previous non-blank line."
+  (save-excursion
+    (forward-line -1)
+    (while (and (looking-at "^[ \t]*$") (not (bobp)))
+      (forward-line -1))
+    (current-indentation)))
+
+(defun coffee-newline-and-indent ()
+  "Insert a newline and indent it to the same level as the previous line."
+  (interactive)
+
+  ;; Remember the current line indentation level,
+  ;; insert a newline, and indent the newline to the same
+  ;; level as the previous line.
+  (let ((prev-indent (current-indentation)))
+    (when (< (current-column) (current-indentation))
+      (move-to-column (current-indentation)))
+    (delete-horizontal-space t)
+    (newline)
+
+    (if (coffee-line-wants-indent)
+        ;; We need to insert an additional tab because the last line was special.
+        (coffee-insert-spaces (+ (coffee-previous-indent) coffee-tab-width))
+      ;; otherwise keep at the same indentation level
+      (coffee-insert-spaces prev-indent))
+
+    ;; Last line was a comment so this one should probably be,
+    ;; too. Makes it easy to write multi-line comments (like the one I'm
+    ;; writing right now).
+    (unless (and auto-fill-function comment-auto-fill-only-comments)
+      (when (coffee-previous-line-is-single-line-comment)
+        (insert "# ")))))
+
+(defun coffee-dedent-line-backspace (arg)
+  "Unindent to increment of `coffee-tab-width' with ARG==1 when
+called from first non-blank char of line.
+
+Delete ARG spaces if ARG!=1."
+  (interactive "*p")
+  (if (use-region-p)
+      (delete-region (region-beginning) (region-end))
+    (if (and (= 1 arg)
+             (= (point) (save-excursion
+                          (back-to-indentation)
+                          (point)))
+             (not (bolp)))
+        (let* ((extra-space-count (% (current-column) coffee-tab-width))
+               (deleted-chars (if (zerop extra-space-count)
+                                  coffee-tab-width
+                                extra-space-count)))
+          (backward-delete-char-untabify deleted-chars))
+      (backward-delete-char-untabify arg))))
+
+;; Indenters help determine whether the current line should be
+;; indented further based on the content of the previous line. If a
+;; line starts with `class', for instance, you're probably going to
+;; want to indent the next line.
+
+(defvar coffee-indenters-bol '("class" "for" "if" "else" "unless" "while" "until"
+                               "try" "catch" "finally" "switch")
+  "Keywords or syntax whose presence at the start of a line means the
+next line should probably be indented.")
+
+(defun coffee-indenters-bol-regexp ()
+  "Builds a regexp out of `coffee-indenters-bol' words."
+  (regexp-opt coffee-indenters-bol 'words))
+
+(defvar coffee-indenters-eol '(?> ?{ ?\[)
+  "Single characters at the end of a line that mean the next line
+should probably be indented.")
+
+(defun coffee-line-wants-indent ()
+  "Return t if the current line should be indented relative to the
+previous line."
+  (save-excursion
+    (back-to-indentation)
+    (skip-chars-backward "\r\n\t ")
+    (let ((char-of-eol (char-before (line-end-position))))
+      (or (and char-of-eol (memq char-of-eol coffee-indenters-eol))
+          (progn
+            (back-to-indentation)
+            (looking-at (coffee-indenters-bol-regexp)))))))
+
+(defun coffee-previous-line-is-single-line-comment ()
+  "Return t if the previous line is a CoffeeScript single line comment."
+  (save-excursion
+    (forward-line -1)
+    (back-to-indentation)
+    (and (looking-at "#")
+         (not (looking-at "###\\(?:\\s-+.*\\)?$"))
+         (progn
+           (goto-char (line-end-position))
+           (nth 4 (syntax-ppss))))))
+
+(defun coffee-indent-shift-amount (start end dir)
+  "Compute distance to the closest increment of `coffee-tab-width'."
+  (let ((min most-positive-fixnum))
+    (save-excursion
+      (goto-char start)
+      (while (< (point) end)
+        (let ((current (current-indentation)))
+          (when (< current min)
+            (setq min current)))
+        (forward-line))
+      (let ((rem (% min coffee-tab-width)))
+        (if (zerop rem)
+            coffee-tab-width
+          (cond ((eq dir 'left) rem)
+                ((eq dir 'right) (- coffee-tab-width rem))
+                (t 0)))))))
+
+(defun coffee-indent-shift-left (start end &optional count)
+  "Shift lines contained in region START END by COUNT columns to the left.
+If COUNT is not given, indents to the closest increment of
+`coffee-tab-width'. If region isn't active, the current line is
+shifted. The shifted region includes the lines in which START and
+END lie. An error is signaled if any lines in the region are
+indented less than COUNT columns."
+  (interactive
+   (if (use-region-p)
+       (list (region-beginning) (region-end) current-prefix-arg)
+     (list (line-beginning-position) (line-end-position) current-prefix-arg)))
+  (let ((amount (if count (* coffee-tab-width (prefix-numeric-value count))
+                  (coffee-indent-shift-amount start end 'left))))
+    (when (> amount 0)
+      (let (deactivate-mark)
+        (save-excursion
+          (goto-char start)
+          ;; Check that all lines can be shifted enough
+          (while (< (point) end)
+            (if (and (< (current-indentation) amount)
+                     (not (looking-at "[ \t]*$")))
+                (error "Can't shift all lines enough"))
+            (forward-line))
+          (indent-rigidly start end (- amount)))))))
+
+(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+
+(defun coffee-indent-shift-right (start end &optional count)
+  "Shift lines contained in region START END by COUNT columns to the right.
+if COUNT is not given, indents to the closest increment of
+`coffee-tab-width'. If region isn't active, the current line is
+shifted. The shifted region includes the lines in which START and
+END lie."
+  (interactive
+   (if (use-region-p)
+       (list (region-beginning) (region-end) current-prefix-arg)
+     (list (line-beginning-position) (line-end-position) current-prefix-arg)))
+  (let (deactivate-mark
+        (amount (if count (* coffee-tab-width (prefix-numeric-value count))
+                  (coffee-indent-shift-amount start end 'right))))
+    (indent-rigidly start end amount)))
+
+(defun coffee-indent-region (start end)
+  (interactive "r")
+  (save-excursion
+    (goto-char start)
+    (forward-line 1)
+    (while (and (not (eobp)) (< (point) end))
+      (let ((prev-indent (coffee-previous-indent))
+            (curindent (current-indentation))
+            indent-size)
+        (if (coffee-line-wants-indent)
+            (let ((expected (+ prev-indent coffee-tab-width)))
+              (when (/= curindent expected)
+                (setq indent-size expected)))
+          (when (> curindent prev-indent)
+            (setq indent-size prev-indent)))
+        (when indent-size
+          (save-excursion
+            (goto-char (line-beginning-position))
+            (delete-horizontal-space)
+            (coffee-insert-spaces indent-size))))
+      (forward-line 1))))
+
+;;
+;; Fill
+;;
+
+(defun coffee-fill-forward-paragraph-function (&optional count)
+  "`fill-forward-paragraph-function' which correctly handles block
+comments such as the following:
+
+  class Klass
+    method: ->
+      ###
+      This is a method doc comment that spans multiple lines.
+      If `fill-paragraph' is applied to this paragraph, the comment
+      should preserve its format, with the delimiters on separate lines.
+      ###
+      ..."
+  (let ((ret (forward-paragraph count)))
+    (when (and (= count -1)
+               (looking-at "[[:space:]]*###[[:space:]]*$"))
+      (forward-line))
+    ret))
+
+;;
+;; Define navigation functions
+;;
+
+(defconst coffee-defun-regexp
+  (concat "^\\s-*\\(?:"
+          coffee-assign-regexp
+          "\\s-*"
+          coffee-lambda-regexp
+          "\\|"
+          coffee-namespace-regexp
+          "\\|"
+          "@?[_[:word:]:.$]+\\s-*=\\(?:[^>]\\|$\\)"
+          "\\s-*"
+          coffee-lambda-regexp
+          "\\)"))
+
+(defun coffee-in-comment-p ()
+  (unless (eobp)
+    (save-excursion
+      (back-to-indentation)
+      (when (eq (char-after) ?#)
+        (forward-char 1))
+      (nth 4 (syntax-ppss)))))
+
+(defsubst coffee-current-line-empty-p ()
+  (let ((line (buffer-substring-no-properties
+               (line-beginning-position) (line-end-position))))
+    (string-match-p "^\\s-*$" line)))
+
+(defun coffee-current-line-is-defun ()
+  (save-excursion
+    (goto-char (line-end-position))
+    (re-search-backward coffee-defun-regexp (line-beginning-position) t)))
+
+(defun coffee-current-line-is-assignment ()
+  (save-excursion
+    (goto-char (line-end-position))
+    (re-search-backward "^[_[:word:].$]+\\s-*=\\(?:[^>]\\|$\\)"
+                        (line-beginning-position) t)))
+
+(defun coffee-curline-defun-type (parent-indent start-is-defun)
+  (save-excursion
+    (goto-char (line-end-position))
+    (if (not (re-search-backward coffee-defun-regexp (line-beginning-position) t))
+        (when (and (zerop parent-indent) (coffee-current-line-is-assignment))
+          'other)
+      (if (not start-is-defun)
+          'other
+        (if (< parent-indent (current-indentation))
+            'child
+          'other)))))
+
+(defun coffee-same-block-p (block-indent start-is-defun)
+  (let ((type (coffee-curline-defun-type block-indent start-is-defun)))
+    (cond ((eq type 'child) t)
+          ((eq type 'other) nil)
+          (t (>= (current-indentation) block-indent)))))
+
+(defsubst coffee-skip-line-p ()
+  (or (coffee-in-comment-p) (coffee-current-line-empty-p)))
+
+(defun coffee-skip-forward-lines (arg)
+  (let ((pred (if (> arg 0)
+                  (lambda () (not (eobp)))
+                (lambda () (not (bobp))))))
+   (while (and (funcall pred) (coffee-skip-line-p))
+     (forward-line arg))))
+
+(defun coffee-beginning-of-defun (&optional count)
+  (interactive "p")
+  (unless count
+    (setq count 1))
+  (let ((next-indent nil))
+    (when (coffee-skip-line-p)
+      (save-excursion
+        (coffee-skip-forward-lines +1)
+        (setq next-indent (current-indentation))))
+    (coffee-skip-forward-lines -1)
+    (let ((start-indent (or next-indent (current-indentation))))
+      (when (and (not (eq this-command 'coffee-mark-defun)) (looking-back "^\\s-*" (line-beginning-position)))
+        (forward-line -1))
+      (let ((finish nil))
+        (goto-char (line-end-position))
+        (while (and (not finish) (re-search-backward coffee-defun-regexp nil 'move))
+          (let ((cur-indent (current-indentation)))
+            (when (<= cur-indent start-indent)
+              (setq start-indent cur-indent)
+              (cl-decf count)))
+          (when (<= count 0)
+            (back-to-indentation)
+            (setq finish t)))))))
+
+(defun coffee-end-of-block (&optional count)
+  "Move point to the end of the block."
+  (interactive "p")
+  (unless count
+    (setq count 1))
+  (dotimes (_i count)
+    (let* ((curline-is-defun (coffee-current-line-is-defun))
+           start-indent)
+      (coffee-skip-forward-lines 1)
+      (setq start-indent (current-indentation))
+      (when (and (zerop start-indent) (not curline-is-defun))
+        (when (re-search-forward coffee-defun-regexp nil 'move)
+          (back-to-indentation)
+          (setq curline-is-defun t)))
+      (let ((finish nil))
+        (while (not finish)
+          (forward-line 1)
+          (coffee-skip-forward-lines 1)
+          (when (or (not (coffee-same-block-p start-indent curline-is-defun))
+                    (eobp))
+            (setq finish t)))
+        (forward-line -1)
+        (coffee-skip-forward-lines -1)
+        (forward-line 1)))))
+
+(defun coffee-mark-defun ()
+  (interactive)
+  (let ((be-actived transient-mark-mode))
+    (push-mark (point))
+    (let ((cur-indent (current-indentation)))
+      (coffee-beginning-of-defun)
+      (push-mark (point))
+      (coffee-end-of-block)
+      (push-mark (point) nil be-actived)
+      (let ((next-indent nil))
+        (when (coffee-skip-line-p)
+          (save-excursion
+            (coffee-skip-forward-lines +1)
+            (setq next-indent (current-indentation))))
+        (when (and next-indent (< next-indent cur-indent))
+          (coffee-skip-forward-lines -1))
+        (coffee-beginning-of-defun)))))
+
+;;
+;; hs-minor-mode
+;;
+
+;; support for hs-minor-mode
+(add-to-list 'hs-special-modes-alist
+             '(coffee-mode "\\s-*\\(?:class\\|.+[-=]>$\\)" nil "#"
+                           coffee-end-of-block nil))
+
+;;
+;; Based on triple quote of python.el
+;;
+(eval-and-compile
+  (defconst coffee-block-strings-delimiter
+    (rx (and
+         ;; Match even number of backslashes.
+         (or (not (any ?\\ ?\' ?\" ?/))
+             point
+             ;; Quotes might be preceded by a escaped quote.
+             (and (or (not (any ?\\)) point)
+                  ?\\
+                  (* ?\\ ?\\)
+                  (any ?\' ?\" ?/)))
+         (* ?\\ ?\\)
+         ;; Match single or triple quotes of any kind.
+         (group (or "'''" "\"\"\"" "///"))))))
+
+(defsubst coffee-syntax-count-quotes (quote-char start-point limit)
+  (let ((i 0))
+    (while (and (< i 3)
+                (< (+ start-point i) limit)
+                (eq (char-after (+ start-point i)) quote-char))
+      (cl-incf i))
+    i))
+
+(defun coffee-syntax-block-strings-stringify ()
+  (let* ((ppss (prog2
+                   (backward-char 3)
+                   (syntax-ppss)
+                 (forward-char 3)))
+         (string-start (and (not (nth 4 ppss)) (nth 8 ppss)))
+         (quote-starting-pos (- (point) 3))
+         (quote-ending-pos (point))
+         (num-closing-quotes
+          (and string-start
+               (coffee-syntax-count-quotes
+                (char-before) string-start quote-starting-pos))))
+    (cond ((and string-start (= num-closing-quotes 0))
+           ;; This set of quotes doesn't match the string starting
+           ;; kind. Do nothing.
+           nil)
+          ((not string-start)
+           ;; This set of quotes delimit the start of a string.
+           (put-text-property quote-starting-pos (1+ quote-starting-pos)
+                              'syntax-table (string-to-syntax "|")))
+          ((= num-closing-quotes 3)
+           ;; This set of quotes delimit the end of a string.
+           (put-text-property (1- quote-ending-pos) quote-ending-pos
+                              'syntax-table (string-to-syntax "|"))))))
+
+(defun coffee-syntax-propertize-block-comment ()
+  (let ((curpoint (point))
+        (inhibit-changing-match-data t))
+    (let* ((valid-comment-start nil)
+           (valid-comment-end (looking-at-p "#\\{0,2\\}\\s-*$"))
+           (ppss (prog2
+                     (backward-char 3)
+                     (syntax-ppss)
+                   (setq valid-comment-start (looking-back "^\\s-*" (line-beginning-position)))
+                   (forward-char 3)))
+           (in-comment (nth 4 ppss))
+           (in-string (nth 3 ppss)))
+      (when (or (and (not in-comment) (not in-string) valid-comment-start)
+                (and in-comment valid-comment-end))
+        (put-text-property (- curpoint 3) curpoint
+                           'syntax-table (string-to-syntax "!"))))))
+
+(defsubst coffee--in-string-p ()
+  (nth 3 (syntax-ppss)))
+
+(defun coffee-syntax-string-interpolation ()
+  (let ((start (match-beginning 0))
+        (end (point)))
+    (if (not (coffee--in-string-p))
+        (put-text-property start (1+ start)
+                           'syntax-table (string-to-syntax "< b"))
+      (goto-char start)
+      (let (finish res)
+        (while (and (not finish) (search-forward "}" nil t))
+          (let ((end-pos (match-end 0)))
+            (save-excursion
+              (when (and (ignore-errors (backward-list 1))
+                         (= start (1- (point))))
+                (setq res end-pos finish t)))))
+        (goto-char end)
+        (when res
+          (while (re-search-forward "[\"'#]" res t)
+            (put-text-property (match-beginning 0) (match-end 0)
+                               'syntax-table (string-to-syntax "_")))
+          (goto-char (1- res)))))))
+
+(defun coffee-syntax-propertize-function (start end)
+  (goto-char start)
+  (funcall
+   (syntax-propertize-rules
+    (coffee-block-strings-delimiter
+     (0 (ignore (coffee-syntax-block-strings-stringify))))
+    ("/"
+     (0 (ignore
+         (let ((curpoint (point))
+               (start (match-beginning 0))
+               (end (match-end 0)))
+           (goto-char start)
+           (let ((ppss (syntax-ppss)))
+             (cond ((nth 8 ppss)
+                    (put-text-property start end
+                                       'syntax-table (string-to-syntax "_"))
+                    (goto-char curpoint))
+                   ((looking-at coffee-regexp-regexp)
+                    (put-text-property (match-beginning 1) (match-end 1)
+                                       'syntax-table (string-to-syntax "_"))
+                    (goto-char (match-end 0)))
+                   (t (goto-char curpoint))))))))
+    ("#{" (0 (ignore (coffee-syntax-string-interpolation))))
+    ("###"
+     (0 (ignore (coffee-syntax-propertize-block-comment)))))
+   (point) end))
+
+(defun coffee-get-comment-info ()
+  (let* ((syntax (syntax-ppss))
+         (commentp (nth 4 syntax))
+         (comment-start-kinda (nth 8 syntax)))
+    (when commentp
+      (save-excursion
+        (if (and
+             (> comment-start-kinda 2) (< comment-start-kinda (point-max))
+             (string=
+              "###" (buffer-substring
+                     (- comment-start-kinda 2) (1+ comment-start-kinda))))
+            'multiple-line
+          'single-line)))))
+
+(defun coffee-comment-line-break-fn (&optional _)
+  (let ((comment-type (coffee-get-comment-info))
+        (coffee-indent-like-python-mode t))
+    (comment-indent-new-line)
+    (cond ((eq comment-type 'multiple-line)
+           (save-excursion
+             (beginning-of-line)
+             (when (looking-at "[[:space:]]*\\(#\\)")
+               (replace-match "" nil nil nil 1))))
+          ((eq comment-type 'single-line)
+           (coffee-indent-line)))))
+
+(defun coffee-auto-fill-fn ()
+  (let ((comment-type (coffee-get-comment-info))
+        (fill-result (do-auto-fill))
+        (coffee-indent-like-python-mode t))
+    (when (and fill-result (eq comment-type 'single-line))
+      (save-excursion
+        (beginning-of-line)
+        (when (looking-at "[[:space:]]*#")
+          (replace-match "#")))
+      (coffee-indent-line))))
+
+;;
+;; Define Major Mode
+;;
+
+;;;###autoload
+(define-derived-mode coffee-mode prog-mode "Coffee"
+  "Major mode for editing CoffeeScript."
+
+  ;; code for syntax highlighting
+  (setq font-lock-defaults '((coffee-font-lock-keywords)))
+
+  ;; fix comment filling function
+  (set (make-local-variable 'comment-line-break-function)
+        #'coffee-comment-line-break-fn)
+  (set (make-local-variable 'auto-fill-function) #'coffee-auto-fill-fn)
+  ;; perl style comment: "# ..."
+  (modify-syntax-entry ?# "< b" coffee-mode-syntax-table)
+  (modify-syntax-entry ?\n "> b" coffee-mode-syntax-table)
+
+  ;; Treat slashes as paired delimiters; useful for finding regexps.
+  (modify-syntax-entry ?/ "/" coffee-mode-syntax-table)
+
+  (set (make-local-variable 'comment-start) "#")
+
+  ;; single quote strings
+  (modify-syntax-entry ?' "\"" coffee-mode-syntax-table)
+
+  ;; indentation
+  (make-local-variable 'coffee-tab-width)
+  (make-local-variable 'coffee-indent-tabs-mode)
+  (set (make-local-variable 'indent-line-function) 'coffee-indent-line)
+  (set (make-local-variable 'indent-region-function) 'coffee-indent-region)
+  (set (make-local-variable 'tab-width) coffee-tab-width)
+
+  (set (make-local-variable 'syntax-propertize-function)
+       'coffee-syntax-propertize-function)
+
+  ;; fill
+  (set (make-local-variable 'fill-forward-paragraph-function)
+       'coffee-fill-forward-paragraph-function)
+
+  (set (make-local-variable 'beginning-of-defun-function)
+       'coffee-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       'coffee-end-of-block)
+
+  ;; imenu
+  (set (make-local-variable 'imenu-create-index-function)
+       'coffee-imenu-create-index)
+
+  ;; Don't let electric-indent-mode break coffee-mode.
+  (set (make-local-variable 'electric-indent-functions)
+       (list (lambda (_arg) 'no-indent)))
+
+  ;; no tabs
+  (setq indent-tabs-mode coffee-indent-tabs-mode))
+
+;;
+;; Compile-on-Save minor mode
+;;
+
+(defcustom coffee-cos-mode-line " CoS"
+  "Lighter of `coffee-cos-mode'"
+  :type 'string
+  :group 'coffee)
+
+(define-minor-mode coffee-cos-mode
+  "Toggle compile-on-save for coffee-mode.
+
+Add `'(lambda () (coffee-cos-mode t))' to `coffee-mode-hook' to turn
+it on by default."
+  :group 'coffee :lighter coffee-cos-mode-line
+  (if coffee-cos-mode
+      (add-hook 'after-save-hook 'coffee-compile-file nil t)
+    (remove-hook 'after-save-hook 'coffee-compile-file t)))
+
+(provide 'coffee-mode)
+
+;;
+;; On Load
+;;
+
+;; Run coffee-mode for files ending in .coffee.
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.coffee\\'" . coffee-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.iced\\'" . coffee-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("Cakefile\\'" . coffee-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.cson\\'" . coffee-mode))
+;;;###autoload
+(add-to-list 'interpreter-mode-alist '("coffee" . coffee-mode))
+
+;;; coffee-mode.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-abbrev.el b/emacs.d/elpa/company-20150624.334/company-abbrev.el
deleted file mode 100644
index 0a849ad..0000000
--- a/emacs.d/elpa/company-20150624.334/company-abbrev.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; company-abbrev.el --- company-mode completion back-end for abbrev
-
-;; Copyright (C) 2009-2011, 2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-(require 'abbrev)
-
-(defun company-abbrev-insert (match)
-  "Replace MATCH with the expanded abbrev."
-  (expand-abbrev))
-
-;;;###autoload
-(defun company-abbrev (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for abbrev."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-abbrev
-                                        'company-abbrev-insert))
-    (prefix (company-grab-symbol))
-    (candidates (nconc
-                 (delete "" (all-completions arg global-abbrev-table))
-                 (delete "" (all-completions arg local-abbrev-table))))
-    (meta (abbrev-expansion arg))))
-
-(provide 'company-abbrev)
-;;; company-abbrev.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-autoloads.el b/emacs.d/elpa/company-20150624.334/company-autoloads.el
deleted file mode 100644
index 57c4e2f..0000000
--- a/emacs.d/elpa/company-20150624.334/company-autoloads.el
+++ /dev/null
@@ -1,284 +0,0 @@
-;;; company-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "company" "company.el" (21898 47982 0 0))
-;;; Generated autoloads from company.el
-
-(autoload 'company-mode "company" "\
-\"complete anything\"; is an in-buffer completion framework.
-Completion starts automatically, depending on the values
-`company-idle-delay' and `company-minimum-prefix-length'.
-
-Completion can be controlled with the commands:
-`company-complete-common', `company-complete-selection', `company-complete',
-`company-select-next', `company-select-previous'.  If these commands are
-called before `company-idle-delay', completion will also start.
-
-Completions can be searched with `company-search-candidates' or
-`company-filter-candidates'.  These can be used while completion is
-inactive, as well.
-
-The completion data is retrieved using `company-backends' and displayed
-using `company-frontends'.  If you want to start a specific back-end, call
-it interactively or use `company-begin-backend'.
-
-By default, the completions list is sorted alphabetically, unless the
-backend chooses otherwise, or `company-transformers' changes it later.
-
-regular keymap (`company-mode-map'):
-
-\\{company-mode-map}
-keymap during active completions (`company-active-map'):
-
-\\{company-active-map}
-
-\(fn &optional ARG)" t nil)
-
-(defvar global-company-mode nil "\
-Non-nil if Global-Company mode is enabled.
-See the command `global-company-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-company-mode'.")
-
-(custom-autoload 'global-company-mode "company" nil)
-
-(autoload 'global-company-mode "company" "\
-Toggle Company mode in all buffers.
-With prefix ARG, enable Global-Company mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Company mode is enabled in all buffers where
-`company-mode-on' would do it.
-See `company-mode' for more information on Company mode.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (21898
-;;;;;;  47982 0 0))
-;;; Generated autoloads from company-abbrev.el
-
-(autoload 'company-abbrev "company-abbrev" "\
-`company-mode' completion back-end for abbrev.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-bbdb.el
-
-(autoload 'company-bbdb "company-bbdb" "\
-`company-mode' completion back-end for BBDB.
-
-\(fn COMMAND &optional ARG &rest IGNORE)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-css" "company-css.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-css.el
-
-(autoload 'company-css "company-css" "\
-`company-mode' completion back-end for `css-mode'.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (21898
-;;;;;;  47982 0 0))
-;;; Generated autoloads from company-dabbrev.el
-
-(autoload 'company-dabbrev "company-dabbrev" "\
-dabbrev-like `company-mode' completion back-end.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-dabbrev-code" "company-dabbrev-code.el"
-;;;;;;  (21898 47982 0 0))
-;;; Generated autoloads from company-dabbrev-code.el
-
-(autoload 'company-dabbrev-code "company-dabbrev-code" "\
-dabbrev-like `company-mode' back-end for code.
-The back-end looks for all symbols in the current buffer that aren't in
-comments or strings.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-elisp" "company-elisp.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-elisp.el
-
-(autoload 'company-elisp "company-elisp" "\
-`company-mode' completion back-end for Emacs Lisp.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-etags" "company-etags.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-etags.el
-
-(autoload 'company-etags "company-etags" "\
-`company-mode' completion back-end for etags.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-files" "company-files.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-files.el
-
-(autoload 'company-files "company-files" "\
-`company-mode' completion back-end existing file names.
-Completions works for proper absolute and relative files paths.
-File paths with spaces are only supported inside strings.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-gtags" "company-gtags.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-gtags.el
-
-(autoload 'company-gtags "company-gtags" "\
-`company-mode' completion back-end for GNU Global.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-ispell" "company-ispell.el" (21898
-;;;;;;  47982 0 0))
-;;; Generated autoloads from company-ispell.el
-
-(autoload 'company-ispell "company-ispell" "\
-`company-mode' completion back-end using Ispell.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-keywords" "company-keywords.el" (21898
-;;;;;;  47982 0 0))
-;;; Generated autoloads from company-keywords.el
-
-(autoload 'company-keywords "company-keywords" "\
-`company-mode' back-end for programming language keywords.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-nxml" "company-nxml.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-nxml.el
-
-(autoload 'company-nxml "company-nxml" "\
-`company-mode' completion back-end for `nxml-mode'.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (21898
-;;;;;;  47982 0 0))
-;;; Generated autoloads from company-oddmuse.el
-
-(autoload 'company-oddmuse "company-oddmuse" "\
-`company-mode' completion back-end for `oddmuse-mode'.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-semantic" "company-semantic.el" (21898
-;;;;;;  47982 0 0))
-;;; Generated autoloads from company-semantic.el
-
-(autoload 'company-semantic "company-semantic" "\
-`company-mode' completion back-end using CEDET Semantic.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-tempo" "company-tempo.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-tempo.el
-
-(autoload 'company-tempo "company-tempo" "\
-`company-mode' completion back-end for tempo.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-xcode" "company-xcode.el" (21898 47982
-;;;;;;  0 0))
-;;; Generated autoloads from company-xcode.el
-
-(autoload 'company-xcode "company-xcode" "\
-`company-mode' completion back-end for Xcode projects.
-
-\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "company-yasnippet" "company-yasnippet.el"
-;;;;;;  (21898 47982 0 0))
-;;; Generated autoloads from company-yasnippet.el
-
-(autoload 'company-yasnippet "company-yasnippet" "\
-`company-mode' back-end for `yasnippet'.
-
-This back-end should be used with care, because as long as there are
-snippets defined for the current major mode, this back-end will always
-shadow back-ends that come after it.  Recommended usages:
-
-* In a buffer-local value of `company-backends', grouped with a back-end or
-  several that provide actual text completions.
-
-  (add-hook 'js-mode-hook
-            (lambda ()
-              (set (make-local-variable 'company-backends)
-                   '((company-dabbrev-code company-yasnippet)))))
-
-* After keyword `:with', grouped with other back-ends.
-
-  (push '(company-semantic :with company-yasnippet) company-backends)
-
-* Not in `company-backends', just bound to a key.
-
-  (global-set-key (kbd \"C-c y\") 'company-yasnippet)
-
-\(fn COMMAND &optional ARG &rest IGNORE)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("company-capf.el" "company-clang.el" "company-cmake.el"
-;;;;;;  "company-eclim.el" "company-pkg.el" "company-template.el")
-;;;;;;  (21898 47982 27553 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; company-autoloads.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-bbdb.el b/emacs.d/elpa/company-20150624.334/company-bbdb.el
deleted file mode 100644
index 58be84c..0000000
--- a/emacs.d/elpa/company-20150624.334/company-bbdb.el
+++ /dev/null
@@ -1,61 +0,0 @@
-;;; company-bbdb.el --- company-mode completion back-end for BBDB in message-mode
-
-;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
-
-;; Author: Jan Tatarik <jan.tatarik@gmail.com>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-(require 'company)
-(require 'cl-lib)
-
-(declare-function bbdb-record-get-field "bbdb")
-(declare-function bbdb-records "bbdb")
-(declare-function bbdb-dwim-mail "bbdb-com")
-(declare-function bbdb-search "bbdb-com")
-
-(defgroup company-bbdb nil
-  "Completion back-end for BBDB."
-  :group 'company)
-
-(defcustom company-bbdb-modes '(message-mode)
-  "Major modes in which `company-bbdb' may complete."
-  :type '(repeat (symbol :tag "Major mode"))
-  :package-version '(company . "0.8.8"))
-
-(defun company-bbdb--candidates (arg)
-  (cl-mapcan (lambda (record)
-               (mapcar (lambda (mail) (bbdb-dwim-mail record mail))
-                       (bbdb-record-get-field record 'mail)))
-             (eval '(bbdb-search (bbdb-records) arg nil arg))))
-
-;;;###autoload
-(defun company-bbdb (command &optional arg &rest ignore)
-  "`company-mode' completion back-end for BBDB."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-bbdb))
-    (prefix (and (memq major-mode company-bbdb-modes)
-                 (featurep 'bbdb-com)
-                 (looking-back "^\\(To\\|Cc\\|Bcc\\): *\\(.*\\)"
-                               (line-beginning-position))
-                 (match-string-no-properties 2)))
-    (candidates (company-bbdb--candidates arg))
-    (sorted t)
-    (no-cache t)))
-
-(provide 'company-bbdb)
-;;; company-bbdb.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-capf.el b/emacs.d/elpa/company-20150624.334/company-capf.el
deleted file mode 100644
index 17b739b..0000000
--- a/emacs.d/elpa/company-20150624.334/company-capf.el
+++ /dev/null
@@ -1,153 +0,0 @@
-;;; company-capf.el --- company-mode completion-at-point-functions back-end -*- lexical-binding: t -*-
-
-;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
-
-;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defvar company--capf-cache nil)
-
-(defun company--capf-data ()
-  (let ((cache company--capf-cache))
-    (if (and (equal (current-buffer) (car cache))
-             (equal (point) (car (setq cache (cdr cache))))
-             (equal (buffer-chars-modified-tick) (car (setq cache (cdr cache)))))
-        (cadr cache)
-      (let ((data (company--capf-data-real)))
-        (setq company--capf-cache
-              (list (current-buffer) (point) (buffer-chars-modified-tick) data))
-        data))))
-
-(defun company--capf-data-real ()
-  (cl-letf* (((default-value 'completion-at-point-functions)
-              ;; Ignore tags-completion-at-point-function because it subverts
-              ;; company-etags in the default value of company-backends, where
-              ;; the latter comes later.
-              (remove 'tags-completion-at-point-function
-                      (default-value 'completion-at-point-functions)))
-             (data (run-hook-wrapped 'completion-at-point-functions
-                                     ;; Ignore misbehaving functions.
-                                     #'completion--capf-wrapper 'optimist)))
-    (when (and (consp (cdr data)) (integer-or-marker-p (nth 1 data))) data)))
-
-(defun company-capf (command &optional arg &rest _args)
-  "`company-mode' back-end using `completion-at-point-functions'."
-  (interactive (list 'interactive))
-  (pcase command
-    (`interactive (company-begin-backend 'company-capf))
-    (`prefix
-     (let ((res (company--capf-data)))
-       (when res
-         (if (> (nth 2 res) (point))
-             'stop
-           (buffer-substring-no-properties (nth 1 res) (point))))))
-    (`candidates
-     (let ((res (company--capf-data)))
-       (when res
-         (let* ((table (nth 3 res))
-                (pred (plist-get (nthcdr 4 res) :predicate))
-                (meta (completion-metadata
-                      (buffer-substring (nth 1 res) (nth 2 res))
-                      table pred))
-                (sortfun (cdr (assq 'display-sort-function meta)))
-                (candidates (completion-all-completions arg table pred (length arg)))
-                (last (last candidates))
-                (base-size (and (numberp (cdr last)) (cdr last))))
-           (when base-size
-             (setcdr last nil))
-           (when sortfun
-             (setq candidates (funcall sortfun candidates)))
-           (if (not (zerop (or base-size 0)))
-               (let ((before (substring arg 0 base-size)))
-                 (mapcar (lambda (candidate)
-                           (concat before candidate))
-                         candidates))
-             candidates)))))
-    (`sorted
-     (let ((res (company--capf-data)))
-       (when res
-         (let ((meta (completion-metadata
-                      (buffer-substring (nth 1 res) (nth 2 res))
-                      (nth 3 res) (plist-get (nthcdr 4 res) :predicate))))
-           (cdr (assq 'display-sort-function meta))))))
-    (`match
-     ;; Can't just use 0 when base-size (see above) is non-zero.
-     (let ((start (if (get-text-property 0 'font-lock-face arg)
-                      0
-                    (next-single-property-change 0 'font-lock-face arg))))
-       (when start
-         ;; completions-common-part comes first, but we can't just look for this
-         ;; value because it can be in a list.
-         (or
-          (let ((value (get-text-property start 'font-lock-face arg)))
-            (text-property-not-all start (length arg)
-                                   'font-lock-face value arg))
-          (length arg)))))
-    (`duplicates t)
-    (`no-cache t)   ;Not much can be done here, as long as we handle
-                    ;non-prefix matches.
-    (`meta
-     (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-docsig)))
-       (when f (funcall f arg))))
-    (`doc-buffer
-     (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-doc-buffer)))
-       (when f (funcall f arg))))
-    (`location
-     (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-location)))
-       (when f (funcall f arg))))
-    (`annotation
-     (save-excursion
-       ;; FIXME: `company-begin' sets `company-point' after calling
-       ;; `company--begin-new'.  We shouldn't rely on `company-point' here,
-       ;; better to cache the capf-data value instead.  However: we can't just
-       ;; save the last capf-data value in `prefix', because that command can
-       ;; get called more often than `candidates', and at any point in the
-       ;; buffer (https://github.com/company-mode/company-mode/issues/153).
-       ;; We could try propertizing the returned prefix string, but it's not
-       ;; passed to `annotation', and `company-prefix' is set only after
-       ;; `company--strip-duplicates' is called.
-       (when company-point
-         (goto-char company-point))
-       (let ((f (plist-get (nthcdr 4 (company--capf-data)) :annotation-function)))
-         (when f (funcall f arg)))))
-    (`require-match
-     (plist-get (nthcdr 4 (company--capf-data)) :company-require-match))
-    (`init nil)      ;Don't bother: plenty of other ways to initialize the code.
-    (`post-completion
-     (let* ((res (company--capf-data))
-            (exit-function (plist-get (nthcdr 4 res) :exit-function))
-            (table (nth 3 res))
-            (pred (plist-get (nthcdr 4 res) :predicate)))
-       (if exit-function
-           ;; Follow the example of `completion--done'.
-           (funcall exit-function arg
-                    (if (eq (try-completion arg table pred) t)
-                        'finished 'sole)))))
-    ))
-
-(provide 'company-capf)
-
-;;; company-capf.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-clang.el b/emacs.d/elpa/company-20150624.334/company-clang.el
deleted file mode 100644
index 369f4a9..0000000
--- a/emacs.d/elpa/company-20150624.334/company-clang.el
+++ /dev/null
@@ -1,331 +0,0 @@
-;;; company-clang.el --- company-mode completion back-end for Clang  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2009, 2011, 2013-2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'company-template)
-(require 'cl-lib)
-
-(defgroup company-clang nil
-  "Completion back-end for Clang."
-  :group 'company)
-
-(defcustom company-clang-executable
-  (executable-find "clang")
-  "Location of clang executable."
-  :type 'file)
-
-(defcustom company-clang-begin-after-member-access t
-  "When non-nil, automatic completion will start whenever the current
-symbol is preceded by \".\", \"->\" or \"::\", ignoring
-`company-minimum-prefix-length'.
-
-If `company-begin-commands' is a list, it should include `c-electric-lt-gt'
-and `c-electric-colon', for automatic completion right after \">\" and
-\":\".")
-
-(defcustom company-clang-arguments nil
-  "Additional arguments to pass to clang when completing.
-Prefix files (-include ...) can be selected with `company-clang-set-prefix'
-or automatically through a custom `company-clang-prefix-guesser'."
-  :type '(repeat (string :tag "Argument")))
-
-(defcustom company-clang-prefix-guesser 'company-clang-guess-prefix
-  "A function to determine the prefix file for the current buffer."
-  :type '(function :tag "Guesser function" nil))
-
-(defvar company-clang-modes '(c-mode c++-mode objc-mode)
-  "Major modes which clang may complete.")
-
-(defcustom company-clang-insert-arguments t
-  "When non-nil, insert function arguments as a template after completion."
-  :type 'boolean
-  :package-version '(company . "0.8.0"))
-
-;; prefix ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar company-clang--prefix nil)
-
-(defsubst company-clang--guess-pch-file (file)
-  (let ((dir (directory-file-name (file-name-directory file))))
-    (when (equal (file-name-nondirectory dir) "Classes")
-      (setq dir (file-name-directory dir)))
-    (car (directory-files dir t "\\([^.]h\\|[^h]\\).pch\\'" t))))
-
-(defsubst company-clang--file-substring (file beg end)
-  (with-temp-buffer
-    (insert-file-contents-literally file nil beg end)
-    (buffer-string)))
-
-(defun company-clang-guess-prefix ()
-  "Try to guess the prefix file for the current buffer."
-  ;; Prefixes seem to be called .pch.  Pre-compiled headers do, too.
-  ;; So we look at the magic number to rule them out.
-  (let* ((file (company-clang--guess-pch-file buffer-file-name))
-         (magic-number (and file (company-clang--file-substring file 0 4))))
-    (unless (member magic-number '("CPCH" "gpch"))
-      file)))
-
-(defun company-clang-set-prefix (&optional prefix)
-  "Use PREFIX as a prefix (-include ...) file for clang completion."
-  (interactive (let ((def (funcall company-clang-prefix-guesser)))
-     (unless (stringp def)
-       (setq def default-directory))
-     (list (read-file-name "Prefix file: "
-                           (when def (file-name-directory def))
-                           def t (when def (file-name-nondirectory def))))))
-  ;; TODO: pre-compile?
-  (setq company-clang--prefix (and (stringp prefix)
-                                   (file-regular-p prefix)
-                                   prefix)))
-
-;; Clean-up on exit.
-(add-hook 'kill-emacs-hook 'company-clang-set-prefix)
-
-;; parsing ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; TODO: Handle Pattern (syntactic hints would be neat).
-;; Do we ever see OVERLOAD (or OVERRIDE)?
-(defconst company-clang--completion-pattern
-  "^COMPLETION: \\_<\\(%s[a-zA-Z0-9_:]*\\)\\(?: : \\(.*\\)$\\)?$")
-
-(defconst company-clang--error-buffer-name "*clang-error*")
-
-(defun company-clang--lang-option ()
-     (if (eq major-mode 'objc-mode)
-         (if (string= "m" (file-name-extension buffer-file-name))
-             "objective-c" "objective-c++")
-       (substring (symbol-name major-mode) 0 -5)))
-
-(defun company-clang--parse-output (prefix _objc)
-  (goto-char (point-min))
-  (let ((pattern (format company-clang--completion-pattern
-                         (regexp-quote prefix)))
-        (case-fold-search nil)
-        lines match)
-    (while (re-search-forward pattern nil t)
-      (setq match (match-string-no-properties 1))
-      (unless (equal match "Pattern")
-        (save-match-data
-          (when (string-match ":" match)
-            (setq match (substring match 0 (match-beginning 0)))))
-        (let ((meta (match-string-no-properties 2)))
-          (when (and meta (not (string= match meta)))
-            (put-text-property 0 1 'meta
-                               (company-clang--strip-formatting meta)
-                               match)))
-        (push match lines)))
-    lines))
-
-(defun company-clang--meta (candidate)
-  (get-text-property 0 'meta candidate))
-
-(defun company-clang--annotation (candidate)
-  (let ((ann (company-clang--annotation-1 candidate)))
-    (if (not (and ann (string-prefix-p "(*)" ann)))
-        ann
-      (with-temp-buffer
-        (insert ann)
-        (search-backward ")")
-        (let ((pt (1+ (point))))
-          (re-search-forward ".\\_>" nil t)
-          (delete-region pt (point)))
-        (buffer-string)))))
-
-(defun company-clang--annotation-1 (candidate)
-  (let ((meta (company-clang--meta candidate)))
-    (cond
-     ((null meta) nil)
-     ((string-match "[^:]:[^:]" meta)
-      (substring meta (1+ (match-beginning 0))))
-     ((string-match "\\((.*)[ a-z]*\\'\\)" meta)
-      (let ((paren (match-beginning 1)))
-        (if (not (eq (aref meta (1- paren)) ?>))
-            (match-string 1 meta)
-          (with-temp-buffer
-            (insert meta)
-            (goto-char paren)
-            (substring meta (1- (search-backward "<"))))))))))
-
-(defun company-clang--strip-formatting (text)
-  (replace-regexp-in-string
-   "#]" " "
-   (replace-regexp-in-string "[<{[]#\\|#[>}]" "" text t)
-   t))
-
-(defun company-clang--handle-error (res args)
-  (goto-char (point-min))
-  (let* ((buf (get-buffer-create company-clang--error-buffer-name))
-         (cmd (concat company-clang-executable " " (mapconcat 'identity args " ")))
-         (pattern (format company-clang--completion-pattern ""))
-         (err (if (re-search-forward pattern nil t)
-                  (buffer-substring-no-properties (point-min)
-                                                  (1- (match-beginning 0)))
-                ;; Warn the user more aggressively if no match was found.
-                (message "clang failed with error %d:\n%s" res cmd)
-                (buffer-string))))
-
-    (with-current-buffer buf
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (insert (current-time-string)
-                (format "\nclang failed with error %d:\n" res)
-                cmd "\n\n")
-        (insert err)
-        (setq buffer-read-only t)
-        (goto-char (point-min))))))
-
-(defun company-clang--start-process (prefix callback &rest args)
-  (let ((objc (derived-mode-p 'objc-mode))
-        (buf (get-buffer-create "*clang-output*"))
-        ;; Looks unnecessary in Emacs 25.1 and later.
-        (process-adaptive-read-buffering nil))
-    (if (get-buffer-process buf)
-        (funcall callback nil)
-      (with-current-buffer buf
-        (erase-buffer)
-        (setq buffer-undo-list t))
-      (let ((process (apply #'start-process "company-clang" buf
-                            company-clang-executable args)))
-        (set-process-sentinel
-         process
-         (lambda (proc status)
-           (unless (string-match-p "hangup" status)
-             (funcall
-              callback
-              (let ((res (process-exit-status proc)))
-                (with-current-buffer buf
-                  (unless (eq 0 res)
-                    (company-clang--handle-error res args))
-                  ;; Still try to get any useful input.
-                  (company-clang--parse-output prefix objc)))))))
-        (unless (company-clang--auto-save-p)
-          (send-region process (point-min) (point-max))
-          (send-string process "\n")
-          (process-send-eof process))))))
-
-(defsubst company-clang--build-location (pos)
-  (save-excursion
-    (goto-char pos)
-    (format "%s:%d:%d"
-            (if (company-clang--auto-save-p) buffer-file-name "-")
-            (line-number-at-pos)
-            (1+ (length
-                 (encode-coding-region
-                  (line-beginning-position)
-                  (point)
-                  'utf-8
-                  t))))))
-
-(defsubst company-clang--build-complete-args (pos)
-  (append '("-fsyntax-only" "-Xclang" "-code-completion-macros")
-          (unless (company-clang--auto-save-p)
-            (list "-x" (company-clang--lang-option)))
-          company-clang-arguments
-          (when (stringp company-clang--prefix)
-            (list "-include" (expand-file-name company-clang--prefix)))
-          (list "-Xclang" (format "-code-completion-at=%s"
-                                  (company-clang--build-location pos)))
-          (list (if (company-clang--auto-save-p) buffer-file-name "-"))))
-
-(defun company-clang--candidates (prefix callback)
-  (and (company-clang--auto-save-p)
-       (buffer-modified-p)
-       (basic-save-buffer))
-  (when (null company-clang--prefix)
-    (company-clang-set-prefix (or (funcall company-clang-prefix-guesser)
-                                  'none)))
-  (apply 'company-clang--start-process
-         prefix
-         callback
-         (company-clang--build-complete-args (- (point) (length prefix)))))
-
-(defun company-clang--prefix ()
-  (if company-clang-begin-after-member-access
-      (company-grab-symbol-cons "\\.\\|->\\|::" 2)
-    (company-grab-symbol)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defconst company-clang-required-version 1.1)
-
-(defvar company-clang--version nil)
-
-(defun company-clang--auto-save-p ()
-  (< company-clang--version 2.9))
-
-(defsubst company-clang-version ()
-  "Return the version of `company-clang-executable'."
-  (with-temp-buffer
-    (call-process company-clang-executable nil t nil "--version")
-    (goto-char (point-min))
-    (if (re-search-forward "clang\\(?: version \\|-\\)\\([0-9.]+\\)" nil t)
-        (let ((ver (string-to-number (match-string-no-properties 1))))
-          (if (> ver 100)
-              (/ ver 100)
-            ver))
-      0)))
-
-(defun company-clang (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for Clang.
-Clang is a parser for C and ObjC.  Clang version 1.1 or newer is required.
-
-Additional command line arguments can be specified in
-`company-clang-arguments'.  Prefix files (-include ...) can be selected
-with `company-clang-set-prefix' or automatically through a custom
-`company-clang-prefix-guesser'.
-
-With Clang versions before 2.9, we have to save the buffer before
-performing completion.  With Clang 2.9 and later, buffer contents are
-passed via standard input."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-clang))
-    (init (when (memq major-mode company-clang-modes)
-            (unless company-clang-executable
-              (error "Company found no clang executable"))
-            (setq company-clang--version (company-clang-version))
-            (when (< company-clang--version company-clang-required-version)
-              (error "Company requires clang version 1.1"))))
-    (prefix (and (memq major-mode company-clang-modes)
-                 buffer-file-name
-                 company-clang-executable
-                 (not (company-in-string-or-comment))
-                 (or (company-clang--prefix) 'stop)))
-    (candidates (cons :async
-                      (lambda (cb) (company-clang--candidates arg cb))))
-    (meta       (company-clang--meta arg))
-    (annotation (company-clang--annotation arg))
-    (post-completion (let ((anno (company-clang--annotation arg)))
-                       (when (and company-clang-insert-arguments anno)
-                         (insert anno)
-                         (if (string-match "\\`:[^:]" anno)
-                             (company-clang-objc-templatify anno)
-                           (company-template-c-like-templatify
-                            (concat arg anno))))))))
-
-(provide 'company-clang)
-;;; company-clang.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-cmake.el b/emacs.d/elpa/company-20150624.334/company-cmake.el
deleted file mode 100644
index e2962f5..0000000
--- a/emacs.d/elpa/company-20150624.334/company-cmake.el
+++ /dev/null
@@ -1,198 +0,0 @@
-;;; company-cmake.el --- company-mode completion back-end for CMake
-
-;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
-
-;; Author: Chen Bin <chenbin DOT sh AT gmail>
-;; Version: 0.2
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; company-cmake offers completions for module names, variable names and
-;; commands used by CMake.  And their descriptions.
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defgroup company-cmake nil
-  "Completion back-end for CMake."
-  :group 'company)
-
-(defcustom company-cmake-executable
-  (executable-find "cmake")
-  "Location of cmake executable."
-  :type 'file)
-
-(defvar company-cmake-executable-arguments
-  '("--help-command-list"
-    "--help-module-list"
-    "--help-variable-list")
-  "The arguments we pass to cmake, separately.
-They affect which types of symbols we get completion candidates for.")
-
-(defvar company-cmake--completion-pattern
-  "^\\(%s[a-zA-Z0-9_<>]%s\\)$"
-  "Regexp to match the candidates.")
-
-(defvar company-cmake-modes '(cmake-mode)
-  "Major modes in which cmake may complete.")
-
-(defvar company-cmake--candidates-cache nil
-  "Cache for the raw candidates.")
-
-(defvar company-cmake--meta-command-cache nil
-  "Cache for command arguments to retrieve descriptions for the candidates.")
-
-(defun company-cmake--replace-tags (rlt)
-  (setq rlt (replace-regexp-in-string
-             "\\(.*?\\(IS_GNU\\)?\\)<LANG>\\(.*\\)"
-             (lambda (_match)
-               (mapconcat 'identity
-                          (if (match-beginning 2)
-                              '("\\1CXX\\3" "\\1C\\3" "\\1G77\\3")
-                            '("\\1CXX\\3" "\\1C\\3" "\\1Fortran\\3"))
-                          "\n"))
-             rlt t))
-  (setq rlt (replace-regexp-in-string
-             "\\(.*\\)<CONFIG>\\(.*\\)"
-             (mapconcat 'identity '("\\1DEBUG\\2" "\\1RELEASE\\2"
-                                    "\\1RELWITHDEBINFO\\2" "\\1MINSIZEREL\\2")
-                        "\n")
-             rlt))
-  rlt)
-
-(defun company-cmake--fill-candidates-cache (arg)
-  "Fill candidates cache if needed."
-  (let (rlt)
-    (unless company-cmake--candidates-cache
-      (setq company-cmake--candidates-cache (make-hash-table :test 'equal)))
-
-    ;; If hash is empty, fill it.
-    (unless (gethash arg company-cmake--candidates-cache)
-      (with-temp-buffer
-        (let ((res (call-process company-cmake-executable nil t nil arg)))
-          (unless (zerop res)
-            (message "cmake executable exited with error=%d" res)))
-        (setq rlt (buffer-string)))
-      (setq rlt (company-cmake--replace-tags rlt))
-      (puthash arg rlt company-cmake--candidates-cache))
-    ))
-
-(defun company-cmake--parse (prefix content cmd)
-  (let ((start 0)
-        (pattern (format company-cmake--completion-pattern
-                         (regexp-quote prefix)
-                         (if (zerop (length prefix)) "+" "*")))
-        (lines (split-string content "\n"))
-        match
-        rlt)
-    (dolist (line lines)
-      (when (string-match pattern line)
-        (let ((match (match-string 1 line)))
-          (when match
-            (puthash match cmd company-cmake--meta-command-cache)
-            (push match rlt)))))
-    rlt))
-
-(defun company-cmake--candidates (prefix)
-  (let (results
-        cmd-opts
-        str)
-
-    (unless company-cmake--meta-command-cache
-      (setq company-cmake--meta-command-cache (make-hash-table :test 'equal)))
-
-    (dolist (arg company-cmake-executable-arguments)
-      (company-cmake--fill-candidates-cache arg)
-      (setq cmd-opts (replace-regexp-in-string "-list$" "" arg) )
-
-      (setq str (gethash arg company-cmake--candidates-cache))
-      (when str
-        (setq results (nconc results
-                             (company-cmake--parse prefix str cmd-opts)))))
-    results))
-
-(defun company-cmake--unexpand-candidate (candidate)
-  (cond
-   ((string-match "^CMAKE_\\(C\\|CXX\\|Fortran\\)\\(_.*\\)$" candidate)
-    (setq candidate (concat "CMAKE_<LANG>" (match-string 2 candidate))))
-
-   ;; C flags
-   ((string-match "^\\(.*_\\)IS_GNU\\(C\\|CXX\\|G77\\)$" candidate)
-    (setq candidate (concat (match-string 1 candidate) "IS_GNU<LANG>")))
-
-   ;; C flags
-   ((string-match "^\\(.*_\\)OVERRIDE_\\(C\\|CXX\\|Fortran\\)$" candidate)
-    (setq candidate (concat (match-string 1 candidate) "OVERRIDE_<LANG>")))
-
-   ((string-match "^\\(.*\\)\\(_DEBUG\\|_RELEASE\\|_RELWITHDEBINFO\\|_MINSIZEREL\\)\\(.*\\)$" candidate)
-    (setq candidate (concat (match-string 1 candidate)
-                            "_<CONFIG>"
-                            (match-string 3 candidate)))))
-  candidate)
-
-(defun company-cmake--meta (candidate)
-  (let ((cmd-opts (gethash candidate company-cmake--meta-command-cache))
-        result)
-    (setq candidate (company-cmake--unexpand-candidate candidate))
-
-    ;; Don't cache the documentation of every candidate (command)
-    ;; Cache in this case will cost too much memory.
-    (with-temp-buffer
-      (call-process company-cmake-executable nil t nil cmd-opts candidate)
-      ;; Go to the third line, trim it and return the result.
-      ;; Tested with cmake 2.8.9.
-      (goto-char (point-min))
-      (forward-line 2)
-      (setq result (buffer-substring-no-properties (line-beginning-position)
-                                                   (line-end-position)))
-      (setq result (replace-regexp-in-string "^[ \t\n\r]+" "" result))
-      result)))
-
-(defun company-cmake--doc-buffer (candidate)
-  (let ((cmd-opts (gethash candidate company-cmake--meta-command-cache)))
-
-    (setq candidate (company-cmake--unexpand-candidate candidate))
-    (with-temp-buffer
-      (call-process company-cmake-executable nil t nil cmd-opts candidate)
-      ;; Go to the third line, trim it and return the doc buffer.
-      ;; Tested with cmake 2.8.9.
-      (goto-char (point-min))
-      (forward-line 2)
-      (company-doc-buffer
-       (buffer-substring-no-properties (line-beginning-position)
-                                       (point-max))))))
-
-(defun company-cmake (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for CMake.
-CMake is a cross-platform, open-source make system."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-cmake))
-    (init (when (memq major-mode company-cmake-modes)
-            (unless company-cmake-executable
-              (error "Company found no cmake executable"))))
-    (prefix (and (memq major-mode company-cmake-modes)
-                 (not (company-in-string-or-comment))
-                 (company-grab-symbol)))
-    (candidates (company-cmake--candidates arg))
-    (meta (company-cmake--meta arg))
-    (doc-buffer (company-cmake--doc-buffer arg))
-    ))
-
-(provide 'company-cmake)
-;;; company-cmake.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-css.el b/emacs.d/elpa/company-20150624.334/company-css.el
deleted file mode 100644
index 28f6c2d..0000000
--- a/emacs.d/elpa/company-20150624.334/company-css.el
+++ /dev/null
@@ -1,442 +0,0 @@
-;;; company-css.el --- company-mode completion back-end for css-mode  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2009, 2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(declare-function web-mode-language-at-pos "web-mode" (&optional pos))
-
-(defconst company-css-property-alist
-  ;; see http://www.w3.org/TR/CSS21/propidx.html
-  '(("azimuth" angle "left-side" "far-left" "left" "center-left" "center"
-     "center-right" "right" "far-right" "right-side" "behind" "leftwards"
-     "rightwards")
-    ("background" background-color background-image background-repeat
-     background-attachment background-position
-     background-clip background-origin background-size)
-    ("background-attachment" "scroll" "fixed")
-    ("background-color" color "transparent")
-    ("background-image" uri "none")
-    ("background-position" percentage length "left" "center" "right" percentage
-     length "top" "center" "bottom" "left" "center" "right" "top" "center"
-     "bottom")
-    ("background-repeat" "repeat" "repeat-x" "repeat-y" "no-repeat")
-    ("border" border-width border-style border-color)
-    ("border-bottom" border)
-    ("border-bottom-color" border-color)
-    ("border-bottom-style" border-style)
-    ("border-bottom-width" border-width)
-    ("border-collapse" "collapse" "separate")
-    ("border-color" color "transparent")
-    ("border-left" border)
-    ("border-left-color" border-color)
-    ("border-left-style" border-style)
-    ("border-left-width" border-width)
-    ("border-right" border)
-    ("border-right-color" border-color)
-    ("border-right-style" border-style)
-    ("border-right-width" border-width)
-    ("border-spacing" length length)
-    ("border-style" border-style)
-    ("border-top" border)
-    ("border-top-color" border-color)
-    ("border-top-style" border-style)
-    ("border-top-width" border-width)
-    ("border-width" border-width)
-    ("bottom" length percentage "auto")
-    ("caption-side" "top" "bottom")
-    ("clear" "none" "left" "right" "both")
-    ("clip" shape "auto")
-    ("color" color)
-    ("content" "normal" "none" string uri counter "attr()" "open-quote"
-     "close-quote" "no-open-quote" "no-close-quote")
-    ("counter-increment" identifier integer "none")
-    ("counter-reset" identifier integer "none")
-    ("cue" cue-before cue-after)
-    ("cue-after" uri "none")
-    ("cue-before" uri "none")
-    ("cursor" uri "*" "auto" "crosshair" "default" "pointer" "move" "e-resize"
-     "ne-resize" "nw-resize" "n-resize" "se-resize" "sw-resize" "s-resize"
-     "w-resize" "text" "wait" "help" "progress")
-    ("direction" "ltr" "rtl")
-    ("display" "inline" "block" "list-item" "run-in" "inline-block" "table"
-     "inline-table" "table-row-group" "table-header-group" "table-footer-group"
-     "table-row" "table-column-group" "table-column" "table-cell"
-     "table-caption" "none")
-    ("elevation" angle "below" "level" "above" "higher" "lower")
-    ("empty-cells" "show" "hide")
-    ("float" "left" "right" "none")
-    ("font" font-style font-weight font-size "/" line-height
-     font-family "caption" "icon" "menu" "message-box" "small-caption"
-     "status-bar" "normal" "small-caps"
-     ;; CSS3
-     font-stretch)
-    ("font-family" family-name generic-family)
-    ("font-size" absolute-size relative-size length percentage)
-    ("font-style" "normal" "italic" "oblique")
-    ("font-weight" "normal" "bold" "bolder" "lighter" "100" "200" "300" "400"
-     "500" "600" "700" "800" "900")
-    ("height" length percentage "auto")
-    ("left" length percentage "auto")
-    ("letter-spacing" "normal" length)
-    ("line-height" "normal" number length percentage)
-    ("list-style" list-style-type list-style-position list-style-image)
-    ("list-style-image" uri "none")
-    ("list-style-position" "inside" "outside")
-    ("list-style-type" "disc" "circle" "square" "decimal" "decimal-leading-zero"
-     "lower-roman" "upper-roman" "lower-greek" "lower-latin" "upper-latin"
-     "armenian" "georgian" "lower-alpha" "upper-alpha" "none")
-    ("margin" margin-width)
-    ("margin-bottom" margin-width)
-    ("margin-left" margin-width)
-    ("margin-right" margin-width)
-    ("margin-top" margin-width)
-    ("max-height" length percentage "none")
-    ("max-width" length percentage "none")
-    ("min-height" length percentage)
-    ("min-width" length percentage)
-    ("orphans" integer)
-    ("outline" outline-color outline-style outline-width)
-    ("outline-color" color "invert")
-    ("outline-style" border-style)
-    ("outline-width" border-width)
-    ("overflow" "visible" "hidden" "scroll" "auto"
-     ;; CSS3:
-     "no-display" "no-content")
-    ("padding" padding-width)
-    ("padding-bottom" padding-width)
-    ("padding-left" padding-width)
-    ("padding-right" padding-width)
-    ("padding-top" padding-width)
-    ("page-break-after" "auto" "always" "avoid" "left" "right")
-    ("page-break-before" "auto" "always" "avoid" "left" "right")
-    ("page-break-inside" "avoid" "auto")
-    ("pause" time percentage)
-    ("pause-after" time percentage)
-    ("pause-before" time percentage)
-    ("pitch" frequency "x-low" "low" "medium" "high" "x-high")
-    ("pitch-range" number)
-    ("play-during" uri "mix" "repeat" "auto" "none")
-    ("position" "static" "relative" "absolute" "fixed")
-    ("quotes" string string "none")
-    ("richness" number)
-    ("right" length percentage "auto")
-    ("speak" "normal" "none" "spell-out")
-    ("speak-header" "once" "always")
-    ("speak-numeral" "digits" "continuous")
-    ("speak-punctuation" "code" "none")
-    ("speech-rate" number "x-slow" "slow" "medium" "fast" "x-fast" "faster"
-     "slower")
-    ("stress" number)
-    ("table-layout" "auto" "fixed")
-    ("text-align" "left" "right" "center" "justify")
-    ("text-indent" length percentage)
-    ("text-transform" "capitalize" "uppercase" "lowercase" "none")
-    ("top" length percentage "auto")
-    ("unicode-bidi" "normal" "embed" "bidi-override")
-    ("vertical-align" "baseline" "sub" "super" "top" "text-top" "middle"
-     "bottom" "text-bottom" percentage length)
-    ("visibility" "visible" "hidden" "collapse")
-    ("voice-family" specific-voice generic-voice "*" specific-voice
-     generic-voice)
-    ("volume" number percentage "silent" "x-soft" "soft" "medium" "loud"
-     "x-loud")
-    ("white-space" "normal" "pre" "nowrap" "pre-wrap" "pre-line")
-    ("widows" integer)
-    ("width" length percentage "auto")
-    ("word-spacing" "normal" length)
-    ("z-index" "auto" integer)
-    ;; CSS3
-    ("align-content" align-stretch "space-between" "space-around")
-    ("align-items" align-stretch "baseline")
-    ("align-self" align-items "auto")
-    ("animation" animation-name animation-duration animation-timing-function
-     animation-delay animation-iteration-count animation-direction
-     animation-fill-mode)
-    ("animation-delay" time)
-    ("animation-direction" "normal" "reverse" "alternate" "alternate-reverse")
-    ("animation-duration" time)
-    ("animation-fill-mode" "none" "forwards" "backwards" "both")
-    ("animation-iteration-count" integer "infinite")
-    ("animation-name" "none")
-    ("animation-play-state" "paused" "running")
-    ("animation-timing-function" transition-timing-function
-     "step-start" "step-end" "steps(,)")
-    ("backface-visibility" "visible" "hidden")
-    ("background-clip" background-origin)
-    ("background-origin" "border-box" "padding-box" "content-box")
-    ("background-size" length percentage "auto" "cover" "contain")
-    ("border-image" border-image-outset border-image-repeat border-image-source
-     border-image-slice border-image-width)
-    ("border-image-outset" length)
-    ("border-image-repeat" "stretch" "repeat" "round" "space")
-    ("border-image-source" uri "none")
-    ("border-image-slice" length)
-    ("border-image-width" length percentage)
-    ("border-radius" length)
-    ("border-top-left-radius" length)
-    ("border-top-right-radius" length)
-    ("border-bottom-left-radius" length)
-    ("border-bottom-right-radius" length)
-    ("box-decoration-break" "slice" "clone")
-    ("box-shadow" length color)
-    ("box-sizing" "content-box" "border-box")
-    ("break-after" "auto" "always" "avoid" "left" "right" "page" "column"
-     "avoid-page" "avoid-column")
-    ("break-before" break-after)
-    ("break-inside" "avoid" "auto")
-    ("columns" column-width column-count)
-    ("column-count" integer)
-    ("column-fill" "auto" "balance")
-    ("column-gap" length "normal")
-    ("column-rule" column-rule-width column-rule-style column-rule-color)
-    ("column-rule-color" color)
-    ("column-rule-style" border-style)
-    ("column-rule-width" border-width)
-    ("column-span" "all" "none")
-    ("column-width" length "auto")
-    ("filter" url "blur()" "brightness()" "contrast()" "drop-shadow()"
-     "grayscale()" "hue-rotate()" "invert()" "opacity()" "saturate()" "sepia()")
-    ("flex" flex-grow flex-shrink flex-basis)
-    ("flex-basis" percentage length "auto")
-    ("flex-direction" "row" "row-reverse" "column" "column-reverse")
-    ("flex-flow" flex-direction flex-wrap)
-    ("flex-grow" number)
-    ("flex-shrink" number)
-    ("flex-wrap" "nowrap" "wrap" "wrap-reverse")
-    ("font-feature-setting" normal string number)
-    ("font-kerning" "auto" "normal" "none")
-    ("font-language-override" "normal" string)
-    ("font-size-adjust" "none" number)
-    ("font-stretch" "normal" "ultra-condensed" "extra-condensed" "condensed"
-     "semi-condensed" "semi-expanded" "expanded" "extra-expanded" "ultra-expanded")
-    ("font-synthesis" "none" "weight" "style")
-    ("font-variant" font-variant-alternates font-variant-caps
-     font-variant-east-asian font-variant-ligatures font-variant-numeric
-     font-variant-position)
-    ("font-variant-alternates" "normal" "historical-forms" "stylistic()"
-     "styleset()" "character-variant()" "swash()" "ornaments()" "annotation()")
-    ("font-variant-caps" "normal" "small-caps" "all-small-caps" "petite-caps"
-     "all-petite-caps" "unicase" "titling-caps")
-    ("font-variant-east-asian" "jis78" "jis83" "jis90" "jis04" "simplified"
-     "traditional" "full-width" "proportional-width" "ruby")
-    ("font-variant-ligatures" "normal" "none" "common-ligatures"
-     "no-common-ligatures" "discretionary-ligatures" "no-discretionary-ligatures"
-     "historical-ligatures" "no-historical-ligatures" "contextual" "no-contextual")
-    ("font-variant-numeric" "normal" "ordinal" "slashed-zero"
-     "lining-nums" "oldstyle-nums" "proportional-nums" "tabular-nums"
-     "diagonal-fractions" "stacked-fractions")
-    ("font-variant-position" "normal" "sub" "super")
-    ("hyphens" "none" "manual" "auto")
-    ("justify-content" align-common "space-between" "space-around")
-    ("line-break" "auto" "loose" "normal" "strict")
-    ("marquee-direction" "forward" "reverse")
-    ("marquee-play-count" integer "infinite")
-    ("marquee-speed" "slow" "normal" "fast")
-    ("marquee-style" "scroll" "slide" "alternate")
-    ("opacity" number)
-    ("order" number)
-    ("outline-offset" length)
-    ("overflow-x" overflow)
-    ("overflow-y" overflow)
-    ("overflow-style" "auto" "marquee-line" "marquee-block")
-    ("overflow-wrap" "normal" "break-word")
-    ("perspective" "none" length)
-    ("perspective-origin" percentage length "left" "center" "right" "top" "bottom")
-    ("resize" "none" "both" "horizontal" "vertical")
-    ("tab-size" integer length)
-    ("text-align-last" "auto" "start" "end" "left" "right" "center" "justify")
-    ("text-decoration" text-decoration-color text-decoration-line text-decoration-style)
-    ("text-decoration-color" color)
-    ("text-decoration-line" "none" "underline" "overline" "line-through" "blink")
-    ("text-decoration-style" "solid" "double" "dotted" "dashed" "wavy")
-    ("text-overflow" "clip" "ellipsis")
-    ("text-shadow" color length)
-    ("text-underline-position" "auto" "under" "left" "right")
-    ("transform" "matrix(,,,,,)" "translate(,)" "translateX()" "translateY()"
-     "scale()" "scaleX()" "scaleY()" "rotate()" "skewX()" "skewY()" "none")
-    ("transform-origin" perspective-origin)
-    ("transform-style" "flat" "preserve-3d")
-    ("transition" transition-property transition-duration
-     transition-timing-function transition-delay)
-    ("transition-delay" time)
-    ("transition-duration" time)
-    ("transition-timing-function"
-     "ease" "linear" "ease-in" "ease-out" "ease-in-out" "cubic-bezier(,,,)")
-    ("transition-property" "none" "all" identifier)
-    ("word-wrap" overflow-wrap)
-    ("word-break" "normal" "break-all" "keep-all"))
-  "A list of CSS properties and their possible values.")
-
-(defconst company-css-value-classes
-  '((absolute-size "xx-small" "x-small" "small" "medium" "large" "x-large"
-                   "xx-large")
-    (align-common "flex-start" "flex-end" "center")
-    (align-stretch align-common "stretch")
-    (border-style "none" "hidden" "dotted" "dashed" "solid" "double" "groove"
-                  "ridge" "inset" "outset")
-    (border-width "thick" "medium" "thin")
-    (color "aqua" "black" "blue" "fuchsia" "gray" "green" "lime" "maroon" "navy"
-           "olive" "orange" "purple" "red" "silver" "teal" "white" "yellow")
-    (counter "counter(,)")
-    (family-name "Courier" "Helvetica" "Times")
-    (generic-family "serif" "sans-serif" "cursive" "fantasy" "monospace")
-    (generic-voice "male" "female" "child")
-    (margin-width "auto") ;; length percentage
-    (relative-size "larger" "smaller")
-    (shape "rect(,,,)")
-    (uri "url()"))
-  "A list of CSS property value classes and their contents.")
-;; missing, because not completable
-;; <angle><frequency><identifier><integer><length><number><padding-width>
-;; <percentage><specific-voice><string><time><uri>
-
-(defconst company-css-html-tags
-  '("a" "abbr" "acronym" "address" "applet" "area" "b" "base" "basefont" "bdo"
-    "big" "blockquote" "body" "br" "button" "caption" "center" "cite" "code"
-    "col" "colgroup" "dd" "del" "dfn" "dir" "div" "dl" "dt" "em" "fieldset"
-    "font" "form" "frame" "frameset" "h1" "h2" "h3" "h4" "h5" "h6" "head" "hr"
-    "html" "i" "iframe" "img" "input" "ins" "isindex" "kbd" "label" "legend"
-    "li" "link" "map" "menu" "meta" "noframes" "noscript" "object" "ol"
-    "optgroup" "option" "p" "param" "pre" "q" "s" "samp" "script" "select"
-    "small" "span" "strike" "strong" "style" "sub" "sup" "table" "tbody" "td"
-    "textarea" "tfoot" "th" "thead" "title" "tr" "tt" "u" "ul" "var"
-    ;; HTML5
-    "section" "article" "aside" "header" "footer" "nav" "figure" "figcaption"
-    "time" "mark" "main")
-  "A list of HTML tags for use in CSS completion.")
-
-(defconst company-css-pseudo-classes
-  '("active" "after" "before" "first" "first-child" "first-letter" "first-line"
-    "focus" "hover" "lang" "left" "link" "right" "visited")
-  "Identifiers for CSS pseudo-elements and pseudo-classes.")
-
-(defconst company-css-property-cache (make-hash-table :size 115 :test 'equal))
-
-(defun company-css-property-values (attribute)
-  "Access the `company-css-property-alist' cached and flattened."
-  (or (gethash attribute company-css-property-cache)
-      (let (results)
-        (dolist (value (cdr (assoc attribute company-css-property-alist)))
-          (if (symbolp value)
-              (dolist (child (or (cdr (assoc value company-css-value-classes))
-                                 (company-css-property-values
-                                  (symbol-name value))))
-                (push child results))
-            (push value results)))
-        (setq results (sort results 'string<))
-        (puthash attribute
-                 (if (fboundp 'delete-consecutive-dups)
-                     (delete-consecutive-dups results)
-                   (delete-dups results))
-                 company-css-property-cache)
-        results)))
-
-;;; bracket detection
-
-(defconst company-css-braces-syntax-table
-  (let ((table (make-syntax-table)))
-    (setf (aref table ?{) '(4 . 125))
-    (setf (aref table ?}) '(5 . 123))
-    table)
-  "A syntax table giving { and } paren syntax.")
-
-(defun company-css-inside-braces-p ()
-  "Return non-nil, if point is within matched { and }."
-  (ignore-errors
-    (with-syntax-table company-css-braces-syntax-table
-      (let ((parse-sexp-ignore-comments t))
-        (scan-lists (point) -1 1)))))
-
-;;; tags
-(defconst company-css-tag-regexp
-  (concat "\\(?:\\`\\|}\\)[[:space:]]*"
-          ;; multiple
-          "\\(?:"
-          ;; previous tags:
-          "\\(?:#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\(?:\\[[^]]*\\]\\)?"
-          ;; space or selectors
-          "\\(?:[[:space:]]+\\|[[:space:]]*[+,>][[:space:]]*\\)"
-          "\\)*"
-          "\\(\\(?:#\\|\\_<[[:alpha:]]\\)\\(?:[[:alnum:]-#]*\\_>\\)?\\_>\\|\\)"
-          "\\=")
-  "A regular expression matching CSS tags.")
-
-;;; pseudo id
-(defconst company-css-pseudo-regexp
-  (concat "\\(?:\\`\\|}\\)[[:space:]]*"
-          ;; multiple
-          "\\(?:"
-          ;; previous tags:
-          "\\(?:#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\(?:\\[[^]]*\\]\\)?"
-          ;; space or delimiters
-          "\\(?:[[:space:]]+\\|[[:space:]]*[+,>][[:space:]]*\\)"
-          "\\)*"
-          "\\(?:\\(?:\\#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\):"
-          "\\([[:alpha:]-]+\\_>\\|\\)\\_>\\=")
-  "A regular expression matching CSS pseudo classes.")
-
-;;; properties
-
-(defun company-css-grab-property ()
-  "Return the CSS property before point, if any.
-Returns \"\" if no property found, but feasible at this position."
-  (when (company-css-inside-braces-p)
-    (company-grab-symbol)))
-
-;;; values
-(defconst company-css-property-value-regexp
-  "\\_<\\([[:alpha:]-]+\\):\\(?:[^{};]*[[:space:]]+\\)?\\([^{};]*\\_>\\|\\)\\="
-  "A regular expression matching CSS tags.")
-
-;;;###autoload
-(defun company-css (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for `css-mode'."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-css))
-    (prefix (and (or (derived-mode-p 'css-mode)
-                     (and (derived-mode-p 'web-mode)
-                          (string= (web-mode-language-at-pos) "css")))
-                 (or (company-grab company-css-tag-regexp 1)
-                     (company-grab company-css-pseudo-regexp 1)
-                     (company-grab company-css-property-value-regexp 2)
-                     (company-css-grab-property))))
-    (candidates
-     (cond
-      ((company-grab company-css-tag-regexp 1)
-       (all-completions arg company-css-html-tags))
-      ((company-grab company-css-pseudo-regexp 1)
-       (all-completions arg company-css-pseudo-classes))
-      ((company-grab company-css-property-value-regexp 2)
-       (all-completions arg
-                        (company-css-property-values
-                         (company-grab company-css-property-value-regexp 1))))
-      ((company-css-grab-property)
-       (all-completions arg company-css-property-alist))))
-    (sorted t)))
-
-(provide 'company-css)
-;;; company-css.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-dabbrev-code.el b/emacs.d/elpa/company-20150624.334/company-dabbrev-code.el
deleted file mode 100644
index 256b57f..0000000
--- a/emacs.d/elpa/company-20150624.334/company-dabbrev-code.el
+++ /dev/null
@@ -1,104 +0,0 @@
-;;; company-dabbrev-code.el --- dabbrev-like company-mode back-end for code  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2009, 2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'company-dabbrev)
-(require 'cl-lib)
-
-(defgroup company-dabbrev-code nil
-  "dabbrev-like completion back-end for code."
-  :group 'company)
-
-(defcustom company-dabbrev-code-modes
-  '(prog-mode
-    batch-file-mode csharp-mode css-mode erlang-mode haskell-mode jde-mode
-    lua-mode python-mode)
-  "Modes that use `company-dabbrev-code'.
-In all these modes (and their derivatives) `company-dabbrev-code' will
-complete only symbols, not text in comments or strings.  In other modes
-`company-dabbrev-code' will pass control to other back-ends
-\(e.g. `company-dabbrev'\).  Value t means complete in all modes."
-  :type '(choice (repeat (symbol :tag "Major mode"))
-                 (const tag "All modes" t)))
-
-(defcustom company-dabbrev-code-other-buffers t
-  "Determines whether `company-dabbrev-code' should search other buffers.
-If `all', search all other buffers, except the ignored ones.  If t, search
-buffers with the same major mode.  If `code', search all buffers with major
-modes in `company-dabbrev-code-modes', or derived from one of them.  See
-also `company-dabbrev-code-time-limit'."
-  :type '(choice (const :tag "Off" nil)
-                 (const :tag "Same major mode" t)
-                 (const :tag "Code major modes" code)
-                 (const :tag "All" all)))
-
-(defcustom company-dabbrev-code-time-limit .1
-  "Determines how long `company-dabbrev-code' should look for matches."
-  :type '(choice (const :tag "Off" nil)
-                 (number :tag "Seconds")))
-
-(defcustom company-dabbrev-code-everywhere nil
-  "Non-nil to offer completions in comments and strings."
-  :type 'boolean)
-
-(defcustom company-dabbrev-code-ignore-case nil
-  "Non-nil to ignore case when collecting completion candidates."
-  :type 'boolean)
-
-(defsubst company-dabbrev-code--make-regexp (prefix)
-  (concat "\\_<" (if (equal prefix "")
-                     "\\([a-zA-Z]\\|\\s_\\)"
-                   (regexp-quote prefix))
-          "\\(\\sw\\|\\s_\\)*\\_>"))
-
-;;;###autoload
-(defun company-dabbrev-code (command &optional arg &rest ignored)
-  "dabbrev-like `company-mode' back-end for code.
-The back-end looks for all symbols in the current buffer that aren't in
-comments or strings."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-dabbrev-code))
-    (prefix (and (or (eq t company-dabbrev-code-modes)
-                     (apply #'derived-mode-p company-dabbrev-code-modes))
-                 (or company-dabbrev-code-everywhere
-                     (not (company-in-string-or-comment)))
-                 (or (company-grab-symbol) 'stop)))
-    (candidates (let ((case-fold-search company-dabbrev-code-ignore-case))
-                  (company-dabbrev--search
-                   (company-dabbrev-code--make-regexp arg)
-                   company-dabbrev-code-time-limit
-                   (pcase company-dabbrev-code-other-buffers
-                     (`t (list major-mode))
-                     (`code company-dabbrev-code-modes)
-                     (`all `all))
-                   t)))
-    (ignore-case company-dabbrev-code-ignore-case)
-    (duplicates t)))
-
-(provide 'company-dabbrev-code)
-;;; company-dabbrev-code.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-dabbrev.el b/emacs.d/elpa/company-20150624.334/company-dabbrev.el
deleted file mode 100644
index 2ab4303..0000000
--- a/emacs.d/elpa/company-20150624.334/company-dabbrev.el
+++ /dev/null
@@ -1,170 +0,0 @@
-;;; company-dabbrev.el --- dabbrev-like company-mode completion back-end  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2009, 2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defgroup company-dabbrev nil
-  "dabbrev-like completion back-end."
-  :group 'company)
-
-(defcustom company-dabbrev-other-buffers 'all
-  "Determines whether `company-dabbrev' should search other buffers.
-If `all', search all other buffers, except the ignored ones.  If t, search
-buffers with the same major mode.  See also `company-dabbrev-time-limit'."
-  :type '(choice (const :tag "Off" nil)
-                 (const :tag "Same major mode" t)
-                 (const :tag "All" all)))
-
-(defcustom company-dabbrev-ignore-buffers "\\`[ *]"
-  "Regexp matching the names of buffers to ignore."
-  :type 'regexp)
-
-(defcustom company-dabbrev-time-limit .1
-  "Determines how many seconds `company-dabbrev' should look for matches."
-  :type '(choice (const :tag "Off" nil)
-                 (number :tag "Seconds")))
-
-(defcustom company-dabbrev-char-regexp "\\sw"
-  "A regular expression matching the characters `company-dabbrev' looks for."
-  :type 'regexp)
-
-(defcustom company-dabbrev-ignore-case 'keep-prefix
-  "Non-nil to ignore case when collecting completion candidates.
-When it's `keep-prefix', the text before point will remain unchanged after
-candidate is inserted, even some of its characters have different case.")
-
-(defcustom company-dabbrev-downcase 'case-replace
-  "Whether to downcase the returned candidates.
-
-The value of nil means keep them as-is.
-`case-replace' means use the value of `case-replace'.
-Any other value means downcase.
-
-If you set this value to nil, you may also want to set
-`company-dabbrev-ignore-case' to any value other than `keep-prefix'.")
-
-(defcustom company-dabbrev-minimum-length 4
-  "The minimum length for the completion candidate to be included.
-This variable affects both `company-dabbrev' and `company-dabbrev-code'."
-  :type 'integer
-  :package-version '(company . "0.8.3"))
-
-(defcustom company-dabbrev-ignore-invisible nil
-  "Non-nil to skip invisible text."
-  :type 'boolean
-  :package-version '(company . "0.9.0"))
-
-(defmacro company-dabrev--time-limit-while (test start limit &rest body)
-  (declare (indent 3) (debug t))
-  `(let ((company-time-limit-while-counter 0))
-     (catch 'done
-       (while ,test
-         ,@body
-         (and ,limit
-              (eq (cl-incf company-time-limit-while-counter) 25)
-              (setq company-time-limit-while-counter 0)
-              (> (float-time (time-since ,start)) ,limit)
-              (throw 'done 'company-time-out))))))
-
-(defsubst company-dabbrev--make-regexp (prefix)
-  (concat "\\<" (if (equal prefix "")
-              company-dabbrev-char-regexp
-            (regexp-quote prefix))
-          "\\(" company-dabbrev-char-regexp "\\)*\\>"))
-
-(defun company-dabbrev--search-buffer (regexp pos symbols start limit
-                                       ignore-comments)
-  (save-excursion
-    (cl-flet ((maybe-collect-match
-               ()
-               (let ((match (match-string-no-properties 0)))
-                 (when (and (>= (length match) company-dabbrev-minimum-length)
-                            (not (and company-dabbrev-ignore-invisible
-                                      (invisible-p (match-beginning 0)))))
-                   (push match symbols)))))
-      (goto-char (if pos (1- pos) (point-min)))
-      ;; search before pos
-      (company-dabrev--time-limit-while (re-search-backward regexp nil t)
-          start limit
-        (if (and ignore-comments (save-match-data (company-in-string-or-comment)))
-            (goto-char (nth 8 (syntax-ppss)))
-          (maybe-collect-match)))
-      (goto-char (or pos (point-min)))
-      ;; search after pos
-      (company-dabrev--time-limit-while (re-search-forward regexp nil t)
-          start limit
-        (if (and ignore-comments (save-match-data (company-in-string-or-comment)))
-            (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)
-          (maybe-collect-match)))
-      symbols)))
-
-(defun company-dabbrev--search (regexp &optional limit other-buffer-modes
-                                ignore-comments)
-  (let* ((start (current-time))
-         (symbols (company-dabbrev--search-buffer regexp (point) nil start limit
-                                                  ignore-comments)))
-    (when other-buffer-modes
-      (cl-dolist (buffer (delq (current-buffer) (buffer-list)))
-        (with-current-buffer buffer
-          (when (if (eq other-buffer-modes 'all)
-                    (not (string-match-p company-dabbrev-ignore-buffers
-                                         (buffer-name)))
-                  (apply #'derived-mode-p other-buffer-modes))
-            (setq symbols
-                  (company-dabbrev--search-buffer regexp nil symbols start
-                                                  limit ignore-comments))))
-        (and limit
-             (> (float-time (time-since start)) limit)
-             (cl-return))))
-    symbols))
-
-;;;###autoload
-(defun company-dabbrev (command &optional arg &rest ignored)
-  "dabbrev-like `company-mode' completion back-end."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-dabbrev))
-    (prefix (company-grab-word))
-    (candidates
-     (let* ((case-fold-search company-dabbrev-ignore-case)
-            (words (company-dabbrev--search (company-dabbrev--make-regexp arg)
-                                            company-dabbrev-time-limit
-                                            (pcase company-dabbrev-other-buffers
-                                              (`t (list major-mode))
-                                              (`all `all))))
-            (downcase-p (if (eq company-dabbrev-downcase 'case-replace)
-                            case-replace
-                          company-dabbrev-downcase)))
-       (if downcase-p
-           (mapcar 'downcase words)
-         words)))
-    (ignore-case company-dabbrev-ignore-case)
-    (duplicates t)))
-
-(provide 'company-dabbrev)
-;;; company-dabbrev.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-eclim.el b/emacs.d/elpa/company-20150624.334/company-eclim.el
deleted file mode 100644
index 5627f8e..0000000
--- a/emacs.d/elpa/company-20150624.334/company-eclim.el
+++ /dev/null
@@ -1,185 +0,0 @@
-;;; company-eclim.el --- company-mode completion back-end for Eclim
-
-;; Copyright (C) 2009, 2011, 2013, 2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Using `emacs-eclim' together with (or instead of) this back-end is
-;; recommended, as it allows you to use other Eclim features.
-;;
-;; The alternative back-end provided by `emacs-eclim' uses `yasnippet'
-;; instead of `company-template' to expand function calls, and it supports
-;; some languages other than Java.
-
-;;; Code:
-
-(require 'company)
-(require 'company-template)
-(require 'cl-lib)
-
-(defgroup company-eclim nil
-  "Completion back-end for Eclim."
-  :group 'company)
-
-(defun company-eclim-executable-find ()
-  (let (file)
-    (cl-dolist (eclipse-root '("/Applications/eclipse" "/usr/lib/eclipse"
-                            "/usr/local/lib/eclipse"))
-      (and (file-exists-p (setq file (expand-file-name "plugins" eclipse-root)))
-           (setq file (car (last (directory-files file t "^org.eclim_"))))
-           (file-exists-p (setq file (expand-file-name "bin/eclim" file)))
-           (cl-return file)))))
-
-(defcustom company-eclim-executable
-  (or (bound-and-true-p eclim-executable)
-      (executable-find "eclim")
-      (company-eclim-executable-find))
-  "Location of eclim executable."
-  :type 'file)
-
-(defcustom company-eclim-auto-save t
-  "Determines whether to save the buffer when retrieving completions.
-eclim can only complete correctly when the buffer has been saved."
-  :type '(choice (const :tag "Off" nil)
-                 (const :tag "On" t)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-eclim--project-dir 'unknown)
-
-(defvar-local company-eclim--project-name nil)
-
-(declare-function json-read "json")
-(defvar json-array-type)
-
-(defun company-eclim--call-process (&rest args)
-  (let ((coding-system-for-read 'utf-8)
-        res)
-    (require 'json)
-    (with-temp-buffer
-      (if (= 0 (setq res (apply 'call-process company-eclim-executable nil t nil
-                                "-command" args)))
-          (let ((json-array-type 'list))
-            (goto-char (point-min))
-            (unless (eobp)
-              (json-read)))
-        (message "Company-eclim command failed with error %d:\n%s" res
-                 (buffer-substring (point-min) (point-max)))
-        nil))))
-
-(defun company-eclim--project-list ()
-  (company-eclim--call-process "project_list"))
-
-(defun company-eclim--project-dir ()
-  (if (eq company-eclim--project-dir 'unknown)
-      (setq company-eclim--project-dir
-            (directory-file-name
-             (expand-file-name
-              (locate-dominating-file buffer-file-name ".project"))))
-    company-eclim--project-dir))
-
-(defun company-eclim--project-name ()
-  (or company-eclim--project-name
-      (let ((dir (company-eclim--project-dir)))
-        (when dir
-          (setq company-eclim--project-name
-                (cl-loop for project in (company-eclim--project-list)
-                         when (equal (cdr (assoc 'path project)) dir)
-                         return (cdr (assoc 'name project))))))))
-
-(defun company-eclim--candidates (prefix)
-  (interactive "d")
-  (let ((project-file (file-relative-name buffer-file-name
-                                          (company-eclim--project-dir)))
-        completions)
-    (when company-eclim-auto-save
-      (when (buffer-modified-p)
-        (basic-save-buffer))
-      ;; FIXME: Sometimes this isn't finished when we complete.
-      (company-eclim--call-process "java_src_update"
-                                   "-p" (company-eclim--project-name)
-                                   "-f" project-file))
-    (dolist (item (cdr (assoc 'completions
-                              (company-eclim--call-process
-                               "java_complete" "-p" (company-eclim--project-name)
-                               "-f" project-file
-                               "-o" (number-to-string
-                                     (company-eclim--search-point prefix))
-                               "-e" "utf-8"
-                               "-l" "standard"))))
-      (let* ((meta (cdr (assoc 'info item)))
-             (completion meta))
-        (when (string-match " ?[(:-]" completion)
-          (setq completion (substring completion 0 (match-beginning 0))))
-        (put-text-property 0 1 'meta meta completion)
-        (push completion completions)))
-    (let ((completion-ignore-case nil))
-      (all-completions prefix completions))))
-
-(defun company-eclim--search-point (prefix)
-  (if (or (cl-plusp (length prefix)) (eq (char-before) ?.))
-      (1- (point))
-    (point)))
-
-(defun company-eclim--meta (candidate)
-  (get-text-property 0 'meta candidate))
-
-(defun company-eclim--annotation (candidate)
-  (let ((meta (company-eclim--meta candidate)))
-    (when (string-match "\\(([^-]*\\) -" meta)
-      (substring meta (match-beginning 1) (match-end 1)))))
-
-(defun company-eclim--prefix ()
-  (let ((prefix (company-grab-symbol)))
-    (when prefix
-      ;; Completion candidates for annotations don't include '@'.
-      (when (eq ?@ (string-to-char prefix))
-        (setq prefix (substring prefix 1)))
-      prefix)))
-
-(defun company-eclim (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for Eclim.
-Eclim provides access to Eclipse Java IDE features for other editors.
-
-Eclim version 1.7.13 or newer (?) is required.
-
-Completions only work correctly when the buffer has been saved.
-`company-eclim-auto-save' determines whether to do this automatically."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-eclim))
-    (prefix (and (derived-mode-p 'java-mode 'jde-mode)
-                 buffer-file-name
-                 company-eclim-executable
-                 (company-eclim--project-name)
-                 (not (company-in-string-or-comment))
-                 (or (company-eclim--prefix) 'stop)))
-    (candidates (company-eclim--candidates arg))
-    (meta (company-eclim--meta arg))
-    ;; because "" doesn't return everything
-    (no-cache (equal arg ""))
-    (annotation (company-eclim--annotation arg))
-    (post-completion (let ((anno (company-eclim--annotation arg)))
-                       (when anno
-                         (insert anno)
-                         (company-template-c-like-templatify anno))))))
-
-(provide 'company-eclim)
-;;; company-eclim.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-elisp.el b/emacs.d/elpa/company-20150624.334/company-elisp.el
deleted file mode 100644
index 5efd8d0..0000000
--- a/emacs.d/elpa/company-20150624.334/company-elisp.el
+++ /dev/null
@@ -1,225 +0,0 @@
-;;; company-elisp.el --- company-mode completion back-end for Emacs Lisp -*- lexical-binding: t -*-
-
-;; Copyright (C) 2009, 2011-2013  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-(require 'help-mode)
-(require 'find-func)
-
-(defgroup company-elisp nil
-  "Completion back-end for Emacs Lisp."
-  :group 'company)
-
-(defcustom company-elisp-detect-function-context t
-  "If enabled, offer Lisp functions only in appropriate contexts.
-Functions are offered for completion only after ' and \(."
-  :type '(choice (const :tag "Off" nil)
-                 (const :tag "On" t)))
-
-(defcustom company-elisp-show-locals-first t
-  "If enabled, locally bound variables and functions are displayed
-first in the candidates list."
-  :type '(choice (const :tag "Off" nil)
-                 (const :tag "On" t)))
-
-(defun company-elisp--prefix ()
-  (let ((prefix (company-grab-symbol)))
-    (if prefix
-        (when (if (company-in-string-or-comment)
-                  (= (char-before (- (point) (length prefix))) ?`)
-                (company-elisp--should-complete))
-          prefix)
-      'stop)))
-
-(defun company-elisp--predicate (symbol)
-  (or (boundp symbol)
-      (fboundp symbol)
-      (facep symbol)
-      (featurep symbol)))
-
-(defun company-elisp--fns-regexp (&rest names)
-  (concat "\\_<\\(?:cl-\\)?" (regexp-opt names) "\\*?\\_>"))
-
-(defvar company-elisp-parse-limit 30)
-(defvar company-elisp-parse-depth 100)
-
-(defvar company-elisp-defun-names '("defun" "defmacro" "defsubst"))
-
-(defvar company-elisp-var-binding-regexp
-  (apply #'company-elisp--fns-regexp "let" "lambda" "lexical-let"
-         company-elisp-defun-names)
-  "Regular expression matching head of a multiple variable bindings form.")
-
-(defvar company-elisp-var-binding-regexp-1
-  (company-elisp--fns-regexp "dolist" "dotimes")
-  "Regular expression matching head of a form with one variable binding.")
-
-(defvar company-elisp-fun-binding-regexp
-  (company-elisp--fns-regexp "flet" "labels")
-  "Regular expression matching head of a function bindings form.")
-
-(defvar company-elisp-defuns-regexp
-  (concat "([ \t\n]*"
-          (apply #'company-elisp--fns-regexp company-elisp-defun-names)))
-
-(defun company-elisp--should-complete ()
-  (let ((start (point))
-        (depth (car (syntax-ppss))))
-    (not
-     (when (> depth 0)
-       (save-excursion
-         (up-list (- depth))
-         (when (looking-at company-elisp-defuns-regexp)
-           (forward-char)
-           (forward-sexp 1)
-           (unless (= (point) start)
-             (condition-case nil
-                 (let ((args-end (scan-sexps (point) 2)))
-                   (or (null args-end)
-                       (> args-end start)))
-               (scan-error
-                t)))))))))
-
-(defun company-elisp--locals (prefix functions-p)
-  (let ((regexp (concat "[ \t\n]*\\(\\_<" (regexp-quote prefix)
-                        "\\(?:\\sw\\|\\s_\\)*\\_>\\)"))
-        (pos (point))
-        res)
-    (condition-case nil
-        (save-excursion
-          (dotimes (_ company-elisp-parse-depth)
-            (up-list -1)
-            (save-excursion
-              (when (eq (char-after) ?\()
-                (forward-char 1)
-                (when (ignore-errors
-                        (save-excursion (forward-list)
-                                        (<= (point) pos)))
-                  (skip-chars-forward " \t\n")
-                  (cond
-                   ((looking-at (if functions-p
-                                    company-elisp-fun-binding-regexp
-                                  company-elisp-var-binding-regexp))
-                    (down-list 1)
-                    (condition-case nil
-                        (dotimes (_ company-elisp-parse-limit)
-                          (save-excursion
-                            (when (looking-at "[ \t\n]*(")
-                              (down-list 1))
-                            (when (looking-at regexp)
-                              (cl-pushnew (match-string-no-properties 1) res)))
-                          (forward-sexp))
-                      (scan-error nil)))
-                   ((unless functions-p
-                      (looking-at company-elisp-var-binding-regexp-1))
-                    (down-list 1)
-                    (when (looking-at regexp)
-                      (cl-pushnew (match-string-no-properties 1) res)))))))))
-      (scan-error nil))
-    res))
-
-(defun company-elisp-candidates (prefix)
-  (let* ((predicate (company-elisp--candidates-predicate prefix))
-         (locals (company-elisp--locals prefix (eq predicate 'fboundp)))
-         (globals (company-elisp--globals prefix predicate))
-         (locals (cl-loop for local in locals
-                          when (not (member local globals))
-                          collect local)))
-    (if company-elisp-show-locals-first
-        (append (sort locals 'string<)
-                (sort globals 'string<))
-      (append locals globals))))
-
-(defun company-elisp--globals (prefix predicate)
-  (all-completions prefix obarray predicate))
-
-(defun company-elisp--candidates-predicate (prefix)
-  (let* ((completion-ignore-case nil)
-         (beg (- (point) (length prefix)))
-         (before (char-before beg)))
-    (if (and company-elisp-detect-function-context
-             (not (memq before '(?' ?`))))
-        (if (and (eq before ?\()
-                 (not
-                  (save-excursion
-                    (ignore-errors
-                      (goto-char (1- beg))
-                      (or (company-elisp--before-binding-varlist-p)
-                          (progn
-                            (up-list -1)
-                            (company-elisp--before-binding-varlist-p)))))))
-            'fboundp
-          'boundp)
-      'company-elisp--predicate)))
-
-(defun company-elisp--before-binding-varlist-p ()
-  (save-excursion
-    (and (prog1 (search-backward "(")
-           (forward-char 1))
-         (looking-at company-elisp-var-binding-regexp))))
-
-(defun company-elisp--doc (symbol)
-  (let* ((symbol (intern symbol))
-         (doc (if (fboundp symbol)
-                  (documentation symbol t)
-                (documentation-property symbol 'variable-documentation t))))
-    (and (stringp doc)
-         (string-match ".*$" doc)
-         (match-string 0 doc))))
-
-;;;###autoload
-(defun company-elisp (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for Emacs Lisp."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-elisp))
-    (prefix (and (derived-mode-p 'emacs-lisp-mode 'inferior-emacs-lisp-mode)
-                 (company-elisp--prefix)))
-    (candidates (company-elisp-candidates arg))
-    (sorted company-elisp-show-locals-first)
-    (meta (company-elisp--doc arg))
-    (doc-buffer (let ((symbol (intern arg)))
-                  (save-window-excursion
-                    (ignore-errors
-                      (cond
-                       ((fboundp symbol) (describe-function symbol))
-                       ((boundp symbol) (describe-variable symbol))
-                       ((featurep symbol) (describe-package symbol))
-                       ((facep symbol) (describe-face symbol))
-                       (t (signal 'user-error nil)))
-                      (help-buffer)))))
-    (location (let ((sym (intern arg)))
-                (cond
-                 ((fboundp sym) (find-definition-noselect sym nil))
-                 ((boundp sym) (find-definition-noselect sym 'defvar))
-                 ((featurep sym) (cons (find-file-noselect (find-library-name
-                                                            (symbol-name sym)))
-                                       0))
-                 ((facep sym) (find-definition-noselect sym 'defface)))))))
-
-(provide 'company-elisp)
-;;; company-elisp.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-etags.el b/emacs.d/elpa/company-20150624.334/company-etags.el
deleted file mode 100644
index 1c01c91..0000000
--- a/emacs.d/elpa/company-20150624.334/company-etags.el
+++ /dev/null
@@ -1,94 +0,0 @@
-;;; company-etags.el --- company-mode completion back-end for etags
-
-;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-(require 'etags)
-
-(defgroup company-etags nil
-  "Completion back-end for etags."
-  :group 'company)
-
-(defcustom company-etags-use-main-table-list t
-  "Always search `tags-table-list' if set.
-If this is disabled, `company-etags' will try to find the one table for each
-buffer automatically."
-  :type '(choice (const :tag "off" nil)
-                 (const :tag "on" t)))
-
-(defcustom company-etags-ignore-case nil
-  "Non-nil to ignore case in completion candidates."
-  :type 'boolean
-  :package-version '(company . "0.7.3"))
-
-(defvar company-etags-modes '(prog-mode c-mode objc-mode c++-mode java-mode
-                              jde-mode pascal-mode perl-mode python-mode))
-
-(defvar-local company-etags-buffer-table 'unknown)
-
-(defun company-etags-find-table ()
-  (let ((file (locate-dominating-file (or buffer-file-name
-                                          default-directory)
-                                      "TAGS")))
-    (when (and file (file-regular-p file))
-      (list (expand-file-name file)))))
-
-(defun company-etags-buffer-table ()
-  (or (and company-etags-use-main-table-list tags-table-list)
-      (if (eq company-etags-buffer-table 'unknown)
-          (setq company-etags-buffer-table (company-etags-find-table))
-        company-etags-buffer-table)))
-
-(defun company-etags--candidates (prefix)
-  (let ((tags-table-list (company-etags-buffer-table))
-        (completion-ignore-case company-etags-ignore-case))
-    (and (or tags-file-name tags-table-list)
-         (fboundp 'tags-completion-table)
-         (save-excursion
-           (visit-tags-table-buffer)
-           (all-completions prefix (tags-completion-table))))))
-
-;;;###autoload
-(defun company-etags (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for etags."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-etags))
-    (prefix (and (apply 'derived-mode-p company-etags-modes)
-                 (not (company-in-string-or-comment))
-                 (company-etags-buffer-table)
-                 (or (company-grab-symbol) 'stop)))
-    (candidates (company-etags--candidates arg))
-    (location (let ((tags-table-list (company-etags-buffer-table)))
-                (when (fboundp 'find-tag-noselect)
-                  (save-excursion
-                    (let ((buffer (find-tag-noselect arg)))
-                      (cons buffer (with-current-buffer buffer (point))))))))
-    (ignore-case company-etags-ignore-case)))
-
-(provide 'company-etags)
-;;; company-etags.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-files.el b/emacs.d/elpa/company-20150624.334/company-files.el
deleted file mode 100644
index 200f9cf..0000000
--- a/emacs.d/elpa/company-20150624.334/company-files.el
+++ /dev/null
@@ -1,111 +0,0 @@
-;;; company-files.el --- company-mode completion back-end for file paths
-
-;; Copyright (C) 2009-2011, 2014-2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defun company-files--directory-files (dir prefix)
-  (ignore-errors
-    (if (equal prefix "")
-        (directory-files dir nil "\\`[^.]\\|\\`.[^.]")
-      (file-name-all-completions prefix dir))))
-
-(defvar company-files--regexps
-  (let* ((root (if (eq system-type 'windows-nt)
-                   "[a-zA-Z]:/"
-                 "/"))
-         (begin (concat "\\(?:\\.\\{1,2\\}/\\|~/\\|" root "\\)")))
-    (list (concat "\"\\(" begin "[^\"\n]*\\)")
-          (concat "\'\\(" begin "[^\'\n]*\\)")
-          (concat "\\(?:[ \t]\\|^\\)\\(" begin "[^ \t\n]*\\)"))))
-
-(defun company-files--grab-existing-name ()
-  ;; Grab the file name.
-  ;; When surrounded with quotes, it can include spaces.
-  (let (file dir)
-    (and (cl-dolist (regexp company-files--regexps)
-           (when (setq file (company-grab-line regexp 1))
-             (cl-return file)))
-         (company-files--connected-p file)
-         (setq dir (file-name-directory file))
-         (not (string-match "//" dir))
-         (file-exists-p dir)
-         (file-name-all-completions (file-name-nondirectory file) dir)
-         file)))
-
-(defun company-files--connected-p (file)
-  (or (not (file-remote-p file))
-      (file-remote-p file nil t)))
-
-(defvar company-files--completion-cache nil)
-
-(defun company-files--complete (prefix)
-  (let* ((dir (file-name-directory prefix))
-         (key (list (file-name-nondirectory prefix)
-                    (expand-file-name dir)
-                    (nth 5 (file-attributes dir))))
-         (file (file-name-nondirectory prefix))
-         (completion-ignore-case read-file-name-completion-ignore-case)
-         candidates directories)
-    (unless (company-file--keys-match-p key (car company-files--completion-cache))
-      (dolist (file (company-files--directory-files dir file))
-        (setq file (concat dir file))
-        (when (company-files--connected-p file)
-          (push file candidates)
-          (when (file-directory-p file)
-            (push file directories))))
-      (dolist (directory (reverse directories))
-        ;; Add one level of children.
-        (dolist (child (company-files--directory-files directory ""))
-          (push (concat directory
-                        (unless (eq (aref directory (1- (length directory))) ?/) "/")
-                        child) candidates)))
-      (setq company-files--completion-cache (cons key (nreverse candidates))))
-    (all-completions prefix
-                     (cdr company-files--completion-cache))))
-
-(defun company-file--keys-match-p (new old)
-  (and (equal (cdr old) (cdr new))
-       (string-prefix-p (car old) (car new))))
-
-;;;###autoload
-(defun company-files (command &optional arg &rest ignored)
-  "`company-mode' completion back-end existing file names.
-Completions works for proper absolute and relative files paths.
-File paths with spaces are only supported inside strings."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-files))
-    (prefix (company-files--grab-existing-name))
-    (candidates (company-files--complete arg))
-    (location (cons (dired-noselect
-                     (file-name-directory (directory-file-name arg))) 1))
-    (sorted t)
-    (no-cache t)))
-
-(provide 'company-files)
-;;; company-files.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-gtags.el b/emacs.d/elpa/company-20150624.334/company-gtags.el
deleted file mode 100644
index e214db7..0000000
--- a/emacs.d/elpa/company-20150624.334/company-gtags.el
+++ /dev/null
@@ -1,116 +0,0 @@
-;;; company-gtags.el --- company-mode completion back-end for GNU Global
-
-;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'company-template)
-(require 'cl-lib)
-
-(defgroup company-gtags nil
-  "Completion back-end for GNU Global."
-  :group 'company)
-
-(defcustom company-gtags-executable
-  (executable-find "global")
-  "Location of GNU global executable."
-  :type 'string)
-
-(define-obsolete-variable-alias
-  'company-gtags-gnu-global-program-name
-  'company-gtags-executable "earlier")
-
-(defcustom company-gtags-insert-arguments t
-  "When non-nil, insert function arguments as a template after completion."
-  :type 'boolean
-  :package-version '(company . "0.8.1"))
-
-(defvar-local company-gtags--tags-available-p 'unknown)
-
-(defcustom company-gtags-modes '(prog-mode jde-mode)
-  "Modes that use `company-gtags'.
-In all these modes (and their derivatives) `company-gtags' will perform
-completion."
-  :type '(repeat (symbol :tag "Major mode"))
-  :package-version '(company . "0.8.4"))
-
-(defun company-gtags--tags-available-p ()
-  (if (eq company-gtags--tags-available-p 'unknown)
-      (setq company-gtags--tags-available-p
-            (locate-dominating-file buffer-file-name "GTAGS"))
-    company-gtags--tags-available-p))
-
-(defun company-gtags--fetch-tags (prefix)
-  (with-temp-buffer
-    (let (tags)
-      (when (= 0 (call-process company-gtags-executable nil
-                               (list (current-buffer) nil) nil "-xGq" (concat "^" prefix)))
-        (goto-char (point-min))
-        (cl-loop while
-                 (re-search-forward (concat
-                                     "^"
-                                     "\\([^ ]*\\)" ;; completion
-                                     "[ \t]+\\([[:digit:]]+\\)" ;; linum
-                                     "[ \t]+\\([^ \t]+\\)" ;; file
-                                     "[ \t]+\\(.*\\)" ;; definition
-                                     "$"
-                                     ) nil t)
-                 collect
-                 (propertize (match-string 1)
-                             'meta (match-string 4)
-                             'location (cons (expand-file-name (match-string 3))
-                                             (string-to-number (match-string 2)))
-                             ))))))
-
-(defun company-gtags--annotation (arg)
-  (let ((meta (get-text-property 0 'meta arg)))
-    (when (string-match (concat arg "\\((.*)\\).*") meta)
-      (match-string 1 meta))))
-
-;;;###autoload
-(defun company-gtags (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for GNU Global."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-gtags))
-    (prefix (and company-gtags-executable
-                 buffer-file-name
-                 (apply #'derived-mode-p company-gtags-modes)
-                 (not (company-in-string-or-comment))
-                 (company-gtags--tags-available-p)
-                 (or (company-grab-symbol) 'stop)))
-    (candidates (company-gtags--fetch-tags arg))
-    (sorted t)
-    (duplicates t)
-    (annotation (company-gtags--annotation arg))
-    (meta (get-text-property 0 'meta arg))
-    (location (get-text-property 0 'location arg))
-    (post-completion (let ((anno (company-gtags--annotation arg)))
-                       (when (and company-gtags-insert-arguments anno)
-                         (insert anno)
-                         (company-template-c-like-templatify anno))))))
-
-(provide 'company-gtags)
-;;; company-gtags.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-ispell.el b/emacs.d/elpa/company-20150624.334/company-ispell.el
deleted file mode 100644
index 4ce8dfc..0000000
--- a/emacs.d/elpa/company-20150624.334/company-ispell.el
+++ /dev/null
@@ -1,76 +0,0 @@
-;;; company-ispell.el --- company-mode completion back-end using Ispell
-
-;; Copyright (C) 2009-2011, 2013-2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-(require 'ispell)
-
-(defgroup company-ispell nil
-  "Completion back-end using Ispell."
-  :group 'company)
-
-(defcustom company-ispell-dictionary nil
-  "Dictionary to use for `company-ispell'.
-If nil, use `ispell-complete-word-dict'."
-  :type '(choice (const :tag "default (nil)" nil)
-                 (file :tag "dictionary" t)))
-
-(defvar company-ispell-available 'unknown)
-
-(defun company-ispell-available ()
-  (when (eq company-ispell-available 'unknown)
-    (condition-case err
-        (progn
-          (lookup-words "WHATEVER")
-          (setq company-ispell-available t))
-      (error
-       (message "Company: ispell-look-command not found")
-       (setq company-ispell-available nil))))
-  company-ispell-available)
-
-;;;###autoload
-(defun company-ispell (command &optional arg &rest ignored)
-  "`company-mode' completion back-end using Ispell."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-ispell))
-    (prefix (when (company-ispell-available)
-              (company-grab-word)))
-    (candidates
-     (let ((words (lookup-words arg (or company-ispell-dictionary
-                                        ispell-complete-word-dict)))
-           (completion-ignore-case t))
-       (if (string= arg "")
-           ;; Small optimization.
-           words
-         ;; Work around issue #284.
-         (all-completions arg words))))
-    (sorted t)
-    (ignore-case 'keep-prefix)))
-
-(provide 'company-ispell)
-;;; company-ispell.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-keywords.el b/emacs.d/elpa/company-20150624.334/company-keywords.el
deleted file mode 100644
index a6b20c2..0000000
--- a/emacs.d/elpa/company-20150624.334/company-keywords.el
+++ /dev/null
@@ -1,242 +0,0 @@
-;;; company-keywords.el --- A company back-end for programming language keywords
-
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defun company-keywords-upper-lower (&rest lst)
-  ;; Upcase order is different for _.
-  (nconc (sort (mapcar 'upcase lst) 'string<) lst))
-
-(defvar company-keywords-alist
-  ;; Please contribute corrections or additions.
-  `((c++-mode
-     "asm" "auto" "bool" "break" "case" "catch" "char" "class" "const"
-     "const_cast" "continue" "default" "delete" "do" "double" "dynamic_cast"
-     "else" "enum" "explicit" "export" "extern" "false" "float" "for" "friend"
-     "goto" "if" "inline" "int" "long" "mutable" "namespace" "new"
-     "operator" "private" "protected" "public" "register" "reinterpret_cast"
-     "return" "short" "signed" "sizeof" "static" "static_cast" "struct" "switch"
-     "template" "this" "throw" "true" "try" "typedef" "typeid" "typename"
-     "union" "unsigned" "using" "virtual" "void" "volatile" "wchar_t" "while")
-    (c-mode
-     "auto" "break" "case" "char" "const" "continue" "default" "do"
-     "double" "else" "enum" "extern" "float" "for" "goto" "if" "int" "long"
-     "register" "return" "short" "signed" "sizeof" "static" "struct"
-     "switch" "typedef" "union" "unsigned" "void" "volatile" "while")
-    (csharp-mode
-     "abstract" "add" "alias" "as" "base" "bool" "break" "byte" "case"
-     "catch" "char" "checked" "class" "const" "continue" "decimal" "default"
-     "delegate" "do" "double" "else" "enum" "event" "explicit" "extern"
-     "false" "finally" "fixed" "float" "for" "foreach" "get" "global" "goto"
-     "if" "implicit" "in" "int" "interface" "internal" "is" "lock" "long"
-     "namespace" "new" "null" "object" "operator" "out" "override" "params"
-     "partial" "private" "protected" "public" "readonly" "ref" "remove"
-     "return" "sbyte" "sealed" "set" "short" "sizeof" "stackalloc" "static"
-     "string" "struct" "switch" "this" "throw" "true" "try" "typeof" "uint"
-     "ulong" "unchecked" "unsafe" "ushort" "using" "value" "var" "virtual"
-     "void" "volatile" "where" "while" "yield")
-    (d-mode
-     ;; from http://www.digitalmars.com/d/2.0/lex.html
-     "abstract" "alias" "align" "asm"
-     "assert" "auto" "body" "bool" "break" "byte" "case" "cast" "catch"
-     "cdouble" "cent" "cfloat" "char" "class" "const" "continue" "creal"
-     "dchar" "debug" "default" "delegate" "delete" "deprecated" "do"
-     "double" "else" "enum" "export" "extern" "false" "final" "finally"
-     "float" "for" "foreach" "foreach_reverse" "function" "goto" "idouble"
-     "if" "ifloat" "import" "in" "inout" "int" "interface" "invariant"
-     "ireal" "is" "lazy" "long" "macro" "mixin" "module" "new" "nothrow"
-     "null" "out" "override" "package" "pragma" "private" "protected"
-     "public" "pure" "real" "ref" "return" "scope" "short" "static" "struct"
-     "super" "switch" "synchronized" "template" "this" "throw" "true" "try"
-     "typedef" "typeid" "typeof" "ubyte" "ucent" "uint" "ulong" "union"
-     "unittest" "ushort" "version" "void" "volatile" "wchar" "while" "with")
-    (f90-mode .
-     ;; from f90.el
-     ;; ".AND." ".GE." ".GT." ".LT." ".LE." ".NE." ".OR." ".TRUE." ".FALSE."
-     ,(company-keywords-upper-lower
-      "abs" "abstract" "achar" "acos" "adjustl" "adjustr" "aimag" "aint"
-      "align" "all" "all_prefix" "all_scatter" "all_suffix" "allocatable"
-      "allocate" "allocated" "and" "anint" "any" "any_prefix" "any_scatter"
-      "any_suffix" "asin" "assign" "assignment" "associate" "associated"
-      "asynchronous" "atan" "atan2" "backspace" "bind" "bit_size" "block"
-      "btest" "c_alert" "c_associated" "c_backspace" "c_bool"
-      "c_carriage_return" "c_char" "c_double" "c_double_complex" "c_f_pointer"
-      "c_f_procpointer" "c_float" "c_float_complex" "c_form_feed" "c_funloc"
-      "c_funptr" "c_horizontal_tab" "c_int" "c_int16_t" "c_int32_t" "c_int64_t"
-      "c_int8_t" "c_int_fast16_t" "c_int_fast32_t" "c_int_fast64_t"
-      "c_int_fast8_t" "c_int_least16_t" "c_int_least32_t" "c_int_least64_t"
-      "c_int_least8_t" "c_intmax_t" "c_intptr_t" "c_loc" "c_long"
-      "c_long_double" "c_long_double_complex" "c_long_long" "c_new_line"
-      "c_null_char" "c_null_funptr" "c_null_ptr" "c_ptr" "c_short"
-      "c_signed_char" "c_size_t" "c_vertical_tab" "call" "case" "ceiling"
-      "char" "character" "character_storage_size" "class" "close" "cmplx"
-      "command_argument_count" "common" "complex" "conjg" "contains" "continue"
-      "copy_prefix" "copy_scatter" "copy_suffix" "cos" "cosh" "count"
-      "count_prefix" "count_scatter" "count_suffix" "cpu_time" "cshift"
-      "cycle" "cyclic" "data" "date_and_time" "dble" "deallocate" "deferred"
-      "digits" "dim" "dimension" "distribute" "do" "dot_product" "double"
-      "dprod" "dynamic" "elemental" "else" "elseif" "elsewhere" "end" "enddo"
-      "endfile" "endif" "entry" "enum" "enumerator" "eoshift" "epsilon" "eq"
-      "equivalence" "eqv" "error_unit" "exit" "exp" "exponent" "extends"
-      "extends_type_of" "external" "extrinsic" "false" "file_storage_size"
-      "final" "floor" "flush" "forall" "format" "fraction" "function" "ge"
-      "generic" "get_command" "get_command_argument" "get_environment_variable"
-      "goto" "grade_down" "grade_up" "gt" "hpf_alignment" "hpf_distribution"
-      "hpf_template" "huge" "iachar" "iall" "iall_prefix" "iall_scatter"
-      "iall_suffix" "iand" "iany" "iany_prefix" "iany_scatter" "iany_suffix"
-      "ibclr" "ibits" "ibset" "ichar" "ieee_arithmetic" "ieee_exceptions"
-      "ieee_features" "ieee_get_underflow_mode" "ieee_set_underflow_mode"
-      "ieee_support_underflow_control" "ieor" "if" "ilen" "implicit"
-      "import" "include" "independent" "index" "inherit" "input_unit"
-      "inquire" "int" "integer" "intent" "interface" "intrinsic" "ior"
-      "iostat_end" "iostat_eor" "iparity" "iparity_prefix" "iparity_scatter"
-      "iparity_suffix" "ishft" "ishftc" "iso_c_binding" "iso_fortran_env"
-      "kind" "lbound" "le" "leadz" "len" "len_trim" "lge" "lgt" "lle" "llt"
-      "log" "log10" "logical" "lt" "matmul" "max" "maxexponent" "maxloc"
-      "maxval" "maxval_prefix" "maxval_scatter" "maxval_suffix" "merge"
-      "min" "minexponent" "minloc" "minval" "minval_prefix" "minval_scatter"
-      "minval_suffix" "mod" "module" "modulo" "move_alloc" "mvbits" "namelist"
-      "ne" "nearest" "neqv" "new" "new_line" "nint" "non_intrinsic"
-      "non_overridable" "none" "nopass" "not" "null" "nullify"
-      "number_of_processors" "numeric_storage_size" "only" "onto" "open"
-      "operator" "optional" "or" "output_unit" "pack" "parameter" "parity"
-      "parity_prefix" "parity_scatter" "parity_suffix" "pass" "pause"
-      "pointer" "popcnt" "poppar" "precision" "present" "print" "private"
-      "procedure" "processors" "processors_shape" "product" "product_prefix"
-      "product_scatter" "product_suffix" "program" "protected" "public"
-      "pure" "radix" "random_number" "random_seed" "range" "read" "real"
-      "realign" "recursive" "redistribute" "repeat" "reshape" "result"
-      "return" "rewind" "rrspacing" "same_type_as" "save" "scale" "scan"
-      "select" "selected_char_kind" "selected_int_kind" "selected_real_kind"
-      "sequence" "set_exponent" "shape" "sign" "sin" "sinh" "size" "spacing"
-      "spread" "sqrt" "stop" "subroutine" "sum" "sum_prefix" "sum_scatter"
-      "sum_suffix" "system_clock" "tan" "tanh" "target" "template" "then"
-      "tiny" "transfer" "transpose" "trim" "true" "type" "ubound" "unpack"
-      "use" "value" "verify" "volatile" "wait" "where" "while" "with" "write"))
-    (java-mode
-     "abstract" "assert" "boolean" "break" "byte" "case" "catch" "char" "class"
-     "continue" "default" "do" "double" "else" "enum" "extends" "final"
-     "finally" "float" "for" "if" "implements" "import" "instanceof" "int"
-     "interface" "long" "native" "new" "package" "private" "protected" "public"
-     "return" "short" "static" "strictfp" "super" "switch" "synchronized"
-     "this" "throw" "throws" "transient" "try" "void" "volatile" "while")
-    (javascript-mode
-     "break" "catch" "const" "continue" "delete" "do" "else" "export" "for"
-     "function" "if" "import" "in" "instanceOf" "label" "let" "new" "return"
-     "switch" "this" "throw" "try" "typeof" "var" "void" "while" "with" "yield")
-    (objc-mode
-     "@catch" "@class" "@encode" "@end" "@finally" "@implementation"
-     "@interface" "@private" "@protected" "@protocol" "@public"
-     "@selector" "@synchronized" "@throw" "@try" "alloc" "autorelease"
-     "bycopy" "byref" "in" "inout" "oneway" "out" "release" "retain")
-    (perl-mode
-     ;; from cperl.el
-     "AUTOLOAD" "BEGIN" "CHECK" "CORE" "DESTROY" "END" "INIT" "__END__"
-     "__FILE__" "__LINE__" "abs" "accept" "alarm" "and" "atan2" "bind"
-     "binmode" "bless" "caller" "chdir" "chmod" "chomp" "chop" "chown" "chr"
-     "chroot" "close" "closedir" "cmp" "connect" "continue" "cos"
-     "crypt" "dbmclose" "dbmopen" "defined" "delete" "die" "do" "dump" "each"
-     "else" "elsif" "endgrent" "endhostent" "endnetent" "endprotoent"
-     "endpwent" "endservent" "eof" "eq" "eval" "exec" "exists" "exit" "exp"
-     "fcntl" "fileno" "flock" "for" "foreach" "fork" "format" "formline"
-     "ge" "getc" "getgrent" "getgrgid" "getgrnam" "gethostbyaddr"
-     "gethostbyname" "gethostent" "getlogin" "getnetbyaddr" "getnetbyname"
-     "getnetent" "getpeername" "getpgrp" "getppid" "getpriority"
-     "getprotobyname" "getprotobynumber" "getprotoent" "getpwent" "getpwnam"
-     "getpwuid" "getservbyname" "getservbyport" "getservent" "getsockname"
-     "getsockopt" "glob" "gmtime" "goto" "grep" "gt" "hex" "if" "index" "int"
-     "ioctl" "join" "keys" "kill" "last" "lc" "lcfirst" "le" "length"
-     "link" "listen" "local" "localtime" "lock" "log" "lstat" "lt" "map"
-     "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "my" "ne" "next" "no"
-     "not" "oct" "open" "opendir" "or" "ord" "our" "pack" "package" "pipe"
-     "pop" "pos" "print" "printf" "push" "q" "qq" "quotemeta" "qw" "qx"
-     "rand" "read" "readdir" "readline" "readlink" "readpipe" "recv" "redo"
-     "ref" "rename" "require" "reset" "return" "reverse" "rewinddir" "rindex"
-     "rmdir" "scalar" "seek" "seekdir" "select" "semctl" "semget" "semop"
-     "send" "setgrent" "sethostent" "setnetent" "setpgrp" "setpriority"
-     "setprotoent" "setpwent" "setservent" "setsockopt" "shift" "shmctl"
-     "shmget" "shmread" "shmwrite" "shutdown" "sin" "sleep" "socket"
-     "socketpair" "sort" "splice" "split" "sprintf" "sqrt" "srand" "stat"
-     "study" "sub" "substr" "symlink" "syscall" "sysopen" "sysread" "system"
-     "syswrite" "tell" "telldir" "tie" "time" "times" "tr" "truncate" "uc"
-     "ucfirst" "umask" "undef" "unless" "unlink" "unpack" "unshift" "untie"
-     "until" "use" "utime" "values" "vec" "wait" "waitpid"
-     "wantarray" "warn" "while" "write" "x" "xor" "y")
-    (php-mode
-     "__CLASS__" "__DIR__" "__FILE__" "__FUNCTION__" "__LINE__" "__METHOD__"
-     "__NAMESPACE__" "_once" "abstract" "and" "array" "as" "break" "case"
-     "catch" "cfunction" "class" "clone" "const" "continue" "declare"
-     "default" "die" "do" "echo" "else" "elseif" "empty" "enddeclare"
-     "endfor" "endforeach" "endif" "endswitch" "endwhile" "eval" "exception"
-     "exit" "extends" "final" "for" "foreach" "function" "global"
-     "goto" "if" "implements" "include" "instanceof" "interface"
-     "isset" "list" "namespace" "new" "old_function" "or" "php_user_filter"
-     "print" "private" "protected" "public" "require" "require_once" "return"
-     "static" "switch" "this" "throw" "try" "unset" "use" "var" "while" "xor")
-    (python-mode
-     "and" "assert" "break" "class" "continue" "def" "del" "elif" "else"
-     "except" "exec" "finally" "for" "from" "global" "if" "import" "in" "is"
-     "lambda" "not" "or" "pass" "print" "raise" "return" "try" "while" "yield")
-    (ruby-mode
-     "BEGIN" "END" "alias" "and"  "begin" "break" "case" "class" "def" "defined?"
-     "do" "else" "elsif"  "end" "ensure" "false" "for" "if" "in" "module"
-     "next" "nil" "not" "or" "redo" "rescue" "retry" "return" "self" "super"
-     "then" "true" "undef" "unless" "until" "when" "while" "yield")
-    (scala-mode
-     "abstract" "case" "catch" "class" "def" "do" "else" "extends" "false"
-     "final" "finally" "for" "forSome" "if" "implicit" "import" "lazy" "match"
-     "new" "null" "object" "override" "package" "private" "protected"
-     "return" "sealed" "super" "this" "throw" "trait" "true" "try" "type" "val"
-     "var" "while" "with" "yield")
-    ;; aliases
-    (js2-mode . javascript-mode)
-    (espresso-mode . javascript-mode)
-    (js-mode . javascript-mode)
-    (cperl-mode . perl-mode)
-    (jde-mode . java-mode))
-  "Alist mapping major-modes to sorted keywords for `company-keywords'.")
-
-;;;###autoload
-(defun company-keywords (command &optional arg &rest ignored)
-  "`company-mode' back-end for programming language keywords."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-keywords))
-    (prefix (and (assq major-mode company-keywords-alist)
-                 (not (company-in-string-or-comment))
-                 (or (company-grab-symbol) 'stop)))
-    (candidates
-     (let ((completion-ignore-case nil)
-           (symbols (cdr (assq major-mode company-keywords-alist))))
-       (all-completions arg (if (consp symbols)
-                                symbols
-                              (cdr (assq symbols company-keywords-alist))))))
-    (sorted t)))
-
-(provide 'company-keywords)
-;;; company-keywords.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-nxml.el b/emacs.d/elpa/company-20150624.334/company-nxml.el
deleted file mode 100644
index 70e1c09..0000000
--- a/emacs.d/elpa/company-20150624.334/company-nxml.el
+++ /dev/null
@@ -1,142 +0,0 @@
-;;; company-nxml.el --- company-mode completion back-end for nxml-mode
-
-;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defvar rng-open-elements)
-(defvar rng-validate-mode)
-(defvar rng-in-attribute-regex)
-(defvar rng-in-attribute-value-regex)
-(declare-function rng-set-state-after "rng-nxml")
-(declare-function rng-match-possible-start-tag-names "rng-match")
-(declare-function rng-adjust-state-for-attribute "rng-nxml")
-(declare-function rng-match-possible-attribute-names "rng-match")
-(declare-function rng-adjust-state-for-attribute-value "rng-nxml")
-(declare-function rng-match-possible-value-strings "rng-match")
-
-(defconst company-nxml-token-regexp
-  "\\(?:[_[:alpha:]][-._[:alnum:]]*\\_>\\)")
-
-(defvar company-nxml-in-attribute-value-regexp
-  (replace-regexp-in-string "w" company-nxml-token-regexp
-   "<w\\(?::w\\)?\
-\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
-\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
-\[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
-\\(\"\\([^\"]*\\>\\)\\|'\\([^']*\\>\\)\\)\\="
-   t t))
-
-(defvar company-nxml-in-tag-name-regexp
-  (replace-regexp-in-string "w" company-nxml-token-regexp
-                            "<\\(/?w\\(?::w?\\)?\\)?\\=" t t))
-
-(defun company-nxml-all-completions (prefix alist)
-  (let ((candidates (mapcar 'cdr alist))
-        (case-fold-search nil)
-        filtered)
-    (when (cdar rng-open-elements)
-      (push (concat "/" (cdar rng-open-elements)) candidates))
-    (setq candidates (sort (all-completions prefix candidates) 'string<))
-    (while candidates
-      (unless (equal (car candidates) (car filtered))
-        (push (car candidates) filtered))
-      (pop candidates))
-    (nreverse filtered)))
-
-(defmacro company-nxml-prepared (&rest body)
-  (declare (indent 0) (debug t))
-  `(let ((lt-pos (save-excursion (search-backward "<" nil t)))
-         xmltok-dtd)
-     (when (and lt-pos (= (rng-set-state-after lt-pos) lt-pos))
-       ,@body)))
-
-(defun company-nxml-tag (command &optional arg &rest ignored)
-  (cl-case command
-    (prefix (and (derived-mode-p 'nxml-mode)
-                 rng-validate-mode
-                 (company-grab company-nxml-in-tag-name-regexp 1)))
-    (candidates (company-nxml-prepared
-                 (company-nxml-all-completions
-                  arg (rng-match-possible-start-tag-names))))
-    (sorted t)))
-
-(defun company-nxml-attribute (command &optional arg &rest ignored)
-  (cl-case command
-    (prefix (and (derived-mode-p 'nxml-mode)
-                 rng-validate-mode
-                 (memq (char-after) '(?\  ?\t ?\n)) ;; outside word
-                 (company-grab rng-in-attribute-regex 1)))
-    (candidates (company-nxml-prepared
-                 (and (rng-adjust-state-for-attribute
-                       lt-pos (- (point) (length arg)))
-                      (company-nxml-all-completions
-                       arg (rng-match-possible-attribute-names)))))
-    (sorted t)))
-
-(defun company-nxml-attribute-value (command &optional arg &rest ignored)
-  (cl-case command
-    (prefix (and (derived-mode-p 'nxml-mode)
-                 rng-validate-mode
-                 (and (memq (char-after) '(?' ?\" ?\  ?\t ?\n)) ;; outside word
-                      (looking-back company-nxml-in-attribute-value-regexp)
-                      (or (match-string-no-properties 4)
-                          (match-string-no-properties 5)
-                          ""))))
-    (candidates (company-nxml-prepared
-                 (let (attr-start attr-end colon)
-                   (and (looking-back rng-in-attribute-value-regex lt-pos)
-                        (setq colon (match-beginning 2)
-                              attr-start (match-beginning 1)
-                              attr-end (match-end 1))
-                        (rng-adjust-state-for-attribute lt-pos attr-start)
-                        (rng-adjust-state-for-attribute-value
-                         attr-start colon attr-end)
-                        (all-completions
-                         arg (rng-match-possible-value-strings))))))))
-
-;;;###autoload
-(defun company-nxml (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for `nxml-mode'."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-nxml))
-    (prefix (or (company-nxml-tag 'prefix)
-                (company-nxml-attribute 'prefix)
-                (company-nxml-attribute-value 'prefix)))
-    (candidates (cond
-                 ((company-nxml-tag 'prefix)
-                  (company-nxml-tag 'candidates arg))
-                 ((company-nxml-attribute 'prefix)
-                  (company-nxml-attribute 'candidates arg))
-                 ((company-nxml-attribute-value 'prefix)
-                  (sort (company-nxml-attribute-value 'candidates arg)
-                        'string<))))
-    (sorted t)))
-
-(provide 'company-nxml)
-;;; company-nxml.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-oddmuse.el b/emacs.d/elpa/company-20150624.334/company-oddmuse.el
deleted file mode 100644
index aa30f2a..0000000
--- a/emacs.d/elpa/company-20150624.334/company-oddmuse.el
+++ /dev/null
@@ -1,57 +0,0 @@
-;;; company-oddmuse.el --- company-mode completion back-end for oddmuse-mode
-
-;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-(eval-when-compile (require 'yaooddmuse nil t))
-(eval-when-compile (require 'oddmuse nil t))
-
-(defvar company-oddmuse-link-regexp
-  "\\(\\<[A-Z][[:alnum:]]*\\>\\)\\|\\[\\[\\([[:alnum:]]+\\>\\|\\)")
-
-(defun company-oddmuse-get-page-table ()
-  (cl-case major-mode
-    (yaoddmuse-mode (with-no-warnings
-                      (yaoddmuse-get-pagename-table yaoddmuse-wikiname)))
-    (oddmuse-mode (with-no-warnings
-                    (oddmuse-make-completion-table oddmuse-wiki)))))
-
-;;;###autoload
-(defun company-oddmuse (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for `oddmuse-mode'."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-oddmuse))
-    (prefix (let ((case-fold-search nil))
-              (and (memq major-mode '(oddmuse-mode yaoddmuse-mode))
-                   (looking-back company-oddmuse-link-regexp (point-at-bol))
-                   (or (match-string 1)
-                       (match-string 2)))))
-    (candidates (all-completions arg (company-oddmuse-get-page-table)))))
-
-(provide 'company-oddmuse)
-;;; company-oddmuse.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-pkg.el b/emacs.d/elpa/company-20150624.334/company-pkg.el
deleted file mode 100644
index a6de6ae..0000000
--- a/emacs.d/elpa/company-20150624.334/company-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-(define-package "company" "20150624.334" "Modular text completion framework"
-  '((emacs "24.1")
-    (cl-lib "0.5"))
-  :url "http://company-mode.github.io/" :keywords
-  '("abbrev" "convenience" "matching"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/company-20150624.334/company-semantic.el b/emacs.d/elpa/company-20150624.334/company-semantic.el
deleted file mode 100644
index a1c7d16..0000000
--- a/emacs.d/elpa/company-20150624.334/company-semantic.el
+++ /dev/null
@@ -1,156 +0,0 @@
-;;; company-semantic.el --- company-mode completion back-end using Semantic
-
-;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defvar semantic-idle-summary-function)
-(declare-function semantic-documentation-for-tag "semantic/doc" )
-(declare-function semantic-analyze-current-context "semantic/analyze")
-(declare-function semantic-analyze-possible-completions "semantic/complete")
-(declare-function semantic-analyze-find-tags-by-prefix "semantic/analyze/fcn")
-(declare-function semantic-tag-class "semantic/tag")
-(declare-function semantic-tag-name "semantic/tag")
-(declare-function semantic-tag-start "semantic/tag")
-(declare-function semantic-tag-buffer "semantic/tag")
-(declare-function semantic-active-p "semantic")
-
-(defgroup company-semantic nil
-  "Completion back-end using Semantic."
-  :group 'company)
-
-(defcustom company-semantic-metadata-function 'company-semantic-summary-and-doc
-  "The function turning a semantic tag into doc information."
-  :type 'function)
-
-(defvar company-semantic-modes '(c-mode c++-mode jde-mode java-mode))
-
-(defvar-local company-semantic--current-tags nil
-  "Tags for the current context.")
-
-(defun company-semantic-documentation-for-tag (tag)
-  (when (semantic-tag-buffer tag)
-    ;; When TAG's buffer is unknown, the function below raises an error.
-    (semantic-documentation-for-tag tag)))
-
-(defun company-semantic-doc-or-summary (tag)
-  (or (company-semantic-documentation-for-tag tag)
-      (and (require 'semantic-idle nil t)
-           (require 'semantic/idle nil t)
-           (funcall semantic-idle-summary-function tag nil t))))
-
-(defun company-semantic-summary-and-doc (tag)
-  (let ((doc (company-semantic-documentation-for-tag tag))
-        (summary (funcall semantic-idle-summary-function tag nil t)))
-    (and (stringp doc)
-         (string-match "\n*\\(.*\\)$" doc)
-         (setq doc (match-string 1 doc)))
-    (concat summary
-            (when doc
-                  (if (< (+ (length doc) (length summary) 4) (window-width))
-                      " -- "
-                    "\n"))
-            doc)))
-
-(defun company-semantic-doc-buffer (tag)
-  (let ((doc (company-semantic-documentation-for-tag tag)))
-    (when doc
-      (company-doc-buffer
-       (concat (funcall semantic-idle-summary-function tag nil t)
-               "\n"
-               doc)))))
-
-(defsubst company-semantic-completions (prefix)
-  (ignore-errors
-    (let ((completion-ignore-case nil)
-          (context (semantic-analyze-current-context)))
-      (setq company-semantic--current-tags
-            (semantic-analyze-possible-completions context))
-      (all-completions prefix company-semantic--current-tags))))
-
-(defun company-semantic-completions-raw (prefix)
-  (setq company-semantic--current-tags nil)
-  (dolist (tag (semantic-analyze-find-tags-by-prefix prefix))
-    (unless (eq (semantic-tag-class tag) 'include)
-      (push tag company-semantic--current-tags)))
-  (delete "" (mapcar 'semantic-tag-name company-semantic--current-tags)))
-
-(defun company-semantic-annotation (argument tags)
-  (let* ((tag (assoc argument tags))
-         (kind (when tag (elt tag 1))))
-    (cl-case kind
-      (function (let* ((prototype (semantic-format-tag-prototype tag nil nil))
-                       (par-pos (string-match "(" prototype)))
-                  (when par-pos (substring prototype par-pos)))))))
-
-(defun company-semantic--pre-prefix-length (prefix-length)
-  "Sum up the length of all chained symbols before POS.
-Symbols are chained by \".\" or \"->\"."
-  (save-excursion
-    (let ((pos (point)))
-      (goto-char (- (point) prefix-length))
-      (while (looking-back "->\\|\\.")
-        (goto-char (match-beginning 0))
-        (skip-syntax-backward "w_"))
-      (- pos (point)))))
-
-(defun company-semantic--grab ()
-  "Grab the semantic prefix, but return everything before -> or . as length."
-  (let ((symbol (company-grab-symbol)))
-    (when symbol
-      (cons symbol (company-semantic--pre-prefix-length (length symbol))))))
-
-;;;###autoload
-(defun company-semantic (command &optional arg &rest ignored)
-  "`company-mode' completion back-end using CEDET Semantic."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-semantic))
-    (prefix (and (featurep 'semantic)
-                 (semantic-active-p)
-                 (memq major-mode company-semantic-modes)
-                 (not (company-in-string-or-comment))
-                 (or (company-semantic--grab) 'stop)))
-    (candidates (if (and (equal arg "")
-                         (not (looking-back "->\\|\\.")))
-                    (company-semantic-completions-raw arg)
-                  (company-semantic-completions arg)))
-    (meta (funcall company-semantic-metadata-function
-                   (assoc arg company-semantic--current-tags)))
-    (annotation (company-semantic-annotation arg
-                                             company-semantic--current-tags))
-    (doc-buffer (company-semantic-doc-buffer
-                 (assoc arg company-semantic--current-tags)))
-    ;; Because "" is an empty context and doesn't return local variables.
-    (no-cache (equal arg ""))
-    (location (let ((tag (assoc arg company-semantic--current-tags)))
-                (when (buffer-live-p (semantic-tag-buffer tag))
-                  (cons (semantic-tag-buffer tag)
-                        (semantic-tag-start tag)))))))
-
-(provide 'company-semantic)
-;;; company-semantic.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-template.el b/emacs.d/elpa/company-20150624.334/company-template.el
deleted file mode 100644
index 02065af..0000000
--- a/emacs.d/elpa/company-20150624.334/company-template.el
+++ /dev/null
@@ -1,214 +0,0 @@
-;;; company-template.el --- utility library for template expansion
-
-;; Copyright (C) 2009, 2010, 2014-2015 Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-
-(defface company-template-field
-  '((((background dark)) (:background "yellow" :foreground "black"))
-    (((background light)) (:background "orange" :foreground "black")))
-  "Face used for editable text in template fields."
-  :group 'company)
-
-(defvar company-template-nav-map
-  (let ((keymap (make-sparse-keymap)))
-    (define-key keymap [tab] 'company-template-forward-field)
-    (define-key keymap (kbd "TAB") 'company-template-forward-field)
-    keymap))
-
-(defvar-local company-template--buffer-templates nil)
-
-;; interactive ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-template-templates-at (pos)
-  (let (os)
-    (dolist (o (overlays-at pos))
-      ;; FIXME: Always return the whole list of templates?
-      ;; We remove templates not at point after every command.
-      (when (memq o company-template--buffer-templates)
-        (push o os)))
-    os))
-
-(defun company-template-move-to-first (templ)
-  (interactive)
-  (goto-char (overlay-start templ))
-  (company-template-forward-field))
-
-(defun company-template-forward-field ()
-  (interactive)
-  (let* ((start (point))
-         (templates (company-template-templates-at (point)))
-         (minimum (apply 'max (mapcar 'overlay-end templates)))
-         (fields (cl-loop for templ in templates
-                          append (overlay-get templ 'company-template-fields))))
-    (dolist (pos (mapcar 'overlay-start fields))
-      (and pos
-           (> pos (point))
-           (< pos minimum)
-           (setq minimum pos)))
-    (push-mark)
-    (goto-char minimum)
-    (company-template-remove-field (company-template-field-at start))))
-
-(defun company-template-field-at (&optional point)
-  (cl-loop for ovl in (overlays-at (or point (point)))
-           when (overlay-get ovl 'company-template-parent)
-           return ovl))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-template-declare-template (beg end)
-  (let ((ov (make-overlay beg end)))
-    ;; (overlay-put ov 'face 'highlight)
-    (overlay-put ov 'keymap company-template-nav-map)
-    (overlay-put ov 'priority 101)
-    (overlay-put ov 'evaporate t)
-    (push ov company-template--buffer-templates)
-    (add-hook 'post-command-hook 'company-template-post-command nil t)
-    ov))
-
-(defun company-template-remove-template (templ)
-  (mapc 'company-template-remove-field
-        (overlay-get templ 'company-template-fields))
-  (setq company-template--buffer-templates
-        (delq templ company-template--buffer-templates))
-  (delete-overlay templ))
-
-(defun company-template-add-field (templ beg end &optional display)
-  "Add new field to template TEMPL spanning from BEG to END.
-When DISPLAY is non-nil, set the respective property on the overlay.
-Leave point at the end of the field."
-  (cl-assert templ)
-  (when (> end (overlay-end templ))
-    (move-overlay templ (overlay-start templ) end))
-  (let ((ov (make-overlay beg end))
-        (siblings (overlay-get templ 'company-template-fields)))
-    ;; (overlay-put ov 'evaporate t)
-    (overlay-put ov 'intangible t)
-    (overlay-put ov 'face 'company-template-field)
-    (when display
-      (overlay-put ov 'display display))
-    (overlay-put ov 'company-template-parent templ)
-    (overlay-put ov 'insert-in-front-hooks '(company-template-insert-hook))
-    (push ov siblings)
-    (overlay-put templ 'company-template-fields siblings)))
-
-(defun company-template-remove-field (ovl &optional clear)
-  (when (overlayp ovl)
-    (when (overlay-buffer ovl)
-      (when clear
-        (delete-region (overlay-start ovl) (overlay-end ovl)))
-      (delete-overlay ovl))
-    (let* ((templ (overlay-get ovl 'company-template-parent))
-           (siblings (overlay-get templ 'company-template-fields)))
-      (setq siblings (delq ovl siblings))
-      (overlay-put templ 'company-template-fields siblings))))
-
-(defun company-template-clean-up (&optional pos)
-  "Clean up all templates that don't contain POS."
-  (let ((local-ovs (overlays-at (or pos (point)))))
-    (dolist (templ company-template--buffer-templates)
-      (unless (memq templ local-ovs)
-        (company-template-remove-template templ)))))
-
-;; hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-template-insert-hook (ovl after-p &rest _ignore)
-  "Called when a snippet input prompt is modified."
-  (unless after-p
-    (company-template-remove-field ovl t)))
-
-(defun company-template-post-command ()
-  (company-template-clean-up)
-  (unless company-template--buffer-templates
-    (remove-hook 'post-command-hook 'company-template-post-command t)))
-
-;; common ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-template-c-like-templatify (call)
-  (let* ((end (point-marker))
-         (beg (- (point) (length call)))
-         (templ (company-template-declare-template beg end))
-         paren-open paren-close)
-    (with-syntax-table (make-syntax-table (syntax-table))
-      (modify-syntax-entry ?< "(")
-      (modify-syntax-entry ?> ")")
-      (when (search-backward ")" beg t)
-        (setq paren-close (point-marker))
-        (forward-char 1)
-        (delete-region (point) end)
-        (backward-sexp)
-        (forward-char 1)
-        (setq paren-open (point-marker)))
-      (when (search-backward ">" beg t)
-        (let ((angle-close (point-marker)))
-          (forward-char 1)
-          (backward-sexp)
-          (forward-char)
-          (company-template--c-like-args templ angle-close)))
-      (when (looking-back "\\((\\*)\\)(" (line-beginning-position))
-        (delete-region (match-beginning 1) (match-end 1)))
-      (when paren-open
-        (goto-char paren-open)
-        (company-template--c-like-args templ paren-close)))
-    (if (overlay-get templ 'company-template-fields)
-        (company-template-move-to-first templ)
-      (company-template-remove-template templ)
-      (goto-char end))))
-
-(defun company-template--c-like-args (templ end)
-  (let ((last-pos (point)))
-    (while (re-search-forward "\\([^,]+\\),?" end 'move)
-      (when (zerop (car (parse-partial-sexp last-pos (point))))
-        (company-template-add-field templ last-pos (match-end 1))
-        (skip-chars-forward " ")
-        (setq last-pos (point))))))
-
-;; objc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-clang-objc-templatify (selector)
-  (let* ((end (point-marker))
-         (beg (- (point) (length selector) 1))
-         (templ (company-template-declare-template beg end))
-         (cnt 0))
-    (save-excursion
-      (goto-char beg)
-      (catch 'stop
-        (while (search-forward ":" end t)
-          (if (looking-at "\\(([^)]*)\\) ?")
-              (company-template-add-field templ (point) (match-end 1))
-            ;; Not sure which conditions this case manifests under, but
-            ;; apparently it did before, when I wrote the first test for this
-            ;; function.  FIXME: Revisit it.
-            (company-template-add-field templ (point)
-                                        (progn
-                                          (insert (format "arg%d" cnt))
-                                          (point)))
-            (when (< (point) end)
-              (insert " "))
-            (cl-incf cnt))
-          (when (>= (point) end)
-            (throw 'stop t)))))
-    (company-template-move-to-first templ)))
-
-(provide 'company-template)
-;;; company-template.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-tempo.el b/emacs.d/elpa/company-20150624.334/company-tempo.el
deleted file mode 100644
index 09d1dfb..0000000
--- a/emacs.d/elpa/company-20150624.334/company-tempo.el
+++ /dev/null
@@ -1,62 +0,0 @@
-;;; company-tempo.el --- company-mode completion back-end for tempo
-
-;; Copyright (C) 2009-2011, 2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-(require 'tempo)
-
-(defsubst company-tempo-lookup (match)
-  (cdr (assoc match (tempo-build-collection))))
-
-(defun company-tempo-insert (match)
-  "Replace MATCH with the expanded tempo template."
-  (search-backward match)
-  (goto-char (match-beginning 0))
-  (replace-match "")
-  (call-interactively (company-tempo-lookup match)))
-
-(defsubst company-tempo-meta (match)
-  (let ((templ (company-tempo-lookup match))
-        doc)
-    (and templ
-         (setq doc (documentation templ t))
-         (car (split-string doc "\n" t)))))
-
-;;;###autoload
-(defun company-tempo (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for tempo."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-tempo
-                                        'company-tempo-insert))
-    (prefix (or (car (tempo-find-match-string tempo-match-finder)) ""))
-    (candidates (all-completions arg (tempo-build-collection)))
-    (meta (company-tempo-meta arg))
-    (sorted t)))
-
-(provide 'company-tempo)
-;;; company-tempo.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-xcode.el b/emacs.d/elpa/company-20150624.334/company-xcode.el
deleted file mode 100644
index c7a6f80..0000000
--- a/emacs.d/elpa/company-20150624.334/company-xcode.el
+++ /dev/null
@@ -1,123 +0,0 @@
-;;; company-xcode.el --- company-mode completion back-end for Xcode projects
-
-;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(defgroup company-xcode nil
-  "Completion back-end for Xcode projects."
-  :group 'company)
-
-(defcustom company-xcode-xcodeindex-executable (executable-find "xcodeindex")
-  "Location of xcodeindex executable."
-  :type 'file)
-
-(defvar company-xcode-tags nil)
-
-(defun company-xcode-reset ()
-  "Reset the cached tags."
-  (interactive)
-  (setq company-xcode-tags nil))
-
-(defcustom company-xcode-types
-  '("Class" "Constant" "Enum" "Macro" "Modeled Class" "Structure"
-    "Type" "Union" "Function")
-  "The types of symbols offered by `company-xcode'.
-No context-enabled completion is available.  Types like methods will be
-offered regardless of whether the class supports them.  The defaults should be
-valid in most contexts."
-  :set (lambda (variable value)
-         (set variable value)
-         (company-xcode-reset))
-  :type '(set (const "Category") (const "Class") (const "Class Method")
-              (const "Class Variable") (const "Constant") (const "Enum")
-              (const "Field") (const "Instance Method")
-              (const "Instance Variable") (const "Macro")
-              (const "Modeled Class") (const "Modeled Method")
-              (const "Modeled Property") (const "Property") (const "Protocol")
-              (const "Structure") (const "Type") (const "Union")
-              (const "Variable") (const "Function")))
-
-(defvar-local company-xcode-project 'unknown)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-xcode-fetch (project-bundle)
-  (setq project-bundle (directory-file-name project-bundle))
-  (message "Retrieving dump from %s..." project-bundle)
-  (with-temp-buffer
-    (let ((default-directory (file-name-directory project-bundle)))
-      (call-process company-xcode-xcodeindex-executable nil (current-buffer)
-                    nil "dump" "-project"
-                    (file-name-nondirectory project-bundle) "-quiet")
-      (goto-char (point-min))
-      (let ((regexp (concat "^\\([^\t\n]*\\)\t[^\t\n]*\t"
-                            (regexp-opt company-xcode-types)
-                            "\t[^\t\n]*\t[^\t\n]*"))
-            candidates)
-        (while (re-search-forward regexp nil t)
-          (cl-pushnew (match-string 1) candidates :test #'equal))
-        (message "Retrieving dump from %s...done" project-bundle)
-        candidates))))
-
-(defun company-xcode-find-project ()
-  (let ((dir (if buffer-file-name
-                 (file-name-directory buffer-file-name)
-               (expand-file-name default-directory)))
-        (prev-dir nil)
-        file)
-    (while (not (or file (equal dir prev-dir)))
-      (setq file (car (directory-files dir t ".xcodeproj\\'" t))
-            prev-dir dir
-            dir (file-name-directory (directory-file-name dir))))
-    file))
-
-(defun company-xcode-tags ()
-  (when (eq company-xcode-project 'unknown)
-    (setq company-xcode-project (company-xcode-find-project)))
-  (when company-xcode-project
-    (cdr (or (assoc company-xcode-project company-xcode-tags)
-             (car (push (cons company-xcode-project
-                              (company-xcode-fetch company-xcode-project))
-                        company-xcode-tags))))))
-;;;###autoload
-(defun company-xcode (command &optional arg &rest ignored)
-  "`company-mode' completion back-end for Xcode projects."
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-xcode))
-    (prefix (and company-xcode-xcodeindex-executable
-                 (company-xcode-tags)
-                 (not (company-in-string-or-comment))
-                 (or (company-grab-symbol) 'stop)))
-    (candidates (let ((completion-ignore-case nil))
-                  (company-xcode-tags)
-                  (all-completions arg (company-xcode-tags))))))
-
-
-(provide 'company-xcode)
-;;; company-xcode.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company-yasnippet.el b/emacs.d/elpa/company-20150624.334/company-yasnippet.el
deleted file mode 100644
index f0a7c38..0000000
--- a/emacs.d/elpa/company-20150624.334/company-yasnippet.el
+++ /dev/null
@@ -1,104 +0,0 @@
-;;; company-yasnippet.el --- company-mode completion back-end for Yasnippet
-
-;; Copyright (C) 2014  Free Software Foundation, Inc.
-
-;; Author: Dmitry Gutov
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'company)
-(require 'cl-lib)
-
-(declare-function yas--table-hash "yasnippet")
-(declare-function yas--get-snippet-tables "yasnippet")
-(declare-function yas-expand-snippet "yasnippet")
-(declare-function yas--template-content "yasnippet")
-(declare-function yas--template-expand-env "yasnippet")
-
-(defun company-yasnippet--candidates (prefix)
-  (cl-mapcan
-   (lambda (table)
-     (let ((keyhash (yas--table-hash table))
-           res)
-       (when keyhash
-         (maphash
-          (lambda (key value)
-            (when (and (stringp key)
-                       (string-prefix-p prefix key))
-              (maphash
-               (lambda (name template)
-                 (push
-                  (propertize key
-                              'yas-annotation name
-                              'yas-template template)
-                  res))
-               value)))
-          keyhash))
-       res))
-   (yas--get-snippet-tables)))
-
-;;;###autoload
-(defun company-yasnippet (command &optional arg &rest ignore)
-  "`company-mode' back-end for `yasnippet'.
-
-This back-end should be used with care, because as long as there are
-snippets defined for the current major mode, this back-end will always
-shadow back-ends that come after it.  Recommended usages:
-
-* In a buffer-local value of `company-backends', grouped with a back-end or
-  several that provide actual text completions.
-
-  (add-hook 'js-mode-hook
-            (lambda ()
-              (set (make-local-variable 'company-backends)
-                   '((company-dabbrev-code company-yasnippet)))))
-
-* After keyword `:with', grouped with other back-ends.
-
-  (push '(company-semantic :with company-yasnippet) company-backends)
-
-* Not in `company-backends', just bound to a key.
-
-  (global-set-key (kbd \"C-c y\") 'company-yasnippet)
-"
-  (interactive (list 'interactive))
-  (cl-case command
-    (interactive (company-begin-backend 'company-yasnippet))
-    (prefix
-     ;; Should probably use `yas--current-key', but that's bound to be slower.
-     ;; How many trigger keys start with non-symbol characters anyway?
-     (and (bound-and-true-p yas-minor-mode)
-          (company-grab-symbol)))
-    (annotation
-     (concat
-      (unless company-tooltip-align-annotations " -> ")
-      (get-text-property 0 'yas-annotation arg)))
-    (candidates (company-yasnippet--candidates arg))
-    (post-completion
-     (let ((template (get-text-property 0 'yas-template arg)))
-       (yas-expand-snippet (yas--template-content template)
-                           (- (point) (length arg))
-                           (point)
-                           (yas--template-expand-env template))))))
-
-(provide 'company-yasnippet)
-;;; company-yasnippet.el ends here
diff --git a/emacs.d/elpa/company-20150624.334/company.el b/emacs.d/elpa/company-20150624.334/company.el
deleted file mode 100644
index 8500a4d..0000000
--- a/emacs.d/elpa/company-20150624.334/company.el
+++ /dev/null
@@ -1,2871 +0,0 @@
-;;; company.el --- Modular text completion framework  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2009-2015  Free Software Foundation, Inc.
-
-;; Author: Nikolaj Schumacher
-;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
-;; URL: http://company-mode.github.io/
-;; Version: 0.9.0-cvs
-;; Keywords: abbrev, convenience, matching
-;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Company is a modular completion mechanism.  Modules for retrieving completion
-;; candidates are called back-ends, modules for displaying them are front-ends.
-;;
-;; Company comes with many back-ends, e.g. `company-elisp'.  These are
-;; distributed in separate files and can be used individually.
-;;
-;; Place company.el and the back-ends you want to use in a directory and add the
-;; following to your .emacs:
-;; (add-to-list 'load-path "/path/to/company")
-;; (autoload 'company-mode "company" nil t)
-;;
-;; Enable company-mode with M-x company-mode.  For further information look at
-;; the documentation for `company-mode' (C-h f company-mode RET)
-;;
-;; If you want to start a specific back-end, call it interactively or use
-;; `company-begin-backend'.  For example:
-;; M-x company-abbrev will prompt for and insert an abbrev.
-;;
-;; To write your own back-end, look at the documentation for `company-backends'.
-;; Here is a simple example completing "foo":
-;;
-;; (defun company-my-backend (command &optional arg &rest ignored)
-;;   (pcase command
-;;     (`prefix (when (looking-back "foo\\>")
-;;               (match-string 0)))
-;;     (`candidates (list "foobar" "foobaz" "foobarbaz"))
-;;     (`meta (format "This value is named %s" arg))))
-;;
-;; Sometimes it is a good idea to mix several back-ends together, for example to
-;; enrich gtags with dabbrev-code results (to emulate local variables).
-;; To do this, add a list with both back-ends as an element in company-backends.
-;;
-;;; Change Log:
-;;
-;; See NEWS.md in the repository.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'newcomment)
-
-;; FIXME: Use `user-error'.
-(add-to-list 'debug-ignored-errors "^.* frontend cannot be used twice$")
-(add-to-list 'debug-ignored-errors "^Echo area cannot be used twice$")
-(add-to-list 'debug-ignored-errors "^No \\(document\\|loc\\)ation available$")
-(add-to-list 'debug-ignored-errors "^Company not ")
-(add-to-list 'debug-ignored-errors "^No candidate number ")
-(add-to-list 'debug-ignored-errors "^Cannot complete at point$")
-(add-to-list 'debug-ignored-errors "^No other back-end$")
-
-;;; Compatibility
-(eval-and-compile
-  ;; `defvar-local' for Emacs 24.2 and below
-  (unless (fboundp 'defvar-local)
-    (defmacro defvar-local (var val &optional docstring)
-      "Define VAR as a buffer-local variable with default value VAL.
-Like `defvar' but additionally marks the variable as being automatically
-buffer-local wherever it is set."
-      (declare (debug defvar) (doc-string 3))
-      `(progn
-         (defvar ,var ,val ,docstring)
-         (make-variable-buffer-local ',var)))))
-
-(defgroup company nil
-  "Extensible inline text completion mechanism"
-  :group 'abbrev
-  :group 'convenience
-  :group 'matching)
-
-(defface company-tooltip
-  '((default :foreground "black")
-    (((class color) (min-colors 88) (background light))
-     (:background "cornsilk"))
-    (((class color) (min-colors 88) (background dark))
-     (:background "yellow")))
-  "Face used for the tooltip.")
-
-(defface company-tooltip-selection
-  '((default :inherit company-tooltip)
-    (((class color) (min-colors 88) (background light))
-     (:background "light blue"))
-    (((class color) (min-colors 88) (background dark))
-     (:background "orange1"))
-    (t (:background "green")))
-  "Face used for the selection in the tooltip.")
-
-(defface company-tooltip-search
-  '((default :inherit company-tooltip-selection))
-  "Face used for the search string in the tooltip.")
-
-(defface company-tooltip-mouse
-  '((default :inherit highlight))
-  "Face used for the tooltip item under the mouse.")
-
-(defface company-tooltip-common
-  '((default :inherit company-tooltip)
-    (((background light))
-     :foreground "darkred")
-    (((background dark))
-     :foreground "red"))
-  "Face used for the common completion in the tooltip.")
-
-(defface company-tooltip-common-selection
-  '((default :inherit company-tooltip-selection)
-    (((background light))
-     :foreground "darkred")
-    (((background dark))
-     :foreground "red"))
-  "Face used for the selected common completion in the tooltip.")
-
-(defface company-tooltip-annotation
-  '((default :inherit company-tooltip)
-    (((background light))
-     :foreground "firebrick4")
-    (((background dark))
-     :foreground "red4"))
-  "Face used for the annotation in the tooltip.")
-
-(defface company-scrollbar-fg
-  '((((background light))
-     :background "darkred")
-    (((background dark))
-     :background "red"))
-  "Face used for the tooltip scrollbar thumb.")
-
-(defface company-scrollbar-bg
-  '((default :inherit company-tooltip)
-    (((background light))
-     :background "wheat")
-    (((background dark))
-     :background "gold"))
-  "Face used for the tooltip scrollbar background.")
-
-(defface company-preview
-  '((((background light))
-     :inherit company-tooltip-selection)
-    (((background dark))
-     :background "blue4"
-     :foreground "wheat"))
-  "Face used for the completion preview.")
-
-(defface company-preview-common
-  '((((background light))
-     :inherit company-tooltip-selection)
-    (((background dark))
-     :inherit company-preview
-     :foreground "red"))
-  "Face used for the common part of the completion preview.")
-
-(defface company-preview-search
-  '((((background light))
-     :inherit company-tooltip-common-selection)
-    (((background dark))
-     :inherit company-preview
-     :background "blue1"))
-  "Face used for the search string in the completion preview.")
-
-(defface company-echo nil
-  "Face used for completions in the echo area.")
-
-(defface company-echo-common
-  '((((background dark)) (:foreground "firebrick1"))
-    (((background light)) (:background "firebrick4")))
-  "Face used for the common part of completions in the echo area.")
-
-(defun company-frontends-set (variable value)
-  ;; Uniquify.
-  (let ((value (delete-dups (copy-sequence value))))
-    (and (memq 'company-pseudo-tooltip-unless-just-one-frontend value)
-         (memq 'company-pseudo-tooltip-frontend value)
-         (error "Pseudo tooltip frontend cannot be used twice"))
-    (and (memq 'company-preview-if-just-one-frontend value)
-         (memq 'company-preview-frontend value)
-         (error "Preview frontend cannot be used twice"))
-    (and (memq 'company-echo value)
-         (memq 'company-echo-metadata-frontend value)
-         (error "Echo area cannot be used twice"))
-    ;; Preview must come last.
-    (dolist (f '(company-preview-if-just-one-frontend company-preview-frontend))
-      (when (cdr (memq f value))
-        (setq value (append (delq f value) (list f)))))
-    (set variable value)))
-
-(defcustom company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
-                               company-preview-if-just-one-frontend
-                               company-echo-metadata-frontend)
-  "The list of active front-ends (visualizations).
-Each front-end is a function that takes one argument.  It is called with
-one of the following arguments:
-
-`show': When the visualization should start.
-
-`hide': When the visualization should end.
-
-`update': When the data has been updated.
-
-`pre-command': Before every command that is executed while the
-visualization is active.
-
-`post-command': After every command that is executed while the
-visualization is active.
-
-The visualized data is stored in `company-prefix', `company-candidates',
-`company-common', `company-selection', `company-point' and
-`company-search-string'."
-  :set 'company-frontends-set
-  :type '(repeat (choice (const :tag "echo" company-echo-frontend)
-                         (const :tag "echo, strip common"
-                                company-echo-strip-common-frontend)
-                         (const :tag "show echo meta-data in echo"
-                                company-echo-metadata-frontend)
-                         (const :tag "pseudo tooltip"
-                                company-pseudo-tooltip-frontend)
-                         (const :tag "pseudo tooltip, multiple only"
-                                company-pseudo-tooltip-unless-just-one-frontend)
-                         (const :tag "preview" company-preview-frontend)
-                         (const :tag "preview, unique only"
-                                company-preview-if-just-one-frontend)
-                         (function :tag "custom function" nil))))
-
-(defcustom company-tooltip-limit 10
-  "The maximum number of candidates in the tooltip."
-  :type 'integer)
-
-(defcustom company-tooltip-minimum 6
-  "The minimum height of the tooltip.
-If this many lines are not available, prefer to display the tooltip above."
-  :type 'integer)
-
-(defcustom company-tooltip-minimum-width 0
-  "The minimum width of the tooltip's inner area.
-This doesn't include the margins and the scroll bar."
-  :type 'integer
-  :package-version '(company . "0.8.0"))
-
-(defcustom company-tooltip-margin 1
-  "Width of margin columns to show around the toolip."
-  :type 'integer)
-
-(defcustom company-tooltip-offset-display 'scrollbar
-  "Method using which the tooltip displays scrolling position.
-`scrollbar' means draw a scrollbar to the right of the items.
-`lines' means wrap items in lines with \"before\" and \"after\" counters."
-  :type '(choice (const :tag "Scrollbar" scrollbar)
-                 (const :tag "Two lines" lines)))
-
-(defcustom company-tooltip-align-annotations nil
-  "When non-nil, align annotations to the right tooltip border."
-  :type 'boolean
-  :package-version '(company . "0.7.1"))
-
-(defcustom company-tooltip-flip-when-above nil
-  "Whether to flip the tooltip when it's above the current line."
-  :type 'boolean
-  :package-version '(company . "0.8.1"))
-
-(defvar company-safe-backends
-  '((company-abbrev . "Abbrev")
-    (company-bbdb . "BBDB")
-    (company-capf . "completion-at-point-functions")
-    (company-clang . "Clang")
-    (company-cmake . "CMake")
-    (company-css . "CSS")
-    (company-dabbrev . "dabbrev for plain text")
-    (company-dabbrev-code . "dabbrev for code")
-    (company-eclim . "Eclim (an Eclipse interface)")
-    (company-elisp . "Emacs Lisp")
-    (company-etags . "etags")
-    (company-files . "Files")
-    (company-gtags . "GNU Global")
-    (company-ispell . "Ispell")
-    (company-keywords . "Programming language keywords")
-    (company-nxml . "nxml")
-    (company-oddmuse . "Oddmuse")
-    (company-semantic . "Semantic")
-    (company-tempo . "Tempo templates")
-    (company-xcode . "Xcode")))
-(put 'company-safe-backends 'risky-local-variable t)
-
-(defun company-safe-backends-p (backends)
-  (and (consp backends)
-       (not (cl-dolist (backend backends)
-              (unless (if (consp backend)
-                          (company-safe-backends-p backend)
-                        (assq backend company-safe-backends))
-                (cl-return t))))))
-
-(defcustom company-backends `(,@(unless (version< "24.3.51" emacs-version)
-                                  (list 'company-elisp))
-                              company-bbdb
-                              company-nxml company-css
-                              company-eclim company-semantic company-clang
-                              company-xcode company-cmake
-                              company-capf
-                              (company-dabbrev-code company-gtags company-etags
-                               company-keywords)
-                              company-oddmuse company-files company-dabbrev)
-  "The list of active back-ends (completion engines).
-
-Only one back-end is used at a time.  The choice depends on the order of
-the items in this list, and on the values they return in response to the
-`prefix' command (see below).  But a back-end can also be a \"grouped\"
-one (see below).
-
-`company-begin-backend' can be used to start a specific back-end,
-`company-other-backend' will skip to the next matching back-end in the list.
-
-Each back-end is a function that takes a variable number of arguments.
-The first argument is the command requested from the back-end.  It is one
-of the following:
-
-`prefix': The back-end should return the text to be completed.  It must be
-text immediately before point.  Returning nil from this command passes
-control to the next back-end.  The function should return `stop' if it
-should complete but cannot (e.g. if it is in the middle of a string).
-Instead of a string, the back-end may return a cons where car is the prefix
-and cdr is used instead of the actual prefix length in the comparison
-against `company-minimum-prefix-length'.  It must be either number or t,
-and in the latter case the test automatically succeeds.
-
-`candidates': The second argument is the prefix to be completed.  The
-return value should be a list of candidates that match the prefix.
-
-Non-prefix matches are also supported (candidates that don't start with the
-prefix, but match it in some backend-defined way).  Backends that use this
-feature must disable cache (return t to `no-cache') and might also want to
-respond to `match'.
-
-Optional commands:
-
-`sorted': Return t here to indicate that the candidates are sorted and will
-not need to be sorted again.
-
-`duplicates': If non-nil, company will take care of removing duplicates
-from the list.
-
-`no-cache': Usually company doesn't ask for candidates again as completion
-progresses, unless the back-end returns t for this command.  The second
-argument is the latest prefix.
-
-`ignore-case': Return t here if the backend returns case-insensitive
-matches.  This value is used to determine the longest common prefix (as
-used in `company-complete-common'), and to filter completions when fetching
-them from cache.
-
-`meta': The second argument is a completion candidate.  Return a (short)
-documentation string for it.
-
-`doc-buffer': The second argument is a completion candidate.  Return a
-buffer with documentation for it.  Preferably use `company-doc-buffer'.  If
-not all buffer contents pertain to this candidate, return a cons of buffer
-and window start position.
-
-`location': The second argument is a completion candidate.  Return a cons
-of buffer and buffer location, or of file and line number where the
-completion candidate was defined.
-
-`annotation': The second argument is a completion candidate.  Return a
-string to be displayed inline with the candidate in the popup.  If
-duplicates are removed by company, candidates with equal string values will
-be kept if they have different annotations.  For that to work properly,
-backends should store the related information on candidates using text
-properties.
-
-`match': The second argument is a completion candidate.  Return the index
-after the end of text matching `prefix' within the candidate string.  It
-will be used when rendering the popup.  This command only makes sense for
-backends that provide non-prefix completion.
-
-`require-match': If this returns t, the user is not allowed to enter
-anything not offered as a candidate.  Please don't use that value in normal
-backends.  The default value nil gives the user that choice with
-`company-require-match'.  Return value `never' overrides that option the
-other way around.
-
-`init': Called once for each buffer. The back-end can check for external
-programs and files and load any required libraries.  Raising an error here
-will show up in message log once, and the back-end will not be used for
-completion.
-
-`post-completion': Called after a completion candidate has been inserted
-into the buffer.  The second argument is the candidate.  Can be used to
-modify it, e.g. to expand a snippet.
-
-The back-end should return nil for all commands it does not support or
-does not know about.  It should also be callable interactively and use
-`company-begin-backend' to start itself in that case.
-
-Grouped back-ends:
-
-An element of `company-backends' can also itself be a list of back-ends,
-then it's considered to be a \"grouped\" back-end.
-
-When possible, commands taking a candidate as an argument are dispatched to
-the back-end it came from.  In other cases, the first non-nil value among
-all the back-ends is returned.
-
-The latter is the case for the `prefix' command.  But if the group contains
-the keyword `:with', the back-ends after it are ignored for this command.
-
-The completions from back-ends in a group are merged (but only from those
-that return the same `prefix').
-
-Asynchronous back-ends:
-
-The return value of each command can also be a cons (:async . FETCHER)
-where FETCHER is a function of one argument, CALLBACK.  When the data
-arrives, FETCHER must call CALLBACK and pass it the appropriate return
-value, as described above.
-
-True asynchronous operation is only supported for command `candidates', and
-only during idle completion.  Other commands will block the user interface,
-even if the back-end uses the asynchronous calling convention."
-  :type `(repeat
-          (choice
-           :tag "Back-end"
-           ,@(mapcar (lambda (b) `(const :tag ,(cdr b) ,(car b)))
-                     company-safe-backends)
-           (symbol :tag "User defined")
-           (repeat :tag "Merged Back-ends"
-                   (choice :tag "Back-end"
-                           ,@(mapcar (lambda (b)
-                                       `(const :tag ,(cdr b) ,(car b)))
-                                     company-safe-backends)
-                           (const :tag "With" :with)
-                           (symbol :tag "User defined"))))))
-
-(put 'company-backends 'safe-local-variable 'company-safe-backends-p)
-
-(defcustom company-transformers nil
-  "Functions to change the list of candidates received from backends.
-
-Each function gets called with the return value of the previous one.
-The first one gets passed the list of candidates, already sorted and
-without duplicates."
-  :type '(choice
-          (const :tag "None" nil)
-          (const :tag "Sort by occurrence" (company-sort-by-occurrence))
-          (const :tag "Sort by back-end importance"
-                 (company-sort-by-backend-importance))
-          (repeat :tag "User defined" (function))))
-
-(defcustom company-completion-started-hook nil
-  "Hook run when company starts completing.
-The hook is called with one argument that is non-nil if the completion was
-started manually."
-  :type 'hook)
-
-(defcustom company-completion-cancelled-hook nil
-  "Hook run when company cancels completing.
-The hook is called with one argument that is non-nil if the completion was
-aborted manually."
-  :type 'hook)
-
-(defcustom company-completion-finished-hook nil
-  "Hook run when company successfully completes.
-The hook is called with the selected candidate as an argument.
-
-If you indend to use it to post-process candidates from a specific
-back-end, consider using the `post-completion' command instead."
-  :type 'hook)
-
-(defcustom company-minimum-prefix-length 3
-  "The minimum prefix length for idle completion."
-  :type '(integer :tag "prefix length"))
-
-(defcustom company-abort-manual-when-too-short nil
-  "If enabled, cancel a manually started completion when the prefix gets
-shorter than both `company-minimum-prefix-length' and the length of the
-prefix it was started from."
-  :type 'boolean
-  :package-version '(company . "0.8.0"))
-
-(defcustom company-require-match 'company-explicit-action-p
-  "If enabled, disallow non-matching input.
-This can be a function do determine if a match is required.
-
-This can be overridden by the back-end, if it returns t or `never' to
-`require-match'.  `company-auto-complete' also takes precedence over this."
-  :type '(choice (const :tag "Off" nil)
-                 (function :tag "Predicate function")
-                 (const :tag "On, if user interaction took place"
-                        'company-explicit-action-p)
-                 (const :tag "On" t)))
-
-(defcustom company-auto-complete nil
-  "Determines when to auto-complete.
-If this is enabled, all characters from `company-auto-complete-chars'
-trigger insertion of the selected completion candidate.
-This can also be a function."
-  :type '(choice (const :tag "Off" nil)
-                 (function :tag "Predicate function")
-                 (const :tag "On, if user interaction took place"
-                        'company-explicit-action-p)
-                 (const :tag "On" t)))
-
-(defcustom company-auto-complete-chars '(?\  ?\) ?.)
-  "Determines which characters trigger auto-completion.
-See `company-auto-complete'.  If this is a string, each string character
-tiggers auto-completion.  If it is a list of syntax description characters (see
-`modify-syntax-entry'), all characters with that syntax auto-complete.
-
-This can also be a function, which is called with the new input and should
-return non-nil if company should auto-complete.
-
-A character that is part of a valid candidate never triggers auto-completion."
-  :type '(choice (string :tag "Characters")
-                 (set :tag "Syntax"
-                      (const :tag "Whitespace" ?\ )
-                      (const :tag "Symbol" ?_)
-                      (const :tag "Opening parentheses" ?\()
-                      (const :tag "Closing parentheses" ?\))
-                      (const :tag "Word constituent" ?w)
-                      (const :tag "Punctuation." ?.)
-                      (const :tag "String quote." ?\")
-                      (const :tag "Paired delimiter." ?$)
-                      (const :tag "Expression quote or prefix operator." ?\')
-                      (const :tag "Comment starter." ?<)
-                      (const :tag "Comment ender." ?>)
-                      (const :tag "Character-quote." ?/)
-                      (const :tag "Generic string fence." ?|)
-                      (const :tag "Generic comment fence." ?!))
-                 (function :tag "Predicate function")))
-
-(defcustom company-idle-delay .5
-  "The idle delay in seconds until completion starts automatically.
-The prefix still has to satisfy `company-minimum-prefix-length' before that
-happens.  The value of nil means no idle completion."
-  :type '(choice (const :tag "never (nil)" nil)
-                 (const :tag "immediate (0)" 0)
-                 (number :tag "seconds")))
-
-(defcustom company-begin-commands '(self-insert-command
-                                    org-self-insert-command
-                                    orgtbl-self-insert-command
-                                    c-scope-operator
-                                    c-electric-colon
-                                    c-electric-lt-gt
-                                    c-electric-slash)
-  "A list of commands after which idle completion is allowed.
-If this is t, it can show completions after any command except a few from a
-pre-defined list.  See `company-idle-delay'.
-
-Alternatively, any command with a non-nil `company-begin' property is
-treated as if it was on this list."
-  :type '(choice (const :tag "Any command" t)
-                 (const :tag "Self insert command" '(self-insert-command))
-                 (repeat :tag "Commands" function))
-  :package-version '(company . "0.8.4"))
-
-(defcustom company-continue-commands '(not save-buffer save-some-buffers
-                                           save-buffers-kill-terminal
-                                           save-buffers-kill-emacs)
-  "A list of commands that are allowed during completion.
-If this is t, or if `company-begin-commands' is t, any command is allowed.
-Otherwise, the value must be a list of symbols.  If it starts with `not',
-the cdr is the list of commands that abort completion.  Otherwise, all
-commands except those in that list, or in `company-begin-commands', or
-commands in the `company-' namespace, abort completion."
-  :type '(choice (const :tag "Any command" t)
-                 (cons  :tag "Any except"
-                        (const not)
-                        (repeat :tag "Commands" function))
-                 (repeat :tag "Commands" function)))
-
-(defcustom company-show-numbers nil
-  "If enabled, show quick-access numbers for the first ten candidates."
-  :type '(choice (const :tag "off" nil)
-                 (const :tag "on" t)))
-
-(defcustom company-selection-wrap-around nil
-  "If enabled, selecting item before first or after last wraps around."
-  :type '(choice (const :tag "off" nil)
-                 (const :tag "on" t)))
-
-(defvar company-async-wait 0.03
-  "Pause between checks to see if the value's been set when turning an
-asynchronous call into synchronous.")
-
-(defvar company-async-timeout 2
-  "Maximum wait time for a value to be set during asynchronous call.")
-
-;;; mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar company-mode-map (make-sparse-keymap)
-  "Keymap used by `company-mode'.")
-
-(defvar company-active-map
-  (let ((keymap (make-sparse-keymap)))
-    (define-key keymap "\e\e\e" 'company-abort)
-    (define-key keymap "\C-g" 'company-abort)
-    (define-key keymap (kbd "M-n") 'company-select-next)
-    (define-key keymap (kbd "M-p") 'company-select-previous)
-    (define-key keymap (kbd "<down>") 'company-select-next-or-abort)
-    (define-key keymap (kbd "<up>") 'company-select-previous-or-abort)
-    (define-key keymap [remap scroll-up-command] 'company-next-page)
-    (define-key keymap [remap scroll-down-command] 'company-previous-page)
-    (define-key keymap [down-mouse-1] 'ignore)
-    (define-key keymap [down-mouse-3] 'ignore)
-    (define-key keymap [mouse-1] 'company-complete-mouse)
-    (define-key keymap [mouse-3] 'company-select-mouse)
-    (define-key keymap [up-mouse-1] 'ignore)
-    (define-key keymap [up-mouse-3] 'ignore)
-    (define-key keymap [return] 'company-complete-selection)
-    (define-key keymap (kbd "RET") 'company-complete-selection)
-    (define-key keymap [tab] 'company-complete-common)
-    (define-key keymap (kbd "TAB") 'company-complete-common)
-    (define-key keymap (kbd "<f1>") 'company-show-doc-buffer)
-    (define-key keymap (kbd "C-h") 'company-show-doc-buffer)
-    (define-key keymap "\C-w" 'company-show-location)
-    (define-key keymap "\C-s" 'company-search-candidates)
-    (define-key keymap "\C-\M-s" 'company-filter-candidates)
-    (dotimes (i 10)
-      (define-key keymap (read-kbd-macro (format "M-%d" i)) 'company-complete-number))
-     keymap)
-  "Keymap that is enabled during an active completion.")
-
-(defvar company--disabled-backends nil)
-
-(defun company-init-backend (backend)
-  (and (symbolp backend)
-       (not (fboundp backend))
-       (ignore-errors (require backend nil t)))
-  (cond
-   ((symbolp backend)
-    (condition-case err
-        (progn
-          (funcall backend 'init)
-          (put backend 'company-init t))
-      (error
-       (put backend 'company-init 'failed)
-       (unless (memq backend company--disabled-backends)
-         (message "Company back-end '%s' could not be initialized:\n%s"
-                  backend (error-message-string err)))
-       (cl-pushnew backend company--disabled-backends)
-       nil)))
-   ;; No initialization for lambdas.
-   ((functionp backend) t)
-   (t ;; Must be a list.
-    (cl-dolist (b backend)
-      (unless (keywordp b)
-        (company-init-backend b))))))
-
-(defcustom company-lighter-base "company"
-  "Base string to use for the `company-mode' lighter."
-  :type 'string
-  :package-version '(company . "0.8.10"))
-
-(defvar company-lighter '(" "
-                          (company-candidates
-                           (:eval
-                            (if (consp company-backend)
-                                (company--group-lighter (nth company-selection
-                                                             company-candidates)
-                                                        company-lighter-base)
-                              (symbol-name company-backend)))
-                           company-lighter-base))
-  "Mode line lighter for Company.
-
-The value of this variable is a mode line template as in
-`mode-line-format'.")
-
-(put 'company-lighter 'risky-local-variable t)
-
-;;;###autoload
-(define-minor-mode company-mode
-  "\"complete anything\"; is an in-buffer completion framework.
-Completion starts automatically, depending on the values
-`company-idle-delay' and `company-minimum-prefix-length'.
-
-Completion can be controlled with the commands:
-`company-complete-common', `company-complete-selection', `company-complete',
-`company-select-next', `company-select-previous'.  If these commands are
-called before `company-idle-delay', completion will also start.
-
-Completions can be searched with `company-search-candidates' or
-`company-filter-candidates'.  These can be used while completion is
-inactive, as well.
-
-The completion data is retrieved using `company-backends' and displayed
-using `company-frontends'.  If you want to start a specific back-end, call
-it interactively or use `company-begin-backend'.
-
-By default, the completions list is sorted alphabetically, unless the
-backend chooses otherwise, or `company-transformers' changes it later.
-
-regular keymap (`company-mode-map'):
-
-\\{company-mode-map}
-keymap during active completions (`company-active-map'):
-
-\\{company-active-map}"
-  nil company-lighter company-mode-map
-  (if company-mode
-      (progn
-        (when (eq company-idle-delay t)
-          (setq company-idle-delay 0)
-          (warn "Setting `company-idle-delay' to t is deprecated.  Set it to 0 instead."))
-        (add-hook 'pre-command-hook 'company-pre-command nil t)
-        (add-hook 'post-command-hook 'company-post-command nil t)
-        (mapc 'company-init-backend company-backends))
-    (remove-hook 'pre-command-hook 'company-pre-command t)
-    (remove-hook 'post-command-hook 'company-post-command t)
-    (company-cancel)
-    (kill-local-variable 'company-point)))
-
-(defcustom company-global-modes t
-  "Modes for which `company-mode' mode is turned on by `global-company-mode'.
-If nil, means no modes.  If t, then all major modes have it turned on.
-If a list, it should be a list of `major-mode' symbol names for which
-`company-mode' should be automatically turned on.  The sense of the list is
-negated if it begins with `not'.  For example:
- (c-mode c++-mode)
-means that `company-mode' is turned on for buffers in C and C++ modes only.
- (not message-mode)
-means that `company-mode' is always turned on except in `message-mode' buffers."
-  :type '(choice (const :tag "none" nil)
-                 (const :tag "all" t)
-                 (set :menu-tag "mode specific" :tag "modes"
-                      :value (not)
-                      (const :tag "Except" not)
-                      (repeat :inline t (symbol :tag "mode")))))
-
-;;;###autoload
-(define-globalized-minor-mode global-company-mode company-mode company-mode-on)
-
-(defun company-mode-on ()
-  (when (and (not (or noninteractive (eq (aref (buffer-name) 0) ?\s)))
-             (cond ((eq company-global-modes t)
-                    t)
-                   ((eq (car-safe company-global-modes) 'not)
-                    (not (memq major-mode (cdr company-global-modes))))
-                   (t (memq major-mode company-global-modes))))
-    (company-mode 1)))
-
-(defsubst company-assert-enabled ()
-  (unless company-mode
-    (company-uninstall-map)
-    (error "Company not enabled")))
-
-;;; keymaps ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-my-keymap nil)
-
-(defvar company-emulation-alist '((t . nil)))
-
-(defsubst company-enable-overriding-keymap (keymap)
-  (company-uninstall-map)
-  (setq company-my-keymap keymap))
-
-(defun company-ensure-emulation-alist ()
-  (unless (eq 'company-emulation-alist (car emulation-mode-map-alists))
-    (setq emulation-mode-map-alists
-          (cons 'company-emulation-alist
-                (delq 'company-emulation-alist emulation-mode-map-alists)))))
-
-(defun company-install-map ()
-  (unless (or (cdar company-emulation-alist)
-              (null company-my-keymap))
-    (setf (cdar company-emulation-alist) company-my-keymap)))
-
-(defun company-uninstall-map ()
-  (setf (cdar company-emulation-alist) nil))
-
-;; Hack:
-;; Emacs calculates the active keymaps before reading the event.  That means we
-;; cannot change the keymap from a timer.  So we send a bogus command.
-;; XXX: Even in Emacs 24.4, seems to be needed in the terminal.
-(defun company-ignore ()
-  (interactive)
-  (setq this-command last-command))
-
-(global-set-key '[company-dummy-event] 'company-ignore)
-
-(defun company-input-noop ()
-  (push 'company-dummy-event unread-command-events))
-
-(defun company--posn-col-row (posn)
-  (let ((col (car (posn-col-row posn)))
-        ;; `posn-col-row' doesn't work well with lines of different height.
-        ;; `posn-actual-col-row' doesn't handle multiple-width characters.
-        (row (cdr (posn-actual-col-row posn))))
-    (when (and header-line-format (version< emacs-version "24.3.93.3"))
-      ;; http://debbugs.gnu.org/18384
-      (cl-decf row))
-    (cons (+ col (window-hscroll)) row)))
-
-(defun company--col-row (&optional pos)
-  (company--posn-col-row (posn-at-point pos)))
-
-(defun company--row (&optional pos)
-  (cdr (company--col-row pos)))
-
-;;; backends ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-backend nil)
-
-(defun company-grab (regexp &optional expression limit)
-  (when (looking-back regexp limit)
-    (or (match-string-no-properties (or expression 0)) "")))
-
-(defun company-grab-line (regexp &optional expression)
-  (company-grab regexp expression (point-at-bol)))
-
-(defun company-grab-symbol ()
-  (if (looking-at "\\_>")
-      (buffer-substring (point) (save-excursion (skip-syntax-backward "w_")
-                                                (point)))
-    (unless (and (char-after) (memq (char-syntax (char-after)) '(?w ?_)))
-      "")))
-
-(defun company-grab-word ()
-  (if (looking-at "\\>")
-      (buffer-substring (point) (save-excursion (skip-syntax-backward "w")
-                                                (point)))
-    (unless (and (char-after) (eq (char-syntax (char-after)) ?w))
-      "")))
-
-(defun company-grab-symbol-cons (idle-begin-after-re &optional max-len)
-  (let ((symbol (company-grab-symbol)))
-    (when symbol
-      (save-excursion
-        (forward-char (- (length symbol)))
-        (if (looking-back idle-begin-after-re (if max-len
-                                                  (- (point) max-len)
-                                                (line-beginning-position)))
-            (cons symbol t)
-          symbol)))))
-
-(defun company-in-string-or-comment ()
-  (let ((ppss (syntax-ppss)))
-    (or (car (setq ppss (nthcdr 3 ppss)))
-        (car (setq ppss (cdr ppss)))
-        (nth 3 ppss))))
-
-(defun company-call-backend (&rest args)
-  (company--force-sync #'company-call-backend-raw args company-backend))
-
-(defun company--force-sync (fun args backend)
-  (let ((value (apply fun args)))
-    (if (not (eq (car-safe value) :async))
-        value
-      (let ((res 'trash)
-            (start (time-to-seconds)))
-        (funcall (cdr value)
-                 (lambda (result) (setq res result)))
-        (while (eq res 'trash)
-          (if (> (- (time-to-seconds) start) company-async-timeout)
-              (error "Company: Back-end %s async timeout with args %s"
-                     backend args)
-            (sleep-for company-async-wait)))
-        res))))
-
-(defun company-call-backend-raw (&rest args)
-  (condition-case-unless-debug err
-      (if (functionp company-backend)
-          (apply company-backend args)
-        (apply #'company--multi-backend-adapter company-backend args))
-    (error (error "Company: Back-end %s error \"%s\" with args %s"
-                  company-backend (error-message-string err) args))))
-
-(defun company--multi-backend-adapter (backends command &rest args)
-  (let ((backends (cl-loop for b in backends
-                           when (not (and (symbolp b)
-                                          (eq 'failed (get b 'company-init))))
-                           collect b)))
-    (setq backends
-          (if (eq command 'prefix)
-              (butlast backends (length (member :with backends)))
-            (delq :with backends)))
-    (pcase command
-      (`candidates
-       (company--multi-backend-adapter-candidates backends (car args)))
-      (`sorted nil)
-      (`duplicates t)
-      ((or `prefix `ignore-case `no-cache `require-match)
-       (let (value)
-         (cl-dolist (backend backends)
-           (when (setq value (company--force-sync
-                              backend (cons command args) backend))
-             (cl-return value)))))
-      (_
-       (let ((arg (car args)))
-         (when (> (length arg) 0)
-           (let ((backend (or (get-text-property 0 'company-backend arg)
-                              (car backends))))
-             (apply backend command args))))))))
-
-(defun company--multi-backend-adapter-candidates (backends prefix)
-  (let ((pairs (cl-loop for backend in (cdr backends)
-                        when (equal (company--prefix-str
-                                     (funcall backend 'prefix))
-                                    prefix)
-                        collect (cons (funcall backend 'candidates prefix)
-                                      (let ((b backend))
-                                        (lambda (candidates)
-                                          (mapcar
-                                           (lambda (str)
-                                             (propertize str 'company-backend b))
-                                           candidates)))))))
-    (when (equal (company--prefix-str (funcall (car backends) 'prefix)) prefix)
-      ;; Small perf optimization: don't tag the candidates received
-      ;; from the first backend in the group.
-      (push (cons (funcall (car backends) 'candidates prefix)
-                  'identity)
-            pairs))
-    (company--merge-async pairs (lambda (values) (apply #'append values)))))
-
-(defun company--merge-async (pairs merger)
-  (let ((async (cl-loop for pair in pairs
-                        thereis
-                        (eq :async (car-safe (car pair))))))
-    (if (not async)
-        (funcall merger (cl-loop for (val . mapper) in pairs
-                                 collect (funcall mapper val)))
-      (cons
-       :async
-       (lambda (callback)
-         (let* (lst
-                (pending (mapcar #'car pairs))
-                (finisher (lambda ()
-                            (unless pending
-                              (funcall callback
-                                       (funcall merger
-                                                (nreverse lst)))))))
-           (dolist (pair pairs)
-             (push nil lst)
-             (let* ((cell lst)
-                    (val (car pair))
-                    (mapper (cdr pair))
-                    (this-finisher (lambda (res)
-                                     (setq pending (delq val pending))
-                                     (setcar cell (funcall mapper res))
-                                     (funcall finisher))))
-               (if (not (eq :async (car-safe val)))
-                   (funcall this-finisher val)
-                 (let ((fetcher (cdr val)))
-                   (funcall fetcher this-finisher)))))))))))
-
-(defun company--prefix-str (prefix)
-  (or (car-safe prefix) prefix))
-
-;;; completion mechanism ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-prefix nil)
-
-(defvar-local company-candidates nil)
-
-(defvar-local company-candidates-length nil)
-
-(defvar-local company-candidates-cache nil)
-
-(defvar-local company-candidates-predicate nil)
-
-(defvar-local company-common nil)
-
-(defvar-local company-selection 0)
-
-(defvar-local company-selection-changed nil)
-
-(defvar-local company--manual-action nil
-  "Non-nil, if manual completion took place.")
-
-(defvar-local company--manual-prefix nil)
-
-(defvar company--auto-completion nil
-  "Non-nil when current candidate is being inserted automatically.
-Controlled by `company-auto-complete'.")
-
-(defvar-local company--point-max nil)
-
-(defvar-local company-point nil)
-
-(defvar company-timer nil)
-
-(defsubst company-strip-prefix (str)
-  (substring str (length company-prefix)))
-
-(defun company--insert-candidate (candidate)
-  (when (> (length candidate) 0)
-    (setq candidate (substring-no-properties candidate))
-    ;; XXX: Return value we check here is subject to change.
-    (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
-        (insert (company-strip-prefix candidate))
-      (unless (equal company-prefix candidate)
-        (delete-region (- (point) (length company-prefix)) (point))
-        (insert candidate)))))
-
-(defmacro company-with-candidate-inserted (candidate &rest body)
-  "Evaluate BODY with CANDIDATE temporarily inserted.
-This is a tool for back-ends that need candidates inserted before they
-can retrieve meta-data for them."
-  (declare (indent 1))
-  `(let ((inhibit-modification-hooks t)
-         (inhibit-point-motion-hooks t)
-         (modified-p (buffer-modified-p)))
-     (company--insert-candidate ,candidate)
-     (unwind-protect
-         (progn ,@body)
-       (delete-region company-point (point))
-       (set-buffer-modified-p modified-p))))
-
-(defun company-explicit-action-p ()
-  "Return whether explicit completion action was taken by the user."
-  (or company--manual-action
-      company-selection-changed))
-
-(defun company-reformat (candidate)
-  ;; company-ispell needs this, because the results are always lower-case
-  ;; It's mory efficient to fix it only when they are displayed.
-  ;; FIXME: Adopt the current text's capitalization instead?
-  (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
-      (concat company-prefix (substring candidate (length company-prefix)))
-    candidate))
-
-(defun company--should-complete ()
-  (and (eq company-idle-delay 'now)
-       (not (or buffer-read-only overriding-terminal-local-map
-                overriding-local-map))
-       ;; Check if in the middle of entering a key combination.
-       (or (equal (this-command-keys-vector) [])
-           (not (keymapp (key-binding (this-command-keys-vector)))))
-       (not (and transient-mark-mode mark-active))))
-
-(defun company--should-continue ()
-  (or (eq t company-begin-commands)
-      (eq t company-continue-commands)
-      (if (eq 'not (car company-continue-commands))
-          (not (memq this-command (cdr company-continue-commands)))
-        (or (memq this-command company-begin-commands)
-            (memq this-command company-continue-commands)
-            (and (symbolp this-command)
-                 (string-match-p "\\`company-" (symbol-name this-command)))))))
-
-(defun company-call-frontends (command)
-  (dolist (frontend company-frontends)
-    (condition-case-unless-debug err
-        (funcall frontend command)
-      (error (error "Company: Front-end %s error \"%s\" on command %s"
-                    frontend (error-message-string err) command)))))
-
-(defun company-set-selection (selection &optional force-update)
-  (setq selection
-        (if company-selection-wrap-around
-            (mod selection company-candidates-length)
-          (max 0 (min (1- company-candidates-length) selection))))
-  (when (or force-update (not (equal selection company-selection)))
-    (setq company-selection selection
-          company-selection-changed t)
-    (company-call-frontends 'update)))
-
-(defun company--group-lighter (candidate base)
-  (let ((backend (or (get-text-property 0 'company-backend candidate)
-                     (car company-backend))))
-    (when (and backend (symbolp backend))
-      (let ((name (replace-regexp-in-string "company-\\|-company" ""
-                                            (symbol-name backend))))
-        (format "%s-<%s>" base name)))))
-
-(defun company-update-candidates (candidates)
-  (setq company-candidates-length (length candidates))
-  (if company-selection-changed
-      ;; Try to restore the selection
-      (let ((selected (nth company-selection company-candidates)))
-        (setq company-selection 0
-              company-candidates candidates)
-        (when selected
-          (catch 'found
-            (while candidates
-              (let ((candidate (pop candidates)))
-                (when (and (string= candidate selected)
-                           (equal (company-call-backend 'annotation candidate)
-                                  (company-call-backend 'annotation selected)))
-                  (throw 'found t)))
-              (cl-incf company-selection))
-            (setq company-selection 0
-                  company-selection-changed nil))))
-    (setq company-selection 0
-          company-candidates candidates))
-  ;; Calculate common.
-  (let ((completion-ignore-case (company-call-backend 'ignore-case)))
-    ;; We want to support non-prefix completion, so filtering is the
-    ;; responsibility of each respective backend, not ours.
-    ;; On the other hand, we don't want to replace non-prefix input in
-    ;; `company-complete-common', unless there's only one candidate.
-    (setq company-common
-          (if (cdr company-candidates)
-              (let ((common (try-completion "" company-candidates)))
-                (when (string-prefix-p company-prefix common
-                                       completion-ignore-case)
-                  common))
-            (car company-candidates)))))
-
-(defun company-calculate-candidates (prefix)
-  (let ((candidates (cdr (assoc prefix company-candidates-cache)))
-        (ignore-case (company-call-backend 'ignore-case)))
-    (or candidates
-        (when company-candidates-cache
-          (let ((len (length prefix))
-                (completion-ignore-case ignore-case)
-                prev)
-            (cl-dotimes (i (1+ len))
-              (when (setq prev (cdr (assoc (substring prefix 0 (- len i))
-                                           company-candidates-cache)))
-                (setq candidates (all-completions prefix prev))
-                (cl-return t)))))
-        (progn
-          ;; No cache match, call the backend.
-          (setq candidates (company--preprocess-candidates
-                            (company--fetch-candidates prefix)))
-          ;; Save in cache.
-          (push (cons prefix candidates) company-candidates-cache)))
-    ;; Only now apply the predicate and transformers.
-    (setq candidates (company--postprocess-candidates candidates))
-    (when candidates
-      (if (or (cdr candidates)
-              (not (eq t (compare-strings (car candidates) nil nil
-                                          prefix nil nil ignore-case))))
-          candidates
-        ;; Already completed and unique; don't start.
-        t))))
-
-(defun company--fetch-candidates (prefix)
-  (let ((c (if company--manual-action
-               (company-call-backend 'candidates prefix)
-             (company-call-backend-raw 'candidates prefix)))
-        res)
-    (if (not (eq (car c) :async))
-        c
-      (let ((buf (current-buffer))
-            (win (selected-window))
-            (tick (buffer-chars-modified-tick))
-            (pt (point))
-            (backend company-backend))
-        (funcall
-         (cdr c)
-         (lambda (candidates)
-           (if (not (and candidates (eq res 'done)))
-               ;; There's no completions to display,
-               ;; or the fetcher called us back right away.
-               (setq res candidates)
-             (setq company-backend backend
-                   company-candidates-cache
-                   (list (cons prefix
-                               (company--preprocess-candidates candidates))))
-             (company-idle-begin buf win tick pt)))))
-      ;; FIXME: Relying on the fact that the callers
-      ;; will interpret nil as "do nothing" is shaky.
-      ;; A throw-catch would be one possible improvement.
-      (or res
-          (progn (setq res 'done) nil)))))
-
-(defun company--preprocess-candidates (candidates)
-  (unless (company-call-backend 'sorted)
-    (setq candidates (sort candidates 'string<)))
-  (when (company-call-backend 'duplicates)
-    (company--strip-duplicates candidates))
-  candidates)
-
-(defun company--postprocess-candidates (candidates)
-  (when (or company-candidates-predicate company-transformers)
-    (setq candidates (copy-sequence candidates)))
-  (when company-candidates-predicate
-    (setq candidates (cl-delete-if-not company-candidates-predicate candidates)))
-  (company--transform-candidates candidates))
-
-(defun company--strip-duplicates (candidates)
-  (let ((c2 candidates)
-        (annos 'unk))
-    (while c2
-      (setcdr c2
-              (let ((str (pop c2)))
-                (while (let ((str2 (car c2)))
-                         (if (not (equal str str2))
-                             (progn
-                               (setq annos 'unk)
-                               nil)
-                           (when (eq annos 'unk)
-                             (setq annos (list (company-call-backend
-                                                'annotation str))))
-                           (let ((anno2 (company-call-backend
-                                         'annotation str2)))
-                             (if (member anno2 annos)
-                                 t
-                               (push anno2 annos)
-                               nil))))
-                  (pop c2))
-                c2)))))
-
-(defun company--transform-candidates (candidates)
-  (let ((c candidates))
-    (dolist (tr company-transformers)
-      (setq c (funcall tr c)))
-    c))
-
-(defcustom company-occurrence-weight-function
-  #'company-occurrence-prefer-closest-above
-  "Function to weigh matches in `company-sort-by-occurrence'.
-It's called with three arguments: cursor position, the beginning and the
-end of the match."
-  :type '(choice
-          (const :tag "First above point, then below point"
-                 company-occurrence-prefer-closest-above)
-          (const :tag "Prefer closest in any direction"
-                 company-occurrence-prefer-any-closest)))
-
-(defun company-occurrence-prefer-closest-above (pos match-beg match-end)
-  "Give priority to the matches above point, then those below point."
-  (if (< match-beg pos)
-      (- pos match-end)
-    (- match-beg (window-start))))
-
-(defun company-occurrence-prefer-any-closest (pos _match-beg match-end)
-  "Give priority to the matches closest to the point."
-  (abs (- pos match-end)))
-
-(defun company-sort-by-occurrence (candidates)
-  "Sort CANDIDATES according to their occurrences.
-Searches for each in the currently visible part of the current buffer and
-prioritizes the matches according to `company-occurrence-weight-function'.
-The rest of the list is appended unchanged.
-Keywords and function definition names are ignored."
-  (let* ((w-start (window-start))
-         (w-end (window-end))
-         (start-point (point))
-         occurs
-         (noccurs
-          (save-excursion
-            (cl-delete-if
-             (lambda (candidate)
-               (when (catch 'done
-                       (goto-char w-start)
-                       (while (search-forward candidate w-end t)
-                         (when (and (not (eq (point) start-point))
-                                    (save-match-data
-                                      (company--occurrence-predicate)))
-                           (throw 'done t))))
-                 (push
-                  (cons candidate
-                        (funcall company-occurrence-weight-function
-                                 start-point
-                                 (match-beginning 0)
-                                 (match-end 0)))
-                  occurs)
-                 t))
-             candidates))))
-    (nconc
-     (mapcar #'car (sort occurs (lambda (e1 e2) (<= (cdr e1) (cdr e2)))))
-     noccurs)))
-
-(defun company--occurrence-predicate ()
-  (let ((beg (match-beginning 0))
-        (end (match-end 0)))
-    (save-excursion
-      (goto-char end)
-      (and (not (memq (get-text-property (1- (point)) 'face)
-                      '(font-lock-function-name-face
-                        font-lock-keyword-face)))
-           (let ((prefix (company--prefix-str
-                          (company-call-backend 'prefix))))
-             (and (stringp prefix)
-                  (= (length prefix) (- end beg))))))))
-
-(defun company-sort-by-backend-importance (candidates)
-  "Sort CANDIDATES as two priority groups.
-If `company-backend' is a function, do nothing.  If it's a list, move
-candidates from back-ends before keyword `:with' to the front.  Candidates
-from the rest of the back-ends in the group, if any, will be left at the end."
-  (if (functionp company-backend)
-      candidates
-    (let ((low-priority (cdr (memq :with company-backend))))
-      (if (null low-priority)
-          candidates
-        (sort candidates
-              (lambda (c1 c2)
-                (and
-                 (let ((b2 (get-text-property 0 'company-backend c2)))
-                   (and b2 (memq b2 low-priority)))
-                 (let ((b1 (get-text-property 0 'company-backend c1)))
-                   (or (not b1) (not (memq b1 low-priority)))))))))))
-
-(defun company-idle-begin (buf win tick pos)
-  (and (eq buf (current-buffer))
-       (eq win (selected-window))
-       (eq tick (buffer-chars-modified-tick))
-       (eq pos (point))
-       (when (company-auto-begin)
-         (company-input-noop)
-         (let ((this-command 'company-idle-begin))
-           (company-post-command)))))
-
-(defun company-auto-begin ()
-  (and company-mode
-       (not company-candidates)
-       (let ((company-idle-delay 'now))
-         (condition-case-unless-debug err
-             (progn
-               (company--perform)
-               ;; Return non-nil if active.
-               company-candidates)
-           (error (message "Company: An error occurred in auto-begin")
-                  (message "%s" (error-message-string err))
-                  (company-cancel))
-           (quit (company-cancel))))))
-
-(defun company-manual-begin ()
-  (interactive)
-  (company-assert-enabled)
-  (setq company--manual-action t)
-  (unwind-protect
-      (let ((company-minimum-prefix-length 0))
-        (or company-candidates
-            (company-auto-begin)))
-    (unless company-candidates
-      (setq company--manual-action nil))))
-
-(defun company-other-backend (&optional backward)
-  (interactive (list current-prefix-arg))
-  (company-assert-enabled)
-  (let* ((after (if company-backend
-                    (cdr (member company-backend company-backends))
-                  company-backends))
-         (before (cdr (member company-backend (reverse company-backends))))
-         (next (if backward
-                   (append before (reverse after))
-                 (append after (reverse before)))))
-    (company-cancel)
-    (cl-dolist (backend next)
-      (when (ignore-errors (company-begin-backend backend))
-        (cl-return t))))
-  (unless company-candidates
-    (error "No other back-end")))
-
-(defun company-require-match-p ()
-  (let ((backend-value (company-call-backend 'require-match)))
-    (or (eq backend-value t)
-        (and (not (eq backend-value 'never))
-             (if (functionp company-require-match)
-                 (funcall company-require-match)
-               (eq company-require-match t))))))
-
-(defun company-auto-complete-p (input)
-  "Return non-nil, if input starts with punctuation or parentheses."
-  (and (if (functionp company-auto-complete)
-           (funcall company-auto-complete)
-         company-auto-complete)
-       (if (functionp company-auto-complete-chars)
-           (funcall company-auto-complete-chars input)
-         (if (consp company-auto-complete-chars)
-             (memq (char-syntax (string-to-char input))
-                   company-auto-complete-chars)
-           (string-match (substring input 0 1) company-auto-complete-chars)))))
-
-(defun company--incremental-p ()
-  (and (> (point) company-point)
-       (> (point-max) company--point-max)
-       (not (eq this-command 'backward-delete-char-untabify))
-       (equal (buffer-substring (- company-point (length company-prefix))
-                                company-point)
-              company-prefix)))
-
-(defun company--continue-failed (new-prefix)
-  (let ((input (buffer-substring-no-properties (point) company-point)))
-    (cond
-     ((company-auto-complete-p input)
-      ;; auto-complete
-      (save-excursion
-        (goto-char company-point)
-        (let ((company--auto-completion t))
-          (company-complete-selection))
-        nil))
-     ((and (or (not (company-require-match-p))
-               ;; Don't require match if the new prefix
-               ;; doesn't continue the old one, and the latter was a match.
-               (not (stringp new-prefix))
-               (<= (length new-prefix) (length company-prefix)))
-           (member company-prefix company-candidates))
-      ;; Last input was a success,
-      ;; but we're treating it as an abort + input anyway,
-      ;; like the `unique' case below.
-      (company-cancel 'non-unique))
-     ((company-require-match-p)
-      ;; Wrong incremental input, but required match.
-      (delete-char (- (length input)))
-      (ding)
-      (message "Matching input is required")
-      company-candidates)
-     (t (company-cancel)))))
-
-(defun company--good-prefix-p (prefix)
-  (and (stringp (company--prefix-str prefix)) ;excludes 'stop
-       (or (eq (cdr-safe prefix) t)
-           (let ((len (or (cdr-safe prefix) (length prefix))))
-             (if company--manual-prefix
-                 (or (not company-abort-manual-when-too-short)
-                     ;; Must not be less than minimum or initial length.
-                     (>= len (min company-minimum-prefix-length
-                                  (length company--manual-prefix))))
-               (>= len company-minimum-prefix-length))))))
-
-(defun company--continue ()
-  (when (company-call-backend 'no-cache company-prefix)
-    ;; Don't complete existing candidates, fetch new ones.
-    (setq company-candidates-cache nil))
-  (let* ((new-prefix (company-call-backend 'prefix))
-         (c (when (and (company--good-prefix-p new-prefix)
-                       (setq new-prefix (company--prefix-str new-prefix))
-                       (= (- (point) (length new-prefix))
-                          (- company-point (length company-prefix))))
-              (company-calculate-candidates new-prefix))))
-    (cond
-     ((eq c t)
-      ;; t means complete/unique.
-      ;; Handle it like completion was aborted, to differentiate from user
-      ;; calling one of Company's commands to insert the candidate,
-      ;; not to trigger template expansion, etc.
-      (company-cancel 'unique))
-     ((consp c)
-      ;; incremental match
-      (setq company-prefix new-prefix)
-      (company-update-candidates c)
-      c)
-     ((not (company--incremental-p))
-      (company-cancel))
-     (t (company--continue-failed new-prefix)))))
-
-(defun company--begin-new ()
-  (let (prefix c)
-    (cl-dolist (backend (if company-backend
-                            ;; prefer manual override
-                            (list company-backend)
-                          company-backends))
-      (setq prefix
-            (if (or (symbolp backend)
-                    (functionp backend))
-                (when (or (not (symbolp backend))
-                          (eq t (get backend 'company-init))
-                          (unless (get backend 'company-init)
-                            (company-init-backend backend)))
-                  (funcall backend 'prefix))
-              (company--multi-backend-adapter backend 'prefix)))
-      (when prefix
-        (when (company--good-prefix-p prefix)
-          (setq company-prefix (company--prefix-str prefix)
-                company-backend backend
-                c (company-calculate-candidates company-prefix))
-          (if (not (consp c))
-              (progn
-                (when company--manual-action
-                  (message "No completion found"))
-                (when (eq c t)
-                  ;; t means complete/unique.
-                  ;; Run the hooks anyway, to e.g. clear the cache.
-                  (company-cancel 'unique)))
-            (when company--manual-action
-              (setq company--manual-prefix prefix))
-            (company-update-candidates c)
-            (run-hook-with-args 'company-completion-started-hook
-                                (company-explicit-action-p))
-            (company-call-frontends 'show)))
-        (cl-return c)))))
-
-(defun company--perform ()
-  (or (and company-candidates (company--continue))
-      (and (company--should-complete) (company--begin-new)))
-  (if (not company-candidates)
-      (setq company-backend nil)
-    (setq company-point (point)
-          company--point-max (point-max))
-    (company-ensure-emulation-alist)
-    (company-enable-overriding-keymap company-active-map)
-    (company-call-frontends 'update)))
-
-(defun company-cancel (&optional result)
-  (unwind-protect
-      (when company-prefix
-        (if (stringp result)
-            (progn
-              (company-call-backend 'pre-completion result)
-              (run-hook-with-args 'company-completion-finished-hook result)
-              (company-call-backend 'post-completion result))
-          (run-hook-with-args 'company-completion-cancelled-hook result)))
-    (setq company-backend nil
-          company-prefix nil
-          company-candidates nil
-          company-candidates-length nil
-          company-candidates-cache nil
-          company-candidates-predicate nil
-          company-common nil
-          company-selection 0
-          company-selection-changed nil
-          company--manual-action nil
-          company--manual-prefix nil
-          company--point-max nil
-          company-point nil)
-    (when company-timer
-      (cancel-timer company-timer))
-    (company-echo-cancel t)
-    (company-search-mode 0)
-    (company-call-frontends 'hide)
-    (company-enable-overriding-keymap nil))
-  ;; Make return value explicit.
-  nil)
-
-(defun company-abort ()
-  (interactive)
-  (company-cancel 'abort))
-
-(defun company-finish (result)
-  (company--insert-candidate result)
-  (company-cancel result))
-
-(defsubst company-keep (command)
-  (and (symbolp command) (get command 'company-keep)))
-
-(defun company-pre-command ()
-  (unless (company-keep this-command)
-    (condition-case-unless-debug err
-        (when company-candidates
-          (company-call-frontends 'pre-command)
-          (unless (company--should-continue)
-            (company-abort)))
-      (error (message "Company: An error occurred in pre-command")
-             (message "%s" (error-message-string err))
-             (company-cancel))))
-  (when company-timer
-    (cancel-timer company-timer)
-    (setq company-timer nil))
-  (company-echo-cancel t)
-  (company-uninstall-map))
-
-(defun company-post-command ()
-  (when (null this-command)
-    ;; Happens when the user presses `C-g' while inside
-    ;; `flyspell-post-command-hook', for example.
-    ;; Or any other `post-command-hook' function that can call `sit-for',
-    ;; or any quittable timer function.
-    (company-abort)
-    (setq this-command 'company-abort))
-  (unless (company-keep this-command)
-    (condition-case-unless-debug err
-        (progn
-          (unless (equal (point) company-point)
-            (let (company-idle-delay) ; Against misbehavior while debugging.
-              (company--perform)))
-          (if company-candidates
-              (company-call-frontends 'post-command)
-            (and (numberp company-idle-delay)
-                 (company--should-begin)
-                 (setq company-timer
-                       (run-with-timer company-idle-delay nil
-                                       'company-idle-begin
-                                       (current-buffer) (selected-window)
-                                       (buffer-chars-modified-tick) (point))))))
-      (error (message "Company: An error occurred in post-command")
-             (message "%s" (error-message-string err))
-             (company-cancel))))
-  (company-install-map))
-
-(defvar company--begin-inhibit-commands '(company-abort
-                                          company-complete-mouse
-                                          company-complete
-                                          company-complete-common
-                                          company-complete-selection
-                                          company-complete-number)
-  "List of commands after which idle completion is (still) disabled when
-`company-begin-commands' is t.")
-
-(defun company--should-begin ()
-  (if (eq t company-begin-commands)
-      (not (memq this-command company--begin-inhibit-commands))
-    (or
-     (memq this-command company-begin-commands)
-     (and (symbolp this-command) (get this-command 'company-begin)))))
-
-;;; search ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-search-string "")
-
-(defvar company-search-lighter '(" "
-                                 (company-search-filtering "Filter" "Search")
-                                 ": \""
-                                 company-search-string
-                                 "\""))
-
-(defvar-local company-search-filtering nil
-  "Non-nil to filter the completion candidates by the search string")
-
-(defvar-local company--search-old-selection 0)
-
-(defvar-local company--search-old-changed nil)
-
-(defun company--search (text lines)
-  (let ((quoted (regexp-quote text))
-        (i 0))
-    (cl-dolist (line lines)
-      (when (string-match quoted line (length company-prefix))
-        (cl-return i))
-      (cl-incf i))))
-
-(defun company-search-keypad ()
-  (interactive)
-  (let* ((name (symbol-name last-command-event))
-         (last-command-event (aref name (1- (length name)))))
-    (company-search-printing-char)))
-
-(defun company-search-printing-char ()
-  (interactive)
-  (company--search-assert-enabled)
-  (let ((ss (concat company-search-string (string last-command-event))))
-    (when company-search-filtering
-      (company--search-update-predicate ss))
-    (company--search-update-string ss)))
-
-(defun company--search-update-predicate (&optional ss)
-  (let* ((company-candidates-predicate
-          (and (not (string= ss ""))
-               company-search-filtering
-               (lambda (candidate) (string-match ss candidate))))
-         (cc (company-calculate-candidates company-prefix)))
-    (unless cc (error "No match"))
-    (company-update-candidates cc)))
-
-(defun company--search-update-string (new)
-  (let* ((pos (company--search new (nthcdr company-selection company-candidates))))
-    (if (null pos)
-        (ding)
-      (setq company-search-string new)
-      (company-set-selection (+ company-selection pos) t))))
-
-(defun company--search-assert-input ()
-  (company--search-assert-enabled)
-  (when (string= company-search-string "")
-    (error "Empty search string")))
-
-(defun company-search-repeat-forward ()
-  "Repeat the incremental search in completion candidates forward."
-  (interactive)
-  (company--search-assert-input)
-  (let ((pos (company--search company-search-string
-                              (cdr (nthcdr company-selection
-                                           company-candidates)))))
-    (if (null pos)
-        (ding)
-      (company-set-selection (+ company-selection pos 1) t))))
-
-(defun company-search-repeat-backward ()
-  "Repeat the incremental search in completion candidates backwards."
-  (interactive)
-  (company--search-assert-input)
-  (let ((pos (company--search company-search-string
-                              (nthcdr (- company-candidates-length
-                                         company-selection)
-                                      (reverse company-candidates)))))
-    (if (null pos)
-        (ding)
-      (company-set-selection (- company-selection pos 1) t))))
-
-(defun company-search-toggle-filtering ()
-  "Toggle `company-search-filtering'."
-  (interactive)
-  (company--search-assert-enabled)
-  (setq company-search-filtering (not company-search-filtering))
-  (let ((ss company-search-string))
-    (company--search-update-predicate ss)
-    (company--search-update-string ss)))
-
-(defun company-search-abort ()
-  "Abort searching the completion candidates."
-  (interactive)
-  (company--search-assert-enabled)
-  (company-search-mode 0)
-  (company-set-selection company--search-old-selection t)
-  (setq company-selection-changed company--search-old-changed))
-
-(defun company-search-other-char ()
-  (interactive)
-  (company--search-assert-enabled)
-  (company-search-mode 0)
-  (company--unread-last-input))
-
-(defun company-search-delete-char ()
-  (interactive)
-  (company--search-assert-enabled)
-  (if (string= company-search-string "")
-      (ding)
-    (let ((ss (substring company-search-string 0 -1)))
-      (when company-search-filtering
-        (company--search-update-predicate ss))
-      (company--search-update-string ss))))
-
-(defvar company-search-map
-  (let ((i 0)
-        (keymap (make-keymap)))
-    (if (fboundp 'max-char)
-        (set-char-table-range (nth 1 keymap) (cons #x100 (max-char))
-                              'company-search-printing-char)
-      (with-no-warnings
-        ;; obsolete in Emacs 23
-        (let ((l (generic-character-list))
-              (table (nth 1 keymap)))
-          (while l
-            (set-char-table-default table (car l) 'company-search-printing-char)
-            (setq l (cdr l))))))
-    (define-key keymap [t] 'company-search-other-char)
-    (while (< i ?\s)
-      (define-key keymap (make-string 1 i) 'company-search-other-char)
-      (cl-incf i))
-    (while (< i 256)
-      (define-key keymap (vector i) 'company-search-printing-char)
-      (cl-incf i))
-    (dotimes (i 10)
-      (define-key keymap (read (format "[kp-%s]" i)) 'company-search-keypad))
-    (let ((meta-map (make-sparse-keymap)))
-      (define-key keymap (char-to-string meta-prefix-char) meta-map)
-      (define-key keymap [escape] meta-map))
-    (define-key keymap (vector meta-prefix-char t) 'company-search-other-char)
-    (define-key keymap (kbd "M-n") 'company-select-next)
-    (define-key keymap (kbd "M-p") 'company-select-previous)
-    (define-key keymap (kbd "<down>") 'company-select-next-or-abort)
-    (define-key keymap (kbd "<up>") 'company-select-previous-or-abort)
-    (define-key keymap "\e\e\e" 'company-search-other-char)
-    (define-key keymap [escape escape escape] 'company-search-other-char)
-    (define-key keymap (kbd "DEL") 'company-search-delete-char)
-    (define-key keymap [backspace] 'company-search-delete-char)
-    (define-key keymap "\C-g" 'company-search-abort)
-    (define-key keymap "\C-s" 'company-search-repeat-forward)
-    (define-key keymap "\C-r" 'company-search-repeat-backward)
-    (define-key keymap "\C-o" 'company-search-toggle-filtering)
-    (dotimes (i 10)
-      (define-key keymap (read-kbd-macro (format "M-%d" i)) 'company-complete-number))
-    keymap)
-  "Keymap used for incrementally searching the completion candidates.")
-
-(define-minor-mode company-search-mode
-  "Search mode for completion candidates.
-Don't start this directly, use `company-search-candidates' or
-`company-filter-candidates'."
-  nil company-search-lighter nil
-  (if company-search-mode
-      (if (company-manual-begin)
-          (progn
-            (setq company--search-old-selection company-selection
-                  company--search-old-changed company-selection-changed)
-            (company-call-frontends 'update)
-            (company-enable-overriding-keymap company-search-map))
-        (setq company-search-mode nil))
-    (kill-local-variable 'company-search-string)
-    (kill-local-variable 'company-search-filtering)
-    (kill-local-variable 'company--search-old-selection)
-    (kill-local-variable 'company--search-old-changed)
-    (when company-backend
-      (company--search-update-predicate "")
-      (company-call-frontends 'update))
-    (company-enable-overriding-keymap company-active-map)))
-
-(defun company--search-assert-enabled ()
-  (company-assert-enabled)
-  (unless company-search-mode
-    (company-uninstall-map)
-    (error "Company not in search mode")))
-
-(defun company-search-candidates ()
-  "Start searching the completion candidates incrementally.
-
-\\<company-search-map>Search can be controlled with the commands:
-- `company-search-repeat-forward' (\\[company-search-repeat-forward])
-- `company-search-repeat-backward' (\\[company-search-repeat-backward])
-- `company-search-abort' (\\[company-search-abort])
-- `company-search-delete-char' (\\[company-search-delete-char])
-
-Regular characters are appended to the search string.
-
-The command `company-search-toggle-filtering' (\\[company-search-toggle-filtering])
-uses the search string to filter the completion candidates."
-  (interactive)
-  (company-search-mode 1))
-
-(defvar company-filter-map
-  (let ((keymap (make-keymap)))
-    (define-key keymap [remap company-search-printing-char]
-      'company-filter-printing-char)
-    (set-keymap-parent keymap company-search-map)
-    keymap)
-  "Keymap used for incrementally searching the completion candidates.")
-
-(defun company-filter-candidates ()
-  "Start filtering the completion candidates incrementally.
-This works the same way as `company-search-candidates' immediately
-followed by `company-search-toggle-filtering'."
-  (interactive)
-  (company-search-mode 1)
-  (setq company-search-filtering t))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun company-select-next (&optional arg)
-  "Select the next candidate in the list.
-
-With ARG, move by that many elements."
-  (interactive "p")
-  (when (company-manual-begin)
-    (company-set-selection (+ (or arg 1) company-selection))))
-
-(defun company-select-previous (&optional arg)
-  "Select the previous candidate in the list.
-
-With ARG, move by that many elements."
-  (interactive "p")
-  (company-select-next (if arg (- arg) -1)))
-
-(defun company-select-next-or-abort (&optional arg)
-  "Select the next candidate if more than one, else abort
-and invoke the normal binding.
-
-With ARG, move by that many elements."
-  (interactive "p")
-  (if (> company-candidates-length 1)
-      (company-select-next arg)
-    (company-abort)
-    (company--unread-last-input)))
-
-(defun company-select-previous-or-abort (&optional arg)
-  "Select the previous candidate if more than one, else abort
-and invoke the normal binding.
-
-With ARG, move by that many elements."
-  (interactive "p")
-  (if (> company-candidates-length 1)
-      (company-select-previous arg)
-    (company-abort)
-    (company--unread-last-input)))
-
-(defun company-next-page ()
-  "Select the candidate one page further."
-  (interactive)
-  (when (company-manual-begin)
-    (company-set-selection (+ company-selection
-                              company-tooltip-limit))))
-
-(defun company-previous-page ()
-  "Select the candidate one page earlier."
-  (interactive)
-  (when (company-manual-begin)
-    (company-set-selection (- company-selection
-                              company-tooltip-limit))))
-
-(defvar company-pseudo-tooltip-overlay)
-
-(defvar company-tooltip-offset)
-
-(defun company--inside-tooltip-p (event-col-row row height)
-  (let* ((ovl company-pseudo-tooltip-overlay)
-         (column (overlay-get ovl 'company-column))
-         (width (overlay-get ovl 'company-width))
-         (evt-col (car event-col-row))
-         (evt-row (cdr event-col-row)))
-    (and (>= evt-col column)
-         (< evt-col (+ column width))
-         (if (> height 0)
-             (and (> evt-row row)
-                  (<= evt-row (+ row height) ))
-           (and (< evt-row row)
-                (>= evt-row (+ row height)))))))
-
-(defun company--event-col-row (event)
-  (company--posn-col-row (event-start event)))
-
-(defun company-select-mouse (event)
-  "Select the candidate picked by the mouse."
-  (interactive "e")
-  (let ((event-col-row (company--event-col-row event))
-        (ovl-row (company--row))
-        (ovl-height (and company-pseudo-tooltip-overlay
-                         (min (overlay-get company-pseudo-tooltip-overlay
-                                           'company-height)
-                              company-candidates-length))))
-    (if (and ovl-height
-             (company--inside-tooltip-p event-col-row ovl-row ovl-height))
-        (progn
-          (company-set-selection (+ (cdr event-col-row)
-                                    (1- company-tooltip-offset)
-                                    (if (and (eq company-tooltip-offset-display 'lines)
-                                             (not (zerop company-tooltip-offset)))
-                                        -1 0)
-                                    (- ovl-row)
-                                    (if (< ovl-height 0)
-                                        (- 1 ovl-height)
-                                      0)))
-          t)
-      (company-abort)
-      (company--unread-last-input)
-      nil)))
-
-(defun company-complete-mouse (event)
-  "Insert the candidate picked by the mouse."
-  (interactive "e")
-  (when (company-select-mouse event)
-    (company-complete-selection)))
-
-(defun company-complete-selection ()
-  "Insert the selected candidate."
-  (interactive)
-  (when (company-manual-begin)
-    (let ((result (nth company-selection company-candidates)))
-      (company-finish result))))
-
-(defun company-complete-common ()
-  "Insert the common part of all candidates."
-  (interactive)
-  (when (company-manual-begin)
-    (if (and (not (cdr company-candidates))
-             (equal company-common (car company-candidates)))
-        (company-complete-selection)
-      (company--insert-candidate company-common))))
-
-(defun company-complete-common-or-cycle (&optional arg)
-  "Insert the common part of all candidates, or select the next one.
-
-With ARG, move by that many elements."
-  (interactive "p")
-  (when (company-manual-begin)
-    (let ((tick (buffer-chars-modified-tick)))
-      (call-interactively 'company-complete-common)
-      (when (eq tick (buffer-chars-modified-tick))
-        (let ((company-selection-wrap-around t)
-              (current-prefix-arg arg))
-          (call-interactively 'company-select-next))))))
-
-(defun company-complete ()
-  "Insert the common part of all candidates or the current selection.
-The first time this is called, the common part is inserted, the second
-time, or when the selection has been changed, the selected candidate is
-inserted."
-  (interactive)
-  (when (company-manual-begin)
-    (if (or company-selection-changed
-            (eq last-command 'company-complete-common))
-        (call-interactively 'company-complete-selection)
-      (call-interactively 'company-complete-common)
-      (setq this-command 'company-complete-common))))
-
-(defun company-complete-number (n)
-  "Insert the Nth candidate visible in the tooltip.
-To show the number next to the candidates in some back-ends, enable
-`company-show-numbers'.  When called interactively, uses the last typed
-character, stripping the modifiers.  That character must be a digit."
-  (interactive
-   (list (let* ((type (event-basic-type last-command-event))
-                (char (if (characterp type)
-                          ;; Number on the main row.
-                          type
-                        ;; Keypad number, if bound directly.
-                        (car (last (string-to-list (symbol-name type))))))
-                (n (- char ?0)))
-           (if (zerop n) 10 n))))
-  (when (company-manual-begin)
-    (and (or (< n 1) (> n (- company-candidates-length
-                             company-tooltip-offset)))
-         (error "No candidate number %d" n))
-    (cl-decf n)
-    (company-finish (nth (+ n company-tooltip-offset)
-                         company-candidates))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defconst company-space-strings-limit 100)
-
-(defconst company-space-strings
-  (let (lst)
-    (dotimes (i company-space-strings-limit)
-      (push (make-string (- company-space-strings-limit 1 i) ?\  ) lst))
-    (apply 'vector lst)))
-
-(defun company-space-string (len)
-  (if (< len company-space-strings-limit)
-      (aref company-space-strings len)
-    (make-string len ?\ )))
-
-(defun company-safe-substring (str from &optional to)
-  (if (> from (string-width str))
-      ""
-    (with-temp-buffer
-      (insert str)
-      (move-to-column from)
-      (let ((beg (point)))
-        (if to
-            (progn
-              (move-to-column to)
-              (concat (buffer-substring beg (point))
-                      (let ((padding (- to (current-column))))
-                        (when (> padding 0)
-                          (company-space-string padding)))))
-          (buffer-substring beg (point-max)))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-last-metadata nil)
-
-(defun company-fetch-metadata ()
-  (let ((selected (nth company-selection company-candidates)))
-    (unless (eq selected (car company-last-metadata))
-      (setq company-last-metadata
-            (cons selected (company-call-backend 'meta selected))))
-    (cdr company-last-metadata)))
-
-(defun company-doc-buffer (&optional string)
-  (with-current-buffer (get-buffer-create "*company-documentation*")
-    (erase-buffer)
-    (when string
-      (save-excursion
-        (insert string)))
-    (current-buffer)))
-
-(defvar company--electric-commands
-  '(scroll-other-window scroll-other-window-down mwheel-scroll)
-  "List of Commands that won't break out of electric commands.")
-
-(defmacro company--electric-do (&rest body)
-  (declare (indent 0) (debug t))
-  `(when (company-manual-begin)
-     (save-window-excursion
-       (let ((height (window-height))
-             (row (company--row))
-             cmd)
-         ,@body
-         (and (< (window-height) height)
-              (< (- (window-height) row 2) company-tooltip-limit)
-              (recenter (- (window-height) row 2)))
-         (while (memq (setq cmd (key-binding (read-key-sequence-vector nil)))
-                      company--electric-commands)
-           (condition-case err
-               (call-interactively cmd)
-             ((beginning-of-buffer end-of-buffer)
-              (message (error-message-string err)))))
-         (company--unread-last-input)))))
-
-(defun company--unread-last-input ()
-  (when last-input-event
-    (clear-this-command-keys t)
-    (setq unread-command-events (list last-input-event))))
-
-(defun company-show-doc-buffer ()
-  "Temporarily show the documentation buffer for the selection."
-  (interactive)
-  (let (other-window-scroll-buffer)
-    (company--electric-do
-      (let* ((selected (nth company-selection company-candidates))
-             (doc-buffer (or (company-call-backend 'doc-buffer selected)
-                             (error "No documentation available")))
-             start)
-        (when (consp doc-buffer)
-          (setq start (cdr doc-buffer)
-                doc-buffer (car doc-buffer)))
-        (setq other-window-scroll-buffer (get-buffer doc-buffer))
-        (let ((win (display-buffer doc-buffer t)))
-          (set-window-start win (if start start (point-min))))))))
-(put 'company-show-doc-buffer 'company-keep t)
-
-(defun company-show-location ()
-  "Temporarily display a buffer showing the selected candidate in context."
-  (interactive)
-  (let (other-window-scroll-buffer)
-    (company--electric-do
-      (let* ((selected (nth company-selection company-candidates))
-             (location (company-call-backend 'location selected))
-             (pos (or (cdr location) (error "No location available")))
-             (buffer (or (and (bufferp (car location)) (car location))
-                         (find-file-noselect (car location) t))))
-        (setq other-window-scroll-buffer (get-buffer buffer))
-        (with-selected-window (display-buffer buffer t)
-          (save-restriction
-            (widen)
-            (if (bufferp (car location))
-                (goto-char pos)
-              (goto-char (point-min))
-              (forward-line (1- pos))))
-          (set-window-start nil (point)))))))
-(put 'company-show-location 'company-keep t)
-
-;;; package functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-callback nil)
-
-(defun company-remove-callback (&optional ignored)
-  (remove-hook 'company-completion-finished-hook company-callback t)
-  (remove-hook 'company-completion-cancelled-hook 'company-remove-callback t)
-  (remove-hook 'company-completion-finished-hook 'company-remove-callback t))
-
-(defun company-begin-backend (backend &optional callback)
-  "Start a completion at point using BACKEND."
-  (interactive (let ((val (completing-read "Company back-end: "
-                                           obarray
-                                           'functionp nil "company-")))
-                 (when val
-                   (list (intern val)))))
-  (when (setq company-callback callback)
-    (add-hook 'company-completion-finished-hook company-callback nil t))
-  (add-hook 'company-completion-cancelled-hook 'company-remove-callback nil t)
-  (add-hook 'company-completion-finished-hook 'company-remove-callback nil t)
-  (setq company-backend backend)
-  ;; Return non-nil if active.
-  (or (company-manual-begin)
-      (error "Cannot complete at point")))
-
-(defun company-begin-with (candidates
-                           &optional prefix-length require-match callback)
-  "Start a completion at point.
-CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length
-of the prefix that already is in the buffer before point.
-It defaults to 0.
-
-CALLBACK is a function called with the selected result if the user
-successfully completes the input.
-
-Example: \(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
-  (let ((begin-marker (copy-marker (point) t)))
-    (company-begin-backend
-     (lambda (command &optional arg &rest ignored)
-       (pcase command
-         (`prefix
-          (when (equal (point) (marker-position begin-marker))
-            (buffer-substring (- (point) (or prefix-length 0)) (point))))
-         (`candidates
-          (all-completions arg candidates))
-         (`require-match
-          require-match)))
-     callback)))
-
-(defun company-version (&optional show-version)
-  "Get the Company version as string.
-
-If SHOW-VERSION is non-nil, show the version in the echo area."
-  (interactive (list t))
-  (with-temp-buffer
-    (require 'find-func)
-    (insert-file-contents (find-library-name "company"))
-    (require 'lisp-mnt)
-    (if show-version
-        (message "Company version: %s" (lm-version))
-      (lm-version))))
-
-(defun company-diag ()
-  "Pop a buffer with information about completions at point."
-  (interactive)
-  (let* ((bb company-backends)
-         backend
-         (prefix (cl-loop for b in bb
-                          thereis (let ((company-backend b))
-                                    (setq backend b)
-                                    (company-call-backend 'prefix))))
-         cc annotations)
-    (when (stringp prefix)
-      (let ((company-backend backend))
-        (setq cc (company-call-backend 'candidates prefix)
-              annotations
-              (mapcar
-               (lambda (c) (cons c (company-call-backend 'annotation c)))
-               cc))))
-    (pop-to-buffer (get-buffer-create "*company-diag*"))
-    (setq buffer-read-only nil)
-    (erase-buffer)
-    (insert (format "Emacs %s (%s) of %s on %s"
-                    emacs-version system-configuration
-                    (format-time-string "%Y-%m-%d" emacs-build-time)
-                    emacs-build-system))
-    (insert "\nCompany " (company-version) "\n\n")
-    (insert "company-backends: " (pp-to-string bb))
-    (insert "\n")
-    (insert "Used backend: " (pp-to-string backend))
-    (insert "\n")
-    (insert "Prefix: " (pp-to-string prefix))
-    (insert "\n")
-    (insert (message  "Completions:"))
-    (unless cc (insert " none"))
-    (save-excursion
-      (dolist (c annotations)
-        (insert "\n  " (prin1-to-string (car c)))
-        (when (cdr c)
-          (insert " " (prin1-to-string (cdr c))))))
-    (special-mode)))
-
-;;; pseudo-tooltip ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-pseudo-tooltip-overlay nil)
-
-(defvar-local company-tooltip-offset 0)
-
-(defun company-tooltip--lines-update-offset (selection num-lines limit)
-  (cl-decf limit 2)
-  (setq company-tooltip-offset
-        (max (min selection company-tooltip-offset)
-             (- selection -1 limit)))
-
-  (when (<= company-tooltip-offset 1)
-    (cl-incf limit)
-    (setq company-tooltip-offset 0))
-
-  (when (>= company-tooltip-offset (- num-lines limit 1))
-    (cl-incf limit)
-    (when (= selection (1- num-lines))
-      (cl-decf company-tooltip-offset)
-      (when (<= company-tooltip-offset 1)
-        (setq company-tooltip-offset 0)
-        (cl-incf limit))))
-
-  limit)
-
-(defun company-tooltip--simple-update-offset (selection _num-lines limit)
-  (setq company-tooltip-offset
-        (if (< selection company-tooltip-offset)
-            selection
-          (max company-tooltip-offset
-               (- selection limit -1)))))
-
-;;; propertize
-
-(defsubst company-round-tab (arg)
-  (* (/ (+ arg tab-width) tab-width) tab-width))
-
-(defun company-plainify (str)
-  (let ((prefix (get-text-property 0 'line-prefix str)))
-    (when prefix ; Keep the original value unmodified, for no special reason.
-      (setq str (concat prefix str))
-      (remove-text-properties 0 (length str) '(line-prefix) str)))
-  (let* ((pieces (split-string str "\t"))
-         (copy pieces))
-    (while (cdr copy)
-      (setcar copy (company-safe-substring
-                    (car copy) 0 (company-round-tab (string-width (car copy)))))
-      (pop copy))
-    (apply 'concat pieces)))
-
-(defun company-fill-propertize (value annotation width selected left right)
-  (let* ((margin (length left))
-         (common (or (company-call-backend 'match value)
-                     (if company-common
-                         (string-width company-common)
-                       0)))
-         (ann-ralign company-tooltip-align-annotations)
-         (ann-truncate (< width
-                          (+ (length value) (length annotation)
-                             (if ann-ralign 1 0))))
-         (ann-start (+ margin
-                       (if ann-ralign
-                           (if ann-truncate
-                               (1+ (length value))
-                             (- width (length annotation)))
-                         (length value))))
-         (ann-end (min (+ ann-start (length annotation)) (+ margin width)))
-         (line (concat left
-                       (if (or ann-truncate (not ann-ralign))
-                           (company-safe-substring
-                            (concat value
-                                    (when (and annotation ann-ralign) " ")
-                                    annotation)
-                            0 width)
-                         (concat
-                          (company-safe-substring value 0
-                                                  (- width (length annotation)))
-                          annotation))
-                       right)))
-    (setq common (+ (min common width) margin))
-    (setq width (+ width margin (length right)))
-
-    (add-text-properties 0 width '(face company-tooltip
-                                   mouse-face company-tooltip-mouse)
-                         line)
-    (add-text-properties margin common
-                         '(face company-tooltip-common
-                           mouse-face company-tooltip-mouse)
-                         line)
-    (when (< ann-start ann-end)
-      (add-text-properties ann-start ann-end
-                           '(face company-tooltip-annotation
-                             mouse-face company-tooltip-mouse)
-                           line))
-    (when selected
-      (if (and (not (string= company-search-string ""))
-               (string-match (regexp-quote company-search-string) value
-                             (length company-prefix)))
-          (let ((beg (+ margin (match-beginning 0)))
-                (end (+ margin (match-end 0)))
-                (width (- width (length right))))
-            (when (< beg width)
-              (add-text-properties beg (min end width)
-                                   '(face company-tooltip-search)
-                                   line)))
-        (add-text-properties 0 width '(face company-tooltip-selection
-                                       mouse-face company-tooltip-selection)
-                             line)
-        (add-text-properties margin common
-                             '(face company-tooltip-common-selection
-                               mouse-face company-tooltip-selection)
-                             line)))
-    line))
-
-(defun company--clean-string (str)
-  (replace-regexp-in-string
-   "\\([^[:graph:] ]\\)\\|\\(\ufeff\\)\\|[[:multibyte:]]"
-   (lambda (match)
-     (cond
-      ((match-beginning 1)
-       ;; FIXME: Better char for 'non-printable'?
-       ;; We shouldn't get any of these, but sometimes we might.
-       "\u2017")
-      ((match-beginning 2)
-       ;; Zero-width non-breakable space.
-       "")
-      ((> (string-width match) 1)
-       (concat
-        (make-string (1- (string-width match)) ?\ufeff)
-        match))
-      (t match)))
-   str))
-
-;;; replace
-
-(defun company-buffer-lines (beg end)
-  (goto-char beg)
-  (let (lines lines-moved)
-    (while (and (not (eobp)) ; http://debbugs.gnu.org/19553
-                (> (setq lines-moved (vertical-motion 1)) 0)
-                (<= (point) end))
-      (let ((bound (min end (point))))
-        ;; A visual line can contain several physical lines (e.g. with outline's
-        ;; folding overlay).  Take only the first one.
-        (push (buffer-substring beg
-                                (save-excursion
-                                  (goto-char beg)
-                                  (re-search-forward "$" bound 'move)
-                                  (point)))
-              lines))
-      ;; One physical line can be displayed as several visual ones as well:
-      ;; add empty strings to the list, to even the count.
-      (dotimes (_ (1- lines-moved))
-        (push "" lines))
-      (setq beg (point)))
-    (unless (eq beg end)
-      (push (buffer-substring beg end) lines))
-    (nreverse lines)))
-
-(defun company-modify-line (old new offset)
-  (concat (company-safe-substring old 0 offset)
-          new
-          (company-safe-substring old (+ offset (length new)))))
-
-(defsubst company--length-limit (lst limit)
-  (if (nthcdr limit lst)
-      limit
-    (length lst)))
-
-(defsubst company--window-height ()
-  (if (fboundp 'window-screen-lines)
-      (floor (window-screen-lines))
-    (window-body-height)))
-
-(defun company--window-width ()
-  (let ((ww (window-body-width)))
-    ;; Account for the line continuation column.
-    (when (zerop (cadr (window-fringes)))
-      (cl-decf ww))
-    (unless (or (display-graphic-p)
-                (version< "24.3.1" emacs-version))
-      ;; Emacs 24.3 and earlier included margins
-      ;; in window-width when in TTY.
-      (cl-decf ww
-               (let ((margins (window-margins)))
-                 (+ (or (car margins) 0)
-                    (or (cdr margins) 0)))))
-    (when (and word-wrap
-               (version< emacs-version "24.4.51.5"))
-      ;; http://debbugs.gnu.org/18384
-      (cl-decf ww))
-    ;; whitespace-mode with newline-mark
-    (when (and buffer-display-table
-               (aref buffer-display-table ?\n))
-      (cl-decf ww (1- (length (aref buffer-display-table ?\n)))))
-    ww))
-
-(defun company--replacement-string (lines old column nl &optional align-top)
-  (cl-decf column company-tooltip-margin)
-
-  (when (and align-top company-tooltip-flip-when-above)
-    (setq lines (reverse lines)))
-
-  (let ((width (length (car lines)))
-        (remaining-cols (- (+ (company--window-width) (window-hscroll))
-                           column)))
-    (when (> width remaining-cols)
-      (cl-decf column (- width remaining-cols))))
-
-  (let ((offset (and (< column 0) (- column)))
-        new)
-    (when offset
-      (setq column 0))
-    (when align-top
-      ;; untouched lines first
-      (dotimes (_ (- (length old) (length lines)))
-        (push (pop old) new)))
-    ;; length into old lines.
-    (while old
-      (push (company-modify-line (pop old)
-                                 (company--offset-line (pop lines) offset)
-                                 column)
-            new))
-    ;; Append whole new lines.
-    (while lines
-      (push (concat (company-space-string column)
-                    (company--offset-line (pop lines) offset))
-            new))
-
-    (let ((str (concat (when nl " ")
-                       "\n"
-                       (mapconcat 'identity (nreverse new) "\n")
-                       "\n")))
-      (font-lock-append-text-property 0 (length str) 'face 'default str)
-      (when nl (put-text-property 0 1 'cursor t str))
-      str)))
-
-(defun company--offset-line (line offset)
-  (if (and offset line)
-      (substring line offset)
-    line))
-
-(defun company--create-lines (selection limit)
-  (let ((len company-candidates-length)
-        (window-width (company--window-width))
-        lines
-        width
-        lines-copy
-        items
-        previous
-        remainder
-        scrollbar-bounds)
-
-    ;; Maybe clear old offset.
-    (when (< len (+ company-tooltip-offset limit))
-      (setq company-tooltip-offset 0))
-
-    ;; Scroll to offset.
-    (if (eq company-tooltip-offset-display 'lines)
-        (setq limit (company-tooltip--lines-update-offset selection len limit))
-      (company-tooltip--simple-update-offset selection len limit))
-
-    (cond
-     ((eq company-tooltip-offset-display 'scrollbar)
-      (setq scrollbar-bounds (company--scrollbar-bounds company-tooltip-offset
-                                                        limit len)))
-     ((eq company-tooltip-offset-display 'lines)
-      (when (> company-tooltip-offset 0)
-        (setq previous (format "...(%d)" company-tooltip-offset)))
-      (setq remainder (- len limit company-tooltip-offset)
-            remainder (when (> remainder 0)
-                        (setq remainder (format "...(%d)" remainder))))))
-
-    (cl-decf selection company-tooltip-offset)
-    (setq width (max (length previous) (length remainder))
-          lines (nthcdr company-tooltip-offset company-candidates)
-          len (min limit len)
-          lines-copy lines)
-
-    (cl-decf window-width (* 2 company-tooltip-margin))
-    (when scrollbar-bounds (cl-decf window-width))
-
-    (dotimes (_ len)
-      (let* ((value (pop lines-copy))
-             (annotation (company-call-backend 'annotation value)))
-        (setq value (company--clean-string (company-reformat value)))
-        (when annotation
-          (when company-tooltip-align-annotations
-            ;; `lisp-completion-at-point' adds a space.
-            (setq annotation (comment-string-strip annotation t nil)))
-          (setq annotation (company--clean-string annotation)))
-        (push (cons value annotation) items)
-        (setq width (max (+ (length value)
-                            (if (and annotation company-tooltip-align-annotations)
-                                (1+ (length annotation))
-                              (length annotation)))
-                         width))))
-
-    (setq width (min window-width
-                     (max company-tooltip-minimum-width
-                          (if company-show-numbers
-                              (+ 2 width)
-                            width))))
-
-    (let ((items (nreverse items))
-          (numbered (if company-show-numbers 0 99999))
-          new)
-      (when previous
-        (push (company--scrollpos-line previous width) new))
-
-      (dotimes (i len)
-        (let* ((item (pop items))
-               (str (car item))
-               (annotation (cdr item))
-               (right (company-space-string company-tooltip-margin))
-               (width width))
-          (when (< numbered 10)
-            (cl-decf width 2)
-            (cl-incf numbered)
-            (setq right (concat (format " %d" (mod numbered 10)) right)))
-          (push (concat
-                 (company-fill-propertize str annotation
-                                          width (equal i selection)
-                                          (company-space-string
-                                           company-tooltip-margin)
-                                          right)
-                 (when scrollbar-bounds
-                   (company--scrollbar i scrollbar-bounds)))
-                new)))
-
-      (when remainder
-        (push (company--scrollpos-line remainder width) new))
-
-      (nreverse new))))
-
-(defun company--scrollbar-bounds (offset limit length)
-  (when (> length limit)
-    (let* ((size (ceiling (* limit (float limit)) length))
-           (lower (floor (* limit (float offset)) length))
-           (upper (+ lower size -1)))
-      (cons lower upper))))
-
-(defun company--scrollbar (i bounds)
-  (propertize " " 'face
-              (if (and (>= i (car bounds)) (<= i (cdr bounds)))
-                  'company-scrollbar-fg
-                'company-scrollbar-bg)))
-
-(defun company--scrollpos-line (text width)
-  (propertize (concat (company-space-string company-tooltip-margin)
-                      (company-safe-substring text 0 width)
-                      (company-space-string company-tooltip-margin))
-              'face 'company-tooltip))
-
-;; show
-
-(defun company--pseudo-tooltip-height ()
-  "Calculate the appropriate tooltip height.
-Returns a negative number if the tooltip should be displayed above point."
-  (let* ((lines (company--row))
-         (below (- (company--window-height) 1 lines)))
-    (if (and (< below (min company-tooltip-minimum company-candidates-length))
-             (> lines below))
-        (- (max 3 (min company-tooltip-limit lines)))
-      (max 3 (min company-tooltip-limit below)))))
-
-(defun company-pseudo-tooltip-show (row column selection)
-  (company-pseudo-tooltip-hide)
-  (save-excursion
-
-    (let* ((height (company--pseudo-tooltip-height))
-           above)
-
-      (when (< height 0)
-        (setq row (+ row height -1)
-              above t))
-
-      (let* ((nl (< (move-to-window-line row) row))
-             (beg (point))
-             (end (save-excursion
-                    (move-to-window-line (+ row (abs height)))
-                    (point)))
-             (ov (make-overlay (if nl beg (1- beg)) end nil t))
-             (args (list (mapcar 'company-plainify
-                                 (company-buffer-lines beg end))
-                         column nl above)))
-
-        (setq company-pseudo-tooltip-overlay ov)
-        (overlay-put ov 'company-replacement-args args)
-
-        (let ((lines (company--create-lines selection (abs height))))
-          (overlay-put ov 'company-display
-                       (apply 'company--replacement-string lines args))
-          (overlay-put ov 'company-width (string-width (car lines))))
-
-        (overlay-put ov 'company-column column)
-        (overlay-put ov 'company-height height)))))
-
-(defun company-pseudo-tooltip-show-at-point (pos column-offset)
-  (let* ((col-row (company--col-row pos))
-         (col (- (car col-row) column-offset)))
-    (when (< col 0) (setq col 0))
-    (company-pseudo-tooltip-show (1+ (cdr col-row)) col company-selection)))
-
-(defun company-pseudo-tooltip-edit (selection)
-  (let* ((height (overlay-get company-pseudo-tooltip-overlay 'company-height))
-         (lines  (company--create-lines selection (abs height))))
-    (overlay-put company-pseudo-tooltip-overlay 'company-width
-                 (string-width (car lines)))
-    (overlay-put company-pseudo-tooltip-overlay 'company-display
-                 (apply 'company--replacement-string
-                        lines
-                        (overlay-get company-pseudo-tooltip-overlay
-                                     'company-replacement-args)))))
-
-(defun company-pseudo-tooltip-hide ()
-  (when company-pseudo-tooltip-overlay
-    (delete-overlay company-pseudo-tooltip-overlay)
-    (setq company-pseudo-tooltip-overlay nil)))
-
-(defun company-pseudo-tooltip-hide-temporarily ()
-  (when (overlayp company-pseudo-tooltip-overlay)
-    (overlay-put company-pseudo-tooltip-overlay 'invisible nil)
-    (overlay-put company-pseudo-tooltip-overlay 'after-string nil)))
-
-(defun company-pseudo-tooltip-unhide ()
-  (when company-pseudo-tooltip-overlay
-    (let* ((ov company-pseudo-tooltip-overlay)
-           (disp (overlay-get ov 'company-display)))
-      ;; Beat outline's folding overlays, at least.
-      (overlay-put ov 'priority 1)
-      ;; `display' could be better (http://debbugs.gnu.org/18285), but it
-      ;; doesn't work when the overlay is empty, which is what happens at eob.
-      ;; It also seems to interact badly with `cursor'.
-      ;; We deal with priorities by having the overlay start before the newline.
-      (overlay-put ov 'after-string disp)
-      (overlay-put ov 'invisible t)
-      (overlay-put ov 'window (selected-window)))))
-
-(defun company-pseudo-tooltip-guard ()
-  (cons
-   (save-excursion (beginning-of-visual-line))
-   (let ((ov company-pseudo-tooltip-overlay)
-         (overhang (save-excursion (end-of-visual-line)
-                                   (- (line-end-position) (point)))))
-     (when (>= (overlay-get ov 'company-height) 0)
-       (cons
-        (buffer-substring-no-properties (point) (overlay-start ov))
-        (when (>= overhang 0) overhang))))))
-
-(defun company-pseudo-tooltip-frontend (command)
-  "`company-mode' front-end similar to a tooltip but based on overlays."
-  (cl-case command
-    (pre-command (company-pseudo-tooltip-hide-temporarily))
-    (post-command
-     (unless (when (overlayp company-pseudo-tooltip-overlay)
-              (let* ((ov company-pseudo-tooltip-overlay)
-                     (old-height (overlay-get ov 'company-height))
-                     (new-height (company--pseudo-tooltip-height)))
-                (and
-                 (>= (* old-height new-height) 0)
-                 (>= (abs old-height) (abs new-height))
-                 (equal (company-pseudo-tooltip-guard)
-                        (overlay-get ov 'company-guard)))))
-       ;; Redraw needed.
-       (company-pseudo-tooltip-show-at-point (point) (length company-prefix))
-       (overlay-put company-pseudo-tooltip-overlay
-                    'company-guard (company-pseudo-tooltip-guard)))
-     (company-pseudo-tooltip-unhide))
-    (hide (company-pseudo-tooltip-hide)
-          (setq company-tooltip-offset 0))
-    (update (when (overlayp company-pseudo-tooltip-overlay)
-              (company-pseudo-tooltip-edit company-selection)))))
-
-(defun company-pseudo-tooltip-unless-just-one-frontend (command)
-  "`company-pseudo-tooltip-frontend', but not shown for single candidates."
-  (unless (and (eq command 'post-command)
-               (company--show-inline-p))
-    (company-pseudo-tooltip-frontend command)))
-
-;;; overlay ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-preview-overlay nil)
-
-(defun company-preview-show-at-point (pos)
-  (company-preview-hide)
-
-  (let ((completion (nth company-selection company-candidates)))
-    (setq completion (propertize completion 'face 'company-preview))
-    (add-text-properties 0 (length company-common)
-                         '(face company-preview-common) completion)
-
-    ;; Add search string
-    (and company-search-string
-         (string-match (regexp-quote company-search-string) completion)
-         (add-text-properties (match-beginning 0)
-                              (match-end 0)
-                              '(face company-preview-search)
-                              completion))
-
-    (setq completion (company-strip-prefix completion))
-
-    (and (equal pos (point))
-         (not (equal completion ""))
-         (add-text-properties 0 1 '(cursor 1) completion))
-
-    (let* ((beg pos)
-           (pto company-pseudo-tooltip-overlay)
-           (ptf-workaround (and
-                            pto
-                            (char-before pos)
-                            (eq pos (overlay-start pto)))))
-      ;; Try to accomodate for the pseudo-tooltip overlay,
-      ;; which may start at the same position if it's at eol.
-      (when ptf-workaround
-        (cl-decf beg)
-        (setq completion (concat (buffer-substring beg pos) completion)))
-
-      (setq company-preview-overlay (make-overlay beg pos))
-
-      (let ((ov company-preview-overlay))
-        (overlay-put ov (if ptf-workaround 'display 'after-string)
-                     completion)
-        (overlay-put ov 'window (selected-window))))))
-
-(defun company-preview-hide ()
-  (when company-preview-overlay
-    (delete-overlay company-preview-overlay)
-    (setq company-preview-overlay nil)))
-
-(defun company-preview-frontend (command)
-  "`company-mode' front-end showing the selection as if it had been inserted."
-  (pcase command
-    (`pre-command (company-preview-hide))
-    (`post-command (company-preview-show-at-point (point)))
-    (`hide (company-preview-hide))))
-
-(defun company-preview-if-just-one-frontend (command)
-  "`company-preview-frontend', but only shown for single candidates."
-  (when (or (not (eq command 'post-command))
-            (company--show-inline-p))
-    (company-preview-frontend command)))
-
-(defun company--show-inline-p ()
-  (and (not (cdr company-candidates))
-       company-common
-       (or (eq (company-call-backend 'ignore-case) 'keep-prefix)
-           (string-prefix-p company-prefix company-common))))
-
-;;; echo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar-local company-echo-last-msg nil)
-
-(defvar company-echo-timer nil)
-
-(defvar company-echo-delay .01)
-
-(defun company-echo-show (&optional getter)
-  (when getter
-    (setq company-echo-last-msg (funcall getter)))
-  (let ((message-log-max nil))
-    (if company-echo-last-msg
-        (message "%s" company-echo-last-msg)
-      (message ""))))
-
-(defun company-echo-show-soon (&optional getter)
-  (company-echo-cancel)
-  (setq company-echo-timer (run-with-timer 0 nil 'company-echo-show getter)))
-
-(defun company-echo-cancel (&optional unset)
-  (when company-echo-timer
-    (cancel-timer company-echo-timer))
-  (when unset
-    (setq company-echo-timer nil)))
-
-(defun company-echo-show-when-idle (&optional getter)
-  (company-echo-cancel)
-  (setq company-echo-timer
-        (run-with-idle-timer company-echo-delay nil 'company-echo-show getter)))
-
-(defun company-echo-format ()
-
-  (let ((limit (window-body-width (minibuffer-window)))
-        (len -1)
-        ;; Roll to selection.
-        (candidates (nthcdr company-selection company-candidates))
-        (i (if company-show-numbers company-selection 99999))
-        comp msg)
-
-    (while candidates
-      (setq comp (company-reformat (pop candidates))
-            len (+ len 1 (length comp)))
-      (if (< i 10)
-          ;; Add number.
-          (progn
-            (setq comp (propertize (format "%d: %s" i comp)
-                                   'face 'company-echo))
-            (cl-incf len 3)
-            (cl-incf i)
-            (add-text-properties 3 (+ 3 (length company-common))
-                                 '(face company-echo-common) comp))
-        (setq comp (propertize comp 'face 'company-echo))
-        (add-text-properties 0 (length company-common)
-                             '(face company-echo-common) comp))
-      (if (>= len limit)
-          (setq candidates nil)
-        (push comp msg)))
-
-    (mapconcat 'identity (nreverse msg) " ")))
-
-(defun company-echo-strip-common-format ()
-
-  (let ((limit (window-body-width (minibuffer-window)))
-        (len (+ (length company-prefix) 2))
-        ;; Roll to selection.
-        (candidates (nthcdr company-selection company-candidates))
-        (i (if company-show-numbers company-selection 99999))
-        msg comp)
-
-    (while candidates
-      (setq comp (company-strip-prefix (pop candidates))
-            len (+ len 2 (length comp)))
-      (when (< i 10)
-        ;; Add number.
-        (setq comp (format "%s (%d)" comp i))
-        (cl-incf len 4)
-        (cl-incf i))
-      (if (>= len limit)
-          (setq candidates nil)
-        (push (propertize comp 'face 'company-echo) msg)))
-
-    (concat (propertize company-prefix 'face 'company-echo-common) "{"
-            (mapconcat 'identity (nreverse msg) ", ")
-            "}")))
-
-(defun company-echo-hide ()
-  (unless (equal company-echo-last-msg "")
-    (setq company-echo-last-msg "")
-    (company-echo-show)))
-
-(defun company-echo-frontend (command)
-  "`company-mode' front-end showing the candidates in the echo area."
-  (pcase command
-    (`post-command (company-echo-show-soon 'company-echo-format))
-    (`hide (company-echo-hide))))
-
-(defun company-echo-strip-common-frontend (command)
-  "`company-mode' front-end showing the candidates in the echo area."
-  (pcase command
-    (`post-command (company-echo-show-soon 'company-echo-strip-common-format))
-    (`hide (company-echo-hide))))
-
-(defun company-echo-metadata-frontend (command)
-  "`company-mode' front-end showing the documentation in the echo area."
-  (pcase command
-    (`post-command (company-echo-show-when-idle 'company-fetch-metadata))
-    (`hide (company-echo-hide))))
-
-(provide 'company)
-;;; company.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-abbrev.el b/emacs.d/elpa/company-20160117.321/company-abbrev.el
new file mode 100644
index 0000000..24ec3b7
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-abbrev.el
@@ -0,0 +1,50 @@
+;;; company-abbrev.el --- company-mode completion backend for abbrev
+
+;; Copyright (C) 2009-2011, 2015  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+(require 'abbrev)
+
+(defun company-abbrev-insert (match)
+  "Replace MATCH with the expanded abbrev."
+  (expand-abbrev))
+
+;;;###autoload
+(defun company-abbrev (command &optional arg &rest ignored)
+  "`company-mode' completion backend for abbrev."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-abbrev
+                                        'company-abbrev-insert))
+    (prefix (company-grab-symbol))
+    (candidates (nconc
+                 (delete "" (all-completions arg global-abbrev-table))
+                 (delete "" (all-completions arg local-abbrev-table))))
+    (meta (abbrev-expansion arg))))
+
+(provide 'company-abbrev)
+;;; company-abbrev.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-autoloads.el b/emacs.d/elpa/company-20160117.321/company-autoloads.el
new file mode 100644
index 0000000..b5f9a9e
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-autoloads.el
@@ -0,0 +1,284 @@
+;;; company-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "company" "company.el" (22171 46580 0 0))
+;;; Generated autoloads from company.el
+
+(autoload 'company-mode "company" "\
+\"complete anything\"; is an in-buffer completion framework.
+Completion starts automatically, depending on the values
+`company-idle-delay' and `company-minimum-prefix-length'.
+
+Completion can be controlled with the commands:
+`company-complete-common', `company-complete-selection', `company-complete',
+`company-select-next', `company-select-previous'.  If these commands are
+called before `company-idle-delay', completion will also start.
+
+Completions can be searched with `company-search-candidates' or
+`company-filter-candidates'.  These can be used while completion is
+inactive, as well.
+
+The completion data is retrieved using `company-backends' and displayed
+using `company-frontends'.  If you want to start a specific backend, call
+it interactively or use `company-begin-backend'.
+
+By default, the completions list is sorted alphabetically, unless the
+backend chooses otherwise, or `company-transformers' changes it later.
+
+regular keymap (`company-mode-map'):
+
+\\{company-mode-map}
+keymap during active completions (`company-active-map'):
+
+\\{company-active-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-company-mode nil "\
+Non-nil if Global-Company mode is enabled.
+See the command `global-company-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-company-mode'.")
+
+(custom-autoload 'global-company-mode "company" nil)
+
+(autoload 'global-company-mode "company" "\
+Toggle Company mode in all buffers.
+With prefix ARG, enable Global-Company mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Company mode is enabled in all buffers where
+`company-mode-on' would do it.
+See `company-mode' for more information on Company mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-abbrev" "company-abbrev.el" (22171
+;;;;;;  46580 0 0))
+;;; Generated autoloads from company-abbrev.el
+
+(autoload 'company-abbrev "company-abbrev" "\
+`company-mode' completion backend for abbrev.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-bbdb" "company-bbdb.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-bbdb.el
+
+(autoload 'company-bbdb "company-bbdb" "\
+`company-mode' completion backend for BBDB.
+
+\(fn COMMAND &optional ARG &rest IGNORE)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-css" "company-css.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-css.el
+
+(autoload 'company-css "company-css" "\
+`company-mode' completion backend for `css-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-dabbrev" "company-dabbrev.el" (22171
+;;;;;;  46580 0 0))
+;;; Generated autoloads from company-dabbrev.el
+
+(autoload 'company-dabbrev "company-dabbrev" "\
+dabbrev-like `company-mode' completion backend.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-dabbrev-code" "company-dabbrev-code.el"
+;;;;;;  (22171 46580 0 0))
+;;; Generated autoloads from company-dabbrev-code.el
+
+(autoload 'company-dabbrev-code "company-dabbrev-code" "\
+dabbrev-like `company-mode' backend for code.
+The backend looks for all symbols in the current buffer that aren't in
+comments or strings.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-elisp" "company-elisp.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-elisp.el
+
+(autoload 'company-elisp "company-elisp" "\
+`company-mode' completion backend for Emacs Lisp.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-etags" "company-etags.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-etags.el
+
+(autoload 'company-etags "company-etags" "\
+`company-mode' completion backend for etags.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-files" "company-files.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-files.el
+
+(autoload 'company-files "company-files" "\
+`company-mode' completion backend existing file names.
+Completions works for proper absolute and relative files paths.
+File paths with spaces are only supported inside strings.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-gtags" "company-gtags.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-gtags.el
+
+(autoload 'company-gtags "company-gtags" "\
+`company-mode' completion backend for GNU Global.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-ispell" "company-ispell.el" (22171
+;;;;;;  46580 0 0))
+;;; Generated autoloads from company-ispell.el
+
+(autoload 'company-ispell "company-ispell" "\
+`company-mode' completion backend using Ispell.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-keywords" "company-keywords.el" (22171
+;;;;;;  46580 0 0))
+;;; Generated autoloads from company-keywords.el
+
+(autoload 'company-keywords "company-keywords" "\
+`company-mode' backend for programming language keywords.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-nxml" "company-nxml.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-nxml.el
+
+(autoload 'company-nxml "company-nxml" "\
+`company-mode' completion backend for `nxml-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-oddmuse" "company-oddmuse.el" (22171
+;;;;;;  46580 0 0))
+;;; Generated autoloads from company-oddmuse.el
+
+(autoload 'company-oddmuse "company-oddmuse" "\
+`company-mode' completion backend for `oddmuse-mode'.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-semantic" "company-semantic.el" (22171
+;;;;;;  46580 0 0))
+;;; Generated autoloads from company-semantic.el
+
+(autoload 'company-semantic "company-semantic" "\
+`company-mode' completion backend using CEDET Semantic.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-tempo" "company-tempo.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-tempo.el
+
+(autoload 'company-tempo "company-tempo" "\
+`company-mode' completion backend for tempo.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-xcode" "company-xcode.el" (22171 46580
+;;;;;;  0 0))
+;;; Generated autoloads from company-xcode.el
+
+(autoload 'company-xcode "company-xcode" "\
+`company-mode' completion backend for Xcode projects.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "company-yasnippet" "company-yasnippet.el"
+;;;;;;  (22171 46580 0 0))
+;;; Generated autoloads from company-yasnippet.el
+
+(autoload 'company-yasnippet "company-yasnippet" "\
+`company-mode' backend for `yasnippet'.
+
+This backend should be used with care, because as long as there are
+snippets defined for the current major mode, this backend will always
+shadow backends that come after it.  Recommended usages:
+
+* In a buffer-local value of `company-backends', grouped with a backend or
+  several that provide actual text completions.
+
+  (add-hook 'js-mode-hook
+            (lambda ()
+              (set (make-local-variable 'company-backends)
+                   '((company-dabbrev-code company-yasnippet)))))
+
+* After keyword `:with', grouped with other backends.
+
+  (push '(company-semantic :with company-yasnippet) company-backends)
+
+* Not in `company-backends', just bound to a key.
+
+  (global-set-key (kbd \"C-c y\") 'company-yasnippet)
+
+\(fn COMMAND &optional ARG &rest IGNORE)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("company-capf.el" "company-clang.el" "company-cmake.el"
+;;;;;;  "company-eclim.el" "company-pkg.el" "company-template.el")
+;;;;;;  (22171 46580 491198 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; company-autoloads.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-bbdb.el b/emacs.d/elpa/company-20160117.321/company-bbdb.el
new file mode 100644
index 0000000..36307d0
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-bbdb.el
@@ -0,0 +1,61 @@
+;;; company-bbdb.el --- company-mode completion backend for BBDB in message-mode
+
+;; Copyright (C) 2013-2014, 2016  Free Software Foundation, Inc.
+
+;; Author: Jan Tatarik <jan.tatarik@gmail.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company)
+(require 'cl-lib)
+
+(declare-function bbdb-record-get-field "bbdb")
+(declare-function bbdb-records "bbdb")
+(declare-function bbdb-dwim-mail "bbdb-com")
+(declare-function bbdb-search "bbdb-com")
+
+(defgroup company-bbdb nil
+  "Completion backend for BBDB."
+  :group 'company)
+
+(defcustom company-bbdb-modes '(message-mode)
+  "Major modes in which `company-bbdb' may complete."
+  :type '(repeat (symbol :tag "Major mode"))
+  :package-version '(company . "0.8.8"))
+
+(defun company-bbdb--candidates (arg)
+  (cl-mapcan (lambda (record)
+               (mapcar (lambda (mail) (bbdb-dwim-mail record mail))
+                       (bbdb-record-get-field record 'mail)))
+             (eval '(bbdb-search (bbdb-records) arg nil arg))))
+
+;;;###autoload
+(defun company-bbdb (command &optional arg &rest ignore)
+  "`company-mode' completion backend for BBDB."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-bbdb))
+    (prefix (and (memq major-mode company-bbdb-modes)
+                 (featurep 'bbdb-com)
+                 (looking-back "^\\(To\\|Cc\\|Bcc\\): *.*?\\([^,; ]*\\)"
+                               (line-beginning-position))
+                 (match-string-no-properties 2)))
+    (candidates (company-bbdb--candidates arg))
+    (sorted t)
+    (no-cache t)))
+
+(provide 'company-bbdb)
+;;; company-bbdb.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-capf.el b/emacs.d/elpa/company-20160117.321/company-capf.el
new file mode 100644
index 0000000..6554782
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-capf.el
@@ -0,0 +1,170 @@
+;;; company-capf.el --- company-mode completion-at-point-functions backend -*- lexical-binding: t -*-
+
+;; Copyright (C) 2013-2016  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defvar company--capf-cache nil)
+
+(defun company--capf-data ()
+  (let ((cache company--capf-cache))
+    (if (and (equal (current-buffer) (car cache))
+             (equal (point) (car (setq cache (cdr cache))))
+             (equal (buffer-chars-modified-tick) (car (setq cache (cdr cache)))))
+        (cadr cache)
+      (let ((data (company--capf-data-real)))
+        (setq company--capf-cache
+              (list (current-buffer) (point) (buffer-chars-modified-tick) data))
+        data))))
+
+(defun company--capf-data-real ()
+  (cl-letf* (((default-value 'completion-at-point-functions)
+              ;; Ignore tags-completion-at-point-function because it subverts
+              ;; company-etags in the default value of company-backends, where
+              ;; the latter comes later.
+              (remove 'tags-completion-at-point-function
+                      (default-value 'completion-at-point-functions)))
+             (completion-at-point-functions (company--capf-workaround))
+             (data (run-hook-wrapped 'completion-at-point-functions
+                                     ;; Ignore misbehaving functions.
+                                     #'completion--capf-wrapper 'optimist)))
+    (when (and (consp (cdr data)) (integer-or-marker-p (nth 1 data))) data)))
+
+(declare-function python-shell-get-process "python")
+
+(defun company--capf-workaround ()
+  ;; For http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18067
+  (if (or (not (listp completion-at-point-functions))
+          (not (memq 'python-completion-complete-at-point completion-at-point-functions))
+          (python-shell-get-process))
+      completion-at-point-functions
+    (remq 'python-completion-complete-at-point completion-at-point-functions)))
+
+(defun company-capf (command &optional arg &rest _args)
+  "`company-mode' backend using `completion-at-point-functions'."
+  (interactive (list 'interactive))
+  (pcase command
+    (`interactive (company-begin-backend 'company-capf))
+    (`prefix
+     (let ((res (company--capf-data)))
+       (when res
+         (let* ((f (plist-get (nthcdr 4 res) :company-prefix-length))
+                (beg (nth 1 res))
+                (end (nth 2 res))
+                (length (and f (funcall f beg (point))))
+                (prefix (buffer-substring-no-properties beg (point))))
+           (cond
+            ((> end (point)) 'stop)
+            (length (cons prefix length))
+            (t prefix))))))
+    (`candidates
+     (let ((res (company--capf-data)))
+       (when res
+         (let* ((table (nth 3 res))
+                (pred (plist-get (nthcdr 4 res) :predicate))
+                (meta (completion-metadata
+                      (buffer-substring (nth 1 res) (nth 2 res))
+                      table pred))
+                (sortfun (cdr (assq 'display-sort-function meta)))
+                (candidates (completion-all-completions arg table pred (length arg)))
+                (last (last candidates))
+                (base-size (and (numberp (cdr last)) (cdr last))))
+           (when base-size
+             (setcdr last nil))
+           (when sortfun
+             (setq candidates (funcall sortfun candidates)))
+           (if (not (zerop (or base-size 0)))
+               (let ((before (substring arg 0 base-size)))
+                 (mapcar (lambda (candidate)
+                           (concat before candidate))
+                         candidates))
+             candidates)))))
+    (`sorted
+     (let ((res (company--capf-data)))
+       (when res
+         (let ((meta (completion-metadata
+                      (buffer-substring (nth 1 res) (nth 2 res))
+                      (nth 3 res) (plist-get (nthcdr 4 res) :predicate))))
+           (cdr (assq 'display-sort-function meta))))))
+    (`match
+     ;; Can't just use 0 when base-size (see above) is non-zero.
+     (let ((start (if (get-text-property 0 'font-lock-face arg)
+                      0
+                    (next-single-property-change 0 'font-lock-face arg))))
+       (when start
+         ;; completions-common-part comes first, but we can't just look for this
+         ;; value because it can be in a list.
+         (or
+          (let ((value (get-text-property start 'font-lock-face arg)))
+            (text-property-not-all start (length arg)
+                                   'font-lock-face value arg))
+          (length arg)))))
+    (`duplicates t)
+    (`no-cache t)   ;Not much can be done here, as long as we handle
+                    ;non-prefix matches.
+    (`meta
+     (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-docsig)))
+       (when f (funcall f arg))))
+    (`doc-buffer
+     (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-doc-buffer)))
+       (when f (funcall f arg))))
+    (`location
+     (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-location)))
+       (when f (funcall f arg))))
+    (`annotation
+     (save-excursion
+       ;; FIXME: `company-begin' sets `company-point' after calling
+       ;; `company--begin-new'.  We shouldn't rely on `company-point' here,
+       ;; better to cache the capf-data value instead.  However: we can't just
+       ;; save the last capf-data value in `prefix', because that command can
+       ;; get called more often than `candidates', and at any point in the
+       ;; buffer (https://github.com/company-mode/company-mode/issues/153).
+       ;; We could try propertizing the returned prefix string, but it's not
+       ;; passed to `annotation', and `company-prefix' is set only after
+       ;; `company--strip-duplicates' is called.
+       (when company-point
+         (goto-char company-point))
+       (let ((f (plist-get (nthcdr 4 (company--capf-data)) :annotation-function)))
+         (when f (funcall f arg)))))
+    (`require-match
+     (plist-get (nthcdr 4 (company--capf-data)) :company-require-match))
+    (`init nil)      ;Don't bother: plenty of other ways to initialize the code.
+    (`post-completion
+     (let* ((res (company--capf-data))
+            (exit-function (plist-get (nthcdr 4 res) :exit-function))
+            (table (nth 3 res))
+            (pred (plist-get (nthcdr 4 res) :predicate)))
+       (if exit-function
+           ;; Follow the example of `completion--done'.
+           (funcall exit-function arg
+                    (if (eq (try-completion arg table pred) t)
+                        'finished 'sole)))))
+    ))
+
+(provide 'company-capf)
+
+;;; company-capf.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-clang.el b/emacs.d/elpa/company-20160117.321/company-clang.el
new file mode 100644
index 0000000..54d4b9b
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-clang.el
@@ -0,0 +1,331 @@
+;;; company-clang.el --- company-mode completion backend for Clang  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2009, 2011, 2013-2016  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'company-template)
+(require 'cl-lib)
+
+(defgroup company-clang nil
+  "Completion backend for Clang."
+  :group 'company)
+
+(defcustom company-clang-executable
+  (executable-find "clang")
+  "Location of clang executable."
+  :type 'file)
+
+(defcustom company-clang-begin-after-member-access t
+  "When non-nil, automatic completion will start whenever the current
+symbol is preceded by \".\", \"->\" or \"::\", ignoring
+`company-minimum-prefix-length'.
+
+If `company-begin-commands' is a list, it should include `c-electric-lt-gt'
+and `c-electric-colon', for automatic completion right after \">\" and
+\":\".")
+
+(defcustom company-clang-arguments nil
+  "Additional arguments to pass to clang when completing.
+Prefix files (-include ...) can be selected with `company-clang-set-prefix'
+or automatically through a custom `company-clang-prefix-guesser'."
+  :type '(repeat (string :tag "Argument")))
+
+(defcustom company-clang-prefix-guesser 'company-clang-guess-prefix
+  "A function to determine the prefix file for the current buffer."
+  :type '(function :tag "Guesser function" nil))
+
+(defvar company-clang-modes '(c-mode c++-mode objc-mode)
+  "Major modes which clang may complete.")
+
+(defcustom company-clang-insert-arguments t
+  "When non-nil, insert function arguments as a template after completion."
+  :type 'boolean
+  :package-version '(company . "0.8.0"))
+
+;; prefix ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-clang--prefix nil)
+
+(defsubst company-clang--guess-pch-file (file)
+  (let ((dir (directory-file-name (file-name-directory file))))
+    (when (equal (file-name-nondirectory dir) "Classes")
+      (setq dir (file-name-directory dir)))
+    (car (directory-files dir t "\\([^.]h\\|[^h]\\).pch\\'" t))))
+
+(defsubst company-clang--file-substring (file beg end)
+  (with-temp-buffer
+    (insert-file-contents-literally file nil beg end)
+    (buffer-string)))
+
+(defun company-clang-guess-prefix ()
+  "Try to guess the prefix file for the current buffer."
+  ;; Prefixes seem to be called .pch.  Pre-compiled headers do, too.
+  ;; So we look at the magic number to rule them out.
+  (let* ((file (company-clang--guess-pch-file buffer-file-name))
+         (magic-number (and file (company-clang--file-substring file 0 4))))
+    (unless (member magic-number '("CPCH" "gpch"))
+      file)))
+
+(defun company-clang-set-prefix (&optional prefix)
+  "Use PREFIX as a prefix (-include ...) file for clang completion."
+  (interactive (let ((def (funcall company-clang-prefix-guesser)))
+     (unless (stringp def)
+       (setq def default-directory))
+     (list (read-file-name "Prefix file: "
+                           (when def (file-name-directory def))
+                           def t (when def (file-name-nondirectory def))))))
+  ;; TODO: pre-compile?
+  (setq company-clang--prefix (and (stringp prefix)
+                                   (file-regular-p prefix)
+                                   prefix)))
+
+;; Clean-up on exit.
+(add-hook 'kill-emacs-hook 'company-clang-set-prefix)
+
+;; parsing ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; TODO: Handle Pattern (syntactic hints would be neat).
+;; Do we ever see OVERLOAD (or OVERRIDE)?
+(defconst company-clang--completion-pattern
+  "^COMPLETION: \\_<\\(%s[a-zA-Z0-9_:]*\\)\\(?: : \\(.*\\)$\\)?$")
+
+(defconst company-clang--error-buffer-name "*clang-error*")
+
+(defun company-clang--lang-option ()
+     (if (eq major-mode 'objc-mode)
+         (if (string= "m" (file-name-extension buffer-file-name))
+             "objective-c" "objective-c++")
+       (substring (symbol-name major-mode) 0 -5)))
+
+(defun company-clang--parse-output (prefix _objc)
+  (goto-char (point-min))
+  (let ((pattern (format company-clang--completion-pattern
+                         (regexp-quote prefix)))
+        (case-fold-search nil)
+        lines match)
+    (while (re-search-forward pattern nil t)
+      (setq match (match-string-no-properties 1))
+      (unless (equal match "Pattern")
+        (save-match-data
+          (when (string-match ":" match)
+            (setq match (substring match 0 (match-beginning 0)))))
+        (let ((meta (match-string-no-properties 2)))
+          (when (and meta (not (string= match meta)))
+            (put-text-property 0 1 'meta
+                               (company-clang--strip-formatting meta)
+                               match)))
+        (push match lines)))
+    lines))
+
+(defun company-clang--meta (candidate)
+  (get-text-property 0 'meta candidate))
+
+(defun company-clang--annotation (candidate)
+  (let ((ann (company-clang--annotation-1 candidate)))
+    (if (not (and ann (string-prefix-p "(*)" ann)))
+        ann
+      (with-temp-buffer
+        (insert ann)
+        (search-backward ")")
+        (let ((pt (1+ (point))))
+          (re-search-forward ".\\_>" nil t)
+          (delete-region pt (point)))
+        (buffer-string)))))
+
+(defun company-clang--annotation-1 (candidate)
+  (let ((meta (company-clang--meta candidate)))
+    (cond
+     ((null meta) nil)
+     ((string-match "[^:]:[^:]" meta)
+      (substring meta (1+ (match-beginning 0))))
+     ((string-match "\\((.*)[ a-z]*\\'\\)" meta)
+      (let ((paren (match-beginning 1)))
+        (if (not (eq (aref meta (1- paren)) ?>))
+            (match-string 1 meta)
+          (with-temp-buffer
+            (insert meta)
+            (goto-char paren)
+            (substring meta (1- (search-backward "<"))))))))))
+
+(defun company-clang--strip-formatting (text)
+  (replace-regexp-in-string
+   "#]" " "
+   (replace-regexp-in-string "[<{[]#\\|#[>}]" "" text t)
+   t))
+
+(defun company-clang--handle-error (res args)
+  (goto-char (point-min))
+  (let* ((buf (get-buffer-create company-clang--error-buffer-name))
+         (cmd (concat company-clang-executable " " (mapconcat 'identity args " ")))
+         (pattern (format company-clang--completion-pattern ""))
+         (err (if (re-search-forward pattern nil t)
+                  (buffer-substring-no-properties (point-min)
+                                                  (1- (match-beginning 0)))
+                ;; Warn the user more aggressively if no match was found.
+                (message "clang failed with error %d:\n%s" res cmd)
+                (buffer-string))))
+
+    (with-current-buffer buf
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (insert (current-time-string)
+                (format "\nclang failed with error %d:\n" res)
+                cmd "\n\n")
+        (insert err)
+        (setq buffer-read-only t)
+        (goto-char (point-min))))))
+
+(defun company-clang--start-process (prefix callback &rest args)
+  (let ((objc (derived-mode-p 'objc-mode))
+        (buf (get-buffer-create "*clang-output*"))
+        ;; Looks unnecessary in Emacs 25.1 and later.
+        (process-adaptive-read-buffering nil))
+    (if (get-buffer-process buf)
+        (funcall callback nil)
+      (with-current-buffer buf
+        (erase-buffer)
+        (setq buffer-undo-list t))
+      (let ((process (apply #'start-process "company-clang" buf
+                            company-clang-executable args)))
+        (set-process-sentinel
+         process
+         (lambda (proc status)
+           (unless (string-match-p "hangup" status)
+             (funcall
+              callback
+              (let ((res (process-exit-status proc)))
+                (with-current-buffer buf
+                  (unless (eq 0 res)
+                    (company-clang--handle-error res args))
+                  ;; Still try to get any useful input.
+                  (company-clang--parse-output prefix objc)))))))
+        (unless (company-clang--auto-save-p)
+          (send-region process (point-min) (point-max))
+          (send-string process "\n")
+          (process-send-eof process))))))
+
+(defsubst company-clang--build-location (pos)
+  (save-excursion
+    (goto-char pos)
+    (format "%s:%d:%d"
+            (if (company-clang--auto-save-p) buffer-file-name "-")
+            (line-number-at-pos)
+            (1+ (length
+                 (encode-coding-region
+                  (line-beginning-position)
+                  (point)
+                  'utf-8
+                  t))))))
+
+(defsubst company-clang--build-complete-args (pos)
+  (append '("-fsyntax-only" "-Xclang" "-code-completion-macros")
+          (unless (company-clang--auto-save-p)
+            (list "-x" (company-clang--lang-option)))
+          company-clang-arguments
+          (when (stringp company-clang--prefix)
+            (list "-include" (expand-file-name company-clang--prefix)))
+          (list "-Xclang" (format "-code-completion-at=%s"
+                                  (company-clang--build-location pos)))
+          (list (if (company-clang--auto-save-p) buffer-file-name "-"))))
+
+(defun company-clang--candidates (prefix callback)
+  (and (company-clang--auto-save-p)
+       (buffer-modified-p)
+       (basic-save-buffer))
+  (when (null company-clang--prefix)
+    (company-clang-set-prefix (or (funcall company-clang-prefix-guesser)
+                                  'none)))
+  (apply 'company-clang--start-process
+         prefix
+         callback
+         (company-clang--build-complete-args (- (point) (length prefix)))))
+
+(defun company-clang--prefix ()
+  (if company-clang-begin-after-member-access
+      (company-grab-symbol-cons "\\.\\|->\\|::" 2)
+    (company-grab-symbol)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defconst company-clang-required-version 1.1)
+
+(defvar company-clang--version nil)
+
+(defun company-clang--auto-save-p ()
+  (< company-clang--version 2.9))
+
+(defsubst company-clang-version ()
+  "Return the version of `company-clang-executable'."
+  (with-temp-buffer
+    (call-process company-clang-executable nil t nil "--version")
+    (goto-char (point-min))
+    (if (re-search-forward "clang\\(?: version \\|-\\)\\([0-9.]+\\)" nil t)
+        (let ((ver (string-to-number (match-string-no-properties 1))))
+          (if (> ver 100)
+              (/ ver 100)
+            ver))
+      0)))
+
+(defun company-clang (command &optional arg &rest ignored)
+  "`company-mode' completion backend for Clang.
+Clang is a parser for C and ObjC.  Clang version 1.1 or newer is required.
+
+Additional command line arguments can be specified in
+`company-clang-arguments'.  Prefix files (-include ...) can be selected
+with `company-clang-set-prefix' or automatically through a custom
+`company-clang-prefix-guesser'.
+
+With Clang versions before 2.9, we have to save the buffer before
+performing completion.  With Clang 2.9 and later, buffer contents are
+passed via standard input."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-clang))
+    (init (when (memq major-mode company-clang-modes)
+            (unless company-clang-executable
+              (error "Company found no clang executable"))
+            (setq company-clang--version (company-clang-version))
+            (when (< company-clang--version company-clang-required-version)
+              (error "Company requires clang version 1.1"))))
+    (prefix (and (memq major-mode company-clang-modes)
+                 buffer-file-name
+                 company-clang-executable
+                 (not (company-in-string-or-comment))
+                 (or (company-clang--prefix) 'stop)))
+    (candidates (cons :async
+                      (lambda (cb) (company-clang--candidates arg cb))))
+    (meta       (company-clang--meta arg))
+    (annotation (company-clang--annotation arg))
+    (post-completion (let ((anno (company-clang--annotation arg)))
+                       (when (and company-clang-insert-arguments anno)
+                         (insert anno)
+                         (if (string-match "\\`:[^:]" anno)
+                             (company-template-objc-templatify anno)
+                           (company-template-c-like-templatify
+                            (concat arg anno))))))))
+
+(provide 'company-clang)
+;;; company-clang.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-cmake.el b/emacs.d/elpa/company-20160117.321/company-cmake.el
new file mode 100644
index 0000000..010df32
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-cmake.el
@@ -0,0 +1,198 @@
+;;; company-cmake.el --- company-mode completion backend for CMake
+
+;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
+
+;; Author: Chen Bin <chenbin DOT sh AT gmail>
+;; Version: 0.2
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; company-cmake offers completions for module names, variable names and
+;; commands used by CMake.  And their descriptions.
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defgroup company-cmake nil
+  "Completion backend for CMake."
+  :group 'company)
+
+(defcustom company-cmake-executable
+  (executable-find "cmake")
+  "Location of cmake executable."
+  :type 'file)
+
+(defvar company-cmake-executable-arguments
+  '("--help-command-list"
+    "--help-module-list"
+    "--help-variable-list")
+  "The arguments we pass to cmake, separately.
+They affect which types of symbols we get completion candidates for.")
+
+(defvar company-cmake--completion-pattern
+  "^\\(%s[a-zA-Z0-9_<>]%s\\)$"
+  "Regexp to match the candidates.")
+
+(defvar company-cmake-modes '(cmake-mode)
+  "Major modes in which cmake may complete.")
+
+(defvar company-cmake--candidates-cache nil
+  "Cache for the raw candidates.")
+
+(defvar company-cmake--meta-command-cache nil
+  "Cache for command arguments to retrieve descriptions for the candidates.")
+
+(defun company-cmake--replace-tags (rlt)
+  (setq rlt (replace-regexp-in-string
+             "\\(.*?\\(IS_GNU\\)?\\)<LANG>\\(.*\\)"
+             (lambda (_match)
+               (mapconcat 'identity
+                          (if (match-beginning 2)
+                              '("\\1CXX\\3" "\\1C\\3" "\\1G77\\3")
+                            '("\\1CXX\\3" "\\1C\\3" "\\1Fortran\\3"))
+                          "\n"))
+             rlt t))
+  (setq rlt (replace-regexp-in-string
+             "\\(.*\\)<CONFIG>\\(.*\\)"
+             (mapconcat 'identity '("\\1DEBUG\\2" "\\1RELEASE\\2"
+                                    "\\1RELWITHDEBINFO\\2" "\\1MINSIZEREL\\2")
+                        "\n")
+             rlt))
+  rlt)
+
+(defun company-cmake--fill-candidates-cache (arg)
+  "Fill candidates cache if needed."
+  (let (rlt)
+    (unless company-cmake--candidates-cache
+      (setq company-cmake--candidates-cache (make-hash-table :test 'equal)))
+
+    ;; If hash is empty, fill it.
+    (unless (gethash arg company-cmake--candidates-cache)
+      (with-temp-buffer
+        (let ((res (call-process company-cmake-executable nil t nil arg)))
+          (unless (zerop res)
+            (message "cmake executable exited with error=%d" res)))
+        (setq rlt (buffer-string)))
+      (setq rlt (company-cmake--replace-tags rlt))
+      (puthash arg rlt company-cmake--candidates-cache))
+    ))
+
+(defun company-cmake--parse (prefix content cmd)
+  (let ((start 0)
+        (pattern (format company-cmake--completion-pattern
+                         (regexp-quote prefix)
+                         (if (zerop (length prefix)) "+" "*")))
+        (lines (split-string content "\n"))
+        match
+        rlt)
+    (dolist (line lines)
+      (when (string-match pattern line)
+        (let ((match (match-string 1 line)))
+          (when match
+            (puthash match cmd company-cmake--meta-command-cache)
+            (push match rlt)))))
+    rlt))
+
+(defun company-cmake--candidates (prefix)
+  (let (results
+        cmd-opts
+        str)
+
+    (unless company-cmake--meta-command-cache
+      (setq company-cmake--meta-command-cache (make-hash-table :test 'equal)))
+
+    (dolist (arg company-cmake-executable-arguments)
+      (company-cmake--fill-candidates-cache arg)
+      (setq cmd-opts (replace-regexp-in-string "-list$" "" arg) )
+
+      (setq str (gethash arg company-cmake--candidates-cache))
+      (when str
+        (setq results (nconc results
+                             (company-cmake--parse prefix str cmd-opts)))))
+    results))
+
+(defun company-cmake--unexpand-candidate (candidate)
+  (cond
+   ((string-match "^CMAKE_\\(C\\|CXX\\|Fortran\\)\\(_.*\\)$" candidate)
+    (setq candidate (concat "CMAKE_<LANG>" (match-string 2 candidate))))
+
+   ;; C flags
+   ((string-match "^\\(.*_\\)IS_GNU\\(C\\|CXX\\|G77\\)$" candidate)
+    (setq candidate (concat (match-string 1 candidate) "IS_GNU<LANG>")))
+
+   ;; C flags
+   ((string-match "^\\(.*_\\)OVERRIDE_\\(C\\|CXX\\|Fortran\\)$" candidate)
+    (setq candidate (concat (match-string 1 candidate) "OVERRIDE_<LANG>")))
+
+   ((string-match "^\\(.*\\)\\(_DEBUG\\|_RELEASE\\|_RELWITHDEBINFO\\|_MINSIZEREL\\)\\(.*\\)$" candidate)
+    (setq candidate (concat (match-string 1 candidate)
+                            "_<CONFIG>"
+                            (match-string 3 candidate)))))
+  candidate)
+
+(defun company-cmake--meta (candidate)
+  (let ((cmd-opts (gethash candidate company-cmake--meta-command-cache))
+        result)
+    (setq candidate (company-cmake--unexpand-candidate candidate))
+
+    ;; Don't cache the documentation of every candidate (command)
+    ;; Cache in this case will cost too much memory.
+    (with-temp-buffer
+      (call-process company-cmake-executable nil t nil cmd-opts candidate)
+      ;; Go to the third line, trim it and return the result.
+      ;; Tested with cmake 2.8.9.
+      (goto-char (point-min))
+      (forward-line 2)
+      (setq result (buffer-substring-no-properties (line-beginning-position)
+                                                   (line-end-position)))
+      (setq result (replace-regexp-in-string "^[ \t\n\r]+" "" result))
+      result)))
+
+(defun company-cmake--doc-buffer (candidate)
+  (let ((cmd-opts (gethash candidate company-cmake--meta-command-cache)))
+
+    (setq candidate (company-cmake--unexpand-candidate candidate))
+    (with-temp-buffer
+      (call-process company-cmake-executable nil t nil cmd-opts candidate)
+      ;; Go to the third line, trim it and return the doc buffer.
+      ;; Tested with cmake 2.8.9.
+      (goto-char (point-min))
+      (forward-line 2)
+      (company-doc-buffer
+       (buffer-substring-no-properties (line-beginning-position)
+                                       (point-max))))))
+
+(defun company-cmake (command &optional arg &rest ignored)
+  "`company-mode' completion backend for CMake.
+CMake is a cross-platform, open-source make system."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-cmake))
+    (init (when (memq major-mode company-cmake-modes)
+            (unless company-cmake-executable
+              (error "Company found no cmake executable"))))
+    (prefix (and (memq major-mode company-cmake-modes)
+                 (not (company-in-string-or-comment))
+                 (company-grab-symbol)))
+    (candidates (company-cmake--candidates arg))
+    (meta (company-cmake--meta arg))
+    (doc-buffer (company-cmake--doc-buffer arg))
+    ))
+
+(provide 'company-cmake)
+;;; company-cmake.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-css.el b/emacs.d/elpa/company-20160117.321/company-css.el
new file mode 100644
index 0000000..cf8c683
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-css.el
@@ -0,0 +1,442 @@
+;;; company-css.el --- company-mode completion backend for css-mode  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2009, 2011, 2014  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(declare-function web-mode-language-at-pos "web-mode" (&optional pos))
+
+(defconst company-css-property-alist
+  ;; see http://www.w3.org/TR/CSS21/propidx.html
+  '(("azimuth" angle "left-side" "far-left" "left" "center-left" "center"
+     "center-right" "right" "far-right" "right-side" "behind" "leftwards"
+     "rightwards")
+    ("background" background-color background-image background-repeat
+     background-attachment background-position
+     background-clip background-origin background-size)
+    ("background-attachment" "scroll" "fixed")
+    ("background-color" color "transparent")
+    ("background-image" uri "none")
+    ("background-position" percentage length "left" "center" "right" percentage
+     length "top" "center" "bottom" "left" "center" "right" "top" "center"
+     "bottom")
+    ("background-repeat" "repeat" "repeat-x" "repeat-y" "no-repeat")
+    ("border" border-width border-style border-color)
+    ("border-bottom" border)
+    ("border-bottom-color" border-color)
+    ("border-bottom-style" border-style)
+    ("border-bottom-width" border-width)
+    ("border-collapse" "collapse" "separate")
+    ("border-color" color "transparent")
+    ("border-left" border)
+    ("border-left-color" border-color)
+    ("border-left-style" border-style)
+    ("border-left-width" border-width)
+    ("border-right" border)
+    ("border-right-color" border-color)
+    ("border-right-style" border-style)
+    ("border-right-width" border-width)
+    ("border-spacing" length length)
+    ("border-style" border-style)
+    ("border-top" border)
+    ("border-top-color" border-color)
+    ("border-top-style" border-style)
+    ("border-top-width" border-width)
+    ("border-width" border-width)
+    ("bottom" length percentage "auto")
+    ("caption-side" "top" "bottom")
+    ("clear" "none" "left" "right" "both")
+    ("clip" shape "auto")
+    ("color" color)
+    ("content" "normal" "none" string uri counter "attr()" "open-quote"
+     "close-quote" "no-open-quote" "no-close-quote")
+    ("counter-increment" identifier integer "none")
+    ("counter-reset" identifier integer "none")
+    ("cue" cue-before cue-after)
+    ("cue-after" uri "none")
+    ("cue-before" uri "none")
+    ("cursor" uri "*" "auto" "crosshair" "default" "pointer" "move" "e-resize"
+     "ne-resize" "nw-resize" "n-resize" "se-resize" "sw-resize" "s-resize"
+     "w-resize" "text" "wait" "help" "progress")
+    ("direction" "ltr" "rtl")
+    ("display" "inline" "block" "list-item" "run-in" "inline-block" "table"
+     "inline-table" "table-row-group" "table-header-group" "table-footer-group"
+     "table-row" "table-column-group" "table-column" "table-cell"
+     "table-caption" "none")
+    ("elevation" angle "below" "level" "above" "higher" "lower")
+    ("empty-cells" "show" "hide")
+    ("float" "left" "right" "none")
+    ("font" font-style font-weight font-size "/" line-height
+     font-family "caption" "icon" "menu" "message-box" "small-caption"
+     "status-bar" "normal" "small-caps"
+     ;; CSS3
+     font-stretch)
+    ("font-family" family-name generic-family)
+    ("font-size" absolute-size relative-size length percentage)
+    ("font-style" "normal" "italic" "oblique")
+    ("font-weight" "normal" "bold" "bolder" "lighter" "100" "200" "300" "400"
+     "500" "600" "700" "800" "900")
+    ("height" length percentage "auto")
+    ("left" length percentage "auto")
+    ("letter-spacing" "normal" length)
+    ("line-height" "normal" number length percentage)
+    ("list-style" list-style-type list-style-position list-style-image)
+    ("list-style-image" uri "none")
+    ("list-style-position" "inside" "outside")
+    ("list-style-type" "disc" "circle" "square" "decimal" "decimal-leading-zero"
+     "lower-roman" "upper-roman" "lower-greek" "lower-latin" "upper-latin"
+     "armenian" "georgian" "lower-alpha" "upper-alpha" "none")
+    ("margin" margin-width)
+    ("margin-bottom" margin-width)
+    ("margin-left" margin-width)
+    ("margin-right" margin-width)
+    ("margin-top" margin-width)
+    ("max-height" length percentage "none")
+    ("max-width" length percentage "none")
+    ("min-height" length percentage)
+    ("min-width" length percentage)
+    ("orphans" integer)
+    ("outline" outline-color outline-style outline-width)
+    ("outline-color" color "invert")
+    ("outline-style" border-style)
+    ("outline-width" border-width)
+    ("overflow" "visible" "hidden" "scroll" "auto"
+     ;; CSS3:
+     "no-display" "no-content")
+    ("padding" padding-width)
+    ("padding-bottom" padding-width)
+    ("padding-left" padding-width)
+    ("padding-right" padding-width)
+    ("padding-top" padding-width)
+    ("page-break-after" "auto" "always" "avoid" "left" "right")
+    ("page-break-before" "auto" "always" "avoid" "left" "right")
+    ("page-break-inside" "avoid" "auto")
+    ("pause" time percentage)
+    ("pause-after" time percentage)
+    ("pause-before" time percentage)
+    ("pitch" frequency "x-low" "low" "medium" "high" "x-high")
+    ("pitch-range" number)
+    ("play-during" uri "mix" "repeat" "auto" "none")
+    ("position" "static" "relative" "absolute" "fixed")
+    ("quotes" string string "none")
+    ("richness" number)
+    ("right" length percentage "auto")
+    ("speak" "normal" "none" "spell-out")
+    ("speak-header" "once" "always")
+    ("speak-numeral" "digits" "continuous")
+    ("speak-punctuation" "code" "none")
+    ("speech-rate" number "x-slow" "slow" "medium" "fast" "x-fast" "faster"
+     "slower")
+    ("stress" number)
+    ("table-layout" "auto" "fixed")
+    ("text-align" "left" "right" "center" "justify")
+    ("text-indent" length percentage)
+    ("text-transform" "capitalize" "uppercase" "lowercase" "none")
+    ("top" length percentage "auto")
+    ("unicode-bidi" "normal" "embed" "bidi-override")
+    ("vertical-align" "baseline" "sub" "super" "top" "text-top" "middle"
+     "bottom" "text-bottom" percentage length)
+    ("visibility" "visible" "hidden" "collapse")
+    ("voice-family" specific-voice generic-voice "*" specific-voice
+     generic-voice)
+    ("volume" number percentage "silent" "x-soft" "soft" "medium" "loud"
+     "x-loud")
+    ("white-space" "normal" "pre" "nowrap" "pre-wrap" "pre-line")
+    ("widows" integer)
+    ("width" length percentage "auto")
+    ("word-spacing" "normal" length)
+    ("z-index" "auto" integer)
+    ;; CSS3
+    ("align-content" align-stretch "space-between" "space-around")
+    ("align-items" align-stretch "baseline")
+    ("align-self" align-items "auto")
+    ("animation" animation-name animation-duration animation-timing-function
+     animation-delay animation-iteration-count animation-direction
+     animation-fill-mode)
+    ("animation-delay" time)
+    ("animation-direction" "normal" "reverse" "alternate" "alternate-reverse")
+    ("animation-duration" time)
+    ("animation-fill-mode" "none" "forwards" "backwards" "both")
+    ("animation-iteration-count" integer "infinite")
+    ("animation-name" "none")
+    ("animation-play-state" "paused" "running")
+    ("animation-timing-function" transition-timing-function
+     "step-start" "step-end" "steps(,)")
+    ("backface-visibility" "visible" "hidden")
+    ("background-clip" background-origin)
+    ("background-origin" "border-box" "padding-box" "content-box")
+    ("background-size" length percentage "auto" "cover" "contain")
+    ("border-image" border-image-outset border-image-repeat border-image-source
+     border-image-slice border-image-width)
+    ("border-image-outset" length)
+    ("border-image-repeat" "stretch" "repeat" "round" "space")
+    ("border-image-source" uri "none")
+    ("border-image-slice" length)
+    ("border-image-width" length percentage)
+    ("border-radius" length)
+    ("border-top-left-radius" length)
+    ("border-top-right-radius" length)
+    ("border-bottom-left-radius" length)
+    ("border-bottom-right-radius" length)
+    ("box-decoration-break" "slice" "clone")
+    ("box-shadow" length color)
+    ("box-sizing" "content-box" "border-box")
+    ("break-after" "auto" "always" "avoid" "left" "right" "page" "column"
+     "avoid-page" "avoid-column")
+    ("break-before" break-after)
+    ("break-inside" "avoid" "auto")
+    ("columns" column-width column-count)
+    ("column-count" integer)
+    ("column-fill" "auto" "balance")
+    ("column-gap" length "normal")
+    ("column-rule" column-rule-width column-rule-style column-rule-color)
+    ("column-rule-color" color)
+    ("column-rule-style" border-style)
+    ("column-rule-width" border-width)
+    ("column-span" "all" "none")
+    ("column-width" length "auto")
+    ("filter" url "blur()" "brightness()" "contrast()" "drop-shadow()"
+     "grayscale()" "hue-rotate()" "invert()" "opacity()" "saturate()" "sepia()")
+    ("flex" flex-grow flex-shrink flex-basis)
+    ("flex-basis" percentage length "auto")
+    ("flex-direction" "row" "row-reverse" "column" "column-reverse")
+    ("flex-flow" flex-direction flex-wrap)
+    ("flex-grow" number)
+    ("flex-shrink" number)
+    ("flex-wrap" "nowrap" "wrap" "wrap-reverse")
+    ("font-feature-setting" normal string number)
+    ("font-kerning" "auto" "normal" "none")
+    ("font-language-override" "normal" string)
+    ("font-size-adjust" "none" number)
+    ("font-stretch" "normal" "ultra-condensed" "extra-condensed" "condensed"
+     "semi-condensed" "semi-expanded" "expanded" "extra-expanded" "ultra-expanded")
+    ("font-synthesis" "none" "weight" "style")
+    ("font-variant" font-variant-alternates font-variant-caps
+     font-variant-east-asian font-variant-ligatures font-variant-numeric
+     font-variant-position)
+    ("font-variant-alternates" "normal" "historical-forms" "stylistic()"
+     "styleset()" "character-variant()" "swash()" "ornaments()" "annotation()")
+    ("font-variant-caps" "normal" "small-caps" "all-small-caps" "petite-caps"
+     "all-petite-caps" "unicase" "titling-caps")
+    ("font-variant-east-asian" "jis78" "jis83" "jis90" "jis04" "simplified"
+     "traditional" "full-width" "proportional-width" "ruby")
+    ("font-variant-ligatures" "normal" "none" "common-ligatures"
+     "no-common-ligatures" "discretionary-ligatures" "no-discretionary-ligatures"
+     "historical-ligatures" "no-historical-ligatures" "contextual" "no-contextual")
+    ("font-variant-numeric" "normal" "ordinal" "slashed-zero"
+     "lining-nums" "oldstyle-nums" "proportional-nums" "tabular-nums"
+     "diagonal-fractions" "stacked-fractions")
+    ("font-variant-position" "normal" "sub" "super")
+    ("hyphens" "none" "manual" "auto")
+    ("justify-content" align-common "space-between" "space-around")
+    ("line-break" "auto" "loose" "normal" "strict")
+    ("marquee-direction" "forward" "reverse")
+    ("marquee-play-count" integer "infinite")
+    ("marquee-speed" "slow" "normal" "fast")
+    ("marquee-style" "scroll" "slide" "alternate")
+    ("opacity" number)
+    ("order" number)
+    ("outline-offset" length)
+    ("overflow-x" overflow)
+    ("overflow-y" overflow)
+    ("overflow-style" "auto" "marquee-line" "marquee-block")
+    ("overflow-wrap" "normal" "break-word")
+    ("perspective" "none" length)
+    ("perspective-origin" percentage length "left" "center" "right" "top" "bottom")
+    ("resize" "none" "both" "horizontal" "vertical")
+    ("tab-size" integer length)
+    ("text-align-last" "auto" "start" "end" "left" "right" "center" "justify")
+    ("text-decoration" text-decoration-color text-decoration-line text-decoration-style)
+    ("text-decoration-color" color)
+    ("text-decoration-line" "none" "underline" "overline" "line-through" "blink")
+    ("text-decoration-style" "solid" "double" "dotted" "dashed" "wavy")
+    ("text-overflow" "clip" "ellipsis")
+    ("text-shadow" color length)
+    ("text-underline-position" "auto" "under" "left" "right")
+    ("transform" "matrix(,,,,,)" "translate(,)" "translateX()" "translateY()"
+     "scale()" "scaleX()" "scaleY()" "rotate()" "skewX()" "skewY()" "none")
+    ("transform-origin" perspective-origin)
+    ("transform-style" "flat" "preserve-3d")
+    ("transition" transition-property transition-duration
+     transition-timing-function transition-delay)
+    ("transition-delay" time)
+    ("transition-duration" time)
+    ("transition-timing-function"
+     "ease" "linear" "ease-in" "ease-out" "ease-in-out" "cubic-bezier(,,,)")
+    ("transition-property" "none" "all" identifier)
+    ("word-wrap" overflow-wrap)
+    ("word-break" "normal" "break-all" "keep-all"))
+  "A list of CSS properties and their possible values.")
+
+(defconst company-css-value-classes
+  '((absolute-size "xx-small" "x-small" "small" "medium" "large" "x-large"
+                   "xx-large")
+    (align-common "flex-start" "flex-end" "center")
+    (align-stretch align-common "stretch")
+    (border-style "none" "hidden" "dotted" "dashed" "solid" "double" "groove"
+                  "ridge" "inset" "outset")
+    (border-width "thick" "medium" "thin")
+    (color "aqua" "black" "blue" "fuchsia" "gray" "green" "lime" "maroon" "navy"
+           "olive" "orange" "purple" "red" "silver" "teal" "white" "yellow")
+    (counter "counter(,)")
+    (family-name "Courier" "Helvetica" "Times")
+    (generic-family "serif" "sans-serif" "cursive" "fantasy" "monospace")
+    (generic-voice "male" "female" "child")
+    (margin-width "auto") ;; length percentage
+    (relative-size "larger" "smaller")
+    (shape "rect(,,,)")
+    (uri "url()"))
+  "A list of CSS property value classes and their contents.")
+;; missing, because not completable
+;; <angle><frequency><identifier><integer><length><number><padding-width>
+;; <percentage><specific-voice><string><time><uri>
+
+(defconst company-css-html-tags
+  '("a" "abbr" "acronym" "address" "applet" "area" "b" "base" "basefont" "bdo"
+    "big" "blockquote" "body" "br" "button" "caption" "center" "cite" "code"
+    "col" "colgroup" "dd" "del" "dfn" "dir" "div" "dl" "dt" "em" "fieldset"
+    "font" "form" "frame" "frameset" "h1" "h2" "h3" "h4" "h5" "h6" "head" "hr"
+    "html" "i" "iframe" "img" "input" "ins" "isindex" "kbd" "label" "legend"
+    "li" "link" "map" "menu" "meta" "noframes" "noscript" "object" "ol"
+    "optgroup" "option" "p" "param" "pre" "q" "s" "samp" "script" "select"
+    "small" "span" "strike" "strong" "style" "sub" "sup" "table" "tbody" "td"
+    "textarea" "tfoot" "th" "thead" "title" "tr" "tt" "u" "ul" "var"
+    ;; HTML5
+    "section" "article" "aside" "header" "footer" "nav" "figure" "figcaption"
+    "time" "mark" "main")
+  "A list of HTML tags for use in CSS completion.")
+
+(defconst company-css-pseudo-classes
+  '("active" "after" "before" "first" "first-child" "first-letter" "first-line"
+    "focus" "hover" "lang" "left" "link" "right" "visited")
+  "Identifiers for CSS pseudo-elements and pseudo-classes.")
+
+(defconst company-css-property-cache (make-hash-table :size 115 :test 'equal))
+
+(defun company-css-property-values (attribute)
+  "Access the `company-css-property-alist' cached and flattened."
+  (or (gethash attribute company-css-property-cache)
+      (let (results)
+        (dolist (value (cdr (assoc attribute company-css-property-alist)))
+          (if (symbolp value)
+              (dolist (child (or (cdr (assoc value company-css-value-classes))
+                                 (company-css-property-values
+                                  (symbol-name value))))
+                (push child results))
+            (push value results)))
+        (setq results (sort results 'string<))
+        (puthash attribute
+                 (if (fboundp 'delete-consecutive-dups)
+                     (delete-consecutive-dups results)
+                   (delete-dups results))
+                 company-css-property-cache)
+        results)))
+
+;;; bracket detection
+
+(defconst company-css-braces-syntax-table
+  (let ((table (make-syntax-table)))
+    (setf (aref table ?{) '(4 . 125))
+    (setf (aref table ?}) '(5 . 123))
+    table)
+  "A syntax table giving { and } paren syntax.")
+
+(defun company-css-inside-braces-p ()
+  "Return non-nil, if point is within matched { and }."
+  (ignore-errors
+    (with-syntax-table company-css-braces-syntax-table
+      (let ((parse-sexp-ignore-comments t))
+        (scan-lists (point) -1 1)))))
+
+;;; tags
+(defconst company-css-tag-regexp
+  (concat "\\(?:\\`\\|}\\)[[:space:]]*"
+          ;; multiple
+          "\\(?:"
+          ;; previous tags:
+          "\\(?:#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\(?:\\[[^]]*\\]\\)?"
+          ;; space or selectors
+          "\\(?:[[:space:]]+\\|[[:space:]]*[+,>][[:space:]]*\\)"
+          "\\)*"
+          "\\(\\(?:#\\|\\_<[[:alpha:]]\\)\\(?:[[:alnum:]-#]*\\_>\\)?\\_>\\|\\)"
+          "\\=")
+  "A regular expression matching CSS tags.")
+
+;;; pseudo id
+(defconst company-css-pseudo-regexp
+  (concat "\\(?:\\`\\|}\\)[[:space:]]*"
+          ;; multiple
+          "\\(?:"
+          ;; previous tags:
+          "\\(?:#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\(?:\\[[^]]*\\]\\)?"
+          ;; space or delimiters
+          "\\(?:[[:space:]]+\\|[[:space:]]*[+,>][[:space:]]*\\)"
+          "\\)*"
+          "\\(?:\\(?:\\#\\|\\_<[[:alpha:]]\\)[[:alnum:]-#]*\\):"
+          "\\([[:alpha:]-]+\\_>\\|\\)\\_>\\=")
+  "A regular expression matching CSS pseudo classes.")
+
+;;; properties
+
+(defun company-css-grab-property ()
+  "Return the CSS property before point, if any.
+Returns \"\" if no property found, but feasible at this position."
+  (when (company-css-inside-braces-p)
+    (company-grab-symbol)))
+
+;;; values
+(defconst company-css-property-value-regexp
+  "\\_<\\([[:alpha:]-]+\\):\\(?:[^{};]*[[:space:]]+\\)?\\([^{};]*\\_>\\|\\)\\="
+  "A regular expression matching CSS tags.")
+
+;;;###autoload
+(defun company-css (command &optional arg &rest ignored)
+  "`company-mode' completion backend for `css-mode'."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-css))
+    (prefix (and (or (derived-mode-p 'css-mode)
+                     (and (derived-mode-p 'web-mode)
+                          (string= (web-mode-language-at-pos) "css")))
+                 (or (company-grab company-css-tag-regexp 1)
+                     (company-grab company-css-pseudo-regexp 1)
+                     (company-grab company-css-property-value-regexp 2)
+                     (company-css-grab-property))))
+    (candidates
+     (cond
+      ((company-grab company-css-tag-regexp 1)
+       (all-completions arg company-css-html-tags))
+      ((company-grab company-css-pseudo-regexp 1)
+       (all-completions arg company-css-pseudo-classes))
+      ((company-grab company-css-property-value-regexp 2)
+       (all-completions arg
+                        (company-css-property-values
+                         (company-grab company-css-property-value-regexp 1))))
+      ((company-css-grab-property)
+       (all-completions arg company-css-property-alist))))
+    (sorted t)))
+
+(provide 'company-css)
+;;; company-css.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-dabbrev-code.el b/emacs.d/elpa/company-20160117.321/company-dabbrev-code.el
new file mode 100644
index 0000000..9331087
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-dabbrev-code.el
@@ -0,0 +1,104 @@
+;;; company-dabbrev-code.el --- dabbrev-like company-mode backend for code  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2009, 2011, 2014  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'company-dabbrev)
+(require 'cl-lib)
+
+(defgroup company-dabbrev-code nil
+  "dabbrev-like completion backend for code."
+  :group 'company)
+
+(defcustom company-dabbrev-code-modes
+  '(prog-mode
+    batch-file-mode csharp-mode css-mode erlang-mode haskell-mode jde-mode
+    lua-mode python-mode)
+  "Modes that use `company-dabbrev-code'.
+In all these modes (and their derivatives) `company-dabbrev-code' will
+complete only symbols, not text in comments or strings.  In other modes
+`company-dabbrev-code' will pass control to other backends
+\(e.g. `company-dabbrev'\).  Value t means complete in all modes."
+  :type '(choice (repeat :tag "Some modes" (symbol :tag "Major mode"))
+                 (const :tag "All modes" t)))
+
+(defcustom company-dabbrev-code-other-buffers t
+  "Determines whether `company-dabbrev-code' should search other buffers.
+If `all', search all other buffers, except the ignored ones.  If t, search
+buffers with the same major mode.  If `code', search all buffers with major
+modes in `company-dabbrev-code-modes', or derived from one of them.  See
+also `company-dabbrev-code-time-limit'."
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "Same major mode" t)
+                 (const :tag "Code major modes" code)
+                 (const :tag "All" all)))
+
+(defcustom company-dabbrev-code-time-limit .1
+  "Determines how long `company-dabbrev-code' should look for matches."
+  :type '(choice (const :tag "Off" nil)
+                 (number :tag "Seconds")))
+
+(defcustom company-dabbrev-code-everywhere nil
+  "Non-nil to offer completions in comments and strings."
+  :type 'boolean)
+
+(defcustom company-dabbrev-code-ignore-case nil
+  "Non-nil to ignore case when collecting completion candidates."
+  :type 'boolean)
+
+(defun company-dabbrev-code--make-regexp (prefix)
+  (concat "\\_<" (if (equal prefix "")
+                     "\\([a-zA-Z]\\|\\s_\\)"
+                   (regexp-quote prefix))
+          "\\(\\sw\\|\\s_\\)*\\_>"))
+
+;;;###autoload
+(defun company-dabbrev-code (command &optional arg &rest ignored)
+  "dabbrev-like `company-mode' backend for code.
+The backend looks for all symbols in the current buffer that aren't in
+comments or strings."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-dabbrev-code))
+    (prefix (and (or (eq t company-dabbrev-code-modes)
+                     (apply #'derived-mode-p company-dabbrev-code-modes))
+                 (or company-dabbrev-code-everywhere
+                     (not (company-in-string-or-comment)))
+                 (or (company-grab-symbol) 'stop)))
+    (candidates (let ((case-fold-search company-dabbrev-code-ignore-case))
+                  (company-dabbrev--search
+                   (company-dabbrev-code--make-regexp arg)
+                   company-dabbrev-code-time-limit
+                   (pcase company-dabbrev-code-other-buffers
+                     (`t (list major-mode))
+                     (`code company-dabbrev-code-modes)
+                     (`all `all))
+                   t)))
+    (ignore-case company-dabbrev-code-ignore-case)
+    (duplicates t)))
+
+(provide 'company-dabbrev-code)
+;;; company-dabbrev-code.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-dabbrev.el b/emacs.d/elpa/company-20160117.321/company-dabbrev.el
new file mode 100644
index 0000000..37dcecc
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-dabbrev.el
@@ -0,0 +1,188 @@
+;;; company-dabbrev.el --- dabbrev-like company-mode completion backend  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2009, 2011, 2014, 2015  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defgroup company-dabbrev nil
+  "dabbrev-like completion backend."
+  :group 'company)
+
+(defcustom company-dabbrev-other-buffers 'all
+  "Determines whether `company-dabbrev' should search other buffers.
+If `all', search all other buffers, except the ignored ones.  If t, search
+buffers with the same major mode.  See also `company-dabbrev-time-limit'."
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "Same major mode" t)
+                 (const :tag "All" all)))
+
+(defcustom company-dabbrev-ignore-buffers "\\`[ *]"
+  "Regexp matching the names of buffers to ignore."
+  :type 'regexp)
+
+(defcustom company-dabbrev-time-limit .1
+  "Determines how many seconds `company-dabbrev' should look for matches."
+  :type '(choice (const :tag "Off" nil)
+                 (number :tag "Seconds")))
+
+(defcustom company-dabbrev-char-regexp "\\sw"
+  "A regular expression matching the characters `company-dabbrev' looks for."
+  :type 'regexp)
+
+(defcustom company-dabbrev-ignore-case 'keep-prefix
+  "Non-nil to ignore case when collecting completion candidates.
+When it's `keep-prefix', the text before point will remain unchanged after
+candidate is inserted, even some of its characters have different case.")
+
+(defcustom company-dabbrev-downcase 'case-replace
+  "Whether to downcase the returned candidates.
+
+The value of nil means keep them as-is.
+`case-replace' means use the value of `case-replace'.
+Any other value means downcase.
+
+If you set this value to nil, you may also want to set
+`company-dabbrev-ignore-case' to any value other than `keep-prefix'.")
+
+(defcustom company-dabbrev-minimum-length 4
+  "The minimum length for the completion candidate to be included.
+This variable affects both `company-dabbrev' and `company-dabbrev-code'."
+  :type 'integer
+  :package-version '(company . "0.8.3"))
+
+(defcustom company-dabbrev-ignore-invisible nil
+  "Non-nil to skip invisible text."
+  :type 'boolean
+  :package-version '(company . "0.9.0"))
+
+(defmacro company-dabrev--time-limit-while (test start limit &rest body)
+  (declare (indent 3) (debug t))
+  `(let ((company-time-limit-while-counter 0))
+     (catch 'done
+       (while ,test
+         ,@body
+         (and ,limit
+              (eq (cl-incf company-time-limit-while-counter) 25)
+              (setq company-time-limit-while-counter 0)
+              (> (float-time (time-since ,start)) ,limit)
+              (throw 'done 'company-time-out))))))
+
+(defun company-dabbrev--make-regexp (prefix)
+  (concat (if (equal prefix "")
+              (concat "\\(?:" company-dabbrev-char-regexp "\\)")
+            (regexp-quote prefix))
+          "\\(?:" company-dabbrev-char-regexp "\\)*"))
+
+(defun company-dabbrev--search-buffer (regexp pos symbols start limit
+                                       ignore-comments)
+  (save-excursion
+    (cl-labels ((maybe-collect-match
+                 ()
+                 (let ((match (match-string-no-properties 0)))
+                   (when (and (>= (length match) company-dabbrev-minimum-length)
+                              (not (and company-dabbrev-ignore-invisible
+                                        (invisible-p (match-beginning 0)))))
+                     (push match symbols)))))
+      (goto-char (if pos (1- pos) (point-min)))
+      ;; Search before pos.
+      (let ((tmp-end (point)))
+        (company-dabrev--time-limit-while (not (bobp))
+            start limit
+          (ignore-errors
+            (forward-char -10000))
+          (forward-line 0)
+          (save-excursion
+            ;; Before, we used backward search, but it matches non-greedily, and
+            ;; that forced us to use the "beginning/end of word" anchors in
+            ;; `company-dabbrev--make-regexp'.
+            (while (re-search-forward regexp tmp-end t)
+              (if (and ignore-comments (save-match-data (company-in-string-or-comment)))
+                  (re-search-forward "\\s>\\|\\s!\\|\\s\"" tmp-end t)
+                (maybe-collect-match))))
+          (setq tmp-end (point))))
+      (goto-char (or pos (point-min)))
+      ;; Search after pos.
+      (company-dabrev--time-limit-while (re-search-forward regexp nil t)
+          start limit
+        (if (and ignore-comments (save-match-data (company-in-string-or-comment)))
+            (re-search-forward "\\s>\\|\\s!\\|\\s\"" nil t)
+          (maybe-collect-match)))
+      symbols)))
+
+(defun company-dabbrev--search (regexp &optional limit other-buffer-modes
+                                ignore-comments)
+  (let* ((start (current-time))
+         (symbols (company-dabbrev--search-buffer regexp (point) nil start limit
+                                                  ignore-comments)))
+    (when other-buffer-modes
+      (cl-dolist (buffer (delq (current-buffer) (buffer-list)))
+        (with-current-buffer buffer
+          (when (if (eq other-buffer-modes 'all)
+                    (not (string-match-p company-dabbrev-ignore-buffers
+                                         (buffer-name)))
+                  (apply #'derived-mode-p other-buffer-modes))
+            (setq symbols
+                  (company-dabbrev--search-buffer regexp nil symbols start
+                                                  limit ignore-comments))))
+        (and limit
+             (> (float-time (time-since start)) limit)
+             (cl-return))))
+    symbols))
+
+(defun company-dabbrev--prefix ()
+  ;; Not in the middle of a word.
+  (unless (looking-at company-dabbrev-char-regexp)
+    ;; Emacs can't do greedy backward-search.
+    (company-grab-line (format "\\(?:^\\| \\)[^ ]*?\\(\\(?:%s\\)*\\)"
+                               company-dabbrev-char-regexp)
+                       1)))
+
+;;;###autoload
+(defun company-dabbrev (command &optional arg &rest ignored)
+  "dabbrev-like `company-mode' completion backend."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-dabbrev))
+    (prefix (company-dabbrev--prefix))
+    (candidates
+     (let* ((case-fold-search company-dabbrev-ignore-case)
+            (words (company-dabbrev--search (company-dabbrev--make-regexp arg)
+                                            company-dabbrev-time-limit
+                                            (pcase company-dabbrev-other-buffers
+                                              (`t (list major-mode))
+                                              (`all `all))))
+            (downcase-p (if (eq company-dabbrev-downcase 'case-replace)
+                            case-replace
+                          company-dabbrev-downcase)))
+       (if downcase-p
+           (mapcar 'downcase words)
+         words)))
+    (ignore-case company-dabbrev-ignore-case)
+    (duplicates t)))
+
+(provide 'company-dabbrev)
+;;; company-dabbrev.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-eclim.el b/emacs.d/elpa/company-20160117.321/company-eclim.el
new file mode 100644
index 0000000..208daf5
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-eclim.el
@@ -0,0 +1,185 @@
+;;; company-eclim.el --- company-mode completion backend for Eclim
+
+;; Copyright (C) 2009, 2011, 2013, 2015  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Using `emacs-eclim' together with (or instead of) this backend is
+;; recommended, as it allows you to use other Eclim features.
+;;
+;; The alternative backend provided by `emacs-eclim' uses `yasnippet'
+;; instead of `company-template' to expand function calls, and it supports
+;; some languages other than Java.
+
+;;; Code:
+
+(require 'company)
+(require 'company-template)
+(require 'cl-lib)
+
+(defgroup company-eclim nil
+  "Completion backend for Eclim."
+  :group 'company)
+
+(defun company-eclim-executable-find ()
+  (let (file)
+    (cl-dolist (eclipse-root '("/Applications/eclipse" "/usr/lib/eclipse"
+                            "/usr/local/lib/eclipse"))
+      (and (file-exists-p (setq file (expand-file-name "plugins" eclipse-root)))
+           (setq file (car (last (directory-files file t "^org.eclim_"))))
+           (file-exists-p (setq file (expand-file-name "bin/eclim" file)))
+           (cl-return file)))))
+
+(defcustom company-eclim-executable
+  (or (bound-and-true-p eclim-executable)
+      (executable-find "eclim")
+      (company-eclim-executable-find))
+  "Location of eclim executable."
+  :type 'file)
+
+(defcustom company-eclim-auto-save t
+  "Determines whether to save the buffer when retrieving completions.
+eclim can only complete correctly when the buffer has been saved."
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "On" t)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-eclim--project-dir 'unknown)
+
+(defvar-local company-eclim--project-name nil)
+
+(declare-function json-read "json")
+(defvar json-array-type)
+
+(defun company-eclim--call-process (&rest args)
+  (let ((coding-system-for-read 'utf-8)
+        res)
+    (require 'json)
+    (with-temp-buffer
+      (if (= 0 (setq res (apply 'call-process company-eclim-executable nil t nil
+                                "-command" args)))
+          (let ((json-array-type 'list))
+            (goto-char (point-min))
+            (unless (eobp)
+              (json-read)))
+        (message "Company-eclim command failed with error %d:\n%s" res
+                 (buffer-substring (point-min) (point-max)))
+        nil))))
+
+(defun company-eclim--project-list ()
+  (company-eclim--call-process "project_list"))
+
+(defun company-eclim--project-dir ()
+  (if (eq company-eclim--project-dir 'unknown)
+      (setq company-eclim--project-dir
+            (directory-file-name
+             (expand-file-name
+              (locate-dominating-file buffer-file-name ".project"))))
+    company-eclim--project-dir))
+
+(defun company-eclim--project-name ()
+  (or company-eclim--project-name
+      (let ((dir (company-eclim--project-dir)))
+        (when dir
+          (setq company-eclim--project-name
+                (cl-loop for project in (company-eclim--project-list)
+                         when (equal (cdr (assoc 'path project)) dir)
+                         return (cdr (assoc 'name project))))))))
+
+(defun company-eclim--candidates (prefix)
+  (interactive "d")
+  (let ((project-file (file-relative-name buffer-file-name
+                                          (company-eclim--project-dir)))
+        completions)
+    (when company-eclim-auto-save
+      (when (buffer-modified-p)
+        (basic-save-buffer))
+      ;; FIXME: Sometimes this isn't finished when we complete.
+      (company-eclim--call-process "java_src_update"
+                                   "-p" (company-eclim--project-name)
+                                   "-f" project-file))
+    (dolist (item (cdr (assoc 'completions
+                              (company-eclim--call-process
+                               "java_complete" "-p" (company-eclim--project-name)
+                               "-f" project-file
+                               "-o" (number-to-string
+                                     (company-eclim--search-point prefix))
+                               "-e" "utf-8"
+                               "-l" "standard"))))
+      (let* ((meta (cdr (assoc 'info item)))
+             (completion meta))
+        (when (string-match " ?[(:-]" completion)
+          (setq completion (substring completion 0 (match-beginning 0))))
+        (put-text-property 0 1 'meta meta completion)
+        (push completion completions)))
+    (let ((completion-ignore-case nil))
+      (all-completions prefix completions))))
+
+(defun company-eclim--search-point (prefix)
+  (if (or (cl-plusp (length prefix)) (eq (char-before) ?.))
+      (1- (point))
+    (point)))
+
+(defun company-eclim--meta (candidate)
+  (get-text-property 0 'meta candidate))
+
+(defun company-eclim--annotation (candidate)
+  (let ((meta (company-eclim--meta candidate)))
+    (when (string-match "\\(([^-]*\\) -" meta)
+      (substring meta (match-beginning 1) (match-end 1)))))
+
+(defun company-eclim--prefix ()
+  (let ((prefix (company-grab-symbol)))
+    (when prefix
+      ;; Completion candidates for annotations don't include '@'.
+      (when (eq ?@ (string-to-char prefix))
+        (setq prefix (substring prefix 1)))
+      prefix)))
+
+(defun company-eclim (command &optional arg &rest ignored)
+  "`company-mode' completion backend for Eclim.
+Eclim provides access to Eclipse Java IDE features for other editors.
+
+Eclim version 1.7.13 or newer (?) is required.
+
+Completions only work correctly when the buffer has been saved.
+`company-eclim-auto-save' determines whether to do this automatically."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-eclim))
+    (prefix (and (derived-mode-p 'java-mode 'jde-mode)
+                 buffer-file-name
+                 company-eclim-executable
+                 (company-eclim--project-name)
+                 (not (company-in-string-or-comment))
+                 (or (company-eclim--prefix) 'stop)))
+    (candidates (company-eclim--candidates arg))
+    (meta (company-eclim--meta arg))
+    ;; because "" doesn't return everything
+    (no-cache (equal arg ""))
+    (annotation (company-eclim--annotation arg))
+    (post-completion (let ((anno (company-eclim--annotation arg)))
+                       (when anno
+                         (insert anno)
+                         (company-template-c-like-templatify anno))))))
+
+(provide 'company-eclim)
+;;; company-eclim.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-elisp.el b/emacs.d/elpa/company-20160117.321/company-elisp.el
new file mode 100644
index 0000000..3db0d8b
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-elisp.el
@@ -0,0 +1,225 @@
+;;; company-elisp.el --- company-mode completion backend for Emacs Lisp -*- lexical-binding: t -*-
+
+;; Copyright (C) 2009, 2011-2013  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+(require 'help-mode)
+(require 'find-func)
+
+(defgroup company-elisp nil
+  "Completion backend for Emacs Lisp."
+  :group 'company)
+
+(defcustom company-elisp-detect-function-context t
+  "If enabled, offer Lisp functions only in appropriate contexts.
+Functions are offered for completion only after ' and \(."
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "On" t)))
+
+(defcustom company-elisp-show-locals-first t
+  "If enabled, locally bound variables and functions are displayed
+first in the candidates list."
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "On" t)))
+
+(defun company-elisp--prefix ()
+  (let ((prefix (company-grab-symbol)))
+    (if prefix
+        (when (if (company-in-string-or-comment)
+                  (= (char-before (- (point) (length prefix))) ?`)
+                (company-elisp--should-complete))
+          prefix)
+      'stop)))
+
+(defun company-elisp--predicate (symbol)
+  (or (boundp symbol)
+      (fboundp symbol)
+      (facep symbol)
+      (featurep symbol)))
+
+(defun company-elisp--fns-regexp (&rest names)
+  (concat "\\_<\\(?:cl-\\)?" (regexp-opt names) "\\*?\\_>"))
+
+(defvar company-elisp-parse-limit 30)
+(defvar company-elisp-parse-depth 100)
+
+(defvar company-elisp-defun-names '("defun" "defmacro" "defsubst"))
+
+(defvar company-elisp-var-binding-regexp
+  (apply #'company-elisp--fns-regexp "let" "lambda" "lexical-let"
+         company-elisp-defun-names)
+  "Regular expression matching head of a multiple variable bindings form.")
+
+(defvar company-elisp-var-binding-regexp-1
+  (company-elisp--fns-regexp "dolist" "dotimes")
+  "Regular expression matching head of a form with one variable binding.")
+
+(defvar company-elisp-fun-binding-regexp
+  (company-elisp--fns-regexp "flet" "labels")
+  "Regular expression matching head of a function bindings form.")
+
+(defvar company-elisp-defuns-regexp
+  (concat "([ \t\n]*"
+          (apply #'company-elisp--fns-regexp company-elisp-defun-names)))
+
+(defun company-elisp--should-complete ()
+  (let ((start (point))
+        (depth (car (syntax-ppss))))
+    (not
+     (when (> depth 0)
+       (save-excursion
+         (up-list (- depth))
+         (when (looking-at company-elisp-defuns-regexp)
+           (forward-char)
+           (forward-sexp 1)
+           (unless (= (point) start)
+             (condition-case nil
+                 (let ((args-end (scan-sexps (point) 2)))
+                   (or (null args-end)
+                       (> args-end start)))
+               (scan-error
+                t)))))))))
+
+(defun company-elisp--locals (prefix functions-p)
+  (let ((regexp (concat "[ \t\n]*\\(\\_<" (regexp-quote prefix)
+                        "\\(?:\\sw\\|\\s_\\)*\\_>\\)"))
+        (pos (point))
+        res)
+    (condition-case nil
+        (save-excursion
+          (dotimes (_ company-elisp-parse-depth)
+            (up-list -1)
+            (save-excursion
+              (when (eq (char-after) ?\()
+                (forward-char 1)
+                (when (ignore-errors
+                        (save-excursion (forward-list)
+                                        (<= (point) pos)))
+                  (skip-chars-forward " \t\n")
+                  (cond
+                   ((looking-at (if functions-p
+                                    company-elisp-fun-binding-regexp
+                                  company-elisp-var-binding-regexp))
+                    (down-list 1)
+                    (condition-case nil
+                        (dotimes (_ company-elisp-parse-limit)
+                          (save-excursion
+                            (when (looking-at "[ \t\n]*(")
+                              (down-list 1))
+                            (when (looking-at regexp)
+                              (cl-pushnew (match-string-no-properties 1) res)))
+                          (forward-sexp))
+                      (scan-error nil)))
+                   ((unless functions-p
+                      (looking-at company-elisp-var-binding-regexp-1))
+                    (down-list 1)
+                    (when (looking-at regexp)
+                      (cl-pushnew (match-string-no-properties 1) res)))))))))
+      (scan-error nil))
+    res))
+
+(defun company-elisp-candidates (prefix)
+  (let* ((predicate (company-elisp--candidates-predicate prefix))
+         (locals (company-elisp--locals prefix (eq predicate 'fboundp)))
+         (globals (company-elisp--globals prefix predicate))
+         (locals (cl-loop for local in locals
+                          when (not (member local globals))
+                          collect local)))
+    (if company-elisp-show-locals-first
+        (append (sort locals 'string<)
+                (sort globals 'string<))
+      (append locals globals))))
+
+(defun company-elisp--globals (prefix predicate)
+  (all-completions prefix obarray predicate))
+
+(defun company-elisp--candidates-predicate (prefix)
+  (let* ((completion-ignore-case nil)
+         (beg (- (point) (length prefix)))
+         (before (char-before beg)))
+    (if (and company-elisp-detect-function-context
+             (not (memq before '(?' ?`))))
+        (if (and (eq before ?\()
+                 (not
+                  (save-excursion
+                    (ignore-errors
+                      (goto-char (1- beg))
+                      (or (company-elisp--before-binding-varlist-p)
+                          (progn
+                            (up-list -1)
+                            (company-elisp--before-binding-varlist-p)))))))
+            'fboundp
+          'boundp)
+      'company-elisp--predicate)))
+
+(defun company-elisp--before-binding-varlist-p ()
+  (save-excursion
+    (and (prog1 (search-backward "(")
+           (forward-char 1))
+         (looking-at company-elisp-var-binding-regexp))))
+
+(defun company-elisp--doc (symbol)
+  (let* ((symbol (intern symbol))
+         (doc (if (fboundp symbol)
+                  (documentation symbol t)
+                (documentation-property symbol 'variable-documentation t))))
+    (and (stringp doc)
+         (string-match ".*$" doc)
+         (match-string 0 doc))))
+
+;;;###autoload
+(defun company-elisp (command &optional arg &rest ignored)
+  "`company-mode' completion backend for Emacs Lisp."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-elisp))
+    (prefix (and (derived-mode-p 'emacs-lisp-mode 'inferior-emacs-lisp-mode)
+                 (company-elisp--prefix)))
+    (candidates (company-elisp-candidates arg))
+    (sorted company-elisp-show-locals-first)
+    (meta (company-elisp--doc arg))
+    (doc-buffer (let ((symbol (intern arg)))
+                  (save-window-excursion
+                    (ignore-errors
+                      (cond
+                       ((fboundp symbol) (describe-function symbol))
+                       ((boundp symbol) (describe-variable symbol))
+                       ((featurep symbol) (describe-package symbol))
+                       ((facep symbol) (describe-face symbol))
+                       (t (signal 'user-error nil)))
+                      (help-buffer)))))
+    (location (let ((sym (intern arg)))
+                (cond
+                 ((fboundp sym) (find-definition-noselect sym nil))
+                 ((boundp sym) (find-definition-noselect sym 'defvar))
+                 ((featurep sym) (cons (find-file-noselect (find-library-name
+                                                            (symbol-name sym)))
+                                       0))
+                 ((facep sym) (find-definition-noselect sym 'defface)))))))
+
+(provide 'company-elisp)
+;;; company-elisp.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-etags.el b/emacs.d/elpa/company-20160117.321/company-etags.el
new file mode 100644
index 0000000..ef53213
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-etags.el
@@ -0,0 +1,107 @@
+;;; company-etags.el --- company-mode completion backend for etags
+
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+(require 'etags)
+
+(defgroup company-etags nil
+  "Completion backend for etags."
+  :group 'company)
+
+(defcustom company-etags-use-main-table-list t
+  "Always search `tags-table-list' if set.
+If this is disabled, `company-etags' will try to find the one table for each
+buffer automatically."
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "on" t)))
+
+(defcustom company-etags-ignore-case nil
+  "Non-nil to ignore case in completion candidates."
+  :type 'boolean
+  :package-version '(company . "0.7.3"))
+
+(defcustom company-etags-everywhere nil
+  "Non-nil to offer completions in comments and strings.
+Set it to t or to a list of major modes."
+  :type '(choice (const :tag "Off" nil)
+                 (const :tag "Any supported mode" t)
+                 (repeat :tag "Some major modes"
+                         (symbol :tag "Major mode")))
+  :package-version '(company . "0.9.0"))
+
+(defvar company-etags-modes '(prog-mode c-mode objc-mode c++-mode java-mode
+                              jde-mode pascal-mode perl-mode python-mode))
+
+(defvar-local company-etags-buffer-table 'unknown)
+
+(defun company-etags-find-table ()
+  (let ((file (expand-file-name
+               "TAGS"
+               (locate-dominating-file (or buffer-file-name
+                                           default-directory)
+                                       "TAGS"))))
+    (when (and file (file-regular-p file))
+      (list file))))
+
+(defun company-etags-buffer-table ()
+  (or (and company-etags-use-main-table-list tags-table-list)
+      (if (eq company-etags-buffer-table 'unknown)
+          (setq company-etags-buffer-table (company-etags-find-table))
+        company-etags-buffer-table)))
+
+(defun company-etags--candidates (prefix)
+  (let ((tags-table-list (company-etags-buffer-table))
+        (completion-ignore-case company-etags-ignore-case))
+    (and (or tags-file-name tags-table-list)
+         (fboundp 'tags-completion-table)
+         (save-excursion
+           (visit-tags-table-buffer)
+           (all-completions prefix (tags-completion-table))))))
+
+;;;###autoload
+(defun company-etags (command &optional arg &rest ignored)
+  "`company-mode' completion backend for etags."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-etags))
+    (prefix (and (apply #'derived-mode-p company-etags-modes)
+                 (or (eq t company-etags-everywhere)
+                     (apply #'derived-mode-p company-etags-everywhere)
+                     (not (company-in-string-or-comment)))
+                 (company-etags-buffer-table)
+                 (or (company-grab-symbol) 'stop)))
+    (candidates (company-etags--candidates arg))
+    (location (let ((tags-table-list (company-etags-buffer-table)))
+                (when (fboundp 'find-tag-noselect)
+                  (save-excursion
+                    (let ((buffer (find-tag-noselect arg)))
+                      (cons buffer (with-current-buffer buffer (point))))))))
+    (ignore-case company-etags-ignore-case)))
+
+(provide 'company-etags)
+;;; company-etags.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-files.el b/emacs.d/elpa/company-20160117.321/company-files.el
new file mode 100644
index 0000000..53730c6
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-files.el
@@ -0,0 +1,111 @@
+;;; company-files.el --- company-mode completion backend for file paths
+
+;; Copyright (C) 2009-2011, 2014-2015  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defun company-files--directory-files (dir prefix)
+  (ignore-errors
+    (if (equal prefix "")
+        (directory-files dir nil "\\`[^.]\\|\\`.[^.]")
+      (file-name-all-completions prefix dir))))
+
+(defvar company-files--regexps
+  (let* ((root (if (eq system-type 'windows-nt)
+                   "[a-zA-Z]:/"
+                 "/"))
+         (begin (concat "\\(?:\\.\\{1,2\\}/\\|~/\\|" root "\\)")))
+    (list (concat "\"\\(" begin "[^\"\n]*\\)")
+          (concat "\'\\(" begin "[^\'\n]*\\)")
+          (concat "\\(?:[ \t]\\|^\\)\\(" begin "[^ \t\n]*\\)"))))
+
+(defun company-files--grab-existing-name ()
+  ;; Grab the file name.
+  ;; When surrounded with quotes, it can include spaces.
+  (let (file dir)
+    (and (cl-dolist (regexp company-files--regexps)
+           (when (setq file (company-grab-line regexp 1))
+             (cl-return file)))
+         (company-files--connected-p file)
+         (setq dir (file-name-directory file))
+         (not (string-match "//" dir))
+         (file-exists-p dir)
+         (file-name-all-completions (file-name-nondirectory file) dir)
+         file)))
+
+(defun company-files--connected-p (file)
+  (or (not (file-remote-p file))
+      (file-remote-p file nil t)))
+
+(defvar company-files--completion-cache nil)
+
+(defun company-files--complete (prefix)
+  (let* ((dir (file-name-directory prefix))
+         (key (list (file-name-nondirectory prefix)
+                    (expand-file-name dir)
+                    (nth 5 (file-attributes dir))))
+         (file (file-name-nondirectory prefix))
+         (completion-ignore-case read-file-name-completion-ignore-case)
+         candidates directories)
+    (unless (company-file--keys-match-p key (car company-files--completion-cache))
+      (dolist (file (company-files--directory-files dir file))
+        (setq file (concat dir file))
+        (when (company-files--connected-p file)
+          (push file candidates)
+          (when (file-directory-p file)
+            (push file directories))))
+      (dolist (directory (reverse directories))
+        ;; Add one level of children.
+        (dolist (child (company-files--directory-files directory ""))
+          (push (concat directory
+                        (unless (eq (aref directory (1- (length directory))) ?/) "/")
+                        child) candidates)))
+      (setq company-files--completion-cache (cons key (nreverse candidates))))
+    (all-completions prefix
+                     (cdr company-files--completion-cache))))
+
+(defun company-file--keys-match-p (new old)
+  (and (equal (cdr old) (cdr new))
+       (string-prefix-p (car old) (car new))))
+
+;;;###autoload
+(defun company-files (command &optional arg &rest ignored)
+  "`company-mode' completion backend existing file names.
+Completions works for proper absolute and relative files paths.
+File paths with spaces are only supported inside strings."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-files))
+    (prefix (company-files--grab-existing-name))
+    (candidates (company-files--complete arg))
+    (location (cons (dired-noselect
+                     (file-name-directory (directory-file-name arg))) 1))
+    (sorted t)
+    (no-cache t)))
+
+(provide 'company-files)
+;;; company-files.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-gtags.el b/emacs.d/elpa/company-20160117.321/company-gtags.el
new file mode 100644
index 0000000..5050783
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-gtags.el
@@ -0,0 +1,116 @@
+;;; company-gtags.el --- company-mode completion backend for GNU Global
+
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'company-template)
+(require 'cl-lib)
+
+(defgroup company-gtags nil
+  "Completion backend for GNU Global."
+  :group 'company)
+
+(defcustom company-gtags-executable
+  (executable-find "global")
+  "Location of GNU global executable."
+  :type 'string)
+
+(define-obsolete-variable-alias
+  'company-gtags-gnu-global-program-name
+  'company-gtags-executable "earlier")
+
+(defcustom company-gtags-insert-arguments t
+  "When non-nil, insert function arguments as a template after completion."
+  :type 'boolean
+  :package-version '(company . "0.8.1"))
+
+(defvar-local company-gtags--tags-available-p 'unknown)
+
+(defcustom company-gtags-modes '(prog-mode jde-mode)
+  "Modes that use `company-gtags'.
+In all these modes (and their derivatives) `company-gtags' will perform
+completion."
+  :type '(repeat (symbol :tag "Major mode"))
+  :package-version '(company . "0.8.4"))
+
+(defun company-gtags--tags-available-p ()
+  (if (eq company-gtags--tags-available-p 'unknown)
+      (setq company-gtags--tags-available-p
+            (locate-dominating-file buffer-file-name "GTAGS"))
+    company-gtags--tags-available-p))
+
+(defun company-gtags--fetch-tags (prefix)
+  (with-temp-buffer
+    (let (tags)
+      (when (= 0 (call-process company-gtags-executable nil
+                               (list (current-buffer) nil) nil "-xGq" (concat "^" prefix)))
+        (goto-char (point-min))
+        (cl-loop while
+                 (re-search-forward (concat
+                                     "^"
+                                     "\\([^ ]*\\)" ;; completion
+                                     "[ \t]+\\([[:digit:]]+\\)" ;; linum
+                                     "[ \t]+\\([^ \t]+\\)" ;; file
+                                     "[ \t]+\\(.*\\)" ;; definition
+                                     "$"
+                                     ) nil t)
+                 collect
+                 (propertize (match-string 1)
+                             'meta (match-string 4)
+                             'location (cons (expand-file-name (match-string 3))
+                                             (string-to-number (match-string 2)))
+                             ))))))
+
+(defun company-gtags--annotation (arg)
+  (let ((meta (get-text-property 0 'meta arg)))
+    (when (string-match (concat arg "\\((.*)\\).*") meta)
+      (match-string 1 meta))))
+
+;;;###autoload
+(defun company-gtags (command &optional arg &rest ignored)
+  "`company-mode' completion backend for GNU Global."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-gtags))
+    (prefix (and company-gtags-executable
+                 buffer-file-name
+                 (apply #'derived-mode-p company-gtags-modes)
+                 (not (company-in-string-or-comment))
+                 (company-gtags--tags-available-p)
+                 (or (company-grab-symbol) 'stop)))
+    (candidates (company-gtags--fetch-tags arg))
+    (sorted t)
+    (duplicates t)
+    (annotation (company-gtags--annotation arg))
+    (meta (get-text-property 0 'meta arg))
+    (location (get-text-property 0 'location arg))
+    (post-completion (let ((anno (company-gtags--annotation arg)))
+                       (when (and company-gtags-insert-arguments anno)
+                         (insert anno)
+                         (company-template-c-like-templatify anno))))))
+
+(provide 'company-gtags)
+;;; company-gtags.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-ispell.el b/emacs.d/elpa/company-20160117.321/company-ispell.el
new file mode 100644
index 0000000..c275bbe
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-ispell.el
@@ -0,0 +1,82 @@
+;;; company-ispell.el --- company-mode completion backend using Ispell
+
+;; Copyright (C) 2009-2011, 2013-2016  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+(require 'ispell)
+
+(defgroup company-ispell nil
+  "Completion backend using Ispell."
+  :group 'company)
+
+(defcustom company-ispell-dictionary nil
+  "Dictionary to use for `company-ispell'.
+If nil, use `ispell-complete-word-dict'."
+  :type '(choice (const :tag "default (nil)" nil)
+                 (file :tag "dictionary" t)))
+
+(defvar company-ispell-available 'unknown)
+
+(defalias 'company-ispell--lookup-words
+  (if (fboundp 'ispell-lookup-words)
+      'ispell-lookup-words
+    'lookup-words))
+
+(defun company-ispell-available ()
+  (when (eq company-ispell-available 'unknown)
+    (condition-case err
+        (progn
+          (company-ispell--lookup-words "WHATEVER")
+          (setq company-ispell-available t))
+      (error
+       (message "Company: ispell-look-command not found")
+       (setq company-ispell-available nil))))
+  company-ispell-available)
+
+;;;###autoload
+(defun company-ispell (command &optional arg &rest ignored)
+  "`company-mode' completion backend using Ispell."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-ispell))
+    (prefix (when (company-ispell-available)
+              (company-grab-word)))
+    (candidates
+     (let ((words (company-ispell--lookup-words
+                   arg
+                   (or company-ispell-dictionary ispell-complete-word-dict)))
+           (completion-ignore-case t))
+       (if (string= arg "")
+           ;; Small optimization.
+           words
+         ;; Work around issue #284.
+         (all-completions arg words))))
+    (sorted t)
+    (ignore-case 'keep-prefix)))
+
+(provide 'company-ispell)
+;;; company-ispell.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-keywords.el b/emacs.d/elpa/company-20160117.321/company-keywords.el
new file mode 100644
index 0000000..f0c6ca6
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-keywords.el
@@ -0,0 +1,242 @@
+;;; company-keywords.el --- A company backend for programming language keywords
+
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defun company-keywords-upper-lower (&rest lst)
+  ;; Upcase order is different for _.
+  (nconc (sort (mapcar 'upcase lst) 'string<) lst))
+
+(defvar company-keywords-alist
+  ;; Please contribute corrections or additions.
+  `((c++-mode
+     "asm" "auto" "bool" "break" "case" "catch" "char" "class" "const"
+     "const_cast" "continue" "default" "delete" "do" "double" "dynamic_cast"
+     "else" "enum" "explicit" "export" "extern" "false" "float" "for" "friend"
+     "goto" "if" "inline" "int" "long" "mutable" "namespace" "new"
+     "operator" "private" "protected" "public" "register" "reinterpret_cast"
+     "return" "short" "signed" "sizeof" "static" "static_cast" "struct" "switch"
+     "template" "this" "throw" "true" "try" "typedef" "typeid" "typename"
+     "union" "unsigned" "using" "virtual" "void" "volatile" "wchar_t" "while")
+    (c-mode
+     "auto" "break" "case" "char" "const" "continue" "default" "do"
+     "double" "else" "enum" "extern" "float" "for" "goto" "if" "int" "long"
+     "register" "return" "short" "signed" "sizeof" "static" "struct"
+     "switch" "typedef" "union" "unsigned" "void" "volatile" "while")
+    (csharp-mode
+     "abstract" "add" "alias" "as" "base" "bool" "break" "byte" "case"
+     "catch" "char" "checked" "class" "const" "continue" "decimal" "default"
+     "delegate" "do" "double" "else" "enum" "event" "explicit" "extern"
+     "false" "finally" "fixed" "float" "for" "foreach" "get" "global" "goto"
+     "if" "implicit" "in" "int" "interface" "internal" "is" "lock" "long"
+     "namespace" "new" "null" "object" "operator" "out" "override" "params"
+     "partial" "private" "protected" "public" "readonly" "ref" "remove"
+     "return" "sbyte" "sealed" "set" "short" "sizeof" "stackalloc" "static"
+     "string" "struct" "switch" "this" "throw" "true" "try" "typeof" "uint"
+     "ulong" "unchecked" "unsafe" "ushort" "using" "value" "var" "virtual"
+     "void" "volatile" "where" "while" "yield")
+    (d-mode
+     ;; from http://www.digitalmars.com/d/2.0/lex.html
+     "abstract" "alias" "align" "asm"
+     "assert" "auto" "body" "bool" "break" "byte" "case" "cast" "catch"
+     "cdouble" "cent" "cfloat" "char" "class" "const" "continue" "creal"
+     "dchar" "debug" "default" "delegate" "delete" "deprecated" "do"
+     "double" "else" "enum" "export" "extern" "false" "final" "finally"
+     "float" "for" "foreach" "foreach_reverse" "function" "goto" "idouble"
+     "if" "ifloat" "import" "in" "inout" "int" "interface" "invariant"
+     "ireal" "is" "lazy" "long" "macro" "mixin" "module" "new" "nothrow"
+     "null" "out" "override" "package" "pragma" "private" "protected"
+     "public" "pure" "real" "ref" "return" "scope" "short" "static" "struct"
+     "super" "switch" "synchronized" "template" "this" "throw" "true" "try"
+     "typedef" "typeid" "typeof" "ubyte" "ucent" "uint" "ulong" "union"
+     "unittest" "ushort" "version" "void" "volatile" "wchar" "while" "with")
+    (f90-mode .
+     ;; from f90.el
+     ;; ".AND." ".GE." ".GT." ".LT." ".LE." ".NE." ".OR." ".TRUE." ".FALSE."
+     ,(company-keywords-upper-lower
+      "abs" "abstract" "achar" "acos" "adjustl" "adjustr" "aimag" "aint"
+      "align" "all" "all_prefix" "all_scatter" "all_suffix" "allocatable"
+      "allocate" "allocated" "and" "anint" "any" "any_prefix" "any_scatter"
+      "any_suffix" "asin" "assign" "assignment" "associate" "associated"
+      "asynchronous" "atan" "atan2" "backspace" "bind" "bit_size" "block"
+      "btest" "c_alert" "c_associated" "c_backspace" "c_bool"
+      "c_carriage_return" "c_char" "c_double" "c_double_complex" "c_f_pointer"
+      "c_f_procpointer" "c_float" "c_float_complex" "c_form_feed" "c_funloc"
+      "c_funptr" "c_horizontal_tab" "c_int" "c_int16_t" "c_int32_t" "c_int64_t"
+      "c_int8_t" "c_int_fast16_t" "c_int_fast32_t" "c_int_fast64_t"
+      "c_int_fast8_t" "c_int_least16_t" "c_int_least32_t" "c_int_least64_t"
+      "c_int_least8_t" "c_intmax_t" "c_intptr_t" "c_loc" "c_long"
+      "c_long_double" "c_long_double_complex" "c_long_long" "c_new_line"
+      "c_null_char" "c_null_funptr" "c_null_ptr" "c_ptr" "c_short"
+      "c_signed_char" "c_size_t" "c_vertical_tab" "call" "case" "ceiling"
+      "char" "character" "character_storage_size" "class" "close" "cmplx"
+      "command_argument_count" "common" "complex" "conjg" "contains" "continue"
+      "copy_prefix" "copy_scatter" "copy_suffix" "cos" "cosh" "count"
+      "count_prefix" "count_scatter" "count_suffix" "cpu_time" "cshift"
+      "cycle" "cyclic" "data" "date_and_time" "dble" "deallocate" "deferred"
+      "digits" "dim" "dimension" "distribute" "do" "dot_product" "double"
+      "dprod" "dynamic" "elemental" "else" "elseif" "elsewhere" "end" "enddo"
+      "endfile" "endif" "entry" "enum" "enumerator" "eoshift" "epsilon" "eq"
+      "equivalence" "eqv" "error_unit" "exit" "exp" "exponent" "extends"
+      "extends_type_of" "external" "extrinsic" "false" "file_storage_size"
+      "final" "floor" "flush" "forall" "format" "fraction" "function" "ge"
+      "generic" "get_command" "get_command_argument" "get_environment_variable"
+      "goto" "grade_down" "grade_up" "gt" "hpf_alignment" "hpf_distribution"
+      "hpf_template" "huge" "iachar" "iall" "iall_prefix" "iall_scatter"
+      "iall_suffix" "iand" "iany" "iany_prefix" "iany_scatter" "iany_suffix"
+      "ibclr" "ibits" "ibset" "ichar" "ieee_arithmetic" "ieee_exceptions"
+      "ieee_features" "ieee_get_underflow_mode" "ieee_set_underflow_mode"
+      "ieee_support_underflow_control" "ieor" "if" "ilen" "implicit"
+      "import" "include" "independent" "index" "inherit" "input_unit"
+      "inquire" "int" "integer" "intent" "interface" "intrinsic" "ior"
+      "iostat_end" "iostat_eor" "iparity" "iparity_prefix" "iparity_scatter"
+      "iparity_suffix" "ishft" "ishftc" "iso_c_binding" "iso_fortran_env"
+      "kind" "lbound" "le" "leadz" "len" "len_trim" "lge" "lgt" "lle" "llt"
+      "log" "log10" "logical" "lt" "matmul" "max" "maxexponent" "maxloc"
+      "maxval" "maxval_prefix" "maxval_scatter" "maxval_suffix" "merge"
+      "min" "minexponent" "minloc" "minval" "minval_prefix" "minval_scatter"
+      "minval_suffix" "mod" "module" "modulo" "move_alloc" "mvbits" "namelist"
+      "ne" "nearest" "neqv" "new" "new_line" "nint" "non_intrinsic"
+      "non_overridable" "none" "nopass" "not" "null" "nullify"
+      "number_of_processors" "numeric_storage_size" "only" "onto" "open"
+      "operator" "optional" "or" "output_unit" "pack" "parameter" "parity"
+      "parity_prefix" "parity_scatter" "parity_suffix" "pass" "pause"
+      "pointer" "popcnt" "poppar" "precision" "present" "print" "private"
+      "procedure" "processors" "processors_shape" "product" "product_prefix"
+      "product_scatter" "product_suffix" "program" "protected" "public"
+      "pure" "radix" "random_number" "random_seed" "range" "read" "real"
+      "realign" "recursive" "redistribute" "repeat" "reshape" "result"
+      "return" "rewind" "rrspacing" "same_type_as" "save" "scale" "scan"
+      "select" "selected_char_kind" "selected_int_kind" "selected_real_kind"
+      "sequence" "set_exponent" "shape" "sign" "sin" "sinh" "size" "spacing"
+      "spread" "sqrt" "stop" "subroutine" "sum" "sum_prefix" "sum_scatter"
+      "sum_suffix" "system_clock" "tan" "tanh" "target" "template" "then"
+      "tiny" "transfer" "transpose" "trim" "true" "type" "ubound" "unpack"
+      "use" "value" "verify" "volatile" "wait" "where" "while" "with" "write"))
+    (java-mode
+     "abstract" "assert" "boolean" "break" "byte" "case" "catch" "char" "class"
+     "continue" "default" "do" "double" "else" "enum" "extends" "final"
+     "finally" "float" "for" "if" "implements" "import" "instanceof" "int"
+     "interface" "long" "native" "new" "package" "private" "protected" "public"
+     "return" "short" "static" "strictfp" "super" "switch" "synchronized"
+     "this" "throw" "throws" "transient" "try" "void" "volatile" "while")
+    (javascript-mode
+     "break" "catch" "const" "continue" "delete" "do" "else" "export" "for"
+     "function" "if" "import" "in" "instanceOf" "label" "let" "new" "return"
+     "switch" "this" "throw" "try" "typeof" "var" "void" "while" "with" "yield")
+    (objc-mode
+     "@catch" "@class" "@encode" "@end" "@finally" "@implementation"
+     "@interface" "@private" "@protected" "@protocol" "@public"
+     "@selector" "@synchronized" "@throw" "@try" "alloc" "autorelease"
+     "bycopy" "byref" "in" "inout" "oneway" "out" "release" "retain")
+    (perl-mode
+     ;; from cperl.el
+     "AUTOLOAD" "BEGIN" "CHECK" "CORE" "DESTROY" "END" "INIT" "__END__"
+     "__FILE__" "__LINE__" "abs" "accept" "alarm" "and" "atan2" "bind"
+     "binmode" "bless" "caller" "chdir" "chmod" "chomp" "chop" "chown" "chr"
+     "chroot" "close" "closedir" "cmp" "connect" "continue" "cos"
+     "crypt" "dbmclose" "dbmopen" "defined" "delete" "die" "do" "dump" "each"
+     "else" "elsif" "endgrent" "endhostent" "endnetent" "endprotoent"
+     "endpwent" "endservent" "eof" "eq" "eval" "exec" "exists" "exit" "exp"
+     "fcntl" "fileno" "flock" "for" "foreach" "fork" "format" "formline"
+     "ge" "getc" "getgrent" "getgrgid" "getgrnam" "gethostbyaddr"
+     "gethostbyname" "gethostent" "getlogin" "getnetbyaddr" "getnetbyname"
+     "getnetent" "getpeername" "getpgrp" "getppid" "getpriority"
+     "getprotobyname" "getprotobynumber" "getprotoent" "getpwent" "getpwnam"
+     "getpwuid" "getservbyname" "getservbyport" "getservent" "getsockname"
+     "getsockopt" "glob" "gmtime" "goto" "grep" "gt" "hex" "if" "index" "int"
+     "ioctl" "join" "keys" "kill" "last" "lc" "lcfirst" "le" "length"
+     "link" "listen" "local" "localtime" "lock" "log" "lstat" "lt" "map"
+     "mkdir" "msgctl" "msgget" "msgrcv" "msgsnd" "my" "ne" "next" "no"
+     "not" "oct" "open" "opendir" "or" "ord" "our" "pack" "package" "pipe"
+     "pop" "pos" "print" "printf" "push" "q" "qq" "quotemeta" "qw" "qx"
+     "rand" "read" "readdir" "readline" "readlink" "readpipe" "recv" "redo"
+     "ref" "rename" "require" "reset" "return" "reverse" "rewinddir" "rindex"
+     "rmdir" "scalar" "seek" "seekdir" "select" "semctl" "semget" "semop"
+     "send" "setgrent" "sethostent" "setnetent" "setpgrp" "setpriority"
+     "setprotoent" "setpwent" "setservent" "setsockopt" "shift" "shmctl"
+     "shmget" "shmread" "shmwrite" "shutdown" "sin" "sleep" "socket"
+     "socketpair" "sort" "splice" "split" "sprintf" "sqrt" "srand" "stat"
+     "study" "sub" "substr" "symlink" "syscall" "sysopen" "sysread" "system"
+     "syswrite" "tell" "telldir" "tie" "time" "times" "tr" "truncate" "uc"
+     "ucfirst" "umask" "undef" "unless" "unlink" "unpack" "unshift" "untie"
+     "until" "use" "utime" "values" "vec" "wait" "waitpid"
+     "wantarray" "warn" "while" "write" "x" "xor" "y")
+    (php-mode
+     "__CLASS__" "__DIR__" "__FILE__" "__FUNCTION__" "__LINE__" "__METHOD__"
+     "__NAMESPACE__" "_once" "abstract" "and" "array" "as" "break" "case"
+     "catch" "cfunction" "class" "clone" "const" "continue" "declare"
+     "default" "die" "do" "echo" "else" "elseif" "empty" "enddeclare"
+     "endfor" "endforeach" "endif" "endswitch" "endwhile" "eval" "exception"
+     "exit" "extends" "final" "for" "foreach" "function" "global"
+     "goto" "if" "implements" "include" "instanceof" "interface"
+     "isset" "list" "namespace" "new" "old_function" "or" "php_user_filter"
+     "print" "private" "protected" "public" "require" "require_once" "return"
+     "static" "switch" "this" "throw" "try" "unset" "use" "var" "while" "xor")
+    (python-mode
+     "and" "assert" "break" "class" "continue" "def" "del" "elif" "else"
+     "except" "exec" "finally" "for" "from" "global" "if" "import" "in" "is"
+     "lambda" "not" "or" "pass" "print" "raise" "return" "try" "while" "yield")
+    (ruby-mode
+     "BEGIN" "END" "alias" "and"  "begin" "break" "case" "class" "def" "defined?"
+     "do" "else" "elsif"  "end" "ensure" "false" "for" "if" "in" "module"
+     "next" "nil" "not" "or" "redo" "rescue" "retry" "return" "self" "super"
+     "then" "true" "undef" "unless" "until" "when" "while" "yield")
+    (scala-mode
+     "abstract" "case" "catch" "class" "def" "do" "else" "extends" "false"
+     "final" "finally" "for" "forSome" "if" "implicit" "import" "lazy" "match"
+     "new" "null" "object" "override" "package" "private" "protected"
+     "return" "sealed" "super" "this" "throw" "trait" "true" "try" "type" "val"
+     "var" "while" "with" "yield")
+    ;; aliases
+    (js2-mode . javascript-mode)
+    (espresso-mode . javascript-mode)
+    (js-mode . javascript-mode)
+    (cperl-mode . perl-mode)
+    (jde-mode . java-mode))
+  "Alist mapping major-modes to sorted keywords for `company-keywords'.")
+
+;;;###autoload
+(defun company-keywords (command &optional arg &rest ignored)
+  "`company-mode' backend for programming language keywords."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-keywords))
+    (prefix (and (assq major-mode company-keywords-alist)
+                 (not (company-in-string-or-comment))
+                 (or (company-grab-symbol) 'stop)))
+    (candidates
+     (let ((completion-ignore-case nil)
+           (symbols (cdr (assq major-mode company-keywords-alist))))
+       (all-completions arg (if (consp symbols)
+                                symbols
+                              (cdr (assq symbols company-keywords-alist))))))
+    (sorted t)))
+
+(provide 'company-keywords)
+;;; company-keywords.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-nxml.el b/emacs.d/elpa/company-20160117.321/company-nxml.el
new file mode 100644
index 0000000..9c180e9
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-nxml.el
@@ -0,0 +1,142 @@
+;;; company-nxml.el --- company-mode completion backend for nxml-mode
+
+;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defvar rng-open-elements)
+(defvar rng-validate-mode)
+(defvar rng-in-attribute-regex)
+(defvar rng-in-attribute-value-regex)
+(declare-function rng-set-state-after "rng-nxml")
+(declare-function rng-match-possible-start-tag-names "rng-match")
+(declare-function rng-adjust-state-for-attribute "rng-nxml")
+(declare-function rng-match-possible-attribute-names "rng-match")
+(declare-function rng-adjust-state-for-attribute-value "rng-nxml")
+(declare-function rng-match-possible-value-strings "rng-match")
+
+(defconst company-nxml-token-regexp
+  "\\(?:[_[:alpha:]][-._[:alnum:]]*\\_>\\)")
+
+(defvar company-nxml-in-attribute-value-regexp
+  (replace-regexp-in-string "w" company-nxml-token-regexp
+   "<w\\(?::w\\)?\
+\\(?:[ \t\r\n]+w\\(?::w\\)?[ \t\r\n]*=\
+\[ \t\r\n]*\\(?:\"[^\"]*\"\\|'[^']*'\\)\\)*\
+\[ \t\r\n]+\\(w\\(:w\\)?\\)[ \t\r\n]*=[ \t\r\n]*\
+\\(\"\\([^\"]*\\>\\)\\|'\\([^']*\\>\\)\\)\\="
+   t t))
+
+(defvar company-nxml-in-tag-name-regexp
+  (replace-regexp-in-string "w" company-nxml-token-regexp
+                            "<\\(/?w\\(?::w?\\)?\\)?\\=" t t))
+
+(defun company-nxml-all-completions (prefix alist)
+  (let ((candidates (mapcar 'cdr alist))
+        (case-fold-search nil)
+        filtered)
+    (when (cdar rng-open-elements)
+      (push (concat "/" (cdar rng-open-elements)) candidates))
+    (setq candidates (sort (all-completions prefix candidates) 'string<))
+    (while candidates
+      (unless (equal (car candidates) (car filtered))
+        (push (car candidates) filtered))
+      (pop candidates))
+    (nreverse filtered)))
+
+(defmacro company-nxml-prepared (&rest body)
+  (declare (indent 0) (debug t))
+  `(let ((lt-pos (save-excursion (search-backward "<" nil t)))
+         xmltok-dtd)
+     (when (and lt-pos (= (rng-set-state-after lt-pos) lt-pos))
+       ,@body)))
+
+(defun company-nxml-tag (command &optional arg &rest ignored)
+  (cl-case command
+    (prefix (and (derived-mode-p 'nxml-mode)
+                 rng-validate-mode
+                 (company-grab company-nxml-in-tag-name-regexp 1)))
+    (candidates (company-nxml-prepared
+                 (company-nxml-all-completions
+                  arg (rng-match-possible-start-tag-names))))
+    (sorted t)))
+
+(defun company-nxml-attribute (command &optional arg &rest ignored)
+  (cl-case command
+    (prefix (and (derived-mode-p 'nxml-mode)
+                 rng-validate-mode
+                 (memq (char-after) '(?\  ?\t ?\n)) ;; outside word
+                 (company-grab rng-in-attribute-regex 1)))
+    (candidates (company-nxml-prepared
+                 (and (rng-adjust-state-for-attribute
+                       lt-pos (- (point) (length arg)))
+                      (company-nxml-all-completions
+                       arg (rng-match-possible-attribute-names)))))
+    (sorted t)))
+
+(defun company-nxml-attribute-value (command &optional arg &rest ignored)
+  (cl-case command
+    (prefix (and (derived-mode-p 'nxml-mode)
+                 rng-validate-mode
+                 (and (memq (char-after) '(?' ?\" ?\  ?\t ?\n)) ;; outside word
+                      (looking-back company-nxml-in-attribute-value-regexp)
+                      (or (match-string-no-properties 4)
+                          (match-string-no-properties 5)
+                          ""))))
+    (candidates (company-nxml-prepared
+                 (let (attr-start attr-end colon)
+                   (and (looking-back rng-in-attribute-value-regex lt-pos)
+                        (setq colon (match-beginning 2)
+                              attr-start (match-beginning 1)
+                              attr-end (match-end 1))
+                        (rng-adjust-state-for-attribute lt-pos attr-start)
+                        (rng-adjust-state-for-attribute-value
+                         attr-start colon attr-end)
+                        (all-completions
+                         arg (rng-match-possible-value-strings))))))))
+
+;;;###autoload
+(defun company-nxml (command &optional arg &rest ignored)
+  "`company-mode' completion backend for `nxml-mode'."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-nxml))
+    (prefix (or (company-nxml-tag 'prefix)
+                (company-nxml-attribute 'prefix)
+                (company-nxml-attribute-value 'prefix)))
+    (candidates (cond
+                 ((company-nxml-tag 'prefix)
+                  (company-nxml-tag 'candidates arg))
+                 ((company-nxml-attribute 'prefix)
+                  (company-nxml-attribute 'candidates arg))
+                 ((company-nxml-attribute-value 'prefix)
+                  (sort (company-nxml-attribute-value 'candidates arg)
+                        'string<))))
+    (sorted t)))
+
+(provide 'company-nxml)
+;;; company-nxml.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-oddmuse.el b/emacs.d/elpa/company-20160117.321/company-oddmuse.el
new file mode 100644
index 0000000..5bacaeb
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-oddmuse.el
@@ -0,0 +1,57 @@
+;;; company-oddmuse.el --- company-mode completion backend for oddmuse-mode
+
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+(eval-when-compile (require 'yaooddmuse nil t))
+(eval-when-compile (require 'oddmuse nil t))
+
+(defvar company-oddmuse-link-regexp
+  "\\(\\<[A-Z][[:alnum:]]*\\>\\)\\|\\[\\[\\([[:alnum:]]+\\>\\|\\)")
+
+(defun company-oddmuse-get-page-table ()
+  (cl-case major-mode
+    (yaoddmuse-mode (with-no-warnings
+                      (yaoddmuse-get-pagename-table yaoddmuse-wikiname)))
+    (oddmuse-mode (with-no-warnings
+                    (oddmuse-make-completion-table oddmuse-wiki)))))
+
+;;;###autoload
+(defun company-oddmuse (command &optional arg &rest ignored)
+  "`company-mode' completion backend for `oddmuse-mode'."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-oddmuse))
+    (prefix (let ((case-fold-search nil))
+              (and (memq major-mode '(oddmuse-mode yaoddmuse-mode))
+                   (looking-back company-oddmuse-link-regexp (point-at-bol))
+                   (or (match-string 1)
+                       (match-string 2)))))
+    (candidates (all-completions arg (company-oddmuse-get-page-table)))))
+
+(provide 'company-oddmuse)
+;;; company-oddmuse.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-pkg.el b/emacs.d/elpa/company-20160117.321/company-pkg.el
new file mode 100644
index 0000000..61e7783
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-pkg.el
@@ -0,0 +1,8 @@
+(define-package "company" "20160117.321" "Modular text completion framework"
+  '((emacs "24.1")
+    (cl-lib "0.5"))
+  :url "http://company-mode.github.io/" :keywords
+  '("abbrev" "convenience" "matching"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/company-20160117.321/company-semantic.el b/emacs.d/elpa/company-20160117.321/company-semantic.el
new file mode 100644
index 0000000..8b13b72
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-semantic.el
@@ -0,0 +1,167 @@
+;;; company-semantic.el --- company-mode completion backend using Semantic
+
+;; Copyright (C) 2009-2011, 2013-2016  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'company-template)
+(require 'cl-lib)
+
+(defvar semantic-idle-summary-function)
+(declare-function semantic-documentation-for-tag "semantic/doc" )
+(declare-function semantic-analyze-current-context "semantic/analyze")
+(declare-function semantic-analyze-possible-completions "semantic/complete")
+(declare-function semantic-analyze-find-tags-by-prefix "semantic/analyze/fcn")
+(declare-function semantic-tag-class "semantic/tag")
+(declare-function semantic-tag-name "semantic/tag")
+(declare-function semantic-tag-start "semantic/tag")
+(declare-function semantic-tag-buffer "semantic/tag")
+(declare-function semantic-active-p "semantic")
+(declare-function semantic-format-tag-prototype "semantic/format")
+
+(defgroup company-semantic nil
+  "Completion backend using Semantic."
+  :group 'company)
+
+(defcustom company-semantic-metadata-function 'company-semantic-summary-and-doc
+  "The function turning a semantic tag into doc information."
+  :type 'function)
+
+(defcustom company-semantic-begin-after-member-access t
+  "When non-nil, automatic completion will start whenever the current
+symbol is preceded by \".\", \"->\" or \"::\", ignoring
+`company-minimum-prefix-length'.
+
+If `company-begin-commands' is a list, it should include `c-electric-lt-gt'
+and `c-electric-colon', for automatic completion right after \">\" and
+\":\".")
+
+(defcustom company-semantic-insert-arguments t
+  "When non-nil, insert function arguments as a template after completion."
+  :type 'boolean
+  :package-version '(company . "0.9.0"))
+
+(defvar company-semantic-modes '(c-mode c++-mode jde-mode java-mode))
+
+(defvar-local company-semantic--current-tags nil
+  "Tags for the current context.")
+
+(defun company-semantic-documentation-for-tag (tag)
+  (when (semantic-tag-buffer tag)
+    ;; When TAG's buffer is unknown, the function below raises an error.
+    (semantic-documentation-for-tag tag)))
+
+(defun company-semantic-doc-or-summary (tag)
+  (or (company-semantic-documentation-for-tag tag)
+      (and (require 'semantic-idle nil t)
+           (require 'semantic/idle nil t)
+           (funcall semantic-idle-summary-function tag nil t))))
+
+(defun company-semantic-summary-and-doc (tag)
+  (let ((doc (company-semantic-documentation-for-tag tag))
+        (summary (funcall semantic-idle-summary-function tag nil t)))
+    (and (stringp doc)
+         (string-match "\n*\\(.*\\)$" doc)
+         (setq doc (match-string 1 doc)))
+    (concat summary
+            (when doc
+                  (if (< (+ (length doc) (length summary) 4) (window-width))
+                      " -- "
+                    "\n"))
+            doc)))
+
+(defun company-semantic-doc-buffer (tag)
+  (let ((doc (company-semantic-documentation-for-tag tag)))
+    (when doc
+      (company-doc-buffer
+       (concat (funcall semantic-idle-summary-function tag nil t)
+               "\n"
+               doc)))))
+
+(defsubst company-semantic-completions (prefix)
+  (ignore-errors
+    (let ((completion-ignore-case nil)
+          (context (semantic-analyze-current-context)))
+      (setq company-semantic--current-tags
+            (semantic-analyze-possible-completions context 'no-unique))
+      (all-completions prefix company-semantic--current-tags))))
+
+(defun company-semantic-completions-raw (prefix)
+  (setq company-semantic--current-tags nil)
+  (dolist (tag (semantic-analyze-find-tags-by-prefix prefix))
+    (unless (eq (semantic-tag-class tag) 'include)
+      (push tag company-semantic--current-tags)))
+  (delete "" (mapcar 'semantic-tag-name company-semantic--current-tags)))
+
+(defun company-semantic-annotation (argument tags)
+  (let* ((tag (assq argument tags))
+         (kind (when tag (elt tag 1))))
+    (cl-case kind
+      (function (let* ((prototype (semantic-format-tag-prototype tag nil nil))
+                       (par-pos (string-match "(" prototype)))
+                  (when par-pos (substring prototype par-pos)))))))
+
+(defun company-semantic--prefix ()
+  (if company-semantic-begin-after-member-access
+      (company-grab-symbol-cons "\\.\\|->\\|::" 2)
+    (company-grab-symbol)))
+
+;;;###autoload
+(defun company-semantic (command &optional arg &rest ignored)
+  "`company-mode' completion backend using CEDET Semantic."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-semantic))
+    (prefix (and (featurep 'semantic)
+                 (semantic-active-p)
+                 (memq major-mode company-semantic-modes)
+                 (not (company-in-string-or-comment))
+                 (or (company-semantic--prefix) 'stop)))
+    (candidates (if (and (equal arg "")
+                         (not (looking-back "->\\|\\." (- (point) 2))))
+                    (company-semantic-completions-raw arg)
+                  (company-semantic-completions arg)))
+    (meta (funcall company-semantic-metadata-function
+                   (assoc arg company-semantic--current-tags)))
+    (annotation (company-semantic-annotation arg
+                                             company-semantic--current-tags))
+    (doc-buffer (company-semantic-doc-buffer
+                 (assoc arg company-semantic--current-tags)))
+    ;; Because "" is an empty context and doesn't return local variables.
+    (no-cache (equal arg ""))
+    (duplicates t)
+    (location (let ((tag (assoc arg company-semantic--current-tags)))
+                (when (buffer-live-p (semantic-tag-buffer tag))
+                  (cons (semantic-tag-buffer tag)
+                        (semantic-tag-start tag)))))
+    (post-completion (let ((anno (company-semantic-annotation
+                                  arg company-semantic--current-tags)))
+                       (when (and company-semantic-insert-arguments anno)
+                         (insert anno)
+                         (company-template-c-like-templatify (concat arg anno)))
+                       ))))
+
+(provide 'company-semantic)
+;;; company-semantic.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-template.el b/emacs.d/elpa/company-20160117.321/company-template.el
new file mode 100644
index 0000000..053429d
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-template.el
@@ -0,0 +1,214 @@
+;;; company-template.el --- utility library for template expansion
+
+;; Copyright (C) 2009, 2010, 2014-2016 Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+
+(defface company-template-field
+  '((((background dark)) (:background "yellow" :foreground "black"))
+    (((background light)) (:background "orange" :foreground "black")))
+  "Face used for editable text in template fields."
+  :group 'company)
+
+(defvar company-template-nav-map
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap [tab] 'company-template-forward-field)
+    (define-key keymap (kbd "TAB") 'company-template-forward-field)
+    keymap))
+
+(defvar-local company-template--buffer-templates nil)
+
+;; interactive ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-template-templates-at (pos)
+  (let (os)
+    (dolist (o (overlays-at pos))
+      ;; FIXME: Always return the whole list of templates?
+      ;; We remove templates not at point after every command.
+      (when (memq o company-template--buffer-templates)
+        (push o os)))
+    os))
+
+(defun company-template-move-to-first (templ)
+  (interactive)
+  (goto-char (overlay-start templ))
+  (company-template-forward-field))
+
+(defun company-template-forward-field ()
+  (interactive)
+  (let* ((start (point))
+         (templates (company-template-templates-at (point)))
+         (minimum (apply 'max (mapcar 'overlay-end templates)))
+         (fields (cl-loop for templ in templates
+                          append (overlay-get templ 'company-template-fields))))
+    (dolist (pos (mapcar 'overlay-start fields))
+      (and pos
+           (> pos (point))
+           (< pos minimum)
+           (setq minimum pos)))
+    (push-mark)
+    (goto-char minimum)
+    (company-template-remove-field (company-template-field-at start))))
+
+(defun company-template-field-at (&optional point)
+  (cl-loop for ovl in (overlays-at (or point (point)))
+           when (overlay-get ovl 'company-template-parent)
+           return ovl))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-template-declare-template (beg end)
+  (let ((ov (make-overlay beg end)))
+    ;; (overlay-put ov 'face 'highlight)
+    (overlay-put ov 'keymap company-template-nav-map)
+    (overlay-put ov 'priority 101)
+    (overlay-put ov 'evaporate t)
+    (push ov company-template--buffer-templates)
+    (add-hook 'post-command-hook 'company-template-post-command nil t)
+    ov))
+
+(defun company-template-remove-template (templ)
+  (mapc 'company-template-remove-field
+        (overlay-get templ 'company-template-fields))
+  (setq company-template--buffer-templates
+        (delq templ company-template--buffer-templates))
+  (delete-overlay templ))
+
+(defun company-template-add-field (templ beg end &optional display)
+  "Add new field to template TEMPL spanning from BEG to END.
+When DISPLAY is non-nil, set the respective property on the overlay.
+Leave point at the end of the field."
+  (cl-assert templ)
+  (when (> end (overlay-end templ))
+    (move-overlay templ (overlay-start templ) end))
+  (let ((ov (make-overlay beg end))
+        (siblings (overlay-get templ 'company-template-fields)))
+    ;; (overlay-put ov 'evaporate t)
+    (overlay-put ov 'intangible t)
+    (overlay-put ov 'face 'company-template-field)
+    (when display
+      (overlay-put ov 'display display))
+    (overlay-put ov 'company-template-parent templ)
+    (overlay-put ov 'insert-in-front-hooks '(company-template-insert-hook))
+    (push ov siblings)
+    (overlay-put templ 'company-template-fields siblings)))
+
+(defun company-template-remove-field (ovl &optional clear)
+  (when (overlayp ovl)
+    (when (overlay-buffer ovl)
+      (when clear
+        (delete-region (overlay-start ovl) (overlay-end ovl)))
+      (delete-overlay ovl))
+    (let* ((templ (overlay-get ovl 'company-template-parent))
+           (siblings (overlay-get templ 'company-template-fields)))
+      (setq siblings (delq ovl siblings))
+      (overlay-put templ 'company-template-fields siblings))))
+
+(defun company-template-clean-up (&optional pos)
+  "Clean up all templates that don't contain POS."
+  (let ((local-ovs (overlays-at (or pos (point)))))
+    (dolist (templ company-template--buffer-templates)
+      (unless (memq templ local-ovs)
+        (company-template-remove-template templ)))))
+
+;; hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-template-insert-hook (ovl after-p &rest _ignore)
+  "Called when a snippet input prompt is modified."
+  (unless after-p
+    (company-template-remove-field ovl t)))
+
+(defun company-template-post-command ()
+  (company-template-clean-up)
+  (unless company-template--buffer-templates
+    (remove-hook 'post-command-hook 'company-template-post-command t)))
+
+;; common ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-template-c-like-templatify (call)
+  (let* ((end (point-marker))
+         (beg (- (point) (length call)))
+         (templ (company-template-declare-template beg end))
+         paren-open paren-close)
+    (with-syntax-table (make-syntax-table (syntax-table))
+      (modify-syntax-entry ?< "(")
+      (modify-syntax-entry ?> ")")
+      (when (search-backward ")" beg t)
+        (setq paren-close (point-marker))
+        (forward-char 1)
+        (delete-region (point) end)
+        (backward-sexp)
+        (forward-char 1)
+        (setq paren-open (point-marker)))
+      (when (search-backward ">" beg t)
+        (let ((angle-close (point-marker)))
+          (forward-char 1)
+          (backward-sexp)
+          (forward-char)
+          (company-template--c-like-args templ angle-close)))
+      (when (looking-back "\\((\\*)\\)(" (line-beginning-position))
+        (delete-region (match-beginning 1) (match-end 1)))
+      (when paren-open
+        (goto-char paren-open)
+        (company-template--c-like-args templ paren-close)))
+    (if (overlay-get templ 'company-template-fields)
+        (company-template-move-to-first templ)
+      (company-template-remove-template templ)
+      (goto-char end))))
+
+(defun company-template--c-like-args (templ end)
+  (let ((last-pos (point)))
+    (while (re-search-forward "\\([^,]+\\),?" end 'move)
+      (when (zerop (car (parse-partial-sexp last-pos (point))))
+        (company-template-add-field templ last-pos (match-end 1))
+        (skip-chars-forward " ")
+        (setq last-pos (point))))))
+
+;; objc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-template-objc-templatify (selector)
+  (let* ((end (point-marker))
+         (beg (- (point) (length selector) 1))
+         (templ (company-template-declare-template beg end))
+         (cnt 0))
+    (save-excursion
+      (goto-char beg)
+      (catch 'stop
+        (while (search-forward ":" end t)
+          (if (looking-at "\\(([^)]*)\\) ?")
+              (company-template-add-field templ (point) (match-end 1))
+            ;; Not sure which conditions this case manifests under, but
+            ;; apparently it did before, when I wrote the first test for this
+            ;; function.  FIXME: Revisit it.
+            (company-template-add-field templ (point)
+                                        (progn
+                                          (insert (format "arg%d" cnt))
+                                          (point)))
+            (when (< (point) end)
+              (insert " "))
+            (cl-incf cnt))
+          (when (>= (point) end)
+            (throw 'stop t)))))
+    (company-template-move-to-first templ)))
+
+(provide 'company-template)
+;;; company-template.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-tempo.el b/emacs.d/elpa/company-20160117.321/company-tempo.el
new file mode 100644
index 0000000..0fa5c75
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-tempo.el
@@ -0,0 +1,62 @@
+;;; company-tempo.el --- company-mode completion backend for tempo
+
+;; Copyright (C) 2009-2011, 2015  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+(require 'tempo)
+
+(defsubst company-tempo-lookup (match)
+  (cdr (assoc match (tempo-build-collection))))
+
+(defun company-tempo-insert (match)
+  "Replace MATCH with the expanded tempo template."
+  (search-backward match)
+  (goto-char (match-beginning 0))
+  (replace-match "")
+  (call-interactively (company-tempo-lookup match)))
+
+(defsubst company-tempo-meta (match)
+  (let ((templ (company-tempo-lookup match))
+        doc)
+    (and templ
+         (setq doc (documentation templ t))
+         (car (split-string doc "\n" t)))))
+
+;;;###autoload
+(defun company-tempo (command &optional arg &rest ignored)
+  "`company-mode' completion backend for tempo."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-tempo
+                                        'company-tempo-insert))
+    (prefix (or (car (tempo-find-match-string tempo-match-finder)) ""))
+    (candidates (all-completions arg (tempo-build-collection)))
+    (meta (company-tempo-meta arg))
+    (sorted t)))
+
+(provide 'company-tempo)
+;;; company-tempo.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-xcode.el b/emacs.d/elpa/company-20160117.321/company-xcode.el
new file mode 100644
index 0000000..56da198
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-xcode.el
@@ -0,0 +1,123 @@
+;;; company-xcode.el --- company-mode completion backend for Xcode projects
+
+;; Copyright (C) 2009-2011, 2014  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(defgroup company-xcode nil
+  "Completion backend for Xcode projects."
+  :group 'company)
+
+(defcustom company-xcode-xcodeindex-executable (executable-find "xcodeindex")
+  "Location of xcodeindex executable."
+  :type 'file)
+
+(defvar company-xcode-tags nil)
+
+(defun company-xcode-reset ()
+  "Reset the cached tags."
+  (interactive)
+  (setq company-xcode-tags nil))
+
+(defcustom company-xcode-types
+  '("Class" "Constant" "Enum" "Macro" "Modeled Class" "Structure"
+    "Type" "Union" "Function")
+  "The types of symbols offered by `company-xcode'.
+No context-enabled completion is available.  Types like methods will be
+offered regardless of whether the class supports them.  The defaults should be
+valid in most contexts."
+  :set (lambda (variable value)
+         (set variable value)
+         (company-xcode-reset))
+  :type '(set (const "Category") (const "Class") (const "Class Method")
+              (const "Class Variable") (const "Constant") (const "Enum")
+              (const "Field") (const "Instance Method")
+              (const "Instance Variable") (const "Macro")
+              (const "Modeled Class") (const "Modeled Method")
+              (const "Modeled Property") (const "Property") (const "Protocol")
+              (const "Structure") (const "Type") (const "Union")
+              (const "Variable") (const "Function")))
+
+(defvar-local company-xcode-project 'unknown)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-xcode-fetch (project-bundle)
+  (setq project-bundle (directory-file-name project-bundle))
+  (message "Retrieving dump from %s..." project-bundle)
+  (with-temp-buffer
+    (let ((default-directory (file-name-directory project-bundle)))
+      (call-process company-xcode-xcodeindex-executable nil (current-buffer)
+                    nil "dump" "-project"
+                    (file-name-nondirectory project-bundle) "-quiet")
+      (goto-char (point-min))
+      (let ((regexp (concat "^\\([^\t\n]*\\)\t[^\t\n]*\t"
+                            (regexp-opt company-xcode-types)
+                            "\t[^\t\n]*\t[^\t\n]*"))
+            candidates)
+        (while (re-search-forward regexp nil t)
+          (cl-pushnew (match-string 1) candidates :test #'equal))
+        (message "Retrieving dump from %s...done" project-bundle)
+        candidates))))
+
+(defun company-xcode-find-project ()
+  (let ((dir (if buffer-file-name
+                 (file-name-directory buffer-file-name)
+               (expand-file-name default-directory)))
+        (prev-dir nil)
+        file)
+    (while (not (or file (equal dir prev-dir)))
+      (setq file (car (directory-files dir t ".xcodeproj\\'" t))
+            prev-dir dir
+            dir (file-name-directory (directory-file-name dir))))
+    file))
+
+(defun company-xcode-tags ()
+  (when (eq company-xcode-project 'unknown)
+    (setq company-xcode-project (company-xcode-find-project)))
+  (when company-xcode-project
+    (cdr (or (assoc company-xcode-project company-xcode-tags)
+             (car (push (cons company-xcode-project
+                              (company-xcode-fetch company-xcode-project))
+                        company-xcode-tags))))))
+;;;###autoload
+(defun company-xcode (command &optional arg &rest ignored)
+  "`company-mode' completion backend for Xcode projects."
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-xcode))
+    (prefix (and company-xcode-xcodeindex-executable
+                 (company-xcode-tags)
+                 (not (company-in-string-or-comment))
+                 (or (company-grab-symbol) 'stop)))
+    (candidates (let ((completion-ignore-case nil))
+                  (company-xcode-tags)
+                  (all-completions arg (company-xcode-tags))))))
+
+
+(provide 'company-xcode)
+;;; company-xcode.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company-yasnippet.el b/emacs.d/elpa/company-20160117.321/company-yasnippet.el
new file mode 100644
index 0000000..e5fded4
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company-yasnippet.el
@@ -0,0 +1,147 @@
+;;; company-yasnippet.el --- company-mode completion backend for Yasnippet
+
+;; Copyright (C) 2014, 2015  Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'company)
+(require 'cl-lib)
+
+(declare-function yas--table-hash "yasnippet")
+(declare-function yas--get-snippet-tables "yasnippet")
+(declare-function yas-expand-snippet "yasnippet")
+(declare-function yas--template-content "yasnippet")
+(declare-function yas--template-expand-env "yasnippet")
+(declare-function yas--warning "yasnippet")
+
+(defun company-yasnippet--key-prefixes ()
+  ;; Mostly copied from `yas--templates-for-key-at-point'.
+  (defvar yas-key-syntaxes)
+  (save-excursion
+    (let ((original (point))
+          (methods yas-key-syntaxes)
+          prefixes
+          method)
+      (while methods
+        (unless (eq method (car methods))
+          (goto-char original))
+        (setq method (car methods))
+        (cond ((stringp method)
+               (skip-syntax-backward method)
+               (setq methods (cdr methods)))
+              ((functionp method)
+               (unless (eq (funcall method original)
+                           'again)
+                 (setq methods (cdr methods))))
+              (t
+               (setq methods (cdr methods))
+               (yas--warning "Invalid element `%s' in `yas-key-syntaxes'" method)))
+        (let ((prefix (buffer-substring-no-properties (point) original)))
+          (unless (equal prefix (car prefixes))
+            (push prefix prefixes))))
+      prefixes)))
+
+(defun company-yasnippet--candidates (prefix)
+  ;; Process the prefixes in reverse: unlike Yasnippet, we look for prefix
+  ;; matches, so the longest prefix with any matches should be the most useful.
+  (cl-loop with tables = (yas--get-snippet-tables)
+           for key-prefix in (company-yasnippet--key-prefixes)
+           ;; Only consider keys at least as long as the symbol at point.
+           when (>= (length key-prefix) (length prefix))
+           thereis (company-yasnippet--completions-for-prefix prefix
+                                                              key-prefix
+                                                              tables)))
+
+(defun company-yasnippet--completions-for-prefix (prefix key-prefix tables)
+  (cl-mapcan
+   (lambda (table)
+     (let ((keyhash (yas--table-hash table))
+           res)
+       (when keyhash
+         (maphash
+          (lambda (key value)
+            (when (and (stringp key)
+                       (string-prefix-p key-prefix key))
+              (maphash
+               (lambda (name template)
+                 (push
+                  (propertize key
+                              'yas-annotation name
+                              'yas-template template
+                              'yas-prefix-offset (- (length key-prefix)
+                                                    (length prefix)))
+                  res))
+               value)))
+          keyhash))
+       res))
+   tables))
+
+;;;###autoload
+(defun company-yasnippet (command &optional arg &rest ignore)
+  "`company-mode' backend for `yasnippet'.
+
+This backend should be used with care, because as long as there are
+snippets defined for the current major mode, this backend will always
+shadow backends that come after it.  Recommended usages:
+
+* In a buffer-local value of `company-backends', grouped with a backend or
+  several that provide actual text completions.
+
+  (add-hook 'js-mode-hook
+            (lambda ()
+              (set (make-local-variable 'company-backends)
+                   '((company-dabbrev-code company-yasnippet)))))
+
+* After keyword `:with', grouped with other backends.
+
+  (push '(company-semantic :with company-yasnippet) company-backends)
+
+* Not in `company-backends', just bound to a key.
+
+  (global-set-key (kbd \"C-c y\") 'company-yasnippet)
+"
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'company-yasnippet))
+    (prefix
+     ;; Should probably use `yas--current-key', but that's bound to be slower.
+     ;; How many trigger keys start with non-symbol characters anyway?
+     (and (bound-and-true-p yas-minor-mode)
+          (company-grab-symbol)))
+    (annotation
+     (concat
+      (unless company-tooltip-align-annotations " -> ")
+      (get-text-property 0 'yas-annotation arg)))
+    (candidates (company-yasnippet--candidates arg))
+    (no-cache t)
+    (post-completion
+     (let ((template (get-text-property 0 'yas-template arg))
+           (prefix-offset (get-text-property 0 'yas-prefix-offset arg)))
+       (yas-expand-snippet (yas--template-content template)
+                           (- (point) (length arg) prefix-offset)
+                           (point)
+                           (yas--template-expand-env template))))))
+
+(provide 'company-yasnippet)
+;;; company-yasnippet.el ends here
diff --git a/emacs.d/elpa/company-20160117.321/company.el b/emacs.d/elpa/company-20160117.321/company.el
new file mode 100644
index 0000000..9c44f4b
--- /dev/null
+++ b/emacs.d/elpa/company-20160117.321/company.el
@@ -0,0 +1,2992 @@
+;;; company.el --- Modular text completion framework  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2009-2016  Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
+;; URL: http://company-mode.github.io/
+;; Version: 0.9.0-cvs
+;; Keywords: abbrev, convenience, matching
+;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Company is a modular completion framework.  Modules for retrieving completion
+;; candidates are called backends, modules for displaying them are frontends.
+;;
+;; Company comes with many backends, e.g. `company-etags'.  These are
+;; distributed in separate files and can be used individually.
+;;
+;; Enable `company-mode' in all buffers with M-x global-company-mode.  For
+;; further information look at the documentation for `company-mode' (C-h f
+;; company-mode RET).
+;;
+;; If you want to start a specific backend, call it interactively or use
+;; `company-begin-backend'.  For example:
+;; M-x company-abbrev will prompt for and insert an abbrev.
+;;
+;; To write your own backend, look at the documentation for `company-backends'.
+;; Here is a simple example completing "foo":
+;;
+;; (defun company-my-backend (command &optional arg &rest ignored)
+;;   (pcase command
+;;     (`prefix (when (looking-back "foo\\>")
+;;               (match-string 0)))
+;;     (`candidates (list "foobar" "foobaz" "foobarbaz"))
+;;     (`meta (format "This value is named %s" arg))))
+;;
+;; Sometimes it is a good idea to mix several backends together, for example to
+;; enrich gtags with dabbrev-code results (to emulate local variables).  To do
+;; this, add a list with both backends as an element in `company-backends'.
+;;
+;;; Change Log:
+;;
+;; See NEWS.md in the repository.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'newcomment)
+(require 'pcase)
+
+;; FIXME: Use `user-error'.
+(add-to-list 'debug-ignored-errors "^.* frontend cannot be used twice$")
+(add-to-list 'debug-ignored-errors "^Echo area cannot be used twice$")
+(add-to-list 'debug-ignored-errors "^No \\(document\\|loc\\)ation available$")
+(add-to-list 'debug-ignored-errors "^Company not ")
+(add-to-list 'debug-ignored-errors "^No candidate number ")
+(add-to-list 'debug-ignored-errors "^Cannot complete at point$")
+(add-to-list 'debug-ignored-errors "^No other backend$")
+
+;;; Compatibility
+(eval-and-compile
+  ;; `defvar-local' for Emacs 24.2 and below
+  (unless (fboundp 'defvar-local)
+    (defmacro defvar-local (var val &optional docstring)
+      "Define VAR as a buffer-local variable with default value VAL.
+Like `defvar' but additionally marks the variable as being automatically
+buffer-local wherever it is set."
+      (declare (debug defvar) (doc-string 3))
+      `(progn
+         (defvar ,var ,val ,docstring)
+         (make-variable-buffer-local ',var)))))
+
+(defgroup company nil
+  "Extensible inline text completion mechanism"
+  :group 'abbrev
+  :group 'convenience
+  :group 'matching)
+
+(defface company-tooltip
+  '((default :foreground "black")
+    (((class color) (min-colors 88) (background light))
+     (:background "cornsilk"))
+    (((class color) (min-colors 88) (background dark))
+     (:background "yellow")))
+  "Face used for the tooltip.")
+
+(defface company-tooltip-selection
+  '((((class color) (min-colors 88) (background light))
+     (:background "light blue"))
+    (((class color) (min-colors 88) (background dark))
+     (:background "orange1"))
+    (t (:background "green")))
+  "Face used for the selection in the tooltip.")
+
+(defface company-tooltip-search
+  '((default :inherit company-tooltip-selection))
+  "Face used for the search string in the tooltip.")
+
+(defface company-tooltip-mouse
+  '((default :inherit highlight))
+  "Face used for the tooltip item under the mouse.")
+
+(defface company-tooltip-common
+  '((((background light))
+     :foreground "darkred")
+    (((background dark))
+     :foreground "red"))
+  "Face used for the common completion in the tooltip.")
+
+(defface company-tooltip-common-selection
+  '((default :inherit company-tooltip-common))
+  "Face used for the selected common completion in the tooltip.")
+
+(defface company-tooltip-annotation
+  '((((background light))
+     :foreground "firebrick4")
+    (((background dark))
+     :foreground "red4"))
+  "Face used for the completion annotation in the tooltip.")
+
+(defface company-tooltip-annotation-selection
+  '((default :inherit company-tooltip-annotation))
+  "Face used for the selected completion annotation in the tooltip.")
+
+(defface company-scrollbar-fg
+  '((((background light))
+     :background "darkred")
+    (((background dark))
+     :background "red"))
+  "Face used for the tooltip scrollbar thumb.")
+
+(defface company-scrollbar-bg
+  '((((background light))
+     :background "wheat")
+    (((background dark))
+     :background "gold"))
+  "Face used for the tooltip scrollbar background.")
+
+(defface company-preview
+  '((((background light))
+     :inherit (company-tooltip-selection company-tooltip))
+    (((background dark))
+     :background "blue4"
+     :foreground "wheat"))
+  "Face used for the completion preview.")
+
+(defface company-preview-common
+  '((((background light))
+     :inherit company-tooltip-common-selection)
+    (((background dark))
+     :inherit company-preview
+     :foreground "red"))
+  "Face used for the common part of the completion preview.")
+
+(defface company-preview-search
+  '((((background light))
+     :inherit company-tooltip-common-selection)
+    (((background dark))
+     :inherit company-preview
+     :background "blue1"))
+  "Face used for the search string in the completion preview.")
+
+(defface company-echo nil
+  "Face used for completions in the echo area.")
+
+(defface company-echo-common
+  '((((background dark)) (:foreground "firebrick1"))
+    (((background light)) (:background "firebrick4")))
+  "Face used for the common part of completions in the echo area.")
+
+(defun company-frontends-set (variable value)
+  ;; Uniquify.
+  (let ((value (delete-dups (copy-sequence value))))
+    (and (memq 'company-pseudo-tooltip-unless-just-one-frontend value)
+         (memq 'company-pseudo-tooltip-frontend value)
+         (error "Pseudo tooltip frontend cannot be used twice"))
+    (and (memq 'company-preview-if-just-one-frontend value)
+         (memq 'company-preview-frontend value)
+         (error "Preview frontend cannot be used twice"))
+    (and (memq 'company-echo value)
+         (memq 'company-echo-metadata-frontend value)
+         (error "Echo area cannot be used twice"))
+    ;; Preview must come last.
+    (dolist (f '(company-preview-if-just-one-frontend company-preview-frontend))
+      (when (cdr (memq f value))
+        (setq value (append (delq f value) (list f)))))
+    (set variable value)))
+
+(defcustom company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
+                               company-preview-if-just-one-frontend
+                               company-echo-metadata-frontend)
+  "The list of active frontends (visualizations).
+Each frontend is a function that takes one argument.  It is called with
+one of the following arguments:
+
+`show': When the visualization should start.
+
+`hide': When the visualization should end.
+
+`update': When the data has been updated.
+
+`pre-command': Before every command that is executed while the
+visualization is active.
+
+`post-command': After every command that is executed while the
+visualization is active.
+
+The visualized data is stored in `company-prefix', `company-candidates',
+`company-common', `company-selection', `company-point' and
+`company-search-string'."
+  :set 'company-frontends-set
+  :type '(repeat (choice (const :tag "echo" company-echo-frontend)
+                         (const :tag "echo, strip common"
+                                company-echo-strip-common-frontend)
+                         (const :tag "show echo meta-data in echo"
+                                company-echo-metadata-frontend)
+                         (const :tag "pseudo tooltip"
+                                company-pseudo-tooltip-frontend)
+                         (const :tag "pseudo tooltip, multiple only"
+                                company-pseudo-tooltip-unless-just-one-frontend)
+                         (const :tag "preview" company-preview-frontend)
+                         (const :tag "preview, unique only"
+                                company-preview-if-just-one-frontend)
+                         (function :tag "custom function" nil))))
+
+(defcustom company-tooltip-limit 10
+  "The maximum number of candidates in the tooltip."
+  :type 'integer)
+
+(defcustom company-tooltip-minimum 6
+  "The minimum height of the tooltip.
+If this many lines are not available, prefer to display the tooltip above."
+  :type 'integer)
+
+(defcustom company-tooltip-minimum-width 0
+  "The minimum width of the tooltip's inner area.
+This doesn't include the margins and the scroll bar."
+  :type 'integer
+  :package-version '(company . "0.8.0"))
+
+(defcustom company-tooltip-margin 1
+  "Width of margin columns to show around the toolip."
+  :type 'integer)
+
+(defcustom company-tooltip-offset-display 'scrollbar
+  "Method using which the tooltip displays scrolling position.
+`scrollbar' means draw a scrollbar to the right of the items.
+`lines' means wrap items in lines with \"before\" and \"after\" counters."
+  :type '(choice (const :tag "Scrollbar" scrollbar)
+                 (const :tag "Two lines" lines)))
+
+(defcustom company-tooltip-align-annotations nil
+  "When non-nil, align annotations to the right tooltip border."
+  :type 'boolean
+  :package-version '(company . "0.7.1"))
+
+(defcustom company-tooltip-flip-when-above nil
+  "Whether to flip the tooltip when it's above the current line."
+  :type 'boolean
+  :package-version '(company . "0.8.1"))
+
+(defvar company-safe-backends
+  '((company-abbrev . "Abbrev")
+    (company-bbdb . "BBDB")
+    (company-capf . "completion-at-point-functions")
+    (company-clang . "Clang")
+    (company-cmake . "CMake")
+    (company-css . "CSS")
+    (company-dabbrev . "dabbrev for plain text")
+    (company-dabbrev-code . "dabbrev for code")
+    (company-eclim . "Eclim (an Eclipse interface)")
+    (company-elisp . "Emacs Lisp")
+    (company-etags . "etags")
+    (company-files . "Files")
+    (company-gtags . "GNU Global")
+    (company-ispell . "Ispell")
+    (company-keywords . "Programming language keywords")
+    (company-nxml . "nxml")
+    (company-oddmuse . "Oddmuse")
+    (company-semantic . "Semantic")
+    (company-tempo . "Tempo templates")
+    (company-xcode . "Xcode")))
+(put 'company-safe-backends 'risky-local-variable t)
+
+(defun company-safe-backends-p (backends)
+  (and (consp backends)
+       (not (cl-dolist (backend backends)
+              (unless (if (consp backend)
+                          (company-safe-backends-p backend)
+                        (assq backend company-safe-backends))
+                (cl-return t))))))
+
+(defcustom company-backends `(,@(unless (version< "24.3.51" emacs-version)
+                                  (list 'company-elisp))
+                              company-bbdb
+                              company-nxml company-css
+                              company-eclim company-semantic company-clang
+                              company-xcode company-cmake
+                              company-capf
+                              (company-dabbrev-code company-gtags company-etags
+                               company-keywords)
+                              company-oddmuse company-files company-dabbrev)
+  "The list of active backends (completion engines).
+
+Only one backend is used at a time.  The choice depends on the order of
+the items in this list, and on the values they return in response to the
+`prefix' command (see below).  But a backend can also be a \"grouped\"
+one (see below).
+
+`company-begin-backend' can be used to start a specific backend,
+`company-other-backend' will skip to the next matching backend in the list.
+
+Each backend is a function that takes a variable number of arguments.
+The first argument is the command requested from the backend.  It is one
+of the following:
+
+`prefix': The backend should return the text to be completed.  It must be
+text immediately before point.  Returning nil from this command passes
+control to the next backend.  The function should return `stop' if it
+should complete but cannot (e.g. if it is in the middle of a string).
+Instead of a string, the backend may return a cons where car is the prefix
+and cdr is used instead of the actual prefix length in the comparison
+against `company-minimum-prefix-length'.  It must be either number or t,
+and in the latter case the test automatically succeeds.
+
+`candidates': The second argument is the prefix to be completed.  The
+return value should be a list of candidates that match the prefix.
+
+Non-prefix matches are also supported (candidates that don't start with the
+prefix, but match it in some backend-defined way).  Backends that use this
+feature must disable cache (return t to `no-cache') and might also want to
+respond to `match'.
+
+Optional commands
+=================
+
+`sorted': Return t here to indicate that the candidates are sorted and will
+not need to be sorted again.
+
+`duplicates': If non-nil, company will take care of removing duplicates
+from the list.
+
+`no-cache': Usually company doesn't ask for candidates again as completion
+progresses, unless the backend returns t for this command.  The second
+argument is the latest prefix.
+
+`ignore-case': Return t here if the backend returns case-insensitive
+matches.  This value is used to determine the longest common prefix (as
+used in `company-complete-common'), and to filter completions when fetching
+them from cache.
+
+`meta': The second argument is a completion candidate.  Return a (short)
+documentation string for it.
+
+`doc-buffer': The second argument is a completion candidate.  Return a
+buffer with documentation for it.  Preferably use `company-doc-buffer'.  If
+not all buffer contents pertain to this candidate, return a cons of buffer
+and window start position.
+
+`location': The second argument is a completion candidate.  Return a cons
+of buffer and buffer location, or of file and line number where the
+completion candidate was defined.
+
+`annotation': The second argument is a completion candidate.  Return a
+string to be displayed inline with the candidate in the popup.  If
+duplicates are removed by company, candidates with equal string values will
+be kept if they have different annotations.  For that to work properly,
+backends should store the related information on candidates using text
+properties.
+
+`match': The second argument is a completion candidate.  Return the index
+after the end of text matching `prefix' within the candidate string.  It
+will be used when rendering the popup.  This command only makes sense for
+backends that provide non-prefix completion.
+
+`require-match': If this returns t, the user is not allowed to enter
+anything not offered as a candidate.  Please don't use that value in normal
+backends.  The default value nil gives the user that choice with
+`company-require-match'.  Return value `never' overrides that option the
+other way around.
+
+`init': Called once for each buffer. The backend can check for external
+programs and files and load any required libraries.  Raising an error here
+will show up in message log once, and the backend will not be used for
+completion.
+
+`post-completion': Called after a completion candidate has been inserted
+into the buffer.  The second argument is the candidate.  Can be used to
+modify it, e.g. to expand a snippet.
+
+The backend should return nil for all commands it does not support or
+does not know about.  It should also be callable interactively and use
+`company-begin-backend' to start itself in that case.
+
+Grouped backends
+================
+
+An element of `company-backends' can also be a list of backends.  The
+completions from backends in such groups are merged, but only from those
+backends which return the same `prefix'.
+
+If a backend command takes a candidate as an argument (e.g. `meta'), the
+call is dispatched to the backend the candidate came from.  In other
+cases (except for `duplicates' and `sorted'), the first non-nil value among
+all the backends is returned.
+
+The group can also contain keywords.  Currently, `:with' and `:sorted'
+keywords are defined.  If the group contains keyword `:with', the backends
+listed after this keyword are ignored for the purpose of the `prefix'
+command.  If the group contains keyword `:sorted', the final list of
+candidates is not sorted after concatenation.
+
+Asynchronous backends
+=====================
+
+The return value of each command can also be a cons (:async . FETCHER)
+where FETCHER is a function of one argument, CALLBACK.  When the data
+arrives, FETCHER must call CALLBACK and pass it the appropriate return
+value, as described above.
+
+True asynchronous operation is only supported for command `candidates', and
+only during idle completion.  Other commands will block the user interface,
+even if the backend uses the asynchronous calling convention."
+  :type `(repeat
+          (choice
+           :tag "backend"
+           ,@(mapcar (lambda (b) `(const :tag ,(cdr b) ,(car b)))
+                     company-safe-backends)
+           (symbol :tag "User defined")
+           (repeat :tag "Merged backends"
+                   (choice :tag "backend"
+                           ,@(mapcar (lambda (b)
+                                       `(const :tag ,(cdr b) ,(car b)))
+                                     company-safe-backends)
+                           (const :tag "With" :with)
+                           (symbol :tag "User defined"))))))
+
+(put 'company-backends 'safe-local-variable 'company-safe-backends-p)
+
+(defcustom company-transformers nil
+  "Functions to change the list of candidates received from backends.
+
+Each function gets called with the return value of the previous one.
+The first one gets passed the list of candidates, already sorted and
+without duplicates."
+  :type '(choice
+          (const :tag "None" nil)
+          (const :tag "Sort by occurrence" (company-sort-by-occurrence))
+          (const :tag "Sort by backend importance"
+                 (company-sort-by-backend-importance))
+          (repeat :tag "User defined" (function))))
+
+(defcustom company-completion-started-hook nil
+  "Hook run when company starts completing.
+The hook is called with one argument that is non-nil if the completion was
+started manually."
+  :type 'hook)
+
+(defcustom company-completion-cancelled-hook nil
+  "Hook run when company cancels completing.
+The hook is called with one argument that is non-nil if the completion was
+aborted manually."
+  :type 'hook)
+
+(defcustom company-completion-finished-hook nil
+  "Hook run when company successfully completes.
+The hook is called with the selected candidate as an argument.
+
+If you indend to use it to post-process candidates from a specific
+backend, consider using the `post-completion' command instead."
+  :type 'hook)
+
+(defcustom company-minimum-prefix-length 3
+  "The minimum prefix length for idle completion."
+  :type '(integer :tag "prefix length"))
+
+(defcustom company-abort-manual-when-too-short nil
+  "If enabled, cancel a manually started completion when the prefix gets
+shorter than both `company-minimum-prefix-length' and the length of the
+prefix it was started from."
+  :type 'boolean
+  :package-version '(company . "0.8.0"))
+
+(defcustom company-require-match 'company-explicit-action-p
+  "If enabled, disallow non-matching input.
+This can be a function do determine if a match is required.
+
+This can be overridden by the backend, if it returns t or `never' to
+`require-match'.  `company-auto-complete' also takes precedence over this."
+  :type '(choice (const :tag "Off" nil)
+                 (function :tag "Predicate function")
+                 (const :tag "On, if user interaction took place"
+                        'company-explicit-action-p)
+                 (const :tag "On" t)))
+
+(defcustom company-auto-complete nil
+  "Determines when to auto-complete.
+If this is enabled, all characters from `company-auto-complete-chars'
+trigger insertion of the selected completion candidate.
+This can also be a function."
+  :type '(choice (const :tag "Off" nil)
+                 (function :tag "Predicate function")
+                 (const :tag "On, if user interaction took place"
+                        'company-explicit-action-p)
+                 (const :tag "On" t)))
+
+(defcustom company-auto-complete-chars '(?\  ?\) ?.)
+  "Determines which characters trigger auto-completion.
+See `company-auto-complete'.  If this is a string, each string character
+tiggers auto-completion.  If it is a list of syntax description characters (see
+`modify-syntax-entry'), all characters with that syntax auto-complete.
+
+This can also be a function, which is called with the new input and should
+return non-nil if company should auto-complete.
+
+A character that is part of a valid candidate never triggers auto-completion."
+  :type '(choice (string :tag "Characters")
+                 (set :tag "Syntax"
+                      (const :tag "Whitespace" ?\ )
+                      (const :tag "Symbol" ?_)
+                      (const :tag "Opening parentheses" ?\()
+                      (const :tag "Closing parentheses" ?\))
+                      (const :tag "Word constituent" ?w)
+                      (const :tag "Punctuation." ?.)
+                      (const :tag "String quote." ?\")
+                      (const :tag "Paired delimiter." ?$)
+                      (const :tag "Expression quote or prefix operator." ?\')
+                      (const :tag "Comment starter." ?<)
+                      (const :tag "Comment ender." ?>)
+                      (const :tag "Character-quote." ?/)
+                      (const :tag "Generic string fence." ?|)
+                      (const :tag "Generic comment fence." ?!))
+                 (function :tag "Predicate function")))
+
+(defcustom company-idle-delay .5
+  "The idle delay in seconds until completion starts automatically.
+The prefix still has to satisfy `company-minimum-prefix-length' before that
+happens.  The value of nil means no idle completion."
+  :type '(choice (const :tag "never (nil)" nil)
+                 (const :tag "immediate (0)" 0)
+                 (number :tag "seconds")))
+
+(defcustom company-begin-commands '(self-insert-command
+                                    org-self-insert-command
+                                    orgtbl-self-insert-command
+                                    c-scope-operator
+                                    c-electric-colon
+                                    c-electric-lt-gt
+                                    c-electric-slash)
+  "A list of commands after which idle completion is allowed.
+If this is t, it can show completions after any command except a few from a
+pre-defined list.  See `company-idle-delay'.
+
+Alternatively, any command with a non-nil `company-begin' property is
+treated as if it was on this list."
+  :type '(choice (const :tag "Any command" t)
+                 (const :tag "Self insert command" '(self-insert-command))
+                 (repeat :tag "Commands" function))
+  :package-version '(company . "0.8.4"))
+
+(defcustom company-continue-commands '(not save-buffer save-some-buffers
+                                           save-buffers-kill-terminal
+                                           save-buffers-kill-emacs)
+  "A list of commands that are allowed during completion.
+If this is t, or if `company-begin-commands' is t, any command is allowed.
+Otherwise, the value must be a list of symbols.  If it starts with `not',
+the cdr is the list of commands that abort completion.  Otherwise, all
+commands except those in that list, or in `company-begin-commands', or
+commands in the `company-' namespace, abort completion."
+  :type '(choice (const :tag "Any command" t)
+                 (cons  :tag "Any except"
+                        (const not)
+                        (repeat :tag "Commands" function))
+                 (repeat :tag "Commands" function)))
+
+(defcustom company-show-numbers nil
+  "If enabled, show quick-access numbers for the first ten candidates."
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "on" t)))
+
+(defcustom company-selection-wrap-around nil
+  "If enabled, selecting item before first or after last wraps around."
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "on" t)))
+
+(defvar company-async-wait 0.03
+  "Pause between checks to see if the value's been set when turning an
+asynchronous call into synchronous.")
+
+(defvar company-async-timeout 2
+  "Maximum wait time for a value to be set during asynchronous call.")
+
+;;; mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar company-mode-map (make-sparse-keymap)
+  "Keymap used by `company-mode'.")
+
+(defvar company-active-map
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "\e\e\e" 'company-abort)
+    (define-key keymap "\C-g" 'company-abort)
+    (define-key keymap (kbd "M-n") 'company-select-next)
+    (define-key keymap (kbd "M-p") 'company-select-previous)
+    (define-key keymap (kbd "<down>") 'company-select-next-or-abort)
+    (define-key keymap (kbd "<up>") 'company-select-previous-or-abort)
+    (define-key keymap [remap scroll-up-command] 'company-next-page)
+    (define-key keymap [remap scroll-down-command] 'company-previous-page)
+    (define-key keymap [down-mouse-1] 'ignore)
+    (define-key keymap [down-mouse-3] 'ignore)
+    (define-key keymap [mouse-1] 'company-complete-mouse)
+    (define-key keymap [mouse-3] 'company-select-mouse)
+    (define-key keymap [up-mouse-1] 'ignore)
+    (define-key keymap [up-mouse-3] 'ignore)
+    (define-key keymap [return] 'company-complete-selection)
+    (define-key keymap (kbd "RET") 'company-complete-selection)
+    (define-key keymap [tab] 'company-complete-common)
+    (define-key keymap (kbd "TAB") 'company-complete-common)
+    (define-key keymap (kbd "<f1>") 'company-show-doc-buffer)
+    (define-key keymap (kbd "C-h") 'company-show-doc-buffer)
+    (define-key keymap "\C-w" 'company-show-location)
+    (define-key keymap "\C-s" 'company-search-candidates)
+    (define-key keymap "\C-\M-s" 'company-filter-candidates)
+    (dotimes (i 10)
+      (define-key keymap (read-kbd-macro (format "M-%d" i)) 'company-complete-number))
+     keymap)
+  "Keymap that is enabled during an active completion.")
+
+(defvar company--disabled-backends nil)
+
+(defun company-init-backend (backend)
+  (and (symbolp backend)
+       (not (fboundp backend))
+       (ignore-errors (require backend nil t)))
+  (cond
+   ((symbolp backend)
+    (condition-case err
+        (progn
+          (funcall backend 'init)
+          (put backend 'company-init t))
+      (error
+       (put backend 'company-init 'failed)
+       (unless (memq backend company--disabled-backends)
+         (message "Company backend '%s' could not be initialized:\n%s"
+                  backend (error-message-string err)))
+       (cl-pushnew backend company--disabled-backends)
+       nil)))
+   ;; No initialization for lambdas.
+   ((functionp backend) t)
+   (t ;; Must be a list.
+    (cl-dolist (b backend)
+      (unless (keywordp b)
+        (company-init-backend b))))))
+
+(defcustom company-lighter-base "company"
+  "Base string to use for the `company-mode' lighter."
+  :type 'string
+  :package-version '(company . "0.8.10"))
+
+(defvar company-lighter '(" "
+                          (company-candidates
+                           (:eval
+                            (if (consp company-backend)
+                                (company--group-lighter (nth company-selection
+                                                             company-candidates)
+                                                        company-lighter-base)
+                              (symbol-name company-backend)))
+                           company-lighter-base))
+  "Mode line lighter for Company.
+
+The value of this variable is a mode line template as in
+`mode-line-format'.")
+
+(put 'company-lighter 'risky-local-variable t)
+
+;;;###autoload
+(define-minor-mode company-mode
+  "\"complete anything\"; is an in-buffer completion framework.
+Completion starts automatically, depending on the values
+`company-idle-delay' and `company-minimum-prefix-length'.
+
+Completion can be controlled with the commands:
+`company-complete-common', `company-complete-selection', `company-complete',
+`company-select-next', `company-select-previous'.  If these commands are
+called before `company-idle-delay', completion will also start.
+
+Completions can be searched with `company-search-candidates' or
+`company-filter-candidates'.  These can be used while completion is
+inactive, as well.
+
+The completion data is retrieved using `company-backends' and displayed
+using `company-frontends'.  If you want to start a specific backend, call
+it interactively or use `company-begin-backend'.
+
+By default, the completions list is sorted alphabetically, unless the
+backend chooses otherwise, or `company-transformers' changes it later.
+
+regular keymap (`company-mode-map'):
+
+\\{company-mode-map}
+keymap during active completions (`company-active-map'):
+
+\\{company-active-map}"
+  nil company-lighter company-mode-map
+  (if company-mode
+      (progn
+        (when (eq company-idle-delay t)
+          (setq company-idle-delay 0)
+          (warn "Setting `company-idle-delay' to t is deprecated.  Set it to 0 instead."))
+        (add-hook 'pre-command-hook 'company-pre-command nil t)
+        (add-hook 'post-command-hook 'company-post-command nil t)
+        (mapc 'company-init-backend company-backends))
+    (remove-hook 'pre-command-hook 'company-pre-command t)
+    (remove-hook 'post-command-hook 'company-post-command t)
+    (company-cancel)
+    (kill-local-variable 'company-point)))
+
+(defcustom company-global-modes t
+  "Modes for which `company-mode' mode is turned on by `global-company-mode'.
+If nil, means no modes.  If t, then all major modes have it turned on.
+If a list, it should be a list of `major-mode' symbol names for which
+`company-mode' should be automatically turned on.  The sense of the list is
+negated if it begins with `not'.  For example:
+ (c-mode c++-mode)
+means that `company-mode' is turned on for buffers in C and C++ modes only.
+ (not message-mode)
+means that `company-mode' is always turned on except in `message-mode' buffers."
+  :type '(choice (const :tag "none" nil)
+                 (const :tag "all" t)
+                 (set :menu-tag "mode specific" :tag "modes"
+                      :value (not)
+                      (const :tag "Except" not)
+                      (repeat :inline t (symbol :tag "mode")))))
+
+;;;###autoload
+(define-globalized-minor-mode global-company-mode company-mode company-mode-on)
+
+(defun company-mode-on ()
+  (when (and (not (or noninteractive (eq (aref (buffer-name) 0) ?\s)))
+             (cond ((eq company-global-modes t)
+                    t)
+                   ((eq (car-safe company-global-modes) 'not)
+                    (not (memq major-mode (cdr company-global-modes))))
+                   (t (memq major-mode company-global-modes))))
+    (company-mode 1)))
+
+(defsubst company-assert-enabled ()
+  (unless company-mode
+    (company-uninstall-map)
+    (error "Company not enabled")))
+
+;;; keymaps ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-my-keymap nil)
+
+(defvar company-emulation-alist '((t . nil)))
+
+(defsubst company-enable-overriding-keymap (keymap)
+  (company-uninstall-map)
+  (setq company-my-keymap keymap))
+
+(defun company-ensure-emulation-alist ()
+  (unless (eq 'company-emulation-alist (car emulation-mode-map-alists))
+    (setq emulation-mode-map-alists
+          (cons 'company-emulation-alist
+                (delq 'company-emulation-alist emulation-mode-map-alists)))))
+
+(defun company-install-map ()
+  (unless (or (cdar company-emulation-alist)
+              (null company-my-keymap))
+    (setf (cdar company-emulation-alist) company-my-keymap)))
+
+(defun company-uninstall-map ()
+  (setf (cdar company-emulation-alist) nil))
+
+;; Hack:
+;; Emacs calculates the active keymaps before reading the event.  That means we
+;; cannot change the keymap from a timer.  So we send a bogus command.
+;; XXX: Even in Emacs 24.4, seems to be needed in the terminal.
+(defun company-ignore ()
+  (interactive)
+  (setq this-command last-command))
+
+(global-set-key '[company-dummy-event] 'company-ignore)
+
+(defun company-input-noop ()
+  (push 'company-dummy-event unread-command-events))
+
+(defun company--posn-col-row (posn)
+  (let ((col (car (posn-col-row posn)))
+        ;; `posn-col-row' doesn't work well with lines of different height.
+        ;; `posn-actual-col-row' doesn't handle multiple-width characters.
+        (row (cdr (or (posn-actual-col-row posn)
+                      ;; When position is non-visible for some reason.
+                      (posn-col-row posn)))))
+    (when (and header-line-format (version< emacs-version "24.3.93.3"))
+      ;; http://debbugs.gnu.org/18384
+      (cl-decf row))
+    (cons (+ col (window-hscroll)) row)))
+
+(defun company--col-row (&optional pos)
+  (company--posn-col-row (posn-at-point pos)))
+
+(defun company--row (&optional pos)
+  (cdr (company--col-row pos)))
+
+;;; backends ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-backend nil)
+
+(defun company-grab (regexp &optional expression limit)
+  (when (looking-back regexp limit)
+    (or (match-string-no-properties (or expression 0)) "")))
+
+(defun company-grab-line (regexp &optional expression)
+  "Return a match string for REGEXP if it matches text before point.
+If EXPRESSION is non-nil, return the match string for the respective
+parenthesized expression in REGEXP.
+Matching is limited to the current line."
+  (company-grab regexp expression (point-at-bol)))
+
+(defun company-grab-symbol ()
+  "If point is at the end of a symbol, return it.
+Otherwise, if point is not inside a symbol, return an empty string."
+  (if (looking-at "\\_>")
+      (buffer-substring (point) (save-excursion (skip-syntax-backward "w_")
+                                                (point)))
+    (unless (and (char-after) (memq (char-syntax (char-after)) '(?w ?_)))
+      "")))
+
+(defun company-grab-word ()
+  "If point is at the end of a word, return it.
+Otherwise, if point is not inside a symbol, return an empty string."
+  (if (looking-at "\\>")
+      (buffer-substring (point) (save-excursion (skip-syntax-backward "w")
+                                                (point)))
+    (unless (and (char-after) (eq (char-syntax (char-after)) ?w))
+      "")))
+
+(defun company-grab-symbol-cons (idle-begin-after-re &optional max-len)
+  "Return a string SYMBOL or a cons (SYMBOL . t).
+SYMBOL is as returned by `company-grab-symbol'.  If the text before poit
+matches IDLE-BEGIN-AFTER-RE, return it wrapped in a cons."
+  (let ((symbol (company-grab-symbol)))
+    (when symbol
+      (save-excursion
+        (forward-char (- (length symbol)))
+        (if (looking-back idle-begin-after-re (if max-len
+                                                  (- (point) max-len)
+                                                (line-beginning-position)))
+            (cons symbol t)
+          symbol)))))
+
+(defun company-in-string-or-comment ()
+  "Return non-nil if point is within a string or comment."
+  (let ((ppss (syntax-ppss)))
+    (or (car (setq ppss (nthcdr 3 ppss)))
+        (car (setq ppss (cdr ppss)))
+        (nth 3 ppss))))
+
+(defun company-call-backend (&rest args)
+  (company--force-sync #'company-call-backend-raw args company-backend))
+
+(defun company--force-sync (fun args backend)
+  (let ((value (apply fun args)))
+    (if (not (eq (car-safe value) :async))
+        value
+      (let ((res 'trash)
+            (start (time-to-seconds)))
+        (funcall (cdr value)
+                 (lambda (result) (setq res result)))
+        (while (eq res 'trash)
+          (if (> (- (time-to-seconds) start) company-async-timeout)
+              (error "Company: backend %s async timeout with args %s"
+                     backend args)
+            (sleep-for company-async-wait)))
+        res))))
+
+(defun company-call-backend-raw (&rest args)
+  (condition-case-unless-debug err
+      (if (functionp company-backend)
+          (apply company-backend args)
+        (apply #'company--multi-backend-adapter company-backend args))
+    (error (error "Company: backend %s error \"%s\" with args %s"
+                  company-backend (error-message-string err) args))))
+
+(defun company--multi-backend-adapter (backends command &rest args)
+  (let ((backends (cl-loop for b in backends
+                           when (not (and (symbolp b)
+                                          (eq 'failed (get b 'company-init))))
+                           collect b)))
+
+    (when (eq command 'prefix)
+      (setq backends (butlast backends (length (member :with backends)))))
+
+    (unless (memq command '(sorted))
+      (setq backends (cl-delete-if #'keywordp backends)))
+
+    (pcase command
+      (`candidates
+       (company--multi-backend-adapter-candidates backends (car args)))
+      (`sorted (memq :sorted backends))
+      (`duplicates t)
+      ((or `prefix `ignore-case `no-cache `require-match)
+       (let (value)
+         (cl-dolist (backend backends)
+           (when (setq value (company--force-sync
+                              backend (cons command args) backend))
+             (cl-return value)))))
+      (_
+       (let ((arg (car args)))
+         (when (> (length arg) 0)
+           (let ((backend (or (get-text-property 0 'company-backend arg)
+                              (car backends))))
+             (apply backend command args))))))))
+
+(defun company--multi-backend-adapter-candidates (backends prefix)
+  (let ((pairs (cl-loop for backend in (cdr backends)
+                        when (equal (company--prefix-str
+                                     (funcall backend 'prefix))
+                                    prefix)
+                        collect (cons (funcall backend 'candidates prefix)
+                                      (let ((b backend))
+                                        (lambda (candidates)
+                                          (mapcar
+                                           (lambda (str)
+                                             (propertize str 'company-backend b))
+                                           candidates)))))))
+    (when (equal (company--prefix-str (funcall (car backends) 'prefix)) prefix)
+      ;; Small perf optimization: don't tag the candidates received
+      ;; from the first backend in the group.
+      (push (cons (funcall (car backends) 'candidates prefix)
+                  'identity)
+            pairs))
+    (company--merge-async pairs (lambda (values) (apply #'append values)))))
+
+(defun company--merge-async (pairs merger)
+  (let ((async (cl-loop for pair in pairs
+                        thereis
+                        (eq :async (car-safe (car pair))))))
+    (if (not async)
+        (funcall merger (cl-loop for (val . mapper) in pairs
+                                 collect (funcall mapper val)))
+      (cons
+       :async
+       (lambda (callback)
+         (let* (lst
+                (pending (mapcar #'car pairs))
+                (finisher (lambda ()
+                            (unless pending
+                              (funcall callback
+                                       (funcall merger
+                                                (nreverse lst)))))))
+           (dolist (pair pairs)
+             (push nil lst)
+             (let* ((cell lst)
+                    (val (car pair))
+                    (mapper (cdr pair))
+                    (this-finisher (lambda (res)
+                                     (setq pending (delq val pending))
+                                     (setcar cell (funcall mapper res))
+                                     (funcall finisher))))
+               (if (not (eq :async (car-safe val)))
+                   (funcall this-finisher val)
+                 (let ((fetcher (cdr val)))
+                   (funcall fetcher this-finisher)))))))))))
+
+(defun company--prefix-str (prefix)
+  (or (car-safe prefix) prefix))
+
+;;; completion mechanism ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-prefix nil)
+
+(defvar-local company-candidates nil)
+
+(defvar-local company-candidates-length nil)
+
+(defvar-local company-candidates-cache nil)
+
+(defvar-local company-candidates-predicate nil)
+
+(defvar-local company-common nil)
+
+(defvar-local company-selection 0)
+
+(defvar-local company-selection-changed nil)
+
+(defvar-local company--manual-action nil
+  "Non-nil, if manual completion took place.")
+
+(defvar-local company--manual-prefix nil)
+
+(defvar company--auto-completion nil
+  "Non-nil when current candidate is being inserted automatically.
+Controlled by `company-auto-complete'.")
+
+(defvar-local company--point-max nil)
+
+(defvar-local company-point nil)
+
+(defvar company-timer nil)
+
+(defsubst company-strip-prefix (str)
+  (substring str (length company-prefix)))
+
+(defun company--insert-candidate (candidate)
+  (when (> (length candidate) 0)
+    (setq candidate (substring-no-properties candidate))
+    ;; XXX: Return value we check here is subject to change.
+    (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
+        (insert (company-strip-prefix candidate))
+      (unless (equal company-prefix candidate)
+        (delete-region (- (point) (length company-prefix)) (point))
+        (insert candidate)))))
+
+(defmacro company-with-candidate-inserted (candidate &rest body)
+  "Evaluate BODY with CANDIDATE temporarily inserted.
+This is a tool for backends that need candidates inserted before they
+can retrieve meta-data for them."
+  (declare (indent 1))
+  `(let ((inhibit-modification-hooks t)
+         (inhibit-point-motion-hooks t)
+         (modified-p (buffer-modified-p)))
+     (company--insert-candidate ,candidate)
+     (unwind-protect
+         (progn ,@body)
+       (delete-region company-point (point))
+       (set-buffer-modified-p modified-p))))
+
+(defun company-explicit-action-p ()
+  "Return whether explicit completion action was taken by the user."
+  (or company--manual-action
+      company-selection-changed))
+
+(defun company-reformat (candidate)
+  ;; company-ispell needs this, because the results are always lower-case
+  ;; It's mory efficient to fix it only when they are displayed.
+  ;; FIXME: Adopt the current text's capitalization instead?
+  (if (eq (company-call-backend 'ignore-case) 'keep-prefix)
+      (concat company-prefix (substring candidate (length company-prefix)))
+    candidate))
+
+(defun company--should-complete ()
+  (and (eq company-idle-delay 'now)
+       (not (or buffer-read-only overriding-terminal-local-map
+                overriding-local-map))
+       ;; Check if in the middle of entering a key combination.
+       (or (equal (this-command-keys-vector) [])
+           (not (keymapp (key-binding (this-command-keys-vector)))))
+       (not (and transient-mark-mode mark-active))))
+
+(defun company--should-continue ()
+  (or (eq t company-begin-commands)
+      (eq t company-continue-commands)
+      (if (eq 'not (car company-continue-commands))
+          (not (memq this-command (cdr company-continue-commands)))
+        (or (memq this-command company-begin-commands)
+            (memq this-command company-continue-commands)
+            (and (symbolp this-command)
+                 (string-match-p "\\`company-" (symbol-name this-command)))))))
+
+(defun company-call-frontends (command)
+  (dolist (frontend company-frontends)
+    (condition-case-unless-debug err
+        (funcall frontend command)
+      (error (error "Company: frontend %s error \"%s\" on command %s"
+                    frontend (error-message-string err) command)))))
+
+(defun company-set-selection (selection &optional force-update)
+  (setq selection
+        (if company-selection-wrap-around
+            (mod selection company-candidates-length)
+          (max 0 (min (1- company-candidates-length) selection))))
+  (when (or force-update (not (equal selection company-selection)))
+    (setq company-selection selection
+          company-selection-changed t)
+    (company-call-frontends 'update)))
+
+(defun company--group-lighter (candidate base)
+  (let ((backend (or (get-text-property 0 'company-backend candidate)
+                     (car company-backend))))
+    (when (and backend (symbolp backend))
+      (let ((name (replace-regexp-in-string "company-\\|-company" ""
+                                            (symbol-name backend))))
+        (format "%s-<%s>" base name)))))
+
+(defun company-update-candidates (candidates)
+  (setq company-candidates-length (length candidates))
+  (if company-selection-changed
+      ;; Try to restore the selection
+      (let ((selected (nth company-selection company-candidates)))
+        (setq company-selection 0
+              company-candidates candidates)
+        (when selected
+          (catch 'found
+            (while candidates
+              (let ((candidate (pop candidates)))
+                (when (and (string= candidate selected)
+                           (equal (company-call-backend 'annotation candidate)
+                                  (company-call-backend 'annotation selected)))
+                  (throw 'found t)))
+              (cl-incf company-selection))
+            (setq company-selection 0
+                  company-selection-changed nil))))
+    (setq company-selection 0
+          company-candidates candidates))
+  ;; Calculate common.
+  (let ((completion-ignore-case (company-call-backend 'ignore-case)))
+    ;; We want to support non-prefix completion, so filtering is the
+    ;; responsibility of each respective backend, not ours.
+    ;; On the other hand, we don't want to replace non-prefix input in
+    ;; `company-complete-common', unless there's only one candidate.
+    (setq company-common
+          (if (cdr company-candidates)
+              (let ((common (try-completion "" company-candidates)))
+                (when (string-prefix-p company-prefix common
+                                       completion-ignore-case)
+                  common))
+            (car company-candidates)))))
+
+(defun company-calculate-candidates (prefix)
+  (let ((candidates (cdr (assoc prefix company-candidates-cache)))
+        (ignore-case (company-call-backend 'ignore-case)))
+    (or candidates
+        (when company-candidates-cache
+          (let ((len (length prefix))
+                (completion-ignore-case ignore-case)
+                prev)
+            (cl-dotimes (i (1+ len))
+              (when (setq prev (cdr (assoc (substring prefix 0 (- len i))
+                                           company-candidates-cache)))
+                (setq candidates (all-completions prefix prev))
+                (cl-return t)))))
+        (progn
+          ;; No cache match, call the backend.
+          (setq candidates (company--preprocess-candidates
+                            (company--fetch-candidates prefix)))
+          ;; Save in cache.
+          (push (cons prefix candidates) company-candidates-cache)))
+    ;; Only now apply the predicate and transformers.
+    (setq candidates (company--postprocess-candidates candidates))
+    (when candidates
+      (if (or (cdr candidates)
+              (not (eq t (compare-strings (car candidates) nil nil
+                                          prefix nil nil ignore-case))))
+          candidates
+        ;; Already completed and unique; don't start.
+        t))))
+
+(defun company--fetch-candidates (prefix)
+  (let ((c (if company--manual-action
+               (company-call-backend 'candidates prefix)
+             (company-call-backend-raw 'candidates prefix)))
+        res)
+    (if (not (eq (car c) :async))
+        c
+      (let ((buf (current-buffer))
+            (win (selected-window))
+            (tick (buffer-chars-modified-tick))
+            (pt (point))
+            (backend company-backend))
+        (funcall
+         (cdr c)
+         (lambda (candidates)
+           (if (not (and candidates (eq res 'done)))
+               ;; There's no completions to display,
+               ;; or the fetcher called us back right away.
+               (setq res candidates)
+             (setq company-backend backend
+                   company-candidates-cache
+                   (list (cons prefix
+                               (company--preprocess-candidates candidates))))
+             (company-idle-begin buf win tick pt)))))
+      ;; FIXME: Relying on the fact that the callers
+      ;; will interpret nil as "do nothing" is shaky.
+      ;; A throw-catch would be one possible improvement.
+      (or res
+          (progn (setq res 'done) nil)))))
+
+(defun company--preprocess-candidates (candidates)
+  (unless (company-call-backend 'sorted)
+    (setq candidates (sort candidates 'string<)))
+  (when (company-call-backend 'duplicates)
+    (setq candidates (company--strip-duplicates candidates)))
+  candidates)
+
+(defun company--postprocess-candidates (candidates)
+  (when (or company-candidates-predicate company-transformers)
+    (setq candidates (copy-sequence candidates)))
+  (when company-candidates-predicate
+    (setq candidates (cl-delete-if-not company-candidates-predicate candidates)))
+  (company--transform-candidates candidates))
+
+(defun company--strip-duplicates (candidates)
+  (let* ((annos 'unk)
+         (str (car candidates))
+         (ref (cdr candidates))
+         res str2 anno2)
+    (while ref
+      (setq str2 (pop ref))
+      (if (not (equal str str2))
+          (progn
+            (push str res)
+            (setq str str2)
+            (setq annos 'unk))
+        (setq anno2 (company-call-backend
+                     'annotation str2))
+        (cond
+         ((null anno2))             ; Skip it.
+         ((when (eq annos 'unk)
+            (let ((ann1 (company-call-backend 'annotation str)))
+              (if (null ann1)
+                  ;; No annotation on the earlier element, drop it.
+                  t
+                (setq annos (list ann1))
+                nil)))
+          (setq annos (list anno2))
+          (setq str str2))
+         ((member anno2 annos))     ; Also skip.
+         (t
+          (push anno2 annos)
+          (push str res)            ; Maintain ordering.
+          (setq str str2)))))
+    (when str (push str res))
+    (nreverse res)))
+
+(defun company--transform-candidates (candidates)
+  (let ((c candidates))
+    (dolist (tr company-transformers)
+      (setq c (funcall tr c)))
+    c))
+
+(defcustom company-occurrence-weight-function
+  #'company-occurrence-prefer-closest-above
+  "Function to weigh matches in `company-sort-by-occurrence'.
+It's called with three arguments: cursor position, the beginning and the
+end of the match."
+  :type '(choice
+          (const :tag "First above point, then below point"
+                 company-occurrence-prefer-closest-above)
+          (const :tag "Prefer closest in any direction"
+                 company-occurrence-prefer-any-closest)))
+
+(defun company-occurrence-prefer-closest-above (pos match-beg match-end)
+  "Give priority to the matches above point, then those below point."
+  (if (< match-beg pos)
+      (- pos match-end)
+    (- match-beg (window-start))))
+
+(defun company-occurrence-prefer-any-closest (pos _match-beg match-end)
+  "Give priority to the matches closest to the point."
+  (abs (- pos match-end)))
+
+(defun company-sort-by-occurrence (candidates)
+  "Sort CANDIDATES according to their occurrences.
+Searches for each in the currently visible part of the current buffer and
+prioritizes the matches according to `company-occurrence-weight-function'.
+The rest of the list is appended unchanged.
+Keywords and function definition names are ignored."
+  (let* ((w-start (window-start))
+         (w-end (window-end))
+         (start-point (point))
+         occurs
+         (noccurs
+          (save-excursion
+            (cl-delete-if
+             (lambda (candidate)
+               (when (catch 'done
+                       (goto-char w-start)
+                       (while (search-forward candidate w-end t)
+                         (when (and (not (eq (point) start-point))
+                                    (save-match-data
+                                      (company--occurrence-predicate)))
+                           (throw 'done t))))
+                 (push
+                  (cons candidate
+                        (funcall company-occurrence-weight-function
+                                 start-point
+                                 (match-beginning 0)
+                                 (match-end 0)))
+                  occurs)
+                 t))
+             candidates))))
+    (nconc
+     (mapcar #'car (sort occurs (lambda (e1 e2) (<= (cdr e1) (cdr e2)))))
+     noccurs)))
+
+(defun company--occurrence-predicate ()
+  (let ((beg (match-beginning 0))
+        (end (match-end 0)))
+    (save-excursion
+      (goto-char end)
+      (and (not (memq (get-text-property (1- (point)) 'face)
+                      '(font-lock-function-name-face
+                        font-lock-keyword-face)))
+           (let ((prefix (company--prefix-str
+                          (company-call-backend 'prefix))))
+             (and (stringp prefix)
+                  (= (length prefix) (- end beg))))))))
+
+(defun company-sort-by-backend-importance (candidates)
+  "Sort CANDIDATES as two priority groups.
+If `company-backend' is a function, do nothing.  If it's a list, move
+candidates from backends before keyword `:with' to the front.  Candidates
+from the rest of the backends in the group, if any, will be left at the end."
+  (if (functionp company-backend)
+      candidates
+    (let ((low-priority (cdr (memq :with company-backend))))
+      (if (null low-priority)
+          candidates
+        (sort candidates
+              (lambda (c1 c2)
+                (and
+                 (let ((b2 (get-text-property 0 'company-backend c2)))
+                   (and b2 (memq b2 low-priority)))
+                 (let ((b1 (get-text-property 0 'company-backend c1)))
+                   (or (not b1) (not (memq b1 low-priority)))))))))))
+
+(defun company-idle-begin (buf win tick pos)
+  (and (eq buf (current-buffer))
+       (eq win (selected-window))
+       (eq tick (buffer-chars-modified-tick))
+       (eq pos (point))
+       (when (company-auto-begin)
+         (company-input-noop)
+         (let ((this-command 'company-idle-begin))
+           (company-post-command)))))
+
+(defun company-auto-begin ()
+  (and company-mode
+       (not company-candidates)
+       (let ((company-idle-delay 'now))
+         (condition-case-unless-debug err
+             (progn
+               (company--perform)
+               ;; Return non-nil if active.
+               company-candidates)
+           (error (message "Company: An error occurred in auto-begin")
+                  (message "%s" (error-message-string err))
+                  (company-cancel))
+           (quit (company-cancel))))))
+
+(defun company-manual-begin ()
+  (interactive)
+  (company-assert-enabled)
+  (setq company--manual-action t)
+  (unwind-protect
+      (let ((company-minimum-prefix-length 0))
+        (or company-candidates
+            (company-auto-begin)))
+    (unless company-candidates
+      (setq company--manual-action nil))))
+
+(defun company-other-backend (&optional backward)
+  (interactive (list current-prefix-arg))
+  (company-assert-enabled)
+  (let* ((after (if company-backend
+                    (cdr (member company-backend company-backends))
+                  company-backends))
+         (before (cdr (member company-backend (reverse company-backends))))
+         (next (if backward
+                   (append before (reverse after))
+                 (append after (reverse before)))))
+    (company-cancel)
+    (cl-dolist (backend next)
+      (when (ignore-errors (company-begin-backend backend))
+        (cl-return t))))
+  (unless company-candidates
+    (error "No other backend")))
+
+(defun company-require-match-p ()
+  (let ((backend-value (company-call-backend 'require-match)))
+    (or (eq backend-value t)
+        (and (not (eq backend-value 'never))
+             (if (functionp company-require-match)
+                 (funcall company-require-match)
+               (eq company-require-match t))))))
+
+(defun company-auto-complete-p (input)
+  "Return non-nil, if input starts with punctuation or parentheses."
+  (and (if (functionp company-auto-complete)
+           (funcall company-auto-complete)
+         company-auto-complete)
+       (if (functionp company-auto-complete-chars)
+           (funcall company-auto-complete-chars input)
+         (if (consp company-auto-complete-chars)
+             (memq (char-syntax (string-to-char input))
+                   company-auto-complete-chars)
+           (string-match (substring input 0 1) company-auto-complete-chars)))))
+
+(defun company--incremental-p ()
+  (and (> (point) company-point)
+       (> (point-max) company--point-max)
+       (not (eq this-command 'backward-delete-char-untabify))
+       (equal (buffer-substring (- company-point (length company-prefix))
+                                company-point)
+              company-prefix)))
+
+(defun company--continue-failed (new-prefix)
+  (let ((input (buffer-substring-no-properties (point) company-point)))
+    (cond
+     ((company-auto-complete-p input)
+      ;; auto-complete
+      (save-excursion
+        (goto-char company-point)
+        (let ((company--auto-completion t))
+          (company-complete-selection))
+        nil))
+     ((and (or (not (company-require-match-p))
+               ;; Don't require match if the new prefix
+               ;; doesn't continue the old one, and the latter was a match.
+               (not (stringp new-prefix))
+               (<= (length new-prefix) (length company-prefix)))
+           (member company-prefix company-candidates))
+      ;; Last input was a success,
+      ;; but we're treating it as an abort + input anyway,
+      ;; like the `unique' case below.
+      (company-cancel 'non-unique))
+     ((company-require-match-p)
+      ;; Wrong incremental input, but required match.
+      (delete-char (- (length input)))
+      (ding)
+      (message "Matching input is required")
+      company-candidates)
+     (t (company-cancel)))))
+
+(defun company--good-prefix-p (prefix)
+  (and (stringp (company--prefix-str prefix)) ;excludes 'stop
+       (or (eq (cdr-safe prefix) t)
+           (let ((len (or (cdr-safe prefix) (length prefix))))
+             (if company--manual-prefix
+                 (or (not company-abort-manual-when-too-short)
+                     ;; Must not be less than minimum or initial length.
+                     (>= len (min company-minimum-prefix-length
+                                  (length company--manual-prefix))))
+               (>= len company-minimum-prefix-length))))))
+
+(defun company--continue ()
+  (when (company-call-backend 'no-cache company-prefix)
+    ;; Don't complete existing candidates, fetch new ones.
+    (setq company-candidates-cache nil))
+  (let* ((new-prefix (company-call-backend 'prefix))
+         (c (when (and (company--good-prefix-p new-prefix)
+                       (setq new-prefix (company--prefix-str new-prefix))
+                       (= (- (point) (length new-prefix))
+                          (- company-point (length company-prefix))))
+              (company-calculate-candidates new-prefix))))
+    (cond
+     ((eq c t)
+      ;; t means complete/unique.
+      ;; Handle it like completion was aborted, to differentiate from user
+      ;; calling one of Company's commands to insert the candidate,
+      ;; not to trigger template expansion, etc.
+      (company-cancel 'unique))
+     ((consp c)
+      ;; incremental match
+      (setq company-prefix new-prefix)
+      (company-update-candidates c)
+      c)
+     ((not (company--incremental-p))
+      (company-cancel))
+     (t (company--continue-failed new-prefix)))))
+
+(defun company--begin-new ()
+  (let (prefix c)
+    (cl-dolist (backend (if company-backend
+                            ;; prefer manual override
+                            (list company-backend)
+                          company-backends))
+      (setq prefix
+            (if (or (symbolp backend)
+                    (functionp backend))
+                (when (or (not (symbolp backend))
+                          (eq t (get backend 'company-init))
+                          (unless (get backend 'company-init)
+                            (company-init-backend backend)))
+                  (funcall backend 'prefix))
+              (company--multi-backend-adapter backend 'prefix)))
+      (when prefix
+        (when (company--good-prefix-p prefix)
+          (setq company-prefix (company--prefix-str prefix)
+                company-backend backend
+                c (company-calculate-candidates company-prefix))
+          (if (not (consp c))
+              (progn
+                (when company--manual-action
+                  (message "No completion found"))
+                (when (eq c t)
+                  ;; t means complete/unique.
+                  ;; Run the hooks anyway, to e.g. clear the cache.
+                  (company-cancel 'unique)))
+            (when company--manual-action
+              (setq company--manual-prefix prefix))
+            (company-update-candidates c)
+            (run-hook-with-args 'company-completion-started-hook
+                                (company-explicit-action-p))
+            (company-call-frontends 'show)))
+        (cl-return c)))))
+
+(defun company--perform ()
+  (or (and company-candidates (company--continue))
+      (and (company--should-complete) (company--begin-new)))
+  (if (not company-candidates)
+      (setq company-backend nil)
+    (setq company-point (point)
+          company--point-max (point-max))
+    (company-ensure-emulation-alist)
+    (company-enable-overriding-keymap company-active-map)
+    (company-call-frontends 'update)))
+
+(defun company-cancel (&optional result)
+  (let ((prefix company-prefix)
+        (backend company-backend))
+    (setq company-backend nil
+          company-prefix nil
+          company-candidates nil
+          company-candidates-length nil
+          company-candidates-cache nil
+          company-candidates-predicate nil
+          company-common nil
+          company-selection 0
+          company-selection-changed nil
+          company--manual-action nil
+          company--manual-prefix nil
+          company--point-max nil
+          company-point nil)
+    (when company-timer
+      (cancel-timer company-timer))
+    (company-echo-cancel t)
+    (company-search-mode 0)
+    (company-call-frontends 'hide)
+    (company-enable-overriding-keymap nil)
+    (when prefix
+      ;; FIXME: RESULT can also be e.g. `unique'.  We should call
+      ;; `company-completion-finished-hook' in that case, with right argument.
+      (if (stringp result)
+          (let ((company-backend backend))
+            (company-call-backend 'pre-completion result)
+            (run-hook-with-args 'company-completion-finished-hook result)
+            (company-call-backend 'post-completion result))
+        (run-hook-with-args 'company-completion-cancelled-hook result))))
+  ;; Make return value explicit.
+  nil)
+
+(defun company-abort ()
+  (interactive)
+  (company-cancel 'abort))
+
+(defun company-finish (result)
+  (company--insert-candidate result)
+  (company-cancel result))
+
+(defsubst company-keep (command)
+  (and (symbolp command) (get command 'company-keep)))
+
+(defun company-pre-command ()
+  (company--electric-restore-window-configuration)
+  (unless (company-keep this-command)
+    (condition-case-unless-debug err
+        (when company-candidates
+          (company-call-frontends 'pre-command)
+          (unless (company--should-continue)
+            (company-abort)))
+      (error (message "Company: An error occurred in pre-command")
+             (message "%s" (error-message-string err))
+             (company-cancel))))
+  (when company-timer
+    (cancel-timer company-timer)
+    (setq company-timer nil))
+  (company-echo-cancel t)
+  (company-uninstall-map))
+
+(defun company-post-command ()
+  (when (null this-command)
+    ;; Happens when the user presses `C-g' while inside
+    ;; `flyspell-post-command-hook', for example.
+    ;; Or any other `post-command-hook' function that can call `sit-for',
+    ;; or any quittable timer function.
+    (company-abort)
+    (setq this-command 'company-abort))
+  (unless (company-keep this-command)
+    (condition-case-unless-debug err
+        (progn
+          (unless (equal (point) company-point)
+            (let (company-idle-delay) ; Against misbehavior while debugging.
+              (company--perform)))
+          (if company-candidates
+              (company-call-frontends 'post-command)
+            (and (numberp company-idle-delay)
+                 (not defining-kbd-macro)
+                 (company--should-begin)
+                 (setq company-timer
+                       (run-with-timer company-idle-delay nil
+                                       'company-idle-begin
+                                       (current-buffer) (selected-window)
+                                       (buffer-chars-modified-tick) (point))))))
+      (error (message "Company: An error occurred in post-command")
+             (message "%s" (error-message-string err))
+             (company-cancel))))
+  (company-install-map))
+
+(defvar company--begin-inhibit-commands '(company-abort
+                                          company-complete-mouse
+                                          company-complete
+                                          company-complete-common
+                                          company-complete-selection
+                                          company-complete-number)
+  "List of commands after which idle completion is (still) disabled when
+`company-begin-commands' is t.")
+
+(defun company--should-begin ()
+  (if (eq t company-begin-commands)
+      (not (memq this-command company--begin-inhibit-commands))
+    (or
+     (memq this-command company-begin-commands)
+     (and (symbolp this-command) (get this-command 'company-begin)))))
+
+;;; search ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defcustom company-search-regexp-function #'regexp-quote
+  "Function to construct the search regexp from input.
+It's called with one argument, the current search input.  It must return
+either a regexp without groups, or one where groups don't intersect and
+each one wraps a part of the input string."
+  :type '(choice
+          (const :tag "Exact match" regexp-quote)
+          (const :tag "Words separated with spaces" company-search-words-regexp)
+          (const :tag "Words separated with spaces, in any order"
+                 company-search-words-in-any-order-regexp)))
+
+(defvar-local company-search-string "")
+
+(defvar company-search-lighter '(" "
+                                 (company-search-filtering "Filter" "Search")
+                                 ": \""
+                                 company-search-string
+                                 "\""))
+
+(defvar-local company-search-filtering nil
+  "Non-nil to filter the completion candidates by the search string")
+
+(defvar-local company--search-old-selection 0)
+
+(defvar-local company--search-old-changed nil)
+
+(defun company-search-words-regexp (input)
+  (mapconcat (lambda (word) (format "\\(%s\\)" (regexp-quote word)))
+             (split-string input " +" t) ".*"))
+
+(defun company-search-words-in-any-order-regexp (input)
+  (let* ((words (mapcar (lambda (word) (format "\\(%s\\)" (regexp-quote word)))
+                        (split-string input " +" t)))
+         (permutations (company--permutations words)))
+    (mapconcat (lambda (words)
+                 (mapconcat #'identity words ".*"))
+               permutations
+               "\\|")))
+
+(defun company--permutations (lst)
+  (if (not lst)
+      '(nil)
+    (cl-mapcan
+     (lambda (e)
+       (mapcar (lambda (perm) (cons e perm))
+               (company--permutations (cl-remove e lst :count 1))))
+     lst)))
+
+(defun company--search (text lines)
+  (let ((re (funcall company-search-regexp-function text))
+        (i 0))
+    (cl-dolist (line lines)
+      (when (string-match-p re line (length company-prefix))
+        (cl-return i))
+      (cl-incf i))))
+
+(defun company-search-keypad ()
+  (interactive)
+  (let* ((name (symbol-name last-command-event))
+         (last-command-event (aref name (1- (length name)))))
+    (company-search-printing-char)))
+
+(defun company-search-printing-char ()
+  (interactive)
+  (company--search-assert-enabled)
+  (let ((ss (concat company-search-string (string last-command-event))))
+    (when company-search-filtering
+      (company--search-update-predicate ss))
+    (company--search-update-string ss)))
+
+(defun company--search-update-predicate (ss)
+  (let* ((re (funcall company-search-regexp-function ss))
+         (company-candidates-predicate
+          (and (not (string= re ""))
+               company-search-filtering
+               (lambda (candidate) (string-match re candidate))))
+         (cc (company-calculate-candidates company-prefix)))
+    (unless cc (error "No match"))
+    (company-update-candidates cc)))
+
+(defun company--search-update-string (new)
+  (let* ((pos (company--search new (nthcdr company-selection company-candidates))))
+    (if (null pos)
+        (ding)
+      (setq company-search-string new)
+      (company-set-selection (+ company-selection pos) t))))
+
+(defun company--search-assert-input ()
+  (company--search-assert-enabled)
+  (when (string= company-search-string "")
+    (error "Empty search string")))
+
+(defun company-search-repeat-forward ()
+  "Repeat the incremental search in completion candidates forward."
+  (interactive)
+  (company--search-assert-input)
+  (let ((pos (company--search company-search-string
+                              (cdr (nthcdr company-selection
+                                           company-candidates)))))
+    (if (null pos)
+        (ding)
+      (company-set-selection (+ company-selection pos 1) t))))
+
+(defun company-search-repeat-backward ()
+  "Repeat the incremental search in completion candidates backwards."
+  (interactive)
+  (company--search-assert-input)
+  (let ((pos (company--search company-search-string
+                              (nthcdr (- company-candidates-length
+                                         company-selection)
+                                      (reverse company-candidates)))))
+    (if (null pos)
+        (ding)
+      (company-set-selection (- company-selection pos 1) t))))
+
+(defun company-search-toggle-filtering ()
+  "Toggle `company-search-filtering'."
+  (interactive)
+  (company--search-assert-enabled)
+  (setq company-search-filtering (not company-search-filtering))
+  (let ((ss company-search-string))
+    (company--search-update-predicate ss)
+    (company--search-update-string ss)))
+
+(defun company-search-abort ()
+  "Abort searching the completion candidates."
+  (interactive)
+  (company--search-assert-enabled)
+  (company-search-mode 0)
+  (company-set-selection company--search-old-selection t)
+  (setq company-selection-changed company--search-old-changed))
+
+(defun company-search-other-char ()
+  (interactive)
+  (company--search-assert-enabled)
+  (company-search-mode 0)
+  (company--unread-last-input))
+
+(defun company-search-delete-char ()
+  (interactive)
+  (company--search-assert-enabled)
+  (if (string= company-search-string "")
+      (ding)
+    (let ((ss (substring company-search-string 0 -1)))
+      (when company-search-filtering
+        (company--search-update-predicate ss))
+      (company--search-update-string ss))))
+
+(defvar company-search-map
+  (let ((i 0)
+        (keymap (make-keymap)))
+    (if (fboundp 'max-char)
+        (set-char-table-range (nth 1 keymap) (cons #x100 (max-char))
+                              'company-search-printing-char)
+      (with-no-warnings
+        ;; obsolete in Emacs 23
+        (let ((l (generic-character-list))
+              (table (nth 1 keymap)))
+          (while l
+            (set-char-table-default table (car l) 'company-search-printing-char)
+            (setq l (cdr l))))))
+    (define-key keymap [t] 'company-search-other-char)
+    (while (< i ?\s)
+      (define-key keymap (make-string 1 i) 'company-search-other-char)
+      (cl-incf i))
+    (while (< i 256)
+      (define-key keymap (vector i) 'company-search-printing-char)
+      (cl-incf i))
+    (dotimes (i 10)
+      (define-key keymap (read (format "[kp-%s]" i)) 'company-search-keypad))
+    (let ((meta-map (make-sparse-keymap)))
+      (define-key keymap (char-to-string meta-prefix-char) meta-map)
+      (define-key keymap [escape] meta-map))
+    (define-key keymap (vector meta-prefix-char t) 'company-search-other-char)
+    (define-key keymap (kbd "M-n") 'company-select-next)
+    (define-key keymap (kbd "M-p") 'company-select-previous)
+    (define-key keymap (kbd "<down>") 'company-select-next-or-abort)
+    (define-key keymap (kbd "<up>") 'company-select-previous-or-abort)
+    (define-key keymap "\e\e\e" 'company-search-other-char)
+    (define-key keymap [escape escape escape] 'company-search-other-char)
+    (define-key keymap (kbd "DEL") 'company-search-delete-char)
+    (define-key keymap [backspace] 'company-search-delete-char)
+    (define-key keymap "\C-g" 'company-search-abort)
+    (define-key keymap "\C-s" 'company-search-repeat-forward)
+    (define-key keymap "\C-r" 'company-search-repeat-backward)
+    (define-key keymap "\C-o" 'company-search-toggle-filtering)
+    (dotimes (i 10)
+      (define-key keymap (read-kbd-macro (format "M-%d" i)) 'company-complete-number))
+    keymap)
+  "Keymap used for incrementally searching the completion candidates.")
+
+(define-minor-mode company-search-mode
+  "Search mode for completion candidates.
+Don't start this directly, use `company-search-candidates' or
+`company-filter-candidates'."
+  nil company-search-lighter nil
+  (if company-search-mode
+      (if (company-manual-begin)
+          (progn
+            (setq company--search-old-selection company-selection
+                  company--search-old-changed company-selection-changed)
+            (company-call-frontends 'update)
+            (company-enable-overriding-keymap company-search-map))
+        (setq company-search-mode nil))
+    (kill-local-variable 'company-search-string)
+    (kill-local-variable 'company-search-filtering)
+    (kill-local-variable 'company--search-old-selection)
+    (kill-local-variable 'company--search-old-changed)
+    (when company-backend
+      (company--search-update-predicate "")
+      (company-call-frontends 'update))
+    (company-enable-overriding-keymap company-active-map)))
+
+(defun company--search-assert-enabled ()
+  (company-assert-enabled)
+  (unless company-search-mode
+    (company-uninstall-map)
+    (error "Company not in search mode")))
+
+(defun company-search-candidates ()
+  "Start searching the completion candidates incrementally.
+
+\\<company-search-map>Search can be controlled with the commands:
+- `company-search-repeat-forward' (\\[company-search-repeat-forward])
+- `company-search-repeat-backward' (\\[company-search-repeat-backward])
+- `company-search-abort' (\\[company-search-abort])
+- `company-search-delete-char' (\\[company-search-delete-char])
+
+Regular characters are appended to the search string.
+
+Customize `company-search-regexp-function' to change how the input
+is interpreted when searching.
+
+The command `company-search-toggle-filtering' (\\[company-search-toggle-filtering])
+uses the search string to filter the completion candidates."
+  (interactive)
+  (company-search-mode 1))
+
+(defvar company-filter-map
+  (let ((keymap (make-keymap)))
+    (define-key keymap [remap company-search-printing-char]
+      'company-filter-printing-char)
+    (set-keymap-parent keymap company-search-map)
+    keymap)
+  "Keymap used for incrementally searching the completion candidates.")
+
+(defun company-filter-candidates ()
+  "Start filtering the completion candidates incrementally.
+This works the same way as `company-search-candidates' immediately
+followed by `company-search-toggle-filtering'."
+  (interactive)
+  (company-search-mode 1)
+  (setq company-search-filtering t))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defun company-select-next (&optional arg)
+  "Select the next candidate in the list.
+
+With ARG, move by that many elements."
+  (interactive "p")
+  (when (company-manual-begin)
+    (company-set-selection (+ (or arg 1) company-selection))))
+
+(defun company-select-previous (&optional arg)
+  "Select the previous candidate in the list.
+
+With ARG, move by that many elements."
+  (interactive "p")
+  (company-select-next (if arg (- arg) -1)))
+
+(defun company-select-next-or-abort (&optional arg)
+  "Select the next candidate if more than one, else abort
+and invoke the normal binding.
+
+With ARG, move by that many elements."
+  (interactive "p")
+  (if (> company-candidates-length 1)
+      (company-select-next arg)
+    (company-abort)
+    (company--unread-last-input)))
+
+(defun company-select-previous-or-abort (&optional arg)
+  "Select the previous candidate if more than one, else abort
+and invoke the normal binding.
+
+With ARG, move by that many elements."
+  (interactive "p")
+  (if (> company-candidates-length 1)
+      (company-select-previous arg)
+    (company-abort)
+    (company--unread-last-input)))
+
+(defun company-next-page ()
+  "Select the candidate one page further."
+  (interactive)
+  (when (company-manual-begin)
+    (company-set-selection (+ company-selection
+                              company-tooltip-limit))))
+
+(defun company-previous-page ()
+  "Select the candidate one page earlier."
+  (interactive)
+  (when (company-manual-begin)
+    (company-set-selection (- company-selection
+                              company-tooltip-limit))))
+
+(defvar company-pseudo-tooltip-overlay)
+
+(defvar company-tooltip-offset)
+
+(defun company--inside-tooltip-p (event-col-row row height)
+  (let* ((ovl company-pseudo-tooltip-overlay)
+         (column (overlay-get ovl 'company-column))
+         (width (overlay-get ovl 'company-width))
+         (evt-col (car event-col-row))
+         (evt-row (cdr event-col-row)))
+    (and (>= evt-col column)
+         (< evt-col (+ column width))
+         (if (> height 0)
+             (and (> evt-row row)
+                  (<= evt-row (+ row height) ))
+           (and (< evt-row row)
+                (>= evt-row (+ row height)))))))
+
+(defun company--event-col-row (event)
+  (company--posn-col-row (event-start event)))
+
+(defun company-select-mouse (event)
+  "Select the candidate picked by the mouse."
+  (interactive "e")
+  (let ((event-col-row (company--event-col-row event))
+        (ovl-row (company--row))
+        (ovl-height (and company-pseudo-tooltip-overlay
+                         (min (overlay-get company-pseudo-tooltip-overlay
+                                           'company-height)
+                              company-candidates-length))))
+    (if (and ovl-height
+             (company--inside-tooltip-p event-col-row ovl-row ovl-height))
+        (progn
+          (company-set-selection (+ (cdr event-col-row)
+                                    (1- company-tooltip-offset)
+                                    (if (and (eq company-tooltip-offset-display 'lines)
+                                             (not (zerop company-tooltip-offset)))
+                                        -1 0)
+                                    (- ovl-row)
+                                    (if (< ovl-height 0)
+                                        (- 1 ovl-height)
+                                      0)))
+          t)
+      (company-abort)
+      (company--unread-last-input)
+      nil)))
+
+(defun company-complete-mouse (event)
+  "Insert the candidate picked by the mouse."
+  (interactive "e")
+  (when (company-select-mouse event)
+    (company-complete-selection)))
+
+(defun company-complete-selection ()
+  "Insert the selected candidate."
+  (interactive)
+  (when (company-manual-begin)
+    (let ((result (nth company-selection company-candidates)))
+      (company-finish result))))
+
+(defun company-complete-common ()
+  "Insert the common part of all candidates."
+  (interactive)
+  (when (company-manual-begin)
+    (if (and (not (cdr company-candidates))
+             (equal company-common (car company-candidates)))
+        (company-complete-selection)
+      (company--insert-candidate company-common))))
+
+(defun company-complete-common-or-cycle (&optional arg)
+  "Insert the common part of all candidates, or select the next one.
+
+With ARG, move by that many elements."
+  (interactive "p")
+  (when (company-manual-begin)
+    (let ((tick (buffer-chars-modified-tick)))
+      (call-interactively 'company-complete-common)
+      (when (eq tick (buffer-chars-modified-tick))
+        (let ((company-selection-wrap-around t)
+              (current-prefix-arg arg))
+          (call-interactively 'company-select-next))))))
+
+(defun company-indent-or-complete-common ()
+  "Indent the current line or region, or complete the common part."
+  (interactive)
+  (cond
+   ((use-region-p)
+    (indent-region (region-beginning) (region-end)))
+   ((let ((old-point (point))
+          (old-tick (buffer-chars-modified-tick))
+          (tab-always-indent t))
+      (call-interactively #'indent-for-tab-command)
+      (when (and (eq old-point (point))
+                 (eq old-tick (buffer-chars-modified-tick)))
+        (company-complete-common))))))
+
+(defun company-complete ()
+  "Insert the common part of all candidates or the current selection.
+The first time this is called, the common part is inserted, the second
+time, or when the selection has been changed, the selected candidate is
+inserted."
+  (interactive)
+  (when (company-manual-begin)
+    (if (or company-selection-changed
+            (eq last-command 'company-complete-common))
+        (call-interactively 'company-complete-selection)
+      (call-interactively 'company-complete-common)
+      (setq this-command 'company-complete-common))))
+
+(defun company-complete-number (n)
+  "Insert the Nth candidate visible in the tooltip.
+To show the number next to the candidates in some backends, enable
+`company-show-numbers'.  When called interactively, uses the last typed
+character, stripping the modifiers.  That character must be a digit."
+  (interactive
+   (list (let* ((type (event-basic-type last-command-event))
+                (char (if (characterp type)
+                          ;; Number on the main row.
+                          type
+                        ;; Keypad number, if bound directly.
+                        (car (last (string-to-list (symbol-name type))))))
+                (n (- char ?0)))
+           (if (zerop n) 10 n))))
+  (when (company-manual-begin)
+    (and (or (< n 1) (> n (- company-candidates-length
+                             company-tooltip-offset)))
+         (error "No candidate number %d" n))
+    (cl-decf n)
+    (company-finish (nth (+ n company-tooltip-offset)
+                         company-candidates))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defconst company-space-strings-limit 100)
+
+(defconst company-space-strings
+  (let (lst)
+    (dotimes (i company-space-strings-limit)
+      (push (make-string (- company-space-strings-limit 1 i) ?\  ) lst))
+    (apply 'vector lst)))
+
+(defun company-space-string (len)
+  (if (< len company-space-strings-limit)
+      (aref company-space-strings len)
+    (make-string len ?\ )))
+
+(defun company-safe-substring (str from &optional to)
+  (if (> from (string-width str))
+      ""
+    (with-temp-buffer
+      (insert str)
+      (move-to-column from)
+      (let ((beg (point)))
+        (if to
+            (progn
+              (move-to-column to)
+              (concat (buffer-substring beg (point))
+                      (let ((padding (- to (current-column))))
+                        (when (> padding 0)
+                          (company-space-string padding)))))
+          (buffer-substring beg (point-max)))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-last-metadata nil)
+
+(defun company-fetch-metadata ()
+  (let ((selected (nth company-selection company-candidates)))
+    (unless (eq selected (car company-last-metadata))
+      (setq company-last-metadata
+            (cons selected (company-call-backend 'meta selected))))
+    (cdr company-last-metadata)))
+
+(defun company-doc-buffer (&optional string)
+  (with-current-buffer (get-buffer-create "*company-documentation*")
+    (erase-buffer)
+    (when string
+      (save-excursion
+        (insert string)))
+    (current-buffer)))
+
+(defvar company--electric-saved-window-configuration nil)
+
+(defvar company--electric-commands
+  '(scroll-other-window scroll-other-window-down mwheel-scroll)
+  "List of Commands that won't break out of electric commands.")
+
+(defun company--electric-restore-window-configuration ()
+  "Restore window configuration (after electric commands)."
+  (when (and company--electric-saved-window-configuration
+             (not (memq this-command company--electric-commands)))
+    (set-window-configuration company--electric-saved-window-configuration)
+    (setq company--electric-saved-window-configuration nil)))
+
+(defmacro company--electric-do (&rest body)
+  (declare (indent 0) (debug t))
+  `(when (company-manual-begin)
+     (cl-assert (null company--electric-saved-window-configuration))
+     (setq company--electric-saved-window-configuration (current-window-configuration))
+     (let ((height (window-height))
+           (row (company--row)))
+       ,@body
+       (and (< (window-height) height)
+            (< (- (window-height) row 2) company-tooltip-limit)
+            (recenter (- (window-height) row 2))))))
+
+(defun company--unread-last-input ()
+  (when last-input-event
+    (clear-this-command-keys t)
+    (setq unread-command-events (list last-input-event))))
+
+(defun company-show-doc-buffer ()
+  "Temporarily show the documentation buffer for the selection."
+  (interactive)
+  (let (other-window-scroll-buffer)
+    (company--electric-do
+      (let* ((selected (nth company-selection company-candidates))
+             (doc-buffer (or (company-call-backend 'doc-buffer selected)
+                             (error "No documentation available")))
+             start)
+        (when (consp doc-buffer)
+          (setq start (cdr doc-buffer)
+                doc-buffer (car doc-buffer)))
+        (setq other-window-scroll-buffer (get-buffer doc-buffer))
+        (let ((win (display-buffer doc-buffer t)))
+          (set-window-start win (if start start (point-min))))))))
+(put 'company-show-doc-buffer 'company-keep t)
+
+(defun company-show-location ()
+  "Temporarily display a buffer showing the selected candidate in context."
+  (interactive)
+  (let (other-window-scroll-buffer)
+    (company--electric-do
+      (let* ((selected (nth company-selection company-candidates))
+             (location (company-call-backend 'location selected))
+             (pos (or (cdr location) (error "No location available")))
+             (buffer (or (and (bufferp (car location)) (car location))
+                         (find-file-noselect (car location) t))))
+        (setq other-window-scroll-buffer (get-buffer buffer))
+        (with-selected-window (display-buffer buffer t)
+          (save-restriction
+            (widen)
+            (if (bufferp (car location))
+                (goto-char pos)
+              (goto-char (point-min))
+              (forward-line (1- pos))))
+          (set-window-start nil (point)))))))
+(put 'company-show-location 'company-keep t)
+
+;;; package functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-callback nil)
+
+(defun company-remove-callback (&optional ignored)
+  (remove-hook 'company-completion-finished-hook company-callback t)
+  (remove-hook 'company-completion-cancelled-hook 'company-remove-callback t)
+  (remove-hook 'company-completion-finished-hook 'company-remove-callback t))
+
+(defun company-begin-backend (backend &optional callback)
+  "Start a completion at point using BACKEND."
+  (interactive (let ((val (completing-read "Company backend: "
+                                           obarray
+                                           'functionp nil "company-")))
+                 (when val
+                   (list (intern val)))))
+  (when (setq company-callback callback)
+    (add-hook 'company-completion-finished-hook company-callback nil t))
+  (add-hook 'company-completion-cancelled-hook 'company-remove-callback nil t)
+  (add-hook 'company-completion-finished-hook 'company-remove-callback nil t)
+  (setq company-backend backend)
+  ;; Return non-nil if active.
+  (or (company-manual-begin)
+      (error "Cannot complete at point")))
+
+(defun company-begin-with (candidates
+                           &optional prefix-length require-match callback)
+  "Start a completion at point.
+CANDIDATES is the list of candidates to use and PREFIX-LENGTH is the length
+of the prefix that already is in the buffer before point.
+It defaults to 0.
+
+CALLBACK is a function called with the selected result if the user
+successfully completes the input.
+
+Example: \(company-begin-with '\(\"foo\" \"foobar\" \"foobarbaz\"\)\)"
+  (let ((begin-marker (copy-marker (point) t)))
+    (company-begin-backend
+     (lambda (command &optional arg &rest ignored)
+       (pcase command
+         (`prefix
+          (when (equal (point) (marker-position begin-marker))
+            (buffer-substring (- (point) (or prefix-length 0)) (point))))
+         (`candidates
+          (all-completions arg candidates))
+         (`require-match
+          require-match)))
+     callback)))
+
+(declare-function find-library-name "find-func")
+(declare-function lm-version "lisp-mnt")
+
+(defun company-version (&optional show-version)
+  "Get the Company version as string.
+
+If SHOW-VERSION is non-nil, show the version in the echo area."
+  (interactive (list t))
+  (with-temp-buffer
+    (require 'find-func)
+    (insert-file-contents (find-library-name "company"))
+    (require 'lisp-mnt)
+    (if show-version
+        (message "Company version: %s" (lm-version))
+      (lm-version))))
+
+(defun company-diag ()
+  "Pop a buffer with information about completions at point."
+  (interactive)
+  (let* ((bb company-backends)
+         backend
+         (prefix (cl-loop for b in bb
+                          thereis (let ((company-backend b))
+                                    (setq backend b)
+                                    (company-call-backend 'prefix))))
+         cc annotations)
+    (when (stringp prefix)
+      (let ((company-backend backend))
+        (setq cc (company-call-backend 'candidates prefix)
+              annotations
+              (mapcar
+               (lambda (c) (cons c (company-call-backend 'annotation c)))
+               cc))))
+    (pop-to-buffer (get-buffer-create "*company-diag*"))
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (insert (format "Emacs %s (%s) of %s on %s"
+                    emacs-version system-configuration
+                    (format-time-string "%Y-%m-%d" emacs-build-time)
+                    emacs-build-system))
+    (insert "\nCompany " (company-version) "\n\n")
+    (insert "company-backends: " (pp-to-string bb))
+    (insert "\n")
+    (insert "Used backend: " (pp-to-string backend))
+    (insert "\n")
+    (insert "Prefix: " (pp-to-string prefix))
+    (insert "\n")
+    (insert (message  "Completions:"))
+    (unless cc (insert " none"))
+    (save-excursion
+      (dolist (c annotations)
+        (insert "\n  " (prin1-to-string (car c)))
+        (when (cdr c)
+          (insert " " (prin1-to-string (cdr c))))))
+    (special-mode)))
+
+;;; pseudo-tooltip ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-pseudo-tooltip-overlay nil)
+
+(defvar-local company-tooltip-offset 0)
+
+(defun company-tooltip--lines-update-offset (selection num-lines limit)
+  (cl-decf limit 2)
+  (setq company-tooltip-offset
+        (max (min selection company-tooltip-offset)
+             (- selection -1 limit)))
+
+  (when (<= company-tooltip-offset 1)
+    (cl-incf limit)
+    (setq company-tooltip-offset 0))
+
+  (when (>= company-tooltip-offset (- num-lines limit 1))
+    (cl-incf limit)
+    (when (= selection (1- num-lines))
+      (cl-decf company-tooltip-offset)
+      (when (<= company-tooltip-offset 1)
+        (setq company-tooltip-offset 0)
+        (cl-incf limit))))
+
+  limit)
+
+(defun company-tooltip--simple-update-offset (selection _num-lines limit)
+  (setq company-tooltip-offset
+        (if (< selection company-tooltip-offset)
+            selection
+          (max company-tooltip-offset
+               (- selection limit -1)))))
+
+;;; propertize
+
+(defsubst company-round-tab (arg)
+  (* (/ (+ arg tab-width) tab-width) tab-width))
+
+(defun company-plainify (str)
+  (let ((prefix (get-text-property 0 'line-prefix str)))
+    (when prefix ; Keep the original value unmodified, for no special reason.
+      (setq str (concat prefix str))
+      (remove-text-properties 0 (length str) '(line-prefix) str)))
+  (let* ((pieces (split-string str "\t"))
+         (copy pieces))
+    (while (cdr copy)
+      (setcar copy (company-safe-substring
+                    (car copy) 0 (company-round-tab (string-width (car copy)))))
+      (pop copy))
+    (apply 'concat pieces)))
+
+(defun company-fill-propertize (value annotation width selected left right)
+  (let* ((margin (length left))
+         (common (or (company-call-backend 'match value)
+                     (if company-common
+                         (string-width company-common)
+                       0)))
+         (_ (setq value (company--pre-render value)
+                  annotation (and annotation (company--pre-render annotation t))))
+         (ann-ralign company-tooltip-align-annotations)
+         (ann-truncate (< width
+                          (+ (length value) (length annotation)
+                             (if ann-ralign 1 0))))
+         (ann-start (+ margin
+                       (if ann-ralign
+                           (if ann-truncate
+                               (1+ (length value))
+                             (- width (length annotation)))
+                         (length value))))
+         (ann-end (min (+ ann-start (length annotation)) (+ margin width)))
+         (line (concat left
+                       (if (or ann-truncate (not ann-ralign))
+                           (company-safe-substring
+                            (concat value
+                                    (when (and annotation ann-ralign) " ")
+                                    annotation)
+                            0 width)
+                         (concat
+                          (company-safe-substring value 0
+                                                  (- width (length annotation)))
+                          annotation))
+                       right)))
+    (setq common (+ (min common width) margin))
+    (setq width (+ width margin (length right)))
+
+    (font-lock-append-text-property 0 width 'mouse-face
+                                    'company-tooltip-mouse
+                                    line)
+    (when (< ann-start ann-end)
+      (font-lock-append-text-property ann-start ann-end 'face
+                                      (if selected
+                                          'company-tooltip-annotation-selection
+                                        'company-tooltip-annotation)
+                                      line))
+    (font-lock-prepend-text-property margin common 'face
+                                     (if selected
+                                         'company-tooltip-common-selection
+                                       'company-tooltip-common)
+                                     line)
+    (when selected
+      (if (let ((re (funcall company-search-regexp-function
+                             company-search-string)))
+            (and (not (string= re ""))
+                 (string-match re value (length company-prefix))))
+          (pcase-dolist (`(,mbeg . ,mend) (company--search-chunks))
+            (let ((beg (+ margin mbeg))
+                  (end (+ margin mend))
+                  (width (- width (length right))))
+              (when (< beg width)
+                (font-lock-prepend-text-property beg (min end width)
+                                                 'face 'company-tooltip-search
+                                                 line))))
+        (font-lock-append-text-property 0 width 'face
+                                        'company-tooltip-selection
+                                        line)))
+    (font-lock-append-text-property 0 width 'face
+                                    'company-tooltip
+                                    line)
+    line))
+
+(defun company--search-chunks ()
+  (let ((md (match-data t))
+        res)
+    (if (<= (length md) 2)
+        (push (cons (nth 0 md) (nth 1 md)) res)
+      (while (setq md (nthcdr 2 md))
+        (when (car md)
+          (push (cons (car md) (cadr md)) res))))
+    res))
+
+(defun company--pre-render (str &optional annotation-p)
+  (or (company-call-backend 'pre-render str annotation-p)
+      (progn
+        (when (or (text-property-not-all 0 (length str) 'face nil str)
+                  (text-property-not-all 0 (length str) 'mouse-face nil str))
+          (setq str (copy-sequence str))
+          (remove-text-properties 0 (length str)
+                                  '(face nil font-lock-face nil mouse-face nil)
+                                  str))
+        str)))
+
+(defun company--clean-string (str)
+  (replace-regexp-in-string
+   "\\([^[:graph:] ]\\)\\|\\(\ufeff\\)\\|[[:multibyte:]]"
+   (lambda (match)
+     (cond
+      ((match-beginning 1)
+       ;; FIXME: Better char for 'non-printable'?
+       ;; We shouldn't get any of these, but sometimes we might.
+       "\u2017")
+      ((match-beginning 2)
+       ;; Zero-width non-breakable space.
+       "")
+      ((> (string-width match) 1)
+       (concat
+        (make-string (1- (string-width match)) ?\ufeff)
+        match))
+      (t match)))
+   str))
+
+;;; replace
+
+(defun company-buffer-lines (beg end)
+  (goto-char beg)
+  (let (lines lines-moved)
+    (while (and (not (eobp)) ; http://debbugs.gnu.org/19553
+                (> (setq lines-moved (vertical-motion 1)) 0)
+                (<= (point) end))
+      (let ((bound (min end (point))))
+        ;; A visual line can contain several physical lines (e.g. with outline's
+        ;; folding overlay).  Take only the first one.
+        (push (buffer-substring beg
+                                (save-excursion
+                                  (goto-char beg)
+                                  (re-search-forward "$" bound 'move)
+                                  (point)))
+              lines))
+      ;; One physical line can be displayed as several visual ones as well:
+      ;; add empty strings to the list, to even the count.
+      (dotimes (_ (1- lines-moved))
+        (push "" lines))
+      (setq beg (point)))
+    (unless (eq beg end)
+      (push (buffer-substring beg end) lines))
+    (nreverse lines)))
+
+(defun company-modify-line (old new offset)
+  (concat (company-safe-substring old 0 offset)
+          new
+          (company-safe-substring old (+ offset (length new)))))
+
+(defsubst company--length-limit (lst limit)
+  (if (nthcdr limit lst)
+      limit
+    (length lst)))
+
+(defsubst company--window-height ()
+  (if (fboundp 'window-screen-lines)
+      (floor (window-screen-lines))
+    (window-body-height)))
+
+(defun company--window-width ()
+  (let ((ww (window-body-width)))
+    ;; Account for the line continuation column.
+    (when (zerop (cadr (window-fringes)))
+      (cl-decf ww))
+    (unless (or (display-graphic-p)
+                (version< "24.3.1" emacs-version))
+      ;; Emacs 24.3 and earlier included margins
+      ;; in window-width when in TTY.
+      (cl-decf ww
+               (let ((margins (window-margins)))
+                 (+ (or (car margins) 0)
+                    (or (cdr margins) 0)))))
+    (when (and word-wrap
+               (version< emacs-version "24.4.51.5"))
+      ;; http://debbugs.gnu.org/19300
+      (cl-decf ww))
+    ;; whitespace-mode with newline-mark
+    (when (and buffer-display-table
+               (aref buffer-display-table ?\n))
+      (cl-decf ww (1- (length (aref buffer-display-table ?\n)))))
+    ww))
+
+(defun company--replacement-string (lines old column nl &optional align-top)
+  (cl-decf column company-tooltip-margin)
+
+  (when (and align-top company-tooltip-flip-when-above)
+    (setq lines (reverse lines)))
+
+  (let ((width (length (car lines)))
+        (remaining-cols (- (+ (company--window-width) (window-hscroll))
+                           column)))
+    (when (> width remaining-cols)
+      (cl-decf column (- width remaining-cols))))
+
+  (let ((offset (and (< column 0) (- column)))
+        new)
+    (when offset
+      (setq column 0))
+    (when align-top
+      ;; untouched lines first
+      (dotimes (_ (- (length old) (length lines)))
+        (push (pop old) new)))
+    ;; length into old lines.
+    (while old
+      (push (company-modify-line (pop old)
+                                 (company--offset-line (pop lines) offset)
+                                 column)
+            new))
+    ;; Append whole new lines.
+    (while lines
+      (push (concat (company-space-string column)
+                    (company--offset-line (pop lines) offset))
+            new))
+
+    (let ((str (concat (when nl " \n")
+                       (mapconcat 'identity (nreverse new) "\n")
+                       "\n")))
+      (font-lock-append-text-property 0 (length str) 'face 'default str)
+      (when nl (put-text-property 0 1 'cursor t str))
+      str)))
+
+(defun company--offset-line (line offset)
+  (if (and offset line)
+      (substring line offset)
+    line))
+
+(defun company--create-lines (selection limit)
+  (let ((len company-candidates-length)
+        (window-width (company--window-width))
+        lines
+        width
+        lines-copy
+        items
+        previous
+        remainder
+        scrollbar-bounds)
+
+    ;; Maybe clear old offset.
+    (when (< len (+ company-tooltip-offset limit))
+      (setq company-tooltip-offset 0))
+
+    ;; Scroll to offset.
+    (if (eq company-tooltip-offset-display 'lines)
+        (setq limit (company-tooltip--lines-update-offset selection len limit))
+      (company-tooltip--simple-update-offset selection len limit))
+
+    (cond
+     ((eq company-tooltip-offset-display 'scrollbar)
+      (setq scrollbar-bounds (company--scrollbar-bounds company-tooltip-offset
+                                                        limit len)))
+     ((eq company-tooltip-offset-display 'lines)
+      (when (> company-tooltip-offset 0)
+        (setq previous (format "...(%d)" company-tooltip-offset)))
+      (setq remainder (- len limit company-tooltip-offset)
+            remainder (when (> remainder 0)
+                        (setq remainder (format "...(%d)" remainder))))))
+
+    (cl-decf selection company-tooltip-offset)
+    (setq width (max (length previous) (length remainder))
+          lines (nthcdr company-tooltip-offset company-candidates)
+          len (min limit len)
+          lines-copy lines)
+
+    (cl-decf window-width (* 2 company-tooltip-margin))
+    (when scrollbar-bounds (cl-decf window-width))
+
+    (dotimes (_ len)
+      (let* ((value (pop lines-copy))
+             (annotation (company-call-backend 'annotation value)))
+        (setq value (company--clean-string (company-reformat value)))
+        (when annotation
+          (when company-tooltip-align-annotations
+            ;; `lisp-completion-at-point' adds a space.
+            (setq annotation (comment-string-strip annotation t nil)))
+          (setq annotation (company--clean-string annotation)))
+        (push (cons value annotation) items)
+        (setq width (max (+ (length value)
+                            (if (and annotation company-tooltip-align-annotations)
+                                (1+ (length annotation))
+                              (length annotation)))
+                         width))))
+
+    (setq width (min window-width
+                     (max company-tooltip-minimum-width
+                          (if company-show-numbers
+                              (+ 2 width)
+                            width))))
+
+    (let ((items (nreverse items))
+          (numbered (if company-show-numbers 0 99999))
+          new)
+      (when previous
+        (push (company--scrollpos-line previous width) new))
+
+      (dotimes (i len)
+        (let* ((item (pop items))
+               (str (car item))
+               (annotation (cdr item))
+               (right (company-space-string company-tooltip-margin))
+               (width width))
+          (when (< numbered 10)
+            (cl-decf width 2)
+            (cl-incf numbered)
+            (setq right (concat (format " %d" (mod numbered 10)) right)))
+          (push (concat
+                 (company-fill-propertize str annotation
+                                          width (equal i selection)
+                                          (company-space-string
+                                           company-tooltip-margin)
+                                          right)
+                 (when scrollbar-bounds
+                   (company--scrollbar i scrollbar-bounds)))
+                new)))
+
+      (when remainder
+        (push (company--scrollpos-line remainder width) new))
+
+      (nreverse new))))
+
+(defun company--scrollbar-bounds (offset limit length)
+  (when (> length limit)
+    (let* ((size (ceiling (* limit (float limit)) length))
+           (lower (floor (* limit (float offset)) length))
+           (upper (+ lower size -1)))
+      (cons lower upper))))
+
+(defun company--scrollbar (i bounds)
+  (propertize " " 'face
+              (if (and (>= i (car bounds)) (<= i (cdr bounds)))
+                  'company-scrollbar-fg
+                'company-scrollbar-bg)))
+
+(defun company--scrollpos-line (text width)
+  (propertize (concat (company-space-string company-tooltip-margin)
+                      (company-safe-substring text 0 width)
+                      (company-space-string company-tooltip-margin))
+              'face 'company-tooltip))
+
+;; show
+
+(defun company--pseudo-tooltip-height ()
+  "Calculate the appropriate tooltip height.
+Returns a negative number if the tooltip should be displayed above point."
+  (let* ((lines (company--row))
+         (below (- (company--window-height) 1 lines)))
+    (if (and (< below (min company-tooltip-minimum company-candidates-length))
+             (> lines below))
+        (- (max 3 (min company-tooltip-limit lines)))
+      (max 3 (min company-tooltip-limit below)))))
+
+(defun company-pseudo-tooltip-show (row column selection)
+  (company-pseudo-tooltip-hide)
+  (save-excursion
+
+    (let* ((height (company--pseudo-tooltip-height))
+           above)
+
+      (when (< height 0)
+        (setq row (+ row height -1)
+              above t))
+
+      (let* ((nl (< (move-to-window-line row) row))
+             (beg (point))
+             (end (save-excursion
+                    (move-to-window-line (+ row (abs height)))
+                    (point)))
+             (ov (make-overlay beg end nil t))
+             (args (list (mapcar 'company-plainify
+                                 (company-buffer-lines beg end))
+                         column nl above)))
+
+        (setq company-pseudo-tooltip-overlay ov)
+        (overlay-put ov 'company-replacement-args args)
+
+        (let ((lines (company--create-lines selection (abs height))))
+          (overlay-put ov 'company-display
+                       (apply 'company--replacement-string lines args))
+          (overlay-put ov 'company-width (string-width (car lines))))
+
+        (overlay-put ov 'company-column column)
+        (overlay-put ov 'company-height height)))))
+
+(defun company-pseudo-tooltip-show-at-point (pos column-offset)
+  (let* ((col-row (company--col-row pos))
+         (col (- (car col-row) column-offset)))
+    (when (< col 0) (setq col 0))
+    (company-pseudo-tooltip-show (1+ (cdr col-row)) col company-selection)))
+
+(defun company-pseudo-tooltip-edit (selection)
+  (let* ((height (overlay-get company-pseudo-tooltip-overlay 'company-height))
+         (lines  (company--create-lines selection (abs height))))
+    (overlay-put company-pseudo-tooltip-overlay 'company-width
+                 (string-width (car lines)))
+    (overlay-put company-pseudo-tooltip-overlay 'company-display
+                 (apply 'company--replacement-string
+                        lines
+                        (overlay-get company-pseudo-tooltip-overlay
+                                     'company-replacement-args)))))
+
+(defun company-pseudo-tooltip-hide ()
+  (when company-pseudo-tooltip-overlay
+    (delete-overlay company-pseudo-tooltip-overlay)
+    (setq company-pseudo-tooltip-overlay nil)))
+
+(defun company-pseudo-tooltip-hide-temporarily ()
+  (when (overlayp company-pseudo-tooltip-overlay)
+    (overlay-put company-pseudo-tooltip-overlay 'invisible nil)
+    (overlay-put company-pseudo-tooltip-overlay 'line-prefix nil)
+    (overlay-put company-pseudo-tooltip-overlay 'after-string nil)
+    (overlay-put company-pseudo-tooltip-overlay 'display nil)))
+
+(defun company-pseudo-tooltip-unhide ()
+  (when company-pseudo-tooltip-overlay
+    (let* ((ov company-pseudo-tooltip-overlay)
+           (disp (overlay-get ov 'company-display)))
+      ;; Beat outline's folding overlays, at least.
+      (overlay-put ov 'priority 1)
+      ;; No (extra) prefix for the first line.
+      (overlay-put ov 'line-prefix "")
+      ;; `display' is better
+      ;; (http://debbugs.gnu.org/18285, http://debbugs.gnu.org/20847),
+      ;; but it doesn't work on 0-length overlays.
+      (if (< (overlay-start ov) (overlay-end ov))
+          (overlay-put ov 'display disp)
+        (overlay-put ov 'after-string disp)
+        (overlay-put ov 'invisible t))
+      (overlay-put ov 'window (selected-window)))))
+
+(defun company-pseudo-tooltip-guard ()
+  (cons
+   (save-excursion (beginning-of-visual-line))
+   (let ((ov company-pseudo-tooltip-overlay)
+         (overhang (save-excursion (end-of-visual-line)
+                                   (- (line-end-position) (point)))))
+     (when (>= (overlay-get ov 'company-height) 0)
+       (cons
+        (buffer-substring-no-properties (point) (overlay-start ov))
+        (when (>= overhang 0) overhang))))))
+
+(defun company-pseudo-tooltip-frontend (command)
+  "`company-mode' frontend similar to a tooltip but based on overlays."
+  (cl-case command
+    (pre-command (company-pseudo-tooltip-hide-temporarily))
+    (post-command
+     (unless (when (overlayp company-pseudo-tooltip-overlay)
+              (let* ((ov company-pseudo-tooltip-overlay)
+                     (old-height (overlay-get ov 'company-height))
+                     (new-height (company--pseudo-tooltip-height)))
+                (and
+                 (>= (* old-height new-height) 0)
+                 (>= (abs old-height) (abs new-height))
+                 (equal (company-pseudo-tooltip-guard)
+                        (overlay-get ov 'company-guard)))))
+       ;; Redraw needed.
+       (company-pseudo-tooltip-show-at-point (point) (length company-prefix))
+       (overlay-put company-pseudo-tooltip-overlay
+                    'company-guard (company-pseudo-tooltip-guard)))
+     (company-pseudo-tooltip-unhide))
+    (hide (company-pseudo-tooltip-hide)
+          (setq company-tooltip-offset 0))
+    (update (when (overlayp company-pseudo-tooltip-overlay)
+              (company-pseudo-tooltip-edit company-selection)))))
+
+(defun company-pseudo-tooltip-unless-just-one-frontend (command)
+  "`company-pseudo-tooltip-frontend', but not shown for single candidates."
+  (unless (and (eq command 'post-command)
+               (company--show-inline-p))
+    (company-pseudo-tooltip-frontend command)))
+
+;;; overlay ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-preview-overlay nil)
+
+(defun company-preview-show-at-point (pos)
+  (company-preview-hide)
+
+  (let ((completion (nth company-selection company-candidates)))
+    (setq completion (copy-sequence (company--pre-render completion)))
+    (font-lock-append-text-property 0 (length completion)
+                                    'face 'company-preview
+                                    completion)
+    (font-lock-prepend-text-property 0 (length company-common)
+                                     'face 'company-preview-common
+                                     completion)
+
+    ;; Add search string
+    (and (string-match (funcall company-search-regexp-function
+                                company-search-string)
+                       completion)
+         (pcase-dolist (`(,mbeg . ,mend) (company--search-chunks))
+           (font-lock-prepend-text-property mbeg mend
+                                            'face 'company-preview-search
+                                            completion)))
+
+    (setq completion (company-strip-prefix completion))
+
+    (and (equal pos (point))
+         (not (equal completion ""))
+         (add-text-properties 0 1 '(cursor 1) completion))
+
+    (let* ((beg pos)
+           (pto company-pseudo-tooltip-overlay)
+           (ptf-workaround (and
+                            pto
+                            (char-before pos)
+                            (eq pos (overlay-start pto)))))
+      ;; Try to accomodate for the pseudo-tooltip overlay,
+      ;; which may start at the same position if it's at eol.
+      (when ptf-workaround
+        (cl-decf beg)
+        (setq completion (concat (buffer-substring beg pos) completion)))
+
+      (setq company-preview-overlay (make-overlay beg pos))
+
+      (let ((ov company-preview-overlay))
+        (overlay-put ov (if ptf-workaround 'display 'after-string)
+                     completion)
+        (overlay-put ov 'window (selected-window))))))
+
+(defun company-preview-hide ()
+  (when company-preview-overlay
+    (delete-overlay company-preview-overlay)
+    (setq company-preview-overlay nil)))
+
+(defun company-preview-frontend (command)
+  "`company-mode' frontend showing the selection as if it had been inserted."
+  (pcase command
+    (`pre-command (company-preview-hide))
+    (`post-command (company-preview-show-at-point (point)))
+    (`hide (company-preview-hide))))
+
+(defun company-preview-if-just-one-frontend (command)
+  "`company-preview-frontend', but only shown for single candidates."
+  (when (or (not (eq command 'post-command))
+            (company--show-inline-p))
+    (company-preview-frontend command)))
+
+(defun company--show-inline-p ()
+  (and (not (cdr company-candidates))
+       company-common
+       (or (eq (company-call-backend 'ignore-case) 'keep-prefix)
+           (string-prefix-p company-prefix company-common))))
+
+;;; echo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar-local company-echo-last-msg nil)
+
+(defvar company-echo-timer nil)
+
+(defvar company-echo-delay .01)
+
+(defun company-echo-show (&optional getter)
+  (when getter
+    (setq company-echo-last-msg (funcall getter)))
+  (let ((message-log-max nil))
+    (if company-echo-last-msg
+        (message "%s" company-echo-last-msg)
+      (message ""))))
+
+(defun company-echo-show-soon (&optional getter)
+  (company-echo-cancel)
+  (setq company-echo-timer (run-with-timer 0 nil 'company-echo-show getter)))
+
+(defun company-echo-cancel (&optional unset)
+  (when company-echo-timer
+    (cancel-timer company-echo-timer))
+  (when unset
+    (setq company-echo-timer nil)))
+
+(defun company-echo-show-when-idle (&optional getter)
+  (company-echo-cancel)
+  (setq company-echo-timer
+        (run-with-idle-timer company-echo-delay nil 'company-echo-show getter)))
+
+(defun company-echo-format ()
+
+  (let ((limit (window-body-width (minibuffer-window)))
+        (len -1)
+        ;; Roll to selection.
+        (candidates (nthcdr company-selection company-candidates))
+        (i (if company-show-numbers company-selection 99999))
+        comp msg)
+
+    (while candidates
+      (setq comp (company-reformat (pop candidates))
+            len (+ len 1 (length comp)))
+      (if (< i 10)
+          ;; Add number.
+          (progn
+            (setq comp (propertize (format "%d: %s" i comp)
+                                   'face 'company-echo))
+            (cl-incf len 3)
+            (cl-incf i)
+            (add-text-properties 3 (+ 3 (length company-common))
+                                 '(face company-echo-common) comp))
+        (setq comp (propertize comp 'face 'company-echo))
+        (add-text-properties 0 (length company-common)
+                             '(face company-echo-common) comp))
+      (if (>= len limit)
+          (setq candidates nil)
+        (push comp msg)))
+
+    (mapconcat 'identity (nreverse msg) " ")))
+
+(defun company-echo-strip-common-format ()
+
+  (let ((limit (window-body-width (minibuffer-window)))
+        (len (+ (length company-prefix) 2))
+        ;; Roll to selection.
+        (candidates (nthcdr company-selection company-candidates))
+        (i (if company-show-numbers company-selection 99999))
+        msg comp)
+
+    (while candidates
+      (setq comp (company-strip-prefix (pop candidates))
+            len (+ len 2 (length comp)))
+      (when (< i 10)
+        ;; Add number.
+        (setq comp (format "%s (%d)" comp i))
+        (cl-incf len 4)
+        (cl-incf i))
+      (if (>= len limit)
+          (setq candidates nil)
+        (push (propertize comp 'face 'company-echo) msg)))
+
+    (concat (propertize company-prefix 'face 'company-echo-common) "{"
+            (mapconcat 'identity (nreverse msg) ", ")
+            "}")))
+
+(defun company-echo-hide ()
+  (unless (equal company-echo-last-msg "")
+    (setq company-echo-last-msg "")
+    (company-echo-show)))
+
+(defun company-echo-frontend (command)
+  "`company-mode' frontend showing the candidates in the echo area."
+  (pcase command
+    (`post-command (company-echo-show-soon 'company-echo-format))
+    (`hide (company-echo-hide))))
+
+(defun company-echo-strip-common-frontend (command)
+  "`company-mode' frontend showing the candidates in the echo area."
+  (pcase command
+    (`post-command (company-echo-show-soon 'company-echo-strip-common-format))
+    (`hide (company-echo-hide))))
+
+(defun company-echo-metadata-frontend (command)
+  "`company-mode' frontend showing the documentation in the echo area."
+  (pcase command
+    (`post-command (company-echo-show-when-idle 'company-fetch-metadata))
+    (`hide (company-echo-hide))))
+
+(provide 'company)
+;;; company.el ends here
diff --git a/emacs.d/elpa/concurrent-20150309.2052/concurrent-autoloads.el b/emacs.d/elpa/concurrent-20150309.2052/concurrent-autoloads.el
deleted file mode 100644
index 38b735e..0000000
--- a/emacs.d/elpa/concurrent-20150309.2052/concurrent-autoloads.el
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; concurrent-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil nil ("concurrent.el") (21837 24216 635114 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; concurrent-autoloads.el ends here
diff --git a/emacs.d/elpa/concurrent-20150309.2052/concurrent-pkg.el b/emacs.d/elpa/concurrent-20150309.2052/concurrent-pkg.el
deleted file mode 100644
index 2aacdcb..0000000
--- a/emacs.d/elpa/concurrent-20150309.2052/concurrent-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "concurrent" "20150309.2052" "Concurrent utility functions for emacs lisp" '((deferred "0.3.1")) :url "https://github.com/kiwanami/emacs-deferred/blob/master/README-concurrent.markdown" :keywords '("deferred" "async" "concurrent"))
diff --git a/emacs.d/elpa/concurrent-20150309.2052/concurrent.el b/emacs.d/elpa/concurrent-20150309.2052/concurrent.el
deleted file mode 100644
index a6beacb..0000000
--- a/emacs.d/elpa/concurrent-20150309.2052/concurrent.el
+++ /dev/null
@@ -1,507 +0,0 @@
-;;; concurrent.el --- Concurrent utility functions for emacs lisp
-
-;; Copyright (C) 2010, 2011, 2012  SAKURAI Masashi
-
-;; Author: SAKURAI Masashi <m.sakurai at kiwanami.net>
-;; Version: 0.3.1
-;; Package-Version: 20150309.2052
-;; Keywords: deferred, async, concurrent
-;; Package-Requires: ((deferred "0.3.1"))
-;; URL: https://github.com/kiwanami/emacs-deferred/blob/master/README-concurrent.markdown
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; 'concurrent.el' is a higher level library for concurrent tasks
-;; based on 'deferred.el'. This library has following features:
-;;
-;; - Generator
-;; - Green thread
-;; - Semaphore
-;; - Dataflow
-;; - Signal/Channel
-
-(require 'cl)
-
-(require 'deferred)
-
-(defvar cc:version nil "version number")
-(setq cc:version "0.3")
-
-;;; Code:
-
-
-
-(defmacro cc:aif (test-form then-form &rest else-forms)
-  (declare (debug (form form &rest form)))
-  `(let ((it ,test-form))
-     (if it ,then-form ,@else-forms)))
-(put 'cc:aif 'lisp-indent-function 2)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Generator
-
-(defun cc:generator-replace-yield (tree)
-  "[internal] Replace `yield' symbols to calling a function in TREE."
-  (let (ret)
-    (loop for i in tree
-          do (cond
-              ((eq i 'yield)
-               (push 'funcall ret)
-               (push i ret))
-              ((listp i)
-               (push (cc:generator-replace-yield i) ret))
-              (t
-               (push i ret))))
-    (nreverse ret)))
-
-(defun cc:generator-line (chain line)
-  "[internal] Return a macro expansion to execute the sexp LINE
-asynchronously."
-  (cond
-   ;; function object
-   ((functionp line)
-    `(setq ,chain (deferred:nextc ,chain ,line)))
-   ;; while loop form
-   ((eq 'while (car line))
-    (let ((condition (cadr line))
-          (body (cddr line)))
-    `(setq ,chain
-      (deferred:nextc ,chain
-        (deferred:lambda (x)
-         (if ,condition
-             (deferred:nextc
-               (progn
-                 ,@(cc:generator-replace-yield body)) self)))))))
-   ;; statement
-   (t
-    `(setq ,chain
-           (deferred:nextc ,chain
-             (deferred:lambda (x) ,(cc:generator-replace-yield line)))))))
-
-(defmacro cc:generator (callback &rest body)
-  "Create a generator object. If BODY has `yield' symbols, it
-means calling callback function CALLBACK."
-  (let ((chain (gensym))
-        (cc (gensym))
-        (waiter (gensym)))
-    `(lexical-let*
-         (,chain
-          (,cc ,callback)
-          (,waiter (deferred:new))
-          (yield (lambda (x) (funcall ,cc x) ,waiter)))
-       (setq ,chain ,waiter)
-       ,@(loop for i in body
-               collect
-               (cc:generator-line chain i))
-       (lambda () (deferred:callback ,waiter)))))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Thread
-
-(defun cc:thread-line (wait-time chain line)
-  "[internal] Return a macro expansion to execute the sexp LINE asynchronously.
-WAIT-TIME is an interval time between tasks.
-CHAIN is the previous deferred task."
-  (cond
-   ;; function object
-   ((functionp line)
-    `(setq ,chain (deferred:nextc ,chain ,line)))
-   ;; while loop form
-   ((eq 'while (car line))
-    (let ((condition (cadr line))
-          (body (cddr line))
-          (retsym (gensym)))
-    `(setq ,chain
-      (deferred:nextc ,chain
-        (deferred:lambda (x)
-         (if ,condition
-             (deferred:nextc
-               (let ((,retsym (progn ,@body)))
-                 (if (deferred-p ,retsym) ,retsym
-                   (deferred:wait ,wait-time)))
-               self)))))))
-   ;; statement
-   (t
-    `(setq ,chain
-           (deferred:nextc ,chain
-             (lambda (x) ,line))))))
-
-(defmacro cc:thread (wait-time-msec &rest body)
-  "Return a thread object."
-  (let ((chain (gensym))
-        (dstart (gensym)))
-    `(lexical-let*
-         (,chain
-          (,dstart (deferred:new)))
-       (setq ,chain ,dstart)
-       ,@(loop for i in body
-               collect
-               (cc:thread-line wait-time-msec chain i))
-       (deferred:callback ,dstart))))
-(put 'cc:thread 'lisp-indent-function 1)
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Semaphore
-
-(defstruct cc:semaphore max-permits permits waiting-deferreds)
-
-(defun cc:semaphore-create(permits-num)
-  "Return a semaphore object with PERMITS-NUM permissions."
-  (make-cc:semaphore :max-permits permits-num :permits permits-num))
-
-(defun cc:semaphore-acquire(semaphore)
-  "Acquire an execution permission and return deferred object to chain.
-If this semaphore object has permissions, the subsequent deferred
-task is executed immediately.  If this semaphore object has no
-permissions, the subsequent deferred task is blocked. After the
-permission is returned, the task is executed."
-  (cond
-   ((< 0 (cc:semaphore-permits semaphore))
-    (decf (cc:semaphore-permits semaphore))
-    (deferred:succeed))
-   (t
-    (let ((d (deferred:new)))
-      (push d (cc:semaphore-waiting-deferreds semaphore))
-      d))))
-
-(defun cc:semaphore-release(semaphore)
-  "Release an execution permission. The programmer is responsible to return the permissions."
-  (when (<= (cc:semaphore-max-permits semaphore)
-            (cc:semaphore-permits semaphore))
-    (error "Too many calling semaphore-release. [max:%s <= permits:%s]"
-           (cc:semaphore-max-permits semaphore)
-           (cc:semaphore-permits semaphore)))
-  (let ((waiting-deferreds
-         (cc:semaphore-waiting-deferreds semaphore)))
-    (cond
-     (waiting-deferreds
-      (let* ((d (car (last waiting-deferreds))))
-        (setf (cc:semaphore-waiting-deferreds semaphore)
-              (nbutlast waiting-deferreds))
-        (deferred:callback-post d)))
-     (t
-      (incf (cc:semaphore-permits semaphore)))))
-  semaphore)
-
-(defun cc:semaphore-with (semaphore body-func &optional error-func)
-  "Execute the task BODY-FUNC asynchronously with the semaphore block."
-  (lexical-let ((semaphore semaphore))
-    (deferred:try
-      (deferred:nextc (cc:semaphore-acquire semaphore) body-func)
-      :catch
-      error-func
-      :finally
-      (lambda (_x) (cc:semaphore-release semaphore)))))
-(put 'cc:semaphore-with 'lisp-indent-function 1)
-
-(defun cc:semaphore-release-all (semaphore)
-  "Release all permissions for resetting the semaphore object.
-If the semaphore object has some blocked tasks, this function
-return a list of the tasks and clear the list of the blocked
-tasks in the semaphore object."
-  (setf (cc:semaphore-permits semaphore)
-        (cc:semaphore-max-permits semaphore))
-  (let ((ds (cc:semaphore-waiting-deferreds semaphore)))
-    (when ds
-      (setf (cc:semaphore-waiting-deferreds semaphore) nil))
-    ds))
-
-(defun cc:semaphore-interrupt-all (semaphore)
-  "Clear the list of the blocked tasks in the semaphore and return a deferred object to chain.
-This function is used for the interruption cases."
-  (when (cc:semaphore-waiting-deferreds semaphore)
-    (setf (cc:semaphore-waiting-deferreds semaphore) nil)
-    (setf (cc:semaphore-permits semaphore) 0))
-  (cc:semaphore-acquire semaphore))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Signal / Channel
-
-(defun cc:signal-channel (&optional name parent-channel)
-  "Create a channel.
-NAME is a channel name for debug.
-PARENT-CHANNEL is an upstream channel. The observers of this channel can receive the upstream signals.
-In the case of using the function `cc:signal-send', the observers of the upstream channel can not receive the signals of this channel. The function `cc:signal-send-global' can send a signal to the upstream channels from the downstream channels."
-  (lexical-let
-      ((ch (cons
-            (or name (format "signal%s" (deferred:uid))) ; name for debug
-            (cons
-             parent-channel ; parent-channel
-             nil)))) ; observers
-    (when parent-channel
-      (cc:signal-connect
-       parent-channel
-       t (lambda (event)
-           (destructuring-bind
-               (event-name event-args) event
-             (apply 'cc:signal-send
-                    ch event-name event-args)))))
-    ch))
-
-(defmacro cc:signal-name (ch)
-  "[internal] Return signal name."
-  `(car ,ch))
-
-(defmacro cc:signal-parent-channel (ch)
-  "[internal] Return parent channel object."
-  `(cadr ,ch))
-
-(defmacro cc:signal-observers (ch)
-  "[internal] Return observers."
-  `(cddr ,ch))
-
-(defun cc:signal-connect (channel event-sym &optional callback)
-  "Append an observer for EVENT-SYM of CHANNEL and return a deferred object.
-If EVENT-SYM is `t', the observer receives all signals of the channel.
-If CALLBACK function is given, the deferred object executes the
-CALLBACK function asynchronously. One can connect subsequent
-tasks to the returned deferred object."
-  (let ((d (if callback
-               (deferred:new callback)
-             (deferred:new))))
-    (push (cons event-sym d)
-          (cc:signal-observers channel))
-    d))
-
-(defun cc:signal-send (channel event-sym &rest args)
-  "Send a signal to CHANNEL. If ARGS values are given, observers can get the values by following code: (lambda (event) (destructuring-bind (event-sym (args)) event ... )). "
-  (let ((observers (cc:signal-observers channel))
-        (event (list event-sym args)))
-    (loop for i in observers
-          for name = (car i)
-          for d = (cdr i)
-          if (or (eq event-sym name) (eq t name))
-          do (deferred:callback-post d event))))
-
-(defun cc:signal-send-global (channel event-sym &rest args)
-  "Send a signal to the most upstream channel. "
-  (cc:aif (cc:signal-parent-channel channel)
-      (apply 'cc:signal-send-global it event-sym args)
-    (apply 'cc:signal-send channel event-sym args)))
-
-
-(defun cc:signal-disconnect (channel deferred)
-  "Remove the observer object DEFERRED from CHANNEL and return
-the removed deferred object. "
-  (let ((observers (cc:signal-observers channel)) deleted)
-    (setf
-     (cc:signal-observers channel) ; place
-     (loop for i in observers
-           for d = (cdr i)
-           unless (eq d deferred)
-           collect i
-           else
-           do (push i deleted)))
-    deleted))
-
-(defun cc:signal-disconnect-all (channel)
-  "Remove all observers."
-  (setf
-   (cc:signal-observers channel) ; place
-   nil))
-
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Dataflow
-
-;; Dataflow variable entry
-(defstruct cc:dataflow key (value 'cc:dataflow-undefine) deferred-list)
-
-(defun cc:dataflow-undefine-p (obj)
-  "[internal] If the variable entry is not bound, return `t'."
-  (eq 'cc:dataflow-undefine (cc:dataflow-value obj)))
-
-(defmacro cc:dataflow-parent-environment (df)
-  "[internal] Return the parent environment."
-  `(car ,df))
-
-(defmacro cc:dataflow-test (df)
-  "[internal] Return the test function."
-  `(cadr ,df))
-
-(defmacro cc:dataflow-channel (df)
-  "[internal] Return the channel object."
-  `(caddr ,df))
-
-(defmacro cc:dataflow-list (df)
-  "[internal] Return the list of deferred object which are waiting for value binding."
-  `(cdddr ,df))
-
-(defun cc:dataflow-environment (&optional parent-env test-func channel)
-  "Create a dataflow environment.
-PARENT-ENV is the default environment. If this environment doesn't have the entry A and the parent one has the entry A, this environment can return the entry A. One can override the entry, setting another entry A to this environment.
-TEST-FUNC is a test function that compares the entry keys. The default function is `equal'.
-CHANNEL is a channel object that sends signals of variable events. Observers can receive following signals:
--get-first : the fist referrer is waiting for binding,
--get-waiting : another referrer is waiting for binding,
--set : a value is bound,
--get : returned a bound value,
--clear : cleared one entry,
--clear-all : cleared all entries.
-"
-  (let ((this (list parent-env
-                    (or test-func 'equal)
-                    (or channel
-                        (cc:signal-channel
-                         'dataflow
-                         (and parent-env
-                              (cc:dataflow-channel parent-env)))))))
-    (cc:dataflow-init-connect this)
-    this))
-
-(defun cc:dataflow-init-connect (df)
-  "[internal] Initialize the channel object."
-  (lexical-let ((df df))
-    (cc:dataflow-connect
-     df 'set
-     (lambda (args)
-       (destructuring-bind (_event (key)) args
-         (let* ((obj (cc:dataflow-get-object-for-value df key))
-                (value (and obj (cc:dataflow-value obj))))
-           (when obj
-             (loop for i in (cc:aif (cc:dataflow-get-object-for-deferreds df key)
-                                (cc:dataflow-deferred-list it) nil)
-                   do (deferred:callback-post i value))
-             (setf (cc:dataflow-deferred-list obj) nil))))))))
-
-(defun cc:dataflow-get-object-for-value (df key)
-  "[internal] Return an entry object that is indicated by KEY.
-If the environment DF doesn't have the entry and the parent one has the entry, this function returns the entry of the parent environment. This function doesn't affect the waiting list."
-  (or
-   (loop for i in (cc:dataflow-list df)
-         with test = (cc:dataflow-test df)
-         if (and (funcall test key (cc:dataflow-key i))
-                 (not (cc:dataflow-undefine-p i)))
-         return i)
-   (deferred:aand
-     (cc:dataflow-parent-environment df)
-     (cc:dataflow-get-object-for-value it key))))
-
-(defun cc:dataflow-get-object-for-deferreds (df key)
-  "[internal] Return a list of the deferred objects those are waiting for value binding.
-This function doesn't affect the waiting list and doesn't refer the parent environment."
-  (loop for i in (cc:dataflow-list df)
-        with test = (cc:dataflow-test df)
-        if (funcall test key (cc:dataflow-key i))
-        return i))
-
-(defun cc:dataflow-connect (df event-sym &optional callback)
-  "Append an observer for EVENT-SYM of the channel of DF and return a deferred object.
-See the docstring of `cc:dataflow-environment' for details."
-  (cc:signal-connect (cc:dataflow-channel df) event-sym callback))
-
-(defun cc:dataflow-signal (df event &optional arg)
-  "[internal] Send a signal to the channel of DF."
-  (cc:signal-send (cc:dataflow-channel df) event arg))
-
-(defun cc:dataflow-get (df key)
-  "Return a deferred object that can refer the value which is indicated by KEY.
-If DF has the entry that bound value, the subsequent deferred task is executed immediately.
-If not, the task is deferred till a value is bound."
-  (let ((obj (cc:dataflow-get-object-for-value df key)))
-    (cond
-     ((and obj (cc:dataflow-value obj))
-      (cc:dataflow-signal df 'get key)
-      (deferred:succeed (cc:dataflow-value obj)))
-     (t
-      (setq obj (cc:dataflow-get-object-for-deferreds df key))
-      (unless obj
-        (setq obj (make-cc:dataflow :key key))
-        (push obj (cc:dataflow-list df))
-        (cc:dataflow-signal df 'get-first key))
-      (let ((d (deferred:new)))
-        (push d (cc:dataflow-deferred-list obj))
-        (cc:dataflow-signal df 'get-waiting key)
-        d)))))
-
-(defun cc:dataflow-get-sync (df key)
-  "Return the value which is indicated by KEY synchronously.
-If the environment DF doesn't have an entry of KEY, this function returns nil."
-  (let ((obj (cc:dataflow-get-object-for-value df key)))
-    (and obj (cc:dataflow-value obj))))
-
-(defun cc:dataflow-set (df key value)
-  "Bind the VALUE to KEY in the environment DF.
-If DF already has the bound entry of KEY, this function throws an error signal.
-VALUE can be nil as a value."
-  (let ((obj (cc:dataflow-get-object-for-deferreds df key)))
-    (cond
-     ((and obj (not (cc:dataflow-undefine-p obj)))
-      ;; overwrite!
-      (error "Can not set a dataflow value. The key [%s] has already had a value. NEW:[%s] OLD:[%s]" key value (cc:dataflow-value obj)))
-     (obj
-      (setf (cc:dataflow-value obj) value))
-     (t
-      ;; just value arrived
-      (push (make-cc:dataflow :key key :value value)
-            (cc:dataflow-list df))))
-    ;; value arrived and start deferred objects
-    (cc:dataflow-signal df 'set key)
-    value))
-
-(defun cc:dataflow-clear (df key)
-  "Clear the entry which is indicated by KEY.
-This function does nothing for the waiting deferred objects."
-  (cc:dataflow-signal df 'clear key)
-  (setf (cc:dataflow-list df)
-        (loop for i in (cc:dataflow-list df)
-              with test = (cc:dataflow-test df)
-              unless (funcall test key (cc:dataflow-key i))
-              collect i)))
-
-(defun cc:dataflow-get-avalable-pairs (df)
-  "Return an available key-value alist in the environment DF and the parent ones."
-  (append
-   (loop for i in (cc:dataflow-list df)
-         for key = (cc:dataflow-key i)
-         for val = (cc:dataflow-value i)
-         unless (cc:dataflow-undefine-p i) collect (cons key val))
-   (deferred:aand
-     (cc:dataflow-parent-environment df)
-     (cc:dataflow-get-avalable-pairs it))))
-
-(defun cc:dataflow-get-waiting-keys (df)
-  "Return a list of keys which have waiting deferred objects in the environment DF and the parent ones."
-  (append
-   (loop for i in (cc:dataflow-list df)
-         for key = (cc:dataflow-key i)
-         if (cc:dataflow-undefine-p i) collect key)
-   (deferred:aand
-     (cc:dataflow-parent-environment df)
-     (cc:dataflow-get-waiting-keys it))))
-
-(defun cc:dataflow-clear-all (df)
-  "Clear all entries in the environment DF.
-This function does nothing for the waiting deferred objects."
-  (cc:dataflow-signal df 'clear-all)
-  (setf (cc:dataflow-list df) nil))
-
-
-(provide 'concurrent)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
-;;; concurrent.el ends here
diff --git a/emacs.d/elpa/concurrent-20160109.2046/concurrent-autoloads.el b/emacs.d/elpa/concurrent-20160109.2046/concurrent-autoloads.el
new file mode 100644
index 0000000..6815c58
--- /dev/null
+++ b/emacs.d/elpa/concurrent-20160109.2046/concurrent-autoloads.el
@@ -0,0 +1,15 @@
+;;; concurrent-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil nil ("concurrent.el") (22171 46579 712268 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; concurrent-autoloads.el ends here
diff --git a/emacs.d/elpa/concurrent-20160109.2046/concurrent-pkg.el b/emacs.d/elpa/concurrent-20160109.2046/concurrent-pkg.el
new file mode 100644
index 0000000..d656dd1
--- /dev/null
+++ b/emacs.d/elpa/concurrent-20160109.2046/concurrent-pkg.el
@@ -0,0 +1 @@
+(define-package "concurrent" "20160109.2046" "Concurrent utility functions for emacs lisp" '((deferred "0.4.0")) :url "https://github.com/kiwanami/emacs-deferred/blob/master/README-concurrent.markdown" :keywords '("deferred" "async" "concurrent"))
diff --git a/emacs.d/elpa/concurrent-20160109.2046/concurrent.el b/emacs.d/elpa/concurrent-20160109.2046/concurrent.el
new file mode 100644
index 0000000..32d85b3
--- /dev/null
+++ b/emacs.d/elpa/concurrent-20160109.2046/concurrent.el
@@ -0,0 +1,507 @@
+;;; concurrent.el --- Concurrent utility functions for emacs lisp
+
+;; Copyright (C) 2010-2016  SAKURAI Masashi
+
+;; Author: SAKURAI Masashi <m.sakurai at kiwanami.net>
+;; Version: 0.4.0
+;; Package-Version: 20160109.2046
+;; Keywords: deferred, async, concurrent
+;; Package-Requires: ((deferred "0.4.0"))
+;; URL: https://github.com/kiwanami/emacs-deferred/blob/master/README-concurrent.markdown
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; 'concurrent.el' is a higher level library for concurrent tasks
+;; based on 'deferred.el'. This library has following features:
+;;
+;; - Generator
+;; - Green thread
+;; - Semaphore
+;; - Dataflow
+;; - Signal/Channel
+
+(require 'cl)
+
+(require 'deferred)
+
+(defvar cc:version nil "version number")
+(setq cc:version "0.3")
+
+;;; Code:
+
+
+
+(defmacro cc:aif (test-form then-form &rest else-forms)
+  (declare (debug (form form &rest form)))
+  `(let ((it ,test-form))
+     (if it ,then-form ,@else-forms)))
+(put 'cc:aif 'lisp-indent-function 2)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Generator
+
+(defun cc:generator-replace-yield (tree)
+  "[internal] Replace `yield' symbols to calling a function in TREE."
+  (let (ret)
+    (loop for i in tree
+          do (cond
+              ((eq i 'yield)
+               (push 'funcall ret)
+               (push i ret))
+              ((listp i)
+               (push (cc:generator-replace-yield i) ret))
+              (t
+               (push i ret))))
+    (nreverse ret)))
+
+(defun cc:generator-line (chain line)
+  "[internal] Return a macro expansion to execute the sexp LINE
+asynchronously."
+  (cond
+   ;; function object
+   ((functionp line)
+    `(setq ,chain (deferred:nextc ,chain ,line)))
+   ;; while loop form
+   ((eq 'while (car line))
+    (let ((condition (cadr line))
+          (body (cddr line)))
+    `(setq ,chain
+      (deferred:nextc ,chain
+        (deferred:lambda (x)
+         (if ,condition
+             (deferred:nextc
+               (progn
+                 ,@(cc:generator-replace-yield body)) self)))))))
+   ;; statement
+   (t
+    `(setq ,chain
+           (deferred:nextc ,chain
+             (deferred:lambda (x) ,(cc:generator-replace-yield line)))))))
+
+(defmacro cc:generator (callback &rest body)
+  "Create a generator object. If BODY has `yield' symbols, it
+means calling callback function CALLBACK."
+  (let ((chain (gensym))
+        (cc (gensym))
+        (waiter (gensym)))
+    `(lexical-let*
+         (,chain
+          (,cc ,callback)
+          (,waiter (deferred:new))
+          (yield (lambda (x) (funcall ,cc x) ,waiter)))
+       (setq ,chain ,waiter)
+       ,@(loop for i in body
+               collect
+               (cc:generator-line chain i))
+       (lambda () (deferred:callback ,waiter)))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Thread
+
+(defun cc:thread-line (wait-time chain line)
+  "[internal] Return a macro expansion to execute the sexp LINE asynchronously.
+WAIT-TIME is an interval time between tasks.
+CHAIN is the previous deferred task."
+  (cond
+   ;; function object
+   ((functionp line)
+    `(setq ,chain (deferred:nextc ,chain ,line)))
+   ;; while loop form
+   ((eq 'while (car line))
+    (let ((condition (cadr line))
+          (body (cddr line))
+          (retsym (gensym)))
+    `(setq ,chain
+      (deferred:nextc ,chain
+        (deferred:lambda (x)
+         (if ,condition
+             (deferred:nextc
+               (let ((,retsym (progn ,@body)))
+                 (if (deferred-p ,retsym) ,retsym
+                   (deferred:wait ,wait-time)))
+               self)))))))
+   ;; statement
+   (t
+    `(setq ,chain
+           (deferred:nextc ,chain
+             (lambda (x) ,line))))))
+
+(defmacro cc:thread (wait-time-msec &rest body)
+  "Return a thread object."
+  (let ((chain (gensym))
+        (dstart (gensym)))
+    `(lexical-let*
+         (,chain
+          (,dstart (deferred:new)))
+       (setq ,chain ,dstart)
+       ,@(loop for i in body
+               collect
+               (cc:thread-line wait-time-msec chain i))
+       (deferred:callback ,dstart))))
+(put 'cc:thread 'lisp-indent-function 1)
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Semaphore
+
+(defstruct cc:semaphore max-permits permits waiting-deferreds)
+
+(defun cc:semaphore-create(permits-num)
+  "Return a semaphore object with PERMITS-NUM permissions."
+  (make-cc:semaphore :max-permits permits-num :permits permits-num))
+
+(defun cc:semaphore-acquire(semaphore)
+  "Acquire an execution permission and return deferred object to chain.
+If this semaphore object has permissions, the subsequent deferred
+task is executed immediately.  If this semaphore object has no
+permissions, the subsequent deferred task is blocked. After the
+permission is returned, the task is executed."
+  (cond
+   ((< 0 (cc:semaphore-permits semaphore))
+    (decf (cc:semaphore-permits semaphore))
+    (deferred:succeed))
+   (t
+    (let ((d (deferred:new)))
+      (push d (cc:semaphore-waiting-deferreds semaphore))
+      d))))
+
+(defun cc:semaphore-release(semaphore)
+  "Release an execution permission. The programmer is responsible to return the permissions."
+  (when (<= (cc:semaphore-max-permits semaphore)
+            (cc:semaphore-permits semaphore))
+    (error "Too many calling semaphore-release. [max:%s <= permits:%s]"
+           (cc:semaphore-max-permits semaphore)
+           (cc:semaphore-permits semaphore)))
+  (let ((waiting-deferreds
+         (cc:semaphore-waiting-deferreds semaphore)))
+    (cond
+     (waiting-deferreds
+      (let* ((d (car (last waiting-deferreds))))
+        (setf (cc:semaphore-waiting-deferreds semaphore)
+              (nbutlast waiting-deferreds))
+        (deferred:callback-post d)))
+     (t
+      (incf (cc:semaphore-permits semaphore)))))
+  semaphore)
+
+(defun cc:semaphore-with (semaphore body-func &optional error-func)
+  "Execute the task BODY-FUNC asynchronously with the semaphore block."
+  (lexical-let ((semaphore semaphore))
+    (deferred:try
+      (deferred:nextc (cc:semaphore-acquire semaphore) body-func)
+      :catch
+      error-func
+      :finally
+      (lambda (_x) (cc:semaphore-release semaphore)))))
+(put 'cc:semaphore-with 'lisp-indent-function 1)
+
+(defun cc:semaphore-release-all (semaphore)
+  "Release all permissions for resetting the semaphore object.
+If the semaphore object has some blocked tasks, this function
+return a list of the tasks and clear the list of the blocked
+tasks in the semaphore object."
+  (setf (cc:semaphore-permits semaphore)
+        (cc:semaphore-max-permits semaphore))
+  (let ((ds (cc:semaphore-waiting-deferreds semaphore)))
+    (when ds
+      (setf (cc:semaphore-waiting-deferreds semaphore) nil))
+    ds))
+
+(defun cc:semaphore-interrupt-all (semaphore)
+  "Clear the list of the blocked tasks in the semaphore and return a deferred object to chain.
+This function is used for the interruption cases."
+  (when (cc:semaphore-waiting-deferreds semaphore)
+    (setf (cc:semaphore-waiting-deferreds semaphore) nil)
+    (setf (cc:semaphore-permits semaphore) 0))
+  (cc:semaphore-acquire semaphore))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Signal / Channel
+
+(defun cc:signal-channel (&optional name parent-channel)
+  "Create a channel.
+NAME is a channel name for debug.
+PARENT-CHANNEL is an upstream channel. The observers of this channel can receive the upstream signals.
+In the case of using the function `cc:signal-send', the observers of the upstream channel can not receive the signals of this channel. The function `cc:signal-send-global' can send a signal to the upstream channels from the downstream channels."
+  (lexical-let
+      ((ch (cons
+            (or name (format "signal%s" (deferred:uid))) ; name for debug
+            (cons
+             parent-channel ; parent-channel
+             nil)))) ; observers
+    (when parent-channel
+      (cc:signal-connect
+       parent-channel
+       t (lambda (event)
+           (destructuring-bind
+               (event-name event-args) event
+             (apply 'cc:signal-send
+                    ch event-name event-args)))))
+    ch))
+
+(defmacro cc:signal-name (ch)
+  "[internal] Return signal name."
+  `(car ,ch))
+
+(defmacro cc:signal-parent-channel (ch)
+  "[internal] Return parent channel object."
+  `(cadr ,ch))
+
+(defmacro cc:signal-observers (ch)
+  "[internal] Return observers."
+  `(cddr ,ch))
+
+(defun cc:signal-connect (channel event-sym &optional callback)
+  "Append an observer for EVENT-SYM of CHANNEL and return a deferred object.
+If EVENT-SYM is `t', the observer receives all signals of the channel.
+If CALLBACK function is given, the deferred object executes the
+CALLBACK function asynchronously. One can connect subsequent
+tasks to the returned deferred object."
+  (let ((d (if callback
+               (deferred:new callback)
+             (deferred:new))))
+    (push (cons event-sym d)
+          (cc:signal-observers channel))
+    d))
+
+(defun cc:signal-send (channel event-sym &rest args)
+  "Send a signal to CHANNEL. If ARGS values are given, observers can get the values by following code: (lambda (event) (destructuring-bind (event-sym (args)) event ... )). "
+  (let ((observers (cc:signal-observers channel))
+        (event (list event-sym args)))
+    (loop for i in observers
+          for name = (car i)
+          for d = (cdr i)
+          if (or (eq event-sym name) (eq t name))
+          do (deferred:callback-post d event))))
+
+(defun cc:signal-send-global (channel event-sym &rest args)
+  "Send a signal to the most upstream channel. "
+  (cc:aif (cc:signal-parent-channel channel)
+      (apply 'cc:signal-send-global it event-sym args)
+    (apply 'cc:signal-send channel event-sym args)))
+
+
+(defun cc:signal-disconnect (channel deferred)
+  "Remove the observer object DEFERRED from CHANNEL and return
+the removed deferred object. "
+  (let ((observers (cc:signal-observers channel)) deleted)
+    (setf
+     (cc:signal-observers channel) ; place
+     (loop for i in observers
+           for d = (cdr i)
+           unless (eq d deferred)
+           collect i
+           else
+           do (push i deleted)))
+    deleted))
+
+(defun cc:signal-disconnect-all (channel)
+  "Remove all observers."
+  (setf
+   (cc:signal-observers channel) ; place
+   nil))
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Dataflow
+
+;; Dataflow variable entry
+(defstruct cc:dataflow key (value 'cc:dataflow-undefine) deferred-list)
+
+(defun cc:dataflow-undefine-p (obj)
+  "[internal] If the variable entry is not bound, return `t'."
+  (eq 'cc:dataflow-undefine (cc:dataflow-value obj)))
+
+(defmacro cc:dataflow-parent-environment (df)
+  "[internal] Return the parent environment."
+  `(car ,df))
+
+(defmacro cc:dataflow-test (df)
+  "[internal] Return the test function."
+  `(cadr ,df))
+
+(defmacro cc:dataflow-channel (df)
+  "[internal] Return the channel object."
+  `(caddr ,df))
+
+(defmacro cc:dataflow-list (df)
+  "[internal] Return the list of deferred object which are waiting for value binding."
+  `(cdddr ,df))
+
+(defun cc:dataflow-environment (&optional parent-env test-func channel)
+  "Create a dataflow environment.
+PARENT-ENV is the default environment. If this environment doesn't have the entry A and the parent one has the entry A, this environment can return the entry A. One can override the entry, setting another entry A to this environment.
+TEST-FUNC is a test function that compares the entry keys. The default function is `equal'.
+CHANNEL is a channel object that sends signals of variable events. Observers can receive following signals:
+-get-first : the fist referrer is waiting for binding,
+-get-waiting : another referrer is waiting for binding,
+-set : a value is bound,
+-get : returned a bound value,
+-clear : cleared one entry,
+-clear-all : cleared all entries.
+"
+  (let ((this (list parent-env
+                    (or test-func 'equal)
+                    (or channel
+                        (cc:signal-channel
+                         'dataflow
+                         (and parent-env
+                              (cc:dataflow-channel parent-env)))))))
+    (cc:dataflow-init-connect this)
+    this))
+
+(defun cc:dataflow-init-connect (df)
+  "[internal] Initialize the channel object."
+  (lexical-let ((df df))
+    (cc:dataflow-connect
+     df 'set
+     (lambda (args)
+       (destructuring-bind (_event (key)) args
+         (let* ((obj (cc:dataflow-get-object-for-value df key))
+                (value (and obj (cc:dataflow-value obj))))
+           (when obj
+             (loop for i in (cc:aif (cc:dataflow-get-object-for-deferreds df key)
+                                (cc:dataflow-deferred-list it) nil)
+                   do (deferred:callback-post i value))
+             (setf (cc:dataflow-deferred-list obj) nil))))))))
+
+(defun cc:dataflow-get-object-for-value (df key)
+  "[internal] Return an entry object that is indicated by KEY.
+If the environment DF doesn't have the entry and the parent one has the entry, this function returns the entry of the parent environment. This function doesn't affect the waiting list."
+  (or
+   (loop for i in (cc:dataflow-list df)
+         with test = (cc:dataflow-test df)
+         if (and (funcall test key (cc:dataflow-key i))
+                 (not (cc:dataflow-undefine-p i)))
+         return i)
+   (deferred:aand
+     (cc:dataflow-parent-environment df)
+     (cc:dataflow-get-object-for-value it key))))
+
+(defun cc:dataflow-get-object-for-deferreds (df key)
+  "[internal] Return a list of the deferred objects those are waiting for value binding.
+This function doesn't affect the waiting list and doesn't refer the parent environment."
+  (loop for i in (cc:dataflow-list df)
+        with test = (cc:dataflow-test df)
+        if (funcall test key (cc:dataflow-key i))
+        return i))
+
+(defun cc:dataflow-connect (df event-sym &optional callback)
+  "Append an observer for EVENT-SYM of the channel of DF and return a deferred object.
+See the docstring of `cc:dataflow-environment' for details."
+  (cc:signal-connect (cc:dataflow-channel df) event-sym callback))
+
+(defun cc:dataflow-signal (df event &optional arg)
+  "[internal] Send a signal to the channel of DF."
+  (cc:signal-send (cc:dataflow-channel df) event arg))
+
+(defun cc:dataflow-get (df key)
+  "Return a deferred object that can refer the value which is indicated by KEY.
+If DF has the entry that bound value, the subsequent deferred task is executed immediately.
+If not, the task is deferred till a value is bound."
+  (let ((obj (cc:dataflow-get-object-for-value df key)))
+    (cond
+     ((and obj (cc:dataflow-value obj))
+      (cc:dataflow-signal df 'get key)
+      (deferred:succeed (cc:dataflow-value obj)))
+     (t
+      (setq obj (cc:dataflow-get-object-for-deferreds df key))
+      (unless obj
+        (setq obj (make-cc:dataflow :key key))
+        (push obj (cc:dataflow-list df))
+        (cc:dataflow-signal df 'get-first key))
+      (let ((d (deferred:new)))
+        (push d (cc:dataflow-deferred-list obj))
+        (cc:dataflow-signal df 'get-waiting key)
+        d)))))
+
+(defun cc:dataflow-get-sync (df key)
+  "Return the value which is indicated by KEY synchronously.
+If the environment DF doesn't have an entry of KEY, this function returns nil."
+  (let ((obj (cc:dataflow-get-object-for-value df key)))
+    (and obj (cc:dataflow-value obj))))
+
+(defun cc:dataflow-set (df key value)
+  "Bind the VALUE to KEY in the environment DF.
+If DF already has the bound entry of KEY, this function throws an error signal.
+VALUE can be nil as a value."
+  (let ((obj (cc:dataflow-get-object-for-deferreds df key)))
+    (cond
+     ((and obj (not (cc:dataflow-undefine-p obj)))
+      ;; overwrite!
+      (error "Can not set a dataflow value. The key [%s] has already had a value. NEW:[%s] OLD:[%s]" key value (cc:dataflow-value obj)))
+     (obj
+      (setf (cc:dataflow-value obj) value))
+     (t
+      ;; just value arrived
+      (push (make-cc:dataflow :key key :value value)
+            (cc:dataflow-list df))))
+    ;; value arrived and start deferred objects
+    (cc:dataflow-signal df 'set key)
+    value))
+
+(defun cc:dataflow-clear (df key)
+  "Clear the entry which is indicated by KEY.
+This function does nothing for the waiting deferred objects."
+  (cc:dataflow-signal df 'clear key)
+  (setf (cc:dataflow-list df)
+        (loop for i in (cc:dataflow-list df)
+              with test = (cc:dataflow-test df)
+              unless (funcall test key (cc:dataflow-key i))
+              collect i)))
+
+(defun cc:dataflow-get-avalable-pairs (df)
+  "Return an available key-value alist in the environment DF and the parent ones."
+  (append
+   (loop for i in (cc:dataflow-list df)
+         for key = (cc:dataflow-key i)
+         for val = (cc:dataflow-value i)
+         unless (cc:dataflow-undefine-p i) collect (cons key val))
+   (deferred:aand
+     (cc:dataflow-parent-environment df)
+     (cc:dataflow-get-avalable-pairs it))))
+
+(defun cc:dataflow-get-waiting-keys (df)
+  "Return a list of keys which have waiting deferred objects in the environment DF and the parent ones."
+  (append
+   (loop for i in (cc:dataflow-list df)
+         for key = (cc:dataflow-key i)
+         if (cc:dataflow-undefine-p i) collect key)
+   (deferred:aand
+     (cc:dataflow-parent-environment df)
+     (cc:dataflow-get-waiting-keys it))))
+
+(defun cc:dataflow-clear-all (df)
+  "Clear all entries in the environment DF.
+This function does nothing for the waiting deferred objects."
+  (cc:dataflow-signal df 'clear-all)
+  (setf (cc:dataflow-list df) nil))
+
+
+(provide 'concurrent)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
+;;; concurrent.el ends here
diff --git a/emacs.d/elpa/dash-20150611.922/dash-autoloads.el b/emacs.d/elpa/dash-20150611.922/dash-autoloads.el
deleted file mode 100644
index a0bdf0b..0000000
--- a/emacs.d/elpa/dash-20150611.922/dash-autoloads.el
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; dash-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil nil ("dash.el") (21898 47981 341462 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; dash-autoloads.el ends here
diff --git a/emacs.d/elpa/dash-20150611.922/dash-pkg.el b/emacs.d/elpa/dash-20150611.922/dash-pkg.el
deleted file mode 100644
index f1b2d63..0000000
--- a/emacs.d/elpa/dash-20150611.922/dash-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "dash" "20150611.922" "A modern list library for Emacs" 'nil :keywords '("lists"))
diff --git a/emacs.d/elpa/dash-20150611.922/dash.el b/emacs.d/elpa/dash-20150611.922/dash.el
deleted file mode 100644
index 47fb46d..0000000
--- a/emacs.d/elpa/dash-20150611.922/dash.el
+++ /dev/null
@@ -1,2369 +0,0 @@
-;;; dash.el --- A modern list library for Emacs
-
-;; Copyright (C) 2012-2014 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 2.10.0
-;; Package-Version: 20150611.922
-;; Keywords: lists
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; A modern list api for Emacs.
-;;
-;; See documentation on https://github.com/magnars/dash.el#functions
-
-;;; Code:
-
-(defgroup dash ()
-  "Customize group for dash.el"
-  :group 'lisp
-  :prefix "dash-")
-
-(defun dash--enable-fontlock (symbol value)
-  (when value
-    (dash-enable-font-lock))
-  (set-default symbol value))
-
-(defcustom dash-enable-fontlock nil
-  "If non-nil, enable fontification of dash functions, macros and
-special values."
-  :type 'boolean
-  :set 'dash--enable-fontlock
-  :group 'dash)
-
-(defmacro !cons (car cdr)
-  "Destructive: Set CDR to the cons of CAR and CDR."
-  `(setq ,cdr (cons ,car ,cdr)))
-
-(defmacro !cdr (list)
-  "Destructive: Set LIST to the cdr of LIST."
-  `(setq ,list (cdr ,list)))
-
-(defmacro --each (list &rest body)
-  "Anaphoric form of `-each'."
-  (declare (debug (form body))
-           (indent 1))
-  (let ((l (make-symbol "list")))
-    `(let ((,l ,list)
-           (it-index 0))
-       (while ,l
-         (let ((it (car ,l)))
-           ,@body)
-         (setq it-index (1+ it-index))
-         (!cdr ,l)))))
-
-(defun -each (list fn)
-  "Call FN with every item in LIST. Return nil, used for side-effects only."
-  (--each list (funcall fn it)))
-
-(put '-each 'lisp-indent-function 1)
-
-(defmacro --each-while (list pred &rest body)
-  "Anaphoric form of `-each-while'."
-  (declare (debug (form form body))
-           (indent 2))
-  (let ((l (make-symbol "list"))
-        (c (make-symbol "continue")))
-    `(let ((,l ,list)
-           (,c t)
-           (it-index 0))
-       (while (and ,l ,c)
-         (let ((it (car ,l)))
-           (if (not ,pred) (setq ,c nil) ,@body))
-         (setq it-index (1+ it-index))
-         (!cdr ,l)))))
-
-(defun -each-while (list pred fn)
-  "Call FN with every item in LIST while (PRED item) is non-nil.
-Return nil, used for side-effects only."
-  (--each-while list (funcall pred it) (funcall fn it)))
-
-(put '-each-while 'lisp-indent-function 2)
-
-(defmacro --dotimes (num &rest body)
-  "Repeatedly executes BODY (presumably for side-effects) with `it` bound to integers from 0 through NUM-1."
-  (declare (debug (form body))
-           (indent 1))
-  (let ((n (make-symbol "num")))
-    `(let ((,n ,num)
-           (it 0))
-       (while (< it ,n)
-         ,@body
-         (setq it (1+ it))))))
-
-(defun -dotimes (num fn)
-  "Repeatedly calls FN (presumably for side-effects) passing in integers from 0 through NUM-1."
-  (--dotimes num (funcall fn it)))
-
-(put '-dotimes 'lisp-indent-function 1)
-
-(defun -map (fn list)
-  "Return a new list consisting of the result of applying FN to the items in LIST."
-  (mapcar fn list))
-
-(defmacro --map (form list)
-  "Anaphoric form of `-map'."
-  (declare (debug (form form)))
-  `(mapcar (lambda (it) ,form) ,list))
-
-(defmacro --reduce-from (form initial-value list)
-  "Anaphoric form of `-reduce-from'."
-  (declare (debug (form form form)))
-  `(let ((acc ,initial-value))
-     (--each ,list (setq acc ,form))
-     acc))
-
-(defun -reduce-from (fn initial-value list)
-  "Return the result of applying FN to INITIAL-VALUE and the
-first item in LIST, then applying FN to that result and the 2nd
-item, etc. If LIST contains no items, return INITIAL-VALUE and
-FN is not called.
-
-In the anaphoric form `--reduce-from', the accumulated value is
-exposed as `acc`."
-  (--reduce-from (funcall fn acc it) initial-value list))
-
-(defmacro --reduce (form list)
-  "Anaphoric form of `-reduce'."
-  (declare (debug (form form)))
-  (let ((lv (make-symbol "list-value")))
-    `(let ((,lv ,list))
-       (if ,lv
-           (--reduce-from ,form (car ,lv) (cdr ,lv))
-         (let (acc it) ,form)))))
-
-(defun -reduce (fn list)
-  "Return the result of applying FN to the first 2 items in LIST,
-then applying FN to that result and the 3rd item, etc. If LIST
-contains no items, FN must accept no arguments as well, and
-reduce return the result of calling FN with no arguments. If
-LIST has only 1 item, it is returned and FN is not called.
-
-In the anaphoric form `--reduce', the accumulated value is
-exposed as `acc`."
-  (if list
-      (-reduce-from fn (car list) (cdr list))
-    (funcall fn)))
-
-(defun -reduce-r-from (fn initial-value list)
-  "Replace conses with FN, nil with INITIAL-VALUE and evaluate
-the resulting expression. If LIST is empty, INITIAL-VALUE is
-returned and FN is not called.
-
-Note: this function works the same as `-reduce-from' but the
-operation associates from right instead of from left."
-  (if (not list) initial-value
-    (funcall fn (car list) (-reduce-r-from fn initial-value (cdr list)))))
-
-(defmacro --reduce-r-from (form initial-value list)
-  "Anaphoric version of `-reduce-r-from'."
-  (declare (debug (form form form)))
-  `(-reduce-r-from (lambda (&optional it acc) ,form) ,initial-value ,list))
-
-(defun -reduce-r (fn list)
-  "Replace conses with FN and evaluate the resulting expression.
-The final nil is ignored. If LIST contains no items, FN must
-accept no arguments as well, and reduce return the result of
-calling FN with no arguments. If LIST has only 1 item, it is
-returned and FN is not called.
-
-The first argument of FN is the new item, the second is the
-accumulated value.
-
-Note: this function works the same as `-reduce' but the operation
-associates from right instead of from left."
-  (cond
-   ((not list) (funcall fn))
-   ((not (cdr list)) (car list))
-   (t (funcall fn (car list) (-reduce-r fn (cdr list))))))
-
-(defmacro --reduce-r (form list)
-  "Anaphoric version of `-reduce-r'."
-  (declare (debug (form form)))
-  `(-reduce-r (lambda (&optional it acc) ,form) ,list))
-
-(defmacro --filter (form list)
-  "Anaphoric form of `-filter'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list (when ,form (!cons it ,r)))
-       (nreverse ,r))))
-
-(defun -filter (pred list)
-  "Return a new list of the items in LIST for which PRED returns a non-nil value.
-
-Alias: `-select'"
-  (--filter (funcall pred it) list))
-
-(defalias '-select '-filter)
-(defalias '--select '--filter)
-
-(defmacro --remove (form list)
-  "Anaphoric form of `-remove'."
-  (declare (debug (form form)))
-  `(--filter (not ,form) ,list))
-
-(defun -remove (pred list)
-  "Return a new list of the items in LIST for which PRED returns nil.
-
-Alias: `-reject'"
-  (--remove (funcall pred it) list))
-
-(defalias '-reject '-remove)
-(defalias '--reject '--remove)
-
-(defun -remove-first (pred list)
-  "Return a new list with the first item matching PRED removed.
-
-Alias: `-reject-first'
-
-See also: `-remove', `-map-first'"
-  (let (front)
-    (while (and list (not (funcall pred (car list))))
-      (push (car list) front)
-      (!cdr list))
-    (if list
-        (-concat (nreverse front) (cdr list))
-      (nreverse front))))
-
-(defmacro --remove-first (form list)
-  "Anaphoric form of `-remove-first'."
-  (declare (debug (form form)))
-  `(-remove-first (lambda (it) ,form) ,list))
-
-(defalias '-reject-first '-remove-first)
-(defalias '--reject-first '--remove-first)
-
-(defun -remove-last (pred list)
-  "Return a new list with the last item matching PRED removed.
-
-Alias: `-reject-last'
-
-See also: `-remove', `-map-last'"
-  (nreverse (-remove-first pred (nreverse list))))
-
-(defmacro --remove-last (form list)
-  "Anaphoric form of `-remove-last'."
-  (declare (debug (form form)))
-  `(-remove-last (lambda (it) ,form) ,list))
-
-(defalias '-reject-last '-remove-last)
-(defalias '--reject-last '--remove-last)
-
-(defun -remove-item (item list)
-  "Remove all occurences of ITEM from LIST.
-
-Comparison is done with `equal'."
-  (--remove (equal it item) list))
-
-(defmacro --keep (form list)
-  "Anaphoric form of `-keep'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result"))
-        (m (make-symbol "mapped")))
-    `(let (,r)
-       (--each ,list (let ((,m ,form)) (when ,m (!cons ,m ,r))))
-       (nreverse ,r))))
-
-(defun -keep (fn list)
-  "Return a new list of the non-nil results of applying FN to the items in LIST.
-
-If you want to select the original items satisfying a predicate use `-filter'."
-  (--keep (funcall fn it) list))
-
-(defun -non-nil (list)
-  "Return all non-nil elements of LIST."
-  (-remove 'null list))
-
-(defmacro --map-indexed (form list)
-  "Anaphoric form of `-map-indexed'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list
-         (!cons ,form ,r))
-       (nreverse ,r))))
-
-(defun -map-indexed (fn list)
-  "Return a new list consisting of the result of (FN index item) for each item in LIST.
-
-In the anaphoric form `--map-indexed', the index is exposed as `it-index`."
-  (--map-indexed (funcall fn it-index it) list))
-
-(defmacro --map-when (pred rep list)
-  "Anaphoric form of `-map-when'."
-  (declare (debug (form form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list (!cons (if ,pred ,rep it) ,r))
-       (nreverse ,r))))
-
-(defun -map-when (pred rep list)
-  "Return a new list where the elements in LIST that does not match the PRED function
-are unchanged, and where the elements in LIST that do match the PRED function are mapped
-through the REP function.
-
-Alias: `-replace-where'
-
-See also: `-update-at'"
-  (--map-when (funcall pred it) (funcall rep it) list))
-
-(defalias '-replace-where '-map-when)
-(defalias '--replace-where '--map-when)
-
-(defun -map-first (pred rep list)
-  "Replace first item in LIST satisfying PRED with result of REP called on this item.
-
-See also: `-map-when', `-replace-first'"
-  (let (front)
-    (while (and list (not (funcall pred (car list))))
-      (push (car list) front)
-      (!cdr list))
-    (if list
-        (-concat (nreverse front) (cons (funcall rep (car list)) (cdr list)))
-      (nreverse front))))
-
-(defmacro --map-first (pred rep list)
-  "Anaphoric form of `-map-first'."
-  `(-map-first (lambda (it) ,pred) (lambda (it) ,rep) ,list))
-
-(defun -map-last (pred rep list)
-  "Replace first item in LIST satisfying PRED with result of REP called on this item.
-
-See also: `-map-when', `-replace-last'"
-  (nreverse (-map-first pred rep (nreverse list))))
-
-(defmacro --map-last (pred rep list)
-  "Anaphoric form of `-map-last'."
-  `(-map-last (lambda (it) ,pred) (lambda (it) ,rep) ,list))
-
-(defun -replace (old new list)
-  "Replace all OLD items in LIST with NEW.
-
-Elements are compared using `equal'.
-
-See also: `-replace-at'"
-  (--map-when (equal it old) new list))
-
-(defun -replace-first (old new list)
-  "Replace the first occurence of OLD with NEW in LIST.
-
-Elements are compared using `equal'.
-
-See also: `-map-first'"
-  (--map-first (equal old it) new list))
-
-(defun -replace-last (old new list)
-  "Replace the last occurence of OLD with NEW in LIST.
-
-Elements are compared using `equal'.
-
-See also: `-map-last'"
-  (--map-last (equal old it) new list))
-
-(defmacro --mapcat (form list)
-  "Anaphoric form of `-mapcat'."
-  (declare (debug (form form)))
-  `(apply 'append (--map ,form ,list)))
-
-(defun -mapcat (fn list)
-  "Return the concatenation of the result of mapping FN over LIST.
-Thus function FN should return a list."
-  (--mapcat (funcall fn it) list))
-
-(defun -flatten (l)
-  "Take a nested list L and return its contents as a single, flat list.
-
-See also: `-flatten-n'"
-  (if (and (listp l) (listp (cdr l)))
-      (-mapcat '-flatten l)
-    (list l)))
-
-(defmacro --iterate (form init n)
-  "Anaphoric version of `-iterate'."
-  (declare (debug (form form form)))
-  `(-iterate (lambda (it) ,form) ,init ,n))
-
-(defun -flatten-n (num list)
-  "Flatten NUM levels of a nested LIST.
-
-See also: `-flatten'"
-  (-last-item (--iterate (--mapcat (-list it) it) list (1+ num))))
-
-(defun -concat (&rest lists)
-  "Return a new list with the concatenation of the elements in the supplied LISTS."
-  (apply 'append lists))
-
-(defalias '-copy 'copy-sequence
-  "Create a shallow copy of LIST.")
-
-(defun -splice (pred fun list)
-  "Splice lists generated by FUN in place of elements matching PRED in LIST.
-
-FUN takes the element matching PRED as input.
-
-This function can be used as replacement for `,@' in case you
-need to splice several lists at marked positions (for example
-with keywords).
-
-See also: `-splice-list', `-insert-at'"
-  (let (r)
-    (--each list
-      (if (funcall pred it)
-          (let ((new (funcall fun it)))
-            (--each new (!cons it r)))
-        (!cons it r)))
-    (nreverse r)))
-
-(defmacro --splice (pred form list)
-  "Anaphoric form of `-splice'."
-  `(-splice (lambda (it) ,pred) (lambda (it) ,form) ,list))
-
-(defun -splice-list (pred new-list list)
-  "Splice NEW-LIST in place of elements matching PRED in LIST.
-
-See also: `-splice', `-insert-at'"
-  (-splice pred (lambda (_) new-list) list))
-
-(defmacro --splice-list (pred new-list list)
-  "Anaphoric form of `-splice-list'."
-  `(-splice-list (lambda (it) ,pred) ,new-list ,list))
-
-(defun -cons* (&rest args)
-  "Make a new list from the elements of ARGS.
-
-The last 2 members of ARGS are used as the final cons of the
-result so if the final member of ARGS is not a list the result is
-a dotted list."
-  (-reduce-r 'cons args))
-
-(defun -snoc (list elem &rest elements)
-  "Append ELEM to the end of the list.
-
-This is like `cons', but operates on the end of list.
-
-If ELEMENTS is non nil, append these to the list as well."
-  (-concat list (list elem) elements))
-
-(defmacro --first (form list)
-  "Anaphoric form of `-first'."
-  (declare (debug (form form)))
-  (let ((n (make-symbol "needle")))
-    `(let (,n)
-       (--each-while ,list (not ,n)
-         (when ,form (setq ,n it)))
-       ,n)))
-
-(defun -first (pred list)
-  "Return the first x in LIST where (PRED x) is non-nil, else nil.
-
-To get the first item in the list no questions asked, use `car'.
-
-Alias: `-find'"
-  (--first (funcall pred it) list))
-
-(defalias '-find '-first)
-(defalias '--find '--first)
-
-(defmacro --some (form list)
-  "Anaphoric form of `-some'."
-  (declare (debug (form form)))
-  (let ((n (make-symbol "needle")))
-    `(let (,n)
-       (--each-while ,list (not ,n)
-         (setq ,n ,form))
-       ,n)))
-
-(defun -some (pred list)
-  "Return (PRED x) for the first LIST item where (PRED x) is non-nil, else nil.
-
-Alias: `-any'"
-  (--some (funcall pred it) list))
-
-(defalias '-any '-some)
-(defalias '--any '--some)
-
-(defmacro --last (form list)
-  "Anaphoric form of `-last'."
-  (declare (debug (form form)))
-  (let ((n (make-symbol "needle")))
-    `(let (,n)
-       (--each ,list
-         (when ,form (setq ,n it)))
-       ,n)))
-
-(defun -last (pred list)
-  "Return the last x in LIST where (PRED x) is non-nil, else nil."
-  (--last (funcall pred it) list))
-
-(defalias '-first-item 'car
-  "Return the first item of LIST, or nil on an empty list.")
-
-(defun -last-item (list)
-  "Return the last item of LIST, or nil on an empty list."
-  (car (last list)))
-
-(defun -butlast (list)
-  "Return a list of all items in list except for the last."
-  (let (result)
-    (while (cdr list)
-      (!cons (car list) result)
-      (!cdr list))
-    (nreverse result)))
-
-(defmacro --count (pred list)
-  "Anaphoric form of `-count'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let ((,r 0))
-       (--each ,list (when ,pred (setq ,r (1+ ,r))))
-       ,r)))
-
-(defun -count (pred list)
-  "Counts the number of items in LIST where (PRED item) is non-nil."
-  (--count (funcall pred it) list))
-
-(defun ---truthy? (val)
-  (not (null val)))
-
-(defmacro --any? (form list)
-  "Anaphoric form of `-any?'."
-  (declare (debug (form form)))
-  `(---truthy? (--first ,form ,list)))
-
-(defun -any? (pred list)
-  "Return t if (PRED x) is non-nil for any x in LIST, else nil.
-
-Alias: `-any-p', `-some?', `-some-p'"
-  (--any? (funcall pred it) list))
-
-(defalias '-some? '-any?)
-(defalias '--some? '--any?)
-(defalias '-any-p '-any?)
-(defalias '--any-p '--any?)
-(defalias '-some-p '-any?)
-(defalias '--some-p '--any?)
-
-(defmacro --all? (form list)
-  "Anaphoric form of `-all?'."
-  (declare (debug (form form)))
-  (let ((a (make-symbol "all")))
-    `(let ((,a t))
-       (--each-while ,list ,a (setq ,a ,form))
-       (---truthy? ,a))))
-
-(defun -all? (pred list)
-  "Return t if (PRED x) is non-nil for all x in LIST, else nil.
-
-Alias: `-all-p', `-every?', `-every-p'"
-  (--all? (funcall pred it) list))
-
-(defalias '-every? '-all?)
-(defalias '--every? '--all?)
-(defalias '-all-p '-all?)
-(defalias '--all-p '--all?)
-(defalias '-every-p '-all?)
-(defalias '--every-p '--all?)
-
-(defmacro --none? (form list)
-  "Anaphoric form of `-none?'."
-  (declare (debug (form form)))
-  `(--all? (not ,form) ,list))
-
-(defun -none? (pred list)
-  "Return t if (PRED x) is nil for all x in LIST, else nil.
-
-Alias: `-none-p'"
-  (--none? (funcall pred it) list))
-
-(defalias '-none-p '-none?)
-(defalias '--none-p '--none?)
-
-(defmacro --only-some? (form list)
-  "Anaphoric form of `-only-some?'."
-  (declare (debug (form form)))
-  (let ((y (make-symbol "yes"))
-        (n (make-symbol "no")))
-    `(let (,y ,n)
-       (--each-while ,list (not (and ,y ,n))
-         (if ,form (setq ,y t) (setq ,n t)))
-       (---truthy? (and ,y ,n)))))
-
-(defun -only-some? (pred list)
-  "Return `t` if at least one item of LIST matches PRED and at least one item of LIST does not match PRED.
-Return `nil` both if all items match the predicate or if none of the items match the predicate.
-
-Alias: `-only-some-p'"
-  (--only-some? (funcall pred it) list))
-
-(defalias '-only-some-p '-only-some?)
-(defalias '--only-some-p '--only-some?)
-
-(defun -slice (list from &optional to step)
-  "Return copy of LIST, starting from index FROM to index TO.
-
-FROM or TO may be negative.  These values are then interpreted
-modulo the length of the list.
-
-If STEP is a number, only each STEPth item in the resulting
-section is returned.  Defaults to 1."
-  (let ((length (length list))
-        (new-list nil))
-    ;; to defaults to the end of the list
-    (setq to (or to length))
-    (setq step (or step 1))
-    ;; handle negative indices
-    (when (< from 0)
-      (setq from (mod from length)))
-    (when (< to 0)
-      (setq to (mod to length)))
-
-    ;; iterate through the list, keeping the elements we want
-    (--each-while list (< it-index to)
-      (when (and (>= it-index from)
-                 (= (mod (- from it-index) step) 0))
-        (push it new-list)))
-    (nreverse new-list)))
-
-(defun -take (n list)
-  "Return a new list of the first N items in LIST, or all items if there are fewer than N."
-  (let (result)
-    (--dotimes n
-      (when list
-        (!cons (car list) result)
-        (!cdr list)))
-    (nreverse result)))
-
-(defalias '-drop 'nthcdr "Return the tail of LIST without the first N items.")
-
-(defmacro --take-while (form list)
-  "Anaphoric form of `-take-while'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each-while ,list ,form (!cons it ,r))
-       (nreverse ,r))))
-
-(defun -take-while (pred list)
-  "Return a new list of successive items from LIST while (PRED item) returns a non-nil value."
-  (--take-while (funcall pred it) list))
-
-(defmacro --drop-while (form list)
-  "Anaphoric form of `-drop-while'."
-  (declare (debug (form form)))
-  (let ((l (make-symbol "list")))
-    `(let ((,l ,list))
-       (while (and ,l (let ((it (car ,l))) ,form))
-         (!cdr ,l))
-       ,l)))
-
-(defun -drop-while (pred list)
-  "Return the tail of LIST starting from the first item for which (PRED item) returns nil."
-  (--drop-while (funcall pred it) list))
-
-(defun -split-at (n list)
-  "Return a list of ((-take N LIST) (-drop N LIST)), in no more than one pass through the list."
-  (let (result)
-    (--dotimes n
-      (when list
-        (!cons (car list) result)
-        (!cdr list)))
-    (list (nreverse result) list)))
-
-(defun -rotate (n list)
-  "Rotate LIST N places to the right.  With N negative, rotate to the left.
-The time complexity is O(n)."
-  (if (> n 0)
-      (append (last list n) (butlast list n))
-    (append (-drop (- n) list) (-take (- n) list))))
-
-(defun -insert-at (n x list)
-  "Return a list with X inserted into LIST at position N.
-
-See also: `-splice', `-splice-list'"
-  (let ((split-list (-split-at n list)))
-    (nconc (car split-list) (cons x (cadr split-list)))))
-
-(defun -replace-at (n x list)
-  "Return a list with element at Nth position in LIST replaced with X.
-
-See also: `-replace'"
-  (let ((split-list (-split-at n list)))
-    (nconc (car split-list) (cons x (cdr (cadr split-list))))))
-
-(defun -update-at (n func list)
-  "Return a list with element at Nth position in LIST replaced with `(func (nth n list))`.
-
-See also: `-map-when'"
-  (let ((split-list (-split-at n list)))
-    (nconc (car split-list) (cons (funcall func (car (cadr split-list))) (cdr (cadr split-list))))))
-
-(defmacro --update-at (n form list)
-  "Anaphoric version of `-update-at'."
-  (declare (debug (form form form)))
-  `(-update-at ,n (lambda (it) ,form) ,list))
-
-(defun -remove-at (n list)
-  "Return a list with element at Nth position in LIST removed.
-
-See also: `-remove-at-indices', `-remove'"
-  (-remove-at-indices (list n) list))
-
-(defun -remove-at-indices (indices list)
-  "Return a list whose elements are elements from LIST without
-elements selected as `(nth i list)` for all i
-from INDICES.
-
-See also: `-remove-at', `-remove'"
-  (let* ((indices (-sort '< indices))
-         (diffs (cons (car indices) (-map '1- (-zip-with '- (cdr indices) indices))))
-         r)
-    (--each diffs
-      (let ((split (-split-at it list)))
-        (!cons (car split) r)
-        (setq list (cdr (cadr split)))))
-    (!cons list r)
-    (apply '-concat (nreverse r))))
-
-(defmacro --split-with (pred list)
-  "Anaphoric form of `-split-with'."
-  (declare (debug (form form)))
-  (let ((l (make-symbol "list"))
-        (r (make-symbol "result"))
-        (c (make-symbol "continue")))
-    `(let ((,l ,list)
-           (,r nil)
-           (,c t))
-       (while (and ,l ,c)
-         (let ((it (car ,l)))
-           (if (not ,pred)
-               (setq ,c nil)
-             (!cons it ,r)
-             (!cdr ,l))))
-       (list (nreverse ,r) ,l))))
-
-(defun -split-with (pred list)
-  "Return a list of ((-take-while PRED LIST) (-drop-while PRED LIST)), in no more than one pass through the list."
-  (--split-with (funcall pred it) list))
-
-(defmacro -split-on (item list)
-  "Split the LIST each time ITEM is found.
-
-Unlike `-partition-by', the ITEM is discarded from the results.
-Empty lists are also removed from the result.
-
-Comparison is done by `equal'.
-
-See also `-split-when'"
-  (declare (debug (form form)))
-  `(-split-when (lambda (it) (equal it ,item)) ,list))
-
-(defmacro --split-when (form list)
-  "Anaphoric version of `-split-when'."
-  (declare (debug (form form)))
-  `(-split-when (lambda (it) ,form) ,list))
-
-(defun -split-when (fn list)
-  "Split the LIST on each element where FN returns non-nil.
-
-Unlike `-partition-by', the \"matched\" element is discarded from
-the results.  Empty lists are also removed from the result.
-
-This function can be thought of as a generalization of
-`split-string'."
-  (let (r s)
-    (while list
-      (if (not (funcall fn (car list)))
-          (push (car list) s)
-        (when s (push (nreverse s) r))
-        (setq s nil))
-      (!cdr list))
-    (when s (push (nreverse s) r))
-    (nreverse r)))
-
-(defmacro --separate (form list)
-  "Anaphoric form of `-separate'."
-  (declare (debug (form form)))
-  (let ((y (make-symbol "yes"))
-        (n (make-symbol "no")))
-    `(let (,y ,n)
-       (--each ,list (if ,form (!cons it ,y) (!cons it ,n)))
-       (list (nreverse ,y) (nreverse ,n)))))
-
-(defun -separate (pred list)
-  "Return a list of ((-filter PRED LIST) (-remove PRED LIST)), in one pass through the list."
-  (--separate (funcall pred it) list))
-
-(defun ---partition-all-in-steps-reversed (n step list)
-  "Private: Used by -partition-all-in-steps and -partition-in-steps."
-  (when (< step 1)
-    (error "Step must be a positive number, or you're looking at some juicy infinite loops."))
-  (let ((result nil)
-        (len 0))
-    (while list
-      (!cons (-take n list) result)
-      (setq list (-drop step list)))
-    result))
-
-(defun -partition-all-in-steps (n step list)
-  "Return a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
-The last groups may contain less than N items."
-  (nreverse (---partition-all-in-steps-reversed n step list)))
-
-(defun -partition-in-steps (n step list)
-  "Return a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
-If there are not enough items to make the last group N-sized,
-those items are discarded."
-  (let ((result (---partition-all-in-steps-reversed n step list)))
-    (while (and result (< (length (car result)) n))
-      (!cdr result))
-    (nreverse result)))
-
-(defun -partition-all (n list)
-  "Return a new list with the items in LIST grouped into N-sized sublists.
-The last group may contain less than N items."
-  (-partition-all-in-steps n n list))
-
-(defun -partition (n list)
-  "Return a new list with the items in LIST grouped into N-sized sublists.
-If there are not enough items to make the last group N-sized,
-those items are discarded."
-  (-partition-in-steps n n list))
-
-(defmacro --partition-by (form list)
-  "Anaphoric form of `-partition-by'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result"))
-        (s (make-symbol "sublist"))
-        (v (make-symbol "value"))
-        (n (make-symbol "new-value"))
-        (l (make-symbol "list")))
-    `(let ((,l ,list))
-       (when ,l
-         (let* ((,r nil)
-                (it (car ,l))
-                (,s (list it))
-                (,v ,form)
-                (,l (cdr ,l)))
-           (while ,l
-             (let* ((it (car ,l))
-                    (,n ,form))
-               (unless (equal ,v ,n)
-                 (!cons (nreverse ,s) ,r)
-                 (setq ,s nil)
-                 (setq ,v ,n))
-               (!cons it ,s)
-               (!cdr ,l)))
-           (!cons (nreverse ,s) ,r)
-           (nreverse ,r))))))
-
-(defun -partition-by (fn list)
-  "Apply FN to each item in LIST, splitting it each time FN returns a new value."
-  (--partition-by (funcall fn it) list))
-
-(defmacro --partition-by-header (form list)
-  "Anaphoric form of `-partition-by-header'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result"))
-        (s (make-symbol "sublist"))
-        (h (make-symbol "header-value"))
-        (b (make-symbol "seen-body?"))
-        (n (make-symbol "new-value"))
-        (l (make-symbol "list")))
-    `(let ((,l ,list))
-       (when ,l
-         (let* ((,r nil)
-                (it (car ,l))
-                (,s (list it))
-                (,h ,form)
-                (,b nil)
-                (,l (cdr ,l)))
-           (while ,l
-             (let* ((it (car ,l))
-                    (,n ,form))
-               (if (equal ,h ,n)
-                   (when ,b
-                     (!cons (nreverse ,s) ,r)
-                     (setq ,s nil)
-                     (setq ,b nil))
-                 (setq ,b t))
-               (!cons it ,s)
-               (!cdr ,l)))
-           (!cons (nreverse ,s) ,r)
-           (nreverse ,r))))))
-
-(defun -partition-by-header (fn list)
-  "Apply FN to the first item in LIST. That is the header
-value. Apply FN to each item in LIST, splitting it each time FN
-returns the header value, but only after seeing at least one
-other value (the body)."
-  (--partition-by-header (funcall fn it) list))
-
-(defmacro --group-by (form list)
-  "Anaphoric form of `-group-by'."
-  (declare (debug t))
-  (let ((n (make-symbol "n"))
-        (k (make-symbol "k"))
-        (grp (make-symbol "grp")))
-    `(nreverse
-      (-map
-       (lambda (,n)
-         (cons (car ,n)
-               (nreverse (cdr ,n))))
-       (--reduce-from
-        (let* ((,k (,@form))
-               (,grp (assoc ,k acc)))
-          (if ,grp
-              (setcdr ,grp (cons it (cdr ,grp)))
-            (push
-             (list ,k it)
-             acc))
-          acc)
-        nil ,list)))))
-
-(defun -group-by (fn list)
-  "Separate LIST into an alist whose keys are FN applied to the
-elements of LIST.  Keys are compared by `equal'."
-  (--group-by (funcall fn it) list))
-
-(defun -interpose (sep list)
-  "Return a new list of all elements in LIST separated by SEP."
-  (let (result)
-    (when list
-      (!cons (car list) result)
-      (!cdr list))
-    (while list
-      (setq result (cons (car list) (cons sep result)))
-      (!cdr list))
-    (nreverse result)))
-
-(defun -interleave (&rest lists)
-  "Return a new list of the first item in each list, then the second etc."
-  (let (result)
-    (while (-none? 'null lists)
-      (--each lists (!cons (car it) result))
-      (setq lists (-map 'cdr lists)))
-    (nreverse result)))
-
-(defmacro --zip-with (form list1 list2)
-  "Anaphoric form of `-zip-with'.
-
-The elements in list1 is bound as `it`, the elements in list2 as `other`."
-  (declare (debug (form form form)))
-  (let ((r (make-symbol "result"))
-        (l1 (make-symbol "list1"))
-        (l2 (make-symbol "list2")))
-    `(let ((,r nil)
-           (,l1 ,list1)
-           (,l2 ,list2))
-       (while (and ,l1 ,l2)
-         (let ((it (car ,l1))
-               (other (car ,l2)))
-           (!cons ,form ,r)
-           (!cdr ,l1)
-           (!cdr ,l2)))
-       (nreverse ,r))))
-
-(defun -zip-with (fn list1 list2)
-  "Zip the two lists LIST1 and LIST2 using a function FN.  This
-function is applied pairwise taking as first argument element of
-LIST1 and as second argument element of LIST2 at corresponding
-position.
-
-The anaphoric form `--zip-with' binds the elements from LIST1 as `it`,
-and the elements from LIST2 as `other`."
-  (--zip-with (funcall fn it other) list1 list2))
-
-(defun -zip (&rest lists)
-  "Zip LISTS together.  Group the head of each list, followed by the
-second elements of each list, and so on. The lengths of the returned
-groupings are equal to the length of the shortest input list.
-
-If two lists are provided as arguments, return the groupings as a list
-of cons cells. Otherwise, return the groupings as a list of lists. "
-  (let (results)
-    (while (-none? 'null lists)
-      (setq results (cons (mapcar 'car lists) results))
-      (setq lists (mapcar 'cdr lists)))
-    (setq results (nreverse results))
-    (if (= (length lists) 2)
-        ;; to support backward compatability, return
-        ;; a cons cell if two lists were provided
-        (--map (cons (car it) (cadr it)) results)
-      results)))
-
-(defun -zip-fill (fill-value &rest lists)
-  "Zip LISTS, with FILL-VALUE padded onto the shorter lists. The
-lengths of the returned groupings are equal to the length of the
-longest input list."
-  (apply '-zip (apply '-pad (cons fill-value lists))))
-
-(defun -cycle (list)
-  "Return an infinite copy of LIST that will cycle through the
-elements and repeat from the beginning."
-  (let ((newlist (-map 'identity list)))
-    (nconc newlist newlist)))
-
-(defun -pad (fill-value &rest lists)
-  "Appends FILL-VALUE to the end of each list in LISTS such that they
-will all have the same length."
-  (let* ((annotations (-annotate 'length lists))
-         (n (-max (-map 'car annotations))))
-    (--map (append (cdr it) (-repeat (- n (car it)) fill-value)) annotations)))
-
-(defun -annotate (fn list)
-  "Return a list of cons cells where each cell is FN applied to each
-element of LIST paired with the unmodified element of LIST."
-  (-zip (-map fn list) list))
-
-(defmacro --annotate (form list)
-  "Anaphoric version of `-annotate'."
-  (declare (debug (form form)))
-  `(-annotate (lambda (it) ,form) ,list))
-
-(defun dash--table-carry (lists restore-lists &optional re)
-  "Helper for `-table' and `-table-flat'.
-
-If a list overflows, carry to the right and reset the list.
-
-Return how many lists were re-seted."
-  (while (and (not (car lists))
-              (not (equal lists '(nil))))
-    (setcar lists (car restore-lists))
-    (pop (cadr lists))
-    (!cdr lists)
-    (!cdr restore-lists)
-    (when re
-      (push (nreverse (car re)) (cadr re))
-      (setcar re nil)
-      (!cdr re))))
-
-(defun -table (fn &rest lists)
-  "Compute outer product of LISTS using function FN.
-
-The function FN should have the same arity as the number of
-supplied lists.
-
-The outer product is computed by applying fn to all possible
-combinations created by taking one element from each list in
-order.  The dimension of the result is (length lists).
-
-See also: `-table-flat'"
-  (let ((restore-lists (copy-sequence lists))
-        (last-list (last lists))
-        (re (--map nil (number-sequence 1 (length lists)))))
-    (while (car last-list)
-      (let ((item (apply fn (-map 'car lists))))
-        (push item (car re))
-        (setcar lists (cdar lists)) ;; silence byte compiler
-        (dash--table-carry lists restore-lists re)))
-    (nreverse (car (last re)))))
-
-(defun -table-flat (fn &rest lists)
-  "Compute flat outer product of LISTS using function FN.
-
-The function FN should have the same arity as the number of
-supplied lists.
-
-The outer product is computed by applying fn to all possible
-combinations created by taking one element from each list in
-order.  The results are flattened, ignoring the tensor structure
-of the result.  This is equivalent to calling:
-
-  (-flatten-n (1- (length lists)) (-table fn lists))
-
-but the implementation here is much more efficient.
-
-See also: `-flatten-n', `-table'"
-  (let ((restore-lists (copy-sequence lists))
-        (last-list (last lists))
-        re)
-    (while (car last-list)
-      (push (apply fn (-map 'car lists)) re)
-      (pop (car lists))
-      (dash--table-carry lists restore-lists))
-    (nreverse re)))
-
-(defun -partial (fn &rest args)
-  "Take a function FN and fewer than the normal arguments to FN,
-and return a fn that takes a variable number of additional ARGS.
-When called, the returned function calls FN with ARGS first and
-then additional args."
-  (apply 'apply-partially fn args))
-
-(defun -elem-index (elem list)
-  "Return the index of the first element in the given LIST which
-is equal to the query element ELEM, or nil if there is no
-such element."
-  (car (-elem-indices elem list)))
-
-(defun -elem-indices (elem list)
-  "Return the indices of all elements in LIST equal to the query
-element ELEM, in ascending order."
-  (-find-indices (-partial 'equal elem) list))
-
-(defun -find-indices (pred list)
-  "Return the indices of all elements in LIST satisfying the
-predicate PRED, in ascending order."
-  (let ((i 0))
-    (apply 'append (--map-indexed (when (funcall pred it) (list it-index)) list))))
-
-(defmacro --find-indices (form list)
-  "Anaphoric version of `-find-indices'."
-  (declare (debug (form form)))
-  `(-find-indices (lambda (it) ,form) ,list))
-
-(defun -find-index (pred list)
-  "Take a predicate PRED and a LIST and return the index of the
-first element in the list satisfying the predicate, or nil if
-there is no such element."
-  (car (-find-indices pred list)))
-
-(defmacro --find-index (form list)
-  "Anaphoric version of `-find-index'."
-  (declare (debug (form form)))
-  `(-find-index (lambda (it) ,form) ,list))
-
-(defun -find-last-index (pred list)
-  "Take a predicate PRED and a LIST and return the index of the
-last element in the list satisfying the predicate, or nil if
-there is no such element."
-  (-last-item (-find-indices pred list)))
-
-(defmacro --find-last-index (form list)
-  "Anaphoric version of `-find-last-index'."
-  `(-find-last-index (lambda (it) ,form) ,list))
-
-(defun -select-by-indices (indices list)
-  "Return a list whose elements are elements from LIST selected
-as `(nth i list)` for all i from INDICES."
-  (let (r)
-    (--each indices
-      (!cons (nth it list) r))
-    (nreverse r)))
-
-(defmacro -> (x &optional form &rest more)
-  "Thread the expr through the forms. Insert X as the second item
-in the first form, making a list of it if it is not a list
-already. If there are more forms, insert the first form as the
-second item in second form, etc."
-  (cond
-   ((null form) x)
-   ((null more) (if (listp form)
-                    `(,(car form) ,x ,@(cdr form))
-                  (list form x)))
-   (:else `(-> (-> ,x ,form) ,@more))))
-
-(defmacro ->> (x &optional form &rest more)
-  "Thread the expr through the forms. Insert X as the last item
-in the first form, making a list of it if it is not a list
-already. If there are more forms, insert the first form as the
-last item in second form, etc."
-  (cond
-   ((null form) x)
-   ((null more) (if (listp form)
-                    `(,@form ,x)
-                  (list form x)))
-   (:else `(->> (->> ,x ,form) ,@more))))
-
-(defmacro --> (x form &rest more)
-  "Thread the expr through the forms. Insert X at the position
-signified by the token `it' in the first form. If there are more
-forms, insert the first form at the position signified by `it' in
-in second form, etc."
-  (if (null more)
-      (if (listp form)
-          (--map-when (eq it 'it) x form)
-        (list form x))
-    `(--> (--> ,x ,form) ,@more)))
-
-(defun -grade-up (comparator list)
-  "Grade elements of LIST using COMPARATOR relation, yielding a
-permutation vector such that applying this permutation to LIST
-sorts it in ascending order."
-  ;; ugly hack to "fix" lack of lexical scope
-  (let ((comp `(lambda (it other) (funcall ',comparator (car it) (car other)))))
-    (->> (--map-indexed (cons it it-index) list)
-         (-sort comp)
-         (-map 'cdr))))
-
-(defun -grade-down (comparator list)
-  "Grade elements of LIST using COMPARATOR relation, yielding a
-permutation vector such that applying this permutation to LIST
-sorts it in descending order."
-  ;; ugly hack to "fix" lack of lexical scope
-  (let ((comp `(lambda (it other) (funcall ',comparator (car other) (car it)))))
-    (->> (--map-indexed (cons it it-index) list)
-         (-sort comp)
-         (-map 'cdr))))
-
-(defvar dash--source-counter 0
-  "Monotonic counter for generated symbols.")
-
-(defun dash--match-make-source-symbol ()
-  "Generate a new dash-source symbol.
-
-All returned symbols are guaranteed to be unique."
-  (prog1 (make-symbol (format "--dash-source-%d--" dash--source-counter))
-    (setq dash--source-counter (1+ dash--source-counter))))
-
-(defun dash--match-ignore-place-p (symbol)
-  "Return non-nil if SYMBOL is a symbol and starts with _."
-  (and (symbolp symbol)
-       (eq (aref (symbol-name symbol) 0) ?_)))
-
-(defun dash--match-cons-skip-cdr (skip-cdr source)
-  "Helper function generating idiomatic shifting code."
-  (cond
-   ((= skip-cdr 0)
-    `(pop ,source))
-   (t
-    `(prog1 ,(dash--match-cons-get-car skip-cdr source)
-       (setq ,source ,(dash--match-cons-get-cdr (1+ skip-cdr) source))))))
-
-(defun dash--match-cons-get-car (skip-cdr source)
-  "Helper function generating idiomatic code to get nth car."
-  (cond
-   ((= skip-cdr 0)
-    `(car ,source))
-   ((= skip-cdr 1)
-    `(cadr ,source))
-   (t
-    `(nth ,skip-cdr ,source))))
-
-(defun dash--match-cons-get-cdr (skip-cdr source)
-  "Helper function generating idiomatic code to get nth cdr."
-  (cond
-   ((= skip-cdr 0)
-    source)
-   ((= skip-cdr 1)
-    `(cdr ,source))
-   (t
-    `(nthcdr ,skip-cdr ,source))))
-
-(defun dash--match-cons (match-form source)
-  "Setup a cons matching environment and call the real matcher."
-  (let ((s (dash--match-make-source-symbol))
-        (n 0)
-        (m match-form))
-    (while (and (consp m)
-                (dash--match-ignore-place-p (car m)))
-      (setq n (1+ n)) (!cdr m))
-    (cond
-     ;; when we only have one pattern in the list, we don't have to
-     ;; create a temporary binding (--dash-source--) for the source
-     ;; and just use the input directly
-     ((and (consp m)
-           (not (cdr m)))
-      (dash--match (car m) (dash--match-cons-get-car n source)))
-     ;; handle other special types
-     ((> n 0)
-      (dash--match m (dash--match-cons-get-cdr n source)))
-     ;; this is the only entry-point for dash--match-cons-1, that's
-     ;; why we can't simply use the above branch, it would produce
-     ;; infinite recursion
-     (t
-      (cons (list s source) (dash--match-cons-1 match-form s))))))
-
-(defun dash--match-cons-1 (match-form source &optional props)
-  "Match MATCH-FORM against SOURCE.
-
-MATCH-FORM is a proper or improper list.  Each element of
-MATCH-FORM is either a symbol, which gets bound to the respective
-value in source or another match form which gets destructured
-recursively.
-
-If the cdr of last cons cell in the list is `nil', matching stops
-there.
-
-SOURCE is a proper or improper list."
-  (let ((skip-cdr (or (plist-get props :skip-cdr) 0)))
-    (cond
-     ((consp match-form)
-      (cond
-       ((cdr match-form)
-        (cond
-         ((and (symbolp (car match-form))
-               (eq (car match-form) '&keys))
-          (dash--match-kv (cons '&plist (cdr match-form)) (dash--match-cons-get-cdr skip-cdr source)))
-         ((dash--match-ignore-place-p (car match-form))
-          (dash--match-cons-1 (cdr match-form) source
-                              (plist-put props :skip-cdr (1+ skip-cdr))))
-         (t
-          (-concat (dash--match (car match-form) (dash--match-cons-skip-cdr skip-cdr source))
-                   (dash--match-cons-1 (cdr match-form) source)))))
-       (t ;; Last matching place, no need for shift
-        (dash--match (car match-form) (dash--match-cons-get-car skip-cdr source)))))
-     ((eq match-form nil)
-      nil)
-     (t ;; Handle improper lists.  Last matching place, no need for shift
-      (dash--match match-form (dash--match-cons-get-cdr skip-cdr source))))))
-
-(defun dash--vector-tail (seq start)
-  "Return the tail of SEQ starting at START."
-  (cond
-   ((vectorp seq)
-    (let* ((re-length (- (length seq) start))
-           (re (make-vector re-length 0)))
-      (--dotimes re-length (aset re it (aref seq (+ it start))))
-      re))
-   ((stringp seq)
-    (substring seq start))))
-
-(defun dash--match-vector (match-form source)
-  "Setup a vector matching environment and call the real matcher."
-  (let ((s (dash--match-make-source-symbol)))
-    (cond
-     ;; don't bind `s' if we only have one sub-pattern
-     ((= (length match-form) 1)
-      (dash--match (aref match-form 0) `(aref ,source 0)))
-     ;; if the source is a symbol, we don't need to re-bind it
-     ((symbolp source)
-      (dash--match-vector-1 match-form source))
-     ;; don't bind `s' if we only have one sub-pattern which is not ignored
-     ((let* ((ignored-places (mapcar 'dash--match-ignore-place-p match-form))
-             (ignored-places-n (length (-remove 'null ignored-places))))
-        (when (= ignored-places-n (1- (length match-form)))
-          (let ((n (-find-index 'null ignored-places)))
-            (dash--match (aref match-form n) `(aref ,source ,n))))))
-     (t
-      (cons (list s source) (dash--match-vector-1 match-form s))))))
-
-(defun dash--match-vector-1 (match-form source)
-  "Match MATCH-FORM against SOURCE.
-
-MATCH-FORM is a vector.  Each element of MATCH-FORM is either a
-symbol, which gets bound to the respective value in source or
-another match form which gets destructured recursively.
-
-If second-from-last place in MATCH-FORM is the symbol &rest, the
-next element of the MATCH-FORM is matched against the tail of
-SOURCE, starting at index of the &rest symbol.  This is
-conceptually the same as the (head . tail) match for improper
-lists, where dot plays the role of &rest.
-
-SOURCE is a vector.
-
-If the MATCH-FORM vector is shorter than SOURCE vector, only
-the (length MATCH-FORM) places are bound, the rest of the SOURCE
-is discarded."
-  (let ((i 0)
-        (l (length match-form))
-        (re))
-    (while (< i l)
-      (let ((m (aref match-form i)))
-        (push (cond
-               ((and (symbolp m)
-                     (eq m '&rest))
-                (prog1 (dash--match
-                        (aref match-form (1+ i))
-                        `(dash--vector-tail ,source ,i))
-                  (setq i l)))
-               ((and (symbolp m)
-                     ;; do not match symbols starting with _
-                     (not (eq (aref (symbol-name m) 0) ?_)))
-                (list (list m `(aref ,source ,i))))
-               ((not (symbolp m))
-                (dash--match m `(aref ,source ,i))))
-              re)
-        (setq i (1+ i))))
-    (-flatten-n 1 (nreverse re))))
-
-(defun dash--match-kv (match-form source)
-  "Setup a kv matching environment and call the real matcher.
-
-kv can be any key-value store, such as plist, alist or hash-table."
-  (let ((s (dash--match-make-source-symbol)))
-    (cond
-     ;; don't bind `s' if we only have one sub-pattern (&type key val)
-     ((= (length match-form) 3)
-      (dash--match-kv-1 (cdr match-form) source (car match-form)))
-     ;; if the source is a symbol, we don't need to re-bind it
-     ((symbolp source)
-      (dash--match-kv-1 (cdr match-form) source (car match-form)))
-     (t
-      (cons (list s source) (dash--match-kv-1 (cdr match-form) s (car match-form)))))))
-
-(defun dash--match-kv-1 (match-form source type)
-  "Match MATCH-FORM against SOURCE of type TYPE.
-
-MATCH-FORM is a proper list of the form (key1 place1 ... keyN
-placeN).  Each placeK is either a symbol, which gets bound to the
-value of keyK retrieved from the key-value store, or another
-match form which gets destructured recursively.
-
-SOURCE is a key-value store of type TYPE, which can be a plist,
-an alist or a hash table.
-
-TYPE is a token specifying the type of the key-value store.
-Valid values are &plist, &alist and &hash."
-  (-flatten-n 1 (-map
-                 (lambda (kv)
-                   (let* ((k (car kv))
-                          (v (cadr kv))
-                          (getter (cond
-                                   ((eq type '&plist)
-                                    `(plist-get ,source ,k))
-                                   ((eq type '&alist)
-                                    `(cdr (assoc ,k ,source)))
-                                   ((eq type '&hash)
-                                    `(gethash ,k ,source)))))
-                     (cond
-                      ((symbolp v)
-                       (list (list v getter)))
-                      (t (dash--match v getter)))))
-                 (-partition 2 match-form))))
-
-(defun dash--match-symbol (match-form source)
-  "Bind a symbol.
-
-This works just like `let', there is no destructuring."
-  (list (list match-form source)))
-
-(defun dash--match (match-form source)
-  "Match MATCH-FORM against SOURCE.
-
-This function tests the MATCH-FORM and dispatches to specific
-matchers based on the type of the expression.
-
-Key-value stores are disambiguated by placing a token &plist,
-&alist or &hash as a first item in the MATCH-FORM."
-  (cond
-   ((symbolp match-form)
-    (dash--match-symbol match-form source))
-   ((consp match-form)
-    (cond
-     ;; Handle the "x &as" bindings first.
-     ((and (consp (cdr match-form))
-           (symbolp (car match-form))
-           (eq '&as (cadr match-form)))
-      (let ((s (car match-form)))
-        (cons (list s source)
-              (dash--match (cddr match-form) s))))
-     ((memq (car match-form) '(&plist &alist &hash))
-      (dash--match-kv match-form source))
-     ((eq (car match-form) '&keys)
-      (dash--match-kv (cons '&plist (cdr match-form)) source))
-     (t (dash--match-cons match-form source))))
-   ((vectorp match-form)
-    ;; We support the &as binding in vectors too
-    (cond
-     ((and (> (length match-form) 2)
-           (symbolp (aref match-form 0))
-           (eq '&as (aref match-form 1)))
-      (let ((s (aref match-form 0)))
-        (cons (list s source)
-              (dash--match (dash--vector-tail match-form 2) s))))
-     (t (dash--match-vector match-form source))))))
-
-(defmacro -let* (varlist &rest body)
-  "Bind variables according to VARLIST then eval BODY.
-
-VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
-PATTERN is matched against the SOURCE structurally.  SOURCE is
-only evaluated once for each PATTERN.
-
-Each SOURCE can refer to the symbols already bound by this
-VARLIST.  This is useful if you want to destructure SOURCE
-recursively but also want to name the intermediate structures.
-
-See `-let' for the list of all possible patterns."
-  (declare (debug ((&rest (sexp form)) body))
-           (indent 1))
-  (let ((bindings (--mapcat (dash--match (car it) (cadr it)) varlist)))
-    `(let* ,bindings
-       ,@body)))
-
-(defmacro -let (varlist &rest body)
-  "Bind variables according to VARLIST then eval BODY.
-
-VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
-PATTERN is matched against the SOURCE \"structurally\".  SOURCE
-is only evaluated once for each PATTERN.  Each PATTERN is matched
-recursively, and can therefore contain sub-patterns which are
-matched against corresponding sub-expressions of SOURCE.
-
-All the SOURCEs are evalled before any symbols are
-bound (i.e. \"in parallel\").
-
-If VARLIST only contains one (PATTERN SOURCE) element, you can
-optionally specify it using a vector and discarding the
-outer-most parens.  Thus
-
-  (-let ((PATTERN SOURCE)) ..)
-
-becomes
-
-  (-let [PATTERN SOURCE] ..).
-
-`-let' uses a convention of not binding places (symbols) starting
-with _ whenever it's possible.  You can use this to skip over
-entries you don't care about.  However, this is not *always*
-possible (as a result of implementation) and these symbols might
-get bound to undefined values.
-
-Following is the overview of supported patterns.  Remember that
-patterns can be matched recursively, so every a, b, aK in the
-following can be a matching construct and not necessarily a
-symbol/variable.
-
-Symbol:
-
-  a - bind the SOURCE to A.  This is just like regular `let'.
-
-Conses and lists:
-
-  (a) - bind `car' of cons/list to A
-
-  (a . b) - bind car of cons to A and `cdr' to B
-
-  (a b) - bind car of list to A and `cadr' to B
-
-  (a1 a2 a3  ...) - bind 0th car of list to A1, 1st to A2, 2nd to A3 ...
-
-  (a1 a2 a3 ... aN . rest) - as above, but bind the Nth cdr to REST.
-
-Vectors:
-
-  [a] - bind 0th element of a non-list sequence to A (works with
-        vectors, strings, bit arrays...)
-
-  [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st to
-                   A1, 2nd to A2, ...
-                   If the PATTERN is shorter than SOURCE, the values at
-                   places not in PATTERN are ignored.
-                   If the PATTERN is longer than SOURCE, an `error' is
-                   thrown.
-
-  [a1 a2 a3 ... &rest rest] ) - as above, but bind the rest of
-                                the sequence to REST.  This is
-                                conceptually the same as improper list
-                                matching (a1 a2 ... aN . rest)
-
-Key/value stores:
-
-  (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
-                                 SOURCE plist to aK.  If the
-                                 value is not found, aK is nil.
-
-  (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
-                                 SOURCE alist to aK.  If the
-                                 value is not found, aK is nil.
-
-  (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
-                                SOURCE hash table to aK.  If the
-                                value is not found, aK is nil.
-
-Further, special keyword &keys supports \"inline\" matching of
-plist-like key-value pairs, similarly to &keys keyword of
-`cl-defun'.
-
-  (a1 a2 ... aN &keys key1 b1 ... keyN bK)
-
-This binds N values from the list to a1 ... aN, then interprets
-the cdr as a plist (see key/value matching above).
-
-You can name the source using the syntax SYMBOL &as PATTERN.
-This syntax works with lists (proper or improper), vectors and
-all types of maps.
-
-  (list &as a b c) (list 1 2 3)
-
-binds A to 1, B to 2, C to 3 and LIST to (1 2 3).
-
-Similarly:
-
-  (bounds &as beg . end) (cons 1 2)
-
-binds BEG to 1, END to 2 and BOUNDS to (1 . 2).
-
-  (items &as first . rest) (list 1 2 3)
-
-binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3)
-
-  [vect &as _ b c] [1 2 3]
-
-binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as usual).
-
-  (plist &as &plist :b b) (list :a 1 :b 2 :c 3)
-
-binds B to 2 and PLIST to (:a 1 :b 2 :c 3).  Same for &alist and &hash.
-
-This is especially useful when we want to capture the result of a
-computation and destructure at the same time.  Consider the
-form (function-returning-complex-structure) returning a list of
-two vectors with two items each.  We want to capture this entire
-result and pass it to another computation, but at the same time
-we want to get the second item from each vector.  We can achieve
-it with pattern
-
-  (result &as [_ a] [_ b]) (function-returning-complex-structure)
-
-Note: Clojure programmers may know this feature as the \":as
-binding\".  The difference is that we put the &as at the front
-because we need to support improper list binding."
-  (declare (debug ([&or (&rest (sexp form))
-                        (vector [&rest [sexp form]])]
-                   body))
-           (indent 1))
-  (if (vectorp varlist)
-      `(let* ,(dash--match (aref varlist 0) (aref varlist 1))
-         ,@body)
-    (let* ((inputs (--map-indexed (list (make-symbol (format "input%d" it-index)) (cadr it)) varlist))
-           (new-varlist (--map (list (caar it) (cadr it)) (-zip varlist inputs))))
-      `(let ,inputs
-         (-let* ,new-varlist ,@body)))))
-
-(defmacro -lambda (match-form &rest body)
-  "Return a lambda which destructures its input as MATCH-FORM and executes BODY.
-
-Note that you have to enclose the MATCH-FORM in a pair of parens,
-such that:
-
-  (-lambda (x) body)
-  (-lambda (x y ...) body)
-
-has the usual semantics of `lambda'.  Furthermore, these get
-translated into normal lambda, so there is no performance
-penalty.
-
-See `-let' for the description of destructuring mechanism."
-  (declare (doc-string 2) (indent defun)
-           (debug (&define sexp
-                           [&optional stringp]
-                           [&optional ("interactive" interactive)]
-                           def-body)))
-  (cond
-   ((not (consp match-form))
-    (signal 'wrong-type-argument "match-form must be a list"))
-   ;; no destructuring, so just return regular lambda to make things faster
-   ((-all? 'symbolp match-form)
-    `(lambda ,match-form ,@body))
-   (t
-    (let* ((inputs (--map-indexed (list it (make-symbol (format "input%d" it-index))) match-form)))
-      ;; TODO: because inputs to the lambda are evaluated only once,
-      ;; -let* need not to create the extra bindings to ensure that.
-      ;; We should find a way to optimize that.  Not critical however.
-      `(lambda ,(--map (cadr it) inputs)
-         (-let* ,inputs ,@body))))))
-
-(defmacro -if-let* (vars-vals then &rest else)
-  "If all VALS evaluate to true, bind them to their corresponding
-VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
-of (VAR VAL) pairs.
-
-Note: binding is done according to `-let*'."
-  (declare (debug ((&rest (sexp form)) form body))
-           (indent 2))
-  (->> vars-vals
-       (--mapcat (dash--match (car it) (cadr it)))
-       (--reduce-r-from
-        (let ((var (car it))
-              (val (cadr it)))
-          `(let ((,var ,val))
-             (if ,var ,acc ,@else)))
-        then)))
-
-(defmacro -if-let (var-val then &rest else)
-  "If VAL evaluates to non-nil, bind it to VAR and do THEN,
-otherwise do ELSE. VAR-VAL should be a (VAR VAL) pair.
-
-Note: binding is done according to `-let'."
-  (declare (debug ((sexp form) form body))
-           (indent 2))
-  `(-if-let* (,var-val) ,then ,@else))
-
-(defmacro --if-let (val then &rest else)
-  "If VAL evaluates to non-nil, bind it to `it' and do THEN,
-otherwise do ELSE."
-  (declare (debug (form form body))
-           (indent 2))
-  `(-if-let (it ,val) ,then ,@else))
-
-(defmacro -when-let* (vars-vals &rest body)
-  "If all VALS evaluate to true, bind them to their corresponding
-VARS and execute body. VARS-VALS should be a list of (VAR VAL)
-pairs.
-
-Note: binding is done according to `-let*'."
-  (declare (debug ((&rest (sexp form)) body))
-           (indent 1))
-  `(-if-let* ,vars-vals (progn ,@body)))
-
-(defmacro -when-let (var-val &rest body)
-  "If VAL evaluates to non-nil, bind it to VAR and execute body.
-VAR-VAL should be a (VAR VAL) pair.
-
-Note: binding is done according to `-let'."
-  (declare (debug ((sexp form) body))
-           (indent 1))
-  `(-if-let ,var-val (progn ,@body)))
-
-(defmacro --when-let (val &rest body)
-  "If VAL evaluates to non-nil, bind it to `it' and execute
-body."
-  (declare (debug (form body))
-           (indent 1))
-  `(--if-let ,val (progn ,@body)))
-
-(defun -distinct (list)
-  "Return a new list with all duplicates removed.
-The test for equality is done with `equal',
-or with `-compare-fn' if that's non-nil.
-
-Alias: `-uniq'"
-  (let (result)
-    (--each list (unless (-contains? result it) (!cons it result)))
-    (nreverse result)))
-
-(defalias '-uniq '-distinct)
-
-(defun -union (list list2)
-  "Return a new list containing the elements of LIST1 and elements of LIST2 that are not in LIST1.
-The test for equality is done with `equal',
-or with `-compare-fn' if that's non-nil."
-  (let (result)
-    (--each list (!cons it result))
-    (--each list2 (unless (-contains? result it) (!cons it result)))
-    (nreverse result)))
-
-(defun -intersection (list list2)
-  "Return a new list containing only the elements that are members of both LIST and LIST2.
-The test for equality is done with `equal',
-or with `-compare-fn' if that's non-nil."
-  (--filter (-contains? list2 it) list))
-
-(defun -difference (list list2)
-  "Return a new list with only the members of LIST that are not in LIST2.
-The test for equality is done with `equal',
-or with `-compare-fn' if that's non-nil."
-  (--filter (not (-contains? list2 it)) list))
-
-(defvar -compare-fn nil
-  "Tests for equality use this function or `equal' if this is nil.
-It should only be set using dynamic scope with a let, like:
-
-  (let ((-compare-fn =)) (-union numbers1 numbers2 numbers3)")
-
-(defun -contains? (list element)
-  "Return non-nil if LIST contains ELEMENT.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that's non-nil.
-
-Alias: `-contains-p'"
-  (not
-   (null
-    (cond
-     ((null -compare-fn)    (member element list))
-     ((eq -compare-fn 'eq)  (memq element list))
-     ((eq -compare-fn 'eql) (memql element list))
-     (t
-      (let ((lst list))
-        (while (and lst
-                    (not (funcall -compare-fn element (car lst))))
-          (setq lst (cdr lst)))
-        lst))))))
-
-(defalias '-contains-p '-contains?)
-
-(defun -same-items? (list list2)
-  "Return true if LIST and LIST2 has the same items.
-
-The order of the elements in the lists does not matter.
-
-Alias: `-same-items-p'"
-  (let ((length-a (length list))
-        (length-b (length list2)))
-    (and
-     (= length-a length-b)
-     (= length-a (length (-intersection list list2))))))
-
-(defalias '-same-items-p '-same-items?)
-
-(defun -is-prefix? (prefix list)
-  "Return non-nil if PREFIX is prefix of LIST.
-
-Alias: `-is-prefix-p'"
-  (--each-while list (equal (car prefix) it)
-    (!cdr prefix))
-  (not prefix))
-
-(defun -is-suffix? (suffix list)
-  "Return non-nil if SUFFIX is suffix of LIST.
-
-Alias: `-is-suffix-p'"
-  (-is-prefix? (nreverse suffix) (nreverse list)))
-
-(defun -is-infix? (infix list)
-  "Return non-nil if INFIX is infix of LIST.
-
-This operation runs in O(n^2) time
-
-Alias: `-is-infix-p'"
-  (let (done)
-    (while (and (not done) list)
-      (setq done (-is-prefix? infix list))
-      (!cdr list))
-    done))
-
-(defalias '-is-prefix-p '-is-prefix?)
-(defalias '-is-suffix-p '-is-suffix?)
-(defalias '-is-infix-p '-is-infix?)
-
-(defun -sort (comparator list)
-  "Sort LIST, stably, comparing elements using COMPARATOR.
-Return the sorted list.  LIST is NOT modified by side effects.
-COMPARATOR is called with two elements of LIST, and should return non-nil
-if the first element should sort before the second."
-  (sort (copy-sequence list) comparator))
-
-(defmacro --sort (form list)
-  "Anaphoric form of `-sort'."
-  (declare (debug (form form)))
-  `(-sort (lambda (it other) ,form) ,list))
-
-(defun -list (&rest args)
-  "Return a list with ARGS.
-
-If first item of ARGS is already a list, simply return ARGS.  If
-not, return a list with ARGS as elements."
-  (let ((arg (car args)))
-    (if (listp arg) arg args)))
-
-(defun -repeat (n x)
-  "Return a list with X repeated N times.
-Return nil if N is less than 1."
-  (let (ret)
-    (--dotimes n (!cons x ret))
-    ret))
-
-(defun -sum (list)
-  "Return the sum of LIST."
-  (apply '+ list))
-
-(defun -product (list)
-  "Return the product of LIST."
-  (apply '* list))
-
-(defun -max (list)
-  "Return the largest value from LIST of numbers or markers."
-  (apply 'max list))
-
-(defun -min (list)
-  "Return the smallest value from LIST of numbers or markers."
-  (apply 'min list))
-
-(defun -max-by (comparator list)
-  "Take a comparison function COMPARATOR and a LIST and return
-the greatest element of the list by the comparison function.
-
-See also combinator `-on' which can transform the values before
-comparing them."
-  (--reduce (if (funcall comparator it acc) it acc) list))
-
-(defun -min-by (comparator list)
-  "Take a comparison function COMPARATOR and a LIST and return
-the least element of the list by the comparison function.
-
-See also combinator `-on' which can transform the values before
-comparing them."
-  (--reduce (if (funcall comparator it acc) acc it) list))
-
-(defmacro --max-by (form list)
-  "Anaphoric version of `-max-by'.
-
-The items for the comparator form are exposed as \"it\" and \"other\"."
-  (declare (debug (form form)))
-  `(-max-by (lambda (it other) ,form) ,list))
-
-(defmacro --min-by (form list)
-  "Anaphoric version of `-min-by'.
-
-The items for the comparator form are exposed as \"it\" and \"other\"."
-  (declare (debug (form form)))
-  `(-min-by (lambda (it other) ,form) ,list))
-
-(defun -iterate (fun init n)
-  "Return a list of iterated applications of FUN to INIT.
-
-This means a list of form:
-
-  (init (fun init) (fun (fun init)) ...)
-
-N is the length of the returned list."
-  (if (= n 0) nil
-    (let ((r (list init)))
-      (--dotimes (1- n)
-        (push (funcall fun (car r)) r))
-      (nreverse r))))
-
-(defun -fix (fn list)
-  "Compute the (least) fixpoint of FN with initial input LIST.
-
-FN is called at least once, results are compared with `equal'."
-  (let ((re (funcall fn list)))
-    (while (not (equal list re))
-      (setq list re)
-      (setq re (funcall fn re)))
-    re))
-
-(defmacro --fix (form list)
-  "Anaphoric form of `-fix'."
-  `(-fix (lambda (it) ,form) ,list))
-
-(defun -unfold (fun seed)
-  "Build a list from SEED using FUN.
-
-This is \"dual\" operation to `-reduce-r': while -reduce-r
-consumes a list to produce a single value, `-unfold' takes a
-seed value and builds a (potentially infinite!) list.
-
-FUN should return `nil' to stop the generating process, or a
-cons (A . B), where A will be prepended to the result and B is
-the new seed."
-  (let ((last (funcall fun seed)) r)
-    (while last
-      (push (car last) r)
-      (setq last (funcall fun (cdr last))))
-    (nreverse r)))
-
-(defmacro --unfold (form seed)
-  "Anaphoric version of `-unfold'."
-  (declare (debug (form form)))
-  `(-unfold (lambda (it) ,form) ,seed))
-
-(defun -cons-pair? (con)
-  "Return non-nil if CON is true cons pair.
-That is (A . B) where B is not a list."
-  (and (listp con)
-       (not (listp (cdr con)))))
-
-(defun -cons-to-list (con)
-  "Convert a cons pair to a list with `car' and `cdr' of the pair respectively."
-  (list (car con) (cdr con)))
-
-(defun -value-to-list (val)
-  "Convert a value to a list.
-
-If the value is a cons pair, make a list with two elements, `car'
-and `cdr' of the pair respectively.
-
-If the value is anything else, wrap it in a list."
-  (cond
-   ((-cons-pair? val) (-cons-to-list val))
-   (t (list val))))
-
-(defun -tree-mapreduce-from (fn folder init-value tree)
-  "Apply FN to each element of TREE, and make a list of the results.
-If elements of TREE are lists themselves, apply FN recursively to
-elements of these nested lists.
-
-Then reduce the resulting lists using FOLDER and initial value
-INIT-VALUE. See `-reduce-r-from'.
-
-This is the same as calling `-tree-reduce-from' after `-tree-map'
-but is twice as fast as it only traverse the structure once."
-  (cond
-   ((not tree) nil)
-   ((-cons-pair? tree) (funcall fn tree))
-   ((listp tree)
-    (-reduce-r-from folder init-value (mapcar (lambda (x) (-tree-mapreduce-from fn folder init-value x)) tree)))
-   (t (funcall fn tree))))
-
-(defmacro --tree-mapreduce-from (form folder init-value tree)
-  "Anaphoric form of `-tree-mapreduce-from'."
-  (declare (debug (form form form form)))
-  `(-tree-mapreduce-from (lambda (it) ,form) (lambda (it acc) ,folder) ,init-value ,tree))
-
-(defun -tree-mapreduce (fn folder tree)
-  "Apply FN to each element of TREE, and make a list of the results.
-If elements of TREE are lists themselves, apply FN recursively to
-elements of these nested lists.
-
-Then reduce the resulting lists using FOLDER and initial value
-INIT-VALUE. See `-reduce-r-from'.
-
-This is the same as calling `-tree-reduce' after `-tree-map'
-but is twice as fast as it only traverse the structure once."
-  (cond
-   ((not tree) nil)
-   ((-cons-pair? tree) (funcall fn tree))
-   ((listp tree)
-    (-reduce-r folder (mapcar (lambda (x) (-tree-mapreduce fn folder x)) tree)))
-   (t (funcall fn tree))))
-
-(defmacro --tree-mapreduce (form folder tree)
-  "Anaphoric form of `-tree-mapreduce'."
-  (declare (debug (form form form)))
-  `(-tree-mapreduce (lambda (it) ,form) (lambda (it acc) ,folder) ,tree))
-
-(defun -tree-map (fn tree)
-  "Apply FN to each element of TREE while preserving the tree structure."
-  (cond
-   ((not tree) nil)
-   ((-cons-pair? tree) (funcall fn tree))
-   ((listp tree)
-    (mapcar (lambda (x) (-tree-map fn x)) tree))
-   (t (funcall fn tree))))
-
-(defmacro --tree-map (form tree)
-  "Anaphoric form of `-tree-map'."
-  (declare (debug (form form)))
-  `(-tree-map (lambda (it) ,form) ,tree))
-
-(defun -tree-reduce-from (fn init-value tree)
-  "Use FN to reduce elements of list TREE.
-If elements of TREE are lists themselves, apply the reduction recursively.
-
-FN is first applied to INIT-VALUE and first element of the list,
-then on this result and second element from the list etc.
-
-The initial value is ignored on cons pairs as they always contain
-two elements."
-  (cond
-   ((not tree) nil)
-   ((-cons-pair? tree) tree)
-   ((listp tree)
-    (-reduce-r-from fn init-value (mapcar (lambda (x) (-tree-reduce-from fn init-value x)) tree)))
-   (t tree)))
-
-(defmacro --tree-reduce-from (form init-value tree)
-  "Anaphoric form of `-tree-reduce-from'."
-  (declare (debug (form form form)))
-  `(-tree-reduce-from (lambda (it acc) ,form) ,init-value ,tree))
-
-(defun -tree-reduce (fn tree)
-  "Use FN to reduce elements of list TREE.
-If elements of TREE are lists themselves, apply the reduction recursively.
-
-FN is first applied to first element of the list and second
-element, then on this result and third element from the list etc.
-
-See `-reduce-r' for how exactly are lists of zero or one element handled."
-  (cond
-   ((not tree) nil)
-   ((-cons-pair? tree) tree)
-   ((listp tree)
-    (-reduce-r fn (mapcar (lambda (x) (-tree-reduce fn x)) tree)))
-   (t tree)))
-
-(defmacro --tree-reduce (form tree)
-  "Anaphoric form of `-tree-reduce'."
-  (declare (debug (form form)))
-  `(-tree-reduce (lambda (it acc) ,form) ,tree))
-
-(defun -tree-map-nodes (pred fun tree)
-  "Call FUN on each node of TREE that satisfies PRED.
-
-If PRED returns nil, continue descending down this node.  If PRED
-returns non-nil, apply FUN to this node and do not descend
-further."
-  (if (funcall pred tree)
-      (funcall fun tree)
-    (if (and (listp tree)
-             (not (-cons-pair? tree)))
-        (-map (lambda (x) (-tree-map-nodes pred fun x)) tree)
-      tree)))
-
-(defmacro --tree-map-nodes (pred form tree)
-  "Anaphoric form of `-tree-map-nodes'."
-  `(-tree-map-nodes (lambda (it) ,pred) (lambda (it) ,form) ,tree))
-
-(defun -tree-seq (branch children tree)
-  "Return a sequence of the nodes in TREE, in depth-first search order.
-
-BRANCH is a predicate of one argument that returns non-nil if the
-passed argument is a branch, that is, a node that can have children.
-
-CHILDREN is a function of one argument that returns the children
-of the passed branch node.
-
-Non-branch nodes are simply copied."
-  (cons tree
-        (when (funcall branch tree)
-          (-mapcat (lambda (x) (-tree-seq branch children x))
-                   (funcall children tree)))))
-
-(defmacro --tree-seq (branch children tree)
-  "Anaphoric form of `-tree-seq'."
-  `(-tree-seq (lambda (it) ,branch) (lambda (it) ,children) ,tree))
-
-(defun -clone (list)
-  "Create a deep copy of LIST.
-The new list has the same elements and structure but all cons are
-replaced with new ones.  This is useful when you need to clone a
-structure such as plist or alist."
-  (-tree-map 'identity list))
-
-(defun dash-enable-font-lock ()
-  "Add syntax highlighting to dash functions, macros and magic values."
-  (eval-after-load "lisp-mode"
-    '(progn
-       (let ((new-keywords '(
-                             "-each"
-                             "--each"
-                             "-each-while"
-                             "--each-while"
-                             "-dotimes"
-                             "--dotimes"
-                             "-map"
-                             "--map"
-                             "-reduce-from"
-                             "--reduce-from"
-                             "-reduce"
-                             "--reduce"
-                             "-reduce-r-from"
-                             "--reduce-r-from"
-                             "-reduce-r"
-                             "--reduce-r"
-                             "-filter"
-                             "--filter"
-                             "-select"
-                             "--select"
-                             "-remove"
-                             "--remove"
-                             "-reject"
-                             "--reject"
-                             "-remove-first"
-                             "--remove-first"
-                             "-reject-first"
-                             "--reject-first"
-                             "-remove-last"
-                             "--remove-last"
-                             "-reject-last"
-                             "--reject-last"
-                             "-remove-item"
-                             "-non-nil"
-                             "-keep"
-                             "--keep"
-                             "-map-indexed"
-                             "--map-indexed"
-                             "-splice"
-                             "--splice"
-                             "-splice-list"
-                             "--splice-list"
-                             "-map-when"
-                             "--map-when"
-                             "-replace-where"
-                             "--replace-where"
-                             "-map-first"
-                             "--map-first"
-                             "-map-last"
-                             "--map-last"
-                             "-replace"
-                             "-replace-first"
-                             "-replace-last"
-                             "-flatten"
-                             "-flatten-n"
-                             "-concat"
-                             "-mapcat"
-                             "--mapcat"
-                             "-copy"
-                             "-cons*"
-                             "-snoc"
-                             "-first"
-                             "--first"
-                             "-find"
-                             "--find"
-                             "-some"
-                             "--some"
-                             "-any"
-                             "--any"
-                             "-last"
-                             "--last"
-                             "-first-item"
-                             "-last-item"
-                             "-butlast"
-                             "-count"
-                             "--count"
-                             "-any?"
-                             "--any?"
-                             "-some?"
-                             "--some?"
-                             "-any-p"
-                             "--any-p"
-                             "-some-p"
-                             "--some-p"
-                             "-all?"
-                             "--all?"
-                             "-every?"
-                             "--every?"
-                             "-all-p"
-                             "--all-p"
-                             "-every-p"
-                             "--every-p"
-                             "-none?"
-                             "--none?"
-                             "-none-p"
-                             "--none-p"
-                             "-only-some?"
-                             "--only-some?"
-                             "-only-some-p"
-                             "--only-some-p"
-                             "-slice"
-                             "-take"
-                             "-drop"
-                             "-take-while"
-                             "--take-while"
-                             "-drop-while"
-                             "--drop-while"
-                             "-split-at"
-                             "-rotate"
-                             "-insert-at"
-                             "-replace-at"
-                             "-update-at"
-                             "--update-at"
-                             "-remove-at"
-                             "-remove-at-indices"
-                             "-split-with"
-                             "--split-with"
-                             "-split-on"
-                             "-split-when"
-                             "--split-when"
-                             "-separate"
-                             "--separate"
-                             "-partition-all-in-steps"
-                             "-partition-in-steps"
-                             "-partition-all"
-                             "-partition"
-                             "-partition-by"
-                             "--partition-by"
-                             "-partition-by-header"
-                             "--partition-by-header"
-                             "-group-by"
-                             "--group-by"
-                             "-interpose"
-                             "-interleave"
-                             "-zip-with"
-                             "--zip-with"
-                             "-zip"
-                             "-zip-fill"
-                             "-cycle"
-                             "-pad"
-                             "-annotate"
-                             "--annotate"
-                             "-table"
-                             "-table-flat"
-                             "-partial"
-                             "-elem-index"
-                             "-elem-indices"
-                             "-find-indices"
-                             "--find-indices"
-                             "-find-index"
-                             "--find-index"
-                             "-find-last-index"
-                             "--find-last-index"
-                             "-select-by-indices"
-                             "-grade-up"
-                             "-grade-down"
-                             "->"
-                             "->>"
-                             "-->"
-                             "-when-let"
-                             "-when-let*"
-                             "--when-let"
-                             "-if-let"
-                             "-if-let*"
-                             "--if-let"
-                             "-let*"
-                             "-let"
-                             "-lambda"
-                             "-distinct"
-                             "-uniq"
-                             "-union"
-                             "-intersection"
-                             "-difference"
-                             "-contains?"
-                             "-contains-p"
-                             "-same-items?"
-                             "-same-items-p"
-                             "-is-prefix-p"
-                             "-is-prefix?"
-                             "-is-suffix-p"
-                             "-is-suffix?"
-                             "-is-infix-p"
-                             "-is-infix?"
-                             "-sort"
-                             "--sort"
-                             "-list"
-                             "-repeat"
-                             "-sum"
-                             "-product"
-                             "-max"
-                             "-min"
-                             "-max-by"
-                             "--max-by"
-                             "-min-by"
-                             "--min-by"
-                             "-iterate"
-                             "--iterate"
-                             "-fix"
-                             "--fix"
-                             "-unfold"
-                             "--unfold"
-                             "-cons-pair?"
-                             "-cons-to-list"
-                             "-value-to-list"
-                             "-tree-mapreduce-from"
-                             "--tree-mapreduce-from"
-                             "-tree-mapreduce"
-                             "--tree-mapreduce"
-                             "-tree-map"
-                             "--tree-map"
-                             "-tree-reduce-from"
-                             "--tree-reduce-from"
-                             "-tree-reduce"
-                             "--tree-reduce"
-                             "-tree-seq"
-                             "--tree-seq"
-                             "-tree-map-nodes"
-                             "--tree-map-nodes"
-                             "-clone"
-                             "-rpartial"
-                             "-juxt"
-                             "-applify"
-                             "-on"
-                             "-flip"
-                             "-const"
-                             "-cut"
-                             "-orfn"
-                             "-andfn"
-                             "-iteratefn"
-                             "-fixfn"
-                             "-prodfn"
-                             ))
-             (special-variables '(
-                                  "it"
-                                  "it-index"
-                                  "acc"
-                                  "other"
-                                  )))
-         (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "\\_<" (regexp-opt special-variables 'paren) "\\_>")
-                                                     1 font-lock-variable-name-face)) 'append)
-         (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "(\\s-*" (regexp-opt new-keywords 'paren) "\\_>")
-                                                     1 font-lock-keyword-face)) 'append))
-       (--each (buffer-list)
-         (with-current-buffer it
-           (when (and (eq major-mode 'emacs-lisp-mode)
-                      (boundp 'font-lock-mode)
-                      font-lock-mode)
-             (font-lock-refresh-defaults)))))))
-
-(provide 'dash)
-;;; dash.el ends here
diff --git a/emacs.d/elpa/dash-20151216.1315/dash-autoloads.el b/emacs.d/elpa/dash-20151216.1315/dash-autoloads.el
new file mode 100644
index 0000000..a175fac
--- /dev/null
+++ b/emacs.d/elpa/dash-20151216.1315/dash-autoloads.el
@@ -0,0 +1,15 @@
+;;; dash-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil nil ("dash.el") (22171 46579 42910 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; dash-autoloads.el ends here
diff --git a/emacs.d/elpa/dash-20151216.1315/dash-pkg.el b/emacs.d/elpa/dash-20151216.1315/dash-pkg.el
new file mode 100644
index 0000000..2e03885
--- /dev/null
+++ b/emacs.d/elpa/dash-20151216.1315/dash-pkg.el
@@ -0,0 +1 @@
+(define-package "dash" "20151216.1315" "A modern list library for Emacs" 'nil :keywords '("lists"))
diff --git a/emacs.d/elpa/dash-20151216.1315/dash.el b/emacs.d/elpa/dash-20151216.1315/dash.el
new file mode 100644
index 0000000..0b582b2
--- /dev/null
+++ b/emacs.d/elpa/dash-20151216.1315/dash.el
@@ -0,0 +1,2437 @@
+;;; dash.el --- A modern list library for Emacs  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 2.12.1
+;; Package-Version: 20151216.1315
+;; Keywords: lists
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; A modern list api for Emacs.
+;;
+;; See documentation on https://github.com/magnars/dash.el#functions
+;;
+;; **Please note** The lexical binding in this file is not utilised at the
+;; moment. We will take full advantage of lexical binding in an upcoming 3.0
+;; release of Dash. In the meantime, we've added the pragma to avoid a bug that
+;; you can read more about in https://github.com/magnars/dash.el/issues/130.
+;;
+
+;;; Code:
+
+(defgroup dash ()
+  "Customize group for dash.el"
+  :group 'lisp
+  :prefix "dash-")
+
+(defun dash--enable-fontlock (symbol value)
+  (when value
+    (dash-enable-font-lock))
+  (set-default symbol value))
+
+(defcustom dash-enable-fontlock nil
+  "If non-nil, enable fontification of dash functions, macros and
+special values."
+  :type 'boolean
+  :set 'dash--enable-fontlock
+  :group 'dash)
+
+(defmacro !cons (car cdr)
+  "Destructive: Set CDR to the cons of CAR and CDR."
+  `(setq ,cdr (cons ,car ,cdr)))
+
+(defmacro !cdr (list)
+  "Destructive: Set LIST to the cdr of LIST."
+  `(setq ,list (cdr ,list)))
+
+(defmacro --each (list &rest body)
+  "Anaphoric form of `-each'."
+  (declare (debug (form body))
+           (indent 1))
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list)
+           (it-index 0))
+       (while ,l
+         (let ((it (car ,l)))
+           ,@body)
+         (setq it-index (1+ it-index))
+         (!cdr ,l)))))
+
+(defun -each (list fn)
+  "Call FN with every item in LIST. Return nil, used for side-effects only."
+  (--each list (funcall fn it)))
+
+(put '-each 'lisp-indent-function 1)
+
+(defmacro --each-while (list pred &rest body)
+  "Anaphoric form of `-each-while'."
+  (declare (debug (form form body))
+           (indent 2))
+  (let ((l (make-symbol "list"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,c t)
+           (it-index 0))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred) (setq ,c nil) ,@body))
+         (setq it-index (1+ it-index))
+         (!cdr ,l)))))
+
+(defun -each-while (list pred fn)
+  "Call FN with every item in LIST while (PRED item) is non-nil.
+Return nil, used for side-effects only."
+  (--each-while list (funcall pred it) (funcall fn it)))
+
+(put '-each-while 'lisp-indent-function 2)
+
+(defmacro --dotimes (num &rest body)
+  "Repeatedly executes BODY (presumably for side-effects) with `it` bound to integers from 0 through NUM-1."
+  (declare (debug (form body))
+           (indent 1))
+  (let ((n (make-symbol "num")))
+    `(let ((,n ,num)
+           (it 0))
+       (while (< it ,n)
+         ,@body
+         (setq it (1+ it))))))
+
+(defun -dotimes (num fn)
+  "Repeatedly calls FN (presumably for side-effects) passing in integers from 0 through NUM-1."
+  (--dotimes num (funcall fn it)))
+
+(put '-dotimes 'lisp-indent-function 1)
+
+(defun -map (fn list)
+  "Return a new list consisting of the result of applying FN to the items in LIST."
+  (mapcar fn list))
+
+(defmacro --map (form list)
+  "Anaphoric form of `-map'."
+  (declare (debug (form form)))
+  `(mapcar (lambda (it) ,form) ,list))
+
+(defmacro --reduce-from (form initial-value list)
+  "Anaphoric form of `-reduce-from'."
+  (declare (debug (form form form)))
+  `(let ((acc ,initial-value))
+     (--each ,list (setq acc ,form))
+     acc))
+
+(defun -reduce-from (fn initial-value list)
+  "Return the result of applying FN to INITIAL-VALUE and the
+first item in LIST, then applying FN to that result and the 2nd
+item, etc. If LIST contains no items, return INITIAL-VALUE and
+FN is not called.
+
+In the anaphoric form `--reduce-from', the accumulated value is
+exposed as `acc`.
+
+See also: `-reduce', `-reduce-r'"
+  (--reduce-from (funcall fn acc it) initial-value list))
+
+(defmacro --reduce (form list)
+  "Anaphoric form of `-reduce'."
+  (declare (debug (form form)))
+  (let ((lv (make-symbol "list-value")))
+    `(let ((,lv ,list))
+       (if ,lv
+           (--reduce-from ,form (car ,lv) (cdr ,lv))
+         (let (acc it) ,form)))))
+
+(defun -reduce (fn list)
+  "Return the result of applying FN to the first 2 items in LIST,
+then applying FN to that result and the 3rd item, etc. If LIST
+contains no items, FN must accept no arguments as well, and
+reduce return the result of calling FN with no arguments. If
+LIST has only 1 item, it is returned and FN is not called.
+
+In the anaphoric form `--reduce', the accumulated value is
+exposed as `acc`.
+
+See also: `-reduce-from', `-reduce-r'"
+  (if list
+      (-reduce-from fn (car list) (cdr list))
+    (funcall fn)))
+
+(defun -reduce-r-from (fn initial-value list)
+  "Replace conses with FN, nil with INITIAL-VALUE and evaluate
+the resulting expression. If LIST is empty, INITIAL-VALUE is
+returned and FN is not called.
+
+Note: this function works the same as `-reduce-from' but the
+operation associates from right instead of from left.
+
+See also: `-reduce-r', `-reduce'"
+  (if (not list) initial-value
+    (funcall fn (car list) (-reduce-r-from fn initial-value (cdr list)))))
+
+(defmacro --reduce-r-from (form initial-value list)
+  "Anaphoric version of `-reduce-r-from'."
+  (declare (debug (form form form)))
+  `(-reduce-r-from (lambda (&optional it acc) ,form) ,initial-value ,list))
+
+(defun -reduce-r (fn list)
+  "Replace conses with FN and evaluate the resulting expression.
+The final nil is ignored. If LIST contains no items, FN must
+accept no arguments as well, and reduce return the result of
+calling FN with no arguments. If LIST has only 1 item, it is
+returned and FN is not called.
+
+The first argument of FN is the new item, the second is the
+accumulated value.
+
+Note: this function works the same as `-reduce' but the operation
+associates from right instead of from left.
+
+See also: `-reduce-r-from', `-reduce'"
+  (cond
+   ((not list) (funcall fn))
+   ((not (cdr list)) (car list))
+   (t (funcall fn (car list) (-reduce-r fn (cdr list))))))
+
+(defmacro --reduce-r (form list)
+  "Anaphoric version of `-reduce-r'."
+  (declare (debug (form form)))
+  `(-reduce-r (lambda (&optional it acc) ,form) ,list))
+
+(defmacro --filter (form list)
+  "Anaphoric form of `-filter'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (when ,form (!cons it ,r)))
+       (nreverse ,r))))
+
+(defun -filter (pred list)
+  "Return a new list of the items in LIST for which PRED returns a non-nil value.
+
+Alias: `-select'
+
+See also: `-keep'"
+  (--filter (funcall pred it) list))
+
+(defalias '-select '-filter)
+(defalias '--select '--filter)
+
+(defmacro --remove (form list)
+  "Anaphoric form of `-remove'."
+  (declare (debug (form form)))
+  `(--filter (not ,form) ,list))
+
+(defun -remove (pred list)
+  "Return a new list of the items in LIST for which PRED returns nil.
+
+Alias: `-reject'"
+  (--remove (funcall pred it) list))
+
+(defalias '-reject '-remove)
+(defalias '--reject '--remove)
+
+(defun -remove-first (pred list)
+  "Return a new list with the first item matching PRED removed.
+
+Alias: `-reject-first'
+
+See also: `-remove', `-map-first'"
+  (let (front)
+    (while (and list (not (funcall pred (car list))))
+      (push (car list) front)
+      (!cdr list))
+    (if list
+        (-concat (nreverse front) (cdr list))
+      (nreverse front))))
+
+(defmacro --remove-first (form list)
+  "Anaphoric form of `-remove-first'."
+  (declare (debug (form form)))
+  `(-remove-first (lambda (it) ,form) ,list))
+
+(defalias '-reject-first '-remove-first)
+(defalias '--reject-first '--remove-first)
+
+(defun -remove-last (pred list)
+  "Return a new list with the last item matching PRED removed.
+
+Alias: `-reject-last'
+
+See also: `-remove', `-map-last'"
+  (nreverse (-remove-first pred (nreverse list))))
+
+(defmacro --remove-last (form list)
+  "Anaphoric form of `-remove-last'."
+  (declare (debug (form form)))
+  `(-remove-last (lambda (it) ,form) ,list))
+
+(defalias '-reject-last '-remove-last)
+(defalias '--reject-last '--remove-last)
+
+(defun -remove-item (item list)
+  "Remove all occurences of ITEM from LIST.
+
+Comparison is done with `equal'."
+  (--remove (equal it item) list))
+
+(defmacro --keep (form list)
+  "Anaphoric form of `-keep'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result"))
+        (m (make-symbol "mapped")))
+    `(let (,r)
+       (--each ,list (let ((,m ,form)) (when ,m (!cons ,m ,r))))
+       (nreverse ,r))))
+
+(defun -keep (fn list)
+  "Return a new list of the non-nil results of applying FN to the items in LIST.
+
+If you want to select the original items satisfying a predicate use `-filter'."
+  (--keep (funcall fn it) list))
+
+(defun -non-nil (list)
+  "Return all non-nil elements of LIST."
+  (-remove 'null list))
+
+(defmacro --map-indexed (form list)
+  "Anaphoric form of `-map-indexed'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list
+         (!cons ,form ,r))
+       (nreverse ,r))))
+
+(defun -map-indexed (fn list)
+  "Return a new list consisting of the result of (FN index item) for each item in LIST.
+
+In the anaphoric form `--map-indexed', the index is exposed as `it-index`."
+  (--map-indexed (funcall fn it-index it) list))
+
+(defmacro --map-when (pred rep list)
+  "Anaphoric form of `-map-when'."
+  (declare (debug (form form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (!cons (if ,pred ,rep it) ,r))
+       (nreverse ,r))))
+
+(defun -map-when (pred rep list)
+  "Return a new list where the elements in LIST that does not match the PRED function
+are unchanged, and where the elements in LIST that do match the PRED function are mapped
+through the REP function.
+
+Alias: `-replace-where'
+
+See also: `-update-at'"
+  (--map-when (funcall pred it) (funcall rep it) list))
+
+(defalias '-replace-where '-map-when)
+(defalias '--replace-where '--map-when)
+
+(defun -map-first (pred rep list)
+  "Replace first item in LIST satisfying PRED with result of REP called on this item.
+
+See also: `-map-when', `-replace-first'"
+  (let (front)
+    (while (and list (not (funcall pred (car list))))
+      (push (car list) front)
+      (!cdr list))
+    (if list
+        (-concat (nreverse front) (cons (funcall rep (car list)) (cdr list)))
+      (nreverse front))))
+
+(defmacro --map-first (pred rep list)
+  "Anaphoric form of `-map-first'."
+  `(-map-first (lambda (it) ,pred) (lambda (it) (ignore it) ,rep) ,list))
+
+(defun -map-last (pred rep list)
+  "Replace first item in LIST satisfying PRED with result of REP called on this item.
+
+See also: `-map-when', `-replace-last'"
+  (nreverse (-map-first pred rep (nreverse list))))
+
+(defmacro --map-last (pred rep list)
+  "Anaphoric form of `-map-last'."
+  `(-map-last (lambda (it) ,pred) (lambda (it) (ignore it) ,rep) ,list))
+
+(defun -replace (old new list)
+  "Replace all OLD items in LIST with NEW.
+
+Elements are compared using `equal'.
+
+See also: `-replace-at'"
+  (--map-when (equal it old) new list))
+
+(defun -replace-first (old new list)
+  "Replace the first occurence of OLD with NEW in LIST.
+
+Elements are compared using `equal'.
+
+See also: `-map-first'"
+  (--map-first (equal old it) new list))
+
+(defun -replace-last (old new list)
+  "Replace the last occurence of OLD with NEW in LIST.
+
+Elements are compared using `equal'.
+
+See also: `-map-last'"
+  (--map-last (equal old it) new list))
+
+(defmacro --mapcat (form list)
+  "Anaphoric form of `-mapcat'."
+  (declare (debug (form form)))
+  `(apply 'append (--map ,form ,list)))
+
+(defun -mapcat (fn list)
+  "Return the concatenation of the result of mapping FN over LIST.
+Thus function FN should return a list."
+  (--mapcat (funcall fn it) list))
+
+(defun -flatten (l)
+  "Take a nested list L and return its contents as a single, flat list.
+
+Note that because `nil' represents a list of zero elements (an
+empty list), any mention of nil in L will disappear after
+flattening.  If you need to preserve nils, consider `-flatten-n'
+or map them to some unique symbol and then map them back.
+
+Conses of two atoms are considered \"terminals\", that is, they
+aren't flattened further.
+
+See also: `-flatten-n'"
+  (if (and (listp l) (listp (cdr l)))
+      (-mapcat '-flatten l)
+    (list l)))
+
+(defmacro --iterate (form init n)
+  "Anaphoric version of `-iterate'."
+  (declare (debug (form form form)))
+  `(-iterate (lambda (it) ,form) ,init ,n))
+
+(defun -flatten-n (num list)
+  "Flatten NUM levels of a nested LIST.
+
+See also: `-flatten'"
+  (-last-item (--iterate (--mapcat (-list it) it) list (1+ num))))
+
+(defun -concat (&rest lists)
+  "Return a new list with the concatenation of the elements in the supplied LISTS."
+  (apply 'append lists))
+
+(defalias '-copy 'copy-sequence
+  "Create a shallow copy of LIST.")
+
+(defun -splice (pred fun list)
+  "Splice lists generated by FUN in place of elements matching PRED in LIST.
+
+FUN takes the element matching PRED as input.
+
+This function can be used as replacement for `,@' in case you
+need to splice several lists at marked positions (for example
+with keywords).
+
+See also: `-splice-list', `-insert-at'"
+  (let (r)
+    (--each list
+      (if (funcall pred it)
+          (let ((new (funcall fun it)))
+            (--each new (!cons it r)))
+        (!cons it r)))
+    (nreverse r)))
+
+(defmacro --splice (pred form list)
+  "Anaphoric form of `-splice'."
+  `(-splice (lambda (it) ,pred) (lambda (it) ,form) ,list))
+
+(defun -splice-list (pred new-list list)
+  "Splice NEW-LIST in place of elements matching PRED in LIST.
+
+See also: `-splice', `-insert-at'"
+  (-splice pred (lambda (_) new-list) list))
+
+(defmacro --splice-list (pred new-list list)
+  "Anaphoric form of `-splice-list'."
+  `(-splice-list (lambda (it) ,pred) ,new-list ,list))
+
+(defun -cons* (&rest args)
+  "Make a new list from the elements of ARGS.
+
+The last 2 members of ARGS are used as the final cons of the
+result so if the final member of ARGS is not a list the result is
+a dotted list."
+  (-reduce-r 'cons args))
+
+(defun -snoc (list elem &rest elements)
+  "Append ELEM to the end of the list.
+
+This is like `cons', but operates on the end of list.
+
+If ELEMENTS is non nil, append these to the list as well."
+  (-concat list (list elem) elements))
+
+(defmacro --first (form list)
+  "Anaphoric form of `-first'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (not ,n)
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -first (pred list)
+  "Return the first x in LIST where (PRED x) is non-nil, else nil.
+
+To get the first item in the list no questions asked, use `car'.
+
+Alias: `-find'"
+  (--first (funcall pred it) list))
+
+(defalias '-find '-first)
+(defalias '--find '--first)
+
+(defmacro --some (form list)
+  "Anaphoric form of `-some'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (not ,n)
+         (setq ,n ,form))
+       ,n)))
+
+(defun -some (pred list)
+  "Return (PRED x) for the first LIST item where (PRED x) is non-nil, else nil.
+
+Alias: `-any'"
+  (--some (funcall pred it) list))
+
+(defalias '-any '-some)
+(defalias '--any '--some)
+
+(defmacro --last (form list)
+  "Anaphoric form of `-last'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each ,list
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -last (pred list)
+  "Return the last x in LIST where (PRED x) is non-nil, else nil."
+  (--last (funcall pred it) list))
+
+(defalias '-first-item 'car
+  "Return the first item of LIST, or nil on an empty list.")
+
+(defun -last-item (list)
+  "Return the last item of LIST, or nil on an empty list."
+  (car (last list)))
+
+(defun -butlast (list)
+  "Return a list of all items in list except for the last."
+  (let (result)
+    (while (cdr list)
+      (!cons (car list) result)
+      (!cdr list))
+    (nreverse result)))
+
+(defmacro --count (pred list)
+  "Anaphoric form of `-count'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let ((,r 0))
+       (--each ,list (when ,pred (setq ,r (1+ ,r))))
+       ,r)))
+
+(defun -count (pred list)
+  "Counts the number of items in LIST where (PRED item) is non-nil."
+  (--count (funcall pred it) list))
+
+(defun ---truthy? (val)
+  (not (null val)))
+
+(defmacro --any? (form list)
+  "Anaphoric form of `-any?'."
+  (declare (debug (form form)))
+  `(---truthy? (--first ,form ,list)))
+
+(defun -any? (pred list)
+  "Return t if (PRED x) is non-nil for any x in LIST, else nil.
+
+Alias: `-any-p', `-some?', `-some-p'"
+  (--any? (funcall pred it) list))
+
+(defalias '-some? '-any?)
+(defalias '--some? '--any?)
+(defalias '-any-p '-any?)
+(defalias '--any-p '--any?)
+(defalias '-some-p '-any?)
+(defalias '--some-p '--any?)
+
+(defmacro --all? (form list)
+  "Anaphoric form of `-all?'."
+  (declare (debug (form form)))
+  (let ((a (make-symbol "all")))
+    `(let ((,a t))
+       (--each-while ,list ,a (setq ,a ,form))
+       (---truthy? ,a))))
+
+(defun -all? (pred list)
+  "Return t if (PRED x) is non-nil for all x in LIST, else nil.
+
+Alias: `-all-p', `-every?', `-every-p'"
+  (--all? (funcall pred it) list))
+
+(defalias '-every? '-all?)
+(defalias '--every? '--all?)
+(defalias '-all-p '-all?)
+(defalias '--all-p '--all?)
+(defalias '-every-p '-all?)
+(defalias '--every-p '--all?)
+
+(defmacro --none? (form list)
+  "Anaphoric form of `-none?'."
+  (declare (debug (form form)))
+  `(--all? (not ,form) ,list))
+
+(defun -none? (pred list)
+  "Return t if (PRED x) is nil for all x in LIST, else nil.
+
+Alias: `-none-p'"
+  (--none? (funcall pred it) list))
+
+(defalias '-none-p '-none?)
+(defalias '--none-p '--none?)
+
+(defmacro --only-some? (form list)
+  "Anaphoric form of `-only-some?'."
+  (declare (debug (form form)))
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each-while ,list (not (and ,y ,n))
+         (if ,form (setq ,y t) (setq ,n t)))
+       (---truthy? (and ,y ,n)))))
+
+(defun -only-some? (pred list)
+  "Return `t` if at least one item of LIST matches PRED and at least one item of LIST does not match PRED.
+Return `nil` both if all items match the predicate or if none of the items match the predicate.
+
+Alias: `-only-some-p'"
+  (--only-some? (funcall pred it) list))
+
+(defalias '-only-some-p '-only-some?)
+(defalias '--only-some-p '--only-some?)
+
+(defun -slice (list from &optional to step)
+  "Return copy of LIST, starting from index FROM to index TO.
+
+FROM or TO may be negative.  These values are then interpreted
+modulo the length of the list.
+
+If STEP is a number, only each STEPth item in the resulting
+section is returned.  Defaults to 1."
+  (let ((length (length list))
+        (new-list nil))
+    ;; to defaults to the end of the list
+    (setq to (or to length))
+    (setq step (or step 1))
+    ;; handle negative indices
+    (when (< from 0)
+      (setq from (mod from length)))
+    (when (< to 0)
+      (setq to (mod to length)))
+
+    ;; iterate through the list, keeping the elements we want
+    (--each-while list (< it-index to)
+      (when (and (>= it-index from)
+                 (= (mod (- from it-index) step) 0))
+        (push it new-list)))
+    (nreverse new-list)))
+
+(defun -take (n list)
+  "Return a new list of the first N items in LIST, or all items if there are fewer than N."
+  (let (result)
+    (--dotimes n
+      (when list
+        (!cons (car list) result)
+        (!cdr list)))
+    (nreverse result)))
+
+(defalias '-drop 'nthcdr "Return the tail of LIST without the first N items.")
+
+(defmacro --take-while (form list)
+  "Anaphoric form of `-take-while'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each-while ,list ,form (!cons it ,r))
+       (nreverse ,r))))
+
+(defun -take-while (pred list)
+  "Return a new list of successive items from LIST while (PRED item) returns a non-nil value."
+  (--take-while (funcall pred it) list))
+
+(defmacro --drop-while (form list)
+  "Anaphoric form of `-drop-while'."
+  (declare (debug (form form)))
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list))
+       (while (and ,l (let ((it (car ,l))) ,form))
+         (!cdr ,l))
+       ,l)))
+
+(defun -drop-while (pred list)
+  "Return the tail of LIST starting from the first item for which (PRED item) returns nil."
+  (--drop-while (funcall pred it) list))
+
+(defun -split-at (n list)
+  "Return a list of ((-take N LIST) (-drop N LIST)), in no more than one pass through the list."
+  (let (result)
+    (--dotimes n
+      (when list
+        (!cons (car list) result)
+        (!cdr list)))
+    (list (nreverse result) list)))
+
+(defun -rotate (n list)
+  "Rotate LIST N places to the right.  With N negative, rotate to the left.
+The time complexity is O(n)."
+  (if (> n 0)
+      (append (last list n) (butlast list n))
+    (append (-drop (- n) list) (-take (- n) list))))
+
+(defun -insert-at (n x list)
+  "Return a list with X inserted into LIST at position N.
+
+See also: `-splice', `-splice-list'"
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cadr split-list)))))
+
+(defun -replace-at (n x list)
+  "Return a list with element at Nth position in LIST replaced with X.
+
+See also: `-replace'"
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cdr (cadr split-list))))))
+
+(defun -update-at (n func list)
+  "Return a list with element at Nth position in LIST replaced with `(func (nth n list))`.
+
+See also: `-map-when'"
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons (funcall func (car (cadr split-list))) (cdr (cadr split-list))))))
+
+(defmacro --update-at (n form list)
+  "Anaphoric version of `-update-at'."
+  (declare (debug (form form form)))
+  `(-update-at ,n (lambda (it) ,form) ,list))
+
+(defun -remove-at (n list)
+  "Return a list with element at Nth position in LIST removed.
+
+See also: `-remove-at-indices', `-remove'"
+  (-remove-at-indices (list n) list))
+
+(defun -remove-at-indices (indices list)
+  "Return a list whose elements are elements from LIST without
+elements selected as `(nth i list)` for all i
+from INDICES.
+
+See also: `-remove-at', `-remove'"
+  (let* ((indices (-sort '< indices))
+         (diffs (cons (car indices) (-map '1- (-zip-with '- (cdr indices) indices))))
+         r)
+    (--each diffs
+      (let ((split (-split-at it list)))
+        (!cons (car split) r)
+        (setq list (cdr (cadr split)))))
+    (!cons list r)
+    (apply '-concat (nreverse r))))
+
+(defmacro --split-with (pred list)
+  "Anaphoric form of `-split-with'."
+  (declare (debug (form form)))
+  (let ((l (make-symbol "list"))
+        (r (make-symbol "result"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,r nil)
+           (,c t))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred)
+               (setq ,c nil)
+             (!cons it ,r)
+             (!cdr ,l))))
+       (list (nreverse ,r) ,l))))
+
+(defun -split-with (pred list)
+  "Return a list of ((-take-while PRED LIST) (-drop-while PRED LIST)), in no more than one pass through the list."
+  (--split-with (funcall pred it) list))
+
+(defmacro -split-on (item list)
+  "Split the LIST each time ITEM is found.
+
+Unlike `-partition-by', the ITEM is discarded from the results.
+Empty lists are also removed from the result.
+
+Comparison is done by `equal'.
+
+See also `-split-when'"
+  (declare (debug (form form)))
+  `(-split-when (lambda (it) (equal it ,item)) ,list))
+
+(defmacro --split-when (form list)
+  "Anaphoric version of `-split-when'."
+  (declare (debug (form form)))
+  `(-split-when (lambda (it) ,form) ,list))
+
+(defun -split-when (fn list)
+  "Split the LIST on each element where FN returns non-nil.
+
+Unlike `-partition-by', the \"matched\" element is discarded from
+the results.  Empty lists are also removed from the result.
+
+This function can be thought of as a generalization of
+`split-string'."
+  (let (r s)
+    (while list
+      (if (not (funcall fn (car list)))
+          (push (car list) s)
+        (when s (push (nreverse s) r))
+        (setq s nil))
+      (!cdr list))
+    (when s (push (nreverse s) r))
+    (nreverse r)))
+
+(defmacro --separate (form list)
+  "Anaphoric form of `-separate'."
+  (declare (debug (form form)))
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each ,list (if ,form (!cons it ,y) (!cons it ,n)))
+       (list (nreverse ,y) (nreverse ,n)))))
+
+(defun -separate (pred list)
+  "Return a list of ((-filter PRED LIST) (-remove PRED LIST)), in one pass through the list."
+  (--separate (funcall pred it) list))
+
+(defun ---partition-all-in-steps-reversed (n step list)
+  "Private: Used by -partition-all-in-steps and -partition-in-steps."
+  (when (< step 1)
+    (error "Step must be a positive number, or you're looking at some juicy infinite loops."))
+  (let ((result nil))
+    (while list
+      (!cons (-take n list) result)
+      (setq list (-drop step list)))
+    result))
+
+(defun -partition-all-in-steps (n step list)
+  "Return a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
+The last groups may contain less than N items."
+  (nreverse (---partition-all-in-steps-reversed n step list)))
+
+(defun -partition-in-steps (n step list)
+  "Return a new list with the items in LIST grouped into N-sized sublists at offsets STEP apart.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (let ((result (---partition-all-in-steps-reversed n step list)))
+    (while (and result (< (length (car result)) n))
+      (!cdr result))
+    (nreverse result)))
+
+(defun -partition-all (n list)
+  "Return a new list with the items in LIST grouped into N-sized sublists.
+The last group may contain less than N items."
+  (-partition-all-in-steps n n list))
+
+(defun -partition (n list)
+  "Return a new list with the items in LIST grouped into N-sized sublists.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (-partition-in-steps n n list))
+
+(defmacro --partition-by (form list)
+  "Anaphoric form of `-partition-by'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (v (make-symbol "value"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,v ,form)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (unless (equal ,v ,n)
+                 (!cons (nreverse ,s) ,r)
+                 (setq ,s nil)
+                 (setq ,v ,n))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by (fn list)
+  "Apply FN to each item in LIST, splitting it each time FN returns a new value."
+  (--partition-by (funcall fn it) list))
+
+(defmacro --partition-by-header (form list)
+  "Anaphoric form of `-partition-by-header'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (h (make-symbol "header-value"))
+        (b (make-symbol "seen-body?"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,h ,form)
+                (,b nil)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (if (equal ,h ,n)
+                   (when ,b
+                     (!cons (nreverse ,s) ,r)
+                     (setq ,s nil)
+                     (setq ,b nil))
+                 (setq ,b t))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by-header (fn list)
+  "Apply FN to the first item in LIST. That is the header
+value. Apply FN to each item in LIST, splitting it each time FN
+returns the header value, but only after seeing at least one
+other value (the body)."
+  (--partition-by-header (funcall fn it) list))
+
+(defmacro --group-by (form list)
+  "Anaphoric form of `-group-by'."
+  (declare (debug t))
+  (let ((n (make-symbol "n"))
+        (k (make-symbol "k"))
+        (grp (make-symbol "grp")))
+    `(nreverse
+      (-map
+       (lambda (,n)
+         (cons (car ,n)
+               (nreverse (cdr ,n))))
+       (--reduce-from
+        (let* ((,k (,@form))
+               (,grp (assoc ,k acc)))
+          (if ,grp
+              (setcdr ,grp (cons it (cdr ,grp)))
+            (push
+             (list ,k it)
+             acc))
+          acc)
+        nil ,list)))))
+
+(defun -group-by (fn list)
+  "Separate LIST into an alist whose keys are FN applied to the
+elements of LIST.  Keys are compared by `equal'."
+  (--group-by (funcall fn it) list))
+
+(defun -interpose (sep list)
+  "Return a new list of all elements in LIST separated by SEP."
+  (let (result)
+    (when list
+      (!cons (car list) result)
+      (!cdr list))
+    (while list
+      (setq result (cons (car list) (cons sep result)))
+      (!cdr list))
+    (nreverse result)))
+
+(defun -interleave (&rest lists)
+  "Return a new list of the first item in each list, then the second etc."
+  (let (result)
+    (while (-none? 'null lists)
+      (--each lists (!cons (car it) result))
+      (setq lists (-map 'cdr lists)))
+    (nreverse result)))
+
+(defmacro --zip-with (form list1 list2)
+  "Anaphoric form of `-zip-with'.
+
+The elements in list1 is bound as `it`, the elements in list2 as `other`."
+  (declare (debug (form form form)))
+  (let ((r (make-symbol "result"))
+        (l1 (make-symbol "list1"))
+        (l2 (make-symbol "list2")))
+    `(let ((,r nil)
+           (,l1 ,list1)
+           (,l2 ,list2))
+       (while (and ,l1 ,l2)
+         (let ((it (car ,l1))
+               (other (car ,l2)))
+           (!cons ,form ,r)
+           (!cdr ,l1)
+           (!cdr ,l2)))
+       (nreverse ,r))))
+
+(defun -zip-with (fn list1 list2)
+  "Zip the two lists LIST1 and LIST2 using a function FN.  This
+function is applied pairwise taking as first argument element of
+LIST1 and as second argument element of LIST2 at corresponding
+position.
+
+The anaphoric form `--zip-with' binds the elements from LIST1 as `it`,
+and the elements from LIST2 as `other`."
+  (--zip-with (funcall fn it other) list1 list2))
+
+(defun -zip (&rest lists)
+  "Zip LISTS together.  Group the head of each list, followed by the
+second elements of each list, and so on. The lengths of the returned
+groupings are equal to the length of the shortest input list.
+
+If two lists are provided as arguments, return the groupings as a list
+of cons cells. Otherwise, return the groupings as a list of lists.
+
+Please note! This distinction is being removed in an upcoming 2.0
+release of Dash. If you rely on this behavior, use -zip-pair instead."
+  (let (results)
+    (while (-none? 'null lists)
+      (setq results (cons (mapcar 'car lists) results))
+      (setq lists (mapcar 'cdr lists)))
+    (setq results (nreverse results))
+    (if (= (length lists) 2)
+        ;; to support backward compatability, return
+        ;; a cons cell if two lists were provided
+        (--map (cons (car it) (cadr it)) results)
+      results)))
+
+(defalias '-zip-pair '-zip)
+
+(defun -zip-fill (fill-value &rest lists)
+  "Zip LISTS, with FILL-VALUE padded onto the shorter lists. The
+lengths of the returned groupings are equal to the length of the
+longest input list."
+  (apply '-zip (apply '-pad (cons fill-value lists))))
+
+(defun -cycle (list)
+  "Return an infinite copy of LIST that will cycle through the
+elements and repeat from the beginning."
+  (let ((newlist (-map 'identity list)))
+    (nconc newlist newlist)))
+
+(defun -pad (fill-value &rest lists)
+  "Appends FILL-VALUE to the end of each list in LISTS such that they
+will all have the same length."
+  (let* ((annotations (-annotate 'length lists))
+         (n (-max (-map 'car annotations))))
+    (--map (append (cdr it) (-repeat (- n (car it)) fill-value)) annotations)))
+
+(defun -annotate (fn list)
+  "Return a list of cons cells where each cell is FN applied to each
+element of LIST paired with the unmodified element of LIST."
+  (-zip (-map fn list) list))
+
+(defmacro --annotate (form list)
+  "Anaphoric version of `-annotate'."
+  (declare (debug (form form)))
+  `(-annotate (lambda (it) ,form) ,list))
+
+(defun dash--table-carry (lists restore-lists &optional re)
+  "Helper for `-table' and `-table-flat'.
+
+If a list overflows, carry to the right and reset the list."
+  (while (not (or (car lists)
+                  (equal lists '(nil))))
+    (setcar lists (car restore-lists))
+    (pop (cadr lists))
+    (!cdr lists)
+    (!cdr restore-lists)
+    (when re
+      (push (nreverse (car re)) (cadr re))
+      (setcar re nil)
+      (!cdr re))))
+
+(defun -table (fn &rest lists)
+  "Compute outer product of LISTS using function FN.
+
+The function FN should have the same arity as the number of
+supplied lists.
+
+The outer product is computed by applying fn to all possible
+combinations created by taking one element from each list in
+order.  The dimension of the result is (length lists).
+
+See also: `-table-flat'"
+  (let ((restore-lists (copy-sequence lists))
+        (last-list (last lists))
+        (re (make-list (length lists) nil)))
+    (while (car last-list)
+      (let ((item (apply fn (-map 'car lists))))
+        (push item (car re))
+        (setcar lists (cdar lists)) ;; silence byte compiler
+        (dash--table-carry lists restore-lists re)))
+    (nreverse (car (last re)))))
+
+(defun -table-flat (fn &rest lists)
+  "Compute flat outer product of LISTS using function FN.
+
+The function FN should have the same arity as the number of
+supplied lists.
+
+The outer product is computed by applying fn to all possible
+combinations created by taking one element from each list in
+order.  The results are flattened, ignoring the tensor structure
+of the result.  This is equivalent to calling:
+
+  (-flatten-n (1- (length lists)) (-table fn lists))
+
+but the implementation here is much more efficient.
+
+See also: `-flatten-n', `-table'"
+  (when lists                           ;Just in case.
+    (let* ((list1 (pop lists))
+           (restore-lists (copy-sequence lists))
+           (last-list (last lists))
+           re)
+      (while (car last-list)
+        (let ((tail (-map #'car lists)))
+          (dolist (head list1)
+            (push (apply fn head tail) re)))
+        (pop (car lists))
+        (dash--table-carry lists restore-lists))
+      (nreverse re))))
+
+(defun -partial (fn &rest args)
+  "Take a function FN and fewer than the normal arguments to FN,
+and return a fn that takes a variable number of additional ARGS.
+When called, the returned function calls FN with ARGS first and
+then additional args."
+  (apply 'apply-partially fn args))
+
+(defun -elem-index (elem list)
+  "Return the index of the first element in the given LIST which
+is equal to the query element ELEM, or nil if there is no
+such element."
+  (car (-elem-indices elem list)))
+
+(defun -elem-indices (elem list)
+  "Return the indices of all elements in LIST equal to the query
+element ELEM, in ascending order."
+  (-find-indices (-partial 'equal elem) list))
+
+(defun -find-indices (pred list)
+  "Return the indices of all elements in LIST satisfying the
+predicate PRED, in ascending order."
+  (apply 'append (--map-indexed (when (funcall pred it) (list it-index)) list)))
+
+(defmacro --find-indices (form list)
+  "Anaphoric version of `-find-indices'."
+  (declare (debug (form form)))
+  `(-find-indices (lambda (it) ,form) ,list))
+
+(defun -find-index (pred list)
+  "Take a predicate PRED and a LIST and return the index of the
+first element in the list satisfying the predicate, or nil if
+there is no such element."
+  (car (-find-indices pred list)))
+
+(defmacro --find-index (form list)
+  "Anaphoric version of `-find-index'."
+  (declare (debug (form form)))
+  `(-find-index (lambda (it) ,form) ,list))
+
+(defun -find-last-index (pred list)
+  "Take a predicate PRED and a LIST and return the index of the
+last element in the list satisfying the predicate, or nil if
+there is no such element."
+  (-last-item (-find-indices pred list)))
+
+(defmacro --find-last-index (form list)
+  "Anaphoric version of `-find-last-index'."
+  `(-find-last-index (lambda (it) ,form) ,list))
+
+(defun -select-by-indices (indices list)
+  "Return a list whose elements are elements from LIST selected
+as `(nth i list)` for all i from INDICES."
+  (let (r)
+    (--each indices
+      (!cons (nth it list) r))
+    (nreverse r)))
+
+(defmacro -> (x &optional form &rest more)
+  "Thread the expr through the forms. Insert X as the second item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, insert the first form as the
+second item in second form, etc."
+  (cond
+   ((null form) x)
+   ((null more) (if (listp form)
+                    `(,(car form) ,x ,@(cdr form))
+                  (list form x)))
+   (:else `(-> (-> ,x ,form) ,@more))))
+
+(defmacro ->> (x &optional form &rest more)
+  "Thread the expr through the forms. Insert X as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, insert the first form as the
+last item in second form, etc."
+  (cond
+   ((null form) x)
+   ((null more) (if (listp form)
+                    `(,@form ,x)
+                  (list form x)))
+   (:else `(->> (->> ,x ,form) ,@more))))
+
+(defmacro --> (x form &rest more)
+  "Thread the expr through the forms. Insert X at the position
+signified by the token `it' in the first form. If there are more
+forms, insert the first form at the position signified by `it' in
+in second form, etc."
+  (if (null more)
+      (if (listp form)
+          (--map-when (eq it 'it) x form)
+        (list form x))
+    `(--> (--> ,x ,form) ,@more)))
+
+(defmacro -some-> (x &optional form &rest more)
+  "When expr is non-nil, thread it through the first form (via `->'),
+and when that result is non-nil, through the next form, etc."
+  (if (null form) x
+    (let ((result (make-symbol "result")))
+      `(-some-> (-when-let (,result ,x)
+                  (-> ,result ,form))
+                ,@more))))
+
+(defmacro -some->> (x &optional form &rest more)
+  "When expr is non-nil, thread it through the first form (via `->>'),
+and when that result is non-nil, through the next form, etc."
+  (if (null form) x
+    (let ((result (make-symbol "result")))
+      `(-some->> (-when-let (,result ,x)
+                   (->> ,result ,form))
+                 ,@more))))
+
+(defmacro -some--> (x &optional form &rest more)
+  "When expr in non-nil, thread it through the first form (via `-->'),
+and when that result is non-nil, through the next form, etc."
+  (if (null form) x
+    (let ((result (make-symbol "result")))
+      `(-some--> (-when-let (,result ,x)
+                   (--> ,result ,form))
+                 ,@more))))
+
+(defun -grade-up (comparator list)
+  "Grade elements of LIST using COMPARATOR relation, yielding a
+permutation vector such that applying this permutation to LIST
+sorts it in ascending order."
+  ;; ugly hack to "fix" lack of lexical scope
+  (let ((comp `(lambda (it other) (funcall ',comparator (car it) (car other)))))
+    (->> (--map-indexed (cons it it-index) list)
+         (-sort comp)
+         (-map 'cdr))))
+
+(defun -grade-down (comparator list)
+  "Grade elements of LIST using COMPARATOR relation, yielding a
+permutation vector such that applying this permutation to LIST
+sorts it in descending order."
+  ;; ugly hack to "fix" lack of lexical scope
+  (let ((comp `(lambda (it other) (funcall ',comparator (car other) (car it)))))
+    (->> (--map-indexed (cons it it-index) list)
+         (-sort comp)
+         (-map 'cdr))))
+
+(defvar dash--source-counter 0
+  "Monotonic counter for generated symbols.")
+
+(defun dash--match-make-source-symbol ()
+  "Generate a new dash-source symbol.
+
+All returned symbols are guaranteed to be unique."
+  (prog1 (make-symbol (format "--dash-source-%d--" dash--source-counter))
+    (setq dash--source-counter (1+ dash--source-counter))))
+
+(defun dash--match-ignore-place-p (symbol)
+  "Return non-nil if SYMBOL is a symbol and starts with _."
+  (and (symbolp symbol)
+       (eq (aref (symbol-name symbol) 0) ?_)))
+
+(defun dash--match-cons-skip-cdr (skip-cdr source)
+  "Helper function generating idiomatic shifting code."
+  (cond
+   ((= skip-cdr 0)
+    `(pop ,source))
+   (t
+    `(prog1 ,(dash--match-cons-get-car skip-cdr source)
+       (setq ,source ,(dash--match-cons-get-cdr (1+ skip-cdr) source))))))
+
+(defun dash--match-cons-get-car (skip-cdr source)
+  "Helper function generating idiomatic code to get nth car."
+  (cond
+   ((= skip-cdr 0)
+    `(car ,source))
+   ((= skip-cdr 1)
+    `(cadr ,source))
+   (t
+    `(nth ,skip-cdr ,source))))
+
+(defun dash--match-cons-get-cdr (skip-cdr source)
+  "Helper function generating idiomatic code to get nth cdr."
+  (cond
+   ((= skip-cdr 0)
+    source)
+   ((= skip-cdr 1)
+    `(cdr ,source))
+   (t
+    `(nthcdr ,skip-cdr ,source))))
+
+(defun dash--match-cons (match-form source)
+  "Setup a cons matching environment and call the real matcher."
+  (let ((s (dash--match-make-source-symbol))
+        (n 0)
+        (m match-form))
+    (while (and (consp m)
+                (dash--match-ignore-place-p (car m)))
+      (setq n (1+ n)) (!cdr m))
+    (cond
+     ;; when we only have one pattern in the list, we don't have to
+     ;; create a temporary binding (--dash-source--) for the source
+     ;; and just use the input directly
+     ((and (consp m)
+           (not (cdr m)))
+      (dash--match (car m) (dash--match-cons-get-car n source)))
+     ;; handle other special types
+     ((> n 0)
+      (dash--match m (dash--match-cons-get-cdr n source)))
+     ;; this is the only entry-point for dash--match-cons-1, that's
+     ;; why we can't simply use the above branch, it would produce
+     ;; infinite recursion
+     (t
+      (cons (list s source) (dash--match-cons-1 match-form s))))))
+
+(defun dash--match-cons-1 (match-form source &optional props)
+  "Match MATCH-FORM against SOURCE.
+
+MATCH-FORM is a proper or improper list.  Each element of
+MATCH-FORM is either a symbol, which gets bound to the respective
+value in source or another match form which gets destructured
+recursively.
+
+If the cdr of last cons cell in the list is `nil', matching stops
+there.
+
+SOURCE is a proper or improper list."
+  (let ((skip-cdr (or (plist-get props :skip-cdr) 0)))
+    (cond
+     ((consp match-form)
+      (cond
+       ((cdr match-form)
+        (cond
+         ((and (symbolp (car match-form))
+               (memq (car match-form) '(&keys &plist &alist &hash)))
+          (dash--match-kv match-form (dash--match-cons-get-cdr skip-cdr source)))
+         ((dash--match-ignore-place-p (car match-form))
+          (dash--match-cons-1 (cdr match-form) source
+                              (plist-put props :skip-cdr (1+ skip-cdr))))
+         (t
+          (-concat (dash--match (car match-form) (dash--match-cons-skip-cdr skip-cdr source))
+                   (dash--match-cons-1 (cdr match-form) source)))))
+       (t ;; Last matching place, no need for shift
+        (dash--match (car match-form) (dash--match-cons-get-car skip-cdr source)))))
+     ((eq match-form nil)
+      nil)
+     (t ;; Handle improper lists.  Last matching place, no need for shift
+      (dash--match match-form (dash--match-cons-get-cdr skip-cdr source))))))
+
+(defun dash--vector-tail (seq start)
+  "Return the tail of SEQ starting at START."
+  (cond
+   ((vectorp seq)
+    (let* ((re-length (- (length seq) start))
+           (re (make-vector re-length 0)))
+      (--dotimes re-length (aset re it (aref seq (+ it start))))
+      re))
+   ((stringp seq)
+    (substring seq start))))
+
+(defun dash--match-vector (match-form source)
+  "Setup a vector matching environment and call the real matcher."
+  (let ((s (dash--match-make-source-symbol)))
+    (cond
+     ;; don't bind `s' if we only have one sub-pattern
+     ((= (length match-form) 1)
+      (dash--match (aref match-form 0) `(aref ,source 0)))
+     ;; if the source is a symbol, we don't need to re-bind it
+     ((symbolp source)
+      (dash--match-vector-1 match-form source))
+     ;; don't bind `s' if we only have one sub-pattern which is not ignored
+     ((let* ((ignored-places (mapcar 'dash--match-ignore-place-p match-form))
+             (ignored-places-n (length (-remove 'null ignored-places))))
+        (when (= ignored-places-n (1- (length match-form)))
+          (let ((n (-find-index 'null ignored-places)))
+            (dash--match (aref match-form n) `(aref ,source ,n))))))
+     (t
+      (cons (list s source) (dash--match-vector-1 match-form s))))))
+
+(defun dash--match-vector-1 (match-form source)
+  "Match MATCH-FORM against SOURCE.
+
+MATCH-FORM is a vector.  Each element of MATCH-FORM is either a
+symbol, which gets bound to the respective value in source or
+another match form which gets destructured recursively.
+
+If second-from-last place in MATCH-FORM is the symbol &rest, the
+next element of the MATCH-FORM is matched against the tail of
+SOURCE, starting at index of the &rest symbol.  This is
+conceptually the same as the (head . tail) match for improper
+lists, where dot plays the role of &rest.
+
+SOURCE is a vector.
+
+If the MATCH-FORM vector is shorter than SOURCE vector, only
+the (length MATCH-FORM) places are bound, the rest of the SOURCE
+is discarded."
+  (let ((i 0)
+        (l (length match-form))
+        (re))
+    (while (< i l)
+      (let ((m (aref match-form i)))
+        (push (cond
+               ((and (symbolp m)
+                     (eq m '&rest))
+                (prog1 (dash--match
+                        (aref match-form (1+ i))
+                        `(dash--vector-tail ,source ,i))
+                  (setq i l)))
+               ((and (symbolp m)
+                     ;; do not match symbols starting with _
+                     (not (eq (aref (symbol-name m) 0) ?_)))
+                (list (list m `(aref ,source ,i))))
+               ((not (symbolp m))
+                (dash--match m `(aref ,source ,i))))
+              re)
+        (setq i (1+ i))))
+    (-flatten-n 1 (nreverse re))))
+
+(defun dash--match-kv (match-form source)
+  "Setup a kv matching environment and call the real matcher.
+
+kv can be any key-value store, such as plist, alist or hash-table."
+  (let ((s (dash--match-make-source-symbol)))
+    (cond
+     ;; don't bind `s' if we only have one sub-pattern (&type key val)
+     ((= (length match-form) 3)
+      (dash--match-kv-1 (cdr match-form) source (car match-form)))
+     ;; if the source is a symbol, we don't need to re-bind it
+     ((symbolp source)
+      (dash--match-kv-1 (cdr match-form) source (car match-form)))
+     (t
+      (cons (list s source) (dash--match-kv-1 (cdr match-form) s (car match-form)))))))
+
+(defun dash--match-kv-1 (match-form source type)
+  "Match MATCH-FORM against SOURCE of type TYPE.
+
+MATCH-FORM is a proper list of the form (key1 place1 ... keyN
+placeN).  Each placeK is either a symbol, which gets bound to the
+value of keyK retrieved from the key-value store, or another
+match form which gets destructured recursively.
+
+SOURCE is a key-value store of type TYPE, which can be a plist,
+an alist or a hash table.
+
+TYPE is a token specifying the type of the key-value store.
+Valid values are &plist, &alist and &hash."
+  (-flatten-n 1 (-map
+                 (lambda (kv)
+                   (let* ((k (car kv))
+                          (v (cadr kv))
+                          (getter (cond
+                                   ((or (eq type '&plist) (eq type '&keys))
+                                    `(plist-get ,source ,k))
+                                   ((eq type '&alist)
+                                    `(cdr (assoc ,k ,source)))
+                                   ((eq type '&hash)
+                                    `(gethash ,k ,source)))))
+                     (cond
+                      ((symbolp v)
+                       (list (list v getter)))
+                      (t (dash--match v getter)))))
+                 (-partition 2 match-form))))
+
+(defun dash--match-symbol (match-form source)
+  "Bind a symbol.
+
+This works just like `let', there is no destructuring."
+  (list (list match-form source)))
+
+(defun dash--match (match-form source)
+  "Match MATCH-FORM against SOURCE.
+
+This function tests the MATCH-FORM and dispatches to specific
+matchers based on the type of the expression.
+
+Key-value stores are disambiguated by placing a token &plist,
+&alist or &hash as a first item in the MATCH-FORM."
+  (cond
+   ((symbolp match-form)
+    (dash--match-symbol match-form source))
+   ((consp match-form)
+    (cond
+     ;; Handle the "x &as" bindings first.
+     ((and (consp (cdr match-form))
+           (symbolp (car match-form))
+           (eq '&as (cadr match-form)))
+      (let ((s (car match-form)))
+        (cons (list s source)
+              (dash--match (cddr match-form) s))))
+     ((memq (car match-form) '(&keys &plist &alist &hash))
+      (dash--match-kv match-form source))
+     (t (dash--match-cons match-form source))))
+   ((vectorp match-form)
+    ;; We support the &as binding in vectors too
+    (cond
+     ((and (> (length match-form) 2)
+           (symbolp (aref match-form 0))
+           (eq '&as (aref match-form 1)))
+      (let ((s (aref match-form 0)))
+        (cons (list s source)
+              (dash--match (dash--vector-tail match-form 2) s))))
+     (t (dash--match-vector match-form source))))))
+
+(defmacro -let* (varlist &rest body)
+  "Bind variables according to VARLIST then eval BODY.
+
+VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+PATTERN is matched against the SOURCE structurally.  SOURCE is
+only evaluated once for each PATTERN.
+
+Each SOURCE can refer to the symbols already bound by this
+VARLIST.  This is useful if you want to destructure SOURCE
+recursively but also want to name the intermediate structures.
+
+See `-let' for the list of all possible patterns."
+  (declare (debug ((&rest (sexp form)) body))
+           (indent 1))
+  (let ((bindings (--mapcat (dash--match (car it) (cadr it)) varlist)))
+    `(let* ,bindings
+       ,@body)))
+
+(defmacro -let (varlist &rest body)
+  "Bind variables according to VARLIST then eval BODY.
+
+VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+PATTERN is matched against the SOURCE \"structurally\".  SOURCE
+is only evaluated once for each PATTERN.  Each PATTERN is matched
+recursively, and can therefore contain sub-patterns which are
+matched against corresponding sub-expressions of SOURCE.
+
+All the SOURCEs are evalled before any symbols are
+bound (i.e. \"in parallel\").
+
+If VARLIST only contains one (PATTERN SOURCE) element, you can
+optionally specify it using a vector and discarding the
+outer-most parens.  Thus
+
+  (-let ((PATTERN SOURCE)) ..)
+
+becomes
+
+  (-let [PATTERN SOURCE] ..).
+
+`-let' uses a convention of not binding places (symbols) starting
+with _ whenever it's possible.  You can use this to skip over
+entries you don't care about.  However, this is not *always*
+possible (as a result of implementation) and these symbols might
+get bound to undefined values.
+
+Following is the overview of supported patterns.  Remember that
+patterns can be matched recursively, so every a, b, aK in the
+following can be a matching construct and not necessarily a
+symbol/variable.
+
+Symbol:
+
+  a - bind the SOURCE to A.  This is just like regular `let'.
+
+Conses and lists:
+
+  (a) - bind `car' of cons/list to A
+
+  (a . b) - bind car of cons to A and `cdr' to B
+
+  (a b) - bind car of list to A and `cadr' to B
+
+  (a1 a2 a3  ...) - bind 0th car of list to A1, 1st to A2, 2nd to A3 ...
+
+  (a1 a2 a3 ... aN . rest) - as above, but bind the Nth cdr to REST.
+
+Vectors:
+
+  [a] - bind 0th element of a non-list sequence to A (works with
+        vectors, strings, bit arrays...)
+
+  [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st to
+                   A1, 2nd to A2, ...
+                   If the PATTERN is shorter than SOURCE, the values at
+                   places not in PATTERN are ignored.
+                   If the PATTERN is longer than SOURCE, an `error' is
+                   thrown.
+
+  [a1 a2 a3 ... &rest rest] - as above, but bind the rest of
+                              the sequence to REST.  This is
+                              conceptually the same as improper list
+                              matching (a1 a2 ... aN . rest)
+
+Key/value stores:
+
+  (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                 SOURCE plist to aK.  If the
+                                 value is not found, aK is nil.
+
+  (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                 SOURCE alist to aK.  If the
+                                 value is not found, aK is nil.
+
+  (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                SOURCE hash table to aK.  If the
+                                value is not found, aK is nil.
+
+Further, special keyword &keys supports \"inline\" matching of
+plist-like key-value pairs, similarly to &keys keyword of
+`cl-defun'.
+
+  (a1 a2 ... aN &keys key1 b1 ... keyN bK)
+
+This binds N values from the list to a1 ... aN, then interprets
+the cdr as a plist (see key/value matching above).
+
+You can name the source using the syntax SYMBOL &as PATTERN.
+This syntax works with lists (proper or improper), vectors and
+all types of maps.
+
+  (list &as a b c) (list 1 2 3)
+
+binds A to 1, B to 2, C to 3 and LIST to (1 2 3).
+
+Similarly:
+
+  (bounds &as beg . end) (cons 1 2)
+
+binds BEG to 1, END to 2 and BOUNDS to (1 . 2).
+
+  (items &as first . rest) (list 1 2 3)
+
+binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3)
+
+  [vect &as _ b c] [1 2 3]
+
+binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as usual).
+
+  (plist &as &plist :b b) (list :a 1 :b 2 :c 3)
+
+binds B to 2 and PLIST to (:a 1 :b 2 :c 3).  Same for &alist and &hash.
+
+This is especially useful when we want to capture the result of a
+computation and destructure at the same time.  Consider the
+form (function-returning-complex-structure) returning a list of
+two vectors with two items each.  We want to capture this entire
+result and pass it to another computation, but at the same time
+we want to get the second item from each vector.  We can achieve
+it with pattern
+
+  (result &as [_ a] [_ b]) (function-returning-complex-structure)
+
+Note: Clojure programmers may know this feature as the \":as
+binding\".  The difference is that we put the &as at the front
+because we need to support improper list binding."
+  (declare (debug ([&or (&rest (sexp form))
+                        (vector [&rest [sexp form]])]
+                   body))
+           (indent 1))
+  (if (vectorp varlist)
+      `(let* ,(dash--match (aref varlist 0) (aref varlist 1))
+         ,@body)
+    (let* ((inputs (--map-indexed (list (make-symbol (format "input%d" it-index)) (cadr it)) varlist))
+           (new-varlist (--map (list (caar it) (cadr it)) (-zip varlist inputs))))
+      `(let ,inputs
+         (-let* ,new-varlist ,@body)))))
+
+(defmacro -lambda (match-form &rest body)
+  "Return a lambda which destructures its input as MATCH-FORM and executes BODY.
+
+Note that you have to enclose the MATCH-FORM in a pair of parens,
+such that:
+
+  (-lambda (x) body)
+  (-lambda (x y ...) body)
+
+has the usual semantics of `lambda'.  Furthermore, these get
+translated into normal lambda, so there is no performance
+penalty.
+
+See `-let' for the description of destructuring mechanism."
+  (declare (doc-string 2) (indent defun)
+           (debug (&define sexp
+                           [&optional stringp]
+                           [&optional ("interactive" interactive)]
+                           def-body)))
+  (cond
+   ((not (consp match-form))
+    (signal 'wrong-type-argument "match-form must be a list"))
+   ;; no destructuring, so just return regular lambda to make things faster
+   ((-all? 'symbolp match-form)
+    `(lambda ,match-form ,@body))
+   (t
+    (let* ((inputs (--map-indexed (list it (make-symbol (format "input%d" it-index))) match-form)))
+      ;; TODO: because inputs to the lambda are evaluated only once,
+      ;; -let* need not to create the extra bindings to ensure that.
+      ;; We should find a way to optimize that.  Not critical however.
+      `(lambda ,(--map (cadr it) inputs)
+         (-let* ,inputs ,@body))))))
+
+(defmacro -if-let* (vars-vals then &rest else)
+  "If all VALS evaluate to true, bind them to their corresponding
+VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
+of (VAR VAL) pairs.
+
+Note: binding is done according to `-let*'.  VALS are evaluated
+sequentially, and evaluation stops after the first nil VAL is
+encountered."
+  (declare (debug ((&rest (sexp form)) form body))
+           (indent 2))
+  (->> vars-vals
+       (--mapcat (dash--match (car it) (cadr it)))
+       (--reduce-r-from
+        (let ((var (car it))
+              (val (cadr it)))
+          `(let ((,var ,val))
+             (if ,var ,acc ,@else)))
+        then)))
+
+(defmacro -if-let (var-val then &rest else)
+  "If VAL evaluates to non-nil, bind it to VAR and do THEN,
+otherwise do ELSE. VAR-VAL should be a (VAR VAL) pair.
+
+Note: binding is done according to `-let'."
+  (declare (debug ((sexp form) form body))
+           (indent 2))
+  `(-if-let* (,var-val) ,then ,@else))
+
+(defmacro --if-let (val then &rest else)
+  "If VAL evaluates to non-nil, bind it to `it' and do THEN,
+otherwise do ELSE."
+  (declare (debug (form form body))
+           (indent 2))
+  `(-if-let (it ,val) ,then ,@else))
+
+(defmacro -when-let* (vars-vals &rest body)
+  "If all VALS evaluate to true, bind them to their corresponding
+VARS and execute body. VARS-VALS should be a list of (VAR VAL)
+pairs.
+
+Note: binding is done according to `-let*'.  VALS are evaluated
+sequentially, and evaluation stops after the first nil VAL is
+encountered."
+  (declare (debug ((&rest (sexp form)) body))
+           (indent 1))
+  `(-if-let* ,vars-vals (progn ,@body)))
+
+(defmacro -when-let (var-val &rest body)
+  "If VAL evaluates to non-nil, bind it to VAR and execute body.
+VAR-VAL should be a (VAR VAL) pair.
+
+Note: binding is done according to `-let'."
+  (declare (debug ((sexp form) body))
+           (indent 1))
+  `(-if-let ,var-val (progn ,@body)))
+
+(defmacro --when-let (val &rest body)
+  "If VAL evaluates to non-nil, bind it to `it' and execute
+body."
+  (declare (debug (form body))
+           (indent 1))
+  `(--if-let ,val (progn ,@body)))
+
+(defvar -compare-fn nil
+  "Tests for equality use this function or `equal' if this is nil.
+It should only be set using dynamic scope with a let, like:
+
+  (let ((-compare-fn #'=)) (-union numbers1 numbers2 numbers3)")
+
+(defun -distinct (list)
+  "Return a new list with all duplicates removed.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil.
+
+Alias: `-uniq'"
+  (let (result)
+    (--each list (unless (-contains? result it) (!cons it result)))
+    (nreverse result)))
+
+(defalias '-uniq '-distinct)
+
+(defun -union (list list2)
+  "Return a new list containing the elements of LIST1 and elements of LIST2 that are not in LIST1.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  ;; We fall back to iteration implementation if the comparison
+  ;; function isn't one of `eq', `eql' or `equal'.
+  (let* ((result (reverse list))
+         ;; TODO: get rid of this dynamic variable, pass it as an
+         ;; argument instead.
+         (-compare-fn (if (bound-and-true-p -compare-fn)
+                          -compare-fn
+                        'equal)))
+    (if (memq -compare-fn '(eq eql equal))
+        (let ((ht (make-hash-table :test -compare-fn)))
+          (--each list (puthash it t ht))
+          (--each list2 (unless (gethash it ht) (!cons it result))))
+      (--each list2 (unless (-contains? result it) (!cons it result))))
+    (nreverse result)))
+
+(defun -intersection (list list2)
+  "Return a new list containing only the elements that are members of both LIST and LIST2.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (--filter (-contains? list2 it) list))
+
+(defun -difference (list list2)
+  "Return a new list with only the members of LIST that are not in LIST2.
+The test for equality is done with `equal',
+or with `-compare-fn' if that's non-nil."
+  (--filter (not (-contains? list2 it)) list))
+
+(defun -contains? (list element)
+  "Return non-nil if LIST contains ELEMENT.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that's non-nil.
+
+Alias: `-contains-p'"
+  (not
+   (null
+    (cond
+     ((null -compare-fn)    (member element list))
+     ((eq -compare-fn 'eq)  (memq element list))
+     ((eq -compare-fn 'eql) (memql element list))
+     (t
+      (let ((lst list))
+        (while (and lst
+                    (not (funcall -compare-fn element (car lst))))
+          (setq lst (cdr lst)))
+        lst))))))
+
+(defalias '-contains-p '-contains?)
+
+(defun -same-items? (list list2)
+  "Return true if LIST and LIST2 has the same items.
+
+The order of the elements in the lists does not matter.
+
+Alias: `-same-items-p'"
+  (let ((length-a (length list))
+        (length-b (length list2)))
+    (and
+     (= length-a length-b)
+     (= length-a (length (-intersection list list2))))))
+
+(defalias '-same-items-p '-same-items?)
+
+(defun -is-prefix? (prefix list)
+  "Return non-nil if PREFIX is prefix of LIST.
+
+Alias: `-is-prefix-p'"
+  (--each-while list (equal (car prefix) it)
+    (!cdr prefix))
+  (not prefix))
+
+(defun -is-suffix? (suffix list)
+  "Return non-nil if SUFFIX is suffix of LIST.
+
+Alias: `-is-suffix-p'"
+  (-is-prefix? (reverse suffix) (reverse list)))
+
+(defun -is-infix? (infix list)
+  "Return non-nil if INFIX is infix of LIST.
+
+This operation runs in O(n^2) time
+
+Alias: `-is-infix-p'"
+  (let (done)
+    (while (and (not done) list)
+      (setq done (-is-prefix? infix list))
+      (!cdr list))
+    done))
+
+(defalias '-is-prefix-p '-is-prefix?)
+(defalias '-is-suffix-p '-is-suffix?)
+(defalias '-is-infix-p '-is-infix?)
+
+(defun -sort (comparator list)
+  "Sort LIST, stably, comparing elements using COMPARATOR.
+Return the sorted list.  LIST is NOT modified by side effects.
+COMPARATOR is called with two elements of LIST, and should return non-nil
+if the first element should sort before the second."
+  (sort (copy-sequence list) comparator))
+
+(defmacro --sort (form list)
+  "Anaphoric form of `-sort'."
+  (declare (debug (form form)))
+  `(-sort (lambda (it other) ,form) ,list))
+
+(defun -list (&rest args)
+  "Return a list with ARGS.
+
+If first item of ARGS is already a list, simply return ARGS.  If
+not, return a list with ARGS as elements."
+  (let ((arg (car args)))
+    (if (listp arg) arg args)))
+
+(defun -repeat (n x)
+  "Return a list with X repeated N times.
+Return nil if N is less than 1."
+  (let (ret)
+    (--dotimes n (!cons x ret))
+    ret))
+
+(defun -sum (list)
+  "Return the sum of LIST."
+  (apply '+ list))
+
+(defun -product (list)
+  "Return the product of LIST."
+  (apply '* list))
+
+(defun -max (list)
+  "Return the largest value from LIST of numbers or markers."
+  (apply 'max list))
+
+(defun -min (list)
+  "Return the smallest value from LIST of numbers or markers."
+  (apply 'min list))
+
+(defun -max-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the greatest element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (--reduce (if (funcall comparator it acc) it acc) list))
+
+(defun -min-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the least element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (--reduce (if (funcall comparator it acc) acc it) list))
+
+(defmacro --max-by (form list)
+  "Anaphoric version of `-max-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  (declare (debug (form form)))
+  `(-max-by (lambda (it other) ,form) ,list))
+
+(defmacro --min-by (form list)
+  "Anaphoric version of `-min-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  (declare (debug (form form)))
+  `(-min-by (lambda (it other) ,form) ,list))
+
+(defun -iterate (fun init n)
+  "Return a list of iterated applications of FUN to INIT.
+
+This means a list of form:
+
+  (init (fun init) (fun (fun init)) ...)
+
+N is the length of the returned list."
+  (if (= n 0) nil
+    (let ((r (list init)))
+      (--dotimes (1- n)
+        (push (funcall fun (car r)) r))
+      (nreverse r))))
+
+(defun -fix (fn list)
+  "Compute the (least) fixpoint of FN with initial input LIST.
+
+FN is called at least once, results are compared with `equal'."
+  (let ((re (funcall fn list)))
+    (while (not (equal list re))
+      (setq list re)
+      (setq re (funcall fn re)))
+    re))
+
+(defmacro --fix (form list)
+  "Anaphoric form of `-fix'."
+  `(-fix (lambda (it) ,form) ,list))
+
+(defun -unfold (fun seed)
+  "Build a list from SEED using FUN.
+
+This is \"dual\" operation to `-reduce-r': while -reduce-r
+consumes a list to produce a single value, `-unfold' takes a
+seed value and builds a (potentially infinite!) list.
+
+FUN should return `nil' to stop the generating process, or a
+cons (A . B), where A will be prepended to the result and B is
+the new seed."
+  (let ((last (funcall fun seed)) r)
+    (while last
+      (push (car last) r)
+      (setq last (funcall fun (cdr last))))
+    (nreverse r)))
+
+(defmacro --unfold (form seed)
+  "Anaphoric version of `-unfold'."
+  (declare (debug (form form)))
+  `(-unfold (lambda (it) ,form) ,seed))
+
+(defun -cons-pair? (con)
+  "Return non-nil if CON is true cons pair.
+That is (A . B) where B is not a list."
+  (and (listp con)
+       (not (listp (cdr con)))))
+
+(defun -cons-to-list (con)
+  "Convert a cons pair to a list with `car' and `cdr' of the pair respectively."
+  (list (car con) (cdr con)))
+
+(defun -value-to-list (val)
+  "Convert a value to a list.
+
+If the value is a cons pair, make a list with two elements, `car'
+and `cdr' of the pair respectively.
+
+If the value is anything else, wrap it in a list."
+  (cond
+   ((-cons-pair? val) (-cons-to-list val))
+   (t (list val))))
+
+(defun -tree-mapreduce-from (fn folder init-value tree)
+  "Apply FN to each element of TREE, and make a list of the results.
+If elements of TREE are lists themselves, apply FN recursively to
+elements of these nested lists.
+
+Then reduce the resulting lists using FOLDER and initial value
+INIT-VALUE. See `-reduce-r-from'.
+
+This is the same as calling `-tree-reduce-from' after `-tree-map'
+but is twice as fast as it only traverse the structure once."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) (funcall fn tree))
+   ((listp tree)
+    (-reduce-r-from folder init-value (mapcar (lambda (x) (-tree-mapreduce-from fn folder init-value x)) tree)))
+   (t (funcall fn tree))))
+
+(defmacro --tree-mapreduce-from (form folder init-value tree)
+  "Anaphoric form of `-tree-mapreduce-from'."
+  (declare (debug (form form form form)))
+  `(-tree-mapreduce-from (lambda (it) ,form) (lambda (it acc) ,folder) ,init-value ,tree))
+
+(defun -tree-mapreduce (fn folder tree)
+  "Apply FN to each element of TREE, and make a list of the results.
+If elements of TREE are lists themselves, apply FN recursively to
+elements of these nested lists.
+
+Then reduce the resulting lists using FOLDER and initial value
+INIT-VALUE. See `-reduce-r-from'.
+
+This is the same as calling `-tree-reduce' after `-tree-map'
+but is twice as fast as it only traverse the structure once."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) (funcall fn tree))
+   ((listp tree)
+    (-reduce-r folder (mapcar (lambda (x) (-tree-mapreduce fn folder x)) tree)))
+   (t (funcall fn tree))))
+
+(defmacro --tree-mapreduce (form folder tree)
+  "Anaphoric form of `-tree-mapreduce'."
+  (declare (debug (form form form)))
+  `(-tree-mapreduce (lambda (it) ,form) (lambda (it acc) ,folder) ,tree))
+
+(defun -tree-map (fn tree)
+  "Apply FN to each element of TREE while preserving the tree structure."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) (funcall fn tree))
+   ((listp tree)
+    (mapcar (lambda (x) (-tree-map fn x)) tree))
+   (t (funcall fn tree))))
+
+(defmacro --tree-map (form tree)
+  "Anaphoric form of `-tree-map'."
+  (declare (debug (form form)))
+  `(-tree-map (lambda (it) ,form) ,tree))
+
+(defun -tree-reduce-from (fn init-value tree)
+  "Use FN to reduce elements of list TREE.
+If elements of TREE are lists themselves, apply the reduction recursively.
+
+FN is first applied to INIT-VALUE and first element of the list,
+then on this result and second element from the list etc.
+
+The initial value is ignored on cons pairs as they always contain
+two elements."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) tree)
+   ((listp tree)
+    (-reduce-r-from fn init-value (mapcar (lambda (x) (-tree-reduce-from fn init-value x)) tree)))
+   (t tree)))
+
+(defmacro --tree-reduce-from (form init-value tree)
+  "Anaphoric form of `-tree-reduce-from'."
+  (declare (debug (form form form)))
+  `(-tree-reduce-from (lambda (it acc) ,form) ,init-value ,tree))
+
+(defun -tree-reduce (fn tree)
+  "Use FN to reduce elements of list TREE.
+If elements of TREE are lists themselves, apply the reduction recursively.
+
+FN is first applied to first element of the list and second
+element, then on this result and third element from the list etc.
+
+See `-reduce-r' for how exactly are lists of zero or one element handled."
+  (cond
+   ((not tree) nil)
+   ((-cons-pair? tree) tree)
+   ((listp tree)
+    (-reduce-r fn (mapcar (lambda (x) (-tree-reduce fn x)) tree)))
+   (t tree)))
+
+(defmacro --tree-reduce (form tree)
+  "Anaphoric form of `-tree-reduce'."
+  (declare (debug (form form)))
+  `(-tree-reduce (lambda (it acc) ,form) ,tree))
+
+(defun -tree-map-nodes (pred fun tree)
+  "Call FUN on each node of TREE that satisfies PRED.
+
+If PRED returns nil, continue descending down this node.  If PRED
+returns non-nil, apply FUN to this node and do not descend
+further."
+  (if (funcall pred tree)
+      (funcall fun tree)
+    (if (and (listp tree)
+             (not (-cons-pair? tree)))
+        (-map (lambda (x) (-tree-map-nodes pred fun x)) tree)
+      tree)))
+
+(defmacro --tree-map-nodes (pred form tree)
+  "Anaphoric form of `-tree-map-nodes'."
+  `(-tree-map-nodes (lambda (it) ,pred) (lambda (it) ,form) ,tree))
+
+(defun -tree-seq (branch children tree)
+  "Return a sequence of the nodes in TREE, in depth-first search order.
+
+BRANCH is a predicate of one argument that returns non-nil if the
+passed argument is a branch, that is, a node that can have children.
+
+CHILDREN is a function of one argument that returns the children
+of the passed branch node.
+
+Non-branch nodes are simply copied."
+  (cons tree
+        (when (funcall branch tree)
+          (-mapcat (lambda (x) (-tree-seq branch children x))
+                   (funcall children tree)))))
+
+(defmacro --tree-seq (branch children tree)
+  "Anaphoric form of `-tree-seq'."
+  `(-tree-seq (lambda (it) ,branch) (lambda (it) ,children) ,tree))
+
+(defun -clone (list)
+  "Create a deep copy of LIST.
+The new list has the same elements and structure but all cons are
+replaced with new ones.  This is useful when you need to clone a
+structure such as plist or alist."
+  (-tree-map 'identity list))
+
+(defun dash-enable-font-lock ()
+  "Add syntax highlighting to dash functions, macros and magic values."
+  (eval-after-load "lisp-mode"
+    '(progn
+       (let ((new-keywords '(
+                             "-each"
+                             "--each"
+                             "-each-while"
+                             "--each-while"
+                             "-dotimes"
+                             "--dotimes"
+                             "-map"
+                             "--map"
+                             "-reduce-from"
+                             "--reduce-from"
+                             "-reduce"
+                             "--reduce"
+                             "-reduce-r-from"
+                             "--reduce-r-from"
+                             "-reduce-r"
+                             "--reduce-r"
+                             "-filter"
+                             "--filter"
+                             "-select"
+                             "--select"
+                             "-remove"
+                             "--remove"
+                             "-reject"
+                             "--reject"
+                             "-remove-first"
+                             "--remove-first"
+                             "-reject-first"
+                             "--reject-first"
+                             "-remove-last"
+                             "--remove-last"
+                             "-reject-last"
+                             "--reject-last"
+                             "-remove-item"
+                             "-non-nil"
+                             "-keep"
+                             "--keep"
+                             "-map-indexed"
+                             "--map-indexed"
+                             "-splice"
+                             "--splice"
+                             "-splice-list"
+                             "--splice-list"
+                             "-map-when"
+                             "--map-when"
+                             "-replace-where"
+                             "--replace-where"
+                             "-map-first"
+                             "--map-first"
+                             "-map-last"
+                             "--map-last"
+                             "-replace"
+                             "-replace-first"
+                             "-replace-last"
+                             "-flatten"
+                             "-flatten-n"
+                             "-concat"
+                             "-mapcat"
+                             "--mapcat"
+                             "-copy"
+                             "-cons*"
+                             "-snoc"
+                             "-first"
+                             "--first"
+                             "-find"
+                             "--find"
+                             "-some"
+                             "--some"
+                             "-any"
+                             "--any"
+                             "-last"
+                             "--last"
+                             "-first-item"
+                             "-last-item"
+                             "-butlast"
+                             "-count"
+                             "--count"
+                             "-any?"
+                             "--any?"
+                             "-some?"
+                             "--some?"
+                             "-any-p"
+                             "--any-p"
+                             "-some-p"
+                             "--some-p"
+                             "-all?"
+                             "--all?"
+                             "-every?"
+                             "--every?"
+                             "-all-p"
+                             "--all-p"
+                             "-every-p"
+                             "--every-p"
+                             "-none?"
+                             "--none?"
+                             "-none-p"
+                             "--none-p"
+                             "-only-some?"
+                             "--only-some?"
+                             "-only-some-p"
+                             "--only-some-p"
+                             "-slice"
+                             "-take"
+                             "-drop"
+                             "-take-while"
+                             "--take-while"
+                             "-drop-while"
+                             "--drop-while"
+                             "-split-at"
+                             "-rotate"
+                             "-insert-at"
+                             "-replace-at"
+                             "-update-at"
+                             "--update-at"
+                             "-remove-at"
+                             "-remove-at-indices"
+                             "-split-with"
+                             "--split-with"
+                             "-split-on"
+                             "-split-when"
+                             "--split-when"
+                             "-separate"
+                             "--separate"
+                             "-partition-all-in-steps"
+                             "-partition-in-steps"
+                             "-partition-all"
+                             "-partition"
+                             "-partition-by"
+                             "--partition-by"
+                             "-partition-by-header"
+                             "--partition-by-header"
+                             "-group-by"
+                             "--group-by"
+                             "-interpose"
+                             "-interleave"
+                             "-zip-with"
+                             "--zip-with"
+                             "-zip"
+                             "-zip-fill"
+                             "-cycle"
+                             "-pad"
+                             "-annotate"
+                             "--annotate"
+                             "-table"
+                             "-table-flat"
+                             "-partial"
+                             "-elem-index"
+                             "-elem-indices"
+                             "-find-indices"
+                             "--find-indices"
+                             "-find-index"
+                             "--find-index"
+                             "-find-last-index"
+                             "--find-last-index"
+                             "-select-by-indices"
+                             "-grade-up"
+                             "-grade-down"
+                             "->"
+                             "->>"
+                             "-->"
+                             "-when-let"
+                             "-when-let*"
+                             "--when-let"
+                             "-if-let"
+                             "-if-let*"
+                             "--if-let"
+                             "-let*"
+                             "-let"
+                             "-lambda"
+                             "-distinct"
+                             "-uniq"
+                             "-union"
+                             "-intersection"
+                             "-difference"
+                             "-contains?"
+                             "-contains-p"
+                             "-same-items?"
+                             "-same-items-p"
+                             "-is-prefix-p"
+                             "-is-prefix?"
+                             "-is-suffix-p"
+                             "-is-suffix?"
+                             "-is-infix-p"
+                             "-is-infix?"
+                             "-sort"
+                             "--sort"
+                             "-list"
+                             "-repeat"
+                             "-sum"
+                             "-product"
+                             "-max"
+                             "-min"
+                             "-max-by"
+                             "--max-by"
+                             "-min-by"
+                             "--min-by"
+                             "-iterate"
+                             "--iterate"
+                             "-fix"
+                             "--fix"
+                             "-unfold"
+                             "--unfold"
+                             "-cons-pair?"
+                             "-cons-to-list"
+                             "-value-to-list"
+                             "-tree-mapreduce-from"
+                             "--tree-mapreduce-from"
+                             "-tree-mapreduce"
+                             "--tree-mapreduce"
+                             "-tree-map"
+                             "--tree-map"
+                             "-tree-reduce-from"
+                             "--tree-reduce-from"
+                             "-tree-reduce"
+                             "--tree-reduce"
+                             "-tree-seq"
+                             "--tree-seq"
+                             "-tree-map-nodes"
+                             "--tree-map-nodes"
+                             "-clone"
+                             "-rpartial"
+                             "-juxt"
+                             "-applify"
+                             "-on"
+                             "-flip"
+                             "-const"
+                             "-cut"
+                             "-orfn"
+                             "-andfn"
+                             "-iteratefn"
+                             "-fixfn"
+                             "-prodfn"
+                             ))
+             (special-variables '(
+                                  "it"
+                                  "it-index"
+                                  "acc"
+                                  "other"
+                                  )))
+         (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "\\_<" (regexp-opt special-variables 'paren) "\\_>")
+                                                     1 font-lock-variable-name-face)) 'append)
+         (font-lock-add-keywords 'emacs-lisp-mode `((,(concat "(\\s-*" (regexp-opt new-keywords 'paren) "\\_>")
+                                                     1 font-lock-keyword-face)) 'append))
+       (--each (buffer-list)
+         (with-current-buffer it
+           (when (and (eq major-mode 'emacs-lisp-mode)
+                      (boundp 'font-lock-mode)
+                      font-lock-mode)
+             (font-lock-refresh-defaults)))))))
+
+(provide 'dash)
+;;; dash.el ends here
diff --git a/emacs.d/elpa/deferred-20150309.2052/deferred-autoloads.el b/emacs.d/elpa/deferred-20150309.2052/deferred-autoloads.el
deleted file mode 100644
index fc1b048..0000000
--- a/emacs.d/elpa/deferred-20150309.2052/deferred-autoloads.el
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; deferred-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil nil ("deferred.el") (21837 24216 32814 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; deferred-autoloads.el ends here
diff --git a/emacs.d/elpa/deferred-20150309.2052/deferred-pkg.el b/emacs.d/elpa/deferred-20150309.2052/deferred-pkg.el
deleted file mode 100644
index 90de56a..0000000
--- a/emacs.d/elpa/deferred-20150309.2052/deferred-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "deferred" "20150309.2052" "Simple asynchronous functions for emacs lisp" 'nil :url "https://github.com/kiwanami/emacs-deferred" :keywords '("deferred" "async"))
diff --git a/emacs.d/elpa/deferred-20150309.2052/deferred.el b/emacs.d/elpa/deferred-20150309.2052/deferred.el
deleted file mode 100644
index 5d27d7c..0000000
--- a/emacs.d/elpa/deferred-20150309.2052/deferred.el
+++ /dev/null
@@ -1,964 +0,0 @@
-;;; deferred.el --- Simple asynchronous functions for emacs lisp
-
-;; Copyright (C) 2010, 2011, 2012  SAKURAI Masashi
-
-;; Author: SAKURAI Masashi <m.sakurai at kiwanami.net>
-;; Version: 0.3.2
-;; Package-Version: 20150309.2052
-;; Keywords: deferred, async
-;; URL: https://github.com/kiwanami/emacs-deferred
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; 'deferred.el' is a simple library for asynchronous tasks.
-;; [https://github.com/kiwanami/emacs-deferred]
-
-;; The API is almost the same as JSDeferred written by cho45. See the
-;; JSDeferred and Mochikit.Async web sites for further documentations.
-;; [https://github.com/cho45/jsdeferred]
-;; [http://mochikit.com/doc/html/MochiKit/Async.html]
-
-;; A good introduction document (JavaScript)
-;; [http://cho45.stfuawsc.com/jsdeferred/doc/intro.en.html]
-
-;;; Samples:
-
-;; ** HTTP Access
-
-;; (require 'url)
-;; (deferred:$
-;;   (deferred:url-retrieve "http://www.gnu.org")
-;;   (deferred:nextc it
-;;     (lambda (buf)
-;;       (insert  (with-current-buffer buf (buffer-string)))
-;;       (kill-buffer buf))))
-
-;; ** Invoking command tasks
-
-;; (deferred:$
-;;   (deferred:process "wget" "-O" "a.jpg" "http://www.gnu.org/software/emacs/tour/images/splash.png")
-;;   (deferred:nextc it
-;;     (lambda (x) (deferred:process "convert" "a.jpg" "-resize" "100x100" "jpg:b.jpg")))
-;;   (deferred:nextc it
-;;     (lambda (x)
-;;       (insert-image (create-image (expand-file-name "b.jpg") 'jpeg nil)))))
-
-;; See the readme for further API documentation.
-
-;; ** Applications
-
-;; *Inertial scrolling for Emacs
-;; [https://github.com/kiwanami/emacs-inertial-scroll]
-
-;; This program makes simple multi-thread function, using
-;; deferred.el.
-
-(require 'cl)
-
-(declare-function pp-display-expression 'pp)
-
-(defvar deferred:version nil "deferred.el version")
-(setq deferred:version "0.3.2")
-
-;;; Code:
-
-(defmacro deferred:aand (test &rest rest)
-  "[internal] Anaphoric AND."
-  (declare (debug ("test" form &rest form)))
-  `(let ((it ,test))
-     (if it ,(if rest `(deferred:aand ,@rest) 'it))))
-
-(defmacro deferred:$ (&rest elements)
-  "Anaphoric function chain macro for deferred chains."
-  (declare (debug (&rest form)))
-  `(let (it)
-     ,@(loop for i in elements
-             collect
-             `(setq it ,i))
-     it))
-
-(defmacro deferred:lambda (args &rest body)
-  "Anaphoric lambda macro for self recursion."
-  (declare (debug ("args" form &rest form)))
-  (let ((argsyms (loop repeat (length args) collect (gensym))))
-  `(lambda (,@argsyms)
-     (lexical-let (self)
-       (setq self (lambda( ,@args ) ,@body))
-       (funcall self ,@argsyms)))))
-
-(defmacro* deferred:try (d &key catch finally)
-  "Try-catch-finally macro. This macro simulates the
-try-catch-finally block asynchronously. CATCH and FINALLY can be
-nil. Because of asynchrony, this macro does not ensure that the
-task FINALLY should be called."
-  (let ((chain
-         (if catch `((deferred:error it ,catch)))))
-    (when finally
-      (setq chain (append chain `((deferred:watch it ,finally)))))
-    `(deferred:$ ,d ,@chain)))
-
-(defun deferred:setTimeout (f msec)
-  "[internal] Timer function that emulates the `setTimeout' function in JS."
-  (run-at-time (/ msec 1000.0) nil f))
-
-(defun deferred:cancelTimeout (id)
-  "[internal] Timer cancellation function that emulates the `cancelTimeout' function in JS."
-  (cancel-timer id))
-
-(defun deferred:run-with-idle-timer (sec f)
-  "[internal] Wrapper function for run-with-idle-timer."
-  (run-with-idle-timer sec nil f))
-
-(defun deferred:call-lambda (f &optional arg)
-  "[internal] Call a function with one or zero argument safely.
-The lambda function can define with zero and one argument."
-  (condition-case err
-      (funcall f arg)
-    ('wrong-number-of-arguments
-     (display-warning 'deferred "\
-Callback that takes no argument may be specified.
-Passing callback with no argument is deprecated.
-Callback must take one argument.
-Or, this error is coming from somewhere inside of the callback: %S" err)
-     (condition-case nil
-         (funcall f)
-       ('wrong-number-of-arguments
-        (signal 'wrong-number-of-arguments (cdr err))))))) ; return the first error
-
-;; debug
-
-(eval-and-compile
-  (defvar deferred:debug nil "Debug output switch."))
-(defvar deferred:debug-count 0 "[internal] Debug output counter.")
-
-(defmacro deferred:message (&rest args)
-  "[internal] Debug log function."
-  (when deferred:debug
-    `(progn
-       (with-current-buffer (get-buffer-create "*deferred:debug*")
-         (save-excursion
-           (goto-char (point-max))
-           (insert (format "%5i %s\n" deferred:debug-count (format ,@args)))))
-       (incf deferred:debug-count))))
-
-(defun deferred:message-mark ()
-  "[internal] Debug log function."
-  (interactive)
-  (deferred:message "==================== mark ==== %s"
-    (format-time-string "%H:%M:%S" (current-time))))
-
-(defun deferred:pp (d)
-  (require 'pp)
-  (deferred:$
-    (deferred:nextc d
-      (lambda (x)
-        (pp-display-expression x "*deferred:pp*")))
-    (deferred:error it
-      (lambda (e)
-        (pp-display-expression e "*deferred:pp*")))
-    (deferred:nextc it
-      (lambda (_x) (pop-to-buffer "*deferred:pp*")))))
-
-(defvar deferred:debug-on-signal nil
-"If non nil, the value `debug-on-signal' is substituted this
-value in the `condition-case' form in deferred
-implementations. Then, Emacs debugger can catch an error occurred
-in the asynchronous tasks.")
-
-(defmacro deferred:condition-case (var protected-form &rest handlers)
-  "[internal] Custom condition-case. See the comment for
-`deferred:debug-on-signal'."
-  (declare (debug condition-case)
-           (indent 2))
-  `(let ((debug-on-signal
-          (or debug-on-signal deferred:debug-on-signal)))
-     (condition-case ,var
-         ,protected-form
-       ,@handlers)))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Back end functions of deferred tasks
-
-(defvar deferred:tick-time 0.001
-  "Waiting time between asynchronous tasks (second).
-The shorter waiting time increases the load of Emacs. The end
-user can tune this paramter. However, applications should not
-modify it because the applications run on various environments.")
-
-(defvar deferred:queue nil
-  "[internal] The execution queue of deferred objects.
-See the functions `deferred:post-task' and `deferred:worker'.")
-
-(defmacro deferred:pack (a b c)
-  `(cons ,a (cons ,b ,c)))
-
-(defun deferred:schedule-worker ()
-  "[internal] Schedule consuming a deferred task in the execution queue."
-  (run-at-time deferred:tick-time nil 'deferred:worker))
-
-(defun deferred:post-task (d which &optional arg)
-  "[internal] Add a deferred object to the execution queue
-`deferred:queue' and schedule to execute.
-D is a deferred object. WHICH is a symbol, `ok' or `ng'. ARG is
-an argument value for execution of the deferred task."
-  (push (deferred:pack d which arg) deferred:queue)
-  (deferred:message "QUEUE-POST [%s]: %s"
-    (length deferred:queue) (deferred:pack d which arg))
-  (deferred:schedule-worker)
-  d)
-
-(defun deferred:clear-queue ()
-  "Clear the execution queue. For test and debugging."
-  (interactive)
-  (deferred:message "QUEUE-CLEAR [%s -> 0]" (length deferred:queue))
-  (setq deferred:queue nil))
-
-(defun deferred:worker ()
-  "[internal] Consume a deferred task.
-Mainly this function is called by timer asynchronously."
-  (when deferred:queue
-    (let* ((pack (car (last deferred:queue)))
-           (d (car pack))
-           (which (cadr pack))
-           (arg (cddr pack)) value)
-      (setq deferred:queue (nbutlast deferred:queue))
-      (condition-case err
-          (setq value (deferred:exec-task d which arg))
-        (error
-         (deferred:message "ERROR : %s" err)
-         (message "deferred error : %s" err)))
-      value)))
-
-(defun deferred:flush-queue! ()
-  "Call all deferred tasks synchronously. For test and debugging."
-  (let (value)
-    (while deferred:queue
-      (setq value (deferred:worker)))
-    value))
-
-(defun deferred:sync! (d)
-  "Wait for the given deferred task. For test and debugging.
-Error is raised if it is not processed within deferred chain D."
-  (progn
-    (lexical-let ((last-value 'deferred:undefined*)
-                  uncaught-error)
-      (deferred:try
-        (deferred:nextc d
-          (lambda (x) (setq last-value x)))
-        :catch
-        (lambda (err) (setq uncaught-error err)))
-      (while (and (eq 'deferred:undefined* last-value)
-                  (not uncaught-error))
-        (sit-for 0.05)
-        (sleep-for 0.05))
-      (when uncaught-error
-        (deferred:resignal uncaught-error))
-      last-value)))
-
-
-
-;; Struct: deferred
-;;
-;; callback    : a callback function (default `deferred:default-callback')
-;; errorback   : an errorback function (default `deferred:default-errorback')
-;; cancel      : a canceling function (default `deferred:default-cancel')
-;; next        : a next chained deferred object (default nil)
-;; status      : if 'ok or 'ng, this deferred has a result (error) value. (default nil)
-;; value       : saved value (default nil)
-;;
-(defstruct deferred
-  (callback 'deferred:default-callback)
-  (errorback 'deferred:default-errorback)
-  (cancel 'deferred:default-cancel)
-  next status value)
-
-(defun deferred:default-callback (i)
-  "[internal] Default callback function."
-  (identity i))
-
-(defun deferred:default-errorback (err)
-  "[internal] Default errorback function."
-  (deferred:resignal err))
-
-(defun deferred:resignal (err)
-  "[internal] Safely resignal ERR as an Emacs condition.
-
-If ERR is a cons (ERROR-SYMBOL . DATA) where ERROR-SYMBOL has an
-`error-conditions' property, it is re-signaled unchanged. If ERR
-is a string, it is signaled as a generic error using `error'.
-Otherwise, ERR is formatted into a string as if by `print' before
-raising with `error'."
-  (cond ((and (listp err)
-              (symbolp (car err))
-              (get (car err) 'error-conditions))
-         (signal (car err) (cdr err)))
-        ((stringp err)
-         (error "%s" err))
-        (t
-         (error "%S" err))))
-
-(defun deferred:default-cancel (d)
-  "[internal] Default canceling function."
-  (deferred:message "CANCEL : %s" d)
-  (setf (deferred-callback d) 'deferred:default-callback)
-  (setf (deferred-errorback d) 'deferred:default-errorback)
-  (setf (deferred-next d) nil)
-  d)
-
-(defun deferred:exec-task (d which &optional arg)
-  "[internal] Executing deferred task. If the deferred object has
-next deferred task or the return value is a deferred object, this
-function adds the task to the execution queue.
-D is a deferred object. WHICH is a symbol, `ok' or `ng'. ARG is
-an argument value for execution of the deferred task."
-  (deferred:message "EXEC : %s / %s / %s" d which arg)
-  (when (null d) (error "deferred:exec-task was given a nil."))
-  (let ((callback (if (eq which 'ok)
-                      (deferred-callback d)
-                    (deferred-errorback d)))
-        (next-deferred (deferred-next d)))
-    (cond
-     (callback
-      (deferred:condition-case err
-          (let ((value (deferred:call-lambda callback arg)))
-            (cond
-             ((deferred-p value)
-              (deferred:message "WAIT NEST : %s" value)
-              (if next-deferred
-                  (deferred:set-next value next-deferred)
-                value))
-             (t
-              (if next-deferred
-                  (deferred:post-task next-deferred 'ok value)
-                (setf (deferred-status d) 'ok)
-                (setf (deferred-value d) value)
-                value))))
-        (error
-         (cond
-          (next-deferred
-           (deferred:post-task next-deferred 'ng err))
-          (deferred:onerror
-            (deferred:call-lambda deferred:onerror err))
-          (t
-           (deferred:message "ERROR : %S" err)
-           (message "deferred error : %S" err)
-           (setf (deferred-status d) 'ng)
-           (setf (deferred-value d) err)
-           err)))))
-     (t ; <= (null callback)
-      (cond
-       (next-deferred
-        (deferred:exec-task next-deferred which arg))
-       ((eq which 'ok) arg)
-       (t                             ; (eq which 'ng)
-        (deferred:resignal arg)))))))
-
-(defun deferred:set-next (prev next)
-  "[internal] Connect deferred objects."
-  (setf (deferred-next prev) next)
-  (cond
-   ((eq 'ok (deferred-status prev))
-    (setf (deferred-status prev) nil)
-    (let ((ret (deferred:exec-task
-                 next 'ok (deferred-value prev))))
-      (if (deferred-p ret) ret
-        next)))
-   ((eq 'ng (deferred-status prev))
-    (setf (deferred-status prev) nil)
-    (let ((ret (deferred:exec-task next 'ng (deferred-value prev))))
-      (if (deferred-p ret) ret
-        next)))
-   (t
-    next)))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Basic functions for deferred objects
-
-(defun deferred:new (&optional callback)
-  "Create a deferred object."
-  (if callback
-      (make-deferred :callback callback)
-    (make-deferred)))
-
-(defun deferred:callback (d &optional arg)
-  "Start deferred chain with a callback message."
-  (deferred:exec-task d 'ok arg))
-
-(defun deferred:errorback (d &optional arg)
-  "Start deferred chain with an errorback message."
-  (deferred:exec-task d 'ng arg))
-
-(defun deferred:callback-post (d &optional arg)
-  "Add the deferred object to the execution queue."
-  (deferred:post-task d 'ok arg))
-
-(defun deferred:errorback-post (d &optional arg)
-  "Add the deferred object to the execution queue."
-  (deferred:post-task d 'ng arg))
-
-(defun deferred:cancel (d)
-  "Cancel all callbacks and deferred chain in the deferred object."
-  (deferred:message "CANCEL : %s" d)
-  (funcall (deferred-cancel d) d)
-  d)
-
-(defun deferred:status (d)
-  "Return a current status of the deferred object. The returned value means following:
-`ok': the callback was called and waiting for next deferred.
-`ng': the errorback was called and waiting for next deferred.
- nil: The neither callback nor errorback was not called."
-  (deferred-status d))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Basic utility functions
-
-(defvar deferred:onerror nil
-  "Default error handler. This value is nil or a function that
-  have one argument for the error message.")
-
-(defun deferred:succeed (&optional arg)
-  "Create a synchronous deferred object."
-  (let ((d (deferred:new)))
-    (deferred:exec-task d 'ok arg)
-    d))
-
-(defun deferred:fail (&optional arg)
-  "Create a synchronous deferred object."
-  (let ((d (deferred:new)))
-    (deferred:exec-task d 'ng arg)
-    d))
-
-(defun deferred:next (&optional callback arg)
-  "Create a deferred object and schedule executing. This function
-is a short cut of following code:
- (deferred:callback-post (deferred:new callback))."
-  (let ((d (if callback
-               (make-deferred :callback callback)
-             (make-deferred))))
-    (deferred:callback-post d arg)
-    d))
-
-(defun deferred:nextc (d callback)
-  "Create a deferred object with OK callback and connect it to the given deferred object."
-  (let ((nd (make-deferred :callback callback)))
-    (deferred:set-next d nd)))
-
-(defun deferred:error (d callback)
-  "Create a deferred object with errorback and connect it to the given deferred object."
-  (let ((nd (make-deferred :errorback callback)))
-    (deferred:set-next d nd)))
-
-(defun deferred:watch (d callback)
-  "Create a deferred object with watch task and connect it to the given deferred object.
-The watch task CALLBACK can not affect deferred chains with
-return values. This function is used in following purposes,
-simulation of try-finally block in asynchronous tasks, progress
-monitoring of tasks."
-  (lexical-let*
-      ((callback callback)
-       (normal (lambda (x) (ignore-errors (deferred:call-lambda callback x)) x))
-       (err    (lambda (e)
-                 (ignore-errors (deferred:call-lambda callback e))
-                 (deferred:resignal e))))
-    (let ((nd (make-deferred :callback normal :errorback err)))
-      (deferred:set-next d nd))))
-
-(defun deferred:wait (msec)
-  "Return a deferred object scheduled at MSEC millisecond later."
-  (lexical-let
-      ((d (deferred:new)) (start-time (float-time)) timer)
-    (deferred:message "WAIT : %s" msec)
-    (setq timer (deferred:setTimeout
-                  (lambda ()
-                    (deferred:exec-task d 'ok
-                      (* 1000.0 (- (float-time) start-time)))
-                    nil) msec))
-    (setf (deferred-cancel d)
-          (lambda (x)
-            (deferred:cancelTimeout timer)
-            (deferred:default-cancel x)))
-    d))
-
-(defun deferred:wait-idle (msec)
-  "Return a deferred object which will run when Emacs has been
-idle for MSEC millisecond."
-  (lexical-let
-      ((d (deferred:new)) (start-time (float-time)) timer)
-    (deferred:message "WAIT-IDLE : %s" msec)
-    (setq timer
-          (deferred:run-with-idle-timer
-            (/ msec 1000.0)
-            (lambda ()
-              (deferred:exec-task d 'ok
-                (* 1000.0 (- (float-time) start-time)))
-              nil)))
-    (setf (deferred-cancel d)
-          (lambda (x)
-            (deferred:cancelTimeout timer)
-            (deferred:default-cancel x)))
-    d))
-
-(defun deferred:call (f &rest args)
-  "Call the given function asynchronously."
-  (lexical-let ((f f) (args args))
-    (deferred:next
-      (lambda (_x)
-        (apply f args)))))
-
-(defun deferred:apply (f &optional args)
-  "Call the given function asynchronously."
-  (lexical-let ((f f) (args args))
-    (deferred:next
-      (lambda (_x)
-        (apply f args)))))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Utility functions
-
-(defun deferred:empty-p (times-or-list)
-  "[internal] Return non-nil if TIMES-OR-LIST is the number zero or nil."
-  (or (and (numberp times-or-list) (<= times-or-list 0))
-      (and (listp times-or-list) (null times-or-list))))
-
-(defun deferred:loop (times-or-list func)
-  "Return a iteration deferred object."
-  (deferred:message "LOOP : %s" times-or-list)
-  (if (deferred:empty-p times-or-list) (deferred:next)
-    (lexical-let*
-        (items (rd
-                (cond
-                 ((numberp times-or-list)
-                  (loop for i from 0 below times-or-list
-                        with ld = (deferred:next)
-                        do
-                        (push ld items)
-                        (setq ld
-                              (lexical-let ((i i) (func func))
-                                (deferred:nextc ld (lambda (_x) (deferred:call-lambda func i)))))
-                        finally return ld))
-                 ((listp times-or-list)
-                  (loop for i in times-or-list
-                        with ld = (deferred:next)
-                        do
-                        (push ld items)
-                        (setq ld
-                              (lexical-let ((i i) (func func))
-                                (deferred:nextc ld (lambda (_x) (deferred:call-lambda func i)))))
-                        finally return ld)))))
-      (setf (deferred-cancel rd)
-            (lambda (x) (deferred:default-cancel x)
-              (loop for i in items
-                    do (deferred:cancel i))))
-      rd)))
-
-(defun deferred:trans-multi-args (args self-func list-func main-func)
-  "[internal] Check the argument values and dispatch to methods."
-  (cond
-   ((and (= 1 (length args)) (consp (car args)) (not (functionp (car args))))
-    (let ((lst (car args)))
-      (cond
-       ((or (null lst) (null (car lst)))
-        (deferred:next))
-       ((deferred:aand lst (car it) (or (functionp it) (deferred-p it)))
-        ;; a list of deferred objects
-        (funcall list-func lst))
-       ((deferred:aand lst (consp it))
-        ;; an alist of deferred objects
-        (funcall main-func lst))
-       (t (error "Wrong argument type. %s" args)))))
-   (t (funcall self-func args))))
-
-(defun deferred:parallel-array-to-alist (lst)
-  "[internal] Translation array to alist."
-  (loop for d in lst
-        for i from 0 below (length lst)
-        collect (cons i d)))
-
-(defun deferred:parallel-alist-to-array (alst)
-  "[internal] Translation alist to array."
-  (loop for pair in
-        (sort alst (lambda (x y)
-                     (< (car x) (car y))))
-        collect (cdr pair)))
-
-(defun deferred:parallel-func-to-deferred (alst)
-  "[internal] Normalization for parallel and earlier arguments."
-  (loop for pair in alst
-        for d = (cdr pair)
-        collect
-        (progn
-          (unless (deferred-p d)
-            (setf (cdr pair) (deferred:next d)))
-          pair)))
-
-(defun deferred:parallel-main (alst)
-  "[internal] Deferred alist implementation for `deferred:parallel'. "
-  (deferred:message "PARALLEL<KEY . VALUE>" )
-  (lexical-let ((nd (deferred:new))
-                (len (length alst))
-                values)
-    (loop for pair in
-          (deferred:parallel-func-to-deferred alst)
-          with cd ; current child deferred
-          do
-          (lexical-let ((name (car pair)))
-            (setq cd
-                  (deferred:nextc (cdr pair)
-                    (lambda (x)
-                      (push (cons name x) values)
-                      (deferred:message "PARALLEL VALUE [%s/%s] %s"
-                        (length values) len (cons name x))
-                      (when (= len (length values))
-                        (deferred:message "PARALLEL COLLECTED")
-                        (deferred:post-task nd 'ok (nreverse values)))
-                      nil)))
-            (deferred:error cd
-              (lambda (e)
-                (push (cons name e) values)
-                (deferred:message "PARALLEL ERROR [%s/%s] %s"
-                  (length values) len (cons name e))
-                (when (= (length values) len)
-                  (deferred:message "PARALLEL COLLECTED")
-                  (deferred:post-task nd 'ok (nreverse values)))
-                nil))))
-    nd))
-
-(defun deferred:parallel-list (lst)
-  "[internal] Deferred list implementation for `deferred:parallel'. "
-  (deferred:message "PARALLEL<LIST>" )
-  (lexical-let*
-      ((pd (deferred:parallel-main (deferred:parallel-array-to-alist lst)))
-       (rd (deferred:nextc pd 'deferred:parallel-alist-to-array)))
-    (setf (deferred-cancel rd)
-          (lambda (x) (deferred:default-cancel x)
-            (deferred:cancel pd)))
-    rd))
-
-(defun deferred:parallel (&rest args)
-  "Return a deferred object that calls given deferred objects or
-functions in parallel and wait for all callbacks. The following
-deferred task will be called with an array of the return
-values. ARGS can be a list or an alist of deferred objects or
-functions."
-  (deferred:message "PARALLEL : %s" args)
-  (deferred:trans-multi-args args
-    'deferred:parallel 'deferred:parallel-list 'deferred:parallel-main))
-
-(defun deferred:earlier-main (alst)
-  "[internal] Deferred alist implementation for `deferred:earlier'. "
-  (deferred:message "EARLIER<KEY . VALUE>" )
-  (lexical-let ((nd (deferred:new))
-                (len (length alst))
-                value results)
-    (loop for pair in
-          (deferred:parallel-func-to-deferred alst)
-          with cd ; current child deferred
-          do
-          (lexical-let ((name (car pair)))
-            (setq cd
-                  (deferred:nextc (cdr pair)
-                    (lambda (x)
-                      (push (cons name x) results)
-                      (cond
-                       ((null value)
-                        (setq value (cons name x))
-                        (deferred:message "EARLIER VALUE %s" (cons name value))
-                        (deferred:post-task nd 'ok value))
-                       (t
-                        (deferred:message "EARLIER MISS [%s/%s] %s" (length results) len (cons name value))
-                        (when (eql (length results) len)
-                          (deferred:message "EARLIER COLLECTED"))))
-                      nil)))
-            (deferred:error cd
-              (lambda (e)
-                (push (cons name e) results)
-                (deferred:message "EARLIER ERROR [%s/%s] %s" (length results) len (cons name e))
-                (when (and (eql (length results) len) (null value))
-                  (deferred:message "EARLIER FAILED")
-                  (deferred:post-task nd 'ok nil))
-                nil))))
-    nd))
-
-(defun deferred:earlier-list (lst)
-  "[internal] Deferred list implementation for `deferred:earlier'. "
-  (deferred:message "EARLIER<LIST>" )
-  (lexical-let*
-      ((pd (deferred:earlier-main (deferred:parallel-array-to-alist lst)))
-       (rd (deferred:nextc pd (lambda (x) (cdr x)))))
-    (setf (deferred-cancel rd)
-          (lambda (x) (deferred:default-cancel x)
-            (deferred:cancel pd)))
-    rd))
-
-
-(defun deferred:earlier (&rest args)
-  "Return a deferred object that calls given deferred objects or
-functions in parallel and wait for the first callback. The
-following deferred task will be called with the first return
-value. ARGS can be a list or an alist of deferred objects or
-functions."
-  (deferred:message "EARLIER : %s" args)
-  (deferred:trans-multi-args args
-    'deferred:earlier 'deferred:earlier-list 'deferred:earlier-main))
-
-(defmacro deferred:timeout (timeout-msec timeout-form d)
-  "Time out macro on a deferred task D.  If the deferred task D
-does not complete within TIMEOUT-MSEC, this macro cancels the
-deferred task and return the TIMEOUT-FORM."
-  `(deferred:earlier
-     (deferred:nextc (deferred:wait ,timeout-msec)
-       (lambda (x) ,timeout-form))
-     ,d))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Application functions
-
-(defvar deferred:uid 0 "[internal] Sequence number for some utilities. See the function `deferred:uid'.")
-
-(defun deferred:uid ()
-  "[internal] Generate a sequence number."
-  (incf deferred:uid))
-
-(defun deferred:buffer-string (strformat buf)
-  "[internal] Return a string in the buffer with the given format."
-  (format strformat
-          (with-current-buffer buf (buffer-string))))
-
-(defun deferred:process (command &rest args)
-  "A deferred wrapper of `start-process'. Return a deferred
-object. The process name and buffer name of the argument of the
-`start-process' are generated by this function automatically.
-The next deferred object receives stdout string from the command
-process."
-  (deferred:process-gen 'start-process command args))
-
-(defun deferred:process-shell (command &rest args)
-  "A deferred wrapper of `start-process-shell-command'. Return a deferred
-object. The process name and buffer name of the argument of the
-`start-process-shell-command' are generated by this function automatically.
-The next deferred object receives stdout string from the command
-process."
-  (deferred:process-gen 'start-process-shell-command command args))
-
-(defun deferred:process-buffer (command &rest args)
-  "A deferred wrapper of `start-process'. Return a deferred
-object. The process name and buffer name of the argument of the
-`start-process' are generated by this function automatically.
-The next deferred object receives stdout buffer from the command
-process."
-  (deferred:process-buffer-gen 'start-process command args))
-
-(defun deferred:process-shell-buffer (command &rest args)
-  "A deferred wrapper of `start-process-shell-command'. Return a deferred
-object. The process name and buffer name of the argument of the
-`start-process-shell-command' are generated by this function automatically.
-The next deferred object receives stdout buffer from the command
-process."
-  (deferred:process-buffer-gen 'start-process-shell-command command args))
-
-(defun deferred:process-gen (f command args)
-  "[internal]"
-  (lexical-let
-      ((pd (deferred:process-buffer-gen f command args)) d)
-    (setq d (deferred:nextc pd
-              (lambda (buf)
-                (prog1
-                    (with-current-buffer buf (buffer-string))
-                  (kill-buffer buf)))))
-    (setf (deferred-cancel d)
-          (lambda (_x)
-            (deferred:default-cancel d)
-            (deferred:default-cancel pd)))
-    d))
-
-(defun deferred:process-buffer-gen (f command args)
-  "[internal]"
-  (let ((d (deferred:next)) (uid (deferred:uid)))
-    (lexical-let
-        ((f f) (command command) (args args)
-         (proc-name (format "*deferred:*%s*:%s" command uid))
-         (buf-name (format " *deferred:*%s*:%s" command uid))
-         (pwd default-directory)
-         (env process-environment)
-         (con-type process-connection-type)
-         (nd (deferred:new)) proc-buf proc)
-      (deferred:nextc d
-        (lambda (_x)
-          (setq proc-buf (get-buffer-create buf-name))
-          (condition-case err
-              (let ((default-directory pwd)
-                    (process-environment env)
-                    (process-connection-type con-type))
-                (setq proc
-                      (if (null (car args))
-                          (apply f proc-name buf-name command nil)
-                        (apply f proc-name buf-name command args)))
-                (set-process-sentinel
-                 proc
-                 (lambda (_proc event)
-                   (cond
-                    ((string-match "exited abnormally" event)
-                     (let ((msg (if (buffer-live-p proc-buf)
-                                    (format "Process [%s] exited abnormally : %s"
-                                            command
-                                            (with-current-buffer proc-buf (buffer-string)))
-                                  (concat "Process exited abnormally: " proc-name))))
-                       (kill-buffer proc-buf)
-                       (deferred:post-task nd 'ng msg)))
-                    ((equal event "finished\n")
-                       (deferred:post-task nd 'ok proc-buf)))))
-                (setf (deferred-cancel nd)
-                      (lambda (x) (deferred:default-cancel x)
-                        (when proc
-                          (kill-process proc)
-                          (kill-buffer proc-buf)))))
-            (error (deferred:post-task nd 'ng err)))
-          nil))
-      nd)))
-
-(defmacro deferred:processc (d command &rest args)
-  "Process chain of `deferred:process'."
-  `(deferred:nextc ,d
-    (lambda (,(gensym)) (deferred:process ,command ,@args))))
-
-(defmacro deferred:process-bufferc (d command &rest args)
-  "Process chain of `deferred:process-buffer'."
-  `(deferred:nextc ,d
-     (lambda (,(gensym)) (deferred:process-buffer ,command ,@args))))
-
-(defmacro deferred:process-shellc (d command &rest args)
-  "Process chain of `deferred:process'."
-  `(deferred:nextc ,d
-    (lambda (,(gensym)) (deferred:process-shell ,command ,@args))))
-
-(defmacro deferred:process-shell-bufferc (d command &rest args)
-  "Process chain of `deferred:process-buffer'."
-  `(deferred:nextc ,d
-     (lambda (,(gensym)) (deferred:process-shell-buffer ,command ,@args))))
-
-(eval-after-load "url"
-  ;; for url package
-  ;; TODO: proxy, charaset
-  ;; List of gloabl variables to preserve and restore before url-retrieve call
-  '(lexical-let ((url-global-variables '(url-request-data
-                                         url-request-method
-                                         url-request-extra-headers)))
-
-     (defun deferred:url-retrieve (url &optional cbargs silent inhibit-cookies)
-       "A wrapper function for url-retrieve. The next deferred
-object receives the buffer object that URL will load
-into. Values of dynamically bound 'url-request-data', 'url-request-method' and
-'url-request-extra-headers' are passed to url-retrieve call."
-       (lexical-let ((nd (deferred:new)) (url url)
-                     (cbargs cbargs) (silent silent) (inhibit-cookies inhibit-cookies) buf
-                     (local-values (mapcar (lambda (symbol) (symbol-value symbol)) url-global-variables)))
-         (deferred:next
-           (lambda (_x)
-             (progv url-global-variables local-values
-               (condition-case err
-                   (setq buf
-                         (url-retrieve
-                          url (lambda (_xx) (deferred:post-task nd 'ok buf))
-                          cbargs silent inhibit-cookies))
-                 (error (deferred:post-task nd 'ng err)))
-             nil)))
-         (setf (deferred-cancel nd)
-               (lambda (_x)
-                 (when (buffer-live-p buf)
-                   (kill-buffer buf))))
-         nd))
-
-     (defun deferred:url-delete-header (buf)
-       (with-current-buffer buf
-         (let ((pos (url-http-symbol-value-in-buffer
-                     'url-http-end-of-headers buf)))
-           (when pos
-             (delete-region (point-min) (1+ pos)))))
-       buf)
-
-     (defun deferred:url-delete-buffer (buf)
-       (when (and buf (buffer-live-p buf))
-         (kill-buffer buf))
-       nil)
-
-     (defun deferred:url-get (url &optional params &rest args)
-       "Perform a HTTP GET method with `url-retrieve'. PARAMS is
-a parameter list of (key . value) or key. ARGS will be appended
-to deferred:url-retrieve args list. The next deferred
-object receives the buffer object that URL will load into."
-       (when params
-         (setq url
-               (concat url "?" (deferred:url-param-serialize params))))
-       (let ((d (deferred:$
-                  (apply 'deferred:url-retrieve url args)
-                  (deferred:nextc it 'deferred:url-delete-header))))
-         (deferred:set-next
-           d (deferred:new 'deferred:url-delete-buffer))
-         d))
-
-     (defun deferred:url-post (url &optional params &rest args)
-       "Perform a HTTP POST method with `url-retrieve'. PARAMS is
-a parameter list of (key . value) or key. ARGS will be appended
-to deferred:url-retrieve args list. The next deferred
-object receives the buffer object that URL will load into."
-       (let ((url-request-method "POST")
-             (url-request-extra-headers
-              (append url-request-extra-headers
-                      '(("Content-Type" . "application/x-www-form-urlencoded"))))
-             (url-request-data (deferred:url-param-serialize params)))
-         (let ((d (deferred:$
-                    (apply 'deferred:url-retrieve url args)
-                    (deferred:nextc it 'deferred:url-delete-header))))
-           (deferred:set-next
-             d (deferred:new 'deferred:url-delete-buffer))
-           d)))
-
-     (defun deferred:url-escape (val)
-       "[internal] Return a new string that is VAL URI-encoded."
-       (unless (stringp val)
-         (setq val (format "%s" val)))
-       (url-hexify-string
-        (encode-coding-string val 'utf-8)))
-
-     (defun deferred:url-param-serialize (params)
-       "[internal] Serialize a list of (key . value) cons cells
-into a query string."
-       (when params
-         (mapconcat
-          'identity
-          (loop for p in params
-                collect
-                (cond
-                 ((consp p)
-                  (concat
-                   (deferred:url-escape (car p)) "="
-                   (deferred:url-escape (cdr p))))
-                 (t
-                  (deferred:url-escape p))))
-          "&")))
-     ))
-
-
-(provide 'deferred)
-;;; deferred.el ends here
diff --git a/emacs.d/elpa/deferred-20160109.2046/deferred-autoloads.el b/emacs.d/elpa/deferred-20160109.2046/deferred-autoloads.el
new file mode 100644
index 0000000..265c206
--- /dev/null
+++ b/emacs.d/elpa/deferred-20160109.2046/deferred-autoloads.el
@@ -0,0 +1,15 @@
+;;; deferred-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil nil ("deferred.el") (22171 46578 312993 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; deferred-autoloads.el ends here
diff --git a/emacs.d/elpa/deferred-20160109.2046/deferred-pkg.el b/emacs.d/elpa/deferred-20160109.2046/deferred-pkg.el
new file mode 100644
index 0000000..dacf0af
--- /dev/null
+++ b/emacs.d/elpa/deferred-20160109.2046/deferred-pkg.el
@@ -0,0 +1 @@
+(define-package "deferred" "20160109.2046" "Simple asynchronous functions for emacs lisp" 'nil :url "https://github.com/kiwanami/emacs-deferred" :keywords '("deferred" "async"))
diff --git a/emacs.d/elpa/deferred-20160109.2046/deferred.el b/emacs.d/elpa/deferred-20160109.2046/deferred.el
new file mode 100644
index 0000000..9f0023f
--- /dev/null
+++ b/emacs.d/elpa/deferred-20160109.2046/deferred.el
@@ -0,0 +1,964 @@
+;;; deferred.el --- Simple asynchronous functions for emacs lisp
+
+;; Copyright (C) 2010-2016 SAKURAI Masashi
+
+;; Author: SAKURAI Masashi <m.sakurai at kiwanami.net>
+;; Version: 0.4.0
+;; Package-Version: 20160109.2046
+;; Keywords: deferred, async
+;; URL: https://github.com/kiwanami/emacs-deferred
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; 'deferred.el' is a simple library for asynchronous tasks.
+;; [https://github.com/kiwanami/emacs-deferred]
+
+;; The API is almost the same as JSDeferred written by cho45. See the
+;; JSDeferred and Mochikit.Async web sites for further documentations.
+;; [https://github.com/cho45/jsdeferred]
+;; [http://mochikit.com/doc/html/MochiKit/Async.html]
+
+;; A good introduction document (JavaScript)
+;; [http://cho45.stfuawsc.com/jsdeferred/doc/intro.en.html]
+
+;;; Samples:
+
+;; ** HTTP Access
+
+;; (require 'url)
+;; (deferred:$
+;;   (deferred:url-retrieve "http://www.gnu.org")
+;;   (deferred:nextc it
+;;     (lambda (buf)
+;;       (insert  (with-current-buffer buf (buffer-string)))
+;;       (kill-buffer buf))))
+
+;; ** Invoking command tasks
+
+;; (deferred:$
+;;   (deferred:process "wget" "-O" "a.jpg" "http://www.gnu.org/software/emacs/tour/images/splash.png")
+;;   (deferred:nextc it
+;;     (lambda (x) (deferred:process "convert" "a.jpg" "-resize" "100x100" "jpg:b.jpg")))
+;;   (deferred:nextc it
+;;     (lambda (x)
+;;       (insert-image (create-image (expand-file-name "b.jpg") 'jpeg nil)))))
+
+;; See the readme for further API documentation.
+
+;; ** Applications
+
+;; *Inertial scrolling for Emacs
+;; [https://github.com/kiwanami/emacs-inertial-scroll]
+
+;; This program makes simple multi-thread function, using
+;; deferred.el.
+
+(require 'cl)
+
+(declare-function pp-display-expression 'pp)
+
+(defvar deferred:version nil "deferred.el version")
+(setq deferred:version "0.4.0")
+
+;;; Code:
+
+(defmacro deferred:aand (test &rest rest)
+  "[internal] Anaphoric AND."
+  (declare (debug ("test" form &rest form)))
+  `(let ((it ,test))
+     (if it ,(if rest `(deferred:aand ,@rest) 'it))))
+
+(defmacro deferred:$ (&rest elements)
+  "Anaphoric function chain macro for deferred chains."
+  (declare (debug (&rest form)))
+  `(let (it)
+     ,@(loop for i in elements
+             collect
+             `(setq it ,i))
+     it))
+
+(defmacro deferred:lambda (args &rest body)
+  "Anaphoric lambda macro for self recursion."
+  (declare (debug ("args" form &rest form)))
+  (let ((argsyms (loop repeat (length args) collect (gensym))))
+  `(lambda (,@argsyms)
+     (lexical-let (self)
+       (setq self (lambda( ,@args ) ,@body))
+       (funcall self ,@argsyms)))))
+
+(defmacro* deferred:try (d &key catch finally)
+  "Try-catch-finally macro. This macro simulates the
+try-catch-finally block asynchronously. CATCH and FINALLY can be
+nil. Because of asynchrony, this macro does not ensure that the
+task FINALLY should be called."
+  (let ((chain
+         (if catch `((deferred:error it ,catch)))))
+    (when finally
+      (setq chain (append chain `((deferred:watch it ,finally)))))
+    `(deferred:$ ,d ,@chain)))
+
+(defun deferred:setTimeout (f msec)
+  "[internal] Timer function that emulates the `setTimeout' function in JS."
+  (run-at-time (/ msec 1000.0) nil f))
+
+(defun deferred:cancelTimeout (id)
+  "[internal] Timer cancellation function that emulates the `cancelTimeout' function in JS."
+  (cancel-timer id))
+
+(defun deferred:run-with-idle-timer (sec f)
+  "[internal] Wrapper function for run-with-idle-timer."
+  (run-with-idle-timer sec nil f))
+
+(defun deferred:call-lambda (f &optional arg)
+  "[internal] Call a function with one or zero argument safely.
+The lambda function can define with zero and one argument."
+  (condition-case err
+      (funcall f arg)
+    ('wrong-number-of-arguments
+     (display-warning 'deferred "\
+Callback that takes no argument may be specified.
+Passing callback with no argument is deprecated.
+Callback must take one argument.
+Or, this error is coming from somewhere inside of the callback: %S" err)
+     (condition-case nil
+         (funcall f)
+       ('wrong-number-of-arguments
+        (signal 'wrong-number-of-arguments (cdr err))))))) ; return the first error
+
+;; debug
+
+(eval-and-compile
+  (defvar deferred:debug nil "Debug output switch."))
+(defvar deferred:debug-count 0 "[internal] Debug output counter.")
+
+(defmacro deferred:message (&rest args)
+  "[internal] Debug log function."
+  (when deferred:debug
+    `(progn
+       (with-current-buffer (get-buffer-create "*deferred:debug*")
+         (save-excursion
+           (goto-char (point-max))
+           (insert (format "%5i %s\n" deferred:debug-count (format ,@args)))))
+       (incf deferred:debug-count))))
+
+(defun deferred:message-mark ()
+  "[internal] Debug log function."
+  (interactive)
+  (deferred:message "==================== mark ==== %s"
+    (format-time-string "%H:%M:%S" (current-time))))
+
+(defun deferred:pp (d)
+  (require 'pp)
+  (deferred:$
+    (deferred:nextc d
+      (lambda (x)
+        (pp-display-expression x "*deferred:pp*")))
+    (deferred:error it
+      (lambda (e)
+        (pp-display-expression e "*deferred:pp*")))
+    (deferred:nextc it
+      (lambda (_x) (pop-to-buffer "*deferred:pp*")))))
+
+(defvar deferred:debug-on-signal nil
+"If non nil, the value `debug-on-signal' is substituted this
+value in the `condition-case' form in deferred
+implementations. Then, Emacs debugger can catch an error occurred
+in the asynchronous tasks.")
+
+(defmacro deferred:condition-case (var protected-form &rest handlers)
+  "[internal] Custom condition-case. See the comment for
+`deferred:debug-on-signal'."
+  (declare (debug condition-case)
+           (indent 2))
+  `(let ((debug-on-signal
+          (or debug-on-signal deferred:debug-on-signal)))
+     (condition-case ,var
+         ,protected-form
+       ,@handlers)))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Back end functions of deferred tasks
+
+(defvar deferred:tick-time 0.001
+  "Waiting time between asynchronous tasks (second).
+The shorter waiting time increases the load of Emacs. The end
+user can tune this paramter. However, applications should not
+modify it because the applications run on various environments.")
+
+(defvar deferred:queue nil
+  "[internal] The execution queue of deferred objects.
+See the functions `deferred:post-task' and `deferred:worker'.")
+
+(defmacro deferred:pack (a b c)
+  `(cons ,a (cons ,b ,c)))
+
+(defun deferred:schedule-worker ()
+  "[internal] Schedule consuming a deferred task in the execution queue."
+  (run-at-time deferred:tick-time nil 'deferred:worker))
+
+(defun deferred:post-task (d which &optional arg)
+  "[internal] Add a deferred object to the execution queue
+`deferred:queue' and schedule to execute.
+D is a deferred object. WHICH is a symbol, `ok' or `ng'. ARG is
+an argument value for execution of the deferred task."
+  (push (deferred:pack d which arg) deferred:queue)
+  (deferred:message "QUEUE-POST [%s]: %s"
+    (length deferred:queue) (deferred:pack d which arg))
+  (deferred:schedule-worker)
+  d)
+
+(defun deferred:clear-queue ()
+  "Clear the execution queue. For test and debugging."
+  (interactive)
+  (deferred:message "QUEUE-CLEAR [%s -> 0]" (length deferred:queue))
+  (setq deferred:queue nil))
+
+(defun deferred:worker ()
+  "[internal] Consume a deferred task.
+Mainly this function is called by timer asynchronously."
+  (when deferred:queue
+    (let* ((pack (car (last deferred:queue)))
+           (d (car pack))
+           (which (cadr pack))
+           (arg (cddr pack)) value)
+      (setq deferred:queue (nbutlast deferred:queue))
+      (condition-case err
+          (setq value (deferred:exec-task d which arg))
+        (error
+         (deferred:message "ERROR : %s" err)
+         (message "deferred error : %s" err)))
+      value)))
+
+(defun deferred:flush-queue! ()
+  "Call all deferred tasks synchronously. For test and debugging."
+  (let (value)
+    (while deferred:queue
+      (setq value (deferred:worker)))
+    value))
+
+(defun deferred:sync! (d)
+  "Wait for the given deferred task. For test and debugging.
+Error is raised if it is not processed within deferred chain D."
+  (progn
+    (lexical-let ((last-value 'deferred:undefined*)
+                  uncaught-error)
+      (deferred:try
+        (deferred:nextc d
+          (lambda (x) (setq last-value x)))
+        :catch
+        (lambda (err) (setq uncaught-error err)))
+      (while (and (eq 'deferred:undefined* last-value)
+                  (not uncaught-error))
+        (sit-for 0.05)
+        (sleep-for 0.05))
+      (when uncaught-error
+        (deferred:resignal uncaught-error))
+      last-value)))
+
+
+
+;; Struct: deferred
+;;
+;; callback    : a callback function (default `deferred:default-callback')
+;; errorback   : an errorback function (default `deferred:default-errorback')
+;; cancel      : a canceling function (default `deferred:default-cancel')
+;; next        : a next chained deferred object (default nil)
+;; status      : if 'ok or 'ng, this deferred has a result (error) value. (default nil)
+;; value       : saved value (default nil)
+;;
+(defstruct deferred
+  (callback 'deferred:default-callback)
+  (errorback 'deferred:default-errorback)
+  (cancel 'deferred:default-cancel)
+  next status value)
+
+(defun deferred:default-callback (i)
+  "[internal] Default callback function."
+  (identity i))
+
+(defun deferred:default-errorback (err)
+  "[internal] Default errorback function."
+  (deferred:resignal err))
+
+(defun deferred:resignal (err)
+  "[internal] Safely resignal ERR as an Emacs condition.
+
+If ERR is a cons (ERROR-SYMBOL . DATA) where ERROR-SYMBOL has an
+`error-conditions' property, it is re-signaled unchanged. If ERR
+is a string, it is signaled as a generic error using `error'.
+Otherwise, ERR is formatted into a string as if by `print' before
+raising with `error'."
+  (cond ((and (listp err)
+              (symbolp (car err))
+              (get (car err) 'error-conditions))
+         (signal (car err) (cdr err)))
+        ((stringp err)
+         (error "%s" err))
+        (t
+         (error "%S" err))))
+
+(defun deferred:default-cancel (d)
+  "[internal] Default canceling function."
+  (deferred:message "CANCEL : %s" d)
+  (setf (deferred-callback d) 'deferred:default-callback)
+  (setf (deferred-errorback d) 'deferred:default-errorback)
+  (setf (deferred-next d) nil)
+  d)
+
+(defun deferred:exec-task (d which &optional arg)
+  "[internal] Executing deferred task. If the deferred object has
+next deferred task or the return value is a deferred object, this
+function adds the task to the execution queue.
+D is a deferred object. WHICH is a symbol, `ok' or `ng'. ARG is
+an argument value for execution of the deferred task."
+  (deferred:message "EXEC : %s / %s / %s" d which arg)
+  (when (null d) (error "deferred:exec-task was given a nil."))
+  (let ((callback (if (eq which 'ok)
+                      (deferred-callback d)
+                    (deferred-errorback d)))
+        (next-deferred (deferred-next d)))
+    (cond
+     (callback
+      (deferred:condition-case err
+          (let ((value (deferred:call-lambda callback arg)))
+            (cond
+             ((deferred-p value)
+              (deferred:message "WAIT NEST : %s" value)
+              (if next-deferred
+                  (deferred:set-next value next-deferred)
+                value))
+             (t
+              (if next-deferred
+                  (deferred:post-task next-deferred 'ok value)
+                (setf (deferred-status d) 'ok)
+                (setf (deferred-value d) value)
+                value))))
+        (error
+         (cond
+          (next-deferred
+           (deferred:post-task next-deferred 'ng err))
+          (deferred:onerror
+            (deferred:call-lambda deferred:onerror err))
+          (t
+           (deferred:message "ERROR : %S" err)
+           (message "deferred error : %S" err)
+           (setf (deferred-status d) 'ng)
+           (setf (deferred-value d) err)
+           err)))))
+     (t ; <= (null callback)
+      (cond
+       (next-deferred
+        (deferred:exec-task next-deferred which arg))
+       ((eq which 'ok) arg)
+       (t                             ; (eq which 'ng)
+        (deferred:resignal arg)))))))
+
+(defun deferred:set-next (prev next)
+  "[internal] Connect deferred objects."
+  (setf (deferred-next prev) next)
+  (cond
+   ((eq 'ok (deferred-status prev))
+    (setf (deferred-status prev) nil)
+    (let ((ret (deferred:exec-task
+                 next 'ok (deferred-value prev))))
+      (if (deferred-p ret) ret
+        next)))
+   ((eq 'ng (deferred-status prev))
+    (setf (deferred-status prev) nil)
+    (let ((ret (deferred:exec-task next 'ng (deferred-value prev))))
+      (if (deferred-p ret) ret
+        next)))
+   (t
+    next)))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Basic functions for deferred objects
+
+(defun deferred:new (&optional callback)
+  "Create a deferred object."
+  (if callback
+      (make-deferred :callback callback)
+    (make-deferred)))
+
+(defun deferred:callback (d &optional arg)
+  "Start deferred chain with a callback message."
+  (deferred:exec-task d 'ok arg))
+
+(defun deferred:errorback (d &optional arg)
+  "Start deferred chain with an errorback message."
+  (deferred:exec-task d 'ng arg))
+
+(defun deferred:callback-post (d &optional arg)
+  "Add the deferred object to the execution queue."
+  (deferred:post-task d 'ok arg))
+
+(defun deferred:errorback-post (d &optional arg)
+  "Add the deferred object to the execution queue."
+  (deferred:post-task d 'ng arg))
+
+(defun deferred:cancel (d)
+  "Cancel all callbacks and deferred chain in the deferred object."
+  (deferred:message "CANCEL : %s" d)
+  (funcall (deferred-cancel d) d)
+  d)
+
+(defun deferred:status (d)
+  "Return a current status of the deferred object. The returned value means following:
+`ok': the callback was called and waiting for next deferred.
+`ng': the errorback was called and waiting for next deferred.
+ nil: The neither callback nor errorback was not called."
+  (deferred-status d))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Basic utility functions
+
+(defvar deferred:onerror nil
+  "Default error handler. This value is nil or a function that
+  have one argument for the error message.")
+
+(defun deferred:succeed (&optional arg)
+  "Create a synchronous deferred object."
+  (let ((d (deferred:new)))
+    (deferred:exec-task d 'ok arg)
+    d))
+
+(defun deferred:fail (&optional arg)
+  "Create a synchronous deferred object."
+  (let ((d (deferred:new)))
+    (deferred:exec-task d 'ng arg)
+    d))
+
+(defun deferred:next (&optional callback arg)
+  "Create a deferred object and schedule executing. This function
+is a short cut of following code:
+ (deferred:callback-post (deferred:new callback))."
+  (let ((d (if callback
+               (make-deferred :callback callback)
+             (make-deferred))))
+    (deferred:callback-post d arg)
+    d))
+
+(defun deferred:nextc (d callback)
+  "Create a deferred object with OK callback and connect it to the given deferred object."
+  (let ((nd (make-deferred :callback callback)))
+    (deferred:set-next d nd)))
+
+(defun deferred:error (d callback)
+  "Create a deferred object with errorback and connect it to the given deferred object."
+  (let ((nd (make-deferred :errorback callback)))
+    (deferred:set-next d nd)))
+
+(defun deferred:watch (d callback)
+  "Create a deferred object with watch task and connect it to the given deferred object.
+The watch task CALLBACK can not affect deferred chains with
+return values. This function is used in following purposes,
+simulation of try-finally block in asynchronous tasks, progress
+monitoring of tasks."
+  (lexical-let*
+      ((callback callback)
+       (normal (lambda (x) (ignore-errors (deferred:call-lambda callback x)) x))
+       (err    (lambda (e)
+                 (ignore-errors (deferred:call-lambda callback e))
+                 (deferred:resignal e))))
+    (let ((nd (make-deferred :callback normal :errorback err)))
+      (deferred:set-next d nd))))
+
+(defun deferred:wait (msec)
+  "Return a deferred object scheduled at MSEC millisecond later."
+  (lexical-let
+      ((d (deferred:new)) (start-time (float-time)) timer)
+    (deferred:message "WAIT : %s" msec)
+    (setq timer (deferred:setTimeout
+                  (lambda ()
+                    (deferred:exec-task d 'ok
+                      (* 1000.0 (- (float-time) start-time)))
+                    nil) msec))
+    (setf (deferred-cancel d)
+          (lambda (x)
+            (deferred:cancelTimeout timer)
+            (deferred:default-cancel x)))
+    d))
+
+(defun deferred:wait-idle (msec)
+  "Return a deferred object which will run when Emacs has been
+idle for MSEC millisecond."
+  (lexical-let
+      ((d (deferred:new)) (start-time (float-time)) timer)
+    (deferred:message "WAIT-IDLE : %s" msec)
+    (setq timer
+          (deferred:run-with-idle-timer
+            (/ msec 1000.0)
+            (lambda ()
+              (deferred:exec-task d 'ok
+                (* 1000.0 (- (float-time) start-time)))
+              nil)))
+    (setf (deferred-cancel d)
+          (lambda (x)
+            (deferred:cancelTimeout timer)
+            (deferred:default-cancel x)))
+    d))
+
+(defun deferred:call (f &rest args)
+  "Call the given function asynchronously."
+  (lexical-let ((f f) (args args))
+    (deferred:next
+      (lambda (_x)
+        (apply f args)))))
+
+(defun deferred:apply (f &optional args)
+  "Call the given function asynchronously."
+  (lexical-let ((f f) (args args))
+    (deferred:next
+      (lambda (_x)
+        (apply f args)))))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Utility functions
+
+(defun deferred:empty-p (times-or-seq)
+  "[internal] Return non-nil if TIMES-OR-SEQ is the number zero or nil."
+  (or (and (numberp times-or-seq) (<= times-or-seq 0))
+      (and (sequencep times-or-seq) (= (length times-or-seq) 0))))
+
+(defun deferred:loop (times-or-seq func)
+  "Return a iteration deferred object."
+  (deferred:message "LOOP : %s" times-or-seq)
+  (if (deferred:empty-p times-or-seq) (deferred:next)
+    (lexical-let*
+        (items (rd
+                (cond
+                 ((numberp times-or-seq)
+                  (loop for i from 0 below times-or-seq
+                        with ld = (deferred:next)
+                        do
+                        (push ld items)
+                        (setq ld
+                              (lexical-let ((i i) (func func))
+                                (deferred:nextc ld (lambda (_x) (deferred:call-lambda func i)))))
+                        finally return ld))
+                 ((sequencep times-or-seq)
+                  (loop for i in (append times-or-seq nil) ; seq->list
+                        with ld = (deferred:next)
+                        do
+                        (push ld items)
+                        (setq ld
+                              (lexical-let ((i i) (func func))
+                                (deferred:nextc ld (lambda (_x) (deferred:call-lambda func i)))))
+                        finally return ld)))))
+      (setf (deferred-cancel rd)
+            (lambda (x) (deferred:default-cancel x)
+              (loop for i in items
+                    do (deferred:cancel i))))
+      rd)))
+
+(defun deferred:trans-multi-args (args self-func list-func main-func)
+  "[internal] Check the argument values and dispatch to methods."
+  (cond
+   ((and (= 1 (length args)) (consp (car args)) (not (functionp (car args))))
+    (let ((lst (car args)))
+      (cond
+       ((or (null lst) (null (car lst)))
+        (deferred:next))
+       ((deferred:aand lst (car it) (or (functionp it) (deferred-p it)))
+        ;; a list of deferred objects
+        (funcall list-func lst))
+       ((deferred:aand lst (consp it))
+        ;; an alist of deferred objects
+        (funcall main-func lst))
+       (t (error "Wrong argument type. %s" args)))))
+   (t (funcall self-func args))))
+
+(defun deferred:parallel-array-to-alist (lst)
+  "[internal] Translation array to alist."
+  (loop for d in lst
+        for i from 0 below (length lst)
+        collect (cons i d)))
+
+(defun deferred:parallel-alist-to-array (alst)
+  "[internal] Translation alist to array."
+  (loop for pair in
+        (sort alst (lambda (x y)
+                     (< (car x) (car y))))
+        collect (cdr pair)))
+
+(defun deferred:parallel-func-to-deferred (alst)
+  "[internal] Normalization for parallel and earlier arguments."
+  (loop for pair in alst
+        for d = (cdr pair)
+        collect
+        (progn
+          (unless (deferred-p d)
+            (setf (cdr pair) (deferred:next d)))
+          pair)))
+
+(defun deferred:parallel-main (alst)
+  "[internal] Deferred alist implementation for `deferred:parallel'. "
+  (deferred:message "PARALLEL<KEY . VALUE>" )
+  (lexical-let ((nd (deferred:new))
+                (len (length alst))
+                values)
+    (loop for pair in
+          (deferred:parallel-func-to-deferred alst)
+          with cd ; current child deferred
+          do
+          (lexical-let ((name (car pair)))
+            (setq cd
+                  (deferred:nextc (cdr pair)
+                    (lambda (x)
+                      (push (cons name x) values)
+                      (deferred:message "PARALLEL VALUE [%s/%s] %s"
+                        (length values) len (cons name x))
+                      (when (= len (length values))
+                        (deferred:message "PARALLEL COLLECTED")
+                        (deferred:post-task nd 'ok (nreverse values)))
+                      nil)))
+            (deferred:error cd
+              (lambda (e)
+                (push (cons name e) values)
+                (deferred:message "PARALLEL ERROR [%s/%s] %s"
+                  (length values) len (cons name e))
+                (when (= (length values) len)
+                  (deferred:message "PARALLEL COLLECTED")
+                  (deferred:post-task nd 'ok (nreverse values)))
+                nil))))
+    nd))
+
+(defun deferred:parallel-list (lst)
+  "[internal] Deferred list implementation for `deferred:parallel'. "
+  (deferred:message "PARALLEL<LIST>" )
+  (lexical-let*
+      ((pd (deferred:parallel-main (deferred:parallel-array-to-alist lst)))
+       (rd (deferred:nextc pd 'deferred:parallel-alist-to-array)))
+    (setf (deferred-cancel rd)
+          (lambda (x) (deferred:default-cancel x)
+            (deferred:cancel pd)))
+    rd))
+
+(defun deferred:parallel (&rest args)
+  "Return a deferred object that calls given deferred objects or
+functions in parallel and wait for all callbacks. The following
+deferred task will be called with an array of the return
+values. ARGS can be a list or an alist of deferred objects or
+functions."
+  (deferred:message "PARALLEL : %s" args)
+  (deferred:trans-multi-args args
+    'deferred:parallel 'deferred:parallel-list 'deferred:parallel-main))
+
+(defun deferred:earlier-main (alst)
+  "[internal] Deferred alist implementation for `deferred:earlier'. "
+  (deferred:message "EARLIER<KEY . VALUE>" )
+  (lexical-let ((nd (deferred:new))
+                (len (length alst))
+                value results)
+    (loop for pair in
+          (deferred:parallel-func-to-deferred alst)
+          with cd ; current child deferred
+          do
+          (lexical-let ((name (car pair)))
+            (setq cd
+                  (deferred:nextc (cdr pair)
+                    (lambda (x)
+                      (push (cons name x) results)
+                      (cond
+                       ((null value)
+                        (setq value (cons name x))
+                        (deferred:message "EARLIER VALUE %s" (cons name value))
+                        (deferred:post-task nd 'ok value))
+                       (t
+                        (deferred:message "EARLIER MISS [%s/%s] %s" (length results) len (cons name value))
+                        (when (eql (length results) len)
+                          (deferred:message "EARLIER COLLECTED"))))
+                      nil)))
+            (deferred:error cd
+              (lambda (e)
+                (push (cons name e) results)
+                (deferred:message "EARLIER ERROR [%s/%s] %s" (length results) len (cons name e))
+                (when (and (eql (length results) len) (null value))
+                  (deferred:message "EARLIER FAILED")
+                  (deferred:post-task nd 'ok nil))
+                nil))))
+    nd))
+
+(defun deferred:earlier-list (lst)
+  "[internal] Deferred list implementation for `deferred:earlier'. "
+  (deferred:message "EARLIER<LIST>" )
+  (lexical-let*
+      ((pd (deferred:earlier-main (deferred:parallel-array-to-alist lst)))
+       (rd (deferred:nextc pd (lambda (x) (cdr x)))))
+    (setf (deferred-cancel rd)
+          (lambda (x) (deferred:default-cancel x)
+            (deferred:cancel pd)))
+    rd))
+
+
+(defun deferred:earlier (&rest args)
+  "Return a deferred object that calls given deferred objects or
+functions in parallel and wait for the first callback. The
+following deferred task will be called with the first return
+value. ARGS can be a list or an alist of deferred objects or
+functions."
+  (deferred:message "EARLIER : %s" args)
+  (deferred:trans-multi-args args
+    'deferred:earlier 'deferred:earlier-list 'deferred:earlier-main))
+
+(defmacro deferred:timeout (timeout-msec timeout-form d)
+  "Time out macro on a deferred task D.  If the deferred task D
+does not complete within TIMEOUT-MSEC, this macro cancels the
+deferred task and return the TIMEOUT-FORM."
+  `(deferred:earlier
+     (deferred:nextc (deferred:wait ,timeout-msec)
+       (lambda (x) ,timeout-form))
+     ,d))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Application functions
+
+(defvar deferred:uid 0 "[internal] Sequence number for some utilities. See the function `deferred:uid'.")
+
+(defun deferred:uid ()
+  "[internal] Generate a sequence number."
+  (incf deferred:uid))
+
+(defun deferred:buffer-string (strformat buf)
+  "[internal] Return a string in the buffer with the given format."
+  (format strformat
+          (with-current-buffer buf (buffer-string))))
+
+(defun deferred:process (command &rest args)
+  "A deferred wrapper of `start-process'. Return a deferred
+object. The process name and buffer name of the argument of the
+`start-process' are generated by this function automatically.
+The next deferred object receives stdout string from the command
+process."
+  (deferred:process-gen 'start-process command args))
+
+(defun deferred:process-shell (command &rest args)
+  "A deferred wrapper of `start-process-shell-command'. Return a deferred
+object. The process name and buffer name of the argument of the
+`start-process-shell-command' are generated by this function automatically.
+The next deferred object receives stdout string from the command
+process."
+  (deferred:process-gen 'start-process-shell-command command args))
+
+(defun deferred:process-buffer (command &rest args)
+  "A deferred wrapper of `start-process'. Return a deferred
+object. The process name and buffer name of the argument of the
+`start-process' are generated by this function automatically.
+The next deferred object receives stdout buffer from the command
+process."
+  (deferred:process-buffer-gen 'start-process command args))
+
+(defun deferred:process-shell-buffer (command &rest args)
+  "A deferred wrapper of `start-process-shell-command'. Return a deferred
+object. The process name and buffer name of the argument of the
+`start-process-shell-command' are generated by this function automatically.
+The next deferred object receives stdout buffer from the command
+process."
+  (deferred:process-buffer-gen 'start-process-shell-command command args))
+
+(defun deferred:process-gen (f command args)
+  "[internal]"
+  (lexical-let
+      ((pd (deferred:process-buffer-gen f command args)) d)
+    (setq d (deferred:nextc pd
+              (lambda (buf)
+                (prog1
+                    (with-current-buffer buf (buffer-string))
+                  (kill-buffer buf)))))
+    (setf (deferred-cancel d)
+          (lambda (_x)
+            (deferred:default-cancel d)
+            (deferred:default-cancel pd)))
+    d))
+
+(defun deferred:process-buffer-gen (f command args)
+  "[internal]"
+  (let ((d (deferred:next)) (uid (deferred:uid)))
+    (lexical-let
+        ((f f) (command command) (args args)
+         (proc-name (format "*deferred:*%s*:%s" command uid))
+         (buf-name (format " *deferred:*%s*:%s" command uid))
+         (pwd default-directory)
+         (env process-environment)
+         (con-type process-connection-type)
+         (nd (deferred:new)) proc-buf proc)
+      (deferred:nextc d
+        (lambda (_x)
+          (setq proc-buf (get-buffer-create buf-name))
+          (condition-case err
+              (let ((default-directory pwd)
+                    (process-environment env)
+                    (process-connection-type con-type))
+                (setq proc
+                      (if (null (car args))
+                          (apply f proc-name buf-name command nil)
+                        (apply f proc-name buf-name command args)))
+                (set-process-sentinel
+                 proc
+                 (lambda (_proc event)
+                   (cond
+                    ((string-match "exited abnormally" event)
+                     (let ((msg (if (buffer-live-p proc-buf)
+                                    (format "Process [%s] exited abnormally : %s"
+                                            command
+                                            (with-current-buffer proc-buf (buffer-string)))
+                                  (concat "Process exited abnormally: " proc-name))))
+                       (kill-buffer proc-buf)
+                       (deferred:post-task nd 'ng msg)))
+                    ((equal event "finished\n")
+                       (deferred:post-task nd 'ok proc-buf)))))
+                (setf (deferred-cancel nd)
+                      (lambda (x) (deferred:default-cancel x)
+                        (when proc
+                          (kill-process proc)
+                          (kill-buffer proc-buf)))))
+            (error (deferred:post-task nd 'ng err)))
+          nil))
+      nd)))
+
+(defmacro deferred:processc (d command &rest args)
+  "Process chain of `deferred:process'."
+  `(deferred:nextc ,d
+    (lambda (,(gensym)) (deferred:process ,command ,@args))))
+
+(defmacro deferred:process-bufferc (d command &rest args)
+  "Process chain of `deferred:process-buffer'."
+  `(deferred:nextc ,d
+     (lambda (,(gensym)) (deferred:process-buffer ,command ,@args))))
+
+(defmacro deferred:process-shellc (d command &rest args)
+  "Process chain of `deferred:process'."
+  `(deferred:nextc ,d
+    (lambda (,(gensym)) (deferred:process-shell ,command ,@args))))
+
+(defmacro deferred:process-shell-bufferc (d command &rest args)
+  "Process chain of `deferred:process-buffer'."
+  `(deferred:nextc ,d
+     (lambda (,(gensym)) (deferred:process-shell-buffer ,command ,@args))))
+
+(eval-after-load "url"
+  ;; for url package
+  ;; TODO: proxy, charaset
+  ;; List of gloabl variables to preserve and restore before url-retrieve call
+  '(lexical-let ((url-global-variables '(url-request-data
+                                         url-request-method
+                                         url-request-extra-headers)))
+
+     (defun deferred:url-retrieve (url &optional cbargs silent inhibit-cookies)
+       "A wrapper function for url-retrieve. The next deferred
+object receives the buffer object that URL will load
+into. Values of dynamically bound 'url-request-data', 'url-request-method' and
+'url-request-extra-headers' are passed to url-retrieve call."
+       (lexical-let ((nd (deferred:new)) (url url)
+                     (cbargs cbargs) (silent silent) (inhibit-cookies inhibit-cookies) buf
+                     (local-values (mapcar (lambda (symbol) (symbol-value symbol)) url-global-variables)))
+         (deferred:next
+           (lambda (_x)
+             (progv url-global-variables local-values
+               (condition-case err
+                   (setq buf
+                         (url-retrieve
+                          url (lambda (_xx) (deferred:post-task nd 'ok buf))
+                          cbargs silent inhibit-cookies))
+                 (error (deferred:post-task nd 'ng err)))
+             nil)))
+         (setf (deferred-cancel nd)
+               (lambda (_x)
+                 (when (buffer-live-p buf)
+                   (kill-buffer buf))))
+         nd))
+
+     (defun deferred:url-delete-header (buf)
+       (with-current-buffer buf
+         (let ((pos (url-http-symbol-value-in-buffer
+                     'url-http-end-of-headers buf)))
+           (when pos
+             (delete-region (point-min) (1+ pos)))))
+       buf)
+
+     (defun deferred:url-delete-buffer (buf)
+       (when (and buf (buffer-live-p buf))
+         (kill-buffer buf))
+       nil)
+
+     (defun deferred:url-get (url &optional params &rest args)
+       "Perform a HTTP GET method with `url-retrieve'. PARAMS is
+a parameter list of (key . value) or key. ARGS will be appended
+to deferred:url-retrieve args list. The next deferred
+object receives the buffer object that URL will load into."
+       (when params
+         (setq url
+               (concat url "?" (deferred:url-param-serialize params))))
+       (let ((d (deferred:$
+                  (apply 'deferred:url-retrieve url args)
+                  (deferred:nextc it 'deferred:url-delete-header))))
+         (deferred:set-next
+           d (deferred:new 'deferred:url-delete-buffer))
+         d))
+
+     (defun deferred:url-post (url &optional params &rest args)
+       "Perform a HTTP POST method with `url-retrieve'. PARAMS is
+a parameter list of (key . value) or key. ARGS will be appended
+to deferred:url-retrieve args list. The next deferred
+object receives the buffer object that URL will load into."
+       (let ((url-request-method "POST")
+             (url-request-extra-headers
+              (append url-request-extra-headers
+                      '(("Content-Type" . "application/x-www-form-urlencoded"))))
+             (url-request-data (deferred:url-param-serialize params)))
+         (let ((d (deferred:$
+                    (apply 'deferred:url-retrieve url args)
+                    (deferred:nextc it 'deferred:url-delete-header))))
+           (deferred:set-next
+             d (deferred:new 'deferred:url-delete-buffer))
+           d)))
+
+     (defun deferred:url-escape (val)
+       "[internal] Return a new string that is VAL URI-encoded."
+       (unless (stringp val)
+         (setq val (format "%s" val)))
+       (url-hexify-string
+        (encode-coding-string val 'utf-8)))
+
+     (defun deferred:url-param-serialize (params)
+       "[internal] Serialize a list of (key . value) cons cells
+into a query string."
+       (when params
+         (mapconcat
+          'identity
+          (loop for p in params
+                collect
+                (cond
+                 ((consp p)
+                  (concat
+                   (deferred:url-escape (car p)) "="
+                   (deferred:url-escape (cdr p))))
+                 (t
+                  (deferred:url-escape p))))
+          "&")))
+     ))
+
+
+(provide 'deferred)
+;;; deferred.el ends here
diff --git a/emacs.d/elpa/editorconfig-0.4/editorconfig-autoloads.el b/emacs.d/elpa/editorconfig-0.4/editorconfig-autoloads.el
new file mode 100644
index 0000000..6c34668
--- /dev/null
+++ b/emacs.d/elpa/editorconfig-0.4/editorconfig-autoloads.el
@@ -0,0 +1,11 @@
+;;; editorconfig-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; editorconfig-autoloads.el ends here
diff --git a/emacs.d/elpa/editorconfig-0.4/editorconfig.el b/emacs.d/elpa/editorconfig-0.4/editorconfig.el
new file mode 100644
index 0000000..5dcf621
--- /dev/null
+++ b/emacs.d/elpa/editorconfig-0.4/editorconfig.el
@@ -0,0 +1,276 @@
+;;; editorconfig.el --- EditorConfig Emacs extension
+
+;; Copyright (C) 2011-2014 EditorConfig Team
+
+;; Author: EditorConfig Team <editorconfig@googlegroups.com>
+;; Version: 0.4
+;; URL: http://github.com/editorconfig/editorconfig-emacs#readme
+
+;; See
+;; http://github.com/editorconfig/editorconfig-emacs/graphs/contributors
+;; or the CONTRIBUTORS file for the list of contributors.
+
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions are met:
+;;
+;; 1. Redistributions of source code must retain the above copyright notice,
+;;    this list of conditions and the following disclaimer.
+;; 2. Redistributions in binary form must reproduce the above copyright notice,
+;;    this list of conditions and the following disclaimer in the documentation
+;;    and/or other materials provided with the distribution.
+
+;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+;; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+;; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+;; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;; POSSIBILITY OF SUCH DAMAGE.
+
+;;; Commentary:
+
+;; EditorConfig helps developers define and maintain consistent
+;; coding styles between different editors and IDEs.
+
+;; The EditorConfig project consists of a file format for defining
+;; coding styles and a collection of text editor plugins that enable
+;; editors to read the file format and adhere to defined styles.
+;; EditorConfig files are easily readable and they work nicely with
+;; version control systems.
+
+;;; Code:
+
+(defcustom edconf-exec-path
+  "editorconfig"
+  "EditorConfig command"
+  :type 'string
+  :group 'editorconfig)
+
+(defcustom edconf-indentation-alist
+  '((emacs-lisp-mode lisp-indent-offset)
+    (lisp-mode lisp-indent-offset)
+    (c-mode c-basic-offset)
+    (c++-mode c-basic-offset)
+    (objc-mode c-basic-offset)
+    (java-mode c-basic-offset)
+    (idl-mode c-basic-offset)
+    (pike-mode c-basic-offset)
+    (awk-mode c-basic-offset)
+    (cmake-mode cmake-tab-width)
+    (coffee-mode coffee-tab-width)
+    (cperl-mode cperl-indent-level)
+    (css-mode css-indent-offset)
+    (haskell-mode haskell-indent-spaces
+                  haskell-indent-offset
+                  shm-indent-spaces)
+    (js-mode js-indent-level)
+    (json-mode js-indent-level)
+    (js2-mode js2-basic-offset)
+    (js3-mode js3-indent-level)
+    (perl-mode perl-indent-level)
+    (python-mode . edconf-set-indentation/python-mode)
+    (ruby-mode ruby-indent-level)
+    (sh-mode sh-basic-offset sh-indentation)
+    (nxml-mode nxml-child-indent (nxml-attribute-indent . 2))
+    (sgml-mode sgml-basic-offset)
+    (livescript-mode livescript-tab-width)
+    (mustache-mode mustache-basic-offset)
+    (scala-mode scala-indent:step)
+    (groovy-mode c-basic-offset)
+    (latex-mode . edconf-set-indentation/latex-mode)
+    (web-mode (web-mode-indent-style . (lambda (size) 2))
+              web-mode-markup-indent-offset
+              web-mode-css-indent-offset
+              web-mode-code-indent-offset
+              web-mode-script-padding
+              web-mode-style-padding))
+  "Alist of indentation setting methods by modes.
+
+Each element looks like (MODE . FUNCTION) or (MODE . INDENT-SPEC-LIST).
+
+If FUNCTION is provided, it will be called when setting the indentation.  The
+indent size will be passed.
+
+If INDENT-SPEC-LIST is provided, each element of it must have one of the
+following forms:
+
+ 1. VARIABLE
+
+    It means (VARIABLE . 1).
+
+ 2. (VARIABLE . SPEC)
+
+    Setting VARIABLE according to the type of SPEC:
+
+      - Integer
+
+        The value is (* SPEC INDENT-SIZE);
+
+      - Function
+
+        The value is (funcall SPEC INDENT-SIZE);
+
+      - Any other type.
+
+        The value is SPEC.
+
+NOTE: Only the **buffer local** value of VARIABLE will be set."
+  :type '(alist :key-type symbol :value-type sexp)
+  :risky t
+  :group 'editorconfig)
+
+(defun edconf-string-integer-p (string)
+  "Whether a string representing integer"
+  (if (stringp string)
+    (string-match-p "\\`[0-9]+\\'" string)
+    nil))
+
+(defun edconf-set-indentation/python-mode (size)
+  (set (make-local-variable (if (or (> emacs-major-version 24)
+                                    (and (= emacs-major-version 24)
+                                         (>= emacs-minor-version 3)))
+                                'python-indent-offset
+                              'python-indent))
+       size)
+  ;; For https://launchpad.net/python-mode
+  (when (boundp 'py-indent-offset)
+    (set (make-local-variable 'py-indent-offset) size)))
+
+(defun edconf-set-indentation/latex-mode (size)
+  (set (make-local-variable 'tex-indent-basic) size)
+  (set (make-local-variable 'tex-indent-item) size)
+  (set (make-local-variable 'tex-indent-arg) (* 2 size))
+  ;; For AUCTeX
+  (when (boundp 'TeX-brace-indent-level)
+    (set (make-local-variable 'TeX-brace-indent-level) size))
+  (when (boundp 'LaTeX-indent-level)
+    (set (make-local-variable 'LaTeX-indent-level) size))
+  (when (boundp 'LaTeX-item-indent)
+    (set (make-local-variable 'LaTeX-item-indent) (- size))))
+
+(defun edconf-set-indentation (style &optional size tab_width)
+  "Set indentation type from given style and size"
+  (make-local-variable 'indent-tabs-mode)
+  (make-local-variable 'tab-width)
+  (if (edconf-string-integer-p size)
+    (setq size (string-to-number size))
+    (when (not (equal size "tab")) (setq size nil)))
+  (setq tab-width (cond (tab_width (string-to-number tab_width))
+                        ((numberp size) size)
+                        (t tab-width)))
+  (when (equal size "tab")
+    (setq size tab-width))
+  (cond ((equal style "space")
+         (setq indent-tabs-mode nil))
+        ((equal style "tab")
+         (setq indent-tabs-mode t)))
+  (when size
+    (let ((parent major-mode)
+          entry)
+      ;; Find the closet parent mode of `major-mode' in
+      ;; `edconf-indentation-alist'.
+      (while (and (not (setq entry (assoc parent edconf-indentation-alist)))
+                  (setq parent (get parent 'derived-mode-parent))))
+      (when entry
+        (let ((fn-or-list (cdr entry)))
+          (cond ((functionp fn-or-list) (funcall fn-or-list size))
+                ((listp fn-or-list)
+                 (dolist (elem fn-or-list)
+                   (cond ((symbolp elem) (set (make-local-variable elem) size))
+                         ((consp elem)
+                          (let ((spec (cdr elem)))
+                            (set (make-local-variable (car elem))
+                                 (cond ((functionp spec) (funcall spec size))
+                                       ((integerp spec) (* spec size))
+                                       (t spec))))))))))))))
+
+(defun edconf-set-line-ending (end-of-line)
+  "Set line ending style to CR, LF, or CRLF"
+  (set-buffer-file-coding-system
+   (cond
+    ((equal end-of-line "lf") 'undecided-unix)
+    ((equal end-of-line "cr") 'undecided-mac)
+    ((equal end-of-line "crlf") 'undecided-dos)
+    (t 'undecided))
+   nil t))
+
+(defun edconf-set-trailing-nl (final-newline)
+  (cond
+   ((equal final-newline "true")
+    ;; keep prefs around how/when the nl is added, if set - otherwise add on save
+    (set      (make-local-variable 'require-final-newline)      (or require-final-newline t))
+    (set      (make-local-variable 'mode-require-final-newline) (or mode-require-final-newline t)))
+   ((equal final-newline "false")
+    ;; FIXME: Add functionality for actually REMOVING any trailing newlines here!
+    ;;        (rather than just making sure we don't automagically ADD a new one)
+    (set      (make-local-variable 'require-final-newline) nil)
+    (set      (make-local-variable 'mode-require-final-newline) nil))))
+
+(defun edconf-set-trailing-ws (trim-trailing-ws)
+  "set up trimming of trailing whitespace at end of lines"
+  (make-local-variable 'write-file-functions) ;; just current buffer
+  (when (equal trim-trailing-ws "true")
+    ;; when true we push delete-trailing-whitespace (emacs > 21)
+    ;; to write-file-functions
+    (add-to-list
+     'write-file-functions
+     'delete-trailing-whitespace))
+  (when (equal trim-trailing-ws "false")
+    ;; when false we remove every delete-trailing-whitespace
+    ;; from write-file-functions
+    (setq
+     write-file-functions
+     (delete
+      'delete-trailing-whitespace
+      write-file-functions))))
+
+(defun edconf-set-line-length (length)
+  "set the max line length (fill-column)"
+  (when (edconf-string-integer-p length)
+    (set-fill-column (string-to-number length))))
+
+(defun edconf-get-properties ()
+  "Call EditorConfig core and return output"
+  (let ((oldbuf (current-buffer)))
+    (call-process edconf-exec-path nil "ecbuffer" nil (buffer-file-name oldbuf))
+    (set-buffer (get-buffer "ecbuffer"))
+    (let (props-string)
+      (setq props-string (buffer-string))
+      (set-buffer oldbuf)
+      (kill-buffer (get-buffer "ecbuffer"))
+      props-string)))
+
+(defun edconf-parse-properties (props-string)
+  "Create properties hash table from string of properties"
+  (let (props-list properties)
+    (setq props-list (split-string props-string "\n")
+          properties (make-hash-table :test 'equal))
+    (dolist (prop props-list properties)
+      (let ((key-val (split-string prop " *= *")))
+        (when (> (length key-val) 1)
+          (let ((key (intern (car key-val)))
+                (val (mapconcat 'identity (cdr key-val) "")))
+            (puthash key val properties)))))))
+
+;;;###autoload
+(defun edconf-find-file-hook ()
+  (when (executable-find edconf-exec-path)
+    (let ((props (edconf-parse-properties (edconf-get-properties))))
+      (edconf-set-indentation (gethash 'indent_style props)
+                              (gethash 'indent_size props)
+                              (gethash 'tab_width props))
+      (edconf-set-line-ending (gethash 'end_of_line props))
+      (edconf-set-trailing-nl (gethash 'insert_final_newline props))
+      (edconf-set-trailing-ws (gethash 'trim_trailing_whitespace props))
+      (edconf-set-line-length (gethash 'max_line_length props)))))
+
+;;;###autoload
+(add-hook 'find-file-hook 'edconf-find-file-hook)
+
+(provide 'editorconfig)
+
+;;; editorconfig.el ends here
diff --git a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-deprecated.el b/emacs.d/elpa/elixir-mode-20150618.1413/elixir-deprecated.el
deleted file mode 100644
index 1767ff2..0000000
--- a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-deprecated.el
+++ /dev/null
@@ -1,63 +0,0 @@
-;;; elixir-deprecated.el --- Functionality to display deprecated messages
-
-;; Copyright 2011-2014 secondplanet
-;;           2013-2014 Matt DeBoard, Samuel Tonini, Andreas Fuchs
-;; Authors: Humza Yaqoob,
-;;          Andreas Fuchs <asf@boinkor.net>,
-;;          Matt DeBoard
-;;          Samuel Tonini <tonini.samuel@gmail.com>
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;  Functionality to display deprecated messages
-
-;;; Code:
-
-(defface elixir-deprecated--warning-face
-  '((t (:inherit font-lock-variable-name-face :bold t :foreground "red")))
-  ""
-  :group 'elixir-deprecated)
-
-(defface elixir-deprecated--function-face
-  '((t (:inherit font-lock-variable-name-face :bold t :foreground "green")))
-  ""
-  :group 'elixir-deprecated)
-
-(defun elixir-deprecated--warning (function-name message)
-  (let ((buffer (get-buffer "*Warnings*")))
-    (when buffer
-      (kill-buffer buffer))
-    (display-warning :deprecated
-		     (concat "\n\n"
-			     (propertize "DEPRECATION WARNING: "
-					 'face 'elixir-deprecated--warning-face)
-			     (propertize (format "[ %s ]\n\n" function-name)
-					 'face 'elixir-deprecated--function-face)
-			     message)) :warning))
-
-;; DEPRECATED MESSAGES FOR RELEASE 3.0.0
-
-(defvar elixir-deprecated--alchemist-message "This function will be removed in version 3.0.0.\n
-Please use the package *alchemist.el* for compilation functionality.\n
-Alchemist: http://www.github.com/tonini/alchemist.el")
-
-(defun elixir-deprecated-use-alchemist (function-name)
-  (elixir-deprecated--warning function-name
-			      elixir-deprecated--alchemist-message))
-
-(provide 'elixir-deprecated)
diff --git a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode-autoloads.el b/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode-autoloads.el
deleted file mode 100644
index 5b0946b..0000000
--- a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode-autoloads.el
+++ /dev/null
@@ -1,76 +0,0 @@
-;;; elixir-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "elixir-mode" "elixir-mode.el" (21898 47980
-;;;;;;  0 0))
-;;; Generated autoloads from elixir-mode.el
-
-(autoload 'elixir-mode-iex "elixir-mode" "\
-Elixir mode interactive REPL.
-Optional argument ARGS-P .
-
-\(fn &optional ARGS-P)" t nil)
-
-(autoload 'elixir-mode-open-modegithub "elixir-mode" "\
-Elixir mode open GitHub page.
-
-\(fn)" t nil)
-
-(autoload 'elixir-mode-open-elixir-home "elixir-mode" "\
-Elixir mode go to language home.
-
-\(fn)" t nil)
-
-(autoload 'elixir-mode-open-docs-master "elixir-mode" "\
-Elixir mode go to master documentation.
-
-\(fn)" t nil)
-
-(autoload 'elixir-mode-open-docs-stable "elixir-mode" "\
-Elixir mode go to stable documentation.
-
-\(fn)" t nil)
-
-(autoload 'elixir-mode-version "elixir-mode" "\
-Get the Elixir-Mode version as string.
-
-If called interactively or if SHOW-VERSION is non-nil, show the
-version in the echo area and the messages buffer.
-
-The returned string includes both, the version from package.el
-and the library version, if both a present and different.
-
-If the version number could not be determined, signal an error,
-if called interactively, or if SHOW-VERSION is non-nil, otherwise
-just return nil.
-
-\(fn &optional SHOW-VERSION)" t nil)
-
-(autoload 'elixir-mode "elixir-mode" "\
-Major mode for editing Elixir code.
-
-\\{elixir-mode-map}
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
-
-(add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
-
-(add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode))
-
-;;;***
-
-;;;### (autoloads nil nil ("elixir-deprecated.el" "elixir-mode-pkg.el"
-;;;;;;  "elixir-smie.el") (21898 47980 859329 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; elixir-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode-pkg.el b/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode-pkg.el
deleted file mode 100644
index d52238a..0000000
--- a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode-pkg.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(define-package "elixir-mode" "20150618.1413" "Major mode for editing Elixir files" 'nil :url "https://github.com/elixir-lang/emacs-elixir" :keywords
-  '("languages" "elixir"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode.el b/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode.el
deleted file mode 100644
index c7c4b31..0000000
--- a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-mode.el
+++ /dev/null
@@ -1,693 +0,0 @@
-;;; elixir-mode.el --- Major mode for editing Elixir files
-
-;; Copyright 2011-2015 secondplanet
-;;           2013-2015 Samuel Tonini, Matt DeBoard, Andreas Fuchs
-;; Authors: Humza Yaqoob,
-;;          Andreas Fuchs <asf@boinkor.net>,
-;;          Matt DeBoard
-;;          Samuel Tonini <tonini.samuel@gmail.com>
-
-;; URL: https://github.com/elixir-lang/emacs-elixir
-;; Created: Mon Nov 7 2011
-;; Keywords: languages elixir
-;; Version: 2.2.5
-
-;; This file is not a part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, 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, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-;;; Commentary:
-
-;;  Provides font-locking, indentation and navigation support
-;;  for the Elixir programming language.
-
-;;; Code:
-
-(require 'comint)             ; for interactive REPL
-(require 'easymenu)           ; for menubar features
-
-(require 'elixir-smie)				; syntax and indentation support
-(require 'elixir-deprecated)	; deprecated messages
-
-(defgroup elixir-mode nil
-  "Provides font-locking, indentation and navigation support
-for the Elixir programming language."
-  :prefix "elixir-mode-"
-  :group 'applications
-  :link '(url-link :tag "Github" "https://github.com/elixir-lang/emacs-elixir")
-  :link '(emacs-commentary-link :tag "Commentary" "elixir-mode"))
-
-(defvar elixir-mqode--website-url
-  "http://elixir-lang.org")
-
-(defvar elixir-mode-hook nil)
-
-(defvar elixir-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c ,r") 'elixir-mode-eval-on-region)
-    (define-key map (kbd "C-c ,c") 'elixir-mode-eval-on-current-line)
-    (define-key map (kbd "C-c ,b") 'elixir-mode-eval-on-current-buffer)
-    (define-key map (kbd "C-c ,a") 'elixir-mode-string-to-quoted-on-region)
-    (define-key map (kbd "C-c ,l") 'elixir-mode-string-to-quoted-on-current-line)
-    map)
-  "Keymap used in `elixir-mode'.")
-
-(defvar elixir-imenu-generic-expression
-  '(("Modules" "^\\s-*defmodule[ \n\t]+\\([A-Z][A-Za-z0-9._]+\\)\\s-+.*$" 1)
-    ("Public Functions" "^\\s-*def[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
-    ("Private Functions" "^\\s-*defp[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
-    ("Public Macros" "^\\s-*defmacro[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
-    ("Private Macros" "^\\s-*defmacrop[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
-    ("Delegates" "^\\s-*defdelegate[ \n\t]+\\([a-z0-9_]+\\)\\(([^)]*)\\)*.*" 1)
-    ("Overridables" "^\\s-*defoverridable[ \n\t]+\\([a-z0-9_]+\\)\\(([^)]*)\\)*.*" 1)
-    ("Tests" "^\\s-*test[ \t\n]+\"?\\(:?[a-z0-9_@+() \t-]+\\)\"?[ \t\n]+.*" 1))
-  "Imenu pattern for `elixir-mode'.")
-
-(defgroup elixir nil
-  "Elixir major mode."
-  :group 'languages)
-
-(defcustom elixir-compiler-command "elixirc"
-  "Elixir mode command to compile code.  Must be in your path."
-  :type 'string
-  :group 'elixir)
-
-(defcustom elixir-mode-command "elixir"
-  "The command for elixir."
-  :type 'string
-  :group 'elixir)
-
-(defcustom elixir-iex-command "iex"
-  "Elixir mode command for interactive REPL.  Must be in your path."
-  :type 'string
-  :group 'elixir)
-
-(defcustom elixir-mode-cygwin-paths t
-  "Elixir mode use Cygwin style paths on Windows operating systems."
-  :type 'boolean
-  :group 'elixir)
-
-(defcustom elixir-mode-cygwin-prefix "/cygdrive/C"
-  "Elixir mode Cygwin prefix."
-  :type 'string
-  :group 'elixir)
-
-(defvar elixir-mode--eval-filename "elixir-mode-tmp-eval-file.exs")
-
-(defvar elixir-quoted--buffer-name "*elixir-quoted*")
-
-(defvar elixir-basic-offset 2)
-(defvar elixir-key-label-offset 0)
-(defvar elixir-match-label-offset 2)
-
-(defvar elixir-operator-face 'elixir-operator-face)
-(defface elixir-operator-face
-  '((((class color) (min-colors 88) (background light))
-     :foreground "darkred")
-    (((class color) (background dark))
-     (:foreground "lemonchiffon1"))
-    (t nil))
-  "For use with operators."
-  :group 'font-lock-faces)
-
-(defvar elixir-negation-face 'elixir-negation-face)
-(defface elixir-negation-face
-  '((((class color) (min-colors 88) (background light))
-     :foreground "#ff4500")
-    (((class color) (background dark))
-     (:foreground "#ff4500"))
-    (t nil))
-  "For use with standalone \"?\" to indicate code point."
-  :group 'font-lock-faces)
-
-(defvar elixir-attribute-face 'elixir-attribute-face)
-(defface elixir-attribute-face
-  '((((class color) (min-colors 88) (background light))
-     :foreground "MediumPurple4")
-    (((class color) (background dark))
-     (:foreground "thistle"))
-    (t nil))
-  "For use with module attribute tokens."
-  :group 'font-lock-faces)
-
-(defvar elixir-atom-face 'elixir-atom-face)
-(defface elixir-atom-face
-  '((((class color) (min-colors 88) (background light))
-     :foreground "RoyalBlue4")
-    (((class color) (background dark))
-     (:foreground "light sky blue"))
-    (t nil))
-  "For use with atoms & map keys."
-  :group 'font-lock-faces)
-
-(eval-when-compile
-  (defconst elixir-rx-constituents
-    `(
-      (string-delimiter . ,(rx (and
-                                ;; Match even number of backslashes.
-                                (or (not (any ?\\ ?\' ?\")) point
-                                    ;; Quotes might be preceded by escaped quote
-                                    (and (or (not (any ?\\)) point) ?\\
-                                         (* ?\\ ?\\) (any ?\' ?\")))
-                                (* ?\\ ?\\)
-                                ;; Match single or triple quotes of any kind.
-                                (group (or "\"" "\"\"\"" "'" "'''")))))
-      (atoms . ,(rx ":"
-                    (or
-                     (and
-                      (any "a-z" "A-Z" "_" "\"" "'")
-                      (zero-or-more (any "a-z" "A-Z" "0-9" "_" "\"" "'")))
-                     (and "\"" (one-or-more (not (any "\""))) "\"")
-                     (and "'" (one-or-more (not (any "'"))) "'"))))
-      (builtin . ,(rx symbol-start
-                      (or "case" "cond" "for" "if" "unless" "try" "receive"
-                          "raise" "quote" "unquote" "unquote_splicing" "throw"
-                          "super")
-                      symbol-end))
-      (builtin-declaration . ,(rx symbol-start
-                                  (or "def" "defp" "defmodule" "defprotocol"
-                                      "defmacro" "defmacrop" "defdelegate"
-                                      "defexception" "defstruct" "defimpl"
-                                      "defcallback")
-                                  symbol-end))
-      (builtin-namespace . ,(rx symbol-start
-                                (or "import" "require" "use" "alias")
-                                symbol-end))
-      ;; Set aside code point syntax for `elixir-negation-face'.
-      (code-point . ,(rx symbol-start
-                         "?"
-                         anything
-                         symbol-end))
-      (function-declaration . ,(rx symbol-start
-                                   (or "def" "defp")
-                                   symbol-end))
-      ;; Match `@doc' or `@moduledoc' syntax, with or without triple quotes.
-      (heredocs . ,(rx symbol-start
-                       (or "@doc" "@moduledoc" "~s")
-                       symbol-end))
-      ;; The first character of an identifier must be a letter or an underscore.
-      ;; After that, they may contain any alphanumeric character + underscore.
-      ;; Additionally, the final character may be either `?' or `!'.
-      (identifiers . ,(rx (one-or-more (any "A-Z" "a-z" "_"))
-                          (zero-or-more (any "A-Z" "a-z" "0-9" "_"))
-                          (optional (or "?" "!"))))
-      (keyword . ,(rx symbol-start
-                      (or "fn" "do" "end" "after" "else" "rescue" "catch")
-                      symbol-end))
-      (keyword-operator . ,(rx symbol-start
-                               (or "not" "and" "or" "when" "in")
-                               symbol-end))
-      ;; Module and submodule names start with upper case letter. This
-      ;; can then be followed by any combination of alphanumeric chars.
-      ;; In turn, this can be followed by a `.' which begins the notation of
-      ;; a submodule, which follows the same naming pattern of the module.
-      ;; Finally, like other identifiers, it can be terminated with either `?'
-      ;; or `!'.
-      (module-names . ,(rx symbol-start
-                           (optional "%")
-                           (one-or-more (any "A-Z"))
-                           (zero-or-more (any "A-Z" "a-z" "_" "0-9"))
-                           (zero-or-more
-                            (and "."
-                                 (one-or-more (any "A-Z" "_"))
-                                 (zero-or-more (any "A-Z" "a-z" "_" "0-9"))))
-                           (optional (or "!" "?"))
-                           symbol-end))
-      (operators1 . ,(rx symbol-start
-                         (or "<" ">" "+" "-" "*" "/" "!" "^" "&")
-                         symbol-end))
-      (operators2 . ,(rx symbol-start
-                         (or
-                          "==" "!=" "<=" ">=" "&&" "||" "<>" "++" "--" "|>" "=~"
-                          "->" "<-" "|" "." "=")
-                         symbol-end))
-      (operators3 . ,(rx symbol-start
-                         (or "<<<" ">>>" "|||" "&&&" "^^^" "~~~" "===" "!==")
-                         symbol-end))
-      (pseudo-var . ,(rx symbol-start
-                         (or "_" "__MODULE__" "__DIR__" "__ENV__" "__CALLER__"
-                             "__block__" "__aliases__")
-                         symbol-end))
-      (punctuation . ,(rx symbol-start
-                          (or "\\" "<<" ">>" "=>" "(" ")" ":" ";" "" "[" "]")
-                          symbol-end))
-      (sigils . ,(rx "~" (or "B" "C" "R" "S" "b" "c" "r" "s" "w")))))
-
-  (defmacro elixir-rx (&rest sexps)
-    (let ((rx-constituents (append elixir-rx-constituents rx-constituents)))
-      (cond ((null sexps)
-             (error "No regexp"))
-            ((cdr sexps)
-             (rx-to-string `(and ,@sexps) t))
-            (t
-             (rx-to-string (car sexps) t))))))
-
-(defsubst elixir-syntax-count-quotes (quote-char &optional point limit)
-  "Count number of quotes around point (max is 3).
-QUOTE-CHAR is the quote char to count.  Optional argument POINT is
-the point where scan starts (defaults to current point), and LIMIT
-is used to limit the scan."
-  (let ((i 0))
-    (while (and (< i 3)
-                (or (not limit) (< (+ point i) limit))
-                (eq (char-after (+ point i)) quote-char))
-      (setq i (1+ i)))
-    i))
-
-(defun elixir-syntax-stringify ()
-  "Put `syntax-table' property correctly on single/triple quotes."
-  (let* ((num-quotes (length (match-string-no-properties 1)))
-         (ppss (prog2
-                   (backward-char num-quotes)
-                   (syntax-ppss)
-                 (forward-char num-quotes)))
-         (string-start (and (not (nth 4 ppss)) (nth 8 ppss)))
-         (quote-starting-pos (- (point) num-quotes))
-         (quote-ending-pos (point))
-         (num-closing-quotes
-          (and string-start
-               (elixir-syntax-count-quotes
-                (char-before) string-start quote-starting-pos))))
-    (cond ((and string-start (= num-closing-quotes 0))
-           ;; This set of quotes doesn't match the string starting
-           ;; kind. Do nothing.
-           nil)
-          ((not string-start)
-           ;; This set of quotes delimit the start of a string.
-           (put-text-property quote-starting-pos (1+ quote-starting-pos)
-                              'syntax-table (string-to-syntax "|")))
-          ((= num-quotes num-closing-quotes)
-           ;; This set of quotes delimit the end of a string.
-           (put-text-property (1- quote-ending-pos) quote-ending-pos
-                              'syntax-table (string-to-syntax "|")))
-          ((> num-quotes num-closing-quotes)
-           ;; This may only happen whenever a triple quote is closing
-           ;; a single quoted string. Add string delimiter syntax to
-           ;; all three quotes.
-           (put-text-property quote-starting-pos quote-ending-pos
-                              'syntax-table (string-to-syntax "|"))))))
-
-
-(defun elixir-syntax-propertize-interpolation ()
-  (let* ((beg (match-beginning 0))
-         (context (save-excursion (save-match-data (syntax-ppss beg)))))
-    (put-text-property beg (1+ beg) 'elixir-interpolation
-                       (cons (nth 3 context) (match-data)))))
-
-(defconst elixir-syntax-propertize-function
-  (syntax-propertize-rules
-   ((elixir-rx string-delimiter)
-    (0 (ignore (elixir-syntax-stringify))))
-   ((rx (group "#{" (0+ (not (any "}"))) "}"))
-    (0 (ignore (elixir-syntax-propertize-interpolation))))))
-
-(defun elixir-syntax-propertize-function (start end)
-  (let ((case-fold-search nil))
-    (goto-char start)
-    (funcall
-     (syntax-propertize-rules
-      ((elixir-rx string-delimiter)
-       (0 (ignore (elixir-syntax-stringify))))
-      ((rx (group "#{" (0+ (not (any "}"))) "}"))
-       (0 (ignore (elixir-syntax-propertize-interpolation)))))
-     start end)))
-
-(defun elixir-match-interpolation (limit)
-  (let ((pos (next-single-char-property-change (point) 'elixir-interpolation
-                                               nil limit)))
-    (when (and pos (> pos (point)))
-      (goto-char pos)
-      (let ((value (get-text-property pos 'elixir-interpolation)))
-        (if (eq (car value) ?\")
-            (progn
-              (set-match-data (cdr value))
-              t)
-          (elixir-match-interpolation limit))))))
-
-
-(defconst elixir-font-lock-keywords
-  `(
-    ;; String interpolation
-    (elixir-match-interpolation 0 font-lock-variable-name-face t)
-
-    ;; Module attributes
-    (,(elixir-rx (group (or heredocs
-                            (and "@" (1+ identifiers)))))
-     1 elixir-attribute-face)
-
-    ;; Keywords
-    (,(elixir-rx (group (or builtin builtin-declaration builtin-namespace
-                            keyword keyword-operator)))
-     1 font-lock-keyword-face)
-
-    ;; Function names, i.e. `def foo do'.
-    (,(elixir-rx (group function-declaration)
-                 space
-                 (group identifiers))
-     2 font-lock-function-name-face)
-
-    ;; Sigils
-    (,(elixir-rx (group sigils))
-     1 font-lock-builtin-face)
-
-    ;; Sigil patterns. Elixir has support for eight different sigil delimiters.
-    ;; This isn't a very DRY approach here but it gets the job done.
-    (,(elixir-rx sigils
-                 (and "/" (group (one-or-more (not (any "/")))) "/"))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "[" (group (one-or-more (not (any "]")))) "]"))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "{" (group (one-or-more (not (any "}")))) "}"))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "(" (group (one-or-more (not (any ")")))) ")"))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "|" (group (one-or-more (not (any "|")))) "|"))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "\"" (group (one-or-more (not (any "\"")))) "\""))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "'" (group (one-or-more (not (any "'")))) "'"))
-     1 font-lock-string-face)
-    (,(elixir-rx sigils
-                 (and "<" (group (one-or-more (not (any ">")))) ">"))
-     1 font-lock-string-face)
-
-    ;; Regex patterns. Elixir has support for eight different regex delimiters.
-    ;; This isn't a very DRY approach here but it gets the job done.
-    (,(elixir-rx "~r"
-                 (and "/" (group (one-or-more (not (any "/")))) "/"))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "[" (group (one-or-more (not (any "]")))) "]"))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "{" (group (one-or-more (not (any "}")))) "}"))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "(" (group (one-or-more (not (any ")")))) ")"))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "|" (group (one-or-more (not (any "|")))) "|"))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "\"" (group (one-or-more (not (any "\"")))) "\""))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "'" (group (one-or-more (not (any "'")))) "'"))
-     1 font-lock-string-face)
-    (,(elixir-rx "~r"
-                 (and "<" (group (one-or-more (not (any ">")))) ">"))
-     1 font-lock-string-face)
-
-    ;; Modules
-    (,(elixir-rx (group module-names))
-     1 font-lock-type-face)
-
-    ;; Atoms and singleton-like words like true/false/nil.
-    (,(elixir-rx (group atoms)
-                 (zero-or-more space)
-                 (optional "="))
-     1 elixir-atom-face)
-
-    ;; Variable definitions
-    (,(elixir-rx (group identifiers)
-                 (zero-or-more space)
-                 "="
-                 (or (zero-or-more space)
-                     (one-or-more "\n")))
-     1 font-lock-variable-name-face)
-
-    ;; Map keys
-    (,(elixir-rx (group (and (one-or-more identifiers) ":")))
-     1 elixir-atom-face)
-
-    ;; Pseudovariables
-    (,(elixir-rx (group pseudo-var))
-     1 font-lock-constant-face)
-
-    ;; Code points
-    (,(elixir-rx (group code-point))
-     1 elixir-negation-face)))
-
-(defun elixir-mode-cygwin-path (expanded-file-name)
-  "Elixir mode get Cygwin absolute path name.
-Argument EXPANDED-FILE-NAME ."
-  (replace-regexp-in-string "^[a-zA-Z]:" elixir-mode-cygwin-prefix expanded-file-name t))
-
-(defun elixir-mode-universal-path (file-name)
-  "Elixir mode multi-OS path handler.
-Argument FILE-NAME ."
-  (let ((full-file-name (expand-file-name file-name)))
-    (if (and (equal system-type 'windows-nt)
-             elixir-mode-cygwin-paths)
-        (elixir-mode-cygwin-path full-file-name)
-      full-file-name)))
-
-(defun elixir-mode-command-compile (file-name)
-  "Elixir mode command to compile a file.
-Argument FILE-NAME ."
-  (let ((full-file-name (elixir-mode-universal-path file-name)))
-    (mapconcat 'identity (append (list elixir-compiler-command) (list full-file-name)) " ")))
-
-(defun elixir-mode-compiled-file-name (&optional filename)
-  "Elixir mode compiled FILENAME."
-  (concat (file-name-sans-extension (or filename (buffer-file-name))) ".beam"))
-
-(defun elixir-mode-compile-file ()
-  "Elixir mode compile and save current file."
-  (interactive)
-  (elixir-deprecated-use-alchemist "elixir-mode-compile-file")
-  (let ((compiler-output (shell-command-to-string (elixir-mode-command-compile (buffer-file-name)))))
-    (when (string= compiler-output "")
-      (message "Compiled and saved as %s" (elixir-mode-compiled-file-name)))))
-
-(defun elixir-quoted--initialize-buffer (quoted)
-  (pop-to-buffer elixir-quoted--buffer-name)
-  (setq buffer-undo-list nil) ; Get rid of undo information from previous expansions
-  (let ((inhibit-read-only t)
-        (buffer-undo-list t)) ; Ignore undo information
-    (erase-buffer)
-    (insert quoted)
-    (goto-char (point-min))
-    (elixir-mode)
-    (elixir-quoted-minor-mode 1)))
-
-;;;###autoload
-(defun elixir-mode-iex (&optional args-p)
-  "Elixir mode interactive REPL.
-Optional argument ARGS-P ."
-  (interactive "P")
-  (let ((switches (if (equal args-p nil)
-                      '()
-                    (split-string (read-string "Additional args: ")))))
-    (unless (comint-check-proc "*IEX*")
-      (set-buffer
-       (apply 'make-comint "IEX"
-              elixir-iex-command nil switches))))
-  (pop-to-buffer "*IEX*")
-  (elixir-deprecated-use-alchemist "elixir-mode-iex"))
-
-;;;###autoload
-(defun elixir-mode-open-modegithub ()
-  "Elixir mode open GitHub page."
-  (interactive)
-  (browse-url "https://github.com/elixir-lang/emacs-elixir"))
-
-;;;###autoload
-(defun elixir-mode-open-elixir-home ()
-  "Elixir mode go to language home."
-  (interactive)
-  (browse-url elixir-mode--website-url))
-
-;;;###autoload
-(defun elixir-mode-open-docs-master ()
-  "Elixir mode go to master documentation."
-  (interactive)
-  (browse-url (concat elixir-mode--website-url "/docs/master/elixir")))
-
-;;;###autoload
-(defun elixir-mode-open-docs-stable ()
-  "Elixir mode go to stable documentation."
-  (interactive)
-  (browse-url (concat elixir-mode--website-url "/docs/stable/elixir")))
-
-;;;###autoload
-(defun elixir-mode-version (&optional show-version)
-  "Get the Elixir-Mode version as string.
-
-If called interactively or if SHOW-VERSION is non-nil, show the
-version in the echo area and the messages buffer.
-
-The returned string includes both, the version from package.el
-and the library version, if both a present and different.
-
-If the version number could not be determined, signal an error,
-if called interactively, or if SHOW-VERSION is non-nil, otherwise
-just return nil."
-  (interactive (list t))
-  (let ((version (pkg-info-version-info 'elixir-mode)))
-    (when show-version
-      (message "Elixir-Mode version: %s" version))
-    version))
-
-(defun elixir-mode--code-eval-string-command (file)
-  (format "%s -e 'IO.puts inspect(elem(Code.eval_string(File.read!(\"%s\")), 0))'"
-          elixir-mode-command
-          file))
-
-(defun elixir-mode--code-string-to-quoted-command (file)
-  (format "%s -e 'IO.puts inspect(elem(Code.string_to_quoted(File.read!(\"%s\")), 1), pretty: true)'"
-          elixir-mode-command
-          file))
-
-(defun elixir-mode--execute-elixir-with-code-eval-string (string)
-  (with-temp-file elixir-mode--eval-filename
-    (insert string))
-  (let ((output (shell-command-to-string (elixir-mode--code-eval-string-command elixir-mode--eval-filename))))
-    (delete-file elixir-mode--eval-filename)
-    output))
-
-(defun elixir-mode--execute-elixir-with-code-string-to-quoted (string)
-  (with-temp-file elixir-mode--eval-filename
-    (insert string))
-  (let ((output (shell-command-to-string (elixir-mode--code-string-to-quoted-command elixir-mode--eval-filename))))
-    (delete-file elixir-mode--eval-filename)
-    output))
-
-(defun elixir-mode--eval-string (string)
-  (let ((output (elixir-mode--execute-elixir-with-code-eval-string string)))
-    (message output)))
-
-(defun elixir-mode--string-to-quoted (string)
-  (let* ((output (elixir-mode--execute-elixir-with-code-string-to-quoted string)))
-    (elixir-quoted--initialize-buffer output)))
-
-(defun elixir-mode-fill-doc-string ()
-  (interactive)
-  (save-excursion
-    (re-search-backward "@\\(?:module\\)?doc +\"\"\"" nil t)
-    (re-search-forward "\"\"\"" nil t)
-    (set-mark (point))
-    (re-search-forward "\"\"\"" nil t)
-    (re-search-backward "^ *\"\"\"" nil t)
-    (backward-char)
-    (fill-region (point) (mark))))
-
-(defun elixir-mode-eval-on-region (beg end)
-  "Evaluate the Elixir code on the marked region.
-Argument BEG Start of the region.
-Argument END End of the region."
-  (interactive (list (point) (mark)))
-  (elixir-deprecated-use-alchemist "elixir-mode-eval-on-region")
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let* ((region (buffer-substring-no-properties beg end)))
-    (elixir-mode--eval-string region)))
-
-(defun elixir-mode-eval-on-current-line ()
-  "Evaluate the Elixir code on the current line."
-  (interactive)
-  (elixir-deprecated-use-alchemist "elixir-mode-eval-on-current-line")
-  (let ((current-line (thing-at-point 'line)))
-    (elixir-mode--eval-string current-line)))
-
-(defun elixir-mode-eval-on-current-buffer ()
-  "Evaluate the Elixir code on the current buffer."
-  (interactive)
-  (elixir-deprecated-use-alchemist "elixir-mode-eval-on-current-buffer")
-  (let ((current-buffer (buffer-substring-no-properties (point-max) (point-min))))
-    (elixir-mode--eval-string current-buffer)))
-
-(defun elixir-mode-string-to-quoted-on-region (beg end)
-  "Get the representation of the expression on the marked region.
-Argument BEG Start of the region.
-Argument END End of the region."
-  (interactive (list (point) (mark)))
-  (elixir-deprecated-use-alchemist "elixir-mode-string-to-quoted-on-region")
-  (unless (and beg end)
-    (error "The mark is not set now, so there is no region"))
-  (let ((region (buffer-substring-no-properties beg end)))
-    (elixir-mode--string-to-quoted region)))
-
-(defun elixir-mode-string-to-quoted-on-current-line ()
-  "Get the representation of the expression on the current line."
-  (interactive)
-  (elixir-deprecated-use-alchemist "elixir-mode-string-to-quoted-on-current-line")
-  (let ((current-line (thing-at-point 'line)))
-    (elixir-mode--string-to-quoted current-line)))
-
-(easy-menu-define elixir-mode-menu elixir-mode-map
-  "Elixir mode menu."
-  '("Elixir"
-    ["Indent line" smie-indent-line]
-    ["Compile file" elixir-mode-compile-file]
-    ["IEX" elixir-mode-iex]
-    "---"
-    ["elixir-mode on GitHub" elixir-mode-open-modegithub]
-    ["Elixir homepage" elixir-mode-open-elixirhome]
-    ["About" elixir-mode-version]
-    ))
-
-;;;###autoload
-(define-derived-mode elixir-mode prog-mode "Elixir"
-  "Major mode for editing Elixir code.
-
-\\{elixir-mode-map}"
-  (set (make-local-variable 'font-lock-defaults)
-       '(elixir-font-lock-keywords))
-  (set (make-local-variable 'comment-start) "# ")
-  (set (make-local-variable 'comment-end) "")
-  (set (make-local-variable 'comment-start-skip) "#+ *")
-  (set (make-local-variable 'comment-use-syntax) t)
-  (set (make-local-variable 'tab-width) elixir-basic-offset)
-  (set (make-local-variable 'syntax-propertize-function)
-       #'elixir-syntax-propertize-function)
-  (set (make-local-variable 'imenu-generic-expression)
-       elixir-imenu-generic-expression)
-  (smie-setup elixir-smie-grammar 'verbose-elixir-smie-rules
-              :forward-token 'elixir-smie-forward-token
-              :backward-token 'elixir-smie-backward-token))
-
-(define-minor-mode elixir-cos-mode
-  "Elixir mode toggle compile on save."
-  :group 'elixir-cos :lighter " CoS"
-  (cond
-   (elixir-cos-mode
-    (add-hook 'after-save-hook 'elixir-mode-compile-file nil t))
-   (t
-    (remove-hook 'after-save-hook 'elixir-mode-compile-file t))))
-
-(define-minor-mode elixir-quoted-minor-mode
-  "Minor mode for displaying elixir quoted expressions"
-  :group 'elixir-quoted :lighter " quoted"
-  :keymap '(("q" . quit-window))
-  (setq buffer-read-only t))
-
-;; Invoke elixir-mode when appropriate
-
-;;;###autoload
-(progn
-  (add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
-  (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
-  (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode)))
-
-(provide 'elixir-mode)
-
-;;; elixir-mode.el ends here
diff --git a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-smie.el b/emacs.d/elpa/elixir-mode-20150618.1413/elixir-smie.el
deleted file mode 100644
index 348ecfd..0000000
--- a/emacs.d/elpa/elixir-mode-20150618.1413/elixir-smie.el
+++ /dev/null
@@ -1,459 +0,0 @@
-;;; elixir-smie.el --- Structural syntax support for elixir-mode
-
-;; Copyright 2011-2015 secondplanet
-;;           2013-2015 Samuel Tonini, Matt DeBoard, Andreas Fuchs
-
-;; This file is not a part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, 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, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-;;; Commentary:
-
-;;  Structural syntax support for elixir-mode
-
-;;; Code:
-
-(require 'smie)
-
-;; HACK: Patch for Emacs 24.3 smie that fix
-;; https://github.com/elixir-lang/emacs-elixir/issues/107.
-;;
-;; defadvice is used to change the behavior only for elixir-mode.
-;; Definition of advice is a definition of corresponding function
-;; in Emacs 24.4.
-(when (and (= 24 emacs-major-version)
-           (= 3  emacs-minor-version))
-  (defadvice smie-rule-parent (around elixir-mode-patch activate)
-    (if (not (eq major-mode 'elixir-mode))
-        (progn ad-do-it)
-      (setq ad-return-value
-            (save-excursion
-              (goto-char (cadr (smie-indent--parent)))
-              (cons 'column
-                    (+ (or offset 0)
-                       (smie-indent-virtual)))))))
-
-  (defadvice smie-indent-comment (around elixir-mode-patch activate)
-    (if (not (eq major-mode 'elixir-mode))
-        (progn ad-do-it)
-      (setq ad-return-value
-            (and (smie-indent--bolp)
-                 (let ((pos (point)))
-                   (save-excursion
-                     (beginning-of-line)
-                     (and (re-search-forward comment-start-skip (line-end-position) t)
-                          (eq pos (or (match-end 1) (match-beginning 0))))))
-                 (save-excursion
-                   (forward-comment (point-max))
-                   (skip-chars-forward " \t\r\n")
-                   (unless
-                       (save-excursion
-                         (let ((next (funcall smie-forward-token-function)))
-                           (or (if (zerop (length next))
-                                   (or (eobp) (eq (car (syntax-after (point))) 5)))
-                               (rassoc next smie-closer-alist))))
-                     (smie-indent-calculate))))))))
-
-;; FIXME: This is me being lazy. CL is a compile-time dep only.
-;; (But for now, there is no real file-compilation plot, so let's
-;; scrape by with the runtime dep.)
-(require 'cl)
-
-(defvar elixir-smie-verbose-p nil
-  "Emit context information about the current syntax state.")
-
-(defvar elixir-mode-syntax-table
-  (let ((table (make-syntax-table)))
-
-    ;; Note that ?_ might be better as class "_", but either seems to
-    ;; work:
-    (modify-syntax-entry ?_ "_" table)
-    (modify-syntax-entry ?? "w" table)
-    (modify-syntax-entry ?~ "w" table)
-    (modify-syntax-entry ?! "_" table)
-    (modify-syntax-entry ?' "\"'" table)
-    (modify-syntax-entry ?\" "\"\"" table)
-    (modify-syntax-entry ?# "<" table)
-    (modify-syntax-entry ?\n ">" table)
-    (modify-syntax-entry ?\( "()" table)
-    (modify-syntax-entry ?\) ")(" table)
-    (modify-syntax-entry ?\{ "(}" table)
-    (modify-syntax-entry ?\} "){" table)
-    (modify-syntax-entry ?\[ "(]" table)
-    (modify-syntax-entry ?\] ")[" table)
-    (modify-syntax-entry ?: "_" table)
-    (modify-syntax-entry ?@ "_" table)
-    table)
-  "Elixir mode syntax table.")
-
-(defconst elixir-smie-grammar
-  (smie-prec2->grammar
-   (smie-merge-prec2s
-    (smie-bnf->prec2
-     '((id)
-       (statements (statement)
-                   (statement ";" statements))
-       (statement ("def" non-block-expr "do" statements "end")
-                  (non-block-expr "fn" match-statements "end")
-                  (non-block-expr "do" statements "end")
-                  ("if" non-block-expr "do" statements "else" statements "end")
-                  ("if" non-block-expr "do" statements "end")
-                  ("if" non-block-expr "COMMA" "do:" non-block-expr)
-                  ("if" non-block-expr "COMMA"
-                   "do:" non-block-expr "COMMA"
-                   "else:" non-block-expr)
-                  ("try" "do" statements "after" statements "end")
-                  ("try" "do" statements "catch" match-statements "end")
-                  ("try" "do" statements "rescue" match-statements "end")
-                  ("try" "do" statements "end")
-                  ("case" non-block-expr "do" match-statements "end"))
-       (non-block-expr (non-block-expr "OP" non-block-expr)
-                       (non-block-expr "COMMA" non-block-expr)
-                       ("(" non-block-expr ")")
-                       ("{" non-block-expr "}")
-                       ("[" non-block-expr "]")
-                       ("STRING"))
-       (match-statements (match-statement "MATCH-STATEMENT-DELIMITER"
-                                          match-statements)
-                         (match-statement))
-       (match-statement (non-block-expr "->" statements)))
-     '((assoc "if" "do:" "else:")
-       (assoc "COMMA")
-       (left "OP")))
-
-    (smie-precs->prec2
-     '((left "||")
-       (left "&&")
-       (nonassoc "=~" "===" "!==" "==" "!=" "<=" ">=" "<" ">")
-       (left "+" "-" "<<<" ">>>" "^^^" "~~~" "&&&" "|||")
-       (left "*" "/"))))))
-
-(defvar elixir-smie--operator-regexp
-  (rx (or "<<<" ">>>" "^^^" "~~~" "&&&" "|||" "===" "!==" "==" "!=" "<="
-          "=" ">=" "<" ">" "&&" "||" "<>" "++" "--" "//" "/>" "=~" "|>")))
-
-(defvar elixir-smie--binary-sequence-regexp
-  (rx (or "<<" ">>")))
-
-(defvar elixir-smie--block-operator-regexp
-  (rx "->" (0+ nonl)))
-
-(defvar elixir-smie--oneline-def-operator-regexp
-  (rx "do:" (0+ nonl)))
-
-(defvar elixir-smie--spaces-til-eol-regexp
-  (rx (and (1+ space) eol))
-  "Regex representing one or more whitespace characters concluding with eol.")
-
-(defvar elixir-smie--comment-regexp
-  (rx (and (0+ space) "#" (0+ not-newline)))
-  "Regex matching comments.")
-
-(defvar elixir-smie-indent-basic 2)
-
-(defmacro elixir-smie-debug (message &rest format-args)
-  `(progn
-     (when elixir-smie-verbose-p
-       (message (format ,message ,@format-args)))
-     nil))
-
-(defun elixir-smie--implicit-semi-p ()
-  (not (or (memq (char-before) '(?\{ ?\[))
-           (looking-back elixir-smie--operator-regexp (- (point) 3) t))))
-
-(defun elixir-smie--semi-ends-match ()
-  "Return non-nil if the current line concludes a match block."
-  (when (not (eobp))
-    (save-excursion
-      ;; Warning: Recursion.
-      ;; This is easy though.
-
-      ;; 1. If we're at a blank line, move forward a character. This takes us to
-      ;;    the next line.
-      ;; 2. If we're not at the end of the buffer, call this function again.
-      ;;    (Otherwise, return nil.)
-
-      ;; The point here is that we want to treat blank lines as a single semi-
-      ;; colon when it comes to detecting the end of match statements. This could
-      ;; also be handled by a `while' expression or some other looping mechanism.
-      (cl-flet ((self-call ()
-                           (if (< (point) (point-max))
-                               (elixir-smie--semi-ends-match)
-                             nil)))
-        (cond
-         ((and (eolp) (bolp))
-          (forward-char)
-          (self-call))
-         ((looking-at elixir-smie--spaces-til-eol-regexp)
-          (forward-char)
-          (self-call))
-         ;; And if we're NOT on a blank line, move to the end of the line, and see
-         ;; if we're looking back at a block operator.
-         (t (move-end-of-line 1)
-            (looking-back elixir-smie--block-operator-regexp)))))))
-
-(defun elixir-smie--same-line-as-parent (parent-pos child-pos)
-  "Return non-nil if `child-pos' is on same line as `parent-pos'."
-  (= (line-number-at-pos parent-pos) (line-number-at-pos child-pos)))
-
-(defun elixir-smie-forward-token ()
-  (cond
-   ;; If there is nothing but whitespace between the last token and eol, emit
-   ;; a semicolon.
-   ((looking-at elixir-smie--spaces-til-eol-regexp)
-    (goto-char (match-end 0))
-    ";")
-   ((and (or (looking-at elixir-smie--comment-regexp)
-             (looking-at "[\n#]"))
-         (elixir-smie--implicit-semi-p))
-    (when (not (save-excursion
-                 (forward-comment 1)
-                 (eobp)))
-      (if (eolp) (forward-char 1) (forward-comment 1)))
-    ;; Note: `elixir-smie--semi-ends-match' will be called when the point is at
-    ;; the beginning of a new line. Keep that in mind.
-    (if (elixir-smie--semi-ends-match)
-        "MATCH-STATEMENT-DELIMITER"
-      ";"))
-   ((looking-at elixir-smie--block-operator-regexp)
-    (goto-char (match-end 0))
-    "->")
-   ((looking-at elixir-smie--operator-regexp)
-    (goto-char (match-end 0))
-    "OP")
-   (t (smie-default-forward-token))))
-
-(defun elixir-smie-backward-token ()
-  (let ((pos (point)))
-    (forward-comment (- (point)))
-    (cond
-     ((and (> pos (line-end-position))
-           (elixir-smie--implicit-semi-p))
-      (if (elixir-smie--semi-ends-match)
-          "MATCH-STATEMENT-DELIMITER"
-        ";"))
-     ((looking-back elixir-smie--oneline-def-operator-regexp (- (point) 3) t)
-      (goto-char (match-beginning 0))
-      ";")
-     ((looking-back elixir-smie--block-operator-regexp (- (point) 3) t)
-      (goto-char (match-beginning 0))
-      "->")
-     ((looking-back elixir-smie--binary-sequence-regexp (- (point) 3) t)
-      (goto-char (match-beginning 0))
-      "OP")
-     ((looking-back elixir-smie--operator-regexp (- (point) 3) t)
-      (goto-char (match-beginning 0))
-      "OP")
-     (t (smie-default-backward-token)))))
-
-(defun verbose-elixir-smie-rules (kind token)
-  (let ((value (elixir-smie-rules kind token)))
-    (elixir-smie-debug "%s '%s'; sibling-p:%s parent:%s prev-is-OP:%s hanging:%s == %s" kind token
-                       (ignore-errors (smie-rule-sibling-p))
-                       (ignore-errors smie--parent)
-                       (ignore-errors (smie-rule-prev-p "OP"))
-                       (ignore-errors (smie-rule-hanging-p))
-                       value)
-    value))
-
-(defun elixir-smie-rules (kind token)
-  (pcase (cons kind token)
-    (`(:list-intro . ";")
-     -4)
-    (`(:elem . args)
-     -4)
-    (`(:before . "OP")
-     (when (and (not (smie-rule-hanging-p))
-                (smie-rule-prev-p "OP"))
-       -2))
-    (`(:after . "OP")
-     (cond
-      ((smie-rule-sibling-p) nil)
-      ((smie-rule-hanging-p) (smie-rule-parent elixir-smie-indent-basic))
-      ((and (not (smie-rule-sibling-p))
-            (not (smie-rule-hanging-p))
-            (smie-rule-parent-p "do:"))
-       ;; Dedent the line after an OP if it's after a "do:" token, which implies
-       ;; a one-line function.
-       (smie-rule-parent
-        (- (+ elixir-smie-indent-basic elixir-smie-indent-basic))))
-      (t (smie-rule-parent))))
-    (`(:before . "MATCH-STATEMENT-DELIMITER")
-     (cond
-      ((smie-rule-parent-p "MATCH-STATEMENT-DELIMITER")
-       (smie-rule-parent))
-      ((and (not (smie-rule-sibling-p))
-            (nth 2 smie--parent)
-            (smie-rule-hanging-p))
-       (smie-rule-parent elixir-smie-indent-basic))
-      ((and (not (smie-rule-sibling-p))
-            (not (nth 2 smie--parent))
-            (smie-rule-hanging-p))
-       (smie-rule-parent))))
-    (`(:before . "fn")
-     (smie-rule-parent))
-    (`(:before . "do:")
-     (cond
-      ((smie-rule-parent-p "def" "if")
-       (smie-rule-parent))))
-    (`(:before . "end")
-     (smie-rule-parent))
-    ;; Closing paren on the other line
-    (`(:before . "(")
-     (cond
-      ((smie-rule-parent-p "fn")
-       (smie-rule-parent elixir-smie-indent-basic))
-      ;; Indent parenthesis correctly inside a block
-      ;;
-      ;; Example:
-      ;;
-      ;; def bar do
-      ;;   ()
-      ;; .....
-      ((smie-rule-parent-p "do")
-       (smie-rule-parent elixir-smie-indent-basic))
-      (t (smie-rule-parent))))
-    (`(:before . "[")
-     (cond
-      ((smie-rule-hanging-p)
-       (smie-rule-parent))))
-    (`(:after . "{")
-     (cond
-      ((smie-rule-hanging-p)
-       (smie-rule-parent elixir-smie-indent-basic))
-      (t elixir-smie-indent-basic)))
-    (`(:after . "[")
-     (cond
-      ((smie-rule-hanging-p)
-       (smie-rule-parent elixir-smie-indent-basic))
-      (t elixir-smie-indent-basic)))
-    (`(:before . "if")
-     (cond
-      ((smie-rule-parent-p ";")
-       (smie-rule-parent))))
-    (`(:before . "->")
-     (cond
-      ((smie-rule-hanging-p)
-       (smie-rule-parent elixir-smie-indent-basic))))
-    (`(:after . "->")
-     (cond
-      ;; This first condition is kind of complicated so I'll try to make this
-      ;; comment as clear as possible.
-
-      ;; "If `->' is the last thing on the line, and its parent token
-      ;; is `fn' ..."
-      ((and (smie-rule-hanging-p)
-            (smie-rule-parent-p "fn"))
-       ;; "... and if:
-
-       ;; 1. `smie--parent' is non-nil
-       ;; 2. the `->' token in question is on the same line as its parent (if
-       ;;    the logic has gotten this far, its parent will be `fn')
-
-       ;; ... then indent the line after the `->' aligned with the
-       ;; parent, offset by `elixir-smie-indent-basic'."
-       (if (and smie--parent (elixir-smie--same-line-as-parent
-                              (nth 1 smie--parent)
-                              (point)))
-           (smie-rule-parent elixir-smie-indent-basic)
-         elixir-smie-indent-basic))
-      ;; Otherwise, if just indent by two.
-      ((smie-rule-hanging-p)
-       (cond
-        ((smie-rule-parent-p "after" "catch" "do" "rescue" "try")
-         elixir-smie-indent-basic)
-        (t (smie-rule-parent elixir-smie-indent-basic))))))
-    (`(:before . ";")
-     (cond
-      ;; There is a case after an one line definition of functions/macros
-      ;; when an `if' keyword token is involved, where the next block `end'
-      ;; token will have a `if' as parent and it's hanging.
-      ;;
-      ;; Example:
-      ;;
-      ;; defmacro my_if(expr, do: if_block), do: if(expr, do: if_block, else: nil)
-      ;; defmacro my_if(expr, do: if_block, else: else_block) do
-      ;;   ...
-      ;; end <- parent is `if`
-      ((and (smie-rule-parent-p "if")
-            (smie-rule-hanging-p))
-       (smie-rule-parent))
-      ((smie-rule-parent-p "after" "catch" "def" "defmodule" "defp" "do" "else"
-                           "fn" "if" "rescue" "try" "unless")
-       (smie-rule-parent elixir-smie-indent-basic))
-     ))
-    (`(:after . ";")
-     (cond
-      ((smie-rule-parent-p "def")
-       (smie-rule-parent))
-      ((smie-rule-parent-p "if")
-       (smie-rule-parent))
-      ((and (smie-rule-parent-p "(")
-            (boundp 'smie--parent)
-            (save-excursion
-              (goto-char (cadr smie--parent))
-              (smie-rule-hanging-p)))
-       (smie-rule-parent elixir-smie-indent-basic))))))
-
-(defun elixir-smie--heredoc-at-current-point-p ()
-  "Return non-nil if cursor is at a string."
-  (save-excursion
-    (or (and (nth 3 (save-excursion
-                      (let ((pos (point)))
-                        (parse-partial-sexp 1 pos))))
-             (nth 8 (save-excursion
-                      (let ((pos (point)))
-                        (parse-partial-sexp 1 pos)))))
-        (and (looking-at "\"\"\"")
-           (match-beginning 0)))))
-
-(defun elixir-smie--previous-line-empty-p ()
-  "Return non-nil if the previous line is blank."
-  (save-excursion
-    (forward-line -1)
-    (and (eolp) (bolp))))
-
-(defun elixir-smie--previous-line-indentation ()
-  "Return the indentation of the previous line."
-  (save-excursion
-    (forward-line -1)
-    (current-indentation)))
-
-;; Add the custom function to handle indentation inside heredoc to the
-;; smie-indent-functions list. The indentation function will only be
-;; process inside an elixir-mode.
-(defun elixir-smie--indent-inside-heredoc ()
-  "Handle indentation inside Elixir heredocs.
-
-Rules:
-  1. If the previous line is empty, indent as the basic indentation
-     at the beginning of the heredoc.
-  2. If the previous line is not empty, indent as the previous line.
-"
-  (if (eq major-mode 'elixir-mode)
-      (if (elixir-smie--heredoc-at-current-point-p)
-          (let ((indent
-                 (save-excursion
-                   (when (re-search-backward "^\\(\s+\\).+\"\"\"" nil t)
-                     (string-width (match-string 1))))))
-            (if (elixir-smie--previous-line-empty-p)
-                (goto-char indent)
-              (goto-char (elixir-smie--previous-line-indentation)))))))
-
-(add-to-list 'smie-indent-functions 'elixir-smie--indent-inside-heredoc)
-
-(provide 'elixir-smie)
-
-;;; elixir-smie.el ends here
diff --git a/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode-autoloads.el b/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode-autoloads.el
new file mode 100644
index 0000000..2294175
--- /dev/null
+++ b/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode-autoloads.el
@@ -0,0 +1,70 @@
+;;; elixir-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "elixir-mode" "elixir-mode.el" (22171 46577
+;;;;;;  0 0))
+;;; Generated autoloads from elixir-mode.el
+
+(autoload 'elixir-mode-open-modegithub "elixir-mode" "\
+Elixir mode open GitHub page.
+
+\(fn)" t nil)
+
+(autoload 'elixir-mode-open-elixir-home "elixir-mode" "\
+Elixir mode go to language home.
+
+\(fn)" t nil)
+
+(autoload 'elixir-mode-open-docs-master "elixir-mode" "\
+Elixir mode go to master documentation.
+
+\(fn)" t nil)
+
+(autoload 'elixir-mode-open-docs-stable "elixir-mode" "\
+Elixir mode go to stable documentation.
+
+\(fn)" t nil)
+
+(autoload 'elixir-mode-version "elixir-mode" "\
+Get the Elixir-Mode version as string.
+
+If called interactively or if SHOW-VERSION is non-nil, show the
+version in the echo area and the messages buffer.
+
+The returned string includes both, the version from package.el
+and the library version, if both a present and different.
+
+If the version number could not be determined, signal an error,
+if called interactively, or if SHOW-VERSION is non-nil, otherwise
+just return nil.
+
+\(fn &optional SHOW-VERSION)" t nil)
+
+(autoload 'elixir-mode "elixir-mode" "\
+Major mode for editing Elixir code.
+
+\\{elixir-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
+
+(add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
+
+(add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode))
+
+;;;***
+
+;;;### (autoloads nil nil ("elixir-mode-pkg.el" "elixir-smie.el")
+;;;;;;  (22171 46577 625024 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; elixir-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode-pkg.el b/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode-pkg.el
new file mode 100644
index 0000000..e998fec
--- /dev/null
+++ b/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode-pkg.el
@@ -0,0 +1,8 @@
+(define-package "elixir-mode" "20160103.54" "Major mode for editing Elixir files"
+  '((emacs "24")
+    (pkg-info "0.4"))
+  :url "https://github.com/elixir-lang/emacs-elixir" :keywords
+  '("languages" "elixir"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode.el b/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode.el
new file mode 100644
index 0000000..a78b100
--- /dev/null
+++ b/emacs.d/elpa/elixir-mode-20160103.54/elixir-mode.el
@@ -0,0 +1,531 @@
+;;; elixir-mode.el --- Major mode for editing Elixir files
+
+;; Copyright 2011-2015 secondplanet
+;;           2013-2015 Samuel Tonini, Matt DeBoard, Andreas Fuchs
+;; Authors: Humza Yaqoob,
+;;          Andreas Fuchs <asf@boinkor.net>,
+;;          Matt DeBoard
+;;          Samuel Tonini <tonini.samuel@gmail.com>
+
+;; URL: https://github.com/elixir-lang/emacs-elixir
+;; Created: Mon Nov 7 2011
+;; Keywords: languages elixir
+;; Version: 2.2.8
+;; Package-Requires: ((emacs "24") (pkg-info "0.4"))
+
+;; This file is not a part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, 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, write to the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary:
+
+;;  Provides font-locking, indentation and navigation support
+;;  for the Elixir programming language.
+
+;;; Code:
+
+(require 'easymenu)           ; Elixir Mode menu definition
+(require 'elixir-smie)        ; Syntax and indentation support
+(require 'pkg-info)           ; Display Elixir Mode package version
+
+(defgroup elixir nil
+  "Major mode for editing Elixir code."
+  :prefix "elixir-"
+  :group 'languages
+  :link '(url-link :tag "Github" "https://github.com/elixir-lang/emacs-elixir")
+  :link '(emacs-commentary-link :tag "Commentary" "elixir-mode"))
+
+(defvar elixir-mode-website-url "http://elixir-lang.org"
+  "Official url of Elixir programming website.")
+
+(defvar elixir-mode-hook nil)
+
+(defvar elixir-mode-map
+  (let ((map (make-sparse-keymap)))
+    map)
+  "Keymap used in `elixir-mode'.")
+
+(defvar elixir-imenu-generic-expression
+  '(("Modules" "^\\s-*defmodule[ \n\t]+\\([A-Z][A-Za-z0-9._]+\\)\\s-+.*$" 1)
+    ("Public Functions" "^\\s-*def[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
+    ("Private Functions" "^\\s-*defp[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
+    ("Public Macros" "^\\s-*defmacro[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
+    ("Private Macros" "^\\s-*defmacrop[ \n\t]+\\([a-z0-9_!\\?]+\\)\\(([^)]*)\\)*.*" 1)
+    ("Delegates" "^\\s-*defdelegate[ \n\t]+\\([a-z0-9_]+\\)\\(([^)]*)\\)*.*" 1)
+    ("Overridables" "^\\s-*defoverridable[ \n\t]+\\([a-z0-9_]+\\)\\(([^)]*)\\)*.*" 1)
+    ("Tests" "^\\s-*test[ \t\n]+\"?\\(:?[a-z0-9_@+() \t-]+\\)\"?[ \t\n]+.*" 1))
+  "Imenu pattern for `elixir-mode'.")
+
+(defvar elixir-basic-offset 2)
+(defvar elixir-key-label-offset 0)
+(defvar elixir-match-label-offset 2)
+
+(defvar elixir-operator-face 'elixir-operator-face)
+(defface elixir-operator-face
+  '((((class color) (min-colors 88) (background light))
+     :foreground "darkred")
+    (((class color) (background dark))
+     (:foreground "lemonchiffon1"))
+    (t nil))
+  "For use with operators."
+  :group 'font-lock-faces)
+
+(defvar elixir-negation-face 'elixir-negation-face)
+(defface elixir-negation-face
+  '((((class color) (min-colors 88) (background light))
+     :foreground "#ff4500")
+    (((class color) (background dark))
+     (:foreground "#ff4500"))
+    (t nil))
+  "For use with standalone \"?\" to indicate code point."
+  :group 'font-lock-faces)
+
+(defvar elixir-attribute-face 'elixir-attribute-face)
+(defface elixir-attribute-face
+  '((((class color) (min-colors 88) (background light))
+     :foreground "MediumPurple4")
+    (((class color) (background dark))
+     (:foreground "thistle"))
+    (t nil))
+  "For use with module attribute tokens."
+  :group 'font-lock-faces)
+
+(defvar elixir-atom-face 'elixir-atom-face)
+(defface elixir-atom-face
+  '((((class color) (min-colors 88) (background light))
+     :foreground "RoyalBlue4")
+    (((class color) (background dark))
+     (:foreground "light sky blue"))
+    (t nil))
+  "For use with atoms & map keys."
+  :group 'font-lock-faces)
+
+(defvar elixir-ignored-var-face 'elixir-ignored-var-face)
+(defface elixir-ignored-var-face
+  '((((class color) (min-colors 88) (background light))
+     :foreground "#424242")
+    (((class color) (background dark))
+     (:foreground "#616161"))
+    (t nil))
+  "For use with ignored variables (starting with underscore)."
+  :group 'font-lock-faces)
+
+(eval-when-compile
+  (defconst elixir-rx-constituents
+    `(
+      (string-delimiter . ,(rx (and
+                                ;; Match even number of backslashes.
+                                (or (not (any ?\\ ?\' ?\")) point
+                                    ;; Quotes might be preceded by escaped quote
+                                    (and (or (not (any ?\\)) point) ?\\
+                                         (* ?\\ ?\\) (any ?\' ?\")))
+                                (* ?\\ ?\\)
+                                ;; Match single or triple quotes of any kind.
+                                (group (or "\"" "\"\"\"" "'" "'''")))))
+      (atoms . ,(rx ":"
+                    (or
+                     (and
+                      (any "a-z" "A-Z" "_" "\"" "'")
+                      (zero-or-more (any "a-z" "A-Z" "0-9" "_" "\"" "'" "!" "@" "?")))
+                     (and "\"" (one-or-more (not (any "\""))) "\"")
+                     (and "'" (one-or-more (not (any "'"))) "'"))))
+      (builtin . ,(rx symbol-start
+                      (or "case" "cond" "for" "if" "quote" "raise" "receive" "send"
+                          "super" "throw" "try" "unless" "unquote" "unquote_splicing"
+                          "with")
+                      symbol-end))
+      (builtin-declaration . ,(rx symbol-start
+                                  (or "def" "defp" "defmodule" "defprotocol"
+                                      "defmacro" "defmacrop" "defdelegate"
+                                      "defexception" "defstruct" "defimpl"
+                                      "defcallback" "defoverridable")
+                                  symbol-end))
+      (builtin-namespace . ,(rx symbol-start
+                                (or "import" "require" "use" "alias")
+                                symbol-end))
+      ;; Set aside code point syntax for `elixir-negation-face'.
+      (code-point . ,(rx symbol-start
+                         "?"
+                         anything
+                         symbol-end))
+      (function-declaration . ,(rx (or line-start (not (any ".")))
+                                   symbol-start
+                                   (or "def" "defp")
+                                   symbol-end))
+      ;; The first character of an identifier must be a letter or an underscore.
+      ;; After that, they may contain any alphanumeric character + underscore.
+      ;; Additionally, the final character may be either `?' or `!'.
+      (identifiers . ,(rx (one-or-more (any "A-Z" "a-z" "_"))
+                          (zero-or-more (any "A-Z" "a-z" "0-9" "_"))
+                          (optional (or "?" "!"))))
+      (keyword . ,(rx symbol-start
+                      (or "fn" "do" "end" "after" "else" "rescue" "catch")
+                      symbol-end))
+      (keyword-operator . ,(rx symbol-start
+                               (or "not" "and" "or" "when" "in")
+                               symbol-end))
+      ;; Module and submodule names start with upper case letter. This
+      ;; can then be followed by any combination of alphanumeric chars.
+      ;; In turn, this can be followed by a `.' which begins the notation of
+      ;; a submodule, which follows the same naming pattern of the module.
+      ;; Finally, like other identifiers, it can be terminated with either `?'
+      ;; or `!'.
+      (module-names . ,(rx symbol-start
+                           (optional (or "%" "&"))
+                           (one-or-more (any "A-Z"))
+                           (zero-or-more (any "A-Z" "a-z" "_" "0-9"))
+                           (zero-or-more
+                            (and "."
+                                 (one-or-more (any "A-Z" "_"))
+                                 (zero-or-more (any "A-Z" "a-z" "_" "0-9"))))
+                           (optional (or "!" "?"))
+                           symbol-end))
+      (pseudo-var . ,(rx symbol-start
+                         (optional (or "%" "&"))
+                         (or "_" "__MODULE__" "__DIR__" "__ENV__" "__CALLER__"
+                             "__block__" "__aliases__")
+                         symbol-end))
+      (sigils . ,(rx "~" (or "B" "C" "R" "S" "b" "c" "r" "s" "w")))))
+
+  (defmacro elixir-rx (&rest sexps)
+    (let ((rx-constituents (append elixir-rx-constituents rx-constituents)))
+      (cond ((null sexps)
+             (error "No regexp"))
+            ((cdr sexps)
+             (rx-to-string `(and ,@sexps) t))
+            (t
+             (rx-to-string (car sexps) t))))))
+
+(defsubst elixir-syntax-in-string-or-comment-p ()
+  (nth 8 (syntax-ppss)))
+
+(defsubst elixir-syntax-count-quotes (quote-char &optional point limit)
+  "Count number of quotes around point (max is 3).
+QUOTE-CHAR is the quote char to count.  Optional argument POINT is
+the point where scan starts (defaults to current point), and LIMIT
+is used to limit the scan."
+  (let ((i 0))
+    (while (and (< i 3)
+                (or (not limit) (< (+ point i) limit))
+                (eq (char-after (+ point i)) quote-char))
+      (setq i (1+ i)))
+    i))
+
+(defun elixir-syntax-stringify ()
+  "Put `syntax-table' property correctly on single/triple quotes."
+  (let* ((num-quotes (length (match-string-no-properties 1)))
+         (ppss (prog2
+                   (backward-char num-quotes)
+                   (syntax-ppss)
+                 (forward-char num-quotes)))
+         (string-start (and (not (nth 4 ppss)) (nth 8 ppss)))
+         (quote-starting-pos (- (point) num-quotes))
+         (quote-ending-pos (point))
+         (num-closing-quotes
+          (and string-start
+               (elixir-syntax-count-quotes
+                (char-before) string-start quote-starting-pos))))
+    (cond ((and string-start (= num-closing-quotes 0))
+           ;; This set of quotes doesn't match the string starting
+           ;; kind. Do nothing.
+           nil)
+          ((not string-start)
+           ;; This set of quotes delimit the start of a string.
+           (put-text-property quote-starting-pos (1+ quote-starting-pos)
+                              'syntax-table (string-to-syntax "|")))
+          ((= num-quotes num-closing-quotes)
+           ;; This set of quotes delimit the end of a string.
+           (put-text-property (1- quote-ending-pos) quote-ending-pos
+                              'syntax-table (string-to-syntax "|")))
+          ((> num-quotes num-closing-quotes)
+           ;; This may only happen whenever a triple quote is closing
+           ;; a single quoted string. Add string delimiter syntax to
+           ;; all three quotes.
+           (put-text-property quote-starting-pos quote-ending-pos
+                              'syntax-table (string-to-syntax "|"))))))
+
+
+(defun elixir-syntax-propertize-interpolation ()
+  (let* ((beg (match-beginning 0))
+         (context (save-excursion (save-match-data (syntax-ppss beg)))))
+    (put-text-property beg (1+ beg) 'syntax-table (string-to-syntax "w"))
+    (put-text-property beg (1+ beg) 'elixir-interpolation
+                       (cons (nth 3 context) (match-data)))))
+
+(defconst elixir-sigil-delimiter-pair
+  '((?\( . ")")
+    (?\{ . "}")
+    (?\< . ">")
+    (?\[ . "]")))
+
+(defun elixir-syntax-replace-property-in-sigil ()
+  (unless (elixir-syntax-in-string-or-comment-p)
+    (let ((heredoc-p (save-excursion
+                       (goto-char (match-beginning 0))
+                       (looking-at-p "~[sS]\"\"\""))))
+      (unless heredoc-p
+        (forward-char 1)
+        (let* ((start-delim (char-after (1- (point))))
+               (end-delim (or (assoc-default start-delim elixir-sigil-delimiter-pair)
+                              (char-to-string start-delim)))
+               (end (save-excursion
+                      (let (finish)
+                        (while (not finish)
+                          (skip-chars-forward (concat "^" end-delim))
+                          (if (or (not (eq (char-before) ?\\))
+                                  (eq (char-before (1- (point))) ?\\)
+                                  (eobp))
+                              (setq finish t)
+                            (forward-char 1)))
+                        (point))))
+               (word-syntax (string-to-syntax "w")))
+          (when (memq start-delim '(?' ?\"))
+            (setq end (1+ end))
+            (forward-char -1))
+          (while (re-search-forward "[\"'#]" end 'move)
+            (put-text-property (1- (point)) (point) 'syntax-table word-syntax)))))))
+
+(defun elixir-syntax-propertize-function (start end)
+  (let ((case-fold-search nil))
+    (goto-char start)
+    (funcall
+     (syntax-propertize-rules
+      ((elixir-rx string-delimiter)
+       (0 (ignore (elixir-syntax-stringify))))
+      ((elixir-rx sigils)
+       (0 (ignore (elixir-syntax-replace-property-in-sigil))))
+      ((rx (group "#{" (0+ (not (any "}"))) "}"))
+       (0 (ignore (elixir-syntax-propertize-interpolation)))))
+     start end)))
+
+(defun elixir-match-interpolation (limit)
+  (let ((pos (next-single-char-property-change (point) 'elixir-interpolation
+                                               nil limit)))
+    (when (and pos (> pos (point)))
+      (goto-char pos)
+      (let ((value (get-text-property pos 'elixir-interpolation)))
+        (if (car value)
+            (progn
+              (set-match-data (cdr value))
+              t)
+          (elixir-match-interpolation limit))))))
+
+
+(defconst elixir-font-lock-keywords
+  `(
+    ;; String interpolation
+    (elixir-match-interpolation 0 font-lock-variable-name-face t)
+
+    ;; Module attributes
+    (,(elixir-rx (and "@" (1+ identifiers)))
+     0 elixir-attribute-face)
+
+    ;; Keywords
+    (,(elixir-rx (and (or line-start (not (any ".")))
+                      (group (or builtin builtin-declaration builtin-namespace
+                                 keyword keyword-operator))))
+     1 font-lock-keyword-face)
+
+    ;; Function names, i.e. `def foo do'.
+    (,(elixir-rx (group function-declaration)
+                 space
+                 (group identifiers))
+     2 font-lock-function-name-face)
+
+    ;; Sigil patterns. Elixir has support for eight different sigil delimiters.
+    ;; This isn't a very DRY approach here but it gets the job done.
+    (,(elixir-rx (group sigils)
+                 (and "/"
+                      (group (zero-or-more (or (and "\\" "/") (not (any "/" "\n" "\r")))))
+                      "/"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "["
+                      (group (zero-or-more (or (and "\\" "]") (not (any "]" "\n" "\r")))))
+                      "]"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "{"
+                      (group (zero-or-more (or (and "\\" "}") (not (any "}" "\n" "\r")))))
+                      "}"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "("
+                      (group (zero-or-more (or (and "\\" ")") (not (any ")" "\n" "\r")))))
+                      ")"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "|"
+                      (group (zero-or-more (or (and "\\" "|") (not (any "|" "\n" "\r")))))
+                      "|"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "\""
+                      (group (zero-or-more (or (and "\\" "\"") (not (any "\"" "\n" "\r")))))
+                      "\""))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "'"
+                      (group (zero-or-more (or (and "\\" "'") (not (any "'" "\n" "\r")))))
+                      "'"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+    (,(elixir-rx (group sigils)
+                 (and "<"
+                      (group (zero-or-more (or (and "\\" ">") (not (any ">" "\n" "\r")))))
+                      ">"))
+     (1 font-lock-builtin-face)
+     (2 font-lock-string-face))
+
+    ;; Modules
+    (,(elixir-rx (group module-names))
+     1 font-lock-type-face)
+
+    ;; Atoms and singleton-like words like true/false/nil.
+    (,(elixir-rx symbol-start
+                 (group (or atoms "true" "false" "nil"))
+                 symbol-end
+                 (zero-or-more space)
+                 (optional "="))
+     1 elixir-atom-face)
+
+    ;; Variable definitions
+    (,(elixir-rx (group identifiers)
+                 (zero-or-more space)
+                 (repeat 1 "=")
+                 (or (or sigils identifiers space)
+                     (one-or-more "\n")))
+     1 font-lock-variable-name-face)
+
+    ;; Gray out variables starting with "_"
+    (,(elixir-rx symbol-start
+                 (group (and "_"
+                             (any "A-Z" "a-z" "0-9"))
+                        (zero-or-more (any "A-Z" "a-z" "0-9" "_"))
+                        (optional (or "?" "!"))))
+     1 elixir-ignored-var-face)
+
+    ;; Map keys
+    (,(elixir-rx (group (and (one-or-more identifiers) ":")))
+     1 elixir-atom-face)
+
+    ;; Pseudovariables
+    (,(elixir-rx (group pseudo-var))
+     1 font-lock-constant-face)
+
+    ;; Code points
+    (,(elixir-rx (group code-point))
+     1 elixir-negation-face)))
+
+;;;###autoload
+(defun elixir-mode-open-modegithub ()
+  "Elixir mode open GitHub page."
+  (interactive)
+  (browse-url "https://github.com/elixir-lang/emacs-elixir"))
+
+;;;###autoload
+(defun elixir-mode-open-elixir-home ()
+  "Elixir mode go to language home."
+  (interactive)
+  (browse-url elixir-mode-website-url))
+
+;;;###autoload
+(defun elixir-mode-open-docs-master ()
+  "Elixir mode go to master documentation."
+  (interactive)
+  (browse-url (concat elixir-mode-website-url "/docs/master/elixir")))
+
+;;;###autoload
+(defun elixir-mode-open-docs-stable ()
+  "Elixir mode go to stable documentation."
+  (interactive)
+  (browse-url (concat elixir-mode-website-url "/docs/stable/elixir")))
+
+;;;###autoload
+(defun elixir-mode-version (&optional show-version)
+  "Get the Elixir-Mode version as string.
+
+If called interactively or if SHOW-VERSION is non-nil, show the
+version in the echo area and the messages buffer.
+
+The returned string includes both, the version from package.el
+and the library version, if both a present and different.
+
+If the version number could not be determined, signal an error,
+if called interactively, or if SHOW-VERSION is non-nil, otherwise
+just return nil."
+  (interactive (list t))
+  (let ((version (pkg-info-version-info 'elixir-mode)))
+    (when show-version
+      (message "Elixir-Mode version: %s" version))
+    version))
+
+(defun elixir-mode-fill-doc-string ()
+  (interactive)
+  (save-excursion
+    (re-search-backward "@\\(?:module\\)?doc +\"\"\"" nil t)
+    (re-search-forward "\"\"\"" nil t)
+    (set-mark (point))
+    (re-search-forward "\"\"\"" nil t)
+    (re-search-backward "^ *\"\"\"" nil t)
+    (backward-char)
+    (fill-region (point) (mark))))
+
+(easy-menu-define elixir-mode-menu elixir-mode-map
+  "Elixir mode menu."
+  '("Elixir"
+    ["Indent line" smie-indent-line]
+    "---"
+    ["elixir-mode on GitHub" elixir-mode-open-modegithub]
+    ["Elixir homepage" elixir-mode-open-elixirhome]
+    ["About" elixir-mode-version]))
+
+;;;###autoload
+(define-derived-mode elixir-mode prog-mode "Elixir"
+  "Major mode for editing Elixir code.
+
+\\{elixir-mode-map}"
+  (set (make-local-variable 'font-lock-defaults)
+       '(elixir-font-lock-keywords))
+  (set (make-local-variable 'comment-start) "# ")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-start-skip) "#+ *")
+  (set (make-local-variable 'comment-use-syntax) t)
+  (set (make-local-variable 'tab-width) elixir-basic-offset)
+  (set (make-local-variable 'syntax-propertize-function)
+       #'elixir-syntax-propertize-function)
+  (set (make-local-variable 'imenu-generic-expression)
+       elixir-imenu-generic-expression)
+  (smie-setup elixir-smie-grammar 'verbose-elixir-smie-rules
+              :forward-token 'elixir-smie-forward-token
+              :backward-token 'elixir-smie-backward-token))
+
+;; Invoke elixir-mode when appropriate
+
+;;;###autoload
+(progn
+  (add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
+  (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
+  (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode)))
+
+(provide 'elixir-mode)
+
+;;; elixir-mode.el ends here
diff --git a/emacs.d/elpa/elixir-mode-20160103.54/elixir-smie.el b/emacs.d/elpa/elixir-mode-20160103.54/elixir-smie.el
new file mode 100644
index 0000000..63736fa
--- /dev/null
+++ b/emacs.d/elpa/elixir-mode-20160103.54/elixir-smie.el
@@ -0,0 +1,708 @@
+;;; elixir-smie.el --- Structural syntax support for elixir-mode
+
+;; Copyright 2011-2015 secondplanet
+;;           2013-2015 Samuel Tonini, Matt DeBoard, Andreas Fuchs
+
+;; This file is not a part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, 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, write to the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+;;; Commentary:
+
+;;  Structural syntax support for elixir-mode
+
+;;; Code:
+
+(require 'smie)           ; Simple minded indentation engine
+(require 'cl-lib)         ; `cl-flet'
+
+;; HACK: Patch for Emacs 24.3 smie that fix
+;; https://github.com/elixir-lang/emacs-elixir/issues/107.
+;;
+;; defadvice is used to change the behavior only for elixir-mode.
+;; Definition of advice is a definition of corresponding function
+;; in Emacs 24.4.
+(when (and (= 24 emacs-major-version)
+           (= 3  emacs-minor-version))
+  (defadvice smie-rule-parent (around elixir-mode-patch activate)
+    (if (not (eq major-mode 'elixir-mode))
+        (progn ad-do-it)
+      (setq ad-return-value
+            (save-excursion
+              (goto-char (cadr (smie-indent--parent)))
+              (cons 'column
+                    (+ (or offset 0)
+                       (smie-indent-virtual)))))))
+
+  (defadvice smie-indent-comment (around elixir-mode-patch activate)
+    (if (not (eq major-mode 'elixir-mode))
+        (progn ad-do-it)
+      (setq ad-return-value
+            (and (smie-indent--bolp)
+                 (let ((pos (point)))
+                   (save-excursion
+                     (beginning-of-line)
+                     (and (re-search-forward comment-start-skip (line-end-position) t)
+                          (eq pos (or (match-end 1) (match-beginning 0))))))
+                 (save-excursion
+                   (forward-comment (point-max))
+                   (skip-chars-forward " \t\r\n")
+                   (unless
+                       (save-excursion
+                         (let ((next (funcall smie-forward-token-function)))
+                           (or (if (zerop (length next))
+                                   (or (eobp) (eq (car (syntax-after (point))) 5)))
+                               (rassoc next smie-closer-alist))))
+                     (smie-indent-calculate))))))))
+
+;; Declare variable that we need from the smie package
+(defvar smie--parent)
+
+(defvar elixir-smie-verbose-p nil
+  "Emit context information about the current syntax state.")
+
+(defvar elixir-mode-syntax-table
+  (let ((table (make-syntax-table)))
+
+    ;; Note that ?_ might be better as class "_", but either seems to
+    ;; work:
+    (modify-syntax-entry ?| "." table)
+    (modify-syntax-entry ?_ "_" table)
+    (modify-syntax-entry ?? "w" table)
+    (modify-syntax-entry ?~ "w" table)
+    (modify-syntax-entry ?! "_" table)
+    (modify-syntax-entry ?' "\"'" table)
+    (modify-syntax-entry ?\" "\"\"" table)
+    (modify-syntax-entry ?# "<" table)
+    (modify-syntax-entry ?\n ">" table)
+    (modify-syntax-entry ?\( "()" table)
+    (modify-syntax-entry ?\) ")(" table)
+    (modify-syntax-entry ?\{ "(}" table)
+    (modify-syntax-entry ?\} "){" table)
+    (modify-syntax-entry ?\[ "(]" table)
+    (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?: "_" table)
+    (modify-syntax-entry ?@ "_" table)
+    table)
+  "Elixir mode syntax table.")
+
+(defconst elixir-smie-grammar
+  (smie-prec2->grammar
+   (smie-merge-prec2s
+    (smie-bnf->prec2
+     '((id)
+       (statements (statement)
+                   (statement ";" statements))
+       (statement ("def" non-block-expr "do" statements "end")
+                  ("defp" non-block-expr "do" statements "end")
+                  ("defmacro" non-block-expr "do" statements "end")
+                  ("defmacrop" non-block-expr "do" statements "end")
+                  (non-block-expr "fn" match-statements "end")
+                  (non-block-expr "do" statements "end")
+                  ("if" non-block-expr "do" statements "else" statements "end")
+                  ("if" non-block-expr "do" statements "end")
+                  ("if" non-block-expr "COMMA" "do:" non-block-expr)
+                  ("if" non-block-expr "COMMA"
+                   "do:" non-block-expr "COMMA"
+                   "else:" non-block-expr)
+                  ("try" "do" statements "after" statements "end")
+                  ("try" "do" statements "catch" match-statements "end")
+                  ("try" "do" statements "rescue" match-statements "end")
+                  ("try" "do" statements "end")
+                  ("case" non-block-expr "do" match-statements "end")
+                  ("for" non-block-expr "COMMA" "do:" non-block-expr))
+       (non-block-expr (non-block-expr "OP" non-block-expr)
+                       ("(" non-block-expr ")")
+                       ("{" non-block-expr "}")
+                       ("[" non-block-expr "]")
+                       ("STRING"))
+       (match-statements (match-statement "MATCH-STATEMENT-DELIMITER"
+                                          match-statements)
+                         (match-statement))
+       (match-statement (non-block-expr "->" statements)))
+     '((assoc "if" "do:" "else:")
+       (assoc "COMMA")
+       (left "OP")))
+
+    (smie-precs->prec2
+     '((left "||")
+       (left "&&")
+       (nonassoc "=~" "===" "!==" "==" "!=" "<=" ">=" "<" ">")
+       (left "+" "-" "<<<" ">>>" "^^^" "~~~" "&&&" "|||")
+       (left "*" "/"))))))
+
+(defvar elixir-smie--operator-regexp
+  (rx (or "<<<" ">>>" "^^^" "~~~" "&&&" "|||" "===" "!==" "==" "!=" "<="
+          "=" ">=" "<" ">" "&&" "||" "<>" "++" "--" "//" "/>" "=~" "|>")))
+
+(defvar elixir-smie--binary-sequence-regexp
+  (rx (or "<<" ">>")))
+
+(defvar elixir-smie--block-operator-regexp
+  (rx "->" (0+ nonl)))
+
+(defvar elixir-smie--oneline-def-operator-regexp
+  (rx "do:" (0+ nonl)))
+
+(defvar elixir-smie--spaces-til-eol-regexp
+  (rx (and (1+ space) eol))
+  "Regex representing one or more whitespace characters concluding with eol.")
+
+(defvar elixir-smie--comment-regexp
+  (rx (and (0+ space) "#" (0+ not-newline)))
+  "Regex matching comments.")
+
+(defvar elixir-smie-indent-basic 2)
+
+(defmacro elixir-smie-debug (message &rest format-args)
+  `(progn
+     (when elixir-smie-verbose-p
+       (message (format ,message ,@format-args)))
+     nil))
+
+(defun elixir-smie--implicit-semi-p ()
+  (not (or (memq (char-before) '(?\{ ?\[))
+           (looking-back elixir-smie--operator-regexp (- (point) 3) t))))
+
+(defun elixir-smie-current-line-contains-built-in-keyword-p ()
+  "Return non-nil if the current line contains built in keywords with a `.'"
+  (save-excursion
+    (beginning-of-line)
+    (looking-at ".+\\.\\(case\\|try\\|if\\|rescue\\)")))
+
+(defun elixir-smie-last-line-end-with-block-operator-p ()
+  "Return non-nil if the previous line ends with a `->' operator."
+  (save-excursion
+    (forward-line -1)
+    (move-end-of-line 1)
+    (looking-back elixir-smie--block-operator-regexp (- (point) 3) t)))
+
+(defun elixir-smie-last-line-start-with-block-operator-p ()
+  (save-excursion
+    (forward-line -1)
+    (beginning-of-line)
+    (looking-at "^\s+->.+$")))
+
+(defun elixir-smie-line-starts-with-do-colon-p ()
+  (save-excursion
+    (beginning-of-line)
+    (looking-at "^\s+do:")))
+
+(defun elixir-smie--semi-ends-match ()
+  "Return non-nil if the current line concludes a match block."
+  (when (not (eobp))
+    (save-excursion
+      ;; Warning: Recursion.
+      ;; This is easy though.
+
+      ;; 1. If we're at a blank line, move forward a character. This takes us to
+      ;;    the next line.
+      ;; 2. If we're not at the end of the buffer, call this function again.
+      ;;    (Otherwise, return nil.)
+
+      ;; The point here is that we want to treat blank lines as a single semi-
+      ;; colon when it comes to detecting the end of match statements. This could
+      ;; also be handled by a `while' expression or some other looping mechanism.
+      (cl-flet ((self-call ()
+                           (if (< (point) (point-max))
+                               (elixir-smie--semi-ends-match)
+                             nil)))
+        (cond
+         ((and (eolp) (bolp))
+          (forward-char)
+          (self-call))
+         ((looking-at elixir-smie--spaces-til-eol-regexp)
+          (forward-char)
+          (self-call))
+         ;; And if we're NOT on a blank line, move to the end of the line, and see
+         ;; if we're looking back at a block operator.
+         (t (move-end-of-line 1)
+            (looking-back elixir-smie--block-operator-regexp)))))))
+
+(defun elixir-smie--same-line-as-parent (parent-pos child-pos)
+  "Return non-nil if `child-pos' is on same line as `parent-pos'."
+  (= (line-number-at-pos parent-pos) (line-number-at-pos child-pos)))
+
+(defun elixir-smie-forward-token ()
+  (cond
+   ;; If there is nothing but whitespace between the last token and eol, emit
+   ;; a semicolon.
+   ((looking-at elixir-smie--spaces-til-eol-regexp)
+    (goto-char (match-end 0))
+    ";")
+   ((and (or (looking-at elixir-smie--comment-regexp)
+             (looking-at "[\n#]"))
+         (elixir-smie--implicit-semi-p))
+    (when (not (save-excursion
+                 (forward-comment 1)
+                 (eobp)))
+      (if (eolp) (forward-char 1) (forward-comment 1)))
+    ;; Note: `elixir-smie--semi-ends-match' will be called when the point is at
+    ;; the beginning of a new line. Keep that in mind.
+    (if (elixir-smie--semi-ends-match)
+        "MATCH-STATEMENT-DELIMITER"
+      ";"))
+   ((looking-at elixir-smie--block-operator-regexp)
+    (goto-char (match-end 0))
+    "->")
+   ((looking-at elixir-smie--operator-regexp)
+    (goto-char (match-end 0))
+    "OP")
+   (t
+    (let ((token (smie-default-forward-token)))
+      (unless (elixir-smie-empty-string-p token)
+        token)))))
+
+(defun elixir-smie-backward-token ()
+  (let ((pos (point)))
+    (forward-comment (- (point)))
+    (cond
+     ((and (> pos (line-end-position))
+           (elixir-smie--implicit-semi-p))
+      (if (elixir-smie--semi-ends-match)
+          "MATCH-STATEMENT-DELIMITER"
+        ";"))
+     ((looking-back elixir-smie--oneline-def-operator-regexp (- (point) 3) t)
+      (goto-char (match-beginning 0))
+      ";")
+     ((looking-back elixir-smie--block-operator-regexp (- (point) 3) t)
+      (goto-char (match-beginning 0))
+      "->")
+     ((looking-back elixir-smie--binary-sequence-regexp (- (point) 3) t)
+      (goto-char (match-beginning 0))
+      "OP")
+     ((looking-back elixir-smie--operator-regexp (- (point) 3) t)
+      (goto-char (match-beginning 0))
+      "OP")
+     (t (smie-default-backward-token)))))
+
+(defun verbose-elixir-smie-rules (kind token)
+  (let ((value (elixir-smie-rules kind token)))
+    (elixir-smie-debug "%s '%s'; sibling-p:%s parent:%s prev-is-OP:%s hanging:%s == %s" kind token
+                       (ignore-errors (smie-rule-sibling-p))
+                       (ignore-errors smie--parent)
+                       (ignore-errors (smie-rule-prev-p "OP"))
+                       (ignore-errors (smie-rule-hanging-p))
+                       value)
+    value))
+
+(defun elixir-smie-rules (kind token)
+  (pcase (cons kind token)
+    (`(:list-intro . ";")
+     -4)
+    (`(:elem . args)
+     -4)
+    (`(:before . "OP")
+     (cond ((and (not (smie-rule-hanging-p))
+                 (smie-rule-prev-p "OP"))
+            -2)
+           ((smie-rule-parent-p "def" "defp" "defmacro" "defmacrop")
+            (smie-rule-parent))))
+    (`(:before . "def")
+     (cond
+      (t
+       (smie-rule-parent))))
+    (`(:before . "defp")
+     (cond
+      (t
+       (smie-rule-parent))))
+    (`(:before . "defmacro")
+     (cond
+      (t
+       (smie-rule-parent))))
+    (`(:before . "defmacrop")
+     (cond
+      (t
+       (smie-rule-parent))))
+    (`(:after . "OP")
+     (cond
+      ((smie-rule-sibling-p) nil)
+      ((smie-rule-hanging-p) (smie-rule-parent elixir-smie-indent-basic))
+      ((and (not (smie-rule-sibling-p))
+            (not (smie-rule-hanging-p))
+            (smie-rule-parent-p "do:"))
+       ;; Dedent the line after an OP if it's after a "do:" token, which implies
+       ;; a one-line function.
+       (smie-rule-parent
+        (- (+ elixir-smie-indent-basic elixir-smie-indent-basic))))
+      (t (smie-rule-parent))))
+    (`(:before . "MATCH-STATEMENT-DELIMITER")
+     (cond
+      ((and (smie-rule-parent-p "do")
+            (smie-rule-hanging-p))
+       (smie-rule-parent))
+      ;; There is a case when between two line inside a def block
+      ;; when jumping to the next line and indent, where the cursor
+      ;; jumps too much in front.
+      ;;
+      ;; Example:
+      ;; def generate_pkg(path, opts) do
+      ;;   name = Path.basename(Path.expand(path))
+      ;;
+      ;;   File.mkdir_p!(path)
+      ;;                              <-
+      ;;   File.cd! path, fn ->
+      ;;     _generate_pkg(name, opts)
+      ;;   end
+      ;; end
+      ((and (smie-rule-parent-p "do")
+            (not (smie-rule-hanging-p)))
+       0)
+      ((and (not (smie-rule-sibling-p))
+            (nth 2 smie--parent)
+            (smie-rule-hanging-p))
+       (smie-rule-parent elixir-smie-indent-basic))
+      ((and (not (smie-rule-sibling-p))
+            (not (nth 2 smie--parent))
+            (smie-rule-hanging-p))
+       (smie-rule-parent))))
+    (`(:after . "MATCH-STATEMENT-DELIMITER")
+     (cond
+      ((and (smie-rule-parent-p "MATCH-STATEMENT-DELIMITER")
+            (smie-rule-hanging-p)
+            (smie-rule-sibling-p))
+       (if (elixir-smie-last-line-end-with-block-operator-p)
+           (smie-rule-parent)
+         0))
+      ((and (smie-rule-parent-p "after")
+            (smie-rule-hanging-p))
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t
+       (smie-rule-parent))))
+    (`(:before . "fn")
+     (smie-rule-parent))
+    (`(:before . "for")
+     (smie-rule-parent))
+    (`(:before . "do:")
+     (cond
+      ((smie-rule-parent-p "def" "if" "defp" "defmacro" "defmacrop")
+       (smie-rule-parent))
+      ((and (smie-rule-parent-p ";")
+            (not (smie-rule-hanging-p)))
+       (smie-rule-parent))
+      ;; Example
+      ;;
+      ;; hi = for i <- list, do: i
+      ;; # weird spacing now <- Indent
+      ;;
+      ;; for i <- list, do: i
+      ;; IO.puts 'WORKED' <- Indent
+      ((and (smie-rule-parent-p "for")
+            (not (smie-rule-hanging-p)))
+       (smie-rule-parent))
+      ((and (smie-rule-parent-p "OP")
+            (not (smie-rule-hanging-p)))
+       (smie-rule-parent))))
+    (`(:before . "do")
+     (cond
+      ((and (smie-rule-parent-p "case")
+            (smie-rule-hanging-p))
+       (smie-rule-parent 2))
+      ;; There is a case when between two line inside a def block
+      ;; when jumping to the next line and indent, where the cursor
+      ;; jumps too much in front.
+      ;;
+      ;; Example:
+      ;; def generate_pkg(path, opts) do
+      ;;   name = Path.basename(Path.expand(path))
+      ;;
+      ;;   File.mkdir_p!(path)
+      ;;                              <-
+      ;;   File.cd! path, fn ->
+      ;;     _generate_pkg(name, opts)
+      ;;   end
+      ;; end
+      ((and (smie-rule-parent-p "def")
+            (smie-rule-hanging-p))
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t
+       elixir-smie-indent-basic)))
+    (`(:before . "end")
+     (smie-rule-parent))
+    ;; Closing paren on the other line
+    (`(:before . "(")
+     (cond
+      ((smie-rule-parent-p "fn")
+       (smie-rule-parent elixir-smie-indent-basic))
+      ;; Indent parenthesis correctly inside a block
+      ;;
+      ;; Example:
+      ;;
+      ;; def bar do
+      ;;   ()
+      ;; .....
+      ((smie-rule-parent-p "do")
+       (smie-rule-parent))
+      (t (smie-rule-parent))))
+    (`(:before . "[")
+     (cond
+      ((smie-rule-hanging-p)
+       (smie-rule-parent))))
+    (`(:before . "{")
+     (cond
+      ;; Example
+      ;;
+      ;; case parse do
+      ;;   { [ help: true ], _, _ }
+      ;;     -> :help
+      ;;   { _, [ user, project, count ], _ }
+      ((and (not (smie-rule-hanging-p))
+            (smie-rule-parent-p "do"))
+       ;; If the last line ends with a block operator `->'
+       ;; indent two spaces more
+       ;;
+       ;; Example
+       ;;
+       ;; case File.read("/usr/share/dict/words") do
+       ;;   {:ok, contents} ->
+       ;;     {:something, contents} <- Indent here two spaces
+       ;;   ...
+       (if (elixir-smie-last-line-end-with-block-operator-p)
+           (smie-rule-parent elixir-smie-indent-basic)
+         (smie-rule-parent)))
+      ((and (smie-rule-parent-p "MATCH-STATEMENT-DELIMITER")
+            (not (smie-rule-hanging-p)))
+       (if (elixir-smie-last-line-end-with-block-operator-p)
+           (smie-rule-parent elixir-smie-indent-basic)
+         (if (elixir-smie-last-line-start-with-block-operator-p)
+             (smie-rule-parent -2)
+           (smie-rule-parent))))
+      ((and (smie-rule-parent-p "OP")
+            (smie-rule-hanging-p))
+       (smie-rule-parent))))
+    (`(:after . "{")
+     (cond
+      ((smie-rule-hanging-p)
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t elixir-smie-indent-basic)))
+    (`(:after . "[")
+     (cond
+      ((smie-rule-hanging-p)
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t elixir-smie-indent-basic)))
+    (`(:before . "if")
+     (cond
+      ;; Indent when if is inside a `->' block
+      ;;
+      ;; Example:
+      ;;
+      ;; whatever ->
+      ;;   if true do <-
+      ;;     :foo
+      ;;   end
+      ;;   ....
+      ((elixir-smie-last-line-end-with-block-operator-p)
+       (smie-rule-parent elixir-smie-indent-basic))
+      (t
+       (smie-rule-parent))))
+    (`(:before . "->")
+     (cond
+      ;; Example
+      ;;
+      ;; receive do
+      ;; after
+      ;;   2000 ->
+      ;;     IO.puts 'hello'
+      ;;     IO.puts 'status 2000 ends' <- Indent second line
+      ;;   { :ok } ->
+      ;;     ....
+      ((and (smie-rule-parent-p "after")
+            (not (smie-rule-sibling-p)))
+       (smie-rule-parent (+ elixir-smie-indent-basic
+                            elixir-smie-indent-basic)))
+      ;; Example
+      ;;
+      ;; case parse do
+      ;;   { [ help: true ], _, _ }
+      ;;     -> :help
+      ;;   ...
+      ((and (not (smie-rule-hanging-p))
+            (smie-rule-parent-p "do"))
+          elixir-smie-indent-basic)
+      ((and (not (smie-rule-hanging-p))
+            (smie-rule-parent-p "MATCH-STATEMENT-DELIMITER"))
+       (smie-rule-parent))
+      (t (smie-rule-parent elixir-smie-indent-basic))))
+    (`(:after . "->")
+     (cond
+      ;; This first condition is kind of complicated so I'll try to make this
+      ;; comment as clear as possible.
+
+      ;; "If `->' is the last thing on the line, and its parent token
+      ;; is `fn' ..."
+      ((and (smie-rule-hanging-p)
+            (smie-rule-parent-p "fn"))
+       ;; "... and if:
+
+       ;; 1. `smie--parent' is non-nil
+       ;; 2. the `->' token in question is on the same line as its parent (if
+       ;;    the logic has gotten this far, its parent will be `fn')
+
+       ;; ... then indent the line after the `->' aligned with the
+       ;; parent, offset by `elixir-smie-indent-basic'."
+       (if (and smie--parent (elixir-smie--same-line-as-parent
+                              (nth 1 smie--parent)
+                              (point)))
+           (smie-rule-parent elixir-smie-indent-basic)
+         elixir-smie-indent-basic))
+      ;; Otherwise, if just indent by two.
+      ((smie-rule-hanging-p)
+       (cond
+        ((smie-rule-parent-p "catch" "rescue")
+         (smie-rule-parent (+ elixir-smie-indent-basic
+                              elixir-smie-indent-basic)))
+        ((smie-rule-parent-p "do" "try")
+         (smie-rule-parent elixir-smie-indent-basic))
+        ;; Example
+        ;;
+        ;; receive do
+        ;; after
+        ;;   2000 ->
+        ;;     IO.puts 'hello' <- Indent two spaces
+        ((and (smie-rule-parent-p "after")
+              (smie-rule-hanging-p)
+              (not (smie-rule-sibling-p)))
+         (smie-rule-parent (+ elixir-smie-indent-basic
+                              elixir-smie-indent-basic)))
+        (t (smie-rule-parent elixir-smie-indent-basic))))))
+    (`(:before . ";")
+     (cond
+      ;; Handle cases where built in keywords are used
+      ;; as function names.
+      ;;
+      ;; Example:
+      ;;
+      ;; def foo(test) do
+      ;;   test_case = test.case
+      ;;   run(test_case)
+      ;; end
+      ((and (smie-rule-parent-p "case" "try" "rescue")
+            (smie-rule-hanging-p)
+            (elixir-smie-current-line-contains-built-in-keyword-p))
+       (+ (- (cdr (smie-rule-parent))) (+ elixir-smie-indent-basic
+                                          elixir-smie-indent-basic)))
+      ;; There is a case after an one line definition of functions/macros
+      ;; when an `if' keyword token is involved, where the next block `end'
+      ;; token will have a `if' as parent and it's hanging.
+      ;;
+      ;; Example:
+      ;;
+      ;; defmacro my_if(expr, do: if_block), do: if(expr, do: if_block, else: nil)
+      ;; defmacro my_if(expr, do: if_block, else: else_block) do
+      ;;   ...
+      ;; end <- parent is `if`
+      ((and (smie-rule-parent-p "if")
+            (smie-rule-hanging-p))
+       (smie-rule-parent))
+      ((and (smie-rule-parent-p "else")
+            (smie-rule-hanging-p))
+       (smie-rule-parent elixir-smie-indent-basic))
+      ((smie-rule-parent-p "after" "catch" "def" "defmodule" "defp" "do" "else"
+                           "fn" "if" "rescue" "try" "unless" "defmacro" "defmacrop")
+       (smie-rule-parent))
+      ;; Example
+      ;;
+      ;; case parse do
+      ;;   { [ help: true ], _, _ }
+      ;;     -> :help
+      ;;   { _, [ user, project, count ], _ }
+      ;;     -> { user, project, count }
+      ;;   ...
+      ((and (smie-rule-parent-p "->")
+            (smie-rule-hanging-p))
+       (smie-rule-parent))
+      ;; Example
+      ;;
+      ;; defp skip,
+      ;;   do: true <- indent two spaces
+      ((and (smie-rule-parent-p ";")
+            (smie-rule-hanging-p)
+            (elixir-smie-line-starts-with-do-colon-p))
+       (smie-rule-parent (- elixir-smie-indent-basic)))))
+    (`(:after . ";")
+     (cond
+      ((smie-rule-parent-p "def")
+       (smie-rule-parent))
+      ((and (smie-rule-parent-p "if")
+            (elixir-smie-current-line-contains-built-in-keyword-p))
+       (+ (- (cdr (smie-rule-parent))) (+ elixir-smie-indent-basic
+                                          elixir-smie-indent-basic)))
+      ((smie-rule-parent-p "if")
+       (smie-rule-parent))
+      ((smie-rule-parent-p "after")
+       (smie-rule-parent elixir-smie-indent-basic))
+      ((and (smie-rule-parent-p "(")
+            (boundp 'smie--parent)
+            (save-excursion
+              (goto-char (cadr smie--parent))
+              (smie-rule-hanging-p)))
+       (smie-rule-parent elixir-smie-indent-basic))))))
+
+(defun elixir-smie--heredoc-at-current-point-p ()
+  "Return non-nil if cursor is at a string."
+  (save-excursion
+    (or (and (nth 3 (save-excursion
+                      (let ((pos (point)))
+                        (parse-partial-sexp 1 pos))))
+             (nth 8 (save-excursion
+                      (let ((pos (point)))
+                        (parse-partial-sexp 1 pos)))))
+        (and (looking-at "\"\"\"")
+           (match-beginning 0)))))
+
+(defun elixir-smie--previous-line-empty-p ()
+  "Return non-nil if the previous line is blank."
+  (save-excursion
+    (forward-line -1)
+    (and (eolp) (bolp))))
+
+(defun elixir-smie--previous-line-indentation ()
+  "Return the indentation of the previous line."
+  (save-excursion
+    (forward-line -1)
+    (current-indentation)))
+
+;; Add the custom function to handle indentation inside heredoc to the
+;; smie-indent-functions list. The indentation function will only be
+;; process inside an elixir-mode.
+(defun elixir-smie--indent-inside-heredoc ()
+  "Handle indentation inside Elixir heredocs.
+
+Rules:
+  1. If the previous line is empty, indent as the basic indentation
+     at the beginning of the heredoc.
+  2. If the previous line is not empty, indent as the previous line.
+"
+  (if (eq major-mode 'elixir-mode)
+      (if (elixir-smie--heredoc-at-current-point-p)
+          (let ((indent
+                 (save-excursion
+                   (when (re-search-backward "^\\(\s+\\).+\"\"\"" nil t)
+                     (string-width (match-string 1))))))
+            (if (elixir-smie--previous-line-empty-p)
+                (goto-char indent)
+              (goto-char (elixir-smie--previous-line-indentation)))))))
+
+(defun elixir-smie-empty-string-p (string)
+  "Return non-nil if STRING is null, blank or whitespace only."
+  (or (null string)
+      (string= string "")
+      (if (string-match-p "^\s+$" string) t)))
+
+(add-to-list 'smie-indent-functions 'elixir-smie--indent-inside-heredoc)
+
+(provide 'elixir-smie)
+
+;;; elixir-smie.el ends here
diff --git a/emacs.d/elpa/elpy-20150502.740/NEWS.rst b/emacs.d/elpa/elpy-20150502.740/NEWS.rst
deleted file mode 100644
index 9783ced..0000000
--- a/emacs.d/elpa/elpy-20150502.740/NEWS.rst
+++ /dev/null
@@ -1,375 +0,0 @@
-New in Elpy 1.8.0
-=================
-
-- Emacs 24.5 is now officially supported
-- The new configuration option ``elpy-rpc-ignored-buffer-size`` defines a maximum buffer size to be handle completion in, to avoid laggy interaction in unusually large files
-- Indentation block movement was replaced with code that just moves the marked block or the current line; this should be a lot less magical and more predictable
-- Running the test at point now correctly ignores any inner methods
-- Jedi docstrings now show the full name of the object
-- The RPC interpreter is now chosen correctly on cygwin
-- ``elpy-shell-send-region-or-buffer`` now warns of tabs in the data being sent
-- Elpy now binds stdout and stderr to ``/dev/null`` to avoid being confused by spurious output from other libraries
-- RPC buffers (and processes) are removed after some time to avoid them piling up endlessly
-- It is not possibly anymore to use customize alone to use ipython, because of some bad interaction between custom options in Elpy and python.el
-- And lots of bugfixes (50 issues closed!)
-
-
-New in Elpy 1.7.1
-=================
-
-- Do not fail on errors from importmagic.
-- Handle new minor mode behavior of new versions of yasnippet.
-- Do use the argument to ``elpy-use-ipython`` correctly.
-- Handle unexpected data from the backend more gracefully.
-
-
-New in Elpy 1.7.0
-=================
-
-- Elpy now can add missing import directives automatically, by using
-  Alec Thomas' excellent importmagic_ library. Use ``C-c C-m`` to add
-  a single import statement, or ``C-c C-S-m`` to include all missing
-  import statements. Many thanks to Georg Brandl for doing a lot of
-  work to bring this feature to Elpy!
-- The Jedi backend now also supports ``C-c C-d`` to display a
-  docstring. Thanks again to Georg Brandl for the patch.
-- It is now possible to disable the display of the current function in
-  the echo area by setting ``elpy-eldoc-show-current-function`` to
-  ``nil``.
-- idomenu was removed.
-- Twisted's Trial test runner is now supported. Thanks to Elric Milon
-  for the patch!
-- All test runners now use a variable to decide which command to run,
-  which for example allows using ``manage.py`` for the Django test
-  runner, or your own test script which sets up the environment
-  correctly.
-- Emacs 24.4 is now officially supported.
-- Various bugfixes.
-
-.. _importmagic: https://github.com/alecthomas/importmagic
-
-New in Elpy 1.6.0
-=================
-
-- When point is on a line with a flymake error, Elpy will now show the
-  error in the echo area.
-- The movement commands (``C-<cursor>``) have been reworked again.
-  Going left and right will now move by indentation levels left of the
-  current indentation, i.e. jump four spaces, and by words right of
-  the current indentation. Going up and down will go to the previous
-  or next line with the indentation level point is at, not the
-  indentation the line has. Try it, it's more difficult to explain
-  than to use.
-- Completion results are now sorted more sensibly, with
-  single-underscore symbols at the end, and double-underscore symbols
-  after normal symbols, but before single-underscore ones.
-- ``M-x elpy-config`` will now point out if there are newer versions
-  available for packages used by Elpy.
-- ``M-x elpy-config`` will now warn if ``~/.local/bin`` is not in
-  ``PATH`` while there is no virtualenv active.
-- The ``M-x elpy-version`` command is back by popular demand.
-- RPC buffers used by Elpy are now hidden by default, having a space
-  at the beginning of the name.
-- When the Rope library throws an error, Elpy will now also attempt to
-  provide reproduction steps. This used to only happen for Jedi.
-- Various bug fixes.
-
-
-New in Elpy 1.5.1
-=================
-
-- Fix a bug where company-mode might get confused about the current
-  backend, leading to an error about ``Symbol's function definition is
-  void: nil``
-- Fix Rope so it won’t search the whole project directory. This was an
-  intended feature in v1.5 which did not work originally.
-- Use ``yas-text`` instead of ``text`` in snippets for compatibility
-  with the unreleased yasnippet from MELPA (thanks to Daniel Wu!)
-
-New in Elpy 1.5.0
-=================
-
-- Elpy now has a `manual`_. Additionally, there's a menu bar now which
-  should make it easier to discover Elpy features.
-- The Elpy Python package now ships with the Emacs Lisp package,
-  removing the need to install Elpy via pip.
-- Python 3.4 is now officially supported.
-- The new command ``elpy-config`` can be used to configure Elpy using
-  Emacs' built-in customize system. Elpy has been changed to make the
-  most of this.
-- Elpy now uses company-mode instead of auto-complete for on-the-fly
-  auto completion. This changes a few things. There is no automatic
-  documentation popup anymore. Instead, you can type ``C-d`` and get
-  the documentation buffer. In addition, you can type ``C-w`` to see
-  the source of the current candidate in context.
-- Elpy now uses pyvenv as the virtualenv module, enabling
-  virtualenvwrapper hooks.
-- We now ship with a large number of YASnippet snippets. Try ``M-x
-  yas-insert-snippet``.
-- The new unified test running interface on ``C-c C-t`` will try to
-  determine the current test and run it, or, failing that, run all
-  tests. Provide a prefix argument to just run all tests no matter
-  what. You can change the test runner to be used using
-  ``elpy-set-test-runner``. Elpy supports the default unittest
-  discover runner, the Django discover runner, nosetests and py.test
-  by default. New test runners can easily be defined.
-- There's a new multi-edit functionality. ``C-c C-e`` will edit all
-  occurrences of the symbol under point. When using Jedi, this is
-  using semantic information as opposed to just syntactic one. When a
-  region is active, edit all occurrences of the text in region in the
-  current buffer.
-- When sending Python code to the interactive interpreter using ``C-c
-  C-c``, Elpy will now not automatically pop to the interpreter
-  anymore. Use ``C-c C-z`` to switch to the interpreter.
-- Elpy will now display the current class and function if there is no
-  call tip to be displayed. Removes the ``C-c C-q`` binding.
-- If there is a call tip, highlight the current argument (requires Jedi).
-- The documentation interface using ``C-c C-d`` is much smarter now,
-  falling back to pydoc when necessary and providing sensible
-  completion for that, too. Provide a prefix argument if you want no
-  smarts, just pydoc.
-- ``<S-return>`` and ``<C-S-return>`` now open a line below or above
-  the current one.
-- ``<C-cursor>`` will now navigate between Python blocks of the same
-  indentation level. ``<M-cursor>`` will move the current block. Try
-  it, it's easier to understand when you see it than to explain it.
-- There's a new concept of modules. The variable
-  ``elpy-default-minor-modes`` is gone (use ``elpy-mode-hook`` for
-  minor modes). Instead, there's now ``elpy-modules`` which can be
-  used to enable or disable certain features of Elpy.
-- ``elpy-clean-modeline`` is gone, modules now clean themselves up.
-- Elpy now distinguishes between the project root, where project files
-  are located, and the library root, which should be part of
-  ``sys.path`` to import the module under development.
-- ``elpy-project-ignored-directories`` replaces the old
-  ``elpy-rgrep-ignored-directories`` and is used by more features.
-- ``elpy-doc-websearch`` has been removed as it was barely useable
-  as is.
-- Elpy now tries to be more helpful when errors in the backend happen.
-  This removes ``elpy-rpc-traceback``, as that will be displayed by
-  default.
-- Optimizations were added to handle large files, making general
-  interaction a lot faster.
-- When Rope is being used, do not search through unusually large
-  directories. This should speed up interaction in those cases,
-  especially when editing a file in the home directory.
-- And a whole lot of minor bug fixes and little improvements.
-
-.. _manual: http://elpy.readthedocs.org/
-
-
-New in Elpy 1.4.2
-==================
-
-- Minor bugfix to prevent an error from projectile-project-root to
-  interfere with Elpy’s project finding strategy.
-
-New in Elpy 1.4.1
-=================
-
-- Elpy now sets project-wide preferences for Rope, enabling completion
-  in the sys package, among others.
-- An error is avoided in the Jedi backend when trying to go to symbols
-  in compiled packages.
-- A compatibility alias was added for nose.el, which insists on
-  breaking backwards compatibility with Emacs 24.x.
-
-New in Elpy 1.4.0
-=================
-
-- Elpy has moved to its own ELPA. Make sure to update your
-  package-archives (as described above).
-- For a file in a Projectile-managed project is opened, Elpy will now
-  use Projectile’s project root.
-- When the user has set a valid python-check-command, elpy will now
-  refrain from overriding it.
-- On Windows, elpy is now using the pythonw.exe interpreter for the
-  RPC process, as that seems to be causing fewer issues.
-- And various smaller bugfixes.
-
-New in Elpy 1.3.0
-=================
-
-- virtualenv.el has been replaced by pyvenv.el, as that library offers
-  more features.
-- elpy-rpc-restart now works globally, not just in Elpy buffers.
-- Elpy does not try to complete in comments anymore.
-- The new command elpy-rpc-traceback gives access to the last stack
-  trace in the Elpy backend, helping with debugging problems.
-- The flymake check function is now run with the current directory as
-  / to avoid accidental imports.
-- Ensure correct handling of yas-snippet-dirs by Elpy. This variable
-  can be a string, so ensure it’s a list before adding to it.
-- The new variable elpy-show-installation-instructions can be used to
-  disable the installation screen.
-- Fix a very nasty bug causing spurious empty lines in a buffer or
-  consume 100% CPU in certain situations when using the Jedi backend.
-  Thanks to Matthias Dahl for finding this bug.
-- Various other bugfixes.
-
-New in Elpy 1.2.1
-=================
-
-Bugfix release.
-
-- The refactoring was not ported to the new asynchronous API,
-  resulting in an error when refactoring was attempted.
-- The project root now always returns a directory. Too many parts of
-  elpy relies on this. If the project root turns out to be your home
-  directory, elpy will warn you about it.
-- Elpy now works correctly with Emacs 24.2. There were some
-  compatibility functions missing.
-- Blocking RPC calls now do not block for one second even if there is
-  process output.
-
-New in Elpy 1.2
-===============
-
-- Elpy now uses asynchronous RPC. This means that Emacs should not
-  freeze anymore while eldoc or auto-complete functions run.
-- ``elpy-shell-send-region-or-buffer`` will now remove common
-  indentation of the region, making it possible to easily send parts
-  of an if statement or function body without manually adjusting the
-  indentation.
-- The Python package depends on ``flake8``, and will also try to be
-  smarter when detecting ``flake8`` for on-the-fly checking.
-- ``elpy-check`` can be run with a prefix argument to check the whole
-  project, instead of only the current file.
-- ``elpy-rgrep-symbol`` now ignores a few common directories
-  (``.tox``, ``build``, ``dist``).
-- When using the rope backend, Elpy will not create the
-  ``.ropeproject`` folders anymore. This should keep projects a lot
-  cleaner.
-
-New in Elpy 1.1
-===============
-
-- Elpy now always uses the root directory of the package as the
-  project root; this should avoid some confusion and improve
-  auto-completion suggestions
-- ``elpy-shell-send-region-or-buffer`` now accepts a prefix argument
-  to run code wrapped behind ``if __name__ == '__main__'``, which is
-  ignored by default
-- ``elpy-project-root`` is now a safe local variable and can be set
-  from file variables
-- Elpy now supports project-specific RPC processes, see
-  ``elpy-rpc-project-specific`` for how to use this
-- ``M-*`` now works to go back where you came from after a ``M-.``
-- Elpy now ships with a few dedicated snippets for YASnippet
-- Support and require Jedi 0.6.0
-
-New in Elpy 1.0
-===============
-
-- Version 0.9 was a release candidate, so this release focused on bug
-  fixes instead of new features.
-- ``elpy-enable`` now takes an optional argument that skips variable
-  initialization for those users who prefer their own defaults for
-  other modes.
-- ``python-check.sh`` has been removed from Elpy, as the flake8 tool
-  from pypi does everything it does, only better.
-- Elpy will now start the helper subprocess in the root directory,
-  avoiding accidental Python path clobbering.
-
-New in Elpy 0.9
-===============
-
-- Elpy now officially support Python 2.6, 2.7 and 3.3 on Emacs 24.2
-  and 24.3, with continuous integration tests thanks to
-  `Travis CI`_.
-- Extended support for Pydoc. ``C-u C-c C-d`` will now prompt for an
-  auto-completed symbol to run Pydoc on. The pydoc output will be
-  formatted and placed in a help buffer for easy review.
-- Refactoring support is back. ``C-c C-r`` will pop up a refactoring
-  wizard offering various refactoring options. Most of them depend on
-  the presence of Rope, though, even if Jedi is used as a completion
-  backend.
-- The Rope backend has been extended to provide completions for
-  modules in an import clause.
-- New refactoring option: Add missing imports. This will search for
-  undefined symbols in the current file and automatically add
-  appropriate imports.
-- ``C-c C-c (elpy-rgrep-symbol)`` now prompts for a regexp when a prefix
-  argument is given instead of using the symbol at point.
-
-.. _Travis CI: https://travis-ci.org/
-
-New in Elpy 0.8
-===============
-
-Python Backend Rewrite
-----------------------
-
-- Elpy does not use Pymacs, Ropemacs and Ropemode anymore, but instead
-  provides its own Python interface with the elpy package on PyPI.
-- This not only should improve performance, but also enables using
-  Jedi as an alternative backend for completion. Use ``M-x
-  elpy-set-backend`` to change between rope and jedi. For now, this
-  does disable all refactoring support, though.
-
-Project Support
----------------
-
-- Elpy now has built-in project support. The interface is rather
-  simple: You can set ``elpy-project-root`` to the correct value in
-  ``.dir-locals.el``, or just rely on the automatic detection. If you
-  change your mind, you can always just ``elpy-set-project-root``.
-- New dependency: Find File in Project (ffip), bound to ``C-c C-f`` by
-  default. This will allow you to find files anywhere in your project
-  using a search-as-you-type interface like ido.
-- New dependency: nose, bound to ``C-c C-t`` by default. This will run
-  the nosetests binary in the root of your current library directory.
-  You can restrict the tests being run to the current test or the
-  current module by adding prefix arguments.
-- New function: Recursive grep for symbol, bound to ``C-c C-s`` by
-  default. This will search for the symbol at point in the whole
-  project.
-
-New dependencies
-----------------
-
-- idomenu, bound to ``C-c C-j`` by default. This replaces the standard
-  imenu interface with an ido-based search-as-you-type interface for
-  definitions in the current buffer.
-- virtualenv.el, replacing pyvirtualenv.el). Use ``M-x
-  virtualenv-workon`` to enable a virtualenv.
-- iedit.el, bound to ``M-,`` by default. This highlights all occurrences
-  of the symbol at point or the active region in the current buffer or
-  narrowing. When you edit any of them, all others will be edited the
-  same. This allows some basic and very quick refactoring.
-- New variable ``elpy-default-minor-modes`` which is run by ``elpy-mode``
-  on startup. If you don’t want to use some modes, remove them from
-  here.
-
-Key Bindings and Functions
---------------------------
-
-- The key bindings have been reworked and cleaned up. Sorry, this
-  might cause confusion.
-- Yasnippet is now on its own keybinding, ``C-c C-i``, instead of
-  sharing the auto-complete interface. This was done because some
-  snippets conflicted with legitimate, unsnippy completions.
-- New function: Occur Definitions, bound to ``C-c C-o`` by default. This
-  will run the standard occur command to show definitions (classes and
-  functions) in your current buffer, giving you a very quick outline
-  and the ability to jump to different definitions quickly.
-- New function: Show Defun, bound to ``C-c C-q`` by default. This will
-  show the current method and possibly class in the mode line, which
-  is helpful in long functions.
-- New functions: Forward/backward definition, bound to ``M-n`` and ``M-p``
-  as well as ``<M-down>`` and ``<M-up>`` by default. These will jump to
-  the next or previous definition (class or function), helping with
-  quick navigation through a file.
-
-Miscellaneous
--------------
-
-- The documentation function (``C-c C-d``) now uses pydoc when a prefix
-  arg is given.
-- The web search function (``C-c C-w``) now searches for the current
-  symbol by default. The tab-completing web documentation interface
-  was removed and is scheduled to be replaced with a new pydoc
-  interface in future versions.
-- The ``python-check.sh`` is now shipped with elpy. If you load elpy.el
-  before you load python.el, it should be the default
-  ``python-check-command``.
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy-autoloads.el b/emacs.d/elpa/elpy-20150502.740/elpy-autoloads.el
deleted file mode 100644
index 5e6db34..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy-autoloads.el
+++ /dev/null
@@ -1,51 +0,0 @@
-;;; elpy-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "elpy" "elpy.el" (21837 24215 0 0))
-;;; Generated autoloads from elpy.el
-
-(autoload 'elpy-enable "elpy" "\
-Enable Elpy in all future Python buffers.
-
-\(fn &optional IGNORED)" t nil)
-
-(autoload 'elpy-mode "elpy" "\
-Minor mode in Python buffers for the Emacs Lisp Python Environment.
-
-This mode fully supports virtualenvs. Once you switch a
-virtualenv using \\[pyvenv-workon], you can use
-\\[elpy-rpc-restart] to make the elpy Python process use your
-virtualenv.
-
-\\{elpy-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'elpy-config "elpy" "\
-Configure Elpy.
-
-This function will pop up a configuration buffer, which is mostly
-a customize buffer, but has some more options.
-
-\(fn)" t nil)
-
-(autoload 'elpy-version "elpy" "\
-Display the version of Elpy.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("elpy-pkg.el" "elpy-refactor.el") (21837
-;;;;;;  24215 521841 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; elpy-autoloads.el ends here
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy-pkg.el b/emacs.d/elpa/elpy-20150502.740/elpy-pkg.el
deleted file mode 100644
index d0fdb5f..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy-pkg.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(define-package "elpy" "20150502.740" "Emacs Python Development Environment"
-  '((company "0.8.2")
-    (find-file-in-project "3.3")
-    (highlight-indentation "0.5.0")
-    (pyvenv "1.3")
-    (yasnippet "0.8.0")))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy-refactor.el b/emacs.d/elpa/elpy-20150502.740/elpy-refactor.el
deleted file mode 100644
index de3b2c2..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy-refactor.el
+++ /dev/null
@@ -1,285 +0,0 @@
-;;; elpy-refactor.el --- Refactoring mode for Elpy
-
-;; Copyright (C) 2013  Jorgen Schaefer
-
-;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
-;; URL: https://github.com/jorgenschaefer/elpy
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 3
-;; of the License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file provides an interface, including a major mode, to use
-;; refactoring options provided by the Rope library.
-
-;;; Code:
-
-;; We require elpy, but elpy loads us, so we shouldn't load it back.
-;; (require 'elpy)
-
-(defvar elpy-refactor-changes nil
-  "Changes that will be commited on \\[elpy-refactor-commit].")
-(make-variable-buffer-local 'elpy-refactor-current-changes)
-
-(defvar elpy-refactor-window-configuration nil
-  "The old window configuration. Will be restored after commit.")
-(make-variable-buffer-local 'elpy-refactor-window-configuration)
-
-(make-obsolete
- 'elpy-refactor
- "Refactoring has been unstable and flakey, support will be dropped in the future."
- "elpy 1.5.0")
-(defun elpy-refactor ()
-  "Run the Elpy refactoring interface for Python code."
-  (interactive)
-  (save-some-buffers)
-  (let* ((selection (elpy-refactor-select
-                     (elpy-refactor-rpc-get-options)))
-         (method (car selection))
-         (args (cdr selection)))
-    (when method
-      (elpy-refactor-create-change-buffer
-       (elpy-refactor-rpc-get-changes method args)))))
-
-(defun elpy-refactor-select (options)
-  "Show the user the refactoring options and let her choose one.
-
-Depending on the chosen option, ask the user for further
-arguments and build the argument.
-
-Return a cons cell of the name of the option and the arg list
-created."
-  (let ((buf (get-buffer-create "*Elpy Refactor*"))
-        (pos (vector (1- (point))
-                     (ignore-errors
-                       (1- (region-beginning)))
-                     (ignore-errors
-                       (1- (region-end)))))
-        (inhibit-read-only t)
-        (options (sort options
-                       (lambda (a b)
-                         (let ((cata (cdr (assq 'category a)))
-                               (catb (cdr (assq 'category b))))
-                           (if (equal cata catb)
-                               (string< (cdr (assq 'description a))
-                                        (cdr (assq 'description b)))
-                             (string< cata catb))))))
-        (key ?a)
-        last-category
-        option-alist)
-    (with-current-buffer buf
-      (erase-buffer)
-      (dolist (option options)
-        (let ((category (cdr (assq 'category option)))
-              (description (cdr (assq 'description option)))
-              (name (cdr (assq 'name option)))
-              (args (cdr (assq 'args option))))
-          (when (not (equal category last-category))
-            (when last-category
-              (insert "\n"))
-            (insert (propertize category 'face 'bold) "\n")
-            (setq last-category category))
-          (insert " (" key ") " description "\n")
-          (setq option-alist (cons (list key name args)
-                                   option-alist))
-          (setq key (1+ key))))
-      (let ((window-conf (current-window-configuration)))
-        (unwind-protect
-            (progn
-              (with-selected-window (display-buffer buf)
-                (goto-char (point-min)))
-              (fit-window-to-buffer (get-buffer-window buf))
-              (let* ((key (read-key "Refactoring action? "))
-                     (entry (cdr (assoc key option-alist))))
-                (kill-buffer buf)
-                (cons (car entry)       ; name
-                      (elpy-refactor-build-arguments (cadr entry)
-                                                     pos))))
-          (set-window-configuration window-conf))))))
-
-(defun elpy-refactor-build-arguments (args pos)
-  "Translate an argument list specification to an argument list.
-
-POS is a vector of three elements, the current offset, the offset
-of the beginning of the region, and the offset of the end of the
-region.
-
-ARGS is a list of triples, each triple containing the name of an
-argument (ignored), the type of the argument, and a possible
-prompt string.
-
-Available types:
-
-  offset       - The offset in the buffer, (1- (point))
-  start_offset - Offset of the beginning of the region
-  end_offset   - Offset of the end of the region
-  string       - A free-form string
-  filename     - A non-existing file name
-  directory    - An existing directory name
-  boolean      - A boolean question"
-  (mapcar (lambda (arg)
-            (let ((type (cadr arg))
-                  (prompt (caddr arg)))
-              (cond
-               ((equal type "offset")
-                (aref pos 0))
-               ((equal type "start_offset")
-                (aref pos 1))
-               ((equal type "end_offset")
-                (aref pos 2))
-               ((equal type "string")
-                (read-from-minibuffer prompt))
-               ((equal type "filename")
-                (expand-file-name
-                 (read-file-name prompt)))
-               ((equal type "directory")
-                (expand-file-name
-                 (read-directory-name prompt)))
-               ((equal type "boolean")
-                (y-or-n-p prompt)))))
-          args))
-
-(defun elpy-refactor-create-change-buffer (changes)
-  "Show the user a buffer of changes.
-
-The user can review the changes and confirm them with
-\\[elpy-refactor-commit]."
-  (when (not changes)
-    (error "No changes for this refactoring action."))
-  (with-current-buffer (get-buffer-create "*Elpy Refactor*")
-    (elpy-refactor-mode)
-    (setq elpy-refactor-changes changes
-          elpy-refactor-window-configuration (current-window-configuration))
-    (let ((inhibit-read-only t))
-      (erase-buffer)
-      (elpy-refactor-insert-changes changes))
-    (select-window (display-buffer (current-buffer)))
-    (goto-char (point-min))))
-
-(defun elpy-refactor-insert-changes (changes)
-  "Format and display the changes described in CHANGES."
-  (insert (propertize "Use C-c C-c to apply the following changes."
-                      'face 'bold)
-          "\n\n")
-  (dolist (change changes)
-    (let ((action (cdr (assq 'action change))))
-      (cond
-       ((equal action "change")
-        (insert (cdr (assq 'diff change))
-                "\n"))
-       ((equal action "create")
-        (let ((type (cdr (assq 'type change))))
-          (if (equal type "file")
-              (insert "+++ " (cdr (assq 'file change)) "\n"
-                      "Create file " (cdr (assq 'file change)) "\n"
-                      "\n")
-            (insert "+++ " (cdr (assq 'path change)) "\n"
-                    "Create directory " (cdr (assq 'path change)) "\n"
-                    "\n"))))
-       ((equal action "move")
-        (insert "--- " (cdr (assq 'source change)) "\n"
-                "+++ " (cdr (assq 'destination change)) "\n"
-                "Rename " (cdr (assq 'type change)) "\n"
-                "\n"))
-       ((equal action "delete")
-        (let ((type (cdr (assq 'type change))))
-          (if (equal type "file")
-              (insert "--- " (cdr (assq 'file change)) "\n"
-                      "Delete file " (cdr (assq 'file change)) "\n"
-                      "\n")
-            (insert "--- " (cdr (assq 'path change)) "\n"
-                    "Delete directory " (cdr (assq 'path change)) "\n"
-                    "\n"))))))))
-
-(defvar elpy-refactor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") 'elpy-refactor-commit)
-    (define-key map (kbd "q") 'bury-buffer)
-    (define-key map (kbd "h") 'describe-mode)
-    (define-key map (kbd "?") 'describe-mode)
-    map)
-  "The key map for `elpy-refactor-mode'.")
-
-(define-derived-mode elpy-refactor-mode diff-mode "Elpy Refactor"
-  "Mode to display refactoring actions and ask confirmation from the user.
-
-\\{elpy-refactor-mode-map}"
-  :group 'elpy
-  (view-mode 1))
-
-(defun elpy-refactor-commit ()
-  "Commit the changes in the current buffer."
-  (interactive)
-  (when (not elpy-refactor-changes)
-    (error "No changes to commit."))
-  ;; Restore the window configuration as the first thing so that
-  ;; changes below are visible to the user. Especially the point
-  ;; change in possible buffer changes.
-  (set-window-configuration elpy-refactor-window-configuration)
-  (dolist (change elpy-refactor-changes)
-    (let ((action (cdr (assq 'action change))))
-      (cond
-       ((equal action "change")
-        (with-current-buffer (find-file-noselect (cdr (assq 'file change)))
-          ;; This would break for save-excursion as the buffer is
-          ;; truncated, so all markets now point to position 1.
-          (let ((old-point (point)))
-            (undo-boundary)
-            (erase-buffer)
-            (insert (cdr (assq 'contents change)))
-            (undo-boundary)
-            (goto-char old-point))))
-       ((equal action "create")
-        (if (equal (cdr (assq 'type change))
-                   "file")
-            (find-file-noselect (cdr (assq 'file change)))
-          (make-directory (cdr (assq 'path change)))))
-       ((equal action "move")
-        (let* ((source (cdr (assq 'source change)))
-               (dest (cdr (assq 'destination change)))
-               (buf (get-file-buffer source)))
-          (when buf
-            (with-current-buffer buf
-              (setq buffer-file-name dest)
-              (rename-buffer (file-name-nondirectory dest) t)))
-          (rename-file source dest)))
-       ((equal action "delete")
-        (if (equal (cdr (assq 'type change)) "file")
-            (let ((name (cdr (assq 'file change))))
-              (when (y-or-n-p (format "Really delete %s? " name))
-                (delete-file name t)))
-          (let ((name (cdr (assq 'directory change))))
-            (when (y-or-n-p (format "Really delete %s? " name))
-              (delete-directory name nil t))))))))
-  (kill-buffer (current-buffer)))
-
-(defun elpy-refactor-rpc-get-options ()
-  "Get a list of refactoring options from the Elpy RPC."
-  (if (use-region-p)
-      (elpy-rpc "get_refactor_options"
-                (list (buffer-file-name)
-                      (1- (region-beginning))
-                      (1- (region-end))))
-    (elpy-rpc "get_refactor_options"
-              (list (buffer-file-name)
-                    (1- (point))))))
-
-(defun elpy-refactor-rpc-get-changes (method args)
-  "Get a list of changes from the Elpy RPC after applying METHOD with ARGS."
-  (elpy-rpc "refactor"
-            (list (buffer-file-name)
-                  method args)))
-
-(provide 'elpy-refactor)
-;;; elpy-refactor.el ends here
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy.el b/emacs.d/elpa/elpy-20150502.740/elpy.el
deleted file mode 100644
index 6d35838..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy.el
+++ /dev/null
@@ -1,3449 +0,0 @@
-;;; elpy.el --- Emacs Python Development Environment -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012-2014  Jorgen Schaefer
-
-;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
-;; URL: https://github.com/jorgenschaefer/elpy
-;; Version: 1.8.0
-;; Keywords: Python, IDE, Languages, Tools
-;; Package-Requires: ((company "0.8.2") (find-file-in-project "3.3")  (highlight-indentation "0.5.0") (pyvenv "1.3") (yasnippet "0.8.0"))
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 3
-;; of the License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; The Emacs Lisp Python Environment in Emacs
-
-;; Elpy is an Emacs package to bring powerful Python editing to Emacs.
-;; It combines a number of existing Emacs packages, both written in
-;; Emacs Lisp as well as Python.
-
-;; For more information, read the Elpy manual:
-
-;; http://elpy.readthedocs.org/en/latest/index.html
-
-;;; Code:
-
-(require 'cus-edit)
-(require 'etags)
-(require 'files-x)
-(require 'grep)
-(require 'ido)
-(require 'json)
-(require 'python)
-
-(require 'elpy-refactor)
-(require 'pyvenv)
-
-(defconst elpy-version "1.8.0"
-  "The version of the Elpy lisp code.")
-
-;;;;;;;;;;;;;;;;;;;;;;
-;;; User customization
-
-(defgroup elpy nil
-  "The Emacs Lisp Python Environment."
-  :prefix "elpy-"
-  :group 'languages)
-
-(defcustom elpy-mode-hook nil
-  "Hook run when `elpy-mode' is enabled.
-
-This can be used to enable minor modes for Python development."
-  :type 'hook
-  :options '(subword-mode hl-line-mode)
-  :group 'elpy)
-
-(defcustom elpy-modules '(elpy-module-sane-defaults
-                          elpy-module-company
-                          elpy-module-eldoc
-                          elpy-module-flymake
-                          elpy-module-highlight-indentation
-                          elpy-module-pyvenv
-                          elpy-module-yasnippet)
-  "Which Elpy modules to use.
-
-Elpy can use a number of modules for additional features, which
-can be inidividually enabled or disabled."
-  :type '(set (const :tag "Inline code completion (company-mode)"
-                     elpy-module-company)
-              (const :tag "Show function signatures (ElDoc)"
-                     elpy-module-eldoc)
-              (const :tag "Highlight syntax errors (Flymake)"
-                     elpy-module-flymake)
-              (const :tag "Show the virtualenv in the mode line (pyvenv)"
-                     elpy-module-pyvenv)
-              (const :tag "Display indentation markers (highlight-indentation)"
-                     elpy-module-highlight-indentation)
-              (const :tag "Expand code snippets (YASnippet)"
-                     elpy-module-yasnippet)
-              (const :tag "Configure some sane defaults for Emacs"
-                     elpy-module-sane-defaults))
-  :group 'elpy)
-
-(defcustom elpy-project-ignored-directories ' (".bzr" "CVS" ".git" ".hg" ".svn"
-                                               ".tox"  "build" "dist"
-                                               ".cask")
-  "Directories ignored by functions working on the whole project."
-  :type '(repeat string)
-  :safe (lambda (val)
-          (cl-every #'stringp val))
-  :group 'elpy)
-
-(defcustom elpy-project-root nil
-  "The root of the project the current buffer is in.
-
-There is normally no use in setting this variable directly, as
-Elpy tries to detect the project root automatically. See
-`elpy-project-root-finder-functions' for a way of influencing
-this.
-
-Setting this variable globally will override Elpy's automatic
-project detection facilities entirely.
-
-Alternatively, you can set this in file- or directory-local
-variables using \\[add-file-local-variable] or
-\\[add-dir-local-variable].
-
-Do not use this variable in Emacs Lisp programs. Instead, call
-the `elpy-project-root' function. It will do the right thing."
-  :type 'directory
-  :safe 'file-directory-p
-  :group 'elpy)
-(make-variable-buffer-local 'elpy-project-root)
-
-(defcustom elpy-project-root-finder-functions
-  '(elpy-project-find-projectile-root
-    elpy-project-find-python-root
-    elpy-project-find-git-root
-    elpy-project-find-hg-root
-    elpy-project-find-svn-root)
-  "List of functions to ask for the current project root.
-
-These will be checked in turn. The first directory found is used."
-  :type '(set (const :tag "Projectile project root"
-                     elpy-project-find-projectile-root)
-              (const :tag "Python project (setup.py, setup.cfg)"
-                     elpy-project-find-python-root)
-              (const :tag "Git repository root (.git)"
-                     elpy-project-find-git-root)
-              (const :tag "Mercurial project root (.hg)"
-                     elpy-project-find-hg-root)
-              (const :tag "Subversion project root (.svn)"
-                     elpy-project-find-svn-root))
-  :group 'elpy)
-
-(defcustom elpy-rpc-backend nil
-  "Your preferred backend.
-
-Elpy can use different backends for code introspection. These
-need to be installed separately using pip or other mechanisms to
-make them available to Python. If you prefer not to do this, you
-can use the native backend, which is very limited but does not
-have any external requirements."
-  :type '(choice (const :tag "Rope" "rope")
-                 (const :tag "Jedi" "jedi")
-                 (const :tag "Automatic" nil))
-  :safe (lambda (val)
-          (member val '("rope" "jedi" "native" nil)))
-  :group 'elpy)
-
-(defcustom elpy-rpc-maximum-buffer-age (* 5 60)
-  "Seconds after which Elpy automatically closes an unused RPC buffer.
-
-Elpy creates RPC buffers over time, depending on python interpreters
-and the project root. When there are many projects being worked on,
-these can accumulate. Setting this variable to an integer will close
-buffers and processes when they have not been used for this amount of
-seconds.
-
-Setting this variable to nil will disable the behavior."
-  :type '(choice (const :tag "Never" nil)
-                 integer)
-  :group 'elpy)
-
-(defcustom elpy-rpc-large-buffer-size 4096
-  "Size for a source buffer up to which it will be sent directly.
-
-The Elpy RPC protocol uses JSON as the serialization format.
-Large buffers take a long time to encode, so Elpy can transmit
-them via temporary files. If a buffer is larger than this value,
-it is sent via a temporary file."
-  :type 'integer
-  :safe #'integerp
-  :group 'elpy)
-
-(defcustom elpy-rpc-ignored-buffer-size 102400
-  "Size for a source buffer over which Elpy completion will not work.
-
-To provide completion, Elpy's backends have to parse the whole
-file every time. For very large files, this is slow, and can make
-Emacs laggy. Elpy will simply not work on buffers larger than
-this to prevent this from happening."
-  :type 'integer
-  :safe #'integerp
-  :group 'elpy)
-
-(defcustom elpy-rpc-python-command (if (equal system-type "windows-nt")
-                                       "pythonw"
-                                     "python")
-  "The Python interpreter for the RPC backend.
-
-This should be the same interpreter the project will be run with,
-and not an interactive shell like ipython."
-  :type '(choice (const :tag "python" "python")
-                 (const :tag "python2" "python2")
-                 (const :tag "python3" "python3")
-                 (const :tag "pythonw (Python on Windows)" "pythonw")
-                 (string :tag "Other"))
-  :safe (lambda (val)
-          (member val '("python" "python2" "python3" "pythonw")))
-  :group 'elpy)
-
-(defcustom elpy-rpc-pythonpath (file-name-directory (locate-library "elpy"))
-  "A directory to add to the PYTHONPATH for the RPC process.
-
-This should be a directory where the elpy module can be found. If
-this is nil, it's assumed elpy can be found in the standard path.
-Usually, there is no need to change this."
-  :type 'directory
-  :safe #'file-directory-p
-  :group 'elpy)
-
-(defcustom elpy-rpc-timeout 1
-  "Number of seconds to wait for a response when blocking.
-
-When Elpy blocks Emacs to wait for a response from the RPC
-process, it will assume it won't come or wait too long after this
-many seconds. On a slow computer, or if you have a large project,
-you might want to increase this.
-
-A setting of nil means to block indefinitely."
-  :type '(choice (const :tag "Block indefinitely" nil)
-                 integer)
-  :safe (lambda (val)
-          (or (integerp val)
-              (null val)))
-  :group 'elpy)
-
-(defcustom elpy-rpc-error-timeout 30
-  "Minimum number of seconds between error popups.
-
-When Elpy encounters an error in the backend, it will display a
-lengthy description of the problem for a bug report. This hangs
-Emacs for a moment, and can be rather annoying if it happens
-repeatedly while editing a source file.
-
-If this variabl is non-nil, Elpy will not display the error
-message again within this amount of seconds."
-  :type 'integer
-  :group 'elpy)
-
-(defcustom elpy-eldoc-show-current-function t
-  "If true, show the current function if no calltip is available.
-
-When Elpy can not find the calltip of the function call at point,
-it can show the name of the function or class and method being
-edited instead. Setting this variable to nil disables this feature."
-  :type 'boolean
-  :group 'elpy)
-
-(defcustom elpy-test-runner 'elpy-test-discover-runner
-  "The test runner to use to run tests."
-  :type '(choice (const :tag "Unittest Discover" elpy-test-discover-runner)
-                 (const :tag "Django Discover" elpy-test-django-runner)
-                 (const :tag "Nose" elpy-test-nose-runner)
-                 (const :tag "py.test" elpy-test-pytest-runner)
-                 (const :tag "Twisted Trial" elpy-test-trial-runner))
-  :safe 'elpy-test-runner-p
-  :group 'elpy)
-
-(defcustom elpy-test-discover-runner-command '("python" "-m" "unittest")
-  "The command to use for `elpy-test-discover-runner'."
-  :type '(repeat string)
-  :group 'elpy)
-
-(defcustom elpy-test-django-runner-command '("django-admin.py" "test"
-                                             "--noinput")
-  "The command to use for `elpy-test-django-runner'."
-  :type '(repeat string)
-  :group 'elpy)
-
-(defcustom elpy-test-nose-runner-command '("nosetests")
-  "The command to use for `elpy-test-nose-runner'."
-  :type '(repeat string)
-  :group 'elpy)
-
-(defcustom elpy-test-trial-runner-command '("trial")
-  "The command to use for `elpy-test-trial-runner'."
-  :type '(repeat string)
-  :group 'elpy)
-
-(defcustom elpy-test-pytest-runner-command '("py.test")
-  "The command to use for `elpy-test-pytest-runner'."
-  :type '(repeat string)
-  :group 'elpy)
-
-;;;;;;;;;;;;;
-;;; Elpy Mode
-
-(defvar elpy-mode-map
-  (let ((map (make-sparse-keymap)))
-    ;; Alphabetical order to make it easier to find free C-c C-X
-    ;; bindings in the future. Heh.
-
-    ;; (define-key map (kbd "<backspace>") 'python-indent-dedent-line-backspace)
-    ;; (define-key map (kbd "<backtab>")   'python-indent-dedent-line)
-
-    ;; (define-key map (kbd "C-M-x")   'python-shell-send-defun)
-    ;; (define-key map (kbd "C-c <")   'python-indent-shift-left)
-    ;; (define-key map (kbd "C-c >")   'python-indent-shift-right)
-    (define-key map (kbd "C-c C-c") 'elpy-shell-send-region-or-buffer)
-    (define-key map (kbd "C-c C-z") 'elpy-shell-switch-to-shell)
-    (define-key map (kbd "C-c C-d") 'elpy-doc)
-    (define-key map (kbd "C-c C-e") 'elpy-multiedit-python-symbol-at-point)
-    (define-key map (kbd "C-c C-f") 'elpy-find-file)
-    (define-key map (kbd "C-c RET") 'elpy-importmagic-add-import)
-    (define-key map (kbd "C-c <S-return>") 'elpy-importmagic-fixup)
-    (define-key map (kbd "C-c C-n") 'elpy-flymake-next-error)
-    (define-key map (kbd "C-c C-o") 'elpy-occur-definitions)
-    (define-key map (kbd "C-c C-p") 'elpy-flymake-previous-error)
-    (define-key map (kbd "C-c C-r") 'elpy-refactor)
-    (define-key map (kbd "C-c C-s") 'elpy-rgrep-symbol)
-    (define-key map (kbd "C-c C-t") 'elpy-test)
-    (define-key map (kbd "C-c C-v") 'elpy-check)
-    ;; (define-key map (kbd "C-c C-z") 'python-shell-switch-to-shell)
-
-    (define-key map (kbd "<S-return>") 'elpy-open-and-indent-line-below)
-    (define-key map (kbd "<C-S-return>") 'elpy-open-and-indent-line-above)
-
-    (define-key map (kbd "<C-down>") 'elpy-nav-forward-block)
-    (define-key map (kbd "<C-up>") 'elpy-nav-backward-block)
-    (define-key map (kbd "<C-left>") 'elpy-nav-backward-indent)
-    (define-key map (kbd "<C-right>") 'elpy-nav-forward-indent)
-
-    (define-key map (kbd "<M-down>") 'elpy-nav-move-line-or-region-down)
-    (define-key map (kbd "<M-up>") 'elpy-nav-move-line-or-region-up)
-    (define-key map (kbd "<M-left>") 'elpy-nav-move-region-or-line-left)
-    (define-key map (kbd "<M-right>") 'elpy-nav-move-region-or-line-right)
-
-    (define-key map (kbd "M-.")     'elpy-goto-definition)
-    (define-key map (kbd "M-TAB")   'elpy-company-backend)
-
-    map)
-  "Key map for the Emacs Lisp Python Environment.")
-
-(easy-menu-define elpy-menu elpy-mode-map
-  "Elpy Mode Menu"
-  '("Elpy"
-    ["Documentation" elpy-doc
-     :help "Get documentation for symbol at point"]
-    ["Run Tests" elpy-test
-     :help "Run test at point, or all tests in the project"]
-    ["Go to Definition" elpy-goto-definition
-     :help "Go to the definition of the symbol at point"]
-    ["Go to previous definition" pop-tag-mark
-     :active (not (ring-empty-p find-tag-marker-ring))
-     :help "Return to the position"]
-    ["Complete" elpy-company-backend
-     :keys "M-TAB"
-     :help "Complete at point"]
-    ["Refactor" elpy-refactor
-     :help "Refactor options"]
-    "---"
-    ("Interactive Python"
-     ["Switch to Python Shell" elpy-shell-switch-to-shell
-      :help "Start and switch to the interactive Python"]
-     ["Send Region or Buffer" elpy-shell-send-region-or-buffer
-      :label (if (use-region-p)
-                 "Send Region to Python"
-               "Send Buffer to Python")
-      :help "Send the current region or the whole buffer to Python"]
-     ["Send Definition" python-shell-send-defun
-      :help "Send current definition to Python"])
-    ("Project"
-     ["Find File" elpy-find-file
-      :help "Interactively find a file in the current project"]
-     ["Find Symbol" elpy-rgrep-symbol
-      :help "Find occurrences of a symbol in the current project"]
-     ["Set Project Root" elpy-set-project-root
-      :help "Change the current project root"]
-     ["Set Project Variable" elpy-set-project-variable
-      :help "Configure a project-specific option"])
-    ("Syntax Check"
-     ["Check Syntax" elpy-check
-      :help "Check the syntax of the current file"]
-     ["Next Error" elpy-flymake-next-error
-      :help "Go to the next inline error, if any"]
-     ["Previous Error" elpy-flymake-previous-error
-      :help "Go to the previous inline error, if any"])
-    ("Indentation Blocks"
-     ["Dedent" elpy-nav-move-region-or-line-left
-      :help "Dedent current block or region"
-      :suffix (if (use-region-p) "Region" "Block")]
-     ["Indent" elpy-nav-move-region-or-line-right
-      :help "Indent current block or region"
-      :suffix (if (use-region-p) "Region" "Block")]
-     ["Up" elpy-nav-move-line-or-region-up
-      :help "Move current block or region up"
-      :suffix (if (use-region-p) "Region" "Block")]
-     ["Down" elpy-nav-move-line-or-region-down
-      :help "Move current block or region down"
-      :suffix (if (use-region-p) "Region" "Block")])
-    "---"
-    ["News" elpy-news t]
-    ["Configure" elpy-config t]))
-
-;;;###autoload
-(defun elpy-enable (&optional ignored)
-  "Enable Elpy in all future Python buffers."
-  (interactive)
-  (when (< emacs-major-version 24)
-    (error "Elpy requires Emacs 24 or newer"))
-  (when ignored
-    (warn "The argument to `elpy-enable' is deprecated, customize `elpy-modules' instead"))
-  (let ((filename (find-lisp-object-file-name 'python-mode
-                                              'symbol-function)))
-    (when (and filename
-               (string-match "/python-mode\\.el\\'"
-                             filename))
-      (error (concat "You are using python-mode.el. "
-                     "Elpy only works with python.el from "
-                     "Emacs 24 and above"))))
-  (elpy-modules-global-init)
-  (add-hook 'python-mode-hook 'elpy-mode))
-
-(defun elpy-disable ()
-  "Disable Elpy in all future Python buffers."
-  (interactive)
-  (remove-hook 'python-mode-hook 'elpy-mode)
-  (elpy-modules-global-stop))
-
-;;;###autoload
-(define-minor-mode elpy-mode
-  "Minor mode in Python buffers for the Emacs Lisp Python Environment.
-
-This mode fully supports virtualenvs. Once you switch a
-virtualenv using \\[pyvenv-workon], you can use
-\\[elpy-rpc-restart] to make the elpy Python process use your
-virtualenv.
-
-\\{elpy-mode-map}"
-  :lighter " Elpy"
-  (when (not (eq major-mode 'python-mode))
-    (error "Elpy only works with `python-mode'"))
-  (cond
-   (elpy-mode
-    (elpy-modules-buffer-init))
-   ((not elpy-mode)
-    (elpy-modules-buffer-stop))))
-
-;;;;;;;;;;;;;
-;;; Elpy News
-
-(defun elpy-news ()
-  "Display Elpy's release notes."
-  (interactive)
-  (with-current-buffer (get-buffer-create "*Elpy News*")
-    (let ((inhibit-read-only t))
-      (erase-buffer)
-      (insert-file (concat (file-name-directory (locate-library "elpy"))
-                           "NEWS.rst"))
-      (help-mode))
-    (pop-to-buffer (current-buffer))))
-
-;;;;;;;;;;;;;;;
-;;; Elpy Config
-
-(defvar elpy-config--related-custom-groups
-  '(("Elpy" elpy "elpy-")
-    ("Python" python "python-")
-    ("Virtual Environments (Pyvenv)" pyvenv "pyvenv-")
-    ("Completion (Company)" company "company-")
-    ("Call Signatures (ElDoc)" eldoc "eldoc-")
-    ("Inline Errors (Flymake)" flymake "flymake-")
-    ("Snippets (YASnippet)" yasnippet "yas-")
-    ("Directory Grep (rgrep)" grep "grep-")
-    ("Search as You Type (ido)" ido "ido-")
-    ;; ffip does not use defcustom
-    ;; highlight-indent does not use defcustom, either. Its sole face
-    ;; is defined in basic-faces.
-    ))
-
-(defvar elpy-config--get-config "import json
-import sys
-
-try:
-    import xmlrpclib
-except ImportError:
-    import xmlrpc.client as xmlrpclib
-
-from distutils.version import LooseVersion
-
-
-def latest(package, version=None):
-    try:
-        pypi = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
-        latest = pypi.package_releases(package)[0]
-        if version is None or LooseVersion(version) < LooseVersion(latest):
-            return latest
-        else:
-            return None
-    except:
-        return None
-
-
-config = {}
-config['python_version'] = ('{major}.{minor}.{micro}'
-                            .format(major=sys.version_info[0],
-                                    minor=sys.version_info[1],
-                                    micro=sys.version_info[2]))
-
-try:
-    import elpy
-    config['elpy_version'] = elpy.__version__
-except:
-    config['elpy_version'] = None
-
-try:
-    import jedi
-    if isinstance(jedi.__version__, tuple):
-        config['jedi_version'] = '.'.join(str(x) for x in jedi.__version__)
-    else:
-        config['jedi_version'] = jedi.__version__
-    config['jedi_latest'] = latest('jedi', config['jedi_version'])
-except:
-    config['jedi_version'] = None
-    config['jedi_latest'] = latest('jedi')
-
-try:
-    import rope
-    config['rope_version'] = rope.VERSION
-    if sys.version_info[0] <= 2:
-        config['rope_latest'] = latest('rope', config['rope_version'])
-    else:
-        config['rope_latest'] = latest('rope_py3k', config['rope_version'])
-except:
-    config['rope_version'] = None
-    config['rope_latest'] = latest('rope')
-
-try:
-    import importmagic
-    config['importmagic_version'] = importmagic.__version__
-    config['importmagic_latest'] = latest('importmagic', config['importmagic_version'])
-except:
-    config['importmagic_version'] = None
-    config['importmagic_latest'] = latest('importmagic')
-
-json.dump(config, sys.stdout)
-")
-
-(defun elpy-config-error (&optional fmt &rest args)
-  "Note a configuration problem.
-
-This will show a message in the minibuffer that tells the user to
-use \\[elpy-config]."
-  (let ((msg (if fmt
-                 (apply #'format fmt args)
-               "Elpy is not properly configured")))
-    (error "%s; use M-x elpy-config to configure it" msg)))
-
-;;;###autoload
-(defun elpy-config ()
-  "Configure Elpy.
-
-This function will pop up a configuration buffer, which is mostly
-a customize buffer, but has some more options."
-  (interactive)
-  (let ((buf (custom-get-fresh-buffer "*Elpy Config*"))
-        (config (elpy-config--get-config))
-        (custom-search-field nil))
-    (with-current-buffer buf
-      (elpy-insert--header "Elpy Configuration")
-
-      (elpy-config--insert-configuration-problems config)
-
-      (elpy-insert--header "Options")
-
-      (let ((custom-buffer-style 'tree))
-        (Custom-mode)
-        (elpy-config--insert-help)
-        (dolist (cust elpy-config--related-custom-groups)
-          (widget-create 'custom-group
-                         :custom-last t
-                         :custom-state 'hidden
-                         :tag (car cust)
-                         :value (cadr cust)))
-        (widget-setup)
-        (goto-char (point-min))))
-    (pop-to-buffer-same-window buf)))
-
-;;;###autoload
-(defun elpy-version ()
-  "Display the version of Elpy."
-  (interactive)
-  (message "Elpy %s (use M-x elpy-config for details)" elpy-version))
-
-(defun elpy-config--insert-help ()
-  (let ((start (point)))
-    ;; Help display from `customize-browse'
-    (widget-insert (format "\
-%s buttons; type RET or click mouse-1
-on a button to invoke its action.
-Invoke [+] to expand a group, and [-] to collapse an expanded group.\n"
-                           (if custom-raised-buttons
-                               "`Raised' text indicates"
-                             "Square brackets indicate")))
-    (if custom-browse-only-groups
-        (widget-insert "\
-Invoke the [Group] button below to edit that item in another window.\n\n")
-      (widget-insert "Invoke the ")
-      (widget-create 'item
-                     :format "%t"
-                     :tag "[Group]"
-                     :tag-glyph "folder")
-      (widget-insert ", ")
-      (widget-create 'item
-                     :format "%t"
-                     :tag "[Face]"
-                     :tag-glyph "face")
-      (widget-insert ", and ")
-      (widget-create 'item
-                     :format "%t"
-                     :tag "[Option]"
-                     :tag-glyph "option")
-      (widget-insert " buttons below to edit that
-item in another window.\n\n")
-
-      (fill-region start (point)))))
-
-(defun elpy-config--insert-configuration-problems (&optional config)
-  "Insert help text and widgets for configuration problems."
-  (when (not config)
-    (setq config (elpy-config--get-config)))
-  (let* ((python-version (gethash "python_version" config))
-         (rope-pypi-package  (if (and python-version
-                                      (string-match "^3\\." python-version))
-                                 "rope_py3k"
-                               "rope")))
-
-    (elpy-config--insert-configuration-table config)
-    (insert "\n")
-
-    ;; Python not found
-    (when (not (gethash "python_rpc_executable" config))
-      (elpy-insert--para
-       "Elpy can not find the configured Python interpreter. Please make "
-       "sure that the variable `elpy-rpc-python-command' points to a "
-       "command in your PATH. You can change the variable below.\n\n"))
-
-    ;; No virtual env
-    (when (and (gethash "python_rpc_executable" config)
-               (not (gethash "virtual_env" config)))
-      (elpy-insert--para
-       "You have not activated a virtual env. While Elpy supports this, "
-       "it is often a good idea to work inside a virtual env. You can use "
-       "M-x pyvenv-activate or M-x pyvenv-workon to activate a virtual "
-       "env.\n\n"))
-
-    ;; No virtual env, but ~/.local/bin not in PATH
-    (when (and (not (memq system-type '(ms-dos windows-nt)))
-               (gethash "python_rpc_executable" config)
-               (not pyvenv-virtual-env)
-               (not (or (member (expand-file-name "~/.local/bin")
-                                exec-path)
-                        (member (expand-file-name "~/.local/bin/")
-                                exec-path))))
-      (elpy-insert--para
-       "The directory ~/.local/bin/ is not in your PATH, even though you "
-       "do not have an active virtualenv. Installing Python packages "
-       "locally will create executables in that directory, so Emacs "
-       "won't find them. If you are missing some commands, do add this "
-       "directory to your PATH.\n\n"))
-
-    ;; Python found, but can't find the elpy module
-    (when (and (gethash "python_rpc_executable" config)
-               (not (gethash "elpy_version" config)))
-      (elpy-insert--para
-       "The Python interpreter could not find the elpy module. "
-       "Make sure the module is installed"
-       (if (gethash "virtual_env" config)
-           " in the current virtualenv.\n"
-         ".\n"))
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button :package "elpy")
-      (insert "\n\n"))
-
-    ;; Bad backend version
-    (when (and (gethash "elpy_version" config)
-               (not (equal (gethash "elpy_version" config)
-                           elpy-version)))
-      (let ((elpy-python-version (gethash "elpy_version" config)))
-        (elpy-insert--para
-         "The Elpy backend is version " elpy-python-version " while "
-         "the Emacs package is " elpy-version ". This is incompatible. "
-         (if (version< elpy-python-version elpy-version)
-             "Please upgrade the Python module."
-           "Please upgrade the Emacs Lisp package.")
-         "\n")))
-
-    ;; Otherwise unparseable output.
-    (when (gethash "error_output" config)
-      (elpy-insert--para
-       "There was an unexpected problem starting the RPC process. Please "
-       "check the following output to see if this makes sense to you. "
-       "To me, it doesn't.\n")
-      (insert "\n"
-              (gethash "error_output" config) "\n"
-              "\n"))
-
-    ;; Requested backend unavailable
-    (when (and (gethash "python_rpc_executable" config)
-               (or (and (equal elpy-rpc-backend "rope")
-                        (not (gethash "rope_version" config)))
-                   (and (equal elpy-rpc-backend "jedi")
-                        (not (gethash "jedi_version" config)))))
-      (elpy-insert--para
-       "You requested Elpy to use the backend " elpy-rpc-backend ", "
-       "but the Python interpreter could not load that module. Make "
-       "sure the module is installed, or change the value of "
-       "`elpy-rpc-backend' below to one of the available backends.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button
-                     :package (if (equal elpy-rpc-backend "rope")
-                                  rope-pypi-package
-                                "jedi"))
-      (insert "\n\n"))
-
-    ;; No backend available.
-    (when (and (gethash "python_rpc_executable" config)
-               (and (not elpy-rpc-backend)
-                    (not (gethash "rope_version" config))
-                    (not (gethash "jedi_version" config))))
-      (elpy-insert--para
-       "There is no backend available. Please install either Rope or Jedi.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button :package rope-pypi-package)
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button :package "jedi")
-      (insert "\n\n"))
-
-    ;; Newer version of Rope available
-    (when (and (gethash "rope_version" config)
-               (gethash "rope_latest" config))
-      (elpy-insert--para
-       "There is a newer version of Rope available.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button
-                     :package rope-pypi-package :upgrade t)
-      (insert "\n\n"))
-
-    ;; Newer version of Jedi available
-    (when (and (gethash "jedi_version" config)
-               (gethash "jedi_latest" config))
-      (elpy-insert--para
-       "There is a newer version of Jedi available.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button
-                     :package "jedi" :upgrade t)
-      (insert "\n\n"))
-
-    ;; No importmagic available
-    (when (not (gethash "importmagic_version" config))
-      (elpy-insert--para
-       "The importmagic package is not available. Commands using this will "
-       "not work.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button
-                     :package "importmagic")
-      (insert "\n\n"))
-
-    ;; Newer version of importmagic available
-    (when (and (gethash "importmagic_version" config)
-               (gethash "importmagic_latest" config))
-      (elpy-insert--para
-       "There is a newer version of the importmagic package available.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button
-                     :package "importmagic" :upgrade t)
-      (insert "\n\n"))
-
-    ;; flake8, the default syntax checker, not found
-    (when (not (executable-find "flake8"))
-      (elpy-insert--para
-       "The configured syntax checker could not be found. Elpy uses this "
-       "program to provide syntax checks of your programs, so you might "
-       "want to install one. Elpy by default uses flake8.\n")
-      (insert "\n")
-      (widget-create 'elpy-insert--pip-button :package "flake8")
-      (insert "\n\n"))
-
-    ))
-
-(defun elpy-config--get-config ()
-  "Return the configuration from `elpy-rpc-python-command'.
-
-This returns a hash table with the following keys (all strings):
-
-emacs_version
-python_rpc
-python_rpc_executable
-python_interactive
-python_interactive_executable
-python_version (RPC)
-elpy_version
-jedi_version
-rope_version
-virtual_env
-virtual_env_short"
-  (with-temp-buffer
-    (let ((config (make-hash-table :test #'equal)))
-      (puthash "emacs_version" emacs-version config)
-      (puthash "python_rpc" elpy-rpc-python-command config)
-      (puthash "python_rpc_executable"
-               (executable-find elpy-rpc-python-command)
-               config)
-      (let ((interactive-python (if (boundp 'python-python-command)
-                                    python-python-command
-                                  python-shell-interpreter)))
-        (puthash "python_interactive"
-                 interactive-python
-                 config)
-        (puthash "python_interactive_executable"
-                 (executable-find interactive-python)
-                 config))
-      (let ((venv (getenv "VIRTUAL_ENV")))
-        (puthash "virtual_env" venv config)
-        (if venv
-            (puthash "virtual_env_short" (file-name-nondirectory venv) config)
-          (puthash "virtual_env_short" nil config)))
-      (let ((return-value (ignore-errors
-                            (let ((process-environment
-                                   (elpy-rpc--environment))
-                                  (default-directory "/"))
-                              (call-process elpy-rpc-python-command
-                                            nil
-                                            (current-buffer)
-                                            nil
-                                            "-c"
-                                            elpy-config--get-config)))))
-        (when return-value
-          (let ((data (ignore-errors
-                        (let ((json-array-type 'list))
-                          (goto-char (point-min))
-                          (json-read)))))
-            (if (not data)
-                (puthash "error_output" (buffer-string) config)
-              (dolist (pair data)
-                (puthash (symbol-name (car pair)) (cdr pair) config))))))
-      config)))
-
-(defun elpy-config--insert-configuration-table (&optional config)
-  "Insert a table describing the current Elpy config."
-  (when (not config)
-    (setq config (elpy-config--get-config)))
-  (let ((emacs-version (gethash "emacs_version" config))
-        (python-version (gethash "python_version" config))
-        (python-rpc (gethash "python_rpc" config))
-        (python-rpc-executable (gethash "python_rpc_executable" config))
-        (python-interactive (gethash "python_interactive" config))
-        (python-interactive-executable (gethash "python_interactive_executable"
-                                                config))
-        (elpy-python-version (gethash "elpy_version" config))
-        (jedi-version (gethash "jedi_version" config))
-        (jedi-latest (gethash "jedi_latest" config))
-        (rope-version (gethash "rope_version" config))
-        (rope-latest (gethash "rope_latest" config))
-        (importmagic-version (gethash "importmagic_version" config))
-        (importmagic-latest (gethash "importmagic_latest" config))
-        (virtual-env (gethash "virtual_env" config))
-        (virtual-env-short (gethash "virtual_env_short" config))
-        table maxwidth)
-    (setq table
-          `(("Virtualenv" . ,(if (gethash "virtual_env" config)
-                                 (format "%s (%s)"
-                                         virtual-env-short
-                                         virtual-env)
-                               "None"))
-            ("RPC Python" . ,(cond
-                              (python-version
-                               (format "%s (%s)"
-                                       python-version
-                                       python-rpc-executable))
-                              (python-rpc-executable
-                               python-rpc-executable)
-                              (python-rpc
-                               (format "%s (not found)" python-rpc))
-                              (t
-                               (format "Not configured"))))
-            ("Interactive Python" . ,(cond
-                                      (python-interactive-executable
-                                       (format "%s (%s)"
-                                               python-interactive
-                                               python-interactive-executable))
-                                      (python-interactive
-                                       (format "%s (not found)"
-                                               python-interactive))
-                                      (t
-                                       "Not configured")))
-            ("Emacs" . ,emacs-version)
-            ("Elpy" . ,(cond
-                        ((and elpy-python-version elpy-version
-                              (equal elpy-python-version elpy-version))
-                         elpy-version)
-                        (elpy-python-version
-                         (format "%s (Python), %s (Emacs Lisp)"
-                                 elpy-python-version
-                                 elpy-version))
-                        (t
-                         (format "Not found (Python), %s (Emacs Lisp)"
-                                 elpy-version))))
-            ("Jedi" . ,(elpy-config--package-link "jedi"
-                                                  jedi-version
-                                                  jedi-latest))
-            ("Rope" . ,(elpy-config--package-link "rope"
-                                                  rope-version
-                                                  rope-latest))
-            ("Importmagic" . ,(elpy-config--package-link "importmagic"
-                                                         importmagic-version
-                                                         importmagic-latest))
-            ("Syntax checker" . ,(let ((syntax-checker
-                                        (executable-find
-                                         python-check-command)))
-                                   (if  syntax-checker
-                                       (format "%s (%s)"
-                                               (file-name-nondirectory
-                                                syntax-checker)
-                                               syntax-checker)
-                                     (format "Not found (%s)"
-                                             python-check-command))))))
-    (setq maxwidth 0)
-    (dolist (row table)
-      (when (> (length (car row))
-               maxwidth)
-        (setq maxwidth (length (car row)))))
-    (dolist (row table)
-      (insert (car row)
-              (make-string (- maxwidth (length (car row)))
-                           ?.)
-              ": "
-              (cdr row)
-              "\n"))))
-
-(defun elpy-config--package-link (name version latest)
-  "Return a string detailing a Python package.
-
-NAME is the PyPI name of the package. VERSION is the currently
-installed version. LATEST is the latest-available version on
-PyPI, or nil if that's VERSION."
-  (cond
-   ((and (not version) (not latest))
-    "Not found")
-   ((not latest)
-    version)
-   ((not version)
-    (format "Not found (%s available)" latest))
-   (t
-    (format "%s (%s available)" version latest))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Elpy Formatted Insertion
-
-(defmacro elpy-insert--popup (buffer-name &rest body)
-  "Pop up a help buffer named BUFFER-NAME and execute BODY in it."
-  (declare (indent 1))
-  `(with-help-window ,buffer-name
-     (with-current-buffer standard-output
-       ,@body)))
-
-(defun elpy-insert--para (&rest messages)
-  "Insert a bunch of text and then fill it."
-  (let ((start (point)))
-    (mapc (lambda (obj)
-            (if (stringp obj)
-                (insert obj)
-              (insert (format "%s" obj))))
-          messages)
-    (fill-region start (point))))
-
-(defun elpy-insert--header (&rest text)
-  "Insert TEXT has a header for a buffer."
-  (insert (propertize (mapconcat #'(lambda (x) x)
-                                 text
-                                 "")
-                      'face 'header-line)
-          "\n"
-          "\n"))
-
-(define-widget 'elpy-insert--pip-button 'item
-  "A button that runs pip (or an alternative)."
-  :button-prefix "["
-  :button-suffix "]"
-  :format "%[run%] %v"
-  :value-create 'elpy-insert--pip-button-value-create
-  :action 'elpy-insert--pip-button-action)
-
-(defun elpy-insert--pip-button-value-create (widget)
-  "The :value-create option for the pip button widget."
-  (let* ((python-package (widget-get widget :package))
-         (do-upgrade (widget-get widget :upgrade))
-         (upgrade-option (if do-upgrade
-                             "--upgrade "
-                           ""))
-         (do-user-install (not (or (getenv "VIRTUAL_ENV")
-                                   pyvenv-virtual-env)))
-         (user-option (if do-user-install
-                          "--user "
-                        ""))
-
-         (command (cond
-                   ((executable-find "pip")
-                    (format "pip install %s%s%s"
-                            user-option upgrade-option python-package))
-                   ((executable-find "easy_install")
-                    (format "easy_install %s%s"
-                            user-option python-package))
-                   (t
-                    (error "Neither easy_install nor pip found")))))
-    (widget-put widget :command command)
-    (insert command)))
-
-(defun elpy-insert--pip-button-action (widget &optional event)
-  "The :action option for the pip button widget."
-  (async-shell-command (widget-get widget :command)))
-
-;;;;;;;;;;;;
-;;; Projects
-
-(defvar elpy-project--variable-name-history nil
-  "The history for `elpy-project--read-project-variable'")
-
-(defun elpy-project-root ()
-  "Return the root of the current buffer's project.
-
-This can very well be nil if the current file is not part of a
-project.
-
-See `elpy-project-root-finder-functions' for a way to configure
-how the project root is found. You can also set the variable
-`elpy-project-root' in, for example, .dir-locals.el to override
-this."
-  (when (not elpy-project-root)
-    (setq elpy-project-root
-          (run-hook-with-args-until-success
-           'elpy-project-root-finder-functions)))
-  elpy-project-root)
-
-(defun elpy-set-project-root (new-root)
-  "Set the Elpy project root to NEW-ROOT."
-  (interactive "DNew project root: ")
-  (setq elpy-project-root new-root))
-
-(defun elpy-project-find-python-root ()
-  "Return the current Python project root, if any.
-
-This is marked with setup.py or setup.cfg."
-  (or (locate-dominating-file default-directory "setup.py")
-      (locate-dominating-file default-directory "setup.cfg")))
-
-(defun elpy-project-find-git-root ()
-  "Return the current git repository root, if any."
-  (locate-dominating-file default-directory ".git"))
-
-(defun elpy-project-find-hg-root ()
-  "Return the current git repository root, if any."
-  (locate-dominating-file default-directory ".hg"))
-
-(defun elpy-project-find-svn-root ()
-  "Return the current git repository root, if any."
-  (locate-dominating-file default-directory
-                          (lambda (dir)
-                            (and (file-directory-p (format "%s/.svn" dir))
-                                 (not (file-directory-p (format "%s/../.svn"
-                                                                dir)))))))
-
-(defun elpy-project-find-projectile-root ()
-  "Return the current project root according to projectile."
-  ;; `ignore-errors' both to avoid an unbound function error as well
-  ;; as ignore projectile saying there is no project root here.
-  (ignore-errors
-    (projectile-project-root)))
-
-(defun elpy-library-root ()
-  "Return the root of the Python package chain of the current buffer.
-
-That is, if you have /foo/package/module.py, it will return /foo,
-so that import package.module will pick up module.py."
-  (locate-dominating-file default-directory
-                          (lambda (dir)
-                            (not (file-exists-p
-                                  (format "%s/__init__.py"
-                                          dir))))))
-
-(defun elpy-project--read-project-variable (prompt)
-  "Prompt the user for a variable name to set project-wide."
-  (let* ((prefixes (mapcar (lambda (cust)
-                             (nth 2 cust))
-                           elpy-config--related-custom-groups))
-         (var-regex (format "^%s" (regexp-opt prefixes))))
-    (intern
-     (completing-read
-      prompt
-      obarray
-      (lambda (sym)
-        (and (get sym 'safe-local-variable)
-             (string-match var-regex (symbol-name sym))
-             (get sym 'custom-type)))
-      :require-match
-      nil
-      'elpy-project--variable-name-history))))
-
-(defun elpy-project--read-variable-value (prompt variable)
-  "Read the value for VARIABLE from the user."
-  (let ((custom-type (get variable 'custom-type)))
-    (if custom-type
-        (widget-prompt-value (if (listp custom-type)
-                                 custom-type
-                               (list custom-type))
-                             prompt
-                             (if (boundp variable)
-                                 (funcall
-                                  (or (get variable 'custom-get)
-                                      'symbol-value)
-                                  variable))
-                             (not (boundp variable)))
-      (eval-minibuffer prompt))))
-
-(defun elpy-set-project-variable (variable value)
-  "Set or remove a variable in the project-wide .dir-locals.el.
-
-With prefix argument, remove the variable."
-  (interactive
-   (let* ((variable (elpy-project--read-project-variable
-                     (if current-prefix-arg
-                         "Remove project variable: "
-                       "Set project variable: ")))
-          (value (if current-prefix-arg
-                     nil
-                   (elpy-project--read-variable-value (format "Value for %s: "
-                                                              variable)
-                                                      variable))))
-     (list variable value)))
-  (with-current-buffer (find-file-noselect (format "%s/%s"
-                                                   (elpy-project-root)
-                                                   dir-locals-file))
-    (modify-dir-local-variable nil
-                               variable
-                               value
-                               (if current-prefix-arg
-                                   'delete
-                                 'add-or-replace))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Search Project Files
-
-(defun elpy-rgrep-symbol (regexp)
-  "Search for REGEXP in the current project.
-
-REGEXP defaults to the symbol at point, or the current region if
-active.
-
-With a prefix argument, always prompt for a string to search
-for."
-  (interactive
-   (list
-    (cond
-     (current-prefix-arg
-      (read-from-minibuffer "Search in project for regexp: "))
-     ((use-region-p)
-      (buffer-substring-no-properties (region-beginning)
-                                      (region-end)))
-     (t
-      (let ((symbol (thing-at-point 'symbol)))
-        (if symbol
-            (format "\\<%s\\>" symbol)
-          (read-from-minibuffer "Search in project for regexp: ")))))))
-  (grep-compute-defaults)
-  (let ((grep-find-ignored-directories (append elpy-project-ignored-directories
-                                               grep-find-ignored-directories)))
-    (rgrep regexp
-           "*.py"
-           (or (elpy-project-root)
-               default-directory)))
-  (with-current-buffer next-error-last-buffer
-    (let ((inhibit-read-only t))
-      (save-excursion
-        (goto-char (point-min))
-        (when (re-search-forward "^find .*" nil t)
-          (replace-match (format "Searching for '%s'\n"
-                                 (regexp-quote regexp))))))))
-
-;;;;;;;;;;;;;;;;;;;;;;
-;;; Find Project Files
-
-(defun elpy-find-file (&optional dwim)
-  "Efficiently find a file in the current project.
-
-With prefix argument, tries to guess what kind of file the user
-wants to open.
-
-On an import line, it opens the file of that module.
-
-Otherwise, it opens a test file associated with the current file,
-if one exists. A test file is named test_<name>.py if the current
-file is <name>.py, and is either in the same directors or a
-\"test\" or \"tests\" subdirectory."
-  (interactive "P")
-  (cond
-   ((and dwim
-         (buffer-file-name)
-         (save-excursion
-           (goto-char (line-beginning-position))
-           (or (looking-at "^ *import +\\([[:alnum:]._]+\\)")
-               (looking-at "^ *from +\\([[:alnum:]._]+\\) +import +\\([[:alnum:]._]+\\)"))))
-    (let* ((module (if (match-string 2)
-                       (format "%s.%s" (match-string 1) (match-string 2))
-                     (match-string 1)))
-           (path (elpy-find--resolve-module module)))
-      (if path
-          (find-file path)
-        (elpy-find-file nil))))
-   ((and dwim
-         (buffer-file-name))
-    (let ((test-file (elpy-find--test-file)))
-      (if test-file
-          (find-file test-file)
-        (elpy-find-file nil))))
-   (t
-    (let ((ffip-prune-patterns elpy-project-ignored-directories)
-          (ffip-project-root (elpy-project-root))
-          ;; Set up ido to use vertical file lists.
-          (ido-decorations '("\n" "" "\n" "\n..."
-                             "[" "]" " [No match]" " [Matched]"
-                             " [Not readable]" " [Too big]"
-                             " [Confirm]"))
-          (ido-setup-hook (cons (lambda ()
-                                  (define-key ido-completion-map (kbd "<down>")
-                                    'ido-next-match)
-                                  (define-key ido-completion-map (kbd "<up>")
-                                    'ido-prev-match))
-                                ido-setup-hook)))
-      (find-file-in-project)))))
-
-(defun elpy-find--test-file ()
-  "Return the test file for the current file, if any.
-
-If this is a test file, return the non-test file.
-
-A test file is named test_<name>.py if the current file is
-<name>.py, and is either in the same directors or a \"test\" or
-\"tests\" subdirectory."
-  (catch 'return
-    (let (full-name directory file)
-      (setq full-name (buffer-file-name))
-      (when (not full-name)
-        (throw 'return nil))
-      (setq full-name (expand-file-name full-name)
-            directory (file-name-directory full-name)
-            file (file-name-nondirectory full-name))
-      (if (string-match "^test_" file)
-          (let ((file (substring file 5)))
-            (dolist (implementation (list (format "%s/%s" directory file)
-                                          (format "%s/../%s" directory file)))
-              (when (file-exists-p implementation)
-                (throw 'return implementation))))
-        (dolist (test (list (format "%s/test_%s" directory file)
-                            (format "%s/test/test_%s" directory file)
-                            (format "%s/tests/test_%s" directory file)
-                            (format "%s/../test/test_%s" directory file)
-                            (format "%s/../tests/test_%s" directory file)))
-          (when (file-exists-p test)
-            (throw 'return test)))))))
-
-(defun elpy-find--module-path (module)
-  "Return a directory path for MODULE.
-
-The resulting path is not guaranteed to exist. This simply
-resolves leading periods relative to the current directory and
-replaces periods in the middle of the string with slashes.
-
-Only works with absolute imports. Stop using implicit relative
-imports. They're a bad idea."
-  (let* ((relative-depth (when(string-match "^\\.+" module)
-                           (length (match-string 0 module))))
-         (base-directory (if relative-depth
-                             (format "%s/%s"
-                                     (buffer-file-name)
-                                     (mapconcat (lambda (_)
-                                                  "../")
-                                                (make-vector relative-depth
-                                                             nil)
-                                                ""))
-                           (elpy-library-root)))
-         (file-name (replace-regexp-in-string
-                     "\\."
-                     "/"
-                     (if relative-depth
-                         (substring module relative-depth)
-                       module))))
-    (expand-file-name (format "%s/%s" base-directory file-name))))
-
-(defun elpy-find--resolve-module (module)
-  "Resolve MODULE relative to the current file and project.
-
-Returns a full path name for that module."
-  (catch 'return
-    (let ((path (elpy-find--module-path module)))
-      (while (string-prefix-p (expand-file-name (elpy-library-root))
-                              path)
-        (dolist (name (list (format "%s.py" path)
-                            (format "%s/__init__.py" path)))
-          (when (file-exists-p name)
-            (throw 'return name)))
-        (if (string-match "/$" path)
-            (setq path (substring path 0 -1))
-          (setq path (file-name-directory path)))))
-    nil))
-
-;;;;;;;;;;;;;;;;;;;;;
-;;; Interactive Shell
-
-(defun elpy-use-ipython (&optional ipython)
-  "Set defaults to use IPython instead of the standard interpreter.
-
-With prefix arg, prompt for the command to use."
-  (interactive (list (when current-prefix-arg
-                       (read-file-name "IPython command: "))))
-  (when (not ipython)
-    (setq ipython "ipython"))
-  (when (not (executable-find ipython))
-    (error "Command %S not found" ipython))
-  (cond
-   ;; Emacs 24 until 24.3
-   ((boundp 'python-python-command)
-    (setq python-python-command ipython))
-   ;; Emacs 24.3
-   ((and (version<= "24.3" emacs-version)
-         (not (boundp 'python-shell-interpreter-interactive-arg)))
-    ;; This is from the python.el commentary.
-    ;; Settings for IPython 0.11:
-    (setq python-shell-interpreter ipython
-          python-shell-interpreter-args ""
-          python-shell-prompt-regexp "In \\[[0-9]+\\]: "
-          python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: "
-          python-shell-completion-setup-code
-          "from IPython.core.completerlib import module_completion"
-          python-shell-completion-module-string-code
-          "';'.join(module_completion('''%s'''))\n"
-          python-shell-completion-string-code
-          "';'.join(get_ipython().Completer.all_completions('''%s'''))\n"))
-   ;; Emacs 24.4
-   ((boundp 'python-shell-interpreter-interactive-arg)
-    (setq python-shell-interpreter ipython
-          python-shell-interpreter-args "-i")
-    ;; Windows requires some special handling here, see #422
-    (let ((exe "C:\\Python27\\python.exe")
-          (ipython_py "C:\\Python27\\Scripts\\ipython-script.py"))
-      (when (and (eq system-type 'windows-nt)
-                 (file-exists-p exe)
-                 (file-exists-p ipython_py))
-        (setq python-shell-interpreter exe
-              python-shell-interpreter-args "-i " + ipython_py))))
-   (t
-    (error "I don't know how to set ipython settings for this Emacs"))))
-
-(defun elpy-use-cpython (&optional cpython)
-  "Set defaults to use the standard interpreter instead of IPython.
-
-With prefix arg, prompt for the command to use."
-  (interactive (list (when current-prefix-arg
-                       (read-file-name "Python command: "))))
-  (when (not cpython)
-    (setq cpython "python"))
-  (when (not (executable-find cpython))
-    (error "Command %S not found" cpython))
-  (cond
-   ;; Emacs 24 until 24.3
-   ((boundp 'python-python-command)
-    (setq python-python-command cpython))
-   ;; Emacs 24.3 and onwards.
-   ((and (version<= "24.3" emacs-version)
-         (not (boundp 'python-shell-interpreter-interactive-arg)))
-    (setq python-shell-interpreter cpython
-          python-shell-interpreter-args "-i"
-          python-shell-prompt-regexp ">>> "
-          python-shell-prompt-output-regexp ""
-          python-shell-completion-setup-code
-          "try:
-    import readline
-except ImportError:
-    def __COMPLETER_all_completions(text): []
-else:
-    import rlcompleter
-    readline.set_completer(rlcompleter.Completer().complete)
-    def __COMPLETER_all_completions(text):
-        import sys
-        completions = []
-        try:
-            i = 0
-            while True:
-                res = readline.get_completer()(text, i)
-                if not res: break
-                i += 1
-                completions.append(res)
-        except NameError:
-            pass
-        return completions"
-          python-shell-completion-module-string-code ""
-          python-shell-completion-string-code
-          "';'.join(__COMPLETER_all_completions('''%s'''))\n"))
-   ;; Emacs 24.4
-   ((boundp 'python-shell-interpreter-interactive-arg)
-    (setq python-shell-interpreter cpython
-          python-shell-interpreter-args "-i"))
-   (t
-    (error "I don't know how to set ipython settings for this Emacs"))))
-
-(defun elpy-shell-send-region-or-buffer (&optional arg)
-  "Send the active region or the buffer to the Python shell.
-
-If there is an active region, send that. Otherwise, send the
-whole buffer.
-
-In Emacs 24.3 and later, without prefix argument, this will
-escape the Python idiom of if __name__ == '__main__' to be false
-to avoid accidental execution of code. With prefix argument, this
-code is executed."
-  (interactive "P")
-  ;; Ensure process exists
-  (elpy-shell-get-or-create-process)
-  (let ((if-main-regex "^if +__name__ +== +[\"']__main__[\"'] *:")
-        (has-if-main nil))
-    (if (use-region-p)
-        (let ((region (elpy-shell--region-without-indentation
-                       (region-beginning) (region-end))))
-          (setq has-if-main (string-match if-main-regex region))
-          (when (string-match "\t" region)
-            (message "Region contained tabs, this might cause weird errors"))
-          (python-shell-send-string region))
-      (save-excursion
-        (goto-char (point-min))
-        (setq has-if-main (re-search-forward if-main-regex nil t)))
-      (python-shell-send-buffer arg))
-    (display-buffer (process-buffer (elpy-shell-get-or-create-process))
-                    nil
-                    'visible)
-    (when has-if-main
-      (message (concat "Removed if __main__ == '__main__' construct, "
-                       "use a prefix argument to evaluate.")))))
-
-(defun elpy-shell-switch-to-shell ()
-  "Switch to inferior Python process buffer."
-  (interactive)
-  (pop-to-buffer (process-buffer (elpy-shell-get-or-create-process))))
-
-(defun elpy-shell-get-or-create-process ()
-  "Get or create an inferior Python process for current buffer and return it."
-  (let* ((bufname (format "*%s*" (python-shell-get-process-name nil)))
-         (proc (get-buffer-process bufname)))
-    (if proc
-        proc
-      (run-python (python-shell-parse-command))
-      (get-buffer-process bufname))))
-
-(defun elpy-shell--region-without-indentation (beg end)
-  "Return the current region as a string, but without indentation."
-  (if (= beg end)
-      ""
-    (let ((region (buffer-substring beg end))
-          (indent-level nil))
-      (with-temp-buffer
-        (insert region)
-        (goto-char (point-min))
-        (while (< (point) (point-max))
-          (cond
-           ((and (not indent-level)
-                 (not (looking-at "[ \t]*$")))
-            (setq indent-level (current-indentation)))
-           ((and indent-level
-                 (not (looking-at "[ \t]*$"))
-                 (< (current-indentation)
-                    indent-level))
-            (error "Can't adjust indentation, consecutive lines indented less than starting line")))
-          (forward-line))
-        (indent-rigidly (point-min)
-                        (point-max)
-                        (- indent-level))
-        (buffer-string)))))
-
-;;;;;;;;;;;;;;;;;
-;;; Syntax Checks
-
-(defun elpy-check (&optional whole-project-p)
-  "Run `python-check-command' on the current buffer's file,
-
-or the project root if WHOLE-PROJECT-P is non-nil (interactively,
-with a prefix argument)."
-  (interactive "P")
-  (when (not (buffer-file-name))
-    (error "Can't check a buffer without a file."))
-  (save-some-buffers (not compilation-ask-about-save) nil)
-  (let ((process-environment (python-shell-calculate-process-environment))
-        (exec-path (python-shell-calculate-exec-path))
-        (file-name-or-directory (expand-file-name
-                                 (if whole-project-p
-                                     (or (elpy-project-root)
-                                         (buffer-file-name))
-                                   (buffer-file-name))))
-        (extra-args (if whole-project-p
-                        (concat " --exclude="
-                                (mapconcat #'identity
-                                           elpy-project-ignored-directories
-                                           ","))
-                      "")))
-    (compilation-start (concat python-check-command
-                               " "
-                               (shell-quote-argument file-name-or-directory)
-                               extra-args)
-                       nil
-                       (lambda (mode-name)
-                         "*Python Check*"))))
-
-;;;;;;;;;;;;;;
-;;; Navigation
-
-(defun elpy-goto-definition ()
-  "Go to the definition of the symbol at point, if found."
-  (interactive)
-  (let ((location (elpy-rpc-get-definition)))
-    (if location
-        (elpy-goto-location (car location) (cadr location))
-      (error "No definition found"))))
-
-(defun elpy-goto-location (filename offset)
-  "Show FILENAME at OFFSET to the user."
-  (ring-insert find-tag-marker-ring (point-marker))
-  (let ((buffer (find-file filename)))
-    (with-current-buffer buffer
-      (with-selected-window (get-buffer-window buffer)
-        (goto-char (1+ offset))
-        (recenter 0)))))
-
-(defun elpy-nav-forward-block ()
-  "Move to the next line indented like point.
-
-This will skip over lines and statements with different
-indentation levels."
-  (interactive)
-  (let ((indent (current-column))
-        (start (point)))
-    (when (/= (% indent python-indent-offset)
-              0)
-      (setq indent (* (1+ (/ indent python-indent-offset))
-                      python-indent-offset)))
-    (python-nav-forward-statement)
-    (while (and (< indent (current-indentation))
-                (not (eobp)))
-      (python-nav-forward-statement))
-    (when (< (current-indentation)
-             indent)
-      (goto-char start))))
-
-(defun elpy-nav-backward-block ()
-  "Move to the previous line indented like point.
-
-This will skip over lines and statements with different
-indentation levels."
-  (interactive)
-  (let ((indent (current-column))
-        (start (point)))
-    (when (/= (% indent python-indent-offset)
-              0)
-      (setq indent (* (1+ (/ indent python-indent-offset))
-                      python-indent-offset)))
-    (python-nav-backward-statement)
-    (while (and (< indent (current-indentation))
-                (not (bobp)))
-      (python-nav-backward-statement))
-    (when (< (current-indentation)
-             indent)
-      (goto-char start))))
-
-(defun elpy-nav-forward-indent ()
-  "Move forward to the next indent level, or over the next word."
-  (interactive "^")
-  (if (< (current-column) (current-indentation))
-      (let* ((current (current-column))
-             (next (* (1+ (/ current python-indent-offset))
-                      python-indent-offset)))
-        (goto-char (+ (point-at-bol)
-                      next)))
-    (let ((eol (point-at-eol)))
-      (forward-word)
-      (when (> (point) eol)
-        (goto-char (point-at-bol))))))
-
-(defun elpy-nav-backward-indent ()
-  "Move backward to the previous indent level, or over the previous word."
-  (interactive "^")
-  (if (and (<= (current-column) (current-indentation))
-           (/= (current-column) 0))
-      (let* ((current (current-column))
-             (next (* (1- (/ current python-indent-offset))
-                      python-indent-offset)))
-        (goto-char (+ (point-at-bol)
-                      next)))
-    (backward-word)))
-
-(defun elpy-nav-move-line-or-region-down (&optional beg end)
-  "Move the current line or active region down."
-  (interactive "r")
-  (if (use-region-p)
-      (elpy--nav-move-region-vertically beg end 1)
-    (elpy--nav-move-line-vertically 1)))
-
-(defun elpy-nav-move-line-or-region-up (&optional beg end)
-  "Move the current line or active region down."
-  (interactive "r")
-  (if (use-region-p)
-      (elpy--nav-move-region-vertically beg end -1)
-    (elpy--nav-move-line-vertically -1)))
-
-(defun elpy--nav-move-line-vertically (dir)
-  (let* ((beg (point-at-bol))
-         (end (point-at-bol 2))
-         (col (current-column))
-         (region (delete-and-extract-region beg end)))
-    (forward-line dir)
-    (save-excursion
-      (insert region))
-    (goto-char (+ (point) col))))
-
-(defun elpy--nav-move-region-vertically (beg end dir)
-  (let* ((point-before-mark (< (point) (mark)))
-         (beg (save-excursion
-                (goto-char beg)
-                (point-at-bol)))
-         (end (save-excursion
-                (goto-char end)
-                (if (bolp)
-                    (point)
-                  (point-at-bol 2))))
-         (region (delete-and-extract-region beg end)))
-    (goto-char beg)
-    (forward-line dir)
-    (save-excursion
-      (insert region))
-    (if point-before-mark
-        (set-mark (+ (point)
-                     (length region)))
-      (set-mark (point))
-      (goto-char (+ (point)
-                    (length region))))
-    (setq deactivate-mark nil)))
-
-(defun elpy-nav-move-region-or-line-left ()
-  "Dedent the current indentation block, or the active region."
-  (interactive)
-  (if (use-region-p)
-      (elpy--nav-move-region-left)
-    (elpy--nav-move-line-left)))
-
-(defun elpy-nav-move-region-or-line-right ()
-  "Indent the current indentation block, or the active region."
-  (interactive)
-  (if (use-region-p)
-      (elpy--nav-move-region-right)
-    (elpy--nav-move-line-right )))
-
-(defun elpy--nav-move-line-left ()
-  (save-excursion
-    (goto-char (point-at-bol))
-    (when (looking-at (format "^ \\{%i\\}" python-indent))
-      (replace-match ""))))
-
-(defun elpy--nav-move-line-right ()
-  (save-excursion
-    (goto-char (point-at-bol))
-    (insert (make-string python-indent ?\s))))
-
-(defun elpy--nav-move-region-left ()
-  (save-excursion
-    (let ((beg (region-beginning))
-          (end (region-end)))
-      (goto-char beg)
-      (goto-char (point-at-bol))
-      (while (< (point) end)
-        (elpy--nav-move-line-left)
-        (forward-line 1)))
-    (setq deactivate-mark nil)))
-
-(defun elpy--nav-move-region-right ()
-  (save-excursion
-    (let ((beg (region-beginning))
-          (end (region-end)))
-      (goto-char beg)
-      (goto-char (point-at-bol))
-      (while (< (point) end)
-        (elpy--nav-move-line-right)
-        (forward-line 1)))
-    (setq deactivate-mark nil)))
-
-(defun elpy-open-and-indent-line-below ()
-  "Open a line below the current one, move there, and indent."
-  (interactive)
-  (move-end-of-line 1)
-  (newline-and-indent))
-
-(defun elpy-open-and-indent-line-above ()
-  "Open a line above the current one, move there, and indent."
-  (interactive)
-  (move-beginning-of-line 1)
-  (save-excursion
-    (insert "\n"))
-  (indent-according-to-mode))
-
-;;;;;;;;;;;;;;;;
-;;; Test running
-
-(defvar elpy-set-test-runner-history nil
-  "History variable for `elpy-set-test-runner'.")
-
-(defun elpy-test (&optional test-whole-project)
-  "Run tests on the current test, or the whole project.
-
-If there is a test at point, run that test. If not, or if a
-prefix is given, run all tests in the current project."
-  (interactive "P")
-  (let ((current-test (elpy-test-at-point)))
-    (if test-whole-project
-        ;; With prefix arg, test the whole project.
-        (funcall elpy-test-runner
-                 (car current-test)
-                 nil nil nil)
-      ;; Else, run only this test
-      (apply elpy-test-runner current-test))))
-
-(defun elpy-set-test-runner (test-runner)
-  "Tell Elpy to use TEST-RUNNER to run tests.
-
-See `elpy-test' for how to invoke it."
-  (interactive
-   (list
-    (let* ((runners (mapcar (lambda (value)
-                              (cons (nth 2 value)
-                                    (nth 3 value)))
-                            (cdr (get 'elpy-test-runner 'custom-type))))
-           (current (cdr (assq elpy-test-runner
-                               (mapcar (lambda (cell)
-                                         (cons (cdr cell) (car cell)))
-                                       runners))))
-           (choice (completing-read (if current
-                                        (format "Test runner (currently %s): "
-                                                current)
-                                      "Test runner: ")
-                                    runners
-                                    nil t nil 'elpy-set-test-runner-history)))
-      (if (equal choice "")
-          elpy-test-runner
-        (cdr (assoc choice runners))))))
-  (setq elpy-test-runner test-runner))
-
-(defun elpy-test-at-point ()
-  "Return a list specifying the test at point, if any.
-
-This is used as the interactive
-
-This list has four elements.
-
-- Top level directory:
-  All test files should be importable from here.
-- Test file:
-  The current file name.
-- Test module:
-  The module name, relative to the top level directory.
-- Test name:
-  The full name of the current test within the module, for
-  example TestClass.test_method
-
-If there is no test at point, test name is nil.
-If the current buffer is not visiting a file, only the top level
-directory is not nil."
-  (if (not buffer-file-name)
-      (progn
-        (save-some-buffers)
-        (list (elpy-library-root) nil nil nil))
-    (let* ((top (elpy-library-root))
-           (file buffer-file-name)
-           (module (elpy-test--module-name-for-file top file))
-           (test (elpy-test--current-test-name)))
-      (if (and file (string-match "/test[^/]*$" file))
-          (progn
-            (save-buffer)
-            (list top file module test))
-        (save-some-buffers)
-        (list top nil nil nil)))))
-
-(defun elpy-test--current-test-name ()
-  (let ((name (python-info-current-defun)))
-    (if (and name
-             (string-match "\\`\\([^.]+\\.[^.]+\\)\\." name))
-        (match-string 1 name)
-      name)))
-
-(defun elpy-test--module-name-for-file (top-level module-file)
-  "Return the module name relative to TOP-LEVEL for MODULE-FILE.
-
-For example, for a top level of /project/root/ and a module file
-of /project/root/package/module.py, this would return
-\"package.module\"."
-  (let* ((relative-name (file-relative-name module-file top-level))
-         (no-extension (replace-regexp-in-string "\\.py\\'" "" relative-name))
-         (no-init (replace-regexp-in-string "/__init__\\'" "" no-extension))
-         (dotted (replace-regexp-in-string "/" "." no-init)))
-    (if (string-match "^\\." dotted)
-        (concat "." (replace-regexp-in-string (regexp-quote "...") "." dotted))
-      dotted)))
-
-(defun elpy-test-runner-p (obj)
-  "Return t iff OBJ is a test runner.
-
-This uses the `elpy-test-runner-p' symbol property."
-  (get obj 'elpy-test-runner-p))
-
-(defun elpy-test-run (working-directory command &rest args)
-  "Run COMMAND with ARGS in WORKING-DIRECTORY as a test command."
-  (let ((default-directory working-directory))
-    (compile (mapconcat #'shell-quote-argument
-                        (cons command args)
-                        " "))))
-
-(defun elpy-test-discover-runner (top file module test)
-  "Test the project using the python unittest discover runner.
-
-This requires Python 2.7 or later."
-  (interactive (elpy-test-at-point))
-  (let ((test (cond
-               (test (format "%s.%s" module test))
-               (module module)
-               (t "discover"))))
-    (apply #'elpy-test-run
-           top
-           (append elpy-test-discover-runner-command
-                   (list test)))))
-(put 'elpy-test-discover-runner 'elpy-test-runner-p t)
-
-(defun elpy-test-django-runner (top file module test)
-  "Test the project using the Django discover runner.
-
-This requires Django 1.6 or the django-discover-runner package."
-  (interactive (elpy-test-at-point))
-  (if module
-      (apply #'elpy-test-run
-             top
-             (append elpy-test-django-runner-command
-                     (list (if test
-                               (format "%s.%s" module test)
-                             module))))
-    (apply #'elpy-test-run
-           top
-           elpy-test-django-runner-command)))
-(put 'elpy-test-django-runner 'elpy-test-runner-p t)
-
-(defun elpy-test-nose-runner (top file module test)
-  "Test the project using the nose test runner.
-
-This requires the nose package to be installed."
-  (interactive (elpy-test-at-point))
-  (if module
-      (apply #'elpy-test-run
-             top
-             (append elpy-test-nose-runner-command
-                     (list (if test
-                               (format "%s:%s" module test)
-                             module))))
-    (apply #'elpy-test-run
-           top
-           elpy-test-nose-runner-command)))
-(put 'elpy-test-nose-runner 'elpy-test-runner-p t)
-
-(defun elpy-test-trial-runner (top file module test)
-  "Test the project using Twisted's Trial test runner.
-
-This requires the twisted-core package to be installed."
-  (interactive (elpy-test-at-point))
-  (if module
-      (apply #'elpy-test-run
-             top
-             (append elpy-test-trial-runner-command
-                     (list (if test
-                               (format "%s.%s" module test)
-                             module))))
-    (apply #'elpy-test-run top elpy-test-trial-runner-command)))
-(put 'elpy-test-trial-runner 'elpy-test-runner-p t)
-
-(defun elpy-test-pytest-runner (top file module test)
-  "Test the project using the py.test test runner.
-
-This requires the pytest package to be installed."
-  (interactive (elpy-test-at-point))
-  (cond
-   (test
-    (let ((test-list (split-string test "\\.")))
-      (apply #'elpy-test-run
-             top
-             (append elpy-test-pytest-runner-command
-                     (list (mapconcat #'identity
-                                      (cons file test-list)
-                                      "::"))))))
-   (module
-    (apply #'elpy-test-run top (append elpy-test-pytest-runner-command
-                                       (list file))))
-   (t
-    (apply #'elpy-test-run top elpy-test-pytest-runner-command))))
-(put 'elpy-test-pytest-runner 'elpy-test-runner-p t)
-
-;;;;;;;;;;;;;;;;;
-;;; Documentation
-
-(defvar elpy-doc-history nil
-  "History for the `elpy-doc' command.")
-
-(defun elpy-doc ()
-  "Show documentation for the symbol at point.
-
-If there is no documentation for the symbol at point, or if a
-prefix argument is given, prompt for a symbol from the user."
-  (interactive)
-  (let ((symbol-at-point nil)
-        (doc nil))
-    (when (not current-prefix-arg)
-      (setq doc (elpy-rpc-get-docstring))
-      (when (not doc)
-        (save-excursion
-          (python-nav-backward-up-list)
-          (setq doc (elpy-rpc-get-docstring))))
-      (when (not doc)
-        (setq doc (elpy-rpc-get-pydoc-documentation
-                   (elpy-doc--symbol-at-point))))
-      (when (not doc)
-        (save-excursion
-          (python-nav-backward-up-list)
-          (setq doc (elpy-rpc-get-pydoc-documentation
-                     (elpy-doc--symbol-at-point))))))
-    (when (not doc)
-      (setq doc (elpy-rpc-get-pydoc-documentation
-                 (elpy-doc--read-identifier-from-minibuffer
-                  (elpy-doc--symbol-at-point)))))
-    (if doc
-        (elpy-doc--show doc)
-      (error "No documentation found."))))
-
-(defun elpy-doc--read-identifier-from-minibuffer (initial)
-  "Read a pydoc-able identifier from the minibuffer."
-  (completing-read "Pydoc for: "
-                   (completion-table-dynamic #'elpy-rpc-get-pydoc-completions)
-                   nil nil initial 'elpy-doc-history))
-
-(defun elpy-doc--show (documentation)
-  "Show DOCUMENTATION to the user, replacing ^H with bold."
-  (with-help-window "*Python Doc*"
-    (with-current-buffer "*Python Doc*"
-      (erase-buffer)
-      (insert documentation)
-      (goto-char (point-min))
-      (while (re-search-forward "\\(.\\)\\1" nil t)
-        (replace-match (propertize (match-string 1)
-                                   'face 'bold)
-                       t t)))))
-
-(defun elpy-doc--symbol-at-point ()
-  "Return the Python symbol at point, including dotted paths."
-  (with-syntax-table python-dotty-syntax-table
-    (let ((symbol (symbol-at-point)))
-      (if symbol
-          (symbol-name symbol)
-        nil))))
-
-;;;;;;;;;;;;;;
-;;; Import manipulation
-
-(defun elpy-importmagic--replace-block (spec)
-  "Replace an imports block. SPEC is (startline endline newblock)."
-  (let ((start-line (nth 0 spec))
-        (end-line (nth 1 spec))
-        (new-block (nth 2 spec)))
-    (save-excursion
-      (save-restriction
-        (widen)
-        (goto-char (point-min))
-        (forward-line start-line)
-        (let ((beg (point))
-              (end (progn (forward-line (- end-line start-line)) (point))))
-          ;; Avoid deleting and re-inserting when the blocks are equal.
-          (unless (string-equal (buffer-substring beg end) new-block)
-            (delete-region beg end)
-            (insert new-block)))))))
-
-(defun elpy-importmagic--add-import-read-args (&optional object prompt)
-  (let* ((default-object (save-excursion
-                           (let ((bounds (with-syntax-table python-dotty-syntax-table
-                                           (bounds-of-thing-at-point 'symbol))))
-                             (if bounds (buffer-substring (car bounds) (cdr bounds)) ""))))
-         (object-to-import (or object (read-string "Object to import: " default-object)))
-         (possible-imports (elpy-rpc "get_import_symbols" (list buffer-file-name
-                                                                (elpy-rpc--buffer-contents)
-                                                                object-to-import)))
-         (statement-prompt (or prompt "New import statement: ")))
-    (cond
-     ;; An elpy warning (i.e. index not ready) is returned as a string.
-     ((stringp possible-imports)
-      (list ""))
-     ;; If there is no candidate, we exit immediately.
-     ((null possible-imports)
-      (message "No import candidate found")
-      (list ""))
-     ;; We have some candidates, let the user choose one.
-     (t
-      (let ((first-choice (car possible-imports))
-            (user-choice (completing-read statement-prompt possible-imports)))
-        (list (if (equal user-choice "") first-choice user-choice)))))))
-
-(defun elpy-importmagic-add-import (statement)
-  (interactive (elpy-importmagic--add-import-read-args))
-  (unless (equal statement "")
-    (let* ((res (elpy-rpc "add_import" (list buffer-file-name
-                                             (elpy-rpc--buffer-contents)
-                                             statement))))
-      (elpy-importmagic--replace-block res))))
-
-(defun elpy-importmagic-fixup ()
-  "Query for new imports of unresolved symbols, and remove unreferenced imports.
-
-Also sort the imports in the import statement blocks."
-  (interactive)
-  ;; get all unresolved names, and interactively add imports for them
-  (let* ((res (elpy-rpc "get_unresolved_symbols" (list buffer-file-name
-                                                       (elpy-rpc--buffer-contents)))))
-    (unless (stringp res)
-      (if (null res) (message "No imports to add."))
-      (dolist (object res)
-        (let* ((prompt (format "How to import \"%s\": " object))
-               (choice (elpy-importmagic--add-import-read-args object prompt)))
-          (elpy-importmagic-add-import (car choice))))))
-  ;; now get a new import statement block (this also sorts)
-  (let* ((res (elpy-rpc "remove_unreferenced_imports" (list buffer-file-name
-                                                            (elpy-rpc--buffer-contents)))))
-    (unless (stringp res)
-      (elpy-importmagic--replace-block res))))
-
-;;;;;;;;;;;;;;
-;;; Multi-Edit
-
-(defvar elpy-multiedit-overlays nil
-  "List of overlays currently being edited.")
-
-(defun elpy-multiedit-add-overlay (beg end)
-  "Add an editable overlay between BEG and END.
-
-A modification in any of these overlays will modify all other
-overlays, too."
-  (interactive "r")
-  (when (elpy-multiedit--overlays-in-p beg end)
-    (error "Overlapping multiedit overlays are not allowed"))
-  (let ((ov (make-overlay beg end nil nil :rear-advance)))
-    (overlay-put ov 'elpy-multiedit t)
-    (overlay-put ov 'face 'highlight)
-    (overlay-put ov 'modification-hooks '(elpy-multiedit--overlay-changed))
-    (overlay-put ov 'insert-in-front-hooks '(elpy-multiedit--overlay-changed))
-    (overlay-put ov 'insert-behind-hooks '(elpy-multiedit--overlay-changed))
-    (push ov elpy-multiedit-overlays)))
-
-(defun elpy-multiedit--overlays-in-p (beg end)
-  "Return t iff there are multiedit overlays between beg and end."
-  (catch 'return
-    (dolist (ov (overlays-in beg end))
-      (when (overlay-get ov 'elpy-multiedit)
-        (throw 'return t)))
-    nil))
-
-(defun elpy-multiedit-stop ()
-  "Stop editing multiple places at once."
-  (interactive)
-  (dolist (ov elpy-multiedit-overlays)
-    (delete-overlay ov))
-  (setq elpy-multiedit-overlays nil))
-
-(defun elpy-multiedit--overlay-changed (ov after-change beg end
-                                           &optional pre-change-length)
-  "Called for each overlay that changes.
-
-This updates all other overlays."
-  (when (and after-change
-             (not undo-in-progress)
-             (overlay-buffer ov))
-    (let ((text (buffer-substring (overlay-start ov)
-                                  (overlay-end ov)))
-          (inhibit-modification-hooks t))
-      (dolist (other-ov elpy-multiedit-overlays)
-        (when (and (not (equal other-ov ov))
-                   (buffer-live-p (overlay-buffer other-ov)))
-          (with-current-buffer (overlay-buffer other-ov)
-            (save-excursion
-              (goto-char (overlay-start other-ov))
-              (insert text)
-              (delete-region (point) (overlay-end other-ov)))))))))
-
-(defun elpy-multiedit ()
-  "Edit all occurences of the symbol at point, or the active region.
-
-If multiedit is active, stop it."
-  (interactive)
-  (if elpy-multiedit-overlays
-      (elpy-multiedit-stop)
-    (let ((regex (if (use-region-p)
-                     (regexp-quote (buffer-substring (region-beginning)
-                                                     (region-end)))
-                   (format "\\_<%s\\_>" (regexp-quote
-                                         (symbol-name
-                                          (symbol-at-point))))))
-          (case-fold-search nil))
-      (save-excursion
-        (goto-char (point-min))
-        (while (re-search-forward regex nil t)
-          (elpy-multiedit-add-overlay (match-beginning 0)
-                                      (match-end 0)))))))
-
-(defun elpy-multiedit-python-symbol-at-point (&optional use-symbol-p)
-  "Edit all usages of the the Python symbol at point.
-
-With prefix arg, edit all syntactic usages of the symbol at
-point. This might include unrelated symbols that just share the
-name."
-  (interactive "P")
-  (if (or elpy-multiedit-overlays
-          use-symbol-p
-          (use-region-p))
-      ;; If we are already doing a multiedit, or are explicitly told
-      ;; to use the symbol at point, or if we are on an active region,
-      ;; call the multiedit function that does just that already.
-      (call-interactively 'elpy-multiedit)
-    ;; Otherwise, fetch usages from backend.
-    (save-some-buffers)
-    (let ((usages (condition-case err
-                      (elpy-rpc-get-usages)
-                    ;; This is quite the stunt, but elisp parses JSON
-                    ;; null as nil, which is indistinguishable from
-                    ;; the empty list, we stick to the error.
-                    (error
-                     (if (and (eq (car err) 'error)
-                              (stringp (cadr err))
-                              (string-match "not implemented" (cadr err)))
-                         'not-supported
-                       (error (cadr err)))))))
-      (cond
-       ((eq usages 'not-supported)
-        (call-interactively 'elpy-multiedit)
-        (message (concat "Using syntactic editing "
-                         "as current backend does not support get_usages.")))
-       ((null usages)
-        (call-interactively 'elpy-multiedit)
-        (if elpy-multiedit-overlays
-            (message (concat "Using syntactic editing as no usages of the "
-                             "symbol at point were found by the backend."))
-          (message "No occurrences of the symbol at point found")))
-       (t
-        (elpy-multiedit--usages usages))))))
-
-(defun elpy-multiedit--usages (usages)
-  "Mark the usages in USAGES for editing."
-  (let ((name nil)
-        (locations (make-hash-table :test #'equal)))
-    (dolist (usage usages)
-      (let* ((filename (cdr (assq 'filename usage)))
-             (this-name (cdr (assq 'name usage)))
-             (offset (cdr (assq 'offset usage))))
-        (setq name this-name)
-        (with-current-buffer (if filename
-                                 (find-file-noselect filename)
-                               (current-buffer))
-          (elpy-multiedit-add-overlay (+ offset 1)
-                                      (+ offset 1 (length this-name)))
-          (save-excursion
-            (goto-char (+ offset 1))
-            (puthash filename
-                     (cons (list offset
-                                 (buffer-substring (line-beginning-position)
-                                                   (line-end-position))
-                                 (- (point)
-                                    (line-beginning-position))
-                                 (- (+ (point) (length this-name))
-                                    (line-beginning-position)))
-                           (gethash filename locations))
-                     locations)))))
-    (if (<= (hash-table-count locations)
-            1)
-        (message "Editing %s usages of '%s' in this buffer"
-                 (length usages) name)
-      (with-current-buffer (get-buffer-create "*Elpy Edit Usages*")
-        (let ((inhibit-read-only t)
-              (filenames nil))
-          (erase-buffer)
-          (elpy-insert--para
-           "The symbol '" name "' was found in multiple files. Editing "
-           "all locations:\n\n")
-          (maphash (lambda (key value)
-                     (when (not (member key filenames))
-                       (setq filenames (cons key filenames))))
-                   locations)
-          (dolist (filename (sort filenames #'string<))
-            (elpy-insert--header filename)
-            (dolist (location (sort (gethash filename locations)
-                                    (lambda (loc1 loc2)
-                                      (< (car loc1)
-                                         (car loc2)))))
-              (let ((line (nth 1 location))
-                    (start (+ (line-beginning-position)
-                              (nth 2 location)))
-                    (end (+ (line-end-position)
-                            (nth 3 location))))
-                ;; Insert the \n first, else we extend the overlay.
-                (insert line "\n")
-                (elpy-multiedit-add-overlay start end)))
-            (insert "\n"))
-          (goto-char (point-min))
-          (display-buffer (current-buffer)
-                          nil
-                          'visible))))))
-
-;;;;;;;;;;;;;;;;;;;;;
-;;; Occur Definitions
-
-(defun elpy-occur-definitions ()
-  "Display an occur buffer of all definitions in the current buffer.
-
-Also, switch to that buffer."
-  (interactive)
-  (let ((list-matching-lines-face nil))
-    (occur "^ *\\(def\\|class\\) "))
-  (let ((window (get-buffer-window "*Occur*")))
-    (if window
-        (select-window window)
-      (switch-to-buffer "*Occur*"))))
-
-;;;;;;;;;;;;;;;;;;;
-;;; Promise objects
-
-(defvar elpy-promise-marker (make-symbol "*elpy-promise*")
-  "An uninterned symbol marking an Elpy promise object.")
-
-(defun elpy-promise (success &optional error)
-  "Return a new promise.
-
-A promise is an object with a success and error callback. If the
-promise is resolved using `elpy-promise-resolve', its success
-callback is called with the given value. The current buffer is
-restored, too.
-
-If the promise is rejected using `elpy-promise-reject', its error
-callback is called. For this function, the current buffer is not
-necessarily restored, as it is also called when the buffer does
-not exist anymore."
-  (vector elpy-promise-marker ; 0 id
-          success             ; 1 success-callback
-          error               ; 2 error-callback
-          (current-buffer)    ; 3 current-buffer
-          nil                 ; 4 run
-          ))
-
-(defun elpy-promise-p (obj)
-  "Return non-nil if the argument is a promise object."
-  (and (vectorp obj)
-       (= (length obj) 5)
-       (eq (aref obj 0) elpy-promise-marker)))
-
-(defsubst elpy-promise-success-callback (promise)
-  "Return the success callback for PROMISE."
-  (aref promise 1))
-
-(defsubst elpy-promise-error-callback (promise)
-  "Return the error callback for PROMISE."
-  (aref promise 2))
-
-(defsubst elpy-promise-buffer (promise)
-  "Return the buffer for PROMISE."
-  (aref promise 3))
-
-(defsubst elpy-promise-resolved-p (promise)
-  "Return non-nil if the PROMISE has been resolved or rejected."
-  (aref promise 4))
-
-(defsubst elpy-promise-set-resolved (promise)
-  "Mark PROMISE as having been resolved."
-  (aset promise 4 t))
-
-(defun elpy-promise-resolve (promise value)
-  "Resolve PROMISE with VALUE."
-  (when (not (elpy-promise-resolved-p promise))
-    (unwind-protect
-        (let ((success-callback (elpy-promise-success-callback promise)))
-          (when success-callback
-            (condition-case err
-                (with-current-buffer (elpy-promise-buffer promise)
-                  (funcall success-callback value))
-              (error
-               (elpy-promise-reject promise err)))))
-      (elpy-promise-set-resolved promise))))
-
-(defun elpy-promise-reject (promise reason)
-  "Reject PROMISE because of REASON."
-  (when (not (elpy-promise-resolved-p promise))
-    (unwind-protect
-        (let ((error-callback (elpy-promise-error-callback promise)))
-          (when error-callback
-            (if (buffer-live-p (elpy-promise-buffer promise))
-                (with-current-buffer (elpy-promise-buffer promise)
-                  (funcall error-callback reason))
-              (with-temp-buffer
-                (funcall error-callback reason)))))
-      (elpy-promise-set-resolved promise))))
-
-(defun elpy-promise-wait (promise &optional timeout)
-  "Wait for PROMISE to be resolved, for up to TIMEOUT seconds.
-
-This will accept process output while waiting.
-
-This will wait for the current Elpy RPC process specifically, as
-Emacs currently has a bug where it can wait for the entire time
-of the timeout, even if output arrives.
-
-See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17647"
-  (let ((end-time (when timeout
-                    (time-add (current-time)
-                              (seconds-to-time timeout))))
-        (process (get-buffer-process (elpy-rpc--get-rpc-buffer))))
-    (while (and (not (elpy-promise-resolved-p promise))
-                (or (not end-time)
-                    (time-less-p (current-time)
-                                 end-time)))
-      (accept-process-output process timeout))))
-
-;;;;;;;
-;;; RPC
-
-;; elpy-rpc is a simple JSON-based RPC protocol. It's mostly JSON-RPC
-;; 1.0, except we do not implement the full protocol as we do not need
-;; all the features. Emacs starts a Python subprocess which runs a
-;; special module. The module reads JSON-RPC requests and responds
-;; with JSON-RPC responses.
-
-(defvar elpy-rpc--call-id 0
-  "Call id of the last elpy-rpc call.
-
-Used to associate responses to callbacks.")
-(make-variable-buffer-local 'elpy-rpc--call-id)
-
-(defvar elpy-rpc--buffer-p nil
-  "True iff the current buffer is an elpy-rpc buffer.")
-(make-variable-buffer-local 'elpy-rpc--buffer-p)
-
-(defvar elpy-rpc--buffer nil
-  "The elpy-rpc buffer associated with this buffer.")
-(make-variable-buffer-local 'elpy-rpc--buffer)
-
-(defvar elpy-rpc--backend-library-root nil
-  "The project root used by this backend.")
-(make-variable-buffer-local 'elpy-rpc--backend-library-root)
-
-(defvar elpy-rpc--backend-python-command nil
-  "The Python interpreter used by this backend.")
-(make-variable-buffer-local 'elpy-rpc--backend-python-command)
-
-(defvar elpy-rpc--backend-callbacks nil
-  "The callbacks registered for calls to the current backend.
-
-This maps call IDs to functions.")
-(make-variable-buffer-local 'elpy-rpc--backend-callbacks)
-
-(defvar elpy-rpc--last-call nil
-  "The time of the last RPC call issued for this backend.")
-(make-variable-buffer-local 'elpy-rpc--last-call)
-
-(defvar elpy-rpc--last-error-popup nil
-  "The last time an error popup happened.")
-
-(defun elpy-rpc (method params &optional success error)
-  "Call METHOD with PARAMS in the backend.
-
-If SUCCESS and optionally ERROR is given, return immediately and
-call those when a result is available. Otherwise, wait for a
-result and return that."
-  (when (not error)
-    (setq error #'elpy-rpc--default-error-callback))
-  (if success
-      (elpy-rpc--call method params success error)
-    (elpy-rpc--call-blocking method params)))
-
-(defun elpy-rpc--call-blocking (method-name params)
-  "Call METHOD-NAME with PARAMS in the current RPC backend.
-
-Returns the result, blocking until this arrived."
-  (let* ((result-arrived nil)
-         (error-occured nil)
-         (result-value nil)
-         (error-object nil)
-         (promise (elpy-rpc--call method-name params
-                                  (lambda (result)
-                                    (setq result-value result
-                                          result-arrived t))
-                                  (lambda (err)
-                                    (setq error-object err
-                                          error-occured t)))))
-    (elpy-promise-wait promise elpy-rpc-timeout)
-    (cond
-     (error-occured
-      (elpy-rpc--default-error-callback error-object))
-     (result-arrived
-      result-value)
-     (t
-      (error "Timeout during RPC call %s from backend"
-             method-name)))))
-
-(defun elpy-rpc--call (method-name params success error)
-  "Call METHOD-NAME with PARAMS in the current RPC backend.
-
-When a result is available, SUCCESS will be called with that
-value as its sole argument. If an error occurs, ERROR will be
-called with the error list.
-
-Returns a PROMISE object."
-  (let ((promise (elpy-promise success error)))
-    (with-current-buffer (elpy-rpc--get-rpc-buffer)
-      (setq elpy-rpc--call-id (1+ elpy-rpc--call-id)
-            elpy-rpc--last-call (float-time))
-      (elpy-rpc--register-callback elpy-rpc--call-id promise)
-      (process-send-string
-       (get-buffer-process (current-buffer))
-       (concat (json-encode `((id . ,elpy-rpc--call-id)
-                              (method . ,method-name)
-                              (params . ,params)))
-               "\n")))
-    promise))
-
-(defun elpy-rpc--register-callback (call-id promise)
-  "Register for PROMISE to be called when CALL-ID returns.
-
-Must be called in an elpy-rpc buffer."
-  (when (not elpy-rpc--buffer-p)
-    (error "Must be called in RPC buffer"))
-  (when (not elpy-rpc--backend-callbacks)
-    (setq elpy-rpc--backend-callbacks (make-hash-table :test #'equal)))
-  (puthash call-id promise elpy-rpc--backend-callbacks))
-
-(defun elpy-rpc--get-rpc-buffer ()
-  "Return the RPC buffer associated with the current buffer,
-creating one if necessary."
-  (when (not (elpy-rpc--process-buffer-p elpy-rpc--buffer))
-    (setq elpy-rpc--buffer
-          (or (elpy-rpc--find-buffer (elpy-library-root)
-                                     elpy-rpc-python-command)
-              (elpy-rpc--open (elpy-library-root)
-                              elpy-rpc-python-command))))
-  elpy-rpc--buffer)
-
-(defun elpy-rpc--process-buffer-p (buffer)
-  "Return non-nil when BUFFER is a live elpy-rpc process buffer.
-
-If BUFFER is a buffer for an elpy-rpc process, but the process
-died, this will kill the process and buffer."
-  (cond
-   ((or (not buffer)
-        (not (buffer-live-p buffer)))
-    nil)
-   ((not (buffer-local-value 'elpy-rpc--buffer-p buffer))
-    nil)
-   ((and (get-buffer-process buffer)
-         (process-live-p (get-buffer-process buffer)))
-    t)
-   (t
-    (ignore-errors
-      (kill-process (get-buffer-process buffer)))
-    (ignore-errors
-      (kill-buffer buffer))
-    nil)))
-
-(defun elpy-rpc--find-buffer (library-root python-command)
-  "Return an existing RPC buffer for this project root and command."
-  (catch 'return
-    (let ((full-python-command (executable-find python-command)))
-      (dolist (buf (buffer-list))
-        (when (and (elpy-rpc--process-buffer-p buf)
-                   (equal (buffer-local-value 'elpy-rpc--backend-library-root
-                                              buf)
-                          library-root)
-                   (equal (buffer-local-value 'elpy-rpc--backend-python-command
-                                              buf)
-                          full-python-command))
-          (throw 'return buf))))
-    nil))
-
-(defun elpy-rpc--open (library-root python-command)
-  "Start a new RPC process and return the associated buffer."
-  (when (and elpy-rpc-backend
-             (not (stringp elpy-rpc-backend)))
-    (error "`elpy-rpc-backend' should be nil or a string."))
-  (elpy-rpc--cleanup-buffers)
-  (let* ((full-python-command (executable-find python-command))
-         (name (format " *elpy-rpc [project:%s python:%s]*"
-                       library-root
-                       full-python-command))
-         (new-elpy-rpc-buffer (generate-new-buffer name))
-         (proc nil))
-    (with-current-buffer new-elpy-rpc-buffer
-      (setq elpy-rpc--buffer-p t
-            elpy-rpc--buffer (current-buffer)
-            elpy-rpc--backend-library-root library-root
-            elpy-rpc--backend-python-command full-python-command
-            default-directory "/"
-            proc (condition-case err
-                     (let ((process-connection-type nil)
-                           (process-environment (elpy-rpc--environment)))
-                       (start-process name
-                                      (current-buffer)
-                                      full-python-command
-                                      "-W" "ignore"
-                                      "-m" "elpy.__main__"))
-                   (error
-                    (elpy-config-error
-                     "Elpy can't start Python (%s: %s)"
-                     (car err) (cadr err)))))
-      (set-process-query-on-exit-flag proc nil)
-      (set-process-sentinel proc #'elpy-rpc--sentinel)
-      (set-process-filter proc #'elpy-rpc--filter)
-      (elpy-rpc-init elpy-rpc-backend library-root
-                     (lambda (result)
-                       (let ((backend (cdr (assq 'backend result))))
-                         (when (and elpy-rpc-backend
-                                    (not (equal backend elpy-rpc-backend)))
-                           (elpy-config-error
-                            "Can't set backend %s, using %s instead"
-                            elpy-rpc-backend backend))))))
-    new-elpy-rpc-buffer))
-
-(defun elpy-rpc--cleanup-buffers ()
-  "Close RPC buffers that have not been used in five minutes."
-  (when elpy-rpc-maximum-buffer-age
-    (let ((old (- (float-time)
-                  elpy-rpc-maximum-buffer-age)))
-      (dolist (buffer (buffer-list))
-        (when (and (elpy-rpc--process-buffer-p buffer)
-                   (< (or (buffer-local-value 'elpy-rpc--last-call buffer)
-                          old)
-                      old))
-          (ignore-errors
-            (kill-process (get-buffer-process buffer)))
-          (ignore-errors
-            (kill-buffer buffer)))))))
-
-(defun elpy-rpc--sentinel (process event)
-  "The sentinel for the RPC process.
-
-As process sentinels are only ever called when the process
-terminates, this will call the error handler of all registered
-RPC calls with the event."
-  (let ((buffer (process-buffer process))
-        (err (list 'process-sentinel (substring event 0 -1))))
-    (when (and buffer
-               (buffer-live-p buffer))
-      (with-current-buffer buffer
-        (when elpy-rpc--backend-callbacks
-          (maphash (lambda (call-id promise)
-                     (ignore-errors
-                       (elpy-promise-reject promise err)))
-                   elpy-rpc--backend-callbacks)
-          (setq elpy-rpc--backend-callbacks nil))))))
-
-(defun elpy-rpc--filter (process output)
-  "The filter for the RPC process."
-  (let ((buffer (process-buffer process)))
-    (when (and buffer
-               (buffer-live-p buffer))
-      (with-current-buffer buffer
-        (goto-char (point-max))
-        (insert output)
-        (while (progn
-                 (goto-char (point-min))
-                 (search-forward "\n" nil t))
-          (let ((line-end (point))
-                (json nil)
-                (did-read-json nil))
-            (goto-char (point-min))
-            (condition-case err
-                (setq json (let ((json-array-type 'list))
-                             (json-read))
-                      line-end (1+ (point))
-                      did-read-json t)
-              (error
-               (goto-char (point-min))))
-            (cond
-             (did-read-json
-              (delete-region (point-min) line-end)
-              (elpy-rpc--handle-json json))
-             ((looking-at "elpy-rpc ready\n")
-              (replace-match "")
-              (elpy-rpc--check-backend-version "1.1"))
-             ((looking-at "elpy-rpc ready (\\([^ ]*\\))\n")
-              (let ((rpc-version (match-string 1)))
-                (replace-match "")
-                (elpy-rpc--check-backend-version rpc-version)))
-             ((looking-at ".*No module named elpy\n")
-              (replace-match "")
-              (elpy-config-error "Elpy module not found"))
-             (t
-              (let ((line (buffer-substring (point-min)
-                                            line-end)))
-                (delete-region (point-min) line-end)
-                (elpy-rpc--handle-unexpected-line line))))))))))
-
-(defun elpy-rpc--check-backend-version (rpc-version)
-  "Check that we are using the right version."
-  (when (not (equal rpc-version elpy-version))
-    (elpy-insert--popup "*Elpy Version Mismatch*"
-      (elpy-insert--header "Elpy Version Mismatch")
-      (elpy-insert--para
-       "You are not using the same version of Elpy in Emacs Lisp"
-       "compared to Python. This can cause random problems. Please"
-       "do make sure to use compatible versions.\n")
-      (insert
-       "\n"
-       "Elpy Emacs Lisp version: " elpy-version "\n"
-       "Elpy Python version....: " rpc-version "\n"))))
-
-(defun elpy-rpc--handle-unexpected-line (line)
-  "Handle an unexpected line from the backend.
-
-This is usually an error or backtrace."
-  (let ((buf (get-buffer "*Elpy Output*")))
-    (when (not buf)
-      (elpy-insert--popup "*Elpy Output*"
-        (elpy-insert--header "Output from Backend")
-        (elpy-insert--para
-         "There was some unexpected output from the Elpy backend. "
-         "This is usually some module that does not use correct logging, "
-         "but might indicate a configuration problem.\n\n")
-        (elpy-insert--header "Output")
-        (setq buf (current-buffer))))
-    (with-current-buffer buf
-      (goto-char (point-max))
-      (let ((inhibit-read-only t))
-        (insert line)))))
-
-(defun elpy-rpc--handle-json (json)
-  "Handle a single JSON object from the RPC backend."
-  (let ((call-id (cdr (assq 'id json)))
-        (error-object (cdr (assq 'error json)))
-        (result (cdr (assq 'result json))))
-    (let ((promise (gethash call-id elpy-rpc--backend-callbacks)))
-      (when (not promise)
-        (error "Received a response for unknown call-id %s" call-id))
-      (remhash call-id elpy-rpc--backend-callbacks)
-      (if error-object
-          (elpy-promise-reject promise error-object)
-        (elpy-promise-resolve promise result)))))
-
-(defun elpy-rpc--default-error-callback (error-object)
-  "Display an error from the RPC backend."
-  ;; We actually might get an (error "foo") thing here.
-  (if (and (consp error-object)
-           (not (consp (car error-object))))
-      (signal (car error-object) (cdr error-object))
-    (let ((message (cdr (assq 'message error-object)))
-          (code (cdr (assq 'code error-object)))
-          (data (cdr (assq 'data error-object))))
-      (cond
-       ((not (numberp code))
-        (error "Bad response from RPC: %S" error-object))
-       ((< code 300)
-        (message "Elpy warning: %s" message))
-       ((< code 500)
-        (error "Elpy error: %s" message))
-       ((and elpy-rpc-error-timeout
-             elpy-rpc--last-error-popup
-             (<= (float-time)
-                 (+ elpy-rpc--last-error-popup
-                    elpy-rpc-error-timeout)))
-        (message "Elpy error popup ignored, see `elpy-rpc-error-timeout': %s"
-                 message))
-       (t
-        (let ((config (elpy-config--get-config)))
-          (elpy-insert--popup "*Elpy Error*"
-            (elpy-insert--header "Elpy Error")
-            (elpy-insert--para
-             "The backend encountered an unexpected error. This indicates "
-             "a bug in Elpy. Please open a bug report with the data below "
-             "in the Elpy bug tracker:")
-            (insert "\n"
-                    "\n")
-            (insert-button
-             "https://github.com/jorgenschaefer/elpy/issues/new"
-             'action (lambda (button)
-                       (browse-url (button-get button 'url)))
-             'url "https://github.com/jorgenschaefer/elpy/issues/new")
-            (insert "\n"
-                    "\n"
-                    "```\n")
-            (elpy-insert--header "Error Message")
-            (insert message "\n\n")
-            (elpy-insert--header "Configuration")
-            (elpy-config--insert-configuration-table config)
-            (let ((traceback (cdr (assq 'traceback data))))
-              (when traceback
-                (insert "\n")
-                (elpy-insert--header "Traceback")
-                (insert traceback)))
-            (let ((jedi-info (cdr (assq 'jedi_debug_info data))))
-              (when jedi-info
-                (insert "\n")
-                (elpy-insert--header "Jedi Debug Information")
-                (pcase (cdr (assq 'debug_info jedi-info))
-                  (`nil (insert "Jedi did not emit any debug info.\n"))
-                  (infos
-                   (dolist (outstr infos)
-                     (insert outstr "\n"))))
-                (insert "\n"
-                        "```\n"
-                        "\n"
-                        "Reproduction:\n"
-                        "\n")
-                (let ((method (cdr (assq 'method jedi-info)))
-                      (source (cdr (assq 'source jedi-info)))
-                      (script-args (cdr (assq 'script_args jedi-info))))
-                  (insert "```Python\n")
-                  (insert "import jedi\n"
-                          "\n"
-                          "source = '''\\\n"
-                          source
-                          "'''\n"
-                          "\n"
-                          "script = jedi.Script(" script-args ")\n"
-                          "script." method "()\n"))))
-            (let ((rope-info (cdr (assq 'rope_debug_info data))))
-              (when rope-info
-                (insert "\n")
-                (elpy-insert--header "Rope Debug Information")
-                (insert "```\n"
-                        "\n"
-                        "Reproduction:\n"
-                        "\n")
-                (let ((project-root (cdr (assq 'project_root rope-info)))
-                      (filename (cdr (assq 'filename rope-info)))
-                      (source (cdr (assq 'source rope-info)))
-                      (function-name (cdr (assq 'function_name rope-info)))
-                      (function-args (cdr (assq 'function_args rope-info))))
-                  (insert "```Python\n")
-                  (insert "\n"
-                          "source = '''\n"
-                          source
-                          "'''\n"
-                          "\n")
-                  (insert "project = rope.base.project.Project(\n"
-                          (format "    %S,\n" project-root)
-                          "    ropefolder=None\n"
-                          ")\n")
-                  (insert "resource = rope.base.libutils.path_to_resource(\n"
-                          "    project,\n"
-                          (format "    %S,\n" filename)
-                          "    'file'\n"
-                          ")\n")
-                  (insert (format "%s(\n    %s\n)\n"
-                                  function-name function-args)))))
-            (when (not (= 0 (current-column)))
-              (insert "\n"))
-            (insert "```"))
-          (setq elpy-rpc--last-error-popup (float-time))))))))
-
-(defun elpy-rpc--environment ()
-  "Return a `process-environment' for the RPC process.
-
-This includes `elpy-rpc-pythonpath' in the PYTHONPATH, if set."
-  (if (or (not elpy-rpc-pythonpath)
-          (not (file-exists-p (expand-file-name "elpy/__init__.py"
-                                                elpy-rpc-pythonpath))))
-      process-environment
-    (let* ((old-pythonpath (getenv "PYTHONPATH"))
-           (new-pythonpath (if old-pythonpath
-                               (concat elpy-rpc-pythonpath
-                                       path-separator
-                                       old-pythonpath)
-                             elpy-rpc-pythonpath)))
-      (cons (concat "PYTHONPATH=" new-pythonpath)
-            process-environment))))
-
-(defun elpy-rpc--buffer-contents ()
-  "Return the contents of the current buffer.
-
-This returns either a string, or a file object for the RPC
-protocol if the buffer is larger than
-`elpy-rpc-large-buffer-size'."
-  (if (< (buffer-size) elpy-rpc-large-buffer-size)
-      (buffer-string)
-    (let ((file-name (make-temp-file "elpy-rpc-"))
-          (coding-system-for-write 'utf-8))
-      (write-region nil nil file-name nil :nomessage)
-      `((filename . ,file-name)
-        (delete_after_use . t)))))
-
-;; RPC API functions
-
-(defun elpy-rpc-restart ()
-  "Restart all RPC processes."
-  (interactive)
-  (dolist (buffer (buffer-list))
-    (when (elpy-rpc--process-buffer-p buffer)
-      (ignore-errors
-        (kill-process (get-buffer-process buffer)))
-      (ignore-errors
-        (kill-buffer buffer)))))
-
-(defun elpy-rpc-init (backend library-root &optional success error)
-  "Initialize the backend.
-
-This has to be called as the first method, else Elpy won't be
-able to respond to other calls."
-  (elpy-rpc "init"
-            ;; This uses a vector because otherwise, json-encode in
-            ;; older Emacsen gets seriously confused, especially when
-            ;; backend is nil.
-            (vector `((backend . ,backend)
-                      (project_root . ,(expand-file-name library-root))))
-            success error))
-
-(defun elpy-rpc-get-calltip (&optional success error)
-  "Call the get_calltip API function.
-
-Returns a calltip string for the function call at point."
-  (when (< (buffer-size) elpy-rpc-ignored-buffer-size)
-    (elpy-rpc "get_calltip"
-              (list buffer-file-name
-                    (elpy-rpc--buffer-contents)
-                    (- (point)
-                       (point-min)))
-              success error)))
-
-(defun elpy-rpc-get-completions (&optional success error)
-  "Call the get_completions API function.
-
-Returns a list of possible completions for the Python symbol at
-point."
-  (when (< (buffer-size) elpy-rpc-ignored-buffer-size)
-    (elpy-rpc "get_completions"
-              (list buffer-file-name
-                    (elpy-rpc--buffer-contents)
-                    (- (point)
-                       (point-min)))
-              success error)))
-
-(defun elpy-rpc-get-completion-docstring (completion &optional success error)
-  "Call the get_completion_docstring API function.
-
-Returns a doc string or nil"
-  (elpy-rpc "get_completion_docstring" (list completion) success error))
-
-(defun elpy-rpc-get-completion-location (completion &optional success error)
-  "Call the get_completion_location API function.
-
-Returns a list of file name and line number, or nil"
-  (elpy-rpc "get_completion_location" (list completion) success error))
-
-(defun elpy-rpc-get-definition (&optional success error)
-  "Call the find_definition API function.
-
-Returns nil or a list of (filename, point)."
-  (elpy-rpc "get_definition"
-            (list buffer-file-name
-                  (elpy-rpc--buffer-contents)
-                  (- (point)
-                     (point-min)))
-            success error))
-
-(defun elpy-rpc-get-docstring (&optional success error)
-  "Call the get_docstring API function.
-
-Returns a possible multi-line docstring for the symbol at point."
-  (elpy-rpc "get_docstring"
-            (list buffer-file-name
-                  (elpy-rpc--buffer-contents)
-                  (- (point)
-                     (point-min)))
-            success error))
-
-(defun elpy-rpc-get-pydoc-completions (prefix &optional success error)
-  "Return a list of modules available in pydoc starting with PREFIX."
-  (elpy-rpc "get_pydoc_completions" (list prefix)
-            success error))
-
-(defun elpy-rpc-get-pydoc-documentation (symbol &optional success error)
-  "Get the Pydoc documentation for SYMBOL.
-
-Returns a possible multi-line docstring."
-    (elpy-rpc "get_pydoc_documentation" (list symbol)
-              success error))
-
-(defun elpy-rpc-get-usages (&optional success error)
-  (elpy-rpc "get_usages"
-            (list buffer-file-name
-                  (elpy-rpc--buffer-contents)
-                  (- (point)
-                     (point-min)))
-            success error))
-
-;;;;;;;;;;;
-;;; Modules
-
-(defvar elpy-modules-initialized-p nil
-  "Boolean, set to true if modules were run with `global-init'.")
-
-(defun elpy-modules-run (command &rest args)
-  "Run COMMAND with ARGS for all modules in `elpy-modules'."
-  (dolist (module elpy-modules)
-    (apply module command args)))
-
-(defun elpy-modules-global-init ()
-  "Run the global-init method of Elpy modules.
-
-Make sure this only happens once."
-  (when (not elpy-modules-initialized-p)
-    (elpy-modules-run 'global-init)
-    (setq elpy-modules-initialized-p t)))
-
-(defun elpy-modules-global-stop ()
-  "Run the global-stop method of Elpy modules.
-
-Make sure this only happens once per global-init call."
-  (when elpy-modules-initialized-p
-    (elpy-modules-run 'global-stop)
-    (setq elpy-modules-initialized-p nil)))
-
-(defun elpy-modules-buffer-init ()
-  "Run the buffer-init method of Elpy modules.
-
-Make sure global-init is called first."
-  (elpy-modules-global-init)
-  (elpy-modules-run 'buffer-init))
-
-(defun elpy-modules-buffer-stop ()
-  "Run the buffer-stop method of Elpy modules."
-  (elpy-modules-run 'buffer-stop))
-
-(defun elpy-modules-remove-modeline-lighter (mode-name)
-  "Remove the lighter for MODE-NAME.
-
-It's not necessary to see (Python Elpy yas company ElDoc) all the
-time. Honestly."
-  (interactive)
-  (cond
-   ((eq mode-name 'eldoc-minor-mode)
-    (setq eldoc-minor-mode-string nil))
-   (t
-    (let ((cell (assq mode-name minor-mode-alist)))
-      (when cell
-        (setcdr cell
-                (list "")))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Module: Sane Defaults
-
-(defun elpy-module-sane-defaults (command &rest args)
-  (pcase command
-    (`buffer-init
-     ;; Set `forward-sexp-function' to nil in python-mode. See
-     ;; http://debbugs.gnu.org/db/13/13642.html
-     (set (make-local-variable 'forward-sexp-function) nil)
-     ;; PEP8 recommends two spaces in front of inline comments.
-     (set (make-local-variable 'comment-inline-offset) 2))
-    (`buffer-stop
-     (kill-local-variable 'forward-sexp-function)
-     (kill-local-variable 'comment-inline-offset))))
-
-;;;;;;;;;;;;;;;;;;;
-;;; Module: Company
-
-(defun elpy-module-company (command &rest args)
-  "Module to support company-mode completions."
-  (pcase command
-    (`global-init
-     (require 'company)
-     (elpy-modules-remove-modeline-lighter 'company-mode)
-     (define-key company-active-map (kbd "C-d")
-       'company-show-doc-buffer))
-    (`buffer-init
-     ;; We want immediate completions from company.
-     (set (make-local-variable 'company-idle-delay)
-          0)
-     ;; And annotations should be right-aligned.
-     (set (make-local-variable 'company-tooltip-align-annotations)
-          t)
-     ;; Also, dabbrev in comments and strings is nice.
-     (set (make-local-variable 'company-dabbrev-code-everywhere)
-          t)
-     ;; Add our own backend and remove a bunch of backends that
-     ;; interfere in Python mode.
-     (set (make-local-variable 'company-backends)
-          (cons 'elpy-company-backend
-                (delq 'company-semantic
-                      (delq 'company-ropemacs
-                            (delq 'company-capf
-                                  (mapcar #'identity company-backends))))))
-     (company-mode 1))
-    (`buffer-stop
-     (company-mode -1)
-     (kill-local-variable 'company-idle-delay)
-     (kill-local-variable 'company-tooltip-align-annotations)
-     (kill-local-variable 'company-backends))
-    ))
-
-(defvar elpy-company--cache nil
-  "Buffer-local cache for candidate information.")
-(make-variable-buffer-local 'elpy-company--cache)
-
-(defun elpy-company--cache-clear ()
-  "Clear and initialize the cache."
-  (if elpy-company--cache
-      (clrhash elpy-company--cache)
-    (setq elpy-company--cache
-          (make-hash-table :test #'equal))))
-
-(defun elpy-company--cache-annotation (name)
-  "Return the cached annotation for NAME."
-  (when elpy-company--cache
-    (cdr (assq 'annotation (gethash name elpy-company--cache)))))
-
-(defun elpy-company--cache-meta (name)
-  "Return the cached annotation for NAME."
-  (when elpy-company--cache
-    (cdr (assq 'meta (gethash name elpy-company--cache)))))
-
-(defun elpy-company--cache-name (name)
-  "Return the cached name for NAME.
-
-Confused yet? We pass \"our\" name, that is, prefix + suffix,
-here, and return the \"name\" as used by the backend."
-  (when elpy-company--cache
-    (cdr (assq 'name (gethash name elpy-company--cache)))))
-
-(defun elpy-company--cache-completions (prefix result)
-  "Store RESULT in the candidate cache and return candidates."
-  (elpy-company--cache-clear)
-  (mapcar (lambda (completion)
-            (let* ((suffix (cdr (assq 'suffix completion)))
-                   (name (concat prefix suffix)))
-              (puthash name completion elpy-company--cache)
-              name))
-          result))
-
-(defun elpy-company-backend (command &optional arg &rest ignored)
-  "A company-mode backend for Elpy."
-  (interactive (list 'interactive))
-  (pcase command
-    (`interactive
-     (company-begin-backend 'elpy-company-backend))
-    ;; init => Called once per buffer
-    ;; prefix => return the prefix at point
-    (`prefix
-     (when (and elpy-mode
-                (not (company-in-string-or-comment)))
-       (company-grab-symbol-cons "\\." 1)))
-    ;; candidates <prefix> => return candidates for this prefix
-    (`candidates
-     (cons :async
-           (lambda (callback)
-             (elpy-rpc-get-completions
-              (lambda (result)
-                (elpy-company--cache-clear)
-                (funcall
-                 callback
-                 (cond
-                  ;; The backend returned something
-                  (result
-                   (elpy-company--cache-completions arg result))
-                  ;; Nothing from the backend, try dabbrev-code.
-                  ((> (length arg) company-minimum-prefix-length)
-                   (elpy--sort-and-strip-duplicates
-                    (company-dabbrev-code 'candidates arg)))
-                  ;; Well, ok, let's go meh.
-                  (t
-                   nil))))))))
-    ;; sorted => t if the list is already sorted
-    (`sorted
-     t)
-    ;; duplicates => t if there could be duplicates
-    (`duplicates
-     nil)
-    ;; no-cache <prefix> => t if company shouldn't cache results
-    ;; meta <candidate> => short docstring for minibuffer
-    (`meta
-     (let ((meta (elpy-company--cache-meta arg)))
-       (when (and meta
-                  (string-match "\\`\\(.*\n.*\\)\n.*" meta))
-         (setq meta (match-string 1 meta)))
-       meta))
-    ;; annotation <candidate> => short docstring for completion buffer
-    (`annotation
-     (elpy-company--cache-annotation arg))
-    ;; doc-buffer <candidate> => put doc buffer in `company-doc-buffer'
-    (`doc-buffer
-     (let* ((name (elpy-company--cache-name arg))
-            (doc (elpy-rpc-get-completion-docstring name)))
-       (when doc
-         (company-doc-buffer doc))))
-    ;; require-match => Never require a match, even if the user
-    ;; started to interact with company. See `company-require-match'.
-    (`require-match
-     'never)
-    ;; location <candidate> => (buffer . point) or (file .
-    ;; line-number)
-    (`location
-     (let* ((name (elpy-company--cache-name arg))
-            (loc (elpy-rpc-get-completion-location name)))
-       (when loc
-         (cons (car loc)
-               (cadr loc)))))
-    ;; match <candidate> => for non-prefix based backends
-    ;; post-completion <candidate> => after insertion, for snippets
-    ))
-
-(defun elpy--sort-and-strip-duplicates (seq)
-  "Sort SEQ and remove any duplicates."
-  (sort (delete-dups seq)
-        (lambda (a b)
-          (string< a b))))
-
-;;;;;;;;;;;;;;;;;
-;;; Module: ElDoc
-
-(defun elpy-module-eldoc (command &rest args)
-  "Module to support ElDoc for Python files."
-  (pcase command
-    (`global-init
-     (require 'eldoc)
-     (setq eldoc-minor-mode-string nil))
-    (`buffer-init
-     (set (make-local-variable 'eldoc-documentation-function)
-          'elpy-eldoc-documentation)
-     (eldoc-mode 1))
-    (`buffer-stop
-     (eldoc-mode -1)
-     (kill-local-variable 'eldoc-documentation-function))))
-
-(defun elpy-eldoc-documentation ()
-  "Return some interesting information for the code at point.
-
-This will return flymake errors for the line at point if there
-are any. If not, this will do an asynchronous call to the RPC
-backend to get a call tip, and display that using
-`eldoc-message'. If the backend has no call tip, this will
-display the current class and method instead."
-  (let ((flymake-error (elpy-flymake-error-at-point)))
-    (if flymake-error
-        flymake-error
-      (elpy-rpc-get-calltip
-       (lambda (calltip)
-         (eldoc-message
-          (cond
-           ((not calltip)
-            (when elpy-eldoc-show-current-function
-              (let ((current-defun (python-info-current-defun)))
-                (when current-defun
-                  (format "In: %s()" current-defun)))))
-           ((stringp calltip)
-            calltip)
-           (t
-            (let ((name (cdr (assq 'name calltip)))
-                  (index (cdr (assq 'index calltip)))
-                  (params (cdr (assq 'params calltip))))
-              (when index
-                (setf (nth index params)
-                      (propertize (nth index params)
-                                  'face
-                                  'eldoc-highlight-function-argument)))
-              (format "%s(%s)"
-                      name
-                      (mapconcat #'identity params ", "))
-              ))))))
-      ;; Return the last message until we're done
-      eldoc-last-message)))
-
-;;;;;;;;;;;;;;;;;;;
-;;; Module: Flymake
-
-(defun elpy-module-flymake (command &rest args)
-  "Enable Flymake support for Python."
-  (pcase command
-    (`global-init
-     (require 'flymake)
-     (elpy-modules-remove-modeline-lighter 'flymake-mode)
-     ;; Flymake support using flake8, including warning faces.
-     (when (and (executable-find "flake8")
-                (equal python-check-command
-                       (elpy-flymake--standard-value 'python-check-command)))
-       (setq python-check-command "flake8"))
-
-     ;; Add our initializer function
-     (add-to-list 'flymake-allowed-file-name-masks
-                  '("\\.py\\'" elpy-flymake-python-init)))
-    (`buffer-init
-     ;; `flymake-no-changes-timeout': The original value of 0.5 is too
-     ;; short for Python code, as that will result in the current line
-     ;; to be highlighted most of the time, and that's annoying. This
-     ;; value might be on the long side, but at least it does not, in
-     ;; general, interfere with normal interaction.
-     (set (make-local-variable 'flymake-no-changes-timeout)
-          60)
-
-     ;; `flymake-start-syntax-check-on-newline': This should be nil for
-     ;; Python, as;; most lines with a colon at the end will mean the
-     ;; next line is always highlighted as error, which is not helpful
-     ;; and mostly annoying.
-     (set (make-local-variable 'flymake-start-syntax-check-on-newline)
-          nil)
-
-     ;; Enable warning faces for flake8 output.
-     ;; COMPAT: Obsolete variable as of 24.4
-     (if (boundp 'flymake-warning-predicate)
-         (set (make-local-variable 'flymake-warning-predicate) "^W[0-9]")
-       (set (make-local-variable 'flymake-warning-re) "^W[0-9]"))
-
-     (flymake-mode 1))
-    (`buffer-stop
-     (flymake-mode -1)
-     (kill-local-variable 'flymake-no-changes-timeout)
-     (kill-local-variable 'flymake-start-syntax-check-on-newline)
-     ;; COMPAT: Obsolete variable as of 24.4
-     (if (boundp 'flymake-warning-predicate)
-         (kill-local-variable 'flymake-warning-predicate)
-       (kill-local-variable 'flymake-warning-re)))))
-
-(defun elpy-flymake-python-init ()
-  ;; Make sure it's not a remote buffer as flymake would not work
-  (when (not (file-remote-p buffer-file-name))
-    (let* ((temp-file (flymake-init-create-temp-buffer-copy
-                       'flymake-create-temp-inplace)))
-      (list python-check-command
-            (list temp-file)
-            ;; Run flake8 from / to avoid import problems (#169)
-            "/"))))
-
-(defun elpy-flymake-next-error ()
-  "Move forward to the next Flymake error and show a
-description."
-  (interactive)
-  (flymake-goto-next-error)
-  (elpy-flymake-show-error))
-
-(defun elpy-flymake-previous-error ()
-  "Move backward to the previous Flymake error and show a
-description."
-  (interactive)
-  (flymake-goto-prev-error)
-  (elpy-flymake-show-error))
-
-(defun elpy-flymake-show-error ()
-  "Show the flymake error message at point."
-  (interactive)
-  (let ((error-message (elpy-flymake-error-at-point)))
-    (when error-message
-      (message "%s" error-message))))
-
-(defun elpy-flymake-error-at-point ()
-  "Return the flymake error at point, or nil if there is none."
-  (when (boundp 'flymake-err-info)
-    (let* ((lineno (line-number-at-pos))
-           (err-info (car (flymake-find-err-info flymake-err-info
-                                                 lineno))))
-      (when err-info
-        (mapconcat #'flymake-ler-text
-                   err-info
-                   ", ")))))
-
-(defun elpy-flymake--standard-value (var)
-  "Return the standard value of the given variable."
-  (let ((sv (get var 'standard-value)))
-    (when (consp sv)
-      (ignore-errors
-        (eval (car sv))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Module: Highlight Indentation
-
-(defun elpy-module-highlight-indentation (command &rest args)
-  "Module to highlight indentation in Python files."
-  (pcase command
-    (`global-init
-     (require 'highlight-indentation))
-    (`buffer-init
-     (highlight-indentation-mode 1))
-    (`buffer-stop
-     (highlight-indentation-mode -1))))
-
-;;;;;;;;;;;;;;;;;;
-;;; Module: pyvenv
-
-(defun elpy-module-pyvenv (command &rest args)
-  "Module to display the current virtualenv in the mode line."
-  (pcase command
-    (`global-init
-     (pyvenv-mode 1))
-    (`global-stop
-     (pyvenv-mode -1))))
-
-;;;;;;;;;;;;;;;;;;;;;
-;;; Module: Yasnippet
-
-(defun elpy-module-yasnippet (command &rest args)
-  "Module to enable YASnippet snippets."
-  (pcase command
-    (`global-init
-     (require 'yasnippet)
-     (elpy-modules-remove-modeline-lighter 'yas-minor-mode)
-
-     ;; We provide some YASnippet snippets. Add them.
-
-     ;; yas-snippet-dirs can be a string for a single directory. Make
-     ;; sure it's a list in that case so we can add our own entry.
-     (when (not (listp yas-snippet-dirs))
-       (setq yas-snippet-dirs (list yas-snippet-dirs)))
-     (add-to-list 'yas-snippet-dirs
-                  (concat (file-name-directory (locate-library "elpy"))
-                          "snippets/")
-                  t)
-
-     ;; Now load yasnippets.
-     (yas-reload-all))
-    (`global-stop
-     (setq yas-snippet-dirs
-           (delete (concat (file-name-directory (locate-library "elpy"))
-                           "snippets/")
-                   yas-snippet-dirs)))
-    (`buffer-init
-     (yas-minor-mode 1))
-    (`buffer-stop
-     (yas-minor-mode -1))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Backwards compatibility
-
-;; Functions for Emacs 24 before 24.3
-(when (not (fboundp 'python-info-current-defun))
-  (defalias 'python-info-current-defun 'python-current-defun))
-
-(when (not (fboundp 'python-nav-forward-statement))
-  (defun python-nav-forward-statement (&rest ignored)
-    "Function added in Emacs 24.3"
-    (error "Enhanced Python navigation only available in Emacs 24.3+")))
-
-(when (not (fboundp 'python-nav-backward-up-list))
-  (defun python-nav-backward-up-list ()
-    "Compatibility function for older Emacsen"
-    (ignore-errors
-      (backward-up-list))))
-
-(when (not (fboundp 'python-shell-calculate-exec-path))
-  (defun python-shell-calculate-exec-path ()
-    "Compatibility function for older Emacsen."
-    exec-path))
-
-(when (not (fboundp 'python-shell-calculate-process-environment))
-  (defun python-shell-calculate-process-environment ()
-    "Compatibility function for older Emacsen."
-    process-environment))
-
-(when (not (fboundp 'python-shell-get-process-name))
-  (defun python-shell-get-process-name (dedicated)
-    "Compatibility function for older Emacsen."
-    "Python"))
-
-(when (not (fboundp 'python-shell-parse-command))
-  (defun python-shell-parse-command ()
-    "Compatibility function for older Emacsen."
-    python-python-command))
-
-(when (not (fboundp 'python-shell-send-buffer))
-  (defun python-shell-send-buffer (&optional arg)
-    (python-send-buffer)))
-
-(when (not (fboundp 'python-shell-send-string))
-  (defalias 'python-shell-send-string 'python-send-string))
-
-;; Emacs 24.2 made `locate-dominating-file' accept a predicate instead
-;; of a string. Simply overwrite the current one, it's
-;; backwards-compatible. The code below is taken from Emacs 24.3.
-(when (or (< emacs-major-version 24)
-          (and (= emacs-major-version 24)
-               (<= emacs-minor-version 2)))
-  (defun locate-dominating-file (file name)
-    "Look up the directory hierarchy from FILE for a directory containing NAME.
-Stop at the first parent directory containing a file NAME,
-and return the directory.  Return nil if not found.
-Instead of a string, NAME can also be a predicate taking one argument
-\(a directory) and returning a non-nil value if that directory is the one for
-which we're looking."
-    ;; We used to use the above locate-dominating-files code, but the
-    ;; directory-files call is very costly, so we're much better off doing
-    ;; multiple calls using the code in here.
-    ;;
-    ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
-    ;; `name' in /home or in /.
-    (setq file (abbreviate-file-name file))
-    (let ((root nil)
-          ;; `user' is not initialized outside the loop because
-          ;; `file' may not exist, so we may have to walk up part of the
-          ;; hierarchy before we find the "initial UID".  Note: currently unused
-          ;; (user nil)
-          try)
-      (while (not (or root
-                      (null file)
-                      ;; FIXME: Disabled this heuristic because it is sometimes
-                      ;; inappropriate.
-                      ;; As a heuristic, we stop looking up the hierarchy of
-                      ;; directories as soon as we find a directory belonging
-                      ;; to another user.  This should save us from looking in
-                      ;; things like /net and /afs.  This assumes that all the
-                      ;; files inside a project belong to the same user.
-                      ;; (let ((prev-user user))
-                      ;;   (setq user (nth 2 (file-attributes file)))
-                      ;;   (and prev-user (not (equal user prev-user))))
-                      (string-match locate-dominating-stop-dir-regexp file)))
-        (setq try (if (stringp name)
-                      (file-exists-p (expand-file-name name file))
-                    (funcall name file)))
-        (cond (try (setq root file))
-              ((equal file (setq file (file-name-directory
-                                       (directory-file-name file))))
-               (setq file nil))))
-      (if root (file-name-as-directory root))))
-  )
-
-;; highlight-indentation 0.5 does not use modes yet
-(when (not (fboundp 'highlight-indentation-mode))
-  (defun highlight-indentation-mode (on-or-off)
-    (cond
-     ((and (> on-or-off 0)
-           (not highlight-indent-active))
-      (highlight-indentation))
-     ((and (<= on-or-off 0)
-           highlight-indent-active)
-      (highlight-indentation)))))
-
-(provide 'elpy)
-;;; elpy.el ends here
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/__init__.py b/emacs.d/elpa/elpy-20150502.740/elpy/__init__.py
deleted file mode 100644
index 1204963..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/__init__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Elpy, the Emacs Lisp Python Environment
-
-# Copyright (C) 2013 Jorgen Schaefer
-
-# Author: Jorgen Schaefer <contact@jorgenschaefer.de>
-# URL: http://github.com/jorgenschaefer/elpy
-
-# 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/>.
-
-"""The Emacs Lisp Python Environment.
-
-Elpy is a mode for Emacs to support writing Python code. This package
-provides the backend within Python to support auto-completion,
-documentation extraction, and navigation.
-
-Emacs will start the protocol by running the module itself, like so:
-
-  python -m elpy
-
-This will emit a greeting string on a single line, and then wait for
-the protocol to start. Details of the protocol can be found in
-elpy.rpc.
-
-This package is unlikely to be useful on its own.
-
-"""
-
-__author__ = "Jorgen Schaefer"
-__version__ = "1.8.0"
-__license__ = "GPL"
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/impmagic.py b/emacs.d/elpa/elpy-20150502.740/elpy/impmagic.py
deleted file mode 100644
index 436552b..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/impmagic.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""Glue for the "importmagic" library.
-
-"""
-
-import os
-import sys
-import threading
-
-
-try:
-    import importmagic.index
-    import importmagic.symbols
-    import importmagic.importer
-except ImportError:  # pragma: no cover
-    importmagic = None
-
-
-class ImportMagic(object):
-
-    def __init__(self):
-        self.is_enabled = bool(importmagic)
-        # fail_message is reported to the user when symbol_index
-        # is (still) None
-        self.fail_message = "symbol index is not yet ready"
-        self.project_root = None
-        self.symbol_index = None
-        self.favorites = set()
-        self._thread = None
-
-    def _build_symbol_index(self, project_root, custom_path, blacklist_re):
-        try:
-            index = importmagic.index.SymbolIndex(blacklist_re=blacklist_re)
-            if os.environ.get('ELPY_TEST'):
-                # test suite support: do not index the whole PYTHONPATH, it
-                # takes much too long
-                index.build_index([])
-            elif custom_path:
-                index.build_index(custom_path)
-            else:
-                index.build_index([project_root] + sys.path)
-        except Exception as e:
-            self.fail_message = "symbol index failed to build: %s" % e
-        else:
-            self.symbol_index = index
-
-    def build_index(self, project_root, custom_path=None, blacklist_re=None):
-        self.project_root = None
-        self._thread = threading.Thread(target=self._build_symbol_index,
-                                        args=(project_root, custom_path,
-                                              blacklist_re))
-        self._thread.setDaemon(True)
-        self._thread.start()
-
-    def get_import_symbols(self, symbol):
-        scores = self.symbol_index.symbol_scores(symbol)
-
-        def sort_key(item):
-            score, mod, var = item
-            if mod in self.favorites:
-                return 2 + score, mod, var
-            return score, mod, var
-
-        scores.sort(key=sort_key, reverse=True)
-        return ["from %s import %s" % (mod, var) if var else "import %s" % mod
-                for (_, mod, var) in scores]
-
-    def add_import(self, source, statement):
-        imports = importmagic.importer.Imports(self.symbol_index, source)
-        if statement.startswith('import '):
-            modname = statement[7:]
-            imports.add_import(modname)
-            self.favorites.add(modname)
-        else:
-            sep = statement.find(' import ')
-            modname = statement[5:sep]
-            if sep > -1:
-                self.favorites.add(modname)
-                imports.add_import_from(statement[5:sep], statement[sep+8:])
-        start_line, end_line, import_block = imports.get_update()
-        return start_line, end_line, import_block
-
-    def get_unresolved_symbols(self, source):
-        scope = importmagic.symbols.Scope.from_source(source)
-        unres, unref = scope.find_unresolved_and_unreferenced_symbols()
-        return list(unres)
-
-    def remove_unreferenced_imports(self, source):
-        scope = importmagic.symbols.Scope.from_source(source)
-        unres, unref = scope.find_unresolved_and_unreferenced_symbols()
-        # Note: we do not supply "unres" to the call below, since we do
-        # not want to add imports without querying the user from which
-        # module symbols should be imported.
-        start_line, end_line, import_block = importmagic.importer.get_update(
-            source, self.symbol_index, set(), unref)
-        return start_line, end_line, import_block
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/jedibackend.py b/emacs.d/elpa/elpy-20150502.740/elpy/jedibackend.py
deleted file mode 100644
index e51f250..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/jedibackend.py
+++ /dev/null
@@ -1,323 +0,0 @@
-"""Elpy backend using the Jedi library.
-
-This backend uses the Jedi library:
-
-https://github.com/davidhalter/jedi
-
-"""
-
-import sys
-import traceback
-
-import jedi
-
-from elpy import rpc
-
-
-class JediBackend(object):
-    """The Jedi backend class.
-
-    Implements the RPC calls we can pass on to Jedi.
-
-    Documentation: http://jedi.jedidjah.ch/en/latest/docs/plugin-api.html
-
-    """
-    name = "jedi"
-
-    def __init__(self, project_root):
-        self.project_root = project_root
-        self.completions = {}
-        sys.path.append(project_root)
-
-    def rpc_get_completions(self, filename, source, offset):
-        line, column = pos_to_linecol(source, offset)
-        proposals = run_with_debug(jedi, 'completions',
-                                   source=source, line=line, column=column,
-                                   path=filename, encoding='utf-8')
-        if proposals is None:
-            return []
-        self.completions = dict((proposal.name, proposal)
-                                for proposal in proposals)
-        return [{'name': proposal.name,
-                 'suffix': proposal.complete,
-                 'annotation': proposal.type,
-                 'meta': proposal.description}
-                for proposal in proposals]
-
-    def rpc_get_completion_docstring(self, completion):
-        proposal = self.completions.get(completion)
-        if proposal is None:
-            return None
-        else:
-            return proposal.docstring(fast=False)
-
-    def rpc_get_completion_location(self, completion):
-        proposal = self.completions.get(completion)
-        if proposal is None:
-            return None
-        else:
-            return (proposal.module_path, proposal.line)
-
-    def rpc_get_docstring(self, filename, source, offset):
-        line, column = pos_to_linecol(source, offset)
-        try:
-            locations = run_with_debug(jedi, 'goto_definitions',
-                                       source=source, line=line, column=column,
-                                       path=filename, encoding='utf-8',
-                                       re_raise=jedi.NotFoundError)
-        except jedi.NotFoundError:
-            return None
-        if locations:
-            return ('Documentation for {0}:\n\n'.format(
-                locations[-1].full_name) + locations[-1].docstring())
-        else:
-            return None
-
-    def rpc_get_definition(self, filename, source, offset):
-        line, column = pos_to_linecol(source, offset)
-        try:
-            locations = run_with_debug(jedi, 'goto_definitions',
-                                       source=source, line=line, column=column,
-                                       path=filename, encoding='utf-8',
-                                       re_raise=jedi.NotFoundError)
-        except jedi.NotFoundError:
-            return None
-        # goto_definitions() can return silly stuff like __builtin__
-        # for int variables, so we fall back on goto() in those
-        # cases. See issue #76.
-        if (
-                locations and
-                locations[0].module_path is None
-        ):
-            locations = run_with_debug(jedi, 'goto_assignments',
-                                       source=source, line=line,
-                                       column=column,
-                                       path=filename, encoding='utf-8')
-        if not locations:
-            return None
-        else:
-            loc = locations[-1]
-            try:
-                if loc.module_path:
-                    if loc.module_path == filename:
-                        offset = linecol_to_pos(source,
-                                                loc.line,
-                                                loc.column)
-                    else:
-                        with open(loc.module_path) as f:
-                            offset = linecol_to_pos(f.read(),
-                                                    loc.line,
-                                                    loc.column)
-                else:
-                    return None
-            except IOError:
-                return None
-            return (loc.module_path, offset)
-
-    def rpc_get_calltip(self, filename, source, offset):
-        line, column = pos_to_linecol(source, offset)
-        calls = run_with_debug(jedi, 'call_signatures',
-                               source=source, line=line, column=column,
-                               path=filename, encoding='utf-8')
-        if calls:
-            call = calls[0]
-        else:
-            call = None
-        if not call:
-            return None
-        return {"name": call.name,
-                "index": call.index,
-                "params": [param.description for param in call.params]}
-
-    def rpc_get_usages(self, filename, source, offset):
-        """Return the uses of the symbol at offset.
-
-        Returns a list of occurrences of the symbol, as dicts with the
-        fields name, filename, and offset.
-
-        """
-        line, column = pos_to_linecol(source, offset)
-        try:
-            uses = run_with_debug(jedi, 'usages',
-                                  source=source, line=line, column=column,
-                                  path=filename, encoding='utf-8',
-                                  re_raise=(jedi.NotFoundError,))
-        except jedi.NotFoundError:
-            return []
-
-        if uses is None:
-            return None
-        result = []
-        for use in uses:
-            if use.module_path == filename:
-                offset = linecol_to_pos(source, use.line, use.column)
-            elif use.module_path is not None:
-                with open(use.module_path) as f:
-                    text = f.read()
-                offset = linecol_to_pos(text, use.line, use.column)
-
-            result.append({"name": use.name,
-                           "filename": use.module_path,
-                           "offset": offset})
-
-        return result
-
-
-# From the Jedi documentation:
-#
-#   line is the current line you want to perform actions on (starting
-#   with line #1 as the first line). column represents the current
-#   column/indent of the cursor (starting with zero). source_path
-#   should be the path of your file in the file system.
-
-def pos_to_linecol(text, pos):
-    """Return a tuple of line and column for offset pos in text.
-
-    Lines are one-based, columns zero-based.
-
-    This is how Jedi wants it. Don't ask me why.
-
-    """
-    line_start = text.rfind("\n", 0, pos) + 1
-    line = text.count("\n", 0, line_start) + 1
-    col = pos - line_start
-    return line, col
-
-
-def linecol_to_pos(text, line, col):
-    """Return the offset of this line and column in text.
-
-    Lines are one-based, columns zero-based.
-
-    This is how Jedi wants it. Don't ask me why.
-
-    """
-    nth_newline_offset = 0
-    for i in range(line - 1):
-        new_offset = text.find("\n", nth_newline_offset)
-        if new_offset < 0:
-            raise ValueError("Text does not have {0} lines."
-                             .format(line))
-        nth_newline_offset = new_offset + 1
-    offset = nth_newline_offset + col
-    if offset > len(text):
-        raise ValueError("Line {0} column {1} is not within the text"
-                         .format(line, col))
-    return offset
-
-
-def run_with_debug(jedi, name, *args, **kwargs):
-    re_raise = kwargs.pop('re_raise', ())
-    # Remove form feed characters, they confuse Jedi (jedi#424)
-    if 'source' in kwargs:
-        kwargs['source'] = kwargs['source'].replace("\f", " ")
-    try:
-        script = jedi.Script(*args, **kwargs)
-        return getattr(script, name)()
-    except Exception as e:
-        if isinstance(e, re_raise):
-            raise
-        # Bug jedi#417
-        if isinstance(e, TypeError) and str(e) == 'no dicts allowed':
-            return None
-        # Bug jedi#427
-        if isinstance(e, UnicodeDecodeError):
-            return None
-        # Bug jedi#429
-        if isinstance(e, IndexError):
-            return None
-        # Bug jedi#431
-        if isinstance(e, AttributeError) and str(e).endswith("'end_pos'"):
-            return None
-        # Bug in Python 2.6, see #275
-        if isinstance(e, OSError) and e.errno == 13:
-            return None
-        # Bug jedi#466
-        if (
-                isinstance(e, SyntaxError) and
-                "EOL while scanning string literal" in str(e)
-        ):
-            return None
-        # Bug jedi#482
-        if isinstance(e, UnicodeEncodeError):
-            return None
-        # Bug jedi#485
-        if (
-                isinstance(e, ValueError) and
-                "invalid \\x escape" in str(e)
-        ):
-            return None
-        # Bug jedi#485 in Python 3
-        if (
-                isinstance(e, SyntaxError) and
-                "truncated \\xXX escape" in str(e)
-        ):
-            return None
-        # Bug jedi#465
-        if (
-                isinstance(e, SyntaxError) and
-                "encoding declaration in Unicode string" in str(e)
-        ):
-            return None
-        # Bug #337 / jedi#471
-        if (
-                isinstance(e, ImportError) and
-                "No module named" in str(e)
-        ):
-            return None
-        # Bug #365 / jedi#486 - fixed in Jedi 0.8.2
-        if (
-                isinstance(e, UnboundLocalError) and
-                "local variable 'path' referenced before assignment" in str(e)
-        ):
-            return None
-        # Bug #366 / jedi#491
-        if (
-                isinstance(e, ValueError) and
-                "__loader__ is None" in str(e)
-        ):
-            return None
-        # Bug #353
-        if (
-                isinstance(e, OSError) and
-                "No such file or directory" in str(e)
-        ):
-            return None
-
-        from jedi import debug
-
-        debug_info = []
-
-        def _debug(level, str_out):
-            if level == debug.NOTICE:
-                prefix = "[N]"
-            elif level == debug.WARNING:
-                prefix = "[W]"
-            else:
-                prefix = "[?]"
-            debug_info.append(u"{0} {1}".format(prefix, str_out))
-
-        jedi.set_debug_function(_debug, speed=False)
-        try:
-            script = jedi.Script(*args, **kwargs)
-            return getattr(script, name)()
-        except Exception as e:
-            source = kwargs.get('source')
-            sc_args = []
-            sc_args.extend(repr(arg) for arg in args)
-            sc_args.extend("{0}={1}".format(k, "source" if k == "source"
-                                            else repr(v))
-                           for (k, v) in kwargs.items())
-
-            data = {
-                "traceback": traceback.format_exc(),
-                "jedi_debug_info": {'script_args': ", ".join(sc_args),
-                                    'source': source,
-                                    'method': name,
-                                    'debug_info': debug_info}
-            }
-            raise rpc.Fault(message=str(e),
-                            code=500,
-                            data=data)
-        finally:
-            jedi.set_debug_function(None)
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/refactor.py b/emacs.d/elpa/elpy-20150502.740/elpy/refactor.py
deleted file mode 100644
index 4044631..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/refactor.py
+++ /dev/null
@@ -1,366 +0,0 @@
-"""Refactoring methods for elpy.
-
-This interfaces directly with rope, regardless of the backend used,
-because the other backends don't really offer refactoring choices.
-Once Jedi is similarly featureful as Rope we can try and offer both.
-
-
-# Too complex:
-
-- Restructure: Interesting, but too complex, and needs deep Rope
-  knowledge to do well.
-
-- ChangeSignature: Slightly less complex interface, but still to
-  complex, requiring a large effort for the benefit.
-
-
-# Too useless:
-
-I could not get these to work in any useful fashion. I might be doing
-something wrong.
-
-- ExtractVariable does not replace the code extracted with the
-  variable, making it a glorified copy&paste function. Emacs can do
-  better than this interface by itself.
-
-- EncapsulateField: Getter/setter methods are outdated, this should be
-  using properties.
-
-- IntroduceFactory: Inserts a trivial method to the current class.
-  Cute.
-
-- IntroduceParameter: Introduces a parameter correctly, but does not
-  replace the old code with the parameter. So it just edits the
-  argument list and adds a shiny default.
-
-- LocalToField: Seems to just add "self." in front of all occurrences
-  of a variable in the local scope.
-
-- MethodObject: This turns the current method into a callable
-  class/object. Not sure what that would be good for.
-
-
-# Can't even get to work:
-
-- ImportOrganizer expand_star_imports, handle_long_imports,
-  relatives_to_absolutes: Seem not to do anything.
-
-- create_move: I was not able to figure out what it would like to see
-  as its attrib argument.
-
-"""
-
-from elpy.rpc import Fault
-
-try:
-    from rope.base.exceptions import RefactoringError
-    from rope.base.project import Project
-    from rope.base.libutils import path_to_resource
-    from rope.base import change as rope_change
-    from rope.base import worder
-    from rope.refactor.importutils import ImportOrganizer
-    from rope.refactor.topackage import ModuleToPackage
-    from rope.refactor.rename import Rename
-    from rope.refactor.move import create_move
-    from rope.refactor.inline import create_inline
-    from rope.refactor.extract import ExtractMethod
-    from rope.refactor.usefunction import UseFunction
-    ROPE_AVAILABLE = True
-except ImportError:
-    ROPE_AVAILABLE = False
-
-
-def options(description, **kwargs):
-    """Decorator to set some options on a method."""
-    def set_notes(function):
-        function.refactor_notes = {'name': function.__name__,
-                                   'category': "Miscellaneous",
-                                   'description': description,
-                                   'doc': getattr(function, '__doc__',
-                                                  ''),
-                                   'args': []}
-        function.refactor_notes.update(kwargs)
-        return function
-    return set_notes
-
-
-class Refactor(object):
-    """The main refactoring interface.
-
-    Once initialized, the first call should be to get_refactor_options
-    to get a list of refactoring options at a given position. The
-    returned value will also list any additional options required.
-
-    Once you picked one, you can call get_changes to get the actual
-    refactoring changes.
-
-    """
-    def __init__(self, project_root, filename):
-        self.project_root = project_root
-        if ROPE_AVAILABLE:
-            self.project = Project(project_root, ropefolder=None)
-            self.resource = path_to_resource(self.project, filename)
-        else:
-            self.project = None
-            self.resource = FakeResource(filename)
-
-    def get_refactor_options(self, start, end=None):
-        """Return a list of options for refactoring at the given position.
-
-        If `end` is also given, refactoring on a region is assumed.
-
-        Each option is a dictionary of key/value pairs. The value of
-        the key 'name' is the one to be used for get_changes.
-
-        The key 'args' contains a list of additional arguments
-        required for get_changes.
-
-        """
-        result = []
-        for symbol in dir(self):
-            if not symbol.startswith("refactor_"):
-                continue
-            method = getattr(self, symbol)
-            if not method.refactor_notes.get('available', True):
-                continue
-            category = method.refactor_notes['category']
-            if end is not None and category != 'Region':
-                continue
-            if end is None and category == 'Region':
-                continue
-            is_on_symbol = self._is_on_symbol(start)
-            if not is_on_symbol and category in ('Symbol', 'Method'):
-                continue
-            requires_import = method.refactor_notes.get('only_on_imports',
-                                                        False)
-            if requires_import and not self._is_on_import_statement(start):
-                continue
-            result.append(method.refactor_notes)
-        return result
-
-    def _is_on_import_statement(self, offset):
-        "Does this offset point to an import statement?"
-        data = self.resource.read()
-        bol = data.rfind("\n", 0, offset) + 1
-        eol = data.find("\n", 0, bol)
-        if eol == -1:
-            eol = len(data)
-        line = data[bol:eol]
-        line = line.strip()
-        if line.startswith("import ") or line.startswith("from "):
-            return True
-        else:
-            return False
-
-    def _is_on_symbol(self, offset):
-        "Is this offset on a symbol?"
-        if not ROPE_AVAILABLE:
-            return False
-        data = self.resource.read()
-        if offset >= len(data):
-            return False
-        if data[offset] != '_' and not data[offset].isalnum():
-            return False
-        word = worder.get_name_at(self.resource, offset)
-        if word:
-            return True
-        else:
-            return False
-
-    def get_changes(self, name, *args):
-        """Return a list of changes for the named refactoring action.
-
-        Changes are dictionaries describing a single action to be
-        taken for the refactoring to be successful.
-
-        A change has an action and possibly a type. In the description
-        below, the action is before the slash and the type after it.
-
-        change: Change file contents
-        - file: The path to the file to change
-        - contents: The new contents for the file
-        - Diff: A unified diff showing the changes introduced
-
-        create/file: Create a new file
-        - file: The file to create
-
-        create/directory: Create a new directory
-        - path: The directory to create
-
-        move/file: Rename a file
-        - source: The path to the source file
-        - destination: The path to the destination file name
-
-        move/directory: Rename a directory
-        - source: The path to the source directory
-        - destination: The path to the destination directory name
-
-        delete/file: Delete a file
-        - file: The file to delete
-
-        delete/directory: Delete a directory
-        - path: The directory to delete
-
-        """
-        if not name.startswith("refactor_"):
-            raise ValueError("Bad refactoring name {0}".format(name))
-        method = getattr(self, name)
-        if not method.refactor_notes.get('available', True):
-            raise RuntimeError("Method not available")
-        return method(*args)
-
-    @options("Convert from x import y to import x.y as y", category="Imports",
-             args=[("offset", "offset", None)],
-             only_on_imports=True,
-             available=ROPE_AVAILABLE)
-    def refactor_froms_to_imports(self, offset):
-        """Converting imports of the form "from ..." to "import ..."."""
-        refactor = ImportOrganizer(self.project)
-        changes = refactor.froms_to_imports(self.resource, offset)
-        return translate_changes(changes)
-
-    @options("Reorganize and clean up", category="Imports",
-             available=ROPE_AVAILABLE)
-    def refactor_organize_imports(self):
-        """Clean up and organize imports."""
-        refactor = ImportOrganizer(self.project)
-        changes = refactor.organize_imports(self.resource)
-        return translate_changes(changes)
-
-    @options("Convert the current module into a package", category="Module",
-             available=ROPE_AVAILABLE)
-    def refactor_module_to_package(self):
-        """Convert the current module into a package."""
-        refactor = ModuleToPackage(self.project, self.resource)
-        changes = refactor.get_changes()
-        return translate_changes(changes)
-
-    @options("Rename symbol at point", category="Symbol",
-             args=[("offset", "offset", None),
-                   ("new_name", "string", "Rename to: "),
-                   ("in_hierarchy", "boolean",
-                    "Rename in super-/subclasses as well? "),
-                   ("docs", "boolean",
-                    "Replace occurences in docs and strings? ")
-                   ],
-             available=ROPE_AVAILABLE)
-    def refactor_rename_at_point(self, offset, new_name, in_hierarchy, docs):
-        """Rename the symbol at point."""
-        try:
-            refactor = Rename(self.project, self.resource, offset)
-        except RefactoringError as e:
-            raise Fault(str(e), code=400)
-        changes = refactor.get_changes(new_name, in_hierarchy=in_hierarchy,
-                                       docs=docs)
-        return translate_changes(changes)
-
-    @options("Rename current module", category="Module",
-             args=[("new_name", "string", "Rename to: ")],
-             available=ROPE_AVAILABLE)
-    def refactor_rename_current_module(self, new_name):
-        """Rename the current module."""
-        refactor = Rename(self.project, self.resource, None)
-        changes = refactor.get_changes(new_name)
-        return translate_changes(changes)
-
-    @options("Move the current module to a different package",
-             category="Module",
-             args=[("new_name", "directory", "Destination package: ")],
-             available=ROPE_AVAILABLE)
-    def refactor_move_module(self, new_name):
-        """Move the current module."""
-        refactor = create_move(self.project, self.resource)
-        resource = path_to_resource(self.project, new_name)
-        changes = refactor.get_changes(resource)
-        return translate_changes(changes)
-
-    @options("Inline function call at point", category="Symbol",
-             args=[("offset", "offset", None),
-                   ("only_this", "boolean", "Only this occurrence? ")],
-             available=ROPE_AVAILABLE)
-    def refactor_create_inline(self, offset, only_this):
-        """Inline the function call at point."""
-        refactor = create_inline(self.project, self.resource, offset)
-        if only_this:
-            changes = refactor.get_changes(remove=False, only_current=True)
-        else:
-            changes = refactor.get_changes(remove=True, only_current=False)
-        return translate_changes(changes)
-
-    @options("Extract current region as a method", category="Region",
-             args=[("start", "start_offset", None),
-                   ("end", "end_offset", None),
-                   ("name", "string", "Method name: "),
-                   ("make_global", "boolean", "Create global method? ")],
-             available=ROPE_AVAILABLE)
-    def refactor_extract_method(self, start, end, name,
-                                make_global):
-        """Extract region as a method."""
-        refactor = ExtractMethod(self.project, self.resource, start, end)
-        changes = refactor.get_changes(name, similar=True, global_=make_global)
-        return translate_changes(changes)
-
-    @options("Use the function at point wherever possible", category="Method",
-             args=[("offset", "offset", None)],
-             available=ROPE_AVAILABLE)
-    def refactor_use_function(self, offset):
-        """Use the function at point wherever possible."""
-        refactor = UseFunction(self.project, self.resource, offset)
-        changes = refactor.get_changes()
-        return translate_changes(changes)
-
-
-def translate_changes(initial_change):
-    """Translate rope.base.change.Change instances to dictionaries.
-
-    See Refactor.get_changes for an explanation of the resulting
-    dictionary.
-
-    """
-    agenda = [initial_change]
-    result = []
-    while agenda:
-        change = agenda.pop(0)
-        if isinstance(change, rope_change.ChangeSet):
-            agenda.extend(change.changes)
-        elif isinstance(change, rope_change.ChangeContents):
-            result.append({'action': 'change',
-                           'file': change.resource.real_path,
-                           'contents': change.new_contents,
-                           'diff': change.get_description()})
-        elif isinstance(change, rope_change.CreateFile):
-            result.append({'action': 'create',
-                           'type': 'file',
-                           'file': change.resource.real_path})
-        elif isinstance(change, rope_change.CreateFolder):
-            result.append({'action': 'create',
-                           'type': 'directory',
-                           'path': change.resource.real_path})
-        elif isinstance(change, rope_change.MoveResource):
-            result.append({'action': 'move',
-                           'type': ('directory'
-                                    if change.new_resource.is_folder()
-                                    else 'file'),
-                           'source': change.resource.real_path,
-                           'destination': change.new_resource.real_path})
-        elif isinstance(change, rope_change.RemoveResource):
-            if change.resource.is_folder():
-                result.append({'action': 'delete',
-                               'type': 'directory',
-                               'path': change.resource.real_path})
-            else:
-                result.append({'action': 'delete',
-                               'type': 'file',
-                               'file': change.resource.real_path})
-    return result
-
-
-class FakeResource(object):
-    """A fake resource in case Rope is absence."""
-
-    def __init__(self, filename):
-        self.real_path = filename
-
-    def read(self):
-        with open(self.real_path) as f:
-            return f.read()
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/ropebackend.py b/emacs.d/elpa/elpy-20150502.740/elpy/ropebackend.py
deleted file mode 100644
index 55a625d..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/ropebackend.py
+++ /dev/null
@@ -1,326 +0,0 @@
-"""Elpy backend using the Rope library.
-
-This backend uses the Rope library:
-
-http://rope.sourceforge.net/
-
-"""
-
-import os
-import time
-import traceback
-
-import rope.contrib.codeassist
-import rope.base.project
-import rope.base.libutils
-import rope.base.exceptions
-import rope.contrib.findit
-
-from elpy import rpc
-import elpy.pydocutils
-
-VALIDATE_EVERY_SECONDS = 5
-MAXFIXES = 5
-
-
-class RopeBackend(object):
-    """The Rope backend class.
-
-    Implements the RPC calls we can pass on to Rope. Also subclasses
-    the native backend to provide methods Rope does not provide, if
-    any.
-
-    """
-    name = "rope"
-
-    def __init__(self, project_root):
-        super(RopeBackend, self).__init__()
-        self.last_validation = 0
-        if not os.path.exists(project_root):
-            raise rpc.Fault(
-                "rope does not support files without a local project root",
-                code=400
-            )
-        self.project_root = project_root
-        self.completions = {}
-        prefs = dict(ignored_resources=['*.pyc', '*~', '.ropeproject',
-                                        '.hg', '.svn', '_svn', '.git'],
-                     python_files=['*.py'],
-                     save_objectdb=False,
-                     compress_objectdb=False,
-                     automatic_soa=True,
-                     soa_followed_calls=0,
-                     perform_doa=True,
-                     validate_objectdb=True,
-                     max_history_items=32,
-                     save_history=False,
-                     compress_history=False,
-                     indent_size=4,
-                     extension_modules=[],
-                     import_dynload_stdmods=True,
-                     ignore_syntax_errors=False,
-                     ignore_bad_imports=False)
-        self.project = rope.base.project.Project(self.project_root,
-                                                 ropefolder=None,
-                                                 **prefs)
-
-    def get_resource(self, filename):
-        if filename is not None and os.path.exists(filename):
-            return rope.base.libutils.path_to_resource(self.project,
-                                                       filename,
-                                                       'file')
-        else:
-            return None
-
-    def validate(self):
-        """Validate the stored project.
-
-        This should be called before every use of Rope. It will
-        revalidate the project, but do some call throttling.
-
-        """
-        now = time.time()
-        if now > self.last_validation + VALIDATE_EVERY_SECONDS:
-            try:
-                self.project.validate()
-            except rope.base.exceptions.ResourceNotFoundError:
-                pass
-            self.last_validation = now
-
-    def call_rope(self, rope_function, filename, source, offset,
-                  **kwargs):
-        self.validate()
-        resource = self.get_resource(filename)
-        try:
-            return rope_function(self.project,
-                                 source, offset,
-                                 resource,
-                                 maxfixes=MAXFIXES,
-                                 **kwargs)
-        except (rope.base.exceptions.BadIdentifierError,
-                rope.base.exceptions.ModuleSyntaxError,
-                rope.base.exceptions.ResourceNotFoundError,
-                rope.base.exceptions.NameNotFoundError,
-                IndentationError,
-                LookupError,
-                AttributeError):
-            return None
-        except Exception as e:
-            data = {
-                "traceback": traceback.format_exc(),
-                "rope_debug_info": {
-                    "project_root": self.project_root,
-                    "filename": filename,
-                    "source": source,
-                    "function_name": (rope_function.__module__ +
-                                      "." +
-                                      rope_function.__name__),
-                    "function_args": ", ".join([
-                        "project", "source", str(offset), "resource",
-                        "maxfixes={0}".format(MAXFIXES)
-                    ] + [
-                        u"{}={}".format(k, v)
-                        for (k, v) in kwargs.items()
-                    ])
-                }
-            }
-            raise rpc.Fault(
-                code=500,
-                message=str(e),
-                data=data
-            )
-
-    def rpc_get_completions(self, filename, source, offset):
-        proposals = self.call_rope(
-            rope.contrib.codeassist.code_assist,
-            filename, source, offset
-        )
-        if proposals is None:
-            return []
-        try:
-            starting_offset = rope.contrib.codeassist.starting_offset(source,
-                                                                      offset)
-        except (rope.base.exceptions.BadIdentifierError,
-                rope.base.exceptions.ModuleSyntaxError,
-                IndentationError,
-                LookupError,
-                AttributeError):
-            return []
-        prefixlen = offset - starting_offset
-        self.completions = dict((proposal.name, proposal)
-                                for proposal in proposals)
-        try:
-            return [{'name': proposal.name,
-                     'suffix': proposal.name[prefixlen:],
-                     'annotation': proposal.type,
-                     'meta': str(proposal)}
-                    for proposal in proposals]
-        except rope.base.exceptions.ModuleSyntaxError:
-            # Bug#406
-            return []
-
-    def rpc_get_completion_docstring(self, completion):
-        proposal = self.completions.get(completion)
-        if proposal is None:
-            return None
-        else:
-            return proposal.get_doc()
-
-    def rpc_get_completion_location(self, completion):
-        proposal = self.completions.get(completion)
-        if proposal is None:
-            return None
-        else:
-            if not proposal.pyname:
-                return None
-            module, lineno = proposal.pyname.get_definition_location()
-            if module is None:
-                return None
-            resource = module.get_module().get_resource()
-            return (resource.real_path, lineno)
-
-    def rpc_get_definition(self, filename, source, offset):
-        location = self.call_rope(
-            rope.contrib.findit.find_definition,
-            filename, source, offset
-        )
-        if location is None:
-            return None
-        else:
-            return (location.resource.real_path, location.offset)
-
-    def rpc_get_calltip(self, filename, source, offset):
-        offset = find_called_name_offset(source, offset)
-        if 0 < offset < len(source) and source[offset] == ')':
-            offset -= 1
-
-        calltip = self.call_rope(
-            rope.contrib.codeassist.get_calltip,
-            filename, source, offset,
-            remove_self=True
-        )
-        if calltip is None:
-            return None
-
-        calltip = calltip.replace(".__init__(", "(")
-        calltip = calltip.replace("(self)", "()")
-        calltip = calltip.replace("(self, ", "(")
-        # "elpy.tests.support.source_and_offset(source)"
-        # =>
-        # "support.source_and_offset(source)"
-        try:
-            openpos = calltip.index("(")
-            period2 = calltip.rindex(".", 0, openpos)
-            period1 = calltip.rindex(".", 0, period2)
-            calltip = calltip[period1 + 1:]
-        except ValueError:
-            pass
-        return calltip
-
-    def rpc_get_docstring(self, filename, source, offset):
-        return self.call_rope(
-            rope.contrib.codeassist.get_doc,
-            filename, source, offset
-        )
-
-
-def find_called_name_offset(source, orig_offset):
-    """Return the offset of a calling function.
-
-    This only approximates movement.
-
-    """
-    offset = min(orig_offset, len(source) - 1)
-    paren_count = 0
-    while True:
-        if offset <= 1:
-            return orig_offset
-        elif source[offset] == '(':
-            if paren_count == 0:
-                return offset - 1
-            else:
-                paren_count -= 1
-        elif source[offset] == ')':
-            paren_count += 1
-        offset -= 1
-
-
-##################################################################
-# A recurring problem in Rope for Elpy is that it searches the whole
-# project root for Python files. If the user edits a file in their
-# home directory, this can easily read a whole lot of files, making
-# Rope practically useless. We change the file finding algorithm here
-# to only recurse into directories with an __init__.py file in them.
-def find_source_folders(self, folder):
-    for resource in folder.get_folders():
-        if self._is_package(resource):
-            return [folder]
-    result = []
-    for resource in folder.get_files():
-        if resource.name.endswith('.py'):
-            result.append(folder)
-            break
-    for resource in folder.get_folders():
-        if self._is_package(resource):
-            result.append(resource)
-    return result
-
-import rope.base.pycore
-rope.base.pycore.PyCore._find_source_folders = find_source_folders
-
-
-def get_files(self):
-    if self.files is None:
-        self.files = get_python_project_files(self.project)
-    return self.files
-
-rope.base.project._FileListCacher.get_files = get_files
-
-
-def get_python_project_files(project):
-    for dirname, subdirs, files in os.walk(project.root.real_path):
-        for filename in files:
-            yield rope.base.libutils.path_to_resource(
-                project, os.path.join(dirname, filename), 'file')
-            subdirs[:] = [subdir for subdir in subdirs
-                          if os.path.exists(os.path.join(dirname, subdir,
-                                                         "__init__.py"))]
-
-
-##################################################################
-# Monkey patching a method in rope because it doesn't complete import
-# statements.
-
-orig_code_completions = (rope.contrib.codeassist.
-                         _PythonCodeAssist._code_completions)
-
-
-def code_completions(self):
-    proposals = get_import_completions(self)
-    if proposals:
-        return proposals
-    else:
-        return orig_code_completions(self)
-
-
-def get_import_completions(self):
-    if not self.word_finder.is_import_statement(self.offset):
-        return []
-    modulename = self.word_finder.get_primary_at(self.offset)
-    # Rope can handle modules in packages
-    if "." in modulename:
-        return []
-    return dict((name, FakeProposal(name))
-                for name in elpy.pydocutils.get_modules()
-                if name.startswith(modulename))
-
-
-class FakeProposal(object):
-    def __init__(self, name):
-        self.name = name
-        self.type = "mock"
-
-    def get_doc(self):
-        return None
-
-rope.contrib.codeassist._PythonCodeAssist._code_completions = code_completions
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/server.py b/emacs.d/elpa/elpy-20150502.740/elpy/server.py
deleted file mode 100644
index 57e1265..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/server.py
+++ /dev/null
@@ -1,275 +0,0 @@
-"""Method implementations for the Elpy JSON-RPC server.
-
-This file implements the methods exported by the JSON-RPC server. It
-handles backend selection and passes methods on to the selected
-backend.
-
-"""
-import io
-import os
-import pydoc
-
-from elpy.pydocutils import get_pydoc_completions
-from elpy.rpc import JSONRPCServer, Fault
-from elpy.impmagic import ImportMagic
-
-
-try:
-    from elpy import jedibackend
-except ImportError:  # pragma: no cover
-    jedibackend = None
-
-try:
-    from elpy import ropebackend
-except ImportError:  # pragma: no cover
-    ropebackend = None
-
-
-class ElpyRPCServer(JSONRPCServer):
-    """The RPC server for elpy.
-
-    See the rpc_* methods for exported method documentation.
-
-    """
-    def __init__(self, *args, **kwargs):
-        super(ElpyRPCServer, self).__init__(*args, **kwargs)
-        self.backend = None
-        self.import_magic = ImportMagic()
-        self.project_root = None
-
-    def _call_backend(self, method, default, *args, **kwargs):
-        """Call the backend method with args.
-
-        If there is currently no backend, return default."""
-        meth = getattr(self.backend, method, None)
-        if meth is None:
-            return default
-        else:
-            return meth(*args, **kwargs)
-
-    def rpc_echo(self, *args):
-        """Return the arguments.
-
-        This is a simple test method to see if the protocol is
-        working.
-
-        """
-        return args
-
-    def rpc_init(self, options):
-        self.project_root = options["project_root"]
-
-        if self.import_magic.is_enabled:
-            self.import_magic.build_index(self.project_root)
-
-        if ropebackend and options["backend"] == "rope":
-            self.backend = ropebackend.RopeBackend(self.project_root)
-        elif jedibackend and options["backend"] == "jedi":
-            self.backend = jedibackend.JediBackend(self.project_root)
-        elif ropebackend:
-            self.backend = ropebackend.RopeBackend(self.project_root)
-        elif jedibackend:
-            self.backend = jedibackend.JediBackend(self.project_root)
-        else:
-            self.backend = None
-
-        return {
-            'backend': (self.backend.name if self.backend is not None
-                        else None)
-        }
-
-    def rpc_get_calltip(self, filename, source, offset):
-        """Get the calltip for the function at the offset.
-
-        """
-        return self._call_backend("rpc_get_calltip", None, filename,
-                                  get_source(source), offset)
-
-    def rpc_get_completions(self, filename, source, offset):
-        """Get a list of completion candidates for the symbol at offset.
-
-        """
-        results = self._call_backend("rpc_get_completions", [], filename,
-                                     get_source(source), offset)
-        # Uniquify by name
-        results = list(dict((res['name'], res) for res in results)
-                       .values())
-        results.sort(key=lambda cand: _pysymbol_key(cand["name"]))
-        return results
-
-    def rpc_get_completion_docstring(self, completion):
-        """Return documentation for a previously returned completion.
-
-        """
-        return self._call_backend("rpc_get_completion_docstring",
-                                  None, completion)
-
-    def rpc_get_completion_location(self, completion):
-        """Return the location for a previously returned completion.
-
-        This returns a list of [file name, line number].
-
-        """
-        return self._call_backend("rpc_get_completion_location", None,
-                                  completion)
-
-    def rpc_get_definition(self, filename, source, offset):
-        """Get the location of the definition for the symbol at the offset.
-
-        """
-        return self._call_backend("rpc_get_definition", None, filename,
-                                  get_source(source), offset)
-
-    def rpc_get_docstring(self, filename, source, offset):
-        """Get the docstring for the symbol at the offset.
-
-        """
-        return self._call_backend("rpc_get_docstring", None, filename,
-                                  get_source(source), offset)
-
-    def rpc_get_pydoc_completions(self, name=None):
-        """Return a list of possible strings to pass to pydoc.
-
-        If name is given, the strings are under name. If not, top
-        level modules are returned.
-
-        """
-        return get_pydoc_completions(name)
-
-    def rpc_get_pydoc_documentation(self, symbol):
-        """Get the Pydoc documentation for the given symbol.
-
-        Uses pydoc and can return a string with backspace characters
-        for bold highlighting.
-
-        """
-        try:
-            docstring = pydoc.render_doc(str(symbol),
-                                         "Elpy Pydoc Documentation for %s",
-                                         False)
-        except (ImportError, pydoc.ErrorDuringImport):
-            return None
-        else:
-            if isinstance(docstring, bytes):
-                docstring = docstring.decode("utf-8", "replace")
-            return docstring
-
-    def rpc_get_refactor_options(self, filename, start, end=None):
-        """Return a list of possible refactoring options.
-
-        This list will be filtered depending on whether it's
-        applicable at the point START and possibly the region between
-        START and END.
-
-        """
-        try:
-            from elpy import refactor
-        except:
-            raise ImportError("Rope not installed, refactorings unavailable")
-        ref = refactor.Refactor(self.project_root, filename)
-        return ref.get_refactor_options(start, end)
-
-    def rpc_refactor(self, filename, method, args):
-        """Return a list of changes from the refactoring action.
-
-        A change is a dictionary describing the change. See
-        elpy.refactor.translate_changes for a description.
-
-        """
-        try:
-            from elpy import refactor
-        except:
-            raise ImportError("Rope not installed, refactorings unavailable")
-        if args is None:
-            args = ()
-        ref = refactor.Refactor(self.project_root, filename)
-        return ref.get_changes(method, *args)
-
-    def rpc_get_usages(self, filename, source, offset):
-        """Get usages for the symbol at point.
-
-        """
-        source = get_source(source)
-        if hasattr(self.backend, "rpc_get_usages"):
-            return self.backend.rpc_get_usages(filename, source, offset)
-        else:
-            raise Fault("get_usages not implemented by current backend",
-                        code=400)
-
-    def _ensure_import_magic(self):  # pragma: no cover
-        if not self.import_magic.is_enabled:
-            raise Fault("fixup_imports not enabled; install importmagic module",
-                        code=400)
-        if not self.import_magic.symbol_index:
-            raise Fault(self.import_magic.fail_message, code=200)  # XXX code?
-
-    def rpc_get_import_symbols(self, filename, source, symbol):
-        """Return a list of modules from which the given symbol can be imported.
-
-        """
-        self._ensure_import_magic()
-        return self.import_magic.get_import_symbols(symbol)
-
-    def rpc_add_import(self, filename, source, statement):
-        """Add an import statement to the module.
-
-        """
-        self._ensure_import_magic()
-        source = get_source(source)
-        return self.import_magic.add_import(source, statement)
-
-    def rpc_get_unresolved_symbols(self, filename, source):
-        """Return a list of unreferenced symbols in the module.
-
-        """
-        self._ensure_import_magic()
-        source = get_source(source)
-        return self.import_magic.get_unresolved_symbols(source)
-
-    def rpc_remove_unreferenced_imports(self, filename, source):
-        """Remove unused import statements.
-
-        """
-        self._ensure_import_magic()
-        source = get_source(source)
-        return self.import_magic.remove_unreferenced_imports(source)
-
-
-def get_source(fileobj):
-    """Translate fileobj into file contents.
-
-    fileobj is either a string or a dict. If it's a string, that's the
-    file contents. If it's a string, then the filename key contains
-    the name of the file whose contents we are to use.
-
-    If the dict contains a true value for the key delete_after_use,
-    the file should be deleted once read.
-
-    """
-    if not isinstance(fileobj, dict):
-        return fileobj
-    else:
-        try:
-            with io.open(fileobj["filename"], encoding="utf-8") as f:
-                return f.read()
-        finally:
-            if fileobj.get('delete_after_use'):
-                try:
-                    os.remove(fileobj["filename"])
-                except:  # pragma: no cover
-                    pass
-
-
-def _pysymbol_key(name):
-    """Return a sortable key index for name.
-
-    Sorting is case-insensitive, with the first underscore counting as
-    worse than any character, but subsequent underscores do not. This
-    means that dunder symbols (like __init__) are sorted after symbols
-    that start with an alphabetic character, but before those that
-    start with only a single underscore.
-
-    """
-    if name.startswith("_"):
-        name = "~" + name[1:]
-    return name.lower()
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/support.py b/emacs.d/elpa/elpy-20150502.740/elpy/tests/support.py
deleted file mode 100644
index f6839a1..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/tests/support.py
+++ /dev/null
@@ -1,743 +0,0 @@
-# coding: utf-8
-
-"""Support classes and functions for the elpy test code.
-
-Elpy uses a bit of a peculiar test setup to avoid redundancy. For the
-tests of the two backends, we provide generic test cases for generic
-tests and for specific callback tests.
-
-These mixins can be included in the actual test classes. We can't add
-these tests to a BackendTestCase subclass directly because the test
-discovery would find them there and try to run them, which would fail.
-
-"""
-
-import os
-import shutil
-import tempfile
-import unittest
-
-from elpy.tests import compat
-
-
-class BackendTestCase(unittest.TestCase):
-    """Base class for backend tests.
-
-    This class sets up a project root directory and provides an easy
-    way to create files within the project root.
-
-    """
-
-    def setUp(self):
-        """Create the project root and make sure it gets cleaned up."""
-        super(BackendTestCase, self).setUp()
-        self.project_root = tempfile.mkdtemp(prefix="elpy-test")
-        self.addCleanup(shutil.rmtree, self.project_root, True)
-
-    def project_file(self, relname, contents):
-        """Create a file named relname within the project root.
-
-        Write contents into that file.
-
-        """
-        full_name = os.path.join(self.project_root, relname)
-        try:
-            os.makedirs(os.path.dirname(full_name))
-        except OSError:
-            pass
-        with open(full_name, "w") as f:
-            f.write(contents)
-        return full_name
-
-
-class GenericRPCTests(object):
-    """Generic RPC test methods.
-
-    This is a mixin to add tests that should be run for all RPC
-    methods that follow the generic (filename, source, offset) calling
-    conventions.
-
-    """
-    METHOD = None
-
-    def rpc(self, filename, source, offset):
-        method = getattr(self.backend, self.METHOD)
-        return method(filename, source, offset)
-
-    def test_should_not_fail_on_inexisting_file(self):
-        filename = self.project_root + "/doesnotexist.py"
-        self.rpc(filename, "", 0)
-
-    def test_should_not_fail_on_empty_file(self):
-        filename = self.project_file("test.py", "")
-        self.rpc(filename, "", 0)
-
-    def test_should_not_fail_if_file_is_none(self):
-        self.rpc(None, "", 0)
-
-    def test_should_not_fail_for_module_syntax_errors(self):
-        source, offset = source_and_offset(
-            "class Foo(object):\n"
-            "  def bar(self):\n"
-            "    foo(_|_"
-            "    bar("
-            "\n"
-            "  def a(self):\n"
-            "    pass\n"
-            "\n"
-            "  def b(self):\n"
-            "  pass\n"
-            "\n"
-            "  def b(self):\n"
-            "  pass\n"
-            "\n"
-            "  def b(self):\n"
-            "  pass\n"
-            "\n"
-            "  def b(self):\n"
-            "  pass\n"
-            "\n"
-            "  def b(self):\n"
-            "  pass\n"
-        )
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_bad_indentation(self):
-        # Bug in Rope: rope#80
-        source, offset = source_and_offset(
-            "def foo():\n"
-            "       print(23)_|_\n"
-            "      print(17)\n")
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_relative_import(self):
-        # Bug in Rope: rope#81 and rope#82
-        source, offset = source_and_offset(
-            "from .. import foo_|_"
-        )
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_on_keyword(self):
-        source, offset = source_and_offset(
-            "_|_try:\n"
-            "    pass\n"
-            "except:\n"
-            "    pass\n")
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_with_bad_encoding(self):
-        # Bug in Rope: rope#83
-        source, offset = source_and_offset(
-            u'# coding: utf-8X_|_\n'
-        )
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_with_form_feed_characters(self):
-        # Bug in Jedi: jedi#424
-        source, offset = source_and_offset(
-            "\f\n"
-            "class Test(object):_|_\n"
-            "    pass"
-        )
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_dictionaries_in_weird_places(self):
-        # Bug in Jedi: jedi#417
-        source, offset = source_and_offset(
-            "import json\n"
-            "\n"
-            "def foo():\n"
-            "    json.loads(_|_\n"
-            "\n"
-            "    json.load.return_value = {'foo': [],\n"
-            "                              'bar': True}\n"
-            "\n"
-            "    c = Foo()\n"
-        )
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_break_with_binary_characters_in_docstring(self):
-        # Bug in Jedi: jedi#427
-        template = '''\
-class Foo(object):
-    def __init__(self):
-        """
-        COMMUNITY instance that this conversion belongs to.
-        DISPERSY_VERSION is the dispersy conversion identifier (on the wire version; must be one byte).
-        COMMUNIY_VERSION is the community conversion identifier (on the wire version; must be one byte).
-
-        COMMUNIY_VERSION may not be '\\x00' or '\\xff'. '\\x00' is used by the DefaultConversion until
-        a proper conversion instance can be made for the Community.  '\\xff' is reserved for when
-        more than one byte is needed as a version indicator.
-        """
-        pass
-
-
-x = Foo()
-x._|_
-'''
-        source, offset = source_and_offset(template)
-        filename = self.project_file("test.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_def_without_name(self):
-        # Bug jedi#429
-        source, offset = source_and_offset(
-            "def_|_():\n"
-            "    if True:\n"
-            "        return True\n"
-            "    else:\n"
-            "        return False\n"
-        )
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_on_lambda(self):
-        # Bug #272 / jedi#431
-        source, offset = source_and_offset(
-            "map(lambda_|_"
-        )
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_on_literals(self):
-        # Bug #314, #344 / jedi#466
-        source = u'lit = u"""\\\n# -*- coding: utf-8 -*-\n"""\n'
-        offset = 0
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_with_args_as_args(self):
-        # Bug #347 in rope_py3k
-        source, offset = source_and_offset(
-            "def my_function(*args):\n"
-            "    ret_|_"
-        )
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_unicode_chars_in_string(self):
-        # Bug #358 / jedi#482
-        source = '''\
-# coding: utf-8
-
-logging.info(u"Saving «{}»...".format(title))
-requests.get(u"https://web.archive.org/save/{}".format(url))
-'''
-        offset = 57
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_bad_escape_sequence(self):
-        # Bug #360 / jedi#485
-        source = r"v = '\x'"
-        offset = 8
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_for_coding_declarations_in_strings(self):
-        # Bug #314 / jedi#465 / python#22221
-        source = u'lit = """\\\n# -*- coding: utf-8 -*-\n"""'
-        offset = 8
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-    def test_should_not_fail_if_root_vanishes(self):
-        # Bug #353
-        source, offset = source_and_offset(
-            "import foo\n"
-            "foo._|_"
-        )
-        filename = self.project_file("project.py", source)
-        shutil.rmtree(self.project_root)
-
-        self.rpc(filename, source, offset)
-
-    # For some reason, this breaks a lot of other tests. Couldn't
-    # figure out why.
-    #
-    # def test_should_not_fail_for_sys_path(self):
-    #     # Bug #365 / jedi#486
-    #     source, offset = source_and_offset(
-    #         "import sys\n"
-    #         "\n"
-    #         "sys.path.index(_|_\n"
-    #     )
-    #     filename = self.project_file("project.py", source)
-    #
-    #     self.rpc(filename, source, offset)
-
-
-class RPCGetCompletionsTests(GenericRPCTests):
-    METHOD = "rpc_get_completions"
-
-    def test_should_complete_builtin(self):
-        source, offset = source_and_offset("o_|_")
-
-        expected = ["object", "oct", "open", "or", "ord"]
-        actual = [cand['name'] for cand in
-                  self.backend.rpc_get_completions("test.py",
-                                                   source, offset)]
-
-        for candidate in expected:
-            self.assertIn(candidate, actual)
-
-    def test_should_complete_imports(self):
-        source, offset = source_and_offset("import json\n"
-                                           "json.J_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        self.assertEqual(
-            sorted([cand['suffix'] for cand in completions]),
-            sorted(["SONDecoder", "SONEncoder"]))
-
-    def test_should_complete_top_level_modules_for_import(self):
-        source, offset = source_and_offset("import multi_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        if compat.PYTHON3:
-            expected = ["processing"]
-        else:
-            expected = ["file", "processing"]
-        self.assertEqual(sorted([cand['suffix'] for cand in completions]),
-                         sorted(expected))
-
-    def test_should_complete_packages_for_import(self):
-        source, offset = source_and_offset("import elpy.tes_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        self.assertEqual([cand['suffix'] for cand in completions],
-                         ["ts"])
-
-    def test_should_not_complete_for_import(self):
-        source, offset = source_and_offset("import foo.Conf_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        self.assertEqual([cand['suffix'] for cand in completions],
-                         [])
-
-    def test_should_not_fail_for_short_module(self):
-        source, offset = source_and_offset("from .. import foo_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        self.assertIsNotNone(completions)
-
-    def test_should_complete_sys(self):
-        source, offset = source_and_offset("import sys\nsys._|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        self.assertIn('path', [cand['suffix'] for cand in completions])
-
-    def test_should_find_with_trailing_text(self):
-        source, offset = source_and_offset(
-            "import threading\nthreading.T_|_mumble mumble")
-
-        expected = ["Thread", "ThreadError", "Timer"]
-        actual = [cand['name'] for cand in
-                  self.backend.rpc_get_completions("test.py", source, offset)]
-
-        for candidate in expected:
-            self.assertIn(candidate, actual)
-
-    def test_should_find_completion_different_package(self):
-        # See issue #74
-        self.project_file("project/__init__.py", "")
-        source1 = ("class Add:\n"
-                   "    def add(self, a, b):\n"
-                   "        return a + b\n")
-        self.project_file("project/add.py", source1)
-        source2, offset = source_and_offset(
-            "from project.add import Add\n"
-            "class Calculator:\n"
-            "    def add(self, a, b):\n"
-            "        c = Add()\n"
-            "        c.ad_|_\n")
-        file2 = self.project_file("project/calculator.py", source2)
-        proposals = self.backend.rpc_get_completions(file2,
-                                                     source2,
-                                                     offset)
-        self.assertEqual(["add"],
-                         [proposal["name"] for proposal in proposals])
-
-
-class RPCGetCompletionDocstringTests(object):
-    def test_should_return_docstring(self):
-        source, offset = source_and_offset("import json\n"
-                                           "json.J_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        completions.sort(key=lambda p: p["name"])
-        prop = completions[0]
-        self.assertEqual(prop["name"], "JSONDecoder")
-
-        docs = self.backend.rpc_get_completion_docstring("JSONDecoder")
-
-        self.assertIn("Simple JSON", docs)
-
-    def test_should_return_none_if_unknown(self):
-        docs = self.backend.rpc_get_completion_docstring("Foo")
-
-        self.assertIsNone(docs)
-
-
-class RPCGetCompletionLocationTests(object):
-    def test_should_return_location(self):
-        source, offset = source_and_offset("donaudampfschiff = 1\n"
-                                           "donau_|_")
-        filename = self.project_file("test.py", source)
-        completions = self.backend.rpc_get_completions(filename,
-                                                       source,
-                                                       offset)
-        prop = completions[0]
-        self.assertEqual(prop["name"], "donaudampfschiff")
-
-        loc = self.backend.rpc_get_completion_location("donaudampfschiff")
-
-        self.assertEqual((filename, 1), loc)
-
-    def test_should_return_none_if_unknown(self):
-        docs = self.backend.rpc_get_completion_location("Foo")
-
-        self.assertIsNone(docs)
-
-
-class RPCGetDefinitionTests(GenericRPCTests):
-    METHOD = "rpc_get_definition"
-
-    def test_should_return_definition_location_same_file(self):
-        source, offset = source_and_offset("import threading\n"
-                                           "def test_function(a, b):\n"
-                                           "    return a + b\n"
-                                           "\n"
-                                           "test_func_|_tion(\n")
-        filename = self.project_file("test.py", source)
-
-        location = self.backend.rpc_get_definition(filename,
-                                                   source,
-                                                   offset)
-
-        self.assertEqual(location[0], filename)
-        # On def or on the function name
-        self.assertIn(location[1], (17, 21))
-
-    def test_should_return_location_in_same_file_if_not_saved(self):
-        source, offset = source_and_offset(
-            "import threading\n"
-            "\n"
-            "\n"
-            "def other_function():\n"
-            "    test_f_|_unction(1, 2)\n"
-            "\n"
-            "\n"
-            "def test_function(a, b):\n"
-            "    return a + b\n")
-        filename = self.project_file("test.py", "")
-
-        location = self.backend.rpc_get_definition(filename,
-                                                   source,
-                                                   offset)
-
-        self.assertEqual(location[0], filename)
-        # def or function name
-        self.assertIn(location[1], (67, 71))
-
-    def test_should_return_location_in_different_file(self):
-        source1 = ("def test_function(a, b):\n"
-                   "    return a + b\n")
-        file1 = self.project_file("test1.py", source1)
-        source2, offset = source_and_offset("from test1 import test_function\n"
-                                            "test_funct_|_ion(1, 2)\n")
-        file2 = self.project_file("test2.py", source2)
-
-        definition = self.backend.rpc_get_definition(file2,
-                                                     source2,
-                                                     offset)
-
-        self.assertEqual(definition[0], file1)
-        # Either on the def or on the function name
-        self.assertIn(definition[1], (0, 4))
-
-    def test_should_return_none_if_location_not_found(self):
-        source, offset = source_and_offset("test_f_|_unction()\n")
-        filename = self.project_file("test.py", source)
-
-        definition = self.backend.rpc_get_definition(filename,
-                                                     source,
-                                                     offset)
-
-        self.assertIsNone(definition)
-
-    def test_should_return_none_if_outside_of_symbol(self):
-        source, offset = source_and_offset("test_function(_|_)\n")
-        filename = self.project_file("test.py", source)
-
-        definition = self.backend.rpc_get_definition(filename,
-                                                     source,
-                                                     offset)
-
-        self.assertIsNone(definition)
-
-    def test_should_return_definition_location_different_package(self):
-        # See issue #74
-        self.project_file("project/__init__.py", "")
-        source1 = ("class Add:\n"
-                   "    def add(self, a, b):\n"
-                   "        return a + b\n")
-        file1 = self.project_file("project/add.py", source1)
-        source2, offset = source_and_offset(
-            "from project.add import Add\n"
-            "class Calculator:\n"
-            "    def add(self, a, b):\n"
-            "        return Add_|_().add(a, b)\n")
-        file2 = self.project_file("project/calculator.py", source2)
-
-        location = self.backend.rpc_get_definition(file2,
-                                                   source2,
-                                                   offset)
-
-        self.assertEqual(location[0], file1)
-        # class or class name
-        self.assertIn(location[1], (0, 6))
-
-    def test_should_find_variable_definition(self):
-        source, offset = source_and_offset("SOME_VALUE = 1\n"
-                                           "\n"
-                                           "variable = _|_SOME_VALUE\n")
-        filename = self.project_file("test.py", source)
-        self.assertEqual(self.backend.rpc_get_definition(filename,
-                                                         source,
-                                                         offset),
-                         (filename, 0))
-
-
-class RPCGetCalltipTests(GenericRPCTests):
-    METHOD = "rpc_get_calltip"
-
-    def test_should_get_calltip(self):
-        source, offset = source_and_offset(
-            "import threading\nthreading.Thread(_|_")
-        filename = self.project_file("test.py", source)
-        calltip = self.backend.rpc_get_calltip(filename,
-                                               source,
-                                               offset)
-
-        expected = self.THREAD_CALLTIP
-
-        self.assertEqual(calltip, expected)
-
-    def test_should_get_calltip_even_after_parens(self):
-        source, offset = source_and_offset(
-            "import threading\nthreading.Thread(foo()_|_")
-        filename = self.project_file("test.py", source)
-
-        actual = self.backend.rpc_get_calltip(filename,
-                                              source,
-                                              offset)
-
-        self.assertEqual(self.THREAD_CALLTIP, actual)
-
-    def test_should_get_calltip_at_closing_paren(self):
-        source, offset = source_and_offset(
-            "import threading\nthreading.Thread(_|_)")
-        filename = self.project_file("test.py", source)
-
-        actual = self.backend.rpc_get_calltip(filename,
-                                              source,
-                                              offset)
-
-        self.assertEqual(self.THREAD_CALLTIP, actual)
-
-    def test_should_return_none_for_bad_identifier(self):
-        source, offset = source_and_offset(
-            "froblgoo(_|_")
-        filename = self.project_file("test.py", source)
-        calltip = self.backend.rpc_get_calltip(filename,
-                                               source,
-                                               offset)
-        self.assertIsNone(calltip)
-
-    def test_should_remove_self_argument(self):
-        source, offset = source_and_offset(
-            "d = dict()\n"
-            "d.keys(_|_")
-        filename = self.project_file("test.py", source)
-
-        actual = self.backend.rpc_get_calltip(filename,
-                                              source,
-                                              offset)
-
-        self.assertEqual(self.KEYS_CALLTIP, actual)
-
-    def test_should_remove_package_prefix(self):
-        source, offset = source_and_offset(
-            "import decimal\n"
-            "d = decimal.Decimal('1.5')\n"
-            "d.radix(_|_")
-        filename = self.project_file("test.py", source)
-
-        actual = self.backend.rpc_get_calltip(filename,
-                                              source,
-                                              offset)
-
-        self.assertEqual(self.RADIX_CALLTIP, actual)
-
-    def test_should_return_none_outside_of_all(self):
-        filename = self.project_file("test.py", "")
-        source, offset = source_and_offset("import thr_|_eading\n")
-        calltip = self.backend.rpc_get_calltip(filename,
-                                               source, offset)
-        self.assertIsNone(calltip)
-
-    def test_should_find_calltip_different_package(self):
-        # See issue #74
-        self.project_file("project/__init__.py", "")
-        source1 = ("class Add:\n"
-                   "    def add(self, a, b):\n"
-                   "        return a + b\n")
-        self.project_file("project/add.py", source1)
-        source2, offset = source_and_offset(
-            "from project.add import Add\n"
-            "class Calculator:\n"
-            "    def add(self, a, b):\n"
-            "        c = Add()\n"
-            "        c.add(_|_\n")
-        file2 = self.project_file("project/calculator.py", source2)
-
-        actual = self.backend.rpc_get_calltip(file2,
-                                              source2,
-                                              offset)
-
-        self.assertEqual(self.ADD_CALLTIP, actual)
-
-
-class RPCGetDocstringTests(GenericRPCTests):
-    METHOD = "rpc_get_docstring"
-
-    def check_docstring(self, docstring):
-
-        def first_line(s):
-            return s[:s.index("\n")]
-
-        self.assertEqual(first_line(docstring),
-                         self.THREAD_JOIN_DOCSTRING)
-
-    def test_should_get_docstring(self):
-        source, offset = source_and_offset(
-            "import threading\nthreading.Thread.join_|_(")
-        filename = self.project_file("test.py", source)
-        docstring = self.backend.rpc_get_docstring(filename,
-                                                   source,
-                                                   offset)
-        self.check_docstring(docstring)
-
-    def test_should_return_none_for_bad_identifier(self):
-        source, offset = source_and_offset(
-            "froblgoo_|_(\n")
-        filename = self.project_file("test.py", source)
-        docstring = self.backend.rpc_get_docstring(filename,
-                                                   source,
-                                                   offset)
-        self.assertIsNone(docstring)
-
-
-class RPCGetUsagesTests(GenericRPCTests):
-    METHOD = "rpc_get_usages"
-
-    def test_should_return_uses_in_same_file(self):
-        filename = self.project_file("test.py", "")
-        source, offset = source_and_offset(
-            "def foo(x):\n"
-            "    return _|_x + x\n")
-
-        usages = self.backend.rpc_get_usages(filename,
-                                             source,
-                                             offset)
-
-        self.assertEqual(usages,
-                         [{'name': 'x',
-                           'offset': 8,
-                           'filename': filename},
-                          {'name': 'x',
-                           'filename': filename,
-                           'offset': 23},
-                          {'name': u'x',
-                           'filename': filename,
-                           'offset': 27}])
-
-    def test_should_return_uses_in_other_file(self):
-        file1 = self.project_file("file1.py", "")
-        file2 = self.project_file("file2.py", "\n\n\n\n\nx = 5")
-        source, offset = source_and_offset(
-            "import file2\n"
-            "file2._|_x\n")
-
-        usages = self.backend.rpc_get_usages(file1,
-                                             source,
-                                             offset)
-
-        self.assertEqual(usages,
-                         [{'name': 'x',
-                           'filename': file1,
-                           'offset': 19},
-                          {'name': 'x',
-                           'filename': file2,
-                           'offset': 5}])
-
-    def test_should_not_fail_without_symbol(self):
-        filename = self.project_file("file.py", "")
-
-        usages = self.backend.rpc_get_usages(filename,
-                                             "",
-                                             0)
-
-        self.assertEqual(usages, [])
-
-
-def source_and_offset(source):
-    """Return a source and offset from a source description.
-
-    >>> source_and_offset("hello, _|_world")
-    ("hello, world", 7)
-    >>> source_and_offset("_|_hello, world")
-    ("hello, world", 0)
-    >>> source_and_offset("hello, world_|_")
-    ("hello, world", 12)
-    """
-    offset = source.index("_|_")
-    return source[:offset] + source[offset + 3:], offset
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_impmagic.py b/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_impmagic.py
deleted file mode 100644
index 38d6ab5..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_impmagic.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# coding: utf-8
-
-"""Tests for the elpy.impmagic module"""
-
-import re
-import unittest
-
-from elpy import impmagic
-from elpy.tests.support import BackendTestCase
-
-TEST_SOURCE = '''# test file
-
-import time
-import logging
-
-os.getcwd()
-time.sleep(1)
-'''
-
-
-class ImportMagicTestCase(BackendTestCase):
-
-    def setUp(self):
-        if not impmagic.importmagic:
-            raise unittest.SkipTest
-        self.importmagic = impmagic.ImportMagic()
-        super(ImportMagicTestCase, self).setUp()
-
-    def build_index(self):
-        self.project_file('mymod.py', 'class AnUncommonName:\n pass\n')
-        self.importmagic.build_index(self.project_root,
-                                     custom_path=[self.project_root],
-                                     blacklist_re=re.compile('^$'))
-        self.importmagic._thread.join()
-
-    def test_get_symbols(self):
-        self.build_index()
-        candidates = self.importmagic.get_import_symbols('AnUncommonName')
-        self.assertEqual(candidates, ['from mymod import AnUncommonName'])
-        candidates = self.importmagic.get_import_symbols('mymod')
-        self.assertEqual(candidates, ['import mymod'])
-
-    @unittest.skipIf(impmagic.importmagic.__version__ == '0.1.3',
-                     "Import ordering is random, see #479")
-    def test_add_import(self):
-        self.build_index()
-        start, end, newblock = self.importmagic.add_import(
-            TEST_SOURCE, 'from mymod import AnUncommonName')
-        self.assertEqual(start, 2)
-        self.assertEqual(end, 5)
-        self.assertEqual(newblock.strip(),
-                         'import logging\nimport time\n\nfrom mymod import AnUncommonName')
-
-        start, end, newblock = self.importmagic.add_import(
-            TEST_SOURCE, 'import mymod')
-        self.assertEqual(start, 2)
-        self.assertEqual(end, 5)
-        self.assertEqual(newblock.strip(),
-                         'import logging\nimport time\n\nimport mymod')
-
-    def test_get_unresolved_symbols(self):
-        self.build_index()
-        symbols = self.importmagic.get_unresolved_symbols('x = a + b\ny = c.d')
-        self.assertEqual(sorted(symbols), ['a', 'b', 'c.d'])
-
-    def test_remove_unreferenced_imports(self):
-        self.build_index()
-        start, end, newblock = \
-            self.importmagic.remove_unreferenced_imports(TEST_SOURCE)
-        self.assertEqual(start, 2)
-        self.assertEqual(end, 5)
-        self.assertEqual(newblock.strip(), 'import time')
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_jedibackend.py b/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_jedibackend.py
deleted file mode 100644
index 38aa45a..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_jedibackend.py
+++ /dev/null
@@ -1,265 +0,0 @@
-"""Tests for the elpy.jedibackend module."""
-
-import unittest
-
-import jedi
-import mock
-
-from elpy import jedibackend
-from elpy import rpc
-from elpy.tests import compat
-from elpy.tests.support import BackendTestCase
-from elpy.tests.support import RPCGetCompletionsTests
-from elpy.tests.support import RPCGetCompletionDocstringTests
-from elpy.tests.support import RPCGetCompletionLocationTests
-from elpy.tests.support import RPCGetDocstringTests
-from elpy.tests.support import RPCGetDefinitionTests
-from elpy.tests.support import RPCGetCalltipTests
-from elpy.tests.support import RPCGetUsagesTests
-
-
-class JediBackendTestCase(BackendTestCase):
-    def setUp(self):
-        super(JediBackendTestCase, self).setUp()
-        self.backend = jedibackend.JediBackend(self.project_root)
-
-
-class TestInit(JediBackendTestCase):
-    def test_should_have_jedi_as_name(self):
-        self.assertEqual(self.backend.name, "jedi")
-
-
-class TestRPCGetCompletions(RPCGetCompletionsTests,
-                            JediBackendTestCase):
-    pass
-
-
-class TestRPCGetCompletionDocstring(RPCGetCompletionDocstringTests,
-                                    JediBackendTestCase):
-    pass
-
-
-class TestRPCGetCompletionLocation(RPCGetCompletionLocationTests,
-                                   JediBackendTestCase):
-    pass
-
-
-class TestRPCGetDocstring(RPCGetDocstringTests,
-                          JediBackendTestCase):
-    THREAD_JOIN_DOCSTRING = 'join(self, timeout = None)'
-
-    def check_docstring(self, docstring):
-        lines = docstring.splitlines()
-        self.assertEqual(lines[0], 'Documentation for threading.Thread.join:')
-        self.assertEqual(lines[2], self.THREAD_JOIN_DOCSTRING)
-
-
-class TestRPCGetDefinition(RPCGetDefinitionTests,
-                           JediBackendTestCase):
-    @mock.patch("jedi.Script")
-    def test_should_not_fail_if_module_path_is_none(self, Script):
-        """Do not fail if loc.module_path is None.
-
-        This can happen under some circumstances I am unsure about.
-        See #537 for the issue that reported this.
-
-        """
-        locations = [
-            mock.Mock(module_path=None)
-        ]
-        script = Script.return_value
-        script.goto_definitions.return_value = locations
-        script.goto_assignments.return_value = locations
-
-        location = self.rpc("", "", 0)
-
-        self.assertIsNone(location)
-        
-
-class TestRPCGetCalltip(RPCGetCalltipTests,
-                        JediBackendTestCase):
-    KEYS_CALLTIP = {'index': 0,
-                    'params': [''],
-                    'name': u'keys'}
-    RADIX_CALLTIP = {'index': None,
-                     'params': [],
-                     'name': u'radix'}
-    ADD_CALLTIP = {'index': 0,
-                   'params': [u'a', u'b'],
-                   'name': u'add'}
-    if compat.PYTHON3:
-        THREAD_CALLTIP = {"name": "Thread",
-                          "params": ["group = None",
-                                     "target = None",
-                                     "name = None",
-                                     "args = ()",
-                                     "kwargs = None",
-                                     "daemon = None"],
-                          "index": 0}
-    else:
-        THREAD_CALLTIP = {"name": "Thread",
-                          "params": ["group = None",
-                                     "target = None",
-                                     "name = None",
-                                     "args = ()",
-                                     "kwargs = None",
-                                     "verbose = None"],
-                          "index": 0}
-
-
-class TestRPCGetUsages(RPCGetUsagesTests,
-                       JediBackendTestCase):
-    def test_should_not_fail_for_missing_module(self):
-        # This causes use.module_path to be None
-        source = "import sys\n\nsys.path.\n"  # insert()"
-        offset = 21
-        filename = self.project_file("project.py", source)
-
-        self.rpc(filename, source, offset)
-
-
-class TestPosToLinecol(unittest.TestCase):
-    def test_should_handle_beginning_of_string(self):
-        self.assertEqual(jedibackend.pos_to_linecol("foo", 0),
-                         (1, 0))
-
-    def test_should_handle_end_of_line(self):
-        self.assertEqual(jedibackend.pos_to_linecol("foo\nbar\nbaz\nqux", 9),
-                         (3, 1))
-
-    def test_should_handle_end_of_string(self):
-        self.assertEqual(jedibackend.pos_to_linecol("foo\nbar\nbaz\nqux", 14),
-                         (4, 2))
-
-
-class TestLinecolToPos(unittest.TestCase):
-    def test_should_handle_beginning_of_string(self):
-        self.assertEqual(jedibackend.linecol_to_pos("foo", 1, 0),
-                         0)
-
-    def test_should_handle_end_of_string(self):
-        self.assertEqual(jedibackend.linecol_to_pos("foo\nbar\nbaz\nqux",
-                                                    3, 1),
-                         9)
-
-    def test_should_return_offset(self):
-        self.assertEqual(jedibackend.linecol_to_pos("foo\nbar\nbaz\nqux",
-                                                    4, 2),
-                         14)
-
-    def test_should_fail_for_line_past_text(self):
-        self.assertRaises(ValueError,
-                          jedibackend.linecol_to_pos, "foo\n", 3, 1)
-
-    def test_should_fail_for_column_past_text(self):
-        self.assertRaises(ValueError,
-                          jedibackend.linecol_to_pos, "foo\n", 1, 10)
-
-
-class TestRunWithDebug(unittest.TestCase):
-    @mock.patch('jedi.Script')
-    def test_should_call_method(self, Script):
-        Script.return_value.test_method.return_value = "test-result"
-
-        result = jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
-
-        Script.assert_called_with(1, 2, arg=3)
-        self.assertEqual(result, 'test-result')
-
-    @mock.patch('jedi.Script')
-    def test_should_re_raise(self, Script):
-        Script.side_effect = RuntimeError
-
-        with self.assertRaises(RuntimeError):
-            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3,
-                                       re_raise=(RuntimeError,))
-
-    @mock.patch('jedi.Script')
-    @mock.patch('jedi.set_debug_function')
-    def test_should_keep_debug_info(self, set_debug_function, Script):
-        Script.side_effect = RuntimeError
-
-        try:
-            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
-        except rpc.Fault as e:
-            self.assertGreaterEqual(e.code, 400)
-            self.assertIsNotNone(e.data)
-            self.assertIn("traceback", e.data)
-            jedi_debug_info = e.data["jedi_debug_info"]
-            self.assertIsNotNone(jedi_debug_info)
-            self.assertEqual(jedi_debug_info["script_args"],
-                             "1, 2, arg=3")
-            self.assertEqual(jedi_debug_info["source"], None)
-            self.assertEqual(jedi_debug_info["method"], "test_method")
-            self.assertEqual(jedi_debug_info["debug_info"], [])
-        else:
-            self.fail("Fault not thrown")
-
-    @mock.patch('jedi.Script')
-    @mock.patch('jedi.set_debug_function')
-    def test_should_keep_error_text(self, set_debug_function, Script):
-        Script.side_effect = RuntimeError
-
-        try:
-            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
-        except rpc.Fault as e:
-            self.assertEqual(str(e), str(RuntimeError()))
-            self.assertEqual(e.message, str(RuntimeError()))
-        else:
-            self.fail("Fault not thrown")
-
-    @mock.patch('jedi.Script')
-    @mock.patch('jedi.set_debug_function')
-    def test_should_handle_source_special(self, set_debug_function, Script):
-        Script.side_effect = RuntimeError
-
-        try:
-            jedibackend.run_with_debug(jedi, 'test_method', source="foo")
-        except rpc.Fault as e:
-            self.assertEqual(e.data["jedi_debug_info"]["script_args"],
-                             "source=source")
-            self.assertEqual(e.data["jedi_debug_info"]["source"], "foo")
-        else:
-            self.fail("Fault not thrown")
-
-    @mock.patch('jedi.Script')
-    @mock.patch('jedi.set_debug_function')
-    def test_should_set_debug_info(self, set_debug_function, Script):
-        the_debug_function = [None]
-
-        def my_set_debug_function(debug_function, **kwargs):
-            the_debug_function[0] = debug_function
-
-        def my_script(*args, **kwargs):
-            the_debug_function[0](jedi.debug.NOTICE, "Notice")
-            the_debug_function[0](jedi.debug.WARNING, "Warning")
-            the_debug_function[0]("other", "Other")
-            raise RuntimeError
-
-        set_debug_function.side_effect = my_set_debug_function
-        Script.return_value.test_method = my_script
-
-        try:
-            jedibackend.run_with_debug(jedi, 'test_method', source="foo")
-        except rpc.Fault as e:
-            self.assertEqual(e.data["jedi_debug_info"]["debug_info"],
-                             ["[N] Notice",
-                              "[W] Warning",
-                              "[?] Other"])
-        else:
-            self.fail("Fault not thrown")
-
-    @mock.patch('jedi.set_debug_function')
-    @mock.patch('jedi.Script')
-    def test_should_not_fail_with_bad_data(self, Script, set_debug_function):
-        import jedi.debug
-
-        def set_debug(function, speed=True):
-            if function is not None:
-                function(jedi.debug.NOTICE, u"\xab")
-
-        set_debug_function.side_effect = set_debug
-        Script.return_value.test_method.side_effect = Exception
-
-        with self.assertRaises(rpc.Fault):
-            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_refactor.py b/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_refactor.py
deleted file mode 100644
index 6a4a2ac..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_refactor.py
+++ /dev/null
@@ -1,542 +0,0 @@
-import unittest
-import tempfile
-import shutil
-import os
-import mock
-
-from elpy import refactor
-from textwrap import dedent
-
-
-class RefactorTestCase(unittest.TestCase):
-    def setUp(self):
-        self.project_root = tempfile.mkdtemp(prefix="test-refactor-root")
-        self.addCleanup(shutil.rmtree, self.project_root,
-                        ignore_errors=True)
-
-    def create_file(self, name, contents=""):
-        filename = os.path.join(self.project_root, name)
-        contents = dedent(contents)
-        offset = contents.find("_|_")
-        if offset > -1:
-            contents = contents[:offset] + contents[offset + 3:]
-        with open(filename, "w") as f:
-            f.write(contents)
-        return filename, offset
-
-    def assertSourceEqual(self, first, second, msg=None):
-        """Fail if the two objects are unequal, ignoring indentation."""
-        self.assertEqual(dedent(first), dedent(second), msg=msg)
-
-
-class TestGetRefactorOptions(RefactorTestCase):
-    def test_should_only_return_importsmodule_if_not_on_symbol(self):
-        filename, offset = self.create_file("foo.py",
-                                            """\
-                                            import foo
-                                            _|_""")
-        ref = refactor.Refactor(self.project_root, filename)
-        options = ref.get_refactor_options(offset)
-        self.assertTrue(all(opt['category'] in ('Imports',
-                                                'Module')
-                            for opt in options))
-        filename, offset = self.create_file("foo.py",
-                                            """\
-                                            _|_
-                                            import foo""")
-        ref = refactor.Refactor(self.project_root, filename)
-        options = ref.get_refactor_options(offset)
-        self.assertTrue(all(opt['category'] in ('Imports',
-                                                'Module')
-                            for opt in options))
-
-    def test_should_return_all_if_on_symbol(self):
-        filename, offset = self.create_file("foo.py",
-                                            "import _|_foo")
-        ref = refactor.Refactor(self.project_root, filename)
-        options = ref.get_refactor_options(offset)
-        self.assertTrue(all(opt['category'] in ('Imports',
-                                                'Method',
-                                                'Module',
-                                                'Symbol')
-                            for opt in options))
-
-    def test_should_return_only_region_if_endoffset(self):
-        filename, offset = self.create_file("foo.py",
-                                            "import foo")
-        ref = refactor.Refactor(self.project_root, filename)
-        options = ref.get_refactor_options(offset, 5)
-        self.assertTrue(all(opt['category'] == 'Region'
-                            for opt in options))
-
-    @unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-    def test_should_treat_from_import_special(self):
-        filename, offset = self.create_file("foo.py",
-                                            """\
-                                            import foo
-                                            _|_""")
-        ref = refactor.Refactor(self.project_root, filename)
-        options = ref.get_refactor_options(offset)
-        self.assertFalse(any(opt['name'] == "refactor_froms_to_imports"
-                             for opt in options))
-        filename, offset = self.create_file("foo.py",
-                                            "imp_|_ort foo")
-        ref = refactor.Refactor(self.project_root, filename)
-        options = ref.get_refactor_options(offset)
-        self.assertTrue(any(opt['name'] == "refactor_froms_to_imports"
-                            for opt in options))
-
-
-class TestGetChanges(RefactorTestCase):
-    def test_should_fail_if_method_is_not_refactoring(self):
-        filename, offset = self.create_file("foo.py")
-        ref = refactor.Refactor(self.project_root, filename)
-        self.assertRaises(ValueError, ref.get_changes, "bad_name")
-
-    def test_should_return_method_results(self):
-        filename, offset = self.create_file("foo.py")
-        ref = refactor.Refactor(self.project_root, filename)
-        with mock.patch.object(ref, 'refactor_extract_method') as test:
-            test.return_value = "Meep!"
-            self.assertEqual(ref.get_changes("refactor_extract_method",
-                                             1, 2),
-                             "Meep!")
-            test.assert_called_with(1, 2)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestIsOnSymbol(RefactorTestCase):
-    def test_should_find_symbol(self):
-        filename, offset = self.create_file("test.py", "__B_|_AR = 100")
-        r = refactor.Refactor(self.project_root, filename)
-        self.assertTrue(r._is_on_symbol(offset))
-
-    # Issue #111
-    def test_should_find_symbol_with_underscores(self):
-        filename, offset = self.create_file("test.py", "_|___BAR = 100")
-        r = refactor.Refactor(self.project_root, filename)
-        self.assertTrue(r._is_on_symbol(offset))
-
-    def test_should_not_find_weird_places(self):
-        filename, offset = self.create_file("test.py", "hello = _|_ 1 + 1")
-        r = refactor.Refactor(self.project_root, filename)
-        self.assertFalse(r._is_on_symbol(offset))
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestFromsToImports(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            """\
-            _|_from datetime import datetime
-
-            d = datetime(2013, 4, 7)
-            """)
-        ref = refactor.Refactor(self.project_root, filename)
-        (change,) = ref.get_changes("refactor_froms_to_imports", offset)
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], filename)
-        self.assertSourceEqual(change['contents'],
-                               """\
-                               import datetime
-
-                               d = datetime.datetime(2013, 4, 7)
-                               """)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestOrganizeImports(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            """\
-            import unittest, base64
-            import datetime, json
-
-            obj = json.dumps(23)
-            unittest.TestCase()
-            """)
-        ref = refactor.Refactor(self.project_root, filename)
-        (change,) = ref.get_changes("refactor_organize_imports")
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], filename)
-        self.assertSourceEqual(change['contents'],
-                               """\
-                               import json
-                               import unittest
-
-
-                               obj = json.dumps(23)
-                               unittest.TestCase()
-                               """)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestModuleToPackage(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            "_|_import os\n")
-        ref = refactor.Refactor(self.project_root, filename)
-        changes = ref.refactor_module_to_package()
-        a, b, c = changes
-        # Not sure why the a change is there. It's a CHANGE that
-        # changes nothing...
-        self.assertEqual(a['diff'], '')
-
-        self.assertEqual(b['action'], 'create')
-        self.assertEqual(b['type'], 'directory')
-        self.assertEqual(b['path'], os.path.join(self.project_root, "foo"))
-
-        self.assertEqual(c['action'], 'move')
-        self.assertEqual(c['type'], 'file')
-        self.assertEqual(c['source'], os.path.join(self.project_root,
-                                                   "foo.py"))
-        self.assertEqual(c['destination'], os.path.join(self.project_root,
-                                                        "foo/__init__.py"))
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestRenameAtPoint(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            """\
-            class Foo(object):
-                def _|_foo(self):
-                    return 5
-
-                def bar(self):
-                    return self.foo()
-            """)
-        file2, offset2 = self.create_file(
-            "bar.py",
-            """\
-            import foo
-
-
-            x = foo.Foo()
-            x.foo()""")
-        ref = refactor.Refactor(self.project_root, filename)
-        first, second = ref.refactor_rename_at_point(offset, "frob",
-                                                     in_hierarchy=False,
-                                                     docs=False)
-        if first['file'] == filename:
-            a, b = first, second
-        else:
-            a, b = second, first
-        self.assertEqual(a['action'], 'change')
-        self.assertEqual(a['file'], filename)
-        self.assertSourceEqual(a['contents'],
-                               """\
-                               class Foo(object):
-                                   def frob(self):
-                                       return 5
-
-                                   def bar(self):
-                                       return self.frob()
-                               """)
-        self.assertEqual(b['action'], 'change')
-        self.assertEqual(b['file'], file2)
-        self.assertSourceEqual(b['contents'],
-                               """\
-                               import foo
-
-
-                               x = foo.Foo()
-                               x.frob()""")
-
-    def test_should_refactor_in_hierarchy(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            """\
-            class Foo(object):
-                def _|_foo(self):
-                    return 5
-
-                def bar(self):
-                    return self.foo()
-
-            class Bar(Foo):
-                def foo(self):
-                    return 42
-
-            class Baz(object):
-                def foo(self):
-                    return 42
-            """)
-        file2, offset2 = self.create_file(
-            "bar.py",
-            """\
-            import foo
-
-
-            x, y, z = foo.Foo(), foo.Bar(), foo.Baz()
-            x.foo()
-            y.foo()
-            z.foo()""")
-        ref = refactor.Refactor(self.project_root, filename)
-        first, second = ref.refactor_rename_at_point(offset, "frob",
-                                                     in_hierarchy=True,
-                                                     docs=False)
-        if first['file'] == filename:
-            a, b = first, second
-        else:
-            a, b = second, first
-        self.assertEqual(a['action'], 'change')
-        self.assertEqual(a['file'], filename)
-        self.assertSourceEqual(a['contents'],
-                               """\
-                               class Foo(object):
-                                   def frob(self):
-                                       return 5
-
-                                   def bar(self):
-                                       return self.frob()
-
-                               class Bar(Foo):
-                                   def frob(self):
-                                       return 42
-
-                               class Baz(object):
-                                   def foo(self):
-                                       return 42
-                               """)
-        self.assertEqual(b['action'], 'change')
-        self.assertEqual(b['file'], file2)
-        self.assertSourceEqual(b['contents'],
-                               """\
-                               import foo
-
-
-                               x, y, z = foo.Foo(), foo.Bar(), foo.Baz()
-                               x.frob()
-                               y.frob()
-                               z.foo()""")
-
-    def test_should_refactor_in_docstrings(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            """\
-            class Foo(object):
-                "Frobnicate the foo"
-                def _|_foo(self):
-                    return 5
-
-            print("I'm an unrelated foo")
-            """)
-        ref = refactor.Refactor(self.project_root, filename)
-        (change,) = ref.refactor_rename_at_point(offset, "frob",
-                                                 in_hierarchy=False,
-                                                 docs=True)
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], filename)
-        self.assertSourceEqual(change['contents'],
-                               """\
-                               class Foo(object):
-                                   "Frobnicate the frob"
-                                   def frob(self):
-                                       return 5
-
-                               print("I'm an unrelated foo")
-                               """)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestRenameCurrentModule(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            "_|_import os\n")
-        file2, offset = self.create_file(
-            "bar.py",
-            """\
-            _|_import foo
-            foo.os
-            """)
-        dest = os.path.join(self.project_root, "frob.py")
-        ref = refactor.Refactor(self.project_root, filename)
-        a, b = ref.refactor_rename_current_module("frob")
-
-        self.assertEqual(a['action'], 'change')
-        self.assertEqual(a['file'], file2)
-        self.assertEqual(a['contents'],
-                         "import frob\n"
-                         "frob.os\n")
-
-        self.assertEqual(b['action'], 'move')
-        self.assertEqual(b['type'], 'file')
-        self.assertEqual(b['source'], filename)
-        self.assertEqual(b['destination'], dest)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestMoveModule(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            "_|_import os\n")
-        file2, offset = self.create_file(
-            "bar.py",
-            """\
-            _|_import foo
-            foo.os
-            """)
-        dest = os.path.join(self.project_root, "frob")
-        os.mkdir(dest)
-        with open(os.path.join(dest, "__init__.py"), "w") as f:
-            f.write("")
-        ref = refactor.Refactor(self.project_root, filename)
-        a, b = ref.refactor_move_module(dest)
-
-        self.assertEqual(a['action'], 'change')
-        self.assertEqual(a['file'], file2)
-        self.assertSourceEqual(a['contents'],
-                               """\
-                               import frob.foo
-                               frob.foo.os
-                               """)
-
-        self.assertEqual(b['action'], 'move')
-        self.assertEqual(b['type'], 'file')
-        self.assertEqual(b['source'], filename)
-        self.assertEqual(b['destination'],
-                         os.path.join(dest, "foo.py"))
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestCreateInline(RefactorTestCase):
-    def setUp(self):
-        super(TestCreateInline, self).setUp()
-        self.filename, self.offset = self.create_file(
-            "foo.py",
-            """\
-            def add(a, b):
-                return a + b
-
-            x = _|_add(2, 3)
-            y = add(17, 4)
-            """)
-
-    def test_should_refactor_single_occurrenc(self):
-        ref = refactor.Refactor(self.project_root, self.filename)
-        (change,) = ref.refactor_create_inline(self.offset, True)
-
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], self.filename)
-        self.assertSourceEqual(change['contents'],
-                               """\
-                               def add(a, b):
-                                   return a + b
-
-                               x = 2 + 3
-                               y = add(17, 4)
-                               """)
-
-    def test_should_refactor_all_occurrencs(self):
-        ref = refactor.Refactor(self.project_root, self.filename)
-        (change,) = ref.refactor_create_inline(self.offset, False)
-
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], self.filename)
-        self.assertSourceEqual(change['contents'],
-                               """\
-                               x = 2 + 3
-                               y = 17 + 4
-                               """)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestExtractMethod(RefactorTestCase):
-    def setUp(self):
-        super(TestExtractMethod, self).setUp()
-        self.filename, self.offset = self.create_file(
-            "foo.py",
-            """\
-            class Foo(object):
-                def spaghetti(self, a, b):
-                    _|_x = a + 5
-                    y = b + 23
-                    return y
-            """)
-
-    def test_should_refactor_local(self):
-        ref = refactor.Refactor(self.project_root, self.filename)
-        (change,) = ref.refactor_extract_method(self.offset, 104,
-                                                "calc", False)
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], self.filename)
-        expected = """\
-                   class Foo(object):
-                       def spaghetti(self, a, b):
-                           return self.calc(a, b)
-
-                       def calc(self, a, b):
-                           x = a + 5
-                           y = b + 23
-                           return y
-                   """
-        expected2 = expected.replace("return self.calc(a, b)",
-                                     "return self.calc(b, a)")
-        expected2 = expected2.replace("def calc(self, a, b)",
-                                      "def calc(self, b, a)")
-        # This is silly, but it's what we got.
-        if change['contents'] == dedent(expected2):
-            self.assertSourceEqual(change['contents'], expected2)
-        else:
-            self.assertSourceEqual(change['contents'], expected)
-
-    def test_should_refactor_global(self):
-        ref = refactor.Refactor(self.project_root, self.filename)
-        (change,) = ref.refactor_extract_method(self.offset, 104,
-                                                "calc", True)
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], self.filename)
-        expected = """\
-                   class Foo(object):
-                       def spaghetti(self, a, b):
-                           return calc(a, b)
-
-                   def calc(a, b):
-                       x = a + 5
-                       y = b + 23
-                       return y
-                   """
-        expected2 = expected.replace("return calc(a, b)",
-                                     "return calc(b, a)")
-        expected2 = expected2.replace("def calc(a, b)",
-                                      "def calc(b, a)")
-        if change['contents'] == dedent(expected2):
-            self.assertSourceEqual(change['contents'], expected2)
-        else:
-            self.assertSourceEqual(change['contents'], expected)
-
-
-@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
-class TestUseFunction(RefactorTestCase):
-    def test_should_refactor(self):
-        filename, offset = self.create_file(
-            "foo.py",
-            """\
-            def _|_add_and_multiply(a, b, c):
-                temp = a + b
-                return temp * c
-
-            f = 1 + 2
-            g = f * 3
-            """)
-
-        ref = refactor.Refactor(self.project_root, filename)
-        (change,) = ref.refactor_use_function(offset)
-
-        self.assertEqual(change['action'], 'change')
-        self.assertEqual(change['file'], filename)
-        self.assertSourceEqual(change['contents'],
-                               """\
-                               def add_and_multiply(a, b, c):
-                                   temp = a + b
-                                   return temp * c
-
-                               g = add_and_multiply(1, 2, 3)
-                               """)
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_ropebackend.py b/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_ropebackend.py
deleted file mode 100644
index e51c9c1..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_ropebackend.py
+++ /dev/null
@@ -1,193 +0,0 @@
-"""Tests for elpy.ropebackend."""
-
-import os
-import shutil
-import tempfile
-
-import mock
-
-from elpy import ropebackend
-from elpy import rpc
-from elpy.tests import compat
-from elpy.tests.support import BackendTestCase
-from elpy.tests.support import RPCGetCompletionsTests
-from elpy.tests.support import RPCGetCompletionDocstringTests
-from elpy.tests.support import RPCGetCompletionLocationTests
-from elpy.tests.support import RPCGetDefinitionTests
-from elpy.tests.support import RPCGetCalltipTests
-from elpy.tests.support import RPCGetDocstringTests
-
-
-class RopeBackendTestCase(BackendTestCase):
-    def setUp(self):
-        super(RopeBackendTestCase, self).setUp()
-        self.backend = ropebackend.RopeBackend(self.project_root)
-
-
-class ShouldCallValidateTest(object):
-    def test_should_call_validate(self):
-        with mock.patch.object(self.backend, 'validate') as validate:
-            self.rpc(None, "", 0)
-
-            self.assertTrue(validate.called)
-
-
-class TestInit(RopeBackendTestCase):
-    def test_should_have_rope_as_name(self):
-        self.assertEqual(self.backend.name, "rope")
-
-    def test_should_patch_project_files(self):
-        self.project_file("foo.txt", "")
-        self.project_file("baddir/file.py", "")
-
-        self.backend.project.validate()
-
-        actual = [f.real_path for f in
-                  self.backend.project.file_list.get_files()]
-        self.assertEqual([os.path.join(self.project_root, "foo.txt")],
-                         actual)
-
-    def test_should_fail_for_inexisting_project_root(self):
-        with self.assertRaises(rpc.Fault):
-            ropebackend.RopeBackend("/does/not/exist/")
-
-
-class TestValidate(RopeBackendTestCase):
-    def test_should_call_validate_after_timeout(self):
-        with mock.patch("time.time") as t:
-            t.return_value = 10
-            self.backend.validate()
-            with mock.patch.object(self.backend, 'project') as project:
-                t.return_value = 10 + ropebackend.VALIDATE_EVERY_SECONDS + 1
-                self.backend.validate()
-
-                self.assertTrue(project.validate.called)
-
-    def test_should_not_call_validate_before_timeout(self):
-        with mock.patch("time.time") as t:
-            t.return_value = 10
-            self.backend.validate()
-            with mock.patch.object(self.backend, 'project') as project:
-                t.return_value = 10 + ropebackend.VALIDATE_EVERY_SECONDS - 1
-                self.backend.validate()
-
-                self.assertFalse(project.validate.called)
-
-    def test_should_not_fail_if_root_vanishes(self):
-        # Bug #353
-        tmpdir = tempfile.mkdtemp(prefix="elpy-test-validate-")
-        try:
-            backend = ropebackend.RopeBackend(tmpdir)
-        finally:
-            shutil.rmtree(tmpdir)
-        backend.validate()
-
-
-class TestRPCGetCompletions(RPCGetCompletionsTests,
-                            RopeBackendTestCase):
-    pass
-
-
-class TestRPCGetCompletionDocstring(RPCGetCompletionDocstringTests,
-                                    RopeBackendTestCase):
-    pass
-
-
-class TestRPCGetCompletionLocation(RPCGetCompletionLocationTests,
-                                   RopeBackendTestCase):
-    pass
-
-
-class TestRPCGetDefinition(RPCGetDefinitionTests,
-                           ShouldCallValidateTest,
-                           RopeBackendTestCase):
-    pass
-
-
-class TestRPCGetCalltip(RPCGetCalltipTests,
-                        ShouldCallValidateTest,
-                        RopeBackendTestCase):
-    ADD_CALLTIP = 'Add.add(a, b)'
-    RADIX_CALLTIP = "Decimal.radix()"
-    if compat.PYTHON3:
-        THREAD_CALLTIP = (
-            "threading.Thread(group=None, target=None, "
-            "name=None, args=(), kwargs=None, daemon=None, *)"
-        )
-        KEYS_CALLTIP = "builtins.keys()"
-    else:
-        THREAD_CALLTIP = (
-            "threading.Thread(group=None, target=None, "
-            "name=None, args=(), kwargs=None, verbose=None)"
-        )
-        KEYS_CALLTIP = "__builtin__.keys()"
-
-
-class TestRPCGetDocstring(RPCGetDocstringTests,
-                          ShouldCallValidateTest,
-                          RopeBackendTestCase):
-    THREAD_JOIN_DOCSTRING = 'Thread.join(self, timeout=None):'
-
-
-class TestGetPythonProjectFiles(RopeBackendTestCase):
-    def test(self):
-        self.project_file("foo.txt", "")
-        self.project_file("gooddir/__init__.py", "")
-        self.project_file("gooddir/file.py", "")
-        self.project_file("baddir/file.py", "")
-        expected = set(os.path.join(self.project_root, name)
-                       for name in ["foo.txt", "gooddir/__init__.py",
-                                    "gooddir/file.py"])
-        project = self.backend.project
-
-        actual = set(resource.real_path
-                     for resource
-                     in ropebackend.get_python_project_files(project))
-
-        self.assertEqual(expected, actual)
-
-
-class TestPatchProjectFiles(RopeBackendTestCase):
-    def test(self):
-        self.project_file("foo.txt", "")
-        self.project_file("gooddir/__init__.py", "")
-        self.project_file("gooddir/file.py", "")
-        self.project_file("baddir/file.py", "")
-        expected = set(os.path.join(self.project_root, name)
-                       for name in ["foo.txt", "gooddir/__init__.py",
-                                    "gooddir/file.py"])
-
-        actual = set(resource.real_path
-                     for resource
-                     in self.backend.project.get_files())
-        self.assertEqual(expected, actual)
-
-
-class TestCallRope(RopeBackendTestCase):
-    def test_should_return_value(self):
-        func = mock.MagicMock()
-        func.return_value = 23
-
-        actual = self.backend.call_rope(
-            func, "foo.py", "", 0
-        )
-
-        self.assertEqual(23, actual)
-
-    def test_should_raise_fault_with_data_on_exception(self):
-        func = mock.MagicMock()
-        func.side_effect = RuntimeError("Stuff!")
-        func.__module__ = "rope.test"
-        func.__name__ = "test_function"
-
-        try:
-            self.backend.call_rope(
-                func, "foo.py", "", 0
-            )
-        except rpc.Fault as e:
-            self.assertEqual(500, e.code)
-            self.assertEqual("Stuff!", e.message)
-            self.assertIn("traceback", e.data)
-            self.assertIn("rope_debug_info", e.data)
-            self.assertEqual("rope.test.test_function",
-                             e.data["rope_debug_info"]["function_name"])
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_server.py b/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_server.py
deleted file mode 100644
index ecc9c16..0000000
--- a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_server.py
+++ /dev/null
@@ -1,413 +0,0 @@
-# coding: utf-8
-
-"""Tests for the elpy.server module"""
-
-import os
-import tempfile
-import unittest
-
-import mock
-
-from elpy import rpc
-from elpy import server
-from elpy.tests import compat
-from elpy.tests.support import BackendTestCase
-import elpy.refactor
-
-
-class ServerTestCase(unittest.TestCase):
-    def setUp(self):
-        self.srv = server.ElpyRPCServer()
-
-
-class BackendCallTestCase(ServerTestCase):
-    def assert_calls_backend(self, method):
-        with mock.patch("elpy.server.get_source") as get_source:
-            with mock.patch.object(self.srv, "backend") as backend:
-                get_source.return_value = "transformed source"
-
-                getattr(self.srv, method)("filename", "source", "offset")
-
-                get_source.assert_called_with("source")
-                getattr(backend, method).assert_called_with(
-                    "filename", "transformed source", "offset"
-                )
-
-
-class TestInit(ServerTestCase):
-    def test_should_not_select_a_backend_by_default(self):
-        self.assertIsNone(self.srv.backend)
-
-
-class TestRPCEcho(ServerTestCase):
-    def test_should_return_arguments(self):
-        self.assertEqual(("hello", "world"),
-                         self.srv.rpc_echo("hello", "world"))
-
-
-class TestRPCInit(ServerTestCase):
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_set_project_root(self, RopeBackend, JediBackend):
-        self.srv.rpc_init({"project_root": "/project/root",
-                           "backend": "rope"})
-
-        self.assertEqual("/project/root", self.srv.project_root)
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_initialize_rope(self, RopeBackend, JediBackend):
-        self.srv.rpc_init({"project_root": "/project/root",
-                           "backend": "rope"})
-
-        RopeBackend.assert_called_with("/project/root")
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_initialize_jedi(self, RopeBackend, JediBackend):
-        self.srv.rpc_init({"project_root": "/project/root",
-                           "backend": "jedi"})
-
-        JediBackend.assert_called_with("/project/root")
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_use_rope_if_available_and_requested(
-            self, RopeBackend, JediBackend):
-        RopeBackend.return_value.name = "rope"
-        JediBackend.return_value.name = "jedi"
-
-        self.srv.rpc_init({"project_root": "/project/root",
-                           "backend": "rope"})
-
-        self.assertEqual("rope", self.srv.backend.name)
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_use_jedi_if_available_and_requested(
-            self, RopeBackend, JediBackend):
-        RopeBackend.return_value.name = "rope"
-        JediBackend.return_value.name = "jedi"
-
-        self.srv.rpc_init({"project_root": "/project/root",
-                           "backend": "jedi"})
-
-        self.assertEqual("jedi", self.srv.backend.name)
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_use_rope_if_available_and_nothing_requested(
-            self, RopeBackend, JediBackend):
-        RopeBackend.return_value.name = "rope"
-        JediBackend.return_value.name = "jedi"
-
-        self.srv.rpc_init({"project_root": "/project/root",
-                           "backend": None})
-
-        self.assertEqual("rope", self.srv.backend.name)
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_use_jedi_if_rope_not_available_and_nothing_requested(
-            self, RopeBackend, JediBackend):
-        RopeBackend.return_value.name = "rope"
-        JediBackend.return_value.name = "jedi"
-        old_rope = server.ropebackend
-        server.ropebackend = None
-
-        try:
-            self.srv.rpc_init({"project_root": "/project/root",
-                               "backend": None})
-        finally:
-            server.ropebackend = old_rope
-
-        self.assertEqual("jedi", self.srv.backend.name)
-
-    @mock.patch("elpy.jedibackend.JediBackend")
-    @mock.patch("elpy.ropebackend.RopeBackend")
-    def test_should_use_none_if_nothing_available(
-            self, RopeBackend, JediBackend):
-        RopeBackend.return_value.name = "rope"
-        JediBackend.return_value.name = "jedi"
-        old_rope = server.ropebackend
-        old_jedi = server.jedibackend
-        server.ropebackend = None
-        server.jedibackend = None
-
-        try:
-            self.srv.rpc_init({"project_root": "/project/root",
-                               "backend": None})
-        finally:
-            server.ropebackend = old_rope
-            server.jedibackend = old_jedi
-
-        self.assertIsNone(self.srv.backend)
-
-
-class TestRPCGetCalltip(BackendCallTestCase):
-    def test_should_call_backend(self):
-        self.assert_calls_backend("rpc_get_calltip")
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        self.assertIsNone(self.srv.rpc_get_calltip("filname", "source",
-                                                   "offset"))
-
-
-class TestRPCGetCompletions(BackendCallTestCase):
-    def test_should_call_backend(self):
-        self.assert_calls_backend("rpc_get_completions")
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        self.assertEqual([],
-                         self.srv.rpc_get_completions("filname", "source",
-                                                      "offset"))
-
-    def test_should_sort_results(self):
-        with mock.patch.object(self.srv, 'backend') as backend:
-            backend.rpc_get_completions.return_value = [
-                {'name': '_e'},
-                {'name': '__d'},
-                {'name': 'c'},
-                {'name': 'B'},
-                {'name': 'a'},
-            ]
-            expected = list(reversed(backend.rpc_get_completions.return_value))
-
-            actual = self.srv.rpc_get_completions("filename", "source",
-                                                  "offset")
-
-            self.assertEqual(expected, actual)
-
-    def test_should_uniquify_results(self):
-        with mock.patch.object(self.srv, 'backend') as backend:
-            backend.rpc_get_completions.return_value = [
-                {'name': 'a'},
-                {'name': 'a'},
-            ]
-            expected = [{'name': 'a'}]
-
-            actual = self.srv.rpc_get_completions("filename", "source",
-                                                  "offset")
-
-            self.assertEqual(expected, actual)
-
-
-class TestRPCGetCompletionDocs(ServerTestCase):
-    def test_should_call_backend(self):
-        with mock.patch.object(self.srv, "backend") as backend:
-            self.srv.rpc_get_completion_docstring("completion")
-
-            (backend.rpc_get_completion_docstring
-             .assert_called_with("completion"))
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        self.assertIsNone(self.srv.rpc_get_completion_docstring("foo"))
-
-
-class TestRPCGetCompletionLocation(ServerTestCase):
-    def test_should_call_backend(self):
-        with mock.patch.object(self.srv, "backend") as backend:
-            self.srv.rpc_get_completion_location("completion")
-
-            (backend.rpc_get_completion_location
-             .assert_called_with("completion"))
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        self.assertIsNone(self.srv.rpc_get_completion_location("foo"))
-
-
-class TestRPCGetDefinition(BackendCallTestCase):
-    def test_should_call_backend(self):
-        self.assert_calls_backend("rpc_get_definition")
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        self.assertIsNone(self.srv.rpc_get_definition("filname", "source",
-                                                      "offset"))
-
-
-class TestRPCGetDocstring(BackendCallTestCase):
-    def test_should_call_backend(self):
-        self.assert_calls_backend("rpc_get_docstring")
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        self.assertIsNone(self.srv.rpc_get_docstring("filname", "source",
-                                                     "offset"))
-
-
-class TestRPCGetPydocCompletions(ServerTestCase):
-    @mock.patch.object(server, 'get_pydoc_completions')
-    def test_should_call_pydoc_completions(self, get_pydoc_completions):
-        srv = server.ElpyRPCServer()
-        srv.rpc_get_pydoc_completions()
-        get_pydoc_completions.assert_called_with(None)
-        srv.rpc_get_pydoc_completions("foo")
-        get_pydoc_completions.assert_called_with("foo")
-
-
-class TestGetPydocDocumentation(ServerTestCase):
-    @mock.patch("pydoc.render_doc")
-    def test_should_find_documentation(self, render_doc):
-        render_doc.return_value = "expected"
-
-        actual = self.srv.rpc_get_pydoc_documentation("open")
-
-        render_doc.assert_called_with("open",
-                                      "Elpy Pydoc Documentation for %s",
-                                      False)
-        self.assertEqual("expected", actual)
-
-    def test_should_return_none_for_unknown_module(self):
-        actual = self.srv.rpc_get_pydoc_documentation("frob.open")
-
-        self.assertIsNone(actual)
-
-    def test_should_return_valid_unicode(self):
-        import json
-
-        docstring = self.srv.rpc_get_pydoc_documentation("tarfile")
-
-        json.dumps(docstring)
-
-
-class TestRPCGetRefactorOptions(BackendTestCase):
-    @mock.patch.object(compat.builtins, '__import__')
-    def test_should_fail_if_rope_is_not_available(self, import_):
-        import_.side_effect = ImportError
-        filename = self.project_file("foo.py", "")
-        srv = server.ElpyRPCServer()
-        self.assertRaises(ImportError, srv.rpc_get_refactor_options,
-                          filename, 0)
-
-    @mock.patch.object(elpy.refactor, 'Refactor')
-    def test_should_initialize_and_call_refactor_object(self, Refactor):
-        filename = self.project_file("foo.py", "import foo")
-        srv = server.ElpyRPCServer()
-        srv.project_root = self.project_root
-
-        srv.rpc_get_refactor_options(filename, 5)
-
-        Refactor.assert_called_with(self.project_root, filename)
-        Refactor.return_value.get_refactor_options.assert_called_with(5, None)
-
-
-class TestRPCRefactor(BackendTestCase):
-    @mock.patch.object(compat.builtins, '__import__')
-    def test_should_fail_if_rope_is_not_available(self, import_):
-        import_.side_effect = ImportError
-        filename = self.project_file("foo.py", "")
-        srv = server.ElpyRPCServer()
-        self.assertRaises(ImportError, srv.rpc_refactor,
-                          filename, 'foo', ())
-
-    @mock.patch.object(elpy.refactor, 'Refactor')
-    def test_should_initialize_and_call_refactor_object_with_args(
-            self, Refactor):
-        filename = self.project_file("foo.py", "import foo")
-        srv = server.ElpyRPCServer()
-        srv.project_root = self.project_root
-
-        srv.rpc_refactor(filename, 'foo', (1, 2, 3))
-
-        Refactor.assert_called_with(self.project_root, filename)
-        Refactor.return_value.get_changes.assert_called_with('foo', 1, 2, 3)
-
-    @mock.patch.object(elpy.refactor, 'Refactor')
-    def test_should_initialize_and_call_refactor_object_without_args(
-            self, Refactor):
-        filename = self.project_file("foo.py", "import foo")
-        srv = server.ElpyRPCServer()
-        srv.project_root = self.project_root
-
-        srv.rpc_refactor(filename, 'foo', None)
-
-        Refactor.assert_called_with(self.project_root, filename)
-        Refactor.return_value.get_changes.assert_called_with('foo')
-
-
-class TestRPCGetUsages(BackendCallTestCase):
-    def test_should_call_backend(self):
-        self.assert_calls_backend("rpc_get_usages")
-
-    def test_should_handle_no_backend(self):
-        self.srv.backend = None
-        with self.assertRaises(rpc.Fault):
-            self.assertIsNone(self.srv.rpc_get_usages("filname", "source",
-                                                      "offset"))
-
-
-class TestRPCImportMagic(ServerTestCase):
-    def test_should_call_importmagic(self):
-        with mock.patch.object(self.srv, "import_magic") as impmagic:
-            self.srv.rpc_get_import_symbols("filename", "source", "os")
-            impmagic.get_import_symbols.assert_called_with("os")
-            self.srv.rpc_add_import("filename", "source", "import os")
-            impmagic.add_import.assert_called_with("source", "import os")
-            self.srv.rpc_get_unresolved_symbols("filename", "source")
-            impmagic.get_unresolved_symbols.assert_called_with("source")
-            self.srv.rpc_remove_unreferenced_imports("filename", "source")
-            impmagic.remove_unreferenced_imports.assert_called_with("source")
-
-
-class TestGetSource(unittest.TestCase):
-    def test_should_return_string_by_default(self):
-        self.assertEqual(server.get_source("foo"),
-                         "foo")
-
-    def test_should_return_file_contents(self):
-        fd, filename = tempfile.mkstemp(prefix="elpy-test-")
-        self.addCleanup(os.remove, filename)
-        with open(filename, "w") as f:
-            f.write("file contents")
-
-        fileobj = {'filename': filename}
-
-        self.assertEqual(server.get_source(fileobj),
-                         "file contents")
-
-    def test_should_clean_up_tempfile(self):
-        fd, filename = tempfile.mkstemp(prefix="elpy-test-")
-        with open(filename, "w") as f:
-            f.write("file contents")
-
-        fileobj = {'filename': filename,
-                   'delete_after_use': True}
-
-        self.assertEqual(server.get_source(fileobj),
-                         "file contents")
-        self.assertFalse(os.path.exists(filename))
-
-    def test_should_support_utf8(self):
-        fd, filename = tempfile.mkstemp(prefix="elpy-test-")
-        self.addCleanup(os.remove, filename)
-        with open(filename, "wb") as f:
-            f.write(u"möp".encode("utf-8"))
-
-        source = server.get_source({'filename': filename})
-
-        self.assertEqual(source, u"möp")
-
-
-class TestPysymbolKey(BackendTestCase):
-    def keyLess(self, a, b):
-        self.assertLess(b, a)
-        self.assertLess(server._pysymbol_key(a),
-                        server._pysymbol_key(b))
-
-    def test_should_be_case_insensitive(self):
-        self.keyLess("bar", "Foo")
-
-    def test_should_sort_private_symbols_after_public_symbols(self):
-        self.keyLess("foo", "_bar")
-
-    def test_should_sort_private_symbols_after_dunder_symbols(self):
-        self.assertLess(server._pysymbol_key("__foo__"),
-                        server._pysymbol_key("_bar"))
-
-    def test_should_sort_dunder_symbols_after_public_symbols(self):
-        self.keyLess("bar", "__foo")
diff --git a/emacs.d/elpa/elpy-20151101.401/NEWS.rst b/emacs.d/elpa/elpy-20151101.401/NEWS.rst
new file mode 100644
index 0000000..91c2ff8
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/NEWS.rst
@@ -0,0 +1,437 @@
+New in Elpy 1.10.0
+==================
+
+- Marking the current indentation level at the top level will now mark
+  the whole buffer.
+- The region will be normalized before re-indenting it, making the
+  behavior more predictable for partially marked lines.
+- Using autopep8 on the whole buffer will now keep point (roughly) at
+  the same location as it was.
+- The autopep8 code now also uses the same configuration options as
+  the command line tool.
+- Malformed JSON data from the backend is now handled better.
+- RPC processes are restarted when the current virtualenv changes.
+- Python 3.5 is now officially supported.
+- Flymake will now not be enabled in buffers without file name, where
+  it can't run anyhow, or when the checker program does not exist in
+  the first place.
+- It is now possible to ask Elpy not to remove the mode line lighter
+  of company mode, which can be useful if you use company in other
+  modes.
+- Test discovery now also allows file names without "test" in them to
+  be tested. Classes and methods still require the substring, though.
+- Spurious equals signs at the end of completions from Jedi will now
+  be ignored.
+- Various other bug fixes.
+
+
+New in Elpy 1.9.0
+=================
+
+- Elpy now supports the ``autopep8`` library for automatically
+  formatting Python code. All refactoring-related code is now grouped
+  under ``C-c C-r``. Use ``C-c C-r i`` to fix up imports using
+  importmagic, ``C-c C-r p`` to fix up Python code with autopep8, and
+  ``C-c C-r r`` to bring up the old Rope refactoring menu.
+- ``C-c C-b`` will now select a region containing surrounding lines of
+  the current indentation or more.
+- ``C-c C-z`` in a Python shell will now switch back to the last
+  Python buffer, allowing to use the key to cycle back and forth
+  between the Python buffer and shell.
+- The pattern used for ``C-c C-s`` is now customizeable in
+  ``elpy-rgrep-file-pattern``.
+- ``<C-return>`` now can be used to send the current statement to the
+  Python shell. Be careful, this can break with nested statements.
+- The Elpy minor mode now also works in modes derived from
+  ``python-mode``, not just in the mode itself.
+
+
+New in Elpy 1.8.1
+=================
+
+- Ignore a ``KeyError`` from Jedi 0.9.0 which occurs a lot in normal
+  code.
+
+
+New in Elpy 1.8.0
+=================
+
+- Ignore a ``KeyError`` from Jedi 0.9.0 which occurs a lot in normal
+  code.
+
+
+New in Elpy 1.8.0
+=================
+
+- Emacs 24.5 is now officially supported
+- The new configuration option ``elpy-rpc-ignored-buffer-size`` defines a maximum buffer size to be handle completion in, to avoid laggy interaction in unusually large files
+- Indentation block movement was replaced with code that just moves the marked block or the current line; this should be a lot less magical and more predictable
+- Running the test at point now correctly ignores any inner methods
+- Jedi docstrings now show the full name of the object
+- The RPC interpreter is now chosen correctly on cygwin
+- ``elpy-shell-send-region-or-buffer`` now warns of tabs in the data being sent
+- Elpy now binds stdout and stderr to ``/dev/null`` to avoid being confused by spurious output from other libraries
+- RPC buffers (and processes) are removed after some time to avoid them piling up endlessly
+- It is not possibly anymore to use customize alone to use ipython, because of some bad interaction between custom options in Elpy and python.el
+- And lots of bugfixes (50 issues closed!)
+
+
+New in Elpy 1.7.1
+=================
+
+- Do not fail on errors from importmagic.
+- Handle new minor mode behavior of new versions of yasnippet.
+- Do use the argument to ``elpy-use-ipython`` correctly.
+- Handle unexpected data from the backend more gracefully.
+
+
+New in Elpy 1.7.0
+=================
+
+- Elpy now can add missing import directives automatically, by using
+  Alec Thomas' excellent importmagic_ library. Use ``C-c C-m`` to add
+  a single import statement, or ``C-c C-S-m`` to include all missing
+  import statements. Many thanks to Georg Brandl for doing a lot of
+  work to bring this feature to Elpy!
+- The Jedi backend now also supports ``C-c C-d`` to display a
+  docstring. Thanks again to Georg Brandl for the patch.
+- It is now possible to disable the display of the current function in
+  the echo area by setting ``elpy-eldoc-show-current-function`` to
+  ``nil``.
+- idomenu was removed.
+- Twisted's Trial test runner is now supported. Thanks to Elric Milon
+  for the patch!
+- All test runners now use a variable to decide which command to run,
+  which for example allows using ``manage.py`` for the Django test
+  runner, or your own test script which sets up the environment
+  correctly.
+- Emacs 24.4 is now officially supported.
+- Various bugfixes.
+
+.. _importmagic: https://github.com/alecthomas/importmagic
+
+New in Elpy 1.6.0
+=================
+
+- When point is on a line with a flymake error, Elpy will now show the
+  error in the echo area.
+- The movement commands (``C-<cursor>``) have been reworked again.
+  Going left and right will now move by indentation levels left of the
+  current indentation, i.e. jump four spaces, and by words right of
+  the current indentation. Going up and down will go to the previous
+  or next line with the indentation level point is at, not the
+  indentation the line has. Try it, it's more difficult to explain
+  than to use.
+- Completion results are now sorted more sensibly, with
+  single-underscore symbols at the end, and double-underscore symbols
+  after normal symbols, but before single-underscore ones.
+- ``M-x elpy-config`` will now point out if there are newer versions
+  available for packages used by Elpy.
+- ``M-x elpy-config`` will now warn if ``~/.local/bin`` is not in
+  ``PATH`` while there is no virtualenv active.
+- The ``M-x elpy-version`` command is back by popular demand.
+- RPC buffers used by Elpy are now hidden by default, having a space
+  at the beginning of the name.
+- When the Rope library throws an error, Elpy will now also attempt to
+  provide reproduction steps. This used to only happen for Jedi.
+- Various bug fixes.
+
+
+New in Elpy 1.5.1
+=================
+
+- Fix a bug where company-mode might get confused about the current
+  backend, leading to an error about ``Symbol's function definition is
+  void: nil``
+- Fix Rope so it won’t search the whole project directory. This was an
+  intended feature in v1.5 which did not work originally.
+- Use ``yas-text`` instead of ``text`` in snippets for compatibility
+  with the unreleased yasnippet from MELPA (thanks to Daniel Wu!)
+
+New in Elpy 1.5.0
+=================
+
+- Elpy now has a `manual`_. Additionally, there's a menu bar now which
+  should make it easier to discover Elpy features.
+- The Elpy Python package now ships with the Emacs Lisp package,
+  removing the need to install Elpy via pip.
+- Python 3.4 is now officially supported.
+- The new command ``elpy-config`` can be used to configure Elpy using
+  Emacs' built-in customize system. Elpy has been changed to make the
+  most of this.
+- Elpy now uses company-mode instead of auto-complete for on-the-fly
+  auto completion. This changes a few things. There is no automatic
+  documentation popup anymore. Instead, you can type ``C-d`` and get
+  the documentation buffer. In addition, you can type ``C-w`` to see
+  the source of the current candidate in context.
+- Elpy now uses pyvenv as the virtualenv module, enabling
+  virtualenvwrapper hooks.
+- We now ship with a large number of YASnippet snippets. Try ``M-x
+  yas-insert-snippet``.
+- The new unified test running interface on ``C-c C-t`` will try to
+  determine the current test and run it, or, failing that, run all
+  tests. Provide a prefix argument to just run all tests no matter
+  what. You can change the test runner to be used using
+  ``elpy-set-test-runner``. Elpy supports the default unittest
+  discover runner, the Django discover runner, nosetests and py.test
+  by default. New test runners can easily be defined.
+- There's a new multi-edit functionality. ``C-c C-e`` will edit all
+  occurrences of the symbol under point. When using Jedi, this is
+  using semantic information as opposed to just syntactic one. When a
+  region is active, edit all occurrences of the text in region in the
+  current buffer.
+- When sending Python code to the interactive interpreter using ``C-c
+  C-c``, Elpy will now not automatically pop to the interpreter
+  anymore. Use ``C-c C-z`` to switch to the interpreter.
+- Elpy will now display the current class and function if there is no
+  call tip to be displayed. Removes the ``C-c C-q`` binding.
+- If there is a call tip, highlight the current argument (requires Jedi).
+- The documentation interface using ``C-c C-d`` is much smarter now,
+  falling back to pydoc when necessary and providing sensible
+  completion for that, too. Provide a prefix argument if you want no
+  smarts, just pydoc.
+- ``<S-return>`` and ``<C-S-return>`` now open a line below or above
+  the current one.
+- ``<C-cursor>`` will now navigate between Python blocks of the same
+  indentation level. ``<M-cursor>`` will move the current block. Try
+  it, it's easier to understand when you see it than to explain it.
+- There's a new concept of modules. The variable
+  ``elpy-default-minor-modes`` is gone (use ``elpy-mode-hook`` for
+  minor modes). Instead, there's now ``elpy-modules`` which can be
+  used to enable or disable certain features of Elpy.
+- ``elpy-clean-modeline`` is gone, modules now clean themselves up.
+- Elpy now distinguishes between the project root, where project files
+  are located, and the library root, which should be part of
+  ``sys.path`` to import the module under development.
+- ``elpy-project-ignored-directories`` replaces the old
+  ``elpy-rgrep-ignored-directories`` and is used by more features.
+- ``elpy-doc-websearch`` has been removed as it was barely useable
+  as is.
+- Elpy now tries to be more helpful when errors in the backend happen.
+  This removes ``elpy-rpc-traceback``, as that will be displayed by
+  default.
+- Optimizations were added to handle large files, making general
+  interaction a lot faster.
+- When Rope is being used, do not search through unusually large
+  directories. This should speed up interaction in those cases,
+  especially when editing a file in the home directory.
+- And a whole lot of minor bug fixes and little improvements.
+
+.. _manual: http://elpy.readthedocs.org/
+
+
+New in Elpy 1.4.2
+==================
+
+- Minor bugfix to prevent an error from projectile-project-root to
+  interfere with Elpy’s project finding strategy.
+
+New in Elpy 1.4.1
+=================
+
+- Elpy now sets project-wide preferences for Rope, enabling completion
+  in the sys package, among others.
+- An error is avoided in the Jedi backend when trying to go to symbols
+  in compiled packages.
+- A compatibility alias was added for nose.el, which insists on
+  breaking backwards compatibility with Emacs 24.x.
+
+New in Elpy 1.4.0
+=================
+
+- Elpy has moved to its own ELPA. Make sure to update your
+  package-archives (as described above).
+- For a file in a Projectile-managed project is opened, Elpy will now
+  use Projectile’s project root.
+- When the user has set a valid python-check-command, elpy will now
+  refrain from overriding it.
+- On Windows, elpy is now using the pythonw.exe interpreter for the
+  RPC process, as that seems to be causing fewer issues.
+- And various smaller bugfixes.
+
+New in Elpy 1.3.0
+=================
+
+- virtualenv.el has been replaced by pyvenv.el, as that library offers
+  more features.
+- elpy-rpc-restart now works globally, not just in Elpy buffers.
+- Elpy does not try to complete in comments anymore.
+- The new command elpy-rpc-traceback gives access to the last stack
+  trace in the Elpy backend, helping with debugging problems.
+- The flymake check function is now run with the current directory as
+  / to avoid accidental imports.
+- Ensure correct handling of yas-snippet-dirs by Elpy. This variable
+  can be a string, so ensure it’s a list before adding to it.
+- The new variable elpy-show-installation-instructions can be used to
+  disable the installation screen.
+- Fix a very nasty bug causing spurious empty lines in a buffer or
+  consume 100% CPU in certain situations when using the Jedi backend.
+  Thanks to Matthias Dahl for finding this bug.
+- Various other bugfixes.
+
+New in Elpy 1.2.1
+=================
+
+Bugfix release.
+
+- The refactoring was not ported to the new asynchronous API,
+  resulting in an error when refactoring was attempted.
+- The project root now always returns a directory. Too many parts of
+  elpy relies on this. If the project root turns out to be your home
+  directory, elpy will warn you about it.
+- Elpy now works correctly with Emacs 24.2. There were some
+  compatibility functions missing.
+- Blocking RPC calls now do not block for one second even if there is
+  process output.
+
+New in Elpy 1.2
+===============
+
+- Elpy now uses asynchronous RPC. This means that Emacs should not
+  freeze anymore while eldoc or auto-complete functions run.
+- ``elpy-shell-send-region-or-buffer`` will now remove common
+  indentation of the region, making it possible to easily send parts
+  of an if statement or function body without manually adjusting the
+  indentation.
+- The Python package depends on ``flake8``, and will also try to be
+  smarter when detecting ``flake8`` for on-the-fly checking.
+- ``elpy-check`` can be run with a prefix argument to check the whole
+  project, instead of only the current file.
+- ``elpy-rgrep-symbol`` now ignores a few common directories
+  (``.tox``, ``build``, ``dist``).
+- When using the rope backend, Elpy will not create the
+  ``.ropeproject`` folders anymore. This should keep projects a lot
+  cleaner.
+
+New in Elpy 1.1
+===============
+
+- Elpy now always uses the root directory of the package as the
+  project root; this should avoid some confusion and improve
+  auto-completion suggestions
+- ``elpy-shell-send-region-or-buffer`` now accepts a prefix argument
+  to run code wrapped behind ``if __name__ == '__main__'``, which is
+  ignored by default
+- ``elpy-project-root`` is now a safe local variable and can be set
+  from file variables
+- Elpy now supports project-specific RPC processes, see
+  ``elpy-rpc-project-specific`` for how to use this
+- ``M-*`` now works to go back where you came from after a ``M-.``
+- Elpy now ships with a few dedicated snippets for YASnippet
+- Support and require Jedi 0.6.0
+
+New in Elpy 1.0
+===============
+
+- Version 0.9 was a release candidate, so this release focused on bug
+  fixes instead of new features.
+- ``elpy-enable`` now takes an optional argument that skips variable
+  initialization for those users who prefer their own defaults for
+  other modes.
+- ``python-check.sh`` has been removed from Elpy, as the flake8 tool
+  from pypi does everything it does, only better.
+- Elpy will now start the helper subprocess in the root directory,
+  avoiding accidental Python path clobbering.
+
+New in Elpy 0.9
+===============
+
+- Elpy now officially support Python 2.6, 2.7 and 3.3 on Emacs 24.2
+  and 24.3, with continuous integration tests thanks to
+  `Travis CI`_.
+- Extended support for Pydoc. ``C-u C-c C-d`` will now prompt for an
+  auto-completed symbol to run Pydoc on. The pydoc output will be
+  formatted and placed in a help buffer for easy review.
+- Refactoring support is back. ``C-c C-r`` will pop up a refactoring
+  wizard offering various refactoring options. Most of them depend on
+  the presence of Rope, though, even if Jedi is used as a completion
+  backend.
+- The Rope backend has been extended to provide completions for
+  modules in an import clause.
+- New refactoring option: Add missing imports. This will search for
+  undefined symbols in the current file and automatically add
+  appropriate imports.
+- ``C-c C-c (elpy-rgrep-symbol)`` now prompts for a regexp when a prefix
+  argument is given instead of using the symbol at point.
+
+.. _Travis CI: https://travis-ci.org/
+
+New in Elpy 0.8
+===============
+
+Python Backend Rewrite
+----------------------
+
+- Elpy does not use Pymacs, Ropemacs and Ropemode anymore, but instead
+  provides its own Python interface with the elpy package on PyPI.
+- This not only should improve performance, but also enables using
+  Jedi as an alternative backend for completion. Use ``M-x
+  elpy-set-backend`` to change between rope and jedi. For now, this
+  does disable all refactoring support, though.
+
+Project Support
+---------------
+
+- Elpy now has built-in project support. The interface is rather
+  simple: You can set ``elpy-project-root`` to the correct value in
+  ``.dir-locals.el``, or just rely on the automatic detection. If you
+  change your mind, you can always just ``elpy-set-project-root``.
+- New dependency: Find File in Project (ffip), bound to ``C-c C-f`` by
+  default. This will allow you to find files anywhere in your project
+  using a search-as-you-type interface like ido.
+- New dependency: nose, bound to ``C-c C-t`` by default. This will run
+  the nosetests binary in the root of your current library directory.
+  You can restrict the tests being run to the current test or the
+  current module by adding prefix arguments.
+- New function: Recursive grep for symbol, bound to ``C-c C-s`` by
+  default. This will search for the symbol at point in the whole
+  project.
+
+New dependencies
+----------------
+
+- idomenu, bound to ``C-c C-j`` by default. This replaces the standard
+  imenu interface with an ido-based search-as-you-type interface for
+  definitions in the current buffer.
+- virtualenv.el, replacing pyvirtualenv.el). Use ``M-x
+  virtualenv-workon`` to enable a virtualenv.
+- iedit.el, bound to ``M-,`` by default. This highlights all occurrences
+  of the symbol at point or the active region in the current buffer or
+  narrowing. When you edit any of them, all others will be edited the
+  same. This allows some basic and very quick refactoring.
+- New variable ``elpy-default-minor-modes`` which is run by ``elpy-mode``
+  on startup. If you don’t want to use some modes, remove them from
+  here.
+
+Key Bindings and Functions
+--------------------------
+
+- The key bindings have been reworked and cleaned up. Sorry, this
+  might cause confusion.
+- Yasnippet is now on its own keybinding, ``C-c C-i``, instead of
+  sharing the auto-complete interface. This was done because some
+  snippets conflicted with legitimate, unsnippy completions.
+- New function: Occur Definitions, bound to ``C-c C-o`` by default. This
+  will run the standard occur command to show definitions (classes and
+  functions) in your current buffer, giving you a very quick outline
+  and the ability to jump to different definitions quickly.
+- New function: Show Defun, bound to ``C-c C-q`` by default. This will
+  show the current method and possibly class in the mode line, which
+  is helpful in long functions.
+- New functions: Forward/backward definition, bound to ``M-n`` and ``M-p``
+  as well as ``<M-down>`` and ``<M-up>`` by default. These will jump to
+  the next or previous definition (class or function), helping with
+  quick navigation through a file.
+
+Miscellaneous
+-------------
+
+- The documentation function (``C-c C-d``) now uses pydoc when a prefix
+  arg is given.
+- The web search function (``C-c C-w``) now searches for the current
+  symbol by default. The tab-completing web documentation interface
+  was removed and is scheduled to be replaced with a new pydoc
+  interface in future versions.
+- The ``python-check.sh`` is now shipped with elpy. If you load elpy.el
+  before you load python.el, it should be the default
+  ``python-check-command``.
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy-autoloads.el b/emacs.d/elpa/elpy-20151101.401/elpy-autoloads.el
new file mode 100644
index 0000000..36a67ae
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy-autoloads.el
@@ -0,0 +1,51 @@
+;;; elpy-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "elpy" "elpy.el" (22171 46576 0 0))
+;;; Generated autoloads from elpy.el
+
+(autoload 'elpy-enable "elpy" "\
+Enable Elpy in all future Python buffers.
+
+\(fn &optional IGNORED)" t nil)
+
+(autoload 'elpy-mode "elpy" "\
+Minor mode in Python buffers for the Emacs Lisp Python Environment.
+
+This mode fully supports virtualenvs. Once you switch a
+virtualenv using \\[pyvenv-workon], you can use
+\\[elpy-rpc-restart] to make the elpy Python process use your
+virtualenv.
+
+\\{elpy-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'elpy-config "elpy" "\
+Configure Elpy.
+
+This function will pop up a configuration buffer, which is mostly
+a customize buffer, but has some more options.
+
+\(fn)" t nil)
+
+(autoload 'elpy-version "elpy" "\
+Display the version of Elpy.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("elpy-pkg.el" "elpy-refactor.el") (22171
+;;;;;;  46576 608536 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; elpy-autoloads.el ends here
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy-pkg.el b/emacs.d/elpa/elpy-20151101.401/elpy-pkg.el
new file mode 100644
index 0000000..bf915db
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy-pkg.el
@@ -0,0 +1,9 @@
+(define-package "elpy" "20151101.401" "Emacs Python Development Environment"
+  '((company "0.8.2")
+    (find-file-in-project "3.3")
+    (highlight-indentation "0.5.0")
+    (pyvenv "1.3")
+    (yasnippet "0.8.0")))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy-refactor.el b/emacs.d/elpa/elpy-20151101.401/elpy-refactor.el
new file mode 100644
index 0000000..d031569
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy-refactor.el
@@ -0,0 +1,297 @@
+;;; elpy-refactor.el --- Refactoring mode for Elpy
+
+;; Copyright (C) 2013  Jorgen Schaefer
+
+;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
+;; URL: https://github.com/jorgenschaefer/elpy
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file provides an interface, including a major mode, to use
+;; refactoring options provided by the Rope library.
+
+;;; Code:
+
+;; We require elpy, but elpy loads us, so we shouldn't load it back.
+;; (require 'elpy)
+
+(defvar elpy-refactor-changes nil
+  "Changes that will be commited on \\[elpy-refactor-commit].")
+(make-variable-buffer-local 'elpy-refactor-current-changes)
+
+(defvar elpy-refactor-window-configuration nil
+  "The old window configuration. Will be restored after commit.")
+(make-variable-buffer-local 'elpy-refactor-window-configuration)
+
+(make-obsolete
+ 'elpy-refactor
+ "Refactoring has been unstable and flakey, support will be dropped in the future."
+ "elpy 1.5.0")
+(defun elpy-refactor ()
+  "Run the Elpy refactoring interface for Python code."
+  (interactive)
+  (save-some-buffers)
+  (let* ((selection (elpy-refactor-select
+                     (elpy-refactor-rpc-get-options)))
+         (method (car selection))
+         (args (cdr selection)))
+    (when method
+      (elpy-refactor-create-change-buffer
+       (elpy-refactor-rpc-get-changes method args)))))
+
+(defun elpy-refactor-select (options)
+  "Show the user the refactoring options and let her choose one.
+
+Depending on the chosen option, ask the user for further
+arguments and build the argument.
+
+Return a cons cell of the name of the option and the arg list
+created."
+  (let ((buf (get-buffer-create "*Elpy Refactor*"))
+        (pos (vector (1- (point))
+                     (ignore-errors
+                       (1- (region-beginning)))
+                     (ignore-errors
+                       (1- (region-end)))))
+        (inhibit-read-only t)
+        (options (sort options
+                       (lambda (a b)
+                         (let ((cata (cdr (assq 'category a)))
+                               (catb (cdr (assq 'category b))))
+                           (if (equal cata catb)
+                               (string< (cdr (assq 'description a))
+                                        (cdr (assq 'description b)))
+                             (string< cata catb))))))
+        (key ?a)
+        last-category
+        option-alist)
+    (with-current-buffer buf
+      (erase-buffer)
+      (dolist (option options)
+        (let ((category (cdr (assq 'category option)))
+              (description (cdr (assq 'description option)))
+              (name (cdr (assq 'name option)))
+              (args (cdr (assq 'args option))))
+          (when (not (equal category last-category))
+            (when last-category
+              (insert "\n"))
+            (insert (propertize category 'face 'bold) "\n")
+            (setq last-category category))
+          (insert " (" key ") " description "\n")
+          (setq option-alist (cons (list key name args)
+                                   option-alist))
+          (setq key (1+ key))))
+      (let ((window-conf (current-window-configuration)))
+        (unwind-protect
+            (progn
+              (with-selected-window (display-buffer buf)
+                (goto-char (point-min)))
+              (fit-window-to-buffer (get-buffer-window buf))
+              (let* ((key (read-key "Refactoring action? "))
+                     (entry (cdr (assoc key option-alist))))
+                (kill-buffer buf)
+                (cons (car entry)       ; name
+                      (elpy-refactor-build-arguments (cadr entry)
+                                                     pos))))
+          (set-window-configuration window-conf))))))
+
+(defun elpy-refactor-build-arguments (args pos)
+  "Translate an argument list specification to an argument list.
+
+POS is a vector of three elements, the current offset, the offset
+of the beginning of the region, and the offset of the end of the
+region.
+
+ARGS is a list of triples, each triple containing the name of an
+argument (ignored), the type of the argument, and a possible
+prompt string.
+
+Available types:
+
+  offset       - The offset in the buffer, (1- (point))
+  start_offset - Offset of the beginning of the region
+  end_offset   - Offset of the end of the region
+  string       - A free-form string
+  filename     - A non-existing file name
+  directory    - An existing directory name
+  boolean      - A boolean question"
+  (mapcar (lambda (arg)
+            (let ((type (cadr arg))
+                  (prompt (caddr arg)))
+              (cond
+               ((equal type "offset")
+                (aref pos 0))
+               ((equal type "start_offset")
+                (aref pos 1))
+               ((equal type "end_offset")
+                (aref pos 2))
+               ((equal type "string")
+                (read-from-minibuffer prompt))
+               ((equal type "filename")
+                (expand-file-name
+                 (read-file-name prompt)))
+               ((equal type "directory")
+                (expand-file-name
+                 (read-directory-name prompt)))
+               ((equal type "boolean")
+                (y-or-n-p prompt)))))
+          args))
+
+(defun elpy-refactor-create-change-buffer (changes)
+  "Show the user a buffer of changes.
+
+The user can review the changes and confirm them with
+\\[elpy-refactor-commit]."
+  (when (not changes)
+    (error "No changes for this refactoring action."))
+  (with-current-buffer (get-buffer-create "*Elpy Refactor*")
+    (elpy-refactor-mode)
+    (setq elpy-refactor-changes changes
+          elpy-refactor-window-configuration (current-window-configuration))
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (elpy-refactor-insert-changes changes))
+    (select-window (display-buffer (current-buffer)))
+    (goto-char (point-min))))
+
+(defun elpy-refactor-insert-changes (changes)
+  "Format and display the changes described in CHANGES."
+  (insert (propertize "Use C-c C-c to apply the following changes."
+                      'face 'bold)
+          "\n\n")
+  (dolist (change changes)
+    (let ((action (cdr (assq 'action change))))
+      (cond
+       ((equal action "change")
+        (insert (cdr (assq 'diff change))
+                "\n"))
+       ((equal action "create")
+        (let ((type (cdr (assq 'type change))))
+          (if (equal type "file")
+              (insert "+++ " (cdr (assq 'file change)) "\n"
+                      "Create file " (cdr (assq 'file change)) "\n"
+                      "\n")
+            (insert "+++ " (cdr (assq 'path change)) "\n"
+                    "Create directory " (cdr (assq 'path change)) "\n"
+                    "\n"))))
+       ((equal action "move")
+        (insert "--- " (cdr (assq 'source change)) "\n"
+                "+++ " (cdr (assq 'destination change)) "\n"
+                "Rename " (cdr (assq 'type change)) "\n"
+                "\n"))
+       ((equal action "delete")
+        (let ((type (cdr (assq 'type change))))
+          (if (equal type "file")
+              (insert "--- " (cdr (assq 'file change)) "\n"
+                      "Delete file " (cdr (assq 'file change)) "\n"
+                      "\n")
+            (insert "--- " (cdr (assq 'path change)) "\n"
+                    "Delete directory " (cdr (assq 'path change)) "\n"
+                    "\n"))))))))
+
+(defvar elpy-refactor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-c") 'elpy-refactor-commit)
+    (define-key map (kbd "q") 'bury-buffer)
+    (define-key map (kbd "h") 'describe-mode)
+    (define-key map (kbd "?") 'describe-mode)
+    map)
+  "The key map for `elpy-refactor-mode'.")
+
+(define-derived-mode elpy-refactor-mode diff-mode "Elpy Refactor"
+  "Mode to display refactoring actions and ask confirmation from the user.
+
+\\{elpy-refactor-mode-map}"
+  :group 'elpy
+  (view-mode 1))
+
+(defun elpy-refactor-commit ()
+  "Commit the changes in the current buffer."
+  (interactive)
+  (when (not elpy-refactor-changes)
+    (error "No changes to commit."))
+  ;; Restore the window configuration as the first thing so that
+  ;; changes below are visible to the user. Especially the point
+  ;; change in possible buffer changes.
+  (set-window-configuration elpy-refactor-window-configuration)
+  (dolist (change elpy-refactor-changes)
+    (let ((action (cdr (assq 'action change))))
+      (cond
+       ((equal action "change")
+        (with-current-buffer (find-file-noselect (cdr (assq 'file change)))
+          ;; This would break for save-excursion as the buffer is
+          ;; truncated, so all markets now point to position 1.
+          (let ((old-point (point)))
+            (undo-boundary)
+            (erase-buffer)
+            (insert (cdr (assq 'contents change)))
+            (undo-boundary)
+            (goto-char old-point))))
+       ((equal action "create")
+        (if (equal (cdr (assq 'type change))
+                   "file")
+            (find-file-noselect (cdr (assq 'file change)))
+          (make-directory (cdr (assq 'path change)))))
+       ((equal action "move")
+        (let* ((source (cdr (assq 'source change)))
+               (dest (cdr (assq 'destination change)))
+               (buf (get-file-buffer source)))
+          (when buf
+            (with-current-buffer buf
+              (setq buffer-file-name dest)
+              (rename-buffer (file-name-nondirectory dest) t)))
+          (rename-file source dest)))
+       ((equal action "delete")
+        (if (equal (cdr (assq 'type change)) "file")
+            (let ((name (cdr (assq 'file change))))
+              (when (y-or-n-p (format "Really delete %s? " name))
+                (delete-file name t)))
+          (let ((name (cdr (assq 'directory change))))
+            (when (y-or-n-p (format "Really delete %s? " name))
+              (delete-directory name nil t))))))))
+  (kill-buffer (current-buffer)))
+
+(defun elpy-refactor-rpc-get-options ()
+  "Get a list of refactoring options from the Elpy RPC."
+  (if (use-region-p)
+      (elpy-rpc "get_refactor_options"
+                (list (buffer-file-name)
+                      (1- (region-beginning))
+                      (1- (region-end))))
+    (elpy-rpc "get_refactor_options"
+              (list (buffer-file-name)
+                    (1- (point))))))
+
+(defun elpy-refactor-rpc-get-changes (method args)
+  "Get a list of changes from the Elpy RPC after applying METHOD with ARGS."
+  (elpy-rpc "refactor"
+            (list (buffer-file-name)
+                  method args)))
+
+(defun elpy-refactor-options (option)
+  "Show available refactor options and let user choose one."
+  (interactive "c[i]: importmagic-fixup [p]: autopep8-fix-code [r]: refactor")
+  (let ((choice (char-to-string option)))
+    (cond
+     ((string-equal choice "i")
+      (elpy-importmagic-fixup))
+     ((string-equal choice "p")
+      (elpy-autopep8-fix-code))
+     ((string-equal choice "r")
+      (elpy-refactor)))))
+
+(provide 'elpy-refactor)
+;;; elpy-refactor.el ends here
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy.el b/emacs.d/elpa/elpy-20151101.401/elpy.el
new file mode 100644
index 0000000..26d36cf
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy.el
@@ -0,0 +1,3603 @@
+;;; elpy.el --- Emacs Python Development Environment -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012-2014  Jorgen Schaefer
+
+;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
+;; URL: https://github.com/jorgenschaefer/elpy
+;; Version: 1.10.0
+;; Keywords: Python, IDE, Languages, Tools
+;; Package-Requires: ((company "0.8.2") (find-file-in-project "3.3")  (highlight-indentation "0.5.0") (pyvenv "1.3") (yasnippet "0.8.0"))
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; The Emacs Lisp Python Environment in Emacs
+
+;; Elpy is an Emacs package to bring powerful Python editing to Emacs.
+;; It combines a number of existing Emacs packages, both written in
+;; Emacs Lisp as well as Python.
+
+;; For more information, read the Elpy manual:
+
+;; http://elpy.readthedocs.org/en/latest/index.html
+
+;;; Code:
+
+(require 'cus-edit)
+(require 'etags)
+(require 'files-x)
+(require 'grep)
+(require 'ido)
+(require 'json)
+(require 'python)
+
+(require 'elpy-refactor)
+(require 'pyvenv)
+
+(defconst elpy-version "1.10.0"
+  "The version of the Elpy lisp code.")
+
+;;;;;;;;;;;;;;;;;;;;;;
+;;; User customization
+
+(defgroup elpy nil
+  "The Emacs Lisp Python Environment."
+  :prefix "elpy-"
+  :group 'languages)
+
+(defcustom elpy-mode-hook nil
+  "Hook run when `elpy-mode' is enabled.
+
+This can be used to enable minor modes for Python development."
+  :type 'hook
+  :options '(subword-mode hl-line-mode)
+  :group 'elpy)
+
+(defcustom elpy-modules '(elpy-module-sane-defaults
+                          elpy-module-company
+                          elpy-module-eldoc
+                          elpy-module-flymake
+                          elpy-module-highlight-indentation
+                          elpy-module-pyvenv
+                          elpy-module-yasnippet)
+  "Which Elpy modules to use.
+
+Elpy can use a number of modules for additional features, which
+can be inidividually enabled or disabled."
+  :type '(set (const :tag "Inline code completion (company-mode)"
+                     elpy-module-company)
+              (const :tag "Show function signatures (ElDoc)"
+                     elpy-module-eldoc)
+              (const :tag "Highlight syntax errors (Flymake)"
+                     elpy-module-flymake)
+              (const :tag "Show the virtualenv in the mode line (pyvenv)"
+                     elpy-module-pyvenv)
+              (const :tag "Display indentation markers (highlight-indentation)"
+                     elpy-module-highlight-indentation)
+              (const :tag "Expand code snippets (YASnippet)"
+                     elpy-module-yasnippet)
+              (const :tag "Configure some sane defaults for Emacs"
+                     elpy-module-sane-defaults))
+  :group 'elpy)
+
+(defcustom elpy-project-ignored-directories ' (".bzr" "CVS" ".git" ".hg" ".svn"
+                                               ".tox"  "build" "dist"
+                                               ".cask")
+  "Directories ignored by functions working on the whole project."
+  :type '(repeat string)
+  :safe (lambda (val)
+          (cl-every #'stringp val))
+  :group 'elpy)
+
+(defcustom elpy-project-root nil
+  "The root of the project the current buffer is in.
+
+There is normally no use in setting this variable directly, as
+Elpy tries to detect the project root automatically. See
+`elpy-project-root-finder-functions' for a way of influencing
+this.
+
+Setting this variable globally will override Elpy's automatic
+project detection facilities entirely.
+
+Alternatively, you can set this in file- or directory-local
+variables using \\[add-file-local-variable] or
+\\[add-dir-local-variable].
+
+Do not use this variable in Emacs Lisp programs. Instead, call
+the `elpy-project-root' function. It will do the right thing."
+  :type 'directory
+  :safe 'file-directory-p
+  :group 'elpy)
+(make-variable-buffer-local 'elpy-project-root)
+
+(defcustom elpy-project-root-finder-functions
+  '(elpy-project-find-projectile-root
+    elpy-project-find-python-root
+    elpy-project-find-git-root
+    elpy-project-find-hg-root
+    elpy-project-find-svn-root)
+  "List of functions to ask for the current project root.
+
+These will be checked in turn. The first directory found is used."
+  :type '(set (const :tag "Projectile project root"
+                     elpy-project-find-projectile-root)
+              (const :tag "Python project (setup.py, setup.cfg)"
+                     elpy-project-find-python-root)
+              (const :tag "Git repository root (.git)"
+                     elpy-project-find-git-root)
+              (const :tag "Mercurial project root (.hg)"
+                     elpy-project-find-hg-root)
+              (const :tag "Subversion project root (.svn)"
+                     elpy-project-find-svn-root))
+  :group 'elpy)
+
+(defcustom elpy-company-hide-modeline t
+  "Non-nil if Elpy should remove company-mode's mode line display.
+
+Company shows the current backend there. For Elpy, this is mostly
+uninteresting information, but if you use company in other modes,
+you might want to keep it."
+  :type 'boolean
+  :group 'elpy)
+
+(defcustom elpy-rpc-backend nil
+  "Your preferred backend.
+
+Elpy can use different backends for code introspection. These
+need to be installed separately using pip or other mechanisms to
+make them available to Python. If you prefer not to do this, you
+can use the native backend, which is very limited but does not
+have any external requirements."
+  :type '(choice (const :tag "Rope" "rope")
+                 (const :tag "Jedi" "jedi")
+                 (const :tag "Automatic" nil))
+  :safe (lambda (val)
+          (member val '("rope" "jedi" "native" nil)))
+  :group 'elpy)
+
+(defcustom elpy-rpc-maximum-buffer-age (* 5 60)
+  "Seconds after which Elpy automatically closes an unused RPC buffer.
+
+Elpy creates RPC buffers over time, depending on python interpreters
+and the project root. When there are many projects being worked on,
+these can accumulate. Setting this variable to an integer will close
+buffers and processes when they have not been used for this amount of
+seconds.
+
+Setting this variable to nil will disable the behavior."
+  :type '(choice (const :tag "Never" nil)
+                 integer)
+  :group 'elpy)
+
+(defcustom elpy-rpc-large-buffer-size 4096
+  "Size for a source buffer up to which it will be sent directly.
+
+The Elpy RPC protocol uses JSON as the serialization format.
+Large buffers take a long time to encode, so Elpy can transmit
+them via temporary files. If a buffer is larger than this value,
+it is sent via a temporary file."
+  :type 'integer
+  :safe #'integerp
+  :group 'elpy)
+
+(defcustom elpy-rpc-ignored-buffer-size 102400
+  "Size for a source buffer over which Elpy completion will not work.
+
+To provide completion, Elpy's backends have to parse the whole
+file every time. For very large files, this is slow, and can make
+Emacs laggy. Elpy will simply not work on buffers larger than
+this to prevent this from happening."
+  :type 'integer
+  :safe #'integerp
+  :group 'elpy)
+
+(defcustom elpy-rpc-python-command (if (equal system-type "windows-nt")
+                                       "pythonw"
+                                     "python")
+  "The Python interpreter for the RPC backend.
+
+This should be the same interpreter the project will be run with,
+and not an interactive shell like ipython."
+  :type '(choice (const :tag "python" "python")
+                 (const :tag "python2" "python2")
+                 (const :tag "python3" "python3")
+                 (const :tag "pythonw (Python on Windows)" "pythonw")
+                 (string :tag "Other"))
+  :safe (lambda (val)
+          (member val '("python" "python2" "python3" "pythonw")))
+  :group 'elpy)
+
+(defcustom elpy-rpc-pythonpath (file-name-directory (locate-library "elpy"))
+  "A directory to add to the PYTHONPATH for the RPC process.
+
+This should be a directory where the elpy module can be found. If
+this is nil, it's assumed elpy can be found in the standard path.
+Usually, there is no need to change this."
+  :type 'directory
+  :safe #'file-directory-p
+  :group 'elpy)
+
+(defcustom elpy-rpc-timeout 1
+  "Number of seconds to wait for a response when blocking.
+
+When Elpy blocks Emacs to wait for a response from the RPC
+process, it will assume it won't come or wait too long after this
+many seconds. On a slow computer, or if you have a large project,
+you might want to increase this.
+
+A setting of nil means to block indefinitely."
+  :type '(choice (const :tag "Block indefinitely" nil)
+                 integer)
+  :safe (lambda (val)
+          (or (integerp val)
+              (null val)))
+  :group 'elpy)
+
+(defcustom elpy-rpc-error-timeout 30
+  "Minimum number of seconds between error popups.
+
+When Elpy encounters an error in the backend, it will display a
+lengthy description of the problem for a bug report. This hangs
+Emacs for a moment, and can be rather annoying if it happens
+repeatedly while editing a source file.
+
+If this variabl is non-nil, Elpy will not display the error
+message again within this amount of seconds."
+  :type 'integer
+  :group 'elpy)
+
+(defcustom elpy-eldoc-show-current-function t
+  "If true, show the current function if no calltip is available.
+
+When Elpy can not find the calltip of the function call at point,
+it can show the name of the function or class and method being
+edited instead. Setting this variable to nil disables this feature."
+  :type 'boolean
+  :group 'elpy)
+
+(defcustom elpy-test-runner 'elpy-test-discover-runner
+  "The test runner to use to run tests."
+  :type '(choice (const :tag "Unittest Discover" elpy-test-discover-runner)
+                 (const :tag "Django Discover" elpy-test-django-runner)
+                 (const :tag "Nose" elpy-test-nose-runner)
+                 (const :tag "py.test" elpy-test-pytest-runner)
+                 (const :tag "Twisted Trial" elpy-test-trial-runner))
+  :safe 'elpy-test-runner-p
+  :group 'elpy)
+
+(defcustom elpy-test-discover-runner-command '("python" "-m" "unittest")
+  "The command to use for `elpy-test-discover-runner'."
+  :type '(repeat string)
+  :group 'elpy)
+
+(defcustom elpy-test-django-runner-command '("django-admin.py" "test"
+                                             "--noinput")
+  "The command to use for `elpy-test-django-runner'."
+  :type '(repeat string)
+  :group 'elpy)
+
+(defcustom elpy-test-nose-runner-command '("nosetests")
+  "The command to use for `elpy-test-nose-runner'."
+  :type '(repeat string)
+  :group 'elpy)
+
+(defcustom elpy-test-trial-runner-command '("trial")
+  "The command to use for `elpy-test-trial-runner'."
+  :type '(repeat string)
+  :group 'elpy)
+
+(defcustom elpy-test-pytest-runner-command '("py.test")
+  "The command to use for `elpy-test-pytest-runner'."
+  :type '(repeat string)
+  :group 'elpy)
+
+(defcustom elpy-rgrep-file-pattern "*.py"
+  "FILES to use for `elpy-rgrep-symbol'."
+  :type 'string
+  :group 'elpy)
+
+;;;;;;;;;;;;;
+;;; Elpy Mode
+
+(defvar elpy-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; Alphabetical order to make it easier to find free C-c C-X
+    ;; bindings in the future. Heh.
+
+    ;; (define-key map (kbd "<backspace>") 'python-indent-dedent-line-backspace)
+    ;; (define-key map (kbd "<backtab>")   'python-indent-dedent-line)
+
+    ;; (define-key map (kbd "C-M-x")   'python-shell-send-defun)
+    ;; (define-key map (kbd "C-c <")   'python-indent-shift-left)
+    ;; (define-key map (kbd "C-c >")   'python-indent-shift-right)
+    (define-key map (kbd "C-c RET") 'elpy-importmagic-add-import)
+    (define-key map (kbd "C-c C-b") 'elpy-nav-expand-to-indentation)
+    (define-key map (kbd "C-c C-c") 'elpy-shell-send-region-or-buffer)
+    (define-key map (kbd "C-c C-d") 'elpy-doc)
+    (define-key map (kbd "C-c C-e") 'elpy-multiedit-python-symbol-at-point)
+    (define-key map (kbd "C-c C-f") 'elpy-find-file)
+    (define-key map (kbd "C-c C-n") 'elpy-flymake-next-error)
+    (define-key map (kbd "C-c C-o") 'elpy-occur-definitions)
+    (define-key map (kbd "C-c C-p") 'elpy-flymake-previous-error)
+    (define-key map (kbd "C-c C-s") 'elpy-rgrep-symbol)
+    (define-key map (kbd "C-c C-t") 'elpy-test)
+    (define-key map (kbd "C-c C-v") 'elpy-check)
+    (define-key map (kbd "C-c C-z") 'elpy-shell-switch-to-shell)
+    (define-key map (kbd "C-c C-r i") 'elpy-importmagic-fixup)
+    (define-key map (kbd "C-c C-r p") 'elpy-autopep8-fix-code)
+    (define-key map (kbd "C-c C-r r") 'elpy-refactor)
+
+    (define-key map (kbd "<S-return>") 'elpy-open-and-indent-line-below)
+    (define-key map (kbd "<C-S-return>") 'elpy-open-and-indent-line-above)
+
+    (define-key map (kbd "<C-return>") 'elpy-shell-send-current-statement)
+
+    (define-key map (kbd "<C-down>") 'elpy-nav-forward-block)
+    (define-key map (kbd "<C-up>") 'elpy-nav-backward-block)
+    (define-key map (kbd "<C-left>") 'elpy-nav-backward-indent)
+    (define-key map (kbd "<C-right>") 'elpy-nav-forward-indent)
+
+    (define-key map (kbd "<M-down>") 'elpy-nav-move-line-or-region-down)
+    (define-key map (kbd "<M-up>") 'elpy-nav-move-line-or-region-up)
+    (define-key map (kbd "<M-left>") 'elpy-nav-indent-shift-left)
+    (define-key map (kbd "<M-right>") 'elpy-nav-indent-shift-right)
+
+    (define-key map (kbd "M-.")     'elpy-goto-definition)
+    (define-key map (kbd "M-TAB")   'elpy-company-backend)
+
+    map)
+  "Key map for the Emacs Lisp Python Environment.")
+
+(easy-menu-define elpy-menu elpy-mode-map
+  "Elpy Mode Menu"
+  '("Elpy"
+    ["Documentation" elpy-doc
+     :help "Get documentation for symbol at point"]
+    ["Run Tests" elpy-test
+     :help "Run test at point, or all tests in the project"]
+    ["Go to Definition" elpy-goto-definition
+     :help "Go to the definition of the symbol at point"]
+    ["Go to previous definition" pop-tag-mark
+     :active (not (ring-empty-p find-tag-marker-ring))
+     :help "Return to the position"]
+    ["Complete" elpy-company-backend
+     :keys "M-TAB"
+     :help "Complete at point"]
+    ["Refactor" elpy-refactor
+     :help "Refactor options"]
+    "---"
+    ("Interactive Python"
+     ["Switch to Python Shell" elpy-shell-switch-to-shell
+      :help "Start and switch to the interactive Python"]
+     ["Send Region or Buffer" elpy-shell-send-region-or-buffer
+      :label (if (use-region-p)
+                 "Send Region to Python"
+               "Send Buffer to Python")
+      :help "Send the current region or the whole buffer to Python"]
+     ["Send Definition" python-shell-send-defun
+      :help "Send current definition to Python"])
+    ("Project"
+     ["Find File" elpy-find-file
+      :help "Interactively find a file in the current project"]
+     ["Find Symbol" elpy-rgrep-symbol
+      :help "Find occurrences of a symbol in the current project"]
+     ["Set Project Root" elpy-set-project-root
+      :help "Change the current project root"]
+     ["Set Project Variable" elpy-set-project-variable
+      :help "Configure a project-specific option"])
+    ("Syntax Check"
+     ["Check Syntax" elpy-check
+      :help "Check the syntax of the current file"]
+     ["Next Error" elpy-flymake-next-error
+      :help "Go to the next inline error, if any"]
+     ["Previous Error" elpy-flymake-previous-error
+      :help "Go to the previous inline error, if any"])
+    ("Indentation Blocks"
+     ["Dedent" python-indent-shift-left
+      :help "Dedent current block or region"
+      :suffix (if (use-region-p) "Region" "Block")]
+     ["Indent" python-indent-shift-right
+      :help "Indent current block or region"
+      :suffix (if (use-region-p) "Region" "Block")]
+     ["Up" elpy-nav-move-line-or-region-up
+      :help "Move current block or region up"
+      :suffix (if (use-region-p) "Region" "Block")]
+     ["Down" elpy-nav-move-line-or-region-down
+      :help "Move current block or region down"
+      :suffix (if (use-region-p) "Region" "Block")])
+    "---"
+    ["News" elpy-news t]
+    ["Configure" elpy-config t]))
+
+;;;###autoload
+(defun elpy-enable (&optional ignored)
+  "Enable Elpy in all future Python buffers."
+  (interactive)
+  (when (< emacs-major-version 24)
+    (error "Elpy requires Emacs 24 or newer"))
+  (when ignored
+    (warn "The argument to `elpy-enable' is deprecated, customize `elpy-modules' instead"))
+  (let ((filename (find-lisp-object-file-name 'python-mode
+                                              'symbol-function)))
+    (when (and filename
+               (string-match "/python-mode\\.el\\'"
+                             filename))
+      (error (concat "You are using python-mode.el. "
+                     "Elpy only works with python.el from "
+                     "Emacs 24 and above"))))
+  (elpy-modules-global-init)
+  (define-key inferior-python-mode-map (kbd "C-c C-z") 'elpy-shell-switch-to-buffer)
+  (add-hook 'python-mode-hook 'elpy-mode)
+  (add-hook 'pyvenv-post-activate-hooks 'elpy-rpc--disconnect))
+
+(defun elpy-disable ()
+  "Disable Elpy in all future Python buffers."
+  (interactive)
+  (remove-hook 'python-mode-hook 'elpy-mode)
+  (elpy-modules-global-stop))
+
+;;;###autoload
+(define-minor-mode elpy-mode
+  "Minor mode in Python buffers for the Emacs Lisp Python Environment.
+
+This mode fully supports virtualenvs. Once you switch a
+virtualenv using \\[pyvenv-workon], you can use
+\\[elpy-rpc-restart] to make the elpy Python process use your
+virtualenv.
+
+\\{elpy-mode-map}"
+  :lighter " Elpy"
+  (when (not (derived-mode-p 'python-mode))
+    (error "Elpy only works with `python-mode'"))
+  (cond
+   (elpy-mode
+    (elpy-modules-buffer-init))
+   ((not elpy-mode)
+    (elpy-modules-buffer-stop))))
+
+;;;;;;;;;;;;;
+;;; Elpy News
+
+(defun elpy-news ()
+  "Display Elpy's release notes."
+  (interactive)
+  (with-current-buffer (get-buffer-create "*Elpy News*")
+    (let ((inhibit-read-only t))
+      (erase-buffer)
+      (insert-file (concat (file-name-directory (locate-library "elpy"))
+                           "NEWS.rst"))
+      (help-mode))
+    (pop-to-buffer (current-buffer))))
+
+;;;;;;;;;;;;;;;
+;;; Elpy Config
+
+(defvar elpy-config--related-custom-groups
+  '(("Elpy" elpy "elpy-")
+    ("Python" python "python-")
+    ("Virtual Environments (Pyvenv)" pyvenv "pyvenv-")
+    ("Completion (Company)" company "company-")
+    ("Call Signatures (ElDoc)" eldoc "eldoc-")
+    ("Inline Errors (Flymake)" flymake "flymake-")
+    ("Snippets (YASnippet)" yasnippet "yas-")
+    ("Directory Grep (rgrep)" grep "grep-")
+    ("Search as You Type (ido)" ido "ido-")
+    ;; ffip does not use defcustom
+    ;; highlight-indent does not use defcustom, either. Its sole face
+    ;; is defined in basic-faces.
+    ))
+
+(defvar elpy-config--get-config "import json
+import sys
+
+try:
+    import xmlrpclib
+except ImportError:
+    import xmlrpc.client as xmlrpclib
+
+from distutils.version import LooseVersion
+
+
+def latest(package, version=None):
+    try:
+        pypi = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
+        latest = pypi.package_releases(package)[0]
+        if version is None or LooseVersion(version) < LooseVersion(latest):
+            return latest
+        else:
+            return None
+    except:
+        return None
+
+
+config = {}
+config['python_version'] = ('{major}.{minor}.{micro}'
+                            .format(major=sys.version_info[0],
+                                    minor=sys.version_info[1],
+                                    micro=sys.version_info[2]))
+
+try:
+    import elpy
+    config['elpy_version'] = elpy.__version__
+except:
+    config['elpy_version'] = None
+
+try:
+    import jedi
+    if isinstance(jedi.__version__, tuple):
+        config['jedi_version'] = '.'.join(str(x) for x in jedi.__version__)
+    else:
+        config['jedi_version'] = jedi.__version__
+    config['jedi_latest'] = latest('jedi', config['jedi_version'])
+except:
+    config['jedi_version'] = None
+    config['jedi_latest'] = latest('jedi')
+
+try:
+    import rope
+    config['rope_version'] = rope.VERSION
+    if sys.version_info[0] <= 2:
+        config['rope_latest'] = latest('rope', config['rope_version'])
+    else:
+        config['rope_latest'] = latest('rope_py3k', config['rope_version'])
+except:
+    config['rope_version'] = None
+    config['rope_latest'] = latest('rope')
+
+try:
+    import importmagic
+    config['importmagic_version'] = importmagic.__version__
+    config['importmagic_latest'] = latest('importmagic', config['importmagic_version'])
+except:
+    config['importmagic_version'] = None
+    config['importmagic_latest'] = latest('importmagic')
+
+try:
+    import autopep8
+    config['autopep8_version'] = autopep8.__version__
+    config['autopep8_latest'] = latest('autopep8', config['autopep8_version'])
+except:
+    config['autopep8_version'] = None
+    config['autopep8_latest'] = latest('autopep8')
+
+json.dump(config, sys.stdout)
+")
+
+(defun elpy-config-error (&optional fmt &rest args)
+  "Note a configuration problem.
+
+This will show a message in the minibuffer that tells the user to
+use \\[elpy-config]."
+  (let ((msg (if fmt
+                 (apply #'format fmt args)
+               "Elpy is not properly configured")))
+    (error "%s; use M-x elpy-config to configure it" msg)))
+
+;;;###autoload
+(defun elpy-config ()
+  "Configure Elpy.
+
+This function will pop up a configuration buffer, which is mostly
+a customize buffer, but has some more options."
+  (interactive)
+  (let ((buf (custom-get-fresh-buffer "*Elpy Config*"))
+        (config (elpy-config--get-config))
+        (custom-search-field nil))
+    (with-current-buffer buf
+      (elpy-insert--header "Elpy Configuration")
+
+      (elpy-config--insert-configuration-problems config)
+
+      (elpy-insert--header "Options")
+
+      (let ((custom-buffer-style 'tree))
+        (Custom-mode)
+        (elpy-config--insert-help)
+        (dolist (cust elpy-config--related-custom-groups)
+          (widget-create 'custom-group
+                         :custom-last t
+                         :custom-state 'hidden
+                         :tag (car cust)
+                         :value (cadr cust)))
+        (widget-setup)
+        (goto-char (point-min))))
+    (pop-to-buffer-same-window buf)))
+
+;;;###autoload
+(defun elpy-version ()
+  "Display the version of Elpy."
+  (interactive)
+  (message "Elpy %s (use M-x elpy-config for details)" elpy-version))
+
+(defun elpy-config--insert-help ()
+  (let ((start (point)))
+    ;; Help display from `customize-browse'
+    (widget-insert (format "\
+%s buttons; type RET or click mouse-1
+on a button to invoke its action.
+Invoke [+] to expand a group, and [-] to collapse an expanded group.\n"
+                           (if custom-raised-buttons
+                               "`Raised' text indicates"
+                             "Square brackets indicate")))
+    (if custom-browse-only-groups
+        (widget-insert "\
+Invoke the [Group] button below to edit that item in another window.\n\n")
+      (widget-insert "Invoke the ")
+      (widget-create 'item
+                     :format "%t"
+                     :tag "[Group]"
+                     :tag-glyph "folder")
+      (widget-insert ", ")
+      (widget-create 'item
+                     :format "%t"
+                     :tag "[Face]"
+                     :tag-glyph "face")
+      (widget-insert ", and ")
+      (widget-create 'item
+                     :format "%t"
+                     :tag "[Option]"
+                     :tag-glyph "option")
+      (widget-insert " buttons below to edit that
+item in another window.\n\n")
+
+      (fill-region start (point)))))
+
+(defun elpy-config--insert-configuration-problems (&optional config)
+  "Insert help text and widgets for configuration problems."
+  (when (not config)
+    (setq config (elpy-config--get-config)))
+  (let* ((python-version (gethash "python_version" config))
+         (rope-pypi-package  (if (and python-version
+                                      (string-match "^3\\." python-version))
+                                 "rope_py3k"
+                               "rope")))
+
+    (elpy-config--insert-configuration-table config)
+    (insert "\n")
+
+    ;; Python not found
+    (when (not (gethash "python_rpc_executable" config))
+      (elpy-insert--para
+       "Elpy can not find the configured Python interpreter. Please make "
+       "sure that the variable `elpy-rpc-python-command' points to a "
+       "command in your PATH. You can change the variable below.\n\n"))
+
+    ;; No virtual env
+    (when (and (gethash "python_rpc_executable" config)
+               (not (gethash "virtual_env" config)))
+      (elpy-insert--para
+       "You have not activated a virtual env. While Elpy supports this, "
+       "it is often a good idea to work inside a virtual env. You can use "
+       "M-x pyvenv-activate or M-x pyvenv-workon to activate a virtual "
+       "env.\n\n"))
+
+    ;; No virtual env, but ~/.local/bin not in PATH
+    (when (and (not (memq system-type '(ms-dos windows-nt)))
+               (gethash "python_rpc_executable" config)
+               (not pyvenv-virtual-env)
+               (not (or (member (expand-file-name "~/.local/bin")
+                                exec-path)
+                        (member (expand-file-name "~/.local/bin/")
+                                exec-path))))
+      (elpy-insert--para
+       "The directory ~/.local/bin/ is not in your PATH. As there is "
+       "no active virtualenv, installing Python packages locally will "
+       "place executables in that directory, so Emacs won't find them. "
+       "If you are missing some commands, do add this directory to your "
+       "PATH.\n\n"))
+
+    ;; Python found, but can't find the elpy module
+    (when (and (gethash "python_rpc_executable" config)
+               (not (gethash "elpy_version" config)))
+      (elpy-insert--para
+       "The Python interpreter could not find the elpy module. "
+       "Make sure the module is installed"
+       (if (gethash "virtual_env" config)
+           " in the current virtualenv.\n"
+         ".\n"))
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button :package "elpy")
+      (insert "\n\n"))
+
+    ;; Bad backend version
+    (when (and (gethash "elpy_version" config)
+               (not (equal (gethash "elpy_version" config)
+                           elpy-version)))
+      (let ((elpy-python-version (gethash "elpy_version" config)))
+        (elpy-insert--para
+         "The Elpy backend is version " elpy-python-version " while "
+         "the Emacs package is " elpy-version ". This is incompatible. "
+         (if (version< elpy-python-version elpy-version)
+             "Please upgrade the Python module."
+           "Please upgrade the Emacs Lisp package.")
+         "\n")))
+
+    ;; Otherwise unparseable output.
+    (when (gethash "error_output" config)
+      (elpy-insert--para
+       "There was an unexpected problem starting the RPC process. Please "
+       "check the following output to see if this makes sense to you. "
+       "To me, it doesn't.\n")
+      (insert "\n"
+              (gethash "error_output" config) "\n"
+              "\n"))
+
+    ;; Requested backend unavailable
+    (when (and (gethash "python_rpc_executable" config)
+               (or (and (equal elpy-rpc-backend "rope")
+                        (not (gethash "rope_version" config)))
+                   (and (equal elpy-rpc-backend "jedi")
+                        (not (gethash "jedi_version" config)))))
+      (elpy-insert--para
+       "You requested Elpy to use the backend " elpy-rpc-backend ", "
+       "but the Python interpreter could not load that module. Make "
+       "sure the module is installed, or change the value of "
+       "`elpy-rpc-backend' below to one of the available backends.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package (if (equal elpy-rpc-backend "rope")
+                                  rope-pypi-package
+                                "jedi"))
+      (insert "\n\n"))
+
+    ;; No backend available.
+    (when (and (gethash "python_rpc_executable" config)
+               (and (not elpy-rpc-backend)
+                    (not (gethash "rope_version" config))
+                    (not (gethash "jedi_version" config))))
+      (elpy-insert--para
+       "There is no backend available. Please install either Rope or Jedi.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button :package rope-pypi-package)
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button :package "jedi")
+      (insert "\n\n"))
+
+    ;; Newer version of Rope available
+    (when (and (gethash "rope_version" config)
+               (gethash "rope_latest" config))
+      (elpy-insert--para
+       "There is a newer version of Rope available.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package rope-pypi-package :upgrade t)
+      (insert "\n\n"))
+
+    ;; Newer version of Jedi available
+    (when (and (gethash "jedi_version" config)
+               (gethash "jedi_latest" config))
+      (elpy-insert--para
+       "There is a newer version of Jedi available.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package "jedi" :upgrade t)
+      (insert "\n\n"))
+
+    ;; No importmagic available
+    (when (not (gethash "importmagic_version" config))
+      (elpy-insert--para
+       "The importmagic package is not available. Commands using this will "
+       "not work.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package "importmagic")
+      (insert "\n\n"))
+
+    ;; Newer version of importmagic available
+    (when (and (gethash "importmagic_version" config)
+               (gethash "importmagic_latest" config))
+      (elpy-insert--para
+       "There is a newer version of the importmagic package available.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package "importmagic" :upgrade t)
+      (insert "\n\n"))
+
+    ;; No autopep8 available
+    (when (not (gethash "autopep8_version" config))
+      (elpy-insert--para
+       "The autopep8 package is not available. Commands using this will "
+       "not work.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package "autopep8")
+      (insert "\n\n"))
+
+    ;; Newer version of autopep8 available
+    (when (and (gethash "autopep8_version" config)
+               (gethash "autopep8_latest" config))
+      (elpy-insert--para
+       "There is a newer version of the autopep8 package available.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button
+                     :package "autopep8" :upgrade t)
+      (insert "\n\n"))
+
+    ;; flake8, the default syntax checker, not found
+    (when (not (executable-find python-check-command))
+      (elpy-insert--para
+       "The configured syntax checker could not be found. Elpy uses this "
+       "program to provide syntax checks of your programs, so you might "
+       "want to install one. Elpy by default uses flake8.\n")
+      (insert "\n")
+      (widget-create 'elpy-insert--pip-button :package "flake8")
+      (insert "\n\n"))
+
+    ))
+
+(defun elpy-config--get-config ()
+  "Return the configuration from `elpy-rpc-python-command'.
+
+This returns a hash table with the following keys (all strings):
+
+emacs_version
+python_rpc
+python_rpc_executable
+python_interactive
+python_interactive_executable
+python_version (RPC)
+elpy_version
+jedi_version
+rope_version
+virtual_env
+virtual_env_short"
+  (with-temp-buffer
+    (let ((config (make-hash-table :test #'equal)))
+      (puthash "emacs_version" emacs-version config)
+      (puthash "python_rpc" elpy-rpc-python-command config)
+      (puthash "python_rpc_executable"
+               (executable-find elpy-rpc-python-command)
+               config)
+      (let ((interactive-python (if (boundp 'python-python-command)
+                                    python-python-command
+                                  python-shell-interpreter)))
+        (puthash "python_interactive"
+                 interactive-python
+                 config)
+        (puthash "python_interactive_executable"
+                 (executable-find interactive-python)
+                 config))
+      (let ((venv (getenv "VIRTUAL_ENV")))
+        (puthash "virtual_env" venv config)
+        (if venv
+            (puthash "virtual_env_short" (file-name-nondirectory venv) config)
+          (puthash "virtual_env_short" nil config)))
+      (let ((return-value (ignore-errors
+                            (let ((process-environment
+                                   (elpy-rpc--environment))
+                                  (default-directory "/"))
+                              (call-process elpy-rpc-python-command
+                                            nil
+                                            (current-buffer)
+                                            nil
+                                            "-c"
+                                            elpy-config--get-config)))))
+        (when return-value
+          (let ((data (ignore-errors
+                        (let ((json-array-type 'list))
+                          (goto-char (point-min))
+                          (json-read)))))
+            (if (not data)
+                (puthash "error_output" (buffer-string) config)
+              (dolist (pair data)
+                (puthash (symbol-name (car pair)) (cdr pair) config))))))
+      config)))
+
+(defun elpy-config--insert-configuration-table (&optional config)
+  "Insert a table describing the current Elpy config."
+  (when (not config)
+    (setq config (elpy-config--get-config)))
+  (let ((emacs-version (gethash "emacs_version" config))
+        (python-version (gethash "python_version" config))
+        (python-rpc (gethash "python_rpc" config))
+        (python-rpc-executable (gethash "python_rpc_executable" config))
+        (python-interactive (gethash "python_interactive" config))
+        (python-interactive-executable (gethash "python_interactive_executable"
+                                                config))
+        (elpy-python-version (gethash "elpy_version" config))
+        (jedi-version (gethash "jedi_version" config))
+        (jedi-latest (gethash "jedi_latest" config))
+        (rope-version (gethash "rope_version" config))
+        (rope-latest (gethash "rope_latest" config))
+        (importmagic-version (gethash "importmagic_version" config))
+        (importmagic-latest (gethash "importmagic_latest" config))
+        (autopep8-version (gethash "importmagic_version" config))
+        (autopep8-latest (gethash "importmagic_latest" config))
+        (virtual-env (gethash "virtual_env" config))
+        (virtual-env-short (gethash "virtual_env_short" config))
+        table maxwidth)
+    (setq table
+          `(("Virtualenv" . ,(if (gethash "virtual_env" config)
+                                 (format "%s (%s)"
+                                         virtual-env-short
+                                         virtual-env)
+                               "None"))
+            ("RPC Python" . ,(cond
+                              (python-version
+                               (format "%s (%s)"
+                                       python-version
+                                       python-rpc-executable))
+                              (python-rpc-executable
+                               python-rpc-executable)
+                              (python-rpc
+                               (format "%s (not found)" python-rpc))
+                              (t
+                               (format "Not configured"))))
+            ("Interactive Python" . ,(cond
+                                      (python-interactive-executable
+                                       (format "%s (%s)"
+                                               python-interactive
+                                               python-interactive-executable))
+                                      (python-interactive
+                                       (format "%s (not found)"
+                                               python-interactive))
+                                      (t
+                                       "Not configured")))
+            ("Emacs" . ,emacs-version)
+            ("Elpy" . ,(cond
+                        ((and elpy-python-version elpy-version
+                              (equal elpy-python-version elpy-version))
+                         elpy-version)
+                        (elpy-python-version
+                         (format "%s (Python), %s (Emacs Lisp)"
+                                 elpy-python-version
+                                 elpy-version))
+                        (t
+                         (format "Not found (Python), %s (Emacs Lisp)"
+                                 elpy-version))))
+            ("Jedi" . ,(elpy-config--package-link "jedi"
+                                                  jedi-version
+                                                  jedi-latest))
+            ("Rope" . ,(elpy-config--package-link "rope"
+                                                  rope-version
+                                                  rope-latest))
+            ("Importmagic" . ,(elpy-config--package-link "importmagic"
+                                                         importmagic-version
+                                                         importmagic-latest))
+            ("Autopep8" . ,(elpy-config--package-link "autopep8"
+                                                      autopep8-version
+                                                      autopep8-latest))
+            ("Syntax checker" . ,(let ((syntax-checker
+                                        (executable-find
+                                         python-check-command)))
+                                   (if  syntax-checker
+                                       (format "%s (%s)"
+                                               (file-name-nondirectory
+                                                syntax-checker)
+                                               syntax-checker)
+                                     (format "Not found (%s)"
+                                             python-check-command))))))
+    (setq maxwidth 0)
+    (dolist (row table)
+      (when (> (length (car row))
+               maxwidth)
+        (setq maxwidth (length (car row)))))
+    (dolist (row table)
+      (insert (car row)
+              (make-string (- maxwidth (length (car row)))
+                           ?.)
+              ": "
+              (cdr row)
+              "\n"))))
+
+(defun elpy-config--package-link (name version latest)
+  "Return a string detailing a Python package.
+
+NAME is the PyPI name of the package. VERSION is the currently
+installed version. LATEST is the latest-available version on
+PyPI, or nil if that's VERSION."
+  (cond
+   ((and (not version) (not latest))
+    "Not found")
+   ((not latest)
+    version)
+   ((not version)
+    (format "Not found (%s available)" latest))
+   (t
+    (format "%s (%s available)" version latest))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Elpy Formatted Insertion
+
+(defmacro elpy-insert--popup (buffer-name &rest body)
+  "Pop up a help buffer named BUFFER-NAME and execute BODY in it."
+  (declare (indent 1))
+  `(with-help-window ,buffer-name
+     (with-current-buffer standard-output
+       ,@body)))
+
+(defun elpy-insert--para (&rest messages)
+  "Insert a bunch of text and then fill it."
+  (let ((start (point)))
+    (mapc (lambda (obj)
+            (if (stringp obj)
+                (insert obj)
+              (insert (format "%s" obj))))
+          messages)
+    (fill-region start (point))))
+
+(defun elpy-insert--header (&rest text)
+  "Insert TEXT has a header for a buffer."
+  (insert (propertize (mapconcat #'(lambda (x) x)
+                                 text
+                                 "")
+                      'face 'header-line)
+          "\n"
+          "\n"))
+
+(define-widget 'elpy-insert--pip-button 'item
+  "A button that runs pip (or an alternative)."
+  :button-prefix "["
+  :button-suffix "]"
+  :format "%[run%] %v"
+  :value-create 'elpy-insert--pip-button-value-create
+  :action 'elpy-insert--pip-button-action)
+
+(defun elpy-insert--pip-button-value-create (widget)
+  "The :value-create option for the pip button widget."
+  (let* ((python-package (widget-get widget :package))
+         (do-upgrade (widget-get widget :upgrade))
+         (upgrade-option (if do-upgrade
+                             "--upgrade "
+                           ""))
+         (do-user-install (not (or (getenv "VIRTUAL_ENV")
+                                   pyvenv-virtual-env)))
+         (user-option (if do-user-install
+                          "--user "
+                        ""))
+
+         (command (cond
+                   ((executable-find "pip")
+                    (format "pip install %s%s%s"
+                            user-option upgrade-option python-package))
+                   ((executable-find "easy_install")
+                    (format "easy_install %s%s"
+                            user-option python-package))
+                   (t
+                    (error "Neither easy_install nor pip found")))))
+    (widget-put widget :command command)
+    (insert command)))
+
+(defun elpy-insert--pip-button-action (widget &optional event)
+  "The :action option for the pip button widget."
+  (async-shell-command (widget-get widget :command)))
+
+;;;;;;;;;;;;
+;;; Projects
+
+(defvar elpy-project--variable-name-history nil
+  "The history for `elpy-project--read-project-variable'")
+
+(defun elpy-project-root ()
+  "Return the root of the current buffer's project.
+
+This can very well be nil if the current file is not part of a
+project.
+
+See `elpy-project-root-finder-functions' for a way to configure
+how the project root is found. You can also set the variable
+`elpy-project-root' in, for example, .dir-locals.el to override
+this."
+  (when (not elpy-project-root)
+    (setq elpy-project-root
+          (run-hook-with-args-until-success
+           'elpy-project-root-finder-functions)))
+  elpy-project-root)
+
+(defun elpy-set-project-root (new-root)
+  "Set the Elpy project root to NEW-ROOT."
+  (interactive "DNew project root: ")
+  (setq elpy-project-root new-root))
+
+(defun elpy-project-find-python-root ()
+  "Return the current Python project root, if any.
+
+This is marked with setup.py or setup.cfg."
+  (or (locate-dominating-file default-directory "setup.py")
+      (locate-dominating-file default-directory "setup.cfg")))
+
+(defun elpy-project-find-git-root ()
+  "Return the current git repository root, if any."
+  (locate-dominating-file default-directory ".git"))
+
+(defun elpy-project-find-hg-root ()
+  "Return the current git repository root, if any."
+  (locate-dominating-file default-directory ".hg"))
+
+(defun elpy-project-find-svn-root ()
+  "Return the current git repository root, if any."
+  (locate-dominating-file default-directory
+                          (lambda (dir)
+                            (and (file-directory-p (format "%s/.svn" dir))
+                                 (not (file-directory-p (format "%s/../.svn"
+                                                                dir)))))))
+
+(defun elpy-project-find-projectile-root ()
+  "Return the current project root according to projectile."
+  ;; `ignore-errors' both to avoid an unbound function error as well
+  ;; as ignore projectile saying there is no project root here.
+  (ignore-errors
+    (projectile-project-root)))
+
+(defun elpy-library-root ()
+  "Return the root of the Python package chain of the current buffer.
+
+That is, if you have /foo/package/module.py, it will return /foo,
+so that import package.module will pick up module.py."
+  (locate-dominating-file default-directory
+                          (lambda (dir)
+                            (not (file-exists-p
+                                  (format "%s/__init__.py"
+                                          dir))))))
+
+(defun elpy-project--read-project-variable (prompt)
+  "Prompt the user for a variable name to set project-wide."
+  (let* ((prefixes (mapcar (lambda (cust)
+                             (nth 2 cust))
+                           elpy-config--related-custom-groups))
+         (var-regex (format "^%s" (regexp-opt prefixes))))
+    (intern
+     (completing-read
+      prompt
+      obarray
+      (lambda (sym)
+        (and (get sym 'safe-local-variable)
+             (string-match var-regex (symbol-name sym))
+             (get sym 'custom-type)))
+      :require-match
+      nil
+      'elpy-project--variable-name-history))))
+
+(defun elpy-project--read-variable-value (prompt variable)
+  "Read the value for VARIABLE from the user."
+  (let ((custom-type (get variable 'custom-type)))
+    (if custom-type
+        (widget-prompt-value (if (listp custom-type)
+                                 custom-type
+                               (list custom-type))
+                             prompt
+                             (if (boundp variable)
+                                 (funcall
+                                  (or (get variable 'custom-get)
+                                      'symbol-value)
+                                  variable))
+                             (not (boundp variable)))
+      (eval-minibuffer prompt))))
+
+(defun elpy-set-project-variable (variable value)
+  "Set or remove a variable in the project-wide .dir-locals.el.
+
+With prefix argument, remove the variable."
+  (interactive
+   (let* ((variable (elpy-project--read-project-variable
+                     (if current-prefix-arg
+                         "Remove project variable: "
+                       "Set project variable: ")))
+          (value (if current-prefix-arg
+                     nil
+                   (elpy-project--read-variable-value (format "Value for %s: "
+                                                              variable)
+                                                      variable))))
+     (list variable value)))
+  (with-current-buffer (find-file-noselect (format "%s/%s"
+                                                   (elpy-project-root)
+                                                   dir-locals-file))
+    (modify-dir-local-variable nil
+                               variable
+                               value
+                               (if current-prefix-arg
+                                   'delete
+                                 'add-or-replace))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Search Project Files
+
+(defun elpy-rgrep-symbol (regexp)
+  "Search for REGEXP in the current project.
+
+REGEXP defaults to the symbol at point, or the current region if
+active.
+
+With a prefix argument, always prompt for a string to search
+for."
+  (interactive
+   (list
+    (cond
+     (current-prefix-arg
+      (read-from-minibuffer "Search in project for regexp: "))
+     ((use-region-p)
+      (buffer-substring-no-properties (region-beginning)
+                                      (region-end)))
+     (t
+      (let ((symbol (thing-at-point 'symbol)))
+        (if symbol
+            (format "\\<%s\\>" symbol)
+          (read-from-minibuffer "Search in project for regexp: ")))))))
+  (grep-compute-defaults)
+  (let ((grep-find-ignored-directories (append elpy-project-ignored-directories
+                                               grep-find-ignored-directories)))
+    (rgrep regexp
+           elpy-rgrep-file-pattern
+           (or (elpy-project-root)
+               default-directory)))
+  (with-current-buffer next-error-last-buffer
+    (let ((inhibit-read-only t))
+      (save-excursion
+        (goto-char (point-min))
+        (when (re-search-forward "^find .*" nil t)
+          (replace-match (format "Searching for '%s'\n"
+                                 (regexp-quote regexp))))))))
+
+;;;;;;;;;;;;;;;;;;;;;;
+;;; Find Project Files
+
+(defun elpy-find-file (&optional dwim)
+  "Efficiently find a file in the current project.
+
+With prefix argument, tries to guess what kind of file the user
+wants to open.
+
+On an import line, it opens the file of that module.
+
+Otherwise, it opens a test file associated with the current file,
+if one exists. A test file is named test_<name>.py if the current
+file is <name>.py, and is either in the same directors or a
+\"test\" or \"tests\" subdirectory."
+  (interactive "P")
+  (cond
+   ((and dwim
+         (buffer-file-name)
+         (save-excursion
+           (goto-char (line-beginning-position))
+           (or (looking-at "^ *import +\\([[:alnum:]._]+\\)")
+               (looking-at "^ *from +\\([[:alnum:]._]+\\) +import +\\([[:alnum:]._]+\\)"))))
+    (let* ((module (if (match-string 2)
+                       (format "%s.%s" (match-string 1) (match-string 2))
+                     (match-string 1)))
+           (path (elpy-find--resolve-module module)))
+      (if path
+          (find-file path)
+        (elpy-find-file nil))))
+   ((and dwim
+         (buffer-file-name))
+    (let ((test-file (elpy-find--test-file)))
+      (if test-file
+          (find-file test-file)
+        (elpy-find-file nil))))
+   (t
+    (let ((ffip-prune-patterns elpy-project-ignored-directories)
+          (ffip-project-root (elpy-project-root))
+          ;; Set up ido to use vertical file lists.
+          (ido-decorations '("\n" "" "\n" "\n..."
+                             "[" "]" " [No match]" " [Matched]"
+                             " [Not readable]" " [Too big]"
+                             " [Confirm]"))
+          (ido-setup-hook (cons (lambda ()
+                                  (define-key ido-completion-map (kbd "<down>")
+                                    'ido-next-match)
+                                  (define-key ido-completion-map (kbd "<up>")
+                                    'ido-prev-match))
+                                ido-setup-hook)))
+      (find-file-in-project)))))
+
+(defun elpy-find--test-file ()
+  "Return the test file for the current file, if any.
+
+If this is a test file, return the non-test file.
+
+A test file is named test_<name>.py if the current file is
+<name>.py, and is either in the same directors or a \"test\" or
+\"tests\" subdirectory."
+  (catch 'return
+    (let (full-name directory file)
+      (setq full-name (buffer-file-name))
+      (when (not full-name)
+        (throw 'return nil))
+      (setq full-name (expand-file-name full-name)
+            directory (file-name-directory full-name)
+            file (file-name-nondirectory full-name))
+      (if (string-match "^test_" file)
+          (let ((file (substring file 5)))
+            (dolist (implementation (list (format "%s/%s" directory file)
+                                          (format "%s/../%s" directory file)))
+              (when (file-exists-p implementation)
+                (throw 'return implementation))))
+        (dolist (test (list (format "%s/test_%s" directory file)
+                            (format "%s/test/test_%s" directory file)
+                            (format "%s/tests/test_%s" directory file)
+                            (format "%s/../test/test_%s" directory file)
+                            (format "%s/../tests/test_%s" directory file)))
+          (when (file-exists-p test)
+            (throw 'return test)))))))
+
+(defun elpy-find--module-path (module)
+  "Return a directory path for MODULE.
+
+The resulting path is not guaranteed to exist. This simply
+resolves leading periods relative to the current directory and
+replaces periods in the middle of the string with slashes.
+
+Only works with absolute imports. Stop using implicit relative
+imports. They're a bad idea."
+  (let* ((relative-depth (when(string-match "^\\.+" module)
+                           (length (match-string 0 module))))
+         (base-directory (if relative-depth
+                             (format "%s/%s"
+                                     (buffer-file-name)
+                                     (mapconcat (lambda (_)
+                                                  "../")
+                                                (make-vector relative-depth
+                                                             nil)
+                                                ""))
+                           (elpy-library-root)))
+         (file-name (replace-regexp-in-string
+                     "\\."
+                     "/"
+                     (if relative-depth
+                         (substring module relative-depth)
+                       module))))
+    (expand-file-name (format "%s/%s" base-directory file-name))))
+
+(defun elpy-find--resolve-module (module)
+  "Resolve MODULE relative to the current file and project.
+
+Returns a full path name for that module."
+  (catch 'return
+    (let ((path (elpy-find--module-path module)))
+      (while (string-prefix-p (expand-file-name (elpy-library-root))
+                              path)
+        (dolist (name (list (format "%s.py" path)
+                            (format "%s/__init__.py" path)))
+          (when (file-exists-p name)
+            (throw 'return name)))
+        (if (string-match "/$" path)
+            (setq path (substring path 0 -1))
+          (setq path (file-name-directory path)))))
+    nil))
+
+;;;;;;;;;;;;;;;;;;;;;
+;;; Interactive Shell
+
+(defun elpy-use-ipython (&optional ipython)
+  "Set defaults to use IPython instead of the standard interpreter.
+
+With prefix arg, prompt for the command to use."
+  (interactive (list (when current-prefix-arg
+                       (read-file-name "IPython command: "))))
+  (when (not ipython)
+    (setq ipython "ipython"))
+  (when (not (executable-find ipython))
+    (error "Command %S not found" ipython))
+  (cond
+   ;; Emacs 24 until 24.3
+   ((boundp 'python-python-command)
+    (setq python-python-command ipython))
+   ;; Emacs 24.3
+   ((and (version<= "24.3" emacs-version)
+         (not (boundp 'python-shell-interpreter-interactive-arg)))
+    ;; This is from the python.el commentary.
+    ;; Settings for IPython 0.11:
+    (setq python-shell-interpreter ipython
+          python-shell-interpreter-args ""
+          python-shell-prompt-regexp "In \\[[0-9]+\\]: "
+          python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: "
+          python-shell-completion-setup-code
+          "from IPython.core.completerlib import module_completion"
+          python-shell-completion-module-string-code
+          "';'.join(module_completion('''%s'''))\n"
+          python-shell-completion-string-code
+          "';'.join(get_ipython().Completer.all_completions('''%s'''))\n"))
+   ;; Emacs 24.4
+   ((boundp 'python-shell-interpreter-interactive-arg)
+    (setq python-shell-interpreter ipython
+          python-shell-interpreter-args "-i")
+    ;; Windows requires some special handling here, see #422
+    (let ((exe "C:\\Python27\\python.exe")
+          (ipython_py "C:\\Python27\\Scripts\\ipython-script.py"))
+      (when (and (eq system-type 'windows-nt)
+                 (file-exists-p exe)
+                 (file-exists-p ipython_py))
+        (setq python-shell-interpreter exe
+              python-shell-interpreter-args "-i " + ipython_py))))
+   (t
+    (error "I don't know how to set ipython settings for this Emacs"))))
+
+(defun elpy-use-cpython (&optional cpython)
+  "Set defaults to use the standard interpreter instead of IPython.
+
+With prefix arg, prompt for the command to use."
+  (interactive (list (when current-prefix-arg
+                       (read-file-name "Python command: "))))
+  (when (not cpython)
+    (setq cpython "python"))
+  (when (not (executable-find cpython))
+    (error "Command %S not found" cpython))
+  (cond
+   ;; Emacs 24 until 24.3
+   ((boundp 'python-python-command)
+    (setq python-python-command cpython))
+   ;; Emacs 24.3 and onwards.
+   ((and (version<= "24.3" emacs-version)
+         (not (boundp 'python-shell-interpreter-interactive-arg)))
+    (setq python-shell-interpreter cpython
+          python-shell-interpreter-args "-i"
+          python-shell-prompt-regexp ">>> "
+          python-shell-prompt-output-regexp ""
+          python-shell-completion-setup-code
+          "try:
+    import readline
+except ImportError:
+    def __COMPLETER_all_completions(text): []
+else:
+    import rlcompleter
+    readline.set_completer(rlcompleter.Completer().complete)
+    def __COMPLETER_all_completions(text):
+        import sys
+        completions = []
+        try:
+            i = 0
+            while True:
+                res = readline.get_completer()(text, i)
+                if not res: break
+                i += 1
+                completions.append(res)
+        except NameError:
+            pass
+        return completions"
+          python-shell-completion-module-string-code ""
+          python-shell-completion-string-code
+          "';'.join(__COMPLETER_all_completions('''%s'''))\n"))
+   ;; Emacs 24.4
+   ((boundp 'python-shell-interpreter-interactive-arg)
+    (setq python-shell-interpreter cpython
+          python-shell-interpreter-args "-i"))
+   (t
+    (error "I don't know how to set ipython settings for this Emacs"))))
+
+(defun elpy-shell-display-buffer ()
+  "Display inferior Python process buffer."
+  (display-buffer (process-buffer (elpy-shell-get-or-create-process))
+                  nil
+                  'visible))
+
+(defun elpy-shell-send-region-or-buffer (&optional arg)
+  "Send the active region or the buffer to the Python shell.
+
+If there is an active region, send that. Otherwise, send the
+whole buffer.
+
+In Emacs 24.3 and later, without prefix argument, this will
+escape the Python idiom of if __name__ == '__main__' to be false
+to avoid accidental execution of code. With prefix argument, this
+code is executed."
+  (interactive "P")
+  ;; Ensure process exists
+  (elpy-shell-get-or-create-process)
+  (let ((if-main-regex "^if +__name__ +== +[\"']__main__[\"'] *:")
+        (has-if-main nil))
+    (if (use-region-p)
+        (let ((region (elpy-shell--region-without-indentation
+                       (region-beginning) (region-end))))
+          (setq has-if-main (string-match if-main-regex region))
+          (when (string-match "\t" region)
+            (message "Region contained tabs, this might cause weird errors"))
+          (python-shell-send-string region))
+      (save-excursion
+        (goto-char (point-min))
+        (setq has-if-main (re-search-forward if-main-regex nil t)))
+      (python-shell-send-buffer arg))
+    (elpy-shell-display-buffer)
+    (when has-if-main
+      (message (concat "Removed if __main__ == '__main__' construct, "
+                       "use a prefix argument to evaluate.")))))
+
+(defun elpy-shell-send-current-statement ()
+  "Send current statement to Python shell."
+  (interactive)
+  (let ((beg (python-nav-beginning-of-statement))
+        (end (python-nav-end-of-statement)))
+    (elpy-shell-get-or-create-process)
+    (python-shell-send-string (buffer-substring beg end)))
+  (elpy-shell-display-buffer)
+  (python-nav-forward-statement))
+
+(defun elpy-shell-switch-to-shell ()
+  "Switch to inferior Python process buffer."
+  (interactive)
+  (pop-to-buffer (process-buffer (elpy-shell-get-or-create-process))))
+
+(defun elpy-shell-switch-to-buffer ()
+  "Switch from inferior Python process buffer to recent Python buffer."
+  (interactive)
+  (pop-to-buffer (other-buffer (current-buffer) 1)))
+
+(defun elpy-shell-get-or-create-process ()
+  "Get or create an inferior Python process for current buffer and return it."
+  (let* ((bufname (format "*%s*" (python-shell-get-process-name nil)))
+         (proc (get-buffer-process bufname)))
+    (if proc
+        proc
+      (run-python (python-shell-parse-command))
+      (get-buffer-process bufname))))
+
+(defun elpy-shell--region-without-indentation (beg end)
+  "Return the current region as a string, but without indentation."
+  (if (= beg end)
+      ""
+    (let ((region (buffer-substring beg end))
+          (indent-level nil)
+          (indent-tabs-mode nil))
+      (with-temp-buffer
+        (insert region)
+        (goto-char (point-min))
+        (while (< (point) (point-max))
+          (cond
+           ((and (not indent-level)
+                 (not (looking-at "[ \t]*$")))
+            (setq indent-level (current-indentation)))
+           ((and indent-level
+                 (not (looking-at "[ \t]*$"))
+                 (< (current-indentation)
+                    indent-level))
+            (error "Can't adjust indentation, consecutive lines indented less than starting line")))
+          (forward-line))
+        (indent-rigidly (point-min)
+                        (point-max)
+                        (- indent-level))
+        (buffer-string)))))
+
+;;;;;;;;;;;;;;;;;
+;;; Syntax Checks
+
+(defun elpy-check (&optional whole-project-p)
+  "Run `python-check-command' on the current buffer's file,
+
+or the project root if WHOLE-PROJECT-P is non-nil (interactively,
+with a prefix argument)."
+  (interactive "P")
+  (when (not (buffer-file-name))
+    (error "Can't check a buffer without a file."))
+  (save-some-buffers (not compilation-ask-about-save) nil)
+  (let ((process-environment (python-shell-calculate-process-environment))
+        (exec-path (python-shell-calculate-exec-path))
+        (file-name-or-directory (expand-file-name
+                                 (if whole-project-p
+                                     (or (elpy-project-root)
+                                         (buffer-file-name))
+                                   (buffer-file-name))))
+        (extra-args (if whole-project-p
+                        (concat " --exclude="
+                                (mapconcat #'identity
+                                           elpy-project-ignored-directories
+                                           ","))
+                      "")))
+    (compilation-start (concat python-check-command
+                               " "
+                               (shell-quote-argument file-name-or-directory)
+                               extra-args)
+                       nil
+                       (lambda (mode-name)
+                         "*Python Check*"))))
+
+;;;;;;;;;;;;;;
+;;; Navigation
+
+(defvar elpy-nav-expand--initial-position nil
+  "Initial position before expanding to indentation.")
+(make-variable-buffer-local 'elpy-nav-expand--initial-position)
+
+(defun elpy-goto-definition ()
+  "Go to the definition of the symbol at point, if found."
+  (interactive)
+  (let ((location (elpy-rpc-get-definition)))
+    (if location
+        (elpy-goto-location (car location) (cadr location))
+      (error "No definition found"))))
+
+(defun elpy-goto-location (filename offset)
+  "Show FILENAME at OFFSET to the user."
+  (ring-insert find-tag-marker-ring (point-marker))
+  (let ((buffer (find-file filename)))
+    (with-current-buffer buffer
+      (with-selected-window (get-buffer-window buffer)
+        (goto-char (1+ offset))
+        (recenter 0)))))
+
+(defun elpy-nav-forward-block ()
+  "Move to the next line indented like point.
+
+This will skip over lines and statements with different
+indentation levels."
+  (interactive)
+  (let ((indent (current-column))
+        (start (point))
+        (cur nil))
+    (when (/= (% indent python-indent-offset)
+              0)
+      (setq indent (* (1+ (/ indent python-indent-offset))
+                      python-indent-offset)))
+    (python-nav-forward-statement)
+    (while (and (< indent (current-indentation))
+                (not (eobp)))
+      (when (equal (point) cur)
+        (error "Statement does not finish"))
+      (setq cur (point))
+      (python-nav-forward-statement))
+    (when (< (current-indentation)
+             indent)
+      (goto-char start))))
+
+(defun elpy-nav-backward-block ()
+  "Move to the previous line indented like point.
+
+This will skip over lines and statements with different
+indentation levels."
+  (interactive)
+  (let ((indent (current-column))
+        (start (point))
+        (cur nil))
+    (when (/= (% indent python-indent-offset)
+              0)
+      (setq indent (* (1+ (/ indent python-indent-offset))
+                      python-indent-offset)))
+    (python-nav-backward-statement)
+    (while (and (< indent (current-indentation))
+                (not (bobp)))
+      (when (equal (point) cur)
+        (error "Statement does not start"))
+      (setq cur (point))
+      (python-nav-backward-statement))
+    (when (< (current-indentation)
+             indent)
+      (goto-char start))))
+
+(defun elpy-nav-forward-indent ()
+  "Move forward to the next indent level, or over the next word."
+  (interactive "^")
+  (if (< (current-column) (current-indentation))
+      (let* ((current (current-column))
+             (next (* (1+ (/ current python-indent-offset))
+                      python-indent-offset)))
+        (goto-char (+ (point-at-bol)
+                      next)))
+    (let ((eol (point-at-eol)))
+      (forward-word)
+      (when (> (point) eol)
+        (goto-char (point-at-bol))))))
+
+(defun elpy-nav-backward-indent ()
+  "Move backward to the previous indent level, or over the previous word."
+  (interactive "^")
+  (if (and (<= (current-column) (current-indentation))
+           (/= (current-column) 0))
+      (let* ((current (current-column))
+             (next (* (1- (/ current python-indent-offset))
+                      python-indent-offset)))
+        (goto-char (+ (point-at-bol)
+                      next)))
+    (backward-word)))
+
+(defun elpy-nav-move-line-or-region-down (&optional beg end)
+  "Move the current line or active region down."
+  (interactive "r")
+  (if (use-region-p)
+      (elpy--nav-move-region-vertically beg end 1)
+    (elpy--nav-move-line-vertically 1)))
+
+(defun elpy-nav-move-line-or-region-up (&optional beg end)
+  "Move the current line or active region down."
+  (interactive "r")
+  (if (use-region-p)
+      (elpy--nav-move-region-vertically beg end -1)
+    (elpy--nav-move-line-vertically -1)))
+
+(defun elpy--nav-move-line-vertically (dir)
+  (let* ((beg (point-at-bol))
+         (end (point-at-bol 2))
+         (col (current-column))
+         (region (delete-and-extract-region beg end)))
+    (forward-line dir)
+    (save-excursion
+      (insert region))
+    (goto-char (+ (point) col))))
+
+(defun elpy--nav-move-region-vertically (beg end dir)
+  (let* ((point-before-mark (< (point) (mark)))
+         (beg (save-excursion
+                (goto-char beg)
+                (point-at-bol)))
+         (end (save-excursion
+                (goto-char end)
+                (if (bolp)
+                    (point)
+                  (point-at-bol 2))))
+         (region (delete-and-extract-region beg end)))
+    (goto-char beg)
+    (forward-line dir)
+    (save-excursion
+      (insert region))
+    (if point-before-mark
+        (set-mark (+ (point)
+                     (length region)))
+      (set-mark (point))
+      (goto-char (+ (point)
+                    (length region))))
+    (setq deactivate-mark nil)))
+
+(defun elpy-open-and-indent-line-below ()
+  "Open a line below the current one, move there, and indent."
+  (interactive)
+  (move-end-of-line 1)
+  (newline-and-indent))
+
+(defun elpy-open-and-indent-line-above ()
+  "Open a line above the current one, move there, and indent."
+  (interactive)
+  (move-beginning-of-line 1)
+  (save-excursion
+    (insert "\n"))
+  (indent-according-to-mode))
+
+(defun elpy-nav-expand-to-indentation ()
+  "Select surrounding lines with current indentation."
+  (interactive)
+  (setq elpy-nav-expand--initial-position (point))
+  (let ((indentation (current-indentation)))
+    (if (= indentation 0)
+        (mark-whole-buffer)
+      (while (<= indentation (current-indentation))
+        (forward-line -1))
+      (forward-line 1)
+      (push-mark (point) nil t)
+      (while (<= indentation (current-indentation))
+        (forward-line 1))
+      (backward-char))))
+
+(defadvice keyboard-quit (before collapse-region activate)
+  (when (eq last-command 'elpy-nav-expand-to-indentation)
+    (goto-char elpy-nav-expand--initial-position)))
+
+(defun elpy-nav-normalize-region ()
+  "If the first or last line are not fully selected, select them completely."
+  (let ((beg (region-beginning))
+        (end (region-end)))
+    (goto-char beg)
+    (beginning-of-line)
+    (push-mark (point) nil t)
+    (goto-char end)
+    (when (not (= (point) (line-beginning-position)))
+      (end-of-line))))
+
+(defun elpy-nav-indent-shift-right (&optional count)
+  "Shift current line by COUNT columns to the right.
+
+COUNT defaults to `python-indent-offset'.
+If region is active, normalize the region and shift."
+  (interactive)
+  (if (use-region-p)
+      (progn
+        (elpy-nav-normalize-region)
+        (python-indent-shift-right (region-beginning) (region-end) current-prefix-arg))
+    (python-indent-shift-right (line-beginning-position) (line-end-position) current-prefix-arg)))
+
+(defun elpy-nav-indent-shift-left (&optional count)
+  "Shift current line by COUNT columns to the left.
+
+COUNT defaults to `python-indent-offset'.
+If region is active, normalize the region and shift."
+  (interactive)
+  (if (use-region-p)
+      (progn
+        (elpy-nav-normalize-region)
+        (python-indent-shift-left (region-beginning) (region-end) current-prefix-arg))
+    (python-indent-shift-left (line-beginning-position) (line-end-position) current-prefix-arg)))
+
+
+;;;;;;;;;;;;;;;;
+;;; Test running
+
+(defvar elpy-set-test-runner-history nil
+  "History variable for `elpy-set-test-runner'.")
+
+(defun elpy-test (&optional test-whole-project)
+  "Run tests on the current test, or the whole project.
+
+If there is a test at point, run that test. If not, or if a
+prefix is given, run all tests in the current project."
+  (interactive "P")
+  (let ((current-test (elpy-test-at-point)))
+    (if test-whole-project
+        ;; With prefix arg, test the whole project.
+        (funcall elpy-test-runner
+                 (car current-test)
+                 nil nil nil)
+      ;; Else, run only this test
+      (apply elpy-test-runner current-test))))
+
+(defun elpy-set-test-runner (test-runner)
+  "Tell Elpy to use TEST-RUNNER to run tests.
+
+See `elpy-test' for how to invoke it."
+  (interactive
+   (list
+    (let* ((runners (mapcar (lambda (value)
+                              (cons (nth 2 value)
+                                    (nth 3 value)))
+                            (cdr (get 'elpy-test-runner 'custom-type))))
+           (current (cdr (assq elpy-test-runner
+                               (mapcar (lambda (cell)
+                                         (cons (cdr cell) (car cell)))
+                                       runners))))
+           (choice (completing-read (if current
+                                        (format "Test runner (currently %s): "
+                                                current)
+                                      "Test runner: ")
+                                    runners
+                                    nil t nil 'elpy-set-test-runner-history)))
+      (if (equal choice "")
+          elpy-test-runner
+        (cdr (assoc choice runners))))))
+  (setq elpy-test-runner test-runner))
+
+(defun elpy-test-at-point ()
+  "Return a list specifying the test at point, if any.
+
+This is used as the interactive
+
+This list has four elements.
+
+- Top level directory:
+  All test files should be importable from here.
+- Test file:
+  The current file name.
+- Test module:
+  The module name, relative to the top level directory.
+- Test name:
+  The full name of the current test within the module, for
+  example TestClass.test_method
+
+If there is no test at point, test name is nil.
+If the current buffer is not visiting a file, only the top level
+directory is not nil."
+  (if (not buffer-file-name)
+      (progn
+        (save-some-buffers)
+        (list (elpy-library-root) nil nil nil))
+    (let* ((top (elpy-library-root))
+           (file buffer-file-name)
+           (module (elpy-test--module-name-for-file top file))
+           (test (elpy-test--current-test-name)))
+      (if (and file (string-match "test" (or module test "")))
+          (progn
+            (save-buffer)
+            (list top file module test))
+        (save-some-buffers)
+        (list top nil nil nil)))))
+
+(defun elpy-test--current-test-name ()
+  (let ((name (python-info-current-defun)))
+    (if (and name
+             (string-match "\\`\\([^.]+\\.[^.]+\\)\\." name))
+        (match-string 1 name)
+      name)))
+
+(defun elpy-test--module-name-for-file (top-level module-file)
+  "Return the module name relative to TOP-LEVEL for MODULE-FILE.
+
+For example, for a top level of /project/root/ and a module file
+of /project/root/package/module.py, this would return
+\"package.module\"."
+  (let* ((relative-name (file-relative-name module-file top-level))
+         (no-extension (replace-regexp-in-string "\\.py\\'" "" relative-name))
+         (no-init (replace-regexp-in-string "/__init__\\'" "" no-extension))
+         (dotted (replace-regexp-in-string "/" "." no-init)))
+    (if (string-match "^\\." dotted)
+        (concat "." (replace-regexp-in-string (regexp-quote "...") "." dotted))
+      dotted)))
+
+(defun elpy-test-runner-p (obj)
+  "Return t iff OBJ is a test runner.
+
+This uses the `elpy-test-runner-p' symbol property."
+  (get obj 'elpy-test-runner-p))
+
+(defun elpy-test-run (working-directory command &rest args)
+  "Run COMMAND with ARGS in WORKING-DIRECTORY as a test command."
+  (let ((default-directory working-directory))
+    (compile (mapconcat #'shell-quote-argument
+                        (cons command args)
+                        " "))))
+
+(defun elpy-test-discover-runner (top file module test)
+  "Test the project using the python unittest discover runner.
+
+This requires Python 2.7 or later."
+  (interactive (elpy-test-at-point))
+  (let ((test (cond
+               (test (format "%s.%s" module test))
+               (module module)
+               (t "discover"))))
+    (apply #'elpy-test-run
+           top
+           (append elpy-test-discover-runner-command
+                   (list test)))))
+(put 'elpy-test-discover-runner 'elpy-test-runner-p t)
+
+(defun elpy-test-django-runner (top file module test)
+  "Test the project using the Django discover runner.
+
+This requires Django 1.6 or the django-discover-runner package."
+  (interactive (elpy-test-at-point))
+  (if module
+      (apply #'elpy-test-run
+             top
+             (append elpy-test-django-runner-command
+                     (list (if test
+                               (format "%s.%s" module test)
+                             module))))
+    (apply #'elpy-test-run
+           top
+           elpy-test-django-runner-command)))
+(put 'elpy-test-django-runner 'elpy-test-runner-p t)
+
+(defun elpy-test-nose-runner (top file module test)
+  "Test the project using the nose test runner.
+
+This requires the nose package to be installed."
+  (interactive (elpy-test-at-point))
+  (if module
+      (apply #'elpy-test-run
+             top
+             (append elpy-test-nose-runner-command
+                     (list (if test
+                               (format "%s:%s" module test)
+                             module))))
+    (apply #'elpy-test-run
+           top
+           elpy-test-nose-runner-command)))
+(put 'elpy-test-nose-runner 'elpy-test-runner-p t)
+
+(defun elpy-test-trial-runner (top file module test)
+  "Test the project using Twisted's Trial test runner.
+
+This requires the twisted-core package to be installed."
+  (interactive (elpy-test-at-point))
+  (if module
+      (apply #'elpy-test-run
+             top
+             (append elpy-test-trial-runner-command
+                     (list (if test
+                               (format "%s.%s" module test)
+                             module))))
+    (apply #'elpy-test-run top elpy-test-trial-runner-command)))
+(put 'elpy-test-trial-runner 'elpy-test-runner-p t)
+
+(defun elpy-test-pytest-runner (top file module test)
+  "Test the project using the py.test test runner.
+
+This requires the pytest package to be installed."
+  (interactive (elpy-test-at-point))
+  (cond
+   (test
+    (let ((test-list (split-string test "\\.")))
+      (apply #'elpy-test-run
+             top
+             (append elpy-test-pytest-runner-command
+                     (list (mapconcat #'identity
+                                      (cons file test-list)
+                                      "::"))))))
+   (module
+    (apply #'elpy-test-run top (append elpy-test-pytest-runner-command
+                                       (list file))))
+   (t
+    (apply #'elpy-test-run top elpy-test-pytest-runner-command))))
+(put 'elpy-test-pytest-runner 'elpy-test-runner-p t)
+
+;;;;;;;;;;;;;;;;;
+;;; Documentation
+
+(defvar elpy-doc-history nil
+  "History for the `elpy-doc' command.")
+
+(defun elpy-doc ()
+  "Show documentation for the symbol at point.
+
+If there is no documentation for the symbol at point, or if a
+prefix argument is given, prompt for a symbol from the user."
+  (interactive)
+  (let ((symbol-at-point nil)
+        (doc nil))
+    (when (not current-prefix-arg)
+      (setq doc (elpy-rpc-get-docstring))
+      (when (not doc)
+        (save-excursion
+          (python-nav-backward-up-list)
+          (setq doc (elpy-rpc-get-docstring))))
+      (when (not doc)
+        (setq doc (elpy-rpc-get-pydoc-documentation
+                   (elpy-doc--symbol-at-point))))
+      (when (not doc)
+        (save-excursion
+          (python-nav-backward-up-list)
+          (setq doc (elpy-rpc-get-pydoc-documentation
+                     (elpy-doc--symbol-at-point))))))
+    (when (not doc)
+      (setq doc (elpy-rpc-get-pydoc-documentation
+                 (elpy-doc--read-identifier-from-minibuffer
+                  (elpy-doc--symbol-at-point)))))
+    (if doc
+        (elpy-doc--show doc)
+      (error "No documentation found."))))
+
+(defun elpy-doc--read-identifier-from-minibuffer (initial)
+  "Read a pydoc-able identifier from the minibuffer."
+  (completing-read "Pydoc for: "
+                   (completion-table-dynamic #'elpy-rpc-get-pydoc-completions)
+                   nil nil initial 'elpy-doc-history))
+
+(defun elpy-doc--show (documentation)
+  "Show DOCUMENTATION to the user, replacing ^H with bold."
+  (with-help-window "*Python Doc*"
+    (with-current-buffer "*Python Doc*"
+      (erase-buffer)
+      (insert documentation)
+      (goto-char (point-min))
+      (while (re-search-forward "\\(.\\)\\1" nil t)
+        (replace-match (propertize (match-string 1)
+                                   'face 'bold)
+                       t t)))))
+
+(defun elpy-doc--symbol-at-point ()
+  "Return the Python symbol at point, including dotted paths."
+  (with-syntax-table python-dotty-syntax-table
+    (let ((symbol (symbol-at-point)))
+      (if symbol
+          (symbol-name symbol)
+        nil))))
+
+;;;;;;;;;;;;;;
+;;; Buffer manipulation
+
+(defun elpy-buffer--replace-block (spec)
+  "Replace a block.  SPEC is (startline endline newblock)."
+  (let ((start-line (nth 0 spec))
+        (end-line (nth 1 spec))
+        (new-block (nth 2 spec)))
+    (save-excursion
+      (save-restriction
+        (widen)
+        (goto-char (point-min))
+        (forward-line start-line)
+        (let ((beg (point))
+              (end (progn (forward-line (- end-line start-line)) (point))))
+          ;; Avoid deleting and re-inserting when the blocks are equal.
+          (unless (string-equal (buffer-substring beg end) new-block)
+            (delete-region beg end)
+            (insert new-block)))))))
+
+(defun elpy-buffer--replace-region (beg end rep)
+  "Replace text in BUFFER in region (BEG END) with REP."
+  (unless (string-equal (buffer-substring beg end) rep)
+    (save-excursion
+      (goto-char end)
+      (insert rep)
+      (delete-region beg end))))
+
+
+;;;;;;;;;;;;;;
+;;; Import manipulation
+
+(defun elpy-importmagic--add-import-read-args (&optional object prompt)
+  (let* ((default-object (save-excursion
+                           (let ((bounds (with-syntax-table python-dotty-syntax-table
+                                           (bounds-of-thing-at-point 'symbol))))
+                             (if bounds (buffer-substring (car bounds) (cdr bounds)) ""))))
+         (object-to-import (or object (read-string "Object to import: " default-object)))
+         (possible-imports (elpy-rpc "get_import_symbols" (list buffer-file-name
+                                                                (elpy-rpc--buffer-contents)
+                                                                object-to-import)))
+         (statement-prompt (or prompt "New import statement: ")))
+    (cond
+     ;; An elpy warning (i.e. index not ready) is returned as a string.
+     ((stringp possible-imports)
+      (list ""))
+     ;; If there is no candidate, we exit immediately.
+     ((null possible-imports)
+      (message "No import candidate found")
+      (list ""))
+     ;; We have some candidates, let the user choose one.
+     (t
+      (let ((first-choice (car possible-imports))
+            (user-choice (completing-read statement-prompt possible-imports)))
+        (list (if (equal user-choice "") first-choice user-choice)))))))
+
+(defun elpy-importmagic-add-import (statement)
+  "Prompt to import thing at point, show possbile imports and add selected import."
+  (interactive (elpy-importmagic--add-import-read-args))
+  (unless (equal statement "")
+    (let* ((res (elpy-rpc "add_import" (list buffer-file-name
+                                             (elpy-rpc--buffer-contents)
+                                             statement))))
+      (elpy-buffer--replace-block res))))
+
+(defun elpy-importmagic-fixup ()
+  "Query for new imports of unresolved symbols, and remove unreferenced imports.
+
+Also sort the imports in the import statement blocks."
+  (interactive)
+  ;; get all unresolved names, and interactively add imports for them
+  (let* ((res (elpy-rpc "get_unresolved_symbols" (list buffer-file-name
+                                                       (elpy-rpc--buffer-contents)))))
+    (unless (stringp res)
+      (if (null res) (message "No imports to add."))
+      (dolist (object res)
+        (let* ((prompt (format "How to import \"%s\": " object))
+               (choice (elpy-importmagic--add-import-read-args object prompt)))
+          (elpy-importmagic-add-import (car choice))))))
+  ;; now get a new import statement block (this also sorts)
+  (let* ((res (elpy-rpc "remove_unreferenced_imports" (list buffer-file-name
+                                                            (elpy-rpc--buffer-contents)))))
+    (unless (stringp res)
+      (elpy-buffer--replace-block res))))
+
+;;;;;;;;;;;;;;
+;;; Multi-Edit
+
+(defvar elpy-multiedit-overlays nil
+  "List of overlays currently being edited.")
+
+(defun elpy-multiedit-add-overlay (beg end)
+  "Add an editable overlay between BEG and END.
+
+A modification in any of these overlays will modify all other
+overlays, too."
+  (interactive "r")
+  (when (elpy-multiedit--overlays-in-p beg end)
+    (error "Overlapping multiedit overlays are not allowed"))
+  (let ((ov (make-overlay beg end nil nil :rear-advance)))
+    (overlay-put ov 'elpy-multiedit t)
+    (overlay-put ov 'face 'highlight)
+    (overlay-put ov 'modification-hooks '(elpy-multiedit--overlay-changed))
+    (overlay-put ov 'insert-in-front-hooks '(elpy-multiedit--overlay-changed))
+    (overlay-put ov 'insert-behind-hooks '(elpy-multiedit--overlay-changed))
+    (push ov elpy-multiedit-overlays)))
+
+(defun elpy-multiedit--overlays-in-p (beg end)
+  "Return t iff there are multiedit overlays between beg and end."
+  (catch 'return
+    (dolist (ov (overlays-in beg end))
+      (when (overlay-get ov 'elpy-multiedit)
+        (throw 'return t)))
+    nil))
+
+(defun elpy-multiedit-stop ()
+  "Stop editing multiple places at once."
+  (interactive)
+  (dolist (ov elpy-multiedit-overlays)
+    (delete-overlay ov))
+  (setq elpy-multiedit-overlays nil))
+
+(defun elpy-multiedit--overlay-changed (ov after-change beg end
+                                           &optional pre-change-length)
+  "Called for each overlay that changes.
+
+This updates all other overlays."
+  (when (and after-change
+             (not undo-in-progress)
+             (overlay-buffer ov))
+    (let ((text (buffer-substring (overlay-start ov)
+                                  (overlay-end ov)))
+          (inhibit-modification-hooks t))
+      (dolist (other-ov elpy-multiedit-overlays)
+        (when (and (not (equal other-ov ov))
+                   (buffer-live-p (overlay-buffer other-ov)))
+          (with-current-buffer (overlay-buffer other-ov)
+            (save-excursion
+              (goto-char (overlay-start other-ov))
+              (insert text)
+              (delete-region (point) (overlay-end other-ov)))))))))
+
+(defun elpy-multiedit ()
+  "Edit all occurences of the symbol at point, or the active region.
+
+If multiedit is active, stop it."
+  (interactive)
+  (if elpy-multiedit-overlays
+      (elpy-multiedit-stop)
+    (let ((regex (if (use-region-p)
+                     (regexp-quote (buffer-substring (region-beginning)
+                                                     (region-end)))
+                   (format "\\_<%s\\_>" (regexp-quote
+                                         (symbol-name
+                                          (symbol-at-point))))))
+          (case-fold-search nil))
+      (save-excursion
+        (goto-char (point-min))
+        (while (re-search-forward regex nil t)
+          (elpy-multiedit-add-overlay (match-beginning 0)
+                                      (match-end 0)))))))
+
+(defun elpy-multiedit-python-symbol-at-point (&optional use-symbol-p)
+  "Edit all usages of the the Python symbol at point.
+
+With prefix arg, edit all syntactic usages of the symbol at
+point. This might include unrelated symbols that just share the
+name."
+  (interactive "P")
+  (if (or elpy-multiedit-overlays
+          use-symbol-p
+          (use-region-p))
+      ;; If we are already doing a multiedit, or are explicitly told
+      ;; to use the symbol at point, or if we are on an active region,
+      ;; call the multiedit function that does just that already.
+      (call-interactively 'elpy-multiedit)
+    ;; Otherwise, fetch usages from backend.
+    (save-some-buffers)
+    (let ((usages (condition-case err
+                      (elpy-rpc-get-usages)
+                    ;; This is quite the stunt, but elisp parses JSON
+                    ;; null as nil, which is indistinguishable from
+                    ;; the empty list, we stick to the error.
+                    (error
+                     (if (and (eq (car err) 'error)
+                              (stringp (cadr err))
+                              (string-match "not implemented" (cadr err)))
+                         'not-supported
+                       (error (cadr err)))))))
+      (cond
+       ((eq usages 'not-supported)
+        (call-interactively 'elpy-multiedit)
+        (message (concat "Using syntactic editing "
+                         "as current backend does not support get_usages.")))
+       ((null usages)
+        (call-interactively 'elpy-multiedit)
+        (if elpy-multiedit-overlays
+            (message (concat "Using syntactic editing as no usages of the "
+                             "symbol at point were found by the backend."))
+          (message "No occurrences of the symbol at point found")))
+       (t
+        (save-restriction
+          (widen)
+          (elpy-multiedit--usages usages)))))))
+
+(defun elpy-multiedit--usages (usages)
+  "Mark the usages in USAGES for editing."
+  (let ((name nil)
+        (locations (make-hash-table :test #'equal)))
+    (dolist (usage usages)
+      (let* ((filename (cdr (assq 'filename usage)))
+             (this-name (cdr (assq 'name usage)))
+             (offset (cdr (assq 'offset usage))))
+        (setq name this-name)
+        (with-current-buffer (if filename
+                                 (find-file-noselect filename)
+                               (current-buffer))
+          (elpy-multiedit-add-overlay (+ offset 1)
+                                      (+ offset 1 (length this-name)))
+          (save-excursion
+            (goto-char (+ offset 1))
+            (puthash filename
+                     (cons (list offset
+                                 (buffer-substring (line-beginning-position)
+                                                   (line-end-position))
+                                 (- (point)
+                                    (line-beginning-position))
+                                 (- (+ (point) (length this-name))
+                                    (line-beginning-position)))
+                           (gethash filename locations))
+                     locations)))))
+    (if (<= (hash-table-count locations)
+            1)
+        (message "Editing %s usages of '%s' in this buffer"
+                 (length usages) name)
+      (with-current-buffer (get-buffer-create "*Elpy Edit Usages*")
+        (let ((inhibit-read-only t)
+              (filenames nil))
+          (erase-buffer)
+          (elpy-insert--para
+           "The symbol '" name "' was found in multiple files. Editing "
+           "all locations:\n\n")
+          (maphash (lambda (key value)
+                     (when (not (member key filenames))
+                       (setq filenames (cons key filenames))))
+                   locations)
+          (dolist (filename (sort filenames #'string<))
+            (elpy-insert--header filename)
+            (dolist (location (sort (gethash filename locations)
+                                    (lambda (loc1 loc2)
+                                      (< (car loc1)
+                                         (car loc2)))))
+              (let ((line (nth 1 location))
+                    (start (+ (line-beginning-position)
+                              (nth 2 location)))
+                    (end (+ (line-end-position)
+                            (nth 3 location))))
+                ;; Insert the \n first, else we extend the overlay.
+                (insert line "\n")
+                (elpy-multiedit-add-overlay start end)))
+            (insert "\n"))
+          (goto-char (point-min))
+          (display-buffer (current-buffer)
+                          nil
+                          'visible))))))
+
+;;;;;;;;;;;;;;;;;;;;;
+;;; Occur Definitions
+
+(defun elpy-occur-definitions ()
+  "Display an occur buffer of all definitions in the current buffer.
+
+Also, switch to that buffer."
+  (interactive)
+  (let ((list-matching-lines-face nil))
+    (occur "^ *\\(def\\|class\\) "))
+  (let ((window (get-buffer-window "*Occur*")))
+    (if window
+        (select-window window)
+      (switch-to-buffer "*Occur*"))))
+
+;;;;;;;;;;;;;;;;;;;
+;;; Promise objects
+
+(defvar elpy-promise-marker (make-symbol "*elpy-promise*")
+  "An uninterned symbol marking an Elpy promise object.")
+
+(defun elpy-promise (success &optional error)
+  "Return a new promise.
+
+A promise is an object with a success and error callback. If the
+promise is resolved using `elpy-promise-resolve', its success
+callback is called with the given value. The current buffer is
+restored, too.
+
+If the promise is rejected using `elpy-promise-reject', its error
+callback is called. For this function, the current buffer is not
+necessarily restored, as it is also called when the buffer does
+not exist anymore."
+  (vector elpy-promise-marker ; 0 id
+          success             ; 1 success-callback
+          error               ; 2 error-callback
+          (current-buffer)    ; 3 current-buffer
+          nil                 ; 4 run
+          ))
+
+(defun elpy-promise-p (obj)
+  "Return non-nil if the argument is a promise object."
+  (and (vectorp obj)
+       (= (length obj) 5)
+       (eq (aref obj 0) elpy-promise-marker)))
+
+(defsubst elpy-promise-success-callback (promise)
+  "Return the success callback for PROMISE."
+  (aref promise 1))
+
+(defsubst elpy-promise-error-callback (promise)
+  "Return the error callback for PROMISE."
+  (aref promise 2))
+
+(defsubst elpy-promise-buffer (promise)
+  "Return the buffer for PROMISE."
+  (aref promise 3))
+
+(defsubst elpy-promise-resolved-p (promise)
+  "Return non-nil if the PROMISE has been resolved or rejected."
+  (aref promise 4))
+
+(defsubst elpy-promise-set-resolved (promise)
+  "Mark PROMISE as having been resolved."
+  (aset promise 4 t))
+
+(defun elpy-promise-resolve (promise value)
+  "Resolve PROMISE with VALUE."
+  (when (not (elpy-promise-resolved-p promise))
+    (unwind-protect
+        (let ((success-callback (elpy-promise-success-callback promise)))
+          (when success-callback
+            (condition-case err
+                (with-current-buffer (elpy-promise-buffer promise)
+                  (funcall success-callback value))
+              (error
+               (elpy-promise-reject promise err)))))
+      (elpy-promise-set-resolved promise))))
+
+(defun elpy-promise-reject (promise reason)
+  "Reject PROMISE because of REASON."
+  (when (not (elpy-promise-resolved-p promise))
+    (unwind-protect
+        (let ((error-callback (elpy-promise-error-callback promise)))
+          (when error-callback
+            (if (buffer-live-p (elpy-promise-buffer promise))
+                (with-current-buffer (elpy-promise-buffer promise)
+                  (funcall error-callback reason))
+              (with-temp-buffer
+                (funcall error-callback reason)))))
+      (elpy-promise-set-resolved promise))))
+
+(defun elpy-promise-wait (promise &optional timeout)
+  "Wait for PROMISE to be resolved, for up to TIMEOUT seconds.
+
+This will accept process output while waiting.
+
+This will wait for the current Elpy RPC process specifically, as
+Emacs currently has a bug where it can wait for the entire time
+of the timeout, even if output arrives.
+
+See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17647"
+  (let ((end-time (when timeout
+                    (time-add (current-time)
+                              (seconds-to-time timeout))))
+        (process (get-buffer-process (elpy-rpc--get-rpc-buffer))))
+    (while (and (not (elpy-promise-resolved-p promise))
+                (or (not end-time)
+                    (time-less-p (current-time)
+                                 end-time)))
+      (accept-process-output process timeout))))
+
+;;;;;;;
+;;; RPC
+
+;; elpy-rpc is a simple JSON-based RPC protocol. It's mostly JSON-RPC
+;; 1.0, except we do not implement the full protocol as we do not need
+;; all the features. Emacs starts a Python subprocess which runs a
+;; special module. The module reads JSON-RPC requests and responds
+;; with JSON-RPC responses.
+
+(defvar elpy-rpc--call-id 0
+  "Call id of the last elpy-rpc call.
+
+Used to associate responses to callbacks.")
+(make-variable-buffer-local 'elpy-rpc--call-id)
+
+(defvar elpy-rpc--buffer-p nil
+  "True iff the current buffer is an elpy-rpc buffer.")
+(make-variable-buffer-local 'elpy-rpc--buffer-p)
+
+(defvar elpy-rpc--buffer nil
+  "The elpy-rpc buffer associated with this buffer.")
+(make-variable-buffer-local 'elpy-rpc--buffer)
+
+(defvar elpy-rpc--backend-library-root nil
+  "The project root used by this backend.")
+(make-variable-buffer-local 'elpy-rpc--backend-library-root)
+
+(defvar elpy-rpc--backend-python-command nil
+  "The Python interpreter used by this backend.")
+(make-variable-buffer-local 'elpy-rpc--backend-python-command)
+
+(defvar elpy-rpc--backend-callbacks nil
+  "The callbacks registered for calls to the current backend.
+
+This maps call IDs to functions.")
+(make-variable-buffer-local 'elpy-rpc--backend-callbacks)
+
+(defvar elpy-rpc--last-call nil
+  "The time of the last RPC call issued for this backend.")
+(make-variable-buffer-local 'elpy-rpc--last-call)
+
+(defvar elpy-rpc--last-error-popup nil
+  "The last time an error popup happened.")
+
+(defun elpy-rpc (method params &optional success error)
+  "Call METHOD with PARAMS in the backend.
+
+If SUCCESS and optionally ERROR is given, return immediately and
+call those when a result is available. Otherwise, wait for a
+result and return that."
+  (when (not error)
+    (setq error #'elpy-rpc--default-error-callback))
+  (if success
+      (elpy-rpc--call method params success error)
+    (elpy-rpc--call-blocking method params)))
+
+(defun elpy-rpc--call-blocking (method-name params)
+  "Call METHOD-NAME with PARAMS in the current RPC backend.
+
+Returns the result, blocking until this arrived."
+  (let* ((result-arrived nil)
+         (error-occured nil)
+         (result-value nil)
+         (error-object nil)
+         (promise (elpy-rpc--call method-name params
+                                  (lambda (result)
+                                    (setq result-value result
+                                          result-arrived t))
+                                  (lambda (err)
+                                    (setq error-object err
+                                          error-occured t)))))
+    (elpy-promise-wait promise elpy-rpc-timeout)
+    (cond
+     (error-occured
+      (elpy-rpc--default-error-callback error-object))
+     (result-arrived
+      result-value)
+     (t
+      (error "Timeout during RPC call %s from backend"
+             method-name)))))
+
+(defun elpy-rpc--call (method-name params success error)
+  "Call METHOD-NAME with PARAMS in the current RPC backend.
+
+When a result is available, SUCCESS will be called with that
+value as its sole argument. If an error occurs, ERROR will be
+called with the error list.
+
+Returns a PROMISE object."
+  (let ((promise (elpy-promise success error)))
+    (with-current-buffer (elpy-rpc--get-rpc-buffer)
+      (setq elpy-rpc--call-id (1+ elpy-rpc--call-id)
+            elpy-rpc--last-call (float-time))
+      (elpy-rpc--register-callback elpy-rpc--call-id promise)
+      (process-send-string
+       (get-buffer-process (current-buffer))
+       (concat (json-encode `((id . ,elpy-rpc--call-id)
+                              (method . ,method-name)
+                              (params . ,params)))
+               "\n")))
+    promise))
+
+(defun elpy-rpc--register-callback (call-id promise)
+  "Register for PROMISE to be called when CALL-ID returns.
+
+Must be called in an elpy-rpc buffer."
+  (when (not elpy-rpc--buffer-p)
+    (error "Must be called in RPC buffer"))
+  (when (not elpy-rpc--backend-callbacks)
+    (setq elpy-rpc--backend-callbacks (make-hash-table :test #'equal)))
+  (puthash call-id promise elpy-rpc--backend-callbacks))
+
+(defun elpy-rpc--get-rpc-buffer ()
+  "Return the RPC buffer associated with the current buffer,
+creating one if necessary."
+  (when (not (elpy-rpc--process-buffer-p elpy-rpc--buffer))
+    (setq elpy-rpc--buffer
+          (or (elpy-rpc--find-buffer (elpy-library-root)
+                                     elpy-rpc-python-command)
+              (elpy-rpc--open (elpy-library-root)
+                              elpy-rpc-python-command))))
+  elpy-rpc--buffer)
+
+(defun elpy-rpc--process-buffer-p (buffer)
+  "Return non-nil when BUFFER is a live elpy-rpc process buffer.
+
+If BUFFER is a buffer for an elpy-rpc process, but the process
+died, this will kill the process and buffer."
+  (cond
+   ((or (not buffer)
+        (not (buffer-live-p buffer)))
+    nil)
+   ((not (buffer-local-value 'elpy-rpc--buffer-p buffer))
+    nil)
+   ((and (get-buffer-process buffer)
+         (process-live-p (get-buffer-process buffer)))
+    t)
+   (t
+    (ignore-errors
+      (kill-process (get-buffer-process buffer)))
+    (ignore-errors
+      (kill-buffer buffer))
+    nil)))
+
+(defun elpy-rpc--find-buffer (library-root python-command)
+  "Return an existing RPC buffer for this project root and command."
+  (catch 'return
+    (let ((full-python-command (executable-find python-command)))
+      (dolist (buf (buffer-list))
+        (when (and (elpy-rpc--process-buffer-p buf)
+                   (equal (buffer-local-value 'elpy-rpc--backend-library-root
+                                              buf)
+                          library-root)
+                   (equal (buffer-local-value 'elpy-rpc--backend-python-command
+                                              buf)
+                          full-python-command))
+          (throw 'return buf))))
+    nil))
+
+(defun elpy-rpc--open (library-root python-command)
+  "Start a new RPC process and return the associated buffer."
+  (when (and elpy-rpc-backend
+             (not (stringp elpy-rpc-backend)))
+    (error "`elpy-rpc-backend' should be nil or a string."))
+  (elpy-rpc--cleanup-buffers)
+  (let* ((full-python-command (executable-find python-command))
+         (name (format " *elpy-rpc [project:%s python:%s]*"
+                       library-root
+                       full-python-command))
+         (new-elpy-rpc-buffer (generate-new-buffer name))
+         (proc nil))
+    (when (not full-python-command)
+      (error "Can't find Python command, configure `elpy-rpc-python-command'"))
+    (with-current-buffer new-elpy-rpc-buffer
+      (setq elpy-rpc--buffer-p t
+            elpy-rpc--buffer (current-buffer)
+            elpy-rpc--backend-library-root library-root
+            elpy-rpc--backend-python-command full-python-command
+            default-directory "/"
+            proc (condition-case err
+                     (let ((process-connection-type nil)
+                           (process-environment (elpy-rpc--environment)))
+                       (start-process name
+                                      (current-buffer)
+                                      full-python-command
+                                      "-W" "ignore"
+                                      "-m" "elpy.__main__"))
+                   (error
+                    (elpy-config-error
+                     "Elpy can't start Python (%s: %s)"
+                     (car err) (cadr err)))))
+      (set-process-query-on-exit-flag proc nil)
+      (set-process-sentinel proc #'elpy-rpc--sentinel)
+      (set-process-filter proc #'elpy-rpc--filter)
+      (elpy-rpc-init elpy-rpc-backend library-root
+                     (lambda (result)
+                       (let ((backend (cdr (assq 'backend result))))
+                         (when (and elpy-rpc-backend
+                                    (not (equal backend elpy-rpc-backend)))
+                           (elpy-config-error
+                            "Can't set backend %s, using %s instead"
+                            elpy-rpc-backend backend))))))
+    new-elpy-rpc-buffer))
+
+(defun elpy-rpc--cleanup-buffers ()
+  "Close RPC buffers that have not been used in five minutes."
+  (when elpy-rpc-maximum-buffer-age
+    (let ((old (- (float-time)
+                  elpy-rpc-maximum-buffer-age)))
+      (dolist (buffer (buffer-list))
+        (when (and (elpy-rpc--process-buffer-p buffer)
+                   (< (or (buffer-local-value 'elpy-rpc--last-call buffer)
+                          old)
+                      old))
+          (ignore-errors
+            (kill-process (get-buffer-process buffer)))
+          (ignore-errors
+            (kill-buffer buffer)))))))
+
+(defun elpy-rpc--sentinel (process event)
+  "The sentinel for the RPC process.
+
+As process sentinels are only ever called when the process
+terminates, this will call the error handler of all registered
+RPC calls with the event."
+  (let ((buffer (process-buffer process))
+        (err (list 'process-sentinel (substring event 0 -1))))
+    (when (and buffer
+               (buffer-live-p buffer))
+      (with-current-buffer buffer
+        (when elpy-rpc--backend-callbacks
+          (maphash (lambda (call-id promise)
+                     (ignore-errors
+                       (elpy-promise-reject promise err)))
+                   elpy-rpc--backend-callbacks)
+          (setq elpy-rpc--backend-callbacks nil))))))
+
+(defun elpy-rpc--filter (process output)
+  "The filter for the RPC process."
+  (let ((buffer (process-buffer process)))
+    (when (and buffer
+               (buffer-live-p buffer))
+      (with-current-buffer buffer
+        (goto-char (point-max))
+        (insert output)
+        (while (progn
+                 (goto-char (point-min))
+                 (search-forward "\n" nil t))
+          (let ((line-end (point))
+                (json nil)
+                (did-read-json nil))
+            (goto-char (point-min))
+            (condition-case err
+                (progn
+                  (setq json (let ((json-array-type 'list))
+                               (json-read)))
+                  (if (listp json)
+                      (setq  line-end (1+ (point))
+                             did-read-json t)
+                    (goto-char (point-min))))
+              (error
+               (goto-char (point-min))))
+            (cond
+             (did-read-json
+              (delete-region (point-min) line-end)
+              (elpy-rpc--handle-json json))
+             ((looking-at "elpy-rpc ready\n")
+              (replace-match "")
+              (elpy-rpc--check-backend-version "1.1"))
+             ((looking-at "elpy-rpc ready (\\([^ ]*\\))\n")
+              (let ((rpc-version (match-string 1)))
+                (replace-match "")
+                (elpy-rpc--check-backend-version rpc-version)))
+             ((looking-at ".*No module named elpy\n")
+              (replace-match "")
+              (elpy-config-error "Elpy module not found"))
+             (t
+              (let ((line (buffer-substring (point-min)
+                                            line-end)))
+                (delete-region (point-min) line-end)
+                (elpy-rpc--handle-unexpected-line line))))))))))
+
+(defun elpy-rpc--check-backend-version (rpc-version)
+  "Check that we are using the right version."
+  (when (not (equal rpc-version elpy-version))
+    (elpy-insert--popup "*Elpy Version Mismatch*"
+      (elpy-insert--header "Elpy Version Mismatch")
+      (elpy-insert--para
+       "You are not using the same version of Elpy in Emacs Lisp"
+       "compared to Python. This can cause random problems. Please"
+       "do make sure to use compatible versions.\n")
+      (insert
+       "\n"
+       "Elpy Emacs Lisp version: " elpy-version "\n"
+       "Elpy Python version....: " rpc-version "\n"))))
+
+(defun elpy-rpc--handle-unexpected-line (line)
+  "Handle an unexpected line from the backend.
+
+This is usually an error or backtrace."
+  (let ((buf (get-buffer "*Elpy Output*")))
+    (when (not buf)
+      (elpy-insert--popup "*Elpy Output*"
+        (elpy-insert--header "Output from Backend")
+        (elpy-insert--para
+         "There was some unexpected output from the Elpy backend. "
+         "This is usually some module that does not use correct logging, "
+         "but might indicate a configuration problem.\n\n")
+        (elpy-insert--header "Output")
+        (setq buf (current-buffer))))
+    (with-current-buffer buf
+      (goto-char (point-max))
+      (let ((inhibit-read-only t))
+        (insert line)))))
+
+(defun elpy-rpc--handle-json (json)
+  "Handle a single JSON object from the RPC backend."
+  (let ((call-id (cdr (assq 'id json)))
+        (error-object (cdr (assq 'error json)))
+        (result (cdr (assq 'result json))))
+    (let ((promise (gethash call-id elpy-rpc--backend-callbacks)))
+      (when (not promise)
+        (error "Received a response for unknown call-id %s" call-id))
+      (remhash call-id elpy-rpc--backend-callbacks)
+      (if error-object
+          (elpy-promise-reject promise error-object)
+        (elpy-promise-resolve promise result)))))
+
+(defun elpy-rpc--default-error-callback (error-object)
+  "Display an error from the RPC backend."
+  ;; We actually might get an (error "foo") thing here.
+  (if (and (consp error-object)
+           (not (consp (car error-object))))
+      (signal (car error-object) (cdr error-object))
+    (let ((message (cdr (assq 'message error-object)))
+          (code (cdr (assq 'code error-object)))
+          (data (cdr (assq 'data error-object))))
+      (cond
+       ((not (numberp code))
+        (error "Bad response from RPC: %S" error-object))
+       ((< code 300)
+        (message "Elpy warning: %s" message))
+       ((< code 500)
+        (error "Elpy error: %s" message))
+       ((and elpy-rpc-error-timeout
+             elpy-rpc--last-error-popup
+             (<= (float-time)
+                 (+ elpy-rpc--last-error-popup
+                    elpy-rpc-error-timeout)))
+        (message "Elpy error popup ignored, see `elpy-rpc-error-timeout': %s"
+                 message))
+       (t
+        (let ((config (elpy-config--get-config)))
+          (elpy-insert--popup "*Elpy Error*"
+            (elpy-insert--header "Elpy Error")
+            (elpy-insert--para
+             "The backend encountered an unexpected error. This indicates "
+             "a bug in Elpy. Please open a bug report with the data below "
+             "in the Elpy bug tracker:")
+            (insert "\n"
+                    "\n")
+            (insert-button
+             "https://github.com/jorgenschaefer/elpy/issues/new"
+             'action (lambda (button)
+                       (browse-url (button-get button 'url)))
+             'url "https://github.com/jorgenschaefer/elpy/issues/new")
+            (insert "\n"
+                    "\n"
+                    "```\n")
+            (elpy-insert--header "Error Message")
+            (insert message "\n\n")
+            (elpy-insert--header "Configuration")
+            (elpy-config--insert-configuration-table config)
+            (let ((traceback (cdr (assq 'traceback data))))
+              (when traceback
+                (insert "\n")
+                (elpy-insert--header "Traceback")
+                (insert traceback)))
+            (let ((jedi-info (cdr (assq 'jedi_debug_info data))))
+              (when jedi-info
+                (insert "\n")
+                (elpy-insert--header "Jedi Debug Information")
+                (pcase (cdr (assq 'debug_info jedi-info))
+                  (`nil (insert "Jedi did not emit any debug info.\n"))
+                  (infos
+                   (dolist (outstr infos)
+                     (insert outstr "\n"))))
+                (insert "\n"
+                        "```\n"
+                        "\n"
+                        "Reproduction:\n"
+                        "\n")
+                (let ((method (cdr (assq 'method jedi-info)))
+                      (source (cdr (assq 'source jedi-info)))
+                      (script-args (cdr (assq 'script_args jedi-info))))
+                  (insert "```Python\n")
+                  (insert "import jedi\n"
+                          "\n"
+                          "source = '''\\\n"
+                          source
+                          "'''\n"
+                          "\n"
+                          "script = jedi.Script(" script-args ")\n"
+                          "script." method "()\n"))))
+            (let ((rope-info (cdr (assq 'rope_debug_info data))))
+              (when rope-info
+                (insert "\n")
+                (elpy-insert--header "Rope Debug Information")
+                (insert "```\n"
+                        "\n"
+                        "Reproduction:\n"
+                        "\n")
+                (let ((project-root (cdr (assq 'project_root rope-info)))
+                      (filename (cdr (assq 'filename rope-info)))
+                      (source (cdr (assq 'source rope-info)))
+                      (function-name (cdr (assq 'function_name rope-info)))
+                      (function-args (cdr (assq 'function_args rope-info))))
+                  (insert "```Python\n")
+                  (insert "\n"
+                          "source = '''\n"
+                          source
+                          "'''\n"
+                          "\n")
+                  (insert "project = rope.base.project.Project(\n"
+                          (format "    %S,\n" project-root)
+                          "    ropefolder=None\n"
+                          ")\n")
+                  (insert "resource = rope.base.libutils.path_to_resource(\n"
+                          "    project,\n"
+                          (format "    %S,\n" filename)
+                          "    'file'\n"
+                          ")\n")
+                  (insert (format "%s(\n    %s\n)\n"
+                                  function-name function-args)))))
+            (when (not (= 0 (current-column)))
+              (insert "\n"))
+            (insert "```"))
+          (setq elpy-rpc--last-error-popup (float-time))))))))
+
+(defun elpy-rpc--environment ()
+  "Return a `process-environment' for the RPC process.
+
+This includes `elpy-rpc-pythonpath' in the PYTHONPATH, if set."
+  (if (or (not elpy-rpc-pythonpath)
+          (not (file-exists-p (expand-file-name "elpy/__init__.py"
+                                                elpy-rpc-pythonpath))))
+      process-environment
+    (let* ((old-pythonpath (getenv "PYTHONPATH"))
+           (new-pythonpath (if old-pythonpath
+                               (concat elpy-rpc-pythonpath
+                                       path-separator
+                                       old-pythonpath)
+                             elpy-rpc-pythonpath)))
+      (cons (concat "PYTHONPATH=" new-pythonpath)
+            process-environment))))
+
+(defun elpy-rpc--buffer-contents ()
+  "Return the contents of the current buffer.
+
+This returns either a string, or a file object for the RPC
+protocol if the buffer is larger than
+`elpy-rpc-large-buffer-size'."
+  (if (< (buffer-size) elpy-rpc-large-buffer-size)
+      (buffer-string)
+    (let ((file-name (make-temp-file "elpy-rpc-"))
+          (coding-system-for-write 'utf-8))
+      (write-region nil nil file-name nil :nomessage)
+      `((filename . ,file-name)
+        (delete_after_use . t)))))
+
+(defun elpy-rpc--region-contents ()
+  "Return the selected region as a string."
+  (if (use-region-p)
+      (buffer-substring (region-beginning) (region-end))))
+
+(defun elpy-rpc--disconnect ()
+  "Disconnect rpc process from elpy buffers."
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (when (memq 'elpy-mode minor-mode-list)
+        (setq elpy-rpc--buffer nil)))))
+
+;; RPC API functions
+
+(defun elpy-rpc-restart ()
+  "Restart all RPC processes."
+  (interactive)
+  (dolist (buffer (buffer-list))
+    (when (elpy-rpc--process-buffer-p buffer)
+      (ignore-errors
+        (kill-process (get-buffer-process buffer)))
+      (ignore-errors
+        (kill-buffer buffer)))))
+
+(defun elpy-rpc-init (backend library-root &optional success error)
+  "Initialize the backend.
+
+This has to be called as the first method, else Elpy won't be
+able to respond to other calls."
+  (elpy-rpc "init"
+            ;; This uses a vector because otherwise, json-encode in
+            ;; older Emacsen gets seriously confused, especially when
+            ;; backend is nil.
+            (vector `((backend . ,backend)
+                      (project_root . ,(expand-file-name library-root))))
+            success error))
+
+(defun elpy-rpc-get-calltip (&optional success error)
+  "Call the get_calltip API function.
+
+Returns a calltip string for the function call at point."
+  (when (< (buffer-size) elpy-rpc-ignored-buffer-size)
+    (elpy-rpc "get_calltip"
+              (list buffer-file-name
+                    (elpy-rpc--buffer-contents)
+                    (- (point)
+                       (point-min)))
+              success error)))
+
+(defun elpy-rpc-get-completions (&optional success error)
+  "Call the get_completions API function.
+
+Returns a list of possible completions for the Python symbol at
+point."
+  (when (< (buffer-size) elpy-rpc-ignored-buffer-size)
+    (elpy-rpc "get_completions"
+              (list buffer-file-name
+                    (elpy-rpc--buffer-contents)
+                    (- (point)
+                       (point-min)))
+              success error)))
+
+(defun elpy-rpc-get-completion-docstring (completion &optional success error)
+  "Call the get_completion_docstring API function.
+
+Returns a doc string or nil"
+  (elpy-rpc "get_completion_docstring" (list completion) success error))
+
+(defun elpy-rpc-get-completion-location (completion &optional success error)
+  "Call the get_completion_location API function.
+
+Returns a list of file name and line number, or nil"
+  (elpy-rpc "get_completion_location" (list completion) success error))
+
+(defun elpy-rpc-get-definition (&optional success error)
+  "Call the find_definition API function.
+
+Returns nil or a list of (filename, point)."
+  (elpy-rpc "get_definition"
+            (list buffer-file-name
+                  (elpy-rpc--buffer-contents)
+                  (- (point)
+                     (point-min)))
+            success error))
+
+(defun elpy-rpc-get-docstring (&optional success error)
+  "Call the get_docstring API function.
+
+Returns a possible multi-line docstring for the symbol at point."
+  (elpy-rpc "get_docstring"
+            (list buffer-file-name
+                  (elpy-rpc--buffer-contents)
+                  (- (point)
+                     (point-min)))
+            success error))
+
+(defun elpy-rpc-get-pydoc-completions (prefix &optional success error)
+  "Return a list of modules available in pydoc starting with PREFIX."
+  (elpy-rpc "get_pydoc_completions" (list prefix)
+            success error))
+
+(defun elpy-rpc-get-pydoc-documentation (symbol &optional success error)
+  "Get the Pydoc documentation for SYMBOL.
+
+Returns a possible multi-line docstring."
+  (elpy-rpc "get_pydoc_documentation" (list symbol)
+            success error))
+
+(defun elpy-rpc-get-usages (&optional success error)
+  (elpy-rpc "get_usages"
+            (list buffer-file-name
+                  (elpy-rpc--buffer-contents)
+                  (- (point)
+                     (point-min)))
+            success error))
+
+;;;;;;;;;;;
+;;; Modules
+
+(defvar elpy-modules-initialized-p nil
+  "Boolean, set to true if modules were run with `global-init'.")
+
+(defun elpy-modules-run (command &rest args)
+  "Run COMMAND with ARGS for all modules in `elpy-modules'."
+  (dolist (module elpy-modules)
+    (apply module command args)))
+
+(defun elpy-modules-global-init ()
+  "Run the global-init method of Elpy modules.
+
+Make sure this only happens once."
+  (when (not elpy-modules-initialized-p)
+    (elpy-modules-run 'global-init)
+    (setq elpy-modules-initialized-p t)))
+
+(defun elpy-modules-global-stop ()
+  "Run the global-stop method of Elpy modules.
+
+Make sure this only happens once per global-init call."
+  (when elpy-modules-initialized-p
+    (elpy-modules-run 'global-stop)
+    (setq elpy-modules-initialized-p nil)))
+
+(defun elpy-modules-buffer-init ()
+  "Run the buffer-init method of Elpy modules.
+
+Make sure global-init is called first."
+  (elpy-modules-global-init)
+  (elpy-modules-run 'buffer-init))
+
+(defun elpy-modules-buffer-stop ()
+  "Run the buffer-stop method of Elpy modules."
+  (elpy-modules-run 'buffer-stop))
+
+(defun elpy-modules-remove-modeline-lighter (mode-name)
+  "Remove the lighter for MODE-NAME.
+
+It's not necessary to see (Python Elpy yas company ElDoc) all the
+time. Honestly."
+  (interactive)
+  (cond
+   ((eq mode-name 'eldoc-minor-mode)
+    (setq eldoc-minor-mode-string nil))
+   (t
+    (let ((cell (assq mode-name minor-mode-alist)))
+      (when cell
+        (setcdr cell
+                (list "")))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Module: Sane Defaults
+
+(defun elpy-module-sane-defaults (command &rest args)
+  (pcase command
+    (`buffer-init
+     ;; Set `forward-sexp-function' to nil in python-mode. See
+     ;; http://debbugs.gnu.org/db/13/13642.html
+     (set (make-local-variable 'forward-sexp-function) nil)
+     ;; PEP8 recommends two spaces in front of inline comments.
+     (set (make-local-variable 'comment-inline-offset) 2))
+    (`buffer-stop
+     (kill-local-variable 'forward-sexp-function)
+     (kill-local-variable 'comment-inline-offset))))
+
+;;;;;;;;;;;;;;;;;;;
+;;; Module: Company
+
+(defun elpy-module-company (command &rest args)
+  "Module to support company-mode completions."
+  (pcase command
+    (`global-init
+     (require 'company)
+     (when elpy-company-hide-modeline
+       (elpy-modules-remove-modeline-lighter 'company-mode))
+     (define-key company-active-map (kbd "C-d")
+       'company-show-doc-buffer))
+    (`buffer-init
+     ;; We want immediate completions from company.
+     (set (make-local-variable 'company-idle-delay)
+          0)
+     ;; And annotations should be right-aligned.
+     (set (make-local-variable 'company-tooltip-align-annotations)
+          t)
+     ;; Also, dabbrev in comments and strings is nice.
+     (set (make-local-variable 'company-dabbrev-code-everywhere)
+          t)
+     ;; Add our own backend and remove a bunch of backends that
+     ;; interfere in Python mode.
+     (set (make-local-variable 'company-backends)
+          (cons 'elpy-company-backend
+                (delq 'company-semantic
+                      (delq 'company-ropemacs
+                            (delq 'company-capf
+                                  (mapcar #'identity company-backends))))))
+     (company-mode 1))
+    (`buffer-stop
+     (company-mode -1)
+     (kill-local-variable 'company-idle-delay)
+     (kill-local-variable 'company-tooltip-align-annotations)
+     (kill-local-variable 'company-backends))
+    ))
+
+(defvar elpy-company--cache nil
+  "Buffer-local cache for candidate information.")
+(make-variable-buffer-local 'elpy-company--cache)
+
+(defun elpy-company--cache-clear ()
+  "Clear and initialize the cache."
+  (if elpy-company--cache
+      (clrhash elpy-company--cache)
+    (setq elpy-company--cache
+          (make-hash-table :test #'equal))))
+
+(defun elpy-company--cache-annotation (name)
+  "Return the cached annotation for NAME."
+  (when elpy-company--cache
+    (cdr (assq 'annotation (gethash name elpy-company--cache)))))
+
+(defun elpy-company--cache-meta (name)
+  "Return the cached annotation for NAME."
+  (when elpy-company--cache
+    (cdr (assq 'meta (gethash name elpy-company--cache)))))
+
+(defun elpy-company--cache-name (name)
+  "Return the cached name for NAME.
+
+Confused yet? We pass \"our\" name, that is, prefix + suffix,
+here, and return the \"name\" as used by the backend."
+  (when elpy-company--cache
+    (cdr (assq 'name (gethash name elpy-company--cache)))))
+
+(defun elpy-company--cache-completions (prefix result)
+  "Store RESULT in the candidate cache and return candidates."
+  (elpy-company--cache-clear)
+  (mapcar (lambda (completion)
+            (let* ((suffix (cdr (assq 'suffix completion)))
+                   (name (concat prefix suffix)))
+              (puthash name completion elpy-company--cache)
+              name))
+          result))
+
+(defun elpy-company-backend (command &optional arg &rest ignored)
+  "A company-mode backend for Elpy."
+  (interactive (list 'interactive))
+  (pcase command
+    (`interactive
+     (company-begin-backend 'elpy-company-backend))
+    ;; init => Called once per buffer
+    ;; prefix => return the prefix at point
+    (`prefix
+     (when (and elpy-mode
+                (not (company-in-string-or-comment)))
+       (company-grab-symbol-cons "\\." 1)))
+    ;; candidates <prefix> => return candidates for this prefix
+    (`candidates
+     (cons :async
+           (lambda (callback)
+             (elpy-rpc-get-completions
+              (lambda (result)
+                (elpy-company--cache-clear)
+                (funcall
+                 callback
+                 (cond
+                  ;; The backend returned something
+                  (result
+                   (elpy-company--cache-completions arg result))
+                  ;; Nothing from the backend, try dabbrev-code.
+                  ((> (length arg) company-minimum-prefix-length)
+                   (elpy--sort-and-strip-duplicates
+                    (company-dabbrev-code 'candidates arg)))
+                  ;; Well, ok, let's go meh.
+                  (t
+                   nil))))))))
+    ;; sorted => t if the list is already sorted
+    (`sorted
+     t)
+    ;; duplicates => t if there could be duplicates
+    (`duplicates
+     nil)
+    ;; no-cache <prefix> => t if company shouldn't cache results
+    ;; meta <candidate> => short docstring for minibuffer
+    (`meta
+     (let ((meta (elpy-company--cache-meta arg)))
+       (when (and meta
+                  (string-match "\\`\\(.*\n.*\\)\n.*" meta))
+         (setq meta (match-string 1 meta)))
+       meta))
+    ;; annotation <candidate> => short docstring for completion buffer
+    (`annotation
+     (elpy-company--cache-annotation arg))
+    ;; doc-buffer <candidate> => put doc buffer in `company-doc-buffer'
+    (`doc-buffer
+     (let* ((name (elpy-company--cache-name arg))
+            (doc (elpy-rpc-get-completion-docstring name)))
+       (when doc
+         (company-doc-buffer doc))))
+    ;; require-match => Never require a match, even if the user
+    ;; started to interact with company. See `company-require-match'.
+    (`require-match
+     'never)
+    ;; location <candidate> => (buffer . point) or (file .
+    ;; line-number)
+    (`location
+     (let* ((name (elpy-company--cache-name arg))
+            (loc (elpy-rpc-get-completion-location name)))
+       (when loc
+         (cons (car loc)
+               (cadr loc)))))
+    ;; match <candidate> => for non-prefix based backends
+    ;; post-completion <candidate> => after insertion, for snippets
+    ))
+
+(defun elpy--sort-and-strip-duplicates (seq)
+  "Sort SEQ and remove any duplicates."
+  (sort (delete-dups seq)
+        (lambda (a b)
+          (string< a b))))
+
+;;;;;;;;;;;;;;;;;
+;;; Module: ElDoc
+
+(defun elpy-module-eldoc (command &rest args)
+  "Module to support ElDoc for Python files."
+  (pcase command
+    (`global-init
+     (require 'eldoc)
+     (setq eldoc-minor-mode-string nil))
+    (`buffer-init
+     (set (make-local-variable 'eldoc-documentation-function)
+          'elpy-eldoc-documentation)
+     (eldoc-mode 1))
+    (`buffer-stop
+     (eldoc-mode -1)
+     (kill-local-variable 'eldoc-documentation-function))))
+
+(defun elpy-eldoc-documentation ()
+  "Return some interesting information for the code at point.
+
+This will return flymake errors for the line at point if there
+are any. If not, this will do an asynchronous call to the RPC
+backend to get a call tip, and display that using
+`eldoc-message'. If the backend has no call tip, this will
+display the current class and method instead."
+  (let ((flymake-error (elpy-flymake-error-at-point)))
+    (if flymake-error
+        flymake-error
+      (elpy-rpc-get-calltip
+       (lambda (calltip)
+         (eldoc-message
+          (cond
+           ((not calltip)
+            (when elpy-eldoc-show-current-function
+              (let ((current-defun (python-info-current-defun)))
+                (when current-defun
+                  (format "In: %s()" current-defun)))))
+           ((stringp calltip)
+            calltip)
+           (t
+            (let ((name (cdr (assq 'name calltip)))
+                  (index (cdr (assq 'index calltip)))
+                  (params (cdr (assq 'params calltip))))
+              (when index
+                (setf (nth index params)
+                      (propertize (nth index params)
+                                  'face
+                                  'eldoc-highlight-function-argument)))
+              (format "%s(%s)"
+                      name
+                      (mapconcat #'identity params ", "))
+              ))))))
+      ;; Return the last message until we're done
+      eldoc-last-message)))
+
+;;;;;;;;;;;;;;;;;;;
+;;; Module: Flymake
+
+(defun elpy-module-flymake (command &rest args)
+  "Enable Flymake support for Python."
+  (pcase command
+    (`global-init
+     (require 'flymake)
+     (elpy-modules-remove-modeline-lighter 'flymake-mode)
+     ;; Flymake support using flake8, including warning faces.
+     (when (and (executable-find "flake8")
+                (equal python-check-command
+                       (elpy-flymake--standard-value 'python-check-command)))
+       (setq python-check-command "flake8"))
+
+     ;; Add our initializer function
+     (add-to-list 'flymake-allowed-file-name-masks
+                  '("\\.py\\'" elpy-flymake-python-init)))
+    (`buffer-init
+     ;; `flymake-no-changes-timeout': The original value of 0.5 is too
+     ;; short for Python code, as that will result in the current line
+     ;; to be highlighted most of the time, and that's annoying. This
+     ;; value might be on the long side, but at least it does not, in
+     ;; general, interfere with normal interaction.
+     (set (make-local-variable 'flymake-no-changes-timeout)
+          60)
+
+     ;; `flymake-start-syntax-check-on-newline': This should be nil for
+     ;; Python, as;; most lines with a colon at the end will mean the
+     ;; next line is always highlighted as error, which is not helpful
+     ;; and mostly annoying.
+     (set (make-local-variable 'flymake-start-syntax-check-on-newline)
+          nil)
+
+     ;; Enable warning faces for flake8 output.
+     ;; COMPAT: Obsolete variable as of 24.4
+     (if (boundp 'flymake-warning-predicate)
+         (set (make-local-variable 'flymake-warning-predicate) "^W[0-9]")
+       (set (make-local-variable 'flymake-warning-re) "^W[0-9]"))
+
+     (when (and (buffer-file-name)
+                (executable-find python-check-command))
+       (flymake-mode 1)))
+    (`buffer-stop
+     (flymake-mode -1)
+     (kill-local-variable 'flymake-no-changes-timeout)
+     (kill-local-variable 'flymake-start-syntax-check-on-newline)
+     ;; COMPAT: Obsolete variable as of 24.4
+     (if (boundp 'flymake-warning-predicate)
+         (kill-local-variable 'flymake-warning-predicate)
+       (kill-local-variable 'flymake-warning-re)))))
+
+(defun elpy-flymake-python-init ()
+  ;; Make sure it's not a remote buffer as flymake would not work
+  (when (not (file-remote-p buffer-file-name))
+    (let* ((temp-file (flymake-init-create-temp-buffer-copy
+                       'flymake-create-temp-inplace)))
+      (list python-check-command
+            (list temp-file)
+            ;; Run flake8 from / to avoid import problems (#169)
+            "/"))))
+
+(defun elpy-flymake-next-error ()
+  "Move forward to the next Flymake error and show a
+description."
+  (interactive)
+  (flymake-goto-next-error)
+  (elpy-flymake-show-error))
+
+(defun elpy-flymake-previous-error ()
+  "Move backward to the previous Flymake error and show a
+description."
+  (interactive)
+  (flymake-goto-prev-error)
+  (elpy-flymake-show-error))
+
+(defun elpy-flymake-show-error ()
+  "Show the flymake error message at point."
+  (interactive)
+  (let ((error-message (elpy-flymake-error-at-point)))
+    (when error-message
+      (message "%s" error-message))))
+
+(defun elpy-flymake-error-at-point ()
+  "Return the flymake error at point, or nil if there is none."
+  (when (boundp 'flymake-err-info)
+    (let* ((lineno (line-number-at-pos))
+           (err-info (car (flymake-find-err-info flymake-err-info
+                                                 lineno))))
+      (when err-info
+        (mapconcat #'flymake-ler-text
+                   err-info
+                   ", ")))))
+
+(defun elpy-flymake--standard-value (var)
+  "Return the standard value of the given variable."
+  (let ((sv (get var 'standard-value)))
+    (when (consp sv)
+      (ignore-errors
+        (eval (car sv))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Module: Highlight Indentation
+
+(defun elpy-module-highlight-indentation (command &rest args)
+  "Module to highlight indentation in Python files."
+  (pcase command
+    (`global-init
+     (require 'highlight-indentation))
+    (`buffer-init
+     (highlight-indentation-mode 1))
+    (`buffer-stop
+     (highlight-indentation-mode -1))))
+
+;;;;;;;;;;;;;;;;;;
+;;; Module: pyvenv
+
+(defun elpy-module-pyvenv (command &rest args)
+  "Module to display the current virtualenv in the mode line."
+  (pcase command
+    (`global-init
+     (pyvenv-mode 1))
+    (`global-stop
+     (pyvenv-mode -1))))
+
+;;;;;;;;;;;;;;;;;;;;;
+;;; Module: Yasnippet
+
+(defun elpy-module-yasnippet (command &rest args)
+  "Module to enable YASnippet snippets."
+  (pcase command
+    (`global-init
+     (require 'yasnippet)
+     (elpy-modules-remove-modeline-lighter 'yas-minor-mode)
+
+     ;; We provide some YASnippet snippets. Add them.
+
+     ;; yas-snippet-dirs can be a string for a single directory. Make
+     ;; sure it's a list in that case so we can add our own entry.
+     (when (not (listp yas-snippet-dirs))
+       (setq yas-snippet-dirs (list yas-snippet-dirs)))
+     (add-to-list 'yas-snippet-dirs
+                  (concat (file-name-directory (locate-library "elpy"))
+                          "snippets/")
+                  t)
+
+     ;; Now load yasnippets.
+     (yas-reload-all))
+    (`global-stop
+     (setq yas-snippet-dirs
+           (delete (concat (file-name-directory (locate-library "elpy"))
+                           "snippets/")
+                   yas-snippet-dirs)))
+    (`buffer-init
+     (yas-minor-mode 1))
+    (`buffer-stop
+     (yas-minor-mode -1))))
+
+;;;;;;;;;;;;;;;;;;
+;;; Module: autopep8
+
+(defun elpy-autopep8-fix-code ()
+  "Automatically formats Python code to conform to the PEP 8 style guide."
+  (interactive)
+  (let ((line (line-number-at-pos))
+        (col (current-column)))
+    (if (use-region-p)
+        (let ((new-block (elpy-rpc "fix_code" (list (elpy-rpc--region-contents))))
+              (beg (region-beginning)) (end (region-end)))
+          (elpy-buffer--replace-region beg end new-block))
+      ;; Vector instead of list, json.el in Emacs 24.3 and before
+      ;; breaks for single-element lists of alists.
+      (let ((new-block (elpy-rpc "fix_code" (vector (elpy-rpc--buffer-contents))))
+            (beg (point-min)) (end (point-max)))
+        (elpy-buffer--replace-region beg end new-block)))
+    (forward-line (1- line))
+    (forward-char col)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Backwards compatibility
+
+;; Functions for Emacs 24 before 24.3
+(when (not (fboundp 'python-info-current-defun))
+  (defalias 'python-info-current-defun 'python-current-defun))
+
+(when (not (fboundp 'python-nav-forward-statement))
+  (defun python-nav-forward-statement (&rest ignored)
+    "Function added in Emacs 24.3"
+    (error "Enhanced Python navigation only available in Emacs 24.3+")))
+
+(when (not (fboundp 'python-nav-backward-up-list))
+  (defun python-nav-backward-up-list ()
+    "Compatibility function for older Emacsen"
+    (ignore-errors
+      (backward-up-list))))
+
+(when (not (fboundp 'python-shell-calculate-exec-path))
+  (defun python-shell-calculate-exec-path ()
+    "Compatibility function for older Emacsen."
+    exec-path))
+
+(when (not (fboundp 'python-shell-calculate-process-environment))
+  (defun python-shell-calculate-process-environment ()
+    "Compatibility function for older Emacsen."
+    process-environment))
+
+(when (not (fboundp 'python-shell-get-process-name))
+  (defun python-shell-get-process-name (dedicated)
+    "Compatibility function for older Emacsen."
+    "Python"))
+
+(when (not (fboundp 'python-shell-parse-command))
+  (defun python-shell-parse-command ()
+    "Compatibility function for older Emacsen."
+    python-python-command))
+
+(when (not (fboundp 'python-shell-send-buffer))
+  (defun python-shell-send-buffer (&optional arg)
+    (python-send-buffer)))
+
+(when (not (fboundp 'python-shell-send-string))
+  (defalias 'python-shell-send-string 'python-send-string))
+
+(when (not (fboundp 'python-indent-shift-right))
+  (defalias 'python-indent-shift-right 'python-shift-right))
+
+(when (not (fboundp 'python-indent-shift-left))
+  (defalias 'python-indent-shift-left 'python-shift-left))
+
+;; Emacs 24.2 made `locate-dominating-file' accept a predicate instead
+;; of a string. Simply overwrite the current one, it's
+;; backwards-compatible. The code below is taken from Emacs 24.3.
+(when (or (< emacs-major-version 24)
+          (and (= emacs-major-version 24)
+               (<= emacs-minor-version 2)))
+  (defun locate-dominating-file (file name)
+    "Look up the directory hierarchy from FILE for a directory containing NAME.
+Stop at the first parent directory containing a file NAME,
+and return the directory.  Return nil if not found.
+Instead of a string, NAME can also be a predicate taking one argument
+\(a directory) and returning a non-nil value if that directory is the one for
+which we're looking."
+    ;; We used to use the above locate-dominating-files code, but the
+    ;; directory-files call is very costly, so we're much better off doing
+    ;; multiple calls using the code in here.
+    ;;
+    ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
+    ;; `name' in /home or in /.
+    (setq file (abbreviate-file-name file))
+    (let ((root nil)
+          ;; `user' is not initialized outside the loop because
+          ;; `file' may not exist, so we may have to walk up part of the
+          ;; hierarchy before we find the "initial UID".  Note: currently unused
+          ;; (user nil)
+          try)
+      (while (not (or root
+                      (null file)
+                      ;; FIXME: Disabled this heuristic because it is sometimes
+                      ;; inappropriate.
+                      ;; As a heuristic, we stop looking up the hierarchy of
+                      ;; directories as soon as we find a directory belonging
+                      ;; to another user.  This should save us from looking in
+                      ;; things like /net and /afs.  This assumes that all the
+                      ;; files inside a project belong to the same user.
+                      ;; (let ((prev-user user))
+                      ;;   (setq user (nth 2 (file-attributes file)))
+                      ;;   (and prev-user (not (equal user prev-user))))
+                      (string-match locate-dominating-stop-dir-regexp file)))
+        (setq try (if (stringp name)
+                      (file-exists-p (expand-file-name name file))
+                    (funcall name file)))
+        (cond (try (setq root file))
+              ((equal file (setq file (file-name-directory
+                                       (directory-file-name file))))
+               (setq file nil))))
+      (if root (file-name-as-directory root))))
+  )
+
+;; highlight-indentation 0.5 does not use modes yet
+(when (not (fboundp 'highlight-indentation-mode))
+  (defun highlight-indentation-mode (on-or-off)
+    (cond
+     ((and (> on-or-off 0)
+           (not highlight-indent-active))
+      (highlight-indentation))
+     ((and (<= on-or-off 0)
+           highlight-indent-active)
+      (highlight-indentation)))))
+
+
+(provide 'elpy)
+;;; elpy.el ends here
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/__init__.py b/emacs.d/elpa/elpy-20151101.401/elpy/__init__.py
new file mode 100644
index 0000000..6958eec
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/__init__.py
@@ -0,0 +1,41 @@
+# Elpy, the Emacs Lisp Python Environment
+
+# Copyright (C) 2013 Jorgen Schaefer
+
+# Author: Jorgen Schaefer <contact@jorgenschaefer.de>
+# URL: http://github.com/jorgenschaefer/elpy
+
+# 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/>.
+
+"""The Emacs Lisp Python Environment.
+
+Elpy is a mode for Emacs to support writing Python code. This package
+provides the backend within Python to support auto-completion,
+documentation extraction, and navigation.
+
+Emacs will start the protocol by running the module itself, like so:
+
+  python -m elpy
+
+This will emit a greeting string on a single line, and then wait for
+the protocol to start. Details of the protocol can be found in
+elpy.rpc.
+
+This package is unlikely to be useful on its own.
+
+"""
+
+__author__ = "Jorgen Schaefer"
+__version__ = "1.10.0"
+__license__ = "GPL"
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/__main__.py b/emacs.d/elpa/elpy-20151101.401/elpy/__main__.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/__main__.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/__main__.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/auto_pep8.py b/emacs.d/elpa/elpy-20151101.401/elpy/auto_pep8.py
new file mode 100644
index 0000000..8606310
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/auto_pep8.py
@@ -0,0 +1,21 @@
+"""Glue for the "autopep8" library.
+
+"""
+
+from elpy.rpc import Fault
+
+
+try:
+    import autopep8
+except ImportError:  # pragma: no cover
+    autopep8 = None
+
+
+def fix_code(code):
+    """Formats Python code to conform to the PEP 8 style guide.
+
+    """
+    if not autopep8:
+        raise Fault('autopep8 not installed, cannot fix code.',
+                    code=400)
+    return autopep8.fix_code(code, apply_config=True)
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/compat.py b/emacs.d/elpa/elpy-20151101.401/elpy/compat.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/compat.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/compat.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/impmagic.py b/emacs.d/elpa/elpy-20151101.401/elpy/impmagic.py
new file mode 100644
index 0000000..3096635
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/impmagic.py
@@ -0,0 +1,107 @@
+"""Glue for the "importmagic" library.
+
+"""
+
+import os
+import sys
+import threading
+
+
+try:
+    import importmagic.index
+    import importmagic.symbols
+    import importmagic.importer
+except ImportError:  # pragma: no cover
+    importmagic = None
+
+
+class ImportMagicError(Exception):
+    """Used to pass defined errors from importmagic to the RPC layer."""
+
+
+class ImportMagic(object):
+
+    def __init__(self):
+        self.is_enabled = bool(importmagic)
+        # fail_message is reported to the user when symbol_index
+        # is (still) None
+        self.fail_message = "symbol index is not yet ready"
+        self.project_root = None
+        self.symbol_index = None
+        self.favorites = set()
+        self._thread = None
+
+    def _build_symbol_index(self, project_root, custom_path, blacklist_re):
+        try:
+            index = importmagic.index.SymbolIndex(blacklist_re=blacklist_re)
+            if os.environ.get('ELPY_TEST'):
+                # test suite support: do not index the whole PYTHONPATH, it
+                # takes much too long
+                index.build_index([])
+            elif custom_path:
+                index.build_index(custom_path)
+            else:
+                index.build_index([project_root] + sys.path)
+        except Exception as e:
+            self.fail_message = "symbol index failed to build: %s" % e
+        else:
+            self.symbol_index = index
+
+    def build_index(self, project_root, custom_path=None, blacklist_re=None):
+        self.project_root = None
+        self._thread = threading.Thread(target=self._build_symbol_index,
+                                        args=(project_root, custom_path,
+                                              blacklist_re))
+        self._thread.setDaemon(True)
+        self._thread.start()
+
+    def get_import_symbols(self, symbol):
+        scores = self.symbol_index.symbol_scores(symbol)
+
+        def sort_key(item):
+            score, mod, var = item
+            if mod in self.favorites:
+                return 2 + score, mod, var
+            return score, mod, var
+
+        scores.sort(key=sort_key, reverse=True)
+        return ["from %s import %s" % (mod, var) if var else "import %s" % mod
+                for (_, mod, var) in scores]
+
+    def add_import(self, source, statement):
+        imports = importmagic.importer.Imports(self.symbol_index, source)
+        if statement.startswith('import '):
+            modname = statement[7:]
+            imports.add_import(modname)
+            self.favorites.add(modname)
+        else:
+            sep = statement.find(' import ')
+            modname = statement[5:sep]
+            if sep > -1:
+                self.favorites.add(modname)
+                imports.add_import_from(statement[5:sep], statement[sep+8:])
+        start_line, end_line, import_block = imports.get_update()
+        return start_line, end_line, import_block
+
+    def get_unresolved_symbols(self, source):
+        try:
+            scope = importmagic.symbols.Scope.from_source(source)
+        except SyntaxError:
+            raise ImportMagicError('cannot find unresolved names in '
+                                   'incomplete file')
+        unres, unref = scope.find_unresolved_and_unreferenced_symbols()
+        return list(unres)
+
+    def remove_unreferenced_imports(self, source):
+        try:
+            scope = importmagic.symbols.Scope.from_source(source)
+        except SyntaxError:
+            raise ImportMagicError('cannot find unreferenced imports in '
+                                   'incomplete file')
+        unres, unref = scope.find_unresolved_and_unreferenced_symbols()
+        # Note: we do not supply "unres" to the call below, since we do
+        # not want to add imports without querying the user from which
+        # module symbols should be imported.
+        start_line, end_line, import_block = importmagic.importer.get_update(
+            source, self.symbol_index, set(), unref)
+        return start_line, end_line, import_block
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/jedibackend.py b/emacs.d/elpa/elpy-20151101.401/elpy/jedibackend.py
new file mode 100644
index 0000000..8989ec6
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/jedibackend.py
@@ -0,0 +1,361 @@
+"""Elpy backend using the Jedi library.
+
+This backend uses the Jedi library:
+
+https://github.com/davidhalter/jedi
+
+"""
+
+import sys
+import traceback
+
+import jedi
+
+from elpy import rpc
+
+
+class JediBackend(object):
+    """The Jedi backend class.
+
+    Implements the RPC calls we can pass on to Jedi.
+
+    Documentation: http://jedi.jedidjah.ch/en/latest/docs/plugin-api.html
+
+    """
+    name = "jedi"
+
+    def __init__(self, project_root):
+        self.project_root = project_root
+        self.completions = {}
+        sys.path.append(project_root)
+
+    def rpc_get_completions(self, filename, source, offset):
+        line, column = pos_to_linecol(source, offset)
+        proposals = run_with_debug(jedi, 'completions',
+                                   source=source, line=line, column=column,
+                                   path=filename, encoding='utf-8')
+        if proposals is None:
+            return []
+        self.completions = dict((proposal.name, proposal)
+                                for proposal in proposals)
+        return [{'name': proposal.name.rstrip("="),
+                 'suffix': proposal.complete.rstrip("="),
+                 'annotation': proposal.type,
+                 'meta': proposal.description}
+                for proposal in proposals]
+
+    def rpc_get_completion_docstring(self, completion):
+        proposal = self.completions.get(completion)
+        if proposal is None:
+            return None
+        else:
+            return proposal.docstring(fast=False)
+
+    def rpc_get_completion_location(self, completion):
+        proposal = self.completions.get(completion)
+        if proposal is None:
+            return None
+        else:
+            return (proposal.module_path, proposal.line)
+
+    def rpc_get_docstring(self, filename, source, offset):
+        line, column = pos_to_linecol(source, offset)
+        try:
+            locations = run_with_debug(jedi, 'goto_definitions',
+                                       source=source, line=line, column=column,
+                                       path=filename, encoding='utf-8',
+                                       re_raise=jedi.NotFoundError)
+        except jedi.NotFoundError:
+            return None
+        if locations:
+            return ('Documentation for {0}:\n\n'.format(
+                locations[-1].full_name) + locations[-1].docstring())
+        else:
+            return None
+
+    def rpc_get_definition(self, filename, source, offset):
+        line, column = pos_to_linecol(source, offset)
+        try:
+            locations = run_with_debug(jedi, 'goto_definitions',
+                                       source=source, line=line, column=column,
+                                       path=filename, encoding='utf-8',
+                                       re_raise=jedi.NotFoundError)
+        except jedi.NotFoundError:
+            return None
+        # goto_definitions() can return silly stuff like __builtin__
+        # for int variables, so we fall back on goto() in those
+        # cases. See issue #76.
+        if (
+                locations and
+                locations[0].module_path is None
+        ):
+            locations = run_with_debug(jedi, 'goto_assignments',
+                                       source=source, line=line,
+                                       column=column,
+                                       path=filename, encoding='utf-8')
+        if not locations:
+            return None
+        else:
+            loc = locations[-1]
+            try:
+                if loc.module_path:
+                    if loc.module_path == filename:
+                        offset = linecol_to_pos(source,
+                                                loc.line,
+                                                loc.column)
+                    else:
+                        with open(loc.module_path) as f:
+                            offset = linecol_to_pos(f.read(),
+                                                    loc.line,
+                                                    loc.column)
+                else:
+                    return None
+            except IOError:
+                return None
+            return (loc.module_path, offset)
+
+    def rpc_get_calltip(self, filename, source, offset):
+        line, column = pos_to_linecol(source, offset)
+        calls = run_with_debug(jedi, 'call_signatures',
+                               source=source, line=line, column=column,
+                               path=filename, encoding='utf-8')
+        if calls:
+            call = calls[0]
+        else:
+            call = None
+        if not call:
+            return None
+        try:
+            call.index
+        except AttributeError as e:
+            if "get_definition" in str(e):
+                # Bug #627 / jedi#573
+                return None
+            elif "get_subscope_by_name" in str(e):
+                # Bug #677 / jedi#628
+                return None
+            else:
+                raise
+        return {"name": call.name,
+                "index": call.index,
+                "params": [param.description for param in call.params]}
+
+    def rpc_get_usages(self, filename, source, offset):
+        """Return the uses of the symbol at offset.
+
+        Returns a list of occurrences of the symbol, as dicts with the
+        fields name, filename, and offset.
+
+        """
+        line, column = pos_to_linecol(source, offset)
+        try:
+            uses = run_with_debug(jedi, 'usages',
+                                  source=source, line=line, column=column,
+                                  path=filename, encoding='utf-8',
+                                  re_raise=(jedi.NotFoundError,))
+        except jedi.NotFoundError:
+            return []
+
+        if uses is None:
+            return None
+        result = []
+        for use in uses:
+            if use.module_path == filename:
+                offset = linecol_to_pos(source, use.line, use.column)
+            elif use.module_path is not None:
+                with open(use.module_path) as f:
+                    text = f.read()
+                offset = linecol_to_pos(text, use.line, use.column)
+
+            result.append({"name": use.name,
+                           "filename": use.module_path,
+                           "offset": offset})
+
+        return result
+
+
+# From the Jedi documentation:
+#
+#   line is the current line you want to perform actions on (starting
+#   with line #1 as the first line). column represents the current
+#   column/indent of the cursor (starting with zero). source_path
+#   should be the path of your file in the file system.
+
+def pos_to_linecol(text, pos):
+    """Return a tuple of line and column for offset pos in text.
+
+    Lines are one-based, columns zero-based.
+
+    This is how Jedi wants it. Don't ask me why.
+
+    """
+    line_start = text.rfind("\n", 0, pos) + 1
+    line = text.count("\n", 0, line_start) + 1
+    col = pos - line_start
+    return line, col
+
+
+def linecol_to_pos(text, line, col):
+    """Return the offset of this line and column in text.
+
+    Lines are one-based, columns zero-based.
+
+    This is how Jedi wants it. Don't ask me why.
+
+    """
+    nth_newline_offset = 0
+    for i in range(line - 1):
+        new_offset = text.find("\n", nth_newline_offset)
+        if new_offset < 0:
+            raise ValueError("Text does not have {0} lines."
+                             .format(line))
+        nth_newline_offset = new_offset + 1
+    offset = nth_newline_offset + col
+    if offset > len(text):
+        raise ValueError("Line {0} column {1} is not within the text"
+                         .format(line, col))
+    return offset
+
+
+def run_with_debug(jedi, name, *args, **kwargs):
+    re_raise = kwargs.pop('re_raise', ())
+    # Remove form feed characters, they confuse Jedi (jedi#424)
+    if 'source' in kwargs:
+        kwargs['source'] = kwargs['source'].replace("\f", " ")
+    try:
+        script = jedi.Script(*args, **kwargs)
+        return getattr(script, name)()
+    except Exception as e:
+        if isinstance(e, re_raise):
+            raise
+        # Bug jedi#417
+        if isinstance(e, TypeError) and str(e) == 'no dicts allowed':
+            return None
+        # Bug jedi#427
+        if isinstance(e, UnicodeDecodeError):
+            return None
+        # Bug jedi#429
+        if isinstance(e, IndexError):
+            return None
+        # Bug jedi#431
+        if isinstance(e, AttributeError) and str(e).endswith("'end_pos'"):
+            return None
+        # Bug in Python 2.6, see #275
+        if isinstance(e, OSError) and e.errno == 13:
+            return None
+        # Bug jedi#466
+        if (
+                isinstance(e, SyntaxError) and
+                "EOL while scanning string literal" in str(e)
+        ):
+            return None
+        # Bug jedi#482
+        if isinstance(e, UnicodeEncodeError):
+            return None
+        # Bug jedi#485
+        if (
+                isinstance(e, ValueError) and
+                "invalid \\x escape" in str(e)
+        ):
+            return None
+        # Bug jedi#485 in Python 3
+        if (
+                isinstance(e, SyntaxError) and
+                "truncated \\xXX escape" in str(e)
+        ):
+            return None
+        # Bug jedi#465
+        if (
+                isinstance(e, SyntaxError) and
+                "encoding declaration in Unicode string" in str(e)
+        ):
+            return None
+        # Bug #337 / jedi#471
+        if (
+                isinstance(e, ImportError) and
+                "No module named" in str(e)
+        ):
+            return None
+        # Bug #365 / jedi#486 - fixed in Jedi 0.8.2
+        if (
+                isinstance(e, UnboundLocalError) and
+                "local variable 'path' referenced before assignment" in str(e)
+        ):
+            return None
+        # Bug #366 / jedi#491
+        if (
+                isinstance(e, ValueError) and
+                "__loader__ is None" in str(e)
+        ):
+            return None
+        # Bug #353
+        if (
+                isinstance(e, OSError) and
+                "No such file or directory" in str(e)
+        ):
+            return None
+        # Bug #561, #564, #570, #588, #593, #599 / jedi#572, jedi#579, jedi#590
+        if isinstance(e, KeyError):
+            return None
+        # Bug #519 / jedi#610
+        if (
+                isinstance(e, RuntimeError) and
+                "maximum recursion depth exceeded" in str(e)
+        ):
+            return None
+        # Bug #563 / jedi#589
+        if (
+                isinstance(e, AttributeError) and
+                "MergedNamesDict" in str(e)
+        ):
+            return None
+        # Bug #615 / jedi#592
+        if (
+                isinstance(e, AttributeError) and
+                "ListComprehension" in str(e)
+        ):
+            return None
+        # Bug #569 / jedi#593
+        if (
+                isinstance(e, AttributeError) and
+                "names_dict" in str(e)
+        ):
+            return None
+
+        from jedi import debug
+
+        debug_info = []
+
+        def _debug(level, str_out):
+            if level == debug.NOTICE:
+                prefix = "[N]"
+            elif level == debug.WARNING:
+                prefix = "[W]"
+            else:
+                prefix = "[?]"
+            debug_info.append(u"{0} {1}".format(prefix, str_out))
+
+        jedi.set_debug_function(_debug, speed=False)
+        try:
+            script = jedi.Script(*args, **kwargs)
+            return getattr(script, name)()
+        except Exception as e:
+            source = kwargs.get('source')
+            sc_args = []
+            sc_args.extend(repr(arg) for arg in args)
+            sc_args.extend("{0}={1}".format(k, "source" if k == "source"
+                                            else repr(v))
+                           for (k, v) in kwargs.items())
+
+            data = {
+                "traceback": traceback.format_exc(),
+                "jedi_debug_info": {'script_args': ", ".join(sc_args),
+                                    'source': source,
+                                    'method': name,
+                                    'debug_info': debug_info}
+            }
+            raise rpc.Fault(message=str(e),
+                            code=500,
+                            data=data)
+        finally:
+            jedi.set_debug_function(None)
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/pydocutils.py b/emacs.d/elpa/elpy-20151101.401/elpy/pydocutils.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/pydocutils.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/pydocutils.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/refactor.py b/emacs.d/elpa/elpy-20151101.401/elpy/refactor.py
new file mode 100644
index 0000000..7b126b5
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/refactor.py
@@ -0,0 +1,375 @@
+"""Refactoring methods for elpy.
+
+This interfaces directly with rope, regardless of the backend used,
+because the other backends don't really offer refactoring choices.
+Once Jedi is similarly featureful as Rope we can try and offer both.
+
+
+# Too complex:
+
+- Restructure: Interesting, but too complex, and needs deep Rope
+  knowledge to do well.
+
+- ChangeSignature: Slightly less complex interface, but still to
+  complex, requiring a large effort for the benefit.
+
+
+# Too useless:
+
+I could not get these to work in any useful fashion. I might be doing
+something wrong.
+
+- ExtractVariable does not replace the code extracted with the
+  variable, making it a glorified copy&paste function. Emacs can do
+  better than this interface by itself.
+
+- EncapsulateField: Getter/setter methods are outdated, this should be
+  using properties.
+
+- IntroduceFactory: Inserts a trivial method to the current class.
+  Cute.
+
+- IntroduceParameter: Introduces a parameter correctly, but does not
+  replace the old code with the parameter. So it just edits the
+  argument list and adds a shiny default.
+
+- LocalToField: Seems to just add "self." in front of all occurrences
+  of a variable in the local scope.
+
+- MethodObject: This turns the current method into a callable
+  class/object. Not sure what that would be good for.
+
+
+# Can't even get to work:
+
+- ImportOrganizer expand_star_imports, handle_long_imports,
+  relatives_to_absolutes: Seem not to do anything.
+
+- create_move: I was not able to figure out what it would like to see
+  as its attrib argument.
+
+"""
+
+import os
+
+from elpy.rpc import Fault
+
+try:
+    from rope.base.exceptions import RefactoringError
+    from rope.base.project import Project
+    from rope.base.libutils import path_to_resource
+    from rope.base import change as rope_change
+    from rope.base import worder
+    from rope.refactor.importutils import ImportOrganizer
+    from rope.refactor.topackage import ModuleToPackage
+    from rope.refactor.rename import Rename
+    from rope.refactor.move import create_move
+    from rope.refactor.inline import create_inline
+    from rope.refactor.extract import ExtractMethod
+    from rope.refactor.usefunction import UseFunction
+    ROPE_AVAILABLE = True
+except ImportError:
+    ROPE_AVAILABLE = False
+
+
+def options(description, **kwargs):
+    """Decorator to set some options on a method."""
+    def set_notes(function):
+        function.refactor_notes = {'name': function.__name__,
+                                   'category': "Miscellaneous",
+                                   'description': description,
+                                   'doc': getattr(function, '__doc__',
+                                                  ''),
+                                   'args': []}
+        function.refactor_notes.update(kwargs)
+        return function
+    return set_notes
+
+
+class Refactor(object):
+    """The main refactoring interface.
+
+    Once initialized, the first call should be to get_refactor_options
+    to get a list of refactoring options at a given position. The
+    returned value will also list any additional options required.
+
+    Once you picked one, you can call get_changes to get the actual
+    refactoring changes.
+
+    """
+    def __init__(self, project_root, filename):
+        self.project_root = project_root
+        if not ROPE_AVAILABLE:
+            raise Fault('rope not installed, cannot refactor code.',
+                        code=400)
+        if not os.path.exists(project_root):
+            raise Fault(
+                "cannot do refactoring without a local project root",
+                code=400
+            )
+        self.project = Project(project_root, ropefolder=None)
+        self.resource = path_to_resource(self.project, filename)
+
+    def get_refactor_options(self, start, end=None):
+        """Return a list of options for refactoring at the given position.
+
+        If `end` is also given, refactoring on a region is assumed.
+
+        Each option is a dictionary of key/value pairs. The value of
+        the key 'name' is the one to be used for get_changes.
+
+        The key 'args' contains a list of additional arguments
+        required for get_changes.
+
+        """
+        result = []
+        for symbol in dir(self):
+            if not symbol.startswith("refactor_"):
+                continue
+            method = getattr(self, symbol)
+            if not method.refactor_notes.get('available', True):
+                continue
+            category = method.refactor_notes['category']
+            if end is not None and category != 'Region':
+                continue
+            if end is None and category == 'Region':
+                continue
+            is_on_symbol = self._is_on_symbol(start)
+            if not is_on_symbol and category in ('Symbol', 'Method'):
+                continue
+            requires_import = method.refactor_notes.get('only_on_imports',
+                                                        False)
+            if requires_import and not self._is_on_import_statement(start):
+                continue
+            result.append(method.refactor_notes)
+        return result
+
+    def _is_on_import_statement(self, offset):
+        "Does this offset point to an import statement?"
+        data = self.resource.read()
+        bol = data.rfind("\n", 0, offset) + 1
+        eol = data.find("\n", 0, bol)
+        if eol == -1:
+            eol = len(data)
+        line = data[bol:eol]
+        line = line.strip()
+        if line.startswith("import ") or line.startswith("from "):
+            return True
+        else:
+            return False
+
+    def _is_on_symbol(self, offset):
+        "Is this offset on a symbol?"
+        if not ROPE_AVAILABLE:
+            return False
+        data = self.resource.read()
+        if offset >= len(data):
+            return False
+        if data[offset] != '_' and not data[offset].isalnum():
+            return False
+        word = worder.get_name_at(self.resource, offset)
+        if word:
+            return True
+        else:
+            return False
+
+    def get_changes(self, name, *args):
+        """Return a list of changes for the named refactoring action.
+
+        Changes are dictionaries describing a single action to be
+        taken for the refactoring to be successful.
+
+        A change has an action and possibly a type. In the description
+        below, the action is before the slash and the type after it.
+
+        change: Change file contents
+        - file: The path to the file to change
+        - contents: The new contents for the file
+        - Diff: A unified diff showing the changes introduced
+
+        create/file: Create a new file
+        - file: The file to create
+
+        create/directory: Create a new directory
+        - path: The directory to create
+
+        move/file: Rename a file
+        - source: The path to the source file
+        - destination: The path to the destination file name
+
+        move/directory: Rename a directory
+        - source: The path to the source directory
+        - destination: The path to the destination directory name
+
+        delete/file: Delete a file
+        - file: The file to delete
+
+        delete/directory: Delete a directory
+        - path: The directory to delete
+
+        """
+        if not name.startswith("refactor_"):
+            raise ValueError("Bad refactoring name {0}".format(name))
+        method = getattr(self, name)
+        if not method.refactor_notes.get('available', True):
+            raise RuntimeError("Method not available")
+        return method(*args)
+
+    @options("Convert from x import y to import x.y as y", category="Imports",
+             args=[("offset", "offset", None)],
+             only_on_imports=True,
+             available=ROPE_AVAILABLE)
+    def refactor_froms_to_imports(self, offset):
+        """Converting imports of the form "from ..." to "import ..."."""
+        refactor = ImportOrganizer(self.project)
+        changes = refactor.froms_to_imports(self.resource, offset)
+        return translate_changes(changes)
+
+    @options("Reorganize and clean up", category="Imports",
+             available=ROPE_AVAILABLE)
+    def refactor_organize_imports(self):
+        """Clean up and organize imports."""
+        refactor = ImportOrganizer(self.project)
+        changes = refactor.organize_imports(self.resource)
+        return translate_changes(changes)
+
+    @options("Convert the current module into a package", category="Module",
+             available=ROPE_AVAILABLE)
+    def refactor_module_to_package(self):
+        """Convert the current module into a package."""
+        refactor = ModuleToPackage(self.project, self.resource)
+        return self._get_changes(refactor)
+
+    @options("Rename symbol at point", category="Symbol",
+             args=[("offset", "offset", None),
+                   ("new_name", "string", "Rename to: "),
+                   ("in_hierarchy", "boolean",
+                    "Rename in super-/subclasses as well? "),
+                   ("docs", "boolean",
+                    "Replace occurences in docs and strings? ")
+                   ],
+             available=ROPE_AVAILABLE)
+    def refactor_rename_at_point(self, offset, new_name, in_hierarchy, docs):
+        """Rename the symbol at point."""
+        try:
+            refactor = Rename(self.project, self.resource, offset)
+        except RefactoringError as e:
+            raise Fault(str(e), code=400)
+        return self._get_changes(refactor, new_name,
+                                 in_hierarchy=in_hierarchy, docs=docs)
+
+    @options("Rename current module", category="Module",
+             args=[("new_name", "string", "Rename to: ")],
+             available=ROPE_AVAILABLE)
+    def refactor_rename_current_module(self, new_name):
+        """Rename the current module."""
+        refactor = Rename(self.project, self.resource, None)
+        return self._get_changes(refactor, new_name)
+
+    @options("Move the current module to a different package",
+             category="Module",
+             args=[("new_name", "directory", "Destination package: ")],
+             available=ROPE_AVAILABLE)
+    def refactor_move_module(self, new_name):
+        """Move the current module."""
+        refactor = create_move(self.project, self.resource)
+        resource = path_to_resource(self.project, new_name)
+        return self._get_changes(refactor, resource)
+
+    @options("Inline function call at point", category="Symbol",
+             args=[("offset", "offset", None),
+                   ("only_this", "boolean", "Only this occurrence? ")],
+             available=ROPE_AVAILABLE)
+    def refactor_create_inline(self, offset, only_this):
+        """Inline the function call at point."""
+        refactor = create_inline(self.project, self.resource, offset)
+        if only_this:
+            return self._get_changes(refactor, remove=False, only_current=True)
+        else:
+            return self._get_changes(refactor, remove=True, only_current=False)
+
+    @options("Extract current region as a method", category="Region",
+             args=[("start", "start_offset", None),
+                   ("end", "end_offset", None),
+                   ("name", "string", "Method name: "),
+                   ("make_global", "boolean", "Create global method? ")],
+             available=ROPE_AVAILABLE)
+    def refactor_extract_method(self, start, end, name,
+                                make_global):
+        """Extract region as a method."""
+        refactor = ExtractMethod(self.project, self.resource, start, end)
+        return self._get_changes(
+            refactor, name, similar=True, global_=make_global
+        )
+
+    @options("Use the function at point wherever possible", category="Method",
+             args=[("offset", "offset", None)],
+             available=ROPE_AVAILABLE)
+    def refactor_use_function(self, offset):
+        """Use the function at point wherever possible."""
+        refactor = UseFunction(self.project, self.resource, offset)
+        return self._get_changes(refactor)
+
+    def _get_changes(self, refactor, *args, **kwargs):
+        try:
+            changes = refactor.get_changes(*args, **kwargs)
+        except Exception as e:
+            raise Fault("Error during refactoring: {}".format(e),
+                        code=400)
+        return translate_changes(changes)
+
+
+def translate_changes(initial_change):
+    """Translate rope.base.change.Change instances to dictionaries.
+
+    See Refactor.get_changes for an explanation of the resulting
+    dictionary.
+
+    """
+    agenda = [initial_change]
+    result = []
+    while agenda:
+        change = agenda.pop(0)
+        if isinstance(change, rope_change.ChangeSet):
+            agenda.extend(change.changes)
+        elif isinstance(change, rope_change.ChangeContents):
+            result.append({'action': 'change',
+                           'file': change.resource.real_path,
+                           'contents': change.new_contents,
+                           'diff': change.get_description()})
+        elif isinstance(change, rope_change.CreateFile):
+            result.append({'action': 'create',
+                           'type': 'file',
+                           'file': change.resource.real_path})
+        elif isinstance(change, rope_change.CreateFolder):
+            result.append({'action': 'create',
+                           'type': 'directory',
+                           'path': change.resource.real_path})
+        elif isinstance(change, rope_change.MoveResource):
+            result.append({'action': 'move',
+                           'type': ('directory'
+                                    if change.new_resource.is_folder()
+                                    else 'file'),
+                           'source': change.resource.real_path,
+                           'destination': change.new_resource.real_path})
+        elif isinstance(change, rope_change.RemoveResource):
+            if change.resource.is_folder():
+                result.append({'action': 'delete',
+                               'type': 'directory',
+                               'path': change.resource.real_path})
+            else:
+                result.append({'action': 'delete',
+                               'type': 'file',
+                               'file': change.resource.real_path})
+    return result
+
+
+class FakeResource(object):
+    """A fake resource in case Rope is absence."""
+
+    def __init__(self, filename):
+        self.real_path = filename
+
+    def read(self):
+        with open(self.real_path) as f:
+            return f.read()
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/ropebackend.py b/emacs.d/elpa/elpy-20151101.401/elpy/ropebackend.py
new file mode 100644
index 0000000..a68661d
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/ropebackend.py
@@ -0,0 +1,327 @@
+"""Elpy backend using the Rope library.
+
+This backend uses the Rope library:
+
+http://rope.sourceforge.net/
+
+"""
+
+import os
+import time
+import traceback
+
+import rope.contrib.codeassist
+import rope.base.project
+import rope.base.libutils
+import rope.base.exceptions
+import rope.contrib.findit
+from rope.base.exceptions import RopeError
+
+from elpy import rpc
+import elpy.pydocutils
+
+VALIDATE_EVERY_SECONDS = 5
+MAXFIXES = 5
+
+
+class RopeBackend(object):
+    """The Rope backend class.
+
+    Implements the RPC calls we can pass on to Rope. Also subclasses
+    the native backend to provide methods Rope does not provide, if
+    any.
+
+    """
+    name = "rope"
+
+    def __init__(self, project_root):
+        super(RopeBackend, self).__init__()
+        self.last_validation = 0
+        if not os.path.exists(project_root):
+            raise rpc.Fault(
+                "rope does not support files without a local project root",
+                code=400
+            )
+        self.project_root = project_root
+        self.completions = {}
+        prefs = dict(ignored_resources=['*.pyc', '*~', '.ropeproject',
+                                        '.hg', '.svn', '_svn', '.git'],
+                     python_files=['*.py'],
+                     save_objectdb=False,
+                     compress_objectdb=False,
+                     automatic_soa=True,
+                     soa_followed_calls=0,
+                     perform_doa=True,
+                     validate_objectdb=True,
+                     max_history_items=32,
+                     save_history=False,
+                     compress_history=False,
+                     indent_size=4,
+                     extension_modules=[],
+                     import_dynload_stdmods=True,
+                     ignore_syntax_errors=False,
+                     ignore_bad_imports=False)
+        self.project = rope.base.project.Project(self.project_root,
+                                                 ropefolder=None,
+                                                 **prefs)
+
+    def get_resource(self, filename):
+        if filename is not None and os.path.exists(filename):
+            return rope.base.libutils.path_to_resource(self.project,
+                                                       filename,
+                                                       'file')
+        else:
+            return None
+
+    def validate(self):
+        """Validate the stored project.
+
+        This should be called before every use of Rope. It will
+        revalidate the project, but do some call throttling.
+
+        """
+        now = time.time()
+        if now > self.last_validation + VALIDATE_EVERY_SECONDS:
+            try:
+                self.project.validate()
+            except rope.base.exceptions.ResourceNotFoundError:
+                pass
+            self.last_validation = now
+
+    def call_rope(self, rope_function, filename, source, offset,
+                  **kwargs):
+        self.validate()
+        resource = self.get_resource(filename)
+        try:
+            return rope_function(self.project,
+                                 source, offset,
+                                 resource,
+                                 maxfixes=MAXFIXES,
+                                 **kwargs)
+        except (RopeError,
+                IndentationError,
+                LookupError,
+                AttributeError):
+            return None
+        except Exception as e:
+            data = {
+                "traceback": traceback.format_exc(),
+                "rope_debug_info": {
+                    "project_root": self.project_root,
+                    "filename": filename,
+                    "source": source,
+                    "function_name": (rope_function.__module__ +
+                                      "." +
+                                      rope_function.__name__),
+                    "function_args": ", ".join([
+                        "project", "source", str(offset), "resource",
+                        "maxfixes={0}".format(MAXFIXES)
+                    ] + [
+                        u"{}={}".format(k, v)
+                        for (k, v) in kwargs.items()
+                    ])
+                }
+            }
+            raise rpc.Fault(
+                code=500,
+                message=str(e),
+                data=data
+            )
+
+    def rpc_get_completions(self, filename, source, offset):
+        proposals = self.call_rope(
+            rope.contrib.codeassist.code_assist,
+            filename, source, offset
+        )
+        if proposals is None:
+            return []
+        try:
+            starting_offset = rope.contrib.codeassist.starting_offset(source,
+                                                                      offset)
+        except (rope.base.exceptions.BadIdentifierError,
+                rope.base.exceptions.ModuleSyntaxError,
+                IndentationError,
+                LookupError,
+                AttributeError):
+            return []
+        prefixlen = offset - starting_offset
+        try:
+            self.completions = dict((proposal.name, proposal)
+                                    for proposal in proposals)
+            return [{'name': proposal.name,
+                     'suffix': proposal.name[prefixlen:],
+                     'annotation': proposal.type,
+                     'meta': str(proposal)}
+                    for proposal in proposals]
+        except rope.base.exceptions.ModuleSyntaxError:
+            # Bug#406
+            return []
+        except AttributeError:
+            # Bug#699
+            return []
+
+    def rpc_get_completion_docstring(self, completion):
+        proposal = self.completions.get(completion)
+        if proposal is None:
+            return None
+        else:
+            return proposal.get_doc()
+
+    def rpc_get_completion_location(self, completion):
+        proposal = self.completions.get(completion)
+        if proposal is None:
+            return None
+        else:
+            if not proposal.pyname:
+                return None
+            module, lineno = proposal.pyname.get_definition_location()
+            if module is None:
+                return None
+            resource = module.get_module().get_resource()
+            return (resource.real_path, lineno)
+
+    def rpc_get_definition(self, filename, source, offset):
+        location = self.call_rope(
+            rope.contrib.findit.find_definition,
+            filename, source, offset
+        )
+        if location is None:
+            return None
+        else:
+            return (location.resource.real_path, location.offset)
+
+    def rpc_get_calltip(self, filename, source, offset):
+        offset = find_called_name_offset(source, offset)
+        if 0 < offset < len(source) and source[offset] == ')':
+            offset -= 1
+
+        calltip = self.call_rope(
+            rope.contrib.codeassist.get_calltip,
+            filename, source, offset,
+            remove_self=True
+        )
+        if calltip is None:
+            return None
+
+        calltip = calltip.replace(".__init__(", "(")
+        calltip = calltip.replace("(self)", "()")
+        calltip = calltip.replace("(self, ", "(")
+        # "elpy.tests.support.source_and_offset(source)"
+        # =>
+        # "support.source_and_offset(source)"
+        try:
+            openpos = calltip.index("(")
+            period2 = calltip.rindex(".", 0, openpos)
+            period1 = calltip.rindex(".", 0, period2)
+            calltip = calltip[period1 + 1:]
+        except ValueError:
+            pass
+        return calltip
+
+    def rpc_get_docstring(self, filename, source, offset):
+        return self.call_rope(
+            rope.contrib.codeassist.get_doc,
+            filename, source, offset
+        )
+
+
+def find_called_name_offset(source, orig_offset):
+    """Return the offset of a calling function.
+
+    This only approximates movement.
+
+    """
+    offset = min(orig_offset, len(source) - 1)
+    paren_count = 0
+    while True:
+        if offset <= 1:
+            return orig_offset
+        elif source[offset] == '(':
+            if paren_count == 0:
+                return offset - 1
+            else:
+                paren_count -= 1
+        elif source[offset] == ')':
+            paren_count += 1
+        offset -= 1
+
+
+##################################################################
+# A recurring problem in Rope for Elpy is that it searches the whole
+# project root for Python files. If the user edits a file in their
+# home directory, this can easily read a whole lot of files, making
+# Rope practically useless. We change the file finding algorithm here
+# to only recurse into directories with an __init__.py file in them.
+def find_source_folders(self, folder):
+    for resource in folder.get_folders():
+        if self._is_package(resource):
+            return [folder]
+    result = []
+    for resource in folder.get_files():
+        if resource.name.endswith('.py'):
+            result.append(folder)
+            break
+    for resource in folder.get_folders():
+        if self._is_package(resource):
+            result.append(resource)
+    return result
+
+import rope.base.pycore
+rope.base.pycore.PyCore._find_source_folders = find_source_folders
+
+
+def get_files(self):
+    if self.files is None:
+        self.files = get_python_project_files(self.project)
+    return self.files
+
+rope.base.project._FileListCacher.get_files = get_files
+
+
+def get_python_project_files(project):
+    for dirname, subdirs, files in os.walk(project.root.real_path):
+        for filename in files:
+            yield rope.base.libutils.path_to_resource(
+                project, os.path.join(dirname, filename), 'file')
+            subdirs[:] = [subdir for subdir in subdirs
+                          if os.path.exists(os.path.join(dirname, subdir,
+                                                         "__init__.py"))]
+
+
+##################################################################
+# Monkey patching a method in rope because it doesn't complete import
+# statements.
+
+orig_code_completions = (rope.contrib.codeassist.
+                         _PythonCodeAssist._code_completions)
+
+
+def code_completions(self):
+    proposals = get_import_completions(self)
+    if proposals:
+        return proposals
+    else:
+        return orig_code_completions(self)
+
+
+def get_import_completions(self):
+    if not self.word_finder.is_import_statement(self.offset):
+        return []
+    modulename = self.word_finder.get_primary_at(self.offset)
+    # Rope can handle modules in packages
+    if "." in modulename:
+        return []
+    return dict((name, FakeProposal(name))
+                for name in elpy.pydocutils.get_modules()
+                if name.startswith(modulename))
+
+
+class FakeProposal(object):
+    def __init__(self, name):
+        self.name = name
+        self.type = "mock"
+
+    def get_doc(self):
+        return None
+
+rope.contrib.codeassist._PythonCodeAssist._code_completions = code_completions
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/rpc.py b/emacs.d/elpa/elpy-20151101.401/elpy/rpc.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/rpc.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/rpc.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/server.py b/emacs.d/elpa/elpy-20151101.401/elpy/server.py
new file mode 100644
index 0000000..1e1a37a
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/server.py
@@ -0,0 +1,296 @@
+"""Method implementations for the Elpy JSON-RPC server.
+
+This file implements the methods exported by the JSON-RPC server. It
+handles backend selection and passes methods on to the selected
+backend.
+
+"""
+import io
+import os
+import pydoc
+
+from elpy.pydocutils import get_pydoc_completions
+from elpy.rpc import JSONRPCServer, Fault
+from elpy.impmagic import ImportMagic, ImportMagicError
+from elpy.auto_pep8 import fix_code
+
+
+try:
+    from elpy import jedibackend
+except ImportError:  # pragma: no cover
+    jedibackend = None
+
+try:
+    from elpy import ropebackend
+except ImportError:  # pragma: no cover
+    ropebackend = None
+
+
+class ElpyRPCServer(JSONRPCServer):
+    """The RPC server for elpy.
+
+    See the rpc_* methods for exported method documentation.
+
+    """
+    def __init__(self, *args, **kwargs):
+        super(ElpyRPCServer, self).__init__(*args, **kwargs)
+        self.backend = None
+        self.import_magic = ImportMagic()
+        self.project_root = None
+
+    def _call_backend(self, method, default, *args, **kwargs):
+        """Call the backend method with args.
+
+        If there is currently no backend, return default."""
+        meth = getattr(self.backend, method, None)
+        if meth is None:
+            return default
+        else:
+            return meth(*args, **kwargs)
+
+    def rpc_echo(self, *args):
+        """Return the arguments.
+
+        This is a simple test method to see if the protocol is
+        working.
+
+        """
+        return args
+
+    def rpc_init(self, options):
+        self.project_root = options["project_root"]
+
+        if self.import_magic.is_enabled:
+            self.import_magic.build_index(self.project_root)
+
+        if ropebackend and options["backend"] == "rope":
+            self.backend = ropebackend.RopeBackend(self.project_root)
+        elif jedibackend and options["backend"] == "jedi":
+            self.backend = jedibackend.JediBackend(self.project_root)
+        elif ropebackend:
+            self.backend = ropebackend.RopeBackend(self.project_root)
+        elif jedibackend:
+            self.backend = jedibackend.JediBackend(self.project_root)
+        else:
+            self.backend = None
+
+        return {
+            'backend': (self.backend.name if self.backend is not None
+                        else None)
+        }
+
+    def rpc_get_calltip(self, filename, source, offset):
+        """Get the calltip for the function at the offset.
+
+        """
+        return self._call_backend("rpc_get_calltip", None, filename,
+                                  get_source(source), offset)
+
+    def rpc_get_completions(self, filename, source, offset):
+        """Get a list of completion candidates for the symbol at offset.
+
+        """
+        results = self._call_backend("rpc_get_completions", [], filename,
+                                     get_source(source), offset)
+        # Uniquify by name
+        results = list(dict((res['name'], res) for res in results)
+                       .values())
+        results.sort(key=lambda cand: _pysymbol_key(cand["name"]))
+        return results
+
+    def rpc_get_completion_docstring(self, completion):
+        """Return documentation for a previously returned completion.
+
+        """
+        return self._call_backend("rpc_get_completion_docstring",
+                                  None, completion)
+
+    def rpc_get_completion_location(self, completion):
+        """Return the location for a previously returned completion.
+
+        This returns a list of [file name, line number].
+
+        """
+        return self._call_backend("rpc_get_completion_location", None,
+                                  completion)
+
+    def rpc_get_definition(self, filename, source, offset):
+        """Get the location of the definition for the symbol at the offset.
+
+        """
+        return self._call_backend("rpc_get_definition", None, filename,
+                                  get_source(source), offset)
+
+    def rpc_get_docstring(self, filename, source, offset):
+        """Get the docstring for the symbol at the offset.
+
+        """
+        return self._call_backend("rpc_get_docstring", None, filename,
+                                  get_source(source), offset)
+
+    def rpc_get_pydoc_completions(self, name=None):
+        """Return a list of possible strings to pass to pydoc.
+
+        If name is given, the strings are under name. If not, top
+        level modules are returned.
+
+        """
+        return get_pydoc_completions(name)
+
+    def rpc_get_pydoc_documentation(self, symbol):
+        """Get the Pydoc documentation for the given symbol.
+
+        Uses pydoc and can return a string with backspace characters
+        for bold highlighting.
+
+        """
+        try:
+            docstring = pydoc.render_doc(str(symbol),
+                                         "Elpy Pydoc Documentation for %s",
+                                         False)
+        except (ImportError, pydoc.ErrorDuringImport):
+            return None
+        else:
+            if isinstance(docstring, bytes):
+                docstring = docstring.decode("utf-8", "replace")
+            return docstring
+
+    def rpc_get_refactor_options(self, filename, start, end=None):
+        """Return a list of possible refactoring options.
+
+        This list will be filtered depending on whether it's
+        applicable at the point START and possibly the region between
+        START and END.
+
+        """
+        try:
+            from elpy import refactor
+        except:
+            raise ImportError("Rope not installed, refactorings unavailable")
+        ref = refactor.Refactor(self.project_root, filename)
+        return ref.get_refactor_options(start, end)
+
+    def rpc_refactor(self, filename, method, args):
+        """Return a list of changes from the refactoring action.
+
+        A change is a dictionary describing the change. See
+        elpy.refactor.translate_changes for a description.
+
+        """
+        try:
+            from elpy import refactor
+        except:
+            raise ImportError("Rope not installed, refactorings unavailable")
+        if args is None:
+            args = ()
+        ref = refactor.Refactor(self.project_root, filename)
+        return ref.get_changes(method, *args)
+
+    def rpc_get_usages(self, filename, source, offset):
+        """Get usages for the symbol at point.
+
+        """
+        source = get_source(source)
+        if hasattr(self.backend, "rpc_get_usages"):
+            return self.backend.rpc_get_usages(filename, source, offset)
+        else:
+            raise Fault("get_usages not implemented by current backend",
+                        code=400)
+
+    def _ensure_import_magic(self):  # pragma: no cover
+        if not self.import_magic.is_enabled:
+            raise Fault("fixup_imports not enabled; install importmagic module",
+                        code=400)
+        if not self.import_magic.symbol_index:
+            raise Fault(self.import_magic.fail_message, code=200)  # XXX code?
+
+    def rpc_get_import_symbols(self, filename, source, symbol):
+        """Return a list of modules from which the given symbol can be imported.
+
+        """
+        self._ensure_import_magic()
+        try:
+            return self.import_magic.get_import_symbols(symbol)
+        except ImportMagicError as err:
+            raise Fault(str(err), code=200)
+
+    def rpc_add_import(self, filename, source, statement):
+        """Add an import statement to the module.
+
+        """
+        self._ensure_import_magic()
+        source = get_source(source)
+        try:
+            return self.import_magic.add_import(source, statement)
+        except ImportMagicError as err:
+            raise Fault(str(err), code=200)
+
+    def rpc_get_unresolved_symbols(self, filename, source):
+        """Return a list of unreferenced symbols in the module.
+
+        """
+        self._ensure_import_magic()
+        source = get_source(source)
+        try:
+            return self.import_magic.get_unresolved_symbols(source)
+        except ImportMagicError as err:
+            raise Fault(str(err), code=200)
+
+    def rpc_remove_unreferenced_imports(self, filename, source):
+        """Remove unused import statements.
+
+        """
+        self._ensure_import_magic()
+        source = get_source(source)
+        try:
+            return self.import_magic.remove_unreferenced_imports(source)
+        except ImportMagicError as err:
+            raise Fault(str(err), code=200)
+
+    def rpc_fix_code(self, source):
+        """Formats Python code to conform to the PEP 8 style guide.
+
+        """
+        source = get_source(source)
+        return fix_code(source)
+
+
+def get_source(fileobj):
+    """Translate fileobj into file contents.
+
+    fileobj is either a string or a dict. If it's a string, that's the
+    file contents. If it's a string, then the filename key contains
+    the name of the file whose contents we are to use.
+
+    If the dict contains a true value for the key delete_after_use,
+    the file should be deleted once read.
+
+    """
+    if not isinstance(fileobj, dict):
+        return fileobj
+    else:
+        try:
+            with io.open(fileobj["filename"], encoding="utf-8",
+                         errors="ignore") as f:
+                return f.read()
+        finally:
+            if fileobj.get('delete_after_use'):
+                try:
+                    os.remove(fileobj["filename"])
+                except:  # pragma: no cover
+                    pass
+
+
+def _pysymbol_key(name):
+    """Return a sortable key index for name.
+
+    Sorting is case-insensitive, with the first underscore counting as
+    worse than any character, but subsequent underscores do not. This
+    means that dunder symbols (like __init__) are sorted after symbols
+    that start with an alphabetic character, but before those that
+    start with only a single underscore.
+
+    """
+    if name.startswith("_"):
+        name = "~" + name[1:]
+    return name.lower()
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/__init__.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/__init__.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/tests/__init__.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/tests/__init__.py
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/compat.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/compat.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/tests/compat.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/tests/compat.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/support.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/support.py
new file mode 100644
index 0000000..ca45ffa
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/support.py
@@ -0,0 +1,806 @@
+# coding: utf-8
+
+"""Support classes and functions for the elpy test code.
+
+Elpy uses a bit of a peculiar test setup to avoid redundancy. For the
+tests of the two backends, we provide generic test cases for generic
+tests and for specific callback tests.
+
+These mixins can be included in the actual test classes. We can't add
+these tests to a BackendTestCase subclass directly because the test
+discovery would find them there and try to run them, which would fail.
+
+"""
+
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+from elpy.tests import compat
+
+
+class BackendTestCase(unittest.TestCase):
+    """Base class for backend tests.
+
+    This class sets up a project root directory and provides an easy
+    way to create files within the project root.
+
+    """
+
+    def setUp(self):
+        """Create the project root and make sure it gets cleaned up."""
+        super(BackendTestCase, self).setUp()
+        self.project_root = tempfile.mkdtemp(prefix="elpy-test")
+        self.addCleanup(shutil.rmtree, self.project_root, True)
+
+    def project_file(self, relname, contents):
+        """Create a file named relname within the project root.
+
+        Write contents into that file.
+
+        """
+        full_name = os.path.join(self.project_root, relname)
+        try:
+            os.makedirs(os.path.dirname(full_name))
+        except OSError:
+            pass
+        if compat.PYTHON3:
+            fobj = open(full_name, "w", encoding="utf-8")
+        else:
+            fobj = open(full_name, "w")
+        with fobj as f:
+            f.write(contents)
+        return full_name
+
+
+class GenericRPCTests(object):
+    """Generic RPC test methods.
+
+    This is a mixin to add tests that should be run for all RPC
+    methods that follow the generic (filename, source, offset) calling
+    conventions.
+
+    """
+    METHOD = None
+
+    def rpc(self, filename, source, offset):
+        method = getattr(self.backend, self.METHOD)
+        return method(filename, source, offset)
+
+    def test_should_not_fail_on_inexisting_file(self):
+        filename = self.project_root + "/doesnotexist.py"
+        self.rpc(filename, "", 0)
+
+    def test_should_not_fail_on_empty_file(self):
+        filename = self.project_file("test.py", "")
+        self.rpc(filename, "", 0)
+
+    def test_should_not_fail_if_file_is_none(self):
+        self.rpc(None, "", 0)
+
+    def test_should_not_fail_for_module_syntax_errors(self):
+        source, offset = source_and_offset(
+            "class Foo(object):\n"
+            "  def bar(self):\n"
+            "    foo(_|_"
+            "    bar("
+            "\n"
+            "  def a(self):\n"
+            "    pass\n"
+            "\n"
+            "  def b(self):\n"
+            "  pass\n"
+            "\n"
+            "  def b(self):\n"
+            "  pass\n"
+            "\n"
+            "  def b(self):\n"
+            "  pass\n"
+            "\n"
+            "  def b(self):\n"
+            "  pass\n"
+            "\n"
+            "  def b(self):\n"
+            "  pass\n"
+        )
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_bad_indentation(self):
+        # Bug in Rope: rope#80
+        source, offset = source_and_offset(
+            "def foo():\n"
+            "       print(23)_|_\n"
+            "      print(17)\n")
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    @unittest.skipIf((3, 3) <= sys.version_info < (3, 4),
+                     "Bug in jedi for Python 3.3")
+    def test_should_not_fail_for_relative_import(self):
+        # Bug in Rope: rope#81 and rope#82
+        source, offset = source_and_offset(
+            "from .. import foo_|_"
+        )
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_on_keyword(self):
+        source, offset = source_and_offset(
+            "_|_try:\n"
+            "    pass\n"
+            "except:\n"
+            "    pass\n")
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_with_bad_encoding(self):
+        # Bug in Rope: rope#83
+        source, offset = source_and_offset(
+            u'# coding: utf-8X_|_\n'
+        )
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_with_form_feed_characters(self):
+        # Bug in Jedi: jedi#424
+        source, offset = source_and_offset(
+            "\f\n"
+            "class Test(object):_|_\n"
+            "    pass"
+        )
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_dictionaries_in_weird_places(self):
+        # Bug in Jedi: jedi#417
+        source, offset = source_and_offset(
+            "import json\n"
+            "\n"
+            "def foo():\n"
+            "    json.loads(_|_\n"
+            "\n"
+            "    json.load.return_value = {'foo': [],\n"
+            "                              'bar': True}\n"
+            "\n"
+            "    c = Foo()\n"
+        )
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_break_with_binary_characters_in_docstring(self):
+        # Bug in Jedi: jedi#427
+        template = '''\
+class Foo(object):
+    def __init__(self):
+        """
+        COMMUNITY instance that this conversion belongs to.
+        DISPERSY_VERSION is the dispersy conversion identifier (on the wire version; must be one byte).
+        COMMUNIY_VERSION is the community conversion identifier (on the wire version; must be one byte).
+
+        COMMUNIY_VERSION may not be '\\x00' or '\\xff'. '\\x00' is used by the DefaultConversion until
+        a proper conversion instance can be made for the Community.  '\\xff' is reserved for when
+        more than one byte is needed as a version indicator.
+        """
+        pass
+
+
+x = Foo()
+x._|_
+'''
+        source, offset = source_and_offset(template)
+        filename = self.project_file("test.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_def_without_name(self):
+        # Bug jedi#429
+        source, offset = source_and_offset(
+            "def_|_():\n"
+            "    if True:\n"
+            "        return True\n"
+            "    else:\n"
+            "        return False\n"
+        )
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_on_lambda(self):
+        # Bug #272 / jedi#431, jedi#572
+        source, offset = source_and_offset(
+            "map(lambda_|_"
+        )
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_on_literals(self):
+        # Bug #314, #344 / jedi#466
+        source = u'lit = u"""\\\n# -*- coding: utf-8 -*-\n"""\n'
+        offset = 0
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_with_args_as_args(self):
+        # Bug #347 in rope_py3k
+        source, offset = source_and_offset(
+            "def my_function(*args):\n"
+            "    ret_|_"
+        )
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_unicode_chars_in_string(self):
+        # Bug #358 / jedi#482
+        source = '''\
+# coding: utf-8
+
+logging.info(u"Saving «{}»...".format(title))
+requests.get(u"https://web.archive.org/save/{}".format(url))
+'''
+        offset = 57
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_bad_escape_sequence(self):
+        # Bug #360 / jedi#485
+        source = r"v = '\x'"
+        offset = 8
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_coding_declarations_in_strings(self):
+        # Bug #314 / jedi#465 / python#22221
+        source = u'lit = """\\\n# -*- coding: utf-8 -*-\n"""'
+        offset = 8
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_if_root_vanishes(self):
+        # Bug #353
+        source, offset = source_and_offset(
+            "import foo\n"
+            "foo._|_"
+        )
+        filename = self.project_file("project.py", source)
+        shutil.rmtree(self.project_root)
+
+        self.rpc(filename, source, offset)
+
+    # For some reason, this breaks a lot of other tests. Couldn't
+    # figure out why.
+    #
+    # def test_should_not_fail_for_sys_path(self):
+    #     # Bug #365 / jedi#486
+    #     source, offset = source_and_offset(
+    #         "import sys\n"
+    #         "\n"
+    #         "sys.path.index(_|_\n"
+    #     )
+    #     filename = self.project_file("project.py", source)
+    #
+    #     self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_key_error(self):
+        # Bug #561, #564, #570, #588, #593, #599 / jedi#572, jedi#579,
+        # jedi#590
+        source, offset = source_and_offset(
+            "map(lambda_|_"
+        )
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_for_badly_defined_global_variable(self):
+        # Bug #519 / jedi#610
+        source, offset = source_and_offset(
+            """\
+def funct1():
+    global global_dict_var
+    global_dict_var = dict()
+
+def funct2():
+    global global_dict_var
+    q = global_dict_var.copy_|_()
+    print(q)""")
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+    def test_should_not_fail_with_mergednamesdict(self):
+        # Bug #563 / jedi#589
+        source, offset = source_and_offset(
+            u'from email import message_|_'
+        )
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+
+class RPCGetCompletionsTests(GenericRPCTests):
+    METHOD = "rpc_get_completions"
+
+    def test_should_complete_builtin(self):
+        source, offset = source_and_offset("o_|_")
+
+        expected = ["object", "oct", "open", "or", "ord"]
+        actual = [cand['name'] for cand in
+                  self.backend.rpc_get_completions("test.py",
+                                                   source, offset)]
+
+        for candidate in expected:
+            self.assertIn(candidate, actual)
+
+    if sys.version_info >= (3, 5):
+        JSON_COMPLETIONS = ["SONDecoder", "SONEncoder", "SONDecodeError"]
+    else:
+        JSON_COMPLETIONS = ["SONDecoder", "SONEncoder"]
+
+    def test_should_complete_imports(self):
+        source, offset = source_and_offset("import json\n"
+                                           "json.J_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        self.assertEqual(
+            sorted([cand['suffix'] for cand in completions]),
+            sorted(self.JSON_COMPLETIONS))
+
+    def test_should_complete_top_level_modules_for_import(self):
+        source, offset = source_and_offset("import multi_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        if compat.PYTHON3:
+            expected = ["processing"]
+        else:
+            expected = ["file", "processing"]
+        self.assertEqual(sorted([cand['suffix'] for cand in completions]),
+                         sorted(expected))
+
+    def test_should_complete_packages_for_import(self):
+        source, offset = source_and_offset("import email.mi_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        self.assertEqual([cand['suffix'] for cand in completions],
+                         ["me"])
+
+    def test_should_not_complete_for_import(self):
+        source, offset = source_and_offset("import foo.Conf_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        self.assertEqual([cand['suffix'] for cand in completions],
+                         [])
+
+    @unittest.skipIf((3, 3) <= sys.version_info < (3, 4),
+                     "Bug in jedi for Python 3.3")
+    def test_should_not_fail_for_short_module(self):
+        source, offset = source_and_offset("from .. import foo_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        self.assertIsNotNone(completions)
+
+    def test_should_complete_sys(self):
+        source, offset = source_and_offset("import sys\nsys._|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        self.assertIn('path', [cand['suffix'] for cand in completions])
+
+    def test_should_find_with_trailing_text(self):
+        source, offset = source_and_offset(
+            "import threading\nthreading.T_|_mumble mumble")
+
+        expected = ["Thread", "ThreadError", "Timer"]
+        actual = [cand['name'] for cand in
+                  self.backend.rpc_get_completions("test.py", source, offset)]
+
+        for candidate in expected:
+            self.assertIn(candidate, actual)
+
+    def test_should_find_completion_different_package(self):
+        # See issue #74
+        self.project_file("project/__init__.py", "")
+        source1 = ("class Add:\n"
+                   "    def add(self, a, b):\n"
+                   "        return a + b\n")
+        self.project_file("project/add.py", source1)
+        source2, offset = source_and_offset(
+            "from project.add import Add\n"
+            "class Calculator:\n"
+            "    def add(self, a, b):\n"
+            "        c = Add()\n"
+            "        c.ad_|_\n")
+        file2 = self.project_file("project/calculator.py", source2)
+        proposals = self.backend.rpc_get_completions(file2,
+                                                     source2,
+                                                     offset)
+        self.assertEqual(["add"],
+                         [proposal["name"] for proposal in proposals])
+
+
+class RPCGetCompletionDocstringTests(object):
+    def test_should_return_docstring(self):
+        source, offset = source_and_offset("import json\n"
+                                           "json.JSONEnc_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        completions.sort(key=lambda p: p["name"])
+        prop = completions[0]
+        self.assertEqual(prop["name"], "JSONEncoder")
+
+        docs = self.backend.rpc_get_completion_docstring("JSONEncoder")
+
+        self.assertIn("Extensible JSON", docs)
+
+    def test_should_return_none_if_unknown(self):
+        docs = self.backend.rpc_get_completion_docstring("Foo")
+
+        self.assertIsNone(docs)
+
+
+class RPCGetCompletionLocationTests(object):
+    def test_should_return_location(self):
+        source, offset = source_and_offset("donaudampfschiff = 1\n"
+                                           "donau_|_")
+        filename = self.project_file("test.py", source)
+        completions = self.backend.rpc_get_completions(filename,
+                                                       source,
+                                                       offset)
+        prop = completions[0]
+        self.assertEqual(prop["name"], "donaudampfschiff")
+
+        loc = self.backend.rpc_get_completion_location("donaudampfschiff")
+
+        self.assertEqual((filename, 1), loc)
+
+    def test_should_return_none_if_unknown(self):
+        docs = self.backend.rpc_get_completion_location("Foo")
+
+        self.assertIsNone(docs)
+
+
+class RPCGetDefinitionTests(GenericRPCTests):
+    METHOD = "rpc_get_definition"
+
+    def test_should_return_definition_location_same_file(self):
+        source, offset = source_and_offset("import threading\n"
+                                           "def test_function(a, b):\n"
+                                           "    return a + b\n"
+                                           "\n"
+                                           "test_func_|_tion(\n")
+        filename = self.project_file("test.py", source)
+
+        location = self.backend.rpc_get_definition(filename,
+                                                   source,
+                                                   offset)
+
+        self.assertEqual(location[0], filename)
+        # On def or on the function name
+        self.assertIn(location[1], (17, 21))
+
+    def test_should_return_location_in_same_file_if_not_saved(self):
+        source, offset = source_and_offset(
+            "import threading\n"
+            "\n"
+            "\n"
+            "def other_function():\n"
+            "    test_f_|_unction(1, 2)\n"
+            "\n"
+            "\n"
+            "def test_function(a, b):\n"
+            "    return a + b\n")
+        filename = self.project_file("test.py", "")
+
+        location = self.backend.rpc_get_definition(filename,
+                                                   source,
+                                                   offset)
+
+        self.assertEqual(location[0], filename)
+        # def or function name
+        self.assertIn(location[1], (67, 71))
+
+    def test_should_return_location_in_different_file(self):
+        source1 = ("def test_function(a, b):\n"
+                   "    return a + b\n")
+        file1 = self.project_file("test1.py", source1)
+        source2, offset = source_and_offset("from test1 import test_function\n"
+                                            "test_funct_|_ion(1, 2)\n")
+        file2 = self.project_file("test2.py", source2)
+
+        definition = self.backend.rpc_get_definition(file2,
+                                                     source2,
+                                                     offset)
+
+        self.assertEqual(definition[0], file1)
+        # Either on the def or on the function name
+        self.assertIn(definition[1], (0, 4))
+
+    def test_should_return_none_if_location_not_found(self):
+        source, offset = source_and_offset("test_f_|_unction()\n")
+        filename = self.project_file("test.py", source)
+
+        definition = self.backend.rpc_get_definition(filename,
+                                                     source,
+                                                     offset)
+
+        self.assertIsNone(definition)
+
+    def test_should_return_none_if_outside_of_symbol(self):
+        source, offset = source_and_offset("test_function(_|_)\n")
+        filename = self.project_file("test.py", source)
+
+        definition = self.backend.rpc_get_definition(filename,
+                                                     source,
+                                                     offset)
+
+        self.assertIsNone(definition)
+
+    def test_should_return_definition_location_different_package(self):
+        # See issue #74
+        self.project_file("project/__init__.py", "")
+        source1 = ("class Add:\n"
+                   "    def add(self, a, b):\n"
+                   "        return a + b\n")
+        file1 = self.project_file("project/add.py", source1)
+        source2, offset = source_and_offset(
+            "from project.add import Add\n"
+            "class Calculator:\n"
+            "    def add(self, a, b):\n"
+            "        return Add_|_().add(a, b)\n")
+        file2 = self.project_file("project/calculator.py", source2)
+
+        location = self.backend.rpc_get_definition(file2,
+                                                   source2,
+                                                   offset)
+
+        self.assertEqual(location[0], file1)
+        # class or class name
+        self.assertIn(location[1], (0, 6))
+
+    def test_should_find_variable_definition(self):
+        source, offset = source_and_offset("SOME_VALUE = 1\n"
+                                           "\n"
+                                           "variable = _|_SOME_VALUE\n")
+        filename = self.project_file("test.py", source)
+        self.assertEqual(self.backend.rpc_get_definition(filename,
+                                                         source,
+                                                         offset),
+                         (filename, 0))
+
+
+class RPCGetCalltipTests(GenericRPCTests):
+    METHOD = "rpc_get_calltip"
+
+    @unittest.skipIf(sys.version_info >= (3, 0),
+                     "Bug in Jedi 0.9.0")
+    def test_should_get_calltip(self):
+        source, offset = source_and_offset(
+            "import threading\nthreading.Thread(_|_")
+        filename = self.project_file("test.py", source)
+        calltip = self.backend.rpc_get_calltip(filename,
+                                               source,
+                                               offset)
+
+        expected = self.THREAD_CALLTIP
+
+        self.assertEqual(calltip, expected)
+
+    @unittest.skipIf(sys.version_info >= (3, 0),
+                     "Bug in Jedi 0.9.0")
+    def test_should_get_calltip_even_after_parens(self):
+        source, offset = source_and_offset(
+            "import threading\nthreading.Thread(foo()_|_")
+        filename = self.project_file("test.py", source)
+
+        actual = self.backend.rpc_get_calltip(filename,
+                                              source,
+                                              offset)
+
+        self.assertEqual(self.THREAD_CALLTIP, actual)
+
+    @unittest.skipIf(sys.version_info >= (3, 0),
+                     "Bug in Jedi 0.9.0")
+    def test_should_get_calltip_at_closing_paren(self):
+        source, offset = source_and_offset(
+            "import threading\nthreading.Thread(_|_)")
+        filename = self.project_file("test.py", source)
+
+        actual = self.backend.rpc_get_calltip(filename,
+                                              source,
+                                              offset)
+
+        self.assertEqual(self.THREAD_CALLTIP, actual)
+
+    def test_should_not_missing_attribute_get_definition(self):
+        # Bug #627 / jedi#573
+        source, offset = source_and_offset(
+            "import threading\nthreading.Thread(_|_)")
+        filename = self.project_file("test.py", source)
+
+        self.backend.rpc_get_calltip(filename, source, offset)
+
+    def test_should_return_none_for_bad_identifier(self):
+        source, offset = source_and_offset(
+            "froblgoo(_|_")
+        filename = self.project_file("test.py", source)
+        calltip = self.backend.rpc_get_calltip(filename,
+                                               source,
+                                               offset)
+        self.assertIsNone(calltip)
+
+    def test_should_remove_self_argument(self):
+        source, offset = source_and_offset(
+            "d = dict()\n"
+            "d.keys(_|_")
+        filename = self.project_file("test.py", source)
+
+        actual = self.backend.rpc_get_calltip(filename,
+                                              source,
+                                              offset)
+
+        self.assertEqual(self.KEYS_CALLTIP, actual)
+
+    def test_should_remove_package_prefix(self):
+        source, offset = source_and_offset(
+            "import decimal\n"
+            "d = decimal.Decimal('1.5')\n"
+            "d.radix(_|_")
+        filename = self.project_file("test.py", source)
+
+        actual = self.backend.rpc_get_calltip(filename,
+                                              source,
+                                              offset)
+
+        self.assertEqual(self.RADIX_CALLTIP, actual)
+
+    def test_should_return_none_outside_of_all(self):
+        filename = self.project_file("test.py", "")
+        source, offset = source_and_offset("import thr_|_eading\n")
+        calltip = self.backend.rpc_get_calltip(filename,
+                                               source, offset)
+        self.assertIsNone(calltip)
+
+    def test_should_find_calltip_different_package(self):
+        # See issue #74
+        self.project_file("project/__init__.py", "")
+        source1 = ("class Add:\n"
+                   "    def add(self, a, b):\n"
+                   "        return a + b\n")
+        self.project_file("project/add.py", source1)
+        source2, offset = source_and_offset(
+            "from project.add import Add\n"
+            "class Calculator:\n"
+            "    def add(self, a, b):\n"
+            "        c = Add()\n"
+            "        c.add(_|_\n")
+        file2 = self.project_file("project/calculator.py", source2)
+
+        actual = self.backend.rpc_get_calltip(file2,
+                                              source2,
+                                              offset)
+
+        self.assertEqual(self.ADD_CALLTIP, actual)
+
+
+class RPCGetDocstringTests(GenericRPCTests):
+    METHOD = "rpc_get_docstring"
+
+    def check_docstring(self, docstring):
+
+        def first_line(s):
+            return s[:s.index("\n")]
+
+        self.assertEqual(first_line(docstring),
+                         self.JSON_LOADS_DOCSTRING)
+
+    def test_should_get_docstring(self):
+        source, offset = source_and_offset(
+            "import json\njson.loads_|_(")
+        filename = self.project_file("test.py", source)
+        docstring = self.backend.rpc_get_docstring(filename,
+                                                   source,
+                                                   offset)
+        self.check_docstring(docstring)
+
+    def test_should_return_none_for_bad_identifier(self):
+        source, offset = source_and_offset(
+            "froblgoo_|_(\n")
+        filename = self.project_file("test.py", source)
+        docstring = self.backend.rpc_get_docstring(filename,
+                                                   source,
+                                                   offset)
+        self.assertIsNone(docstring)
+
+
+class RPCGetUsagesTests(GenericRPCTests):
+    METHOD = "rpc_get_usages"
+
+    def test_should_return_uses_in_same_file(self):
+        filename = self.project_file("test.py", "")
+        source, offset = source_and_offset(
+            "def foo(x):\n"
+            "    return _|_x + x\n")
+
+        usages = self.backend.rpc_get_usages(filename,
+                                             source,
+                                             offset)
+
+        self.assertEqual(usages,
+                         [{'name': 'x',
+                           'offset': 8,
+                           'filename': filename},
+                          {'name': 'x',
+                           'filename': filename,
+                           'offset': 23},
+                          {'name': u'x',
+                           'filename': filename,
+                           'offset': 27}])
+
+    def test_should_return_uses_in_other_file(self):
+        file1 = self.project_file("file1.py", "")
+        file2 = self.project_file("file2.py", "\n\n\n\n\nx = 5")
+        source, offset = source_and_offset(
+            "import file2\n"
+            "file2._|_x\n")
+
+        usages = self.backend.rpc_get_usages(file1,
+                                             source,
+                                             offset)
+
+        self.assertEqual(usages,
+                         [{'name': 'x',
+                           'filename': file1,
+                           'offset': 19},
+                          {'name': 'x',
+                           'filename': file2,
+                           'offset': 5}])
+
+    def test_should_not_fail_without_symbol(self):
+        filename = self.project_file("file.py", "")
+
+        usages = self.backend.rpc_get_usages(filename,
+                                             "",
+                                             0)
+
+        self.assertEqual(usages, [])
+
+
+def source_and_offset(source):
+    """Return a source and offset from a source description.
+
+    >>> source_and_offset("hello, _|_world")
+    ("hello, world", 7)
+    >>> source_and_offset("_|_hello, world")
+    ("hello, world", 0)
+    >>> source_and_offset("hello, world_|_")
+    ("hello, world", 12)
+    """
+    offset = source.index("_|_")
+    return source[:offset] + source[offset + 3:], offset
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_auto_pep8.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_auto_pep8.py
new file mode 100644
index 0000000..2b8e3b1
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_auto_pep8.py
@@ -0,0 +1,20 @@
+# coding: utf-8
+
+"""Tests for the elpy.autopep8 module"""
+
+import unittest
+
+from elpy import auto_pep8
+from elpy.tests.support import BackendTestCase
+
+
+class Autopep8TestCase(BackendTestCase):
+
+    def setUp(self):
+        if not auto_pep8.autopep8:
+            raise unittest.SkipTest
+
+    def test_fix_code(self):
+        code_block = 'x=       123\n'
+        new_block = auto_pep8.fix_code(code_block)
+        self.assertEqual(new_block, 'x = 123\n')
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_impmagic.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_impmagic.py
new file mode 100644
index 0000000..97c6f86
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_impmagic.py
@@ -0,0 +1,74 @@
+# coding: utf-8
+
+"""Tests for the elpy.impmagic module"""
+
+import re
+import sys
+import unittest
+
+from elpy import impmagic
+from elpy.tests.support import BackendTestCase
+
+TEST_SOURCE = '''# test file
+
+import time
+import logging
+
+os.getcwd()
+time.sleep(1)
+'''
+
+
+@unittest.skipIf(sys.version_info >= (3, 5), "importmagic fails in 3.5")
+class ImportMagicTestCase(BackendTestCase):
+    def setUp(self):
+        if not impmagic.importmagic:
+            raise unittest.SkipTest
+        self.importmagic = impmagic.ImportMagic()
+        super(ImportMagicTestCase, self).setUp()
+
+    def build_index(self):
+        self.project_file('mymod.py', 'class AnUncommonName:\n pass\n')
+        self.importmagic.build_index(self.project_root,
+                                     custom_path=[self.project_root],
+                                     blacklist_re=re.compile('^$'))
+        self.importmagic._thread.join()
+
+    def test_get_symbols(self):
+        self.build_index()
+        candidates = self.importmagic.get_import_symbols('AnUncommonName')
+        self.assertEqual(candidates, ['from mymod import AnUncommonName'])
+        candidates = self.importmagic.get_import_symbols('mymod')
+        self.assertEqual(candidates, ['import mymod'])
+
+    def test_add_import(self):
+        self.build_index()
+        start, end, newblock = self.importmagic.add_import(
+            TEST_SOURCE, 'from mymod import AnUncommonName')
+        self.assertEqual(start, 2)
+        self.assertEqual(end, 5)
+        self.assertEqual(newblock.strip(),
+                         'import logging\n'
+                         'import time\n'
+                         '\n'
+                         'from mymod import AnUncommonName')
+
+        start, end, newblock = self.importmagic.add_import(
+            TEST_SOURCE, 'import mymod')
+        self.assertEqual(start, 2)
+        self.assertEqual(end, 5)
+        self.assertEqual(newblock.strip(),
+                         'import logging\nimport time\n\nimport mymod')
+
+    def test_get_unresolved_symbols(self):
+        self.build_index()
+        symbols = self.importmagic.get_unresolved_symbols('x = a + b\ny = c.d')
+        self.assertEqual(sorted(symbols), ['a', 'b', 'c.d'])
+
+    def test_remove_unreferenced_imports(self):
+        self.build_index()
+        start, end, newblock = \
+            self.importmagic.remove_unreferenced_imports(TEST_SOURCE)
+        self.assertEqual(start, 2)
+        self.assertEqual(end, 5)
+        self.assertEqual(newblock.strip(), 'import time')
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_jedibackend.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_jedibackend.py
new file mode 100644
index 0000000..7fef34d
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_jedibackend.py
@@ -0,0 +1,287 @@
+"""Tests for the elpy.jedibackend module."""
+
+import sys
+import unittest
+
+import jedi
+import mock
+
+from elpy import jedibackend
+from elpy import rpc
+from elpy.tests import compat
+from elpy.tests.support import BackendTestCase
+from elpy.tests.support import RPCGetCompletionsTests
+from elpy.tests.support import RPCGetCompletionDocstringTests
+from elpy.tests.support import RPCGetCompletionLocationTests
+from elpy.tests.support import RPCGetDocstringTests
+from elpy.tests.support import RPCGetDefinitionTests
+from elpy.tests.support import RPCGetCalltipTests
+from elpy.tests.support import RPCGetUsagesTests
+
+
+class JediBackendTestCase(BackendTestCase):
+    def setUp(self):
+        super(JediBackendTestCase, self).setUp()
+        self.backend = jedibackend.JediBackend(self.project_root)
+
+
+class TestInit(JediBackendTestCase):
+    def test_should_have_jedi_as_name(self):
+        self.assertEqual(self.backend.name, "jedi")
+
+
+class TestRPCGetCompletions(RPCGetCompletionsTests,
+                            JediBackendTestCase):
+    pass
+
+
+class TestRPCGetCompletionDocstring(RPCGetCompletionDocstringTests,
+                                    JediBackendTestCase):
+    pass
+
+
+class TestRPCGetCompletionLocation(RPCGetCompletionLocationTests,
+                                   JediBackendTestCase):
+    pass
+
+
+class TestRPCGetDocstring(RPCGetDocstringTests,
+                          JediBackendTestCase):
+    JSON_LOADS_DOCSTRING = (
+        'loads(s, encoding=None, cls=None, '
+        'object_hook=None, parse_float=None,'
+    )
+
+    def check_docstring(self, docstring):
+        lines = docstring.splitlines()
+        self.assertEqual(lines[0], 'Documentation for json.loads:')
+        self.assertEqual(lines[2], self.JSON_LOADS_DOCSTRING)
+
+
+class TestRPCGetDefinition(RPCGetDefinitionTests,
+                           JediBackendTestCase):
+    @mock.patch("jedi.Script")
+    def test_should_not_fail_if_module_path_is_none(self, Script):
+        """Do not fail if loc.module_path is None.
+
+        This can happen under some circumstances I am unsure about.
+        See #537 for the issue that reported this.
+
+        """
+        locations = [
+            mock.Mock(module_path=None)
+        ]
+        script = Script.return_value
+        script.goto_definitions.return_value = locations
+        script.goto_assignments.return_value = locations
+
+        location = self.rpc("", "", 0)
+
+        self.assertIsNone(location)
+
+
+class TestRPCGetCalltip(RPCGetCalltipTests,
+                        JediBackendTestCase):
+    KEYS_CALLTIP = {'index': 0,
+                    'params': [''],
+                    'name': u'keys'}
+    if sys.version_info >= (3, 5):
+        RADIX_CALLTIP = {'index': 0,
+                         'params': ['10'],
+                         'name': u'radix'}
+    else:
+        RADIX_CALLTIP = {'index': None,
+                         'params': [],
+                         'name': u'radix'}
+    ADD_CALLTIP = {'index': 0,
+                   'params': [u'a', u'b'],
+                   'name': u'add'}
+    if compat.PYTHON3:
+        THREAD_CALLTIP = {"name": "Thread",
+                          "params": ["group=None",
+                                     "target=None",
+                                     "name=None",
+                                     "args=()",
+                                     "kwargs=None",
+                                     "daemon=None"],
+                          "index": 0}
+    else:
+        THREAD_CALLTIP = {"name": "Thread",
+                          "params": ["group=None",
+                                     "target=None",
+                                     "name=None",
+                                     "args=()",
+                                     "kwargs=None",
+                                     "verbose=None"],
+                          "index": 0}
+
+    def test_should_not_fail_with_get_subscope_by_name(self):
+        # Bug #677 / jedi#628
+        source = (
+            u"my_lambda = lambda x: x+1\n"
+            u"my_lambda(1)"
+        )
+        filename = self.project_file("project.py", source)
+        offset = 37
+
+        sigs = self.backend.rpc_get_calltip(filename, source, offset)
+        if sigs is not None:
+            sigs[0].index
+
+
+class TestRPCGetUsages(RPCGetUsagesTests,
+                       JediBackendTestCase):
+    def test_should_not_fail_for_missing_module(self):
+        # This causes use.module_path to be None
+        source = "import sys\n\nsys.path.\n"  # insert()"
+        offset = 21
+        filename = self.project_file("project.py", source)
+
+        self.rpc(filename, source, offset)
+
+
+class TestPosToLinecol(unittest.TestCase):
+    def test_should_handle_beginning_of_string(self):
+        self.assertEqual(jedibackend.pos_to_linecol("foo", 0),
+                         (1, 0))
+
+    def test_should_handle_end_of_line(self):
+        self.assertEqual(jedibackend.pos_to_linecol("foo\nbar\nbaz\nqux", 9),
+                         (3, 1))
+
+    def test_should_handle_end_of_string(self):
+        self.assertEqual(jedibackend.pos_to_linecol("foo\nbar\nbaz\nqux", 14),
+                         (4, 2))
+
+
+class TestLinecolToPos(unittest.TestCase):
+    def test_should_handle_beginning_of_string(self):
+        self.assertEqual(jedibackend.linecol_to_pos("foo", 1, 0),
+                         0)
+
+    def test_should_handle_end_of_string(self):
+        self.assertEqual(jedibackend.linecol_to_pos("foo\nbar\nbaz\nqux",
+                                                    3, 1),
+                         9)
+
+    def test_should_return_offset(self):
+        self.assertEqual(jedibackend.linecol_to_pos("foo\nbar\nbaz\nqux",
+                                                    4, 2),
+                         14)
+
+    def test_should_fail_for_line_past_text(self):
+        self.assertRaises(ValueError,
+                          jedibackend.linecol_to_pos, "foo\n", 3, 1)
+
+    def test_should_fail_for_column_past_text(self):
+        self.assertRaises(ValueError,
+                          jedibackend.linecol_to_pos, "foo\n", 1, 10)
+
+
+class TestRunWithDebug(unittest.TestCase):
+    @mock.patch('jedi.Script')
+    def test_should_call_method(self, Script):
+        Script.return_value.test_method.return_value = "test-result"
+
+        result = jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
+
+        Script.assert_called_with(1, 2, arg=3)
+        self.assertEqual(result, 'test-result')
+
+    @mock.patch('jedi.Script')
+    def test_should_re_raise(self, Script):
+        Script.side_effect = RuntimeError
+
+        with self.assertRaises(RuntimeError):
+            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3,
+                                       re_raise=(RuntimeError,))
+
+    @mock.patch('jedi.Script')
+    @mock.patch('jedi.set_debug_function')
+    def test_should_keep_debug_info(self, set_debug_function, Script):
+        Script.side_effect = RuntimeError
+
+        try:
+            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
+        except rpc.Fault as e:
+            self.assertGreaterEqual(e.code, 400)
+            self.assertIsNotNone(e.data)
+            self.assertIn("traceback", e.data)
+            jedi_debug_info = e.data["jedi_debug_info"]
+            self.assertIsNotNone(jedi_debug_info)
+            self.assertEqual(jedi_debug_info["script_args"],
+                             "1, 2, arg=3")
+            self.assertEqual(jedi_debug_info["source"], None)
+            self.assertEqual(jedi_debug_info["method"], "test_method")
+            self.assertEqual(jedi_debug_info["debug_info"], [])
+        else:
+            self.fail("Fault not thrown")
+
+    @mock.patch('jedi.Script')
+    @mock.patch('jedi.set_debug_function')
+    def test_should_keep_error_text(self, set_debug_function, Script):
+        Script.side_effect = RuntimeError
+
+        try:
+            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
+        except rpc.Fault as e:
+            self.assertEqual(str(e), str(RuntimeError()))
+            self.assertEqual(e.message, str(RuntimeError()))
+        else:
+            self.fail("Fault not thrown")
+
+    @mock.patch('jedi.Script')
+    @mock.patch('jedi.set_debug_function')
+    def test_should_handle_source_special(self, set_debug_function, Script):
+        Script.side_effect = RuntimeError
+
+        try:
+            jedibackend.run_with_debug(jedi, 'test_method', source="foo")
+        except rpc.Fault as e:
+            self.assertEqual(e.data["jedi_debug_info"]["script_args"],
+                             "source=source")
+            self.assertEqual(e.data["jedi_debug_info"]["source"], "foo")
+        else:
+            self.fail("Fault not thrown")
+
+    @mock.patch('jedi.Script')
+    @mock.patch('jedi.set_debug_function')
+    def test_should_set_debug_info(self, set_debug_function, Script):
+        the_debug_function = [None]
+
+        def my_set_debug_function(debug_function, **kwargs):
+            the_debug_function[0] = debug_function
+
+        def my_script(*args, **kwargs):
+            the_debug_function[0](jedi.debug.NOTICE, "Notice")
+            the_debug_function[0](jedi.debug.WARNING, "Warning")
+            the_debug_function[0]("other", "Other")
+            raise RuntimeError
+
+        set_debug_function.side_effect = my_set_debug_function
+        Script.return_value.test_method = my_script
+
+        try:
+            jedibackend.run_with_debug(jedi, 'test_method', source="foo")
+        except rpc.Fault as e:
+            self.assertEqual(e.data["jedi_debug_info"]["debug_info"],
+                             ["[N] Notice",
+                              "[W] Warning",
+                              "[?] Other"])
+        else:
+            self.fail("Fault not thrown")
+
+    @mock.patch('jedi.set_debug_function')
+    @mock.patch('jedi.Script')
+    def test_should_not_fail_with_bad_data(self, Script, set_debug_function):
+        import jedi.debug
+
+        def set_debug(function, speed=True):
+            if function is not None:
+                function(jedi.debug.NOTICE, u"\xab")
+
+        set_debug_function.side_effect = set_debug
+        Script.return_value.test_method.side_effect = Exception
+
+        with self.assertRaises(rpc.Fault):
+            jedibackend.run_with_debug(jedi, 'test_method', 1, 2, arg=3)
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_pydocutils.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_pydocutils.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/tests/test_pydocutils.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/tests/test_pydocutils.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_refactor.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_refactor.py
new file mode 100644
index 0000000..94270eb
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_refactor.py
@@ -0,0 +1,545 @@
+import unittest
+import tempfile
+import shutil
+import os
+import mock
+import sys
+
+from elpy import refactor
+from textwrap import dedent
+
+
+class RefactorTestCase(unittest.TestCase):
+    def setUp(self):
+        self.project_root = tempfile.mkdtemp(prefix="test-refactor-root")
+        self.addCleanup(shutil.rmtree, self.project_root,
+                        ignore_errors=True)
+
+    def create_file(self, name, contents=""):
+        filename = os.path.join(self.project_root, name)
+        contents = dedent(contents)
+        offset = contents.find("_|_")
+        if offset > -1:
+            contents = contents[:offset] + contents[offset + 3:]
+        with open(filename, "w") as f:
+            f.write(contents)
+        return filename, offset
+
+    def assertSourceEqual(self, first, second, msg=None):
+        """Fail if the two objects are unequal, ignoring indentation."""
+        self.assertEqual(dedent(first), dedent(second), msg=msg)
+
+
+class TestGetRefactorOptions(RefactorTestCase):
+    def test_should_only_return_importsmodule_if_not_on_symbol(self):
+        filename, offset = self.create_file("foo.py",
+                                            """\
+                                            import foo
+                                            _|_""")
+        ref = refactor.Refactor(self.project_root, filename)
+        options = ref.get_refactor_options(offset)
+        self.assertTrue(all(opt['category'] in ('Imports',
+                                                'Module')
+                            for opt in options))
+        filename, offset = self.create_file("foo.py",
+                                            """\
+                                            _|_
+                                            import foo""")
+        ref = refactor.Refactor(self.project_root, filename)
+        options = ref.get_refactor_options(offset)
+        self.assertTrue(all(opt['category'] in ('Imports',
+                                                'Module')
+                            for opt in options))
+
+    def test_should_return_all_if_on_symbol(self):
+        filename, offset = self.create_file("foo.py",
+                                            "import _|_foo")
+        ref = refactor.Refactor(self.project_root, filename)
+        options = ref.get_refactor_options(offset)
+        self.assertTrue(all(opt['category'] in ('Imports',
+                                                'Method',
+                                                'Module',
+                                                'Symbol')
+                            for opt in options))
+
+    def test_should_return_only_region_if_endoffset(self):
+        filename, offset = self.create_file("foo.py",
+                                            "import foo")
+        ref = refactor.Refactor(self.project_root, filename)
+        options = ref.get_refactor_options(offset, 5)
+        self.assertTrue(all(opt['category'] == 'Region'
+                            for opt in options))
+
+    @unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+    def test_should_treat_from_import_special(self):
+        filename, offset = self.create_file("foo.py",
+                                            """\
+                                            import foo
+                                            _|_""")
+        ref = refactor.Refactor(self.project_root, filename)
+        options = ref.get_refactor_options(offset)
+        self.assertFalse(any(opt['name'] == "refactor_froms_to_imports"
+                             for opt in options))
+        filename, offset = self.create_file("foo.py",
+                                            "imp_|_ort foo")
+        ref = refactor.Refactor(self.project_root, filename)
+        options = ref.get_refactor_options(offset)
+        self.assertTrue(any(opt['name'] == "refactor_froms_to_imports"
+                            for opt in options))
+
+
+class TestGetChanges(RefactorTestCase):
+    def test_should_fail_if_method_is_not_refactoring(self):
+        filename, offset = self.create_file("foo.py")
+        ref = refactor.Refactor(self.project_root, filename)
+        self.assertRaises(ValueError, ref.get_changes, "bad_name")
+
+    def test_should_return_method_results(self):
+        filename, offset = self.create_file("foo.py")
+        ref = refactor.Refactor(self.project_root, filename)
+        with mock.patch.object(ref, 'refactor_extract_method') as test:
+            test.return_value = "Meep!"
+            self.assertEqual(ref.get_changes("refactor_extract_method",
+                                             1, 2),
+                             "Meep!")
+            test.assert_called_with(1, 2)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestIsOnSymbol(RefactorTestCase):
+    def test_should_find_symbol(self):
+        filename, offset = self.create_file("test.py", "__B_|_AR = 100")
+        r = refactor.Refactor(self.project_root, filename)
+        self.assertTrue(r._is_on_symbol(offset))
+
+    # Issue #111
+    def test_should_find_symbol_with_underscores(self):
+        filename, offset = self.create_file("test.py", "_|___BAR = 100")
+        r = refactor.Refactor(self.project_root, filename)
+        self.assertTrue(r._is_on_symbol(offset))
+
+    def test_should_not_find_weird_places(self):
+        filename, offset = self.create_file("test.py", "hello = _|_ 1 + 1")
+        r = refactor.Refactor(self.project_root, filename)
+        self.assertFalse(r._is_on_symbol(offset))
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestFromsToImports(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            """\
+            _|_from datetime import datetime
+
+            d = datetime(2013, 4, 7)
+            """)
+        ref = refactor.Refactor(self.project_root, filename)
+        (change,) = ref.get_changes("refactor_froms_to_imports", offset)
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], filename)
+        self.assertSourceEqual(change['contents'],
+                               """\
+                               import datetime
+
+                               d = datetime.datetime(2013, 4, 7)
+                               """)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestOrganizeImports(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            """\
+            import unittest, base64
+            import datetime, json
+
+            obj = json.dumps(23)
+            unittest.TestCase()
+            """)
+        ref = refactor.Refactor(self.project_root, filename)
+        (change,) = ref.get_changes("refactor_organize_imports")
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], filename)
+        self.assertSourceEqual(change['contents'],
+                               """\
+                               import json
+                               import unittest
+
+
+                               obj = json.dumps(23)
+                               unittest.TestCase()
+                               """)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestModuleToPackage(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            "_|_import os\n")
+        ref = refactor.Refactor(self.project_root, filename)
+        changes = ref.refactor_module_to_package()
+        a, b, c = changes
+        # Not sure why the a change is there. It's a CHANGE that
+        # changes nothing...
+        self.assertEqual(a['diff'], '')
+
+        self.assertEqual(b['action'], 'create')
+        self.assertEqual(b['type'], 'directory')
+        self.assertEqual(b['path'], os.path.join(self.project_root, "foo"))
+
+        self.assertEqual(c['action'], 'move')
+        self.assertEqual(c['type'], 'file')
+        self.assertEqual(c['source'], os.path.join(self.project_root,
+                                                   "foo.py"))
+        self.assertEqual(c['destination'], os.path.join(self.project_root,
+                                                        "foo/__init__.py"))
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestRenameAtPoint(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            """\
+            class Foo(object):
+                def _|_foo(self):
+                    return 5
+
+                def bar(self):
+                    return self.foo()
+            """)
+        file2, offset2 = self.create_file(
+            "bar.py",
+            """\
+            import foo
+
+
+            x = foo.Foo()
+            x.foo()""")
+        ref = refactor.Refactor(self.project_root, filename)
+        first, second = ref.refactor_rename_at_point(offset, "frob",
+                                                     in_hierarchy=False,
+                                                     docs=False)
+        if first['file'] == filename:
+            a, b = first, second
+        else:
+            a, b = second, first
+        self.assertEqual(a['action'], 'change')
+        self.assertEqual(a['file'], filename)
+        self.assertSourceEqual(a['contents'],
+                               """\
+                               class Foo(object):
+                                   def frob(self):
+                                       return 5
+
+                                   def bar(self):
+                                       return self.frob()
+                               """)
+        self.assertEqual(b['action'], 'change')
+        self.assertEqual(b['file'], file2)
+        self.assertSourceEqual(b['contents'],
+                               """\
+                               import foo
+
+
+                               x = foo.Foo()
+                               x.frob()""")
+
+    def test_should_refactor_in_hierarchy(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            """\
+            class Foo(object):
+                def _|_foo(self):
+                    return 5
+
+                def bar(self):
+                    return self.foo()
+
+            class Bar(Foo):
+                def foo(self):
+                    return 42
+
+            class Baz(object):
+                def foo(self):
+                    return 42
+            """)
+        file2, offset2 = self.create_file(
+            "bar.py",
+            """\
+            import foo
+
+
+            x, y, z = foo.Foo(), foo.Bar(), foo.Baz()
+            x.foo()
+            y.foo()
+            z.foo()""")
+        ref = refactor.Refactor(self.project_root, filename)
+        first, second = ref.refactor_rename_at_point(offset, "frob",
+                                                     in_hierarchy=True,
+                                                     docs=False)
+        if first['file'] == filename:
+            a, b = first, second
+        else:
+            a, b = second, first
+        self.assertEqual(a['action'], 'change')
+        self.assertEqual(a['file'], filename)
+        self.assertSourceEqual(a['contents'],
+                               """\
+                               class Foo(object):
+                                   def frob(self):
+                                       return 5
+
+                                   def bar(self):
+                                       return self.frob()
+
+                               class Bar(Foo):
+                                   def frob(self):
+                                       return 42
+
+                               class Baz(object):
+                                   def foo(self):
+                                       return 42
+                               """)
+        self.assertEqual(b['action'], 'change')
+        self.assertEqual(b['file'], file2)
+        self.assertSourceEqual(b['contents'],
+                               """\
+                               import foo
+
+
+                               x, y, z = foo.Foo(), foo.Bar(), foo.Baz()
+                               x.frob()
+                               y.frob()
+                               z.foo()""")
+
+    def test_should_refactor_in_docstrings(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            """\
+            class Foo(object):
+                "Frobnicate the foo"
+                def _|_foo(self):
+                    return 5
+
+            print("I'm an unrelated foo")
+            """)
+        ref = refactor.Refactor(self.project_root, filename)
+        (change,) = ref.refactor_rename_at_point(offset, "frob",
+                                                 in_hierarchy=False,
+                                                 docs=True)
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], filename)
+        self.assertSourceEqual(change['contents'],
+                               """\
+                               class Foo(object):
+                                   "Frobnicate the frob"
+                                   def frob(self):
+                                       return 5
+
+                               print("I'm an unrelated foo")
+                               """)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestRenameCurrentModule(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            "_|_import os\n")
+        file2, offset = self.create_file(
+            "bar.py",
+            """\
+            _|_import foo
+            foo.os
+            """)
+        dest = os.path.join(self.project_root, "frob.py")
+        ref = refactor.Refactor(self.project_root, filename)
+        a, b = ref.refactor_rename_current_module("frob")
+
+        self.assertEqual(a['action'], 'change')
+        self.assertEqual(a['file'], file2)
+        self.assertEqual(a['contents'],
+                         "import frob\n"
+                         "frob.os\n")
+
+        self.assertEqual(b['action'], 'move')
+        self.assertEqual(b['type'], 'file')
+        self.assertEqual(b['source'], filename)
+        self.assertEqual(b['destination'], dest)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestMoveModule(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            "_|_import os\n")
+        file2, offset = self.create_file(
+            "bar.py",
+            """\
+            _|_import foo
+            foo.os
+            """)
+        dest = os.path.join(self.project_root, "frob")
+        os.mkdir(dest)
+        with open(os.path.join(dest, "__init__.py"), "w") as f:
+            f.write("")
+        ref = refactor.Refactor(self.project_root, filename)
+        a, b = ref.refactor_move_module(dest)
+
+        self.assertEqual(a['action'], 'change')
+        self.assertEqual(a['file'], file2)
+        self.assertSourceEqual(a['contents'],
+                               """\
+                               import frob.foo
+                               frob.foo.os
+                               """)
+
+        self.assertEqual(b['action'], 'move')
+        self.assertEqual(b['type'], 'file')
+        self.assertEqual(b['source'], filename)
+        self.assertEqual(b['destination'],
+                         os.path.join(dest, "foo.py"))
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestCreateInline(RefactorTestCase):
+    def setUp(self):
+        super(TestCreateInline, self).setUp()
+        self.filename, self.offset = self.create_file(
+            "foo.py",
+            """\
+            def add(a, b):
+                return a + b
+
+            x = _|_add(2, 3)
+            y = add(17, 4)
+            """)
+
+    def test_should_refactor_single_occurrenc(self):
+        ref = refactor.Refactor(self.project_root, self.filename)
+        (change,) = ref.refactor_create_inline(self.offset, True)
+
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], self.filename)
+        self.assertSourceEqual(change['contents'],
+                               """\
+                               def add(a, b):
+                                   return a + b
+
+                               x = 2 + 3
+                               y = add(17, 4)
+                               """)
+
+    def test_should_refactor_all_occurrencs(self):
+        ref = refactor.Refactor(self.project_root, self.filename)
+        (change,) = ref.refactor_create_inline(self.offset, False)
+
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], self.filename)
+        self.assertSourceEqual(change['contents'],
+                               """\
+                               x = 2 + 3
+                               y = 17 + 4
+                               """)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestExtractMethod(RefactorTestCase):
+    def setUp(self):
+        super(TestExtractMethod, self).setUp()
+        self.filename, self.offset = self.create_file(
+            "foo.py",
+            """\
+            class Foo(object):
+                def spaghetti(self, a, b):
+                    _|_x = a + 5
+                    y = b + 23
+                    return y
+            """)
+
+    @unittest.skipIf(sys.version_info >= (3, 5), "Python 3.5 not supported")
+    def test_should_refactor_local(self):
+        ref = refactor.Refactor(self.project_root, self.filename)
+        (change,) = ref.refactor_extract_method(self.offset, 104,
+                                                "calc", False)
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], self.filename)
+        expected = """\
+                   class Foo(object):
+                       def spaghetti(self, a, b):
+                           return self.calc(a, b)
+
+                       def calc(self, a, b):
+                           x = a + 5
+                           y = b + 23
+                           return y
+                   """
+        expected2 = expected.replace("return self.calc(a, b)",
+                                     "return self.calc(b, a)")
+        expected2 = expected2.replace("def calc(self, a, b)",
+                                      "def calc(self, b, a)")
+        # This is silly, but it's what we got.
+        if change['contents'] == dedent(expected2):
+            self.assertSourceEqual(change['contents'], expected2)
+        else:
+            self.assertSourceEqual(change['contents'], expected)
+
+    @unittest.skipIf(sys.version_info >= (3, 5), "Python 3.5 not supported")
+    def test_should_refactor_global(self):
+        ref = refactor.Refactor(self.project_root, self.filename)
+        (change,) = ref.refactor_extract_method(self.offset, 104,
+                                                "calc", True)
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], self.filename)
+        expected = """\
+                   class Foo(object):
+                       def spaghetti(self, a, b):
+                           return calc(a, b)
+
+                   def calc(a, b):
+                       x = a + 5
+                       y = b + 23
+                       return y
+                   """
+        expected2 = expected.replace("return calc(a, b)",
+                                     "return calc(b, a)")
+        expected2 = expected2.replace("def calc(a, b)",
+                                      "def calc(b, a)")
+        if change['contents'] == dedent(expected2):
+            self.assertSourceEqual(change['contents'], expected2)
+        else:
+            self.assertSourceEqual(change['contents'], expected)
+
+
+@unittest.skipIf(not refactor.ROPE_AVAILABLE, "Requires Rope")
+class TestUseFunction(RefactorTestCase):
+    def test_should_refactor(self):
+        filename, offset = self.create_file(
+            "foo.py",
+            """\
+            def _|_add_and_multiply(a, b, c):
+                temp = a + b
+                return temp * c
+
+            f = 1 + 2
+            g = f * 3
+            """)
+
+        ref = refactor.Refactor(self.project_root, filename)
+        (change,) = ref.refactor_use_function(offset)
+
+        self.assertEqual(change['action'], 'change')
+        self.assertEqual(change['file'], filename)
+        self.assertSourceEqual(change['contents'],
+                               """\
+                               def add_and_multiply(a, b, c):
+                                   temp = a + b
+                                   return temp * c
+
+                               g = add_and_multiply(1, 2, 3)
+                               """)
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_ropebackend.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_ropebackend.py
new file mode 100644
index 0000000..f0a4121
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_ropebackend.py
@@ -0,0 +1,205 @@
+"""Tests for elpy.ropebackend."""
+
+import os
+import shutil
+import sys
+import tempfile
+
+import mock
+
+from elpy import ropebackend
+from elpy import rpc
+from elpy.tests import compat
+from elpy.tests.support import BackendTestCase
+from elpy.tests.support import RPCGetCompletionsTests
+from elpy.tests.support import RPCGetCompletionDocstringTests
+from elpy.tests.support import RPCGetCompletionLocationTests
+from elpy.tests.support import RPCGetDefinitionTests
+from elpy.tests.support import RPCGetCalltipTests
+from elpy.tests.support import RPCGetDocstringTests
+
+
+class RopeBackendTestCase(BackendTestCase):
+    def setUp(self):
+        super(RopeBackendTestCase, self).setUp()
+        self.backend = ropebackend.RopeBackend(self.project_root)
+
+
+class ShouldCallValidateTest(object):
+    def test_should_call_validate(self):
+        with mock.patch.object(self.backend, 'validate') as validate:
+            self.rpc(None, "", 0)
+
+            self.assertTrue(validate.called)
+
+
+class TestInit(RopeBackendTestCase):
+    def test_should_have_rope_as_name(self):
+        self.assertEqual(self.backend.name, "rope")
+
+    def test_should_patch_project_files(self):
+        self.project_file("foo.txt", "")
+        self.project_file("baddir/file.py", "")
+
+        self.backend.project.validate()
+
+        actual = [f.real_path for f in
+                  self.backend.project.file_list.get_files()]
+        self.assertEqual([os.path.join(self.project_root, "foo.txt")],
+                         actual)
+
+    def test_should_fail_for_inexisting_project_root(self):
+        with self.assertRaises(rpc.Fault):
+            ropebackend.RopeBackend("/does/not/exist/")
+
+
+class TestValidate(RopeBackendTestCase):
+    def test_should_call_validate_after_timeout(self):
+        with mock.patch("time.time") as t:
+            t.return_value = 10
+            self.backend.validate()
+            with mock.patch.object(self.backend, 'project') as project:
+                t.return_value = 10 + ropebackend.VALIDATE_EVERY_SECONDS + 1
+                self.backend.validate()
+
+                self.assertTrue(project.validate.called)
+
+    def test_should_not_call_validate_before_timeout(self):
+        with mock.patch("time.time") as t:
+            t.return_value = 10
+            self.backend.validate()
+            with mock.patch.object(self.backend, 'project') as project:
+                t.return_value = 10 + ropebackend.VALIDATE_EVERY_SECONDS - 1
+                self.backend.validate()
+
+                self.assertFalse(project.validate.called)
+
+    def test_should_not_fail_if_root_vanishes(self):
+        # Bug #353
+        tmpdir = tempfile.mkdtemp(prefix="elpy-test-validate-")
+        try:
+            backend = ropebackend.RopeBackend(tmpdir)
+        finally:
+            shutil.rmtree(tmpdir)
+        backend.validate()
+
+
+class TestRPCGetCompletions(RPCGetCompletionsTests,
+                            RopeBackendTestCase):
+    pass
+
+
+class TestRPCGetCompletionDocstring(RPCGetCompletionDocstringTests,
+                                    RopeBackendTestCase):
+    pass
+
+
+class TestRPCGetCompletionLocation(RPCGetCompletionLocationTests,
+                                   RopeBackendTestCase):
+    pass
+
+
+class TestRPCGetDefinition(RPCGetDefinitionTests,
+                           ShouldCallValidateTest,
+                           RopeBackendTestCase):
+    pass
+
+
+class TestRPCGetCalltip(RPCGetCalltipTests,
+                        ShouldCallValidateTest,
+                        RopeBackendTestCase):
+    ADD_CALLTIP = 'Add.add(a, b)'
+    RADIX_CALLTIP = "Decimal.radix()"
+    if compat.PYTHON3:
+        THREAD_CALLTIP = (
+            "threading.Thread(group=None, target=None, "
+            "name=None, args=(), kwargs=None, daemon=None, *)"
+        )
+        KEYS_CALLTIP = "builtins.keys()"
+    else:
+        THREAD_CALLTIP = (
+            "threading.Thread(group=None, target=None, "
+            "name=None, args=(), kwargs=None, verbose=None)"
+        )
+        KEYS_CALLTIP = "__builtin__.keys()"
+
+
+class TestRPCGetDocstring(RPCGetDocstringTests,
+                          ShouldCallValidateTest,
+                          RopeBackendTestCase):
+    if sys.version_info < (2, 7):
+        JSON_LOADS_DOCSTRING = (
+            'loads(s, encoding=None, cls=None, object_hook=None, '
+            'parse_float=None, parse_int=None, parse_constant=None, '
+            '**kw):'
+        )
+    else:
+        JSON_LOADS_DOCSTRING = (
+            'loads(s, encoding=None, cls=None, object_hook=None, '
+            'parse_float=None, parse_int=None, parse_constant=None, '
+            'object_pairs_hook=None, **kw):'
+        )
+
+
+class TestGetPythonProjectFiles(RopeBackendTestCase):
+    def test(self):
+        self.project_file("foo.txt", "")
+        self.project_file("gooddir/__init__.py", "")
+        self.project_file("gooddir/file.py", "")
+        self.project_file("baddir/file.py", "")
+        expected = set(os.path.join(self.project_root, name)
+                       for name in ["foo.txt", "gooddir/__init__.py",
+                                    "gooddir/file.py"])
+        project = self.backend.project
+
+        actual = set(resource.real_path
+                     for resource
+                     in ropebackend.get_python_project_files(project))
+
+        self.assertEqual(expected, actual)
+
+
+class TestPatchProjectFiles(RopeBackendTestCase):
+    def test(self):
+        self.project_file("foo.txt", "")
+        self.project_file("gooddir/__init__.py", "")
+        self.project_file("gooddir/file.py", "")
+        self.project_file("baddir/file.py", "")
+        expected = set(os.path.join(self.project_root, name)
+                       for name in ["foo.txt", "gooddir/__init__.py",
+                                    "gooddir/file.py"])
+
+        actual = set(resource.real_path
+                     for resource
+                     in self.backend.project.get_files())
+        self.assertEqual(expected, actual)
+
+
+class TestCallRope(RopeBackendTestCase):
+    def test_should_return_value(self):
+        func = mock.MagicMock()
+        func.return_value = 23
+
+        actual = self.backend.call_rope(
+            func, "foo.py", "", 0
+        )
+
+        self.assertEqual(23, actual)
+
+    def test_should_raise_fault_with_data_on_exception(self):
+        func = mock.MagicMock()
+        func.side_effect = RuntimeError("Stuff!")
+        func.__module__ = "rope.test"
+        func.__name__ = "test_function"
+
+        try:
+            self.backend.call_rope(
+                func, "foo.py", "", 0
+            )
+        except rpc.Fault as e:
+            self.assertEqual(500, e.code)
+            self.assertEqual("Stuff!", e.message)
+            self.assertIn("traceback", e.data)
+            self.assertIn("rope_debug_info", e.data)
+            self.assertEqual("rope.test.test_function",
+                             e.data["rope_debug_info"]["function_name"])
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_rpc.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_rpc.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/tests/test_rpc.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/tests/test_rpc.py
diff --git a/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_server.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_server.py
new file mode 100644
index 0000000..5e0884a
--- /dev/null
+++ b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_server.py
@@ -0,0 +1,421 @@
+# coding: utf-8
+
+"""Tests for the elpy.server module"""
+
+import os
+import tempfile
+import unittest
+
+import mock
+
+from elpy import rpc
+from elpy import server
+from elpy.tests import compat
+from elpy.tests.support import BackendTestCase
+import elpy.refactor
+
+
+class ServerTestCase(unittest.TestCase):
+    def setUp(self):
+        self.srv = server.ElpyRPCServer()
+
+
+class BackendCallTestCase(ServerTestCase):
+    def assert_calls_backend(self, method):
+        with mock.patch("elpy.server.get_source") as get_source:
+            with mock.patch.object(self.srv, "backend") as backend:
+                get_source.return_value = "transformed source"
+
+                getattr(self.srv, method)("filename", "source", "offset")
+
+                get_source.assert_called_with("source")
+                getattr(backend, method).assert_called_with(
+                    "filename", "transformed source", "offset"
+                )
+
+
+class TestInit(ServerTestCase):
+    def test_should_not_select_a_backend_by_default(self):
+        self.assertIsNone(self.srv.backend)
+
+
+class TestRPCEcho(ServerTestCase):
+    def test_should_return_arguments(self):
+        self.assertEqual(("hello", "world"),
+                         self.srv.rpc_echo("hello", "world"))
+
+
+class TestRPCInit(ServerTestCase):
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_set_project_root(self, RopeBackend, JediBackend):
+        self.srv.rpc_init({"project_root": "/project/root",
+                           "backend": "rope"})
+
+        self.assertEqual("/project/root", self.srv.project_root)
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_initialize_rope(self, RopeBackend, JediBackend):
+        self.srv.rpc_init({"project_root": "/project/root",
+                           "backend": "rope"})
+
+        RopeBackend.assert_called_with("/project/root")
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_initialize_jedi(self, RopeBackend, JediBackend):
+        self.srv.rpc_init({"project_root": "/project/root",
+                           "backend": "jedi"})
+
+        JediBackend.assert_called_with("/project/root")
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_use_rope_if_available_and_requested(
+            self, RopeBackend, JediBackend):
+        RopeBackend.return_value.name = "rope"
+        JediBackend.return_value.name = "jedi"
+
+        self.srv.rpc_init({"project_root": "/project/root",
+                           "backend": "rope"})
+
+        self.assertEqual("rope", self.srv.backend.name)
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_use_jedi_if_available_and_requested(
+            self, RopeBackend, JediBackend):
+        RopeBackend.return_value.name = "rope"
+        JediBackend.return_value.name = "jedi"
+
+        self.srv.rpc_init({"project_root": "/project/root",
+                           "backend": "jedi"})
+
+        self.assertEqual("jedi", self.srv.backend.name)
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_use_rope_if_available_and_nothing_requested(
+            self, RopeBackend, JediBackend):
+        RopeBackend.return_value.name = "rope"
+        JediBackend.return_value.name = "jedi"
+
+        self.srv.rpc_init({"project_root": "/project/root",
+                           "backend": None})
+
+        self.assertEqual("rope", self.srv.backend.name)
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_use_jedi_if_rope_not_available_and_nothing_requested(
+            self, RopeBackend, JediBackend):
+        RopeBackend.return_value.name = "rope"
+        JediBackend.return_value.name = "jedi"
+        old_rope = server.ropebackend
+        server.ropebackend = None
+
+        try:
+            self.srv.rpc_init({"project_root": "/project/root",
+                               "backend": None})
+        finally:
+            server.ropebackend = old_rope
+
+        self.assertEqual("jedi", self.srv.backend.name)
+
+    @mock.patch("elpy.jedibackend.JediBackend")
+    @mock.patch("elpy.ropebackend.RopeBackend")
+    def test_should_use_none_if_nothing_available(
+            self, RopeBackend, JediBackend):
+        RopeBackend.return_value.name = "rope"
+        JediBackend.return_value.name = "jedi"
+        old_rope = server.ropebackend
+        old_jedi = server.jedibackend
+        server.ropebackend = None
+        server.jedibackend = None
+
+        try:
+            self.srv.rpc_init({"project_root": "/project/root",
+                               "backend": None})
+        finally:
+            server.ropebackend = old_rope
+            server.jedibackend = old_jedi
+
+        self.assertIsNone(self.srv.backend)
+
+
+class TestRPCGetCalltip(BackendCallTestCase):
+    def test_should_call_backend(self):
+        self.assert_calls_backend("rpc_get_calltip")
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        self.assertIsNone(self.srv.rpc_get_calltip("filname", "source",
+                                                   "offset"))
+
+
+class TestRPCGetCompletions(BackendCallTestCase):
+    def test_should_call_backend(self):
+        self.assert_calls_backend("rpc_get_completions")
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        self.assertEqual([],
+                         self.srv.rpc_get_completions("filname", "source",
+                                                      "offset"))
+
+    def test_should_sort_results(self):
+        with mock.patch.object(self.srv, 'backend') as backend:
+            backend.rpc_get_completions.return_value = [
+                {'name': '_e'},
+                {'name': '__d'},
+                {'name': 'c'},
+                {'name': 'B'},
+                {'name': 'a'},
+            ]
+            expected = list(reversed(backend.rpc_get_completions.return_value))
+
+            actual = self.srv.rpc_get_completions("filename", "source",
+                                                  "offset")
+
+            self.assertEqual(expected, actual)
+
+    def test_should_uniquify_results(self):
+        with mock.patch.object(self.srv, 'backend') as backend:
+            backend.rpc_get_completions.return_value = [
+                {'name': 'a'},
+                {'name': 'a'},
+            ]
+            expected = [{'name': 'a'}]
+
+            actual = self.srv.rpc_get_completions("filename", "source",
+                                                  "offset")
+
+            self.assertEqual(expected, actual)
+
+
+class TestRPCGetCompletionDocs(ServerTestCase):
+    def test_should_call_backend(self):
+        with mock.patch.object(self.srv, "backend") as backend:
+            self.srv.rpc_get_completion_docstring("completion")
+
+            (backend.rpc_get_completion_docstring
+             .assert_called_with("completion"))
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        self.assertIsNone(self.srv.rpc_get_completion_docstring("foo"))
+
+
+class TestRPCGetCompletionLocation(ServerTestCase):
+    def test_should_call_backend(self):
+        with mock.patch.object(self.srv, "backend") as backend:
+            self.srv.rpc_get_completion_location("completion")
+
+            (backend.rpc_get_completion_location
+             .assert_called_with("completion"))
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        self.assertIsNone(self.srv.rpc_get_completion_location("foo"))
+
+
+class TestRPCGetDefinition(BackendCallTestCase):
+    def test_should_call_backend(self):
+        self.assert_calls_backend("rpc_get_definition")
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        self.assertIsNone(self.srv.rpc_get_definition("filname", "source",
+                                                      "offset"))
+
+
+class TestRPCGetDocstring(BackendCallTestCase):
+    def test_should_call_backend(self):
+        self.assert_calls_backend("rpc_get_docstring")
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        self.assertIsNone(self.srv.rpc_get_docstring("filname", "source",
+                                                     "offset"))
+
+
+class TestRPCGetPydocCompletions(ServerTestCase):
+    @mock.patch.object(server, 'get_pydoc_completions')
+    def test_should_call_pydoc_completions(self, get_pydoc_completions):
+        srv = server.ElpyRPCServer()
+        srv.rpc_get_pydoc_completions()
+        get_pydoc_completions.assert_called_with(None)
+        srv.rpc_get_pydoc_completions("foo")
+        get_pydoc_completions.assert_called_with("foo")
+
+
+class TestGetPydocDocumentation(ServerTestCase):
+    @mock.patch("pydoc.render_doc")
+    def test_should_find_documentation(self, render_doc):
+        render_doc.return_value = "expected"
+
+        actual = self.srv.rpc_get_pydoc_documentation("open")
+
+        render_doc.assert_called_with("open",
+                                      "Elpy Pydoc Documentation for %s",
+                                      False)
+        self.assertEqual("expected", actual)
+
+    def test_should_return_none_for_unknown_module(self):
+        actual = self.srv.rpc_get_pydoc_documentation("frob.open")
+
+        self.assertIsNone(actual)
+
+    def test_should_return_valid_unicode(self):
+        import json
+
+        docstring = self.srv.rpc_get_pydoc_documentation("tarfile")
+
+        json.dumps(docstring)
+
+
+class TestRPCGetRefactorOptions(BackendTestCase):
+    @mock.patch.object(compat.builtins, '__import__')
+    def test_should_fail_if_rope_is_not_available(self, import_):
+        import_.side_effect = ImportError
+        filename = self.project_file("foo.py", "")
+        srv = server.ElpyRPCServer()
+        self.assertRaises(ImportError, srv.rpc_get_refactor_options,
+                          filename, 0)
+
+    @mock.patch.object(elpy.refactor, 'Refactor')
+    def test_should_initialize_and_call_refactor_object(self, Refactor):
+        filename = self.project_file("foo.py", "import foo")
+        srv = server.ElpyRPCServer()
+        srv.project_root = self.project_root
+
+        srv.rpc_get_refactor_options(filename, 5)
+
+        Refactor.assert_called_with(self.project_root, filename)
+        Refactor.return_value.get_refactor_options.assert_called_with(5, None)
+
+
+class TestRPCRefactor(BackendTestCase):
+    @mock.patch.object(compat.builtins, '__import__')
+    def test_should_fail_if_rope_is_not_available(self, import_):
+        import_.side_effect = ImportError
+        filename = self.project_file("foo.py", "")
+        srv = server.ElpyRPCServer()
+        self.assertRaises(ImportError, srv.rpc_refactor,
+                          filename, 'foo', ())
+
+    @mock.patch.object(elpy.refactor, 'Refactor')
+    def test_should_initialize_and_call_refactor_object_with_args(
+            self, Refactor):
+        filename = self.project_file("foo.py", "import foo")
+        srv = server.ElpyRPCServer()
+        srv.project_root = self.project_root
+
+        srv.rpc_refactor(filename, 'foo', (1, 2, 3))
+
+        Refactor.assert_called_with(self.project_root, filename)
+        Refactor.return_value.get_changes.assert_called_with('foo', 1, 2, 3)
+
+    @mock.patch.object(elpy.refactor, 'Refactor')
+    def test_should_initialize_and_call_refactor_object_without_args(
+            self, Refactor):
+        filename = self.project_file("foo.py", "import foo")
+        srv = server.ElpyRPCServer()
+        srv.project_root = self.project_root
+
+        srv.rpc_refactor(filename, 'foo', None)
+
+        Refactor.assert_called_with(self.project_root, filename)
+        Refactor.return_value.get_changes.assert_called_with('foo')
+
+
+class TestRPCGetUsages(BackendCallTestCase):
+    def test_should_call_backend(self):
+        self.assert_calls_backend("rpc_get_usages")
+
+    def test_should_handle_no_backend(self):
+        self.srv.backend = None
+        with self.assertRaises(rpc.Fault):
+            self.assertIsNone(self.srv.rpc_get_usages("filname", "source",
+                                                      "offset"))
+
+
+class TestRPCImportMagic(ServerTestCase):
+    def test_should_call_importmagic(self):
+        with mock.patch.object(self.srv, "import_magic") as impmagic:
+            self.srv.rpc_get_import_symbols("filename", "source", "os")
+            impmagic.get_import_symbols.assert_called_with("os")
+            self.srv.rpc_add_import("filename", "source", "import os")
+            impmagic.add_import.assert_called_with("source", "import os")
+            self.srv.rpc_get_unresolved_symbols("filename", "source")
+            impmagic.get_unresolved_symbols.assert_called_with("source")
+            self.srv.rpc_remove_unreferenced_imports("filename", "source")
+            impmagic.remove_unreferenced_imports.assert_called_with("source")
+
+
+class TestGetSource(unittest.TestCase):
+    def test_should_return_string_by_default(self):
+        self.assertEqual(server.get_source("foo"),
+                         "foo")
+
+    def test_should_return_file_contents(self):
+        fd, filename = tempfile.mkstemp(prefix="elpy-test-")
+        self.addCleanup(os.remove, filename)
+        with open(filename, "w") as f:
+            f.write("file contents")
+
+        fileobj = {'filename': filename}
+
+        self.assertEqual(server.get_source(fileobj),
+                         "file contents")
+
+    def test_should_clean_up_tempfile(self):
+        fd, filename = tempfile.mkstemp(prefix="elpy-test-")
+        with open(filename, "w") as f:
+            f.write("file contents")
+
+        fileobj = {'filename': filename,
+                   'delete_after_use': True}
+
+        self.assertEqual(server.get_source(fileobj),
+                         "file contents")
+        self.assertFalse(os.path.exists(filename))
+
+    def test_should_support_utf8(self):
+        fd, filename = tempfile.mkstemp(prefix="elpy-test-")
+        self.addCleanup(os.remove, filename)
+        with open(filename, "wb") as f:
+            f.write(u"möp".encode("utf-8"))
+
+        source = server.get_source({'filename': filename})
+
+        self.assertEqual(source, u"möp")
+
+
+class TestPysymbolKey(BackendTestCase):
+    def keyLess(self, a, b):
+        self.assertLess(b, a)
+        self.assertLess(server._pysymbol_key(a),
+                        server._pysymbol_key(b))
+
+    def test_should_be_case_insensitive(self):
+        self.keyLess("bar", "Foo")
+
+    def test_should_sort_private_symbols_after_public_symbols(self):
+        self.keyLess("foo", "_bar")
+
+    def test_should_sort_private_symbols_after_dunder_symbols(self):
+        self.assertLess(server._pysymbol_key("__foo__"),
+                        server._pysymbol_key("_bar"))
+
+    def test_should_sort_dunder_symbols_after_public_symbols(self):
+        self.keyLess("bar", "__foo")
+
+
+class Autopep8TestCase(ServerTestCase):
+
+    def test_rpc_fix_code_should_return_formatted_string(self):
+        code_block = 'x=       123\n'
+        new_block = self.srv.rpc_fix_code(code_block)
+        self.assertEqual(new_block, 'x = 123\n')
diff --git a/emacs.d/elpa/elpy-20150502.740/elpy/tests/test_support.py b/emacs.d/elpa/elpy-20151101.401/elpy/tests/test_support.py
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/elpy/tests/test_support.py
rename to emacs.d/elpa/elpy-20151101.401/elpy/tests/test_support.py
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/.yas-setup.el b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/.yas-setup.el
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/.yas-setup.el
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/.yas-setup.el
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__abs__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__abs__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__abs__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__abs__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__add__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__add__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__add__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__add__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__and__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__and__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__and__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__and__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__bool__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__bool__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__bool__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__bool__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__call__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__call__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__call__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__call__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__cmp__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__cmp__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__cmp__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__cmp__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__coerce__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__coerce__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__coerce__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__coerce__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__complex__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__complex__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__complex__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__complex__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__contains__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__contains__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__contains__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__contains__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__del__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__del__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__del__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__del__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__delattr__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__delattr__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__delattr__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__delattr__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__delete__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__delete__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__delete__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__delete__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__delitem__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__delitem__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__delitem__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__delitem__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__div__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__div__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__div__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__div__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__divmod__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__divmod__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__divmod__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__divmod__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__enter__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__enter__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__enter__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__enter__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__eq__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__eq__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__eq__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__eq__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__exit__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__exit__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__exit__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__exit__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__float__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__float__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__float__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__float__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__floordiv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__floordiv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__floordiv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__floordiv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ge__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ge__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ge__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ge__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__get__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__get__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__get__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__get__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__getattr__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__getattr__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__getattr__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__getattr__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__getattribute__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__getattribute__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__getattribute__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__getattribute__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__getitem__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__getitem__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__getitem__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__getitem__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__gt__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__gt__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__gt__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__gt__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__hash__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__hash__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__hash__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__hash__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__hex__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__hex__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__hex__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__hex__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__iadd__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__iadd__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__iadd__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__iadd__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__iand__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__iand__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__iand__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__iand__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__idiv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__idiv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__idiv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__idiv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ifloordiv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ifloordiv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ifloordiv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ifloordiv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ilshift__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ilshift__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ilshift__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ilshift__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__imod__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__imod__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__imod__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__imod__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__imul__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__imul__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__imul__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__imul__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__index__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__index__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__index__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__index__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__init__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__init__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__init__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__init__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__instancecheck__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__instancecheck__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__instancecheck__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__instancecheck__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__int__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__int__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__int__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__int__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__invert__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__invert__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__invert__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__invert__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ior__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ior__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ior__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ior__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ipow__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ipow__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ipow__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ipow__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__irshift__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__irshift__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__irshift__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__irshift__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__isub__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__isub__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__isub__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__isub__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__iter__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__iter__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__iter__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__iter__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__itruediv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__itruediv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__itruediv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__itruediv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ixor__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ixor__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ixor__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ixor__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__le__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__le__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__le__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__le__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__len__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__len__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__len__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__len__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__long__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__long__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__long__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__long__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__lshift__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__lshift__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__lshift__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__lshift__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__lt__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__lt__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__lt__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__lt__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__mod__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__mod__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__mod__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__mod__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__mul__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__mul__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__mul__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__mul__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ne__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ne__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ne__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ne__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__neg__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__neg__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__neg__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__neg__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__new__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__new__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__new__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__new__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__nonzero__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__nonzero__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__nonzero__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__nonzero__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__oct__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__oct__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__oct__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__oct__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__or__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__or__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__or__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__or__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__pos__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__pos__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__pos__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__pos__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__pow__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__pow__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__pow__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__pow__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__radd__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__radd__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__radd__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__radd__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rand__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rand__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rand__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rand__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rdivmod__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rdivmod__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rdivmod__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rdivmod__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__repr__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__repr__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__repr__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__repr__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__reversed__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__reversed__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__reversed__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__reversed__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rfloordiv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rfloordiv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rfloordiv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rfloordiv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rlshift__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rlshift__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rlshift__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rlshift__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rmod__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rmod__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rmod__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rmod__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rmul__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rmul__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rmul__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rmul__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ror__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ror__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__ror__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__ror__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rpow__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rpow__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rpow__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rpow__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rrshift__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rrshift__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rrshift__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rrshift__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rshift__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rshift__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rshift__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rshift__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rsub__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rsub__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rsub__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rsub__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rtruediv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rtruediv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rtruediv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rtruediv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rxor__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rxor__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__rxor__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__rxor__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__set__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__set__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__set__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__set__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__setattr__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__setattr__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__setattr__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__setattr__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__setitem__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__setitem__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__setitem__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__setitem__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__slots__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__slots__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__slots__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__slots__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__str__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__str__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__str__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__str__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__sub__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__sub__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__sub__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__sub__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__subclasscheck__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__subclasscheck__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__subclasscheck__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__subclasscheck__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__truediv__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__truediv__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__truediv__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__truediv__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__unicode__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__unicode__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__unicode__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__unicode__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__xor__ b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__xor__
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/__xor__
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/__xor__
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/ase b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/ase
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/ase
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/ase
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/asne b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/asne
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/asne
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/asne
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/asr b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/asr
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/asr
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/asr
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/class b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/class
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/class
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/class
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/defs b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/defs
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/defs
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/defs
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/enc b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/enc
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/enc
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/enc
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/env b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/env
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/env
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/env
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/from b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/from
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/from
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/from
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/pdb b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/pdb
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/pdb
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/pdb
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/py3 b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/py3
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/py3
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/py3
diff --git a/emacs.d/elpa/elpy-20150502.740/snippets/python-mode/super b/emacs.d/elpa/elpy-20151101.401/snippets/python-mode/super
similarity index 100%
rename from emacs.d/elpa/elpy-20150502.740/snippets/python-mode/super
rename to emacs.d/elpa/elpy-20151101.401/snippets/python-mode/super
diff --git a/emacs.d/elpa/elpy-readme.txt b/emacs.d/elpa/elpy-readme.txt
new file mode 100644
index 0000000..e9c7837
--- /dev/null
+++ b/emacs.d/elpa/elpy-readme.txt
@@ -0,0 +1,9 @@
+The Emacs Lisp Python Environment in Emacs
+
+Elpy is an Emacs package to bring powerful Python editing to Emacs.
+It combines a number of existing Emacs packages, both written in
+Emacs Lisp as well as Python.
+
+For more information, read the Elpy manual:
+
+http://elpy.readthedocs.org/en/latest/index.html
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-autoloads.el b/emacs.d/elpa/erlang-20150622.644/erlang-autoloads.el
deleted file mode 100644
index 54809b8..0000000
--- a/emacs.d/elpa/erlang-20150622.644/erlang-autoloads.el
+++ /dev/null
@@ -1,144 +0,0 @@
-;;; erlang-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "erlang" "erlang.el" (21898 47979 0 0))
-;;; Generated autoloads from erlang.el
-
-(autoload 'erlang-mode "erlang" "\
-Major mode for editing Erlang source files in Emacs.
-It knows about syntax and comment, it can indent code, it is capable
-of fontifying the source file, the TAGS commands are aware of Erlang
-modules, and the Erlang man pages can be accessed.
-
-Should this module, \"erlang.el\", be installed properly, Erlang mode
-is activated whenever an Erlang source or header file is loaded into
-Emacs.  To indicate this, the mode line should contain the word
-\"Erlang\".
-
-The main feature of Erlang mode is indentation, press TAB and the
-current line will be indented correctly.
-
-Comments starting with only one `%' are indented to the column stored
-in the variable `comment-column'.  Comments starting with two `%':s
-are indented with the same indentation as code.  Comments starting
-with at least three `%':s are indented to the first column.
-
-However, Erlang mode contains much more, this is a list of the most
-useful commands:
-     TAB     - Indent the line.
-     C-c C-q - Indent current function.
-     M-;     - Create a comment at the end of the line.
-     M-q     - Fill a comment, i.e. wrap lines so that they (hopefully)
-		 will look better.
-     M-a     - Goto the beginning of an Erlang clause.
-     M-C-a   - Ditto for function.
-     M-e     - Goto the end of an Erlang clause.
-     M-C-e   - Ditto for function.
-     M-h     - Mark current Erlang clause.
-     M-C-h   - Ditto for function.
-     C-c C-z - Start, or switch to, an inferior Erlang shell.
-     C-c C-k - Compile current file.
-     C-x `   - Next error.
-     ,       - Electric comma.
-     ;       - Electric semicolon.
-
-Erlang mode check the name of the file against the module name when
-saving, whenever a mismatch occurs Erlang mode offers to modify the
-source.
-
-The variable `erlang-electric-commands' controls the electric
-commands.  To deactivate all of them, set it to nil.
-
-There exists a large number of commands and variables in the Erlang
-module.  Please press `M-x apropos RET erlang RET' to see a complete
-list.  Press `C-h f name-of-function RET' and `C-h v name-of-variable
-RET'to see the full description of functions and variables,
-respectively.
-
-On entry to this mode the contents of the hook `erlang-mode-hook' is
-executed.
-
-Please see the beginning of the file `erlang.el' for more information
-and examples of hooks.
-
-Other commands:
-\\{erlang-mode-map}
-
-\(fn)" t nil)
-
-(dolist (r '("\\.erl$" "\\.app\\.src$" "\\.escript" "\\.hrl$" "\\.xrl$" "\\.yrl" "/ebin/.+\\.app")) (add-to-list 'auto-mode-alist (cons r 'erlang-mode)))
-
-(autoload 'erlang-find-tag "erlang" "\
-Like `find-tag'.  Capable of retrieving Erlang modules.
-
-Tags can be given on the forms `tag', `module:', `module:tag'.
-
-\(fn MODTAGNAME &optional NEXT-P REGEXP-P)" t nil)
-
-(autoload 'erlang-find-tag-other-window "erlang" "\
-Like `find-tag-other-window' but aware of Erlang modules.
-
-\(fn TAGNAME &optional NEXT-P REGEXP-P)" t nil)
-
-(autoload 'erlang-shell "erlang" "\
-Start a new Erlang shell.
-
-The variable `erlang-shell-function' decides which method to use,
-default is to start a new Erlang host.  It is possible that, in the
-future, a new shell on an already running host will be started.
-
-\(fn)" t nil)
- (autoload 'run-erlang "erlang" "Start a new Erlang shell." t)
-
-(autoload 'erlang-compile "erlang" "\
-Compile Erlang module in current buffer.
-
-\(fn)" t nil)
-
-(autoload 'inferior-erlang "erlang" "\
-Run an inferior Erlang.
-With prefix command, prompt for command to start Erlang with.
-
-This is just like running Erlang in a normal shell, except that
-an Emacs buffer is used for input and output.
-\\<comint-mode-map>
-The command line history can be accessed with  \\[comint-previous-input]  and  \\[comint-next-input].
-The history is saved between sessions.
-
-Entry to this mode calls the functions in the variables
-`comint-mode-hook' and `erlang-shell-mode-hook' with no arguments.
-
-The following commands imitate the usual Unix interrupt and
-editing control characters:
-\\{erlang-shell-mode-map}
-
-\(fn &optional COMMAND)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "erlang-start" "erlang-start.el" (21898 47979
-;;;;;;  0 0))
-;;; Generated autoloads from erlang-start.el
-
-(let ((a '("\\.erl\\'" . erlang-mode)) (b '("\\.hrl\\'" . erlang-mode))) (or (assoc (car a) auto-mode-alist) (setq auto-mode-alist (cons a auto-mode-alist))) (or (assoc (car b) auto-mode-alist) (setq auto-mode-alist (cons b auto-mode-alist))))
-
-(add-to-list 'interpreter-mode-alist (cons "escript" 'erlang-mode))
-
-(let ((erl-ext '(".jam" ".vee" ".beam"))) (while erl-ext (let ((cie completion-ignored-extensions)) (while (and cie (not (string-equal (car cie) (car erl-ext)))) (setq cie (cdr cie))) (if (null cie) (setq completion-ignored-extensions (cons (car erl-ext) completion-ignored-extensions)))) (setq erl-ext (cdr erl-ext))))
-
-;;;***
-
-;;;### (autoloads nil nil ("erlang-eunit.el" "erlang-flymake.el"
-;;;;;;  "erlang-pkg.el" "erlang-skels-old.el" "erlang-skels.el" "erlang_appwiz.el")
-;;;;;;  (21898 47979 264219 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; erlang-autoloads.el ends here
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-pkg.el b/emacs.d/elpa/erlang-20150622.644/erlang-pkg.el
deleted file mode 100644
index 780460d..0000000
--- a/emacs.d/elpa/erlang-20150622.644/erlang-pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(define-package "erlang" "20150622.644" "Erlang major mode" 'nil)
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang.el b/emacs.d/elpa/erlang-20150622.644/erlang.el
deleted file mode 100644
index 4aa1ab7..0000000
--- a/emacs.d/elpa/erlang-20150622.644/erlang.el
+++ /dev/null
@@ -1,5815 +0,0 @@
-;;; erlang.el --- Major modes for editing and running Erlang
-
-;; Copyright (C) 2004  Free Software Foundation, Inc.
-;; Author:   Anders Lindgren
-;; Keywords: erlang, languages, processes
-;; Date:     2011-12-11
-
-;; %CopyrightBegin%
-;;
-;; Copyright Ericsson AB 1996-2014. All Rights Reserved.
-;;
-;; Licensed under the Apache License, Version 2.0 (the "License");
-;; you may not use this file except in compliance with the License.
-;; You may obtain a copy of the License at
-;;
-;;     http://www.apache.org/licenses/LICENSE-2.0
-;;
-;; Unless required by applicable law or agreed to in writing, software
-;; distributed under the License is distributed on an "AS IS" BASIS,
-;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-;; See the License for the specific language governing permissions and
-;; limitations under the License.
-;;
-;; %CopyrightEnd%
-;;
-
-;; Lars Thors�n's modifications of 2000-06-07 included.
-;; The original version of this package was written by Robert Virding.
-;;
-;;; Commentary:
-
-;; Introduction:
-;; ------------
-;;
-;; This package provides support for the programming language Erlang.
-;; The package provides an editing mode with lots of bells and
-;; whistles, compilation support, and it makes it possible for the
-;; user to start Erlang shells that run inside Emacs.
-;;
-;; See the Erlang distribution for full documentation of this package.
-
-;; Installation:
-;; ------------
-;;
-;; Place this file in Emacs load path, byte-compile it, and add the
-;; following line to the appropriate init file:
-;;
-;;    (require 'erlang-start)
-;;
-;; The full documentation contains much more extensive description of
-;; the installation procedure.
-
-;; Reporting Bugs:
-;; --------------
-;;
-;; Please send bug reports to the following email address:
-;;      erlang-bugs@erlang.org
-;; or if you have a patch suggestion to:
-;;      erlang-patches@erlang.org
-;; Please state as exactly as possible:
-;;    - Version number of Erlang Mode (see the menu), Emacs, Erlang,
-;;	and of any other relevant software.
-;;    - What the expected result was.
-;;    - What you did, preferably in a repeatable step-by-step form.
-;;    - A description of the unexpected result.
-;;    - Relevant pieces of Erlang code causing the problem.
-;;    - Personal Emacs customisations, if any.
-;;
-;; Should the Emacs generate an error, please set the Emacs variable
-;; `debug-on-error' to `t'.  Repeat the error and enclose the debug
-;; information in your bug-report.
-;;
-;; To set the variable you can use the following command:
-;;     M-x set-variable RET debug-on-error RET t RET
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
-;; Variables:
-
-(defconst erlang-version "2.7"
-  "The version number of Erlang mode.")
-
-(defvar erlang-root-dir nil
-  "The directory where the Erlang system is installed.
-The name should not contain the trailing slash.
-
-Should this variable be nil, no manual pages will show up in the
-Erlang mode menu.")
-
-(eval-and-compile
-  (defconst erlang-emacs-major-version
-    (if (boundp 'emacs-major-version)
-	emacs-major-version
-      (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
-      (erlang-string-to-int (substring emacs-version
-				       (match-beginning 1) (match-end 1))))
-    "Major version number of Emacs."))
-
-(eval-and-compile
-  (defconst erlang-emacs-minor-version
-  (if (boundp 'emacs-minor-version)
-      emacs-minor-version
-    (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
-    (erlang-string-to-int (substring emacs-version
-			      (match-beginning 2) (match-end 2))))
-  "Minor version number of Emacs."))
-
-(defconst erlang-xemacs-p (string-match "Lucid\\|XEmacs" emacs-version)
-  "Non-nil when running under XEmacs or Lucid Emacs.")
-
-(defvar erlang-xemacs-popup-menu '("Erlang Mode Commands" . nil)
-  "Common popup menu for all buffers in Erlang mode.
-
-This variable is destructively modified every time the Erlang menu
-is modified.  The effect is that all changes take effect in all
-buffers in Erlang mode, just like under GNU Emacs.
-
-Never EVER set this variable!")
-
-(defvar erlang-menu-items '(erlang-menu-base-items
-			    erlang-menu-skel-items
-			    erlang-menu-shell-items
-			    erlang-menu-compile-items
-			    erlang-menu-man-items
-			    erlang-menu-personal-items
-			    erlang-menu-version-items)
-  "*List of menu item list to combine to create Erlang mode menu.
-
-External programs which temporarily add menu items to the Erlang mode
-menu may use this variable.  Please use the function `add-hook' to add
-items.
-
-Please call the function `erlang-menu-init' after every change to this
-variable.")
-
-(defvar erlang-menu-base-items
-  '(("Indent"
-     (("Indent Line" erlang-indent-command)
-      ("Indent Region " erlang-indent-region
-       (if erlang-xemacs-p (mark) mark-active))
-      ("Indent Clause" erlang-indent-clause)
-      ("Indent Function" erlang-indent-function)
-      ("Indent Buffer" erlang-indent-current-buffer)))
-    ("Edit"
-     (("Fill Comment" erlang-fill-paragraph)
-      ("Comment Region" comment-region
-       (if erlang-xemacs-p (mark) mark-active))
-      ("Uncomment Region" erlang-uncomment-region
-       (if erlang-xemacs-p (mark) mark-active))
-      nil
-      ("Beginning of Function" erlang-beginning-of-function)
-      ("End of Function" erlang-end-of-function)
-      ("Mark Function" erlang-mark-function)
-      nil
-      ("Beginning of Clause" erlang-beginning-of-clause)
-      ("End of Clause" erlang-end-of-clause)
-      ("Mark Clause" erlang-mark-clause)
-      nil
-      ("New Clause" erlang-generate-new-clause)
-      ("Clone Arguments" erlang-clone-arguments)
-      nil
-      ("Align Arrows" erlang-align-arrows)))
-    ("Syntax Highlighting"
-     (("Level 4" erlang-font-lock-level-4)
-      ("Level 3" erlang-font-lock-level-3)
-      ("Level 2" erlang-font-lock-level-2)
-      ("Level 1" erlang-font-lock-level-1)
-      ("Off" erlang-font-lock-level-0)))
-    ("TAGS"
-     (("Find Tag" find-tag)
-      ("Find Next Tag" erlang-find-next-tag)
-					;("Find Regexp" find-tag-regexp)
-      ("Complete Word" erlang-complete-tag)
-      ("Tags Apropos" tags-apropos)
-      ("Search Files" tags-search))))
-  "Description of menu used in Erlang mode.
-
-This variable must be a list.  The elements are either nil representing
-a horizontal line or a list with two or three elements.  The first is
-the name of the menu item, the second is the function to call, or a
-submenu, on the same same form as ITEMS.  The third optional argument
-is an expression which is evaluated every time the menu is displayed.
-Should the expression evaluate to nil the menu item is ghosted.
-
-Example:
-    '((\"Func1\" function-one)
-      (\"SubItem\"
-       ((\"Yellow\" function-yellow)
-        (\"Blue\" function-blue)))
-      nil
-      (\"Region Function\" spook-function midnight-variable))
-
-Call the function `erlang-menu-init' after modifying this variable.")
-
-(defvar erlang-menu-shell-items
-  '(nil
-    ("Shell"
-     (("Start New Shell" erlang-shell)
-      ("Display Shell"   erlang-shell-display))))
-  "Description of the Shell menu used by Erlang mode.
-
-Please see the documentation of `erlang-menu-base-items'.")
-
-(defvar erlang-menu-compile-items
-  '(("Compile"
-     (("Compile Buffer" erlang-compile)
-      ("Display Result" erlang-compile-display)
-      ("Next Error"     erlang-next-error))))
-  "Description of the Compile menu used by Erlang mode.
-
-Please see the documentation of `erlang-menu-base-items'.")
-
-(defvar erlang-menu-version-items
-  '(nil
-    ("Version" erlang-version))
-  "Description of the version menu used in Erlang mode.")
-
-(defvar erlang-menu-personal-items nil
-  "Description of personal menu items used in Erlang mode.
-
-Please see the variable `erlang-menu-base-items' for a description
-of the format.")
-
-(defvar erlang-menu-man-items nil
-  "The menu containing man pages.
-
-The format of the menu should be compatible with `erlang-menu-base-items'.
-This variable is added to the list of Erlang menus stored in
-`erlang-menu-items'.")
-
-(defvar erlang-menu-skel-items '()
-  "Description of the menu containing the skeleton entries.
-The menu is in the form described by the variable `erlang-menu-base-items'.")
-
-(defvar erlang-mode-hook nil
-  "*Functions to run when Erlang mode is activated.
-
-This hook is used to change the behaviour of Erlang mode.  It is
-normally used by the user to personalise the programming environment.
-When used in a site init file, it could be used to customise Erlang
-mode for all users on the system.
-
-The functions added to this hook are run every time Erlang mode is
-started.  See also `erlang-load-hook', a hook which is run once,
-when Erlang mode is loaded into Emacs, and `erlang-shell-mode-hook'
-which is run every time a new inferior Erlang shell is started.
-
-To use a hook, create an Emacs lisp function to perform your actions
-and add the function to the hook by calling `add-hook'.
-
-The following example binds the key sequence C-c C-c to the command
-`erlang-compile' (normally bound to C-c C-k).  The example also
-activates Font Lock mode to fontify the buffer and adds a menu
-containing all functions defined in the current buffer.
-
-To use the example, copy the following lines to your `~/.emacs' file:
-
-    (add-hook 'erlang-mode-hook 'my-erlang-mode-hook)
-
-    (defun my-erlang-mode-hook ()
-      (local-set-key \"\\C-c\\C-c\" 'erlang-compile)
-      (if window-system
-          (progn
-            (setq font-lock-maximum-decoration t)
-            (font-lock-mode 1)))
-      (if (and window-system (fboundp 'imenu-add-to-menubar))
-          (imenu-add-to-menubar \"Imenu\")))")
-
-(defvar erlang-load-hook nil
-  "*Functions to run when Erlang mode is loaded.
-
-This hook is used to change the behaviour of Erlang mode.  It is
-normally used by the user to personalise the programming environment.
-When used in a site init file, it could be used to customize Erlang
-mode for all users on the system.
-
-The difference between this hook and `erlang-mode-hook' and
-`erlang-shell-mode-hook' is that the functions in this hook
-is only called once, when the Erlang mode is loaded into Emacs
-the first time.
-
-Natural actions for the functions added to this hook are actions which
-only should be performed once, and actions which should be performed
-before starting Erlang mode.  For example, a number of variables are
-used by Erlang mode before `erlang-mode-hook' is run.
-
-The following example sets the variable `erlang-root-dir' so that the
-manual pages can be retrieved (note that you must set the value of
-`erlang-root-dir' to match the location of Erlang on your system):
-
-    (add-hook 'erlang-load-hook 'my-erlang-load-hook)
-
-    (defun my-erlang-load-hook ()
-       (setq erlang-root-dir \"/usr/local/erlang\"))")
-
-(defvar erlang-new-file-hook nil
-  "Functions to run when a new Erlang source file is being edited.
-
-A useful function is `tempo-template-erlang-normal-header'.
-\(This function only exists when the `tempo' package is available.)")
-
-(defvar erlang-check-module-name 'ask
-  "*Non-nil means check that module name and file name agrees when saving.
-
-If the value of this variable is the atom `ask', the user is
-prompted.  If the value is t the source is silently changed.")
-
-(defvar erlang-electric-commands
-  '(erlang-electric-comma
-    erlang-electric-semicolon
-    erlang-electric-gt)
-  "*List of activated electric commands.
-
-The list should contain the electric commands which should be active.
-Currently, the available electric commands are:
-    `erlang-electric-comma'
-    `erlang-electric-semicolon'
-    `erlang-electric-gt'
-    `erlang-electric-newline'
-
-Should the variable be bound to t, all electric commands
-are activated.
-
-To deactivate all electric commands, set this variable to nil.")
-
-(defvar erlang-electric-newline-inhibit t
-  "*Set to non-nil to inhibit newline after electric command.
-
-This is useful since a lot of people press return after executing an
-electric command.
-
-In order to work, the command must also be in the
-list `erlang-electric-newline-inhibit-list'.
-
-Note that commands in this list are required to set the variable
-`erlang-electric-newline-inhibit' to nil when the newline shouldn't be
-inhibited.")
-
-(defvar erlang-electric-newline-inhibit-list
-  '(erlang-electric-semicolon
-    erlang-electric-comma
-    erlang-electric-gt)
-  "*Commands which can inhibit the next newline.")
-
-(defvar erlang-electric-semicolon-insert-blank-lines nil
-  "*Number of blank lines inserted before header, or nil.
-
-This variable controls the behaviour of `erlang-electric-semicolon'
-when a new function header is generated.  When nil, no blank line is
-inserted between the current line and the new header.  When bound to a
-number it represents the number of blank lines which should be
-inserted.")
-
-(defvar erlang-electric-semicolon-criteria
-  '(erlang-next-lines-empty-p
-    erlang-at-keyword-end-p
-    erlang-at-end-of-function-p)
-  "*List of functions controlling `erlang-electric-semicolon'.
-The functions in this list are called, in order, whenever a semicolon
-is typed.  Each function in the list is called with no arguments,
-and should return one of the following values:
-
-  nil             -- no determination made, continue checking
-  'stop           -- do not create prototype for next line
-  (anything else) -- insert prototype, and stop checking
-
-If every function in the list is called with no determination made,
-then no prototype is inserted.
-
-The test is performed by the function `erlang-test-criteria-list'.")
-
-(defvar erlang-electric-comma-criteria
-  '(erlang-stop-when-inside-argument-list
-    erlang-stop-when-at-guard
-    erlang-next-lines-empty-p
-    erlang-at-keyword-end-p
-    erlang-at-end-of-clause-p
-    erlang-at-end-of-function-p)
-  "*List of functions controlling `erlang-electric-comma'.
-The functions in this list are called, in order, whenever a comma
-is typed.  Each function in the list is called with no arguments,
-and should return one of the following values:
-
-  nil             -- no determination made, continue checking
-  'stop           -- do not create prototype for next line
-  (anything else) -- insert prototype, and stop checking
-
-If every function in the list is called with no determination made,
-then no prototype is inserted.
-
-The test is performed by the function `erlang-test-criteria-list'.")
-
-(defvar erlang-electric-arrow-criteria
-  '(erlang-stop-when-in-type-spec
-    erlang-next-lines-empty-p
-    erlang-at-end-of-function-p)
-  "*List of functions controlling the arrow aspect of `erlang-electric-gt'.
-The functions in this list are called, in order, whenever a `>'
-is typed.  Each function in the list is called with no arguments,
-and should return one of the following values:
-
-  nil             -- no determination made, continue checking
-  'stop           -- do not create prototype for next line
-  (anything else) -- insert prototype, and stop checking
-
-If every function in the list is called with no determination made,
-then no prototype is inserted.
-
-The test is performed by the function `erlang-test-criteria-list'.")
-
-(defvar erlang-electric-newline-criteria
-  '(t)
-  "*List of functions controlling `erlang-electric-newline'.
-
-The electric newline commands indents the next line.  Should the
-current line begin with a comment the comment start is copied to
-the newly created line.
-
-The functions in this list are called, in order, whenever a comma
-is typed.  Each function in the list is called with no arguments,
-and should return one of the following values:
-
-  nil             -- no determination made, continue checking
-  'stop           -- do not create prototype for next line
-  (anything else) -- trigger the electric command.
-
-If every function in the list is called with no determination made,
-then no prototype is inserted.  Should the atom t be a member of the
-list, it is treated as a function triggering the electric command.
-
-The test is performed by the function `erlang-test-criteria-list'.")
-
-(defvar erlang-next-lines-empty-threshold 2
-  "*Number of blank lines required to activate an electric command.
-
-Actually, this value controls the behaviour of the function
-`erlang-next-lines-empty-p' which normally is a member of the
-criteria lists controlling the electric commands.  (Please see
-the variables `erlang-electric-semicolon-criteria' and
-`erlang-electric-comma-criteria'.)
-
-The variable is bound to a threshold value, a number, representing the
-number of lines which must be empty.
-
-Setting this variable to zero, electric commands will always be
-triggered by `erlang-next-lines-empty-p', unless inhibited by other
-rules.
-
-Should this variable be nil, `erlang-next-lines-empty-p' will never
-trigger an electric command.  The same effect would be reached if the
-function `erlang-next-lines-empty-p' would be removed from the criteria
-lists.
-
-Note that even if `erlang-next-lines-empty-p' should not trigger an
-electric command, other functions in the criteria list could.")
-
-(defvar erlang-new-clause-with-arguments nil
-  "*Non-nil means that the arguments are cloned when a clause is generated.
-
-A new function header can be generated by calls to the function
-`erlang-generate-new-clause' and by use of the electric semicolon.")
-
-(defvar erlang-compile-use-outdir t
-  "*When nil, go to the directory containing source file when compiling.
-
-This is a workaround for a bug in the `outdir' option of compile.  If the
-outdir is not in the current load path, Erlang doesn't load the object
-module after it has been compiled.
-
-To activate the workaround, place the following in your `~/.emacs' file:
-    (setq erlang-compile-use-outdir nil)")
-
-(defvar erlang-indent-level 4
-  "*Indentation of Erlang calls/clauses within blocks.")
-(put 'erlang-indent-level 'safe-local-variable 'integerp)
-
-(defvar erlang-indent-guard 2
-  "*Indentation of Erlang guards.")
-(put 'erlang-indent-guard 'safe-local-variable 'integerp)
-
-(defvar erlang-argument-indent 2
-  "*Indentation of the first argument in a function call.
-When nil, indent to the column after the `(' of the
-function.")
-(put 'erlang-argument-indent 'safe-local-variable '(lambda (val) (or (null val) (integerp val))))
-
-(defvar erlang-tab-always-indent t
-  "*Non-nil means TAB in Erlang mode should always re-indent the current line,
-regardless of where in the line point is when the TAB command is used.")
-
-(defvar erlang-man-inhibit (eq system-type 'windows-nt)
-  "Inhibit the creation of the Erlang Manual Pages menu.
-
-The Windows distribution of Erlang does not include man pages, hence
-there is no attempt to create the menu.")
-
-(defvar erlang-man-dirs
-  '(("Man - Commands" "/man/man1" t)
-    ("Man - Modules" "/man/man3" t)
-    ("Man - Files" "/man/man4" t)
-    ("Man - Applications" "/man/man6" t))
-  "*The man directories displayed in the Erlang menu.
-
-Each item in the list should be a list with three elements, the first
-the name of the menu, the second the directory, and the last a flag.
-Should the flag the nil, the directory is absolute, should it be non-nil
-the directory is relative to the variable `erlang-root-dir'.")
-
-(defvar erlang-man-max-menu-size 35
-  "*The maximum number of menu items in one menu allowed.")
-
-(defvar erlang-man-display-function 'erlang-man-display
-  "*Function used to display man page.
-
-The function is called with one argument, the name of the file
-containing the man page.  Use this variable when the default
-function, `erlang-man-display', does not work on your system.")
-
-(defvar erlang-compile-extra-opts '()
-  "*Additional options to the compilation command.
-This is an elisp list of options. Each option can be either:
-- an atom
-- a dotted pair
-- a string
-Example: '(bin_opt_info (i . \"/path1/include\") (i . \"/path2/include\"))")
-
-(defvar erlang-compile-command-function-alist
-  '((".erl\\'" . inferior-erlang-compute-erl-compile-command)
-    (".xrl\\'" . inferior-erlang-compute-leex-compile-command)
-    (".yrl\\'" . inferior-erlang-compute-yecc-compile-command)
-    ("." . inferior-erlang-compute-erl-compile-command))
-  "*Alist of filename patterns vs corresponding compilation functions.
-Each element looks like (REGEXP . FUNCTION). Compiling a file whose name
-matches REGEXP specifies FUNCTION to use to compute the compilation
-command. The FUNCTION will be called with two arguments: module name and
-default compilation options, like output directory. The FUNCTION
-is expected to return a string.")
-
-(defvar erlang-leex-compile-opts '()
-  "*Options to pass to leex when compiling xrl files.
-This is an elisp list of options. Each option can be either:
-- an atom
-- a dotted pair
-- a string")
-
-(defvar erlang-yecc-compile-opts '()
-  "*Options to pass to yecc when compiling yrl files.
-This is an elisp list of options. Each option can be either:
-- an atom
-- a dotted pair
-- a string")
-
-(eval-and-compile
-  (defvar erlang-regexp-modern-p
-    (if (> erlang-emacs-major-version 21) t nil)
-    "Non-nil when this version of Emacs uses a modern version of regexp.
-Supporting \_< and \_> This is determined by checking the version of Emacs used."))
-
-(eval-and-compile
-  (defconst erlang-atom-quoted-regexp 
-    "'\\(?:[^\\']\\|\\(?:\\\\.\\)\\)*'"
-    "Regexp describing a single-quoted atom"))
-
-(eval-and-compile
-  (defconst erlang-atom-regular-regexp
-    (if erlang-regexp-modern-p
-	"\\_<[[:lower:]]\\(?:\\sw\\|\\s_\\)*\\_>"
-      "\\<[[:lower:]]\\(?:\\sw\\|\\s_\\)*\\>")
-    "Regexp describing a regular (non-quoted) atom"))
-
-(eval-and-compile
-  (defconst erlang-atom-regexp 
-    (concat "\\(" erlang-atom-quoted-regexp "\\|" 
-	    erlang-atom-regular-regexp "\\)")
-    "Regexp describing an Erlang atom."))
-
-(eval-and-compile
-  (defconst erlang-atom-regexp-matches 1
-    "Number of regexp parenthesis pairs in `erlang-atom-regexp'.
-  
-This is used to determine parenthesis matches in complex regexps which
-contains `erlang-atom-regexp'."))
-
-
-(eval-and-compile
-  (defconst erlang-variable-regexp 
-    (if erlang-regexp-modern-p 
-	"\\_<\\([[:upper:]_]\\(?:\\sw\\|\\s_\\)*\\)\\_>"
-      "\\<\\([[:upper:]_]\\(?:\\sw\\|\\s_\\)*\\)\\>")
-    "Regexp which should match an Erlang variable.
-
-The regexp must be surrounded with a pair of regexp parentheses."))
-
-(eval-and-compile
-  (defconst erlang-variable-regexp-matches 1
-    "Number of regexp parenthesis pairs in `erlang-variable-regexp'.
-
-This is used to determine matches in complex regexps which contains
-`erlang-variable-regexp'."))
-
-
-(eval-and-compile
-  (defun erlang-regexp-opt (strings &optional paren)
-    "Like `regexp-opt', except if PAREN is `symbols', then the
-resulting regexp is surrounded by \\_< and \\_>."
-    (if (eq paren 'symbols)
-	(if erlang-regexp-modern-p
-	    (concat "\\_<" (regexp-opt strings t) "\\_>")
-	  (concat "\\<" (regexp-opt strings t) "\\>"))
-      (regexp-opt strings paren))))
-
-
-(eval-and-compile 
-  (defvar erlang-keywords
-    '("after"
-      "begin"
-      "catch"
-      "case"
-      "cond"
-      "end"
-      "fun"
-      "if"
-      "let"
-      "of"
-      "receive"
-      "try"
-      "when")
-    "Erlang reserved keywords"))
-
-(eval-and-compile
-  (defconst erlang-keywords-regexp (erlang-regexp-opt erlang-keywords 'symbols)))
-  
-(eval-and-compile
-  (defvar erlang-operators
-    '("and"
-      "andalso"
-      "band"
-      "bnot"
-      "bor"
-      "bsl"
-      "bsr"
-      "bxor"
-      "div"
-      "not"
-      "or"
-      "orelse"
-      "rem"
-      "xor")
-    "Erlang operators"))
-;; What about these?
-;; '+' '-' '*' '/' '>', '>=', '<', '=<', '=:=', '==', '=/=', '/='
-
-(eval-and-compile
-  (defconst erlang-operators-regexp (erlang-regexp-opt erlang-operators 'symbols)))
-  
-
-(eval-and-compile
-  (defvar erlang-guards
-    '("is_atom"
-      "is_binary"
-      "is_bitstring"
-      "is_boolean"
-      "is_float"
-      "is_function"
-      "is_integer"
-      "is_list"
-      "is_map"
-      "is_number"
-      "is_pid"
-      "is_port"
-      "is_record"
-      "is_reference"
-      "is_tuple"
-      "atom"
-      "binary"
-      "bitstring"
-      "boolean"
-      ;;"float"	; Not included to avoid clashes with the bif float/1
-      "function"
-      "integer"
-      "list"
-      "number"
-      "pid"
-      "port"
-      "record"
-      "reference"
-      "tuple")
-    "Erlang guards"))
-
-(eval-and-compile
-  (defconst erlang-guards-regexp (erlang-regexp-opt erlang-guards 'symbols)))
-
-(eval-and-compile
-  (defvar erlang-predefined-types
-    '("any"
-      "arity"
-      "boolean"
-      "byte"
-      "char"
-      "cons"
-      "deep_string"
-      "iodata"
-      "iolist"
-      "maybe_improper_list"
-      "module"
-      "mfa"
-      "nil"
-      "neg_integer"
-      "none"
-      "non_neg_integer"
-      "nonempty_list"
-      "nonempty_improper_list"
-      "nonempty_maybe_improper_list"
-      "nonempty_string"
-      "no_return"
-      "pos_integer"
-      "string"
-      "term"
-      "timeout"
-      "map")
-    "Erlang type specs types"))
-
-(eval-and-compile
-  (defconst erlang-predefined-types-regexp 
-    (erlang-regexp-opt erlang-predefined-types 'symbols)))
-
-
-(eval-and-compile
-  (defvar erlang-int-bifs
-    '("abs"
-      "apply"
-      "atom_to_binary"
-      "atom_to_list"
-      "binary_to_atom"
-      "binary_to_existing_atom"
-      "binary_to_float"
-      "binary_to_integer"
-      "binary_to_list"
-      "binary_to_term"
-      "binary_part"
-      "bit_size"
-      "bitsize"
-      "bitstring_to_list"
-      "byte_size"
-      "check_old_code"
-      "check_process_code"
-      "date"
-      "delete_module"
-      "demonitor"
-      "disconnect_node"
-      "element"
-      "erase"
-      "error"
-      "exit"
-      "float"
-      "float_to_binary"
-      "float_to_list"
-      "garbage_collect"
-      "get"
-      "get_keys"
-      "group_leader"
-      "halt"
-      "hd"
-      "integer_to_list"
-      "integer_to_binary"
-      "iolist_size"
-      "iolist_to_binary"
-      "is_alive"
-      "is_atom"
-      "is_binary"
-      "is_bitstring"
-      "is_boolean"
-      "is_float"
-      "is_function"
-      "is_integer"
-      "is_list"
-      "is_map"
-      "is_number"
-      "is_pid"
-      "is_port"
-      "is_process_alive"
-      "is_record"
-      "is_reference"
-      "is_tuple"
-      "length"
-      "link"
-      "list_to_atom"
-      "list_to_binary"
-      "list_to_bitstring"
-      "list_to_existing_atom"
-      "list_to_float"
-      "list_to_integer"
-      "list_to_pid"
-      "list_to_tuple"
-      "load_module"
-      "make_ref"
-      "map_size"
-      "max"
-      "min"
-      "module_loaded"
-      "monitor"
-      "monitor_node"
-      "node"
-      "nodes"
-      "now"
-      "open_port"
-      "pid_to_list"
-      "port_close"
-      "port_command"
-      "port_connect"
-      "port_control"
-      "pre_loaded"
-      "process_flag"
-      "process_info"
-      "processes"
-      "purge_module"
-      "put"
-      "register"
-      "registered"
-      "round"
-      "self"
-      "setelement"
-      "size"
-      "spawn"
-      "spawn_link"
-      "spawn_monitor"
-      "spawn_opt"
-      "split_binary"
-      "statistics"
-      "term_to_binary"
-      "time"
-      "throw"
-      "tl"
-      "trunc"
-      "tuple_size"
-      "tuple_to_list"
-      "unlink"
-      "unregister"
-      "whereis")
-    "Erlang built-in functions (BIFs)"))
-
-(eval-and-compile
-  (defconst erlang-int-bif-regexp (erlang-regexp-opt erlang-int-bifs 'symbols)))
-  
-
-(eval-and-compile
-  (defvar erlang-ext-bifs
-    '("adler32"
-      "adler32_combine"
-      "alloc_info"
-      "alloc_sizes"
-      "append"
-      "append_element"
-      "await_proc_exit"
-      "await_sched_wall_time_modifications"
-      "bump_reductions"
-      "call_on_load_function"
-      "cancel_timer"
-      "crasher"
-      "crc32"
-      "crc32_combine"
-      "decode_packet"
-      "delay_trap"
-      "delete_element"
-      "dexit"
-      "dgroup_leader"
-      "display"
-      "display_nl"
-      "display_string"
-      "dist_exit"
-      "dlink"
-      "dmonitor_node"
-      "dmonitor_p"
-      "dsend"
-      "dt_append_vm_tag_data"
-      "dt_get_tag"
-      "dt_get_tag_data"
-      "dt_prepend_vm_tag_data"
-      "dt_put_tag"
-      "dt_restore_tag"
-      "dt_spread_tag"
-      "dunlink"
-      "convert_time_unit"
-      "external_size"
-      "finish_after_on_load"
-      "finish_loading"
-      "format_cpu_topology"
-      "fun_info"
-      "fun_info_mfa"
-      "fun_to_list"
-      "function_exported"
-      "garbage_collect_message_area"
-      "gather_gc_info_result"
-      "gather_sched_wall_time_result"
-      "get_cookie"
-      "get_module_info"
-      "get_stacktrace"
-      "hash"
-      "hibernate"
-      "insert_element"
-      "is_builtin"
-      "load_nif"
-      "loaded"
-      "localtime"
-      "localtime_to_universaltime"
-      "make_fun"
-      "make_tuple"
-      "match_spec_test"
-      "md5"
-      "md5_final"
-      "md5_init"
-      "md5_update"
-      "memory"
-      "module_info"
-      "monitor_node"
-      "monotonic_time"
-      "nif_error"
-      "phash"
-      "phash2"
-      "port_call"
-      "port_get_data"
-      "port_info"
-      "port_set_data"
-      "port_to_list"
-      "ports"
-      "posixtime_to_universaltime"
-      "prepare_loading"
-      "process_display"
-      "raise"
-      "read_timer"
-      "ref_to_list"
-      "resume_process"
-      "send"
-      "send_after"
-      "send_nosuspend"
-      "seq_trace"
-      "seq_trace_info"
-      "seq_trace_print"
-      "set_cookie"
-      "set_cpu_topology"
-      "setnode"
-      "spawn_opt"
-      "start_timer"
-      "subtract"
-      "suspend_process"
-      "system_flag"
-      "system_info"
-      "system_monitor"
-      "system_profile"
-      "system_time"
-      "trace"
-      "trace_delivered"
-      "trace_info"
-      "trace_pattern"
-      "time_offset"
-      "timestamp"
-      "universaltime"
-      "universaltime_to_localtime"
-      "universaltime_to_posixtime"
-      "unique_integer"
-      "yield")
-    "Erlang built-in functions (BIFs) that needs erlang: prefix"))
-
-(eval-and-compile
-  (defconst erlang-ext-bif-regexp
-    (erlang-regexp-opt (append erlang-int-bifs erlang-ext-bifs) 'symbols)))
-
-
-(defvar erlang-defun-prompt-regexp (concat "^" erlang-atom-regexp "\\s *(")
-  "Regexp which should match beginning of a clause.")
-
-(defvar erlang-file-name-extension-regexp "\\.[eh]rl$"
-  "*Regexp which should match an Erlang file name.
-
-This regexp is used when an Erlang module name is extracted from the
-name of an Erlang source file.
-
-The regexp should only match the section of the file name which should
-be excluded from the module name.
-
-To match all files set this variable to \"\\\\(\\\\..*\\\\|\\\\)$\".
-The matches all except the extension.  This is useful if the Erlang
-tags system should interpret tags on the form `module:tag' for
-files written in other languages than Erlang.")
-
-(defvar erlang-inferior-shell-split-window t
-  "*If non-nil, when starting an inferior shell, split windows.
-If nil, the inferior shell replaces the window. This is the traditional
-behaviour.")
-
-(defconst inferior-erlang-use-cmm (boundp 'minor-mode-overriding-map-alist)
-  "Non-nil means use `compilation-minor-mode' in Erlang shell.")
-
-(defvar erlang-mode-map
-  (let ((map (make-sparse-keymap)))
-    (unless (boundp 'indent-line-function)
-      (define-key map "\t"        'erlang-indent-command))
-    (define-key map ";"	      'erlang-electric-semicolon)
-    (define-key map ","	      'erlang-electric-comma)
-    (define-key map "<"         'erlang-electric-lt)
-    (define-key map ">"         'erlang-electric-gt)
-    (define-key map "\C-m"      'erlang-electric-newline)
-    (if (not (boundp 'delete-key-deletes-forward))
-        (define-key map "\177" 'backward-delete-char-untabify)
-      (define-key map [(backspace)] 'backward-delete-char-untabify))
-    ;;(unless (boundp 'fill-paragraph-function)
-    (define-key map "\M-q"      'erlang-fill-paragraph)
-    (unless (boundp 'beginning-of-defun-function)
-      (define-key map "\M-\C-a"   'erlang-beginning-of-function)
-      (define-key map "\M-\C-e"   'erlang-end-of-function)
-      (define-key map '(meta control h)   'erlang-mark-function))	; Xemacs
-    (define-key map "\M-\t"     'erlang-complete-tag)
-    (define-key map "\C-c\M-\t" 'tempo-complete-tag)
-    (define-key map "\M-+"      'erlang-find-next-tag)
-    (define-key map "\C-c\M-a"  'erlang-beginning-of-clause)
-    (define-key map "\C-c\M-b"  'tempo-backward-mark)
-    (define-key map "\C-c\M-e"  'erlang-end-of-clause)
-    (define-key map "\C-c\M-f"  'tempo-forward-mark)
-    (define-key map "\C-c\M-h"  'erlang-mark-clause)
-    (define-key map "\C-c\C-c"  'comment-region)
-    (define-key map "\C-c\C-j"  'erlang-generate-new-clause)
-    (define-key map "\C-c\C-k"  'erlang-compile)
-    (define-key map "\C-c\C-l"  'erlang-compile-display)
-    (define-key map "\C-c\C-s"  'erlang-show-syntactic-information)
-    (define-key map "\C-c\C-q"  'erlang-indent-function)
-    (define-key map "\C-c\C-u"  'erlang-uncomment-region)
-    (define-key map "\C-c\C-y"  'erlang-clone-arguments)
-    (define-key map "\C-c\C-a"  'erlang-align-arrows)
-    (define-key map "\C-c\C-z"  'erlang-shell-display)
-    (unless inferior-erlang-use-cmm
-      (define-key map "\C-x`"    'erlang-next-error))
-    map)
-  "*Keymap used in Erlang mode.")
-(defvar erlang-mode-abbrev-table nil
-  "Abbrev table in use in Erlang-mode buffers.")
-(defvar erlang-mode-syntax-table nil
-  "Syntax table in use in Erlang-mode buffers.")
-
-
-
-(defvar erlang-skel-file "erlang-skels"
-  "The type of erlang-skeletons that should be used, default
-   uses edoc type, for the old type, standard comments,
-   set \"erlang-skels-old\" in your .emacs and restart.
-
-   Or define your own and set the variable to that file.")
-
-;; Tempo skeleton templates:
-(load erlang-skel-file)
-
-;; Font-lock variables
-
-;; The next few variables define different Erlang font-lock patterns.
-;; They could be appended to form a custom font-lock appearance.
-;;
-;; The function `erlang-font-lock-set-face' could be used to change
-;; the face of a pattern.
-;;
-;; Note that Erlang strings and atoms are highlighted with using
-;; syntactic analysis.
-
-(defvar erlang-font-lock-keywords-function-header
-  (list
-   (list (concat "^" erlang-atom-regexp "\\s-*(")
-	 1 'font-lock-function-name-face t))
-  "Font lock keyword highlighting a function header.")
-
-(defface erlang-font-lock-exported-function-name-face
-  '((default (:inherit font-lock-function-name-face)))
-  "Face used for highlighting exported functions.")
-
-(defvar erlang-font-lock-exported-function-name-face
-  'erlang-font-lock-exported-function-name-face)
-
-(defvar erlang-inhibit-exported-function-name-face nil
-  "Inhibit separate face for exported functions")
-
-(defvar erlang-font-lock-keywords-exported-function-header
-  (list
-   (list #'erlang-match-next-exported-function
-	 1 'erlang-font-lock-exported-function-name-face t))
-  "Font lock keyword highlighting an exported function header.")
-
-(defvar erlang-font-lock-keywords-int-bifs
-  (list
-   (list (concat erlang-int-bif-regexp "\\s-*(")
-         1 'font-lock-builtin-face))
-  "Font lock keyword highlighting built in functions.")
-
-(defvar erlang-font-lock-keywords-ext-bifs
-  (list
-   (list (concat "\\<\\(erlang\\)\\s-*:\\s-*" erlang-ext-bif-regexp "\\s-*(")
-	 '(1 'font-lock-builtin-face)
-	 '(2 'font-lock-builtin-face)))
-  "Font lock keyword highlighting built in functions.")
-
-(defvar erlang-font-lock-keywords-int-function-calls
-  (list
-   (list (concat erlang-atom-regexp "\\s-*(")
-         1 'font-lock-type-face))
-  "Font lock keyword highlighting an internal function call.")
-
-(defvar erlang-font-lock-keywords-ext-function-calls
-  (list
-   (list (concat erlang-atom-regexp "\\s-*:\\s-*"
-                 erlang-atom-regexp "\\s-*(")
-         '(1 'font-lock-type-face)
-	 '(2 'font-lock-type-face)))
-  "Font lock keyword highlighting an external function call.")
-
-(defvar erlang-font-lock-keywords-fun-n
-  (list
-   (list (concat "\\(" erlang-atom-regexp "/[0-9]+\\)")
-         1 'font-lock-type-face))
-  "Font lock keyword highlighting a fun descriptor in F/N format.")
-
-(defvar erlang-font-lock-keywords-operators
-  (list
-   (list erlang-operators-regexp
-         1 'font-lock-builtin-face))
-  "Font lock keyword highlighting Erlang operators.")
-
-(defvar erlang-font-lock-keywords-dollar
-  (list
-   (list "\\(\\$\\([^\\]\\|\\\\\\([^0-7^\n]\\|[0-7]+\\|\\^[a-zA-Z]\\)\\)\\)"
-	 1 'font-lock-constant-face))
-  "Font lock keyword highlighting numbers in ASCII form (e.g. $A).")
-
-(defvar erlang-font-lock-keywords-arrow
-  (list
-   (list "->\\(\\s \\|$\\)" 1 'font-lock-function-name-face))
-  "Font lock keyword highlighting clause arrow.")
-
-(defvar erlang-font-lock-keywords-lc
-  (list
-   (list "\\(<-\\|<=\\|||\\)\\(\\s \\|$\\)" 1 'font-lock-keyword-face))
-  "Font lock keyword highlighting list comprehension operators.")
-
-(defvar erlang-font-lock-keywords-keywords
-  (list
-   (list erlang-keywords-regexp 1 'font-lock-keyword-face))
-  "Font lock keyword highlighting Erlang keywords.")
-
-(defvar erlang-font-lock-keywords-attr
-  (list
-   (list (concat "^\\(-" erlang-atom-regexp "\\)\\(\\s-\\|\\.\\|(\\)")	 
-	 1 (if (boundp 'font-lock-preprocessor-face)
-	       'font-lock-preprocessor-face
-	     'font-lock-constant-face)))
-  "Font lock keyword highlighting attributes.")
-
-(defvar erlang-font-lock-keywords-quotes
-  (list
-   (list "`\\([-+a-zA-Z0-9_:*][-+a-zA-Z0-9_:*]+\\)'"
-	 1
-	 'font-lock-keyword-face
-	 t))
-  "Font lock keyword highlighting words in single quotes in comments.
-
-This is not the highlighting of Erlang strings and atoms, which
-are highlighted by syntactic analysis.")
-
-(defvar erlang-font-lock-keywords-guards
-  (list
-   (list (concat "[^:]" erlang-guards-regexp "\\s-*(")
-	 1 'font-lock-builtin-face))
-  "Font lock keyword highlighting guards.")
-
-(defvar erlang-font-lock-keywords-predefined-types
-  (list
-   (list (concat "[^:]" erlang-predefined-types-regexp "\\s-*(")
-	 1 'font-lock-builtin-face))
-  "Font lock keyword highlighting predefined types.")
-
-
-(defvar erlang-font-lock-keywords-macros
-  (list
-   (list (concat "?\\s-*\\(" erlang-atom-regexp
-		 "\\|" erlang-variable-regexp "\\)")
-	 1 'font-lock-constant-face)
-   (list (concat "^\\(-\\(?:define\\|ifn?def\\)\\)\\s-*(\\s-*\\(" erlang-atom-regexp
-		 "\\|" erlang-variable-regexp "\\)")
-	 (if (boundp 'font-lock-preprocessor-face)
-	     (list 1 'font-lock-preprocessor-face t)
-	   (list 1 'font-lock-constant-face t))
-	 (list 3 'font-lock-type-face t t))
-   (list "^-e\\(lse\\|ndif\\)\\>" 0 'font-lock-preprocessor-face t))
-  "Font lock keyword highlighting macros.
-This must be placed in front of `erlang-font-lock-keywords-vars'.")
-
-(defvar erlang-font-lock-keywords-records
-  (list
-   (list (concat "#\\s *" erlang-atom-regexp)
-         1 'font-lock-type-face)
-   ;; Don't highlight numerical constants.
-   (list (if erlang-regexp-modern-p
-	     "\\_<[0-9]+#\\([0-9a-zA-Z]+\\)"
-	   "\\<[0-9]+#\\([0-9a-zA-Z]+\\)")
-         1 nil t)
-   (list (concat "^-record\\s-*(\\s-*" erlang-atom-regexp)
-         1 'font-lock-type-face))
-  "Font lock keyword highlighting Erlang records.
-This must be placed in front of `erlang-font-lock-keywords-vars'.")
-
-(defvar erlang-font-lock-keywords-vars
-  (list
-   (list (concat "[^#]" erlang-variable-regexp)	; no numerical constants
-	 1 'font-lock-variable-name-face))
-  "Font lock keyword highlighting Erlang variables.
-Must be preceded by `erlang-font-lock-keywords-macros' to work properly.")
-
-(defvar erlang-font-lock-descr-string
-  "Font-lock keywords used by Erlang Mode.
-
-There exists three levels of Font Lock keywords for Erlang:
-  `erlang-font-lock-keywords-1' - Function headers and reserved keywords.
-  `erlang-font-lock-keywords-2' - Bifs, guards and `single quotes'.
-  `erlang-font-lock-keywords-3' - Variables, macros and records.
-  `erlang-font-lock-keywords-4' - Exported functions, Function names,
-                                  Funs, LCs (not Atoms).
-
-To use a specific level, please set the variable
-`font-lock-maximum-decoration' to the appropriate level.  Note that the
-variable must be set before Erlang mode is activated.
-
-Example:
-    (setq font-lock-maximum-decoration 2)")
-
-(defvar erlang-font-lock-keywords-1
-  (append erlang-font-lock-keywords-function-header
-	  erlang-font-lock-keywords-dollar
-	  erlang-font-lock-keywords-arrow
-	  erlang-font-lock-keywords-keywords
-	  )
-  ;; DocStringOrig: erlang-font-lock-keywords
-  erlang-font-lock-descr-string)
-
-(defvar erlang-font-lock-keywords-2
-  (append erlang-font-lock-keywords-1
-	  erlang-font-lock-keywords-int-bifs
-	  erlang-font-lock-keywords-ext-bifs
-	  erlang-font-lock-keywords-attr
-	  erlang-font-lock-keywords-quotes
-	  erlang-font-lock-keywords-guards
-	  )
-  ;; DocStringCopy: erlang-font-lock-keywords
-  erlang-font-lock-descr-string)
-
-(defvar erlang-font-lock-keywords-3
-  (append erlang-font-lock-keywords-2
-	  erlang-font-lock-keywords-operators
-	  erlang-font-lock-keywords-macros
-	  erlang-font-lock-keywords-records
-	  erlang-font-lock-keywords-vars
-	  erlang-font-lock-keywords-predefined-types
-	  )
-  ;; DocStringCopy: erlang-font-lock-keywords
-  erlang-font-lock-descr-string)
-
-(defvar erlang-font-lock-keywords-4
-  (append erlang-font-lock-keywords-3
-          erlang-font-lock-keywords-exported-function-header
-          erlang-font-lock-keywords-int-function-calls
-	  erlang-font-lock-keywords-ext-function-calls
-	  erlang-font-lock-keywords-fun-n
-          erlang-font-lock-keywords-lc
-	  )
-  ;; DocStringCopy: erlang-font-lock-keywords
-  erlang-font-lock-descr-string)
-
-(defvar erlang-font-lock-keywords erlang-font-lock-keywords-4
-  ;; DocStringCopy: erlang-font-lock-keywords
-  erlang-font-lock-descr-string)
-
-(defvar erlang-font-lock-syntax-table nil
-  "Syntax table used by Font Lock mode.
-
-The difference between this and the standard Erlang Mode
-syntax table is that `_' is treated as part of words by
-this syntax table.
-
-Unfortunately, XEmacs hasn't got support for a special Font
-Lock syntax table.  The effect is that `apply' in the atom
-`foo_apply' will be highlighted as a bif.")
-
-
-;;; Avoid errors while compiling this file.
-
-;; `eval-when-compile' is not defined in Emacs 18.  We define it as a
-;; no-op.
-(or (fboundp 'eval-when-compile)
-    (defmacro eval-when-compile (&rest rest) nil))
-
-;; These umm...functions are new in Emacs 20. And, yes, until version
-;; 19.27 Emacs backquotes were this ugly.
-
-(or (fboundp 'unless)
-    (defmacro unless (condition &rest body)
-      "(unless CONDITION BODY...): If CONDITION is false, do BODY, else return nil."
-      `((if (, condition) nil ,@body))))
-
-(or (fboundp 'when)
-    (defmacro when (condition &rest body)
-      "(when CONDITION BODY...): If CONDITION is true, do BODY, else return nil."
-      `((if (, condition) (progn ,@body) nil))))
-
-(or (fboundp 'char-before)
-    (defmacro char-before (&optional pos)
-      "Return the character in the current buffer just before POS."
-      `( (char-after (1- (or ,pos (point)))))))
-
-;; defvar some obsolete variables, which we still support for
-;; backwards compatibility reasons.
-(eval-when-compile
-  (defvar comment-indent-hook)
-  (defvar dabbrev-case-fold-search)
-  (defvar tempo-match-finder)
-  (defvar compilation-menu-map)
-  (defvar next-error-last-buffer))
-
-(eval-when-compile
-  (if (or (featurep 'bytecomp)
-	  (featurep 'byte-compile))
-      (progn
-	(cond ((string-match "Lucid\\|XEmacs" emacs-version)
-	       (put 'comment-indent-hook 'byte-obsolete-variable nil)
-	       ;; Do not warn for unused variables
-	       ;; when compiling under XEmacs.
-	       (setq byte-compile-warnings
-		     '(free-vars unresolved callargs redefine))))
-	(require 'comint)
-	(require 'tempo)
-	(require 'compile))))
-
-
-(defun erlang-version ()
-  "Return the current version of Erlang mode."
-  (interactive)
-  (if (interactive-p)
-      (message "Erlang mode version %s, written by Anders Lindgren"
-	       erlang-version))
-  erlang-version)
-
-
-;;;###autoload
-(defun erlang-mode ()
-  "Major mode for editing Erlang source files in Emacs.
-It knows about syntax and comment, it can indent code, it is capable
-of fontifying the source file, the TAGS commands are aware of Erlang
-modules, and the Erlang man pages can be accessed.
-
-Should this module, \"erlang.el\", be installed properly, Erlang mode
-is activated whenever an Erlang source or header file is loaded into
-Emacs.  To indicate this, the mode line should contain the word
-\"Erlang\".
-
-The main feature of Erlang mode is indentation, press TAB and the
-current line will be indented correctly.
-
-Comments starting with only one `%' are indented to the column stored
-in the variable `comment-column'.  Comments starting with two `%':s
-are indented with the same indentation as code.  Comments starting
-with at least three `%':s are indented to the first column.
-
-However, Erlang mode contains much more, this is a list of the most
-useful commands:
-     TAB     - Indent the line.
-     C-c C-q - Indent current function.
-     M-;     - Create a comment at the end of the line.
-     M-q     - Fill a comment, i.e. wrap lines so that they (hopefully)
-		 will look better.
-     M-a     - Goto the beginning of an Erlang clause.
-     M-C-a   - Ditto for function.
-     M-e     - Goto the end of an Erlang clause.
-     M-C-e   - Ditto for function.
-     M-h     - Mark current Erlang clause.
-     M-C-h   - Ditto for function.
-     C-c C-z - Start, or switch to, an inferior Erlang shell.
-     C-c C-k - Compile current file.
-     C-x `   - Next error.
-     ,       - Electric comma.
-     ;       - Electric semicolon.
-
-Erlang mode check the name of the file against the module name when
-saving, whenever a mismatch occurs Erlang mode offers to modify the
-source.
-
-The variable `erlang-electric-commands' controls the electric
-commands.  To deactivate all of them, set it to nil.
-
-There exists a large number of commands and variables in the Erlang
-module.  Please press `M-x apropos RET erlang RET' to see a complete
-list.  Press `C-h f name-of-function RET' and `C-h v name-of-variable
-RET'to see the full description of functions and variables,
-respectively.
-
-On entry to this mode the contents of the hook `erlang-mode-hook' is
-executed.
-
-Please see the beginning of the file `erlang.el' for more information
-and examples of hooks.
-
-Other commands:
-\\{erlang-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'erlang-mode)
-  (setq mode-name "Erlang")
-  (erlang-syntax-table-init)
-  (use-local-map erlang-mode-map)
-  (erlang-electric-init)
-  (erlang-menu-init)
-  (erlang-mode-variables)
-  (erlang-check-module-name-init)
-  (erlang-man-init)
-  (erlang-tags-init)
-  (erlang-font-lock-init)
-  (erlang-skel-init)
-  (tempo-use-tag-list 'erlang-tempo-tags)
-  (run-hooks 'erlang-mode-hook)
-  (if (zerop (buffer-size))
-      (run-hooks 'erlang-new-file-hook))
-  ;; Doesn't exist in Emacs v21.4; required by Emacs v23.
-  (if (boundp 'after-change-major-mode-hook)
-      (run-hooks 'after-change-major-mode-hook)))
-
-;;;###autoload
-(dolist (r '("\\.erl$" "\\.app\\.src$" "\\.escript"
-             "\\.hrl$" "\\.xrl$" "\\.yrl" "/ebin/.+\\.app"))
-  (add-to-list 'auto-mode-alist (cons r 'erlang-mode)))
-
-(defun erlang-syntax-table-init ()
-  (if (null erlang-mode-syntax-table)
-      (let ((table (make-syntax-table)))
-	(modify-syntax-entry ?\n ">" table)
-	(modify-syntax-entry ?\" "\"" table)
-	(modify-syntax-entry ?# "." table)
-;;	(modify-syntax-entry ?$ "\\" table)   ;; Creates problems with indention afterwards
-;;	(modify-syntax-entry ?$ "'" table)    ;; Creates syntax highlighting and indention problems
-	(modify-syntax-entry ?$ "/" table)    ;; Misses the corner case "string that ends with $" 
-	                                      ;; we have to live with that for now..it is the best alternative
-	                                      ;; that can be worked around with "string hat ends with \$" 
-	(modify-syntax-entry ?% "<" table)
-	(modify-syntax-entry ?& "." table)
-	(modify-syntax-entry ?\' "\"" table)
-	(modify-syntax-entry ?* "." table)
-	(modify-syntax-entry ?+ "." table)
-	(modify-syntax-entry ?- "." table)
-	(modify-syntax-entry ?/ "." table)
-	(modify-syntax-entry ?: "." table)
-	(modify-syntax-entry ?< "." table)
-	(modify-syntax-entry ?= "." table)
-	(modify-syntax-entry ?> "." table)
-	(modify-syntax-entry ?\\ "\\" table)
-	(modify-syntax-entry ?_ "_" table)
-	(modify-syntax-entry ?| "." table)
-	(modify-syntax-entry ?^ "'" table)
-	
-	;; Pseudo bit-syntax: Latin1 double angle quotes as parens.
-	;;(modify-syntax-entry ?\253 "(?\273" table)
-	;;(modify-syntax-entry ?\273 ")?\253" table)
-
-	(setq erlang-mode-syntax-table table)))
-
-  (set-syntax-table erlang-mode-syntax-table))
-
-
-(defun erlang-electric-init ()
-  ;; Set up electric character functions to work with
-  ;; delsel/pending-del mode. Also, set up text properties for bit
-  ;; syntax handling.
-  (mapc #'(lambda (cmd)
-	    (put cmd 'delete-selection t) ;for delsel (Emacs)
-	    (put cmd 'pending-delete t)) ;for pending-del (XEmacs)
-	'(erlang-electric-semicolon
-	  erlang-electric-comma
-	  erlang-electric-gt))
-  
-  (put 'bitsyntax-open-outer 'syntax-table '(4 . ?>))
-  (put 'bitsyntax-open-outer 'rear-nonsticky '(category))
-  (put 'bitsyntax-open-inner 'rear-nonsticky '(category))
-  (put 'bitsyntax-close-inner 'rear-nonsticky '(category))
-  (put 'bitsyntax-close-outer 'syntax-table '(5 . ?<))
-  (put 'bitsyntax-close-outer 'rear-nonsticky '(category))
-  (make-local-variable 'parse-sexp-lookup-properties)
-  (setq parse-sexp-lookup-properties 't))
-
-
-(defun erlang-mode-variables ()
-  (or erlang-mode-abbrev-table
-      (define-abbrev-table 'erlang-mode-abbrev-table ()))
-  (setq local-abbrev-table erlang-mode-abbrev-table)
-  (make-local-variable 'paragraph-start)
-  (setq paragraph-start (concat "^$\\|" page-delimiter))
-  (make-local-variable 'paragraph-separate)
-  (setq paragraph-separate paragraph-start)
-  (make-local-variable 'paragraph-ignore-fill-prefix)
-  (setq paragraph-ignore-fill-prefix t)
-  (make-local-variable 'require-final-newline)
-  (setq require-final-newline t)
-  (make-local-variable 'defun-prompt-regexp)
-  (setq defun-prompt-regexp erlang-defun-prompt-regexp)
-  (make-local-variable 'comment-start)
-  (setq comment-start "%")
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "%+\\s *")
-  (make-local-variable 'comment-column)
-  (setq comment-column 48)
-  (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'erlang-indent-command)
-  (make-local-variable 'indent-region-function)
-  (setq indent-region-function 'erlang-indent-region)
-  (set (make-local-variable 'comment-indent-function) 'erlang-comment-indent)
-  (if (<= erlang-emacs-major-version 18)
-      (set (make-local-variable 'comment-indent-hook) 'erlang-comment-indent))
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
-  (set (make-local-variable 'dabbrev-case-fold-search) nil)
-  (set (make-local-variable 'imenu-prev-index-position-function)
-       'erlang-beginning-of-function)
-  (set (make-local-variable 'imenu-extract-index-name-function)
-       'erlang-get-function-name-and-arity)
-  (set (make-local-variable 'tempo-match-finder)
-       "[^-a-zA-Z0-9_]\\([-a-zA-Z0-9_]*\\)\\=")
-  (set (make-local-variable 'beginning-of-defun-function)
-       'erlang-beginning-of-function)
-  (set (make-local-variable 'end-of-defun-function) 'erlang-end-of-function)
-  (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)
-  (set (make-local-variable 'fill-paragraph-function) 'erlang-fill-paragraph)
-  (set (make-local-variable 'comment-add) 1)
-  (set (make-local-variable 'outline-regexp) "[[:lower:]0-9_]+ *(.*) *-> *$")
-  (set (make-local-variable 'outline-level) (lambda () 1))
-  (set (make-local-variable 'add-log-current-defun-function)
-       'erlang-current-defun))
-
-(defun erlang-font-lock-init ()
-  "Initialize Font Lock for Erlang mode."
-  (or erlang-font-lock-syntax-table
-      (setq erlang-font-lock-syntax-table
-	    (let ((table (copy-syntax-table erlang-mode-syntax-table)))
-	      (modify-syntax-entry ?_ "w" table)
-	      table)))
-  (set (make-local-variable 'font-lock-syntax-table)
-       erlang-font-lock-syntax-table)
-  (set (make-local-variable 'font-lock-beginning-of-syntax-function)
-       'erlang-beginning-of-clause)
-  (make-local-variable 'font-lock-keywords)
-  (let ((level (cond ((boundp 'font-lock-maximum-decoration)
-		      (symbol-value 'font-lock-maximum-decoration))
-		     ((boundp 'font-lock-use-maximal-decoration)
-		      (symbol-value 'font-lock-use-maximal-decoration))
-		     (t nil))))
-    (if (consp level)
-	(setq level (cdr-safe (or (assq 'erlang-mode level)
-				  (assq t level)))))
-    ;; `level' can here be:
-    ;;      A number - The fontification level
-    ;;      nil      - Use the default
-    ;;      t        - Use maximum
-    (cond ((eq level nil)
-	   (set 'font-lock-keywords erlang-font-lock-keywords))
-	  ((eq level 1)
-	   (set 'font-lock-keywords erlang-font-lock-keywords-1))
-	  ((eq level 2)
-	   (set 'font-lock-keywords erlang-font-lock-keywords-2))
-          ((eq level 3)
-           (set 'font-lock-keywords erlang-font-lock-keywords-3))
-          (t
-           (set 'font-lock-keywords erlang-font-lock-keywords-4))))
-
-  ;; Modern font-locks can handle the above much more elegantly:
-  (set (make-local-variable 'font-lock-defaults)
-       '((erlang-font-lock-keywords erlang-font-lock-keywords-1
-				    erlang-font-lock-keywords-2 
-				    erlang-font-lock-keywords-3 
-				    erlang-font-lock-keywords-4)
-	 nil nil ((?_ . "w")) erlang-beginning-of-clause
-	 (font-lock-mark-block-function . erlang-mark-clause)
-         (font-lock-syntactic-keywords
-          ;; A dollar sign right before the double quote that ends a
-          ;; string is not a character escape.
-          ;;
-          ;; And a "string" consists of a double quote not escaped by a
-          ;; dollar sign, any number of non-backslash non-newline
-          ;; characters or escaped backslashes, a dollar sign
-          ;; (otherwise we wouldn't care) and a double quote.  This
-          ;; doesn't match multi-line strings, but this is probably
-          ;; the best we can get, since while font-locking we don't
-          ;; know whether matching started inside a string: limiting
-          ;; search to a single line keeps things sane.
-          . (("\\(?:^\\|[^$]\\)\"\\(?:[^\"\n]\\|\\\\\"\\)*\\(\\$\\)\"" 1 "w")
-	     ;; Likewise for atoms
-	     ("\\(?:^\\|[^$]\\)'\\(?:[^'\n]\\|\\\\'\\)*\\(\\$\\)'" 1 "w")
-             ;; And the dollar sign in $\" or $\' escapes two
-             ;; characters, not just one.
-             ("\\(\\$\\)\\\\[\"']" 1 "'"))))))
-
-
-
-;; Useful when defining your own keywords.
-(defun erlang-font-lock-set-face (ks &rest faces)
-  "Replace the face components in a list of keywords.
-
-The first argument, KS, is a list of keywords.  The rest of the
-arguments are expressions to replace the face information with.  The
-first expression replaces the face of the first keyword, the second
-expression the second keyword etc.
-
-Should an expression be nil, the face of the corresponding keyword is
-not changed.
-
-Should fewer expressions than keywords be given, the last expression
-is used for all remaining keywords.
-
-Normally, the expressions are just atoms representing the new face.
-They could however be more complex, returning different faces in
-different situations.
-
-This function only handles keywords with elements on the forms:
-  (REGEXP NUMBER FACE)
-  (REGEXP NUMBER FACE OVERWRITE)
-
-This could be used when defining your own special font-lock setup, e.g:
-
-\(setq my-font-lock-keywords
-      (append erlang-font-lock-keywords-function-header
-              erlang-font-lock-keywords-dollar
-              (erlang-font-lock-set-face
-               erlang-font-lock-keywords-macros 'my-neon-green-face)
-              (erlang-font-lock-set-face
-               erlang-font-lock-keywords-lc 'my-deep-red 'my-light-red)
-              erlang-font-lock-keywords-attr))
-
-For a more elaborate example, please see the beginning of the file
-`erlang.el'."
-  (let ((res '()))
-    (while ks
-      (let* ((regexp (car (car ks)))
-	     (number (car (cdr (car ks))))
-	     (new-face (if (and faces (car faces))
-			   (car faces)
-			 (car (cdr (cdr (car ks))))))
-	     (overwrite (car (cdr (cdr (cdr (car ks))))))
-	     (new-keyword (list regexp number new-face)))
-	(if overwrite (nconc new-keyword (list overwrite)))
-	(setq res (cons new-keyword res))
-	(setq ks (cdr ks))
-	(if (and faces (cdr faces))
-	    (setq faces (cdr faces)))))
-    (nreverse res)))
-
-
-(defun erlang-font-lock-level-0 ()
-  ;; DocStringOrig: font-cmd
-  "Unfontify current buffer."
-  (interactive)
-  (font-lock-mode 0))
-
-
-(defun erlang-font-lock-level-1 ()
-  ;; DocStringCopy: font-cmd
-  "Fontify current buffer at level 1.
-This highlights function headers, reserved keywords, strings and comments."
-  (interactive)
-  (require 'font-lock)
-  (set 'font-lock-keywords erlang-font-lock-keywords-1)
-  (font-lock-mode 1)
-  (funcall (symbol-function 'font-lock-fontify-buffer)))
-
-
-(defun erlang-font-lock-level-2 ()
-  ;; DocStringCopy: font-cmd
-  "Fontify current buffer at level 2.
-This highlights level 1 features (see `erlang-font-lock-level-1')
-plus bifs, guards and `single quotes'."
-  (interactive)
-  (require 'font-lock)
-  (set 'font-lock-keywords erlang-font-lock-keywords-2)
-  (font-lock-mode 1)
-  (funcall (symbol-function 'font-lock-fontify-buffer)))
-
-
-(defun erlang-font-lock-level-3 ()
-  ;; DocStringCopy: font-cmd
-  "Fontify current buffer at level 3.
-This highlights level 2 features (see `erlang-font-lock-level-2')
-plus variables, macros and records."
-  (interactive)
-  (require 'font-lock)
-  (set 'font-lock-keywords erlang-font-lock-keywords-3)
-  (font-lock-mode 1)
-  (funcall (symbol-function 'font-lock-fontify-buffer)))
-
-(defun erlang-font-lock-level-4 ()
-  ;; DocStringCopy: font-cmd
-  "Fontify current buffer at level 4.
-This highlights level 3 features (see `erlang-font-lock-level-2')
-plus variables, macros and records."
-  (interactive)
-  (require 'font-lock)
-  (set 'font-lock-keywords erlang-font-lock-keywords-4)
-  (font-lock-mode 1)
-  (funcall (symbol-function 'font-lock-fontify-buffer)))
-
-
-(defun erlang-menu-init ()
-  "Init menus for Erlang mode.
-
-The variable `erlang-menu-items' contain a description of the Erlang
-mode menu.  Normally, the list contains atoms, representing variables
-bound to pieces of the menu.
-
-Personal extensions could be added to `erlang-menu-personal-items'.
-
-This function should be called if any variable describing the
-menu configuration is changed."
-  (erlang-menu-install "Erlang" erlang-menu-items erlang-mode-map t))
-
-
-(defun erlang-menu-install (name items keymap &optional popup)
-  "Install a menu in Emacs or XEmacs based on an abstract description.
-
-NAME is the name of the menu.
-
-ITEMS is a list.  The elements are either nil representing a horizontal
-line or a list with two or three elements.  The first is the name of
-the menu item, the second the function to call, or a submenu, on the
-same same form as ITEMS.  The third optional element is an expression
-which is evaluated every time the menu is displayed.  Should the
-expression evaluate to nil the menu item is ghosted.
-
-KEYMAP is the keymap to add to menu to.  (When using XEmacs, the menu
-will only be visible when this menu is the global, the local, or an
-activate minor mode keymap.)
-
-If POPUP is non-nil, the menu is bound to the XEmacs `mode-popup-menu'
-variable, i.e. it will popup when pressing the right mouse button.
-
-Please see the variable `erlang-menu-base-items'."
-  (cond (erlang-xemacs-p
-	 (let ((menu (erlang-menu-xemacs name items keymap)))
-	   ;; We add the menu to the global menubar.
-	   ;;(funcall (symbol-function 'set-buffer-menubar)
-	   ;;         (symbol-value 'current-menubar))
-	   (funcall (symbol-function 'add-submenu) nil menu)
-	   (setcdr erlang-xemacs-popup-menu (cdr menu))
-	   (if (and popup (boundp 'mode-popup-menu))
-	       (funcall (symbol-function 'set)
-			'mode-popup-menu erlang-xemacs-popup-menu))))
-	((>= erlang-emacs-major-version 19)
-	 (define-key keymap (vector 'menu-bar (intern name))
-	   (erlang-menu-make-keymap name items)))
-	(t nil)))
-
-
-(defun erlang-menu-make-keymap (name items)
-  "Build a menu for Emacs 19."
-  (let ((menumap (funcall (symbol-function 'make-sparse-keymap)
-			  name))
-	(count 0)
-	id def first second third)
-    (setq items (reverse items))
-    (while items
-      ;; Replace any occurrence of atoms by their value.
-      (while (and items (atom (car items)) (not (null (car items))))
-	(if (and (boundp (car items))
-		 (listp (symbol-value (car items))))
-	    (setq items (append (reverse (symbol-value (car items)))
-				(cdr items)))
-	  (setq items (cdr items))))
-      (setq first (car-safe (car items)))
-      (setq second (car-safe (cdr-safe (car items))))
-      (setq third (car-safe (cdr-safe (cdr-safe (car items)))))
-      (cond ((null first)
-	     (setq count (+ count 1))
-	     (setq id (intern (format "separator-%d" count)))
-	     (setq def '("--" . nil)))
-	    ((and (consp second) (eq (car second) 'lambda))
-	     (setq count (+ count 1))
-	     (setq id (intern (format "lambda-%d" count)))
-	     (setq def (cons first second)))
-	    ((symbolp second)
-	     (setq id second)
-	     (setq def (cons first second)))
-	    (t
-	     (setq count (+ count 1))
-	     (setq id (intern (format "submenu-%d" count)))
-	     (setq def (erlang-menu-make-keymap first second))))
-      (define-key menumap (vector id) def)
-      (if third
-	  (put id 'menu-enable third))
-      (setq items (cdr items)))
-    (cons name menumap)))
-
-
-(defun erlang-menu-xemacs (name items &optional keymap)
-  "Build a menu for XEmacs."
-  (let ((res '())
-	first second third entry)
-    (while items
-      ;; Replace any occurrence of atoms by their value.
-      (while (and items (atom (car items)) (not (null (car items))))
-	(if (and (boundp (car items))
-		 (listp (symbol-value (car items))))
-	    (setq items (append (reverse (symbol-value (car items)))
-				(cdr items)))
-	  (setq items (cdr items))))
-      (setq first (car-safe (car items)))
-      (setq second (car-safe (cdr-safe (car items))))
-      (setq third (car-safe (cdr-safe (cdr-safe (car items)))))
-      (cond ((null first)
-	     (setq res (cons "------" res)))
-	    ((symbolp second)
-	     (setq res (cons (vector first second (or third t)) res)))
-	    ((and (consp second) (eq (car second) 'lambda))
-	     (setq res (cons (vector first (list 'call-interactively second)
-				     (or third t)) res)))
-	    (t
-	     (setq res (cons (cons first
-				   (cdr (erlang-menu-xemacs
-					 first second)))
-			     res))))
-      (setq items (cdr items)))
-    (setq res (reverse res))
-    ;; When adding a menu to a minor-mode keymap under Emacs,
-    ;; it disappears when the mode is disabled.  The expression
-    ;; generated below imitates this behaviour.
-    ;; (This could be expressed much clearer using backquotes,
-    ;; but I don't want to pull in every package.)
-    (if keymap
-	(let ((expr (list 'or
-			  (list 'eq keymap 'global-map)
-			  (list 'eq keymap (list 'current-local-map))
-			  (list 'symbol-value
-				(list 'car-safe
-				      (list 'rassq
-					    keymap
-					    'minor-mode-map-alist))))))
-	  (setq res (cons ':included (cons expr res)))))
-    (cons name res)))
-
-
-(defun erlang-menu-substitute (items alist)
-  "Substitute functions in menu described by ITEMS.
-
-The menu ITEMS is updated destructively.
-
-ALIST is list of pairs where the car is the old function and cdr the new."
-  (let (first second pair)
-    (while items
-      (setq first (car-safe (car items)))
-      (setq second (car-safe (cdr-safe (car items))))
-      (cond ((null first))
-	    ((symbolp second)
-	     (setq pair (and second (assq second alist)))
-	     (if pair
-		 (setcar (cdr (car items)) (cdr pair))))
-	    ((and (consp second) (eq (car second) 'lambda)))
-	    (t
-	     (erlang-menu-substitute second alist)))
-      (setq items (cdr items)))))
-
-
-(defun erlang-menu-add-above (entry above items)
-  "Add menu ENTRY above menu entry ABOVE in menu ITEMS.
-Do nothing if the items already should be in the menu.
-Should ABOVE not be in the list, the entry is added at
-the bottom of the menu.
-
-The new menu is returned.  No guarantee is given that the original
-menu is left unchanged.
-
-The equality test is performed by `eq'.
-
-Example:  (erlang-menu-add-above 'my-erlang-menu-items
-                                 'erlang-menu-man-items)"
-  (erlang-menu-add-below entry above items t))
-
-
-(defun erlang-menu-add-below (entry below items &optional above-p)
-  "Add menu ENTRY below menu items BELOW in the Erlang menu.
-Do nothing if the items already should be in the menu.
-Should BELOW not be in the list, items is added at the bottom
-of the menu.
-
-The new menu is returned.  No guarantee is given that the original
-menu is left unchanged.
-
-The equality test is performed by `eq'.
-
-Example:
-
-\(setq erlang-menu-items
-      (erlang-menu-add-below 'my-erlang-menu-items
-	 	             'erlang-menu-base-items
-                             erlang-menu-items))"
-  (if (memq entry items)
-      items				; Return the original menu.
-    (let ((head '())
-	  (done nil)
-	  res)
-      (while (not done)
-	(cond ((null items)
-	       (setq res (append head (list entry)))
-	       (setq done t))
-	      ((eq below (car items))
-	       (setq res
-		     (if above-p
-			 (append head (cons entry items))
-		       (append head (cons (car items)
-					  (cons entry (cdr items))))))
-	       (setq done t))
-	      (t
-	       (setq head (append head (list (car items))))
-	       (setq items (cdr items)))))
-      res)))
-
-(defun erlang-menu-delete (entry items)
-  "Delete ENTRY from menu ITEMS.
-
-The new menu is returned.  No guarantee is given that the original
-menu is left unchanged."
-  (delq entry items))
-
-;; Man code:
-
-(defun erlang-man-init ()
-  "Add menus containing the manual pages of the Erlang.
-
-The variable `erlang-man-dirs' contains entries describing
-the location of the manual pages."
-  (interactive)
-  (if erlang-man-inhibit
-      ()
-    (setq erlang-menu-man-items
-	  '(nil
-	    ("Man - Function" erlang-man-function)))
-    (if erlang-man-dirs
-	(setq erlang-menu-man-items
-	      (append erlang-menu-man-items
-		      (erlang-man-make-top-menu erlang-man-dirs))))
-    (setq erlang-menu-items
-	  (erlang-menu-add-above 'erlang-menu-man-items
-				 'erlang-menu-version-items
-				 erlang-menu-items))
-    (erlang-menu-init)))
-
-
-(defun erlang-man-uninstall ()
-  "Remove the man pages from the Erlang mode."
-  (interactive)
-  (setq erlang-menu-items
-	(erlang-menu-delete 'erlang-menu-man-items erlang-menu-items))
-  (erlang-menu-init))
-
-
-;; The man menu is a hierarchal structure, with the manual sections
-;; at the top, described by `erlang-man-dirs'.  The next level could
-;; either be the manual pages if not to many, otherwise it is an index
-;; menu whose submenus will contain up to `erlang-man-max-menu-size'
-;; manual pages.
-
-(defun erlang-man-make-top-menu (dir-list)
-  "Create one menu entry per element of DIR-LIST.
-The format is described in the documentation of `erlang-man-dirs'."
-  (let ((menu '())
-	dir)
-    (while dir-list
-      (setq dir (cond ((nth 2 (car dir-list))
-		       ;; Relative to `erlang-root-dir'.
-		       (and (stringp erlang-root-dir)
-			    (concat erlang-root-dir (nth 1 (car dir-list)))))
-		      (t
-		       ;; Absolute
-		       (nth 1 (car dir-list)))))
-      (if (and dir
-	       (file-readable-p dir))
-	  (setq menu (cons (list (car (car dir-list))
-				 (erlang-man-make-middle-menu
-				  (erlang-man-get-files dir)))
-			   menu)))
-      (setq dir-list (cdr dir-list)))
-    ;; Should no menus be found, generate a menu item which
-    ;; will display a help text, when selected.
-    (if menu
-	(nreverse menu)
-      '(("Man Pages"
-	 (("Error! Why?" erlang-man-describe-error)))))))
-
-
-;; Should the menu be to long, let's split it into a number of
-;; smaller menus.  Warning, this code contains beautiful
-;; destructive operations!
-(defun erlang-man-make-middle-menu (filelist)
-  "Create the second level menu from FILELIST.
-
-Should the list be longer than `erlang-man-max-menu-size', a tree of
-menus is created."
-  (if (<= (length filelist) erlang-man-max-menu-size)
-      (erlang-man-make-menu filelist)
-    (let ((menu '())
-	  (filelist (copy-sequence filelist))
-	  segment submenu pair)
-      (while filelist
-	(setq pair (nthcdr (- erlang-man-max-menu-size 1) filelist))
-	(setq segment filelist)
-	(if (null pair)
-	    (setq filelist nil)
-	  (setq filelist (cdr pair))
-	  (setcdr pair nil))
-	(setq submenu (erlang-man-make-menu segment))
-	(setq menu (cons (list (concat (car (car submenu))
-				       " -- "
-				       (car (car (reverse submenu))))
-			       submenu)
-			 menu)))
-      (nreverse menu))))
-
-
-(defun erlang-man-make-menu (filelist)
-  "Make a leaf menu based on FILELIST."
-  (let ((menu '())
-	item)
-    (while filelist
-      (setq item (erlang-man-make-menu-item (car filelist)))
-      (if item
-	  (setq menu (cons item menu)))
-      (setq filelist (cdr filelist)))
-    (nreverse menu)))
-
-
-(defun erlang-man-make-menu-item (file)
-  "Create a menu item containing the name of the man page."
-  (and (string-match ".+/\\([^/]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
-       (let ((page (substring file (match-beginning 1) (match-end 1))))
-	 (list (capitalize page)
-	       (list 'lambda '()
-		     '(interactive)
-		     (list 'funcall 'erlang-man-display-function
-			   file))))))
-
-
-(defun erlang-man-get-files (dir)
-  "Return files in directory DIR."
-  (directory-files dir t ".+\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?\\'"))
-
-
-(defun erlang-man-module (&optional module)
-  "Find manual page for MODULE, defaults to module of function under point.
-This function is aware of imported functions."
-  (interactive
-   (list (let* ((mod (car-safe (erlang-get-function-under-point)))
-		(input (read-string
-			(format "Manual entry for module%s: "
-				(if (or (null mod) (string= mod ""))
-				    ""
-				  (format " (default %s)" mod))))))
-	   (if (string= input "")
-	       mod
-	     input))))
-  (or module (setq module (car (erlang-get-function-under-point))))
-  (if (or (null module) (string= module ""))
-      (error "No Erlang module name given"))
-  (let ((dir-list erlang-man-dirs)
-	(pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
-	(file nil)
-	file-list)
-    (while (and dir-list (null file))
-      (setq file-list (erlang-man-get-files
-		       (if (nth 2 (car dir-list))
-			   (concat erlang-root-dir (nth 1 (car dir-list)))
-			 (nth 1 (car dir-list)))))
-      (while (and file-list (null file))
-	(if (string-match pat (car file-list))
-	    (setq file (car file-list)))
-	(setq file-list (cdr file-list)))
-      (setq dir-list (cdr dir-list)))
-    (if file
-	(funcall erlang-man-display-function file)
-      (error "No manual page for module %s found" module))))
-
-
-;; Warning, the function `erlang-man-function' is a hack!
-;; It links itself into the man code in a non-clean way.  I have
-;; chosen to keep it since it provides a very useful functionality
-;; which is not possible to achieve using a clean approach.
-;;   / AndersL
-
-(defvar erlang-man-function-name nil
-  "Name of function for last `erlang-man-function' call.
-Used for communication between `erlang-man-function' and the
-patch to `Man-notify-when-ready'.")
-
-(defun erlang-man-function (&optional name)
-  "Find manual page for NAME, where NAME is module:function.
-The entry for `function' is displayed.
-
-This function is aware of imported functions."
-  (interactive
-   (list (let* ((mod-func (erlang-get-function-under-point))
-		(mod (car-safe mod-func))
-		(func (nth 1 mod-func))
-		(input (read-string
-			(format
-			 "Manual entry for `module:func' or `module'%s: "
-			 (if (or (null mod) (string= mod ""))
-			     ""
-			   (format " (default %s:%s)" mod func))))))
-	   (if (string= input "")
-	       (if (and mod func)
-		   (concat mod ":" func)
-		 mod)
-	     input))))
-  ;; Emacs 18 doesn't provide `man'...
-  (condition-case nil
-      (require 'man)
-    (error nil))
-  (let ((modname nil)
-	(funcname nil))
-    (cond ((null name)
-	   (let ((mod-func (erlang-get-function-under-point)))
-	     (setq modname (car-safe mod-func))
-	     (setq funcname (nth 1 mod-func))))
-	  ((string-match ":" name)
-	   (setq modname (substring name 0 (match-beginning 0)))
-	   (setq funcname (substring name (match-end 0) nil)))
-	  ((stringp name)
-	   (setq modname name)))
-    (if (or (null modname) (string= modname ""))
-	(error "No Erlang module name given"))
-    (cond ((fboundp 'Man-notify-when-ready)
-	   ;; Emacs 19:  The man command could possibly start an
-	   ;; asynchronous process, i.e. we must hook ourselves into
-	   ;; the system to be activated when the man-process
-	   ;; terminates.
-	   (if (null funcname)
-	       ()
-	     (erlang-man-patch-notify)
-	     (setq erlang-man-function-name funcname))
-	   (condition-case nil
-	       (erlang-man-module modname)
-	     (error (setq erlang-man-function-name nil))))
-	  (t
-	   (erlang-man-module modname)
-	   (if funcname
-	       (erlang-man-find-function
-		(or (get-buffer "*Manual Entry*") ; Emacs 18
-		    (current-buffer))	; XEmacs
-		funcname))))))
-
-
-;; Should the defadvice be at the top level, the package `advice' would
-;; be required.  Now it is only required when this functionality
-;; is used.  (Emacs 19 specific.)
-(defun erlang-man-patch-notify ()
-  "Patch the function `Man-notify-when-ready' to search for function.
-The variable `erlang-man-function-name' is assumed to be bound to
-the function name, or to nil.
-
-The reason for patching a function is that under Emacs 19, the man
-command is executed asynchronously."
-  (condition-case nil
-      (require 'advice)
-    ;; This should never happened since this is only called when
-    ;; running under Emacs 19.
-    (error (error (concat "This command needs the package `advice', "
-			  "please upgrade your Emacs."))))
-  (require 'man)
-  (defadvice Man-notify-when-ready
-    (after erlang-Man-notify-when-ready activate)
-    "Set point at the documentation of the function name in
-`erlang-man-function-name' when the man page is displayed."
-    (if erlang-man-function-name
-	(erlang-man-find-function (ad-get-arg 0) erlang-man-function-name))
-    (setq erlang-man-function-name nil)))
-
-
-(defun erlang-man-find-function (buf func)
-  "Find manual page for function in `erlang-man-function-name' in buffer BUF."
-  (if func
-      (let ((win (get-buffer-window buf)))
-	(if win
-	    (progn
-	      (set-buffer buf)
-	      (goto-char (point-min))
-	      (if (re-search-forward
-		   (concat "^[ \t]+" func " ?(")
-		   (point-max) t)
-		  (progn
-		    (forward-word -1)
-		    (set-window-point win (point)))
-		(message "Could not find function `%s'" func)))))))
-
-
-(defun erlang-man-display (file)
-  "Display FILE as a `man' file.
-This is the default manual page display function.
-The variables `erlang-man-display-function' contains the function
-to be used."
-  ;; Emacs 18 doesn't `provide' man.
-  (condition-case nil
-      (require 'man)
-    (error nil))
-  (if file
-      (let ((process-environment (copy-sequence process-environment)))
-	(if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
-	    (let ((dir (substring file (match-beginning 1) (match-end 1)))
-		  (page (substring file (match-beginning 2) (match-end 2))))
-	      (if (fboundp 'setenv)
-		  (setenv "MANPATH" dir)
-		;; Emacs 18
-		(setq process-environment (cons (concat "MANPATH=" dir)
-						process-environment)))
-	      (cond ((not (and (not erlang-xemacs-p)
-			       (= erlang-emacs-major-version 19)
-			       (< erlang-emacs-minor-version 29)))
-		     (manual-entry page))
-		    (t
-		     ;; Emacs 19.28 and earlier versions of 19:
-		     ;; The manual-entry command unconditionally prompts
-		     ;; the user :-(
-		     (funcall (symbol-function 'Man-getpage-in-background)
-			      page))))
-	  (error "Can't find man page for %s\n" file)))))
-
-
-(defun erlang-man-describe-error ()
-  "Describe why the manual pages weren't found."
-  (interactive)
-  (with-output-to-temp-buffer "*Erlang Man Error*"
-    (princ "Normally, this menu should contain Erlang manual pages.
-
-In order to find the manual pages, the variable `erlang-root-dir'
-should be bound to the name of the directory containing the Erlang
-installation.  The name should not include the final slash.
-
-Practically, you should add a line on the following form to
-your ~/.emacs, or ask your system administrator to add it to
-the site init file:
-    (setq erlang-root-dir \"/the/erlang/root/dir/goes/here\")
-
-For example:
-    (setq erlang-root-dir \"/usr/local/erlang\")
-
-After installing the line, kill and restart Emacs, or restart Erlang
-mode with the command `M-x erlang-mode RET'.")))
-
-;; Skeleton code:
-
-;; This code is based on the package `tempo' which is part of modern
-;; Emacsen.  (GNU Emacs 19.25 (?) and XEmacs 19.14.)
-
-(defun erlang-skel-init ()
-  "Generate the skeleton functions and menu items.
-The variable `erlang-skel' contains the name and descriptions of
-all skeletons.
-
-The skeleton routines are based on the `tempo' package.  Should this
-package not be present, this function does nothing."
-  (interactive)
-  (condition-case nil
-      (require 'tempo)
-    (error t))
-  (if (featurep 'tempo)
-      (let ((skel erlang-skel)
-	    (menu '()))
-	(while skel
-	  (cond ((null (car skel))
-		 (setq menu (cons nil menu)))
-		(t
-		 (funcall (symbol-function 'tempo-define-template)
-			  (concat "erlang-" (nth 1 (car skel)))
-			  ;; The tempo template used contains an `include'
-			  ;; function call only, hence changes to the
-			  ;; variables describing the templates take effect
-			  ;; immdiately.
-			  (list (list 'erlang-skel-include (nth 2 (car skel))))
-			  (nth 1 (car skel))
-			  (car (car skel))
-			  'erlang-tempo-tags)
-		 (setq menu (cons (erlang-skel-make-menu-item
-				   (car skel)) menu))))
-	  (setq skel (cdr skel)))
-	(setq erlang-menu-skel-items
-	      (list nil (list "Skeletons" (nreverse menu))))
-	(setq erlang-menu-items
-	      (erlang-menu-add-above 'erlang-menu-skel-items
-				     'erlang-menu-version-items
-				     erlang-menu-items))
-	(erlang-menu-init))))
-
-(defun erlang-skel-make-menu-item (skel)
-  (let ((func (intern (concat "tempo-template-erlang-" (nth 1 skel)))))
-    (cond ((null (nth 3 skel))
-	   (list (car skel) func))
-	  (t
-	   (list (car skel)
-		 (list 'lambda '()
-		       '(interactive)
-		       (list 'funcall
-			     (list 'quote (nth 3 skel))
-			     (list 'quote func))))))))
-
-;; Functions designed to be added to the skeleton menu.
-;; (Not normally used)
-(defun erlang-skel-insert (func)
-  "Insert skeleton generated by FUNC and goto first tempo mark."
-  (save-excursion (funcall func))
-  (funcall (symbol-function 'tempo-forward-mark)))
-
-(defun erlang-skel-header (func)
-  "Insert the header generated by FUNC at the beginning of the buffer."
-  (goto-char (point-min))
-  (save-excursion (funcall func))
-  (funcall (symbol-function 'tempo-forward-mark)))
-
-
-;; Functions used inside the skeleton descriptions.
-(defun erlang-skel-skip-blank ()
-  (skip-chars-backward " \t")
-  nil)
-
-(defun erlang-skel-include (&rest args)
-  "Include a template inside another template.
-
-Example of use, assuming that `erlang-skel-func' is defined:
-
- (defvar foo-skeleton '(\"%%% New function:\"
-                        (erlang-skel-include erlang-skel-func)))
-
-Technically, this function returns the `tempo' attribute`(l ...)' which
-can contain other `tempo' attributes.  Please see the function
-`tempo-define-template' for a description of the `(l ...)' attribute."
-  (let ((res '())
-	entry)
-    (while args
-      (setq entry (car args))
-      (while entry
-	(setq res (cons (car entry) res))
-	(setq entry (cdr entry)))
-      (setq args (cdr args)))
-    (cons 'l (nreverse res))))
-
-(defvar erlang-skel-separator-length 70)
-
-(defun erlang-skel-separator (&optional percent)
-  "Return a comment separator."
-  (let ((percent (or percent 3)))
-    (concat (make-string percent ?%) 
-	    (make-string (- erlang-skel-separator-length percent) ?-) 
-	    "\n")))
-
-(defun erlang-skel-double-separator (&optional percent)
-  "Return a comment separator."
-  (let ((percent (or percent 3)))
-    (concat (make-string percent ?%) 
-	    (make-string (- erlang-skel-separator-length percent) ?=) 
-	    "\n")))
-
-(defun erlang-skel-dd-mmm-yyyy ()
-  "Return the current date as a string in \"DD Mon YYYY\" form.
-The first character of DD is space if the value is less than 10."
-  (let ((date (current-time-string)))
-    (format "%2d %s %s"
-	    (erlang-string-to-int (substring date 8 10))
-	    (substring date 4 7)
-	    (substring date -4))))
-
-;; Indentation code:
-
-(defun erlang-indent-command (&optional whole-exp)
-  "Indent current line as Erlang code.
-With argument, indent any additional lines of the same clause
-rigidly along with this one."
-  (interactive "P")
-  (if whole-exp
-      ;; If arg, always indent this line as Erlang
-      ;; and shift remaining lines of clause the same amount.
-      (let ((shift-amt (erlang-indent-line))
-	    beg end)
-	(save-excursion
-	  (if erlang-tab-always-indent
-	      (beginning-of-line))
-	  (setq beg (point))
-	  (erlang-end-of-clause 1)
-	  (setq end (point))
-	  (goto-char beg)
-	  (forward-line 1)
-	  (setq beg (point)))
-	(if (> end beg)
-	    (indent-code-rigidly beg end shift-amt "\n")))
-    (if (and (not erlang-tab-always-indent)
-	     (save-excursion
-	       (skip-chars-backward " \t")
-	       (not (bolp))))
-	(insert-tab)
-      (erlang-indent-line))))
-
-
-(defun erlang-indent-line ()
-  "Indent current line as Erlang code.
-Return the amount the indentation changed by."
-  (let ((pos (- (point-max) (point)))
-	indent beg
-	shift-amt)
-    (beginning-of-line 1)
-    (setq beg (point))
-    (skip-chars-forward " \t")
-    (cond ((looking-at "%")
-	   (setq indent (funcall comment-indent-function))
-	   (setq shift-amt (- indent (current-column))))
-	  (t
-	   (setq indent (erlang-calculate-indent))
-	   (cond ((null indent)
-		  (setq indent (current-indentation)))
-		 ((eq indent t)
-		  ;; This should never occur here.
-		  (error "Erlang mode error"))
-		 ;;((= (char-syntax (following-char)) ?\))
-		 ;; (setq indent (1- indent)))
-		 )
-	   (setq shift-amt (- indent (current-column)))))
-    (if (zerop shift-amt)
-	nil
-      (delete-region beg (point))
-      (indent-to indent))
-    ;; If initial point was within line's indentation, position
-    ;; after the indentation. Else stay at same point in text.
-    (if (> (- (point-max) pos) (point))
-	(goto-char (- (point-max) pos)))
-    shift-amt))
-
-
-(defun erlang-indent-region (beg end)
-  "Indent region of Erlang code.
-
-This is automagically called by the user level function `indent-region'."
-  (interactive "r")
-  (save-excursion
-    (let ((case-fold-search nil)
-	  (continue t)
-	  (from-end (- (point-max) end))
-	  indent-point;; The beginning of the current line
-	  indent;; The indent amount
-	  state)
-      (goto-char beg)
-      (beginning-of-line)
-      (setq indent-point (point))
-      (erlang-beginning-of-clause)
-      ;; Parse the Erlang code from the beginning of the clause to
-      ;; the beginning of the region.
-      (while (< (point) indent-point)
-        (let ((pt (point)))
-          (setq state (erlang-partial-parse pt indent-point state))
-          (if (= pt (point))
-              (error "Illegal syntax"))))
-      ;; Indent every line in the region
-      (while continue
-	(goto-char indent-point)
-	(skip-chars-forward " \t")
-	(cond ((looking-at "%")
-	       ;; Do not use our stack to help the user to customize
-	       ;; comment indentation.
-	       (setq indent (funcall comment-indent-function)))
-	      ((looking-at "$")
-	       ;; Don't indent empty lines.
-	       (setq indent 0))
-	      (t
-	       (setq indent
-		     (save-excursion
-		       (erlang-calculate-stack-indent (point) state)))
-	       (cond ((null indent)
-		      (setq indent (current-indentation)))
-		     ((eq indent t)
-		      ;; This should never occur here.
-		      (error "Erlang mode error"))
-		     ;;((= (char-syntax (following-char)) ?\))
-		     ;; (setq indent (1- indent)))
-		     )))
-	(if (zerop (- indent (current-column)))
-	    nil
-	  (delete-region indent-point (point))
-	  (indent-to indent))
-	;; Find the next line in the region
-	(goto-char indent-point)
-	(save-excursion
-	  (forward-line 1)
-	  (setq indent-point (point)))
-	(if (>= from-end (- (point-max) indent-point))
-	    (setq continue nil)
-	  (while (< (point) indent-point)
-            (let ((pt (point)))
-              (setq state (erlang-partial-parse
-                           pt indent-point state))
-              (if (= pt (point))
-                  (error "Illegal syntax")))))))))
-
-
-(defun erlang-indent-current-buffer ()
-  "Indent current buffer as Erlang code."
-  (interactive)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (erlang-indent-region (point-min) (point-max)))))
-
-
-(defun erlang-indent-function ()
-  "Indent current Erlang function."
-  (interactive)
-  (save-excursion
-    (let ((end (progn (erlang-end-of-function 1) (point)))
-	  (beg (progn (erlang-beginning-of-function 1) (point))))
-      (erlang-indent-region beg end))))
-
-
-(defun erlang-indent-clause ()
-  "Indent current Erlang clause."
-  (interactive)
-  (save-excursion
-    (let ((end (progn (erlang-end-of-clause 1) (point)))
-	  (beg (progn (erlang-beginning-of-clause 1) (point))))
-      (erlang-indent-region beg end))))
-
-
-(defmacro erlang-push (x stack) (list 'setq stack (list 'cons x stack)))
-(defmacro erlang-pop (stack) (list 'setq stack (list 'cdr stack)))
-;; Would much prefer to make caddr a macro but this clashes.
-(defun erlang-caddr (x) (car (cdr (cdr x))))
-
-
-(defun erlang-calculate-indent (&optional parse-start)
-  "Compute appropriate indentation for current line as Erlang code.
-Return nil if line starts inside string, t if in a comment."
-  (save-excursion
-    (let ((indent-point (point))
-	  (case-fold-search nil)
-	  (state nil))
-      (if parse-start
-	  (goto-char parse-start)
-	(erlang-beginning-of-clause))
-      (while (< (point) indent-point)
-        (let ((pt (point)))
-          (setq state (erlang-partial-parse pt indent-point state))
-          (if (= pt (point))
-              (error "Illegal syntax"))))
-      (erlang-calculate-stack-indent indent-point state))))
-
-(defun erlang-show-syntactic-information ()
-  "Show syntactic information for current line."
-
-  (interactive)
-
-  (save-excursion
-    (let ((starting-point (point))
-	  (case-fold-search nil)
-	  (state nil))
-      (erlang-beginning-of-clause)
-      (while (< (point) starting-point)
-	(setq state (erlang-partial-parse (point) starting-point state)))
-      (message "%S" state))))
-
-
-(defun erlang-partial-parse (from to &optional state)
-  "Parse Erlang syntax starting at FROM until TO, with an optional STATE.
-Value is list (stack token-start token-type in-what)."
-  (goto-char from)			; Start at the beginning
-  (erlang-skip-blank to)
-  (let ((cs (char-syntax (following-char)))
-	(stack (car state))
-	(token (point))
-	in-what)
-    (cond 
-     
-     ;; Done: Return previous state.
-     ((>= token to)
-      (setq token (nth 1 state))
-      (setq cs (nth 2 state))
-      (setq in-what (nth 3 state)))
-
-     ;; Word constituent: check and handle keywords.
-     ((= cs ?w)
-      (cond ((looking-at "\\(end\\|after\\)[^_a-zA-Z0-9]")
-	     ;; Must pop top icr layer, `after' will push a new
-	     ;; layer next.
-	     (progn
-	       (while (and stack (eq (car (car stack)) '->))
-		 (erlang-pop stack))
-	       (if (and stack (memq (car (car stack)) '(icr begin fun try)))
-		   (erlang-pop stack))))
-	    ((looking-at "catch\\b.*of")
-	     t)
-	    ((looking-at "catch\\b\\s *\\($\\|%\\|.*->\\)")
-	     ;; Must pop top icr layer, `catch' in try/catch
-	     ;;will push a new layer next.
-	     (progn
-	       (while (and stack (eq (car (car stack)) '->))
-		 (erlang-pop stack))
-	       (if (and stack (memq (car (car stack)) '(icr begin try)))
-		   (erlang-pop stack))))
-	    )  
-      (cond ((looking-at "\\(if\\|case\\|receive\\)[^_a-zA-Z0-9]")
-	     ;; Must push a new icr (if/case/receive) layer.
-	     (erlang-push (list 'icr token (current-column)) stack))
-	    ((looking-at "\\(try\\|after\\)[^_a-zA-Z0-9]")
-	     ;; Must handle separately, try catch or try X of -> catch
-	     ;; same for `after', it could be 
-	     ;; receive after Time -> X end, or 
-	     ;; try after X end
-	     (erlang-push (list 'try token (current-column)) stack))
-	    ((looking-at "\\(of\\)[^_a-zA-Z0-9]")
-	     ;; Must handle separately, try X of -> catch
-	     (if (and stack (eq (car (car stack)) 'try))
-		 (let ((try-column (nth 2 (car stack)))
-		       (try-pos (nth 1 (car stack))))
-		   (erlang-pop stack)
-		   (erlang-push (list 'icr try-pos try-column) stack))))
-	    
-	    ((looking-at "\\(fun\\)[^_a-zA-Z0-9]")
-	     ;; Push a new layer if we are defining a `fun'
-	     ;; expression, not when we are refering an existing
-	     ;; function.  'fun's defines are only indented one level now.
-	     (if (save-excursion
-		   (goto-char (match-end 1))
-		   (erlang-skip-blank to)
-		   ;; Use erlang-variable-regexp here to look for an
-		   ;; optional variable name to match EEP37 named funs.
-		   (if (looking-at erlang-variable-regexp)
-		       (progn
-			 (goto-char (match-end 0))
-			 (erlang-skip-blank to)))
-		   (eq (following-char) ?\())
-		 (erlang-push (list 'fun token (current-column)) stack)))
-	    ((looking-at "\\(begin\\)[^_a-zA-Z0-9]")
-	     (erlang-push (list 'begin token (current-column)) stack))
-	    ;; Normal when case
-	    ;;((looking-at "when\\s ")
-	    ;;((looking-at "when\\s *\\($\\|%\\)")
-	    ((looking-at "when[^_a-zA-Z0-9]")
-	     (erlang-push (list 'when token (current-column)) stack))
-	    ((looking-at "catch\\b.*of")
-	     t)
-	    ((looking-at "catch\\b\\s *\\($\\|%\\|.*->\\)")
-	     (erlang-push (list 'icr token (current-column)) stack))
-	    ;;(erlang-push (list '-> token (current-column)) stack))
-	    ;;((looking-at "^of$") 
-	    ;; (erlang-push (list 'icr token (current-column)) stack)
-	    ;;(erlang-push (list '-> token (current-column)) stack))
-	    )
-      (forward-sexp 1))
-      ;; String: Try to skip over it. (Catch error if not complete.)
-      ((= cs ?\")
-       (condition-case nil
-	   (progn
-	    (forward-sexp 1)
-	    (if (> (point) to)
-		(progn
-		  (setq in-what 'string)
-		  (goto-char to))))
-	(error
-	 (setq in-what 'string)
-	 (goto-char to))))
-
-     ;; Expression prefix e.i. $ or ^ (Note ^ can be in the character
-     ;; literal $^ or part of string and $ outside of a string denotes
-     ;; a character literal)
-     ((= cs ?')
-      (cond 
-       ((= (following-char) ?\") ;; $ or ^ was the last char in a string
-	(forward-char 1))
-       (t
-	;; Maybe a character literal, quote the next char to avoid
-	;; situations as $" being seen as the begining of a string.
-	;; Note the quoting something in the middle of a string is harmless.
-	(quote (following-char)) 
-	(forward-char 1))))
-
-     ;; Symbol constituent or punctuation
-     
-     ((memq cs '(?. ?_))
-      (cond 
-       
-       ;; Clause end
-       ((= (following-char) ?\;)
-	(if (eq (car (car (last stack))) 'spec)
-	    (while (memq (car (car stack)) '(when ::))
-	      (erlang-pop stack)))
-	(if (and stack (eq (car (car stack)) '->))
-	    (erlang-pop stack))
-	(forward-char 1))
-       
-       ;; Parameter separator
-       ((looking-at ",")
-	(forward-char 1)
-	(if (and stack (eq (car (car stack)) '::))
-	    ;; Type or spec
-	    (erlang-pop stack)))
-
-       ;; Function end
-       ((looking-at "\\.\\(\\s \\|\n\\|\\s<\\)")
-	(setq stack nil)
-	(forward-char 1))
-       
-       ;; Function head
-       ((looking-at "->")
-	(if (and stack (eq (car (car stack)) 'when))
-	    (erlang-pop stack))
-	(erlang-push (list '-> token (current-column)) stack)
-	(forward-char 2)) 
-       
-       ;; List-comprehension divider
-       ((looking-at "||")
-	(erlang-push (list '|| token (current-column)) stack)
-	(forward-char 2))
-
-       ;; Bit-syntax open. Note that map syntax allows "<<" to follow ":="
-       ;; or "=>" without intervening whitespace, so handle that case here
-       ((looking-at "\\(:=\\|=>\\)?<<")
-	(erlang-push (list '<< token (current-column)) stack)
-	(forward-char (- (match-end 0) (match-beginning 0))))
-       
-       ;; Bit-syntax close
-       ((looking-at ">>")
-	(while (memq (car (car stack)) '(|| ->))
-	  (erlang-pop stack))
-	(cond ((eq (car (car stack)) '<<)
-	       (erlang-pop stack))
-	      ((memq (car (car stack)) '(icr begin fun)) 
-	       (error "Missing `end'"))
-	      (t
-	       (error "Unbalanced parentheses")))
-	(forward-char 2))
-       
-       ;; Macro
-       ((= (following-char) ??)
-	;; Skip over the ? 
-	(forward-char 1)
-	)
-
-       ;; Type spec's
-       ((looking-at "-type\\s \\|-opaque\\s ")
-	(if stack
-	    (forward-char 1)
-	  (erlang-push (list 'icr token (current-column)) stack)
-	  (forward-char 6)))
-       ((looking-at "-spec\\s ")
-	(if stack
-	    (forward-char 1)
-	  (forward-char 6) 
-	  (skip-chars-forward "^(\n")
-	  (erlang-push (list 'spec (point) (current-column)) stack)
-	  ))
-
-       ;; Type spec delimiter
-       ((looking-at "::")
-	(erlang-push (list ':: token (current-column)) stack)
-	(forward-char 2))
-       
-       ;; Don't follow through in the clause below 
-       ;; '|' don't need spaces around it 
-       ((looking-at "|")
-	(forward-char 1))
-       
-       ;; Other punctuation: Skip over it and any following punctuation
-       ((= cs ?.)
-	;; Skip over all characters in the operand.
-	(skip-syntax-forward "."))
-       
-       ;; Other char: Skip over it.
-       (t
-	(forward-char 1))))
-     
-     ;; Open parenthesis
-     ((= cs ?\()
-      (erlang-push (list '\( token (current-column)) stack)
-      (forward-char 1))
-     
-     ;; Close parenthesis
-     ((= cs ?\))
-      (while (memq (car (car stack)) '(|| -> :: when))
-	(erlang-pop stack))
-      (cond ((eq (car (car stack)) '\()
-	     (erlang-pop stack)
-	     (if (and (eq (car (car stack)) 'fun) 
-		      (or (eq (car (car (last stack))) 'spec)
-			  (eq (car (car (cdr stack))) '::))) ;; -type()
-		 ;; Inside fun type def ') closes fun definition
-		 (erlang-pop stack)))
-	    ((eq (car (car stack)) 'icr)
-	     (erlang-pop stack)  
-	     ;; Normal catch not try-catch might have caused icr
-	     ;; and then incr should be removed and is not an error.
-	     (if (eq (car (car stack)) '\() 
-	     	 (erlang-pop stack) 
-	       (error "Missing `end'")
-	       ))
-	    ((eq (car (car stack)) 'begin) 
-	     (error "Missing `end'"))
-	    (t
-	     (error "Unbalanced parenthesis"))
-	    )
-      (forward-char 1)) 
-    
-     ;; Character quote: Skip it and the quoted char.
-     ((= cs ?/)
-      (forward-char 2))
-     
-     ;; Character escape: Skip it and the escape sequence.
-     ((= cs ?\\)
-      (forward-char 1)
-      (skip-syntax-forward "w"))
-
-     ;; Everything else
-     (t
-      (forward-char 1)))
-    (list stack token cs in-what)))
-
-(defun erlang-calculate-stack-indent (indent-point state)
-  "From the given last position and state (stack) calculate indentation.
-Return nil if inside string, t if in a comment."
-  (let* ((stack (and state (car state)))
-         (token (nth 1 state))
-         (stack-top (and stack (car stack))))
-    (cond ((null state)                 ;No state
-           0)
-          ((nth 3 state)
-           ;; Return nil or t.
-           (eq (nth 3 state) 'comment))
-          ((null stack)
-           (if (looking-at "when[^_a-zA-Z0-9]")
-               erlang-indent-guard
-             0))
-          ((eq (car stack-top) '\()
-           ;; Element of list, tuple or part of an expression,
-           (cond ((null erlang-argument-indent)
-		  ;; indent to next column.
-		  (1+ (nth 2 stack-top)))
-		 ((= (char-syntax (following-char)) ?\))
-		  (goto-char (nth 1 stack-top))
-		  (cond ((looking-at "[({]\\s *\\($\\|%\\)")
-		   	 ;; Line ends with parenthesis.
-			 (let ((previous (erlang-indent-find-preceding-expr))
-			       (stack-pos (nth 2 stack-top)))
-			   (if (>= previous stack-pos) stack-pos
-			     (- (+ previous erlang-argument-indent) 1))))
-		   	(t
-		   	 (nth 2 stack-top))))
-		 ((= (following-char) ?,)
-		  ;; a comma at the start of the line: line up with opening parenthesis.
-		  (nth 2 stack-top))
-		 (t 
-		  (goto-char (nth 1 stack-top))
-		  (let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")
-				     ;; Line ends with parenthesis.
-				     (erlang-indent-parenthesis (nth 2 stack-top)))
-				    (t
-				     ;; Indent to the same column as the first
-				     ;; argument.
-				     (goto-char (1+ (nth 1 stack-top)))
-				     (skip-chars-forward " \t")
-				     (current-column)))))
-		    (erlang-indent-standard indent-point token base 't)))))
-	  ;;
-	  ((eq (car stack-top) '<<)
-	   ;; Element of binary (possible comprehension) expression,
-	   (cond ((null erlang-argument-indent)
-		  ;; indent to next column.
-		  (+ 2 (nth 2 stack-top)))
-		 ((looking-at "\\(>>\\)[^_a-zA-Z0-9]")
-		  (nth 2 stack-top))
-		 (t 
-		  (goto-char (nth 1 stack-top))
-		  ;; Indent to the same column as the first
-		  ;; argument.
-		  (goto-char (+ 2 (nth 1 stack-top)))
-		  (skip-chars-forward " \t")
-		  (current-column))))
-	  
-          ((memq (car stack-top) '(icr fun spec))
-           ;; The default indentation is the column of the option
-           ;; directly following the keyword. (This does not apply to
-           ;; `case'.)  Should no option be on the same line, the
-           ;; indentation is the indentation of the keyword +
-           ;; `erlang-indent-level'.
-           ;;
-           ;; `after' should be indented to the same level as the
-           ;; corresponding receive.
-           (cond ((looking-at "\\(after\\|of\\)\\($\\|[^_a-zA-Z0-9]\\)")
-		  (nth 2 stack-top))
-		 ((looking-at "when[^_a-zA-Z0-9]")
-		  ;; Handling one when part
-		  (+ (nth 2 stack-top) erlang-indent-level erlang-indent-guard))
-		 (t
-		  (save-excursion
-		    (goto-char (nth 1 stack-top))
-		    (if (looking-at "case[^_a-zA-Z0-9]")
-			(+ (nth 2 stack-top) erlang-indent-level)
-		      (skip-chars-forward "a-z")
-		      (skip-chars-forward " \t")
-		      (if (memq (following-char) '(?% ?\n))
-			  (+ (nth 2 stack-top) erlang-indent-level)
-			(current-column))))))
-           )
-	  ((and (eq (car stack-top) '||) (looking-at "\\(]\\|>>\\)[^_a-zA-Z0-9]"))
-	   (nth 2 (car (cdr stack))))
-          ;; Real indentation, where operators create extra indentation etc.
-          ((memq (car stack-top) '(-> || try begin))
-	   (if (looking-at "\\(of\\)[^_a-zA-Z0-9]")
-	       (nth 2 stack-top)
-	     (goto-char (nth 1 stack-top))
-	     ;; Check if there is more code after the '->' on the
-	     ;; same line. If so use this indentation as base, else
-	     ;; use parent indentation + 2 * level as base.
-	     (let ((off erlang-indent-level)
-		   (skip 2))
-	       (cond ((null (cdr stack))) ; Top level in function.
-		     ((eq (car stack-top) 'begin)
-		      (setq skip 5))
-		     ((eq (car stack-top) 'try)
-		      (setq skip 5))
-		     ((eq (car stack-top) '->)
-		      ;; If in fun definition use standard indent level not double
-		      ;;(if (not (eq (car (car (cdr stack))) 'fun))
-		      ;; Removed it made multi clause fun's look to bad
-		      (setq off (* 2 erlang-indent-level)))) ;; ) 
-	       (let ((base (erlang-indent-find-base stack indent-point off skip)))
-		 ;; Special cases
-		 (goto-char indent-point)
-		 (cond ((looking-at "\\(end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
-			(if (eq (car stack-top) '->)
-			    (erlang-pop stack))
-			(if stack
-			    (erlang-caddr (car stack))
-			  0))
-		       ((looking-at "catch\\b\\($\\|[^_a-zA-Z0-9]\\)")
-			;; Are we in a try
-			(let ((start (if (eq (car stack-top) '->)
-					 (car (cdr stack))
-				       stack-top)))
-			  (if (null start) nil
-			    (goto-char (nth 1 start)))
-			  (cond ((looking-at "try\\($\\|[^_a-zA-Z0-9]\\)")
-				 (progn
-				   (if (eq (car stack-top) '->)
-				       (erlang-pop stack))
-				   (if stack
-				       (erlang-caddr (car stack))
-				     0)))
-				(t (erlang-indent-standard indent-point token base 'nil))))) ;; old catch
-		       (t 
-			(erlang-indent-standard indent-point token base 'nil)
-			))))
-	     ))
-	  ((eq (car stack-top) 'when)
-	   (goto-char (nth 1 stack-top))
-	   (if (looking-at "when\\s *\\($\\|%\\)")
-	       (progn
-		 (erlang-pop stack)
-		 (if (and stack (memq (nth 0 (car stack)) '(icr fun)))
-		     (progn
-		       (goto-char (nth 1 (car stack)))
-		       (+ (nth 2 (car stack)) erlang-indent-guard
-			  ;; receive XYZ    or    receive
-			  ;;                          XYZ
-			  ;; This if thing does not seem to be needed
-			  ;;(if (looking-at "[a-z]+\\s *\\($\\|%\\)")
-			  ;;    erlang-indent-level
-			  ;;  (* 2 erlang-indent-level))))
-			  (* 2 erlang-indent-level)))
-			  ;;erlang-indent-level))
-		   (+ erlang-indent-level erlang-indent-guard)))
-             ;; "when" is followed by code, let's indent to the same
-             ;; column.
-             (forward-char 4)           ; Skip "when"
-             (skip-chars-forward " \t")
-             (current-column)))
-	  ;; Type and Spec indentation
-	  ((eq (car stack-top) '::)
-	   (if (looking-at "}")
-	       ;; Closing record definition with types
-	       ;; pop stack and recurse
-	       (erlang-calculate-stack-indent indent-point
-					      (cons (erlang-pop stack) (cdr state)))
-	     (cond ((null erlang-argument-indent)
-		    ;; indent to next column.
-		    (+ 2 (nth 2 stack-top)))
-		   ((looking-at "::[^_a-zA-Z0-9]")
-		    (nth 2 stack-top))
-		   (t
-		    (let ((start-alternativ (if (looking-at "|") 2 0)))
-		      (goto-char (nth 1 stack-top))
-		      (- (cond ((looking-at "::\\s *\\($\\|%\\)")
-				;; Line ends with ::
-				(if (eq (car (car (last stack))) 'spec)
-				  (+ (erlang-indent-find-preceding-expr 1)
-				     erlang-argument-indent)
-				  (+ (erlang-indent-find-preceding-expr 2)
-				     erlang-argument-indent)))
-			       (t
-				;; Indent to the same column as the first
-				;; argument.
-				(goto-char (+ 2 (nth 1 stack-top)))
-				(skip-chars-forward " \t")
-				(current-column))) start-alternativ))))))
-	  )))
-
-(defun erlang-indent-standard (indent-point token base inside-parenthesis)
-  "Standard indent when in blocks or tuple or arguments.
-   Look at last thing to see in what state we are, move relative to the base."
-  (goto-char token)  
-  (cond ((looking-at "||\\|,\\|->\\||")
-	 base)
-	((erlang-at-keyword)
-	 (+ (current-column) erlang-indent-level))
-	((or (= (char-syntax (following-char)) ?.)
-	     (erlang-at-operator))
-	 (+ base erlang-indent-level))
-	(t
-	 (goto-char indent-point)
-	 (cond ((memq (following-char) '(?\( ))
-		;; Function application.
-		(+ (erlang-indent-find-preceding-expr)
-		   erlang-argument-indent))
-	       ;; Empty line, or end; treat it as the end of
-	       ;; the block.  (Here we have a choice: should
-	       ;; the user be forced to reindent continued
-	       ;; lines, or should the "end" be reindented?)
-	       
-	       ;; Avoid treating comments a continued line.
-	       ((= (following-char) ?%)
-		base)
-	       ;; Continued line (e.g. line beginning
-	       ;; with an operator.)
-	       (t 
-		(if (or (erlang-at-operator) (not inside-parenthesis)) 
-		    (+ base erlang-indent-level)
-		  base))))))
-
-(defun erlang-indent-find-base (stack indent-point &optional offset skip)
-  "Find the base column for current stack."
-  (or skip (setq skip 2))
-  (or offset (setq offset erlang-indent-level))
-  (save-excursion
-    (let* ((stack-top (car stack)))
-      (goto-char (nth 1 stack-top))
-      (if (< skip (- (point-max) (point)))
-	  (progn 
-	    (forward-char skip)
-	    (if (looking-at "\\s *\\($\\|%\\)")
-		(progn
-		  (if (memq (car stack-top) '(-> ||))
-		      (erlang-pop stack))
-		  ;; Take parent identation + offset,
-		  ;; else just erlang-indent-level if no parent
-		  (if stack
-		      (+ (erlang-caddr (car stack))
-			 offset)
-		    erlang-indent-level))
-	      (erlang-skip-blank indent-point)
-	      (current-column)))
-	(+ (current-column) skip)))))
-
-
-;; Does not handle `begin' .. `end'.
-(defun erlang-indent-find-preceding-expr (&optional arg)
-  "Return the first column of the preceding expression.
-This assumes that the preceding expression is either simple
-\(i.e. an atom) or parenthesized."
-  (save-excursion
-    (or arg (setq arg 1))
-    (ignore-errors (forward-sexp (- arg)))
-    (let ((col (current-column)))
-      (skip-chars-backward " \t")
-      ;; Special hack to handle: (note line break)
-      ;; [#myrecord{
-      ;;  foo = foo}]
-      ;; where the call (forward-sexp -1) will fail when point is at the `#'.
-      (or
-       (ignore-errors
-	 ;; Needed to match the colon in "'foo':'bar'".
-	 (cond ((eq (preceding-char) ?:)
-		(backward-char 1)
-		(forward-sexp -1)
-		(current-column))
-	       ((eq  (preceding-char) ?#)
-		;; We may now be at:
-		;; - either a construction of a new record
-		;; - or update of a record, in which case we want
-		;;   the column of the expression to be updated.
-		;;
-		;; To see which of the two cases we are at, we first
-		;; move an expression backwards, check for keywords,
-		;; then immediately an expression forwards.  Moving
-		;; backwards skips past tokens like `,' or `->', but
-		;; when moving forwards again, we won't skip past such
-		;; tokens.  We use this: if, after having moved
-		;; forwards, we're back where we started, then it was
-		;; a record update.
-		;; The check for keywords is to detect cases like:
-		;;   case Something of #record_construction{...}
-		(backward-char 1)
-		(let ((record-start (point))
-		      (record-start-col (current-column)))
-		  (forward-sexp -1)
-		  (let ((preceding-expr-col (current-column))
-			;; white space definition according to erl_scan
-			(white-space "\000-\040\200-\240"))
-		    (if (erlang-at-keyword)
-			;; The (forward-sexp -1) call moved past a keyword
-			(1+ record-start-col)
-		      (forward-sexp 1)
-		      (skip-chars-forward white-space record-start)
-		      ;; Are we back where we started?  If so, it was an update.
-		      (if (= (point) record-start)
-			    preceding-expr-col
-			(goto-char record-start)
-			(1+ (current-column)))))))
-	       (t col)))
-       col))))
-
-(defun erlang-indent-parenthesis (stack-position) 
-  (let ((previous (erlang-indent-find-preceding-expr)))
-    (if (> previous stack-position)
-	(+ stack-position erlang-argument-indent)
-      (+ previous erlang-argument-indent))))
-
-(defun erlang-skip-blank (&optional lim)
-  "Skip over whitespace and comments until limit reached."
-  (or lim (setq lim (point-max)))
-  (let (stop)
-    (while (and (not stop) (< (point) lim))
-      (cond ((= (following-char) ?%)
-	     (skip-chars-forward "^\n" lim))
-	    ((= (following-char) ?\n)
-	     (skip-chars-forward "\n" lim))
-	    ((looking-at "\\s ")
-	     (if (re-search-forward "\\S " lim 'move)
-		 (forward-char -1)))
-	    (t
-	     (setq stop t))))
-    stop))
-
-(defun erlang-at-keyword ()
-  "Are we looking at an Erlang keyword which will increase indentation?"
-  (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|"
-		      "of\\|receive\\|after\\|catch\\|try\\)\\b")))
-
-(defun erlang-at-operator ()
-  "Are we looking at an Erlang operator?"
-  (looking-at
-   "\\(bnot\\|div\\|mod\\|band\\|bor\\|bxor\\|bsl\\|bsr\\)\\b"))
-
-(defun erlang-comment-indent ()
-  "Compute Erlang comment indentation.
-
-Used both by `indent-for-comment' and the Erlang specific indentation
-commands."
-  (cond ((looking-at "%%%") 0)
-	((looking-at "%%")
-	 (or (erlang-calculate-indent)
-	     (current-indentation)))
-	(t
-	 (save-excursion
-	   (skip-chars-backward " \t")
-	   (max (if (bolp) 0 (1+ (current-column)))
-		comment-column)))))
-
-;;; Erlang movement commands
-
-;; All commands below work as movement commands.  I.e. if the point is
-;; at the end of the clause, and the command `erlang-end-of-clause' is
-;; executed, the point is moved to the end of the NEXT clause.  (This
-;; mimics the behaviour of `end-of-defun'.)
-;;
-;; Personally I would like to rewrite them to be "pure", and add a set
-;; of movement functions, like `erlang-next-clause',
-;; `erlang-previous-clause', and the same for functions.
-;;
-;; The current implementation makes it hopeless to use the functions as
-;; subroutines in more complex commands.   /andersl
-
-(defun erlang-beginning-of-clause (&optional arg)
-  "Move backward to previous start of clause.
-With argument, do this that many times.
-Return t unless search stops due to end of buffer."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      ;; Step back to the end of the previous line, unless we are at
-      ;; the beginning of the buffer.  The reason for this move is
-      ;; that the regexp below includes the last character of the
-      ;; previous line.
-      (if (bobp)
-	  (or (looking-at "\n")
-	      (forward-char 1))
-	(forward-char -1)
-	(if (looking-at "\\`\n")
-	    (forward-char 1))))
-  ;; The regexp matches a function header that isn't
-  ;; included in a string.
-  (and (re-search-forward "\\(\\`\\|\\`\n\\|[^\\]\n\\)\\(-?[a-z]\\|'\\|-\\)"
-			  nil 'move (- arg))
-       (let ((beg (match-beginning 2)))
-	 (and beg (goto-char beg))
-	 t)))
-
-(defun erlang-end-of-clause (&optional arg)
-  "Move to the end of the current clause.
-With argument, do this that many times."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (while (and (looking-at "[ \t]*[%\n]")
-	      (zerop (forward-line 1))))
-  ;; Move to the next clause.
-  (erlang-beginning-of-clause (- arg))
-  (beginning-of-line);; Just to be sure...
-  (let ((continue t))
-    (while (and (not (bobp)) continue)
-      (forward-line -1)
-      (skip-chars-forward " \t")
-      (if (looking-at "[%\n]")
-	  nil
-	(end-of-line)
-	(setq continue nil)))))
-
-(defun erlang-mark-clause ()
-  "Put mark at end of clause, point at beginning."
-  (interactive)
-  (push-mark (point))
-  (erlang-end-of-clause 1)
-  ;; Sets the region. In Emacs 19 and XEmacs, we want to activate
-  ;; the region.
-  (condition-case nil
-      (push-mark (point) nil t)
-    (error (push-mark (point))))
-  (erlang-beginning-of-clause 1)
-  ;; The above function deactivates the mark.
-  (if (boundp 'deactivate-mark)
-      (funcall (symbol-function 'set) 'deactivate-mark nil)))
-
-(defun erlang-beginning-of-function (&optional arg)
-  "Move backward to previous start of function.
-With positive argument, do this that many times.
-With negative argument, search forward.
-
-Return t unless search stops due to end of buffer."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (cond
-   ;; Search backward
-   ((> arg 0)
-    (while (and (> arg 0)
-		(and (erlang-beginning-of-clause 1)
-		     (let ((start (point))
-			   (name (erlang-name-of-function))
-			   (arity (erlang-get-function-arity)))
-		       ;; Note: "arity" is nil for e.g. "-import", hence
-		       ;; two "-import" clauses are not considered to
-		       ;; be part of the same function.
-		       (while (and (erlang-beginning-of-clause 1)
-				   (string-equal name
-						 (erlang-name-of-function))
-				   arity
-				   (equal arity
-					  (erlang-get-function-arity)))
-			 (setq start (point)))
-		       (goto-char start)
-		       t)))
-      (setq arg (1- arg))))
-   ;; Search forward
-   ((< arg 0)
-    (end-of-line)
-    (erlang-beginning-of-clause 1)
-    ;; Step -arg functions forward.
-    (while (and (< arg 0)
-		;; Step one function forward, or stop if the end of
-		;; the buffer was reached.  Return t if we found the
-		;; function.
-		(let ((name (erlang-name-of-function))
-		      (arity (erlang-get-function-arity))
-		      (found (erlang-beginning-of-clause -1)))
-		  (while (and found
-			      (string-equal name (erlang-name-of-function))
-			      arity
-			      (equal arity
-				     (erlang-get-function-arity)))
-		    (setq found (erlang-beginning-of-clause -1)))
-		  found))
-      (setq arg (1+ arg)))))
-  (zerop arg))
-
-
-(defun erlang-end-of-function (&optional arg)
-  "Move forward to next end of function.
-
-With argument, do this that many times.
-With negative argument go towards the beginning of the buffer."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (let ((first t))
-    ;; Forward
-    (while (and (> arg 0) (< (point) (point-max)))
-      (let ((pos (point)))
-	(while (progn
-		 (if (and first
-			  (progn
-			    (forward-char 1)
-			    (erlang-beginning-of-clause 1)))
-		     nil
-		   (or (bobp) (forward-char -1))
-		   (erlang-beginning-of-clause -1))
-		 (setq first nil)
-		 (erlang-pass-over-function)
-		 (skip-chars-forward " \t")
-		 (if (looking-at "[%\n]")
-		     (forward-line 1))
-		 (<= (point) pos))))
-      (setq arg (1- arg)))
-    ;; Backward
-    (while (< arg 0)
-      (let ((pos (point)))
-	(erlang-beginning-of-clause 1)
-	(erlang-pass-over-function)
-	(forward-line 1)
-	(if (>= (point) pos)
-	    (if (erlang-beginning-of-function 2)
-		(progn
-		  (erlang-pass-over-function)
-		  (skip-chars-forward " \t")
-		  (if (looking-at "[%\n]")
-		      (forward-line 1)))
-	      (goto-char (point-min)))))
-      (setq arg (1+ arg)))))
-
-(eval-and-compile
-  (if (default-boundp 'beginning-of-defun-function)
-      (defalias 'erlang-mark-function 'mark-defun)
-    (defun erlang-mark-function ()
-      "Put mark at end of function, point at beginning."
-      (interactive)
-      (push-mark (point))
-      (erlang-end-of-function 1)
-      ;; Sets the region. In Emacs 19 and XEmacs, we want to activate
-      ;; the region.
-      (condition-case nil
-	  (push-mark (point) nil t)
-	(error (push-mark (point))))
-      (erlang-beginning-of-function 1)
-      ;; The above function deactivates the mark.
-      (if (boundp 'deactivate-mark)
-	  (funcall (symbol-function 'set) 'deactivate-mark nil)))))
-
-(defun erlang-pass-over-function ()
-  (while (progn
-	   (erlang-skip-blank)
-	   (and (not (looking-at "\\.\\(\\s \\|\n\\|\\s<\\)"))
-		(not (eobp))))
-    (forward-sexp 1))
-  (if (not (eobp))
-      (forward-char 1)))
-
-(defun erlang-name-of-function ()
-  (save-excursion
-    ;; Skip over attribute leader.
-    (if (looking-at "-[ \t]*")
-	(re-search-forward "-[ \t]*" nil 'move))
-    (let ((start (point)))
-      (forward-sexp 1)
-      (buffer-substring start (point)))))
-
-
-;;; Miscellaneous
-
-(defun erlang-fill-paragraph (&optional justify)
-  "Like \\[fill-paragraph], but handle Erlang comments.
-If any of the current line is a comment, fill the comment or the
-paragraph of it that point is in, preserving the comment's indentation
-and initial `%':s."
-  (interactive "P")
-  (let ((has-comment nil)
-	;; If has-comment, the appropriate fill-prefix for the comment.
-	comment-fill-prefix)
-    ;; Figure out what kind of comment we are looking at.
-    (save-excursion
-      (beginning-of-line)
-      (cond
-       ;; Find the command prefix.
-       ((looking-at (concat "\\s *" comment-start-skip))
-	(setq has-comment t)
-	(setq comment-fill-prefix (buffer-substring (match-beginning 0)
-						    (match-end 0))))
-       ;; A line with some code, followed by a comment?  Remember that the
-       ;; % which starts the comment shouldn't be part of a string or
-       ;; character.
-       ((progn
-	  (while (not (looking-at "%\\|$"))
-	    (skip-chars-forward "^%\n\"\\\\")
-	    (cond
-	     ((eq (char-after (point)) ?\\) (forward-char 2))
-	     ((eq (char-after (point)) ?\") (forward-sexp 1))))
-	  (looking-at comment-start-skip))
-	(setq has-comment t)
-	(setq comment-fill-prefix
-	      (concat (make-string (current-column) ? )
-		      (buffer-substring (match-beginning 0) (match-end 0)))))))
-    (if (not has-comment)
-	(fill-paragraph justify)
-      ;; Narrow to include only the comment, and then fill the region.
-      (save-restriction
-	(narrow-to-region
-	 ;; Find the first line we should include in the region to fill.
-	 (save-excursion
-	   (while (and (zerop (forward-line -1))
-		       (looking-at "^\\s *%")))
-	   ;; We may have gone to far.  Go forward again.
-	   (or (looking-at "^\\s *%")
-	       (forward-line 1))
-	   (point))
-	 ;; Find the beginning of the first line past the region to fill.
-	 (save-excursion
-	   (while (progn (forward-line 1)
-			 (looking-at "^\\s *%")))
-	   (point)))
-	;; Lines with only % on them can be paragraph boundaries.
-	(let ((paragraph-start (concat paragraph-start "\\|^[ \t%]*$"))
-	      (paragraph-separate (concat paragraph-start "\\|^[ \t%]*$"))
-	      (fill-prefix comment-fill-prefix))
-	  (fill-paragraph justify))))))
-
-
-(defun erlang-uncomment-region (beg end)
-  "Uncomment all commented lines in the region."
-  (interactive "r")
-  (uncomment-region beg end))
-
-
-(defun erlang-generate-new-clause ()
-  "Create additional Erlang clause header.
-
-Parses the source file for the name of the current Erlang function.
-Create the header containing the name, A pair of parentheses,
-and an arrow. The space between the function name and the
-first parenthesis is preserved.  The point is placed between
-the parentheses."
-  (interactive)
-  (let ((name (save-excursion
-		(and (erlang-beginning-of-clause)
-		     (erlang-get-function-name t))))
-	(arrow (save-excursion
-		 (and (erlang-beginning-of-clause)
-		      (erlang-get-function-arrow)))))
-    (if (or (null arrow) (null name))
-	(error "Can't find name of current Erlang function"))
-    (if (and (bolp) (eolp))
-	nil
-      (end-of-line)
-      (newline))
-    (insert name)
-    (save-excursion
-      (insert ") " arrow))
-    (if erlang-new-clause-with-arguments
-	(erlang-clone-arguments))))
-
-
-(defun erlang-clone-arguments ()
-  "Insert, at the point, the argument list of the previous clause.
-
-The mark is set at the beginning of the inserted text, the point
-at the end."
-  (interactive)
-  (let ((args (save-excursion
-		(beginning-of-line)
-		(and (erlang-beginning-of-clause)
-		     (erlang-get-function-arguments))))
-	(p (point)))
-    (if (null args)
-	(error "Can't clone argument list"))
-    (insert args)
-    (set-mark p)))
-
-;;; Information retrieval functions.
-
-(defun erlang-buffer-substring (beg end)
-  "Like `buffer-substring-no-properties'.
-Although, this function works on all versions of Emacs."
-  (if (fboundp 'buffer-substring-no-properties)
-      (funcall (symbol-function 'buffer-substring-no-properties) beg end)
-    (buffer-substring beg end)))
-
-
-(defun erlang-get-module ()
-  "Return the name of the module as specified by `-module'.
-
-Return nil if file contains no `-module' attribute."
-  (save-excursion
-    (save-restriction
-      (widen)
-      (goto-char (point-min))
-      (let ((md (match-data)))
-	(unwind-protect
-	    (if (re-search-forward
-		 (eval-when-compile
-		   (concat "^-module\\s *(\\s *\\(\\("
-			   erlang-atom-regexp
-			   "\\)?\\)\\s *)\\s *\\."))
-		 (point-max) t)
-		(erlang-remove-quotes
-		 (erlang-buffer-substring (match-beginning 1)
-					  (match-end 1)))
-	      nil)
-	  (store-match-data md))))))
-
-
-(defun erlang-get-module-from-file-name (&optional file)
-  "Extract the module name from a file name.
-
-First, the directory part is removed.  Second, the part of the file name
-matching `erlang-file-name-extension-regexp' is removed.
-
-Should the match fail, nil is returned.
-
-By modifying `erlang-file-name-extension-regexp' to match files other
-than Erlang source files, Erlang specific functions could be applied on
-non-Erlang files.  Most notably; the support for Erlang modules in the
-tags system could be used by files written in other languages."
-  (or file (setq file buffer-file-name))
-  (if (null file)
-      nil
-    (setq file (file-name-nondirectory file))
-    (if (string-match erlang-file-name-extension-regexp file)
-	(substring file 0 (match-beginning 0))
-      nil)))
-
-
-;; Used by `erlang-get-export' and `erlang-get-import'.
-
-(defun erlang-get-function-arity-list ()
-  "Parse list of `function/arity' as used by `-import' and `-export'.
-
-Point must be before the opening bracket.  When the
-function returns the point will be placed after the closing bracket.
-
-The function does not return an error if the list is incorrectly
-formatted.
-
-Return list of (function . arity).  The order of the returned list
-corresponds to the order of the parsed Erlang list."
-  (let ((res '()))
-    (erlang-skip-blank)
-    (forward-char 1)
-    (if (not (eq (preceding-char) ?\[))
-	'()				; Not looking at an Erlang list.
-      (while				; Note: `while' has no body.
-	  (progn
-	    (erlang-skip-blank)
-	    (and (looking-at (eval-when-compile
-			       (concat erlang-atom-regexp "/\\([0-9]+\\)\\>")))
-		 (progn
-		   (setq res (cons
-			      (cons
-			       (erlang-remove-quotes
-				(erlang-buffer-substring
-				 (match-beginning 1) (match-end 1)))
-			       (erlang-string-to-int
-				(erlang-buffer-substring
-				 (match-beginning
-				  (+ 1 erlang-atom-regexp-matches))
-				 (match-end
-				  (+ 1 erlang-atom-regexp-matches)))))
-			      res))
-		   (goto-char (match-end 0))
-		   (erlang-skip-blank)
-		   (forward-char 1)
-		   ;; Test if there are more exported functions.
-		   (eq (preceding-char) ?,))))))
-    (nreverse res)))
-
-
-;;;  Note that `-export' and the open parenthesis must be written on
-;;;  the same line.
-
-(defun erlang-get-export ()
-  "Return a list of `(function . arity)' as specified by `-export'."
-  (save-excursion
-    (goto-char (point-min))
-    (let ((md (match-data))
-	  (res '()))
-      (unwind-protect
-	  (progn
-	    (while (re-search-forward "^-export\\s *(" (point-max) t)
-	      (erlang-skip-blank)
-	      (setq res (nconc res (erlang-get-function-arity-list))))
-	    res)
-	(store-match-data md)))))
-
-
-(defun erlang-get-import ()
-  "Parse an Erlang source file for imported functions.
-
-Return an alist with module name as car part and list of conses containing
-function and arity as cdr part."
-  (save-excursion
-    (goto-char (point-min))
-    (let ((md (match-data))
-	  (res '()))
-      (unwind-protect
-	  (progn
-	    (while (re-search-forward "^-import\\s *(" (point-max) t)
-	      (erlang-skip-blank)
-	      (if (looking-at erlang-atom-regexp)
-		  (let ((module (erlang-remove-quotes
-				 (erlang-buffer-substring
-				  (match-beginning 0)
-				  (match-end 0)))))
-		    (goto-char (match-end 0))
-		    (erlang-skip-blank)
-		    (if (eq (following-char) ?,)
-			(progn
-			  (forward-char 1)
-			  (erlang-skip-blank)
-			  (let ((funcs (erlang-get-function-arity-list))
-				(pair (assoc module res)))
-			    (if pair
-				(setcdr pair (nconc (cdr pair) funcs))
-			      (setq res (cons (cons module funcs)
-					      res)))))))))
-	    (nreverse res))
-	(store-match-data md)))))
-
-
-(defun erlang-get-function-name (&optional arg)
-  "Return name of current function, or nil.
-
-If optional argument is non-nil, everything up to and including
-the first `(' is returned.
-
-Normally used in conjunction with `erlang-beginning-of-clause', e.g.:
-              (save-excursion
-                (if (not (eobp)) (forward-char 1))
-		(and (erlang-beginning-of-clause)
-		     (erlang-get-function-name t)))"
-  (let ((n (if arg 0 1)))
-    (and (looking-at (eval-when-compile
-		       (concat "^" erlang-atom-regexp "\\s *(")))
-	 (erlang-buffer-substring (match-beginning n) (match-end n)))))
-
-
-(defun erlang-get-function-arrow ()
-  "Return arrow of current function, could be \"->\" or nil.
-
-Normally used in conjunction with `erlang-beginning-of-clause', e.g.:
-              (save-excursion
-                (if (not (eobp)) (forward-char 1))
-		(and (erlang-beginning-of-clause)
-		     (erlang-get-function-arrow)))"
-  (and 
-   (save-excursion
-     (re-search-forward "->" (point-max) t)
-     (erlang-buffer-substring (- (point) 2) (+ (point) 1)))))
-
-(defun erlang-get-function-arity ()
-  "Return the number of arguments of function at point, or nil."
-  (and (looking-at (eval-when-compile
-		     (concat "^" erlang-atom-regexp "\\s *(")))
-       (save-excursion
-	 (goto-char (match-end 0))
-	 (condition-case nil
-	     (let ((res 0)
-		   (cont t))
-	       (while cont
-		 (cond ((eobp)
-			(setq res nil)
-			(setq cont nil))
-		       ((looking-at "\\s *)")
-			(setq cont nil))
-		       ((looking-at "\\s *\\($\\|%\\)")
-			(forward-line 1))
-		       ((looking-at "\\s *<<[^>]*?>>")
-			(when (zerop res)
-			  (setq res (+ 1 res)))
-			(goto-char (match-end 0)))
-		       ((looking-at "\\s *,")
-			(setq res (+ 1 res))
-			(goto-char (match-end 0)))
-		       (t
-			(when (zerop res)
-			  (setq res (+ 1 res)))
-			(forward-sexp 1))))
-	       res)
-	   (error nil)))))
-
-(defun erlang-get-function-name-and-arity ()
-  "Return the name and arity of the function at point, or nil.
-The return value is a string of the form \"foo/1\"."
-  (let ((name (erlang-get-function-name))
-        (arity (erlang-get-function-arity)))
-    (and name arity (format "%s/%d" name arity))))
-
-(defun erlang-get-function-arguments ()
-  "Return arguments of current function, or nil."
-  (if (not (looking-at (eval-when-compile
-			 (concat "^" erlang-atom-regexp "\\s *("))))
-      nil
-    (save-excursion
-      (condition-case nil
-	  (let ((start (match-end 0)))
-	    (goto-char (- start 1))
-	    (forward-sexp)
-	    (erlang-buffer-substring start (- (point) 1)))
-	(error nil)))))
-
-
-(defun erlang-get-function-under-point ()
-  "Return the module and function under the point, or nil.
-
-Should no explicit module name be present at the point, the
-list of imported functions is searched.
-
-The following could be returned:
-   (\"module\"  \"function\")    -- Both module and function name found.
-   (nil       \"function\")    -- No module name was found.
-   nil                       -- No function name found
-
-In the future the list may contain more elements."
-  (save-excursion
-    (let ((md (match-data))
-	  (res nil))
-      (if (eq (char-syntax (following-char)) ? )
-	  (skip-chars-backward " \t"))
-      (skip-chars-backward "a-zA-Z0-9_:'")
-      (cond ((looking-at (eval-when-compile
-			   (concat erlang-atom-regexp ":" erlang-atom-regexp)))
-	     (setq res (list
-			(erlang-remove-quotes
-			 (erlang-buffer-substring
-			  (match-beginning 1) (match-end 1)))
-			(erlang-remove-quotes
-			 (erlang-buffer-substring
-			  (match-beginning (1+ erlang-atom-regexp-matches))
-			  (match-end (1+ erlang-atom-regexp-matches)))))))
-	    ((looking-at erlang-atom-regexp)
-	     (let ((fk (erlang-remove-quotes
-			(erlang-buffer-substring
-			 (match-beginning 0) (match-end 0))))
-		   (mod nil)
-		   (imports (erlang-get-import)))
-	       (while (and imports (null mod))
-		 (if (assoc fk (cdr (car imports)))
-		     (setq mod (car (car imports)))
-		   (setq imports (cdr imports))))
-	       (setq res (list mod fk)))))
-      (store-match-data md)
-      res)))
-
-
-;; TODO: Escape single quotes inside the string without
-;; replace-regexp-in-string.
-(defun erlang-add-quotes-if-needed (str)
-  "Return STR, possibly with quotes."
-  (let ((case-fold-search nil)) ; force string matching to be case sensitive
-    (if (and (stringp str)
-	     (not (string-match (eval-when-compile
-				  (concat "\\`" erlang-atom-regexp "\\'")) str)))
-	(progn (if (fboundp 'replace-regexp-in-string)
-		   (setq str (replace-regexp-in-string "'" "\\'" str t t )))
-	       (concat "'" str "'"))
-      str)))
-
-
-(defun erlang-remove-quotes (str)
-  "Return STR without quotes, if present."
-  (let ((md (match-data)))
-    (prog1
-	(if (string-match "\\`'\\(.*\\)'\\'" str)
-	    (substring str 1 -1)
-	  str)
-      (store-match-data md))))
-
-(defun erlang-match-next-exported-function (max)
-  "Returns non-nil if there is an exported function in the current
-buffer between point and MAX."
-  (block nil
-    (while (and (not erlang-inhibit-exported-function-name-face)
-                (erlang-match-next-function max))
-      (when (erlang-last-match-exported-p)
-        (return (match-data))))))
-
-(defun erlang-match-next-function (max)
-  "Searches forward in current buffer for the next erlang function,
-bounded by position MAX."
-  (re-search-forward erlang-defun-prompt-regexp max 'move-point))
-
-(defun erlang-last-match-exported-p ()
-  "Returns non-nil if match-data describes the name and arity of an
-exported function."
-  (save-excursion
-    (save-match-data
-      (goto-char (match-beginning 1))
-      (erlang-function-exported-p
-       (erlang-remove-quotes (erlang-get-function-name))
-       (erlang-get-function-arity)))))
-
-(defun erlang-function-exported-p (name arity)
-  "Returns non-nil if function of name and arity is exported in current buffer."
-  (save-excursion
-    (let* ((old-match-data (match-data))
-           (exports        (erlang-get-export)))
-      (store-match-data old-match-data)
-      (member (cons name arity) exports))))
-
-
-;;; Check module name
-
-;; The function `write-file', bound to C-x C-w, calls
-;; `set-visited-file-name' which clears the hook.  :-(
-;; To make sure that the hook always is present, we advise
-;; `set-visited-file-name'.
-(defun erlang-check-module-name-init ()
-  "Initialize the functionality to compare file and module names.
-
-Unless we have `before-save-hook', we redefine the function
-`set-visited-file-name' since it clears the variable
-`local-write-file-hooks'.  The original function definition is
-stored in `erlang-orig-set-visited-file-name'."
-  (if (boundp 'before-save-hook)
-      ;; If we have that, `make-local-hook' is obsolete.
-      (add-hook 'before-save-hook 'erlang-check-module-name nil t)
-    (require 'advice)
-    (unless (ad-advised-definition-p 'set-visited-file-name)
-      (defadvice set-visited-file-name (after erlang-set-visited-file-name
-					      activate)
-	(if (eq major-mode 'erlang-mode)
-	    (add-hook 'local-write-file-hooks 'erlang-check-module-name))))
-    (add-hook 'local-write-file-hooks 'erlang-check-module-name)))
-
-
-(defun erlang-check-module-name ()
-  "If the module name doesn't match file name, ask for permission to change.
-
-The variable `erlang-check-module-name' controls the behaviour of this
-function.  It it is nil, this function does nothing.  If it is t, the
-source is silently changed.  If it is set to the atom `ask', the user
-is prompted.
-
-This function is normally placed in the hook `local-write-file-hooks'."
-  (if erlang-check-module-name
-      (let ((mn (erlang-add-quotes-if-needed 
-		 (erlang-get-module)))
-	    (fn (erlang-add-quotes-if-needed 
-		 (erlang-get-module-from-file-name (buffer-file-name)))))
-	(if (and (stringp mn) (stringp fn))
-	    (or (string-equal mn fn)
-		(if (or (eq erlang-check-module-name t)
-			(y-or-n-p
-			 "Module does not match file name. Modify source? "))
-		    (save-excursion
-		      (save-restriction
-			(widen)
-			(goto-char (point-min))
-			(if (re-search-forward
-			     (eval-when-compile
-			       (concat "^-module\\s *(\\s *\\(\\("
-				       erlang-atom-regexp
-				       "\\)?\\)\\s *)\\s *\\."))
-			     (point-max) t)
-			    (progn
-			      (goto-char (match-beginning 1))
-			      (delete-region (match-beginning 1)
-					     (match-end 1))
-			      (insert fn))))))))))
-  ;; Must return nil since it is added to `local-write-file-hook'.
-  nil)
-
-
-;;; Electric functions.
-
-(defun erlang-electric-semicolon (&optional arg)
-  "Insert a semicolon character and possibly a prototype for the next line.
-
-The variable `erlang-electric-semicolon-criteria' states a criterion,
-when fulfilled a newline is inserted, the next line is indented and a
-prototype for the next line is inserted.  Normally the prototype
-consists of \" ->\".  Should the semicolon end the clause a new clause
-header is generated.
-
-The variable `erlang-electric-semicolon-insert-blank-lines' controls
-the number of blank lines inserted between the current line and new
-function header.
-
-Behaves just like the normal semicolon when supplied with a
-numerical arg, point is inside string or comment, or when there are
-non-whitespace characters following the point on the current line."
-  (interactive "P")
-  (self-insert-command (prefix-numeric-value arg))
-  (if (or arg
-	  (and (listp erlang-electric-commands)
-	       (not (memq 'erlang-electric-semicolon
-			  erlang-electric-commands)))
-	  (erlang-in-literal)
-	  (not (looking-at "\\s *\\(%.*\\)?$"))
-	  (null (erlang-test-criteria-list
-		 erlang-electric-semicolon-criteria)))
-      (setq erlang-electric-newline-inhibit nil)
-    (setq erlang-electric-newline-inhibit t)
-    (undo-boundary)
-    (erlang-indent-line)
-    (end-of-line)
-    (newline)
-    (if (condition-case nil
-	    (progn (erlang-indent-line) t)
-	  (error (if (bolp) (delete-backward-char 1))))
-	(if (not (bolp))
-	    (save-excursion
-	      (insert " ->"))
-	  (condition-case nil
-	      (progn
-		(erlang-generate-new-clause)
-		(if erlang-electric-semicolon-insert-blank-lines
-		    (save-excursion
-		      (beginning-of-line)
-		      (newline
-		       erlang-electric-semicolon-insert-blank-lines))))
-	    (error (if (bolp) (delete-backward-char 1))))))))
-
-
-(defun erlang-electric-comma (&optional arg)
-  "Insert a comma character and possibly a new indented line.
-The variable `erlang-electric-comma-criteria' states a criterion,
-when fulfilled a newline is inserted and the next line is indented.
-
-Behaves just like the normal comma when supplied with a
-numerical arg, point is inside string or comment, or when there are
-non-whitespace characters following the point on the current line."
-  (interactive "P")
-
-  (self-insert-command (prefix-numeric-value arg))
-
-  (if (or arg
-	  (and (listp erlang-electric-commands)
-	       (not (memq 'erlang-electric-comma erlang-electric-commands)))
-	  (erlang-in-literal)
-	  (not (looking-at "\\s *\\(%.*\\)?$"))
-	  (null (erlang-test-criteria-list
-		 erlang-electric-comma-criteria)))
-      (setq erlang-electric-newline-inhibit nil)
-    (setq erlang-electric-newline-inhibit t)
-    (undo-boundary)
-    (erlang-indent-line)
-    (end-of-line)
-    (newline)
-    (condition-case nil
-	(erlang-indent-line)
-      (error (if (bolp) (delete-backward-char 1))))))
-
-(defun erlang-electric-lt (&optional arg)
-  "Insert a less-than sign, and optionally mark it as an open paren."
-  
-  (interactive "p")
-
-  (self-insert-command arg)
-
-  ;; Was this the second char in bit-syntax open (`<<')?
-  (unless (<= (point) 2)
-    (save-excursion
-      (backward-char 2)
-      (when (and (eq (char-after (point)) ?<)
-		 (not (eq (get-text-property (point) 'category)
-			  'bitsyntax-open-inner)))
-	;; Then mark the two chars...
-	(put-text-property (point) (1+ (point)) 
-			   'category 'bitsyntax-open-outer)
-	(forward-char 1)
-	(put-text-property (point) (1+ (point))
-			   'category 'bitsyntax-open-inner)
-	;;...and unmark any subsequent less-than chars.
-	(forward-char 1)
-	(while (eq (char-after (point)) ?<)
-	  (remove-text-properties (point) (1+ (point))
-				  '(category nil))
-	  (forward-char 1))))))
-
-(defun erlang-after-bitsyntax-close ()
-  "Return t if point is immediately after a bit-syntax close parenthesis (`>>')."
-  (and (>= (point) 3)
-       (save-excursion
-	 (backward-char 2)
-	 (and (eq (char-after (point)) ?>)
-	      (not (eq (get-text-property (point) 'category)
-		       'bitsyntax-close-outer))))))
-	 
-(defun erlang-after-arrow ()
-  "Return true if point is immediately after a function arrow (`->')."
-  (and (>= (point) 2)
-       (and 
-	(save-excursion
-	  (backward-char)
-	  (eq (char-before (point)) ?-))
-	(or (not (listp erlang-electric-commands))
-	    (memq 'erlang-electric-gt
-		  erlang-electric-commands))
-	(not (erlang-in-literal))
-	(looking-at "\\s *\\(%.*\\)?$")
-	(erlang-test-criteria-list erlang-electric-arrow-criteria))))
-
-
-(defun erlang-electric-gt (&optional arg)
-  "Insert a greater-than sign, and optionally mark it as a close paren."
-  
-  (interactive "p")
-
-  (self-insert-command arg)
-
-  (cond
-   ;; Did we just write a bit-syntax close (`>>')?
-   ((erlang-after-bitsyntax-close)
-    (save-excursion
-      ;; Then mark the two chars...
-      (backward-char 2)
-      (put-text-property (point) (1+ (point)) 
-			 'category 'bitsyntax-close-inner)
-      (forward-char)
-      (put-text-property (point) (1+ (point))
-			 'category 'bitsyntax-close-outer)
-      ;;...and unmark any subsequent greater-than chars.
-      (forward-char)
-      (while (eq (char-after (point)) ?>)
-	(remove-text-properties (point) (1+ (point))
-				'(category nil))
-	(forward-char))))
-
-   ;; Did we just write a function arrow (`->')?
-   ((erlang-after-arrow)
-    (let ((erlang-electric-newline-inhibit t))
-      (undo-boundary)
-      (end-of-line)
-      (newline)
-      (condition-case nil
-	  (erlang-indent-line)
-	(error (if (bolp) (delete-backward-char 1))))))
-
-   ;; Then it's just a plain greater-than.
-   (t
-    nil)))
-    
-
-(defun erlang-electric-arrow\ off (&optional arg)
-  "Insert a '>'-sign and possibly a new indented line.
-
-This command is only `electric' when the `>' is part of an `->' arrow.
-The variable `erlang-electric-arrow-criteria' states a sequence of
-criteria, which decides when a newline should be inserted and the next
-line indented.
-
-It behaves just like the normal greater than sign when supplied with a
-numerical arg, point is inside string or comment, or when there are
-non-whitespace characters following the point on the current line.
-
-After being split/merged into `erlang-after-arrow' and
-`erlang-electric-gt', it is now unused and disabled."
-  (interactive "P")
-  (let ((prec (preceding-char)))
-    (self-insert-command (prefix-numeric-value arg))
-    (if (or arg
-	    (and (listp erlang-electric-commands)
-		 (not (memq 'erlang-electric-arrow
-			    erlang-electric-commands)))
-	    (not (eq prec ?-))
-	    (erlang-in-literal)
-	    (not (looking-at "\\s *\\(%.*\\)?$"))
-	    (null (erlang-test-criteria-list
-		   erlang-electric-arrow-criteria)))
-	(setq erlang-electric-newline-inhibit nil)
-      (setq erlang-electric-newline-inhibit t)
-      (undo-boundary)
-      (end-of-line)
-      (newline)
-      (condition-case nil
-	  (erlang-indent-line)
-	(error (if (bolp) (delete-backward-char 1)))))))
-
-
-(defun erlang-electric-newline (&optional arg)
-  "Break line at point and indent, continuing comment if within one.
-The variable `erlang-electric-newline-criteria' states a criterion,
-when fulfilled a newline is inserted and the next line is indented.
-
-Should the current line begin with a comment, and the variable
-`comment-multi-line' be non-nil, a new comment start is inserted.
-
-Should the previous command be another electric command we assume that
-the user pressed newline out of old habit, hence we will do nothing."
-  (interactive "P")
-  (cond ((and (not arg)
-	      erlang-electric-newline-inhibit
-	      (memq last-command erlang-electric-newline-inhibit-list))
-	 ())				; Do nothing!
-	((or arg
-	     (and (listp erlang-electric-commands)
-		  (not (memq 'erlang-electric-newline
-			     erlang-electric-commands)))
-	     (null (erlang-test-criteria-list
-		    erlang-electric-newline-criteria)))
-	 (newline (prefix-numeric-value arg)))
-	(t
-	 (if (and comment-multi-line
-		  (save-excursion
-		    (beginning-of-line)
-		    (looking-at (concat "\\s *" comment-start-skip))))
-	     (let ((str (buffer-substring
-			 (or (match-end 1) (match-beginning 0))
-			 (min (match-end 0) (point)))))
-	       (newline)
-	       (undo-boundary)
-	       (insert str))
-	   (newline)
-	   (undo-boundary)
-	   (indent-according-to-mode)))))
-
-
-(defun erlang-test-criteria-list (criteria)
-  "Given a list of criterion functions, test if criteria are fulfilled.
-
-Each element in the criteria list can a function returning nil, t or
-the atom `stop'.  t means that the criterion is fulfilled, `stop' means
-that it isn't fulfilled and that the search should stop,
-and nil means continue searching.
-
-Should the list contain the atom t the criterion is assumed to be
-fulfilled, unless preceded by a function returning `stop', of course.
-
-Should the argument be the atom t instead of a list, the criterion is
-assumed to be trivially true.
-
-Should all functions return nil, the criteria are assumed not to be
-fulfilled.
-
-Return t if criteria fulfilled, nil otherwise."
-  (if (eq criteria t)
-      t
-    (save-excursion
-      (let ((answer nil))
-	(while (and criteria (null answer))
-	  (if (eq (car criteria) t)
-	      (setq answer t)
-	    (setq answer (funcall (car criteria))))
-	  (setq criteria (cdr criteria)))
-	(if (and answer (not (eq answer 'stop)))
-	    t
-	  nil)))))
-
-
-(defun erlang-in-literal (&optional lim)
-  "Test if point is in string, quoted atom or comment.
-
-Return one of the three atoms `atom', `string', and `comment'.
-Should the point be inside none of the above mentioned types of
-context, nil is returned."
-  (save-excursion
-    (let* ((lim (or lim (save-excursion
-			  (erlang-beginning-of-clause)
-			  (point))))
-	   (state (if (fboundp 'syntax-ppss) ; post Emacs 21.3
-		      (funcall (symbol-function 'syntax-ppss))
-		    (parse-partial-sexp lim (point)))))
-      (cond
-       ((eq (nth 3 state) ?') 'atom)
-       ((nth 3 state) 'string)
-       ((nth 4 state) 'comment)
-       (t nil)))))
-
-
-(defun erlang-at-end-of-function-p ()
-  "Test if point is at end of an Erlang function.
-
-This function is designed to be a member of a criteria list."
-  (eq (save-excursion (erlang-skip-blank) (point))
-      (save-excursion
-	(erlang-beginning-of-function -1) (point))))
-
-
-(defun erlang-at-end-of-clause-p ()
-  "Test if point is at end of an Erlang clause.
-
-This function is designed to be a member of a criteria list."
-  (eq (save-excursion (erlang-skip-blank) (point))
-      (save-excursion
-	(erlang-beginning-of-clause -1) (point))))
-
-
-(defun erlang-stop-when-inside-argument-list ()
-  "Return `stop' if inside parenthesis list, nil otherwise.
-
-Knows about the list comprehension syntax.  When the point is
-after `||', `stop' is not returned.
-
-This function is designed to be a member of a criteria list."
-  (save-excursion
-    (condition-case nil
-	(let ((orig-point (point))
-	      (state nil))
-	  (up-list -1)
-	  (if (not (eq (following-char) ?\[))
-	      'stop
-	    ;; Do not return `stop' when inside a list comprehension
-	    ;; construction.  (The point must be after `||').
-	    (while (< (point) orig-point)
-              (let ((pt (point)))
-                (setq state (erlang-partial-parse pt orig-point state))
-                (if (= pt (point))
-                    (error "Illegal syntax"))))
-	    (if (and (car state) (eq (car (car (car state))) '||))
-		nil
-	      'stop)))
-      (error 
-       nil))))
-
-
-(defun erlang-stop-when-at-guard ()
-  "Return `stop' when at function guards.
-
-This function is designed to be a member of a criteria list."
-  (save-excursion
-    (beginning-of-line)
-    (if (and (looking-at (eval-when-compile
-			   (concat "^" erlang-atom-regexp "\\s *(")))
-	     (not (looking-at
-		   (eval-when-compile
-		     (concat "^" erlang-atom-regexp ".*->")))))
-	'stop
-      nil)))
-
-
-(defun erlang-stop-when-in-type-spec ()
-  "Return `stop' when in a type spec line.
-
-This function is designed to be a member of a criteria list."
-  (save-excursion
-    (beginning-of-line)
-    (when (save-match-data (looking-at "-\\(spec\\|type\\)"))
-      'stop)))
-
-
-(defun erlang-next-lines-empty-p ()
-  "Return non-nil if next lines are empty.
-
-The variable `erlang-next-lines-empty-threshold' contains the number
-of lines required to be empty.
-
-A line containing only spaces and tabs is considered empty.
-
-This function is designed to be a member of a criteria list."
-  (and erlang-next-lines-empty-threshold
-       (save-excursion
-	 (let ((left erlang-next-lines-empty-threshold)
-	       (cont t))
-	   (while (and cont (> left 0))
-	     (forward-line 1)
-	     (setq cont (looking-at "\\s *$"))
-	     (setq left (- left 1)))
-	   cont))))
-
-
-(defun erlang-at-keyword-end-p ()
-  "Test if next readable token is the keyword end.
-
-This function is designed to be a member of a criteria list."
-  (save-excursion
-    (erlang-skip-blank)
-    (looking-at "end[^_a-zA-Z0-9]")))
-
-
-;; Erlang tags support which is aware of erlang modules.
-;;
-;; Not yet implemented under XEmacs.  (Hint:  The Emacs 19 etags
-;; package works under XEmacs.)
-
-(eval-when-compile
-  (if (or (featurep 'bytecomp)
-	  (featurep 'byte-compile))
-      (progn
-	(require 'etags))))
-
-
-;; Variables:
-
-(defvar erlang-tags-function-alist
-  '((find-tag                 . erlang-find-tag)
-    (find-tag-other-window    . erlang-find-tag-other-window)
-    (find-tag-regexp          . erlang-find-tag-regexp)
-    (find-tag-other-frame     . erlang-find-tag-other-frame))
-  "Alist of old tags commands and the replacement functions.")
-
-(defvar erlang-tags-installed nil
-  "Non-nil when the Erlang tags system is installed.")
-(defvar erlang-tags-file-list '()
-  "List of files in tag list. Used when finding tag on form `module:'.")
-(defvar erlang-tags-completion-table nil
-  "Like `tags-completion-table', this table contains `tag' and `module:tag'.")
-(defvar erlang-tags-buffer-installed-p nil
-  "Non-nil when Erlang module recognising functions installed.")
-(defvar erlang-tags-buffer-list '()
-  "Temporary list of buffers.")
-(defvar erlang-tags-orig-completion-table nil
-  "Temporary storage for `tags-completion-table'.")
-(defvar erlang-tags-orig-tag-order nil
-  "Temporary storage for `find-tag-tag-order'.")
-(defvar erlang-tags-orig-regexp-tag-order nil
-  "Temporary storage for `find-tag-regexp-tag-order'.")
-(defvar erlang-tags-orig-search-function nil
-  "Temporary storage for `find-tag-search-function'.")
-(defvar erlang-tags-orig-regexp-search-function nil
-  "Temporary storage for `find-tag-regexp-search-function'.")
-(defvar erlang-tags-orig-format-hooks nil
-  "Temporary storage for `tags-table-format-hooks'.") ;v19
-(defvar erlang-tags-orig-format-functions nil
-  "Temporary storage for `tags-table-format-functions'.") ;v > 19
-
-(defun erlang-tags-init ()
-  "Install an alternate version of tags, aware of Erlang modules.
-
-After calling this function, the tags functions are aware of
-Erlang modules.  Tags can be entered on the for `module:tag' as well
-as on the old form `tag'.
-
-In the completion list, `module:tag' and `module:' shows up.
-
-Call this function from an appropriate init file, or add it to
-Erlang mode hook with the commands:
-    (add-hook 'erlang-mode-hook 'erlang-tags-init)
-    (add-hook 'erlang-shell-mode-hook 'erlang-tags-init)
-
-This function only works under Emacs 18 and Emacs 19.  Currently, It
-is not implemented under XEmacs.  (Hint: The Emacs 19 etags module
-works under XEmacs.)"
-  (interactive)
-  (cond ((= erlang-emacs-major-version 18)
-	 (require 'tags)
-	 (erlang-tags-define-keys (current-local-map))
-	 (setq erlang-tags-installed t))
-	(t
-	 (require 'etags)
-	 ;; Test on a function available in the Emacs 19 version
-	 ;; of tags but not in the XEmacs version.
-	 (if (not (fboundp 'find-tag-noselect))
-	     ()
-	   (erlang-tags-define-keys (current-local-map))
-	   (setq erlang-tags-installed t)))))
-
-
-;; Set all keys bound to `find-tag' et.al. in the global map and the
-;; menu to `erlang-find-tag' et.al. in `map'.
-;;
-;; The function `substitute-key-definition' does not work properly
-;; in all version of Emacs.
-
-(defun erlang-tags-define-keys (map)
-  "Bind tags commands to keymap MAP aware of Erlang modules."
-  (let ((alist erlang-tags-function-alist))
-    (while alist
-      (let* ((old (car (car alist)))
-	     (new (cdr (car alist)))
-	     (keys (append (where-is-internal old global-map))))
-	(while keys
-	  (define-key map (car keys) new)
-	  (setq keys (cdr keys))))
-      (setq alist (cdr alist))))
-  ;; Update the menu.
-  (erlang-menu-substitute erlang-menu-base-items erlang-tags-function-alist)
-  (erlang-menu-init))
-
-
-;; There exists a variable `find-tag-default-function'.  It is not used
-;; since `complete-tag' uses it to get current word under point.  In that
-;; situation we don't want the module to be prepended.
-
-(defun erlang-find-tag-default ()
-  "Return the default tag.
-Search `-import' list of imported functions.
-Single quotes are been stripped away."
-  (let ((mod-func (erlang-get-function-under-point)))
-    (cond ((null mod-func)
-	   nil)
-	  ((null (car mod-func))
-	   (nth 1 mod-func))
-	  (t
-	   (concat (car mod-func) ":" (nth 1 mod-func))))))
-
-
-;; Return `t' since it is used inside `tags-loop-form'.
-;;;###autoload
-(defun erlang-find-tag (modtagname &optional next-p regexp-p)
-  "Like `find-tag'.  Capable of retrieving Erlang modules.
-
-Tags can be given on the forms `tag', `module:', `module:tag'."
-  (interactive (erlang-tag-interactive "Find `module:tag' or `tag': "))
-  (switch-to-buffer (erlang-find-tag-noselect modtagname next-p regexp-p))
-  t)
-
-
-;; Code mainly from `find-tag-other-window' in `etags.el'.
-;;;###autoload
-(defun erlang-find-tag-other-window (tagname &optional next-p regexp-p)
-  "Like `find-tag-other-window' but aware of Erlang modules."
-  (interactive (erlang-tag-interactive
-		"Find `module:tag' or `tag' other window: "))
-
-  ;; This is to deal with the case where the tag is found in the
-  ;; selected window's buffer; without this, point is moved in both
-  ;; windows.  To prevent this, we save the selected window's point
-  ;; before doing find-tag-noselect, and restore it afterwards.
-  (let* ((window-point (window-point (selected-window)))
-	 (tagbuf (erlang-find-tag-noselect tagname next-p regexp-p))
-	 (tagpoint (progn (set-buffer tagbuf) (point))))
-    (set-window-point (prog1
-			  (selected-window)
-			(switch-to-buffer-other-window tagbuf)
-			;; We have to set this new window's point; it
-			;; might already have been displaying a
-			;; different portion of tagbuf, in which case
-			;; switch-to-buffer-other-window doesn't set
-			;; the window's point from the buffer.
-			(set-window-point (selected-window) tagpoint))
-		      window-point)))
-
-
-(defun erlang-find-tag-other-frame (tagname &optional next-p)
-  "Like `find-tag-other-frame' but aware of Erlang modules."
-  (interactive (erlang-tag-interactive
-		"Find `module:tag' or `tag' other frame: "))
-  (let ((pop-up-frames t))
-    (erlang-find-tag-other-window tagname next-p)))
-
-
-(defun erlang-find-tag-regexp (regexp &optional next-p other-window)
-  "Like `find-tag-regexp' but aware of Erlang modules."
-  (interactive (if (fboundp 'find-tag-regexp)
-		   (erlang-tag-interactive
-		    "Find `module:regexp' or `regexp': ")
-		 (error "This version of Emacs can't find tags by regexps")))
-  (funcall (if other-window
-	       'erlang-find-tag-other-window
-	     'erlang-find-tag)
-	   regexp next-p t))
-
-
-;; Just like C-u M-.  This could be added to the menu.
-(defun erlang-find-next-tag ()
-  "Find next tag, like \\[find-tag] with prefix arg."
-  (interactive)
-  (let ((current-prefix-arg '(4)))
-    (if erlang-tags-installed
-	(call-interactively 'erlang-find-tag)
-      (call-interactively 'find-tag))))
-
-
-;; Mimics `find-tag-noselect' found in `etags.el', but uses `find-tag' to
-;; be compatible with `tags.el'.
-;;
-;; Handles three cases:
-;; * `module:'  Loop over all possible file names.  Stop if a file-name
-;;              without extension and directory matches the module.
-;;
-;; * `module:tag'
-;;		Emacs 19: Replace test functions with functions aware of
-;;	        Erlang modules.  Tricky because the etags system wasn't
-;;		built for these kind of operations...
-;;
-;;              Emacs 18: We loop over `find-tag' until we find a file
-;;              whose module matches the requested module.  The
-;;              drawback is that a lot of files could be loaded into
-;;              Emacs.
-;;
-;; * `tag'      Just give it to `find-tag'.
-
-(defun erlang-find-tag-noselect (modtagname &optional next-p regexp-p)
-  "Like `find-tag-noselect' but aware of Erlang modules."
-  (interactive (erlang-tag-interactive "Find `module:tag' or `tag': "))
-  (or modtagname
-      (setq modtagname (symbol-value 'last-tag)))
-  (funcall (symbol-function 'set) 'last-tag modtagname)
-  ;; `tags.el' uses this variable to record how M-, would
-  ;; know where to restart a tags command.
-  (if (boundp 'tags-loop-form)
-      (funcall (symbol-function 'set)
-	       'tags-loop-form '(erlang-find-tag nil t)))
-  (save-window-excursion
-    (cond
-     ((string-match ":$" modtagname)
-      ;; Only the module name was given.  Read all files whose file name
-      ;; match.
-      (let ((modname (substring modtagname 0 (match-beginning 0)))
-	    (file nil))
-	(if (not next-p)
-	    (save-excursion
-	      (visit-tags-table-buffer)
-	      (setq erlang-tags-file-list
-		    (funcall (symbol-function 'tags-table-files)))))
-	(while (null file)
-	  (or erlang-tags-file-list
-	      (save-excursion
-		(if (and (featurep 'etags)
-			 (funcall
-			  (symbol-function 'visit-tags-table-buffer) 'same)
-			 (funcall
-			  (symbol-function 'visit-tags-table-buffer) t))
-		    (setq erlang-tags-file-list
-			  (funcall (symbol-function 'tags-table-files)))
-		  (error "No %stags containing %s" (if next-p "more " "")
-			 modtagname))))
-	  (if erlang-tags-file-list
-	      (let ((this-module (erlang-get-module-from-file-name
-				  (car erlang-tags-file-list))))
-		(if (and (stringp this-module)
-			 (string= modname this-module))
-		    (setq file (car erlang-tags-file-list)))
-		(setq erlang-tags-file-list (cdr erlang-tags-file-list)))))
-	(set-buffer (or (get-file-buffer file)
-			(find-file-noselect file)))))
-
-     ((string-match ":" modtagname)
-      (if (boundp 'find-tag-tag-order)
-	  ;; Method one: Add module-recognising functions to the
-	  ;; list of order functions.  However, the tags system
-	  ;; from Emacs 18, and derives thereof (read: XEmacs)
-	  ;; hasn't got this feature.
-	  (progn
-	    (erlang-tags-install-module-check)
-	    (unwind-protect
-		(funcall (symbol-function 'find-tag)
-			 modtagname next-p regexp-p)
-	      (erlang-tags-remove-module-check)))
-	;; Method two: Call the tags system until a file matching
-	;; the module is found.  This could result in that many
-	;; files are read. (e.g. The tag "foo:file" will take a
-	;; while to process.)
-	(let* ((modname (substring modtagname 0 (match-beginning 0)))
-	       (tagname (substring modtagname (match-end 0) nil))
-	       (last-tag tagname)
-	       file)
-	  (while
-	      (progn
-		(funcall (symbol-function 'find-tag) tagname next-p regexp-p)
-		(setq next-p t)
-		;; Determine the module form the file name.  (The
-		;; alternative, to check `-module', would make this
-		;; code useless for non-Erlang programs.)
-		(setq file (erlang-get-module-from-file-name buffer-file-name))
-		(not (and (stringp file)
-			  (string= modname file))))))))
-     (t
-      (funcall (symbol-function 'find-tag) modtagname next-p regexp-p)))
-    (current-buffer)))			; Return the new buffer.
-
-
-;; Process interactive arguments for erlang-find-tag-*.
-;;
-;; Negative arguments work only for `etags', not `tags'.  This is not
-;; a problem since negative arguments means step back into the
-;; history list, a feature not implemented in `tags'.
-
-(defun erlang-tag-interactive (prompt)
-  (condition-case nil
-      (require 'etags)
-    (error
-     (require 'tags)))
-  (if current-prefix-arg
-      (list nil (if (< (prefix-numeric-value current-prefix-arg) 0)
-		    '-
-		  t))
-    (let* ((default (erlang-find-tag-default))
-	   (prompt (if default
-		       (format "%s(default %s) " prompt default)
-		     prompt))
-	   (spec (if (featurep 'etags)
-		     (completing-read prompt 'erlang-tags-complete-tag)
-		   (read-string prompt))))
-      (list (if (equal spec "")
-		(or default (error "There is no default tag"))
-	      spec)))))
-
-
-;; Search tag functions which are aware of Erlang modules.  The tactic
-;; is to store new search functions into the local variables of the
-;; TAGS buffers.  The variables are restored directly after the
-;; search.  The situation is complicated by the fact that new TAGS
-;; files can be loaded during the search.
-;;
-
-(defun erlang-tags-install-module-check ()
-  "Install our own tag search functions."
-  ;; Make sure our functions are installed in TAGS files loaded
-  ;; into Emacs while searching.
-  (cond
-   ((>= erlang-emacs-major-version 20)
-    (setq erlang-tags-orig-format-functions
-          (symbol-value 'tags-table-format-functions))
-    (funcall (symbol-function 'set) 'tags-table-format-functions
-             (cons 'erlang-tags-recognize-tags-table
-                   erlang-tags-orig-format-functions))
-    (setq erlang-tags-buffer-list '())
-    )
-   (t
-    (setq erlang-tags-orig-format-hooks
-          (symbol-value 'tags-table-format-hooks))
-    (funcall (symbol-function 'set) 'tags-table-format-hooks
-	     (cons 'erlang-tags-recognize-tags-table
-		   erlang-tags-orig-format-hooks))
-    (setq erlang-tags-buffer-list '())
-   ))
-   
-  ;; Install our functions in the TAGS files already resident.
-  (save-excursion
-    (let ((files (symbol-value 'tags-table-computed-list)))
-      (while files
-	(if (stringp (car files))
-	    (if (get-file-buffer (car files))
-		(progn
-		  (set-buffer (get-file-buffer (car files)))
-		  (erlang-tags-install-local))))
-	(setq files (cdr files))))))
-
-
-(defun erlang-tags-install-local ()
-  "Install our tag search functions in current buffer."
-  (if erlang-tags-buffer-installed-p
-      ()
-    ;; Mark this buffer as "installed" and record.
-    (set (make-local-variable 'erlang-tags-buffer-installed-p) t)
-    (setq erlang-tags-buffer-list
-	  (cons (current-buffer) erlang-tags-buffer-list))
-
-    ;; Save the original values.
-    (set (make-local-variable 'erlang-tags-orig-tag-order)
-	 (symbol-value 'find-tag-tag-order))
-    (set (make-local-variable 'erlang-tags-orig-regexp-tag-order)
-	 (symbol-value 'find-tag-regexp-tag-order))
-    (set (make-local-variable 'erlang-tags-orig-search-function)
-	 (symbol-value 'find-tag-search-function))
-    (set (make-local-variable 'erlang-tags-orig-regexp-search-function)
-	 (symbol-value 'find-tag-regexp-search-function))
-
-    ;; Install our own functions.
-    (set (make-local-variable 'find-tag-search-function)
-	 'erlang-tags-search-forward)
-    (set (make-local-variable 'find-tag-regexp-search-function)
-	 'erlang-tags-regexp-search-forward)
-    (set (make-local-variable 'find-tag-tag-order)
-	 '(erlang-tag-match-module-p))
-    (set (make-local-variable 'find-tag-regexp-tag-order)
-	 '(erlang-tag-match-module-regexp-p))))
-
-
-(defun erlang-tags-remove-module-check ()
-  "Remove our own tags search functions."
-  (cond
-   ((>= erlang-emacs-major-version 20)
-    (funcall (symbol-function 'set)
-	     'tags-table-format-functions
-	     erlang-tags-orig-format-functions)
-    )
-   (t 
-    (funcall (symbol-function 'set)
-	     'tags-table-format-hooks
-	     erlang-tags-orig-format-hooks)
-    ))
-
-  ;; Remove our functions from the TAGS files.  (Note that
-  ;; `tags-table-computed-list' need not be the same list as when
-  ;; the search was started.)
-  (save-excursion
-    (let ((buffers erlang-tags-buffer-list))
-      (while buffers
-	(if (buffer-name (car buffers))
-	    (progn
-	      (set-buffer (car buffers))
-	      (erlang-tags-remove-local)))
-	(setq buffers (cdr buffers))))))
-
-
-(defun erlang-tags-remove-local ()
-  "Remove our tag search functions from current buffer."
-  (if (null erlang-tags-buffer-installed-p)
-      ()
-    (funcall (symbol-function 'set) 'erlang-tags-buffer-installed-p nil)
-    (funcall (symbol-function 'set)
-	     'find-tag-tag-order erlang-tags-orig-tag-order)
-    (funcall (symbol-function 'set)
-	     'find-tag-regexp-tag-order erlang-tags-orig-regexp-tag-order)
-    (funcall (symbol-function 'set)
-	     'find-tag-search-function erlang-tags-orig-search-function)
-    (funcall (symbol-function 'set)
-	     'find-tag-regexp-search-function
-	     erlang-tags-orig-regexp-search-function)))
-
-
-(defun erlang-tags-recognize-tags-table ()
-  "Install our functions in all loaded TAGS files.
-
-This function is added to `tags-table-format-hooks/functions' when searching
-for a tag on the form `module:tag'."
-  (if (null (funcall (symbol-function 'etags-recognize-tags-table)))
-      nil
-    (erlang-tags-install-local)
-    t))
-
-
-(defun erlang-tags-search-forward (tag &optional bound noerror count)
-  "Forward search function, aware of Erlang module prefix."
-  (if (string-match ":" tag)
-      (setq tag (substring tag (match-end 0) nil)))
-  ;; Avoid unintended recursion.
-  (if (eq erlang-tags-orig-search-function 'erlang-tags-search-forward)
-      (search-forward tag bound noerror count)
-    (funcall erlang-tags-orig-search-function tag bound noerror count)))
-
-
-(defun erlang-tags-regexp-search-forward (tag &optional bound noerror count)
-  "Forward regexp search function, aware of Erlang module prefix."
-  (if (string-match ":" tag)
-      (setq tag (substring tag (match-end 0) nil)))
-  (if (eq erlang-tags-orig-regexp-search-function
-	  'erlang-tags-regexp-search-forward)
-      (re-search-forward tag bound noerror count)
-    (funcall erlang-tags-orig-regexp-search-function
-	     tag bound noerror count)))
-
-
-;; t if point is at a tag line that matches TAG, containing
-;; module information.  Assumes that all other order functions
-;; are stored in `erlang-tags-orig-[regex]-tag-order'.
-
-(defun erlang-tag-match-module-p (tag)
-  (erlang-tag-match-module-common-p tag erlang-tags-orig-tag-order))
-
-(defun erlang-tag-match-module-regexp-p (tag)
-  (erlang-tag-match-module-common-p tag erlang-tags-orig-regexp-tag-order))
-
-(defun erlang-tag-match-module-common-p (tag order)
-  (let ((mod nil)
-	(found nil))
-    (if (string-match ":" tag)
-	(progn
-	  (setq mod (substring tag 0 (match-beginning 0)))
-	  (setq tag (substring tag (match-end 0) nil))))
-    (while (and order (not found))
-      (setq found
-	    (and (not (memq (car order)
-			    '(erlang-tag-match-module-p
-			      erlang-tag-match-module-regexp-p)))
-		 (funcall (car order) tag)))
-      (setq order (cdr order)))
-    (and found
-	 (or (null mod)
-	     (string= mod (erlang-get-module-from-file-name
-			   (file-of-tag)))))))
-
-
-;;; Tags completion, Emacs 19 `etags' specific.
-;;;
-;;; The basic idea is to create a second completion table `erlang-tags-
-;;; completion-table' containing all normal tags plus tags on the form
-;;; `module:tag'.
-
-
-(when (and (fboundp 'etags-tags-completion-table)
-           (fboundp 'tags-lazy-completion-table)) ; Emacs 23.1+
-  (if (fboundp 'advice-add)
-      ;; Emacs 24.4+
-      (advice-add 'etags-tags-completion-table :around
-                  (lambda (oldfun)
-                    (if (eq find-tag-default-function 'erlang-find-tag-for-completion)
-                        (erlang-etags-tags-completion-table)
-                      (funcall oldfun)))
-                  (list :name 'erlang-replace-tags-table))
-    ;; Emacs 23.1-24.3
-    (defadvice etags-tags-completion-table (around erlang-replace-tags-table activate)
-      (if (eq find-tag-default-function 'erlang-find-tag-for-completion)
-          (setq ad-return-value (erlang-etags-tags-completion-table))
-        ad-do-it))))
-
-
-(defun erlang-complete-tag ()
-  "Perform tags completion on the text around point.
-Completes to the set of names listed in the current tags table.
-
-Should the Erlang tags system be installed this command knows
-about Erlang modules."
-  (interactive)
-  (condition-case nil
-      (require 'etags)
-    (error nil))
-  (cond ((and erlang-tags-installed
-              (fboundp 'etags-tags-completion-table)
-              (fboundp 'tags-lazy-completion-table)) ; Emacs 23.1+
-         ;; This depends on the advice called erlang-replace-tags-table
-         ;; above.  It is not enough to let-bind
-         ;; tags-completion-table-function since that will not override
-         ;; the buffer-local value in the TAGS buffer.
-         (let ((find-tag-default-function 'erlang-find-tag-for-completion))
-           (complete-tag)))
-        ((and erlang-tags-installed
-	      (fboundp 'complete-tag)
-              (fboundp 'tags-complete-tag)) ; Emacs 19
-	 (let ((orig-tags-complete-tag (symbol-function 'tags-complete-tag)))
-	   (fset 'tags-complete-tag
-	     (symbol-function 'erlang-tags-complete-tag))
-	   (unwind-protect
-	       (funcall (symbol-function 'complete-tag))
-	     (fset 'tags-complete-tag orig-tags-complete-tag))))
-	((fboundp 'complete-tag)	; Emacs 19
-	 (funcall (symbol-function 'complete-tag)))
-	((fboundp 'tag-complete-symbol)	; XEmacs
-	 (funcall (symbol-function 'tag-complete-symbol)))
-	(t
-	 (error "This version of Emacs can't complete tags"))))
-
-
-(defun erlang-find-tag-for-completion ()
-  (let ((start (save-excursion
-                 (skip-chars-backward "[:word:][:digit:]_:'")
-                 (point))))
-    (unless (eq start (point))
-      (buffer-substring-no-properties start (point)))))
-
-
-
-;; Based on `tags-complete-tag', but this one uses
-;; `erlang-tags-completion-table' instead of `tags-completion-table'.
-;;
-;; This is the entry-point called by system function `completing-read'.
-(defun erlang-tags-complete-tag (string predicate what)
-  (save-excursion
-    ;; If we need to ask for the tag table, allow that.
-    (let ((enable-recursive-minibuffers t))
-      (visit-tags-table-buffer))
-    (if (eq what t)
-	(all-completions string (erlang-tags-completion-table) predicate)
-      (try-completion string (erlang-tags-completion-table) predicate))))
-
-
-;; `tags-completion-table' calls itself recursively, make it
-;; call our own wedge instead.  Note that the recursive call
-;; is very rare;  it only occurs when a tags-file contains
-;; `include'-statements.
-(defun erlang-tags-completion-table ()
-  "Build completion table.  Tags on the form `tag' or `module:tag'."
-  (setq erlang-tags-orig-completion-table
-	(symbol-function 'tags-completion-table))
-  (fset 'tags-completion-table
-	(symbol-function 'erlang-tags-completion-table-1))
-  (unwind-protect
-      (erlang-tags-completion-table-1)
-    (fset 'tags-completion-table
-	  erlang-tags-orig-completion-table)))
-
-
-(defun erlang-tags-completion-table-1 ()
-  (make-local-variable 'erlang-tags-completion-table)
-  (or erlang-tags-completion-table
-      (let ((tags-completion-table nil)
-	    (tags-completion-table-function
-	     'erlang-etags-tags-completion-table))
-	(funcall erlang-tags-orig-completion-table)
-	(setq erlang-tags-completion-table tags-completion-table))))
-
-
-;; Based on `etags-tags-completion-table'.  The difference is that we
-;; add three symbols to the vector, the tag, module: and module:tag.
-;; The module is extracted from the file name of a tag.  (This one
-;; only works if we are looking at an `etags' file. However, this is
-;; the only format supported by Emacs, so far.)
-(defun erlang-etags-tags-completion-table ()
-  (let ((table (make-vector 511 0))
-        (file nil)
-        (progress-reporter
-         (when (fboundp 'make-progress-reporter)
-           (make-progress-reporter
-            (format "Making erlang tags completion table for %s..." buffer-file-name)
-            (point-min) (point-max)))))
-    (save-excursion
-      (goto-char (point-min))
-      ;; This monster regexp matches an etags tag line.
-      ;;   \1 is the string to match;
-      ;;   \2 is not interesting;
-      ;;   \3 is the guessed tag name; XXX guess should be better eg DEFUN
-      ;;   \4 is not interesting;
-      ;;   \5 is the explicitly-specified tag name.
-      ;;   \6 is the line to start searching at;
-      ;;   \7 is the char to start searching at.
-      (while (progn
-               (while (and
-                       (eq (following-char) ?\f)
-                       (looking-at "\f\n\\([^,\n]*\\),.*\n"))
-                 (setq file (buffer-substring
-                             (match-beginning 1) (match-end 1)))
-                 (goto-char (match-end 0)))
-               (re-search-forward
-                "\
-^\\(\\([^\177]+[^-a-zA-Z0-9_$\177]+\\)?\\([-a-zA-Z0-9_$?:]+\\)\
-\[^-a-zA-Z0-9_$?:\177]*\\)\177\\(\\([^\n\001]+\\)\001\\)?\
-\\([0-9]+\\)?,\\([0-9]+\\)?\n"
-                nil t))
-        (let ((tag (if (match-beginning 5)
-                       ;; There is an explicit tag name.
-                       (buffer-substring (match-beginning 5) (match-end 5))
-                     ;; No explicit tag name.  Best guess.
-                     (buffer-substring (match-beginning 3) (match-end 3))))
-              (module (and file
-                           (erlang-get-module-from-file-name file))))
-          (intern tag table)
-          (when (stringp module)
-            (intern (concat module ":" tag) table)
-            ;; Only the first ones will be stored in the table.
-            (intern (concat module ":") table)
-            (intern (concat module ":module_info") table))
-          (when progress-reporter
-            (progress-reporter-update progress-reporter (point))))))
-    table))
-
-;;;
-;;; Prepare for other methods to run an Erlang slave process.
-;;;
-
-(defvar erlang-shell-function 'inferior-erlang
-  "Command to execute start a new Erlang shell.
-
-Change this variable to use your favorite
-Erlang compilation package.")
-
-(defvar erlang-shell-display-function 'inferior-erlang-run-or-select
-  "Command to execute to display Erlang shell.
-
-Change this variable to use your favorite
-Erlang compilation package.")
-
-(defvar erlang-compile-function 'inferior-erlang-compile
-  "Command to execute to compile current buffer.
-
-Change this variable to use your favorite
-Erlang compilation package.")
-
-(defvar erlang-compile-erlang-function "c"
-  "Erlang function to call to compile an erlang file.")
-
-(defvar erlang-compile-display-function 'inferior-erlang-run-or-select
-  "Command to execute to view last compilation.
-
-Change this variable to use your favorite
-Erlang compilation package.")
-
-(defvar erlang-next-error-function 'inferior-erlang-next-error
-  "Command to execute to go to the next error.
-
-Change this variable to use your favorite Erlang compilation
-package.  Not used in Emacs 21.")
-
-
-;;;###autoload
-(defun erlang-shell ()
-  "Start a new Erlang shell.
-
-The variable `erlang-shell-function' decides which method to use,
-default is to start a new Erlang host.  It is possible that, in the
-future, a new shell on an already running host will be started."
-  (interactive)
-  (call-interactively erlang-shell-function))
-
-
-;;;###autoload (autoload 'run-erlang "erlang" "Start a new Erlang shell." t)
-
-;; It is customary for Emacs packages to supply a function on this
-;; form, even though it violates the `erlang-*' name convention.
-(defalias 'run-erlang 'erlang-shell)
-
-
-(defun erlang-shell-display ()
-  "Display an Erlang shell, or start a new."
-  (interactive)
-  (call-interactively erlang-shell-display-function))
-
-
-;;;###autoload
-(defun erlang-compile ()
-  "Compile Erlang module in current buffer."
-  (interactive)
-  (call-interactively erlang-compile-function))
-
-
-(defun erlang-compile-display ()
-  "Display compilation output."
-  (interactive)
-  (call-interactively erlang-compile-display-function))
-
-
-(defun erlang-next-error ()
-  "Display next error message from the latest compilation."
-  (interactive)
-  (call-interactively erlang-next-error-function))
-
-
-
-;;;
-;;; Erlang Shell Mode -- Major mode used for Erlang shells.
-;;;
-
-;; This mode is designed to be implementation independent,
-;; e.g. it does not assume that we are running an inferior
-;; Erlang, there exists a lot of other possibilities.
-
-
-(defvar erlang-shell-buffer-name "*erlang*"
-  "The name of the Erlang link shell buffer.")
-
-(defvar erlang-shell-mode-map nil
-  "Keymap used by Erlang shells.")
-
-
-(defvar erlang-shell-mode-hook nil
-  "*User functions to run when an Erlang shell is started.
-
-This hook is used to change the behaviour of Erlang mode.  It is
-normally used by the user to personalise the programming environment.
-When used in a site init file, it could be used to customise Erlang
-mode for all users on the system.
-
-The function added to this hook is run every time a new Erlang
-shell is started.
-
-See also `erlang-load-hook', a hook which is run once, when Erlang
-mode is loaded, and `erlang-mode-hook' which is run every time a new
-Erlang source file is loaded into Emacs.")
-
-
-(defvar erlang-input-ring-file-name "~/.erlang_history"
-  "*When non-nil, file name used to store Erlang shell history information.")
-
-
-(defun erlang-shell-mode ()
-  "Major mode for interacting with an Erlang shell.
-
-We assume that we already are in Comint mode.
-
-The following special commands are available:
-\\{erlang-shell-mode-map}"
-  (interactive)
-  (setq major-mode 'erlang-shell-mode)
-  (setq mode-name "Erlang Shell")
-  (erlang-mode-variables)
-  (if erlang-shell-mode-map
-      nil
-    (setq erlang-shell-mode-map (copy-keymap comint-mode-map))
-    (erlang-shell-mode-commands erlang-shell-mode-map))
-  (use-local-map erlang-shell-mode-map)
-  (unless inferior-erlang-use-cmm
-    ;; This was originally not a marker, but it needs to be, at least
-    ;; in Emacs 21, and should be backwards-compatible.  Otherwise,
-    ;; would need to test whether compilation-parsing-end is a marker
-    ;; after requiring `compile'.
-    (set (make-local-variable 'compilation-parsing-end) (copy-marker 1))
-    (set (make-local-variable 'compilation-error-list) nil)
-    (set (make-local-variable 'compilation-old-error-list) nil))
-  ;; Needed when compiling directly from the Erlang shell.
-  (setq compilation-last-buffer (current-buffer))
-  (setq comint-prompt-regexp "^[^>=]*> *")
-  (setq comint-eol-on-send t)
-  (setq comint-input-ignoredups t)
-  (setq comint-scroll-show-maximum-output t)
-  (setq comint-scroll-to-bottom-on-output t)
-  ;; In Emacs 19.30, `add-hook' has got a `local' flag, use it.  If
-  ;; the call fails, just call the normal `add-hook'.
-  (condition-case nil
-      (progn
-        (add-hook 'comint-output-filter-functions
-		  'inferior-erlang-strip-delete nil t)
-        (add-hook 'comint-output-filter-functions
-		  'inferior-erlang-strip-ctrl-m nil t))
-    (error
-     (funcall (symbol-function 'make-local-hook)
-	      'comint-output-filter-functions) ; obsolete as of Emacs 21.1
-     (add-hook 'comint-output-filter-functions 'inferior-erlang-strip-delete)
-     (add-hook 'comint-output-filter-functions 'inferior-erlang-strip-ctrl-m)))
-  ;; Some older versions of comint don't have an input ring.
-  (if (fboundp 'comint-read-input-ring)
-      (progn
-	(setq comint-input-ring-file-name erlang-input-ring-file-name)
-	(comint-read-input-ring t)
-	(make-local-variable 'kill-buffer-hook)
-	(add-hook 'kill-buffer-hook 'comint-write-input-ring)))
-  ;; At least in Emacs 21, we need to be in `compilation-minor-mode'
-  ;; for `next-error' to work.  We can avoid it clobbering the shell
-  ;; keys thus.
-  (when inferior-erlang-use-cmm
-    (compilation-minor-mode 1)
-    (set (make-local-variable 'minor-mode-overriding-map-alist)
-	 `((compilation-minor-mode
-	    . ,(let ((map (make-sparse-keymap)))
-		 ;; It would be useful to put keymap properties on the
-		 ;; error lines so that we could use RET and mouse-2
-		 ;; on them directly.
-		 (when (boundp 'compilation-skip-threshold) ; new compile.el
-		   (define-key map [mouse-2] #'erlang-mouse-2-command)
-		   (define-key map "\C-m" #'erlang-RET-command))
-		 (if (boundp 'compilation-menu-map)
-		     (define-key map [menu-bar compilation]
-		       (cons "Errors" compilation-menu-map)))
-		 map)))))
-  (run-hooks 'erlang-shell-mode-hook))
-
-
-(defun erlang-mouse-2-command (event)
-  "Command bound to `mouse-2' in inferior Erlang buffer.
-Selects Comint or Compilation mode command as appropriate."
-  (interactive "e")
-  (if (save-window-excursion
-	(save-excursion
-	  (mouse-set-point event)
-	  (consp (get-text-property (line-beginning-position) 'message))))
-      (call-interactively (lookup-key compilation-mode-map [mouse-2]))
-    (call-interactively (lookup-key comint-mode-map [mouse-2]))))
-
-(defun erlang-RET-command ()
-  "Command bound to `RET' in inferior Erlang buffer.
-Selects Comint or Compilation mode command as appropriate."
-  (interactive)
-  (if (consp (get-text-property (line-beginning-position) 'message))
-      (call-interactively (lookup-key compilation-mode-map "\C-m"))
-    (call-interactively (lookup-key comint-mode-map "\C-m"))))
-
-(defun erlang-shell-mode-commands (map)
-  (define-key map "\M-\t"    'erlang-complete-tag)
-  (define-key map "\C-a"     'comint-bol) ; Normally the other way around.
-  (define-key map "\C-c\C-a" 'beginning-of-line)
-  (define-key map "\C-d"     nil)	; Was `comint-delchar-or-maybe-eof'
-  (define-key map "\M-\C-m"  'compile-goto-error)
-  (unless inferior-erlang-use-cmm
-    (define-key map "\C-x`"    'erlang-next-error)))
-
-;;;
-;;; Inferior Erlang -- Run an Erlang shell as a subprocess.
-;;;
-
-(defvar inferior-erlang-display-buffer-any-frame nil
-  "*When nil, `inferior-erlang-display-buffer' use only selected frame.
-When t, all frames are searched.  When 'raise, the frame is raised.")
-
-(defvar inferior-erlang-shell-type 'newshell
-  "The type of Erlang shell to use.
-
-When this variable is set to the atom `oldshell', the old shell is used.
-When set to `newshell' the new shell is used.  Should the variable be
-nil, the default shell is used.
-
-This variable influence the setting of other variables.")
-
-(defvar inferior-erlang-machine "erl"
-  "*The name of the Erlang shell.")
-
-(defvar inferior-erlang-machine-options '()
-  "*The options used when activating the Erlang shell.
-
-This must be a list of strings.")
-
-(defvar inferior-erlang-process-name "inferior-erlang"
-  "The name of the inferior Erlang process.")
-
-(defvar inferior-erlang-buffer-name erlang-shell-buffer-name
-  "The name of the inferior Erlang buffer.")
-
-(defvar inferior-erlang-prompt-timeout 60
-  "*Number of seconds before `inferior-erlang-wait-prompt' timeouts.
-
-The time specified is waited after every output made by the inferior
-Erlang shell.  When this variable is t, we assume that we always have
-a prompt.  When nil, we will wait forever, or until \\[keyboard-quit].")
-
-(defvar inferior-erlang-process nil
-  "Process of last invoked inferior Erlang, or nil.")
-
-(defvar inferior-erlang-buffer nil
-  "Buffer of last invoked inferior Erlang, or nil.")
-
-;; Enable uniquifying Erlang shell buffers based on directory name.
-(eval-after-load "uniquify"
-  '(add-to-list 'uniquify-list-buffers-directory-modes 'erlang-shell-mode))
-
-;;;###autoload
-(defun inferior-erlang (&optional command)
-  "Run an inferior Erlang.
-With prefix command, prompt for command to start Erlang with.
-
-This is just like running Erlang in a normal shell, except that
-an Emacs buffer is used for input and output.
-\\<comint-mode-map>
-The command line history can be accessed with  \\[comint-previous-input]  and  \\[comint-next-input].
-The history is saved between sessions.
-
-Entry to this mode calls the functions in the variables
-`comint-mode-hook' and `erlang-shell-mode-hook' with no arguments.
-
-The following commands imitate the usual Unix interrupt and
-editing control characters:
-\\{erlang-shell-mode-map}"
-  (interactive
-   (when current-prefix-arg
-     (list (if (fboundp 'read-shell-command)
-               ;; `read-shell-command' is a new function in Emacs 23.
-	       (read-shell-command "Erlang command: ")
-	     (read-string "Erlang command: ")))))
-  (require 'comint)
-  (let (cmd opts)
-    (if command
-        (setq cmd "sh"
-              opts (list "-c" command))
-      (setq cmd inferior-erlang-machine
-            opts inferior-erlang-machine-options)
-      (cond ((eq inferior-erlang-shell-type 'oldshell)
-             (setq opts (cons "-oldshell" opts)))
-            ((eq inferior-erlang-shell-type 'newshell)
-             (setq opts (append '("-newshell" "-env" "TERM" "vt100") opts)))))
-
-    ;; Using create-file-buffer and list-buffers-directory in this way
-    ;; makes uniquify give each buffer a unique name based on the
-    ;; directory.
-    (let ((fake-file-name (expand-file-name inferior-erlang-buffer-name default-directory)))
-      (setq inferior-erlang-buffer (create-file-buffer fake-file-name))
-      (apply 'make-comint-in-buffer
-             inferior-erlang-process-name
-             inferior-erlang-buffer
-             cmd
-             nil opts)
-      (with-current-buffer inferior-erlang-buffer
-        (setq list-buffers-directory fake-file-name))))
-
-  (setq inferior-erlang-process
-	(get-buffer-process inferior-erlang-buffer))
-  (if (> 21 erlang-emacs-major-version)	; funcalls to avoid compiler warnings
-      (funcall (symbol-function 'set-process-query-on-exit-flag) 
-	       inferior-erlang-process nil)
-    (funcall (symbol-function 'process-kill-without-query) inferior-erlang-process))
-  (if erlang-inferior-shell-split-window
-      (switch-to-buffer-other-window inferior-erlang-buffer)
-    (switch-to-buffer inferior-erlang-buffer)) 
-  (if (and (not (eq system-type 'windows-nt))
-	   (eq inferior-erlang-shell-type 'newshell))
-      (setq comint-process-echoes t))
-  (erlang-shell-mode))
-
-
-(defun inferior-erlang-run-or-select ()
-  "Switch to an inferior Erlang buffer, possibly starting new process."
-  (interactive)
-  (if (null (inferior-erlang-running-p))
-      (inferior-erlang)
-    (inferior-erlang-display-buffer t)))
-
-
-(defun inferior-erlang-display-buffer (&optional select)
-  "Make the inferior Erlang process visible.
-The window is returned.
-
-Should `inferior-erlang-display-buffer-any-frame' be nil the buffer is
-displayed in the current frame.  Should it be non-nil, and the buffer
-already is visible in any other frame, no new window will be created.
-Should it be the atom 'raise, the frame containing the window will
-be raised.
-
-Should the optional argument SELECT be non-nil, the window is
-selected.  Should the window be in another frame, that frame is raised.
-
-Note, should the mouse pointer be places outside the raised frame, that
-frame will become deselected before the next command."
-  (interactive)
-  (or (inferior-erlang-running-p)
-      (error "No inferior Erlang process is running"))
-  (let ((win (inferior-erlang-window
-	      inferior-erlang-display-buffer-any-frame))
-	(frames-p (fboundp 'selected-frame)))
-    (if (null win)
-	(let ((old-win (selected-window)))
-	  (save-excursion
-	    (switch-to-buffer-other-window inferior-erlang-buffer)
-	    (setq win (selected-window)))
-	  (select-window old-win))
-      (if (and window-system
-	       frames-p
-	       (or select
-		   (eq inferior-erlang-display-buffer-any-frame 'raise))
-	       (not (eq (selected-frame) (window-frame win))))
-	  (raise-frame (window-frame win))))
-    (if select
-	(select-window win))
-    (sit-for 0)
-    win))
-
-
-(defun inferior-erlang-running-p ()
-  "Non-nil when an inferior Erlang is running."
-  (and inferior-erlang-process
-       (memq (process-status inferior-erlang-process) '(run open))
-       inferior-erlang-buffer
-       (buffer-name inferior-erlang-buffer)))
-
-
-(defun inferior-erlang-window (&optional all-frames)
-  "Return the window containing the inferior Erlang, or nil."
-  (and (inferior-erlang-running-p)
-       (if (and all-frames (>= erlang-emacs-major-version 19))
-	   (get-buffer-window inferior-erlang-buffer t)
-	 (get-buffer-window inferior-erlang-buffer))))
-
-
-(defun inferior-erlang-wait-prompt ()
-  "Wait until the inferior Erlang shell prompt appears."
-  (if (eq inferior-erlang-prompt-timeout t)
-      ()
-    (or (inferior-erlang-running-p)
-	(error "No inferior Erlang shell is running"))
-    (save-excursion
-      (set-buffer inferior-erlang-buffer)
-      (let ((msg nil))
-	(while (save-excursion
-		 (goto-char (process-mark inferior-erlang-process))
-		 (forward-line 0)
-		 (not (looking-at comint-prompt-regexp)))
-	  (if msg
-	      ()
-	    (setq msg t)
-	    (message "Waiting for Erlang shell prompt (press C-g to abort)."))
-	  (or (accept-process-output inferior-erlang-process
-				     inferior-erlang-prompt-timeout)
-	      (error "No Erlang shell prompt before timeout")))
-	(if msg (message ""))))))
-
-(defun inferior-erlang-send-empty-cmd-unless-already-at-prompt ()
-  "If not already at a prompt, try to send an empty cmd to get a prompt.
-The empty command resembles hitting RET. This is useful in some
-situations, for instance if a crash or error report from sasl
-has been printed after the last prompt."
-  (save-excursion
-    (set-buffer inferior-erlang-buffer)
-    (if (> (point-max) 1)
-	;; make sure we get a prompt if buffer contains data
-	(if (save-excursion
-	      (goto-char (process-mark inferior-erlang-process))
-	      (forward-line 0)
-	      (not (looking-at comint-prompt-regexp)))
-	    (inferior-erlang-send-command "")))))
-
-(autoload 'comint-send-input "comint")
-
-(defun inferior-erlang-send-command (cmd &optional hist)
-  "Send command CMD to the inferior Erlang.
-
-The contents of the current command line (if any) will
-be placed at the next prompt.
-
-If optional second argument is non-nil the command is inserted into
-the history list.
-
-Return the position after the newly inserted command."
-  (or (inferior-erlang-running-p)
-      (error "No inferior Erlang process is running"))
-  (let ((old-buffer (current-buffer))
-	(insert-point (marker-position (process-mark inferior-erlang-process)))
-	(insert-length (if comint-process-echoes
-			   0
-			 (1+ (length cmd)))))
-    (set-buffer inferior-erlang-buffer)
-    (goto-char insert-point)
-    (insert cmd)
-    ;; Strange things happened if `comint-eol-on-send' is declared
-    ;; in the `let' expression above, but setq:d here. The
-    ;; `set-buffer' statement obviously makes the buffer local
-    ;; instance of `comint-eol-on-send' shadow this one.
-    ;; I'm considering this a bug in Elisp.
-    ;;
-    ;; This was previously cautioned against in the Lisp manual.  It
-    ;; has been sorted out in Emacs 21.  -- fx
-    (let ((comint-eol-on-send nil)
-	  (comint-input-filter (if hist comint-input-filter 'ignore)))
-      (if (and (not erlang-xemacs-p)
-	       (>= emacs-major-version 22))
-	  (comint-send-input nil t)
-	(comint-send-input)))
-    ;; Adjust all windows whose points are incorrect.
-    (if (null comint-process-echoes)
-	(walk-windows
-	 (function
-	  (lambda (window)
-	    (if (and (eq (window-buffer window) inferior-erlang-buffer)
-		     (= (window-point window) insert-point))
-		(set-window-point window
-				  (+ insert-point insert-length)))))
-	 nil t))
-    (set-buffer old-buffer)
-    (+ insert-point insert-length)))
-
-
-(defun inferior-erlang-strip-delete (&optional s)
-  "Remove `^H' (delete) and the characters it was supposed to remove."
-  (interactive)
-  (if (and (boundp 'comint-last-input-end)
-	   (boundp 'comint-last-output-start))
-      (save-excursion
-	(goto-char
-	 (if (interactive-p)
-	     (symbol-value 'comint-last-input-end)
-	   (symbol-value 'comint-last-output-start)))
-	(while (progn (skip-chars-forward "^\C-h")
-		      (not (eq (point) (point-max))))
-	  (delete-char 1)
-	  (or (bolp)
-	      (backward-delete-char 1))))))
-
-
-;; Basically `comint-strip-ctrl-m', with a few extra checks.
-(defun inferior-erlang-strip-ctrl-m (&optional string)
-  "Strip trailing `^M' characters from the current output group."
-  (interactive)
-  (if (and (boundp 'comint-last-input-end)
-	   (boundp 'comint-last-output-start))
-      (let ((pmark (process-mark (get-buffer-process (current-buffer)))))
-	(save-excursion
-	  (goto-char
-	   (if (interactive-p)
-	       (symbol-value 'comint-last-input-end)
-	     (symbol-value 'comint-last-output-start)))
-	  (while (re-search-forward "\r+$" pmark t)
-	    (replace-match "" t t))))))
-
-
-(defun inferior-erlang-compile (arg)
-  "Compile the file in the current buffer.
-
-With prefix arg, compiles for debug.
-
-Should Erlang return `{error, nofile}' it could not load the object
-module after completing the compilation.  This is due to a bug in the
-compile command `c' when using the option `outdir'.
-
-There exists two workarounds for this bug:
-
-  1) Place the directory in the Erlang load path.
-
-  2) Set the Emacs variable `erlang-compile-use-outdir' to nil.
-     To do so, place the following line in your `~/.emacs'-file:
-        (setq erlang-compile-use-outdir nil)"
-  (interactive "P")
-  (save-some-buffers)
-  (inferior-erlang-prepare-for-input)
-  (let* ((dir (inferior-erlang-compile-outdir))
-;;; (file (file-name-nondirectory (buffer-file-name)))
-	 (noext (substring (erlang-local-buffer-file-name) 0 -4))
-	 (opts (append (list (cons 'outdir dir))
-		       (if current-prefix-arg
-			   (list 'debug_info 'export_all))
-		       erlang-compile-extra-opts))
-	 end)
-    (save-excursion
-      (set-buffer inferior-erlang-buffer)
-      (compilation-forget-errors))
-    (setq end (inferior-erlang-send-command
-	       (inferior-erlang-compute-compile-command noext opts)
-	       nil))
-    (sit-for 0)
-    (inferior-erlang-wait-prompt)
-    (save-excursion
-      (set-buffer inferior-erlang-buffer)
-      (setq compilation-error-list nil)
-      (set-marker compilation-parsing-end end))
-    (setq compilation-last-buffer inferior-erlang-buffer)))
-
-(defun inferior-erlang-prepare-for-input (&optional no-display)
-  "Create an inferior erlang buffer if needed and ready it for input.
-The buffer is displayed, according to `inferior-erlang-display-buffer'
-unless the optional NO-DISPLAY is non-nil."
-  (or (inferior-erlang-running-p)
-      (save-excursion
-	(inferior-erlang)))
-  (or (inferior-erlang-running-p)
-      (error "Error starting inferior Erlang shell"))
-  (if (not no-display)
-      (inferior-erlang-display-buffer))
-  (inferior-erlang-send-empty-cmd-unless-already-at-prompt)
-  (sit-for 0)
-  (inferior-erlang-wait-prompt))
-
-(defun inferior-erlang-compile-outdir ()
-  "Return the directory to compile the current buffer into."
-  (let* ((buffer-dir (directory-file-name
-		      (file-name-directory (erlang-local-buffer-file-name))))
-	 (parent-dir (directory-file-name
-		      (file-name-directory buffer-dir)))
-         (ebin-dir (concat (file-name-as-directory parent-dir) "ebin"))
-	 (buffer-dir-base-name (file-name-nondirectory 
-				(expand-file-name
-				 (concat (file-name-as-directory buffer-dir)
-					 ".")))))
-    (if (and (string= buffer-dir-base-name "src")
-	     (file-directory-p ebin-dir))
-	(file-name-as-directory ebin-dir)
-      (file-name-as-directory buffer-dir))))
-
-(defun inferior-erlang-compute-compile-command (module-name opts)
-  (let ((ccfn erlang-compile-command-function-alist)
-	(res (inferior-erlang-compute-erl-compile-command module-name opts))
-	ccfn-entry
-	done)
-    (if (not (null (erlang-local-buffer-file-name)))
-	(while (and (not done) (not (null ccfn)))
-	  (setq ccfn-entry (car ccfn))
-	  (setq ccfn (cdr ccfn))
-	  (if (string-match (car ccfn-entry) (erlang-local-buffer-file-name))
-	      (let ((c-fn (cdr ccfn-entry)))
-		(setq done t)
-		(if (not (null c-fn))
-		    (setq result (funcall c-fn module-name opts)))))))
-    result))
-
-(defun inferior-erlang-compute-erl-compile-command (module-name opts)
-  (let* ((out-dir-opt (assoc 'outdir opts))
-	 (out-dir     (cdr out-dir-opt)))
-    (if erlang-compile-use-outdir
-	(format "%s(\"%s\"%s)."
-		erlang-compile-erlang-function
-		module-name
-		(inferior-erlang-format-comma-opts opts))
-      (let (;; Hopefully, noone else will ever use these...
-	    (tmpvar "Tmp7236")
-	    (tmpvar2 "Tmp8742"))
-	(format
-	 (concat
-	  "f(%s), {ok, %s} = file:get_cwd(), "
-	  "file:set_cwd(\"%s\"), "
-	  "%s = %s(\"%s\"%s), file:set_cwd(%s), f(%s), %s.")
-	 tmpvar2 tmpvar
-	 out-dir
-	 tmpvar2
-	 erlang-compile-erlang-function
-	 module-name (inferior-erlang-format-comma-opts
-		      (remq out-dir-opt opts))
-	 tmpvar tmpvar tmpvar2)))))
-
-(defun inferior-erlang-compute-leex-compile-command (module-name opts)
-  (let ((file-name        (erlang-local-buffer-file-name))
-	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
-			   (inferior-erlang-compute-erl-compile-command
-			    module-name opts))))
-    (format (concat "f(LErr1__), f(LErr2__), "
-		    "case case leex:file(\"%s\", [%s]) of"
-		    " ok -> ok;"
-		    " {ok,_} -> ok;"
-		    " {ok,_,_} -> ok;"
-		    " LErr1__ -> LErr1__ "
-		    "end of"
-		    " ok -> %s;"
-		    " LErr2__ -> LErr2__ "
-		    "end.")
-	    file-name
-	    (inferior-erlang-format-comma-opts erlang-leex-compile-opts)
-	    erl-compile-expr)))
-
-(defun inferior-erlang-compute-yecc-compile-command (module-name opts)
-  (let ((file-name        (erlang-local-buffer-file-name))
-	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
-			   (inferior-erlang-compute-erl-compile-command
-			    module-name opts))))
-    (format (concat "f(YErr1__), f(YErr2__), "
-		    "case case yecc:file(\"%s\", [%s]) of"
-		    " {ok,_} -> ok;"
-		    " {ok,_,_} -> ok;"
-		    " YErr1__ -> YErr1__ "
-		    "end of"
-		    " ok -> %s;"
-		    " YErr2__ -> YErr2__ "
-		    "end.")
-	    file-name
-	    (inferior-erlang-format-comma-opts erlang-yecc-compile-opts)
-	    erl-compile-expr)))
-
-(defun inferior-erlang-remove-any-trailing-dot (str)
-  (if (string= (substring str -1) ".")
-      (substring str 0 (1- (length str)))
-    str))
-
-(defun inferior-erlang-format-comma-opts (opts)
-  (if (null opts)
-      ""
-    (concat ", " (inferior-erlang-format-opts opts))))
-
-(defun inferior-erlang-format-opts (opts)
-  (concat "[" (inferior-erlang-string-join (mapcar 'inferior-erlang-format-opt
-						   opts)
-					   ", ")
-	  "]"))
-
-(defun inferior-erlang-format-opt (opt)
-  (cond ((stringp opt) (concat "\"" opt "\""))
-	((atom opt)    (format "%s" opt))
-	((consp opt)   (concat "{" (inferior-erlang-string-join
-				    (mapcar 'inferior-erlang-format-opt
-					    (list (car opt) (cdr opt)))
-				    ", ")
-			       "}"))
-	(t (error (format "Unexpected opt %s" opt)))))
-
-(defun inferior-erlang-string-join (strs sep)
-  (let ((result (or (car strs) "")))
-    (setq strs (cdr strs))
-    (while strs
-      (setq result (concat result sep (car strs)))
-      (setq strs (cdr strs)))
-    result))
-
-(defun erlang-local-buffer-file-name ()
-  ;; When editing a file remotely via tramp,
-  ;; the buffer's file name may be for example
-  ;; "/ssh:host.example.com:/some/path/x.erl"
-  ;;
-  ;; If I try to compile such a file using C-c C-k, an
-  ;; erlang shell on the remote host is automatically
-  ;; started if needed, but for it to successfully compile
-  ;; the file, the c(...)  command that is sent must contain
-  ;; the file name "/some/path/x.erl" without the
-  ;; tramp-prefix "/ssh:host.example.com:".
-  (cond ((null (buffer-file-name))
-	 nil)
-	((erlang-tramp-remote-file-p)
-	 (erlang-tramp-get-localname))
-	(t
-	 (buffer-file-name))))
-
-(defun erlang-tramp-remote-file-p ()
-  (and (fboundp 'tramp-tramp-file-p)
-       (tramp-tramp-file-p (buffer-file-name))))
-
-(defun erlang-tramp-get-localname ()
-  (let ((tramp-info (tramp-dissect-file-name (buffer-file-name))))
-    (if (fboundp 'tramp-file-name-localname)
-	(tramp-file-name-localname tramp-info)
-      ;; In old versions of tramp, it was `tramp-file-name-path'
-      ;; instead of the newer `tramp-file-name-localname'
-      (tramp-file-name-path tramp-info))))
-
-;; `next-error' only accepts buffers with major mode `compilation-mode'
-;; or with the minor mode `compilation-minor-mode' activated.
-;; (To activate the minor mode is out of the question, since it will
-;; ruin the inferior Erlang keymap.)
-;; This is done differently in Emacs 21.
-(defun inferior-erlang-next-error (&optional argp)
-  "Just like `next-error'.
-Capable of finding error messages in an inferior Erlang buffer."
-  (interactive "P")
-  (let ((done nil)
-	(buf (or (and (boundp 'next-error-last-buffer)
-		      next-error-last-buffer)
-		 (and (boundp 'compilation-last-buffer)
-		      compilation-last-buffer))))
-    (if (and (bufferp buf)
-	     (save-excursion
-	       (set-buffer buf)
-	       (and (eq major-mode 'erlang-shell-mode)
-		    (setq major-mode 'compilation-mode))))
-	(unwind-protect
-	    (progn
-	      (setq done t)
-	      (next-error argp))
-	  (save-excursion
-	    (set-buffer buf)
-	    (setq major-mode 'erlang-shell-mode))))
-    (or done
-	(next-error argp))))
-
-
-(defun inferior-erlang-change-directory (&optional dir)
-  "Make the inferior Erlang change directory.
-The default is to go to the directory of the current buffer."
-  (interactive)
-  (or dir (setq dir (file-name-directory (erlang-local-buffer-file-name))))
-  (or (inferior-erlang-running-p)
-      (error "No inferior Erlang is running"))
-  (inferior-erlang-display-buffer)
-  (inferior-erlang-send-empty-cmd-unless-already-at-prompt)
-  (inferior-erlang-wait-prompt)
-  (inferior-erlang-send-command (format "cd('%s')." dir) nil))
-
-(defun erlang-align-arrows (start end)
-  "Align arrows (\"->\") in function clauses from START to END.
-When called interactively, aligns arrows after function clauses inside
-the region.
-
-With a prefix argument, aligns all arrows, not just those in function
-clauses.
-
-Example:
-
-sum(L) -> sum(L, 0).
-sum([H|T], Sum) -> sum(T, Sum + H);
-sum([], Sum) -> Sum.
-
-becomes:
-
-sum(L)          -> sum(L, 0).
-sum([H|T], Sum) -> sum(T, Sum + H);
-sum([], Sum)    -> Sum."
-  (interactive "r")
-  (save-excursion
-    (let (;; regexp for matching arrows. without a prefix argument,
-	  ;; the regexp matches function heads. With a prefix, it
-	  ;; matches any arrow.
-	  (re (if current-prefix-arg
-		  "^.*\\(\\)->"
-		(eval-when-compile
-		  (concat "^" erlang-atom-regexp ".*\\(\\)->"))))
-	  ;; part of regexp matching directly before the arrow
-	  (arrow-match-pos (if current-prefix-arg
-			       1
-			     (1+ erlang-atom-regexp-matches)))
-	  ;; accumulator for positions where arrows are found, ordered
-	  ;; by buffer position (from greatest to smallest)
-	  (arrow-positions '())
-	  ;; accumulator for longest distance from start of line to arrow
-	  (most-indent 0)
-	  ;; marker to track the end of the region we're aligning
-	  (end-marker (progn (goto-char end)
-			     (point-marker))))
-      ;; Pass 1: Find the arrow positions, adjust the whitespace
-      ;; before each arrow to one space, and find the greatest
-      ;; indentation level.
-      (goto-char start)
-      (while (re-search-forward re end-marker t)
-	(goto-char (match-beginning arrow-match-pos))
-	(just-one-space)		; adjust whitespace
-	(setq arrow-positions (cons (point) arrow-positions))
-	(setq most-indent (max most-indent (erlang-column-number))))
-      (set-marker end-marker nil)	; free the marker
-      ;; Pass 2: Insert extra padding so that all arrow indentation is
-      ;; equal. This is done last-to-first by buffer position, so that
-      ;; inserting spaces before one arrow doesn't change the
-      ;; positions of the next ones.
-      (mapc (lambda (arrow-pos)
-	      (goto-char arrow-pos)
-	      (let* ((pad (- most-indent (erlang-column-number))))
-		(when (> pad 0)
-		  (insert-char ?\  pad))))
-	    arrow-positions))))
-
-(defun erlang-column-number ()
-  "Return the column number of the current position in the buffer.
-Tab characters are counted by their visual width."
-  (string-width (buffer-substring (line-beginning-position) (point))))
-
-(defun erlang-current-defun ()
-  "`add-log-current-defun-function' for Erlang."
-  (save-excursion
-    (erlang-beginning-of-function)
-    (if (looking-at "[a-z0-9_]+")
-	(match-string 0))))
-
-;; Aliases for backward compatibility with older versions of Erlang Mode.
-;;
-;; Unfortuantely, older versions of Emacs doesn't have `defalias' and
-;; `make-obsolete' so we have to define our own `obsolete' function.
-
-(defun erlang-obsolete (sym newdef)
-  "Make the obsolete function SYM refer to the defined function NEWDEF.
-
-Simplified version of a combination `defalias' and `make-obsolete',
-it assumes that NEWDEF is loaded."
-  (defalias sym (symbol-function newdef))
-  (if (fboundp 'make-obsolete)
-      (make-obsolete sym newdef)))
-
-
-(erlang-obsolete 'calculate-erlang-indent 'erlang-calculate-indent)
-(erlang-obsolete 'calculate-erlang-stack-indent
-		 'erlang-calculate-stack-indent)
-(erlang-obsolete 'at-erlang-keyword 'erlang-at-keyword)
-(erlang-obsolete 'at-erlang-operator 'erlang-at-operator)
-(erlang-obsolete 'beginning-of-erlang-clause 'erlang-beginning-of-clause)
-(erlang-obsolete 'end-of-erlang-clause 'erlang-end-of-clause)
-(erlang-obsolete 'mark-erlang-clause 'erlang-mark-clause)
-(erlang-obsolete 'beginning-of-erlang-function 'erlang-beginning-of-function)
-(erlang-obsolete 'end-of-erlang-function 'erlang-end-of-function)
-(erlang-obsolete 'mark-erlang-function 'erlang-mark-function)
-(erlang-obsolete 'pass-over-erlang-clause 'erlang-pass-over-function)
-(erlang-obsolete 'name-of-erlang-function 'erlang-name-of-function)
-
-
-;; Fixme: shouldn't redefine `set-visited-file-name' anyhow -- see above.
-(defconst erlang-unload-hook
-  (list (lambda ()
-	  (defalias 'set-visited-file-name
-	    'erlang-orig-set-visited-file-name)
-	  (when (featurep 'advice)
-	    (ad-unadvise 'Man-notify-when-ready)
-	    (ad-unadvise 'set-visited-file-name)))))
-
-
-(defun erlang-string-to-int (string) 
-  (if (fboundp 'string-to-number)
-      (string-to-number string)
-    (funcall (symbol-function 'string-to-int) string)))
-
-;; The end...
-
-(provide 'erlang)
-
-(run-hooks 'erlang-load-hook)
-
-;; Local variables:
-;; coding: iso-8859-1
-;; End:
-
-;;; erlang.el ends here
diff --git a/emacs.d/elpa/erlang-20151013.157/erlang-autoloads.el b/emacs.d/elpa/erlang-20151013.157/erlang-autoloads.el
new file mode 100644
index 0000000..bff3e2c
--- /dev/null
+++ b/emacs.d/elpa/erlang-20151013.157/erlang-autoloads.el
@@ -0,0 +1,144 @@
+;;; erlang-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "erlang" "erlang.el" (22171 46574 0 0))
+;;; Generated autoloads from erlang.el
+
+(autoload 'erlang-mode "erlang" "\
+Major mode for editing Erlang source files in Emacs.
+It knows about syntax and comment, it can indent code, it is capable
+of fontifying the source file, the TAGS commands are aware of Erlang
+modules, and the Erlang man pages can be accessed.
+
+Should this module, \"erlang.el\", be installed properly, Erlang mode
+is activated whenever an Erlang source or header file is loaded into
+Emacs.  To indicate this, the mode line should contain the word
+\"Erlang\".
+
+The main feature of Erlang mode is indentation, press TAB and the
+current line will be indented correctly.
+
+Comments starting with only one `%' are indented to the column stored
+in the variable `comment-column'.  Comments starting with two `%':s
+are indented with the same indentation as code.  Comments starting
+with at least three `%':s are indented to the first column.
+
+However, Erlang mode contains much more, this is a list of the most
+useful commands:
+     TAB     - Indent the line.
+     C-c C-q - Indent current function.
+     M-;     - Create a comment at the end of the line.
+     M-q     - Fill a comment, i.e. wrap lines so that they (hopefully)
+		 will look better.
+     M-a     - Goto the beginning of an Erlang clause.
+     M-C-a   - Ditto for function.
+     M-e     - Goto the end of an Erlang clause.
+     M-C-e   - Ditto for function.
+     M-h     - Mark current Erlang clause.
+     M-C-h   - Ditto for function.
+     C-c C-z - Start, or switch to, an inferior Erlang shell.
+     C-c C-k - Compile current file.
+     C-x `   - Next error.
+     ,       - Electric comma.
+     ;       - Electric semicolon.
+
+Erlang mode check the name of the file against the module name when
+saving, whenever a mismatch occurs Erlang mode offers to modify the
+source.
+
+The variable `erlang-electric-commands' controls the electric
+commands.  To deactivate all of them, set it to nil.
+
+There exists a large number of commands and variables in the Erlang
+module.  Please press `M-x apropos RET erlang RET' to see a complete
+list.  Press `C-h f name-of-function RET' and `C-h v name-of-variable
+RET'to see the full description of functions and variables,
+respectively.
+
+On entry to this mode the contents of the hook `erlang-mode-hook' is
+executed.
+
+Please see the beginning of the file `erlang.el' for more information
+and examples of hooks.
+
+Other commands:
+\\{erlang-mode-map}
+
+\(fn)" t nil)
+
+(dolist (r '("\\.erl$" "\\.app\\.src$" "\\.escript" "\\.hrl$" "\\.xrl$" "\\.yrl" "/ebin/.+\\.app")) (add-to-list 'auto-mode-alist (cons r 'erlang-mode)))
+
+(autoload 'erlang-find-tag "erlang" "\
+Like `find-tag'.  Capable of retrieving Erlang modules.
+
+Tags can be given on the forms `tag', `module:', `module:tag'.
+
+\(fn MODTAGNAME &optional NEXT-P REGEXP-P)" t nil)
+
+(autoload 'erlang-find-tag-other-window "erlang" "\
+Like `find-tag-other-window' but aware of Erlang modules.
+
+\(fn TAGNAME &optional NEXT-P REGEXP-P)" t nil)
+
+(autoload 'erlang-shell "erlang" "\
+Start a new Erlang shell.
+
+The variable `erlang-shell-function' decides which method to use,
+default is to start a new Erlang host.  It is possible that, in the
+future, a new shell on an already running host will be started.
+
+\(fn)" t nil)
+ (autoload 'run-erlang "erlang" "Start a new Erlang shell." t)
+
+(autoload 'erlang-compile "erlang" "\
+Compile Erlang module in current buffer.
+
+\(fn)" t nil)
+
+(autoload 'inferior-erlang "erlang" "\
+Run an inferior Erlang.
+With prefix command, prompt for command to start Erlang with.
+
+This is just like running Erlang in a normal shell, except that
+an Emacs buffer is used for input and output.
+\\<comint-mode-map>
+The command line history can be accessed with  \\[comint-previous-input]  and  \\[comint-next-input].
+The history is saved between sessions.
+
+Entry to this mode calls the functions in the variables
+`comint-mode-hook' and `erlang-shell-mode-hook' with no arguments.
+
+The following commands imitate the usual Unix interrupt and
+editing control characters:
+\\{erlang-shell-mode-map}
+
+\(fn &optional COMMAND)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "erlang-start" "erlang-start.el" (22171 46574
+;;;;;;  0 0))
+;;; Generated autoloads from erlang-start.el
+
+(let ((a '("\\.erl\\'" . erlang-mode)) (b '("\\.hrl\\'" . erlang-mode))) (or (assoc (car a) auto-mode-alist) (setq auto-mode-alist (cons a auto-mode-alist))) (or (assoc (car b) auto-mode-alist) (setq auto-mode-alist (cons b auto-mode-alist))))
+
+(add-to-list 'interpreter-mode-alist (cons "escript" 'erlang-mode))
+
+(let ((erl-ext '(".jam" ".vee" ".beam"))) (while erl-ext (let ((cie completion-ignored-extensions)) (while (and cie (not (string-equal (car cie) (car erl-ext)))) (setq cie (cdr cie))) (if (null cie) (setq completion-ignored-extensions (cons (car erl-ext) completion-ignored-extensions)))) (setq erl-ext (cdr erl-ext))))
+
+;;;***
+
+;;;### (autoloads nil nil ("erlang-eunit.el" "erlang-flymake.el"
+;;;;;;  "erlang-pkg.el" "erlang-skels-old.el" "erlang-skels.el" "erlang_appwiz.el")
+;;;;;;  (22171 46574 466159 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; erlang-autoloads.el ends here
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-eunit.el b/emacs.d/elpa/erlang-20151013.157/erlang-eunit.el
similarity index 100%
rename from emacs.d/elpa/erlang-20150622.644/erlang-eunit.el
rename to emacs.d/elpa/erlang-20151013.157/erlang-eunit.el
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-flymake.el b/emacs.d/elpa/erlang-20151013.157/erlang-flymake.el
similarity index 100%
rename from emacs.d/elpa/erlang-20150622.644/erlang-flymake.el
rename to emacs.d/elpa/erlang-20151013.157/erlang-flymake.el
diff --git a/emacs.d/elpa/erlang-20151013.157/erlang-pkg.el b/emacs.d/elpa/erlang-20151013.157/erlang-pkg.el
new file mode 100644
index 0000000..909a055
--- /dev/null
+++ b/emacs.d/elpa/erlang-20151013.157/erlang-pkg.el
@@ -0,0 +1,4 @@
+(define-package "erlang" "20151013.157" "Erlang major mode" 'nil)
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-skels-old.el b/emacs.d/elpa/erlang-20151013.157/erlang-skels-old.el
similarity index 100%
rename from emacs.d/elpa/erlang-20150622.644/erlang-skels-old.el
rename to emacs.d/elpa/erlang-20151013.157/erlang-skels-old.el
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-skels.el b/emacs.d/elpa/erlang-20151013.157/erlang-skels.el
similarity index 100%
rename from emacs.d/elpa/erlang-20150622.644/erlang-skels.el
rename to emacs.d/elpa/erlang-20151013.157/erlang-skels.el
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang-start.el b/emacs.d/elpa/erlang-20151013.157/erlang-start.el
similarity index 100%
rename from emacs.d/elpa/erlang-20150622.644/erlang-start.el
rename to emacs.d/elpa/erlang-20151013.157/erlang-start.el
diff --git a/emacs.d/elpa/erlang-20151013.157/erlang.el b/emacs.d/elpa/erlang-20151013.157/erlang.el
new file mode 100644
index 0000000..466bf13
--- /dev/null
+++ b/emacs.d/elpa/erlang-20151013.157/erlang.el
@@ -0,0 +1,5815 @@
+;;; erlang.el --- Major modes for editing and running Erlang
+
+;; Copyright (C) 2004  Free Software Foundation, Inc.
+;; Author:   Anders Lindgren
+;; Keywords: erlang, languages, processes
+;; Date:     2011-12-11
+
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 1996-2014. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;; Lars Thors�n's modifications of 2000-06-07 included.
+;; The original version of this package was written by Robert Virding.
+;;
+;;; Commentary:
+
+;; Introduction:
+;; ------------
+;;
+;; This package provides support for the programming language Erlang.
+;; The package provides an editing mode with lots of bells and
+;; whistles, compilation support, and it makes it possible for the
+;; user to start Erlang shells that run inside Emacs.
+;;
+;; See the Erlang distribution for full documentation of this package.
+
+;; Installation:
+;; ------------
+;;
+;; Place this file in Emacs load path, byte-compile it, and add the
+;; following line to the appropriate init file:
+;;
+;;    (require 'erlang-start)
+;;
+;; The full documentation contains much more extensive description of
+;; the installation procedure.
+
+;; Reporting Bugs:
+;; --------------
+;;
+;; Please send bug reports to the following email address:
+;;      erlang-bugs@erlang.org
+;; or if you have a patch suggestion to:
+;;      erlang-patches@erlang.org
+;; Please state as exactly as possible:
+;;    - Version number of Erlang Mode (see the menu), Emacs, Erlang,
+;;	and of any other relevant software.
+;;    - What the expected result was.
+;;    - What you did, preferably in a repeatable step-by-step form.
+;;    - A description of the unexpected result.
+;;    - Relevant pieces of Erlang code causing the problem.
+;;    - Personal Emacs customisations, if any.
+;;
+;; Should the Emacs generate an error, please set the Emacs variable
+;; `debug-on-error' to `t'.  Repeat the error and enclose the debug
+;; information in your bug-report.
+;;
+;; To set the variable you can use the following command:
+;;     M-x set-variable RET debug-on-error RET t RET
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+;; Variables:
+
+(defconst erlang-version "2.7"
+  "The version number of Erlang mode.")
+
+(defvar erlang-root-dir nil
+  "The directory where the Erlang system is installed.
+The name should not contain the trailing slash.
+
+Should this variable be nil, no manual pages will show up in the
+Erlang mode menu.")
+
+(eval-and-compile
+  (defconst erlang-emacs-major-version
+    (if (boundp 'emacs-major-version)
+	emacs-major-version
+      (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
+      (erlang-string-to-int (substring emacs-version
+				       (match-beginning 1) (match-end 1))))
+    "Major version number of Emacs."))
+
+(eval-and-compile
+  (defconst erlang-emacs-minor-version
+  (if (boundp 'emacs-minor-version)
+      emacs-minor-version
+    (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
+    (erlang-string-to-int (substring emacs-version
+			      (match-beginning 2) (match-end 2))))
+  "Minor version number of Emacs."))
+
+(defconst erlang-xemacs-p (string-match "Lucid\\|XEmacs" emacs-version)
+  "Non-nil when running under XEmacs or Lucid Emacs.")
+
+(defvar erlang-xemacs-popup-menu '("Erlang Mode Commands" . nil)
+  "Common popup menu for all buffers in Erlang mode.
+
+This variable is destructively modified every time the Erlang menu
+is modified.  The effect is that all changes take effect in all
+buffers in Erlang mode, just like under GNU Emacs.
+
+Never EVER set this variable!")
+
+(defvar erlang-menu-items '(erlang-menu-base-items
+			    erlang-menu-skel-items
+			    erlang-menu-shell-items
+			    erlang-menu-compile-items
+			    erlang-menu-man-items
+			    erlang-menu-personal-items
+			    erlang-menu-version-items)
+  "*List of menu item list to combine to create Erlang mode menu.
+
+External programs which temporarily add menu items to the Erlang mode
+menu may use this variable.  Please use the function `add-hook' to add
+items.
+
+Please call the function `erlang-menu-init' after every change to this
+variable.")
+
+(defvar erlang-menu-base-items
+  '(("Indent"
+     (("Indent Line" erlang-indent-command)
+      ("Indent Region " erlang-indent-region
+       (if erlang-xemacs-p (mark) mark-active))
+      ("Indent Clause" erlang-indent-clause)
+      ("Indent Function" erlang-indent-function)
+      ("Indent Buffer" erlang-indent-current-buffer)))
+    ("Edit"
+     (("Fill Comment" erlang-fill-paragraph)
+      ("Comment Region" comment-region
+       (if erlang-xemacs-p (mark) mark-active))
+      ("Uncomment Region" erlang-uncomment-region
+       (if erlang-xemacs-p (mark) mark-active))
+      nil
+      ("Beginning of Function" erlang-beginning-of-function)
+      ("End of Function" erlang-end-of-function)
+      ("Mark Function" erlang-mark-function)
+      nil
+      ("Beginning of Clause" erlang-beginning-of-clause)
+      ("End of Clause" erlang-end-of-clause)
+      ("Mark Clause" erlang-mark-clause)
+      nil
+      ("New Clause" erlang-generate-new-clause)
+      ("Clone Arguments" erlang-clone-arguments)
+      nil
+      ("Align Arrows" erlang-align-arrows)))
+    ("Syntax Highlighting"
+     (("Level 4" erlang-font-lock-level-4)
+      ("Level 3" erlang-font-lock-level-3)
+      ("Level 2" erlang-font-lock-level-2)
+      ("Level 1" erlang-font-lock-level-1)
+      ("Off" erlang-font-lock-level-0)))
+    ("TAGS"
+     (("Find Tag" find-tag)
+      ("Find Next Tag" erlang-find-next-tag)
+					;("Find Regexp" find-tag-regexp)
+      ("Complete Word" erlang-complete-tag)
+      ("Tags Apropos" tags-apropos)
+      ("Search Files" tags-search))))
+  "Description of menu used in Erlang mode.
+
+This variable must be a list.  The elements are either nil representing
+a horizontal line or a list with two or three elements.  The first is
+the name of the menu item, the second is the function to call, or a
+submenu, on the same same form as ITEMS.  The third optional argument
+is an expression which is evaluated every time the menu is displayed.
+Should the expression evaluate to nil the menu item is ghosted.
+
+Example:
+    '((\"Func1\" function-one)
+      (\"SubItem\"
+       ((\"Yellow\" function-yellow)
+        (\"Blue\" function-blue)))
+      nil
+      (\"Region Function\" spook-function midnight-variable))
+
+Call the function `erlang-menu-init' after modifying this variable.")
+
+(defvar erlang-menu-shell-items
+  '(nil
+    ("Shell"
+     (("Start New Shell" erlang-shell)
+      ("Display Shell"   erlang-shell-display))))
+  "Description of the Shell menu used by Erlang mode.
+
+Please see the documentation of `erlang-menu-base-items'.")
+
+(defvar erlang-menu-compile-items
+  '(("Compile"
+     (("Compile Buffer" erlang-compile)
+      ("Display Result" erlang-compile-display)
+      ("Next Error"     erlang-next-error))))
+  "Description of the Compile menu used by Erlang mode.
+
+Please see the documentation of `erlang-menu-base-items'.")
+
+(defvar erlang-menu-version-items
+  '(nil
+    ("Version" erlang-version))
+  "Description of the version menu used in Erlang mode.")
+
+(defvar erlang-menu-personal-items nil
+  "Description of personal menu items used in Erlang mode.
+
+Please see the variable `erlang-menu-base-items' for a description
+of the format.")
+
+(defvar erlang-menu-man-items nil
+  "The menu containing man pages.
+
+The format of the menu should be compatible with `erlang-menu-base-items'.
+This variable is added to the list of Erlang menus stored in
+`erlang-menu-items'.")
+
+(defvar erlang-menu-skel-items '()
+  "Description of the menu containing the skeleton entries.
+The menu is in the form described by the variable `erlang-menu-base-items'.")
+
+(defvar erlang-mode-hook nil
+  "*Functions to run when Erlang mode is activated.
+
+This hook is used to change the behaviour of Erlang mode.  It is
+normally used by the user to personalise the programming environment.
+When used in a site init file, it could be used to customise Erlang
+mode for all users on the system.
+
+The functions added to this hook are run every time Erlang mode is
+started.  See also `erlang-load-hook', a hook which is run once,
+when Erlang mode is loaded into Emacs, and `erlang-shell-mode-hook'
+which is run every time a new inferior Erlang shell is started.
+
+To use a hook, create an Emacs lisp function to perform your actions
+and add the function to the hook by calling `add-hook'.
+
+The following example binds the key sequence C-c C-c to the command
+`erlang-compile' (normally bound to C-c C-k).  The example also
+activates Font Lock mode to fontify the buffer and adds a menu
+containing all functions defined in the current buffer.
+
+To use the example, copy the following lines to your `~/.emacs' file:
+
+    (add-hook 'erlang-mode-hook 'my-erlang-mode-hook)
+
+    (defun my-erlang-mode-hook ()
+      (local-set-key \"\\C-c\\C-c\" 'erlang-compile)
+      (if window-system
+          (progn
+            (setq font-lock-maximum-decoration t)
+            (font-lock-mode 1)))
+      (if (and window-system (fboundp 'imenu-add-to-menubar))
+          (imenu-add-to-menubar \"Imenu\")))")
+
+(defvar erlang-load-hook nil
+  "*Functions to run when Erlang mode is loaded.
+
+This hook is used to change the behaviour of Erlang mode.  It is
+normally used by the user to personalise the programming environment.
+When used in a site init file, it could be used to customize Erlang
+mode for all users on the system.
+
+The difference between this hook and `erlang-mode-hook' and
+`erlang-shell-mode-hook' is that the functions in this hook
+is only called once, when the Erlang mode is loaded into Emacs
+the first time.
+
+Natural actions for the functions added to this hook are actions which
+only should be performed once, and actions which should be performed
+before starting Erlang mode.  For example, a number of variables are
+used by Erlang mode before `erlang-mode-hook' is run.
+
+The following example sets the variable `erlang-root-dir' so that the
+manual pages can be retrieved (note that you must set the value of
+`erlang-root-dir' to match the location of Erlang on your system):
+
+    (add-hook 'erlang-load-hook 'my-erlang-load-hook)
+
+    (defun my-erlang-load-hook ()
+       (setq erlang-root-dir \"/usr/local/erlang\"))")
+
+(defvar erlang-new-file-hook nil
+  "Functions to run when a new Erlang source file is being edited.
+
+A useful function is `tempo-template-erlang-normal-header'.
+\(This function only exists when the `tempo' package is available.)")
+
+(defvar erlang-check-module-name 'ask
+  "*Non-nil means check that module name and file name agrees when saving.
+
+If the value of this variable is the atom `ask', the user is
+prompted.  If the value is t the source is silently changed.")
+
+(defvar erlang-electric-commands
+  '(erlang-electric-comma
+    erlang-electric-semicolon
+    erlang-electric-gt)
+  "*List of activated electric commands.
+
+The list should contain the electric commands which should be active.
+Currently, the available electric commands are:
+    `erlang-electric-comma'
+    `erlang-electric-semicolon'
+    `erlang-electric-gt'
+    `erlang-electric-newline'
+
+Should the variable be bound to t, all electric commands
+are activated.
+
+To deactivate all electric commands, set this variable to nil.")
+
+(defvar erlang-electric-newline-inhibit t
+  "*Set to non-nil to inhibit newline after electric command.
+
+This is useful since a lot of people press return after executing an
+electric command.
+
+In order to work, the command must also be in the
+list `erlang-electric-newline-inhibit-list'.
+
+Note that commands in this list are required to set the variable
+`erlang-electric-newline-inhibit' to nil when the newline shouldn't be
+inhibited.")
+
+(defvar erlang-electric-newline-inhibit-list
+  '(erlang-electric-semicolon
+    erlang-electric-comma
+    erlang-electric-gt)
+  "*Commands which can inhibit the next newline.")
+
+(defvar erlang-electric-semicolon-insert-blank-lines nil
+  "*Number of blank lines inserted before header, or nil.
+
+This variable controls the behaviour of `erlang-electric-semicolon'
+when a new function header is generated.  When nil, no blank line is
+inserted between the current line and the new header.  When bound to a
+number it represents the number of blank lines which should be
+inserted.")
+
+(defvar erlang-electric-semicolon-criteria
+  '(erlang-next-lines-empty-p
+    erlang-at-keyword-end-p
+    erlang-at-end-of-function-p)
+  "*List of functions controlling `erlang-electric-semicolon'.
+The functions in this list are called, in order, whenever a semicolon
+is typed.  Each function in the list is called with no arguments,
+and should return one of the following values:
+
+  nil             -- no determination made, continue checking
+  'stop           -- do not create prototype for next line
+  (anything else) -- insert prototype, and stop checking
+
+If every function in the list is called with no determination made,
+then no prototype is inserted.
+
+The test is performed by the function `erlang-test-criteria-list'.")
+
+(defvar erlang-electric-comma-criteria
+  '(erlang-stop-when-inside-argument-list
+    erlang-stop-when-at-guard
+    erlang-next-lines-empty-p
+    erlang-at-keyword-end-p
+    erlang-at-end-of-clause-p
+    erlang-at-end-of-function-p)
+  "*List of functions controlling `erlang-electric-comma'.
+The functions in this list are called, in order, whenever a comma
+is typed.  Each function in the list is called with no arguments,
+and should return one of the following values:
+
+  nil             -- no determination made, continue checking
+  'stop           -- do not create prototype for next line
+  (anything else) -- insert prototype, and stop checking
+
+If every function in the list is called with no determination made,
+then no prototype is inserted.
+
+The test is performed by the function `erlang-test-criteria-list'.")
+
+(defvar erlang-electric-arrow-criteria
+  '(erlang-stop-when-in-type-spec
+    erlang-next-lines-empty-p
+    erlang-at-end-of-function-p)
+  "*List of functions controlling the arrow aspect of `erlang-electric-gt'.
+The functions in this list are called, in order, whenever a `>'
+is typed.  Each function in the list is called with no arguments,
+and should return one of the following values:
+
+  nil             -- no determination made, continue checking
+  'stop           -- do not create prototype for next line
+  (anything else) -- insert prototype, and stop checking
+
+If every function in the list is called with no determination made,
+then no prototype is inserted.
+
+The test is performed by the function `erlang-test-criteria-list'.")
+
+(defvar erlang-electric-newline-criteria
+  '(t)
+  "*List of functions controlling `erlang-electric-newline'.
+
+The electric newline commands indents the next line.  Should the
+current line begin with a comment the comment start is copied to
+the newly created line.
+
+The functions in this list are called, in order, whenever a comma
+is typed.  Each function in the list is called with no arguments,
+and should return one of the following values:
+
+  nil             -- no determination made, continue checking
+  'stop           -- do not create prototype for next line
+  (anything else) -- trigger the electric command.
+
+If every function in the list is called with no determination made,
+then no prototype is inserted.  Should the atom t be a member of the
+list, it is treated as a function triggering the electric command.
+
+The test is performed by the function `erlang-test-criteria-list'.")
+
+(defvar erlang-next-lines-empty-threshold 2
+  "*Number of blank lines required to activate an electric command.
+
+Actually, this value controls the behaviour of the function
+`erlang-next-lines-empty-p' which normally is a member of the
+criteria lists controlling the electric commands.  (Please see
+the variables `erlang-electric-semicolon-criteria' and
+`erlang-electric-comma-criteria'.)
+
+The variable is bound to a threshold value, a number, representing the
+number of lines which must be empty.
+
+Setting this variable to zero, electric commands will always be
+triggered by `erlang-next-lines-empty-p', unless inhibited by other
+rules.
+
+Should this variable be nil, `erlang-next-lines-empty-p' will never
+trigger an electric command.  The same effect would be reached if the
+function `erlang-next-lines-empty-p' would be removed from the criteria
+lists.
+
+Note that even if `erlang-next-lines-empty-p' should not trigger an
+electric command, other functions in the criteria list could.")
+
+(defvar erlang-new-clause-with-arguments nil
+  "*Non-nil means that the arguments are cloned when a clause is generated.
+
+A new function header can be generated by calls to the function
+`erlang-generate-new-clause' and by use of the electric semicolon.")
+
+(defvar erlang-compile-use-outdir t
+  "*When nil, go to the directory containing source file when compiling.
+
+This is a workaround for a bug in the `outdir' option of compile.  If the
+outdir is not in the current load path, Erlang doesn't load the object
+module after it has been compiled.
+
+To activate the workaround, place the following in your `~/.emacs' file:
+    (setq erlang-compile-use-outdir nil)")
+
+(defvar erlang-indent-level 4
+  "*Indentation of Erlang calls/clauses within blocks.")
+(put 'erlang-indent-level 'safe-local-variable 'integerp)
+
+(defvar erlang-indent-guard 2
+  "*Indentation of Erlang guards.")
+(put 'erlang-indent-guard 'safe-local-variable 'integerp)
+
+(defvar erlang-argument-indent 2
+  "*Indentation of the first argument in a function call.
+When nil, indent to the column after the `(' of the
+function.")
+(put 'erlang-argument-indent 'safe-local-variable '(lambda (val) (or (null val) (integerp val))))
+
+(defvar erlang-tab-always-indent t
+  "*Non-nil means TAB in Erlang mode should always re-indent the current line,
+regardless of where in the line point is when the TAB command is used.")
+
+(defvar erlang-man-inhibit (eq system-type 'windows-nt)
+  "Inhibit the creation of the Erlang Manual Pages menu.
+
+The Windows distribution of Erlang does not include man pages, hence
+there is no attempt to create the menu.")
+
+(defvar erlang-man-dirs
+  '(("Man - Commands" "/man/man1" t)
+    ("Man - Modules" "/man/man3" t)
+    ("Man - Files" "/man/man4" t)
+    ("Man - Applications" "/man/man6" t))
+  "*The man directories displayed in the Erlang menu.
+
+Each item in the list should be a list with three elements, the first
+the name of the menu, the second the directory, and the last a flag.
+Should the flag the nil, the directory is absolute, should it be non-nil
+the directory is relative to the variable `erlang-root-dir'.")
+
+(defvar erlang-man-max-menu-size 35
+  "*The maximum number of menu items in one menu allowed.")
+
+(defvar erlang-man-display-function 'erlang-man-display
+  "*Function used to display man page.
+
+The function is called with one argument, the name of the file
+containing the man page.  Use this variable when the default
+function, `erlang-man-display', does not work on your system.")
+
+(defvar erlang-compile-extra-opts '()
+  "*Additional options to the compilation command.
+This is an elisp list of options. Each option can be either:
+- an atom
+- a dotted pair
+- a string
+Example: '(bin_opt_info (i . \"/path1/include\") (i . \"/path2/include\"))")
+
+(defvar erlang-compile-command-function-alist
+  '((".erl\\'" . inferior-erlang-compute-erl-compile-command)
+    (".xrl\\'" . inferior-erlang-compute-leex-compile-command)
+    (".yrl\\'" . inferior-erlang-compute-yecc-compile-command)
+    ("." . inferior-erlang-compute-erl-compile-command))
+  "*Alist of filename patterns vs corresponding compilation functions.
+Each element looks like (REGEXP . FUNCTION). Compiling a file whose name
+matches REGEXP specifies FUNCTION to use to compute the compilation
+command. The FUNCTION will be called with two arguments: module name and
+default compilation options, like output directory. The FUNCTION
+is expected to return a string.")
+
+(defvar erlang-leex-compile-opts '()
+  "*Options to pass to leex when compiling xrl files.
+This is an elisp list of options. Each option can be either:
+- an atom
+- a dotted pair
+- a string")
+
+(defvar erlang-yecc-compile-opts '()
+  "*Options to pass to yecc when compiling yrl files.
+This is an elisp list of options. Each option can be either:
+- an atom
+- a dotted pair
+- a string")
+
+(eval-and-compile
+  (defvar erlang-regexp-modern-p
+    (if (> erlang-emacs-major-version 21) t nil)
+    "Non-nil when this version of Emacs uses a modern version of regexp.
+Supporting \_< and \_> This is determined by checking the version of Emacs used."))
+
+(eval-and-compile
+  (defconst erlang-atom-quoted-regexp 
+    "'\\(?:[^\\']\\|\\(?:\\\\.\\)\\)*'"
+    "Regexp describing a single-quoted atom"))
+
+(eval-and-compile
+  (defconst erlang-atom-regular-regexp
+    (if erlang-regexp-modern-p
+	"\\_<[[:lower:]]\\(?:\\sw\\|\\s_\\)*\\_>"
+      "\\<[[:lower:]]\\(?:\\sw\\|\\s_\\)*\\>")
+    "Regexp describing a regular (non-quoted) atom"))
+
+(eval-and-compile
+  (defconst erlang-atom-regexp 
+    (concat "\\(" erlang-atom-quoted-regexp "\\|" 
+	    erlang-atom-regular-regexp "\\)")
+    "Regexp describing an Erlang atom."))
+
+(eval-and-compile
+  (defconst erlang-atom-regexp-matches 1
+    "Number of regexp parenthesis pairs in `erlang-atom-regexp'.
+  
+This is used to determine parenthesis matches in complex regexps which
+contains `erlang-atom-regexp'."))
+
+
+(eval-and-compile
+  (defconst erlang-variable-regexp 
+    (if erlang-regexp-modern-p 
+	"\\_<\\([[:upper:]_]\\(?:\\sw\\|\\s_\\)*\\)\\_>"
+      "\\<\\([[:upper:]_]\\(?:\\sw\\|\\s_\\)*\\)\\>")
+    "Regexp which should match an Erlang variable.
+
+The regexp must be surrounded with a pair of regexp parentheses."))
+
+(eval-and-compile
+  (defconst erlang-variable-regexp-matches 1
+    "Number of regexp parenthesis pairs in `erlang-variable-regexp'.
+
+This is used to determine matches in complex regexps which contains
+`erlang-variable-regexp'."))
+
+
+(eval-and-compile
+  (defun erlang-regexp-opt (strings &optional paren)
+    "Like `regexp-opt', except if PAREN is `symbols', then the
+resulting regexp is surrounded by \\_< and \\_>."
+    (if (eq paren 'symbols)
+	(if erlang-regexp-modern-p
+	    (concat "\\_<" (regexp-opt strings t) "\\_>")
+	  (concat "\\<" (regexp-opt strings t) "\\>"))
+      (regexp-opt strings paren))))
+
+
+(eval-and-compile 
+  (defvar erlang-keywords
+    '("after"
+      "begin"
+      "catch"
+      "case"
+      "cond"
+      "end"
+      "fun"
+      "if"
+      "let"
+      "of"
+      "receive"
+      "try"
+      "when")
+    "Erlang reserved keywords"))
+
+(eval-and-compile
+  (defconst erlang-keywords-regexp (erlang-regexp-opt erlang-keywords 'symbols)))
+  
+(eval-and-compile
+  (defvar erlang-operators
+    '("and"
+      "andalso"
+      "band"
+      "bnot"
+      "bor"
+      "bsl"
+      "bsr"
+      "bxor"
+      "div"
+      "not"
+      "or"
+      "orelse"
+      "rem"
+      "xor")
+    "Erlang operators"))
+;; What about these?
+;; '+' '-' '*' '/' '>', '>=', '<', '=<', '=:=', '==', '=/=', '/='
+
+(eval-and-compile
+  (defconst erlang-operators-regexp (erlang-regexp-opt erlang-operators 'symbols)))
+  
+
+(eval-and-compile
+  (defvar erlang-guards
+    '("is_atom"
+      "is_binary"
+      "is_bitstring"
+      "is_boolean"
+      "is_float"
+      "is_function"
+      "is_integer"
+      "is_list"
+      "is_map"
+      "is_number"
+      "is_pid"
+      "is_port"
+      "is_record"
+      "is_reference"
+      "is_tuple"
+      "atom"
+      "binary"
+      "bitstring"
+      "boolean"
+      ;;"float"	; Not included to avoid clashes with the bif float/1
+      "function"
+      "integer"
+      "list"
+      "number"
+      "pid"
+      "port"
+      "record"
+      "reference"
+      "tuple")
+    "Erlang guards"))
+
+(eval-and-compile
+  (defconst erlang-guards-regexp (erlang-regexp-opt erlang-guards 'symbols)))
+
+(eval-and-compile
+  (defvar erlang-predefined-types
+    '("any"
+      "arity"
+      "boolean"
+      "byte"
+      "char"
+      "cons"
+      "deep_string"
+      "iodata"
+      "iolist"
+      "maybe_improper_list"
+      "module"
+      "mfa"
+      "nil"
+      "neg_integer"
+      "none"
+      "non_neg_integer"
+      "nonempty_list"
+      "nonempty_improper_list"
+      "nonempty_maybe_improper_list"
+      "nonempty_string"
+      "no_return"
+      "pos_integer"
+      "string"
+      "term"
+      "timeout"
+      "map")
+    "Erlang type specs types"))
+
+(eval-and-compile
+  (defconst erlang-predefined-types-regexp 
+    (erlang-regexp-opt erlang-predefined-types 'symbols)))
+
+
+(eval-and-compile
+  (defvar erlang-int-bifs
+    '("abs"
+      "apply"
+      "atom_to_binary"
+      "atom_to_list"
+      "binary_to_atom"
+      "binary_to_existing_atom"
+      "binary_to_float"
+      "binary_to_integer"
+      "binary_to_list"
+      "binary_to_term"
+      "binary_part"
+      "bit_size"
+      "bitsize"
+      "bitstring_to_list"
+      "byte_size"
+      "check_old_code"
+      "check_process_code"
+      "date"
+      "delete_module"
+      "demonitor"
+      "disconnect_node"
+      "element"
+      "erase"
+      "error"
+      "exit"
+      "float"
+      "float_to_binary"
+      "float_to_list"
+      "garbage_collect"
+      "get"
+      "get_keys"
+      "group_leader"
+      "halt"
+      "hd"
+      "integer_to_list"
+      "integer_to_binary"
+      "iolist_size"
+      "iolist_to_binary"
+      "is_alive"
+      "is_atom"
+      "is_binary"
+      "is_bitstring"
+      "is_boolean"
+      "is_float"
+      "is_function"
+      "is_integer"
+      "is_list"
+      "is_map"
+      "is_number"
+      "is_pid"
+      "is_port"
+      "is_process_alive"
+      "is_record"
+      "is_reference"
+      "is_tuple"
+      "length"
+      "link"
+      "list_to_atom"
+      "list_to_binary"
+      "list_to_bitstring"
+      "list_to_existing_atom"
+      "list_to_float"
+      "list_to_integer"
+      "list_to_pid"
+      "list_to_tuple"
+      "load_module"
+      "make_ref"
+      "map_size"
+      "max"
+      "min"
+      "module_loaded"
+      "monitor"
+      "monitor_node"
+      "node"
+      "nodes"
+      "now"
+      "open_port"
+      "pid_to_list"
+      "port_close"
+      "port_command"
+      "port_connect"
+      "port_control"
+      "pre_loaded"
+      "process_flag"
+      "process_info"
+      "processes"
+      "purge_module"
+      "put"
+      "register"
+      "registered"
+      "round"
+      "self"
+      "setelement"
+      "size"
+      "spawn"
+      "spawn_link"
+      "spawn_monitor"
+      "spawn_opt"
+      "split_binary"
+      "statistics"
+      "term_to_binary"
+      "time"
+      "throw"
+      "tl"
+      "trunc"
+      "tuple_size"
+      "tuple_to_list"
+      "unlink"
+      "unregister"
+      "whereis")
+    "Erlang built-in functions (BIFs)"))
+
+(eval-and-compile
+  (defconst erlang-int-bif-regexp (erlang-regexp-opt erlang-int-bifs 'symbols)))
+  
+
+(eval-and-compile
+  (defvar erlang-ext-bifs
+    '("adler32"
+      "adler32_combine"
+      "alloc_info"
+      "alloc_sizes"
+      "append"
+      "append_element"
+      "await_proc_exit"
+      "await_sched_wall_time_modifications"
+      "bump_reductions"
+      "call_on_load_function"
+      "cancel_timer"
+      "crasher"
+      "crc32"
+      "crc32_combine"
+      "decode_packet"
+      "delay_trap"
+      "delete_element"
+      "dexit"
+      "dgroup_leader"
+      "display"
+      "display_nl"
+      "display_string"
+      "dist_exit"
+      "dlink"
+      "dmonitor_node"
+      "dmonitor_p"
+      "dsend"
+      "dt_append_vm_tag_data"
+      "dt_get_tag"
+      "dt_get_tag_data"
+      "dt_prepend_vm_tag_data"
+      "dt_put_tag"
+      "dt_restore_tag"
+      "dt_spread_tag"
+      "dunlink"
+      "convert_time_unit"
+      "external_size"
+      "finish_after_on_load"
+      "finish_loading"
+      "format_cpu_topology"
+      "fun_info"
+      "fun_info_mfa"
+      "fun_to_list"
+      "function_exported"
+      "garbage_collect_message_area"
+      "gather_gc_info_result"
+      "gather_sched_wall_time_result"
+      "get_cookie"
+      "get_module_info"
+      "get_stacktrace"
+      "hash"
+      "hibernate"
+      "insert_element"
+      "is_builtin"
+      "load_nif"
+      "loaded"
+      "localtime"
+      "localtime_to_universaltime"
+      "make_fun"
+      "make_tuple"
+      "match_spec_test"
+      "md5"
+      "md5_final"
+      "md5_init"
+      "md5_update"
+      "memory"
+      "module_info"
+      "monitor_node"
+      "monotonic_time"
+      "nif_error"
+      "phash"
+      "phash2"
+      "port_call"
+      "port_get_data"
+      "port_info"
+      "port_set_data"
+      "port_to_list"
+      "ports"
+      "posixtime_to_universaltime"
+      "prepare_loading"
+      "process_display"
+      "raise"
+      "read_timer"
+      "ref_to_list"
+      "resume_process"
+      "send"
+      "send_after"
+      "send_nosuspend"
+      "seq_trace"
+      "seq_trace_info"
+      "seq_trace_print"
+      "set_cookie"
+      "set_cpu_topology"
+      "setnode"
+      "spawn_opt"
+      "start_timer"
+      "subtract"
+      "suspend_process"
+      "system_flag"
+      "system_info"
+      "system_monitor"
+      "system_profile"
+      "system_time"
+      "trace"
+      "trace_delivered"
+      "trace_info"
+      "trace_pattern"
+      "time_offset"
+      "timestamp"
+      "universaltime"
+      "universaltime_to_localtime"
+      "universaltime_to_posixtime"
+      "unique_integer"
+      "yield")
+    "Erlang built-in functions (BIFs) that needs erlang: prefix"))
+
+(eval-and-compile
+  (defconst erlang-ext-bif-regexp
+    (erlang-regexp-opt (append erlang-int-bifs erlang-ext-bifs) 'symbols)))
+
+
+(defvar erlang-defun-prompt-regexp (concat "^" erlang-atom-regexp "\\s *(")
+  "Regexp which should match beginning of a clause.")
+
+(defvar erlang-file-name-extension-regexp "\\.[eh]rl$"
+  "*Regexp which should match an Erlang file name.
+
+This regexp is used when an Erlang module name is extracted from the
+name of an Erlang source file.
+
+The regexp should only match the section of the file name which should
+be excluded from the module name.
+
+To match all files set this variable to \"\\\\(\\\\..*\\\\|\\\\)$\".
+The matches all except the extension.  This is useful if the Erlang
+tags system should interpret tags on the form `module:tag' for
+files written in other languages than Erlang.")
+
+(defvar erlang-inferior-shell-split-window t
+  "*If non-nil, when starting an inferior shell, split windows.
+If nil, the inferior shell replaces the window. This is the traditional
+behaviour.")
+
+(defconst inferior-erlang-use-cmm (boundp 'minor-mode-overriding-map-alist)
+  "Non-nil means use `compilation-minor-mode' in Erlang shell.")
+
+(defvar erlang-mode-map
+  (let ((map (make-sparse-keymap)))
+    (unless (boundp 'indent-line-function)
+      (define-key map "\t"        'erlang-indent-command))
+    (define-key map ";"	      'erlang-electric-semicolon)
+    (define-key map ","	      'erlang-electric-comma)
+    (define-key map "<"         'erlang-electric-lt)
+    (define-key map ">"         'erlang-electric-gt)
+    (define-key map "\C-m"      'erlang-electric-newline)
+    (if (not (boundp 'delete-key-deletes-forward))
+        (define-key map "\177" 'backward-delete-char-untabify)
+      (define-key map [(backspace)] 'backward-delete-char-untabify))
+    ;;(unless (boundp 'fill-paragraph-function)
+    (define-key map "\M-q"      'erlang-fill-paragraph)
+    (unless (boundp 'beginning-of-defun-function)
+      (define-key map "\M-\C-a"   'erlang-beginning-of-function)
+      (define-key map "\M-\C-e"   'erlang-end-of-function)
+      (define-key map '(meta control h)   'erlang-mark-function))	; Xemacs
+    (define-key map "\M-\t"     'erlang-complete-tag)
+    (define-key map "\C-c\M-\t" 'tempo-complete-tag)
+    (define-key map "\M-+"      'erlang-find-next-tag)
+    (define-key map "\C-c\M-a"  'erlang-beginning-of-clause)
+    (define-key map "\C-c\M-b"  'tempo-backward-mark)
+    (define-key map "\C-c\M-e"  'erlang-end-of-clause)
+    (define-key map "\C-c\M-f"  'tempo-forward-mark)
+    (define-key map "\C-c\M-h"  'erlang-mark-clause)
+    (define-key map "\C-c\C-c"  'comment-region)
+    (define-key map "\C-c\C-j"  'erlang-generate-new-clause)
+    (define-key map "\C-c\C-k"  'erlang-compile)
+    (define-key map "\C-c\C-l"  'erlang-compile-display)
+    (define-key map "\C-c\C-s"  'erlang-show-syntactic-information)
+    (define-key map "\C-c\C-q"  'erlang-indent-function)
+    (define-key map "\C-c\C-u"  'erlang-uncomment-region)
+    (define-key map "\C-c\C-y"  'erlang-clone-arguments)
+    (define-key map "\C-c\C-a"  'erlang-align-arrows)
+    (define-key map "\C-c\C-z"  'erlang-shell-display)
+    (unless inferior-erlang-use-cmm
+      (define-key map "\C-x`"    'erlang-next-error))
+    map)
+  "*Keymap used in Erlang mode.")
+(defvar erlang-mode-abbrev-table nil
+  "Abbrev table in use in Erlang-mode buffers.")
+(defvar erlang-mode-syntax-table nil
+  "Syntax table in use in Erlang-mode buffers.")
+
+
+
+(defvar erlang-skel-file "erlang-skels"
+  "The type of erlang-skeletons that should be used, default
+   uses edoc type, for the old type, standard comments,
+   set \"erlang-skels-old\" in your .emacs and restart.
+
+   Or define your own and set the variable to that file.")
+
+;; Tempo skeleton templates:
+(load erlang-skel-file)
+
+;; Font-lock variables
+
+;; The next few variables define different Erlang font-lock patterns.
+;; They could be appended to form a custom font-lock appearance.
+;;
+;; The function `erlang-font-lock-set-face' could be used to change
+;; the face of a pattern.
+;;
+;; Note that Erlang strings and atoms are highlighted with using
+;; syntactic analysis.
+
+(defvar erlang-font-lock-keywords-function-header
+  (list
+   (list (concat "^" erlang-atom-regexp "\\s-*(")
+	 1 'font-lock-function-name-face t))
+  "Font lock keyword highlighting a function header.")
+
+(defface erlang-font-lock-exported-function-name-face
+  '((default (:inherit font-lock-function-name-face)))
+  "Face used for highlighting exported functions.")
+
+(defvar erlang-font-lock-exported-function-name-face
+  'erlang-font-lock-exported-function-name-face)
+
+(defvar erlang-inhibit-exported-function-name-face nil
+  "Inhibit separate face for exported functions")
+
+(defvar erlang-font-lock-keywords-exported-function-header
+  (list
+   (list #'erlang-match-next-exported-function
+	 1 'erlang-font-lock-exported-function-name-face t))
+  "Font lock keyword highlighting an exported function header.")
+
+(defvar erlang-font-lock-keywords-int-bifs
+  (list
+   (list (concat erlang-int-bif-regexp "\\s-*(")
+         1 'font-lock-builtin-face))
+  "Font lock keyword highlighting built in functions.")
+
+(defvar erlang-font-lock-keywords-ext-bifs
+  (list
+   (list (concat "\\<\\(erlang\\)\\s-*:\\s-*" erlang-ext-bif-regexp "\\s-*(")
+	 '(1 'font-lock-builtin-face)
+	 '(2 'font-lock-builtin-face)))
+  "Font lock keyword highlighting built in functions.")
+
+(defvar erlang-font-lock-keywords-int-function-calls
+  (list
+   (list (concat erlang-atom-regexp "\\s-*(")
+         1 'font-lock-type-face))
+  "Font lock keyword highlighting an internal function call.")
+
+(defvar erlang-font-lock-keywords-ext-function-calls
+  (list
+   (list (concat erlang-atom-regexp "\\s-*:\\s-*"
+                 erlang-atom-regexp "\\s-*(")
+         '(1 'font-lock-type-face)
+	 '(2 'font-lock-type-face)))
+  "Font lock keyword highlighting an external function call.")
+
+(defvar erlang-font-lock-keywords-fun-n
+  (list
+   (list (concat "\\(" erlang-atom-regexp "/[0-9]+\\)")
+         1 'font-lock-type-face))
+  "Font lock keyword highlighting a fun descriptor in F/N format.")
+
+(defvar erlang-font-lock-keywords-operators
+  (list
+   (list erlang-operators-regexp
+         1 'font-lock-builtin-face))
+  "Font lock keyword highlighting Erlang operators.")
+
+(defvar erlang-font-lock-keywords-dollar
+  (list
+   (list "\\(\\$\\([^\\]\\|\\\\\\([^0-7^\n]\\|[0-7]+\\|\\^[a-zA-Z]\\)\\)\\)"
+	 1 'font-lock-constant-face))
+  "Font lock keyword highlighting numbers in ASCII form (e.g. $A).")
+
+(defvar erlang-font-lock-keywords-arrow
+  (list
+   (list "->\\(\\s \\|$\\)" 1 'font-lock-function-name-face))
+  "Font lock keyword highlighting clause arrow.")
+
+(defvar erlang-font-lock-keywords-lc
+  (list
+   (list "\\(<-\\|<=\\|||\\)\\(\\s \\|$\\)" 1 'font-lock-keyword-face))
+  "Font lock keyword highlighting list comprehension operators.")
+
+(defvar erlang-font-lock-keywords-keywords
+  (list
+   (list erlang-keywords-regexp 1 'font-lock-keyword-face))
+  "Font lock keyword highlighting Erlang keywords.")
+
+(defvar erlang-font-lock-keywords-attr
+  (list
+   (list (concat "^\\(-" erlang-atom-regexp "\\)\\(\\s-\\|\\.\\|(\\)")	 
+	 1 (if (boundp 'font-lock-preprocessor-face)
+	       'font-lock-preprocessor-face
+	     'font-lock-constant-face)))
+  "Font lock keyword highlighting attributes.")
+
+(defvar erlang-font-lock-keywords-quotes
+  (list
+   (list "`\\([-+a-zA-Z0-9_:*][-+a-zA-Z0-9_:*]+\\)'"
+	 1
+	 'font-lock-keyword-face
+	 t))
+  "Font lock keyword highlighting words in single quotes in comments.
+
+This is not the highlighting of Erlang strings and atoms, which
+are highlighted by syntactic analysis.")
+
+(defvar erlang-font-lock-keywords-guards
+  (list
+   (list (concat "[^:]" erlang-guards-regexp "\\s-*(")
+	 1 'font-lock-builtin-face))
+  "Font lock keyword highlighting guards.")
+
+(defvar erlang-font-lock-keywords-predefined-types
+  (list
+   (list (concat "[^:]" erlang-predefined-types-regexp "\\s-*(")
+	 1 'font-lock-builtin-face))
+  "Font lock keyword highlighting predefined types.")
+
+
+(defvar erlang-font-lock-keywords-macros
+  (list
+   (list (concat "?\\s-*\\(" erlang-atom-regexp
+		 "\\|" erlang-variable-regexp "\\)")
+	 1 'font-lock-constant-face)
+   (list (concat "^\\(-\\(?:define\\|ifn?def\\)\\)\\s-*(\\s-*\\(" erlang-atom-regexp
+		 "\\|" erlang-variable-regexp "\\)")
+	 (if (boundp 'font-lock-preprocessor-face)
+	     (list 1 'font-lock-preprocessor-face t)
+	   (list 1 'font-lock-constant-face t))
+	 (list 3 'font-lock-type-face t t))
+   (list "^-e\\(lse\\|ndif\\)\\>" 0 'font-lock-preprocessor-face t))
+  "Font lock keyword highlighting macros.
+This must be placed in front of `erlang-font-lock-keywords-vars'.")
+
+(defvar erlang-font-lock-keywords-records
+  (list
+   (list (concat "#\\s *" erlang-atom-regexp)
+         1 'font-lock-type-face)
+   ;; Don't highlight numerical constants.
+   (list (if erlang-regexp-modern-p
+	     "\\_<[0-9]+#\\([0-9a-zA-Z]+\\)"
+	   "\\<[0-9]+#\\([0-9a-zA-Z]+\\)")
+         1 nil t)
+   (list (concat "^-record\\s-*(\\s-*" erlang-atom-regexp)
+         1 'font-lock-type-face))
+  "Font lock keyword highlighting Erlang records.
+This must be placed in front of `erlang-font-lock-keywords-vars'.")
+
+(defvar erlang-font-lock-keywords-vars
+  (list
+   (list (concat "[^#]" erlang-variable-regexp)	; no numerical constants
+	 1 'font-lock-variable-name-face))
+  "Font lock keyword highlighting Erlang variables.
+Must be preceded by `erlang-font-lock-keywords-macros' to work properly.")
+
+(defvar erlang-font-lock-descr-string
+  "Font-lock keywords used by Erlang Mode.
+
+There exists three levels of Font Lock keywords for Erlang:
+  `erlang-font-lock-keywords-1' - Function headers and reserved keywords.
+  `erlang-font-lock-keywords-2' - Bifs, guards and `single quotes'.
+  `erlang-font-lock-keywords-3' - Variables, macros and records.
+  `erlang-font-lock-keywords-4' - Exported functions, Function names,
+                                  Funs, LCs (not Atoms).
+
+To use a specific level, please set the variable
+`font-lock-maximum-decoration' to the appropriate level.  Note that the
+variable must be set before Erlang mode is activated.
+
+Example:
+    (setq font-lock-maximum-decoration 2)")
+
+(defvar erlang-font-lock-keywords-1
+  (append erlang-font-lock-keywords-function-header
+	  erlang-font-lock-keywords-dollar
+	  erlang-font-lock-keywords-arrow
+	  erlang-font-lock-keywords-keywords
+	  )
+  ;; DocStringOrig: erlang-font-lock-keywords
+  erlang-font-lock-descr-string)
+
+(defvar erlang-font-lock-keywords-2
+  (append erlang-font-lock-keywords-1
+	  erlang-font-lock-keywords-int-bifs
+	  erlang-font-lock-keywords-ext-bifs
+	  erlang-font-lock-keywords-attr
+	  erlang-font-lock-keywords-quotes
+	  erlang-font-lock-keywords-guards
+	  )
+  ;; DocStringCopy: erlang-font-lock-keywords
+  erlang-font-lock-descr-string)
+
+(defvar erlang-font-lock-keywords-3
+  (append erlang-font-lock-keywords-2
+	  erlang-font-lock-keywords-operators
+	  erlang-font-lock-keywords-macros
+	  erlang-font-lock-keywords-records
+	  erlang-font-lock-keywords-vars
+	  erlang-font-lock-keywords-predefined-types
+	  )
+  ;; DocStringCopy: erlang-font-lock-keywords
+  erlang-font-lock-descr-string)
+
+(defvar erlang-font-lock-keywords-4
+  (append erlang-font-lock-keywords-3
+          erlang-font-lock-keywords-exported-function-header
+          erlang-font-lock-keywords-int-function-calls
+	  erlang-font-lock-keywords-ext-function-calls
+	  erlang-font-lock-keywords-fun-n
+          erlang-font-lock-keywords-lc
+	  )
+  ;; DocStringCopy: erlang-font-lock-keywords
+  erlang-font-lock-descr-string)
+
+(defvar erlang-font-lock-keywords erlang-font-lock-keywords-4
+  ;; DocStringCopy: erlang-font-lock-keywords
+  erlang-font-lock-descr-string)
+
+(defvar erlang-font-lock-syntax-table nil
+  "Syntax table used by Font Lock mode.
+
+The difference between this and the standard Erlang Mode
+syntax table is that `_' is treated as part of words by
+this syntax table.
+
+Unfortunately, XEmacs hasn't got support for a special Font
+Lock syntax table.  The effect is that `apply' in the atom
+`foo_apply' will be highlighted as a bif.")
+
+
+;;; Avoid errors while compiling this file.
+
+;; `eval-when-compile' is not defined in Emacs 18.  We define it as a
+;; no-op.
+(or (fboundp 'eval-when-compile)
+    (defmacro eval-when-compile (&rest rest) nil))
+
+;; These umm...functions are new in Emacs 20. And, yes, until version
+;; 19.27 Emacs backquotes were this ugly.
+
+(or (fboundp 'unless)
+    (defmacro unless (condition &rest body)
+      "(unless CONDITION BODY...): If CONDITION is false, do BODY, else return nil."
+      `((if (, condition) nil ,@body))))
+
+(or (fboundp 'when)
+    (defmacro when (condition &rest body)
+      "(when CONDITION BODY...): If CONDITION is true, do BODY, else return nil."
+      `((if (, condition) (progn ,@body) nil))))
+
+(or (fboundp 'char-before)
+    (defmacro char-before (&optional pos)
+      "Return the character in the current buffer just before POS."
+      `( (char-after (1- (or ,pos (point)))))))
+
+;; defvar some obsolete variables, which we still support for
+;; backwards compatibility reasons.
+(eval-when-compile
+  (defvar comment-indent-hook)
+  (defvar dabbrev-case-fold-search)
+  (defvar tempo-match-finder)
+  (defvar compilation-menu-map)
+  (defvar next-error-last-buffer))
+
+(eval-when-compile
+  (if (or (featurep 'bytecomp)
+	  (featurep 'byte-compile))
+      (progn
+	(cond ((string-match "Lucid\\|XEmacs" emacs-version)
+	       (put 'comment-indent-hook 'byte-obsolete-variable nil)
+	       ;; Do not warn for unused variables
+	       ;; when compiling under XEmacs.
+	       (setq byte-compile-warnings
+		     '(free-vars unresolved callargs redefine))))
+	(require 'comint)
+	(require 'tempo)
+	(require 'compile))))
+
+
+(defun erlang-version ()
+  "Return the current version of Erlang mode."
+  (interactive)
+  (if (interactive-p)
+      (message "Erlang mode version %s, written by Anders Lindgren"
+	       erlang-version))
+  erlang-version)
+
+
+;;;###autoload
+(defun erlang-mode ()
+  "Major mode for editing Erlang source files in Emacs.
+It knows about syntax and comment, it can indent code, it is capable
+of fontifying the source file, the TAGS commands are aware of Erlang
+modules, and the Erlang man pages can be accessed.
+
+Should this module, \"erlang.el\", be installed properly, Erlang mode
+is activated whenever an Erlang source or header file is loaded into
+Emacs.  To indicate this, the mode line should contain the word
+\"Erlang\".
+
+The main feature of Erlang mode is indentation, press TAB and the
+current line will be indented correctly.
+
+Comments starting with only one `%' are indented to the column stored
+in the variable `comment-column'.  Comments starting with two `%':s
+are indented with the same indentation as code.  Comments starting
+with at least three `%':s are indented to the first column.
+
+However, Erlang mode contains much more, this is a list of the most
+useful commands:
+     TAB     - Indent the line.
+     C-c C-q - Indent current function.
+     M-;     - Create a comment at the end of the line.
+     M-q     - Fill a comment, i.e. wrap lines so that they (hopefully)
+		 will look better.
+     M-a     - Goto the beginning of an Erlang clause.
+     M-C-a   - Ditto for function.
+     M-e     - Goto the end of an Erlang clause.
+     M-C-e   - Ditto for function.
+     M-h     - Mark current Erlang clause.
+     M-C-h   - Ditto for function.
+     C-c C-z - Start, or switch to, an inferior Erlang shell.
+     C-c C-k - Compile current file.
+     C-x `   - Next error.
+     ,       - Electric comma.
+     ;       - Electric semicolon.
+
+Erlang mode check the name of the file against the module name when
+saving, whenever a mismatch occurs Erlang mode offers to modify the
+source.
+
+The variable `erlang-electric-commands' controls the electric
+commands.  To deactivate all of them, set it to nil.
+
+There exists a large number of commands and variables in the Erlang
+module.  Please press `M-x apropos RET erlang RET' to see a complete
+list.  Press `C-h f name-of-function RET' and `C-h v name-of-variable
+RET'to see the full description of functions and variables,
+respectively.
+
+On entry to this mode the contents of the hook `erlang-mode-hook' is
+executed.
+
+Please see the beginning of the file `erlang.el' for more information
+and examples of hooks.
+
+Other commands:
+\\{erlang-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (setq major-mode 'erlang-mode)
+  (setq mode-name "Erlang")
+  (erlang-syntax-table-init)
+  (use-local-map erlang-mode-map)
+  (erlang-electric-init)
+  (erlang-menu-init)
+  (erlang-mode-variables)
+  (erlang-check-module-name-init)
+  (erlang-man-init)
+  (erlang-tags-init)
+  (erlang-font-lock-init)
+  (erlang-skel-init)
+  (tempo-use-tag-list 'erlang-tempo-tags)
+  (run-hooks 'erlang-mode-hook)
+  (if (zerop (buffer-size))
+      (run-hooks 'erlang-new-file-hook))
+  ;; Doesn't exist in Emacs v21.4; required by Emacs v23.
+  (if (boundp 'after-change-major-mode-hook)
+      (run-hooks 'after-change-major-mode-hook)))
+
+;;;###autoload
+(dolist (r '("\\.erl$" "\\.app\\.src$" "\\.escript"
+             "\\.hrl$" "\\.xrl$" "\\.yrl" "/ebin/.+\\.app"))
+  (add-to-list 'auto-mode-alist (cons r 'erlang-mode)))
+
+(defun erlang-syntax-table-init ()
+  (if (null erlang-mode-syntax-table)
+      (let ((table (make-syntax-table)))
+	(modify-syntax-entry ?\n ">" table)
+	(modify-syntax-entry ?\" "\"" table)
+	(modify-syntax-entry ?# "." table)
+;;	(modify-syntax-entry ?$ "\\" table)   ;; Creates problems with indention afterwards
+;;	(modify-syntax-entry ?$ "'" table)    ;; Creates syntax highlighting and indention problems
+	(modify-syntax-entry ?$ "/" table)    ;; Misses the corner case "string that ends with $" 
+	                                      ;; we have to live with that for now..it is the best alternative
+	                                      ;; that can be worked around with "string hat ends with \$" 
+	(modify-syntax-entry ?% "<" table)
+	(modify-syntax-entry ?& "." table)
+	(modify-syntax-entry ?\' "\"" table)
+	(modify-syntax-entry ?* "." table)
+	(modify-syntax-entry ?+ "." table)
+	(modify-syntax-entry ?- "." table)
+	(modify-syntax-entry ?/ "." table)
+	(modify-syntax-entry ?: "." table)
+	(modify-syntax-entry ?< "." table)
+	(modify-syntax-entry ?= "." table)
+	(modify-syntax-entry ?> "." table)
+	(modify-syntax-entry ?\\ "\\" table)
+	(modify-syntax-entry ?_ "_" table)
+	(modify-syntax-entry ?| "." table)
+	(modify-syntax-entry ?^ "'" table)
+	
+	;; Pseudo bit-syntax: Latin1 double angle quotes as parens.
+	;;(modify-syntax-entry ?\253 "(?\273" table)
+	;;(modify-syntax-entry ?\273 ")?\253" table)
+
+	(setq erlang-mode-syntax-table table)))
+
+  (set-syntax-table erlang-mode-syntax-table))
+
+
+(defun erlang-electric-init ()
+  ;; Set up electric character functions to work with
+  ;; delsel/pending-del mode. Also, set up text properties for bit
+  ;; syntax handling.
+  (mapc #'(lambda (cmd)
+	    (put cmd 'delete-selection t) ;for delsel (Emacs)
+	    (put cmd 'pending-delete t)) ;for pending-del (XEmacs)
+	'(erlang-electric-semicolon
+	  erlang-electric-comma
+	  erlang-electric-gt))
+  
+  (put 'bitsyntax-open-outer 'syntax-table '(4 . ?>))
+  (put 'bitsyntax-open-outer 'rear-nonsticky '(category))
+  (put 'bitsyntax-open-inner 'rear-nonsticky '(category))
+  (put 'bitsyntax-close-inner 'rear-nonsticky '(category))
+  (put 'bitsyntax-close-outer 'syntax-table '(5 . ?<))
+  (put 'bitsyntax-close-outer 'rear-nonsticky '(category))
+  (make-local-variable 'parse-sexp-lookup-properties)
+  (setq parse-sexp-lookup-properties 't))
+
+
+(defun erlang-mode-variables ()
+  (or erlang-mode-abbrev-table
+      (define-abbrev-table 'erlang-mode-abbrev-table ()))
+  (setq local-abbrev-table erlang-mode-abbrev-table)
+  (make-local-variable 'paragraph-start)
+  (setq paragraph-start (concat "^$\\|" page-delimiter))
+  (make-local-variable 'paragraph-separate)
+  (setq paragraph-separate paragraph-start)
+  (make-local-variable 'paragraph-ignore-fill-prefix)
+  (setq paragraph-ignore-fill-prefix t)
+  (make-local-variable 'require-final-newline)
+  (setq require-final-newline t)
+  (make-local-variable 'defun-prompt-regexp)
+  (setq defun-prompt-regexp erlang-defun-prompt-regexp)
+  (make-local-variable 'comment-start)
+  (setq comment-start "%")
+  (make-local-variable 'comment-start-skip)
+  (setq comment-start-skip "%+\\s *")
+  (make-local-variable 'comment-column)
+  (setq comment-column 48)
+  (make-local-variable 'indent-line-function)
+  (setq indent-line-function 'erlang-indent-command)
+  (make-local-variable 'indent-region-function)
+  (setq indent-region-function 'erlang-indent-region)
+  (set (make-local-variable 'comment-indent-function) 'erlang-comment-indent)
+  (if (<= erlang-emacs-major-version 18)
+      (set (make-local-variable 'comment-indent-hook) 'erlang-comment-indent))
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  (set (make-local-variable 'dabbrev-case-fold-search) nil)
+  (set (make-local-variable 'imenu-prev-index-position-function)
+       'erlang-beginning-of-function)
+  (set (make-local-variable 'imenu-extract-index-name-function)
+       'erlang-get-function-name-and-arity)
+  (set (make-local-variable 'tempo-match-finder)
+       "[^-a-zA-Z0-9_]\\([-a-zA-Z0-9_]*\\)\\=")
+  (set (make-local-variable 'beginning-of-defun-function)
+       'erlang-beginning-of-function)
+  (set (make-local-variable 'end-of-defun-function) 'erlang-end-of-function)
+  (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)
+  (set (make-local-variable 'fill-paragraph-function) 'erlang-fill-paragraph)
+  (set (make-local-variable 'comment-add) 1)
+  (set (make-local-variable 'outline-regexp) "[[:lower:]0-9_]+ *(.*) *-> *$")
+  (set (make-local-variable 'outline-level) (lambda () 1))
+  (set (make-local-variable 'add-log-current-defun-function)
+       'erlang-current-defun))
+
+(defun erlang-font-lock-init ()
+  "Initialize Font Lock for Erlang mode."
+  (or erlang-font-lock-syntax-table
+      (setq erlang-font-lock-syntax-table
+	    (let ((table (copy-syntax-table erlang-mode-syntax-table)))
+	      (modify-syntax-entry ?_ "w" table)
+	      table)))
+  (set (make-local-variable 'font-lock-syntax-table)
+       erlang-font-lock-syntax-table)
+  (set (make-local-variable 'font-lock-beginning-of-syntax-function)
+       'erlang-beginning-of-clause)
+  (make-local-variable 'font-lock-keywords)
+  (let ((level (cond ((boundp 'font-lock-maximum-decoration)
+		      (symbol-value 'font-lock-maximum-decoration))
+		     ((boundp 'font-lock-use-maximal-decoration)
+		      (symbol-value 'font-lock-use-maximal-decoration))
+		     (t nil))))
+    (if (consp level)
+	(setq level (cdr-safe (or (assq 'erlang-mode level)
+				  (assq t level)))))
+    ;; `level' can here be:
+    ;;      A number - The fontification level
+    ;;      nil      - Use the default
+    ;;      t        - Use maximum
+    (cond ((eq level nil)
+	   (set 'font-lock-keywords erlang-font-lock-keywords))
+	  ((eq level 1)
+	   (set 'font-lock-keywords erlang-font-lock-keywords-1))
+	  ((eq level 2)
+	   (set 'font-lock-keywords erlang-font-lock-keywords-2))
+          ((eq level 3)
+           (set 'font-lock-keywords erlang-font-lock-keywords-3))
+          (t
+           (set 'font-lock-keywords erlang-font-lock-keywords-4))))
+
+  ;; Modern font-locks can handle the above much more elegantly:
+  (set (make-local-variable 'font-lock-defaults)
+       '((erlang-font-lock-keywords erlang-font-lock-keywords-1
+				    erlang-font-lock-keywords-2 
+				    erlang-font-lock-keywords-3 
+				    erlang-font-lock-keywords-4)
+	 nil nil ((?_ . "w")) erlang-beginning-of-clause
+	 (font-lock-mark-block-function . erlang-mark-clause)
+         (font-lock-syntactic-keywords
+          ;; A dollar sign right before the double quote that ends a
+          ;; string is not a character escape.
+          ;;
+          ;; And a "string" consists of a double quote not escaped by a
+          ;; dollar sign, any number of non-backslash non-newline
+          ;; characters or escaped backslashes, a dollar sign
+          ;; (otherwise we wouldn't care) and a double quote.  This
+          ;; doesn't match multi-line strings, but this is probably
+          ;; the best we can get, since while font-locking we don't
+          ;; know whether matching started inside a string: limiting
+          ;; search to a single line keeps things sane.
+          . (("\\(?:^\\|[^$]\\)\"\\(?:[^\"\n]\\|\\\\\"\\)*\\(\\$\\)\"" 1 "w")
+	     ;; Likewise for atoms
+	     ("\\(?:^\\|[^$]\\)'\\(?:[^'\n]\\|\\\\'\\)*\\(\\$\\)'" 1 "w")
+             ;; And the dollar sign in $\" or $\' escapes two
+             ;; characters, not just one.
+             ("\\(\\$\\)\\\\[\"']" 1 "'"))))))
+
+
+
+;; Useful when defining your own keywords.
+(defun erlang-font-lock-set-face (ks &rest faces)
+  "Replace the face components in a list of keywords.
+
+The first argument, KS, is a list of keywords.  The rest of the
+arguments are expressions to replace the face information with.  The
+first expression replaces the face of the first keyword, the second
+expression the second keyword etc.
+
+Should an expression be nil, the face of the corresponding keyword is
+not changed.
+
+Should fewer expressions than keywords be given, the last expression
+is used for all remaining keywords.
+
+Normally, the expressions are just atoms representing the new face.
+They could however be more complex, returning different faces in
+different situations.
+
+This function only handles keywords with elements on the forms:
+  (REGEXP NUMBER FACE)
+  (REGEXP NUMBER FACE OVERWRITE)
+
+This could be used when defining your own special font-lock setup, e.g:
+
+\(setq my-font-lock-keywords
+      (append erlang-font-lock-keywords-function-header
+              erlang-font-lock-keywords-dollar
+              (erlang-font-lock-set-face
+               erlang-font-lock-keywords-macros 'my-neon-green-face)
+              (erlang-font-lock-set-face
+               erlang-font-lock-keywords-lc 'my-deep-red 'my-light-red)
+              erlang-font-lock-keywords-attr))
+
+For a more elaborate example, please see the beginning of the file
+`erlang.el'."
+  (let ((res '()))
+    (while ks
+      (let* ((regexp (car (car ks)))
+	     (number (car (cdr (car ks))))
+	     (new-face (if (and faces (car faces))
+			   (car faces)
+			 (car (cdr (cdr (car ks))))))
+	     (overwrite (car (cdr (cdr (cdr (car ks))))))
+	     (new-keyword (list regexp number new-face)))
+	(if overwrite (nconc new-keyword (list overwrite)))
+	(setq res (cons new-keyword res))
+	(setq ks (cdr ks))
+	(if (and faces (cdr faces))
+	    (setq faces (cdr faces)))))
+    (nreverse res)))
+
+
+(defun erlang-font-lock-level-0 ()
+  ;; DocStringOrig: font-cmd
+  "Unfontify current buffer."
+  (interactive)
+  (font-lock-mode 0))
+
+
+(defun erlang-font-lock-level-1 ()
+  ;; DocStringCopy: font-cmd
+  "Fontify current buffer at level 1.
+This highlights function headers, reserved keywords, strings and comments."
+  (interactive)
+  (require 'font-lock)
+  (set 'font-lock-keywords erlang-font-lock-keywords-1)
+  (font-lock-mode 1)
+  (funcall (symbol-function 'font-lock-fontify-buffer)))
+
+
+(defun erlang-font-lock-level-2 ()
+  ;; DocStringCopy: font-cmd
+  "Fontify current buffer at level 2.
+This highlights level 1 features (see `erlang-font-lock-level-1')
+plus bifs, guards and `single quotes'."
+  (interactive)
+  (require 'font-lock)
+  (set 'font-lock-keywords erlang-font-lock-keywords-2)
+  (font-lock-mode 1)
+  (funcall (symbol-function 'font-lock-fontify-buffer)))
+
+
+(defun erlang-font-lock-level-3 ()
+  ;; DocStringCopy: font-cmd
+  "Fontify current buffer at level 3.
+This highlights level 2 features (see `erlang-font-lock-level-2')
+plus variables, macros and records."
+  (interactive)
+  (require 'font-lock)
+  (set 'font-lock-keywords erlang-font-lock-keywords-3)
+  (font-lock-mode 1)
+  (funcall (symbol-function 'font-lock-fontify-buffer)))
+
+(defun erlang-font-lock-level-4 ()
+  ;; DocStringCopy: font-cmd
+  "Fontify current buffer at level 4.
+This highlights level 3 features (see `erlang-font-lock-level-2')
+plus variables, macros and records."
+  (interactive)
+  (require 'font-lock)
+  (set 'font-lock-keywords erlang-font-lock-keywords-4)
+  (font-lock-mode 1)
+  (funcall (symbol-function 'font-lock-fontify-buffer)))
+
+
+(defun erlang-menu-init ()
+  "Init menus for Erlang mode.
+
+The variable `erlang-menu-items' contain a description of the Erlang
+mode menu.  Normally, the list contains atoms, representing variables
+bound to pieces of the menu.
+
+Personal extensions could be added to `erlang-menu-personal-items'.
+
+This function should be called if any variable describing the
+menu configuration is changed."
+  (erlang-menu-install "Erlang" erlang-menu-items erlang-mode-map t))
+
+
+(defun erlang-menu-install (name items keymap &optional popup)
+  "Install a menu in Emacs or XEmacs based on an abstract description.
+
+NAME is the name of the menu.
+
+ITEMS is a list.  The elements are either nil representing a horizontal
+line or a list with two or three elements.  The first is the name of
+the menu item, the second the function to call, or a submenu, on the
+same same form as ITEMS.  The third optional element is an expression
+which is evaluated every time the menu is displayed.  Should the
+expression evaluate to nil the menu item is ghosted.
+
+KEYMAP is the keymap to add to menu to.  (When using XEmacs, the menu
+will only be visible when this menu is the global, the local, or an
+activate minor mode keymap.)
+
+If POPUP is non-nil, the menu is bound to the XEmacs `mode-popup-menu'
+variable, i.e. it will popup when pressing the right mouse button.
+
+Please see the variable `erlang-menu-base-items'."
+  (cond (erlang-xemacs-p
+	 (let ((menu (erlang-menu-xemacs name items keymap)))
+	   ;; We add the menu to the global menubar.
+	   ;;(funcall (symbol-function 'set-buffer-menubar)
+	   ;;         (symbol-value 'current-menubar))
+	   (funcall (symbol-function 'add-submenu) nil menu)
+	   (setcdr erlang-xemacs-popup-menu (cdr menu))
+	   (if (and popup (boundp 'mode-popup-menu))
+	       (funcall (symbol-function 'set)
+			'mode-popup-menu erlang-xemacs-popup-menu))))
+	((>= erlang-emacs-major-version 19)
+	 (define-key keymap (vector 'menu-bar (intern name))
+	   (erlang-menu-make-keymap name items)))
+	(t nil)))
+
+
+(defun erlang-menu-make-keymap (name items)
+  "Build a menu for Emacs 19."
+  (let ((menumap (funcall (symbol-function 'make-sparse-keymap)
+			  name))
+	(count 0)
+	id def first second third)
+    (setq items (reverse items))
+    (while items
+      ;; Replace any occurrence of atoms by their value.
+      (while (and items (atom (car items)) (not (null (car items))))
+	(if (and (boundp (car items))
+		 (listp (symbol-value (car items))))
+	    (setq items (append (reverse (symbol-value (car items)))
+				(cdr items)))
+	  (setq items (cdr items))))
+      (setq first (car-safe (car items)))
+      (setq second (car-safe (cdr-safe (car items))))
+      (setq third (car-safe (cdr-safe (cdr-safe (car items)))))
+      (cond ((null first)
+	     (setq count (+ count 1))
+	     (setq id (intern (format "separator-%d" count)))
+	     (setq def '("--" . nil)))
+	    ((and (consp second) (eq (car second) 'lambda))
+	     (setq count (+ count 1))
+	     (setq id (intern (format "lambda-%d" count)))
+	     (setq def (cons first second)))
+	    ((symbolp second)
+	     (setq id second)
+	     (setq def (cons first second)))
+	    (t
+	     (setq count (+ count 1))
+	     (setq id (intern (format "submenu-%d" count)))
+	     (setq def (erlang-menu-make-keymap first second))))
+      (define-key menumap (vector id) def)
+      (if third
+	  (put id 'menu-enable third))
+      (setq items (cdr items)))
+    (cons name menumap)))
+
+
+(defun erlang-menu-xemacs (name items &optional keymap)
+  "Build a menu for XEmacs."
+  (let ((res '())
+	first second third entry)
+    (while items
+      ;; Replace any occurrence of atoms by their value.
+      (while (and items (atom (car items)) (not (null (car items))))
+	(if (and (boundp (car items))
+		 (listp (symbol-value (car items))))
+	    (setq items (append (reverse (symbol-value (car items)))
+				(cdr items)))
+	  (setq items (cdr items))))
+      (setq first (car-safe (car items)))
+      (setq second (car-safe (cdr-safe (car items))))
+      (setq third (car-safe (cdr-safe (cdr-safe (car items)))))
+      (cond ((null first)
+	     (setq res (cons "------" res)))
+	    ((symbolp second)
+	     (setq res (cons (vector first second (or third t)) res)))
+	    ((and (consp second) (eq (car second) 'lambda))
+	     (setq res (cons (vector first (list 'call-interactively second)
+				     (or third t)) res)))
+	    (t
+	     (setq res (cons (cons first
+				   (cdr (erlang-menu-xemacs
+					 first second)))
+			     res))))
+      (setq items (cdr items)))
+    (setq res (reverse res))
+    ;; When adding a menu to a minor-mode keymap under Emacs,
+    ;; it disappears when the mode is disabled.  The expression
+    ;; generated below imitates this behaviour.
+    ;; (This could be expressed much clearer using backquotes,
+    ;; but I don't want to pull in every package.)
+    (if keymap
+	(let ((expr (list 'or
+			  (list 'eq keymap 'global-map)
+			  (list 'eq keymap (list 'current-local-map))
+			  (list 'symbol-value
+				(list 'car-safe
+				      (list 'rassq
+					    keymap
+					    'minor-mode-map-alist))))))
+	  (setq res (cons ':included (cons expr res)))))
+    (cons name res)))
+
+
+(defun erlang-menu-substitute (items alist)
+  "Substitute functions in menu described by ITEMS.
+
+The menu ITEMS is updated destructively.
+
+ALIST is list of pairs where the car is the old function and cdr the new."
+  (let (first second pair)
+    (while items
+      (setq first (car-safe (car items)))
+      (setq second (car-safe (cdr-safe (car items))))
+      (cond ((null first))
+	    ((symbolp second)
+	     (setq pair (and second (assq second alist)))
+	     (if pair
+		 (setcar (cdr (car items)) (cdr pair))))
+	    ((and (consp second) (eq (car second) 'lambda)))
+	    (t
+	     (erlang-menu-substitute second alist)))
+      (setq items (cdr items)))))
+
+
+(defun erlang-menu-add-above (entry above items)
+  "Add menu ENTRY above menu entry ABOVE in menu ITEMS.
+Do nothing if the items already should be in the menu.
+Should ABOVE not be in the list, the entry is added at
+the bottom of the menu.
+
+The new menu is returned.  No guarantee is given that the original
+menu is left unchanged.
+
+The equality test is performed by `eq'.
+
+Example:  (erlang-menu-add-above 'my-erlang-menu-items
+                                 'erlang-menu-man-items)"
+  (erlang-menu-add-below entry above items t))
+
+
+(defun erlang-menu-add-below (entry below items &optional above-p)
+  "Add menu ENTRY below menu items BELOW in the Erlang menu.
+Do nothing if the items already should be in the menu.
+Should BELOW not be in the list, items is added at the bottom
+of the menu.
+
+The new menu is returned.  No guarantee is given that the original
+menu is left unchanged.
+
+The equality test is performed by `eq'.
+
+Example:
+
+\(setq erlang-menu-items
+      (erlang-menu-add-below 'my-erlang-menu-items
+	 	             'erlang-menu-base-items
+                             erlang-menu-items))"
+  (if (memq entry items)
+      items				; Return the original menu.
+    (let ((head '())
+	  (done nil)
+	  res)
+      (while (not done)
+	(cond ((null items)
+	       (setq res (append head (list entry)))
+	       (setq done t))
+	      ((eq below (car items))
+	       (setq res
+		     (if above-p
+			 (append head (cons entry items))
+		       (append head (cons (car items)
+					  (cons entry (cdr items))))))
+	       (setq done t))
+	      (t
+	       (setq head (append head (list (car items))))
+	       (setq items (cdr items)))))
+      res)))
+
+(defun erlang-menu-delete (entry items)
+  "Delete ENTRY from menu ITEMS.
+
+The new menu is returned.  No guarantee is given that the original
+menu is left unchanged."
+  (delq entry items))
+
+;; Man code:
+
+(defun erlang-man-init ()
+  "Add menus containing the manual pages of the Erlang.
+
+The variable `erlang-man-dirs' contains entries describing
+the location of the manual pages."
+  (interactive)
+  (if erlang-man-inhibit
+      ()
+    (setq erlang-menu-man-items
+	  '(nil
+	    ("Man - Function" erlang-man-function)))
+    (if erlang-man-dirs
+	(setq erlang-menu-man-items
+	      (append erlang-menu-man-items
+		      (erlang-man-make-top-menu erlang-man-dirs))))
+    (setq erlang-menu-items
+	  (erlang-menu-add-above 'erlang-menu-man-items
+				 'erlang-menu-version-items
+				 erlang-menu-items))
+    (erlang-menu-init)))
+
+
+(defun erlang-man-uninstall ()
+  "Remove the man pages from the Erlang mode."
+  (interactive)
+  (setq erlang-menu-items
+	(erlang-menu-delete 'erlang-menu-man-items erlang-menu-items))
+  (erlang-menu-init))
+
+
+;; The man menu is a hierarchal structure, with the manual sections
+;; at the top, described by `erlang-man-dirs'.  The next level could
+;; either be the manual pages if not to many, otherwise it is an index
+;; menu whose submenus will contain up to `erlang-man-max-menu-size'
+;; manual pages.
+
+(defun erlang-man-make-top-menu (dir-list)
+  "Create one menu entry per element of DIR-LIST.
+The format is described in the documentation of `erlang-man-dirs'."
+  (let ((menu '())
+	dir)
+    (while dir-list
+      (setq dir (cond ((nth 2 (car dir-list))
+		       ;; Relative to `erlang-root-dir'.
+		       (and (stringp erlang-root-dir)
+			    (concat erlang-root-dir (nth 1 (car dir-list)))))
+		      (t
+		       ;; Absolute
+		       (nth 1 (car dir-list)))))
+      (if (and dir
+	       (file-readable-p dir))
+	  (setq menu (cons (list (car (car dir-list))
+				 (erlang-man-make-middle-menu
+				  (erlang-man-get-files dir)))
+			   menu)))
+      (setq dir-list (cdr dir-list)))
+    ;; Should no menus be found, generate a menu item which
+    ;; will display a help text, when selected.
+    (if menu
+	(nreverse menu)
+      '(("Man Pages"
+	 (("Error! Why?" erlang-man-describe-error)))))))
+
+
+;; Should the menu be to long, let's split it into a number of
+;; smaller menus.  Warning, this code contains beautiful
+;; destructive operations!
+(defun erlang-man-make-middle-menu (filelist)
+  "Create the second level menu from FILELIST.
+
+Should the list be longer than `erlang-man-max-menu-size', a tree of
+menus is created."
+  (if (<= (length filelist) erlang-man-max-menu-size)
+      (erlang-man-make-menu filelist)
+    (let ((menu '())
+	  (filelist (copy-sequence filelist))
+	  segment submenu pair)
+      (while filelist
+	(setq pair (nthcdr (- erlang-man-max-menu-size 1) filelist))
+	(setq segment filelist)
+	(if (null pair)
+	    (setq filelist nil)
+	  (setq filelist (cdr pair))
+	  (setcdr pair nil))
+	(setq submenu (erlang-man-make-menu segment))
+	(setq menu (cons (list (concat (car (car submenu))
+				       " -- "
+				       (car (car (reverse submenu))))
+			       submenu)
+			 menu)))
+      (nreverse menu))))
+
+
+(defun erlang-man-make-menu (filelist)
+  "Make a leaf menu based on FILELIST."
+  (let ((menu '())
+	item)
+    (while filelist
+      (setq item (erlang-man-make-menu-item (car filelist)))
+      (if item
+	  (setq menu (cons item menu)))
+      (setq filelist (cdr filelist)))
+    (nreverse menu)))
+
+
+(defun erlang-man-make-menu-item (file)
+  "Create a menu item containing the name of the man page."
+  (and (string-match ".+/\\([^/]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
+       (let ((page (substring file (match-beginning 1) (match-end 1))))
+	 (list (capitalize page)
+	       (list 'lambda '()
+		     '(interactive)
+		     (list 'funcall 'erlang-man-display-function
+			   file))))))
+
+
+(defun erlang-man-get-files (dir)
+  "Return files in directory DIR."
+  (directory-files dir t ".+\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?\\'"))
+
+
+(defun erlang-man-module (&optional module)
+  "Find manual page for MODULE, defaults to module of function under point.
+This function is aware of imported functions."
+  (interactive
+   (list (let* ((mod (car-safe (erlang-get-function-under-point)))
+		(input (read-string
+			(format "Manual entry for module%s: "
+				(if (or (null mod) (string= mod ""))
+				    ""
+				  (format " (default %s)" mod))))))
+	   (if (string= input "")
+	       mod
+	     input))))
+  (or module (setq module (car (erlang-get-function-under-point))))
+  (if (or (null module) (string= module ""))
+      (error "No Erlang module name given"))
+  (let ((dir-list erlang-man-dirs)
+	(pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
+	(file nil)
+	file-list)
+    (while (and dir-list (null file))
+      (setq file-list (erlang-man-get-files
+		       (if (nth 2 (car dir-list))
+			   (concat erlang-root-dir (nth 1 (car dir-list)))
+			 (nth 1 (car dir-list)))))
+      (while (and file-list (null file))
+	(if (string-match pat (car file-list))
+	    (setq file (car file-list)))
+	(setq file-list (cdr file-list)))
+      (setq dir-list (cdr dir-list)))
+    (if file
+	(funcall erlang-man-display-function file)
+      (error "No manual page for module %s found" module))))
+
+
+;; Warning, the function `erlang-man-function' is a hack!
+;; It links itself into the man code in a non-clean way.  I have
+;; chosen to keep it since it provides a very useful functionality
+;; which is not possible to achieve using a clean approach.
+;;   / AndersL
+
+(defvar erlang-man-function-name nil
+  "Name of function for last `erlang-man-function' call.
+Used for communication between `erlang-man-function' and the
+patch to `Man-notify-when-ready'.")
+
+(defun erlang-man-function (&optional name)
+  "Find manual page for NAME, where NAME is module:function.
+The entry for `function' is displayed.
+
+This function is aware of imported functions."
+  (interactive
+   (list (let* ((mod-func (erlang-get-function-under-point))
+		(mod (car-safe mod-func))
+		(func (nth 1 mod-func))
+		(input (read-string
+			(format
+			 "Manual entry for `module:func' or `module'%s: "
+			 (if (or (null mod) (string= mod ""))
+			     ""
+			   (format " (default %s:%s)" mod func))))))
+	   (if (string= input "")
+	       (if (and mod func)
+		   (concat mod ":" func)
+		 mod)
+	     input))))
+  ;; Emacs 18 doesn't provide `man'...
+  (condition-case nil
+      (require 'man)
+    (error nil))
+  (let ((modname nil)
+	(funcname nil))
+    (cond ((null name)
+	   (let ((mod-func (erlang-get-function-under-point)))
+	     (setq modname (car-safe mod-func))
+	     (setq funcname (nth 1 mod-func))))
+	  ((string-match ":" name)
+	   (setq modname (substring name 0 (match-beginning 0)))
+	   (setq funcname (substring name (match-end 0) nil)))
+	  ((stringp name)
+	   (setq modname name)))
+    (if (or (null modname) (string= modname ""))
+	(error "No Erlang module name given"))
+    (cond ((fboundp 'Man-notify-when-ready)
+	   ;; Emacs 19:  The man command could possibly start an
+	   ;; asynchronous process, i.e. we must hook ourselves into
+	   ;; the system to be activated when the man-process
+	   ;; terminates.
+	   (if (null funcname)
+	       ()
+	     (erlang-man-patch-notify)
+	     (setq erlang-man-function-name funcname))
+	   (condition-case nil
+	       (erlang-man-module modname)
+	     (error (setq erlang-man-function-name nil))))
+	  (t
+	   (erlang-man-module modname)
+	   (if funcname
+	       (erlang-man-find-function
+		(or (get-buffer "*Manual Entry*") ; Emacs 18
+		    (current-buffer))	; XEmacs
+		funcname))))))
+
+
+;; Should the defadvice be at the top level, the package `advice' would
+;; be required.  Now it is only required when this functionality
+;; is used.  (Emacs 19 specific.)
+(defun erlang-man-patch-notify ()
+  "Patch the function `Man-notify-when-ready' to search for function.
+The variable `erlang-man-function-name' is assumed to be bound to
+the function name, or to nil.
+
+The reason for patching a function is that under Emacs 19, the man
+command is executed asynchronously."
+  (condition-case nil
+      (require 'advice)
+    ;; This should never happened since this is only called when
+    ;; running under Emacs 19.
+    (error (error (concat "This command needs the package `advice', "
+			  "please upgrade your Emacs."))))
+  (require 'man)
+  (defadvice Man-notify-when-ready
+    (after erlang-Man-notify-when-ready activate)
+    "Set point at the documentation of the function name in
+`erlang-man-function-name' when the man page is displayed."
+    (if erlang-man-function-name
+	(erlang-man-find-function (ad-get-arg 0) erlang-man-function-name))
+    (setq erlang-man-function-name nil)))
+
+
+(defun erlang-man-find-function (buf func)
+  "Find manual page for function in `erlang-man-function-name' in buffer BUF."
+  (if func
+      (let ((win (get-buffer-window buf)))
+	(if win
+	    (progn
+	      (set-buffer buf)
+	      (goto-char (point-min))
+	      (if (re-search-forward
+		   (concat "^[ \t]+" func " ?(")
+		   (point-max) t)
+		  (progn
+		    (forward-word -1)
+		    (set-window-point win (point)))
+		(message "Could not find function `%s'" func)))))))
+
+
+(defun erlang-man-display (file)
+  "Display FILE as a `man' file.
+This is the default manual page display function.
+The variables `erlang-man-display-function' contains the function
+to be used."
+  ;; Emacs 18 doesn't `provide' man.
+  (condition-case nil
+      (require 'man)
+    (error nil))
+  (if file
+      (let ((process-environment (copy-sequence process-environment)))
+	(if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
+	    (let ((dir (substring file (match-beginning 1) (match-end 1)))
+		  (page (substring file (match-beginning 2) (match-end 2))))
+	      (if (fboundp 'setenv)
+		  (setenv "MANPATH" dir)
+		;; Emacs 18
+		(setq process-environment (cons (concat "MANPATH=" dir)
+						process-environment)))
+	      (cond ((not (and (not erlang-xemacs-p)
+			       (= erlang-emacs-major-version 19)
+			       (< erlang-emacs-minor-version 29)))
+		     (manual-entry page))
+		    (t
+		     ;; Emacs 19.28 and earlier versions of 19:
+		     ;; The manual-entry command unconditionally prompts
+		     ;; the user :-(
+		     (funcall (symbol-function 'Man-getpage-in-background)
+			      page))))
+	  (error "Can't find man page for %s\n" file)))))
+
+
+(defun erlang-man-describe-error ()
+  "Describe why the manual pages weren't found."
+  (interactive)
+  (with-output-to-temp-buffer "*Erlang Man Error*"
+    (princ "Normally, this menu should contain Erlang manual pages.
+
+In order to find the manual pages, the variable `erlang-root-dir'
+should be bound to the name of the directory containing the Erlang
+installation.  The name should not include the final slash.
+
+Practically, you should add a line on the following form to
+your ~/.emacs, or ask your system administrator to add it to
+the site init file:
+    (setq erlang-root-dir \"/the/erlang/root/dir/goes/here\")
+
+For example:
+    (setq erlang-root-dir \"/usr/local/erlang\")
+
+After installing the line, kill and restart Emacs, or restart Erlang
+mode with the command `M-x erlang-mode RET'.")))
+
+;; Skeleton code:
+
+;; This code is based on the package `tempo' which is part of modern
+;; Emacsen.  (GNU Emacs 19.25 (?) and XEmacs 19.14.)
+
+(defun erlang-skel-init ()
+  "Generate the skeleton functions and menu items.
+The variable `erlang-skel' contains the name and descriptions of
+all skeletons.
+
+The skeleton routines are based on the `tempo' package.  Should this
+package not be present, this function does nothing."
+  (interactive)
+  (condition-case nil
+      (require 'tempo)
+    (error t))
+  (if (featurep 'tempo)
+      (let ((skel erlang-skel)
+	    (menu '()))
+	(while skel
+	  (cond ((null (car skel))
+		 (setq menu (cons nil menu)))
+		(t
+		 (funcall (symbol-function 'tempo-define-template)
+			  (concat "erlang-" (nth 1 (car skel)))
+			  ;; The tempo template used contains an `include'
+			  ;; function call only, hence changes to the
+			  ;; variables describing the templates take effect
+			  ;; immdiately.
+			  (list (list 'erlang-skel-include (nth 2 (car skel))))
+			  (nth 1 (car skel))
+			  (car (car skel))
+			  'erlang-tempo-tags)
+		 (setq menu (cons (erlang-skel-make-menu-item
+				   (car skel)) menu))))
+	  (setq skel (cdr skel)))
+	(setq erlang-menu-skel-items
+	      (list nil (list "Skeletons" (nreverse menu))))
+	(setq erlang-menu-items
+	      (erlang-menu-add-above 'erlang-menu-skel-items
+				     'erlang-menu-version-items
+				     erlang-menu-items))
+	(erlang-menu-init))))
+
+(defun erlang-skel-make-menu-item (skel)
+  (let ((func (intern (concat "tempo-template-erlang-" (nth 1 skel)))))
+    (cond ((null (nth 3 skel))
+	   (list (car skel) func))
+	  (t
+	   (list (car skel)
+		 (list 'lambda '()
+		       '(interactive)
+		       (list 'funcall
+			     (list 'quote (nth 3 skel))
+			     (list 'quote func))))))))
+
+;; Functions designed to be added to the skeleton menu.
+;; (Not normally used)
+(defun erlang-skel-insert (func)
+  "Insert skeleton generated by FUNC and goto first tempo mark."
+  (save-excursion (funcall func))
+  (funcall (symbol-function 'tempo-forward-mark)))
+
+(defun erlang-skel-header (func)
+  "Insert the header generated by FUNC at the beginning of the buffer."
+  (goto-char (point-min))
+  (save-excursion (funcall func))
+  (funcall (symbol-function 'tempo-forward-mark)))
+
+
+;; Functions used inside the skeleton descriptions.
+(defun erlang-skel-skip-blank ()
+  (skip-chars-backward " \t")
+  nil)
+
+(defun erlang-skel-include (&rest args)
+  "Include a template inside another template.
+
+Example of use, assuming that `erlang-skel-func' is defined:
+
+ (defvar foo-skeleton '(\"%%% New function:\"
+                        (erlang-skel-include erlang-skel-func)))
+
+Technically, this function returns the `tempo' attribute`(l ...)' which
+can contain other `tempo' attributes.  Please see the function
+`tempo-define-template' for a description of the `(l ...)' attribute."
+  (let ((res '())
+	entry)
+    (while args
+      (setq entry (car args))
+      (while entry
+	(setq res (cons (car entry) res))
+	(setq entry (cdr entry)))
+      (setq args (cdr args)))
+    (cons 'l (nreverse res))))
+
+(defvar erlang-skel-separator-length 70)
+
+(defun erlang-skel-separator (&optional percent)
+  "Return a comment separator."
+  (let ((percent (or percent 3)))
+    (concat (make-string percent ?%) 
+	    (make-string (- erlang-skel-separator-length percent) ?-) 
+	    "\n")))
+
+(defun erlang-skel-double-separator (&optional percent)
+  "Return a comment separator."
+  (let ((percent (or percent 3)))
+    (concat (make-string percent ?%) 
+	    (make-string (- erlang-skel-separator-length percent) ?=) 
+	    "\n")))
+
+(defun erlang-skel-dd-mmm-yyyy ()
+  "Return the current date as a string in \"DD Mon YYYY\" form.
+The first character of DD is space if the value is less than 10."
+  (let ((date (current-time-string)))
+    (format "%2d %s %s"
+	    (erlang-string-to-int (substring date 8 10))
+	    (substring date 4 7)
+	    (substring date -4))))
+
+;; Indentation code:
+
+(defun erlang-indent-command (&optional whole-exp)
+  "Indent current line as Erlang code.
+With argument, indent any additional lines of the same clause
+rigidly along with this one."
+  (interactive "P")
+  (if whole-exp
+      ;; If arg, always indent this line as Erlang
+      ;; and shift remaining lines of clause the same amount.
+      (let ((shift-amt (erlang-indent-line))
+	    beg end)
+	(save-excursion
+	  (if erlang-tab-always-indent
+	      (beginning-of-line))
+	  (setq beg (point))
+	  (erlang-end-of-clause 1)
+	  (setq end (point))
+	  (goto-char beg)
+	  (forward-line 1)
+	  (setq beg (point)))
+	(if (> end beg)
+	    (indent-code-rigidly beg end shift-amt "\n")))
+    (if (and (not erlang-tab-always-indent)
+	     (save-excursion
+	       (skip-chars-backward " \t")
+	       (not (bolp))))
+	(insert-tab)
+      (erlang-indent-line))))
+
+
+(defun erlang-indent-line ()
+  "Indent current line as Erlang code.
+Return the amount the indentation changed by."
+  (let ((pos (- (point-max) (point)))
+	indent beg
+	shift-amt)
+    (beginning-of-line 1)
+    (setq beg (point))
+    (skip-chars-forward " \t")
+    (cond ((looking-at "%")
+	   (setq indent (funcall comment-indent-function))
+	   (setq shift-amt (- indent (current-column))))
+	  (t
+	   (setq indent (erlang-calculate-indent))
+	   (cond ((null indent)
+		  (setq indent (current-indentation)))
+		 ((eq indent t)
+		  ;; This should never occur here.
+		  (error "Erlang mode error"))
+		 ;;((= (char-syntax (following-char)) ?\))
+		 ;; (setq indent (1- indent)))
+		 )
+	   (setq shift-amt (- indent (current-column)))))
+    (if (zerop shift-amt)
+	nil
+      (delete-region beg (point))
+      (indent-to indent))
+    ;; If initial point was within line's indentation, position
+    ;; after the indentation. Else stay at same point in text.
+    (if (> (- (point-max) pos) (point))
+	(goto-char (- (point-max) pos)))
+    shift-amt))
+
+
+(defun erlang-indent-region (beg end)
+  "Indent region of Erlang code.
+
+This is automagically called by the user level function `indent-region'."
+  (interactive "r")
+  (save-excursion
+    (let ((case-fold-search nil)
+	  (continue t)
+	  (from-end (- (point-max) end))
+	  indent-point;; The beginning of the current line
+	  indent;; The indent amount
+	  state)
+      (goto-char beg)
+      (beginning-of-line)
+      (setq indent-point (point))
+      (erlang-beginning-of-clause)
+      ;; Parse the Erlang code from the beginning of the clause to
+      ;; the beginning of the region.
+      (while (< (point) indent-point)
+        (let ((pt (point)))
+          (setq state (erlang-partial-parse pt indent-point state))
+          (if (= pt (point))
+              (error "Illegal syntax"))))
+      ;; Indent every line in the region
+      (while continue
+	(goto-char indent-point)
+	(skip-chars-forward " \t")
+	(cond ((looking-at "%")
+	       ;; Do not use our stack to help the user to customize
+	       ;; comment indentation.
+	       (setq indent (funcall comment-indent-function)))
+	      ((looking-at "$")
+	       ;; Don't indent empty lines.
+	       (setq indent 0))
+	      (t
+	       (setq indent
+		     (save-excursion
+		       (erlang-calculate-stack-indent (point) state)))
+	       (cond ((null indent)
+		      (setq indent (current-indentation)))
+		     ((eq indent t)
+		      ;; This should never occur here.
+		      (error "Erlang mode error"))
+		     ;;((= (char-syntax (following-char)) ?\))
+		     ;; (setq indent (1- indent)))
+		     )))
+	(if (zerop (- indent (current-column)))
+	    nil
+	  (delete-region indent-point (point))
+	  (indent-to indent))
+	;; Find the next line in the region
+	(goto-char indent-point)
+	(save-excursion
+	  (forward-line 1)
+	  (setq indent-point (point)))
+	(if (>= from-end (- (point-max) indent-point))
+	    (setq continue nil)
+	  (while (< (point) indent-point)
+            (let ((pt (point)))
+              (setq state (erlang-partial-parse
+                           pt indent-point state))
+              (if (= pt (point))
+                  (error "Illegal syntax")))))))))
+
+
+(defun erlang-indent-current-buffer ()
+  "Indent current buffer as Erlang code."
+  (interactive)
+  (save-excursion
+    (save-restriction
+      (widen)
+      (erlang-indent-region (point-min) (point-max)))))
+
+
+(defun erlang-indent-function ()
+  "Indent current Erlang function."
+  (interactive)
+  (save-excursion
+    (let ((end (progn (erlang-end-of-function 1) (point)))
+	  (beg (progn (erlang-beginning-of-function 1) (point))))
+      (erlang-indent-region beg end))))
+
+
+(defun erlang-indent-clause ()
+  "Indent current Erlang clause."
+  (interactive)
+  (save-excursion
+    (let ((end (progn (erlang-end-of-clause 1) (point)))
+	  (beg (progn (erlang-beginning-of-clause 1) (point))))
+      (erlang-indent-region beg end))))
+
+
+(defmacro erlang-push (x stack) (list 'setq stack (list 'cons x stack)))
+(defmacro erlang-pop (stack) (list 'setq stack (list 'cdr stack)))
+;; Would much prefer to make caddr a macro but this clashes.
+(defun erlang-caddr (x) (car (cdr (cdr x))))
+
+
+(defun erlang-calculate-indent (&optional parse-start)
+  "Compute appropriate indentation for current line as Erlang code.
+Return nil if line starts inside string, t if in a comment."
+  (save-excursion
+    (let ((indent-point (point))
+	  (case-fold-search nil)
+	  (state nil))
+      (if parse-start
+	  (goto-char parse-start)
+	(erlang-beginning-of-clause))
+      (while (< (point) indent-point)
+        (let ((pt (point)))
+          (setq state (erlang-partial-parse pt indent-point state))
+          (if (= pt (point))
+              (error "Illegal syntax"))))
+      (erlang-calculate-stack-indent indent-point state))))
+
+(defun erlang-show-syntactic-information ()
+  "Show syntactic information for current line."
+
+  (interactive)
+
+  (save-excursion
+    (let ((starting-point (point))
+	  (case-fold-search nil)
+	  (state nil))
+      (erlang-beginning-of-clause)
+      (while (< (point) starting-point)
+	(setq state (erlang-partial-parse (point) starting-point state)))
+      (message "%S" state))))
+
+
+(defun erlang-partial-parse (from to &optional state)
+  "Parse Erlang syntax starting at FROM until TO, with an optional STATE.
+Value is list (stack token-start token-type in-what)."
+  (goto-char from)			; Start at the beginning
+  (erlang-skip-blank to)
+  (let ((cs (char-syntax (following-char)))
+	(stack (car state))
+	(token (point))
+	in-what)
+    (cond 
+     
+     ;; Done: Return previous state.
+     ((>= token to)
+      (setq token (nth 1 state))
+      (setq cs (nth 2 state))
+      (setq in-what (nth 3 state)))
+
+     ;; Word constituent: check and handle keywords.
+     ((= cs ?w)
+      (cond ((looking-at "\\(end\\|after\\)[^_a-zA-Z0-9]")
+	     ;; Must pop top icr layer, `after' will push a new
+	     ;; layer next.
+	     (progn
+	       (while (and stack (eq (car (car stack)) '->))
+		 (erlang-pop stack))
+	       (if (and stack (memq (car (car stack)) '(icr begin fun try)))
+		   (erlang-pop stack))))
+	    ((looking-at "catch\\b.*of")
+	     t)
+	    ((looking-at "catch\\b\\s *\\($\\|%\\|.*->\\)")
+	     ;; Must pop top icr layer, `catch' in try/catch
+	     ;;will push a new layer next.
+	     (progn
+	       (while (and stack (eq (car (car stack)) '->))
+		 (erlang-pop stack))
+	       (if (and stack (memq (car (car stack)) '(icr begin try)))
+		   (erlang-pop stack))))
+	    )  
+      (cond ((looking-at "\\(if\\|case\\|receive\\)[^_a-zA-Z0-9]")
+	     ;; Must push a new icr (if/case/receive) layer.
+	     (erlang-push (list 'icr token (current-column)) stack))
+	    ((looking-at "\\(try\\|after\\)[^_a-zA-Z0-9]")
+	     ;; Must handle separately, try catch or try X of -> catch
+	     ;; same for `after', it could be 
+	     ;; receive after Time -> X end, or 
+	     ;; try after X end
+	     (erlang-push (list 'try token (current-column)) stack))
+	    ((looking-at "\\(of\\)[^_a-zA-Z0-9]")
+	     ;; Must handle separately, try X of -> catch
+	     (if (and stack (eq (car (car stack)) 'try))
+		 (let ((try-column (nth 2 (car stack)))
+		       (try-pos (nth 1 (car stack))))
+		   (erlang-pop stack)
+		   (erlang-push (list 'icr try-pos try-column) stack))))
+	    
+	    ((looking-at "\\(fun\\)[^_a-zA-Z0-9]")
+	     ;; Push a new layer if we are defining a `fun'
+	     ;; expression, not when we are refering an existing
+	     ;; function.  'fun's defines are only indented one level now.
+	     (if (save-excursion
+		   (goto-char (match-end 1))
+		   (erlang-skip-blank to)
+		   ;; Use erlang-variable-regexp here to look for an
+		   ;; optional variable name to match EEP37 named funs.
+		   (if (looking-at erlang-variable-regexp)
+		       (progn
+			 (goto-char (match-end 0))
+			 (erlang-skip-blank to)))
+		   (eq (following-char) ?\())
+		 (erlang-push (list 'fun token (current-column)) stack)))
+	    ((looking-at "\\(begin\\)[^_a-zA-Z0-9]")
+	     (erlang-push (list 'begin token (current-column)) stack))
+	    ;; Normal when case
+	    ;;((looking-at "when\\s ")
+	    ;;((looking-at "when\\s *\\($\\|%\\)")
+	    ((looking-at "when[^_a-zA-Z0-9]")
+	     (erlang-push (list 'when token (current-column)) stack))
+	    ((looking-at "catch\\b.*of")
+	     t)
+	    ((looking-at "catch\\b\\s *\\($\\|%\\|.*->\\)")
+	     (erlang-push (list 'icr token (current-column)) stack))
+	    ;;(erlang-push (list '-> token (current-column)) stack))
+	    ;;((looking-at "^of$") 
+	    ;; (erlang-push (list 'icr token (current-column)) stack)
+	    ;;(erlang-push (list '-> token (current-column)) stack))
+	    )
+      (forward-sexp 1))
+      ;; String: Try to skip over it. (Catch error if not complete.)
+      ((= cs ?\")
+       (condition-case nil
+	   (progn
+	    (forward-sexp 1)
+	    (if (> (point) to)
+		(progn
+		  (setq in-what 'string)
+		  (goto-char to))))
+	(error
+	 (setq in-what 'string)
+	 (goto-char to))))
+
+     ;; Expression prefix e.i. $ or ^ (Note ^ can be in the character
+     ;; literal $^ or part of string and $ outside of a string denotes
+     ;; a character literal)
+     ((= cs ?')
+      (cond 
+       ((= (following-char) ?\") ;; $ or ^ was the last char in a string
+	(forward-char 1))
+       (t
+	;; Maybe a character literal, quote the next char to avoid
+	;; situations as $" being seen as the begining of a string.
+	;; Note the quoting something in the middle of a string is harmless.
+	(quote (following-char)) 
+	(forward-char 1))))
+
+     ;; Symbol constituent or punctuation
+     
+     ((memq cs '(?. ?_))
+      (cond 
+       
+       ;; Clause end
+       ((= (following-char) ?\;)
+	(if (eq (car (car (last stack))) 'spec)
+	    (while (memq (car (car stack)) '(when ::))
+	      (erlang-pop stack)))
+	(if (and stack (eq (car (car stack)) '->))
+	    (erlang-pop stack))
+	(forward-char 1))
+       
+       ;; Parameter separator
+       ((looking-at ",")
+	(forward-char 1)
+	(if (and stack (eq (car (car stack)) '::))
+	    ;; Type or spec
+	    (erlang-pop stack)))
+
+       ;; Function end
+       ((looking-at "\\.\\(\\s \\|\n\\|\\s<\\)")
+	(setq stack nil)
+	(forward-char 1))
+       
+       ;; Function head
+       ((looking-at "->")
+	(if (and stack (eq (car (car stack)) 'when))
+	    (erlang-pop stack))
+	(erlang-push (list '-> token (current-column)) stack)
+	(forward-char 2)) 
+       
+       ;; List-comprehension divider
+       ((looking-at "||")
+	(erlang-push (list '|| token (current-column)) stack)
+	(forward-char 2))
+
+       ;; Bit-syntax open. Note that map syntax allows "<<" to follow ":="
+       ;; or "=>" without intervening whitespace, so handle that case here
+       ((looking-at "\\(:=\\|=>\\)?<<")
+	(erlang-push (list '<< token (current-column)) stack)
+	(forward-char (- (match-end 0) (match-beginning 0))))
+       
+       ;; Bit-syntax close
+       ((looking-at ">>")
+	(while (memq (car (car stack)) '(|| ->))
+	  (erlang-pop stack))
+	(cond ((eq (car (car stack)) '<<)
+	       (erlang-pop stack))
+	      ((memq (car (car stack)) '(icr begin fun)) 
+	       (error "Missing `end'"))
+	      (t
+	       (error "Unbalanced parentheses")))
+	(forward-char 2))
+       
+       ;; Macro
+       ((= (following-char) ??)
+	;; Skip over the ? 
+	(forward-char 1)
+	)
+
+       ;; Type spec's
+       ((looking-at "-type\\s \\|-opaque\\s ")
+	(if stack
+	    (forward-char 1)
+	  (erlang-push (list 'icr token (current-column)) stack)
+	  (forward-char 6)))
+       ((looking-at "-spec\\s ")
+	(if stack
+	    (forward-char 1)
+	  (forward-char 6) 
+	  (skip-chars-forward "^(\n")
+	  (erlang-push (list 'spec (point) (current-column)) stack)
+	  ))
+
+       ;; Type spec delimiter
+       ((looking-at "::")
+	(erlang-push (list ':: token (current-column)) stack)
+	(forward-char 2))
+       
+       ;; Don't follow through in the clause below 
+       ;; '|' don't need spaces around it 
+       ((looking-at "|")
+	(forward-char 1))
+       
+       ;; Other punctuation: Skip over it and any following punctuation
+       ((= cs ?.)
+	;; Skip over all characters in the operand.
+	(skip-syntax-forward "."))
+       
+       ;; Other char: Skip over it.
+       (t
+	(forward-char 1))))
+     
+     ;; Open parenthesis
+     ((= cs ?\()
+      (erlang-push (list '\( token (current-column)) stack)
+      (forward-char 1))
+     
+     ;; Close parenthesis
+     ((= cs ?\))
+      (while (memq (car (car stack)) '(|| -> :: when))
+	(erlang-pop stack))
+      (cond ((eq (car (car stack)) '\()
+	     (erlang-pop stack)
+	     (if (and (eq (car (car stack)) 'fun) 
+		      (or (eq (car (car (last stack))) 'spec)
+			  (eq (car (car (cdr stack))) '::))) ;; -type()
+		 ;; Inside fun type def ') closes fun definition
+		 (erlang-pop stack)))
+	    ((eq (car (car stack)) 'icr)
+	     (erlang-pop stack)  
+	     ;; Normal catch not try-catch might have caused icr
+	     ;; and then incr should be removed and is not an error.
+	     (if (eq (car (car stack)) '\() 
+	     	 (erlang-pop stack) 
+	       (error "Missing `end'")
+	       ))
+	    ((eq (car (car stack)) 'begin) 
+	     (error "Missing `end'"))
+	    (t
+	     (error "Unbalanced parenthesis"))
+	    )
+      (forward-char 1)) 
+    
+     ;; Character quote: Skip it and the quoted char.
+     ((= cs ?/)
+      (forward-char 2))
+     
+     ;; Character escape: Skip it and the escape sequence.
+     ((= cs ?\\)
+      (forward-char 1)
+      (skip-syntax-forward "w"))
+
+     ;; Everything else
+     (t
+      (forward-char 1)))
+    (list stack token cs in-what)))
+
+(defun erlang-calculate-stack-indent (indent-point state)
+  "From the given last position and state (stack) calculate indentation.
+Return nil if inside string, t if in a comment."
+  (let* ((stack (and state (car state)))
+         (token (nth 1 state))
+         (stack-top (and stack (car stack))))
+    (cond ((null state)                 ;No state
+           0)
+          ((nth 3 state)
+           ;; Return nil or t.
+           (eq (nth 3 state) 'comment))
+          ((null stack)
+           (if (looking-at "when[^_a-zA-Z0-9]")
+               erlang-indent-guard
+             0))
+          ((eq (car stack-top) '\()
+           ;; Element of list, tuple or part of an expression,
+           (cond ((null erlang-argument-indent)
+		  ;; indent to next column.
+		  (1+ (nth 2 stack-top)))
+		 ((= (char-syntax (following-char)) ?\))
+		  (goto-char (nth 1 stack-top))
+		  (cond ((looking-at "[({]\\s *\\($\\|%\\)")
+		   	 ;; Line ends with parenthesis.
+			 (let ((previous (erlang-indent-find-preceding-expr))
+			       (stack-pos (nth 2 stack-top)))
+			   (if (>= previous stack-pos) stack-pos
+			     (- (+ previous erlang-argument-indent) 1))))
+		   	(t
+		   	 (nth 2 stack-top))))
+		 ((= (following-char) ?,)
+		  ;; a comma at the start of the line: line up with opening parenthesis.
+		  (nth 2 stack-top))
+		 (t 
+		  (goto-char (nth 1 stack-top))
+		  (let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")
+				     ;; Line ends with parenthesis.
+				     (erlang-indent-parenthesis (nth 2 stack-top)))
+				    (t
+				     ;; Indent to the same column as the first
+				     ;; argument.
+				     (goto-char (1+ (nth 1 stack-top)))
+				     (skip-chars-forward " \t")
+				     (current-column)))))
+		    (erlang-indent-standard indent-point token base 't)))))
+	  ;;
+	  ((eq (car stack-top) '<<)
+	   ;; Element of binary (possible comprehension) expression,
+	   (cond ((null erlang-argument-indent)
+		  ;; indent to next column.
+		  (+ 2 (nth 2 stack-top)))
+		 ((looking-at "\\(>>\\)[^_a-zA-Z0-9]")
+		  (nth 2 stack-top))
+		 (t 
+		  (goto-char (nth 1 stack-top))
+		  ;; Indent to the same column as the first
+		  ;; argument.
+		  (goto-char (+ 2 (nth 1 stack-top)))
+		  (skip-chars-forward " \t")
+		  (current-column))))
+	  
+          ((memq (car stack-top) '(icr fun spec))
+           ;; The default indentation is the column of the option
+           ;; directly following the keyword. (This does not apply to
+           ;; `case'.)  Should no option be on the same line, the
+           ;; indentation is the indentation of the keyword +
+           ;; `erlang-indent-level'.
+           ;;
+           ;; `after' should be indented to the same level as the
+           ;; corresponding receive.
+           (cond ((looking-at "\\(after\\|of\\)\\($\\|[^_a-zA-Z0-9]\\)")
+		  (nth 2 stack-top))
+		 ((looking-at "when[^_a-zA-Z0-9]")
+		  ;; Handling one when part
+		  (+ (nth 2 stack-top) erlang-indent-level erlang-indent-guard))
+		 (t
+		  (save-excursion
+		    (goto-char (nth 1 stack-top))
+		    (if (looking-at "case[^_a-zA-Z0-9]")
+			(+ (nth 2 stack-top) erlang-indent-level)
+		      (skip-chars-forward "a-z")
+		      (skip-chars-forward " \t")
+		      (if (memq (following-char) '(?% ?\n))
+			  (+ (nth 2 stack-top) erlang-indent-level)
+			(current-column))))))
+           )
+	  ((and (eq (car stack-top) '||) (looking-at "\\(]\\|>>\\)[^_a-zA-Z0-9]"))
+	   (nth 2 (car (cdr stack))))
+          ;; Real indentation, where operators create extra indentation etc.
+          ((memq (car stack-top) '(-> || try begin))
+	   (if (looking-at "\\(of\\)[^_a-zA-Z0-9]")
+	       (nth 2 stack-top)
+	     (goto-char (nth 1 stack-top))
+	     ;; Check if there is more code after the '->' on the
+	     ;; same line. If so use this indentation as base, else
+	     ;; use parent indentation + 2 * level as base.
+	     (let ((off erlang-indent-level)
+		   (skip 2))
+	       (cond ((null (cdr stack))) ; Top level in function.
+		     ((eq (car stack-top) 'begin)
+		      (setq skip 5))
+		     ((eq (car stack-top) 'try)
+		      (setq skip 5))
+		     ((eq (car stack-top) '->)
+		      ;; If in fun definition use standard indent level not double
+		      ;;(if (not (eq (car (car (cdr stack))) 'fun))
+		      ;; Removed it made multi clause fun's look to bad
+		      (setq off (* 2 erlang-indent-level)))) ;; ) 
+	       (let ((base (erlang-indent-find-base stack indent-point off skip)))
+		 ;; Special cases
+		 (goto-char indent-point)
+		 (cond ((looking-at "\\(end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
+			(if (eq (car stack-top) '->)
+			    (erlang-pop stack))
+			(if stack
+			    (erlang-caddr (car stack))
+			  0))
+		       ((looking-at "catch\\b\\($\\|[^_a-zA-Z0-9]\\)")
+			;; Are we in a try
+			(let ((start (if (eq (car stack-top) '->)
+					 (car (cdr stack))
+				       stack-top)))
+			  (if (null start) nil
+			    (goto-char (nth 1 start)))
+			  (cond ((looking-at "try\\($\\|[^_a-zA-Z0-9]\\)")
+				 (progn
+				   (if (eq (car stack-top) '->)
+				       (erlang-pop stack))
+				   (if stack
+				       (erlang-caddr (car stack))
+				     0)))
+				(t (erlang-indent-standard indent-point token base 'nil))))) ;; old catch
+		       (t 
+			(erlang-indent-standard indent-point token base 'nil)
+			))))
+	     ))
+	  ((eq (car stack-top) 'when)
+	   (goto-char (nth 1 stack-top))
+	   (if (looking-at "when\\s *\\($\\|%\\)")
+	       (progn
+		 (erlang-pop stack)
+		 (if (and stack (memq (nth 0 (car stack)) '(icr fun)))
+		     (progn
+		       (goto-char (nth 1 (car stack)))
+		       (+ (nth 2 (car stack)) erlang-indent-guard
+			  ;; receive XYZ    or    receive
+			  ;;                          XYZ
+			  ;; This if thing does not seem to be needed
+			  ;;(if (looking-at "[a-z]+\\s *\\($\\|%\\)")
+			  ;;    erlang-indent-level
+			  ;;  (* 2 erlang-indent-level))))
+			  (* 2 erlang-indent-level)))
+			  ;;erlang-indent-level))
+		   (+ erlang-indent-level erlang-indent-guard)))
+             ;; "when" is followed by code, let's indent to the same
+             ;; column.
+             (forward-char 4)           ; Skip "when"
+             (skip-chars-forward " \t")
+             (current-column)))
+	  ;; Type and Spec indentation
+	  ((eq (car stack-top) '::)
+	   (if (looking-at "}")
+	       ;; Closing record definition with types
+	       ;; pop stack and recurse
+	       (erlang-calculate-stack-indent indent-point
+					      (cons (erlang-pop stack) (cdr state)))
+	     (cond ((null erlang-argument-indent)
+		    ;; indent to next column.
+		    (+ 2 (nth 2 stack-top)))
+		   ((looking-at "::[^_a-zA-Z0-9]")
+		    (nth 2 stack-top))
+		   (t
+		    (let ((start-alternativ (if (looking-at "|") 2 0)))
+		      (goto-char (nth 1 stack-top))
+		      (- (cond ((looking-at "::\\s *\\($\\|%\\)")
+				;; Line ends with ::
+				(if (eq (car (car (last stack))) 'spec)
+				  (+ (erlang-indent-find-preceding-expr 1)
+				     erlang-argument-indent)
+				  (+ (erlang-indent-find-preceding-expr 2)
+				     erlang-argument-indent)))
+			       (t
+				;; Indent to the same column as the first
+				;; argument.
+				(goto-char (+ 2 (nth 1 stack-top)))
+				(skip-chars-forward " \t")
+				(current-column))) start-alternativ))))))
+	  )))
+
+(defun erlang-indent-standard (indent-point token base inside-parenthesis)
+  "Standard indent when in blocks or tuple or arguments.
+   Look at last thing to see in what state we are, move relative to the base."
+  (goto-char token)  
+  (cond ((looking-at "||\\|,\\|->\\||")
+	 base)
+	((erlang-at-keyword)
+	 (+ (current-column) erlang-indent-level))
+	((or (= (char-syntax (following-char)) ?.)
+	     (erlang-at-operator))
+	 (+ base erlang-indent-level))
+	(t
+	 (goto-char indent-point)
+	 (cond ((memq (following-char) '(?\( ))
+		;; Function application.
+		(+ (erlang-indent-find-preceding-expr)
+		   erlang-argument-indent))
+	       ;; Empty line, or end; treat it as the end of
+	       ;; the block.  (Here we have a choice: should
+	       ;; the user be forced to reindent continued
+	       ;; lines, or should the "end" be reindented?)
+	       
+	       ;; Avoid treating comments a continued line.
+	       ((= (following-char) ?%)
+		base)
+	       ;; Continued line (e.g. line beginning
+	       ;; with an operator.)
+	       (t 
+		(if (or (erlang-at-operator) (not inside-parenthesis)) 
+		    (+ base erlang-indent-level)
+		  base))))))
+
+(defun erlang-indent-find-base (stack indent-point &optional offset skip)
+  "Find the base column for current stack."
+  (or skip (setq skip 2))
+  (or offset (setq offset erlang-indent-level))
+  (save-excursion
+    (let* ((stack-top (car stack)))
+      (goto-char (nth 1 stack-top))
+      (if (< skip (- (point-max) (point)))
+	  (progn 
+	    (forward-char skip)
+	    (if (looking-at "\\s *\\($\\|%\\)")
+		(progn
+		  (if (memq (car stack-top) '(-> ||))
+		      (erlang-pop stack))
+		  ;; Take parent identation + offset,
+		  ;; else just erlang-indent-level if no parent
+		  (if stack
+		      (+ (erlang-caddr (car stack))
+			 offset)
+		    erlang-indent-level))
+	      (erlang-skip-blank indent-point)
+	      (current-column)))
+	(+ (current-column) skip)))))
+
+
+;; Does not handle `begin' .. `end'.
+(defun erlang-indent-find-preceding-expr (&optional arg)
+  "Return the first column of the preceding expression.
+This assumes that the preceding expression is either simple
+\(i.e. an atom) or parenthesized."
+  (save-excursion
+    (or arg (setq arg 1))
+    (ignore-errors (forward-sexp (- arg)))
+    (let ((col (current-column)))
+      (skip-chars-backward " \t")
+      ;; Special hack to handle: (note line break)
+      ;; [#myrecord{
+      ;;  foo = foo}]
+      ;; where the call (forward-sexp -1) will fail when point is at the `#'.
+      (or
+       (ignore-errors
+	 ;; Needed to match the colon in "'foo':'bar'".
+	 (cond ((eq (preceding-char) ?:)
+		(backward-char 1)
+		(forward-sexp -1)
+		(current-column))
+	       ((eq  (preceding-char) ?#)
+		;; We may now be at:
+		;; - either a construction of a new record
+		;; - or update of a record, in which case we want
+		;;   the column of the expression to be updated.
+		;;
+		;; To see which of the two cases we are at, we first
+		;; move an expression backwards, check for keywords,
+		;; then immediately an expression forwards.  Moving
+		;; backwards skips past tokens like `,' or `->', but
+		;; when moving forwards again, we won't skip past such
+		;; tokens.  We use this: if, after having moved
+		;; forwards, we're back where we started, then it was
+		;; a record update.
+		;; The check for keywords is to detect cases like:
+		;;   case Something of #record_construction{...}
+		(backward-char 1)
+		(let ((record-start (point))
+		      (record-start-col (current-column)))
+		  (forward-sexp -1)
+		  (let ((preceding-expr-col (current-column))
+			;; white space definition according to erl_scan
+			(white-space "\000-\040\200-\240"))
+		    (if (erlang-at-keyword)
+			;; The (forward-sexp -1) call moved past a keyword
+			(1+ record-start-col)
+		      (forward-sexp 1)
+		      (skip-chars-forward white-space record-start)
+		      ;; Are we back where we started?  If so, it was an update.
+		      (if (= (point) record-start)
+			    preceding-expr-col
+			(goto-char record-start)
+			(1+ (current-column)))))))
+	       (t col)))
+       col))))
+
+(defun erlang-indent-parenthesis (stack-position) 
+  (let ((previous (erlang-indent-find-preceding-expr)))
+    (if (> previous stack-position)
+	(+ stack-position erlang-argument-indent)
+      (+ previous erlang-argument-indent))))
+
+(defun erlang-skip-blank (&optional lim)
+  "Skip over whitespace and comments until limit reached."
+  (or lim (setq lim (point-max)))
+  (let (stop)
+    (while (and (not stop) (< (point) lim))
+      (cond ((= (following-char) ?%)
+	     (skip-chars-forward "^\n" lim))
+	    ((= (following-char) ?\n)
+	     (skip-chars-forward "\n" lim))
+	    ((looking-at "\\s ")
+	     (if (re-search-forward "\\S " lim 'move)
+		 (forward-char -1)))
+	    (t
+	     (setq stop t))))
+    stop))
+
+(defun erlang-at-keyword ()
+  "Are we looking at an Erlang keyword which will increase indentation?"
+  (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|"
+		      "of\\|receive\\|after\\|catch\\|try\\)\\b")))
+
+(defun erlang-at-operator ()
+  "Are we looking at an Erlang operator?"
+  (looking-at
+   "\\(bnot\\|div\\|mod\\|band\\|bor\\|bxor\\|bsl\\|bsr\\)\\b"))
+
+(defun erlang-comment-indent ()
+  "Compute Erlang comment indentation.
+
+Used both by `indent-for-comment' and the Erlang specific indentation
+commands."
+  (cond ((looking-at "%%%") 0)
+	((looking-at "%%")
+	 (or (erlang-calculate-indent)
+	     (current-indentation)))
+	(t
+	 (save-excursion
+	   (skip-chars-backward " \t")
+	   (max (if (bolp) 0 (1+ (current-column)))
+		comment-column)))))
+
+;;; Erlang movement commands
+
+;; All commands below work as movement commands.  I.e. if the point is
+;; at the end of the clause, and the command `erlang-end-of-clause' is
+;; executed, the point is moved to the end of the NEXT clause.  (This
+;; mimics the behaviour of `end-of-defun'.)
+;;
+;; Personally I would like to rewrite them to be "pure", and add a set
+;; of movement functions, like `erlang-next-clause',
+;; `erlang-previous-clause', and the same for functions.
+;;
+;; The current implementation makes it hopeless to use the functions as
+;; subroutines in more complex commands.   /andersl
+
+(defun erlang-beginning-of-clause (&optional arg)
+  "Move backward to previous start of clause.
+With argument, do this that many times.
+Return t unless search stops due to end of buffer."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (if (< arg 0)
+      ;; Step back to the end of the previous line, unless we are at
+      ;; the beginning of the buffer.  The reason for this move is
+      ;; that the regexp below includes the last character of the
+      ;; previous line.
+      (if (bobp)
+	  (or (looking-at "\n")
+	      (forward-char 1))
+	(forward-char -1)
+	(if (looking-at "\\`\n")
+	    (forward-char 1))))
+  ;; The regexp matches a function header that isn't
+  ;; included in a string.
+  (and (re-search-forward "\\(\\`\\|\\`\n\\|[^\\]\n\\)\\(-?[a-z]\\|'\\|-\\)"
+			  nil 'move (- arg))
+       (let ((beg (match-beginning 2)))
+	 (and beg (goto-char beg))
+	 t)))
+
+(defun erlang-end-of-clause (&optional arg)
+  "Move to the end of the current clause.
+With argument, do this that many times."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (while (and (looking-at "[ \t]*[%\n]")
+	      (zerop (forward-line 1))))
+  ;; Move to the next clause.
+  (erlang-beginning-of-clause (- arg))
+  (beginning-of-line);; Just to be sure...
+  (let ((continue t))
+    (while (and (not (bobp)) continue)
+      (forward-line -1)
+      (skip-chars-forward " \t")
+      (if (looking-at "[%\n]")
+	  nil
+	(end-of-line)
+	(setq continue nil)))))
+
+(defun erlang-mark-clause ()
+  "Put mark at end of clause, point at beginning."
+  (interactive)
+  (push-mark (point))
+  (erlang-end-of-clause 1)
+  ;; Sets the region. In Emacs 19 and XEmacs, we want to activate
+  ;; the region.
+  (condition-case nil
+      (push-mark (point) nil t)
+    (error (push-mark (point))))
+  (erlang-beginning-of-clause 1)
+  ;; The above function deactivates the mark.
+  (if (boundp 'deactivate-mark)
+      (funcall (symbol-function 'set) 'deactivate-mark nil)))
+
+(defun erlang-beginning-of-function (&optional arg)
+  "Move backward to previous start of function.
+With positive argument, do this that many times.
+With negative argument, search forward.
+
+Return t unless search stops due to end of buffer."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (cond
+   ;; Search backward
+   ((> arg 0)
+    (while (and (> arg 0)
+		(and (erlang-beginning-of-clause 1)
+		     (let ((start (point))
+			   (name (erlang-name-of-function))
+			   (arity (erlang-get-function-arity)))
+		       ;; Note: "arity" is nil for e.g. "-import", hence
+		       ;; two "-import" clauses are not considered to
+		       ;; be part of the same function.
+		       (while (and (erlang-beginning-of-clause 1)
+				   (string-equal name
+						 (erlang-name-of-function))
+				   arity
+				   (equal arity
+					  (erlang-get-function-arity)))
+			 (setq start (point)))
+		       (goto-char start)
+		       t)))
+      (setq arg (1- arg))))
+   ;; Search forward
+   ((< arg 0)
+    (end-of-line)
+    (erlang-beginning-of-clause 1)
+    ;; Step -arg functions forward.
+    (while (and (< arg 0)
+		;; Step one function forward, or stop if the end of
+		;; the buffer was reached.  Return t if we found the
+		;; function.
+		(let ((name (erlang-name-of-function))
+		      (arity (erlang-get-function-arity))
+		      (found (erlang-beginning-of-clause -1)))
+		  (while (and found
+			      (string-equal name (erlang-name-of-function))
+			      arity
+			      (equal arity
+				     (erlang-get-function-arity)))
+		    (setq found (erlang-beginning-of-clause -1)))
+		  found))
+      (setq arg (1+ arg)))))
+  (zerop arg))
+
+
+(defun erlang-end-of-function (&optional arg)
+  "Move forward to next end of function.
+
+With argument, do this that many times.
+With negative argument go towards the beginning of the buffer."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (let ((first t))
+    ;; Forward
+    (while (and (> arg 0) (< (point) (point-max)))
+      (let ((pos (point)))
+	(while (progn
+		 (if (and first
+			  (progn
+			    (forward-char 1)
+			    (erlang-beginning-of-clause 1)))
+		     nil
+		   (or (bobp) (forward-char -1))
+		   (erlang-beginning-of-clause -1))
+		 (setq first nil)
+		 (erlang-pass-over-function)
+		 (skip-chars-forward " \t")
+		 (if (looking-at "[%\n]")
+		     (forward-line 1))
+		 (<= (point) pos))))
+      (setq arg (1- arg)))
+    ;; Backward
+    (while (< arg 0)
+      (let ((pos (point)))
+	(erlang-beginning-of-clause 1)
+	(erlang-pass-over-function)
+	(forward-line 1)
+	(if (>= (point) pos)
+	    (if (erlang-beginning-of-function 2)
+		(progn
+		  (erlang-pass-over-function)
+		  (skip-chars-forward " \t")
+		  (if (looking-at "[%\n]")
+		      (forward-line 1)))
+	      (goto-char (point-min)))))
+      (setq arg (1+ arg)))))
+
+(eval-and-compile
+  (if (default-boundp 'beginning-of-defun-function)
+      (defalias 'erlang-mark-function 'mark-defun)
+    (defun erlang-mark-function ()
+      "Put mark at end of function, point at beginning."
+      (interactive)
+      (push-mark (point))
+      (erlang-end-of-function 1)
+      ;; Sets the region. In Emacs 19 and XEmacs, we want to activate
+      ;; the region.
+      (condition-case nil
+	  (push-mark (point) nil t)
+	(error (push-mark (point))))
+      (erlang-beginning-of-function 1)
+      ;; The above function deactivates the mark.
+      (if (boundp 'deactivate-mark)
+	  (funcall (symbol-function 'set) 'deactivate-mark nil)))))
+
+(defun erlang-pass-over-function ()
+  (while (progn
+	   (erlang-skip-blank)
+	   (and (not (looking-at "\\.\\(\\s \\|\n\\|\\s<\\)"))
+		(not (eobp))))
+    (forward-sexp 1))
+  (if (not (eobp))
+      (forward-char 1)))
+
+(defun erlang-name-of-function ()
+  (save-excursion
+    ;; Skip over attribute leader.
+    (if (looking-at "-[ \t]*")
+	(re-search-forward "-[ \t]*" nil 'move))
+    (let ((start (point)))
+      (forward-sexp 1)
+      (buffer-substring start (point)))))
+
+
+;;; Miscellaneous
+
+(defun erlang-fill-paragraph (&optional justify)
+  "Like \\[fill-paragraph], but handle Erlang comments.
+If any of the current line is a comment, fill the comment or the
+paragraph of it that point is in, preserving the comment's indentation
+and initial `%':s."
+  (interactive "P")
+  (let ((has-comment nil)
+	;; If has-comment, the appropriate fill-prefix for the comment.
+	comment-fill-prefix)
+    ;; Figure out what kind of comment we are looking at.
+    (save-excursion
+      (beginning-of-line)
+      (cond
+       ;; Find the command prefix.
+       ((looking-at (concat "\\s *" comment-start-skip))
+	(setq has-comment t)
+	(setq comment-fill-prefix (buffer-substring (match-beginning 0)
+						    (match-end 0))))
+       ;; A line with some code, followed by a comment?  Remember that the
+       ;; % which starts the comment shouldn't be part of a string or
+       ;; character.
+       ((progn
+	  (while (not (looking-at "%\\|$"))
+	    (skip-chars-forward "^%\n\"\\\\")
+	    (cond
+	     ((eq (char-after (point)) ?\\) (forward-char 2))
+	     ((eq (char-after (point)) ?\") (forward-sexp 1))))
+	  (looking-at comment-start-skip))
+	(setq has-comment t)
+	(setq comment-fill-prefix
+	      (concat (make-string (current-column) ? )
+		      (buffer-substring (match-beginning 0) (match-end 0)))))))
+    (if (not has-comment)
+	(fill-paragraph justify)
+      ;; Narrow to include only the comment, and then fill the region.
+      (save-restriction
+	(narrow-to-region
+	 ;; Find the first line we should include in the region to fill.
+	 (save-excursion
+	   (while (and (zerop (forward-line -1))
+		       (looking-at "^\\s *%")))
+	   ;; We may have gone to far.  Go forward again.
+	   (or (looking-at "^\\s *%")
+	       (forward-line 1))
+	   (point))
+	 ;; Find the beginning of the first line past the region to fill.
+	 (save-excursion
+	   (while (progn (forward-line 1)
+			 (looking-at "^\\s *%")))
+	   (point)))
+	;; Lines with only % on them can be paragraph boundaries.
+	(let ((paragraph-start (concat paragraph-start "\\|^[ \t%]*$"))
+	      (paragraph-separate (concat paragraph-start "\\|^[ \t%]*$"))
+	      (fill-prefix comment-fill-prefix))
+	  (fill-paragraph justify))))))
+
+
+(defun erlang-uncomment-region (beg end)
+  "Uncomment all commented lines in the region."
+  (interactive "r")
+  (uncomment-region beg end))
+
+
+(defun erlang-generate-new-clause ()
+  "Create additional Erlang clause header.
+
+Parses the source file for the name of the current Erlang function.
+Create the header containing the name, A pair of parentheses,
+and an arrow. The space between the function name and the
+first parenthesis is preserved.  The point is placed between
+the parentheses."
+  (interactive)
+  (let ((name (save-excursion
+		(and (erlang-beginning-of-clause)
+		     (erlang-get-function-name t))))
+	(arrow (save-excursion
+		 (and (erlang-beginning-of-clause)
+		      (erlang-get-function-arrow)))))
+    (if (or (null arrow) (null name))
+	(error "Can't find name of current Erlang function"))
+    (if (and (bolp) (eolp))
+	nil
+      (end-of-line)
+      (newline))
+    (insert name)
+    (save-excursion
+      (insert ") " arrow))
+    (if erlang-new-clause-with-arguments
+	(erlang-clone-arguments))))
+
+
+(defun erlang-clone-arguments ()
+  "Insert, at the point, the argument list of the previous clause.
+
+The mark is set at the beginning of the inserted text, the point
+at the end."
+  (interactive)
+  (let ((args (save-excursion
+		(beginning-of-line)
+		(and (erlang-beginning-of-clause)
+		     (erlang-get-function-arguments))))
+	(p (point)))
+    (if (null args)
+	(error "Can't clone argument list"))
+    (insert args)
+    (set-mark p)))
+
+;;; Information retrieval functions.
+
+(defun erlang-buffer-substring (beg end)
+  "Like `buffer-substring-no-properties'.
+Although, this function works on all versions of Emacs."
+  (if (fboundp 'buffer-substring-no-properties)
+      (funcall (symbol-function 'buffer-substring-no-properties) beg end)
+    (buffer-substring beg end)))
+
+
+(defun erlang-get-module ()
+  "Return the name of the module as specified by `-module'.
+
+Return nil if file contains no `-module' attribute."
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char (point-min))
+      (let ((md (match-data)))
+	(unwind-protect
+	    (if (re-search-forward
+		 (eval-when-compile
+		   (concat "^-module\\s *(\\s *\\(\\("
+			   erlang-atom-regexp
+			   "\\)?\\)\\s *)\\s *\\."))
+		 (point-max) t)
+		(erlang-remove-quotes
+		 (erlang-buffer-substring (match-beginning 1)
+					  (match-end 1)))
+	      nil)
+	  (store-match-data md))))))
+
+
+(defun erlang-get-module-from-file-name (&optional file)
+  "Extract the module name from a file name.
+
+First, the directory part is removed.  Second, the part of the file name
+matching `erlang-file-name-extension-regexp' is removed.
+
+Should the match fail, nil is returned.
+
+By modifying `erlang-file-name-extension-regexp' to match files other
+than Erlang source files, Erlang specific functions could be applied on
+non-Erlang files.  Most notably; the support for Erlang modules in the
+tags system could be used by files written in other languages."
+  (or file (setq file buffer-file-name))
+  (if (null file)
+      nil
+    (setq file (file-name-nondirectory file))
+    (if (string-match erlang-file-name-extension-regexp file)
+	(substring file 0 (match-beginning 0))
+      nil)))
+
+
+;; Used by `erlang-get-export' and `erlang-get-import'.
+
+(defun erlang-get-function-arity-list ()
+  "Parse list of `function/arity' as used by `-import' and `-export'.
+
+Point must be before the opening bracket.  When the
+function returns the point will be placed after the closing bracket.
+
+The function does not return an error if the list is incorrectly
+formatted.
+
+Return list of (function . arity).  The order of the returned list
+corresponds to the order of the parsed Erlang list."
+  (let ((res '()))
+    (erlang-skip-blank)
+    (forward-char 1)
+    (if (not (eq (preceding-char) ?\[))
+	'()				; Not looking at an Erlang list.
+      (while				; Note: `while' has no body.
+	  (progn
+	    (erlang-skip-blank)
+	    (and (looking-at (eval-when-compile
+			       (concat erlang-atom-regexp "/\\([0-9]+\\)\\>")))
+		 (progn
+		   (setq res (cons
+			      (cons
+			       (erlang-remove-quotes
+				(erlang-buffer-substring
+				 (match-beginning 1) (match-end 1)))
+			       (erlang-string-to-int
+				(erlang-buffer-substring
+				 (match-beginning
+				  (+ 1 erlang-atom-regexp-matches))
+				 (match-end
+				  (+ 1 erlang-atom-regexp-matches)))))
+			      res))
+		   (goto-char (match-end 0))
+		   (erlang-skip-blank)
+		   (forward-char 1)
+		   ;; Test if there are more exported functions.
+		   (eq (preceding-char) ?,))))))
+    (nreverse res)))
+
+
+;;;  Note that `-export' and the open parenthesis must be written on
+;;;  the same line.
+
+(defun erlang-get-export ()
+  "Return a list of `(function . arity)' as specified by `-export'."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((md (match-data))
+	  (res '()))
+      (unwind-protect
+	  (progn
+	    (while (re-search-forward "^-export\\s *(" (point-max) t)
+	      (erlang-skip-blank)
+	      (setq res (nconc res (erlang-get-function-arity-list))))
+	    res)
+	(store-match-data md)))))
+
+
+(defun erlang-get-import ()
+  "Parse an Erlang source file for imported functions.
+
+Return an alist with module name as car part and list of conses containing
+function and arity as cdr part."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((md (match-data))
+	  (res '()))
+      (unwind-protect
+	  (progn
+	    (while (re-search-forward "^-import\\s *(" (point-max) t)
+	      (erlang-skip-blank)
+	      (if (looking-at erlang-atom-regexp)
+		  (let ((module (erlang-remove-quotes
+				 (erlang-buffer-substring
+				  (match-beginning 0)
+				  (match-end 0)))))
+		    (goto-char (match-end 0))
+		    (erlang-skip-blank)
+		    (if (eq (following-char) ?,)
+			(progn
+			  (forward-char 1)
+			  (erlang-skip-blank)
+			  (let ((funcs (erlang-get-function-arity-list))
+				(pair (assoc module res)))
+			    (if pair
+				(setcdr pair (nconc (cdr pair) funcs))
+			      (setq res (cons (cons module funcs)
+					      res)))))))))
+	    (nreverse res))
+	(store-match-data md)))))
+
+
+(defun erlang-get-function-name (&optional arg)
+  "Return name of current function, or nil.
+
+If optional argument is non-nil, everything up to and including
+the first `(' is returned.
+
+Normally used in conjunction with `erlang-beginning-of-clause', e.g.:
+              (save-excursion
+                (if (not (eobp)) (forward-char 1))
+		(and (erlang-beginning-of-clause)
+		     (erlang-get-function-name t)))"
+  (let ((n (if arg 0 1)))
+    (and (looking-at (eval-when-compile
+		       (concat "^" erlang-atom-regexp "\\s *(")))
+	 (erlang-buffer-substring (match-beginning n) (match-end n)))))
+
+
+(defun erlang-get-function-arrow ()
+  "Return arrow of current function, could be \"->\" or nil.
+
+Normally used in conjunction with `erlang-beginning-of-clause', e.g.:
+              (save-excursion
+                (if (not (eobp)) (forward-char 1))
+		(and (erlang-beginning-of-clause)
+		     (erlang-get-function-arrow)))"
+  (and 
+   (save-excursion
+     (re-search-forward "->" (point-max) t)
+     (erlang-buffer-substring (- (point) 2) (+ (point) 1)))))
+
+(defun erlang-get-function-arity ()
+  "Return the number of arguments of function at point, or nil."
+  (and (looking-at (eval-when-compile
+		     (concat "^" erlang-atom-regexp "\\s *(")))
+       (save-excursion
+	 (goto-char (match-end 0))
+	 (condition-case nil
+	     (let ((res 0)
+		   (cont t))
+	       (while cont
+		 (cond ((eobp)
+			(setq res nil)
+			(setq cont nil))
+		       ((looking-at "\\s *)")
+			(setq cont nil))
+		       ((looking-at "\\s *\\($\\|%\\)")
+			(forward-line 1))
+		       ((looking-at "\\s *<<[^>]*?>>")
+			(when (zerop res)
+			  (setq res (+ 1 res)))
+			(goto-char (match-end 0)))
+		       ((looking-at "\\s *,")
+			(setq res (+ 1 res))
+			(goto-char (match-end 0)))
+		       (t
+			(when (zerop res)
+			  (setq res (+ 1 res)))
+			(forward-sexp 1))))
+	       res)
+	   (error nil)))))
+
+(defun erlang-get-function-name-and-arity ()
+  "Return the name and arity of the function at point, or nil.
+The return value is a string of the form \"foo/1\"."
+  (let ((name (erlang-get-function-name))
+        (arity (erlang-get-function-arity)))
+    (and name arity (format "%s/%d" name arity))))
+
+(defun erlang-get-function-arguments ()
+  "Return arguments of current function, or nil."
+  (if (not (looking-at (eval-when-compile
+			 (concat "^" erlang-atom-regexp "\\s *("))))
+      nil
+    (save-excursion
+      (condition-case nil
+	  (let ((start (match-end 0)))
+	    (goto-char (- start 1))
+	    (forward-sexp)
+	    (erlang-buffer-substring start (- (point) 1)))
+	(error nil)))))
+
+
+(defun erlang-get-function-under-point ()
+  "Return the module and function under the point, or nil.
+
+Should no explicit module name be present at the point, the
+list of imported functions is searched.
+
+The following could be returned:
+   (\"module\"  \"function\")    -- Both module and function name found.
+   (nil       \"function\")    -- No module name was found.
+   nil                       -- No function name found
+
+In the future the list may contain more elements."
+  (save-excursion
+    (let ((md (match-data))
+	  (res nil))
+      (if (eq (char-syntax (following-char)) ? )
+	  (skip-chars-backward " \t"))
+      (skip-chars-backward "a-zA-Z0-9_:'")
+      (cond ((looking-at (eval-when-compile
+			   (concat erlang-atom-regexp ":" erlang-atom-regexp)))
+	     (setq res (list
+			(erlang-remove-quotes
+			 (erlang-buffer-substring
+			  (match-beginning 1) (match-end 1)))
+			(erlang-remove-quotes
+			 (erlang-buffer-substring
+			  (match-beginning (1+ erlang-atom-regexp-matches))
+			  (match-end (1+ erlang-atom-regexp-matches)))))))
+	    ((looking-at erlang-atom-regexp)
+	     (let ((fk (erlang-remove-quotes
+			(erlang-buffer-substring
+			 (match-beginning 0) (match-end 0))))
+		   (mod nil)
+		   (imports (erlang-get-import)))
+	       (while (and imports (null mod))
+		 (if (assoc fk (cdr (car imports)))
+		     (setq mod (car (car imports)))
+		   (setq imports (cdr imports))))
+	       (setq res (list mod fk)))))
+      (store-match-data md)
+      res)))
+
+
+;; TODO: Escape single quotes inside the string without
+;; replace-regexp-in-string.
+(defun erlang-add-quotes-if-needed (str)
+  "Return STR, possibly with quotes."
+  (let ((case-fold-search nil)) ; force string matching to be case sensitive
+    (if (and (stringp str)
+	     (not (string-match (eval-when-compile
+				  (concat "\\`" erlang-atom-regexp "\\'")) str)))
+	(progn (if (fboundp 'replace-regexp-in-string)
+		   (setq str (replace-regexp-in-string "'" "\\'" str t t )))
+	       (concat "'" str "'"))
+      str)))
+
+
+(defun erlang-remove-quotes (str)
+  "Return STR without quotes, if present."
+  (let ((md (match-data)))
+    (prog1
+	(if (string-match "\\`'\\(.*\\)'\\'" str)
+	    (substring str 1 -1)
+	  str)
+      (store-match-data md))))
+
+(defun erlang-match-next-exported-function (max)
+  "Returns non-nil if there is an exported function in the current
+buffer between point and MAX."
+  (block nil
+    (while (and (not erlang-inhibit-exported-function-name-face)
+                (erlang-match-next-function max))
+      (when (erlang-last-match-exported-p)
+        (return (match-data))))))
+
+(defun erlang-match-next-function (max)
+  "Searches forward in current buffer for the next erlang function,
+bounded by position MAX."
+  (re-search-forward erlang-defun-prompt-regexp max 'move-point))
+
+(defun erlang-last-match-exported-p ()
+  "Returns non-nil if match-data describes the name and arity of an
+exported function."
+  (save-excursion
+    (save-match-data
+      (goto-char (match-beginning 1))
+      (erlang-function-exported-p
+       (erlang-remove-quotes (erlang-get-function-name))
+       (erlang-get-function-arity)))))
+
+(defun erlang-function-exported-p (name arity)
+  "Returns non-nil if function of name and arity is exported in current buffer."
+  (save-excursion
+    (let* ((old-match-data (match-data))
+           (exports        (erlang-get-export)))
+      (store-match-data old-match-data)
+      (member (cons name arity) exports))))
+
+
+;;; Check module name
+
+;; The function `write-file', bound to C-x C-w, calls
+;; `set-visited-file-name' which clears the hook.  :-(
+;; To make sure that the hook always is present, we advise
+;; `set-visited-file-name'.
+(defun erlang-check-module-name-init ()
+  "Initialize the functionality to compare file and module names.
+
+Unless we have `before-save-hook', we redefine the function
+`set-visited-file-name' since it clears the variable
+`local-write-file-hooks'.  The original function definition is
+stored in `erlang-orig-set-visited-file-name'."
+  (if (boundp 'before-save-hook)
+      ;; If we have that, `make-local-hook' is obsolete.
+      (add-hook 'before-save-hook 'erlang-check-module-name nil t)
+    (require 'advice)
+    (unless (ad-advised-definition-p 'set-visited-file-name)
+      (defadvice set-visited-file-name (after erlang-set-visited-file-name
+					      activate)
+	(if (eq major-mode 'erlang-mode)
+	    (add-hook 'local-write-file-hooks 'erlang-check-module-name))))
+    (add-hook 'local-write-file-hooks 'erlang-check-module-name)))
+
+
+(defun erlang-check-module-name ()
+  "If the module name doesn't match file name, ask for permission to change.
+
+The variable `erlang-check-module-name' controls the behaviour of this
+function.  It it is nil, this function does nothing.  If it is t, the
+source is silently changed.  If it is set to the atom `ask', the user
+is prompted.
+
+This function is normally placed in the hook `local-write-file-hooks'."
+  (if erlang-check-module-name
+      (let ((mn (erlang-add-quotes-if-needed 
+		 (erlang-get-module)))
+	    (fn (erlang-add-quotes-if-needed 
+		 (erlang-get-module-from-file-name (buffer-file-name)))))
+	(if (and (stringp mn) (stringp fn))
+	    (or (string-equal mn fn)
+		(if (or (eq erlang-check-module-name t)
+			(y-or-n-p
+			 "Module does not match file name. Modify source? "))
+		    (save-excursion
+		      (save-restriction
+			(widen)
+			(goto-char (point-min))
+			(if (re-search-forward
+			     (eval-when-compile
+			       (concat "^-module\\s *(\\s *\\(\\("
+				       erlang-atom-regexp
+				       "\\)?\\)\\s *)\\s *\\."))
+			     (point-max) t)
+			    (progn
+			      (goto-char (match-beginning 1))
+			      (delete-region (match-beginning 1)
+					     (match-end 1))
+			      (insert fn))))))))))
+  ;; Must return nil since it is added to `local-write-file-hook'.
+  nil)
+
+
+;;; Electric functions.
+
+(defun erlang-electric-semicolon (&optional arg)
+  "Insert a semicolon character and possibly a prototype for the next line.
+
+The variable `erlang-electric-semicolon-criteria' states a criterion,
+when fulfilled a newline is inserted, the next line is indented and a
+prototype for the next line is inserted.  Normally the prototype
+consists of \" ->\".  Should the semicolon end the clause a new clause
+header is generated.
+
+The variable `erlang-electric-semicolon-insert-blank-lines' controls
+the number of blank lines inserted between the current line and new
+function header.
+
+Behaves just like the normal semicolon when supplied with a
+numerical arg, point is inside string or comment, or when there are
+non-whitespace characters following the point on the current line."
+  (interactive "P")
+  (self-insert-command (prefix-numeric-value arg))
+  (if (or arg
+	  (and (listp erlang-electric-commands)
+	       (not (memq 'erlang-electric-semicolon
+			  erlang-electric-commands)))
+	  (erlang-in-literal)
+	  (not (looking-at "\\s *\\(%.*\\)?$"))
+	  (null (erlang-test-criteria-list
+		 erlang-electric-semicolon-criteria)))
+      (setq erlang-electric-newline-inhibit nil)
+    (setq erlang-electric-newline-inhibit t)
+    (undo-boundary)
+    (erlang-indent-line)
+    (end-of-line)
+    (newline)
+    (if (condition-case nil
+	    (progn (erlang-indent-line) t)
+	  (error (if (bolp) (delete-backward-char 1))))
+	(if (not (bolp))
+	    (save-excursion
+	      (insert " ->"))
+	  (condition-case nil
+	      (progn
+		(erlang-generate-new-clause)
+		(if erlang-electric-semicolon-insert-blank-lines
+		    (save-excursion
+		      (beginning-of-line)
+		      (newline
+		       erlang-electric-semicolon-insert-blank-lines))))
+	    (error (if (bolp) (delete-backward-char 1))))))))
+
+
+(defun erlang-electric-comma (&optional arg)
+  "Insert a comma character and possibly a new indented line.
+The variable `erlang-electric-comma-criteria' states a criterion,
+when fulfilled a newline is inserted and the next line is indented.
+
+Behaves just like the normal comma when supplied with a
+numerical arg, point is inside string or comment, or when there are
+non-whitespace characters following the point on the current line."
+  (interactive "P")
+
+  (self-insert-command (prefix-numeric-value arg))
+
+  (if (or arg
+	  (and (listp erlang-electric-commands)
+	       (not (memq 'erlang-electric-comma erlang-electric-commands)))
+	  (erlang-in-literal)
+	  (not (looking-at "\\s *\\(%.*\\)?$"))
+	  (null (erlang-test-criteria-list
+		 erlang-electric-comma-criteria)))
+      (setq erlang-electric-newline-inhibit nil)
+    (setq erlang-electric-newline-inhibit t)
+    (undo-boundary)
+    (erlang-indent-line)
+    (end-of-line)
+    (newline)
+    (condition-case nil
+	(erlang-indent-line)
+      (error (if (bolp) (delete-backward-char 1))))))
+
+(defun erlang-electric-lt (&optional arg)
+  "Insert a less-than sign, and optionally mark it as an open paren."
+  
+  (interactive "p")
+
+  (self-insert-command arg)
+
+  ;; Was this the second char in bit-syntax open (`<<')?
+  (unless (<= (point) 2)
+    (save-excursion
+      (backward-char 2)
+      (when (and (eq (char-after (point)) ?<)
+		 (not (eq (get-text-property (point) 'category)
+			  'bitsyntax-open-inner)))
+	;; Then mark the two chars...
+	(put-text-property (point) (1+ (point)) 
+			   'category 'bitsyntax-open-outer)
+	(forward-char 1)
+	(put-text-property (point) (1+ (point))
+			   'category 'bitsyntax-open-inner)
+	;;...and unmark any subsequent less-than chars.
+	(forward-char 1)
+	(while (eq (char-after (point)) ?<)
+	  (remove-text-properties (point) (1+ (point))
+				  '(category nil))
+	  (forward-char 1))))))
+
+(defun erlang-after-bitsyntax-close ()
+  "Return t if point is immediately after a bit-syntax close parenthesis (`>>')."
+  (and (>= (point) 3)
+       (save-excursion
+	 (backward-char 2)
+	 (and (eq (char-after (point)) ?>)
+	      (not (eq (get-text-property (point) 'category)
+		       'bitsyntax-close-outer))))))
+	 
+(defun erlang-after-arrow ()
+  "Return true if point is immediately after a function arrow (`->')."
+  (and (>= (point) 2)
+       (and 
+	(save-excursion
+	  (backward-char)
+	  (eq (char-before (point)) ?-))
+	(or (not (listp erlang-electric-commands))
+	    (memq 'erlang-electric-gt
+		  erlang-electric-commands))
+	(not (erlang-in-literal))
+	(looking-at "\\s *\\(%.*\\)?$")
+	(erlang-test-criteria-list erlang-electric-arrow-criteria))))
+
+
+(defun erlang-electric-gt (&optional arg)
+  "Insert a greater-than sign, and optionally mark it as a close paren."
+  
+  (interactive "p")
+
+  (self-insert-command arg)
+
+  (cond
+   ;; Did we just write a bit-syntax close (`>>')?
+   ((erlang-after-bitsyntax-close)
+    (save-excursion
+      ;; Then mark the two chars...
+      (backward-char 2)
+      (put-text-property (point) (1+ (point)) 
+			 'category 'bitsyntax-close-inner)
+      (forward-char)
+      (put-text-property (point) (1+ (point))
+			 'category 'bitsyntax-close-outer)
+      ;;...and unmark any subsequent greater-than chars.
+      (forward-char)
+      (while (eq (char-after (point)) ?>)
+	(remove-text-properties (point) (1+ (point))
+				'(category nil))
+	(forward-char))))
+
+   ;; Did we just write a function arrow (`->')?
+   ((erlang-after-arrow)
+    (let ((erlang-electric-newline-inhibit t))
+      (undo-boundary)
+      (end-of-line)
+      (newline)
+      (condition-case nil
+	  (erlang-indent-line)
+	(error (if (bolp) (delete-backward-char 1))))))
+
+   ;; Then it's just a plain greater-than.
+   (t
+    nil)))
+    
+
+(defun erlang-electric-arrow\ off (&optional arg)
+  "Insert a '>'-sign and possibly a new indented line.
+
+This command is only `electric' when the `>' is part of an `->' arrow.
+The variable `erlang-electric-arrow-criteria' states a sequence of
+criteria, which decides when a newline should be inserted and the next
+line indented.
+
+It behaves just like the normal greater than sign when supplied with a
+numerical arg, point is inside string or comment, or when there are
+non-whitespace characters following the point on the current line.
+
+After being split/merged into `erlang-after-arrow' and
+`erlang-electric-gt', it is now unused and disabled."
+  (interactive "P")
+  (let ((prec (preceding-char)))
+    (self-insert-command (prefix-numeric-value arg))
+    (if (or arg
+	    (and (listp erlang-electric-commands)
+		 (not (memq 'erlang-electric-arrow
+			    erlang-electric-commands)))
+	    (not (eq prec ?-))
+	    (erlang-in-literal)
+	    (not (looking-at "\\s *\\(%.*\\)?$"))
+	    (null (erlang-test-criteria-list
+		   erlang-electric-arrow-criteria)))
+	(setq erlang-electric-newline-inhibit nil)
+      (setq erlang-electric-newline-inhibit t)
+      (undo-boundary)
+      (end-of-line)
+      (newline)
+      (condition-case nil
+	  (erlang-indent-line)
+	(error (if (bolp) (delete-backward-char 1)))))))
+
+
+(defun erlang-electric-newline (&optional arg)
+  "Break line at point and indent, continuing comment if within one.
+The variable `erlang-electric-newline-criteria' states a criterion,
+when fulfilled a newline is inserted and the next line is indented.
+
+Should the current line begin with a comment, and the variable
+`comment-multi-line' be non-nil, a new comment start is inserted.
+
+Should the previous command be another electric command we assume that
+the user pressed newline out of old habit, hence we will do nothing."
+  (interactive "P")
+  (cond ((and (not arg)
+	      erlang-electric-newline-inhibit
+	      (memq last-command erlang-electric-newline-inhibit-list))
+	 ())				; Do nothing!
+	((or arg
+	     (and (listp erlang-electric-commands)
+		  (not (memq 'erlang-electric-newline
+			     erlang-electric-commands)))
+	     (null (erlang-test-criteria-list
+		    erlang-electric-newline-criteria)))
+	 (newline (prefix-numeric-value arg)))
+	(t
+	 (if (and comment-multi-line
+		  (save-excursion
+		    (beginning-of-line)
+		    (looking-at (concat "\\s *" comment-start-skip))))
+	     (let ((str (buffer-substring
+			 (or (match-end 1) (match-beginning 0))
+			 (min (match-end 0) (point)))))
+	       (newline)
+	       (undo-boundary)
+	       (insert str))
+	   (newline)
+	   (undo-boundary)
+	   (indent-according-to-mode)))))
+
+
+(defun erlang-test-criteria-list (criteria)
+  "Given a list of criterion functions, test if criteria are fulfilled.
+
+Each element in the criteria list can a function returning nil, t or
+the atom `stop'.  t means that the criterion is fulfilled, `stop' means
+that it isn't fulfilled and that the search should stop,
+and nil means continue searching.
+
+Should the list contain the atom t the criterion is assumed to be
+fulfilled, unless preceded by a function returning `stop', of course.
+
+Should the argument be the atom t instead of a list, the criterion is
+assumed to be trivially true.
+
+Should all functions return nil, the criteria are assumed not to be
+fulfilled.
+
+Return t if criteria fulfilled, nil otherwise."
+  (if (eq criteria t)
+      t
+    (save-excursion
+      (let ((answer nil))
+	(while (and criteria (null answer))
+	  (if (eq (car criteria) t)
+	      (setq answer t)
+	    (setq answer (funcall (car criteria))))
+	  (setq criteria (cdr criteria)))
+	(if (and answer (not (eq answer 'stop)))
+	    t
+	  nil)))))
+
+
+(defun erlang-in-literal (&optional lim)
+  "Test if point is in string, quoted atom or comment.
+
+Return one of the three atoms `atom', `string', and `comment'.
+Should the point be inside none of the above mentioned types of
+context, nil is returned."
+  (save-excursion
+    (let* ((lim (or lim (save-excursion
+			  (erlang-beginning-of-clause)
+			  (point))))
+	   (state (if (fboundp 'syntax-ppss) ; post Emacs 21.3
+		      (funcall (symbol-function 'syntax-ppss))
+		    (parse-partial-sexp lim (point)))))
+      (cond
+       ((eq (nth 3 state) ?') 'atom)
+       ((nth 3 state) 'string)
+       ((nth 4 state) 'comment)
+       (t nil)))))
+
+
+(defun erlang-at-end-of-function-p ()
+  "Test if point is at end of an Erlang function.
+
+This function is designed to be a member of a criteria list."
+  (eq (save-excursion (erlang-skip-blank) (point))
+      (save-excursion
+	(erlang-beginning-of-function -1) (point))))
+
+
+(defun erlang-at-end-of-clause-p ()
+  "Test if point is at end of an Erlang clause.
+
+This function is designed to be a member of a criteria list."
+  (eq (save-excursion (erlang-skip-blank) (point))
+      (save-excursion
+	(erlang-beginning-of-clause -1) (point))))
+
+
+(defun erlang-stop-when-inside-argument-list ()
+  "Return `stop' if inside parenthesis list, nil otherwise.
+
+Knows about the list comprehension syntax.  When the point is
+after `||', `stop' is not returned.
+
+This function is designed to be a member of a criteria list."
+  (save-excursion
+    (condition-case nil
+	(let ((orig-point (point))
+	      (state nil))
+	  (up-list -1)
+	  (if (not (eq (following-char) ?\[))
+	      'stop
+	    ;; Do not return `stop' when inside a list comprehension
+	    ;; construction.  (The point must be after `||').
+	    (while (< (point) orig-point)
+              (let ((pt (point)))
+                (setq state (erlang-partial-parse pt orig-point state))
+                (if (= pt (point))
+                    (error "Illegal syntax"))))
+	    (if (and (car state) (eq (car (car (car state))) '||))
+		nil
+	      'stop)))
+      (error 
+       nil))))
+
+
+(defun erlang-stop-when-at-guard ()
+  "Return `stop' when at function guards.
+
+This function is designed to be a member of a criteria list."
+  (save-excursion
+    (beginning-of-line)
+    (if (and (looking-at (eval-when-compile
+			   (concat "^" erlang-atom-regexp "\\s *(")))
+	     (not (looking-at
+		   (eval-when-compile
+		     (concat "^" erlang-atom-regexp ".*->")))))
+	'stop
+      nil)))
+
+
+(defun erlang-stop-when-in-type-spec ()
+  "Return `stop' when in a type spec line.
+
+This function is designed to be a member of a criteria list."
+  (save-excursion
+    (beginning-of-line)
+    (when (save-match-data (looking-at "-\\(spec\\|type\\|callback\\)"))
+      'stop)))
+
+
+(defun erlang-next-lines-empty-p ()
+  "Return non-nil if next lines are empty.
+
+The variable `erlang-next-lines-empty-threshold' contains the number
+of lines required to be empty.
+
+A line containing only spaces and tabs is considered empty.
+
+This function is designed to be a member of a criteria list."
+  (and erlang-next-lines-empty-threshold
+       (save-excursion
+	 (let ((left erlang-next-lines-empty-threshold)
+	       (cont t))
+	   (while (and cont (> left 0))
+	     (forward-line 1)
+	     (setq cont (looking-at "\\s *$"))
+	     (setq left (- left 1)))
+	   cont))))
+
+
+(defun erlang-at-keyword-end-p ()
+  "Test if next readable token is the keyword end.
+
+This function is designed to be a member of a criteria list."
+  (save-excursion
+    (erlang-skip-blank)
+    (looking-at "end[^_a-zA-Z0-9]")))
+
+
+;; Erlang tags support which is aware of erlang modules.
+;;
+;; Not yet implemented under XEmacs.  (Hint:  The Emacs 19 etags
+;; package works under XEmacs.)
+
+(eval-when-compile
+  (if (or (featurep 'bytecomp)
+	  (featurep 'byte-compile))
+      (progn
+	(require 'etags))))
+
+
+;; Variables:
+
+(defvar erlang-tags-function-alist
+  '((find-tag                 . erlang-find-tag)
+    (find-tag-other-window    . erlang-find-tag-other-window)
+    (find-tag-regexp          . erlang-find-tag-regexp)
+    (find-tag-other-frame     . erlang-find-tag-other-frame))
+  "Alist of old tags commands and the replacement functions.")
+
+(defvar erlang-tags-installed nil
+  "Non-nil when the Erlang tags system is installed.")
+(defvar erlang-tags-file-list '()
+  "List of files in tag list. Used when finding tag on form `module:'.")
+(defvar erlang-tags-completion-table nil
+  "Like `tags-completion-table', this table contains `tag' and `module:tag'.")
+(defvar erlang-tags-buffer-installed-p nil
+  "Non-nil when Erlang module recognising functions installed.")
+(defvar erlang-tags-buffer-list '()
+  "Temporary list of buffers.")
+(defvar erlang-tags-orig-completion-table nil
+  "Temporary storage for `tags-completion-table'.")
+(defvar erlang-tags-orig-tag-order nil
+  "Temporary storage for `find-tag-tag-order'.")
+(defvar erlang-tags-orig-regexp-tag-order nil
+  "Temporary storage for `find-tag-regexp-tag-order'.")
+(defvar erlang-tags-orig-search-function nil
+  "Temporary storage for `find-tag-search-function'.")
+(defvar erlang-tags-orig-regexp-search-function nil
+  "Temporary storage for `find-tag-regexp-search-function'.")
+(defvar erlang-tags-orig-format-hooks nil
+  "Temporary storage for `tags-table-format-hooks'.") ;v19
+(defvar erlang-tags-orig-format-functions nil
+  "Temporary storage for `tags-table-format-functions'.") ;v > 19
+
+(defun erlang-tags-init ()
+  "Install an alternate version of tags, aware of Erlang modules.
+
+After calling this function, the tags functions are aware of
+Erlang modules.  Tags can be entered on the for `module:tag' as well
+as on the old form `tag'.
+
+In the completion list, `module:tag' and `module:' shows up.
+
+Call this function from an appropriate init file, or add it to
+Erlang mode hook with the commands:
+    (add-hook 'erlang-mode-hook 'erlang-tags-init)
+    (add-hook 'erlang-shell-mode-hook 'erlang-tags-init)
+
+This function only works under Emacs 18 and Emacs 19.  Currently, It
+is not implemented under XEmacs.  (Hint: The Emacs 19 etags module
+works under XEmacs.)"
+  (interactive)
+  (cond ((= erlang-emacs-major-version 18)
+	 (require 'tags)
+	 (erlang-tags-define-keys (current-local-map))
+	 (setq erlang-tags-installed t))
+	(t
+	 (require 'etags)
+	 ;; Test on a function available in the Emacs 19 version
+	 ;; of tags but not in the XEmacs version.
+	 (if (not (fboundp 'find-tag-noselect))
+	     ()
+	   (erlang-tags-define-keys (current-local-map))
+	   (setq erlang-tags-installed t)))))
+
+
+;; Set all keys bound to `find-tag' et.al. in the global map and the
+;; menu to `erlang-find-tag' et.al. in `map'.
+;;
+;; The function `substitute-key-definition' does not work properly
+;; in all version of Emacs.
+
+(defun erlang-tags-define-keys (map)
+  "Bind tags commands to keymap MAP aware of Erlang modules."
+  (let ((alist erlang-tags-function-alist))
+    (while alist
+      (let* ((old (car (car alist)))
+	     (new (cdr (car alist)))
+	     (keys (append (where-is-internal old global-map))))
+	(while keys
+	  (define-key map (car keys) new)
+	  (setq keys (cdr keys))))
+      (setq alist (cdr alist))))
+  ;; Update the menu.
+  (erlang-menu-substitute erlang-menu-base-items erlang-tags-function-alist)
+  (erlang-menu-init))
+
+
+;; There exists a variable `find-tag-default-function'.  It is not used
+;; since `complete-tag' uses it to get current word under point.  In that
+;; situation we don't want the module to be prepended.
+
+(defun erlang-find-tag-default ()
+  "Return the default tag.
+Search `-import' list of imported functions.
+Single quotes are been stripped away."
+  (let ((mod-func (erlang-get-function-under-point)))
+    (cond ((null mod-func)
+	   nil)
+	  ((null (car mod-func))
+	   (nth 1 mod-func))
+	  (t
+	   (concat (car mod-func) ":" (nth 1 mod-func))))))
+
+
+;; Return `t' since it is used inside `tags-loop-form'.
+;;;###autoload
+(defun erlang-find-tag (modtagname &optional next-p regexp-p)
+  "Like `find-tag'.  Capable of retrieving Erlang modules.
+
+Tags can be given on the forms `tag', `module:', `module:tag'."
+  (interactive (erlang-tag-interactive "Find `module:tag' or `tag': "))
+  (switch-to-buffer (erlang-find-tag-noselect modtagname next-p regexp-p))
+  t)
+
+
+;; Code mainly from `find-tag-other-window' in `etags.el'.
+;;;###autoload
+(defun erlang-find-tag-other-window (tagname &optional next-p regexp-p)
+  "Like `find-tag-other-window' but aware of Erlang modules."
+  (interactive (erlang-tag-interactive
+		"Find `module:tag' or `tag' other window: "))
+
+  ;; This is to deal with the case where the tag is found in the
+  ;; selected window's buffer; without this, point is moved in both
+  ;; windows.  To prevent this, we save the selected window's point
+  ;; before doing find-tag-noselect, and restore it afterwards.
+  (let* ((window-point (window-point (selected-window)))
+	 (tagbuf (erlang-find-tag-noselect tagname next-p regexp-p))
+	 (tagpoint (progn (set-buffer tagbuf) (point))))
+    (set-window-point (prog1
+			  (selected-window)
+			(switch-to-buffer-other-window tagbuf)
+			;; We have to set this new window's point; it
+			;; might already have been displaying a
+			;; different portion of tagbuf, in which case
+			;; switch-to-buffer-other-window doesn't set
+			;; the window's point from the buffer.
+			(set-window-point (selected-window) tagpoint))
+		      window-point)))
+
+
+(defun erlang-find-tag-other-frame (tagname &optional next-p)
+  "Like `find-tag-other-frame' but aware of Erlang modules."
+  (interactive (erlang-tag-interactive
+		"Find `module:tag' or `tag' other frame: "))
+  (let ((pop-up-frames t))
+    (erlang-find-tag-other-window tagname next-p)))
+
+
+(defun erlang-find-tag-regexp (regexp &optional next-p other-window)
+  "Like `find-tag-regexp' but aware of Erlang modules."
+  (interactive (if (fboundp 'find-tag-regexp)
+		   (erlang-tag-interactive
+		    "Find `module:regexp' or `regexp': ")
+		 (error "This version of Emacs can't find tags by regexps")))
+  (funcall (if other-window
+	       'erlang-find-tag-other-window
+	     'erlang-find-tag)
+	   regexp next-p t))
+
+
+;; Just like C-u M-.  This could be added to the menu.
+(defun erlang-find-next-tag ()
+  "Find next tag, like \\[find-tag] with prefix arg."
+  (interactive)
+  (let ((current-prefix-arg '(4)))
+    (if erlang-tags-installed
+	(call-interactively 'erlang-find-tag)
+      (call-interactively 'find-tag))))
+
+
+;; Mimics `find-tag-noselect' found in `etags.el', but uses `find-tag' to
+;; be compatible with `tags.el'.
+;;
+;; Handles three cases:
+;; * `module:'  Loop over all possible file names.  Stop if a file-name
+;;              without extension and directory matches the module.
+;;
+;; * `module:tag'
+;;		Emacs 19: Replace test functions with functions aware of
+;;	        Erlang modules.  Tricky because the etags system wasn't
+;;		built for these kind of operations...
+;;
+;;              Emacs 18: We loop over `find-tag' until we find a file
+;;              whose module matches the requested module.  The
+;;              drawback is that a lot of files could be loaded into
+;;              Emacs.
+;;
+;; * `tag'      Just give it to `find-tag'.
+
+(defun erlang-find-tag-noselect (modtagname &optional next-p regexp-p)
+  "Like `find-tag-noselect' but aware of Erlang modules."
+  (interactive (erlang-tag-interactive "Find `module:tag' or `tag': "))
+  (or modtagname
+      (setq modtagname (symbol-value 'last-tag)))
+  (funcall (symbol-function 'set) 'last-tag modtagname)
+  ;; `tags.el' uses this variable to record how M-, would
+  ;; know where to restart a tags command.
+  (if (boundp 'tags-loop-form)
+      (funcall (symbol-function 'set)
+	       'tags-loop-form '(erlang-find-tag nil t)))
+  (save-window-excursion
+    (cond
+     ((string-match ":$" modtagname)
+      ;; Only the module name was given.  Read all files whose file name
+      ;; match.
+      (let ((modname (substring modtagname 0 (match-beginning 0)))
+	    (file nil))
+	(if (not next-p)
+	    (save-excursion
+	      (visit-tags-table-buffer)
+	      (setq erlang-tags-file-list
+		    (funcall (symbol-function 'tags-table-files)))))
+	(while (null file)
+	  (or erlang-tags-file-list
+	      (save-excursion
+		(if (and (featurep 'etags)
+			 (funcall
+			  (symbol-function 'visit-tags-table-buffer) 'same)
+			 (funcall
+			  (symbol-function 'visit-tags-table-buffer) t))
+		    (setq erlang-tags-file-list
+			  (funcall (symbol-function 'tags-table-files)))
+		  (error "No %stags containing %s" (if next-p "more " "")
+			 modtagname))))
+	  (if erlang-tags-file-list
+	      (let ((this-module (erlang-get-module-from-file-name
+				  (car erlang-tags-file-list))))
+		(if (and (stringp this-module)
+			 (string= modname this-module))
+		    (setq file (car erlang-tags-file-list)))
+		(setq erlang-tags-file-list (cdr erlang-tags-file-list)))))
+	(set-buffer (or (get-file-buffer file)
+			(find-file-noselect file)))))
+
+     ((string-match ":" modtagname)
+      (if (boundp 'find-tag-tag-order)
+	  ;; Method one: Add module-recognising functions to the
+	  ;; list of order functions.  However, the tags system
+	  ;; from Emacs 18, and derives thereof (read: XEmacs)
+	  ;; hasn't got this feature.
+	  (progn
+	    (erlang-tags-install-module-check)
+	    (unwind-protect
+		(funcall (symbol-function 'find-tag)
+			 modtagname next-p regexp-p)
+	      (erlang-tags-remove-module-check)))
+	;; Method two: Call the tags system until a file matching
+	;; the module is found.  This could result in that many
+	;; files are read. (e.g. The tag "foo:file" will take a
+	;; while to process.)
+	(let* ((modname (substring modtagname 0 (match-beginning 0)))
+	       (tagname (substring modtagname (match-end 0) nil))
+	       (last-tag tagname)
+	       file)
+	  (while
+	      (progn
+		(funcall (symbol-function 'find-tag) tagname next-p regexp-p)
+		(setq next-p t)
+		;; Determine the module form the file name.  (The
+		;; alternative, to check `-module', would make this
+		;; code useless for non-Erlang programs.)
+		(setq file (erlang-get-module-from-file-name buffer-file-name))
+		(not (and (stringp file)
+			  (string= modname file))))))))
+     (t
+      (funcall (symbol-function 'find-tag) modtagname next-p regexp-p)))
+    (current-buffer)))			; Return the new buffer.
+
+
+;; Process interactive arguments for erlang-find-tag-*.
+;;
+;; Negative arguments work only for `etags', not `tags'.  This is not
+;; a problem since negative arguments means step back into the
+;; history list, a feature not implemented in `tags'.
+
+(defun erlang-tag-interactive (prompt)
+  (condition-case nil
+      (require 'etags)
+    (error
+     (require 'tags)))
+  (if current-prefix-arg
+      (list nil (if (< (prefix-numeric-value current-prefix-arg) 0)
+		    '-
+		  t))
+    (let* ((default (erlang-find-tag-default))
+	   (prompt (if default
+		       (format "%s(default %s) " prompt default)
+		     prompt))
+	   (spec (if (featurep 'etags)
+		     (completing-read prompt 'erlang-tags-complete-tag)
+		   (read-string prompt))))
+      (list (if (equal spec "")
+		(or default (error "There is no default tag"))
+	      spec)))))
+
+
+;; Search tag functions which are aware of Erlang modules.  The tactic
+;; is to store new search functions into the local variables of the
+;; TAGS buffers.  The variables are restored directly after the
+;; search.  The situation is complicated by the fact that new TAGS
+;; files can be loaded during the search.
+;;
+
+(defun erlang-tags-install-module-check ()
+  "Install our own tag search functions."
+  ;; Make sure our functions are installed in TAGS files loaded
+  ;; into Emacs while searching.
+  (cond
+   ((>= erlang-emacs-major-version 20)
+    (setq erlang-tags-orig-format-functions
+          (symbol-value 'tags-table-format-functions))
+    (funcall (symbol-function 'set) 'tags-table-format-functions
+             (cons 'erlang-tags-recognize-tags-table
+                   erlang-tags-orig-format-functions))
+    (setq erlang-tags-buffer-list '())
+    )
+   (t
+    (setq erlang-tags-orig-format-hooks
+          (symbol-value 'tags-table-format-hooks))
+    (funcall (symbol-function 'set) 'tags-table-format-hooks
+	     (cons 'erlang-tags-recognize-tags-table
+		   erlang-tags-orig-format-hooks))
+    (setq erlang-tags-buffer-list '())
+   ))
+   
+  ;; Install our functions in the TAGS files already resident.
+  (save-excursion
+    (let ((files (symbol-value 'tags-table-computed-list)))
+      (while files
+	(if (stringp (car files))
+	    (if (get-file-buffer (car files))
+		(progn
+		  (set-buffer (get-file-buffer (car files)))
+		  (erlang-tags-install-local))))
+	(setq files (cdr files))))))
+
+
+(defun erlang-tags-install-local ()
+  "Install our tag search functions in current buffer."
+  (if erlang-tags-buffer-installed-p
+      ()
+    ;; Mark this buffer as "installed" and record.
+    (set (make-local-variable 'erlang-tags-buffer-installed-p) t)
+    (setq erlang-tags-buffer-list
+	  (cons (current-buffer) erlang-tags-buffer-list))
+
+    ;; Save the original values.
+    (set (make-local-variable 'erlang-tags-orig-tag-order)
+	 (symbol-value 'find-tag-tag-order))
+    (set (make-local-variable 'erlang-tags-orig-regexp-tag-order)
+	 (symbol-value 'find-tag-regexp-tag-order))
+    (set (make-local-variable 'erlang-tags-orig-search-function)
+	 (symbol-value 'find-tag-search-function))
+    (set (make-local-variable 'erlang-tags-orig-regexp-search-function)
+	 (symbol-value 'find-tag-regexp-search-function))
+
+    ;; Install our own functions.
+    (set (make-local-variable 'find-tag-search-function)
+	 'erlang-tags-search-forward)
+    (set (make-local-variable 'find-tag-regexp-search-function)
+	 'erlang-tags-regexp-search-forward)
+    (set (make-local-variable 'find-tag-tag-order)
+	 '(erlang-tag-match-module-p))
+    (set (make-local-variable 'find-tag-regexp-tag-order)
+	 '(erlang-tag-match-module-regexp-p))))
+
+
+(defun erlang-tags-remove-module-check ()
+  "Remove our own tags search functions."
+  (cond
+   ((>= erlang-emacs-major-version 20)
+    (funcall (symbol-function 'set)
+	     'tags-table-format-functions
+	     erlang-tags-orig-format-functions)
+    )
+   (t 
+    (funcall (symbol-function 'set)
+	     'tags-table-format-hooks
+	     erlang-tags-orig-format-hooks)
+    ))
+
+  ;; Remove our functions from the TAGS files.  (Note that
+  ;; `tags-table-computed-list' need not be the same list as when
+  ;; the search was started.)
+  (save-excursion
+    (let ((buffers erlang-tags-buffer-list))
+      (while buffers
+	(if (buffer-name (car buffers))
+	    (progn
+	      (set-buffer (car buffers))
+	      (erlang-tags-remove-local)))
+	(setq buffers (cdr buffers))))))
+
+
+(defun erlang-tags-remove-local ()
+  "Remove our tag search functions from current buffer."
+  (if (null erlang-tags-buffer-installed-p)
+      ()
+    (funcall (symbol-function 'set) 'erlang-tags-buffer-installed-p nil)
+    (funcall (symbol-function 'set)
+	     'find-tag-tag-order erlang-tags-orig-tag-order)
+    (funcall (symbol-function 'set)
+	     'find-tag-regexp-tag-order erlang-tags-orig-regexp-tag-order)
+    (funcall (symbol-function 'set)
+	     'find-tag-search-function erlang-tags-orig-search-function)
+    (funcall (symbol-function 'set)
+	     'find-tag-regexp-search-function
+	     erlang-tags-orig-regexp-search-function)))
+
+
+(defun erlang-tags-recognize-tags-table ()
+  "Install our functions in all loaded TAGS files.
+
+This function is added to `tags-table-format-hooks/functions' when searching
+for a tag on the form `module:tag'."
+  (if (null (funcall (symbol-function 'etags-recognize-tags-table)))
+      nil
+    (erlang-tags-install-local)
+    t))
+
+
+(defun erlang-tags-search-forward (tag &optional bound noerror count)
+  "Forward search function, aware of Erlang module prefix."
+  (if (string-match ":" tag)
+      (setq tag (substring tag (match-end 0) nil)))
+  ;; Avoid unintended recursion.
+  (if (eq erlang-tags-orig-search-function 'erlang-tags-search-forward)
+      (search-forward tag bound noerror count)
+    (funcall erlang-tags-orig-search-function tag bound noerror count)))
+
+
+(defun erlang-tags-regexp-search-forward (tag &optional bound noerror count)
+  "Forward regexp search function, aware of Erlang module prefix."
+  (if (string-match ":" tag)
+      (setq tag (substring tag (match-end 0) nil)))
+  (if (eq erlang-tags-orig-regexp-search-function
+	  'erlang-tags-regexp-search-forward)
+      (re-search-forward tag bound noerror count)
+    (funcall erlang-tags-orig-regexp-search-function
+	     tag bound noerror count)))
+
+
+;; t if point is at a tag line that matches TAG, containing
+;; module information.  Assumes that all other order functions
+;; are stored in `erlang-tags-orig-[regex]-tag-order'.
+
+(defun erlang-tag-match-module-p (tag)
+  (erlang-tag-match-module-common-p tag erlang-tags-orig-tag-order))
+
+(defun erlang-tag-match-module-regexp-p (tag)
+  (erlang-tag-match-module-common-p tag erlang-tags-orig-regexp-tag-order))
+
+(defun erlang-tag-match-module-common-p (tag order)
+  (let ((mod nil)
+	(found nil))
+    (if (string-match ":" tag)
+	(progn
+	  (setq mod (substring tag 0 (match-beginning 0)))
+	  (setq tag (substring tag (match-end 0) nil))))
+    (while (and order (not found))
+      (setq found
+	    (and (not (memq (car order)
+			    '(erlang-tag-match-module-p
+			      erlang-tag-match-module-regexp-p)))
+		 (funcall (car order) tag)))
+      (setq order (cdr order)))
+    (and found
+	 (or (null mod)
+	     (string= mod (erlang-get-module-from-file-name
+			   (file-of-tag)))))))
+
+
+;;; Tags completion, Emacs 19 `etags' specific.
+;;;
+;;; The basic idea is to create a second completion table `erlang-tags-
+;;; completion-table' containing all normal tags plus tags on the form
+;;; `module:tag'.
+
+
+(when (and (fboundp 'etags-tags-completion-table)
+           (fboundp 'tags-lazy-completion-table)) ; Emacs 23.1+
+  (if (fboundp 'advice-add)
+      ;; Emacs 24.4+
+      (advice-add 'etags-tags-completion-table :around
+                  (lambda (oldfun)
+                    (if (eq find-tag-default-function 'erlang-find-tag-for-completion)
+                        (erlang-etags-tags-completion-table)
+                      (funcall oldfun)))
+                  (list :name 'erlang-replace-tags-table))
+    ;; Emacs 23.1-24.3
+    (defadvice etags-tags-completion-table (around erlang-replace-tags-table activate)
+      (if (eq find-tag-default-function 'erlang-find-tag-for-completion)
+          (setq ad-return-value (erlang-etags-tags-completion-table))
+        ad-do-it))))
+
+
+(defun erlang-complete-tag ()
+  "Perform tags completion on the text around point.
+Completes to the set of names listed in the current tags table.
+
+Should the Erlang tags system be installed this command knows
+about Erlang modules."
+  (interactive)
+  (condition-case nil
+      (require 'etags)
+    (error nil))
+  (cond ((and erlang-tags-installed
+              (fboundp 'etags-tags-completion-table)
+              (fboundp 'tags-lazy-completion-table)) ; Emacs 23.1+
+         ;; This depends on the advice called erlang-replace-tags-table
+         ;; above.  It is not enough to let-bind
+         ;; tags-completion-table-function since that will not override
+         ;; the buffer-local value in the TAGS buffer.
+         (let ((find-tag-default-function 'erlang-find-tag-for-completion))
+           (complete-tag)))
+        ((and erlang-tags-installed
+	      (fboundp 'complete-tag)
+              (fboundp 'tags-complete-tag)) ; Emacs 19
+	 (let ((orig-tags-complete-tag (symbol-function 'tags-complete-tag)))
+	   (fset 'tags-complete-tag
+	     (symbol-function 'erlang-tags-complete-tag))
+	   (unwind-protect
+	       (funcall (symbol-function 'complete-tag))
+	     (fset 'tags-complete-tag orig-tags-complete-tag))))
+	((fboundp 'complete-tag)	; Emacs 19
+	 (funcall (symbol-function 'complete-tag)))
+	((fboundp 'tag-complete-symbol)	; XEmacs
+	 (funcall (symbol-function 'tag-complete-symbol)))
+	(t
+	 (error "This version of Emacs can't complete tags"))))
+
+
+(defun erlang-find-tag-for-completion ()
+  (let ((start (save-excursion
+                 (skip-chars-backward "[:word:][:digit:]_:'")
+                 (point))))
+    (unless (eq start (point))
+      (buffer-substring-no-properties start (point)))))
+
+
+
+;; Based on `tags-complete-tag', but this one uses
+;; `erlang-tags-completion-table' instead of `tags-completion-table'.
+;;
+;; This is the entry-point called by system function `completing-read'.
+(defun erlang-tags-complete-tag (string predicate what)
+  (save-excursion
+    ;; If we need to ask for the tag table, allow that.
+    (let ((enable-recursive-minibuffers t))
+      (visit-tags-table-buffer))
+    (if (eq what t)
+	(all-completions string (erlang-tags-completion-table) predicate)
+      (try-completion string (erlang-tags-completion-table) predicate))))
+
+
+;; `tags-completion-table' calls itself recursively, make it
+;; call our own wedge instead.  Note that the recursive call
+;; is very rare;  it only occurs when a tags-file contains
+;; `include'-statements.
+(defun erlang-tags-completion-table ()
+  "Build completion table.  Tags on the form `tag' or `module:tag'."
+  (setq erlang-tags-orig-completion-table
+	(symbol-function 'tags-completion-table))
+  (fset 'tags-completion-table
+	(symbol-function 'erlang-tags-completion-table-1))
+  (unwind-protect
+      (erlang-tags-completion-table-1)
+    (fset 'tags-completion-table
+	  erlang-tags-orig-completion-table)))
+
+
+(defun erlang-tags-completion-table-1 ()
+  (make-local-variable 'erlang-tags-completion-table)
+  (or erlang-tags-completion-table
+      (let ((tags-completion-table nil)
+	    (tags-completion-table-function
+	     'erlang-etags-tags-completion-table))
+	(funcall erlang-tags-orig-completion-table)
+	(setq erlang-tags-completion-table tags-completion-table))))
+
+
+;; Based on `etags-tags-completion-table'.  The difference is that we
+;; add three symbols to the vector, the tag, module: and module:tag.
+;; The module is extracted from the file name of a tag.  (This one
+;; only works if we are looking at an `etags' file. However, this is
+;; the only format supported by Emacs, so far.)
+(defun erlang-etags-tags-completion-table ()
+  (let ((table (make-vector 511 0))
+        (file nil)
+        (progress-reporter
+         (when (fboundp 'make-progress-reporter)
+           (make-progress-reporter
+            (format "Making erlang tags completion table for %s..." buffer-file-name)
+            (point-min) (point-max)))))
+    (save-excursion
+      (goto-char (point-min))
+      ;; This monster regexp matches an etags tag line.
+      ;;   \1 is the string to match;
+      ;;   \2 is not interesting;
+      ;;   \3 is the guessed tag name; XXX guess should be better eg DEFUN
+      ;;   \4 is not interesting;
+      ;;   \5 is the explicitly-specified tag name.
+      ;;   \6 is the line to start searching at;
+      ;;   \7 is the char to start searching at.
+      (while (progn
+               (while (and
+                       (eq (following-char) ?\f)
+                       (looking-at "\f\n\\([^,\n]*\\),.*\n"))
+                 (setq file (buffer-substring
+                             (match-beginning 1) (match-end 1)))
+                 (goto-char (match-end 0)))
+               (re-search-forward
+                "\
+^\\(\\([^\177]+[^-a-zA-Z0-9_$\177]+\\)?\\([-a-zA-Z0-9_$?:]+\\)\
+\[^-a-zA-Z0-9_$?:\177]*\\)\177\\(\\([^\n\001]+\\)\001\\)?\
+\\([0-9]+\\)?,\\([0-9]+\\)?\n"
+                nil t))
+        (let ((tag (if (match-beginning 5)
+                       ;; There is an explicit tag name.
+                       (buffer-substring (match-beginning 5) (match-end 5))
+                     ;; No explicit tag name.  Best guess.
+                     (buffer-substring (match-beginning 3) (match-end 3))))
+              (module (and file
+                           (erlang-get-module-from-file-name file))))
+          (intern tag table)
+          (when (stringp module)
+            (intern (concat module ":" tag) table)
+            ;; Only the first ones will be stored in the table.
+            (intern (concat module ":") table)
+            (intern (concat module ":module_info") table))
+          (when progress-reporter
+            (progress-reporter-update progress-reporter (point))))))
+    table))
+
+;;;
+;;; Prepare for other methods to run an Erlang slave process.
+;;;
+
+(defvar erlang-shell-function 'inferior-erlang
+  "Command to execute start a new Erlang shell.
+
+Change this variable to use your favorite
+Erlang compilation package.")
+
+(defvar erlang-shell-display-function 'inferior-erlang-run-or-select
+  "Command to execute to display Erlang shell.
+
+Change this variable to use your favorite
+Erlang compilation package.")
+
+(defvar erlang-compile-function 'inferior-erlang-compile
+  "Command to execute to compile current buffer.
+
+Change this variable to use your favorite
+Erlang compilation package.")
+
+(defvar erlang-compile-erlang-function "c"
+  "Erlang function to call to compile an erlang file.")
+
+(defvar erlang-compile-display-function 'inferior-erlang-run-or-select
+  "Command to execute to view last compilation.
+
+Change this variable to use your favorite
+Erlang compilation package.")
+
+(defvar erlang-next-error-function 'inferior-erlang-next-error
+  "Command to execute to go to the next error.
+
+Change this variable to use your favorite Erlang compilation
+package.  Not used in Emacs 21.")
+
+
+;;;###autoload
+(defun erlang-shell ()
+  "Start a new Erlang shell.
+
+The variable `erlang-shell-function' decides which method to use,
+default is to start a new Erlang host.  It is possible that, in the
+future, a new shell on an already running host will be started."
+  (interactive)
+  (call-interactively erlang-shell-function))
+
+
+;;;###autoload (autoload 'run-erlang "erlang" "Start a new Erlang shell." t)
+
+;; It is customary for Emacs packages to supply a function on this
+;; form, even though it violates the `erlang-*' name convention.
+(defalias 'run-erlang 'erlang-shell)
+
+
+(defun erlang-shell-display ()
+  "Display an Erlang shell, or start a new."
+  (interactive)
+  (call-interactively erlang-shell-display-function))
+
+
+;;;###autoload
+(defun erlang-compile ()
+  "Compile Erlang module in current buffer."
+  (interactive)
+  (call-interactively erlang-compile-function))
+
+
+(defun erlang-compile-display ()
+  "Display compilation output."
+  (interactive)
+  (call-interactively erlang-compile-display-function))
+
+
+(defun erlang-next-error ()
+  "Display next error message from the latest compilation."
+  (interactive)
+  (call-interactively erlang-next-error-function))
+
+
+
+;;;
+;;; Erlang Shell Mode -- Major mode used for Erlang shells.
+;;;
+
+;; This mode is designed to be implementation independent,
+;; e.g. it does not assume that we are running an inferior
+;; Erlang, there exists a lot of other possibilities.
+
+
+(defvar erlang-shell-buffer-name "*erlang*"
+  "The name of the Erlang link shell buffer.")
+
+(defvar erlang-shell-mode-map nil
+  "Keymap used by Erlang shells.")
+
+
+(defvar erlang-shell-mode-hook nil
+  "*User functions to run when an Erlang shell is started.
+
+This hook is used to change the behaviour of Erlang mode.  It is
+normally used by the user to personalise the programming environment.
+When used in a site init file, it could be used to customise Erlang
+mode for all users on the system.
+
+The function added to this hook is run every time a new Erlang
+shell is started.
+
+See also `erlang-load-hook', a hook which is run once, when Erlang
+mode is loaded, and `erlang-mode-hook' which is run every time a new
+Erlang source file is loaded into Emacs.")
+
+
+(defvar erlang-input-ring-file-name "~/.erlang_history"
+  "*When non-nil, file name used to store Erlang shell history information.")
+
+
+(defun erlang-shell-mode ()
+  "Major mode for interacting with an Erlang shell.
+
+We assume that we already are in Comint mode.
+
+The following special commands are available:
+\\{erlang-shell-mode-map}"
+  (interactive)
+  (setq major-mode 'erlang-shell-mode)
+  (setq mode-name "Erlang Shell")
+  (erlang-mode-variables)
+  (if erlang-shell-mode-map
+      nil
+    (setq erlang-shell-mode-map (copy-keymap comint-mode-map))
+    (erlang-shell-mode-commands erlang-shell-mode-map))
+  (use-local-map erlang-shell-mode-map)
+  (unless inferior-erlang-use-cmm
+    ;; This was originally not a marker, but it needs to be, at least
+    ;; in Emacs 21, and should be backwards-compatible.  Otherwise,
+    ;; would need to test whether compilation-parsing-end is a marker
+    ;; after requiring `compile'.
+    (set (make-local-variable 'compilation-parsing-end) (copy-marker 1))
+    (set (make-local-variable 'compilation-error-list) nil)
+    (set (make-local-variable 'compilation-old-error-list) nil))
+  ;; Needed when compiling directly from the Erlang shell.
+  (setq compilation-last-buffer (current-buffer))
+  (setq comint-prompt-regexp "^[^>=]*> *")
+  (setq comint-eol-on-send t)
+  (setq comint-input-ignoredups t)
+  (setq comint-scroll-show-maximum-output t)
+  (setq comint-scroll-to-bottom-on-output t)
+  ;; In Emacs 19.30, `add-hook' has got a `local' flag, use it.  If
+  ;; the call fails, just call the normal `add-hook'.
+  (condition-case nil
+      (progn
+        (add-hook 'comint-output-filter-functions
+		  'inferior-erlang-strip-delete nil t)
+        (add-hook 'comint-output-filter-functions
+		  'inferior-erlang-strip-ctrl-m nil t))
+    (error
+     (funcall (symbol-function 'make-local-hook)
+	      'comint-output-filter-functions) ; obsolete as of Emacs 21.1
+     (add-hook 'comint-output-filter-functions 'inferior-erlang-strip-delete)
+     (add-hook 'comint-output-filter-functions 'inferior-erlang-strip-ctrl-m)))
+  ;; Some older versions of comint don't have an input ring.
+  (if (fboundp 'comint-read-input-ring)
+      (progn
+	(setq comint-input-ring-file-name erlang-input-ring-file-name)
+	(comint-read-input-ring t)
+	(make-local-variable 'kill-buffer-hook)
+	(add-hook 'kill-buffer-hook 'comint-write-input-ring)))
+  ;; At least in Emacs 21, we need to be in `compilation-minor-mode'
+  ;; for `next-error' to work.  We can avoid it clobbering the shell
+  ;; keys thus.
+  (when inferior-erlang-use-cmm
+    (compilation-minor-mode 1)
+    (set (make-local-variable 'minor-mode-overriding-map-alist)
+	 `((compilation-minor-mode
+	    . ,(let ((map (make-sparse-keymap)))
+		 ;; It would be useful to put keymap properties on the
+		 ;; error lines so that we could use RET and mouse-2
+		 ;; on them directly.
+		 (when (boundp 'compilation-skip-threshold) ; new compile.el
+		   (define-key map [mouse-2] #'erlang-mouse-2-command)
+		   (define-key map "\C-m" #'erlang-RET-command))
+		 (if (boundp 'compilation-menu-map)
+		     (define-key map [menu-bar compilation]
+		       (cons "Errors" compilation-menu-map)))
+		 map)))))
+  (run-hooks 'erlang-shell-mode-hook))
+
+
+(defun erlang-mouse-2-command (event)
+  "Command bound to `mouse-2' in inferior Erlang buffer.
+Selects Comint or Compilation mode command as appropriate."
+  (interactive "e")
+  (if (save-window-excursion
+	(save-excursion
+	  (mouse-set-point event)
+	  (consp (get-text-property (line-beginning-position) 'message))))
+      (call-interactively (lookup-key compilation-mode-map [mouse-2]))
+    (call-interactively (lookup-key comint-mode-map [mouse-2]))))
+
+(defun erlang-RET-command ()
+  "Command bound to `RET' in inferior Erlang buffer.
+Selects Comint or Compilation mode command as appropriate."
+  (interactive)
+  (if (consp (get-text-property (line-beginning-position) 'message))
+      (call-interactively (lookup-key compilation-mode-map "\C-m"))
+    (call-interactively (lookup-key comint-mode-map "\C-m"))))
+
+(defun erlang-shell-mode-commands (map)
+  (define-key map "\M-\t"    'erlang-complete-tag)
+  (define-key map "\C-a"     'comint-bol) ; Normally the other way around.
+  (define-key map "\C-c\C-a" 'beginning-of-line)
+  (define-key map "\C-d"     nil)	; Was `comint-delchar-or-maybe-eof'
+  (define-key map "\M-\C-m"  'compile-goto-error)
+  (unless inferior-erlang-use-cmm
+    (define-key map "\C-x`"    'erlang-next-error)))
+
+;;;
+;;; Inferior Erlang -- Run an Erlang shell as a subprocess.
+;;;
+
+(defvar inferior-erlang-display-buffer-any-frame nil
+  "*When nil, `inferior-erlang-display-buffer' use only selected frame.
+When t, all frames are searched.  When 'raise, the frame is raised.")
+
+(defvar inferior-erlang-shell-type 'newshell
+  "The type of Erlang shell to use.
+
+When this variable is set to the atom `oldshell', the old shell is used.
+When set to `newshell' the new shell is used.  Should the variable be
+nil, the default shell is used.
+
+This variable influence the setting of other variables.")
+
+(defvar inferior-erlang-machine "erl"
+  "*The name of the Erlang shell.")
+
+(defvar inferior-erlang-machine-options '()
+  "*The options used when activating the Erlang shell.
+
+This must be a list of strings.")
+
+(defvar inferior-erlang-process-name "inferior-erlang"
+  "The name of the inferior Erlang process.")
+
+(defvar inferior-erlang-buffer-name erlang-shell-buffer-name
+  "The name of the inferior Erlang buffer.")
+
+(defvar inferior-erlang-prompt-timeout 60
+  "*Number of seconds before `inferior-erlang-wait-prompt' timeouts.
+
+The time specified is waited after every output made by the inferior
+Erlang shell.  When this variable is t, we assume that we always have
+a prompt.  When nil, we will wait forever, or until \\[keyboard-quit].")
+
+(defvar inferior-erlang-process nil
+  "Process of last invoked inferior Erlang, or nil.")
+
+(defvar inferior-erlang-buffer nil
+  "Buffer of last invoked inferior Erlang, or nil.")
+
+;; Enable uniquifying Erlang shell buffers based on directory name.
+(eval-after-load "uniquify"
+  '(add-to-list 'uniquify-list-buffers-directory-modes 'erlang-shell-mode))
+
+;;;###autoload
+(defun inferior-erlang (&optional command)
+  "Run an inferior Erlang.
+With prefix command, prompt for command to start Erlang with.
+
+This is just like running Erlang in a normal shell, except that
+an Emacs buffer is used for input and output.
+\\<comint-mode-map>
+The command line history can be accessed with  \\[comint-previous-input]  and  \\[comint-next-input].
+The history is saved between sessions.
+
+Entry to this mode calls the functions in the variables
+`comint-mode-hook' and `erlang-shell-mode-hook' with no arguments.
+
+The following commands imitate the usual Unix interrupt and
+editing control characters:
+\\{erlang-shell-mode-map}"
+  (interactive
+   (when current-prefix-arg
+     (list (if (fboundp 'read-shell-command)
+               ;; `read-shell-command' is a new function in Emacs 23.
+	       (read-shell-command "Erlang command: ")
+	     (read-string "Erlang command: ")))))
+  (require 'comint)
+  (let (cmd opts)
+    (if command
+        (setq cmd "sh"
+              opts (list "-c" command))
+      (setq cmd inferior-erlang-machine
+            opts inferior-erlang-machine-options)
+      (cond ((eq inferior-erlang-shell-type 'oldshell)
+             (setq opts (cons "-oldshell" opts)))
+            ((eq inferior-erlang-shell-type 'newshell)
+             (setq opts (append '("-newshell" "-env" "TERM" "vt100") opts)))))
+
+    ;; Using create-file-buffer and list-buffers-directory in this way
+    ;; makes uniquify give each buffer a unique name based on the
+    ;; directory.
+    (let ((fake-file-name (expand-file-name inferior-erlang-buffer-name default-directory)))
+      (setq inferior-erlang-buffer (create-file-buffer fake-file-name))
+      (apply 'make-comint-in-buffer
+             inferior-erlang-process-name
+             inferior-erlang-buffer
+             cmd
+             nil opts)
+      (with-current-buffer inferior-erlang-buffer
+        (setq list-buffers-directory fake-file-name))))
+
+  (setq inferior-erlang-process
+	(get-buffer-process inferior-erlang-buffer))
+  (if (> 21 erlang-emacs-major-version)	; funcalls to avoid compiler warnings
+      (funcall (symbol-function 'set-process-query-on-exit-flag) 
+	       inferior-erlang-process nil)
+    (funcall (symbol-function 'process-kill-without-query) inferior-erlang-process))
+  (if erlang-inferior-shell-split-window
+      (switch-to-buffer-other-window inferior-erlang-buffer)
+    (switch-to-buffer inferior-erlang-buffer)) 
+  (if (and (not (eq system-type 'windows-nt))
+	   (eq inferior-erlang-shell-type 'newshell))
+      (setq comint-process-echoes t))
+  (erlang-shell-mode))
+
+
+(defun inferior-erlang-run-or-select ()
+  "Switch to an inferior Erlang buffer, possibly starting new process."
+  (interactive)
+  (if (null (inferior-erlang-running-p))
+      (inferior-erlang)
+    (inferior-erlang-display-buffer t)))
+
+
+(defun inferior-erlang-display-buffer (&optional select)
+  "Make the inferior Erlang process visible.
+The window is returned.
+
+Should `inferior-erlang-display-buffer-any-frame' be nil the buffer is
+displayed in the current frame.  Should it be non-nil, and the buffer
+already is visible in any other frame, no new window will be created.
+Should it be the atom 'raise, the frame containing the window will
+be raised.
+
+Should the optional argument SELECT be non-nil, the window is
+selected.  Should the window be in another frame, that frame is raised.
+
+Note, should the mouse pointer be places outside the raised frame, that
+frame will become deselected before the next command."
+  (interactive)
+  (or (inferior-erlang-running-p)
+      (error "No inferior Erlang process is running"))
+  (let ((win (inferior-erlang-window
+	      inferior-erlang-display-buffer-any-frame))
+	(frames-p (fboundp 'selected-frame)))
+    (if (null win)
+	(let ((old-win (selected-window)))
+	  (save-excursion
+	    (switch-to-buffer-other-window inferior-erlang-buffer)
+	    (setq win (selected-window)))
+	  (select-window old-win))
+      (if (and window-system
+	       frames-p
+	       (or select
+		   (eq inferior-erlang-display-buffer-any-frame 'raise))
+	       (not (eq (selected-frame) (window-frame win))))
+	  (raise-frame (window-frame win))))
+    (if select
+	(select-window win))
+    (sit-for 0)
+    win))
+
+
+(defun inferior-erlang-running-p ()
+  "Non-nil when an inferior Erlang is running."
+  (and inferior-erlang-process
+       (memq (process-status inferior-erlang-process) '(run open))
+       inferior-erlang-buffer
+       (buffer-name inferior-erlang-buffer)))
+
+
+(defun inferior-erlang-window (&optional all-frames)
+  "Return the window containing the inferior Erlang, or nil."
+  (and (inferior-erlang-running-p)
+       (if (and all-frames (>= erlang-emacs-major-version 19))
+	   (get-buffer-window inferior-erlang-buffer t)
+	 (get-buffer-window inferior-erlang-buffer))))
+
+
+(defun inferior-erlang-wait-prompt ()
+  "Wait until the inferior Erlang shell prompt appears."
+  (if (eq inferior-erlang-prompt-timeout t)
+      ()
+    (or (inferior-erlang-running-p)
+	(error "No inferior Erlang shell is running"))
+    (save-excursion
+      (set-buffer inferior-erlang-buffer)
+      (let ((msg nil))
+	(while (save-excursion
+		 (goto-char (process-mark inferior-erlang-process))
+		 (forward-line 0)
+		 (not (looking-at comint-prompt-regexp)))
+	  (if msg
+	      ()
+	    (setq msg t)
+	    (message "Waiting for Erlang shell prompt (press C-g to abort)."))
+	  (or (accept-process-output inferior-erlang-process
+				     inferior-erlang-prompt-timeout)
+	      (error "No Erlang shell prompt before timeout")))
+	(if msg (message ""))))))
+
+(defun inferior-erlang-send-empty-cmd-unless-already-at-prompt ()
+  "If not already at a prompt, try to send an empty cmd to get a prompt.
+The empty command resembles hitting RET. This is useful in some
+situations, for instance if a crash or error report from sasl
+has been printed after the last prompt."
+  (save-excursion
+    (set-buffer inferior-erlang-buffer)
+    (if (> (point-max) 1)
+	;; make sure we get a prompt if buffer contains data
+	(if (save-excursion
+	      (goto-char (process-mark inferior-erlang-process))
+	      (forward-line 0)
+	      (not (looking-at comint-prompt-regexp)))
+	    (inferior-erlang-send-command "")))))
+
+(autoload 'comint-send-input "comint")
+
+(defun inferior-erlang-send-command (cmd &optional hist)
+  "Send command CMD to the inferior Erlang.
+
+The contents of the current command line (if any) will
+be placed at the next prompt.
+
+If optional second argument is non-nil the command is inserted into
+the history list.
+
+Return the position after the newly inserted command."
+  (or (inferior-erlang-running-p)
+      (error "No inferior Erlang process is running"))
+  (let ((old-buffer (current-buffer))
+	(insert-point (marker-position (process-mark inferior-erlang-process)))
+	(insert-length (if comint-process-echoes
+			   0
+			 (1+ (length cmd)))))
+    (set-buffer inferior-erlang-buffer)
+    (goto-char insert-point)
+    (insert cmd)
+    ;; Strange things happened if `comint-eol-on-send' is declared
+    ;; in the `let' expression above, but setq:d here. The
+    ;; `set-buffer' statement obviously makes the buffer local
+    ;; instance of `comint-eol-on-send' shadow this one.
+    ;; I'm considering this a bug in Elisp.
+    ;;
+    ;; This was previously cautioned against in the Lisp manual.  It
+    ;; has been sorted out in Emacs 21.  -- fx
+    (let ((comint-eol-on-send nil)
+	  (comint-input-filter (if hist comint-input-filter 'ignore)))
+      (if (and (not erlang-xemacs-p)
+	       (>= emacs-major-version 22))
+	  (comint-send-input nil t)
+	(comint-send-input)))
+    ;; Adjust all windows whose points are incorrect.
+    (if (null comint-process-echoes)
+	(walk-windows
+	 (function
+	  (lambda (window)
+	    (if (and (eq (window-buffer window) inferior-erlang-buffer)
+		     (= (window-point window) insert-point))
+		(set-window-point window
+				  (+ insert-point insert-length)))))
+	 nil t))
+    (set-buffer old-buffer)
+    (+ insert-point insert-length)))
+
+
+(defun inferior-erlang-strip-delete (&optional s)
+  "Remove `^H' (delete) and the characters it was supposed to remove."
+  (interactive)
+  (if (and (boundp 'comint-last-input-end)
+	   (boundp 'comint-last-output-start))
+      (save-excursion
+	(goto-char
+	 (if (interactive-p)
+	     (symbol-value 'comint-last-input-end)
+	   (symbol-value 'comint-last-output-start)))
+	(while (progn (skip-chars-forward "^\C-h")
+		      (not (eq (point) (point-max))))
+	  (delete-char 1)
+	  (or (bolp)
+	      (backward-delete-char 1))))))
+
+
+;; Basically `comint-strip-ctrl-m', with a few extra checks.
+(defun inferior-erlang-strip-ctrl-m (&optional string)
+  "Strip trailing `^M' characters from the current output group."
+  (interactive)
+  (if (and (boundp 'comint-last-input-end)
+	   (boundp 'comint-last-output-start))
+      (let ((pmark (process-mark (get-buffer-process (current-buffer)))))
+	(save-excursion
+	  (goto-char
+	   (if (interactive-p)
+	       (symbol-value 'comint-last-input-end)
+	     (symbol-value 'comint-last-output-start)))
+	  (while (re-search-forward "\r+$" pmark t)
+	    (replace-match "" t t))))))
+
+
+(defun inferior-erlang-compile (arg)
+  "Compile the file in the current buffer.
+
+With prefix arg, compiles for debug.
+
+Should Erlang return `{error, nofile}' it could not load the object
+module after completing the compilation.  This is due to a bug in the
+compile command `c' when using the option `outdir'.
+
+There exists two workarounds for this bug:
+
+  1) Place the directory in the Erlang load path.
+
+  2) Set the Emacs variable `erlang-compile-use-outdir' to nil.
+     To do so, place the following line in your `~/.emacs'-file:
+        (setq erlang-compile-use-outdir nil)"
+  (interactive "P")
+  (save-some-buffers)
+  (inferior-erlang-prepare-for-input)
+  (let* ((dir (inferior-erlang-compile-outdir))
+;;; (file (file-name-nondirectory (buffer-file-name)))
+	 (noext (substring (erlang-local-buffer-file-name) 0 -4))
+	 (opts (append (list (cons 'outdir dir))
+		       (if current-prefix-arg
+			   (list 'debug_info 'export_all))
+		       erlang-compile-extra-opts))
+	 end)
+    (save-excursion
+      (set-buffer inferior-erlang-buffer)
+      (compilation-forget-errors))
+    (setq end (inferior-erlang-send-command
+	       (inferior-erlang-compute-compile-command noext opts)
+	       nil))
+    (sit-for 0)
+    (inferior-erlang-wait-prompt)
+    (save-excursion
+      (set-buffer inferior-erlang-buffer)
+      (setq compilation-error-list nil)
+      (set-marker compilation-parsing-end end))
+    (setq compilation-last-buffer inferior-erlang-buffer)))
+
+(defun inferior-erlang-prepare-for-input (&optional no-display)
+  "Create an inferior erlang buffer if needed and ready it for input.
+The buffer is displayed, according to `inferior-erlang-display-buffer'
+unless the optional NO-DISPLAY is non-nil."
+  (or (inferior-erlang-running-p)
+      (save-excursion
+	(inferior-erlang)))
+  (or (inferior-erlang-running-p)
+      (error "Error starting inferior Erlang shell"))
+  (if (not no-display)
+      (inferior-erlang-display-buffer))
+  (inferior-erlang-send-empty-cmd-unless-already-at-prompt)
+  (sit-for 0)
+  (inferior-erlang-wait-prompt))
+
+(defun inferior-erlang-compile-outdir ()
+  "Return the directory to compile the current buffer into."
+  (let* ((buffer-dir (directory-file-name
+		      (file-name-directory (erlang-local-buffer-file-name))))
+	 (parent-dir (directory-file-name
+		      (file-name-directory buffer-dir)))
+         (ebin-dir (concat (file-name-as-directory parent-dir) "ebin"))
+	 (buffer-dir-base-name (file-name-nondirectory 
+				(expand-file-name
+				 (concat (file-name-as-directory buffer-dir)
+					 ".")))))
+    (if (and (string= buffer-dir-base-name "src")
+	     (file-directory-p ebin-dir))
+	(file-name-as-directory ebin-dir)
+      (file-name-as-directory buffer-dir))))
+
+(defun inferior-erlang-compute-compile-command (module-name opts)
+  (let ((ccfn erlang-compile-command-function-alist)
+	(res (inferior-erlang-compute-erl-compile-command module-name opts))
+	ccfn-entry
+	done)
+    (if (not (null (erlang-local-buffer-file-name)))
+	(while (and (not done) (not (null ccfn)))
+	  (setq ccfn-entry (car ccfn))
+	  (setq ccfn (cdr ccfn))
+	  (if (string-match (car ccfn-entry) (erlang-local-buffer-file-name))
+	      (let ((c-fn (cdr ccfn-entry)))
+		(setq done t)
+		(if (not (null c-fn))
+		    (setq result (funcall c-fn module-name opts)))))))
+    result))
+
+(defun inferior-erlang-compute-erl-compile-command (module-name opts)
+  (let* ((out-dir-opt (assoc 'outdir opts))
+	 (out-dir     (cdr out-dir-opt)))
+    (if erlang-compile-use-outdir
+	(format "%s(\"%s\"%s)."
+		erlang-compile-erlang-function
+		module-name
+		(inferior-erlang-format-comma-opts opts))
+      (let (;; Hopefully, noone else will ever use these...
+	    (tmpvar "Tmp7236")
+	    (tmpvar2 "Tmp8742"))
+	(format
+	 (concat
+	  "f(%s), {ok, %s} = file:get_cwd(), "
+	  "file:set_cwd(\"%s\"), "
+	  "%s = %s(\"%s\"%s), file:set_cwd(%s), f(%s), %s.")
+	 tmpvar2 tmpvar
+	 out-dir
+	 tmpvar2
+	 erlang-compile-erlang-function
+	 module-name (inferior-erlang-format-comma-opts
+		      (remq out-dir-opt opts))
+	 tmpvar tmpvar tmpvar2)))))
+
+(defun inferior-erlang-compute-leex-compile-command (module-name opts)
+  (let ((file-name        (erlang-local-buffer-file-name))
+	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
+			   (inferior-erlang-compute-erl-compile-command
+			    module-name opts))))
+    (format (concat "f(LErr1__), f(LErr2__), "
+		    "case case leex:file(\"%s\", [%s]) of"
+		    " ok -> ok;"
+		    " {ok,_} -> ok;"
+		    " {ok,_,_} -> ok;"
+		    " LErr1__ -> LErr1__ "
+		    "end of"
+		    " ok -> %s;"
+		    " LErr2__ -> LErr2__ "
+		    "end.")
+	    file-name
+	    (inferior-erlang-format-comma-opts erlang-leex-compile-opts)
+	    erl-compile-expr)))
+
+(defun inferior-erlang-compute-yecc-compile-command (module-name opts)
+  (let ((file-name        (erlang-local-buffer-file-name))
+	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
+			   (inferior-erlang-compute-erl-compile-command
+			    module-name opts))))
+    (format (concat "f(YErr1__), f(YErr2__), "
+		    "case case yecc:file(\"%s\", [%s]) of"
+		    " {ok,_} -> ok;"
+		    " {ok,_,_} -> ok;"
+		    " YErr1__ -> YErr1__ "
+		    "end of"
+		    " ok -> %s;"
+		    " YErr2__ -> YErr2__ "
+		    "end.")
+	    file-name
+	    (inferior-erlang-format-comma-opts erlang-yecc-compile-opts)
+	    erl-compile-expr)))
+
+(defun inferior-erlang-remove-any-trailing-dot (str)
+  (if (string= (substring str -1) ".")
+      (substring str 0 (1- (length str)))
+    str))
+
+(defun inferior-erlang-format-comma-opts (opts)
+  (if (null opts)
+      ""
+    (concat ", " (inferior-erlang-format-opts opts))))
+
+(defun inferior-erlang-format-opts (opts)
+  (concat "[" (inferior-erlang-string-join (mapcar 'inferior-erlang-format-opt
+						   opts)
+					   ", ")
+	  "]"))
+
+(defun inferior-erlang-format-opt (opt)
+  (cond ((stringp opt) (concat "\"" opt "\""))
+	((atom opt)    (format "%s" opt))
+	((consp opt)   (concat "{" (inferior-erlang-string-join
+				    (mapcar 'inferior-erlang-format-opt
+					    (list (car opt) (cdr opt)))
+				    ", ")
+			       "}"))
+	(t (error (format "Unexpected opt %s" opt)))))
+
+(defun inferior-erlang-string-join (strs sep)
+  (let ((result (or (car strs) "")))
+    (setq strs (cdr strs))
+    (while strs
+      (setq result (concat result sep (car strs)))
+      (setq strs (cdr strs)))
+    result))
+
+(defun erlang-local-buffer-file-name ()
+  ;; When editing a file remotely via tramp,
+  ;; the buffer's file name may be for example
+  ;; "/ssh:host.example.com:/some/path/x.erl"
+  ;;
+  ;; If I try to compile such a file using C-c C-k, an
+  ;; erlang shell on the remote host is automatically
+  ;; started if needed, but for it to successfully compile
+  ;; the file, the c(...)  command that is sent must contain
+  ;; the file name "/some/path/x.erl" without the
+  ;; tramp-prefix "/ssh:host.example.com:".
+  (cond ((null (buffer-file-name))
+	 nil)
+	((erlang-tramp-remote-file-p)
+	 (erlang-tramp-get-localname))
+	(t
+	 (buffer-file-name))))
+
+(defun erlang-tramp-remote-file-p ()
+  (and (fboundp 'tramp-tramp-file-p)
+       (tramp-tramp-file-p (buffer-file-name))))
+
+(defun erlang-tramp-get-localname ()
+  (let ((tramp-info (tramp-dissect-file-name (buffer-file-name))))
+    (if (fboundp 'tramp-file-name-localname)
+	(tramp-file-name-localname tramp-info)
+      ;; In old versions of tramp, it was `tramp-file-name-path'
+      ;; instead of the newer `tramp-file-name-localname'
+      (tramp-file-name-path tramp-info))))
+
+;; `next-error' only accepts buffers with major mode `compilation-mode'
+;; or with the minor mode `compilation-minor-mode' activated.
+;; (To activate the minor mode is out of the question, since it will
+;; ruin the inferior Erlang keymap.)
+;; This is done differently in Emacs 21.
+(defun inferior-erlang-next-error (&optional argp)
+  "Just like `next-error'.
+Capable of finding error messages in an inferior Erlang buffer."
+  (interactive "P")
+  (let ((done nil)
+	(buf (or (and (boundp 'next-error-last-buffer)
+		      next-error-last-buffer)
+		 (and (boundp 'compilation-last-buffer)
+		      compilation-last-buffer))))
+    (if (and (bufferp buf)
+	     (save-excursion
+	       (set-buffer buf)
+	       (and (eq major-mode 'erlang-shell-mode)
+		    (setq major-mode 'compilation-mode))))
+	(unwind-protect
+	    (progn
+	      (setq done t)
+	      (next-error argp))
+	  (save-excursion
+	    (set-buffer buf)
+	    (setq major-mode 'erlang-shell-mode))))
+    (or done
+	(next-error argp))))
+
+
+(defun inferior-erlang-change-directory (&optional dir)
+  "Make the inferior Erlang change directory.
+The default is to go to the directory of the current buffer."
+  (interactive)
+  (or dir (setq dir (file-name-directory (erlang-local-buffer-file-name))))
+  (or (inferior-erlang-running-p)
+      (error "No inferior Erlang is running"))
+  (inferior-erlang-display-buffer)
+  (inferior-erlang-send-empty-cmd-unless-already-at-prompt)
+  (inferior-erlang-wait-prompt)
+  (inferior-erlang-send-command (format "cd('%s')." dir) nil))
+
+(defun erlang-align-arrows (start end)
+  "Align arrows (\"->\") in function clauses from START to END.
+When called interactively, aligns arrows after function clauses inside
+the region.
+
+With a prefix argument, aligns all arrows, not just those in function
+clauses.
+
+Example:
+
+sum(L) -> sum(L, 0).
+sum([H|T], Sum) -> sum(T, Sum + H);
+sum([], Sum) -> Sum.
+
+becomes:
+
+sum(L)          -> sum(L, 0).
+sum([H|T], Sum) -> sum(T, Sum + H);
+sum([], Sum)    -> Sum."
+  (interactive "r")
+  (save-excursion
+    (let (;; regexp for matching arrows. without a prefix argument,
+	  ;; the regexp matches function heads. With a prefix, it
+	  ;; matches any arrow.
+	  (re (if current-prefix-arg
+		  "^.*\\(\\)->"
+		(eval-when-compile
+		  (concat "^" erlang-atom-regexp ".*\\(\\)->"))))
+	  ;; part of regexp matching directly before the arrow
+	  (arrow-match-pos (if current-prefix-arg
+			       1
+			     (1+ erlang-atom-regexp-matches)))
+	  ;; accumulator for positions where arrows are found, ordered
+	  ;; by buffer position (from greatest to smallest)
+	  (arrow-positions '())
+	  ;; accumulator for longest distance from start of line to arrow
+	  (most-indent 0)
+	  ;; marker to track the end of the region we're aligning
+	  (end-marker (progn (goto-char end)
+			     (point-marker))))
+      ;; Pass 1: Find the arrow positions, adjust the whitespace
+      ;; before each arrow to one space, and find the greatest
+      ;; indentation level.
+      (goto-char start)
+      (while (re-search-forward re end-marker t)
+	(goto-char (match-beginning arrow-match-pos))
+	(just-one-space)		; adjust whitespace
+	(setq arrow-positions (cons (point) arrow-positions))
+	(setq most-indent (max most-indent (erlang-column-number))))
+      (set-marker end-marker nil)	; free the marker
+      ;; Pass 2: Insert extra padding so that all arrow indentation is
+      ;; equal. This is done last-to-first by buffer position, so that
+      ;; inserting spaces before one arrow doesn't change the
+      ;; positions of the next ones.
+      (mapc (lambda (arrow-pos)
+	      (goto-char arrow-pos)
+	      (let* ((pad (- most-indent (erlang-column-number))))
+		(when (> pad 0)
+		  (insert-char ?\  pad))))
+	    arrow-positions))))
+
+(defun erlang-column-number ()
+  "Return the column number of the current position in the buffer.
+Tab characters are counted by their visual width."
+  (string-width (buffer-substring (line-beginning-position) (point))))
+
+(defun erlang-current-defun ()
+  "`add-log-current-defun-function' for Erlang."
+  (save-excursion
+    (erlang-beginning-of-function)
+    (if (looking-at "[a-z0-9_]+")
+	(match-string 0))))
+
+;; Aliases for backward compatibility with older versions of Erlang Mode.
+;;
+;; Unfortuantely, older versions of Emacs doesn't have `defalias' and
+;; `make-obsolete' so we have to define our own `obsolete' function.
+
+(defun erlang-obsolete (sym newdef)
+  "Make the obsolete function SYM refer to the defined function NEWDEF.
+
+Simplified version of a combination `defalias' and `make-obsolete',
+it assumes that NEWDEF is loaded."
+  (defalias sym (symbol-function newdef))
+  (if (fboundp 'make-obsolete)
+      (make-obsolete sym newdef)))
+
+
+(erlang-obsolete 'calculate-erlang-indent 'erlang-calculate-indent)
+(erlang-obsolete 'calculate-erlang-stack-indent
+		 'erlang-calculate-stack-indent)
+(erlang-obsolete 'at-erlang-keyword 'erlang-at-keyword)
+(erlang-obsolete 'at-erlang-operator 'erlang-at-operator)
+(erlang-obsolete 'beginning-of-erlang-clause 'erlang-beginning-of-clause)
+(erlang-obsolete 'end-of-erlang-clause 'erlang-end-of-clause)
+(erlang-obsolete 'mark-erlang-clause 'erlang-mark-clause)
+(erlang-obsolete 'beginning-of-erlang-function 'erlang-beginning-of-function)
+(erlang-obsolete 'end-of-erlang-function 'erlang-end-of-function)
+(erlang-obsolete 'mark-erlang-function 'erlang-mark-function)
+(erlang-obsolete 'pass-over-erlang-clause 'erlang-pass-over-function)
+(erlang-obsolete 'name-of-erlang-function 'erlang-name-of-function)
+
+
+;; Fixme: shouldn't redefine `set-visited-file-name' anyhow -- see above.
+(defconst erlang-unload-hook
+  (list (lambda ()
+	  (defalias 'set-visited-file-name
+	    'erlang-orig-set-visited-file-name)
+	  (when (featurep 'advice)
+	    (ad-unadvise 'Man-notify-when-ready)
+	    (ad-unadvise 'set-visited-file-name)))))
+
+
+(defun erlang-string-to-int (string) 
+  (if (fboundp 'string-to-number)
+      (string-to-number string)
+    (funcall (symbol-function 'string-to-int) string)))
+
+;; The end...
+
+(provide 'erlang)
+
+(run-hooks 'erlang-load-hook)
+
+;; Local variables:
+;; coding: iso-8859-1
+;; End:
+
+;;; erlang.el ends here
diff --git a/emacs.d/elpa/erlang-20150622.644/erlang_appwiz.el b/emacs.d/elpa/erlang-20151013.157/erlang_appwiz.el
similarity index 100%
rename from emacs.d/elpa/erlang-20150622.644/erlang_appwiz.el
rename to emacs.d/elpa/erlang-20151013.157/erlang_appwiz.el
diff --git a/emacs.d/elpa/fill-column-indicator-20140509.1101/fci-osx-23-fix.el b/emacs.d/elpa/fill-column-indicator-20140509.1101/fci-osx-23-fix.el
deleted file mode 100644
index b1389eb..0000000
--- a/emacs.d/elpa/fill-column-indicator-20140509.1101/fci-osx-23-fix.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; fci-osx-23-fix.el --- workaround for fci-mode on Mac OS X, v23.0-2
-
-;; Copyright (c) 2011-2012 Alp Aker
-
-;; Author: Alp Aker <alp.tekin.aker@gmail.com>
-;; Version: 1.79
-;; Keywords: convenience
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of the
-;; License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; A copy of the GNU General Public License can be obtained from the
-;; Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; You should only need to use this if you're using fill-column-indicator
-;; with the Mac OS X (NextStep) port, versions 23.0 through 23.2.  (It is
-;; *not* needed with v22.)  To use it, simply place this file in your load
-;; path and put
-;;
-;;   (require 'fci-osx-23-fix)
-;;
-;; in your .emacs.
-
-(require 'fill-column-indicator)
-
-(defvar fci-nextstep-23-hack-overlay nil)
-(make-variable-buffer-local 'fci-nextstep-23-hack-overlay)
-
-(defun fci-nextstep-23-hack ()
-  (when fci-nextstep-23-hack-overlay
-    (overlay-put fci-nextstep-23-hack-overlay
-                 'after-string
-                 (overlay-get fci-nextstep-23-hack-overlay 'fci-after-string))
-    (setq fci-nextstep-23-hack-overlay nil))
-  (when (and (not fci-newline)
-             (= (current-column) fci-limit)
-             (setq fci-nextstep-23-hack-overlay (fci-overlay-at-point)))
-    (overlay-put fci-nextstep-23-hack-overlay 'fci-after-string
-                 (overlay-get fci-nextstep-23-hack-overlay 'after-string))
-    (overlay-put fci-nextstep-23-hack-overlay 'after-string nil)))
-
-(defun fci-overlay-at-point ()
-  (car (fci-get-overlays-region (point) (point))))
-
-(add-to-list 'fci-hook-assignments
-             '(post-command-hook fci-nextstep-23-hack 'local))
-
-(provide 'fci-osx-23-fix)
diff --git a/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator-autoloads.el b/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator-autoloads.el
deleted file mode 100644
index f1fddd7..0000000
--- a/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator-autoloads.el
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; fill-column-indicator-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "fill-column-indicator" "fill-column-indicator.el"
-;;;;;;  (21570 20026 0 0))
-;;; Generated autoloads from fill-column-indicator.el
-
-(autoload 'fci-mode "fill-column-indicator" "\
-Toggle fci-mode on and off.
-Fci-mode indicates the location of the fill column by drawing a
-thin line (a `rule') at the fill column.
-
-With prefix ARG, turn fci-mode on if and only if ARG is positive.
-
-The following options control the appearance of the fill-column
-rule: `fci-rule-column', `fci-rule-width', `fci-rule-color',
-`fci-rule-use-dashes', `fci-dash-pattern', `fci-rule-character',
-and `fci-rule-character-color'.  For further options, see the
-Customization menu or the package file.  (See the latter for tips
-on troubleshooting.)
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'turn-on-fci-mode "fill-column-indicator" "\
-Turn on fci-mode unconditionally.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("fci-osx-23-fix.el" "fill-column-indicator-pkg.el")
-;;;;;;  (21570 20026 389543 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; fill-column-indicator-autoloads.el ends here
diff --git a/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator-pkg.el b/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator-pkg.el
deleted file mode 100644
index 1b9eaca..0000000
--- a/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator-pkg.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(define-package "fill-column-indicator" "20140509.1101" "Graphically indicate the fill column" 'nil :keywords
-  '("convenience"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator.el b/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator.el
deleted file mode 100644
index f644ae7..0000000
--- a/emacs.d/elpa/fill-column-indicator-20140509.1101/fill-column-indicator.el
+++ /dev/null
@@ -1,909 +0,0 @@
-;;; fill-column-indicator.el --- Graphically indicate the fill column
-
-;; Copyright (c) 2011-2014 Alp Aker
-
-;; Author: Alp Aker <alp.tekin.aker@gmail.com>
-;; Version: 1.87
-;; Keywords: convenience
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of the
-;; License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; A copy of the GNU General Public License can be obtained from the
-;; Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
-
-;;; Commentary:
-
-;; Many modern editors and IDEs can graphically indicate the location of the
-;; fill column by drawing a thin line (in design parlance, a `rule') down the
-;; length of the editing window.  Fill-column-indicator implements this
-;; facility in Emacs.
-
-;; PLEASE NOTE: There is a small incompatibility between this package and the
-;; current stable Emacs relase (v24.3).  A bug in Emacs's internal display
-;; routine that was introduced shortly before that release can cause vertical
-;; motion commands to skip blank lines when fci-mode is active.  This has
-;; been fixed in Emacs trunk.  See github.com/alpaker/Fill-Column-Indicator/issues/31
-;; for further discussion.
-
-;; Installation and Usage
-;; ======================
-
-;; Put this file in your load path and put:
-;;
-;;   (require 'fill-column-indicator)
-;;
-;; in your init file.
-
-;; To toggle graphical indication of the fill column in a buffer, use the
-;; command `fci-mode'.
- 
-;; Configuration
-;; =============
-
-;; By default, fci-mode draws its vertical indicator at the fill column.  If
-;; you'd like it to be drawn at another column, set `fci-rule-column' to the
-;; column number.  (A case in which this might be useful is when you want to
-;; fill comments at, for example, column 70, but want a vertical rule at
-;; column 80 or 100 to indicate the maximum line length for code.)  The
-;; default behavior (showing the indicator at the fill column) is specified
-;; by setting fci-rule-column to nil.
-
-;; On graphical displays the fill-column rule is drawn using a bitmap
-;; image.  Its color is controlled by the variable `fci-rule-color', whose
-;; value can be any valid color name.  The rule's width in pixels is
-;; determined by the variable `fci-rule-width'; the default value is 1.
-
-;; The rule can be drawn as a solid or dashed line, controlled by the
-;; variable `fci-rule-use-dashes'; the default is nil.  The dash appearance is
-;; controlled by `fci-dash-pattern', which is the ratio of dash length to
-;; line height; the default is 0.75. (The value should be a number between 0
-;; and 1; values outside that interval are coerced to the nearest endpoint.)
-
-;; The image formats fci-mode can use are XPM and PBM.  If Emacs has been
-;; compiled with the appropriate library it uses XPM images by default; if
-;; not it uses PBM images, which are natively supported.  You can specify a
-;; particular choice of format by setting `fci-rule-image-format' explicitly
-;; to xpm or pbm.
-
-;; On character terminals the rule is drawn using the character specified by
-;; `fci-rule-character'; the default is `|' (ascii 124).  If
-;; `fci-rule-character-color' is nil, then it is drawn using fci-rule-color
-;; (or the closest approximation thereto that the terminal is capable of); if
-;; it is a color name, then that color is used instead.
-
-;; If you'd like the rule to be drawn using fci-rule-character even on
-;; graphical displays, set `fci-always-use-textual-rule' to a non-nil value.
-
-;; These variables (as well as those described in the next section) can be
-;; given buffer-local bindings.
-
-;; Other Options
-;; =============
-
-;; When `truncate-lines' is nil, the effect of drawing a fill-column rule is
-;; very odd looking. Indeed, it makes little sense to use a rule to indicate
-;; the position of the fill column in that case (the positions at which the
-;; fill column falls in the visual display space won't, in general, be
-;; collinear).  For this reason, fci-mode sets truncate-lines to t in buffers
-;; in which it is enabled and restores it to its previous value when
-;; disabled.  You can turn this feature off by setting
-;; `fci-handle-truncate-lines' to nil.
-
-;; If `line-move-visual' is t, then vertical navigation can behave oddly in
-;; several edge cases while fci-mode is enabled (this is due to a bug in
-;; Emacs's C code).  Accordingly, fci-mode sets line-move-visual to nil in
-;; buffers in which it is enabled and restores it to its previous value when
-;; disabled.  This can be suppressed by setting `fci-handle-line-move-visual'
-;; to nil.  (But you shouldn't want to do this.  There's no reason to use
-;; line-move-visual if truncate-lines is t, and it doesn't make sense to use
-;; something like fci-mode when truncate-lines is nil.)
-
-;; Fci-mode needs free use of two characters (specifically, it needs the use
-;; of two characters whose display table entries it can change
-;; arbitrarily).  Its defualt is to use the first two characters of the
-;; Private Use Area of the Unicode BMP, viz. U+E000 and U+E001.  If you need
-;; to use those characters for some other purpose, set `fci-eol-char' and
-;; `fci-blank-char' to different values.
-
-;; Troubleshooting
-;; ===============
-
-;; o Fci-mode is intended to be used with monospaced fonts.  If you're using
-;;   a monospaced font and the fill-column rule is missing or misaligned on a
-;;   few lines but otherwise appears normal, then most likely (a) there are
-;;   non-ascii characters on those lines that are being displayed using a
-;;   non-monospaced font, or (b) your font-lock settings use bold or italics
-;;   and those font variants aren't monospaced.
-
-;; o Fci-mode in not currently compatible with Emacs's
-;;   `show-trailing-whitespace' feature (given the way the latter is
-;;   implemented, such compatibility is going to be hard to achieve).  A
-;;   workaround is to configure `whitespace-mode' to replicate the
-;;   functionality of show-trailing-whitespace.  This can be done with the
-;;   following setting:
-;;
-;;     (setq whitespace-style '(face trailing))
-;;
-;;  With this, whitespace-mode produces the same basic effect as a non-nil
-;;  value of show-trailing-whitespace, and compatibility with fci-mode is not
-;;  a problem.
-
-;; Known Issues
-;; ============
-
-;; o The indicator extends only to end of the buffer contents (as opposed to
-;;   running the full length of the editing window).
-
-;; o When portions of a buffer are invisible, such as when outline-mode is
-;;   used to hide certain lines, the fill-column rule is hidden as well.
-
-;; o Fci-mode should work smoothly when simultaneously displaying the same
-;;   buffer on both a graphical display and on a character terminal.  It does
-;;   not currently support simultaneous display of the same buffer on window
-;;   frames with different default font sizes. (It would be feasible to
-;;   support this use case, but thus far there seems to be no demand for
-;;   it.)
-
-;; o An issue specific to the Mac OS X (NextStep) port, versions 23.0-23.2:
-;;   Emacs won't, in these particular versions, draw a cursor on top of an
-;;   image.  Thus on graphical displays the cursor will disappear when
-;;   positioned directly on top of the fill-column rule.  The best way to
-;;   deal with this is to upgrade to v23.3 or v24 (or downgrade to v22).  If
-;;   that isn't practical, a fix is available via the mini-package
-;;   fci-osx-23-fix.el, which can be downloaded from:
-;;
-;;     github.com/alpaker/Fill-Column-Indicator
-;;
-;;  Directions for its use are given in the file header.
-
-;; Todo
-;; ====
-
-;; o Accommodate non-nil values of `hl-line-sticky-flag' and similar cases.
-
-;; o Accommodate linum-mode more robustly.
-
-;; o Compatibility with non-nil `show-trailing-whitespace.'
-
-;; Acknowledgements
-;; ================
-
-;; Thanks to Ami Fischman, Christopher Genovese, Michael Hoffman, José
-;; Alfredo Romero L., R. Lange, Joe Lisee, José Lombera, Frank Meffert,
-;; Mitchell Peabody, sheijk, and an anonymous BT subscriber for bug reports
-;; and suggestions.  Special thanks to lomew, John Lamp, David Röthlisberger,
-;; and Pär Wieslander for code contributions.
-
-;;; Code:
-
-(unless (version<= "22" emacs-version)
-  (error "Fill-column-indicator requires version 22 or later"))
-
-;;; ---------------------------------------------------------------------
-;;; User Options
-;;; ---------------------------------------------------------------------
-
-(defgroup fill-column-indicator nil
-  "Graphically indicate the fill-column."
-  :tag "Fill-Column Indicator"
-  :group 'convenience
-  :group 'fill)
-
-;; We should be using :validate instead of :match, but that seems not to
-;; work with defcustom widgets.
-(defcustom fci-rule-column nil
-  "Controls where fci-mode displays a vertical line (rule).
-
-If nil, the rule is drawn at the fill column.  Otherwise, it is
-drawn at the column given by this variable.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :group 'fill-column-indicator
-  :tag "Fill-Column rule column"
-  :type '(choice (const :tag "Use the fill column" nil)
-                 (integer :tag "Use a custom column"
-                          :match (lambda (w val) (fci-posint-p val)))))
-
-(defcustom fci-rule-color "#cccccc"
-  "Color used to draw the fill-column rule.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :group 'fill-column-indicator
-  :tag "Fill-column rule color"
-  :type 'color)
-
-(defcustom fci-rule-width 1
-  "Width in pixels of the fill-column rule on graphical displays.
-Note that a value greater than the default character width is
-treated as equivalent to the default character width.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :tag "Fill-Column Rule Width"
-  :group 'fill-column-indicator
-  :type  '(integer :match (lambda (w val) (fci-posint-p val))))
-
-(defcustom fci-rule-image-format
-  (if (image-type-available-p 'xpm) 'xpm 'pbm)
-  "Image format used for the fill-column rule on graphical displays.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :tag "Fill-Column Rule Image Format"
-  :group 'fill-column-indicator
-  :type '(choice (symbol :tag "XPM" 'xpm)
-                 (symbol :tag "PBM" 'pbm)))
-
-(defcustom fci-rule-use-dashes nil
-  "Whether to show the fill-column rule as dashes or as a solid line.
-This has no effect on non-graphical displays.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :tag "Fill-Column Rule Use Dashes"
-  :group 'fill-column-indicator
-  :type 'boolean)
-
-(defcustom fci-dash-pattern 0.75
-  "When using a dashed rule, ratio of dash length to line height.
-Values less than 0 or greather than 1 are coerced to the nearest
-endpoint of that interval.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :tag "Fill-Column Rule Use Dashes"
-  :group 'fill-column-indicator
-  :type 'float)
-
-(defcustom fci-rule-character ?|
-  "Character used to draw the fill-column rule on character terminals.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :tag "Fill-Column Rule Character"
-  :group 'fill-column-indicator
-  :type 'character)
-
-(defcustom fci-rule-character-color nil
-  "Color used to draw the fill-column rule on character terminals.
-If nil, the same color is used as for the graphical rule.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :group 'fill-column-indicator
-  :tag "Fill-column rule color"
-  :type '(choice (const :tag "Use same color as graphical rule" nil)
-                 (color :tag "Specify a color")))
-
-(defcustom fci-always-use-textual-rule nil
-  "When non-nil, the rule is always drawn using textual characters.
-Specifically, fci-mode will use `fci-rule-character' intead of
-bitmap images to draw the rule on graphical displays.
-
-Changes to this variable do not take effect until the mode
-function `fci-mode' is run."
-  :tag "Don't Use Image for Fill-Column Rule"
-  :group 'fill-column-indicator
-  :type 'boolean)
-
-(defcustom fci-handle-truncate-lines t
-  "Whether fci-mode should set truncate-lines to t while enabled.
-If non-nil, fci-mode will set truncate-lines to t in buffers in
-which it is enabled, and restore it to its previous value when
-disabled.
-
-Leaving this option set to the default value is recommended."
-  :group 'fill-column-indicator
-  :tag "Locally set truncate-lines to t during fci-mode"
-  :type 'boolean)
-
-(defcustom fci-handle-line-move-visual (version<= "23" emacs-version)
-  "Whether fci-mode should set line-move-visual to nil while enabled.
-If non-nil, fci-mode will set line-move-visual to nil in buffers
-in which it is enabled, and restore t to its previous value when
-disabled.
-
-Leaving this option set to the default value is recommended."
-  :group 'fill-column-indicator
-  :tag "Locally set line-move-visual to nil during fci-mode"
-  :type 'boolean)
-
-(defcustom fci-eol-char ?\uE000
-  "Character used for internal purposes by fci-mode.
-If you need to use this character, set this variable's value to a
-character you do not care about (a good choice is a character
-from the Private Use Area of the Unicode BMP, i.e., the range
-U+E000-U+F8FF, inclusive)."
-  :group 'fill-column-indicator
-  :type 'character)
-
-(defcustom fci-blank-char ?\uE001
-  "Character used for internal purposes by fci-mode.
-If you need to use this character, set this variable's value to a
-character you do not care about (a good choice is a character
-from the Private Use Area of the Unicode BMP, i.e., the the range
-U+E000-U+F8FF, inclusive)."
-  :group 'fill-column-indicator
-  :type 'character)
-
-;;; ---------------------------------------------------------------------
-;;; Internal Variables and Constants
-;;; ---------------------------------------------------------------------
-
-;; Record prior state of buffer.
-(defvar fci-saved-line-move-visual)
-(defvar fci-line-move-visual-was-buffer-local)
-(defvar fci-saved-truncate-lines)
-(defvar fci-saved-eol)
-(defvar fci-made-display-table)
-
-;; Record state of fci initialization in this buffer.
-(defvar fci-display-table-processed)
-(defvar fci-local-vars-set)
-
-;; Record current state of some quantities, so we can detect changes to them.
-(defvar fci-column)
-(defvar fci-newline)
-(defvar fci-tab-width)
-(defvar fci-char-width)
-(defvar fci-char-height)
-
-;; Data used in setting the fill-column rule that only need to be
-;; occasionally updated in a given buffer.
-(defvar fci-limit)
-(defvar fci-pre-limit-string)
-(defvar fci-at-limit-string)
-(defvar fci-post-limit-string)
-
-;; The preceding internal variables need to be buffer local and reset when
-;; the mode is disabled.
-(defconst fci-internal-vars '(fci-saved-line-move-visual
-                              fci-line-move-visual-was-buffer-local
-                              fci-saved-truncate-lines
-                              fci-saved-eol
-                              fci-made-display-table
-                              fci-display-table-processed
-                              fci-local-vars-set
-                              fci-column
-                              fci-newline
-                              fci-tab-width
-                              fci-char-width
-                              fci-char-height
-                              fci-limit
-                              fci-pre-limit-string
-                              fci-at-limit-string
-                              fci-post-limit-string))
-
-(dolist (var fci-internal-vars)
-  (make-variable-buffer-local var))
-
-;; Hooks we use.
-(defconst fci-hook-assignments
-  '((after-change-functions fci-redraw-region t t)
-    (before-change-functions fci-extend-rule-for-deletion nil t)
-    (window-scroll-functions fci-update-window-for-scroll nil t)
-    (window-configuration-change-hook  fci-redraw-frame)
-    (post-command-hook  fci-post-command-check nil t)
-    (change-major-mode-hook turn-off-fci-mode nil t)
-    (longlines-mode-hook fci-update-all-windows nil t)))
-
-;;; ---------------------------------------------------------------------
-;;; Miscellany
-;;; ---------------------------------------------------------------------
-
-(defun fci-get-buffer-windows (&optional all-frames)
-  "Return a list of windows displaying the current buffer."
-  (get-buffer-window-list (current-buffer) 'no-minibuf all-frames))
-
-(defun fci-posint-p (x)
-  "Return true if X is an integer greater than zero."
-  (and (wholenump x)
-       (/= 0 x)))
-
-(if (fboundp 'characterp)
-    (defalias 'fci-character-p 'characterp)
-  ;; For v22.
-  (defun fci-character-p (c)
-    "Return true if C is a character."
-    (and (fci-posint-p c)
-         ;; MAX_CHAR in v22 is (0x1f << 14).  We don't worry about
-         ;; generic chars.
-         (< c 507904))))
-
-;;; ---------------------------------------------------------------------
-;;; Mode Definition
-;;; ---------------------------------------------------------------------
-
-;;;###autoload
-(define-minor-mode fci-mode
-  "Toggle fci-mode on and off.
-Fci-mode indicates the location of the fill column by drawing a
-thin line (a `rule') at the fill column.
-
-With prefix ARG, turn fci-mode on if and only if ARG is positive.
-
-The following options control the appearance of the fill-column
-rule: `fci-rule-column', `fci-rule-width', `fci-rule-color',
-`fci-rule-use-dashes', `fci-dash-pattern', `fci-rule-character',
-and `fci-rule-character-color'.  For further options, see the
-Customization menu or the package file.  (See the latter for tips
-on troubleshooting.)"
-
-  nil nil nil
-
-  (if fci-mode
-      ;; Enabling.
-      (condition-case error
-          (progn
-            (fci-check-user-options)
-            (fci-process-display-table)
-            (fci-set-local-vars)
-            (fci-get-frame-dimens)
-            (dolist (hook fci-hook-assignments)
-              (apply 'add-hook hook))
-            (setq fci-column (or fci-rule-column fill-column)
-                  fci-tab-width tab-width
-                  fci-limit (if fci-newline
-                                (1+ (- fci-column (length fci-saved-eol)))
-                              fci-column))
-            (fci-make-overlay-strings)
-            (fci-update-all-windows t))
-        (error
-         (fci-mode 0)
-         (signal (car error) (cdr error))))
-
-    ;; Disabling.
-    (fci-restore-display-table)
-    (fci-restore-local-vars)
-    (dolist (hook fci-hook-assignments)
-      (remove-hook (car hook) (nth 1 hook) (nth 3 hook)))
-    (fci-delete-overlays-buffer)
-    (dolist (var fci-internal-vars)
-      (set var nil))))
-
-;;;###autoload
-(defun turn-on-fci-mode ()
-  "Turn on fci-mode unconditionally."
-  (interactive)
-  (fci-mode 1))
-
-(defun turn-off-fci-mode ()
-  "Turn off fci-mode unconditionally."
-  (interactive)
-  (fci-mode 0))
-
-;;; ---------------------------------------------------------------------
-;;; Display Property Specs
-;;; ---------------------------------------------------------------------
-
-(defun fci-overlay-fills-background-p (olay)
-  "Return true if OLAY specifies a background color."
-  (let ((olay-face (overlay-get olay 'face)))
-    (when olay-face
-      (if (facep olay-face)
-          (not (eq (face-attribute olay-face :background nil t) 'unspecified))
-        (if (consp olay-face)
-            (if (listp (cdr olay-face))
-                (if (facep (car olay-face))
-                    (not (memq t (mapcar #'(lambda (f) (eq (face-attribute f :background nil t) 'unspecified))
-                                         olay-face)))
-                  (plist-member olay-face :background))
-              (eq (car olay-face) 'background-color)))))))
-
-(defun fci-competing-overlay-p (posn)
-  "Return true if there is an overlay at POSN that fills the background."
-  (memq t (mapcar #'fci-overlay-fills-background-p (overlays-at posn))))
-
-;; The display spec used in overlay before strings to pad out the rule to the
-;; fill-column. 
-(defconst fci-padding-display
-  '((when (not (fci-competing-overlay-p buffer-position))
-      . (space :align-to fci-column))
-    (space :width 0)))
-
-;; Generate the display spec for the rule.  Basic idea is to use a "cascading
-;; display property" to display the textual rule if the display doesn't
-;; support images and the graphical rule if it does, but in either case only
-;; display a rule if no other overlay wants to fill the background at the
-;; relevant buffer position.
-(defun fci-rule-display (blank rule-img rule-str for-pre-string)
-  "Generate a display specification for a fill-column rule overlay string."
-  (let* ((cursor-prop (if (and (not for-pre-string) (not fci-newline)) t))
-         (propertized-rule-str (propertize rule-str 'cursor cursor-prop))
-         (display-prop (if rule-img
-                           `((when (not (or (display-images-p)
-                                            (fci-competing-overlay-p buffer-position)))
-                               . ,propertized-rule-str)
-                             (when (not (fci-competing-overlay-p buffer-position))
-                               . ,rule-img)
-                             (space :width 0))
-                         `((when (not (fci-competing-overlay-p buffer-position))
-                             . ,propertized-rule-str)
-                           (space :width 0)))))
-    (propertize blank 'cursor cursor-prop 'display display-prop)))
-
-;;; ---------------------------------------------------------------------
-;;; Enabling
-;;; ---------------------------------------------------------------------
-
-(defun fci-check-user-options ()
-  "Check that all user options for fci-mode have valid values."
-  (unless (memq fci-rule-image-format '(xpm pbm))
-    (error "Unrecognized value of `fci-rule-image-format'"))
-  ;; If the third element of a binding form is t, then nil is an acceptable
-  ;; value for the variable; otherwise, the variable value must satisfy the
-  ;; given predicate.
-  (let ((checks '((fci-rule-color color-defined-p)
-                  (fci-rule-column fci-posint-p t)
-                  (fci-rule-width fci-posint-p t)
-                  (fci-rule-character-color color-defined-p t)
-                  (fci-rule-character fci-character-p)
-                  (fci-blank-char fci-character-p)
-                  (fci-dash-pattern floatp)
-                  (fci-eol-char fci-character-p))))
-    (dolist (check checks)
-      (let ((value (symbol-value (nth 0 check)))
-            (pred (nth 1 check))
-            (nil-is-ok (nth 2 check)))
-        (unless (or (and nil-is-ok (null value))
-                    (funcall pred value))
-          (signal 'wrong-type-argument (list pred value)))))))
-
-(defun fci-process-display-table ()
-  "Set up a buffer-local display table for fci-mode."
-  (unless fci-display-table-processed
-    (unless buffer-display-table
-      (setq buffer-display-table (make-display-table)
-            fci-made-display-table t))
-    (aset buffer-display-table fci-blank-char [32])
-    (setq fci-saved-eol (aref buffer-display-table 10))
-    ;; Assumption: the display-table entry for character 10 is either nil or
-    ;; a vector whose last element is the newline glyph.
-    (let ((glyphs (butlast (append fci-saved-eol nil)))
-          eol)
-      (if glyphs
-          (setq fci-newline [10]
-                eol (vconcat glyphs))
-        (setq fci-newline nil
-              eol [32]))
-      (aset buffer-display-table 10 fci-newline)
-      (aset buffer-display-table fci-eol-char eol))
-    (setq fci-display-table-processed t)))
-
-(defun fci-set-local-vars ()
-  "Set miscellaneous local variables when fci-mode is enabled."
-  (unless fci-local-vars-set
-    (when (and fci-handle-line-move-visual
-               (boundp 'line-move-visual))
-      (if (local-variable-p 'line-move-visual)
-          (setq fci-line-move-visual-was-buffer-local t
-                fci-saved-line-move-visual line-move-visual
-                line-move-visual nil)
-        (set (make-local-variable 'line-move-visual) nil)))
-    (when fci-handle-truncate-lines
-      (setq fci-saved-truncate-lines truncate-lines
-            truncate-lines t))
-    (setq fci-local-vars-set t)))
-
-(defun fci-make-rule-string ()
-  "Return a string for drawing the fill-column rule."
-  (let ((color (or fci-rule-character-color
-                   fci-rule-color)))
-    ;; Make sure we don't inherit weight or slant from font-lock.
-    (propertize (char-to-string fci-rule-character)
-                'face `(:foreground ,color :weight normal :slant normal))))
-
-(defun fci-make-img-descriptor ()
-  "Make an image descriptor for the fill-column rule."
-  (unless (or (= 0 fci-char-width)
-              fci-always-use-textual-rule)
-    ;; No point passing width, height, color etc. directly to the image
-    ;; functions: those variables have either global or buffer-local
-    ;; scope, so the image-generating functions can access them directly.
-    (if (eq fci-rule-image-format 'xpm)
-        (fci-make-xpm-img)
-      (fci-make-pbm-img))))
-
-(defun fci-get-frame-dimens ()
-  "Determine the frame character height and width.
-
-If the selected frame cannot display images, use the character
-height and width of the first graphic frame in the frame list
-displaying the current buffer.  (This fallback behavior is just a
-rough heuristic.)"
-  (let ((frame (catch 'found-graphic
-                 (if (display-images-p)
-                     (selected-frame)
-                   (dolist (win (fci-get-buffer-windows t))
-                     (when (display-images-p (window-frame win))
-                       (throw 'found-graphic (window-frame win))))))))
-    (setq fci-char-width (frame-char-width frame)
-          fci-char-height (frame-char-height frame))))
-
-(defmacro fci-with-rule-parameters (&rest body)
-  "Define various quantites used in generating rule image descriptors."
-  (declare (indent defun))
-  `(let* ((height-str (number-to-string fci-char-height))
-          (width-str (number-to-string fci-char-width))
-          (rule-width (min fci-rule-width fci-char-width))
-          (hmargin (/ (- fci-char-width rule-width) 2.0))
-          (left-margin (floor hmargin))
-          (right-margin (ceiling hmargin))
-          (segment-ratio (if fci-rule-use-dashes fci-dash-pattern 1))
-          (segment-ratio-coerced (min 1 (max 0 segment-ratio)))
-          (segment-length (round (* segment-ratio-coerced fci-char-height)))
-          (vmargin (/ (- fci-char-height segment-length) 2.0))
-          (top-margin (floor vmargin))
-          (bottom-margin (ceiling vmargin)))
-     ,@body))
-
-(defun fci-mapconcat (sep &rest lists)
-  "Concatenate the strings in LISTS, using SEP as separator."
-  (mapconcat #'identity (apply 'nconc lists) sep))
-
-(defun fci-make-pbm-img ()
-  "Return an image descriptor for the fill-column rule in PBM format."
-  (fci-with-rule-parameters
-    (let* ((magic-number "P1\n")
-           (dimens (concat width-str " " height-str "\n"))
-           (on-pixels (fci-mapconcat " "
-                                     (make-list left-margin "0")
-                                     (make-list rule-width "1")
-                                     (make-list right-margin "0")))
-           (off-pixels (fci-mapconcat " " (make-list fci-char-width "0")))
-           (raster (fci-mapconcat "\n"
-                                  (make-list top-margin off-pixels)
-                                  (make-list segment-length on-pixels)
-                                  (make-list bottom-margin off-pixels)))
-           (data (concat magic-number dimens raster)))
-      `(image :type pbm
-              :data ,data
-              :mask heuristic
-              :foreground ,fci-rule-color
-              :ascent center))))
-
-(defun fci-make-xpm-img ()
-  "Return an image descriptor for the fill-column rule in XPM format."
-  (fci-with-rule-parameters
-    (let* ((identifier "/* XPM */\nstatic char *rule[] = {")
-           (dimens (concat "\"" width-str " " height-str " 2 1\","))
-           (color-spec (concat "\"1 c " fci-rule-color "\",\"0 c None\","))
-           (on-pixels (concat "\""
-                              (make-string left-margin ?0)
-                              (make-string rule-width ?1)
-                              (make-string right-margin ?0)
-                              "\","))
-           (off-pixels (concat "\"" (make-string fci-char-width ?0) "\","))
-           (raster (fci-mapconcat ""
-                                  (make-list top-margin off-pixels)
-                                  (make-list segment-length on-pixels)
-                                  (make-list bottom-margin off-pixels)))
-           (end "};")
-           (data (concat identifier dimens color-spec raster end)))
-      `(image :type xpm
-              :data ,data
-              :mask heuristic
-              :ascent center))))
-
-(defun fci-make-overlay-strings ()
-  "Generate the overlay strings used to display the fill-column rule."
-  (let* ((str (fci-make-rule-string))
-         (img (fci-make-img-descriptor))
-         (blank-str (char-to-string fci-blank-char))
-         (eol-str (char-to-string fci-eol-char))
-         (end-cap (propertize blank-str 'display '(space :width 0)))
-         (pre-or-post-eol (propertize eol-str
-                                      'cursor t
-                                      'display (propertize eol-str 'cursor t)))
-         (pre-padding (propertize blank-str 'display fci-padding-display))
-         (pre-rule (fci-rule-display blank-str img str t))
-         (at-rule (fci-rule-display blank-str img str fci-newline))
-         (at-eol (if fci-newline pre-or-post-eol "")))
-    (setq fci-pre-limit-string (concat pre-or-post-eol pre-padding pre-rule)
-          fci-at-limit-string (concat at-eol at-rule)
-          fci-post-limit-string (concat pre-or-post-eol end-cap))))
-
-;;; ---------------------------------------------------------------------
-;;; Disabling
-;;; ---------------------------------------------------------------------
-
-(defun fci-restore-local-vars ()
-  "Restore miscellaneous local variables when fci-mode is disabled."
-  (when fci-local-vars-set
-    (when (and fci-handle-line-move-visual
-               (boundp 'line-move-visual))
-      (if fci-line-move-visual-was-buffer-local
-          (setq line-move-visual fci-saved-line-move-visual)
-        (kill-local-variable 'line-move-visual)))
-    (when fci-handle-truncate-lines
-      (setq truncate-lines fci-saved-truncate-lines))))
-
-(defun fci-restore-display-table ()
-  "Restore the buffer display table when fci-mode is disabled."
-  (when (and buffer-display-table
-             fci-display-table-processed)
-    (aset buffer-display-table 10 fci-saved-eol)
-    ;; Don't set buffer-display-table to nil even if we created the display
-    ;; table; only do so if nothing else has changed it.
-    (when (and fci-made-display-table
-               (equal buffer-display-table (make-display-table)))
-      (setq buffer-display-table nil))))
-
-;;; ---------------------------------------------------------------------
-;;; Drawing and Erasing
-;;; ---------------------------------------------------------------------
-
-(defun fci-get-overlays-region (start end)
-  "Return all overlays between START and END displaying the fill-column rule."
-  (delq nil (mapcar #'(lambda (o) (if (overlay-get o 'fci) o))
-                    (overlays-in start end))))
-
-(defun fci-delete-overlays-region (start end)
-  "Delete overlays displaying the fill-column rule between START and END."
-  (mapc #'(lambda (o) (if (overlay-get o 'fci) (delete-overlay o)))
-        (overlays-in start end)))
-
-(defun fci-delete-overlays-buffer ()
-  "Delete all overlays displaying the fill-column rule in the current buffer."
-  (save-restriction
-    (widen)
-    (fci-delete-overlays-region (point-min) (point-max))))
-
-(defsubst fci-posn-visible-p (posn ranges)
-  "Return true if POSN falls within an interval in RANGES."
-  (memq t (mapcar #'(lambda (range) (and (<= (car range) posn)
-                                         (< posn (cdr range))))
-                  ranges)))
-
-(defsubst fci-get-visible-ranges ()
-  "Return the window start and end for each window on the current buffer."
-  (mapcar #'(lambda (w) (cons (window-start w) (window-end w 'updated)))
-          (fci-get-buffer-windows t)))
-
-(defun fci-delete-unneeded ()
-  "Erase the fill-column rule at buffer positions not visible in any window."
-  (let ((olays (fci-get-overlays-region (point-min) (point-max)))
-        (ranges (fci-get-visible-ranges)))
-    (dolist (o olays)
-      (unless (fci-posn-visible-p (overlay-start o) ranges)
-        (delete-overlay o)))))
-
-;; It would be slightly faster to run this backwards from END to START, but
-;; only if we maintained the overlay center at an early position in the
-;; buffer.  Since other packages that use overlays typically place them while
-;; traversing the buffer in a forward direction, that would be a bad idea.
-(defun fci-put-overlays-region (start end)
-  "Place overlays displaying the fill-column rule between START and END."
-  (goto-char start)
-  (let (o cc)
-    (while (search-forward "\n" end t)
-      (goto-char (match-beginning 0))
-      (setq cc (current-column)
-            o (make-overlay (match-beginning 0) (match-beginning 0)))
-      (overlay-put o 'fci t)
-      (cond
-       ((< cc fci-limit)
-        (overlay-put o 'after-string fci-pre-limit-string))
-       ((> cc fci-limit)
-        (overlay-put o 'after-string fci-post-limit-string))
-       (t
-        (overlay-put o 'after-string fci-at-limit-string)))
-      (goto-char (match-end 0)))))
-
-(defun fci-redraw-region (start end _ignored)
-  "Erase and redraw the fill-column rule between START and END."
-  (save-match-data
-    (save-excursion
-      (let ((inhibit-point-motion-hooks t))
-        (goto-char end)
-        (setq end (line-beginning-position 2))
-        (fci-delete-overlays-region start end)
-        (fci-put-overlays-region start end))))) 
-
-(defun fci-redraw-window (win &optional start)
-  "Redraw the fill-column rule in WIN starting from START."
-  (fci-redraw-region (or start (window-start win)) (window-end win t) 'ignored))
-
-;; This doesn't determine the strictly minimum amount by which the rule needs
-;; to be extended, but the amount used is always sufficient, and determining
-;; the genuine minimum is more expensive than doing the extra drawing.
-(defun fci-extend-rule-for-deletion (start end)
-  "Extend the fill-column rule after a deletion that spans newlines."
-  (unless (= start end)
-    (let ((delenda (fci-get-overlays-region start end)))
-      (when delenda
-        (let ((lossage (1+ (length delenda)))
-              (max-end 0)
-              win-end)
-          (mapc #'delete-overlay delenda)
-          (dolist (win (fci-get-buffer-windows t))
-            ;; Do not ask for an updated value of window-end.
-            (setq win-end (window-end win))
-            (when (and (< 0 (- (min win-end end)
-                               (max (window-start win) start)))
-                       (< max-end win-end))
-              (setq max-end win-end)))
-          (unless (= max-end (point-max))
-            (fci-redraw-region max-end
-                               (save-excursion
-                                 (goto-char max-end)
-                                 (line-beginning-position lossage))
-                               nil)))))))
-
-(defun fci-update-window-for-scroll (win start)
-  "Redraw the fill-column rule in WIN after it has been been scrolled."
-   (fci-delete-unneeded)
-   (fci-redraw-window win start))
-
-(defun fci-update-all-windows (&optional all-frames)
-  "Redraw the fill-column rule in all windows showing the current buffer."
-  (dolist (win (fci-get-buffer-windows all-frames))
-    (fci-redraw-window win)))
-
-(defun fci-redraw-frame ()
-  "Redraw the fill-column rule in all windows on the selected frame."
-  (let* ((wins (window-list (selected-frame) 'no-minibuf))
-         (bufs (delete-dups (mapcar #'window-buffer wins))))
-    (dolist (buf bufs)
-      (with-current-buffer buf
-        (when fci-mode
-          (fci-delete-unneeded)
-          (fci-update-all-windows))))))
-
-;;; ---------------------------------------------------------------------
-;;; Workarounds
-;;; ---------------------------------------------------------------------
-
-;; This in placed in post-command-hook and does four things:
-;; 1. If the display table has been deleted or something has changed the
-;;    display table for newline chars, we regenerate overlay strings after
-;;    reprocessing the display table.
-;; 2. If the default char width or height has changed, we regenerate the rule
-;;    image.  (This handles both font changes and also cases where we
-;;    activate the mode while displaying on a char terminal then subsequently
-;;    display the buffer on a window frame.)
-;; 3. If the value of `tab-width' or `fill-column' has changed, we reset the
-;;    rule.  (We could set things up so that the rule adjusted automatically
-;;    to such changes, but it wouldn't work on v22 or v23.)
-;; 4. Cursor properties are ignored when they're out of sight because of
-;;    horizontal scrolling.  We detect such situations and force a return
-;;    from hscrolling to bring our requested cursor position back into view.
-;; These are all fast tests, so despite the large remit this function
-;; shouldn't noticeably affect editing speed.
-(defun fci-post-command-check ()
-  "This function is a gross hack."
-  (cond
-   ((not (and buffer-display-table
-              (equal (aref buffer-display-table 10) fci-newline)))
-    (setq fci-display-table-processed nil)
-    (fci-mode 1))
-   ((and (< 1 (frame-char-width))
-         (not fci-always-use-textual-rule)
-         (not (and (= (frame-char-width) fci-char-width)
-                   (= (frame-char-height) fci-char-height))))
-    (fci-mode 1))
-   ((not (and (= (or fci-rule-column fill-column) fci-column)
-              (= tab-width fci-tab-width)))
-    (fci-mode 1))
-   ((and (< 0 (window-hscroll))
-         auto-hscroll-mode
-         (<= (current-column) (window-hscroll)))
-    ;; Fix me:  Rather than setting hscroll to 0, this should reproduce the
-    ;; relevant part of the auto-hscrolling algorithm.  Most people won't
-    ;; notice the difference in behavior, though.
-    (set-window-hscroll (selected-window) 0))))
-
-(provide 'fill-column-indicator)
-
-;;; fill-column-indicator.el ends here
diff --git a/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator-autoloads.el b/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator-autoloads.el
new file mode 100644
index 0000000..3de7e59
--- /dev/null
+++ b/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator-autoloads.el
@@ -0,0 +1,38 @@
+;;; fill-column-indicator-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "fill-column-indicator" "fill-column-indicator.el"
+;;;;;;  (22171 46573 0 0))
+;;; Generated autoloads from fill-column-indicator.el
+
+(autoload 'fci-mode "fill-column-indicator" "\
+Toggle fci-mode on and off.
+Fci-mode indicates the location of the fill column by drawing a
+thin line (a `rule') at the fill column.
+
+With prefix ARG, turn fci-mode on if and only if ARG is positive.
+
+The following options control the appearance of the fill-column
+rule: `fci-rule-column', `fci-rule-width', `fci-rule-color',
+`fci-rule-use-dashes', `fci-dash-pattern', `fci-rule-character',
+and `fci-rule-character-color'.  For further options, see the
+Customization menu or the package file.  (See the latter for tips
+on troubleshooting.)
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'turn-on-fci-mode "fill-column-indicator" "\
+Turn on fci-mode unconditionally.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; fill-column-indicator-autoloads.el ends here
diff --git a/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator-pkg.el b/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator-pkg.el
new file mode 100644
index 0000000..cd8c376
--- /dev/null
+++ b/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator-pkg.el
@@ -0,0 +1 @@
+(define-package "fill-column-indicator" "20151030.1233" "Graphically indicate the fill column" 'nil :keywords '("convenience"))
diff --git a/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator.el b/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator.el
new file mode 100644
index 0000000..97d2ad7
--- /dev/null
+++ b/emacs.d/elpa/fill-column-indicator-20151030.1233/fill-column-indicator.el
@@ -0,0 +1,898 @@
+;;; fill-column-indicator.el --- Graphically indicate the fill column
+
+;; Copyright (c) 2011-2014 Alp Aker
+
+;; Author: Alp Aker <alp.tekin.aker@gmail.com>
+;; Version: 1.87
+;; Package-Version: 20151030.1233
+;; Keywords: convenience
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of the
+;; License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; A copy of the GNU General Public License can be obtained from the
+;; Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+;; MA 02111-1307 USA
+
+;;; Commentary:
+
+;; Many modern editors and IDEs can graphically indicate the location of the
+;; fill column by drawing a thin line (in design parlance, a `rule') down the
+;; length of the editing window.  Fill-column-indicator implements this
+;; facility in Emacs.
+
+;; PLEASE NOTE: There is a small incompatibility between this package and the
+;; current stable Emacs relase (v24.3).  A bug in Emacs's internal display
+;; routine that was introduced shortly before that release can cause vertical
+;; motion commands to skip blank lines when fci-mode is active.  This has
+;; been fixed in Emacs trunk.  See github.com/alpaker/Fill-Column-Indicator/issues/31
+;; for further discussion.
+
+;; Installation and Usage
+;; ======================
+
+;; Put this file in your load path and put:
+;;
+;;   (require 'fill-column-indicator)
+;;
+;; in your init file.
+
+;; To toggle graphical indication of the fill column in a buffer, use the
+;; command `fci-mode'.
+ 
+;; Configuration
+;; =============
+
+;; By default, fci-mode draws its vertical indicator at the fill column.  If
+;; you'd like it to be drawn at another column, set `fci-rule-column' to the
+;; column number.  (A case in which this might be useful is when you want to
+;; fill comments at, for example, column 70, but want a vertical rule at
+;; column 80 or 100 to indicate the maximum line length for code.)  The
+;; default behavior (showing the indicator at the fill column) is specified
+;; by setting fci-rule-column to nil.
+
+;; On graphical displays the fill-column rule is drawn using a bitmap
+;; image.  Its color is controlled by the variable `fci-rule-color', whose
+;; value can be any valid color name.  The rule's width in pixels is
+;; determined by the variable `fci-rule-width'; the default value is 1.
+
+;; The rule can be drawn as a solid or dashed line, controlled by the
+;; variable `fci-rule-use-dashes'; the default is nil.  The dash appearance is
+;; controlled by `fci-dash-pattern', which is the ratio of dash length to
+;; line height; the default is 0.75. (The value should be a number between 0
+;; and 1; values outside that interval are coerced to the nearest endpoint.)
+
+;; The image formats fci-mode can use are XPM and PBM.  If Emacs has been
+;; compiled with the appropriate library it uses XPM images by default; if
+;; not it uses PBM images, which are natively supported.  You can specify a
+;; particular choice of format by setting `fci-rule-image-format' explicitly
+;; to xpm or pbm.
+
+;; On character terminals the rule is drawn using the character specified by
+;; `fci-rule-character'; the default is `|' (ascii 124).  If
+;; `fci-rule-character-color' is nil, then it is drawn using fci-rule-color
+;; (or the closest approximation thereto that the terminal is capable of); if
+;; it is a color name, then that color is used instead.
+
+;; If you'd like the rule to be drawn using fci-rule-character even on
+;; graphical displays, set `fci-always-use-textual-rule' to a non-nil value.
+
+;; These variables (as well as those described in the next section) can be
+;; given buffer-local bindings.
+
+;; Other Options
+;; =============
+
+;; When `truncate-lines' is nil, the effect of drawing a fill-column rule is
+;; very odd looking. Indeed, it makes little sense to use a rule to indicate
+;; the position of the fill column in that case (the positions at which the
+;; fill column falls in the visual display space won't, in general, be
+;; collinear).  For this reason, fci-mode sets truncate-lines to t in buffers
+;; in which it is enabled and restores it to its previous value when
+;; disabled.  You can turn this feature off by setting
+;; `fci-handle-truncate-lines' to nil.
+
+;; If `line-move-visual' is t, then vertical navigation can behave oddly in
+;; several edge cases while fci-mode is enabled (this is due to a bug in
+;; Emacs's C code).  Accordingly, fci-mode sets line-move-visual to nil in
+;; buffers in which it is enabled and restores it to its previous value when
+;; disabled.  This can be suppressed by setting `fci-handle-line-move-visual'
+;; to nil.  (But you shouldn't want to do this.  There's no reason to use
+;; line-move-visual if truncate-lines is t, and it doesn't make sense to use
+;; something like fci-mode when truncate-lines is nil.)
+
+;; Fci-mode needs free use of two characters (specifically, it needs the use
+;; of two characters whose display table entries it can change
+;; arbitrarily).  Its defualt is to use the first two characters of the
+;; Private Use Area of the Unicode BMP, viz. U+E000 and U+E001.  If you need
+;; to use those characters for some other purpose, set `fci-eol-char' and
+;; `fci-blank-char' to different values.
+
+;; Troubleshooting
+;; ===============
+
+;; o Fci-mode is intended to be used with monospaced fonts.  If you're using
+;;   a monospaced font and the fill-column rule is missing or misaligned on a
+;;   few lines but otherwise appears normal, then most likely (a) there are
+;;   non-ascii characters on those lines that are being displayed using a
+;;   non-monospaced font, or (b) your font-lock settings use bold or italics
+;;   and those font variants aren't monospaced.
+
+;; o Fci-mode in not currently compatible with Emacs's
+;;   `show-trailing-whitespace' feature (given the way the latter is
+;;   implemented, such compatibility is going to be hard to achieve).  A
+;;   workaround is to configure `whitespace-mode' to replicate the
+;;   functionality of show-trailing-whitespace.  This can be done with the
+;;   following setting:
+;;
+;;     (setq whitespace-style '(face trailing))
+;;
+;;  With this, whitespace-mode produces the same basic effect as a non-nil
+;;  value of show-trailing-whitespace, and compatibility with fci-mode is not
+;;  a problem.
+
+;; Known Issues
+;; ============
+
+;; o The indicator extends only to end of the buffer contents (as opposed to
+;;   running the full length of the editing window).
+
+;; o When portions of a buffer are invisible, such as when outline-mode is
+;;   used to hide certain lines, the fill-column rule is hidden as well.
+
+;; o Fci-mode should work smoothly when simultaneously displaying the same
+;;   buffer on both a graphical display and on a character terminal.  It does
+;;   not currently support simultaneous display of the same buffer on window
+;;   frames with different default font sizes. (It would be feasible to
+;;   support this use case, but thus far there seems to be no demand for
+;;   it.)
+
+;; Todo
+;; ====
+
+;; o Accommodate non-nil values of `hl-line-sticky-flag' and similar cases.
+
+;; o Accommodate linum-mode more robustly.
+
+;; o Compatibility with non-nil `show-trailing-whitespace.'
+
+;; Acknowledgements
+;; ================
+
+;; Thanks to Ami Fischman, Christopher Genovese, Michael Hoffman, José
+;; Alfredo Romero L., R. Lange, Joe Lisee, José Lombera, Frank Meffert,
+;; Mitchell Peabody, sheijk, and an anonymous BT subscriber for bug reports
+;; and suggestions.  Special thanks to lomew, John Lamp, David Röthlisberger,
+;; and Pär Wieslander for code contributions.
+
+;;; Code:
+
+(unless (version<= "22" emacs-version)
+  (error "Fill-column-indicator requires version 22 or later"))
+
+;;; ---------------------------------------------------------------------
+;;; User Options
+;;; ---------------------------------------------------------------------
+
+(defgroup fill-column-indicator nil
+  "Graphically indicate the fill-column."
+  :tag "Fill-Column Indicator"
+  :group 'convenience
+  :group 'fill)
+
+;; We should be using :validate instead of :match, but that seems not to
+;; work with defcustom widgets.
+(defcustom fci-rule-column nil
+  "Controls where fci-mode displays a vertical line (rule).
+
+If nil, the rule is drawn at the fill column.  Otherwise, it is
+drawn at the column given by this variable.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :group 'fill-column-indicator
+  :tag "Fill-Column rule column"
+  :type '(choice (const :tag "Use the fill column" nil)
+                 (integer :tag "Use a custom column"
+                          :match (lambda (w val) (fci-posint-p val)))))
+
+(defcustom fci-rule-color "#cccccc"
+  "Color used to draw the fill-column rule.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :group 'fill-column-indicator
+  :tag "Fill-column rule color"
+  :type 'color)
+
+(defcustom fci-rule-width 1
+  "Width in pixels of the fill-column rule on graphical displays.
+Note that a value greater than the default character width is
+treated as equivalent to the default character width.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :tag "Fill-Column Rule Width"
+  :group 'fill-column-indicator
+  :type  '(integer :match (lambda (w val) (fci-posint-p val))))
+
+(defcustom fci-rule-image-format
+  (if (image-type-available-p 'xpm) 'xpm 'pbm)
+  "Image format used for the fill-column rule on graphical displays.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :tag "Fill-Column Rule Image Format"
+  :group 'fill-column-indicator
+  :type '(choice (symbol :tag "XPM" 'xpm)
+                 (symbol :tag "PBM" 'pbm)))
+
+(defcustom fci-rule-use-dashes nil
+  "Whether to show the fill-column rule as dashes or as a solid line.
+This has no effect on non-graphical displays.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :tag "Fill-Column Rule Use Dashes"
+  :group 'fill-column-indicator
+  :type 'boolean)
+
+(defcustom fci-dash-pattern 0.75
+  "When using a dashed rule, ratio of dash length to line height.
+Values less than 0 or greather than 1 are coerced to the nearest
+endpoint of that interval.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :tag "Fill-Column Rule Use Dashes"
+  :group 'fill-column-indicator
+  :type 'float)
+
+(defcustom fci-rule-character ?|
+  "Character used to draw the fill-column rule on character terminals.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :tag "Fill-Column Rule Character"
+  :group 'fill-column-indicator
+  :type 'character)
+
+(defcustom fci-rule-character-color nil
+  "Color used to draw the fill-column rule on character terminals.
+If nil, the same color is used as for the graphical rule.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :group 'fill-column-indicator
+  :tag "Fill-column rule color"
+  :type '(choice (const :tag "Use same color as graphical rule" nil)
+                 (color :tag "Specify a color")))
+
+(defcustom fci-always-use-textual-rule nil
+  "When non-nil, the rule is always drawn using textual characters.
+Specifically, fci-mode will use `fci-rule-character' intead of
+bitmap images to draw the rule on graphical displays.
+
+Changes to this variable do not take effect until the mode
+function `fci-mode' is run."
+  :tag "Don't Use Image for Fill-Column Rule"
+  :group 'fill-column-indicator
+  :type 'boolean)
+
+(defcustom fci-handle-truncate-lines t
+  "Whether fci-mode should set truncate-lines to t while enabled.
+If non-nil, fci-mode will set truncate-lines to t in buffers in
+which it is enabled, and restore it to its previous value when
+disabled.
+
+Leaving this option set to the default value is recommended."
+  :group 'fill-column-indicator
+  :tag "Locally set truncate-lines to t during fci-mode"
+  :type 'boolean)
+
+(defcustom fci-handle-line-move-visual (version<= "23" emacs-version)
+  "Whether fci-mode should set line-move-visual to nil while enabled.
+If non-nil, fci-mode will set line-move-visual to nil in buffers
+in which it is enabled, and restore t to its previous value when
+disabled.
+
+Leaving this option set to the default value is recommended."
+  :group 'fill-column-indicator
+  :tag "Locally set line-move-visual to nil during fci-mode"
+  :type 'boolean)
+
+(defcustom fci-eol-char ?\uE000
+  "Character used for internal purposes by fci-mode.
+If you need to use this character, set this variable's value to a
+character you do not care about (a good choice is a character
+from the Private Use Area of the Unicode BMP, i.e., the range
+U+E000-U+F8FF, inclusive)."
+  :group 'fill-column-indicator
+  :type 'character)
+
+(defcustom fci-blank-char ?\uE001
+  "Character used for internal purposes by fci-mode.
+If you need to use this character, set this variable's value to a
+character you do not care about (a good choice is a character
+from the Private Use Area of the Unicode BMP, i.e., the the range
+U+E000-U+F8FF, inclusive)."
+  :group 'fill-column-indicator
+  :type 'character)
+
+;;; ---------------------------------------------------------------------
+;;; Internal Variables and Constants
+;;; ---------------------------------------------------------------------
+
+;; Record prior state of buffer.
+(defvar fci-saved-line-move-visual)
+(defvar fci-line-move-visual-was-buffer-local)
+(defvar fci-saved-truncate-lines)
+(defvar fci-saved-eol)
+(defvar fci-made-display-table)
+
+;; Record state of fci initialization in this buffer.
+(defvar fci-display-table-processed)
+(defvar fci-local-vars-set)
+
+;; Record current state of some quantities, so we can detect changes to them.
+(defvar fci-column)
+(defvar fci-newline)
+(defvar fci-tab-width)
+(defvar fci-char-width)
+(defvar fci-char-height)
+
+;; Data used in setting the fill-column rule that only need to be
+;; occasionally updated in a given buffer.
+(defvar fci-limit)
+(defvar fci-pre-limit-string)
+(defvar fci-at-limit-string)
+(defvar fci-post-limit-string)
+
+;; The preceding internal variables need to be buffer local and reset when
+;; the mode is disabled.
+(defconst fci-internal-vars '(fci-saved-line-move-visual
+                              fci-line-move-visual-was-buffer-local
+                              fci-saved-truncate-lines
+                              fci-saved-eol
+                              fci-made-display-table
+                              fci-display-table-processed
+                              fci-local-vars-set
+                              fci-column
+                              fci-newline
+                              fci-tab-width
+                              fci-char-width
+                              fci-char-height
+                              fci-limit
+                              fci-pre-limit-string
+                              fci-at-limit-string
+                              fci-post-limit-string))
+
+(dolist (var fci-internal-vars)
+  (make-variable-buffer-local var))
+
+;; Hooks we use.
+(defconst fci-hook-assignments
+  '((after-change-functions fci-redraw-region t t)
+    (before-change-functions fci-extend-rule-for-deletion nil t)
+    (window-scroll-functions fci-update-window-for-scroll nil t)
+    (window-configuration-change-hook  fci-redraw-frame)
+    (post-command-hook  fci-post-command-check nil t)
+    (change-major-mode-hook turn-off-fci-mode nil t)
+    (longlines-mode-hook fci-update-all-windows nil t)))
+
+;;; ---------------------------------------------------------------------
+;;; Miscellany
+;;; ---------------------------------------------------------------------
+
+(defun fci-get-buffer-windows (&optional all-frames)
+  "Return a list of windows displaying the current buffer."
+  (get-buffer-window-list (current-buffer) 'no-minibuf all-frames))
+
+(defun fci-posint-p (x)
+  "Return true if X is an integer greater than zero."
+  (and (wholenump x)
+       (/= 0 x)))
+
+(if (fboundp 'characterp)
+    (defalias 'fci-character-p 'characterp)
+  ;; For v22.
+  (defun fci-character-p (c)
+    "Return true if C is a character."
+    (and (fci-posint-p c)
+         ;; MAX_CHAR in v22 is (0x1f << 14).  We don't worry about
+         ;; generic chars.
+         (< c 507904))))
+
+;;; ---------------------------------------------------------------------
+;;; Mode Definition
+;;; ---------------------------------------------------------------------
+
+;;;###autoload
+(define-minor-mode fci-mode
+  "Toggle fci-mode on and off.
+Fci-mode indicates the location of the fill column by drawing a
+thin line (a `rule') at the fill column.
+
+With prefix ARG, turn fci-mode on if and only if ARG is positive.
+
+The following options control the appearance of the fill-column
+rule: `fci-rule-column', `fci-rule-width', `fci-rule-color',
+`fci-rule-use-dashes', `fci-dash-pattern', `fci-rule-character',
+and `fci-rule-character-color'.  For further options, see the
+Customization menu or the package file.  (See the latter for tips
+on troubleshooting.)"
+
+  nil nil nil
+
+  (if fci-mode
+      ;; Enabling.
+      (condition-case error
+          (progn
+            (fci-check-user-options)
+            (fci-process-display-table)
+            (fci-set-local-vars)
+            (fci-get-frame-dimens)
+            (dolist (hook fci-hook-assignments)
+              (apply 'add-hook hook))
+            (setq fci-column (or fci-rule-column fill-column)
+                  fci-tab-width tab-width
+                  fci-limit (if fci-newline
+                                (1+ (- fci-column (length fci-saved-eol)))
+                              fci-column))
+            (fci-make-overlay-strings)
+            (fci-update-all-windows t))
+        (error
+         (fci-mode 0)
+         (signal (car error) (cdr error))))
+
+    ;; Disabling.
+    (fci-restore-display-table)
+    (fci-restore-local-vars)
+    (dolist (hook fci-hook-assignments)
+      (remove-hook (car hook) (nth 1 hook) (nth 3 hook)))
+    (fci-delete-overlays-buffer)
+    (dolist (var fci-internal-vars)
+      (set var nil))))
+
+;;;###autoload
+(defun turn-on-fci-mode ()
+  "Turn on fci-mode unconditionally."
+  (interactive)
+  (fci-mode 1))
+
+(defun turn-off-fci-mode ()
+  "Turn off fci-mode unconditionally."
+  (interactive)
+  (fci-mode 0))
+
+;;; ---------------------------------------------------------------------
+;;; Display Property Specs
+;;; ---------------------------------------------------------------------
+
+(defun fci-overlay-fills-background-p (olay)
+  "Return true if OLAY specifies a background color."
+  (let ((olay-face (overlay-get olay 'face)))
+    (when olay-face
+      (if (facep olay-face)
+          (not (eq (face-attribute olay-face :background nil t) 'unspecified))
+        (if (consp olay-face)
+            (if (listp (cdr olay-face))
+                (if (facep (car olay-face))
+                    (not (memq t (mapcar #'(lambda (f) (eq (face-attribute f :background nil t) 'unspecified))
+                                         olay-face)))
+                  (plist-member olay-face :background))
+              (eq (car olay-face) 'background-color)))))))
+
+(defun fci-competing-overlay-p (posn)
+  "Return true if there is an overlay at POSN that fills the background."
+  (memq t (mapcar #'fci-overlay-fills-background-p (overlays-at posn))))
+
+;; The display spec used in overlay before strings to pad out the rule to the
+;; fill-column. 
+(defconst fci-padding-display
+  '((when (not (fci-competing-overlay-p buffer-position))
+      . (space :align-to fci-column))
+    (space :width 0)))
+
+;; Generate the display spec for the rule.  Basic idea is to use a "cascading
+;; display property" to display the textual rule if the display doesn't
+;; support images and the graphical rule if it does, but in either case only
+;; display a rule if no other overlay wants to fill the background at the
+;; relevant buffer position.
+(defun fci-rule-display (blank rule-img rule-str for-pre-string)
+  "Generate a display specification for a fill-column rule overlay string."
+  (let* ((cursor-prop (if (and (not for-pre-string) (not fci-newline)) t))
+         (propertized-rule-str (propertize rule-str 'cursor cursor-prop))
+         (display-prop (if rule-img
+                           `((when (not (or (display-images-p)
+                                            (fci-competing-overlay-p buffer-position)))
+                               . ,propertized-rule-str)
+                             (when (not (fci-competing-overlay-p buffer-position))
+                               . ,rule-img)
+                             (space :width 0))
+                         `((when (not (fci-competing-overlay-p buffer-position))
+                             . ,propertized-rule-str)
+                           (space :width 0)))))
+    (propertize blank 'cursor cursor-prop 'display display-prop)))
+
+;;; ---------------------------------------------------------------------
+;;; Enabling
+;;; ---------------------------------------------------------------------
+
+(defun fci-check-user-options ()
+  "Check that all user options for fci-mode have valid values."
+  (unless (memq fci-rule-image-format '(xpm pbm))
+    (error "Unrecognized value of `fci-rule-image-format'"))
+  ;; If the third element of a binding form is t, then nil is an acceptable
+  ;; value for the variable; otherwise, the variable value must satisfy the
+  ;; given predicate.
+  (let ((checks '((fci-rule-color color-defined-p)
+                  (fci-rule-column fci-posint-p t)
+                  (fci-rule-width fci-posint-p t)
+                  (fci-rule-character-color color-defined-p t)
+                  (fci-rule-character fci-character-p)
+                  (fci-blank-char fci-character-p)
+                  (fci-dash-pattern floatp)
+                  (fci-eol-char fci-character-p))))
+    (dolist (check checks)
+      (let ((value (symbol-value (nth 0 check)))
+            (pred (nth 1 check))
+            (nil-is-ok (nth 2 check)))
+        (unless (or (and nil-is-ok (null value))
+                    (funcall pred value))
+          (signal 'wrong-type-argument (list pred value)))))))
+
+(defun fci-process-display-table ()
+  "Set up a buffer-local display table for fci-mode."
+  (unless fci-display-table-processed
+    (unless buffer-display-table
+      (setq buffer-display-table (make-display-table)
+            fci-made-display-table t))
+    (aset buffer-display-table fci-blank-char [32])
+    (setq fci-saved-eol (aref buffer-display-table 10))
+    ;; Assumption: the display-table entry for character 10 is either nil or
+    ;; a vector whose last element is the newline glyph.
+    (let ((glyphs (butlast (append fci-saved-eol nil)))
+          eol)
+      (if glyphs
+          (setq fci-newline [10]
+                eol (vconcat glyphs))
+        (setq fci-newline nil
+              eol [32]))
+      (aset buffer-display-table 10 fci-newline)
+      (aset buffer-display-table fci-eol-char eol))
+    (setq fci-display-table-processed t)))
+
+(defun fci-set-local-vars ()
+  "Set miscellaneous local variables when fci-mode is enabled."
+  (unless fci-local-vars-set
+    (when (and fci-handle-line-move-visual
+               (boundp 'line-move-visual))
+      (if (local-variable-p 'line-move-visual)
+          (setq fci-line-move-visual-was-buffer-local t
+                fci-saved-line-move-visual line-move-visual
+                line-move-visual nil)
+        (set (make-local-variable 'line-move-visual) nil)))
+    (when fci-handle-truncate-lines
+      (setq fci-saved-truncate-lines truncate-lines
+            truncate-lines t))
+    (setq fci-local-vars-set t)))
+
+(defun fci-make-rule-string ()
+  "Return a string for drawing the fill-column rule."
+  (let ((color (or fci-rule-character-color
+                   fci-rule-color)))
+    ;; Make sure we don't inherit weight or slant from font-lock.
+    (propertize (char-to-string fci-rule-character)
+                'face `(:foreground ,color :weight normal :slant normal))))
+
+(defun fci-make-img-descriptor ()
+  "Make an image descriptor for the fill-column rule."
+  (unless (or (= 0 fci-char-width)
+              fci-always-use-textual-rule)
+    ;; No point passing width, height, color etc. directly to the image
+    ;; functions: those variables have either global or buffer-local
+    ;; scope, so the image-generating functions can access them directly.
+    (if (eq fci-rule-image-format 'xpm)
+        (fci-make-xpm-img)
+      (fci-make-pbm-img))))
+
+(defun fci-get-frame-dimens ()
+  "Determine the frame character height and width.
+
+If the selected frame cannot display images, use the character
+height and width of the first graphic frame in the frame list
+displaying the current buffer.  (This fallback behavior is just a
+rough heuristic.)"
+  (let ((frame (catch 'found-graphic
+                 (if (display-images-p)
+                     (selected-frame)
+                   (dolist (win (fci-get-buffer-windows t))
+                     (when (display-images-p (window-frame win))
+                       (throw 'found-graphic (window-frame win))))))))
+    (setq fci-char-width (frame-char-width frame)
+          fci-char-height (frame-char-height frame))))
+
+(defmacro fci-with-rule-parameters (&rest body)
+  "Define various quantites used in generating rule image descriptors."
+  (declare (indent defun))
+  `(let* ((height-str (number-to-string fci-char-height))
+          (width-str (number-to-string fci-char-width))
+          (rule-width (min fci-rule-width fci-char-width))
+          (hmargin (/ (- fci-char-width rule-width) 2.0))
+          (left-margin (floor hmargin))
+          (right-margin (ceiling hmargin))
+          (segment-ratio (if fci-rule-use-dashes fci-dash-pattern 1))
+          (segment-ratio-coerced (min 1 (max 0 segment-ratio)))
+          (segment-length (round (* segment-ratio-coerced fci-char-height)))
+          (vmargin (/ (- fci-char-height segment-length) 2.0))
+          (top-margin (floor vmargin))
+          (bottom-margin (ceiling vmargin)))
+     ,@body))
+
+(defun fci-mapconcat (sep &rest lists)
+  "Concatenate the strings in LISTS, using SEP as separator."
+  (mapconcat #'identity (apply 'nconc lists) sep))
+
+(defun fci-make-pbm-img ()
+  "Return an image descriptor for the fill-column rule in PBM format."
+  (fci-with-rule-parameters
+    (let* ((magic-number "P1\n")
+           (dimens (concat width-str " " height-str "\n"))
+           (on-pixels (fci-mapconcat " "
+                                     (make-list left-margin "0")
+                                     (make-list rule-width "1")
+                                     (make-list right-margin "0")))
+           (off-pixels (fci-mapconcat " " (make-list fci-char-width "0")))
+           (raster (fci-mapconcat "\n"
+                                  (make-list top-margin off-pixels)
+                                  (make-list segment-length on-pixels)
+                                  (make-list bottom-margin off-pixels)))
+           (data (concat magic-number dimens raster)))
+      `(image :type pbm
+              :data ,data
+              :mask heuristic
+              :foreground ,fci-rule-color
+              :ascent center))))
+
+(defun fci-make-xpm-img ()
+  "Return an image descriptor for the fill-column rule in XPM format."
+  (fci-with-rule-parameters
+    (let* ((identifier "/* XPM */\nstatic char *rule[] = {")
+           (dimens (concat "\"" width-str " " height-str " 2 1\","))
+           (color-spec (concat "\"1 c " fci-rule-color "\",\"0 c None\","))
+           (on-pixels (concat "\""
+                              (make-string left-margin ?0)
+                              (make-string rule-width ?1)
+                              (make-string right-margin ?0)
+                              "\","))
+           (off-pixels (concat "\"" (make-string fci-char-width ?0) "\","))
+           (raster (fci-mapconcat ""
+                                  (make-list top-margin off-pixels)
+                                  (make-list segment-length on-pixels)
+                                  (make-list bottom-margin off-pixels)))
+           (end "};")
+           (data (concat identifier dimens color-spec raster end)))
+      `(image :type xpm
+              :data ,data
+              :mask heuristic
+              :ascent center))))
+
+(defun fci-make-overlay-strings ()
+  "Generate the overlay strings used to display the fill-column rule."
+  (let* ((str (fci-make-rule-string))
+         (img (fci-make-img-descriptor))
+         (blank-str (char-to-string fci-blank-char))
+         (eol-str (char-to-string fci-eol-char))
+         (end-cap (propertize blank-str 'display '(space :width 0)))
+         (pre-or-post-eol (propertize eol-str
+                                      'cursor t
+                                      'display (propertize eol-str 'cursor t)))
+         (pre-padding (propertize blank-str 'display fci-padding-display))
+         (pre-rule (fci-rule-display blank-str img str t))
+         (at-rule (fci-rule-display blank-str img str fci-newline))
+         (at-eol (if fci-newline pre-or-post-eol "")))
+    (setq fci-pre-limit-string (concat pre-or-post-eol pre-padding pre-rule)
+          fci-at-limit-string (concat at-eol at-rule)
+          fci-post-limit-string (concat pre-or-post-eol end-cap))))
+
+;;; ---------------------------------------------------------------------
+;;; Disabling
+;;; ---------------------------------------------------------------------
+
+(defun fci-restore-local-vars ()
+  "Restore miscellaneous local variables when fci-mode is disabled."
+  (when fci-local-vars-set
+    (when (and fci-handle-line-move-visual
+               (boundp 'line-move-visual))
+      (if fci-line-move-visual-was-buffer-local
+          (setq line-move-visual fci-saved-line-move-visual)
+        (kill-local-variable 'line-move-visual)))
+    (when fci-handle-truncate-lines
+      (setq truncate-lines fci-saved-truncate-lines))))
+
+(defun fci-restore-display-table ()
+  "Restore the buffer display table when fci-mode is disabled."
+  (when (and buffer-display-table
+             fci-display-table-processed)
+    (aset buffer-display-table 10 fci-saved-eol)
+    ;; Don't set buffer-display-table to nil even if we created the display
+    ;; table; only do so if nothing else has changed it.
+    (when (and fci-made-display-table
+               (equal buffer-display-table (make-display-table)))
+      (setq buffer-display-table nil))))
+
+;;; ---------------------------------------------------------------------
+;;; Drawing and Erasing
+;;; ---------------------------------------------------------------------
+
+(defun fci-get-overlays-region (start end)
+  "Return all overlays between START and END displaying the fill-column rule."
+  (delq nil (mapcar #'(lambda (o) (if (overlay-get o 'fci) o))
+                    (overlays-in start end))))
+
+(defun fci-delete-overlays-region (start end)
+  "Delete overlays displaying the fill-column rule between START and END."
+  (mapc #'(lambda (o) (if (overlay-get o 'fci) (delete-overlay o)))
+        (overlays-in start end)))
+
+(defun fci-delete-overlays-buffer ()
+  "Delete all overlays displaying the fill-column rule in the current buffer."
+  (save-restriction
+    (widen)
+    (fci-delete-overlays-region (point-min) (point-max))))
+
+(defsubst fci-posn-visible-p (posn ranges)
+  "Return true if POSN falls within an interval in RANGES."
+  (memq t (mapcar #'(lambda (range) (and (<= (car range) posn)
+                                         (< posn (cdr range))))
+                  ranges)))
+
+(defsubst fci-get-visible-ranges ()
+  "Return the window start and end for each window on the current buffer."
+  (mapcar #'(lambda (w) (cons (window-start w) (window-end w 'updated)))
+          (fci-get-buffer-windows t)))
+
+(defun fci-delete-unneeded ()
+  "Erase the fill-column rule at buffer positions not visible in any window."
+  (let ((olays (fci-get-overlays-region (point-min) (point-max)))
+        (ranges (fci-get-visible-ranges)))
+    (dolist (o olays)
+      (unless (fci-posn-visible-p (overlay-start o) ranges)
+        (delete-overlay o)))))
+
+;; It would be slightly faster to run this backwards from END to START, but
+;; only if we maintained the overlay center at an early position in the
+;; buffer.  Since other packages that use overlays typically place them while
+;; traversing the buffer in a forward direction, that would be a bad idea.
+(defun fci-put-overlays-region (start end)
+  "Place overlays displaying the fill-column rule between START and END."
+  (goto-char start)
+  (let (o cc)
+    (while (search-forward "\n" end t)
+      (goto-char (match-beginning 0))
+      (setq cc (current-column)
+            o (make-overlay (match-beginning 0) (match-beginning 0)))
+      (overlay-put o 'fci t)
+      (cond
+       ((< cc fci-limit)
+        (overlay-put o 'after-string fci-pre-limit-string))
+       ((> cc fci-limit)
+        (overlay-put o 'after-string fci-post-limit-string))
+       (t
+        (overlay-put o 'after-string fci-at-limit-string)))
+      (goto-char (match-end 0)))))
+
+(defun fci-redraw-region (start end _ignored)
+  "Erase and redraw the fill-column rule between START and END."
+  (save-match-data
+    (save-excursion
+      (let ((inhibit-point-motion-hooks t))
+        (goto-char end)
+        (setq end (line-beginning-position 2))
+        (fci-delete-overlays-region start end)
+        (fci-put-overlays-region start end))))) 
+
+(defun fci-redraw-window (win &optional start)
+  "Redraw the fill-column rule in WIN starting from START."
+  (fci-redraw-region (or start (window-start win)) (window-end win t) 'ignored))
+
+;; This doesn't determine the strictly minimum amount by which the rule needs
+;; to be extended, but the amount used is always sufficient, and determining
+;; the genuine minimum is more expensive than doing the extra drawing.
+(defun fci-extend-rule-for-deletion (start end)
+  "Extend the fill-column rule after a deletion that spans newlines."
+  (unless (= start end)
+    (let ((delenda (fci-get-overlays-region start end)))
+      (when delenda
+        (let ((lossage (1+ (length delenda)))
+              (max-end 0)
+              win-end)
+          (mapc #'delete-overlay delenda)
+          (dolist (win (fci-get-buffer-windows t))
+            ;; Do not ask for an updated value of window-end.
+            (setq win-end (window-end win))
+            (when (and (< 0 (- (min win-end end)
+                               (max (window-start win) start)))
+                       (< max-end win-end))
+              (setq max-end win-end)))
+          (unless (= max-end (point-max))
+            (fci-redraw-region max-end
+                               (save-excursion
+                                 (goto-char max-end)
+                                 (line-beginning-position lossage))
+                               nil)))))))
+
+(defun fci-update-window-for-scroll (win start)
+  "Redraw the fill-column rule in WIN after it has been been scrolled."
+   (fci-delete-unneeded)
+   (fci-redraw-window win start))
+
+(defun fci-update-all-windows (&optional all-frames)
+  "Redraw the fill-column rule in all windows showing the current buffer."
+  (dolist (win (fci-get-buffer-windows all-frames))
+    (fci-redraw-window win)))
+
+(defun fci-redraw-frame ()
+  "Redraw the fill-column rule in all windows on the selected frame."
+  (let* ((wins (window-list (selected-frame) 'no-minibuf))
+         (bufs (delete-dups (mapcar #'window-buffer wins))))
+    (dolist (buf bufs)
+      (with-current-buffer buf
+        (when fci-mode
+          (fci-delete-unneeded)
+          (fci-update-all-windows))))))
+
+;;; ---------------------------------------------------------------------
+;;; Workarounds
+;;; ---------------------------------------------------------------------
+
+;; This in placed in post-command-hook and does four things:
+;; 1. If the display table has been deleted or something has changed the
+;;    display table for newline chars, we regenerate overlay strings after
+;;    reprocessing the display table.
+;; 2. If the default char width or height has changed, we regenerate the rule
+;;    image.  (This handles both font changes and also cases where we
+;;    activate the mode while displaying on a char terminal then subsequently
+;;    display the buffer on a window frame.)
+;; 3. If the value of `tab-width' or `fill-column' has changed, we reset the
+;;    rule.  (We could set things up so that the rule adjusted automatically
+;;    to such changes, but it wouldn't work on v22 or v23.)
+;; 4. Cursor properties are ignored when they're out of sight because of
+;;    horizontal scrolling.  We detect such situations and force a return
+;;    from hscrolling to bring our requested cursor position back into view.
+;; These are all fast tests, so despite the large remit this function
+;; shouldn't noticeably affect editing speed.
+(defun fci-post-command-check ()
+  "This function is a gross hack."
+  (cond
+   ((not (and buffer-display-table
+              (equal (aref buffer-display-table 10) fci-newline)))
+    (setq fci-display-table-processed nil)
+    (fci-mode 1))
+   ((and (< 1 (frame-char-width))
+         (not fci-always-use-textual-rule)
+         (not (and (= (frame-char-width) fci-char-width)
+                   (= (frame-char-height) fci-char-height))))
+    (fci-mode 1))
+   ((not (and (= (or fci-rule-column fill-column) fci-column)
+              (= tab-width fci-tab-width)))
+    (fci-mode 1))
+   ((and (< 0 (window-hscroll))
+         auto-hscroll-mode
+         (<= (current-column) (window-hscroll)))
+    ;; Fix me:  Rather than setting hscroll to 0, this should reproduce the
+    ;; relevant part of the auto-hscrolling algorithm.  Most people won't
+    ;; notice the difference in behavior, though.
+    (set-window-hscroll (selected-window) 0))))
+
+(provide 'fill-column-indicator)
+
+;;; fill-column-indicator.el ends here
diff --git a/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project-autoloads.el b/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project-autoloads.el
deleted file mode 100644
index 9031d13..0000000
--- a/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project-autoloads.el
+++ /dev/null
@@ -1,56 +0,0 @@
-;;; find-file-in-project-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "find-file-in-project" "find-file-in-project.el"
-;;;;;;  (21898 47978 0 0))
-;;; Generated autoloads from find-file-in-project.el
-
-(autoload 'ffip-current-full-filename-match-pattern-p "find-file-in-project" "\
-Is current full file name (including directory) match the REGEX?
-
-\(fn REGEX)" nil nil)
-
-(autoload 'find-file-in-project "find-file-in-project" "\
-Prompt with a completing list of all files in the project to find one.
-If NUM is given, only files modfied NUM days before will be selected.
-
-The project's scope is defined as the first directory containing
-a `ffip-project-file' (It's value is \".git\" by default.
-
-You can override this by setting the variable `ffip-project-root'.
-
-\(fn &optional NUM)" t nil)
-
-(autoload 'ffip-get-project-root-directory "find-file-in-project" "\
-Get the full path of project root directory
-
-\(fn)" nil nil)
-
-(autoload 'find-file-in-project-by-selected "find-file-in-project" "\
-Similar to find-file-in-project.
-But use string from selected region to search files in the project.
-If no region is selected, you need provide one.
-If NUM is given, only files modfied NUM days before will be selected.
-
-\(fn &optional NUM)" t nil)
-
-(defalias 'ffip 'find-file-in-project)
-
-(put 'ffip-patterns 'safe-local-variable 'listp)
-
-(put 'ffip-project-file 'safe-local-variable 'stringp)
-
-(put 'ffip-project-root 'safe-local-variable 'stringp)
-
-(put 'ffip-limit 'safe-local-variable 'integerp)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; find-file-in-project-autoloads.el ends here
diff --git a/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project-pkg.el b/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project-pkg.el
deleted file mode 100644
index 1c7fa1c..0000000
--- a/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "find-file-in-project" "20150528.633" "Find files in a project quickly." 'nil :url "http://www.emacswiki.org/cgi-bin/wiki/FindFileInProject" :keywords '("project" "convenience"))
diff --git a/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project.el b/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project.el
deleted file mode 100644
index 2891960..0000000
--- a/emacs.d/elpa/find-file-in-project-20150528.633/find-file-in-project.el
+++ /dev/null
@@ -1,347 +0,0 @@
-;;; find-file-in-project.el --- Find files in a project quickly.
-
-;; Copyright (C) 2006-2009, 2011-2012, 2015
-;;   Phil Hagelberg, Doug Alcorn, and Will Farrington
-;; Author: Phil Hagelberg, Doug Alcorn, and Will Farrington
-;; Maintainer: Chen Bin <chenbin.sh@gmail.com>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/FindFileInProject
-;; Package-Version: 20150528.633
-;; Git: git://github.com/technomancy/find-file-in-project.git
-;; Version: 3.5
-;; Created: 2008-03-18
-;; Keywords: project, convenience
-;; EmacsWiki: FindFileInProject
-
-;; This file is NOT part of GNU Emacs.
-
-;;; License:
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This program provides a couple methods for quickly finding any file
-;; in a given project.  It depends on GNU find.
-;;
-;; Usage,
-;;   - `M-x find-file-in-project` will start search immediately
-;;   - `M-x find-file-in-project-by-selected` use the your selected
-;;      region as keyword to search. Or you need provide the keyword
-;;      if no region selected.
-;;
-;; A project is found by searching up the directory tree until a file
-;; is found that matches `ffip-project-file'.  (".git" by default.)
-;; You can set `ffip-project-root-function' to provide an alternate
-;; function to search for the project root.  By default, it looks only
-;; for files whose names match `ffip-patterns',
-
-;; If you have so many files that it becomes unwieldy, you can set
-;; `ffip-find-options' to a string which will be passed to the `find'
-;; invocation in order to exclude irrelevant subdirectories/files.
-;; For instance, in a Ruby on Rails project, you are interested in all
-;; .rb files that don't exist in the "vendor" directory.  In that case
-;; you could set `ffip-find-options' to "-not -regex \".*vendor.*\"".
-
-;; All these variables may be overridden on a per-directory basis in
-;; your .dir-locals.el.  See (info "(Emacs) Directory Variables") for
-;; details.
-
-;; Ivy.el from https://github.com/abo-abo/swiper could be automatically
-;; used if you insert below line into ~/.emacs,
-;;   (autoload 'ivy-read "ivy")
-;; In Ivy.el, SPACE is translated to regex ".*".
-;; For exmaple, the search string "dec fun pro" is transformed into
-;; a regex "\\(dec\\).*\\(fun\\).*\\(pro\\)"
-;;
-;; If Ivy.el is not available, ido will be used.
-
-;; GNU Find can be installed,
-;;   - through `brew' on OS X
-;;   - through `cygwin' on Windows.
-;;
-;; This program works on Windows/Cygwin/Linux/Mac Emacs.
-;; See https://github.com/technomancy/find-file-in-project for advanced tips
-
-;; Recommended binding: (global-set-key (kbd "C-x f") 'find-file-in-project)
-
-;;; Code:
-
-(require 'cl)
-
-(defvar ffip-find-executable nil "Path of GNU find. If nil, we will find `find' path automatically")
-
-(defvar ffip-project-file ".git"
-  "The file that should be used to define a project root.
-
-May be set using .dir-locals.el. Checks each entry if set to a list.")
-
-(defvar ffip-patterns nil
-  "List of patterns to look for with `find-file-in-project'.")
-
-(defvar ffip-prune-patterns
-  '(;; VCS
-    ".git"
-    ".svn"
-    ".cvs"
-    ".bzr"
-    ".hg"
-    ;; project misc
-    "*.log"
-    "bin"
-    "dist"
-    "target"
-    ;; Mac
-    ".DS_Store"
-    ;; Ctags
-    "tags"
-    "TAGS"
-    ;; Global/Cscope
-    "GTAGS"
-    "GPATH"
-    "GRTAGS"
-    "cscope.files"
-    ;; html/javascript/css
-    "*min.js"
-    "*min.css"
-    "node_modules"
-    "bower_components"
-    ;; Images
-    "*.png"
-    "*.jpg"
-    "*.jpeg"
-    "*.gif"
-    "*.bmp"
-    "*.tiff"
-    ;; documents
-    "*.doc"
-    "*.docx"
-    "*.pdf"
-    ;; C/C++
-    "*.obj"
-    "*.o"
-    "*.a"
-    "*.dylib"
-    "*.lib"
-    "*.d"
-    "*.dll"
-    "*.exe"
-    ;; Java
-    ".metadata"
-    ".gradle"
-    "*.class"
-    "*.war"
-    "*.jar"
-    ;; Emacs/Vim
-    "*flymake"
-    "#*#"
-    ".#*"
-    "*.swp"
-    "*~"
-    "*.elc"
-    ".cask"
-    ;; Python
-    "*.pyc")
-  "List of directory/file patterns to not descend into when listing files in `find-file-in-project'.")
-
-(defvar ffip-find-options ""
-  "Extra options to pass to `find' when using `find-file-in-project'.
-
-Use this to exclude portions of your project: \"-not -regex \\\".*svn.*\\\"\".")
-
-(defvar ffip-project-root nil
-  "If non-nil, overrides the project root directory location.")
-
-(defvar ffip-project-root-function nil
-  "If non-nil, this function is called to determine the project root.
-
-This overrides variable `ffip-project-root' when set.")
-
-(defvar ffip-limit 0
-  "Limit results to this many files. 0 means no limit")
-
-(defvar ffip-full-paths t
-  "If non-nil, show fully project-relative paths.")
-
-(defvar ffip-debug nil "Print debug information")
-
-(defun ffip-project-root ()
-  "Return the root of the project."
-  (let ((project-root (or ffip-project-root
-                          (if (functionp ffip-project-root-function)
-                              (funcall ffip-project-root-function)
-                            (if (listp ffip-project-file)
-                                (some (apply-partially 'locate-dominating-file
-                                                       default-directory)
-                                      ffip-project-file)
-                              (locate-dominating-file default-directory
-                                                      ffip-project-file))))))
-    (or project-root
-        (progn (message "No project was defined for the current file.")
-               nil))))
-
-(defun ffip--guess-gnu-find ()
-  (let ((rlt "find"))
-    (if (eq system-type 'windows-nt)
-        (cond
-         ((executable-find "c:\\\\cygwin64\\\\bin\\\\find")
-          (setq rlt "c:\\\\cygwin64\\\\bin\\\\find"))
-         ((executable-find "d:\\\\cygwin64\\\\bin\\\\find")
-          (setq rlt "d:\\\\cygwin64\\\\bin\\\\find"))
-         ((executable-find "e:\\\\cygwin64\\\\bin\\\\find")
-          (setq rlt "e:\\\\cygwin64\\\\bin\\\\find"))
-         ((executable-find "c:\\\\cygwin\\\\bin\\\\find")
-          (setq rlt "c:\\\\cygwin\\\\bin\\\\find"))
-         ((executable-find "d:\\\\cygwin\\\\bin\\\\find")
-          (setq rlt "d:\\\\cygwin\\\\bin\\\\find"))
-         ((executable-find "e:\\\\cygwin\\\\bin\\\\find")
-          (setq rlt "e:\\\\cygwin\\\\bin\\\\find"))))
-    rlt))
-
-(defun ffip-join-patterns ()
-  "Turn `ffip-patterns' into a string that `find' can use."
-  (if ffip-patterns
-      (format "\\( %s \\)"
-              (mapconcat (lambda (pat) (format "-name \"%s\"" pat))
-                         ffip-patterns " -or "))
-    ""))
-
-(defun ffip-prune-patterns ()
-  "Turn `ffip-prune-patterns' into a string that `find' can use."
-  (mapconcat (lambda (pat) (format "-name \"%s\"" pat))
-             ffip-prune-patterns " -or "))
-
-(defun ffip-limit-find-results ()
-  (let ((rlt ""))
-    (if (and (executable-find "head") (> ffip-limit 0))
-        (setq rlt (format " | head -n %d" ffip-limit)))
-    rlt))
-
-(defun ffip-completing-read (prompt collection)
-  (let (rlt)
-    (cond
-     ( (= 1 (length collection))
-       ;; open file directly
-       (setq rlt (car collection)))
-     ((fboundp 'ivy-read)
-      (setq rlt (ivy-read prompt collection)))
-     ((and (boundp 'ido-mode) ido-mode)
-      (setq rlt (ido-completing-read prompt collection)))
-     (t
-      (setq rlt (completing-read prompt collection))))
-    rlt))
-
-(defun ffip-project-files (keyword NUM)
-  "Return an alist of all filenames in the project and their path.
-
-Files with duplicate filenames are suffixed with the name of the
-directory they are found in so that they are unique."
-  (let (rlt
-        cmd
-        (old-default-directory default-directory)
-        (file-alist nil)
-        (root (expand-file-name (or ffip-project-root (ffip-project-root)
-                                    (error "No project root found")))))
-    (cd (file-name-as-directory root))
-    ;; make the prune pattern more general
-    (setq cmd (format "%s . \\( %s \\) -prune -o -type f %s %s %s %s -print %s"
-                      (if ffip-find-executable ffip-find-executable (ffip--guess-gnu-find))
-                      (ffip-prune-patterns)
-                      (ffip-join-patterns)
-                      (if keyword (concat "-name \"*" keyword "*\"") "")
-                      (if (and NUM (> NUM 0)) (format "-mtime -%d" NUM) "")
-                      ffip-find-options
-                      (ffip-limit-find-results)))
-
-    (if ffip-debug (message "run cmd at %s: %s" default-directory cmd))
-    (setq rlt
-          (mapcar (lambda (file)
-                    (if ffip-full-paths
-                        (cons (replace-regexp-in-string "^\./" "" file)
-                              (expand-file-name file))
-                      (let ((file-cons (cons (file-name-nondirectory file)
-                                             (expand-file-name file))))
-                        (add-to-list 'file-alist file-cons)
-                        file-cons)))
-                  ;; #15 improving handling of directories containing space
-                  (split-string (shell-command-to-string cmd) "[\r\n]+" t)))
-
-    ;; restore the original default-directory
-    (cd old-default-directory)
-    rlt))
-
-(defun ffip-find-files (keyword NUM)
-  (let* ((project-files (ffip-project-files keyword NUM))
-         (files (mapcar 'car project-files))
-         file root)
-    (cond
-     ((and files (> (length files) 0))
-      (setq root (file-name-nondirectory (directory-file-name (or ffip-project-root (ffip-project-root)))))
-      (setq file (ffip-completing-read (format "Find file in %s/: " root)  files))
-      (find-file (cdr (assoc file project-files))))
-     (t (message "No match file exist!")))
-    ))
-
-;;;###autoload
-(defun ffip-current-full-filename-match-pattern-p (REGEX)
-  "Is current full file name (including directory) match the REGEX?"
-  (let ((dir (if (buffer-file-name) (buffer-file-name) "")))
-    (string-match-p REGEX dir)))
-
-;;;###autoload
-(defun find-file-in-project (&optional NUM)
-  "Prompt with a completing list of all files in the project to find one.
-If NUM is given, only files modfied NUM days before will be selected.
-
-The project's scope is defined as the first directory containing
-a `ffip-project-file' (It's value is \".git\" by default.
-
-You can override this by setting the variable `ffip-project-root'."
-
-  (interactive "P")
-  (ffip-find-files nil NUM))
-
-;;;###autoload
-(defun ffip-get-project-root-directory ()
-  "Get the full path of project root directory"
-  (expand-file-name (or ffip-project-root
-                        (ffip-project-root))))
-
-;;;###autoload
-(defun find-file-in-project-by-selected (&optional NUM)
-  "Similar to find-file-in-project.
-But use string from selected region to search files in the project.
-If no region is selected, you need provide one.
-If NUM is given, only files modfied NUM days before will be selected.
-"
-  (interactive "P")
-  (let ((keyword (if (region-active-p)
-                     (buffer-substring-no-properties (region-beginning) (region-end))
-                   (read-string "Enter keyword:"))))
-    (ffip-find-files keyword NUM)))
-
-;;;###autoload
-(defalias 'ffip 'find-file-in-project)
-
-;; safe locals
-;;;###autoload
-(progn
-  (put 'ffip-patterns 'safe-local-variable 'listp)
-  (put 'ffip-project-file 'safe-local-variable 'stringp)
-  (put 'ffip-project-root 'safe-local-variable 'stringp)
-  (put 'ffip-limit 'safe-local-variable 'integerp))
-
-(provide 'find-file-in-project)
-;;; find-file-in-project.el ends here
diff --git a/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project-autoloads.el b/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project-autoloads.el
new file mode 100644
index 0000000..05ff8b0
--- /dev/null
+++ b/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project-autoloads.el
@@ -0,0 +1,100 @@
+;;; find-file-in-project-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "find-file-in-project" "find-file-in-project.el"
+;;;;;;  (22171 46573 0 0))
+;;; Generated autoloads from find-file-in-project.el
+
+(autoload 'ffip-project-root "find-file-in-project" "\
+Return the root of the project.
+
+\(fn)" nil nil)
+
+(autoload 'ffip-filename-identity "find-file-in-project" "\
+Return identical KEYWORD.
+
+\(fn KEYWORD)" nil nil)
+
+(autoload 'ffip-filename-camelcase-to-dashes "find-file-in-project" "\
+Convert KEYWORD from camel cased to dash seperated.
+If CHECK-ONLY is true, only do the check.
+
+\(fn KEYWORD &optional CHECK-ONLY)" nil nil)
+
+(autoload 'ffip-filename-dashes-to-camelcase "find-file-in-project" "\
+Convert KEYWORD from dash seperated to camel cased.
+If CHECK-ONLY is true, only do the check.
+
+\(fn KEYWORD &optional CHECK-ONLY)" nil nil)
+
+(autoload 'ffip-create-project-file "find-file-in-project" "\
+Create .dir-locals.el to setup find-file-in-project per directory.
+Modify and place .dir-locals.el to your project root.
+See (info \"(Emacs) Directory Variables\") for details.
+
+\(fn)" t nil)
+
+(autoload 'ffip-current-full-filename-match-pattern-p "find-file-in-project" "\
+Is current full file name (including directory) match the REGEX?
+
+\(fn REGEX)" nil nil)
+
+(autoload 'find-file-in-project "find-file-in-project" "\
+Prompt with a completing list of all files in the project to find one.
+
+If OPEN-ANOTHER-WINDOW is not nil, the file will be opened in new window.
+
+The project's scope is defined as the first directory containing
+a `ffip-project-file' (It's value is \".git\" by default.
+
+You can override this by setting the variable `ffip-project-root'.
+
+\(fn &optional OPEN-ANOTHER-WINDOW)" t nil)
+
+(autoload 'ffip-get-project-root-directory "find-file-in-project" "\
+Get the full path of project root directory.
+
+\(fn)" nil nil)
+
+(autoload 'find-file-in-project-by-selected "find-file-in-project" "\
+Similar to `find-file-in-project'.
+But use string from selected region to search files in the project.
+If no region is selected, you need provide keyword.
+
+Keyword could be ANY part of the file's full path and support wildcard.
+For example, to find /home/john/proj1/test.js, below keywords are valid:
+- test.js
+- roj1/tes
+- john*test
+
+If OPEN-ANOTHER-WINDOW is not nil, the file will be opened in new window.
+
+\(fn &optional OPEN-ANOTHER-WINDOW)" t nil)
+
+(autoload 'find-directory-in-project-by-selected "find-file-in-project" "\
+Similar to `find-file-in-project-by-selected'.
+Use string from selected region to find directory in the project.
+If no region is selected, you need provide keyword.
+
+Keyword could be directory's base-name only or parent-directoy+base-name
+For example, to find /home/john/proj1/test, below keywords are valid:
+- test
+- roj1/test
+- john*test
+
+If OPEN-ANOTHER-WINDOW is not nil, the file will be opened in new window.
+
+\(fn &optional OPEN-ANOTHER-WINDOW)" t nil)
+
+(defalias 'ffip 'find-file-in-project)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; find-file-in-project-autoloads.el ends here
diff --git a/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project-pkg.el b/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project-pkg.el
new file mode 100644
index 0000000..bac5156
--- /dev/null
+++ b/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project-pkg.el
@@ -0,0 +1 @@
+(define-package "find-file-in-project" "20151216.1850" "Find files in a project quickly, on any OS" '((swiper "0.7.0") (emacs "24.3")) :url "https://github.com/technomancy/find-file-in-project" :keywords '("project" "convenience"))
diff --git a/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project.el b/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project.el
new file mode 100644
index 0000000..69d47f9
--- /dev/null
+++ b/emacs.d/elpa/find-file-in-project-20151216.1850/find-file-in-project.el
@@ -0,0 +1,512 @@
+;;; find-file-in-project.el --- Find files in a project quickly, on any OS
+
+;; Copyright (C) 2006-2009, 2011-2012, 2015
+;;   Phil Hagelberg, Doug Alcorn, and Will Farrington
+;;
+;; Version: 4.5
+;; Package-Version: 20151216.1850
+;; Author: Phil Hagelberg, Doug Alcorn, and Will Farrington
+;; Maintainer: Chen Bin <chenbin.sh@gmail.com>
+;; URL: https://github.com/technomancy/find-file-in-project
+;; Package-Requires: ((swiper "0.7.0") (emacs "24.3"))
+;; Created: 2008-03-18
+;; Keywords: project, convenience
+;; EmacsWiki: FindFileInProject
+
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This program provides a couple methods for quickly finding any file
+;; in a given project.  It depends on GNU find.
+;;
+;; Usage,
+;;   - `M-x find-file-in-project-by-selected' use the selected region
+;;      as the keyword to search file.  Or you need provide the keyword
+;;      if no region selected.
+;;   - `M-x find-directory-in-project-by-selected' use the select region
+;;      to find directory.  Or you need provide the keyword if no region
+;;      selected.
+;;   - `M-x find-file-in-project' will start search file immediately
+;;   - `M-x ffip-create-project-file' create .dir-locals.el
+;;
+;; A project is found by searching up the directory tree until a file
+;; is found that matches `ffip-project-file'.
+;; You can set `ffip-project-root-function' to provide an alternate
+;; function to search for the project root.  By default, it looks only
+;; for files whose names match `ffip-patterns',
+
+;; If you have so many files that it becomes unwieldy, you can set
+;; `ffip-find-options' to a string which will be passed to the `find'
+;; invocation in order to exclude irrelevant subdirectories/files.
+;; For instance, in a Ruby on Rails project, you are interested in all
+;; .rb files that don't exist in the "vendor" directory.  In that case
+;; you could set `ffip-find-options' to "-not -regex \".*vendor.*\"".
+
+;; The variable `ffip-filename-rules' create some extra file names for
+;; search when calling `find-file-in-project-by-selected'. For example,
+;; When file basename `helloWorld' provided, `HelloWorld', `hello-world'
+;; are added as the file name search patterns.
+;; `C-h v ffip-filename-rules' to see its default value.
+
+;; All these variables may be overridden on a per-directory basis in
+;; your .dir-locals.el.  See (info "(Emacs) Directory Variables") for
+;; details.
+
+;; ivy-mode is used for filter/search UI
+;; In ivy-mode, SPACE is translated to regex ".*".
+;; For example, the search string "dec fun pro" is transformed into
+;; a regex "\\(dec\\).*\\(fun\\).*\\(pro\\)"
+;; `C-h i g (ivy)' for more key-binding tips.
+;;
+;; You switch to ido-mode by `(setq ffip-prefer-ido-mode t)'
+
+;; GNU Find can be installed,
+;;   - through `brew' on OS X
+;;   - through `cygwin' on Windows.
+;;
+;; This program works on Windows/Cygwin/Linux/Mac Emacs.
+;;
+;; Windows setup is as easy as installing Cygwin into default directory on
+;; ANY driver. That's all.
+;;
+;; See https://github.com/technomancy/find-file-in-project for advanced tips
+
+;; Recommended binding: (global-set-key (kbd "C-x f") 'find-file-in-project)
+
+;;; Code:
+
+(require 'ivy)
+
+(defvar ffip-filename-rules
+  '(ffip-filename-identity
+    (ffip-filename-dashes-to-camelcase ffip-filename-camelcase-to-dashes)))
+
+(defvar ffip-find-executable nil "Path of GNU find.  If nil, we will find `find' path automatically.")
+
+(defvar ffip-project-file '(".svn" ".git" ".hg")
+  "The file that should be used to define a project root.
+May be set using .dir-locals.el.  Checks each entry if set to a list.")
+
+(defvar ffip-prefer-ido-mode nil
+  "Use `ido-mode' instead of `ivy-mode' for displaying candidates.")
+
+(defvar ffip-patterns nil
+  "List of patterns to look for with `find-file-in-project'.")
+
+(defvar ffip-match-path-instead-of-filename nil
+  "Match full path instead of file name when calling `find-file-in-project-by-selected'")
+
+(defvar ffip-prune-patterns
+  '(;; VCS
+    "*/.git/*"
+    "*/.svn/*"
+    "*/.cvs/*"
+    "*/.bzr/*"
+    "*/.hg/*"
+    ;; project misc
+    "*.log"
+    "*/bin/*"
+    ;; Mac
+    "*/.DS_Store/*"
+    ;; Ctags
+    "*/tags"
+    "*/TAGS"
+    ;; Global/Cscope
+    "*/GTAGS"
+    "*/GPATH"
+    "*/GRTAGS"
+    "*/cscope.files"
+    ;; html/javascript/css
+    "*/.npm/*"
+    "*/.idea/*"
+    "*min.js"
+    "*min.css"
+    "*/node_modules/*"
+    "*/bower_components/*"
+    ;; Images
+    "*.png"
+    "*.jpg"
+    "*.jpeg"
+    "*.gif"
+    "*.bmp"
+    "*.tiff"
+    ;; documents
+    "*.doc"
+    "*.docx"
+    "*.pdf"
+    ;; C/C++
+    "*.obj"
+    "*.o"
+    "*.a"
+    "*.dylib"
+    "*.lib"
+    "*.d"
+    "*.dll"
+    "*.exe"
+    ;; Java
+    "*/.metadata*"
+    "*/.gradle/*"
+    "*.class"
+    "*.war"
+    "*.jar"
+    ;; Emacs/Vim
+    "*flymake"
+    "*/#*#"
+    ".#*"
+    "*.swp"
+    "*~"
+    "*.elc"
+    "*/.cask/*"
+    ;; Python
+    "*.pyc")
+  "List of directory/file patterns to not descend into when listing files in `find-file-in-project'.")
+
+(defvar ffip-find-options ""
+  "Extra options to pass to `find' when using `find-file-in-project'.
+
+Use this to exclude portions of your project: \"-not -regex \\\".*svn.*\\\"\".")
+
+(defvar ffip-project-root nil
+  "If non-nil, overrides the project root directory location.")
+
+(defvar ffip-project-root-function nil
+  "If non-nil, this function is called to determine the project root.
+
+This overrides variable `ffip-project-root' when set.")
+
+(defvar ffip-full-paths t
+  "If non-nil, show fully project-relative paths.")
+
+(defvar ffip-debug nil "Print debug information.")
+
+;;;###autoload
+(defun ffip-project-root ()
+  "Return the root of the project."
+  (let ((project-root (or ffip-project-root
+                          (if (functionp ffip-project-root-function)
+                              (funcall ffip-project-root-function)
+                            (if (listp ffip-project-file)
+                                (cl-some (apply-partially 'locate-dominating-file
+                                                       default-directory)
+                                      ffip-project-file)
+                              (locate-dominating-file default-directory
+                                                      ffip-project-file))))))
+    (or project-root
+        (progn (message "No project was defined for the current file.")
+               nil))))
+
+(defun ffip--find-rule-to-execute (keyword f)
+  "If F is a function, return it.
+
+If F is a list, assume each element is a function.
+Run each element with keyword as 1st parameter as KEYWORD and 2nd parameter as t.
+If the result is true, return the function."
+  (let (rlt found fn)
+    (cond
+     ((functionp f) (setq rlt f))
+
+     ((listp f)
+      (while (and f (not found))
+        (setq fn (car f))
+        (if (funcall fn keyword t)
+            (setq found t)
+          (setq f (cdr f))))
+      (setq rlt (if found fn 'identity)))
+
+     (t (setq rlt 'identity)))
+
+    rlt))
+
+
+;;;###autoload
+(defun ffip-filename-identity (keyword)
+  "Return identical KEYWORD."
+  keyword)
+
+;;;###autoload
+(defun ffip-filename-camelcase-to-dashes (keyword &optional check-only)
+  "Convert KEYWORD from camel cased to dash seperated.
+If CHECK-ONLY is true, only do the check."
+  (let (rlt
+        (old-flag case-fold-search))
+    (cond
+     (check-only
+      (setq rlt (string-match "^[a-z0-9]+[A-Z][A-Za-z0-9]+$" keyword))
+      (if ffip-debug (message "ffip-filename-camelcase-to-dashes called. check-only keyword=%s rlt=%s" keyword rlt)))
+     (t
+      (setq case-fold-search nil)
+      ;; case sensitive replace
+      (setq rlt (downcase (replace-regexp-in-string "\\([a-z]\\)\\([A-Z]\\)" "\\1-\\2" keyword)))
+      (setq case-fold-search old-flag)
+
+      (if (string= rlt (downcase keyword)) (setq rlt nil))
+
+      (if (and rlt ffip-debug)
+          (message "ffip-filename-camelcase-to-dashes called. rlt=%s" rlt))))
+    rlt))
+
+;;;###autoload
+(defun ffip-filename-dashes-to-camelcase (keyword &optional check-only)
+  "Convert KEYWORD from dash seperated to camel cased.
+If CHECK-ONLY is true, only do the check."
+  (let (rlt)
+    (cond
+     (check-only
+        (setq rlt (string-match "^[A-Za-z0-9]+\\(-[A-Za-z0-9]+\\)+$" keyword))
+        (if ffip-debug (message "ffip-filename-dashes-to-camelcase called. check-only keyword=%s rlt=%s" keyword rlt)))
+     (t
+      (setq rlt (mapconcat (lambda (s) (capitalize s)) (split-string keyword "-") ""))
+
+      (let ((first-char (substring rlt 0 1)))
+       (setq rlt (concat "[" first-char (downcase first-char) "]" (substring rlt 1))))
+      (if (and rlt ffip-debug)
+          (message "ffip-filename-dashes-to-camelcase called. rlt=%s" rlt))))
+    rlt))
+
+(defun ffip--create-filename-pattern-for-gnufind (keyword)
+  (let ((rlt ""))
+    (cond
+     ((not keyword)
+      (setq rlt ""))
+     ((not ffip-filename-rules)
+      (setq rlt (concat (if ffip-match-path-instead-of-filename "-iwholename" "-name")
+                        " \"*"
+                        keyword
+                        "*\"" )))
+     (t
+      (dolist (f ffip-filename-rules rlt)
+        (let (tmp fn)
+          (setq fn (ffip--find-rule-to-execute keyword f))
+          (setq tmp (funcall fn keyword))
+          (when tmp
+            (setq rlt (concat rlt (unless (string= rlt "") " -o")
+                              " "
+                              (if ffip-match-path-instead-of-filename "-iwholename" "-name")
+                              " \"*"
+                              tmp
+                              "*\"")))))
+      (unless (string= "" rlt)
+        (setq rlt (concat "\\(" rlt " \\)")))
+      ))
+    (if ffip-debug (message "ffip--create-filename-pattern-for-gnufind called. rlt=%s" rlt))
+    rlt))
+
+(defun ffip--guess-gnu-find ()
+  (let ((rlt "find"))
+    (if (eq system-type 'windows-nt)
+        (cond
+         ((executable-find "c:\\\\cygwin64\\\\bin\\\\find")
+          (setq rlt "c:\\\\cygwin64\\\\bin\\\\find"))
+         ((executable-find "d:\\\\cygwin64\\\\bin\\\\find")
+          (setq rlt "d:\\\\cygwin64\\\\bin\\\\find"))
+         ((executable-find "e:\\\\cygwin64\\\\bin\\\\find")
+          (setq rlt "e:\\\\cygwin64\\\\bin\\\\find"))
+         ((executable-find "c:\\\\cygwin\\\\bin\\\\find")
+          (setq rlt "c:\\\\cygwin\\\\bin\\\\find"))
+         ((executable-find "d:\\\\cygwin\\\\bin\\\\find")
+          (setq rlt "d:\\\\cygwin\\\\bin\\\\find"))
+         ((executable-find "e:\\\\cygwin\\\\bin\\\\find")
+          (setq rlt "e:\\\\cygwin\\\\bin\\\\find"))))
+    rlt))
+
+(defun ffip--join-patterns (patterns)
+  "Turn `ffip-patterns' into a string that `find' can use."
+  (if ffip-patterns
+      (format "\\( %s \\)" (mapconcat (lambda (pat) (format "-iwholename \"%s\"" pat))
+                         patterns " -or "))
+    ""))
+
+(defun ffip--prune-patterns ()
+  "Turn `ffip-prune-patterns' into a string that `find' can use."
+  (mapconcat (lambda (pat) (format "-iwholename \"%s\"" pat))
+             ffip-prune-patterns " -or "))
+
+(defun ffip-completing-read (prompt collection action)
+  (cond
+    ((= 1 (length collection))
+     ;; open file directly
+     (funcall action (car collection)))
+    ;; support ido-mode
+    ((and ffip-prefer-ido-mode (boundp 'ido-mode) ido-mode)
+     (funcall action (ido-completing-read prompt collection)))
+    (t
+     (ivy-read prompt collection
+               :action action))))
+
+(defun ffip-project-search (keyword find-directory)
+  "Return an alist of all filenames in the project and their path.
+
+Files with duplicate filenames are suffixed with the name of the
+directory they are found in so that they are unique."
+  (let (rlt
+        cmd
+        (old-default-directory default-directory)
+        (file-alist nil)
+        (root (expand-file-name (or ffip-project-root (ffip-project-root)
+                                    (error "No project root found")))))
+    (cd (file-name-as-directory root))
+    ;; make the prune pattern more general
+    (setq cmd (format "%s . \\( %s \\) -prune -o -type %s %s %s %s -print"
+                      (if ffip-find-executable ffip-find-executable (ffip--guess-gnu-find))
+                      (ffip--prune-patterns)
+                      (if find-directory "d" "f")
+                      (ffip--join-patterns ffip-patterns)
+                      ;; When finding directory, the keyword is like:
+                      ;; "proj/hello/world"
+                      (if find-directory (format "-iwholename \"*%s\"" keyword)
+                          (ffip--create-filename-pattern-for-gnufind keyword))
+                      ffip-find-options))
+
+    (if ffip-debug (message "run cmd at %s: %s" default-directory cmd))
+    (setq rlt
+          (mapcar (lambda (file)
+                    (if ffip-full-paths
+                        (cons (replace-regexp-in-string "^\./" "" file)
+                              (expand-file-name file))
+                      (let ((file-cons (cons (file-name-nondirectory file)
+                                             (expand-file-name file))))
+                        (add-to-list 'file-alist file-cons)
+                        file-cons)))
+                  ;; #15 improving handling of directories containing space
+                  (split-string (shell-command-to-string cmd) "[\r\n]+" t)))
+
+    ;; restore the original default-directory
+    (cd old-default-directory)
+    rlt))
+
+(defun ffip-find-files (keyword open-another-window &optional find-directory)
+  (let* ((project-files (ffip-project-search keyword find-directory))
+         (files (mapcar 'car project-files))
+         file root)
+    (if (> (length files) 0)
+        (progn
+          (setq root (file-name-nondirectory
+                      (directory-file-name
+                       (or ffip-project-root (ffip-project-root)))))
+          (ffip-completing-read
+           (format "Find in %s/: " root)
+           files
+           (lambda (file)
+             (let ((rlt (cdr (assoc file project-files))))
+               (if find-directory
+                   ;; open dired because this rlt is a directory
+                   (if open-another-window
+                       (dired-other-window rlt)
+                     (switch-to-buffer (dired rlt)))
+                 (if open-another-window
+                     (find-file-other-window rlt)
+                   (find-file rlt)))))))
+      (message "Nothing found!"))))
+
+;;;###autoload
+(defun ffip-create-project-file ()
+  "Create .dir-locals.el to setup find-file-in-project per directory.
+Modify and place .dir-locals.el to your project root.
+See (info \"(Emacs) Directory Variables\") for details."
+  (interactive)
+  (let ((file (concat (file-name-as-directory default-directory) ".dir-locals.el")))
+    (with-temp-file file
+      (insert (concat ";; Generated by find-file-in-project.\n"
+                      "((nil . ((ffip-project-root . \"" default-directory "\")\n"
+                      ";;       (ffip-find-options . \"-not -size +64k\")\n"
+                      ";;       (ffip-patterns . (\"*.html\" \"*.js\" \"*.css\" \"*.java\" \"*.el\" \"*.js\"))\n"
+                      ";;       (ffip-prune-patterns . (\"*/.git/*\" \"*/node_modules/*\" \"*/index.js\"))\n"
+                      "         )))")))
+    (message "%s created." file)))
+
+;;;###autoload
+(defun ffip-current-full-filename-match-pattern-p (regex)
+  "Is current full file name (including directory) match the REGEX?"
+  (let ((dir (if (buffer-file-name) (buffer-file-name) "")))
+    (string-match-p regex dir)))
+
+;;;###autoload
+(defun find-file-in-project (&optional open-another-window)
+  "Prompt with a completing list of all files in the project to find one.
+
+If OPEN-ANOTHER-WINDOW is not nil, the file will be opened in new window.
+
+The project's scope is defined as the first directory containing
+a `ffip-project-file' (It's value is \".git\" by default.
+
+You can override this by setting the variable `ffip-project-root'."
+
+  (interactive "P")
+  (ffip-find-files nil open-another-window))
+
+;;;###autoload
+(defun ffip-get-project-root-directory ()
+  "Get the full path of project root directory."
+  (expand-file-name (or ffip-project-root
+                        (ffip-project-root))))
+
+;;;###autoload
+(defun find-file-in-project-by-selected (&optional open-another-window)
+  "Similar to `find-file-in-project'.
+But use string from selected region to search files in the project.
+If no region is selected, you need provide keyword.
+
+Keyword could be ANY part of the file's full path and support wildcard.
+For example, to find /home/john/proj1/test.js, below keywords are valid:
+- test.js
+- roj1/tes
+- john*test
+
+If OPEN-ANOTHER-WINDOW is not nil, the file will be opened in new window."
+  (interactive "P")
+  (let ((keyword (if (region-active-p)
+                     (buffer-substring-no-properties (region-beginning) (region-end))
+                   (read-string "Enter keyword:"))))
+    (ffip-find-files keyword open-another-window)))
+
+;;;###autoload
+(defun find-directory-in-project-by-selected (&optional open-another-window)
+  "Similar to `find-file-in-project-by-selected'.
+Use string from selected region to find directory in the project.
+If no region is selected, you need provide keyword.
+
+Keyword could be directory's base-name only or parent-directoy+base-name
+For example, to find /home/john/proj1/test, below keywords are valid:
+- test
+- roj1/test
+- john*test
+
+If OPEN-ANOTHER-WINDOW is not nil, the file will be opened in new window."
+  (interactive "P")
+  (let ((keyword (if (region-active-p)
+                     (buffer-substring-no-properties (region-beginning) (region-end))
+                   (read-string "Enter keyword:"))))
+    (ffip-find-files keyword open-another-window t)))
+
+;;;###autoload
+(defalias 'ffip 'find-file-in-project)
+
+;; safe locals
+(progn
+  (put 'ffip-patterns 'safe-local-variable 'listp)
+  (put 'ffip-prune-patterns 'safe-local-variable 'listp)
+  (put 'ffip-filename-rules 'safe-local-variable 'listp)
+  (put 'ffip-match-path-instead-of-filename 'safe-local-variable 'booleanp)
+  (put 'ffip-project-file 'safe-local-variable 'stringp)
+  (put 'ffip-project-root 'safe-local-variable 'stringp))
+
+(provide 'find-file-in-project)
+;;; find-file-in-project.el ends here
diff --git a/emacs.d/elpa/git-gutter-20150501.756/git-gutter-autoloads.el b/emacs.d/elpa/git-gutter-20150501.756/git-gutter-autoloads.el
deleted file mode 100644
index 15ca0a5..0000000
--- a/emacs.d/elpa/git-gutter-20150501.756/git-gutter-autoloads.el
+++ /dev/null
@@ -1,109 +0,0 @@
-;;; git-gutter-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "git-gutter" "git-gutter.el" (21837 24213 0
-;;;;;;  0))
-;;; Generated autoloads from git-gutter.el
-
-(autoload 'git-gutter:linum-setup "git-gutter" "\
-Setup for linum-mode.
-
-\(fn)" nil nil)
-
-(autoload 'git-gutter-mode "git-gutter" "\
-Git-Gutter mode
-
-\(fn &optional ARG)" t nil)
-
-(defvar global-git-gutter-mode nil "\
-Non-nil if Global-Git-Gutter mode is enabled.
-See the command `global-git-gutter-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-git-gutter-mode'.")
-
-(custom-autoload 'global-git-gutter-mode "git-gutter" nil)
-
-(autoload 'global-git-gutter-mode "git-gutter" "\
-Toggle Git-Gutter mode in all buffers.
-With prefix ARG, enable Global-Git-Gutter mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Git-Gutter mode is enabled in all buffers where
-`git-gutter--turn-on' would do it.
-See `git-gutter-mode' for more information on Git-Gutter mode.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'git-gutter:revert-hunk "git-gutter" "\
-Revert current hunk.
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:stage-hunk "git-gutter" "\
-Stage this hunk like 'git add -p'.
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:popup-hunk "git-gutter" "\
-Popup current diff hunk.
-
-\(fn &optional DIFFINFO)" t nil)
-
-(autoload 'git-gutter:next-hunk "git-gutter" "\
-Move to next diff hunk
-
-\(fn ARG)" t nil)
-
-(autoload 'git-gutter:previous-hunk "git-gutter" "\
-Move to previous diff hunk
-
-\(fn ARG)" t nil)
-
-(autoload 'git-gutter "git-gutter" "\
-Show diff information in gutter
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:clear "git-gutter" "\
-Clear diff information in gutter.
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:toggle "git-gutter" "\
-Toggle to show diff information.
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:set-start-revision "git-gutter" "\
-Set start revision. If `start-rev' is nil or empty string then reset
-start revision.
-
-\(fn START-REV)" t nil)
-
-(autoload 'git-gutter:update-all-windows "git-gutter" "\
-Update git-gutter informations for all visible buffers.
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:start-update-timer "git-gutter" "\
-
-
-\(fn)" t nil)
-
-(autoload 'git-gutter:cancel-update-timer "git-gutter" "\
-
-
-\(fn)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; git-gutter-autoloads.el ends here
diff --git a/emacs.d/elpa/git-gutter-20150501.756/git-gutter-pkg.el b/emacs.d/elpa/git-gutter-20150501.756/git-gutter-pkg.el
deleted file mode 100644
index 2a5d6d4..0000000
--- a/emacs.d/elpa/git-gutter-20150501.756/git-gutter-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "git-gutter" "20150501.756" "Port of Sublime Text plugin GitGutter" '((cl-lib "0.5") (emacs "24")) :url "https://github.com/syohex/emacs-git-gutter")
diff --git a/emacs.d/elpa/git-gutter-20150501.756/git-gutter.el b/emacs.d/elpa/git-gutter-20150501.756/git-gutter.el
deleted file mode 100644
index 2de54c7..0000000
--- a/emacs.d/elpa/git-gutter-20150501.756/git-gutter.el
+++ /dev/null
@@ -1,1030 +0,0 @@
-;;; git-gutter.el --- Port of Sublime Text plugin GitGutter -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2015 by Syohei YOSHIDA
-
-;; Author: Syohei YOSHIDA <syohex@gmail.com>
-;; URL: https://github.com/syohex/emacs-git-gutter
-;; Package-Version: 20150501.756
-;; Version: 0.83
-;; Package-Requires: ((cl-lib "0.5") (emacs "24"))
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Port of GitGutter which is a plugin of Sublime Text
-
-;;; Code:
-
-(require 'cl-lib)
-
-(defgroup git-gutter nil
-  "Port GitGutter"
-  :prefix "git-gutter:"
-  :group 'vc)
-
-(defcustom git-gutter:window-width nil
-  "Character width of gutter window. Emacs mistakes width of some characters.
-It is better to explicitly assign width to this variable, if you use full-width
-character for signs of changes"
-  :type 'integer
-  :group 'git-gutter)
-
-(defcustom git-gutter:diff-option ""
-  "Option of 'git diff'"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:subversion-diff-option ""
-  "Option of 'svn diff'"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:mercurial-diff-option ""
-  "Option of 'hg diff'"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:bazaar-diff-option ""
-  "Option of 'bzr diff'"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:update-commands
-  '(ido-switch-buffer helm-buffers-list)
-  "Each command of this list is executed, gutter information is updated."
-  :type '(list (function :tag "Update command")
-               (repeat :inline t (function :tag "Update command")))
-  :group 'git-gutter)
-
-(defcustom git-gutter:update-windows-commands
-  '(kill-buffer ido-kill-buffer)
-  "Each command of this list is executed, gutter information is updated and
-gutter information of other windows."
-  :type '(list (function :tag "Update command")
-               (repeat :inline t (function :tag "Update command")))
-  :group 'git-gutter)
-
-(defcustom git-gutter:update-hooks
-  '(after-save-hook after-revert-hook find-file-hook after-change-major-mode-hook
-    text-scale-mode-hook magit-revert-buffer-hook)
-  "hook points of updating gutter"
-  :type '(list (hook :tag "HookPoint")
-               (repeat :inline t (hook :tag "HookPoint")))
-  :group 'git-gutter)
-
-(defcustom git-gutter:always-show-separator nil
-  "Show separator even if there are no changes."
-  :type 'boolean
-  :group 'git-gutter)
-
-(defcustom git-gutter:separator-sign nil
-  "Separator sign"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:modified-sign "="
-  "Modified sign"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:added-sign "+"
-  "Added sign"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:deleted-sign "-"
-  "Deleted sign"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:unchanged-sign nil
-  "Unchanged sign"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:hide-gutter nil
-  "Hide gutter if there are no changes"
-  :type 'boolean
-  :group 'git-gutter)
-
-(defcustom git-gutter:lighter " GitGutter"
-  "Minor mode lighter in mode-line"
-  :type 'string
-  :group 'git-gutter)
-
-(defcustom git-gutter:verbosity 0
-  "Log/message level. 4 means all, 0 nothing."
-  :type 'integer
-  :group 'git-gutter)
-
-(defface git-gutter:separator
-  '((t (:foreground "cyan" :weight bold)))
-  "Face of separator"
-  :group 'git-gutter)
-
-(defface git-gutter:modified
-  '((t (:foreground "magenta" :weight bold)))
-  "Face of modified"
-  :group 'git-gutter)
-
-(defface git-gutter:added
-  '((t (:foreground "green" :weight bold)))
-  "Face of added"
-  :group 'git-gutter)
-
-(defface git-gutter:deleted
-  '((t (:foreground "red" :weight bold)))
-  "Face of deleted"
-  :group 'git-gutter)
-
-(defface git-gutter:unchanged
-  '((t (:background "yellow")))
-  "Face of unchanged"
-  :group 'git-gutter)
-
-(defcustom git-gutter:disabled-modes nil
-  "A list of modes which `global-git-gutter-mode' should be disabled."
-  :type '(repeat symbol)
-  :group 'git-gutter)
-
-(defcustom git-gutter:handled-backends '(git)
-  "List of version control backends for which `git-gutter.el` will be used.
-`git', `svn', `hg', and `bzr' are supported."
-  :type '(repeat symbol)
-  :group 'git-gutter)
-
-(defvar git-gutter:view-diff-function 'git-gutter:view-diff-infos
-  "Function of viewing changes")
-
-(defvar git-gutter:clear-function 'git-gutter:clear-diff-infos
-  "Function of clear changes")
-
-(defvar git-gutter:init-function 'nil
-  "Function of initialize")
-
-(defcustom git-gutter-mode-on-hook nil
-  "Hook run when git-gutter mode enable"
-  :type 'hook
-  :group 'git-gutter)
-
-(defcustom git-gutter-mode-off-hook nil
-  "Hook run when git-gutter mode disable"
-  :type 'hook
-  :group 'git-gutter)
-
-(defcustom git-gutter:update-interval 0
-  "Time interval in seconds for updating diff information."
-  :type 'integer
-  :group 'git-gutter)
-
-(defvar git-gutter:enabled nil)
-(defvar git-gutter:toggle-flag t)
-(defvar git-gutter:force nil)
-(defvar git-gutter:diffinfos nil)
-(defvar git-gutter:has-indirect-buffers nil)
-(defvar git-gutter:real-this-command nil)
-(defvar git-gutter:linum-enabled nil)
-(defvar git-gutter:linum-prev-window-margin nil)
-(defvar git-gutter:vcs-type nil)
-(defvar git-gutter:start-revision nil)
-(defvar git-gutter:revision-history nil)
-(defvar git-gutter:update-timer nil)
-(defvar git-gutter:last-sha1 nil)
-
-(defvar git-gutter:popup-buffer "*git-gutter:diff*")
-(defvar git-gutter:ignore-commands
-  '(minibuffer-complete-and-exit
-    exit-minibuffer
-    ido-exit-minibuffer
-    helm-maybe-exit-minibuffer
-    helm-confirm-and-exit-minibuffer))
-
-(defmacro git-gutter:awhen (test &rest body)
-  "Anaphoric when."
-  (declare (indent 1))
-  `(let ((it ,test))
-     (when it ,@body)))
-
-(defsubst git-gutter:execute-command (cmd output &rest args)
-  (apply 'process-file cmd nil output nil args))
-
-(defun git-gutter:in-git-repository-p ()
-  (when (executable-find "git")
-    (with-temp-buffer
-      (when (zerop (git-gutter:execute-command "git" t "rev-parse" "--is-inside-work-tree"))
-        (goto-char (point-min))
-        (string= "true" (buffer-substring-no-properties
-                         (point) (line-end-position)))))))
-
-(defun git-gutter:in-svn-repository-p ()
-  (and (executable-find "svn")
-       (locate-dominating-file default-directory ".svn")
-       (zerop (git-gutter:execute-command "svn" nil "info"))
-       (not (string-match-p "/\.svn/" default-directory))))
-
-(defun git-gutter:in-hg-repository-p ()
-  (and (executable-find "hg")
-       (locate-dominating-file default-directory ".hg")
-       (zerop (git-gutter:execute-command "hg" nil "root"))
-       (not (string-match-p "/\.hg/" default-directory))))
-
-(defun git-gutter:in-bzr-repository-p ()
-  (and (executable-find "bzr")
-       (locate-dominating-file default-directory ".bzr")
-       (zerop (git-gutter:execute-command "bzr" nil "root"))
-       (not (string-match-p "/\.bzr/" default-directory))))
-
-(defsubst git-gutter:vcs-check-function (vcs)
-  (cl-case vcs
-    (git 'git-gutter:in-git-repository-p)
-    (svn 'git-gutter:in-svn-repository-p)
-    (hg 'git-gutter:in-hg-repository-p)
-    (bzr 'git-gutter:in-bzr-repository-p)))
-
-(defsubst git-gutter:in-repository-p ()
-  (cl-loop for vcs in git-gutter:handled-backends
-           for check-func = (git-gutter:vcs-check-function vcs)
-           when (funcall check-func)
-           return (set (make-local-variable 'git-gutter:vcs-type) vcs)))
-
-(defsubst git-gutter:changes-to-number (str)
-  (if (string= str "")
-      1
-    (string-to-number str)))
-
-(defsubst git-gutter:make-diffinfo (type content start end)
-  (list :type type :content content :start-line start :end-line end))
-
-(defsubst git-gutter:base-file ()
-  (buffer-file-name (buffer-base-buffer)))
-
-(defun git-gutter:diff-content ()
-  (save-excursion
-    (goto-char (line-beginning-position))
-    (let ((curpoint (point)))
-      (forward-line 1)
-      (if (re-search-forward "^@@" nil t)
-          (backward-char 3) ;; for '@@'
-        (goto-char (point-max)))
-      (buffer-substring curpoint (point)))))
-
-(defun git-gutter:process-diff-output (buf)
-  (when (buffer-live-p buf)
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (cl-loop with regexp = "^@@ -\\(?:[0-9]+\\),?\\([0-9]*\\) \\+\\([0-9]+\\),?\\([0-9]*\\) @@"
-               while (re-search-forward regexp nil t)
-               for new-line  = (string-to-number (match-string 2))
-               for orig-changes = (git-gutter:changes-to-number (match-string 1))
-               for new-changes = (git-gutter:changes-to-number (match-string 3))
-               for type = (cond ((zerop orig-changes) 'added)
-                                ((zerop new-changes) 'deleted)
-                                (t 'modified))
-               for end-line = (if (eq type 'deleted)
-                                  new-line
-                                (1- (+ new-line new-changes)))
-               for content = (git-gutter:diff-content)
-               collect
-               (let ((start (if (zerop new-line) 1 new-line))
-                     (end (if (zerop end-line) 1 end-line)))
-                 (git-gutter:make-diffinfo type content start end))))))
-
-(defsubst git-gutter:window-margin ()
-  (or git-gutter:window-width (git-gutter:longest-sign-width)))
-
-(defun git-gutter:set-window-margin (width)
-  (when (and (not git-gutter:linum-enabled) (>= width 0))
-    (let ((curwin (get-buffer-window)))
-      (set-window-margins curwin width (cdr (window-margins curwin))))))
-
-(defsubst git-gutter:revision-set-p ()
-  (and git-gutter:start-revision (not (string= git-gutter:start-revision ""))))
-
-(defun git-gutter:git-diff-arguments (file)
-  (let (args)
-    (unless (string= git-gutter:diff-option "")
-      (setq args (nreverse (split-string git-gutter:diff-option))))
-    (when (git-gutter:revision-set-p)
-      (push git-gutter:start-revision args))
-    (nreverse (cons file args))))
-
-(defun git-gutter:start-git-diff-process (file proc-buf)
-  (let ((arg (git-gutter:git-diff-arguments file)))
-    (apply 'start-file-process "git-gutter" proc-buf
-           "git" "--no-pager" "diff" "--no-color" "--no-ext-diff" "--relative" "-U0"
-           arg)))
-
-(defun git-gutter:svn-diff-arguments (file)
-  (let (args)
-    (unless (string= git-gutter:subversion-diff-option "")
-      (setq args (nreverse (split-string git-gutter:subversion-diff-option))))
-    (when (git-gutter:revision-set-p)
-      (push "-r" args)
-      (push git-gutter:start-revision args))
-    (nreverse (cons file args))))
-
-(defsubst git-gutter:start-svn-diff-process (file proc-buf)
-  (let ((args (git-gutter:svn-diff-arguments file)))
-    (apply 'start-file-process "git-gutter" proc-buf "svn" "diff" "--diff-cmd"
-           "diff" "-x" "-U0" args)))
-
-(defun git-gutter:hg-diff-arguments (file)
-  (let (args)
-    (unless (string= git-gutter:mercurial-diff-option "")
-      (setq args (nreverse (split-string git-gutter:mercurial-diff-option))))
-    (when (git-gutter:revision-set-p)
-      (push "-r" args)
-      (push git-gutter:start-revision args))
-    (nreverse (cons file args))))
-
-(defsubst git-gutter:start-hg-diff-process (file proc-buf)
-  (let ((args (git-gutter:hg-diff-arguments file)))
-    (apply 'start-file-process "git-gutter" proc-buf "hg" "diff" "-U0" args)))
-
-(defun git-gutter:bzr-diff-arguments (file)
-  (let (args)
-    (unless (string= git-gutter:bazaar-diff-option "")
-      (setq args (nreverse (split-string git-gutter:bazaar-diff-option))))
-    (when (git-gutter:revision-set-p)
-      (push "-r" args)
-      (push git-gutter:start-revision args))
-    (nreverse (cons file args))))
-
-(defsubst git-gutter:start-bzr-diff-process (file proc-buf)
-  (let ((args (git-gutter:bzr-diff-arguments file)))
-    (apply 'start-file-process "git-gutter" proc-buf
-           "bzr" "diff" "--context=0" args)))
-
-(defun git-gutter:start-diff-process1 (file proc-buf)
-  (cl-case git-gutter:vcs-type
-    (git (git-gutter:start-git-diff-process file proc-buf))
-    (svn (git-gutter:start-svn-diff-process file proc-buf))
-    (hg (git-gutter:start-hg-diff-process file proc-buf))
-    (bzr (git-gutter:start-bzr-diff-process file proc-buf))))
-
-(defun git-gutter:start-diff-process (curfile proc-buf)
-  (git-gutter:set-window-margin (git-gutter:window-margin))
-  (let ((file (git-gutter:base-file)) ;; for tramp
-        (curbuf (current-buffer))
-        (process (git-gutter:start-diff-process1 curfile proc-buf)))
-    (set-process-query-on-exit-flag process nil)
-    (set-process-sentinel
-     process
-     (lambda (proc _event)
-       (when (eq (process-status proc) 'exit)
-         (setq git-gutter:enabled nil)
-         (let ((diffinfos (git-gutter:process-diff-output (process-buffer proc))))
-           (when (buffer-live-p curbuf)
-             (with-current-buffer curbuf
-               (git-gutter:update-diffinfo diffinfos)
-               (when git-gutter:has-indirect-buffers
-                 (git-gutter:update-indirect-buffers file))
-               (setq git-gutter:enabled t)))
-           (kill-buffer proc-buf)))))))
-
-(defsubst git-gutter:gutter-sperator ()
-  (when git-gutter:separator-sign
-    (propertize git-gutter:separator-sign 'face 'git-gutter:separator)))
-
-(defun git-gutter:before-string (sign)
-  (let ((gutter-sep (concat sign (git-gutter:gutter-sperator))))
-    (propertize " " 'display `((margin left-margin) ,gutter-sep))))
-
-(defsubst git-gutter:select-face (type)
-  (cl-case type
-    (added 'git-gutter:added)
-    (modified 'git-gutter:modified)
-    (deleted 'git-gutter:deleted)))
-
-(defsubst git-gutter:select-sign (type)
-  (cl-case type
-    (added git-gutter:added-sign)
-    (modified git-gutter:modified-sign)
-    (deleted git-gutter:deleted-sign)))
-
-(defun git-gutter:propertized-sign (type)
-  (let ((sign (git-gutter:select-sign type))
-        (face (git-gutter:select-face type)))
-    (propertize sign 'face face)))
-
-(defsubst git-gutter:linum-get-overlay (pos)
-  (cl-loop for ov in (overlays-in pos pos)
-           when (overlay-get ov 'linum-str)
-           return ov))
-
-(defun git-gutter:view-at-pos-linum (sign pos)
-  (git-gutter:awhen (git-gutter:linum-get-overlay pos)
-    (overlay-put it 'before-string
-                 (propertize " "
-                             'display
-                             `((margin left-margin)
-                               ,(concat sign (overlay-get it 'linum-str)))))))
-
-(defun git-gutter:view-at-pos (sign pos)
-  (if git-gutter:linum-enabled
-      (git-gutter:view-at-pos-linum sign pos)
-    (let ((ov (make-overlay pos pos)))
-      (overlay-put ov 'before-string (git-gutter:before-string sign))
-      (overlay-put ov 'git-gutter t))))
-
-(defsubst git-gutter:sign-width (sign)
-  (cl-loop for s across sign
-           sum (char-width s)))
-
-(defun git-gutter:longest-sign-width ()
-  (let ((signs (list git-gutter:modified-sign
-                     git-gutter:added-sign
-                     git-gutter:deleted-sign)))
-    (when git-gutter:unchanged-sign
-      (push git-gutter:unchanged-sign signs))
-    (+ (apply 'max (mapcar 'git-gutter:sign-width signs))
-       (git-gutter:sign-width git-gutter:separator-sign))))
-
-(defun git-gutter:view-for-unchanged ()
-  (save-excursion
-    (let ((sign (if git-gutter:unchanged-sign
-                    (propertize git-gutter:unchanged-sign
-                                'face 'git-gutter:unchanged)
-                  " ")))
-      (goto-char (point-min))
-      (while (not (eobp))
-        (git-gutter:view-at-pos sign (point))
-        (forward-line 1)))))
-
-(defsubst git-gutter:check-file-and-directory ()
-  (and (git-gutter:base-file)
-       default-directory (file-directory-p default-directory)))
-
-(defun git-gutter:pre-command-hook ()
-  (unless (memq this-command git-gutter:ignore-commands)
-    (setq git-gutter:real-this-command this-command)))
-
-(defun git-gutter:update-other-window-buffers (curwin curbuf)
-  (save-selected-window
-    (cl-loop for win in (window-list)
-             unless (eq win curwin)
-             do
-             (progn
-               (select-window win)
-               (let ((win-width (window-margins win)))
-                 (unless (car win-width)
-                   (if (eq (current-buffer) curbuf)
-                       (git-gutter:set-window-margin (git-gutter:window-margin))
-                     (git-gutter:update-diffinfo git-gutter:diffinfos))))))))
-
-(defun git-gutter:post-command-hook ()
-  (cond ((memq git-gutter:real-this-command git-gutter:update-commands)
-         (git-gutter))
-        ((memq git-gutter:real-this-command git-gutter:update-windows-commands)
-         (git-gutter)
-         (unless global-linum-mode
-           (git-gutter:update-other-window-buffers (selected-window) (current-buffer))))))
-
-(defsubst git-gutter:diff-process-buffer (curfile)
-  (concat " *git-gutter-" curfile "-*"))
-
-(defun git-gutter:kill-buffer-hook ()
-  (let ((buf (git-gutter:diff-process-buffer (git-gutter:base-file))))
-    (git-gutter:awhen (get-buffer buf)
-      (kill-buffer it))))
-
-(defsubst git-gutter:linum-padding ()
-  (cl-loop repeat (git-gutter:window-margin)
-           collect " " into paddings
-           finally return (apply 'concat paddings)))
-
-(defun git-gutter:linum-prepend-spaces ()
-  (save-excursion
-    (goto-char (point-min))
-    (let ((padding (git-gutter:linum-padding)))
-      (while (not (eobp))
-        (git-gutter:view-at-pos-linum padding (point))
-        (forward-line 1)))))
-
-(defun git-gutter:linum-update (diffinfos)
-  (let ((linum-width (car (window-margins))))
-    (when linum-width
-      (git-gutter:linum-prepend-spaces)
-      (git-gutter:view-set-overlays diffinfos)
-      (let ((curwin (get-buffer-window))
-            (margin (+ linum-width (git-gutter:window-margin))))
-        (setq git-gutter:linum-prev-window-margin margin)
-        (set-window-margins curwin margin (cdr (window-margins curwin)))))))
-
-(defun git-gutter:linum-init ()
-  (set (make-local-variable 'git-gutter:linum-enabled) t)
-  (make-local-variable 'git-gutter:linum-prev-window-margin))
-
-;;;###autoload
-(defun git-gutter:linum-setup ()
-  "Setup for linum-mode."
-  (setq git-gutter:init-function 'git-gutter:linum-init
-        git-gutter:view-diff-function nil)
-  (defadvice linum-update-window (after git-gutter:linum-update-window activate)
-    (if (and git-gutter-mode git-gutter:diffinfos)
-        (git-gutter:linum-update git-gutter:diffinfos)
-      (let ((curwin (get-buffer-window))
-            (margin (or git-gutter:linum-prev-window-margin
-                        (car (window-margins)))))
-        (set-window-margins curwin margin (cdr (window-margins curwin)))))))
-
-(defun git-gutter:show-backends ()
-  (mapconcat (lambda (backend)
-               (capitalize (symbol-name backend)))
-             git-gutter:handled-backends "/"))
-
-;;;###autoload
-(define-minor-mode git-gutter-mode
-  "Git-Gutter mode"
-  :group      'git-gutter
-  :init-value nil
-  :global     nil
-  :lighter    git-gutter:lighter
-  (if git-gutter-mode
-      (if (and (git-gutter:check-file-and-directory)
-               (git-gutter:in-repository-p))
-          (progn
-            (when git-gutter:init-function
-              (funcall git-gutter:init-function))
-            (make-local-variable 'git-gutter:enabled)
-            (set (make-local-variable 'git-gutter:has-indirect-buffers) nil)
-            (set (make-local-variable 'git-gutter:toggle-flag) t)
-            (make-local-variable 'git-gutter:diffinfos)
-            (set (make-local-variable 'git-gutter:start-revision) nil)
-            (add-hook 'kill-buffer-hook 'git-gutter:kill-buffer-hook nil t)
-            (add-hook 'pre-command-hook 'git-gutter:pre-command-hook)
-            (add-hook 'post-command-hook 'git-gutter:post-command-hook nil t)
-            (dolist (hook git-gutter:update-hooks)
-              (add-hook hook 'git-gutter nil t))
-            (git-gutter)
-            (when (and (not git-gutter:update-timer) (> git-gutter:update-interval 0))
-              (setq git-gutter:update-timer
-                    (run-with-idle-timer 1 git-gutter:update-interval 'git-gutter:live-update))))
-        (when (> git-gutter:verbosity 2)
-          (message "Here is not %s work tree" (git-gutter:show-backends)))
-        (git-gutter-mode -1))
-    (remove-hook 'kill-buffer-hook 'git-gutter:kill-buffer-hook t)
-    (remove-hook 'pre-command-hook 'git-gutter:pre-command-hook)
-    (remove-hook 'post-command-hook 'git-gutter:post-command-hook t)
-    (dolist (hook git-gutter:update-hooks)
-      (remove-hook hook 'git-gutter t))
-    (git-gutter:clear)))
-
-(defun git-gutter--turn-on ()
-  (when (and (buffer-file-name)
-             (not (memq major-mode git-gutter:disabled-modes)))
-    (git-gutter-mode +1)))
-
-;;;###autoload
-(define-global-minor-mode global-git-gutter-mode git-gutter-mode git-gutter--turn-on
-  :group 'git-gutter)
-
-(defsubst git-gutter:show-gutter-p (diffinfos)
-  (if git-gutter:hide-gutter
-      (or diffinfos git-gutter:unchanged-sign)
-    (or global-git-gutter-mode git-gutter:unchanged-sign diffinfos)))
-
-(defun git-gutter:show-gutter (diffinfos)
-  (when (git-gutter:show-gutter-p diffinfos)
-    (git-gutter:set-window-margin (git-gutter:window-margin))))
-
-(defun git-gutter:view-set-overlays (diffinfos)
-  (save-excursion
-    (goto-char (point-min))
-    (cl-loop with curline = 1
-             for info in diffinfos
-             for start-line = (plist-get info :start-line)
-             for end-line = (plist-get info :end-line)
-             for type = (plist-get info :type)
-             for sign = (git-gutter:propertized-sign type)
-             do
-             (progn
-               (forward-line (- start-line curline))
-               (cl-case type
-                 ((modified added)
-                  (setq curline start-line)
-                  (while (and (<= curline end-line) (not (eobp)))
-                    (git-gutter:view-at-pos sign (point))
-                    (cl-incf curline)
-                    (forward-line 1)))
-                 (deleted
-                  (git-gutter:view-at-pos sign (point))
-                  (forward-line 1)
-                  (setq curline (1+ end-line))))))))
-
-(defun git-gutter:view-diff-infos (diffinfos)
-  (when (or diffinfos git-gutter:always-show-separator)
-    (when (or git-gutter:unchanged-sign git-gutter:separator-sign)
-      (git-gutter:view-for-unchanged))
-    (git-gutter:view-set-overlays diffinfos))
-  (git-gutter:show-gutter diffinfos))
-
-(defsubst git-gutter:reset-window-margin-p ()
-  (or git-gutter:force
-      git-gutter:hide-gutter
-      (not global-git-gutter-mode)))
-
-(defun git-gutter:clear-diff-infos ()
-  (when (git-gutter:reset-window-margin-p)
-    (git-gutter:set-window-margin 0))
-  (remove-overlays (point-min) (point-max) 'git-gutter t))
-
-(defsubst git-gutter:clear-gutter ()
-  (when git-gutter:clear-function
-    (funcall git-gutter:clear-function)))
-
-(defun git-gutter:update-diffinfo (diffinfos)
-  (save-restriction
-    (widen)
-    (git-gutter:clear-gutter)
-    (setq git-gutter:diffinfos diffinfos)
-    (when git-gutter:view-diff-function
-      (funcall git-gutter:view-diff-function diffinfos))))
-
-(defun git-gutter:search-near-diff-index (diffinfos is-reverse)
-  (cl-loop with current-line = (line-number-at-pos)
-           with cmp-fn = (if is-reverse '> '<)
-           for diffinfo in (if is-reverse (reverse diffinfos) diffinfos)
-           for index = 0 then (1+ index)
-           for start-line = (plist-get diffinfo :start-line)
-           when (funcall cmp-fn current-line start-line)
-           return (if is-reverse
-                      (1- (- (length diffinfos) index))
-                    index)))
-
-(defun git-gutter:search-here-diffinfo (diffinfos)
-  (save-restriction
-    (widen)
-    (cl-loop with current-line = (line-number-at-pos)
-             for diffinfo in diffinfos
-             for start = (plist-get diffinfo :start-line)
-             for end   = (or (plist-get diffinfo :end-line) (1+ start))
-             when (and (>= current-line start) (<= current-line end))
-             return diffinfo)))
-
-(defun git-gutter:collect-deleted-line (str)
-  (with-temp-buffer
-    (insert str)
-    (goto-char (point-min))
-    (cl-loop while (re-search-forward "^-\\(.*?\\)$" nil t)
-             collect (match-string 1) into deleted-lines
-             finally return deleted-lines)))
-
-(defun git-gutter:delete-added-lines (start-line end-line)
-  (forward-line (1- start-line))
-  (let ((start-point (point)))
-    (forward-line (1+ (- end-line start-line)))
-    (delete-region start-point (point))))
-
-(defun git-gutter:insert-deleted-lines (content)
-  (dolist (line (git-gutter:collect-deleted-line content))
-    (insert (concat line "\n"))))
-
-(defsubst git-gutter:delete-from-first-line-p (start-line end-line)
-  (and (not (= start-line 1)) (not (= end-line 1))))
-
-(defun git-gutter:do-revert-hunk (diffinfo)
-  (save-excursion
-    (goto-char (point-min))
-    (let ((start-line (plist-get diffinfo :start-line))
-          (end-line (plist-get diffinfo :end-line))
-          (content (plist-get diffinfo :content)))
-      (cl-case (plist-get diffinfo :type)
-        (added (git-gutter:delete-added-lines start-line end-line))
-        (deleted (when (git-gutter:delete-from-first-line-p start-line end-line)
-                   (forward-line start-line))
-                 (git-gutter:insert-deleted-lines content))
-        (modified (git-gutter:delete-added-lines start-line end-line)
-                  (git-gutter:insert-deleted-lines content))))))
-
-(defsubst git-gutter:popup-buffer-window ()
-  (get-buffer-window (get-buffer git-gutter:popup-buffer)))
-
-;;;###autoload
-(defun git-gutter:revert-hunk ()
-  "Revert current hunk."
-  (interactive)
-  (git-gutter:awhen (git-gutter:search-here-diffinfo git-gutter:diffinfos)
-    (save-window-excursion
-      (git-gutter:popup-hunk it)
-      (when (yes-or-no-p "Revert current hunk ?")
-        (git-gutter:do-revert-hunk it)
-        (save-buffer))
-      (delete-window (git-gutter:popup-buffer-window)))))
-
-(defun git-gutter:extract-hunk-header ()
-  (git-gutter:awhen (git-gutter:base-file)
-    (with-temp-buffer
-      (when (zerop (git-gutter:execute-command "git" t "diff" "--relative" it))
-        (goto-char (point-min))
-        (forward-line 4)
-        (buffer-substring-no-properties (point-min) (point))))))
-
-(defun git-gutter:read-hunk-header (header)
-  (let ((header-regexp "^@@ -\\([0-9]+\\),?\\([0-9]*\\) \\+\\([0-9]+\\),?\\([0-9]*\\) @@"))
-    (when (string-match header-regexp header)
-      (list (string-to-number (match-string 1 header))
-            (git-gutter:changes-to-number (match-string 2 header))
-            (string-to-number (match-string 3 header))
-            (git-gutter:changes-to-number (match-string 4 header))))))
-
-(defun git-gutter:convert-hunk-header (type)
-  (let ((header (buffer-substring-no-properties (point) (line-end-position))))
-    (delete-region (point) (line-end-position))
-    (cl-destructuring-bind
-        (orig-line orig-changes new-line new-changes) (git-gutter:read-hunk-header header)
-      (cl-case type
-        (added (setq new-line (1+ orig-line)))
-        (t (setq new-line orig-line)))
-      (let ((new-header (format "@@ -%d,%d +%d,%d @@"
-                                orig-line orig-changes new-line new-changes)))
-        (insert new-header)))))
-
-(defun git-gutter:insert-staging-hunk (hunk type)
-  (save-excursion
-    (insert hunk "\n"))
-  (git-gutter:convert-hunk-header type))
-
-(defun git-gutter:apply-directory-option ()
-  (let ((root (locate-dominating-file default-directory ".git")))
-    (file-name-directory (file-relative-name (git-gutter:base-file) root))))
-
-(defun git-gutter:do-stage-hunk (diff-info)
-  (let ((content (plist-get diff-info :content))
-        (type (plist-get diff-info :type))
-        (header (git-gutter:extract-hunk-header))
-        (patch (make-temp-name "git-gutter")))
-    (when header
-      (with-temp-file patch
-        (insert header)
-        (git-gutter:insert-staging-hunk content type))
-      (let ((dir-option (git-gutter:apply-directory-option))
-            (options (list "--cached" patch)))
-        (when dir-option
-          (setq options (cons "--directory" (cons dir-option options))))
-        (unless (zerop (apply 'git-gutter:execute-command
-                              "git" nil "apply" "--unidiff-zero"
-                              options))
-          (message "Failed: stating this hunk"))
-        (delete-file patch)))))
-
-;;;###autoload
-(defun git-gutter:stage-hunk ()
-  "Stage this hunk like 'git add -p'."
-  (interactive)
-  (git-gutter:awhen (git-gutter:search-here-diffinfo git-gutter:diffinfos)
-    (save-window-excursion
-      (git-gutter:popup-hunk it)
-      (when (yes-or-no-p "Stage current hunk ?")
-        (git-gutter:do-stage-hunk it)
-        (git-gutter))
-      (delete-window (git-gutter:popup-buffer-window)))))
-
-(defun git-gutter:update-popuped-buffer (diffinfo)
-  (with-current-buffer (get-buffer-create git-gutter:popup-buffer)
-    (view-mode -1)
-    (setq buffer-read-only nil)
-    (erase-buffer)
-    (insert (plist-get diffinfo :content))
-    (insert "\n")
-    (goto-char (point-min))
-    (diff-mode)
-    (view-mode +1)
-    (current-buffer)))
-
-;;;###autoload
-(defun git-gutter:popup-hunk (&optional diffinfo)
-  "Popup current diff hunk."
-  (interactive)
-  (git-gutter:awhen (or diffinfo
-                        (git-gutter:search-here-diffinfo git-gutter:diffinfos))
-    (save-selected-window
-      (pop-to-buffer (git-gutter:update-popuped-buffer it)))))
-
-;;;###autoload
-(defun git-gutter:next-hunk (arg)
-  "Move to next diff hunk"
-  (interactive "p")
-  (if (not git-gutter:diffinfos)
-      (when (> git-gutter:verbosity 3)
-        (message "There are no changes!!"))
-    (let* ((is-reverse (< arg 0))
-           (diffinfos git-gutter:diffinfos)
-           (len (length diffinfos))
-           (index (git-gutter:search-near-diff-index diffinfos is-reverse))
-           (real-index (if index
-                           (let ((next (if is-reverse (1+ index) (1- index))))
-                             (mod (+ arg next) len))
-                         (if is-reverse (1- len) 0)))
-           (diffinfo (nth real-index diffinfos)))
-      (goto-char (point-min))
-      (forward-line (1- (plist-get diffinfo :start-line)))
-      (when (buffer-live-p (get-buffer git-gutter:popup-buffer))
-        (git-gutter:update-popuped-buffer diffinfo)))))
-
-;;;###autoload
-(defun git-gutter:previous-hunk (arg)
-  "Move to previous diff hunk"
-  (interactive "p")
-  (git-gutter:next-hunk (- arg)))
-
-(defalias 'git-gutter:next-diff 'git-gutter:next-hunk)
-(make-obsolete 'git-gutter:next-diff 'git-gutter:next-hunk "0.60")
-(defalias 'git-gutter:previous-diff 'git-gutter:previous-hunk)
-(make-obsolete 'git-gutter:previous-diff 'git-gutter:previous-hunk "0.60")
-(defalias 'git-gutter:popup-diff 'git-gutter:popup-hunk)
-(make-obsolete 'git-gutter:popup-diff 'git-gutter:popup-hunk "0.60")
-
-(defun git-gutter:update-indirect-buffers (orig-file)
-  (cl-loop with diffinfos = git-gutter:diffinfos
-           for win in (window-list)
-           for buf  = (window-buffer win)
-           for base = (buffer-base-buffer buf)
-           when (and base (string= (buffer-file-name base) orig-file))
-           do
-           (with-current-buffer buf
-             (git-gutter:update-diffinfo diffinfos))))
-
-;;;###autoload
-(defun git-gutter ()
-  "Show diff information in gutter"
-  (interactive)
-  (when (and (or git-gutter:toggle-flag git-gutter:force)
-             (or git-gutter:vcs-type (git-gutter:in-repository-p)))
-    (let* ((file (git-gutter:base-file))
-           (proc-buf (git-gutter:diff-process-buffer file)))
-      (when (and (called-interactively-p 'interactive) (get-buffer proc-buf))
-        (kill-buffer proc-buf))
-      (when (and file (file-exists-p file) (not (get-buffer proc-buf)))
-        (git-gutter:start-diff-process (file-name-nondirectory file)
-                                       (get-buffer-create proc-buf))))))
-
-(defadvice make-indirect-buffer (before git-gutter:has-indirect-buffers activate)
-  (when (and git-gutter-mode (not (buffer-base-buffer)))
-    (setq git-gutter:has-indirect-buffers t)))
-
-(defadvice vc-revert (after git-gutter:vc-revert activate)
-  (when git-gutter-mode
-    (run-with-idle-timer 0.1 nil 'git-gutter)))
-
-;; `quit-window' and `switch-to-buffer' are called from other
-;; commands. So we should use `defadvice' instead of `post-command-hook'.
-(defadvice quit-window (after git-gutter:quit-window activate)
-  (when git-gutter-mode
-    (git-gutter)))
-
-(defadvice switch-to-buffer (after git-gutter:switch-to-buffer activate)
-  (when git-gutter-mode
-    (git-gutter)))
-
-;;;###autoload
-(defun git-gutter:clear ()
-  "Clear diff information in gutter."
-  (interactive)
-  (save-restriction
-    (widen)
-    (git-gutter:clear-gutter))
-  (setq git-gutter:enabled nil
-        git-gutter:diffinfos nil))
-
-;;;###autoload
-(defun git-gutter:toggle ()
-  "Toggle to show diff information."
-  (interactive)
-  (let ((git-gutter:force t))
-    (if git-gutter:enabled
-        (progn
-          (git-gutter:clear)
-          (setq git-gutter-mode nil
-                git-gutter:toggle-flag nil))
-      (git-gutter)
-      (setq git-gutter-mode t
-            git-gutter:toggle-flag t))
-    (force-mode-line-update)))
-
-(defun git-gutter:revision-valid-p (revision)
-  (zerop (cl-case git-gutter:vcs-type
-           (git (git-gutter:execute-command "git" nil
-                                            "rev-parse" "--quiet" "--verify"
-                                            revision))
-           (svn (git-gutter:execute-command "svn" nil "info" "-r" revision
-                                            (file-relative-name (buffer-file-name))))
-           (hg (git-gutter:execute-command "hg" nil "id" "-r" revision))
-           (bzr (git-gutter:execute-command "bzr" nil
-                                            "revno" "-r" revision)))))
-
-;;;###autoload
-(defun git-gutter:set-start-revision (start-rev)
-  "Set start revision. If `start-rev' is nil or empty string then reset
-start revision."
-  (interactive
-   (list (read-string "Start Revision: "
-                      nil 'git-gutter:revision-history)))
-  (when (and start-rev (not (string= start-rev "")))
-    (unless (git-gutter:revision-valid-p start-rev)
-      (error "Revision '%s' is not valid." start-rev)))
-  (setq git-gutter:start-revision start-rev)
-  (git-gutter))
-
-;;;###autoload
-(defun git-gutter:update-all-windows ()
-  "Update git-gutter informations for all visible buffers."
-  (interactive)
-  (dolist (win (window-list))
-    (let ((buf (window-buffer win)))
-      (with-current-buffer buf
-        (when git-gutter-mode
-          (git-gutter))))))
-
-;;;###autoload
-(defun git-gutter:start-update-timer ()
-  (interactive)
-  (when git-gutter:update-timer
-    (error "Update timer is already running."))
-  (setq git-gutter:update-timer
-        (run-with-idle-timer 1 git-gutter:update-interval 'git-gutter:live-update)))
-
-;;;###autoload
-(defun git-gutter:cancel-update-timer ()
-  (interactive)
-  (unless git-gutter:update-timer
-    (error "Timer is no running."))
-  (cancel-timer git-gutter:update-timer)
-  (setq git-gutter:update-timer nil))
-
-(defsubst git-gutter:write-current-content (tmpfile)
-  (let ((content (buffer-substring-no-properties (point-min) (point-max))))
-    (with-temp-file tmpfile
-      (insert content))))
-
-(defsubst git-gutter:original-file-content (file)
-  (with-temp-buffer
-    (when (zerop (process-file "git" nil t nil "show" (concat ":" file)))
-      (buffer-substring-no-properties (point-min) (point-max)))))
-
-(defun git-gutter:write-original-content (tmpfile filename)
-  (git-gutter:awhen (git-gutter:original-file-content filename)
-    (with-temp-file tmpfile
-      (insert it)
-      t)))
-
-(defsubst git-gutter:start-raw-diff-process (proc-buf original now)
-  (start-file-process "git-gutter:update-timer" proc-buf
-                      "diff" "-U0" original now))
-
-(defun git-gutter:start-live-update (file original now)
-  (let ((proc-bufname (git-gutter:diff-process-buffer file)))
-    (when (get-buffer proc-bufname)
-      (kill-buffer proc-bufname))
-    (let* ((curbuf (current-buffer))
-           (proc-buf (get-buffer-create proc-bufname))
-           (process (git-gutter:start-raw-diff-process proc-buf original now)))
-      (set-process-query-on-exit-flag process nil)
-      (set-process-sentinel
-       process
-       (lambda (proc _event)
-         (when (eq (process-status proc) 'exit)
-           (setq git-gutter:enabled nil)
-           (let ((diffinfos (git-gutter:process-diff-output (process-buffer proc))))
-             (when (buffer-live-p curbuf)
-               (with-current-buffer curbuf
-                 (git-gutter:update-diffinfo diffinfos)
-                 (setq git-gutter:enabled t)))
-             (kill-buffer proc-buf)
-             (delete-file original)
-             (delete-file now))))))))
-
-(defun git-gutter:should-update-p ()
-  (let ((sha1 (secure-hash 'sha1 (current-buffer))))
-    (unless (equal sha1 git-gutter:last-sha1)
-      (setq git-gutter:last-sha1 sha1))))
-
-(defun git-gutter:live-update ()
-  (when (and git-gutter:enabled (buffer-modified-p))
-    (when (git-gutter:should-update-p)
-      (let ((file (file-name-nondirectory (git-gutter:base-file)))
-            (now (make-temp-file "git-gutter-cur"))
-            (original (make-temp-file "git-gutter-orig")))
-        (when (git-gutter:write-original-content original file)
-          (git-gutter:write-current-content now)
-          (git-gutter:start-live-update file original now))))))
-
-;; for linum-user
-(when (and global-linum-mode (not (boundp 'git-gutter-fringe)))
-  (git-gutter:linum-setup))
-
-(provide 'git-gutter)
-
-;;; git-gutter.el ends here
diff --git a/emacs.d/elpa/git-gutter-20160115.2300/git-gutter-autoloads.el b/emacs.d/elpa/git-gutter-20160115.2300/git-gutter-autoloads.el
new file mode 100644
index 0000000..c1cde97
--- /dev/null
+++ b/emacs.d/elpa/git-gutter-20160115.2300/git-gutter-autoloads.el
@@ -0,0 +1,109 @@
+;;; git-gutter-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "git-gutter" "git-gutter.el" (22171 46571 0
+;;;;;;  0))
+;;; Generated autoloads from git-gutter.el
+
+(autoload 'git-gutter:linum-setup "git-gutter" "\
+Setup for linum-mode.
+
+\(fn)" nil nil)
+
+(autoload 'git-gutter-mode "git-gutter" "\
+Git-Gutter mode
+
+\(fn &optional ARG)" t nil)
+
+(defvar global-git-gutter-mode nil "\
+Non-nil if Global-Git-Gutter mode is enabled.
+See the command `global-git-gutter-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-git-gutter-mode'.")
+
+(custom-autoload 'global-git-gutter-mode "git-gutter" nil)
+
+(autoload 'global-git-gutter-mode "git-gutter" "\
+Toggle Git-Gutter mode in all buffers.
+With prefix ARG, enable Global-Git-Gutter mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Git-Gutter mode is enabled in all buffers where
+`git-gutter--turn-on' would do it.
+See `git-gutter-mode' for more information on Git-Gutter mode.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'git-gutter:revert-hunk "git-gutter" "\
+Revert current hunk.
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:stage-hunk "git-gutter" "\
+Stage this hunk like 'git add -p'.
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:popup-hunk "git-gutter" "\
+Popup current diff hunk.
+
+\(fn &optional DIFFINFO)" t nil)
+
+(autoload 'git-gutter:next-hunk "git-gutter" "\
+Move to next diff hunk
+
+\(fn ARG)" t nil)
+
+(autoload 'git-gutter:previous-hunk "git-gutter" "\
+Move to previous diff hunk
+
+\(fn ARG)" t nil)
+
+(autoload 'git-gutter "git-gutter" "\
+Show diff information in gutter
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:clear "git-gutter" "\
+Clear diff information in gutter.
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:toggle "git-gutter" "\
+Toggle to show diff information.
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:set-start-revision "git-gutter" "\
+Set start revision. If `start-rev' is nil or empty string then reset
+start revision.
+
+\(fn START-REV)" t nil)
+
+(autoload 'git-gutter:update-all-windows "git-gutter" "\
+Update git-gutter information for all visible buffers.
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:start-update-timer "git-gutter" "\
+
+
+\(fn)" t nil)
+
+(autoload 'git-gutter:cancel-update-timer "git-gutter" "\
+
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; git-gutter-autoloads.el ends here
diff --git a/emacs.d/elpa/git-gutter-20160115.2300/git-gutter-pkg.el b/emacs.d/elpa/git-gutter-20160115.2300/git-gutter-pkg.el
new file mode 100644
index 0000000..37827c7
--- /dev/null
+++ b/emacs.d/elpa/git-gutter-20160115.2300/git-gutter-pkg.el
@@ -0,0 +1 @@
+(define-package "git-gutter" "20160115.2300" "Port of Sublime Text plugin GitGutter" '((cl-lib "0.5") (emacs "24")) :url "https://github.com/syohex/emacs-git-gutter")
diff --git a/emacs.d/elpa/git-gutter-20160115.2300/git-gutter.el b/emacs.d/elpa/git-gutter-20160115.2300/git-gutter.el
new file mode 100644
index 0000000..87a0052
--- /dev/null
+++ b/emacs.d/elpa/git-gutter-20160115.2300/git-gutter.el
@@ -0,0 +1,985 @@
+;;; git-gutter.el --- Port of Sublime Text plugin GitGutter -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2016 by Syohei YOSHIDA
+
+;; Author: Syohei YOSHIDA <syohex@gmail.com>
+;; URL: https://github.com/syohex/emacs-git-gutter
+;; Package-Version: 20160115.2300
+;; Version: 0.85
+;; Package-Requires: ((cl-lib "0.5") (emacs "24"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Port of GitGutter which is a plugin of Sublime Text
+
+;;; Code:
+
+(require 'cl-lib)
+
+(defgroup git-gutter nil
+  "Port GitGutter"
+  :prefix "git-gutter:"
+  :group 'vc)
+
+(defcustom git-gutter:window-width nil
+  "Character width of gutter window. Emacs mistakes width of some characters.
+It is better to explicitly assign width to this variable, if you use full-width
+character for signs of changes"
+  :type 'integer)
+
+(defcustom git-gutter:diff-option ""
+  "Option of 'git diff'"
+  :type 'string)
+
+(defcustom git-gutter:subversion-diff-option ""
+  "Option of 'svn diff'"
+  :type 'string)
+
+(defcustom git-gutter:mercurial-diff-option ""
+  "Option of 'hg diff'"
+  :type 'string)
+
+(defcustom git-gutter:bazaar-diff-option ""
+  "Option of 'bzr diff'"
+  :type 'string)
+
+(defcustom git-gutter:update-commands
+  '(ido-switch-buffer helm-buffers-list)
+  "Each command of this list is executed, gutter information is updated."
+  :type '(list (function :tag "Update command")
+               (repeat :inline t (function :tag "Update command"))))
+
+(defcustom git-gutter:update-windows-commands
+  '(kill-buffer ido-kill-buffer)
+  "Each command of this list is executed, gutter information is updated and
+gutter information of other windows."
+  :type '(list (function :tag "Update command")
+               (repeat :inline t (function :tag "Update command"))))
+
+(defcustom git-gutter:update-hooks
+  '(after-save-hook after-revert-hook find-file-hook after-change-major-mode-hook
+    text-scale-mode-hook)
+  "hook points of updating gutter"
+  :type '(list (hook :tag "HookPoint")
+               (repeat :inline t (hook :tag "HookPoint"))))
+
+(defcustom git-gutter:always-show-separator nil
+  "Show separator even if there are no changes."
+  :type 'boolean)
+
+(defcustom git-gutter:separator-sign nil
+  "Separator sign"
+  :type 'string)
+
+(defcustom git-gutter:modified-sign "="
+  "Modified sign"
+  :type 'string)
+
+(defcustom git-gutter:added-sign "+"
+  "Added sign"
+  :type 'string)
+
+(defcustom git-gutter:deleted-sign "-"
+  "Deleted sign"
+  :type 'string)
+
+(defcustom git-gutter:unchanged-sign nil
+  "Unchanged sign"
+  :type 'string)
+
+(defcustom git-gutter:hide-gutter nil
+  "Hide gutter if there are no changes"
+  :type 'boolean)
+
+(defcustom git-gutter:lighter " GitGutter"
+  "Minor mode lighter in mode-line"
+  :type 'string)
+
+(defcustom git-gutter:verbosity 0
+  "Log/message level. 4 means all, 0 nothing."
+  :type 'integer)
+
+(defface git-gutter:separator
+  '((t (:foreground "cyan" :weight bold)))
+  "Face of separator")
+
+(defface git-gutter:modified
+  '((t (:foreground "magenta" :weight bold)))
+  "Face of modified")
+
+(defface git-gutter:added
+  '((t (:foreground "green" :weight bold)))
+  "Face of added")
+
+(defface git-gutter:deleted
+  '((t (:foreground "red" :weight bold)))
+  "Face of deleted")
+
+(defface git-gutter:unchanged
+  '((t (:background "yellow")))
+  "Face of unchanged")
+
+(defcustom git-gutter:disabled-modes nil
+  "A list of modes which `global-git-gutter-mode' should be disabled."
+  :type '(repeat symbol))
+
+(defcustom git-gutter:handled-backends '(git)
+  "List of version control backends for which `git-gutter.el` will be used.
+`git', `svn', `hg', and `bzr' are supported."
+  :type '(repeat symbol))
+
+(defvar git-gutter:view-diff-function 'git-gutter:view-diff-infos
+  "Function of viewing changes")
+
+(defvar git-gutter:clear-function 'git-gutter:clear-diff-infos
+  "Function of clear changes")
+
+(defvar git-gutter:init-function 'nil
+  "Function of initialize")
+
+(defcustom git-gutter-mode-on-hook nil
+  "Hook run when git-gutter mode enable"
+  :type 'hook)
+
+(defcustom git-gutter-mode-off-hook nil
+  "Hook run when git-gutter mode disable"
+  :type 'hook)
+
+(defcustom git-gutter:update-interval 0
+  "Time interval in seconds for updating diff information."
+  :type 'integer)
+
+(defcustom git-gutter:ask-p t
+  "Ask whether commit/revert or not"
+  :type 'boolean)
+
+(defvar git-gutter:enabled nil)
+(defvar git-gutter:diffinfos nil)
+(defvar git-gutter:has-indirect-buffers nil)
+(defvar git-gutter:real-this-command nil)
+(defvar git-gutter:linum-enabled nil)
+(defvar git-gutter:linum-prev-window-margin nil)
+(defvar git-gutter:vcs-type nil)
+(defvar git-gutter:start-revision nil)
+(defvar git-gutter:revision-history nil)
+(defvar git-gutter:update-timer nil)
+(defvar git-gutter:last-sha1 nil)
+
+(defvar git-gutter:popup-buffer "*git-gutter:diff*")
+(defvar git-gutter:ignore-commands
+  '(minibuffer-complete-and-exit
+    exit-minibuffer
+    ido-exit-minibuffer
+    helm-maybe-exit-minibuffer
+    helm-confirm-and-exit-minibuffer))
+
+(defmacro git-gutter:awhen (test &rest body)
+  "Anaphoric when."
+  (declare (indent 1))
+  `(let ((it ,test))
+     (when it ,@body)))
+
+(defsubst git-gutter:execute-command (cmd output &rest args)
+  (apply #'process-file cmd nil output nil args))
+
+(defun git-gutter:in-git-repository-p ()
+  (when (executable-find "git")
+    (with-temp-buffer
+      (when (zerop (git-gutter:execute-command "git" t "rev-parse" "--is-inside-work-tree"))
+        (goto-char (point-min))
+        (string= "true" (buffer-substring-no-properties
+                         (point) (line-end-position)))))))
+
+(defun git-gutter:in-repository-common-p (cmd check-subcmd repodir)
+  (and (executable-find cmd)
+       (locate-dominating-file default-directory repodir)
+       (zerop (apply #'git-gutter:execute-command cmd nil check-subcmd))
+       (not (string-match-p (regexp-quote (concat "/" repodir "/")) default-directory))))
+
+(defsubst git-gutter:vcs-check-function (vcs)
+  (cl-case vcs
+    (git (git-gutter:in-git-repository-p))
+    (svn (git-gutter:in-repository-common-p "svn" '("info") ".svn"))
+    (hg (git-gutter:in-repository-common-p "hg" '("root") ".hg"))
+    (bzr (git-gutter:in-repository-common-p "bzr" '("root") ".bzr"))))
+
+(defsubst git-gutter:in-repository-p ()
+  (cl-loop for vcs in git-gutter:handled-backends
+           when (git-gutter:vcs-check-function vcs)
+           return (set (make-local-variable 'git-gutter:vcs-type) vcs)))
+
+(defsubst git-gutter:changes-to-number (str)
+  (if (string= str "")
+      1
+    (string-to-number str)))
+
+(defsubst git-gutter:make-diffinfo (type content start end)
+  (list :type type :content content :start-line start :end-line end))
+
+(defsubst git-gutter:base-file ()
+  (buffer-file-name (buffer-base-buffer)))
+
+(defun git-gutter:diff-content ()
+  (save-excursion
+    (goto-char (line-beginning-position))
+    (let ((curpoint (point)))
+      (forward-line 1)
+      (if (re-search-forward "^@@" nil t)
+          (backward-char 3) ;; for '@@'
+        (goto-char (point-max)))
+      (buffer-substring curpoint (point)))))
+
+(defun git-gutter:process-diff-output (buf)
+  (when (buffer-live-p buf)
+    (with-current-buffer buf
+      (goto-char (point-min))
+      (cl-loop with regexp = "^@@ -\\(?:[0-9]+\\),?\\([0-9]*\\) \\+\\([0-9]+\\),?\\([0-9]*\\) @@"
+               while (re-search-forward regexp nil t)
+               for new-line  = (string-to-number (match-string 2))
+               for orig-changes = (git-gutter:changes-to-number (match-string 1))
+               for new-changes = (git-gutter:changes-to-number (match-string 3))
+               for type = (cond ((zerop orig-changes) 'added)
+                                ((zerop new-changes) 'deleted)
+                                (t 'modified))
+               for end-line = (if (eq type 'deleted)
+                                  new-line
+                                (1- (+ new-line new-changes)))
+               for content = (git-gutter:diff-content)
+               collect
+               (let ((start (if (zerop new-line) 1 new-line))
+                     (end (if (zerop end-line) 1 end-line)))
+                 (git-gutter:make-diffinfo type content start end))))))
+
+(defsubst git-gutter:window-margin ()
+  (or git-gutter:window-width (git-gutter:longest-sign-width)))
+
+(defun git-gutter:set-window-margin (width)
+  (when (and (not git-gutter:linum-enabled) (>= width 0))
+    (let ((curwin (get-buffer-window)))
+      (set-window-margins curwin width (cdr (window-margins curwin))))))
+
+(defsubst git-gutter:revision-set-p ()
+  (and git-gutter:start-revision (not (string= git-gutter:start-revision ""))))
+
+(defun git-gutter:git-diff-arguments (file)
+  (let (args)
+    (unless (string= git-gutter:diff-option "")
+      (setq args (nreverse (split-string git-gutter:diff-option))))
+    (when (git-gutter:revision-set-p)
+      (push git-gutter:start-revision args))
+    (nreverse (cons file args))))
+
+(defun git-gutter:start-git-diff-process (file proc-buf)
+  (let ((arg (git-gutter:git-diff-arguments file)))
+    (apply #'start-file-process "git-gutter" proc-buf
+           "git" "--no-pager" "-c" "diff.autorefreshindex=0"
+           "diff" "--no-color" "--no-ext-diff" "--relative" "-U0"
+           arg)))
+
+(defun git-gutter:svn-diff-arguments (file)
+  (let (args)
+    (unless (string= git-gutter:subversion-diff-option "")
+      (setq args (nreverse (split-string git-gutter:subversion-diff-option))))
+    (when (git-gutter:revision-set-p)
+      (push "-r" args)
+      (push git-gutter:start-revision args))
+    (nreverse (cons file args))))
+
+(defsubst git-gutter:start-svn-diff-process (file proc-buf)
+  (let ((args (git-gutter:svn-diff-arguments file)))
+    (apply #'start-file-process "git-gutter" proc-buf "svn" "diff" "--diff-cmd"
+           "diff" "-x" "-U0" args)))
+
+(defun git-gutter:hg-diff-arguments (file)
+  (let (args)
+    (unless (string= git-gutter:mercurial-diff-option "")
+      (setq args (nreverse (split-string git-gutter:mercurial-diff-option))))
+    (when (git-gutter:revision-set-p)
+      (push "-r" args)
+      (push git-gutter:start-revision args))
+    (nreverse (cons file args))))
+
+(defsubst git-gutter:start-hg-diff-process (file proc-buf)
+  (let ((args (git-gutter:hg-diff-arguments file)))
+    (apply #'start-file-process "git-gutter" proc-buf "hg" "diff" "-U0" args)))
+
+(defun git-gutter:bzr-diff-arguments (file)
+  (let (args)
+    (unless (string= git-gutter:bazaar-diff-option "")
+      (setq args (nreverse (split-string git-gutter:bazaar-diff-option))))
+    (when (git-gutter:revision-set-p)
+      (push "-r" args)
+      (push git-gutter:start-revision args))
+    (nreverse (cons file args))))
+
+(defsubst git-gutter:start-bzr-diff-process (file proc-buf)
+  (let ((args (git-gutter:bzr-diff-arguments file)))
+    (apply #'start-file-process "git-gutter" proc-buf
+           "bzr" "diff" "--context=0" args)))
+
+(defun git-gutter:start-diff-process1 (file proc-buf)
+  (cl-case git-gutter:vcs-type
+    (git (git-gutter:start-git-diff-process file proc-buf))
+    (svn (git-gutter:start-svn-diff-process file proc-buf))
+    (hg (git-gutter:start-hg-diff-process file proc-buf))
+    (bzr (git-gutter:start-bzr-diff-process file proc-buf))))
+
+(defun git-gutter:start-diff-process (curfile proc-buf)
+  (git-gutter:set-window-margin (git-gutter:window-margin))
+  (let ((file (git-gutter:base-file)) ;; for tramp
+        (curbuf (current-buffer))
+        (process (git-gutter:start-diff-process1 curfile proc-buf)))
+    (set-process-query-on-exit-flag process nil)
+    (set-process-sentinel
+     process
+     (lambda (proc _event)
+       (when (eq (process-status proc) 'exit)
+         (setq git-gutter:enabled nil)
+         (let ((diffinfos (git-gutter:process-diff-output (process-buffer proc))))
+           (when (buffer-live-p curbuf)
+             (with-current-buffer curbuf
+               (git-gutter:update-diffinfo diffinfos)
+               (when git-gutter:has-indirect-buffers
+                 (git-gutter:update-indirect-buffers file))
+               (setq git-gutter:enabled t)))
+           (kill-buffer proc-buf)))))))
+
+(defsubst git-gutter:gutter-sperator ()
+  (when git-gutter:separator-sign
+    (propertize git-gutter:separator-sign 'face 'git-gutter:separator)))
+
+(defun git-gutter:before-string (sign)
+  (let ((gutter-sep (concat sign (git-gutter:gutter-sperator))))
+    (propertize " " 'display `((margin left-margin) ,gutter-sep))))
+
+(defsubst git-gutter:select-face (type)
+  (cl-case type
+    (added 'git-gutter:added)
+    (modified 'git-gutter:modified)
+    (deleted 'git-gutter:deleted)))
+
+(defsubst git-gutter:select-sign (type)
+  (cl-case type
+    (added git-gutter:added-sign)
+    (modified git-gutter:modified-sign)
+    (deleted git-gutter:deleted-sign)))
+
+(defun git-gutter:propertized-sign (type)
+  (let ((sign (git-gutter:select-sign type))
+        (face (git-gutter:select-face type)))
+    (propertize sign 'face face)))
+
+(defsubst git-gutter:linum-get-overlay (pos)
+  (cl-loop for ov in (overlays-in pos pos)
+           when (overlay-get ov 'linum-str)
+           return ov))
+
+(defun git-gutter:view-at-pos-linum (sign pos)
+  (git-gutter:awhen (git-gutter:linum-get-overlay pos)
+    (overlay-put it 'before-string
+                 (propertize " "
+                             'display
+                             `((margin left-margin)
+                               ,(concat sign (overlay-get it 'linum-str)))))))
+
+(defun git-gutter:view-at-pos (sign pos)
+  (if git-gutter:linum-enabled
+      (git-gutter:view-at-pos-linum sign pos)
+    (let ((ov (make-overlay pos pos)))
+      (overlay-put ov 'before-string (git-gutter:before-string sign))
+      (overlay-put ov 'git-gutter t))))
+
+(defsubst git-gutter:sign-width (sign)
+  (cl-loop for s across sign
+           sum (char-width s)))
+
+(defun git-gutter:longest-sign-width ()
+  (let ((signs (list git-gutter:modified-sign
+                     git-gutter:added-sign
+                     git-gutter:deleted-sign)))
+    (when git-gutter:unchanged-sign
+      (push git-gutter:unchanged-sign signs))
+    (+ (apply #'max (mapcar 'git-gutter:sign-width signs))
+       (git-gutter:sign-width git-gutter:separator-sign))))
+
+(defun git-gutter:view-for-unchanged ()
+  (save-excursion
+    (let ((sign (if git-gutter:unchanged-sign
+                    (propertize git-gutter:unchanged-sign
+                                'face 'git-gutter:unchanged)
+                  " ")))
+      (goto-char (point-min))
+      (while (not (eobp))
+        (git-gutter:view-at-pos sign (point))
+        (forward-line 1)))))
+
+(defsubst git-gutter:check-file-and-directory ()
+  (and (git-gutter:base-file)
+       default-directory (file-directory-p default-directory)))
+
+(defun git-gutter:pre-command-hook ()
+  (unless (memq this-command git-gutter:ignore-commands)
+    (setq git-gutter:real-this-command this-command)))
+
+(defun git-gutter:update-other-window-buffers (curwin curbuf)
+  (save-selected-window
+    (cl-loop for win in (window-list)
+             unless (eq win curwin)
+             do
+             (progn
+               (select-window win)
+               (let ((win-width (window-margins win)))
+                 (unless (car win-width)
+                   (if (eq (current-buffer) curbuf)
+                       (git-gutter:set-window-margin (git-gutter:window-margin))
+                     (git-gutter:update-diffinfo git-gutter:diffinfos))))))))
+
+(defun git-gutter:post-command-hook ()
+  (cond ((memq git-gutter:real-this-command git-gutter:update-commands)
+         (git-gutter))
+        ((memq git-gutter:real-this-command git-gutter:update-windows-commands)
+         (git-gutter)
+         (unless global-linum-mode
+           (git-gutter:update-other-window-buffers (selected-window) (current-buffer))))))
+
+(defsubst git-gutter:diff-process-buffer (curfile)
+  (concat " *git-gutter-" curfile "-*"))
+
+(defun git-gutter:kill-buffer-hook ()
+  (let ((buf (git-gutter:diff-process-buffer (git-gutter:base-file))))
+    (git-gutter:awhen (get-buffer buf)
+      (kill-buffer it))))
+
+(defsubst git-gutter:linum-padding ()
+  (cl-loop repeat (git-gutter:window-margin)
+           collect " " into paddings
+           finally return (apply #'concat paddings)))
+
+(defun git-gutter:linum-prepend-spaces ()
+  (save-excursion
+    (goto-char (point-min))
+    (let ((padding (git-gutter:linum-padding)))
+      (while (not (eobp))
+        (git-gutter:view-at-pos-linum padding (point))
+        (forward-line 1)))))
+
+(defun git-gutter:linum-update (diffinfos)
+  (let ((linum-width (car (window-margins))))
+    (when linum-width
+      (git-gutter:linum-prepend-spaces)
+      (git-gutter:view-set-overlays diffinfos)
+      (let ((curwin (get-buffer-window))
+            (margin (+ linum-width (git-gutter:window-margin))))
+        (setq git-gutter:linum-prev-window-margin margin)
+        (set-window-margins curwin margin (cdr (window-margins curwin)))))))
+
+(defun git-gutter:linum-init ()
+  (set (make-local-variable 'git-gutter:linum-enabled) t)
+  (make-local-variable 'git-gutter:linum-prev-window-margin))
+
+;;;###autoload
+(defun git-gutter:linum-setup ()
+  "Setup for linum-mode."
+  (setq git-gutter:init-function 'git-gutter:linum-init
+        git-gutter:view-diff-function nil)
+  (defadvice linum-update-window (after git-gutter:linum-update-window activate)
+    (if (and git-gutter-mode git-gutter:diffinfos)
+        (git-gutter:linum-update git-gutter:diffinfos)
+      (let ((curwin (get-buffer-window))
+            (margin (or git-gutter:linum-prev-window-margin
+                        (car (window-margins)))))
+        (set-window-margins curwin margin (cdr (window-margins curwin)))))))
+
+(defun git-gutter:show-backends ()
+  (mapconcat (lambda (backend)
+               (capitalize (symbol-name backend)))
+             git-gutter:handled-backends "/"))
+
+;;;###autoload
+(define-minor-mode git-gutter-mode
+  "Git-Gutter mode"
+  :init-value nil
+  :global     nil
+  :lighter    git-gutter:lighter
+  (if git-gutter-mode
+      (if (and (git-gutter:check-file-and-directory)
+               (git-gutter:in-repository-p))
+          (progn
+            (when git-gutter:init-function
+              (funcall git-gutter:init-function))
+            (make-local-variable 'git-gutter:enabled)
+            (set (make-local-variable 'git-gutter:has-indirect-buffers) nil)
+            (make-local-variable 'git-gutter:diffinfos)
+            (set (make-local-variable 'git-gutter:start-revision) nil)
+            (add-hook 'kill-buffer-hook 'git-gutter:kill-buffer-hook nil t)
+            (add-hook 'pre-command-hook 'git-gutter:pre-command-hook)
+            (add-hook 'post-command-hook 'git-gutter:post-command-hook nil t)
+            (dolist (hook git-gutter:update-hooks)
+              (add-hook hook 'git-gutter nil t))
+            (git-gutter)
+            (when (and (not git-gutter:update-timer) (> git-gutter:update-interval 0))
+              (setq git-gutter:update-timer
+                    (run-with-idle-timer 1 git-gutter:update-interval 'git-gutter:live-update))))
+        (when (> git-gutter:verbosity 2)
+          (message "Here is not %s work tree" (git-gutter:show-backends)))
+        (git-gutter-mode -1))
+    (remove-hook 'kill-buffer-hook 'git-gutter:kill-buffer-hook t)
+    (remove-hook 'pre-command-hook 'git-gutter:pre-command-hook)
+    (remove-hook 'post-command-hook 'git-gutter:post-command-hook t)
+    (dolist (hook git-gutter:update-hooks)
+      (remove-hook hook 'git-gutter t))
+    (git-gutter:clear-gutter)))
+
+(defun git-gutter--turn-on ()
+  (when (and (buffer-file-name)
+             (not (memq major-mode git-gutter:disabled-modes)))
+    (git-gutter-mode +1)))
+
+;;;###autoload
+(define-global-minor-mode global-git-gutter-mode git-gutter-mode git-gutter--turn-on)
+
+(defsubst git-gutter:show-gutter-p (diffinfos)
+  (if git-gutter:hide-gutter
+      (or diffinfos git-gutter:unchanged-sign)
+    (or global-git-gutter-mode git-gutter:unchanged-sign diffinfos)))
+
+(defun git-gutter:show-gutter (diffinfos)
+  (when (git-gutter:show-gutter-p diffinfos)
+    (git-gutter:set-window-margin (git-gutter:window-margin))))
+
+(defun git-gutter:view-set-overlays (diffinfos)
+  (when (or git-gutter:unchanged-sign git-gutter:separator-sign)
+    (git-gutter:view-for-unchanged))
+  (save-excursion
+    (goto-char (point-min))
+    (cl-loop with curline = 1
+             for info in diffinfos
+             for start-line = (plist-get info :start-line)
+             for end-line = (plist-get info :end-line)
+             for type = (plist-get info :type)
+             for sign = (git-gutter:propertized-sign type)
+             do
+             (progn
+               (forward-line (- start-line curline))
+               (cl-case type
+                 ((modified added)
+                  (setq curline start-line)
+                  (while (and (<= curline end-line) (not (eobp)))
+                    (git-gutter:view-at-pos sign (point))
+                    (cl-incf curline)
+                    (forward-line 1)))
+                 (deleted
+                  (git-gutter:view-at-pos sign (point))
+                  (forward-line 1)
+                  (setq curline (1+ end-line))))))))
+
+(defun git-gutter:view-diff-infos (diffinfos)
+  (when (or diffinfos git-gutter:always-show-separator)
+    (git-gutter:view-set-overlays diffinfos))
+  (git-gutter:show-gutter diffinfos))
+
+(defsubst git-gutter:reset-window-margin-p ()
+  (or git-gutter:hide-gutter (not global-git-gutter-mode)))
+
+(defun git-gutter:clear-diff-infos ()
+  (when (git-gutter:reset-window-margin-p)
+    (git-gutter:set-window-margin 0))
+  (remove-overlays (point-min) (point-max) 'git-gutter t))
+
+(defun git-gutter:clear-gutter ()
+  (save-restriction
+    (widen)
+    (when git-gutter:clear-function
+      (funcall git-gutter:clear-function)))
+  (setq git-gutter:enabled nil
+        git-gutter:diffinfos nil))
+
+(defun git-gutter:update-diffinfo (diffinfos)
+  (save-restriction
+    (widen)
+    (git-gutter:clear-gutter)
+    (setq git-gutter:diffinfos diffinfos)
+    (when git-gutter:view-diff-function
+      (funcall git-gutter:view-diff-function diffinfos))))
+
+(defun git-gutter:search-near-diff-index (diffinfos is-reverse)
+  (cl-loop with current-line = (line-number-at-pos)
+           with cmp-fn = (if is-reverse '> '<)
+           for diffinfo in (if is-reverse (reverse diffinfos) diffinfos)
+           for index = 0 then (1+ index)
+           for start-line = (plist-get diffinfo :start-line)
+           when (funcall cmp-fn current-line start-line)
+           return (if is-reverse
+                      (1- (- (length diffinfos) index))
+                    index)))
+
+(defun git-gutter:search-here-diffinfo (diffinfos)
+  (save-restriction
+    (widen)
+    (cl-loop with current-line = (line-number-at-pos)
+             for diffinfo in diffinfos
+             for start = (plist-get diffinfo :start-line)
+             for end   = (or (plist-get diffinfo :end-line) (1+ start))
+             when (and (>= current-line start) (<= current-line end))
+             return diffinfo)))
+
+(defun git-gutter:collect-deleted-line (str)
+  (with-temp-buffer
+    (insert str)
+    (goto-char (point-min))
+    (cl-loop while (re-search-forward "^-\\(.*?\\)$" nil t)
+             collect (match-string 1) into deleted-lines
+             finally return deleted-lines)))
+
+(defun git-gutter:delete-added-lines (start-line end-line)
+  (forward-line (1- start-line))
+  (let ((start-point (point)))
+    (forward-line (1+ (- end-line start-line)))
+    (delete-region start-point (point))))
+
+(defun git-gutter:insert-deleted-lines (content)
+  (dolist (line (git-gutter:collect-deleted-line content))
+    (insert (concat line "\n"))))
+
+(defsubst git-gutter:delete-from-first-line-p (start-line end-line)
+  (and (not (= start-line 1)) (not (= end-line 1))))
+
+(defun git-gutter:do-revert-hunk (diffinfo)
+  (save-excursion
+    (goto-char (point-min))
+    (let ((start-line (plist-get diffinfo :start-line))
+          (end-line (plist-get diffinfo :end-line))
+          (content (plist-get diffinfo :content)))
+      (cl-case (plist-get diffinfo :type)
+        (added (git-gutter:delete-added-lines start-line end-line))
+        (deleted (when (git-gutter:delete-from-first-line-p start-line end-line)
+                   (forward-line start-line))
+                 (git-gutter:insert-deleted-lines content))
+        (modified (git-gutter:delete-added-lines start-line end-line)
+                  (git-gutter:insert-deleted-lines content))))))
+
+(defsubst git-gutter:popup-buffer-window ()
+  (get-buffer-window (get-buffer git-gutter:popup-buffer)))
+
+(defun git-gutter:query-action (action action-fn update-fn)
+  (git-gutter:awhen (git-gutter:search-here-diffinfo git-gutter:diffinfos)
+    (save-window-excursion
+      (when git-gutter:ask-p
+        (git-gutter:popup-hunk it))
+      (when (or (not git-gutter:ask-p) (yes-or-no-p (format "%s current hunk ? " action)))
+        (funcall action-fn it)
+        (funcall update-fn))
+      (if git-gutter:ask-p
+          (delete-window (git-gutter:popup-buffer-window))
+        (message "%s current hunk." action)))))
+
+;;;###autoload
+(defun git-gutter:revert-hunk ()
+  "Revert current hunk."
+  (interactive)
+  (git-gutter:query-action "Revert" #'git-gutter:do-revert-hunk #'save-buffer))
+
+(defun git-gutter:extract-hunk-header ()
+  (git-gutter:awhen (git-gutter:base-file)
+    (with-temp-buffer
+      (when (zerop (git-gutter:execute-command
+                    "git" t "--no-pager" "-c" "diff.autorefreshindex=0"
+                    "diff" "--no-color" "--no-ext-diff"
+                    "--relative" (file-name-nondirectory it)))
+        (goto-char (point-min))
+        (forward-line 4)
+        (buffer-substring-no-properties (point-min) (point))))))
+
+(defun git-gutter:read-hunk-header (header)
+  (let ((header-regexp "^@@ -\\([0-9]+\\),?\\([0-9]*\\) \\+\\([0-9]+\\),?\\([0-9]*\\) @@"))
+    (when (string-match header-regexp header)
+      (list (string-to-number (match-string 1 header))
+            (git-gutter:changes-to-number (match-string 2 header))
+            (string-to-number (match-string 3 header))
+            (git-gutter:changes-to-number (match-string 4 header))))))
+
+(defun git-gutter:convert-hunk-header (type)
+  (let ((header (buffer-substring-no-properties (point) (line-end-position))))
+    (delete-region (point) (line-end-position))
+    (cl-destructuring-bind
+        (orig-line orig-changes new-line new-changes) (git-gutter:read-hunk-header header)
+      (cl-case type
+        (added (setq new-line (1+ orig-line)))
+        (t (setq new-line orig-line)))
+      (let ((new-header (format "@@ -%d,%d +%d,%d @@"
+                                orig-line orig-changes new-line new-changes)))
+        (insert new-header)))))
+
+(defun git-gutter:insert-staging-hunk (hunk type)
+  (save-excursion
+    (insert hunk "\n"))
+  (git-gutter:convert-hunk-header type))
+
+(defun git-gutter:apply-directory-option ()
+  (let ((root (locate-dominating-file default-directory ".git")))
+    (file-name-directory (file-relative-name (git-gutter:base-file) root))))
+
+(defun git-gutter:do-stage-hunk (diff-info)
+  (let ((content (plist-get diff-info :content))
+        (type (plist-get diff-info :type))
+        (header (git-gutter:extract-hunk-header))
+        (patch (make-temp-name "git-gutter")))
+    (when header
+      (with-temp-file patch
+        (insert header)
+        (git-gutter:insert-staging-hunk content type))
+      (let ((dir-option (git-gutter:apply-directory-option))
+            (options (list "--cached" patch)))
+        (when dir-option
+          (setq options (cons "--directory" (cons dir-option options))))
+        (unless (zerop (apply #'git-gutter:execute-command
+                              "git" nil "apply" "--unidiff-zero"
+                              options))
+          (message "Failed: stating this hunk"))
+        (delete-file patch)))))
+
+;;;###autoload
+(defun git-gutter:stage-hunk ()
+  "Stage this hunk like 'git add -p'."
+  (interactive)
+  (git-gutter:query-action "Stage" #'git-gutter:do-stage-hunk #'git-gutter))
+
+(defun git-gutter:update-popuped-buffer (diffinfo)
+  (with-current-buffer (get-buffer-create git-gutter:popup-buffer)
+    (view-mode -1)
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (insert (plist-get diffinfo :content))
+    (insert "\n")
+    (goto-char (point-min))
+    (diff-mode)
+    (view-mode +1)
+    (current-buffer)))
+
+;;;###autoload
+(defun git-gutter:popup-hunk (&optional diffinfo)
+  "Popup current diff hunk."
+  (interactive)
+  (git-gutter:awhen (or diffinfo
+                        (git-gutter:search-here-diffinfo git-gutter:diffinfos))
+    (save-selected-window
+      (pop-to-buffer (git-gutter:update-popuped-buffer it)))))
+
+;;;###autoload
+(defun git-gutter:next-hunk (arg)
+  "Move to next diff hunk"
+  (interactive "p")
+  (if (not git-gutter:diffinfos)
+      (when (> git-gutter:verbosity 3)
+        (message "There are no changes!!"))
+    (let* ((is-reverse (< arg 0))
+           (diffinfos git-gutter:diffinfos)
+           (len (length diffinfos))
+           (index (git-gutter:search-near-diff-index diffinfos is-reverse))
+           (real-index (if index
+                           (let ((next (if is-reverse (1+ index) (1- index))))
+                             (mod (+ arg next) len))
+                         (if is-reverse (1- len) 0)))
+           (diffinfo (nth real-index diffinfos)))
+      (goto-char (point-min))
+      (forward-line (1- (plist-get diffinfo :start-line)))
+      (when (buffer-live-p (get-buffer git-gutter:popup-buffer))
+        (git-gutter:update-popuped-buffer diffinfo)))))
+
+;;;###autoload
+(defun git-gutter:previous-hunk (arg)
+  "Move to previous diff hunk"
+  (interactive "p")
+  (git-gutter:next-hunk (- arg)))
+
+(defalias 'git-gutter:next-diff 'git-gutter:next-hunk)
+(make-obsolete 'git-gutter:next-diff 'git-gutter:next-hunk "0.60")
+(defalias 'git-gutter:previous-diff 'git-gutter:previous-hunk)
+(make-obsolete 'git-gutter:previous-diff 'git-gutter:previous-hunk "0.60")
+(defalias 'git-gutter:popup-diff 'git-gutter:popup-hunk)
+(make-obsolete 'git-gutter:popup-diff 'git-gutter:popup-hunk "0.60")
+
+(defun git-gutter:update-indirect-buffers (orig-file)
+  (cl-loop with diffinfos = git-gutter:diffinfos
+           for win in (window-list)
+           for buf  = (window-buffer win)
+           for base = (buffer-base-buffer buf)
+           when (and base (string= (buffer-file-name base) orig-file))
+           do
+           (with-current-buffer buf
+             (git-gutter:update-diffinfo diffinfos))))
+
+;;;###autoload
+(defun git-gutter ()
+  "Show diff information in gutter"
+  (interactive)
+  (when (or git-gutter:vcs-type (git-gutter:in-repository-p))
+    (let* ((file (git-gutter:base-file))
+           (proc-buf (git-gutter:diff-process-buffer file)))
+      (when (and (called-interactively-p 'interactive) (get-buffer proc-buf))
+        (kill-buffer proc-buf))
+      (when (and file (file-exists-p file) (not (get-buffer proc-buf)))
+        (git-gutter:start-diff-process (file-name-nondirectory file)
+                                       (get-buffer-create proc-buf))))))
+
+(defadvice make-indirect-buffer (before git-gutter:has-indirect-buffers activate)
+  (when (and git-gutter-mode (not (buffer-base-buffer)))
+    (setq git-gutter:has-indirect-buffers t)))
+
+(defadvice vc-revert (after git-gutter:vc-revert activate)
+  (when git-gutter-mode
+    (run-with-idle-timer 0.1 nil 'git-gutter)))
+
+;; `quit-window' and `switch-to-buffer' are called from other
+;; commands. So we should use `defadvice' instead of `post-command-hook'.
+(defadvice quit-window (after git-gutter:quit-window activate)
+  (when git-gutter-mode
+    (git-gutter)))
+
+(defadvice switch-to-buffer (after git-gutter:switch-to-buffer activate)
+  (when git-gutter-mode
+    (git-gutter)))
+
+;;;###autoload
+(defun git-gutter:clear ()
+  "Clear diff information in gutter."
+  (interactive)
+  (git-gutter-mode -1))
+
+;;;###autoload
+(defun git-gutter:toggle ()
+  "Toggle to show diff information."
+  (interactive)
+  (if git-gutter-mode
+      (git-gutter-mode -1)
+    (git-gutter-mode +1)))
+
+(defun git-gutter:revision-valid-p (revision)
+  (zerop (cl-case git-gutter:vcs-type
+           (git (git-gutter:execute-command "git" nil
+                                            "rev-parse" "--quiet" "--verify"
+                                            revision))
+           (svn (git-gutter:execute-command "svn" nil "info" "-r" revision
+                                            (file-relative-name (buffer-file-name))))
+           (hg (git-gutter:execute-command "hg" nil "id" "-r" revision))
+           (bzr (git-gutter:execute-command "bzr" nil
+                                            "revno" "-r" revision)))))
+
+;;;###autoload
+(defun git-gutter:set-start-revision (start-rev)
+  "Set start revision. If `start-rev' is nil or empty string then reset
+start revision."
+  (interactive
+   (list (read-string "Start Revision: "
+                      nil 'git-gutter:revision-history)))
+  (when (and start-rev (not (string= start-rev "")))
+    (unless (git-gutter:revision-valid-p start-rev)
+      (error "Revision '%s' is not valid." start-rev)))
+  (setq git-gutter:start-revision start-rev)
+  (git-gutter))
+
+;;;###autoload
+(defun git-gutter:update-all-windows ()
+  "Update git-gutter information for all visible buffers."
+  (interactive)
+  (dolist (win (window-list))
+    (let ((buf (window-buffer win)))
+      (with-current-buffer buf
+        (when git-gutter-mode
+          (git-gutter))))))
+
+;;;###autoload
+(defun git-gutter:start-update-timer ()
+  (interactive)
+  (when git-gutter:update-timer
+    (error "Update timer is already running."))
+  (setq git-gutter:update-timer
+        (run-with-idle-timer 1 git-gutter:update-interval 'git-gutter:live-update)))
+
+;;;###autoload
+(defun git-gutter:cancel-update-timer ()
+  (interactive)
+  (unless git-gutter:update-timer
+    (error "Timer is no running."))
+  (cancel-timer git-gutter:update-timer)
+  (setq git-gutter:update-timer nil))
+
+(defsubst git-gutter:write-current-content (tmpfile)
+  (let ((content (buffer-substring-no-properties (point-min) (point-max))))
+    (with-temp-file tmpfile
+      (insert content))))
+
+(defsubst git-gutter:original-file-content (file)
+  (with-temp-buffer
+    (when (zerop (process-file "git" nil t nil "show" (concat ":" file)))
+      (buffer-substring-no-properties (point-min) (point-max)))))
+
+(defun git-gutter:write-original-content (tmpfile filename)
+  (git-gutter:awhen (git-gutter:original-file-content filename)
+    (with-temp-file tmpfile
+      (insert it)
+      t)))
+
+(defsubst git-gutter:start-raw-diff-process (proc-buf original now)
+  (start-file-process "git-gutter:update-timer" proc-buf
+                      "diff" "-U0" original now))
+
+(defun git-gutter:start-live-update (file original now)
+  (let ((proc-bufname (git-gutter:diff-process-buffer file)))
+    (when (get-buffer proc-bufname)
+      (kill-buffer proc-bufname))
+    (let* ((curbuf (current-buffer))
+           (proc-buf (get-buffer-create proc-bufname))
+           (process (git-gutter:start-raw-diff-process proc-buf original now)))
+      (set-process-query-on-exit-flag process nil)
+      (set-process-sentinel
+       process
+       (lambda (proc _event)
+         (when (eq (process-status proc) 'exit)
+           (setq git-gutter:enabled nil)
+           (let ((diffinfos (git-gutter:process-diff-output (process-buffer proc))))
+             (when (buffer-live-p curbuf)
+               (with-current-buffer curbuf
+                 (git-gutter:update-diffinfo diffinfos)
+                 (setq git-gutter:enabled t)))
+             (kill-buffer proc-buf)
+             (delete-file original)
+             (delete-file now))))))))
+
+(defun git-gutter:should-update-p ()
+  (let ((sha1 (secure-hash 'sha1 (current-buffer))))
+    (unless (equal sha1 git-gutter:last-sha1)
+      (setq git-gutter:last-sha1 sha1))))
+
+(defun git-gutter:live-update ()
+  (git-gutter:awhen (git-gutter:base-file)
+    (when (and git-gutter:enabled
+               (buffer-modified-p)
+               (git-gutter:should-update-p))
+      (let ((file (file-name-nondirectory it))
+            (now (make-temp-file "git-gutter-cur"))
+            (original (make-temp-file "git-gutter-orig")))
+        (when (git-gutter:write-original-content original file)
+          (git-gutter:write-current-content now)
+          (git-gutter:start-live-update file original now))))))
+
+;; for linum-user
+(when (and global-linum-mode (not (boundp 'git-gutter-fringe)))
+  (git-gutter:linum-setup))
+
+(provide 'git-gutter)
+
+;;; git-gutter.el ends here
diff --git a/emacs.d/elpa/go-complete-20151015.228/go-complete-autoloads.el b/emacs.d/elpa/go-complete-20151015.228/go-complete-autoloads.el
new file mode 100644
index 0000000..48caf6d
--- /dev/null
+++ b/emacs.d/elpa/go-complete-20151015.228/go-complete-autoloads.el
@@ -0,0 +1,22 @@
+;;; go-complete-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "go-complete" "go-complete.el" (22171 46630
+;;;;;;  0 0))
+;;; Generated autoloads from go-complete.el
+
+(autoload 'go-complete-at-point "go-complete" "\
+Complete go expression at point.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; go-complete-autoloads.el ends here
diff --git a/emacs.d/elpa/go-complete-20151015.228/go-complete-pkg.el b/emacs.d/elpa/go-complete-20151015.228/go-complete-pkg.el
new file mode 100644
index 0000000..e0c21e4
--- /dev/null
+++ b/emacs.d/elpa/go-complete-20151015.228/go-complete-pkg.el
@@ -0,0 +1 @@
+(define-package "go-complete" "20151015.228" "Native code completion for Go" '((go-mode "0") (cl-lib "0.5")) :url "https://github.com/vibhavp/go-complete" :keywords '("go" "golang" "completion"))
diff --git a/emacs.d/elpa/go-complete-20151015.228/go-complete.el b/emacs.d/elpa/go-complete-20151015.228/go-complete.el
new file mode 100644
index 0000000..7143559
--- /dev/null
+++ b/emacs.d/elpa/go-complete-20151015.228/go-complete.el
@@ -0,0 +1,131 @@
+;;; go-complete.el --- Native code completion for Go
+;; Copyright (C) 2015 Vibhav Pant
+
+;; Author: Vibhav Pant <vibhavp@gmail.com>
+;; Version: 1.0
+;; Package-Version: 20151015.228
+;; Package-Requires: ((go-mode "0") (cl-lib "0.5"))
+;; Keywords: go, golang, completion
+;; URL: https://github.com/vibhavp/go-complete
+
+;;; Commentary:
+;; This package provides native code completion for the Go Programming
+;; Language.
+;; To enable, ad the following code into your .emacs:
+;; (require 'go-complete)
+;; (add-hook 'completion-at-point-functions 'go-complete-at-point)
+;; You need to have gocode (https://github.com/nsf/gocode) installed to use
+;; this package.
+
+;;; License:
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+
+(defcustom go-complete-gocode-command "gocode"
+  "The command to invoke `gocode'."
+  :group 'go-completion
+  :type 'string)
+
+(defun go-complete-run-gocode ()
+  "Run gocode on the current point, return a buffer containing the output."
+  (let ((temp-buffer (generate-new-buffer "*gocode*")))
+    (if (buffer-modified-p)
+	(call-process-region (point-min)
+			     (point-max)
+			     go-complete-gocode-command
+			     nil
+			     temp-buffer
+			     nil
+			     "-f=emacs"
+			     "autocomplete"
+			     (concat "c" (int-to-string (-  (point) 1))))
+      (call-process-region
+       (point-min)
+       (point-min)
+       "gocode"
+       nil
+       temp-buffer
+       nil
+       "-f=emacs"
+       (format "--in=%s" buffer-file-name)
+       "autocomplete"
+       (concat "c" (int-to-string (- (point) 1)))))
+    temp-buffer))
+
+(defun go-complete-char-at (string index)
+  "Return the character in STRING at index INDEX."
+  (substring string index (+ index 1)))
+
+(defun go-complete-args-commas (string)
+  "STRING is a function completion returned by gocode.
+Return a string in the format foo(,,), where foo is the function
+name, and the number of commas = number of arguments taken by the function"
+  (let ((index (string-match ",,func(" string))
+	(args 0))
+    (unless (or (eq index nil) (string= (go-complete-char-at string (+ index 1)) ")"))
+      (cl-incf index 2)
+      (while (and (not (eq index (- (length string) 1))) (not (string= (go-complete-char-at string index) ")")))
+	(when (string= (go-complete-char-at string index) ",")
+	  (cl-incf args))
+	(cl-incf index))
+      (format "(%s)" (make-string args ?,)))))
+
+(defun go-complete-make-completion (string)
+  "Take a completion STRING from gocode, return a completion string.
+If STRING is a function completion, return foo(,,), where foo is the function
+name, and the number of commas = number of arguments taken by the function"
+  (format "%s%s"
+	  (substring string 0 (string-match "," string))
+	  (if (string-match ",,func(" string) (go-complete-args-commas string) "")))
+
+(defun go-complete-make-completion-list (buffer)
+  "Take a BUFFER containing gocode output, return a list of completions.
+The list returned is compatible with `completion-at-point-functions'"
+  (with-current-buffer buffer
+    (goto-char (point-min))
+    (let ((completion-list '()))
+      (while (not (eq (point) (point-max)))
+	(setq completion-list
+	      (append completion-list (list (go-complete-make-completion
+					     (buffer-substring
+					      (line-beginning-position)
+					      (line-end-position))))))
+	(forward-line))
+      (kill-buffer buffer)
+      completion-list)))
+
+;;;###autoload
+(defun go-complete-at-point ()
+  "Complete go expression at point."
+  (interactive)
+  (when (derived-mode-p 'go-mode)
+    (let ((token (current-word t))
+	  (completing-field (string= "." (buffer-substring
+					  (- (point) 1) (point)))))
+      (when (or token completing-field)
+	(list
+	 (if completing-field
+	     (point)
+	   (save-excursion (left-word) (point)))
+	 (point)
+	 (go-complete-make-completion-list (go-complete-run-gocode))
+	 .
+	 nil)))))
+
+(provide 'go-complete)
+;;; go-complete.el ends here
diff --git a/emacs.d/elpa/go-complete-readme.txt b/emacs.d/elpa/go-complete-readme.txt
new file mode 100644
index 0000000..8d79fcf
--- /dev/null
+++ b/emacs.d/elpa/go-complete-readme.txt
@@ -0,0 +1,7 @@
+This package provides native code completion for the Go Programming
+Language.
+To enable, ad the following code into your .emacs:
+(require 'go-complete)
+(add-hook 'completion-at-point-functions 'go-complete-at-point)
+You need to have gocode (https://github.com/nsf/gocode) installed to use
+this package.
diff --git a/emacs.d/elpa/go-mode-20150503.258/go-mode-autoloads.el b/emacs.d/elpa/go-mode-20150503.258/go-mode-autoloads.el
deleted file mode 100644
index 1529540..0000000
--- a/emacs.d/elpa/go-mode-20150503.258/go-mode-autoloads.el
+++ /dev/null
@@ -1,102 +0,0 @@
-;;; go-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-
-;;;### (autoloads nil "go-mode" "go-mode.el" (21837 24213 0 0))
-;;; Generated autoloads from go-mode.el
-
-(autoload 'go-mode "go-mode" "\
-Major mode for editing Go source text.
-
-This mode provides (not just) basic editing capabilities for
-working with Go code. It offers almost complete syntax
-highlighting, indentation that is almost identical to gofmt and
-proper parsing of the buffer content to allow features such as
-navigation by function, manipulation of comments or detection of
-strings.
-
-In addition to these core features, it offers various features to
-help with writing Go code. You can directly run buffer content
-through gofmt, read godoc documentation from within Emacs, modify
-and clean up the list of package imports or interact with the
-Playground (uploading and downloading pastes).
-
-The following extra functions are defined:
-
-- `gofmt'
-- `godoc'
-- `go-import-add'
-- `go-remove-unused-imports'
-- `go-goto-imports'
-- `go-play-buffer' and `go-play-region'
-- `go-download-play'
-- `godef-describe' and `godef-jump'
-- `go-coverage'
-
-If you want to automatically run `gofmt' before saving a file,
-add the following hook to your emacs configuration:
-
-\(add-hook 'before-save-hook #'gofmt-before-save)
-
-If you want to use `godef-jump' instead of etags (or similar),
-consider binding godef-jump to `M-.', which is the default key
-for `find-tag':
-
-\(add-hook 'go-mode-hook (lambda ()
-                          (local-set-key (kbd \"M-.\") #'godef-jump)))
-
-Please note that godef is an external dependency. You can install
-it with
-
-go get code.google.com/p/rog-go/exp/cmd/godef
-
-
-If you're looking for even more integration with Go, namely
-on-the-fly syntax checking, auto-completion and snippets, it is
-recommended that you look at flycheck
-\(see URL `https://github.com/flycheck/flycheck') or flymake in combination
-with goflymake (see URL `https://github.com/dougm/goflymake'), gocode
-\(see URL `https://github.com/nsf/gocode'), go-eldoc
-\(see URL `github.com/syohex/emacs-go-eldoc') and yasnippet-go
-\(see URL `https://github.com/dominikh/yasnippet-go')
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist (cons "\\.go\\'" 'go-mode))
-
-(autoload 'gofmt-before-save "go-mode" "\
-Add this to .emacs to run gofmt on the current buffer when saving:
- (add-hook 'before-save-hook 'gofmt-before-save).
-
-Note that this will cause go-mode to get loaded the first time
-you save any file, kind of defeating the point of autoloading.
-
-\(fn)" t nil)
-
-(autoload 'godoc "go-mode" "\
-Show Go documentation for QUERY, much like M-x man.
-
-\(fn QUERY)" t nil)
-
-(autoload 'go-download-play "go-mode" "\
-Download a paste from the playground and insert it in a Go buffer.
-Tries to look for a URL at point.
-
-\(fn URL)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("go-mode-pkg.el") (21837 24213 414192
-;;;;;;  0))
-
-;;;***
-
-(provide 'go-mode-autoloads)
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; go-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/go-mode-20150503.258/go-mode-pkg.el b/emacs.d/elpa/go-mode-20150503.258/go-mode-pkg.el
deleted file mode 100644
index 35a6c13..0000000
--- a/emacs.d/elpa/go-mode-20150503.258/go-mode-pkg.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(define-package "go-mode" "20150503.258" "Major mode for the Go programming language" 'nil :url "https://github.com/dominikh/go-mode.el" :keywords
-  '("languages" "go"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/go-mode-20150503.258/go-mode.el b/emacs.d/elpa/go-mode-20150503.258/go-mode.el
deleted file mode 100644
index 71fe692..0000000
--- a/emacs.d/elpa/go-mode-20150503.258/go-mode.el
+++ /dev/null
@@ -1,1564 +0,0 @@
-;;; go-mode.el --- Major mode for the Go programming language
-
-;; Copyright 2013 The go-mode Authors. All rights reserved.
-;; Use of this source code is governed by a BSD-style
-;; license that can be found in the LICENSE file.
-
-;; Author: The go-mode Authors
-;; Version: 1.2.1
-;; Keywords: languages go
-;; URL: https://github.com/dominikh/go-mode.el
-;;
-;; This file is not part of GNU Emacs.
-
-;;; Code:
-
-(require 'cl)
-(require 'etags)
-(require 'ffap)
-(require 'find-file)
-(require 'ring)
-(require 'url)
-
-;; XEmacs compatibility guidelines
-;; - Minimum required version of XEmacs: 21.5.32
-;;   - Feature that cannot be backported: POSIX character classes in
-;;     regular expressions
-;;   - Functions that could be backported but won't because 21.5.32
-;;     covers them: plenty.
-;;   - Features that are still partly broken:
-;;     - godef will not work correctly if multibyte characters are
-;;       being used
-;;     - Fontification will not handle unicode correctly
-;;
-;; - Do not use \_< and \_> regexp delimiters directly; use
-;;   go--regexp-enclose-in-symbol
-;;
-;; - The character `_` must not be a symbol constituent but a
-;;   character constituent
-;;
-;; - Do not use process-lines
-;;
-;; - Use go--old-completion-list-style when using a plain list as the
-;;   collection for completing-read
-;;
-;; - Use go--position-bytes instead of position-bytes
-(defmacro go--xemacs-p ()
-  `(featurep 'xemacs))
-
-(defun go--delete-whole-line (&optional arg)
-  "Delete the current line without putting it in the `kill-ring'.
-Derived from function `kill-whole-line'.  ARG is defined as for that
-function."
-  (setq arg (or arg 1))
-  (if (and (> arg 0)
-           (eobp)
-           (save-excursion (forward-visible-line 0) (eobp)))
-      (signal 'end-of-buffer nil))
-  (if (and (< arg 0)
-           (bobp)
-           (save-excursion (end-of-visible-line) (bobp)))
-      (signal 'beginning-of-buffer nil))
-  (cond ((zerop arg)
-         (delete-region (progn (forward-visible-line 0) (point))
-                        (progn (end-of-visible-line) (point))))
-        ((< arg 0)
-         (delete-region (progn (end-of-visible-line) (point))
-                        (progn (forward-visible-line (1+ arg))
-                               (unless (bobp)
-                                 (backward-char))
-                               (point))))
-        (t
-         (delete-region (progn (forward-visible-line 0) (point))
-                        (progn (forward-visible-line arg) (point))))))
-
-;; declare-function is an empty macro that only byte-compile cares
-;; about. Wrap in always false if to satisfy Emacsen without that
-;; macro.
-(if nil
-    (declare-function go--position-bytes "go-mode" (point)))
-
-;; XEmacs unfortunately does not offer position-bytes. We can fall
-;; back to just using (point), but it will be incorrect as soon as
-;; multibyte characters are being used.
-(if (fboundp 'position-bytes)
-    (defalias 'go--position-bytes #'position-bytes)
-  (defun go--position-bytes (point) point))
-
-(defun go--old-completion-list-style (list)
-  (mapcar (lambda (x) (cons x nil)) list))
-
-;; GNU Emacs 24 has prog-mode, older GNU Emacs and XEmacs do not, so
-;; copy its definition for those.
-(if (not (fboundp 'prog-mode))
-    (define-derived-mode prog-mode fundamental-mode "Prog"
-      "Major mode for editing source code."
-      (set (make-local-variable 'require-final-newline) mode-require-final-newline)
-      (set (make-local-variable 'parse-sexp-ignore-comments) t)
-      (setq bidi-paragraph-direction 'left-to-right)))
-
-(defun go--regexp-enclose-in-symbol (s)
-  "Enclose S as regexp symbol.
-XEmacs does not support \\_<, GNU Emacs does.  In GNU Emacs we
-make extensive use of \\_< to support unicode in identifiers.
-Until we come up with a better solution for XEmacs, this solution
-will break fontification in XEmacs for identifiers such as
-\"typeµ\".  XEmacs will consider \"type\" a keyword, GNU Emacs
-won't."
-  (if (go--xemacs-p)
-      (concat "\\<" s "\\>")
-    (concat "\\_<" s "\\_>")))
-
-(defun go-goto-opening-parenthesis (&optional _legacy-unused)
-  "Move up one level of parentheses."
-  ;; The old implementation of go-goto-opening-parenthesis had an
-  ;; optional argument to speed up the function.  It didn't change the
-  ;; function's outcome.
-
-  ;; Silently fail if there's no matching opening parenthesis.
-  (condition-case nil
-      (backward-up-list)
-    (scan-error nil)))
-
-
-(defconst go-dangling-operators-regexp "[^-]-\\|[^+]\\+\\|[/*&><.=|^]")
-(defconst go-identifier-regexp "[[:word:][:multibyte:]]+")
-(defconst go-type-name-no-prefix-regexp "\\(?:[[:word:][:multibyte:]]+\\.\\)?[[:word:][:multibyte:]]+")
-(defconst go-qualified-identifier-regexp (concat go-identifier-regexp "\\." go-identifier-regexp))
-(defconst go-label-regexp go-identifier-regexp)
-(defconst go-type-regexp "[[:word:][:multibyte:]*]+")
-(defconst go-func-regexp (concat (go--regexp-enclose-in-symbol "func") "\\s *\\(" go-identifier-regexp "\\)"))
-(defconst go-func-meth-regexp (concat
-                               (go--regexp-enclose-in-symbol "func") "\\s *\\(?:(\\s *"
-                               "\\(" go-identifier-regexp "\\s +\\)?" go-type-regexp
-                               "\\s *)\\s *\\)?\\("
-                               go-identifier-regexp
-                               "\\)("))
-
-(defconst go-builtins
-  '("append" "cap"   "close"   "complex" "copy"
-    "delete" "imag"  "len"     "make"    "new"
-    "panic"  "print" "println" "real"    "recover")
-  "All built-in functions in the Go language.  Used for font locking.")
-
-(defconst go-mode-keywords
-  '("break"    "default"     "func"   "interface" "select"
-    "case"     "defer"       "go"     "map"       "struct"
-    "chan"     "else"        "goto"   "package"   "switch"
-    "const"    "fallthrough" "if"     "range"     "type"
-    "continue" "for"         "import" "return"    "var")
-  "All keywords in the Go language.  Used for font locking.")
-
-(defconst go-constants '("nil" "true" "false" "iota"))
-(defconst go-type-name-regexp (concat "\\(?:[*(]\\)*\\(\\(?:" go-identifier-regexp "\\.\\)?" go-identifier-regexp "\\)"))
-
-;; Maximum number of identifiers that can be highlighted as type names
-;; in one function type/declaration.
-(defconst go--font-lock-func-param-num-groups 16)
-
-(defvar go-dangling-cache)
-(defvar go-godoc-history nil)
-(defvar go--coverage-current-file-name)
-
-(defgroup go nil
-  "Major mode for editing Go code."
-  :link '(url-link "https://github.com/dominikh/go-mode.el")
-  :group 'languages)
-
-(defgroup go-cover nil
-  "Options specific to `cover`."
-  :group 'go)
-
-(defcustom go-fontify-function-calls t
-  "Fontify function and method calls if this is non-nil."
-  :type 'boolean
-  :group 'go)
-
-(defcustom go-mode-hook nil
-  "Hook called by `go-mode'."
-  :type 'hook
-  :group 'go)
-
-(defcustom go-command "go"
-  "The 'go' command.
-Some users have multiple Go development trees and invoke the 'go'
-tool via a wrapper that sets GOROOT and GOPATH based on the
-current directory.  Such users should customize this variable to
-point to the wrapper script."
-  :type 'string
-  :group 'go)
-
-(defcustom gofmt-command "gofmt"
-  "The 'gofmt' command.
-Some users may replace this with 'goimports'
-from https://github.com/bradfitz/goimports."
-  :type 'string
-  :group 'go)
-
-(defcustom gofmt-show-errors 'buffer
-  "Where to display gofmt error output.
-It can either be displayed in its own buffer, in the echo area, or not at all.
-
-Please note that Emacs outputs to the echo area when writing
-files and will overwrite gofmt's echo output if used from inside
-a `before-save-hook'."
-  :type '(choice
-          (const :tag "Own buffer" buffer)
-          (const :tag "Echo area" echo)
-          (const :tag "None" nil))
-  :group 'go)
-
-(defcustom godef-command "godef"
-  "The 'godef' command."
-  :type 'string
-  :group 'go)
-
-(defcustom go-other-file-alist
-  '(("_test\\.go\\'" (".go"))
-    ("\\.go\\'" ("_test.go")))
-  "See the documentation of `ff-other-file-alist' for details."
-  :type '(repeat (list regexp (choice (repeat string) function)))
-  :group 'go)
-
-(defun go--kill-new-message (url)
-  "Make URL the latest kill and print a message."
-  (kill-new url)
-  (message "%s" url))
-
-(defcustom go-play-browse-function 'go--kill-new-message
-  "Function to call with the Playground URL.
-See `go-play-region' for more details."
-  :type '(choice
-          (const :tag "Nothing" nil)
-          (const :tag "Kill + Message" go--kill-new-message)
-          (const :tag "Browse URL" browse-url)
-          (function :tag "Call function"))
-  :group 'go)
-
-(defcustom go-coverage-display-buffer-func 'display-buffer-reuse-window
-  "How `go-coverage' should display the coverage buffer.
-See `display-buffer' for a list of possible functions."
-  :type 'function
-  :group 'go-cover)
-
-(defface go-coverage-untracked
-  '((t (:foreground "#505050")))
-  "Coverage color of untracked code."
-  :group 'go-cover)
-
-(defface go-coverage-0
-  '((t (:foreground "#c00000")))
-  "Coverage color for uncovered code."
-  :group 'go-cover)
-(defface go-coverage-1
-  '((t (:foreground "#808080")))
-  "Coverage color for covered code with weight 1."
-  :group 'go-cover)
-(defface go-coverage-2
-  '((t (:foreground "#748c83")))
-  "Coverage color for covered code with weight 2."
-  :group 'go-cover)
-(defface go-coverage-3
-  '((t (:foreground "#689886")))
-  "Coverage color for covered code with weight 3."
-  :group 'go-cover)
-(defface go-coverage-4
-  '((t (:foreground "#5ca489")))
-  "Coverage color for covered code with weight 4."
-  :group 'go-cover)
-(defface go-coverage-5
-  '((t (:foreground "#50b08c")))
-  "Coverage color for covered code with weight 5."
-  :group 'go-cover)
-(defface go-coverage-6
-  '((t (:foreground "#44bc8f")))
-  "Coverage color for covered code with weight 6."
-  :group 'go-cover)
-(defface go-coverage-7
-  '((t (:foreground "#38c892")))
-  "Coverage color for covered code with weight 7."
-  :group 'go-cover)
-(defface go-coverage-8
-  '((t (:foreground "#2cd495")))
-  "Coverage color for covered code with weight 8.
-For mode=set, all covered lines will have this weight."
-  :group 'go-cover)
-(defface go-coverage-9
-  '((t (:foreground "#20e098")))
-  "Coverage color for covered code with weight 9."
-  :group 'go-cover)
-(defface go-coverage-10
-  '((t (:foreground "#14ec9b")))
-  "Coverage color for covered code with weight 10."
-  :group 'go-cover)
-(defface go-coverage-covered
-  '((t (:foreground "#2cd495")))
-  "Coverage color of covered code."
-  :group 'go-cover)
-
-(defvar go-mode-syntax-table
-  (let ((st (make-syntax-table)))
-    (modify-syntax-entry ?+  "." st)
-    (modify-syntax-entry ?-  "." st)
-    (modify-syntax-entry ?%  "." st)
-    (modify-syntax-entry ?&  "." st)
-    (modify-syntax-entry ?|  "." st)
-    (modify-syntax-entry ?^  "." st)
-    (modify-syntax-entry ?!  "." st)
-    (modify-syntax-entry ?=  "." st)
-    (modify-syntax-entry ?<  "." st)
-    (modify-syntax-entry ?>  "." st)
-    (modify-syntax-entry ?/ (if (go--xemacs-p) ". 1456" ". 124b") st)
-    (modify-syntax-entry ?*  ". 23" st)
-    (modify-syntax-entry ?\n "> b" st)
-    (modify-syntax-entry ?\" "\"" st)
-    (modify-syntax-entry ?\' "\"" st)
-    (modify-syntax-entry ?`  "\"" st)
-    (modify-syntax-entry ?\\ "\\" st)
-    ;; It would be nicer to have _ as a symbol constituent, but that
-    ;; would trip up XEmacs, which does not support the \_< anchor
-    (modify-syntax-entry ?_  "w" st)
-
-    st)
-  "Syntax table for Go mode.")
-
-(defun go--build-font-lock-keywords ()
-  ;; we cannot use 'symbols in regexp-opt because GNU Emacs <24
-  ;; doesn't understand that
-  (append
-   `((go--match-func
-      ,@(mapcar (lambda (x) `(,x font-lock-type-face))
-                (number-sequence 1 go--font-lock-func-param-num-groups)))
-     (,(go--regexp-enclose-in-symbol (regexp-opt go-mode-keywords t)) . font-lock-keyword-face)
-     (,(concat "\\(" (go--regexp-enclose-in-symbol (regexp-opt go-builtins t)) "\\)[[:space:]]*(") 1 font-lock-builtin-face)
-     (,(go--regexp-enclose-in-symbol (regexp-opt go-constants t)) . font-lock-constant-face)
-     (,go-func-regexp 1 font-lock-function-name-face)) ;; function (not method) name
-
-   (if go-fontify-function-calls
-       `((,(concat "\\(" go-identifier-regexp "\\)[[:space:]]*(") 1 font-lock-function-name-face) ;; function call/method name
-         (,(concat "[^[:word:][:multibyte:]](\\(" go-identifier-regexp "\\))[[:space:]]*(") 1 font-lock-function-name-face)) ;; bracketed function call
-     `((,go-func-meth-regexp 2 font-lock-function-name-face))) ;; method name
-
-   `(
-     ("\\(`[^`]*`\\)" 1 font-lock-multiline) ;; raw string literal, needed for font-lock-syntactic-keywords
-     (,(concat (go--regexp-enclose-in-symbol "type") "[[:space:]]+\\([^[:space:]]+\\)") 1 font-lock-type-face) ;; types
-     (,(concat (go--regexp-enclose-in-symbol "type") "[[:space:]]+" go-identifier-regexp "[[:space:]]*" go-type-name-regexp) 1 font-lock-type-face) ;; types
-     (,(concat "[^[:word:][:multibyte:]]\\[\\([[:digit:]]+\\|\\.\\.\\.\\)?\\]" go-type-name-regexp) 2 font-lock-type-face) ;; Arrays/slices
-     (,(concat "\\(" go-identifier-regexp "\\)" "{") 1 font-lock-type-face)
-     (,(concat (go--regexp-enclose-in-symbol "map") "\\[[^]]+\\]" go-type-name-regexp) 1 font-lock-type-face) ;; map value type
-     (,(concat (go--regexp-enclose-in-symbol "map") "\\[" go-type-name-regexp) 1 font-lock-type-face) ;; map key type
-     (,(concat (go--regexp-enclose-in-symbol "chan") "[[:space:]]*\\(?:<-[[:space:]]*\\)?" go-type-name-regexp) 1 font-lock-type-face) ;; channel type
-     (,(concat (go--regexp-enclose-in-symbol "\\(?:new\\|make\\)") "\\(?:[[:space:]]\\|)\\)*(" go-type-name-regexp) 1 font-lock-type-face) ;; new/make type
-     ;; TODO do we actually need this one or isn't it just a function call?
-     (,(concat "\\.\\s *(" go-type-name-regexp) 1 font-lock-type-face) ;; Type conversion
-     ;; Like the original go-mode this also marks compound literal
-     ;; fields. There, it was marked as to fix, but I grew quite
-     ;; accustomed to it, so it'll stay for now.
-     (,(concat "^[[:space:]]*\\(" go-label-regexp "\\)[[:space:]]*:\\(\\S.\\|$\\)") 1 font-lock-constant-face) ;; Labels and compound literal fields
-     (,(concat (go--regexp-enclose-in-symbol "\\(goto\\|break\\|continue\\)") "[[:space:]]*\\(" go-label-regexp "\\)") 2 font-lock-constant-face)))) ;; labels in goto/break/continue
-
-(defconst go--font-lock-syntactic-keywords
-  ;; Override syntax property of raw string literal contents, so that
-  ;; backslashes have no special meaning in ``. Used in Emacs 23 or older.
-  '((go--match-raw-string-literal
-     (1 (7 . ?`))
-     (2 (15 . nil))  ;; 15 = "generic string"
-     (3 (7 . ?`)))))
-
-(defvar go-mode-map
-  (let ((m (make-sparse-keymap)))
-    (define-key m "}" #'go-mode-insert-and-indent)
-    (define-key m ")" #'go-mode-insert-and-indent)
-    (define-key m "," #'go-mode-insert-and-indent)
-    (define-key m ":" #'go-mode-insert-and-indent)
-    (define-key m "=" #'go-mode-insert-and-indent)
-    (define-key m (kbd "C-c C-a") #'go-import-add)
-    (define-key m (kbd "C-c C-j") #'godef-jump)
-    (define-key m (kbd "C-x 4 C-c C-j") #'godef-jump-other-window)
-    (define-key m (kbd "C-c C-d") #'godef-describe)
-    m)
-  "Keymap used by Go mode to implement electric keys.")
-
-(easy-menu-define go-mode-menu go-mode-map
-  "Menu for Go mode."
-  '("Go"
-    ["Describe Expression"   godef-describe t]
-    ["Jump to Definition"    godef-jump t]
-    "---"
-    ["Add Import"            go-import-add t]
-    ["Remove Unused Imports" go-remove-unused-imports t]
-    ["Go to Imports"         go-goto-imports t]
-    "---"
-    ("Playground"
-     ["Send Buffer"          go-play-buffer t]
-     ["Send Region"          go-play-region t]
-     ["Download"             go-download-play t])
-    "---"
-    ["Coverage"              go-coverage t]
-    ["Gofmt"                 gofmt t]
-    ["Godoc"                 godoc t]
-    "---"
-    ["Customize Mode"        (customize-group 'go) t]))
-
-(defun go-mode-insert-and-indent (key)
-  "Invoke the global binding of KEY, then reindent the line."
-
-  (interactive (list (this-command-keys)))
-  (call-interactively (lookup-key (current-global-map) key))
-  (indent-according-to-mode))
-
-(defmacro go-paren-level ()
-  `(car (syntax-ppss)))
-
-(defmacro go-in-string-or-comment-p ()
-  `(nth 8 (syntax-ppss)))
-
-(defmacro go-in-string-p ()
-  `(nth 3 (syntax-ppss)))
-
-(defmacro go-in-comment-p ()
-  `(nth 4 (syntax-ppss)))
-
-(defmacro go-goto-beginning-of-string-or-comment ()
-  `(goto-char (nth 8 (syntax-ppss))))
-
-(defun go--backward-irrelevant (&optional stop-at-string)
-  "Skip backwards over any characters that are irrelevant for
-indentation and related tasks.
-
-It skips over whitespace, comments, cases and labels and, if
-STOP-AT-STRING is not true, over strings."
-
-  (let (pos (start-pos (point)))
-    (skip-chars-backward "\n\s\t")
-    (if (and (save-excursion (beginning-of-line) (go-in-string-p)) (looking-back "`") (not stop-at-string))
-        (backward-char))
-    (if (and (go-in-string-p) (not stop-at-string))
-        (go-goto-beginning-of-string-or-comment))
-    (if (looking-back "\\*/")
-        (backward-char))
-    (if (go-in-comment-p)
-        (go-goto-beginning-of-string-or-comment))
-    (setq pos (point))
-    (beginning-of-line)
-    (if (or (looking-at (concat "^" go-label-regexp ":")) (looking-at "^[[:space:]]*\\(case .+\\|default\\):"))
-        (end-of-line 0)
-      (goto-char pos))
-    (if (/= start-pos (point))
-        (go--backward-irrelevant stop-at-string))
-    (/= start-pos (point))))
-
-(defun go--buffer-narrowed-p ()
-  "Return non-nil if the current buffer is narrowed."
-  (/= (buffer-size)
-      (- (point-max)
-         (point-min))))
-
-(defun go--match-raw-string-literal (end)
-  "Search for a raw string literal.
-Set point to the end of the occurence found on success.  Return nil on failure."
-  (unless (go-in-string-or-comment-p)
-    (when (search-forward "`" end t)
-      (goto-char (match-beginning 0))
-      (if (go-in-string-or-comment-p)
-          (progn (goto-char (match-end 0))
-                 (go--match-raw-string-literal end))
-        (when (looking-at "\\(`\\)\\([^`]*\\)\\(`\\)")
-          (goto-char (match-end 0))
-          t)))))
-
-(defun go-previous-line-has-dangling-op-p ()
-  "Return non-nil if the current line is a continuation line."
-  (let* ((cur-line (line-number-at-pos))
-         (val (gethash cur-line go-dangling-cache 'nope)))
-    (if (or (go--buffer-narrowed-p) (equal val 'nope))
-        (save-excursion
-          (beginning-of-line)
-          (go--backward-irrelevant t)
-          (setq val (looking-back go-dangling-operators-regexp))
-          (if (not (go--buffer-narrowed-p))
-              (puthash cur-line val go-dangling-cache))))
-    val))
-
-(defun go--at-function-definition ()
-  "Return non-nil if point is on the opening curly brace of a
-function definition.
-
-We do this by first calling (beginning-of-defun), which will take
-us to the start of *some* function. We then look for the opening
-curly brace of that function and compare its position against the
-curly brace we are checking. If they match, we return non-nil."
-  (if (= (char-after) ?\{)
-      (save-excursion
-        (let ((old-point (point))
-              start-nesting)
-          (beginning-of-defun)
-          (when (looking-at "func ")
-            (setq start-nesting (go-paren-level))
-            (skip-chars-forward "^{")
-            (while (> (go-paren-level) start-nesting)
-              (forward-char)
-              (skip-chars-forward "^{") 0)
-            (if (and (= (go-paren-level) start-nesting) (= old-point (point)))
-                t))))))
-
-(defun go--indentation-for-opening-parenthesis ()
-  "Return the semantic indentation for the current opening parenthesis.
-
-If point is on an opening curly brace and said curly brace
-belongs to a function declaration, the indentation of the func
-keyword will be returned.  Otherwise the indentation of the
-current line will be returned."
-  (save-excursion
-    (if (go--at-function-definition)
-        (progn
-          (beginning-of-defun)
-          (current-indentation))
-      (current-indentation))))
-
-(defun go-indentation-at-point ()
-  (save-excursion
-    (let (start-nesting)
-      (back-to-indentation)
-      (setq start-nesting (go-paren-level))
-
-      (cond
-       ((go-in-string-p)
-        (current-indentation))
-       ((looking-at "[])}]")
-        (go-goto-opening-parenthesis)
-        (if (go-previous-line-has-dangling-op-p)
-            (- (current-indentation) tab-width)
-          (go--indentation-for-opening-parenthesis)))
-       ((progn (go--backward-irrelevant t) (looking-back go-dangling-operators-regexp))
-        ;; only one nesting for all dangling operators in one operation
-        (if (go-previous-line-has-dangling-op-p)
-            (current-indentation)
-          (+ (current-indentation) tab-width)))
-       ((zerop (go-paren-level))
-        0)
-       ((progn (go-goto-opening-parenthesis) (< (go-paren-level) start-nesting))
-        (if (go-previous-line-has-dangling-op-p)
-            (current-indentation)
-          (+ (go--indentation-for-opening-parenthesis) tab-width)))
-       (t
-        (current-indentation))))))
-
-(defun go-mode-indent-line ()
-  (interactive)
-  (let (indent
-        shift-amt
-        (pos (- (point-max) (point)))
-        (point (point))
-        (beg (line-beginning-position)))
-    (back-to-indentation)
-    (if (go-in-string-or-comment-p)
-        (goto-char point)
-      (setq indent (go-indentation-at-point))
-      (if (looking-at (concat go-label-regexp ":\\([[:space:]]*/.+\\)?$\\|case .+:\\|default:"))
-          (decf indent tab-width))
-      (setq shift-amt (- indent (current-column)))
-      (if (zerop shift-amt)
-          nil
-        (delete-region beg (point))
-        (indent-to indent))
-      ;; If initial point was within line's indentation,
-      ;; position after the indentation.  Else stay at same point in text.
-      (if (> (- (point-max) pos) (point))
-          (goto-char (- (point-max) pos))))))
-
-(defun go-beginning-of-defun (&optional count)
-  (unless (bolp)
-    (end-of-line))
-  (setq count (or count 1))
-  (let (first failure)
-    (dotimes (i (abs count))
-      (setq first t)
-      (while (and (not failure)
-                  (or first (go-in-string-or-comment-p)))
-        (if (>= count 0)
-            (progn
-              (go--backward-irrelevant)
-              (if (not (re-search-backward go-func-meth-regexp nil t))
-                  (setq failure t)))
-          (if (looking-at go-func-meth-regexp)
-              (forward-char))
-          (if (not (re-search-forward go-func-meth-regexp nil t))
-              (setq failure t)))
-        (setq first nil)))
-    (if (< count 0)
-        (beginning-of-line))
-    (not failure)))
-
-(defun go-end-of-defun ()
-  (let (orig-level)
-    ;; It can happen that we're not placed before a function by emacs
-    (if (not (looking-at "func"))
-        (go-beginning-of-defun -1))
-    ;; Find the { that starts the function, i.e., the next { that isn't
-    ;; preceded by struct or interface, or a comment or struct tag.  BUG:
-    ;; breaks if there's a comment between the struct/interface keyword and
-    ;; bracket, like this:
-    ;;
-    ;;     struct /* why? */ { 
-    (while (progn
-      (skip-chars-forward "^{")
-      (forward-char)
-      (or (go-in-string-or-comment-p)
-          (looking-back "\\(struct\\|interface\\)\\s-*{"))))
-    (setq orig-level (go-paren-level))
-    (while (>= (go-paren-level) orig-level)
-      (skip-chars-forward "^}")
-      (forward-char))))
-
-(defun go--find-enclosing-parentheses (position)
-  "Return points of outermost '(' and ')' surrounding POSITION if
-such parentheses exist.
-
-If outermost '(' exists but ')' does not, it returns the next blank
-line or end-of-buffer position instead of the position of the closing
-parenthesis.
-
-If the starting parenthesis is not found, it returns (POSITION
-POSITION)."
-  (save-excursion
-    (let (beg end)
-      (goto-char position)
-      (while (> (go-paren-level) 0)
-        (re-search-backward "[(\\[{]" nil t)
-        (when (looking-at "(")
-          (setq beg (point))))
-      (if (null beg)
-          (list position position)
-        (goto-char position)
-        (while (and (> (go-paren-level) 0)
-                    (search-forward ")" nil t)))
-        (when (> (go-paren-level) 0)
-          (unless (re-search-forward "^[[:space:]]*$" nil t)
-            (goto-char (point-max))))
-        (list beg (point))))))
-
-(defun go--search-next-comma (end)
-  "Search forward from point for a comma whose nesting level is
-the same as point.  If it reaches the end of line or a closing
-parenthesis before a comma, it stops at it."
-  (let ((orig-level (go-paren-level)))
-    (while (and (< (point) end)
-                (or (looking-at "[^,)\n]")
-                    (> (go-paren-level) orig-level)))
-      (forward-char))
-    (when (and (looking-at ",")
-               (< (point) (1- end)))
-      (forward-char))))
-
-(defun go--looking-at-keyword ()
-  (and (looking-at (concat "\\(" go-identifier-regexp "\\)"))
-       (member (match-string 1) go-mode-keywords)))
-
-(defun go--match-func (end)
-  "Search for identifiers used as type names from a function
-parameter list, and set the identifier positions as the results
-of last search.  Return t if search succeeded."
-  (when (re-search-forward (go--regexp-enclose-in-symbol "func") end t)
-    (let ((regions (go--match-func-type-names end)))
-      (if (null regions)
-          ;; Nothing to highlight. This can happen if the current func
-          ;; is "func()". Try next one.
-          (go--match-func end)
-        ;; There are something to highlight. Set those positions as
-        ;; last search results.
-        (setq regions (go--filter-match-data regions end))
-        (when regions
-          (set-match-data (go--make-match-data regions))
-          t)))))
-
-(defun go--match-func-type-names (end)
-  (cond
-   ;; Function declaration (e.g. "func foo(")
-   ((looking-at (concat "[[:space:]\n]*" go-identifier-regexp "[[:space:]\n]*("))
-    (goto-char (match-end 0))
-    (nconc (go--match-parameter-list end)
-           (go--match-function-result end)))
-   ;; Method declaration, function literal, or function type
-   ((looking-at "[[:space:]]*(")
-    (goto-char (match-end 0))
-    (let ((regions (go--match-parameter-list end)))
-      ;; Method declaration (e.g. "func (x y) foo(")
-      (when (looking-at (concat "[[:space:]]*" go-identifier-regexp "[[:space:]\n]*("))
-        (goto-char (match-end 0))
-        (setq regions (nconc regions (go--match-parameter-list end))))
-      (nconc regions (go--match-function-result end))))))
-
-(defun go--parameter-list-type (end)
-  "Return `present' if the parameter list has names, or `absent' if
-not, assuming point is at the beginning of a parameter list, just
-after '('."
-  (save-excursion
-    (skip-chars-forward "[:space:]\n" end)
-    (cond ((> (point) end)
-           nil)
-          ((looking-at (concat go-identifier-regexp "[[:space:]\n]*,"))
-           (goto-char (match-end 0))
-           (go--parameter-list-type end))
-          ((or (looking-at go-qualified-identifier-regexp)
-               (looking-at (concat go-type-name-no-prefix-regexp "[[:space:]\n]*\\(?:)\\|\\'\\)"))
-               (go--looking-at-keyword)
-               (looking-at "[*\\[]\\|\\.\\.\\.\\|\\'"))
-           'absent)
-          (t 'present))))
-
-(defconst go--opt-dotdotdot-regexp "\\(?:\\.\\.\\.\\)?")
-(defconst go--parameter-type-regexp
-  (concat go--opt-dotdotdot-regexp "[[:space:]*\n]*\\(" go-type-name-no-prefix-regexp "\\)[[:space:]\n]*\\([,)]\\|\\'\\)"))
-(defconst go--func-type-in-parameter-list-regexp
-  (concat go--opt-dotdotdot-regexp "[[:space:]*\n]*\\(" (go--regexp-enclose-in-symbol "func") "\\)"))
-
-(defun go--match-parameters-common (identifier-regexp end)
-  (let ((acc ())
-        (start -1))
-    (while (progn (skip-chars-forward "[:space:]\n" end)
-                  (and (not (looking-at "\\(?:)\\|\\'\\)"))
-                       (< start (point))
-                       (<= (point) end)))
-      (setq start (point))
-      (cond
-       ((looking-at (concat identifier-regexp go--parameter-type-regexp))
-        (setq acc (nconc acc (list (match-beginning 1) (match-end 1))))
-        (goto-char (match-beginning 2)))
-       ((looking-at (concat identifier-regexp go--func-type-in-parameter-list-regexp))
-        (goto-char (match-beginning 1))
-        (setq acc (nconc acc (go--match-func-type-names end)))
-        (go--search-next-comma end))
-       (t
-        (go--search-next-comma end))))
-    (when (and (looking-at ")")
-               (< (point) end))
-      (forward-char))
-    acc))
-
-(defun go--match-parameters-with-identifier-list (end)
-  (go--match-parameters-common
-   (concat go-identifier-regexp "[[:space:]\n]+")
-   end))
-
-(defun go--match-parameters-without-identifier-list (end)
-  (go--match-parameters-common "" end))
-
-(defun go--filter-match-data (regions end)
-  "Remove points from REGIONS if they are beyond END.
-REGIONS are a list whose size is multiple of 2.  Element 2n is beginning of a
-region and 2n+1 is end of it.
-
-This function is used to make sure we don't override end point
-that `font-lock-mode' gave to us."
-  (when regions
-    (let* ((vec (vconcat regions))
-           (i 0)
-           (len (length vec)))
-      (while (and (< i len)
-                  (<= (nth i regions) end)
-                  (<= (nth (1+ i) regions) end))
-        (setq i (+ i 2)))
-      (cond ((= i len)
-             regions)
-            ((zerop i)
-             nil)
-            (t
-             (setcdr (nth i regions) nil)
-             regions)))))
-
-(defun go--make-match-data (regions)
-  (let ((deficit (- (* 2 go--font-lock-func-param-num-groups)
-                    (length regions))))
-    (when (> deficit 0)
-      (let ((last (car (last regions))))
-        (setq regions (nconc regions (make-list deficit last))))))
-  `(,(car regions) ,@(last regions) ,@regions))
-
-(defun go--match-parameter-list (end)
-  "Return a list of identifier positions that are used as type
-names in a function parameter list, assuming point is at the
-beginning of a parameter list.  Return nil if the text after
-point does not look like a parameter list.
-
-Set point to end of closing parenthesis on success.
-
-In Go, the names must either all be present or all be absent
-within a list of parameters.
-
-Parsing a parameter list is a little bit complicated because we
-have to scan through the parameter list to determine whether or
-not the list has names. Until a type name is found or reaching
-end of a parameter list, we are not sure which form the parameter
-list is.
-
-For example, X and Y are type names in a parameter list \"(X,
-Y)\" but are parameter names in \"(X, Y int)\". We cannot say if
-X is a type name until we see int after Y.
-
-Note that even \"(int, float T)\" is a valid parameter
-list. Builtin type names are not reserved words. In this example,
-int and float are parameter names and only T is a type name.
-
-In this function, we first scan the parameter list to see if the
-list has names, and then handle it accordingly."
-  (let ((name (go--parameter-list-type end)))
-    (cond ((eq name 'present)
-           (go--match-parameters-with-identifier-list end))
-          ((eq name 'absent)
-           (go--match-parameters-without-identifier-list end))
-          (t nil))))
-
-(defun go--match-function-result (end)
-  "Return a list of identifier positions that are used as type
-names in a function result, assuming point is at the beginning of
-a result.
-
-Function result is a unparenthesized type or a parameter list."
-  (cond ((and (looking-at (concat "[[:space:]*]*\\(" go-type-name-no-prefix-regexp "\\)"))
-              (not (member (match-string 1) go-mode-keywords)))
-         (list (match-beginning 1) (match-end 1)))
-        ((looking-at "[[:space:]]*(")
-         (goto-char (match-end 0))
-         (go--match-parameter-list end))
-        (t nil)))
-
-;;;###autoload
-(define-derived-mode go-mode prog-mode "Go"
-  "Major mode for editing Go source text.
-
-This mode provides (not just) basic editing capabilities for
-working with Go code. It offers almost complete syntax
-highlighting, indentation that is almost identical to gofmt and
-proper parsing of the buffer content to allow features such as
-navigation by function, manipulation of comments or detection of
-strings.
-
-In addition to these core features, it offers various features to
-help with writing Go code. You can directly run buffer content
-through gofmt, read godoc documentation from within Emacs, modify
-and clean up the list of package imports or interact with the
-Playground (uploading and downloading pastes).
-
-The following extra functions are defined:
-
-- `gofmt'
-- `godoc'
-- `go-import-add'
-- `go-remove-unused-imports'
-- `go-goto-imports'
-- `go-play-buffer' and `go-play-region'
-- `go-download-play'
-- `godef-describe' and `godef-jump'
-- `go-coverage'
-
-If you want to automatically run `gofmt' before saving a file,
-add the following hook to your emacs configuration:
-
-\(add-hook 'before-save-hook #'gofmt-before-save)
-
-If you want to use `godef-jump' instead of etags (or similar),
-consider binding godef-jump to `M-.', which is the default key
-for `find-tag':
-
-\(add-hook 'go-mode-hook (lambda ()
-                          (local-set-key (kbd \"M-.\") #'godef-jump)))
-
-Please note that godef is an external dependency. You can install
-it with
-
-go get code.google.com/p/rog-go/exp/cmd/godef
-
-
-If you're looking for even more integration with Go, namely
-on-the-fly syntax checking, auto-completion and snippets, it is
-recommended that you look at flycheck
-\(see URL `https://github.com/flycheck/flycheck') or flymake in combination
-with goflymake \(see URL `https://github.com/dougm/goflymake'), gocode
-\(see URL `https://github.com/nsf/gocode'), go-eldoc
-\(see URL `github.com/syohex/emacs-go-eldoc') and yasnippet-go
-\(see URL `https://github.com/dominikh/yasnippet-go')"
-
-  ;; Font lock
-  (set (make-local-variable 'font-lock-defaults)
-       '(go--build-font-lock-keywords))
-
-  ;; Indentation
-  (set (make-local-variable 'indent-line-function) #'go-mode-indent-line)
-
-  ;; Comments
-  (set (make-local-variable 'comment-start) "// ")
-  (set (make-local-variable 'comment-end)   "")
-  (set (make-local-variable 'comment-use-syntax) t)
-  (set (make-local-variable 'comment-start-skip) "\\(//+\\|/\\*+\\)\\s *")
-
-  (set (make-local-variable 'beginning-of-defun-function) #'go-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function) #'go-end-of-defun)
-
-  (set (make-local-variable 'parse-sexp-lookup-properties) t)
-  (if (boundp 'syntax-propertize-function)
-      (set (make-local-variable 'syntax-propertize-function) #'go-propertize-syntax)
-    (set (make-local-variable 'font-lock-syntactic-keywords)
-         go--font-lock-syntactic-keywords)
-    (set (make-local-variable 'font-lock-multiline) t))
-
-  (set (make-local-variable 'go-dangling-cache) (make-hash-table :test 'eql))
-  (add-hook 'before-change-functions (lambda (x y) (setq go-dangling-cache (make-hash-table :test 'eql))) t t)
-
-  ;; ff-find-other-file
-  (setq ff-other-file-alist 'go-other-file-alist)
-
-  (setq imenu-generic-expression
-        '(("type" "^type *\\([^ \t\n\r\f]*\\)" 1)
-          ("func" "^func *\\(.*\\) {" 1)))
-  (imenu-add-to-menubar "Index")
-
-  ;; Go style
-  (setq indent-tabs-mode t)
-
-  ;; Handle unit test failure output in compilation-mode
-  ;;
-  ;; Note the final t argument to add-to-list for append, ie put these at the
-  ;; *ends* of compilation-error-regexp-alist[-alist]. We want go-test to be
-  ;; handled first, otherwise other elements will match that don't work, and
-  ;; those alists are traversed in *reverse* order:
-  ;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2001-12/msg00674.html
-  (when (and (boundp 'compilation-error-regexp-alist)
-             (boundp 'compilation-error-regexp-alist-alist))
-    (add-to-list 'compilation-error-regexp-alist 'go-test t)
-    (add-to-list 'compilation-error-regexp-alist-alist
-                 '(go-test . ("^\t+\\([^()\t\n]+\\):\\([0-9]+\\):? .*$" 1 2)) t)))
-
-;;;###autoload
-(add-to-list 'auto-mode-alist (cons "\\.go\\'" 'go-mode))
-
-(defun go--apply-rcs-patch (patch-buffer)
-  "Apply an RCS-formatted diff from PATCH-BUFFER to the current buffer."
-  (let ((target-buffer (current-buffer))
-        ;; Relative offset between buffer line numbers and line numbers
-        ;; in patch.
-        ;;
-        ;; Line numbers in the patch are based on the source file, so
-        ;; we have to keep an offset when making changes to the
-        ;; buffer.
-        ;;
-        ;; Appending lines decrements the offset (possibly making it
-        ;; negative), deleting lines increments it. This order
-        ;; simplifies the forward-line invocations.
-        (line-offset 0))
-    (save-excursion
-      (with-current-buffer patch-buffer
-        (goto-char (point-min))
-        (while (not (eobp))
-          (unless (looking-at "^\\([ad]\\)\\([0-9]+\\) \\([0-9]+\\)")
-            (error "invalid rcs patch or internal error in go--apply-rcs-patch"))
-          (forward-line)
-          (let ((action (match-string 1))
-                (from (string-to-number (match-string 2)))
-                (len  (string-to-number (match-string 3))))
-            (cond
-             ((equal action "a")
-              (let ((start (point)))
-                (forward-line len)
-                (let ((text (buffer-substring start (point))))
-                  (with-current-buffer target-buffer
-                    (decf line-offset len)
-                    (goto-char (point-min))
-                    (forward-line (- from len line-offset))
-                    (insert text)))))
-             ((equal action "d")
-              (with-current-buffer target-buffer
-                (go--goto-line (- from line-offset))
-                (incf line-offset len)
-                (go--delete-whole-line len)))
-             (t
-              (error "invalid rcs patch or internal error in go--apply-rcs-patch")))))))))
-
-(defun gofmt ()
-  "Format the current buffer according to the gofmt tool."
-  (interactive)
-  (let ((tmpfile (make-temp-file "gofmt" nil ".go"))
-        (patchbuf (get-buffer-create "*Gofmt patch*"))
-        (errbuf (if gofmt-show-errors (get-buffer-create "*Gofmt Errors*")))
-        (coding-system-for-read 'utf-8)
-        (coding-system-for-write 'utf-8))
-
-    (save-restriction
-      (widen)
-      (if errbuf
-          (with-current-buffer errbuf
-            (setq buffer-read-only nil)
-            (erase-buffer)))
-      (with-current-buffer patchbuf
-        (erase-buffer))
-
-      (write-region nil nil tmpfile)
-
-      ;; We're using errbuf for the mixed stdout and stderr output. This
-      ;; is not an issue because gofmt -w does not produce any stdout
-      ;; output in case of success.
-      (if (zerop (call-process gofmt-command nil errbuf nil "-w" tmpfile))
-          (progn
-            (if (zerop (call-process-region (point-min) (point-max) "diff" nil patchbuf nil "-n" "-" tmpfile))
-                (message "Buffer is already gofmted")
-              (go--apply-rcs-patch patchbuf)
-              (message "Applied gofmt"))
-            (if errbuf (gofmt--kill-error-buffer errbuf)))
-        (message "Could not apply gofmt")
-        (if errbuf (gofmt--process-errors (buffer-file-name) tmpfile errbuf)))
-
-      (kill-buffer patchbuf)
-      (delete-file tmpfile))))
-
-
-(defun gofmt--process-errors (filename tmpfile errbuf)
-  (with-current-buffer errbuf
-    (if (eq gofmt-show-errors 'echo)
-        (progn
-          (message "%s" (buffer-string))
-          (gofmt--kill-error-buffer errbuf))
-      ;; Convert the gofmt stderr to something understood by the compilation mode.
-      (goto-char (point-min))
-      (insert "gofmt errors:\n")
-      (while (search-forward-regexp (concat "^\\(" (regexp-quote tmpfile) "\\):") nil t)
-        (replace-match (file-name-nondirectory filename) t t nil 1))
-      (compilation-mode)
-      (display-buffer errbuf))))
-
-(defun gofmt--kill-error-buffer (errbuf)
-  (let ((win (get-buffer-window errbuf)))
-    (if win
-        (quit-window t win)
-      (kill-buffer errbuf))))
-
-;;;###autoload
-(defun gofmt-before-save ()
-  "Add this to .emacs to run gofmt on the current buffer when saving:
- (add-hook 'before-save-hook 'gofmt-before-save).
-
-Note that this will cause go-mode to get loaded the first time
-you save any file, kind of defeating the point of autoloading."
-
-  (interactive)
-  (when (eq major-mode 'go-mode) (gofmt)))
-
-(defun godoc--read-query ()
-  "Read a godoc query from the minibuffer."
-  ;; Compute the default query as the symbol under the cursor.
-  ;; TODO: This does the wrong thing for e.g. multipart.NewReader (it only grabs
-  ;; half) but I see no way to disambiguate that from e.g. foobar.SomeMethod.
-  (let* ((bounds (bounds-of-thing-at-point 'symbol))
-         (symbol (if bounds
-                     (buffer-substring-no-properties (car bounds)
-                                                     (cdr bounds)))))
-    (completing-read (if symbol
-                         (format "godoc (default %s): " symbol)
-                       "godoc: ")
-                     (go--old-completion-list-style (go-packages)) nil nil nil 'go-godoc-history symbol)))
-
-(defun godoc--get-buffer (query)
-  "Get an empty buffer for a godoc query."
-  (let* ((buffer-name (concat "*godoc " query "*"))
-         (buffer (get-buffer buffer-name)))
-    ;; Kill the existing buffer if it already exists.
-    (when buffer (kill-buffer buffer))
-    (get-buffer-create buffer-name)))
-
-(defun godoc--buffer-sentinel (proc event)
-  "Sentinel function run when godoc command completes."
-  (with-current-buffer (process-buffer proc)
-    (cond ((string= event "finished\n")  ;; Successful exit.
-           (goto-char (point-min))
-           (godoc-mode)
-           (display-buffer (current-buffer) t))
-          ((/= (process-exit-status proc) 0)  ;; Error exit.
-           (let ((output (buffer-string)))
-             (kill-buffer (current-buffer))
-             (message (concat "godoc: " output)))))))
-
-(define-derived-mode godoc-mode special-mode "Godoc"
-  "Major mode for showing Go documentation."
-  (view-mode-enter))
-
-;;;###autoload
-(defun godoc (query)
-  "Show Go documentation for QUERY, much like M-x man."
-  (interactive (list (godoc--read-query)))
-  (unless (string= query "")
-    (set-process-sentinel
-     (start-process-shell-command "godoc" (godoc--get-buffer query)
-                                  (concat "godoc " query))
-     'godoc--buffer-sentinel)
-    nil))
-
-(defun godoc-at-point (point)
-  "Show Go documentation for the identifier at POINT.
-
-`godoc-at-point' requires godef to work.
-
-Due to a limitation in godoc, it is not possible to differentiate
-between functions and methods, which may cause `godoc-at-point'
-to display more documentation than desired."
-  ;; TODO(dominikh): Support executing godoc-at-point on a package
-  ;; name.
-  (interactive "d")
-  (condition-case nil
-      (let* ((output (godef--call point))
-             (file (car output))
-             (name-parts (split-string (cadr output) " "))
-             (first (car name-parts)))
-        (if (not (godef--successful-p file))
-            (message "%s" (godef--error file))
-          (godoc (format "%s %s"
-                         (file-name-directory file)
-                         (if (or (string= first "type") (string= first "const"))
-                             (cadr name-parts)
-                           (car name-parts))))))
-    (file-error (message "Could not run godef binary"))))
-
-(defun go-goto-imports ()
-  "Move point to the block of imports.
-
-If using
-
-  import (
-    \"foo\"
-    \"bar\"
-  )
-
-it will move point directly behind the last import.
-
-If using
-
-  import \"foo\"
-  import \"bar\"
-
-it will move point to the next line after the last import.
-
-If no imports can be found, point will be moved after the package
-declaration."
-  (interactive)
-  ;; FIXME if there's a block-commented import before the real
-  ;; imports, we'll jump to that one.
-
-  ;; Generally, this function isn't very forgiving. it'll bark on
-  ;; extra whitespace. It works well for clean code.
-  (let ((old-point (point)))
-    (goto-char (point-min))
-    (cond
-     ((re-search-forward "^import ()" nil t)
-      (backward-char 1)
-      'block-empty)
-     ((re-search-forward "^import ([^)]+)" nil t)
-      (backward-char 2)
-      'block)
-     ((re-search-forward "\\(^import \\([^\"]+ \\)?\"[^\"]+\"\n?\\)+" nil t)
-      'single)
-     ((re-search-forward "^[[:space:]\n]*package .+?\n" nil t)
-      (message "No imports found, moving point after package declaration")
-      'none)
-     (t
-      (goto-char old-point)
-      (message "No imports or package declaration found. Is this really a Go file?")
-      'fail))))
-
-(defun go-play-buffer ()
-  "Like `go-play-region', but acts on the entire buffer."
-  (interactive)
-  (go-play-region (point-min) (point-max)))
-
-(defun go-play-region (start end)
-  "Send the region to the Playground.
-If non-nil `go-play-browse-function' is called with the
-Playground URL."
-  (interactive "r")
-  (let* ((url-request-method "POST")
-         (url-request-extra-headers
-          '(("Content-Type" . "application/x-www-form-urlencoded")))
-         (url-request-data
-          (encode-coding-string
-           (buffer-substring-no-properties start end)
-           'utf-8))
-         (content-buf (url-retrieve
-                       "http://play.golang.org/share"
-                       (lambda (arg)
-                         (cond
-                          ((equal :error (car arg))
-                           (signal 'go-play-error (cdr arg)))
-                          (t
-                           (re-search-forward "\n\n")
-                           (let ((url (format "http://play.golang.org/p/%s"
-                                              (buffer-substring (point) (point-max)))))
-                             (when go-play-browse-function
-                               (funcall go-play-browse-function url)))))))))))
-
-;;;###autoload
-(defun go-download-play (url)
-  "Download a paste from the playground and insert it in a Go buffer.
-Tries to look for a URL at point."
-  (interactive (list (read-from-minibuffer "Playground URL: " (ffap-url-p (ffap-string-at-point 'url)))))
-  (with-current-buffer
-      (let ((url-request-method "GET") url-request-data url-request-extra-headers)
-        (url-retrieve-synchronously (concat url ".go")))
-    (let ((buffer (generate-new-buffer (concat (car (last (split-string url "/"))) ".go"))))
-      (goto-char (point-min))
-      (re-search-forward "\n\n")
-      (copy-to-buffer buffer (point) (point-max))
-      (kill-buffer)
-      (with-current-buffer buffer
-        (go-mode)
-        (switch-to-buffer buffer)))))
-
-(defun go-propertize-syntax (start end)
-  (save-excursion
-    (goto-char start)
-    (while (search-forward "\\" end t)
-      (put-text-property (1- (point)) (point) 'syntax-table (if (= (char-after) ?`) '(1) '(9))))))
-
-(defun go-import-add (arg import)
-  "Add a new IMPORT to the list of imports.
-
-When called with a prefix ARG asks for an alternative name to
-import the package as.
-
-If no list exists yet, one will be created if possible.
-
-If an identical import has been commented, it will be
-uncommented, otherwise a new import will be added."
-
-  ;; - If there's a matching `// import "foo"`, uncomment it
-  ;; - If we're in an import() block and there's a matching `"foo"`, uncomment it
-  ;; - Otherwise add a new import, with the appropriate syntax
-  (interactive
-   (list
-    current-prefix-arg
-    (replace-regexp-in-string "^[\"']\\|[\"']$" "" (completing-read "Package: " (go--old-completion-list-style (go-packages))))))
-  (save-excursion
-    (let (as line import-start)
-      (if arg
-          (setq as (read-from-minibuffer "Import as: ")))
-      (if as
-          (setq line (format "%s \"%s\"" as import))
-        (setq line (format "\"%s\"" import)))
-
-      (goto-char (point-min))
-      (if (re-search-forward (concat "^[[:space:]]*//[[:space:]]*import " line "$") nil t)
-          (uncomment-region (line-beginning-position) (line-end-position))
-        (case (go-goto-imports)
-          ('fail (message "Could not find a place to add import."))
-          ('block-empty
-           (insert "\n\t" line "\n"))
-          ('block
-              (save-excursion
-                (re-search-backward "^import (")
-                (setq import-start (point)))
-            (if (re-search-backward (concat "^[[:space:]]*//[[:space:]]*" line "$")  import-start t)
-                (uncomment-region (line-beginning-position) (line-end-position))
-              (insert "\n\t" line)))
-          ('single (insert "import " line "\n"))
-          ('none (insert "\nimport (\n\t" line "\n)\n")))))))
-
-(defun go-root-and-paths ()
-  (let* ((output (split-string (shell-command-to-string (concat go-command " env GOROOT GOPATH"))
-                               "\n"))
-         (root (car output))
-         (paths (split-string (cadr output) path-separator)))
-    (append (list root) paths)))
-
-(defun go--string-prefix-p (s1 s2 &optional ignore-case)
-  "Return non-nil if S1 is a prefix of S2.
-If IGNORE-CASE is non-nil, the comparison is case-insensitive."
-  (eq t (compare-strings s1 nil nil
-                         s2 0 (length s1) ignore-case)))
-
-(defun go--directory-dirs (dir)
-  "Recursively return all subdirectories in DIR."
-  (if (file-directory-p dir)
-      (let ((dir (directory-file-name dir))
-            (dirs '())
-            (files (directory-files dir nil nil t)))
-        (dolist (file files)
-          (unless (member file '("." ".."))
-            (let ((file (concat dir "/" file)))
-              (if (file-directory-p file)
-                  (setq dirs (append (cons file
-                                           (go--directory-dirs file))
-                                     dirs))))))
-        dirs)
-    '()))
-
-
-(defun go-packages ()
-  (sort
-   (delete-dups
-    (mapcan
-     (lambda (topdir)
-       (let ((pkgdir (concat topdir "/pkg/")))
-         (mapcan (lambda (dir)
-                   (mapcar (lambda (file)
-                             (let ((sub (substring file (length pkgdir) -2)))
-                               (unless (or (go--string-prefix-p "obj/" sub) (go--string-prefix-p "tool/" sub))
-                                 (mapconcat #'identity (cdr (split-string sub "/")) "/"))))
-                           (if (file-directory-p dir)
-                               (directory-files dir t "\\.a$"))))
-                 (if (file-directory-p pkgdir)
-                     (go--directory-dirs pkgdir)))))
-     (go-root-and-paths)))
-   #'string<))
-
-(defun go-unused-imports-lines ()
-  ;; FIXME Technically, -o /dev/null fails in quite some cases (on
-  ;; Windows, when compiling from within GOPATH). Practically,
-  ;; however, it has the same end result: There won't be a
-  ;; compiled binary/archive, and we'll get our import errors when
-  ;; there are any.
-  (reverse (remove nil
-                   (mapcar
-                    (lambda (line)
-                      (when (string-match "^\\(.+\\):\\([[:digit:]]+\\): imported and not used: \".+\".*$" line)
-                        (let ((error-file-name (match-string 1 line))
-                              (error-line-num (match-string 2 line)))
-                          (if (string= (file-truename error-file-name) (file-truename buffer-file-name))
-                              (string-to-number error-line-num)))))
-                    (split-string (shell-command-to-string
-                                   (concat go-command
-                                           (if (string-match "_test\.go$" buffer-file-truename)
-                                               " test -c"
-                                             " build -o /dev/null"))) "\n")))))
-
-(defun go-remove-unused-imports (arg)
-  "Remove all unused imports.
-If ARG is non-nil, unused imports will be commented, otherwise
-they will be removed completely."
-  (interactive "P")
-  (save-excursion
-    (let ((cur-buffer (current-buffer)) flymake-state lines)
-      (when (boundp 'flymake-mode)
-        (setq flymake-state flymake-mode)
-        (flymake-mode-off))
-      (save-some-buffers nil (lambda () (equal cur-buffer (current-buffer))))
-      (if (buffer-modified-p)
-          (message "Cannot operate on unsaved buffer")
-        (setq lines (go-unused-imports-lines))
-        (dolist (import lines)
-          (go--goto-line import)
-          (beginning-of-line)
-          (if arg
-              (comment-region (line-beginning-position) (line-end-position))
-            (go--delete-whole-line)))
-        (message "Removed %d imports" (length lines)))
-      (if flymake-state (flymake-mode-on)))))
-
-(defun godef--find-file-line-column (specifier other-window)
-  "Given a file name in the format of `filename:line:column',
-visit FILENAME and go to line LINE and column COLUMN."
-  (if (not (string-match "\\(.+\\):\\([0-9]+\\):\\([0-9]+\\)" specifier))
-      ;; We've only been given a directory name
-      (funcall (if other-window #'find-file-other-window #'find-file) specifier)
-    (let ((filename (match-string 1 specifier))
-          (line (string-to-number (match-string 2 specifier)))
-          (column (string-to-number (match-string 3 specifier))))
-      (funcall (if other-window #'find-file-other-window #'find-file) filename)
-      (go--goto-line line)
-      (beginning-of-line)
-      (forward-char (1- column))
-      (if (buffer-modified-p)
-          (message "Buffer is modified, file position might not have been correct")))))
-
-(defun godef--call (point)
-  "Call godef, acquiring definition position and expression
-description at POINT."
-  (if (go--xemacs-p)
-      (error "godef does not reliably work in XEmacs, expect bad results"))
-  (if (not (buffer-file-name (go--coverage-origin-buffer)))
-      (error "Cannot use godef on a buffer without a file name")
-    (let ((outbuf (get-buffer-create "*godef*"))
-          (coding-system-for-read 'utf-8)
-          (coding-system-for-write 'utf-8))
-      (with-current-buffer outbuf
-        (erase-buffer))
-      (call-process-region (point-min)
-                           (point-max)
-                           godef-command
-                           nil
-                           outbuf
-                           nil
-                           "-i"
-                           "-t"
-                           "-f"
-                           (file-truename (buffer-file-name (go--coverage-origin-buffer)))
-                           "-o"
-                           (number-to-string (go--position-bytes point)))
-      (with-current-buffer outbuf
-        (split-string (buffer-substring-no-properties (point-min) (point-max)) "\n")))))
-
-(defun godef--successful-p (output)
-  (not (or (string= "-" output)
-           (string= "godef: no identifier found" output)
-           (go--string-prefix-p "godef: no declaration found for " output)
-           (go--string-prefix-p "error finding import path for " output))))
-
-(defun godef--error (output)
-  (cond
-   ((godef--successful-p output)
-    nil)
-   ((string= "-" output)
-    "godef: expression is not defined anywhere")
-   (t
-    output)))
-
-(defun godef-describe (point)
-  "Describe the expression at POINT."
-  (interactive "d")
-  (condition-case nil
-      (let ((description (cdr (butlast (godef--call point) 1))))
-        (if (not description)
-            (message "No description found for expression at point")
-          (message "%s" (mapconcat #'identity description "\n"))))
-    (file-error (message "Could not run godef binary"))))
-
-(defun godef-jump (point &optional other-window)
-  "Jump to the definition of the expression at POINT."
-  (interactive "d")
-  (condition-case nil
-      (let ((file (car (godef--call point))))
-        (if (not (godef--successful-p file))
-            (message "%s" (godef--error file))
-          (push-mark)
-          (ring-insert find-tag-marker-ring (point-marker))
-          (godef--find-file-line-column file other-window)))
-    (file-error (message "Could not run godef binary"))))
-
-(defun godef-jump-other-window (point)
-  (interactive "d")
-  (godef-jump point t))
-
-(defun go--goto-line (line)
-  (goto-char (point-min))
-  (forward-line (1- line)))
-
-(defun go--line-column-to-point (line column)
-  (save-excursion
-    (go--goto-line line)
-    (forward-char (1- column))
-    (point)))
-
-(defstruct go--covered
-  start-line start-column end-line end-column covered count)
-
-(defun go--coverage-file ()
-  "Return the coverage file to use, either by reading it from the
-current coverage buffer or by prompting for it."
-  (if (boundp 'go--coverage-current-file-name)
-      go--coverage-current-file-name
-    (read-file-name "Coverage file: " nil nil t)))
-
-(defun go--coverage-origin-buffer ()
-  "Return the buffer to base the coverage on."
-  (or (buffer-base-buffer) (current-buffer)))
-
-(defun go--coverage-face (count divisor)
-  "Return the intensity face for COUNT when using DIVISOR
-to scale it to a range [0,10].
-
-DIVISOR scales the absolute cover count to values from 0 to 10.
-For DIVISOR = 0 the count will always translate to 8."
-  (let* ((norm (cond
-                ((= count 0)
-                 -0.1) ;; Uncovered code, set to -0.1 so n becomes 0.
-                ((= divisor 0)
-                 0.8) ;; covermode=set, set to 0.8 so n becomes 8.
-                (t
-                 (/ (log count) divisor))))
-         (n (1+ (floor (* norm 9))))) ;; Convert normalized count [0,1] to intensity [0,10]
-    (concat "go-coverage-" (number-to-string n))))
-
-(defun go--coverage-make-overlay (range divisor)
-  "Create a coverage overlay for a RANGE of covered/uncovered code.
-Use DIVISOR to scale absolute counts to a [0,10] scale."
-  (let* ((count (go--covered-count range))
-         (face (go--coverage-face count divisor))
-         (ov (make-overlay (go--line-column-to-point (go--covered-start-line range)
-                                                     (go--covered-start-column range))
-                           (go--line-column-to-point (go--covered-end-line range)
-                                                     (go--covered-end-column range)))))
-
-    (overlay-put ov 'face face)
-    (overlay-put ov 'help-echo (format "Count: %d" count))))
-
-(defun go--coverage-clear-overlays ()
-  "Remove existing overlays and put a single untracked overlay
-over the entire buffer."
-  (remove-overlays)
-  (overlay-put (make-overlay (point-min) (point-max))
-               'face
-               'go-coverage-untracked))
-
-(defun go--coverage-parse-file (coverage-file file-name)
-  "Parse COVERAGE-FILE and extract coverage information and
-divisor for FILE-NAME."
-  (let (ranges
-        (max-count 0))
-    (with-temp-buffer
-      (insert-file-contents coverage-file)
-      (go--goto-line 2) ;; Skip over mode
-      (while (not (eobp))
-        (let* ((parts (split-string (buffer-substring (point-at-bol) (point-at-eol)) ":"))
-               (file (car parts))
-               (rest (split-string (nth 1 parts) "[., ]")))
-
-          (destructuring-bind
-              (start-line start-column end-line end-column num count)
-              (mapcar #'string-to-number rest)
-
-            (when (string= (file-name-nondirectory file) file-name)
-              (if (> count max-count)
-                  (setq max-count count))
-              (push (make-go--covered :start-line start-line
-                                      :start-column start-column
-                                      :end-line end-line
-                                      :end-column end-column
-                                      :covered (/= count 0)
-                                      :count count)
-                    ranges)))
-
-          (forward-line)))
-
-      (list ranges (if (> max-count 0) (log max-count) 0)))))
-
-(defun go-coverage (&optional coverage-file)
-  "Open a clone of the current buffer and overlay it with
-coverage information gathered via go test -coverprofile=COVERAGE-FILE.
-
-If COVERAGE-FILE is nil, it will either be inferred from the
-current buffer if it's already a coverage buffer, or be prompted
-for."
-  (interactive)
-  (let* ((cur-buffer (current-buffer))
-         (origin-buffer (go--coverage-origin-buffer))
-         (gocov-buffer-name (concat (buffer-name origin-buffer) "<gocov>"))
-         (coverage-file (or coverage-file (go--coverage-file)))
-         (ranges-and-divisor (go--coverage-parse-file
-                              coverage-file
-                              (file-name-nondirectory (buffer-file-name origin-buffer))))
-         (cov-mtime (nth 5 (file-attributes coverage-file)))
-         (cur-mtime (nth 5 (file-attributes (buffer-file-name origin-buffer)))))
-
-    (if (< (float-time cov-mtime) (float-time cur-mtime))
-        (message "Coverage file is older than the source file."))
-
-    (with-current-buffer (or (get-buffer gocov-buffer-name)
-                             (make-indirect-buffer origin-buffer gocov-buffer-name t))
-      (set (make-local-variable 'go--coverage-current-file-name) coverage-file)
-
-      (save-excursion
-        (go--coverage-clear-overlays)
-        (dolist (range (car ranges-and-divisor))
-          (go--coverage-make-overlay range (cadr ranges-and-divisor))))
-
-      (if (not (eq cur-buffer (current-buffer)))
-          (display-buffer (current-buffer) `(,go-coverage-display-buffer-func))))))
-
-(provide 'go-mode)
-
-;;; go-mode.el ends here
diff --git a/emacs.d/elpa/go-mode-20151226.1224/go-mode-autoloads.el b/emacs.d/elpa/go-mode-20151226.1224/go-mode-autoloads.el
new file mode 100644
index 0000000..7e60bc1
--- /dev/null
+++ b/emacs.d/elpa/go-mode-20151226.1224/go-mode-autoloads.el
@@ -0,0 +1,102 @@
+;;; go-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil "go-mode" "go-mode.el" (22171 46570 0 0))
+;;; Generated autoloads from go-mode.el
+
+(autoload 'go-mode "go-mode" "\
+Major mode for editing Go source text.
+
+This mode provides (not just) basic editing capabilities for
+working with Go code. It offers almost complete syntax
+highlighting, indentation that is almost identical to gofmt and
+proper parsing of the buffer content to allow features such as
+navigation by function, manipulation of comments or detection of
+strings.
+
+In addition to these core features, it offers various features to
+help with writing Go code. You can directly run buffer content
+through gofmt, read godoc documentation from within Emacs, modify
+and clean up the list of package imports or interact with the
+Playground (uploading and downloading pastes).
+
+The following extra functions are defined:
+
+- `gofmt'
+- `godoc'
+- `go-import-add'
+- `go-remove-unused-imports'
+- `go-goto-imports'
+- `go-play-buffer' and `go-play-region'
+- `go-download-play'
+- `godef-describe' and `godef-jump'
+- `go-coverage'
+
+If you want to automatically run `gofmt' before saving a file,
+add the following hook to your emacs configuration:
+
+\(add-hook 'before-save-hook #'gofmt-before-save)
+
+If you want to use `godef-jump' instead of etags (or similar),
+consider binding godef-jump to `M-.', which is the default key
+for `find-tag':
+
+\(add-hook 'go-mode-hook (lambda ()
+                          (local-set-key (kbd \"M-.\") #'godef-jump)))
+
+Please note that godef is an external dependency. You can install
+it with
+
+go get github.com/rogpeppe/godef
+
+
+If you're looking for even more integration with Go, namely
+on-the-fly syntax checking, auto-completion and snippets, it is
+recommended that you look at flycheck
+\(see URL `https://github.com/flycheck/flycheck') or flymake in combination
+with goflymake (see URL `https://github.com/dougm/goflymake'), gocode
+\(see URL `https://github.com/nsf/gocode'), go-eldoc
+\(see URL `github.com/syohex/emacs-go-eldoc') and yasnippet-go
+\(see URL `https://github.com/dominikh/yasnippet-go')
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist (cons "\\.go\\'" 'go-mode))
+
+(autoload 'gofmt-before-save "go-mode" "\
+Add this to .emacs to run gofmt on the current buffer when saving:
+ (add-hook 'before-save-hook 'gofmt-before-save).
+
+Note that this will cause go-mode to get loaded the first time
+you save any file, kind of defeating the point of autoloading.
+
+\(fn)" t nil)
+
+(autoload 'godoc "go-mode" "\
+Show Go documentation for QUERY, much like M-x man.
+
+\(fn QUERY)" t nil)
+
+(autoload 'go-download-play "go-mode" "\
+Download a paste from the playground and insert it in a Go buffer.
+Tries to look for a URL at point.
+
+\(fn URL)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("go-mode-pkg.el") (22171 46570 869141
+;;;;;;  0))
+
+;;;***
+
+(provide 'go-mode-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; go-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/go-mode-20151226.1224/go-mode-pkg.el b/emacs.d/elpa/go-mode-20151226.1224/go-mode-pkg.el
new file mode 100644
index 0000000..e1600a2
--- /dev/null
+++ b/emacs.d/elpa/go-mode-20151226.1224/go-mode-pkg.el
@@ -0,0 +1,5 @@
+(define-package "go-mode" "20151226.1224" "Major mode for the Go programming language" 'nil :url "https://github.com/dominikh/go-mode.el" :keywords
+  '("languages" "go"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/go-mode-20151226.1224/go-mode.el b/emacs.d/elpa/go-mode-20151226.1224/go-mode.el
new file mode 100644
index 0000000..851b937
--- /dev/null
+++ b/emacs.d/elpa/go-mode-20151226.1224/go-mode.el
@@ -0,0 +1,1567 @@
+;;; go-mode.el --- Major mode for the Go programming language
+
+;; Copyright 2013 The go-mode Authors. All rights reserved.
+;; Use of this source code is governed by a BSD-style
+;; license that can be found in the LICENSE file.
+
+;; Author: The go-mode Authors
+;; Version: 1.3.1
+;; Keywords: languages go
+;; URL: https://github.com/dominikh/go-mode.el
+;;
+;; This file is not part of GNU Emacs.
+
+;;; Code:
+
+(require 'cl)
+(require 'etags)
+(require 'ffap)
+(require 'find-file)
+(require 'ring)
+(require 'url)
+
+;; XEmacs compatibility guidelines
+;; - Minimum required version of XEmacs: 21.5.32
+;;   - Feature that cannot be backported: POSIX character classes in
+;;     regular expressions
+;;   - Functions that could be backported but won't because 21.5.32
+;;     covers them: plenty.
+;;   - Features that are still partly broken:
+;;     - godef will not work correctly if multibyte characters are
+;;       being used
+;;     - Fontification will not handle unicode correctly
+;;
+;; - Do not use \_< and \_> regexp delimiters directly; use
+;;   go--regexp-enclose-in-symbol
+;;
+;; - The character `_` must not be a symbol constituent but a
+;;   character constituent
+;;
+;; - Do not use process-lines
+;;
+;; - Use go--old-completion-list-style when using a plain list as the
+;;   collection for completing-read
+;;
+;; - Use go--position-bytes instead of position-bytes
+(defmacro go--xemacs-p ()
+  `(featurep 'xemacs))
+
+(defun go--delete-whole-line (&optional arg)
+  "Delete the current line without putting it in the `kill-ring'.
+Derived from function `kill-whole-line'.  ARG is defined as for that
+function."
+  (setq arg (or arg 1))
+  (if (and (> arg 0)
+           (eobp)
+           (save-excursion (forward-visible-line 0) (eobp)))
+      (signal 'end-of-buffer nil))
+  (if (and (< arg 0)
+           (bobp)
+           (save-excursion (end-of-visible-line) (bobp)))
+      (signal 'beginning-of-buffer nil))
+  (cond ((zerop arg)
+         (delete-region (progn (forward-visible-line 0) (point))
+                        (progn (end-of-visible-line) (point))))
+        ((< arg 0)
+         (delete-region (progn (end-of-visible-line) (point))
+                        (progn (forward-visible-line (1+ arg))
+                               (unless (bobp)
+                                 (backward-char))
+                               (point))))
+        (t
+         (delete-region (progn (forward-visible-line 0) (point))
+                        (progn (forward-visible-line arg) (point))))))
+
+;; declare-function is an empty macro that only byte-compile cares
+;; about. Wrap in always false if to satisfy Emacsen without that
+;; macro.
+(if nil
+    (declare-function go--position-bytes "go-mode" (point)))
+
+;; XEmacs unfortunately does not offer position-bytes. We can fall
+;; back to just using (point), but it will be incorrect as soon as
+;; multibyte characters are being used.
+(if (fboundp 'position-bytes)
+    (defalias 'go--position-bytes #'position-bytes)
+  (defun go--position-bytes (point) point))
+
+(defun go--old-completion-list-style (list)
+  (mapcar (lambda (x) (cons x nil)) list))
+
+;; GNU Emacs 24 has prog-mode, older GNU Emacs and XEmacs do not, so
+;; copy its definition for those.
+(if (not (fboundp 'prog-mode))
+    (define-derived-mode prog-mode fundamental-mode "Prog"
+      "Major mode for editing source code."
+      (set (make-local-variable 'require-final-newline) mode-require-final-newline)
+      (set (make-local-variable 'parse-sexp-ignore-comments) t)
+      (setq bidi-paragraph-direction 'left-to-right)))
+
+(defun go--regexp-enclose-in-symbol (s)
+  "Enclose S as regexp symbol.
+XEmacs does not support \\_<, GNU Emacs does.  In GNU Emacs we
+make extensive use of \\_< to support unicode in identifiers.
+Until we come up with a better solution for XEmacs, this solution
+will break fontification in XEmacs for identifiers such as
+\"typeµ\".  XEmacs will consider \"type\" a keyword, GNU Emacs
+won't."
+  (if (go--xemacs-p)
+      (concat "\\<" s "\\>")
+    (concat "\\_<" s "\\_>")))
+
+(defun go-goto-opening-parenthesis (&optional _legacy-unused)
+  "Move up one level of parentheses."
+  ;; The old implementation of go-goto-opening-parenthesis had an
+  ;; optional argument to speed up the function.  It didn't change the
+  ;; function's outcome.
+
+  ;; Silently fail if there's no matching opening parenthesis.
+  (condition-case nil
+      (backward-up-list)
+    (scan-error nil)))
+
+
+(defconst go-dangling-operators-regexp "[^-]-\\|[^+]\\+\\|[/*&><.=|^]")
+(defconst go-identifier-regexp "[[:word:][:multibyte:]]+")
+(defconst go-type-name-no-prefix-regexp "\\(?:[[:word:][:multibyte:]]+\\.\\)?[[:word:][:multibyte:]]+")
+(defconst go-qualified-identifier-regexp (concat go-identifier-regexp "\\." go-identifier-regexp))
+(defconst go-label-regexp go-identifier-regexp)
+(defconst go-type-regexp "[[:word:][:multibyte:]*]+")
+(defconst go-func-regexp (concat (go--regexp-enclose-in-symbol "func") "\\s *\\(" go-identifier-regexp "\\)"))
+(defconst go-func-meth-regexp (concat
+                               (go--regexp-enclose-in-symbol "func") "\\s *\\(?:(\\s *"
+                               "\\(" go-identifier-regexp "\\s +\\)?" go-type-regexp
+                               "\\s *)\\s *\\)?\\("
+                               go-identifier-regexp
+                               "\\)("))
+
+(defconst go-builtins
+  '("append" "cap"   "close"   "complex" "copy"
+    "delete" "imag"  "len"     "make"    "new"
+    "panic"  "print" "println" "real"    "recover")
+  "All built-in functions in the Go language.  Used for font locking.")
+
+(defconst go-mode-keywords
+  '("break"    "default"     "func"   "interface" "select"
+    "case"     "defer"       "go"     "map"       "struct"
+    "chan"     "else"        "goto"   "package"   "switch"
+    "const"    "fallthrough" "if"     "range"     "type"
+    "continue" "for"         "import" "return"    "var")
+  "All keywords in the Go language.  Used for font locking.")
+
+(defconst go-constants '("nil" "true" "false" "iota"))
+(defconst go-type-name-regexp (concat "\\(?:[*(]\\)*\\(\\(?:" go-identifier-regexp "\\.\\)?" go-identifier-regexp "\\)"))
+
+;; Maximum number of identifiers that can be highlighted as type names
+;; in one function type/declaration.
+(defconst go--font-lock-func-param-num-groups 16)
+
+(defvar go-dangling-cache)
+(defvar go-godoc-history nil)
+(defvar go--coverage-current-file-name)
+
+(defgroup go nil
+  "Major mode for editing Go code."
+  :link '(url-link "https://github.com/dominikh/go-mode.el")
+  :group 'languages)
+
+(defgroup go-cover nil
+  "Options specific to `cover`."
+  :group 'go)
+
+(defcustom go-fontify-function-calls t
+  "Fontify function and method calls if this is non-nil."
+  :type 'boolean
+  :group 'go)
+
+(defcustom go-mode-hook nil
+  "Hook called by `go-mode'."
+  :type 'hook
+  :group 'go)
+
+(defcustom go-command "go"
+  "The 'go' command.
+Some users have multiple Go development trees and invoke the 'go'
+tool via a wrapper that sets GOROOT and GOPATH based on the
+current directory.  Such users should customize this variable to
+point to the wrapper script."
+  :type 'string
+  :group 'go)
+
+(defcustom gofmt-command "gofmt"
+  "The 'gofmt' command.
+Some users may replace this with 'goimports'
+from https://github.com/bradfitz/goimports."
+  :type 'string
+  :group 'go)
+
+(defcustom gofmt-show-errors 'buffer
+  "Where to display gofmt error output.
+It can either be displayed in its own buffer, in the echo area, or not at all.
+
+Please note that Emacs outputs to the echo area when writing
+files and will overwrite gofmt's echo output if used from inside
+a `before-save-hook'."
+  :type '(choice
+          (const :tag "Own buffer" buffer)
+          (const :tag "Echo area" echo)
+          (const :tag "None" nil))
+  :group 'go)
+
+(defcustom godef-command "godef"
+  "The 'godef' command."
+  :type 'string
+  :group 'go)
+
+(defcustom go-other-file-alist
+  '(("_test\\.go\\'" (".go"))
+    ("\\.go\\'" ("_test.go")))
+  "See the documentation of `ff-other-file-alist' for details."
+  :type '(repeat (list regexp (choice (repeat string) function)))
+  :group 'go)
+
+(defun go--kill-new-message (url)
+  "Make URL the latest kill and print a message."
+  (kill-new url)
+  (message "%s" url))
+
+(defcustom go-play-browse-function 'go--kill-new-message
+  "Function to call with the Playground URL.
+See `go-play-region' for more details."
+  :type '(choice
+          (const :tag "Nothing" nil)
+          (const :tag "Kill + Message" go--kill-new-message)
+          (const :tag "Browse URL" browse-url)
+          (function :tag "Call function"))
+  :group 'go)
+
+(defcustom go-coverage-display-buffer-func 'display-buffer-reuse-window
+  "How `go-coverage' should display the coverage buffer.
+See `display-buffer' for a list of possible functions."
+  :type 'function
+  :group 'go-cover)
+
+(defface go-coverage-untracked
+  '((t (:foreground "#505050")))
+  "Coverage color of untracked code."
+  :group 'go-cover)
+
+(defface go-coverage-0
+  '((t (:foreground "#c00000")))
+  "Coverage color for uncovered code."
+  :group 'go-cover)
+(defface go-coverage-1
+  '((t (:foreground "#808080")))
+  "Coverage color for covered code with weight 1."
+  :group 'go-cover)
+(defface go-coverage-2
+  '((t (:foreground "#748c83")))
+  "Coverage color for covered code with weight 2."
+  :group 'go-cover)
+(defface go-coverage-3
+  '((t (:foreground "#689886")))
+  "Coverage color for covered code with weight 3."
+  :group 'go-cover)
+(defface go-coverage-4
+  '((t (:foreground "#5ca489")))
+  "Coverage color for covered code with weight 4."
+  :group 'go-cover)
+(defface go-coverage-5
+  '((t (:foreground "#50b08c")))
+  "Coverage color for covered code with weight 5."
+  :group 'go-cover)
+(defface go-coverage-6
+  '((t (:foreground "#44bc8f")))
+  "Coverage color for covered code with weight 6."
+  :group 'go-cover)
+(defface go-coverage-7
+  '((t (:foreground "#38c892")))
+  "Coverage color for covered code with weight 7."
+  :group 'go-cover)
+(defface go-coverage-8
+  '((t (:foreground "#2cd495")))
+  "Coverage color for covered code with weight 8.
+For mode=set, all covered lines will have this weight."
+  :group 'go-cover)
+(defface go-coverage-9
+  '((t (:foreground "#20e098")))
+  "Coverage color for covered code with weight 9."
+  :group 'go-cover)
+(defface go-coverage-10
+  '((t (:foreground "#14ec9b")))
+  "Coverage color for covered code with weight 10."
+  :group 'go-cover)
+(defface go-coverage-covered
+  '((t (:foreground "#2cd495")))
+  "Coverage color of covered code."
+  :group 'go-cover)
+
+(defvar go-mode-syntax-table
+  (let ((st (make-syntax-table)))
+    (modify-syntax-entry ?+  "." st)
+    (modify-syntax-entry ?-  "." st)
+    (modify-syntax-entry ?%  "." st)
+    (modify-syntax-entry ?&  "." st)
+    (modify-syntax-entry ?|  "." st)
+    (modify-syntax-entry ?^  "." st)
+    (modify-syntax-entry ?!  "." st)
+    (modify-syntax-entry ?=  "." st)
+    (modify-syntax-entry ?<  "." st)
+    (modify-syntax-entry ?>  "." st)
+    (modify-syntax-entry ?/ (if (go--xemacs-p) ". 1456" ". 124b") st)
+    (modify-syntax-entry ?*  ". 23" st)
+    (modify-syntax-entry ?\n "> b" st)
+    (modify-syntax-entry ?\" "\"" st)
+    (modify-syntax-entry ?\' "\"" st)
+    (modify-syntax-entry ?`  "\"" st)
+    (modify-syntax-entry ?\\ "\\" st)
+    ;; It would be nicer to have _ as a symbol constituent, but that
+    ;; would trip up XEmacs, which does not support the \_< anchor
+    (modify-syntax-entry ?_  "w" st)
+
+    st)
+  "Syntax table for Go mode.")
+
+(defun go--build-font-lock-keywords ()
+  ;; we cannot use 'symbols in regexp-opt because GNU Emacs <24
+  ;; doesn't understand that
+  (append
+   `((go--match-func
+      ,@(mapcar (lambda (x) `(,x font-lock-type-face))
+                (number-sequence 1 go--font-lock-func-param-num-groups)))
+     (,(go--regexp-enclose-in-symbol (regexp-opt go-mode-keywords t)) . font-lock-keyword-face)
+     (,(concat "\\(" (go--regexp-enclose-in-symbol (regexp-opt go-builtins t)) "\\)[[:space:]]*(") 1 font-lock-builtin-face)
+     (,(go--regexp-enclose-in-symbol (regexp-opt go-constants t)) . font-lock-constant-face)
+     (,go-func-regexp 1 font-lock-function-name-face)) ;; function (not method) name
+
+   (if go-fontify-function-calls
+       `((,(concat "\\(" go-identifier-regexp "\\)[[:space:]]*(") 1 font-lock-function-name-face) ;; function call/method name
+         (,(concat "[^[:word:][:multibyte:]](\\(" go-identifier-regexp "\\))[[:space:]]*(") 1 font-lock-function-name-face)) ;; bracketed function call
+     `((,go-func-meth-regexp 2 font-lock-function-name-face))) ;; method name
+
+   `(
+     ("\\(`[^`]*`\\)" 1 font-lock-multiline) ;; raw string literal, needed for font-lock-syntactic-keywords
+     (,(concat (go--regexp-enclose-in-symbol "type") "[[:space:]]+\\([^[:space:]]+\\)") 1 font-lock-type-face) ;; types
+     (,(concat (go--regexp-enclose-in-symbol "type") "[[:space:]]+" go-identifier-regexp "[[:space:]]*" go-type-name-regexp) 1 font-lock-type-face) ;; types
+     (,(concat "[^[:word:][:multibyte:]]\\[\\([[:digit:]]+\\|\\.\\.\\.\\)?\\]" go-type-name-regexp) 2 font-lock-type-face) ;; Arrays/slices
+     (,(concat "\\(" go-identifier-regexp "\\)" "{") 1 font-lock-type-face)
+     (,(concat (go--regexp-enclose-in-symbol "map") "\\[[^]]+\\]" go-type-name-regexp) 1 font-lock-type-face) ;; map value type
+     (,(concat (go--regexp-enclose-in-symbol "map") "\\[" go-type-name-regexp) 1 font-lock-type-face) ;; map key type
+     (,(concat (go--regexp-enclose-in-symbol "chan") "[[:space:]]*\\(?:<-[[:space:]]*\\)?" go-type-name-regexp) 1 font-lock-type-face) ;; channel type
+     (,(concat (go--regexp-enclose-in-symbol "\\(?:new\\|make\\)") "\\(?:[[:space:]]\\|)\\)*(" go-type-name-regexp) 1 font-lock-type-face) ;; new/make type
+     ;; TODO do we actually need this one or isn't it just a function call?
+     (,(concat "\\.\\s *(" go-type-name-regexp) 1 font-lock-type-face) ;; Type conversion
+     ;; Like the original go-mode this also marks compound literal
+     ;; fields. There, it was marked as to fix, but I grew quite
+     ;; accustomed to it, so it'll stay for now.
+     (,(concat "^[[:space:]]*\\(" go-label-regexp "\\)[[:space:]]*:\\(\\S.\\|$\\)") 1 font-lock-constant-face) ;; Labels and compound literal fields
+     (,(concat (go--regexp-enclose-in-symbol "\\(goto\\|break\\|continue\\)") "[[:space:]]*\\(" go-label-regexp "\\)") 2 font-lock-constant-face)))) ;; labels in goto/break/continue
+
+(defconst go--font-lock-syntactic-keywords
+  ;; Override syntax property of raw string literal contents, so that
+  ;; backslashes have no special meaning in ``. Used in Emacs 23 or older.
+  '((go--match-raw-string-literal
+     (1 (7 . ?`))
+     (2 (15 . nil))  ;; 15 = "generic string"
+     (3 (7 . ?`)))))
+
+(defvar go-mode-map
+  (let ((m (make-sparse-keymap)))
+    (define-key m "}" #'go-mode-insert-and-indent)
+    (define-key m ")" #'go-mode-insert-and-indent)
+    (define-key m "," #'go-mode-insert-and-indent)
+    (define-key m ":" #'go-mode-insert-and-indent)
+    (define-key m "=" #'go-mode-insert-and-indent)
+    (define-key m (kbd "C-c C-a") #'go-import-add)
+    (define-key m (kbd "C-c C-j") #'godef-jump)
+    (define-key m (kbd "C-x 4 C-c C-j") #'godef-jump-other-window)
+    (define-key m (kbd "C-c C-d") #'godef-describe)
+    m)
+  "Keymap used by Go mode to implement electric keys.")
+
+(easy-menu-define go-mode-menu go-mode-map
+  "Menu for Go mode."
+  '("Go"
+    ["Describe Expression"   godef-describe t]
+    ["Jump to Definition"    godef-jump t]
+    "---"
+    ["Add Import"            go-import-add t]
+    ["Remove Unused Imports" go-remove-unused-imports t]
+    ["Go to Imports"         go-goto-imports t]
+    "---"
+    ("Playground"
+     ["Send Buffer"          go-play-buffer t]
+     ["Send Region"          go-play-region t]
+     ["Download"             go-download-play t])
+    "---"
+    ["Coverage"              go-coverage t]
+    ["Gofmt"                 gofmt t]
+    ["Godoc"                 godoc t]
+    "---"
+    ["Customize Mode"        (customize-group 'go) t]))
+
+(defun go-mode-insert-and-indent (key)
+  "Invoke the global binding of KEY, then reindent the line."
+
+  (interactive (list (this-command-keys)))
+  (call-interactively (lookup-key (current-global-map) key))
+  (indent-according-to-mode))
+
+(defmacro go-paren-level ()
+  `(car (syntax-ppss)))
+
+(defmacro go-in-string-or-comment-p ()
+  `(nth 8 (syntax-ppss)))
+
+(defmacro go-in-string-p ()
+  `(nth 3 (syntax-ppss)))
+
+(defmacro go-in-comment-p ()
+  `(nth 4 (syntax-ppss)))
+
+(defmacro go-goto-beginning-of-string-or-comment ()
+  `(goto-char (nth 8 (syntax-ppss))))
+
+(defun go--backward-irrelevant (&optional stop-at-string)
+  "Skip backwards over any characters that are irrelevant for
+indentation and related tasks.
+
+It skips over whitespace, comments, cases and labels and, if
+STOP-AT-STRING is not true, over strings."
+
+  (let (pos (start-pos (point)))
+    (skip-chars-backward "\n\s\t")
+    (if (and (save-excursion (beginning-of-line) (go-in-string-p)) (looking-back "`") (not stop-at-string))
+        (backward-char))
+    (if (and (go-in-string-p) (not stop-at-string))
+        (go-goto-beginning-of-string-or-comment))
+    (if (looking-back "\\*/")
+        (backward-char))
+    (if (go-in-comment-p)
+        (go-goto-beginning-of-string-or-comment))
+    (setq pos (point))
+    (beginning-of-line)
+    (if (or (looking-at (concat "^" go-label-regexp ":")) (looking-at "^[[:space:]]*\\(case .+\\|default\\):"))
+        (end-of-line 0)
+      (goto-char pos))
+    (if (/= start-pos (point))
+        (go--backward-irrelevant stop-at-string))
+    (/= start-pos (point))))
+
+(defun go--buffer-narrowed-p ()
+  "Return non-nil if the current buffer is narrowed."
+  (/= (buffer-size)
+      (- (point-max)
+         (point-min))))
+
+(defun go--match-raw-string-literal (end)
+  "Search for a raw string literal.
+Set point to the end of the occurence found on success.  Return nil on failure."
+  (unless (go-in-string-or-comment-p)
+    (when (search-forward "`" end t)
+      (goto-char (match-beginning 0))
+      (if (go-in-string-or-comment-p)
+          (progn (goto-char (match-end 0))
+                 (go--match-raw-string-literal end))
+        (when (looking-at "\\(`\\)\\([^`]*\\)\\(`\\)")
+          (goto-char (match-end 0))
+          t)))))
+
+(defun go-previous-line-has-dangling-op-p ()
+  "Return non-nil if the current line is a continuation line."
+  (let* ((cur-line (line-number-at-pos))
+         (val (gethash cur-line go-dangling-cache 'nope)))
+    (if (or (go--buffer-narrowed-p) (equal val 'nope))
+        (save-excursion
+          (beginning-of-line)
+          (go--backward-irrelevant t)
+          (setq val (looking-back go-dangling-operators-regexp))
+          (if (not (go--buffer-narrowed-p))
+              (puthash cur-line val go-dangling-cache))))
+    val))
+
+(defun go--at-function-definition ()
+  "Return non-nil if point is on the opening curly brace of a
+function definition.
+
+We do this by first calling (beginning-of-defun), which will take
+us to the start of *some* function. We then look for the opening
+curly brace of that function and compare its position against the
+curly brace we are checking. If they match, we return non-nil."
+  (if (= (char-after) ?\{)
+      (save-excursion
+        (let ((old-point (point))
+              start-nesting)
+          (beginning-of-defun)
+          (when (looking-at "func ")
+            (setq start-nesting (go-paren-level))
+            (skip-chars-forward "^{")
+            (while (> (go-paren-level) start-nesting)
+              (forward-char)
+              (skip-chars-forward "^{") 0)
+            (if (and (= (go-paren-level) start-nesting) (= old-point (point)))
+                t))))))
+
+(defun go--indentation-for-opening-parenthesis ()
+  "Return the semantic indentation for the current opening parenthesis.
+
+If point is on an opening curly brace and said curly brace
+belongs to a function declaration, the indentation of the func
+keyword will be returned.  Otherwise the indentation of the
+current line will be returned."
+  (save-excursion
+    (if (go--at-function-definition)
+        (progn
+          (beginning-of-defun)
+          (current-indentation))
+      (current-indentation))))
+
+(defun go-indentation-at-point ()
+  (save-excursion
+    (let (start-nesting)
+      (back-to-indentation)
+      (setq start-nesting (go-paren-level))
+
+      (cond
+       ((go-in-string-p)
+        (current-indentation))
+       ((looking-at "[])}]")
+        (go-goto-opening-parenthesis)
+        (if (go-previous-line-has-dangling-op-p)
+            (- (current-indentation) tab-width)
+          (go--indentation-for-opening-parenthesis)))
+       ((progn (go--backward-irrelevant t) (looking-back go-dangling-operators-regexp))
+        ;; only one nesting for all dangling operators in one operation
+        (if (go-previous-line-has-dangling-op-p)
+            (current-indentation)
+          (+ (current-indentation) tab-width)))
+       ((zerop (go-paren-level))
+        0)
+       ((progn (go-goto-opening-parenthesis) (< (go-paren-level) start-nesting))
+        (if (go-previous-line-has-dangling-op-p)
+            (current-indentation)
+          (+ (go--indentation-for-opening-parenthesis) tab-width)))
+       (t
+        (current-indentation))))))
+
+(defun go-mode-indent-line ()
+  (interactive)
+  (let (indent
+        shift-amt
+        (pos (- (point-max) (point)))
+        (point (point))
+        (beg (line-beginning-position)))
+    (back-to-indentation)
+    (if (go-in-string-or-comment-p)
+        (goto-char point)
+      (setq indent (go-indentation-at-point))
+      (if (looking-at (concat go-label-regexp ":\\([[:space:]]*/.+\\)?$\\|case .+:\\|default:"))
+          (decf indent tab-width))
+      (setq shift-amt (- indent (current-column)))
+      (if (zerop shift-amt)
+          nil
+        (delete-region beg (point))
+        (indent-to indent))
+      ;; If initial point was within line's indentation,
+      ;; position after the indentation.  Else stay at same point in text.
+      (if (> (- (point-max) pos) (point))
+          (goto-char (- (point-max) pos))))))
+
+(defun go-beginning-of-defun (&optional count)
+  (unless (bolp)
+    (end-of-line))
+  (setq count (or count 1))
+  (let (first failure)
+    (dotimes (i (abs count))
+      (setq first t)
+      (while (and (not failure)
+                  (or first (go-in-string-or-comment-p)))
+        (if (>= count 0)
+            (progn
+              (go--backward-irrelevant)
+              (if (not (re-search-backward go-func-meth-regexp nil t))
+                  (setq failure t)))
+          (if (looking-at go-func-meth-regexp)
+              (forward-char))
+          (if (not (re-search-forward go-func-meth-regexp nil t))
+              (setq failure t)))
+        (setq first nil)))
+    (if (< count 0)
+        (beginning-of-line))
+    (not failure)))
+
+(defun go-end-of-defun ()
+  (let (orig-level)
+    ;; It can happen that we're not placed before a function by emacs
+    (if (not (looking-at "func"))
+        (go-beginning-of-defun -1))
+    ;; Find the { that starts the function, i.e., the next { that isn't
+    ;; preceded by struct or interface, or a comment or struct tag.  BUG:
+    ;; breaks if there's a comment between the struct/interface keyword and
+    ;; bracket, like this:
+    ;;
+    ;;     struct /* why? */ { 
+    (while (progn
+      (skip-chars-forward "^{")
+      (forward-char)
+      (or (go-in-string-or-comment-p)
+          (looking-back "\\(struct\\|interface\\)\\s-*{"))))
+    (setq orig-level (go-paren-level))
+    (while (>= (go-paren-level) orig-level)
+      (skip-chars-forward "^}")
+      (forward-char))))
+
+(defun go--find-enclosing-parentheses (position)
+  "Return points of outermost '(' and ')' surrounding POSITION if
+such parentheses exist.
+
+If outermost '(' exists but ')' does not, it returns the next blank
+line or end-of-buffer position instead of the position of the closing
+parenthesis.
+
+If the starting parenthesis is not found, it returns (POSITION
+POSITION)."
+  (save-excursion
+    (let (beg end)
+      (goto-char position)
+      (while (> (go-paren-level) 0)
+        (re-search-backward "[(\\[{]" nil t)
+        (when (looking-at "(")
+          (setq beg (point))))
+      (if (null beg)
+          (list position position)
+        (goto-char position)
+        (while (and (> (go-paren-level) 0)
+                    (search-forward ")" nil t)))
+        (when (> (go-paren-level) 0)
+          (unless (re-search-forward "^[[:space:]]*$" nil t)
+            (goto-char (point-max))))
+        (list beg (point))))))
+
+(defun go--search-next-comma (end)
+  "Search forward from point for a comma whose nesting level is
+the same as point.  If it reaches the end of line or a closing
+parenthesis before a comma, it stops at it."
+  (let ((orig-level (go-paren-level)))
+    (while (and (< (point) end)
+                (or (looking-at "[^,)\n]")
+                    (> (go-paren-level) orig-level)))
+      (forward-char))
+    (when (and (looking-at ",")
+               (< (point) (1- end)))
+      (forward-char))))
+
+(defun go--looking-at-keyword ()
+  (and (looking-at (concat "\\(" go-identifier-regexp "\\)"))
+       (member (match-string 1) go-mode-keywords)))
+
+(defun go--match-func (end)
+  "Search for identifiers used as type names from a function
+parameter list, and set the identifier positions as the results
+of last search.  Return t if search succeeded."
+  (when (re-search-forward (go--regexp-enclose-in-symbol "func") end t)
+    (let ((regions (go--match-func-type-names end)))
+      (if (null regions)
+          ;; Nothing to highlight. This can happen if the current func
+          ;; is "func()". Try next one.
+          (go--match-func end)
+        ;; There are something to highlight. Set those positions as
+        ;; last search results.
+        (setq regions (go--filter-match-data regions end))
+        (when regions
+          (set-match-data (go--make-match-data regions))
+          t)))))
+
+(defun go--match-func-type-names (end)
+  (cond
+   ;; Function declaration (e.g. "func foo(")
+   ((looking-at (concat "[[:space:]\n]*" go-identifier-regexp "[[:space:]\n]*("))
+    (goto-char (match-end 0))
+    (nconc (go--match-parameter-list end)
+           (go--match-function-result end)))
+   ;; Method declaration, function literal, or function type
+   ((looking-at "[[:space:]]*(")
+    (goto-char (match-end 0))
+    (let ((regions (go--match-parameter-list end)))
+      ;; Method declaration (e.g. "func (x y) foo(")
+      (when (looking-at (concat "[[:space:]]*" go-identifier-regexp "[[:space:]\n]*("))
+        (goto-char (match-end 0))
+        (setq regions (nconc regions (go--match-parameter-list end))))
+      (nconc regions (go--match-function-result end))))))
+
+(defun go--parameter-list-type (end)
+  "Return `present' if the parameter list has names, or `absent' if
+not, assuming point is at the beginning of a parameter list, just
+after '('."
+  (save-excursion
+    (skip-chars-forward "[:space:]\n" end)
+    (cond ((> (point) end)
+           nil)
+          ((looking-at (concat go-identifier-regexp "[[:space:]\n]*,"))
+           (goto-char (match-end 0))
+           (go--parameter-list-type end))
+          ((or (looking-at go-qualified-identifier-regexp)
+               (looking-at (concat go-type-name-no-prefix-regexp "[[:space:]\n]*\\(?:)\\|\\'\\)"))
+               (go--looking-at-keyword)
+               (looking-at "[*\\[]\\|\\.\\.\\.\\|\\'"))
+           'absent)
+          (t 'present))))
+
+(defconst go--opt-dotdotdot-regexp "\\(?:\\.\\.\\.\\)?")
+(defconst go--parameter-type-regexp
+  (concat go--opt-dotdotdot-regexp "[[:space:]*\n]*\\(" go-type-name-no-prefix-regexp "\\)[[:space:]\n]*\\([,)]\\|\\'\\)"))
+(defconst go--func-type-in-parameter-list-regexp
+  (concat go--opt-dotdotdot-regexp "[[:space:]*\n]*\\(" (go--regexp-enclose-in-symbol "func") "\\)"))
+
+(defun go--match-parameters-common (identifier-regexp end)
+  (let ((acc ())
+        (start -1))
+    (while (progn (skip-chars-forward "[:space:]\n" end)
+                  (and (not (looking-at "\\(?:)\\|\\'\\)"))
+                       (< start (point))
+                       (<= (point) end)))
+      (setq start (point))
+      (cond
+       ((looking-at (concat identifier-regexp go--parameter-type-regexp))
+        (setq acc (nconc acc (list (match-beginning 1) (match-end 1))))
+        (goto-char (match-beginning 2)))
+       ((looking-at (concat identifier-regexp go--func-type-in-parameter-list-regexp))
+        (goto-char (match-beginning 1))
+        (setq acc (nconc acc (go--match-func-type-names end)))
+        (go--search-next-comma end))
+       (t
+        (go--search-next-comma end))))
+    (when (and (looking-at ")")
+               (< (point) end))
+      (forward-char))
+    acc))
+
+(defun go--match-parameters-with-identifier-list (end)
+  (go--match-parameters-common
+   (concat go-identifier-regexp "[[:space:]\n]+")
+   end))
+
+(defun go--match-parameters-without-identifier-list (end)
+  (go--match-parameters-common "" end))
+
+(defun go--filter-match-data (regions end)
+  "Remove points from REGIONS if they are beyond END.
+REGIONS are a list whose size is multiple of 2.  Element 2n is beginning of a
+region and 2n+1 is end of it.
+
+This function is used to make sure we don't override end point
+that `font-lock-mode' gave to us."
+  (when regions
+    (let* ((vec (vconcat regions))
+           (i 0)
+           (len (length vec)))
+      (while (and (< i len)
+                  (<= (nth i regions) end)
+                  (<= (nth (1+ i) regions) end))
+        (setq i (+ i 2)))
+      (cond ((= i len)
+             regions)
+            ((zerop i)
+             nil)
+            (t
+             (butlast regions (- (length regions) i)))))))
+
+(defun go--make-match-data (regions)
+  (let ((deficit (- (* 2 go--font-lock-func-param-num-groups)
+                    (length regions))))
+    (when (> deficit 0)
+      (let ((last (car (last regions))))
+        (setq regions (nconc regions (make-list deficit last))))))
+  `(,(car regions) ,@(last regions) ,@regions))
+
+(defun go--match-parameter-list (end)
+  "Return a list of identifier positions that are used as type
+names in a function parameter list, assuming point is at the
+beginning of a parameter list.  Return nil if the text after
+point does not look like a parameter list.
+
+Set point to end of closing parenthesis on success.
+
+In Go, the names must either all be present or all be absent
+within a list of parameters.
+
+Parsing a parameter list is a little bit complicated because we
+have to scan through the parameter list to determine whether or
+not the list has names. Until a type name is found or reaching
+end of a parameter list, we are not sure which form the parameter
+list is.
+
+For example, X and Y are type names in a parameter list \"(X,
+Y)\" but are parameter names in \"(X, Y int)\". We cannot say if
+X is a type name until we see int after Y.
+
+Note that even \"(int, float T)\" is a valid parameter
+list. Builtin type names are not reserved words. In this example,
+int and float are parameter names and only T is a type name.
+
+In this function, we first scan the parameter list to see if the
+list has names, and then handle it accordingly."
+  (let ((name (go--parameter-list-type end)))
+    (cond ((eq name 'present)
+           (go--match-parameters-with-identifier-list end))
+          ((eq name 'absent)
+           (go--match-parameters-without-identifier-list end))
+          (t nil))))
+
+(defun go--match-function-result (end)
+  "Return a list of identifier positions that are used as type
+names in a function result, assuming point is at the beginning of
+a result.
+
+Function result is a unparenthesized type or a parameter list."
+  (cond ((and (looking-at (concat "[[:space:]*]*\\(" go-type-name-no-prefix-regexp "\\)"))
+              (not (member (match-string 1) go-mode-keywords)))
+         (list (match-beginning 1) (match-end 1)))
+        ((looking-at "[[:space:]]*(")
+         (goto-char (match-end 0))
+         (go--match-parameter-list end))
+        (t nil)))
+
+;;;###autoload
+(define-derived-mode go-mode prog-mode "Go"
+  "Major mode for editing Go source text.
+
+This mode provides (not just) basic editing capabilities for
+working with Go code. It offers almost complete syntax
+highlighting, indentation that is almost identical to gofmt and
+proper parsing of the buffer content to allow features such as
+navigation by function, manipulation of comments or detection of
+strings.
+
+In addition to these core features, it offers various features to
+help with writing Go code. You can directly run buffer content
+through gofmt, read godoc documentation from within Emacs, modify
+and clean up the list of package imports or interact with the
+Playground (uploading and downloading pastes).
+
+The following extra functions are defined:
+
+- `gofmt'
+- `godoc'
+- `go-import-add'
+- `go-remove-unused-imports'
+- `go-goto-imports'
+- `go-play-buffer' and `go-play-region'
+- `go-download-play'
+- `godef-describe' and `godef-jump'
+- `go-coverage'
+
+If you want to automatically run `gofmt' before saving a file,
+add the following hook to your emacs configuration:
+
+\(add-hook 'before-save-hook #'gofmt-before-save)
+
+If you want to use `godef-jump' instead of etags (or similar),
+consider binding godef-jump to `M-.', which is the default key
+for `find-tag':
+
+\(add-hook 'go-mode-hook (lambda ()
+                          (local-set-key (kbd \"M-.\") #'godef-jump)))
+
+Please note that godef is an external dependency. You can install
+it with
+
+go get github.com/rogpeppe/godef
+
+
+If you're looking for even more integration with Go, namely
+on-the-fly syntax checking, auto-completion and snippets, it is
+recommended that you look at flycheck
+\(see URL `https://github.com/flycheck/flycheck') or flymake in combination
+with goflymake \(see URL `https://github.com/dougm/goflymake'), gocode
+\(see URL `https://github.com/nsf/gocode'), go-eldoc
+\(see URL `github.com/syohex/emacs-go-eldoc') and yasnippet-go
+\(see URL `https://github.com/dominikh/yasnippet-go')"
+
+  ;; Font lock
+  (set (make-local-variable 'font-lock-defaults)
+       '(go--build-font-lock-keywords))
+
+  ;; Indentation
+  (set (make-local-variable 'indent-line-function) #'go-mode-indent-line)
+
+  ;; Comments
+  (set (make-local-variable 'comment-start) "// ")
+  (set (make-local-variable 'comment-end)   "")
+  (set (make-local-variable 'comment-use-syntax) t)
+  (set (make-local-variable 'comment-start-skip) "\\(//+\\|/\\*+\\)\\s *")
+
+  (set (make-local-variable 'beginning-of-defun-function) #'go-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function) #'go-end-of-defun)
+
+  (set (make-local-variable 'parse-sexp-lookup-properties) t)
+  (if (boundp 'syntax-propertize-function)
+      (set (make-local-variable 'syntax-propertize-function) #'go-propertize-syntax)
+    (set (make-local-variable 'font-lock-syntactic-keywords)
+         go--font-lock-syntactic-keywords)
+    (set (make-local-variable 'font-lock-multiline) t))
+
+  (set (make-local-variable 'go-dangling-cache) (make-hash-table :test 'eql))
+  (add-hook 'before-change-functions (lambda (x y) (setq go-dangling-cache (make-hash-table :test 'eql))) t t)
+
+  ;; ff-find-other-file
+  (setq ff-other-file-alist 'go-other-file-alist)
+
+  (setq imenu-generic-expression
+        '(("type" "^type *\\([^ \t\n\r\f]*\\)" 1)
+          ("func" "^func *\\(.*\\) {" 1)))
+  (imenu-add-to-menubar "Index")
+
+  ;; Go style
+  (setq indent-tabs-mode t)
+
+  ;; Handle unit test failure output in compilation-mode
+  ;;
+  ;; Note the final t argument to add-to-list for append, ie put these at the
+  ;; *ends* of compilation-error-regexp-alist[-alist]. We want go-test to be
+  ;; handled first, otherwise other elements will match that don't work, and
+  ;; those alists are traversed in *reverse* order:
+  ;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2001-12/msg00674.html
+  (when (and (boundp 'compilation-error-regexp-alist)
+             (boundp 'compilation-error-regexp-alist-alist))
+    (add-to-list 'compilation-error-regexp-alist 'go-test t)
+    (add-to-list 'compilation-error-regexp-alist-alist
+                 '(go-test . ("^\t+\\([^()\t\n]+\\):\\([0-9]+\\):? .*$" 1 2)) t)))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist (cons "\\.go\\'" 'go-mode))
+
+(defun go--apply-rcs-patch (patch-buffer)
+  "Apply an RCS-formatted diff from PATCH-BUFFER to the current buffer."
+  (let ((target-buffer (current-buffer))
+        ;; Relative offset between buffer line numbers and line numbers
+        ;; in patch.
+        ;;
+        ;; Line numbers in the patch are based on the source file, so
+        ;; we have to keep an offset when making changes to the
+        ;; buffer.
+        ;;
+        ;; Appending lines decrements the offset (possibly making it
+        ;; negative), deleting lines increments it. This order
+        ;; simplifies the forward-line invocations.
+        (line-offset 0))
+    (save-excursion
+      (with-current-buffer patch-buffer
+        (goto-char (point-min))
+        (while (not (eobp))
+          (unless (looking-at "^\\([ad]\\)\\([0-9]+\\) \\([0-9]+\\)")
+            (error "invalid rcs patch or internal error in go--apply-rcs-patch"))
+          (forward-line)
+          (let ((action (match-string 1))
+                (from (string-to-number (match-string 2)))
+                (len  (string-to-number (match-string 3))))
+            (cond
+             ((equal action "a")
+              (let ((start (point)))
+                (forward-line len)
+                (let ((text (buffer-substring start (point))))
+                  (with-current-buffer target-buffer
+                    (decf line-offset len)
+                    (goto-char (point-min))
+                    (forward-line (- from len line-offset))
+                    (insert text)))))
+             ((equal action "d")
+              (with-current-buffer target-buffer
+                (go--goto-line (- from line-offset))
+                (incf line-offset len)
+                (go--delete-whole-line len)))
+             (t
+              (error "invalid rcs patch or internal error in go--apply-rcs-patch")))))))))
+
+(defun gofmt ()
+  "Format the current buffer according to the gofmt tool."
+  (interactive)
+  (let ((tmpfile (make-temp-file "gofmt" nil ".go"))
+        (patchbuf (get-buffer-create "*Gofmt patch*"))
+        (errbuf (if gofmt-show-errors (get-buffer-create "*Gofmt Errors*")))
+        (coding-system-for-read 'utf-8)
+        (coding-system-for-write 'utf-8))
+
+    (unwind-protect
+        (save-restriction
+          (widen)
+          (if errbuf
+              (with-current-buffer errbuf
+                (setq buffer-read-only nil)
+                (erase-buffer)))
+          (with-current-buffer patchbuf
+            (erase-buffer))
+
+          (write-region nil nil tmpfile)
+
+          ;; We're using errbuf for the mixed stdout and stderr output. This
+          ;; is not an issue because gofmt -w does not produce any stdout
+          ;; output in case of success.
+          (if (zerop (call-process gofmt-command nil errbuf nil "-w" tmpfile))
+              (progn
+                (if (zerop (call-process-region (point-min) (point-max) "diff" nil patchbuf nil "-n" "-" tmpfile))
+                    (message "Buffer is already gofmted")
+                  (go--apply-rcs-patch patchbuf)
+                  (message "Applied gofmt"))
+                (if errbuf (gofmt--kill-error-buffer errbuf)))
+            (message "Could not apply gofmt")
+            (if errbuf (gofmt--process-errors (buffer-file-name) tmpfile errbuf))))
+
+      (kill-buffer patchbuf)
+      (delete-file tmpfile))))
+
+
+(defun gofmt--process-errors (filename tmpfile errbuf)
+  (with-current-buffer errbuf
+    (if (eq gofmt-show-errors 'echo)
+        (progn
+          (message "%s" (buffer-string))
+          (gofmt--kill-error-buffer errbuf))
+      ;; Convert the gofmt stderr to something understood by the compilation mode.
+      (goto-char (point-min))
+      (insert "gofmt errors:\n")
+      (while (search-forward-regexp (concat "^\\(" (regexp-quote tmpfile) "\\):") nil t)
+        (replace-match (file-name-nondirectory filename) t t nil 1))
+      (compilation-mode)
+      (display-buffer errbuf))))
+
+(defun gofmt--kill-error-buffer (errbuf)
+  (let ((win (get-buffer-window errbuf)))
+    (if win
+        (quit-window t win)
+      (kill-buffer errbuf))))
+
+;;;###autoload
+(defun gofmt-before-save ()
+  "Add this to .emacs to run gofmt on the current buffer when saving:
+ (add-hook 'before-save-hook 'gofmt-before-save).
+
+Note that this will cause go-mode to get loaded the first time
+you save any file, kind of defeating the point of autoloading."
+
+  (interactive)
+  (when (eq major-mode 'go-mode) (gofmt)))
+
+(defun godoc--read-query ()
+  "Read a godoc query from the minibuffer."
+  ;; Compute the default query as the symbol under the cursor.
+  ;; TODO: This does the wrong thing for e.g. multipart.NewReader (it only grabs
+  ;; half) but I see no way to disambiguate that from e.g. foobar.SomeMethod.
+  (let* ((bounds (bounds-of-thing-at-point 'symbol))
+         (symbol (if bounds
+                     (buffer-substring-no-properties (car bounds)
+                                                     (cdr bounds)))))
+    (completing-read (if symbol
+                         (format "godoc (default %s): " symbol)
+                       "godoc: ")
+                     (go--old-completion-list-style (go-packages)) nil nil nil 'go-godoc-history symbol)))
+
+(defun godoc--get-buffer (query)
+  "Get an empty buffer for a godoc query."
+  (let* ((buffer-name (concat "*godoc " query "*"))
+         (buffer (get-buffer buffer-name)))
+    ;; Kill the existing buffer if it already exists.
+    (when buffer (kill-buffer buffer))
+    (get-buffer-create buffer-name)))
+
+(defun godoc--buffer-sentinel (proc event)
+  "Sentinel function run when godoc command completes."
+  (with-current-buffer (process-buffer proc)
+    (cond ((string= event "finished\n")  ;; Successful exit.
+           (goto-char (point-min))
+           (godoc-mode)
+           (display-buffer (current-buffer) t))
+          ((/= (process-exit-status proc) 0)  ;; Error exit.
+           (let ((output (buffer-string)))
+             (kill-buffer (current-buffer))
+             (message (concat "godoc: " output)))))))
+
+(define-derived-mode godoc-mode special-mode "Godoc"
+  "Major mode for showing Go documentation."
+  (view-mode-enter))
+
+;;;###autoload
+(defun godoc (query)
+  "Show Go documentation for QUERY, much like M-x man."
+  (interactive (list (godoc--read-query)))
+  (unless (string= query "")
+    (set-process-sentinel
+     (start-process-shell-command "godoc" (godoc--get-buffer query)
+                                  (concat "godoc " query))
+     'godoc--buffer-sentinel)
+    nil))
+
+(defun godoc-at-point (point)
+  "Show Go documentation for the identifier at POINT.
+
+`godoc-at-point' requires godef to work.
+
+Due to a limitation in godoc, it is not possible to differentiate
+between functions and methods, which may cause `godoc-at-point'
+to display more documentation than desired."
+  ;; TODO(dominikh): Support executing godoc-at-point on a package
+  ;; name.
+  (interactive "d")
+  (condition-case nil
+      (let* ((output (godef--call point))
+             (file (car output))
+             (name-parts (split-string (cadr output) " "))
+             (first (car name-parts)))
+        (if (not (godef--successful-p file))
+            (message "%s" (godef--error file))
+          (godoc (format "%s %s"
+                         (file-name-directory file)
+                         (if (or (string= first "type") (string= first "const"))
+                             (cadr name-parts)
+                           (car name-parts))))))
+    (file-error (message "Could not run godef binary"))))
+
+(defun go-goto-imports ()
+  "Move point to the block of imports.
+
+If using
+
+  import (
+    \"foo\"
+    \"bar\"
+  )
+
+it will move point directly behind the last import.
+
+If using
+
+  import \"foo\"
+  import \"bar\"
+
+it will move point to the next line after the last import.
+
+If no imports can be found, point will be moved after the package
+declaration."
+  (interactive)
+  ;; FIXME if there's a block-commented import before the real
+  ;; imports, we'll jump to that one.
+
+  ;; Generally, this function isn't very forgiving. it'll bark on
+  ;; extra whitespace. It works well for clean code.
+  (let ((old-point (point)))
+    (goto-char (point-min))
+    (cond
+     ((re-search-forward "^import ()" nil t)
+      (backward-char 1)
+      'block-empty)
+     ((re-search-forward "^import ([^)]+)" nil t)
+      (backward-char 2)
+      'block)
+     ((re-search-forward "\\(^import \\([^\"]+ \\)?\"[^\"]+\"\n?\\)+" nil t)
+      'single)
+     ((re-search-forward "^[[:space:]\n]*package .+?\n" nil t)
+      (message "No imports found, moving point after package declaration")
+      'none)
+     (t
+      (goto-char old-point)
+      (message "No imports or package declaration found. Is this really a Go file?")
+      'fail))))
+
+(defun go-play-buffer ()
+  "Like `go-play-region', but acts on the entire buffer."
+  (interactive)
+  (go-play-region (point-min) (point-max)))
+
+(defun go-play-region (start end)
+  "Send the region to the Playground.
+If non-nil `go-play-browse-function' is called with the
+Playground URL."
+  (interactive "r")
+  (let* ((url-request-method "POST")
+         (url-request-extra-headers
+          '(("Content-Type" . "application/x-www-form-urlencoded")))
+         (url-request-data
+          (encode-coding-string
+           (buffer-substring-no-properties start end)
+           'utf-8))
+         (content-buf (url-retrieve
+                       "http://play.golang.org/share"
+                       (lambda (arg)
+                         (cond
+                          ((equal :error (car arg))
+                           (signal 'go-play-error (cdr arg)))
+                          (t
+                           (re-search-forward "\n\n")
+                           (let ((url (format "http://play.golang.org/p/%s"
+                                              (buffer-substring (point) (point-max)))))
+                             (when go-play-browse-function
+                               (funcall go-play-browse-function url)))))))))))
+
+;;;###autoload
+(defun go-download-play (url)
+  "Download a paste from the playground and insert it in a Go buffer.
+Tries to look for a URL at point."
+  (interactive (list (read-from-minibuffer "Playground URL: " (ffap-url-p (ffap-string-at-point 'url)))))
+  (with-current-buffer
+      (let ((url-request-method "GET") url-request-data url-request-extra-headers)
+        (url-retrieve-synchronously (concat url ".go")))
+    (let ((buffer (generate-new-buffer (concat (car (last (split-string url "/"))) ".go"))))
+      (goto-char (point-min))
+      (re-search-forward "\n\n")
+      (copy-to-buffer buffer (point) (point-max))
+      (kill-buffer)
+      (with-current-buffer buffer
+        (go-mode)
+        (switch-to-buffer buffer)))))
+
+(defun go-propertize-syntax (start end)
+  (save-excursion
+    (goto-char start)
+    (while (search-forward "\\" end t)
+      (put-text-property (1- (point)) (point) 'syntax-table (if (= (char-after) ?`) '(1) '(9))))))
+
+(defun go-import-add (arg import)
+  "Add a new IMPORT to the list of imports.
+
+When called with a prefix ARG asks for an alternative name to
+import the package as.
+
+If no list exists yet, one will be created if possible.
+
+If an identical import has been commented, it will be
+uncommented, otherwise a new import will be added."
+
+  ;; - If there's a matching `// import "foo"`, uncomment it
+  ;; - If we're in an import() block and there's a matching `"foo"`, uncomment it
+  ;; - Otherwise add a new import, with the appropriate syntax
+  (interactive
+   (list
+    current-prefix-arg
+    (replace-regexp-in-string "^[\"']\\|[\"']$" "" (completing-read "Package: " (go--old-completion-list-style (go-packages))))))
+  (save-excursion
+    (let (as line import-start)
+      (if arg
+          (setq as (read-from-minibuffer "Import as: ")))
+      (if as
+          (setq line (format "%s \"%s\"" as import))
+        (setq line (format "\"%s\"" import)))
+
+      (goto-char (point-min))
+      (if (re-search-forward (concat "^[[:space:]]*//[[:space:]]*import " line "$") nil t)
+          (uncomment-region (line-beginning-position) (line-end-position))
+        (case (go-goto-imports)
+          ('fail (message "Could not find a place to add import."))
+          ('block-empty
+           (insert "\n\t" line "\n"))
+          ('block
+              (save-excursion
+                (re-search-backward "^import (")
+                (setq import-start (point)))
+            (if (re-search-backward (concat "^[[:space:]]*//[[:space:]]*" line "$")  import-start t)
+                (uncomment-region (line-beginning-position) (line-end-position))
+              (insert "\n\t" line)))
+          ('single (insert "import " line "\n"))
+          ('none (insert "\nimport (\n\t" line "\n)\n")))))))
+
+(defun go-root-and-paths ()
+  (let* ((output (split-string (shell-command-to-string (concat go-command " env GOROOT GOPATH"))
+                               "\n"))
+         (root (car output))
+         (paths (split-string (cadr output) path-separator)))
+    (append (list root) paths)))
+
+(defun go--string-prefix-p (s1 s2 &optional ignore-case)
+  "Return non-nil if S1 is a prefix of S2.
+If IGNORE-CASE is non-nil, the comparison is case-insensitive."
+  (eq t (compare-strings s1 nil nil
+                         s2 0 (length s1) ignore-case)))
+
+(defun go--directory-dirs (dir)
+  "Recursively return all subdirectories in DIR."
+  (if (file-directory-p dir)
+      (let ((dir (directory-file-name dir))
+            (dirs '())
+            (files (directory-files dir nil nil t)))
+        (dolist (file files)
+          (unless (member file '("." ".."))
+            (let ((file (concat dir "/" file)))
+              (if (file-directory-p file)
+                  (setq dirs (append (cons file
+                                           (go--directory-dirs file))
+                                     dirs))))))
+        dirs)
+    '()))
+
+
+(defun go-packages ()
+  (sort
+   (delete-dups
+    (mapcan
+     (lambda (topdir)
+       (let ((pkgdir (concat topdir "/pkg/")))
+         (mapcan (lambda (dir)
+                   (mapcar (lambda (file)
+                             (let ((sub (substring file (length pkgdir) -2)))
+                               (unless (or (go--string-prefix-p "obj/" sub) (go--string-prefix-p "tool/" sub))
+                                 (mapconcat #'identity (cdr (split-string sub "/")) "/"))))
+                           (if (file-directory-p dir)
+                               (directory-files dir t "\\.a$"))))
+                 (if (file-directory-p pkgdir)
+                     (go--directory-dirs pkgdir)))))
+     (go-root-and-paths)))
+   #'string<))
+
+(defun go-unused-imports-lines ()
+  ;; FIXME Technically, -o /dev/null fails in quite some cases (on
+  ;; Windows, when compiling from within GOPATH). Practically,
+  ;; however, it has the same end result: There won't be a
+  ;; compiled binary/archive, and we'll get our import errors when
+  ;; there are any.
+  (reverse (remove nil
+                   (mapcar
+                    (lambda (line)
+                      (when (string-match "^\\(.+\\):\\([[:digit:]]+\\): imported and not used: \".+\".*$" line)
+                        (let ((error-file-name (match-string 1 line))
+                              (error-line-num (match-string 2 line)))
+                          (if (string= (file-truename error-file-name) (file-truename buffer-file-name))
+                              (string-to-number error-line-num)))))
+                    (split-string (shell-command-to-string
+                                   (concat go-command
+                                           (if (string-match "_test\\.go$" buffer-file-truename)
+                                               " test -c"
+                                             " build -o /dev/null")
+                                           " -gcflags=-e"
+                                           " "
+                                           (shell-quote-argument (file-truename buffer-file-name)))) "\n")))))
+
+(defun go-remove-unused-imports (arg)
+  "Remove all unused imports.
+If ARG is non-nil, unused imports will be commented, otherwise
+they will be removed completely."
+  (interactive "P")
+  (save-excursion
+    (let ((cur-buffer (current-buffer)) flymake-state lines)
+      (when (boundp 'flymake-mode)
+        (setq flymake-state flymake-mode)
+        (flymake-mode-off))
+      (save-some-buffers nil (lambda () (equal cur-buffer (current-buffer))))
+      (if (buffer-modified-p)
+          (message "Cannot operate on unsaved buffer")
+        (setq lines (go-unused-imports-lines))
+        (dolist (import lines)
+          (go--goto-line import)
+          (beginning-of-line)
+          (if arg
+              (comment-region (line-beginning-position) (line-end-position))
+            (go--delete-whole-line)))
+        (message "Removed %d imports" (length lines)))
+      (if flymake-state (flymake-mode-on)))))
+
+(defun godef--find-file-line-column (specifier other-window)
+  "Given a file name in the format of `filename:line:column',
+visit FILENAME and go to line LINE and column COLUMN."
+  (if (not (string-match "\\(.+\\):\\([0-9]+\\):\\([0-9]+\\)" specifier))
+      ;; We've only been given a directory name
+      (funcall (if other-window #'find-file-other-window #'find-file) specifier)
+    (let ((filename (match-string 1 specifier))
+          (line (string-to-number (match-string 2 specifier)))
+          (column (string-to-number (match-string 3 specifier))))
+      (funcall (if other-window #'find-file-other-window #'find-file) filename)
+      (go--goto-line line)
+      (beginning-of-line)
+      (forward-char (1- column))
+      (if (buffer-modified-p)
+          (message "Buffer is modified, file position might not have been correct")))))
+
+(defun godef--call (point)
+  "Call godef, acquiring definition position and expression
+description at POINT."
+  (if (go--xemacs-p)
+      (error "godef does not reliably work in XEmacs, expect bad results"))
+  (if (not (buffer-file-name (go--coverage-origin-buffer)))
+      (error "Cannot use godef on a buffer without a file name")
+    (let ((outbuf (get-buffer-create "*godef*"))
+          (coding-system-for-read 'utf-8)
+          (coding-system-for-write 'utf-8))
+      (with-current-buffer outbuf
+        (erase-buffer))
+      (call-process-region (point-min)
+                           (point-max)
+                           godef-command
+                           nil
+                           outbuf
+                           nil
+                           "-i"
+                           "-t"
+                           "-f"
+                           (file-truename (buffer-file-name (go--coverage-origin-buffer)))
+                           "-o"
+                           (number-to-string (go--position-bytes point)))
+      (with-current-buffer outbuf
+        (split-string (buffer-substring-no-properties (point-min) (point-max)) "\n")))))
+
+(defun godef--successful-p (output)
+  (not (or (string= "-" output)
+           (string= "godef: no identifier found" output)
+           (go--string-prefix-p "godef: no declaration found for " output)
+           (go--string-prefix-p "error finding import path for " output))))
+
+(defun godef--error (output)
+  (cond
+   ((godef--successful-p output)
+    nil)
+   ((string= "-" output)
+    "godef: expression is not defined anywhere")
+   (t
+    output)))
+
+(defun godef-describe (point)
+  "Describe the expression at POINT."
+  (interactive "d")
+  (condition-case nil
+      (let ((description (cdr (butlast (godef--call point) 1))))
+        (if (not description)
+            (message "No description found for expression at point")
+          (message "%s" (mapconcat #'identity description "\n"))))
+    (file-error (message "Could not run godef binary"))))
+
+(defun godef-jump (point &optional other-window)
+  "Jump to the definition of the expression at POINT."
+  (interactive "d")
+  (condition-case nil
+      (let ((file (car (godef--call point))))
+        (if (not (godef--successful-p file))
+            (message "%s" (godef--error file))
+          (push-mark)
+          (ring-insert find-tag-marker-ring (point-marker))
+          (godef--find-file-line-column file other-window)))
+    (file-error (message "Could not run godef binary"))))
+
+(defun godef-jump-other-window (point)
+  (interactive "d")
+  (godef-jump point t))
+
+(defun go--goto-line (line)
+  (goto-char (point-min))
+  (forward-line (1- line)))
+
+(defun go--line-column-to-point (line column)
+  (save-excursion
+    (go--goto-line line)
+    (forward-char (1- column))
+    (point)))
+
+(defstruct go--covered
+  start-line start-column end-line end-column covered count)
+
+(defun go--coverage-file ()
+  "Return the coverage file to use, either by reading it from the
+current coverage buffer or by prompting for it."
+  (if (boundp 'go--coverage-current-file-name)
+      go--coverage-current-file-name
+    (read-file-name "Coverage file: " nil nil t)))
+
+(defun go--coverage-origin-buffer ()
+  "Return the buffer to base the coverage on."
+  (or (buffer-base-buffer) (current-buffer)))
+
+(defun go--coverage-face (count divisor)
+  "Return the intensity face for COUNT when using DIVISOR
+to scale it to a range [0,10].
+
+DIVISOR scales the absolute cover count to values from 0 to 10.
+For DIVISOR = 0 the count will always translate to 8."
+  (let* ((norm (cond
+                ((= count 0)
+                 -0.1) ;; Uncovered code, set to -0.1 so n becomes 0.
+                ((= divisor 0)
+                 0.8) ;; covermode=set, set to 0.8 so n becomes 8.
+                (t
+                 (/ (log count) divisor))))
+         (n (1+ (floor (* norm 9))))) ;; Convert normalized count [0,1] to intensity [0,10]
+    (concat "go-coverage-" (number-to-string n))))
+
+(defun go--coverage-make-overlay (range divisor)
+  "Create a coverage overlay for a RANGE of covered/uncovered code.
+Use DIVISOR to scale absolute counts to a [0,10] scale."
+  (let* ((count (go--covered-count range))
+         (face (go--coverage-face count divisor))
+         (ov (make-overlay (go--line-column-to-point (go--covered-start-line range)
+                                                     (go--covered-start-column range))
+                           (go--line-column-to-point (go--covered-end-line range)
+                                                     (go--covered-end-column range)))))
+
+    (overlay-put ov 'face face)
+    (overlay-put ov 'help-echo (format "Count: %d" count))))
+
+(defun go--coverage-clear-overlays ()
+  "Remove existing overlays and put a single untracked overlay
+over the entire buffer."
+  (remove-overlays)
+  (overlay-put (make-overlay (point-min) (point-max))
+               'face
+               'go-coverage-untracked))
+
+(defun go--coverage-parse-file (coverage-file file-name)
+  "Parse COVERAGE-FILE and extract coverage information and
+divisor for FILE-NAME."
+  (let (ranges
+        (max-count 0))
+    (with-temp-buffer
+      (insert-file-contents coverage-file)
+      (go--goto-line 2) ;; Skip over mode
+      (while (not (eobp))
+        (let* ((parts (split-string (buffer-substring (point-at-bol) (point-at-eol)) ":"))
+               (file (car parts))
+               (rest (split-string (nth 1 parts) "[., ]")))
+
+          (destructuring-bind
+              (start-line start-column end-line end-column num count)
+              (mapcar #'string-to-number rest)
+
+            (when (string= (file-name-nondirectory file) file-name)
+              (if (> count max-count)
+                  (setq max-count count))
+              (push (make-go--covered :start-line start-line
+                                      :start-column start-column
+                                      :end-line end-line
+                                      :end-column end-column
+                                      :covered (/= count 0)
+                                      :count count)
+                    ranges)))
+
+          (forward-line)))
+
+      (list ranges (if (> max-count 0) (log max-count) 0)))))
+
+(defun go-coverage (&optional coverage-file)
+  "Open a clone of the current buffer and overlay it with
+coverage information gathered via go test -coverprofile=COVERAGE-FILE.
+
+If COVERAGE-FILE is nil, it will either be inferred from the
+current buffer if it's already a coverage buffer, or be prompted
+for."
+  (interactive)
+  (let* ((cur-buffer (current-buffer))
+         (origin-buffer (go--coverage-origin-buffer))
+         (gocov-buffer-name (concat (buffer-name origin-buffer) "<gocov>"))
+         (coverage-file (or coverage-file (go--coverage-file)))
+         (ranges-and-divisor (go--coverage-parse-file
+                              coverage-file
+                              (file-name-nondirectory (buffer-file-name origin-buffer))))
+         (cov-mtime (nth 5 (file-attributes coverage-file)))
+         (cur-mtime (nth 5 (file-attributes (buffer-file-name origin-buffer)))))
+
+    (if (< (float-time cov-mtime) (float-time cur-mtime))
+        (message "Coverage file is older than the source file."))
+
+    (with-current-buffer (or (get-buffer gocov-buffer-name)
+                             (make-indirect-buffer origin-buffer gocov-buffer-name t))
+      (set (make-local-variable 'go--coverage-current-file-name) coverage-file)
+
+      (save-excursion
+        (go--coverage-clear-overlays)
+        (dolist (range (car ranges-and-divisor))
+          (go--coverage-make-overlay range (cadr ranges-and-divisor))))
+
+      (if (not (eq cur-buffer (current-buffer)))
+          (display-buffer (current-buffer) `(,go-coverage-display-buffer-func))))))
+
+(provide 'go-mode)
+
+;;; go-mode.el ends here
diff --git a/emacs.d/elpa/haml-mode-20150508.2011/haml-mode-autoloads.el b/emacs.d/elpa/haml-mode-20150508.2011/haml-mode-autoloads.el
new file mode 100644
index 0000000..0839ff1
--- /dev/null
+++ b/emacs.d/elpa/haml-mode-20150508.2011/haml-mode-autoloads.el
@@ -0,0 +1,25 @@
+;;; haml-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "haml-mode" "haml-mode.el" (22139 28314 0 0))
+;;; Generated autoloads from haml-mode.el
+
+(autoload 'haml-mode "haml-mode" "\
+Major mode for editing Haml files.
+
+\\{haml-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.haml\\'" . haml-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; haml-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/haml-mode-20150508.2011/haml-mode-pkg.el b/emacs.d/elpa/haml-mode-20150508.2011/haml-mode-pkg.el
new file mode 100644
index 0000000..1483a7e
--- /dev/null
+++ b/emacs.d/elpa/haml-mode-20150508.2011/haml-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "haml-mode" "20150508.2011" "Major mode for editing Haml files" '((ruby-mode "1.0")) :url "http://github.com/nex3/haml/tree/master" :keywords '("markup" "language" "html"))
diff --git a/emacs.d/elpa/haml-mode-20150508.2011/haml-mode.el b/emacs.d/elpa/haml-mode-20150508.2011/haml-mode.el
new file mode 100644
index 0000000..e022958
--- /dev/null
+++ b/emacs.d/elpa/haml-mode-20150508.2011/haml-mode.el
@@ -0,0 +1,888 @@
+;;; haml-mode.el --- Major mode for editing Haml files
+
+;; Copyright (c) 2007, 2008 Natalie Weizenbaum
+
+;; Author: Natalie Weizenbaum
+;; URL: http://github.com/nex3/haml/tree/master
+;; Package-Version: 20150508.2011
+;; Package-Requires: ((ruby-mode "1.0"))
+;; Version: DEV
+;; Created: 2007-03-08
+;; By: Natalie Weizenbaum
+;; Keywords: markup, language, html
+
+;;; Commentary:
+
+;; Because Haml's indentation schema is similar
+;; to that of YAML and Python, many indentation-related
+;; functions are similar to those in yaml-mode and python-mode.
+
+;; To install, save this on your load path and add the following to
+;; your .emacs file:
+;;
+;; (require 'haml-mode)
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'ruby-mode)
+
+;; Additional (optional) libraries for fontification
+(require 'css-mode nil t)
+(require 'textile-mode nil t)
+(require 'markdown-mode nil t)
+(or
+ (require 'js nil t)
+ (require 'javascript-mode "javascript" t))
+
+
+;; User definable variables
+
+(defgroup haml nil
+  "Support for the Haml template language."
+  :group 'languages
+  :prefix "haml-")
+
+(defcustom haml-mode-hook nil
+  "Hook run when entering Haml mode."
+  :type 'hook
+  :group 'haml)
+
+(defcustom haml-indent-offset 2
+  "Amount of offset per level of indentation."
+  :type 'integer
+  :group 'haml)
+
+(defcustom haml-backspace-backdents-nesting t
+  "Non-nil to have `haml-electric-backspace' re-indent blocks of code.
+This means that all code nested beneath the backspaced line is
+re-indented along with the line itself."
+  :type 'boolean
+  :group 'haml)
+
+(defvar haml-indent-function 'haml-indent-p
+  "A function for checking if nesting is allowed.
+This function should look at the current line and return t
+if the next line could be nested within this line.
+
+The function can also return a positive integer to indicate
+a specific level to which the current line could be indented.")
+
+(defconst haml-tag-beg-re
+  "^[ \t]*\\([%\\.#][a-z0-9_:\\-]+\\)+\\(?:(.*)\\|{.*}\\|\\[.*\\]\\)*"
+  "A regexp matching the beginning of a Haml tag, through (), {}, and [].")
+
+(defvar haml-block-openers
+  `(,(concat haml-tag-beg-re "[><]*[ \t]*$")
+    "^[ \t]*[&!]?[-=~].*do[ \t]*\\(|.*|[ \t]*\\)?$"
+    ,(concat "^[ \t]*[&!]?[-=~][ \t]*\\("
+             (regexp-opt '("if" "unless" "while" "until" "else" "for"
+                           "begin" "elsif" "rescue" "ensure" "when"))
+             "\\)")
+    "^[ \t]*/\\(\\[.*\\]\\)?[ \t]*$"
+    "^[ \t]*-#"
+    "^[ \t]*:")
+  "A list of regexps that match lines of Haml that open blocks.
+That is, a Haml line that can have text nested beneath it should
+be matched by a regexp in this list.")
+
+
+;; Font lock
+
+(defun haml-nested-regexp (re)
+  "Create a regexp to match a block starting with RE.
+The line containing RE is matched, as well as all lines indented beneath it."
+  (concat "^\\([ \t]*\\)\\(" re "\\)\\([ \t]*\\(?:\n\\(?:\\1 +[^\n]*\\)?\\)*\n?\\)$"))
+
+(defconst haml-font-lock-keywords
+  `((haml-highlight-interpolation         1 font-lock-variable-name-face prepend)
+    (haml-highlight-ruby-tag 1 font-lock-preprocessor-face)
+    (haml-highlight-ruby-script 1 font-lock-preprocessor-face)
+    ;; TODO: distinguish between "/" comments, which can contain HAML
+    ;; output directives, and "-#", which are completely ignored
+    haml-highlight-comment
+    haml-highlight-filter
+    ("^!!!.*"                             0 font-lock-constant-face)
+    ("\\s| *$"                            0 font-lock-string-face)))
+
+(defconst haml-filter-re (haml-nested-regexp ":[[:alnum:]_\\-]+"))
+(defconst haml-comment-re (haml-nested-regexp "\\(?:-\\#\\|/\\)[^\n]*"))
+
+(defun haml-highlight-comment (limit)
+  "Highlight any -# or / comment found up to LIMIT."
+  (when (re-search-forward haml-comment-re limit t)
+    (let ((beg (match-beginning 0))
+          (end (match-end 0)))
+      (put-text-property beg end 'face 'font-lock-comment-face)
+      (goto-char end))))
+
+;; Fontifying sub-regions for other languages
+
+(defun haml-fontify-region
+  (beg end keywords syntax-table syntactic-keywords syntax-propertize-fn)
+  "Fontify a region between BEG and END using another mode's fontification.
+
+KEYWORDS, SYNTAX-TABLE, SYNTACTIC-KEYWORDS and
+SYNTAX-PROPERTIZE-FN are the values of that mode's
+`font-lock-keywords', `font-lock-syntax-table',
+`font-lock-syntactic-keywords', and `syntax-propertize-function'
+respectively."
+  (save-excursion
+    (save-match-data
+      (let ((font-lock-keywords keywords)
+            (font-lock-syntax-table syntax-table)
+            (font-lock-syntactic-keywords syntactic-keywords)
+            (syntax-propertize-function syntax-propertize-fn)
+            (font-lock-multiline 'undecided)
+            (font-lock-dont-widen t)
+            font-lock-keywords-only
+            font-lock-extend-region-functions
+            font-lock-keywords-case-fold-search)
+        (save-restriction
+          (narrow-to-region (1- beg) end)
+          ;; font-lock-fontify-region apparently isn't inclusive,
+          ;; so we have to move the beginning back one char
+          (font-lock-fontify-region (1- beg) end))))))
+
+(defun haml-fontify-region-as-ruby (beg end)
+  "Use Ruby's font-lock variables to fontify the region between BEG and END."
+  (haml-fontify-region beg end ruby-font-lock-keywords
+                       ruby-font-lock-syntax-table
+                       (when (boundp 'ruby-font-lock-syntactic-keywords)
+                         ruby-font-lock-syntactic-keywords)
+                       (when (fboundp 'ruby-syntax-propertize-function)
+                         #'ruby-syntax-propertize-function)))
+
+(defun haml-fontify-region-as-css (beg end)
+  "Fontify CSS code from BEG to END.
+
+This requires that `css-mode' is available.
+`css-mode' is included with Emacs 23."
+  (when (boundp 'css-font-lock-keywords)
+      (haml-fontify-region beg end
+                           css-font-lock-keywords
+                           css-mode-syntax-table
+                           nil
+                           nil)))
+
+(defun haml-fontify-region-as-javascript (beg end)
+  "Fontify javascript code from BEG to END.
+
+This requires that Karl Landström's javascript mode be available, either as the
+\"js.el\" bundled with Emacs >= 23, or as \"javascript.el\" found in ELPA and
+elsewhere."
+  (let ((keywords (or (and (featurep 'js) js--font-lock-keywords-3)
+                      (and (featurep 'javascript-mode) js-font-lock-keywords-3)))
+        (syntax-table (or (and (featurep 'js) js-mode-syntax-table)
+                          (and (featurep 'javascript-mode) javascript-mode-syntax-table)))
+        (syntax-propertize (and (featurep 'js) 'js-syntax-propertize)))
+    (when keywords
+      (when (and (fboundp 'js--update-quick-match-re) (null js--quick-match-re-func))
+        (js--update-quick-match-re))
+      (haml-fontify-region beg end keywords syntax-table nil syntax-propertize))))
+
+(defun haml-fontify-region-as-textile (beg end)
+  "Highlight textile from BEG to END.
+
+This requires that `textile-mode' be available.
+
+Note that the results are not perfect, since `textile-mode' expects
+certain constructs such as \"h1.\" to be at the beginning of a line,
+and indented Haml filters always have leading whitespace."
+  (if (boundp 'textile-font-lock-keywords)
+      (haml-fontify-region beg end textile-font-lock-keywords nil nil nil)))
+
+(defun haml-fontify-region-as-markdown (beg end)
+  "Highlight markdown from BEG to END.
+
+This requires that `markdown-mode' be available."
+  (if (boundp 'markdown-mode-font-lock-keywords)
+      (haml-fontify-region beg end
+                           markdown-mode-font-lock-keywords
+                           markdown-mode-syntax-table
+                           nil
+                           nil)))
+
+(defvar haml-fontify-filter-functions-alist
+  '(("ruby"       . haml-fontify-region-as-ruby)
+    ("css"        . haml-fontify-region-as-css)
+    ("javascript" . haml-fontify-region-as-javascript)
+    ("textile"    . haml-fontify-region-as-textile)
+    ("markdown"   . haml-fontify-region-as-markdown))
+  "An alist of (FILTER-NAME . FUNCTION) used to fontify code regions.
+FILTER-NAME is a string and FUNCTION is a function which will be
+used to fontify the filter's indented code region.  FUNCTION will
+be passed the extents of that region in two arguments BEG and
+END.")
+
+(defun haml-highlight-filter (limit)
+  "Highlight any :filter region found in the text up to LIMIT."
+  (when (re-search-forward haml-filter-re limit t)
+    ;; fontify the filter name
+    (put-text-property (match-beginning 2) (1+ (match-end 2))
+                       'face font-lock-preprocessor-face)
+    (let ((filter-name (substring (match-string 2) 1))
+          (code-start (1+ (match-beginning 3)))
+          (code-end (match-end 3)))
+      (save-match-data
+        (funcall (or (cdr (assoc filter-name haml-fontify-filter-functions-alist))
+                     #'(lambda (beg end)
+                         (put-text-property beg end
+                                            'face
+                                            'font-lock-string-face)))
+                 code-start code-end))
+      (goto-char (match-end 0)))))
+
+(defconst haml-possibly-multiline-code-re
+  "\\(\\(?:.*?,[ \t]*\n\\)*.*\\)"
+  "Regexp to match trailing ruby code which may continue onto subsequent lines.")
+
+(defconst haml-ruby-script-re
+  (concat "^[ \t]*\\(-\\|[&!]?\\(?:=\\|~\\)\\)[^=]" haml-possibly-multiline-code-re)
+  "Regexp to match -, = or ~ blocks and any continued code lines.")
+
+(defun haml-highlight-ruby-script (limit)
+  "Highlight a Ruby script expression (-, =, or ~).
+LIMIT works as it does in `re-search-forward'."
+  (when (re-search-forward haml-ruby-script-re limit t)
+    (haml-fontify-region-as-ruby (match-beginning 2) (match-end 2))))
+
+(defun haml-move (re)
+  "Try matching and moving to the end of regular expression RE.
+Returns non-nil if the expression was sucessfully matched."
+  (when (looking-at re)
+    (goto-char (match-end 0))
+    t))
+
+(defun haml-highlight-ruby-tag (limit)
+  "Highlight Ruby code within a Haml tag.
+LIMIT works as it does in `re-search-forward'.
+
+This highlights the tag attributes and object refs of the tag,
+as well as the script expression (-, =, or ~) following the tag.
+
+For example, this will highlight all of the following:
+  %p{:foo => 'bar'}
+  %p[@bar]
+  %p= 'baz'
+  %p{:foo => 'bar'}[@bar]= 'baz'"
+  (when (re-search-forward "^[ \t]*[%.#]" limit t)
+    (forward-char -1)
+
+    ;; Highlight tag, classes, and ids
+    (while (haml-move "\\([.#%]\\)[a-z0-9_:\\-]*")
+      (put-text-property (match-beginning 0) (match-end 0) 'face
+                         (case (char-after (match-beginning 1))
+                           (?% font-lock-keyword-face)
+                           (?# font-lock-function-name-face)
+                           (?. font-lock-variable-name-face))))
+
+    (block loop
+      (while t
+        (let ((eol (save-excursion (end-of-line) (point))))
+          (case (char-after)
+            ;; Highlight obj refs
+            (?\[
+             (forward-char 1)
+             (let ((beg (point)))
+               (haml-limited-forward-sexp eol)
+               (haml-fontify-region-as-ruby beg (point))))
+            ;; Highlight new attr hashes
+            (?\(
+             (forward-char 1)
+             (while
+                 (and (haml-parse-new-attr-hash
+                       (lambda (type beg end)
+                         (case type
+                           (name (put-text-property beg end
+                                                    'face
+                                                    font-lock-constant-face))
+                           (value (haml-fontify-region-as-ruby beg end)))))
+                      (not (eobp)))
+               (forward-line 1)
+               (beginning-of-line)))
+            ;; Highlight old attr hashes
+            (?\{
+             (let ((beg (point)))
+               (haml-limited-forward-sexp eol)
+
+               ;; Check for multiline
+               (while (and (eolp) (eq (char-before) ?,) (not (eobp)))
+                 (forward-line)
+                 (let ((eol (save-excursion (end-of-line) (point))))
+                   ;; If no sexps are closed,
+                   ;; we're still continuing a  multiline hash
+                   (if (>= (car (parse-partial-sexp (point) eol)) 0)
+                       (end-of-line)
+                     ;; If sexps have been closed,
+                     ;; set the point at the end of the total sexp
+                     (goto-char beg)
+                     (haml-limited-forward-sexp eol))))
+
+               (haml-fontify-region-as-ruby (1+ beg) (point))))
+            (t (return-from loop))))))
+
+    ;; Move past end chars
+    (haml-move "[<>&!]+")
+    ;; Highlight script
+    (if (looking-at (concat "\\([=~]\\) " haml-possibly-multiline-code-re))
+        (haml-fontify-region-as-ruby (match-beginning 2) (match-end 2))
+      ;; Give font-lock something to highlight
+      (forward-char -1)
+      (looking-at "\\(\\)"))
+    t))
+
+(defun haml-highlight-interpolation (limit)
+  "Highlight Ruby interpolation (#{foo}).
+LIMIT works as it does in `re-search-forward'."
+  (when (re-search-forward "\\(#{\\)" limit t)
+    (save-match-data
+      (forward-char -1)
+      (let ((beg (point)))
+        (haml-limited-forward-sexp limit)
+        (haml-fontify-region-as-ruby (1+ beg) (point)))
+      (when (eq (char-before) ?\})
+        (put-text-property (1- (point)) (point)
+                           'face font-lock-variable-name-face))
+      t)))
+
+(defun haml-limited-forward-sexp (limit &optional arg)
+  "Move forward using `forward-sexp' or to LIMIT, whichever comes first.
+With ARG, do it that many times."
+  (let (forward-sexp-function)
+    (condition-case err
+        (save-restriction
+          (narrow-to-region (point) limit)
+          (forward-sexp arg))
+      (scan-error
+       (unless (equal (nth 1 err) "Unbalanced parentheses")
+         (signal 'scan-error (cdr err)))
+       (goto-char limit)))))
+
+(defun haml-find-containing-block (re)
+  "If point is inside a block matching RE, return (start . end) for the block."
+  (save-excursion
+    (let ((pos (point))
+          start end)
+      (beginning-of-line)
+      (when (and
+             (or (looking-at re)
+                 (when (re-search-backward re nil t)
+                   (looking-at re)))
+             (< pos (match-end 0)))
+        (setq start (match-beginning 0)
+              end (match-end 0)))
+      (when start
+        (cons start end)))))
+
+(defun haml-maybe-extend-region (extender)
+  "Maybe extend the font lock region using EXTENDER.
+With point at the beginning of the font lock region, EXTENDER is called.
+If it returns a (START . END) pair, those positions are used to possibly
+extend the font lock region."
+  (let ((old-beg font-lock-beg)
+        (old-end font-lock-end))
+    (save-excursion
+      (goto-char font-lock-beg)
+      (let ((new-bounds (funcall extender)))
+        (when new-bounds
+          (setq font-lock-beg (min font-lock-beg (car new-bounds))
+                font-lock-end (max font-lock-end (cdr new-bounds))))))
+    (or (/= old-beg font-lock-beg)
+        (/= old-end font-lock-end))))
+
+(defun haml-extend-region-nested-below ()
+  "Extend the font-lock region to any subsequent indented lines."
+  (haml-maybe-extend-region
+   (lambda ()
+     (beginning-of-line)
+     (when (looking-at (haml-nested-regexp "[^ \t].*"))
+       (cons (match-beginning 0) (match-end 0))))))
+
+(defun haml-extend-region-to-containing-block (re)
+  "Extend the font-lock region to the smallest containing block matching RE."
+  (haml-maybe-extend-region
+   (lambda ()
+     (haml-find-containing-block re))))
+
+(defun haml-extend-region-filter ()
+  "Extend the font-lock region to an enclosing filter."
+  (haml-extend-region-to-containing-block haml-filter-re))
+
+(defun haml-extend-region-comment ()
+  "Extend the font-lock region to an enclosing comment."
+  (haml-extend-region-to-containing-block haml-comment-re))
+
+(defun haml-extend-region-ruby-script ()
+  "Extend the font-lock region to encompass any current -/=/~ line."
+  (haml-extend-region-to-containing-block haml-ruby-script-re))
+
+(defun haml-extend-region-multiline-hashes ()
+  "Extend the font-lock region to encompass multiline attribute hashes."
+  (haml-maybe-extend-region
+   (lambda ()
+     (let ((attr-props (haml-parse-multiline-attr-hash))
+           multiline-end
+           start)
+       (when attr-props
+         (setq start (cdr (assq 'point attr-props)))
+
+         (end-of-line)
+         ;; Move through multiline attrs
+         (when (eq (char-before) ?,)
+           (save-excursion
+             (while (progn (end-of-line)
+                           (and (eq (char-before) ?,) (not (eobp))))
+               (forward-line))
+
+             (forward-line -1)
+             (end-of-line)
+             (setq multiline-end (point))))
+
+         (goto-char (+ (cdr (assq 'point attr-props))
+                       (cdr (assq 'hash-indent attr-props))
+                       -1))
+         (haml-limited-forward-sexp
+          (or multiline-end
+              (save-excursion (end-of-line) (point))))
+         (cons start (point)))))))
+
+(defun haml-extend-region-contextual ()
+  "Extend the font lock region piecemeal.
+
+The result of calling this function repeatedly until it returns
+nil is that (FONT-LOCK-BEG . FONT-LOCK-END) will be the smallest
+possible region in which font-locking could be affected by
+changes in the initial region."
+  (or
+   (haml-extend-region-filter)
+   (haml-extend-region-comment)
+   (haml-extend-region-ruby-script)
+   (haml-extend-region-multiline-hashes)
+   (haml-extend-region-nested-below)
+   (font-lock-extend-region-multiline)))
+
+
+;; Mode setup
+
+(defvar haml-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?: "." table)
+    (modify-syntax-entry ?' "\"" table)
+    table)
+  "Syntax table in use in `haml-mode' buffers.")
+
+(defvar haml-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [backspace] 'haml-electric-backspace)
+    (define-key map "\C-?" 'haml-electric-backspace)
+    (define-key map "\C-c\C-f" 'haml-forward-sexp)
+    (define-key map "\C-c\C-b" 'haml-backward-sexp)
+    (define-key map "\C-c\C-u" 'haml-up-list)
+    (define-key map "\C-c\C-d" 'haml-down-list)
+    (define-key map "\C-c\C-k" 'haml-kill-line-and-indent)
+    (define-key map "\C-c\C-r" 'haml-output-region)
+    (define-key map "\C-c\C-l" 'haml-output-buffer)
+    map))
+
+(defalias 'haml-parent-mode
+  (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
+
+;;;###autoload
+(define-derived-mode haml-mode haml-parent-mode "Haml"
+  "Major mode for editing Haml files.
+
+\\{haml-mode-map}"
+  (setq font-lock-extend-region-functions '(haml-extend-region-contextual))
+  (set (make-local-variable 'jit-lock-contextually) t)
+  (set (make-local-variable 'font-lock-multiline) t)
+  (set (make-local-variable 'indent-line-function) 'haml-indent-line)
+  (set (make-local-variable 'indent-region-function) 'haml-indent-region)
+  (set (make-local-variable 'parse-sexp-lookup-properties) t)
+  (set (make-local-variable 'comment-start) "-#")
+  (setq font-lock-defaults '((haml-font-lock-keywords) t t))
+  (when (boundp 'electric-indent-inhibit)
+    (setq electric-indent-inhibit t))
+  (setq indent-tabs-mode nil))
+
+;; Useful functions
+
+(defun haml-comment-block ()
+  "Comment the current block of Haml code."
+  (interactive)
+  (save-excursion
+    (let ((indent (current-indentation)))
+      (back-to-indentation)
+      (insert "-#")
+      (newline)
+      (indent-to indent)
+      (beginning-of-line)
+      (haml-mark-sexp)
+      (haml-reindent-region-by haml-indent-offset))))
+
+(defun haml-uncomment-block ()
+  "Uncomment the current block of Haml code."
+  (interactive)
+  (save-excursion
+    (beginning-of-line)
+    (while (not (looking-at haml-comment-re))
+      (haml-up-list)
+      (beginning-of-line))
+    (haml-mark-sexp)
+    (kill-line 1)
+    (haml-reindent-region-by (- haml-indent-offset))))
+
+(defun haml-replace-region (start end)
+  "Replace the current block of Haml code with the HTML equivalent.
+Called from a program, START and END specify the region to indent."
+  (interactive "r")
+  (save-excursion
+    (goto-char end)
+    (setq end (point-marker))
+    (goto-char start)
+    (let ((ci (current-indentation)))
+      (while (re-search-forward "^ +" end t)
+        (replace-match (make-string (- (current-indentation) ci) ? ))))
+    (shell-command-on-region start end "haml" "haml-output" t)))
+
+(defun haml-output-region (start end)
+  "Displays the HTML output for the current block of Haml code.
+Called from a program, START and END specify the region to indent."
+  (interactive "r")
+  (kill-new (buffer-substring start end))
+  (with-temp-buffer
+    (yank)
+    (haml-indent-region (point-min) (point-max))
+    (shell-command-on-region (point-min) (point-max) "haml" "haml-output")))
+
+(defun haml-output-buffer ()
+  "Displays the HTML output for entire buffer."
+  (interactive)
+  (haml-output-region (point-min) (point-max)))
+
+;; Navigation
+
+(defun haml-forward-through-whitespace (&optional backward)
+  "Move the point forward through any whitespace.
+The point will move forward at least one line, until it reaches
+either the end of the buffer or a line with no whitespace.
+
+If BACKWARD is non-nil, move the point backward instead."
+  (let ((arg (if backward -1 1))
+        (endp (if backward 'bobp 'eobp)))
+    (loop do (forward-line arg)
+          while (and (not (funcall endp))
+                     (looking-at "^[ \t]*$")))))
+
+(defun haml-at-indent-p ()
+  "Return non-nil if the point is before any text on the line."
+  (let ((opoint (point)))
+    (save-excursion
+      (back-to-indentation)
+      (>= (point) opoint))))
+
+(defun haml-forward-sexp (&optional arg)
+  "Move forward across one nested expression.
+With ARG, do it that many times.  Negative arg -N means move
+backward across N balanced expressions.
+
+A sexp in Haml is defined as a line of Haml code as well as any
+lines nested beneath it."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (if (and (< arg 0) (not (haml-at-indent-p)))
+      (back-to-indentation)
+    (while (/= arg 0)
+      (let ((indent (current-indentation)))
+        (loop do (haml-forward-through-whitespace (< arg 0))
+              while (and (not (eobp))
+                         (not (bobp))
+                         (> (current-indentation) indent)))
+        (unless (eobp)
+          (back-to-indentation))
+        (setq arg (+ arg (if (> arg 0) -1 1)))))))
+
+(defun haml-backward-sexp (&optional arg)
+  "Move backward across one nested expression.
+With ARG, do it that many times.  Negative arg -N means move
+forward across N balanced expressions.
+
+A sexp in Haml is defined as a line of Haml code as well as any
+lines nested beneath it."
+  (interactive "p")
+  (haml-forward-sexp (if arg (- arg) -1)))
+
+(defun haml-up-list (&optional arg)
+  "Move out of one level of nesting.
+With ARG, do this that many times."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (while (> arg 0)
+    (let ((indent (current-indentation)))
+      (loop do (haml-forward-through-whitespace t)
+            while (and (not (bobp))
+                       (>= (current-indentation) indent)))
+      (setq arg (1- arg))))
+  (back-to-indentation))
+
+(defun haml-down-list (&optional arg)
+  "Move down one level of nesting.
+With ARG, do this that many times."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (while (> arg 0)
+    (let ((indent (current-indentation)))
+      (haml-forward-through-whitespace)
+      (when (<= (current-indentation) indent)
+        (haml-forward-through-whitespace t)
+        (back-to-indentation)
+        (error "Nothing is nested beneath this line"))
+      (setq arg (1- arg))))
+  (back-to-indentation))
+
+(defun haml-mark-sexp ()
+  "Mark the next Haml block."
+  (let ((forward-sexp-function 'haml-forward-sexp))
+    (mark-sexp)))
+
+(defun haml-mark-sexp-but-not-next-line ()
+  "Mark the next Haml block, but not the next line.
+Put the mark at the end of the last line of the sexp rather than
+the first non-whitespace character of the next line."
+  (haml-mark-sexp)
+  (set-mark
+   (save-excursion
+     (goto-char (mark))
+     (unless (eobp)
+       (forward-line -1)
+       (end-of-line))
+     (point))))
+
+;; Indentation and electric keys
+
+(defvar haml-empty-elements
+  '("area" "base" "br" "col" "command" "embed" "hr" "img" "input"
+    "keygen" "link" "meta" "param" "source" "track" "wbr")
+  "A list of html elements which may not contain content.
+
+See http://www.w3.org/TR/html-markup/syntax.html.")
+
+(defun haml-unnestable-tag-p ()
+  "Return t if the current line is an empty element tag, or one with content."
+  (when (looking-at haml-tag-beg-re)
+    (save-excursion
+      (goto-char (match-end 0))
+      (or (string-match-p (concat "%" (regexp-opt haml-empty-elements) "\\b")
+                          (match-string 1))
+          (progn
+            (when (looking-at "[{(]")
+              (ignore-errors (forward-sexp)))
+            (looking-at "\\(?:=\\|==\\| \\)[[:blank:]]*[^[:blank:]\r\n]+"))))))
+
+(defun haml-indent-p ()
+  "Return t if the current line can have lines nested beneath it."
+  (let ((attr-props (haml-parse-multiline-attr-hash)))
+    (if attr-props
+        (if (haml-unclosed-attr-hash-p)
+            (cdr (assq 'hash-indent attr-props))
+          (+ (cdr (assq 'indent attr-props)) haml-indent-offset))
+      (unless (or (haml-unnestable-tag-p))
+        (loop for opener in haml-block-openers
+              if (looking-at opener) return t
+              finally return nil)))))
+
+(defun* haml-parse-multiline-attr-hash ()
+  "Parses a multiline attribute hash, and returns
+an alist with the following keys:
+
+INDENT is the indentation of the line beginning the hash.
+
+HASH-INDENT is the indentation of the first character
+within the attribute hash.
+
+POINT is the character position at the beginning of the line
+beginning the hash."
+  (save-excursion
+    (while t
+      (beginning-of-line)
+      (if (looking-at (concat haml-tag-beg-re "\\([{(]\\)"))
+          (progn
+            (goto-char (1- (match-end 0)))
+            (haml-limited-forward-sexp (save-excursion (end-of-line) (point)))
+            (return-from haml-parse-multiline-attr-hash
+              (when (or (string-equal (match-string 1) "(") (eq (char-before) ?,))
+                `((indent . ,(current-indentation))
+                  (hash-indent . ,(- (match-end 0) (match-beginning 0)))
+                  (point . ,(match-beginning 0))))))
+        (when (bobp) (return-from haml-parse-multiline-attr-hash))
+        (forward-line -1)
+        (unless (haml-unclosed-attr-hash-p)
+          (return-from haml-parse-multiline-attr-hash))))))
+
+(defun* haml-unclosed-attr-hash-p ()
+  "Return t if this line has an unclosed attribute hash, new or old."
+  (save-excursion
+    (end-of-line)
+    (when (eq (char-before) ?,) (return-from haml-unclosed-attr-hash-p t))
+    (re-search-backward "(\\|^")
+    (haml-move "(")
+    (haml-parse-new-attr-hash)))
+
+(defun* haml-parse-new-attr-hash (&optional (fn (lambda (type beg end) ())))
+  "Parse a new-style attribute hash on this line, and returns
+t if it's not finished on the current line.
+
+FN should take three parameters: TYPE, BEG, and END.
+TYPE is the type of text parsed ('name or 'value)
+and BEG and END delimit that text in the buffer."
+  (let ((eol (save-excursion (end-of-line) (point))))
+    (while (not (haml-move ")"))
+      (haml-move "[ \t]*")
+      (unless (haml-move "[a-z0-9_:\\-]+")
+        (return-from haml-parse-new-attr-hash (haml-move "[ \t]*$")))
+      (funcall fn 'name (match-beginning 0) (match-end 0))
+      (haml-move "[ \t]*")
+      (when (haml-move "=")
+        (haml-move "[ \t]*")
+        (unless (looking-at "[\"'@a-z0-9]") (return-from haml-parse-new-attr-hash))
+        (let ((beg (point)))
+          (haml-limited-forward-sexp eol)
+          (funcall fn 'value beg (point)))
+        (haml-move "[ \t]*")))
+    nil))
+
+(defun haml-compute-indentation ()
+  "Calculate the maximum sensible indentation for the current line."
+  (save-excursion
+    (beginning-of-line)
+    (if (bobp) (list 0 nil)
+      (haml-forward-through-whitespace t)
+      (let ((indent (funcall haml-indent-function)))
+        (cond
+         ((consp indent) indent)
+         ((integerp indent) (list indent t))
+         (indent (list (+ (current-indentation) haml-indent-offset) nil))
+         (t (list (current-indentation) nil)))))))
+
+(defun haml-indent-region (start end)
+  "Indent each nonblank line in the region.
+This is done by indenting the first line based on
+`haml-compute-indentation' and preserving the relative
+indentation of the rest of the region.  START and END specify the
+region to indent.
+
+If this command is used multiple times in a row, it will cycle
+between possible indentations."
+  (save-excursion
+    (goto-char end)
+    (setq end (point-marker))
+    (goto-char start)
+    (let (this-line-column current-column
+          (next-line-column
+           (if (and (equal last-command this-command) (/= (current-indentation) 0))
+               (* (/ (1- (current-indentation)) haml-indent-offset) haml-indent-offset)
+             (car (haml-compute-indentation)))))
+      (while (< (point) end)
+        (setq this-line-column next-line-column
+              current-column (current-indentation))
+        ;; Delete whitespace chars at beginning of line
+        (delete-horizontal-space)
+        (unless (eolp)
+          (setq next-line-column (save-excursion
+                                   (loop do (forward-line 1)
+                                         while (and (not (eobp)) (looking-at "^[ \t]*$")))
+                                   (+ this-line-column
+                                      (- (current-indentation) current-column))))
+          ;; Don't indent an empty line
+          (unless (eolp) (indent-to this-line-column)))
+        (forward-line 1)))
+    (move-marker end nil)))
+
+(defun haml-indent-line ()
+  "Indent the current line.
+The first time this command is used, the line will be indented to the
+maximum sensible indentation.  Each immediately subsequent usage will
+back-dent the line by `haml-indent-offset' spaces.  On reaching column
+0, it will cycle back to the maximum sensible indentation."
+  (interactive "*")
+  (let ((ci (current-indentation))
+        (cc (current-column)))
+    (destructuring-bind (need strict) (haml-compute-indentation)
+      (save-excursion
+        (beginning-of-line)
+        (delete-horizontal-space)
+        (if (and (not strict) (equal last-command this-command) (/= ci 0))
+            (indent-to (* (/ (1- ci) haml-indent-offset) haml-indent-offset))
+          (indent-to need))))
+    (when (< (current-column) (current-indentation))
+      (forward-to-indentation 0))))
+
+(defun haml-reindent-region-by (n)
+  "Add N spaces to the beginning of each line in the region.
+If N is negative, will remove the spaces instead.  Assumes all
+lines in the region have indentation >= that of the first line."
+  (let* ((ci (current-indentation))
+         (indent-rx
+          (concat "^"
+                  (if indent-tabs-mode
+                      (concat (make-string (/ ci tab-width) ?\t)
+                              (make-string (mod ci tab-width) ?\t))
+                    (make-string ci ?\s)))))
+    (save-excursion
+      (while (re-search-forward indent-rx (mark) t)
+        (let ((ci (current-indentation)))
+          (delete-horizontal-space)
+          (beginning-of-line)
+          (indent-to (max 0 (+ ci n))))))))
+
+(defun haml-electric-backspace (arg)
+  "Delete characters or back-dent the current line.
+If invoked following only whitespace on a line, will back-dent
+the line and all nested lines to the immediately previous
+multiple of `haml-indent-offset' spaces.  With ARG, do it that
+many times.
+
+Set `haml-backspace-backdents-nesting' to nil to just back-dent
+the current line."
+  (interactive "*p")
+  (if (or (/= (current-indentation) (current-column))
+          (bolp)
+          (save-excursion
+            (beginning-of-line)
+            (looking-at "^[ \t]+$")))
+      (backward-delete-char arg)
+    (save-excursion
+      (beginning-of-line)
+      (unwind-protect
+          (progn
+            (if haml-backspace-backdents-nesting
+                (haml-mark-sexp-but-not-next-line)
+              (set-mark (save-excursion (end-of-line) (point))))
+            (haml-reindent-region-by (* (- arg) haml-indent-offset)))
+        (pop-mark)))
+    (back-to-indentation)))
+
+(defun haml-kill-line-and-indent ()
+  "Kill the current line, and re-indent all lines nested beneath it."
+  (interactive)
+  (beginning-of-line)
+  (haml-mark-sexp-but-not-next-line)
+  (kill-line 1)
+  (haml-reindent-region-by (* -1 haml-indent-offset)))
+
+(defun haml-indent-string ()
+  "Return the indentation string for `haml-indent-offset'."
+  (mapconcat 'identity (make-list haml-indent-offset " ") ""))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.haml\\'" . haml-mode))
+
+
+;; Local Variables:
+;; coding: utf-8
+;; byte-compile-warnings: (not cl-functions)
+;; eval: (checkdoc-minor-mode 1)
+;; End:
+
+(provide 'haml-mode)
+;;; haml-mode.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/emacs-helm.sh b/emacs.d/elpa/helm-20150623.1310/emacs-helm.sh
deleted file mode 100755
index f3e45a7..0000000
--- a/emacs.d/elpa/helm-20150623.1310/emacs-helm.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-
-
-## Copyright (C) 2012 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-## 
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-## 
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-## Commentary:
-
-# Preconfigured Emacs with a basic helm configuration.
-# Useful to start quickly an emacs -Q with helm.
-# Run it from this directory or symlink it somewhere in your PATH.
-
-# If TEMP env var exists use it otherwise declare it.
-[ -z $TEMP ] && declare TEMP="/tmp"
-
-CONF_FILE="$TEMP/helm-cfg.el"
-EMACS=emacs
-
-case $1 in
-    -P)
-        shift 1
-        declare EMACS=$1
-        shift 1
-        ;;
-    -h)
-        echo "Usage: ${0##*/} [-P} Emacs path [-h} help [--] EMACS ARGS"
-        exit 2
-        ;;
-esac
-
-cd $(dirname "$0")
-
-# Check if autoload file exists.
-# It is maybe in a different directory if
-# emacs-helm.sh is a symlink.
-LS=$(ls -l $0 | awk '{print $11}')
-if [ ! -z $LS ]; then
-    AUTO_FILE="$(dirname $LS)/helm-autoloads.el"
-else
-    AUTO_FILE="helm-autoloads.el"
-fi
-if [ ! -e "$AUTO_FILE" ]; then
-    echo No autoloads found, please run make first to generate autoload file
-    exit 2
-fi
-
-
-cat > $CONF_FILE <<EOF
-(setq initial-scratch-message (concat initial-scratch-message
-";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\
-;; This Emacs is Powered by \`HELM' using\n\
-;; emacs program \"$EMACS\".\n\
-;; This is a minimal \`helm' configuration to discover \`helm' or debug it.\n\
-;; You can retrieve this minimal configuration in \"$CONF_FILE\" \n\
-;; Some originals emacs commands have been replaced by own \`helm' commands:\n\n\
-;; - \`find-file'(C-x C-f)           =>\`helm-find-files'\n\
-;; - \`occur'(M-s o)                 =>\`helm-occur'\n\
-;; - \`list-buffers'(C-x C-b)        =>\`helm-buffers-list'\n\
-;; - \`completion-at-point'(M-tab)   =>\`helm-lisp-completion-at-point'[1]\n\
-;; - \`dabbrev-expand'(M-/)          =>\`helm-dabbrev'\n\n\
-;; Some others native emacs commands are \"helmized\" by \`helm-mode'.\n\
-;; [1] Coming with emacs-24.4 \`completion-at-point' is \"helmized\" by \`helm-mode'\n\
-;; which provide helm completion in many other places like \`shell-mode'.\n\
-;; You will find embeded help for most helm commands with \`C-c ?'.\n\
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n"))
-
-(setq default-frame-alist '((vertical-scroll-bars . nil)
-                            (tool-bar-lines . 0)
-                            (menu-bar-lines . 0)
-                            (fullscreen . nil)))
-(blink-cursor-mode -1)
-(add-to-list 'load-path (file-name-directory (file-truename "$0")))
-(require 'helm-config)
-(helm-mode 1)
-(define-key global-map [remap find-file] 'helm-find-files)
-(define-key global-map [remap occur] 'helm-occur)
-(define-key global-map [remap list-buffers] 'helm-buffers-list)
-(define-key global-map [remap dabbrev-expand] 'helm-dabbrev)
-(global-set-key (kbd "M-x") 'helm-M-x)
-(unless (boundp 'completion-in-region-function)
-  (define-key lisp-interaction-mode-map [remap completion-at-point] 'helm-lisp-completion-at-point)
-  (define-key emacs-lisp-mode-map       [remap completion-at-point] 'helm-lisp-completion-at-point))
-(add-hook 'kill-emacs-hook #'(lambda () (and (file-exists-p "$CONF_FILE") (delete-file "$CONF_FILE"))))
-EOF
-
-$EMACS -Q -l $CONF_FILE $@
-
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-aliases.el b/emacs.d/elpa/helm-20150623.1310/helm-aliases.el
deleted file mode 100644
index eb3d372..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-aliases.el
+++ /dev/null
@@ -1,776 +0,0 @@
-;;; helm-aliases.el --- Helm aliases for helm obsoletes functions. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-
-
-;;; Helper functions to create aliases with old helm definitions
-;;  prefixed with "helm-c-"
-;;
-(defun helm-alias-p (sym)
-  (cond ((boundp sym)
-         (not (eq (indirect-variable sym) sym)))
-        ((fboundp sym)
-         (symbolp (symbol-function sym)))
-        (t nil)))
-
-(defun helm-check-conflicting-prefixes ()
-  (cl-loop for s in (all-completions "helm-c-" obarray)
-        for rep = (replace-regexp-in-string "helm-c-" "helm-" s)
-        when (or (and (not (helm-alias-p (intern s))) (fboundp (intern rep)))
-                 (and (not (helm-alias-p (intern s))) (boundp (intern rep))))
-        collect rep))
-
-(defun helm-collect-functions-with-bad-prefix ()
-  (cl-loop for s in (all-completions "helm-c-" obarray)
-        for sym = (intern s)
-        when (and (not (helm-alias-p sym)) (fboundp sym))
-        collect s))
-
-(defun helm-collect-vars-with-bad-prefix ()
-  (cl-loop for s in (all-completions "helm-c-" obarray)
-        for sym = (intern s)
-        when (and (not (helm-alias-p sym)) (boundp sym))
-        collect s))
-
-(defun helm-insert-fn-aliases ()
-  (cl-loop for s in (helm-collect-functions-with-bad-prefix)
-        for rep = (replace-regexp-in-string "helm-c-" "helm-" s)
-        do (insert (format "(defalias '%s '%s)\n(make-obsolete '%s '%s \"1.5.1\")\n" s rep s rep))))
-
-(defun helm-insert-var-aliases ()
-  (cl-loop for s in (helm-collect-vars-with-bad-prefix)
-        for rep = (replace-regexp-in-string "helm-c-" "helm-" s)
-        do (insert (format "(defvaralias '%s '%s)\n(make-obsolete-variable '%s '%s \"1.5.1\")\n" s rep s rep))))
-
-
-;;; Alias old functions prefixed with "helm-c-"
-;;
-;;
-(defalias 'helm-c-etags-default-action 'helm-etags-default-action)
-(make-obsolete 'helm-c-etags-default-action 'helm-etags-default-action "1.5.1")
-(defalias 'helm-c-show-info-in-mode-line 'helm-show-info-in-mode-line)
-(make-obsolete 'helm-c-show-info-in-mode-line 'helm-show-info-in-mode-line "1.5.1")
-(defalias 'helm-c-grep-highlight-match 'helm-grep-highlight-match)
-(make-obsolete 'helm-c-grep-highlight-match 'helm-grep-highlight-match "1.5.1")
-(defalias 'helm-c-apropos 'helm-apropos)
-(make-obsolete 'helm-c-apropos 'helm-apropos "1.5.1")
-(defalias 'helm-c-grep-guess-extensions 'helm-grep-guess-extensions)
-(make-obsolete 'helm-c-grep-guess-extensions 'helm-grep-guess-extensions "1.5.1")
-(defalias 'helm-c-apt-reinstall 'helm-apt-reinstall)
-(make-obsolete 'helm-c-apt-reinstall 'helm-apt-reinstall "1.5.1")
-(defalias 'helm-c-reset-adaptive-history 'helm-reset-adaptive-history)
-(make-obsolete 'helm-c-reset-adaptive-history 'helm-reset-adaptive-history "1.5.1")
-(defalias 'helm-adaptative-mode 'helm-adaptive-mode)
-(make-obsolete 'helm-adaptative-mode 'helm-adaptive-mode "1.6.2")
-(defalias 'helm-c-highlight-bookmark 'helm-highlight-bookmark)
-(make-obsolete 'helm-c-highlight-bookmark 'helm-highlight-bookmark "1.5.1")
-(defalias 'helm-c-locate-init 'helm-locate-init)
-(make-obsolete 'helm-c-locate-init 'helm-locate-init "1.5.1")
-(defalias 'helm-c-delete-file 'helm-delete-file)
-(make-obsolete 'helm-c-delete-file 'helm-delete-file "1.5.1")
-(defalias 'helm-c-regexp-persistent-action 'helm-regexp-persistent-action)
-(make-obsolete 'helm-c-regexp-persistent-action 'helm-regexp-persistent-action "1.5.1")
-(defalias 'helm-c-grep-split-line 'helm-grep-split-line)
-(make-obsolete 'helm-c-grep-split-line 'helm-grep-split-line "1.5.1")
-(defalias 'helm-c-info-display-to-real 'helm-info-display-to-real)
-(make-obsolete 'helm-c-info-display-to-real 'helm-info-display-to-real "1.5.1")
-(defalias 'helm-c-symbolify 'helm-symbolify)
-(make-obsolete 'helm-c-symbolify 'helm-symbolify "1.5.1")
-(defalias 'helm-c-zgrep-buffers 'helm-zgrep-buffers)
-(make-obsolete 'helm-c-zgrep-buffers 'helm-zgrep-buffers "1.5.1")
-(defalias 'helm-c-apt-persistent-action 'helm-apt-persistent-action)
-(make-obsolete 'helm-c-apt-persistent-action 'helm-apt-persistent-action "1.5.1")
-(defalias 'helm-c-pdfgrep-init 'helm-pdfgrep-init)
-(make-obsolete 'helm-c-pdfgrep-init 'helm-pdfgrep-init "1.5.1")
-(defalias 'helm-c-walk-directory 'helm-walk-directory)
-(make-obsolete 'helm-c-walk-directory 'helm-walk-directory "1.5.1")
-(defalias 'helm-c-grep-init 'helm-grep-init)
-(make-obsolete 'helm-c-grep-init 'helm-grep-init "1.5.1")
-(defalias 'helm-c-ucs-forward-char 'helm-ucs-forward-char)
-(make-obsolete 'helm-c-ucs-forward-char 'helm-ucs-forward-char "1.5.1")
-(defalias 'helm-c-complete-file-name-at-point 'helm-complete-file-name-at-point)
-(make-obsolete 'helm-c-complete-file-name-at-point 'helm-complete-file-name-at-point "1.5.1")
-(defalias 'helm-c-timer-real-to-display 'helm-timer-real-to-display)
-(make-obsolete 'helm-c-timer-real-to-display 'helm-timer-real-to-display "1.5.1")
-(defalias 'helm-c-ucs-init 'helm-ucs-init)
-(make-obsolete 'helm-c-ucs-init 'helm-ucs-init "1.5.1")
-(defalias 'helm-c-bookmark-run-delete 'helm-bookmark-run-delete)
-(make-obsolete 'helm-c-bookmark-run-delete 'helm-bookmark-run-delete "1.5.1")
-(defalias 'helm-c-uniq-list 'helm-uniq-list)
-(make-obsolete 'helm-c-uniq-list 'helm-uniq-list "1.5.1")
-(defalias 'helm-c-pp-bookmarks 'helm-pp-bookmarks)
-(make-obsolete 'helm-c-pp-bookmarks 'helm-pp-bookmarks "1.5.1")
-(defalias 'helm-c-top-sh-persistent-action 'helm-top-sh-persistent-action)
-(make-obsolete 'helm-c-top-sh-persistent-action 'helm-top-sh-persistent-action "1.5.1")
-(defalias 'helm-c-grep-action 'helm-grep-action)
-(make-obsolete 'helm-c-grep-action 'helm-grep-action "1.5.1")
-(defalias 'helm-c-file-buffers 'helm-file-buffers)
-(make-obsolete 'helm-c-file-buffers 'helm-file-buffers "1.5.1")
-(defalias 'helm-c-google-suggest-fetch 'helm-google-suggest-fetch)
-(make-obsolete 'helm-c-google-suggest-fetch 'helm-google-suggest-fetch "1.5.1")
-(defalias 'helm-c-arrange-type-attribute 'helm-arrange-type-attribute)
-(make-obsolete 'helm-c-arrange-type-attribute 'helm-arrange-type-attribute "1.5.1")
-(defalias 'helm-c-yahoo-suggest-action 'helm-yahoo-suggest-action)
-(make-obsolete 'helm-c-yahoo-suggest-action 'helm-yahoo-suggest-action "1.5.1")
-(defalias 'helm-c-buffer-query-replace-1 'helm-buffer-query-replace-1)
-(make-obsolete 'helm-c-buffer-query-replace-1 'helm-buffer-query-replace-1 "1.5.1")
-(defalias 'helm-c-make-info-source 'helm-make-info-source)
-(make-obsolete 'helm-c-make-info-source 'helm-make-info-source "1.5.1")
-(defalias 'helm-c-open-dired 'helm-open-dired)
-(make-obsolete 'helm-c-open-dired 'helm-open-dired "1.5.1")
-(defalias 'helm-c-kill-ring-transformer 'helm-kill-ring-transformer)
-(make-obsolete 'helm-c-kill-ring-transformer 'helm-kill-ring-transformer "1.5.1")
-(defalias 'helm-c-etags-init 'helm-etags-init)
-(make-obsolete 'helm-c-etags-init 'helm-etags-init "1.5.1")
-(defalias 'helm-c-advice-update-current-display-string 'helm-advice-update-current-display-string)
-(make-obsolete 'helm-c-advice-update-current-display-string 'helm-advice-update-current-display-string "1.5.1")
-(defalias 'helm-c-regexp-get-line 'helm-regexp-get-line)
-(make-obsolete 'helm-c-regexp-get-line 'helm-regexp-get-line "1.5.1")
-(defalias 'helm-c-grep-run-other-window-action 'helm-grep-run-other-window-action)
-(make-obsolete 'helm-c-grep-run-other-window-action 'helm-grep-run-other-window-action "1.5.1")
-(defalias 'helm-c-regexp-kill-new 'helm-regexp-kill-new)
-(make-obsolete 'helm-c-regexp-kill-new 'helm-regexp-kill-new "1.5.1")
-(defalias 'helm-c-grep-run-default-action 'helm-grep-run-default-action)
-(make-obsolete 'helm-c-grep-run-default-action 'helm-grep-run-default-action "1.5.1")
-(defalias 'helm-c-define-info-index-sources 'helm-define-info-index-sources)
-(make-obsolete 'helm-c-define-info-index-sources 'helm-define-info-index-sources "1.5.1")
-(defalias 'helm-c-transform-file-browse-url 'helm-transform-file-browse-url)
-(make-obsolete 'helm-c-transform-file-browse-url 'helm-transform-file-browse-url "1.5.1")
-(defalias 'helm-c-shell-command-if-needed 'helm-shell-command-if-needed)
-(make-obsolete 'helm-c-shell-command-if-needed 'helm-shell-command-if-needed "1.5.1")
-(defalias 'helm-c-kill-regexp-as-sexp 'helm-kill-regexp-as-sexp)
-(make-obsolete 'helm-c-kill-regexp-as-sexp 'helm-kill-regexp-as-sexp "1.5.1")
-(defalias 'helm-c-goto-next-or-prec-file 'helm-goto-next-or-prec-file)
-(make-obsolete 'helm-c-goto-next-or-prec-file 'helm-goto-next-or-prec-file "1.5.1")
-(defalias 'helm-c-insert-file-name-completion-at-point 'helm-insert-file-name-completion-at-point)
-(make-obsolete 'helm-c-insert-file-name-completion-at-point 'helm-insert-file-name-completion-at-point "1.5.1")
-(defalias 'helm-c-point-file-in-dired 'helm-point-file-in-dired)
-(make-obsolete 'helm-c-point-file-in-dired 'helm-point-file-in-dired "1.5.1")
-(defalias 'helm-c-info-goto 'helm-info-goto)
-(make-obsolete 'helm-c-info-goto 'helm-info-goto "1.5.1")
-(defalias 'helm-c-apt-install 'helm-apt-install)
-(make-obsolete 'helm-c-apt-install 'helm-apt-install "1.5.1")
-(defalias 'helm-c-skip-boring-buffers 'helm-skip-boring-buffers)
-(make-obsolete 'helm-c-skip-boring-buffers 'helm-skip-boring-buffers "1.5.1")
-(defalias 'helm-c-register-candidates 'helm-register-candidates)
-(make-obsolete 'helm-c-register-candidates 'helm-register-candidates "1.5.1")
-(defalias 'helm-c-find-function 'helm-find-function)
-(make-obsolete 'helm-c-find-function 'helm-find-function "1.5.1")
-(defalias 'helm-c-apt-display-to-real 'helm-apt-display-to-real)
-(make-obsolete 'helm-c-apt-display-to-real 'helm-apt-display-to-real "1.5.1")
-(defalias 'helm-c-org-keywords-init 'helm-org-keywords-init)
-(make-obsolete 'helm-c-org-keywords-init 'helm-org-keywords-init "1.5.1")
-(defalias 'helm-c-xrandr-screen 'helm-xrandr-screen)
-(make-obsolete 'helm-c-xrandr-screen 'helm-xrandr-screen "1.5.1")
-(defalias 'helm-c-position 'helm-position)
-(make-obsolete 'helm-c-position 'helm-position "1.5.1")
-(defalias 'helm-c-imenu-candidates 'helm-imenu-candidates)
-(make-obsolete 'helm-c-imenu-candidates 'helm-imenu-candidates "1.5.1")
-(defalias 'helm-c-ucs-persistent-forward 'helm-ucs-persistent-forward)
-(make-obsolete 'helm-c-ucs-persistent-forward 'helm-ucs-persistent-forward "1.5.1")
-(defalias 'helm-c-basename 'helm-basename)
-(make-obsolete 'helm-c-basename 'helm-basename "1.5.1")
-(defalias 'helm-c-files-in-all-dired-candidates 'helm-files-in-all-dired-candidates)
-(make-obsolete 'helm-c-files-in-all-dired-candidates 'helm-files-in-all-dired-candidates "1.5.1")
-(defalias 'helm-c-grep-other-window 'helm-grep-other-window)
-(make-obsolete 'helm-c-grep-other-window 'helm-grep-other-window "1.5.1")
-(defalias 'helm-c-yahoo-suggest-fetch 'helm-yahoo-suggest-fetch)
-(make-obsolete 'helm-c-yahoo-suggest-fetch 'helm-yahoo-suggest-fetch "1.5.1")
-(defalias 'helm-c-external-commands-list-1 'helm-external-commands-list-1)
-(make-obsolete 'helm-c-external-commands-list-1 'helm-external-commands-list-1 "1.5.1")
-(defalias 'helm-c-buffers-list-persistent-action 'helm-buffers-list-persistent-action)
-(make-obsolete 'helm-c-buffers-list-persistent-action 'helm-buffers-list-persistent-action "1.5.1")
-(defalias 'helm-c-show-completion-init-overlay 'helm-show-completion-init-overlay)
-(make-obsolete 'helm-c-show-completion-init-overlay 'helm-show-completion-init-overlay "1.5.1")
-(defalias 'helm-c-shadow-boring-files 'helm-shadow-boring-files)
-(make-obsolete 'helm-c-shadow-boring-files 'helm-shadow-boring-files "1.5.1")
-(defalias 'helm-c-bookmark-local-files-setup-alist 'helm-bookmark-local-files-setup-alist)
-(make-obsolete 'helm-c-bookmark-local-files-setup-alist 'helm-bookmark-local-files-setup-alist "1.5.1")
-(defalias 'helm-c-highlight-local-use 'helm-highlight-local-use)
-(make-obsolete 'helm-c-highlight-local-use 'helm-highlight-local-use "1.5.1")
-(defalias 'helm-c-skip-current-file 'helm-skip-current-file)
-(make-obsolete 'helm-c-skip-current-file 'helm-skip-current-file "1.5.1")
-(defalias 'helm-c-goto-next-file 'helm-goto-next-file)
-(make-obsolete 'helm-c-goto-next-file 'helm-goto-next-file "1.5.1")
-(defalias 'helm-c-info-init 'helm-info-init)
-(make-obsolete 'helm-c-info-init 'helm-info-init "1.5.1")
-(defalias 'helm-c-query-replace-args 'helm-query-replace-args)
-(make-obsolete 'helm-c-query-replace-args 'helm-query-replace-args "1.5.1")
-(defalias 'helm-c-bookmark-info-setup-alist 'helm-bookmark-info-setup-alist)
-(make-obsolete 'helm-c-bookmark-info-setup-alist 'helm-bookmark-info-setup-alist "1.5.1")
-(defalias 'helm-c-ratpoison-commands-execute 'helm-ratpoison-commands-execute)
-(make-obsolete 'helm-c-ratpoison-commands-execute 'helm-ratpoison-commands-execute "1.5.1")
-(defalias 'helm-c-ucs-persistent-backward 'helm-ucs-persistent-backward)
-(make-obsolete 'helm-c-ucs-persistent-backward 'helm-ucs-persistent-backward "1.5.1")
-(defalias 'helm-c-info-pages-init 'helm-info-pages-init)
-(make-obsolete 'helm-c-info-pages-init 'helm-info-pages-init "1.5.1")
-(defalias 'helm-c-grep-save-results 'helm-grep-save-results)
-(make-obsolete 'helm-c-grep-save-results 'helm-grep-save-results "1.5.1")
-(defalias 'helm-c-read-file-name 'helm-read-file-name)
-(make-obsolete 'helm-c-read-file-name 'helm-read-file-name "1.5.1")
-(defalias 'helm-c-org-keywords-insert 'helm-org-keywords-insert)
-(make-obsolete 'helm-c-org-keywords-insert 'helm-org-keywords-insert "1.5.1")
-(defalias 'helm-c-call-interactively 'helm-call-interactively)
-(make-obsolete 'helm-c-call-interactively 'helm-call-interactively "1.5.1")
-(defalias 'helm-c-adaptative-compare 'helm-adaptive-compare)
-(make-obsolete 'helm-c-adaptative-compare 'helm-adaptive-compare "1.5.1")
-(defalias 'helm-c-buffer-list 'helm-buffer-list)
-(make-obsolete 'helm-c-buffer-list 'helm-buffer-list "1.5.1")
-(defalias 'helm-c-thing-before-point 'helm-thing-before-point)
-(make-obsolete 'helm-c-thing-before-point 'helm-thing-before-point "1.5.1")
-(defalias 'helm-c-ratpoison-commands-display-to-real 'helm-ratpoison-commands-display-to-real)
-(make-obsolete 'helm-c-ratpoison-commands-display-to-real 'helm-ratpoison-commands-display-to-real "1.5.1")
-(defalias 'helm-c-imenu-default-action 'helm-imenu-default-action)
-(make-obsolete 'helm-c-imenu-default-action 'helm-imenu-default-action "1.5.1")
-(defalias 'helm-c-describe-function 'helm-describe-function)
-(make-obsolete 'helm-c-describe-function 'helm-describe-function "1.5.1")
-(defalias 'helm-c-colors-get-name 'helm-colors-get-name)
-(make-obsolete 'helm-c-colors-get-name 'helm-colors-get-name "1.5.1")
-(defalias 'helm-c-bookmark-help 'helm-bookmark-help)
-(make-obsolete 'helm-c-bookmark-help 'helm-bookmark-help "1.5.1")
-(defalias 'helm-c-ucs-persistent-delete 'helm-ucs-persistent-delete)
-(make-obsolete 'helm-c-ucs-persistent-delete 'helm-ucs-persistent-delete "1.5.1")
-(defalias 'helm-c-set-variable 'helm-set-variable)
-(make-obsolete 'helm-c-set-variable 'helm-set-variable "1.5.1")
-(defalias 'helm-c-grep-save-results-1 'helm-grep-save-results-1)
-(make-obsolete 'helm-c-grep-save-results-1 'helm-grep-save-results-1 "1.5.1")
-(defalias 'helm-c-adaptative-maybe-load-history 'helm-adaptive-maybe-load-history)
-(make-obsolete 'helm-c-adaptative-maybe-load-history 'helm-adaptive-maybe-load-history "1.5.1")
-(defalias 'helm-c-w32-pathname-transformer 'helm-w32-pathname-transformer)
-(make-obsolete 'helm-c-w32-pathname-transformer 'helm-w32-pathname-transformer "1.5.1")
-(defalias 'helm-c-top-display-to-real 'helm-top-display-to-real)
-(make-obsolete 'helm-c-top-display-to-real 'helm-top-display-to-real "1.5.1")
-(defalias 'helm-c-open-file-externally 'helm-open-file-externally)
-(make-obsolete 'helm-c-open-file-externally 'helm-open-file-externally "1.5.1")
-(defalias 'helm-c-colors-get-rgb 'helm-colors-get-rgb)
-(make-obsolete 'helm-c-colors-get-rgb 'helm-colors-get-rgb "1.5.1")
-(defalias 'helm-c-stumpwm-commands-init 'helm-stumpwm-commands-init)
-(make-obsolete 'helm-c-stumpwm-commands-init 'helm-stumpwm-commands-init "1.5.1")
-(defalias 'helm-c-highlight-world 'helm-highlight-world)
-(make-obsolete 'helm-c-highlight-world 'helm-highlight-world "1.5.1")
-(defalias 'helm-c-top-sh 'helm-top-sh)
-(make-obsolete 'helm-c-top-sh 'helm-top-sh "1.5.1")
-(defalias 'helm-c-persistent-xfont-action 'helm-persistent-xfont-action)
-(make-obsolete 'helm-c-persistent-xfont-action 'helm-persistent-xfont-action "1.5.1")
-(defalias 'helm-c-latex-math-candidates 'helm-latex-math-candidates)
-(make-obsolete 'helm-c-latex-math-candidates 'helm-latex-math-candidates "1.5.1")
-(defalias 'helm-c-ucs-backward-char 'helm-ucs-backward-char)
-(make-obsolete 'helm-c-ucs-backward-char 'helm-ucs-backward-char "1.5.1")
-(defalias 'helm-c-calculate-ucs-max-len 'helm-calculate-ucs-max-len)
-(make-obsolete 'helm-c-calculate-ucs-max-len 'helm-calculate-ucs-max-len "1.5.1")
-(defalias 'helm-c-etags-mtime 'helm-etags-mtime)
-(make-obsolete 'helm-c-etags-mtime 'helm-etags-mtime "1.5.1")
-(defalias 'helm-c-google-suggest-action 'helm-google-suggest-action)
-(make-obsolete 'helm-c-google-suggest-action 'helm-google-suggest-action "1.5.1")
-(defalias 'helm-c-elisp-library-scan-init 'helm-elisp-library-scan-init)
-(make-obsolete 'helm-c-elisp-library-scan-init 'helm-elisp-library-scan-init "1.5.1")
-(defalias 'helm-c-apt-refresh 'helm-apt-refresh)
-(make-obsolete 'helm-c-apt-refresh 'helm-apt-refresh "1.5.1")
-(defalias 'helm-c-kill-regexp 'helm-kill-regexp)
-(make-obsolete 'helm-c-kill-regexp 'helm-kill-regexp "1.5.1")
-(defalias 'helm-c-grep-buffers-1 'helm-grep-buffers-1)
-(make-obsolete 'helm-c-grep-buffers-1 'helm-grep-buffers-1 "1.5.1")
-(defalias 'helm-c-adaptative-store-selection 'helm-adaptive-store-selection)
-(make-obsolete 'helm-c-adaptative-store-selection 'helm-adaptive-store-selection "1.5.1")
-(defalias 'helm-c-browse-url 'helm-browse-url)
-(make-obsolete 'helm-c-browse-url 'helm-browse-url "1.5.1")
-(defalias 'helm-c-google-suggest-emacs-lisp 'helm-google-suggest-emacs-lisp)
-(make-obsolete 'helm-c-google-suggest-emacs-lisp 'helm-google-suggest-emacs-lisp "1.5.1")
-(defalias 'helm-c-ucs-persistent-insert 'helm-ucs-persistent-insert)
-(make-obsolete 'helm-c-ucs-persistent-insert 'helm-ucs-persistent-insert "1.5.1")
-(defalias 'helm-c-xrandr-output 'helm-xrandr-output)
-(make-obsolete 'helm-c-xrandr-output 'helm-xrandr-output "1.5.1")
-(defalias 'helm-c-kill-ring-action 'helm-kill-ring-action)
-(make-obsolete 'helm-c-kill-ring-action 'helm-kill-ring-action "1.5.1")
-(defalias 'helm-c-org-keywords-candidates 'helm-org-keywords-candidates)
-(make-obsolete 'helm-c-org-keywords-candidates 'helm-org-keywords-candidates "1.5.1")
-(defalias 'helm-c-bookmark-jump 'helm-bookmark-jump)
-(make-obsolete 'helm-c-bookmark-jump 'helm-bookmark-jump "1.5.1")
-(defalias 'helm-c-shadow-boring-buffers 'helm-shadow-boring-buffers)
-(make-obsolete 'helm-c-shadow-boring-buffers 'helm-shadow-boring-buffers "1.5.1")
-(defalias 'helm-c-buffer-match-major-mode 'helm-buffer-match-major-mode)
-(make-obsolete 'helm-c-buffer-match-major-mode 'helm-buffer-match-major-mode "1.5.1")
-(defalias 'helm-c-highlight-bookmark-su 'helm-highlight-bookmark-su)
-(make-obsolete 'helm-c-highlight-bookmark-su 'helm-highlight-bookmark-su "1.5.1")
-(defalias 'helm-c-grep-other-frame 'helm-grep-other-frame)
-(make-obsolete 'helm-c-grep-other-frame 'helm-grep-other-frame "1.5.1")
-(defalias 'helm-c-jabber-online-contacts 'helm-jabber-online-contacts)
-(make-obsolete 'helm-c-jabber-online-contacts 'helm-jabber-online-contacts "1.5.1")
-(defalias 'helm-c-apt-purge 'helm-apt-purge)
-(make-obsolete 'helm-c-apt-purge 'helm-apt-purge "1.5.1")
-(defalias 'helm-c-adaptative-sort 'helm-adaptive-sort)
-(make-obsolete 'helm-c-adaptative-sort 'helm-adaptive-sort "1.5.1")
-(defalias 'helm-c-bmkext-addressbook-setup-alist 'helm-bmkext-addressbook-setup-alist)
-(make-obsolete 'helm-c-bmkext-addressbook-setup-alist 'helm-bmkext-addressbook-setup-alist "1.5.1")
-(defalias 'helm-c-bmkext-filter-setup-alist 'helm-bmkext-filter-setup-alist)
-(make-obsolete 'helm-c-bmkext-filter-setup-alist 'helm-bmkext-filter-setup-alist "1.5.1")
-(defalias 'helm-c-grep-buffers 'helm-grep-buffers)
-(make-obsolete 'helm-c-grep-buffers 'helm-grep-buffers "1.5.1")
-(defalias 'helm-c-apt-init 'helm-apt-init)
-(make-obsolete 'helm-c-apt-init 'helm-apt-init "1.5.1")
-(defalias 'helm-c-grep-run-save-buffer 'helm-grep-run-save-buffer)
-(make-obsolete 'helm-c-grep-run-save-buffer 'helm-grep-run-save-buffer "1.5.1")
-(defalias 'helm-c-ggs-set-number-result 'helm-ggs-set-number-result)
-(make-obsolete 'helm-c-ggs-set-number-result 'helm-ggs-set-number-result "1.5.1")
-(defalias 'helm-c-grep-prepare-candidates 'helm-grep-prepare-candidates)
-(make-obsolete 'helm-c-grep-prepare-candidates 'helm-grep-prepare-candidates "1.5.1")
-(defalias 'helm-c-grep-jump-elscreen 'helm-grep-jump-elscreen)
-(make-obsolete 'helm-c-grep-jump-elscreen 'helm-grep-jump-elscreen "1.5.1")
-(defalias 'helm-c-show-completion-display-function 'helm-show-completion-display-function)
-(make-obsolete 'helm-c-show-completion-display-function 'helm-show-completion-display-function "1.5.1")
-(defalias 'helm-c-find-variable 'helm-find-variable)
-(make-obsolete 'helm-c-find-variable 'helm-find-variable "1.5.1")
-(defalias 'helm-c-build-elvi-list 'helm-build-elvi-list)
-(make-obsolete 'helm-c-build-elvi-list 'helm-build-elvi-list "1.5.1")
-(defalias 'helm-c-advice-toggle 'helm-advice-toggle)
-(make-obsolete 'helm-c-advice-toggle 'helm-advice-toggle "1.5.1")
-(defalias 'helm-c-buffers-persistent-kill 'helm-buffers-persistent-kill)
-(make-obsolete 'helm-c-buffers-persistent-kill 'helm-buffers-persistent-kill "1.5.1")
-(defalias 'helm-c-register-action-transformer 'helm-register-action-transformer)
-(make-obsolete 'helm-c-register-action-transformer 'helm-register-action-transformer "1.5.1")
-(defalias 'helm-c-kill-ring-candidates 'helm-kill-ring-candidates)
-(make-obsolete 'helm-c-kill-ring-candidates 'helm-kill-ring-candidates "1.5.1")
-(defalias 'helm-c-generic-browser 'helm-generic-browser)
-(make-obsolete 'helm-c-generic-browser 'helm-generic-browser "1.5.1")
-(defalias 'helm-c-top-init 'helm-top-init)
-(make-obsolete 'helm-c-top-init 'helm-top-init "1.5.1")
-(defalias 'helm-c-ucs-delete-backward 'helm-ucs-delete-backward)
-(make-obsolete 'helm-c-ucs-delete-backward 'helm-ucs-delete-backward "1.5.1")
-(defalias 'helm-c-apt-generic-action 'helm-apt-generic-action)
-(make-obsolete 'helm-c-apt-generic-action 'helm-apt-generic-action "1.5.1")
-(defalias 'helm-c-pdfgrep-action-1 'helm-pdfgrep-action-1)
-(make-obsolete 'helm-c-pdfgrep-action-1 'helm-pdfgrep-action-1 "1.5.1")
-(defalias 'helm-c-buffer-query-replace-regexp 'helm-buffer-query-replace-regexp)
-(make-obsolete 'helm-c-buffer-query-replace-regexp 'helm-buffer-query-replace-regexp "1.5.1")
-(defalias 'helm-c-apropos-init 'helm-apropos-init)
-(make-obsolete 'helm-c-apropos-init 'helm-apropos-init "1.5.1")
-(defalias 'helm-c-kill-new 'helm-kill-new)
-(make-obsolete 'helm-c-kill-new 'helm-kill-new "1.5.1")
-(defalias 'helm-c-bookmark-gnus-setup-alist 'helm-bookmark-gnus-setup-alist)
-(make-obsolete 'helm-c-bookmark-gnus-setup-alist 'helm-bookmark-gnus-setup-alist "1.5.1")
-(defalias 'helm-c-quit-and-execute-action 'helm-quit-and-execute-action)
-(make-obsolete 'helm-c-quit-and-execute-action 'helm-quit-and-execute-action "1.5.1")
-(defalias 'helm-c-build-info-index-command 'helm-build-info-index-command)
-(make-obsolete 'helm-c-build-info-index-command 'helm-build-info-index-command "1.5.1")
-(defalias 'helm-c-ratpoison-commands-init 'helm-ratpoison-commands-init)
-(make-obsolete 'helm-c-ratpoison-commands-init 'helm-ratpoison-commands-init "1.5.1")
-(defalias 'helm-c-etags-select 'helm-etags-select)
-(make-obsolete 'helm-c-etags-select 'helm-etags-select "1.5.1")
-(defalias 'helm-c-etags-create-buffer 'helm-etags-create-buffer)
-(make-obsolete 'helm-c-etags-create-buffer 'helm-etags-create-buffer "1.5.1")
-(defalias 'helm-c-yahoo-suggest-set-candidates 'helm-yahoo-suggest-set-candidates)
-(make-obsolete 'helm-c-yahoo-suggest-set-candidates 'helm-yahoo-suggest-set-candidates "1.5.1")
-(defalias 'helm-c-org-keywords-show-help 'helm-org-keywords-show-help)
-(make-obsolete 'helm-c-org-keywords-show-help 'helm-org-keywords-show-help "1.5.1")
-(defalias 'helm-c-highlight-files 'helm-highlight-files)
-(make-obsolete 'helm-c-highlight-files 'helm-highlight-files "1.5.1")
-(defalias 'helm-c-get-pid-from-process-name 'helm-get-pid-from-process-name)
-(make-obsolete 'helm-c-get-pid-from-process-name 'helm-get-pid-from-process-name "1.5.1")
-(defalias 'helm-c-insert-latex-math 'helm-insert-latex-math)
-(make-obsolete 'helm-c-insert-latex-math 'helm-insert-latex-math "1.5.1")
-(defalias 'helm-c-buffer-query-replace 'helm-buffer-query-replace)
-(make-obsolete 'helm-c-buffer-query-replace 'helm-buffer-query-replace "1.5.1")
-(defalias 'helm-c-bmkext-run-edit 'helm-bmkext-run-edit)
-(make-obsolete 'helm-c-bmkext-run-edit 'helm-bmkext-run-edit "1.5.1")
-(defalias 'helm-c-skip-boring-files 'helm-skip-boring-files)
-(make-obsolete 'helm-c-skip-boring-files 'helm-skip-boring-files "1.5.1")
-(defalias 'helm-c-transform-file-load-el 'helm-transform-file-load-el)
-(make-obsolete 'helm-c-transform-file-load-el 'helm-transform-file-load-el "1.5.1")
-(defalias 'helm-c-ucs-insert-char 'helm-ucs-insert-char)
-(make-obsolete 'helm-c-ucs-insert-char 'helm-ucs-insert-char "1.5.1")
-(defalias 'helm-c-buffer-help 'helm-buffer-help)
-(make-obsolete 'helm-c-buffer-help 'helm-buffer-help "1.5.1")
-(defalias 'helm-c-current-directory 'helm-current-directory)
-(make-obsolete 'helm-c-current-directory 'helm-current-directory "1.5.1")
-(defalias 'helm-c-find-file-or-marked 'helm-find-file-or-marked)
-(make-obsolete 'helm-c-find-file-or-marked 'helm-find-file-or-marked "1.5.1")
-(defalias 'helm-c-query-replace-regexp 'helm-query-replace-regexp)
-(make-obsolete 'helm-c-query-replace-regexp 'helm-query-replace-regexp "1.5.1")
-(defalias 'helm-c-describe-variable 'helm-describe-variable)
-(make-obsolete 'helm-c-describe-variable 'helm-describe-variable "1.5.1")
-(defalias 'helm-c-advice-persistent-action 'helm-advice-persistent-action)
-(make-obsolete 'helm-c-advice-persistent-action 'helm-advice-persistent-action "1.5.1")
-(defalias 'helm-c-show-completion 'helm-show-completion)
-(make-obsolete 'helm-c-show-completion 'helm-show-completion "1.5.1")
-(defalias 'helm-c-google-suggest-set-candidates 'helm-google-suggest-set-candidates)
-(make-obsolete 'helm-c-google-suggest-set-candidates 'helm-google-suggest-set-candidates "1.5.1")
-(defalias 'helm-c-grep-persistent-action 'helm-grep-persistent-action)
-(make-obsolete 'helm-c-grep-persistent-action 'helm-grep-persistent-action "1.5.1")
-(defalias 'helm-c-open-file-with-default-tool 'helm-open-file-with-default-tool)
-(make-obsolete 'helm-c-open-file-with-default-tool 'helm-open-file-with-default-tool "1.5.1")
-(defalias 'helm-c-run-external-command 'helm-run-external-command)
-(make-obsolete 'helm-c-run-external-command 'helm-run-external-command "1.5.1")
-(defalias 'helm-c-bookmark-images-setup-alist 'helm-bookmark-images-setup-alist)
-(make-obsolete 'helm-c-bookmark-images-setup-alist 'helm-bookmark-images-setup-alist "1.5.1")
-(defalias 'helm-c-apt-candidate-transformer 'helm-apt-candidate-transformer)
-(make-obsolete 'helm-c-apt-candidate-transformer 'helm-apt-candidate-transformer "1.5.1")
-(defalias 'helm-c-grep-run-persistent-action 'helm-grep-run-persistent-action)
-(make-obsolete 'helm-c-grep-run-persistent-action 'helm-grep-run-persistent-action "1.5.1")
-(defalias 'helm-c-highlight-buffers 'helm-highlight-buffers)
-(make-obsolete 'helm-c-highlight-buffers 'helm-highlight-buffers "1.5.1")
-(defalias 'helm-c-man-default-action 'helm-man-default-action)
-(make-obsolete 'helm-c-man-default-action 'helm-man-default-action "1.5.1")
-(defalias 'helm-c-advice-candidates 'helm-advice-candidates)
-(make-obsolete 'helm-c-advice-candidates 'helm-advice-candidates "1.5.1")
-(defalias 'helm-c-stumpwm-commands-execute 'helm-stumpwm-commands-execute)
-(make-obsolete 'helm-c-stumpwm-commands-execute 'helm-stumpwm-commands-execute "1.5.1")
-(defalias 'helm-c-ucs-help 'helm-ucs-help)
-(make-obsolete 'helm-c-ucs-help 'helm-ucs-help "1.5.1")
-(defalias 'helm-c-apt-uninstall 'helm-apt-uninstall)
-(make-obsolete 'helm-c-apt-uninstall 'helm-apt-uninstall "1.5.1")
-(defalias 'helm-c-bookmark-run-jump-other-window 'helm-bookmark-run-jump-other-window)
-(make-obsolete 'helm-c-bookmark-run-jump-other-window 'helm-bookmark-run-jump-other-window "1.5.1")
-(defalias 'helm-c-elisp-library-scan-list 'helm-elisp-library-scan-list)
-(make-obsolete 'helm-c-elisp-library-scan-list 'helm-elisp-library-scan-list "1.5.1")
-(defalias 'helm-c-bookmark-man-setup-alist 'helm-bookmark-man-setup-alist)
-(make-obsolete 'helm-c-bookmark-man-setup-alist 'helm-bookmark-man-setup-alist "1.5.1")
-(defalias 'helm-c-etags-find-tag-file-directory 'helm-etags-find-tag-file-directory)
-(make-obsolete 'helm-c-etags-find-tag-file-directory 'helm-etags-find-tag-file-directory "1.5.1")
-(defalias 'helm-c-xrandr-info 'helm-xrandr-info)
-(make-obsolete 'helm-c-xrandr-info 'helm-xrandr-info "1.5.1")
-(defalias 'helm-c-stringify 'helm-stringify)
-(make-obsolete 'helm-c-stringify 'helm-stringify "1.5.1")
-(defalias 'helm-c-goto-precedent-file 'helm-goto-precedent-file)
-(make-obsolete 'helm-c-goto-precedent-file 'helm-goto-precedent-file "1.5.1")
-(defalias 'helm-c-apt-cache-show 'helm-apt-cache-show)
-(make-obsolete 'helm-c-apt-cache-show 'helm-apt-cache-show "1.5.1")
-(defalias 'helm-c-etags-file-modified-p 'helm-etags-file-modified-p)
-(make-obsolete 'helm-c-etags-file-modified-p 'helm-etags-file-modified-p "1.5.1")
-(defalias 'helm-c-etags-get-tag-file 'helm-etags-get-tag-file)
-(make-obsolete 'helm-c-etags-get-tag-file 'helm-etags-get-tag-file "1.5.1")
-(defalias 'helm-c-highlight-not-logged 'helm-highlight-not-logged)
-(make-obsolete 'helm-c-highlight-not-logged 'helm-highlight-not-logged "1.5.1")
-(defalias 'helm-c-pdfgrep-action 'helm-pdfgrep-action)
-(make-obsolete 'helm-c-pdfgrep-action 'helm-pdfgrep-action "1.5.1")
-(defalias 'helm-c-adaptative-save-history 'helm-adaptive-save-history)
-(make-obsolete 'helm-c-adaptative-save-history 'helm-adaptive-save-history "1.5.1")
-(defalias 'helm-c-get-first-line-documentation 'helm-get-first-line-documentation)
-(make-obsolete 'helm-c-get-first-line-documentation 'helm-get-first-line-documentation "1.5.1")
-(defalias 'helm-approximate-candidate-number 'helm-get-candidate-number)
-(make-obsolete 'helm-approximate-candidate-number 'helm-get-candidate-number "1.5.5")
-(defalias 'helm-org-headlines 'helm-org-in-buffer-headings)
-(make-obsolete 'helm-org-headlines 'helm-org-in-buffer-headings "1.6.5")
-
-
-;;; variables
-;;
-;;
-
-
-(defvaralias 'helm-c-pdfgrep-default-command 'helm-pdfgrep-default-command)
-(make-obsolete-variable 'helm-c-pdfgrep-default-command 'helm-pdfgrep-default-command "1.5.1")
-(defvaralias 'helm-c-source-time-world 'helm-source-time-world)
-(make-obsolete-variable 'helm-c-source-time-world 'helm-source-time-world "1.5.1")
-(defvaralias 'helm-c-grep-default-command 'helm-grep-default-command)
-(make-obsolete-variable 'helm-c-grep-default-command 'helm-grep-default-command "1.5.1")
-(defvaralias 'helm-c-default-info-index-list 'helm-default-info-index-list)
-(make-obsolete-variable 'helm-c-default-info-index-list 'helm-default-info-index-list "1.5.1")
-(defvaralias 'helm-c-etags-tag-file-dir 'helm-etags-tag-file-dir)
-(make-obsolete-variable 'helm-c-etags-tag-file-dir 'helm-etags-tag-file-dir "1.5.1")
-(defvaralias 'helm-c-source-man-pages 'helm-source-man-pages)
-(make-obsolete-variable 'helm-c-source-man-pages 'helm-source-man-pages "1.5.1")
-(defvaralias 'helm-c-source-bookmark-info 'helm-source-bookmark-info)
-(make-obsolete-variable 'helm-c-source-bookmark-info 'helm-source-bookmark-info "1.5.1")
-(defvaralias 'helm-c-file-cache-files 'helm-file-cache-files)
-(make-obsolete-variable 'helm-c-file-cache-files 'helm-file-cache-files "1.5.1")
-(defvaralias 'helm-c-ucs-map 'helm-ucs-map)
-(make-obsolete-variable 'helm-c-ucs-map 'helm-ucs-map "1.5.1")
-(defvaralias 'helm-c-show-completion-min-window-height 'helm-show-completion-min-window-height)
-(make-obsolete-variable 'helm-c-show-completion-min-window-height 'helm-show-completion-min-window-height "1.5.1")
-(defvaralias 'helm-c-adaptative-history 'helm-adaptive-history)
-(make-obsolete-variable 'helm-c-adaptative-history 'helm-adaptive-history "1.5.1")
-(defvaralias 'helm-c-source-bookmarks-local 'helm-source-bookmarks-local)
-(make-obsolete-variable 'helm-c-source-bookmarks-local 'helm-source-bookmarks-local "1.5.1")
-(defvaralias 'helm-c-grep-map 'helm-grep-map)
-(make-obsolete-variable 'helm-c-grep-map 'helm-grep-map "1.5.1")
-(defvaralias 'helm-c-source-session 'helm-source-session)
-(make-obsolete-variable 'helm-c-source-session 'helm-source-session "1.5.1")
-(defvaralias 'helm-c-source-minibuffer-history 'helm-source-minibuffer-history)
-(make-obsolete-variable 'helm-c-source-minibuffer-history 'helm-source-minibuffer-history "1.5.1")
-(defvaralias 'helm-c-source-files-in-current-dir 'helm-source-files-in-current-dir)
-(make-obsolete-variable 'helm-c-source-files-in-current-dir 'helm-source-files-in-current-dir "1.5.1")
-(defvaralias 'helm-c-source-etags-select 'helm-source-etags-select)
-(make-obsolete-variable 'helm-c-source-etags-select 'helm-source-etags-select "1.5.1")
-(defvaralias 'helm-c-show-completion-overlay 'helm-show-completion-overlay)
-(make-obsolete-variable 'helm-c-show-completion-overlay 'helm-show-completion-overlay "1.5.1")
-(defvaralias 'helm-c-buffer-help-message 'helm-buffer-help-message)
-(make-obsolete-variable 'helm-c-buffer-help-message 'helm-buffer-help-message "1.5.1")
-(defvaralias 'helm-c-ucs-max-len 'helm-ucs-max-len)
-(make-obsolete-variable 'helm-c-ucs-max-len 'helm-ucs-max-len "1.5.1")
-(defvaralias 'helm-c-imenu-index-filter 'helm-imenu-index-filter)
-(make-obsolete-variable 'helm-c-imenu-index-filter 'helm-imenu-index-filter "1.5.1")
-(defvaralias 'helm-c-org-keywords-info-location 'helm-org-keywords-info-location)
-(make-obsolete-variable 'helm-c-org-keywords-info-location 'helm-org-keywords-info-location "1.5.1")
-(defvaralias 'helm-c-kill-ring-max-lines-number 'helm-kill-ring-max-lines-number)
-(make-obsolete-variable 'helm-c-kill-ring-max-lines-number 'helm-kill-ring-max-lines-number "1.5.1")
-(defvaralias 'helm-c-source-apt 'helm-source-apt)
-(make-obsolete-variable 'helm-c-source-apt 'helm-source-apt "1.5.1")
-(defvaralias 'helm-c-bookmark-map 'helm-bookmark-map)
-(make-obsolete-variable 'helm-c-bookmark-map 'helm-bookmark-map "1.5.1")
-(defvaralias 'helm-c-source-xfonts 'helm-source-xfonts)
-(make-obsolete-variable 'helm-c-source-xfonts 'helm-source-xfonts "1.5.1")
-(defvaralias 'helm-c-source-kill-ring 'helm-source-kill-ring)
-(make-obsolete-variable 'helm-c-source-kill-ring 'helm-source-kill-ring "1.5.1")
-(defvaralias 'helm-c-home-url 'helm-home-url)
-(make-obsolete-variable 'helm-c-home-url 'helm-home-url "1.5.1")
-(defvaralias 'helm-c-etags-cache 'helm-etags-cache)
-(make-obsolete-variable 'helm-c-etags-cache 'helm-etags-cache "1.5.1")
-(defvaralias 'helm-c-source-latex-math 'helm-source-latex-math)
-(make-obsolete-variable 'helm-c-source-latex-math 'helm-source-latex-math "1.5.1")
-(defvaralias 'helm-c-source-bookmark-files&dirs 'helm-source-bookmark-files&dirs)
-(make-obsolete-variable 'helm-c-source-bookmark-files&dirs 'helm-source-bookmark-files&dirs "1.5.1")
-(defvaralias 'helm-c-source-ratpoison-commands 'helm-source-ratpoison-commands)
-(make-obsolete-variable 'helm-c-source-ratpoison-commands 'helm-source-ratpoison-commands "1.5.1")
-(defvaralias 'helm-c-apt-show-command 'helm-apt-show-command)
-(make-obsolete-variable 'helm-c-apt-show-command 'helm-apt-show-command "1.5.1")
-(defvaralias 'helm-c-pdfgrep-default-function 'helm-pdfgrep-default-function)
-(make-obsolete-variable 'helm-c-pdfgrep-default-function 'helm-pdfgrep-default-function "1.5.1")
-(defvaralias 'helm-c-source-register 'helm-source-register)
-(make-obsolete-variable 'helm-c-source-register 'helm-source-register "1.5.1")
-(defvaralias 'helm-c-boring-buffer-regexp-list 'helm-boring-buffer-regexp-list)
-(make-obsolete-variable 'helm-c-boring-buffer-regexp-list 'helm-boring-buffer-regexp-list "1.5.1")
-(defvaralias 'helm-c-source-locate 'helm-source-locate)
-(make-obsolete-variable 'helm-c-source-locate 'helm-source-locate "1.5.1")
-(defvaralias 'helm-c-source-advice 'helm-source-advice)
-(make-obsolete-variable 'helm-c-source-advice 'helm-source-advice "1.5.1")
-(defvaralias 'helm-c-source-yaoddmuse-emacswiki-edit-or-view 'helm-source-yaoddmuse-emacswiki-edit-or-view)
-(defvaralias 'helm-c-ucs-mode-line-string 'helm-ucs-mode-line-string)
-(make-obsolete-variable 'helm-c-ucs-mode-line-string 'helm-ucs-mode-line-string "1.5.1")
-(defvaralias 'helm-c-xfonts-cache 'helm-xfonts-cache)
-(make-obsolete-variable 'helm-c-xfonts-cache 'helm-xfonts-cache "1.5.1")
-(defvaralias 'helm-c-source-yahoo-suggest 'helm-source-yahoo-suggest)
-(make-obsolete-variable 'helm-c-source-yahoo-suggest 'helm-source-yahoo-suggest "1.5.1")
-(defvaralias 'helm-c-rzgrep-cache 'helm-rzgrep-cache)
-(make-obsolete-variable 'helm-c-rzgrep-cache 'helm-rzgrep-cache "1.5.1")
-(defvaralias 'helm-c-source-org-keywords 'helm-source-org-keywords)
-(make-obsolete-variable 'helm-c-source-org-keywords 'helm-source-org-keywords "1.5.1")
-(defvaralias 'helm-c-pdfgrep-map 'helm-pdfgrep-map)
-(make-obsolete-variable 'helm-c-pdfgrep-map 'helm-pdfgrep-map "1.5.1")
-(defvaralias 'helm-c-source-lacarte 'helm-source-lacarte)
-(make-obsolete-variable 'helm-c-source-lacarte 'helm-source-lacarte "1.5.1")
-(defvaralias 'helm-c-apt-search-command 'helm-apt-search-command)
-(make-obsolete-variable 'helm-c-apt-search-command 'helm-apt-search-command "1.5.1")
-(defvaralias 'helm-c-default-external-file-browser 'helm-default-external-file-browser)
-(make-obsolete-variable 'helm-c-default-external-file-browser 'helm-default-external-file-browser "1.5.1")
-(defvaralias 'helm-c-source-evaluation-result 'helm-source-evaluation-result)
-(make-obsolete-variable 'helm-c-source-evaluation-result 'helm-source-evaluation-result "1.5.1")
-(defvaralias 'helm-c-yahoo-suggest-search-url 'helm-yahoo-suggest-search-url)
-(make-obsolete-variable 'helm-c-yahoo-suggest-search-url 'helm-yahoo-suggest-search-url "1.5.1")
-(defvaralias 'helm-c-source-occur 'helm-source-occur)
-(make-obsolete-variable 'helm-c-source-occur 'helm-source-occur "1.5.1")
-(defvaralias 'helm-c-source-calculation-result 'helm-source-calculation-result)
-(make-obsolete-variable 'helm-c-source-calculation-result 'helm-source-calculation-result "1.5.1")
-(defvaralias 'helm-c-default-zgrep-command 'helm-default-zgrep-command)
-(make-obsolete-variable 'helm-c-default-zgrep-command 'helm-default-zgrep-command "1.5.1")
-(defvaralias 'helm-c-show-info-in-mode-line-delay 'helm-show-info-in-mode-line-delay)
-(make-obsolete-variable 'helm-c-show-info-in-mode-line-delay 'helm-show-info-in-mode-line-delay "1.5.1")
-(defvaralias 'helm-c-source-ido-virtual-buffers 'helm-source-ido-virtual-buffers)
-(make-obsolete-variable 'helm-c-source-ido-virtual-buffers 'helm-source-ido-virtual-buffers "1.5.1")
-(defvaralias 'helm-c-source-top 'helm-source-top)
-(make-obsolete-variable 'helm-c-source-top 'helm-source-top "1.5.1")
-(defvaralias 'helm-c-source-colors 'helm-source-colors)
-(make-obsolete-variable 'helm-c-source-colors 'helm-source-colors "1.5.1")
-(defvaralias 'helm-c-read-file-map 'helm-read-file-map)
-(make-obsolete-variable 'helm-c-read-file-map 'helm-read-file-map "1.5.1")
-(defvaralias 'helm-c-source-file-cache 'helm-source-file-cache)
-(make-obsolete-variable 'helm-c-source-file-cache 'helm-source-file-cache "1.5.1")
-(defvaralias 'helm-c-google-suggest-default-browser-function 'helm-google-suggest-default-browser-function)
-(make-obsolete-variable 'helm-c-google-suggest-default-browser-function 'helm-google-suggest-default-browser-function "1.5.1")
-(defvaralias 'helm-c-external-programs-associations 'helm-external-programs-associations)
-(make-obsolete-variable 'helm-c-external-programs-associations 'helm-external-programs-associations "1.5.1")
-(defvaralias 'helm-c-source-complex-command-history 'helm-source-complex-command-history)
-(make-obsolete-variable 'helm-c-source-complex-command-history 'helm-source-complex-command-history "1.5.1")
-(defvaralias 'helm-c-cached-imenu-candidates 'helm-cached-imenu-candidates)
-(make-obsolete-variable 'helm-c-cached-imenu-candidates 'helm-cached-imenu-candidates "1.5.1")
-(defvaralias 'helm-c-external-commands-list 'helm-external-commands-list)
-(make-obsolete-variable 'helm-c-external-commands-list 'helm-external-commands-list "1.5.1")
-(defvaralias 'helm-c-source-ucs 'helm-source-ucs)
-(make-obsolete-variable 'helm-c-source-ucs 'helm-source-ucs "1.5.1")
-(defvaralias 'helm-c-adaptative-history-length 'helm-adaptive-history-length)
-(make-obsolete-variable 'helm-c-adaptative-history-length 'helm-adaptive-history-length "1.5.1")
-(defvaralias 'helm-c-source-customize-face 'helm-source-customize-face)
-(make-obsolete-variable 'helm-c-source-customize-face 'helm-source-customize-face "1.5.1")
-(defvaralias 'helm-c-source-bookmarks-ssh 'helm-source-bookmarks-ssh)
-(make-obsolete-variable 'helm-c-source-bookmarks-ssh 'helm-source-bookmarks-ssh "1.5.1")
-(defvaralias 'helm-c-eldoc-in-minibuffer-show-fn 'helm-eldoc-in-minibuffer-show-fn)
-(make-obsolete-variable 'helm-c-eldoc-in-minibuffer-show-fn 'helm-eldoc-in-minibuffer-show-fn "1.5.1")
-(defvaralias 'helm-c-google-suggest-search-url 'helm-google-suggest-search-url)
-(make-obsolete-variable 'helm-c-google-suggest-search-url 'helm-google-suggest-search-url "1.5.1")
-(defvaralias 'helm-c-source-bmkext-addressbook 'helm-source-bmkext-addressbook)
-(make-obsolete-variable 'helm-c-source-bmkext-addressbook 'helm-source-bmkext-addressbook "1.5.1")
-(defvaralias 'helm-c-source-ctags 'helm-source-ctags)
-(make-obsolete-variable 'helm-c-source-ctags 'helm-source-ctags "1.5.1")
-(defvaralias 'helm-c-apt-installed-packages 'helm-apt-installed-packages)
-(make-obsolete-variable 'helm-c-apt-installed-packages 'helm-apt-installed-packages "1.5.1")
-(defvaralias 'helm-c-apt-all-packages 'helm-apt-all-packages)
-(make-obsolete-variable 'helm-c-apt-all-packages 'helm-apt-all-packages "1.5.1")
-(defvaralias 'helm-c-find-files-doc-header 'helm-find-files-doc-header)
-(make-obsolete-variable 'helm-c-find-files-doc-header 'helm-find-files-doc-header "1.5.1")
-(defvaralias 'helm-c-source-imenu 'helm-source-imenu)
-(make-obsolete-variable 'helm-c-source-imenu 'helm-source-imenu "1.5.1")
-(defvaralias 'helm-c-grep-default-function 'helm-grep-default-function)
-(make-obsolete-variable 'helm-c-grep-default-function 'helm-grep-default-function "1.5.1")
-(defvaralias 'helm-c-top-command 'helm-top-command)
-(make-obsolete-variable 'helm-c-top-command 'helm-top-command "1.5.1")
-(defvaralias 'helm-c-source-bookmark-man 'helm-source-bookmark-man)
-(make-obsolete-variable 'helm-c-source-bookmark-man 'helm-source-bookmark-man "1.5.1")
-(defvaralias 'helm-c-source-stumpwm-commands 'helm-source-stumpwm-commands)
-(make-obsolete-variable 'helm-c-source-stumpwm-commands 'helm-source-stumpwm-commands "1.5.1")
-(defvaralias 'helm-c-source-idle-time-timers 'helm-source-idle-time-timers)
-(make-obsolete-variable 'helm-c-source-idle-time-timers 'helm-source-idle-time-timers "1.5.1")
-(defvaralias 'helm-c-turn-on-show-completion 'helm-turn-on-show-completion)
-(make-obsolete-variable 'helm-c-turn-on-show-completion 'helm-turn-on-show-completion "1.5.1")
-(defvaralias 'helm-c-esh-help-message 'helm-esh-help-message)
-(make-obsolete-variable 'helm-c-esh-help-message 'helm-esh-help-message "1.5.1")
-(defvaralias 'helm-c-register-max-offset 'helm-register-max-offset)
-(make-obsolete-variable 'helm-c-register-max-offset 'helm-register-max-offset "1.5.1")
-(defvaralias 'helm-c-source-bookmark-set 'helm-source-bookmark-set)
-(make-obsolete-variable 'helm-c-source-bookmark-set 'helm-source-bookmark-set "1.5.1")
-(defvaralias 'helm-c-source-file-name-history 'helm-source-file-name-history)
-(make-obsolete-variable 'helm-c-source-file-name-history 'helm-source-file-name-history "1.5.1")
-(defvaralias 'helm-c-file-cache-initialized-p 'helm-file-cache-initialized-p)
-(make-obsolete-variable 'helm-c-file-cache-initialized-p 'helm-file-cache-initialized-p "1.5.1")
-(defvaralias 'helm-c-grep-max-length-history 'helm-grep-max-length-history)
-(make-obsolete-variable 'helm-c-grep-max-length-history 'helm-grep-max-length-history "1.5.1")
-(defvaralias 'helm-c-source-jabber-contacts 'helm-source-jabber-contacts)
-(make-obsolete-variable 'helm-c-source-jabber-contacts 'helm-source-jabber-contacts "1.5.1")
-(defvaralias 'helm-c-grep-use-ioccur-style-keys 'helm-grep-use-ioccur-style-keys)
-(make-obsolete-variable 'helm-c-grep-use-ioccur-style-keys 'helm-grep-use-ioccur-style-keys "1.5.1")
-(defvaralias 'helm-c-ctags-modes 'helm-ctags-modes)
-(make-obsolete-variable 'helm-c-ctags-modes 'helm-ctags-modes "1.5.1")
-(defvaralias 'helm-c-source-moccur 'helm-source-moccur)
-(make-obsolete-variable 'helm-c-source-moccur 'helm-source-moccur "1.5.1")
-(defvaralias 'helm-c-locate-command 'helm-locate-command)
-(make-obsolete-variable 'helm-c-locate-command 'helm-locate-command "1.5.1")
-(defvaralias 'helm-c-etags-tag-file-name 'helm-etags-tag-file-name)
-(make-obsolete-variable 'helm-c-etags-tag-file-name 'helm-etags-tag-file-name "1.5.1")
-(defvaralias 'helm-c-source-bookmarks-su 'helm-source-bookmarks-su)
-(make-obsolete-variable 'helm-c-source-bookmarks-su 'helm-source-bookmarks-su "1.5.1")
-(defvaralias 'helm-c-buffer-map 'helm-buffer-map)
-(make-obsolete-variable 'helm-c-buffer-map 'helm-buffer-map "1.5.1")
-(defvaralias 'helm-c-source-files-in-all-dired 'helm-source-files-in-all-dired)
-(make-obsolete-variable 'helm-c-source-files-in-all-dired 'helm-source-files-in-all-dired "1.5.1")
-(defvaralias 'helm-c-source-eshell-history 'helm-source-eshell-history)
-(make-obsolete-variable 'helm-c-source-eshell-history 'helm-source-eshell-history "1.5.1")
-(defvaralias 'helm-c-source-absolute-time-timers 'helm-source-absolute-time-timers)
-(make-obsolete-variable 'helm-c-source-absolute-time-timers 'helm-source-absolute-time-timers "1.5.1")
-(defvaralias 'helm-c-source-findutils 'helm-source-findutils)
-(make-obsolete-variable 'helm-c-source-findutils 'helm-source-findutils "1.5.1")
-(defvaralias 'helm-c-ucs-help-message 'helm-ucs-help-message)
-(make-obsolete-variable 'helm-c-ucs-help-message 'helm-ucs-help-message "1.5.1")
-(defvaralias 'helm-c-source-find-files 'helm-source-find-files)
-(make-obsolete-variable 'helm-c-source-find-files 'helm-source-find-files "1.5.1")
-(defvaralias 'helm-c-source-recentf 'helm-source-recentf)
-(make-obsolete-variable 'helm-c-source-recentf 'helm-source-recentf "1.5.1")
-(defvaralias 'helm-c-cache-world 'helm-cache-world)
-(make-obsolete-variable 'helm-c-cache-world 'helm-cache-world "1.5.1")
-(defvaralias 'helm-c-source-picklist 'helm-source-picklist)
-(make-obsolete-variable 'helm-c-source-picklist 'helm-source-picklist "1.5.1")
-(defvaralias 'helm-c-source-buffer-not-found 'helm-source-buffer-not-found)
-(make-obsolete-variable 'helm-c-source-buffer-not-found 'helm-source-buffer-not-found "1.5.1")
-(defvaralias 'helm-c-source-xrandr-change-resolution 'helm-source-xrandr-change-resolution)
-(make-obsolete-variable 'helm-c-source-xrandr-change-resolution 'helm-source-xrandr-change-resolution "1.5.1")
-(defvaralias 'helm-c-google-suggest-url 'helm-google-suggest-url)
-(make-obsolete-variable 'helm-c-google-suggest-url 'helm-google-suggest-url "1.5.1")
-(defvaralias 'helm-c-source-semantic 'helm-source-semantic)
-(make-obsolete-variable 'helm-c-source-semantic 'helm-source-semantic "1.5.1")
-(defvaralias 'helm-c-source-mark-ring 'helm-source-mark-ring)
-(make-obsolete-variable 'helm-c-source-mark-ring 'helm-source-mark-ring "1.5.1")
-(defvaralias 'helm-c-grep-preferred-ext 'helm-grep-preferred-ext)
-(make-obsolete-variable 'helm-c-grep-preferred-ext 'helm-grep-preferred-ext "1.5.1")
-(defvaralias 'helm-c-source-bookmarks 'helm-source-bookmarks)
-(make-obsolete-variable 'helm-c-source-bookmarks 'helm-source-bookmarks "1.5.1")
-(defvaralias 'helm-c-source-elisp-library-scan 'helm-source-elisp-library-scan)
-(make-obsolete-variable 'helm-c-source-elisp-library-scan 'helm-source-elisp-library-scan "1.5.1")
-(defvaralias 'helm-c-source-info-pages 'helm-source-info-pages)
-(make-obsolete-variable 'helm-c-source-info-pages 'helm-source-info-pages "1.5.1")
-(defvaralias 'helm-c-source-bookmark-gnus 'helm-source-bookmark-gnus)
-(make-obsolete-variable 'helm-c-source-bookmark-gnus 'helm-source-bookmark-gnus "1.5.1")
-(defvaralias 'helm-c-source-elscreen 'helm-source-elscreen)
-(make-obsolete-variable 'helm-c-source-elscreen 'helm-source-elscreen "1.5.1")
-(defvaralias 'helm-c-etags-mtime-alist 'helm-etags-mtime-alist)
-(make-obsolete-variable 'helm-c-etags-mtime-alist 'helm-etags-mtime-alist "1.5.1")
-(defvaralias 'helm-c-grep-default-recurse-command 'helm-grep-default-recurse-command)
-(make-obsolete-variable 'helm-c-grep-default-recurse-command 'helm-grep-default-recurse-command "1.5.1")
-(defvaralias 'helm-c-source-google-suggest 'helm-source-google-suggest)
-(make-obsolete-variable 'helm-c-source-google-suggest 'helm-source-google-suggest "1.5.1")
-(defvaralias 'helm-c-etags-tag-file-search-limit 'helm-etags-tag-file-search-limit)
-(make-obsolete-variable 'helm-c-etags-tag-file-search-limit 'helm-etags-tag-file-search-limit "1.5.1")
-(defvaralias 'helm-c-source-ff-file-name-history 'helm-source-ff-file-name-history)
-(make-obsolete-variable 'helm-c-source-ff-file-name-history 'helm-source-ff-file-name-history "1.5.1")
-(defvaralias 'helm-c-source-buffers-list 'helm-source-buffers-list)
-(make-obsolete-variable 'helm-c-source-buffers-list 'helm-source-buffers-list "1.5.1")
-(defvaralias 'helm-c-cached-imenu-alist 'helm-cached-imenu-alist)
-(make-obsolete-variable 'helm-c-cached-imenu-alist 'helm-cached-imenu-alist "1.5.1")
-(defvaralias 'helm-c-source-tracker-search 'helm-source-tracker-search)
-(make-obsolete-variable 'helm-c-source-tracker-search 'helm-source-tracker-search "1.5.1")
-(defvaralias 'helm-c-google-suggest-default-function 'helm-google-suggest-default-function)
-(make-obsolete-variable 'helm-c-google-suggest-default-function 'helm-google-suggest-default-function "1.5.1")
-(defvaralias 'helm-c-imenu-delimiter 'helm-imenu-delimiter)
-(make-obsolete-variable 'helm-c-imenu-delimiter 'helm-imenu-delimiter "1.5.1")
-(defvaralias 'helm-c-source-emacs-process 'helm-source-emacs-process)
-(make-obsolete-variable 'helm-c-source-emacs-process 'helm-source-emacs-process "1.5.1")
-(defvaralias 'helm-c-etags-map 'helm-etags-map)
-(make-obsolete-variable 'helm-c-etags-map 'helm-etags-map "1.5.1")
-(defvaralias 'helm-c-grep-history 'helm-grep-history)
-(make-obsolete-variable 'helm-c-grep-history 'helm-grep-history "1.5.1")
-(defvaralias 'helm-c-cached-imenu-tick 'helm-cached-imenu-tick)
-(make-obsolete-variable 'helm-c-cached-imenu-tick 'helm-cached-imenu-tick "1.5.1")
-(defvaralias 'helm-c-source-esh 'helm-source-esh)
-(make-obsolete-variable 'helm-c-source-esh 'helm-source-esh "1.5.1")
-(defvaralias 'helm-c-source-global-mark-ring 'helm-source-global-mark-ring)
-(make-obsolete-variable 'helm-c-source-global-mark-ring 'helm-source-global-mark-ring "1.5.1")
-(defvaralias 'helm-c-man-pages 'helm-man-pages)
-(make-obsolete-variable 'helm-c-man-pages 'helm-man-pages "1.5.1")
-(defvaralias 'helm-c-adaptative-done 'helm-adaptive-done)
-(make-obsolete-variable 'helm-c-adaptative-done 'helm-adaptive-done "1.5.1")
-(defvaralias 'helm-c-source-regexp 'helm-source-regexp)
-(make-obsolete-variable 'helm-c-source-regexp 'helm-source-regexp "1.5.1")
-(defvaralias 'helm-c-boring-file-regexp-list 'helm-boring-file-regexp-list)
-(make-obsolete-variable 'helm-c-boring-file-regexp-list 'helm-boring-file-regexp-list "1.5.1")
-(defvaralias 'helm-c-show-completion-use-special-display 'helm-show-completion-use-special-display)
-(make-obsolete-variable 'helm-c-show-completion-use-special-display 'helm-show-completion-use-special-display "1.5.1")
-(defvaralias 'helm-c-apt-query 'helm-apt-query)
-(make-obsolete-variable 'helm-c-apt-query 'helm-apt-query "1.5.1")
-(defvaralias 'helm-c-pdfgrep-default-read-command 'helm-pdfgrep-default-read-command)
-(make-obsolete-variable 'helm-c-pdfgrep-default-read-command 'helm-pdfgrep-default-read-command "1.5.1")
-(defvaralias 'helm-c-source-bookmark-images 'helm-source-bookmark-images)
-(make-obsolete-variable 'helm-c-source-bookmark-images 'helm-source-bookmark-images "1.5.1")
-(defvaralias 'helm-c-source-mac-spotlight 'helm-source-mac-spotlight)
-(make-obsolete-variable 'helm-c-source-mac-spotlight 'helm-source-mac-spotlight "1.5.1")
-(defvaralias 'helm-c-yahoo-suggest-url 'helm-yahoo-suggest-url)
-(make-obsolete-variable 'helm-c-yahoo-suggest-url 'helm-yahoo-suggest-url "1.5.1")
-(defvaralias 'helm-c-zgrep-recurse-flag 'helm-zgrep-recurse-flag)
-(make-obsolete-variable 'helm-c-zgrep-recurse-flag 'helm-zgrep-recurse-flag "1.5.1")
-(defvaralias 'helm-c-source-use-flags 'helm-source-use-flags)
-(make-obsolete-variable 'helm-c-source-use-flags 'helm-source-use-flags "1.5.1")
-(defvaralias 'helm-c-moccur-map 'helm-moccur-map)
-(make-obsolete-variable 'helm-c-moccur-map 'helm-moccur-map "1.5.1")
-(defvaralias 'helm-c-adaptative-history-file 'helm-adaptive-history-file)
-(make-obsolete-variable 'helm-c-adaptative-history-file 'helm-adaptive-history-file "1.5.1")
-(defvaralias 'helm-c-grep-default-directory-fn 'helm-grep-default-directory-fn)
-(make-obsolete-variable 'helm-c-grep-default-directory-fn 'helm-grep-default-directory-fn "1.5.1")
-(defvaralias 'helm-c-apt-input-history 'helm-apt-input-history)
-(make-obsolete-variable 'helm-c-apt-input-history 'helm-apt-input-history "1.5.1")
-
-
-(provide 'helm-aliases)
-
-;;; helm-aliases.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-apt.el b/emacs.d/elpa/helm-20150623.1310/helm-apt.el
deleted file mode 100644
index b667c5b..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-apt.el
+++ /dev/null
@@ -1,292 +0,0 @@
-;;; helm-apt.el --- Helm interface for Debian/Ubuntu packages (apt-*) -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-external)
-
-(declare-function term-line-mode "term")
-(declare-function term-char-mode "term")
-(declare-function term-send-input "term")
-(declare-function term-send-eof "term")
-
-
-(defgroup helm-apt nil
-  "Apt related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-apt-cache-show-function 'helm-apt-cache-show-1
-  "Function of one argument used to show apt package.
-Default is `helm-apt-cache-show-1' but you can use `apt-utils-show-package-1'
-from `apt-utils.el' to have something more enhanced.
-If nil default `helm-apt-cache-show-1' will be used."
-  :type 'function
-  :group 'helm-apt)
-
-(defface helm-apt-installed
-    '((t (:foreground "green")))
-  "Face used for apt installed candidates."
-  :group 'helm-apt)
-
-(defface helm-apt-deinstalled
-    '((t (:foreground "DimGray")))
-  "Face used for apt deinstalled candidates."
-  :group 'helm-apt)
-
-
-(defvar helm-apt-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?") 'helm-apt-help)
-    (define-key map (kbd "M-I")   'helm-apt-show-only-installed)
-    (define-key map (kbd "M-U")   'helm-apt-show-only-not-installed)
-    (define-key map (kbd "M-D")   'helm-apt-show-only-deinstalled)
-    (define-key map (kbd "M-A")   'helm-apt-show-all)
-    map))
-
-
-(defvar helm-source-apt
-  `((name . "APT")
-    (init . helm-apt-init)
-    (candidates-in-buffer)
-    (candidate-transformer . helm-apt-candidate-transformer)
-    (display-to-real . helm-apt-display-to-real)
-    (update . helm-apt-refresh)
-    (keymap . ,helm-apt-map)
-    (mode-line . helm-apt-mode-line)
-    (action
-     ("Show package description" . helm-apt-cache-show)
-     ("Install package" . helm-apt-install)
-     ("Reinstall package" . helm-apt-reinstall)
-     ("Remove package" . helm-apt-uninstall)
-     ("Purge package" . helm-apt-purge))
-    (persistent-action . helm-apt-persistent-action)
-    (persistent-help . "Show package description")))
-
-;;; Internals vars
-(defvar helm-apt-search-command "apt-cache search '%s'")
-(defvar helm-apt-show-command "apt-cache show '%s'")
-(defvar helm-apt-installed-packages nil)
-(defvar helm-apt-all-packages nil)
-(defvar helm-apt-input-history nil)
-(defvar helm-apt-show-only 'all)
-(defvar helm-apt-term-buffer nil)
-(defvar helm-apt-default-archs nil)
-
-(defun helm-apt-refresh ()
-  "Refresh installed candidates list."
-  (setq helm-apt-installed-packages nil)
-  (setq helm-apt-all-packages nil))
-
-(defun helm-apt-persistent-action (candidate)
-  "Persistent action for APT source."
-  (helm-apt-cache-show candidate))
-
-(defun helm-apt--installed-package-name (name)
-  (cl-loop for arch in helm-apt-default-archs
-           thereis (or (assoc-default
-                        name helm-apt-installed-packages)
-                       (assoc-default
-                        (format "%s:%s" name arch)
-                        helm-apt-installed-packages))))
-
-(defun helm-apt-candidate-transformer (candidates)
-  "Show installed CANDIDATES and the ones to deinstall in a different color."
-  (cl-loop for cand in candidates
-        for name = (helm-apt-display-to-real cand)
-        for deinstall = (string=
-                         (helm-apt--installed-package-name name)
-                         "deinstall")
-        for install = (string=
-                       (helm-apt--installed-package-name name)
-                       "install")
-        for show = (cond ((and deinstall
-                               (memq helm-apt-show-only '(all deinstalled)))
-                          (propertize cand 'face 'helm-apt-deinstalled))
-                         ((and install
-                               (memq helm-apt-show-only '(all installed)))
-                          (propertize cand 'face 'helm-apt-installed))
-                         ((and (eq helm-apt-show-only 'noinstalled)
-                               (not install)) cand)
-                         ((eq helm-apt-show-only 'all) cand))
-        when show collect show))
-
-(defun helm-apt-show-only-installed ()
-  (interactive)
-  (when helm-alive-p
-    (setq helm-apt-show-only 'installed)
-    (helm-update)))
-
-(defun helm-apt-show-only-not-installed ()
-  (interactive)
-  (when helm-alive-p
-    (setq helm-apt-show-only 'noinstalled)
-    (helm-update)))
-
-(defun helm-apt-show-only-deinstalled ()
-  (interactive)
-  (when helm-alive-p
-    (setq helm-apt-show-only 'deinstalled)
-    (helm-update)))
-
-(defun helm-apt-show-all ()
-  (interactive)
-  (when helm-alive-p
-    (setq helm-apt-show-only 'all)
-    (helm-update)))
-
-(defun helm-apt-init ()
-  "Initialize list of debian packages."
-  (let ((query ""))
-    (unless (and helm-apt-installed-packages
-                 helm-apt-all-packages)
-      (message "Loading package list...")
-      (setq helm-apt-installed-packages
-            (with-temp-buffer
-              (call-process-shell-command "dpkg --get-selections"
-                                          nil (current-buffer))
-              (cl-loop for i in (split-string (buffer-string) "\n" t)
-                    for p = (split-string i)
-                    collect (cons (car p) (cadr p)))))
-      (helm-init-candidates-in-buffer
-          'global
-        (setq helm-apt-all-packages
-              (with-temp-buffer
-                (call-process-shell-command
-                 (format helm-apt-search-command query)
-                 nil (current-buffer))
-                (buffer-string))))
-      (message "Loading package list done")
-      (sit-for 0.5))))
-
-(defun helm-apt-display-to-real (line)
-  "Return only name of a debian package.
-LINE is displayed like:
-package name - description."
-  (car (split-string line " - ")))
-
-(defvar helm-apt-show-current-package nil)
-(define-derived-mode helm-apt-show-mode
-    special-mode "helm-apt-show"
-    "Mode to display infos on apt packages.")
-
-(defun helm-apt-cache-show (package)
-  "Show information on apt package PACKAGE."
-  (if (and (functionp helm-apt-cache-show-function)
-           (not (eq helm-apt-cache-show-function
-                    'helm-apt-cache-show)))
-      ;; A function, call it.
-      (funcall helm-apt-cache-show-function package)
-    ;; nil or whatever use default.
-    (helm-apt-cache-show-1 package)))
-
-(defun helm-apt-cache-show-1 (package)
-  (let* ((command (format helm-apt-show-command package))
-         (buf     (get-buffer-create "*helm apt show*")))
-    (switch-to-buffer buf)
-    (unless (string= package helm-apt-show-current-package)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (save-excursion
-          (call-process-shell-command
-           command nil (current-buffer) t))))
-    (helm-apt-show-mode)
-    (set (make-local-variable 'helm-apt-show-current-package)
-         package)))
-
-(defun helm-apt-install (_package)
-  "Run 'apt-get install' shell command on PACKAGE."
-  (helm-apt-generic-action :action 'install))
-
-(defun helm-apt-reinstall (_package)
-  "Run 'apt-get install --reinstall' shell command on PACKAGE."
-  (helm-apt-generic-action :action 'reinstall))
-
-(defun helm-apt-uninstall (_package)
-  "Run 'apt-get remove' shell command on PACKAGE."
-  (helm-apt-generic-action :action 'uninstall))
-
-(defun helm-apt-purge (_package)
-  "Run 'apt-get purge' shell command on PACKAGE."
-  (helm-apt-generic-action :action 'purge))
-
-(cl-defun helm-apt-generic-action (&key action)
-  "Run 'apt-get ACTION'.
-Support install, remove and purge actions."
-  (if (and helm-apt-term-buffer
-           (buffer-live-p (get-buffer helm-apt-term-buffer)))
-      (switch-to-buffer helm-apt-term-buffer)
-    (ansi-term (getenv "SHELL") "term apt")
-    (setq helm-apt-term-buffer (buffer-name)))
-  (term-line-mode)
-  (let ((command   (cl-case action
-                     (install   "sudo apt-get install ")
-                     (reinstall "sudo apt-get install --reinstall ")
-                     (uninstall "sudo apt-get remove ")
-                     (purge     "sudo apt-get purge ")
-                     (t          (error "Unknown action"))))
-        (beg       (point))
-        end
-        (cand-list (mapconcat #'(lambda (x) (format "'%s'" x))
-                              (helm-marked-candidates) " ")))
-    (goto-char (point-max))
-    (insert (concat command cand-list))
-    (setq end (point))
-    (if (y-or-n-p (format "%s package(s)" (symbol-name action)))
-        (progn
-          (setq helm-external-commands-list nil)
-          (setq helm-apt-installed-packages nil)
-          (term-char-mode) (term-send-input))
-      (delete-region beg end))))
-
-;;;###autoload
-(defun helm-apt (arg)
-  "Preconfigured `helm' : frontend of APT package manager.
-With a prefix arg reload cache."
-  (interactive "P")
-  (setq helm-apt-show-only 'all)
-  (unless helm-apt-default-archs
-    (setq helm-apt-default-archs
-          (append (split-string
-                   (shell-command-to-string
-                    "dpkg --print-architecture")
-                   "\n" t)
-                  (split-string
-                   (shell-command-to-string
-                    "dpkg --print-foreign-architectures")
-                   "\n" t))))
-  (let ((query (read-string "Search Package: " nil 'helm-apt-input-history)))
-    (when arg (helm-apt-refresh))
-    (helm :sources 'helm-source-apt
-          :prompt "Search Package: "
-          :input query
-          :buffer "*helm apt*"
-          :history 'helm-apt-input-history)))
-
-
-(provide 'helm-apt)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-apt.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-autoloads.el b/emacs.d/elpa/helm-20150623.1310/helm-autoloads.el
deleted file mode 100644
index 1721d26..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-autoloads.el
+++ /dev/null
@@ -1,1241 +0,0 @@
-;;; helm-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "helm" "helm.el" (21898 47974 0 0))
-;;; Generated autoloads from helm.el
-
-(autoload 'helm-define-multi-key "helm" "\
-In KEYMAP, define key sequence KEY for function list FUNCTIONS.
-Each function run sequentially each time the key KEY is pressed.
-If DELAY is specified switch back to initial function of FUNCTIONS list
-after DELAY seconds.
-The functions in FUNCTIONS list are functions with no args.
-e.g
-  (defun foo ()
-    (message \"Run foo\"))
-  (defun bar ()
-    (message \"Run bar\"))
-  (defun baz ()
-    (message \"Run baz\"))
-
-\(helm-define-multi-key global-map \"<f5> q\" '(foo bar baz) 2)
-
-Each time \"<f5> q\" is pressed the next function is executed, if you wait
-More than 2 seconds, next hit will run again the first function and so on.
-
-\(fn KEYMAP KEY FUNCTIONS &optional DELAY)" nil nil)
-
-(autoload 'helm-multi-key-defun "helm" "\
-Define NAME as a multi-key command running FUNS.
-After DELAY seconds the FUNS list is reinitialised.
-See `helm-define-multi-key'.
-
-\(fn NAME DOCSTRING FUNS &optional DELAY)" nil t)
-
-(put 'helm-multi-key-defun 'lisp-indent-function '2)
-
-(autoload 'helm-define-key-with-subkeys "helm" "\
-Allow defining in MAP a KEY and SUBKEY to COMMAND.
-
-This allow typing KEY to call COMMAND the first time and
-type only SUBKEY on subsequent calls.
-
-Arg MAP is the keymap to use, SUBKEY is the initial short keybinding to
-call COMMAND.
-
-Arg OTHER-SUBKEYS is an alist specifying other short keybindings
-to use once started.
-e.g:
-
-\(helm-define-key-with-subkeys global-map
-   (kbd \"C-x v n\") ?n 'git-gutter:next-hunk '((?p . git-gutter:previous-hunk)))
-
-
-In this example, `C-x v n' will run `git-gutter:next-hunk'
-subsequent hits on \"n\" will run this command again
-and subsequent hits on \"p\" will run `git-gutter:previous-hunk'.
-
-Arg MENU is a string to display in minibuffer
-to describe SUBKEY and OTHER-SUBKEYS.
-Arg EXIT-FN specify a function to run on exit.
-
-Any other keys pressed run their assigned command defined in MAP
-and exit the loop running EXIT-FN if specified.
-
-NOTE: SUBKEY and OTHER-SUBKEYS bindings support
-only char syntax actually (e.g ?n)
-so don't use strings, vectors or whatever to define them.
-
-\(fn MAP KEY SUBKEY COMMAND &optional OTHER-SUBKEYS MENU EXIT-FN)" nil nil)
-
-(put 'helm-define-key-with-subkeys 'lisp-indent-function '1)
-
-(autoload 'helm-debug-open-last-log "helm" "\
-Open helm log file of last helm session.
-If `helm-last-log-file' is nil, switch to `helm-debug-buffer' .
-
-\(fn)" t nil)
-
-(autoload 'helm "helm" "\
-Main function to execute helm sources.
-
-Keywords supported:
-:sources :input :prompt :resume :preselect
-:buffer :keymap :default :history :allow-nest
-
-Extra LOCAL-VARS keywords are supported, see below.
-
-PLIST is a list like (:key1 val1 :key2 val2 ...) or
-\(&optional sources input prompt resume
-            preselect buffer keymap default history).
-
-Basic keywords are the following:
-
-:sources
-
-A list of sources used for this session.  It also accepts a
-symbol, interpreted as a variable of a helm source
-i.e (a symbol can be passed instead of a list of sources).
-It also accepts an alist representing a helm source, which is
-detected by (assq 'name ANY-SOURCES).
-NOTE: In this case the source is embedded in the helm command and
-have no symbol name, so it is not reachable from outside.
-It will be referenced in `helm-sources' as a whole alist.
-
-:input
-
-Temporary value of `helm-pattern', ie. initial input of minibuffer.
-
-:prompt
-
-Prompt other than \"pattern: \".
-
-:resume
-
-If t, Resurrect previously instance of `helm'.  Skip the initialization.
-If 'noresume, this instance of `helm' cannot be resumed.
-
-:preselect
-
-Initially selected candidate.  Specified by exact candidate or a regexp.
-
-:buffer
-
-`helm-buffer' instead of *helm*.
-
-:keymap
-
-`helm-map' for current `helm' session.
-
-:default
-
-A default argument that will be inserted in minibuffer with \\<minibuffer-local-map>\\[next-history-element].
-When nil or not present `thing-at-point' will be used instead.
-If `helm--maybe-use-default-as-input' is non--nil display will be
-updated using :default arg as input unless :input is specified,
-which in this case will take precedence on :default
-This is a string or a list, in this case the car of the list will
-be used as initial default input, but you will be able to cycle in this
-list with \\<minibuffer-local-map>\\[next-history-element].
-
-:history
-
-By default all minibuffer input is pushed to `minibuffer-history',
-if an argument HISTORY is provided, input will be pushed to HISTORY.
-History element should be a symbol.
-
-:allow-nest
-
-Allow running this helm command within a running helm session.
-
-Of course, conventional arguments are supported, the two are same.
-
-\(helm :sources sources :input input :prompt prompt :resume resume
-       :preselect preselect :buffer buffer :keymap keymap :default default
-       :history history)
-
-and
-
-\(helm sources input prompt resume preselect buffer keymap default history)
-
-are the same.
-
-However the use of non keyword args is deprecated and should not be used.
-
-Other keywords are interpreted as local variables of this helm session.
-The `helm-' prefix can be omitted.  For example,
-
-\(helm :sources 'helm-source-buffers-list
-       :buffer \"*buffers*\" :candidate-number-limit 10)
-
-means starting helm session with `helm-source-buffers'
-source in *buffers* buffer and set variable `helm-candidate-number-limit'
-to 10 as session local variable.
-
-\(fn &key SOURCES INPUT PROMPT RESUME PRESELECT BUFFER KEYMAP DEFAULT HISTORY ALLOW-NEST OTHER-LOCAL-VARS)" nil nil)
-
-(autoload 'helm-other-buffer "helm" "\
-Simplified interface of `helm' with other `helm-buffer'.
-Call `helm' with only ANY-SOURCES and ANY-BUFFER as args.
-
-\(fn ANY-SOURCES ANY-BUFFER)" nil nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-adaptive.el
-
-(defvar helm-adaptive-mode nil "\
-Non-nil if Helm-Adaptive mode is enabled.
-See the command `helm-adaptive-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 `helm-adaptive-mode'.")
-
-(custom-autoload 'helm-adaptive-mode "helm-adaptive" nil)
-
-(autoload 'helm-adaptive-mode "helm-adaptive" "\
-Toggle adaptive sorting in all sources.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'helm-reset-adaptive-history "helm-adaptive" "\
-Delete all `helm-adaptive-history' and his file.
-Useful when you have a old or corrupted `helm-adaptive-history-file'.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-apt" "helm-apt.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-apt.el
-
-(autoload 'helm-apt "helm-apt" "\
-Preconfigured `helm' : frontend of APT package manager.
-With a prefix arg reload cache.
-
-\(fn ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-bookmark.el
-
-(autoload 'helm-bookmarks "helm-bookmark" "\
-Preconfigured `helm' for bookmarks.
-
-\(fn)" t nil)
-
-(autoload 'helm-pp-bookmarks "helm-bookmark" "\
-Preconfigured `helm' for bookmarks (pretty-printed).
-
-\(fn)" t nil)
-
-(autoload 'helm-filtered-bookmarks "helm-bookmark" "\
-Preconfigured helm for bookmarks (filtered by category).
-Optional source `helm-source-bookmark-addressbook' is loaded
-only if external library addressbook-bookmark.el is available.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-buffers.el
-
-(autoload 'helm-buffers-list "helm-buffers" "\
-Preconfigured `helm' to list buffers.
-
-\(fn)" t nil)
-
-(autoload 'helm-mini "helm-buffers" "\
-Preconfigured `helm' lightweight version (buffer -> recentf).
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-color" "helm-color.el" (21898 47974 0
-;;;;;;  0))
-;;; Generated autoloads from helm-color.el
-
-(autoload 'helm-colors "helm-color" "\
-Preconfigured `helm' for color.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-command" "helm-command.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-command.el
-
-(autoload 'helm-M-x "helm-command" "\
-Preconfigured `helm' for Emacs commands.
-It is `helm' replacement of regular `M-x' `execute-extended-command'.
-
-Unlike regular `M-x' emacs vanilla `execute-extended-command' command,
-the prefix args if needed, are passed AFTER starting `helm-M-x'.
-
-You can get help on each command by persistent action.
-
-\(fn ARG &optional COMMAND-NAME)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-config" "helm-config.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-config.el
-
-(autoload 'helm-configuration "helm-config" "\
-Customize `helm'.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-dabbrev.el
-
-(autoload 'helm-dabbrev "helm-dabbrev" "\
-Preconfigured helm for dynamic abbreviations.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (21898 47974 0
-;;;;;;  0))
-;;; Generated autoloads from helm-elisp.el
-
-(autoload 'helm-lisp-completion-at-point "helm-elisp" "\
-Preconfigured helm for lisp symbol completion at point.
-
-\(fn)" t nil)
-
-(autoload 'helm-complete-file-name-at-point "helm-elisp" "\
-Preconfigured helm to complete file name at point.
-
-\(fn &optional FORCE)" t nil)
-
-(autoload 'helm-lisp-indent "helm-elisp" "\
-
-
-\(fn)" t nil)
-
-(autoload 'helm-lisp-completion-or-file-name-at-point "helm-elisp" "\
-Preconfigured helm to complete lisp symbol or filename at point.
-Filename completion happen if string start after or between a double quote.
-
-\(fn)" t nil)
-
-(autoload 'helm-apropos "helm-elisp" "\
-Preconfigured helm to describe commands, functions, variables and faces.
-
-\(fn)" t nil)
-
-(autoload 'helm-manage-advice "helm-elisp" "\
-Preconfigured `helm' to disable/enable function advices.
-
-\(fn)" t nil)
-
-(autoload 'helm-locate-library "helm-elisp" "\
-Preconfigured helm to locate elisp libraries.
-
-\(fn)" t nil)
-
-(autoload 'helm-timers "helm-elisp" "\
-Preconfigured `helm' for timers.
-
-\(fn)" t nil)
-
-(autoload 'helm-complex-command-history "helm-elisp" "\
-Preconfigured helm for complex command history.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el"
-;;;;;;  (21898 47974 0 0))
-;;; Generated autoloads from helm-elisp-package.el
-
-(autoload 'helm-list-elisp-packages "helm-elisp-package" "\
-Preconfigured helm for listing and handling emacs packages.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-list-elisp-packages-no-fetch "helm-elisp-package" "\
-Preconfigured helm for emacs packages.
-Same as `helm-list-elisp-packages' but don't fetch packages on remote.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-elscreen.el
-
-(autoload 'helm-elscreen "helm-elscreen" "\
-Preconfigured helm to list elscreen.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-eshell.el
-
-(autoload 'helm-esh-pcomplete "helm-eshell" "\
-Preconfigured helm to provide helm completion in eshell.
-
-\(fn)" t nil)
-
-(autoload 'helm-eshell-history "helm-eshell" "\
-Preconfigured helm for eshell history.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-eval" "helm-eval.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-eval.el
-
-(autoload 'helm-eval-expression "helm-eval" "\
-Preconfigured helm for `helm-source-evaluation-result'.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-eval-expression-with-eldoc "helm-eval" "\
-Preconfigured helm for `helm-source-evaluation-result' with `eldoc' support.
-
-\(fn)" t nil)
-
-(autoload 'helm-calcul-expression "helm-eval" "\
-Preconfigured helm for `helm-source-calculation-result'.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-external" "helm-external.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-external.el
-
-(autoload 'helm-run-external-command "helm-external" "\
-Preconfigured `helm' to run External PROGRAM asyncronously from Emacs.
-If program is already running exit with error.
-You can set your own list of commands with
-`helm-external-commands-list'.
-
-\(fn PROGRAM)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-files" "helm-files.el" (21898 47974 0
-;;;;;;  0))
-;;; Generated autoloads from helm-files.el
-
-(autoload 'helm-browse-project "helm-files" "\
-Preconfigured helm to browse projects.
-Browse files and see status of project with its vcs.
-Only HG and GIT are supported for now.
-Fall back to `helm-browse-project-find-files'
-if current directory is not under control of one of those vcs.
-With a prefix ARG browse files recursively, with two prefix ARG
-rebuild the cache.
-If the current directory is found in the cache, start
-`helm-browse-project-find-files' even with no prefix ARG.
-NOTE: The prefix ARG have no effect on the VCS controlled directories.
-
-Needed dependencies for VCS:
-<https://github.com/emacs-helm/helm-ls-git>
-and
-<https://github.com/emacs-helm/helm-ls-hg>
-and
-<http://melpa.org/#/helm-ls-svn>.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-find "helm-files" "\
-Preconfigured `helm' for the find shell command.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-find-files "helm-files" "\
-Preconfigured `helm' for helm implementation of `find-file'.
-Called with a prefix arg show history if some.
-Don't call it from programs, use `helm-find-files-1' instead.
-This is the starting point for nearly all actions you can do on files.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-for-files "helm-files" "\
-Preconfigured `helm' for opening files.
-Run all sources defined in `helm-for-files-preferred-list'.
-
-\(fn)" t nil)
-
-(autoload 'helm-multi-files "helm-files" "\
-Preconfigured helm similar to `helm-for-files' but that don't run locate.
-Allow toggling from locate to others sources.
-This allow seeing first if what you search is in other sources before launching
-locate.
-
-\(fn)" t nil)
-
-(autoload 'helm-recentf "helm-files" "\
-Preconfigured `helm' for `recentf'.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-font" "helm-font.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-font.el
-
-(autoload 'helm-select-xfont "helm-font" "\
-Preconfigured `helm' to select Xfont.
-
-\(fn)" t nil)
-
-(autoload 'helm-ucs "helm-font" "\
-Preconfigured helm for `ucs-names' math symbols.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-grep" "helm-grep.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-grep.el
-
-(autoload 'helm-goto-precedent-file "helm-grep" "\
-Go to precedent file in helm grep/etags buffers.
-
-\(fn)" t nil)
-
-(autoload 'helm-goto-next-file "helm-grep" "\
-Go to precedent file in helm grep/etags buffers.
-
-\(fn)" t nil)
-
-(autoload 'helm-grep-mode "helm-grep" "\
-Major mode to provide actions in helm grep saved buffer.
-
-Special commands:
-\\{helm-grep-mode-map}
-
-\(fn)" t nil)
-
-(autoload 'helm-do-grep "helm-grep" "\
-Preconfigured helm for grep.
-Contrarily to Emacs `grep', no default directory is given, but
-the full path of candidates in ONLY.
-That allow to grep different files not only in `default-directory' but anywhere
-by marking them (C-<SPACE>). If one or more directory is selected
-grep will search in all files of these directories.
-You can also use wildcard in the base name of candidate.
-If a prefix arg is given use the -r option of grep (recurse).
-The prefix arg can be passed before or after start file selection.
-See also `helm-do-grep-1'.
-
-\(fn)" t nil)
-
-(autoload 'helm-do-zgrep "helm-grep" "\
-Preconfigured helm for zgrep.
-
-\(fn)" t nil)
-
-(autoload 'helm-do-pdfgrep "helm-grep" "\
-Preconfigured helm for pdfgrep.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-help" "helm-help.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-help.el
-
-(autoload 'helm-documentation "helm-help" "\
-Preconfigured helm for helm documentation.
-With a prefix arg refresh the documentation.
-
-Find here the documentation of all sources actually documented.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-help "helm-help" "\
-Help of `helm'.
-
-\(fn)" t nil)
-
-(autoload 'helm-buffer-help "helm-help" "\
-Help command for helm buffers.
-
-\(fn)" t nil)
-
-(autoload 'helm-ff-help "helm-help" "\
-Help command for `helm-find-files'.
-
-\(fn)" t nil)
-
-(autoload 'helm-read-file-name-help "helm-help" "\
-Help command for `read-file-name'.
-
-\(fn)" t nil)
-
-(autoload 'helm-generic-file-help "helm-help" "\
-Global help for helm.
-
-\(fn)" t nil)
-
-(autoload 'helm-grep-help "helm-help" "\
-Help command for helm grep.
-
-\(fn)" t nil)
-
-(autoload 'helm-pdfgrep-help "helm-help" "\
-Help command for pdfgrep.
-
-\(fn)" t nil)
-
-(autoload 'helm-etags-help "helm-help" "\
-The help function for etags.
-
-\(fn)" t nil)
-
-(autoload 'helm-ucs-help "helm-help" "\
-Help command for `helm-ucs'.
-
-\(fn)" t nil)
-
-(autoload 'helm-bookmark-help "helm-help" "\
-Help command for bookmarks.
-
-\(fn)" t nil)
-
-(autoload 'helm-esh-help "helm-help" "\
-Help command for `helm-find-files-eshell-command-on-file'.
-
-\(fn)" t nil)
-
-(autoload 'helm-buffers-ido-virtual-help "helm-help" "\
-Help command for ido virtual buffers.
-
-\(fn)" t nil)
-
-(autoload 'helm-moccur-help "helm-help" "\
-Help command for (m)occur.
-
-\(fn)" t nil)
-
-(autoload 'helm-top-help "helm-help" "\
-Help command for top.
-
-\(fn)" t nil)
-
-(autoload 'helm-apt-help "helm-help" "\
-Help command for helm apt.
-
-\(fn)" t nil)
-
-(autoload 'helm-el-package-help "helm-help" "\
-Help command for emacs packages.
-
-\(fn)" t nil)
-
-(autoload 'helm-M-x-help "helm-help" "\
-Help command for `helm-M-x'.
-
-\(fn)" t nil)
-
-(autoload 'helm-imenu-help "helm-help" "\
-Help command for imenu.
-
-\(fn)" t nil)
-
-(autoload 'helm-color-help "helm-help" "\
-Help command for color.
-
-\(fn)" t nil)
-
-(autoload 'helm-semantic-help "helm-help" "\
-Help command for semantic.
-
-\(fn)" t nil)
-
-(autoload 'helm-kmacro-help "helm-help" "\
-Help command for kmacro.
-
-\(fn)" t nil)
-
-(defvar helm-buffer-mode-line-string '("Buffer(s)" "\\<helm-buffer-map>\\[helm-buffer-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct" "String displayed in mode-line in `helm-source-buffers-list'"))
-
-(defvar helm-color-mode-line-string '("Colors" "\\<helm-color-map>\\[helm-color-help]:Help/\\[helm-color-run-insert-name]:Insert name/\\[helm-color-run-insert-rgb]:Insert RGB/with shift: Kill"))
-
-(defvar helm-buffers-ido-virtual-mode-line-string '("Killed Buffer(s)" "\\<helm-buffers-ido-virtual-map>\\[helm-buffers-ido-virtual-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct" "String displayed in mode-line in `helm-source-buffers-list'"))
-
-(defvar helm-ff-mode-line-string "\\<helm-find-files-map>\\[helm-ff-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct" "\
-String displayed in mode-line in `helm-source-find-files'")
-
-(defvar helm-read-file-name-mode-line-string "\\<helm-read-file-map>\\[helm-read-file-name-help]:Help C/\\[helm-cr-empty-string]:Empty \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct" "\
-String displayed in mode-line in `helm-source-find-files'.")
-
-(defvar helm-generic-file-mode-line-string "\\<helm-generic-files-map>\\[helm-generic-file-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend" "\
-String displayed in mode-line in Locate.")
-
-(defvar helm-grep-mode-line-string "\\<helm-grep-map>\\[helm-grep-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend" "\
-String displayed in mode-line in `helm-do-grep'.")
-
-(defvar helm-pdfgrep-mode-line-string "\\<helm-pdfgrep-map>\\[helm-pdfgrep-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend" "\
-String displayed in mode-line in `helm-do-pdfgrep'.")
-
-(defvar helm-etags-mode-line-string "\\<helm-etags-map>\\[helm-etags-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct" "\
-String displayed in mode-line in `helm-etags-select'.")
-
-(defvar helm-ucs-mode-line-string "\\<helm-ucs-map>\\[helm-ucs-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct" "\
-String displayed in mode-line in `helm-ucs'.")
-
-(defvar helm-bookmark-mode-line-string '("Bookmark(s)" "\\<helm-bookmark-map>\\[helm-bookmark-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct") "\
-String displayed in mode-line in `helm-source-buffers-list'")
-
-(defvar helm-occur-mode-line "\\<helm-map>\\[helm-help]:Help \\<helm-occur-map>\\[helm-occur-run-query-replace-regexp]:Query replace regexp \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-moccur-mode-line "\\<helm-moccur-map>\\[helm-moccur-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-comp-read-mode-line "\\<helm-comp-read-map>C/\\[helm-cr-empty-string]:Empty \\<helm-map>\\[helm-help]:Help \\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct")
-
-(defvar helm-top-mode-line "\\<helm-top-map>\\[helm-top-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-apt-mode-line "\\<helm-apt-map>\\[helm-apt-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-el-package-mode-line "\\<helm-el-package-map>\\[helm-el-package-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-M-x-mode-line "\\<helm-M-x-map>\\[helm-M-x-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-imenu-mode-line "\\<helm-imenu-map>\\[helm-imenu-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(defvar helm-semantic-mode-line "\\<helm-semantic-map>\\[helm-semantic-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
-
-(autoload 'helm-describe-helm-attribute "helm-help" "\
-Display the full documentation of HELM-ATTRIBUTE.
-HELM-ATTRIBUTE should be a symbol.
-
-\(fn HELM-ATTRIBUTE)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-id-utils.el
-
-(autoload 'helm-gid "helm-id-utils" "\
-Preconfigured helm for `gid' command line of `ID-Utils'.
-Need A database created with the command `mkid'
-above `default-directory'.
-Need id-utils as dependency which provide `mkid', `gid' etc...
-See <https://www.gnu.org/software/idutils/>.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (21898 47974 0
-;;;;;;  0))
-;;; Generated autoloads from helm-imenu.el
-
-(autoload 'helm-imenu "helm-imenu" "\
-Preconfigured `helm' for `imenu'.
-
-\(fn)" t nil)
-
-(autoload 'helm-imenu-in-all-buffers "helm-imenu" "\
-Preconfigured helm for fetching imenu entries of all buffers.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-info" "helm-info.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-info.el
-
-(autoload 'helm-info-at-point "helm-info" "\
-Preconfigured `helm' for searching info at point.
-With a prefix-arg insert symbol at point.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-locate" "helm-locate.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-locate.el
-
-(autoload 'helm-locate-read-file-name "helm-locate" "\
-
-
-\(fn PROMPT)" nil nil)
-
-(autoload 'helm-locate "helm-locate" "\
-Preconfigured `helm' for Locate.
-Note: you can add locate options after entering pattern.
-See 'man locate' for valid options and also `helm-locate-command'.
-
-You can specify a local database with prefix argument ARG.
-With two prefix arg, refresh the current local db or create it
-if it doesn't exists.
-Many databases can be used: navigate and mark them.
-See also `helm-locate-with-db'.
-
-To create a user specific db, use
-\"updatedb -l 0 -o db_path -U directory\".
-Where db_path is a filename matched by
-`helm-locate-db-file-regexp'.
-
-\(fn ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-man" "helm-man.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-man.el
-
-(autoload 'helm-man-woman "helm-man" "\
-Preconfigured `helm' for Man and Woman pages.
-With a prefix arg reinitialize the cache.
-
-\(fn ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-misc" "helm-misc.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-misc.el
-
-(autoload 'helm-browse-menubar "helm-misc" "\
-Preconfigured helm to the menubar using lacarte.el.
-
-\(fn)" t nil)
-
-(autoload 'helm-world-time "helm-misc" "\
-Preconfigured `helm' to show world time.
-
-\(fn)" t nil)
-
-(autoload 'helm-insert-latex-math "helm-misc" "\
-Preconfigured helm for latex math symbols completion.
-
-\(fn)" t nil)
-
-(autoload 'helm-ratpoison-commands "helm-misc" "\
-Preconfigured `helm' to execute ratpoison commands.
-
-\(fn)" t nil)
-
-(autoload 'helm-stumpwm-commands "helm-misc" "\
-Preconfigured helm for stumpwm commands.
-
-\(fn)" t nil)
-
-(autoload 'helm-minibuffer-history "helm-misc" "\
-Preconfigured `helm' for `minibuffer-history'.
-
-\(fn)" t nil)
-
-(autoload 'helm-comint-input-ring "helm-misc" "\
-Preconfigured `helm' that provide completion of `comint' history.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-mode" "helm-mode.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-mode.el
-
-(autoload 'helm-comp-read "helm-mode" "\
-Read a string in the minibuffer, with helm completion.
-
-It is helm `completing-read' equivalent.
-
-- PROMPT is the prompt name to use.
-
-- COLLECTION can be a list, vector, obarray or hash-table.
-  It can be also a function that receives three arguments:
-  the values string, predicate and t. See `all-completions' for more details.
-
-Keys description:
-
-- TEST: A predicate called with one arg i.e candidate.
-
-- INITIAL-INPUT: Same as input arg in `helm'.
-
-- PRESELECT: See preselect arg of `helm'.
-
-- DEFAULT: This option is used only for compatibility with regular
-  Emacs `completing-read' (Same as DEFAULT arg of `completing-read').
-
-- BUFFER: Name of helm-buffer.
-
-- MUST-MATCH: Candidate selected must be one of COLLECTION.
-
-- REVERSE-HISTORY: When non--nil display history source after current
-  source completion.
-
-- REQUIRES-PATTERN: Same as helm attribute, default is 0.
-
-- HISTORY: A list containing specific history, default is nil.
-  When it is non--nil, all elements of HISTORY are displayed in
-  a special source before COLLECTION.
-
-- INPUT-HISTORY: A symbol. the minibuffer input history will be
-  stored there, if nil or not provided, `minibuffer-history'
-  will be used instead.
-
-- CASE-FOLD: Same as `helm-case-fold-search'.
-
-- DEL-INPUT: Boolean, when non--nil (default) remove the partial
-  minibuffer input from HISTORY is present.
-
-- PERSISTENT-ACTION: A function called with one arg i.e candidate.
-
-- PERSISTENT-HELP: A string to document PERSISTENT-ACTION.
-
-- MODE-LINE: A string or list to display in mode line.
-  Default is `helm-comp-read-mode-line'.
-
-- KEYMAP: A keymap to use in this `helm-comp-read'.
-  (the keymap will be shared with history source)
-
-- NAME: The name related to this local source.
-
-- EXEC-WHEN-ONLY-ONE: Bound `helm-execute-action-at-once-if-one'
-  to non--nil. (possibles values are t or nil).
-
-- VOLATILE: Use volatile attribute (enabled by default).
-
-- SORT: A predicate to give to `sort' e.g `string-lessp'.
-
-- FC-TRANSFORMER: A `filtered-candidate-transformer' function.
-
-- HIST-FC-TRANSFORMER: A `filtered-candidate-transformer'
-  function for the history source.
-
-- MARKED-CANDIDATES: If non--nil return candidate or marked candidates as a list.
-
-- NOMARK: When non--nil don't allow marking candidates.
-
-- ALISTP: (default is non--nil) See `helm-comp-read-get-candidates'.
-
-- CANDIDATES-IN-BUFFER: when non--nil use a source build with
-  `helm-candidates-in-buffer' which is much faster.
-  Argument VOLATILE have no effect when CANDIDATES-IN-BUFFER is non--nil.
-
-Any prefix args passed during `helm-comp-read' invocation will be recorded
-in `helm-current-prefix-arg', otherwise if prefix args were given before
-`helm-comp-read' invocation, the value of `current-prefix-arg' will be used.
-That's mean you can pass prefix args before or after calling a command
-that use `helm-comp-read' See `helm-M-x' for example.
-
-\(fn PROMPT COLLECTION &key TEST INITIAL-INPUT DEFAULT PRESELECT (buffer \"*Helm Completions*\") MUST-MATCH FUZZY REVERSE-HISTORY (requires-pattern 0) HISTORY INPUT-HISTORY (case-fold helm-comp-read-case-fold-search) (del-input t) (persistent-action nil) (persistent-help \"DoNothing\") (mode-line helm-comp-read-mode-line) (keymap helm-comp-read-map) (name \"Helm Completions\") CANDIDATES-IN-BUFFER EXEC-WHEN-ONLY-ONE QUIT-WHEN-NO-CAND (volatile t) SORT (fc-transformer (quote helm-cr-default-transformer)) HIST-FC-TRANSFORMER MARKED-CANDIDATES NOMARK (alistp t))" nil nil)
-
-(defvar helm-mode nil "\
-Non-nil if Helm mode is enabled.
-See the command `helm-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 `helm-mode'.")
-
-(custom-autoload 'helm-mode "helm-mode" nil)
-
-(autoload 'helm-mode "helm-mode" "\
-Toggle generic helm completion.
-
-All functions in Emacs that use `completing-read'
-or `read-file-name' and friends will use helm interface
-when this mode is turned on.
-However you can modify this behavior for functions of your choice
-with `helm-completing-read-handlers-alist'.
-
-Called with a positive arg, turn on unconditionally, with a
-negative arg turn off.
-You can turn it on with `helm-mode'.
-
-Some crap emacs functions may not be supported,
-e.g `ffap-alternate-file' and maybe others
-You can add such functions to `helm-completing-read-handlers-alist'
-with a nil value.
-
-Note: This mode is incompatible with Emacs23.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-net" "helm-net.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-net.el
-
-(autoload 'helm-surfraw "helm-net" "\
-Preconfigured `helm' to search PATTERN with search ENGINE.
-
-\(fn PATTERN ENGINE)" t nil)
-
-(autoload 'helm-google-suggest "helm-net" "\
-Preconfigured `helm' for google search with google suggest.
-
-\(fn)" t nil)
-
-(autoload 'helm-yahoo-suggest "helm-net" "\
-Preconfigured `helm' for Yahoo searching with Yahoo suggest.
-
-\(fn)" t nil)
-
-(autoload 'helm-wikipedia-suggest "helm-net" "\
-Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-org" "helm-org.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-org.el
-
-(autoload 'helm-org-agenda-files-headings "helm-org" "\
-Preconfigured helm for org files headings.
-
-\(fn)" t nil)
-
-(autoload 'helm-org-in-buffer-headings "helm-org" "\
-Preconfigured helm for org buffer headings.
-
-\(fn)" t nil)
-
-(autoload 'helm-org-capture-templates "helm-org" "\
-Preconfigured helm for org templates.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-regexp.el
-
-(autoload 'helm-moccur-mode "helm-regexp" "\
-Major mode to provide actions in helm moccur saved buffer.
-
-Special commands:
-\\{helm-moccur-mode-map}
-
-\(fn)" t nil)
-
-(autoload 'helm-regexp "helm-regexp" "\
-Preconfigured helm to build regexps.
-`query-replace-regexp' can be run from there against found regexp.
-
-\(fn)" t nil)
-
-(autoload 'helm-occur "helm-regexp" "\
-Preconfigured helm for Occur.
-
-\(fn)" t nil)
-
-(autoload 'helm-occur-from-isearch "helm-regexp" "\
-Invoke `helm-occur' from isearch.
-
-\(fn)" t nil)
-
-(autoload 'helm-multi-occur "helm-regexp" "\
-Preconfigured helm for multi occur.
-
-  BUFFERS is a list of buffers to search through.
-With a prefix arg, reverse the behavior of
-`helm-moccur-always-search-in-current'.
-The prefix arg can be set before calling `helm-multi-occur'
-or during the buffer selection.
-
-\(fn BUFFERS)" t nil)
-
-(autoload 'helm-multi-occur-from-isearch "helm-regexp" "\
-Invoke `helm-multi-occur' from isearch.
-
-With a prefix arg, reverse the behavior of
-`helm-moccur-always-search-in-current'.
-The prefix arg can be set before calling
-`helm-multi-occur-from-isearch' or during the buffer selection.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-ring" "helm-ring.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-ring.el
-
-(defvar helm-push-mark-mode nil "\
-Non-nil if Helm-Push-Mark mode is enabled.
-See the command `helm-push-mark-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 `helm-push-mark-mode'.")
-
-(custom-autoload 'helm-push-mark-mode "helm-ring" nil)
-
-(autoload 'helm-push-mark-mode "helm-ring" "\
-Provide an improved version of `push-mark'.
-Modify the behavior of `push-mark' to update
-the `global-mark-ring' after each new visit.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'helm-mark-ring "helm-ring" "\
-Preconfigured `helm' for `helm-source-mark-ring'.
-
-\(fn)" t nil)
-
-(autoload 'helm-global-mark-ring "helm-ring" "\
-Preconfigured `helm' for `helm-source-global-mark-ring'.
-
-\(fn)" t nil)
-
-(autoload 'helm-all-mark-rings "helm-ring" "\
-Preconfigured `helm' for `helm-source-global-mark-ring' and `helm-source-mark-ring'.
-
-\(fn)" t nil)
-
-(autoload 'helm-register "helm-ring" "\
-Preconfigured `helm' for Emacs registers.
-
-\(fn)" t nil)
-
-(autoload 'helm-show-kill-ring "helm-ring" "\
-Preconfigured `helm' for `kill-ring'.
-It is drop-in replacement of `yank-pop'.
-
-First call open the kill-ring browser, next calls move to next line.
-
-\(fn)" t nil)
-
-(autoload 'helm-execute-kmacro "helm-ring" "\
-Preconfigured helm for keyboard macros.
-Define your macros with `f3' and `f4'.
-See (info \"(emacs) Keyboard Macros\") for detailed infos.
-This command is useful when used with persistent action.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (21898 47974
-;;;;;;  0 0))
-;;; Generated autoloads from helm-semantic.el
-
-(autoload 'helm-semantic "helm-semantic" "\
-Preconfigured `helm' for `semantic'.
-If ARG is supplied, pre-select symbol at point instead of current
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-semantic-or-imenu "helm-semantic" "\
-Preconfigured helm for `semantic' or `imenu'.
-If ARG is supplied, pre-select symbol at point instead of current
-semantic tag in scope.
-
-If `semantic-mode' is active in the current buffer, then use
-semantic for generating tags, otherwise fall back to `imenu'.
-Fill in the symbol at point by default.
-
-\(fn ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-sys" "helm-sys.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-sys.el
-
-(autoload 'helm-top "helm-sys" "\
-Preconfigured `helm' for top command.
-
-\(fn)" t nil)
-
-(autoload 'helm-list-emacs-process "helm-sys" "\
-Preconfigured `helm' for emacs process.
-
-\(fn)" t nil)
-
-(autoload 'helm-xrandr-set "helm-sys" "\
-Preconfigured helm for xrandr.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-tags" "helm-tags.el" (21898 47974 0 0))
-;;; Generated autoloads from helm-tags.el
-
-(autoload 'helm-etags-select "helm-tags" "\
-Preconfigured helm for etags.
-If called with a prefix argument or if any of the tag files have
-been modified, reinitialize cache.
-
-This function aggregates three sources of tag files:
-
-  1) An automatically located file in the parent directories, by `helm-etags-get-tag-file'.
-  2) `tags-file-name', which is commonly set by `find-tag' command.
-  3) `tags-table-list' which is commonly set by `visit-tags-table' command.
-
-\(fn ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "helm-utils" "helm-utils.el" (21898 47974 0
-;;;;;;  0))
-;;; Generated autoloads from helm-utils.el
-
-(autoload 'helm-show-all-in-this-source-only "helm-utils" "\
-Show only current source of this helm session with all its candidates.
-With a numeric prefix arg show only the ARG number of candidates.
-
-\(fn ARG)" t nil)
-
-(autoload 'helm-display-all-sources "helm-utils" "\
-Display all sources previously hidden by `helm-set-source-filter'.
-
-\(fn)" t nil)
-
-(autoload 'helm-quit-and-find-file "helm-utils" "\
-Drop into `helm-find-files' from `helm'.
-If current selection is a buffer or a file, `helm-find-files'
-from its directory.
-
-\(fn)" t nil)
-
-(autoload 'helm-w32-shell-execute-open-file "helm-utils" "\
-
-
-\(fn FILE)" t nil)
-
-(autoload 'helm-yank-text-at-point "helm-utils" "\
-Yank text at point in `helm-current-buffer' into minibuffer.
-If `helm-yank-symbol-first' is non--nil the first yank
-grabs the entire symbol.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("helm-aliases.el" "helm-easymenu.el" "helm-match-plugin.el"
-;;;;;;  "helm-pkg.el" "helm-plugin.el" "helm-source.el") (21898 47974
-;;;;;;  974094 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; helm-autoloads.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-bookmark.el b/emacs.d/elpa/helm-20150623.1310/helm-bookmark.el
deleted file mode 100644
index 5b5efe2..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-bookmark.el
+++ /dev/null
@@ -1,793 +0,0 @@
-;;; helm-bookmark.el --- Helm for Emacs regular Bookmarks. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'bookmark)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-info)
-(require 'helm-adaptive)
-(require 'helm-net)
-
-(declare-function addressbook-bookmark-edit "ext:addressbook-bookmark.el" (bookmark))
-(declare-function message-buffers "message.el")
-(declare-function addressbook-set-mail-buffer-1 "ext:addressbook-bookmark.el"
-                  (&optional bookmark-name append cc))
-
-
-(defgroup helm-bookmark nil
-  "Predefined configurations for `helm.el'."
-  :group 'helm)
-
-(defcustom helm-bookmark-show-location nil
-  "Show location of bookmark on display."
-  :group 'helm-bookmark
-  :type 'boolean)
-
-(defcustom helm-bookmark-default-filtered-sources
-  (append '(helm-source-bookmark-files&dirs
-            helm-source-bookmark-helm-find-files
-            helm-source-bookmark-info
-            helm-source-bookmark-gnus
-            helm-source-bookmark-man
-            helm-source-bookmark-images
-            helm-source-bookmark-w3m)
-          (and (locate-library "addressbook-bookmark")
-               (list 'helm-source-bookmark-addressbook))
-          (list 'helm-source-bookmark-uncategorized
-                'helm-source-bookmark-set))
-  "List of sources to use in `helm-filtered-bookmarks'."
-  :group 'helm-bookmark
-  :type '(repeat (choice symbol)))
-
-
-(defface helm-bookmark-info
-    '((t (:foreground "green")))
-  "Face used for W3m Emacs bookmarks (not w3m bookmarks)."
-  :group 'helm-bookmark)
-
-(defface helm-bookmark-w3m
-    '((t (:foreground "yellow")))
-  "Face used for W3m Emacs bookmarks (not w3m bookmarks)."
-  :group 'helm-bookmark)
-
-(defface helm-bookmark-gnus
-    '((t (:foreground "magenta")))
-  "Face used for Gnus bookmarks."
-  :group 'helm-bookmark)
-
-(defface helm-bookmark-man
-    '((t (:foreground "Orange4")))
-  "Face used for Woman/man bookmarks."
-  :group 'helm-bookmark)
-
-(defface helm-bookmark-file
-    '((t (:foreground "Deepskyblue2")))
-  "Face used for file bookmarks."
-  :group 'helm-bookmark)
-
-(defface helm-bookmark-directory
-    '((t (:inherit helm-ff-directory)))
-  "Face used for file bookmarks."
-  :group 'helm-bookmark)
-
-(defface helm-bookmark-addressbook
-    '((t (:foreground "tomato")))
-  "Face used for addressbook bookmarks."
-  :group 'helm-bookmark)
-
-
-(defvar helm-bookmark-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c o") 'helm-bookmark-run-jump-other-window)
-    (define-key map (kbd "C-d")   'helm-bookmark-run-delete)
-    (define-key map (kbd "C-]")   'helm-bookmark-toggle-filename)
-    (define-key map (kbd "M-e")   'helm-bookmark-run-edit)
-    (define-key map (kbd "C-c ?") 'helm-bookmark-help)
-    map)
-  "Generic Keymap for emacs bookmark sources.")
-
-(defclass helm-source-basic-bookmarks (helm-source-in-buffer helm-type-bookmark)
-   ((init :initform (lambda ()
-                      (bookmark-maybe-load-default-file)
-                      (helm-init-candidates-in-buffer
-                          'global
-                        (bookmark-all-names))))
-    (filtered-candidate-transformer :initform 'helm-bookmark-transformer)
-    (search :initform 'helm-bookmark-search-fn)))
-
-(defvar helm-source-bookmarks
-  (helm-make-source "Bookmarks" 'helm-source-basic-bookmarks)
-  "See (info \"(emacs)Bookmarks\").")
-
-(defun helm-bookmark-transformer (candidates _source)
-  (cl-loop for i in candidates
-        for loc = (bookmark-location i)
-        for len =  (string-width i)
-        for trunc = (if (> len bookmark-bmenu-file-column)
-                        (helm-substring i bookmark-bmenu-file-column)
-                      i)
-        for sep = (make-string (- (+ bookmark-bmenu-file-column 2)
-                                  (length trunc))
-                               ? )
-        if helm-bookmark-show-location
-        collect (cons (concat trunc sep (if (listp loc) (car loc) loc)) i)
-        else collect i))
-
-(defun helm-bookmark-match-fn (candidate)
-  "Match function for bookmark sources using `candidates'."
-  (if helm-bookmark-show-location
-      ;; match only location, match-plugin will match also name.
-      (string-match helm-pattern (bookmark-location candidate))
-    (string-match helm-pattern candidate)))
-
-(defun helm-bookmark-toggle-filename-1 (_candidate)
-  (let* ((real (helm-get-selection helm-buffer))
-         (trunc (if (> (string-width real) bookmark-bmenu-file-column)
-                    (helm-substring real bookmark-bmenu-file-column)
-                    real))
-         (loc (bookmark-location real)))
-    (setq helm-bookmark-show-location (not helm-bookmark-show-location))
-    (helm-force-update (if helm-bookmark-show-location
-                           (concat (regexp-quote trunc)
-                                   " +"
-                                   (regexp-quote
-                                    (if (listp loc) (car loc) loc)))
-                           real))))
-
-(defun helm-bookmark-toggle-filename ()
-  "Toggle bookmark location visibility."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'toggle-filename
-                  '(helm-bookmark-toggle-filename-1 . never-split))
-    (helm-execute-persistent-action 'toggle-filename)))
-
-(defun helm-bookmark-jump (candidate)
-  "Jump to bookmark from keyboard."
-  (let ((current-prefix-arg helm-current-prefix-arg)
-        non-essential)
-    (bookmark-jump candidate)))
-
-(defun helm-bookmark-jump-other-window (candidate)
-  (let (non-essential)
-    (bookmark-jump-other-window candidate)))
-
-
-;;; bookmark-set
-;;
-(defvar helm-source-bookmark-set
-  '((name . "Set Bookmark")
-    (dummy)
-    (action . bookmark-set))
-  "See (info \"(emacs)Bookmarks\").")
-
-
-;;; Colorize bookmarks by category
-;;
-(defvar helm-source-pp-bookmarks
-  '((name . "PP-Bookmarks")
-    (init . (lambda ()
-              (bookmark-maybe-load-default-file)
-              (helm-init-candidates-in-buffer
-                  'global (cl-loop for b in (bookmark-all-names) collect
-                                (propertize b 'location (bookmark-location b))))))
-    (candidates-in-buffer)
-    (search helm-bookmark-search-fn)
-    (match-part . helm-pp-bookmark-match-fn)
-    (filtered-candidate-transformer
-     helm-adaptive-sort
-     helm-highlight-bookmark)
-    (type . bookmark))
-  "See (info \"(emacs)Bookmarks\").")
-
-(defun helm-bookmark-search-fn (pattern)
-  "Search function for bookmark sources using `candidates-in-buffer'.
-Should be used with `helm-pp-bookmark-match-fn' as `match-part' function."
-  (if helm-bookmark-show-location
-      (helm-aif (next-single-property-change (point) 'location)
-          (goto-char it))
-    (re-search-forward pattern nil t)))
-
-(defun helm-pp-bookmark-match-fn (candidate)
-  "Search function for bookmark sources using `candidates-in-buffer'.
-Should be used with `helm-bookmark-search-fn' as `search' function."
-  (helm-aif (and helm-bookmark-show-location
-                 (bookmark-location candidate))
-      ;; Match against bookmark-name and location.
-      (concat candidate " " it)
-    ;; Match against bookmark-name.
-    candidate))
-
-
-;;; Predicates
-;;
-(defconst helm-bookmark--non-file-filename "   - no file -"
-  "Name to use for `filename' entry, for non-file bookmarks.")
-
-(defun helm-bookmark-gnus-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK is a Gnus bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-gnus)
-      (eq (bookmark-get-handler bookmark) 'gnus-summary-bookmark-jump)
-      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-gnus)))
-
-(defun helm-bookmark-w3m-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK is a W3m bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-w3m)
-      (eq (bookmark-get-handler bookmark) 'bookmark-w3m-bookmark-jump)
-      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-w3m)))
-
-(defun helm-bookmark-woman-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK is a Woman bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-woman)
-      (eq (bookmark-get-handler bookmark) 'woman-bookmark-jump)
-      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-woman)))
-
-(defun helm-bookmark-man-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK is a Man bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-man)
-      (eq (bookmark-get-handler bookmark) 'Man-bookmark-jump)
-      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-man)))
-
-(defun helm-bookmark-woman-man-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK is a Man or Woman bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (or (helm-bookmark-man-bookmark-p bookmark)
-      (helm-bookmark-woman-bookmark-p bookmark)))
-
-(defun helm-bookmark-info-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK is an Info bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (eq (bookmark-get-handler bookmark) 'Info-bookmark-jump))
-
-(defun helm-bookmark-image-bookmark-p (bookmark)
-  "Return non-nil if BOOKMARK bookmarks an image file."
-  (if (stringp bookmark)
-      (assoc 'image-type (assoc bookmark bookmark-alist))
-    (assoc 'image-type bookmark)))
-
-(defun helm-bookmark-file-p (bookmark)
-  "Return non-nil if BOOKMARK bookmarks a file or directory.
-BOOKMARK is a bookmark name or a bookmark record.
-This excludes bookmarks of a more specific kind (Info, Gnus, and W3m)."
-  (let* ((filename   (bookmark-get-filename bookmark))
-         (isnonfile  (equal filename helm-bookmark--non-file-filename))) 
-    (and filename (not isnonfile) (not (bookmark-get-handler bookmark)))))
-
-(defun helm-bookmark-helm-find-files-p (bookmark)
-  "Return non-nil if BOOKMARK bookmarks a `helm-find-files' session.
-BOOKMARK is a bookmark name or a bookmark record."
-  (eq (bookmark-get-handler bookmark) 'helm-ff-bookmark-jump))
-
-(defun helm-bookmark-addressbook-p (bookmark)
-  "Return non--nil if BOOKMARK is a contact recorded with addressbook-bookmark.
-BOOKMARK is a bookmark name or a bookmark record."
-  (if (listp bookmark)
-      (string= (assoc-default 'type bookmark) "addressbook")
-    (string= (assoc-default
-              'type (assoc bookmark bookmark-alist)) "addressbook")))
-
-(defun helm-bookmark-uncategorized-bookmark-p (bookmark)
-  "Return non--nil if BOOKMARK match no known category."
-  (cl-loop for pred in '(helm-bookmark-addressbook-p
-                         helm-bookmark-gnus-bookmark-p
-                         helm-bookmark-w3m-bookmark-p
-                         helm-bookmark-woman-man-bookmark-p
-                         helm-bookmark-info-bookmark-p
-                         helm-bookmark-image-bookmark-p
-                         helm-bookmark-file-p
-                         helm-bookmark-helm-find-files-p
-                         helm-bookmark-addressbook-p)
-           never (funcall pred bookmark)))
-
-(defun helm-bookmark-filter-setup-alist (fn)
-  "Return a filtered `bookmark-alist' sorted alphabetically."
-  (cl-loop with alist = (cl-loop for b in bookmark-alist
-                              when (funcall fn b) collect b)
-        for bmk in alist
-        for name = (car bmk)
-        collect (propertize name 'location (bookmark-location name))))
-
-
-;;; Bookmark handlers
-;;
-(defvar w3m-async-exec)
-(defun helm-bookmark-jump-w3m (bookmark)
-  "Jump to W3m bookmark BOOKMARK, setting a new tab.
-If `browse-url-browser-function' is set to something else
-than `w3m-browse-url' use it."
-  (require 'helm-net)
-  (let ((file  (or (bookmark-prop-get bookmark 'filename)
-                   (bookmark-prop-get bookmark 'url)))
-        (buf   (generate-new-buffer-name "*w3m*"))
-        (w3m-async-exec nil)
-        (really-use-w3m (equal browse-url-browser-function 'w3m-browse-url)))
-    (helm-browse-url file really-use-w3m)
-    (when really-use-w3m
-      (bookmark-default-handler
-       `("" (buffer . ,buf) . ,(bookmark-get-bookmark-record bookmark))))))
-
-;; All bookmarks recorded with the handler provided with w3m
-;; (`bookmark-w3m-bookmark-jump') will use our handler which open
-;; the bookmark in a new tab or in an external browser depending
-;; on `browse-url-browser-function'.
-(defalias 'bookmark-w3m-bookmark-jump 'helm-bookmark-jump-w3m)
-
-;; Provide compatibility with old handlers provided in external
-;; packages bookmark-extensions.el and bookmark+.
-(defalias 'bmkext-jump-woman 'woman-bookmark-jump)
-(defalias 'bmkext-jump-man 'Man-bookmark-jump)
-(defalias 'bmkext-jump-w3m 'helm-bookmark-jump-w3m)
-(defalias 'bmkext-jump-gnus 'gnus-summary-bookmark-jump)
-(defalias 'bookmarkp-jump-gnus 'gnus-summary-bookmark-jump)
-(defalias 'bookmarkp-jump-w3m 'helm-bookmark-jump-w3m)
-(defalias 'bookmarkp-jump-woman 'woman-bookmark-jump)
-(defalias 'bookmarkp-jump-man 'Man-bookmark-jump)
-
-
-;;;; Filtered bookmark sources
-;;
-;;
-(defclass helm-source-filtered-bookmarks (helm-source-in-buffer helm-type-bookmark)
-  ((search :initform #'helm-bookmark-search-fn)
-   (match-part :initform #'helm-pp-bookmark-match-fn)
-   (filtered-candidate-transformer
-    :initform '(helm-adaptive-sort
-                helm-highlight-bookmark))))
-
-;;; W3m bookmarks.
-;;
-(defun helm-bookmark-w3m-setup-alist ()
-  "Specialized filter function for bookmarks w3m."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-w3m-bookmark-p))
-
-(defvar helm-source-bookmark-w3m
-  (helm-make-source "Bookmark W3m" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-w3m-setup-alist)))))
-
-;;; Images
-;;
-(defun helm-bookmark-images-setup-alist ()
-  "Specialized filter function for images bookmarks."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-image-bookmark-p))
-
-(defvar helm-source-bookmark-images
-  (helm-make-source "Bookmark Images" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-images-setup-alist)))))
-
-;;; Woman Man
-;;
-(defun helm-bookmark-man-setup-alist ()
-  "Specialized filter function for bookmarks w3m."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-woman-man-bookmark-p))
-
-(defvar helm-source-bookmark-man
-  (helm-make-source "Bookmark Woman&Man" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-man-setup-alist)))))
-
-;;; Gnus
-;;
-(defun helm-bookmark-gnus-setup-alist ()
-  "Specialized filter function for bookmarks gnus."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-gnus-bookmark-p))
-
-(defvar helm-source-bookmark-gnus
-  (helm-make-source "Bookmark Gnus" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-gnus-setup-alist)))))
-
-;;; Info
-;;
-(defun helm-bookmark-info-setup-alist ()
-  "Specialized filter function for bookmarks info."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-info-bookmark-p))
-
-(defvar helm-source-bookmark-info
-  (helm-make-source "Bookmark Info" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-info-setup-alist)))))
-
-;;; Files and directories
-;;
-(defun helm-bookmark-local-files-setup-alist ()
-  "Specialized filter function for bookmarks locals files."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-file-p))
-
-(defvar helm-source-bookmark-files&dirs
-  (helm-make-source "Bookmark Files&Directories" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-local-files-setup-alist)))))
-
-;;; Helm find files sessions.
-;;
-(defun helm-bookmark-helm-find-files-setup-alist ()
-  "Specialized filter function for `helm-find-files' bookmarks."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-helm-find-files-p))
-
-(defvar helm-source-bookmark-helm-find-files
-  (helm-make-source "Bookmark helm-find-files sessions" 'helm-source-filtered-bookmarks
-      :init (lambda ()
-              (bookmark-maybe-load-default-file)
-              (helm-init-candidates-in-buffer
-                  'global (helm-bookmark-helm-find-files-setup-alist)))))
-
-;;; Uncategorized bookmarks
-;;
-(defun helm-bookmark-uncategorized-setup-alist ()
-  "Specialized filter function for uncategorized bookmarks."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-uncategorized-bookmark-p))
-
-(defvar helm-source-bookmark-uncategorized
-  (helm-make-source "Bookmark uncategorized" 'helm-source-filtered-bookmarks
-    :init (lambda ()
-            (bookmark-maybe-load-default-file)
-            (helm-init-candidates-in-buffer
-                'global (helm-bookmark-uncategorized-setup-alist)))))
-
-;;; Addressbook.
-;;
-;;
-(defclass helm-bookmark-addressbook-class (helm-source-in-buffer)
-  ((init :initform (lambda ()
-                     (require 'addressbook-bookmark nil t)
-                     (bookmark-maybe-load-default-file)
-                     (helm-init-candidates-in-buffer
-                         'global
-                       (helm-bookmark-addressbook-setup-alist))))
-   (search :initform #'helm-bookmark-search-fn)
-   (match-part :initform #'helm-pp-bookmark-match-fn)
-   (persistent-action :initform
-                      (lambda (candidate)
-                        (let ((bmk (helm-bookmark-get-bookmark-from-name
-                                    candidate)))
-                          (bookmark--jump-via bmk 'switch-to-buffer))))
-   (persistent-help :initform "Show contact - Prefix with C-u to append")
-   (filtered-candidate-transformer :initform
-                                   '(helm-adaptive-sort
-                                     helm-highlight-bookmark))
-   (action :initform (("Show Contact(s)"
-                       . (lambda (candidate)
-                           (let* ((contacts (helm-marked-candidates))
-                                  (current-prefix-arg helm-current-prefix-arg))
-                             (bookmark-jump
-                              (helm-bookmark-get-bookmark-from-name (car contacts)))
-                             (helm-aif (cdr contacts)
-                                 (let ((current-prefix-arg '(4)))
-                                   (cl-loop for bmk in it do
-                                            (bookmark-jump
-                                             (helm-bookmark-get-bookmark-from-name bmk))))))))
-                      ("Mail To" . helm-bookmark-addressbook-send-mail-1)
-                      ("Mail Cc" . (lambda (_candidate)
-                                     (helm-bookmark-addressbook-send-mail-1 nil 'cc)))
-                      ("Mail Bcc" . (lambda (_candidate)
-                                      (helm-bookmark-addressbook-send-mail-1 nil 'bcc)))
-                      ("Edit Bookmark"
-                       . (lambda (candidate)
-                           (let ((bmk (helm-bookmark-get-bookmark-from-name
-                                       candidate)))
-                             (addressbook-bookmark-edit
-                              (assoc bmk bookmark-alist)))))
-                      ("Delete bookmark(s)" . helm-delete-marked-bookmarks)
-                      ("Insert Email at point"
-                       . (lambda (candidate)
-                           (let* ((bmk   (helm-bookmark-get-bookmark-from-name
-                                          candidate))
-                                  (mlist (split-string
-                                          (assoc-default
-                                           'email (assoc bmk bookmark-alist))
-                                          ", ")))
-                             (insert
-                              (if (> (length mlist) 1)
-                                  (helm-comp-read
-                                   "Insert Mail Address: " mlist :must-match t)
-                                  (car mlist))))))
-                      ("Show annotation"
-                       . (lambda (candidate)
-                           (let ((bmk (helm-bookmark-get-bookmark-from-name
-                                       candidate)))
-                             (bookmark-show-annotation bmk))))
-                      ("Edit annotation"
-                       . (lambda (candidate)
-                           (let ((bmk (helm-bookmark-get-bookmark-from-name
-                                       candidate)))
-                             (bookmark-edit-annotation bmk))))
-                      ("Show Google map"
-                       . (lambda (candidate)
-                           (let* ((bmk (helm-bookmark-get-bookmark-from-name
-                                        candidate))
-                                  (full-bmk (assoc bmk bookmark-alist)))
-                             (addressbook-google-map full-bmk))))))))
-
-(defun helm-bookmark-addressbook-send-mail-1 (_candidate &optional cc)
-  (let* ((contacts (helm-marked-candidates))
-         (bookmark      (helm-bookmark-get-bookmark-from-name
-                         (car contacts)))
-         (append   (message-buffers)))
-    (addressbook-set-mail-buffer-1 bookmark append)
-    (helm-aif (cdr contacts)
-        (progn
-          (when cc (addressbook-set-mail-buffer-1 (car it) nil cc))
-          (cl-loop for bmk in (cdr it) do
-                   (addressbook-set-mail-buffer-1
-                    (helm-bookmark-get-bookmark-from-name bmk) 'append cc))))))
-
-(defun helm-bookmark-addressbook-setup-alist ()
-  "Specialized filter function for addressbook bookmarks."
-  (helm-bookmark-filter-setup-alist 'helm-bookmark-addressbook-p))
-
-(defvar helm-source-bookmark-addressbook
-  (helm-make-source "Bookmark Addressbook" 'helm-bookmark-addressbook-class))
-
-;;; Transformer
-;;
-
-(defun helm-highlight-bookmark (bookmarks _source)
-  "Used as `filtered-candidate-transformer' to colorize bookmarks.
-Work both with standard Emacs bookmarks and bookmark-extensions.el."
-  (let ((non-essential t))
-    (cl-loop for i in bookmarks
-          for isfile        = (bookmark-get-filename i)
-          for hff           = (helm-bookmark-helm-find-files-p i)
-          for handlerp      = (and (fboundp 'bookmark-get-handler)
-                                   (bookmark-get-handler i))
-          for isw3m         = (and (fboundp 'helm-bookmark-w3m-bookmark-p)
-                                   (helm-bookmark-w3m-bookmark-p i))
-          for isgnus        = (and (fboundp 'helm-bookmark-gnus-bookmark-p)
-                                   (helm-bookmark-gnus-bookmark-p i))
-          for isman         = (and (fboundp 'helm-bookmark-man-bookmark-p) ; Man
-                                   (helm-bookmark-man-bookmark-p i))
-          for iswoman       = (and (fboundp 'helm-bookmark-woman-bookmark-p) ; Woman
-                                   (helm-bookmark-woman-bookmark-p i))
-          for isannotation  = (bookmark-get-annotation i)
-          for isabook       = (string= (bookmark-prop-get i 'type)
-                                       "addressbook")
-          for isinfo        = (eq handlerp 'Info-bookmark-jump)
-          for loc = (bookmark-location i)
-          for len =  (string-width i)
-          for trunc = (if (and helm-bookmark-show-location
-                               (> len bookmark-bmenu-file-column))
-                          (helm-substring
-                           i bookmark-bmenu-file-column)
-                        i)
-          ;; Add a * if bookmark have annotation
-          if (and isannotation (not (string-equal isannotation "")))
-          do (setq trunc (concat "*" (if helm-bookmark-show-location trunc i)))
-          for sep = (and helm-bookmark-show-location
-                         (make-string (- (+ bookmark-bmenu-file-column 2)
-                                         (string-width trunc))
-                                      ? ))
-          for bmk = (cond ( ;; info buffers
-                           isinfo
-                           (propertize trunc 'face 'helm-bookmark-info
-                                       'help-echo isfile))
-                          ( ;; w3m buffers
-                           isw3m
-                           (propertize trunc 'face 'helm-bookmark-w3m
-                                       'help-echo isfile))
-                          ( ;; gnus buffers
-                           isgnus
-                           (propertize trunc 'face 'helm-bookmark-gnus
-                                       'help-echo isfile))
-                          ( ;; Man Woman
-                           (or iswoman isman)
-                           (propertize trunc 'face 'helm-bookmark-man
-                                       'help-echo isfile))
-                          ( ;; Addressbook
-                           isabook
-                           (propertize trunc 'face 'helm-bookmark-addressbook))
-                          ( ;; directories
-                           (and isfile
-                                (or hff
-                                    ;; This is needed because `non-essential'
-                                    ;; is not working on Emacs-24.2 and the behavior
-                                    ;; of tramp seems to have changed since previous
-                                    ;; versions (Need to reenter password even if a
-                                    ;; first connection have been established,
-                                    ;; probably when host is named differently
-                                    ;; i.e machine/localhost)
-                                    (and (not (file-remote-p isfile))
-                                         (file-directory-p isfile))))
-                           (propertize trunc 'face 'helm-bookmark-directory
-                                       'help-echo isfile))
-                          ( ;; regular files
-                           t
-                           (propertize trunc 'face 'helm-bookmark-file
-                                       'help-echo isfile)))
-          collect (if helm-bookmark-show-location
-                      (cons (concat bmk sep (if (listp loc) (car loc) loc))
-                            i)
-                    (cons bmk i)))))
-
-(defun helm-bookmark-edit-bookmark (bookmark-name)
-  "Edit bookmark's name and file name, and maybe save them.
-BOOKMARK-NAME is the current (old) name of the bookmark to be renamed."
-  (let ((bmk (helm-bookmark-get-bookmark-from-name bookmark-name))
-        (handler (bookmark-prop-get bookmark-name 'handler)))
-    (if (eq handler 'addressbook-bookmark-jump)
-        (addressbook-bookmark-edit
-         (assoc bmk bookmark-alist))
-      (helm-bookmark-edit-bookmark-1 bookmark-name handler))))
-
-(defun helm-bookmark-edit-bookmark-1 (bookmark-name handler)
-  (let* ((helm--reading-passwd-or-string t)
-         (bookmark-fname (bookmark-get-filename bookmark-name))
-         (bookmark-loc   (bookmark-prop-get bookmark-name 'location))
-         (new-name       (read-from-minibuffer "Name: " bookmark-name))
-         (new-loc        (read-from-minibuffer "FileName or Location: "
-                                               (or bookmark-fname
-                                                   (if (consp bookmark-loc)
-                                                       (car bookmark-loc)
-                                                     bookmark-loc))))
-         (docid           (and (eq handler 'mu4e-bookmark-jump)
-                               (read-number "Docid: " (cdr bookmark-loc)))))
-    (when docid
-      (setq new-loc (cons new-loc docid)))
-    (when (and (not (equal new-name "")) (not (equal new-loc ""))
-               (y-or-n-p "Save changes? "))
-      (if bookmark-fname
-          (progn
-            (helm-bookmark-rename bookmark-name new-name 'batch)
-            (bookmark-set-filename new-name new-loc))
-        (bookmark-prop-set
-         (bookmark-get-bookmark bookmark-name) 'location new-loc)
-        (helm-bookmark-rename bookmark-name new-name 'batch))
-      (helm-bookmark-maybe-save-bookmark)
-      (list new-name new-loc))))
-
-(defun helm-bookmark-maybe-save-bookmark ()
-  "Increment save counter and maybe save `bookmark-alist'."
-  (setq bookmark-alist-modification-count (1+ bookmark-alist-modification-count))
-  (when (bookmark-time-to-save-p) (bookmark-save)))
-
-(defun helm-bookmark-rename (old &optional new batch)
-  "Change bookmark's name from OLD to NEW.
-Interactively:
- If called from the keyboard, then prompt for OLD.
- If called from the menubar, select OLD from a menu.
-If NEW is nil, then prompt for its string value.
-
-If BATCH is non-nil, then do not rebuild the menu list.
-
-While the user enters the new name, repeated `C-w' inserts consecutive
-words from the buffer into the new bookmark name."
-  (interactive (list (bookmark-completing-read "Old bookmark name")))
-  (bookmark-maybe-historicize-string old)
-  (bookmark-maybe-load-default-file)
-  (save-excursion (skip-chars-forward " ") (setq bookmark-yank-point (point)))
-  (setq bookmark-current-buffer (current-buffer))
-  (let ((newname  (or new  (read-from-minibuffer
-                            "New name: " nil
-                            (let ((now-map  (copy-keymap minibuffer-local-map)))
-                              (define-key now-map  "\C-w" 'bookmark-yank-word)
-                              now-map)
-                            nil 'bookmark-history))))
-    (bookmark-set-name old newname)
-    (setq bookmark-current-bookmark  newname)
-    (unless batch (bookmark-bmenu-surreptitiously-rebuild-list))
-    (helm-bookmark-maybe-save-bookmark) newname))
-
-(defun helm-bookmark-run-edit ()
-  "Run `helm-bookmark-edit-bookmark' from keyboard."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-bookmark-edit-bookmark)))
-
-
-;;; Bookmarks attributes
-;;
-(define-helm-type-attribute 'bookmark
-    `((coerce . helm-bookmark-get-bookmark-from-name)
-      (action . ,(helm-make-actions
-                  "Jump to bookmark" 'helm-bookmark-jump
-                  "Jump to BM other window" 'helm-bookmark-jump-other-window
-                  "Bookmark edit annotation" 'bookmark-edit-annotation
-                  "Bookmark show annotation" 'bookmark-show-annotation
-                  "Delete bookmark(s)" 'helm-delete-marked-bookmarks
-                  "Edit Bookmark" 'helm-bookmark-edit-bookmark
-                  "Rename bookmark" 'helm-bookmark-rename
-                  "Relocate bookmark" 'bookmark-relocate))
-      (keymap . ,helm-bookmark-map)
-      (mode-line . helm-bookmark-mode-line-string))
-  "Bookmark name.")
-
-
-(defun helm-bookmark-run-jump-other-window ()
-  "Jump to bookmark from keyboard."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'bookmark-jump-other-window)))
-
-(defun helm-bookmark-run-delete ()
-  "Delete bookmark from keyboard."
-  (interactive)
-  (with-helm-alive-p
-    (when (y-or-n-p "Delete bookmark(s)?")
-      (helm-quit-and-execute-action 'helm-delete-marked-bookmarks))))
-
-(defun helm-bookmark-get-bookmark-from-name (bmk)
-  "Return bookmark name even if it is a bookmark with annotation.
-e.g prepended with *."
-  (let ((bookmark (replace-regexp-in-string "\\`\\*" "" bmk)))
-    (if (assoc bookmark bookmark-alist) bookmark bmk)))
-
-(defun helm-delete-marked-bookmarks (_ignore)
-  "Delete this bookmark or all marked bookmarks."
-  (cl-dolist (i (helm-marked-candidates))
-    (bookmark-delete (helm-bookmark-get-bookmark-from-name i)
-                     'batch)))
-
-
-;;;###autoload
-(defun helm-bookmarks ()
-  "Preconfigured `helm' for bookmarks."
-  (interactive)
-  (helm :sources '(helm-source-bookmarks
-                   helm-source-bookmark-set)
-        :buffer "*helm bookmarks*"
-        :default (buffer-name helm-current-buffer)))
-
-;;;###autoload
-(defun helm-pp-bookmarks ()
-  "Preconfigured `helm' for bookmarks (pretty-printed)."
-  (interactive)
-  (helm :sources '(helm-source-pp-bookmarks
-                   helm-source-bookmark-set)
-        :buffer "*helm pp bookmarks*"
-        :default (buffer-name helm-current-buffer)))
-
-;;;###autoload
-(defun helm-filtered-bookmarks ()
-  "Preconfigured helm for bookmarks (filtered by category).
-Optional source `helm-source-bookmark-addressbook' is loaded
-only if external library addressbook-bookmark.el is available."
-  (interactive)
-  (helm :sources helm-bookmark-default-filtered-sources
-        :prompt "Search Bookmark: "
-        :buffer "*helm filtered bookmarks*"
-        :default (list (thing-at-point 'symbol)
-                       (buffer-name helm-current-buffer))))
-
-(provide 'helm-bookmark)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-bookmark.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-buffers.el b/emacs.d/elpa/helm-20150623.1310/helm-buffers.el
deleted file mode 100644
index 60a6505..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-buffers.el
+++ /dev/null
@@ -1,883 +0,0 @@
-;;; helm-buffers.el --- helm support for buffers. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-elscreen)
-(require 'helm-grep)
-(require 'helm-plugin)
-(require 'helm-regexp)
-(require 'helm-help)
-
-(declare-function ido-make-buffer-list "ido" (default))
-(declare-function ido-add-virtual-buffers-to-list "ido")
-(declare-function helm-comp-read "helm-mode")
-
-
-(defgroup helm-buffers nil
-  "Buffers related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-boring-buffer-regexp-list
-  '("\\` " "\\*helm" "\\*helm-mode" "\\*Echo Area" "\\*Minibuf")
-  "The regexp list that match boring buffers.
-Buffer candidates matching these regular expression will be
-filtered from the list of candidates if the
-`helm-skip-boring-buffers' candidate transformer is used."
-  :type  '(repeat (choice regexp))
-  :group 'helm-buffers)
-
-(defcustom helm-buffers-favorite-modes '(lisp-interaction-mode
-                                         emacs-lisp-mode
-                                         text-mode
-                                         org-mode)
-  "List of preferred mode to open new buffers with."
-  :type '(repeat (choice function))
-  :group 'helm-buffers)
-
-(defcustom helm-buffer-max-length 20
-  "Max length of buffer names before truncate.
-When disabled (nil) use the longest buffer-name length found."
-  :group 'helm-buffers
-  :type  '(choice (const :tag "Disabled" nil)
-           (integer :tag "Length before truncate")))
-
-(defcustom helm-buffer-details-flag t
-  "Always show details in buffer list when non--nil."
-  :group 'helm-buffers
-  :type 'boolean)
-
-(defcustom helm-buffers-fuzzy-matching nil
-  "Fuzzy matching buffer names when non--nil.
-Only buffer names are fuzzy matched when this is enabled,
-`major-mode' matching is not affected by this."
-  :group 'helm-buffers
-  :type 'boolean)
-
-(defcustom helm-buffer-skip-remote-checking nil
-  "Ignore checking for `file-exists-p' on remote files."
-  :group 'helm-buffers
-  :type 'boolean)
-
-(defcustom helm-buffers-truncate-lines t
-  "Truncate lines in `helm-buffers-list' when non--nil."
-  :group 'helm-buffers
-  :type 'boolean)
-
-(defcustom helm-mini-default-sources '(helm-source-buffers-list
-                                       helm-source-recentf
-                                       helm-source-buffer-not-found)
-  "Default sources list used in `helm-mini'."
-  :group 'helm-misc
-  :type '(repeat (choice symbol)))
-
-
-;;; Faces
-;;
-;;
-(defgroup helm-buffers-faces nil
-  "Customize the appearance of helm-buffers."
-  :prefix "helm-"
-  :group 'helm-buffers
-  :group 'helm-faces)
-
-(defface helm-buffer-saved-out
-    '((t (:foreground "red" :background "black")))
-  "Face used for buffer files modified outside of emacs."
-  :group 'helm-buffers-faces)
-
-(defface helm-buffer-not-saved
-    '((t (:foreground "Indianred2")))
-  "Face used for buffer files not already saved on disk."
-  :group 'helm-buffers-faces)
-
-(defface helm-buffer-size
-    '((((background dark)) :foreground "RosyBrown")
-      (((background light)) :foreground "SlateGray"))
-  "Face used for buffer size."
-  :group 'helm-buffers-faces)
-
-(defface helm-buffer-process
-    '((t (:foreground "Sienna3")))
-  "Face used for process status in buffer."
-  :group 'helm-buffers-faces)
-
-(defface helm-buffer-directory
-    '((t (:foreground "DarkRed" :background "LightGray")))
-  "Face used for directories in `helm-buffers-list'."
-  :group 'helm-buffers-faces)
-
-(defface helm-buffer-file
-    '((t :inherit font-lock-builtin-face))
-  "Face for buffer file names in `helm-buffers-list'."
-  :group 'helm-buffers-faces)
-
-
-;;; Buffers keymap
-;;
-(defvar helm-buffer-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?")     'helm-buffer-help)
-    ;; No need to have separate command for grep and zgrep
-    ;; as we don't use recursivity for buffers.
-    ;; So use zgrep for both as it is capable to handle non--compressed files.
-    (define-key map (kbd "M-g s")     'helm-buffer-run-zgrep)
-    (define-key map (kbd "C-s")       'helm-buffers-run-multi-occur)
-    (define-key map (kbd "C-c o")     'helm-buffer-switch-other-window)
-    (define-key map (kbd "C-c C-o")   'helm-buffer-switch-other-frame)
-    (define-key map (kbd "C-c =")     'helm-buffer-run-ediff)
-    (define-key map (kbd "M-=")       'helm-buffer-run-ediff-merge)
-    (define-key map (kbd "C-=")       'helm-buffer-diff-persistent)
-    (define-key map (kbd "M-U")       'helm-buffer-revert-persistent)
-    (define-key map (kbd "C-c d")     'helm-buffer-run-kill-persistent)
-    (define-key map (kbd "M-D")       'helm-buffer-run-kill-buffers)
-    (define-key map (kbd "C-x C-s")   'helm-buffer-save-persistent)
-    (define-key map (kbd "C-M-%")     'helm-buffer-run-query-replace-regexp)
-    (define-key map (kbd "M-%")       'helm-buffer-run-query-replace)
-    (define-key map (kbd "M-m")       'helm-toggle-all-marks)
-    (define-key map (kbd "M-a")       'helm-mark-all)
-    (define-key map (kbd "C-]")       'helm-toggle-buffers-details)
-    (define-key map (kbd "C-c a")     'helm-buffers-toggle-show-hidden-buffers)
-    (define-key map (kbd "<C-M-SPC>") 'helm-buffers-mark-similar-buffers)
-    map)
-  "Keymap for buffer sources in helm.")
-
-(defvar helm-buffers-ido-virtual-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?")   'helm-buffers-ido-virtual-help)
-    (define-key map (kbd "C-c o")   'helm-ff-run-switch-other-window)
-    (define-key map (kbd "C-c C-o") 'helm-ff-run-switch-other-frame)
-    (define-key map (kbd "M-g s")   'helm-ff-run-grep)
-    (define-key map (kbd "M-g z")   'helm-ff-run-zgrep)
-    (define-key map (kbd "M-D")     'helm-ff-run-delete-file)
-    (define-key map (kbd "C-c C-x") 'helm-ff-run-open-file-externally)
-    map))
-
-
-(defvar helm-buffers-list-cache nil)
-(defvar helm-buffer-max-len-mode nil)
-
-(defun helm-buffers-list--init ()
-  ;; Issue #51 Create the list before `helm-buffer' creation.
-  (setq helm-buffers-list-cache (funcall (helm-attr 'buffer-list)))
-  (let ((result (cl-loop for b in helm-buffers-list-cache
-                         maximize (length b) into len-buf
-                         maximize (length (with-current-buffer b
-                                            (symbol-name major-mode)))
-                         into len-mode
-                         finally return (cons len-buf len-mode))))
-    (unless (default-value 'helm-buffer-max-length)
-      (helm-set-local-variable 'helm-buffer-max-length (car result)))
-    (unless (default-value 'helm-buffer-max-len-mode)
-      (helm-set-local-variable 'helm-buffer-max-len-mode (cdr result)))))
-
-(defclass helm-source-buffers (helm-source-sync helm-type-buffer)
-  ((buffer-list
-    :initarg :buffer-list
-    :initform #'helm-buffer-list
-    :custom function
-    :documentation
-    "  A function with no arguments to create buffer list.")
-   (init :initform 'helm-buffers-list--init)
-   (candidates :initform helm-buffers-list-cache)
-   (matchplugin :initform nil)
-   (match :initform 'helm-buffers-match-function)
-   (persistent-action :initform 'helm-buffers-list-persistent-action)
-   (resume :initform (lambda ()
-                       (run-with-idle-timer
-                        0.1 nil (lambda ()
-                                  (with-helm-buffer
-                                    (helm-force-update))))))
-   (keymap :initform helm-buffer-map)
-   (volatile :initform t)
-   (mode-line :initform helm-buffer-mode-line-string)
-   (persistent-help
-    :initform
-    "Show this buffer / C-u \\[helm-execute-persistent-action]: Kill this buffer")))
-
-(defvar helm-source-buffers-list nil)
-
-(defvar helm-source-buffer-not-found
-  (helm-build-dummy-source
-   "Create buffer"
-   :action (helm-make-actions
-            "Create buffer (C-u choose mode)"
-            (lambda (candidate)
-             (let ((mjm (or (and helm-current-prefix-arg
-                                 (intern-soft (helm-comp-read
-                                               "Major-mode: "
-                                               helm-buffers-favorite-modes)))
-                            (cl-loop for (r . m) in auto-mode-alist
-                                     when (string-match r candidate)
-                                     return m)))
-                   (buffer (get-buffer-create candidate)))
-               (if mjm
-                   (with-current-buffer buffer (funcall mjm))
-                   (set-buffer-major-mode buffer))
-               (switch-to-buffer buffer))))))
-
-(defvar ido-temp-list)
-(defvar ido-ignored-list)
-(defvar ido-process-ignore-lists)
-(defvar ido-use-virtual-buffers)
-(defvar ido-virtual-buffers)
-
-(defvar helm-source-ido-virtual-buffers
-  (helm-build-sync-source "Ido virtual buffers"
-    :candidates (lambda ()
-                  (let (ido-temp-list
-                        ido-ignored-list
-                        (ido-process-ignore-lists t))
-                    (when ido-use-virtual-buffers
-                      (ido-add-virtual-buffers-to-list)
-                      ido-virtual-buffers)))
-    :fuzzy-match helm-buffers-fuzzy-matching
-    :keymap helm-buffers-ido-virtual-map
-    :mode-line helm-buffers-ido-virtual-mode-line-string
-    :action '(("Find file" . helm-find-many-files)
-              ("Find file other window" . find-file-other-window)
-              ("Find file other frame" . find-file-other-frame)
-              ("Find file as root" . helm-find-file-as-root)
-              ("Grep File(s) `C-u recurse'" . helm-find-files-grep)
-              ("Zgrep File(s) `C-u Recurse'" . helm-ff-zgrep)
-              ("View file" . view-file)
-              ("Delete file(s)" . helm-delete-marked-files)
-              ("Open file externally (C-u to choose)"
-               . helm-open-file-externally))))
-
-
-(defvar ido-use-virtual-buffers)
-(defun helm-buffer-list ()
-  "Return the current list of buffers.
-Currently visible buffers are put at the end of the list.
-See `ido-make-buffer-list' for more infos."
-  (require 'ido)
-  (let ((ido-process-ignore-lists t)
-        ido-ignored-list
-        ido-use-virtual-buffers)
-    (ido-make-buffer-list nil)))
-
-(defun helm-buffer-size (buffer)
-  "Return size of BUFFER."
-  (with-current-buffer buffer
-    (save-restriction
-      (widen)
-      (helm-file-human-size
-       (- (position-bytes (point-max))
-          (position-bytes (point-min)))))))
-
-(defun helm-buffer--show-details (buf-name prefix help-echo
-                                  size mode dir face1 face2
-                                  proc details type)
-  (append
-   (list
-    (concat prefix
-            (propertize buf-name 'face face1
-                        'help-echo help-echo
-                        'type type)))
-   (and details
-        (list size mode
-              (propertize
-               (if proc
-                   (format "(%s %s in `%s')"
-                           (process-name proc)
-                           (process-status proc) dir)
-                 (format "(in `%s')" dir))
-               'face face2)))))
-
-(defun helm-buffer--details (buffer &optional details)
-  (let* ((mode (with-current-buffer buffer (format-mode-line mode-name)))
-         (buf (get-buffer buffer))
-         (size (propertize (helm-buffer-size buf)
-                           'face 'helm-buffer-size))
-         (proc (get-buffer-process buf))
-         (dir (with-current-buffer buffer (abbreviate-file-name default-directory)))
-         (file-name (helm-aif (buffer-file-name buf) (abbreviate-file-name it)))
-         (name (buffer-name buf))
-         (name-prefix (when (file-remote-p dir)
-                        (propertize "@ " 'face 'helm-ff-prefix))))
-    ;; No fancy things on remote buffers.
-    (if (and name-prefix helm-buffer-skip-remote-checking)
-        (helm-buffer--show-details
-         name name-prefix file-name size mode dir
-         'helm-buffer-file 'helm-buffer-process nil details 'filebuf)
-      (cond
-        ( ;; A dired buffer.
-         (rassoc buf dired-buffers)
-         (helm-buffer--show-details
-          name name-prefix dir size mode dir
-          'helm-buffer-directory 'helm-buffer-process nil details 'dired))
-        ;; A buffer file modified somewhere outside of emacs.=>red
-        ((and file-name
-              (file-exists-p file-name)
-              (not (verify-visited-file-modtime buf)))
-         (helm-buffer--show-details
-          name name-prefix file-name size mode dir
-          'helm-buffer-saved-out 'helm-buffer-process nil details 'modout))
-        ;; A new buffer file not already saved on disk (or a deleted file) .=>indianred2
-        ((and file-name (not (file-exists-p file-name)))
-         (helm-buffer--show-details
-          name name-prefix file-name size mode dir
-          'helm-buffer-not-saved 'helm-buffer-process nil details 'notsaved))
-        ;; A buffer file modified and not saved on disk.=>orange
-        ((and file-name (buffer-modified-p buf))
-         (helm-buffer--show-details
-          name name-prefix file-name size mode dir
-          'helm-ff-symlink 'helm-buffer-process nil details 'mod))
-        ;; A buffer file not modified and saved on disk.=>green
-        (file-name
-         (helm-buffer--show-details
-          name name-prefix file-name size mode dir
-          'helm-buffer-file 'helm-buffer-process nil details 'filebuf))
-        ;; Any non--file buffer.=>grey italic
-        (t
-         (helm-buffer--show-details
-          name (and proc name-prefix) dir size mode dir
-          'italic 'helm-buffer-process proc details 'nofile))))))
-
-(defun helm-highlight-buffers (buffers _source)
-  "Transformer function to highlight BUFFERS list.
-Should be called after others transformers i.e (boring buffers)."
-  (cl-loop for i in buffers
-        for (name size mode meta) = (if helm-buffer-details-flag
-                                        (helm-buffer--details i 'details)
-                                      (helm-buffer--details i))
-        for truncbuf = (if (> (string-width name) helm-buffer-max-length)
-                           (helm-substring-by-width
-                            name helm-buffer-max-length)
-                         (concat name (make-string
-                                       (- (+ helm-buffer-max-length 3)
-                                          (string-width name)) ? )))
-        for len = (length mode)
-        when (> len helm-buffer-max-len-mode)
-        do (setq helm-buffer-max-len-mode len)
-        for fmode = (concat (make-string
-                             (- (max helm-buffer-max-len-mode len) len) ? )
-                            mode)
-        ;; The max length of a number should be 1023.9X where X is the
-        ;; units, this is 7 characters.
-        for formatted-size = (and size (format "%7s" size))
-        collect (cons (if helm-buffer-details-flag
-                          (concat truncbuf "\t" formatted-size
-                                  "  " fmode "  " meta)
-                        name)
-                      (get-buffer i))))
-
-(defun helm-buffer--get-preselection (buffer)
-  (let ((bufname (buffer-name buffer)))
-    (concat "^"
-            (if (and (null helm-buffer-details-flag)
-                     (numberp helm-buffer-max-length)
-                     (> (string-width bufname)
-                        helm-buffer-max-length))
-                (regexp-quote
-                 (helm-substring-by-width
-                  bufname helm-buffer-max-length))
-                (concat (regexp-quote bufname)
-                        (if helm-buffer-details-flag
-                            "$" "[[:blank:]]+"))))))
-
-(defun helm-toggle-buffers-details ()
-  (interactive)
-  (let ((preselect (helm-buffer--get-preselection
-                    (helm-get-selection))))
-    (when helm-alive-p
-      (setq helm-buffer-details-flag (not helm-buffer-details-flag))
-      (helm-force-update preselect))))
-
-(defun helm-buffers-sort-transformer (candidates _source)
-  (if (string= helm-pattern "")
-      candidates
-    (sort candidates
-          #'(lambda (s1 s2)
-              (< (string-width s1) (string-width s2))))))
-
-(defun helm-buffers-mark-similar-buffers-1 ()
-  (with-helm-window
-    (let ((type (get-text-property
-                 0 'type (helm-get-selection nil 'withprop))))
-      (save-excursion
-        (goto-char (helm-get-previous-header-pos))
-        (helm-next-line)
-        (let* ((next-head (helm-get-next-header-pos))
-               (end       (and next-head
-                               (save-excursion
-                                 (goto-char next-head)
-                                 (forward-line -1)
-                                 (point))))
-               (maxpoint  (or end (point-max))))
-          (while (< (point) maxpoint)
-            (helm-mark-current-line)
-            (let ((cand (helm-get-selection nil 'withprop)))
-              (when (and (not (helm-this-visible-mark))
-                         (eq (get-text-property 0 'type cand) type))
-                (helm-make-visible-mark)))
-            (forward-line 1) (end-of-line))))
-      (helm-mark-current-line)
-      (message "%s candidates marked" (length helm-marked-candidates)))))
-
-(defun helm-buffers-mark-similar-buffers ()
-    "Mark All buffers that have same property `type' than current.
-i.e same color."
-  (interactive)
-  (let ((marked (helm-marked-candidates)))
-    (if (and (>= (length marked) 1)
-             (with-helm-window helm-visible-mark-overlays))
-        (helm-unmark-all)
-      (helm-buffers-mark-similar-buffers-1))))
-
-
-;;; match functions
-;;
-(defun helm-buffer--match-mjm (pattern mjm)
-  (when (string-match "\\`\\*" pattern)
-    (cl-loop with patterns = (split-string (substring pattern 1) ",")
-             for pat in patterns
-             if (string-match "\\`!" pat)
-             collect (string-match (substring pat 1) mjm) into neg
-             else collect (string-match pat mjm) into pos
-             finally return
-             (let ((neg-test (cl-loop for i in neg thereis (numberp i)))
-                   (pos-test (cl-loop for i in pos thereis (numberp i))))
-               (or
-                (and neg (not pos) (not neg-test))
-                (and pos pos-test)
-                (and neg neg-test (not neg-test)))))))
-
-(defun helm-buffer--match-pattern (pattern candidate)
-  (let ((fun (if (and helm-buffers-fuzzy-matching
-                      (not (string-match "\\`\\^" pattern)))
-                 #'helm--mapconcat-pattern
-                 #'identity)))
-    (if (string-match "\\`!" pattern)
-        (not (string-match (funcall fun (substring pattern 1))
-                           candidate))
-        (string-match (funcall fun pattern) candidate))))
-
-(defun helm-buffers--match-from-mjm (candidate)
-  (let* ((cand (replace-regexp-in-string "^\\s-\\{1\\}" "" candidate))
-         (buf  (get-buffer cand))
-         (regexp (cl-loop with pattern = helm-pattern
-                          for p in (split-string pattern)
-                          when (string-match "\\`\\*" p)
-                          return p)))
-    (if regexp
-        (when buf
-          (with-current-buffer buf
-            (let ((mjm (format-mode-line mode-name)))
-              (helm-buffer--match-mjm regexp mjm))))
-        t)))
-
-(defun helm-buffers--match-from-pat (candidate)
-  (let ((regexp-list (cl-loop with pattern = helm-pattern
-                              for p in (split-string pattern)
-                              unless (string-match
-                                      "\\`\\(\\*\\)\\|\\(/\\)\\|\\(@\\)" p)
-                              collect p)))
-    (if regexp-list
-        (cl-loop for re in regexp-list
-                 always (helm-buffer--match-pattern re candidate))
-        t)))
-
-(defun helm-buffers--match-from-inside (candidate)
-  (let* ((cand (replace-regexp-in-string "^\\s-\\{1\\}" "" candidate))
-         (buf  (get-buffer cand))
-         (regexp (cl-loop with pattern = helm-pattern
-                          for p in (split-string pattern)
-                          when (string-match "\\`@\\(.*\\)" p)
-                          return (match-string 1 p))))
-    (if regexp
-        (with-current-buffer buf
-          (save-excursion
-            (goto-char (point-min))
-            (re-search-forward regexp nil t)))
-        t)))
-
-(defun helm-buffers--match-from-directory (candidate)
-  (let* ((cand (replace-regexp-in-string "^\\s-\\{1\\}" "" candidate))
-         (buf  (get-buffer cand))
-         (buf-fname (buffer-file-name buf))
-         (regexps (cl-loop with pattern = helm-pattern
-                          for p in (split-string pattern)
-                          when (string-match "\\`/" p)
-                          collect p)))
-    (if regexps
-        (cl-loop for re in regexps
-                 thereis 
-                 (and buf-fname
-                      (string-match
-                       (substring re 1) (helm-basedir buf-fname))))
-        t)))
-
-(defun helm-buffers-match-function (candidate)
-  "Default function to match buffers."
-  (and (helm-buffers--match-from-pat candidate)
-       (helm-buffers--match-from-mjm candidate)
-       (helm-buffers--match-from-inside candidate)
-       (helm-buffers--match-from-directory candidate)))
-
-
-(defun helm-buffer-query-replace-1 (&optional regexp-flag buffers)
-  "Query replace in marked buffers.
-If REGEXP-FLAG is given use `query-replace-regexp'."
-  (let ((fn     (if regexp-flag 'query-replace-regexp 'query-replace))
-        (prompt (if regexp-flag "Query replace regexp" "Query replace"))
-        (bufs   (or buffers (helm-marked-candidates)))
-        (helm--reading-passwd-or-string t))
-    (cl-loop with replace = (query-replace-read-from prompt regexp-flag)
-          with tostring = (unless (consp replace)
-                            (query-replace-read-to
-                             replace prompt regexp-flag))
-          for buf in bufs
-          do
-          (save-window-excursion
-            (switch-to-buffer buf)
-            (save-excursion
-              (let ((case-fold-search t))
-                (goto-char (point-min))
-                (if (consp replace)
-                    (apply fn (list (car replace) (cdr replace)))
-                  (apply fn (list replace tostring)))))))))
-
-(defun helm-buffer-query-replace-regexp (_candidate)
-  (helm-buffer-query-replace-1 'regexp))
-
-(defun helm-buffer-query-replace (_candidate)
-  (helm-buffer-query-replace-1))
-
-(defun helm-buffer-toggle-diff (candidate)
-  "Toggle diff buffer CANDIDATE with it's file."
-  (let (helm-persistent-action-use-special-display)
-    (helm-aif (get-buffer-window "*Diff*")
-        (progn (kill-buffer "*Diff*")
-               (set-window-buffer it helm-current-buffer))
-      (diff-buffer-with-file (get-buffer candidate)))))
-
-(defun helm-buffer-diff-persistent ()
-  "Toggle diff buffer without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'diff-action 'helm-buffer-toggle-diff)
-    (helm-execute-persistent-action 'diff-action)))
-
-(defun helm-revert-buffer (candidate)
-  (with-current-buffer candidate
-    (helm-aif (buffer-file-name)
-        (and (file-exists-p it) (revert-buffer t t)))))
-
-(defun helm-revert-marked-buffers (_ignore)
-  (mapc 'helm-revert-buffer (helm-marked-candidates)))
-
-(defun helm-buffer-revert-and-update (_candidate)
-  (let ((marked (helm-marked-candidates))
-        (preselect (helm-buffers--quote-truncated-buffer
-                    (helm-get-selection))))
-    (cl-loop for buf in marked do (helm-revert-buffer buf))
-    (when (> (length marked) 1) (helm-unmark-all))
-    (helm-force-update preselect)))
-
-(defun helm-buffer-revert-persistent ()
-  "Revert buffer without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'revert-action '(helm-buffer-revert-and-update . never-split))
-    (helm-execute-persistent-action 'revert-action)))
-
-(defun helm-buffer-save-and-update (_candidate)
-  (let ((marked (helm-marked-candidates))
-        (preselect (helm-get-selection nil t))
-        (enable-recursive-minibuffers t))
-    (cl-loop for buf in marked do
-          (with-current-buffer (get-buffer buf)
-            (when (buffer-file-name) (save-buffer))))
-    (when (> (length marked) 1) (helm-unmark-all))
-    (helm-force-update (regexp-quote preselect))))
-
-(defun helm-buffer-save-persistent ()
-  "Save buffer without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'save-action '(helm-buffer-save-and-update . never-split))
-    (helm-execute-persistent-action 'save-action)))
-
-(defun helm-buffer-run-kill-persistent ()
-  "Kill buffer without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'kill-action '(helm-buffers-persistent-kill . never-split))
-    (helm-execute-persistent-action 'kill-action)))
-
-(defun helm-kill-marked-buffers (_ignore)
-  (mapc 'kill-buffer (helm-marked-candidates))
-  (with-helm-buffer
-    (setq helm-marked-candidates nil
-          helm-visible-mark-overlays nil)))
-
-(defun helm-buffer-run-kill-buffers ()
-  "Run kill buffer action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-kill-marked-buffers)))
-
-(defun helm-buffer-run-grep ()
-  "Run Grep action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-grep-buffers)))
-
-(defun helm-buffer-run-zgrep ()
-  "Run Grep action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-zgrep-buffers)))
-
-(defun helm-buffer-run-query-replace-regexp ()
-  "Run Query replace regexp action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-buffer-query-replace-regexp)))
-
-(defun helm-buffer-run-query-replace ()
-  "Run Query replace action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-buffer-query-replace)))
-
-(defun helm-buffer-switch-other-window ()
-  "Run switch to other window action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-switch-to-buffers-other-window)))
-
-(defun helm-buffer-switch-other-frame ()
-  "Run switch to other frame action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'switch-to-buffer-other-frame)))
-
-(defun helm-buffer-switch-to-elscreen ()
-  "Run switch to elscreen  action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-buffer-on-elscreen)))
-
-(defun helm-buffer-run-ediff ()
-  "Run ediff action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ediff-marked-buffers)))
-
-(defun helm-buffer-run-ediff-merge ()
-  "Run ediff action from `helm-source-buffers-list'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ediff-marked-buffers-merge)))
-
-(defun helm-buffers-persistent-kill-1 (buffer)
-  "Persistent action to kill buffer."
-  (if (eql (get-buffer buffer) (get-buffer helm-current-buffer))
-      (progn
-        (message "Can't kill `helm-current-buffer' without quitting session")
-        (sit-for 1))
-      (with-current-buffer (get-buffer buffer)
-        (if (and (buffer-modified-p)
-                 (buffer-file-name (current-buffer)))
-            (progn
-              (save-buffer)
-              (kill-buffer buffer))
-            (kill-buffer buffer)))
-      (helm-delete-current-selection)
-      (with-helm-temp-hook 'helm-after-persistent-action-hook
-        (helm-force-update (regexp-quote (helm-get-selection nil t))))))
-
-(defun helm-buffers--quote-truncated-buffer (buffer)
-  (let ((bufname (and (bufferp buffer)
-                      (buffer-name buffer))))
-    (when bufname
-      (regexp-quote
-       (if helm-buffer-max-length
-           (helm-substring-by-width
-            bufname helm-buffer-max-length
-            "")
-           bufname)))))
-
-(defun helm-buffers-persistent-kill (_buffer)
-  (let ((marked (helm-marked-candidates)))
-    (unwind-protect
-         (cl-loop for b in marked
-               do (progn (helm-preselect
-                          (format "^%s"
-                                  (helm-buffers--quote-truncated-buffer b)))
-                         (when (y-or-n-p (format "kill buffer (%s)? " b))
-                           (helm-buffers-persistent-kill-1 b))
-                         (message nil)))
-      (with-helm-buffer
-        (setq helm-marked-candidates nil
-              helm-visible-mark-overlays nil))
-      (helm-force-update (helm-buffers--quote-truncated-buffer
-                          (helm-get-selection))))))
-
-(defun helm-buffers-list-persistent-action (candidate)
-  (if current-prefix-arg
-      (helm-buffers-persistent-kill candidate)
-    (switch-to-buffer candidate)))
-
-(defun helm-ediff-marked-buffers (_candidate &optional merge)
-  "Ediff 2 marked buffers or CANDIDATE and `helm-current-buffer'.
-With optional arg MERGE call `ediff-merge-buffers'."
-  (let ((lg-lst (length (helm-marked-candidates)))
-        buf1 buf2)
-    (cl-case lg-lst
-      (0
-       (error "Error:You have to mark at least 1 buffer"))
-      (1
-       (setq buf1 helm-current-buffer
-             buf2 (cl-first (helm-marked-candidates))))
-      (2
-       (setq buf1 (cl-first (helm-marked-candidates))
-             buf2 (cl-second (helm-marked-candidates))))
-      (t
-       (error "Error:To much buffers marked!")))
-    (if merge
-        (ediff-merge-buffers buf1 buf2)
-      (ediff-buffers buf1 buf2))))
-
-(defun helm-ediff-marked-buffers-merge (candidate)
-  "Ediff merge `helm-current-buffer' with CANDIDATE.
-See `helm-ediff-marked-buffers'."
-  (helm-ediff-marked-buffers candidate t))
-
-(defun helm-multi-occur-as-action (_candidate)
-  "Multi occur action for `helm-source-buffers-list'.
-Can be used by any source that list buffers."
-  (let ((helm-moccur-always-search-in-current
-         (if helm-current-prefix-arg
-             (not helm-moccur-always-search-in-current)
-           helm-moccur-always-search-in-current))
-        (buffers (helm-marked-candidates))
-        (input (cl-loop for i in (split-string helm-pattern " " t)
-                     thereis (and (string-match "\\`@\\(.*\\)" i)
-                                  (match-string 1 i)))))
-    (helm-multi-occur-1 buffers input)))
-
-(defun helm-buffers-run-multi-occur ()
-  "Run `helm-multi-occur-as-action' by key."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-multi-occur-as-action)))
-
-(defun helm-buffers-toggle-show-hidden-buffers ()
-  (interactive)
-  (with-helm-alive-p
-    (let ((filter-attrs (helm-attr 'filtered-candidate-transformer
-                                   helm-source-buffers-list)))
-      (if (memq 'helm-shadow-boring-buffers filter-attrs)
-          (helm-attrset 'filtered-candidate-transformer
-                        (cons 'helm-skip-boring-buffers
-                              (remove 'helm-shadow-boring-buffers
-                                      filter-attrs))
-                        helm-source-buffers-list t)
-        (helm-attrset 'filtered-candidate-transformer
-                      (cons 'helm-shadow-boring-buffers
-                            (remove 'helm-skip-boring-buffers
-                                    filter-attrs))
-                      helm-source-buffers-list t))
-      (helm-force-update))))
-
-
-;;; Candidate Transformers
-;;
-;;
-(defun helm-skip-boring-buffers (buffers _source)
-  (helm-skip-entries buffers helm-boring-buffer-regexp-list))
-
-(defun helm-shadow-boring-buffers (buffers _source)
-  "Buffers matching `helm-boring-buffer-regexp' will be
-displayed with the `file-name-shadow' face if available."
-  (helm-shadow-entries buffers helm-boring-buffer-regexp-list))
-
-
-(define-helm-type-attribute 'buffer
-  `((action
-     . ,(helm-make-actions
-         "Switch to buffer" 'switch-to-buffer
-         (lambda () (and (locate-library "popwin") "Switch to buffer in popup window"))
-         'popwin:popup-buffer
-         "Switch to buffer other window `C-c o'" 'switch-to-buffer-other-window
-         "Switch to buffer other frame `C-c C-o'" 'switch-to-buffer-other-frame
-         (lambda () (and (locate-library "elscreen") "Display buffer in Elscreen"))
-         'helm-find-buffer-on-elscreen
-         "Query replace regexp `C-M-%'" 'helm-buffer-query-replace-regexp
-         "Query replace `M-%'" 'helm-buffer-query-replace
-         "View buffer" 'view-buffer
-         "Display buffer" 'display-buffer
-         "Grep buffers `M-g s' (C-u grep all buffers)" 'helm-zgrep-buffers
-         "Multi occur buffer(s) `C-s'" 'helm-multi-occur-as-action
-         "Revert buffer(s) `M-U'" 'helm-revert-marked-buffers
-         "Insert buffer" 'insert-buffer
-         "Kill buffer(s) `M-D'" 'helm-kill-marked-buffers
-         "Diff with file" 'diff-buffer-with-file
-         "Ediff Marked buffers `C-c ='" 'helm-ediff-marked-buffers
-         "Ediff Merge marked buffers `M-='" (lambda (candidate)
-                                              (helm-ediff-marked-buffers candidate t))))
-    (persistent-help . "Show this buffer")
-    (filtered-candidate-transformer helm-skip-boring-buffers
-                                    helm-buffers-sort-transformer
-                                    helm-highlight-buffers))
-  "Buffer or buffer name.")
-
-;;;###autoload
-(defun helm-buffers-list ()
-  "Preconfigured `helm' to list buffers."
-  (interactive)
-  (unless helm-source-buffers-list
-    (setq helm-source-buffers-list
-          (helm-make-source "Buffers" 'helm-source-buffers)))
-  (helm :sources '(helm-source-buffers-list
-                   helm-source-ido-virtual-buffers
-                   helm-source-buffer-not-found)
-        :buffer "*helm buffers*"
-        :keymap helm-buffer-map
-        :truncate-lines helm-buffers-truncate-lines))
-
-;;;###autoload
-(defun helm-mini ()
-  "Preconfigured `helm' lightweight version \(buffer -> recentf\)."
-  (interactive)
-  (require 'helm-files)
-  (unless helm-source-buffers-list
-    (setq helm-source-buffers-list
-          (helm-make-source "Buffers" 'helm-source-buffers)))
-  (helm :sources helm-mini-default-sources
-        :buffer "*helm mini*"
-        :ff-transformer-show-only-basename nil
-        :truncate-lines helm-buffers-truncate-lines))
-
-(provide 'helm-buffers)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-buffers.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-color.el b/emacs.d/elpa/helm-20150623.1310/helm-color.el
deleted file mode 100644
index 7707c5d..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-color.el
+++ /dev/null
@@ -1,160 +0,0 @@
-;;; helm-color.el --- colors and faces -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-
-;;; Customize Face
-;;
-;;
-(defun helm-custom-faces-init ()
-  "Initialize buffer for `helm-source-customize-face'."
-  (unless (helm-candidate-buffer)
-    (save-selected-window
-      (list-faces-display)
-      (message nil))
-    (helm-init-candidates-in-buffer
-        'global
-      (with-current-buffer (get-buffer "*Faces*")
-        (buffer-substring
-         (next-single-char-property-change (point-min) 'face)
-         (point-max))))
-    (kill-buffer "*Faces*")))
-
-(defvar helm-source-customize-face
-  (helm-build-in-buffer-source "Customize Face"
-    :init 'helm-custom-faces-init
-    :get-line 'buffer-substring
-    :action '(("Customize"
-               . (lambda (line)
-                   (customize-face (intern (car (split-string line))))))
-              ("Copy name"
-               . (lambda (line)
-                   (kill-new (car (split-string line " " t)))))))
-  "See (info \"(emacs)Faces\")")
-
-;;; Colors browser
-;;
-;;
-(defun helm-colors-init ()
-  (unless (helm-candidate-buffer)
-    (save-selected-window
-      (list-colors-display)
-      (message nil))
-    (helm-init-candidates-in-buffer
-        'global
-      (with-current-buffer (get-buffer "*Colors*")
-        (buffer-string)))
-    (kill-buffer "*Colors*")))
-
-(defun helm-color-insert-name (candidate)
-  (with-helm-current-buffer
-    (insert (helm-colors-get-name candidate))))
-
-(defun helm-color-kill-name (candidate)
-  (kill-new (helm-colors-get-name candidate)))
-
-(defun helm-color-insert-rgb (candidate)
-  (with-helm-current-buffer
-    (insert (helm-colors-get-rgb candidate))))
-
-(defun helm-color-kill-rgb (candidate)
-  (kill-new (helm-colors-get-rgb candidate)))
-
-(defun helm-color-run-insert-name ()
-  "Insert name of color from `helm-source-colors'"
-  (interactive)
-  (with-helm-alive-p (helm-quit-and-execute-action 'helm-color-insert-name)))
-
-(defun helm-color-run-kill-name ()
-  "Kill name of color from `helm-source-colors'"
-  (interactive)
-  (with-helm-alive-p (helm-quit-and-execute-action 'helm-color-kill-name)))
-
-(defun helm-color-run-insert-rgb ()
-  "Insert RGB of color from `helm-source-colors'"
-  (interactive)
-  (with-helm-alive-p (helm-quit-and-execute-action 'helm-color-insert-rgb)))
-
-(defun helm-color-run-kill-rgb ()
-  "Kill RGB of color from `helm-source-colors'"
-  (interactive)
-  (with-helm-alive-p (helm-quit-and-execute-action 'helm-color-kill-rgb)))
-
-(defvar helm-color-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c n") 'helm-color-run-insert-name)
-    (define-key map (kbd "C-c N") 'helm-color-run-kill-name)
-    (define-key map (kbd "C-c r") 'helm-color-run-insert-rgb)
-    (define-key map (kbd "C-c R") 'helm-color-run-kill-rgb)
-    (define-key map (kbd "C-c ?") 'helm-color-help)
-    map))
-
-(defvar helm-source-colors
-  (helm-build-in-buffer-source "Colors"
-    :init 'helm-colors-init
-    :get-line 'buffer-substring
-    :keymap helm-color-map
-    :persistent-help "Kill entry in RGB format."
-    :persistent-action 'helm-color-kill-rgb
-    :mode-line 'helm-color-mode-line-string
-    :action
-    '(("Copy Name (C-c N)" . helm-color-kill-name)
-      ("Copy RGB (C-c R)" . helm-color-kill-rgb)
-      ("Insert Name (C-c n)" . helm-color-insert-name)
-      ("Insert RGB (C-c r)" . helm-color-insert-rgb))))
-
-(defun helm-colors-get-name (candidate)
-  "Get color name."
-  (replace-regexp-in-string
-   " " ""
-   (with-temp-buffer
-     (insert (capitalize candidate))
-     (goto-char (point-min))
-     (search-forward-regexp "\\s-\\{2,\\}")
-     (delete-region (point) (point-max))
-     (buffer-string))))
-
-(defun helm-colors-get-rgb (candidate)
-  "Get color RGB."
-  (replace-regexp-in-string
-   " " ""
-   (with-temp-buffer
-     (insert (capitalize candidate))
-     (goto-char (point-max))
-     (search-backward-regexp "\\s-\\{2,\\}")
-     (delete-region (point) (point-min))
-     (buffer-string))))
-
-;;;###autoload
-(defun helm-colors ()
-  "Preconfigured `helm' for color."
-  (interactive)
-  (helm :sources '(helm-source-colors helm-source-customize-face)
-        :buffer "*helm colors*"))
-
-(provide 'helm-color)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-color.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-command.el b/emacs.d/elpa/helm-20150623.1310/helm-command.el
deleted file mode 100644
index 06b395b..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-command.el
+++ /dev/null
@@ -1,272 +0,0 @@
-;;; helm-command.el --- Helm execute-exended-command. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-mode)
-(require 'helm-elisp)
-
-
-(defgroup helm-command nil
-  "Emacs command related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-M-x-requires-pattern 0
-  "Value of requires-pattern for `helm-M-x'.
-Show all candidates on startup when 0 (default)."
-  :group 'helm-command
-  :type 'boolean)
-
-(defcustom helm-M-x-always-save-history nil
-  "`helm-M-x' Save command in `extended-command-history' even when it fail."
-  :group 'helm-command
-  :type  'boolean)
-
-(defcustom helm-M-x-reverse-history nil
-  "The history source of `helm-M-x' appear in second position when non--nil."
-  :group 'helm-command
-  :type 'boolean)
-
-(defcustom helm-M-x-fuzzy-match nil
-  "Enable fuzzy matching in `helm-M-x' when non--nil.")
-
-
-;;; Faces
-;;
-;;
-(defgroup helm-command-faces nil
-  "Customize the appearance of helm-command."
-  :prefix "helm-"
-  :group 'helm-command
-  :group 'helm-faces)
-
-(defface helm-M-x-key '((t (:foreground "orange" :underline t)))
-  "Face used in helm-M-x to show keybinding."
-  :group 'helm-command-faces)
-
-
-(defvar helm-M-x-input-history nil)
-
-(defvar helm-M-x-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?") 'helm-M-x-help)
-    map)
-  "Keymap for `helm-M-x'.")
-
-
-(cl-defun helm-M-x-get-major-mode-command-alist (mode-map)
-  "Return alist of MODE-MAP."
-  (cl-loop for key being the key-seqs of mode-map using (key-bindings com)
-        for str-key  = (key-description key)
-        for ismenu   = (string-match "<menu-bar>" str-key)
-        unless ismenu collect (cons str-key com)))
-
-(defun helm-get-mode-map-from-mode (mode)
-  "Guess the mode-map name according to MODE.
-Some modes don't use conventional mode-map name
-so we need to guess mode-map name. e.g python-mode ==> py-mode-map.
-Return nil if no mode-map found."
-  (cl-loop ;; Start with a conventional mode-map name.
-        with mode-map    = (intern-soft (format "%s-map" mode))
-        with mode-string = (symbol-name mode)
-        with mode-name   = (replace-regexp-in-string "-mode" "" mode-string)
-        while (not mode-map)
-        for count downfrom (length mode-name)
-        ;; Return when no result after parsing entire string.
-        when (eq count 0) return nil
-        for sub-name = (substring mode-name 0 count)
-        do (setq mode-map (intern-soft (format "%s-map" (concat sub-name "-mode"))))
-        finally return mode-map))
-
-(defun helm-M-x-current-mode-map-alist ()
-  "Return mode-map alist of current `major-mode'."
-  (let ((map (helm-get-mode-map-from-mode major-mode)))
-    (when (and map (boundp map))
-      (helm-M-x-get-major-mode-command-alist (symbol-value map)))))
-
-
-(defun helm-M-x-transformer-1 (candidates &optional sort)
-  "Transformer function to show bindings in emacs commands.
-Show global bindings and local bindings according to current `major-mode'.
-If SORT is non nil sort list with `helm-generic-sort-fn'.
-Note that SORT should not be used when fuzzy matching because
-fuzzy matching is running its own sort function with a different algorithm."
-  (with-helm-current-buffer
-    (cl-loop with local-map = (helm-M-x-current-mode-map-alist)
-          for cand in candidates
-          for local-key  = (car (rassq cand local-map))
-          for key        = (substitute-command-keys (format "\\[%s]" cand))
-          collect
-          (cons (cond ((and (string-match "^M-x" key) local-key)
-                       (format "%s (%s)"
-                               cand (propertize
-                                     local-key
-                                     'face 'helm-M-x-key)))
-                      ((string-match "^M-x" key) cand)
-                      (t (format "%s (%s)"
-                                 cand (propertize
-                                       key
-                                       'face 'helm-M-x-key))))
-                cand)
-          into ls
-          finally return
-          (if sort (sort ls #'helm-generic-sort-fn) ls))))
-
-(defun helm-M-x-transformer (candidates _source)
-  "Transformer function for `helm-M-x' candidates."
-  (helm-M-x-transformer-1 candidates (null helm--in-fuzzy)))
-
-(defun helm-M-x-transformer-hist (candidates _source)
-  "Transformer function for `helm-M-x' candidates."
-  (helm-M-x-transformer-1 candidates))
-
-(defun helm-M-x--notify-prefix-arg ()
-  ;; Notify a prefix-arg set AFTER calling M-x.
-  (when prefix-arg
-    (with-helm-window
-      (helm-display-mode-line (helm-get-current-source) 'force))))
-
-(defun helm-cmd--get-current-function-name ()
-  (save-excursion
-    (beginning-of-defun)
-    (cadr (split-string (buffer-substring-no-properties
-                         (point-at-bol) (point-at-eol))))))
-
-(defun helm-cmd--get-preconfigured-commands (helm-directory)
-  (cl-loop with results
-           for f in (directory-files helm-directory t ".*\\.el\\'")
-           do (with-current-buffer (find-file-noselect f)
-                (save-excursion
-                  (goto-char (point-min))
-                  (while (re-search-forward "Preconfigured helm" nil t)
-                    (push (helm-cmd--get-current-function-name) results))))
-           finally return results))
-
-(defun helm-M-x-read-extended-command (&optional collection history)
-  "Read command name to invoke in `helm-M-x'.
-Helm completion is not provided when executing or defining
-kbd macros.
-Optional arg COLLECTION is to allow using another COLLECTION
-than the default which is OBARRAY."
-  (if (or defining-kbd-macro executing-kbd-macro)
-      (if helm-mode
-          (unwind-protect
-               (progn
-                 (helm-mode -1)
-                 (read-extended-command))
-            (helm-mode 1))
-          (read-extended-command))
-      (let* (in-help
-             help-cand
-             (orig-fuzzy-sort-fn helm-fuzzy-sort-fn)
-             (helm-fuzzy-sort-fn (lambda (candidates source)
-                                   (funcall orig-fuzzy-sort-fn
-                                            candidates source 'real)))
-             (helm--mode-line-display-prefarg t)
-             (pers-help
-              #'(lambda (candidate)
-                  (let ((hbuf (get-buffer (help-buffer))))
-                    (if (and in-help (string= candidate help-cand)
-                             (null helm-persistent-action-use-special-display))
-                        (progn
-                          ;; When M-x is started from a help buffer,
-                          ;; Don't kill it as it is helm-current-buffer.
-                          (unless (equal hbuf helm-current-buffer)
-                            (kill-buffer hbuf)
-                            (set-window-buffer (get-buffer-window hbuf)
-                                               helm-current-buffer))
-                          (setq in-help nil))
-                        (helm-describe-function candidate)
-                        (setq in-help t))
-                    (setq help-cand candidate))))
-             (tm (run-at-time 1 0.1 'helm-M-x--notify-prefix-arg)))
-        (setq extended-command-history
-              (cl-loop for i in extended-command-history
-                       when (commandp (intern i))
-                       do (set-text-properties 0 (length i) nil i)
-                       and collect i))
-        (unwind-protect
-             (let ((msg "Error: Specifying a prefix arg before calling `helm-M-x'"))
-               (when current-prefix-arg
-                 (ding)
-                 (message "%s" msg)
-                 (while (not (sit-for 1))
-                   (discard-input))
-                 (user-error msg))
-               (setq current-prefix-arg nil)
-               (helm-comp-read
-                "M-x " (or collection obarray)
-                :test 'commandp
-                :requires-pattern helm-M-x-requires-pattern
-                :name "Emacs Commands"
-                :buffer "*helm M-x*"
-                :persistent-action pers-help
-                :persistent-help "Describe this command"
-                :history (or history extended-command-history)
-                :reverse-history helm-M-x-reverse-history
-                :del-input nil
-                :mode-line helm-M-x-mode-line
-                :must-match t
-                :fuzzy helm-M-x-fuzzy-match
-                :nomark t
-                :keymap helm-M-x-map
-                :candidates-in-buffer t
-                :fc-transformer 'helm-M-x-transformer
-                :hist-fc-transformer 'helm-M-x-transformer-hist))
-          (cancel-timer tm)
-          (setq helm--mode-line-display-prefarg nil)))))
-
-;;;###autoload
-(defun helm-M-x (arg &optional command-name)
-  "Preconfigured `helm' for Emacs commands.
-It is `helm' replacement of regular `M-x' `execute-extended-command'.
-
-Unlike regular `M-x' emacs vanilla `execute-extended-command' command,
-the prefix args if needed, are passed AFTER starting `helm-M-x'.
-
-You can get help on each command by persistent action."
-  (interactive (list current-prefix-arg (helm-M-x-read-extended-command)))
-  (let ((sym-com (and (stringp command-name) (intern-soft command-name))))
-    ;; Avoid having `this-command' set to *exit-minibuffer.
-    (setq this-command sym-com
-          ;; Handle C-x z (repeat) Issue #322
-          real-this-command sym-com)
-    ;; If helm-M-x is called with regular emacs completion (kmacro)
-    ;; use the value of arg otherwise use helm-current-prefix-arg.
-    (let ((prefix-arg (or helm-current-prefix-arg arg)))
-      ;; This ugly construct is to save history even on error.
-      (unless helm-M-x-always-save-history
-        (command-execute sym-com 'record))
-      (setq extended-command-history
-            (cons command-name
-                  (delete command-name extended-command-history)))
-      (when helm-M-x-always-save-history
-        (command-execute sym-com 'record)))))
-
-
-(provide 'helm-command)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-command.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-config.el b/emacs.d/elpa/helm-20150623.1310/helm-config.el
deleted file mode 100644
index 58e29e2..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-config.el
+++ /dev/null
@@ -1,169 +0,0 @@
-;;; helm-config.el --- Applications library for `helm.el' -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-
-;;; Require
-;;
-;;
-(require 'helm-aliases)
-(declare-function async-bytecomp-package-mode "ext:async-bytecomp.el")
-(when (require 'async-bytecomp nil t)
-  (and (fboundp 'async-bytecomp-package-mode)
-       (async-bytecomp-package-mode 1)))
-
-
-(defgroup helm-config nil
-  "Various configurations for Helm."
-  :group 'helm)
-
-(defcustom helm-command-prefix-key "C-x c"
-  "The key `helm-command-prefix' is bound to in the global map."
-  :type '(choice (string :tag "Key") (const :tag "no binding"))
-  :group 'helm-config
-  :set
-  (lambda (var key)
-    (when (and (boundp var) (symbol-value var))
-      (define-key (current-global-map)
-          (read-kbd-macro (symbol-value var)) nil))
-    (when key
-      (define-key (current-global-map)
-          (read-kbd-macro key) 'helm-command-prefix))
-    (set var key)))
-
-(defcustom helm-minibuffer-history-key "C-r"
-  "The key `helm-minibuffer-history' is bound to in minibuffer local maps."
-  :type '(choice (string :tag "Key") (const :tag "no binding"))
-  :group 'helm-config
-  :set
-  (lambda (var key)
-    (cl-dolist (map '(minibuffer-local-completion-map
-                      minibuffer-local-filename-completion-map
-                      minibuffer-local-filename-must-match-map ; Emacs 23.1.+
-                      minibuffer-local-isearch-map
-                      minibuffer-local-map
-                      minibuffer-local-must-match-filename-map ; Older Emacsen
-                      minibuffer-local-must-match-map
-                      minibuffer-local-ns-map))
-      (when (and (boundp map) (keymapp (symbol-value map)))
-        (when (and (boundp var) (symbol-value var))
-          (define-key (symbol-value map)
-              (read-kbd-macro (symbol-value var)) nil))
-        (when key
-          (define-key (symbol-value map)
-              (read-kbd-macro key) 'helm-minibuffer-history))))
-    (set var key)))
-
-;;; Command Keymap
-;;
-;;
-(defvar helm-command-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "a")         'helm-apropos)
-    (define-key map (kbd "e")         'helm-etags-select)
-    (define-key map (kbd "l")         'helm-locate)
-    (define-key map (kbd "s")         'helm-surfraw)
-    (define-key map (kbd "r")         'helm-regexp)
-    (define-key map (kbd "m")         'helm-man-woman)
-    (define-key map (kbd "t")         'helm-top)
-    (define-key map (kbd "/")         'helm-find)
-    (define-key map (kbd "i")         'helm-semantic-or-imenu)
-    (define-key map (kbd "I")         'helm-imenu-in-all-buffers)
-    (define-key map (kbd "<tab>")     'helm-lisp-completion-at-point)
-    (define-key map (kbd "p")         'helm-list-emacs-process)
-    (define-key map (kbd "C-x r b")   'helm-filtered-bookmarks)
-    (define-key map (kbd "M-y")       'helm-show-kill-ring)
-    (define-key map (kbd "C-c <SPC>") 'helm-all-mark-rings)
-    (define-key map (kbd "C-x C-f")   'helm-find-files)
-    (define-key map (kbd "f")         'helm-multi-files)
-    (define-key map (kbd "C-:")       'helm-eval-expression-with-eldoc)
-    (define-key map (kbd "C-,")       'helm-calcul-expression)
-    (define-key map (kbd "M-x")       'helm-M-x)
-    (define-key map (kbd "M-s o")     'helm-occur)
-    (define-key map (kbd "M-g s")     'helm-do-grep)
-    (define-key map (kbd "c")         'helm-colors)
-    (define-key map (kbd "F")         'helm-select-xfont)
-    (define-key map (kbd "8")         'helm-ucs)
-    (define-key map (kbd "C-c f")     'helm-recentf)
-    (define-key map (kbd "C-c g")     'helm-google-suggest)
-    (define-key map (kbd "h i")       'helm-info-at-point)
-    (define-key map (kbd "h r")       'helm-info-emacs)
-    (define-key map (kbd "h g")       'helm-info-gnus)
-    (define-key map (kbd "C-x C-b")   'helm-buffers-list)
-    (define-key map (kbd "C-x r i")   'helm-register)
-    (define-key map (kbd "C-c C-x")   'helm-run-external-command)
-    (define-key map (kbd "b")         'helm-resume)
-    (define-key map (kbd "M-n")       'helm-gid)
-    (define-key map (kbd "@")         'helm-list-elisp-packages)
-    map))
-
-;; Don't override the keymap we just defined with an empty
-;; keymap.  This also protect bindings changed by the user.
-(defvar helm-command-prefix)
-(define-prefix-command 'helm-command-prefix)
-(fset 'helm-command-prefix helm-command-map)
-(setq  helm-command-prefix helm-command-map)
-
-
-;;; Menu
-
-(require 'helm-easymenu)
-
-
-;;;###autoload
-(defun helm-configuration ()
-  "Customize `helm'."
-  (interactive)
-  (customize-group "helm"))
-
-
-;;; Fontlock
-(cl-dolist (mode '(emacs-lisp-mode lisp-interaction-mode))
-  (font-lock-add-keywords
-   mode
-   '(("(\\<\\(with-helm-after-update-hook\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-temp-hook\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-window\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-quittable\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-current-buffer\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-buffer\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-show-completion\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-default-directory\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-display-same-window\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(with-helm-restore-variables\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(define-helm-type-attribute\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(helm-multi-key-defun\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(helm-while-no-input\\)\\>" 1 font-lock-keyword-face)
-     ("(\\<\\(helm-aif\\)\\>" 1 font-lock-keyword-face))))
-
-
-;;; Load the autoload file
-;;  It should have been generated either by
-;;  package.el or the make file.
-
-(load "helm-autoloads" nil t)
-
-(provide 'helm-config)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-config.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-dabbrev.el b/emacs.d/elpa/helm-20150623.1310/helm-dabbrev.el
deleted file mode 100644
index 08b525b..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-dabbrev.el
+++ /dev/null
@@ -1,355 +0,0 @@
-;;; helm-dabbrev.el --- Helm implementation of dabbrev. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'helm)
-(require 'helm-elisp) ; For show-completion.
-
-(defgroup helm-dabbrev nil
-  "Dabbrev related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-dabbrev-always-search-all t
-  "Always search in all buffers when non--nil.
-Note that even if nil, a search in all buffers
-will occur if the length of candidates is <= than
-`helm-dabbrev-max-length-result'."
-  :group 'helm-dabbrev
-  :type 'boolean)
-
-(defcustom helm-dabbrev-max-length-result 20
-  "Max length of candidates before searching in all buffers.
-If number of candidates found in current-buffer is <= to this,
-search in all buffers.
-Have no effect when `helm-dabbrev-always-search-all' is non--nil."
-  :group 'helm-dabbrev
-  :type 'integer)
-
-(defcustom helm-dabbrev-ignored-buffers-regexps
-  '("\\*helm" "\\*Messages" "\\*Echo Area" "\\*Buffer List")
-  "List of regexps matching names of buffers that helm-dabbrev should not check."
-  :group 'helm-dabbrev
-  :type '(repeat regexp))
-
-(defcustom helm-dabbrev-related-buffer-fn #'helm-dabbrev--same-major-mode-p
-  "A function that decide if a buffer to search in is related to `current-buffer'.
-This is actually determined by comparing `major-mode' of the buffer to search
-and the `current-buffer'.
-The function take one arg, the buffer which is current, look at
-`helm-dabbrev--same-major-mode-p' for example.
-
-When nil all buffers are considered related to `current-buffer'."
-  :group 'helm-dabbrev
-  :type 'function)
-
-(defcustom helm-dabbrev-major-mode-assoc
-  '((emacs-lisp-mode . lisp-interaction-mode))
-  "Major mode association alist.
-This allow helm-dabbrev searching in buffers with the associated `major-mode'.
-e.g \(emacs-lisp-mode . lisp-interaction-mode\)
-will allow searching in the lisp-interaction-mode buffer when `current-buffer'
-is an `emacs-lisp-mode' buffer and vice versa i.e
-no need to provide \(lisp-interaction-mode . emacs-lisp-mode\) association.
-
-When nil check is the searched buffer have same `major-mode'
-than the `current-buffer'.
-This have no effect when `helm-dabbrev-related-buffer-fn' is nil or of course
-bound to a function that doesn't handle this var."
-  :type '(alist :key-type symbol :value-type symbol)
-  :group 'helm-dabbrev)
-
-(defcustom helm-dabbrev-lineno-around 30
-  "Search first in this number of lines before an after point."
-  :group 'helm-dabbrev
-  :type 'integer)
-
-(defcustom helm-dabbrev-cycle-threshold nil
-  "Number of time helm-dabbrev cycle before displaying helm completion.
-When nil or 0 disable cycling."
-  :group 'helm-dabbrev
-  :type '(choice (const :tag "Cycling disabled" nil) integer))
-
-(defcustom helm-dabbrev-case-fold-search 'smart
-  "Set `case-fold-search' in `helm-dabbrev'.
-Same as `helm-case-fold-search' but for `helm-dabbrev'.
-Note that this is not affecting searching in helm buffer,
-but the initial search for all candidates in buffer(s)."
-  :group 'helm-dabbrev
-  :type '(choice (const :tag "Ignore case" t)
-          (const :tag "Respect case" nil)
-          (other :tag "Smart" 'smart)))
-
-
-(defvar helm-dabbrev-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-/") 'helm-next-line)
-    (define-key map (kbd "M-:") 'helm-previous-line)
-    map))
-
-;; Internal
-(defvar helm-dabbrev--exclude-current-buffer-flag nil)
-(defvar helm-dabbrev--cache nil)
-(defvar helm-dabbrev--data nil)
-(defvar helm-dabbrev--regexp "\\s-\\|\t\\|[(\[\{\"'`=<$;.]\\|\\s\\\\|^")
-(cl-defstruct helm-dabbrev-info dabbrev limits iterator)
-
-
-(defun helm-dabbrev--buffer-list ()
-  (cl-loop with lst = (buffer-list)
-        for buf in (if helm-dabbrev--exclude-current-buffer-flag
-                       (cdr lst) lst)
-        unless (cl-loop for r in helm-dabbrev-ignored-buffers-regexps
-                     thereis (string-match r (buffer-name buf)))
-        collect buf))
-
-(defun helm-dabbrev--same-major-mode-p (start-buffer)
-  ;; START-BUFFER is the current-buffer where we start searching.
-  ;; Determine the major-mode of START-BUFFER as `cur-maj-mode'.
-  ;; Each time the loop go in another buffer we try to find if its
-  ;; `major-mode' is:
-  ;; - same as the `cur-maj-mode'
-  ;; - derived from `cur-maj-mode'
-  ;; - have an assoc entry (major-mode . cur-maj-mode)
-  ;; - have an rassoc entry (cur-maj-mode . major-mode)
-  ;; - check if one of these entries inherit from another one in
-  ;;   `helm-dabbrev-major-mode-assoc'.
-  (let* ((cur-maj-mode  (with-current-buffer start-buffer major-mode))
-         (c-assoc-mode  (assq cur-maj-mode helm-dabbrev-major-mode-assoc))
-         (c-rassoc-mode (rassq cur-maj-mode helm-dabbrev-major-mode-assoc))
-         (o-assoc-mode  (assq major-mode helm-dabbrev-major-mode-assoc))
-         (o-rassoc-mode (rassq major-mode helm-dabbrev-major-mode-assoc))
-         (cdr-c-assoc-mode (cdr c-assoc-mode))
-         (cdr-o-assoc-mode (cdr o-assoc-mode)))
-    (or (eq major-mode cur-maj-mode)
-        (derived-mode-p cur-maj-mode)
-        (or (eq cdr-c-assoc-mode major-mode)
-            (eq (car c-rassoc-mode) major-mode)
-            (eq (cdr (assq cdr-c-assoc-mode helm-dabbrev-major-mode-assoc))
-                major-mode)
-            (eq (car (rassq cdr-c-assoc-mode helm-dabbrev-major-mode-assoc))
-                major-mode))
-        (or (eq cdr-o-assoc-mode cur-maj-mode)
-            (eq (car o-rassoc-mode) cur-maj-mode)
-            (eq (cdr (assq cdr-o-assoc-mode helm-dabbrev-major-mode-assoc))
-                cur-maj-mode)
-            (eq (car (rassq cdr-o-assoc-mode helm-dabbrev-major-mode-assoc))
-                cur-maj-mode)))))
-
-(defun helm-dabbrev--collect (str limit ignore-case all)
-  (let* ((case-fold-search ignore-case)
-         (buffer1 (current-buffer)) ; start buffer.
-         (minibuf (minibufferp buffer1))
-         result pos-before pos-after
-         (search-and-store
-          #'(lambda (pattern direction)
-              (while (cl-case direction
-                       (1   (search-forward pattern nil t))
-                       (-1  (search-backward pattern nil t))
-                       (2   (let ((pos
-                                   (save-excursion
-                                     (forward-line
-                                      helm-dabbrev-lineno-around)
-                                     (point))))
-                              (setq pos-after pos)
-                              (search-forward pattern pos t)))
-                       (-2  (let ((pos
-                                   (save-excursion
-                                     (forward-line
-                                      (- helm-dabbrev-lineno-around))
-                                     (point))))
-                              (setq pos-before pos)
-                              (search-backward pattern pos t))))
-                (let* ((replace-regexp (concat "\\(" helm-dabbrev--regexp "\\)\\'"))
-                       (match-1 (helm-aif (thing-at-point 'symbol)
-                                    ;; `thing-at-point' returns
-                                    ;; the quote outside of e-lisp mode,
-                                    ;; e.g in message mode,
-                                    ;; `foo' => foo'
-                                    ;; but in e-lisp like modes:
-                                    ;; `foo' => foo
-                                    ;; so remove it [1].
-                                    (replace-regexp-in-string
-                                     replace-regexp
-                                     "" (substring-no-properties it))))
-                       (match-2 (helm-aif (thing-at-point 'filename)
-                                    ;; Same as in [1].
-                                    (replace-regexp-in-string
-                                     replace-regexp
-                                     "" (substring-no-properties it))))
-                       (lst (if (string= match-1 match-2)
-                                (list match-1)
-                              (list match-1 match-2))))
-                  (cl-loop for match in lst
-                        unless (or (string= str match)
-                                   (member match result))
-                        do (push match result)))))))
-    (cl-loop for buf in (if all (helm-dabbrev--buffer-list)
-                          (list (current-buffer)))
-          
-          do (with-current-buffer buf
-               (when (or minibuf ; check against all buffers when in minibuffer.
-                         (if helm-dabbrev-related-buffer-fn
-                             (funcall helm-dabbrev-related-buffer-fn buffer1)
-                             t))
-                 (save-excursion
-                   ;; Start searching before thing before point.
-                   (goto-char (- (point) (length str)))
-                   ;; Search the last 30 lines before point.
-                   (funcall search-and-store str -2)) ; store pos [1]
-                 (save-excursion
-                   ;; Search the next 30 lines after point.
-                   (funcall search-and-store str 2)) ; store pos [2]
-                 (save-excursion
-                   ;; Search all before point.
-                   (goto-char pos-before) ; start from [1]
-                   (funcall search-and-store str -1))
-                 (save-excursion
-                   ;; Search all after point.
-                   (goto-char pos-after) ; start from [2]
-                   (funcall search-and-store str 1))))
-          when (> (length result) limit) return (nreverse result)
-          finally return (nreverse result))))
-
-(defun helm-dabbrev--get-candidates (abbrev)
-  (cl-assert abbrev nil "[No Match]")
-  (with-current-buffer (current-buffer)
-    (let* ((dabbrev-get #'(lambda (str all-bufs)
-                            (helm-dabbrev--collect
-                             str helm-candidate-number-limit
-                             (cl-case helm-dabbrev-case-fold-search
-                               (smart (helm-set-case-fold-search-1 abbrev))
-                               (t helm-dabbrev-case-fold-search))
-                             all-bufs)))
-           (lst (funcall dabbrev-get abbrev helm-dabbrev-always-search-all)))
-      (if (and (not helm-dabbrev-always-search-all)
-               (<= (length lst) helm-dabbrev-max-length-result))
-          ;; Search all but don't recompute current-buffer.
-          (let ((helm-dabbrev--exclude-current-buffer-flag t))
-            (append lst (funcall dabbrev-get abbrev 'all-bufs)))
-        lst))))
-
-(defun helm-dabbrev-default-action (candidate)
-  (with-helm-current-buffer
-    (let* ((limits (helm-bounds-of-thing-before-point
-                    helm-dabbrev--regexp))
-           (beg (car limits))
-           (end (point)))
-      (run-with-timer
-       0.01 nil
-       'helm-insert-completion-at-point
-       beg end candidate))))
-
-;;;###autoload
-(defun helm-dabbrev ()
-  "Preconfigured helm for dynamic abbreviations."
-  (interactive)
-  (let ((dabbrev (helm-thing-before-point nil helm-dabbrev--regexp))
-        (limits (helm-bounds-of-thing-before-point helm-dabbrev--regexp))
-        (enable-recursive-minibuffers t)
-        (cycling-disabled-p (or (null helm-dabbrev-cycle-threshold)
-                                (zerop helm-dabbrev-cycle-threshold)))
-        (helm-execute-action-at-once-if-one t)
-        (helm-quit-if-no-candidate
-         #'(lambda ()
-             (message "[Helm-dabbrev: No expansion found]"))))
-    (cl-assert (and (stringp dabbrev) (not (string= dabbrev "")))
-               nil "[Helm-dabbrev: Nothing found before point]")
-    (when (and
-           ;; have been called at least once.
-           (helm-dabbrev-info-p helm-dabbrev--data)
-           ;; But user have moved with some other command
-           ;; in the meaning time.
-           (not (eq last-command 'helm-dabbrev)))
-      (setq helm-dabbrev--data nil))
-    (when cycling-disabled-p
-      (setq helm-dabbrev--cache (helm-dabbrev--get-candidates dabbrev)))
-    (unless (or cycling-disabled-p
-                (helm-dabbrev-info-p helm-dabbrev--data))
-      (setq helm-dabbrev--cache (helm-dabbrev--get-candidates dabbrev))
-      (setq helm-dabbrev--data
-            (make-helm-dabbrev-info
-             :dabbrev dabbrev
-             :limits limits
-             :iterator
-             (helm-iter-list
-              (cl-loop for i in helm-dabbrev--cache when
-                       (and i (string-match
-                               (concat "^" (regexp-quote dabbrev)) i))
-                       collect i into selection
-                       when (and selection
-                                 (= (length selection)
-                                    helm-dabbrev-cycle-threshold))
-                       ;; When selection len reach
-                       ;; `helm-dabbrev-cycle-threshold'
-                       ;; return selection.
-                       return selection
-                       ;; selection len never reach
-                       ;; `helm-dabbrev-cycle-threshold'
-                       ;; return selection.
-                       finally return selection)))))
-    (let ((iter (and (helm-dabbrev-info-p helm-dabbrev--data)
-                     (helm-dabbrev-info-iterator helm-dabbrev--data)))
-          deactivate-mark)
-      ;; Cycle until iterator is consumed.
-      (helm-aif (and iter (helm-iter-next iter))
-          (progn
-            (helm-insert-completion-at-point
-             (car (helm-dabbrev-info-limits helm-dabbrev--data))
-             (cdr limits) it)
-            ;; Move already tried candidates to end of list.
-            (setq helm-dabbrev--cache (append (remove it helm-dabbrev--cache)
-                                              (list it))))
-        ;; If the length of candidates is only one when computed
-        ;; that's mean the unique matched item have already been
-        ;; inserted by the iterator, so no need to reinsert the old dabbrev,
-        ;; just let helm exiting with "No expansion found".
-        (let ((old-dabbrev (if (helm-dabbrev-info-p helm-dabbrev--data)
-                               (helm-dabbrev-info-dabbrev helm-dabbrev--data)
-                               dabbrev)))
-          (unless (cdr (all-completions old-dabbrev helm-dabbrev--cache))
-            (setq cycling-disabled-p t))
-          ;; Iterator is now empty, reset dabbrev to initial value
-          ;; and start helm completion.
-          (unless cycling-disabled-p
-            (setq dabbrev old-dabbrev
-                  limits  (helm-dabbrev-info-limits helm-dabbrev--data))
-            (setq helm-dabbrev--data nil)
-            (delete-region (car limits) (point))
-            (insert dabbrev))
-          (with-helm-show-completion (car limits) (cdr limits)
-            (helm :sources (helm-build-in-buffer-source "Dabbrev Expand"
-                             :data helm-dabbrev--cache
-                             :persistent-action 'ignore
-                             :persistent-help "DoNothing"
-                             :keymap helm-dabbrev-map
-                             :action 'helm-dabbrev-default-action)
-                  :buffer "*helm dabbrev*"
-                  :input (concat "^" dabbrev " ")
-                  :resume 'noresume
-                  :allow-nest t)))))))
-
-(provide 'helm-dabbrev)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-dabbrev.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-easymenu.el b/emacs.d/elpa/helm-20150623.1310/helm-easymenu.el
deleted file mode 100644
index 23f263b..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-easymenu.el
+++ /dev/null
@@ -1,89 +0,0 @@
-;;; helm-easymenu.el --- Helm easymenu definitions. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'easymenu)
-
-(easy-menu-add-item
- nil '("Tools")
- '("Helm"
-   ["Find any Files/Buffers" helm-multi-files t]
-   ["Helm Everywhere (Toggle)" helm-mode t]
-   ["Helm resume" helm-resume t]
-   "----"
-   ("Files"
-    ["Find files" helm-find-files t]
-    ["Recent Files" helm-recentf t]
-    ["Locate" helm-locate t]
-    ["Search Files with find" helm-find t]
-    ["Bookmarks" helm-filtered-bookmarks t])
-   ("Buffers"
-    ["Find buffers" helm-buffers-list t])
-   ("Commands"
-    ["Emacs Commands" helm-M-x t]
-    ["Externals Commands" helm-run-external-command t])
-   ("Help"
-    ["Helm Apropos" helm-apropos t])
-   ("Info"
-    ["Info at point" helm-info-at-point t]
-    ["Emacs Manual index" helm-info-emacs t]
-    ["Gnus Manual index" helm-info-gnus t])
-   ("Org"
-    ["Org keywords" helm-org-keywords t]
-    ["Org headlines" helm-org-headlines t])
-   ("Elpa"
-    ["Elisp packages" helm-list-elisp-packages t]
-    ["Elisp packages no fetch" helm-list-elisp-packages-no-fetch t])
-   ("Tools"
-    ["Occur" helm-occur t]
-    ["Grep" helm-do-grep t]
-    ["Gid"  helm-gid t]
-    ["Etags" helm-etags-select t]
-    ["Lisp complete at point" helm-lisp-completion-at-point t]
-    ["Browse Kill ring" helm-show-kill-ring t]
-    ["Browse register" helm-register t]
-    ["Mark Ring" helm-all-mark-rings t]
-    ["Regexp handler" helm-regexp t]
-    ["Colors & Faces" helm-colors t]
-    ["Show xfonts" helm-select-xfont t]
-    ["Ucs Symbols" helm-ucs t]
-    ["Imenu" helm-imenu t]
-    ["Imenu all" helm-imenu-in-all-buffers t]
-    ["Semantic or Imenu" helm-semantic-or-imenu t]
-    ["Google Suggest" helm-google-suggest t]
-    ["Eval expression" helm-eval-expression-with-eldoc t]
-    ["Calcul expression" helm-calcul-expression t]
-    ["Man pages" helm-man-woman t]
-    ["Top externals process" helm-top t]
-    ["Emacs internals process" helm-list-emacs-process t])
-   "----"
-   ["Preferred Options" helm-configuration t])
- "Spell Checking")
-
-(easy-menu-add-item nil '("Tools") '("----") "Spell Checking")
-
-
-(provide 'helm-easymenu)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-easymenu.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-elisp-package.el b/emacs.d/elpa/helm-20150623.1310/helm-elisp-package.el
deleted file mode 100644
index 32d9514..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-elisp-package.el
+++ /dev/null
@@ -1,369 +0,0 @@
-;;; helm-elisp-package.el --- helm interface for package.el -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'package)
-
-(defgroup helm-el-package nil
-  "helm elisp packages."
-  :group 'helm)
-
-(defcustom helm-el-package-initial-filter 'all
-  "Show only installed, upgraded or all packages at startup."
-  :group 'helm-el-package
-  :type '(radio :tag "Initial filter for elisp packages"
-          (const :tag "Show all packages" all)
-          (const :tag "Show installed packages" installed)
-          (const :tag "Show upgradable packages" upgrade)))
-
-;; internals vars
-(defvar helm-el-package--show-only 'all)
-(defvar helm-el-package--initialized-p nil)
-(defvar helm-el-package--tabulated-list nil)
-(defvar helm-el-package--upgrades nil)
-(defvar helm-el-package--removable-packages nil)
-
-(defun helm-el-package--init ()
-  (when (null package-alist)
-    (setq helm-el-package--show-only 'all))
-  (when (fboundp 'package--removable-packages)
-    (setq helm-el-package--removable-packages
-          (package--removable-packages)))
-  (save-selected-window
-    (list-packages helm-el-package--initialized-p)
-    (setq helm-el-package--initialized-p t)
-    (message nil))
-  (helm-init-candidates-in-buffer
-      'global
-    (with-current-buffer (get-buffer "*Packages*")
-      (setq helm-el-package--tabulated-list tabulated-list-entries)
-      (buffer-string)))
-  (setq helm-el-package--upgrades (helm-el-package-menu--find-upgrades))
-  (if helm-force-updating-p
-      (message "Refreshing packages list done")
-      (setq helm-el-package--show-only helm-el-package-initial-filter))
-  (kill-buffer "*Packages*"))
-
-(defun helm-el-package-describe (candidate)
-  (let ((id (get-text-property 0 'tabulated-list-id candidate)))
-    (describe-package (if (fboundp 'package-desc-name)
-                          (package-desc-name id)
-                        (car id)))))
-
-(defun helm-el-package-visit-homepage (candidate)
-  (let* ((id (get-text-property 0 'tabulated-list-id candidate))
-         (pkg (if (fboundp 'package-desc-name) (package-desc-name id)
-                (car id)))
-         (desc (cadr (assoc pkg package-archive-contents)))
-         (extras (package-desc-extras desc))
-         (url (and (listp extras) (cdr-safe (assoc :url extras)))))
-    (if (stringp url)
-        (browse-url url)
-      (message "Package %s has no homepage"
-               (propertize (symbol-name pkg)
-                           'face 'font-lock-keyword-face)))))
-
-(defun helm-el-run-visit-homepage ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-el-package-visit-homepage)))
-
-(defun helm-el-package-install-1 (pkg-list)
-  (cl-loop with mkd = pkg-list
-        for p in mkd
-        for id = (get-text-property 0 'tabulated-list-id p)
-        do (package-install
-            (if (fboundp 'package-desc-name)
-                (package-desc-name id)
-              (car id)))
-        collect (if (fboundp 'package-desc-full-name)
-                        id
-                      (car id))
-        into installed-list
-        finally do (progn
-                     (when (boundp 'package-selected-packages)
-                       (customize-save-variable
-                        'package-selected-packages
-                        (append (mapcar 'package-desc-name installed-list)
-                                package-selected-packages)))
-                     (if (fboundp 'package-desc-full-name)
-                         (message (format "%d packages installed:\n(%s)"
-                                          (length installed-list)
-                                          (mapconcat #'package-desc-full-name
-                                                     installed-list ", ")))
-                         (message (format "%d packages installed:\n(%s)"
-                                          (length installed-list)
-                                          (mapconcat 'symbol-name installed-list ", ")))))))
-
-(defun helm-el-package-install (_candidate)
-  (helm-el-package-install-1 (helm-marked-candidates)))
-
-(defun helm-el-run-package-install ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-el-package-install)))
-
-(defun helm-el-package-uninstall-1 (pkg-list)
-  (cl-loop with mkd = pkg-list
-        for p in mkd
-        for id = (get-text-property 0 'tabulated-list-id p)
-        do
-        (condition-case-unless-debug err
-            (with-no-warnings
-              (if (fboundp 'package-desc-full-name)
-                  ;; emacs 24.4
-                  (package-delete id)
-                ;; emacs 24.3
-                (package-delete (symbol-name (car id))
-                                (package-version-join (cdr id)))))
-          (error (message (cadr err))))
-        unless (assoc (elt id 1) package-alist)
-        collect (if (fboundp 'package-desc-full-name)
-                        id
-                      (cons (symbol-name (car id))
-                            (package-version-join (cdr id))))
-        into delete-list
-        finally do (if delete-list
-                       (if (fboundp 'package-desc-full-name)
-                           ;; emacs 24.4
-                           (message (format "%d packages deleted:\n(%s)"
-                                            (length delete-list)
-                                            (mapconcat #'package-desc-full-name
-                                                       delete-list ", ")))
-                           ;; emacs 24.3
-                           (message (format "%d packages deleted:\n(%s)"
-                                            (length delete-list)
-                                            (mapconcat (lambda (x)
-                                                         (concat (car x) "-" (cdr x)))
-                                                       delete-list ", ")))
-                           ;; emacs 24.3 doesn't update
-                           ;; its `package-alist' after deleting.
-                           (cl-loop for p in package-alist
-                                    when (assq (symbol-name (car p)) delete-list)
-                                    do (setq package-alist (delete p package-alist))))
-                       "No package deleted")))
-
-(defun helm-el-package-uninstall (_candidate)
-  (helm-el-package-uninstall-1 (helm-marked-candidates)))
-
-(defun helm-el-run-package-uninstall ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-el-package-uninstall)))
-
-(defun helm-el-package-menu--find-upgrades ()
-  (cl-loop for entry in helm-el-package--tabulated-list
-           for pkg-desc = (car entry)
-           for status = (package-desc-status pkg-desc)
-           when (member status '("installed" "unsigned" "dependency"))
-           collect pkg-desc
-           into installed
-           when (member status '("available" "new"))
-           collect (cons (package-desc-name pkg-desc) pkg-desc)
-           into available
-           finally return
-           (cl-loop for pkg in installed
-                    for avail-pkg = (assq (package-desc-name pkg) available)
-                    when (and avail-pkg
-                              (version-list-< (package-desc-version pkg)
-                                              (package-desc-version
-                                               (cdr avail-pkg))))
-                    collect avail-pkg)))
-
-(defun helm-el-package-upgrade-1 (pkg-list)
-  (cl-loop for p in pkg-list
-           for pkg-desc = (car p)
-           for upgrade = (cdr (assq (package-desc-name pkg-desc)
-                                    helm-el-package--upgrades))
-           do
-           (cond ((null upgrade)
-                  (ignore))
-                 ((equal pkg-desc upgrade)
-                  ;;Install.
-                  (package-install pkg-desc))
-                 (t
-                  ;; Delete.
-                  (if (boundp 'package-selected-packages)
-                      (with-no-warnings
-                        (package-delete pkg-desc t t))
-                      (package-delete pkg-desc))))))
-
-(defun helm-el-package-upgrade (_candidate)
-  (helm-el-package-upgrade-1
-   (cl-loop with pkgs = (helm-marked-candidates)
-            for p in helm-el-package--tabulated-list
-            for pkg = (car p)
-            if (member (symbol-name (package-desc-name pkg)) pkgs)
-            collect p)))
-
-(defun helm-el-run-package-upgrade ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-el-package-upgrade)))
-
-(defun helm-el-package-upgrade-all ()
-  (if helm-el-package--upgrades
-      (with-helm-display-marked-candidates
-        helm-marked-buffer-name (mapcar (lambda (x) (symbol-name (car x)))
-                                        helm-el-package--upgrades)
-        (when (y-or-n-p "Upgrade all packages? ")
-          (helm-el-package-upgrade-1 helm-el-package--tabulated-list)))
-      (message "No packages to upgrade actually!")))
-
-(defun helm-el-run-package-upgrade-all ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-el-package-upgrade-all)))
-
-(defun helm-el-package-upgrade-all-action (_candidate)
-  (helm-el-package-upgrade-all))
-
-(defun helm-el-package--transformer (candidates _source)
-  (cl-loop for c in candidates
-           for id = (get-text-property 0 'tabulated-list-id c)
-           for name = (if (fboundp 'package-desc-name)
-                          (package-desc-name id)
-                          (car id))
-           for installed-p = (assq name package-alist)
-           for upgrade-p = (assq name helm-el-package--upgrades)
-           for user-installed-p = (and (boundp 'package-selected-packages)
-                                       (memq name package-selected-packages))
-           do (when user-installed-p (put-text-property 0 2 'display "S " c))
-           do (when (memq name helm-el-package--removable-packages)
-                (put-text-property 0 2 'display "U " c)
-                (put-text-property
-                 2 (+ (length (symbol-name name)) 2)
-                 'face 'font-lock-variable-name-face c))
-           for cand = (cons c (car (split-string c)))
-           when (or (and upgrade-p
-                         (eq helm-el-package--show-only 'upgrade))
-                    (and installed-p
-                         (eq helm-el-package--show-only 'installed))
-                    (and (not installed-p)
-                         (eq helm-el-package--show-only 'uninstalled)) 
-                    (eq helm-el-package--show-only 'all))
-           collect cand))
-
-(defun helm-el-package-show-upgrade ()
-  (interactive)
-  (with-helm-alive-p
-    (setq helm-el-package--show-only 'upgrade)
-    (helm-update)))
-
-(defun helm-el-package-show-installed ()
-  (interactive)
-  (with-helm-alive-p
-    (setq helm-el-package--show-only 'installed)
-    (helm-update)))
-
-(defun helm-el-package-show-all ()
-  (interactive)
-  (with-helm-alive-p
-    (setq helm-el-package--show-only 'all)
-    (helm-update)))
-
-(defun helm-el-package-show-uninstalled ()
-  (interactive)
-  (with-helm-alive-p
-    (setq helm-el-package--show-only 'uninstalled)
-    (helm-update)))
-
-(defvar helm-el-package-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-I")   'helm-el-package-show-installed)
-    (define-key map (kbd "M-O")   'helm-el-package-show-uninstalled)
-    (define-key map (kbd "M-U")   'helm-el-package-show-upgrade)
-    (define-key map (kbd "M-A")   'helm-el-package-show-all)
-    (define-key map (kbd "C-c i") 'helm-el-run-package-install)
-    (define-key map (kbd "C-c r") 'helm-el-run-package-reinstall)
-    (define-key map (kbd "C-c d") 'helm-el-run-package-uninstall)
-    (define-key map (kbd "C-c u") 'helm-el-run-package-upgrade)
-    (define-key map (kbd "C-c U") 'helm-el-run-package-upgrade-all)
-    (define-key map (kbd "C-c @") 'helm-el-run-visit-homepage)
-    (define-key map (kbd "C-c ?") 'helm-el-package-help)
-    map))
-
-(defvar helm-source-list-el-package nil)
-(defclass helm-list-el-package-source (helm-source-in-buffer)
-  ((init :initform 'helm-el-package--init)
-   (get-line :initform 'buffer-substring)
-   (filtered-candidate-transformer :initform 'helm-el-package--transformer)
-   (action-transformer
-    :initform
-    (lambda (actions candidate)
-      (let ((pkg-desc (get-text-property
-                       0 'tabulated-list-id candidate))
-            (acts (if helm-el-package--upgrades
-                      (append actions '(("Upgrade all packages"
-                                         . helm-el-package-upgrade-all-action)))
-                      actions)))
-        (cond ((cdr (assq (package-desc-name pkg-desc)
-                          helm-el-package--upgrades))
-               (append '(("Upgrade package(s)" . helm-el-package-upgrade)) acts))
-              ((package-installed-p (package-desc-name pkg-desc))
-               (append acts '(("Reinstall package(s)" . helm-el-package-reinstall)
-                              ("Uninstall package(s)" . helm-el-package-uninstall))))
-              (t (append acts '(("Install packages(s)" . helm-el-package-install))))))))
-   (mode-line :initform helm-el-package-mode-line)
-   (keymap :initform helm-el-package-map)
-   (update :initform 'helm-el-package--update)
-   (candidate-number-limit :initform 9999)
-   (action :initform '(("Describe package" . helm-el-package-describe)
-                       ("Visit homepage" . helm-el-package-visit-homepage)))))
-
-(defun helm-el-package--update ()
-  (setq helm-el-package--initialized-p nil))
-
-(defun helm-el-package-reinstall (_pkg)
-  (cl-loop for p in (helm-marked-candidates)
-           for pkg-desc = (get-text-property 0 'tabulated-list-id p)
-           for name = (package-desc-name pkg-desc)
-           do (if (fboundp 'package-reinstall)
-                  (package-reinstall name)
-                  (package-delete pkg-desc)
-                  (package-install name))))
-
-(defun helm-el-run-package-reinstall ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-el-package-reinstall)))
-
-;;;###autoload
-(defun helm-list-elisp-packages (arg)
-  "Preconfigured helm for listing and handling emacs packages."
-  (interactive "P")
-  (when arg (setq helm-el-package--initialized-p nil))
-  (unless helm-source-list-el-package
-    (setq helm-source-list-el-package
-          (helm-make-source "list packages" 'helm-list-el-package-source)))
-  (helm :sources 'helm-source-list-el-package
-        :buffer "*helm list packages*"))
-
-;;;###autoload
-(defun helm-list-elisp-packages-no-fetch ()
-  "Preconfigured helm for emacs packages.
-Same as `helm-list-elisp-packages' but don't fetch packages on remote."
-  (interactive)
-  (let ((helm-el-package--initialized-p t))
-    (helm-list-elisp-packages nil)))
-
-(provide 'helm-elisp-package)
-
-;;; helm-elisp-package.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-elisp.el b/emacs.d/elpa/helm-20150623.1310/helm-elisp.el
deleted file mode 100644
index 156b879..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-elisp.el
+++ /dev/null
@@ -1,810 +0,0 @@
-;;; helm-elisp.el --- Elisp symbols completion for helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-info)
-(require 'helm-eval)
-(require 'helm-files)
-(require 'advice)
-
-
-(defgroup helm-elisp nil
-  "Elisp related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-turn-on-show-completion t
-  "Display candidate in buffer while moving selection when non--nil."
-  :group 'helm-elisp
-  :type  'boolean)
-
-(defcustom helm-show-completion-use-special-display t
-  "A special display will be used in lisp completion if non--nil.
-All functions that are wrapped in macro `with-helm-show-completion'
-will be affected."
-  :group 'helm-elisp
-  :type  'boolean)
-
-(defcustom helm-show-completion-min-window-height 7
-  "Minimum completion window height used in show completion.
-This is used in macro `with-helm-show-completion'."
-  :group 'helm-elisp
-  :type  'integer)
-
-(defcustom helm-lisp-quoted-function-list
-  '(funcall apply mapc cl-mapc mapcar cl-mapcar
-    callf callf2 cl-callf cl-callf2 fset
-    fboundp fmakunbound symbol-function)
-  "List of function where quoted function completion happen.
-e.g give only function names after \(funcall '."
-  :group 'helm-elisp
-  :type '(repeat (choice symbol)))
-
-(defcustom helm-lisp-unquoted-function-list
-  '(function defadvice)
-  "List of function where unquoted function completion happen.
-e.g give only function names after \(function ."
-  :group 'helm-elisp
-  :type '(repeat (choice symbol)))
-
-(defcustom helm-apropos-fuzzy-match nil
-  "Enable fuzzy matching for `helm-apropos' when non-nil."
-  :group 'helm-elisp
-  :type 'boolean)
-
-(defcustom helm-lisp-fuzzy-completion nil
-  "Enable fuzzy matching in emacs-lisp completion when non-nil.
-NOTE: This enable fuzzy matching in helm native implementation of
-elisp completion, but not on helmized elisp completion, i.e
-fuzzy completion is not available in `completion-at-point'."
-  :group 'helm-elisp
-  :type 'boolean)
-
-(defcustom helm-apropos-function-list '(helm-def-source--emacs-commands
-                                        helm-def-source--emacs-functions
-                                        helm-def-source--eieio-classes
-                                        helm-def-source--eieio-generic
-                                        helm-def-source--emacs-variables
-                                        helm-def-source--emacs-faces
-                                        helm-def-source--helm-attributes)
-  "A list of functions that build helm sources to use in `helm-apropos'."
-  :group 'helm-elisp
-  :type '(repeat (choice symbol)))
-
-
-;;; Faces
-;;
-;;
-(defgroup helm-elisp-faces nil
-  "Customize the appearance of helm-elisp."
-  :prefix "helm-"
-  :group 'helm-elisp
-  :group 'helm-faces)
-
-(defface helm-lisp-show-completion
-    '((t (:background "DarkSlateGray")))
-  "Face used for showing candidates in `helm-lisp-completion'."
-  :group 'helm-elisp-faces)
-
-(defface helm-lisp-completion-info
-    '((t (:foreground "red")))
-  "Face used for showing info in `helm-lisp-completion'."
-  :group 'helm-elisp-faces)
-
-(defcustom helm-elisp-help-function
-  'helm-elisp-show-doc-modeline
-  "Function for displaying help for lisp symbols."
-  :group 'helm-elisp
-  :type '(choice (function :tag "Open help for the symbol."
-                  helm-elisp-show-help)
-                 (function :tag "Show one liner in modeline."
-                  helm-elisp-show-doc-modeline)))
-
-
-;;; Show completion.
-;;
-;; Provide show completion with macro `with-helm-show-completion'.
-
-(defvar helm-show-completion-overlay nil)
-
-;; Called each time cursor move in helm-buffer.
-(defun helm-show-completion ()
-  (with-helm-current-buffer
-    (overlay-put helm-show-completion-overlay
-                 'display (substring-no-properties
-                           (helm-get-selection)))))
-
-(defun helm-show-completion-init-overlay (beg end)
-  (when (and helm-turn-on-show-completion beg end)
-    (setq helm-show-completion-overlay (make-overlay beg end))
-    (overlay-put helm-show-completion-overlay
-                 'face 'helm-lisp-show-completion)))
-
-(defun helm-show-completion-display-function (buffer &rest _args)
-  "A special resized helm window is used depending on position in BUFFER."
-  (with-selected-window (selected-window)
-    (if (window-dedicated-p)
-        (helm-default-display-buffer buffer)
-      (let* ((screen-size  (+ (count-screen-lines (window-start) (point) t)
-                              1                         ; mode-line
-                              (if header-line-format 1 0))) ; header-line
-             (def-size     (- (window-height)
-                              helm-show-completion-min-window-height))
-             (upper-height (max window-min-height (min screen-size def-size)))
-             split-window-keep-point)
-        (recenter -1)
-        (set-window-buffer (if (active-minibuffer-window)
-                               (minibuffer-selected-window)
-                               (split-window nil upper-height
-                                             helm-split-window-default-side))
-                           buffer)))))
-
-(defmacro with-helm-show-completion (beg end &rest body)
-  "Show helm candidate in an overlay at point.
-BEG and END are the beginning and end position of the current completion
-in `helm-current-buffer'.
-BODY is an helm call where we want to enable show completion.
-If `helm-turn-on-show-completion' is nil just do nothing."
-  (declare (indent 2) (debug t))
-  `(let ((helm-move-selection-after-hook
-          (and helm-turn-on-show-completion
-               (append (list 'helm-show-completion)
-                       helm-move-selection-after-hook))))
-     (with-helm-temp-hook 'helm-after-initialize-hook
-       (with-helm-buffer
-         (set (make-local-variable 'helm-display-function)
-              (if helm-show-completion-use-special-display
-                  'helm-show-completion-display-function
-                'helm-default-display-buffer))))
-     (unwind-protect
-          (progn
-            (helm-show-completion-init-overlay ,beg ,end)
-            ,@body)
-       (when (and helm-turn-on-show-completion
-                  helm-show-completion-overlay
-                  (overlayp helm-show-completion-overlay))
-         (delete-overlay helm-show-completion-overlay)))))
-
-
-;;; Lisp symbol completion.
-;;
-;;
-(defun helm-lisp-completion--predicate-at-point (beg)
-  ;; Return a predicate for `all-completions'.
-  (let ((fn-sym-p (lambda ()
-                    (or
-                     (and (eq (char-before) ?\ )
-                          (save-excursion
-                            (skip-syntax-backward " " (point-at-bol))
-                            (memq (symbol-at-point)
-                                  helm-lisp-unquoted-function-list)))
-                     (and (eq (char-before) ?\')
-                          (save-excursion
-                            (forward-char -1)
-                            (eq (char-before) ?\#)))))))
-    (save-excursion
-      (goto-char beg)
-      (if (or
-           ;; Complete on all symbols in non--lisp modes (logs mail etc..)
-           (not (memq major-mode '(emacs-lisp-mode
-                                   lisp-interaction-mode
-                                   inferior-emacs-lisp-mode)))
-           (not (or (funcall fn-sym-p)
-                    (and (eq (char-before) ?\')
-                         (save-excursion
-                           (forward-char (if (funcall fn-sym-p) -2 -1))
-                           (skip-syntax-backward " " (point-at-bol))
-                           (memq (symbol-at-point)
-                                 helm-lisp-quoted-function-list)))
-                    (eq (char-before) ?\())) ; no paren before str.
-           ;; Looks like we are in a let statement.
-           (condition-case nil
-               (progn (up-list -2) (forward-char 1)
-                      (eq (char-after) ?\())
-             (error nil)))
-          (lambda (sym)
-            (or (boundp sym) (fboundp sym) (symbol-plist sym)))
-        #'fboundp))))
-
-(defun helm-thing-before-point (&optional limits regexp)
-  "Return symbol name before point.
-If REGEXP is specified return what REGEXP find before point.
-By default match the beginning of symbol before point.
-With LIMITS arg specified return the beginning and end position
-of symbol before point."
-  (save-excursion
-    (let (beg
-          (end (point))
-          (boundary (field-beginning nil nil (point-at-bol))))
-      (if (re-search-backward (or regexp "\\_<") boundary t)
-          (setq beg (match-end 0))
-        (setq beg boundary))
-      (unless (= beg end)
-        (if limits
-            (cons beg end)
-          (buffer-substring-no-properties beg end))))))
-
-(defun helm-bounds-of-thing-before-point (&optional regexp)
-  "Get the beginning and end position of `helm-thing-before-point'.
-Return a cons \(beg . end\)."
-  (helm-thing-before-point 'limits regexp))
-
-(defun helm-insert-completion-at-point (beg end str)
-  ;; When there is no space after point
-  ;; we are completing inside a symbol or
-  ;; after a partial symbol with the next arg aside
-  ;; without space, in this case mark the region.
-  ;; deleting it would remove the
-  ;; next arg which is unwanted.
-  (delete-region beg end)
-  (insert str)
-  (let ((pos (cdr (or (bounds-of-thing-at-point 'symbol)
-                      ;; needed for helm-dabbrev.
-                      (bounds-of-thing-at-point 'filename)))))
-    (when (and pos (< (point) pos))
-      (push-mark pos t t))))
-
-(defvar helm-lisp-completion--cache nil)
-(defvar helm-lgst-len nil)
-;;;###autoload
-(defun helm-lisp-completion-at-point ()
-  "Preconfigured helm for lisp symbol completion at point."
-  (interactive)
-  (setq helm-lgst-len 0)
-  (let* ((target     (helm-thing-before-point))
-         (beg        (car (helm-bounds-of-thing-before-point)))
-         (end        (point))
-         (pred       (and beg (helm-lisp-completion--predicate-at-point beg)))
-         (loc-vars   (and (fboundp 'elisp--local-variables)
-                          (ignore-errors
-                            (mapcar #'symbol-name (elisp--local-variables)))))
-         (glob-syms  (and target pred (all-completions target obarray pred)))
-         (candidates (append loc-vars glob-syms))
-         (helm-quit-if-no-candidate t)
-         (helm-execute-action-at-once-if-one t)
-         (enable-recursive-minibuffers t))
-    (setq helm-lisp-completion--cache (cl-loop for sym in candidates
-                                            for len = (length sym)
-                                            when (> len helm-lgst-len)
-                                            do (setq helm-lgst-len len)
-                                            collect sym))
-    (if candidates
-        (with-helm-show-completion beg end
-          ;; Overlay is initialized now in helm-current-buffer.
-          (helm
-           :sources (helm-build-in-buffer-source "Lisp completion"
-                      :data helm-lisp-completion--cache
-                      :persistent-action 'helm-lisp-completion-persistent-action
-                      :nomark t
-                      :fuzzy-match helm-lisp-fuzzy-completion
-                      :persistent-help "Show brief doc in mode-line"
-                      :filtered-candidate-transformer
-                      'helm-lisp-completion-transformer
-                      :action `(lambda (candidate)
-                                 (with-helm-current-buffer
-                                   (run-with-timer
-                                    0.01 nil
-                                    'helm-insert-completion-at-point
-                                    ,beg ,end candidate))))
-           :input (if helm-lisp-fuzzy-completion
-                      target (concat target " "))
-           :resume 'noresume
-           :buffer "*helm lisp completion*"
-           :allow-nest t))
-      (message "[No Match]"))))
-
-(defun helm-lisp-completion-persistent-action (candidate)
-  "Show documentation for the function.
-Documentation is shown briefly in mode-line or completely
-in other window according to the value of `helm-elisp-help-function'."
-  (funcall helm-elisp-help-function candidate))
-
-(defun helm-elisp-show-help (candidate)
-  "Show full help for the function."
-  (let ((sym (intern-soft candidate)))
-    (cl-typecase sym
-      (fbound   (describe-function sym))
-      (bound    (describe-variable sym))
-      (face     (describe-face sym)))))
-
-(defun helm-elisp-show-doc-modeline (candidate)
-  "Show brief documentation for the function in modeline."
-  (let ((cursor-in-echo-area t)
-        mode-line-in-non-selected-windows)
-    (helm-show-info-in-mode-line
-     (propertize
-      (helm-get-first-line-documentation
-       (intern candidate))
-      'face 'helm-lisp-completion-info))))
-
-(defun helm-lisp-completion-transformer (candidates _source)
-  "Helm candidates transformer for lisp completion."
-  (cl-loop for c in candidates
-        for sym = (intern c)
-        for annot = (cl-typecase sym
-                      (command " (Com)")
-                      (class   " (Class)")
-                      (generic " (Gen)")
-                      (fbound  " (Fun)")
-                      (bound   " (Var)")
-                      (face    " (Face)"))
-        for spaces = (make-string (- helm-lgst-len (length c)) ? )
-        collect (cons (concat c spaces annot) c) into lst
-        finally return (sort lst #'helm-generic-sort-fn)))
-
-(defun helm-get-first-line-documentation (sym)
-  "Return first line documentation of symbol SYM.
-If SYM is not documented, return \"Not documented\"."
-  (let ((doc (cl-typecase sym
-                 (fbound  (documentation sym t))
-                 (bound   (documentation-property sym 'variable-documentation t))
-                 (face    (face-documentation sym)))))
-    (if (and doc (not (string= doc ""))
-             ;; `documentation' return "\n\n(args...)"
-             ;; for CL-style functions.
-             (not (string-match-p "^\n\n" doc)))
-        (car (split-string doc "\n"))
-      "Not documented")))
-
-;;; File completion.
-;;
-;; Complete file name at point.
-
-;;;###autoload
-(defun helm-complete-file-name-at-point (&optional force)
-  "Preconfigured helm to complete file name at point."
-  (interactive)
-  (require 'helm-mode)
-  (let* ((tap (thing-at-point 'filename))
-         beg
-         (init (and tap
-                    (or force
-                        (save-excursion
-                          (end-of-line)
-                          (search-backward tap (point-at-bol) t)
-                          (setq beg (point))
-                          (looking-back "[^'`( ]" (1- (point)))))
-                    (expand-file-name
-                     (substring-no-properties tap))))
-         (end  (point))
-         (helm-quit-if-no-candidate t)
-         (helm-execute-action-at-once-if-one t)
-         completion)
-    (with-helm-show-completion beg end
-      (setq completion (helm-read-file-name "FileName: "
-                                            :initial-input init)))
-    (when (and completion (not (string= completion "")))
-      (delete-region beg end) (insert (if (string-match "^~" tap)
-                                          (abbreviate-file-name completion)
-                                        completion)))))
-
-;;;###autoload
-(defun helm-lisp-indent ()
-  ;; It is meant to use with `helm-define-multi-key' which
-  ;; does not support args for functions yet, so use `current-prefix-arg'
-  ;; for now instead of (interactive "P").
-  (interactive)
-  (let ((tab-always-indent (or (eq tab-always-indent 'complete)
-                               tab-always-indent)))
-    (indent-for-tab-command current-prefix-arg)))
-
-;;;###autoload
-(defun helm-lisp-completion-or-file-name-at-point ()
-  "Preconfigured helm to complete lisp symbol or filename at point.
-Filename completion happen if string start after or between a double quote."
-  (interactive)
-  (let* ((tap (thing-at-point 'filename)))
-    (if (and tap (save-excursion
-                   (end-of-line)
-                   (search-backward tap (point-at-bol) t)
-                   (looking-back "[^'`( ]" (1- (point)))))
-        (helm-complete-file-name-at-point)
-      (helm-lisp-completion-at-point))))
-
-
-;;; Apropos
-;;
-;;
-(defun helm-apropos-init (test default)
-  "Init candidates buffer for `helm-apropos' sources."
-  (require 'helm-help)
-  (helm-init-candidates-in-buffer 'global
-    (let ((default-symbol (and (stringp default)
-                               (intern-soft default)))
-          (symbols (all-completions "" obarray test)))
-      (if (and default-symbol (funcall test default-symbol))
-          (cons default-symbol symbols)
-        symbols))))
-
-(defun helm-apropos-init-faces (default)
-  "Init candidates buffer for faces for `helm-apropos'."
-  (require 'helm-help)
-  (with-current-buffer (helm-candidate-buffer 'global)
-    (goto-char (point-min))
-    (let ((default-symbol (and (stringp default)
-                               (intern-soft default)))
-          (faces (face-list)))
-      (when (and default-symbol (facep default-symbol))
-        (insert (concat default "\n")))
-      (insert
-       (mapconcat #'prin1-to-string
-                  (if default
-                      (cl-remove-if (lambda (sym) (string= sym default)) faces)
-                    faces)
-                  "\n")))))
-
-(defun helm-apropos-default-sort-fn (candidates _source)
-  (if (string= helm-pattern "")
-      candidates
-      (sort candidates #'helm-generic-sort-fn)))
-
-(defun helm-def-source--emacs-variables (&optional default)
-  (helm-build-in-buffer-source "Variables"
-    :init `(lambda ()
-             (helm-apropos-init
-              (lambda (x) (and (boundp x) (not (keywordp x)))) ,default))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
-                                         'helm-apropos-default-sort-fn)
-    :nomark t
-    :action '(("Describe Variable" . helm-describe-variable)
-              ("Find Variable" . helm-find-variable)
-              ("Info lookup" . helm-info-lookup-symbol)
-              ("Set variable" . helm-set-variable))))
-
-(defun helm-def-source--emacs-faces (&optional default)
-  (helm-build-in-buffer-source "Faces"
-    :init (lambda () (helm-apropos-init-faces default))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :filtered-candidate-transformer
-    (append (and (null helm-apropos-fuzzy-match)
-                 '(helm-apropos-default-sort-fn))
-            (list
-             (lambda (candidates _source)
-               (cl-loop for c in candidates
-                        collect (propertize c 'face (intern c))))))
-    :nomark t
-    :action (lambda (candidate)
-              (describe-face (intern candidate)))))
-
-(defun helm-def-source--helm-attributes (&optional _default)
-  (helm-build-sync-source "Helm attributes"
-    :candidates (lambda ()
-                  (mapcar 'symbol-name helm-attributes))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :nomark t
-    :action (lambda (candidate)
-              (let (special-display-buffer-names
-                    special-display-regexps
-                    helm-persistent-action-use-special-display)
-                (with-output-to-temp-buffer "*Help*"
-                  (princ (get (intern candidate) 'helm-attrdoc)))))))
-
-(defun helm-def-source--emacs-commands (&optional default)
-  (helm-build-in-buffer-source "Commands"
-    :init `(lambda ()
-             (helm-apropos-init 'commandp ,default))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
-                                         'helm-apropos-default-sort-fn)
-    :nomark t
-    :action '(("Describe Function" . helm-describe-function)
-              ("Find Function" . helm-find-function)
-              ("Info lookup" . helm-info-lookup-symbol))))
-
-(defun helm-def-source--emacs-functions (&optional default)
-  (helm-build-in-buffer-source "Functions"
-    :init `(lambda ()
-             (helm-apropos-init #'(lambda (x)
-                                    (and (fboundp x)
-                                         (not (commandp x))
-                                         (not (generic-p x))
-                                         (not (class-p x))))
-                                ,default))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
-                                         'helm-apropos-default-sort-fn)
-    :nomark t
-    :action '(("Describe Function" . helm-describe-function)
-              ("Find Function" . helm-find-function)
-              ("Info lookup" . helm-info-lookup-symbol))))
-
-(defun helm-def-source--eieio-classes (&optional default)
-  (helm-build-in-buffer-source "Classes"
-    :init `(lambda ()
-             (helm-apropos-init #'(lambda (x)
-                                    (class-p x))
-                                ,default))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
-                                         'helm-apropos-default-sort-fn)
-    :nomark t
-    :action '(("Describe Function" . helm-describe-function)
-              ("Find Function" . helm-find-function)
-              ("Info lookup" . helm-info-lookup-symbol))))
-
-(defun helm-def-source--eieio-generic (&optional default)
-  (helm-build-in-buffer-source "Generic functions"
-    :init `(lambda ()
-             (helm-apropos-init #'(lambda (x)
-                                    (generic-p x))
-                                ,default))
-    :fuzzy-match helm-apropos-fuzzy-match
-    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
-                                         'helm-apropos-default-sort-fn)
-    :nomark t
-    :action '(("Describe Function" . helm-describe-function)
-              ("Find Function" . helm-find-function)
-              ("Info lookup" . helm-info-lookup-symbol))))
-
-(defun helm-info-lookup-symbol-1 (c)
-  (let ((helm-execute-action-at-once-if-one t)
-        (helm-quit-if-no-candidate
-         `(lambda ()
-            (message "`%s' Not Documented as a symbol" ,c))))
-    (helm :sources '(helm-source-info-elisp
-                     helm-source-info-cl
-                     helm-source-info-eieio)
-          :resume 'noresume
-          :buffer "*helm lookup*"
-          :input c)))
-
-(defun helm-info-lookup-symbol (candidate)
-  (run-with-timer 0.01 nil #'helm-info-lookup-symbol-1 candidate))
-
-;;;###autoload
-(defun helm-apropos ()
-  "Preconfigured helm to describe commands, functions, variables and faces."
-  (interactive)
-  (let ((default (thing-at-point 'symbol)))
-    (helm :sources
-          (mapcar (lambda (func)
-                    (funcall func default))
-                  helm-apropos-function-list)
-          :buffer "*helm apropos*"
-          :preselect (and default (concat "\\_<" (regexp-quote default) "\\_>")))))
-
-
-;;; Advices
-;;
-;;
-(defvar helm-source-advice
-  '((name . "Function Advice")
-    (candidates . helm-advice-candidates)
-    (action ("Toggle Enable/Disable" . helm-advice-toggle))
-    (persistent-action . helm-advice-persistent-action)
-    (nomark)
-    (multiline)
-    (persistent-help . "Describe function / C-u C-j: Toggle advice")))
-
-(defun helm-advice-candidates ()
-  (cl-loop for (fname) in ad-advised-functions
-        for function = (intern fname)
-        append
-        (cl-loop for class in ad-advice-classes append
-              (cl-loop for advice in (ad-get-advice-info-field function class)
-                    for enabled = (ad-advice-enabled advice)
-                    collect
-                    (cons (format
-                           "%s %s %s"
-                           (if enabled "Enabled " "Disabled")
-                           (propertize fname 'face 'font-lock-function-name-face)
-                           (ad-make-single-advice-docstring advice class nil))
-                          (list function class advice))))))
-
-(defun helm-advice-persistent-action (func-class-advice)
-  (if current-prefix-arg
-      (helm-advice-toggle func-class-advice)
-    (describe-function (car func-class-advice))))
-
-(defun helm-advice-toggle (func-class-advice)
-  (cl-destructuring-bind (function _class advice) func-class-advice
-    (cond ((ad-advice-enabled advice)
-           (ad-advice-set-enabled advice nil)
-           (message "Disabled"))
-          (t
-           (ad-advice-set-enabled advice t)
-           (message "Enabled")))
-    (ad-activate function)
-    (and helm-in-persistent-action
-         (helm-advice-update-current-display-string))))
-
-(defun helm-advice-update-current-display-string ()
-  (helm-edit-current-selection
-    (let ((newword (cond ((looking-at "Disabled") "Enabled")
-                         ((looking-at "Enabled")  "Disabled"))))
-      (when newword
-        (delete-region (point) (progn (forward-word 1) (point)))
-        (insert newword)))))
-
-;;;###autoload
-(defun helm-manage-advice ()
-  "Preconfigured `helm' to disable/enable function advices."
-  (interactive)
-  (helm-other-buffer 'helm-source-advice "*helm advice*"))
-
-
-;;; Locate elisp library
-;;
-;;
-(defun helm-locate-library-scan-list ()
-  (cl-loop for dir in load-path
-        when (file-directory-p dir)
-        append (directory-files dir t (concat (regexp-opt (get-load-suffixes))
-                                              "\\'"))
-        into lst
-        finally return (helm-fast-remove-dups lst :test 'equal)))
-
-;;;###autoload
-(defun helm-locate-library ()
-  "Preconfigured helm to locate elisp libraries."
-  (interactive)
-  (helm :sources (helm-build-in-buffer-source  "Elisp libraries (Scan)"
-                   :data (lambda () (helm-locate-library-scan-list))
-                   :fuzzy-match t
-                   :keymap helm-generic-files-map
-                   :match-part (lambda (candidate)
-                                 (if helm-ff-transformer-show-only-basename
-                                     (helm-basename candidate) candidate))
-                   :filter-one-by-one (lambda (c)
-                                        (if helm-ff-transformer-show-only-basename
-                                            (cons (helm-basename c) c) c))
-                   :action (helm-actions-from-type-file))
-        :buffer "*helm locate library*"))
-
-(defun helm-set-variable (var)
-  "Set value to VAR interactively."
-  (let* ((sym (helm-symbolify var))
-         (val (default-value sym)))
-    (set-default sym (eval-minibuffer (format "Set `%s': " var)
-                                      (if (or (stringp val) (memq val '(nil t)))
-                                          (prin1-to-string val)
-                                          (format "'%s" (prin1-to-string val)))))))
-
-
-;;; Elisp Timers.
-;;
-;;
-(defclass helm-absolute-time-timers-class (helm-source-sync helm-type-timers)
-  ((candidates :initform timer-list)
-   (filtered-candidate-transformer
-    :initform
-    (lambda (candidates _source)
-      (cl-loop for timer in candidates
-               collect (cons (helm-elisp--format-timer timer) timer))))
-   (allow-dups :initform t)
-   (volatile :initform t)))
-
-(defvar helm-source-absolute-time-timers
-  (helm-make-source "Absolute Time Timers" 'helm-absolute-time-timers-class))
-
-(defclass helm-idle-time-timers-class (helm-source-sync helm-type-timers)
-  ((candidates :initform timer-idle-list)
-   (allow-dups :initform t)
-   (volatile :initform t)
-   (filtered-candidate-transformer
-    :initform
-    (lambda (candidates _source)
-      (cl-loop for timer in candidates
-               collect (cons (helm-elisp--format-timer timer) timer))))))
-
-(defvar helm-source-idle-time-timers
-  (helm-make-source "Idle Time Timers" 'helm-idle-time-timers-class))
-
-(defun helm-elisp--format-timer (timer)
-  (format "%s repeat=%s %s(%s)"
-          (let ((time (timer--time timer)))
-            (if (timer--idle-delay timer)
-                (format-time-string "idle-for=%5s" time)
-              (format-time-string "%m/%d %T" time)))
-          (or (timer--repeat-delay timer) "nil")
-          (mapconcat 'identity (split-string
-                                (prin1-to-string (timer--function timer))
-                                "\n") " ")
-          (mapconcat 'prin1-to-string (timer--args timer) " ")))
-
-;;;###autoload
-(defun helm-timers ()
-  "Preconfigured `helm' for timers."
-  (interactive)
-  (helm :sources '(helm-source-absolute-time-timers
-                   helm-source-idle-time-timers)
-        :buffer "*helm timers*"))
-
-
-;;; Complex command history
-;;
-;;
-(defun helm-btf--usable-p ()
-  "Return t if current version of `backtrace-frame' accept 2 arguments."
-  (condition-case nil
-      (and (backtrace-frame 1 'condition-case) t)
-    (wrong-number-of-arguments nil)))
-
-(if (helm-btf--usable-p)        ; Check if BTF accept more than one arg.
-    ;; Emacs 24.4.
-    (dont-compile
-      (defvar helm-sexp--last-sexp nil)
-      ;; This wont work compiled.
-      (defun helm-sexp-eval-1 ()
-        (interactive)
-        (unwind-protect
-             (progn
-               ;; Trick called-interactively-p into thinking that `cand' is
-               ;; an interactive call, See `repeat-complex-command'.
-               (add-hook 'called-interactively-p-functions
-                         #'helm-complex-command-history--called-interactively-skip)
-               (eval (read helm-sexp--last-sexp)))
-          (remove-hook 'called-interactively-p-functions
-                       #'helm-complex-command-history--called-interactively-skip)))
-
-      (defun helm-complex-command-history--called-interactively-skip (i _frame1 frame2)
-        (and (eq 'eval (cadr frame2))
-             (eq 'helm-sexp-eval-1
-                 (cadr (backtrace-frame (+ i 2) #'called-interactively-p)))
-             1))
-
-      (defun helm-sexp-eval (_candidate)
-        (call-interactively #'helm-sexp-eval-1)))
-  ;; Emacs 24.3
-  (defun helm-sexp-eval (cand)
-    (let ((sexp (read cand)))
-      (condition-case err
-          (if (> (length (remove nil sexp)) 1)
-              (eval sexp)
-            (apply 'call-interactively sexp))
-        (error (message "Evaluating gave an error: %S" err)
-               nil)))))
-
-(defvar helm-source-complex-command-history
-  (helm-build-sync-source "Complex Command History"
-    :candidates (lambda ()
-                  ;; Use cdr to avoid adding
-                  ;; `helm-complex-command-history' here.
-                  (cl-loop for i in command-history
-                           unless (equal i '(helm-complex-command-history))
-                           collect (prin1-to-string i)))
-    :action (helm-make-actions
-             "Eval" (lambda (candidate)
-                      (and (boundp 'helm-sexp--last-sexp)
-                           (setq helm-sexp--last-sexp candidate))
-                      (run-with-timer 0.1 nil #'helm-sexp-eval candidate))
-             "Edit and eval"
-             (lambda (cand)
-               (minibuffer-with-setup-hook
-                   (lambda () (insert cand))
-                 (call-interactively #'eval-expression))))
-    :persistent-action #'helm-sexp-eval))
-
-;;;###autoload
-(defun helm-complex-command-history ()
-  "Preconfigured helm for complex command history."
-  (interactive)
-  (helm :sources 'helm-source-complex-command-history
-        :buffer "*helm complex commands*"))
-
-(provide 'helm-elisp)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-elisp.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-elscreen.el b/emacs.d/elpa/helm-20150623.1310/helm-elscreen.el
deleted file mode 100644
index 178d37f..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-elscreen.el
+++ /dev/null
@@ -1,79 +0,0 @@
-;;; helm-elscreen.el -- Elscreen support -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-
-(declare-function elscreen-find-screen-by-buffer "ext:elscreen.el" (buffer &optional create))
-(declare-function elscreen-find-file "ext:elscreen.el" (filename))
-(declare-function elscreen-goto "ext:elscreen.el" (screen))
-
-(defun helm-find-buffer-on-elscreen (candidate)
-  "Open buffer in new screen, if marked buffers open all in elscreens."
-  (helm-require-or-error 'elscreen 'helm-find-buffer-on-elscreen)
-  (helm-aif (helm-marked-candidates)
-      (cl-dolist (i it)
-        (let ((target-screen (elscreen-find-screen-by-buffer
-                              (get-buffer i) 'create)))
-          (elscreen-goto target-screen)))
-    (let ((target-screen (elscreen-find-screen-by-buffer
-                          (get-buffer candidate) 'create)))
-      (elscreen-goto target-screen))))
-
-(defun helm-elscreen-find-file (file)
-  (helm-require-or-error 'elscreen 'helm-elscreen-find-file)
-  (elscreen-find-file file))
-
-(defvar helm-source-elscreen
-  '((name . "Elscreen")
-    (candidates
-     . (lambda ()
-         (if (cdr (elscreen-get-screen-to-name-alist))
-             (sort
-              (cl-loop for sname in (elscreen-get-screen-to-name-alist)
-                    append (list (format "[%d] %s" (car sname) (cdr sname))))
-              #'(lambda (a b) (compare-strings a nil nil b nil nil))))))
-    (action
-     . (("Change Screen" .
-                         (lambda (candidate)
-                           (elscreen-goto (- (aref candidate 1) (aref "0" 0)))))
-        ("Kill Screen(s)" .
-                          (lambda (candidate)
-                            (cl-dolist (i (helm-marked-candidates))
-                              (elscreen-goto (- (aref i 1) (aref "0" 0)))
-                              (elscreen-kill))))
-        ("Only Screen" .
-                       (lambda (candidate)
-                         (elscreen-goto (- (aref candidate 1) (aref "0" 0)))
-                         (elscreen-kill-others)))))))
-
-;;;###autoload
-(defun helm-elscreen ()
-  "Preconfigured helm to list elscreen."
-  (interactive)
-  (helm-other-buffer 'helm-source-elscreen "*Helm Elscreen*"))
-
-(provide 'helm-elscreen)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-elscreen.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-eshell.el b/emacs.d/elpa/helm-20150623.1310/helm-eshell.el
deleted file mode 100644
index 2b0deed..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-eshell.el
+++ /dev/null
@@ -1,246 +0,0 @@
-;;; helm-eshell.el --- pcomplete and eshell completion for helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;; Enable like this in .emacs:
-;;
-;; (add-hook 'eshell-mode-hook
-;;           #'(lambda ()
-;;               (define-key eshell-mode-map [remap pcomplete] 'helm-esh-pcomplete)))
-;;
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-elisp)
-(require 'helm-regexp)
-
-(declare-function eshell-read-aliases-list "em-alias")
-(declare-function eshell-send-input "esh-mode" (&optional use-region queue-p no-newline))
-(declare-function eshell-bol "esh-mode")
-(declare-function eshell-parse-arguments "esh-arg" (beg end))
-(declare-function eshell-backward-argument "esh-mode" (&optional arg))
-
-(defvar helm-eshell-history-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-p") 'helm-next-line)
-    map)
-  "Keymap for `helm-eshell-history'.")
-
-(defvar helm-esh-completion-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "TAB") 'helm-next-line)
-    map)
-  "Keymap for `helm-esh-pcomplete'.")
-
-(defclass helm-esh-source (helm-source-sync)
-  ((init :initform (lambda ()
-                     (setq pcomplete-current-completions nil
-                           pcomplete-last-completion-raw nil)
-                     ;; Eshell-command add this hook in all minibuffers
-                     ;; Remove it for the helm one. (Fixed in Emacs24)
-                     (remove-hook 'minibuffer-setup-hook 'eshell-mode)))
-   (candidates :initform 'helm-esh-get-candidates)
-   (nomark :initform t)
-   (persistent-action :initform 'ignore)
-   (filtered-candidate-transformer
-    :initform
-    (lambda (candidates _sources)
-      (cl-loop 
-       for i in candidates
-       collect
-       (cond ((string-match "\\`~/?" helm-ec-target)
-              (abbreviate-file-name i))
-             ((string-match "\\`/" helm-ec-target) i)
-             (t
-              (file-relative-name i)))
-       into lst
-       finally return (sort lst 'helm-generic-sort-fn))))
-   (action :initform 'helm-ec-insert))
-  "Helm class to define source for Eshell completion.")
-
-;; Internal.
-(defvar helm-ec-target "")
-(defun helm-ec-insert (candidate)
-  "Replace text at point with CANDIDATE.
-The function that call this should set `helm-ec-target' to thing at point."
-  (let ((pt (point)))
-    (when (and helm-ec-target
-               (search-backward helm-ec-target nil t)
-               (string= (buffer-substring (point) pt) helm-ec-target))
-      (delete-region (point) pt)))
-  (when (string-match "\\`\\*" helm-ec-target) (insert "*"))
-  (cond ((string-match "\\`~/?" helm-ec-target)
-         (insert (helm-quote-whitespace (abbreviate-file-name candidate))))
-        ((string-match "\\`/" helm-ec-target)
-         (insert (helm-quote-whitespace candidate)))
-        (t
-         (insert (concat (and (string-match "\\`[.]/" helm-ec-target) "./")
-                         (helm-quote-whitespace
-                          (file-relative-name candidate)))))))
-
-(defun helm-esh-get-candidates ()
-  "Get candidates for eshell completion using `pcomplete'."
-  (catch 'pcompleted
-    (with-helm-current-buffer
-      (let* ((pcomplete-stub)
-             pcomplete-seen pcomplete-norm-func
-             pcomplete-args pcomplete-last pcomplete-index
-             (pcomplete-autolist pcomplete-autolist)
-             (pcomplete-suffix-list pcomplete-suffix-list)
-             (table (pcomplete-completions))
-             (entry (or (try-completion helm-pattern
-                                        (pcomplete-entries))
-                        helm-pattern)))
-        (cl-loop ;; expand entry too to be able to compare it with file-cand.
-              with exp-entry = (and (stringp entry)
-                                    (not (string= entry ""))
-                                    (file-name-as-directory
-                                     (expand-file-name entry default-directory)))
-              for i in (all-completions pcomplete-stub table)
-              ;; Transform the related names to abs names.
-              for file-cand = (and exp-entry
-                                   (if (file-remote-p i) i
-                                     (expand-file-name
-                                      i (file-name-directory entry))))
-              ;; Compare them to avoid dups.
-              for file-entry-p = (and (stringp exp-entry)
-                                      (stringp file-cand)
-                                      ;; Fix :/tmp/foo/ $ cd foo
-                                      (not (file-directory-p file-cand))
-                                      (file-equal-p exp-entry file-cand))
-              if (and file-cand (or (file-remote-p file-cand)
-                                    (file-exists-p file-cand))
-                      (not file-entry-p))
-              collect file-cand into ls
-              else
-              ;; Avoid adding entry here.
-              unless file-entry-p collect i into ls
-              finally return
-              (if (and exp-entry
-                       (file-directory-p exp-entry)
-                       ;; If the car of completion list is
-                       ;; an executable, probably we are in
-                       ;; command completion, so don't add a
-                       ;; possible file related entry here.
-                       (and ls (not (executable-find (car ls))))
-                       ;; Don't add entry if already in prompt.
-                       (not (file-equal-p exp-entry pcomplete-stub)))
-                  (append (list exp-entry)
-                          ;; Entry should not be here now but double check.
-                          (remove entry ls))
-                ls))))))
-
-;;; Eshell history.
-;;
-;;
-(defclass helm-eshell-history-source (helm-source-in-buffer)
-  ((init :initform (lambda ()
-                     (let (eshell-hist-ignoredups)
-                       (eshell-write-history eshell-history-file-name t)
-                       (with-current-buffer (helm-candidate-buffer 'global)
-                         (insert-file-contents eshell-history-file-name)))
-                     ;; Same comment as in `helm-source-esh'
-                     (remove-hook 'minibuffer-setup-hook 'eshell-mode)))
-   (nomark :initform t)
-   (keymap :initform helm-eshell-history-map)
-   (filtered-candidate-transformer :initform (lambda (candidates sources)
-                                               (reverse candidates)))
-   (candidate-number-limit :initform 9999)
-   (action :initform (lambda (candidate)
-                       (eshell-kill-input)
-                       (insert candidate))))
-  "Helm class to define source for Eshell history.")
-
-;;;###autoload
-(defun helm-esh-pcomplete ()
-  "Preconfigured helm to provide helm completion in eshell."
-  (interactive)
-  (let* ((helm-quit-if-no-candidate t)
-         (helm-execute-action-at-once-if-one t)
-         (end (point-marker))
-         (beg (save-excursion (eshell-bol) (point)))
-         (args (catch 'eshell-incomplete
-                 (eshell-parse-arguments beg end)))
-         (target
-          (or (and (looking-back " " (1- (point))) " ")
-              (buffer-substring-no-properties
-               (save-excursion
-                 (eshell-backward-argument 1) (point))
-               end)))
-         (first (car args)) ; Maybe lisp delimiter "(".
-         last) ; Will be the last but parsed by pcomplete.
-    (setq helm-ec-target (or target " ")
-          end (point)
-          ;; Reset beg for `with-helm-show-completion'.
-          beg (or (and target (not (string= target " "))
-                       (- end (length target)))
-                  ;; Nothing at point.
-                  (progn (insert " ") (point))))
-    (cond ((eq first ?\()
-           (helm-lisp-completion-or-file-name-at-point))
-          ;; In eshell `pcomplete-parse-arguments' is called
-          ;; with `pcomplete-parse-arguments-function'
-          ;; locally bound to `eshell-complete-parse-arguments'
-          ;; which is calling `lisp-complete-symbol',
-          ;; calling it before would popup the
-          ;; *completions* buffer.
-          (t (setq last (replace-regexp-in-string
-                         "\\`\\*" ""
-                         (car (last (ignore-errors
-                                      (pcomplete-parse-arguments))))))
-             (with-helm-show-completion beg end
-               (helm :sources (helm-make-source "Eshell completions" 'helm-esh-source)
-                     :buffer "*helm pcomplete*"
-                     :keymap helm-esh-completion-map
-                     :resume 'noresume
-                     :input (and (stringp last)
-                                 (helm-ff-set-pattern last))))))))
-
-;;;###autoload
-(defun helm-eshell-history ()
-  "Preconfigured helm for eshell history."
-  (interactive)
-  (let* ((end   (point))
-         (beg   (save-excursion (eshell-bol) (point)))
-         (input (buffer-substring beg end))
-         flag-empty)
-    (when (eq beg end)
-      (insert " ")
-      (setq flag-empty t)
-      (setq end (point)))
-    (unwind-protect
-         (with-helm-show-completion beg end
-           (helm :sources (helm-make-source "Eshell history"
-                              'helm-eshell-history-source)
-                 :buffer "*helm eshell history*"
-                 :resume 'noresume
-                 :input input))
-      (when (and flag-empty
-                 (looking-back " " (1- (point))))
-        (delete-char -1)))))
-
-(provide 'helm-eshell)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-eshell ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-eval.el b/emacs.d/elpa/helm-20150623.1310/helm-eval.el
deleted file mode 100644
index 175a267..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-eval.el
+++ /dev/null
@@ -1,195 +0,0 @@
-;;; helm-eval.el --- eval expressions from helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'eldoc)
-(require 'edebug)
-
-
-(defgroup helm-eval nil
-  "Eval related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-eldoc-in-minibuffer-show-fn
-  'helm-show-info-in-mode-line
-  "A function to display eldoc info.
-Should take one arg: the string to display."
-  :group 'helm-eval
-  :type  'symbol)
-
-(defcustom helm-show-info-in-mode-line-delay 12
-  "Eldoc will show info in mode-line during this delay if user is idle."
-  :type  'integer
-  :group 'helm-eval)
-
-
-;;; Eldoc compatibility between emacs-24 and emacs-25
-;;
-(if (require 'elisp-mode nil t)    ; emacs-25
-    ;; Maybe the eldoc functions have been
-    ;; already aliased by eldoc-eval.
-    (cl-loop for (f . a) in '((eldoc-current-symbol .
-                               elisp--current-symbol)
-                              (eldoc-fnsym-in-current-sexp .
-                               elisp--fnsym-in-current-sexp) 
-                              (eldoc-get-fnsym-args-string .
-                               elisp-get-fnsym-args-string) 
-                              (eldoc-get-var-docstring .
-                               elisp-get-var-docstring))
-             unless (fboundp f)
-             do (defalias f a))
-    ;; Emacs-24.
-    (declare-function eldoc-current-symbol "eldoc")
-    (declare-function eldoc-get-fnsym-args-string "eldoc" (sym &optional index))
-    (declare-function eldoc-get-var-docstring "eldoc" (sym))
-    (declare-function eldoc-fnsym-in-current-sexp "eldoc"))
-
-;;; Evaluation Result
-;;
-;;
-;; Internal
-(defvar helm-eldoc-active-minibuffers-list nil)
-
-(defvar helm-eval-expression-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "<C-return>") 'helm-eval-new-line-and-indent)
-    (define-key map (kbd "<M-tab>")      'lisp-indent-line)
-    (define-key map (kbd "<C-tab>")    'helm-lisp-completion-at-point)
-    (define-key map (kbd "C-p")        'previous-line)
-    (define-key map (kbd "C-n")        'next-line)
-    (define-key map (kbd "<up>")       'previous-line)
-    (define-key map (kbd "<down>")     'next-line)
-    (define-key map (kbd "<right>")    'forward-char)
-    (define-key map (kbd "<left>")     'backward-char)
-    map))
-
-(defun helm-build-evaluation-result-source ()
-  (helm-build-dummy-source "Evaluation Result"
-    :multiline t
-    :mode-line "C-RET: nl-and-indent, M-tab: reindent, C-tab:complete, C-p/n: next/prec-line."
-    :filtered-candidate-transformer (lambda (_candidates _source)
-                                      (list
-                                       (condition-case nil
-                                           (with-helm-current-buffer
-                                             (pp-to-string
-                                              (if edebug-active
-                                                  (edebug-eval-expression
-                                                   (read helm-pattern))
-                                                  (eval (read helm-pattern)))))
-                                         (error "Error"))))
-    :nohighlight t
-    :action '(("Copy result to kill-ring" . (lambda (candidate)
-                                              (kill-new
-                                               (replace-regexp-in-string
-                                                "\n" "" candidate))))
-              ("copy sexp to kill-ring" . (lambda (_candidate)
-                                            (kill-new helm-input))))))
-
-(defun helm-eval-new-line-and-indent ()
-  (interactive)
-  (newline) (lisp-indent-line))
-
-(defun helm-eldoc-store-minibuffer ()
-  "Store minibuffer buffer name in `helm-eldoc-active-minibuffers-list'."
-  (with-selected-window (minibuffer-window)
-    (push (current-buffer) helm-eldoc-active-minibuffers-list)))
-
-(defun helm-eldoc-show-in-eval ()
-  "Return eldoc in mode-line for current minibuffer input."
-  (let ((buf (window-buffer (active-minibuffer-window))))
-    (condition-case err
-        (when (member buf helm-eldoc-active-minibuffers-list)
-          (with-current-buffer buf
-            (let* ((sym     (save-excursion
-                              (unless (looking-back ")\\|\"" (1- (point)))
-                                (forward-char -1))
-                              (eldoc-current-symbol)))
-                   (info-fn (eldoc-fnsym-in-current-sexp))
-                   (doc     (or (eldoc-get-var-docstring sym)
-                                (eldoc-get-fnsym-args-string
-                                 (car info-fn) (cadr info-fn)))))
-              (when doc (funcall helm-eldoc-in-minibuffer-show-fn doc)))))
-      (error (message "Eldoc in minibuffer error: %S" err) nil))))
-
-(defun helm-show-info-in-mode-line (str)
-  "Display string STR in mode-line."
-  (save-selected-window
-    (with-current-buffer helm-buffer
-      (let ((mode-line-format (concat " " str)))
-        (force-mode-line-update)
-        (sit-for helm-show-info-in-mode-line-delay))
-      (force-mode-line-update))))
-
-;;; Calculation Result
-;;
-;;
-(defvar helm-source-calculation-result
-  (helm-build-dummy-source "Calculation Result"
-    :filtered-candidate-transformer (lambda (_candidates _source)
-                                      (list
-                                       (condition-case nil
-                                           (calc-eval helm-pattern)
-                                         (error "error"))))
-    :nohighlight t
-    :action '(("Copy result to kill-ring" . kill-new))))
-
-;;;###autoload
-(defun helm-eval-expression (arg)
-  "Preconfigured helm for `helm-source-evaluation-result'."
-  (interactive "P")
-  (helm :sources (helm-build-evaluation-result-source)
-        :input (when arg (thing-at-point 'sexp))
-        :buffer "*helm eval*"
-        :echo-input-in-header-line nil
-        :history 'read-expression-history
-        :keymap helm-eval-expression-map))
-
-(defvar eldoc-idle-delay)
-;;;###autoload
-(defun helm-eval-expression-with-eldoc ()
-  "Preconfigured helm for `helm-source-evaluation-result' with `eldoc' support. "
-  (interactive)
-  (let ((timer (run-with-idle-timer
-                eldoc-idle-delay 'repeat
-                'helm-eldoc-show-in-eval)))
-    (unwind-protect
-         (minibuffer-with-setup-hook
-             'helm-eldoc-store-minibuffer
-           (call-interactively 'helm-eval-expression))
-      (and timer (cancel-timer timer))
-      (setq helm-eldoc-active-minibuffers-list
-            (cdr helm-eldoc-active-minibuffers-list)))))
-
-;;;###autoload
-(defun helm-calcul-expression ()
-  "Preconfigured helm for `helm-source-calculation-result'."
-  (interactive)
-  (helm :sources 'helm-source-calculation-result
-        :buffer "*helm calcul*"))
-
-(provide 'helm-eval)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-eval.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-external.el b/emacs.d/elpa/helm-20150623.1310/helm-external.el
deleted file mode 100644
index 28298e3..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-external.el
+++ /dev/null
@@ -1,216 +0,0 @@
-;;; helm-external.el --- Run Externals commands within Emacs with helm completion. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-net)
-
-
-(defgroup helm-external nil
-  "External related Applications and libraries for Helm." 
-  :group 'helm)
-
-(defcustom helm-raise-command nil
-  "A shell command to jump to a window running specific program.
-Need external program wmctrl.
-This will be use with `format', so use something like \"wmctrl -xa %s\"."
-  :type 'string
-  :group 'helm-external)
-
-(defcustom helm-external-programs-associations nil
-  "Alist to store externals programs associated with file extension.
-This variable overhide setting in .mailcap file.
-e.g : '\(\(\"jpg\" . \"gqview\"\) (\"pdf\" . \"xpdf\"\)\) "
-  :type '(alist :key-type string :value-type string)
-  :group 'helm-external)
-
-(defcustom helm-default-external-file-browser "nautilus"
-  "Default external file browser for your system.
-Directories will be opened externally with it when
-opening file externally in `helm-find-files'.
-Set to nil if you do not have external file browser
-or do not want to use it.
-Windows users should set that to \"explorer.exe\"."
-  :group 'helm-external
-  :type  'string)
-
-
-;;; Internals
-(defvar helm-external-command-history nil)
-(defvar helm-external-commands-list nil
-  "A list of all external commands the user can execute.
-If this variable is not set by the user, it will be calculated
-automatically.")
-
-(defun helm-external-commands-list-1 (&optional sort)
-  "Returns a list of all external commands the user can execute.
-If `helm-external-commands-list' is non-nil it will
-return its contents.  Else it calculates all external commands
-and sets `helm-external-commands-list'."
-  (helm-aif helm-external-commands-list
-      it
-    (setq helm-external-commands-list
-          (cl-loop
-                for dir in (split-string (getenv "PATH") path-separator)
-                when (and (file-exists-p dir) (file-accessible-directory-p dir))
-                for lsdir = (cl-loop for i in (directory-files dir t)
-                                  for bn = (file-name-nondirectory i)
-                                  when (and (not (member bn completions))
-                                            (not (file-directory-p i))
-                                            (file-executable-p i))
-                                  collect bn)
-                append lsdir into completions
-                finally return
-                (if sort (sort completions 'string-lessp) completions)))))
-
-(defun helm-run-or-raise (exe &optional file)
-  "Generic command that run asynchronously EXE.
-If EXE is already running just jump to his window if `helm-raise-command'
-is non--nil.
-When FILE argument is provided run EXE with FILE.
-In this case EXE must be provided as \"EXE %s\"."
-  (let* ((real-com (car (split-string (replace-regexp-in-string
-                                       "%s" "" exe))))
-         (proc     (if file (concat real-com " " file) real-com))
-         process-connection-type)
-    (if (get-process proc)
-        (if helm-raise-command
-            (shell-command  (format helm-raise-command real-com))
-          (error "Error: %s is already running" real-com))
-      (when (cl-loop for i in helm-external-commands-list thereis (string= real-com i))
-        (message "Starting %s..." real-com)
-        (if file
-            (start-process-shell-command
-             proc nil (format exe (shell-quote-argument
-                                   (if (eq system-type 'windows-nt)
-                                       (helm-w32-prepare-filename file)
-                                     file))))
-          (start-process-shell-command proc nil real-com))
-        (set-process-sentinel
-         (get-process proc)
-         #'(lambda (process event)
-             (when (and (string= event "finished\n")
-                        helm-raise-command
-                        (not (helm-get-pid-from-process-name real-com)))
-               (shell-command  (format helm-raise-command "emacs")))
-             (message "%s process...Finished." process))))
-      (setq helm-external-commands-list
-            (cons real-com
-                  (delete real-com helm-external-commands-list))))))
-
-(defun helm-get-mailcap-for-file (filename)
-  "Get the command to use for FILENAME from mailcap files.
-The command is like <command %s> and is meant to use with `format'."
-  (mailcap-parse-mailcaps)
-  (let* ((ext  (file-name-extension filename))
-         (mime (when ext (mailcap-extension-to-mime ext)))
-         (result (when mime (mailcap-mime-info mime))))
-    ;; If elisp file have no associations in .mailcap
-    ;; `mailcap-maybe-eval' is returned, in this case just return nil.
-    (when (stringp result) result)))
-
-(defun helm-get-default-program-for-file (filename)
-  "Try to find a default program to open FILENAME.
-Try first in `helm-external-programs-associations' and then in mailcap file
-if nothing found return nil."
-  (let* ((ext      (file-name-extension filename))
-         (def-prog (assoc-default ext helm-external-programs-associations)))
-    (cond ((and def-prog (not (string= def-prog "")))
-           (concat def-prog " %s"))
-          ((and helm-default-external-file-browser
-                (file-directory-p filename))
-           (concat helm-default-external-file-browser " %s"))
-          (t (helm-get-mailcap-for-file filename)))))
-
-(defun helm-open-file-externally (file)
-  "Open FILE with an external program.
-Try to guess which program to use with `helm-get-default-program-for-file'.
-If not found or a prefix arg is given query the user which tool to use."
-  (let* ((fname          (expand-file-name file))
-         (collection     (helm-external-commands-list-1 'sort))
-         (def-prog       (helm-get-default-program-for-file fname))
-         (real-prog-name (if (or helm-current-prefix-arg (not def-prog))
-                             ;; Prefix arg or no default program.
-                             (prog1
-                                 (helm-comp-read
-                                  "Program: " collection
-                                  :must-match t
-                                  :name "Open file Externally"
-                                  :del-input nil
-                                  :history helm-external-command-history)
-                               ;; Always prompt to set this program as default.
-                               (setq def-prog nil))
-                           ;; No prefix arg or default program exists.
-                           (replace-regexp-in-string " %s\\| '%s'" "" def-prog)))
-         (program        (concat real-prog-name " %s")))
-    (unless (or def-prog ; Association exists, no need to record it.
-                ;; Don't try to record non--filenames associations (e.g urls).
-                (not (file-exists-p fname)))
-      (when
-          (y-or-n-p
-           (format
-            "Do you want to make `%s' the default program for this kind of files? "
-            real-prog-name))
-        (helm-aif (assoc (file-name-extension fname)
-                         helm-external-programs-associations)
-            (setq helm-external-programs-associations
-                  (delete it helm-external-programs-associations)))
-        (push (cons (file-name-extension fname)
-                    (helm-read-string
-                     "Program (Add args maybe and confirm): " real-prog-name))
-              helm-external-programs-associations)
-        (customize-save-variable 'helm-external-programs-associations
-                                 helm-external-programs-associations)))
-    (helm-run-or-raise program file)
-    (setq helm-external-command-history
-          (cons real-prog-name
-                (delete real-prog-name
-                        (cl-loop for i in helm-external-command-history
-                              when (executable-find i) collect i))))))
-
-;;;###autoload
-(defun helm-run-external-command (program)
-  "Preconfigured `helm' to run External PROGRAM asyncronously from Emacs.
-If program is already running exit with error.
-You can set your own list of commands with
-`helm-external-commands-list'."
-  (interactive (list
-                (helm-comp-read
-                 "RunProgram: "
-                 (helm-external-commands-list-1 'sort)
-                 :must-match t
-                 :del-input nil
-                 :name "External Commands"
-                 :history helm-external-command-history)))
-  (helm-run-or-raise program)
-  (setq helm-external-command-history
-        (cons program (delete program
-                              (cl-loop for i in helm-external-command-history
-                                    when (executable-find i) collect i)))))
-
-
-(provide 'helm-external)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-external ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-files.el b/emacs.d/elpa/helm-20150623.1310/helm-files.el
deleted file mode 100644
index 234b766..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-files.el
+++ /dev/null
@@ -1,3334 +0,0 @@
-;;; helm-files.el --- helm file browser and related. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-external)
-(require 'helm-grep)
-(require 'helm-match-plugin)
-(require 'helm-help)
-(require 'helm-locate)
-(require 'helm-bookmark)
-(require 'helm-tags)
-(require 'helm-buffers)
-(require 'thingatpt)
-(require 'ffap)
-(require 'dired-aux)
-(require 'dired-x)
-(require 'tramp)
-(require 'image-dired)
-
-(declare-function find-library-name "find-func.el" (library))
-(declare-function w32-shell-execute "ext:w32fns.c" (operation document &optional parameters show-flag))
-(declare-function gnus-dired-attach "ext:gnus-dired.el" (files-to-attach))
-(declare-function image-dired-display-image "image-dired.el" (file &optional original-size))
-(declare-function image-dired-update-property "image-dired.el" (prop value))
-(declare-function eshell-read-aliases-list "em-alias")
-(declare-function eshell-send-input "esh-mode" (&optional use-region queue-p no-newline))
-(declare-function eshell-kill-input "esh-mode")
-(declare-function eshell-bol "esh-mode")
-(declare-function eshell-quote-argument "esh-arg.el")
-(declare-function helm-ls-git-ls "ext:helm-ls-git")
-(declare-function helm-hg-find-files-in-project "ext:helm-ls-hg")
-(declare-function helm-gid "helm-id-utils.el")
-(declare-function helm-ls-svn-ls "ext:helm-ls-svn")
-
-(defvar recentf-list)
-
-
-;;; Type attributes
-;;
-;;
-(define-helm-type-attribute 'file
-    (helm-build-type-file)
-  "File name.")
-
-
-
-(defgroup helm-files nil
-  "Files applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-boring-file-regexp-list
-  (mapcar (lambda (f)
-            (concat
-             (rx-to-string
-              (replace-regexp-in-string
-               "/$" "" f) t) "$"))
-          completion-ignored-extensions)
-  "The regexp list matching boring files."
-  :group 'helm-files
-  :type  '(repeat (choice regexp)))
-
-(defcustom helm-for-files-preferred-list
-  '(helm-source-buffers-list
-    helm-source-recentf
-    helm-source-bookmarks
-    helm-source-file-cache
-    helm-source-files-in-current-dir
-    helm-source-locate)
-  "Your preferred sources to find files."
-  :type '(repeat (choice symbol))
-  :group 'helm-files)
-
-(defcustom helm-tramp-verbose 0
-  "Just like `tramp-verbose' but specific to helm.
-When set to 0 don't show tramp messages in helm.
-If you want to have the default tramp messages set it to 3."
-  :type 'integer
-  :group 'helm-files)
-
-(defcustom helm-ff-auto-update-initial-value nil
-  "Auto update when only one candidate directory is matched.
-Default value when starting `helm-find-files' is nil because
-it prevent using <backspace> to delete char backward and by the way
-confuse beginners.
-For a better experience with `helm-find-files' set this to non--nil
-and use C-<backspace> to toggle it."
-  :group 'helm-files
-  :type  'boolean)
-
-(defcustom helm-ff-lynx-style-map t
-  "Use arrow keys to navigate with `helm-find-files'.
-You will have to restart Emacs or reeval `helm-find-files-map'
-and `helm-read-file-map' for this take effect."
-  :group 'helm-files
-  :type 'boolean)
-
-(defcustom helm-ff-history-max-length 100
-  "Number of elements shown in `helm-find-files' history."
-  :group 'helm-files
-  :type 'integer)
-
-(defcustom helm-ff-smart-completion t
-  "Try to complete filenames smarter when non--nil.
-See `helm-ff--transform-pattern-for-completion' for more info."
-  :group 'helm-files
-  :type 'boolean)
-
-(defcustom helm-ff-tramp-not-fancy t
-  "No colors when listing remote files when set to non--nil.
-This make listing much faster, specially on slow machines."
-  :group 'helm-files
-  :type  'boolean)
-
-(defcustom helm-ff-exif-data-program "exiftran"
-  "Program used to extract exif data of an image file."
-  :group 'helm-files
-  :type 'string)
-
-(defcustom helm-ff-exif-data-program-args "-d"
-  "Arguments used for `helm-ff-exif-data-program'."
-  :group 'helm-files
-  :type 'string)
-
-(defcustom helm-ff-newfile-prompt-p t
-  "Whether Prompt or not when creating new file.
-This set `ffap-newfile-prompt'."
-  :type  'boolean
-  :group 'helm-files)
-
-(defcustom helm-ff-avfs-directory "~/.avfs"
-  "The default avfs directory, usually '~/.avfs'.
-When this is set you will be able to expand archive filenames with `C-j'
-inside an avfs directory mounted with mountavfs.
-See <http://sourceforge.net/projects/avf/>."
-  :type  'string
-  :group 'helm-files)
-
-(defcustom helm-ff-file-compressed-list '("gz" "bz2" "zip" "7z")
-  "Minimal list of compressed files extension."
-  :type  '(repeat (choice string))
-  :group 'helm-files)
-
-(defcustom helm-ff-printer-list nil
-  "A list of available printers on your system.
-When non--nil let you choose a printer to print file.
-Otherwise when nil the variable `printer-name' will be used.
-On Unix based systems (lpstat command needed) you don't need to set this,
-`helm-ff-find-printers' will find a list of available printers for you."
-  :type '(repeat (choice string))
-  :group 'helm-files)
-
-(defcustom helm-ff-transformer-show-only-basename t
-  "Show only basename of candidates in `helm-find-files'.
-This can be toggled at anytime from `helm-find-files' with \
-\\<helm-find-files-map>\\[helm-ff-run-toggle-basename]."
-  :type 'boolean
-  :group 'helm-files)
-
-(defcustom helm-ff-signal-error-on-dot-files t
-  "Signal error when file is `.' or `..' on file deletion when non--nil.
-Default is non--nil.
-WARNING: Setting this to nil is unsafe and can cause deletion of a whole tree."
-  :group 'helm-files
-  :type  'boolean)
-
-(defcustom helm-ff-search-library-in-sexp nil
-  "Search for library in `require' and `declare-function' sexp."
-  :group 'helm-files
-  :type  'boolean)
-
-(defcustom helm-tooltip-hide-delay 25
-  "Hide tooltips automatically after this many seconds."
-  :group 'helm-files
-  :type 'integer)
-
-(defcustom helm-ff-file-name-history-use-recentf nil
-  "Use `recentf-list' instead of `file-name-history' in `helm-find-files'."
-  :group 'helm-files
-  :type 'boolean)
-
-(defcustom helm-ff-skip-boring-files nil
-  "Non--nil to skip files matching regexps in `helm-boring-file-regexp-list'.
-This take effect in `helm-find-files' and file completion used by `helm-mode'
-i.e `helm-read-file-name'."
-  :group 'helm-files
-  :type  'boolean)
-
-(defcustom helm-findutils-skip-boring-files t
-  "Ignore files matching regexps in `completion-ignored-extensions'."
-  :group 'helm-files
-  :type  'boolean)
-
-(defcustom helm-findutils-search-full-path nil
-  "Search in full path with shell command find when non--nil.
-I.e use the -path/ipath arguments of find instead of -name/iname."
-  :group 'helm-files
-  :type 'boolean)
-
-(defcustom helm-files-save-history-extra-sources
-  '("Find" "Locate" "Recentf"
-    "Files from Current Directory" "File Cache")
-  "Extras source that save candidate to `file-name-history'."
-  :group 'helm-files
-  :type '(repeat (choice string)))
-
-(defcustom helm-find-files-before-init-hook nil
-  "Hook that run before initialization of `helm-find-files'."
-  :group 'helm-files
-  :type 'hook)
-
-(defcustom helm-find-files-after-init-hook nil
-  "Hook that run after initialization of `helm-find-files'."
-  :group 'helm-files
-  :type 'hook)
-
-(defcustom helm-multi-files-toggle-locate-binding "C-c p"
-  "Default binding to switch back and forth locate in `helm-multi-files'."
-  :group 'helm-files
-  :type 'string)
-
-(defcustom helm-find-files-bookmark-prefix "Helm-find-files: "
-  "bookmark name prefix of `helm-find-files' sessions."
-  :group 'helm-files
-  :type 'string)
-
-;;; Faces
-;;
-;;
-(defgroup helm-files-faces nil
-  "Customize the appearance of helm-files."
-  :prefix "helm-"
-  :group 'helm-files
-  :group 'helm-faces)
-
-(defface helm-ff-prefix
-    '((t (:background "yellow" :foreground "black")))
-  "Face used to prefix new file or url paths in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-ff-executable
-    '((t (:foreground "green")))
-  "Face used for executable files in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-ff-directory
-    '((t (:foreground "DarkRed" :background "LightGray")))
-  "Face used for directories in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-ff-dotted-directory
-    '((t (:foreground "black" :background "DimGray")))
-  "Face used for dotted directories in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-ff-symlink
-    '((t (:foreground "DarkOrange")))
-  "Face used for symlinks in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-ff-invalid-symlink
-    '((t (:foreground "black" :background "red")))
-  "Face used for invalid symlinks in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-ff-file
-    '((t (:inherit font-lock-builtin-face)))
-  "Face used for file names in `helm-find-files'."
-  :group 'helm-files-faces)
-
-(defface helm-history-deleted
-    '((t (:inherit helm-ff-invalid-symlink)))
-  "Face used for deleted files in `file-name-history'."
-  :group 'helm-files-faces)
-
-(defface helm-history-remote
-    '((t (:foreground "Indianred1")))
-  "Face used for remote files in `file-name-history'."
-  :group 'helm-files-faces)
-
-
-;;; Helm-find-files - The helm file browser.
-;;
-;; Keymaps
-(defvar helm-find-files-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-]")           'helm-ff-run-toggle-basename)
-    (define-key map (kbd "C-x C-f")       'helm-ff-run-locate)
-    (define-key map (kbd "C-x C-d")       'helm-ff-run-browse-project)
-    (define-key map (kbd "C-x r m")       'helm-ff-bookmark-set)
-    (define-key map (kbd "C-x r b")       'helm-find-files-toggle-to-bookmark)
-    (define-key map (kbd "C-s")           'helm-ff-run-grep)
-    (define-key map (kbd "M-g s")         'helm-ff-run-grep)
-    (define-key map (kbd "M-g p")         'helm-ff-run-pdfgrep)
-    (define-key map (kbd "M-g z")         'helm-ff-run-zgrep)
-    (define-key map (kbd "C-c g")         'helm-ff-run-gid)
-    (define-key map (kbd "M-.")           'helm-ff-run-etags)
-    (define-key map (kbd "M-R")           'helm-ff-run-rename-file)
-    (define-key map (kbd "M-C")           'helm-ff-run-copy-file)
-    (define-key map (kbd "M-B")           'helm-ff-run-byte-compile-file)
-    (define-key map (kbd "M-L")           'helm-ff-run-load-file)
-    (define-key map (kbd "M-S")           'helm-ff-run-symlink-file)
-    (define-key map (kbd "M-H")           'helm-ff-run-hardlink-file)
-    (define-key map (kbd "M-D")           'helm-ff-run-delete-file)
-    (define-key map (kbd "M-K")           'helm-ff-run-kill-buffer-persistent)
-    (define-key map (kbd "C-c d")         'helm-ff-persistent-delete)
-    (define-key map (kbd "M-e")           'helm-ff-run-switch-to-eshell)
-    (define-key map (kbd "C-c i")         'helm-ff-run-complete-fn-at-point)
-    (define-key map (kbd "C-c o")         'helm-ff-run-switch-other-window)
-    (define-key map (kbd "C-c C-o")       'helm-ff-run-switch-other-frame)
-    (define-key map (kbd "C-c C-x")       'helm-ff-run-open-file-externally)
-    (define-key map (kbd "C-c X")         'helm-ff-run-open-file-with-default-tool)
-    (define-key map (kbd "M-!")           'helm-ff-run-eshell-command-on-file)
-    (define-key map (kbd "M-%")           'helm-ff-run-query-replace-on-marked)
-    (define-key map (kbd "C-c =")         'helm-ff-run-ediff-file)
-    (define-key map (kbd "M-=")           'helm-ff-run-ediff-merge-file)
-    (define-key map (kbd "M-p")           'helm-ff-run-switch-to-history)
-    (define-key map (kbd "C-c h")         'helm-ff-file-name-history)
-    (define-key map (kbd "M-i")           'helm-ff-properties-persistent)
-    (define-key map (kbd "C-c ?")         'helm-ff-help)
-    (define-key map (kbd "C-}")           'helm-narrow-window)
-    (define-key map (kbd "C-{")           'helm-enlarge-window)
-    (define-key map (kbd "C-<backspace>") 'helm-ff-run-toggle-auto-update)
-    (define-key map (kbd "C-c <DEL>")     'helm-ff-run-toggle-auto-update)
-    (define-key map (kbd "C-c C-a")       'helm-ff-run-gnus-attach-files)
-    (define-key map (kbd "C-c p")         'helm-ff-run-print-file)
-    (define-key map (kbd "C-c /")         'helm-ff-run-find-sh-command)
-    ;; Next 2 have no effect if candidate is not an image file.
-    (define-key map (kbd "M-l")           'helm-ff-rotate-left-persistent)
-    (define-key map (kbd "M-r")           'helm-ff-rotate-right-persistent)
-    (define-key map (kbd "C-.")           'helm-find-files-up-one-level)
-    (define-key map (kbd "C-l")           'helm-find-files-up-one-level)
-    (define-key map (kbd "C-h C-b")       'helm-send-bug-report-from-helm)
-    (define-key map (kbd "C-c r")         'helm-ff-run-find-file-as-root)
-    (define-key map (kbd "C-c @")         'helm-ff-run-insert-org-link)
-    (helm-define-key-with-subkeys map (kbd "DEL") ?\d 'helm-ff-delete-char-backward
-                                  nil nil 'helm-ff-delete-char-backward--exit-fn)
-    (when helm-ff-lynx-style-map
-      (define-key map (kbd "<left>")      'helm-find-files-up-one-level)
-      (define-key map (kbd "<right>")     'helm-execute-persistent-action))
-    (delq nil map))
-  "Keymap for `helm-find-files'.")
-
-(defvar helm-read-file-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "<C-return>")    'helm-cr-empty-string)
-    (define-key map (kbd "<M-RET>")       'helm-cr-empty-string)
-    (define-key map (kbd "C-]")           'helm-ff-run-toggle-basename)
-    (define-key map (kbd "C-.")           'helm-find-files-up-one-level)
-    (define-key map (kbd "C-l")           'helm-find-files-up-one-level)
-    (define-key map (kbd "C-c h")         'helm-ff-file-name-history)
-    (define-key map (kbd "C-<backspace>") 'helm-ff-run-toggle-auto-update)
-    (define-key map (kbd "C-c <DEL>")     'helm-ff-run-toggle-auto-update)
-    (define-key map (kbd "C-c ?")         'helm-read-file-name-help)
-    (helm-define-key-with-subkeys map (kbd "DEL") ?\d 'helm-ff-delete-char-backward
-                                  nil nil 'helm-ff-delete-char-backward--exit-fn)
-    (when helm-ff-lynx-style-map
-      (define-key map (kbd "<left>")      'helm-find-files-up-one-level)
-      (define-key map (kbd "<right>")     'helm-execute-persistent-action)
-      (define-key map (kbd "<M-left>")    'helm-previous-source)
-      (define-key map (kbd "<M-right>")   'helm-next-source))
-    (delq nil map))
-  "Keymap for `helm-read-file-name'.")
-
-(defvar helm-esh-on-file-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?")    'helm-esh-help)
-    map)
-  "Keymap for `helm-find-files-eshell-command-on-file'.")
-
-
-;; Internal.
-(defvar helm-find-files-doc-header " (`C-l': Go up one level)"
-  "*The doc that is inserted in the Name header of a find-files or dired source.")
-(defvar helm-ff-auto-update-flag nil
-  "Internal, flag to turn on/off auto-update in `helm-find-files'.
-Don't set it directly, use instead `helm-ff-auto-update-initial-value'.")
-(defvar helm-ff-last-expanded nil
-  "Store last expanded directory or file.")
-(defvar helm-ff-default-directory nil)
-(defvar helm-ff-history nil)
-(defvar helm-ff-cand-to-mark nil)
-(defvar helm-ff-url-regexp
-  "\\`\\(news\\(post\\)?:\\|nntp:\\|mailto:\\|file:\\|\\(ftp\\|https?\\|telnet\\|gopher\\|www\\|wais\\):/?/?\\).*"
-  "Same as `ffap-url-regexp' but match earlier possible url.")
-(defvar helm-tramp-file-name-regexp "\\`/\\([^[/:]+\\|[^/]+]\\):")
-(defvar helm-marked-buffer-name "*helm marked*")
-(defvar helm-ff--auto-update-state nil)
-(defvar helm-ff--deleting-char-backward nil)
-(defvar helm-multi-files--toggle-locate nil)
-(defvar helm-ff--move-to-first-real-candidate t)
-(defvar helm-find-files--toggle-bookmark nil)
-
-
-;;; Helm-find-files
-;;
-;;
-(defvar helm-source-find-files nil
-  "The main source to browse files.
-Should not be used among other sources.")
-
-(defclass helm-source-ffiles (helm-source-sync)
-  ((header-name
-    :initform (lambda (name)
-                (concat name helm-find-files-doc-header)))
-   (init
-    :initform (lambda ()
-                (setq helm-ff-auto-update-flag
-                      helm-ff-auto-update-initial-value)
-                (setq helm-ff--auto-update-state
-                      helm-ff-auto-update-flag)
-                (helm-set-local-variable 'bookmark-make-record-function
-                                         #'helm-ff-make-bookmark-record)))
-   (candidates :initform 'helm-find-files-get-candidates)
-   (filtered-candidate-transformer :initform 'helm-ff-sort-candidates)
-   (filter-one-by-one :initform 'helm-ff-filter-candidate-one-by-one)
-   (persistent-action :initform 'helm-find-files-persistent-action)
-   (persistent-help :initform "Hit1 Expand Candidate, Hit2 or (C-u) Find file")
-   (mode-line :initform helm-ff-mode-line-string)
-   (volatile :initform t)
-   (nohighlight :initform t)
-   (keymap :initform helm-find-files-map)
-   (candidate-number-limit
-    :initform 9999)
-   (action-transformer
-    :initform 'helm-find-files-action-transformer)
-   (action
-    :initform
-    (helm-make-actions
-     "Find File" 'helm-find-file-or-marked
-     "Find file in Dired" 'helm-point-file-in-dired
-     (lambda () (and (locate-library "elscreen") "Find file in Elscreen"))
-     'helm-elscreen-find-file
-     "View file" 'view-file
-     "Checksum File" 'helm-ff-checksum
-     "Query replace fnames on marked" 'helm-ff-query-replace-on-marked
-     "Query replace contents on marked" 'helm-ff-query-replace
-     "Query replace regexp contents on marked" 'helm-ff-query-replace-regexp
-     "Serial rename files" 'helm-ff-serial-rename
-     "Serial rename by symlinking files" 'helm-ff-serial-rename-by-symlink
-     "Serial rename by copying files" 'helm-ff-serial-rename-by-copying
-     "Open file with default tool" 'helm-open-file-with-default-tool
-     "Find file in hex dump" 'hexl-find-file
-     "Browse project" 'helm-ff-browse-project
-     "Complete at point `C-c i'" 'helm-insert-file-name-completion-at-point
-     "Insert as org link `C-c @'" 'helm-files-insert-as-org-link
-     "Find shell command `C-c /'" 'helm-ff-find-sh-command
-     "Add marked files to file-cache" 'helm-ff-cache-add-file
-     "Open file externally `C-c C-x, C-u to choose'" 'helm-open-file-externally
-     "Grep File(s) `C-s, C-u Recurse'" 'helm-find-files-grep
-     "Zgrep File(s) `M-g z, C-u Recurse'" 'helm-ff-zgrep
-     "Gid" 'helm-ff-gid
-     "Switch to Eshell `M-e'" 'helm-ff-switch-to-eshell
-     "Etags `M-., C-u reload tag file'" 'helm-ff-etags-select
-     "Eshell command on file(s) `M-!, C-u take all marked as arguments.'"
-     'helm-find-files-eshell-command-on-file
-     "Find file as root `C-c r'" 'helm-find-file-as-root
-     "Ediff File `C-='" 'helm-find-files-ediff-files
-     "Ediff Merge File `C-c ='" 'helm-find-files-ediff-merge-files
-     "Delete File(s) `M-D'" 'helm-delete-marked-files
-     "Copy file(s) `M-C, C-u to follow'" 'helm-find-files-copy
-     "Rename file(s) `M-R, C-u to follow'" 'helm-find-files-rename
-     "Symlink files(s) `M-S, C-u to follow'" 'helm-find-files-symlink
-     "Relsymlink file(s) `C-u to follow'" 'helm-find-files-relsymlink
-     "Hardlink file(s) `M-H, C-u to follow'" 'helm-find-files-hardlink
-     "Find file other window `C-c o'" 'find-file-other-window
-     "Switch to history `M-p'" 'helm-find-files-switch-to-hist
-     "Find file other frame `C-c C-o'" 'find-file-other-frame
-     "Print File `C-c p, C-u to refresh'" 'helm-ff-print
-     "Locate `C-x C-f, C-u to specify locate db'" 'helm-ff-locate))
-   (before-init-hook :initform 'helm-find-files-before-init-hook)
-   (after-init-hook :initform 'helm-find-files-after-init-hook)))
-
-;; Bookmark handlers.
-;;
-(defun helm-ff-make-bookmark-record ()
-  "The `bookmark-make-record-function' for `helm-find-files'."
-  (with-helm-buffer
-    `((filename . ,helm-ff-default-directory)
-      (presel . ,(helm-get-selection))
-      (handler . helm-ff-bookmark-jump))))
-
-(defun helm-ff-bookmark-jump (bookmark)
-  "bookmark handler for `helm-find-files'."
-  (let ((fname (bookmark-prop-get bookmark 'filename))
-        (presel (bookmark-prop-get bookmark 'presel)))
-    (helm-find-files-1 fname (if helm-ff-transformer-show-only-basename
-                                 (helm-basename presel)
-                                 presel))))
-
-(defun helm-ff-bookmark-set ()
-  "Record `helm-find-files' session in bookmarks."
-  (interactive)
-  (with-helm-buffer
-    (bookmark-set
-     (concat helm-find-files-bookmark-prefix
-             (abbreviate-file-name helm-ff-default-directory))))
-  (message "Helm find files session bookmarked! "))
-
-(defun helm-dwim-target-directory ()
-  "Return value of `default-directory' of buffer in other window.
-If there is only one window return the value ot `default-directory'
-for current buffer."
-  (with-helm-current-buffer
-    (let ((num-windows (length (remove (get-buffer-window helm-marked-buffer-name)
-                                       (window-list)))))
-      (expand-file-name
-       (if (> num-windows 1)
-           (save-selected-window
-             (other-window 1)
-             default-directory)
-           ;; Using the car of *ff-history allow
-           ;; allow staying in the directory visited instead of current.
-           (or (car-safe helm-ff-history) default-directory))))))
-
-(defun helm-find-files-do-action (action)
-  "Generic function for creating actions from `helm-source-find-files'.
-ACTION must be an action supported by `helm-dired-action'."
-  (let* ((ifiles (mapcar 'expand-file-name ; Allow modify '/foo/.' -> '/foo'
-                         (helm-marked-candidates :with-wildcard t)))
-         (cand   (helm-get-selection)) ; Target
-         (prompt (format "%s %s file(s) to: "
-                         (capitalize (symbol-name action))
-                         (length ifiles)))
-         helm-ff--move-to-first-real-candidate
-         (helm-always-two-windows t)
-         (helm-reuse-last-window-split-state t)
-         (helm-split-window-default-side
-          (eq helm-split-window-default-side 'same))
-         helm-split-window-in-side-p
-         (parg   helm-current-prefix-arg)
-         helm-display-source-at-screen-top ; prevent setting window-start.
-         helm-ff-auto-update-initial-value
-         (dest   (with-helm-display-marked-candidates
-                   helm-marked-buffer-name
-                   (mapcar #'(lambda (f)
-                               (if (file-directory-p f)
-                                   (concat (helm-basename f) "/")
-                                 (helm-basename f)))
-                           ifiles)
-                   (with-helm-current-buffer
-                     (helm-read-file-name
-                      prompt
-                      :preselect (unless (cdr ifiles)
-                                   (if helm-ff-transformer-show-only-basename
-                                       (helm-basename cand) cand))
-                      :initial-input (helm-dwim-target-directory)
-                      :history (helm-find-files-history :comp-read nil))))))
-    (helm-dired-action
-     dest :files ifiles :action action :follow parg)))
-
-(defun helm-find-files-copy (_candidate)
-  "Copy files from `helm-find-files'."
-  (helm-find-files-do-action 'copy))
-
-(defun helm-find-files-rename (_candidate)
-  "Rename files from `helm-find-files'."
-  (helm-find-files-do-action 'rename))
-
-(defun helm-find-files-symlink (_candidate)
-  "Symlink files from `helm-find-files'."
-  (helm-find-files-do-action 'symlink))
-
-(defun helm-find-files-relsymlink (_candidate)
-  "Relsymlink files from `helm-find-files'."
-  (helm-find-files-do-action 'relsymlink))
-
-(defun helm-find-files-hardlink (_candidate)
-  "Hardlink files from `helm-find-files'."
-  (helm-find-files-do-action 'hardlink))
-
-(defun helm-find-files-byte-compile (_candidate)
-  "Byte compile elisp files from `helm-find-files'."
-  (let ((files    (helm-marked-candidates :with-wildcard t))
-        (parg     helm-current-prefix-arg))
-    (cl-loop for fname in files
-          do (byte-compile-file fname parg))))
-
-(defun helm-find-files-load-files (_candidate)
-  "Load elisp files from `helm-find-files'."
-  (let ((files    (helm-marked-candidates :with-wildcard t)))
-    (cl-loop for fname in files
-          do (load fname))))
-
-(defun helm-find-files-ediff-files-1 (candidate &optional merge)
-  "Generic function to ediff/merge files in `helm-find-files'."
-  (let* ((bname  (helm-basename candidate))
-         (marked (helm-marked-candidates :with-wildcard t))
-         (prompt (if merge "Ediff Merge `%s' With File: "
-                   "Ediff `%s' With File: "))
-         (fun    (if merge 'ediff-merge-files 'ediff-files))
-         (input  (helm-dwim-target-directory))
-         (presel (if helm-ff-transformer-show-only-basename
-                     (helm-basename candidate)
-                   (expand-file-name
-                    (helm-basename candidate)
-                    input))))
-    (if (= (length marked) 2)
-        (funcall fun (car marked) (cadr marked))
-      (funcall fun candidate (helm-read-file-name
-                              (format prompt bname)
-                              :initial-input input
-                              :preselect presel)))))
-
-(defun helm-find-files-ediff-files (candidate)
-  (helm-find-files-ediff-files-1 candidate))
-
-(defun helm-find-files-ediff-merge-files (candidate)
-  (helm-find-files-ediff-files-1 candidate 'merge))
-
-(defun helm-find-files-grep (_candidate)
-  "Default action to grep files from `helm-find-files'."
-  (apply 'run-with-timer 0.01 nil
-         #'helm-do-grep-1
-         (helm-marked-candidates :with-wildcard t)
-         helm-current-prefix-arg))
-
-(defun helm-ff-zgrep (_candidate)
-  "Default action to zgrep files from `helm-find-files'."
-  (helm-ff-zgrep-1 (helm-marked-candidates :with-wildcard t) helm-current-prefix-arg))
-
-(defun helm-ff-pdfgrep (_candidate)
-  "Default action to pdfgrep files from `helm-find-files'."
-  (let ((cands (cl-loop for file in (helm-marked-candidates :with-wildcard t)
-                     if (or (string= (file-name-extension file) "pdf")
-                            (string= (file-name-extension file) "PDF"))
-                     collect file))
-        (helm-pdfgrep-default-function 'helm-pdfgrep-init))
-    (when cands
-      (helm-do-pdfgrep-1 cands))))
-
-(defun helm-ff-etags-select (candidate)
-  "Default action to jump to etags from `helm-find-files'."
-  (when (get-buffer helm-action-buffer)
-    (kill-buffer helm-action-buffer))
-  (let* ((source-name (assoc-default 'name (helm-get-current-source)))
-         (default-directory (if (string= source-name "Find Files")
-                                helm-ff-default-directory
-                              (file-name-directory candidate))))
-    (helm-etags-select helm-current-prefix-arg)))
-
-(defun helm-find-files-switch-to-hist (_candidate)
-  "Switch to helm-find-files history."
-  (helm-find-files t))
-
-(defvar eshell-command-aliases-list nil)
-(defvar helm-eshell-command-on-file-input-history nil)
-(defun helm-find-files-eshell-command-on-file-1 (&optional map)
-  "Run `eshell-command' on CANDIDATE or marked candidates.
-This is done possibly with an eshell alias, if no alias found, you can type in
-an eshell command.
-
-Basename of CANDIDATE can be a wild-card.
-e.g you can do \"eshell-command command *.el\"
-Where \"*.el\" is the CANDIDATE.
-
-It is possible to do eshell-command command <CANDIDATE> <some more args>
-like this: \"command %s some more args\".
-
-If MAP is given run `eshell-command' on all marked files at once,
-Otherwise, run `eshell-command' on each marked files.
-In other terms, with a prefix arg do on the three marked files
-\"foo\" \"bar\" \"baz\":
-
-\"eshell-command command foo bar baz\"
-
-otherwise do
-
-\"eshell-command command foo\"
-\"eshell-command command bar\"
-\"eshell-command command baz\"
-
-Note:
-If `eshell' or `eshell-command' have not been run once,
-or if you have no eshell aliases `eshell-command-aliases-list'
-will not be loaded first time you use this."
-  (when (or eshell-command-aliases-list
-            (y-or-n-p "Eshell is not loaded, run eshell-command without alias anyway? "))
-    (and eshell-command-aliases-list (eshell-read-aliases-list))
-    (let* ((cand-list (helm-marked-candidates))
-           (default-directory (or helm-ff-default-directory
-                                  ;; If candidate is an url *-ff-default-directory is nil
-                                  ;; so keep value of default-directory.
-                                  default-directory))
-           (command (helm-comp-read
-                     "Command: "
-                     (cl-loop for (a . c) in eshell-command-aliases-list
-                              when (string-match "\\(\\$1\\|\\$\\*\\)$" (car c))
-                              collect (propertize a 'help-echo (car c)) into ls
-                              finally return (sort ls 'string<))
-                     :buffer "*helm eshell on file*"
-                     :name "Eshell command"
-                     :keymap helm-esh-on-file-map
-                     :mode-line
-                     '("Eshell alias"
-                       "C-c ?: Help, \\[universal-argument]: Insert output at point")
-                     :input-history
-                     'helm-eshell-command-on-file-input-history))
-           (alias-value (car (assoc-default command eshell-command-aliases-list)))
-           cmd-line)
-      (if (or (equal helm-current-prefix-arg '(16))
-              (equal map '(16)))
-          ;; Two time C-u from `helm-comp-read' mean print to current-buffer.
-          ;; i.e `eshell-command' will use this value.
-          (setq current-prefix-arg '(16))
-          ;; Else reset the value of `current-prefix-arg'
-          ;; to avoid printing in current-buffer.
-          (setq current-prefix-arg nil))
-      (if (and (or
-                ;; One prefix-arg have been passed before `helm-comp-read'.
-                ;; If map have been set with C-u C-u (value == '(16))
-                ;; ignore it.
-                (and map (equal map '(4)))
-                ;; One C-u from `helm-comp-read'.
-                (equal helm-current-prefix-arg '(4))
-                ;; An alias that finish with $*
-                (and alias-value
-                     ;; If command is an alias be sure it accept
-                     ;; more than one arg i.e $*.
-                     (string-match "\\$\\*$" alias-value)))
-               (cdr cand-list))
-
-          ;; Run eshell-command with ALL marked files as arguments.
-          ;; This wont work on remote files, because tramp handlers depends
-          ;; on `default-directory' (limitation).
-          (let ((mapfiles (mapconcat 'eshell-quote-argument cand-list " ")))
-            (if (string-match "'%s'\\|\"%s\"\\|%s" command)
-                (setq cmd-line (format command mapfiles)) ; See [1]
-                (setq cmd-line (format "%s %s" command mapfiles)))
-            (helm-log "%S" cmd-line)
-            (eshell-command cmd-line))
-
-          ;; Run eshell-command on EACH marked files.
-          ;; To work with tramp handler we have to call
-          ;; COMMAND on basename of each file, using
-          ;; its basedir as `default-directory'.
-          (cl-loop for f in cand-list
-                   for dir = (and (not (string-match ffap-url-regexp f))
-                                  (helm-basedir f))
-                   for file = (eshell-quote-argument
-                               (format "%s" (if (and dir (file-remote-p dir))
-                                                (helm-basename f) f)))
-                   for com = (if (string-match "'%s'\\|\"%s\"\\|%s" command)
-                                 ;; [1] This allow to enter other args AFTER filename
-                                 ;; i.e <command %s some_more_args>
-                                 (format command file)
-                                 (format "%s %s" command file))
-                   do (let ((default-directory (or dir default-directory)))
-                        (eshell-command com)))))))
-
-(defun helm-find-files-eshell-command-on-file (_candidate)
-  "Run `eshell-command' on CANDIDATE or marked candidates.
-See `helm-find-files-eshell-command-on-file-1' for more info."
-  (helm-find-files-eshell-command-on-file-1 helm-current-prefix-arg))
-
-(defun helm-ff-switch-to-eshell (_candidate)
-  "Switch to eshell and cd to `helm-ff-default-directory'."
-  (let ((cd-eshell #'(lambda ()
-                       (eshell-kill-input)
-                       (goto-char (point-max))
-                       (insert
-                        (format "cd '%s'" helm-ff-default-directory))
-                       (eshell-send-input))))
-    (if (get-buffer "*eshell*")
-        (switch-to-buffer "*eshell*")
-      (call-interactively 'eshell))
-    (unless (get-buffer-process (current-buffer))
-      (funcall cd-eshell))))
-
-(defun helm-ff-serial-rename-action (method)
-  "Rename all marked files in `helm-ff-default-directory' with METHOD.
-See `helm-ff-serial-rename-1'."
-  (let* ((helm--reading-passwd-or-string t)
-         (cands     (helm-marked-candidates :with-wildcard t))
-         (def-name  (car cands))
-         (name      (helm-read-string "NewName: "
-                                      (replace-regexp-in-string
-                                       "[0-9]+$" ""
-                                       (helm-basename
-                                        def-name
-                                        (file-name-extension def-name)))))
-         (start     (read-number "StartAtNumber: "))
-         (extension (helm-read-string "Extension: "
-                                      (file-name-extension (car cands))))
-         (dir       (expand-file-name
-                     (helm-read-file-name
-                      "Serial Rename to directory: "
-                      :initial-input
-                      (expand-file-name helm-ff-default-directory)
-                      :test 'file-directory-p
-                      :must-match t)))
-         done)
-    (with-helm-display-marked-candidates
-      helm-marked-buffer-name (mapcar 'helm-basename cands)
-      (if (y-or-n-p
-           (format "Rename %s file(s) to <%s> like this ?\n%s "
-                   (length cands) dir (format "%s <-> %s%s.%s"
-                                              (helm-basename (car cands))
-                                              name start extension)))
-          (progn
-            (helm-ff-serial-rename-1
-             dir cands name start extension :method method)
-            (setq done t)
-            (message nil))))
-    (if done
-        (with-helm-current-buffer (helm-find-files-1 dir))
-      (message "Operation aborted"))))
-
-(defun helm-ff-member-directory-p (file directory)
-  (let ((dir-file (expand-file-name
-                   (file-name-as-directory (file-name-directory file))))
-        (cur-dir  (expand-file-name (file-name-as-directory directory))))
-    (string= dir-file cur-dir)))
-
-(cl-defun helm-ff-serial-rename-1
-    (directory collection new-name start-at-num extension &key (method 'rename))
-  "rename files in COLLECTION to DIRECTORY with the prefix name NEW-NAME.
-Rename start at number START-AT-NUM - ex: prefixname-01.jpg.
-EXTENSION is the file extension to use, in empty prompt,
-reuse the original extension of file.
-METHOD can be one of rename, copy or symlink.
-Files will be renamed if they are files of current directory, otherwise they
-will be treated with METHOD.
-Default METHOD is rename."
-  ;; Maybe remove directories selected by error in collection.
-  (setq collection (cl-remove-if 'file-directory-p collection))
-  (let* ((tmp-dir  (file-name-as-directory
-                    (concat (file-name-as-directory directory)
-                            (symbol-name (cl-gensym "tmp")))))
-         (fn       (cl-case method
-                     (copy    'copy-file)
-                     (symlink 'make-symbolic-link)
-                     (rename  'rename-file)
-                     (t (error "Error: Unknown method %s" method)))))
-    (make-directory tmp-dir)
-    (unwind-protect
-         (progn
-           ;; Rename all files to tmp-dir with new-name.
-           ;; If files are not from start directory, use method
-           ;; to move files to tmp-dir.
-           (cl-loop for i in collection
-                 for count from start-at-num
-                 for fnum = (if (< count 10) "0%s" "%s")
-                 for nname = (concat tmp-dir new-name (format fnum count)
-                                     (if (not (string= extension ""))
-                                         (format ".%s" (replace-regexp-in-string
-                                                        "[.]" "" extension))
-                                       (file-name-extension i 'dot)))
-                 do (if (helm-ff-member-directory-p i directory)
-                        (rename-file i nname)
-                      (funcall fn i nname)))
-           ;; Now move all from tmp-dir to destination.
-           (cl-loop with dirlist = (directory-files
-                                    tmp-dir t directory-files-no-dot-files-regexp)
-                 for f in dirlist do
-                 (if (file-symlink-p f)
-                     (make-symbolic-link (file-truename f)
-                                         (concat (file-name-as-directory directory)
-                                                 (helm-basename f)))
-                   (rename-file f directory))))
-      (delete-directory tmp-dir t))))
-
-(defun helm-ff-serial-rename (_candidate)
-  "Serial rename all marked files to `helm-ff-default-directory'.
-Rename only file of current directory, and symlink files coming from
-other directories.
-See `helm-ff-serial-rename-1'."
-  (helm-ff-serial-rename-action 'rename))
-
-(defun helm-ff-serial-rename-by-symlink (_candidate)
-  "Serial rename all marked files to `helm-ff-default-directory'.
-Rename only file of current directory, and symlink files coming from
-other directories.
-See `helm-ff-serial-rename-1'."
-  (helm-ff-serial-rename-action 'symlink))
-
-(defun helm-ff-serial-rename-by-copying (_candidate)
-  "Serial rename all marked files to `helm-ff-default-directory'.
-Rename only file of current directory, and copy files coming from
-other directories.
-See `helm-ff-serial-rename-1'."
-  (helm-ff-serial-rename-action 'copy))
-
-(defun helm-ff-query-replace-on-marked-1 (candidates)
-  (with-helm-display-marked-candidates
-    helm-marked-buffer-name
-    (mapcar 'helm-basename candidates)
-    (let* ((regexp (read-string "Replace regexp on filename(s): "))
-           (str    (read-string (format "Replace regexp `%s' with: " regexp))))
-      (cl-loop with query = "y"
-               with count = 0
-               for old in candidates
-               for new = (concat (helm-basedir old)
-                                 (replace-regexp-in-string
-                                  regexp str
-                                  (helm-basename old)))
-               ;; If `regexp' is not matched in `old'
-               ;; `replace-regexp-in-string' will
-               ;; return `old' unmodified.
-               unless (string= old new)
-               do (progn
-                    (unless (string= query "!")
-                      (while (not (member
-                                   (setq query
-                                         (string
-                                          (read-key
-                                           (propertize
-                                            (format
-                                             "Replace `%s' by `%s' [!,y,n,q]"
-                                             old new)
-                                            'face 'minibuffer-prompt))))
-                                   '("y" "!" "n" "q")))
-                        (message "Please answer by y,n,! or q") (sit-for 1)))
-                    (when (string= query "q")
-                      (cl-return (message "Operation aborted")))
-                    (unless (string= query "n")
-                      (rename-file old new)
-                      (cl-incf count)))
-               finally (message "%d Files renamed" count))))
-  ;; This fix the emacs bug where "Emacs-Lisp:" is sent
-  ;; in minibuffer (not the echo area).
-  (sit-for 0.1)
-  (with-current-buffer (window-buffer (minibuffer-window))
-    (delete-minibuffer-contents)))
-
-;; The action.
-(defun helm-ff-query-replace-on-marked (_candidate)
-  (let ((marked (helm-marked-candidates)))
-    (helm-run-after-quit #'helm-ff-query-replace-on-marked-1 marked)))
-
-;; The command for `helm-find-files-map'.
-(defun helm-ff-run-query-replace-on-marked ()
-  (interactive)
-  (helm-ff-query-replace-on-marked nil))
-
-(defun helm-ff-query-replace (_candidate)
-  (let ((bufs (cl-loop for f in (helm-marked-candidates)
-                       collect (buffer-name (find-file-noselect f)))))
-    (helm-run-after-quit #'helm-buffer-query-replace-1 nil bufs)))
-
-(defun helm-ff-query-replace-regexp (_candidate)
-  (let ((bufs (cl-loop for f in (helm-marked-candidates)
-                       collect (buffer-name (find-file-noselect f)))))
-    (helm-run-after-quit #'helm-buffer-query-replace-1 'regexp bufs)))
-
-(defun helm-ff-run-query-replace ()
-  (interactive)
-  (helm-ff-query-replace nil))
-
-(defun helm-ff-run-query-replace-regexp ()
-  (interactive)
-  (helm-ff-query-replace-regexp nil))
-
-(defun helm-ff-toggle-auto-update (_candidate)
-  (setq helm-ff-auto-update-flag (not helm-ff-auto-update-flag))
-  (setq helm-ff--auto-update-state helm-ff-auto-update-flag)
-  (message "[Auto expansion %s]"
-           (if helm-ff-auto-update-flag "enabled" "disabled")))
-
-(defun helm-ff-run-toggle-auto-update ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'toggle-auto-update '(helm-ff-toggle-auto-update . never-split))
-    (helm-execute-persistent-action 'toggle-auto-update)))
-
-(defun helm-ff-delete-char-backward ()
-  "Disable helm find files auto update and delete char backward."
-  (interactive)
-  (setq helm-ff-auto-update-flag nil)
-  (setq helm-ff--deleting-char-backward t)
-  (call-interactively
-   (lookup-key (current-global-map)
-               (read-kbd-macro "DEL"))))
-
-(defun helm-ff-delete-char-backward--exit-fn ()
-  (setq helm-ff-auto-update-flag helm-ff--auto-update-state)
-  (setq helm-ff--deleting-char-backward nil))
-
-(defun helm-ff-run-switch-to-history ()
-  "Run Switch to history action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (when (helm-file-completion-source-p)
-      (helm-quit-and-execute-action 'helm-find-files-switch-to-hist))))
-
-(defun helm-ff-run-grep ()
-  "Run Grep action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-grep)))
-
-(defun helm-ff-run-pdfgrep ()
-  "Run Pdfgrep action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-pdfgrep)))
-
-(defun helm-ff-run-zgrep ()
-  "Run Grep action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-zgrep)))
-
-(defun helm-ff-run-copy-file ()
-  "Run Copy file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-copy)))
-
-(defun helm-ff-run-rename-file ()
-  "Run Rename file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-rename)))
-
-(defun helm-ff-run-byte-compile-file ()
-  "Run Byte compile file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-byte-compile)))
-
-(defun helm-ff-run-load-file ()
-  "Run Load file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-load-files)))
-
-(defun helm-ff-run-eshell-command-on-file ()
-  "Run eshell command on file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action
-     'helm-find-files-eshell-command-on-file)))
-
-(defun helm-ff-run-ediff-file ()
-  "Run Ediff file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-ediff-files)))
-
-(defun helm-ff-run-ediff-merge-file ()
-  "Run Ediff merge file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action
-     'helm-find-files-ediff-merge-files)))
-
-(defun helm-ff-run-symlink-file ()
-  "Run Symlink file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-symlink)))
-
-(defun helm-ff-run-hardlink-file ()
-  "Run Hardlink file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-files-hardlink)))
-
-(defun helm-ff-run-delete-file ()
-  "Run Delete file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-delete-marked-files)))
-
-(defun helm-ff-run-complete-fn-at-point ()
-  "Run complete file name action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action
-     'helm-insert-file-name-completion-at-point)))
-
-(defun helm-ff-run-switch-to-eshell ()
-  "Run switch to eshell action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-switch-to-eshell)))
-
-(defun helm-ff-run-switch-other-window ()
-  "Run switch to other window action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'find-file-other-window)))
-
-(defun helm-ff-run-switch-other-frame ()
-  "Run switch to other frame action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'find-file-other-frame)))
-
-(defun helm-ff-run-open-file-externally ()
-  "Run open file externally command action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-open-file-externally)))
-
-(defun helm-ff-run-open-file-with-default-tool ()
-  "Run open file externally command action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-open-file-with-default-tool)))
-
-(defun helm-ff-locate (candidate)
-  "Locate action function for `helm-find-files'."
-  (helm-locate-set-command)
-  (let ((input (concat (helm-basename
-                        (expand-file-name
-                         candidate
-                         helm-ff-default-directory))
-                       ;; The locate '-b' option doesn't exists
-                       ;; in everything (es).
-                       (unless (and (eq system-type 'windows-nt)
-                                    (string-match "^es" helm-locate-command))
-                         " -b"))))
-    (helm-locate-1 helm-current-prefix-arg nil 'from-ff input)))
-
-(defun helm-ff-run-locate ()
-  "Run locate action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-locate)))
-
-(defun helm-files-insert-as-org-link (candidate)
-  (insert (format "[[%s][]]" candidate))
-  (goto-char (- (point) 2)))
-
-(defun helm-ff-run-insert-org-link ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-files-insert-as-org-link)))
-
-(defun helm-ff-run-find-file-as-root ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-find-file-as-root)))
-
-(defun helm-ff-run-gnus-attach-files ()
-  "Run gnus attach files command action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-gnus-attach-files)))
-
-(defun helm-ff-run-etags ()
-  "Run Etags command action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-etags-select)))
-
-(defvar lpr-printer-switch)
-(defun helm-ff-print (_candidate)
-  "Print marked files.
-
-You may to set in order
-variables `lpr-command',`lpr-switches' and/or `printer-name',
-but with no settings helm should detect your printer(s) and
-print with the default `lpr' settings.
-
-NOTE: DO NOT set the \"-P\" flag in `lpr-switches', if you really
-have to modify this, do it in `lpr-printer-switch'.
-  
-Same as `dired-do-print' but for helm."
-  (require 'lpr)
-  (when (or helm-current-prefix-arg
-            (not helm-ff-printer-list))
-    (setq helm-ff-printer-list
-          (helm-ff-find-printers)))
-  (let* ((file-list (helm-marked-candidates :with-wildcard t))
-         (len (length file-list))
-         (printer-name (if helm-ff-printer-list
-                           (helm-comp-read
-                            "Printer: " helm-ff-printer-list)
-                         printer-name))
-         (lpr-switches
-	  (if (and (stringp printer-name)
-		   (string< "" printer-name))
-	      (cons (concat lpr-printer-switch printer-name)
-		    lpr-switches)
-              lpr-switches))
-         (command (helm-read-string
-                   (format "Print *%s File(s):\n%s with: "
-                           len
-                           (mapconcat
-                            (lambda (f) (format "- %s\n" f))
-                            file-list ""))
-                   (when (and lpr-command lpr-switches)
-                     (mapconcat 'identity
-                                (cons lpr-command
-                                      (if (stringp lpr-switches)
-                                          (list lpr-switches)
-                                          lpr-switches))
-                                " "))))
-         (file-args (mapconcat #'(lambda (x)
-                                   (format "'%s'" x))
-                               file-list " "))
-         (cmd-line (concat command " " file-args)))
-    (if command
-        (start-process-shell-command "helm-print" nil cmd-line)
-      (error "Error: Please verify your printer settings in Emacs."))))
-
-(defun helm-ff-run-print-file ()
-  "Run Print file action from `helm-source-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-print)))
-
-(defun helm-ff-checksum (file)
-  "Calculate the checksum of FILE.
-The checksum is copied to kill-ring."
-  (let ((algo (intern (helm-comp-read
-                       "Algorithm: "
-                       '(md5 sha1 sha224 sha256 sha384 sha512)))))
-    (kill-new (with-temp-buffer
-                (insert-file-contents-literally file)
-                (secure-hash algo (current-buffer))))
-    (message "Checksum copied to kill-ring.")))
-
-(defun helm-ff-toggle-basename (_candidate)
-  (with-helm-buffer
-    (setq helm-ff-transformer-show-only-basename
-          (not helm-ff-transformer-show-only-basename))
-    (let* ((cand   (helm-get-selection nil t))
-           (target (if helm-ff-transformer-show-only-basename
-                       (helm-basename cand) cand)))
-      (helm-force-update (regexp-quote target)))))
-
-(defun helm-ff-run-toggle-basename ()
-  (interactive)
-  (with-helm-alive-p
-    (unless (helm-empty-source-p)
-      (helm-ff-toggle-basename nil))))
-
-(cl-defun helm-reduce-file-name (fname level &key unix-close expand)
-  "Reduce FNAME by LEVEL from end or beginning depending LEVEL value.
-If LEVEL is positive reduce from end else from beginning.
-If UNIX-CLOSE is non--nil close filename with /.
-If EXPAND is non--nil expand-file-name."
-  (let* ((exp-fname  (expand-file-name fname))
-         (fname-list (split-string (if (or (string= fname "~/") expand)
-                                       exp-fname fname) "/" t))
-         (len        (length fname-list))
-         (pop-list   (if (< level 0)
-                         (cl-subseq fname-list (* level -1))
-                       (cl-subseq fname-list 0 (- len level))))
-         (result     (mapconcat 'identity pop-list "/"))
-         (empty      (string= result "")))
-    (when unix-close (setq result (concat result "/")))
-    (if (string-match "^~" result)
-        (if (string= result "~/") "~/" result)
-      (if (< level 0)
-          (if empty "../" (concat "../" result))
-        (cond ((eq system-type 'windows-nt)
-               (if empty (expand-file-name "/") ; Expand to "/" or "c:/".
-                 result))
-              (empty "/")
-              (t
-               (concat "/" result)))))))
-
-;; Internal
-(defvar helm--file-completion-sources
-  '("Find Files" "Read File Name" "Read File Name History"
-    "Files from Current Directory")
-  "Sources that use the *find-files mechanism can be added here.
-Sources generated by `helm-mode' don't need to be added here, it will
-be done automatically.
-You should not modify this yourself unless you know what you do.")
-
-(defun helm-file-completion-source-p ()
-  "Return non--nil if current source is a file completion source."
-  (or minibuffer-completing-file-name
-      (let ((cur-source (cdr (assoc 'name (helm-get-current-source)))))
-        (cl-loop for i in helm--file-completion-sources
-              thereis (string= cur-source i)))))
-
-(defun helm-find-files-up-one-level (arg)
-  "Go up one level like unix command `cd ..'.
-If prefix numeric arg is given go ARG level up."
-  (interactive "p")
-  (with-helm-alive-p
-    (when (and (helm-file-completion-source-p)
-               (not (helm-ff-invalid-tramp-name-p)))
-      (with-helm-window
-        (when helm-follow-mode
-          (helm-follow-mode -1) (message nil)))
-      ;; When going up one level we want to be at the line
-      ;; corresponding to actual directory, so store this info
-      ;; in `helm-ff-last-expanded'.
-      (let ((cur-cand (helm-get-selection))
-            (new-pattern (helm-reduce-file-name
-                          helm-pattern arg :unix-close t :expand t)))
-        (cond ((file-directory-p helm-pattern)
-               (setq helm-ff-last-expanded helm-ff-default-directory))
-              ((file-exists-p helm-pattern)
-               (setq helm-ff-last-expanded helm-pattern))
-              ((and cur-cand (file-exists-p cur-cand))
-               (setq helm-ff-last-expanded cur-cand)))
-        (helm-set-pattern new-pattern helm-suspend-update-flag)
-        (with-helm-after-update-hook (helm-ff-retrieve-last-expanded))))))
-
-(defun helm-ff-retrieve-last-expanded ()
-  "Move overlay to last visited directory `helm-ff-last-expanded'.
-This happen after using `helm-find-files-up-one-level',
-or hitting C-j on \"..\"."
-  (when helm-ff-last-expanded
-    (let ((presel (if helm-ff-transformer-show-only-basename
-                      (helm-basename
-                       (directory-file-name helm-ff-last-expanded))
-                    (directory-file-name helm-ff-last-expanded))))
-      (with-helm-window
-        (when (re-search-forward (concat "^" (regexp-quote presel) "$") nil t)
-          (forward-line 0)
-          (helm-mark-current-line)))
-      (setq helm-ff-last-expanded nil))))
-
-(defun helm-ff-move-to-first-real-candidate ()
-  "When candidate is an incomplete file name move to first real candidate."
-  (helm-aif (and (helm-file-completion-source-p)
-                 (not (helm-empty-source-p))
-                 (not (string-match
-                       "\\`[Dd]ired"
-                       (assoc-default 'name (helm-get-current-source))))
-                 helm-ff--move-to-first-real-candidate
-                 (helm-get-selection))
-      (unless (or (not (stringp it))
-                  (and (string-match helm-tramp-file-name-regexp it)
-                       (not (file-remote-p it nil t)))
-                  (file-exists-p it))
-        (helm-next-line))))
-(add-hook 'helm-after-update-hook 'helm-ff-move-to-first-real-candidate)
-
-;;; Auto-update - helm-find-files auto expansion of directories.
-;;
-;;
-(defun helm-ff-update-when-only-one-matched ()
-  "Expand to directory when sole completion.
-When only one candidate is remaining and it is a directory,
-expand to this directory.
-This happen only when `helm-ff-auto-update-flag' is non--nil
-or when `helm-pattern' is equal to \"~/\"."
-  (when (or (and helm-ff-auto-update-flag
-                 (null helm-ff--deleting-char-backward)
-                 (helm-file-completion-source-p)
-                 ;; Issue #295
-                 ;; File predicates are returning t
-                 ;; with paths like //home/foo.
-                 ;; So check it is not the case by regexp
-                 ;; to allow user to do C-a / to start e.g
-                 ;; entering a tramp method e.g /sudo::.
-                 (not (string-match "\\`//" helm-pattern))
-                 (not (helm-ff-invalid-tramp-name-p))
-                 (not (eq last-command 'helm-yank-text-at-point)))
-            ;; Fix issue #542.
-            (string= helm-pattern "~/"))
-    (let* ((history-p   (string= (assoc-default
-                                  'name (helm-get-current-source))
-                                 "Read File Name History"))
-           (pat         (if (string-match helm-tramp-file-name-regexp
-                                          helm-pattern)
-                            (helm-create-tramp-name helm-pattern)
-                          helm-pattern))
-           (completed-p (string= (file-name-as-directory
-                                  (expand-file-name
-                                   (substitute-in-file-name pat)))
-                                 helm-ff-default-directory))
-           (candnum (helm-get-candidate-number)))
-      (when (and (or
-                  ;; Only one candidate remaining
-                  ;; and at least 2 char in basename.
-                  (and (<= candnum 2)
-                       (>= (string-width (helm-basename helm-pattern)) 2))
-                  ;; Already completed.
-                  completed-p)
-                 (not history-p)) ; Don't try to auto complete in history.
-        (with-helm-window
-          (let ((cur-cand (prog2
-                              (unless (or completed-p (file-exists-p pat))
-                                ;; Only one non--existing candidate
-                                ;; and one directory candidate, move to it.
-                                (helm-next-line))
-                              (helm-get-selection))))
-            (when (and (stringp cur-cand)
-                       (file-accessible-directory-p cur-cand))
-              (if (and (not (helm-dir-is-dot cur-cand))         ; [1]
-                       ;; Maybe we are here because completed-p is true
-                       ;; but check this again to be sure. (Windows fix)
-                       (<= candnum 2)) ; [2]
-                  ;; If after going to next line the candidate
-                  ;; is not one of "." or ".." [1]
-                  ;; and only one candidate is remaining [2],
-                  ;; assume candidate is a new directory to expand, and do it.
-                  (helm-set-pattern (file-name-as-directory cur-cand))
-                ;; The candidate is one of "." or ".."
-                ;; that mean we have entered the last letter of the directory name
-                ;; in prompt, so expansion is already done, just add the "/" at end
-                ;; of name unless helm-pattern ends with "."
-                ;; (i.e we are writing something starting with ".")
-                (unless (string-match "\\`.*[.]\\{1\\}\\'" helm-pattern)
-                  (helm-set-pattern
-                   ;; Need to expand-file-name to avoid e.g /ssh:host:./ in prompt.
-                   (expand-file-name (file-name-as-directory helm-pattern)))))
-              (helm-check-minibuffer-input))))))))
-
-(defun helm-ff-auto-expand-to-home-or-root ()
-  "Allow expanding to home/user directory or root or text yanked after pattern."
-  (when (and (helm-file-completion-source-p)
-             (string-match
-              "/?\\$.*/\\|/\\./\\|/\\.\\./\\|/~.*/\\|//\\|\\(/[[:alpha:]]:/\\|\\s\\+\\)"
-              helm-pattern)
-             (with-current-buffer (window-buffer (minibuffer-window)) (eolp))
-             (not (string-match helm-ff-url-regexp helm-pattern)))
-    (let* ((match (match-string 0 helm-pattern))
-           (input (cond ((string= match "/./")
-                         (expand-file-name default-directory))
-                        ((string= helm-pattern "/../") "/")
-                        ((string-match-p "\\`/\\$" match)
-                         (let ((sub (substitute-in-file-name match)))
-                           (if (file-directory-p sub)
-                               sub (replace-regexp-in-string "/\\'" "" sub))))
-                        (t (expand-file-name
-                            (helm-substitute-in-filename helm-pattern)
-                            ;; [Windows] On UNC paths "/" expand to current machine,
-                            ;; so use the root of current Drive. (i.e "C:/")
-                            (and (memq system-type '(windows-nt ms-dos))
-                                 (getenv "SystemDrive")) ; nil on Unix.
-                            )))))
-      (if (file-directory-p input)
-          (setq helm-ff-default-directory
-                (setq input (file-name-as-directory input)))
-        (setq helm-ff-default-directory (file-name-as-directory
-                                         (file-name-directory input))))
-      (with-helm-window
-        (helm-set-pattern input)
-        (helm-check-minibuffer-input)))))
-
-(defun helm-substitute-in-filename (fname)
-  "Substitute all parts of FNAME from start up to \"~/\" or \"/\".
-On windows system substitute from start up to \"/[[:lower:]]:/\".
-This function is needed for `helm-ff-auto-expand-to-home-or-root'
-and should be used carefully elsewhere, or not at all, using
-`substitute-in-file-name' instead."
-  (if (and ffap-url-regexp
-           (string-match-p ffap-url-regexp fname))
-      fname
-      (with-temp-buffer
-        (insert fname)
-        (goto-char (point-min))
-        (skip-chars-forward "/") ;; Avoid infloop in UNC paths Issue #424
-        (if (re-search-forward "~.*/?\\|//\\|/[[:alpha:]]:/" nil t)
-            (let ((match (match-string 0)))
-              (goto-char (if (or (string= match "//")
-                                 (string-match-p "/[[:alpha:]]:/" match))
-                             (1+ (match-beginning 0))
-                             (match-beginning 0)))
-              (buffer-substring-no-properties (point) (point-at-eol)))
-            fname))))
-
-(add-hook 'helm-after-update-hook 'helm-ff-update-when-only-one-matched)
-(add-hook 'helm-after-update-hook 'helm-ff-auto-expand-to-home-or-root)
-
-(defun helm-point-file-in-dired (file)
-  "Put point on filename FILE in dired buffer."
-  (unless (and ffap-url-regexp
-               (string-match-p ffap-url-regexp file))
-    (let ((target (expand-file-name (helm-substitute-in-filename file))))
-      (dired (file-name-directory target))
-      (dired-goto-file target))))
-
-(defun helm-create-tramp-name (fname)
-  "Build filename for `helm-pattern' like /su:: or /sudo::."
-  (apply #'tramp-make-tramp-file-name
-         (cl-loop with v = (tramp-dissect-file-name fname)
-               for i across v collect i)))
-
-(cl-defun helm-ff-tramp-hostnames (&optional (pattern helm-pattern))
-  "Get a list of hosts for tramp method found in `helm-pattern'.
-Argument PATTERN default to `helm-pattern', it is here only for debugging
-purpose."
-  (when (string-match helm-tramp-file-name-regexp pattern)
-    (let ((method      (match-string 1 pattern))
-          (tn          (match-string 0 pattern))
-          (all-methods (mapcar 'car tramp-methods)))
-      (helm-fast-remove-dups
-       (cl-loop for (f . h) in (tramp-get-completion-function method)
-             append (cl-loop for e in (funcall f (car h))
-                          for host = (and (consp e) (cadr e))
-                          when (and host (not (member host all-methods)))
-                          collect (concat tn host)))
-       :test 'equal))))
-
-(defun helm-ff-before-action-hook-fn ()
-  "Exit helm when user try to execute action on an invalid tramp fname."
-  (let ((cand (helm-get-selection)))
-    (when (and (helm-file-completion-source-p)
-               (stringp cand)
-               (helm-ff-invalid-tramp-name-p cand) ; Check candidate.
-               (helm-ff-invalid-tramp-name-p)) ; check helm-pattern.
-      (error "Error: Unknown file or directory `%s'" cand))))
-(add-hook 'helm-before-action-hook 'helm-ff-before-action-hook-fn)
-
-(cl-defun helm-ff-invalid-tramp-name-p (&optional (pattern helm-pattern))
-  "Return non--nil when PATTERN is an invalid tramp filename."
-  (string= (helm-ff-set-pattern pattern)
-           "Invalid tramp file name"))
-
-(defun helm-ff-set-pattern (pattern)
-  "Handle tramp filenames in `helm-pattern'."
-  (let ((methods (mapcar 'car tramp-methods))
-        (reg "\\`/\\([^[/:]+\\|[^/]+]\\):.*:")
-        cur-method tramp-name)
-    ;; In some rare cases tramp can return a nil input,
-    ;; so be sure pattern is a string for safety (Issue #476).
-    (unless pattern (setq pattern ""))
-    (cond ((string-match helm-ff-url-regexp pattern) pattern)
-          ((string-match "\\`\\$" pattern)
-           (substitute-in-file-name pattern))
-          ((string= pattern "") "")
-          ((string-match "\\`[.]\\{1,2\\}/\\'" pattern)
-           (expand-file-name pattern))
-          ((string-match ".*\\(~?/?[.]\\{1\\}/\\)\\'" pattern)
-           (expand-file-name default-directory))
-          ((string-match ".*\\(~//\\|//\\)\\'" pattern)
-           (expand-file-name "/")) ; Expand to "/" or "c:/"
-          ((string-match "\\`\\(~/\\|.*/~/\\)\\'" pattern)
-           (expand-file-name "~/"))
-          ;; Match "/method:maybe_hostname:~"
-          ((and (string-match (concat reg "~") pattern)
-                (setq cur-method (match-string 1 pattern))
-                (member cur-method methods))
-           (setq tramp-name (expand-file-name
-                             (helm-create-tramp-name
-                              (match-string 0 pattern))))
-           (replace-match tramp-name nil t pattern))
-          ;; Match "/method:maybe_hostname:"
-          ((and (string-match reg pattern)
-                (setq cur-method (match-string 1 pattern))
-                (member cur-method methods))
-           (setq tramp-name (helm-create-tramp-name
-                             (match-string 0 pattern)))
-           (replace-match tramp-name nil t pattern))
-          ;; Match "/hostname:"
-          ((and (string-match  helm-tramp-file-name-regexp pattern)
-                (setq cur-method (match-string 1 pattern))
-                (and cur-method (not (member cur-method methods))))
-           (setq tramp-name (helm-create-tramp-name
-                             (match-string 0 pattern)))
-           (replace-match tramp-name nil t pattern))
-          ;; Match "/method:" in this case don't try to connect.
-          ((and (not (string-match reg pattern))
-                (string-match helm-tramp-file-name-regexp pattern)
-                (member (match-string 1 pattern) methods))
-           "Invalid tramp file name")   ; Write in helm-buffer.
-          ;; PATTERN is a directory, end it with "/".
-          ;; This will make PATTERN not ending yet with "/"
-          ;; candidate for `helm-ff-default-directory',
-          ;; allowing `helm-ff-retrieve-last-expanded' to retrieve it
-          ;; when descending level.
-          ;; However, we don't add automatically the "/" when
-          ;; `helm-ff-auto-update-flag' is enabled to avoid quick expansion.
-          ((and (file-accessible-directory-p pattern)
-                helm-ff-auto-update-flag)
-           (file-name-as-directory (expand-file-name pattern)))
-          ;; Return PATTERN unchanged.
-          (t pattern))))
-
-(defun helm-find-files-get-candidates (&optional require-match)
-  "Create candidate list for `helm-source-find-files'."
-  (let* ((path          (helm-ff-set-pattern helm-pattern))
-         (dir-p         (file-accessible-directory-p path))
-         basedir
-         invalid-basedir
-         non-essential
-         (tramp-verbose helm-tramp-verbose)) ; No tramp message when 0.
-    (set-text-properties 0 (length path) nil path)
-    ;; Issue #118 allow creation of newdir+newfile.
-    (unless (or
-             ;; A tramp file name not completed.
-             (string= path "Invalid tramp file name")
-             ;; An empty pattern
-             (string= path "")
-             ;; Check if base directory of PATH is valid.
-             (helm-aif (file-name-directory path)
-                 ;; If PATH is a valid directory IT=PATH,
-                 ;; else IT=basedir of PATH.
-                 (file-directory-p it)))
-      ;; BASEDIR is invalid, that's mean user is starting
-      ;; to write a non--existing path in minibuffer
-      ;; probably to create a 'new_dir' or a 'new_dir+new_file'.
-      (setq invalid-basedir t))
-    ;; Don't set now `helm-pattern' if `path' == "Invalid tramp file name"
-    ;; like that the actual value (e.g /ssh:) is passed to
-    ;; `helm-ff-tramp-hostnames'.
-    (unless (or (string= path "Invalid tramp file name")
-                invalid-basedir)      ; Leave  helm-pattern unchanged.
-      (setq helm-ff-auto-update-flag  ; [1]
-            ;; Unless auto update is disabled at startup or
-            ;; interactively, start auto updating only at third char.
-            (unless (or (null helm-ff-auto-update-initial-value)
-                        (null helm-ff--auto-update-state)
-                        ;; But don't enable auto update when
-                        ;; deleting backward.
-                        helm-ff--deleting-char-backward)
-              (or (>= (length (helm-basename path)) 3) dir-p)))
-      (setq helm-pattern (helm-ff--transform-pattern-for-completion path))
-      ;; This have to be set after [1] to allow deleting char backward.
-      (setq basedir (expand-file-name
-                     (if (and dir-p helm-ff-auto-update-flag)
-                         ;; Add the final "/" to path
-                         ;; when `helm-ff-auto-update-flag' is enabled.
-                         (file-name-as-directory path)
-                         (if (string= path "") "/"
-                             (file-name-directory path)))))
-      (setq helm-ff-default-directory
-            (if (string= helm-pattern "")
-                (expand-file-name "/")  ; Expand to "/" or "c:/"
-                ;; If path is an url *default-directory have to be nil.
-                (unless (or (string-match helm-ff-url-regexp path)
-                            (and ffap-url-regexp
-                                 (string-match ffap-url-regexp path)))
-                  basedir))))
-    (cond ((string= path "Invalid tramp file name")
-           (or (helm-ff-tramp-hostnames) ; Hostnames completion.
-               (prog2
-                   ;; `helm-pattern' have not been modified yet.
-                   ;; Set it here to the value of `path' that should be now
-                   ;; "Invalid tramp file name" and set the candidates list
-                   ;; to ("Invalid tramp file name") to make `helm-pattern'
-                   ;; match single candidate "Invalid tramp file name".
-                   (setq helm-pattern path)
-                   ;; "Invalid tramp file name" is now printed
-                   ;; in `helm-buffer'.
-                   (list path))))
-          ((or (and (file-regular-p path)
-                    (eq last-repeatable-command 'helm-execute-persistent-action))
-               ;; `ffap-url-regexp' don't match until url is complete.
-               (string-match helm-ff-url-regexp path)
-               invalid-basedir
-               (and (not (file-exists-p path)) (string-match "/$" path))
-               (and ffap-url-regexp (string-match ffap-url-regexp path)))
-           (list path))
-          ((string= path "") (helm-ff-directory-files "/" t))
-          ;; Check here if directory is accessible (not working on Windows).
-          ((and (file-directory-p path) (not (file-readable-p path)))
-           (list (format "file-error: Opening directory permission denied `%s'" path)))
-          ;; A fast expansion of PATH is made only if `helm-ff-auto-update-flag'
-          ;; is enabled.
-          ((and dir-p helm-ff-auto-update-flag)
-           (helm-ff-directory-files path t))
-          (t (append (unless (or require-match
-                                 ;; When `helm-ff-auto-update-flag' has been
-                                 ;; disabled, whe don't want PATH to be added on top
-                                 ;; if it is a directory.
-                                 dir-p)
-                       (list path))
-                     (helm-ff-directory-files basedir t))))))
-
-(defun helm-ff-directory-files (directory &optional full)
-  "List contents of DIRECTORY.
-Argument FULL mean absolute path.
-It is same as `directory-files' but always returns the
-dotted filename '.' and '..' even on root directories in Windows
-systems."
-  (setq directory (file-name-as-directory
-                   (expand-file-name directory)))
-  (let* (file-error
-         (ls   (condition-case err
-                   (directory-files
-                    directory full directory-files-no-dot-files-regexp)
-                 ;; Handle file-error from here for Windows
-                 ;; because predicates like `file-readable-p' and friends
-                 ;; seem broken on emacs for Windows systems (always returns t).
-                 ;; This should never be called on GNU/Linux/Unix
-                 ;; as the error is properly intercepted in
-                 ;; `helm-find-files-get-candidates' by `file-readable-p'.
-                 (file-error
-                  (prog1
-                      (list (format "%s:%s"
-                                    (car err)
-                                    (mapconcat 'identity (cdr err) " ")))
-                    (setq file-error t)))))
-        (dot  (concat directory "."))
-        (dot2 (concat directory "..")))
-    (append (and (not file-error) (list dot dot2)) ls)))
-
-(defun helm-ff-handle-backslash (fname)
-  ;; Allow creation of filenames containing a backslash.
-  (cl-loop with bad = '((92 . ""))
-        for i across fname
-        for isbad = (assq i bad)
-        if isbad concat (cdr isbad)
-        else concat (string i)))
-
-(defun helm-ff-smart-completion-p ()
-  (and helm-ff-smart-completion
-       (not (memq helm-mp-matching-method '(multi1 multi3p)))))
-
-(defun helm-ff--transform-pattern-for-completion (pattern)
-  "Maybe return PATTERN with it's basename modified as a regexp.
-This happen only when `helm-ff-smart-completion' is enabled.
-This provide a similar behavior as `ido-enable-flex-matching'.
-See also `helm--mapconcat-pattern'.
-If PATTERN is an url returns it unmodified.
-When PATTERN contain a space fallback to match-plugin.
-If basename contain one or more space fallback to match-plugin.
-If PATTERN is a valid directory name,return PATTERN unchanged."
-  ;; handle bad filenames containing a backslash.
-  (setq pattern (helm-ff-handle-backslash pattern))
-  (let ((bn      (helm-basename pattern))
-        (bd      (or (helm-basedir pattern) ""))
-        (dir-p   (file-directory-p pattern))
-        (tramp-p (cl-loop for (m . f) in tramp-methods
-                       thereis (string-match m pattern))))
-    ;; Always regexp-quote base directory name to handle
-    ;; crap dirnames such e.g bookmark+
-    (cond
-      ((or (and dir-p tramp-p (string-match ":\\'" pattern))
-           (string= pattern "")
-           (and dir-p (<= (length bn) 2))
-           ;; Fix Issue #541 when BD have a subdir similar
-           ;; to BN, don't switch to match plugin
-           ;; which will match both.
-           (and dir-p (string-match (regexp-quote bn) bd)))
-       ;; Use full PATTERN on e.g "/ssh:host:".
-       (regexp-quote pattern))
-      ;; Prefixing BN with a space call match-plugin completion.
-      ;; This allow showing all files/dirs matching BN (Issue #518).
-      ;; FIXME: some match-plugin methods may not work here.
-      (dir-p (concat (regexp-quote bd) " " (regexp-quote bn)))
-      ((or (not (helm-ff-smart-completion-p))
-           (string-match "\\s-" bn))    ; Fall back to match-plugin.
-       (concat (regexp-quote bd) bn))
-      ((or (string-match "[*][.]?.*" bn) ; Allow entering wilcard.
-           (string-match "/$" pattern)     ; Allow mkdir.
-           (string-match helm-ff-url-regexp pattern)
-           (and (string= helm-ff-default-directory "/") tramp-p))
-       ;; Don't treat wildcards ("*") as regexp char.
-       ;; (e.g ./foo/*.el => ./foo/[*].el)
-       (concat (regexp-quote bd)
-               (replace-regexp-in-string "[*]" "[*]" bn)))
-      (t
-       (setq bn (if (>= (length bn) 2) ; wait 2nd char before concating.
-                    (helm--mapconcat-pattern bn)
-                  (concat ".*" (regexp-quote bn))))
-       (concat (regexp-quote bd) bn)))))
-
-(defun helm-dir-is-dot (dir)
-  (string-match "\\(?:/\\|\\`\\)\\.\\{1,2\\}\\'" dir))
-
-(defun helm-ff-save-history ()
-  "Store the last value of `helm-ff-default-directory' in `helm-ff-history'.
-Note that only existing directories are saved here."
-  (when (and helm-ff-default-directory
-             (helm-file-completion-source-p)
-             (file-directory-p helm-ff-default-directory))
-    (set-text-properties 0 (length helm-ff-default-directory)
-                         nil helm-ff-default-directory)
-    (push helm-ff-default-directory helm-ff-history)))
-(add-hook 'helm-cleanup-hook 'helm-ff-save-history)
-
-(defun helm-files-save-file-name-history (&optional force)
-  "Save selected file to `file-name-history'."
-  (let ((src-name (assoc-default 'name (helm-get-current-source))))
-    (when (or force (helm-file-completion-source-p)
-              (member src-name helm-files-save-history-extra-sources))
-      (let ((mkd (helm-marked-candidates))
-            (history-delete-duplicates t))
-        (cl-loop for sel in mkd
-              when (and sel
-                        (stringp sel)
-                        (file-exists-p sel)
-                        (not (file-directory-p sel)))
-              do
-              ;; we use `abbreviate-file-name' here because
-              ;; other parts of Emacs seems to,
-              ;; and we don't want to introduce duplicates.
-              (add-to-history 'file-name-history
-                              (abbreviate-file-name sel)))))))
-(add-hook 'helm-exit-minibuffer-hook 'helm-files-save-file-name-history)
-
-(defun helm-ff-valid-symlink-p (file)
-  (helm-aif (condition-case-unless-debug nil
-                ;; `file-truename' send error
-                ;; on cyclic symlinks (Issue #692).
-                (file-truename file)
-              (error nil))
-      (file-exists-p it)))
-
-(defun helm-get-default-mode-for-file (filename)
-  "Return the default mode to open FILENAME."
-  (let ((mode (cl-loop for (r . m) in auto-mode-alist
-                    thereis (and (string-match r filename) m))))
-    (or (and (symbolp mode) mode) "Fundamental")))
-
-(defun helm-ff-properties (candidate)
-  "Show file properties of CANDIDATE in a tooltip or message."
-  (let* ((all                (helm-file-attributes candidate))
-         (dired-line         (helm-file-attributes
-                              candidate :dired t :human-size t))
-         (type               (cl-getf all :type))
-         (mode-type          (cl-getf all :mode-type))
-         (owner              (cl-getf all :uid))
-         (owner-right        (cl-getf all :user t))
-         (group              (cl-getf all :gid))
-         (group-right        (cl-getf all :group))
-         (other-right        (cl-getf all :other))
-         (size               (helm-file-human-size (cl-getf all :size)))
-         (modif              (cl-getf all :modif-time))
-         (access             (cl-getf all :access-time))
-         (ext                (helm-get-default-program-for-file candidate))
-         (tooltip-hide-delay (or helm-tooltip-hide-delay tooltip-hide-delay)))
-    (if (and (window-system) tooltip-mode)
-        (tooltip-show
-         (concat
-          (helm-basename candidate) "\n"
-          dired-line "\n"
-          (format "Mode: %s\n" (helm-get-default-mode-for-file candidate))
-          (format "Ext prog: %s\n" (or (and ext (replace-regexp-in-string
-                                                 " %s" "" ext))
-                                       "Not defined"))
-          (format "Type: %s: %s\n" type mode-type)
-          (when (string= type "symlink")
-            (format "True name: '%s'\n"
-                    (cond ((string-match "^\.#" (helm-basename candidate))
-                           "Autosave symlink")
-                          ((helm-ff-valid-symlink-p candidate)
-                           (file-truename candidate))
-                          (t "Invalid Symlink"))))
-          (format "Owner: %s: %s\n" owner owner-right)
-          (format "Group: %s: %s\n" group group-right)
-          (format "Others: %s\n" other-right)
-          (format "Size: %s\n" size)
-          (format "Modified: %s\n" modif)
-          (format "Accessed: %s\n" access)))
-      (message dired-line) (sit-for 5))))
-
-(defun helm-ff-properties-persistent ()
-  "Show properties without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'properties-action '(helm-ff-properties . never-split))
-    (helm-execute-persistent-action 'properties-action)))
-
-(defun helm-ff-persistent-delete ()
-  "Delete current candidate without quitting."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'quick-delete '(helm-ff-quick-delete . never-split))
-    (helm-execute-persistent-action 'quick-delete)))
-
-(defun helm-ff-dot-file-p (file)
-  "Check if FILE is `.' or `..'."
-  (member (helm-basename file) '("." "..")))
-
-(defun helm-ff-quick-delete (_candidate)
-  "Delete file CANDIDATE without quitting."
-  (let ((marked (helm-marked-candidates)))
-    (unwind-protect
-         (save-selected-window
-           (cl-loop for c in marked do
-                    (progn (helm-preselect (if (and helm-ff-transformer-show-only-basename
-                                                    (not (helm-ff-dot-file-p c)))
-                                               (helm-basename c) c))
-                           (when (y-or-n-p (format "Really Delete file `%s'? " c))
-                             (helm-delete-file c helm-ff-signal-error-on-dot-files
-                                               'synchro)
-                             (helm-delete-current-selection)
-                             (message nil)))))
-      (with-helm-buffer
-        (setq helm-marked-candidates nil
-              helm-visible-mark-overlays nil))
-      (helm-force-update))))
-
-(defun helm-ff-kill-buffer-fname (candidate)
-  (let ((buf (get-file-buffer candidate)))
-    (if buf
-        (progn
-          (kill-buffer buf) (message "Buffer `%s' killed" buf))
-      (message "No buffer to kill"))))
-
-(defun helm-ff-kill-or-find-buffer-fname (candidate)
-  "Find file CANDIDATE or kill it's buffer if it is visible.
-Never kill `helm-current-buffer'.
-Never kill buffer modified.
-This is called normally on third hit of \
-\\<helm-map>\\[helm-execute-persistent-action]
-in `helm-find-files-persistent-action'."
-  (let* ((buf      (get-file-buffer candidate))
-         (buf-name (buffer-name buf))
-         (win (get-buffer-window buf))
-         (helm--reading-passwd-or-string t))
-    (if (and buf win
-             (not (eq buf (get-buffer helm-current-buffer)))
-             (not (buffer-modified-p buf)))
-        (progn
-          (kill-buffer buf)
-          (set-window-buffer win helm-current-buffer)
-          (message "Buffer `%s' killed" buf-name))
-      (find-file candidate))))
-
-(defun helm-ff-run-kill-buffer-persistent ()
-  "Execute `helm-ff-kill-buffer-fname' whitout quitting."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'kill-buffer-fname 'helm-ff-kill-buffer-fname)
-    (helm-execute-persistent-action 'kill-buffer-fname)))
-
-(defun helm-ff-prefix-filename (fname &optional file-or-symlinkp new-file)
-  "Return filename FNAME maybe prefixed with [?] or [@].
-If FILE-OR-SYMLINKP is non--nil this mean we assume FNAME is an
-existing filename or valid symlink and there is no need to test it.
-NEW-FILE when non--nil mean FNAME is a non existing file and
-return FNAME prefixed with [?]."
-  (let* ((prefix-new (propertize
-                      " " 'display
-                      (propertize "[?]" 'face 'helm-ff-prefix)))
-         (prefix-url (propertize
-                      " " 'display
-                      (propertize "[@]" 'face 'helm-ff-prefix))))
-    (cond ((or file-or-symlinkp (file-exists-p fname)) fname)
-          ((or (string-match helm-ff-url-regexp fname)
-               (and ffap-url-regexp (string-match ffap-url-regexp fname)))
-           (concat prefix-url " " fname))
-          ((or new-file (not (file-exists-p fname)))
-           (concat prefix-new " " fname)))))
-
-(defun helm-ff-score-candidate-for-pattern (str pattern)
-  (if (member str '("." ".."))
-      200
-      (helm-score-candidate-for-pattern str pattern)))
-
-(defun helm-ff-sort-candidates (candidates _source)
-  "Sort function for `helm-source-find-files'.
-Return candidates prefixed with basename of `helm-input' first."
-  (if (or (and (file-directory-p helm-input)
-               (string-match "/\\'" helm-input))
-          (string-match "\\`\\$" helm-input)
-          (null candidates))
-      candidates
-      (let* ((c1        (car candidates))
-             (cand1real (if (consp c1) (cdr c1) c1))
-             (cand1     (unless (file-exists-p cand1real) c1))
-             (rest-cand (if cand1 (cdr candidates) candidates))
-             (memo-src  (make-hash-table :test 'equal))
-             (all (sort rest-cand
-                        #'(lambda (s1 s2)
-                            (let* ((score (lambda (str)
-                                            (helm-ff-score-candidate-for-pattern
-                                             str (helm-basename helm-input))))
-                                   (bn1 (helm-basename (if (consp s1) (cdr s1) s1)))
-                                   (bn2 (helm-basename (if (consp s2) (cdr s2) s2)))
-                                   (sc1 (or (gethash bn1 memo-src)
-                                            (puthash bn1 (funcall score bn1) memo-src)))
-                                   (sc2 (or (gethash bn2 memo-src)
-                                            (puthash bn2 (funcall score bn2) memo-src))))
-                              (cond ((= sc1 sc2)
-                                     (< (string-width bn1)
-                                        (string-width bn2)))
-                                    ((> sc1 sc2))))))))
-        (if cand1 (cons cand1 all) all))))
-
-(defun helm-ff-filter-candidate-one-by-one (file)
-  "`filter-one-by-one' Transformer function for `helm-source-find-files'."
-  ;; Handle boring files
-  (unless (and helm-ff-skip-boring-files
-               (cl-loop for r in helm-boring-file-regexp-list
-                        ;; Prevent user doing silly thing like
-                        ;; adding the dotted files to boring regexps (#924).
-                        thereis (and (not (string-match "\\.$" file))
-                                     (string-match r file))))
-    ;; Handle tramp files.
-    (if (and (string-match helm-tramp-file-name-regexp helm-pattern)
-             helm-ff-tramp-not-fancy)
-        (if helm-ff-transformer-show-only-basename
-            (if (helm-dir-is-dot file)
-                file
-              (cons (or (helm-ff-get-host-from-tramp-invalid-fname file)
-                        (helm-basename file))
-                    file))
-          file)
-      ;; Now highlight.
-      (let* ((disp (if (and helm-ff-transformer-show-only-basename
-                            (not (helm-dir-is-dot file))
-                            (not (and ffap-url-regexp
-                                      (string-match ffap-url-regexp file)))
-                            (not (string-match helm-ff-url-regexp file)))
-                       (or (helm-ff-get-host-from-tramp-invalid-fname file)
-                           (helm-basename file)) file))
-             (attr (file-attributes file))
-             (type (car attr)))
-
-        (cond ((string-match "file-error" file) file)
-              ( ;; A not already saved file.
-               (and (stringp type)
-                    (not (helm-ff-valid-symlink-p file))
-                    (not (string-match "^\.#" (helm-basename file))))
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-invalid-symlink) t)
-                     file))
-              ;; A symlink.
-              ((stringp type)
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-symlink) t)
-                     file))
-              ;; A dotted directory.
-              ((and (eq t type) (helm-ff-dot-file-p file))
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-dotted-directory) t)
-                     file))
-              ;; A directory.
-              ((eq t type)
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-directory) t)
-                     file))
-              ;; An executable file.
-              ((and attr (string-match "x" (nth 8 attr)))
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-executable) t)
-                     file))
-              ;; A file.
-              ((and attr (null type))
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-file) t)
-                     file))
-              ;; A non--existing file.
-              (t
-               (cons (helm-ff-prefix-filename
-                      (propertize disp 'face 'helm-ff-file) nil 'new-file)
-                     file)))))))
-
-(defun helm-find-files-action-transformer (actions candidate)
-  "Action transformer for `helm-source-find-files'."
-  (let ((str-at-point (with-helm-current-buffer
-                        (buffer-substring-no-properties
-                         (point-at-bol) (point-at-eol))))
-        (fname-at-point (with-helm-current-buffer (ffap-guesser))))
-    (cond ((with-helm-current-buffer
-             (eq major-mode 'message-mode))
-           (append actions
-                   '(("Gnus attach file(s)" . helm-ff-gnus-attach-files))))
-          ((save-match-data
-             (and (not (string-match-p ffap-url-regexp str-at-point))
-                  (string-match (concat "\\(" fname-at-point "\\):\\([0-9]+:?\\)")
-                                str-at-point)
-                  (file-equal-p (match-string 1 str-at-point) candidate)))
-           (append '(("Find file to line number" . helm-ff-goto-linum))
-                   actions))
-          ((string-match (image-file-name-regexp) candidate)
-           (append actions
-                   '(("Rotate image right `M-r'" . helm-ff-rotate-image-right)
-                     ("Rotate image left `M-l'" . helm-ff-rotate-image-left))))
-          ((string-match "\.el$" (helm-aif (helm-marked-candidates)
-                                     (car it) candidate))
-           (append actions
-                   '(("Byte compile lisp file(s) `M-B, C-u to load'"
-                      . helm-find-files-byte-compile)
-                     ("Load File(s) `M-L'" . helm-find-files-load-files))))
-          ((and (string-match "\.html?$" candidate)
-                (file-exists-p candidate))
-           (append actions
-                   '(("Browse url file" . browse-url-of-file))))
-          ((or (string= (file-name-extension candidate) "pdf")
-               (string= (file-name-extension candidate) "PDF"))
-           (append actions
-                   '(("Pdfgrep File(s)" . helm-ff-pdfgrep))))
-          (t actions))))
-
-(defun helm-ff-goto-linum (candidate)
-  "Find file CANDIDATE and maybe jump to line number found in fname at point.
-line number should be added at end of fname preceded with \":\".
-e.g \"foo:12\"."
-  (let ((linum (let ((str (with-helm-current-buffer
-                            (buffer-substring-no-properties
-                             (point-at-bol) (point-at-eol))))
-                     (fname (with-helm-current-buffer (ffap-guesser))))
-                 (when (string-match
-                        (concat "\\(" fname "\\):\\([0-9]+:?\\)") str)
-                   (match-string 2 str)))))
-    (find-file candidate)
-    (and linum (not (string= linum ""))
-         (helm-goto-line (string-to-number linum) t))))
-
-(defun helm-ff-gnus-attach-files (_candidate)
-  "Run `gnus-dired-attach' on `helm-marked-candidates' or CANDIDATE."
-  (require 'gnus-dired)
-  (let ((flist (helm-marked-candidates :with-wildcard t)))
-    (gnus-dired-attach flist)))
-
-(defvar image-dired-display-image-buffer)
-(defun helm-ff-rotate-current-image-1 (file &optional num-arg)
-  "Rotate current image at NUM-ARG degrees.
-This is a destructive operation on FILE made by external tool mogrify."
-  (setq file (file-truename file)) ; For symlinked images.
-  ;; When FILE is not an image-file, do nothing.
-  (when (string-match (image-file-name-regexp) file)
-    (if (executable-find "mogrify")
-        (progn
-          (shell-command (format "mogrify -rotate %s %s"
-                                 (or num-arg 90)
-                                 (shell-quote-argument file)))
-          (when (buffer-live-p image-dired-display-image-buffer)
-            (kill-buffer image-dired-display-image-buffer))
-          (image-dired-display-image file)
-          (message nil)
-          (display-buffer (get-buffer image-dired-display-image-buffer)))
-      (error "mogrify not found"))))
-
-(defun helm-ff-rotate-image-left (candidate)
-  "Rotate image file CANDIDATE left.
-This affect directly file CANDIDATE."
-  (helm-ff-rotate-current-image-1 candidate -90))
-
-(defun helm-ff-rotate-image-right (candidate)
-  "Rotate image file CANDIDATE right.
-This affect directly file CANDIDATE."
-  (helm-ff-rotate-current-image-1 candidate))
-
-(defun helm-ff-rotate-left-persistent ()
-  "Rotate image left without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'image-action1 'helm-ff-rotate-image-left)
-    (helm-execute-persistent-action 'image-action1)))
-
-(defun helm-ff-rotate-right-persistent ()
-  "Rotate image right without quitting helm."
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'image-action2 'helm-ff-rotate-image-right)
-    (helm-execute-persistent-action 'image-action2)))
-
-(defun helm-ff-exif-data (candidate)
-  "Extract exif data from file CANDIDATE using `helm-ff-exif-data-program'."
-  (if (and helm-ff-exif-data-program
-           (executable-find helm-ff-exif-data-program))
-      (shell-command-to-string (format "%s %s %s"
-                                       helm-ff-exif-data-program
-                                       helm-ff-exif-data-program-args
-                                       candidate))
-    (format "No program %s found to extract exif"
-            helm-ff-exif-data-program)))
-
-(defun helm-find-files-persistent-action (candidate)
-  "Open subtree CANDIDATE without quitting helm.
-If CANDIDATE is not a directory expand CANDIDATE filename.
-If CANDIDATE is alone, open file CANDIDATE filename.
-That's mean:
-First hit on C-j expand CANDIDATE second hit open file.
-If a prefix arg is given or `helm-follow-mode' is on open file."
-  (let* ((follow        (or (buffer-local-value
-                             'helm-follow-mode
-                             (get-buffer-create helm-buffer))
-                            helm--temp-follow-flag))
-         (new-pattern   (helm-get-selection))
-         (num-lines-buf (with-current-buffer helm-buffer
-                          (count-lines (point-min) (point-max))))
-         (insert-in-minibuffer #'(lambda (fname)
-                                   (with-selected-window (minibuffer-window)
-                                     (unless follow
-                                       (delete-minibuffer-contents)
-                                       (set-text-properties 0 (length fname)
-                                                            nil fname)
-                                       (insert fname))))))
-    (cond ((and (helm-ff-invalid-tramp-name-p)
-                (string-match helm-tramp-file-name-regexp candidate))
-           ;; First hit insert hostname and
-           ;; second hit insert ":" and expand.
-           (if (string= candidate helm-pattern)
-               (funcall insert-in-minibuffer (concat candidate ":"))
-             (funcall insert-in-minibuffer candidate)))
-          ( ;; A symlink directory, expand it's truename.
-           (and (file-directory-p candidate) (file-symlink-p candidate))
-           (funcall insert-in-minibuffer (file-name-as-directory
-                                          (file-truename
-                                           (expand-file-name candidate)))))
-          ;; A directory, open it.
-          ((file-directory-p candidate)
-           (when (string= (helm-basename candidate) "..")
-             (setq helm-ff-last-expanded helm-ff-default-directory))
-           (funcall insert-in-minibuffer (file-name-as-directory
-                                          (expand-file-name candidate))))
-          ;; A symlink file, expand to it's true name. (first hit)
-          ((and (file-symlink-p candidate) (not current-prefix-arg) (not follow))
-           (funcall insert-in-minibuffer (file-truename candidate)))
-          ;; A regular file, expand it, (first hit)
-          ((and (>= num-lines-buf 3) (not current-prefix-arg) (not follow))
-           (setq helm-pattern "") ; Force update.
-           (funcall insert-in-minibuffer new-pattern))
-          ;; An image file and it is the second hit on C-j,
-          ;; show the file in `image-dired'.
-          ((string-match (image-file-name-regexp) candidate)
-           (when (buffer-live-p (get-buffer image-dired-display-image-buffer))
-             (kill-buffer image-dired-display-image-buffer))
-           ;; Fix emacs bug never fixed upstream.
-           (unless (file-directory-p image-dired-dir)
-             (make-directory image-dired-dir))
-           (image-dired-display-image candidate)
-           (message nil)
-           (switch-to-buffer image-dired-display-image-buffer)
-           (with-current-buffer image-dired-display-image-buffer
-             (let ((exif-data (helm-ff-exif-data candidate)))
-               (setq default-directory helm-ff-default-directory)
-               (image-dired-update-property 'help-echo exif-data))))
-          ;; Allow browsing archive on avfs fs.
-          ;; Assume volume is already mounted with mountavfs.
-          ((and helm-ff-avfs-directory
-                (string-match
-                 (regexp-quote (expand-file-name helm-ff-avfs-directory))
-                 (file-name-directory candidate))
-                (helm-ff-file-compressed-p candidate))
-           (funcall insert-in-minibuffer (concat candidate "#")))
-          ;; On second hit we open file.
-          ;; On Third hit we kill it's buffer maybe.
-          (t
-           (helm-ff-kill-or-find-buffer-fname candidate)))))
-
-(defun helm-ff-file-compressed-p (candidate)
-  "Whether CANDIDATE is a compressed file or not."
-  (member (file-name-extension candidate)
-          helm-ff-file-compressed-list))
-
-(defun helm-insert-file-name-completion-at-point (candidate)
-  "Insert file name completion at point."
-  (with-helm-current-buffer
-    (if buffer-read-only
-        (error "Error: Buffer `%s' is read-only" (buffer-name))
-      (let* ((end         (point))
-             (tap         (thing-at-point 'filename))
-             (guess       (and (stringp tap) (substring-no-properties tap)))
-             (beg         (- (point) (length guess)))
-             (full-path-p (and (stringp guess)
-                               (or (string-match-p
-                                    (concat "^" (getenv "HOME"))
-                                    guess)
-                                   (string-match-p
-                                    "\\`\\(/\\|[[:lower:][:upper:]]:/\\)"
-                                    guess)))))
-        (set-text-properties 0 (length candidate) nil candidate)
-        (if (and guess (not (string= guess ""))
-                 (or (string-match "^\\(~/\\|/\\|[[:lower:][:upper:]]:/\\)"
-                                   guess)
-                     (file-exists-p candidate)))
-            (progn
-              (delete-region beg end)
-              (insert (cond (full-path-p
-                             (expand-file-name candidate))
-                            ((string= (match-string 1 guess) "~/")
-                              (abbreviate-file-name candidate))
-                            (t (file-relative-name candidate)))))
-            (insert (cond ((equal helm-current-prefix-arg '(4))
-                           (abbreviate-file-name candidate))
-                          ((equal helm-current-prefix-arg '(16))
-                           (file-relative-name candidate))
-                          (t candidate))))))))
-
-(cl-defun helm-find-files-history (&key (comp-read t))
-  "The `helm-find-files' history.
-Show the first `helm-ff-history-max-length' elements of
-`helm-ff-history' in an `helm-comp-read'."
-  (let ((history (when helm-ff-history
-                   (helm-fast-remove-dups helm-ff-history
-                                          :test 'equal))))
-    (when history
-      (setq helm-ff-history
-            (if (>= (length history) helm-ff-history-max-length)
-                (cl-subseq history 0 helm-ff-history-max-length)
-              history))
-      (if comp-read
-          (helm-comp-read
-           "Switch to Directory: "
-           helm-ff-history
-           :name "Helm Find Files History"
-           :must-match t)
-        helm-ff-history))))
-
-(defun helm-find-files-1 (fname &optional preselect)
-  "Find FNAME with `helm' completion.
-Like `find-file' but with `helm' support.
-Use it for non--interactive calls of `helm-find-files'."
-  (when (get-buffer helm-action-buffer)
-    (kill-buffer helm-action-buffer))
-  (setq helm-find-files--toggle-bookmark nil)
-  (let* ( ;; Be sure we don't erase the precedent minibuffer if some.
-         (helm-ff-auto-update-initial-value
-          (and helm-ff-auto-update-initial-value
-               (not (minibuffer-window-active-p (minibuffer-window)))))
-         (tap (thing-at-point 'filename))
-         (def (and tap (or (file-remote-p tap)
-                           (expand-file-name tap)))))
-    (unless helm-source-find-files
-      (setq helm-source-find-files (helm-make-source
-                                    "Find Files" 'helm-source-ffiles)))
-    (helm :sources 'helm-source-find-files
-          :input fname
-          :case-fold-search helm-file-name-case-fold-search
-          :preselect preselect
-          :ff-transformer-show-only-basename
-          helm-ff-transformer-show-only-basename
-          :default def
-          :prompt "Find Files or Url: "
-          :buffer "*Helm Find Files*")))
-
-(defun helm-find-files-toggle-to-bookmark ()
-  "Toggle helm-bookmark for `helm-find-files' and `helm-find-files.'"
-  (interactive)
-  (with-helm-buffer
-    (if (setq helm-find-files--toggle-bookmark
-              (not helm-find-files--toggle-bookmark))
-        (progn
-          (helm-set-pattern "" t)
-          (helm-set-sources '(helm-source-bookmark-helm-find-files)))
-        ;; Switch back to helm-find-files.
-        (helm-set-pattern "./" t) ; Back to initial directory of hff session.
-        (helm-set-sources '(helm-source-find-files))
-        (helm--maybe-update-keymap)))) 
-
-(defun helm-find-files-initial-input (&optional input)
-  "Return INPUT if present, otherwise try to guess it."
-  (let ((ffap-machine-p-known 'reject))
-    (unless (eq major-mode 'image-mode)
-      (or (and input (or (and (file-remote-p input) input)
-                         (expand-file-name input)))
-          (helm-find-files-input
-           (ffap-guesser)
-           (thing-at-point 'filename))))))
-
-(defun helm-find-files-input (file-at-pt thing-at-pt)
-  "Try to guess a default input for `helm-find-files'."
-  (let* ((non-essential t)
-         (remp (or (and file-at-pt (file-remote-p file-at-pt))
-                   (and thing-at-pt (file-remote-p thing-at-pt))))
-         (def-dir (helm-current-directory))
-         (urlp (and file-at-pt ffap-url-regexp
-                    (string-match ffap-url-regexp file-at-pt)))
-         (lib     (when helm-ff-search-library-in-sexp
-                    (helm-find-library-at-point)))
-         (hlink   (helm-ff-find-url-at-point))
-         (file-p  (and file-at-pt
-                       (not (string= file-at-pt ""))
-                       (not remp)
-                       (file-exists-p file-at-pt)
-                       thing-at-pt
-                       (not (string= thing-at-pt ""))
-                       (file-exists-p
-                        (file-name-directory
-                         (expand-file-name thing-at-pt def-dir))))))
-    (cond (lib)      ; e.g we are inside a require sexp.
-          (hlink)    ; String at point is an hyperlink.
-          (file-p    ; a regular file
-           (helm-aif (ffap-file-at-point) (expand-file-name it)))
-          (urlp file-at-pt) ; possibly an url or email.
-          ((and file-at-pt
-                (not remp)
-                (file-exists-p file-at-pt))
-           file-at-pt))))
-
-(defun helm-ff-find-url-at-point ()
-  "Try to find link to an url in text-property at point."
-  (let* ((he      (get-text-property (point) 'help-echo))
-         (ov      (overlays-at (point)))
-         (ov-he   (and ov (overlay-get
-                           (car (overlays-at (point))) 'help-echo)))
-         (w3m-l   (get-text-property (point) 'w3m-href-anchor))
-         (nt-prop (get-text-property (point) 'nt-link)))
-    ;; Org link.
-    (when (and (stringp he) (string-match "^LINK: " he))
-      (setq he (replace-match "" t t he)))
-    (cl-loop for i in (list he ov-he w3m-l nt-prop)
-          thereis (and (stringp i) ffap-url-regexp (string-match ffap-url-regexp i) i))))
-
-(defun helm-find-library-at-point ()
-  "Try to find library path at point.
-Find inside `require' and `declare-function' sexp."
-  (require 'find-func)
-  (let* ((beg-sexp (save-excursion (search-backward "(" (point-at-bol) t)))
-         (end-sexp (save-excursion (search-forward ")" (point-at-eol) t)))
-         (sexp     (and beg-sexp end-sexp
-                        (buffer-substring-no-properties
-                         (1+ beg-sexp) (1- end-sexp)))))
-    (ignore-errors
-      (cond ((and sexp (string-match "require \'.+[^)]" sexp))
-             (find-library-name
-              (replace-regexp-in-string
-               "'\\|\)\\|\(" ""
-               ;; If require use third arg, ignore it,
-               ;; always use library path found in `load-path'.
-               (cl-second (split-string (match-string 0 sexp))))))
-            ((and sexp (string-match-p "^declare-function" sexp))
-             (find-library-name
-              (replace-regexp-in-string
-               "\"\\|ext:" ""
-               (cl-third (split-string sexp)))))
-            (t nil)))))
-
-
-;;; Handle copy, rename, symlink, relsymlink and hardlink from helm.
-;;
-;;
-(defvar dired-async-mode)
-(cl-defun helm-dired-action (candidate
-                             &key action follow (files (dired-get-marked-files)))
-  "Execute ACTION on FILES to CANDIDATE.
-Where ACTION is a symbol that can be one of:
-'copy, 'rename, 'symlink,'relsymlink, 'hardlink.
-Argument FOLLOW when non--nil specify to follow FILES to destination for the actions
-copy and rename."
-  (when (get-buffer dired-log-buffer) (kill-buffer dired-log-buffer))
-  (let ((fn     (cl-case action
-                  (copy       'dired-copy-file)
-                  (rename     'dired-rename-file)
-                  (symlink    'make-symbolic-link)
-                  (relsymlink 'dired-make-relative-symlink)
-                  (hardlink   'dired-hardlink)))
-        (marker (cl-case action
-                  ((copy rename)   dired-keep-marker-copy)
-                  (symlink        dired-keep-marker-symlink)
-                  (relsymlink     dired-keep-marker-relsymlink)
-                  (hardlink       dired-keep-marker-hardlink)))
-        (dirflag (and (= (length files) 1)
-                      (file-directory-p (car files))
-                      (not (file-directory-p candidate))))
-        (dired-async-state (if (and (boundp 'dired-async-mode)
-                                    dired-async-mode)
-                               1 -1)))
-    (and follow (fboundp 'dired-async-mode) (dired-async-mode -1))
-    (unwind-protect
-         (dired-create-files
-          fn (symbol-name action) files
-          ;; CANDIDATE is the destination.
-          (if (file-directory-p candidate)
-              ;; When CANDIDATE is a directory, build file-name in this directory.
-              ;; Else we use CANDIDATE.
-              #'(lambda (from)
-                  (expand-file-name (file-name-nondirectory from) candidate))
-              #'(lambda (_from) candidate))
-          marker)
-      (and (fboundp 'dired-async-mode)
-           (dired-async-mode dired-async-state)))
-    (push (file-name-as-directory
-           (if (file-directory-p candidate)
-               (expand-file-name candidate)
-             (file-name-directory candidate)))
-          helm-ff-history)
-    ;; If follow is non--nil we should not be in async mode.
-    (when (and follow
-               (not (memq action '(symlink relsymlink hardlink)))
-               (not (get-buffer dired-log-buffer)))
-      (let ((target (directory-file-name candidate)))
-        (unwind-protect
-             (progn
-               (setq helm-ff-cand-to-mark
-                     (helm-get-dest-fnames-from-list files candidate dirflag))
-               (with-helm-after-update-hook (helm-ff-maybe-mark-candidates))
-               (if (and dirflag (eq action 'rename))
-                   (helm-find-files-1 (file-name-directory target)
-                                      (if helm-ff-transformer-show-only-basename
-                                          (helm-basename target) target))
-                 (helm-find-files-1 (file-name-as-directory
-                                     (expand-file-name candidate)))))
-          (setq helm-ff-cand-to-mark nil))))))
-
-(defun helm-get-dest-fnames-from-list (flist dest-cand rename-dir-flag)
-  "Transform filenames of FLIST to abs of DEST-CAND.
-If RENAME-DIR-FLAG is non--nil collect the `directory-file-name' of transformed
-members of FLIST."
-  ;; At this point files have been renamed/copied at destination.
-  ;; That's mean DEST-CAND exists.
-  (cl-loop
-        with dest = (expand-file-name dest-cand)
-        for src in flist
-        for basename-src = (helm-basename src)
-        for fname = (cond (rename-dir-flag (directory-file-name dest))
-                          ((file-directory-p dest)
-                           (concat (file-name-as-directory dest) basename-src))
-                          (t dest))
-        when (file-exists-p fname)
-        collect fname into tmp-list
-        finally return (sort tmp-list 'string<)))
-
-(defun helm-ff-maybe-mark-candidates ()
-  "Mark all candidates of list `helm-ff-cand-to-mark'.
-This is used when copying/renaming/symlinking etc... and
-following files to destination."
-  (when (and (string= (assoc-default 'name (helm-get-current-source))
-                      (assoc-default 'name helm-source-find-files))
-             helm-ff-cand-to-mark)
-    (with-helm-window
-      (while helm-ff-cand-to-mark
-        (if (string= (car helm-ff-cand-to-mark) (helm-get-selection))
-            (progn
-              (helm-make-visible-mark)
-              (helm-next-line)
-              (setq helm-ff-cand-to-mark (cdr helm-ff-cand-to-mark)))
-          (helm-next-line)))
-      (unless (helm-this-visible-mark)
-        (helm-prev-visible-mark)))))
-
-
-;;; Routines for files
-;;
-;;
-(defun helm-file-buffers (filename)
-  "Returns a list of buffer names corresponding to FILENAME."
-  (cl-loop with name = (expand-file-name filename)
-        for buf in (buffer-list)
-        for bfn = (buffer-file-name buf)
-        when (and bfn (string= name bfn))
-        collect (buffer-name buf)))
-
-(defun helm-delete-file (file &optional error-if-dot-file-p synchro)
-  "Delete the given file after querying the user.
-Ask to kill buffers associated with that file, too."
-  (when (and error-if-dot-file-p
-             (helm-ff-dot-file-p file))
-    (error "Error: Cannot operate on `.' or `..'"))
-  (let ((buffers (helm-file-buffers file))
-        (helm--reading-passwd-or-string t))
-    (if (or (< emacs-major-version 24) synchro)
-        ;; `dired-delete-file' in Emacs versions < 24
-        ;; doesn't support delete-by-moving-to-trash
-        ;; so use `delete-directory' and `delete-file'
-        ;; that handle it.
-        (cond ((and (not (file-symlink-p file))
-                    (file-directory-p file)
-                    (directory-files file t dired-re-no-dot))
-               (when (y-or-n-p (format "Recursive delete of `%s'? " file))
-                 (delete-directory file 'recursive)))
-              ((and (not (file-symlink-p file))
-                    (file-directory-p file))
-               (delete-directory file))
-              (t (delete-file file)))
-      (dired-delete-file
-       file dired-recursive-deletes delete-by-moving-to-trash))
-    (when buffers
-      (cl-dolist (buf buffers)
-        (when (y-or-n-p (format "Kill buffer %s, too? " buf))
-          (kill-buffer buf))))))
-
-(defun helm-delete-marked-files (_ignore)
-  (let* ((files (helm-marked-candidates :with-wildcard t))
-         (len (length files)))
-    (with-helm-display-marked-candidates
-      helm-marked-buffer-name
-      (mapcar #'(lambda (f)
-                  (if (file-directory-p f)
-                      (concat (helm-basename f) "/")
-                    (helm-basename f)))
-              files)
-      (if (not (y-or-n-p (format "Delete *%s File(s)" len)))
-          (message "(No deletions performed)")
-        (cl-dolist (i files)
-          (set-text-properties 0 (length i) nil i)
-          (helm-delete-file i helm-ff-signal-error-on-dot-files))
-        (message "%s File(s) deleted" len)))))
-
-(defun helm-find-file-or-marked (candidate)
-  "Open file CANDIDATE or open helm marked files in separate windows.
-Called with a prefix arg open files in background without selecting them."
-  (let ((marked (helm-marked-candidates :with-wildcard t))
-        (url-p (and ffap-url-regexp ; we should have only one candidate.
-                    (string-match ffap-url-regexp candidate)))
-        (ffap-newfile-prompt helm-ff-newfile-prompt-p)
-        (find-file-wildcards nil)
-        (make-dir-fn
-         #'(lambda (dir &optional helm-ff)
-             (when (y-or-n-p (format "Create directory `%s'? " dir))
-               (let ((dirfname (directory-file-name dir)))
-                 (if (file-exists-p dirfname)
-                     (error
-                      "Mkdir: Unable to create directory `%s': file exists."
-                      (helm-basename dirfname))
-                   (make-directory dir 'parent)))
-               (when helm-ff
-                 ;; Allow having this new dir in history
-                 ;; to be able to retrieve it immediately
-                 ;; if we want to e.g copy a file from somewhere in it.
-                 (setq helm-ff-default-directory
-                       (file-name-as-directory dir))
-                 (push helm-ff-default-directory helm-ff-history))
-               (or (and helm-ff (helm-find-files-1 dir)) t))))
-        (helm--reading-passwd-or-string t))
-    (if (cdr marked)
-        (if helm-current-prefix-arg
-            (dired-simultaneous-find-file marked nil)
-            (mapc 'find-file-noselect (cdr marked))
-            (find-file (car marked)))
-      (if (and (not (file-exists-p candidate))
-               (not url-p)
-               (string-match "/$" candidate))
-          ;; A a non--existing filename ending with /
-          ;; Create a directory and jump to it.
-          (funcall make-dir-fn candidate 'helm-ff)
-        ;; A non--existing filename NOT ending with / or
-        ;; an existing filename, create or jump to it.
-        ;; If the basedir of candidate doesn't exists,
-        ;; ask for creating it.
-        (let ((dir (file-name-directory candidate)))
-          (find-file-at-point
-           (cond ((and dir (file-directory-p dir))
-                  (substitute-in-file-name (car marked)))
-                 ;; FIXME Why do we use this on urls ?
-                 (url-p (helm-substitute-in-filename (car marked)))
-                 ((funcall make-dir-fn dir) candidate))))))))
-
-(defun helm-shadow-boring-files (files)
-  "Files matching `helm-boring-file-regexp' will be
-displayed with the `file-name-shadow' face if available."
-  (helm-shadow-entries files helm-boring-file-regexp-list))
-
-(defun helm-skip-boring-files (files)
-  "Files matching `helm-boring-file-regexp' will be skipped."
-  (helm-skip-entries files helm-boring-file-regexp-list))
-
-(defun helm-skip-current-file (files)
-  "Current file will be skipped."
-  (remove (buffer-file-name helm-current-buffer) files))
-
-(defun helm-w32-pathname-transformer (args)
-  "Change undesirable features of windows pathnames to ones more acceptable to
-other candidate transformers."
-  (if (eq system-type 'windows-nt)
-      (helm-transform-mapcar
-       (lambda (x)
-         (replace-regexp-in-string
-          "/cygdrive/\\(.\\)" "\\1:"
-          (replace-regexp-in-string "\\\\" "/" x)))
-       args)
-    args))
-
-(defun helm-transform-file-load-el (actions candidate)
-  "Add action to load the file CANDIDATE if it is an emacs lisp
-file.  Else return ACTIONS unmodified."
-  (if (member (file-name-extension candidate) '("el" "elc"))
-      (append actions '(("Load Emacs Lisp File" . load-file)))
-    actions))
-
-(defun helm-transform-file-browse-url (actions candidate)
-  "Add an action to browse the file CANDIDATE if it is a html file or URL.
-Else return ACTIONS unmodified."
-  (let ((browse-action '("Browse with Browser" . browse-url)))
-    (cond ((string-match "^http\\|^ftp" candidate)
-           (cons browse-action actions))
-          ((string-match "\\.html?$" candidate)
-           (append actions (list browse-action)))
-          (t actions))))
-
-(defun helm-multi-files-toggle-to-locate ()
-  (interactive)
-  (with-helm-buffer
-  (if (setq helm-multi-files--toggle-locate
-            (not helm-multi-files--toggle-locate))
-      (progn
-        (helm-set-sources (unless (memq 'helm-source-locate
-                                        helm-sources)
-                            (cons 'helm-source-locate helm-sources)))
-        (helm-set-source-filter '(helm-source-locate)))
-      (helm-kill-async-processes)
-      (helm-set-sources (remove 'helm-source-locate
-                                helm-for-files-preferred-list))
-      (helm-set-source-filter nil))))
-
-
-;;; List of files gleaned from every dired buffer
-;;
-;;
-(defun helm-files-in-all-dired-candidates ()
-  (save-excursion
-    (cl-loop for (f . b) in dired-buffers
-          when (buffer-live-p b)
-          append (let ((dir (with-current-buffer b dired-directory)))
-                   (if (listp dir) (cdr dir)
-                     (directory-files f t dired-re-no-dot))))))
-
-;; (dired '("~/" "~/.emacs.d/.emacs-custom.el" "~/.emacs.d/.emacs.bmk"))
-
-(defvar helm-source-files-in-all-dired
-  '((name . "Files in all dired buffer.")
-    (candidates . helm-files-in-all-dired-candidates)
-    (type . file)))
-
-
-;;; File Cache
-;;
-;;
-(defvar file-cache-alist)
-
-(defclass helm-file-cache (helm-source-in-buffer helm-type-file)
-  ((init :initform (lambda () (require 'filecache)))
-   (keymap :initform helm-generic-files-map)
-   (help-message :initform helm-generic-file-help-message)
-   (mode-line :initform helm-generic-file-mode-line-string)))
-
-(defun helm-file-cache-get-candidates ()
-  (cl-loop for item in file-cache-alist append
-           (cl-destructuring-bind (base &rest dirs) item
-             (cl-loop for dir in dirs collect
-                      (concat dir base)))))
-
-(defvar helm-source-file-cache nil)
-
-(defcustom helm-file-cache-fuzzy-match nil
-  "Enable fuzzy matching in `helm-source-file-cache' when non--nil."
-  :group 'helm-files
-  :type 'boolean
-  :set (lambda (var val)
-         (set var val)
-         (setq helm-source-file-cache
-               (helm-make-source "File Cache" 'helm-file-cache
-                 :fuzzy-match helm-file-cache-fuzzy-match
-                 :data 'helm-file-cache-get-candidates))))
-
-(cl-defun helm-file-cache-add-directory-recursively
-    (dir &optional match (ignore-dirs t))
-  (require 'filecache)
-  (cl-loop for f in (helm-walk-directory
-                     dir
-                     :path 'full
-                     :directories nil
-                     :match match
-                     :skip-subdirs ignore-dirs) 
-           do (file-cache-add-file f)))
-
-(defun helm-ff-cache-add-file (_candidate)
-  (require 'filecache)
-  (let ((mkd (helm-marked-candidates :with-wildcard t)))
-    (mapc 'file-cache-add-file mkd)))
-
-(defun helm-ff-file-cache-remove-file-1 (file)
-  "Remove FILE from `file-cache-alist'."
-  (let ((entry (assoc (helm-basename file) file-cache-alist))
-        (dir   (helm-basedir file))
-        new-entry)
-    (setq new-entry (remove dir entry))
-    (when (= (length entry) 1)
-      (setq new-entry nil))
-    (setq file-cache-alist
-          (cons new-entry (remove entry file-cache-alist)))))
-
-(defun helm-ff-file-cache-remove-file (_file)
-  "Remove marked files from `file-cache-alist.'"
-  (let ((mkd (helm-marked-candidates)))
-    (mapc 'helm-ff-file-cache-remove-file-1 mkd)))
-
-(defun helm-transform-file-cache (actions _candidate)
-  (let ((source (helm-get-current-source)))
-    (if (string= (assoc-default 'name source) "File Cache")
-        (append actions
-                '(("Remove marked files from file-cache"
-                   . helm-ff-file-cache-remove-file)))
-        actions)))
-
-
-;;; File name history
-;;
-;;
-(defvar helm-source-file-name-history
-  `((name . "File Name History")
-    (candidates . file-name-history)
-    (persistent-action . ignore)
-    (filtered-candidate-transformer . helm-file-name-history-transformer)
-    (action . ,(helm-actions-from-type-file))))
-
-(defvar helm-source--ff-file-name-history nil
-  "[Internal] This source is build to be used with `helm-find-files'.
-Don't use it in your own code unless you know what you are doing.")
-
-(defun helm-file-name-history-transformer (candidates _source)
-  (cl-loop for c in candidates collect
-        (cond ((file-remote-p c)
-               (cons (propertize c 'face 'helm-history-remote) c))
-              ((file-exists-p c)
-               (cons (propertize c 'face 'helm-ff-file) c))
-              (t (cons (propertize c 'face 'helm-history-deleted) c)))))
-
-(defun helm-ff-file-name-history ()
-  "Switch to `file-name-history' without quitting `helm-find-files'."
-  (interactive)
-  (unless helm-source--ff-file-name-history
-    (setq helm-source--ff-file-name-history
-          (helm-build-sync-source "File name history"
-            :init (lambda ()
-                    (with-helm-alive-p
-                      (when helm-ff-file-name-history-use-recentf
-                        (require 'recentf)
-                        (or recentf-mode (recentf-mode 1)))))
-            :candidates (lambda ()
-                          (if helm-ff-file-name-history-use-recentf
-                              recentf-list
-                              file-name-history))
-            :fuzzy-match t
-            :persistent-action 'ignore
-            :filtered-candidate-transformer 'helm-file-name-history-transformer
-            :action (helm-make-actions
-                     "Find file" (lambda (candidate)
-                                   (helm-set-pattern
-                                    (expand-file-name candidate))
-                                   (with-helm-after-update-hook (helm-exit-minibuffer)))
-                      "Find file in helm" (lambda (candidate)
-                                            (helm-set-pattern
-                                             (expand-file-name candidate)))))))
-  (with-helm-alive-p
-    (helm :sources 'helm-source--ff-file-name-history
-          :buffer "*helm-file-name-history*"
-          :allow-nest t
-          :resume 'noresume)))
-
-;;; Recentf files
-;;
-;;
-(defvar helm-recentf--basename-flag nil)
-
-(defun helm-recentf-pattern-transformer (pattern)
-  (let ((pattern-no-flag (replace-regexp-in-string " -b" "" pattern)))
-    (cond ((and (string-match " " pattern-no-flag)
-                (string-match " -b\\'" pattern))
-           (setq helm-recentf--basename-flag t)
-           pattern-no-flag)
-        ((string-match "\\([^ ]*\\) -b\\'" pattern)
-         (prog1 (match-string 1 pattern)
-           (setq helm-recentf--basename-flag t)))
-        (t (setq helm-recentf--basename-flag nil)
-           pattern))))
-
-(defclass helm-recentf-source (helm-source-sync)
-  ((init :initform (lambda ()
-                     (require 'recentf)
-                     (recentf-mode 1)))
-   (candidates :initform (lambda () recentf-list))
-   (pattern-transformer :initform 'helm-recentf-pattern-transformer)
-   (match-part :initform (lambda (candidate)
-                           (if (or helm-ff-transformer-show-only-basename
-                                   helm-recentf--basename-flag)
-                               (helm-basename candidate) candidate)))
-   (filter-one-by-one :initform (lambda (c)
-                                  (if (and helm-ff-transformer-show-only-basename
-                                           (not (consp c)))
-                                      (cons (helm-basename c) c)
-                                      c)))
-   (keymap :initform helm-generic-files-map)
-   (help-message :initform helm-generic-file-help-message)
-   (mode-line :initform helm-generic-file-mode-line-string)
-   (action :initform (helm-actions-from-type-file))))
-
-(defvar helm-source-recentf nil 
-  "See (info \"(emacs)File Conveniences\").
-Set `recentf-max-saved-items' to a bigger value if default is too small.")
-
-(defcustom helm-recentf-fuzzy-match nil
-  "Enable fuzzy matching in `helm-source-recentf' when non--nil."
-  :group 'helm-files
-  :type 'boolean
-  :set (lambda (var val)
-         (set var val)
-         (setq helm-source-recentf
-               (helm-make-source "Recentf" 'helm-recentf-source
-                 :fuzzy-match helm-recentf-fuzzy-match))))
-
-;;; Browse project
-;; Need dependencies:
-;; <https://github.com/emacs-helm/helm-ls-git>
-;; <https://github.com/emacs-helm/helm-ls-hg>
-;; Only hg and git are supported for now.
-(defvar helm--browse-project-cache (make-hash-table :test 'equal))
-
-(defun helm-browse-project-get-buffers (root-directory)
-  (cl-loop for b in (helm-buffer-list)
-           for bf = (buffer-file-name (get-buffer b)) 
-           when (and bf (file-in-directory-p bf root-directory))
-           collect b))
-
-(defun helm-browse-project-build-buffers-source (directory)
-  (helm-make-source "Buffers in project" 'helm-source-buffers
-    :header-name (lambda (name)
-                   (format
-                    "%s (%s)"
-                    name (abbreviate-file-name directory)))
-    :buffer-list (lambda () (helm-browse-project-get-buffers directory))))
-
-(defun helm-browse-project-find-files (directory &optional refresh)
-  (when refresh (remhash directory helm--browse-project-cache))
-  (unless (gethash directory helm--browse-project-cache)
-    (puthash directory (helm-walk-directory
-                        directory
-                        :directories nil :path 'full :skip-subdirs t)
-             helm--browse-project-cache))
-  (helm :sources `(,(helm-browse-project-build-buffers-source directory)
-                   ,(helm-build-in-buffer-source "Browse project"
-                     :data (gethash directory helm--browse-project-cache)
-                     :header-name (lambda (name)
-                                    (format
-                                     "%s (%s)"
-                                     name (abbreviate-file-name directory)))
-                     :match-part (lambda (c)
-                                   (if helm-ff-transformer-show-only-basename
-                                       (helm-basename c) c))
-                     :filter-one-by-one
-                     (lambda (c)
-                       (if helm-ff-transformer-show-only-basename
-                           (cons (propertize (helm-basename c)
-                                             'face 'helm-ff-file)
-                                 c)
-                           (propertize c 'face 'helm-ff-file)))
-                     :mode-line helm-generic-file-mode-line-string
-                     :keymap helm-generic-files-map
-                     :action (helm-actions-from-type-file))) 
-        :buffer "*helm browse project*"))
-
-;;;###autoload
-(defun helm-browse-project (arg)
-  "Preconfigured helm to browse projects.
-Browse files and see status of project with its vcs.
-Only HG and GIT are supported for now.
-Fall back to `helm-browse-project-find-files'
-if current directory is not under control of one of those vcs.
-With a prefix ARG browse files recursively, with two prefix ARG
-rebuild the cache.
-If the current directory is found in the cache, start
-`helm-browse-project-find-files' even with no prefix ARG.
-NOTE: The prefix ARG have no effect on the VCS controlled directories.
-
-Needed dependencies for VCS:
-<https://github.com/emacs-helm/helm-ls-git>
-and
-<https://github.com/emacs-helm/helm-ls-hg>
-and
-<http://melpa.org/#/helm-ls-svn>."
-  (interactive "P")
-  (cond ((and (require 'helm-ls-git nil t)
-              (fboundp 'helm-ls-git-root-dir)
-              (helm-ls-git-root-dir))
-         (helm-ls-git-ls))
-        ((and (require 'helm-ls-hg nil t)
-              (fboundp 'helm-hg-root)
-              (helm-hg-root))
-         (helm-hg-find-files-in-project))
-        ((and (require 'helm-ls-svn nil t)
-              (fboundp 'helm-ls-svn-root-dir)
-              (helm-ls-svn-root-dir))
-         (helm-ls-svn-ls))
-        (t (let ((cur-dir (helm-browse-project-get--root-dir
-                           (helm-current-directory))))
-             (if (or arg (gethash cur-dir helm--browse-project-cache))
-                 (helm-browse-project-find-files cur-dir (equal arg '(16)))
-                 (helm :sources (helm-browse-project-build-buffers-source cur-dir)
-                       :buffer "*helm browse project*"))))))
-
-(defun helm-browse-project-get--root-dir (directory)
-  (cl-loop with dname = (file-name-as-directory directory)
-           while (and dname (not (gethash dname helm--browse-project-cache)))
-           if (file-remote-p dname)
-           do (setq dname nil) else
-           do (setq dname (helm-basedir (substring dname 0 (1- (length dname)))))
-           finally return (or dname (file-name-as-directory directory))))
-
-(defun helm-ff-browse-project (_candidate)
-  "Browse project in current directory.
-See `helm-browse-project'."
-  (with-helm-default-directory helm-ff-default-directory
-      (helm-browse-project helm-current-prefix-arg)))
-
-(defun helm-ff-run-browse-project ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-browse-project)))
-
-(defun helm-ff-gid (_candidate)
-  (with-helm-default-directory helm-ff-default-directory
-      (helm-gid)))
-
-(defun helm-ff-run-gid ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-gid)))
-
-;;; session.el files
-;;
-;;  session (http://emacs-session.sourceforge.net/) is an alternative to
-;;  recentf that saves recent file history and much more.
-(defvar helm-source-session
-  `((name . "Session")
-    (candidates . (lambda ()
-                    (cl-delete-if-not #'(lambda (f)
-                                          (or (string-match helm-tramp-file-name-regexp f)
-                                              (file-exists-p f)))
-                                      (mapcar 'car session-file-alist))))
-    (keymap . ,helm-generic-files-map)
-    (help-message . helm-generic-file-help-message)
-    (mode-line . helm-generic-file-mode-line-string)
-    (action . ,(helm-actions-from-type-file)))
-  "File list from emacs-session.")
-
-
-;;; Files in current dir
-;;
-;;
-(defun helm-highlight-files (files)
-  "A basic transformer for helm files sources.
-Colorize only symlinks, directories and files."
-  (cl-loop for i in files
-        for disp = (if (and helm-ff-transformer-show-only-basename
-                            (not (helm-dir-is-dot i))
-                            (not (and ffap-url-regexp
-                                      (string-match ffap-url-regexp i)))
-                            (not (string-match helm-ff-url-regexp i)))
-                       (helm-basename i) i)
-        for type = (and (null helm-ff-tramp-not-fancy)
-                        (car (file-attributes i)))
-        collect
-        (cond ((and helm-ff-tramp-not-fancy
-                    (string-match helm-tramp-file-name-regexp i))
-               (cons disp i))
-              ((stringp type)
-               (cons (propertize disp
-                                 'face 'helm-ff-symlink
-                                 'help-echo (expand-file-name i))
-                     i))
-              ((eq type t)
-               (cons (propertize disp
-                                 'face 'helm-ff-directory
-                                 'help-echo (expand-file-name i))
-                     i))
-              (t (cons (propertize disp
-                                   'face 'helm-ff-file
-                                   'help-echo (expand-file-name i))
-                       i)))))
-
-(defclass helm-files-in-current-dir-source (helm-source-sync helm-type-file)
-  ((candidates :initform (lambda ()
-                           (with-helm-current-buffer
-                             (let ((dir (helm-current-directory)))
-                               (when (file-accessible-directory-p dir)
-                                 (directory-files dir t))))))
-   (pattern-transformer :initform 'helm-recentf-pattern-transformer)
-   (match-part :initform (lambda (candidate)
-                           (if (or helm-ff-transformer-show-only-basename
-                                   helm-recentf--basename-flag)
-                               (helm-basename candidate) candidate)))
-   (fuzzy-match :initform t)
-   (keymap :initform helm-generic-files-map)
-   (help-message :initform helm-generic-file-help-message)
-   (mode-line :initform helm-generic-file-mode-line-string)))
-
-(defvar helm-source-files-in-current-dir
-  (helm-make-source "Files from Current Directory"
-      helm-files-in-current-dir-source))
-
-
-;;; External searching file tools.
-;;
-;; Tracker desktop search
-(defvar helm-source-tracker-cand-incomplete nil "Contains incomplete candidate")
-(defun helm-source-tracker-transformer (candidates _source)
-  (helm-log "received: %S" candidates)
-  (cl-loop for cand in candidates
-           for path = (when (stringp helm-source-tracker-cand-incomplete)
-                        (caar (helm-highlight-files
-                               (list helm-source-tracker-cand-incomplete))))
-           for built = (if (not (stringp cand)) cand
-                         (let ((snippet cand))
-                           (unless (or (null path)
-                                      (string= "" path)
-                                      (not (string-match-p
-                                          "\\`[[:space:]]*\\.\\.\\."
-                                          snippet)))
-                             (let ((complete-candidate
-                                    (cons (concat path "\n" snippet) path)))
-                               (setq helm-source-tracker-cand-incomplete nil)
-                               (helm-log "built: %S" complete-candidate)
-                               complete-candidate))))
-           when (and (stringp cand)
-                   (string-match "\\`[[:space:]]*file://" cand))
-           do (setq helm-source-tracker-cand-incomplete ; save path
-                    (replace-match "" t t cand)) end
-           collect built))
-
-(defvar helm-source-tracker-search
-  `((name . "Tracker Search")
-    (candidates-process
-     . (lambda ()
-         (start-process "tracker-search-process" nil
-                        "tracker-search"
-                        "--disable-color"
-                        "--limit=512"
-                        helm-pattern)))
-    (filtered-candidate-transformer . helm-source-tracker-transformer)
-    ;;(multiline) ; https://github.com/emacs-helm/helm/issues/529
-    (keymap . ,helm-generic-files-map)
-    (action . ,(cdr (helm-get-attribute-from-type 'action 'file)))
-    (action-transformer
-     helm-transform-file-load-el
-     helm-transform-file-browse-url)
-    (requires-pattern . 3))
-  "Source for retrieving files matching the current input pattern
-with the tracker desktop search.")
-
-;; Spotlight (MacOS X desktop search)
-(defvar helm-source-mac-spotlight
-  '((name . "mdfind")
-    (candidates-process
-     . (lambda () (start-process "mdfind-process" nil "mdfind" helm-pattern)))
-    (type . file)
-    (requires-pattern . 3))
-  "Source for retrieving files via Spotlight's command line
-utility mdfind.")
-
-
-;;; Findutils
-;;
-;;
-(defvar helm-source-findutils
-  (helm-build-async-source "Find"
-    :header-name (lambda (name)
-                   (concat name " in [" (helm-default-directory) "]"))
-    :candidates-process 'helm-find-shell-command-fn
-    :filtered-candidate-transformer 'helm-findutils-transformer
-    :action-transformer 'helm-transform-file-load-el
-    :action (helm-actions-from-type-file)
-    :mode-line  helm-generic-file-mode-line-string
-    :keymap helm-generic-files-map
-    :candidate-number-limit 9999
-    :requires-pattern 3))
-
-(defun helm-findutils-transformer (candidates _source)
-  (let (non-essential
-        (default-directory (helm-default-directory)))
-    (cl-loop for i in candidates
-             for abs = (expand-file-name
-                        (helm-aif (file-remote-p default-directory)
-                            (concat it i) i))
-             for type = (car (file-attributes abs))
-             for disp = (if (and helm-ff-transformer-show-only-basename
-                                 (not (string-match "[.]\\{1,2\\}$" i)))
-                            (helm-basename abs) abs)
-             collect (cond ((eq t type)
-                            (cons (propertize disp 'face 'helm-ff-directory)
-                                  abs))
-                           ((stringp type)
-                            (cons (propertize disp 'face 'helm-ff-symlink)
-                                  abs))
-                           (t (cons (propertize disp 'face 'helm-ff-file)
-                                    abs))))))
-
-(defun helm-find--build-cmd-line ()
-  (require 'find-cmd)
-  (let* ((default-directory (or (file-remote-p default-directory 'localname)
-                                default-directory))
-         (patterns+options (split-string helm-pattern "\\(\\`\\| +\\)\\* +"))
-         (fold-case (helm-set-case-fold-search (car patterns+options)))
-         (patterns (split-string (car patterns+options)))
-         (additional-options (and (cdr patterns+options)
-                                  (list (concat (cadr patterns+options) " "))))
-         (ignored-dirs ())
-         (ignored-files (when helm-findutils-skip-boring-files
-                          (cl-loop for f in completion-ignored-extensions
-                                   if (string-match "/$" f)
-                                   do (push (replace-match "" nil t f)
-                                            ignored-dirs)
-                                   else collect (concat "*" f))))
-         (path-or-name (if helm-findutils-search-full-path
-                           '(ipath path) '(iname name)))
-         (name-or-iname (if fold-case
-                            (car path-or-name) (cadr path-or-name))))
-    (find-cmd (and ignored-dirs
-                   `(prune (name ,@ignored-dirs)))
-              (and ignored-files
-                   `(not (name ,@ignored-files)))
-              `(and ,@(mapcar
-                       (lambda (pattern)
-                         `(,name-or-iname ,(concat "*" pattern "*")))
-                       patterns)
-                    ,@additional-options))))
-
-(defun helm-find-shell-command-fn ()
-  "Asynchronously fetch candidates for `helm-find'.
-Additional find options can be specified after a \"*\"
-separator."
-  (let* (process-connection-type
-         non-essential
-         (cmd (helm-find--build-cmd-line))
-         (proc (start-file-process-shell-command "hfind" helm-buffer cmd)))
-    (helm-log "Find command:\n%s" cmd)
-    (prog1 proc
-      (set-process-sentinel
-       proc
-       #'(lambda (process event)
-           (helm-process-deferred-sentinel-hook
-            process event (helm-default-directory))
-           (if (string= event "finished\n")
-               (with-helm-window
-                 (setq mode-line-format
-                       '(" " mode-line-buffer-identification " "
-                         (:eval (format "L%s" (helm-candidate-number-at-point))) " "
-                         (:eval (propertize
-                                 (format "[Find process finished - (%s results)]" 
-                                         (max (1- (count-lines
-                                                   (point-min) (point-max)))
-                                              0))
-                                 'face 'helm-locate-finish))))
-                 (force-mode-line-update))
-               (helm-log "Error: Find %s"
-                         (replace-regexp-in-string "\n" "" event))))))))
-
-(defun helm-find-1 (dir)
-  (let ((default-directory (file-name-as-directory dir)))
-    (helm :sources 'helm-source-findutils
-          :buffer "*helm find*"
-          :ff-transformer-show-only-basename nil
-          :case-fold-search helm-file-name-case-fold-search)))
-
-;; helm-find-files integration.
-(defun helm-ff-find-sh-command (_candidate)
-  "Run `helm-find' from `helm-find-files'."
-  (helm-find-1 helm-ff-default-directory))
-
-(defun helm-ff-run-find-sh-command ()
-  "Run find shell command action with key from `helm-find-files'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-ff-find-sh-command)))
-
-
-;;; Preconfigured commands
-;;
-;;
-;;;###autoload
-(defun helm-find (arg)
-  "Preconfigured `helm' for the find shell command."
-  (interactive "P")
-  (let ((directory
-         (if arg
-             (file-name-as-directory
-              (read-directory-name "DefaultDirectory: "))
-           default-directory)))
-    (helm-find-1 directory)))
-
-(defvar org-directory)
-;;;###autoload
-(defun helm-find-files (arg)
-  "Preconfigured `helm' for helm implementation of `find-file'.
-Called with a prefix arg show history if some.
-Don't call it from programs, use `helm-find-files-1' instead.
-This is the starting point for nearly all actions you can do on files."
-  (interactive "P")
-  (let* ((hist          (and arg helm-ff-history (helm-find-files-history)))
-         (default-input (or hist (helm-find-files-initial-input)))
-         (input         (cond ((and (eq major-mode 'org-agenda-mode)
-                                    org-directory
-                                    (not default-input))
-                               (expand-file-name org-directory))
-                              ((and (eq major-mode 'dired-mode) default-input)
-                               (file-name-directory default-input))
-                              ((and (not (string= default-input ""))
-                                    default-input))
-                              (t (expand-file-name (helm-current-directory)))))
-         (presel        (helm-aif (or hist
-                                      (buffer-file-name (current-buffer))
-                                      (and (eq major-mode 'dired-mode)
-                                           default-input))
-                            (if helm-ff-transformer-show-only-basename
-                                (helm-basename it) it))))
-    (set-text-properties 0 (length input) nil input)
-    (helm-find-files-1 input (and presel (concat "^" (regexp-quote presel))))))
-
-;;;###autoload
-(defun helm-for-files ()
-  "Preconfigured `helm' for opening files.
-Run all sources defined in `helm-for-files-preferred-list'."
-  (interactive)
-  (unless helm-source-buffers-list
-    (setq helm-source-buffers-list
-          (helm-make-source "Buffers" 'helm-source-buffers)))
-  (helm :sources helm-for-files-preferred-list
-        :ff-transformer-show-only-basename nil
-        :buffer "*helm for files*"))
-
-;;;###autoload
-(defun helm-multi-files ()
-  "Preconfigured helm similar to `helm-for-files' but that don't run locate.
-Allow toggling from locate to others sources.
-This allow seeing first if what you search is in other sources before launching
-locate."
-  (interactive)
-  (unless helm-source-buffers-list
-    (setq helm-source-buffers-list
-          (helm-make-source "Buffers" 'helm-source-buffers)))
-  (setq helm-multi-files--toggle-locate nil)
-  (let ((sources (remove 'helm-source-locate helm-for-files-preferred-list))
-        (old-key (lookup-key
-                  helm-map
-                  (read-kbd-macro helm-multi-files-toggle-locate-binding))))
-    (with-helm-temp-hook 'helm-after-initialize-hook
-      (define-key helm-map (kbd helm-multi-files-toggle-locate-binding)
-        'helm-multi-files-toggle-to-locate))
-    (unwind-protect
-         (helm :sources sources
-               :ff-transformer-show-only-basename nil
-               :buffer "*helm multi files*")
-      (define-key helm-map (kbd helm-multi-files-toggle-locate-binding)
-        old-key))))
-
-;;;###autoload
-(defun helm-recentf ()
-  "Preconfigured `helm' for `recentf'."
-  (interactive)
-  (helm :sources 'helm-source-recentf
-        :ff-transformer-show-only-basename nil
-        :buffer "*helm recentf*"))
-
-(provide 'helm-files)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-files.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-font.el b/emacs.d/elpa/helm-20150623.1310/helm-font.el
deleted file mode 100644
index e7a7d24..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-font.el
+++ /dev/null
@@ -1,187 +0,0 @@
-;;; helm-font --- Font and ucs selection for Helm -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-
-(defvar helm-ucs-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "<C-backspace>") 'helm-ucs-persistent-delete)
-    (define-key map (kbd "<C-left>")      'helm-ucs-persistent-backward)
-    (define-key map (kbd "<C-right>")     'helm-ucs-persistent-forward)
-    (define-key map (kbd "<C-return>")    'helm-ucs-persistent-insert)
-    (define-key map (kbd "C-c ?")         'helm-ucs-help)
-    map)
-  "Keymap for `helm-ucs'.")
-
-
-;;; Xfont selection
-;;
-;;
-(defun helm-persistent-xfont-action (elm)
-  "Show current font temporarily"
-  (let ((current-font (cdr (assoc 'font (frame-parameters))))
-        (default-font elm))
-    (unwind-protect
-         (progn (set-frame-font default-font 'keep-size) (sit-for 2))
-      (set-frame-font current-font))))
-
-(defvar helm-xfonts-cache nil)
-(defvar helm-source-xfonts
-  '((name . "X Fonts")
-    (init . (lambda ()
-              (unless helm-xfonts-cache
-                (setq helm-xfonts-cache
-                      (x-list-fonts "*")))))
-    (candidates . helm-xfonts-cache)
-    (action . (("Copy to kill ring" . (lambda (elm)
-                                        (kill-new elm)))
-               ("Set Font" . (lambda (elm)
-                               (kill-new elm)
-                               (set-frame-font elm 'keep-size)
-                               (message "New font have been copied to kill ring")))))
-    (persistent-action . helm-persistent-xfont-action)
-    (persistent-help . "Switch to this font temporarily")))
-
-;;; 𝕌𝕔𝕤 𝕊𝕪𝕞𝕓𝕠𝕝 𝕔𝕠𝕞𝕡𝕝𝕖𝕥𝕚𝕠𝕟
-;;
-;;
-(defvar helm-ucs-max-len 0)
-(defun helm-calculate-ucs-max-len ()
-  "Calculate the length of longest `ucs-names' candidate."
-  (cl-loop with count = 0
-        for (n . v) in (ucs-names)
-        for len = (length n)
-        if (> len count)
-        do (setq count len)
-        finally return count))
-
-(defun helm-ucs-init ()
-  "Initialize an helm buffer with ucs symbols.
-Only math* symbols are collected."
-  (unless (> helm-ucs-max-len 0)
-    (setq helm-ucs-max-len
-          (helm-calculate-ucs-max-len)))
-  (with-current-buffer (helm-candidate-buffer
-                        (get-buffer-create "*helm ucs*"))
-    ;; `ucs-names' fn will not run again, data is cached in
-    ;; var `ucs-names'.
-    (cl-loop for (n . v) in (ucs-names)
-          for len = (length n)
-          for diff = (+ (- helm-ucs-max-len len) 2)
-          unless (string= "" n)
-          do (progn (insert (concat
-                             n ":"
-                             (make-string
-                              diff ? )))
-                    (if (fboundp 'ucs-insert)
-                        (ucs-insert v)
-                      ;; call `insert-char' with nil nil
-                      ;; to shutup byte compiler in 24.1.
-                      (insert-char v nil nil))
-                    (insert (format " #x%x" v))
-                    (insert "\n")))))
-
-(defun helm-ucs-forward-char (_candidate)
-  (with-helm-current-buffer
-    (forward-char 1)))
-
-(defun helm-ucs-backward-char (_candidate)
-  (with-helm-current-buffer
-    (forward-char -1)))
-
-(defun helm-ucs-delete-backward (_candidate)
-  (with-helm-current-buffer
-    (delete-char -1)))
-
-(defun helm-ucs-insert (candidate n)
-  (with-helm-current-buffer
-    (string-match "^\\([^:]+\\): +\\(.\\) #x\\([a-f0-9]+\\)$" candidate)
-    (insert (match-string n candidate))))
-
-(defun helm-ucs-insert-name (candidate)
-  (helm-ucs-insert candidate 1))
-
-(defun helm-ucs-insert-char (candidate)
-  (helm-ucs-insert candidate 2))
-
-(defun helm-ucs-insert-code (candidate)
-  (helm-ucs-insert candidate 3))
-
-(defun helm-ucs-persistent-insert ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'action-insert 'helm-ucs-insert-char)
-    (helm-execute-persistent-action 'action-insert)))
-
-(defun helm-ucs-persistent-forward ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'action-forward 'helm-ucs-forward-char)
-    (helm-execute-persistent-action 'action-forward)))
-
-(defun helm-ucs-persistent-backward ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'action-back 'helm-ucs-backward-char)
-    (helm-execute-persistent-action 'action-back)))
-
-(defun helm-ucs-persistent-delete ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-attrset 'action-delete 'helm-ucs-delete-backward)
-    (helm-execute-persistent-action 'action-delete)))
-
-(defvar helm-source-ucs
-  '((name . "Ucs names")
-    (init . helm-ucs-init)
-    (candidate-number-limit . 9999)
-    (candidates-in-buffer)
-    (mode-line . helm-ucs-mode-line-string)
-    (action . (("Insert character" . helm-ucs-insert-char)
-               ("Insert character name" . helm-ucs-insert-name)
-               ("Insert character code in hex" . helm-ucs-insert-code)
-               ("Forward char" . helm-ucs-forward-char)
-               ("Backward char" . helm-ucs-backward-char)
-               ("Delete char backward" . helm-ucs-delete-backward))))
-  "Source for collecting `ucs-names' math symbols.")
-
-;;;###autoload
-(defun helm-select-xfont ()
-  "Preconfigured `helm' to select Xfont."
-  (interactive)
-  (helm-other-buffer 'helm-source-xfonts "*helm select* xfont"))
-
-;;;###autoload
-(defun helm-ucs ()
-  "Preconfigured helm for `ucs-names' math symbols."
-  (interactive)
-  (helm :sources 'helm-source-ucs
-        :keymap  helm-ucs-map))
-
-(provide 'helm-font)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-font.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-grep.el b/emacs.d/elpa/helm-20150623.1310/helm-grep.el
deleted file mode 100644
index f1ab097..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-grep.el
+++ /dev/null
@@ -1,1233 +0,0 @@
-;;; helm-grep.el --- Helm Incremental Grep. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'grep)
-(require 'helm-regexp)
-
-;;; load wgrep proxy if it's available
-(require 'wgrep-helm nil t)
-
-(declare-function helm-buffer-list "helm-buffers")
-(declare-function helm-elscreen-find-file "helm-elscreen" (file))
-(declare-function View-quit "view")
-(declare-function doc-view-goto-page "doc-view" (page))
-
-
-(defgroup helm-grep nil
-  "Grep related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-grep-default-command
-  "grep --color=never -a -d skip %e -n%cH -e %p %f"
-  "Default grep format command for `helm-do-grep-1'.
-Where:
-'%e' format spec is for --exclude or --include grep options or
-     ack-grep --type option.               (Not mandatory)
-
-'%c' format spec is for case-fold-search,
-     whether to use the -i option of grep. (Not mandatory)
-     When you specify this spec, helm grep will use smartcase
-     that is when a upcase character is found in pattern case will
-     be respected and no '-i' option will be used, otherwise, when
-     no upcase character is found in pattern always use '-i'.
-     If you don't want this behavior, don't use this spec and
-     specify or not the '-i' option.
-     Note that with ack-grep this is not needed, just specify
-     the '--smart-case' option.
-
-'%p' format spec is for pattern.           (Mandatory)
-
-'%f' format spec is for filenames.         (Mandatory)
-
-If your grep version doesn't support the --exclude/include args
-don't specify the '%e' format spec.
-
-Helm also support ack-grep and git-grep ,
-here a default command example for ack-grep:
-
-\(setq helm-grep-default-command \"ack-grep -Hn --no-group --no-color %e %p %f\"
-       helm-grep-default-recurse-command \"ack-grep -H --no-group --no-color %e %p %f\")
-
-You can ommit the %e spec if you don't want to be prompted for types.
-
-NOTE: Helm for ack-grep support ANSI sequences, so you can remove
-the \"--no-color\" option safely (recommended).
-
-To enable ANSI in grep it is a little more difficult:
-    1) Modify env var
-      \(setenv \"GREP_COLORS\" \"ms=01;31:mc=01;31:sl=01;37:cx=:fn=35:ln=32:bn=32:se=36\")
-    2) Add the option \"--color=always\".
-
-To enable ANSI color in git-grep just add \"--color=always\".
-To customize the ANSI color in git-grep, GREP_COLORS have no effect,
-you will have to setup this in your .gitconfig:
-
-    [color \"grep\"]
-	match = black yellow
-
-where \"black\" is the foreground and \"yellow\" the background.
-See the git documentation for more infos.
-
-`helm-grep-default-command' and `helm-grep-default-recurse-command'are
-independents, so you can enable `helm-grep-default-command' with ack-grep
-and `helm-grep-default-recurse-command' with grep if you want to be faster
-on recursive grep.
-
-NOTE: Remote grepping is not available with ack-grep,
-      and badly supported with grep because tramp handle badly
-      repeated remote processes in a short delay (< to 5s)."
-  :group 'helm-grep
-  :type  'string)
-
-(defcustom helm-grep-default-recurse-command
-  "grep --color=never -a -d recurse %e -n%cH -e %p %f"
-  "Default recursive grep format command for `helm-do-grep-1'.
-See `helm-grep-default-command' for format specs and infos about ack-grep."
-  :group 'helm-grep
-  :type  'string)
-
-(defcustom helm-default-zgrep-command
-  "zgrep -a -n%cH -e %p %f"
-  "Default command for Zgrep.
-See `helm-grep-default-command' for infos on format specs.
-Option --color=always is supported and can be used safely
-to replace the helm internal match highlighting,
-see `helm-grep-default-command' for more infos."
-  :group 'helm-grep
-  :type  'string)
-
-(defcustom helm-pdfgrep-default-command
-  "pdfgrep --color never -niH %s %s"
-  "Default command for pdfgrep.
-Option --color always is not supported, expect
-errors when executing actions."
-  :group 'helm-grep
-  :type  'string)
-
-(defcustom helm-grep-use-ioccur-style-keys t
-  "Use Arrow keys to jump to occurences."
-  :group 'helm-grep
-  :type  'boolean)
-
-(defcustom helm-pdfgrep-default-read-command nil
-  "Default command to read pdf files from pdfgrep.
-Where '%f' format spec is filename and '%p' is page number.
-e.g In Ubuntu you can set it to:
-
-    \"evince --page-label=%p '%f'\"
-
-If set to nil `doc-view-mode' will be used instead of an external command."
-  :group 'helm-grep
-  :type  'string)
-
-(defcustom helm-grep-max-length-history 100
-  "Max number of elements to save in `helm-grep-history'."
-  :group 'helm-grep
-  :type 'integer)
-
-(defcustom helm-zgrep-file-extension-regexp
-  ".*\\(\\.gz\\|\\.bz\\|\\.xz\\|\\.lzma\\)$"
-  "Default file extensions zgrep will search in."
-  :group 'helm-grep
-  :type 'string)
-
-(defcustom helm-do-grep-preselect-candidate nil
-  "When non--nil the file name of current buffer will be selected."
-  :group 'helm-grep
-  :type 'boolean)
-
-(defcustom helm-grep-preferred-ext nil
-  "This file extension will be preselected for grep."
-  :group 'helm-grep
-  :type  'string)
-
-
-;;; Faces
-;;
-;;
-(defgroup helm-grep-faces nil
-  "Customize the appearance of helm-grep."
-  :prefix "helm-"
-  :group 'helm-grep
-  :group 'helm-faces)
-
-(defface helm-grep-match
-  '((((background light)) :foreground "#b00000")
-    (((background dark))  :foreground "gold1"))
-  "Face used to highlight grep matches."
-  :group 'helm-grep-faces)
-
-(defface helm-grep-file
-    '((t (:foreground "BlueViolet"
-          :underline t)))
-  "Face used to highlight grep results filenames."
-  :group 'helm-grep-faces)
-
-(defface helm-grep-lineno
-    '((t (:foreground "Darkorange1")))
-  "Face used to highlight grep number lines."
-  :group 'helm-grep-faces)
-
-(defface helm-grep-running
-    '((t (:foreground "Red")))
-  "Face used in mode line when grep is running."
-  :group 'helm-grep-faces)
-
-(defface helm-grep-finish
-    '((t (:foreground "Green")))
-  "Face used in mode line when grep is finish."
-  :group 'helm-grep-faces)
-
-(defface helm-grep-cmd-line
-    '((t (:inherit diff-added)))
-  "Face used to highlight grep command line when no results."
-  :group 'helm-grep-faces)
-
-
-;;; Keymaps
-;;
-;;
-(defvar helm-grep-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
-    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
-    (define-key map (kbd "C-c o")    'helm-grep-run-other-window-action)
-    (define-key map (kbd "C-c C-o")  'helm-grep-run-other-frame-action)
-    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
-    (define-key map (kbd "C-x C-s")  'helm-grep-run-save-buffer)
-    (when helm-grep-use-ioccur-style-keys
-      (define-key map (kbd "<right>")  'helm-execute-persistent-action)
-      (define-key map (kbd "<left>")  'helm-grep-run-default-action))
-    (define-key map (kbd "C-c ?")    'helm-grep-help)
-    (delq nil map))
-  "Keymap used in Grep sources.")
-
-(defvar helm-pdfgrep-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
-    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
-    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
-    (define-key map (kbd "C-c ?")    'helm-pdfgrep-help)
-    map)
-  "Keymap used in pdfgrep.")
-
-(defvar helm-grep-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "RET")      'helm-grep-mode-jump)
-    (define-key map (kbd "C-o")      'helm-grep-mode-jump-other-window)
-    (define-key map (kbd "<C-down>") 'helm-grep-mode-jump-other-window-forward)
-    (define-key map (kbd "<C-up>")   'helm-grep-mode-jump-other-window-backward)
-    (define-key map (kbd "<M-down>") 'helm-gm-next-file)
-    (define-key map (kbd "<M-up>")   'helm-gm-precedent-file)
-    (define-key map (kbd "M-n")      'helm-grep-mode-jump-other-window-forward)
-    (define-key map (kbd "M-p")      'helm-grep-mode-jump-other-window-backward)
-    (define-key map (kbd "M-N")      'helm-gm-next-file)
-    (define-key map (kbd "M-P")      'helm-gm-precedent-file)
-    map))
-
-
-;;; Internals vars
-;;
-;;
-(defvar helm-rzgrep-cache (make-hash-table :test 'equal))
-(defvar helm-grep-default-function 'helm-grep-init)
-(defvar helm-zgrep-recurse-flag nil)
-(defvar helm-grep-history nil)
-(defvar helm-grep-last-targets nil)
-(defvar helm-grep-include-files nil)
-(defvar helm-grep-in-recurse nil)
-(defvar helm-grep-use-zgrep nil)
-(defvar helm-grep-default-directory-fn nil
-  "A function that should return a directory to expand candidate to.
-It is intended to use as a let-bound variable, DON'T set this globaly.")
-(defvar helm-pdfgrep-targets nil)
-(defvar helm-grep-last-cmd-line nil)
-(defvar helm-grep-split-line-regexp "^\\([[:lower:][:upper:]]?:?.*?\\):\\([0-9]+\\):\\(.*\\)")
-
-
-;;; Init
-;;
-;;
-(defun helm-grep-prepare-candidates (candidates in-directory)
-  "Prepare filenames and directories CANDIDATES for grep command line."
-  ;; If one or more candidate is a directory, search in all files
-  ;; of this candidate (e.g /home/user/directory/*).
-  ;; If r option is enabled search also in subdidrectories.
-  ;; We need here to expand wildcards to support crap windows filenames
-  ;; as grep doesn't accept quoted wildcards (e.g "dir/*.el").
-  (if helm-zgrep-recurse-flag
-      (mapconcat 'shell-quote-argument candidates " ")
-    ;; When candidate is a directory, search in all its files.
-    ;; NOTE that `file-expand-wildcards' will return also
-    ;; directories, they will be ignored by grep but not
-    ;; by ack-grep that will grep all files of this directory
-    ;; without recursing in their subdirs though, see that as a one
-    ;; level recursion with ack-grep.
-    ;; So I leave it as it is, considering it is a feature. [1]
-    (cl-loop for i in candidates append
-          (cond ((string-match "^git" helm-grep-default-command)
-                 (list i))
-                ;; Candidate is a directory and we use recursion or ack.
-                ((and (file-directory-p i)
-                      (or helm-grep-in-recurse
-                          ;; ack-grep accept directory [1].
-                          (helm-grep-use-ack-p)))
-                 (list (expand-file-name i)))
-                ;; Grep doesn't support directory only when not in recurse.
-                ((file-directory-p i)
-                 (file-expand-wildcards
-                  (concat (file-name-as-directory (expand-file-name i)) "*") t))
-                ;; Candidate is a file or wildcard and we use recursion, use the
-                ;; current directory instead of candidate.
-                ((and (or (file-exists-p i) (string-match "[*]" i))
-                      helm-grep-in-recurse)
-                 (list (expand-file-name
-                        (directory-file-name ; Needed for windoze.
-                         (file-name-directory (directory-file-name i))))))
-                ;; Else should be one or more file/directory
-                ;; possibly marked.
-                ;; When real is a normal filename without wildcard
-                ;; file-expand-wildcards returns a list of one file.
-                ;; wildcards should have been already handled by
-                ;; helm-read-file-name or helm-find-files but do it from
-                ;; here too in case we are called from elsewhere.
-                (t (file-expand-wildcards i t))) into all-files ; [1]
-          finally return
-          (let ((files (if (file-remote-p in-directory)
-                       ;; Grep don't understand tramp filenames
-                       ;; use the local name.
-                       (mapcar #'(lambda (x)
-                                   (file-remote-p x 'localname))
-                               all-files)
-                       all-files)))
-            (if (string-match "^git" helm-grep-default-command)
-                (mapconcat 'identity files " ")
-                (mapconcat 'shell-quote-argument files " "))))))
-
-(defun helm-grep-command (&optional recursive)
-  (let* ((com (if recursive
-                  helm-grep-default-recurse-command
-                  helm-grep-default-command))
-         (exe (and com (car (split-string com " ")))))
-    (if (and exe (string= exe "git")) "git-grep" exe)))
-
-(cl-defun helm-grep-use-ack-p (&key where)
-  (let* ((rec-com (helm-grep-command t))
-         (norm-com (helm-grep-command))
-         (norm-com-ack-p (string-match "\\`ack" norm-com))
-         (rec-com-ack-p (and rec-com (string-match "\\`ack" rec-com))))
-    (cl-case where
-      (default   (and norm-com norm-com-ack-p))
-      (recursive (and rec-com rec-com-ack-p))
-      (strict    (and norm-com rec-com rec-com-ack-p norm-com-ack-p))
-      (t         (and (not (and norm-com (string= norm-com "git-grep")))
-                      (or (and norm-com norm-com-ack-p)
-                          (and rec-com rec-com-ack-p)))))))
-
-(defun helm-grep--prepare-cmd-line (only-files &optional include zgrep)
-  (let* ((default-directory (or (helm-default-directory)
-                                (expand-file-name helm-ff-default-directory)))
-         (fnargs            (helm-grep-prepare-candidates
-                             only-files default-directory))
-         (ignored-files     (unless (helm-grep-use-ack-p)
-                              (mapconcat
-                               #'(lambda (x)
-                                   (concat "--exclude="
-                                           (shell-quote-argument x)))
-                               grep-find-ignored-files " ")))
-         (ignored-dirs      (unless (helm-grep-use-ack-p)
-                              (mapconcat
-                               ;; Need grep version >=2.5.4
-                               ;; of Gnuwin32 on windoze.
-                               #'(lambda (x)
-                                   (concat "--exclude-dir="
-                                           (shell-quote-argument x)))
-                               grep-find-ignored-directories " ")))
-         (exclude           (unless (helm-grep-use-ack-p)
-                              (if helm-grep-in-recurse
-                                  (concat (or include ignored-files)
-                                          " " ignored-dirs)
-                                ignored-files)))
-         (types             (and (helm-grep-use-ack-p)
-                                 ;; When %e format spec is not specified
-                                 ;; in `helm-grep-default-command'
-                                 ;; we need to pass an empty string
-                                 ;; to types to avoid error.
-                                 (or include "")))
-         (smartcase         (if (helm-grep-use-ack-p) ""
-                              (unless (let ((case-fold-search nil))
-                                        (string-match-p
-                                         "[[:upper:]]" helm-pattern)) "i"))))
-    (format-spec
-     helm-grep-default-command
-     (delq nil
-           (list (unless zgrep
-                   (if types
-                       (cons ?e types)
-                     (cons ?e exclude)))
-                 (cons ?c (or smartcase ""))
-                 (cons ?p (shell-quote-argument helm-pattern))
-                 (cons ?f fnargs))))))
-
-(defun helm-grep-init (cmd-line)
-  "Start an asynchronous grep process with CMD-LINE using ZGREP if non--nil."
-  (let* ((default-directory (or helm-ff-default-directory
-                                (helm-default-directory)))
-         (zgrep (string-match "\\`zgrep" cmd-line))
-         ;; Use pipe only with grep, zgrep or git-grep.
-         (process-connection-type (and (not zgrep) (helm-grep-use-ack-p)))
-         (tramp-verbose helm-tramp-verbose)
-         non-essential)
-    ;; Start grep process.
-    (helm-log "Starting Grep process in directory `%s'" default-directory)
-    (helm-log "Command line used was:\n\n%s"
-              (concat ">>> " (propertize cmd-line 'face 'helm-grep-cmd-line) "\n\n"))
-    (prog1            ; This function should return the process first.
-        (start-file-process-shell-command
-         "grep" helm-buffer cmd-line)
-      ;; Init sentinel.
-      (set-process-sentinel
-       (get-buffer-process helm-buffer)
-       #'(lambda (process event)
-           (let ((noresult (= (process-exit-status process) 1)))
-             (unless noresult
-               (helm-process-deferred-sentinel-hook
-                process event helm-ff-default-directory))
-             (cond ((and noresult
-                         ;; [FIXME] This is a workaround for zgrep
-                         ;; that exit with code 1
-                         ;; after a certain amount of results.
-                         (not (with-helm-buffer helm-grep-use-zgrep)))
-                    (with-current-buffer helm-buffer
-                      (insert (concat "* Exit with code 1, no result found,"
-                                      " Command line was:\n\n "
-                                      (propertize helm-grep-last-cmd-line
-                                                  'face 'helm-grep-cmd-line)))
-                      (setq mode-line-format
-                            '(" " mode-line-buffer-identification " "
-                              (:eval (format "L%s" (helm-candidate-number-at-point))) " "
-                              (:eval (propertize
-                                      (format
-                                       "[%s process finished - (no results)] "
-                                       (if helm-grep-use-zgrep
-                                           "Zgrep"
-                                         (capitalize
-                                          (if helm-grep-in-recurse
-                                              (helm-grep-command t)
-                                            (helm-grep-command)))))
-                                      'face 'helm-grep-finish))))))
-                   ((string= event "finished\n")
-                    (with-helm-window
-                      (setq mode-line-format
-                            '(" " mode-line-buffer-identification " "
-                              (:eval (format "L%s" (helm-candidate-number-at-point))) " "
-                              (:eval (propertize
-                                      (format
-                                       "[%s process finished - (%s results)] "
-                                       (if helm-grep-use-zgrep
-                                           "Zgrep"
-                                         (capitalize
-                                          (if helm-grep-in-recurse
-                                              (helm-grep-command t)
-                                            (helm-grep-command))))
-                                       (max (1- (count-lines
-                                                 (point-min)
-                                                 (point-max)))
-                                            0))
-                                      'face 'helm-grep-finish))))
-                      (force-mode-line-update)))
-                   ;; Catch error output in log.
-                   (t (helm-log
-                       "Error: %s %s"
-                       (if helm-grep-use-zgrep "Zgrep" "Grep")
-                       (replace-regexp-in-string "\n" "" event))))))))))
-
-(defun helm-grep-collect-candidates ()
-  (let ((cmd-line (helm-grep--prepare-cmd-line
-                   helm-grep-last-targets
-                   helm-grep-include-files
-                   helm-grep-use-zgrep)))
-    (set (make-local-variable 'helm-grep-last-cmd-line) cmd-line)
-    (funcall helm-grep-default-function cmd-line)))
-
-
-;;; Actions
-;;
-;;
-(defun helm-grep-action (candidate &optional where mark)
-  "Define a default action for `helm-do-grep' on CANDIDATE.
-WHERE can be one of other-window, elscreen, other-frame."
-  (let* ((split        (helm-grep-split-line candidate))
-         (lineno       (string-to-number (nth 1 split)))
-         (loc-fname        (or (with-current-buffer
-                                   (if (eq major-mode 'helm-grep-mode)
-                                       (current-buffer)
-                                       helm-buffer)
-                                 (get-text-property (point-at-bol) 'help-echo))
-                               (car split)))
-         (tramp-method (file-remote-p (or helm-ff-default-directory
-                                          default-directory) 'method))
-         (tramp-host   (file-remote-p (or helm-ff-default-directory
-                                          default-directory) 'host))
-         (tramp-prefix (concat "/" tramp-method ":" tramp-host ":"))
-         (fname        (if tramp-host
-                           (concat tramp-prefix loc-fname) loc-fname)))
-    (cl-case where
-      (other-window (find-file-other-window fname))
-      (elscreen     (helm-elscreen-find-file fname))
-      (other-frame  (find-file-other-frame fname))
-      (grep         (helm-grep-save-results-1))
-      (pdf          (if helm-pdfgrep-default-read-command
-                        (helm-pdfgrep-action-1 split lineno (car split))
-                      (find-file (car split)) (doc-view-goto-page lineno)))
-      (t            (find-file fname)))
-    (unless (or (eq where 'grep) (eq where 'pdf))
-      (helm-goto-line lineno))
-    (when mark
-      (set-marker (mark-marker) (point))
-      (push-mark (point) 'nomsg))
-    ;; Save history
-    (unless (or helm-in-persistent-action
-                (eq major-mode 'helm-grep-mode)
-                (string= helm-pattern ""))
-      (setq helm-grep-history
-            (cons helm-pattern
-                  (delete helm-pattern helm-grep-history)))
-      (when (> (length helm-grep-history)
-               helm-grep-max-length-history)
-        (setq helm-grep-history
-              (delete (car (last helm-grep-history))
-                      helm-grep-history))))))
-
-(defun helm-grep-persistent-action (candidate)
-  "Persistent action for `helm-do-grep'.
-With a prefix arg record CANDIDATE in `mark-ring'."
-  (if current-prefix-arg
-      (helm-grep-action candidate nil 'mark)
-    (helm-grep-action candidate))
-  (helm-highlight-current-line))
-
-(defun helm-grep-other-window (candidate)
-  "Jump to result in other window from helm grep."
-  (helm-grep-action candidate 'other-window))
-
-(defun helm-grep-other-frame (candidate)
-  "Jump to result in other frame from helm grep."
-  (helm-grep-action candidate 'other-frame))
-
-(defun helm-grep-jump-elscreen (candidate)
-  "Jump to result in elscreen from helm grep."
-  (helm-grep-action candidate 'elscreen))
-
-(defun helm-goto-next-or-prec-file (n &optional type)
-  "Go to next or precedent candidate file in helm grep/etags buffers.
-If N is positive go forward otherwise go backward."
-  (let* ((allow-mode (or (eq major-mode 'helm-grep-mode)
-                         (eq major-mode 'helm-moccur-mode)))
-         (sel (if allow-mode
-                  (buffer-substring (point-at-bol) (point-at-eol))
-                (helm-get-selection nil t)))
-         (current-line-list  (if (eq type 'etags)
-                                 (split-string sel ": +" t)
-                               (helm-grep-split-line sel)))
-         (current-fname      (nth 0 current-line-list))
-         (bob-or-eof         (if (eq n 1) 'eobp 'bobp))
-         (mark-maybe #'(lambda ()
-                         (if allow-mode
-                             (ignore)
-                           (helm-mark-current-line)))))
-    (catch 'break
-      (while (not (funcall bob-or-eof))
-        (forward-line n) ; Go forward or backward depending of n value.
-        ;; Exit when current-fname is not matched or in `helm-grep-mode'
-        ;; the line is not a grep line i.e 'fname:num:tag'.
-        (setq sel (buffer-substring (point-at-bol) (point-at-eol)))
-        (unless (or (string= current-fname
-                             (car (if (eq type 'etags)
-                                      (split-string sel ": +" t)
-                                    (helm-grep-split-line sel))))
-                    (and (eq major-mode 'helm-grep-mode)
-                         (not (get-text-property (point-at-bol) 'help-echo))))
-          (funcall mark-maybe)
-          (throw 'break nil))))
-    (cond ((and (> n 0) (eobp))
-           (re-search-backward ".")
-           (forward-line 0)
-           (funcall mark-maybe))
-          ((and (< n 0) (bobp))
-           (helm-aif (next-single-property-change (point-at-bol) 'help-echo)
-               (goto-char it)
-             (forward-line 1))
-           (funcall mark-maybe)))))
-
-;;;###autoload
-(defun helm-goto-precedent-file ()
-  "Go to precedent file in helm grep/etags buffers."
-  (interactive)
-  (with-helm-alive-p
-    (let ((etagp (when (string= (assoc-default
-                                 'name (helm-get-current-source)) "Etags")
-                   'etags)))
-      (with-helm-window
-        (helm-goto-next-or-prec-file -1 etagp)))))
-
-;;;###autoload
-(defun helm-goto-next-file ()
-  "Go to precedent file in helm grep/etags buffers."
-  (interactive)
-  (with-helm-alive-p
-    (let ((etagp (when (string= (assoc-default
-                                 'name (helm-get-current-source)) "Etags")
-                   'etags)))
-      (with-helm-window
-        (helm-goto-next-or-prec-file 1 etagp)))))
-
-(defun helm-grep-run-default-action ()
-  "Run grep default action from `helm-do-grep-1'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-grep-action)))
-
-(defun helm-grep-run-other-window-action ()
-  "Run grep goto other window action from `helm-do-grep-1'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-grep-other-window)))
-
-(defun helm-grep-run-other-frame-action ()
-  "Run grep goto other frame action from `helm-do-grep-1'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-grep-other-frame)))
-
-(defun helm-grep-run-save-buffer ()
-  "Run grep save results action from `helm-do-grep-1'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-grep-save-results)))
-
-
-;;; helm-grep-mode
-;;
-;;
-(defun helm-grep-save-results (candidate)
-  (helm-grep-action candidate 'grep))
-
-(defun helm-grep-save-results-1 ()
-  "Save helm grep result in a `helm-grep-mode' buffer."
-  (let ((buf "*hgrep*")
-        new-buf)
-    (when (get-buffer buf)
-      (setq new-buf (helm-read-string "GrepBufferName: " buf))
-      (cl-loop for b in (helm-buffer-list)
-            when (and (string= new-buf b)
-                      (not (y-or-n-p
-                            (format "Buffer `%s' already exists overwrite? "
-                                    new-buf))))
-            do (setq new-buf (helm-read-string "GrepBufferName: " "*hgrep ")))
-      (setq buf new-buf))
-    (with-current-buffer (get-buffer-create buf)
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (insert "-*- mode: helm-grep -*-\n\n"
-                (format "Grep Results for `%s':\n\n" helm-pattern))
-        (save-excursion
-          (insert (with-current-buffer helm-buffer
-                    (goto-char (point-min)) (forward-line 1)
-                    (buffer-substring (point) (point-max))))))
-      (helm-grep-mode) (pop-to-buffer buf))
-    (message "Helm Grep Results saved in `%s' buffer" buf)))
-
-;;;###autoload
-(define-derived-mode helm-grep-mode
-    special-mode "helm-grep"
-    "Major mode to provide actions in helm grep saved buffer.
-
-Special commands:
-\\{helm-grep-mode-map}"
-    (set (make-local-variable 'helm-grep-last-cmd-line)
-         (with-helm-buffer helm-grep-last-cmd-line))
-    (set (make-local-variable 'revert-buffer-function)
-         #'helm-grep-mode--revert-buffer-function))
-
-(defun helm-grep-mode--revert-buffer-function (&optional _ignore-auto _noconfirm)
-  (goto-char (point-min))
-  (re-search-forward "^Grep Results for" nil t)
-  (forward-line 0)
-  (when (re-search-forward "^$" nil t)
-    (forward-line 1))
-  (let ((inhibit-read-only t))
-    (delete-region (point) (point-max)))
-  (message "Reverting buffer...")
-  (set-process-sentinel
-   (start-file-process-shell-command
-    "hgrep"  (generate-new-buffer "*hgrep revert*") helm-grep-last-cmd-line)
-   (lambda (process event)
-     (when (string= event "finished\n")
-       (with-current-buffer (current-buffer)
-         (let ((inhibit-read-only t))
-           (save-excursion
-             (cl-loop for line in (with-current-buffer (process-buffer process)
-                                    (prog1 (split-string (buffer-string) "\n")
-                                      (kill-buffer)))
-                      when (string-match helm-grep-split-line-regexp line)
-                      do (insert (propertize
-                                  (car (helm-grep-filter-one-by-one line))
-                                  ;; needed for wgrep.
-                                  'helm-realvalue line)
-                                 "\n"))))
-         (message "Reverting buffer done"))))))
-
-(defun helm-gm-next-file ()
-  (interactive)
-  (helm-goto-next-or-prec-file 1))
-
-(defun helm-gm-precedent-file ()
-  (interactive)
-  (helm-goto-next-or-prec-file -1))
-
-(defun helm-grep-mode-jump ()
-  (interactive)
-  (helm-grep-action
-   (buffer-substring (point-at-bol) (point-at-eol))))
-
-(defun helm-grep-mode-jump-other-window-1 (arg)
-  (let ((candidate (buffer-substring (point-at-bol) (point-at-eol))))
-    (condition-case nil
-        (progn
-          (save-selected-window
-            (helm-grep-action candidate 'other-window)
-            (recenter))
-          (forward-line arg))
-      (error nil))))
-
-(defun helm-grep-mode-jump-other-window-forward ()
-  (interactive)
-  (helm-grep-mode-jump-other-window-1 1))
-
-(defun helm-grep-mode-jump-other-window-backward ()
-  (interactive)
-  (helm-grep-mode-jump-other-window-1 -1))
-
-(defun helm-grep-mode-jump-other-window ()
-  (interactive)
-  (let ((candidate (buffer-substring (point-at-bol) (point-at-eol))))
-    (condition-case nil
-        (helm-grep-action candidate 'other-window)
-      (error nil))))
-
-
-;;; ack-grep types
-;;
-;;
-(defun helm-grep-hack-types ()
-  "Return a list of known ack-grep types."
-  (with-temp-buffer
-    ;; "--help-types" works with both 1.96 and 2.1+, while
-    ;; "--help types" works only with 1.96 Issue #422.
-    ;; `helm-grep-command' should return the ack executable
-    ;; when this function is used in the right context
-    ;; i.e After checking is we are using ack-grep with
-    ;; `helm-grep-use-ack-p'.
-    (call-process (helm-grep-command t) nil t nil "--help-types")
-    (goto-char (point-min))
-    (cl-loop while (re-search-forward
-                    "^ *--\\(\\[no\\]\\)\\([^. ]+\\) *\\(.*\\)" nil t)
-             collect (cons (concat (match-string 2)
-                                   " [" (match-string 3) "]")
-                           (match-string 2))
-             collect (cons (concat "no" (match-string 2)
-                                   " [" (match-string 3) "]")
-                           (concat "no" (match-string 2))))))
-
-(defun helm-grep-ack-types-transformer (candidates _source)
-  (cl-loop for i in candidates
-        if (stringp i)
-        collect (rassoc i helm-grep-ack-types-cache)
-        else
-        collect i))
-
-(defvar helm-grep-ack-types-cache nil)
-(defun helm-grep-read-ack-type ()
-  "Select types for the '--type' argument of ack-grep."
-  (require 'helm-mode)
-  (require 'helm-adaptive)
-  (setq helm-grep-ack-types-cache (helm-grep-hack-types))
-  (let ((types (helm-comp-read
-                "Types: " helm-grep-ack-types-cache
-                :name "*Ack-grep types*"
-                :marked-candidates t
-                :must-match t
-                :fc-transformer '(helm-adaptive-sort
-                                  helm-grep-ack-types-transformer)
-                :buffer "*helm ack-types*")))
-    (mapconcat #'(lambda (type) (concat "--type=" type)) types " ")))
-
-
-;;; grep extensions
-;;
-;;
-(defun helm-grep-guess-extensions (files)
-  "Try to guess file extensions in FILES list when using grep recurse.
-These extensions will be added to command line with --include arg of grep."
-  (cl-loop with ext-list = (list helm-grep-preferred-ext "*")
-        with lst = (if (file-directory-p (car files))
-                       (directory-files
-                        (car files) nil
-                        directory-files-no-dot-files-regexp)
-                     files)
-        for i in lst
-        for ext = (file-name-extension i 'dot)
-        for glob = (and ext (not (string= ext ""))
-                        (concat "*" ext))
-        unless (or (not glob)
-                   (and glob-list (member glob glob-list))
-                   (and glob-list (member glob ext-list))
-                   (and glob-list (member glob grep-find-ignored-files)))
-        collect glob into glob-list
-        finally return (delq nil (append ext-list glob-list))))
-
-(defun helm-grep-get-file-extensions (files)
-  "Try to return a list of file extensions to pass to '--include' arg of grep."
-  (let* ((all-exts (helm-grep-guess-extensions
-                    (mapcar 'expand-file-name files)))
-         (extensions (helm-comp-read "Search Only in: " all-exts
-                                     :marked-candidates t
-                                     :fc-transformer 'helm-adaptive-sort
-                                     :buffer "*helm grep exts*"
-                                     :name "*helm grep extensions*")))
-    (when (listp extensions) ; Otherwise it is empty string returned by C-RET.
-      ;; If extensions is a list of one string containing spaces,
-      ;; assume user entered more than one glob separated by space(s) and
-      ;; split this string to pass it later to mapconcat.
-      ;; e.g '("*.el *.py")
-      (cl-loop for i in extensions
-               append (split-string-and-unquote i " ")))))
-
-
-;;; Set up source
-;;
-;;
-(defvar helm-source-grep nil)
-(defun helm-do-grep-1 (targets &optional recurse zgrep exts default-input input)
-  "Launch grep on a list of TARGETS files.
-When RECURSE is given use -r option of grep and prompt user
-to set the --include args of grep.
-You can give more than one arg separated by space at prompt.
-e.g *.el *.py *.tex.
-From lisp use the EXTS argument as a list of extensions as above.
-If you are using ack-grep, you will be prompted for --type
-instead and EXTS will be ignored.
-If prompt is empty `grep-find-ignored-files' are added to --exclude.
-Argument DEFAULT-INPUT is use as `default' arg of `helm' and INPUT
-is used as `input' arg of `helm', See `helm' docstring.
-ZGREP when non--nil use zgrep instead, without prompting for a choice
-in recurse, and ignoring EXTS, search being made on
-`helm-zgrep-file-extension-regexp'."
-  (when (and (helm-grep-use-ack-p)
-             helm-ff-default-directory
-             (file-remote-p helm-ff-default-directory))
-    (error "Error: Remote operation not supported with ack-grep."))
-  (let* (non-essential
-         (exts (and recurse
-                    ;; [FIXME] I could handle this from helm-walk-directory.
-                    (not zgrep) ; zgrep doesn't handle -r opt.
-                    (not (helm-grep-use-ack-p :where 'recursive))
-                    (or exts (helm-grep-get-file-extensions targets))))
-         (include-files (and exts
-                             (mapconcat #'(lambda (x)
-                                            (concat "--include="
-                                                    (shell-quote-argument x)))
-                                        (if (> (length exts) 1)
-                                            (remove "*" exts)
-                                          exts) " ")))
-         (types (and (not include-files)
-                     (not zgrep)
-                     recurse
-                     (helm-grep-use-ack-p :where 'recursive)
-                     ;; When %e format spec is not specified
-                     ;; ignore types and do not prompt for choice.
-                     (string-match "%e" helm-grep-default-command)
-                     (helm-grep-read-ack-type)))
-         (follow (and helm-follow-mode-persistent
-                      (assoc-default 'follow helm-source-grep))))
-    ;; When called as action from an other source e.g *-find-files
-    ;; we have to kill action buffer.
-    (when (get-buffer helm-action-buffer)
-      (kill-buffer helm-action-buffer))
-    ;; If `helm-find-files' haven't already started,
-    ;; give a default value to `helm-ff-default-directory'.
-    (unless helm-ff-default-directory
-      (setq helm-ff-default-directory default-directory))
-    ;; We need to store these vars locally
-    ;; to pass infos later to `helm-resume'.
-    (helm-set-local-variable 'helm-zgrep-recurse-flag (and recurse zgrep)
-                             'helm-grep-last-targets targets
-                             'helm-grep-include-files (or include-files types)
-                             'helm-grep-in-recurse recurse
-                             'helm-grep-use-zgrep zgrep
-                             'helm-grep-default-command
-                             (cond (zgrep helm-default-zgrep-command)
-                                   (recurse helm-grep-default-recurse-command)
-                                   ;; When resuming the local value of
-                                   ;; `helm-grep-default-command' is used, only git-grep
-                                   ;; should need this.
-                                   (t helm-grep-default-command)))
-    ;; Setup the source.
-    (setq helm-source-grep
-          (helm-build-async-source
-           (if zgrep "Zgrep" (capitalize (if recurse
-                                             (helm-grep-command t)
-                                             (helm-grep-command))))
-            :header-name (lambda (name)
-                           (concat name "(C-c ? Help)"))
-            :candidates-process 'helm-grep-collect-candidates
-            :filter-one-by-one 'helm-grep-filter-one-by-one
-            :nohighlight t
-            :candidate-number-limit 9999
-            :mode-line helm-grep-mode-line-string
-            :history 'helm-grep-history
-            :action (helm-make-actions
-                     "Find File" 'helm-grep-action
-                     "Find file other frame" 'helm-grep-other-frame
-                     (lambda () (and (locate-library "elscreen")
-                                     "Find file in Elscreen"))
-                     'helm-grep-jump-elscreen
-                     "Save results in grep buffer" 'helm-grep-save-results
-                     "Find file other window" 'helm-grep-other-window)
-            :persistent-action 'helm-grep-persistent-action
-            :persistent-help "Jump to line (`C-u' Record in mark ring)"
-            :requires-pattern 2
-            :follow follow))
-    (helm
-     :sources 'helm-source-grep
-     :buffer (format "*helm %s*" (if zgrep "zgrep" (helm-grep-command recurse)))
-     :default default-input
-     :input input
-     :keymap helm-grep-map
-     :history 'helm-grep-history
-     :truncate-lines t)))
-
-
-
-;;; zgrep
-;;
-;;
-(defun helm-ff-zgrep-1 (flist recursive)
-  (unwind-protect
-       (let* ((def-dir (or helm-ff-default-directory
-                           default-directory))
-              (only    (if recursive
-                           (or (gethash def-dir helm-rzgrep-cache)
-                               (puthash
-                                def-dir
-                                (helm-walk-directory
-                                 def-dir
-                                 :directories nil
-                                 :path 'full
-                                 :match helm-zgrep-file-extension-regexp)
-                                helm-rzgrep-cache))
-                         flist)))
-         (helm-do-grep-1 only recursive 'zgrep))
-    (setq helm-zgrep-recurse-flag nil)))
-
-
-;;; transformers
-;;
-;;
-(defun helm-grep-split-line (line)
-  "Split a grep output line."
-  ;; The output of grep may send a truncated line in this chunk,
-  ;; so don't split until grep line is valid, that is
-  ;; once the second part of the line comes with next chunk
-  ;; send by process.
-  (when (string-match helm-grep-split-line-regexp line)
-    ;; Don't use split-string because buffer/file name or string
-    ;; may contain a ":".
-    (cl-loop for n from 1 to 3 collect (match-string n line))))
-
-(defun helm-grep--filter-candidate-1 (candidate &optional dir)
-  (let* ((root   (or dir (and helm-grep-default-directory-fn
-                              (funcall helm-grep-default-directory-fn))))
-         ansi-color-context ; seems this avoid non--translated fname entries.
-         (ansi-p (string-match-p ansi-color-regexp candidate))
-         (line   (if ansi-p (ansi-color-apply candidate) candidate))
-         (split  (helm-grep-split-line line))
-         (fname  (if (and root split)
-                     (expand-file-name (car split) root)
-                   (car-safe split)))
-         (lineno (nth 1 split))
-         (str    (nth 2 split)))
-    (when (and fname lineno str)
-      (cons (concat (propertize (file-name-nondirectory fname)
-                                'face 'helm-grep-file
-                                'help-echo fname)
-                    ":"
-                    (propertize lineno 'face 'helm-grep-lineno)
-                    ":"
-                    (if ansi-p str (helm-grep-highlight-match str)))
-            line))))
-
-(defun helm-grep-filter-one-by-one (candidate)
-  "`filter-one-by-one' transformer function for `helm-do-grep'."
-  (let ((helm-grep-default-directory-fn
-         (or helm-grep-default-directory-fn
-             (lambda () (or helm-ff-default-directory
-                            (helm-default-directory)
-                            default-directory)))))
-    (if (consp candidate)
-        (helm-grep--filter-candidate-1 (cdr candidate))
-        (helm-grep--filter-candidate-1 candidate))))
-
-(defun helm-grep-highlight-match (str &optional multi-match)
-  "Highlight in string STR all occurences matching `helm-pattern'."
-  (require 'helm-match-plugin)
-  (let (beg end)
-    (condition-case-unless-debug nil
-        (with-temp-buffer
-          (insert str)
-          (goto-char (point-min))
-          (cl-loop for reg in (if multi-match
-                                  ;; (m)occur.
-                                  (cl-loop for r in (helm-mp-split-pattern
-                                                     helm-pattern)
-                                           unless (string-match "\\`!" r)
-                                           collect r)
-                                  ;; async sources (grep, gid etc...)
-                                  (list helm-input))
-                   do
-                   (while (and (re-search-forward reg nil t)
-                               (> (- (setq end (match-end 0))
-                                     (setq beg (match-beginning 0))) 0))
-                     (add-text-properties beg end '(face helm-grep-match)))
-                   do (goto-char (point-min))) 
-          (buffer-string))
-      (error nil))))
-
-
-;;; Grep from buffer list
-;;
-;;
-(defun helm-grep-buffers-1 (candidate &optional zgrep)
-  "Run grep on all file--buffers or CANDIDATE if it is a file--buffer.
-If one of selected buffers is not a file--buffer,
-it is ignored and grep will run on all others file--buffers.
-If only one candidate is selected and it is not a file--buffer,
-switch to this buffer and run `helm-occur'.
-If a prefix arg is given run grep on all buffers ignoring non--file-buffers."
-  (let* ((prefarg (or current-prefix-arg helm-current-prefix-arg))
-         (helm-ff-default-directory
-          (if (and helm-ff-default-directory
-                   (file-remote-p helm-ff-default-directory))
-              default-directory
-            helm-ff-default-directory))
-         (cands (if prefarg
-                    (buffer-list)
-                  (helm-marked-candidates)))
-         (win-conf (current-window-configuration))
-         ;; Non--fname and remote buffers are ignored.
-         (bufs (cl-loop for buf in cands
-                     for fname = (buffer-file-name (get-buffer buf))
-                     when (and fname (not (file-remote-p fname)))
-                     collect (expand-file-name fname))))
-    (if bufs
-        (if zgrep
-            (helm-do-grep-1 bufs nil 'zgrep)
-          (helm-do-grep-1 bufs))
-      ;; bufs is empty, thats mean we have only CANDIDATE
-      ;; and it is not a buffer-filename, fallback to occur.
-      (switch-to-buffer candidate)
-      (when (get-buffer helm-action-buffer)
-        (kill-buffer helm-action-buffer))
-      (helm-occur)
-      (when (eq helm-exit-status 1)
-        (set-window-configuration win-conf)))))
-
-(defun helm-grep-buffers (candidate)
-  "Action to grep buffers."
-  (helm-grep-buffers-1 candidate))
-
-(defun helm-zgrep-buffers (candidate)
-  "Action to zgrep buffers."
-  (helm-grep-buffers-1 candidate 'zgrep))
-
-
-;;; Helm interface for pdfgrep
-;;  pdfgrep program <http://pdfgrep.sourceforge.net/>
-;;  and a pdf-reader (e.g xpdf) are needed.
-;;
-(defvar helm-pdfgrep-default-function 'helm-pdfgrep-init)
-(defun helm-pdfgrep-init (only-files)
-  "Start an asynchronous pdfgrep process in ONLY-FILES list."
-  (let* ((default-directory (or helm-ff-default-directory
-                                default-directory))
-         (fnargs   (helm-grep-prepare-candidates
-                    (if (file-remote-p default-directory)
-                        (mapcar #'(lambda (x)
-                                    (file-remote-p x 'localname))
-                                only-files)
-                      only-files)
-                    default-directory))
-         (cmd-line (format helm-pdfgrep-default-command
-                           helm-pattern
-                           fnargs))
-         process-connection-type)
-    ;; Start pdf grep process.
-    (helm-log "Starting Pdf Grep process in directory `%s'" default-directory)
-    (helm-log "Command line used was:\n\n%s"
-              (concat ">>> " (propertize cmd-line 'face 'helm-grep-cmd-line) "\n\n"))
-    (prog1
-        (start-file-process-shell-command
-         "pdfgrep" helm-buffer cmd-line)
-      (message nil)
-      (set-process-sentinel
-       (get-buffer-process helm-buffer)
-       #'(lambda (_process event)
-           (if (string= event "finished\n")
-               (with-helm-window
-                 (setq mode-line-format
-                       '(" " mode-line-buffer-identification " "
-                         (:eval (format "L%s" (helm-candidate-number-at-point))) " "
-                         (:eval (propertize
-                                 (format "[Pdfgrep Process Finish - %s result(s)] "
-                                         (max (1- (count-lines
-                                                   (point-min) (point-max))) 0))
-                                 'face 'helm-grep-finish))))
-                 (force-mode-line-update))
-             (helm-log "Error: Pdf grep %s"
-                       (replace-regexp-in-string "\n" "" event))))))))
-
-(defun helm-do-pdfgrep-1 (only)
-  "Launch pdfgrep with a list of ONLY files."
-  (unless (executable-find "pdfgrep")
-    (error "Error: No such program `pdfgrep'."))
-  (let* (helm-grep-in-recurse) ; recursion is never used in pdfgrep.
-    ;; When called as action from an other source e.g *-find-files
-    ;; we have to kill action buffer.
-    (when (get-buffer helm-action-buffer)
-      (kill-buffer helm-action-buffer))
-    (setq helm-pdfgrep-targets only)
-    (helm
-     :sources (helm-build-async-source "PdfGrep"
-                :init (lambda ()
-                        ;; If `helm-find-files' haven't already started,
-                        ;; give a default value to `helm-ff-default-directory'.
-                        (setq helm-ff-default-directory (or helm-ff-default-directory
-                                                            default-directory)))
-                :candidates-process (lambda ()
-                                      (funcall helm-pdfgrep-default-function helm-pdfgrep-targets))
-                :filter-one-by-one #'helm-grep-filter-one-by-one
-                :candidate-number-limit 9999
-                :history 'helm-grep-history
-                :keymap helm-pdfgrep-map
-                :mode-line helm-pdfgrep-mode-line-string
-                :action #'helm-pdfgrep-action
-                :persistent-help "Jump to PDF Page"
-                :requires-pattern 2)
-     :buffer "*helm pdfgrep*"
-     :history 'helm-grep-history)))
-
-(defun helm-pdfgrep-action (candidate)
-  (helm-grep-action candidate 'pdf))
-
-(defun helm-pdfgrep-action-1 (_split pageno fname)
-  (save-selected-window
-    (start-file-process-shell-command
-     "pdf-reader" nil
-     (format-spec helm-pdfgrep-default-read-command
-                  (list (cons ?f fname) (cons ?p pageno))))))
-
-;;;###autoload
-(defun helm-do-grep ()
-  "Preconfigured helm for grep.
-Contrarily to Emacs `grep', no default directory is given, but
-the full path of candidates in ONLY.
-That allow to grep different files not only in `default-directory' but anywhere
-by marking them (C-<SPACE>). If one or more directory is selected
-grep will search in all files of these directories.
-You can also use wildcard in the base name of candidate.
-If a prefix arg is given use the -r option of grep (recurse).
-The prefix arg can be passed before or after start file selection.
-See also `helm-do-grep-1'."
-  (interactive)
-  (require 'helm-mode)
-  (let* ((preselection (or (dired-get-filename nil t)
-                           (buffer-file-name (current-buffer))))
-         (only    (helm-read-file-name
-                   "Search in file(s): "
-                   :marked-candidates t
-                   :preselect (and helm-do-grep-preselect-candidate
-                                   (if helm-ff-transformer-show-only-basename
-                                       (helm-basename preselection)
-                                     preselection))))
-         (prefarg (or current-prefix-arg helm-current-prefix-arg)))
-    (helm-do-grep-1 only prefarg)))
-
-;;;###autoload
-(defun helm-do-zgrep ()
-  "Preconfigured helm for zgrep."
-  (interactive)
-  (require 'helm-mode)
-  (let* ((prefarg (or current-prefix-arg helm-current-prefix-arg))
-         (preselection (or (dired-get-filename nil t)
-                           (buffer-file-name (current-buffer))))
-         (ls (helm-read-file-name
-              "Search in file(s): "
-              :marked-candidates t
-              :preselect (and helm-do-grep-preselect-candidate
-                              (if helm-ff-transformer-show-only-basename
-                                  (helm-basename preselection)
-                                preselection)))))
-    (helm-ff-zgrep-1 ls prefarg)))
-
-;;;###autoload
-(defun helm-do-pdfgrep ()
-  "Preconfigured helm for pdfgrep."
-  (interactive)
-  (require 'helm-mode)
-  (let* ((preselection (or (dired-get-filename nil t)
-                           (buffer-file-name (current-buffer))))
-         (only (helm-read-file-name
-                "Search in file(s): "
-                :marked-candidates t
-                :test #'(lambda (file)
-                          (or (string= (file-name-extension file) "pdf")
-                              (string= (file-name-extension file) "PDF")
-                              (file-directory-p file)))
-                :preselect (and helm-do-grep-preselect-candidate
-                                (if helm-ff-transformer-show-only-basename
-                                    (helm-basename preselection)
-                                  preselection))))
-         (helm-grep-default-function 'helm-pdfgrep-init))
-    (helm-do-pdfgrep-1 only)))
-
-
-(provide 'helm-grep)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-grep.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-help.el b/emacs.d/elpa/helm-20150623.1310/helm-help.el
deleted file mode 100644
index d2af029..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-help.el
+++ /dev/null
@@ -1,1780 +0,0 @@
-;;; helm-help.el --- Help messages for Helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'helm)
-
-(defvar helm-org-headings--nofilename)
-(declare-function helm-source-org-headings-for-files "helm-org.el")
-
-
-(defgroup helm-help nil
-  "Embedded help for `helm'."
-  :group 'helm)
-
-(defface helm-helper
-    '((t :inherit helm-header))
-  "Face for helm help string in minibuffer."
-  :group 'helm-help)
-
-(defcustom helm-documentation-file "~/.emacs.d/helm-doc.org"
-  "The file where you want to save helm documentation."
-  :group 'helm-help
-  :type 'string)
-
-(defvar helm-help--string-list '(helm-help-message
-                                 helm-buffer-help-message
-                                 helm-ff-help-message
-                                 helm-read-file-name-help-message
-                                 helm-generic-file-help-message
-                                 helm-grep-help-message
-                                 helm-pdfgrep-help-message
-                                 helm-etags-help-message
-                                 helm-ucs-help-message
-                                 helm-bookmark-help-message
-                                 helm-esh-help-message
-                                 helm-buffers-ido-virtual-help-message
-                                 helm-moccur-help-message
-                                 helm-top-help-message
-                                 helm-apt-help-message
-                                 helm-el-package-help-message
-                                 helm-M-x-help-message
-                                 helm-imenu-help-message
-                                 helm-colors-help-message
-                                 helm-semantic-help-message
-                                 helm-kmacro-help-message))
-
-
-;;;###autoload
-(defun helm-documentation (arg)
-  "Preconfigured helm for helm documentation.
-With a prefix arg refresh the documentation.
-
-Find here the documentation of all sources actually documented."
-  (interactive "P")
-  (require 'helm-org)
-  (when arg (delete-file helm-documentation-file)
-        (helm-aif (get-file-buffer helm-documentation-file)
-            (kill-buffer it)))
-  (unless (file-exists-p helm-documentation-file)
-    (with-temp-file helm-documentation-file
-      (erase-buffer)
-      (cl-loop for elm in helm-help--string-list
-               for str = (symbol-value elm)
-               do (insert (substitute-command-keys
-                           (if (functionp str) (funcall str) str))))))
-  (let ((helm-org-headings--nofilename t))
-    (helm :sources (helm-source-org-headings-for-files
-                    (list helm-documentation-file))
-          :candidate-number-limit 99999
-          :buffer "*helm documentation*")))
-
-;;; Global help message - Used by `helm-help'
-;;
-;;
-(defvar helm-help-message
-  (lambda ()
-    (concat
-     "\n* Helm generic help\n"
-     "\\<helm-map>"
-     "\n`helm' is an Emacs incremental completion and selection narrowing framework.
-
-Narrow the list by typing some pattern,
-Multiple patterns are allowed by splitting by space.
-Select with natural Emacs operations, choose with RET.
-
-** Help
-
-C-h m : Run this generic help for helm.
-C-c ? : Run specific helm help for current source.
-
-** Basic Operations
-
-C-p, Up: Previous Line
-C-n, Down : Next Line
-M-v, PageUp : Previous Page
-C-v, PageDown : Next Page
-Enter : Execute first (default) action / Select
-M-< : First Line
-M-> : Last Line
-M-PageUp, C-M-S-v, C-M-y : Previous Page (other-window)
-M-PageDown, C-M-v : Next Page (other-window)
-
-Tab, C-i : Show action list
-Left : Previous Source
-Right, C-o : Next Source
-C-k : Delete pattern (with prefix arg delete from point to end)
-C-j or C-z: Persistent Action (Execute action with helm session kept)
-
-** Shortcuts For nth Action
-
-f1-12: Execute nth 1 to 12 Action(s).
-
-** Visible Marks
-
-Visible marks store candidate. Some actions uses marked candidates.
-
-\\[helm-toggle-visible-mark] : Toggle Visible Mark
-\\[helm-prev-visible-mark] : Previous Mark
-\\[helm-next-visible-mark] : Next Mark
-
-** Miscellaneous Commands
-
-\\[helm-toggle-resplit-window] : Toggle vertical/horizontal split helm window.
-\\[helm-quit-and-find-file] : Drop into `find-file'.
-\\[helm-delete-current-selection] : Delete selected item (visually).
-\\[helm-kill-selection-and-quit] : Kill display value of candidate and quit (with prefix arg kill the real value).
-\\[helm-yank-selection] : Yank selection into pattern.
-\\[helm-follow-mode] : Toggle automatical execution of persistent action.
-\\[helm-follow-action-forward] : Run persistent action and goto next line.
-\\[helm-follow-action-backward] : Run persistent action and goto previous line.
-\\[helm-force-update] : Recalculate and redisplay candidates.
-
-** Global Commands
-
-\\<global-map>\\[helm-resume] revives last `helm' session.
-It is very useful, so you should bind any key."))
-  "Detailed help message string for `helm'.
-It also accepts function or variable symbol.")
-
-(defun helm-help-internal (bufname insert-content-fn)
-  "Show long message during `helm' session in BUFNAME.
-INSERT-CONTENT-FN is the function that insert
-text to be displayed in BUFNAME."
-  (let ((winconf (current-frame-configuration)))
-    (unwind-protect
-         (progn
-           (setq helm-suspend-update-flag t)
-           (set-buffer (get-buffer-create bufname))
-           (switch-to-buffer bufname)
-           (delete-other-windows)
-           (delete-region (point-min) (point-max))
-           (outline-mode)
-           (save-excursion
-             (funcall insert-content-fn))
-           (setq cursor-type nil)
-           (buffer-disable-undo)
-           (helm-help-event-loop))
-      (setq helm-suspend-update-flag nil)
-      (set-frame-configuration winconf))))
-
-(defun helm-help-scroll-up (amount)
-  (condition-case _err
-      (scroll-up-command amount)
-    (beginning-of-buffer nil)
-    (end-of-buffer nil)))
-
-(defun helm-help-scroll-down (amount)
-  (condition-case _err
-      (scroll-down-command amount)
-    (beginning-of-buffer nil)
-    (end-of-buffer nil)))
-
-(defun helm-help-event-loop ()
-  (let ((prompt (propertize
-                 "[SPC,C-v,down,next:NextPage  b,M-v,up,prior:PrevPage C-s/r:Isearch q:Quit]"
-                 'face 'helm-helper))
-        scroll-error-top-bottom)
-    (cl-loop for event = (read-key prompt) do
-             (cl-case event
-               ((?\C-v ? down next) (helm-help-scroll-up helm-scroll-amount))
-               ((?\M-v ?b up prior) (helm-help-scroll-down helm-scroll-amount))
-               (?\C-s (isearch-forward))
-               (?\C-r (isearch-backward))
-               (?q (cl-return))
-               (t (ignore))))))
-
-;;;###autoload
-(defun helm-help ()
-  "Help of `helm'."
-  (interactive)
-  (with-helm-alive-p
-    (save-selected-window
-      (helm-help-internal
-       "*Helm Help*"
-       (lambda ()
-         (insert (substitute-command-keys
-                  (helm-interpret-value (or (assoc-default
-                                             'help-message
-                                             (helm-get-current-source))
-                                            helm-help-message)))))))))
-
-;;; `helm-buffer-list' help
-;;
-;;
-(defvar helm-buffer-help-message
-  "\n* Helm Buffer\n
-
-** Helm buffers tips:
-
-*** Completion:
-
-**** Major-mode:
-
-You can enter a partial name of major-mode (e.g lisp, sh) to narrow down buffers.
-To specify the major-mode, prefix it with \"*\" e.g \"*lisp\".
-If you want to match all buffers but the ones with a specific major-mode (negation),
-prefix the major-mode with \"!\" e.g \"*!lisp\".
-If you want to specify more than one major-mode, separate them with \",\",
-e.g \"*!lisp,!sh,!fun\" will list all buffers but the ones in lisp-mode, sh-mode and
-fundamental-mode.
-
-Enter then a space and a pattern to narrow down to buffers matching this pattern.
-
-**** Search inside buffers:
-
-If you enter a space and a pattern prefixed by \"@\" helm will search for text matching
-this pattern INSIDE the buffer (i.e not in the name of buffer).
-NOTE that if you enter your pattern prefixed with \"@\" but escaped, helm will search a buffer
-matching \"@pattern\" but will not search inside.
-
-**** Search by directory name:
-
-If you prefix the beginning of pattern with \"/\" the match will occur on directory name
-of buffer, it is interesting to narrow down to one directory for example, subsequent string
-entered after a space will match on buffer-name only.
-Note that negation is not supported for matching on buffer-file-name.
-You can specify more than one directory starting from helm v1.6.8
- 
-**** Fuzzy matching:
-
-Note that if `helm-buffers-fuzzy-matching' is non--nil you will have
-fuzzy matching on buffer names (not on directory name matching and major-mode though).
-A pattern starting with \"^\" will disable fuzzy matching and will match by exact regexp.
-
-**** Examples:
-
-if I enter in pattern prompt:
-\"*lisp ^helm @moc\"
-helm will narrow down the list by selecting only buffers that are in lisp mode, start by helm
-and match \"moc\" in their contents.
-
-if I enter in pattern prompt:
-\"*lisp ^helm moc\"
-Notice there is no \"@\" this time
-helm will look for lisp mode buffers starting by \"helm\" and have \"moc\" in their name.
-
-if I enter in pattern prompt:
-\"*!lisp !helm\"
-helm will narrow down to buffers that are not in \"lisp\" mode and that do not match \"helm\"
-
-if I enter in pattern prompt:
-/helm/ w3
-helm will narrow down to buffers that are in any \"helm\" subdirectory and matching w3.
-
-
-*** Creating buffers
-
-When creating a new buffer use \\[universal-argument] to choose a mode for your buffer in a list.
-This list is customizable, see `helm-buffers-favorite-modes'.
-
-*** Killing buffers
-
-You have a command to kill buffer(s) and quit emacs and a command to kill buffers one by one
-\(no marked\) without quitting helm.
-You can run this persistent kill buffer command either with the regular
-`helm-execute-persistent-action' called with a prefix arg (C-u C-j) or with its specific command
-`helm-buffer-run-kill-persistent' see binding below.
-
-*** Meaning of colors and prefixes for buffers:
-
-Remote buffers are prefixed with '@'.
-Red        => Buffer have its file modified on disk by an external process.
-Indianred2 => Buffer exists but its file have been deleted.
-Orange     => Buffer is modified and its file not saved to disk.
-Italic     => A non--file buffer.
-
-\n** Specific commands for `helm-buffers-list':
-\\<helm-buffer-map>
-\\[helm-buffer-run-zgrep]\t\t->Grep Buffer(s) works as zgrep too (C-u grep all buffers but non--file buffers).
-\\[helm-buffers-run-multi-occur]\t\t->Multi Occur buffer or marked buffers. (C-u toggle force searching current-buffer).
-\\[helm-buffer-switch-other-window]\t\t->Switch other window.
-\\[helm-buffer-switch-other-frame]\t\t->Switch other frame.
-\\[helm-buffer-run-query-replace-regexp]\t\t->Query replace regexp in marked buffers.
-\\[helm-buffer-run-query-replace]\t\t->Query replace in marked buffers.
-\\[helm-buffer-run-ediff]\t\t->Ediff current buffer with candidate.  If two marked buffers ediff those buffers.
-\\[helm-buffer-run-ediff-merge]\t\t->Ediff merge current buffer with candidate.  If two marked buffers ediff merge those buffers.
-\\[helm-buffer-diff-persistent]\t\t->Toggle Diff buffer with saved file without quitting.
-\\[helm-buffer-revert-persistent]\t\t->Revert buffer without quitting.
-\\[helm-buffer-save-persistent]\t\t->Save buffer without quitting.
-\\[helm-buffer-run-kill-buffers]\t\t->Delete marked buffers and quit.
-\\[helm-buffer-run-kill-persistent]\t\t->Delete buffer without quitting helm.
-\\[helm-toggle-all-marks]\t\t->Toggle all marks.
-\\[helm-mark-all]\t\t->Mark all.
-\\[helm-toggle-buffers-details]\t\t->Toggle details.
-\\[helm-buffers-toggle-show-hidden-buffers]\t\t->Show hidden buffers.
-\\[helm-buffers-mark-similar-buffers]\t\t->Mark all buffers with same type (color) than current.
-\\[helm-buffer-help]\t\t->Display this help.
-\n** Helm Map
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-buffer-help ()
-  "Help command for helm buffers."
-  (interactive)
-  (let ((helm-help-message helm-buffer-help-message))
-    (helm-help)))
-
-;;; Find files help (`helm-find-files')
-;;
-;;
-(defvar helm-ff-help-message
-  "\n* Helm Find Files\n
-
-** Helm find files tips:
-
-*** Quick pattern expansion:
-
-\n**** Enter `~/' at end of pattern to quickly reach home directory.
-
-**** Enter `/' at end of pattern to quickly reach root of your file system.
-
-**** Enter `./' at end of pattern to quickly reach `default-directory' (initial start of session).
-  If you are already in `default-directory' this will move cursor on top.
-
-**** Enter `../' at end of pattern will reach upper directory, moving cursor on top.
-  NOTE: This is different to using `C-l' in that `C-l' don't move cursor on top but stay on previous
-  subdir name.
-
-**** Enter any environment var (e.g `$HOME') at end of pattern, it will be expanded.
-
-**** You can yank any valid filename after pattern, it will be expanded.
-
-*** You can complete with partial basename (start on third char entered)
-
-  e.g \"fob\" or \"fbr\" will complete \"foobar\"
-  but \"fb\" will wait for a third char for completing.
-
-*** Use `C-u C-j' to watch an image.
-
-*** `C-j' on a filename will expand in helm-buffer to this filename.
-  Second hit on `C-j' will display buffer filename.
-  Third hit on `C-j' will kill buffer filename.
-  NOTE: `C-u C-j' will display buffer directly.
-
-*** To browse images directories turn on `helm-follow-mode' and navigate with arrow keys.
-  You can also use `helm-follow-action-forward' and `helm-follow-action-backward'
-  (`C-<down' and `C-<left>').
-
-*** You can turn off/on (toggle) autoupdate completion at any moment with `C-DEL'.
-  NOTE: On a terminal C-<backspace> may not work, use in this case C-c <backspace>.
-
-*** You can create a new directory and a new file at the same time.
-  just write the path in prompt and press `<RET>'.
-  e.g You can create \"~/new/newnew/newnewnew/my_newfile.txt\".
-
-*** To create a new directory, add a \"/\" at end of new name and press <RET>.
-
-*** To create a new file just write the filename not ending with \"/\".
-
-*** Recursive search from helm find files
-
-**** You can use helm browse project (see binding below).
-
-- With no prefix arg
-  If your current directory is under version control
-  with one of git or hg and you have installed helm-ls-git and/or helm-ls-hg
-  https://github.com/emacs-helm/helm-ls-git.git
-  https://github.com/emacs-helm/helm-ls-hg
-  you will see all your files under version control, otherwise
-  you will be back to helm-find-files.
-- With one prefix arg
-  You will see all the files under this directory
-  and other subdirectories (recursion) and this list of files will be cached.
-- With two prefix args
-  same but the cache will be refreshed.
-
-**** You can start a recursive search with Locate of Find (See commands below).
-  With Locate you can use a local db with a prefix arg; If the localdb doesn't already
-  exists, you will be prompted for its creation, if it exists and you want to refresh it,
-  give two prefix args.
-
-*** Insert filename at point or complete filename at point
-
-On insertion (no completion, i.e nothing at point):
-
-- `C-c i'         => insert absolute file name.
-- `C-u C-c i'     => insert abbreviate file name.
-- `C-u C-u C-c i' => insert relative file name.
-
-On completion:
-
-- target starts by ~/           => insert abbreviate file name.
-- target starts by / or [a-z]:/ => insert full path.
-- otherwise                     => insert relative file name.
-
-*** Using wildcard to select multiple files
-
-Use of wilcard is supported to give a set of files to an action:
-
-e.g
-You can copy all the files with \".el\" extension by using \"*.el\"
-and then run your copy action.
-
-You can do the same but with \"**.el\" (note the two stars),
-this will select recursively all \".el\" files under current directory.
-
-NOTE: When using an action that involve an external backend (e.g grep), using \"**\"
-is not advised (even if it works fine) because it will be slower to select all your files,
-you have better time letting the backend doing it, it will be faster.
-However, if you know you have not many files it is reasonable to use this,
-also using not recursive wilcard (e.g \"*.el\") is perfectly fine for this.
-
-This feature (\"**\") is activated by default with the option `helm-file-globstar'.
-The directory selection with \"**foo/\" like bash shopt globstar option is not supported yet.
-
-*** Copying renaming asynchronously
-
-If you use async library (if you have installed helm from MELPA you do) you can enable
-async for copying/renaming etc... your files by enabling `dired-async-mode'.
-
-Note that even when async is enabled, running a copy/rename action with a prefix arg
-will execute action synchronously, it will follow also the first file of the marked files
-in its destination directory.
-
-*** Bookmark your `helm-find-files' session
-
-You can bookmark your `helm-find-files' session with `C-x r m'.
-You can retrieve later these bookmarks easily by using M-x helm-filtered-bookmarks
-or from the current `helm-find-files' session just hitting `C-x r b'.
-
-*** Run Gid from `helm-find-files'
-
-You can navigate to a project containing an ID file created with the `mkid'
-command from id-utils, and run the `gid' command which will use the symbol at point
-in `helm-current-buffer' as default.
-
-\n** Specific commands for `helm-find-files':\n
-\\<helm-find-files-map>
-\\[helm-ff-run-locate]\t\t->Run Locate (C-u to specify locate db, M-n insert basename of candidate)
-\\[helm-ff-run-browse-project]\t\t->Browse project (`C-u' recurse, `C-u C-u' recurse and refresh db)
-\\[helm-ff-run-find-sh-command]\t\t->Run Find shell command from this directory.
-\\[helm-ff-run-grep]\t\t->Run Grep (C-u Recursive).
-\\[helm-ff-run-pdfgrep]\t\t->Run Pdfgrep on marked files.
-\\[helm-ff-run-zgrep]\t\t->Run zgrep (C-u Recursive).
-\\[helm-ff-run-gid]\t\t->Run gid (id-utils).
-\\[helm-ff-run-etags]\t\t->Run Etags (C-u use thing-at-point `C-u C-u' reload cache)
-\\[helm-ff-run-rename-file]\t\t->Rename File (C-u Follow).
-\\[helm-ff-run-query-replace-on-marked]\t\t->Query replace on marked files.
-\\[helm-ff-run-copy-file]\t\t->Copy File (C-u Follow).
-\\[helm-ff-run-byte-compile-file]\t\t->Byte Compile File (C-u Load).
-\\[helm-ff-run-load-file]\t\t->Load File.
-\\[helm-ff-run-symlink-file]\t\t->Symlink File.
-\\[helm-ff-run-hardlink-file]\t\t->Hardlink file.
-\\[helm-ff-run-delete-file]\t\t->Delete File.
-\\[helm-ff-run-kill-buffer-persistent]\t\t->Kill buffer candidate without quitting.
-\\[helm-ff-persistent-delete]\t\t->Delete file without quitting.
-\\[helm-ff-run-switch-to-eshell]\t\t->Switch to Eshell.
-\\[helm-ff-run-eshell-command-on-file]\t\t->Eshell command on file (C-u Apply on marked files, otherwise treat them sequentially).
-\\[helm-ff-run-ediff-file]\t\t->Ediff file.
-\\[helm-ff-run-ediff-merge-file]\t\t->Ediff merge file.
-\\[helm-ff-run-complete-fn-at-point]\t\t->Complete file name at point.
-\\[helm-ff-run-switch-other-window]\t\t->Switch other window.
-\\[helm-ff-run-switch-other-frame]\t\t->Switch other frame.
-\\[helm-ff-run-open-file-externally]\t\t->Open file with external program (C-u to choose).
-\\[helm-ff-run-open-file-with-default-tool]\t\t->Open file externally with default tool.
-\\[helm-ff-rotate-left-persistent]\t\t->Rotate Image Left.
-\\[helm-ff-rotate-right-persistent]\t\t->Rotate Image Right.
-\\[helm-find-files-up-one-level]\t\t->Go down precedent directory.
-\\[helm-ff-run-switch-to-history]\t\t->Switch to last visited directories history.
-\\[helm-ff-file-name-history]\t\t->Switch to file name history.
-\\[helm-ff-properties-persistent]\t\t->Show file properties in a tooltip.
-\\[helm-mark-all]\t\t->Mark all visibles candidates.
-\\[helm-ff-run-toggle-auto-update]\t\t->Toggle auto expansion of directories.
-\\[helm-unmark-all]\t\t->Unmark all candidates, visibles and invisibles.
-\\[helm-ff-run-gnus-attach-files]\t\t->Gnus attach files to message buffer.
-\\[helm-ff-run-print-file]\t\t->Print file, (C-u to refresh printers list).
-\\[helm-enlarge-window]\t\t->Enlarge helm window.
-\\[helm-narrow-window]\t\t->Narrow helm window.
-\\[helm-ff-run-toggle-basename]\t\t->Toggle basename/fullpath.
-\\[helm-ff-run-find-file-as-root]\t\t->Find file as root.
-\\[helm-ff-run-insert-org-link]\t\t->Insert org link.
-\\[helm-ff-help]\t\t->Display this help info.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-ff-help ()
-  "Help command for `helm-find-files'."
-  (interactive)
-  (let ((helm-help-message helm-ff-help-message))
-    (helm-help)))
-
-;;; Help for `helm-read-file-name'
-;;
-;;
-(defvar helm-read-file-name-help-message
-  "\n* Helm read file name\n
-
-** Helm read file name tips:
-
-\n*** Enter `~/' at end of pattern to quickly reach home directory.
-
-*** Enter `/' at end of pattern to quickly reach root of your file system.
-
-*** Enter `./' at end of pattern to quickly reach `default-directory' (initial start of session).
-  If you are in `default-directory' move cursor on top.
-
-*** Enter `../' at end of pattern will reach upper directory, moving cursor on top.
-  NOTE: This different to using `C-l' in that `C-l' don't move cursor on top but stay on previous
-  subdir name.
-
-*** You can complete with partial basename (start on third char entered)
-
-  e.g \"fob\" or \"fbr\" will complete \"foobar\"
-  but \"fb\" will wait for a third char for completing.
-
-*** Persistent actions:
-
-By default `helm-read-file-name' use the persistent actions of `helm-find-files'.
-
-**** Use `C-u C-j' to watch an image.
-
-**** `C-j' on a filename will expand in helm-buffer to this filename.
-  Second hit on `C-j' will display buffer filename.
-  Third hit on `C-j' will kill buffer filename.
-  NOTE: `C-u C-j' will display buffer directly.
-
-**** To browse images directories turn on `helm-follow-mode' and navigate with arrow keys.
-
-**** When you want to delete backward characters to e.g creating a new file or directory,
-  autoupdate may keep updating to an existent directory
-  preventing you to do so, in this case just hit C-<backspace> and then <backspace>.
-  This should not needed when copying/renaming files because autoupdate is disabled
-  by default in this case.
-  NOTE: On a terminal C-<backspace> may not work, use in this case C-c <backspace>.
-
-**** You can create a new directory and a new file at the same time, just write the path in prompt
-  and press <RET>.
-  e.g You can create \"~/new/newnew/newnewnew/my_newfile.txt\".
-
-**** To create a new directory, add a \"/\" at end of new name and press <RET>.
-
-**** To create a new file just write the filename not ending with \"/\".
-
-\n** Specific commands for helm-read-file-name:\n
-\\<helm-read-file-map>
-\\[helm-find-files-up-one-level]\t\t->Go down precedent directory.
-\\[helm-ff-run-toggle-auto-update]\t\t->Toggle auto expansion of directories.
-\\[helm-ff-run-toggle-basename]\t\t->Toggle basename.
-\\[helm-ff-file-name-history]\t\t->File name history.
-C/\\[helm-cr-empty-string]\t\t->Maybe return empty string (unless `must-match').
-\\[helm-next-source]\t\t->Goto next source.
-\\[helm-previous-source]\t->Goto previous source.
-\\[helm-read-file-name-help]\t\t->Display this help info.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-read-file-name-help ()
-  "Help command for `read-file-name'."
-  (interactive)
-  (let ((helm-help-message helm-read-file-name-help-message))
-    (helm-help)))
-
-;;; Generic file help - Used by locate.
-;;
-;;
-(defvar helm-generic-file-help-message
-  "\n* Helm Generic files\n
-
-** Helm generic file tips:\n
-
-*** Locate
-You can add after writing search pattern any of the locate command line options.
-e.g -b, -e, -n <number>...etc.
-See Man locate for more infos.
-
-Some other sources (at the moment recentf and file in current directory sources)
-support the -b flag for compatibility with locate when they are used with it.
-
-*** Browse project
-
-When your directory is not under version control,
-don't forget to refresh your cache when files have been added/removed in your directory.
-
-*** Find command
-
-Recursively search files using \"find\" shell command.
-
-Candidates are all filenames that match all given globbing patterns.
-This respects the options `helm-case-fold-search' and
-`helm-findutils-search-full-path'.
-
-You can pass arbitrary options directly to find after a \"*\" separator.
-For example, this would find all files matching \"book\" that are larger
-than 1 megabyte:
-
-book * -size +1M
-
-\n** Specific commands for helm locate and others files sources:
-
-\\<helm-generic-files-map>
-\\[helm-ff-run-toggle-basename]\t\t->Toggle basename.
-\\[helm-ff-run-grep]\t\t->Run grep (C-u recurse).
-\\[helm-ff-run-pdfgrep]\t\t->Run Pdfgrep on marked files.
-\\[helm-ff-run-delete-file]\t\t->Delete file.
-\\[helm-ff-run-ediff-file]\t\t->Ediff file.
-\\[helm-ff-run-ediff-merge-file]\t\t->Ediff merge file.
-\\[helm-ff-run-switch-other-window]\t\t->Switch other window.
-\\[helm-ff-properties-persistent]\t\t->Show file properties.
-\\[helm-ff-run-etags]\t\t->Run etags (C-u use tap, C-u C-u reload DB).
-\\[helm-yank-text-at-point]\t\t->Yank text at point.
-\\[helm-ff-run-open-file-externally]\t\t->Open file with external program (C-u to choose).
-\\[helm-ff-run-open-file-with-default-tool]\t\t->Open file externally with default tool.
-\\[helm-ff-run-insert-org-link]\t\t->Insert org link.
-\\[helm-generic-file-help]\t\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-generic-file-help ()
-  "Global help for helm."
-  (interactive)
-  (let ((helm-help-message helm-generic-file-help-message))
-    (helm-help)))
-
-;;; Grep help
-;;
-;;
-(defvar helm-grep-help-message
-  "\n* Helm Grep\n
-** Helm grep tips:\n
-*** You can start grep with a prefix arg to recurse in subdirectories.
-*** You can use wild card when selecting files (e.g *.el)
-*** You can grep in many differents directories by marking files or wild cards.
-*** You can save your results in a grep-mode buffer, see commands below.
-
-*** Important:\n
-Grepping on remote file will work only with grep, not ack-grep, but it is
-anyway bad supported as tramp doesn't support multiple process running in a
-short delay (less than 5s actually) among other things,
-so I strongly advice hitting `C-!' (i.e suspend process)
-before entering anything in pattern, and hit again `C-!' when
-your regexp is ready to send to remote process, even if helm is handling
-this by delaying each process at 5s. 
-Or even better don't use tramp at all and mount your remote file system on SSHFS.
-
-* Helm Gid\n
-** Helm Gid tips
-
-Helm gid read the database created with the `mkid' command from id-utils.
-The name of the database file can be customized with `helm-gid-db-file-name', it
-is usually \"ID\".
-Helm Gid use the symbol at point as default-input.
-You have access to this command also from `helm-find-files' which allow you to
-navigate to another directory to consult its database.
-
-\n** Specific commands for Helm Grep:\n
-\\<helm-grep-map>
-\\[helm-goto-next-file]\t->Next File.
-\\[helm-goto-precedent-file]\t\t->Precedent File.
-\\[helm-yank-text-at-point]\t\t->Yank Text at point in minibuffer.
-\\[helm-grep-run-other-window-action]\t\t->Jump other window.
-\\[helm-grep-run-other-frame-action]\t\t->Jump other frame.
-\\[helm-grep-run-persistent-action]\t\t->Run persistent action (Same as `C-j').
-\\[helm-grep-run-default-action]\t\t->Run default action (Same as RET).
-\\[helm-grep-run-save-buffer]\t\t->Save to a `grep-mode' enabled buffer.
-\\[helm-grep-help]\t\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-grep-help ()
-  "Help command for helm grep."
-  (interactive)
-  (let ((helm-help-message helm-grep-help-message))
-    (helm-help)))
-
-;;; Pdf grep help
-;;
-;;
-(defvar helm-pdfgrep-help-message
-  "\n* Helm PdfGrep Map\n
-\n** Specific commands for Pdf Grep:\n
-\\<helm-pdfgrep-map>
-\\[helm-goto-next-file]\t->Next File.
-\\[helm-goto-precedent-file]\t\t->Precedent File.
-\\[helm-yank-text-at-point]\t\t->Yank Text at point in minibuffer.
-\\[helm-pdfgrep-help]\t\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-pdfgrep-help ()
-  "Help command for pdfgrep."
-  (interactive)
-  (let ((helm-help-message helm-pdfgrep-help-message))
-    (helm-help)))
-
-;;; Etags help
-;;
-;;
-(defvar helm-etags-help-message
-  "\n* Helm Etags Map\n
-\n** Specific commands for Etags:\n
-\\<helm-etags-map>
-\\[helm-goto-next-file]\t->Next File.
-\\[helm-goto-precedent-file]\t\t->Precedent File.
-\\[helm-yank-text-at-point]\t\t->Yank Text at point in minibuffer.
-\\[helm-etags-help]\t\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-etags-help ()
-  "The help function for etags."
-  (interactive)
-  (let ((helm-help-message helm-etags-help-message))
-    (helm-help)))
-
-;;; Ucs help
-;;
-;;
-(defvar helm-ucs-help-message
-  "\n* Helm Ucs\n
-\n** Specific commands for `helm-ucs':\n
-\\<helm-ucs-map>
-\\[helm-ucs-persistent-insert]\t->Insert char.
-\\[helm-ucs-persistent-forward]\t->Forward char.
-\\[helm-ucs-persistent-backward]\t->Backward char.
-\\[helm-ucs-persistent-delete]\t->Delete char backward.
-\\[helm-ucs-help]\t\t->Show this help.
-
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-ucs-help ()
-  "Help command for `helm-ucs'."
-  (interactive)
-  (let ((helm-help-message helm-ucs-help-message))
-    (helm-help)))
-
-;;; Bookmark help
-;;
-;;
-(defvar helm-bookmark-help-message
-  "\n* Helm bookmark name\n
-\n** Specific commands for bookmarks:\n
-\\<helm-bookmark-map>
-\\[helm-bookmark-run-jump-other-window]\t\t->Jump other window.
-\\[helm-bookmark-run-delete]\t\t->Delete bookmark.
-\\[helm-bookmark-run-edit]\t\t->Edit bookmark.
-\\[helm-bookmark-toggle-filename]\t\t->Toggle bookmark location visibility.
-\\[helm-bookmark-help]\t\t->Run this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-bookmark-help ()
-  "Help command for bookmarks."
-  (interactive)
-  (let ((helm-help-message helm-bookmark-help-message))
-    (helm-help)))
-
-;;; Eshell command on file help
-;;
-;;
-(defvar helm-esh-help-message
-  "\n* Helm eshell on file\n
-** Helm eshell on file tips:
-
-*** Passing extra args after filename:
-
-Normally your command or alias will be called with file as argument.
-
-e.g <command> 'candidate_file'
-
-But you can also pass an argument or more after 'candidate_file' like this:
-
-<command> %s [extra_args]\n
-
-'candidate_file' will be added at '%s' and your command will look at this:
-
-<command> 'candidate_file' [extra_args]
-
-*** Specify many files as args (marked files):
-
-e.g <command> file1 file2 ...
-
-Call `helm-find-files-eshell-command-on-file' with one prefix-arg
-Otherwise you can pass one prefix-arg from the command selection buffer.
-NOTE: This is not working on remote files.
-
-With two prefix-arg before starting or from the command selection buffer
-the output is printed to your `current-buffer'.
-
-Note that with no prefix-arg or a prefix-arg value of '(16) (C-u C-u)
-the command is called once for each file like this:
-
-<command> file1 <command> file2 etc...
-
-\n** Specific commands for `helm-find-files-eshell-command-on-file':\n
-\\<helm-esh-on-file-map>
-\\[helm-esh-help]\t\t->Display this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-esh-help ()
-  "Help command for `helm-find-files-eshell-command-on-file'."
-  (interactive)
-  (let ((helm-help-message helm-esh-help-message))
-    (helm-help)))
-
-;;; Ido virtual buffer help
-;;
-;;
-(defvar helm-buffers-ido-virtual-help-message
-  "\n* Helm ido virtual buffers\n
-\n** Specific commands for ido virtuals buffers:\n
-\\<helm-buffers-ido-virtual-map>
-\\[helm-ff-run-switch-other-window]\t\t->Switch other window.
-\\[helm-ff-run-switch-other-frame]\t\t->Switch other frame.
-\\[helm-ff-run-grep]\t\t->Grep file.
-\\[helm-ff-run-zgrep]\t\t->Zgrep file.
-\\[helm-ff-run-delete-file]\t\t->Delete file.
-\\[helm-ff-run-open-file-externally]\t\t->Open file externally.
-\\[helm-buffers-ido-virtual-help]\t\t->Display this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-buffers-ido-virtual-help ()
-  "Help command for ido virtual buffers."
-  (interactive)
-  (let ((helm-help-message helm-buffers-ido-virtual-help-message))
-    (helm-help)))
-
-;;; Moccur help
-;;
-;;
-(defvar helm-moccur-help-message
-  "\n* Helm Moccur\n
-** Helm Moccur tips:
-
-*** Matching
-Multiple regexp matching is allowed, just enter a space to separate your regexps.
-
-Matching empty lines is supported with the regexp \"^$\", you will get the results
-with only the buffer-name and the line number, you can of course save and edit these
-results (i.e add text to the empty line) .
-
-*** Automatically matching symbol at point
-
-You can match automatically the symbol at point, but keeping
-the minibuffer empty ready to write into.
-This is disabled by default, to enable this you have to add `helm-source-occur'
-and `helm-source-moccur' to `helm-sources-using-default-as-input'.
-
-*** Jump to the corresponding line in the searched buffer
-You can do this with `C-j' (persistent-action), to do it repetitively
-you can use `C-<up>' and `C-<down>' or enable `helm-follow-mode' with `C-c C-f'.
-
-*** Saving results
-Same as with helm-grep, you can save the results with `C-x C-s'.
-Of course if you don't save your results, you can get back your session
-with `helm-resume'.
-
-*** Refreshing the resumed session.
-When the buffer(s) where you ran helm-(m)occur have been modified, you will be
-warned of this with the buffer flashing to red, you can refresh the buffer by running
-`C-c C-u'.
-This can be done automatically by customizing `helm-moccur-auto-update-on-resume'.
-
-*** Refreshing a saved buffer
-Just hit `g' to update your buffer.
-
-*** Edit a saved buffer
-
-To do so you have to install wgrep
-https://github.com/mhayashi1120/Emacs-wgrep
-and then:
-
-1) C-c C-p to edit the buffer(s).
-2) C-x C-s to save your changes.
-
-Tip: Use the excellent iedit https://github.com/tsdh/iedit
-to modify occurences in your buffer.
-
-\n** Specific commands for Helm Moccur:\n
-\\<helm-moccur-map>
-\\[helm-goto-next-file]\t->Next Buffer.
-\\[helm-goto-precedent-file]\t\t->Precedent Buffer.
-\\[helm-yank-text-at-point]\t\t->Yank Text at point in minibuffer.
-\\[helm-moccur-run-goto-line-ow]\t\t->Goto line in other window.
-\\[helm-moccur-run-goto-line-of]\t\t->Goto line in new frame.
-\\[helm-moccur-help]\t\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-moccur-help ()
-  "Help command for (m)occur."
-  (interactive)
-  (let ((helm-help-message helm-moccur-help-message))
-    (helm-help)))
-
-;;; Helm Top
-;;
-;;
-(defvar helm-top-help-message
-  "\n* Helm Top\n
-\n** Helm Top tips:
-
-\n** Specific commands for Helm Top:\n
-\\<helm-top-map>
-\\[helm-top-run-sort-by-com]\t->Sort by commands.
-\\[helm-top-run-sort-by-cpu]\t->Sort by cpu usage.
-\\[helm-top-run-sort-by-user]\t->Sort alphabetically by user.
-\\[helm-top-run-sort-by-mem]\t->Sort by memory.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-top-help ()
-  "Help command for top."
-  (interactive)
-  (let ((helm-help-message helm-top-help-message))
-    (helm-help)))
-
-;;; Helm Apt
-;;
-;;
-(defvar helm-apt-help-message
-  "\n* Helm Apt\n
-\n** Helm Apt tips:
-
-\n** Specific commands for Helm Apt:\n
-\\<helm-apt-map>
-\\[helm-apt-show-all]\t->Show all packages.
-\\[helm-apt-show-only-installed]\t->Show installed packages only.
-\\[helm-apt-show-only-not-installed]\t->Show not installed packages only.
-\\[helm-apt-show-only-deinstalled]\t-Show deinstalled (not purged yet) packages only.>
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-apt-help ()
-  "Help command for helm apt."
-  (interactive)
-  (let ((helm-help-message helm-apt-help-message))
-    (helm-help)))
-
-;;; Helm elisp package
-;;
-;;
-(defvar helm-el-package-help-message
-  "\n* Helm elisp package\n
-\n** Helm elisp package tips:
-*** Upgrade elisp packages
-
-To see upgradables packages hit <M-U>.
-
-Then you can install all upgradables packages with the upgrade all action,
-or upgrade only the specific packages by marking them (the new ones) and running
-the upgrade action (visible only when there is upgradables packages).
-Of course you can upgrade a single package by just running the upgrade action
-without marking it.
-
-*** Meaning of flags prefixing packages (Emacs-25)
-
-- The flag \"S\" that prefix package names mean that this package is one of `package-selected-packages'.
-This feature is only available with emacs-25.
-
-- The flag \"U\" that prefix package names mean that this package is no more needed.
-This feature is only available with emacs-25.
-
-\n** Specific commands for Helm elisp package:\n
-\\<helm-el-package-map>
-\\[helm-el-package-show-all]\t->Show all packages.
-\\[helm-el-package-show-installed]\t->Show installed packages only.
-\\[helm-el-package-show-uninstalled]\t->Show not installed packages only.
-\\[helm-el-package-show-upgrade]\t->Show upgradable packages only.
-\\[helm-el-run-package-install]\t->Install package(s).
-\\[helm-el-run-package-reinstall]\t->Reinstall package(s).
-\\[helm-el-run-package-uninstall]\t->Uninstall package(s).
-\\[helm-el-run-package-upgrade]\t->Upgrade package(s).
-\\[helm-el-run-package-upgrade-all]\t->Upgrade all packages upgradables.
-\\[helm-el-run-visit-homepage]\t->Visit package homepage.
-\\[helm-el-package-help]\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-el-package-help ()
-  "Help command for emacs packages."
-  (interactive)
-  (let ((helm-help-message helm-el-package-help-message))
-    (helm-help)))
-
-;;; Helm M-x
-;;
-;;
-(defvar helm-M-x-help-message
-  "\n* Helm M-x\n
-\n** Helm M-x tips:
-
-*** You can get help on any command with persistent action (C-j).
-
-*** All the prefix args passed BEFORE running `helm-M-x' are ignored,
-you should have an error message if you do so.
-When you want to pass prefix args, pass them AFTER starting `helm-M-x',
-you will have a prefix arg counter appearing in mode-line notifying you
-the amount of prefix args entered.
-
-\n** Specific commands for Helm M-x:\n
-\\<helm-M-x-map>
-\\[helm-M-x-help]\t\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-M-x-help ()
-  "Help command for `helm-M-x'."
-  (interactive)
-  (let ((helm-help-message helm-M-x-help-message))
-    (helm-help)))
-
-;;; helm-imenu
-;;
-;;
-(defvar helm-imenu-help-message
-  "\n* Helm imenu\n
-\n** Helm imenu tips:
-
-\n** Specific commands for Helm imenu:\n
-\\<helm-imenu-map>
-\\[helm-imenu-help]\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-imenu-help ()
-  "Help command for imenu."
-  (interactive)
-  (let ((helm-help-message helm-imenu-help-message))
-    (helm-help)))
-
-;;; helm-colors
-;;
-;;
-(defvar helm-colors-help-message
-  "\n* Helm colors\n
-\n** Specific commands for Helm colors:\n
-\\<helm-color-map>
-\\[helm-color-run-insert-name]\t\tInsert the entry'name.
-\\[helm-color-run-kill-name]\t\tKill the entry's name.
-\\[helm-color-run-insert-rgb]\t\tInsert entry in RGB format.
-\\[helm-color-run-kill-rgb]\t\tKill entry in RGB format.
-\\[helm-color-help]\t\tShow this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-color-help ()
-  "Help command for color."
-  (interactive)
-  (let ((helm-help-message helm-colors-help-message))
-    (helm-help)))
-
-;;; helm semantic
-;;
-;;
-(defvar helm-semantic-help-message
-  "\n* Helm semantic\n
-\n** Helm semantic tips:
-
-\n** Specific commands for Helm semantic:\n
-\\<helm-semantic-map>
-\\[helm-semantic-help]\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-semantic-help ()
-  "Help command for semantic."
-  (interactive)
-  (let ((helm-help-message helm-semantic-help-message))
-    (helm-help)))
-
-;;; helm kmacro
-;;
-;;
-(defvar helm-kmacro-help-message
-  "\n* Helm kmacro\n
-\n** Helm kmacro tips:
-- Start recording some keys with `f3'
-- Record new kmacro with `f4'
-- Start `helm-execute-kmacro' to list all your macros.
-
-Use persistent action to run your kmacro as many time as needed,
-you can change of kmacro with `helm-next-line' `helm-previous-line'.
-
-NOTE: You can't record keys running helm commands except `helm-M-x' unless
-you don't choose from there a command using helm completion.
-
-\n** Specific commands for Helm kmacro:\n
-\\<helm-kmacro-map>
-\\[helm-kmacro-help]\t->Show this help.
-\n** Helm Map\n
-\\{helm-map}")
-
-;;;###autoload
-(defun helm-kmacro-help ()
-  "Help command for kmacro."
-  (interactive)
-  (let ((helm-help-message helm-kmacro-help-message))
-    (helm-help)))
-
-
-;;; Mode line strings
-;;
-;;
-;;;###autoload
-(defvar helm-buffer-mode-line-string
-  '("Buffer(s)" "\
-\\<helm-buffer-map>\
-\\[helm-buffer-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-    "String displayed in mode-line in `helm-source-buffers-list'"))
-
-;;;###autoload
-(defvar helm-color-mode-line-string
-  '("Colors" "\
-\\<helm-color-map>\
-\\[helm-color-help]:Help/\
-\\[helm-color-run-insert-name]:Insert name/\
-\\[helm-color-run-insert-rgb]:Insert RGB/\
-with shift: Kill"))
-
-;;;###autoload
-(defvar helm-buffers-ido-virtual-mode-line-string
-  '("Killed Buffer(s)" "\
-\\<helm-buffers-ido-virtual-map>\
-\\[helm-buffers-ido-virtual-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-    "String displayed in mode-line in `helm-source-buffers-list'"))
-
-;;;###autoload
-(defvar helm-ff-mode-line-string "\
-\\<helm-find-files-map>\
-\\[helm-ff-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-  "String displayed in mode-line in `helm-source-find-files'")
-
-;;;###autoload
-(defvar helm-read-file-name-mode-line-string "\
-\\<helm-read-file-map>\
-\\[helm-read-file-name-help]:Help \
-C/\\[helm-cr-empty-string]:Empty \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-  "String displayed in mode-line in `helm-source-find-files'.")
-
-;;;###autoload
-(defvar helm-generic-file-mode-line-string "\
-\\<helm-generic-files-map>\
-\\[helm-generic-file-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend"
-  "String displayed in mode-line in Locate.")
-
-;;;###autoload
-(defvar helm-grep-mode-line-string"\
-\\<helm-grep-map>\
-\\[helm-grep-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend"
-  "String displayed in mode-line in `helm-do-grep'.")
-
-;;;###autoload
-(defvar helm-pdfgrep-mode-line-string "\
-\\<helm-pdfgrep-map>\
-\\[helm-pdfgrep-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend"
-  "String displayed in mode-line in `helm-do-pdfgrep'.")
-
-;;;###autoload
-(defvar helm-etags-mode-line-string "\
-\\<helm-etags-map>\
-\\[helm-etags-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-  "String displayed in mode-line in `helm-etags-select'.")
-
-;;;###autoload
-(defvar helm-ucs-mode-line-string "\
-\\<helm-ucs-map>\
-\\[helm-ucs-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-  "String displayed in mode-line in `helm-ucs'.")
-
-;;;###autoload
-(defvar helm-bookmark-mode-line-string
-  '("Bookmark(s)" "\
-\\<helm-bookmark-map>\
-\\[helm-bookmark-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct")
-  "String displayed in mode-line in `helm-source-buffers-list'")
-
-;;;###autoload
-(defvar helm-occur-mode-line "\
-\\<helm-map>\
-\\[helm-help]:Help \
-\\<helm-occur-map>\
-\\[helm-occur-run-query-replace-regexp]:Query replace regexp \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-moccur-mode-line "\
-\\<helm-moccur-map>\
-\\[helm-moccur-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-comp-read-mode-line "\
-\\<helm-comp-read-map>\
-C/\\[helm-cr-empty-string]:Empty \
-\\<helm-map>\
-\\[helm-help]:Help \
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct")
-
-;;;###autoload
-(defvar helm-top-mode-line "\
-\\<helm-top-map>\
-\\[helm-top-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-apt-mode-line "\
-\\<helm-apt-map>\
-\\[helm-apt-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-el-package-mode-line "\
-\\<helm-el-package-map>\
-\\[helm-el-package-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-M-x-mode-line "\
-\\<helm-M-x-map>\
-\\[helm-M-x-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-imenu-mode-line "\
-\\<helm-imenu-map>\
-\\[helm-imenu-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-;;;###autoload
-(defvar helm-semantic-mode-line "\
-\\<helm-semantic-map>\
-\\[helm-semantic-help]:Help \
-\\<helm-map>\
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct \
-\\[helm-toggle-suspend-update]:Tog.suspend")
-
-
-;;; Attribute Documentation
-;;
-;;
-;;;###autoload
-(defun helm-describe-helm-attribute (helm-attribute)
-  "Display the full documentation of HELM-ATTRIBUTE.
-HELM-ATTRIBUTE should be a symbol."
-  (interactive (list (intern
-                      (completing-read
-                       "Describe helm attribute: "
-                       (mapcar 'symbol-name helm-attributes)
-                       nil t))))
-  (with-output-to-temp-buffer "*Help*"
-    (princ (get helm-attribute 'helm-attrdoc))))
-
-(helm-document-attribute 'name "mandatory"
-  "  The name of the source. It is also the heading which appears
-  above the list of matches from the source. Must be unique.")
-
-(helm-document-attribute 'header-name "optional"
-  "  A function returning the display string of the header. Its
-  argument is the name of the source. This attribute is useful to
-  add an additional information with the source name.")
-
-(helm-document-attribute 'candidates "mandatory if candidates-in-buffer attribute is not provided"
-  "  Specifies how to retrieve candidates from the source. It can
-  either be a variable name, a function called with no parameters
-  or the actual list of candidates.
-
-  The list must be a list whose members are strings, symbols
-  or (DISPLAY . REAL) pairs.
-
-  In case of (DISPLAY . REAL) pairs, the DISPLAY string is shown
-  in the Helm buffer, but the REAL one is used as action
-  argument when the candidate is selected. This allows a more
-  readable presentation for candidates which would otherwise be,
-  for example, too long or have a common part shared with other
-  candidates which can be safely replaced with an abbreviated
-  string for display purposes.
-
-  Note that if the (DISPLAY . REAL) form is used then pattern
-  matching is done on the displayed string, not on the real
-  value.
-
-  If the candidates have to be retrieved asynchronously (for
-  example, by an external command which takes a while to run)
-  then the function should start the external command
-  asynchronously and return the associated process object.
-  Helm will take care of managing the process (receiving the
-  output from it, killing it if necessary, etc.). The process
-  should return candidates matching the current pattern (see
-  variable `helm-pattern'.)
-  You should use instead `candidates-process' attribute for
-  async processes, a warning will popup when using async process
-  in a `candidates' attribute.
-
-  Note that currently results from asynchronous sources appear
-  last in the helm buffer regardless of their position in
-  `helm-sources'.")
-
-(helm-document-attribute 'candidates-process
-    "Same as `candidates' attributes but for process function."
-  "  You should use this attribute when using a function involving
-  an async process instead of `candidates'.")
-
-(helm-document-attribute 'action "mandatory if type attribute is not provided"
-  "  It is a list of (DISPLAY . FUNCTION) pairs or FUNCTION.
-  FUNCTION is called with one parameter: the selected candidate.
-
-  An action other than the default can be chosen from this list
-  of actions for the currently selected candidate (by default
-  with TAB). The DISPLAY string is shown in the completions
-  buffer and the FUNCTION is invoked when an action is
-  selected. The first action of the list is the default.")
-
-(helm-document-attribute 'coerce "optional"
-  "  It's a function called with one argument: the selected
-  candidate.
-
-  This function is intended for type convertion. In normal case,
-  the selected candidate (string) is passed to action
-  function. If coerce function is specified, it is called just
-  before action function.
-
-  Example: converting string to symbol
-    (coerce . intern)")
-
-(helm-document-attribute 'type "optional if action attribute is provided"
-  "  Indicates the type of the items the source returns.
-
-  Merge attributes not specified in the source itself from
-  `helm-type-attributes'.
-
-  This attribute is implemented by plug-in.")
-
-(helm-document-attribute 'init "optional"
-  "  Function called with no parameters when helm is started. It
-  is useful for collecting current state information which can be
-  used to create the list of candidates later.
-
-  For example, if a source needs to work with the current
-  directory then it can store its value here, because later
-  helm does its job in the minibuffer and in the
-  `helm-buffer' and the current directory can be different
-  there.")
-
-(helm-document-attribute 'match "optional"
-  "  List of functions called with one parameter: a candidate. The
-  function should return non-nil if the candidate matches the
-  current pattern (see variable `helm-pattern').
-
-  This attribute allows the source to override the default
-  pattern matching based on `string-match'. It can be used, for
-  example, to implement a source for file names and do the
-  pattern matching on the basename of files, since it's more
-  likely one is typing part of the basename when searching for a
-  file, instead of some string anywhere else in its path.
-
-  If the list contains more than one function then the list of
-  matching candidates from the source is constructed by appending
-  the results after invoking the first function on all the
-  potential candidates, then the next function, and so on. The
-  matching candidates supplied by the first function appear first
-  in the list of results and then results from the other
-  functions, respectively.
-
-  This attribute has no effect for asynchronous sources (see
-  attribute `candidates'), since they perform pattern matching
-  themselves.")
-
-(helm-document-attribute 'candidate-transformer "optional"
-  "  It's a function or a list of functions called with one argument
-  when the completion list from the source is built. The argument
-  is the list of candidates retrieved from the source. The
-  function should return a transformed list of candidates which
-  will be used for the actual completion.  If it is a list of
-  functions, it calls each function sequentially.
-
-  This can be used to transform or remove items from the list of
-  candidates.
-
-  Note that `candidates' is run already, so the given transformer
-  function should also be able to handle candidates with (DISPLAY
-  . REAL) format.")
-
-(helm-document-attribute 'filtered-candidate-transformer "optional"
-  "  It has the same format as `candidate-transformer', except the
-  function is called with two parameters: the candidate list and
-  the source.
-
-  This transformer is run on the candidate list which is already
-  filtered by the current pattern. While `candidate-transformer'
-  is run only once, it is run every time the input pattern is
-  changed.
-
-  It can be used to transform the candidate list dynamically, for
-  example, based on the current pattern.
-
-  In some cases it may also be more efficent to perform candidate
-  transformation here, instead of with `candidate-transformer'
-  even if this transformation is done every time the pattern is
-  changed.  For example, if a candidate set is very large then
-  `candidate-transformer' transforms every candidate while only
-  some of them will actually be dislpayed due to the limit
-  imposed by `helm-candidate-number-limit'.
-
-  Note that `candidates' and `candidate-transformer' is run
-  already, so the given transformer function should also be able
-  to handle candidates with (DISPLAY . REAL) format.
-
-  This option has no effect for asynchronous sources. (Not yet,
-  at least.")
-
-(helm-document-attribute 'action-transformer "optional"
-  "  It's a function or a list of functions called with two
-  arguments when the action list from the source is
-  assembled. The first argument is the list of actions, the
-  second is the current selection.  If it is a list of functions,
-  it calls each function sequentially.
-
-  The function should return a transformed action list.
-
-  This can be used to customize the list of actions based on the
-  currently selected candidate.")
-
-(helm-document-attribute 'pattern-transformer "optional"
-  "  It's a function or a list of functions called with one argument
-  before computing matches. Its argument is `helm-pattern'.
-  Functions should return transformed `helm-pattern'.
-
-  It is useful to change interpretation of `helm-pattern'.")
-
-(helm-document-attribute 'delayed "optional"
-  "  Candidates from the source are shown only if the user stops
-  typing and is idle for `helm-idle-delay' seconds.
-  If a value is given to delayed attr, this value is used instead only
-  if it is > to `helm-idle-delay'.")
-
-(helm-document-attribute 'volatile "optional"
-  "  Indicates the source assembles the candidate list dynamically,
-  so it shouldn't be cached within a single Helm
-  invocation. It is only applicable to synchronous sources,
-  because asynchronous sources are not cached.")
-
-(helm-document-attribute 'requires-pattern "optional"
-  "  If present matches from the source are shown only if the
-  pattern is not empty. Optionally, it can have an integer
-  parameter specifying the required length of input which is
-  useful in case of sources with lots of candidates.")
-
-(helm-document-attribute 'persistent-action "optional"
-  "  Can be a either a Function called with one parameter (the
-  selected candidate) or a cons cell where first element is this
-  same function and second element a symbol (e.g never-split)
-  that inform `helm-execute-persistent-action'to not split his
-  window to execute this persistent action.")
-
-(helm-document-attribute 'candidates-in-buffer "optional"
-  "  Shortcut attribute for making and narrowing candidates using
-  buffers.  This newly-introduced attribute prevents us from
-  forgetting to add volatile and match attributes.
-
-  See docstring of `helm-candidates-in-buffer'.
-
-  (candidates-in-buffer) is equivalent of three attributes:
-    (candidates . helm-candidates-in-buffer)
-    (volatile)
-    (match identity)
-
-  (candidates-in-buffer . candidates-function) is equivalent of:
-    (candidates . candidates-function)
-    (volatile)
-    (match identity)
-
-  This attribute is implemented by plug-in.")
-
-(helm-document-attribute 'search "optional"
-  "  List of functions like `re-search-forward' or `search-forward'.
-  Buffer search function used by `helm-candidates-in-buffer'.
-  By default, `helm-candidates-in-buffer' uses
-  `re-search-forward'. This attribute is meant to be used with
-  (candidates . helm-candidates-in-buffer) or
-  (candidates-in-buffer) in short.")
-
-(helm-document-attribute 'get-line "optional"
-  "  A function like `buffer-substring-no-properties' or `buffer-substring'.
-  This function converts point of line-beginning and point of line-end,
-  which represents a candidate computed by `helm-candidates-in-buffer'.
-  By default, `helm-candidates-in-buffer' uses
-  `buffer-substring-no-properties'.")
-
-(helm-document-attribute 'display-to-real "optional"
-  "  Function called with one parameter; the selected candidate.
-
-  The function transforms the selected candidate, and the result
-  is passed to the action function.  The display-to-real
-  attribute provides another way to pass other string than one
-  shown in Helm buffer.
-
-  Traditionally, it is possible to make candidates,
-  candidate-transformer or filtered-candidate-transformer
-  function return a list with (DISPLAY . REAL) pairs. But if REAL
-  can be generated from DISPLAY, display-to-real is more
-  convenient and faster.")
-
-(helm-document-attribute 'real-to-display "optional"
-  "  Function called with one parameter; the selected candidate.
-
-  The inverse of display-to-real attribute.
-
-  The function transforms the selected candidate, which is passed
-  to the action function, for display.  The real-to-display
-  attribute provides the other way to pass other string than one
-  shown in Helm buffer.
-
-  Traditionally, it is possible to make candidates,
-  candidate-transformer or filtered-candidate-transformer
-  function return a list with (DISPLAY . REAL) pairs. But if
-  DISPLAY can be generated from REAL, real-to-display is more
-  convenient.
-
-  Note that DISPLAY parts returned from candidates /
-  candidate-transformer are IGNORED as the name `display-to-real'
-  says.")
-
-(helm-document-attribute 'cleanup "optional"
-  "  Function called with no parameters when *helm* buffer is
-  closed. It is useful for killing unneeded candidates buffer.
-
-  Note that the function is executed BEFORE performing action.")
-
-(helm-document-attribute 'candidate-number-limit "optional"
-  "  Override `helm-candidate-number-limit' only for this source.")
-
-(helm-document-attribute 'accept-empty "optional"
-  "  Pass empty string \"\" to action function.")
-
-(helm-document-attribute 'dummy "optional"
-  "  Set `helm-pattern' to candidate. If this attribute is
-  specified, The candidates attribute is ignored.
-
-  This attribute is implemented by plug-in.")
-
-(helm-document-attribute 'multiline "optional"
-  "  Enable to selection multiline candidates.")
-
-(helm-document-attribute 'update "optional"
-  (substitute-command-keys
-   "  Function called with no parameters at before \"init\" function when \
-\\<helm-map>\\[helm-force-update] is pressed."))
-
-(helm-document-attribute 'mode-line "optional"
-  "  Source local `helm-mode-line-string' (included in
-  `mode-line-format'). It accepts also variable/function name.")
-
-(helm-document-attribute 'header-line "optional"
-  "  Source local `header-line-format'.
-  It accepts also variable/function name. ")
-
-(helm-document-attribute
-    'resume "optional"
-  "  Function called with no parameters at end of initialization
-  when `helm-resume' is started.
-  If this function try to do something against `helm-buffer', \(e.g updating,
-  searching etc...\) probably you should run it in a timer to ensure
-  `helm-buffer' is ready.")
-
-(helm-document-attribute 'keymap "optional"
-  "  Specific keymap for this source.
-  It is useful to have a keymap per source when using more than
-  one source.  Otherwise, a keymap can be set per command with
-  `helm' argument KEYMAP.  NOTE: when a source have `helm-map' as
-  keymap attr, the global value of `helm-map' will override the
-  actual local one.")
-
-(helm-document-attribute 'help-message "optional"
-  "  Help message for this source.
-  If not present, `helm-help-message' value will be used.")
-
-(helm-document-attribute 'match-part "optional"
-  "  Allow matching candidate in the line with `candidates-in-buffer'.
-  In candidates-in-buffer sources, match is done with
-  `re-search-forward' which allow matching only a regexp on the
-  `helm-buffer'; when this search is done, match-part allow
-  matching only a specific part of the current line e.g with a
-  line like this:
-
-  filename:candidate-containing-the-word-filename
-
-  What you want is to ignore \"filename\" part and match only
-  \"candidate-containing-the-word-filename\"
-
-  So give a function matching only the part of candidate after \":\"
-
-  If source contain match-part attribute, match is computed only
-  on part of candidate returned by the call of function provided
-  by this attribute. The function should have one arg, candidate,
-  and return only a specific part of candidate.
-
-  NOTE: This have effect only on sources using
-  `candidates-in-buffer'.")
-
-(helm-document-attribute 'match-strict "optional"
-  "  When specifying a match function within a source and
-  helm-match-plugin is enabled, the result of all matching
-  functions will be concatened, which in some cases is not what
-  is wanted. When using `match-strict' only this or these
-  functions will be used. You can specify those functions as a
-  list of functions or a single symbol function. For anonymous
-  function don't add the dot, e.g:
-
-  \(match-strict (lambda () (foo))).")
-
-(helm-document-attribute 'nohighlight "optional"
-  "  Disable highlight match in this source.")
-
-(helm-document-attribute 'no-matchplugin "optional"
-  "  Disable matchplugin for this source.")
-
-(helm-document-attribute 'history "optional"
-  "  Allow passing history variable to helm from source.
-  It should be a quoted symbol evaluated from source, i.e:
-  (history . ,'history-var)")
-
-(helm-document-attribute 'follow "optional"
-  "  Enable `helm-follow-mode' for this source only.
-  You must give it a value of 1 or -1, though giving a -1 value
-  is surely not what you want, e.g: (follow . 1)
-
-  See `helm-follow-mode' for more infos")
-
-(helm-document-attribute 'follow-delay "optional"
-  "  `helm-follow-mode' will execute persistent-action after this delay.
-Otherwise value of `helm-follow-input-idle-delay' is used if non--nil,
-If none of these are found fallback to `helm-input-idle-delay'.")
-
-(helm-document-attribute 'allow-dups "optional"
-  "  Allow helm collecting duplicates candidates.")
-
-(helm-document-attribute 'filter-one-by-one "optional"
-  "  A transformer function that treat candidates one by one.
-  It is called with one arg the candidate.
-  It is faster than `filtered-candidate-transformer' or `candidates-transformer',
-  but should be used only in sources that recompute constantly their candidates,
-  e.g `helm-source-find-files'.
-  Filtering happen early and candidates are treated
-  one by one instead of re-looping on the whole list.
-  If used with `filtered-candidate-transformer' or `candidates-transformer'
-  these functions should treat the candidates transformed by the `filter-one-by-one'
-  function in consequence.")
-
-(helm-document-attribute 'nomark "optional"
-  "  Don't allow marking candidates when this attribute is present.")
-
-(provide 'helm-help)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-help.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-id-utils.el b/emacs.d/elpa/helm-20150623.1310/helm-id-utils.el
deleted file mode 100644
index 7b7e922..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-id-utils.el
+++ /dev/null
@@ -1,116 +0,0 @@
-;;; helm-id-utils.el --- Helm interface for id-utils. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'helm-grep)
-
-(defgroup helm-id-utils nil
-  "ID-Utils related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-gid-db-file-name "ID"
-  "Name of a database file created by `mkid' command from `ID-utils'."
-  :group 'helm-id-utils
-  :type 'string)
-
-(defun helm-gid-candidates-process ()
-  (let ((proc (start-process
-               "gid" nil "gid"
-               "-r" helm-pattern)))
-    (set (make-local-variable 'helm-grep-last-cmd-line)
-         (format "gid -r %s" helm-pattern))
-    (prog1 proc
-      (set-process-sentinel
-       proc (lambda (_process event)
-              (when (string= event "finished\n")
-                (with-helm-window
-                  (setq mode-line-format
-                        '(" " mode-line-buffer-identification " "
-                          (:eval (format "L%s" (helm-candidate-number-at-point))) " "
-                          (:eval (propertize
-                                  (format "[Helm Gid process finished - (%s results)]" 
-                                          (max (1- (count-lines
-                                                    (point-min) (point-max)))
-                                               0))
-                                  'face 'helm-locate-finish))))
-                  (force-mode-line-update))
-                (helm-log "Error: Gid %s"
-                          (replace-regexp-in-string "\n" "" event))))))))
-
-(defun helm-gid-filtered-candidate-transformer (candidates _source)
-  ;; "gid -r" may add dups in some rare cases.
-  (cl-loop for c in (helm-fast-remove-dups candidates :test 'equal)
-           collect (helm-grep--filter-candidate-1 c)))
-
-(defclass helm-gid-source (helm-source-async)
-  ((header-name
-    :initform
-    (lambda (name)
-      (concat name " [" (helm-attr 'db-dir) "]")))
-   (db-dir :initarg :db-dir
-           :initform nil
-           :custom string
-           :documentation " Location of ID file.")
-   (candidates-process :initform #'helm-gid-candidates-process)
-   (filtered-candidate-transformer
-    :initform #'helm-gid-filtered-candidate-transformer)
-   (candidate-number-limit :initform 99999)
-   (mode-line :initform helm-grep-mode-line-string)
-   (action :initform (helm-make-actions
-                      "Find File" 'helm-grep-action
-                      "Find file other frame" 'helm-grep-other-frame
-                      (lambda () (and (locate-library "elscreen")
-                                      "Find file in Elscreen"))
-                      'helm-grep-jump-elscreen
-                      "Save results in grep buffer" 'helm-grep-save-results
-                      "Find file other window" 'helm-grep-other-window))
-   (persistent-action :initform 'helm-grep-persistent-action)
-   (history :initform 'helm-grep-history)
-   (nohighlight :initform t)
-   (requires-pattern :initform 2)))
-
-;;;###autoload
-(defun helm-gid ()
-  "Preconfigured helm for `gid' command line of `ID-Utils'.
-Need A database created with the command `mkid'
-above `default-directory'.
-Need id-utils as dependency which provide `mkid', `gid' etc...
-See <https://www.gnu.org/software/idutils/>."
-  (interactive)
-  (let* ((db (locate-dominating-file
-              default-directory
-              helm-gid-db-file-name))
-         (helm-grep-default-directory-fn
-          (lambda () default-directory))
-         (helm--maybe-use-default-as-input t))
-    (cl-assert db nil "No DataBase found, create one with `mkid'")
-    (helm :sources (helm-make-source "Gid" 'helm-gid-source
-                     :db-dir db)
-          :buffer "*helm gid*"
-          :keymap helm-grep-map
-          :truncate-lines t)))
-
-(provide 'helm-id-utils)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-id-utils ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-imenu.el b/emacs.d/elpa/helm-20150623.1310/helm-imenu.el
deleted file mode 100644
index 295df05..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-imenu.el
+++ /dev/null
@@ -1,261 +0,0 @@
-;;; helm-imenu.el --- Helm interface for Imenu -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'imenu)
-(require 'helm-utils)
-(require 'helm-help)
-
-
-(defgroup helm-imenu nil
-  "Imenu related libraries and applications for helm."
-  :group 'helm)
-
-(defcustom helm-imenu-delimiter " / "
-  "Delimit types of candidates and his value in `helm-buffer'."
-  :group 'helm-imenu
-  :type 'string)
-
-(defcustom helm-imenu-execute-action-at-once-if-one t
-  "Goto the candidate when only one is remaining."
-  :group 'helm-imenu
-  :type 'boolean)
-
-(defcustom helm-imenu-lynx-style-map t
-  "Use Arrow keys to jump to occurences."
-  :group 'helm-imenu
-  :type  'boolean)
-
-
-;;; keymap
-(defvar helm-imenu-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?")    'helm-imenu-help)
-    (define-key map (kbd "M-<down>") 'helm-imenu-next-section)
-    (define-key map (kbd "M-<up>")   'helm-imenu-previous-section)
-    (when helm-imenu-lynx-style-map
-      (define-key map (kbd "<left>")  'helm-maybe-exit-minibuffer)
-      (define-key map (kbd "<right>") 'helm-execute-persistent-action))
-    (delq nil map)))
-
-(defun helm-imenu-next-or-previous-section (n)
-  (with-helm-buffer
-    (let* ((fn (lambda ()
-                 (car (split-string (helm-get-selection nil t)
-                                    helm-imenu-delimiter))))
-           (curtype (funcall fn))
-           (move-fn (if (> n 0) #'helm-next-line #'helm-previous-line))
-           (stop-fn (if (> n 0)
-                        #'helm-end-of-source-p
-                        #'helm-beginning-of-source-p)))
-      (catch 'break
-        (while (not (funcall stop-fn))
-          (funcall move-fn)
-          (unless (string= curtype (funcall fn))
-            (throw 'break nil)))))))
-
-(defun helm-imenu-next-section ()
-  (interactive)
-  (helm-imenu-next-or-previous-section 1))
-
-(defun helm-imenu-previous-section ()
-  (interactive)
-  (helm-imenu-next-or-previous-section -1))
-
-
-;;; Internals
-(defvar helm-cached-imenu-alist nil)
-(make-variable-buffer-local 'helm-cached-imenu-alist)
-
-(defvar helm-cached-imenu-candidates nil)
-(make-variable-buffer-local 'helm-cached-imenu-candidates)
-
-(defvar helm-cached-imenu-tick nil)
-(make-variable-buffer-local 'helm-cached-imenu-tick)
-
-
-(defvar helm-source-imenu nil "See (info \"(emacs)Imenu\")")
-(defvar helm-source-imenu-all nil)
-
-(defclass helm-imenu-source (helm-source-sync)
-  ((candidates :initform 'helm-imenu-candidates)
-   (candidate-transformer :initform 'helm-imenu-transformer)
-   (persistent-action :initform 'helm-imenu-persistent-action)
-   (persistent-help :initform "Show this entry")
-   (keymap :initform helm-imenu-map)
-   (mode-line :initform helm-imenu-mode-line)
-   (action :initform 'helm-imenu-action)))
-
-(defcustom helm-imenu-fuzzy-match nil
-  "Enable fuzzy matching in `helm-source-imenu'."
-  :group 'helm-imenu
-  :type  'boolean
-  :set (lambda (var val)
-         (set var val)
-         (setq helm-source-imenu
-               (helm-make-source "Imenu" 'helm-imenu-source
-                 :fuzzy-match helm-imenu-fuzzy-match))))
-
-(defun helm-imenu--maybe-switch-to-buffer (candidate)
-  (helm-aif (marker-buffer (cdr candidate))
-      (unless (eql it (get-buffer helm-current-buffer))
-        (switch-to-buffer it))))
-
-(defun helm-imenu-action (candidate)
-  "Default action for `helm-source-imenu'."
-  (helm-log-run-hook 'helm-goto-line-before-hook)
-  (helm-imenu--maybe-switch-to-buffer candidate)
-  (imenu candidate)
-  ;; If semantic is supported in this buffer
-  ;; imenu used `semantic-imenu-goto-function'
-  ;; and position have been highlighted,
-  ;; no need to highlight again.
-  (unless (eq imenu-default-goto-function
-              'semantic-imenu-goto-function)
-    (helm-highlight-current-line nil nil nil nil 'pulse)))
-
-(defun helm-imenu-persistent-action (candidate)
-  "Default persistent action for `helm-source-imenu'."
-  (helm-imenu--maybe-switch-to-buffer candidate)
-  (imenu candidate)
-  (helm-highlight-current-line))
-
-(defun helm-imenu-candidates (&optional buffer)
-  (with-current-buffer (or buffer helm-current-buffer)
-    (let ((tick (buffer-modified-tick)))
-      (if (eq helm-cached-imenu-tick tick)
-          helm-cached-imenu-candidates
-        (setq imenu--index-alist nil)
-        (prog1 (setq helm-cached-imenu-candidates
-                     (let ((index (imenu--make-index-alist t))) 
-                       (helm-imenu--candidates-1
-                        (delete (assoc "*Rescan*" index) index))))
-          (setq helm-cached-imenu-tick tick))))))
-
-(defun helm-imenu-candidates-in-all-buffers ()
-  (let* ((lst (buffer-list))
-         (progress-reporter (make-progress-reporter
-                             "Imenu indexing buffers..." 1 (length lst))))
-    (prog1
-        (cl-loop for b in lst
-                 for count from 1
-                 for mm = (with-current-buffer b major-mode)
-                 for cmm = (with-helm-current-buffer major-mode)
-                 when (or (with-helm-current-buffer
-                            (derived-mode-p mm))
-                          (with-current-buffer b
-                            (derived-mode-p cmm)))
-                 do (progress-reporter-update progress-reporter count)
-                 and
-                 append (with-current-buffer b
-                          (helm-imenu-candidates b)))
-      (progress-reporter-done progress-reporter))))
-
-(defun helm-imenu--candidates-1 (alist)
-  (cl-loop for elm in alist
-           nconc (if (imenu--subalist-p elm)
-                     (helm-imenu--candidates-1
-                      (cl-loop for (e . v) in (cdr elm) collect
-                               (cons (propertize
-                                      e 'helm-imenu-type (car elm))
-                                     ;; If value is an integer, convert it
-                                     ;; to a marker, otherwise it is a cons cell
-                                     ;; and it will be converted on next recursions.
-                                     ;; (Issue #1060) [1]. 
-                                     (if (integerp v) (copy-marker v) v))))
-                     (and (cdr elm) ; bug in imenu, should not be needed.
-                          (setcdr elm (copy-marker (cdr elm))) ; Same as [1].
-                          (list elm)))))
-
-(defun helm-imenu--get-prop (item)
-  ;; property value of ITEM can have itself
-  ;; a property value which have itself a property value
-  ;; ...and so on; Return a list of all these
-  ;; properties values starting at ITEM.
-  (let* ((prop (get-text-property 0 'helm-imenu-type item))
-         (lst  (list prop item)))
-    (when prop
-      (while prop
-        (setq prop (get-text-property 0 'helm-imenu-type prop))
-        (and prop (push prop lst)))
-      lst)))
-
-(defun helm-imenu-transformer (candidates)
-  (cl-loop for (k . v) in candidates
-        for types = (or (helm-imenu--get-prop k)
-                        (list "Function" k))
-        for bufname = (buffer-name (marker-buffer v))
-        for disp1 = (mapconcat
-                     (lambda (x)
-                       (propertize
-                        x 'face (cond ((string= x "Variables")
-                                       'font-lock-variable-name-face)
-                                      ((string= x "Function")
-                                       'font-lock-function-name-face)
-                                      ((string= x "Types")
-                                       'font-lock-type-face))))
-                     types helm-imenu-delimiter)
-        for disp = (propertize disp1 'help-echo bufname)
-        collect
-        (cons disp (cons k v))))
-
-;;;###autoload
-(defun helm-imenu ()
-  "Preconfigured `helm' for `imenu'."
-  (interactive)
-  (unless helm-source-imenu
-    (setq helm-source-imenu
-          (helm-make-source "Imenu" 'helm-imenu-source
-            :fuzzy-match helm-imenu-fuzzy-match)))
-  (let ((imenu-auto-rescan t)
-        (str (thing-at-point 'symbol))
-        (helm-execute-action-at-once-if-one
-         helm-imenu-execute-action-at-once-if-one))
-    (helm :sources 'helm-source-imenu
-          :default (list (concat "\\_<" str "\\_>") str)
-          :buffer "*helm imenu*")))
-
-;;;###autoload
-(defun helm-imenu-in-all-buffers ()
-  "Preconfigured helm for fetching imenu entries of all buffers."
-  (interactive)
-  (unless helm-source-imenu-all
-    (setq helm-source-imenu-all
-          (helm-make-source "Imenu in all buffers" 'helm-imenu-source
-            :candidates 'helm-imenu-candidates-in-all-buffers
-            :fuzzy-match helm-imenu-fuzzy-match)))
-  (let ((imenu-auto-rescan t)
-        (str (thing-at-point 'symbol))
-        (helm-execute-action-at-once-if-one
-         helm-imenu-execute-action-at-once-if-one))
-    (helm :sources 'helm-source-imenu-all
-          :default (list (concat "\\_<" str "\\_>") str)
-          :buffer "*helm imenu all*")))
-
-(provide 'helm-imenu)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-imenu.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-info.el b/emacs.d/elpa/helm-20150623.1310/helm-info.el
deleted file mode 100644
index e38e64d..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-info.el
+++ /dev/null
@@ -1,183 +0,0 @@
-;;; helm-info.el --- Browse info index with helm -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-plugin)
-
-(declare-function Info-index-nodes "info" (&optional file))
-(declare-function Info-goto-node "info" (&optional fork))
-(declare-function Info-find-node "info.el" (filename nodename &optional no-going-back))
-(defvar Info-history)
-
-
-(defgroup helm-info nil
-  "Info related Applications and libraries for Helm."
-  :group 'helm)
-
-;;; Build info-index sources with `helm-info-source' class.
-;;
-;;
-(cl-defun helm-info-init (&optional (file (helm-attr 'info-file)))
-  ;; Allow reinit candidate buffer when using edebug.
-  (helm-aif (and debug-on-error
-                 (helm-candidate-buffer))
-      (kill-buffer it))
-  (unless (helm-candidate-buffer)
-    (save-window-excursion
-      (info file)
-      (let ((tobuf (helm-candidate-buffer 'global))
-            (infobuf (current-buffer))
-            Info-history
-            start end)
-        (cl-dolist (node (Info-index-nodes))
-          (Info-goto-node node)
-          (goto-char (point-min))
-          (while (search-forward "\n* " nil t)
-            (unless (search-forward "Menu:\n" (1+ (point-at-eol)) t)
-              (setq start (point-at-bol)
-                    end (point-at-eol))
-              (with-current-buffer tobuf
-                (insert-buffer-substring infobuf start end)
-                (insert "\n")))))))))
-
-(defun helm-info-goto (node-line)
-  (Info-goto-node (car node-line))
-  (helm-goto-line (cdr node-line)))
-
-(defun helm-info-display-to-real (line)
-  (and (string-match
-        ;; This regexp is stolen from Info-apropos-matches
-        "\\* +\\([^\n]*.+[^\n]*\\):[ \t]+\\([^\n]*\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?" line)
-       (cons (format "(%s)%s" (helm-attr 'info-file) (match-string 2 line))
-             (string-to-number (or (match-string 3 line) "1")))))
-
-(defclass helm-info-source (helm-source-in-buffer)
-  ((info-file :initarg :info-file
-              :initform nil
-              :custom 'string)
-   (init :initform #'helm-info-init)
-   (display-to-real :initform #'helm-info-display-to-real)
-   (get-line :initform #'buffer-substring)
-   (action :initform '(("Goto node" . helm-info-goto)))))
-
-(defmacro helm-build-info-source (fname &rest args)
-  `(helm-make-source (concat "Info Index: " ,fname) 'helm-info-source
-     :info-file ,fname ,@args))
-
-(defun helm-build-info-index-command (name doc source buffer)
-  "Define an helm command NAME with documentation DOC.
-Arg SOURCE will be an existing helm source named
-`helm-source-info-<NAME>' and BUFFER a string buffer name."
-  (defalias (intern (concat "helm-info-" name))
-      (lambda ()
-        (interactive)
-        (helm :sources source
-              :buffer buffer
-              :candidate-number-limit 1000))
-    doc))
-
-(defun helm-define-info-index-sources (var-value &optional commands)
-  "Define helm sources named helm-source-info-<NAME>.
-Sources are generated for all entries of `helm-default-info-index-list'.
-If COMMANDS arg is non--nil build also commands named `helm-info<NAME>'.
-Where NAME is one of `helm-default-info-index-list'."
-  (cl-loop for str in var-value
-           for sym = (intern (concat "helm-source-info-" str))
-           do (set sym (helm-build-info-source str))
-           when commands
-           do (helm-build-info-index-command
-               str (format "Predefined helm for %s info." str)
-               sym (format "*helm info %s*" str))))
-
-(defun helm-info-index-set (var value)
-  (set var value)
-  (helm-define-info-index-sources value t))
-
-(defcustom helm-default-info-index-list
-  '("elisp" "cl" "org" "gnus" "tramp" "ratpoison"
-    "zsh" "bash" "coreutils" "fileutils"
-    "find" "sh-utils" "textutils" "libc"
-    "make" "automake" "autoconf" "eintr"
-    "emacs" "elib" "eieio" "gauche-refe" "guile"
-    "guile-tut" "goops" "screen" "latex" "gawk"
-    "sed" "m4" "wget" "binutils" "as" "bfd" "gprof"
-    "ld" "diff" "flex" "grep" "gzip" "libtool"
-    "texinfo" "info" "gdb" "stabs" "cvsbook" "cvs"
-    "bison" "id-utils" "global")
-  "Info Manual entries to use for building helm info index commands."
-  :group 'helm-info
-  :type  '(repeat (choice string))
-  :set   'helm-info-index-set)
-
-(defcustom helm-info-default-sources
-  '(helm-source-info-elisp
-    helm-source-info-cl
-    helm-source-info-eieio
-    helm-source-info-pages)
-  "The default sources to use in `helm-info-at-point'."
-  :group 'helm-info
-  :type '(repeat (choice symbol)))
-
-
-;;; Info pages
-(defvar helm-info--pages-cache nil
-  "Cache for all info pages on system.")
-
-(defun helm-info-pages-init ()
-  "Collect candidates for initial Info node Top."
-  (if helm-info--pages-cache
-      helm-info--pages-cache
-    (let ((info-topic-regexp "\\* +\\([^:]+: ([^)]+)[^.]*\\)\\.")
-          topics)
-      (require 'info)
-      (with-temp-buffer
-        (Info-find-node "dir" "top")
-        (goto-char (point-min))
-        (while (re-search-forward info-topic-regexp nil t)
-          (push (match-string-no-properties 1) topics))
-        (kill-buffer))
-      (setq helm-info--pages-cache topics))))
-
-(defvar helm-source-info-pages
-  (helm-build-sync-source "Info Pages"
-    :init #'helm-info-pages-init
-    :candidates (lambda () helm-info--pages-cache)
-    :action '(("Show with Info" .(lambda (node-str)
-                                  (info (replace-regexp-in-string
-                                         "^[^:]+: " "" node-str)))))
-    :requires-pattern 2))
-
-;;;###autoload
-(defun helm-info-at-point ()
-  "Preconfigured `helm' for searching info at point.
-With a prefix-arg insert symbol at point."
-  (interactive)
-  (helm :sources helm-info-default-sources
-        :buffer "*helm info*"))
-
-(provide 'helm-info)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-info.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-locate.el b/emacs.d/elpa/helm-20150623.1310/helm-locate.el
deleted file mode 100644
index b7d3f91..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-locate.el
+++ /dev/null
@@ -1,351 +0,0 @@
-;;; helm-locate.el --- helm interface for locate. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;; NOTE for WINDOZE users:
-;; You have to install Everything with his command line interface here:
-;; http://www.voidtools.com/download.php
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-
-
-(defgroup helm-locate nil
-  "Locate related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-locate-db-file-regexp "m?locate\.db$"
-  "Default regexp to match locate database.
-If nil Search in all files."
-  :type  'string
-  :group 'helm-locate)
-
-(defcustom helm-ff-locate-db-filename "locate.db"
-  "The basename of the locatedb file you use locally in your directories.
-When this is set and `helm' find such a file in the directory from
-where you launch locate, it will use this file and will not prompt you
-for a db file.
-Note that this happen only when locate is launched with a prefix arg."
-  :group 'helm-locate
-  :type 'string)
-
-(defcustom helm-locate-command nil
-  "A list of arguments for locate program.
-Normally you should not have to modify this yourself.
-
-If nil it will be calculated when `helm-locate' startup
-with these default values for different systems:
-
-Gnu/linux: \"locate %s -e -A %s\"
-berkeley-unix: \"locate %s %s\"
-windows-nt: \"es %s %s\"
-Others: \"locate %s %s\"
-
-This string will be passed to format so it should end with `%s'.
-The first format spec is used for the \"-i\" value of locate/es,
-So don't set it directly but use `helm-locate-case-fold-search'
-for this.
-The \"-r\" option must be the last option, however if not specified you will
-be able to specify it during helm invocation by prefixing the pattern
-you enter with \"-r\"."
-  :type 'string
-  :group 'helm-locate)
-
-(defcustom helm-locate-create-db-command
-  "updatedb -l 0 -o %s -U %s"
-  "Command used to create a locale locate db file."
-  :type 'string
-  :group 'helm-locate)
-
-(defcustom helm-locate-case-fold-search helm-case-fold-search
-  "It have the same meaning as `helm-case-fold-search'.
-The -i option of locate will be used depending of value of
-`helm-pattern' when this is set to 'smart.
-When nil \"-i\" will not be used at all.
-and when non--nil it will always be used.
-NOTE: the -i option of the \"es\" command used on windows does
-the opposite of \"locate\" command."
-  :group 'helm-locate
-  :type 'symbol)
-
-(defcustom helm-locate-fuzzy-match nil
-  "Enable fuzzy matching in `helm-locate'."
-  :group 'helm-locate
-  :type 'boolean)
-
-
-(defvar helm-generic-files-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-]")     'helm-ff-run-toggle-basename)
-    (define-key map (kbd "C-s")     'helm-ff-run-grep)
-    (define-key map (kbd "M-g s")   'helm-ff-run-grep)
-    (define-key map (kbd "M-g z")   'helm-ff-run-zgrep)
-    (define-key map (kbd "M-g p")   'helm-ff-run-pdfgrep)
-    (define-key map (kbd "M-R")     'helm-ff-run-rename-file)
-    (define-key map (kbd "M-C")     'helm-ff-run-copy-file)
-    (define-key map (kbd "M-B")     'helm-ff-run-byte-compile-file)
-    (define-key map (kbd "M-L")     'helm-ff-run-load-file)
-    (define-key map (kbd "M-S")     'helm-ff-run-symlink-file)
-    (define-key map (kbd "M-H")     'helm-ff-run-hardlink-file)
-    (define-key map (kbd "M-D")     'helm-ff-run-delete-file)
-    (define-key map (kbd "C-=")     'helm-ff-run-ediff-file)
-    (define-key map (kbd "C-c =")   'helm-ff-run-ediff-merge-file)
-    (define-key map (kbd "C-c o")   'helm-ff-run-switch-other-window)
-    (define-key map (kbd "C-c C-o") 'helm-ff-run-switch-other-frame)
-    (define-key map (kbd "M-i")     'helm-ff-properties-persistent)
-    (define-key map (kbd "C-c C-x") 'helm-ff-run-open-file-externally)
-    (define-key map (kbd "C-c X")   'helm-ff-run-open-file-with-default-tool)
-    (define-key map (kbd "M-.")     'helm-ff-run-etags)
-    (define-key map (kbd "C-w")     'helm-yank-text-at-point)
-    (define-key map (kbd "C-c @")   'helm-ff-run-insert-org-link)
-    (define-key map (kbd "C-c ?")   'helm-generic-file-help)
-    map)
-  "Generic Keymap for files.")
-
-
-(defface helm-locate-finish
-    '((t (:foreground "Green")))
-  "Face used in mode line when locate process is finish."
-  :group 'helm-locate)
-
-
-(defun helm-ff-find-locatedb (&optional from-ff)
-  "Try to find if a local locatedb file is available.
-The search is done in `helm-ff-default-directory' or
-fall back to `default-directory' if FROM-FF is nil."
-  (when helm-ff-locate-db-filename
-    (cond ((and helm-ff-default-directory
-                from-ff
-                (file-exists-p (expand-file-name
-                                helm-ff-locate-db-filename
-                                helm-ff-default-directory))
-                (expand-file-name
-                 helm-ff-locate-db-filename
-                 helm-ff-default-directory)))
-          ((and (not from-ff)
-                (file-exists-p (expand-file-name
-                                helm-ff-locate-db-filename
-                                default-directory))
-                (expand-file-name
-                 helm-ff-locate-db-filename
-                 default-directory))))))
-
-(defun helm-locate-1 (&optional localdb init from-ff default)
-  "Generic function to run Locate.
-Prefix arg LOCALDB when (4) search and use a local locate db file when it
-exists or create it, when (16) force update of existing db file
-even if exists.
-It have no effect when locate command is 'es'.
-INIT is a string to use as initial input in prompt.
-See `helm-locate-with-db' and `helm-locate'."
-  (require 'helm-mode)
-  (helm-locate-set-command)
-  (let ((pfn #'(lambda (candidate)
-                 (if (file-directory-p candidate)
-                     (message "Error: The locate Db should be a file")
-                   (if (= (shell-command
-                           (format helm-locate-create-db-command
-                                   candidate
-                                   helm-ff-default-directory))
-                          0)
-                       (message "New locatedb file `%s' created" candidate)
-                     (error "Failed to create locatedb file `%s'" candidate)))))
-        (locdb (and localdb
-                    (not (string-match "^es" helm-locate-command))
-                    (or (and (equal '(4) localdb)
-                             (helm-ff-find-locatedb from-ff))
-                        (helm-read-file-name
-                         "Create Locate Db file: "
-                         :initial-input (expand-file-name "locate.db"
-                                                          (or helm-ff-default-directory
-                                                              default-directory))
-                         :preselect helm-locate-db-file-regexp
-                         :test #'(lambda (x)
-                                   (if helm-locate-db-file-regexp
-                                       ;; Select only locate db files and directories
-                                       ;; to allow navigation.
-                                       (or (string-match
-                                            helm-locate-db-file-regexp x)
-                                           (file-directory-p x))
-                                     x)))))))
-    (when (and locdb (or (equal localdb '(16))
-                         (not (file-exists-p locdb))))
-      (funcall pfn locdb))
-    (helm-locate-with-db (and localdb locdb) init default)))
-
-(defun helm-locate-set-command ()
-  "Setup `helm-locate-command' if not already defined."
-  (unless helm-locate-command
-    (setq helm-locate-command
-          (cl-case system-type
-            (gnu/linux "locate %s -e -r %s")
-            (berkeley-unix "locate %s %s")
-            (windows-nt "es %s %s")
-            (t "locate %s %s")))))
-
-(defvar helm-file-name-history nil)
-(defun helm-locate-with-db (&optional db initial-input default)
-  "Run locate -d DB.
-If DB is not given or nil use locate without -d option.
-Argument DB can be given as a string or list of db files.
-Argument INITIAL-INPUT is a string to use as initial-input.
-See also `helm-locate'."
-  (when (and db (stringp db)) (setq db (list db)))
-  (helm-locate-set-command)
-  (let ((helm-locate-command
-         (if db
-             (replace-regexp-in-string
-              "locate"
-              (format "locate -d %s"
-                      (mapconcat 'identity
-                                 ;; Remove eventually
-                                 ;; marked directories by error.
-                                 (cl-loop for i in db
-                                       unless (file-directory-p i)
-                                       collect i) ":"))
-              helm-locate-command)
-           helm-locate-command)))
-    (setq helm-file-name-history (mapcar 'helm-basename file-name-history))
-    (helm :sources 'helm-source-locate
-          :buffer "*helm locate*"
-          :ff-transformer-show-only-basename nil
-          :input initial-input
-          :default default
-          :history 'helm-file-name-history)))
-
-(defun helm-locate-init ()
-  "Initialize async locate process for `helm-source-locate'."
-  (let* ((locate-is-es (string-match "\\`es" helm-locate-command))
-         (real-locate (string-match "\\`locate" helm-locate-command))
-         (case-sensitive-flag (if locate-is-es "-i" ""))
-         (ignore-case-flag (if (or locate-is-es
-                                   (not real-locate)) "" "-i"))
-         (args (split-string helm-pattern " "))
-         (cmd (format helm-locate-command
-                      (cl-case helm-locate-case-fold-search
-                        (smart (let ((case-fold-search nil))
-                                 (if (string-match "[[:upper:]]" helm-pattern)
-                                     case-sensitive-flag
-                                     ignore-case-flag)))
-                        (t (if helm-locate-case-fold-search
-                               ignore-case-flag
-                               case-sensitive-flag)))
-                      (concat
-                       ;; The pattern itself.
-                       (shell-quote-argument (car args)) " "
-                       ;; Possible locate args added
-                       ;; after pattern, don't quote them.
-                       (mapconcat 'identity (cdr args) " ")))))
-    (helm-log "Starting helm-locate process")
-    (helm-log "Command line used was:\n\n%s"
-              (concat ">>> " (propertize cmd 'face 'font-lock-comment-face) "\n\n"))
-    (prog1
-        (start-process-shell-command
-         "locate-process" helm-buffer
-         cmd)
-      (set-process-sentinel
-       (get-buffer-process helm-buffer)
-       #'(lambda (_process event)
-           (if (string= event "finished\n")
-               (with-helm-window
-                 (setq mode-line-format
-                       '(" " mode-line-buffer-identification " "
-                         (:eval (format "L%s" (helm-candidate-number-at-point))) " "
-                         (:eval (propertize
-                                 (format "[Locate process finished - (%s results)]"
-                                         (max (1- (count-lines
-                                                   (point-min) (point-max)))
-                                              0))
-                                 'face 'helm-locate-finish))))
-                 (force-mode-line-update))
-             (helm-log "Error: Locate %s"
-                       (replace-regexp-in-string "\n" "" event))))))))
-
-(defclass helm-locate-source (helm-source-async helm-type-file)
-  ((init :initform 'helm-locate-set-command)
-   (candidates-process :initform 'helm-locate-init)
-   (requires-pattern :initform 3)
-   (history :initform 'helm-file-name-history)
-   (keymap :initform helm-generic-files-map)
-   (help-message :initform helm-generic-file-help-message)
-   (candidate-number-limit :initform 9999)
-   (mode-line :initform helm-generic-file-mode-line-string)))
-
-(defvar helm-source-locate
-  (helm-make-source "Locate" 'helm-locate-source
-    :pattern-transformer 'helm-locate-pattern-transformer))
-
-(defun helm-locate-pattern-transformer (pattern)
-  (if helm-locate-fuzzy-match
-      (cond ((string-match
-              " " (replace-regexp-in-string " -b" "" pattern)) pattern)
-            ((string-match "\\([^ ]*\\) -b" pattern)
-             (concat (helm--mapconcat-pattern
-                      (match-string 1 pattern)) " -b"))
-            (t (helm--mapconcat-pattern pattern)))
-      pattern))
-
-;;;###autoload
-(defun helm-locate-read-file-name (prompt)
-  (let* ((src `((name . "Locate read fname")
-                (init . helm-locate-set-command)
-                (candidates-process . helm-locate-init)
-                (action . identity)
-                (requires-pattern . 3)
-                (history . ,'helm-file-name-history)
-                (candidate-transformer . (helm-skip-boring-files
-                                          helm-highlight-files))
-                (candidate-number-limit . 9999)
-                (no-matchplugin))))
-    (or (helm :sources src
-              :ff-transformer-show-only-basename nil
-              :prompt prompt
-              :buffer "*helm locate read fname*"
-              :resume 'noresume)
-        (keyboard-quit))))
-
-;;;###autoload
-(defun helm-locate (arg)
-  "Preconfigured `helm' for Locate.
-Note: you can add locate options after entering pattern.
-See 'man locate' for valid options and also `helm-locate-command'.
-
-You can specify a local database with prefix argument ARG.
-With two prefix arg, refresh the current local db or create it
-if it doesn't exists.
-Many databases can be used: navigate and mark them.
-See also `helm-locate-with-db'.
-
-To create a user specific db, use
-\"updatedb -l 0 -o db_path -U directory\".
-Where db_path is a filename matched by
-`helm-locate-db-file-regexp'."
-  (interactive "P")
-  (setq helm-ff-default-directory default-directory)
-  (helm-locate-1 arg))
-
-(provide 'helm-locate)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-locate.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-man.el b/emacs.d/elpa/helm-20150623.1310/helm-man.el
deleted file mode 100644
index 392ad93..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-man.el
+++ /dev/null
@@ -1,114 +0,0 @@
-;;; helm-man.el --- Man and woman UI -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-
-(defvar woman-topic-all-completions)
-(defvar woman-manpath)
-(defvar woman-path)
-(defvar woman-expanded-directory-path)
-(declare-function woman-file-name "woman.el" (topic &optional re-cache))
-(declare-function woman-file-name-all-completions "woman.el" (topic))
-(declare-function Man-getpage-in-background "man.el" (topic))
-(declare-function woman-expand-directory-path "woman.el" (path-dirs path-regexps))
-(declare-function woman-topic-all-completions "woman.el" (path))
-(declare-function helm-generic-sort-fn "helm-utils.el" (S1 S2))
-
-(defgroup helm-man nil
-  "Man and Woman applications for helm."
-  :group 'helm)
-
-(defcustom helm-man-or-woman-function 'Man-getpage-in-background
-  "Default command to display a man page."
-  :group 'helm-man
-  :type '(radio :tag "Preferred command to display a man page"
-          (const :tag "Man" Man-getpage-in-background)
-          (const :tag "Woman" woman)))
-
-(defcustom helm-man-format-switches "-l %s"
-  "Arguments to pass to the `manual-entry' function.
-Arguments are passed to `manual-entry' with `format.'
-Default use \"-l\" which may not be supported on old man versions,
-in this case use \"%s\" as value to pass only the filename as argument.
-See Issue #1035"
-  :group 'helm-man
-  :type 'string)
-
-;; Internal
-(defvar helm-man--pages nil
-  "All man pages on system.
-Will be calculated the first time you invoke helm with this
-source.")
-
-(defun helm-man-default-action (candidate)
-  "Default action for jumping to a woman or man page from helm."
-  (let ((wfiles (mapcar
-                 'car (woman-file-name-all-completions candidate))))
-    (condition-case nil
-        (if (> (length wfiles) 1)
-            (let ((file (helm-comp-read
-                         "ManFile: " wfiles :must-match t)))
-              (if (eq helm-man-or-woman-function 'Man-getpage-in-background)
-                  (manual-entry (format helm-man-format-switches file))
-                  (woman-find-file file)))
-          (funcall helm-man-or-woman-function candidate))
-      ;; If woman is unable to format correctly
-      ;; use man instead.
-      (error (kill-buffer)              ; Kill woman buffer.
-             (Man-getpage-in-background candidate)))))
-
-(defun helm-man--init ()
-  (require 'woman)
-  (require 'helm-utils)
-  (unless helm-man--pages
-    (setq woman-expanded-directory-path
-          (woman-expand-directory-path woman-manpath woman-path))
-    (setq woman-topic-all-completions
-          (woman-topic-all-completions woman-expanded-directory-path))
-    (setq helm-man--pages (mapcar 'car woman-topic-all-completions)))
-  (helm-init-candidates-in-buffer 'global helm-man--pages))
-
-(defvar helm-source-man-pages
-  (helm-build-in-buffer-source "Manual Pages"
-    :init #'helm-man--init 
-    :persistent-action #'ignore
-    :filtered-candidate-transformer
-     (lambda (candidates _source)
-       (sort candidates #'helm-generic-sort-fn))
-    :action  '(("Display Man page" . helm-man-default-action))))
-
-;;;###autoload
-(defun helm-man-woman (arg)
-  "Preconfigured `helm' for Man and Woman pages.
-With a prefix arg reinitialize the cache."
-  (interactive "P")
-  (when arg (setq helm-man--pages nil))
-    (helm :sources 'helm-source-man-pages
-          :buffer "*Helm man woman*"))
-
-(provide 'helm-man)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-man.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-match-plugin.el b/emacs.d/elpa/helm-20150623.1310/helm-match-plugin.el
deleted file mode 100644
index c95bfb5..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-match-plugin.el
+++ /dev/null
@@ -1,331 +0,0 @@
-;;; helm-match-plugin.el --- Multiple regexp matching methods for helm -*- lexical-binding: t -*-
-
-;; Original Author: rubikitch
-
-;; Copyright (C) 2008 ~ 2011 rubikitch
-;; Copyright (C) 2011 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
-;; URL: http://github.com/emacs-helm/helm
-
-;; 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/>.
-
-;;; Code:
-
-(require 'helm)
-(require 'cl-lib)
-
-
-(defgroup helm-match-plugin nil
-  "Helm match plugin."
-  :group 'helm)
-
-(defcustom helm-mp-matching-method 'multi3
-  "Matching method for helm match plugin.
-You can set here different methods to match candidates in helm.
-Here are the possible value of this symbol and their meaning:
-- multi1: Respect order, prefix of pattern must match.
-- multi2: Same but with partial match.
-- multi3: The best, multiple regexp match, allow negation.
-- multi3p: Same but prefix must match.
-Default is multi3."
-  :type  '(radio :tag "Matching methods for helm"
-           (const :tag "Multiple regexp 1 ordered with prefix match"         multi1)
-           (const :tag "Multiple regexp 2 ordered with partial match"        multi2)
-           (const :tag "Multiple regexp 3 matching no order, partial, best." multi3)
-           (const :tag "Multiple regexp 3p matching with prefix match"       multi3p))
-  :group 'helm-match-plugin)
-
-
-;; Internal
-(defconst helm-mp-default-match-functions
-  '(helm-mp-exact-match helm-mp-match))
-(defconst helm-mp-default-search-functions
-  '(helm-mp-exact-search helm-mp-search))
-
-
-;;; Build regexps
-;;
-;;
-(defvar helm-mp-space-regexp "[\\ ] "
-  "Regexp to represent space itself in multiple regexp match.")
-
-(defun helm-mp-split-pattern (pattern)
-  "Split PATTERN if it contain spaces and return resulting list.
-If spaces in PATTERN are escaped, don't split at this place.
-i.e \"foo bar\"=> (\"foo\" \"bar\")
-but \"foo\ bar\"=> (\"foobar\")."
-  (if (string= pattern "")
-      '("")
-    (cl-loop for s in (split-string
-                       (replace-regexp-in-string helm-mp-space-regexp
-                                                 "\000\000" pattern)
-                       " " t)
-          collect (replace-regexp-in-string "\000\000" " " s))))
-
-(defun helm-mp-1-make-regexp (pattern)
-  "Replace spaces in PATTERN with \"\.*\"."
-  (mapconcat 'identity (helm-mp-split-pattern pattern) ".*"))
-
-
-;;; Exact match.
-;;
-;;
-;; Internal.
-(defvar helm-mp-exact-pattern-str nil)
-(defvar helm-mp-exact-pattern-real nil)
-
-(defun helm-mp-exact-get-pattern (pattern)
-  (unless (equal pattern helm-mp-exact-pattern-str)
-    (setq helm-mp-exact-pattern-str pattern
-          helm-mp-exact-pattern-real (concat "\n" pattern "\n")))
-  helm-mp-exact-pattern-real)
-
-
-(defun helm-mp-exact-match (str &optional pattern)
-  (string= str (or pattern helm-pattern)))
-
-(defun helm-mp-exact-search (pattern &rest _ignore)
-  (and (search-forward (helm-mp-exact-get-pattern pattern) nil t)
-       (forward-line -1)))
-
-
-;;; Prefix match
-;;
-;;
-;; Internal
-(defvar helm-mp-prefix-pattern-str nil)
-(defvar helm-mp-prefix-pattern-real nil)
-
-(defun helm-mp-prefix-get-pattern (pattern)
-  (unless (equal pattern helm-mp-prefix-pattern-str)
-    (setq helm-mp-prefix-pattern-str pattern
-          helm-mp-prefix-pattern-real (concat "\n" pattern)))
-  helm-mp-prefix-pattern-real)
-
-(defun helm-mp-prefix-match (str &optional pattern)
-  (setq pattern (or pattern helm-pattern))
-  (let ((len (length pattern)))
-    (and (<= len (length str))
-         (string= (substring str 0 len) pattern ))))
-
-(defun helm-mp-prefix-search (pattern &rest _ignore)
-  (search-forward (helm-mp-prefix-get-pattern pattern) nil t))
-
-
-;;; Multiple regexp patterns 1 (order is preserved / prefix).
-;;
-;;
-;; Internal
-(defvar helm-mp-1-pattern-str nil)
-(defvar helm-mp-1-pattern-real nil)
-
-(defun helm-mp-1-get-pattern (pattern)
-  (unless (equal pattern helm-mp-1-pattern-str)
-    (setq helm-mp-1-pattern-str pattern
-          helm-mp-1-pattern-real
-          (concat "^" (helm-mp-1-make-regexp pattern))))
-  helm-mp-1-pattern-real)
-
-(cl-defun helm-mp-1-match (str &optional (pattern helm-pattern))
-  (string-match (helm-mp-1-get-pattern pattern) str))
-
-(defun helm-mp-1-search (pattern &rest _ignore)
-  (re-search-forward (helm-mp-1-get-pattern pattern) nil t))
-
-
-;;; Multiple regexp patterns 2 (order is preserved / partial).
-;;
-;;
-;; Internal
-(defvar helm-mp-2-pattern-str nil)
-(defvar helm-mp-2-pattern-real nil)
-
-(defun helm-mp-2-get-pattern (pattern)
-  (unless (equal pattern helm-mp-2-pattern-str)
-    (setq helm-mp-2-pattern-str pattern
-          helm-mp-2-pattern-real
-          (concat "^.*" (helm-mp-1-make-regexp pattern))))
-  helm-mp-2-pattern-real)
-
-(cl-defun helm-mp-2-match (str &optional (pattern helm-pattern))
-  (string-match (helm-mp-2-get-pattern pattern) str))
-
-(defun helm-mp-2-search (pattern &rest _ignore)
-  (re-search-forward (helm-mp-2-get-pattern pattern) nil t))
-
-
-;;; Multiple regexp patterns 3 (permutation).
-;;
-;;
-;; Internal
-(defvar helm-mp-3-pattern-str nil)
-(defvar helm-mp-3-pattern-list nil)
-
-(defun helm-mp-3-get-patterns (pattern)
-  "Return `helm-mp-3-pattern-list', a list of predicate/regexp cons cells.
-e.g ((identity . \"foo\") (identity . \"bar\")).
-This is done only if `helm-mp-3-pattern-str' is same as PATTERN."
-  (unless (equal pattern helm-mp-3-pattern-str)
-    (setq helm-mp-3-pattern-str pattern
-          helm-mp-3-pattern-list
-          (helm-mp-3-get-patterns-internal pattern)))
-  helm-mp-3-pattern-list)
-
-(defun helm-mp-3-get-patterns-internal (pattern)
-  "Return a list of predicate/regexp cons cells.
-e.g ((identity . \"foo\") (identity . \"bar\"))."
-  (unless (string= pattern "")
-    (cl-loop for pat in (helm-mp-split-pattern pattern)
-          collect (if (string= "!" (substring pat 0 1))
-                      (cons 'not (substring pat 1))
-                    (cons 'identity pat)))))
-
-(cl-defun helm-mp-3-match (str &optional (pattern helm-pattern))
-  "Check if PATTERN match STR.
-When PATTERN contain a space, it is splitted and matching is done
-with the several resulting regexps against STR.
-e.g \"bar foo\" will match \"foobar\" and \"barfoo\".
-Argument PATTERN, a string, is transformed in a list of
-cons cell with `helm-mp-3-get-patterns' if it contain a space.
-e.g \"foo bar\"=>((identity . \"foo\") (identity . \"bar\")).
-Then each predicate of cons cell(s) is called with regexp of same
-cons cell against STR (a candidate).
-i.e (identity (string-match \"foo\" \"foo bar\")) => t."
-  (let ((pat (helm-mp-3-get-patterns pattern)))
-    (cl-loop for (predicate . regexp) in pat
-             always (funcall predicate
-                             (condition-case _err
-                                 ;; FIXME: Probably do nothing when
-                                 ;; using fuzzy leaving the job
-                                 ;; to the fuzzy fn.
-                                 (string-match regexp str)
-                               (invalid-regexp nil))))))
-
-(defun helm-mp-3-search-base (pattern searchfn1 searchfn2)
-  "Try to find PATTERN in `helm-buffer' with SEARCHFN1 and SEARCHFN2.
-This is the search function for `candidates-in-buffer' enabled sources.
-Use the same method as `helm-mp-3-match' except it search in buffer
-instead of matching on a string.
-i.e (identity (re-search-forward \"foo\" (point-at-eol) t)) => t."
-  (cl-loop with pat = (if (stringp pattern)
-                          (helm-mp-3-get-patterns pattern)
-                          pattern)
-           when (eq (caar pat) 'not) return
-           ;; Pass the job to `helm-search-match-part'.
-           (prog1 (list (point-at-bol) (point-at-eol))
-             (forward-line 1))
-           while (condition-case _err
-                     (funcall searchfn1 (or (cdar pat) "") nil t)
-                   (invalid-regexp nil))
-           for bol = (point-at-bol)
-           for eol = (point-at-eol)
-           if (cl-loop for (pred . str) in (cdr pat) always
-                       (progn (goto-char bol)
-                              (funcall pred (condition-case _err
-                                                (funcall searchfn2 str eol t)
-                                              (invalid-regexp nil)))))
-           do (goto-char eol) and return t
-           else do (goto-char eol)
-           finally return nil))
-
-(defun helm-mp-3-search (pattern &rest _ignore)
-  (when (stringp pattern)
-    (setq pattern (helm-mp-3-get-patterns pattern)))
-  (helm-mp-3-search-base
-   pattern 're-search-forward 're-search-forward))
-
-
-;;; mp-3p- (multiple regexp pattern 3 with prefix search)
-;;
-;;
-(defun helm-mp-3p-match (str &optional pattern)
-  "Check if PATTERN match STR.
-Same as `helm-mp-3-match' but more strict, matching against prefix also.
-e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to
-`helm-mp-3-match'."
-  (let* ((pat (helm-mp-3-get-patterns (or pattern helm-pattern)))
-         (first (car pat)))
-    (and (funcall (car first) (helm-mp-prefix-match str (cdr first)))
-         (cl-loop for (predicate . regexp) in (cdr pat)
-               always (funcall predicate (string-match regexp str))))))
-
-(defun helm-mp-3p-search (pattern &rest _ignore)
-  (when (stringp pattern)
-    (setq pattern (helm-mp-3-get-patterns pattern)))
-  (helm-mp-3-search-base
-   pattern 'helm-mp-prefix-search 're-search-forward))
-
-
-;;; Generic multi-match/search functions
-;;
-;;
-(cl-defun helm-mp-match (str &optional (pattern helm-pattern))
-  (let ((fun (cl-ecase helm-mp-matching-method
-               (multi1 #'helm-mp-1-match)
-               (multi2 #'helm-mp-2-match)
-               (multi3 #'helm-mp-3-match)
-               (multi3p #'helm-mp-3p-match))))
-    (funcall fun str pattern)))
-
-(defun helm-mp-search (pattern &rest _ignore)
-  (let ((fun (cl-ecase helm-mp-matching-method
-               (multi1 #'helm-mp-1-search)
-               (multi2 #'helm-mp-2-search)
-               (multi3 #'helm-mp-3-search)
-               (multi3p #'helm-mp-3p-search))))
-    (funcall fun pattern)))
-
-
-;;; source compiler
-;;  This is used only in old sources defined without helm-source.
-;;
-(defun helm-compile-source--match-plugin (source)
-  (if (assoc 'no-matchplugin source)
-      source
-    (let* ((searchers        helm-mp-default-search-functions)
-           (defmatch         (helm-aif (assoc-default 'match source)
-                                 (helm-mklist it)))
-           (defmatch-strict  (helm-aif (assoc-default 'match-strict source)
-                                 (helm-mklist it)))
-           (defsearch        (helm-aif (assoc-default 'search source)
-                                 (helm-mklist it)))
-           (defsearch-strict (helm-aif (assoc-default 'search-strict source)
-                                 (helm-mklist it)))
-           (matchfns         (cond (defmatch-strict)
-                                   (defmatch
-                                    (append helm-mp-default-match-functions defmatch))
-                                   (t helm-mp-default-match-functions)))
-           (searchfns        (cond (defsearch-strict)
-                                   (defsearch
-                                    (append searchers defsearch))
-                                   (t searchers))))
-      `(,(if (assoc 'candidates-in-buffer source)
-             `(search ,@searchfns) `(match ,@matchfns))
-         ,@source))))
-
-
-;; Enable match-plugin by default in old sources.
-(add-to-list 'helm-compile-source-functions 'helm-compile-source--match-plugin)
-
-(provide 'helm-match-plugin)
-
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-match-plugin.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-misc.el b/emacs.d/elpa/helm-20150623.1310/helm-misc.el
deleted file mode 100644
index 28a26d3..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-misc.el
+++ /dev/null
@@ -1,319 +0,0 @@
-;;; helm-misc.el --- Various functions for helm -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-
-
-(defgroup helm-misc nil
-  "Various Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-time-zone-home-location "Paris"
-  "The time zone of your home"
-  :group 'helm-misc
-  :type 'string)
-
-(defcustom helm-mini-default-sources '(helm-source-buffers-list
-                                       helm-source-recentf
-                                       helm-source-buffer-not-found)
-  "Default sources list used in `helm-mini'."
-  :group 'helm-misc
-  :type '(repeat (choice symbol)))
-
-(defface helm-time-zone-current
-    '((t (:foreground "green")))
-  "Face used to colorize current time in `helm-world-time'."
-  :group 'helm-misc)
-
-(defface helm-time-zone-home
-    '((t (:foreground "red")))
-  "Face used to colorize home time in `helm-world-time'."
-  :group 'helm-misc)
-
-
-
-;;; Latex completion
-(defvar LaTeX-math-menu)
-(defun helm-latex-math-candidates ()
-  "Collect candidates for latex math completion."
-  (cl-loop for i in (cddr LaTeX-math-menu)
-        for elm = (cl-loop for s in i when (vectorp s)
-                        collect (cons (aref s 0) (aref s 1)))
-        append elm))
-
-(defvar helm-source-latex-math
-  '((name . "Latex Math Menu")
-    (init . (lambda ()
-              (with-helm-current-buffer
-                (LaTeX-math-mode 1))))
-    (candidate-number-limit . 9999)
-    (candidates . helm-latex-math-candidates)
-    (action . (lambda (candidate)
-                (call-interactively candidate)))))
-
-
-;;; Jabber Contacts (jabber.el)
-(defun helm-jabber-online-contacts ()
-  "List online Jabber contacts."
-  (with-no-warnings
-    (cl-loop for item in (jabber-concat-rosters)
-          when (get item 'connected)
-          collect
-          (if (get item 'name)
-              (cons (get item 'name) item)
-            (cons (symbol-name item) item)))))
-
-(defvar helm-source-jabber-contacts
-  '((name . "Jabber Contacts")
-    (init . (lambda () (require 'jabber)))
-    (candidates . (lambda () (mapcar 'car (helm-jabber-online-contacts))))
-    (action . (lambda (x)
-                (jabber-chat-with
-                 (jabber-read-account)
-                 (symbol-name
-                  (cdr (assoc x (helm-jabber-online-contacts)))))))))
-
-;;; World time
-;;
-(defun helm-time-zone-transformer (candidates _source)
-  (cl-loop for i in candidates
-        collect
-        (cond ((string-match (format-time-string "%H:%M" (current-time)) i)
-               (propertize i 'face 'helm-time-zone-current))
-              ((string-match helm-time-zone-home-location i)
-               (propertize i 'face 'helm-time-zone-home))
-              (t i))))
-
-(defvar helm-source-time-world
-  '((name . "Time World List")
-    (init . (lambda ()
-              (require 'time)
-              (let ((helm-buffer (helm-candidate-buffer 'global)))
-                (with-current-buffer helm-buffer
-                  (display-time-world-display display-time-world-list)))))
-    (candidates-in-buffer)
-    (filtered-candidate-transformer . helm-time-zone-transformer)))
-
-;;; LaCarte
-;;
-;;
-(declare-function lacarte-get-overall-menu-item-alist "ext:lacarte.el" (&optional MAPS))
-
-(defun helm-lacarte-candidate-transformer (cands)
-  (mapcar (lambda (cand)
-            (let* ((item (car cand))
-                   (match (string-match "[^>] \\((.*)\\)$" item)))
-              (when match
-                (put-text-property (match-beginning 1) (match-end 1)
-                                   'face 'helm-M-x-key item))
-              cand))
-          cands))
-
-(defclass helm-lacarte (helm-source-sync helm-type-command)
-    ((init :initform (lambda () (require 'lacarte)))
-     (candidates :initform 'helm-lacarte-get-candidates)
-     (candidate-transformer :initform 'helm-lacarte-candidate-transformer)
-     (candidate-number-limit :initform 9999)))
-
-(defun helm-lacarte-get-candidates (&optional maps)
-  "Extract candidates for menubar using lacarte.el.
-See http://www.emacswiki.org/cgi-bin/wiki/download/lacarte.el.
-Optional argument MAPS is a list specifying which keymaps to use: it
-can contain the symbols `local', `global', and `minor', mean the
-current local map, current global map, and all current minor maps."
-  (with-helm-current-buffer
-    ;; FIXME: do we still need to remove possible '(nil) candidates.
-    (lacarte-get-overall-menu-item-alist maps)))
-
-;;;###autoload
-(defun helm-browse-menubar ()
-  "Preconfigured helm to the menubar using lacarte.el."
-  (interactive)
-  (require 'lacarte)
-  (helm :sources (mapcar 
-                  (lambda (spec) (helm-make-source (car spec) 'helm-lacarte
-                              :candidates (lambda () (helm-lacarte-get-candidates (cdr spec)))))
-                  '(("Major Mode"  . (local))
-                    ("Minor Modes" . (minor))
-                    ("Global Map"  . (global))))
-        :buffer "*helm lacarte*"))
-
-(defun helm-call-interactively (cmd-or-name)
-  "Execute CMD-OR-NAME as Emacs command.
-It is added to `extended-command-history'.
-`helm-current-prefix-arg' is used as the command's prefix argument."
-  (setq extended-command-history
-        (cons (helm-stringify cmd-or-name)
-              (delete (helm-stringify cmd-or-name) extended-command-history)))
-  (let ((current-prefix-arg helm-current-prefix-arg)
-        (cmd (helm-symbolify cmd-or-name)))
-    (if (stringp (symbol-function cmd))
-        (execute-kbd-macro (symbol-function cmd))
-      (setq this-command cmd)
-      (call-interactively cmd))))
-
-;;; Minibuffer History
-;;
-;;
-(defvar helm-source-minibuffer-history
-  (helm-build-sync-source "Minibuffer History"
-    :header-name (lambda (name)
-                   (format "%s (%s)" name minibuffer-history-variable))
-    :candidates
-     (lambda ()
-       (let ((history (cl-loop for i in
-                               (symbol-value minibuffer-history-variable)
-                               unless (string= "" i) collect i)))
-         (if (consp (car history))
-             (mapcar 'prin1-to-string history)
-             history)))
-    :migemo t
-    :multiline t
-    :action (lambda (candidate)
-              (delete-minibuffer-contents)
-              (insert candidate))))
-
-;;; Shell history
-;;
-;;
-(defun helm-comint-input-ring-action (candidate)
-  "Default action for comint history."
-  (with-helm-current-buffer
-    (delete-region (comint-line-beginning-position) (point-max))
-    (insert candidate)))
-
-(defvar helm-source-comint-input-ring
-  '((name . "Comint history")
-    (candidates . (lambda ()
-                    (with-helm-current-buffer
-                      (ring-elements comint-input-ring))))
-    (action . helm-comint-input-ring-action))
-  "Source that provide helm completion against `comint-input-ring'.")
-
-
-;;; Helm ratpoison UI
-;;
-;;
-(defvar helm-source-ratpoison-commands
-  '((name . "Ratpoison Commands")
-    (init . helm-ratpoison-commands-init)
-    (candidates-in-buffer)
-    (action ("Execute the command" . helm-ratpoison-commands-execute))
-    (display-to-real . helm-ratpoison-commands-display-to-real)
-    (candidate-number-limit)))
-
-(defun helm-ratpoison-commands-init ()
-  (unless (helm-candidate-buffer)
-    (with-current-buffer (helm-candidate-buffer 'global)
-      ;; with ratpoison prefix key
-      (save-excursion
-        (call-process "ratpoison" nil (current-buffer) nil "-c" "help"))
-      (while (re-search-forward "^\\([^ ]+\\) \\(.+\\)$" nil t)
-        (replace-match "<ratpoison> \\1: \\2"))
-      (goto-char (point-max))
-      ;; direct binding
-      (save-excursion
-        (call-process "ratpoison" nil (current-buffer) nil "-c" "help top"))
-      (while (re-search-forward "^\\([^ ]+\\) \\(.+\\)$" nil t)
-        (replace-match "\\1: \\2")))))
-
-(defun helm-ratpoison-commands-display-to-real (display)
-  (and (string-match ": " display)
-       (substring display (match-end 0))))
-
-(defun helm-ratpoison-commands-execute (candidate)
-  (call-process "ratpoison" nil nil nil "-ic" candidate))
-
-;;; Helm stumpwm UI
-;;
-;;
-(defvar helm-source-stumpwm-commands
-  '((name . "Stumpwm Commands")
-    (init . helm-stumpwm-commands-init)
-    (candidates-in-buffer)
-    (action ("Execute the command" . helm-stumpwm-commands-execute))
-    (candidate-number-limit)))
-
-(defun helm-stumpwm-commands-init ()
-  (with-current-buffer (helm-candidate-buffer 'global)
-    (save-excursion
-      (call-process "stumpish" nil (current-buffer) nil "commands"))
-    (while (re-search-forward "[ ]*\\([^ ]+\\)[ ]*\n?" nil t)
-      (replace-match "\n\\1\n"))
-    (delete-blank-lines)
-    (sort-lines nil (point-min) (point-max))
-    (goto-char (point-max))))
-
-(defun helm-stumpwm-commands-execute (candidate)
-  (call-process "stumpish" nil nil nil  candidate))
-
-;;;###autoload
-(defun helm-world-time ()
-  "Preconfigured `helm' to show world time."
-  (interactive)
-  (helm-other-buffer 'helm-source-time-world "*helm world time*"))
-
-;;;###autoload
-(defun helm-insert-latex-math ()
-  "Preconfigured helm for latex math symbols completion."
-  (interactive)
-  (helm-other-buffer 'helm-source-latex-math "*helm latex*"))
-
-;;;###autoload
-(defun helm-ratpoison-commands ()
-  "Preconfigured `helm' to execute ratpoison commands."
-  (interactive)
-  (helm-other-buffer 'helm-source-ratpoison-commands
-                     "*helm ratpoison commands*"))
-
-;;;###autoload
-(defun helm-stumpwm-commands()
-  "Preconfigured helm for stumpwm commands."
-  (interactive)
-  (helm-other-buffer 'helm-source-stumpwm-commands
-                     "*helm stumpwm commands*"))
-
-;;;###autoload
-(defun helm-minibuffer-history ()
-  "Preconfigured `helm' for `minibuffer-history'."
-  (interactive)
-  (let ((enable-recursive-minibuffers t))
-    (helm :sources 'helm-source-minibuffer-history
-          :buffer "*helm minibuffer-history*")))
-
-;;;###autoload
-(defun helm-comint-input-ring ()
-  "Preconfigured `helm' that provide completion of `comint' history."
-  (interactive)
-  (when (derived-mode-p 'comint-mode)
-    (helm :sources 'helm-source-comint-input-ring
-          :input (buffer-substring-no-properties (comint-line-beginning-position)
-                                                 (point-at-eol))
-          :buffer "*helm comint history*")))
-
-
-(provide 'helm-misc)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-misc.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-mode.el b/emacs.d/elpa/helm-20150623.1310/helm-mode.el
deleted file mode 100644
index d05bb2f..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-mode.el
+++ /dev/null
@@ -1,1135 +0,0 @@
-;;; helm-mode.el --- Enable helm completion everywhere. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-files)
-
-
-(defgroup helm-mode nil
-  "Enable helm completion."
-  :group 'helm)
-
-(defcustom helm-completing-read-handlers-alist
-  '((describe-function . helm-completing-read-symbols)
-    (describe-variable . helm-completing-read-symbols)
-    (debug-on-entry . helm-completing-read-symbols)
-    (find-function . helm-completing-read-symbols)
-    (trace-function . helm-completing-read-symbols)
-    (trace-function-foreground . helm-completing-read-symbols)
-    (trace-function-background . helm-completing-read-symbols)
-    (find-tag . helm-completing-read-with-cands-in-buffer)
-    (ffap-alternate-file . nil)
-    (tmm-menubar . nil))
-  "Alist of handlers to replace `completing-read', `read-file-name' in `helm-mode'.
-Each entry is a cons cell like \(emacs_command . completing-read_handler\)
-where key and value are symbols.
-
-Each key is an Emacs command that use originaly `completing-read'.
-
-Each value maybe an helm function that take same arguments as
-`completing-read' plus NAME and BUFFER, where NAME is the name of the new
-helm source and BUFFER the name of the buffer we will use.
-This function prefix name must start by \"helm\".
-
-See `helm-completing-read-symbols' for example.
-
-Note that this function will be reused for ALL the `completing-read'
-of this command, so it should handle all cases, e.g
-If first `completing-read' complete against symbols and
-second `completing-read' should handle only buffer,
-your specialized function should handle the both.
-
-If the value of an entry is nil completion will fall back to
-emacs vanilla behavior.
-e.g If you want to disable helm completion for `describe-function':
-\(describe-function . nil\).
-
-Ido is also supported, you can use `ido-completing-read' and
-`ido-read-file-name' as value of an entry or just 'ido.
-e.g ido completion for `find-file':
-\(find-file . ido\)
-same as
-\(find-file . ido-read-file-name\)
-Note that you don't need to enable `ido-mode' for this to work."
-  :group 'helm-mode
-  :type '(alist :key-type symbol :value-type symbol))
-
-(defcustom helm-comp-read-case-fold-search helm-case-fold-search
-  "Default Local setting of `helm-case-fold-search' for `helm-comp-read'.
-See `helm-case-fold-search' for more info."
-  :group 'helm-mode
-  :type 'symbol)
-
-(defcustom helm-mode-handle-completion-in-region t
-  "Whether to replace or not `completion-in-region-function'.
-This enable support for `completing-read-multiple' and `completion-at-point'
-when non--nil."
-  :group 'helm-mode
-  :type 'boolean)
-
-(defcustom helm-mode-reverse-history t
-  "Display history source after current source in `helm-mode' handled commands."
-  :group 'helm-mode
-  :type 'boolean)
-
-(defcustom helm-mode-no-completion-in-region-in-modes nil
-  "A list of modes that do not want helm for `completion-in-region'."
-  :group 'helm-mode
-  :type 'boolean)
-
-(defcustom helm-completion-in-region-fuzzy-match nil
-  "Whether `helm-completion-in-region' use fuzzy matching or not.
-Affect among others `completion-at-point', `completing-read-multiple'."
-  :group 'helm-mode
-  :type 'boolean)
-
-
-(defvar helm-comp-read-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "<C-return>") 'helm-cr-empty-string)
-    (define-key map (kbd "<M-RET>") 'helm-cr-empty-string)
-    map)
-  "Keymap for `helm-comp-read'.")
-
-
-;;; Internal
-;;
-;;
-;; Flag to know if `helm-pattern' have been added
-;; to candidate list in `helm-comp-read'.
-(defvar helm-cr-unknown-pattern-flag nil)
-
-
-;;; Helm `completing-read' replacement
-;;
-;;
-(defun helm-cr-empty-string ()
-  "Return empty string."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action
-     #'(lambda (_candidate)
-         (identity "")))))
-
-(defun helm-mode--keyboard-quit ()
-  ;; Use this instead of `keyboard-quit'
-  ;; to avoid deactivating mark in current-buffer.
-  (let ((debug-on-quit nil))
-    (signal 'quit nil)))
-
-(defun helm-comp-read-get-candidates (collection &optional test sort-fn alistp)
-  "Convert COLLECTION to list removing elements that don't match TEST.
-See `helm-comp-read' about supported COLLECTION arguments.
-
-SORT-FN is a predicate to sort COLLECTION.
-
-ALISTP when non--nil will not use `all-completions' to collect
-candidates because it doesn't handle alists correctly for helm.
-i.e In `all-completions' the car of each pair is used as value.
-In helm we want to use the cdr instead like \(display . real\),
-so we return the alist as it is with no transformation by all-completions.
-
-e.g
-
-\(setq A '((a . 1) (b . 2) (c . 3)))
-==>((a . 1) (b . 2) (c . 3))
-\(helm-comp-read \"test: \" A :alistp nil
-                              :exec-when-only-one t
-                              :initial-input \"a\")
-==>\"a\" Which is not what we expect.
-
-\(helm-comp-read \"test: \" A :alistp t
-                              :exec-when-only-one t
-                              :initial-input \"1\")
-==>\"1\"
-
-See docstring of `all-completions' for more info.
-
-If COLLECTION is an `obarray', a TEST should be needed. See `obarray'."
-  ;; Ensure COLLECTION is computed from `helm-current-buffer'
-  ;; because some functions used as COLLECTION work
-  ;; only in the context of current-buffer (Issue #1030) .
-  (with-helm-current-buffer
-    (let ((cands
-           (cond ((vectorp collection)
-                  (all-completions "" collection test))
-                 ((and (symbolp collection) (boundp collection)
-                       ;; Issue #324 history is let-bounded and given
-                       ;; quoted as hist argument of completing-read.
-                       ;; See example in `rcirc-browse-url'.
-                       (symbolp (symbol-value collection)))
-                  nil)
-                 ;; When collection is a symbol, most of the time
-                 ;; it should be a symbol used as a minibuffer-history.
-                 ;; The value of this symbol in this case return a list
-                 ;; of string which maybe are converted later as symbol
-                 ;; in special cases.
-                 ;; we treat here commandp as a special case as it return t
-                 ;; also with a string unless its last arg is provided.
-                 ;; Also, the history collections generally collect their
-                 ;; elements as string, so intern them to call predicate.
-                 ((and (symbolp collection) (boundp collection) test)
-                  (let ((predicate `(lambda (elm)
-                                      (condition-case err
-                                          (if (eq (quote ,test) 'commandp)
-                                              (funcall (quote ,test) (intern elm))
-                                              (funcall (quote ,test) elm))
-                                        (wrong-type-argument
-                                         (funcall (quote ,test) (intern elm)))))))
-                    (all-completions "" (symbol-value collection) predicate)))
-                 ((and (symbolp collection) (boundp collection))
-                  (all-completions "" (symbol-value collection)))
-                 ;; Normally file completion should not be handled here,
-                 ;; but special cases like `find-file-at-point' do it.
-                 ;; Handle here specially such cases.
-                 ((and (functionp collection) minibuffer-completing-file-name)
-                  (cl-loop for f in (funcall collection helm-pattern test t)
-                           unless (member f '("./" "../"))
-                           if (string-match ffap-url-regexp helm-pattern)
-                           collect f
-                           else
-                           collect (concat (file-name-as-directory
-                                            (helm-basedir helm-pattern)) f)))
-                 ((functionp collection)
-                  (funcall collection "" test t))
-                 ((and alistp test)
-                  (cl-loop for i in collection when (funcall test i) collect i))
-                 (alistp collection)
-                 (t (all-completions "" collection test)))))
-      (if sort-fn (sort cands sort-fn) cands))))
-
-(defun helm-cr-default-transformer (candidates _source)
-  "Default filter candidate function for `helm-comp-read'."
-  (cl-loop for c in candidates
-        for cand = (if (stringp c) (replace-regexp-in-string "\\s\\" "" c) c)
-        for pat = (replace-regexp-in-string "\\s\\" "" helm-pattern)
-        if (and (equal cand pat) helm-cr-unknown-pattern-flag)
-        collect
-        (cons (concat (propertize
-                       " " 'display
-                       (propertize "[?]" 'face 'helm-ff-prefix))
-                      c)
-              c)
-        into lst
-        else collect (if (and (stringp c)
-                              (string-match "\n" c))
-                         (cons (replace-regexp-in-string "\n" "->" c) c)
-                         c)
-        into lst
-        finally return (helm-fast-remove-dups lst :test 'equal)))
-
-(defun helm-comp-read--move-to-first-real-candidate ()
-  (helm-aif (helm-get-selection nil 'withprop)
-      (when (string= (get-text-property 0 'display it) "[?]")
-        (helm-next-line))))
-
-;;;###autoload
-(cl-defun helm-comp-read (prompt collection
-                          &key
-                            test
-                            initial-input
-                            default
-                            preselect
-                            (buffer "*Helm Completions*")
-                            must-match
-                            fuzzy
-                            reverse-history
-                            (requires-pattern 0)
-                            history
-                            input-history
-                            (case-fold helm-comp-read-case-fold-search)
-                            (del-input t)
-                            (persistent-action nil)
-                            (persistent-help "DoNothing")
-                            (mode-line helm-comp-read-mode-line)
-                            (keymap helm-comp-read-map)
-                            (name "Helm Completions")
-                            candidates-in-buffer
-                            exec-when-only-one
-                            quit-when-no-cand
-                            (volatile t)
-                            sort
-                            (fc-transformer 'helm-cr-default-transformer)
-                            hist-fc-transformer
-                            marked-candidates
-                            nomark
-                            (alistp t))
-  "Read a string in the minibuffer, with helm completion.
-
-It is helm `completing-read' equivalent.
-
-- PROMPT is the prompt name to use.
-
-- COLLECTION can be a list, vector, obarray or hash-table.
-  It can be also a function that receives three arguments:
-  the values string, predicate and t. See `all-completions' for more details.
-
-Keys description:
-
-- TEST: A predicate called with one arg i.e candidate.
-
-- INITIAL-INPUT: Same as input arg in `helm'.
-
-- PRESELECT: See preselect arg of `helm'.
-
-- DEFAULT: This option is used only for compatibility with regular
-  Emacs `completing-read' (Same as DEFAULT arg of `completing-read').
-
-- BUFFER: Name of helm-buffer.
-
-- MUST-MATCH: Candidate selected must be one of COLLECTION.
-
-- REVERSE-HISTORY: When non--nil display history source after current
-  source completion.
-
-- REQUIRES-PATTERN: Same as helm attribute, default is 0.
-
-- HISTORY: A list containing specific history, default is nil.
-  When it is non--nil, all elements of HISTORY are displayed in
-  a special source before COLLECTION.
-
-- INPUT-HISTORY: A symbol. the minibuffer input history will be
-  stored there, if nil or not provided, `minibuffer-history'
-  will be used instead.
-
-- CASE-FOLD: Same as `helm-case-fold-search'.
-
-- DEL-INPUT: Boolean, when non--nil (default) remove the partial
-  minibuffer input from HISTORY is present.
-
-- PERSISTENT-ACTION: A function called with one arg i.e candidate.
-
-- PERSISTENT-HELP: A string to document PERSISTENT-ACTION.
-
-- MODE-LINE: A string or list to display in mode line.
-  Default is `helm-comp-read-mode-line'.
-
-- KEYMAP: A keymap to use in this `helm-comp-read'.
-  (the keymap will be shared with history source)
-
-- NAME: The name related to this local source.
-
-- EXEC-WHEN-ONLY-ONE: Bound `helm-execute-action-at-once-if-one'
-  to non--nil. (possibles values are t or nil).
-
-- VOLATILE: Use volatile attribute \(enabled by default\).
-
-- SORT: A predicate to give to `sort' e.g `string-lessp'.
-
-- FC-TRANSFORMER: A `filtered-candidate-transformer' function.
-
-- HIST-FC-TRANSFORMER: A `filtered-candidate-transformer'
-  function for the history source.
-
-- MARKED-CANDIDATES: If non--nil return candidate or marked candidates as a list.
-
-- NOMARK: When non--nil don't allow marking candidates.
-
-- ALISTP: \(default is non--nil\) See `helm-comp-read-get-candidates'.
-
-- CANDIDATES-IN-BUFFER: when non--nil use a source build with
-  `helm-candidates-in-buffer' which is much faster.
-  Argument VOLATILE have no effect when CANDIDATES-IN-BUFFER is non--nil.
-
-Any prefix args passed during `helm-comp-read' invocation will be recorded
-in `helm-current-prefix-arg', otherwise if prefix args were given before
-`helm-comp-read' invocation, the value of `current-prefix-arg' will be used.
-That's mean you can pass prefix args before or after calling a command
-that use `helm-comp-read' See `helm-M-x' for example."
-
-  (when (get-buffer helm-action-buffer)
-    (kill-buffer helm-action-buffer))
-  (let ((action-fn `(("Sole action (Identity)"
-                      . (lambda (candidate)
-                          (if ,marked-candidates
-                              (helm-marked-candidates)
-                            (identity candidate)))))))
-    ;; Assume completion have been already required,
-    ;; so always use 'confirm.
-    (when (eq must-match 'confirm-after-completion)
-      (setq must-match 'confirm))
-    (let* ((minibuffer-completion-confirm must-match)
-           (must-match-map (when must-match
-                             (let ((map (make-sparse-keymap)))
-                               (define-key map (kbd "RET")
-                                 'helm-confirm-and-exit-minibuffer)
-                               map)))
-           (loc-map (if must-match-map
-                        (make-composed-keymap
-                         must-match-map (or keymap helm-map))
-                      (or keymap helm-map)))
-           (minibuffer-completion-predicate test)
-           (minibuffer-completion-table collection)
-           (helm-read-file-name-mode-line-string
-            (replace-regexp-in-string "helm-maybe-exit-minibuffer"
-                                      "helm-confirm-and-exit-minibuffer"
-                                      helm-read-file-name-mode-line-string))
-           (get-candidates (lambda ()
-                             (let ((cands (helm-comp-read-get-candidates
-                                           collection test sort alistp)))
-                               (setq helm-cr-unknown-pattern-flag nil)
-                               (unless (or (eq must-match t)
-                                           (string= helm-pattern "")
-                                           (assoc helm-pattern cands)
-                                           (assoc (intern helm-pattern) cands)
-                                           (member helm-pattern cands))
-                                 (setq cands (append (list
-                                                      ;; Unquote helm-pattern
-                                                      ;; when it is added
-                                                      ;; as candidate.
-                                                      (replace-regexp-in-string
-                                                       "\\s\\" "" helm-pattern))
-                                                     cands))
-                                 (setq helm-cr-unknown-pattern-flag t))
-                               (if (and default (not (string= default "")))
-                                   (delq nil (cons default (delete default cands)))
-                                 cands))))
-           (history-get-candidates (lambda ()
-                                     (let ((all (helm-comp-read-get-candidates
-                                                 history test nil alistp)))
-                                       (when all
-                                         (delete
-                                          ""
-                                          (helm-fast-remove-dups
-                                           (if (and default (not (string= default "")))
-                                               (delq nil (cons default
-                                                               (delete default all)))
-                                             all)
-                                           :test 'equal))))))
-           (src-hist (helm-build-sync-source (format "%s History" name)
-                         :candidates history-get-candidates
-                         :fuzzy-match fuzzy
-                         :filtered-candidate-transformer
-                         (append '((lambda (candidates sources)
-                                     (cl-loop for i in candidates
-                                              ;; Input is added to history in completing-read's
-                                              ;; and may be regexp-quoted, so unquote it.
-                                              for cand = (replace-regexp-in-string "\\s\\" "" i)
-                                              collect cand)))
-                                 (and hist-fc-transformer (helm-mklist hist-fc-transformer)))
-                         :persistent-action persistent-action
-                         :persistent-help persistent-help
-                         :mode-line mode-line
-                         :action action-fn))
-           (src (helm-build-sync-source name
-                  :candidates get-candidates
-                  :filtered-candidate-transformer fc-transformer
-                  :requires-pattern requires-pattern
-                  :persistent-action persistent-action
-                  :persistent-help persistent-help
-                  :fuzzy-match fuzzy
-                  :mode-line mode-line
-                  :action action-fn))
-           (src-1 (helm-build-in-buffer-source name
-                    :data get-candidates
-                    :filtered-candidate-transformer fc-transformer
-                    :requires-pattern requires-pattern
-                    :persistent-action persistent-action
-                    :fuzzy-match fuzzy
-                    :persistent-help persistent-help
-                    :mode-line mode-line
-                    :action action-fn))
-           (src-list (list src-hist
-                           (if candidates-in-buffer
-                               src-1
-                             (if volatile
-                                 (append src '((volatile)))
-                               src))))
-           (helm-execute-action-at-once-if-one exec-when-only-one)
-           (helm-quit-if-no-candidate quit-when-no-cand)
-           result)
-      (when nomark
-        (setq src-list (cl-loop for src in src-list
-                             collect (cons '(nomark) src))))
-      (when reverse-history (setq src-list (nreverse src-list)))
-      (add-hook 'helm-after-update-hook 'helm-comp-read--move-to-first-real-candidate)
-      (unwind-protect
-           (setq result (helm
-                         :sources src-list
-                         :input initial-input
-                         :default default
-                         :preselect preselect
-                         :prompt prompt
-                         :resume 'noresume
-                         :case-fold-search case-fold
-                         :keymap loc-map
-                         :history (and (symbolp input-history) input-history)
-                         :buffer buffer))
-        (remove-hook 'helm-after-update-hook 'helm-comp-read--move-to-first-real-candidate))
-      ;; Avoid adding an incomplete input to history.
-      (when (and result history del-input)
-        (cond ((and (symbolp history) ; History is a symbol.
-                    (not (symbolp (symbol-value history)))) ; Fix Issue #324.
-               ;; Be sure history is not a symbol with a nil value.
-               (helm-aif (symbol-value history) (setcar it result)))
-              ((consp history) ; A list with a non--nil value.
-               (setcar history result))
-              (t ; Possibly a symbol with a nil value.
-               (set history (list result)))))
-      (or
-       result
-       (when (and (eq helm-exit-status 0)
-                  (eq must-match 'confirm))
-         ;; Return empty string only if it is the DEFAULT
-         ;; value and helm-pattern is empty.
-         ;; otherwise return helm-pattern
-         (if (and (string= helm-pattern "") default)
-             default (identity helm-pattern)))
-       (unless (or (eq helm-exit-status 1)
-                   must-match)  ; FIXME this should not be needed now.
-         default)
-       (helm-mode--keyboard-quit)))))
-
-;; Generic completing-read
-;;
-;; Support also function as collection.
-;; e.g M-x man is supported.
-;; Support hash-table and vectors as collection.
-;; NOTE:
-;; Some crap emacs functions may not be supported
-;; like ffap-alternate-file (bad use of completing-read)
-;; and maybe others.
-;; Provide a mode `helm-mode' which turn on
-;; helm in all `completing-read' and `read-file-name' in Emacs.
-;;
-(defvar helm-completion-mode-string " Helm")
-
-(defvar helm-completion-mode-quit-message
-  "Helm completion disabled")
-
-(defvar helm-completion-mode-start-message
-  "Helm completion enabled")
-
-;;; Specialized handlers
-;;
-;;
-(defun helm-completing-read-symbols
-    (prompt _collection test _require-match init
-     hist default _inherit-input-method name buffer)
-  "Specialized function for fast symbols completion in `helm-mode'."
-  (or
-   (helm
-    :sources (helm-build-in-buffer-source name
-               :init (lambda ()
-                       (require 'helm-elisp)
-                       (helm-apropos-init (lambda (x)
-                                            (and (funcall test x)
-                                                 (not (keywordp x))))
-                                          (or (car-safe default) default)))
-               :filtered-candidate-transformer 'helm-apropos-default-sort-fn
-               :persistent-action 'helm-lisp-completion-persistent-action
-               :persistent-help "Show brief doc in mode-line")
-    :prompt prompt
-    :buffer buffer
-    :input init
-    :history hist
-    :resume 'noresume
-    :default (or default ""))
-     (helm-mode--keyboard-quit)))
-
-
-;;; Generic completing read
-;;
-;;
-(defun helm-completing-read-default-1
-    (prompt collection test require-match
-     init hist default _inherit-input-method
-     name buffer &optional cands-in-buffer exec-when-only-one)
-  "Call `helm-comp-read' with same args as `completing-read'.
-Extra optional arg CANDS-IN-BUFFER mean use `candidates-in-buffer'
-method which is faster.
-It should be used when candidate list don't need to rebuild dynamically."
-  (let ((history (or (car-safe hist) hist))
-        (alistp cands-in-buffer))
-    (when (and default (listp default))
-      ;; When DEFAULT is a list move the list on head of COLLECTION
-      ;; and set it to its car. #bugfix `grep-read-files'.
-      (setq collection (if (listp collection)
-                           (append default collection)
-                         ;; Else COLLECTION is maybe a function or a table.
-                         (prog1
-                             (append default (all-completions "" collection))
-                           ;; Ensure `all-completions' will not be used
-                           ;; a second time to recompute COLLECTION [1].
-                           (setq alistp t))))
-      (setq default (car default)))
-    (helm-comp-read
-     prompt collection
-     :test test
-     :history history
-     :reverse-history helm-mode-reverse-history
-     :input-history history
-     :must-match require-match
-     :alistp alistp ; Ensure `all-completions' is used when non-nil [1].
-     :name name
-     :requires-pattern (if (and (string= default "")
-                                (or (eq require-match 'confirm)
-                                    (eq require-match
-                                        'confirm-after-completion)))
-                           1 0)
-     :candidates-in-buffer cands-in-buffer
-     :exec-when-only-one exec-when-only-one
-     :buffer buffer
-     ;; If DEF is not provided, fallback to empty string
-     ;; to avoid `thing-at-point' to be appended on top of list
-     :default (or default "")
-     ;; Fail with special characters (e.g in gnus "nnimap+gmail:")
-     ;; if regexp-quote is not used.
-     ;; when init is added to history, it will be unquoted by
-     ;; helm-comp-read.
-     :initial-input (helm-aif (pcase init
-                                ((pred (stringp)) init)
-                                ;; INIT is a cons cell.
-                                (`(,l . ,_ll) l))
-                        (if minibuffer-completing-file-name it
-                            (regexp-quote it))))))
-
-(defun helm-completing-read-with-cands-in-buffer
-    (prompt collection test require-match
-     init hist default inherit-input-method
-     name buffer)
-  "Same as `helm-completing-read-default-1' but use candidates-in-buffer."
-  ;; Some commands like find-tag may use `read-file-name' from inside
-  ;; the calculation of collection. in this case it clash with
-  ;; candidates-in-buffer that reuse precedent data (files) which is wrong.
-  ;; So (re)calculate collection outside of main helm-session.
-  (let ((cands (all-completions "" collection)))
-    (helm-completing-read-default-1 prompt cands test require-match
-                                    init hist default inherit-input-method
-                                    name buffer t)))
-
-(cl-defun helm--completing-read-default
-    (prompt collection &optional
-                         predicate require-match
-                         initial-input hist def
-                         inherit-input-method)
-  "An helm replacement of `completing-read'.
-This function should be used only as a `completing-read-function'.
-
-Don't use it directly, use instead `helm-comp-read' in your programs.
-
-See documentation of `completing-read' and `all-completions' for details."
-  (let* ((current-command (or (helm-this-command) this-command))
-         (str-command     (helm-symbol-name current-command))
-         (buf-name        (format "*helm-mode-%s*" str-command))
-         (entry           (assq current-command
-                                helm-completing-read-handlers-alist))
-         (def-com         (cdr-safe entry))
-         (str-defcom      (and def-com (symbol-name def-com)))
-         (def-args        (list prompt collection predicate require-match
-                                initial-input hist def inherit-input-method))
-         ;; Append the two extra args needed to set the buffer and source name
-         ;; in helm specialized functions.
-         (any-args        (append def-args (list str-command buf-name)))
-         helm-completion-mode-start-message ; Be quiet
-         helm-completion-mode-quit-message
-         ;; Be sure this pesty *completion* buffer doesn't popup.
-         ;; Note: `minibuffer-with-setup-hook' may setup a lambda
-         ;; calling `minibuffer-completion-help' or other minibuffer
-         ;; functions we DONT WANT here, in these cases removing the hook
-         ;; (a symbol) have no effect. Issue #448.
-         ;; But because `minibuffer-completion-table' and
-         ;; `minibuffer-completion-predicate' are not bound
-         ;; anymore here, these functions should have no effect now.
-         (minibuffer-setup-hook (remove 'minibuffer-completion-help
-                                        minibuffer-setup-hook))
-         ;; Disable hack that could be used before `completing-read'.
-         ;; i.e (push ?\t unread-command-events).
-         unread-command-events)
-    (when (eq def-com 'ido) (setq def-com 'ido-completing-read))
-    (unless (or (not entry) def-com)
-      ;; An entry in *read-handlers-alist exists but have
-      ;; a nil value, so we exit from here, disable `helm-mode'
-      ;; and run the command again with it original behavior.
-      ;; `helm-mode' will be restored on exit.
-      (cl-return-from helm--completing-read-default
-        (unwind-protect
-             (progn
-               (helm-mode -1)
-               (apply completing-read-function def-args))
-          (helm-mode 1))))
-    ;; If we use now `completing-read' we MUST turn off `helm-mode'
-    ;; to avoid infinite recursion and CRASH. It will be reenabled on exit.
-    (when (or (eq def-com 'completing-read)
-              ;; All specialized functions are prefixed by "helm"
-              (and (stringp str-defcom)
-                   (not (string-match "^helm" str-defcom))))
-      (helm-mode -1))
-    (unwind-protect
-         (cond (;; An helm specialized function exists, run it.
-                (and def-com helm-mode)
-                (apply def-com any-args))
-               (;; Try to handle `ido-completing-read' everywhere.
-                (and def-com (eq def-com 'ido-completing-read))
-                (setcar (memq collection def-args)
-                        (all-completions "" collection predicate))
-                (apply def-com def-args))
-               (;; User set explicitely `completing-read' or something similar
-                ;; in *read-handlers-alist, use this with exactly the same
-                ;; args as in `completing-read'.
-                ;; If we are here `helm-mode' is now disabled.
-                def-com
-                (apply def-com def-args))
-               (t ; Fall back to classic `helm-comp-read'.
-                (helm-completing-read-default-1
-                 prompt collection predicate require-match
-                 initial-input hist def inherit-input-method
-                 str-command buf-name)))
-      (helm-mode 1)
-      ;; When exiting minibuffer, `this-command' is set to
-      ;; `helm-exit-minibuffer', which is unwanted when starting
-      ;; on another `completing-read', so restore `this-command' to
-      ;; initial value when exiting.
-      (setq this-command current-command))))
-
-;;; Generic read-file-name
-;;
-;;
-(cl-defun helm-read-file-name
-    (prompt
-     &key
-       (name "Read File Name")
-       (initial-input (expand-file-name default-directory))
-       (buffer "*Helm file completions*")
-       test
-       (case-fold helm-file-name-case-fold-search)
-       preselect
-       history
-       must-match
-       default
-       marked-candidates
-       nomark
-       (alistp t)
-       (persistent-action 'helm-find-files-persistent-action)
-       (persistent-help "Hit1 Expand Candidate, Hit2 or (C-u) Find file")
-       (mode-line helm-read-file-name-mode-line-string))
-  "Read a file name with helm completion.
-It is helm `read-file-name' emulation.
-
-Argument PROMPT is the default prompt to use.
-
-Keys description:
-
-- NAME: Source name, default to \"Read File Name\".
-
-- INITIAL-INPUT: Where to start read file name, default to `default-directory'.
-
-- BUFFER: `helm-buffer' name default to \"*Helm Completions*\".
-
-- TEST: A predicate called with one arg 'candidate'.
-
-- CASE-FOLD: Same as `helm-case-fold-search'.
-
-- PRESELECT: helm preselection.
-
-- HISTORY: Display HISTORY in a special source.
-
-- MUST-MATCH: Can be 'confirm, nil, or t.
-
-- MARKED-CANDIDATES: When non--nil return a list of marked candidates.
-
-- NOMARK: When non--nil don't allow marking candidates.
-
-- ALISTP: Don't use `all-completions' in history (take effect only on history).
-
-- PERSISTENT-ACTION: a persistent action function.
-
-- PERSISTENT-HELP: persistent help message.
-
-- MODE-LINE: A mode line message, default is `helm-read-file-name-mode-line-string'."
-  
-  (when (get-buffer helm-action-buffer)
-    (kill-buffer helm-action-buffer))
-  ;; Assume completion have been already required,
-  ;; so always use 'confirm.
-  (when (eq must-match 'confirm-after-completion)
-    (setq must-match 'confirm))
-  (let* ((action-fn `(("Sole action (Identity)"
-                       . (lambda (candidate)
-                           (if ,marked-candidates
-                               (helm-marked-candidates :with-wildcard t)
-                             (identity candidate))))))
-         ;; Be sure we don't erase the underlying minibuffer if some.
-         (helm-ff-auto-update-initial-value
-          (and helm-ff-auto-update-initial-value
-               (not (minibuffer-window-active-p (minibuffer-window)))))
-         helm-full-frame
-         (hist (and history (helm-comp-read-get-candidates
-                             history nil nil alistp)))
-         (minibuffer-completion-confirm must-match)
-         (must-match-map (when must-match
-                           (let ((map (make-sparse-keymap)))
-                             (define-key map (kbd "RET")
-                               'helm-confirm-and-exit-minibuffer)
-                             map)))
-         (cmap (if must-match-map
-                   (make-composed-keymap
-                    must-match-map helm-read-file-map)
-                 helm-read-file-map))
-         (minibuffer-completion-predicate test)
-         (minibuffer-completing-file-name t)
-         (helm-read-file-name-mode-line-string
-          (replace-regexp-in-string "helm-maybe-exit-minibuffer"
-                                    "helm-confirm-and-exit-minibuffer"
-                                    helm-read-file-name-mode-line-string))
-         (src-list
-          (list
-           ;; History source.
-           (helm-build-sync-source (format "%s History" name)
-             :header-name (lambda (hname)
-                            (concat hname helm-find-files-doc-header))
-             :mode-line mode-line
-             :candidates hist
-             :nohighlight t
-             :persistent-action persistent-action
-             :persistent-help persistent-help
-             :nomark nomark
-             :action action-fn)
-           ;; Other source.
-           (helm-build-sync-source name
-             :header-name (lambda (hname)
-                            (concat hname helm-find-files-doc-header))
-             :init (lambda ()
-                     (setq helm-ff-auto-update-flag
-                           helm-ff-auto-update-initial-value)
-                     (setq helm-ff--auto-update-state
-                           helm-ff-auto-update-flag))
-             :mode-line mode-line
-             :nohighlight t
-             :candidates
-             (lambda ()
-               (append (and (not (file-exists-p helm-pattern))
-                            (list helm-pattern))
-                       (if test
-                           (cl-loop with hn = (helm-ff-tramp-hostnames)
-                                    for i in (helm-find-files-get-candidates
-                                              must-match)
-                                    when (or (member i hn) ; A tramp host
-                                             (funcall test i)) ; Test ok
-                                    collect i)
-                           (helm-find-files-get-candidates must-match))))
-             :filtered-candidate-transformer 'helm-ff-sort-candidates
-             :filter-one-by-one 'helm-ff-filter-candidate-one-by-one
-             :persistent-action persistent-action
-             :candidate-number-limit 9999
-             :persistent-help persistent-help
-             :volatile t
-             :nomark nomark
-             :action action-fn)))
-         ;; Helm result.
-         (result (helm
-                  :sources src-list
-                  :input initial-input
-                  :prompt prompt
-                  :keymap cmap
-                  :resume 'noresume
-                  :case-fold-search case-fold
-                  :default default
-                  :buffer buffer
-                  :preselect preselect)))
-    (or
-     (cond ((and result (stringp result)
-                 (string= result "") ""))
-           ((and result
-                 (stringp result)
-                 (file-equal-p result initial-input)
-                 default)
-            (if (listp default) (car default) default))
-           ((and result (stringp result))
-            (expand-file-name result))
-           ((and result (listp result))
-            (mapcar #'expand-file-name result))
-           (t result))
-     (when (and (not (string= helm-pattern ""))
-                (eq helm-exit-status 0)
-                (eq must-match 'confirm))
-       (identity helm-pattern))
-     (helm-mode--keyboard-quit))))
-
-(defun helm-mode--default-filename (fname dir initial)
-  (unless dir (setq dir default-directory))
-  (unless (file-name-absolute-p dir)
-    (setq dir (expand-file-name dir)))
-  (unless (or fname (consp fname))
-    (setq fname (expand-file-name
-                 (or initial buffer-file-name dir)
-                 dir)))
-  (if (and fname (consp fname))
-      (setq fname (cl-loop for f in fname
-                           collect (expand-file-name f dir)))
-      (if (file-name-absolute-p fname)
-          fname (expand-file-name fname dir))))
-
-(cl-defun helm--generic-read-file-name
-    (prompt &optional dir default-filename mustmatch initial predicate)
-  "Generic helm replacement of `read-file-name'.
-Don't use it directly, use instead `helm-read-file-name' in your programs."
-  (let* ((init (or initial dir default-directory))
-         (current-command (or (helm-this-command) this-command))
-         (str-command (helm-symbol-name current-command))
-         (helm--file-completion-sources
-          (cons str-command
-                (remove str-command helm--file-completion-sources)))
-         (buf-name (format "*helm-mode-%s*" str-command))
-         (entry (assq current-command
-                      helm-completing-read-handlers-alist))
-         (def-com  (cdr-safe entry))
-         (str-defcom (and def-com (symbol-name def-com)))
-         (def-args (list prompt dir default-filename mustmatch initial predicate))
-         ;; Append the two extra args needed to set the buffer and source name
-         ;; in helm specialized functions.
-         (any-args (append def-args (list str-command buf-name)))
-         (ido-state ido-mode)
-         helm-completion-mode-start-message ; Be quiet
-         helm-completion-mode-quit-message  ; Same here
-         fname)
-    (setq default-filename (helm-mode--default-filename
-                            default-filename dir initial))
-    ;; Some functions that normally call `completing-read' can switch
-    ;; brutally to `read-file-name' (e.g find-tag), in this case
-    ;; the helm specialized function will fail because it is build
-    ;; for `completing-read', so set it to 'incompatible to be sure
-    ;; we switch to `helm-read-file-name' and don't try to call it
-    ;; with wrong number of args.
-    (when (eq def-com 'ido)
-      (setq def-com 'ido-read-file-name) (ido-mode 1))
-    (when (and def-com (> (length (help-function-arglist def-com)) 8))
-      (setq def-com 'incompatible))
-    (unless (or (not entry) def-com)
-      (cl-return-from helm--generic-read-file-name
-        (unwind-protect
-             (progn
-               (helm-mode -1)
-               (apply read-file-name-function def-args))
-          (helm-mode 1))))
-    ;; If we use now `read-file-name' we MUST turn off `helm-mode'
-    ;; to avoid infinite recursion and CRASH. It will be reenabled on exit.
-    (when (or (eq def-com 'read-file-name)
-              (eq def-com 'ido-read-file-name)
-              (and (stringp str-defcom)
-                   (not (string-match "^helm" str-defcom))))
-      (helm-mode -1))
-    (unwind-protect
-         (setq fname
-               (cond (;; A specialized function exists, run it
-                      ;; with the two extra args specific to helm..
-                      (and def-com helm-mode
-                           (not (eq def-com 'ido-read-file-name))
-                           (not (eq def-com 'incompatible)))
-                      (apply def-com any-args))
-                     (;; Def-com value is `ido-read-file-name'
-                      ;; run it with default args.
-                      (and def-com (eq def-com 'ido-read-file-name))
-                      (ido-mode 1)
-                      (apply def-com def-args))
-                     (;; Def-com value is `read-file-name'
-                      ;; run it with default args.
-                      (eq def-com 'read-file-name)
-                      (apply def-com def-args))
-                     (t ; Fall back to classic `helm-read-file-name'.
-                      (helm-read-file-name
-                       prompt
-                       :name str-command
-                       :buffer buf-name
-                       :default default-filename
-                       :initial-input (expand-file-name init dir)
-                       :alistp nil
-                       :must-match mustmatch
-                       :test predicate))))
-      (helm-mode 1)
-      (ido-mode (if ido-state 1 -1))
-      ;; Same comment as in `helm--completing-read-default'.
-      (setq this-command current-command))
-    fname))
-
-(defun helm-mode--advice-lisp--local-variables (old--fn &rest args)
-  (ignore-errors
-    (apply old--fn args)))
-
-(defun helm--completion-in-region (start end collection &optional predicate)
-  "[EXPERIMENTAL] Helm replacement of `completion--in-region'.
-Can be used as value for `completion-in-region-function'."
-  (cl-declare (special require-match prompt))
-  (if (memq major-mode helm-mode-no-completion-in-region-in-modes)
-      (funcall helm--old-completion-in-region-function
-               start end collection predicate)
-      (advice-add
-       'lisp--local-variables
-       :around #'helm-mode--advice-lisp--local-variables)
-      (unwind-protect
-           (let* ((enable-recursive-minibuffers t)
-                  (input (buffer-substring-no-properties start end))
-                  (current-command (or (helm-this-command) this-command))
-                  (str-command (symbol-name current-command))
-                  (buf-name (format "*helm-mode-%s*" str-command))
-                  (require-match (or (and (boundp 'require-match) require-match)
-                                     minibuffer-completion-confirm
-                                     ;; If prompt have not been propagated here, that's
-                                     ;; probably mean we have no prompt and we are in
-                                     ;; completion-at-point or friend, so use a non--nil
-                                     ;; value for require-match.
-                                     (not (boundp 'prompt))))
-                  ;; `completion-extra-properties' is let-bounded in `completion-at-point'.
-                  ;; `afun' is a closure to call against each string in `data'.
-                  ;; it provide the annotation info for each string.
-                  ;; e.g "foo" => "foo <f>" where foo is a function.
-                  ;; See Issue #407.
-                  (afun (plist-get completion-extra-properties :annotation-function))
-                  (data (all-completions input collection predicate))
-                  (init-space-suffix (unless helm-completion-in-region-fuzzy-match " "))
-                  ;; Assume that when `afun' and `predicate' are null
-                  ;; we are in filename completion.
-                  (file-comp-p (or (helm-mode--in-file-completion-p)
-                                   (and (null afun) (null predicate)))) 
-                  ;; Completion-at-point and friends have no prompt.
-                  (result (if (stringp data)
-                              data
-                              (helm-comp-read
-                               (or (and (boundp 'prompt) prompt) "Pattern: ")
-                               (if file-comp-p
-                                   (cl-loop for f in data unless
-                                            (string-match "\\`\\.\\{1,2\\}/\\'" f)
-                                            collect f)
-                                   (if afun
-                                       (mapcar (lambda (s)
-                                                 (let ((ann (funcall afun s)))
-                                                   (if ann
-                                                       (cons
-                                                        (concat
-                                                         s
-                                                         (propertize
-                                                          " " 'display
-                                                          (propertize
-                                                           ann
-                                                           'face 'completions-annotations)))
-                                                        s)
-                                                       s)))
-                                               data)
-                                       data))
-                               :name str-command
-                               :fuzzy helm-completion-in-region-fuzzy-match
-                               :nomark t
-                               :initial-input
-                               (cond ((and file-comp-p
-                                           (not (string-match "/\\'" input)))
-                                      (concat (helm-basename input)
-                                              (unless (string= input "")
-                                                init-space-suffix)))
-                                     ((string-match "/\\'" input) nil)
-                                     ((or (null require-match)
-                                          (stringp require-match))
-                                      input)
-                                     (t (concat input init-space-suffix)))
-                               :buffer buf-name
-                               :fc-transformer (append (list 'helm-cr-default-transformer)
-                                                       (list (lambda (candidates _source)
-                                                               (sort candidates 'helm-generic-sort-fn))))
-                               :exec-when-only-one t
-                               :quit-when-no-cand
-                               #'(lambda ()
-                                   ;; Delay message to overwrite "Quit".
-                                   (run-with-timer
-                                    0.01 nil
-                                    #'(lambda ()
-                                        (message "[No matches]")))
-                                   t)   ; exit minibuffer immediately.
-                               :must-match require-match))))
-             (when result
-               (delete-region (if (and file-comp-p
-                                       (save-excursion
-                                         (re-search-backward "~?/" start t)))
-                                  (match-end 0) start)
-                              end)
-               (insert result)))
-        (advice-remove 'lisp--local-variables
-                       #'helm-mode--advice-lisp--local-variables))))
-
-(defun helm-mode--in-file-completion-p ()
-  (with-helm-current-buffer
-    (run-hook-with-args-until-success 'file-name-at-point-functions)))
-
-(when (boundp 'completion-in-region-function)
-  (defconst helm--old-completion-in-region-function completion-in-region-function))
-
-;;;###autoload
-(define-minor-mode helm-mode
-    "Toggle generic helm completion.
-
-All functions in Emacs that use `completing-read'
-or `read-file-name' and friends will use helm interface
-when this mode is turned on.
-However you can modify this behavior for functions of your choice
-with `helm-completing-read-handlers-alist'.
-
-Called with a positive arg, turn on unconditionally, with a
-negative arg turn off.
-You can turn it on with `helm-mode'.
-
-Some crap emacs functions may not be supported,
-e.g `ffap-alternate-file' and maybe others
-You can add such functions to `helm-completing-read-handlers-alist'
-with a nil value.
-
-Note: This mode is incompatible with Emacs23."
-  :group 'helm-mode
-  :global t
-  :lighter helm-completion-mode-string
-  (cl-assert (boundp 'completing-read-function) nil
-             "`helm-mode' not available, upgrade to Emacs-24")
-  (if helm-mode
-      (if (fboundp 'add-function)
-          (progn
-            (add-function :override completing-read-function
-                          #'helm--completing-read-default)
-            (add-function :override read-file-name-function
-                          #'helm--generic-read-file-name)
-            (when helm-mode-handle-completion-in-region
-              (add-function :override completion-in-region-function
-                            #'helm--completion-in-region)))
-          (setq completing-read-function 'helm--completing-read-default
-                read-file-name-function  'helm--generic-read-file-name)
-          (when (and (boundp 'completion-in-region-function)
-                     helm-mode-handle-completion-in-region)
-            (setq completion-in-region-function #'helm--completion-in-region))
-          (message helm-completion-mode-start-message))
-      (if (fboundp 'remove-function)
-          (progn
-            (remove-function completing-read-function #'helm--completing-read-default)
-            (remove-function read-file-name-function #'helm--generic-read-file-name)
-            (remove-function completion-in-region-function #'helm--completion-in-region))
-          (setq completing-read-function (and (fboundp 'completing-read-default)
-                                        'completing-read-default)
-                read-file-name-function  (and (fboundp 'read-file-name-default)
-                                              'read-file-name-default))
-          (when (and (boundp 'completion-in-region-function)
-                     (boundp 'helm--old-completion-in-region-function))
-            (setq completion-in-region-function helm--old-completion-in-region-function))
-          (message helm-completion-mode-quit-message))))
-
-(provide 'helm-mode)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-mode.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-net.el b/emacs.d/elpa/helm-20150623.1310/helm-net.el
deleted file mode 100644
index 60c9030..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-net.el
+++ /dev/null
@@ -1,563 +0,0 @@
-;;; helm-net.el --- helm browse url and search web. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'url)
-(require 'xml)
-(require 'browse-url)
-
-
-(defgroup helm-net nil
-  "Net related applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-google-suggest-default-browser-function nil
-  "The browse url function you prefer to use with google suggest.
-When nil, use the first browser function available
-See `helm-browse-url-default-browser-alist'."
-  :group 'helm-net
-  :type 'symbol)
-
-(defcustom helm-home-url "http://www.google.fr"
-  "Default url to use as home url."
-  :group 'helm-net
-  :type 'string)
-
-(defcustom helm-surfraw-default-browser-function nil
-  "The browse url function you prefer to use with surfraw.
-When nil, fallback to `browse-url-browser-function'."
-  :group 'helm-net
-  :type 'symbol)
-
-(defcustom helm-google-suggest-url
-  "http://google.com/complete/search?output=toolbar&q="
-  "URL used for looking up Google suggestions."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-google-suggest-search-url
-  "http://www.google.com/search?ie=utf-8&oe=utf-8&q=%s"
-  "URL used for Google searching."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-google-suggest-use-curl-p nil
-  "When non--nil use CURL to get info from `helm-google-suggest-url'.
-Otherwise `url-retrieve-synchronously' is used."
-  :type 'boolean
-  :group 'helm-net)
-
-(defcustom helm-yahoo-suggest-url
-  "http://search.yahooapis.com/WebSearchService/V1/relatedSuggestion?appid=Generic&query="
-  "Url used for looking up Yahoo suggestions."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-yahoo-suggest-search-url
-  "http://search.yahoo.com/search?&ei=UTF-8&fr&h=c&p=%s"
-  "Url used for Yahoo searching."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-surfraw-duckduckgo-url
-  "https://duckduckgo.com/lite/?q=%s&kp=1"
-  "The duckduckgo url.
-This is a format string, don't forget the `%s'.
-If you have personal settings saved on duckduckgo you should have
-a personal url, see your settings on duckduckgo."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-wikipedia-suggest-url
-  "http://en.wikipedia.org/w/api.php?action=opensearch&search="
-  "Url used for looking up Wikipedia suggestions."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-search-suggest-action-wikipedia-url
-  "https://en.wikipedia.org/wiki/Special:Search?search=%s"
-  "The Wikipedia search url.
-This is a format string, don't forget the `%s'."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-wikipedia-summary-url
-  "http://en.wikipedia.org/w/api.php?action=parse&format=json&prop=text&section=0&page="
-  "URL for getting the summary of a Wikipedia topic."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-wikipedia-follow-delay 2
-  "Delay before wikipedia summary popup."
-  :type 'number
-  :group 'helm-net)
-
-(defcustom helm-search-suggest-action-youtube-url
-  "http://www.youtube.com/results?aq=f&search_query=%s"
-  "The Youtube search url.
-This is a format string, don't forget the `%s'."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-search-suggest-action-imdb-url
-  "http://www.imdb.com/find?s=all&q=%s"
-  "The IMDb search url.
-This is a format string, don't forget the `%s'."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-search-suggest-action-google-maps-url
-  "http://maps.google.com/maps?f=q&source=s_q&q=%s"
-  "The Google Maps search url.
-This is a format string, don't forget the `%s'."
-  :type 'string
-  :group 'helm-net)
-
-(defcustom helm-search-suggest-action-google-news-url
-  "http://www.google.com/search?safe=off&prmd=nvlifd&source=lnms&tbs=nws:1&q=%s"
-  "The Google News search url.
-This is a format string, don't forget the `%s'."
-  :type 'string
-  :group 'helm-net)
-
-
-;;; Additional actions for search suggestions
-;;
-;;
-;; Internal
-
-(defun helm-search-suggest-perform-additional-action (url query)
-  "Perform the search via URL using QUERY as input."
-  (browse-url (format url (url-hexify-string query))))
-
-(defvar helm-search-suggest-additional-actions
-  '(("Wikipedia" . (lambda (candidate)
-                     (helm-search-suggest-perform-additional-action
-                      helm-search-suggest-action-wikipedia-url
-                      candidate)))
-    ("Youtube" . (lambda (candidate)
-                   (helm-search-suggest-perform-additional-action
-                    helm-search-suggest-action-youtube-url
-                    candidate)))
-    ("IMDb" . (lambda (candidate)
-                (helm-search-suggest-perform-additional-action
-                 helm-search-suggest-action-imdb-url
-                 candidate)))
-    ("Google Maps" . (lambda (candidate)
-                       (helm-search-suggest-perform-additional-action
-                        helm-search-suggest-action-google-maps-url
-                        candidate)))
-    ("Google News" . (lambda (candidate)
-                       (helm-search-suggest-perform-additional-action
-                        helm-search-suggest-action-google-news-url
-                        candidate))))
-  "List of additional actions for suggest sources.")
-
-
-;;; Google Suggestions
-;;
-;;
-(defun helm-google-suggest-fetch (input)
-  "Fetch suggestions for INPUT from XML buffer."
-  (let ((request (concat helm-google-suggest-url
-                         (url-hexify-string input)))
-        (fetch #'(lambda ()
-                   (cl-loop
-                    with result-alist = (xml-get-children
-                                         (car (xml-parse-region
-                                               (point-min) (point-max)))
-                                         'CompleteSuggestion)
-                    for i in result-alist collect
-                    (cdr (cl-caadr (assoc 'suggestion i)))))))
-    (if helm-google-suggest-use-curl-p
-        (with-temp-buffer
-          (call-process "curl" nil t nil request)
-          (funcall fetch))
-        (with-current-buffer
-            (url-retrieve-synchronously request)
-          (funcall fetch)))))
-
-(defun helm-google-suggest-set-candidates (&optional request-prefix)
-  "Set candidates with result and number of google results found."
-  (let ((suggestions (helm-google-suggest-fetch
-                      (or (and request-prefix
-                               (concat request-prefix
-                                       " " helm-pattern))
-                          helm-pattern))))
-    (if (member helm-pattern suggestions)
-        suggestions
-        ;; if there is no suggestion exactly matching the input then
-        ;; prepend a Search on Google item to the list
-        (append
-         suggestions
-         (list (cons (format "Search for '%s' on Google" helm-input)
-                     helm-input))))))
-
-(defun helm-ggs-set-number-result (num)
-  (if num
-      (progn
-        (and (numberp num) (setq num (number-to-string num)))
-        (cl-loop for i in (reverse (split-string num "" t))
-              for count from 1
-              append (list i) into C
-              when (= count 3)
-              append (list ",") into C
-              and do (setq count 0)
-              finally return
-              (replace-regexp-in-string
-               "^," "" (mapconcat 'identity (reverse C) ""))))
-    "?"))
-
-(defun helm-google-suggest-action (candidate)
-  "Default action to jump to a google suggested candidate."
-  (let ((arg (format helm-google-suggest-search-url
-                     (url-hexify-string candidate))))
-    (helm-aif helm-google-suggest-default-browser-function
-        (funcall it arg)
-      (helm-browse-url arg))))
-
-(defvar helm-google-suggest-default-function
-  'helm-google-suggest-set-candidates
-  "Default function to use in helm google suggest.")
-
-(defvar helm-source-google-suggest
-  `((name . "Google Suggest")
-    (candidates . (lambda ()
-                    (funcall helm-google-suggest-default-function)))
-    (action . ,(cons '("Google Search" . helm-google-suggest-action)
-                     helm-search-suggest-additional-actions))
-    (volatile)
-    (keymap . ,helm-map)
-    (requires-pattern . 3)))
-
-(defun helm-google-suggest-emacs-lisp ()
-  "Try to emacs lisp complete with google suggestions."
-  (helm-google-suggest-set-candidates "emacs lisp"))
-
-
-;;; Yahoo suggestions
-;;
-;;
-(defun helm-yahoo-suggest-fetch (input)
-  "Fetch Yahoo suggestions for INPUT from XML buffer.
-Return an alist with elements like (data . number_results)."
-  (let ((request (concat helm-yahoo-suggest-url
-                         (url-hexify-string input))))
-    (with-current-buffer
-        (url-retrieve-synchronously request)
-      (cl-loop with result-alist =
-            (xml-get-children
-             (car (xml-parse-region
-                   (point-min) (point-max)))
-             'Result)
-            for i in result-alist
-            collect (cl-caddr i)))))
-
-(defun helm-yahoo-suggest-set-candidates ()
-  "Set candidates with Yahoo results found."
-  (let ((suggestions (helm-yahoo-suggest-fetch helm-input)))
-    (or suggestions
-        (append
-         suggestions
-         (list (cons (concat "Search for " "'" helm-input "'" " on Yahoo")
-                     helm-input))))))
-
-(defun helm-yahoo-suggest-action (candidate)
-  "Default action to jump to a Yahoo suggested candidate."
-  (helm-browse-url (format helm-yahoo-suggest-search-url
-                           (url-hexify-string candidate))))
-
-(defvar helm-source-yahoo-suggest
-  `((name . "Yahoo Suggest")
-    (candidates . helm-yahoo-suggest-set-candidates)
-    (action . (("Yahoo Search" . helm-yahoo-suggest-action)))
-    (volatile)
-    (keymap . ,helm-map)
-    (requires-pattern . 3)))
-
-;;; Wikipedia suggestions
-;;
-;;
-(declare-function json-read-from-string "json" (string))
-(defun helm-wikipedia-suggest-fetch ()
-  "Fetch Wikipedia suggestions and return them as a list."
-  (require 'json)
-  (let ((request (concat helm-wikipedia-suggest-url
-                         (url-hexify-string helm-pattern))))
-    (if helm-google-suggest-use-curl-p
-        (with-temp-buffer
-          (call-process "curl" nil t nil request)
-          (helm-wikipedia--parse-buffer))
-      (with-current-buffer
-          (url-retrieve-synchronously request)
-        (helm-wikipedia--parse-buffer)))))
-
-(defun helm-wikipedia--parse-buffer ()
-  (goto-char (point-min))
-  (when (re-search-forward "^\\[.+\\[\\(.*\\)\\]\\]" nil t)
-    (cl-loop for i across (aref (json-read-from-string (match-string 0)) 1)
-          collect i into result
-          finally return (or result
-                             (append
-                              result
-                              (list (cons (format "Search for '%s' on wikipedia"
-                                                  helm-pattern)
-                                          helm-pattern)))))))
-
-(defvar helm-wikipedia--summary-cache (make-hash-table :test 'equal))
-(defun helm-wikipedia-persistent-action (candidate)
-  (unless (string= (format "Search for '%s' on wikipedia"
-                           helm-pattern)
-                   (helm-get-selection nil t))
-    (message "Fetching summary from Wikipedia...")
-    (let ((buf (get-buffer-create "*helm wikipedia summary*"))
-          result mess)
-      (while (progn
-               (setq result (or (gethash candidate helm-wikipedia--summary-cache)
-                                (puthash candidate
-                                         (prog1
-                                             (helm-wikipedia-fetch-summary candidate)
-                                           (setq mess "Done"))
-                                         helm-wikipedia--summary-cache)))
-               (when (and result
-                          (listp result))
-                 (setq candidate (cdr result))
-                 (message "Redirected to %s" candidate)
-                 t)))
-      (if (not result)
-          (message "Error when getting summary.")
-        (with-current-buffer buf
-          (erase-buffer)
-          (setq cursor-type nil)
-          (insert result)
-          (fill-region (point-min) (point-max))
-          (goto-char (point-min)))
-        (display-buffer buf)
-        (message mess)))))
-
-
-(defun helm-wikipedia-fetch-summary (input)
-  (let* ((request (concat helm-wikipedia-summary-url (url-hexify-string input))))
-    (if helm-google-suggest-use-curl-p
-        (with-temp-buffer
-          (call-process "curl" nil t nil request)
-          (helm-wikipedia--parse-summary))
-      (with-current-buffer
-          (url-retrieve-synchronously request)
-        (helm-wikipedia--parse-summary)))))
-
-
-(defun helm-wikipedia--parse-summary ()
-  (goto-char (point-min))
-  (when (search-forward "{" nil t)
-    (let ((result (cdr (assoc '*
-                              (assoc 'text
-                                     (assoc 'parse
-                                            (json-read-from-string
-                                             (buffer-substring-no-properties
-                                              (1- (point)) (point-max)))))))))
-      (when result
-        (if (string-match "<span class=\"redirectText\"><a href=[^>]+>\\([^<]+\\)" result)
-            (cons 'redirect (match-string 1 result))
-
-          ;; find the beginning of the summary text in the result
-
-          ;; check if there is a table before the summary and skip that
-          (when (or (string-match "</table>\\(\n<div.*?</div>\\)?\n<p>" result)
-                    ;; otherwise just find the first paragraph
-                    (string-match "<p>" result))
-            ;; remove cruft and do a simple formatting 
-            (replace-regexp-in-string
-             "Cite error: .*" ""
-             (replace-regexp-in-string
-              "&#160;" ""
-              (replace-regexp-in-string
-               "\\[[^\]]+\\]" ""
-               (replace-regexp-in-string
-                "<[^>]*>" ""
-                (replace-regexp-in-string
-                 "</p>\n<p>" "\n\n"
-                 (substring result (match-end 0)))))))))))))
-
-
-(defvar helm-source-wikipedia-suggest
-  `((name . "Wikipedia Suggest")
-    (candidates . helm-wikipedia-suggest-fetch)
-    (action . (("Wikipedia" . (lambda (candidate)
-                                (helm-search-suggest-perform-additional-action
-                                 helm-search-suggest-action-wikipedia-url
-                                 candidate)))))
-    (persistent-action . helm-wikipedia-persistent-action)
-    (volatile)
-    (keymap . ,helm-map)
-    (follow . 1)
-    (follow-delay . ,helm-wikipedia-follow-delay)
-    (requires-pattern . 3)))
-
-
-;;; Web browser functions.
-;;
-;;
-;; If default setting of `w3m-command' is not
-;; what you want and you modify it, you will have to reeval
-;; also `helm-browse-url-default-browser-alist'.
-
-(defvar helm-browse-url-chromium-program "chromium-browser")
-(defvar helm-browse-url-uzbl-program "uzbl-browser")
-(defvar helm-browse-url-conkeror-program "conkeror")
-(defvar helm-browse-url-default-browser-alist
-  `((,(or (and (boundp 'w3m-command) w3m-command)
-          "/usr/bin/w3m") . w3m-browse-url)
-    (,browse-url-firefox-program . browse-url-firefox)
-    (,helm-browse-url-chromium-program . helm-browse-url-chromium)
-    (,helm-browse-url-conkeror-program . helm-browse-url-conkeror)
-    (,helm-browse-url-uzbl-program . helm-browse-url-uzbl)
-    (,browse-url-kde-program . browse-url-kde)
-    (,browse-url-gnome-moz-program . browse-url-gnome-moz)
-    (,browse-url-mozilla-program . browse-url-mozilla)
-    (,browse-url-galeon-program . browse-url-galeon)
-    (,browse-url-netscape-program . browse-url-netscape)
-    (,browse-url-mosaic-program . browse-url-mosaic)
-    (,browse-url-xterm-program . browse-url-text-xterm)
-    ("emacs" . eww-browse-url))
-  "*Alist of \(executable . function\) to try to find a suitable url browser.")
-
-(cl-defun helm-generic-browser (url cmd-name &rest args)
-  "Browse URL with NAME browser."
-  (let ((proc (concat cmd-name " " url)))
-    (message "Starting %s..." cmd-name)
-    (apply 'start-process proc nil cmd-name
-           (append args (list url)))
-    (set-process-sentinel
-     (get-process proc)
-     #'(lambda (process event)
-         (when (string= event "finished\n")
-           (message "%s process %s" process event))))))
-
-(defun helm-browse-url-chromium (url &optional _ignore)
-  "Browse URL with google chrome browser."
-  (interactive "sURL: ")
-  (helm-generic-browser
-   url helm-browse-url-chromium-program))
-
-(defun helm-browse-url-uzbl (url &optional _ignore)
-  "Browse URL with uzbl browser."
-  (interactive "sURL: ")
-  (helm-generic-browser url helm-browse-url-uzbl-program "-u"))
-
-(defun helm-browse-url-conkeror (url &optional _ignore)
-  "Browse URL with conkeror browser."
-  (interactive "sURL: ")
-  (helm-generic-browser url helm-browse-url-conkeror-program))
-
-(defun helm-browse-url-default-browser (url &rest args)
-  "Find the first available browser and ask it to load URL."
-  (let ((default-browser-fn
-         (cl-loop for (exe . fn) in helm-browse-url-default-browser-alist
-               thereis (and exe (executable-find exe) (fboundp fn) fn))))
-    (if default-browser-fn
-        (apply default-browser-fn url args)
-      (error "No usable browser found"))))
-
-(defun helm-browse-url (url &rest args)
-  "Default command to browse URL."
-  (if browse-url-browser-function
-      (browse-url url args)
-    (helm-browse-url-default-browser url args)))
-
-
-;;; Surfraw
-;;
-;; Need external program surfraw.
-;; <http://surfraw.alioth.debian.org/>
-
-;; Internal
-(defvar helm-surfraw-engines-history nil)
-(defvar helm-surfraw-input-history nil)
-(defvar helm-surfraw--elvi-cache nil)
-
-(defun helm-build-elvi-list ()
-  "Return list of all engines and descriptions handled by surfraw."
-  (or helm-surfraw--elvi-cache
-      (setq helm-surfraw--elvi-cache
-            (cdr (with-temp-buffer
-                   (call-process "surfraw" nil t nil "-elvi")
-                   (split-string (buffer-string) "\n"))))))
-
-;;;###autoload
-(defun helm-surfraw (pattern engine)
-  "Preconfigured `helm' to search PATTERN with search ENGINE."
-  (interactive (list (read-string "SearchFor: "
-                                  nil 'helm-surfraw-input-history
-                                  (thing-at-point 'symbol))
-                     (helm-comp-read
-                      "Engine: "
-                      (helm-build-elvi-list)
-                      :must-match t
-                      :name "Surfraw Search Engines"
-                      :del-input nil
-                      :history helm-surfraw-engines-history)))
-  (let* ((engine-nodesc (car (split-string engine)))
-         (url (if (string= engine-nodesc "duckduckgo")
-                  ;; "sr duckduckgo -p foo" is broken, workaround.
-                  (format helm-surfraw-duckduckgo-url
-                          (url-hexify-string pattern))
-                (with-temp-buffer
-                  (apply 'call-process "surfraw" nil t nil
-                         (append  (list engine-nodesc "-p") (split-string pattern)))
-                  (replace-regexp-in-string
-                   "\n" "" (buffer-string)))))
-         (browse-url-browser-function (or helm-surfraw-default-browser-function
-                                          browse-url-browser-function)))
-    (if (string= engine-nodesc "W")
-        (helm-browse-url helm-home-url)
-      (helm-browse-url url)
-      (setq helm-surfraw-engines-history
-            (cons engine (delete engine helm-surfraw-engines-history))))))
-
-;;;###autoload
-(defun helm-google-suggest ()
-  "Preconfigured `helm' for google search with google suggest."
-  (interactive)
-  (helm-other-buffer 'helm-source-google-suggest "*helm google*"))
-
-;;;###autoload
-(defun helm-yahoo-suggest ()
-  "Preconfigured `helm' for Yahoo searching with Yahoo suggest."
-  (interactive)
-  (helm-other-buffer 'helm-source-yahoo-suggest "*helm yahoo*"))
-
-;;;###autoload
-(defun helm-wikipedia-suggest ()
-  "Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest."
-  (interactive)
-  (helm :sources 'helm-source-wikipedia-suggest
-        :buffer "*helm wikipedia*"))
-
-
-(provide 'helm-net)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-net.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-org.el b/emacs.d/elpa/helm-20150623.1310/helm-org.el
deleted file mode 100644
index 41b82f8..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-org.el
+++ /dev/null
@@ -1,151 +0,0 @@
-;;; helm-org.el --- Helm for org headlines and keywords completion -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'org)
-
-(defgroup helm-org nil
-  "Org related functions for helm."
-  :group 'helm)
-
-(defcustom helm-org-headings-fontify nil
-  "Fontify org buffers before parsing them.
-This reflect fontification in helm-buffer when non--nil.
-NOTE: This will be slow on large org buffers."
-  :group 'helm-org
-  :type 'boolean)
-
-;; Internal
-(defvar helm-org-headings--nofilename nil)
-
-;;; Org capture templates
-;;
-;;
-(defvar org-capture-templates)
-(defun helm-source-org-capture-templates ()
-  (helm-build-sync-source "Org Capture Templates:"
-    :candidates (cl-loop for template in org-capture-templates
-                         collect `(,(nth 1 template) . ,(nth 0 template)))
-    :action '(("Do capture" . (lambda (template-shortcut)
-                                (org-capture nil template-shortcut))))))
-
-;;; Org headings
-;;
-;;
-(defun helm-org-goto-marker (marker)
-  (switch-to-buffer (marker-buffer marker))
-  (goto-char (marker-position marker))
-  (org-show-context)
-  (org-show-entry))
-
-(cl-defun helm-source-org-headings-for-files (filenames
-                                              &optional (min-depth 1) (max-depth 8))
-  (helm-build-sync-source "Org Headings"
-    :candidates (helm-org-get-candidates filenames min-depth max-depth)
-    :action '(("Go to line" . helm-org-goto-marker)
-              ("Refile to this heading" . helm-org-heading-refile)
-              ("Insert link to this heading"
-               . helm-org-insert-link-to-heading-at-marker))))
-
-(defun helm-org-insert-link-to-heading-at-marker (marker)
-  (with-current-buffer (marker-buffer marker)
-    (let ((heading-name (save-excursion (goto-char (marker-position marker))
-                                        (nth 4 (org-heading-components))))
-          (file-name (buffer-file-name)))
-      (with-helm-current-buffer
-        (org-insert-link
-         file-name (concat "file:" file-name "::*" heading-name))))))
-
-(defun helm-org-heading-refile (marker)
-  (with-helm-current-buffer
-    (org-cut-subtree))
-  (let ((target-level (with-current-buffer (marker-buffer marker)
-                       (goto-char (marker-position marker))
-                       (org-current-level))))
-    (helm-org-goto-marker marker)
-    (org-end-of-subtree t t)
-    (org-paste-subtree (+ target-level 1))))
-
-(defun helm-org-get-candidates (filenames min-depth max-depth)
-  (apply #'append
-   (mapcar (lambda (filename)
-             (helm-get-org-candidates-in-file
-              filename min-depth max-depth
-              helm-org-headings-fontify
-              helm-org-headings--nofilename))
-           filenames)))
-
-(defun helm-get-org-candidates-in-file (filename min-depth max-depth
-                                        &optional fontify nofname)
-  (with-current-buffer (pcase filename
-                         ((pred bufferp) filename)
-                         ((pred stringp) (find-file-noselect filename)))
-    (and fontify (jit-lock-fontify-now))
-    (let ((match-fn (if fontify 'match-string 'match-string-no-properties)))
-      (save-excursion
-        (goto-char (point-min))
-        (cl-loop with width = (window-width)
-                 while (re-search-forward org-complex-heading-regexp nil t)
-                 if (let ((num-stars (length (match-string-no-properties 1))))
-                      (and (>= num-stars min-depth) (<= num-stars max-depth)))
-                 collect `(,(let ((heading (funcall match-fn 4))
-                                  (file (unless nofname
-                                          (concat (helm-basename filename) ":")))
-                                  (level (length (match-string-no-properties 1))))
-                              (org-format-outline-path
-                               (append (org-get-outline-path t level heading)
-                                       (list heading)) width file))
-                           . ,(point-marker)))))))
-
-;;;###autoload
-(defun helm-org-agenda-files-headings ()
-  "Preconfigured helm for org files headings."
-  (interactive)
-  (helm :sources (helm-source-org-headings-for-files (org-agenda-files))
-        :candidate-number-limit 99999
-        :buffer "*helm org headings*"))
-
-;;;###autoload
-(defun helm-org-in-buffer-headings ()
-  "Preconfigured helm for org buffer headings."
-  (interactive)
-  (let ((helm-org-headings--nofilename t))
-    (helm :sources (helm-source-org-headings-for-files
-                    (list (current-buffer)))
-          :candidate-number-limit 99999
-          :buffer "*helm org inbuffer*")))
-
-;;;###autoload
-(defun helm-org-capture-templates ()
-  "Preconfigured helm for org templates."
-  (interactive)
-  (helm :sources (helm-source-org-capture-templates)
-        :candidate-number-limit 99999
-        :buffer "*helm org capture templates*"))
-
-
-(provide 'helm-org)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-org.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-pkg.el b/emacs.d/elpa/helm-20150623.1310/helm-pkg.el
deleted file mode 100644
index 421043b..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-(define-package "helm" "20150623.1310" "Helm is an Emacs incremental and narrowing framework"
-  '((emacs "24")
-    (cl-lib "0.5")
-    (async "1.3"))
-  :url "https://emacs-helm.github.io/helm/")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-regexp.el b/emacs.d/elpa/helm-20150623.1310/helm-regexp.el
deleted file mode 100644
index 5e6d8af..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-regexp.el
+++ /dev/null
@@ -1,642 +0,0 @@
-;;; helm-regexp.el --- In buffer regexp searching and replacement for helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-plugin)
-
-
-(defgroup helm-regexp nil
-  "Regexp related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-moccur-always-search-in-current nil
-  "Helm multi occur always search in current buffer when non--nil."
-  :group 'helm-regexp
-  :type 'boolean)
-
-(defcustom helm-moccur-use-ioccur-style-keys t
-  "Similar to `helm-grep-use-ioccur-style-keys' but for multi occur."
-  :group 'helm-regexp
-  :type 'boolean)
-
-(defcustom helm-moccur-auto-update-on-resume nil
-  "Allow auto updating helm-(m)occur buffer when outdated.
-noask => Always update without asking
-nil   => Don't update but signal buffer needs update
-never => Never update and do not signal buffer needs update
-Any other non--nil value update after confirmation."
-  :group 'helm-regexp
-  :type '(radio :tag "Allow auto updating helm-(m)occur buffer when outdated."
-          (const :tag "Always update without asking" noask)
-          (const :tag "Never update and do not signal buffer needs update" never)
-          (const :tag "Don't update but signal buffer needs update" nil)
-          (const :tag "Update after confirmation" t)))
-
-
-(defface helm-moccur-buffer
-    '((t (:foreground "DarkTurquoise" :underline t)))
-  "Face used to highlight moccur buffer names."
-  :group 'helm-regexp)
-
-(defface helm-resume-need-update
-    '((t (:background "red")))
-  "Face used to flash moccur buffer when it needs update."
-  :group 'helm-regexp)
-
-
-(defvar helm-moccur-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
-    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
-    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
-    (define-key map (kbd "C-c ?")    'helm-moccur-help)
-    (define-key map (kbd "C-c o")    'helm-moccur-run-goto-line-ow)
-    (define-key map (kbd "C-c C-o")  'helm-moccur-run-goto-line-of)
-    (define-key map (kbd "C-x C-s")  'helm-moccur-run-save-buffer)
-    (when helm-moccur-use-ioccur-style-keys
-      (define-key map (kbd "<right>")  'helm-execute-persistent-action)
-      (define-key map (kbd "<left>")   'helm-moccur-run-default-action))
-    (delq nil map))
-  "Keymap used in Moccur source.")
-
-
-(defvar helm-build-regexp-history nil)
-(defun helm-query-replace-regexp (_candidate)
-  "Query replace regexp from `helm-regexp'.
-With a prefix arg replace only matches surrounded by word boundaries,
-i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b."
-  (let ((regexp helm-input))
-    (apply 'query-replace-regexp
-           (helm-query-replace-args regexp))))
-
-(defun helm-kill-regexp-as-sexp (_candidate)
-  "Kill regexp in a format usable in lisp code."
-  (helm-regexp-kill-new
-   (prin1-to-string helm-input)))
-
-(defun helm-kill-regexp (_candidate)
-  "Kill regexp as it is in `helm-pattern'."
-  (helm-regexp-kill-new helm-input))
-
-(defun helm-query-replace-args (regexp)
-  "create arguments of `query-replace-regexp' action in `helm-regexp'."
-  (let ((region-only (helm-region-active-p)))
-    (list
-     regexp
-     (query-replace-read-to regexp
-                            (format "Query replace %sregexp %s"
-                                    (if helm-current-prefix-arg "word " "")
-                                    (if region-only "in region " ""))
-                            t)
-     helm-current-prefix-arg
-     (when region-only (region-beginning))
-     (when region-only (region-end)))))
-
-(defvar helm-source-regexp
-  (helm-build-in-buffer-source "Regexp Builder"
-    :init (lambda ()
-            (helm-init-candidates-in-buffer
-                'global (with-temp-buffer
-                          (insert-buffer-substring helm-current-buffer)
-                          (buffer-string))))
-    :get-line #'helm-regexp-get-line
-    :persistent-action #'helm-regexp-persistent-action
-    :persistent-help "Show this line"
-    :multiline t
-    :matchplugin nil
-    :requires-pattern 2
-    :mode-line "Press TAB to select action."
-    :action '(("Kill Regexp as sexp" . helm-kill-regexp-as-sexp)
-              ("Query Replace Regexp (C-u Not inside word.)"
-               . helm-query-replace-regexp)
-              ("Kill Regexp" . helm-kill-regexp))))
-
-(defun helm-regexp-get-line (s e)
-  (let ((matches (match-data))
-        (line    (buffer-substring s e)))
-    (propertize
-     (cl-loop with ln = (format "%5d: %s" (1- (line-number-at-pos s)) line)
-           for i from 0 to (1- (/ (length matches) 2))
-           concat (format "\n         %s'%s'" (format "Group %d: " i)
-                          (match-string i))
-           into ln1
-           finally return (concat ln ln1))
-     'helm-realvalue s)))
-
-(defun helm-regexp-persistent-action (pt)
-  (helm-goto-char pt)
-  (helm-highlight-current-line))
-
-(defun helm-regexp-kill-new (input)
-  (kill-new input)
-  (message "Killed: %s" input))
-
-(defun helm-quote-whitespace (candidate)
-  "Quote whitespace, if some, in string CANDIDATE."
-  (replace-regexp-in-string " " "\\\\ " candidate))
-
-
-;;; Occur
-;;
-;;
-(defvar helm-source-occur nil)
-(defun helm-occur-init-source ()
-  (unless helm-source-occur
-    (setq helm-source-occur
-          (helm-make-source "Occur" 'helm-source-multi-occur))))
-
-
-;;; Multi occur
-;;
-;;
-
-;; Internal
-(defvar helm-multi-occur-buffer-list nil)
-(defvar helm-multi-occur-buffer-tick nil)
-(defun helm-moccur-init ()
-  "Create the initial helm multi occur buffer."
-  (helm-init-candidates-in-buffer
-      'global
-    (cl-loop with buffers = (helm-attr 'moccur-buffers)
-             for buf in buffers
-             for bufstr = (with-current-buffer buf (buffer-string))
-             do (add-text-properties
-                 0 (length bufstr)
-                 `(buffer-name ,(buffer-name (get-buffer buf)))
-                 bufstr)
-             concat bufstr)))
-
-(defun helm-moccur--next-or-previous-char ()
-  (save-excursion
-    (or (re-search-forward "^." nil t)
-        (re-search-backward "^." nil t))))
-
-(defun helm-moccur-get-line (beg end)
-  "Format line for `helm-source-moccur'."
-  (prog1
-      (format "%s:%d:%s"
-              (get-text-property (if (= beg end)
-                                     (helm-moccur--next-or-previous-char)
-                                     beg)
-                                 'buffer-name)
-              (save-restriction
-                (narrow-to-region (or (previous-single-property-change
-                                       (point) 'buffer-name) 1)
-                                  (or (next-single-property-change
-                                       (if (= beg end)
-                                           (helm-moccur--next-or-previous-char)
-                                           (point))
-                                       'buffer-name)
-                                      (point-max)))
-                (line-number-at-pos beg))
-              ;; When matching empty line, use empty string
-              ;; to allow saving and modifying with wgrep.
-              (if (= beg end) "" (buffer-substring beg end)))
-    ;; When matching empty line, forward char ("\n")
-    ;; to not be blocked forever here.
-    (when (= beg end) (forward-char 1))))
-
-(cl-defun helm-moccur-action (candidate
-                              &optional (method (quote buffer)) mark)
-  "Jump to CANDIDATE with METHOD.
-arg METHOD can be one of buffer, buffer-other-window, buffer-other-frame."
-  (require 'helm-grep)
-  (let* ((split (helm-grep-split-line candidate))
-         (buf (car split))
-         (lineno (string-to-number (nth 1 split)))
-         (split-pat (helm-mp-split-pattern helm-input)))
-    (cl-case method
-      (buffer              (switch-to-buffer buf))
-      (buffer-other-window (switch-to-buffer-other-window buf))
-      (buffer-other-frame  (switch-to-buffer-other-frame buf)))
-    (helm-goto-line lineno)
-    ;; Move point to the nearest matching regexp from bol.
-    (cl-loop for reg in split-pat
-          when (save-excursion
-                 (condition-case _err
-                     (re-search-forward reg (point-at-eol) t)
-                   (invalid-regexp nil)))
-          collect (match-beginning 0) into pos-ls
-          finally (when pos-ls (goto-char (apply #'min pos-ls))))
-    (when mark
-      (set-marker (mark-marker) (point))
-      (push-mark (point) 'nomsg))))
-
-(defun helm-moccur-persistent-action (candidate)
-  (helm-moccur-goto-line candidate)
-  (helm-highlight-current-line))
-
-(defun helm-moccur-goto-line (candidate)
-  "From multi occur, switch to buffer and go to nth 1 CANDIDATE line."
-  (helm-moccur-action
-   candidate 'buffer (or current-prefix-arg         ; persistent.
-                         helm-current-prefix-arg))) ; exit.
-
-(defun helm-moccur-goto-line-ow (candidate)
-  "Go to CANDIDATE line in other window.
-Same as `helm-moccur-goto-line' but go in other window."
-  (helm-moccur-action
-   candidate 'buffer-other-window
-   (or current-prefix-arg         ; persistent.
-       helm-current-prefix-arg))) ; exit.
-
-(defun helm-moccur-goto-line-of (candidate)
-  "Go to CANDIDATE line in new frame.
-Same as `helm-moccur-goto-line' but go in new frame."
-  (helm-moccur-action
-   candidate 'buffer-other-frame
-   (or current-prefix-arg         ; persistent.
-       helm-current-prefix-arg))) ; exit.
-
-(defun helm-moccur-run-goto-line-ow ()
-  "Run goto line other window action from `helm-source-moccur'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-moccur-goto-line-ow)))
-
-(defun helm-moccur-run-goto-line-of ()
-  "Run goto line new frame action from `helm-source-moccur'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-moccur-goto-line-of)))
-
-(defun helm-moccur-run-default-action ()
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-moccur-goto-line)))
-
-(defvar helm-source-moccur nil)
-(defclass helm-source-multi-occur (helm-source-in-buffer)
-  ((init :initform (lambda ()
-                     (require 'helm-grep)
-                     (helm-moccur-init)))
-   (filter-one-by-one :initform 'helm-moccur-filter-one-by-one)
-   (get-line :initform helm-moccur-get-line)
-   (nohighlight :initform t)
-   (migemo :initform t)
-   (action :initform '(("Go to Line" . helm-moccur-goto-line)
-                       ("Goto line other window" . helm-moccur-goto-line-ow)
-                       ("Goto line new frame" . helm-moccur-goto-line-of)))
-   (persistent-action :initform 'helm-moccur-persistent-action)
-   (persistent-help :initform "Go to line")
-   (resume :initform 'helm-moccur-resume-fn)
-   (candidate-number-limit :initform 9999)
-   (mode-line :initform helm-moccur-mode-line)
-   (keymap :initform helm-moccur-map)
-   (history :initform 'helm-grep-history)
-   (requires-pattern :initform 2)))
-
-(defun helm-moccur-resume-fn ()
-  (with-helm-buffer
-    (let (new-tick-ls buffer-is-modified)
-      (set (make-local-variable 'helm-multi-occur-buffer-list)
-           (cl-loop for b in helm-multi-occur-buffer-list
-                    when (buffer-live-p (get-buffer b))
-                    collect b))
-      (setq buffer-is-modified (/= (length helm-multi-occur-buffer-list)
-                                   (length (helm-attr 'moccur-buffers))))
-      (helm-attrset 'moccur-buffers helm-multi-occur-buffer-list)
-      (setq new-tick-ls (cl-loop for b in helm-multi-occur-buffer-list
-                                 collect (buffer-chars-modified-tick (get-buffer b))))
-      (when buffer-is-modified
-        (setq helm-multi-occur-buffer-tick new-tick-ls))
-      (cl-assert (> (length helm-multi-occur-buffer-list) 0) nil
-                 "helm-resume error: helm-(m)occur buffer list is empty")
-      (unless (eq helm-moccur-auto-update-on-resume 'never)
-        (when (or buffer-is-modified
-                  (cl-loop for b in helm-multi-occur-buffer-list
-                           for new-tick = (buffer-chars-modified-tick (get-buffer b))
-                           for tick in helm-multi-occur-buffer-tick
-                           thereis (/= tick new-tick)))
-          (helm-aif helm-moccur-auto-update-on-resume
-              (when (or (eq it 'noask)
-                        (y-or-n-p "Helm (m)occur Buffer outdated, update? "))
-                (run-with-idle-timer 0.1 nil (lambda ()
-                                               (with-helm-buffer
-                                                 (helm-force-update)
-                                                 (message "Helm (m)occur Buffer have been udated")
-                                                 (sit-for 1) (message nil))))
-                (unless buffer-is-modified (setq helm-multi-occur-buffer-tick new-tick-ls)))
-            (run-with-idle-timer 0.1 nil (lambda ()
-                                           (with-helm-buffer
-                                             (let ((ov (make-overlay (save-excursion
-                                                                       (goto-char (point-min))
-                                                                       (forward-line 1)
-                                                                       (point))
-                                                                     (point-max))))
-                                               (overlay-put ov 'face 'helm-resume-need-update)
-                                               (sit-for 0.3) (delete-overlay ov)
-                                               (message "[Helm occur Buffer outdated (C-c C-u to update)]")))))
-            (unless buffer-is-modified
-              (with-helm-after-update-hook
-                (setq helm-multi-occur-buffer-tick new-tick-ls)
-                (message "Helm (m)occur Buffer have been udated")))))))))
-
-(defun helm-moccur-filter-one-by-one (candidate)
-  "`filter-one-by-one' function for `helm-source-moccur'."
-  (require 'helm-grep)
-  (let* ((split  (helm-grep-split-line candidate))
-         (buf    (car split))
-         (lineno (nth 1 split))
-         (str    (nth 2 split)))
-    (cons (concat (propertize
-                   buf
-                   'face 'helm-moccur-buffer
-                   'help-echo (buffer-file-name
-                               (get-buffer buf))
-                   'buffer-name buf)
-                  ":"
-                  (propertize lineno 'face 'helm-grep-lineno)
-                  ":"
-                  (helm-grep-highlight-match str t))
-          candidate)))
-
-(defun helm-multi-occur-1 (buffers &optional input)
-  "Main function to call `helm-source-moccur' with BUFFERS list."
-  (let ((bufs (if helm-moccur-always-search-in-current
-                  (cons
-                   ;; will become helm-current-buffer later.
-                   (buffer-name (current-buffer))
-                   (remove helm-current-buffer buffers))
-                  buffers)))
-    (unless helm-source-moccur
-      (setq helm-source-moccur
-            (helm-make-source "Moccur" 'helm-source-multi-occur)))
-    (helm-attrset 'moccur-buffers bufs helm-source-moccur)
-    (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
-    (helm-set-local-variable
-     'helm-multi-occur-buffer-tick
-     (cl-loop for b in bufs
-              collect (buffer-chars-modified-tick (get-buffer b)))))
-  (helm :sources 'helm-source-moccur
-        :buffer "*helm multi occur*"
-        :history 'helm-grep-history
-        :input input
-        :truncate-lines t))
-
-(defun helm-moccur-run-save-buffer ()
-  "Run moccur save results action from `helm-moccur'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action 'helm-moccur-save-results)))
-
-
-;;; helm-moccur-mode
-;;
-;;
-(defvar helm-moccur-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "RET")      'helm-moccur-mode-goto-line)
-    (define-key map (kbd "C-o")      'helm-moccur-mode-goto-line-ow)
-    (define-key map (kbd "<C-down>") 'helm-moccur-mode-goto-line-ow-forward)
-    (define-key map (kbd "<C-up>")   'helm-moccur-mode-goto-line-ow-backward)
-    (define-key map (kbd "<M-down>") 'helm-gm-next-file)
-    (define-key map (kbd "<M-up>")   'helm-gm-precedent-file)
-    (define-key map (kbd "M-n")      'helm-moccur-mode-goto-line-ow-forward)
-    (define-key map (kbd "M-p")      'helm-moccur-mode-goto-line-ow-backward)
-    (define-key map (kbd "M-N")      'helm-gm-next-file)
-    (define-key map (kbd "M-P")      'helm-gm-precedent-file)
-    map))
-
-(defun helm-moccur-mode-goto-line ()
-  (interactive)
-  (helm-aif (get-text-property (point) 'helm-realvalue)
-    (helm-moccur-goto-line it)))
-
-(defun helm-moccur-mode-goto-line-ow ()
-  (interactive)
-  (helm-aif (get-text-property (point) 'helm-realvalue)
-    (helm-moccur-goto-line-ow it)))
-
-(defun helm-moccur-mode-goto-line-ow-forward-1 (arg)
-  (condition-case nil
-      (progn
-        (save-selected-window
-          (helm-moccur-mode-goto-line-ow)
-          (recenter))
-        (forward-line arg))
-    (error nil)))
-
-(defun helm-moccur-mode-goto-line-ow-forward ()
-  (interactive)
-  (helm-moccur-mode-goto-line-ow-forward-1 1))
-
-(defun helm-moccur-mode-goto-line-ow-backward ()
-  (interactive)
-  (helm-moccur-mode-goto-line-ow-forward-1 -1))
-
-(defun helm-moccur-save-results (_candidate)
-  "Save helm moccur results in a `helm-moccur-mode' buffer."
-  (let ((buf "*hmoccur*")
-        new-buf)
-    (when (get-buffer buf)
-      (setq new-buf (helm-read-string "OccurBufferName: " buf))
-      (cl-loop for b in (helm-buffer-list)
-            when (and (string= new-buf b)
-                      (not (y-or-n-p
-                            (format "Buffer `%s' already exists overwrite? "
-                                    new-buf))))
-            do (setq new-buf (helm-read-string "OccurBufferName: " "*hmoccur ")))
-      (setq buf new-buf))
-    (with-current-buffer (get-buffer-create buf)
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (insert "-*- mode: helm-moccur -*-\n\n"
-                (format "Moccur Results for `%s':\n\n" helm-input))
-        (save-excursion
-          (insert (with-current-buffer helm-buffer
-                    (goto-char (point-min)) (forward-line 1)
-                    (buffer-substring (point) (point-max))))))
-      (helm-moccur-mode) (pop-to-buffer buf))
-    (message "Helm Moccur Results saved in `%s' buffer" buf)))
-
-;;;###autoload
-(define-derived-mode helm-moccur-mode
-    special-mode "helm-moccur"
-    "Major mode to provide actions in helm moccur saved buffer.
-
-Special commands:
-\\{helm-moccur-mode-map}"
-    (set (make-local-variable 'helm-multi-occur-buffer-list)
-         (with-helm-buffer helm-multi-occur-buffer-list))
-    (set (make-local-variable 'revert-buffer-function)
-         #'helm-moccur-mode--revert-buffer-function))
-
-(defun helm-moccur-mode--revert-buffer-function (&optional _ignore-auto _noconfirm)
-  (goto-char (point-min))
-  (let (pattern)
-    (when (re-search-forward "^Moccur Results for `\\(.*\\)'" nil t)
-      (setq pattern (match-string 1))
-      (forward-line 0)
-      (when (re-search-forward "^$" nil t)
-        (forward-line 1))
-      (let ((inhibit-read-only t)
-            (buffer (current-buffer))
-            (buflst helm-multi-occur-buffer-list))
-        (delete-region (point) (point-max))
-        (message "Reverting buffer...")
-        (save-excursion
-          (with-temp-buffer
-            (insert
-             "\n"
-             (cl-loop for buf in buflst
-                      for bufstr = (or (and (buffer-live-p (get-buffer buf))
-                                            (with-current-buffer buf
-                                              (buffer-string)))
-                                       "")
-                      unless (string= bufstr "")
-                      do (add-text-properties
-                          0 (length bufstr)
-                          `(buffer-name ,(buffer-name (get-buffer buf)))
-                          bufstr)
-                      concat bufstr)
-             "\n")
-            (goto-char (point-min))
-            (cl-loop while (re-search-forward pattern nil t)
-                     for line = (helm-moccur-get-line (point-at-bol) (point-at-eol))
-                     when line
-                     do (with-current-buffer buffer
-                          (insert
-                           (propertize
-                            (car (helm-moccur-filter-one-by-one line))
-                            'helm-realvalue line)
-                           "\n")))))
-        (message "Reverting buffer done")))))
-
-
-;;; Predefined commands
-;;
-;;
-
-;;;###autoload
-(defun helm-regexp ()
-  "Preconfigured helm to build regexps.
-`query-replace-regexp' can be run from there against found regexp."
-  (interactive)
-  (save-restriction
-    (when (and (helm-region-active-p)
-               ;; Don't narrow to region if buffer is already narrowed.
-               (not (helm-current-buffer-narrowed-p (current-buffer))))
-      (narrow-to-region (region-beginning) (region-end)))
-    (helm :sources helm-source-regexp
-          :buffer "*helm regexp*"
-          :prompt "Regexp: "
-          :history 'helm-build-regexp-history)))
-
-;;;###autoload
-(defun helm-occur ()
-  "Preconfigured helm for Occur."
-  (interactive)
-  (helm-occur-init-source)
-  (let ((bufs (list (buffer-name (current-buffer)))))
-    (helm-attrset 'moccur-buffers bufs helm-source-occur)
-    (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
-    (helm-set-local-variable
-     'helm-multi-occur-buffer-tick
-     (cl-loop for b in bufs
-              collect (buffer-chars-modified-tick (get-buffer b)))))
-  (helm :sources 'helm-source-occur
-        :buffer "*helm occur*"
-        :history 'helm-grep-history
-        :preselect (and (memq 'helm-source-occur helm-sources-using-default-as-input)
-                        (format "%s:%d:" (regexp-quote (buffer-name))
-                                (line-number-at-pos (point))))
-        :truncate-lines t))
-
-;;;###autoload
-(defun helm-occur-from-isearch ()
-  "Invoke `helm-occur' from isearch."
-  (interactive)
-  (let ((input (if isearch-regexp
-                   isearch-string
-                 (regexp-quote isearch-string)))
-        (bufs (list (buffer-name (current-buffer)))))
-    (isearch-exit)
-    (helm-occur-init-source)
-    (helm-attrset 'moccur-buffers bufs helm-source-occur)
-    (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
-    (helm-set-local-variable
-     'helm-multi-occur-buffer-tick
-     (cl-loop for b in bufs
-              collect (buffer-chars-modified-tick (get-buffer b))))
-    (helm :sources 'helm-source-occur
-          :buffer "*helm occur*"
-          :history 'helm-grep-history
-          :input input
-          :truncate-lines t)))
-
-;;;###autoload
-(defun helm-multi-occur (buffers)
-  "Preconfigured helm for multi occur.
-
-  BUFFERS is a list of buffers to search through.
-With a prefix arg, reverse the behavior of
-`helm-moccur-always-search-in-current'.
-The prefix arg can be set before calling `helm-multi-occur'
-or during the buffer selection."
-  (interactive (list (helm-comp-read
-                      "Buffers: " (helm-buffer-list)
-                      :marked-candidates t)))
-  (let ((helm-moccur-always-search-in-current
-         (if (or current-prefix-arg
-                 helm-current-prefix-arg)
-             (not helm-moccur-always-search-in-current)
-           helm-moccur-always-search-in-current)))
-    (helm-multi-occur-1 buffers)))
-
-;;;###autoload
-(defun helm-multi-occur-from-isearch (&optional _arg)
-  "Invoke `helm-multi-occur' from isearch.
-
-With a prefix arg, reverse the behavior of
-`helm-moccur-always-search-in-current'.
-The prefix arg can be set before calling
-`helm-multi-occur-from-isearch' or during the buffer selection."
-  (interactive "p")
-  (let (buf-list
-        helm-moccur-always-search-in-current
-        (input (if isearch-regexp
-                   isearch-string
-                 (regexp-quote isearch-string))))
-    (isearch-exit)
-    (setq buf-list (helm-comp-read "Buffers: "
-                                   (helm-buffer-list)
-                                   :name "Occur in buffer(s)"
-                                   :marked-candidates t))
-    (setq helm-moccur-always-search-in-current
-          (if (or current-prefix-arg
-                  helm-current-prefix-arg)
-              (not helm-moccur-always-search-in-current)
-            helm-moccur-always-search-in-current))
-    (helm-multi-occur-1 buf-list input)))
-
-
-(provide 'helm-regexp)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-regexp.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-ring.el b/emacs.d/elpa/helm-20150623.1310/helm-ring.el
deleted file mode 100644
index 96913d7..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-ring.el
+++ /dev/null
@@ -1,446 +0,0 @@
-;;; helm-ring.el --- kill-ring, mark-ring, and register browsers for helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-(require 'helm-elisp)
-
-(declare-function undo-tree-restore-state-from-register "ext:undo-tree.el" (register))
-
-
-(defgroup helm-ring nil
-  "Ring related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-kill-ring-threshold 3
-  "Minimum length of a candidate to be listed by `helm-source-kill-ring'."
-  :type 'integer
-  :group 'helm-ring)
-
-(defcustom helm-kill-ring-max-lines-number 5
-  "Max number of lines displayed per candidate in kill-ring browser.
-If nil or zero (disabled), don't truncate candidate, show all."
-  :type '(choice (const :tag "Disabled" nil)
-          (integer :tag "Max number of lines"))
-  :group 'helm-ring)
-
-(defcustom helm-register-max-offset 160
-  "Max size of string register entries before truncating."
-  :group 'helm-ring
-  :type  'integer)
-
-
-;;; Kill ring
-;;
-;;
-(defvar helm-kill-ring-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-y") 'helm-next-line)
-    (define-key map (kbd "M-u") 'helm-previous-line)
-    map)
-  "Keymap for `helm-show-kill-ring'.")
-
-(defvar helm-source-kill-ring
-  (helm-build-sync-source "Kill Ring"
-    :init (lambda () (helm-attrset 'last-command last-command))
-    :candidates #'helm-kill-ring-candidates
-    :filtered-candidate-transformer #'helm-kill-ring-transformer
-    :action '(("Yank" . helm-kill-ring-action)
-              ("Delete" . (lambda (candidate)
-                            (cl-loop for cand in (helm-marked-candidates)
-                                     do (setq kill-ring
-                                              (delete cand kill-ring))))))
-    :persistent-action (lambda (_candidate) (ignore))
-    :persistent-help "DoNothing"
-    :keymap helm-kill-ring-map
-    :migemo t
-    :multiline t)
-  "Source for browse and insert contents of kill-ring.")
-
-(defun helm-kill-ring-candidates ()
-  (cl-loop for kill in (helm-fast-remove-dups kill-ring :test 'equal)
-        unless (or (< (length kill) helm-kill-ring-threshold)
-                   (string-match "\\`[\n[:blank:]]+\\'" kill))
-        collect kill))
-
-(defun helm-kill-ring-transformer (candidates _source)
-  "Display only the `helm-kill-ring-max-lines-number' lines of candidate."
-  (cl-loop for i in candidates
-           when (get-text-property 0 'read-only i)
-           do (set-text-properties 0 (length i) '(read-only nil) i)
-           for nlines = (with-temp-buffer (insert i) (count-lines (point-min) (point-max)))
-           if (and helm-kill-ring-max-lines-number
-                   (> nlines helm-kill-ring-max-lines-number))
-           collect (cons
-                    (with-temp-buffer
-                      (insert i)
-                      (goto-char (point-min))
-                      (concat
-                       (buffer-substring
-                        (point-min)
-                        (save-excursion
-                          (forward-line helm-kill-ring-max-lines-number)
-                          (point)))
-                       "[...]")) i)
-           else collect i))
-
-(defun helm-kill-ring-action (str)
-  "Insert STR in `kill-ring' and set STR to the head.
-If this action is executed just after `yank',
-replace with STR as yanked string."
-  (with-helm-current-buffer
-    (setq kill-ring (delete str kill-ring))
-    (if (not (eq (helm-attr 'last-command helm-source-kill-ring) 'yank))
-        (insert-for-yank str)
-      ;; from `yank-pop'
-      (let ((inhibit-read-only t)
-            (before (< (point) (mark t))))
-        (if before
-            (funcall (or yank-undo-function 'delete-region) (point) (mark t))
-          (funcall (or yank-undo-function 'delete-region) (mark t) (point)))
-        (setq yank-undo-function nil)
-        (set-marker (mark-marker) (point) helm-current-buffer)
-        (insert-for-yank str)
-        ;; Set the window start back where it was in the yank command,
-        ;; if possible.
-        (set-window-start (selected-window) yank-window-start t)
-        (when before
-          ;; This is like exchange-point-and-mark, but doesn't activate the mark.
-          ;; It is cleaner to avoid activation, even though the command
-          ;; loop would deactivate the mark because we inserted text.
-          (goto-char (prog1 (mark t)
-                       (set-marker (mark-marker) (point) helm-current-buffer))))))
-    (kill-new str)))
-
-
-;;;; <Mark ring>
-;; DO NOT use these sources with other sources use
-;; the commands `helm-mark-ring', `helm-global-mark-ring' or
-;; `helm-all-mark-rings' instead.
-
-(defun helm-mark-ring-get-marks (pos)
-  (save-excursion
-    (goto-char pos)
-    (forward-line 0)
-    (let ((line  (car (split-string (thing-at-point 'line) "[\n\r]"))))
-      (when (string= "" line)
-        (setq line  "<EMPTY LINE>"))
-      (format "%7d: %s" (line-number-at-pos) line))))
-
-(defun helm-mark-ring-get-candidates ()
-  (with-helm-current-buffer
-    (cl-loop with marks = (if (mark t) (cons (mark-marker) mark-ring) mark-ring)
-          for i in marks
-          for m = (helm-mark-ring-get-marks i)
-          unless (and recip (member m recip))
-          collect m into recip
-          finally return recip)))
-
-(defvar helm-source-mark-ring
-  (helm-build-sync-source "mark-ring"
-    :candidates #'helm-mark-ring-get-candidates
-    :action '(("Goto line"
-               . (lambda (candidate)
-                   (helm-goto-line (string-to-number candidate))))) 
-    :persistent-action (lambda (candidate)
-                         (helm-goto-line (string-to-number candidate))
-                         (helm-highlight-current-line))
-    :persistent-help "Show this line"))
-
-;;; Global-mark-ring
-(defvar helm-source-global-mark-ring
-  (helm-build-sync-source "global-mark-ring"
-    :candidates #'helm-global-mark-ring-get-candidates
-    :action '(("Goto line"
-              . (lambda (candidate)
-                  (let ((items (split-string candidate ":")))
-                    (switch-to-buffer (cl-second items))
-                    (helm-goto-line (string-to-number (car items)))))))
-    :persistent-action (lambda (candidate)
-                         (let ((items (split-string candidate ":")))
-                           (switch-to-buffer (cl-second items))
-                           (helm-goto-line (string-to-number (car items)))
-                           (helm-highlight-current-line)))
-    :persistent-help "Show this line"))
-
-(defun helm-global-mark-ring-format-buffer (marker)
-  (with-current-buffer (marker-buffer marker)
-    (goto-char marker)
-    (forward-line 0)
-    (let ((line (car (split-string (thing-at-point 'line) "[\n\r]"))))
-      (when (string= "" line) (setq line  "<EMPTY LINE>")) 
-      (format "%7d:%s:    %s"
-              (line-number-at-pos) (marker-buffer marker) line))))
-
-(defun helm-global-mark-ring-get-candidates ()
-  (let ((marks global-mark-ring))
-    (when marks
-      (cl-loop for i in marks
-               for mb = (marker-buffer i)
-               for gm = (unless (or (string-match "^ " (format "%s" mb))
-                                    (null mb))
-                          (helm-global-mark-ring-format-buffer i))
-               when (and gm (not (member gm recip)))
-               collect gm into recip
-               finally return recip))))
-
-(defun helm--push-mark (&optional location nomsg activate)
-  "[Internal] Don't use directly, use instead `helm-push-mark-mode'."
-  (unless (null (mark t))
-    (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
-    (when (> (length mark-ring) mark-ring-max)
-      (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
-      (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil)))
-  (set-marker (mark-marker) (or location (point)) (current-buffer))
-  ;; Now push the mark on the global mark ring.
-  (setq global-mark-ring (cons (copy-marker (mark-marker))
-                               ;; Avoid having multiple entries
-                               ;; for same buffer in `global-mark-ring'.
-                               (cl-loop with mb = (current-buffer)
-                                        for m in global-mark-ring
-                                        for nmb = (marker-buffer m)
-                                        unless (eq mb nmb)
-                                        collect m)))
-  (when (> (length global-mark-ring) global-mark-ring-max)
-    (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) nil)
-    (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil))
-  (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
-      (message "Mark set"))
-  (when (or activate (not transient-mark-mode))
-    (set-mark (mark t)))
-  nil)
-
-;;;###autoload
-(define-minor-mode helm-push-mark-mode
-    "Provide an improved version of `push-mark'.
-Modify the behavior of `push-mark' to update
-the `global-mark-ring' after each new visit."
-  :group 'helm-ring
-  :global t
-  (if helm-push-mark-mode
-      (advice-add 'push-mark :override #'helm--push-mark)
-      (advice-remove 'push-mark #'helm--push-mark)))
-
-;;;; <Register>
-;;; Insert from register
-(defvar helm-source-register
-  (helm-build-sync-source "Registers"
-    :candidates #'helm-register-candidates
-    :action-transformer #'helm-register-action-transformer
-    :multiline t
-    :action nil)
-  "See (info \"(emacs)Registers\")")
-
-(defun helm-register-candidates ()
-  "Collecting register contents and appropriate commands."
-  (cl-loop for (char . val) in register-alist
-        for key    = (single-key-description char)
-        for string-actions =
-        (cond
-          ((numberp val)
-           (list (int-to-string val)
-                 'insert-register
-                 'increment-register))
-          ((markerp val)
-           (let ((buf (marker-buffer val)))
-             (if (null buf)
-                 (list "a marker in no buffer")
-               (list (concat
-                      "a buffer position:"
-                      (buffer-name buf)
-                      ", position "
-                      (int-to-string (marker-position val)))
-                     'jump-to-register
-                     'insert-register))))
-          ((and (consp val) (window-configuration-p (car val)))
-           (list "window configuration."
-                 'jump-to-register))
-          ((and (vectorp val)
-                (fboundp 'undo-tree-register-data-p)
-                (undo-tree-register-data-p (elt val 1)))
-           (list
-            "Undo-tree entry."
-            'undo-tree-restore-state-from-register))
-          ((or (and (vectorp val) (eq 'registerv (aref val 0)))
-               (and (consp val) (frame-configuration-p (car val))))
-           (list "frame configuration."
-                 'jump-to-register))
-          ((and (consp val) (eq (car val) 'file))
-           (list (concat "file:"
-                         (prin1-to-string (cdr val))
-                         ".")
-                 'jump-to-register))
-          ((and (consp val) (eq (car val) 'file-query))
-           (list (concat "file:a file-query reference: file "
-                         (car (cdr val))
-                         ", position "
-                         (int-to-string (car (cdr (cdr val))))
-                         ".")
-                 'jump-to-register))
-          ((consp val)
-           (let ((lines (format "%4d" (length val))))
-             (list (format "%s: %s\n" lines
-                           (truncate-string-to-width
-                            (mapconcat 'identity (list (car val))
-                                       "^J") (- (window-width) 15)))
-                   'insert-register)))
-          ((stringp val)
-           (list
-            ;; without properties
-            (concat (substring-no-properties
-                     val 0 (min (length val) helm-register-max-offset))
-                    (if (> (length val) helm-register-max-offset)
-                        "[...]" ""))
-            'insert-register
-            'append-to-register
-            'prepend-to-register))
-          (t
-           "GARBAGE!"))
-        collect (cons (format "Register %3s:\n %s" key (car string-actions))
-                      (cons char (cdr string-actions)))))
-
-(defun helm-register-action-transformer (_actions register-and-functions)
-  "Decide actions by the contents of register."
-  (cl-loop with func-actions =
-        '((insert-register
-           "Insert Register" .
-           (lambda (c) (insert-register (car c))))
-          (jump-to-register
-           "Jump to Register" .
-           (lambda (c) (jump-to-register (car c))))
-          (append-to-register
-           "Append Region to Register" .
-           (lambda (c) (append-to-register
-                        (car c) (region-beginning) (region-end))))
-          (prepend-to-register
-           "Prepend Region to Register" .
-           (lambda (c) (prepend-to-register
-                        (car c) (region-beginning) (region-end))))
-          (increment-register
-           "Increment Prefix Arg to Register" .
-           (lambda (c) (increment-register
-                        helm-current-prefix-arg (car c))))
-          (undo-tree-restore-state-from-register
-           "Restore Undo-tree register"
-           (lambda (c) (and (fboundp 'undo-tree-restore-state-from-register)
-                            (undo-tree-restore-state-from-register (car c))))))
-        for func in (cdr register-and-functions)
-        for cell = (assq func func-actions)
-        when cell
-        collect (cdr cell)))
-
-;;;###autoload
-(defun helm-mark-ring ()
-  "Preconfigured `helm' for `helm-source-mark-ring'."
-  (interactive)
-  (helm :sources 'helm-source-mark-ring
-        :resume 'noresume
-        :buffer "*helm mark*"))
-
-;;;###autoload
-(defun helm-global-mark-ring ()
-  "Preconfigured `helm' for `helm-source-global-mark-ring'."
-  (interactive)
-  (helm :sources 'helm-source-global-mark-ring
-        :resume 'noresume
-        :buffer "*helm global mark*"))
-
-;;;###autoload
-(defun helm-all-mark-rings ()
-  "Preconfigured `helm' for `helm-source-global-mark-ring' and \
-`helm-source-mark-ring'."
-  (interactive)
-  (helm :sources '(helm-source-mark-ring
-                   helm-source-global-mark-ring)
-        :resume 'noresume
-        :buffer "*helm mark ring*"))
-
-;;;###autoload
-(defun helm-register ()
-  "Preconfigured `helm' for Emacs registers."
-  (interactive)
-  (helm :sources 'helm-source-register
-        :resume 'noresume
-        :buffer "*helm register*"))
-
-;;;###autoload
-(defun helm-show-kill-ring ()
-  "Preconfigured `helm' for `kill-ring'.
-It is drop-in replacement of `yank-pop'.
-
-First call open the kill-ring browser, next calls move to next line."
-  (interactive)
-  (let ((enable-recursive-minibuffers t))
-    (helm :sources helm-source-kill-ring
-          :buffer "*helm kill ring*"
-          :resume 'noresume
-          :allow-nest t)))
-
-(defvar helm-kmacro-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?") 'helm-kmacro-help)
-    map))
-
-;;;###autoload
-(defun helm-execute-kmacro ()
-  "Preconfigured helm for keyboard macros.
-Define your macros with `f3' and `f4'.
-See (info \"(emacs) Keyboard Macros\") for detailed infos.
-This command is useful when used with persistent action."
-  (interactive)
-  (helm :sources
-        (helm-build-sync-source "Kmacro"
-          :candidates (lambda ()
-                        (helm-fast-remove-dups
-                         (cons (kmacro-ring-head)
-                               kmacro-ring)
-                         :test 'equal))
-          :multiline t
-          :keymap helm-kmacro-map
-          :candidate-transformer
-          (lambda (candidates)
-            (cl-loop for c in candidates collect
-                     (propertize (help-key-description (car c) nil)
-                                 'helm-realvalue c)))
-          :persistent-help "Execute kmacro"
-          :action
-          (helm-make-actions
-           "Execute kmacro (`C-u <n>' to execute <n> times)"
-           (lambda (candidate)
-             (interactive)
-             ;; Move candidate on top of list for next use.
-             (setq kmacro-ring (delete candidate kmacro-ring))
-             (kmacro-push-ring)
-             (kmacro-split-ring-element candidate)
-             (kmacro-exec-ring-item
-              candidate helm-current-prefix-arg))))
-        :buffer "*helm kmacro*"))
-
-(provide 'helm-ring)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-ring.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-semantic.el b/emacs.d/elpa/helm-20150623.1310/helm-semantic.el
deleted file mode 100644
index 7fcdbee..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-semantic.el
+++ /dev/null
@@ -1,223 +0,0 @@
-;;; helm-semantic.el --- Helm interface for Semantic -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Daniel Hackney <dan@haxney.org>
-;; Author: Daniel Hackney <dan@haxney.org>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Uses `candidates-in-buffer' for speed.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'semantic)
-(require 'helm-imenu)
-
-(declare-function pulse-momentary-highlight-one-line "pulse.el" (point &optional face))
-
-(defgroup helm-semantic nil
-  "Semantic tags related libraries and applications for helm."
-  :group 'helm)
-
-(defcustom helm-semantic-lynx-style-map t
-  "Use Arrow keys to jump to occurences."
-  :group 'helm-semantic
-  :type  'boolean)
-
-(defcustom helm-semantic-display-style
-  '((python-mode . semantic-format-tag-summarize)
-    (c-mode . semantic-format-tag-concise-prototype-c-mode)
-    (emacs-lisp-mode . semantic-format-tag-abbreviate-emacs-lisp-mode))
-  "Function to present a semantic tag according to `major-mode'.
-
-It is an alist where the `car' of each element is a `major-mode' and
-the `cdr' a `semantic-format-tag-*' function.
-
-If no function is found for current `major-mode', fall back to
-`semantic-format-tag-summarize' default function.
-
-You can have more or less informations depending of the `semantic-format-tag-*'
-function you choose.
-
-All the supported functions are prefixed with \"semantic-format-tag-\",
-you have completion on these functions with `C-M i' in the customize interface."
-  :group 'helm-semantic
-  :type '(alist :key-type symbol :value-type symbol))
-
-;;; keymap
-(defvar helm-semantic-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?") 'helm-semantic-help)
-    (when helm-semantic-lynx-style-map
-      (define-key map (kbd "<left>")  'helm-maybe-exit-minibuffer)
-      (define-key map (kbd "<right>") 'helm-execute-persistent-action))
-    (delq nil map)))
-
-;; Internals vars
-(defvar helm-semantic--tags-cache nil)
-
-(defun helm-semantic--fetch-candidates (tags depth &optional class)
-  "Write the contents of TAGS to the current buffer."
-  (let ((class class) cur-type
-        (stylefn (or (with-helm-current-buffer
-                       (assoc-default major-mode helm-semantic-display-style))
-                     #'semantic-format-tag-summarize)))
-    (cl-dolist (tag tags)
-      (when (listp tag)
-        (cl-case (setq cur-type (semantic-tag-class tag))
-          ((function variable type)
-           (let ((spaces (make-string (* depth 2) ?\s))
-                 (type-p (eq cur-type 'type)))
-             (unless (and (> depth 0) (not type-p))
-               (setq class nil))
-             (insert
-              (if (and class (not type-p))
-                  (format "%s%s(%s) "
-                          spaces (if (< depth 2) "" "├►") class)
-                spaces)
-              ;; Save the tag for later
-              (propertize (funcall stylefn tag nil t)
-                          'semantic-tag tag)
-              "\n")
-             (and type-p (setq class (car tag)))
-             ;; Recurse to children
-             (unless (eq cur-type 'function)
-               (helm-semantic--fetch-candidates
-                (semantic-tag-components tag) (1+ depth) class))))
-
-          ;; Don't do anything with packages or includes for now
-          ((package include)
-           (insert
-            (propertize (funcall stylefn tag nil t)
-                        'semantic-tag tag)
-            "\n")
-           )
-          ;; Catch-all
-          (t))))))
-
-(defun helm-semantic-default-action (_candidate &optional persistent)
-  ;; By default, helm doesn't pass on the text properties of the selection.
-  ;; Fix this.
-  (helm-log-run-hook 'helm-goto-line-before-hook)
-  (with-current-buffer helm-buffer
-    (when (looking-at " ")
-      (goto-char (next-single-property-change
-                  (point-at-bol) 'semantic-tag nil (point-at-eol)))) 
-    (let ((tag (get-text-property (point) 'semantic-tag)))
-      (semantic-go-to-tag tag)
-      (unless persistent
-        (pulse-momentary-highlight-one-line (point))))))
-
-(defun helm-semantic--maybe-set-needs-update ()
-  (with-helm-current-buffer
-    (when (semantic-parse-tree-needs-update-p)
-      (semantic-parse-tree-set-needs-update))))
-
-(defvar helm-source-semantic nil)
-
-(defclass helm-semantic-source (helm-source-in-buffer)
-  ((init :initform (lambda ()
-                     (helm-semantic--maybe-set-needs-update)
-                     (setq helm-semantic--tags-cache (semantic-fetch-tags))
-                     (with-current-buffer (helm-candidate-buffer 'global)
-                       (let ((major-mode (with-helm-current-buffer major-mode)))
-                         (helm-semantic--fetch-candidates helm-semantic--tags-cache 0)))))
-   (get-line :initform 'buffer-substring)
-   (persistent-help :initform "Show this entry")
-   (keymap :initform 'helm-semantic-map)
-   (mode-line :initform helm-semantic-mode-line)
-   (persistent-action :initform (lambda (elm)
-                                  (helm-semantic-default-action elm t)
-                                  (helm-highlight-current-line)))
-   (action :initform 'helm-semantic-default-action)))
-
-(defcustom helm-semantic-fuzzy-match nil
-  "Enable fuzzy matching in `helm-source-semantic'."
-  :group 'helm-semantic
-  :type  'boolean
-  :set (lambda (var val)
-         (set var val)
-         (setq helm-source-semantic
-               (helm-make-source "Semantic Tags" 'helm-semantic-source
-                 :fuzzy-match helm-semantic-fuzzy-match))))
-
-;;;###autoload
-(defun helm-semantic (arg)
-  "Preconfigured `helm' for `semantic'.
-If ARG is supplied, pre-select symbol at point instead of current"
-  (interactive "P")
-  (let ((tag (helm-aif (semantic-current-tag-parent)
-                  (cons (format "\\_<%s\\_>" (car it))
-                        (format "\\_<%s\\_>" (car (semantic-current-tag))))
-                (format "\\_<%s\\_>" (car (semantic-current-tag))))))
-    (unless helm-source-semantic
-      (setq helm-source-semantic
-            (helm-make-source "Semantic Tags" 'helm-semantic-source
-              :fuzzy-match helm-semantic-fuzzy-match)))
-    (helm :sources 'helm-source-semantic
-          :candidate-number-limit 9999
-          :preselect (if arg
-                         (thing-at-point 'symbol)
-                       tag)
-          :buffer "*helm semantic*")))
-
-;;;###autoload
-(defun helm-semantic-or-imenu (arg)
-  "Preconfigured helm for `semantic' or `imenu'.
-If ARG is supplied, pre-select symbol at point instead of current
-semantic tag in scope.
-
-If `semantic-mode' is active in the current buffer, then use
-semantic for generating tags, otherwise fall back to `imenu'.
-Fill in the symbol at point by default."
-  (interactive "P")
-  (unless helm-source-semantic
-    (setq helm-source-semantic
-          (helm-make-source "Semantic Tags" 'helm-semantic-source
-            :fuzzy-match helm-semantic-fuzzy-match)))
-  (unless helm-source-imenu
-    (setq helm-source-imenu
-          (helm-make-source "Imenu" 'helm-imenu-source
-            :fuzzy-match helm-imenu-fuzzy-match)))
-  (let* ((source (if (semantic-active-p)
-                     'helm-source-semantic
-                     'helm-source-imenu))
-         (imenu-p (eq source 'helm-source-imenu))
-         (imenu-auto-rescan imenu-p)
-         (helm-execute-action-at-once-if-one
-          (and imenu-p
-               helm-imenu-execute-action-at-once-if-one))
-         (tag (helm-aif (semantic-current-tag-parent)
-                  (cons (format "\\_<%s\\_>" (car it))
-                        (format "\\_<%s\\_>" (car (semantic-current-tag))))
-                (format "\\_<%s\\_>" (car (semantic-current-tag))))))
-    (helm :sources source
-          :candidate-number-limit 9999
-          :preselect (if (or arg imenu-p)
-                         (thing-at-point 'symbol)
-                         tag)
-          :buffer "*helm semantic/imenu*")))
-
-(provide 'helm-semantic)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-semantic.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-source.el b/emacs.d/elpa/helm-20150623.1310/helm-source.el
deleted file mode 100644
index c983991..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-source.el
+++ /dev/null
@@ -1,1153 +0,0 @@
-;;; helm-source.el --- Helm source creation. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2015  Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
-;; URL: http://github.com/emacs-helm/helm
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Interface to create helm sources easily.
-;; Actually the eieo objects are transformed in alist for compatibility.
-;; In the future this package should allow creating source as eieo objects
-;; without conversion to alist, teaching helm to read such a structure.
-;; The compatibility with alists would be kept.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'eieio)
-
-
-(defgeneric helm--setup-source (source)
-  "Prepare slots and handle slot errors before creating a helm source.")
-
-(defgeneric helm-setup-user-source (source)
-  "Allow users modifying slots in SOURCE just before creation.")
-
-
-;;; Classes for sources
-;;
-;;
-(defclass helm-source ()
-  ((name
-    :initarg :name
-    :initform nil
-    :custom string
-    :documentation
-    "  The name of the source.
-  A string which is also the heading which appears
-  above the list of matches from the source. Must be unique.")
-
-   (header-name
-    :initarg :header-name
-    :initform nil
-    :custom function
-    :documentation
-    "  A function returning the display string of the header.
-  Its argument is the name of the source. This attribute is useful to
-  add an additional information with the source name.
-  It doesn't modify the name of the source.")
-   
-   (init
-    :initarg :init
-    :initform nil
-    :custom function
-    :documentation
-    "  Function called with no parameters when helm is started.
-  It is useful for collecting current state information which can be
-  used to create the list of candidates later.
-  Initialization of `candidates-in-buffer' is done here
-  with `helm-init-candidates-in-buffer'.")
-
-   (candidates
-    :initarg :candidates
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  Specifies how to retrieve candidates from the source.
-  It can either be a variable name, a function called with no parameters
-  or the actual list of candidates.
-  
-  The list must be a list whose members are strings, symbols
-  or (DISPLAY . REAL) pairs.
-  
-  In case of (DISPLAY . REAL) pairs, the DISPLAY string is shown
-  in the Helm buffer, but the REAL one is used as action
-  argument when the candidate is selected. This allows a more
-  readable presentation for candidates which would otherwise be,
-  for example, too long or have a common part shared with other
-  candidates which can be safely replaced with an abbreviated
-  string for display purposes.
-  
-  Note that if the (DISPLAY . REAL) form is used then pattern
-  matching is done on the displayed string, not on the real
-  value.")
-   
-   (update
-    :initarg :update
-    :initform nil
-    :custom function
-    :documentation
-    "  Function called with no parameters at before \"init\" function
-  when `helm-force-update' is called.")
-
-   (cleanup
-    :initarg :cleanup
-    :initform nil
-    :custom function
-    :documentation
-    "  Function called with no parameters when *helm* buffer is
-  closed. It is useful for killing unneeded candidates buffer.
-
-  Note that the function is executed BEFORE performing action.")
-   
-   (delayed
-    :initarg :delayed
-    :initform nil
-    :custom (choice null integer)
-    :documentation
-    "  Candidates from the source are shown only if the user stops
-  typing and is idle for `helm-idle-delay' seconds.
-  If a value is given to delayed attr, this value is used instead only
-  if it is > to `helm-idle-delay'.")
-   
-   (keymap
-    :initarg :keymap
-    :initform nil
-    :custom sexp
-    :documentation
-    "  Specific keymap for this source.
-  It is useful to have a keymap per source when using more than
-  one source.  Otherwise, a keymap can be set per command with
-  `helm' argument KEYMAP.  NOTE: when a source have `helm-map' as
-  keymap attr, the global value of `helm-map' will override the
-  actual local one.")
-   
-   (action
-    :initarg :action
-    :initform 'identity
-    :custom (alist :key-type string
-                   :value-type function)
-    :documentation
-    "  It is a list of (DISPLAY . FUNCTION) pairs or FUNCTION.
-  FUNCTION is called with one parameter: the selected candidate.
-
-  An action other than the default can be chosen from this list
-  of actions for the currently selected candidate (by default
-  with TAB). The DISPLAY string is shown in the completions
-  buffer and the FUNCTION is invoked when an action is
-  selected. The first action of the list is the default.
-
-  You should use `helm-make-actions' to build this alist easily.")
-
-   (persistent-action
-    :initarg :persistent-action
-    :initform nil
-    :custom function
-    :documentation
-    "  Can be a either a Function called with one parameter (the
-  selected candidate) or a cons cell where first element is this
-  same function and second element a symbol (e.g never-split)
-  that inform `helm-execute-persistent-action'to not split his
-  window to execute this persistent action.")
-
-   (persistent-help
-    :initarg :persistent-help
-    :initform nil
-    :custom string
-    :documentation
-    "  A string to explain persistent-action of this source. It also
-  accepts a function or a variable name.
-  It will be displayed in `header-line'.
-  Have no effect when `helm-echo-input-in-header-line' is non--nil.")
-
-   (help-message
-    :initarg :help-message
-    :initform nil
-    :custom (choice string function)
-    :documentation
-    "  Help message for this source.
-  If not present, `helm-help-message' value will be used.")
-   
-   (multiline
-    :initarg :multiline
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Enable to selection multiline candidates.")
-   
-   (requires-pattern
-    :initarg :requires-pattern
-    :initform nil
-    :custom integer
-    :documentation
-    "  If present matches from the source are shown only if the
-  pattern is not empty. Optionally, it can have an integer
-  parameter specifying the required length of input which is
-  useful in case of sources with lots of candidates.")
-
-   (candidate-transformer
-    :initarg :candidate-transformer
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  It's a function or a list of functions called with one argument
-  when the completion list from the source is built. The argument
-  is the list of candidates retrieved from the source. The
-  function should return a transformed list of candidates which
-  will be used for the actual completion.  If it is a list of
-  functions, it calls each function sequentially.
-
-  This can be used to transform or remove items from the list of
-  candidates.
-
-  Note that `candidates' is run already, so the given transformer
-  function should also be able to handle candidates with (DISPLAY
-  . REAL) format.")
-   
-   (filtered-candidate-transformer
-    :initarg :filtered-candidate-transformer
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  It has the same format as `candidate-transformer', except the
-  function is called with two parameters: the candidate list and
-  the source.
-
-  This transformer is run on the candidate list which is already
-  filtered by the current pattern. While `candidate-transformer'
-  is run only once, it is run every time the input pattern is
-  changed.
-
-  It can be used to transform the candidate list dynamically, for
-  example, based on the current pattern.
-
-  In some cases it may also be more efficent to perform candidate
-  transformation here, instead of with `candidate-transformer'
-  even if this transformation is done every time the pattern is
-  changed.  For example, if a candidate set is very large then
-  `candidate-transformer' transforms every candidate while only
-  some of them will actually be displayed due to the limit
-  imposed by `helm-candidate-number-limit'.
-
-  Note that `candidates' and `candidate-transformer' is run
-  already, so the given transformer function should also be able
-  to handle candidates with (DISPLAY . REAL) format.")
-
-   (filter-one-by-one
-    :initarg :filter-one-by-one
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  A transformer function that treat candidates one by one.
-  It is called with one arg the candidate.
-  It is faster than `filtered-candidate-transformer' or
-  `candidates-transformer', but should be used only in sources
-  that recompute constantly their candidates, e.g `helm-source-find-files'.
-  Filtering happen early and candidates are treated
-  one by one instead of re-looping on the whole list.
-  If used with `filtered-candidate-transformer' or `candidates-transformer'
-  these functions should treat the candidates transformed by the
-  `filter-one-by-one' function in consequence.")
-
-   (display-to-real
-    :initarg :display-to-real
-    :initform nil
-    :custom function
-    :documentation
-    "  Function called with one parameter; the selected candidate.
-
-  The function transforms the selected candidate, and the result
-  is passed to the action function.  The display-to-real
-  attribute provides another way to pass to action other string than
-  the one shown in Helm buffer.
-
-  Traditionally, it is possible to make candidates,
-  candidate-transformer or filtered-candidate-transformer
-  function return a list with (DISPLAY . REAL) pairs. But if REAL
-  can be generated from DISPLAY, display-to-real is more
-  convenient and faster.
-
-  NOTE: This is deprecated and you have better time using `filter-one-by-one'.")
-
-   (real-to-display
-    :initarg :real-to-display
-    :initform nil
-    :custom function
-    :documentation
-    "  Function called with one parameter; the selected candidate.
-  The real value of candidates will be shown in display.
-  See `display-to-real'.")
-
-   (action-transformer
-    :initarg :action-transformer
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  It's a function or a list of functions called with two
-  arguments when the action list from the source is
-  assembled. The first argument is the list of actions, the
-  second is the current selection.  If it is a list of functions,
-  it calls each function sequentially.
-
-  The function should return a transformed action list.
-
-  This can be used to customize the list of actions based on the
-  currently selected candidate.")
-
-   (pattern-transformer
-    :initarg :pattern-transformer
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  It's a function or a list of functions called with one argument
-  before computing matches. Its argument is `helm-pattern'.
-  Functions should return transformed `helm-pattern'.
-
-  It is useful to change interpretation of `helm-pattern'.")
-
-   (candidate-number-limit
-    :initarg :candidate-number-limit
-    :initform nil
-    :custom integer
-    :documentation
-    "  Override `helm-candidate-number-limit' only for this source.")
-
-   (volatile
-    :initarg :volatile
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Indicates the source assembles the candidate list dynamically,
-  so it shouldn't be cached within a single Helm
-  invocation. It is only applicable to synchronous sources,
-  because asynchronous sources are not cached.")
-
-   (match
-    :initarg :match
-    :initform nil
-    :custom (choice function list)
-    :documentation
-    "  List of functions called with one parameter: a candidate. The
-  function should return non-nil if the candidate matches the
-  current pattern (see variable `helm-pattern').
-
-  When using `candidates-in-buffer' its default value is `identity' and
-  don't have to be changed, use the `search' slot instead.
-
-  This attribute allows the source to override the default
-  pattern matching based on `string-match'. It can be used, for
-  example, to implement a source for file names and do the
-  pattern matching on the basename of files, since it's more
-  likely one is typing part of the basename when searching for a
-  file, instead of some string anywhere else in its path.
-
-  If the list contains more than one function then the list of
-  matching candidates from the source is constructed by appending
-  the results after invoking the first function on all the
-  potential candidates, then the next function, and so on. The
-  matching candidates supplied by the first function appear first
-  in the list of results and then results from the other
-  functions, respectively.
-
-  This attribute has no effect for asynchronous sources (see
-  attribute `candidates'), since they perform pattern matching
-  themselves.
-
-  Note that FUZZY-MATCH slot will overhide value of this slot.")
-
-   (fuzzy-match
-    :initarg :fuzzy-match
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Enable fuzzy matching in this source.
-  This will overwrite settings in MATCH slot, and for
-  sources built with child class `helm-source-in-buffer' the SEARCH slot.
-  This is an easy way of enabling fuzzy matching, but you can use the MATCH
-  or SEARCH slots yourself if you want something more elaborated, mixing
-  different type of match (See `helm-source-buffers' class for example).")
-
-   (nomark
-    :initarg :nomark
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Don't allow marking candidates when this attribute is present.")
-   
-   (nohighlight
-    :initarg :nohighlight
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Disable highlighting matches in this source.
-  This will disable generic highlighting of matches,
-  but some specialized highlighting can be done from elsewhere,
-  i.e from `filtered-candidate-transformer' or `filter-one-by-one' slots.
-  So use this to either disable completely highlighting in your source,
-  or to disable highlighting and use a specialized highlighting matches
-  function for this source.
-  Remember that this function should run AFTER all filter functions if those
-  filter functions are modifying face properties, though it is possible to
-  avoid this by using new `add-face-text-property' in your filter functions.")
-   
-   (allow-dups
-    :initarg :allow-dups
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Allow helm collecting duplicates candidates.")
-   
-   (history
-    :initarg :history
-    :initform nil
-    :custom symbol
-    :documentation
-    "  Allow passing history variable to helm from source.
-  It should be a quoted symbol.")
-   
-   (coerce
-    :initarg :coerce
-    :initform nil
-    :custom function
-    :documentation
-    "  It's a function called with one argument: the selected candidate.
-  This function is intended for type convertion. In normal case,
-  the selected candidate (string) is passed to action
-  function. If coerce function is specified, it is called just
-  before action function.
-
-  Example: converting string to symbol
-    (coerce . intern)")
-
-   (mode-line
-    :initarg :mode-line
-    :initform nil
-    :custom (choice string sexp)
-    :documentation
-    "  Source local `helm-mode-line-string' (included in
-  `mode-line-format'). It accepts also variable/function name.")
-
-   (header-line
-    :initarg :header-line
-    :initform nil
-    :custom (choice string function)
-    :documentation
-    "  Source local `header-line-format'.
-  Have no effect when `helm-echo-input-in-header-line' is non--nil.
-  It accepts also variable/function name.")
-
-   (resume
-    :initarg :resume
-    :initform nil
-    :custom function
-    :documentation
-    "  Function called with no parameters at end of initialization
-  when `helm-resume' is started.
-  If this function try to do something against `helm-buffer', \(e.g updating,
-  searching etc...\) probably you should run it in a timer to ensure
-  `helm-buffer' is ready.")
-
-   (follow
-    :initarg :follow
-    :initform nil
-    :custom integer
-    :documentation
-    "  Enable `helm-follow-mode' for this source only.
-  You must give it a value of 1 or -1, though giving a -1 value
-  is surely not what you want, e.g: (follow . 1)
-
-  See `helm-follow-mode' for more infos.")
-
-   (follow-delay
-    :initarg :follow-delay
-    :initform nil
-    :custom integer
-    :documentation
-    "  `helm-follow-mode' will execute persistent-action after this delay.
-  Otherwise value of `helm-follow-input-idle-delay' is used if non--nil,
-  If none of these are found fallback to `helm-input-idle-delay'.")
-
-   (dont-plug
-    :initarg :dont-plug
-    :initform '(helm-compile-source--persistent-help)
-    :custom list
-    :documentation
-    "  A list of compile functions plugin to ignore.")
-
-   (migemo
-    :initarg :migemo
-    :initform nil
-    :custom boolean
-    :documentation
-    "  Needed for Japanese input with helm-migemo.el.
-  If you are not Japanese, ignore this.")
-
-   (matchplugin
-    :initarg :matchplugin
-    :initform t
-    :custom boolean)
-
-   (match-part
-    :initarg :match-part
-    :initform nil
-    :custom function
-    :documentation
-    "  Allow matching only one part of candidate.
-  If source contain match-part attribute, match is computed only
-  on part of candidate returned by the call of function provided
-  by this attribute. The function should have one arg, candidate,
-  and return only a specific part of candidate.")
-   
-   (before-init-hook
-    :initarg :before-init-hook
-    :initform nil
-    :custom symbol
-    :documentation
-    "  A local hook that run at beginning of initilization of this source.
-  i.e Before the creation of `helm-buffer'.")
-
-   (after-init-hook
-    :initarg :after-init-hook
-    :initform nil
-    :custom symbol
-    :documentation
-    "  A local hook that run at end of initilization of this source.
-  i.e After the creation of `helm-buffer'."))
-  
-  "Main interface to define helm sources."
-  :abstract t)
-
-(defclass helm-source-sync (helm-source)
-  ((candidates
-    :initform '("ERROR: You must specify the `candidates' slot, either with a list or a function"))
-
-   (dont-plug
-    :initform '(helm-compile-source--match-plugin
-                helm-compile-source--persistent-help))
-   
-   (match-strict
-    :initarg :match-strict
-    :initform nil
-    :custom function
-    :documentation
-    "  When specifying a match function within a source and
-  helm-match-plugin is enabled, the result of all matching
-  functions will be concatened, which in some cases is not what
-  is wanted. When using `match-strict' only this or these
-  functions will be used. You can specify those functions as a
-  list of functions or a single symbol function.
-
-  NOTE: This have the same effect as using :MATCHPLUGIN nil."))
-
-  "Use this class to make helm sources using a list of candidates.
-This list should be given as a normal list, a variable handling a list
-or a function returning a list.
-Matching is done basically with `string-match' against each candidate.")
-
-(defclass helm-source-async (helm-source)
-  ((candidates-process
-    :initarg :candidates-process
-    :initform nil
-    :custom function
-    :documentation
-    "  This attribute is used to define a process as candidate.
-  The value must be a process.
-  
-  NOTE:
-  When building the source at runtime you can give directly a process
-  as value, otherwise wrap the process call into a function.
-  The process buffer should be nil, otherwise, if you use
-  `helm-buffer' give to the process a sentinel.")
-
-   (matchplugin :initform nil)
-   (dont-plug :initform '(helm-compile-source--match-plugin
-                          helm-compile-source--persistent-help)))
-
-  "Use this class to define a helm source calling an external process.
-The :candidates slot is not allowed even if described because this class
-inherit from `helm-source'.")
-
-(defclass helm-source-in-buffer (helm-source)
-  ((init
-    :initform 'helm-default-init-source-in-buffer-function)
-
-   (data
-    :initarg :data
-    :initform nil
-    :custom (choice list string)
-    :documentation
-    "  A string or a list that will be used to feed the `helm-candidates-buffer'.
-  This data will be passed in a function added to the init slot and
-  the buffer will be build with `helm-init-candidates-in-buffer'.
-  This is an easy and fast method to build a `candidates-in-buffer' source.")
-   
-   (dont-plug
-    :initform '(helm-compile-source--candidates-in-buffer
-                helm-compile-source--match-plugin
-                helm-compile-source--persistent-help))
-   
-   (candidates
-    :initform 'helm-candidates-in-buffer)
-
-   (volatile
-    :initform t)
-   
-   (match
-    :initform '(identity))
-   
-   (get-line
-    :initarg :get-line
-    :initform 'buffer-substring-no-properties
-    :custom function
-    :documentation
-    "  A function like `buffer-substring-no-properties' or `buffer-substring'.
-  This function converts point of line-beginning and point of line-end,
-  which represents a candidate computed by `helm-candidates-in-buffer'.
-  By default, `helm-candidates-in-buffer' uses
-  `buffer-substring-no-properties'.")
-
-   (search
-    :initarg :search
-    :initform '(helm-candidates-in-buffer-search-default-fn)
-    :custom (choice function list)
-    :documentation
-    "  List of functions like `re-search-forward' or `search-forward'.
-  Buffer search function used by `helm-candidates-in-buffer'.
-  By default, `helm-candidates-in-buffer' uses `re-search-forward'.
-  The function should take one arg PATTERN.
-  If your search function needs to handle negation like matchplugin,
-  this function should returns in such case a cons cell of two integers defining
-  the beg and end positions to match in the line previously matched by
-  `re-search-forward' or similar, and move point to next line
-  (See how the `helm-mp-3-search-base' and `helm-fuzzy-search' functions are working).
-
-  NOTE: FUZZY-MATCH slot will overhide value of this slot.")
-   
-   (search-strict
-    :initarg :search-strict
-    :initform nil
-    :custom function
-    :documentation
-    "  When specifying a search function within a source and
-  helm-match-plugin is enabled, the result of all searching
-  functions will be concatened, which in some cases is not what
-  is wanted. When using `search-strict' only this or these
-  functions will be used. You can specify those functions as a
-  list of functions or a single symbol function.
-
-  NOTE: This have the same effect as using a nil value for
-        :MATCHPLUGIN slot."))
-
-  "Use this source to make helm sources storing candidates inside a buffer.
-Contrarily to `helm-source-sync' candidates are matched using a function
-like `re-search-forward', see below documentation of :search slot.")
-
-(defclass helm-source-dummy (helm-source)
-  ((candidates
-    :initform '("dummy"))
-
-   (filtered-candidate-transformer
-    :initform 'helm-dummy-candidate)
-
-   (matchplugin
-    :initform nil)
-   
-   (accept-empty
-    :initarg :accept-empty
-    :initform t
-    :custom boolean
-    :documentation
-    "  Allow exiting with an empty string.
-  You should keep the default value.")
-
-   (match
-    :initform 'identity)
-   
-   (volatile
-    :initform t)))
-
-(defclass helm-source-in-file (helm-source-in-buffer)
-  ((init :initform (lambda ()
-                     (let ((file (helm-attr 'candidates-file)))
-                       (with-current-buffer (helm-candidate-buffer 'global)
-                         (insert-file-contents file)))))
-   (candidates-file
-    :initarg :candidates-file
-    :initform nil
-    :custom string
-    :documentation "A filename."))
-  
-  "The contents of the file will be used as candidates in buffer.") 
-
-
-;;; Classes for types.
-;;
-;;  Files
-(defclass helm-type-file (helm-source) ()
-  "A class to define helm type file.")
-
-(defmethod helm--setup-source :primary ((_source helm-type-file)))
-
-(defmethod helm--setup-source :before ((source helm-type-file))
-  (set-slot-value
-   source 'action
-   (helm-make-actions
-    "Find file"                             'helm-find-many-files
-    "Find file as root"                     'helm-find-file-as-root
-    "Find file other window"                'find-file-other-window
-    "Find file other frame"                 'find-file-other-frame
-    "Open dired in file's directory"        'helm-open-dired
-    "Grep File(s) `C-u recurse'"            'helm-find-files-grep
-    "Zgrep File(s) `C-u Recurse'"           'helm-ff-zgrep
-    "Pdfgrep File(s)"                       'helm-ff-pdfgrep
-    "Insert as org link"                    'helm-files-insert-as-org-link
-    "Checksum File"                         'helm-ff-checksum
-    "Ediff File"                            'helm-find-files-ediff-files
-    "Ediff Merge File"                      'helm-find-files-ediff-merge-files
-    "Etags `M-., C-u tap, C-u C-u reload tag file'"
-    'helm-ff-etags-select
-    "View file"                             'view-file
-    "Insert file"                           'insert-file
-    "Add marked files to file-cache"        'helm-ff-cache-add-file
-    "Delete file(s)"                        'helm-delete-marked-files
-    "Copy file(s) `M-C, C-u to follow'"     'helm-find-files-copy
-    "Rename file(s) `M-R, C-u to follow'"   'helm-find-files-rename
-    "Symlink files(s) `M-S, C-u to follow'" 'helm-find-files-symlink
-    "Relsymlink file(s) `C-u to follow'"    'helm-find-files-relsymlink
-    "Hardlink file(s) `M-H, C-u to follow'" 'helm-find-files-hardlink
-    "Open file externally (C-u to choose)"  'helm-open-file-externally
-    "Open file with default tool"           'helm-open-file-with-default-tool
-    "Find file in hex dump"                 'hexl-find-file))
-  (set-slot-value source 'persistent-help "Show this file")
-  (set-slot-value source 'action-transformer '(helm-transform-file-load-el
-                                               helm-transform-file-browse-url
-                                               helm-transform-file-cache))
-  (set-slot-value source 'candidate-transformer '(helm-skip-boring-files
-                                                  helm-highlight-files
-                                                  helm-w32-pathname-transformer)))
-
-;; Bookmarks
-(defclass helm-type-bookmark (helm-source) ()
-  "A class to define type bookmarks.")
-
-(defmethod helm--setup-source :primary ((_source helm-type-bookmark)))
-
-(defmethod helm--setup-source :before ((source helm-type-bookmark))
-  (set-slot-value
-   source 'action (helm-make-actions
-                   "Jump to bookmark" 'helm-bookmark-jump
-                   "Jump to BM other window" 'helm-bookmark-jump-other-window
-                   "Bookmark edit annotation" 'bookmark-edit-annotation
-                   "Bookmark show annotation" 'bookmark-show-annotation
-                   "Delete bookmark(s)" 'helm-delete-marked-bookmarks
-                   "Edit Bookmark" 'helm-bookmark-edit-bookmark
-                   "Rename bookmark" 'helm-bookmark-rename
-                   "Relocate bookmark" 'bookmark-relocate))
-  (set-slot-value source 'keymap helm-bookmark-map)
-  (set-slot-value source 'mode-line helm-bookmark-mode-line-string))
-
-;; Buffers
-(defclass helm-type-buffer (helm-source) ()
-  "A class to define type buffer.")
-
-(defmethod helm--setup-source :primary ((_source helm-type-buffer)))
-
-(defmethod helm--setup-source :before ((source helm-type-buffer))
-  (set-slot-value
-   source 'action (helm-make-actions
-                   "Switch to buffer(s)" 'helm-switch-to-buffers
-                   (lambda () (and (locate-library "popwin")
-                                   "Switch to buffer in popup window"))
-                   'popwin:popup-buffer
-                   "Switch to buffer(s) other window `C-c o'"
-                   'helm-switch-to-buffers-other-window
-                   "Switch to buffer other frame `C-c C-o'"
-                   'switch-to-buffer-other-frame
-                   (lambda () (and (locate-library "elscreen")
-                                   "Display buffer in Elscreen"))
-                   'helm-find-buffer-on-elscreen
-                   "Query replace regexp `C-M-%'"
-                   'helm-buffer-query-replace-regexp
-                   "Query replace `M-%'" 'helm-buffer-query-replace
-                   "View buffer" 'view-buffer
-                   "Display buffer" 'display-buffer
-                   "Grep buffers `M-g s' (C-u grep all buffers)"
-                   'helm-zgrep-buffers
-                   "Multi occur buffer(s) `C-s'" 'helm-multi-occur-as-action
-                   "Revert buffer(s) `M-U'" 'helm-revert-marked-buffers
-                   "Insert buffer" 'insert-buffer
-                   "Kill buffer(s) `M-D'" 'helm-kill-marked-buffers
-                   "Diff with file `C-='" 'diff-buffer-with-file
-                   "Ediff Marked buffers `C-c ='" 'helm-ediff-marked-buffers
-                   "Ediff Merge marked buffers `M-='"
-                   (lambda (candidate)
-                     (helm-ediff-marked-buffers candidate t))))
-  (set-slot-value source 'persistent-help "Show this buffer")
-  (set-slot-value
-   source 'filtered-candidate-transformer
-   '(helm-skip-boring-buffers
-     helm-buffers-sort-transformer
-     helm-highlight-buffers)))
-
-;; Functions
-(defclass helm-type-function (helm-source) ()
-  "A class to define helm type function.")
-
-(defmethod helm--setup-source :primary ((_source helm-type-function)))
-
-(defmethod helm--setup-source :before ((source helm-type-function))
-  (set-slot-value
-   source 'action (helm-make-actions
-                   "Describe command" 'describe-function
-                   "Add command to kill ring" 'helm-kill-new
-                   "Go to command's definition" 'find-function
-                   "Debug on entry" 'debug-on-entry
-                   "Cancel debug on entry" 'cancel-debug-on-entry
-                   "Trace function" 'trace-function
-                   "Trace function (background)" 'trace-function-background
-                   "Untrace function" 'untrace-function))
-  (set-slot-value source 'action-transformer
-                  'helm-transform-function-call-interactively)
-  (set-slot-value source 'candidate-transformer
-                  'helm-mark-interactive-functions)
-  (set-slot-value source 'coerce 'helm-symbolify))
-
-;; Commands
-(defclass helm-type-command (helm-source) ()
-  "A class to define helm type command.")
-
-(defmethod helm--setup-source :primary ((_source helm-type-command)))
-
-(defmethod helm--setup-source :before ((source helm-type-command))
-  (set-slot-value
-   source 'action (append (helm-make-actions
-                           "Call interactively" 'helm-call-interactively)
-                          (helm-actions-from-type-function)))
-  (set-slot-value source 'coerce 'helm-symbolify)
-  (set-slot-value source 'persistent-action 'describe-function))
-
-;; Timers
-(defclass helm-type-timers (helm-source) ()
-  "A class to define helm type timers.")
-
-(defmethod helm--setup-source :primary ((_source helm-type-timers)))
-
-(defmethod helm--setup-source :before ((source helm-type-timers))
-  (set-slot-value
-   source 'action
-   '(("Cancel Timer" . (lambda (_timer)
-                         (let ((mkd (helm-marked-candidates)))
-                           (cl-loop for timer in mkd
-                                    do (cancel-timer timer)))))
-     ("Describe Function" . (lambda (tm)
-                              (describe-function (timer--function tm))))
-     ("Find Function" . (lambda (tm)
-                          (find-function (timer--function tm))))))
-  (set-slot-value source 'persistent-action
-                  (lambda (tm)
-                    (describe-function (timer--function tm))))
-  (set-slot-value source 'persistent-help "Describe Function"))
-
-
-;;; Error functions
-;;
-;;
-(defun helm-default-init-source-in-buffer-function ()
-  (helm-init-candidates-in-buffer 'global
-    '("ERROR: No buffer handling your data, use either the `init' slot or the `data' slot.")))
-
-
-;;; Internal Builder functions.
-;;
-;;
-(defun helm--create-source (object)
-  "[INTERNAL] Build a helm source from OBJECT.
-Where OBJECT is an instance of an eieio class."
-  (cl-loop for s in (object-slots object)
-           for slot-val = (slot-value object s)
-           when slot-val
-           collect (cons s (unless (eq t slot-val) slot-val))))
-
-(defun helm-make-source (name class &rest args)
-  "Build a `helm' source named NAME with ARGS for CLASS.
-Argument NAME is a string which define the source name, so no need to use
-the keyword :name in your source, NAME will be used instead.
-Argument CLASS is an eieio class object.
-Arguments ARGS are keyword value pairs as defined in CLASS."
-  (declare (indent 2))  
-  (let ((source (apply #'make-instance class name args)))
-    (set-slot-value source 'name name)
-    (helm--setup-source source)
-    (helm-setup-user-source source)
-    (helm--create-source source)))
-
-(defun helm-make-type (class &rest args)
-  (let ((source (apply #'make-instance class args)))
-    (set-slot-value source 'name nil)
-    (helm--setup-source source)
-    (helm--create-source source)))
-
-(defun helm-source-mp-get-search-or-match-fns (source method)
-  (require 'helm-match-plugin)
-  (let ((searchers        (and (eq method 'search)
-                               helm-mp-default-search-functions))
-        (defmatch         (helm-aif (slot-value source 'match)
-                              (helm-mklist it)))
-        (defmatch-strict  (helm-aif (and (eq method 'match)
-                                         (slot-value source 'match-strict))
-                              (helm-mklist it)))
-        (defsearch        (helm-aif (and (eq method 'search)
-                                         (slot-value source 'search))
-                              (helm-mklist it)))
-        (defsearch-strict (helm-aif (and (eq method 'search-strict)
-                                         (slot-value source 'search-strict))
-                              (helm-mklist it))))
-    (cl-case method
-      (match (cond (defmatch-strict)
-                   (defmatch
-                    (append helm-mp-default-match-functions defmatch))
-                   (t helm-mp-default-match-functions)))
-      (search (cond (defsearch-strict)
-                    (defsearch
-                     (append searchers defsearch))
-                    (t searchers))))))
-
-
-;;; Modifiers
-;;
-(cl-defun helm-source-add-action-to-source-if (name fn source predicate
-                                                    &optional (index 4))
-  "Same as `helm-add-action-to-source-if' but for SOURCE defined as eieio object.
-You can use this inside a `helm--setup-source' method for a SOURCE defined as
-an eieio class."
-  (let* ((actions     (slot-value source 'action))
-         (action-transformers (slot-value source 'action-transformer))
-         (new-action  (list (cons name fn)))
-         (transformer `(lambda (actions candidate)
-                         (cond ((funcall (quote ,predicate) candidate)
-                                (helm-append-at-nth
-                                 actions (quote ,new-action) ,index))
-                               (t actions)))))
-    (when (or (symbolp actions) (functionp actions))
-      (set-slot-value source 'action (list (cons "Default action" actions))))
-    (when (or (symbolp action-transformers) (functionp action-transformers))
-      (setq action-transformers (list action-transformers)))
-    (set-slot-value
-     source
-     'action-transformer
-     (delq nil (append (list transformer) action-transformers)))))
-
-;;; Methods to access types slots.
-;;
-;;
-(defmethod helm-source-get-action-from-type ((object helm-type-file))
-  (slot-value object 'action))
-
-(defmethod helm-source-get-action-from-type ((object helm-type-buffer))
-  (slot-value object 'action))
-
-(defmethod helm-source-get-action-from-type ((object helm-type-bookmark))
-  (slot-value object 'action))
-
-(defmethod helm-source-get-action-from-type ((object helm-type-function))
-  (slot-value object 'action))
-
-
-;;; Methods to build sources.
-;;
-;;
-(defun helm-source--persistent-help-string (string source)
-  (substitute-command-keys
-   (concat "\\<helm-map>\\[helm-execute-persistent-action]: "
-           (or (format "%s (keeping session)" string)
-               (slot-value source 'header-line)))))
-
-(defun helm-source--header-line (source)
-  (substitute-command-keys
-   (concat "\\<helm-map>\\[helm-execute-persistent-action]: "
-           (helm-aif (or (slot-value source 'persistent-action)
-                         (slot-value source 'action))
-               (cond ((or (symbolp it) (functionp it))
-                      (helm-symbol-name it))
-                     ((listp it)
-                      (let ((action (car it)))
-                        ;; It comes from :action ("foo" . function).
-                        (if (stringp (car action))
-                            (car action)
-                            ;; It comes from :persistent-action
-                            ;; (function . 'nosplit) Fix Issue #788.
-                            (if (or (symbolp action)
-                                    (functionp action))
-                                (helm-symbol-name action)))))
-                     (t ""))
-             "")
-           " (keeping session)")))
-
-(defmethod helm--setup-source :primary ((_source helm-source)))
-
-(defmethod helm--setup-source :before ((source helm-source))
-  (helm-aif (slot-value source 'keymap)
-      (and (symbolp it) (set-slot-value source 'keymap (symbol-value it))))
-  (set-slot-value source 'header-line (helm-source--header-line source))
-  (helm-aif (slot-value source 'persistent-help)
-      (set-slot-value source 'header-line
-                      (helm-source--persistent-help-string it source)))
-  (when (and (slot-value source 'fuzzy-match) helm-fuzzy-sort-fn)
-    (set-slot-value source 'filtered-candidate-transformer
-                    (helm-aif (slot-value source 'filtered-candidate-transformer)
-                        (append (helm-mklist it)
-                                (list helm-fuzzy-sort-fn))
-                      (list helm-fuzzy-sort-fn))))
-  (unless (slot-value source 'nohighlight)
-    (set-slot-value source 'filtered-candidate-transformer
-                    (helm-aif (slot-value source 'filtered-candidate-transformer)
-                        (append (helm-mklist it)
-                                (list #'helm-fuzzy-highlight-matches))
-                      (list #'helm-fuzzy-highlight-matches)))))
-
-(defmethod helm-setup-user-source ((_source helm-source)))
-
-(defmethod helm--setup-source ((source helm-source-sync))
-  (when (slot-value source 'fuzzy-match)
-    (helm-aif (slot-value source 'match)
-        (set-slot-value source 'match (append (helm-mklist it)
-                                              (list helm-fuzzy-match-fn)))
-      (set-slot-value source 'match helm-fuzzy-match-fn)))
-  (when (slot-value source 'matchplugin)
-    (set-slot-value source 'match
-                    (helm-source-mp-get-search-or-match-fns source 'match))))
-
-(defmethod helm--setup-source ((source helm-source-in-buffer))
-  (let ((cur-init (slot-value source 'init)))
-    (helm-aif (slot-value source 'data)
-        (set-slot-value
-         source
-         'init (delq
-                nil
-                (list
-                 (and (null (eq 'helm-default-init-source-in-buffer-function
-                                cur-init))
-                      cur-init)
-                 (lambda ()
-                   (helm-init-candidates-in-buffer
-                       'global
-                     (if (functionp it) (funcall it) it))))))))
-  (when (slot-value source 'fuzzy-match)
-    (helm-aif (slot-value source 'search)
-        (set-slot-value source 'search (append (helm-mklist it)
-                                               (list helm-fuzzy-search-fn)))
-      (set-slot-value source 'search (list helm-fuzzy-search-fn))))
-  (when (slot-value source 'matchplugin)
-    (set-slot-value
-     source 'search (helm-source-mp-get-search-or-match-fns source 'search)))
-  (let ((mtc (slot-value source 'match)))
-    (cl-assert (or (equal '(identity) mtc)
-                   (eq 'identity mtc))
-               nil "Invalid slot value for `match'")
-    (cl-assert (eq (slot-value source 'volatile) t)
-               nil "Invalid slot value for `volatile'")))
-
-(defmethod helm--setup-source ((source helm-source-async))
-  (cl-assert (null (slot-value source 'candidates))
-             nil "Incorrect use of `candidates' use `candidates-process' instead")
-  (cl-assert (null (slot-value source 'matchplugin))
-             nil "`matchplugin' not allowed in async sources."))
-
-(defmethod helm--setup-source ((source helm-source-dummy))
-  (let ((mtc (slot-value source 'match)))
-    (cl-assert (or (equal '(identity) mtc)
-                   (eq 'identity mtc))
-               nil "Invalid slot value for `match'")
-    (cl-assert (eq (slot-value source 'volatile) t)
-               nil "Invalid slot value for `volatile'")
-    (cl-assert (equal (slot-value source 'candidates) '("dummy"))
-               nil "Invalid slot value for `candidates'")
-    (cl-assert (eq (slot-value source 'accept-empty) t)
-               nil "Invalid slot value for `accept-empty'")))
-
-
-;;; User functions
-;;
-;;  Sources
-(defmacro helm-build-sync-source (name &rest args)
-  "Build a synchronous helm source with name NAME.
-Args ARGS are keywords provided by `helm-source-sync'."
-  (declare (indent 1))
-  `(helm-make-source ,name 'helm-source-sync ,@args))
-
-(defmacro helm-build-async-source (name &rest args)
-  "Build a asynchronous helm source with name NAME.
-Args ARGS are keywords provided by `helm-source-async'."
-  (declare (indent 1))
-  `(helm-make-source ,name 'helm-source-async ,@args))
-
-(defmacro helm-build-in-buffer-source (name &rest args)
-  "Build a helm source with name NAME using `candidates-in-buffer' method.
-Args ARGS are keywords provided by `helm-source-in-buffer'."
-  (declare (indent 1))
-  `(helm-make-source ,name 'helm-source-in-buffer ,@args))
-
-(defmacro helm-build-dummy-source (name &rest args)
-  "Build a helm source with name NAME using `dummy' method.
-Args ARGS are keywords provided by `helm-source-dummy'."
-  (declare (indent 1))
-  `(helm-make-source ,name 'helm-source-dummy ,@args))
-
-(defmacro helm-build-in-file-source (name file &rest args)
-  "Build a helm source with NAME name using `candidates-in-files' method.
-Arg FILE is a filename, the contents of this file will be
-used as candidates in buffer.
-Args ARGS are keywords provided by `helm-source-in-file'."
-  (declare (indent 1))
-  `(helm-make-source ,name 'helm-source-in-file
-     :candidates-file ,file ,@args))
-
-;; Types
-(defun helm-actions-from-type-file ()
-  (let ((source (make-instance 'helm-type-file)))
-    (helm--setup-source source)
-    (helm-source-get-action-from-type source)))
-
-(defun helm-build-type-file ()
-  (helm-make-type 'helm-type-file))
-
-(defun helm-actions-from-type-function ()
-  (let ((source (make-instance 'helm-type-function)))
-    (helm--setup-source source)
-    (helm-source-get-action-from-type source)))
-
-(defun helm-build-type-function ()
-  (helm-make-type 'helm-type-function))
-
-(defun helm-actions-from-type-command ()
-  (let ((source (make-instance 'helm-type-command)))
-    (helm--setup-source source)
-    (helm-source-get-action-from-type source)))
-
-(defun helm-build-type-command ()
-  (helm-make-type 'helm-type-command))
-
-(provide 'helm-source)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-source ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-sys.el b/emacs.d/elpa/helm-20150623.1310/helm-sys.el
deleted file mode 100644
index 86d1a7a..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-sys.el
+++ /dev/null
@@ -1,300 +0,0 @@
-;;; helm-sys.el --- System related functions for helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-
-
-(defgroup helm-sys nil
-  "System related helm library."
-  :group 'helm)
-
-(defface helm-top-columns
-    '((t :inherit helm-header))
-  "Face for helm help string in minibuffer."
-  :group 'helm-sys)
-
-
-(defun helm-top-command-set-fn (var _value)
-  (set var
-       (cl-case system-type
-         (darwin "env COLUMNS=%s ps -axo pid,user,pri,nice,ucomm,tty,start,vsz,%%cpu,%%mem,etime,command")
-         (t      "env COLUMNS=%s top -b -n 1"))))
-
-(defcustom helm-top-command "env COLUMNS=%s top -b -n 1"
-  "Top command used to display output of top.
-To use top command, a version supporting batch mode (-b option) is needed.
-On Mac OSX top command doesn't support this, so ps command
-is used by default instead.
-If you modify this the number and order of elements displayed
-should be the same as top command to have the sort commands
-working properly, that is 12 elements with the 2 first being
-PID and USER and the last 4 being %CPU, %MEM, TIME and COMMAND.
-A format string where %s will be replaced with `frame-width'."
-  :group 'helm-sys
-  :type 'string
-  :set  'helm-top-command-set-fn)
-
-
-;;; Top (process)
-;;
-;;
-(defvar helm-top-sort-fn nil)
-(defvar helm-top-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "C-c ?") 'helm-top-help)
-    (define-key map (kbd "M-P")   'helm-top-run-sort-by-cpu)
-    (define-key map (kbd "M-C")   'helm-top-run-sort-by-com)
-    (define-key map (kbd "M-M")   'helm-top-run-sort-by-mem)
-    (define-key map (kbd "M-U")   'helm-top-run-sort-by-user)
-    map))
-
-(defvar helm-source-top
-  (helm-build-in-buffer-source "Top"
-    :header-name (lambda (name) (concat name " (Press C-c C-u to refresh)"))
-    :init #'helm-top-init
-    :nomark t
-    :display-to-real #'helm-top-display-to-real
-    :persistent-action #'helm-top-sh-persistent-action
-    :persistent-help "SIGTERM"
-    :mode-line helm-top-mode-line
-    :follow 'never
-    :keymap helm-top-map
-    :filtered-candidate-transformer #'helm-top-sort-transformer
-    :action-transformer #'helm-top-action-transformer))
-
-(defun helm-top-transformer (candidates _source)
-  "Transformer for `helm-top'.
-Return empty string for non--valid candidates."
-  (cl-loop for disp in candidates collect
-        (cond ((string-match "^ *[0-9]+" disp) disp)
-              ((string-match "^ *PID" disp)
-               (cons (propertize disp 'face 'helm-top-columns) ""))
-              (t (cons disp "")))))
-
-(defun helm-top-action-transformer (actions _candidate)
-  "Action transformer for `top'.
-Show actions only on line starting by a PID."
-  (let ((disp (helm-get-selection nil t)))
-    (cond ((string-match "^ *[0-9]+" disp)
-           (list '("kill (SIGTERM)" . (lambda (pid) (helm-top-sh "TERM" pid)))
-                 '("kill (SIGKILL)" . (lambda (pid) (helm-top-sh "KILL" pid)))
-                 '("kill (SIGINT)" .  (lambda (pid) (helm-top-sh "INT" pid)))
-                 '("kill (Choose signal)"
-                   . (lambda (pid)
-                       (helm-top-sh
-                        (helm-comp-read (format "Kill [%s] with signal: " pid)
-                                        '("ALRM" "HUP" "INT" "KILL" "PIPE" "POLL"
-                                          "PROF" "TERM" "USR1" "USR2" "VTALRM"
-                                          "STKFLT" "PWR" "WINCH" "CHLD" "URG"
-                                          "TSTP" "TTIN" "TTOU" "STOP" "CONT"
-                                          "ABRT" "FPE" "ILL" "QUIT" "SEGV"
-                                          "TRAP" "SYS" "EMT" "BUS" "XCPU" "XFSZ")
-                                        :must-match t)
-                        pid)))))
-          (t actions))))
-
-(defun helm-top-sh (sig pid)
-  "Run kill shell command with signal SIG on PID for `helm-top'."
-  (let ((cmd (format "kill -%s %s" sig pid)))
-    (message "Executed %s\n%s" cmd (shell-command-to-string cmd))))
-
-(defun helm-top-sh-persistent-action (pid)
-  (delete-other-windows)
-  (helm-top-sh "TERM" pid)
-  (helm-force-update))
-
-(defun helm-top-init ()
-  "Insert output of top command in candidate buffer."
-  (unless helm-top-sort-fn (helm-top-set-mode-line "CPU"))
-  (with-current-buffer (helm-candidate-buffer 'global)
-    (call-process-shell-command
-     (format helm-top-command (frame-width))
-     nil (current-buffer))))
-
-(defun helm-top-display-to-real (line)
-  "Return pid only from LINE."
-  (car (split-string line)))
-
-;; Sort top command
-
-(defun helm-top-set-mode-line (str)
-  (if (string-match "Sort:\\[\\(.*\\)\\] " helm-top-mode-line)
-      (setq helm-top-mode-line (replace-match str nil nil helm-top-mode-line 1))
-    (setq helm-top-mode-line (concat (format "Sort:[%s] " str) helm-top-mode-line))))
-
-(defun helm-top-sort-transformer (candidates source)
-  (helm-top-transformer
-   (if helm-top-sort-fn
-       (cl-loop for c in candidates
-                if (string-match "^ *[0-9]+" c)
-                collect c into pid-cands
-                else collect c into header-cands
-                finally return (append
-                                header-cands
-                                (sort pid-cands helm-top-sort-fn)))
-       candidates)
-   source))
-
-(defun helm-top-sort-by-com (s1 s2)
-  (let* ((split-1 (split-string s1))
-         (split-2 (split-string s2))
-         (com-1 (nth 11 split-1))
-         (com-2 (nth 11 split-2)))
-    (string< com-1 com-2)))
-
-(defun helm-top-sort-by-mem (s1 s2)
-  (let* ((split-1 (split-string s1))
-         (split-2 (split-string s2))
-         (mem-1 (string-to-number (nth 9 split-1)))
-         (mem-2 (string-to-number (nth 9 split-2))))
-    (> mem-1 mem-2)))
-
-(defun helm-top-sort-by-user (s1 s2)
-  (let* ((split-1 (split-string s1))
-         (split-2 (split-string s2))
-         (user-1 (nth 1 split-1))
-         (user-2 (nth 1 split-2)))
-    (string< user-1 user-2)))
-
-(defun helm-top-run-sort-by-com ()
-  (interactive)
-  (helm-top-set-mode-line "COM")
-  (setq helm-top-sort-fn 'helm-top-sort-by-com)
-  (helm-force-update))
-
-(defun helm-top-run-sort-by-cpu ()
-  (interactive)
-  (helm-top-set-mode-line "CPU")
-  (setq helm-top-sort-fn nil)
-  (helm-force-update))
-
-(defun helm-top-run-sort-by-mem ()
-  (interactive)
-  (helm-top-set-mode-line "MEM")
-  (setq helm-top-sort-fn 'helm-top-sort-by-mem)
-  (helm-force-update))
-
-(defun helm-top-run-sort-by-user ()
-  (interactive)
-  (helm-top-set-mode-line "USER")
-  (setq helm-top-sort-fn 'helm-top-sort-by-user)
-  (helm-force-update))
-
-
-;;; X RandR resolution change
-;;
-;;
-;;; FIXME I do not care multi-display.
-
-(defun helm-xrandr-info ()
-  "Return a pair with current X screen number and current X display name."
-  (with-temp-buffer
-    (call-process "xrandr" nil (current-buffer) nil
-                  "--current")
-    (let (screen output)
-      (goto-char (point-min))
-      (save-excursion
-        (when (re-search-forward "\\(^Screen \\)\\([0-9]\\):" nil t)
-          (setq screen (match-string 2))))
-      (when (re-search-forward "^\\(.*\\) connected" nil t)
-        (setq output (match-string 1)))
-      (list screen output))))
-
-(defun helm-xrandr-screen ()
-  "Return current X screen number."
-  (car (helm-xrandr-info)))
-
-(defun helm-xrandr-output ()
-  "Return current X display name."
-  (cadr (helm-xrandr-info)))
-
-(defvar helm-source-xrandr-change-resolution
-  '((name . "Change Resolution")
-    (candidates
-     . (lambda ()
-         (with-temp-buffer
-           (call-process "xrandr" nil (current-buffer) nil
-                         "--screen" (helm-xrandr-screen) "-q")
-           (goto-char 1)
-           (cl-loop with modes = nil
-                 while (re-search-forward "   \\([0-9]+x[0-9]+\\)" nil t)
-                 for mode = (match-string 1)
-                 unless (member mode modes)
-                 collect mode into modes
-                 finally return modes))))
-    (action
-     ("Change Resolution"
-      . (lambda (mode)
-          (call-process "xrandr" nil nil nil
-                        "--screen" (helm-xrandr-screen)
-                        "--output" (helm-xrandr-output)
-                        "--mode" mode))))))
-
-
-;;; Emacs process
-;;
-;;
-(defvar helm-source-emacs-process
-  '((name . "Emacs Process")
-    (init . (lambda () (list-processes--refresh)))
-    (candidates . (lambda () (mapcar #'process-name (process-list))))
-    (persistent-action . (lambda (elm)
-                           (delete-process (get-process elm))
-                           (helm-delete-current-selection)))
-    (persistent-help . "Kill Process")
-    (action ("Kill Process" . (lambda (elm)
-                                (delete-process (get-process elm)))))))
-
-
-;;;###autoload
-(defun helm-top ()
-  "Preconfigured `helm' for top command."
-  (interactive)
-  (save-window-excursion
-    (unless helm-alive-p (delete-other-windows))
-    (helm :sources 'helm-source-top
-          :buffer "*helm top*" :full-frame t
-          :candidate-number-limit 9999
-          :preselect "^\\s-*[0-9]+")))
-
-;;;###autoload
-(defun helm-list-emacs-process ()
-  "Preconfigured `helm' for emacs process."
-  (interactive)
-  (helm-other-buffer 'helm-source-emacs-process "*helm process*"))
-
-;;;###autoload
-(defun helm-xrandr-set ()
-  "Preconfigured helm for xrandr."
-  (interactive)
-  (helm :sources 'helm-source-xrandr-change-resolution
-        :buffer "*helm xrandr*"))
-
-(provide 'helm-sys)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-sys.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-tags.el b/emacs.d/elpa/helm-20150623.1310/helm-tags.el
deleted file mode 100644
index 1e2ec22..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-tags.el
+++ /dev/null
@@ -1,318 +0,0 @@
-;;; helm-tags.el --- Helm for Etags. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-utils)
-
-
-(defgroup helm-tags nil
-  "Tags related Applications and libraries for Helm."
-  :group 'helm)
-
-(defcustom helm-etags-tag-file-name "TAGS"
-  "Etags tag file name."
-  :type  'string
-  :group 'helm-tags)
-
-(defcustom helm-etags-tag-file-search-limit 10
-  "The limit level of directory to search tag file.
-Don't search tag file deeply if outside this value."
-  :type  'number
-  :group 'helm-tags)
-
-(defcustom helm-etags-match-part-only t
-  "Whether to match only the tag part of CANDIDATE in
-helm-source-etags-select."
-  :type 'boolean
-  :group 'helm-tags)
-
-(defcustom helm-etags-execute-action-at-once-if-one t
-  "Whether to jump straight to the selected tag if there's only
-one match."
-  :type 'boolean
-  :group 'helm-tags)
-
-
-(defgroup helm-tags-faces nil
-  "Customize the appearance of helm-tags faces."
-  :prefix "helm-"
-  :group 'helm-tags
-  :group 'helm-faces)
-
-(defface helm-etags-file
-    '((t (:foreground "Lightgoldenrod4"
-          :underline t)))
-  "Face used to highlight etags filenames."
-  :group 'helm-tags-faces)
-
-
-;;; Etags
-;;
-;;
-(defun helm-etags-run-switch-other-window ()
-  "Run switch to other window action from `helm-source-etags-select'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action
-     (lambda (c)
-       (helm-etags-action-goto 'find-file-other-window c)))))
-
-(defun helm-etags-run-switch-other-frame ()
-  "Run switch to other frame action from `helm-source-etags-select'."
-  (interactive)
-  (with-helm-alive-p
-    (helm-quit-and-execute-action
-     (lambda (c)
-       (helm-etags-action-goto 'find-file-other-frame c)))))
-
-(defvar helm-etags-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map helm-map)
-    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
-    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
-    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
-    (define-key map (kbd "C-c ?")    'helm-etags-help)
-    (define-key map (kbd "C-c o")    'helm-etags-run-switch-other-window)
-    (define-key map (kbd "C-c C-o")  'helm-etags-run-switch-other-frame)
-    map)
-  "Keymap used in Etags.")
-
-(defvar helm-etags-mtime-alist nil
-  "Store the last modification time of etags files here.")
-(defvar helm-etags-cache (make-hash-table :test 'equal)
-  "Cache content of etags files used here for faster access.")
-
-(defun helm-etags-get-tag-file (&optional directory)
-  "Return the path of etags file if found.
-Lookes recursively in parents directorys for a
-`helm-etags-tag-file-name' file."
-  ;; Get tag file from `default-directory' or upper directory.
-  (let ((current-dir (helm-etags-find-tag-file-directory
-                      (or directory default-directory))))
-    ;; Return nil if not find tag file.
-    (when current-dir
-      (expand-file-name helm-etags-tag-file-name current-dir))))
-
-(defun helm-etags-all-tag-files ()
-  "Return files from the following sources;
-  1) An automatically located file in the parent directories, by `helm-etags-get-tag-file'.
-  2) `tags-file-name', which is commonly set by `find-tag' command.
-  3) `tags-table-list' which is commonly set by `visit-tags-table' command."
-  (helm-fast-remove-dups
-   (delq nil
-         (append (list (helm-etags-get-tag-file)
-                       tags-file-name)
-                 tags-table-list))
-   :test 'equal))
-
-(defun helm-etags-find-tag-file-directory (current-dir)
-  "Try to find the directory containing tag file.
-If not found in CURRENT-DIR search in upper directory."
-  (let ((file-exists? #'(lambda (dir)
-                          (let ((tag-path (expand-file-name
-                                           helm-etags-tag-file-name dir)))
-                            (and (stringp tag-path)
-                                 (file-regular-p tag-path)
-                                 (file-readable-p tag-path))))))
-    (cl-loop with count = 0
-          until (funcall file-exists? current-dir)
-          ;; Return nil if outside the value of
-          ;; `helm-etags-tag-file-search-limit'.
-          if (= count helm-etags-tag-file-search-limit)
-          do (cl-return nil)
-          ;; Or search upper directories.
-          else
-          do (cl-incf count)
-          (setq current-dir (expand-file-name (concat current-dir "../")))
-          finally return current-dir)))
-
-(defun helm-etags-get-header-name (_x)
-  "Create header name for this helm etags session."
-  (concat "Etags in "
-          (with-helm-current-buffer
-            (helm-etags-get-tag-file))))
-
-(defun helm-etags-create-buffer (file)
-  "Create the `helm-buffer' based on contents of etags tag FILE."
-  (let* ((tag-fname file)
-         max
-         (split (with-current-buffer (find-file-noselect tag-fname)
-                  (prog1
-                      (split-string (buffer-string) "\n" 'omit-nulls)
-                    (setq max (line-number-at-pos (point-max)))
-                    (kill-buffer))))
-         (progress-reporter (make-progress-reporter "Loading tag file..." 0 max)))
-    (cl-loop
-          with fname
-          with cand
-          for i in split for count from 0
-          for elm = (unless (string-match "^\x0c" i)
-                      (helm-aif (string-match "\177" i)
-                          (substring i 0 it)
-                        i))
-          do (cond ((and elm (string-match "^\\([^,]+\\),[0-9]+$" elm))
-                    (setq fname (propertize (match-string 1 elm)
-                                            'face 'helm-etags-file)))
-                   (elm (setq cand (concat fname ": " elm)))
-                   (t (setq cand nil)))
-          when cand do (progn
-                         (insert (concat cand "\n"))
-                         (progress-reporter-update progress-reporter count)))))
-
-(defun helm-etags-init ()
-  "Feed `helm-buffer' using `helm-etags-cache' or tag file.
-If no entry in cache, create one."
-  (let ((tagfiles (helm-etags-all-tag-files)))
-    (when tagfiles
-      (with-current-buffer (helm-candidate-buffer 'global)
-        (dolist (f tagfiles)
-          (helm-aif (gethash f helm-etags-cache)
-              ;; An entry is present in cache, insert it.
-              (insert it)
-            ;; No entry, create a new buffer using content of tag file (slower).
-            (helm-etags-create-buffer f)
-            ;; Store content of buffer in cache.
-            (puthash f (buffer-string) helm-etags-cache)
-            ;; Store or set the last modification of tag file.
-            (helm-aif (assoc f helm-etags-mtime-alist)
-                ;; If an entry exists modify it.
-                (setcdr it (helm-etags-mtime f))
-              ;; No entry create a new one.
-              (add-to-list 'helm-etags-mtime-alist
-                           (cons f (helm-etags-mtime f))))))))))
-
-(defun helm-etags-split-line (line)
-  (let ((regexp "\\`\\([[:lower:][:upper:]]?:?.*?\\): \\(.*\\)"))
-    (when (string-match regexp line)
-      (cl-loop for n from 1 to 2 collect (match-string n line)))))
-
-(defvar helm-source-etags-select nil
-  "Helm source for Etags.")
-
-(defun helm-etags-build-source ()
-  (helm-build-in-buffer-source "Etags"
-    :header-name 'helm-etags-get-header-name
-    :init 'helm-etags-init
-    :get-line 'buffer-substring
-    :match-part (lambda (candidate)
-                  ;; Match only the tag part of CANDIDATE
-                  ;; and not the filename.
-                  (if helm-etags-match-part-only
-                      ;; Ignore the first part of the tag
-                      ;; which is irrelevant
-                      ;;(e.g in "(cl-defun foo" search only if "foo" match)
-                      (cadr (split-string
-                             (cadr (helm-etags-split-line candidate))))
-                      candidate))
-    :mode-line helm-etags-mode-line-string
-    :keymap helm-etags-map
-    :action '(("Go to tag" . (lambda (c)
-                               (helm-etags-action-goto 'find-file c)))
-              ("Go to tag in other window" . (lambda (c)
-                                               (helm-etags-action-goto
-                                                'find-file-other-window
-                                                c)))
-              ("Go to tag in other frame" . (lambda (c)
-                                              (helm-etags-action-goto
-                                               'find-file-other-frame
-                                               c))))
-    :persistent-help "Go to line"
-    :persistent-action (lambda (candidate)
-                         (helm-etags-action-goto 'find-file candidate)
-                         (helm-highlight-current-line))))
-
-(defvar find-tag-marker-ring)
-
-(defun helm-etags-action-goto (switcher candidate)
-  "Helm default action to jump to an etags entry in other window."
-  (require 'etags)
-  (helm-log-run-hook 'helm-goto-line-before-hook)
-  (let* ((split (helm-etags-split-line candidate))
-         (fname (cl-loop for tagf being the hash-keys of helm-etags-cache
-                      for f = (expand-file-name
-                               (car split) (file-name-directory tagf))
-                      when (file-exists-p f)
-                      return f))
-         (elm   (cadr split)))
-    (if (null fname)
-        (error "file %s not found" fname)
-      (ring-insert find-tag-marker-ring (point-marker))
-      (funcall switcher fname)
-      (goto-char (point-min))
-      (search-forward elm nil t)
-      (goto-char (match-beginning 0)))))
-
-(defun helm-etags-mtime (file)
-  "Last modification time of etags tag FILE."
-  (cadr (nth 5 (file-attributes file))))
-
-(defun helm-etags-file-modified-p (file)
-  "Check if tag FILE have been modified in this session.
-If FILE is nil return nil."
-  (let ((last-modif (and file
-                         (assoc-default file helm-etags-mtime-alist))))
-    (and last-modif
-         (/= last-modif (helm-etags-mtime file)))))
-
-
-;;;###autoload
-(defun helm-etags-select (arg)
-  "Preconfigured helm for etags.
-If called with a prefix argument or if any of the tag files have
-been modified, reinitialize cache.
-
-This function aggregates three sources of tag files:
-
-  1) An automatically located file in the parent directories, by `helm-etags-get-tag-file'.
-  2) `tags-file-name', which is commonly set by `find-tag' command.
-  3) `tags-table-list' which is commonly set by `visit-tags-table' command."
-  (interactive "P")
-  (let ((tag-files (helm-etags-all-tag-files))
-        (helm-execute-action-at-once-if-one helm-etags-execute-action-at-once-if-one)
-        (str (if (region-active-p) (buffer-substring-no-properties (region-beginning) (region-end))
-               (thing-at-point 'symbol))))
-    (if (cl-notany 'file-exists-p tag-files)
-        (message "Error: No tag file found. Create with etags shell command, or visit with `find-tag' or `visit-tags-table'.")
-      (cl-loop for k being the hash-keys of helm-etags-cache
-            unless (member k tag-files)
-            do (remhash k helm-etags-cache))
-      (mapc (lambda (f)
-              (when (or (equal arg '(4))
-                        (and helm-etags-mtime-alist
-                             (helm-etags-file-modified-p f)))
-                (remhash f helm-etags-cache)))
-            tag-files)
-      (unless helm-source-etags-select
-        (setq helm-source-etags-select
-              (helm-etags-build-source)))
-      (helm :sources 'helm-source-etags-select
-            :keymap helm-etags-map
-            :default (list (concat "\\_<" str "\\_>") str)
-            :buffer "*helm etags*"))))
-
-(provide 'helm-tags)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-tags.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-utils.el b/emacs.d/elpa/helm-20150623.1310/helm-utils.el
deleted file mode 100644
index 9f76469..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm-utils.el
+++ /dev/null
@@ -1,857 +0,0 @@
-;;; helm-utils.el --- Utilities Functions for helm. -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm)
-(require 'compile) ; Fixme: Is this needed?
-(require 'dired)
-
-(declare-function helm-find-files-1 "helm-files.el" (fname &optional preselect))
-(defvar winner-boring-buffers)
-
-
-(defgroup helm-utils nil
-  "Utilities routines for Helm."
-  :group 'helm)
-
-(defcustom helm-su-or-sudo "sudo"
-  "What command to use for root access."
-  :type 'string
-  :group 'helm-utils)
-
-(defcustom helm-yank-text-at-point-function nil
-  "The function used to forward point with `helm-yank-text-at-point'.
-With a nil value, fallback to default `forward-word'.
-The function should take one arg, an integer like `forward-word'.
-NOTE: Using `forward-symbol' here is not very useful as it is already
-provided by \\<helm-map>\\[next-history-element]."
-  :type  'function
-  :group 'helm-utils)
-
-(defcustom helm-default-kbsize 1024.0
-  "Default Kbsize to use for showing files size.
-It is a float, usually 1024.0 but could be 1000.0 on some systems."
-  :group 'helm-utils
-  :type 'float)
-
-(defcustom helm-highlight-number-lines-around-point 15
-  "Number of lines around point where matched items are highlighted."
-  :group 'helm-utils
-  :type 'integer)
-
-(defcustom helm-buffers-to-resize-on-pa nil
-  "A list of helm buffers where the helm-window should be reduced on persistent actions."
-  :group 'helm-utils
-  :type '(repeat (choice string)))
-
-(defcustom helm-resize-on-pa-text-height 12
-  "The size of the helm-window when resizing on persistent action."
-  :group 'helm-utils
-  :type 'integer)
-
-
-(defvar helm-goto-line-before-hook '(helm-save-current-pos-to-mark-ring)
-  "Run before jumping to line.
-This hook run when jumping from `helm-goto-line', `helm-etags-default-action',
-and `helm-imenu-default-action'.
-This allow you to retrieve a previous position after using the different helm
-tools for searching (etags, grep, gid, (m)occur etc...).
-By default positions are added to `mark-ring' you can also add to register
-by using instead (or adding) `helm-save-pos-to-register-before-jump'.
-In this case last position is added to the register
-`helm-save-pos-before-jump-register'.")
-
-(defvar helm-save-pos-before-jump-register ?_
-  "The register where `helm-save-pos-to-register-before-jump' save position.")
-
-
-;;; Faces.
-;;
-(defface helm-selection-line
-    '((t (:inherit highlight :distant-foreground "black")))
-  "Face used in the `helm-current-buffer' when jumping to candidate."
-  :group 'helm-faces)
-
-(defface helm-match-item
-    '((t (:inherit isearch)))
-  "Face used to highlight item matched in a selected line."
-  :group 'helm-faces)
-
-
-;; CUA workaround
-(defadvice cua-delete-region (around helm-avoid-cua activate)
-  (ignore-errors ad-do-it))
-
-(defadvice copy-region-as-kill (around helm-avoid-cua activate)
-  (if cua-mode
-      (ignore-errors ad-do-it)
-    ad-do-it))
-
-
-;;; Utils functions
-;;
-;;
-(defun helm-ff-find-printers ()
-  "Return a list of available printers on Unix systems."
-  (when (executable-find "lpstat")
-    (let ((printer-list (with-temp-buffer
-                          (call-process "lpstat" nil t nil "-a")
-                          (split-string (buffer-string) "\n"))))
-      (cl-loop for p in printer-list
-            for printer = (car (split-string p))
-            when printer
-            collect printer))))
-
-(defun helm-switch-to-buffers (buffer-or-name &optional other-window)
-  "Switch to buffer BUFFER-OR-NAME.
-If more than one buffer marked switch to these buffers in separate windows.
-If OTHER-WINDOW is specified keep current-buffer and switch to others buffers
-in separate windows."
-  (let* ((mkds (helm-marked-candidates))
-         (size (/ (window-height) (length mkds))))
-    (or (<= window-min-height size)
-        (error "Too many buffers to visit simultaneously."))
-    (helm-aif (cdr mkds)
-        (progn
-          (if other-window
-              (switch-to-buffer-other-window (car mkds))
-            (switch-to-buffer (car mkds)))
-          (save-selected-window
-            (cl-loop for b in it
-                  do (progn
-                       (select-window (split-window))
-                       (switch-to-buffer b)))))
-      (if other-window
-          (switch-to-buffer-other-window buffer-or-name)
-        (switch-to-buffer buffer-or-name)))))
-
-(defun helm-switch-to-buffers-other-window (buffer-or-name)
-  "switch to buffer BUFFER-OR-NAME in other window.
-See `helm-switch-to-buffers' for switching to marked buffers."
-  (helm-switch-to-buffers buffer-or-name t))
-
-(cl-defmacro helm-position (item seq &key (test 'eq) all)
-  "A simple and faster replacement of CL `position'.
-Return position of first occurence of ITEM found in SEQ.
-Argument SEQ can be a string, in this case ITEM have to be a char.
-Argument ALL, if non--nil specify to return a list of positions of
-all ITEM found in SEQ."
-  (let ((key (if (stringp seq) 'across 'in)))
-    `(cl-loop for c ,key ,seq
-           for index from 0
-           when (funcall ,test c ,item)
-           if ,all collect index into ls
-           else return index
-           finally return ls)))
-
-(defun helm-substring (str width)
-  "Return the substring of string STR from 0 to WIDTH.
-Handle multibyte characters by moving by columns."
-  (with-temp-buffer
-    (save-excursion
-      (insert str))
-    (move-to-column width)
-    (buffer-substring (point-at-bol) (point))))
-
-(cl-defun helm-substring-by-width (str width &optional (endstr "..."))
-  "Truncate string STR to end at column WIDTH.
-Similar to `truncate-string-to-width'.
-Add ENDSTR (default \"...\") at end of truncated STR.
-Add spaces at end if needed to reach WIDTH when STR is shorter than WIDTH."
-  (cl-loop for ini-str = str
-        then (substring ini-str 0 (1- (length ini-str)))
-        for sw = (string-width ini-str)
-        when (<= sw width) return
-        (concat ini-str endstr (make-string (- width sw) ? ))))
-
-(defun helm-string-multibyte-p (str)
-  "Check if string STR contains multibyte characters."
-  (cl-loop for c across str
-        thereis (> (char-width c) 1)))
-
-(defun helm-get-pid-from-process-name (process-name)
-  "Get pid from running process PROCESS-NAME."
-  (cl-loop with process-list = (list-system-processes)
-        for pid in process-list
-        for process = (assoc-default 'comm (process-attributes pid))
-        when (and process (string-match process-name process))
-        return pid))
-
-(cl-defun helm-current-buffer-narrowed-p (&optional
-                                            (buffer helm-current-buffer))
-  "Check if BUFFER is narrowed.
-Default is `helm-current-buffer'."
-  (with-current-buffer buffer
-    (let ((beg (point-min))
-          (end (point-max))
-          (total (buffer-size)))
-      (or (/= beg 1) (/= end (1+ total))))))
-
-(defun helm-region-active-p ()
-  (and transient-mark-mode mark-active (/= (mark) (point))))
-
-(defun helm-goto-char (loc)
-  "Go to char, revealing if necessary."
-  (goto-char loc)
-  (when (or (eq major-mode 'org-mode)
-            (and (boundp 'outline-minor-mode)
-                 outline-minor-mode))
-    (require 'org) ; On some old Emacs versions org may not be loaded.
-    (org-reveal)))
-
-(defun helm-goto-line (lineno &optional noanim)
-  "Goto LINENO opening only outline headline if needed.
-Animation is used unless NOANIM is non--nil."
-  (helm-log-run-hook 'helm-goto-line-before-hook)
-  (goto-char (point-min))
-  (helm-goto-char (point-at-bol lineno))
-  (unless noanim
-    (helm-highlight-current-line nil nil nil nil 'pulse)))
-
-(defun helm-save-pos-to-register-before-jump ()
-  "Save current buffer position to `helm-save-pos-before-jump-register'.
-To use this add it to `helm-goto-line-before-hook'."
-  (with-helm-current-buffer
-    (unless helm-in-persistent-action
-      (point-to-register helm-save-pos-before-jump-register))))
-
-(defun helm-save-current-pos-to-mark-ring ()
-  "Save current buffer position to mark ring.
-To use this add it to `helm-goto-line-before-hook'."
-  (with-helm-current-buffer
-    (unless helm-in-persistent-action
-      (set-marker (mark-marker) (point))
-      (push-mark (point) 'nomsg))))
-
-;;;###autoload
-(defun helm-show-all-in-this-source-only (arg)
-  "Show only current source of this helm session with all its candidates.
-With a numeric prefix arg show only the ARG number of candidates."
-  (interactive "p")
-  (with-helm-window
-    (with-helm-default-directory (helm-default-directory)
-        (let ((helm-candidate-number-limit (and (> arg 1) arg)))
-          (helm-set-source-filter
-           (list (assoc-default 'name (helm-get-current-source))))))))
-
-;;;###autoload
-(defun helm-display-all-sources ()
-  "Display all sources previously hidden by `helm-set-source-filter'."
-  (interactive)
-  (helm-set-source-filter nil))
-
-(defun helm-displaying-source-names ()
-  "Return the list of sources name for this helm session."
-  (with-current-buffer helm-buffer
-    (goto-char (point-min))
-    (cl-loop with pos
-          while (setq pos (next-single-property-change (point) 'helm-header))
-          do (goto-char pos)
-          collect (buffer-substring-no-properties (point-at-bol)(point-at-eol))
-          do (forward-line 1))))
-
-(defun helm-skip-entries (seq regexp-list)
-  "Remove entries which matches one of REGEXP-LIST from SEQ."
-  (cl-loop for i in seq
-        unless (cl-loop for regexp in regexp-list
-                     thereis (and (stringp i)
-                                  (string-match regexp i)))
-        collect i))
-
-(defun helm-shadow-entries (seq regexp-list)
-  "Put shadow property on entries in SEQ matching a regexp in REGEXP-LIST."
-  (let ((face 'italic))
-    (cl-loop for i in seq
-          if (cl-loop for regexp in regexp-list
-                   thereis (and (stringp i)
-                                (string-match regexp i)))
-          collect (propertize i 'face face)
-          else collect i)))
-
-(defun helm-describe-function (func)
-  "FUNC is symbol or string."
-  (describe-function (helm-symbolify func))
-  (message nil))
-
-(defun helm-describe-variable (var)
-  "VAR is symbol or string."
-  (describe-variable (helm-symbolify var))
-  (message nil))
-
-(defun helm-find-function (func)
-  "FUNC is symbol or string."
-  (find-function (helm-symbolify func)))
-
-(defun helm-find-variable (var)
-  "VAR is symbol or string."
-  (find-variable (helm-symbolify var)))
-
-(defun helm-kill-new (candidate &optional replace)
-  "CANDIDATE is symbol or string.
-See `kill-new' for argument REPLACE."
-  (kill-new (helm-stringify candidate) replace))
-
-(cl-defun helm-fast-remove-dups (seq &key (test 'eq))
-  "Remove duplicates elements in list SEQ.
-This is same as `remove-duplicates' but with memoisation.
-It is much faster, especially in large lists.
-A test function can be provided with TEST argument key.
-Default is `eq'."
-  (cl-loop with cont = (make-hash-table :test test)
-        for elm in seq
-        unless (gethash elm cont)
-        do (puthash elm elm cont)
-        finally return
-        (cl-loop for i being the hash-values in cont collect i)))
-
-(defun helm-handle-winner-boring-buffers ()
-  "Add `helm-buffer' to `winner-boring-buffers' when quitting/exiting helm.
-Add this function to `helm-cleanup-hook' when you don't want to see helm buffers
-after running winner-undo/redo."
-  (require 'winner)
-  (cl-pushnew helm-buffer winner-boring-buffers :test 'equal))
-(add-hook 'helm-cleanup-hook #'helm-handle-winner-boring-buffers)
-
-;;;###autoload
-(defun helm-quit-and-find-file ()
-  "Drop into `helm-find-files' from `helm'.
-If current selection is a buffer or a file, `helm-find-files'
-from its directory."
-  (interactive)
-  (require 'helm-grep)
-  (helm-run-after-quit
-   (lambda (f)
-     (if (file-exists-p f)
-         (helm-find-files-1 (file-name-directory f)
-                            (concat
-                             "^"
-                             (regexp-quote
-                              (if helm-ff-transformer-show-only-basename
-                                  (helm-basename f) f))))
-       (helm-find-files-1 f)))
-   (let* ((sel       (helm-get-selection))
-          (grep-line (and (stringp sel)
-                          (helm-grep-split-line sel)))
-          (bmk-name  (and (stringp sel)
-                          (not grep-line)
-                          (replace-regexp-in-string "\\`\\*" "" sel)))
-          (bmk       (and bmk-name (assoc bmk-name bookmark-alist)))
-          (buf       (helm-aif (get-buffer sel) (buffer-name it)))
-          (default-preselection (or (buffer-file-name helm-current-buffer)
-                                    default-directory)))
-     (cond
-       ;; Buffer.
-       (buf (or (buffer-file-name sel)
-                (car (rassoc buf dired-buffers))
-                (and (with-current-buffer buf
-                       (eq major-mode 'org-agenda-mode))
-                     org-directory
-                     (expand-file-name org-directory))
-                (with-current-buffer buf default-directory)))
-       ;; Bookmark.
-       (bmk (helm-aif (bookmark-get-filename bmk)
-                (if (and ffap-url-regexp
-                         (string-match ffap-url-regexp it))
-                    it (expand-file-name it))
-              default-directory))
-       ((or (file-remote-p sel)
-            (file-exists-p sel))
-        (expand-file-name sel))
-       ;; Grep.
-       ((and grep-line (file-exists-p (car grep-line)))
-        (expand-file-name (car grep-line)))
-       ;; Occur.
-       (grep-line
-        (with-current-buffer (get-buffer (car grep-line))
-          (or (buffer-file-name) default-directory)))
-       ;; Url.
-       ((and ffap-url-regexp (string-match ffap-url-regexp sel)) sel)
-       ;; Default.
-       (t default-preselection)))))
-
-;; Same as `vc-directory-exclusion-list'.
-(defvar helm-walk-ignore-directories
-  '("SCCS" "RCS" "CVS" "MCVS" ".svn" ".git" ".hg" ".bzr"
-    "_MTN" "_darcs" "{arch}" ".gvfs"))
-
-(cl-defun helm-walk-directory (directory &key (path 'basename)
-                                           (directories t)
-                                           match skip-subdirs)
-  "Walk through DIRECTORY tree.
-Argument PATH can be one of basename, relative, full, or a function
-called on file name, default to basename.
-Argument DIRECTORIES when non--nil (default) return also directories names,
-otherwise skip directories names.
-Argument MATCH can be a predicate or a regexp.
-Argument SKIP-SUBDIRS when non--nil will skip `helm-walk-ignore-directories'
-unless it is given as a list of directories, in this case this list will be used
-instead of `helm-walk-ignore-directories'."
-  (let* ((result '())
-         (fn (cl-case path
-               (basename 'file-name-nondirectory)
-               (relative 'file-relative-name)
-               (full     'identity)
-               (t        path))))
-    (cl-labels ((ls-rec (dir)
-                  (unless (and skip-subdirs
-                               (member (helm-basename dir)
-                                       (if (listp skip-subdirs)
-                                           skip-subdirs
-                                         helm-walk-ignore-directories)))
-                    (cl-loop with ls = (sort (file-name-all-completions "" dir)
-                                             'string-lessp)
-                          for f in ls
-                          ;; Use `directory-file-name' to remove the final slash.
-                          ;; Needed to avoid infloop on symlinks symlinking
-                          ;; a directory inside it [1].
-                          for file = (directory-file-name
-                                      (expand-file-name f dir))
-                          unless (member f '("./" "../"))
-                          ;; A directory.
-                          if (char-equal (aref f (1- (length f))) ?/)
-                          do (progn (when directories
-                                      (push (funcall fn file) result))
-                                    ;; Don't recurse in symlinks.
-                                    ;; `file-symlink-p' have to be called
-                                    ;; on the directory with its final
-                                    ;; slash removed [1].
-                                    (and (not (file-symlink-p file))
-                                         (ls-rec file)))
-                          else do
-                          (if match
-                              (and (if (functionp match)
-                                       (funcall match f)
-                                     (and (stringp match)
-                                          (string-match match f)))
-                                   (push (funcall fn file) result))
-                            (push (funcall fn file) result))))))
-      (ls-rec directory)
-      (nreverse result))))
-
-(defun helm-generic-sort-fn (s1 s2)
-  "Sort predicate function for helm candidates.
-Args S1 and S2 can be single or \(display . real\) candidates,
-that is sorting is done against real value of candidate."
-  (let* ((reg1  (concat "\\_<" helm-pattern "\\_>"))
-         (reg2  (concat "\\_<" helm-pattern))
-         (split (split-string helm-pattern))
-         (str1  (if (consp s1) (cdr s1) s1))
-         (str2  (if (consp s2) (cdr s2) s2))
-         (score #'(lambda (str r1 r2 lst)
-                    (cond ((string-match r1 str) 4)
-                          ((and (string-match " " helm-pattern)
-                                (string-match (concat "\\_<" (car lst)) str)
-                                (cl-loop for r in (cdr lst)
-                                      always (string-match r str))) 3)
-                          ((and (string-match " " helm-pattern)
-                                (cl-loop for r in lst always (string-match r str))) 2)
-                          ((string-match r2 str) 1)
-                          (t 0))))
-         (sc1 (funcall score str1 reg1 reg2 split))
-         (sc2 (funcall score str2 reg1 reg2 split)))
-    (cond ((or (zerop (string-width helm-pattern))
-               (and (zerop sc1) (zerop sc2)))
-           (string-lessp str1 str2))
-          ((= sc1 sc2)
-           (< (length str1) (length str2)))
-          (t (> sc1 sc2)))))
-
-(defun helm-basename (fname &optional ext)
-  "Print FNAME  with any  leading directory  components removed.
-If specified, also remove filename extension EXT."
-  (let ((non-essential t))
-    (if (and ext (or (string= (file-name-extension fname) ext)
-                     (string= (file-name-extension fname t) ext))
-             (not (file-directory-p fname)))
-        (file-name-sans-extension (file-name-nondirectory fname))
-      (file-name-nondirectory (directory-file-name fname)))))
-
-(defun helm-basedir (fname)
-  "Return the base directory of filename."
-  (helm-aif (and fname (file-name-directory fname))
-      (file-name-as-directory it)))
-
-(defun helm-ff-get-host-from-tramp-invalid-fname (fname)
-  "Extract hostname from an incomplete tramp file name.
-Return nil on valid file name remote or not."
-  (let* ((str (helm-basename fname))
-         (split (split-string str ":"))
-         (meth (car (member (car split) (mapcar 'car tramp-methods))))) 
-    (when (and meth (<= (length split) 2))
-      (cadr split))))
-
-(cl-defun helm-file-human-size (size &optional (kbsize helm-default-kbsize))
-  "Return a string showing SIZE of a file in human readable form.
-SIZE can be an integer or a float depending it's value.
-`file-attributes' will take care of that to avoid overflow error.
-KBSIZE if a floating point number, defaulting to `helm-default-kbsize'."
-  (let ((M (cons "M" (/ size (expt kbsize 2))))
-        (G (cons "G" (/ size (expt kbsize 3))))
-        (K (cons "K" (/ size kbsize)))
-        (B (cons "B" size)))
-    (cl-loop with result = B
-          for (a . b) in
-          (cl-loop for (x . y) in (list M G K B)
-                unless (< y 1) collect (cons x y))
-          when (< b (cdr result)) do (setq result (cons a b))
-          finally return (if (string= (car result) "B")
-                             (format "%s" size)
-                           (format "%.1f%s" (cdr result) (car result))))))
-
-(cl-defun helm-file-attributes
-    (file &key type links uid gid access-time modif-time
-            status size mode gid-change inode device-num dired human-size
-            mode-type mode-owner mode-group mode-other (string t))
-  "Return `file-attributes' elements of FILE separately according to key value.
-Availables keys are:
-- TYPE: Same as nth 0 `files-attributes' if STRING is nil
-        otherwise return either symlink, directory or file (default).
-- LINKS: See nth 1 `files-attributes'.
-- UID: See nth 2 `files-attributes'.
-- GID: See nth 3 `files-attributes'.
-- ACCESS-TIME: See nth 4 `files-attributes', however format time
-               when STRING is non--nil (the default).
-- MODIF-TIME: See nth 5 `files-attributes', same as above.
-- STATUS: See nth 6 `files-attributes', same as above.
-- SIZE: See nth 7 `files-attributes'.
-- MODE: See nth 8 `files-attributes'.
-- GID-CHANGE: See nth 9 `files-attributes'.
-- INODE: See nth 10 `files-attributes'.
-- DEVICE-NUM: See nth 11 `files-attributes'.
-- DIRED: A line similar to what 'ls -l' return.
-- HUMAN-SIZE: The size in human form, see `helm-file-human-size'.
-- MODE-TYPE, mode-owner,mode-group, mode-other: Split what
-  nth 7 `files-attributes' return in four categories.
-- STRING: When non--nil (default) `helm-file-attributes' return
-          more friendly values.
-If you want the same behavior as `files-attributes' ,
-\(but with return values in proplist\) use a nil value for STRING.
-However when STRING is non--nil, time and type value are different from what
-you have in `file-attributes'."
-  (let* ((all (cl-destructuring-bind
-                    (type links uid gid access-time modif-time
-                          status size mode gid-change inode device-num)
-                  (file-attributes file string)
-                (list :type        (if string
-                                       (cond ((stringp type) "symlink") ; fname
-                                             (type "directory")         ; t
-                                             (t "file"))                ; nil
-                                     type)
-                      :links       links
-                      :uid         uid
-                      :gid         gid
-                      :access-time (if string
-                                       (format-time-string
-                                        "%Y-%m-%d %R" access-time)
-                                     access-time)
-                      :modif-time  (if string
-                                       (format-time-string
-                                        "%Y-%m-%d %R" modif-time)
-                                     modif-time)
-                      :status      (if string
-                                       (format-time-string
-                                        "%Y-%m-%d %R" status)
-                                     status)
-                      :size        size
-                      :mode        mode
-                      :gid-change  gid-change
-                      :inode       inode
-                      :device-num  device-num)))
-         (modes (helm-split-mode-file-attributes (cl-getf all :mode))))
-    (cond (type (cl-getf all :type))
-          (links (cl-getf all :links))
-          (uid   (cl-getf all :uid))
-          (gid   (cl-getf all :gid))
-          (access-time (cl-getf all :access-time))
-          (modif-time (cl-getf all :modif-time))
-          (status (cl-getf all :status))
-          (size (cl-getf all :size))
-          (mode (cl-getf all :mode))
-          (gid-change (cl-getf all :gid-change))
-          (inode (cl-getf all :inode))
-          (device-num (cl-getf all :device-num))
-          (dired
-           (concat
-            (helm-split-mode-file-attributes (cl-getf all :mode) t) " "
-            (number-to-string (cl-getf all :links)) " "
-            (cl-getf all :uid) ":"
-            (cl-getf all :gid) " "
-            (if human-size
-                (helm-file-human-size (cl-getf all :size))
-              (int-to-string (cl-getf all :size))) " "
-              (cl-getf all :modif-time)))
-          (human-size (helm-file-human-size (cl-getf all :size)))
-          (mode-type (cl-getf modes :mode-type))
-          (mode-owner (cl-getf modes :user))
-          (mode-group (cl-getf modes :group))
-          (mode-other (cl-getf modes :other))
-          (t (append all modes)))))
-
-(defun helm-split-mode-file-attributes (str &optional string)
-  "Split mode file attributes STR into a proplist.
-If STRING is non--nil return instead a space separated string."
-  (cl-loop with type = (substring str 0 1)
-        with cdr = (substring str 1)
-        for i across cdr
-        for count from 1
-        if (<= count 3)
-        concat (string i) into user
-        if (and (> count 3) (<= count 6))
-        concat (string i) into group
-        if (and (> count 6) (<= count 9))
-        concat (string i) into other
-        finally return
-        (if string
-            (mapconcat 'identity (list type user group other) " ")
-          (list :mode-type type :user user :group group :other other))))
-
-(defun helm-current-directory ()
-  "Return current-directory name at point.
-Useful in dired buffers when there is inserted subdirs."
-  (if (eq major-mode 'dired-mode)
-      (dired-current-directory)
-    default-directory))
-
-(defmacro with-helm-display-marked-candidates (buffer-or-name candidates &rest body)
-  (declare (indent 0) (debug t))
-  (helm-with-gensyms (buffer window)
-    `(let* ((,buffer (temp-buffer-window-setup ,buffer-or-name))
-            ,window)
-       (unwind-protect
-            (with-current-buffer ,buffer
-              (dired-format-columns-of-files ,candidates)
-              (select-window
-               (setq ,window (temp-buffer-window-show
-                              ,buffer
-                              '(display-buffer-below-selected
-                                (window-height . fit-window-to-buffer)))))
-              (progn ,@body))
-         (quit-window 'kill ,window)))))
-
-;;; Persistent Action Helpers
-;;
-;;
-;; Internal
-(defvar helm-match-line-overlay nil)
-(defvar helm--match-item-overlays nil)
-
-(defun helm-highlight-current-line (&optional start end buf face pulse)
-  "Highlight and underline current position"
-  (let* ((start (or start (line-beginning-position)))
-         (end (or end (1+ (line-end-position))))
-         (start-match (if (or (zerop helm-highlight-number-lines-around-point)
-                              (null helm-highlight-number-lines-around-point))
-                          start
-                          (save-excursion
-                            (forward-line
-                             (- helm-highlight-number-lines-around-point))
-                            (point-at-bol))))
-         (end-match   (if (or (zerop helm-highlight-number-lines-around-point)
-                              (null helm-highlight-number-lines-around-point))
-                          end
-                          (save-excursion
-                            (forward-line
-                             helm-highlight-number-lines-around-point)
-                            (point-at-eol))))
-         (args (list start end buf)))
-    (if (not helm-match-line-overlay)
-        (setq helm-match-line-overlay (apply 'make-overlay args))
-      (apply 'move-overlay helm-match-line-overlay args))
-    (overlay-put helm-match-line-overlay
-                 'face (or face 'helm-selection-line))
-    (catch 'empty-line
-      (cl-loop with ov
-               for r in (helm-remove-if-match
-                         "\\`!" (split-string helm-input))
-               do (save-excursion
-                    (goto-char start-match)
-                    (while (condition-case _err
-                               (re-search-forward r end-match t)
-                             (invalid-regexp nil))
-                      (let ((s (match-beginning 0))
-                            (e (match-end 0)))
-                        (if (= s e)
-                            (throw 'empty-line nil)
-                            (push (setq ov (make-overlay s e))
-                                  helm--match-item-overlays)
-                            (overlay-put ov 'face 'helm-match-item)
-                            (overlay-put ov 'priority 1)))))))
-    (recenter)
-    (when pulse
-      (sit-for 0.3)
-      (helm-match-line-cleanup))))
-
-(defun helm-match-line-cleanup ()
-  (when helm-match-line-overlay
-    (delete-overlay helm-match-line-overlay)
-    (setq helm-match-line-overlay nil))
-  (when helm--match-item-overlays
-    (mapc 'delete-overlay helm--match-item-overlays)))
-
-(defun helm-match-line-update ()
-  (when helm-match-line-overlay
-    (delete-overlay helm-match-line-overlay)
-    (helm-highlight-current-line)))
-
-(defun helm-persistent-autoresize-hook ()
-  (when (and helm-buffers-to-resize-on-pa
-             (member helm-buffer helm-buffers-to-resize-on-pa)
-             (eq helm-split-window-state 'vertical))
-    (set-window-text-height (helm-window) helm-resize-on-pa-text-height)))
-
-(add-hook 'helm-after-persistent-action-hook 'helm-persistent-autoresize-hook)
-(add-hook 'helm-cleanup-hook 'helm-match-line-cleanup)
-(add-hook 'helm-after-persistent-action-hook 'helm-match-line-update)
-
-(defun helm-w32-prepare-filename (file)
-  "Convert filename FILE to something usable by external w32 executables."
-  (replace-regexp-in-string ; For UNC paths
-   "/" "\\"
-   (replace-regexp-in-string ; Strip cygdrive paths
-    "/cygdrive/\\(.\\)" "\\1:"
-    file nil nil) nil t))
-
-;;;###autoload
-(defun helm-w32-shell-execute-open-file (file)
-  (interactive "fOpen file:")
-  (with-no-warnings
-    (w32-shell-execute "open" (helm-w32-prepare-filename file))))
-
-(defun helm-open-file-with-default-tool (file)
-  "Open FILE with the default tool on this platform."
-  (let (process-connection-type)
-    (if (eq system-type 'windows-nt)
-        (helm-w32-shell-execute-open-file file)
-      (start-process "helm-open-file-with-default-tool"
-                     nil
-                     (cond ((eq system-type 'gnu/linux)
-                            "xdg-open")
-                           ((or (eq system-type 'darwin) ;; Mac OS X
-                                (eq system-type 'macos)) ;; Mac OS 9
-                            "open"))
-                     file))))
-
-(defun helm-open-dired (file)
-  "Opens a dired buffer in FILE's directory.  If FILE is a
-directory, open this directory."
-  (if (file-directory-p file)
-      (dired file)
-    (dired (file-name-directory file))
-    (dired-goto-file file)))
-
-(defun helm-require-or-error (feature function)
-  (or (require feature nil t)
-      (error "Need %s to use `%s'." feature function)))
-
-(defun helm-find-file-as-root (candidate)
-  (let* ((buf (helm-basename candidate))
-         (host (file-remote-p candidate 'host))
-         (remote-path (format "/%s:%s:%s"
-                              helm-su-or-sudo
-                              (or host "")
-                              (expand-file-name
-                               (if host
-                                   (file-remote-p candidate 'localname)
-                                 candidate))))
-         non-essential)
-    (if (buffer-live-p (get-buffer buf))
-        (progn
-          (set-buffer buf)
-          (find-alternate-file remote-path))
-      (find-file remote-path))))
-
-(defun helm-find-many-files (_ignore)
-  (let ((helm--reading-passwd-or-string t))
-    (mapc 'find-file (helm-marked-candidates))))
-
-(defun helm-quit-and-execute-action (action)
-  "Quit current helm session and execute ACTION."
-  (setq helm-saved-action action)
-  (helm-exit-minibuffer))
-
-;; Yank text at point.
-;;
-;;
-;; Internal
-(defvar helm-yank-point nil)
-
-;;;###autoload
-(defun helm-yank-text-at-point ()
-  "Yank text at point in `helm-current-buffer' into minibuffer.
-If `helm-yank-symbol-first' is non--nil the first yank
-grabs the entire symbol."
-  (interactive)
-  (with-helm-current-buffer
-    (let ((fwd-fn (or helm-yank-text-at-point-function #'forward-word)))
-      ;; Start to initial point if C-w have never been hit.
-      (unless helm-yank-point (setq helm-yank-point (point)))
-      (save-excursion
-        (goto-char helm-yank-point)
-        (funcall fwd-fn 1)
-        (helm-set-pattern
-         (concat
-          helm-pattern (replace-regexp-in-string
-                        "\\`\n" ""
-                        (buffer-substring-no-properties
-                         helm-yank-point (point)))))
-        (setq helm-yank-point (point))))))
-
-(defun helm-reset-yank-point ()
-  (setq helm-yank-point nil))
-
-(defun helm-read-repeat-string (prompt &optional count)
-  "Prompt as many time PROMPT is not empty.
-If COUNT is non--nil add a number after each prompt."
-  (cl-loop with elm
-        while (not (string= elm ""))
-        for n from 1
-        do (when count
-             (setq prompt (concat prompt (int-to-string n) ": ")))
-        collect (setq elm (helm-read-string prompt)) into lis
-        finally return (remove "" lis)))
-
-(add-hook 'helm-cleanup-hook 'helm-reset-yank-point)
-(add-hook 'helm-after-initialize-hook 'helm-reset-yank-point)
-
-(defun helm-html-bookmarks-to-alist (file url-regexp bmk-regexp)
-  "Parse html bookmark FILE and return an alist with (title . url) as elements."
-  (let (bookmarks-alist url title)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (goto-char (point-min))
-      (while (re-search-forward "href=\\|^ *<DT><A HREF=" nil t)
-        (forward-line 0)
-        (when (re-search-forward url-regexp nil t)
-          (setq url (match-string 0)))
-        (when (re-search-forward bmk-regexp nil t)
-          (setq title (match-string 1)))
-        (push (cons title url) bookmarks-alist)
-        (forward-line)))
-    (nreverse bookmarks-alist)))
-
-
-(provide 'helm-utils)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm-utils.el ends here
diff --git a/emacs.d/elpa/helm-20150623.1310/helm.el b/emacs.d/elpa/helm-20150623.1310/helm.el
deleted file mode 100644
index e5d3a83..0000000
--- a/emacs.d/elpa/helm-20150623.1310/helm.el
+++ /dev/null
@@ -1,5386 +0,0 @@
-;;; helm.el --- Emacs incremental and narrowing framework -*- lexical-binding: t -*-
-
-;; Copyright (C) 2007         Tamas Patrovics
-;;               2008 ~ 2011  rubikitch <rubikitch@ruby-lang.org>
-;;               2011 ~ 2015  Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; This is a fork of anything.el wrote by Tamas Patrovics.
-
-;; Authors of anything.el: Tamas Patrovics
-;;                         rubikitch <rubikitch@ruby-lang.org>
-;;                         Thierry Volpiatto <thierry.volpiatto@gmail.com>
-
-;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
-;; URL: http://github.com/emacs-helm/helm
-
-;; 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/>.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'helm-source)
-
-(defmacro helm-with-gensyms (symbols &rest body)
-  "Bind the SYMBOLS to fresh uninterned symbols and eval BODY."
-  (declare (indent 1))
-  `(let ,(mapcar (lambda (s)
-                   ;; Use cl-gensym here instead of make-symbol
-                   ;; to ensure a symbol that have a live that go
-                   ;; beyond the live of its macro have different name.
-                   ;; i.e symbols created with `with-helm-temp-hook'
-                   ;; should have random names.
-                   `(,s (cl-gensym (symbol-name ',s))))
-                 symbols)
-     ,@body))
-
-
-;;; Multi keys
-;;
-;;
-;;;###autoload
-(defun helm-define-multi-key (keymap key functions &optional delay)
-  "In KEYMAP, define key sequence KEY for function list FUNCTIONS.
-Each function run sequentially each time the key KEY is pressed.
-If DELAY is specified switch back to initial function of FUNCTIONS list
-after DELAY seconds.
-The functions in FUNCTIONS list are functions with no args.
-e.g
-  \(defun foo ()
-    (message \"Run foo\"))
-  \(defun bar ()
-    (message \"Run bar\"))
-  \(defun baz ()
-    (message \"Run baz\"))
-
-\(helm-define-multi-key global-map \"<f5> q\" '(foo bar baz) 2)
-
-Each time \"<f5> q\" is pressed the next function is executed, if you wait
-More than 2 seconds, next hit will run again the first function and so on."
-  (define-key keymap key (helm-make-multi-command functions delay)))
-
-;;;###autoload
-(defmacro helm-multi-key-defun (name docstring funs &optional delay)
-  "Define NAME as a multi-key command running FUNS.
-After DELAY seconds the FUNS list is reinitialised.
-See `helm-define-multi-key'."
-  (declare (indent 2))
-  (setq docstring (if docstring (concat docstring "\n\n")
-                    "This is a helmish multi-key command."))
-  `(defalias (quote ,name) (helm-make-multi-command ,funs ,delay) ,docstring))
-
-(defun helm-make-multi-command (functions &optional delay)
-  "Return an anonymous multi-key command running FUNCTIONS.
-Run each function of FUNCTIONS list in turn when called within DELAY seconds."
-  (declare (indent 1))
-  (let ((funs functions)
-        (iter (cl-gensym "helm-iter-key"))
-        (timeout delay))
-    (eval (list 'defvar iter nil))
-    #'(lambda () (interactive) (helm-run-multi-key-command funs iter timeout))))
-
-(defun helm-run-multi-key-command (functions iterator delay)
-  (let ((fn #'(lambda ()
-                (cl-loop for count from 1 to (length functions)
-                      collect count)))
-        next)
-    (unless (and (symbol-value iterator)
-                 ;; Reset iterator when another key is pressed.
-                 (eq this-command real-last-command))
-      (set iterator (helm-iter-list (funcall fn))))
-    (setq next (helm-iter-next (symbol-value iterator)))
-    (unless next
-      (set iterator (helm-iter-list (funcall fn)))
-      (setq next (helm-iter-next (symbol-value iterator))))
-    (and next (symbol-value iterator) (call-interactively (nth (1- next) functions)))
-    (when delay (run-with-idle-timer delay nil `(lambda ()
-                                                  (setq ,iterator nil))))))
-
-(defun helm-iter-list (seq)
-  "Return an iterator object from SEQ."
-  (let ((lis seq))
-    (lambda ()
-      (let ((elm (car lis)))
-        (setq lis (cdr lis))
-        elm))))
-
-(defun helm-iter-next (iterator)
-  "Return next elm of ITERATOR."
-  (funcall iterator))
-
-(helm-multi-key-defun helm-toggle-resplit-and-swap-windows
-    "Multi key command to resplit and swap helm window.
-First call run `helm-toggle-resplit-window',
-second call within 0.5s run `helm-swap-windows'."
-  '(helm-toggle-resplit-window helm-swap-windows) 1)
-
-;;;###autoload
-(defun helm-define-key-with-subkeys (map key subkey command
-                                         &optional other-subkeys menu exit-fn)
-  "Allow defining in MAP a KEY and SUBKEY to COMMAND.
-
-This allow typing KEY to call COMMAND the first time and
-type only SUBKEY on subsequent calls.
-
-Arg MAP is the keymap to use, SUBKEY is the initial short keybinding to
-call COMMAND.
-
-Arg OTHER-SUBKEYS is an alist specifying other short keybindings
-to use once started.
-e.g:
-
-\(helm-define-key-with-subkeys global-map
-   \(kbd \"C-x v n\") ?n 'git-gutter:next-hunk '((?p . git-gutter:previous-hunk))\)
-
-
-In this example, `C-x v n' will run `git-gutter:next-hunk'
-subsequent hits on \"n\" will run this command again
-and subsequent hits on \"p\" will run `git-gutter:previous-hunk'.
-
-Arg MENU is a string to display in minibuffer
-to describe SUBKEY and OTHER-SUBKEYS.
-Arg EXIT-FN specify a function to run on exit.
-
-Any other keys pressed run their assigned command defined in MAP
-and exit the loop running EXIT-FN if specified.
-
-NOTE: SUBKEY and OTHER-SUBKEYS bindings support
-only char syntax actually (e.g ?n)
-so don't use strings, vectors or whatever to define them."
-  (declare (indent 1))
-  (define-key map key
-    (lambda ()
-      (interactive)
-      (unwind-protect
-          (progn
-            (call-interactively command)
-            (while (let ((input (read-key menu)) other kb com)
-                     (setq last-command-event input)
-                     (cond
-                      ((eq input subkey)
-                       (call-interactively command)
-                       t)
-                      ((setq other (assoc input other-subkeys))
-                       (call-interactively (cdr other))
-                       t)
-                      (t
-                       (setq kb (vector last-command-event))
-                       (setq com (lookup-key map kb))
-                       (if (commandp com)
-                           (call-interactively com)
-                         (setq unread-command-events
-                               (nconc (mapcar 'identity kb)
-                                      unread-command-events)))
-                       nil)))))
-        (and exit-fn (funcall exit-fn))))))
-
-
-;;; Keymap
-;;
-;;
-(defvar helm-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map minibuffer-local-map)
-    (define-key map (kbd "<down>")     'helm-next-line)
-    (define-key map (kbd "<up>")       'helm-previous-line)
-    (define-key map (kbd "C-n")        'helm-next-line)
-    (define-key map (kbd "C-p")        'helm-previous-line)
-    (define-key map (kbd "<C-down>")   'helm-follow-action-forward)
-    (define-key map (kbd "<C-up>")     'helm-follow-action-backward)
-    (define-key map (kbd "<prior>")    'helm-previous-page)
-    (define-key map (kbd "<next>")     'helm-next-page)
-    (define-key map (kbd "M-v")        'helm-previous-page)
-    (define-key map (kbd "C-v")        'helm-next-page)
-    (define-key map (kbd "M-<")        'helm-beginning-of-buffer)
-    (define-key map (kbd "M->")        'helm-end-of-buffer)
-    (define-key map (kbd "C-g")        'helm-keyboard-quit)
-    (define-key map (kbd "<right>")    'helm-next-source)
-    (define-key map (kbd "<left>")     'helm-previous-source)
-    (define-key map (kbd "<RET>")      'helm-maybe-exit-minibuffer)
-    (define-key map (kbd "C-i")        'helm-select-action)
-    (define-key map (kbd "C-z")        'helm-execute-persistent-action)
-    (define-key map (kbd "C-j")        'helm-execute-persistent-action)
-    (define-key map (kbd "C-o")        'helm-next-source)
-    (define-key map (kbd "C-l")        'helm-recenter-top-bottom-other-window)
-    (define-key map (kbd "M-C-l")      'helm-reposition-window-other-window)
-    (define-key map (kbd "C-M-v")      'helm-scroll-other-window)
-    (define-key map (kbd "M-<next>")   'helm-scroll-other-window)
-    (define-key map (kbd "C-M-y")      'helm-scroll-other-window-down)
-    (define-key map (kbd "C-M-S-v")    'helm-scroll-other-window-down)
-    (define-key map (kbd "M-<prior>")  'helm-scroll-other-window-down)
-    (define-key map (kbd "<C-M-down>") 'helm-scroll-other-window)
-    (define-key map (kbd "<C-M-up>")   'helm-scroll-other-window-down)
-    (define-key map (kbd "C-@")        'helm-toggle-visible-mark)
-    (define-key map (kbd "C-SPC")      'helm-toggle-visible-mark)
-    (define-key map (kbd "M-SPC")      'helm-toggle-visible-mark)
-    (define-key map (kbd "M-[")        nil)
-    (define-key map (kbd "M-(")        'helm-prev-visible-mark)
-    (define-key map (kbd "M-)")        'helm-next-visible-mark)
-    (define-key map (kbd "C-k")        'helm-delete-minibuffer-contents)
-    (define-key map (kbd "C-x C-f")    'helm-quit-and-find-file)
-    (define-key map (kbd "M-m")        'helm-toggle-all-marks)
-    (define-key map (kbd "M-a")        'helm-mark-all)
-    (define-key map (kbd "M-u")        'helm-unmark-all)
-    (define-key map (kbd "C-w")        'helm-yank-text-at-point)
-    (define-key map (kbd "C-M-a")      'helm-show-all-in-this-source-only)
-    (define-key map (kbd "C-M-e")      'helm-display-all-sources)
-    (define-key map (kbd "C-r")        'undefined)
-    (define-key map (kbd "C-s")        'undefined)
-    (define-key map (kbd "M-s")        'undefined)
-    (define-key map (kbd "C-}")        'helm-narrow-window)
-    (define-key map (kbd "C-{")        'helm-enlarge-window)
-    (define-key map (kbd "C-c -")      'helm-swap-windows)
-    (define-key map (kbd "C-c C-d")    'helm-delete-current-selection)
-    (define-key map (kbd "C-c C-y")    'helm-yank-selection)
-    (define-key map (kbd "C-c C-k")    'helm-kill-selection-and-quit)
-    (define-key map (kbd "C-c C-i")    'helm-copy-to-buffer)
-    (define-key map (kbd "C-c C-f")    'helm-follow-mode)
-    (define-key map (kbd "C-c C-u")    'helm-force-update)
-    (define-key map (kbd "M-p")        'previous-history-element)
-    (define-key map (kbd "M-n")        'next-history-element)
-    (define-key map (kbd "C-!")        'helm-toggle-suspend-update)
-    (define-key map (kbd "C-x b")      'helm-resume-previous-session-after-quit)
-    (define-key map (kbd "C-x C-b")    'helm-resume-list-buffers-after-quit)
-    ;; Disable `file-cache-minibuffer-complete'.
-    (define-key map (kbd "<C-tab>")    'undefined)
-    ;; Multi keys
-    (define-key map (kbd "C-t")        'helm-toggle-resplit-and-swap-windows)
-    ;; Debugging command
-    (define-key map (kbd "C-h C-d")    'undefined)
-    (define-key map (kbd "C-h C-d")    'helm-debug-output)
-    ;; Use `describe-mode' key in `global-map'.
-    (define-key map [f1] nil) ; Allow to eval keymap without errors.
-    (define-key map (kbd "C-h C-h")    'undefined)
-    (define-key map (kbd "C-h h")      'undefined)
-    (cl-dolist (k (where-is-internal 'describe-mode global-map))
-      (define-key map k 'helm-help))
-    ;; Bind all actions from 1 to 12 to their corresponding nth index+1.
-    (cl-loop for n from 0 to 12 do
-             (define-key map (kbd (format "<f%s>" (1+ n)))
-               `(lambda ()
-                  (interactive)
-                  (helm-select-nth-action ,n))))
-    map)
-  "Keymap for helm.")
-
-
-(defgroup helm nil
-  "Open helm."
-  :prefix "helm-" :group 'convenience)
-
-(defcustom helm-completion-window-scroll-margin 5
-  " `scroll-margin' to use for helm completion window.
-Which see.  Set to 0 to disable.
-NOTE: This have no effect when `helm-display-source-at-screen-top'
-id non--nil."
-  :group 'helm
-  :type  'integer)
-
-(defcustom helm-display-source-at-screen-top t
-  "Display candidates at the top of screen.
-This happen when using `helm-next-source' and `helm-previous-source'.
-NOTE: When non--nil (default) disable `helm-completion-window-scroll-margin'."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-candidate-number-limit 100
-  "Limit candidate number globally.
-Do not show more candidates than this limit from individual sources.
-It is usually pointless to show hundreds of matches
-when the pattern is empty, because it is much simpler to type a
-few characters to narrow down the list of potential candidates.
-
-Set it to nil if you don't want this limit."
-  :group 'helm
-  :type '(choice (const :tag "Disabled" nil) integer))
-
-(defcustom helm-idle-delay 0.01
-  "Be idle for this many seconds, before updating in delayed sources.
-This is useful for sources involving heavy operations
-\(like launching external programs\), so that candidates
-from the source are not retrieved unnecessarily if the user keeps typing.
-
-It also can be used to declutter the results helm displays,
-so that results from certain sources are not shown with every
-character typed, only if the user hesitates a bit.
-Be sure to know what you are doing when modifying this."
-  :group 'helm
-  :type 'float)
-
-(defcustom helm-input-idle-delay 0.01
-  "Be idle for this many seconds, before updating.
-
-Unlike `helm-idle-delay', it is also effective for non-delayed sources.
-If nil, candidates are collected immediately.
-
-Note:  If this value is too low compared to `helm-idle-delay',
-you may have duplicated sources when using multiples sources.
-Safe value is always >= `helm-idle-delay'.
-Default settings are equal value for both.
-Be sure to know what you are doing when modifying this."
-  :group 'helm
-  :type 'float)
-
-(defcustom helm-exit-idle-delay 0
-  "Be idle for this many seconds before exiting minibuffer while helm is updating.
-Note that this does nothing when helm-buffer is up to date
-\(i.e exit without delay in this condition\)."
-  :group 'helm
-  :type 'float)
-
-(defcustom helm-full-frame nil
-  "Use current window to show the candidates.
-If t then Helm doesn't pop up a new window."
-  :group 'helm
-  :type 'boolean)
-
-(defvaralias 'helm-samewindow 'helm-full-frame)
-(make-obsolete-variable 'helm-samewindow 'helm-full-frame "1.4.8.1")
-
-(defcustom helm-quick-update nil
-  "If non-nil, suppress displaying sources which are out of screen at first.
-They are treated as delayed sources at this input.
-This flag makes `helm' a bit faster with many sources."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-candidate-separator
-  "--------------------"
-  "Candidates separator of `multiline' source."
-  :group 'helm
-  :type 'string)
-
-(defcustom helm-save-configuration-functions
-  '(set-window-configuration . current-window-configuration)
-  "The functions used to restore/save window or frame configurations.
-It is a pair where the car is the function to restore window or frame config,
-and the cdr is the function to save the window or frame config.
-
-If you want to save and restore frame configuration, set this variable to
- '\(set-frame-configuration . current-frame-configuration\)
-NOTE: This may not work properly with own-frame minibuffer settings.
-Older version saves/restores frame configuration, but the default is changed now
-because flickering can occur in some environment."
-  :group 'helm
-  :type 'sexp)
-
-(defcustom helm-persistent-action-use-special-display nil
-  "If non-nil, use `special-display-function' in persistent action."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-scroll-amount nil
-  "Scroll amount when scrolling other window in a helm session.
-It is used by `helm-scroll-other-window'
-and `helm-scroll-other-window-down'.
-
-If you prefer scrolling line by line, set this value to 1."
-  :group 'helm
-  :type 'integer)
-
-(defcustom helm-display-function 'helm-default-display-buffer
-  "Function to display *helm* buffer.
-It is `helm-default-display-buffer' by default,
-which affects `helm-full-frame'."
-  :group 'helm
-  :type 'symbol)
-
-(defcustom helm-case-fold-search 'smart
-  "Add 'smart' option to `case-fold-search'.
-When smart is enabled, ignore case in the search strings
-if pattern contains no uppercase characters.
-Otherwise, with a nil or t value, the behavior is same as
-`case-fold-search'.
-Default value is smart, other possible values are nil and t.
-NOTE: This have no effect in asynchronous sources, you will
-have to implement a similar feature directly in the process.
-See in helm-grep.el how it is implemented."
-  :group 'helm
-  :type '(choice (const :tag "Ignore case" t)
-          (const :tag "Respect case" nil)
-          (other :tag "Smart" 'smart)))
-
-(defcustom helm-file-name-case-fold-search
-  (if (memq system-type
-            '(cygwin windows-nt ms-dos darwin))
-      t
-    helm-case-fold-search)
-  "Local setting of `helm-case-fold-search' for reading filenames.
-
-See `helm-case-fold-search' for more info."
-  :group 'helm
-  :type 'symbol)
-
-(defcustom helm-reuse-last-window-split-state nil
-  "Reuse the last state of window split, vertical or horizontal.
-That is when you use `helm-toggle-resplit-window' the next helm session
-will reuse the same window scheme than the one of last session unless
-`helm-split-window-default-side' is 'same or 'other."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-split-window-preferred-function 'helm-split-window-default-fn
-  "Default function used for splitting window."
-  :group 'helm
-  :type 'function)
-
-(defcustom helm-split-window-default-side 'below
-  "The default side to display `helm-buffer'.
-Must be one acceptable arg for `split-window' SIDE,
-that is `below', `above', `left' or `right'.
-
-Other acceptable values are `same' which always display `helm-buffer'
-in current window and `other' that display `helm-buffer' below if only one
-window or in `other-window-for-scrolling' if available.
-
-A nil value as same effect as `below'.
-If `helm-full-frame' is non--nil, it take precedence on this.
-
-See also `helm-split-window-in-side-p' and `helm-always-two-windows' that
-take precedence on this.
-
-NOTE: this have no effect if `helm-split-window-preferred-function' is not
-`helm-split-window-default-fn' unless this new function handle this."
-  :group 'helm
-  :type 'symbol)
-
-(defcustom helm-split-window-in-side-p nil
-  "Force splitting inside selected window when non--nil.
-See also `helm-split-window-default-side'.
-
-NOTE: this have no effect if `helm-split-window-preferred-function' is not
-`helm-split-window-default-fn' unless this new function handle this."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-always-two-windows nil
-  "When non--nil helm will use two windows in this frame.
-That is one window to display `helm-buffer' and one to display
-`helm-current-buffer'.
-
-Note: this have no effect when `helm-split-window-in-side-p' is non--nil,
-or when `helm-split-window-default-side' is set to 'same.
-
-When `helm-autoresize-mode' is enabled, setting this to nil
-will have no effect.
-
-Also when non-nil it overhides the effect of `helm-split-window-default-side'
-set to `other'."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-sources-using-default-as-input '(helm-source-imenu
-                                                 helm-source-imenu-all
-                                                 helm-source-info-elisp
-                                                 helm-source-etags-select
-                                                 helm-source-man-pages
-                                                 helm-source-occur
-                                                 helm-source-moccur)
-  "List of helm sources that need to use `helm--maybe-use-default-as-input'.
-When a source is member of this list, default `thing-at-point'
-will be used as input."
-  :group 'helm
-  :type '(repeat (choice symbol)))
-
-(defcustom helm-delete-minibuffer-contents-from-point t
-  "When non--nil, `helm-delete-minibuffer-contents' delete region from `point'.
-Otherwise delete `minibuffer-contents'.
-See documentation of `helm-delete-minibuffer-contents'."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-follow-mode-persistent nil
-  "Retrieve last state of `helm-follow-mode' in next helm session when non--nil.
-This will not make it persistent through emacs sessions though,
-you will have to set explicitely the `follow' attribute in the source where
-you want this mode enabled definitely."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-prevent-escaping-from-minibuffer t
-  "Prevent escaping from minibuffer during helm session."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-move-to-line-cycle-in-source nil
-  "Move to end or beginning of source when reaching top or bottom of source.
-This happen when using `helm-next/previous-line'."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-fuzzy-match-fn 'helm-fuzzy-match
-  "The function for fuzzy matching in `helm-source-sync' based sources."
-  :group 'helm
-  :type 'function)
-
-(defcustom helm-fuzzy-search-fn 'helm-fuzzy-search
-  "The function for fuzzy matching in `helm-source-in-buffer' based sources."
-  :group 'helm
-  :type 'function)
-
-(defcustom helm-fuzzy-sort-fn 'helm-fuzzy-matching-default-sort-fn
-  "The sort transformer function used in fuzzy matching.
-When nil no sorting will be done."
-  :group 'helm
-  :type 'function)
-
-(defcustom helm-fuzzy-matching-highlight-fn 'helm-fuzzy-default-highlight-match
-  "The function to highlight matches in fuzzy matching.
-When nil no highlighting will be done."
-  :group 'helm
-  :type 'function)
-
-(defcustom helm-autoresize-max-height 40
-  "Specifies a maximum height and defaults to the height of helm window's frame in percentage.
-
-See `fit-window-to-buffer' for more infos."
-  :group 'helm
-  :type 'integer)
-
-(defcustom helm-autoresize-min-height 10
-  "Specifies a minimum height and defaults to the height of helm window's frame in percentage.
-
-If nil the default of `window-min-height' is used
-See `fit-window-to-buffer' for more infos."
-  :group 'helm
-  :type 'integer)
-
-(defcustom helm-input-method-verbose-flag nil
-  "The default value of `input-method-verbose-flag' to use in helm minibuffer.
-It is nil by default to allow helm updating and exiting without turning off
-the input method when complex methods are in use, if you set it to any other
-value allowed by `input-method-verbose-flag' you will have at each time you want
-to exit or helm update to disable the `current-input-method' with `C-\\'."
-  :group 'helm
-  :type '(radio :tag "A flag to control extra guidance given by input methods in helm."
-          (const :tag "Never provide guidance" nil)
-          (const :tag "Always provide guidance" t)
-          (const :tag "Provide guidance only in complex methods" complex-only)))
-
-(defcustom helm-display-header-line t
-  "Display header-line when non nil."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-file-globstar t
-  "Same as globstar bash shopt option.
-When non--nil a pattern beginning with two stars will expand recursively.
-Directories expansion is not supported yet."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-inherit-input-method t
-  "Inherit `current-input-method' from `current-buffer' when non--nil.
-The default is to enable this by default, the user can toggle the current
-input method with `toggle-input-method'."
-  :group 'helm
-  :type 'boolean)
-
-(defcustom helm-echo-input-in-header-line nil
-  "Send current input in header-line."
-  :group 'helm
-  :type 'boolean)
-
-
-;;; Faces
-;;
-;;
-(defgroup helm-faces nil
-  "Customize the appearance of helm."
-  :prefix "helm-"
-  :group 'faces
-  :group 'helm)
-
-(defface helm-source-header
-    '((((background dark))
-       :background "#22083397778B"
-       :foreground "white"
-       :weight bold :height 1.3 :family "Sans Serif")
-      (((background light))
-       :background "#abd7f0"
-       :foreground "black"
-       :weight bold :height 1.3 :family "Sans Serif"))
-  "Face for source header in the helm buffer."
-  :group 'helm-faces)
-
-(defface helm-visible-mark
-    '((((min-colors 88) (background dark))
-       (:background "green1" :foreground "black"))
-      (((background dark))
-       (:background "green" :foreground "black"))
-      (((background light)) :background "#d1f5ea")
-      (((min-colors 88))
-       (:background "green1"))
-      (t (:background "green")))
-  "Face for visible mark."
-  :group 'helm-faces)
-
-(defface helm-header
-    '((t (:inherit header-line)))
-  "Face for header lines in the helm buffer."
-  :group 'helm-faces)
-
-(defface helm-candidate-number
-    '((((background dark)) :background "Yellow" :foreground "black")
-      (((background light)) :background "#faffb5" :foreground "black"))
-  "Face for candidate number in mode-line." :group 'helm-faces)
-
-(defface helm-selection
-    '((((background dark)) :background "ForestGreen"
-       :distant-foreground "black")
-      (((background light)) :background "#b5ffd1"
-       :distant-foreground "black"))
-  "Face for currently selected item in the helm buffer."
-  :group 'helm-faces)
-
-(defface helm-separator
-    '((((background dark)) :foreground "red")
-      (((background light)) :foreground "#ffbfb5"))
-  "Face for multiline source separator."
-  :group 'helm-faces)
-
-(defface helm-action
-    '((t (:underline t)))
-  "Face for action lines in the helm action buffer."
-  :group 'helm-faces)
-
-(defface helm-prefarg
-    '((((background dark)) :foreground "green")
-      (((background light)) :foreground "red"))
-  "Face for showing prefix arg in mode-line."
-  :group 'helm-faces)
-
-(defface helm-match
-  '((((background light)) :foreground "#b00000")
-    (((background dark))  :foreground "gold1"))
-  "Face used to highlight matches."
-  :group 'helm)
-
-
-;;; Variables.
-;;
-;;
-(defvar helm-type-attributes nil
-  "It's a list of \(TYPE ATTRIBUTES ...\).
-ATTRIBUTES are the same as attributes for `helm-sources'.
-TYPE connects the value to the appropriate sources.
-Don't set this directly, use instead `define-helm-type-attribute'.
-
-This allows specifying common attributes for several sources.
-For example, sources which provide files can specify
-common attributes with a `file' type.")
-
-(defvar helm-source-filter nil
-  "A list of source names to be displayed.
-Other sources won't appear in the search results.
-If nil then there is no filtering.
-See also `helm-set-source-filter'.")
-
-(defvar helm-action-buffer "*helm action*"
-  "Buffer showing actions.")
-
-(defvar helm-selection-overlay nil
-  "Overlay used to highlight the currently selected item.")
-
-(defvar helm-async-processes nil
-  "List of information about asynchronous processes managed by helm.")
-
-(defvar helm-before-initialize-hook nil
-  "Run before helm initialization.
-This hook is run before init functions in `helm-sources',
-that is before creation of `helm-buffer'.
-Local variables for `helm-buffer' that need a value from `current-buffer'
-can be set here with `helm-set-local-variable'.")
-
-(defvar helm-after-initialize-hook nil
-  "Run after helm initialization.
-This hook run after `helm-buffer' is created but not from `helm-buffer'
-so the hook have to specify in which buffer it should run.")
-
-(defvar helm-update-hook nil
-  "Run after the helm buffer was updated according the new input pattern.
-This hook is run at the beginning of buffer.
-The first candidate is selected after running this hook.
-See also `helm-after-update-hook'.")
-
-(defvar helm-after-update-hook nil
-  "Run after the helm buffer was updated according the new input pattern.
-This is very similar to `helm-update-hook' but selection is not moved.
-It is useful to select a particular object instead of the first one.")
-
-(defvar helm-cleanup-hook nil
-  "Run after helm minibuffer is closed.
-IOW this hook is executed BEFORE performing action.")
-
-(defvar helm-select-action-hook nil
-  "Run when opening the action buffer.")
-
-(defvar helm-before-action-hook nil
-  "Run before executing action.
-Contrarily to `helm-cleanup-hook',
-this hook run before helm minibuffer is closed
-and before performing action.")
-
-(defvar helm-after-action-hook nil
-  "Run after executing action.")
-
-(defvar helm-exit-minibuffer-hook nil
-  "Run just before exiting minibuffer.")
-
-(defvar helm-after-persistent-action-hook nil
-  "Run after executing persistent action.")
-
-(defvar helm-move-selection-before-hook nil
-  "Run before moving selection in `helm-buffer'.")
-
-(defvar helm-move-selection-after-hook nil
-  "Run after moving selection in `helm-buffer'.")
-
-(defvar helm-window-configuration-hook nil
-  "Run when switching to and back from action buffer.")
-
-(defconst helm-restored-variables
-  '(helm-candidate-number-limit
-    helm-source-filter
-    helm-source-in-each-line-flag
-    helm-map
-    helm-sources)
-  "Variables which are restored after `helm' invocation.")
-
-(defvar helm-execute-action-at-once-if-one nil
-  "Execute default action and exit when only one candidate is remaining.")
-
-(defvar helm-quit-if-no-candidate nil
-  "Quit when there is no candidates when non--nil.
-This variable accepts a function, which is executed if no candidate.")
-
-(defvar helm-source-in-each-line-flag nil
-  "Non-nil means add helm-source text-property in each candidate.
-experimental feature.")
-
-(defvar helm-debug-variables nil
-  "A list of helm variables to show in `helm-debug-output'.
-Otherwise all variables started with `helm-' are shown.")
-
-(defvar helm-debug-buffer "*Debug Helm Log*")
-
-(defvar helm-debug nil
-  "If non-nil, write log message into `helm-debug-buffer' buffer.
-It is disabled by default because `helm-debug-buffer' grows quickly.")
-
-(defvar helm-compile-source-functions
-  '(helm-compile-source--type
-    helm-compile-source--dummy
-    helm-compile-source--candidates-in-buffer)
-  "Functions to compile elements of `helm-sources' (plug-in).")
-
-(defvar helm-mode-line-string "\
-\\<helm-map>\
-\\[helm-help]:Help \
-\\[helm-select-action]:Act \
-\\[helm-maybe-exit-minibuffer]/\
-f1/f2/f-n:NthAct"
-  "Help string displayed in mode-line in `helm'.
-It can be a string or a list of two args, in this case,
-first arg is a string that will be used as name for candidates number,
-second arg any string to display in mode line.
-If nil, use default `mode-line-format'.")
-
-(defvar helm-minibuffer-set-up-hook nil
-  "Hook that run at initialization of minibuffer.
-Useful for modifying the settings of minibuffer in helm.
-
-Here an example to hide minibuffer when using
-`helm-echo-input-in-header-line':
-
-      (add-hook 'helm-minibuffer-set-up-hook
-                (lambda ()
-                  (when (with-helm-buffer helm-echo-input-in-header-line)
-                    (text-scale-set -12)
-                    (window--resize-mini-window
-                     (selected-window) -15))))
-
-Note that we check `helm-echo-input-in-header-line' value
-from `helm-buffer' which allow detecting possible local
-value of this var.")
-
-;;; Internal Variables
-;;
-;;
-(defvar helm-current-prefix-arg nil
-  "Record `current-prefix-arg' when exiting minibuffer.")
-(defvar helm-saved-action nil
-  "Saved value of the currently selected action by key.")
-(defvar helm-saved-current-source nil
-  "Value of the current source when the action list is shown.")
-(defvar helm-compiled-sources nil
-  "Compiled version of `helm-sources'.")
-(defvar helm-in-persistent-action nil
-  "Flag whether in persistent-action or not.")
-(defvar helm-last-buffer nil
-  "`helm-buffer' of previously `helm' session.")
-(defvar helm-saved-selection nil
-  "Value of the currently selected object when the action list is shown.")
-(defvar helm-sources nil
-  "[INTERNAL] Value of current sources in use, a list.")
-(defvar helm-buffer "*helm*"
-  "Buffer showing completions.")
-(defvar helm-current-buffer nil
-  "Current buffer when `helm' is invoked.")
-(defvar helm-buffer-file-name nil
-  "Variable `buffer-file-name' when `helm' is invoked.")
-(defvar helm-candidate-cache (make-hash-table :test 'equal)
-  "Holds the available candidate within a single helm invocation.")
-(defvar helm-pattern ""
-  "The input pattern used to update the helm buffer.")
-(defvar helm-input ""
-  "The input typed in the candidates panel.")
-(defvar helm-input-local nil
-  "Internal, store locally `helm-pattern' value for later use in `helm-resume'.")
-(defvar helm-source-name nil)
-(defvar helm-current-source nil)
-(defvar helm-candidate-buffer-alist nil)
-(defvar helm-match-hash (make-hash-table :test 'equal))
-(defvar helm-cib-hash (make-hash-table :test 'equal))
-(defvar helm-tick-hash (make-hash-table :test 'equal))
-(defvar helm-issued-errors nil)
-(defvar helm-debug-root-directory nil
-  "When non--nil, save helm log to `helm-last-log-file'.
-Be aware that if you set that, you will end up with a huge directory
-of log files, so use that only for debugging purpose.
-See `helm-log-save-maybe' for more info.")
-(defvar helm-last-log-file nil
-  "The name of the last helm session log file.")
-(defvar helm-follow-mode nil)
-(defvar helm--local-variables nil)
-(defvar helm-split-window-state nil)
-(defvar helm--window-side-state nil)
-(defvar helm-selection-point nil)
-(defvar helm-alive-p nil)
-(defvar helm-visible-mark-overlays nil)
-(defvar helm-update-blacklist-regexps '("^" "^ *" "$" "!" " " "\\b"
-                                        "\\<" "\\>" "\\_<" "\\_>" ".*"))
-(defvar helm-suspend-update-flag nil)
-(defvar helm-force-updating-p nil)
-(defvar helm-exit-status 0
-  "Flag to inform whether helm have exited or quitted.
-Exit with 0 mean helm have exited executing an action.
-Exit with 1 mean helm have quitted with \\[keyboard-quit]
-It is useful for example to restore a window config if helm abort
-in special cases.
-See `helm-exit-minibuffer' and `helm-keyboard-quit'.")
-(defvar helm-minibuffer-confirm-state nil)
-(defvar helm-quit nil)
-(defvar helm-attributes nil "List of all `helm' attributes.")
-(defvar helm-buffers nil
-  "All of `helm-buffer' in most recently used order.")
-(defvar helm-current-position nil
-  "Cons of \(point . window-start\)  when `helm' is invoked.
-It is needed to restore position in `helm-current-buffer'
-when `helm' is keyboard-quitted.")
-(defvar helm-last-frame-or-window-configuration nil
-  "Used to store window or frame configuration when helm start.")
-(defvar helm-onewindow-p nil)
-(defvar helm-types nil)
-(defvar helm--mode-line-string-real nil) ; The string to display in mode-line.
-(defvar helm-persistent-action-display-window nil)
-(defvar helm-marked-candidates nil
-  "Marked candadates.  List of \(source . real\) pair.")
-(defvar helm--mode-line-display-prefarg nil)
-(defvar helm--temp-follow-flag nil
-  "[INTERNAL] A simple flag to notify persistent action we are following.")
-(defvar helm--reading-passwd-or-string nil)
-(defvar helm--in-update nil)
-(defvar helm--in-fuzzy nil)
-(defvar helm--maybe-use-default-as-input nil
-  "Flag to notify the use of use-default-as-input.
-Use only in let-bindings.
-Use :default arg of `helm' as input to update display.
-Note that if also :input is specified as `helm' arg, it will take
-precedence on :default.")
-(defvar helm--temp-hooks nil
-  "Store temporary hooks added by `with-helm-temp-hook'.")
-(defvar helm-truncate-lines nil
-  "[Internal] Don't set this globally, it is used as a local var.")
-
-
-;; Utility: logging
-(defun helm-log (format-string &rest args)
-  "Log message `helm-debug' is non-nil.
-Messages are written to the `helm-debug-buffer' buffer.
-
-Argument FORMAT-STRING is a string to use with `format'.
-Use optional arguments ARGS like in `format'."
-  (when helm-debug
-    (with-current-buffer (get-buffer-create helm-debug-buffer)
-      (outline-mode)
-      (buffer-disable-undo)
-      (set (make-local-variable 'inhibit-read-only) t)
-      (goto-char (point-max))
-      (insert (let ((tm (current-time)))
-                (format (concat (if (string-match "Start session" format-string)
-                                    "* " "** ")
-                                "%s.%06d (%s)\n %s\n")
-                        (format-time-string "%H:%M:%S" tm)
-                        (nth 2 tm)
-                        (helm-log-get-current-function)
-                        (apply #'format (cons format-string args))))))))
-
-(defun helm-log-run-hook (hook)
-  "Run HOOK like `run-hooks' but write these actions to helm log buffer."
-  (helm-log "Executing %s with value = %S" hook (symbol-value hook))
-  (helm-log "Executing %s with global value = %S" hook (default-value hook))
-  (run-hooks hook)
-  (helm-log "executed %s" hook))
-
-(defun helm-log-get-current-function ()
-  "Get function name calling `helm-log'.
-The original idea is from `tramp-debug-message'."
-  (cl-loop with exclude-func-re = "^helm-\\(?:interpret\\|log\\|.*funcall\\)"
-        for btn from 1 to 40
-        for btf = (cl-second (backtrace-frame btn))
-        for fn  = (if (symbolp btf) (symbol-name btf) "")
-        if (and (string-match "^helm" fn)
-                (not (string-match exclude-func-re fn)))
-        return fn))
-
-(defun helm-log-error (&rest args)
-  "Accumulate error messages into `helm-issued-errors'.
-ARGS are args given to `format'.
-e.g (helm-log-error \"Error %s: %s\" (car err) (cdr err))."
-  (apply 'helm-log (concat "ERROR: " (car args)) (cdr args))
-  (let ((msg (apply 'format args)))
-    (unless (member msg helm-issued-errors)
-      (add-to-list 'helm-issued-errors msg))))
-
-(defun helm-log-save-maybe ()
-  "May be save log buffer to `helm-last-log-file'.
-If `helm-debug-root-directory' is non--nil and a valid directory,
-a directory named 'helm-debug-<date of today>'
-will be created there and the log recorded in a file named
-at the date and time of today in this directory."
-  (when (and (stringp helm-debug-root-directory)
-             (file-directory-p helm-debug-root-directory)
-             helm-debug)
-    (let ((logdir (expand-file-name (concat "helm-debug-"
-                                            (format-time-string "%Y%m%d"))
-                                    helm-debug-root-directory)))
-      (make-directory logdir t)
-      (with-current-buffer (get-buffer-create helm-debug-buffer)
-        (write-region (point-min) (point-max)
-                      (setq helm-last-log-file
-                            (expand-file-name
-                             (format-time-string "%Y%m%d-%H%M%S")
-                             logdir))
-                      nil 'silent)
-        (kill-buffer)))))
-
-;;;###autoload
-(defun helm-debug-open-last-log ()
-  "Open helm log file of last helm session.
-If `helm-last-log-file' is nil, switch to `helm-debug-buffer' ."
-  (interactive)
-  (if helm-last-log-file
-      (view-file helm-last-log-file)
-    (switch-to-buffer helm-debug-buffer)
-    (view-mode 1) (visual-line-mode 1)))
-
-(defun helm-print-error-messages ()
-  "Print error messages in `helm-issued-errors'."
-  (and helm-issued-errors
-       (message "Helm issued errors: %s"
-                (mapconcat 'identity (reverse helm-issued-errors) "\n"))))
-
-
-;; Programming Tools
-(defmacro helm-aif (test-form then-form &rest else-forms)
-  "Like `if' but set the result of TEST-FORM in a temprary variable called `it'.
-THEN-FORM and ELSE-FORMS are then excuted just like in `if'."
-  (declare (indent 2) (debug t))
-  `(let ((it ,test-form))
-     (if it ,then-form ,@else-forms)))
-
-(defun helm-mklist (obj)
-  "If OBJ is a list \(but not lambda\), return itself.
-Otherwise make a list with one element."
-  (if (and (listp obj) (not (functionp obj)))
-      obj
-    (list obj)))
-
-(defun helm-this-command ()
-  "Return the actual command in action.
-Like `this-command' but return the real command,
-not `exit-minibuffer' or unwanted functions."
-  (cl-loop with bl = '(helm-maybe-exit-minibuffer
-                       helm-confirm-and-exit-minibuffer
-                       helm-exit-minibuffer
-                       exit-minibuffer)
-        for count from 1 to 50
-        for btf = (backtrace-frame count)
-        for fn = (cl-second btf)
-        if (and
-            ;; In some case we may have in the way an
-            ;; advice compiled resulting in byte-code,
-            ;; ignore it (Issue #691).
-            (symbolp fn)
-            (commandp fn)
-            (not (memq fn bl)))
-        return fn
-        else
-        if (and (eq fn 'call-interactively)
-                (> (length btf) 2))
-        return (cadr (cdr btf))))
-
-(defun helm-flatten-list (seq &optional omit-nulls)
-  "Return a list of all single elements of sublists in SEQ."
-  (let (result)
-    (cl-labels ((flatten (seq)
-                  (cl-loop
-                        for elm in seq
-                        if (and (or elm
-                                    (null omit-nulls))
-                                (or (atom elm)
-                                    (functionp elm)
-                                    (and (consp elm)
-                                         (cdr elm)
-                                         (atom (cdr elm)))))
-                        do (push elm result)
-                        else do (flatten elm))))
-      (flatten seq))
-    (nreverse result)))
-
-
-;; Test tools
-(defmacro with-helm-time-after-update (&rest body)
-  (helm-with-gensyms (start-time time-elapsed)
-    `(let ((,start-time (float-time)) ,time-elapsed)
-       (add-hook 'helm-after-update-hook
-                 (lambda ()
-                   (setq ,time-elapsed (- (float-time) ,start-time))
-                   (keyboard-quit)))
-       (unwind-protect ,@body
-         (remove-hook 'helm-after-update-hook
-                      (lambda ()
-                        (setq  ,time-elapsed (- (float-time) ,start-time))
-                        (keyboard-quit))))
-       ,time-elapsed)))
-
-
-;; Helm API
-
-(defun helm-buffer-get ()
-  "Return `helm-action-buffer' if shown otherwise `helm-buffer'."
-  (if (helm-action-window)
-      helm-action-buffer
-    helm-buffer))
-
-(defun helm-window ()
-  "Window of `helm-buffer'."
-  (get-buffer-window (helm-buffer-get) 0))
-
-(defun helm-action-window ()
-  "Window of `helm-action-buffer'."
-  (get-buffer-window helm-action-buffer 'visible))
-
-(defmacro with-helm-window (&rest body)
-  "Be sure BODY is excuted in the helm window."
-  (declare (indent 0) (debug t))
-  `(with-selected-window (helm-window)
-     ,@body))
-
-(defmacro with-helm-current-buffer (&rest body)
-  "Eval BODY inside `helm-current-buffer'."
-  (declare (indent 0) (debug t))
-  `(with-current-buffer (or (and (buffer-live-p helm-current-buffer)
-                                 helm-current-buffer)
-                            (setq helm-current-buffer
-                                  (current-buffer)))
-     ,@body))
-
-(defmacro with-helm-buffer (&rest body)
-  "Eval BODY inside `helm-buffer'."
-  (declare (indent 0) (debug t))
-  `(with-current-buffer (helm-buffer-get)
-     ,@body))
-
-(defmacro with-helm-restore-variables (&rest body)
-  "Restore `helm-restored-variables' after executing BODY."
-  (declare (indent 0) (debug t))
-  (helm-with-gensyms (orig-vars)
-    `(let ((,orig-vars (mapcar (lambda (v)
-                                 (cons v (symbol-value v)))
-                               helm-restored-variables)))
-       (unwind-protect (progn ,@body)
-         (cl-loop for (var . value) in ,orig-vars
-               do (set var value))
-         (helm-log "restore variables")))))
-
-(defmacro with-helm-default-directory (directory &rest body)
-  (declare (indent 2) (debug t))
-  `(let ((default-directory (or (and ,directory
-                                     (file-name-as-directory ,directory))
-                                default-directory)))
-     ,@body))
-
-(defun helm-default-directory ()
-  "Return the local value of `default-directory' in `helm-buffer'."
-  (buffer-local-value 'default-directory (get-buffer helm-buffer)))
-
-(defmacro with-helm-temp-hook (hook &rest body)
-  "Execute temporarily BODY as a function for HOOK."
-  (declare (indent 1) (debug t))
-  (helm-with-gensyms (helm--hook)
-    `(progn
-       (defun ,helm--hook ()
-         (unwind-protect
-              (progn ,@body)
-           (remove-hook ,hook (quote ,helm--hook))
-           (fmakunbound (quote ,helm--hook))))
-       (push (cons ',helm--hook ,hook) helm--temp-hooks)
-       (add-hook ,hook (quote ,helm--hook)))))
-
-(defmacro with-helm-after-update-hook (&rest body)
-  "Execute BODY at end of `helm-update'."
-  (declare (indent 0) (debug t))
-  `(with-helm-temp-hook 'helm-after-update-hook ,@body))
-
-(defmacro with-helm-alive-p (&rest body)
-  "Return error when BODY run outside helm context."
-  (declare (indent 0) (debug t))
-  `(progn
-     (if helm-alive-p
-         (progn ,@body)
-       (error "Running helm command outside of context"))))
-
-(cl-defun helm-attr (attribute-name
-                     &optional (src (helm-get-current-source)) compute)
-  "Get the value of ATTRIBUTE-NAME of SRC.
-If SRC is omitted, use current source.
-If COMPUTE is non--nil compute value of ATTRIBUTE-NAME
-with `helm-interpret-value'."
-  (helm-aif (or (assq attribute-name src)
-                (helm-get-attribute-from-source-type attribute-name src))
-      (if compute (helm-interpret-value (cdr it)) (cdr it))))
-
-(cl-defun helm-attr-defined (attribute-name
-                             &optional (src (helm-get-current-source)))
-  "Return non-nil if ATTRIBUTE-NAME of SRC is defined.
-if SRC is omitted, use current source."
-  (and (helm-attr attribute-name src) t))
-
-(cl-defun helm-attrset (attribute-name value
-                        &optional
-                          (src (helm-get-current-source))
-                          alter-type)
-  "Set the value of ATTRIBUTE-NAME of source SRC to VALUE.
-If ATTRIBUTE-NAME doesn't exists in source it is created with value VALUE.
-If ALTER-TYPE is non--nil alter the value of ATTRIBUTE-NAME in `helm-attributes'
-if it exists.
-If SRC is omitted, use current source.
-If operation succeed, return value, otherwise nil."
-  (let ((from-type (helm-get-attribute-from-source-type attribute-name src))
-        done)
-    (helm-aif (or (assq attribute-name src)
-                  (and alter-type from-type))
-        (prog1 (setcdr it value) (setq done t))
-      (unless from-type
-        (setcdr src (cons (cons attribute-name value) (cdr src)))
-        (setq done t)))
-    (and done value)))
-
-(defun helm-get-attribute-from-source-type (attribute source)
-  "Get ATTRIBUTE from type attribute of SOURCE."
-  (when (assq 'type source)
-    (assq attribute
-          (assq (cdr (assq 'type source))
-                helm-type-attributes))))
-
-(defun helm-get-attribute-from-type (attribute type)
-  "Get ATTRIBUTE from TYPE.
-arg TYPE is an existing type defined in `helm-type-attributes'."
-  (assq attribute (assq type helm-type-attributes)))
-
-(defun helm-get-actions-from-type (source)
-  "Get actions list from type attribute of SOURCE."
-  (when (assq 'type source)
-    (helm-get-attribute-from-source-type 'action source)))
-
-(defun helm-inherit-attribute-from-source (attribute source)
-  "Get the ATTRIBUTE of SOURCE."
-  (helm-aif (assq attribute source)
-      it
-    (helm-get-attribute-from-source-type attribute source)))
-
-(defun helm-append-at-nth (seq elm index)
-  "Append ELM at INDEX in SEQ."
-  (let ((len (length seq)))
-    (cond ((> index len) (setq index len))
-          ((< index 0) (setq index 0)))
-    (if (zerop index)
-        (append elm seq)
-        (cl-loop for i in seq
-                 for count from 1 collect i
-                 when (= count index)
-                 if (listp elm) append elm
-                 else collect elm))))
-
-(defun helm-add-action-to-source (name fn source &optional index)
-  "Add new action NAME linked to function FN to SOURCE.
-Function FN should be a valid function that take one arg i.e candidate,
-argument NAME is a string that will appear in action menu
-and SOURCE should be an existing helm source already loaded.
-If INDEX is specified, action is added in action list at INDEX,
-otherwise it is added at end.
-This allow user to add a specific action to an existing source
-without modifying source code."
-  (let ((actions    (helm-attr 'action source))
-        (new-action (list (cons name fn))))
-    (when (symbolp actions)
-      (setq actions (list (cons "Default action" actions))))
-    (helm-attrset 'action
-                  (if index
-                      (helm-append-at-nth actions new-action index)
-                    (append actions new-action))
-                  source)))
-
-(defun helm-delete-action-from-source (action-or-name source)
-  "Delete ACTION-OR-NAME from SOURCE.
-ACTION-OR-NAME can either be the name of action or the symbol function
-associated to name."
-  (let* ((actions    (helm-attr 'action source))
-         (del-action (if (symbolp action-or-name)
-                         (rassoc action-or-name actions)
-                       (assoc action-or-name actions))))
-    (helm-attrset 'action (delete del-action actions) source)))
-
-(cl-defun helm-add-action-to-source-if (name fn source predicate
-                                        &optional (index 4) test-only)
-  "Add new action NAME linked to function FN to SOURCE.
-Action NAME will be available when the current candidate matches PREDICATE.
-This function add an entry in the `action-transformer' attribute
-of SOURCE (or create one if not found).
-Function PREDICATE should take one arg candidate.
-Function FN should be a valid function that take one arg i.e candidate,
-argument NAME is a string that will appear in action menu
-and SOURCE should be an existing helm source already loaded.
-If INDEX is specified, action is added in action list at INDEX.
-Value of INDEX should be always >=1, default to 4.
-This allow user to add a specific `action-tranformer'
-to an existing source without modifying source code.
-E.g
-Add the action \"Byte compile file async\" linked to
-function 'async-byte-compile-file to source `helm-source-find-files'
-only when predicate helm-ff-candidates-lisp-p return non--nil:
-
-\(helm-add-action-to-source-if \"Byte compile file async\"
-                              'async-byte-compile-file
-                              helm-source-find-files
-                              'helm-ff-candidates-lisp-p\)."
-  (let* ((actions     (helm-attr 'action source))
-         (action-transformers (helm-attr 'action-transformer source))
-         (new-action  (list (cons name fn)))
-         (transformer `(lambda (actions candidate)
-                         (cond ((funcall (quote ,predicate) candidate)
-                                (helm-append-at-nth
-                                 actions (quote ,new-action) ,index))
-                               (t actions)))))
-    (when (or (symbolp actions) (functionp actions))
-      (helm-attrset 'action (list (cons "Default action" actions)) source))
-    (when (or (symbolp action-transformers) (functionp action-transformers))
-      (setq action-transformers (list action-transformers)))
-    (if test-only                       ; debug
-        (delq nil (append (list transformer) action-transformers))
-      (helm-attrset 'action-transformer
-                    (helm-fast-remove-dups
-                     (delq nil (append (list transformer) action-transformers))
-                     :test 'equal)
-                    source))))
-
-(defun helm-set-source-filter (sources)
-  "Set the value of `helm-source-filter' to SOURCES and update.
-
-This function sets a filter for helm sources and it may be
-called while helm is running. It can be used to toggle
-displaying of sources dynamically. For example, additional keys
-can be bound into `helm-map' to display only the file-related
-results if there are too many matches from other sources and
-you're after files only:
-
-Shift+F shows only file results from some sources:
-
-\(define-key helm-map \"F\" 'helm-my-show-files-only)
-
-\(defun helm-my-show-files-only ()
-  (interactive)
-  (helm-set-source-filter '(\"File Name History\"
-                                  \"Files from Current Directory\")))
-
-Shift+A shows all results:
-
-\(define-key helm-map \"A\" 'helm-my-show-all)
-
-\(defun helm-my-show-all ()
-  (interactive)
-  (helm-set-source-filter nil))
-
-The -my- part is added to avoid collisions with
-existing Helm function names."
-  (let ((cur-disp-sel (with-current-buffer helm-buffer
-                        (helm-get-selection nil t))))
-    (setq helm-source-filter (helm--normalize-filter-sources sources))
-    (helm-log "helm-source-filter = %S" helm-source-filter)
-    ;; Use force-update to run init/update functions.
-    (helm-force-update (and (stringp cur-disp-sel)
-                            (regexp-quote cur-disp-sel)))))
-
-(defun helm--normalize-filter-sources (sources)
-  (cl-loop for s in sources collect
-           (cond ((symbolp s)
-                  (assoc-default 'name (symbol-value s)))
-                 ((listp s)
-                  (assoc-default 'name s))
-                 ((stringp s) s))))
-
-(defun helm-set-sources (sources &optional no-init no-update)
-  "Set SOURCES during `helm' invocation.
-If NO-INIT is non-nil, skip executing init functions of SOURCES.
-If NO-UPDATE is non-nil, skip executing `helm-update'."
-  (with-current-buffer helm-buffer
-    (setq helm-compiled-sources nil
-          helm-sources sources)
-    (helm-log "helm-compiled-sources = %S" helm-compiled-sources)
-    (helm-log "helm-sources = %S" helm-sources))
-  (unless no-init (helm-funcall-foreach 'init))
-  (unless no-update (helm-update)))
-
-(defun helm-get-sources ()
-  "Return compiled `helm-sources', which is memoized.
-
-Attributes:
-
-- type
-  `helm-type-attributes' are merged in.
-- candidates-buffer
-  candidates, volatile and match attribute are created."
-  (cond
-    ;; action
-    ((helm-action-window)
-     helm-sources)
-    ;; memoized
-    (helm-compiled-sources)
-    ;; first time
-    (t
-     (prog1
-         (setq helm-compiled-sources
-               (helm-compile-sources
-                helm-sources helm-compile-source-functions))
-       (helm-log "helm-compiled-sources = %S" helm-compiled-sources)))))
-
-(cl-defun helm-get-selection (&optional (buffer nil buffer-s)
-                                force-display-part)
-  "Return the currently selected item or nil.
-if BUFFER is nil or unspecified, use helm-buffer as default value.
-If FORCE-DISPLAY-PART is non-nil, return the display string.
-If FORCE-DISPLAY-PART value is 'withprop the display string is returned
-with its properties."
-  (setq buffer (if (and buffer buffer-s) buffer helm-buffer))
-  (unless (helm-empty-buffer-p buffer)
-    (with-current-buffer buffer
-      (let* ((disp-fn (if (eq force-display-part 'withprop)
-                          'buffer-substring
-                        'buffer-substring-no-properties))
-             (selection
-              (or (and (not force-display-part)
-                       (get-text-property (overlay-start
-                                           helm-selection-overlay)
-                                          'helm-realvalue))
-                  ;; It is needed to return properties of DISP in some case,
-                  ;; e.g for `helm-confirm-and-exit-minibuffer',
-                  ;; so use `buffer-substring' here when 'withprop is specified.
-                  (let ((disp (funcall
-                               disp-fn
-                               (overlay-start helm-selection-overlay)
-                               (1- (overlay-end helm-selection-overlay))))
-                        (source (helm-get-current-source)))
-                    (helm-aif (and (not force-display-part)
-                                   (assoc-default 'display-to-real source))
-                        (helm-funcall-with-source source it disp)
-                      disp)))))
-        (unless (equal selection "")
-          (helm-log "selection = %S" selection)
-          selection)))))
-
-(defun helm-get-actions-from-current-source ()
-  "Return the associated action for the selected candidate.
-It is a function symbol \(sole action\) or list
-of \(action-display . function\)."
-  (unless (helm-empty-buffer-p (helm-buffer-get))
-    (helm-aif (helm-attr 'action-transformer)
-        (helm-composed-funcall-with-source
-         (helm-get-current-source) it
-         (helm-attr 'action)
-         ;; Check if the first given transformer
-         ;; returns the same set of actions for each
-         ;; candidate in marked candidates.
-         ;; If so use the car of marked to determine
-         ;; the set of actions, otherwise use the selection.
-         (if (cl-loop with marked = (helm-marked-candidates)
-                      with act = (car (helm-mklist it))
-                      with acts = (funcall act nil (car marked))
-                      for c in marked
-                      always (equal (funcall act nil c) acts))
-             (car (helm-marked-candidates))
-             (helm-get-selection)))
-      (helm-attr 'action))))
-
-(defun helm-get-current-source ()
-  "Return the source for the current selection.
-Allow also checking if helm-buffer contain candidates."
-  (or helm-current-source
-      (with-current-buffer (helm-buffer-get)
-        (or
-         ;; This happen only when `helm-source-in-each-line-flag'
-         ;; is non--nil and there is candidates in buffer.
-         (get-text-property (point) 'helm-source)
-         ;; Return nil when no--candidates.
-         (cl-block exit
-           ;; This goto-char shouldn't be necessary, but point is moved to
-           ;; point-min somewhere else which shouldn't happen.
-           (goto-char (overlay-start helm-selection-overlay))
-           (let* ((header-pos (or (helm-get-previous-header-pos)
-                                  (helm-get-next-header-pos)))
-                  (source-name
-                   (save-excursion
-                     (unless header-pos
-                       (cl-return-from exit nil))
-                     (goto-char header-pos)
-                     (helm-current-line-contents))))
-             (cl-loop for source in (helm-get-sources) thereis
-                   (and (equal (assoc-default 'name source) source-name)
-                        source))))))))
-
-(defun helm-buffer-is-modified (buffer)
-  "Return non-nil when BUFFER is modified since `helm' was invoked."
-  (let* ((b (get-buffer buffer))
-         (key (concat (buffer-name b) "/" (helm-attr 'name)))
-         (source-tick (or (gethash key helm-tick-hash) 0))
-         (buffer-tick (buffer-chars-modified-tick b))
-         (modifiedp (/= source-tick buffer-tick)))
-    (puthash key buffer-tick helm-tick-hash)
-    (helm-log "buffer = %S" buffer)
-    (helm-log "modifiedp = %S" modifiedp)
-    modifiedp))
-
-(defun helm-current-buffer-is-modified ()
-  "Check if `helm-current-buffer' is modified since `helm' was invoked."
-  (helm-buffer-is-modified helm-current-buffer))
-
-(defun helm-run-after-quit (function &rest args)
-  "Perform an action after quitting `helm'.
-The action is to call FUNCTION with arguments ARGS."
-  (setq helm-quit t)
-  (helm-kill-async-processes)
-  (helm-log "function = %S" function)
-  (helm-log "args = %S" args)
-  (apply 'run-with-timer 0.1 nil function args)
-  (helm-exit-minibuffer))
-
-
-(defun define-helm-type-attribute (type definition &optional doc)
-  "Register type attribute of TYPE as DEFINITION with DOC.
-DOC is displayed in `helm-type-attributes' docstring.
-
-Use this function is better than setting `helm-type-attributes' directly."
-  (cl-loop for i in definition do
-        ;; without `ignore-errors', error at emacs22
-        (ignore-errors (setf i (delete nil i))))
-  (helm-add-type-attribute type definition)
-  (and doc (helm-document-type-attribute type doc))
-  nil)
-
-(defun helm-document-attribute (attribute short-doc &optional long-doc)
-  "Register ATTRIBUTE documentation introduced by plug-in.
-SHORT-DOC is displayed beside attribute name.
-LONG-DOC is displayed below attribute name and short documentation."
-  (if long-doc
-      (setq short-doc (concat "(" short-doc ")"))
-    (setq long-doc short-doc
-          short-doc ""))
-  (add-to-list 'helm-attributes attribute t)
-  (put attribute 'helm-attrdoc
-       (concat "- " (symbol-name attribute)
-               " " short-doc "\n\n" long-doc "\n")))
-
-(put 'helm-document-attribute 'lisp-indent-function 2)
-
-(defun helm-interpret-value (value &optional source)
-  "Interpret VALUE as variable, function or literal and return it.
-If VALUE is a function, call it with no arguments and return the value.
-If SOURCE compute VALUE for this source.
-If VALUE is a variable, return the value.
-If VALUE is a symbol, but it is not a function or a variable, cause an error.
-Otherwise, return VALUE itself."
-  (cond ((and source (functionp value))
-         (helm-funcall-with-source source value))
-        ((functionp value)
-         (funcall value))
-        ((and (symbolp value) (boundp value))
-         (symbol-value value))
-        ((symbolp value)
-         (error
-          "helm-interpret-value: Symbol must be a function or a variable"))
-        (t
-         value)))
-
-(defun helm-set-local-variable (&rest args)
-  "Bind each pair in ARGS locally to `helm-buffer'.
-
-Use this to set local vars before calling helm.
-
-When used from an init or update function
-(i.e when `helm-force-update' is running) the variables are set
-using `make-local-variable' within the `helm-buffer'.
-
-Usage: helm-set-local-variable ([VAR VALUE]...)
-Just like `setq' except that the vars are not set sequentially.
-IOW Don't use VALUE of previous VAR to set the VALUE of next VAR.
-
-\(fn VAR VALUE ...)"
-  (if helm-force-updating-p
-      (with-helm-buffer
-        (cl-loop for i on args by #'cddr
-                 do (set (make-local-variable (car i)) (cadr i))))
-      (setq helm--local-variables
-            (append (cl-loop for i on args by #'cddr
-                             collect (cons (car i) (cadr i)))
-                    helm--local-variables))))
-
-(defun helm-make-actions (&rest args)
-  "Build an alist with (NAME . ACTION) elements with each pairs in ARGS.
-Where NAME is a string or a function returning a string or nil and ACTION
-a function.
-If NAME returns nil the pair is skipped.
-
-\(fn NAME ACTION ...)"
-  (cl-loop for i on args by #'cddr
-           for name  = (car i)
-           when (functionp name)
-           do (setq name (funcall name))
-           when name
-           collect (cons name (cadr i))))
-
-;; Core: API helper
-(cl-defun helm-empty-buffer-p (&optional (buffer helm-buffer))
-  "Check if BUFFER have candidates.
-Default value for BUFFER is `helm-buffer'."
-  (zerop (buffer-size (and buffer (get-buffer buffer)))))
-
-(defun helm-empty-source-p ()
-  "Check if current source contains candidates.
-This happen only in certains cases when e.g the last element
-of a source is deleted without updating the source."
-  (with-helm-window
-    (or (helm-empty-buffer-p)
-        (and (helm-end-of-source-p)
-             (eq (point-at-bol) (point-at-eol))
-             (or
-              (save-excursion
-                (forward-line -1)
-                (helm-pos-header-line-p))
-              (bobp))))))
-
-(defun helm-symbol-name (obj)
-  (if (or (consp obj) (byte-code-function-p obj))
-      "Anonymous"
-      (symbol-name obj)))
-
-
-;; Core: tools
-(defun helm-current-line-contents ()
-  "Current line string without properties."
-  (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
-
-(defun helm-funcall-with-source (source functions &rest args)
-  "Call from SOURCE FUNCTIONS list or single function FUNCTIONS with ARGS.
-FUNCTIONS can be a symbol or a list of functions.
-Return the result of last function call."
-  (let ((helm-source-name (assoc-default 'name source))
-        (helm-current-source source)
-        (funs (if (functionp functions) (list functions) functions)))
-    (helm-log "helm-source-name = %S" helm-source-name)
-    (helm-log "functions = %S" functions)
-    (helm-log "args = %S" args)
-    (cl-loop with result for fn in funs
-             do (setq result (apply fn args))
-             finally return result)))
-
-(defun helm-funcall-foreach (sym &optional sources)
-  "Call the associated function to SYM for each source if any."
-  (let ((sources (or sources (helm-get-sources))))
-    (cl-dolist (source sources)
-      (helm-aif (assoc-default sym source)
-          (helm-funcall-with-source source it)))))
-
-(defun helm-normalize-sources (sources)
-  "If SOURCES is only one source, make a list of one element."
-  (cond ((or (and sources
-                  (symbolp sources))
-             (and (listp sources) (assq 'name sources)))
-         (list sources))
-        (sources)
-        (t helm-sources)))
-
-(defun helm-get-candidate-number (&optional in-current-source)
-  "Return candidates number in `helm-buffer'.
-If IN-CURRENT-SOURCE is provided return number of candidates
-in the source where point is."
-  (with-current-buffer (helm-buffer-get)
-    (if (or (helm-empty-buffer-p)
-            (helm-empty-source-p))
-        0
-      (save-excursion
-        (if in-current-source
-            (goto-char (helm-get-previous-header-pos))
-          (goto-char (point-min)))
-        (forward-line 1)
-        (if (helm-pos-multiline-p)
-            (save-excursion
-              (cl-loop with count-multi = 1
-                    while (and (not (if in-current-source
-                                        (save-excursion
-                                          (forward-line 2)
-                                          (or (helm-pos-header-line-p) (eobp)))
-                                      (eobp)))
-                               (search-forward helm-candidate-separator nil t))
-                    do (cl-incf count-multi)
-                    finally return count-multi))
-          (save-excursion
-            (cl-loop with ln = 0
-                  while (not (if in-current-source
-                                 (or (helm-pos-header-line-p) (eobp))
-                               (eobp)))
-                  unless (helm-pos-header-line-p)
-                  do (cl-incf ln)
-                  do (forward-line 1) finally return ln)))))))
-
-(defmacro with-helm-quittable (&rest body)
-  "If an error occur in execution of BODY, quit helm safely."
-  (declare (indent 0) (debug t))
-  `(condition-case _v
-       (let (inhibit-quit)
-         ,@body)
-     (quit (setq quit-flag t)
-           (setq helm-quit t)
-           (exit-minibuffer)
-           (keyboard-quit)
-           ;; See comment about this in `with-local-quit'.
-           (eval '(ignore nil)))))
-
-(defun helm-compose (arg-lst func-lst)
-  "Apply arguments specified in ARG-LST with each function of FUNC-LST.
-The result of each function will be the new `car' of ARG-LST.
-Each function in FUNC-LST must accept (length ARG-LST) arguments
-\(See examples below) .
-This function allows easy sequencing of transformer functions.
-Where generally, ARG-LST is '(candidates-list source) and FUNC-LST a
-list of transformer functions that take one or two arguments depending
-we are using 'filtered-candidate-transformer' or 'candidate-transformer'.
-e.g
-filtered-candidate-transformer:
-\(helm-compose '((1 2 3 4 5 6 7)
-                '((name . \"A helm source\") (candidates . (a b c))))
-              '((lambda (candidates _source)
-                  (cl-loop for i in candidates
-                        when (cl-oddp i) collect i))
-                (lambda (candidates _source)
-                  (cl-loop for i in candidates collect (1+ i)))))
-=>(2 4 6 8)
-
-candidate-transformer:
-\(helm-compose '((1 2 3 4 5 6 7))
-                '((lambda (candidates)
-                  (cl-loop for i in candidates
-                        when (cl-oddp i) collect i))
-                (lambda (candidates)
-                  (cl-loop for i in candidates collect (1+ i)))))
-=> (2 4 6 8)."
-  (cl-dolist (func func-lst)
-    (setcar arg-lst (apply func arg-lst)))
-  (car arg-lst))
-
-(defun helm-composed-funcall-with-source (source funcs &rest args)
-  "With SOURCE apply `helm-funcall-with-source' with each FUNCS and ARGS.
-This is used in transformers to modify candidates list."
-  (if (functionp funcs)
-      (apply 'helm-funcall-with-source source funcs args)
-      (apply 'helm-funcall-with-source source
-             (lambda (&rest oargs) (helm-compose oargs funcs))
-             args)))
-
-(defun helm-stringify (str-or-sym)
-  "Get string of STR-OR-SYM."
-  (if (stringp str-or-sym)
-      str-or-sym
-    (symbol-name str-or-sym)))
-
-(defun helm-symbolify (str-or-sym)
-  "Get symbol of STR-OR-SYM."
-  (if (symbolp str-or-sym)
-      str-or-sym
-    (intern str-or-sym)))
-
-(defun helm-remove-if-not-match (regexp seq)
-  "Remove all elements of SEQ that don't match REGEXP."
-  (cl-loop for s in seq
-           for str = (cond ((symbolp s)
-                            (symbol-name s))
-                           ((consp s)
-                            (car s))
-                           (t s))
-           when (string-match-p regexp str)
-           collect s))
-
-(defun helm-remove-if-match (regexp seq)
-  "Remove all elements of SEQ that match REGEXP."
-  (cl-loop for s in seq
-           for str = (cond ((symbolp s)
-                            (symbol-name s))
-                           ((consp s)
-                            (car s))
-                           (t s))
-           unless (string-match-p regexp str)
-           collect s))
-
-;; Core: entry point
-;; `:allow-nest' is not in this list because it is treated before.
-(defconst helm-argument-keys
-  '(:sources :input :prompt :resume
-    :preselect :buffer :keymap :default :history))
-
-;;;###autoload
-(defun helm (&rest plist)
-  "Main function to execute helm sources.
-
-Keywords supported:
-:sources :input :prompt :resume :preselect
-:buffer :keymap :default :history :allow-nest
-
-Extra LOCAL-VARS keywords are supported, see below.
-
-PLIST is a list like \(:key1 val1 :key2 val2 ...\) or
-\(&optional sources input prompt resume
-            preselect buffer keymap default history\).
-
-Basic keywords are the following:
-
-\:sources
-
-A list of sources used for this session.  It also accepts a
-symbol, interpreted as a variable of a helm source
-i.e (a symbol can be passed instead of a list of sources).
-It also accepts an alist representing a helm source, which is
-detected by \(assq 'name ANY-SOURCES\).
-NOTE: In this case the source is embedded in the helm command and
-have no symbol name, so it is not reachable from outside.
-It will be referenced in `helm-sources' as a whole alist.
-
-\:input
-
-Temporary value of `helm-pattern', ie. initial input of minibuffer.
-
-\:prompt
-
-Prompt other than \"pattern: \".
-
-\:resume
-
-If t, Resurrect previously instance of `helm'.  Skip the initialization.
-If 'noresume, this instance of `helm' cannot be resumed.
-
-\:preselect
-
-Initially selected candidate.  Specified by exact candidate or a regexp.
-
-\:buffer
-
-`helm-buffer' instead of *helm*.
-
-\:keymap
-
-`helm-map' for current `helm' session.
-
-\:default
-
-A default argument that will be inserted in minibuffer \
-with \\<minibuffer-local-map>\\[next-history-element].
-When nil or not present `thing-at-point' will be used instead.
-If `helm--maybe-use-default-as-input' is non--nil display will be
-updated using :default arg as input unless :input is specified,
-which in this case will take precedence on :default
-This is a string or a list, in this case the car of the list will
-be used as initial default input, but you will be able to cycle in this
-list with \\<minibuffer-local-map>\\[next-history-element].
-
-\:history
-
-By default all minibuffer input is pushed to `minibuffer-history',
-if an argument HISTORY is provided, input will be pushed to HISTORY.
-History element should be a symbol.
-
-\:allow-nest
-
-Allow running this helm command within a running helm session.
-
-Of course, conventional arguments are supported, the two are same.
-
-\(helm :sources sources :input input :prompt prompt :resume resume
-       :preselect preselect :buffer buffer :keymap keymap :default default
-       :history history\)
-
-and
-
-\(helm sources input prompt resume preselect buffer keymap default history\)
-
-are the same.
-
-However the use of non keyword args is deprecated and should not be used.
-
-Other keywords are interpreted as local variables of this helm session.
-The `helm-' prefix can be omitted.  For example,
-
-\(helm :sources 'helm-source-buffers-list
-       :buffer \"*buffers*\" :candidate-number-limit 10\)
-
-means starting helm session with `helm-source-buffers'
-source in *buffers* buffer and set variable `helm-candidate-number-limit'
-to 10 as session local variable.
-
-\(fn &key SOURCES INPUT PROMPT RESUME PRESELECT BUFFER KEYMAP DEFAULT HISTORY ALLOW-NEST OTHER-LOCAL-VARS)"
-  (let ((fn (cond ((or (and helm-alive-p (plist-get plist :allow-nest))
-                       (and helm-alive-p (memq 'allow-nest plist)))
-                   #'helm-nest)
-                  ((keywordp (car plist))
-                   #'helm)
-                  (t #'helm-internal))))
-    (if (and helm-alive-p (eq fn #'helm))
-        (if (helm-alive-p)
-            ;; A helm session is normally running.
-            (error "Error: Trying to run helm within a running helm session")
-          ;; A helm session is already running and user jump somewhere else
-          ;; without desactivating it.
-          (with-helm-buffer
-            (prog1
-                (message "Aborting an helm session running in background")
-              ;; `helm-alive-p' will be reset in unwind-protect forms.
-              (helm-keyboard-quit))))
-      (if (keywordp (car plist))
-          ;; Parse `plist' and move not regular `helm-argument-keys'
-          ;; to `helm--local-variables', then calling helm on itself
-          ;; with normal arguments (the non--arguments-keys removed)
-          ;; will end up in [1].
-          (progn
-            (setq helm--local-variables
-                  (append helm--local-variables
-                          ;; Vars passed by keyword on helm call
-                          ;; take precedence on same vars
-                          ;; that may have been passed before helm call.
-                          (helm-parse-keys plist)))
-            (apply fn (mapcar #'(lambda (key) (plist-get plist key))
-                              helm-argument-keys)))
-        (apply fn plist))))) ; [1] fn == helm-internal.
-
-(defun helm-alive-p ()
-  "Check if `helm' is alive.
-An `helm' session is considered alive if `helm-alive-p' is non--nil,
-the `helm-buffer' is visible, and cursor is in minibuffer."
-  (and helm-alive-p
-       (get-buffer-window helm-buffer 'visible)
-       (minibuffer-window-active-p (minibuffer-window))
-       (minibufferp (current-buffer))))
-
-(defun helm-parse-keys (keys)
-  "Parse the KEYS arguments of `helm'.
-Return only the keys that are not in `helm-argument-keys',
-prefix them with \"helm\" and convert them to alist.
-This allow to add arguments that are not part of `helm-argument-keys',
-but are valid helm variables.
-e.g :candidate-number-limit will be bound to `helm-candidate-number-limit'
-in source.
-
-  (helm-parse-keys '(:sources ((name . \"test\")
-                               (candidates . (a b c)))
-                     :buffer \"toto\"
-                     :candidate-number-limit 4))
-  ==> ((helm-candidate-number-limit . 4))."
-
-  (cl-loop for (key value) on keys by #'cddr
-           for symname = (substring (symbol-name key) 1)
-           for sym = (intern (if (string-match "^helm-" symname)
-                                 symname
-                                 (concat "helm-" symname)))
-           unless (memq key helm-argument-keys)
-           collect (cons sym value)))
-
-(defvar helm--prompt nil)
-;;; Core: entry point helper
-(defun helm-internal (&optional
-                        any-sources any-input
-                        any-prompt any-resume
-                        any-preselect any-buffer
-                        any-keymap any-default any-history)
-  "The internal helm function called by `helm'.
-For ANY-SOURCES ANY-INPUT ANY-PROMPT ANY-RESUME ANY-PRESELECT ANY-BUFFER and
-ANY-KEYMAP ANY-DEFAULT ANY-HISTORY See `helm'."
-  ;; Activate the advice for `tramp-read-passwd'.
-  (if (fboundp 'advice-add)
-      (progn
-        (advice-add 'tramp-read-passwd :around #'helm--advice-tramp-read-passwd)
-        (advice-add 'ange-ftp-get-passwd :around #'helm--advice-ange-ftp-get-passwd))
-      (ad-activate 'tramp-read-passwd)
-      (ad-activate 'ange-ftp-get-passwd))
-  (helm-log (concat "[Start session] " (make-string 41 ?+)))
-  (helm-log "any-prompt = %S" any-prompt)
-  (helm-log "any-preselect = %S" any-preselect)
-  (helm-log "any-buffer = %S" any-buffer)
-  (helm-log "any-keymap = %S" any-keymap)
-  (helm-log "any-default = %S" any-default)
-  (helm-log "any-history = %S" any-history)
-  (setq helm--prompt (or any-prompt "pattern: "))
-  (let ((non-essential t)
-        (input-method-verbose-flag helm-input-method-verbose-flag)
-        (old--cua cua-mode)
-        (helm--maybe-use-default-as-input
-         (or helm--maybe-use-default-as-input ; it is let-bounded so use it.
-             (cl-loop for s in (helm-normalize-sources any-sources)
-                      thereis (memq s helm-sources-using-default-as-input)))))
-    ;; cua-mode overhide local helm bindings.
-    ;; disable this stupid thing if enabled.
-    (and cua-mode (cua-mode -1))
-    (unwind-protect
-         (condition-case-unless-debug _v
-             (let ( ;; `helm-source-name' is non-nil
-                   ;; when `helm' is invoked by action, reset it.
-                   helm-source-name
-                   helm-current-source
-                   helm-in-persistent-action
-                   helm-quit
-                   (helm-buffer (or any-buffer helm-buffer)))
-               (with-helm-restore-variables
-                 (helm-initialize
-                  any-resume any-input any-default any-sources)
-                 (helm-display-buffer helm-buffer)
-                 (when helm-prevent-escaping-from-minibuffer
-                   (helm--remap-mouse-mode 1)) ; Disable mouse bindings.
-                 (add-hook 'post-command-hook 'helm--maybe-update-keymap)
-                 (add-hook 'post-command-hook 'helm--update-header-line)
-                 (helm-log "show prompt")
-                 (unwind-protect
-                      (helm-read-pattern-maybe
-                       any-prompt any-input any-preselect
-                       any-resume any-keymap any-default any-history)
-                   (helm-cleanup)))
-               (prog1
-                   (unless helm-quit (helm-execute-selection-action))
-                 (helm-log (concat "[End session] " (make-string 41 ?-)))))
-           (quit
-            (helm-restore-position-on-quit)
-            (helm-log (concat "[End session (quit)] " (make-string 34 ?-)))
-            nil))
-      (remove-hook 'post-command-hook 'helm--maybe-update-keymap)
-      (remove-hook 'post-command-hook 'helm--update-header-line)
-      (if (fboundp 'advice-add)
-          (progn
-            (advice-remove 'tramp-read-passwd
-                           #'helm--advice-tramp-read-passwd)
-            (advice-remove 'ange-ftp-get-passwd
-                           #'helm--advice-ange-ftp-get-passwd))
-          (ad-deactivate 'tramp-read-passwd)
-          (ad-deactivate 'ange-ftp-get-passwd))
-      (helm-log "helm-alive-p = %S" (setq helm-alive-p nil))
-      (helm--remap-mouse-mode -1)       ; Reenable mouse bindings.
-      (setq helm-alive-p nil)
-      ;; Reset helm-pattern so that lambda's using it
-      ;; before running helm will not start with its old value.
-      (setq helm-pattern "")
-      (and old--cua (cua-mode 1))
-      (helm-log-save-maybe))))
-
-
-;;; Helm resume
-;;
-;;
-(defun helm-resume (arg)
-  "Resurrect previously invoked `helm'.
-Called with a prefix arg, allow choosing among all existing
-helm buffers.  i.e choose among various helm sessions.
-Called from lisp, you can specify a buffer-name as a string with ARG."
-  (interactive "P")
-  (let (any-buffer helm-full-frame cur-dir)
-    (if arg
-        (if (and (stringp arg) (bufferp (get-buffer arg)))
-            (setq any-buffer arg)
-          (setq any-buffer (helm-resume-select-buffer)))
-      (setq any-buffer helm-last-buffer))
-    (cl-assert any-buffer nil
-               "helm-resume: No helm buffers found to resume")
-    ;; Reset `cursor-type' to nil as it have been set to t
-    ;; when quitting previous session.
-    (with-current-buffer any-buffer (setq cursor-type nil))
-    (setq helm-full-frame (buffer-local-value
-                           'helm-full-frame (get-buffer any-buffer)))
-    (setq helm-compiled-sources nil)
-    (setq cur-dir (buffer-local-value
-                   'default-directory (get-buffer any-buffer)))
-    (unless (buffer-live-p helm-current-buffer)
-      ;; `helm-current-buffer' may have been killed.
-      (setq helm-current-buffer (current-buffer)))
-    ;; Restart with same `default-directory' value this session
-    ;; was initially started with.
-    (with-helm-default-directory cur-dir
-        (helm
-         :sources (buffer-local-value
-                   'helm-sources (get-buffer any-buffer))
-         :input (buffer-local-value 'helm-input-local (get-buffer any-buffer))
-         :resume t
-         :buffer any-buffer))))
-
-(defun helm-resume-previous-session-after-quit (arg)
-  "Resume previous helm session within running helm."
-  (interactive "p")
-  (if (and helm-alive-p (> (length helm-buffers) arg))
-      (helm-run-after-quit `(lambda () (helm-resume (nth ,arg helm-buffers))))
-    (message "No previous helm sessions to resume yet!")))
-
-(defun helm-resume-list-buffers-after-quit ()
-  "List resumable helm buffers within running helm."
-  (interactive)
-  (if (and helm-alive-p (> (length helm-buffers) 0))
-      (helm-run-after-quit #'(lambda () (helm-resume t)))
-    (message "No previous helm sessions to resume yet!")))
-
-(defun helm-resume-p (any-resume)
-  "Whether current helm session is resumed or not."
-  (eq any-resume t))
-
-(defun helm-resume-select-buffer ()
-  "Select an `helm-buffer' in `helm-buffers' list to resume a helm session.
-Return nil if no `helm-buffer' found."
-  (when helm-buffers
-    (or (helm :sources '(((name . "Resume helm buffer")
-                          (candidates . helm-buffers)
-                          (action . identity)))
-              :resume 'noresume
-              :buffer "*helm resume*")
-        (keyboard-quit))))
-
-
-;;;###autoload
-(defun helm-other-buffer (any-sources any-buffer)
-  "Simplified interface of `helm' with other `helm-buffer'.
-Call `helm' with only ANY-SOURCES and ANY-BUFFER as args."
-  (helm :sources any-sources :buffer any-buffer))
-
-(defun helm-nest (&rest same-as-helm)
-  "Allow calling `helm' whithin a running helm session.
-Arguments SAME-AS-HELM are the same as `helm', which see."
-  (with-helm-window
-    (let ((orig-helm-current-buffer helm-current-buffer)
-          (orig-helm-buffer helm-buffer)
-          (orig-helm--in-fuzzy helm--in-fuzzy)
-          (orig-helm-last-frame-or-window-configuration
-           helm-last-frame-or-window-configuration)
-          (orig-one-window-p helm-onewindow-p))
-      (unwind-protect
-           (let (helm-current-position
-                 helm-current-buffer
-                 helm-pattern
-                 (helm-buffer (or (cl-getf same-as-helm :buffer)
-                                  (nth 5 same-as-helm)
-                                  "*Helm*"))
-                 helm-sources
-                 helm-compiled-sources
-                 (helm-full-frame t)
-                 (enable-recursive-minibuffers t))
-             (apply #'helm same-as-helm))
-        (with-current-buffer orig-helm-buffer
-          (setq helm-alive-p t) ; Nested session set this to nil on exit.
-          (setq helm-buffer orig-helm-buffer)
-          (setq helm--in-fuzzy orig-helm--in-fuzzy)
-          (helm-initialize-overlays helm-buffer)
-          (unless (helm-empty-buffer-p) (helm-mark-current-line t))
-          (setq helm-last-frame-or-window-configuration
-                orig-helm-last-frame-or-window-configuration)
-          (setq cursor-type nil)
-          (setq helm-current-buffer orig-helm-current-buffer)
-          (setq helm-onewindow-p orig-one-window-p))))))
-
-
-;;; Core: Accessors
-;;
-(defun helm-current-position (save-or-restore)
-  "Restore or save current position in `helm-current-buffer'.
-Argument SAVE-OR-RESTORE is one of save or restore."
-  (cl-case save-or-restore
-    (save
-     (helm-log "Save position at %S" (cons (point) (window-start)))
-     (setq helm-current-position (cons (point) (window-start))))
-    (restore
-     ;; Maybe `helm-current-buffer' have been deleted
-     ;; during helm session so check if it is here
-     ;; otherwise position in underlaying buffer will be lost.
-     (when (get-buffer-window helm-current-buffer 'visible)
-       (helm-log "Restore position at  %S in buffer %s"
-                 helm-current-position
-                 (buffer-name (current-buffer)))
-       (goto-char (car helm-current-position))
-       ;; Fix this position with the NOFORCE arg of `set-window-start'
-       ;; otherwise, if there is some other buffer than `helm-current-buffer'
-       ;; one, position will be lost.
-       (set-window-start (selected-window) (cdr helm-current-position) t)))))
-
-
-(defun helm-frame-or-window-configuration (save-or-restore)
-  "Save or restore last frame or window configuration.
-Possible value of SAVE-OR-RESTORE are 'save and 'restore.
-window or frame configuration is saved/restored according to values of
-`helm-save-configuration-functions'."
-  (helm-log "helm-save-configuration-functions = %S"
-            helm-save-configuration-functions)
-  (let ((window-persistent-parameters (append '((no-other-window . t))
-                                              window-persistent-parameters)))
-    (cl-case save-or-restore
-      (save    (setq helm-last-frame-or-window-configuration
-                     (funcall (cdr helm-save-configuration-functions))))
-      (restore (funcall (car helm-save-configuration-functions)
-                        helm-last-frame-or-window-configuration)
-               ;; Restore frame focus.
-               ;; This is needed for minibuffer own-frame config
-               ;; when recursive minibuffers are in use.
-               ;; e.g M-: + helm-minibuffer-history.
-               (let ((frame (if (minibufferp helm-current-buffer)
-                                (selected-frame)
-                              (last-nonminibuffer-frame))))
-                 (select-frame-set-input-focus frame))))))
-
-(defun helm-split-window-default-fn (window)
-  (let (split-width-threshold)
-    (if (and (fboundp 'window-in-direction)
-             ;; Don't try to split when starting in a minibuffer
-             ;; e.g M-: and try to use helm-show-kill-ring.
-             (not (minibufferp helm-current-buffer)))
-        (if (or (one-window-p t)
-                helm-split-window-in-side-p)
-            (split-window
-             (selected-window) nil (if (eq helm-split-window-default-side 'other)
-                                       'below helm-split-window-default-side))
-          ;; If more than one window reuse one of them.
-          (cl-case helm-split-window-default-side
-            (left  (or (helm-window-in-direction 'left)
-                       (helm-window-in-direction 'above)
-                       (selected-window)))
-            (above (or (helm-window-in-direction 'above)
-                       (helm-window-in-direction 'left)
-                       (selected-window)))
-            (right (or (helm-window-in-direction 'right)
-                       (helm-window-in-direction 'below)
-                       (selected-window)))
-            (below (or (helm-window-in-direction 'below)
-                       (helm-window-in-direction 'right)
-                       (selected-window)))
-            (same  (selected-window))
-            (other (other-window-for-scrolling))
-            (t     (or (window-next-sibling) (selected-window)))))
-      (split-window-sensibly window))))
-
-(defun helm-window-in-direction (direction)
-  "Same as `window-in-direction' but check if window is dedicated."
-  (helm-aif (window-in-direction direction)
-      (and (not (window-dedicated-p it)) it)))
-
-
-;;; Display helm buffer
-;;
-;;
-(defun helm-display-buffer (buffer)
-  "Display BUFFER.
-The function used to display `helm-buffer'."
-  (let (pop-up-frames
-        (split-window-preferred-function
-         helm-split-window-preferred-function)
-        (helm-split-window-default-side
-         (if (and (not helm-full-frame)
-                  helm-reuse-last-window-split-state)
-             (cond ((eq helm-split-window-default-side 'same) 'same)
-                   ((eq helm-split-window-default-side 'other) 'other)
-                   (helm--window-side-state)
-                   (t helm-split-window-default-side))
-           helm-split-window-default-side)))
-    (prog1
-        (funcall (with-current-buffer buffer helm-display-function) buffer)
-      (setq helm-onewindow-p (one-window-p t))
-      ;; Don't allow other-window and friends switching out of minibuffer.
-      (when helm-prevent-escaping-from-minibuffer
-        (helm-prevent-switching-other-window)))))
-
-(cl-defun helm-prevent-switching-other-window (&key (enabled t))
-  "Allow setting `no-other-window' window parameter in all windows.
-Arg ENABLE will be the value of the `no-other-window' window property."
-  (walk-windows
-   #'(lambda (w)
-       (unless (window-dedicated-p w)
-         (set-window-parameter w 'no-other-window enabled)))
-   0))
-
-(defun helm-default-display-buffer (buffer)
-  "Default function to display `helm-buffer' BUFFER.
-It uses `switch-to-buffer' or `pop-to-buffer' depending of value of
-`helm-full-frame' and/or `helm-split-window-default-side'."
-  (if (or (buffer-local-value 'helm-full-frame (get-buffer buffer))
-          (and (eq helm-split-window-default-side 'same)
-               (one-window-p t)))
-      (progn (delete-other-windows) (switch-to-buffer buffer))
-    (when (and (or helm-always-two-windows helm-autoresize-mode
-                   (and (not helm-split-window-in-side-p)
-                        (eq (save-selected-window
-                              (funcall helm-split-window-preferred-function
-                                       (selected-window)))
-                            (get-buffer-window helm-current-buffer))))
-               (not (eq helm-split-window-default-side 'same))
-               (not (minibufferp helm-current-buffer))
-               (not helm-split-window-in-side-p))
-      (delete-other-windows))
-    (pop-to-buffer buffer)))
-
-
-;;; Core: initialize
-;;
-(defun helm-initialize (any-resume any-input any-default any-sources)
-  "Start initialization of `helm' session.
-For ANY-RESUME ANY-INPUT ANY-DEFAULT and ANY-SOURCES See `helm'."
-  (helm-log "start initialization: any-resume=%S any-input=%S"
-            any-resume any-input)
-  (helm-frame-or-window-configuration 'save)
-  (setq helm-sources (helm-normalize-sources any-sources))
-  (setq helm--in-fuzzy
-        (cl-loop for s in helm-sources
-                 for matchfns = (helm-match-functions
-                                 (if (symbolp s) (symbol-value s) s))
-                 for searchfns = (helm-search-functions
-                                  (if (symbolp s) (symbol-value s) s))
-                 when (or (member 'helm-fuzzy-match matchfns)
-                          (member 'helm-fuzzy-search searchfns))
-                 return t))
-  (helm-log "sources = %S" helm-sources)
-  (helm-current-position 'save)
-  (if (helm-resume-p any-resume)
-      (helm-initialize-overlays (helm-buffer-get))
-    (helm-initial-setup any-default))
-  (setq helm-alive-p t)
-  (unless (eq any-resume 'noresume)
-    (helm-recent-push helm-buffer 'helm-buffers)
-    (setq helm-last-buffer helm-buffer))
-  (when any-input
-    (setq helm-input any-input
-          helm-pattern any-input)
-    (helm--fuzzy-match-maybe-set-pattern))
-  ;; If a `resume' attribute is present `helm-funcall-foreach'
-  ;; will run its function.
-  (when (helm-resume-p any-resume)
-    (helm-funcall-foreach 'resume))
-  (helm-log "end initialization"))
-
-(defun helm-initialize-overlays (buffer)
-  "Initialize helm overlays in BUFFER."
-  (helm-log "overlay setup")
-  (if helm-selection-overlay
-      ;; make sure the overlay belongs to the helm buffer if
-      ;; it's newly created
-      (move-overlay helm-selection-overlay (point-min) (point-min)
-                    (get-buffer buffer))
-
-    (setq helm-selection-overlay
-          (make-overlay (point-min) (point-min) (get-buffer buffer)))
-    (overlay-put helm-selection-overlay 'face 'helm-selection)
-    (overlay-put helm-selection-overlay 'priority 1)))
-
-(defun helm-restore-position-on-quit ()
-  "Restore position in `helm-current-buffer' when quitting."
-  (helm-current-position 'restore))
-
-(defun helm-recent-push (elt list-var)
-  "Add ELT to the value of LIST-VAR as most recently used value."
-  (let ((m (member elt (symbol-value list-var))))
-    (and m (set list-var (delq (car m) (symbol-value list-var))))
-    (push elt (symbol-value list-var))))
-
-(defun helm--current-buffer ()
-  "[internal] Return `current-buffer' BEFORE `helm-buffer' is initialized.
-Note that this will return the minibuffer in use after helm have started,
-so to get the buffer where helm started while in a helm session,
-use `helm-current-buffer'.
-It is intended to use this only in `helm-initial-setup'."
-  (if (minibuffer-window-active-p (minibuffer-window))
-      ;; If minibuffer is active be sure to use it's buffer
-      ;; as `helm-current-buffer', this allow to use helm
-      ;; from an already active minibuffer (M-: etc...)
-      (window-buffer (active-minibuffer-window))
-    ;; Fix Issue #456
-    ;; Use this instead of `current-buffer' to ensure
-    ;; helm session started in helm-mode from a completing-read
-    ;; Use really the buffer where we started and not the one
-    ;; where the completing-read is wrapped. i.e
-    ;; (with-current-buffer SOME-OTHER-BUFFER (completing-read [...])
-    (window-buffer (with-selected-window (minibuffer-window)
-                     (minibuffer-selected-window)))))
-
-(defun helm-initial-setup (any-default)
-  "Initialize helm settings and set up the helm buffer."
-  (helm-log-run-hook 'helm-before-initialize-hook)
-  (cl-loop for s in (helm-get-sources)
-           for hook = (assoc-default 'before-init-hook s)
-           when hook do (helm-log-run-hook hook))
-  ;; For initialization of helm locals vars that need
-  ;; a value from current buffer, it is here.
-  (helm-set-local-variable 'current-input-method current-input-method)
-  (setq helm-current-prefix-arg nil)
-  (setq helm-suspend-update-flag nil)
-  (setq helm-current-buffer (helm--current-buffer))
-  (setq helm-buffer-file-name buffer-file-name)
-  (setq helm-issued-errors nil)
-  (setq helm-compiled-sources nil)
-  (setq helm-saved-current-source nil)
-  (unless (and (or helm-split-window-state
-                   helm--window-side-state)
-               helm-reuse-last-window-split-state)
-    (setq helm-split-window-state
-          (if (or (null split-width-threshold)
-                  (and (integerp split-width-threshold)
-                       (>= split-width-threshold (+ (frame-width) 4))))
-              'vertical 'horizontal))
-    (setq helm--window-side-state
-          (or helm-split-window-default-side 'below)))
-  ;; Call the init function for sources where appropriate
-  (helm-funcall-foreach
-   'init (and helm-source-filter
-              (cl-remove-if-not #'(lambda (s)
-                                    (member (assoc-default 'name s)
-                                            helm-source-filter))
-                                (helm-get-sources))))
-  (setq helm-pattern (or (and helm--maybe-use-default-as-input
-                              (or (if (listp any-default)
-                                      (car any-default) any-default)
-                                  (with-helm-current-buffer
-                                    (thing-at-point 'symbol))))
-                         ""))
-  (setq helm-input "")
-  (clrhash helm-candidate-cache)
-  (helm-create-helm-buffer)
-  (helm-clear-visible-mark)
-  (helm-log-run-hook 'helm-after-initialize-hook)
-  (cl-loop for s in (helm-get-sources)
-           for hook = (assoc-default 'after-init-hook s)
-           when hook do (helm-log-run-hook hook)))
-
-(defun helm-create-helm-buffer ()
-  "Create and setup `helm-buffer'."
-  (let ((root-dir default-directory))
-    (with-current-buffer (get-buffer-create helm-buffer)
-      (helm-log "kill local variables: %S" (buffer-local-variables))
-      (kill-all-local-variables)
-      (set (make-local-variable 'inhibit-read-only) t)
-      (buffer-disable-undo)
-      (erase-buffer)
-      (set (make-local-variable 'helm-map) helm-map)
-      (make-local-variable 'helm-sources)
-      (set (make-local-variable 'helm-follow-mode) nil)
-      (set (make-local-variable 'helm-display-function) helm-display-function)
-      (set (make-local-variable 'helm-selection-point) nil)
-      (set (make-local-variable 'scroll-margin)
-           (if helm-display-source-at-screen-top
-               0 helm-completion-window-scroll-margin))
-      (set (make-local-variable 'default-directory) root-dir)
-      (set (make-local-variable 'helm-marked-candidates) nil)
-      (helm-initialize-persistent-action)
-      (helm-log "helm-display-function = %S" helm-display-function)
-      (helm-log "helm--local-variables = %S" helm--local-variables)
-      (cl-loop for (var . val) in helm--local-variables
-               do (set (make-local-variable var) val)
-               finally (setq helm--local-variables nil))
-      (setq truncate-lines helm-truncate-lines) ; already local.
-      (setq cursor-type nil)
-      (setq mode-name "Helm"))
-    (helm-initialize-overlays helm-buffer)
-    (get-buffer helm-buffer)))
-
-(define-minor-mode helm--minor-mode
-    "[INTERNAL] Enable keymap in helm minibuffer.
-This mode have no effect when run outside of helm context.
-Please don't use it.
-
-\\{helm-map}"
-  :group 'helm
-  :keymap (and helm-alive-p helm-map)
-  (unless helm-alive-p (setq helm--minor-mode nil)))
-
-(defun helm--reset-default-pattern ()
-  (setq helm-pattern "")
-  (setq helm--maybe-use-default-as-input nil))
-
-(defun helm-read-pattern-maybe (any-prompt any-input
-                                any-preselect any-resume any-keymap
-                                any-default any-history)
-  "Read pattern with prompt ANY-PROMPT and initial input ANY-INPUT.
-For ANY-PRESELECT ANY-RESUME ANY-KEYMAP ANY-DEFAULT ANY-HISTORY, See `helm'."
-  (if (and (helm-resume-p any-resume)
-           ;; When no source, helm-buffer is empty
-           ;; or contain non--candidate lines (e.g grep exit status)
-           (helm-get-current-source))
-      (helm-mark-current-line t)
-      (helm-update any-preselect))
-  (with-current-buffer (helm-buffer-get)
-    (let* ((src        (helm-get-current-source))
-           (src-keymap (assoc-default 'keymap src))
-           (hist       (or (and any-history (symbolp any-history) any-history)
-                           ;; Needed for resuming.
-                           (assoc-default 'history src)))
-           (timer nil)
-           blink-matching-paren
-           (first-src (car helm-sources))
-           (first-src-val (if (symbolp first-src)
-                              (symbol-value first-src)
-                              first-src))
-           (source-process-p (or (assq 'candidates-process src)
-                                 (assq 'candidates-process first-src-val)))
-           (source-delayed-p (or (assq 'delayed src)
-                                 (assq 'delayed first-src-val))))
-      (helm-log "helm-get-candidate-number => %S"
-                (helm-get-candidate-number))
-      (helm-log "helm-execute-action-at-once-if-one = %S"
-                helm-execute-action-at-once-if-one)
-      (helm-log "helm-quit-if-no-candidate = %S" helm-quit-if-no-candidate)
-      ;; If source is delayed `helm-execute-action-at-once-if-one'
-      ;; and `helm-quit-if-no-candidate' are handled after update finish.
-      (when source-delayed-p
-        ;; Note that we quickly add the hook now when `helm-update'
-        ;; is already started, but because source is delayed the hook
-        ;; should have the time to be passed !!!
-        ;; the hook will remove itself once done.
-        (with-helm-after-update-hook (helm-exit-or-quit-maybe)))
-      ;; Reset `helm-pattern' for non--delayed sources and update
-      ;; display if no result found with precedent value of `helm-pattern'
-      ;; unless `helm-quit-if-no-candidate' is non--nil, in this case
-      ;; Don't force update with an empty pattern.
-      ;; Reset also `helm--maybe-use-default-as-input' as this checking
-      ;; happen only on startup.
-      (when helm--maybe-use-default-as-input
-        ;; Store value of `default' temporarily here waiting next update
-        ;; to allow actions like helm-moccur-action matching pattern
-        ;; at the place it jump to.
-        (setq helm-input helm-pattern)
-        (if (or source-delayed-p source-process-p)
-            ;; Reset pattern to next update.
-            (with-helm-after-update-hook
-              (helm--reset-default-pattern))
-            ;; Reset pattern right now.
-            (helm--reset-default-pattern))
-        ;; Ensure force-update when no candidates
-        ;; when we start with an empty pattern.
-        (and (helm-empty-buffer-p)
-             (null helm-quit-if-no-candidate)
-             (helm-force-update)))
-      ;; Handle `helm-execute-action-at-once-if-one' and
-      ;; `helm-quit-if-no-candidate' now only for not--delayed sources.
-      (cond ((and helm-execute-action-at-once-if-one
-                  (not source-delayed-p)
-                  (= (helm-get-candidate-number) 1))
-             (ignore))              ; Don't enter the minibuffer loop.
-            ((and helm-quit-if-no-candidate
-                  (not source-delayed-p)
-                  (= (helm-get-candidate-number) 0))
-             (setq helm-quit t)
-             (and (functionp helm-quit-if-no-candidate)
-                  (funcall helm-quit-if-no-candidate)))
-            (t              ; Enter now minibuffer and wait for input.
-             (let ((tap (or any-default
-                            (with-helm-current-buffer
-                              (thing-at-point 'symbol)))))
-               (unwind-protect
-                    (minibuffer-with-setup-hook
-                        #'(lambda ()
-                            ;; Start minor-mode with global value of helm-map.
-                            (helm--minor-mode 1)
-                            ;; Now overhide the global value of `helm-map' with
-                            ;; the local one which is in this order:
-                            ;; - The keymap of current source.
-                            ;; - The value passed in ANY-KEYMAP
-                            ;;   which will become buffer local.
-                            ;; - Or fallback to the global value of helm-map.
-                            (helm--maybe-update-keymap
-                             (or src-keymap any-keymap helm-map))
-                            (helm-log-run-hook 'helm-minibuffer-set-up-hook)
-                            (setq timer
-                                  (run-with-idle-timer
-                                   (max helm-input-idle-delay 0.001) 'repeat
-                                   #'(lambda ()
-                                       ;; Stop updating in persistent action
-                                       ;; or when `helm-suspend-update-flag'
-                                       ;; is non--nil.
-                                       (unless (or helm-in-persistent-action
-                                                   helm-suspend-update-flag)
-                                         (save-selected-window
-                                           (helm-check-minibuffer-input)
-                                           (helm-print-error-messages)))))))
-                      (read-from-minibuffer (or any-prompt "pattern: ")
-                                            any-input helm-map
-                                            nil hist tap
-                                            helm-inherit-input-method))
-                 (when timer (cancel-timer timer) (setq timer nil)))))))))
-
-(defun helm-exit-or-quit-maybe ()
-  "Exit and run default action if only one candidate, quit if no candidates.
-This function is handling `helm-execute-action-at-once-if-one' and
-`helm-quit-if-no-candidate' in delayed sources."
-  (with-helm-window
-    (cond ((and helm-execute-action-at-once-if-one
-                (= (helm-get-candidate-number) 1))
-           (helm-exit-minibuffer))
-          ((and helm-quit-if-no-candidate
-                (= (helm-get-candidate-number) 0))
-           (setq helm-quit t)
-           (and (functionp helm-quit-if-no-candidate)
-                (funcall helm-quit-if-no-candidate))
-           (keyboard-quit)))))
-
-(defun helm-toggle-suspend-update ()
-  "Enable or disable update of display in helm.
-This can be useful for e.g writing quietly a complex regexp."
-  (interactive)
-  (when (setq helm-suspend-update-flag (not helm-suspend-update-flag))
-    (helm-kill-async-processes)
-    (setq helm-pattern ""))
-  (message (if helm-suspend-update-flag
-               "Helm update suspended!"
-             "Helm update reenabled!")))
-
-(defadvice tramp-read-passwd (around disable-helm-update)
-  ;; Suspend update when prompting for a tramp password.
-  (setq helm-suspend-update-flag t)
-  (setq overriding-terminal-local-map nil)
-  (setq helm--reading-passwd-or-string t)
-  (let (stimers)
-    (unwind-protect
-         (progn
-           (setq stimers (with-timeout-suspend))
-           ad-do-it)
-      (with-timeout-unsuspend stimers)
-      (setq helm--reading-passwd-or-string nil)
-      (setq helm-suspend-update-flag nil))))
-
-(defun helm--advice-tramp-read-passwd (old--fn &rest args)
-  ;; Suspend update when prompting for a tramp password.
-  (setq helm-suspend-update-flag t)
-  (setq overriding-terminal-local-map nil)
-  (setq helm--reading-passwd-or-string t)
-  (unwind-protect
-       ;; No need to suspend timer in emacs-24.4
-       ;; it is fixed upstream.
-       (apply old--fn args)
-    (setq helm--reading-passwd-or-string nil)
-    (setq helm-suspend-update-flag nil)))
-
-(defun helm--advice-ange-ftp-get-passwd (old--fn &rest args)
-  ;; Suspend update when prompting for a ange password.
-  (setq helm-suspend-update-flag t)
-  (setq overriding-terminal-local-map nil)
-  (setq helm--reading-passwd-or-string t)
-  (unwind-protect
-       (apply old--fn args)
-    (setq helm--reading-passwd-or-string nil)
-    (setq helm-suspend-update-flag nil)))
-
-(defadvice ange-ftp-get-passwd (around disable-helm-update)
-  ;; Suspend update when prompting for a ange password.
-  (setq helm-suspend-update-flag t)
-  (setq overriding-terminal-local-map nil)
-  (setq helm--reading-passwd-or-string t)
-  (unwind-protect
-       ad-do-it
-    (setq helm--reading-passwd-or-string nil)
-    (setq helm-suspend-update-flag nil)))
-
-(defun helm--maybe-update-keymap (&optional map)
-  "Handle differents keymaps in multiples sources.
-
-It will override `helm-map' with the local map of current source.
-If no map is found in current source do nothing (keep previous map)."
-  (with-helm-buffer
-    (helm-aif (or map (assoc-default 'keymap (helm-get-current-source)))
-        ;; We need the timer to leave enough time
-        ;; to helm to setup its buffer when changing source
-        ;; from a recursive minibuffer.
-        ;; e.g C-x C-f M-y C-g
-        ;; => *find-files have now the bindings of *kill-ring.
-        (run-with-idle-timer
-         0.01 nil
-         (lambda ()
-           (with-current-buffer (window-buffer (minibuffer-window))
-             (setq minor-mode-overriding-map-alist `((helm--minor-mode . ,it)))))))))
-
-;;; Prevent loosing focus when using mouse.
-;;
-(defvar helm--remap-mouse-mode-map
-  (let ((map (make-sparse-keymap)))
-    (cl-loop for k in '([mouse-1] [mouse-2] [mouse-3]
-                        [down-mouse-1] [down-mouse-2] [down-mouse-3]
-                        [drag-mouse-1] [drag-mouse-2] [drag-mouse-3]
-                        [double-mouse-1] [double-mouse-2] [double-mouse-3]
-                        [triple-mouse-1] [triple-mouse-2] [triple-mouse-3])
-             do (define-key map k 'undefined))
-    map))
-
-(define-minor-mode helm--remap-mouse-mode
-    "[INTERNAL] Prevent escaping helm minibuffer with mouse clicks.
-Do nothing when used outside of helm context.
-
-WARNING: Do not use this mode yourself, it is internal to helm."
-  :group 'helm
-  :global t
-  :keymap helm--remap-mouse-mode-map
-  (unless helm-alive-p
-    (setq helm--remap-mouse-mode-map nil)))
-
-;; Core: clean up
-
-(defun helm-cleanup ()
-  "Clean up the mess when helm exit or quit."
-  (helm-log "start cleanup")
-  (with-current-buffer helm-buffer
-    ;; bury-buffer from this window.
-    (bury-buffer) ;[1]
-    ;; Be sure we call this from helm-buffer.
-    (helm-funcall-foreach 'cleanup))
-  (helm-kill-async-processes)
-  ;; Remove the temporary hooks added
-  ;; by `with-helm-temp-hook' that
-  ;; may not have been consumed.
-  (when helm--temp-hooks
-    (cl-loop for (fn . hook) in helm--temp-hooks
-             do (set hook (delete fn (symbol-value hook)))))
-  ;; When running helm from a dedicated frame
-  ;; with no minibuffer, helm will run in the main frame
-  ;; which have a minibuffer, so be sure to disable
-  ;; the `no-other-window' prop there.
-  (helm-prevent-switching-other-window :enabled nil)
-  (helm-log-run-hook 'helm-cleanup-hook)
-  (helm-frame-or-window-configuration 'restore)
-  ;; [1] now bury-buffer from underlying windows otherwise,
-  ;; if this window is killed the underlying buffer will
-  ;; be a helm buffer.
-  (replace-buffer-in-windows helm-buffer)
-  (setq helm-alive-p nil)
-  ;; This is needed in some cases where last input
-  ;; is yielded infinitely in minibuffer after helm session.
-  (helm-clean-up-minibuffer))
-
-(defun helm-clean-up-minibuffer ()
-  "Remove contents of minibuffer."
-  (let ((miniwin (minibuffer-window)))
-    ;; Clean only current minibuffer used by helm.
-    ;; i.e The precedent one is active.
-    (unless (minibuffer-window-active-p miniwin)
-      (with-current-buffer (window-buffer miniwin)
-        (delete-minibuffer-contents)))))
-
-
-;;; Core: input handling
-;;
-;;
-(defun helm-check-minibuffer-input ()
-  "Check minibuffer content."
-  (with-helm-quittable
-    (with-selected-window (or (active-minibuffer-window)
-                              (minibuffer-window))
-      (helm-check-new-input (minibuffer-contents)))))
-
-(defun helm-check-new-input (input)
-  "Check INPUT string and update the helm buffer if necessary."
-  ;; First time minibuffer is entered
-  ;; we check value of `helm-pattern' that have been set
-  ;; in `helm-initial-setup' when `helm--maybe-use-default-as-input'
-  ;; is non--nil.  After this initial check, reset
-  ;; `helm--maybe-use-default-as-input' and ignore this.
-  ;; This happen only when source is `delayed'.
-  (when helm--maybe-use-default-as-input ; nil when non--delayed.
-    (setq input helm-pattern))
-  (unless (equal input helm-pattern)
-    (setq helm-pattern input)
-    (unless (helm-action-window)
-      (setq helm-input helm-pattern))
-    (helm-log "helm-pattern = %S" helm-pattern)
-    (helm-log "helm-input = %S" helm-input)
-    (setq helm--in-update t)
-    (helm-update)))
-
-(defun helm--reset-update-flag ()
-  (run-with-idle-timer
-   helm-exit-idle-delay nil
-   (lambda () (setq helm--in-update nil))))
-
-(add-hook 'helm-after-update-hook #'helm--reset-update-flag)
-
-
-;;; Core: source compiler
-;;
-;;
-(defun helm-compile-sources (sources funcs)
-  "Compile SOURCES with FUNCS.
-See `helm-compile-source-functions'.
-Helm plug-ins are realized by this function."
-  (mapcar
-   (lambda (source)
-     (cl-loop with src = (if (listp source) source (symbol-value source))
-              for noplug = (assoc 'dont-plug src)
-              for f in funcs
-              unless (and noplug (memq f (cdr noplug)))
-              do (setq src (funcall f src))
-              finally (cl-return src)))
-   sources))
-
-
-;; Core: all candidates
-
-(defun helm-get-candidates (source)
-  "Retrieve and return the list of candidates from SOURCE."
-  (let* (inhibit-quit
-         (candidate-fn (assoc-default 'candidates source))
-         (candidate-proc (assoc-default 'candidates-process source))
-         (type-error (lambda ()
-                       (error
-                        "`%s' must either be a function, a variable or a list"
-                        (or candidate-fn candidate-proc))))
-         (candidates (condition-case-unless-debug err
-                         ;; Process candidates-(process) function
-                         ;; It may return a process or a list of candidates.
-                         (if candidate-proc
-                             ;; Calling `helm-interpret-value' with no
-                             ;; SOURCE arg force the use of `funcall'
-                             ;; and not `helm-funcall-with-source'.
-                             (helm-interpret-value candidate-proc)
-                           (helm-interpret-value candidate-fn source))
-                       (error (helm-log "Error: %S" err) nil))))
-    (when (and (processp candidates) (not candidate-proc))
-      (warn "Candidates function `%s' should be called in a `candidates-process' attribute"
-            candidate-fn))
-    (cond ((processp candidates)
-           ;; Candidates will be filtered later in process filter.
-           candidates)
-          ((or (null candidates)
-               ;; Can happen when the output of a process
-               ;; is empty, and the candidates function call
-               ;; something like (split-string (buffer-string) "\n")
-               ;; which result in a list of one empty string (Issue #938).
-               ;; e.g (completing-read "test: " '(""))
-               (equal candidates '("")))
-           nil)
-          ((listp candidates)
-           ;; Transform candidates with `candidate-transformer' functions if
-           ;; some, otherwise return candidates.
-           (helm-transform-candidates candidates source))
-          (t (funcall type-error)))))
-
-(defmacro helm-while-no-input (&rest body)
-  "Same as `while-no-input' but without testing with `input-pending-p'."
-  (declare (debug t) (indent 0))
-  (let ((catch-sym (make-symbol "input"))
-        inhibit-quit)
-    `(with-local-quit
-       (catch ',catch-sym
-	 (let ((throw-on-input ',catch-sym))
-           ,@body)))))
-
-(defun helm-get-cached-candidates (source)
-  "Return the cached value of candidates for SOURCE.
-Cache the candidates if there is not yet a cached value."
-  (let* ((name (assoc-default 'name source))
-         (candidate-cache (gethash name helm-candidate-cache)))
-    (helm-aif candidate-cache
-        (prog1 it (helm-log "Use cached candidates"))
-      (helm-log "No cached candidates, calculate candidates")
-      (let ((candidates (helm-get-candidates source)))
-        (cond ((processp candidates)
-               (push (cons candidates
-                           (append source
-                                   (list (cons 'item-count 0)
-                                         (cons 'incomplete-line ""))))
-                     helm-async-processes)
-               (set-process-filter candidates 'helm-output-filter)
-               (setq candidates nil))
-              ((not (assoc 'volatile source))
-               (puthash name candidates helm-candidate-cache)))
-        candidates))))
-
-
-;;; Core: candidate transformers
-(defun helm-transform-mapcar (function args)
-  "`mapcar' for candidate-transformer.
-
-ARGS is (cand1 cand2 ...) or ((disp1 . real1) (disp2 . real2) ...)
-
-\(helm-transform-mapcar 'upcase '(\"foo\" \"bar\"))
-=> (\"FOO\" \"BAR\")
-\(helm-transform-mapcar 'upcase '((\"1st\" . \"foo\") (\"2nd\" . \"bar\")))
-=> ((\"1st\" . \"FOO\") (\"2nd\" . \"BAR\"))
-"
-  (cl-loop for arg in args
-        if (consp arg)
-        collect (cons (car arg) (funcall function (cdr arg)))
-        else
-        collect (funcall function arg)))
-
-(defun helm-process-candidate-transformer (candidates source)
-  "Execute `candidate-transformer' function(s) on CANDIDATES in SOURCE."
-  (helm-aif (assoc-default 'candidate-transformer source)
-      (helm-composed-funcall-with-source source it candidates)
-    candidates))
-
-(defun helm-process-filtered-candidate-transformer (candidates source)
-  "Execute `filtered-candidate-transformer' function(s) on CANDIDATES in SOURCE."
-  (helm-aif (assoc-default 'filtered-candidate-transformer source)
-      (helm-composed-funcall-with-source source it candidates source)
-    candidates))
-
-(defmacro helm--maybe-process-filter-one-by-one-candidate (candidate source)
-  "Execute `filter-one-by-one' function(s) on CANDIDATE in SOURCE."
-  `(helm-aif (assoc-default 'filter-one-by-one ,source)
-       (if (and (listp it)
-                (not (functionp it))) ;; Don't treat lambda's as list.
-           (cl-loop for f in it
-                 do (setq ,candidate (funcall f ,candidate))
-                 finally return ,candidate)
-         (setq ,candidate (funcall it ,candidate)))))
-
-(defun helm--initialize-one-by-one-candidates (candidates source)
-  "Process the CANDIDATES with the `filter-one-by-one' function in SOURCE.
-Return CANDIDATES when pattern is empty."
-  (helm-aif (and (string= helm-pattern "")
-                 (assoc-default 'filter-one-by-one source))
-      (cl-loop for cand in candidates collect
-               (helm--maybe-process-filter-one-by-one-candidate cand source))
-    candidates))
-
-(defun helm-process-filtered-candidate-transformer-maybe
-    (candidates source process-p)
-  "Execute `filtered-candidate-transformer' function(s) on CANDIDATES in SOURCE.
-When PROCESS-P is non-nil execute `filtered-candidate-transformer'
-functions if some, otherwise return CANDIDATES."
-  (if process-p
-      ;; When no filter return CANDIDATES unmodified.
-      (helm-process-filtered-candidate-transformer candidates source)
-    candidates))
-
-(defun helm-process-real-to-display (candidates source)
-  "Execute real-to-display function on all CANDIDATES of SOURCE."
-  (helm-aif (assoc-default 'real-to-display source)
-      (setq candidates (helm-funcall-with-source
-                        source 'mapcar
-                        (lambda (cand_)
-                          (if (consp cand_)
-                              ;; override DISPLAY from candidate-transformer
-                              (cons (funcall it (cdr cand_)) (cdr cand_))
-                            (cons (funcall it cand_) cand_)))
-                        candidates))
-    candidates))
-
-(defun helm-transform-candidates (candidates source &optional process-p)
-  "Transform CANDIDATES of SOURCE according to candidate transformers.
-When PROCESS-P is non-nil execute the `filtered-candidate-transformer' functions
-otherwise only the `candidate-transformer' functions are processed.
-When attribute `real-to-display' is present, execute its function on all maybe
-filtered CANDIDATES."
-  (helm-process-real-to-display
-   (helm-process-filtered-candidate-transformer-maybe
-    (helm-process-candidate-transformer
-     (helm--initialize-one-by-one-candidates candidates source) source)
-    source process-p)
-   source))
-
-
-;; Core: narrowing candidates
-(defun helm-candidate-number-limit (source)
-  "Apply candidate-number-limit attribute value.
-This overhide variable `helm-candidate-number-limit'.
-
-e.g:
-If \(candidate-number-limit\) is in SOURCE, show all candidates in SOURCE.
-If \(candidate-number-limit . 123\) is in SOURCE limit candidate to 123."
-  (helm-aif (assq 'candidate-number-limit source)
-      (or (cdr it) 99999999)
-    (or helm-candidate-number-limit 99999999)))
-
-(defun helm-candidate-get-display (candidate)
-  "Get searched display part from CANDIDATE.
-CANDIDATE is a string, a symbol, or \(DISPLAY . REAL\) cons cell."
-  (cond ((car-safe candidate))
-        ((symbolp candidate)
-         (symbol-name candidate))
-        ((numberp candidate)
-         (number-to-string candidate))
-        (t candidate)))
-
-(defun helm-process-pattern-transformer (pattern source)
-  "Execute pattern-transformer attribute PATTERN function in SOURCE."
-  (helm-aif (assoc-default 'pattern-transformer source)
-      (helm-composed-funcall-with-source source it pattern)
-    pattern))
-
-(defun helm-default-match-function (candidate)
-  "Check if `helm-pattern' match CANDIDATE.
-Default function to match candidates according to `helm-pattern'."
-  (string-match helm-pattern candidate))
-
-
-;;; Fuzzy matching
-;;
-;;
-(defsubst helm--mapconcat-pattern (pattern)
-  "Transform string PATTERN in regexp for further fuzzy matching.
-e.g helm.el$
-    => \"[^h]*h[^e]*e[^l]*l[^m]*m[^.]*[.][^e]*e[^l]*l$\"
-    ^helm.el$
-    => \"helm[.]el$\"."
-  (let ((ls (split-string-and-unquote pattern "")))
-    (if (string= "^" (car ls))
-        ;; Exact match.
-        (mapconcat (lambda (c)
-                     (if (and (string= c "$")
-                              (string-match "$\\'" pattern))
-                         c (regexp-quote c)))
-                   (cdr ls) "")
-        ;; Fuzzy match.
-        (mapconcat (lambda (c)
-                     (if (and (string= c "$")
-                              (string-match "$\\'" pattern))
-                         c (format "[^%s]*%s" c (regexp-quote c))))
-                   ls ""))))
-
-(defvar helm--fuzzy-regexp-cache (make-hash-table :test 'eq))
-(defun helm--fuzzy-match-maybe-set-pattern ()
-  ;; Computing helm-pattern with helm--mapconcat-pattern
-  ;; is costly, so cache it once time for all and reuse it
-  ;; until pattern change.
-  (when helm--in-fuzzy
-    (let ((fun (if (string-match "\\`\\^" helm-pattern)
-                   #'identity
-                   #'helm--mapconcat-pattern)))
-      (clrhash helm--fuzzy-regexp-cache)
-      ;; FIXME: Splitted part are not handled here,
-      ;; I must compute them in `helm-search-match-part'
-      ;; when negation and in-buffer are used.
-      (if (string-match "\\`!" helm-pattern)
-          (puthash 'helm-pattern
-                   (if (> (length helm-pattern) 1)
-                       (list (funcall fun (substring helm-pattern 1 2))
-                             (funcall fun (substring helm-pattern 1)))
-                       '("" ""))
-                   helm--fuzzy-regexp-cache)
-          (puthash 'helm-pattern
-                   (if (> (length helm-pattern) 0)
-                       (list (funcall fun (substring helm-pattern 0 1))
-                             (funcall fun helm-pattern))
-                       '("" ""))
-                   helm--fuzzy-regexp-cache)))))
-
-(defun helm-fuzzy-match (candidate)
-  "Check if `helm-pattern' fuzzy match CANDIDATE.
-This function is used with sources build with `helm-source-sync'."
-  (unless (string-match " " helm-pattern)
-    ;; When pattern have one or more spaces, let
-    ;; match-plugin doing the job with no fuzzy matching.[1]
-    (let ((regexp (cadr (gethash 'helm-pattern helm--fuzzy-regexp-cache))))
-      (if (string-match "\\`!" helm-pattern)
-          (not (string-match regexp candidate))
-          (string-match regexp candidate)))))
-
-(defun helm-fuzzy-search (pattern)
-  "Same as `helm-fuzzy-match' but for sources build with `helm-source-in-buffer'."
-  (unless (string-match " " helm-pattern)
-    ;; Same as in `helm-fuzzy-match' ref[1].
-    (let* ((regexps (gethash 'helm-pattern helm--fuzzy-regexp-cache))
-           (partial-regexp (car regexps))
-           (regexp (cadr regexps)))
-      (if (string-match "\\`!" pattern)
-          ;; Don't try to search here, just return
-          ;; the position of line and go ahead,
-          ;; letting `helm-search-match-part' checking if
-          ;; pattern match against this line.
-          (prog1 (list (point-at-bol) (point-at-eol))
-            (forward-line 1))
-          ;; We could use here directly `re-search-forward'
-          ;; on the regexp produced by `helm--mapconcat-pattern',
-          ;; but it is very slow because emacs have to do an incredible
-          ;; amount of loops to match e.g "[^f]*o[^o]..." in the whole buffer,
-          ;; more the regexp is long more the amount of loops grow.
-          ;; (Probably leading to a max-lisp-eval-depth error if both
-          ;; regexp and buffer are too big)
-          ;; So just search the first bit of pattern e.g "[^f]*f", and
-          ;; then search the corresponding line with the whole regexp,
-          ;; which increase dramatically the speed of the search.
-          (cl-loop while (re-search-forward partial-regexp nil t)
-                   for bol = (point-at-bol)
-                   for eol = (point-at-eol)
-                   if (progn (goto-char bol)
-                             (re-search-forward regexp eol t))
-                   do (goto-char eol) and return t
-                   else do (goto-char eol)
-                   finally return nil)))))
-
-(defsubst helm--collect-pairs-in-string (string)
-  (cl-loop for str on (split-string string "" t) by 'cdr
-           when (cdr str)
-           collect (list (car str) (cadr str))))
-
-(defun helm-score-candidate-for-pattern (candidate pattern)
-  "Give a score to CANDIDATE according to PATTERN.
-Score is calculated against number of contiguous matches found with PATTERN.
-If PATTERN is fully matched in CANDIDATE a maximal score (100) is given.
-A bonus of one point is given when PATTERN prefix match CANDIDATE.
-Contiguous matches have a coefficient of 2."
-  (let* ((pat-lookup (helm--collect-pairs-in-string pattern))
-         (str-lookup (helm--collect-pairs-in-string candidate))
-         (bonus (if (equal (car pat-lookup) (car str-lookup)) 1 0))
-         (bonus1 (and (string-match (concat "\\<" (regexp-quote pattern) "\\>")
-                                    candidate)
-                      100)))
-    (+ bonus (or bonus1
-                 ;; Give a coefficient of 2 for contiguous matches.
-                 ;; That's mean that "wiaaaki" will not take precedence
-                 ;; on "aaawiki" when matching on "wiki" even if "wiaaaki"
-                 ;; starts by "wi".
-                 (* (length (cl-nintersection
-                             pat-lookup str-lookup :test 'equal))
-                    2)))))
-
-(defun helm-fuzzy-matching-default-sort-fn (candidates _source &optional use-real)
-  "The transformer for sorting candidates in fuzzy matching.
-It is sorting on the display part of by default.
-
-Sort CANDIDATES according to their score calculated by
-`helm-score-candidate-for-pattern'.  When two candidates have the
-same score sort is made by length.  Set USE-REAL to non-nil to
-sort on the real part."
-  (if (string= helm-pattern "")
-      candidates
-    (let ((table-scr (make-hash-table :test 'equal)))
-      (sort candidates
-            (lambda (s1 s2)
-              ;; Score and measure the length on real or display part of candidate
-              ;; according to `use-real'.
-              (let* ((real-or-disp-fn (if use-real #'cdr #'car))
-                     (cand1 (if (consp s1)
-                                (funcall real-or-disp-fn s1)
-                              s1))
-                     (cand2 (if (consp s2)
-                                (funcall real-or-disp-fn s2)
-                              s2))
-                     (data1 (or (gethash cand1 table-scr)
-                                (puthash cand1 (list (helm-score-candidate-for-pattern
-                                                      cand1 helm-pattern)
-                                                     (length cand1))
-                                         table-scr)))
-                     (data2 (or (gethash cand2 table-scr)
-                                (puthash cand2 (list (helm-score-candidate-for-pattern
-                                                      cand2 helm-pattern)
-                                                     (length cand2))
-                                         table-scr)))
-                     (len1 (cadr data1))
-                     (len2 (cadr data2))
-                     (scr1 (car data1))
-                     (scr2 (car data2)))
-                (cond ((= scr1 scr2)
-                       (< len1 len2))
-                      ((> scr1 scr2)))))))))
-
-(defun helm-fuzzy-default-highlight-match (candidate)
-  "The default function to highlight matches in fuzzy matching.
-It is meant to use with `filter-one-by-one' slot."
-  (let* ((pair (and (consp candidate) candidate))
-         (display (helm-stringify (if pair (car pair) candidate)))
-         (real (cdr pair)))
-    (with-temp-buffer
-      (insert display)
-      (goto-char (point-min))
-      (if (search-forward helm-pattern nil t)
-          (add-text-properties
-           (match-beginning 0) (match-end 0) '(face helm-match))
-          (cl-loop with pattern = (if (string-match-p " " helm-pattern)
-                                      (split-string helm-pattern)
-                                      (split-string helm-pattern "" t))
-                   for p in pattern
-                   do
-                   (when (search-forward p nil t)
-                     (add-text-properties
-                      (match-beginning 0) (match-end 0) '(face helm-match)))))
-      (setq display (buffer-string)))
-    (if real (cons display real) display)))
-
-(defun helm-fuzzy-highlight-matches (candidates _source)
-  "The filtered-candidate-transformer function to highlight matches in fuzzy.
-See helm-fuzzy-default-highlight-match."
-  (cl-loop for c in candidates
-           collect (helm-fuzzy-default-highlight-match c)))
-
-(defun helm-match-functions (source)
-  (let ((matchfns (or (assoc-default 'match source)
-                      (assoc-default 'match-strict source)
-                      #'helm-default-match-function)))
-    (if (and (listp matchfns) (not (functionp matchfns)))
-        matchfns (list matchfns))))
-
-(defun helm-search-functions (source)
-  (let ((searchfns (assoc-default 'search source)))
-    (if (and (listp searchfns) (not (functionp searchfns)))
-        searchfns (list searchfns))))
-
-(defmacro helm--accumulate-candidates (candidate newmatches
-                                       hash item-count limit source)
-  "Add CAND into NEWMATCHES and use HASH to uniq NEWMATCHES.
-Argument ITEM-COUNT count the matches.
-if ITEM-COUNT reaches LIMIT, exit from inner loop."
-  `(unless (gethash ,candidate ,hash)
-     (unless (assq 'allow-dups ,source)
-       (puthash ,candidate t ,hash))
-     (helm--maybe-process-filter-one-by-one-candidate ,candidate ,source)
-     (push ,candidate ,newmatches)
-     (cl-incf ,item-count)
-     (when (= ,item-count ,limit) (cl-return))))
-
-(defun helm-take-first-elements (seq n)
-  "Return the N first element of SEQ if SEQ is longer than N.
-It is used to narrow down list of candidates to `helm-candidate-number-limit'."
-  (if (> (length seq) n) (cl-subseq seq 0 n) seq))
-
-(cl-defun helm-set-case-fold-search (&optional (pattern helm-pattern))
-  "Used to set the value of `case-fold-search' in helm.
-Return t or nil depending of value of `helm-case-fold-search'
-and `helm-pattern'."
-  (let ((helm-case-fold-search
-         (helm-aif (assq 'case-fold-search (helm-get-current-source))
-             (cdr it)
-           helm-case-fold-search))
-        ;; Only parse basename for filenames
-        ;; to avoid setting case sensitivity
-        ;; when expanded directories contains upcase
-        ;; characters.
-        (bn-or-pattern (if (string-match "[~/]*" pattern)
-                           ;; `helm-basename' is not available yet.
-                           (file-name-nondirectory
-                            (directory-file-name pattern))
-                         pattern)))
-    (helm-set-case-fold-search-1 bn-or-pattern)))
-
-(defun helm-set-case-fold-search-1 (pattern)
-  (cl-case helm-case-fold-search
-    (smart (let ((case-fold-search nil))
-             (if (string-match "[[:upper:]]" pattern) nil t)))
-    (t helm-case-fold-search)))
-
-(defun helm-match-from-candidates (cands matchfns match-part-fn limit source)
-  (let (matches)
-    (condition-case-unless-debug err
-        (let ((item-count 0)
-              (case-fold-search (helm-set-case-fold-search)))
-          (clrhash helm-match-hash)
-          (cl-dolist (match matchfns)
-            (let (newmatches)
-              (cl-dolist (candidate cands)
-                (unless (gethash candidate helm-match-hash)
-                  (let ((target (helm-candidate-get-display candidate)))
-                    (when (funcall match
-                                   (if match-part-fn
-                                       (funcall match-part-fn target) target))
-                      (helm--accumulate-candidates
-                       candidate newmatches
-                       helm-match-hash item-count limit source)))))
-              ;; filter-one-by-one may return nil candidates, so delq them if some.
-              (setq matches (nconc matches (nreverse (delq nil newmatches)))))))
-      (error (unless (eq (car err) 'invalid-regexp) ; Always ignore regexps errors.
-               (helm-log-error "helm-match-from-candidates in source `%s': %s %s"
-                               (assoc-default 'name source) (car err) (cdr err)))
-             (setq matches nil)))
-    matches))
-
-(defun helm-compute-matches (source)
-  "Start computing candidates in SOURCE."
-  (save-current-buffer
-    (let ((matchfns (helm-match-functions source))
-          (matchpartfn (assoc-default 'match-part source))
-          (helm-source-name (assoc-default 'name source))
-          (helm-current-source source)
-          (limit (helm-candidate-number-limit source))
-          (helm-pattern (helm-process-pattern-transformer
-                         helm-pattern source)))
-      (helm--fuzzy-match-maybe-set-pattern)
-      ;; If source have a `filtered-candidate-transformer' attr
-      ;; Filter candidates with this func, otherwise just compute
-      ;; candidates.
-      (helm-process-filtered-candidate-transformer
-       (if (or (equal helm-pattern "")
-               (equal matchfns '(identity)))
-           ;; Compute all candidates up to LIMIT.
-           (helm-take-first-elements
-            (helm-get-cached-candidates source) limit)
-         ;; Compute candidates according to pattern with their match fns.
-         (helm-match-from-candidates
-          (helm-get-cached-candidates source) matchfns matchpartfn limit source))
-       source))))
-
-(defun helm-render-source (source matches)
-  "Display MATCHES from SOURCE according to its settings."
-  (helm-log "Source name = %S" (assoc-default 'name source))
-  (when matches
-    (helm-insert-header-from-source source)
-    (if (not (assq 'multiline source))
-        (cl-loop for m in matches
-                 for count from 1
-                 do (helm-insert-match m 'insert source count))
-      (let ((start (point))
-            (count 0)
-            separate)
-        (cl-dolist (match matches)
-          (cl-incf count)
-          (if separate
-              (helm-insert-candidate-separator)
-            (setq separate t))
-          (helm-insert-match match 'insert source count))
-        (put-text-property start (point) 'helm-multiline t)))))
-
-(defmacro helm--maybe-use-while-no-input (&rest body)
-  "Wrap BODY in `helm-while-no-input' unless initializing a remote connection."
-  `(progn
-     (if (and (file-remote-p helm-pattern)
-              (not (file-remote-p helm-pattern nil t)))
-         ;; Tramp will ask for passwd, don't use `helm-while-no-input'.
-         ,@body
-       (helm-log "Using here `helm-while-no-input'")
-       (helm-while-no-input ,@body))))
-
-(defun helm--compute-sources (src-list)
-  (cl-loop with matches = (helm--maybe-use-while-no-input
-                           (cl-loop for src in src-list
-                                 collect (helm-compute-matches src)))
-        when (eq matches t) do (setq matches nil)
-        for src in src-list
-        for mtc in matches
-        do (helm-render-source src mtc)))
-
-(cl-defun helm-process-delayed-sources (delayed-sources &optional preselect source)
-  "Process helm DELAYED-SOURCES.
-Move selection to string or regexp PRESELECT if non--nil.
-This function is called in `helm-process-delayed-sources-timer'
-when emacs is idle for `helm-idle-delay'."
-  (with-helm-quittable
-    (helm-log "Delayed sources = %S"
-              (mapcar (lambda (s)
-                        (assoc-default 'name s))
-                      delayed-sources))
-    (with-current-buffer (helm-buffer-get)
-      (save-excursion
-        (goto-char (point-max))
-        (helm--compute-sources delayed-sources)
-        (when (and (not (helm-empty-buffer-p))
-                   ;; No selection yet.
-                   (= (overlay-start helm-selection-overlay)
-                      (overlay-end helm-selection-overlay)))
-          (helm-update-move-first-line 'without-hook)))
-      (save-excursion
-        (goto-char (point-min))
-        (helm-log-run-hook 'helm-update-hook))
-      (setq helm-force-updating-p nil)
-      (unless (assoc 'candidates-process source)
-        (helm-display-mode-line (helm-get-current-source))
-        (helm-log-run-hook 'helm-after-update-hook))
-      (when preselect (helm-preselect preselect source)))))
-
-
-;;; Core: helm-update
-;;
-(defun helm-update (&optional preselect source)
-  "Update candidates list in `helm-buffer' according to `helm-pattern'.
-Argument PRESELECT is a string or regexp used to move selection to a particular
-place once updating is done.  It should be used on single source because search
-is done on whole `helm-buffer' and not on current source."
-  (helm-log "Start updating")
-  (helm-kill-async-processes)
-  ;; When persistent action have been called
-  ;; we have two windows even with `helm-full-frame'.
-  ;; So go back to one window when updating if `helm-full-frame'
-  ;; is non--nil.
-  (with-helm-window
-    (when helm-onewindow-p (delete-other-windows)))
-  (with-current-buffer (helm-buffer-get)
-    (set (make-local-variable 'helm-input-local) helm-pattern)
-    (let (normal-sources
-          delayed-sources)
-      (unwind-protect
-           (progn
-             ;; Iterate over all the sources
-             (cl-loop for source in (cl-remove-if-not
-                                     'helm-update-source-p (helm-get-sources))
-                   if (helm-delayed-source-p source)
-                   ;; Delayed sources just get collected for later
-                   ;; processing
-                   collect source into ds
-                   else
-                   ;; Collect the normal sources
-                   collect source into ns
-                   ;; Export the variables from cl-loop
-                   finally (setq delayed-sources ds
-                                 normal-sources ns))
-             (erase-buffer)
-             ;; Render all the sources into the helm buffer after
-             ;; calculating all candidates.
-             ;; Candidates must be computed AFTER erasing buffer
-             ;; even if it cause flickering; Doing so avoid
-             ;; unexpected results when executing actions.
-             (helm--compute-sources normal-sources))
-        (helm-log "Delayed sources = %S"
-                  (mapcar (lambda (s) (assoc-default 'name s))
-                          delayed-sources))
-        (cond ((and preselect delayed-sources normal-sources)
-               ;; Preselection run here when there is
-               ;; normal AND delayed sources.
-               (helm-log "Update preselect candidate %s" preselect)
-               (helm-preselect preselect source))
-              (delayed-sources ; Preselection and hooks will run later.
-               (helm-update-move-first-line 'without-hook))
-              (t              ; No delayed sources, run the hooks now.
-               (helm-update-move-first-line)
-               (unless (assoc 'candidates-process source)
-                 (helm-display-mode-line (helm-get-current-source))
-                 (helm-log-run-hook 'helm-after-update-hook))
-               (when preselect
-                 (helm-log "Update preselect candidate %s" preselect)
-                 (helm-preselect preselect source))
-               (setq helm-force-updating-p nil)))
-        (when delayed-sources
-          ;; Allow giving a value to `delayed' attr from inside source.
-          ;; Retain the biggest value (the slower) found in DELAYED-SOURCES.
-          (let ((helm-idle-delay (cl-loop with delay = helm-idle-delay
-                                       for s in delayed-sources
-                                       for d = (assoc-default 'delayed s)
-                                       when d do (setq delay (max delay d))
-                                       finally return delay)))
-            (run-with-idle-timer
-             ;; Be sure helm-idle-delay is >
-             ;; to helm-input-idle-delay
-             ;; otherwise use value of helm-input-idle-delay
-             ;; or 0.01 if == to 0.
-             (max helm-idle-delay helm-input-idle-delay 0.001) nil
-             'helm-process-delayed-sources delayed-sources preselect source)))
-        (helm-log "end update")))))
-
-;; Update keymap after updating.
-;; Now we run this in post-command-hook, it is
-;; probably no more needed in helm-after-update-hook.
-;; Leave it commented as a reminder for now.
-;; (add-hook 'helm-after-update-hook 'helm--maybe-update-keymap)
-
-(defun helm-update-source-p (source)
-  "Whether SOURCE need updating or not."
-  (let ((len (string-width
-              (if (or (assoc 'matchplugin source)
-                      (null (assoc 'no-matchplugin source)))
-                  ;; Don't count spaces entered when using
-                  ;; match-plugin.
-                  (replace-regexp-in-string " " "" helm-pattern)
-                helm-pattern))))
-    (and (or (not helm-source-filter)
-             (member (assoc-default 'name source) helm-source-filter))
-         (>= len
-             (helm-aif (assoc 'requires-pattern source) (or (cdr it) 1) 0))
-         ;; These incomplete regexps hang helm forever
-         ;; so defer update. Maybe replace spaces quoted when using
-         ;; match-plugin-mode.
-         (not (member (replace-regexp-in-string "\\s\\ " " " helm-pattern)
-                      helm-update-blacklist-regexps)))))
-
-(defun helm-delayed-source-p (source)
-  "Wheter SOURCE is a delayed source or not."
-  (or (assoc 'delayed source)
-      (and helm-quick-update
-           (> (length helm-sources) 1)
-           (< (window-height (get-buffer-window (current-buffer)))
-              (line-number-at-pos (point-max))))))
-
-(defun helm-update-move-first-line (&optional without-hook)
-  "Goto first line of `helm-buffer'."
-  (goto-char (point-min))
-  (unless without-hook
-    (save-excursion (helm-log-run-hook 'helm-update-hook)))
-  (helm-next-line))
-
-(defun helm-force-update (&optional preselect)
-  "Force recalculation and update of candidates.
-The difference with `helm-update' is this function is reevaling
-the `init' and `update' attributes functions when present
-before updating candidates according to pattern i.e calling `helm-update'.
-Selection is preserved to current candidate or moved to PRESELECT
-if specified."
-  (interactive)
-  (let ((source    (helm-get-current-source))
-        (selection (helm-get-selection nil t))
-        ;; `helm-goto-source' need to have all sources displayed
-        ;; So disable `helm-quick-update'.
-        helm-quick-update)
-    (setq helm-force-updating-p t)
-    (when source
-      (mapc 'helm-force-update--reinit
-            (helm-get-sources)))
-    (helm-update (or preselect selection) source)
-    (with-helm-window (recenter))))
-
-(defun helm-force-update--reinit (source)
-  "Reinit SOURCE by calling his update and/or init functions."
-  (helm-aif (helm-funcall-with-source
-             source 'helm-candidate-buffer)
-      (kill-buffer it))
-  (cl-dolist (attr '(update init))
-    (helm-aif (assoc-default attr source)
-        (helm-funcall-with-source source it)))
-  (helm-remove-candidate-cache source))
-
-(defun helm-remove-candidate-cache (source)
-  "Remove SOURCE from `helm-candidate-cache'."
-  (remhash (assoc-default 'name source) helm-candidate-cache))
-
-(defun helm-insert-match (match insert-function source &optional num)
-  "Insert MATCH into `helm-buffer' with INSERT-FUNCTION for SOURCE.
-If MATCH is a list then insert the string intended to appear on the display
-and store the real value in a text property."
-  (let ((start     (point-at-bol (point)))
-        (dispvalue (helm-candidate-get-display match))
-        (realvalue (cdr-safe match)))
-    (when (and (stringp dispvalue)
-             (not (zerop (length dispvalue))))
-      (funcall insert-function dispvalue)
-      ;; Some sources with candidates-in-buffer have already added
-      ;; 'helm-realvalue property when creating candidate buffer.
-      (unless (get-text-property start 'helm-realvalue)
-        (and realvalue
-             (put-text-property start (point-at-eol)
-                                'helm-realvalue realvalue)))
-      (when num
-        (put-text-property start (point-at-eol) 'helm-cand-num num))
-      (when helm-source-in-each-line-flag
-        (put-text-property start (point-at-eol) 'helm-source source))
-      (funcall insert-function "\n"))))
-
-(defun helm-insert-header-from-source (source)
-  "Insert SOURCE name in `helm-buffer' header.
-Maybe insert by overlay additional info after source name if SOURCE have
-header-name attribute."
-  (let ((name (assoc-default 'name source)))
-    (helm-insert-header
-     name
-     (helm-aif (assoc-default 'header-name source)
-         (helm-funcall-with-source source it name)))))
-
-(defun helm-insert-header (name &optional display-string)
-  "Insert header of source NAME into the helm buffer.
-If DISPLAY-STRING is non--nil and a string, display this additional info
-after the source name by overlay."
-  (unless (bobp)
-    (let ((start (point)))
-      (insert "\n")
-      (put-text-property start (point) 'helm-header-separator t)))
-  (let ((start (point)))
-    (insert name)
-    (put-text-property (point-at-bol)
-                       (point-at-eol) 'helm-header t)
-    (when display-string
-      (overlay-put (make-overlay (point-at-bol) (point-at-eol))
-                   'display display-string))
-    (insert "\n")
-    (put-text-property start (point) 'face 'helm-source-header)))
-
-(defun helm-insert-candidate-separator ()
-  "Insert separator of candidates into the helm buffer."
-  (insert (propertize helm-candidate-separator 'face 'helm-separator))
-  (put-text-property (point-at-bol)
-                     (point-at-eol) 'helm-candidate-separator t)
-  (insert "\n"))
-
-
-;;; Core: async process
-;;
-(defun helm-output-filter (process output-string)
-  "The `process-filter' function for helm async sources."
-  (with-helm-quittable
-    (helm-output-filter-1 (assoc process helm-async-processes) output-string)))
-
-(defun helm-output-filter-1 (process-assoc output-string)
-  (helm-log "output-string = %S" output-string)
-  (with-current-buffer helm-buffer
-    (let ((source (cdr process-assoc)))
-      (save-excursion
-        (helm-aif (assoc-default 'insertion-marker source)
-            (goto-char it)
-          (goto-char (point-max))
-          (helm-insert-header-from-source source)
-          (setcdr process-assoc
-                  (append source `((insertion-marker . ,(point-marker))))))
-        (helm-output-filter--process-source
-         (car process-assoc) output-string source
-         (helm-candidate-number-limit source))))
-    (helm-output-filter--post-process)))
-
-(defun helm-output-filter--process-source (process output-string source limit)
-  (cl-dolist (candidate (helm-transform-candidates
-                         (helm-output-filter--collect-candidates
-                          (split-string output-string "\n")
-                          (assoc 'incomplete-line source)
-                          source)
-                         source t))
-    (when candidate     ; filter-one-by-one may return nil candidates.
-      (if (assq 'multiline source)
-          (let ((start (point)))
-            (helm-insert-candidate-separator)
-            (helm-insert-match candidate 'insert-before-markers source
-                               (1+ (cdr (assoc 'item-count source))))
-            (put-text-property start (point) 'helm-multiline t))
-          (helm-insert-match candidate 'insert-before-markers source
-                             (1+ (cdr (assoc 'item-count source)))))
-      (cl-incf (cdr (assoc 'item-count source)))
-      (when (>= (assoc-default 'item-count source) limit)
-        (helm-kill-async-process process)
-        (cl-return)))))
-
-(defun helm-output-filter--collect-candidates (lines incomplete-line-info source)
-  "Collect LINES maybe completing the truncated first and last lines."
-  ;; The output of process may come in chunks of any size,
-  ;; so the last line of LINES come truncated, this truncated line is
-  ;; stored in INCOMPLETE-LINE-INFO and will be concated with the first
-  ;; incomplete line of next chunk arriving.
-  ;; INCOMPLETE-LINE-INFO is an attribute of source which is created
-  ;; with an empty string when the source is computed => (incomplete-line . "")
-  (helm-log "incomplete-line-info = %S" (cdr incomplete-line-info))
-  (butlast
-   (cl-loop for line in lines
-         ;; On start `incomplete-line-info' value is empty string.
-         for newline = (helm-aif (cdr incomplete-line-info)
-                           (prog1
-                               (concat it line)
-                             (setcdr incomplete-line-info nil))
-                         line)
-         do (helm--maybe-process-filter-one-by-one-candidate newline source)
-         collect newline
-         ;; Store last incomplete line (last chunk truncated)
-         ;; until new output arrives.
-         finally do (setcdr incomplete-line-info line))))
-
-(defun helm-output-filter--post-process ()
-  (let ((src (helm-get-current-source)))
-    (helm-log-run-hook 'helm-update-hook)
-    (helm-aif (get-buffer-window helm-buffer 'visible)
-        (with-selected-window it
-          (helm-skip-noncandidate-line 'next)
-          (helm-mark-current-line)
-          (helm-display-mode-line src)
-          (helm-log-run-hook 'helm-after-update-hook)))))
-
-(defun helm-process-deferred-sentinel-hook (process event file)
-  "Defer remote processes in sentinels.
-Meant to be called at beginning of a sentinel process function."
-  (when (and (string= event "finished\n")
-             (or (file-remote-p file)
-                 ;; `helm-suspend-update-flag'
-                 ;; is non--nil here only during a
-                 ;; running process, this will never be called
-                 ;; when user set it explicitely with `C-!'.
-                 helm-suspend-update-flag))
-    (setq helm-suspend-update-flag t)
-    ;; Kill the process but don't delete entry in
-    ;; `helm-async-processes'.
-    (helm-kill-async-process process)
-    ;; When tramp tries to open the same connection twice in a
-    ;; short time frame (less than 5s) it throw 'suppress which
-    ;; call the real-handler on the main "Emacs", so we wait
-    ;; 5s before updating to avoid this [1], but allowing user to
-    ;; enter input during this delay.
-    ;; [1] On last Emacs versions, this is fixed and tramp return
-    ;; nil in this situation.
-    ;; Note: It is difficult to have a value < to 5 for
-    ;; `tramp-connection-min-time-diff', because the process die
-    ;; when calling too quickly same process.
-    (run-at-time (or (and (boundp 'tramp-connection-min-time-diff)
-                          tramp-connection-min-time-diff)
-                     5)
-                 nil #'(lambda ()
-                         (when helm-alive-p ; Don't run timer fn after quit.
-                           (setq helm-suspend-update-flag nil)
-                           (helm-check-minibuffer-input))))))
-
-(defun helm-kill-async-processes ()
-  "Kill all asynchronous processes registered in `helm-async-processes'."
-  (while helm-async-processes
-    (helm-kill-async-process (caar helm-async-processes))
-    (setq helm-async-processes (cdr helm-async-processes))))
-
-(defun helm-kill-async-process (process)
-  "Stop output from `helm-output-filter' and kill associated PROCESS."
-  (set-process-filter process nil)
-  (delete-process process))
-
-
-;;; Core: action
-;;
-(defun helm-execute-selection-action ()
-  "Execute current action and kill the action buffer if present."
-  (helm-log-run-hook 'helm-before-action-hook)
-  ;; Position can be different when `helm-current-buffer'
-  ;; is splitted, so jump to this position before executing action.
-  (helm-current-position 'restore)
-  (unwind-protect
-       (helm-execute-selection-action-1)
-    (helm-aif (get-buffer helm-action-buffer)
-        (kill-buffer it))
-    (helm-log-run-hook 'helm-after-action-hook)))
-
-(defun helm-execute-selection-action-1 (&optional
-                                          selection action
-                                          preserve-saved-action)
-  "Execute ACTION on current SELECTION.
-If PRESERVE-SAVED-ACTION is non--nil save action."
-  (helm-log "executing action")
-  (setq action (helm-get-default-action
-                (or action
-                    helm-saved-action
-                    (if (get-buffer helm-action-buffer)
-                        (helm-get-selection helm-action-buffer)
-                      (helm-get-actions-from-current-source)))))
-  (let ((source (or helm-saved-current-source
-                    (helm-get-current-source)))
-        non-essential)
-    (setq selection (or selection
-                        (helm-get-selection)
-                        (and (assoc 'accept-empty source) "")))
-    (unless preserve-saved-action (setq helm-saved-action nil))
-    (when (and selection action)
-      (helm-funcall-with-source
-       source action
-       (helm-coerce-selection selection source)))))
-
-(defun helm-coerce-selection (selection source)
-  "Apply coerce attribute function to SELECTION in SOURCE.
-Coerce source with coerce function."
-  (helm-aif (assoc-default 'coerce source)
-      (helm-funcall-with-source source it selection)
-    selection))
-
-(defun helm-get-default-action (action)
-  "Get the first ACTION value of action list in source."
-  (if (and (listp action) (not (functionp action)))
-      (cdar action)
-    action))
-
-(defun helm-select-action ()
-  "Select an action for the currently selected candidate.
-If action buffer is selected, back to the helm buffer."
-  (interactive)
-  (let ((src (helm-get-current-source)))
-    (helm-log-run-hook 'helm-select-action-hook)
-    (setq helm-saved-selection (helm-get-selection))
-    (with-selected-frame (with-helm-window (selected-frame))
-      (prog1
-          (cond ((get-buffer-window helm-action-buffer 'visible)
-                 (set-window-buffer (get-buffer-window helm-action-buffer)
-                                    helm-buffer)
-                 (kill-buffer helm-action-buffer)
-                 (helm-set-pattern helm-input 'noupdate))
-                (helm-saved-selection
-                 (setq helm-saved-current-source src)
-                 (let ((actions (helm-get-actions-from-current-source)))
-                   (if (functionp actions)
-                       (message "Sole action: %s" actions)
-                       (helm-show-action-buffer actions)
-                       ;; Be sure the minibuffer is entirely deleted (#907).
-                       (helm--delete-minibuffer-contents-from "")
-                       ;; Make `helm-pattern' differs from the previous value.
-                       (setq helm-pattern 'dummy)
-                       (helm-check-minibuffer-input))))
-                (t (message "No Actions available")))
-        (helm-display-mode-line src)
-        (run-hooks 'helm-window-configuration-hook)))))
-
-(defun helm-show-action-buffer (actions)
-  (with-current-buffer (get-buffer-create helm-action-buffer)
-    (erase-buffer)
-    (buffer-disable-undo)
-    (set-window-buffer (get-buffer-window helm-buffer) helm-action-buffer)
-    (set (make-local-variable 'helm-sources)
-         `(((name . "Actions")
-            (volatile)
-            (nomark)
-            (candidates . ,actions)
-            (mode-line . ("Action(s)" "TAB:BackToCands RET/f1/f2/fn:NthAct"))
-            (candidate-transformer
-             . (lambda (candidates)
-                 (cl-loop for (i . j) in candidates
-                          for count from 1
-                          collect
-                          (cons (concat (cond ((> count 12)
-                                               "      ")
-                                              ((< count 10)
-                                               (format "[f%s]  " count))
-                                              (t (format "[f%s] " count)))
-                                        (propertize i 'face 'helm-action))
-                                j))))
-            (candidate-number-limit))))
-    (set (make-local-variable 'helm-source-filter) nil)
-    (set (make-local-variable 'helm-selection-overlay) nil)
-    (helm-initialize-overlays helm-action-buffer)))
-
-
-;; Core: selection
-
-(defun helm-display-source-at-screen-top-maybe (unit)
-  "Display source at top of screen when UNIT value is 'source.
-With any other value of UNIT return nil."
-  (when (and helm-display-source-at-screen-top (eq unit 'source))
-    (set-window-start (selected-window)
-                      (save-excursion (forward-line -1) (point)))))
-
-(defun helm-skip-noncandidate-line (direction)
-  "Skip source header or candidates separator when going in DIRECTION.
-Possible value of DIRECTION are 'next or 'previous.
-Same as `helm-skip-header-and-separator-line' but ensure
-point is moved to the right place when at bop or eob."
-  (helm-skip-header-and-separator-line direction)
-  (and (bobp) (forward-line 1))     ; Skip first header.
-  (and (eobp) (forward-line -1)))   ; Avoid last empty line.
-
-(defun helm-skip-header-and-separator-line (direction)
-  "Skip source header or candidate separator when going to next/previous line.
-Possible value of DIRECTION are 'next or 'previous."
-  (let ((fn (cl-ecase direction
-              (next 'eobp)
-              (previous 'bobp))))
-  (while (and (not (funcall fn))
-              (or (helm-pos-header-line-p)
-                  (helm-pos-candidate-separator-p)))
-    (forward-line (if (and (eq direction 'previous)
-                           (not (eq (point-at-bol) (point-min))))
-                      -1 1)))))
-
-(defun helm-display-mode-line (source &optional force)
-  "Setup mode-line and header-line for `helm-buffer'."
-  (set (make-local-variable 'helm-mode-line-string)
-       (helm-interpret-value (or (and (listp source) ; Check if source is empty.
-                                      (assoc-default 'mode-line source))
-                                 (default-value 'helm-mode-line-string))
-                             source))
-  (let ((follow (and (eq (cdr (assq 'follow source)) 1) "(HF) ")))
-    ;; Setup mode-line.
-    (if helm-mode-line-string
-        (setq mode-line-format
-              `(" " mode-line-buffer-identification " "
-                    (:eval (format "L%d" (helm-candidate-number-at-point)))
-                    " " ,follow
-                    (:eval (when ,helm--mode-line-display-prefarg
-                             (let ((arg (prefix-numeric-value
-                                         (or prefix-arg current-prefix-arg))))
-                               (unless (= arg 1)
-                                 (propertize (format "[prefarg:%s] " arg)
-                                             'face 'helm-prefarg)))))
-                    (:eval (helm-show-candidate-number
-                            (car-safe helm-mode-line-string)))
-                    " " helm--mode-line-string-real " " mode-line-end-spaces)
-              helm--mode-line-string-real
-              (substitute-command-keys (if (listp helm-mode-line-string)
-                                           (cadr helm-mode-line-string)
-                                           helm-mode-line-string)))
-        (setq mode-line-format (default-value 'mode-line-format)))
-    ;; Setup header-line.
-    (cond (helm-echo-input-in-header-line
-           (setq force t)
-           (helm--set-header-line))
-          (helm-display-header-line
-           (let* ((hlstr (helm-interpret-value
-                          (and (listp source)
-                               (assoc-default 'header-line source))
-                          source))
-                  (hlend (make-string (max 0 (- (window-width) (length hlstr))) ? )))
-             (setq header-line-format
-                   (propertize (concat " " hlstr hlend) 'face 'helm-header))))))
-  (when force (force-mode-line-update)))
-
-(defun helm--set-header-line (&optional update)
-  (with-helm-window
-    (let* ((comp (with-current-buffer (window-buffer (minibuffer-window))
-                   (if (get-text-property (point) 'read-only)
-                       "" (helm-minibuffer-completion-contents))))
-           (prt (propertize helm--prompt 'face 'minibuffer-prompt))
-           (pos (+ (length prt) (length comp))))
-      (setq header-line-format
-            (concat (propertize " " 'display '(space :width left-fringe)) ; [1]
-                    prt (substring-no-properties helm-pattern) " "))
-      (condition-case _err
-          (put-text-property
-           ;; Increment pos to handle the spaces before prompt and at eol [1].
-           (1+ pos) (+ pos 2) 'face 'cursor header-line-format)
-        (args-out-of-range nil)))
-    (when update (force-mode-line-update))))
-
-(defun helm--update-header-line ()
-  ;; This should be used in `post-command-hook',
-  ;; nowhere else.
-  (when (and (with-helm-buffer
-               helm-echo-input-in-header-line)
-             ;; Ensure we don't update when pattern
-             ;; is empty from post-command-hook, otherwise
-             ;; we loose default-as-input.
-             ;; This will be done after update
-             ;; in helm-display-mode-line.
-             (not (string= helm-pattern "")))
-    (helm--set-header-line t)))
-
-(defun helm-show-candidate-number (&optional name)
-  "Used to display candidate number in mode-line.
-You can specify NAME of candidates e.g \"Buffers\" otherwise
-it is \"Candidate\(s\)\" by default."
-  (when helm-alive-p
-    (unless (helm-empty-source-p)
-      (propertize
-       (format "[%s %s]"
-               (helm-get-candidate-number 'in-current-source)
-               (or name "Candidate(s)"))
-       'face 'helm-candidate-number))))
-
-(cl-defun helm-move-selection-common (&key where direction)
-  "Move the selection marker to a new position.
-Position is determined by WHERE and DIRECTION.
-Key arg WHERE can be one of:
- - line
- - page
- - edge
- - source
-Key arg DIRECTION can be one of:
- - previous
- - next
- - A source or a source name when used with :WHERE 'source."
-  (let ((move-func (cl-case where
-                     (line (cl-ecase direction
-                             (previous 'helm-move--previous-line-fn)
-                             (next 'helm-move--next-line-fn)))
-                     (page (cl-ecase direction
-                             (previous 'helm-move--previous-page-fn)
-                             (next 'helm-move--next-page-fn)))
-                     (edge (cl-ecase direction
-                             (previous 'helm-move--beginning-of-buffer-fn)
-                             (next 'helm-move--end-of-buffer-fn)))
-                     (source (cl-case direction
-                               (previous 'helm-move--previous-source-fn)
-                               (next 'helm-move--next-source-fn)
-                               (t (lambda () ; A source is passed as DIRECTION arg.
-                                    (helm-move--goto-source-fn direction))))))))
-    (unless (or (helm-empty-buffer-p (helm-buffer-get))
-                (not (helm-window)))
-      (with-helm-window
-        (helm-log-run-hook 'helm-move-selection-before-hook)
-        (funcall move-func)
-        (and (memq direction '(next previous))
-             (helm-skip-noncandidate-line direction))
-        (when (helm-pos-multiline-p)
-          (helm-move--beginning-of-multiline-candidate))
-        (helm-display-source-at-screen-top-maybe where)
-        (when (helm-get-previous-header-pos)
-          (helm-mark-current-line))
-        (helm-display-mode-line (helm-get-current-source))
-        (helm-log-run-hook 'helm-move-selection-after-hook)))))
-
-(defun helm-move--beginning-of-multiline-candidate ()
-  (let ((header-pos (helm-get-previous-header-pos))
-        (separator-pos (helm-get-previous-candidate-separator-pos)))
-    (when header-pos
-      (goto-char (if (or (null separator-pos)
-                         (< separator-pos header-pos))
-                     header-pos
-                     separator-pos))
-      (forward-line 1))))
-
-(defun helm-move--previous-multi-line-fn ()
-  (forward-line -1)
-  (unless (helm-pos-header-line-p)
-    (helm-skip-header-and-separator-line 'previous)
-    (helm-move--beginning-of-multiline-candidate)))
-
-(defun helm-move--previous-line-fn ()
-  (if (not (helm-pos-multiline-p))
-      (forward-line -1)
-    (helm-move--previous-multi-line-fn))
-  (when (and helm-move-to-line-cycle-in-source
-             (helm-pos-header-line-p))
-    (forward-line 1)
-    (helm-move--end-of-source)
-    ;; We are at end of helm-buffer
-    ;; check if last candidate is a multiline candidate
-    ;; and jump to it
-    (when (and (eobp)
-               (save-excursion (forward-line -1) (helm-pos-multiline-p)))
-      (helm-move--previous-multi-line-fn))))
-
-(defun helm-move--next-multi-line-fn ()
-  (let ((header-pos (helm-get-next-header-pos))
-        (separator-pos (helm-get-next-candidate-separator-pos)))
-    (cond ((and separator-pos
-                (or (null header-pos) (< separator-pos header-pos)))
-           (goto-char separator-pos))
-          (header-pos
-           (goto-char header-pos)))))
-
-(defun helm-move--next-line-fn ()
-  (if (not (helm-pos-multiline-p))
-      (forward-line 1)
-    (helm-move--next-multi-line-fn))
-  (when (and helm-move-to-line-cycle-in-source
-             (or (save-excursion (and (helm-pos-multiline-p)
-                                      (goto-char (overlay-end
-                                                  helm-selection-overlay))
-                                      (helm-end-of-source-p t)))
-                 (helm-end-of-source-p t)))
-    (helm-move--beginning-of-source)))
-
-(defun helm-move--previous-page-fn ()
-  (condition-case nil
-      (scroll-down)
-    (beginning-of-buffer (goto-char (point-min)))))
-
-(defun helm-move--next-page-fn ()
-  (condition-case nil
-      (scroll-up)
-    (end-of-buffer (goto-char (point-max)))))
-
-(defun helm-move--beginning-of-buffer-fn ()
-  (goto-char (point-min)))
-
-(defun helm-move--end-of-buffer-fn ()
-  (goto-char (point-max)))
-
-(defun helm-move--end-of-source ()
-  (goto-char (or (helm-get-next-header-pos) (point-max)))
-  (when (helm-pos-header-line-p) (forward-line -2)))
-
-(defun helm-move--beginning-of-source ()
-  (goto-char (helm-get-previous-header-pos))
-  (forward-line 1))
-
-(defun helm-move--previous-source-fn ()
-  (forward-line -1)
-  (if (bobp)
-      (goto-char (point-max))
-    (helm-skip-header-and-separator-line 'previous))
-  (goto-char (helm-get-previous-header-pos))
-  (forward-line 1))
-
-(defun helm-move--next-source-fn ()
-  (goto-char (or (helm-get-next-header-pos) (point-min))))
-
-(defun helm-move--goto-source-fn (source-or-name)
-  (goto-char (point-min))
-  (let ((name (if (stringp source-or-name) source-or-name
-                (assoc-default 'name source-or-name))))
-    (condition-case err
-        (while (not (string= name (helm-current-line-contents)))
-          (goto-char (helm-get-next-header-pos)))
-      (error (helm-log "%S" err)))))
-
-(defun helm-candidate-number-at-point ()
-  (with-helm-buffer
-    (or (get-text-property (point) 'helm-cand-num) 1)))
-
-(defun helm--next-or-previous-line (direction &optional arg)
-  ;; Be sure to not use this in non--interactives calls.
-  (let ((helm-move-to-line-cycle-in-source
-         (and helm-move-to-line-cycle-in-source arg)))
-    (if (and arg (> arg 1))
-        (cl-loop with pos = (helm-candidate-number-at-point)
-                 with cand-num = (helm-get-candidate-number t)
-                 with iter = (min arg (- cand-num pos))
-                 for count from 1
-                 while (<= count iter)
-                 do
-                 (helm-move-selection-common :where 'line :direction direction))
-        (helm-move-selection-common :where 'line :direction direction))))
-
-(defun helm-previous-line (&optional arg)
-  "Move selection to the ARG previous line(s).
-Same behavior than `helm-next-line' when called with a numeric prefix arg."
-  (interactive "p")
-  (helm--next-or-previous-line 'previous arg))
-
-(defun helm-next-line (&optional arg)
-  "Move selection to the next ARG line(s).
-When a numeric prefix arg is given and this numeric arg
-is > to the number of candidates, move to last candidate of
-current source (i.e don't move to next source if some)."
-  (interactive "p")
-  (helm--next-or-previous-line 'next arg))
-
-(defun helm-previous-page ()
-  "Move selection back with a pageful."
-  (interactive)
-  (helm-move-selection-common :where 'page :direction 'previous))
-
-(defun helm-next-page ()
-  "Move selection forward with a pageful."
-  (interactive)
-  (helm-move-selection-common :where 'page :direction 'next))
-
-(defun helm-beginning-of-buffer ()
-  "Move selection at the top."
-  (interactive)
-  (helm-move-selection-common :where 'edge :direction 'previous))
-
-(defun helm-end-of-buffer ()
-  "Move selection at the bottom."
-  (interactive)
-  (helm-move-selection-common :where 'edge :direction 'next))
-
-(defun helm-previous-source ()
-  "Move selection to the previous source."
-  (interactive)
-  (helm-move-selection-common :where 'source :direction 'previous))
-
-(defun helm-next-source ()
-  "Move selection to the next source."
-  (interactive)
-  (helm-move-selection-common :where 'source :direction 'next))
-
-(defun helm-goto-source (source-or-name)
-  "Move the selection to the source SOURCE-OR-NAME."
-  (helm-move-selection-common :where 'source :direction source-or-name))
-
-(defun helm--follow-action (arg)
-  (let ((helm--temp-follow-flag t))
-    (when (or (eq last-command 'helm-follow-action-forward)
-              (eq last-command 'helm-follow-action-backward)
-              (eq last-command 'helm-execute-persistent-action))
-      (if (> arg 0)
-          (helm-next-line)
-        (helm-previous-line)))
-    (helm-execute-persistent-action)))
-
-(defun helm-follow-action-forward ()
-  "Go to next line and execute persistent action."
-  (interactive)
-  (helm--follow-action 1))
-
-(defun helm-follow-action-backward ()
-  "Go to previous line and execute persistent action."
-  (interactive)
-  (helm--follow-action -1))
-
-(defun helm-mark-current-line (&optional resumep)
-  "Move `helm-selection-overlay' to current line.
-Note that this is not related with visibles marks, which are used
-to mark candidates."
-  (with-helm-window
-    (when resumep
-      (goto-char helm-selection-point))
-    (move-overlay
-     helm-selection-overlay (point-at-bol)
-     (if (helm-pos-multiline-p)
-         (let ((header-pos (helm-get-next-header-pos))
-               (separator-pos (helm-get-next-candidate-separator-pos)))
-           (or (and (null header-pos) separator-pos)
-               (and header-pos separator-pos
-                    (< separator-pos header-pos)
-                    separator-pos)
-               header-pos
-               (point-max)))
-       (1+ (point-at-eol))))
-    (setq helm-selection-point (overlay-start helm-selection-overlay)))
-  (helm-follow-execute-persistent-action-maybe))
-
-(defun helm-confirm-and-exit-minibuffer ()
-  "Maybe ask for confirmation when exiting helm.
-It is similar to `minibuffer-complete-and-exit' adapted to helm.
-If `minibuffer-completion-confirm' value is 'confirm,
-send in minibuffer confirm message and exit on next hit.
-If `minibuffer-completion-confirm' value is t,
-don't exit and send message 'no match'."
-  (interactive)
-  (if (and (helm--updating-p)
-           (null helm--reading-passwd-or-string))
-      (progn (message "[Display not ready]")
-             (sit-for 0.5) (message nil))
-      (let* ((empty-buffer-p (with-current-buffer helm-buffer
-                               (eq (point-min) (point-max))))
-             (sel (helm-get-selection))
-             (unknown (and (not empty-buffer-p)
-                           (string= (get-text-property
-                                     0 'display
-                                     (helm-get-selection nil 'withprop))
-                                    "[?]"))))
-        (cond ((and (or empty-buffer-p unknown)
-                    (eq minibuffer-completion-confirm 'confirm))
-               (setq helm-minibuffer-confirm-state
-                     'confirm)
-               (setq minibuffer-completion-confirm nil)
-               (minibuffer-message " [confirm]"))
-              ((and (or empty-buffer-p
-                        (unless (if minibuffer-completing-file-name
-                                    (and minibuffer-completion-predicate
-                                         (funcall minibuffer-completion-predicate sel))
-                                    (and (stringp sel)
-                                         ;; SEL may be a cons cell when helm-comp-read
-                                         ;; is called directly with a collection composed
-                                         ;; of (display . real) and real is a cons cell.
-                                         (try-completion sel minibuffer-completion-table
-                                                         minibuffer-completion-predicate)))
-                          unknown))
-                    (eq minibuffer-completion-confirm t))
-               (minibuffer-message " [No match]"))
-              (t
-               (setq helm-minibuffer-confirm-state nil)
-               (helm-exit-minibuffer))))))
-(add-hook 'helm-after-update-hook 'helm-confirm-and-exit-hook)
-
-(defun helm-confirm-and-exit-hook ()
-  "Restore `minibuffer-completion-confirm' when helm update."
-  (unless (or (eq minibuffer-completion-confirm t)
-              (not helm-minibuffer-confirm-state))
-    (setq minibuffer-completion-confirm
-          helm-minibuffer-confirm-state)))
-
-(defun helm-read-string (prompt &optional initial-input history
-                                  default-value inherit-input-method)
-  "Same as `read-string' but for reading string from a helm session."
-  (let ((helm--reading-passwd-or-string t))
-    (read-string
-     prompt initial-input history default-value inherit-input-method)))
-
-(defun helm--updating-p ()
-  ;; helm timer is between two cycles.
-  ;; IOW `helm-check-minibuffer-input' haven't yet compared input
-  ;; and `helm-pattern'.
-  (or (not (equal (minibuffer-contents) helm-pattern))
-      ;; `helm-check-minibuffer-input' have launched `helm-update'.
-      helm--in-update))
-
-(defun helm-maybe-exit-minibuffer ()
-  (interactive)
-  (if (and (helm--updating-p)
-           (null helm--reading-passwd-or-string))
-      (progn (message "[Display not ready]")
-             (sit-for 0.5) (message nil))
-      (helm-exit-minibuffer)))
-
-(defun helm-exit-minibuffer ()
-  "Select the current candidate by exiting the minibuffer."
-  (unless helm-current-prefix-arg
-    (setq helm-current-prefix-arg current-prefix-arg))
-  (setq helm-exit-status 0)
-  (helm-log-run-hook 'helm-exit-minibuffer-hook)
-  (exit-minibuffer))
-
-(defun helm-keyboard-quit ()
-  "Quit minibuffer in helm.
-If action buffer is displayed, kill it."
-  (interactive)
-  (when (get-buffer-window helm-action-buffer 'visible)
-    (kill-buffer helm-action-buffer))
-  (setq helm-exit-status 1)
-  (abort-recursive-edit))
-
-(defun helm-get-next-header-pos ()
-  "Return the position of the next header from point."
-  (next-single-property-change (point) 'helm-header))
-
-(defun helm-get-previous-header-pos ()
-  "Return the position of the previous header from point."
-  (previous-single-property-change (point) 'helm-header))
-
-(defun helm-pos-multiline-p ()
-  "Return non-nil if the current position is in the multiline source region."
-  (get-text-property (point) 'helm-multiline))
-
-(defun helm-get-next-candidate-separator-pos ()
-  "Return the position of the next candidate separator from point."
-  (let ((hp (helm-get-next-header-pos)))
-    (helm-aif (next-single-property-change (point) 'helm-candidate-separator)
-        (or
-         ;; Be sure we don't catch
-         ;; the separator of next source.
-         (and hp (< it hp) it)
-         ;; The separator found is in next source
-         ;; we are at last cand, so use the header pos.
-         (and hp (< hp it) hp)
-         ;; A single source, just try next separator.
-         it))))
-
-(defun helm-get-previous-candidate-separator-pos ()
-  "Return the position of the previous candidate separator from point."
-  (previous-single-property-change (point) 'helm-candidate-separator))
-
-(defun helm-pos-header-line-p ()
-  "Return t if the current line is a header line."
-  (or (get-text-property (point-at-bol) 'helm-header)
-      (get-text-property (point-at-bol) 'helm-header-separator)))
-
-(defun helm-pos-candidate-separator-p ()
-  "Return t if the current line is a candidate separator."
-  (get-text-property (point-at-bol) 'helm-candidate-separator))
-
-
-;;; Debugging
-;;
-;;
-(defun helm-debug-output ()
-  "Show all helm-related variables at this time."
-  (interactive)
-  (helm-help-internal " *Helm Debug*" 'helm-debug-output-function))
-
-(defun helm-debug-output-function (&optional vars)
-  (message "Calculating all helm-related values...")
-  (insert "If you debug some variables or forms, set `helm-debug-variables'
-to a list of forms.\n\n")
-  (cl-dolist (v (or vars
-                    helm-debug-variables
-                    (apropos-internal "^helm-" 'boundp)))
-    (insert "** "
-            (pp-to-string v) "\n"
-            (pp-to-string (with-current-buffer helm-buffer (eval v))) "\n"))
-  (message "Calculating all helm-related values...Done"))
-
-
-;; Core: misc
-(defun helm-kill-buffer-hook ()
-  "Remove tick entry from `helm-tick-hash' and remove buffer from
-`helm-buffers' when killing a buffer."
-  (cl-loop for key being the hash-keys in helm-tick-hash
-        if (string-match (format "^%s/" (regexp-quote (buffer-name))) key)
-        do (remhash key helm-tick-hash))
-  (setq helm-buffers (remove (buffer-name) helm-buffers)))
-(add-hook 'kill-buffer-hook 'helm-kill-buffer-hook)
-
-(defun helm-preselect (candidate-or-regexp &optional source)
-  "Move `helm-selection-overlay' to CANDIDATE-OR-REGEXP on startup.
-Arg CANDIDATE-OR-REGEXP can be a string or a cons cell of two strings.
-When it is a cons cell helm will try to jump first to first element of cons cell
-and then to second, allowing a finer preselection when possible duplicates are
-before the candidate we want to preselect."
-  (with-helm-window
-    (when candidate-or-regexp
-      (if (and helm-force-updating-p source)
-          (helm-goto-source source)
-        (goto-char (point-min))
-        (forward-line 1))
-      (let ((start (point)))
-        (or
-         (if (consp candidate-or-regexp)
-             (and (re-search-forward (car candidate-or-regexp) nil t)
-                  (re-search-forward (cdr candidate-or-regexp) nil t))
-             (re-search-forward candidate-or-regexp nil t))
-         (goto-char start))))
-    (forward-line 0) ; Avoid scrolling right on long lines.
-    (when (helm-pos-multiline-p)
-      (helm-move--beginning-of-multiline-candidate))
-    (when (helm-pos-header-line-p) (forward-line 1))
-    (helm-mark-current-line)))
-
-(defun helm-delete-current-selection ()
-  "Delete the currently selected item."
-  (interactive)
-  (with-helm-window
-    (cond ((helm-pos-multiline-p)
-           (helm-aif (helm-get-next-candidate-separator-pos)
-               (delete-region (point-at-bol)
-                              (1+ (progn (goto-char it) (point-at-eol))))
-             ;; last candidate
-             (goto-char (helm-get-previous-candidate-separator-pos))
-             (delete-region (point-at-bol) (point-max)))
-           (when (helm-end-of-source-p)
-             (goto-char (or (helm-get-previous-candidate-separator-pos)
-                            (point-min)))
-             (forward-line 1)))
-          (t
-           (delete-region (point-at-bol) (1+ (point-at-eol)))
-           (when (helm-end-of-source-p t)
-             (let ((headp (save-excursion
-                            (forward-line -1)
-                            (not (helm-pos-header-line-p)))))
-               (and headp (forward-line -1))))))
-    (unless (helm-end-of-source-p t)
-      (helm-mark-current-line))))
-
-(defun helm-end-of-source-p (&optional at-point)
-  "Return non--nil if we are at eob or end of source."
-  (save-excursion
-    (if (and (helm-pos-multiline-p) (null at-point))
-        (null (helm-get-next-candidate-separator-pos))
-      (forward-line (if at-point 0 1))
-      (or (eq (point-at-bol) (point-at-eol))
-          (helm-pos-header-line-p)
-          (eobp)))))
-
-(defun helm-beginning-of-source-p (&optional at-point)
-  "Return non--nil if we are at bob or beginning of source."
-  (save-excursion
-    (if (and (helm-pos-multiline-p) (null at-point))
-        (null (helm-get-previous-candidate-separator-pos))
-      (forward-line (if at-point 0 -1))
-      (or (eq (point-at-bol) (point-at-eol))
-          (helm-pos-header-line-p)
-          (bobp)))))
-
-(defun helm-edit-current-selection-internal (func)
-  (with-helm-window
-    (forward-line 0)
-    (let ((realvalue (get-text-property (point) 'helm-realvalue))
-          (multiline (get-text-property (point) 'helm-multiline)))
-      (funcall func)
-      (forward-line 0)
-      (and realvalue
-           (put-text-property (point) (point-at-eol)
-                              'helm-realvalue realvalue))
-      (and multiline
-           (put-text-property (point) (point-at-eol)
-                              'helm-multiline multiline))
-      (helm-mark-current-line))))
-
-(defmacro helm-edit-current-selection (&rest forms)
-  "Evaluate FORMS at current selection in the helm buffer.
-Used generally to modify current selection."
-  (declare (indent 0) (debug t))
-  `(helm-edit-current-selection-internal
-    (lambda () ,@forms)))
-
-(defun helm-set-pattern (pattern &optional noupdate)
-  "Set minibuffer contents to PATTERN.
-if optional NOUPDATE is non-nil, helm buffer is not changed."
-  (with-selected-window (or (active-minibuffer-window) (minibuffer-window))
-    (delete-minibuffer-contents)
-    (insert pattern))
-  (when noupdate
-    (setq helm-pattern pattern)))
-
-(defun helm-minibuffer-completion-contents ()
-  "Return the user input in a minibuffer before point as a string.
-That is what completion commands operate on."
-  (buffer-substring (field-beginning) (point)))
-
-(defun helm--delete-minibuffer-contents-from (from-str)
-  ;; Giving an empty string value to FROM-STR delete all.
-  (require 'helm-utils)
-  (let ((input (minibuffer-contents)))
-    (helm-reset-yank-point)
-    (if (> (length input) 0)
-        ;; minibuffer is not empty, delete contents from end
-        ;; of FROM-STR and update.
-        (helm-set-pattern from-str)
-        ;; minibuffer is already empty, force update.
-        (helm-force-update))))
-
-(defun helm-delete-minibuffer-contents (&optional arg)
-  "Delete minibuffer contents.
-When `helm-delete-minibuffer-contents-from-point' is non--nil,
-delete minibuffer contents from point instead of deleting all.
-Giving a prefix arg reverse this behavior.
-When at end of minibuffer delete all."
-  (interactive "P")
-  (let ((str (if helm-delete-minibuffer-contents-from-point
-                 (if (or arg (eobp))
-                     "" (helm-minibuffer-completion-contents))
-                 (if (and arg (not (eobp)))
-                     (helm-minibuffer-completion-contents) ""))))
-    (helm--delete-minibuffer-contents-from str)))
-
-
-;;; Plugins
-;;
-;; Built-in plug-in: type
-(defun helm-compile-source--type (source)
-  (helm-aif (assoc-default 'type source)
-      (append source (assoc-default it helm-type-attributes) nil)
-    source))
-
-;; `define-helm-type-attribute' is public API.
-
-(defun helm-add-type-attribute (type definition)
-  (helm-aif (assq type helm-type-attributes)
-      (setq helm-type-attributes (delete it helm-type-attributes)))
-  (push (cons type definition) helm-type-attributes))
-
-(defun helm-document-type-attribute (type doc)
-  (add-to-list 'helm-types type t)
-  (put type 'helm-typeattrdoc
-       (concat "- " (symbol-name type) "\n\n" doc "\n")))
-
-;; Built-in plug-in: dummy
-(defun helm-dummy-candidate (_candidate _source)
-  "Use `helm-pattern' as CANDIDATE in SOURCE."
-  ;; `source' is defined in filtered-candidate-transformer
-  (list helm-pattern))
-
-(defun helm-compile-source--dummy (source)
-  (if (assoc 'dummy source)
-      (progn
-        (unless (helm-attr-defined
-                 'filtered-candidate-transformer source)
-          (helm-attrset 'filtered-candidate-transformer
-                        'helm-dummy-candidate source))
-        (append source
-                '((candidates "dummy")
-                  (accept-empty)
-                  (match identity)
-                  (volatile))))
-    source))
-
-;; Built-in plug-in: candidates-in-buffer
-(defun helm-candidates-in-buffer (&optional source)
-  "Get candidates from the candidates buffer according to `helm-pattern'.
-
-BUFFER is `helm-candidate-buffer' by default.  Each
-candidate must be placed in one line.  This function is meant to
-be used in candidates-in-buffer or candidates attribute of an
-helm source.  Especially fast for many (1000+) candidates.
-
-eg.
- '((name . \"many files\")
-   (init . (lambda () (with-current-buffer (helm-candidate-buffer 'local)
-                        (insert-many-filenames))))
-   (search re-search-forward)  ; optional
-   (candidates-in-buffer)
-   (type . file))
-
-+===============================================================+
-| The new way of making and narrowing candidates: Using buffers |
-+===============================================================+
-
-By default, `helm' makes candidates by evaluating the
-candidates function, then narrows them by `string-match' for each
-candidate.
-
-But this way is very slow for many candidates. The new way is
-storing all candidates in a buffer and narrowing them by
-`re-search-forward'. Search function is customizable by search
-attribute. The important point is that buffer processing is MUCH
-FASTER than string list processing and is the Emacs way.
-
-The init function writes all candidates to a newly-created
-candidate buffer.  The candidates buffer is created or specified
-by `helm-candidate-buffer'.  Candidates are stored in a line.
-
-The candidates function narrows all candidates, IOW creates a
-subset of candidates dynamically. It is the task of
-`helm-candidates-in-buffer'.  As long as
-`helm-candidate-buffer' is used,`(candidates-in-buffer)' is
-sufficient in most cases.
-
-Note that `(candidates-in-buffer)' is shortcut of three attributes:
-  (candidates . helm-candidates-in-buffer)
-  (volatile)
-  (match identity)
-And `(candidates-in-buffer . func)' is shortcut of three attributes:
-  (candidates . func)
-  (volatile)
-  (match identity)
-The expansion is performed in `helm-get-sources'.
-
-The candidates-in-buffer attribute implies the volatile attribute.
-The volatile attribute is needed because `helm-candidates-in-buffer'
-creates candidates dynamically and need to be called everytime
-`helm-pattern' changes.
-
-Because `helm-candidates-in-buffer' plays the role of `match' attribute
-function, specifying `(match identity)' makes the source slightly faster.
-
-However if source contain match-part attribute, match is computed only
-on part of candidate returned by the call of function provided by this attribute.
-The function should have one arg, candidate, and return only
-a specific part of candidate.
-
-To customize `helm-candidates-in-buffer' behavior, use `search',
-`get-line' and `match-part' attributes."
-  (let ((src (or source (helm-get-current-source))))
-    (helm-candidates-in-buffer-1
-     (helm-candidate-buffer)
-     helm-pattern
-     (or (assoc-default 'get-line src)
-         #'buffer-substring-no-properties)
-     (or (assoc-default 'search src)
-         '(helm-candidates-in-buffer-search-default-fn))
-     (helm-candidate-number-limit src)
-     (helm-attr 'match-part)
-     src)))
-
-(defun helm-candidates-in-buffer-search-default-fn (pattern)
-  "Search PATTERN with `re-search-forward' with bound and noerror args."
-  (condition-case _err
-      (re-search-forward pattern nil t)
-    (invalid-regexp nil)))
-
-(defun helm-candidates-in-buffer-1 (buffer pattern get-line-fn
-                                    search-fns limit
-                                    match-part-fn source)
-  "Return the list of candidates inserted in BUFFER matching PATTERN."
-  ;; buffer == nil when candidates buffer does not exist.
-  (when buffer
-    (with-current-buffer buffer
-      (let ((inhibit-point-motion-hooks t)
-            (start-point (1- (point-min))))
-        (goto-char start-point)
-        (if (string= pattern "")
-            (helm-initial-candidates-from-candidate-buffer
-             get-line-fn limit)
-          (helm-search-from-candidate-buffer
-           pattern get-line-fn search-fns limit
-           start-point match-part-fn source))))))
-
-(defun helm-search-from-candidate-buffer (pattern get-line-fn search-fns
-                                          limit start-point match-part-fn source)
-  (let (buffer-read-only
-        matches
-        newmatches
-        (case-fold-search (helm-set-case-fold-search)))
-    (helm--search-from-candidate-buffer-1
-     (lambda ()
-       (clrhash helm-cib-hash)
-       (cl-dolist (searcher search-fns)
-         (goto-char start-point)
-         (forward-line 1) ; >>>[1]
-         (setq newmatches nil)
-         (cl-loop with pos-lst
-                  with item-count = 0
-                  while (and (setq pos-lst (funcall searcher pattern))
-                             (not (eobp)))
-                  for cand = (apply get-line-fn
-                                    (if (and pos-lst (listp pos-lst))
-                                        pos-lst
-                                        (list (point-at-bol) (point-at-eol))))
-                  when (and (not (gethash cand helm-cib-hash))
-                            (or
-                             ;; Always collect when cand is matched by searcher funcs
-                             ;; and match-part attr is not present.
-                             (and (not match-part-fn)
-                                  (not (consp pos-lst)))
-                             ;; If match-part attr is present, or if SEARCHER fn
-                             ;; returns a cons cell, collect PATTERN only if it
-                             ;; match the part of CAND specified by the match-part func.
-                             (helm-search-match-part cand pattern (or match-part-fn #'identity))))
-                  do (helm--accumulate-candidates
-                      cand newmatches helm-cib-hash item-count limit source))
-         (setq matches (append matches (nreverse newmatches))))
-       (delq nil matches)))))
-
-(defun helm-search-match-part (candidate pattern match-part-fn)
-  "Match PATTERN only on part of CANDIDATE returned by MATCH-PART-FN.
-Because `helm-search-match-part' maybe called even if unspecified
-in source (negation), MATCH-PART-FN default to `identity' to match whole candidate.
-When using fuzzy matching and negation (i.e \"!\"), this function is always called."
-  (let ((part (funcall match-part-fn candidate))
-        (fuzzy-regexp (cadr (gethash 'helm-pattern helm--fuzzy-regexp-cache))))
-    (if (string-match " " pattern)
-        (cl-loop for i in (split-string pattern) always
-                 (if (string-match "\\`!" i)
-                     (not (string-match (substring i 1) part))
-                     (string-match i part)))
-        (if (string-match "\\`!" pattern)
-            (not (string-match (if helm--in-fuzzy
-                                   ;; Fuzzy regexp have already been
-                                   ;; computed with substring 1.
-                                   fuzzy-regexp
-                                   (substring 1 pattern))
-                               part))
-            (string-match (if helm--in-fuzzy fuzzy-regexp pattern)
-                          part)))))
-
-(defun helm-initial-candidates-from-candidate-buffer (get-line-fn limit)
-  (delq nil (cl-loop for i from 1 to limit
-                     until (eobp)
-                     collect (funcall get-line-fn
-                                      (point-at-bol) (point-at-eol))
-                     do (forward-line 1))))
-
-(defun helm--search-from-candidate-buffer-1 (search-fn)
-  ;; We are adding a newline at bob and at eol
-  ;; and removing these newlines afterward.
-  ;; This is a bad hack that should be removed.
-  ;; To avoid matching the empty line at first line
-  ;; when searching with e.g occur and "^$" just
-  ;; forward-line before searching (See >>>[1] above).
-  (goto-char (point-min))
-  (insert "\n")
-  (goto-char (point-max))
-  (insert "\n")
-  (unwind-protect
-       (funcall search-fn)
-    (goto-char (point-min))
-    (delete-char 1)
-    (goto-char (1- (point-max)))
-    (delete-char 1)
-    (set-buffer-modified-p nil)))
-
-(defun helm-candidate-buffer (&optional create-or-buffer)
-  "Register and return a buffer containing candidates of current source.
-`helm-candidate-buffer' searches buffer-local candidates buffer first,
-then global candidates buffer.
-
-Acceptable values of CREATE-OR-BUFFER:
-
-- nil (omit)
-  Only return the candidates buffer.
-- a buffer
-  Register a buffer as a candidates buffer.
-- 'global
-  Create a new global candidates buffer,
-  named \" *helm candidates:SOURCE*\".
-- other non-nil value
-  Create a new local candidates buffer,
-  named \" *helm candidates:SOURCE*HELM-CURRENT-BUFFER\"."
-  (let* ((global-bname (format " *helm candidates:%s*"
-                               helm-source-name))
-         (local-bname (format " *helm candidates:%s*%s"
-                              helm-source-name
-                              (buffer-name helm-current-buffer)))
-         (register-func #'(lambda ()
-                            (setq helm-candidate-buffer-alist
-                                  (cons (cons helm-source-name create-or-buffer)
-                                        (delete (assoc helm-source-name
-                                                       helm-candidate-buffer-alist)
-                                                helm-candidate-buffer-alist)))))
-         (kill-buffers-func #'(lambda ()
-                                (cl-loop for b in (buffer-list)
-                                      if (string-match (format "^%s" (regexp-quote global-bname))
-                                                       (buffer-name b))
-                                      do (kill-buffer b))))
-         (create-func #'(lambda ()
-                          (with-current-buffer
-                              (get-buffer-create (if (eq create-or-buffer 'global)
-                                                     global-bname
-                                                   local-bname))
-                            (buffer-disable-undo)
-                            (erase-buffer)
-                            (font-lock-mode -1))))
-         (return-func #'(lambda ()
-                          (or (get-buffer local-bname)
-                              (get-buffer global-bname)
-                              (helm-aif (assoc-default helm-source-name
-                                                       helm-candidate-buffer-alist)
-                                  (and (buffer-live-p it) it))))))
-    (when create-or-buffer
-      (funcall register-func)
-      (unless (bufferp create-or-buffer)
-        (and (eq create-or-buffer 'global) (funcall kill-buffers-func))
-        (funcall create-func)))
-    (funcall return-func)))
-
-(defun helm-init-candidates-in-buffer (buffer data)
-  "Register BUFFER with DATA for a helm candidates-in-buffer session.
-Arg BUFFER can be a string, a buffer object (bufferp), or a symbol,
-either 'local or 'global which is passed to `helm-candidate-buffer'.
-Arg DATA can be either a list or a plain string.
-Returns the resulting buffer."
-  (declare (indent 1))
-  (let ((buf (helm-candidate-buffer
-              (if (or (stringp buffer)
-                      (bufferp buffer))
-                  (get-buffer-create buffer)
-                buffer)))) ; a symbol.
-    (with-current-buffer buf
-      (erase-buffer)
-      (if (listp data)
-          (insert (mapconcat (lambda (i)
-                               (cond ((symbolp i) (symbol-name i))
-                                     ((numberp i) (number-to-string i))
-                                     (t i)))
-                             data "\n"))
-        (and (stringp data) (insert data))))
-    buf))
-
-(defun helm-compile-source--candidates-in-buffer (source)
-  (helm-aif (assoc 'candidates-in-buffer source)
-      (append source
-              `((candidates . ,(or (cdr it)
-                                   (lambda ()
-                                     (helm-candidates-in-buffer source))))
-                (volatile) (match identity)))
-    source))
-
-
-;;; Resplit helm window
-;;
-;;
-(defun helm-toggle-resplit-window ()
-  "Toggle resplit helm window, vertically or horizontally."
-  (interactive)
-  (when helm-prevent-escaping-from-minibuffer
-    (helm-prevent-switching-other-window :enabled nil))
-  (unwind-protect
-       (with-helm-window
-         (if (or helm-full-frame (one-window-p t))
-             (message "Error: Attempt to resplit a single window")
-           (let ((before-height (window-height)))
-             (delete-window)
-             (set-window-buffer
-              (select-window
-               (if (= (window-height) before-height) ; initial split was horizontal.
-                   ;; Split window vertically with `helm-buffer' placed
-                   ;; on the good side according to actual value of
-                   ;; `helm-split-window-default-side'.
-                   (prog1
-                       (cond ((or (eq helm-split-window-default-side 'above)
-                                  (eq helm-split-window-default-side 'left))
-                              (split-window
-                               (selected-window) nil 'above))
-                             (t (split-window-vertically)))
-                     (setq helm-split-window-state 'vertical))
-                 ;; Split window vertically, same comment as above.
-                 (setq helm-split-window-state 'horizontal)
-                 (cond ((or (eq helm-split-window-default-side 'left)
-                            (eq helm-split-window-default-side 'above))
-                        (split-window (selected-window) nil 'left))
-                       (t (split-window-horizontally)))))
-              helm-buffer)))
-         (setq helm--window-side-state (helm--get-window-side-state)))
-    (when helm-prevent-escaping-from-minibuffer
-      (helm-prevent-switching-other-window :enabled t))))
-
-;; Utility: Resize helm window.
-(defun helm-enlarge-window-1 (n)
-  "Enlarge or narrow helm window.
-If N is positive enlarge, if negative narrow."
-  (unless helm-full-frame
-    (let ((horizontal-p (eq helm-split-window-state 'horizontal)))
-      (with-helm-window
-        (enlarge-window n horizontal-p)))))
-
-(defun helm-narrow-window ()
-  "Narrow helm window."
-  (interactive)
-  (helm-enlarge-window-1 -1))
-
-(defun helm-enlarge-window ()
-  "Enlarge helm window."
-  (interactive)
-  (helm-enlarge-window-1 1))
-
-(defun helm-swap-windows ()
-  "Swap window holding `helm-buffer' with other window."
-  (interactive)
-  (if (and helm-full-frame (one-window-p t))
-      (error "Error: Can't swap windows in a single window")
-    (let* ((w1          (helm-window))
-           (split-state (eq helm-split-window-state 'horizontal))
-           (w1size      (window-total-size w1 split-state))
-           (b1          (window-buffer w1)) ; helm-buffer
-           (s1          (window-start w1))
-           (cur-frame   (window-frame w1))
-           (w2          (with-selected-window (helm-window)
-                          ;; Don't try to display helm-buffer
-                          ;; in a dedicated window.
-                          (get-window-with-predicate
-                           (lambda (w) (not (window-dedicated-p w)))
-                           1 cur-frame)))
-           (w2size      (window-total-size w2 split-state))
-           (b2          (window-buffer w2)) ; probably helm-current-buffer
-           (s2          (window-start w2))
-           resize)
-      (with-selected-frame (window-frame w1)
-        (helm-replace-buffer-in-window w1 b1 b2)
-        (helm-replace-buffer-in-window w2 b2 b1)
-        (setq resize
-              (cond ( ;; helm-window is smaller than other window.
-                     (< w1size w2size)
-                     (- (- (max w2size w1size)
-                           (min w2size w1size))))
-                    ( ;; helm-window is larger than other window.
-                     (> w1size w2size)
-                     (- (max w2size w1size)
-                        (min w2size w1size)))
-                    ( ;; windows have probably same size.
-                     t nil)))
-        ;; Maybe resize the window holding helm-buffer.
-        (and resize (window-resize w2 resize split-state))
-        (set-window-start w1 s2 t)
-        (set-window-start w2 s1 t))
-      (setq helm--window-side-state (helm--get-window-side-state)))))
-
-(defun helm--get-window-side-state ()
-  "Return the position of `helm-window' from `helm-current-buffer'.
-Possible values are 'left 'right 'below or 'above."
-  (let ((side-list '(left right below above)))
-    (cl-loop for side in side-list
-          thereis (and (equal (helm-window)
-                              (window-in-direction
-                               side (get-buffer-window helm-current-buffer t)
-                               t))
-                       side))))
-
-(defun helm-replace-buffer-in-window (window buffer1 buffer2)
-  "Replace BUFFER1 by BUFFER2 in WINDOW registering BUFFER1."
-  (when (get-buffer-window buffer1)
-    (unrecord-window-buffer window buffer1)
-    (set-window-buffer window buffer2)))
-
-;; Utility: select another action by key
-(defun helm-select-nth-action (n)
-  "Select the N nth action for the currently selected candidate."
-  (setq helm-saved-selection (helm-get-selection))
-  (unless helm-saved-selection
-    (error "Nothing is selected"))
-  (setq helm-saved-action
-        (helm-get-nth-action
-         n
-         (if (get-buffer-window helm-action-buffer 'visible)
-             (assoc-default 'candidates (helm-get-current-source))
-             (helm-get-actions-from-current-source))))
-  (helm-maybe-exit-minibuffer))
-
-(defun helm-get-nth-action (n action)
-  (cond ((and (zerop n) (functionp action))
-         action)
-        ((listp action)
-         (or (cdr (elt action n))
-             (error "No such action")))
-        ((and (functionp action) (< 0 n))
-         (error "Sole action"))
-        (t
-         (error "Error in `helm-select-nth-action'"))))
-
-;; Utility: Persistent Action
-(defmacro with-helm-display-same-window (&rest body)
-  "Execute BODY in the window used for persistent action.
-Make `pop-to-buffer' and `display-buffer' display in the same window."
-  (declare (indent 0) (debug t))
-  `(let ((display-buffer-function 'helm-persistent-action-display-buffer))
-     ,@body))
-
-(defun helm-initialize-persistent-action ()
-  (set (make-local-variable 'helm-persistent-action-display-window) nil))
-
-(cl-defun helm-execute-persistent-action
-    (&optional (attr 'persistent-action) split-onewindow)
-  "Perform the associated action ATTR without quitting helm.
-ATTR default is 'persistent-action', but it can be anything else.
-In this case you have to add this new attribute to your source.
-
-When `helm-full-frame' or SPLIT-ONEWINDOW are non--nil,
-and `helm-buffer' is displayed in only one window,
-the helm window is splitted to display
-`helm-select-persistent-action-window' in other window
-and keep its visibility."
-  (interactive)
-  (helm-log "executing persistent-action")
-  (let* ((attr-val (assoc-default attr (helm-get-current-source)))
-         ;; If attr value is a cons, use its car as persistent function
-         ;; and its car to decide if helm window should be splitted.
-         (fn       (if (and (consp attr-val)
-                            ;; maybe a lambda.
-                            (not (functionp attr-val)))
-                       (car attr-val) attr-val))
-         (no-split (and (consp attr-val)
-                        (not (functionp attr-val))
-                        (cdr attr-val))))
-    (with-helm-window
-      (save-selected-window
-        (if no-split
-            (helm-select-persistent-action-window)
-          (helm-select-persistent-action-window
-           (or split-onewindow helm-onewindow-p)))
-        (helm-log "current-buffer = %S" (current-buffer))
-        (let ((helm-in-persistent-action t))
-          (with-helm-display-same-window
-            (helm-execute-selection-action-1
-             nil (or fn (helm-get-actions-from-current-source)) t)
-            (helm-log-run-hook 'helm-after-persistent-action-hook))
-          ;; A typical case is when a persistent action delete
-          ;; the buffer already displayed in
-          ;; `helm-persistent-action-display-window' and `helm-full-frame'
-          ;; is enabled, we end up with the `helm-buffer'
-          ;; displayed in two windows.
-          (when (and helm-onewindow-p
-                     (> (length (window-list)) 1)
-                     (equal (buffer-name
-                             (window-buffer
-                              helm-persistent-action-display-window))
-                            (helm-buffer-get)))
-            (delete-other-windows)))))))
-
-(defun helm-persistent-action-display-window (&optional split-onewindow)
-  "Return the window that will be used for persistent action.
-If SPLIT-ONEWINDOW is non--nil window will be splitted in persistent action."
-  (with-helm-window
-    (setq helm-persistent-action-display-window
-          (cond ((and (window-live-p helm-persistent-action-display-window)
-                      (not (member helm-persistent-action-display-window
-                                   (get-buffer-window-list helm-buffer))))
-                 helm-persistent-action-display-window)
-                (split-onewindow (split-window))
-                ((get-buffer-window helm-current-buffer))
-                (t (next-window (selected-window) 1))))))
-
-(defun helm-select-persistent-action-window (&optional split-onewindow)
-  "Select the window that will be used for persistent action.
-See `helm-persistent-action-display-window' for how to use SPLIT-ONEWINDOW."
-  (select-window (get-buffer-window (helm-buffer-get)))
-  (select-window
-   (setq minibuffer-scroll-window
-         (helm-persistent-action-display-window split-onewindow))))
-
-(defun helm-persistent-action-display-buffer (buf &optional  action)
-  "Make `pop-to-buffer' and `display-buffer' display in the same window.
-If `helm-persistent-action-use-special-display' is non-nil and
-BUF is to be displayed by `special-display-function', use it.
-Otherwise ignores `special-display-buffer-names' and `special-display-regexps'.
-Argument ACTION if present will be used as second argument of `display-buffer'."
-  (let* ((name (buffer-name buf))
-         display-buffer-function pop-up-windows pop-up-frames
-         ;; Disable `special-display-regexps' and `special-display-buffer-names'
-         ;; unless `helm-persistent-action-use-special-display' is non--nil.
-         (special-display-buffer-names
-          (and helm-persistent-action-use-special-display
-               special-display-buffer-names))
-         (special-display-regexps
-          (and helm-persistent-action-use-special-display
-               special-display-regexps))
-         (same-window-regexps
-          (unless (and helm-persistent-action-use-special-display
-                       (or (member name
-                                   (mapcar (lambda (x) (or (car-safe x) x))
-                                           special-display-buffer-names))
-                           (cl-loop for x in special-display-regexps
-                                 thereis (string-match (or (car-safe x) x)
-                                                       name))))
-            '("."))))
-    ;; Don't loose minibuffer when displaying persistent window in
-    ;; another frame.
-    ;; This happen when the displayed persistent buffer-name is one of
-    ;; `special-display-buffer-names' or match `special-display-regexps'
-    ;; and `helm-persistent-action-use-special-display' is enabled.
-    (with-selected-window (if (or special-display-regexps
-                                  special-display-buffer-names)
-                              (minibuffer-window)
-                            (selected-window))
-      ;; Be sure window of BUF is not dedicated.
-      (set-window-dedicated-p (get-buffer-window buf) nil)
-      (display-buffer buf action))))
-
-;; scroll-other-window(-down)? for persistent-action
-(defun helm-other-window-base (command &optional scroll-amount)
-  (setq scroll-amount (unless (eq scroll-amount 'noscroll)
-                        helm-scroll-amount))
-  (with-selected-window (helm-persistent-action-display-window)
-    (funcall command scroll-amount)))
-
-(defun helm-scroll-other-window ()
-  "Scroll other window (not *Helm* window) upward."
-  (interactive)
-  (helm-other-window-base 'scroll-up))
-
-(defun helm-scroll-other-window-down ()
-  "Scroll other window (not *Helm* window) downward."
-  (interactive)
-  (helm-other-window-base 'scroll-down))
-
-(defun helm-recenter-top-bottom-other-window ()
-  "`recenter-top-bottom' in other window (not *Helm* window)."
-  (interactive)
-  (helm-other-window-base 'recenter-top-bottom 'noscroll))
-
-(defun helm-reposition-window-other-window ()
-  "`helm-reposition-window' in other window (not *Helm* window)."
-  (interactive)
-  (helm-other-window-base 'reposition-window 'noscroll))
-
-
-
-;; Utility: Visible Mark
-
-(defun helm-clear-visible-mark ()
-  (with-current-buffer (helm-buffer-get)
-    (mapc 'delete-overlay helm-visible-mark-overlays)
-    (set (make-local-variable 'helm-visible-mark-overlays) nil)))
-
-(defun helm-this-visible-mark ()
-  (cl-loop for o in helm-visible-mark-overlays
-        when (equal (point-at-bol) (overlay-start o))
-        return o))
-
-(defun helm-delete-visible-mark (overlay)
-  (setq helm-marked-candidates
-        (remove
-         (cons (helm-get-current-source) (helm-get-selection))
-         helm-marked-candidates))
-  (delete-overlay overlay)
-  (setq helm-visible-mark-overlays
-        (delq overlay helm-visible-mark-overlays)))
-
-(defun helm-make-visible-mark ()
-  (let ((o (make-overlay (point-at-bol)
-                          (if (helm-pos-multiline-p)
-                              (or (helm-get-next-candidate-separator-pos)
-                                  (point-max))
-                            (1+ (point-at-eol))))))
-    (overlay-put o 'priority 0)
-    (overlay-put o 'face   'helm-visible-mark)
-    (overlay-put o 'source (assoc-default 'name (helm-get-current-source)))
-    (overlay-put o 'string (buffer-substring (overlay-start o) (overlay-end o)))
-    (overlay-put o 'real   (helm-get-selection))
-    (add-to-list 'helm-visible-mark-overlays o))
-  (push (cons (helm-get-current-source) (helm-get-selection))
-        helm-marked-candidates))
-
-(defun helm-toggle-visible-mark ()
-  "Toggle helm visible mark at point."
-  (interactive)
-  (with-helm-window
-    (let ((nomark (assq 'nomark (helm-get-current-source))))
-      (if nomark
-          (message "Marking not allowed in this source")
-        (helm-aif (helm-this-visible-mark)
-            (helm-delete-visible-mark it)
-          (helm-make-visible-mark))
-        (unless (helm-end-of-source-p)
-          (helm-next-line))))))
-
-(defun helm-mark-all ()
-  "Mark all visible unmarked candidates in current source."
-  (interactive)
-  (require 'helm-files)
-  (with-helm-window
-    (let ((nomark (assq 'nomark (helm-get-current-source)))
-          (follow (if helm-follow-mode 1 -1)))
-      (helm-follow-mode -1)
-      (unwind-protect
-           (if nomark
-               (message "Marking not allowed in this source")
-               (save-excursion
-                 (goto-char (helm-get-previous-header-pos))
-                 (helm-next-line)
-                 (let* ((next-head (helm-get-next-header-pos))
-                        (end       (and next-head
-                                        (save-excursion
-                                          (goto-char next-head)
-                                          (forward-line -1)
-                                          (point))))
-                        (maxpoint  (or end (point-max))))
-                   (while (< (point) maxpoint)
-                     (helm-mark-current-line)
-                     (let* ((prefix (get-text-property (point-at-bol) 'display))
-                            (cand   (helm-get-selection))
-                            (bn     (and (helm-file-completion-source-p)
-                                         (helm-basename cand)))
-                            (src-name    (assoc-default 'name
-                                                   (helm-get-current-source))))
-                       (when (and (not (helm-this-visible-mark))
-                                  (not (or (string= prefix "[?]")
-                                           (string= prefix "[@]"))))
-                         ;; Don't mark possibles directories ending with . or ..
-                         ;; autosave files/links and non--existent file.
-                         (unless
-                             (and (or (helm-file-completion-source-p)
-                                      (string=
-                                       src-name "Files from Current Directory"))
-                                  (or (string-match
-                                       "^[.]?#.*#?$\\|[^#]*[.]\\{1,2\\}$" bn)
-                                      ;; We need to test here when not using
-                                      ;; a transformer that tag prefix
-                                      ;; (i.e on tramp).
-                                      (not (file-exists-p cand))))
-                           (helm-make-visible-mark))))
-                     (if (helm-pos-multiline-p)
-                         (progn
-                           (goto-char
-                            (or (helm-get-next-candidate-separator-pos)
-                                (point-max)))
-                           (forward-line 1))
-                         (forward-line 1))
-                     (end-of-line))))
-               (helm-mark-current-line)
-               (message "%s candidates marked" (length helm-marked-candidates)))
-        (helm-follow-mode follow) (message nil)))))
-
-(defun helm-unmark-all ()
-  "Unmark all candidates in all sources of current helm session."
-  (interactive)
-  (with-helm-window
-    (let ((len (length helm-marked-candidates)))
-      (save-excursion
-        (helm-clear-visible-mark))
-      (setq helm-marked-candidates nil)
-      (helm-mark-current-line)
-      (message "%s candidates unmarked" len))))
-
-(defun helm-toggle-all-marks ()
-  "Toggle all marks.
-Mark all visible candidates of current source or unmark all candidates
-visible or invisible in all sources of current helm session"
-  (interactive)
-  (let ((marked (helm-marked-candidates)))
-    (if (and (>= (length marked) 1)
-             (with-helm-window helm-visible-mark-overlays))
-        (helm-unmark-all)
-      (helm-mark-all))))
-
-(cl-defun helm-marked-candidates (&key with-wildcard)
-  "Return marked candidates of current source if any.
-Otherwise one element list of current selection.
-When key WITH-WILDCARD is specified try to expand a wilcard if some."
-  (with-current-buffer helm-buffer
-    (cl-loop with current-src = (helm-get-current-source)
-          for (source . real) in
-          (or (reverse helm-marked-candidates)
-              (list (cons current-src (helm-get-selection))))
-          when (equal (assoc 'name current-src)
-                      (assoc 'name source))
-          ;; When real is a normal filename without wildcard
-          ;; file-expand-wildcards returns a list of one file.
-          ;; When real is a non--existent file it return nil.
-          append (let* ((elm (helm-coerce-selection real source))
-                        (c   (and with-wildcard
-                                  (condition-case nil
-                                      (helm-file-expand-wildcards elm t)
-                                    (error nil)))))
-                   (or c (list elm)))
-          into cands
-          finally do (prog1 (cl-return cands)
-                       (helm-log "Marked candidates = %S" cands)))))
-
-(defun helm-file-expand-wildcards (pattern &optional full)
-  "Same as `file-expand-wildcards' but allow recursion.
-Recursion happen when PATTERN starts with two stars.
-Directories expansion is not supported."
-  (require 'helm-utils)
-  (let ((bn (helm-basename pattern)))
-    (if (and helm-file-globstar
-             (string-match "\\`\\*\\{2\\}\\(.*\\)" bn))
-        (helm-walk-directory (helm-basedir pattern)
-                             :path (cl-case full
-                                     (full 'full)
-                                     (relative 'relative)
-                                     ((basename nil) 'basename)
-                                     (t 'full))
-                             :directories nil
-                             :match (wildcard-to-regexp bn)
-                             :skip-subdirs t)
-        (file-expand-wildcards pattern full))))
-
-(defun helm-current-source-name= (name)
-  (save-excursion
-    (goto-char (helm-get-previous-header-pos))
-    (equal name (helm-current-line-contents))))
-
-(defun helm-revive-visible-mark ()
-  "Restore marked candidates when helm update display."
-  (with-current-buffer helm-buffer
-    (cl-dolist (o helm-visible-mark-overlays)
-      (goto-char (point-min))
-      (while (and (search-forward (overlay-get o 'string) nil t)
-                  (helm-current-source-name= (overlay-get o 'source)))
-        ;; Calculate real value of candidate.
-        ;; It can be nil if candidate have only a display value.
-        (let ((real (get-text-property (point-at-bol 0) 'helm-realvalue)))
-          (if real
-              ;; Check if real value of current candidate is the same
-              ;; than the one stored in overlay.
-              ;; This is needed when some cands have same display names.
-              ;; Using equal allow testing any type of value for real cand.
-              ;; Issue (#706).
-              (and (equal (overlay-get o 'real) real)
-                   (move-overlay o (point-at-bol 0) (1+ (point-at-eol 0))))
-            (move-overlay o (point-at-bol 0) (1+ (point-at-eol 0)))))))))
-(add-hook 'helm-update-hook 'helm-revive-visible-mark)
-
-(defun helm-next-point-in-list (curpos points &optional prev)
-  (cond
-    ;; rule out special cases.
-    ((null points) curpos)
-    ((and prev (<= curpos (car points)))
-     (nth (1- (length points)) points))
-    ((< (car (last points)) curpos)
-     (if prev (car (last points)) (nth 0 points)))
-    ((and (not prev) (>= curpos (car (last points))))
-     (nth 0 points))
-    (t
-     (nth (if prev
-              (cl-loop for pt in points
-                    for i from 0
-                    if (<= curpos pt) return (1- i))
-            (cl-loop for pt in points
-                  for i from 0
-                  if (< curpos pt) return i))
-          points))))
-
-(defun helm-next-visible-mark (&optional prev)
-  "Move next helm visible mark.
-If PREV is non-nil move to precedent."
-  (interactive)
-  (with-helm-window
-    (ignore-errors
-      (goto-char (helm-next-point-in-list
-                  (point)
-                  (sort (mapcar 'overlay-start helm-visible-mark-overlays) '<)
-                  prev)))
-    (helm-mark-current-line)))
-
-(defun helm-prev-visible-mark ()
-  "Move previous helm visible mark."
-  (interactive)
-  (helm-next-visible-mark t))
-
-;;; Utility: Selection Paste
-;;
-(defun helm-yank-selection (arg)
-  "Set minibuffer contents to current display selection.
-With a prefix arg set to real value of current selection."
-  (interactive "P")
-  (let ((str (helm-get-selection nil (not arg))))
-    (kill-new str)
-    (helm-set-pattern str)))
-
-(defun helm-kill-selection-and-quit (arg)
-  "Store display value of current selection to kill ring.
-With a prefix arg set to real value of current selection.
-Display value is what you see in `helm-buffer' and real value
-is what is used to perform actions."
-  (interactive "P")
-  (helm-run-after-quit
-   (lambda (sel)
-     (kill-new sel)
-     (message "Killed: %s" sel))
-   (helm-get-selection nil (not arg))))
-
-(defun helm-copy-to-buffer ()
-  "Copy selection or marked candidates to `helm-current-buffer'."
-  (interactive)
-  (with-helm-buffer
-    (cl-loop for cand in (helm-marked-candidates)
-             do (with-helm-current-buffer
-                  (insert cand "\n")))))
-
-
-;;; Follow-mode: Automatical execution of persistent-action
-;;
-;;
-(defun helm-follow-mode (&optional arg)
-  "Execute persistent action everytime the cursor is moved when enabled.
-The mode is enabled for the current source only, you will have to turn it
-on again when you go to next source if you want it there also.
-This mode can be enabled or disabled interactively at anytime during
-helm session or enabled specifically by source by adding the `follow'
-attribute to this source.
-Even when the attribute `follow' exists in source, it is still possible
-to disable/enable this mode interactively.
-Note that when you disable it interactively and `follow' attribute exists,
-`helm-follow-mode' will be disabled on next helm session even if `follow'
-attribute is specified in source. To avoid this set your `follow' attribute
-in source in `helm-before-initialize-hook'.
-
-e.g:
-
-\(add-hook 'helm-before-initialize-hook
-          #'(lambda () (helm-attrset 'follow 1 helm-source-buffers-list)))
-
-This will enable `helm-follow-mode' automatically in `helm-source-buffers-list'."
-  (interactive "p")
-  (with-current-buffer helm-buffer
-    (let* ((src      (helm-get-current-source))
-           (name     (assoc-default 'name src))
-           (sym      (cl-loop for s in helm-sources
-                           for sname = (and (symbolp s)
-                                            (assoc-default
-                                             'name (symbol-value s)))
-                           thereis (and sname (string= sname name) s)))
-           (fol-attr (assq 'follow src))
-           (enabled  (or
-                      ;; If `helm-follow-mode' is called with a negative
-                      ;; ARG, assume follow is already enabled.
-                      ;; i.e turn it off now.
-                      (< arg 0)
-                      (eq (cdr fol-attr) 1)
-                      helm-follow-mode)))
-      (if src
-          (progn
-            (if (eq (cdr fol-attr) 'never)
-                (message "helm-follow-mode not allowed in this source")
-                ;; Make follow attr persistent for this emacs session.
-                (helm-attrset 'follow (if enabled -1 1) src)
-                (setq helm-follow-mode (not enabled))
-                (message "helm-follow-mode is %s"
-                         (if helm-follow-mode
-                             "enabled" "disabled"))
-                (helm-display-mode-line src))
-            (unless helm-follow-mode-persistent
-              (and sym (set sym (remove (assq 'follow src) src)))))
-          (message "Not enough candidates for helm-follow-mode")))))
-
-(defvar helm-follow-input-idle-delay nil
-  "`helm-follow-mode' will execute its persistent action after this delay.
-Note that if the `follow-delay' attr is present in source,
-it will take precedence on this.")
-(defun helm-follow-execute-persistent-action-maybe ()
-  "Execute persistent action in mode `helm-follow-mode'.
-This happen after `helm-input-idle-delay' secs."
-  (let ((src (helm-get-current-source)))
-    (and (not (get-buffer-window helm-action-buffer 'visible))
-         (eq (assoc-default 'follow src) 1)
-         (sit-for (or (assoc-default 'follow-delay src)
-                      helm-follow-input-idle-delay
-                      (and helm-input-idle-delay
-                           (max helm-input-idle-delay 0.01))))
-         (helm-window)
-         (helm-get-selection)
-         (save-excursion
-           (helm-execute-persistent-action)))))
-
-
-;;; Auto-resize mode
-;;
-(defun helm--autoresize-hook (&optional max-height min-height)
-  (with-helm-window
-    (fit-window-to-buffer nil
-                          (/ (* (frame-height)
-                                (or max-height helm-autoresize-max-height))
-                             100)
-                          (/ (* (frame-height)
-                                (or min-height helm-autoresize-min-height))
-                             100))))
-
-(define-minor-mode helm-autoresize-mode
-    "Auto resize helm window when enabled.
-Helm window is resized according to values of `helm-autoresize-max-height'
-and `helm-autoresize-min-height'.
-Note that when this mode is enabled, helm behave like when
-`helm-always-two-windows' is enabled.
-
-See `fit-window-to-buffer' for more infos."
-  :group 'helm
-  :global t
-  (if helm-autoresize-mode
-      (progn (add-hook 'helm-after-update-hook 'helm--autoresize-hook)
-             (add-hook 'helm-window-configuration-hook 'helm--autoresize-hook))
-      (remove-hook 'helm-after-update-hook 'helm--autoresize-hook)
-      (remove-hook 'helm-window-configuration-hook 'helm--autoresize-hook)))
-
-
-(provide 'helm)
-
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions obsolete)
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; helm.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/emacs-helm.sh b/emacs.d/elpa/helm-20160115.2200/emacs-helm.sh
new file mode 100755
index 0000000..a593813
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/emacs-helm.sh
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+
+
+## Copyright (C) 2012 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+## 
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+## Commentary:
+
+# Preconfigured Emacs with a basic helm configuration.
+# Useful to start quickly an emacs -Q with helm.
+# Run it from this directory or symlink it somewhere in your PATH.
+
+# If TEMP env var exists use it otherwise declare it.
+[ -z $TEMP ] && declare TEMP="/tmp"
+
+CONF_FILE="$TEMP/helm-cfg.el"
+EMACS=emacs
+
+case $1 in
+    -P)
+        shift 1
+        declare EMACS=$1
+        shift 1
+        ;;
+    -h)
+        echo "Usage: ${0##*/} [-P} Emacs path [-h} help [--] EMACS ARGS"
+        exit 2
+        ;;
+esac
+
+cd $(dirname "$0")
+
+# Check if autoload file exists.
+# It is maybe in a different directory if
+# emacs-helm.sh is a symlink.
+LS=$(ls -l $0 | awk '{print $11}')
+if [ ! -z $LS ]; then
+    AUTO_FILE="$(dirname $LS)/helm-autoloads.el"
+else
+    AUTO_FILE="helm-autoloads.el"
+fi
+if [ ! -e "$AUTO_FILE" ]; then
+    echo No autoloads found, please run make first to generate autoload file
+    exit 2
+fi
+
+
+cat > $CONF_FILE <<EOF
+(setq initial-scratch-message (concat initial-scratch-message
+";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\
+;; This Emacs is Powered by \`HELM' using\n\
+;; emacs program \"$EMACS\".\n\
+;; This is a minimal \`helm' configuration to discover \`helm' or debug it.\n\
+;; You can retrieve this minimal configuration in \"$CONF_FILE\" \n\
+;; Some originals emacs commands have been replaced by own \`helm' commands:\n\n\
+;; - \`find-file'(C-x C-f)           =>\`helm-find-files'\n\
+;; - \`occur'(M-s o)                 =>\`helm-occur'\n\
+;; - \`list-buffers'(C-x C-b)        =>\`helm-buffers-list'\n\
+;; - \`completion-at-point'(M-tab)   =>\`helm-lisp-completion-at-point'[1]\n\
+;; - \`dabbrev-expand'(M-/)          =>\`helm-dabbrev'\n\n\
+;; Some others native emacs commands are \"helmized\" by \`helm-mode'.\n\
+;; [1] Coming with emacs-24.4 \`completion-at-point' is \"helmized\" by \`helm-mode'\n\
+;; which provide helm completion in many other places like \`shell-mode'.\n\
+;; You will find embeded help for most helm commands with \`C-c ?'.\n\
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n"))
+
+(setq package-load-list '((helm-core t) (helm t) (async t)))
+(package-initialize)
+(add-to-list 'load-path (file-name-directory (file-truename "$0")))
+(setq default-frame-alist '((vertical-scroll-bars . nil)
+                            (tool-bar-lines . 0)
+                            (menu-bar-lines . 0)
+                            (fullscreen . nil)))
+(blink-cursor-mode -1)
+(require 'helm-config)
+(helm-mode 1)
+(define-key global-map [remap find-file] 'helm-find-files)
+(define-key global-map [remap occur] 'helm-occur)
+(define-key global-map [remap list-buffers] 'helm-buffers-list)
+(define-key global-map [remap dabbrev-expand] 'helm-dabbrev)
+(global-set-key (kbd "M-x") 'helm-M-x)
+(unless (boundp 'completion-in-region-function)
+  (define-key lisp-interaction-mode-map [remap completion-at-point] 'helm-lisp-completion-at-point)
+  (define-key emacs-lisp-mode-map       [remap completion-at-point] 'helm-lisp-completion-at-point))
+(add-hook 'kill-emacs-hook #'(lambda () (and (file-exists-p "$CONF_FILE") (delete-file "$CONF_FILE"))))
+EOF
+
+$EMACS -Q -l $CONF_FILE $@
+
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-adaptive.el b/emacs.d/elpa/helm-20160115.2200/helm-adaptive.el
similarity index 100%
rename from emacs.d/elpa/helm-20150623.1310/helm-adaptive.el
rename to emacs.d/elpa/helm-20160115.2200/helm-adaptive.el
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-apt.el b/emacs.d/elpa/helm-20160115.2200/helm-apt.el
new file mode 100644
index 0000000..53c8433
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-apt.el
@@ -0,0 +1,300 @@
+;;; helm-apt.el --- Helm interface for Debian/Ubuntu packages (apt-*) -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-utils)
+(require 'helm-external)
+(require 'helm-help)
+
+(declare-function term-line-mode "term")
+(declare-function term-char-mode "term")
+(declare-function term-send-input "term")
+(declare-function term-send-eof "term")
+
+
+(defgroup helm-apt nil
+  "Apt related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-apt-cache-show-function 'helm-apt-cache-show-1
+  "Function of one argument used to show apt package.
+Default is `helm-apt-cache-show-1' but you can use `apt-utils-show-package-1'
+from `apt-utils.el' to have something more enhanced.
+If nil default `helm-apt-cache-show-1' will be used."
+  :type 'function
+  :group 'helm-apt)
+
+(defcustom helm-apt-actions
+  '(("Show package description" . helm-apt-cache-show)
+    ("Install package(s)" . helm-apt-install)
+    ("Reinstall package(s)" . helm-apt-reinstall)
+    ("Remove package(s)" . helm-apt-uninstall)
+    ("Purge package(s)" . helm-apt-purge))
+  "Actions for helm apt."
+  :group 'helm-apt
+  :type '(alist :key-type string :value-type function))
+
+(defface helm-apt-installed
+    '((t (:foreground "green")))
+  "Face used for apt installed candidates."
+  :group 'helm-apt)
+
+(defface helm-apt-deinstalled
+    '((t (:foreground "DimGray")))
+  "Face used for apt deinstalled candidates."
+  :group 'helm-apt)
+
+
+(defvar helm-apt-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-I")   'helm-apt-show-only-installed)
+    (define-key map (kbd "M-U")   'helm-apt-show-only-not-installed)
+    (define-key map (kbd "M-D")   'helm-apt-show-only-deinstalled)
+    (define-key map (kbd "M-A")   'helm-apt-show-all)
+    map))
+
+
+(defvar helm-source-apt
+  (helm-build-in-buffer-source "APT"
+    :init #'helm-apt-init
+    :candidate-transformer #'helm-apt-candidate-transformer
+    :display-to-real #'helm-apt-display-to-real
+    :update #'helm-apt-refresh
+    :keymap helm-apt-map
+    :help-message 'helm-apt-help-message
+    :action 'helm-apt-actions
+    :persistent-action #'helm-apt-persistent-action
+    :persistent-help "Show package description"))
+
+;;; Internals vars
+(defvar helm-apt-search-command "apt-cache search '%s'")
+(defvar helm-apt-show-command "apt-cache show '%s'")
+(defvar helm-apt-installed-packages nil)
+(defvar helm-apt-all-packages nil)
+(defvar helm-apt-input-history nil)
+(defvar helm-apt-show-only 'all)
+(defvar helm-apt-term-buffer nil)
+(defvar helm-apt-default-archs nil)
+
+(defun helm-apt-refresh ()
+  "Refresh installed candidates list."
+  (setq helm-apt-installed-packages nil)
+  (setq helm-apt-all-packages nil))
+
+(defun helm-apt-persistent-action (candidate)
+  "Persistent action for APT source."
+  (helm-apt-cache-show candidate))
+
+(defun helm-apt--installed-package-name (name)
+  (cl-loop for arch in helm-apt-default-archs
+           thereis (or (assoc-default
+                        name helm-apt-installed-packages)
+                       (assoc-default
+                        (format "%s:%s" name arch)
+                        helm-apt-installed-packages))))
+
+(defun helm-apt-candidate-transformer (candidates)
+  "Show installed CANDIDATES and the ones to deinstall in a different color."
+  (cl-loop for cand in candidates
+        for name = (helm-apt-display-to-real cand)
+        for deinstall = (string=
+                         (helm-apt--installed-package-name name)
+                         "deinstall")
+        for install = (string=
+                       (helm-apt--installed-package-name name)
+                       "install")
+        for show = (cond ((and deinstall
+                               (memq helm-apt-show-only '(all deinstalled)))
+                          (propertize cand 'face 'helm-apt-deinstalled))
+                         ((and install
+                               (memq helm-apt-show-only '(all installed)))
+                          (propertize cand 'face 'helm-apt-installed))
+                         ((and (eq helm-apt-show-only 'noinstalled)
+                               (not install)) cand)
+                         ((eq helm-apt-show-only 'all) cand))
+        when show collect show))
+
+(defun helm-apt-show-only-installed ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-apt-show-only 'installed)
+    (helm-update)))
+(put 'helm-apt-show-only-installed 'helm-only t)
+
+(defun helm-apt-show-only-not-installed ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-apt-show-only 'noinstalled)
+    (helm-update)))
+(put 'helm-apt-show-only-not-installed 'helm-only t)
+
+(defun helm-apt-show-only-deinstalled ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-apt-show-only 'deinstalled)
+    (helm-update)))
+(put 'helm-apt-show-only-deinstalled 'helm-only t)
+
+(defun helm-apt-show-all ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-apt-show-only 'all)
+    (helm-update)))
+(put 'helm-apt-show-all 'helm-only t)
+
+(defun helm-apt-init ()
+  "Initialize list of debian packages."
+  (let ((query ""))
+    (unless (and helm-apt-installed-packages
+                 helm-apt-all-packages)
+      (message "Loading package list...")
+      (setq helm-apt-installed-packages
+            (with-temp-buffer
+              (call-process-shell-command "dpkg --get-selections"
+                                          nil (current-buffer))
+              (cl-loop for i in (split-string (buffer-string) "\n" t)
+                    for p = (split-string i)
+                    collect (cons (car p) (cadr p)))))
+      (helm-init-candidates-in-buffer
+          'global
+        (setq helm-apt-all-packages
+              (with-temp-buffer
+                (call-process-shell-command
+                 (format helm-apt-search-command query)
+                 nil (current-buffer))
+                (buffer-string))))
+      (message "Loading package list done")
+      (sit-for 0.5))))
+
+(defun helm-apt-display-to-real (line)
+  "Return only name of a debian package.
+LINE is displayed like:
+package name - description."
+  (car (split-string line " - ")))
+
+(defvar helm-apt-show-current-package nil)
+(define-derived-mode helm-apt-show-mode
+    special-mode "helm-apt-show"
+    "Mode to display infos on apt packages.")
+
+(defun helm-apt-cache-show (package)
+  "Show information on apt package PACKAGE."
+  (if (and (functionp helm-apt-cache-show-function)
+           (not (eq helm-apt-cache-show-function
+                    'helm-apt-cache-show)))
+      ;; A function, call it.
+      (funcall helm-apt-cache-show-function package)
+    ;; nil or whatever use default.
+    (helm-apt-cache-show-1 package)))
+
+(defun helm-apt-cache-show-1 (package)
+  (let* ((command (format helm-apt-show-command package))
+         (buf     (get-buffer-create "*helm apt show*")))
+    (switch-to-buffer buf)
+    (unless (string= package helm-apt-show-current-package)
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (save-excursion
+          (call-process-shell-command
+           command nil (current-buffer) t))))
+    (helm-apt-show-mode)
+    (set (make-local-variable 'helm-apt-show-current-package)
+         package)))
+
+(defun helm-apt-install (_package)
+  "Run 'apt-get install' shell command on PACKAGE."
+  (helm-apt-generic-action :action 'install))
+
+(defun helm-apt-reinstall (_package)
+  "Run 'apt-get install --reinstall' shell command on PACKAGE."
+  (helm-apt-generic-action :action 'reinstall))
+
+(defun helm-apt-uninstall (_package)
+  "Run 'apt-get remove' shell command on PACKAGE."
+  (helm-apt-generic-action :action 'uninstall))
+
+(defun helm-apt-purge (_package)
+  "Run 'apt-get purge' shell command on PACKAGE."
+  (helm-apt-generic-action :action 'purge))
+
+(cl-defun helm-apt-generic-action (&key action)
+  "Run 'apt-get ACTION'.
+Support install, remove and purge actions."
+  (if (and helm-apt-term-buffer
+           (buffer-live-p (get-buffer helm-apt-term-buffer)))
+      (switch-to-buffer helm-apt-term-buffer)
+    (ansi-term (getenv "SHELL") "term apt")
+    (setq helm-apt-term-buffer (buffer-name)))
+  (term-line-mode)
+  (let ((command   (cl-case action
+                     (install   "sudo apt-get install ")
+                     (reinstall "sudo apt-get install --reinstall ")
+                     (uninstall "sudo apt-get remove ")
+                     (purge     "sudo apt-get purge ")
+                     (t          (error "Unknown action"))))
+        (beg       (point))
+        end
+        (cand-list (mapconcat (lambda (x) (format "'%s'" x))
+                              (helm-marked-candidates) " ")))
+    (goto-char (point-max))
+    (insert (concat command cand-list))
+    (setq end (point))
+    (if (y-or-n-p (format "%s package(s)" (symbol-name action)))
+        (progn
+          (setq helm-external-commands-list nil)
+          (setq helm-apt-installed-packages nil)
+          (term-char-mode) (term-send-input))
+      (delete-region beg end))))
+
+;;;###autoload
+(defun helm-apt (arg)
+  "Preconfigured `helm' : frontend of APT package manager.
+With a prefix arg reload cache."
+  (interactive "P")
+  (setq helm-apt-show-only 'all)
+  (unless helm-apt-default-archs
+    (setq helm-apt-default-archs
+          (append (split-string
+                   (shell-command-to-string
+                    "dpkg --print-architecture")
+                   "\n" t)
+                  (split-string
+                   (shell-command-to-string
+                    "dpkg --print-foreign-architectures")
+                   "\n" t))))
+  (let ((query (read-string "Search Package: " nil 'helm-apt-input-history)))
+    (when arg (helm-apt-refresh))
+    (helm :sources 'helm-source-apt
+          :prompt "Search Package: "
+          :input query
+          :buffer "*helm apt*"
+          :history 'helm-apt-input-history)))
+
+
+(provide 'helm-apt)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-apt.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-autoloads.el b/emacs.d/elpa/helm-20160115.2200/helm-autoloads.el
new file mode 100644
index 0000000..61bd508
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-autoloads.el
@@ -0,0 +1,903 @@
+;;; helm-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "helm-adaptive" "helm-adaptive.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-adaptive.el
+
+(defvar helm-adaptive-mode nil "\
+Non-nil if Helm-Adaptive mode is enabled.
+See the command `helm-adaptive-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 `helm-adaptive-mode'.")
+
+(custom-autoload 'helm-adaptive-mode "helm-adaptive" nil)
+
+(autoload 'helm-adaptive-mode "helm-adaptive" "\
+Toggle adaptive sorting in all sources.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'helm-reset-adaptive-history "helm-adaptive" "\
+Delete all `helm-adaptive-history' and his file.
+Useful when you have a old or corrupted `helm-adaptive-history-file'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-apt" "helm-apt.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-apt.el
+
+(autoload 'helm-apt "helm-apt" "\
+Preconfigured `helm' : frontend of APT package manager.
+With a prefix arg reload cache.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-bookmark" "helm-bookmark.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-bookmark.el
+
+(autoload 'helm-bookmarks "helm-bookmark" "\
+Preconfigured `helm' for bookmarks.
+
+\(fn)" t nil)
+
+(autoload 'helm-filtered-bookmarks "helm-bookmark" "\
+Preconfigured helm for bookmarks (filtered by category).
+Optional source `helm-source-bookmark-addressbook' is loaded
+only if external library addressbook-bookmark.el is available.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-buffers" "helm-buffers.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-buffers.el
+
+(autoload 'helm-buffers-list "helm-buffers" "\
+Preconfigured `helm' to list buffers.
+
+\(fn)" t nil)
+
+(autoload 'helm-mini "helm-buffers" "\
+Preconfigured `helm' lightweight version (buffer -> recentf).
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-color" "helm-color.el" (22171 46565 0
+;;;;;;  0))
+;;; Generated autoloads from helm-color.el
+
+(autoload 'helm-colors "helm-color" "\
+Preconfigured `helm' for color.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-command" "helm-command.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-command.el
+
+(autoload 'helm-M-x "helm-command" "\
+Preconfigured `helm' for Emacs commands.
+It is `helm' replacement of regular `M-x' `execute-extended-command'.
+
+Unlike regular `M-x' emacs vanilla `execute-extended-command' command,
+the prefix args if needed, are passed AFTER starting `helm-M-x'.
+
+You can get help on each command by persistent action.
+
+\(fn ARG &optional COMMAND-NAME)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-config" "helm-config.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-config.el
+
+(autoload 'helm-configuration "helm-config" "\
+Customize `helm'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-dabbrev" "helm-dabbrev.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-dabbrev.el
+
+(autoload 'helm-dabbrev "helm-dabbrev" "\
+Preconfigured helm for dynamic abbreviations.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-elisp" "helm-elisp.el" (22171 46565 0
+;;;;;;  0))
+;;; Generated autoloads from helm-elisp.el
+
+(autoload 'helm-lisp-completion-at-point "helm-elisp" "\
+Preconfigured helm for lisp symbol completion at point.
+
+\(fn)" t nil)
+
+(autoload 'helm-complete-file-name-at-point "helm-elisp" "\
+Preconfigured helm to complete file name at point.
+
+\(fn &optional FORCE)" t nil)
+
+(autoload 'helm-lisp-indent "helm-elisp" "\
+
+
+\(fn)" t nil)
+
+(autoload 'helm-lisp-completion-or-file-name-at-point "helm-elisp" "\
+Preconfigured helm to complete lisp symbol or filename at point.
+Filename completion happen if string start after or between a double quote.
+
+\(fn)" t nil)
+
+(autoload 'helm-apropos "helm-elisp" "\
+Preconfigured helm to describe commands, functions, variables and faces.
+
+\(fn)" t nil)
+
+(autoload 'helm-manage-advice "helm-elisp" "\
+Preconfigured `helm' to disable/enable function advices.
+
+\(fn)" t nil)
+
+(autoload 'helm-locate-library "helm-elisp" "\
+Preconfigured helm to locate elisp libraries.
+
+\(fn)" t nil)
+
+(autoload 'helm-timers "helm-elisp" "\
+Preconfigured `helm' for timers.
+
+\(fn)" t nil)
+
+(autoload 'helm-complex-command-history "helm-elisp" "\
+Preconfigured helm for complex command history.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-elisp-package" "helm-elisp-package.el"
+;;;;;;  (22171 46565 0 0))
+;;; Generated autoloads from helm-elisp-package.el
+
+(autoload 'helm-list-elisp-packages "helm-elisp-package" "\
+Preconfigured helm for listing and handling emacs packages.
+
+\(fn ARG)" t nil)
+
+(autoload 'helm-list-elisp-packages-no-fetch "helm-elisp-package" "\
+Preconfigured helm for emacs packages.
+Same as `helm-list-elisp-packages' but don't fetch packages on remote.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-elscreen" "helm-elscreen.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-elscreen.el
+
+(autoload 'helm-elscreen "helm-elscreen" "\
+Preconfigured helm to list elscreen.
+
+\(fn)" t nil)
+
+(autoload 'helm-elscreen-history "helm-elscreen" "\
+Preconfigured helm to list elscreen in history order.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-eshell" "helm-eshell.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-eshell.el
+
+(autoload 'helm-esh-pcomplete "helm-eshell" "\
+Preconfigured helm to provide helm completion in eshell.
+
+\(fn)" t nil)
+
+(autoload 'helm-eshell-history "helm-eshell" "\
+Preconfigured helm for eshell history.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-eval" "helm-eval.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-eval.el
+
+(autoload 'helm-eval-expression "helm-eval" "\
+Preconfigured helm for `helm-source-evaluation-result'.
+
+\(fn ARG)" t nil)
+
+(autoload 'helm-eval-expression-with-eldoc "helm-eval" "\
+Preconfigured helm for `helm-source-evaluation-result' with `eldoc' support.
+
+\(fn)" t nil)
+
+(autoload 'helm-calcul-expression "helm-eval" "\
+Preconfigured helm for `helm-source-calculation-result'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-external" "helm-external.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-external.el
+
+(autoload 'helm-run-external-command "helm-external" "\
+Preconfigured `helm' to run External PROGRAM asyncronously from Emacs.
+If program is already running exit with error.
+You can set your own list of commands with
+`helm-external-commands-list'.
+
+\(fn PROGRAM)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-files" "helm-files.el" (22171 46565 0
+;;;;;;  0))
+;;; Generated autoloads from helm-files.el
+
+(autoload 'helm-browse-project "helm-files" "\
+Preconfigured helm to browse projects.
+Browse files and see status of project with its vcs.
+Only HG and GIT are supported for now.
+Fall back to `helm-browse-project-find-files'
+if current directory is not under control of one of those vcs.
+With a prefix ARG browse files recursively, with two prefix ARG
+rebuild the cache.
+If the current directory is found in the cache, start
+`helm-browse-project-find-files' even with no prefix ARG.
+NOTE: The prefix ARG have no effect on the VCS controlled directories.
+
+Needed dependencies for VCS:
+<https://github.com/emacs-helm/helm-ls-git>
+and
+<https://github.com/emacs-helm/helm-ls-hg>
+and
+<http://melpa.org/#/helm-ls-svn>.
+
+\(fn ARG)" t nil)
+
+(autoload 'helm-find "helm-files" "\
+Preconfigured `helm' for the find shell command.
+
+\(fn ARG)" t nil)
+
+(autoload 'helm-find-files "helm-files" "\
+Preconfigured `helm' for helm implementation of `find-file'.
+Called with a prefix arg show history if some.
+Don't call it from programs, use `helm-find-files-1' instead.
+This is the starting point for nearly all actions you can do on files.
+
+\(fn ARG)" t nil)
+
+(autoload 'helm-for-files "helm-files" "\
+Preconfigured `helm' for opening files.
+Run all sources defined in `helm-for-files-preferred-list'.
+
+\(fn)" t nil)
+
+(autoload 'helm-multi-files "helm-files" "\
+Preconfigured helm similar to `helm-for-files' but that don't run locate.
+Allow toggling from locate to others sources.
+This allow seeing first if what you search is in other sources before launching
+locate.
+
+\(fn)" t nil)
+
+(autoload 'helm-recentf "helm-files" "\
+Preconfigured `helm' for `recentf'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-font" "helm-font.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-font.el
+
+(autoload 'helm-select-xfont "helm-font" "\
+Preconfigured `helm' to select Xfont.
+
+\(fn)" t nil)
+
+(autoload 'helm-ucs "helm-font" "\
+Preconfigured helm for `ucs-names' math symbols.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-grep" "helm-grep.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-grep.el
+
+(autoload 'helm-goto-precedent-file "helm-grep" "\
+Go to precedent file in helm grep/etags buffers.
+
+\(fn)" t nil)
+
+(autoload 'helm-goto-next-file "helm-grep" "\
+Go to precedent file in helm grep/etags buffers.
+
+\(fn)" t nil)
+
+(autoload 'helm-do-grep-ag "helm-grep" "\
+Preconfigured helm for grepping with AG in `default-directory'.
+
+\(fn)" t nil)
+
+(autoload 'helm-grep-do-git-grep "helm-grep" "\
+Preconfigured helm for git-grepping `default-directory'.
+With a prefix arg ARG git-grep the whole repository.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-help" "helm-help.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-help.el
+
+(autoload 'helm-documentation "helm-help" "\
+Preconfigured helm for helm documentation.
+With a prefix arg refresh the documentation.
+
+Find here the documentation of all sources actually documented.
+
+\(fn ARG)" t nil)
+
+(defvar helm-comp-read-mode-line "\\<helm-comp-read-map>C/\\[helm-cr-empty-string]:Empty \\<helm-map>\\[helm-help]:Help \\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
+
+(defvar helm-read-file-name-mode-line-string "\\<helm-read-file-map>\\[helm-help]:Help C/\\[helm-cr-empty-string]:Empty \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend" "\
+String displayed in mode-line in `helm-source-find-files'.")
+
+(defvar helm-top-mode-line "\\<helm-top-map>\\[helm-help]:Help \\<helm-map>\\[helm-select-action]:Act \\[helm-maybe-exit-minibuffer]/f1/f2/f-n:NthAct \\[helm-toggle-suspend-update]:Tog.suspend")
+
+(autoload 'helm-describe-helm-attribute "helm-help" "\
+Display the full documentation of HELM-ATTRIBUTE.
+HELM-ATTRIBUTE should be a symbol.
+
+\(fn HELM-ATTRIBUTE)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-id-utils" "helm-id-utils.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-id-utils.el
+
+(autoload 'helm-gid "helm-id-utils" "\
+Preconfigured helm for `gid' command line of `ID-Utils'.
+Need A database created with the command `mkid'
+above `default-directory'.
+Need id-utils as dependency which provide `mkid', `gid' etc...
+See <https://www.gnu.org/software/idutils/>.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-imenu" "helm-imenu.el" (22171 46565 0
+;;;;;;  0))
+;;; Generated autoloads from helm-imenu.el
+
+(autoload 'helm-imenu "helm-imenu" "\
+Preconfigured `helm' for `imenu'.
+
+\(fn)" t nil)
+
+(autoload 'helm-imenu-in-all-buffers "helm-imenu" "\
+Preconfigured helm for fetching imenu entries of all buffers.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-info" "helm-info.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-info.el
+
+(autoload 'helm-info "helm-info" "\
+Preconfigured `helm' for searching Info files' indices.
+
+\(fn)" t nil)
+
+(autoload 'helm-info-at-point "helm-info" "\
+Preconfigured `helm' for searching info at point.
+With a prefix-arg insert symbol at point.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-locate" "helm-locate.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-locate.el
+
+(autoload 'helm-projects-find-files "helm-locate" "\
+Find files with locate in `helm-locate-project-list'.
+With a prefix arg refresh the database in each project.
+
+\(fn UPDATE)" t nil)
+
+(autoload 'helm-locate-read-file-name "helm-locate" "\
+
+
+\(fn PROMPT)" nil nil)
+
+(autoload 'helm-locate "helm-locate" "\
+Preconfigured `helm' for Locate.
+Note: you can add locate options after entering pattern.
+See 'man locate' for valid options and also `helm-locate-command'.
+
+You can specify a local database with prefix argument ARG.
+With two prefix arg, refresh the current local db or create it
+if it doesn't exists.
+
+To create a user specific db, use
+\"updatedb -l 0 -o db_path -U directory\".
+Where db_path is a filename matched by
+`helm-locate-db-file-regexp'.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-man" "helm-man.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-man.el
+
+(autoload 'helm-man-woman "helm-man" "\
+Preconfigured `helm' for Man and Woman pages.
+With a prefix arg reinitialize the cache.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-misc" "helm-misc.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-misc.el
+
+(autoload 'helm-browse-menubar "helm-misc" "\
+Preconfigured helm to the menubar using lacarte.el.
+
+\(fn)" t nil)
+
+(autoload 'helm-world-time "helm-misc" "\
+Preconfigured `helm' to show world time.
+Default action change TZ environment variable locally to emacs.
+
+\(fn)" t nil)
+
+(autoload 'helm-insert-latex-math "helm-misc" "\
+Preconfigured helm for latex math symbols completion.
+
+\(fn)" t nil)
+
+(autoload 'helm-ratpoison-commands "helm-misc" "\
+Preconfigured `helm' to execute ratpoison commands.
+
+\(fn)" t nil)
+
+(autoload 'helm-stumpwm-commands "helm-misc" "\
+Preconfigured helm for stumpwm commands.
+
+\(fn)" t nil)
+
+(autoload 'helm-minibuffer-history "helm-misc" "\
+Preconfigured `helm' for `minibuffer-history'.
+
+\(fn)" t nil)
+
+(autoload 'helm-comint-input-ring "helm-misc" "\
+Preconfigured `helm' that provide completion of `comint' history.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-mode" "helm-mode.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-mode.el
+
+(autoload 'helm-comp-read "helm-mode" "\
+Read a string in the minibuffer, with helm completion.
+
+It is helm `completing-read' equivalent.
+
+- PROMPT is the prompt name to use.
+
+- COLLECTION can be a list, vector, obarray or hash-table.
+  It can be also a function that receives three arguments:
+  the values string, predicate and t. See `all-completions' for more details.
+
+Keys description:
+
+- TEST: A predicate called with one arg i.e candidate.
+
+- INITIAL-INPUT: Same as input arg in `helm'.
+
+- PRESELECT: See preselect arg of `helm'.
+
+- DEFAULT: This option is used only for compatibility with regular
+  Emacs `completing-read' (Same as DEFAULT arg of `completing-read').
+
+- BUFFER: Name of helm-buffer.
+
+- MUST-MATCH: Candidate selected must be one of COLLECTION.
+
+- FUZZY: Enable fuzzy matching.
+
+- REVERSE-HISTORY: When non--nil display history source after current
+  source completion.
+
+- REQUIRES-PATTERN: Same as helm attribute, default is 0.
+
+- HISTORY: A list containing specific history, default is nil.
+  When it is non--nil, all elements of HISTORY are displayed in
+  a special source before COLLECTION.
+
+- INPUT-HISTORY: A symbol. the minibuffer input history will be
+  stored there, if nil or not provided, `minibuffer-history'
+  will be used instead.
+
+- CASE-FOLD: Same as `helm-case-fold-search'.
+
+- DEL-INPUT: Boolean, when non--nil (default) remove the partial
+  minibuffer input from HISTORY is present.
+
+- PERSISTENT-ACTION: A function called with one arg i.e candidate.
+
+- PERSISTENT-HELP: A string to document PERSISTENT-ACTION.
+
+- MODE-LINE: A string or list to display in mode line.
+  Default is `helm-comp-read-mode-line'.
+
+- KEYMAP: A keymap to use in this `helm-comp-read'.
+  (the keymap will be shared with history source)
+
+- NAME: The name related to this local source.
+
+- EXEC-WHEN-ONLY-ONE: Bound `helm-execute-action-at-once-if-one'
+  to non--nil. (possibles values are t or nil).
+
+- VOLATILE: Use volatile attribute (enabled by default).
+
+- SORT: A predicate to give to `sort' e.g `string-lessp'
+  Use this only on small data as it is ineficient.
+  If you want to sort faster add a sort function to
+  FC-TRANSFORMER.
+  Note that FUZZY when enabled is already providing a sort function.
+
+- FC-TRANSFORMER: A `filtered-candidate-transformer' function
+  or a list of functions.
+
+- HIST-FC-TRANSFORMER: A `filtered-candidate-transformer'
+  function for the history source.
+
+- MARKED-CANDIDATES: If non--nil return candidate or marked candidates as a list.
+
+- NOMARK: When non--nil don't allow marking candidates.
+
+- ALISTP: (default is non--nil) See `helm-comp-read-get-candidates'.
+
+- CANDIDATES-IN-BUFFER: when non--nil use a source build with
+  `helm-source-in-buffer' which is much faster.
+  Argument VOLATILE have no effect when CANDIDATES-IN-BUFFER is non--nil.
+
+Any prefix args passed during `helm-comp-read' invocation will be recorded
+in `helm-current-prefix-arg', otherwise if prefix args were given before
+`helm-comp-read' invocation, the value of `current-prefix-arg' will be used.
+That's mean you can pass prefix args before or after calling a command
+that use `helm-comp-read' See `helm-M-x' for example.
+
+\(fn PROMPT COLLECTION &key TEST INITIAL-INPUT DEFAULT PRESELECT (buffer \"*Helm Completions*\") MUST-MATCH FUZZY REVERSE-HISTORY (requires-pattern 0) HISTORY INPUT-HISTORY (case-fold helm-comp-read-case-fold-search) (del-input t) (persistent-action nil) (persistent-help \"DoNothing\") (mode-line helm-comp-read-mode-line) HELP-MESSAGE (keymap helm-comp-read-map) (name \"Helm Completions\") CANDIDATES-IN-BUFFER EXEC-WHEN-ONLY-ONE QUIT-WHEN-NO-CAND (volatile t) SORT (fc-transformer (quote helm-cr-default-transformer)) HIST-FC-TRANSFORMER MARKED-CANDIDATES NOMARK (alistp t) (candidate-number-limit helm-candidate-number-limit))" nil nil)
+
+(autoload 'helm-read-file-name "helm-mode" "\
+Read a file name with helm completion.
+It is helm `read-file-name' emulation.
+
+Argument PROMPT is the default prompt to use.
+
+Keys description:
+
+- NAME: Source name, default to \"Read File Name\".
+
+- INITIAL-INPUT: Where to start read file name, default to `default-directory'.
+
+- BUFFER: `helm-buffer' name default to \"*Helm Completions*\".
+
+- TEST: A predicate called with one arg 'candidate'.
+
+- CASE-FOLD: Same as `helm-case-fold-search'.
+
+- PRESELECT: helm preselection.
+
+- HISTORY: Display HISTORY in a special source.
+
+- MUST-MATCH: Can be 'confirm, nil, or t.
+
+- MARKED-CANDIDATES: When non--nil return a list of marked candidates.
+
+- NOMARK: When non--nil don't allow marking candidates.
+
+- ALISTP: Don't use `all-completions' in history (take effect only on history).
+
+- PERSISTENT-ACTION: a persistent action function.
+
+- PERSISTENT-HELP: persistent help message.
+
+- MODE-LINE: A mode line message, default is `helm-read-file-name-mode-line-string'.
+
+\(fn PROMPT &key (name \"Read File Name\") (initial-input default-directory) (buffer \"*Helm file completions*\") TEST (case-fold helm-file-name-case-fold-search) PRESELECT HISTORY MUST-MATCH DEFAULT MARKED-CANDIDATES (candidate-number-limit helm-ff-candidate-number-limit) NOMARK (alistp t) (persistent-action (quote helm-find-files-persistent-action)) (persistent-help \"Hit1 Expand Candidate, Hit2 or (C-u) Find file\") (mode-line helm-read-file-name-mode-line-string))" nil nil)
+
+(defvar helm-mode nil "\
+Non-nil if Helm mode is enabled.
+See the command `helm-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 `helm-mode'.")
+
+(custom-autoload 'helm-mode "helm-mode" nil)
+
+(autoload 'helm-mode "helm-mode" "\
+Toggle generic helm completion.
+
+All functions in Emacs that use `completing-read'
+or `read-file-name' and friends will use helm interface
+when this mode is turned on.
+However you can modify this behavior for functions of your choice
+with `helm-completing-read-handlers-alist'.
+
+Called with a positive arg, turn on unconditionally, with a
+negative arg turn off.
+You can turn it on with `helm-mode'.
+
+Some crap emacs functions may not be supported,
+e.g `ffap-alternate-file' and maybe others
+You can add such functions to `helm-completing-read-handlers-alist'
+with a nil value.
+
+Note: This mode is incompatible with Emacs23.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-net" "helm-net.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-net.el
+
+(autoload 'helm-surfraw "helm-net" "\
+Preconfigured `helm' to search PATTERN with search ENGINE.
+
+\(fn PATTERN ENGINE)" t nil)
+
+(autoload 'helm-google-suggest "helm-net" "\
+Preconfigured `helm' for google search with google suggest.
+
+\(fn)" t nil)
+
+(autoload 'helm-wikipedia-suggest "helm-net" "\
+Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-org" "helm-org.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-org.el
+
+(autoload 'helm-org-agenda-files-headings "helm-org" "\
+Preconfigured helm for org files headings.
+
+\(fn)" t nil)
+
+(autoload 'helm-org-in-buffer-headings "helm-org" "\
+Preconfigured helm for org buffer headings.
+
+\(fn)" t nil)
+
+(autoload 'helm-org-parent-headings "helm-org" "\
+Preconfigured helm for org headings that are parents of the
+current heading.
+
+\(fn)" t nil)
+
+(autoload 'helm-org-capture-templates "helm-org" "\
+Preconfigured helm for org templates.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-regexp" "helm-regexp.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-regexp.el
+
+(autoload 'helm-moccur-mode "helm-regexp" "\
+Major mode to provide actions in helm moccur saved buffer.
+
+Special commands:
+\\{helm-moccur-mode-map}
+
+\(fn)" t nil)
+
+(autoload 'helm-regexp "helm-regexp" "\
+Preconfigured helm to build regexps.
+`query-replace-regexp' can be run from there against found regexp.
+
+\(fn)" t nil)
+
+(autoload 'helm-occur "helm-regexp" "\
+Preconfigured helm for Occur.
+
+\(fn)" t nil)
+
+(autoload 'helm-occur-from-isearch "helm-regexp" "\
+Invoke `helm-occur' from isearch.
+
+\(fn)" t nil)
+
+(autoload 'helm-multi-occur-from-isearch "helm-regexp" "\
+Invoke `helm-multi-occur' from isearch.
+
+With a prefix arg, reverse the behavior of
+`helm-moccur-always-search-in-current'.
+The prefix arg can be set before calling
+`helm-multi-occur-from-isearch' or during the buffer selection.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-ring" "helm-ring.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-ring.el
+
+(defvar helm-push-mark-mode nil "\
+Non-nil if Helm-Push-Mark mode is enabled.
+See the command `helm-push-mark-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 `helm-push-mark-mode'.")
+
+(custom-autoload 'helm-push-mark-mode "helm-ring" nil)
+
+(autoload 'helm-push-mark-mode "helm-ring" "\
+Provide an improved version of `push-mark'.
+Modify the behavior of `push-mark' to update
+the `global-mark-ring' after each new visit.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'helm-mark-ring "helm-ring" "\
+Preconfigured `helm' for `helm-source-mark-ring'.
+
+\(fn)" t nil)
+
+(autoload 'helm-global-mark-ring "helm-ring" "\
+Preconfigured `helm' for `helm-source-global-mark-ring'.
+
+\(fn)" t nil)
+
+(autoload 'helm-all-mark-rings "helm-ring" "\
+Preconfigured `helm' for `helm-source-global-mark-ring' and `helm-source-mark-ring'.
+
+\(fn)" t nil)
+
+(autoload 'helm-register "helm-ring" "\
+Preconfigured `helm' for Emacs registers.
+
+\(fn)" t nil)
+
+(autoload 'helm-show-kill-ring "helm-ring" "\
+Preconfigured `helm' for `kill-ring'.
+It is drop-in replacement of `yank-pop'.
+
+First call open the kill-ring browser, next calls move to next line.
+
+\(fn)" t nil)
+
+(autoload 'helm-execute-kmacro "helm-ring" "\
+Preconfigured helm for keyboard macros.
+Define your macros with `f3' and `f4'.
+See (info \"(emacs) Keyboard Macros\") for detailed infos.
+This command is useful when used with persistent action.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-semantic" "helm-semantic.el" (22171 46565
+;;;;;;  0 0))
+;;; Generated autoloads from helm-semantic.el
+
+(autoload 'helm-semantic "helm-semantic" "\
+Preconfigured `helm' for `semantic'.
+If ARG is supplied, pre-select symbol at point instead of current
+
+\(fn ARG)" t nil)
+
+(autoload 'helm-semantic-or-imenu "helm-semantic" "\
+Preconfigured helm for `semantic' or `imenu'.
+If ARG is supplied, pre-select symbol at point instead of current
+semantic tag in scope.
+
+If `semantic-mode' is active in the current buffer, then use
+semantic for generating tags, otherwise fall back to `imenu'.
+Fill in the symbol at point by default.
+
+\(fn ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-sys" "helm-sys.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-sys.el
+
+(autoload 'helm-top "helm-sys" "\
+Preconfigured `helm' for top command.
+
+\(fn)" t nil)
+
+(autoload 'helm-list-emacs-process "helm-sys" "\
+Preconfigured `helm' for emacs process.
+
+\(fn)" t nil)
+
+(autoload 'helm-xrandr-set "helm-sys" "\
+Preconfigured helm for xrandr.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "helm-tags" "helm-tags.el" (22171 46565 0 0))
+;;; Generated autoloads from helm-tags.el
+
+(autoload 'helm-etags-select "helm-tags" "\
+Preconfigured helm for etags.
+If called with a prefix argument REINIT
+or if any of the tag files have been modified, reinitialize cache.
+
+This function aggregates three sources of tag files:
+
+  1) An automatically located file in the parent directories,
+     by `helm-etags-get-tag-file'.
+  2) `tags-file-name', which is commonly set by `find-tag' command.
+  3) `tags-table-list' which is commonly set by `visit-tags-table' command.
+
+\(fn REINIT)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("helm-easymenu.el" "helm-multi-match.el"
+;;;;;;  "helm-pkg.el" "helm-plugin.el" "helm-types.el" "helm-utils.el")
+;;;;;;  (22171 46565 964556 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; helm-autoloads.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-bookmark.el b/emacs.d/elpa/helm-20160115.2200/helm-bookmark.el
new file mode 100644
index 0000000..94f63f6
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-bookmark.el
@@ -0,0 +1,739 @@
+;;; helm-bookmark.el --- Helm for Emacs regular Bookmarks. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'bookmark)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-types)
+(require 'helm-utils)
+(require 'helm-info)
+(require 'helm-adaptive)
+(require 'helm-net)
+
+(declare-function addressbook-bookmark-edit "ext:addressbook-bookmark.el" (bookmark))
+(declare-function message-buffers "message.el")
+(declare-function addressbook-set-mail-buffer-1 "ext:addressbook-bookmark.el"
+                  (&optional bookmark-name append cc))
+
+
+(defgroup helm-bookmark nil
+  "Predefined configurations for `helm.el'."
+  :group 'helm)
+
+(defcustom helm-bookmark-show-location nil
+  "Show location of bookmark on display."
+  :group 'helm-bookmark
+  :type 'boolean)
+
+(defcustom helm-bookmark-default-filtered-sources
+  (append '(helm-source-bookmark-files&dirs
+            helm-source-bookmark-helm-find-files
+            helm-source-bookmark-info
+            helm-source-bookmark-gnus
+            helm-source-bookmark-man
+            helm-source-bookmark-images
+            helm-source-bookmark-w3m)
+          (and (locate-library "addressbook-bookmark")
+               (list 'helm-source-bookmark-addressbook))
+          (list 'helm-source-bookmark-uncategorized
+                'helm-source-bookmark-set))
+  "List of sources to use in `helm-filtered-bookmarks'."
+  :group 'helm-bookmark
+  :type '(repeat (choice symbol)))
+
+(defcustom helm-bookmark-addressbook-actions
+  '(("Show Contact(s)"
+     . (lambda (candidate)
+         (let* ((contacts (helm-marked-candidates))
+                (current-prefix-arg helm-current-prefix-arg))
+           (bookmark-jump
+            (helm-bookmark-get-bookmark-from-name (car contacts)))
+           (helm-aif (cdr contacts)
+               (let ((current-prefix-arg '(4)))
+                 (cl-loop for bmk in it do
+                          (bookmark-jump
+                           (helm-bookmark-get-bookmark-from-name bmk))))))))
+    ("Mail To" . helm-bookmark-addressbook-send-mail-1)
+    ("Mail Cc" . (lambda (_candidate)
+                   (helm-bookmark-addressbook-send-mail-1 nil 'cc)))
+    ("Mail Bcc" . (lambda (_candidate)
+                    (helm-bookmark-addressbook-send-mail-1 nil 'bcc)))
+    ("Edit Bookmark"
+     . (lambda (candidate)
+         (let ((bmk (helm-bookmark-get-bookmark-from-name
+                     candidate)))
+           (addressbook-bookmark-edit
+            (assoc bmk bookmark-alist)))))
+    ("Delete bookmark(s)" . helm-delete-marked-bookmarks)
+    ("Insert Email at point"
+     . (lambda (candidate)
+         (let* ((bmk   (helm-bookmark-get-bookmark-from-name
+                        candidate))
+                (mlist (split-string
+                        (assoc-default
+                         'email (assoc bmk bookmark-alist))
+                        ", ")))
+           (insert
+            (if (> (length mlist) 1)
+                (helm-comp-read
+                 "Insert Mail Address: " mlist :must-match t)
+                (car mlist))))))
+    ("Show annotation"
+     . (lambda (candidate)
+         (let ((bmk (helm-bookmark-get-bookmark-from-name
+                     candidate)))
+           (bookmark-show-annotation bmk))))
+    ("Edit annotation"
+     . (lambda (candidate)
+         (let ((bmk (helm-bookmark-get-bookmark-from-name
+                     candidate)))
+           (bookmark-edit-annotation bmk))))
+    ("Show Google map"
+     . (lambda (candidate)
+         (let* ((bmk (helm-bookmark-get-bookmark-from-name
+                      candidate))
+                (full-bmk (assoc bmk bookmark-alist)))
+           (addressbook-google-map full-bmk)))))
+  "Actions for addressbook bookmarks."
+  :group 'helm-bookmark
+  :type '(alist :key-type string :value-type function))
+
+
+(defface helm-bookmark-info
+    '((t (:foreground "green")))
+  "Face used for W3m Emacs bookmarks (not w3m bookmarks)."
+  :group 'helm-bookmark)
+
+(defface helm-bookmark-w3m
+    '((t (:foreground "yellow")))
+  "Face used for W3m Emacs bookmarks (not w3m bookmarks)."
+  :group 'helm-bookmark)
+
+(defface helm-bookmark-gnus
+    '((t (:foreground "magenta")))
+  "Face used for Gnus bookmarks."
+  :group 'helm-bookmark)
+
+(defface helm-bookmark-man
+    '((t (:foreground "Orange4")))
+  "Face used for Woman/man bookmarks."
+  :group 'helm-bookmark)
+
+(defface helm-bookmark-file
+    '((t (:foreground "Deepskyblue2")))
+  "Face used for file bookmarks."
+  :group 'helm-bookmark)
+
+(defface helm-bookmark-directory
+    '((t (:inherit helm-ff-directory)))
+  "Face used for file bookmarks."
+  :group 'helm-bookmark)
+
+(defface helm-bookmark-addressbook
+    '((t (:foreground "tomato")))
+  "Face used for addressbook bookmarks."
+  :group 'helm-bookmark)
+
+
+(defvar helm-bookmark-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "C-c o") 'helm-bookmark-run-jump-other-window)
+    (define-key map (kbd "C-d")   'helm-bookmark-run-delete)
+    (define-key map (kbd "C-]")   'helm-bookmark-toggle-filename)
+    (define-key map (kbd "M-e")   'helm-bookmark-run-edit)
+    map)
+  "Generic Keymap for emacs bookmark sources.")
+
+(defclass helm-source-basic-bookmarks (helm-source-in-buffer helm-type-bookmark)
+   ((init :initform (lambda ()
+                      (bookmark-maybe-load-default-file)
+                      (helm-init-candidates-in-buffer
+                          'global
+                        (bookmark-all-names))))
+    (filtered-candidate-transformer :initform 'helm-bookmark-transformer)))
+
+(defvar helm-source-bookmarks
+  (helm-make-source "Bookmarks" 'helm-source-basic-bookmarks)
+  "See (info \"(emacs)Bookmarks\").")
+
+(defun helm-bookmark-transformer (candidates _source)
+  (cl-loop for i in candidates
+        for loc = (bookmark-location i)
+        for len =  (string-width i)
+        for trunc = (if (> len bookmark-bmenu-file-column)
+                        (helm-substring i bookmark-bmenu-file-column)
+                      i)
+        for sep = (make-string (- (+ bookmark-bmenu-file-column 2)
+                                  (length trunc))
+                               ? )
+        if helm-bookmark-show-location
+        collect (cons (concat trunc sep (if (listp loc) (car loc) loc)) i)
+        else collect i))
+
+(defun helm-bookmark-toggle-filename-1 (_candidate)
+  (let* ((real (helm-get-selection helm-buffer))
+         (trunc (if (> (string-width real) bookmark-bmenu-file-column)
+                    (helm-substring real bookmark-bmenu-file-column)
+                    real))
+         (loc (bookmark-location real)))
+    (setq helm-bookmark-show-location (not helm-bookmark-show-location))
+    (helm-update (if helm-bookmark-show-location
+                           (concat (regexp-quote trunc)
+                                   " +"
+                                   (regexp-quote
+                                    (if (listp loc) (car loc) loc)))
+                           (regexp-quote real)))))
+
+(defun helm-bookmark-toggle-filename ()
+  "Toggle bookmark location visibility."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'toggle-filename
+                  '(helm-bookmark-toggle-filename-1 . never-split))
+    (helm-execute-persistent-action 'toggle-filename)))
+(put 'helm-bookmark-toggle-filename 'helm-only t)
+
+(defun helm-bookmark-jump (candidate)
+  "Jump to bookmark from keyboard."
+  (let ((current-prefix-arg helm-current-prefix-arg)
+        non-essential)
+    (bookmark-jump candidate)))
+
+(defun helm-bookmark-jump-other-window (candidate)
+  (let (non-essential)
+    (bookmark-jump-other-window candidate)))
+
+
+;;; bookmark-set
+;;
+(defvar helm-source-bookmark-set
+  (helm-build-dummy-source "Set Bookmark"
+    :filtered-candidate-transformer
+    (lambda (_candidates _source)
+      (list (or (and (not (string= helm-pattern ""))
+                     helm-pattern)
+                "Enter a bookmark name to record")))
+    :action '(("Set bookmark" . (lambda (candidate)
+                                  (if (string= helm-pattern "")
+                                      (message "No bookmark name given for record")
+                                      (bookmark-set candidate))))))
+  "See (info \"(emacs)Bookmarks\").")
+
+
+;;; Predicates
+;;
+(defconst helm-bookmark--non-file-filename "   - no file -"
+  "Name to use for `filename' entry, for non-file bookmarks.")
+
+(defun helm-bookmark-gnus-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK is a Gnus bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-gnus)
+      (eq (bookmark-get-handler bookmark) 'gnus-summary-bookmark-jump)
+      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-gnus)))
+
+(defun helm-bookmark-w3m-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK is a W3m bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-w3m)
+      (eq (bookmark-get-handler bookmark) 'bookmark-w3m-bookmark-jump)
+      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-w3m)))
+
+(defun helm-bookmark-woman-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK is a Woman bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-woman)
+      (eq (bookmark-get-handler bookmark) 'woman-bookmark-jump)
+      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-woman)))
+
+(defun helm-bookmark-man-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK is a Man bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (or (eq (bookmark-get-handler bookmark) 'bmkext-jump-man)
+      (eq (bookmark-get-handler bookmark) 'Man-bookmark-jump)
+      (eq (bookmark-get-handler bookmark) 'bookmarkp-jump-man)))
+
+(defun helm-bookmark-woman-man-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK is a Man or Woman bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (or (helm-bookmark-man-bookmark-p bookmark)
+      (helm-bookmark-woman-bookmark-p bookmark)))
+
+(defun helm-bookmark-info-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK is an Info bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (eq (bookmark-get-handler bookmark) 'Info-bookmark-jump))
+
+(defun helm-bookmark-image-bookmark-p (bookmark)
+  "Return non-nil if BOOKMARK bookmarks an image file."
+  (if (stringp bookmark)
+      (assoc 'image-type (assoc bookmark bookmark-alist))
+    (assoc 'image-type bookmark)))
+
+(defun helm-bookmark-file-p (bookmark)
+  "Return non-nil if BOOKMARK bookmarks a file or directory.
+BOOKMARK is a bookmark name or a bookmark record.
+This excludes bookmarks of a more specific kind (Info, Gnus, and W3m)."
+  (let* ((filename   (bookmark-get-filename bookmark))
+         (isnonfile  (equal filename helm-bookmark--non-file-filename))) 
+    (and filename (not isnonfile) (not (bookmark-get-handler bookmark)))))
+
+(defun helm-bookmark-helm-find-files-p (bookmark)
+  "Return non-nil if BOOKMARK bookmarks a `helm-find-files' session.
+BOOKMARK is a bookmark name or a bookmark record."
+  (eq (bookmark-get-handler bookmark) 'helm-ff-bookmark-jump))
+
+(defun helm-bookmark-addressbook-p (bookmark)
+  "Return non--nil if BOOKMARK is a contact recorded with addressbook-bookmark.
+BOOKMARK is a bookmark name or a bookmark record."
+  (if (listp bookmark)
+      (string= (assoc-default 'type bookmark) "addressbook")
+    (string= (assoc-default
+              'type (assoc bookmark bookmark-alist)) "addressbook")))
+
+(defun helm-bookmark-uncategorized-bookmark-p (bookmark)
+  "Return non--nil if BOOKMARK match no known category."
+  (cl-loop for pred in '(helm-bookmark-addressbook-p
+                         helm-bookmark-gnus-bookmark-p
+                         helm-bookmark-w3m-bookmark-p
+                         helm-bookmark-woman-man-bookmark-p
+                         helm-bookmark-info-bookmark-p
+                         helm-bookmark-image-bookmark-p
+                         helm-bookmark-file-p
+                         helm-bookmark-helm-find-files-p
+                         helm-bookmark-addressbook-p)
+           never (funcall pred bookmark)))
+
+(defun helm-bookmark-filter-setup-alist (fn)
+  "Return a filtered `bookmark-alist' sorted alphabetically."
+  (cl-loop for b in bookmark-alist
+           for name = (car b)
+           when (funcall fn b) collect
+           (propertize name 'location (bookmark-location name))))
+
+;;; Bookmark handlers
+;;
+(defvar w3m-async-exec)
+(defun helm-bookmark-jump-w3m (bookmark)
+  "Jump to W3m bookmark BOOKMARK, setting a new tab.
+If `browse-url-browser-function' is set to something else
+than `w3m-browse-url' use it."
+  (require 'helm-net)
+  (let ((file  (or (bookmark-prop-get bookmark 'filename)
+                   (bookmark-prop-get bookmark 'url)))
+        (buf   (generate-new-buffer-name "*w3m*"))
+        (w3m-async-exec nil)
+        (really-use-w3m (equal browse-url-browser-function 'w3m-browse-url)))
+    (helm-browse-url file really-use-w3m)
+    (when really-use-w3m
+      (bookmark-default-handler
+       `("" (buffer . ,buf) . ,(bookmark-get-bookmark-record bookmark))))))
+
+;; All bookmarks recorded with the handler provided with w3m
+;; (`bookmark-w3m-bookmark-jump') will use our handler which open
+;; the bookmark in a new tab or in an external browser depending
+;; on `browse-url-browser-function'.
+(defalias 'bookmark-w3m-bookmark-jump 'helm-bookmark-jump-w3m)
+
+;; Provide compatibility with old handlers provided in external
+;; packages bookmark-extensions.el and bookmark+.
+(defalias 'bmkext-jump-woman 'woman-bookmark-jump)
+(defalias 'bmkext-jump-man 'Man-bookmark-jump)
+(defalias 'bmkext-jump-w3m 'helm-bookmark-jump-w3m)
+(defalias 'bmkext-jump-gnus 'gnus-summary-bookmark-jump)
+(defalias 'bookmarkp-jump-gnus 'gnus-summary-bookmark-jump)
+(defalias 'bookmarkp-jump-w3m 'helm-bookmark-jump-w3m)
+(defalias 'bookmarkp-jump-woman 'woman-bookmark-jump)
+(defalias 'bookmarkp-jump-man 'Man-bookmark-jump)
+
+
+;;;; Filtered bookmark sources
+;;
+;;
+(defclass helm-source-filtered-bookmarks (helm-source-in-buffer helm-type-bookmark)
+  ((filtered-candidate-transformer
+    :initform '(helm-adaptive-sort
+                helm-highlight-bookmark))))
+
+;;; W3m bookmarks.
+;;
+(defun helm-bookmark-w3m-setup-alist ()
+  "Specialized filter function for bookmarks w3m."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-w3m-bookmark-p))
+
+(defvar helm-source-bookmark-w3m
+  (helm-make-source "Bookmark W3m" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-w3m-setup-alist)))))
+
+;;; Images
+;;
+(defun helm-bookmark-images-setup-alist ()
+  "Specialized filter function for images bookmarks."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-image-bookmark-p))
+
+(defvar helm-source-bookmark-images
+  (helm-make-source "Bookmark Images" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-images-setup-alist)))))
+
+;;; Woman Man
+;;
+(defun helm-bookmark-man-setup-alist ()
+  "Specialized filter function for bookmarks w3m."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-woman-man-bookmark-p))
+
+(defvar helm-source-bookmark-man
+  (helm-make-source "Bookmark Woman&Man" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-man-setup-alist)))))
+
+;;; Gnus
+;;
+(defun helm-bookmark-gnus-setup-alist ()
+  "Specialized filter function for bookmarks gnus."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-gnus-bookmark-p))
+
+(defvar helm-source-bookmark-gnus
+  (helm-make-source "Bookmark Gnus" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-gnus-setup-alist)))))
+
+;;; Info
+;;
+(defun helm-bookmark-info-setup-alist ()
+  "Specialized filter function for bookmarks info."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-info-bookmark-p))
+
+(defvar helm-source-bookmark-info
+  (helm-make-source "Bookmark Info" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-info-setup-alist)))))
+
+;;; Files and directories
+;;
+(defun helm-bookmark-local-files-setup-alist ()
+  "Specialized filter function for bookmarks locals files."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-file-p))
+
+(defvar helm-source-bookmark-files&dirs
+  (helm-make-source "Bookmark Files&Directories" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-local-files-setup-alist)))))
+
+;;; Helm find files sessions.
+;;
+(defun helm-bookmark-helm-find-files-setup-alist ()
+  "Specialized filter function for `helm-find-files' bookmarks."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-helm-find-files-p))
+
+(defvar helm-source-bookmark-helm-find-files
+  (helm-make-source "Bookmark helm-find-files sessions" 'helm-source-filtered-bookmarks
+      :init (lambda ()
+              (bookmark-maybe-load-default-file)
+              (helm-init-candidates-in-buffer
+                  'global (helm-bookmark-helm-find-files-setup-alist)))
+      :persistent-action (lambda (_candidate) (ignore))
+      :persistent-help "Do nothing"))
+
+;;; Uncategorized bookmarks
+;;
+(defun helm-bookmark-uncategorized-setup-alist ()
+  "Specialized filter function for uncategorized bookmarks."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-uncategorized-bookmark-p))
+
+(defvar helm-source-bookmark-uncategorized
+  (helm-make-source "Bookmark uncategorized" 'helm-source-filtered-bookmarks
+    :init (lambda ()
+            (bookmark-maybe-load-default-file)
+            (helm-init-candidates-in-buffer
+                'global (helm-bookmark-uncategorized-setup-alist)))))
+
+;;; Addressbook.
+;;
+;;
+(defclass helm-bookmark-addressbook-class (helm-source-in-buffer)
+  ((init :initform (lambda ()
+                     (require 'addressbook-bookmark nil t)
+                     (bookmark-maybe-load-default-file)
+                     (helm-init-candidates-in-buffer
+                         'global
+                       (helm-bookmark-addressbook-setup-alist))))
+   (persistent-action :initform
+                      (lambda (candidate)
+                        (let ((bmk (helm-bookmark-get-bookmark-from-name
+                                    candidate)))
+                          (bookmark--jump-via bmk 'switch-to-buffer))))
+   (persistent-help :initform "Show contact - Prefix with C-u to append")
+   (filtered-candidate-transformer :initform
+                                   '(helm-adaptive-sort
+                                     helm-highlight-bookmark))
+   (action :initform 'helm-bookmark-addressbook-actions)))
+
+(defun helm-bookmark-addressbook-send-mail-1 (_candidate &optional cc)
+  (let* ((contacts (helm-marked-candidates))
+         (bookmark      (helm-bookmark-get-bookmark-from-name
+                         (car contacts)))
+         (append   (message-buffers)))
+    (addressbook-set-mail-buffer-1 bookmark append)
+    (helm-aif (cdr contacts)
+        (progn
+          (when cc (addressbook-set-mail-buffer-1 (car it) nil cc))
+          (cl-loop for bmk in (cdr it) do
+                   (addressbook-set-mail-buffer-1
+                    (helm-bookmark-get-bookmark-from-name bmk) 'append cc))))))
+
+(defun helm-bookmark-addressbook-setup-alist ()
+  "Specialized filter function for addressbook bookmarks."
+  (helm-bookmark-filter-setup-alist 'helm-bookmark-addressbook-p))
+
+(defvar helm-source-bookmark-addressbook
+  (helm-make-source "Bookmark Addressbook" 'helm-bookmark-addressbook-class))
+
+;;; Transformer
+;;
+
+(defun helm-highlight-bookmark (bookmarks _source)
+  "Used as `filtered-candidate-transformer' to colorize bookmarks.
+Work both with standard Emacs bookmarks and bookmark-extensions.el."
+  (let ((non-essential t))
+    (cl-loop for i in bookmarks
+          for isfile        = (bookmark-get-filename i)
+          for hff           = (helm-bookmark-helm-find-files-p i)
+          for handlerp      = (and (fboundp 'bookmark-get-handler)
+                                   (bookmark-get-handler i))
+          for isw3m         = (and (fboundp 'helm-bookmark-w3m-bookmark-p)
+                                   (helm-bookmark-w3m-bookmark-p i))
+          for isgnus        = (and (fboundp 'helm-bookmark-gnus-bookmark-p)
+                                   (helm-bookmark-gnus-bookmark-p i))
+          for isman         = (and (fboundp 'helm-bookmark-man-bookmark-p) ; Man
+                                   (helm-bookmark-man-bookmark-p i))
+          for iswoman       = (and (fboundp 'helm-bookmark-woman-bookmark-p) ; Woman
+                                   (helm-bookmark-woman-bookmark-p i))
+          for isannotation  = (bookmark-get-annotation i)
+          for isabook       = (string= (bookmark-prop-get i 'type)
+                                       "addressbook")
+          for isinfo        = (eq handlerp 'Info-bookmark-jump)
+          for loc = (bookmark-location i)
+          for len =  (string-width i)
+          for trunc = (if (and helm-bookmark-show-location
+                               (> len bookmark-bmenu-file-column))
+                          (helm-substring
+                           i bookmark-bmenu-file-column)
+                        i)
+          ;; Add a * if bookmark have annotation
+          if (and isannotation (not (string-equal isannotation "")))
+          do (setq trunc (concat "*" (if helm-bookmark-show-location trunc i)))
+          for sep = (and helm-bookmark-show-location
+                         (make-string (- (+ bookmark-bmenu-file-column 2)
+                                         (string-width trunc))
+                                      ? ))
+          for bmk = (cond ( ;; info buffers
+                           isinfo
+                           (propertize trunc 'face 'helm-bookmark-info
+                                       'help-echo isfile))
+                          ( ;; w3m buffers
+                           isw3m
+                           (propertize trunc 'face 'helm-bookmark-w3m
+                                       'help-echo isfile))
+                          ( ;; gnus buffers
+                           isgnus
+                           (propertize trunc 'face 'helm-bookmark-gnus
+                                       'help-echo isfile))
+                          ( ;; Man Woman
+                           (or iswoman isman)
+                           (propertize trunc 'face 'helm-bookmark-man
+                                       'help-echo isfile))
+                          ( ;; Addressbook
+                           isabook
+                           (propertize trunc 'face 'helm-bookmark-addressbook))
+                          ( ;; directories
+                           (and isfile
+                                (or hff
+                                    ;; This is needed because `non-essential'
+                                    ;; is not working on Emacs-24.2 and the behavior
+                                    ;; of tramp seems to have changed since previous
+                                    ;; versions (Need to reenter password even if a
+                                    ;; first connection have been established,
+                                    ;; probably when host is named differently
+                                    ;; i.e machine/localhost)
+                                    (and (not (file-remote-p isfile))
+                                         (file-directory-p isfile))))
+                           (propertize trunc 'face 'helm-bookmark-directory
+                                       'help-echo isfile))
+                          ( ;; regular files
+                           t
+                           (propertize trunc 'face 'helm-bookmark-file
+                                       'help-echo isfile)))
+          collect (if helm-bookmark-show-location
+                      (cons (concat bmk sep (if (listp loc) (car loc) loc))
+                            i)
+                    (cons bmk i)))))
+
+
+;;; Edit/rename/save bookmarks.
+;;
+;;
+(defun helm-bookmark-edit-bookmark (bookmark-name)
+  "Edit bookmark's name and file name, and maybe save them.
+BOOKMARK-NAME is the current (old) name of the bookmark to be renamed."
+  (let ((bmk (helm-bookmark-get-bookmark-from-name bookmark-name))
+        (handler (bookmark-prop-get bookmark-name 'handler)))
+    (if (eq handler 'addressbook-bookmark-jump)
+        (addressbook-bookmark-edit
+         (assoc bmk bookmark-alist))
+      (helm-bookmark-edit-bookmark-1 bookmark-name handler))))
+
+(defun helm-bookmark-edit-bookmark-1 (bookmark-name handler)
+  (let* ((helm--reading-passwd-or-string t)
+         (bookmark-fname (bookmark-get-filename bookmark-name))
+         (bookmark-loc   (bookmark-prop-get bookmark-name 'location))
+         (new-name       (read-from-minibuffer "Name: " bookmark-name))
+         (new-loc        (read-from-minibuffer "FileName or Location: "
+                                               (or bookmark-fname
+                                                   (if (consp bookmark-loc)
+                                                       (car bookmark-loc)
+                                                     bookmark-loc))))
+         (docid           (and (eq handler 'mu4e-bookmark-jump)
+                               (read-number "Docid: " (cdr bookmark-loc)))))
+    (when docid
+      (setq new-loc (cons new-loc docid)))
+    (when (and (not (equal new-name "")) (not (equal new-loc ""))
+               (y-or-n-p "Save changes? "))
+      (if bookmark-fname
+          (progn
+            (helm-bookmark-rename bookmark-name new-name 'batch)
+            (bookmark-set-filename new-name new-loc))
+        (bookmark-prop-set
+         (bookmark-get-bookmark bookmark-name) 'location new-loc)
+        (helm-bookmark-rename bookmark-name new-name 'batch))
+      (helm-bookmark-maybe-save-bookmark)
+      (list new-name new-loc))))
+
+(defun helm-bookmark-maybe-save-bookmark ()
+  "Increment save counter and maybe save `bookmark-alist'."
+  (setq bookmark-alist-modification-count (1+ bookmark-alist-modification-count))
+  (when (bookmark-time-to-save-p) (bookmark-save)))
+
+(defun helm-bookmark-rename (old &optional new batch)
+  "Change bookmark's name from OLD to NEW.
+Interactively:
+ If called from the keyboard, then prompt for OLD.
+ If called from the menubar, select OLD from a menu.
+If NEW is nil, then prompt for its string value.
+
+If BATCH is non-nil, then do not rebuild the menu list.
+
+While the user enters the new name, repeated `C-w' inserts consecutive
+words from the buffer into the new bookmark name."
+  (interactive (list (bookmark-completing-read "Old bookmark name")))
+  (bookmark-maybe-historicize-string old)
+  (bookmark-maybe-load-default-file)
+  (save-excursion (skip-chars-forward " ") (setq bookmark-yank-point (point)))
+  (setq bookmark-current-buffer (current-buffer))
+  (let ((newname  (or new  (read-from-minibuffer
+                            "New name: " nil
+                            (let ((now-map  (copy-keymap minibuffer-local-map)))
+                              (define-key now-map  "\C-w" 'bookmark-yank-word)
+                              now-map)
+                            nil 'bookmark-history))))
+    (bookmark-set-name old newname)
+    (setq bookmark-current-bookmark  newname)
+    (unless batch (bookmark-bmenu-surreptitiously-rebuild-list))
+    (helm-bookmark-maybe-save-bookmark) newname))
+
+(defun helm-bookmark-run-edit ()
+  "Run `helm-bookmark-edit-bookmark' from keyboard."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-bookmark-edit-bookmark)))
+(put 'helm-bookmark-run-edit 'helm-only t)
+
+
+(defun helm-bookmark-run-jump-other-window ()
+  "Jump to bookmark from keyboard."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'bookmark-jump-other-window)))
+(put 'helm-bookmark-run-jump-other-window 'helm-only t)
+
+(defun helm-bookmark-run-delete ()
+  "Delete bookmark from keyboard."
+  (interactive)
+  (with-helm-alive-p
+    (when (y-or-n-p "Delete bookmark(s)?")
+      (helm-exit-and-execute-action 'helm-delete-marked-bookmarks))))
+(put 'helm-bookmark-run-delete 'helm-only t)
+
+(defun helm-bookmark-get-bookmark-from-name (bmk)
+  "Return bookmark name even if it is a bookmark with annotation.
+e.g prepended with *."
+  (let ((bookmark (replace-regexp-in-string "\\`\\*" "" bmk)))
+    (if (assoc bookmark bookmark-alist) bookmark bmk)))
+
+(defun helm-delete-marked-bookmarks (_ignore)
+  "Delete this bookmark or all marked bookmarks."
+  (cl-dolist (i (helm-marked-candidates))
+    (bookmark-delete (helm-bookmark-get-bookmark-from-name i)
+                     'batch)))
+
+
+;;;###autoload
+(defun helm-bookmarks ()
+  "Preconfigured `helm' for bookmarks."
+  (interactive)
+  (helm :sources '(helm-source-bookmarks
+                   helm-source-bookmark-set)
+        :buffer "*helm bookmarks*"
+        :default (buffer-name helm-current-buffer)))
+
+;;;###autoload
+(defun helm-filtered-bookmarks ()
+  "Preconfigured helm for bookmarks (filtered by category).
+Optional source `helm-source-bookmark-addressbook' is loaded
+only if external library addressbook-bookmark.el is available."
+  (interactive)
+  (helm :sources helm-bookmark-default-filtered-sources
+        :prompt "Search Bookmark: "
+        :buffer "*helm filtered bookmarks*"
+        :default (list (thing-at-point 'symbol)
+                       (buffer-name helm-current-buffer))))
+
+(provide 'helm-bookmark)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-bookmark.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-buffers.el b/emacs.d/elpa/helm-20160115.2200/helm-buffers.el
new file mode 100644
index 0000000..c456b86
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-buffers.el
@@ -0,0 +1,895 @@
+;;; helm-buffers.el --- helm support for buffers. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-types)
+(require 'helm-utils)
+(require 'helm-elscreen)
+(require 'helm-grep)
+(require 'helm-plugin)
+(require 'helm-regexp)
+(require 'helm-help)
+
+(declare-function ido-make-buffer-list "ido" (default))
+(declare-function ido-add-virtual-buffers-to-list "ido")
+(declare-function helm-comp-read "helm-mode")
+
+
+(defgroup helm-buffers nil
+  "Buffers related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-boring-buffer-regexp-list
+  '("\\` " "\\*helm" "\\*helm-mode" "\\*Echo Area" "\\*Minibuf")
+  "The regexp list that match boring buffers.
+Buffer candidates matching these regular expression will be
+filtered from the list of candidates if the
+`helm-skip-boring-buffers' candidate transformer is used."
+  :type  '(repeat (choice regexp))
+  :group 'helm-buffers)
+
+(defcustom helm-white-buffer-regexp-list nil
+  "The regexp list of not boring buffers.
+These buffers will be displayed even if they match one of
+`helm-boring-buffer-regexp-list'."
+  :type '(repeat (choice regexp))
+  :group 'helm-buffers)
+
+(defcustom helm-buffers-favorite-modes '(lisp-interaction-mode
+                                         emacs-lisp-mode
+                                         text-mode
+                                         org-mode)
+  "List of preferred mode to open new buffers with."
+  :type '(repeat (choice function))
+  :group 'helm-buffers)
+
+(defcustom helm-buffer-max-length 20
+  "Max length of buffer names before truncate.
+When disabled (nil) use the longest buffer-name length found."
+  :group 'helm-buffers
+  :type  '(choice (const :tag "Disabled" nil)
+           (integer :tag "Length before truncate")))
+
+(defcustom helm-buffer-details-flag t
+  "Always show details in buffer list when non--nil."
+  :group 'helm-buffers
+  :type 'boolean)
+
+(defcustom helm-buffers-fuzzy-matching nil
+  "Fuzzy matching buffer names when non--nil.
+Only buffer names are fuzzy matched when this is enabled,
+`major-mode' matching is not affected by this."
+  :group 'helm-buffers
+  :type 'boolean)
+
+(defcustom helm-buffer-skip-remote-checking nil
+  "Ignore checking for `file-exists-p' on remote files."
+  :group 'helm-buffers
+  :type 'boolean)
+
+(defcustom helm-buffers-truncate-lines t
+  "Truncate lines in `helm-buffers-list' when non--nil."
+  :group 'helm-buffers
+  :type 'boolean)
+
+(defcustom helm-mini-default-sources '(helm-source-buffers-list
+                                       helm-source-recentf
+                                       helm-source-buffer-not-found)
+  "Default sources list used in `helm-mini'."
+  :group 'helm-buffers
+  :type '(repeat (choice symbol)))
+
+(defcustom helm-buffers-end-truncated-string "..."
+  "The string to display at end of truncated buffer names."
+  :type 'string
+  :group 'helm-buffers)
+
+
+;;; Faces
+;;
+;;
+(defgroup helm-buffers-faces nil
+  "Customize the appearance of helm-buffers."
+  :prefix "helm-"
+  :group 'helm-buffers
+  :group 'helm-faces)
+
+(defface helm-buffer-saved-out
+    '((t (:foreground "red" :background "black")))
+  "Face used for buffer files modified outside of emacs."
+  :group 'helm-buffers-faces)
+
+(defface helm-buffer-not-saved
+    '((t (:foreground "Indianred2")))
+  "Face used for buffer files not already saved on disk."
+  :group 'helm-buffers-faces)
+
+(defface helm-buffer-size
+    '((((background dark)) :foreground "RosyBrown")
+      (((background light)) :foreground "SlateGray"))
+  "Face used for buffer size."
+  :group 'helm-buffers-faces)
+
+(defface helm-buffer-process
+    '((t (:foreground "Sienna3")))
+  "Face used for process status in buffer."
+  :group 'helm-buffers-faces)
+
+(defface helm-buffer-directory
+    '((t (:foreground "DarkRed" :background "LightGray")))
+  "Face used for directories in `helm-buffers-list'."
+  :group 'helm-buffers-faces)
+
+(defface helm-buffer-file
+    '((t :inherit font-lock-builtin-face))
+  "Face for buffer file names in `helm-buffers-list'."
+  :group 'helm-buffers-faces)
+
+
+;;; Buffers keymap
+;;
+(defvar helm-buffer-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    ;; No need to have separate command for grep and zgrep
+    ;; as we don't use recursivity for buffers.
+    ;; So use zgrep for both as it is capable to handle non--compressed files.
+    (define-key map (kbd "M-g s")     'helm-buffer-run-zgrep)
+    (define-key map (kbd "C-s")       'helm-buffers-run-multi-occur)
+    (define-key map (kbd "C-c o")     'helm-buffer-switch-other-window)
+    (define-key map (kbd "C-c C-o")   'helm-buffer-switch-other-frame)
+    (define-key map (kbd "C-c =")     'helm-buffer-run-ediff)
+    (define-key map (kbd "M-=")       'helm-buffer-run-ediff-merge)
+    (define-key map (kbd "C-=")       'helm-buffer-diff-persistent)
+    (define-key map (kbd "M-U")       'helm-buffer-revert-persistent)
+    (define-key map (kbd "C-c d")     'helm-buffer-run-kill-persistent)
+    (define-key map (kbd "M-D")       'helm-buffer-run-kill-buffers)
+    (define-key map (kbd "C-x C-s")   'helm-buffer-save-persistent)
+    (define-key map (kbd "C-M-%")     'helm-buffer-run-query-replace-regexp)
+    (define-key map (kbd "M-%")       'helm-buffer-run-query-replace)
+    (define-key map (kbd "M-m")       'helm-toggle-all-marks)
+    (define-key map (kbd "M-a")       'helm-mark-all)
+    (define-key map (kbd "C-]")       'helm-toggle-buffers-details)
+    (define-key map (kbd "C-c a")     'helm-buffers-toggle-show-hidden-buffers)
+    (define-key map (kbd "<C-M-SPC>") 'helm-buffers-mark-similar-buffers)
+    map)
+  "Keymap for buffer sources in helm.")
+
+(defvar helm-buffers-ido-virtual-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "C-c o")   'helm-ff-run-switch-other-window)
+    (define-key map (kbd "C-c C-o") 'helm-ff-run-switch-other-frame)
+    (define-key map (kbd "M-g s")   'helm-ff-run-grep)
+    (define-key map (kbd "M-g z")   'helm-ff-run-zgrep)
+    (define-key map (kbd "M-D")     'helm-ff-run-delete-file)
+    (define-key map (kbd "C-c C-x") 'helm-ff-run-open-file-externally)
+    map))
+
+
+(defvar helm-buffers-list-cache nil)
+(defvar helm-buffer-max-len-mode nil)
+
+(defun helm-buffers-list--init ()
+  ;; Issue #51 Create the list before `helm-buffer' creation.
+  (setq helm-buffers-list-cache (funcall (helm-attr 'buffer-list)))
+  (let ((result (cl-loop for b in helm-buffers-list-cache
+                         maximize (length b) into len-buf
+                         maximize (length (with-current-buffer b
+                                            (format-mode-line mode-name)))
+                         into len-mode
+                         finally return (cons len-buf len-mode))))
+    (unless (default-value 'helm-buffer-max-length)
+      (helm-set-local-variable 'helm-buffer-max-length (car result)))
+    (unless (default-value 'helm-buffer-max-len-mode)
+      (helm-set-local-variable 'helm-buffer-max-len-mode (cdr result)))))
+
+(defclass helm-source-buffers (helm-source-sync helm-type-buffer)
+  ((buffer-list
+    :initarg :buffer-list
+    :initform #'helm-buffer-list
+    :custom function
+    :documentation
+    "  A function with no arguments to create buffer list.")
+   (init :initform 'helm-buffers-list--init)
+   (candidates :initform helm-buffers-list-cache)
+   (matchplugin :initform nil)
+   (match :initform 'helm-buffers-match-function)
+   (persistent-action :initform 'helm-buffers-list-persistent-action)
+   (resume :initform (lambda ()
+                       (run-with-idle-timer
+                        0.1 nil (lambda ()
+                                  (with-helm-buffer
+                                    (helm-force-update))))))
+   (keymap :initform helm-buffer-map)
+   (migemo :initform 'nomultimatch)
+   (volatile :initform t)
+   (help-message :initform 'helm-buffer-help-message)
+   (persistent-help
+    :initform
+    "Show this buffer / C-u \\[helm-execute-persistent-action]: Kill this buffer")))
+
+(defvar helm-source-buffers-list nil)
+
+(defvar helm-source-buffer-not-found
+  (helm-build-dummy-source
+   "Create buffer"
+   :action (helm-make-actions
+            "Create buffer (C-u choose mode)"
+            (lambda (candidate)
+             (let ((mjm (or (and helm-current-prefix-arg
+                                 (intern-soft (helm-comp-read
+                                               "Major-mode: "
+                                               helm-buffers-favorite-modes)))
+                            (cl-loop for (r . m) in auto-mode-alist
+                                     when (string-match r candidate)
+                                     return m)))
+                   (buffer (get-buffer-create candidate)))
+               (if mjm
+                   (with-current-buffer buffer (funcall mjm))
+                   (set-buffer-major-mode buffer))
+               (switch-to-buffer buffer))))))
+
+(defvar ido-temp-list)
+(defvar ido-ignored-list)
+(defvar ido-process-ignore-lists)
+(defvar ido-use-virtual-buffers)
+(defvar ido-virtual-buffers)
+
+(defvar helm-source-ido-virtual-buffers
+  (helm-build-sync-source "Ido virtual buffers"
+    :candidates (lambda ()
+                  (let (ido-temp-list
+                        ido-ignored-list
+                        (ido-process-ignore-lists t))
+                    (when ido-use-virtual-buffers
+                      (ido-add-virtual-buffers-to-list)
+                      ido-virtual-buffers)))
+    :fuzzy-match helm-buffers-fuzzy-matching
+    :keymap helm-buffers-ido-virtual-map
+    :help-message 'helm-buffers-ido-virtual-help-message
+    :action '(("Find file" . helm-find-many-files)
+              ("Find file other window" . find-file-other-window)
+              ("Find file other frame" . find-file-other-frame)
+              ("Find file as root" . helm-find-file-as-root)
+              ("Grep File(s) `C-u recurse'" . helm-find-files-grep)
+              ("Zgrep File(s) `C-u Recurse'" . helm-ff-zgrep)
+              ("View file" . view-file)
+              ("Delete file(s)" . helm-delete-marked-files)
+              ("Open file externally (C-u to choose)"
+               . helm-open-file-externally))))
+
+
+(defvar ido-use-virtual-buffers)
+(defvar ido-ignore-buffers)
+(defun helm-buffer-list ()
+  "Return the current list of buffers.
+Currently visible buffers are put at the end of the list.
+See `ido-make-buffer-list' for more infos."
+  (require 'ido)
+  (let ((ido-process-ignore-lists t)
+        ido-ignored-list
+        ido-ignore-buffers
+        ido-use-virtual-buffers)
+    (ido-make-buffer-list nil)))
+
+(defun helm-buffer-size (buffer)
+  "Return size of BUFFER."
+  (with-current-buffer buffer
+    (save-restriction
+      (widen)
+      (helm-file-human-size
+       (- (position-bytes (point-max))
+          (position-bytes (point-min)))))))
+
+(defun helm-buffer--show-details (buf-name prefix help-echo
+                                  size mode dir face1 face2
+                                  proc details type)
+  (append
+   (list
+    (concat prefix
+            (propertize buf-name 'face face1
+                        'help-echo help-echo
+                        'type type)))
+   (and details
+        (list size mode
+              (propertize
+               (if proc
+                   (format "(%s %s in `%s')"
+                           (process-name proc)
+                           (process-status proc) dir)
+                 (format "(in `%s')" dir))
+               'face face2)))))
+
+(defun helm-buffer--details (buffer &optional details)
+  (let* ((mode (with-current-buffer buffer (format-mode-line mode-name)))
+         (buf (get-buffer buffer))
+         (size (propertize (helm-buffer-size buf)
+                           'face 'helm-buffer-size))
+         (proc (get-buffer-process buf))
+         (dir (with-current-buffer buffer (abbreviate-file-name default-directory)))
+         (file-name (helm-aif (buffer-file-name buf) (abbreviate-file-name it)))
+         (name (buffer-name buf))
+         (name-prefix (when (file-remote-p dir)
+                        (propertize "@ " 'face 'helm-ff-prefix))))
+    ;; No fancy things on remote buffers.
+    (if (and name-prefix helm-buffer-skip-remote-checking)
+        (helm-buffer--show-details
+         name name-prefix file-name size mode dir
+         'helm-buffer-file 'helm-buffer-process nil details 'filebuf)
+      (cond
+        ( ;; A dired buffer.
+         (rassoc buf dired-buffers)
+         (helm-buffer--show-details
+          name name-prefix dir size mode dir
+          'helm-buffer-directory 'helm-buffer-process nil details 'dired))
+        ;; A buffer file modified somewhere outside of emacs.=>red
+        ((and file-name
+              (file-exists-p file-name)
+              (not (verify-visited-file-modtime buf)))
+         (helm-buffer--show-details
+          name name-prefix file-name size mode dir
+          'helm-buffer-saved-out 'helm-buffer-process nil details 'modout))
+        ;; A new buffer file not already saved on disk (or a deleted file) .=>indianred2
+        ((and file-name (not (file-exists-p file-name)))
+         (helm-buffer--show-details
+          name name-prefix file-name size mode dir
+          'helm-buffer-not-saved 'helm-buffer-process nil details 'notsaved))
+        ;; A buffer file modified and not saved on disk.=>orange
+        ((and file-name (buffer-modified-p buf))
+         (helm-buffer--show-details
+          name name-prefix file-name size mode dir
+          'helm-ff-symlink 'helm-buffer-process nil details 'mod))
+        ;; A buffer file not modified and saved on disk.=>green
+        (file-name
+         (helm-buffer--show-details
+          name name-prefix file-name size mode dir
+          'helm-buffer-file 'helm-buffer-process nil details 'filebuf))
+        ;; Any non--file buffer.=>grey italic
+        (t
+         (helm-buffer--show-details
+          name (and proc name-prefix) dir size mode dir
+          'italic 'helm-buffer-process proc details 'nofile))))))
+
+(defun helm-highlight-buffers (buffers _source)
+  "Transformer function to highlight BUFFERS list.
+Should be called after others transformers i.e (boring buffers)."
+  (cl-loop for i in buffers
+        for (name size mode meta) = (if helm-buffer-details-flag
+                                        (helm-buffer--details i 'details)
+                                      (helm-buffer--details i))
+        for truncbuf = (if (> (string-width name) helm-buffer-max-length)
+                           (helm-substring-by-width
+                            name helm-buffer-max-length
+                            helm-buffers-end-truncated-string)
+                         (concat name
+                                 (make-string
+                                       (- (+ helm-buffer-max-length
+                                             (length helm-buffers-end-truncated-string))
+                                          (string-width name)) ? )))
+        for len = (length mode)
+        when (> len helm-buffer-max-len-mode)
+        do (setq helm-buffer-max-len-mode len)
+        for fmode = (concat (make-string
+                             (- (max helm-buffer-max-len-mode len) len) ? )
+                            mode)
+        ;; The max length of a number should be 1023.9X where X is the
+        ;; units, this is 7 characters.
+        for formatted-size = (and size (format "%7s" size))
+        collect (cons (if helm-buffer-details-flag
+                          (concat truncbuf "\t" formatted-size
+                                  "  " fmode "  " meta)
+                        name)
+                      (get-buffer i))))
+
+(defun helm-buffer--get-preselection (buffer)
+  (let ((bufname (buffer-name buffer)))
+    (concat "^"
+            (if (and (null helm-buffer-details-flag)
+                     (numberp helm-buffer-max-length)
+                     (> (string-width bufname)
+                        helm-buffer-max-length))
+                (regexp-quote
+                 (helm-substring-by-width
+                  bufname helm-buffer-max-length
+                  helm-buffers-end-truncated-string))
+                (concat (regexp-quote bufname)
+                        (if helm-buffer-details-flag
+                            "$" "[[:blank:]]+"))))))
+
+(defun helm-toggle-buffers-details ()
+  (interactive)
+  (with-helm-alive-p
+    (let ((preselect (helm-buffer--get-preselection
+                      (helm-get-selection))))
+      (setq helm-buffer-details-flag (not helm-buffer-details-flag))
+      (helm-force-update preselect))))
+(put 'helm-toggle-buffers-details 'helm-only t)
+
+(defun helm-buffers-sort-transformer (candidates _source)
+  (if (string= helm-pattern "")
+      candidates
+    (sort candidates
+          (lambda (s1 s2)
+              (< (string-width s1) (string-width s2))))))
+
+(defun helm-buffers-mark-similar-buffers-1 ()
+  (with-helm-window
+    (let ((type (get-text-property
+                 0 'type (helm-get-selection nil 'withprop))))
+      (save-excursion
+        (goto-char (helm-get-previous-header-pos))
+        (helm-next-line)
+        (let* ((next-head (helm-get-next-header-pos))
+               (end       (and next-head
+                               (save-excursion
+                                 (goto-char next-head)
+                                 (forward-line -1)
+                                 (point))))
+               (maxpoint  (or end (point-max))))
+          (while (< (point) maxpoint)
+            (helm-mark-current-line)
+            (let ((cand (helm-get-selection nil 'withprop)))
+              (when (and (not (helm-this-visible-mark))
+                         (eq (get-text-property 0 'type cand) type))
+                (helm-make-visible-mark)))
+            (forward-line 1) (end-of-line))))
+      (helm-mark-current-line)
+      (helm-display-mode-line (helm-get-current-source) t)
+      (message "%s candidates marked" (length helm-marked-candidates)))))
+
+(defun helm-buffers-mark-similar-buffers ()
+    "Mark All buffers that have same property `type' than current.
+i.e same color."
+  (interactive)
+  (with-helm-alive-p
+    (let ((marked (helm-marked-candidates)))
+      (if (and (>= (length marked) 1)
+               (with-helm-window helm-visible-mark-overlays))
+          (helm-unmark-all)
+          (helm-buffers-mark-similar-buffers-1)))))
+(put 'helm-buffers-mark-similar-buffers 'helm-only t)
+
+
+;;; match functions
+;;
+(defun helm-buffer--match-mjm (pattern mjm)
+  (when (string-match "\\`\\*" pattern)
+    (cl-loop with patterns = (split-string (substring pattern 1) ",")
+             for pat in patterns
+             if (string-match "\\`!" pat)
+             collect (string-match (substring pat 1) mjm) into neg
+             else collect (string-match pat mjm) into pos
+             finally return
+             (let ((neg-test (cl-loop for i in neg thereis (numberp i)))
+                   (pos-test (cl-loop for i in pos thereis (numberp i))))
+               (or
+                (and neg (not pos) (not neg-test))
+                (and pos pos-test)
+                (and neg neg-test (not neg-test)))))))
+
+(defun helm-buffer--match-pattern (pattern candidate)
+  (let ((bfn (if (and helm-buffers-fuzzy-matching
+                      (not helm-migemo-mode)
+                      (not (string-match "\\`\\^" pattern)))
+                 #'helm--mapconcat-pattern
+                 #'identity))
+        (mfn (if helm-migemo-mode
+                 #'helm-mm-migemo-string-match #'string-match)))
+    (if (string-match "\\`!" pattern)
+        (not (funcall mfn (funcall bfn (substring pattern 1))
+                      candidate))
+        (funcall mfn (funcall bfn pattern) candidate))))
+
+(defun helm-buffers--match-from-mjm (candidate)
+  (let* ((cand (replace-regexp-in-string "^\\s-\\{1\\}" "" candidate))
+         (buf  (get-buffer cand))
+         (regexp (cl-loop with pattern = helm-pattern
+                          for p in (split-string pattern)
+                          when (string-match "\\`\\*" p)
+                          return p)))
+    (if regexp
+        (when buf
+          (with-current-buffer buf
+            (let ((mjm (format-mode-line mode-name)))
+              (helm-buffer--match-mjm regexp mjm))))
+        t)))
+
+(defun helm-buffers--match-from-pat (candidate)
+  (let ((regexp-list (cl-loop with pattern = helm-pattern
+                              for p in (split-string pattern)
+                              unless (string-match
+                                      "\\`\\(\\*\\)\\|\\(/\\)\\|\\(@\\)" p)
+                              collect p)))
+    (if regexp-list
+        (cl-loop for re in regexp-list
+                 always (helm-buffer--match-pattern re candidate))
+        t)))
+
+(defun helm-buffers--match-from-inside (candidate)
+  (let* ((cand (replace-regexp-in-string "^\\s-\\{1\\}" "" candidate))
+         (buf  (get-buffer cand))
+         (regexp (cl-loop with pattern = helm-pattern
+                          for p in (split-string pattern)
+                          when (string-match "\\`@\\(.*\\)" p)
+                          return (match-string 1 p))))
+    (if (and buf regexp)
+        (with-current-buffer buf
+          (save-excursion
+            (goto-char (point-min))
+            (if helm-migemo-mode
+                (helm-mm-migemo-forward regexp nil t)
+             (re-search-forward regexp nil t))))
+        t)))
+
+(defun helm-buffers--match-from-directory (candidate)
+  (let* ((cand (replace-regexp-in-string "^\\s-\\{1\\}" "" candidate))
+         (buf  (get-buffer cand))
+         (buf-fname (buffer-file-name buf))
+         (regexps (cl-loop with pattern = helm-pattern
+                          for p in (split-string pattern)
+                          when (string-match "\\`/" p)
+                          collect p)))
+    (if regexps
+        (cl-loop for re in regexps
+                 thereis 
+                 (and buf-fname
+                      (string-match
+                       (substring re 1) (helm-basedir buf-fname))))
+        t)))
+
+(defun helm-buffers-match-function (candidate)
+  "Default function to match buffers."
+  (and (helm-buffers--match-from-pat candidate)
+       (helm-buffers--match-from-mjm candidate)
+       (helm-buffers--match-from-inside candidate)
+       (helm-buffers--match-from-directory candidate)))
+
+
+(defun helm-buffer-query-replace-1 (&optional regexp-flag buffers)
+  "Query replace in marked buffers.
+If REGEXP-FLAG is given use `query-replace-regexp'."
+  (let ((prompt (if regexp-flag "Query replace regexp" "Query replace"))
+        (bufs   (or buffers (helm-marked-candidates)))
+        (helm--reading-passwd-or-string t))
+    (cl-loop with args = (query-replace-read-args prompt regexp-flag t)
+             for buf in bufs
+             do
+             (save-window-excursion
+               (switch-to-buffer buf)
+               (save-excursion
+                 (let ((case-fold-search t))
+                   (goto-char (point-min))
+                   (apply #'perform-replace
+                          (list (nth 0 args) (nth 1 args)
+                                t regexp-flag (nth 2 args) nil
+                                multi-query-replace-map))))))))
+
+(defun helm-buffer-query-replace-regexp (_candidate)
+  (helm-buffer-query-replace-1 'regexp))
+
+(defun helm-buffer-query-replace (_candidate)
+  (helm-buffer-query-replace-1))
+
+(defun helm-buffer-toggle-diff (candidate)
+  "Toggle diff buffer CANDIDATE with it's file."
+  (let (helm-persistent-action-use-special-display)
+    (helm-aif (get-buffer-window "*Diff*")
+        (progn (kill-buffer "*Diff*")
+               (set-window-buffer it helm-current-buffer))
+      (diff-buffer-with-file (get-buffer candidate)))))
+
+(defun helm-buffer-diff-persistent ()
+  "Toggle diff buffer without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'diff-action 'helm-buffer-toggle-diff)
+    (helm-execute-persistent-action 'diff-action)))
+(put 'helm-buffer-diff-persistent 'helm-only t)
+
+(defun helm-revert-buffer (candidate)
+  (with-current-buffer candidate
+    (helm-aif (buffer-file-name)
+        (and (file-exists-p it) (revert-buffer t t)))))
+
+(defun helm-revert-marked-buffers (_ignore)
+  (mapc 'helm-revert-buffer (helm-marked-candidates)))
+
+(defun helm-buffer-revert-and-update (_candidate)
+  (let ((marked (helm-marked-candidates))
+        (preselect (helm-buffers--quote-truncated-buffer
+                    (helm-get-selection))))
+    (cl-loop for buf in marked do (helm-revert-buffer buf))
+    (when (> (length marked) 1) (helm-unmark-all))
+    (helm-force-update preselect)))
+
+(defun helm-buffer-revert-persistent ()
+  "Revert buffer without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'revert-action '(helm-buffer-revert-and-update . never-split))
+    (helm-execute-persistent-action 'revert-action)))
+(put 'helm-buffer-revert-persistent 'helm-only t)
+
+(defun helm-buffer-save-and-update (_candidate)
+  (let ((marked (helm-marked-candidates))
+        (preselect (helm-get-selection nil t))
+        (enable-recursive-minibuffers t))
+    (cl-loop for buf in marked do
+          (with-current-buffer (get-buffer buf)
+            (when (buffer-file-name) (save-buffer))))
+    (when (> (length marked) 1) (helm-unmark-all))
+    (helm-force-update (regexp-quote preselect))))
+
+(defun helm-buffer-save-persistent ()
+  "Save buffer without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'save-action '(helm-buffer-save-and-update . never-split))
+    (helm-execute-persistent-action 'save-action)))
+(put 'helm-buffer-save-persistent 'helm-only t)
+
+(defun helm-buffer-run-kill-persistent ()
+  "Kill buffer without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'kill-action '(helm-buffers-persistent-kill . never-split))
+    (helm-execute-persistent-action 'kill-action)))
+(put 'helm-buffer-run-kill-persistent 'helm-only t)
+
+(defun helm-kill-marked-buffers (_ignore)
+  (let* ((bufs (helm-marked-candidates))
+         (killed-bufs (cl-count-if 'kill-buffer bufs)))
+    (with-helm-buffer
+      (setq helm-marked-candidates nil
+            helm-visible-mark-overlays nil))
+    (message "Killed %s buffer(s)" killed-bufs)))
+
+(defun helm-buffer-run-kill-buffers ()
+  "Run kill buffer action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-kill-marked-buffers)))
+(put 'helm-buffer-run-kill-buffers 'helm-only t)
+
+(defun helm-buffer-run-grep ()
+  "Run Grep action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-grep-buffers)))
+(put 'helm-buffer-run-grep 'helm-only t)
+
+(defun helm-buffer-run-zgrep ()
+  "Run Grep action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-zgrep-buffers)))
+(put 'helm-buffer-run-zgrep 'helm-only t)
+
+(defun helm-buffer-run-query-replace-regexp ()
+  "Run Query replace regexp action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-buffer-query-replace-regexp)))
+(put 'helm-buffer-run-query-replace-regexp 'helm-only t)
+
+(defun helm-buffer-run-query-replace ()
+  "Run Query replace action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-buffer-query-replace)))
+(put 'helm-buffer-run-query-replace 'helm-only t)
+
+(defun helm-buffer-switch-other-window ()
+  "Run switch to other window action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-switch-to-buffers-other-window)))
+(put 'helm-buffer-switch-other-window 'helm-only t)
+
+(defun helm-buffer-switch-other-frame ()
+  "Run switch to other frame action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'switch-to-buffer-other-frame)))
+(put 'helm-buffer-switch-other-frame 'helm-only t)
+
+(defun helm-buffer-switch-to-elscreen ()
+  "Run switch to elscreen  action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-buffer-on-elscreen)))
+(put 'helm-buffer-switch-to-elscreen 'helm-only t)
+
+(defun helm-buffer-run-ediff ()
+  "Run ediff action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ediff-marked-buffers)))
+(put 'helm-buffer-run-ediff 'helm-only t)
+
+(defun helm-buffer-run-ediff-merge ()
+  "Run ediff action from `helm-source-buffers-list'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ediff-marked-buffers-merge)))
+(put 'helm-buffer-run-ediff-merge 'helm-only t)
+
+(defun helm-buffers-persistent-kill-1 (buffer)
+  "Persistent action to kill buffer."
+  (if (eql (get-buffer buffer) (get-buffer helm-current-buffer))
+      (progn
+        (message "Can't kill `helm-current-buffer' without quitting session")
+        (sit-for 1))
+      (with-current-buffer (get-buffer buffer)
+        (kill-buffer buffer))
+      (helm-delete-current-selection)
+      (with-helm-temp-hook 'helm-after-persistent-action-hook
+        (helm-force-update (regexp-quote (helm-get-selection nil t))))))
+
+(defun helm-buffers--quote-truncated-buffer (buffer)
+  (let ((bufname (and (bufferp buffer)
+                      (buffer-name buffer))))
+    (when bufname
+      (regexp-quote
+       (if helm-buffer-max-length
+           (helm-substring-by-width
+            bufname helm-buffer-max-length
+            "")
+           bufname)))))
+
+(defun helm-buffers-persistent-kill (_buffer)
+  (let ((marked (helm-marked-candidates)))
+    (unwind-protect
+         (cl-loop for b in marked
+               do (progn (helm-preselect
+                          (format "^%s"
+                                  (helm-buffers--quote-truncated-buffer b)))
+                         (when (y-or-n-p (format "kill buffer (%s)? " b))
+                           (helm-buffers-persistent-kill-1 b))
+                         (message nil)))
+      (with-helm-buffer
+        (setq helm-marked-candidates nil
+              helm-visible-mark-overlays nil))
+      (helm-force-update (helm-buffers--quote-truncated-buffer
+                          (helm-get-selection))))))
+
+(defun helm-buffers-list-persistent-action (candidate)
+  (let ((current (window-buffer helm-persistent-action-display-window)))
+    (if (or (eql current (get-buffer helm-current-buffer))
+            (not (eql current (get-buffer candidate))))
+        (switch-to-buffer candidate)
+        (switch-to-buffer helm-current-buffer))))
+
+(defun helm-ediff-marked-buffers (_candidate &optional merge)
+  "Ediff 2 marked buffers or CANDIDATE and `helm-current-buffer'.
+With optional arg MERGE call `ediff-merge-buffers'."
+  (let ((lg-lst (length (helm-marked-candidates)))
+        buf1 buf2)
+    (cl-case lg-lst
+      (0
+       (error "Error:You have to mark at least 1 buffer"))
+      (1
+       (setq buf1 helm-current-buffer
+             buf2 (cl-first (helm-marked-candidates))))
+      (2
+       (setq buf1 (cl-first (helm-marked-candidates))
+             buf2 (cl-second (helm-marked-candidates))))
+      (t
+       (error "Error:To much buffers marked!")))
+    (if merge
+        (ediff-merge-buffers buf1 buf2)
+      (ediff-buffers buf1 buf2))))
+
+(defun helm-ediff-marked-buffers-merge (candidate)
+  "Ediff merge `helm-current-buffer' with CANDIDATE.
+See `helm-ediff-marked-buffers'."
+  (helm-ediff-marked-buffers candidate t))
+
+(defun helm-multi-occur-as-action (_candidate)
+  "Multi occur action for `helm-source-buffers-list'.
+Can be used by any source that list buffers."
+  (let ((helm-moccur-always-search-in-current
+         (if helm-current-prefix-arg
+             (not helm-moccur-always-search-in-current)
+           helm-moccur-always-search-in-current))
+        (buffers (helm-marked-candidates))
+        (input (cl-loop for i in (split-string helm-pattern " " t)
+                     thereis (and (string-match "\\`@\\(.*\\)" i)
+                                  (match-string 1 i)))))
+    (helm-multi-occur-1 buffers input)))
+
+(defun helm-buffers-run-multi-occur ()
+  "Run `helm-multi-occur-as-action' by key."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-multi-occur-as-action)))
+(put 'helm-buffers-run-multi-occur 'helm-only t)
+
+(defun helm-buffers-toggle-show-hidden-buffers ()
+  (interactive)
+  (with-helm-alive-p
+    (let ((filter-attrs (helm-attr 'filtered-candidate-transformer
+                                   helm-source-buffers-list)))
+      (if (memq 'helm-shadow-boring-buffers filter-attrs)
+          (helm-attrset 'filtered-candidate-transformer
+                        (cons 'helm-skip-boring-buffers
+                              (remove 'helm-shadow-boring-buffers
+                                      filter-attrs))
+                        helm-source-buffers-list t)
+        (helm-attrset 'filtered-candidate-transformer
+                      (cons 'helm-shadow-boring-buffers
+                            (remove 'helm-skip-boring-buffers
+                                    filter-attrs))
+                      helm-source-buffers-list t))
+      (helm-force-update))))
+(put 'helm-buffers-toggle-show-hidden-buffers 'helm-only t)
+
+
+;;; Candidate Transformers
+;;
+;;
+(defun helm-skip-boring-buffers (buffers _source)
+  (helm-skip-entries buffers
+                     helm-boring-buffer-regexp-list
+                     helm-white-buffer-regexp-list))
+
+(defun helm-shadow-boring-buffers (buffers _source)
+  "Buffers matching `helm-boring-buffer-regexp' will be
+displayed with the `file-name-shadow' face if available."
+  (helm-shadow-entries buffers helm-boring-buffer-regexp-list))
+
+
+;;;###autoload
+(defun helm-buffers-list ()
+  "Preconfigured `helm' to list buffers."
+  (interactive)
+  (unless helm-source-buffers-list
+    (setq helm-source-buffers-list
+          (helm-make-source "Buffers" 'helm-source-buffers)))
+  (helm :sources '(helm-source-buffers-list
+                   helm-source-ido-virtual-buffers
+                   helm-source-buffer-not-found)
+        :buffer "*helm buffers*"
+        :keymap helm-buffer-map
+        :truncate-lines helm-buffers-truncate-lines))
+
+;;;###autoload
+(defun helm-mini ()
+  "Preconfigured `helm' lightweight version \(buffer -> recentf\)."
+  (interactive)
+  (require 'helm-files)
+  (unless helm-source-buffers-list
+    (setq helm-source-buffers-list
+          (helm-make-source "Buffers" 'helm-source-buffers)))
+  (helm :sources helm-mini-default-sources
+        :buffer "*helm mini*"
+        :ff-transformer-show-only-basename nil
+        :truncate-lines helm-buffers-truncate-lines))
+
+(provide 'helm-buffers)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-buffers.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-color.el b/emacs.d/elpa/helm-20160115.2200/helm-color.el
new file mode 100644
index 0000000..4eadfa5
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-color.el
@@ -0,0 +1,164 @@
+;;; helm-color.el --- colors and faces -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+
+;;; Customize Face
+;;
+;;
+(defun helm-custom-faces-init ()
+  "Initialize buffer for `helm-source-customize-face'."
+  (unless (helm-candidate-buffer)
+    (save-selected-window
+      (list-faces-display)
+      (message nil))
+    (helm-init-candidates-in-buffer
+        'global
+      (with-current-buffer (get-buffer "*Faces*")
+        (buffer-substring
+         (next-single-char-property-change (point-min) 'face)
+         (point-max))))
+    (kill-buffer "*Faces*")))
+
+(defvar helm-source-customize-face
+  (helm-build-in-buffer-source "Customize Face"
+    :init 'helm-custom-faces-init
+    :get-line 'buffer-substring
+    :action '(("Customize"
+               . (lambda (line)
+                   (customize-face (intern (car (split-string line))))))
+              ("Copy name"
+               . (lambda (line)
+                   (kill-new (car (split-string line " " t)))))))
+  "See (info \"(emacs)Faces\")")
+
+;;; Colors browser
+;;
+;;
+(defun helm-colors-init ()
+  (unless (helm-candidate-buffer)
+    (save-selected-window
+      (list-colors-display)
+      (message nil))
+    (helm-init-candidates-in-buffer
+        'global
+      (with-current-buffer (get-buffer "*Colors*")
+        (buffer-string)))
+    (kill-buffer "*Colors*")))
+
+(defun helm-color-insert-name (candidate)
+  (with-helm-current-buffer
+    (insert (helm-colors-get-name candidate))))
+
+(defun helm-color-kill-name (candidate)
+  (kill-new (helm-colors-get-name candidate)))
+
+(defun helm-color-insert-rgb (candidate)
+  (with-helm-current-buffer
+    (insert (helm-colors-get-rgb candidate))))
+
+(defun helm-color-kill-rgb (candidate)
+  (kill-new (helm-colors-get-rgb candidate)))
+
+(defun helm-color-run-insert-name ()
+  "Insert name of color from `helm-source-colors'"
+  (interactive)
+  (with-helm-alive-p (helm-exit-and-execute-action 'helm-color-insert-name)))
+(put 'helm-color-run-insert-name 'helm-only t)
+
+(defun helm-color-run-kill-name ()
+  "Kill name of color from `helm-source-colors'"
+  (interactive)
+  (with-helm-alive-p (helm-exit-and-execute-action 'helm-color-kill-name)))
+(put 'helm-color-run-kill-name 'helm-only t)
+
+(defun helm-color-run-insert-rgb ()
+  "Insert RGB of color from `helm-source-colors'"
+  (interactive)
+  (with-helm-alive-p (helm-exit-and-execute-action 'helm-color-insert-rgb)))
+(put 'helm-color-run-insert-rgb 'helm-only t)
+
+(defun helm-color-run-kill-rgb ()
+  "Kill RGB of color from `helm-source-colors'"
+  (interactive)
+  (with-helm-alive-p (helm-exit-and-execute-action 'helm-color-kill-rgb)))
+(put 'helm-color-run-kill-rgb 'helm-only t)
+
+(defvar helm-color-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "C-c n") 'helm-color-run-insert-name)
+    (define-key map (kbd "C-c N") 'helm-color-run-kill-name)
+    (define-key map (kbd "C-c r") 'helm-color-run-insert-rgb)
+    (define-key map (kbd "C-c R") 'helm-color-run-kill-rgb)
+    map))
+
+(defvar helm-source-colors
+  (helm-build-in-buffer-source "Colors"
+    :init 'helm-colors-init
+    :get-line 'buffer-substring
+    :keymap helm-color-map
+    :persistent-help "Kill entry in RGB format."
+    :persistent-action 'helm-color-kill-rgb
+    :help-message 'helm-colors-help-message
+    :action
+    '(("Copy Name (C-c N)" . helm-color-kill-name)
+      ("Copy RGB (C-c R)" . helm-color-kill-rgb)
+      ("Insert Name (C-c n)" . helm-color-insert-name)
+      ("Insert RGB (C-c r)" . helm-color-insert-rgb))))
+
+(defun helm-colors-get-name (candidate)
+  "Get color name."
+  (replace-regexp-in-string
+   " " ""
+   (with-temp-buffer
+     (insert (capitalize candidate))
+     (goto-char (point-min))
+     (search-forward-regexp "\\s-\\{2,\\}")
+     (delete-region (point) (point-max))
+     (buffer-string))))
+
+(defun helm-colors-get-rgb (candidate)
+  "Get color RGB."
+  (replace-regexp-in-string
+   " " ""
+   (with-temp-buffer
+     (insert (capitalize candidate))
+     (goto-char (point-max))
+     (search-backward-regexp "\\s-\\{2,\\}")
+     (delete-region (point) (point-min))
+     (buffer-string))))
+
+;;;###autoload
+(defun helm-colors ()
+  "Preconfigured `helm' for color."
+  (interactive)
+  (helm :sources '(helm-source-colors helm-source-customize-face)
+        :buffer "*helm colors*"))
+
+(provide 'helm-color)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-color.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-command.el b/emacs.d/elpa/helm-20160115.2200/helm-command.el
new file mode 100644
index 0000000..9f79485
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-command.el
@@ -0,0 +1,256 @@
+;;; helm-command.el --- Helm execute-exended-command. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-mode)
+(require 'helm-elisp)
+
+
+(defgroup helm-command nil
+  "Emacs command related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-M-x-requires-pattern 0
+  "Value of requires-pattern for `helm-M-x'.
+Show all candidates on startup when 0 (default)."
+  :group 'helm-command
+  :type 'boolean)
+
+(defcustom helm-M-x-always-save-history nil
+  "`helm-M-x' Save command in `extended-command-history' even when it fail."
+  :group 'helm-command
+  :type  'boolean)
+
+(defcustom helm-M-x-reverse-history nil
+  "The history source of `helm-M-x' appear in second position when non--nil."
+  :group 'helm-command
+  :type 'boolean)
+
+(defcustom helm-M-x-fuzzy-match nil
+  "Enable fuzzy matching in `helm-M-x' when non--nil.")
+
+
+;;; Faces
+;;
+;;
+(defgroup helm-command-faces nil
+  "Customize the appearance of helm-command."
+  :prefix "helm-"
+  :group 'helm-command
+  :group 'helm-faces)
+
+(defface helm-M-x-key '((t (:foreground "orange" :underline t)))
+  "Face used in helm-M-x to show keybinding."
+  :group 'helm-command-faces)
+
+
+(defvar helm-M-x-input-history nil)
+
+
+(cl-defun helm-M-x-get-major-mode-command-alist (mode-map)
+  "Return alist of MODE-MAP."
+  (when mode-map
+    (cl-loop for key being the key-seqs of mode-map using (key-bindings com)
+             for str-key  = (key-description key)
+             for ismenu   = (string-match "<menu-bar>" str-key)
+             unless ismenu collect (cons str-key com))))
+
+(defun helm-get-mode-map-from-mode (mode)
+  "Guess the mode-map name according to MODE.
+Some modes don't use conventional mode-map name
+so we need to guess mode-map name. e.g python-mode ==> py-mode-map.
+Return nil if no mode-map found."
+  (cl-loop ;; Start with a conventional mode-map name.
+        with mode-map    = (intern-soft (format "%s-map" mode))
+        with mode-string = (symbol-name mode)
+        with mode-name   = (replace-regexp-in-string "-mode" "" mode-string)
+        while (not mode-map)
+        for count downfrom (length mode-name)
+        ;; Return when no result after parsing entire string.
+        when (eq count 0) return nil
+        for sub-name = (substring mode-name 0 count)
+        do (setq mode-map (intern-soft (format "%s-map" (concat sub-name "-mode"))))
+        finally return mode-map))
+
+(defun helm-M-x-current-mode-map-alist ()
+  "Return mode-map alist of current `major-mode'."
+  (let ((map-sym (helm-get-mode-map-from-mode major-mode)))
+    (when (and map-sym (boundp map-sym))
+      (helm-M-x-get-major-mode-command-alist (symbol-value map-sym)))))
+
+
+(defun helm-M-x-transformer-1 (candidates &optional sort)
+  "Transformer function to show bindings in emacs commands.
+Show global bindings and local bindings according to current `major-mode'.
+If SORT is non nil sort list with `helm-generic-sort-fn'.
+Note that SORT should not be used when fuzzy matching because
+fuzzy matching is running its own sort function with a different algorithm."
+  (with-helm-current-buffer
+    (cl-loop with local-map = (helm-M-x-current-mode-map-alist)
+          for cand in candidates
+          for local-key  = (car (rassq cand local-map))
+          for key        = (substitute-command-keys (format "\\[%s]" cand))
+          unless (get (intern (if (consp cand) (car cand) cand)) 'helm-only)
+          collect
+          (cons (cond ((and (string-match "^M-x" key) local-key)
+                       (format "%s (%s)"
+                               cand (propertize
+                                     local-key
+                                     'face 'helm-M-x-key)))
+                      ((string-match "^M-x" key) cand)
+                      (t (format "%s (%s)"
+                                 cand (propertize
+                                       key
+                                       'face 'helm-M-x-key))))
+                cand)
+          into ls
+          finally return
+          (if sort (sort ls #'helm-generic-sort-fn) ls))))
+
+(defun helm-M-x-transformer (candidates _source)
+  "Transformer function for `helm-M-x' candidates."
+  (helm-M-x-transformer-1 candidates (null helm--in-fuzzy)))
+
+(defun helm-M-x-transformer-hist (candidates _source)
+  "Transformer function for `helm-M-x' candidates."
+  (helm-M-x-transformer-1 candidates))
+
+(defun helm-M-x--notify-prefix-arg ()
+  ;; Notify a prefix-arg set AFTER calling M-x.
+  (when prefix-arg
+    (with-helm-window
+      (helm-display-mode-line (helm-get-current-source) 'force))))
+
+(defun helm-cmd--get-current-function-name ()
+  (save-excursion
+    (beginning-of-defun)
+    (cadr (split-string (buffer-substring-no-properties
+                         (point-at-bol) (point-at-eol))))))
+
+(defun helm-cmd--get-preconfigured-commands (&optional dir)
+  (let* ((helm-dir (or dir (helm-basedir (locate-library "helm"))))
+         (helm-autoload-file (expand-file-name "helm-autoloads.el" helm-dir))
+         results)
+    (when (file-exists-p helm-autoload-file)
+      (with-temp-buffer
+        (insert-file-contents helm-autoload-file)
+        (while (re-search-forward "Preconfigured" nil t)
+          (push (substring (helm-cmd--get-current-function-name) 1) results))))
+    results))
+
+(defun helm-M-x-read-extended-command (&optional collection history)
+  "Read command name to invoke in `helm-M-x'.
+Helm completion is not provided when executing or defining
+kbd macros.
+Optional arg COLLECTION is to allow using another COLLECTION
+than the default which is OBARRAY."
+  (if (or defining-kbd-macro executing-kbd-macro)
+      (if helm-mode
+          (unwind-protect
+               (progn
+                 (helm-mode -1)
+                 (read-extended-command))
+            (helm-mode 1))
+          (read-extended-command))
+      (let* ((orig-fuzzy-sort-fn helm-fuzzy-sort-fn)
+             (helm-fuzzy-sort-fn (lambda (candidates source)
+                                   (funcall orig-fuzzy-sort-fn
+                                            candidates source 'real)))
+             (helm--mode-line-display-prefarg t)
+             (tm (run-at-time 1 0.1 'helm-M-x--notify-prefix-arg))
+             (helm-move-selection-after-hook
+              (cons (lambda () (setq current-prefix-arg nil))
+                    helm-move-selection-after-hook)))
+        (setq extended-command-history
+              (cl-loop for c in extended-command-history
+                       when (and c (commandp (intern c)))
+                       do (set-text-properties 0 (length c) nil c)
+                       and collect c))
+        (unwind-protect
+             (let ((msg "Error: Specifying a prefix arg before calling `helm-M-x'"))
+               (when current-prefix-arg
+                 (ding)
+                 (message "%s" msg)
+                 (while (not (sit-for 1))
+                   (discard-input))
+                 (user-error msg))
+               (setq current-prefix-arg nil)
+               (helm-comp-read
+                "M-x " (or collection obarray)
+                :test 'commandp
+                :requires-pattern helm-M-x-requires-pattern
+                :name "Emacs Commands"
+                :buffer "*helm M-x*"
+                :persistent-action (lambda (candidate)
+                                     (helm-elisp--persistent-help
+                                      candidate 'helm-describe-function))
+                :persistent-help "Describe this command"
+                :history (or history extended-command-history)
+                :reverse-history helm-M-x-reverse-history
+                :input-history 'helm-M-x-input-history
+                :del-input nil
+                :help-message 'helm-M-x-help-message
+                :must-match t
+                :fuzzy helm-M-x-fuzzy-match
+                :nomark t
+                :candidates-in-buffer t
+                :fc-transformer 'helm-M-x-transformer
+                :hist-fc-transformer 'helm-M-x-transformer-hist))
+          (cancel-timer tm)
+          (setq helm--mode-line-display-prefarg nil)))))
+
+;;;###autoload
+(defun helm-M-x (arg &optional command-name)
+  "Preconfigured `helm' for Emacs commands.
+It is `helm' replacement of regular `M-x' `execute-extended-command'.
+
+Unlike regular `M-x' emacs vanilla `execute-extended-command' command,
+the prefix args if needed, are passed AFTER starting `helm-M-x'.
+
+You can get help on each command by persistent action."
+  (interactive (list current-prefix-arg (helm-M-x-read-extended-command)))
+  (let ((sym-com (and (stringp command-name) (intern-soft command-name))))
+    ;; Avoid having `this-command' set to *exit-minibuffer.
+    (setq this-command sym-com
+          ;; Handle C-x z (repeat) Issue #322
+          real-this-command sym-com)
+    ;; If helm-M-x is called with regular emacs completion (kmacro)
+    ;; use the value of arg otherwise use helm-current-prefix-arg.
+    (let ((prefix-arg (or helm-current-prefix-arg arg)))
+      ;; This ugly construct is to save history even on error.
+      (unless helm-M-x-always-save-history
+        (command-execute sym-com 'record))
+      (setq extended-command-history
+            (cons command-name
+                  (delete command-name extended-command-history)))
+      (when helm-M-x-always-save-history
+        (command-execute sym-com 'record)))))
+
+
+(provide 'helm-command)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-command.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-config.el b/emacs.d/elpa/helm-20160115.2200/helm-config.el
new file mode 100644
index 0000000..c1b978f
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-config.el
@@ -0,0 +1,170 @@
+;;; helm-config.el --- Applications library for `helm.el' -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+
+;;; Require
+;;
+;;
+(declare-function async-bytecomp-package-mode "ext:async-bytecomp.el")
+(when (require 'async-bytecomp nil t)
+  (and (fboundp 'async-bytecomp-package-mode)
+       (async-bytecomp-package-mode 1)))
+
+
+(defgroup helm-config nil
+  "Various configurations for Helm."
+  :group 'helm)
+
+(defcustom helm-command-prefix-key "C-x c"
+  "The key `helm-command-prefix' is bound to in the global map."
+  :type '(choice (string :tag "Key") (const :tag "no binding"))
+  :group 'helm-config
+  :set
+  (lambda (var key)
+    (when (and (boundp var) (symbol-value var))
+      (define-key (current-global-map)
+          (read-kbd-macro (symbol-value var)) nil))
+    (when key
+      (define-key (current-global-map)
+          (read-kbd-macro key) 'helm-command-prefix))
+    (set var key)))
+
+(defcustom helm-minibuffer-history-key "C-r"
+  "The key `helm-minibuffer-history' is bound to in minibuffer local maps."
+  :type '(choice (string :tag "Key") (const :tag "no binding"))
+  :group 'helm-config
+  :set
+  (lambda (var key)
+    (cl-dolist (map '(minibuffer-local-completion-map
+                      minibuffer-local-filename-completion-map
+                      minibuffer-local-filename-must-match-map ; Emacs 23.1.+
+                      minibuffer-local-isearch-map
+                      minibuffer-local-map
+                      minibuffer-local-must-match-filename-map ; Older Emacsen
+                      minibuffer-local-must-match-map
+                      minibuffer-local-ns-map))
+      (when (and (boundp map) (keymapp (symbol-value map)))
+        (when (and (boundp var) (symbol-value var))
+          (define-key (symbol-value map)
+              (read-kbd-macro (symbol-value var)) nil))
+        (when key
+          (define-key (symbol-value map)
+              (read-kbd-macro key) 'helm-minibuffer-history))))
+    (set var key)))
+
+;;; Command Keymap
+;;
+;;
+(defvar helm-command-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "a")         'helm-apropos)
+    (define-key map (kbd "e")         'helm-etags-select)
+    (define-key map (kbd "l")         'helm-locate)
+    (define-key map (kbd "s")         'helm-surfraw)
+    (define-key map (kbd "r")         'helm-regexp)
+    (define-key map (kbd "m")         'helm-man-woman)
+    (define-key map (kbd "t")         'helm-top)
+    (define-key map (kbd "/")         'helm-find)
+    (define-key map (kbd "i")         'helm-semantic-or-imenu)
+    (define-key map (kbd "I")         'helm-imenu-in-all-buffers)
+    (define-key map (kbd "<tab>")     'helm-lisp-completion-at-point)
+    (define-key map (kbd "p")         'helm-list-emacs-process)
+    (define-key map (kbd "C-x r b")   'helm-filtered-bookmarks)
+    (define-key map (kbd "M-y")       'helm-show-kill-ring)
+    (define-key map (kbd "C-c <SPC>") 'helm-all-mark-rings)
+    (define-key map (kbd "C-x C-f")   'helm-find-files)
+    (define-key map (kbd "f")         'helm-multi-files)
+    (define-key map (kbd "C-:")       'helm-eval-expression-with-eldoc)
+    (define-key map (kbd "C-,")       'helm-calcul-expression)
+    (define-key map (kbd "M-x")       'helm-M-x)
+    (define-key map (kbd "M-s o")     'helm-occur)
+    (define-key map (kbd "M-g s")     'helm-do-grep)
+    (define-key map (kbd "M-g a")     'helm-do-grep-ag)
+    (define-key map (kbd "c")         'helm-colors)
+    (define-key map (kbd "F")         'helm-select-xfont)
+    (define-key map (kbd "8")         'helm-ucs)
+    (define-key map (kbd "C-c f")     'helm-recentf)
+    (define-key map (kbd "C-c g")     'helm-google-suggest)
+    (define-key map (kbd "h i")       'helm-info-at-point)
+    (define-key map (kbd "h r")       'helm-info-emacs)
+    (define-key map (kbd "h g")       'helm-info-gnus)
+    (define-key map (kbd "h h")       'helm-documentation)
+    (define-key map (kbd "C-x C-b")   'helm-buffers-list)
+    (define-key map (kbd "C-x r i")   'helm-register)
+    (define-key map (kbd "C-c C-x")   'helm-run-external-command)
+    (define-key map (kbd "b")         'helm-resume)
+    (define-key map (kbd "C-c g")       'helm-gid)
+    (define-key map (kbd "@")         'helm-list-elisp-packages)
+    map))
+
+;; Don't override the keymap we just defined with an empty
+;; keymap.  This also protect bindings changed by the user.
+(defvar helm-command-prefix)
+(define-prefix-command 'helm-command-prefix)
+(fset 'helm-command-prefix helm-command-map)
+(setq  helm-command-prefix helm-command-map)
+
+
+;;; Menu
+
+(require 'helm-easymenu)
+
+
+;;;###autoload
+(defun helm-configuration ()
+  "Customize `helm'."
+  (interactive)
+  (customize-group "helm"))
+
+
+;;; Fontlock
+(cl-dolist (mode '(emacs-lisp-mode lisp-interaction-mode))
+  (font-lock-add-keywords
+   mode
+   '(("(\\<\\(with-helm-after-update-hook\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-temp-hook\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-window\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-quittable\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-current-buffer\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-buffer\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-show-completion\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-default-directory\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-display-same-window\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(with-helm-restore-variables\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(define-helm-type-attribute\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(helm-multi-key-defun\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(helm-while-no-input\\)\\>" 1 font-lock-keyword-face)
+     ("(\\<\\(helm-aif\\)\\>" 1 font-lock-keyword-face))))
+
+
+;;; Load the autoload file
+;;  It should have been generated either by
+;;  package.el or the make file.
+
+(load "helm-autoloads" nil t)
+
+(provide 'helm-config)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-config.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-dabbrev.el b/emacs.d/elpa/helm-20160115.2200/helm-dabbrev.el
new file mode 100644
index 0000000..7e768d9
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-dabbrev.el
@@ -0,0 +1,356 @@
+;;; helm-dabbrev.el --- Helm implementation of dabbrev. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'helm)
+(require 'helm-help)
+(require 'helm-elisp) ; For show-completion.
+
+(defgroup helm-dabbrev nil
+  "Dabbrev related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-dabbrev-always-search-all t
+  "Always search in all buffers when non--nil.
+Note that even if nil, a search in all buffers
+will occur if the length of candidates is <= than
+`helm-dabbrev-max-length-result'."
+  :group 'helm-dabbrev
+  :type 'boolean)
+
+(defcustom helm-dabbrev-max-length-result 20
+  "Max length of candidates before searching in all buffers.
+If number of candidates found in current-buffer is <= to this,
+search in all buffers.
+Have no effect when `helm-dabbrev-always-search-all' is non--nil."
+  :group 'helm-dabbrev
+  :type 'integer)
+
+(defcustom helm-dabbrev-ignored-buffers-regexps
+  '("\\*helm" "\\*Messages" "\\*Echo Area" "\\*Buffer List")
+  "List of regexps matching names of buffers that helm-dabbrev should not check."
+  :group 'helm-dabbrev
+  :type '(repeat regexp))
+
+(defcustom helm-dabbrev-related-buffer-fn #'helm-dabbrev--same-major-mode-p
+  "A function that decide if a buffer to search in is related to `current-buffer'.
+This is actually determined by comparing `major-mode' of the buffer to search
+and the `current-buffer'.
+The function take one arg, the buffer which is current, look at
+`helm-dabbrev--same-major-mode-p' for example.
+
+When nil all buffers are considered related to `current-buffer'."
+  :group 'helm-dabbrev
+  :type 'function)
+
+(defcustom helm-dabbrev-major-mode-assoc
+  '((emacs-lisp-mode . lisp-interaction-mode))
+  "Major mode association alist.
+This allow helm-dabbrev searching in buffers with the associated `major-mode'.
+e.g \(emacs-lisp-mode . lisp-interaction-mode\)
+will allow searching in the lisp-interaction-mode buffer when `current-buffer'
+is an `emacs-lisp-mode' buffer and vice versa i.e
+no need to provide \(lisp-interaction-mode . emacs-lisp-mode\) association.
+
+When nil check is the searched buffer have same `major-mode'
+than the `current-buffer'.
+This have no effect when `helm-dabbrev-related-buffer-fn' is nil or of course
+bound to a function that doesn't handle this var."
+  :type '(alist :key-type symbol :value-type symbol)
+  :group 'helm-dabbrev)
+
+(defcustom helm-dabbrev-lineno-around 30
+  "Search first in this number of lines before an after point."
+  :group 'helm-dabbrev
+  :type 'integer)
+
+(defcustom helm-dabbrev-cycle-threshold nil
+  "Number of time helm-dabbrev cycle before displaying helm completion.
+When nil or 0 disable cycling."
+  :group 'helm-dabbrev
+  :type '(choice (const :tag "Cycling disabled" nil) integer))
+
+(defcustom helm-dabbrev-case-fold-search 'smart
+  "Set `case-fold-search' in `helm-dabbrev'.
+Same as `helm-case-fold-search' but for `helm-dabbrev'.
+Note that this is not affecting searching in helm buffer,
+but the initial search for all candidates in buffer(s)."
+  :group 'helm-dabbrev
+  :type '(choice (const :tag "Ignore case" t)
+          (const :tag "Respect case" nil)
+          (other :tag "Smart" 'smart)))
+
+
+(defvar helm-dabbrev-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-/") 'helm-next-line)
+    (define-key map (kbd "M-:") 'helm-previous-line)
+    map))
+
+;; Internal
+(defvar helm-dabbrev--exclude-current-buffer-flag nil)
+(defvar helm-dabbrev--cache nil)
+(defvar helm-dabbrev--data nil)
+(defvar helm-dabbrev--regexp "\\s-\\|\t\\|[(\[\{\"'`=<$;.]\\|\\s\\\\|^")
+(cl-defstruct helm-dabbrev-info dabbrev limits iterator)
+
+
+(defun helm-dabbrev--buffer-list ()
+  (cl-loop with lst = (buffer-list)
+        for buf in (if helm-dabbrev--exclude-current-buffer-flag
+                       (cdr lst) lst)
+        unless (cl-loop for r in helm-dabbrev-ignored-buffers-regexps
+                     thereis (string-match r (buffer-name buf)))
+        collect buf))
+
+(defun helm-dabbrev--same-major-mode-p (start-buffer)
+  ;; START-BUFFER is the current-buffer where we start searching.
+  ;; Determine the major-mode of START-BUFFER as `cur-maj-mode'.
+  ;; Each time the loop go in another buffer we try to find if its
+  ;; `major-mode' is:
+  ;; - same as the `cur-maj-mode'
+  ;; - derived from `cur-maj-mode'
+  ;; - have an assoc entry (major-mode . cur-maj-mode)
+  ;; - have an rassoc entry (cur-maj-mode . major-mode)
+  ;; - check if one of these entries inherit from another one in
+  ;;   `helm-dabbrev-major-mode-assoc'.
+  (let* ((cur-maj-mode  (with-current-buffer start-buffer major-mode))
+         (c-assoc-mode  (assq cur-maj-mode helm-dabbrev-major-mode-assoc))
+         (c-rassoc-mode (rassq cur-maj-mode helm-dabbrev-major-mode-assoc))
+         (o-assoc-mode  (assq major-mode helm-dabbrev-major-mode-assoc))
+         (o-rassoc-mode (rassq major-mode helm-dabbrev-major-mode-assoc))
+         (cdr-c-assoc-mode (cdr c-assoc-mode))
+         (cdr-o-assoc-mode (cdr o-assoc-mode)))
+    (or (eq major-mode cur-maj-mode)
+        (derived-mode-p cur-maj-mode)
+        (or (eq cdr-c-assoc-mode major-mode)
+            (eq (car c-rassoc-mode) major-mode)
+            (eq (cdr (assq cdr-c-assoc-mode helm-dabbrev-major-mode-assoc))
+                major-mode)
+            (eq (car (rassq cdr-c-assoc-mode helm-dabbrev-major-mode-assoc))
+                major-mode))
+        (or (eq cdr-o-assoc-mode cur-maj-mode)
+            (eq (car o-rassoc-mode) cur-maj-mode)
+            (eq (cdr (assq cdr-o-assoc-mode helm-dabbrev-major-mode-assoc))
+                cur-maj-mode)
+            (eq (car (rassq cdr-o-assoc-mode helm-dabbrev-major-mode-assoc))
+                cur-maj-mode)))))
+
+(defun helm-dabbrev--collect (str limit ignore-case all)
+  (let* ((case-fold-search ignore-case)
+         (buffer1 (current-buffer)) ; start buffer.
+         (minibuf (minibufferp buffer1))
+         result pos-before pos-after
+         (search-and-store
+          (lambda (pattern direction)
+              (while (cl-case direction
+                       (1   (search-forward pattern nil t))
+                       (-1  (search-backward pattern nil t))
+                       (2   (let ((pos
+                                   (save-excursion
+                                     (forward-line
+                                      helm-dabbrev-lineno-around)
+                                     (point))))
+                              (setq pos-after pos)
+                              (search-forward pattern pos t)))
+                       (-2  (let ((pos
+                                   (save-excursion
+                                     (forward-line
+                                      (- helm-dabbrev-lineno-around))
+                                     (point))))
+                              (setq pos-before pos)
+                              (search-backward pattern pos t))))
+                (let* ((replace-regexp (concat "\\(" helm-dabbrev--regexp "\\)\\'"))
+                       (match-1 (helm-aif (thing-at-point 'symbol)
+                                    ;; `thing-at-point' returns
+                                    ;; the quote outside of e-lisp mode,
+                                    ;; e.g in message mode,
+                                    ;; `foo' => foo'
+                                    ;; but in e-lisp like modes:
+                                    ;; `foo' => foo
+                                    ;; so remove it [1].
+                                    (replace-regexp-in-string
+                                     replace-regexp
+                                     "" (substring-no-properties it))))
+                       (match-2 (helm-aif (thing-at-point 'filename)
+                                    ;; Same as in [1].
+                                    (replace-regexp-in-string
+                                     replace-regexp
+                                     "" (substring-no-properties it))))
+                       (lst (if (string= match-1 match-2)
+                                (list match-1)
+                              (list match-1 match-2))))
+                  (cl-loop for match in lst
+                        unless (or (string= str match)
+                                   (member match result))
+                        do (push match result)))))))
+    (cl-loop for buf in (if all (helm-dabbrev--buffer-list)
+                          (list (current-buffer)))
+          
+          do (with-current-buffer buf
+               (when (or minibuf ; check against all buffers when in minibuffer.
+                         (if helm-dabbrev-related-buffer-fn
+                             (funcall helm-dabbrev-related-buffer-fn buffer1)
+                             t))
+                 (save-excursion
+                   ;; Start searching before thing before point.
+                   (goto-char (- (point) (length str)))
+                   ;; Search the last 30 lines before point.
+                   (funcall search-and-store str -2)) ; store pos [1]
+                 (save-excursion
+                   ;; Search the next 30 lines after point.
+                   (funcall search-and-store str 2)) ; store pos [2]
+                 (save-excursion
+                   ;; Search all before point.
+                   (goto-char pos-before) ; start from [1]
+                   (funcall search-and-store str -1))
+                 (save-excursion
+                   ;; Search all after point.
+                   (goto-char pos-after) ; start from [2]
+                   (funcall search-and-store str 1))))
+          when (> (length result) limit) return (nreverse result)
+          finally return (nreverse result))))
+
+(defun helm-dabbrev--get-candidates (abbrev)
+  (cl-assert abbrev nil "[No Match]")
+  (with-current-buffer (current-buffer)
+    (let* ((dabbrev-get (lambda (str all-bufs)
+                            (helm-dabbrev--collect
+                             str helm-candidate-number-limit
+                             (cl-case helm-dabbrev-case-fold-search
+                               (smart (helm-set-case-fold-search-1 abbrev))
+                               (t helm-dabbrev-case-fold-search))
+                             all-bufs)))
+           (lst (funcall dabbrev-get abbrev helm-dabbrev-always-search-all)))
+      (if (and (not helm-dabbrev-always-search-all)
+               (<= (length lst) helm-dabbrev-max-length-result))
+          ;; Search all but don't recompute current-buffer.
+          (let ((helm-dabbrev--exclude-current-buffer-flag t))
+            (append lst (funcall dabbrev-get abbrev 'all-bufs)))
+        lst))))
+
+(defun helm-dabbrev-default-action (candidate)
+  (with-helm-current-buffer
+    (let* ((limits (helm-bounds-of-thing-before-point
+                    helm-dabbrev--regexp))
+           (beg (car limits))
+           (end (point)))
+      (run-with-timer
+       0.01 nil
+       'helm-insert-completion-at-point
+       beg end candidate))))
+
+;;;###autoload
+(defun helm-dabbrev ()
+  "Preconfigured helm for dynamic abbreviations."
+  (interactive)
+  (let ((dabbrev (helm-thing-before-point nil helm-dabbrev--regexp))
+        (limits (helm-bounds-of-thing-before-point helm-dabbrev--regexp))
+        (enable-recursive-minibuffers t)
+        (cycling-disabled-p (or (null helm-dabbrev-cycle-threshold)
+                                (zerop helm-dabbrev-cycle-threshold)))
+        (helm-execute-action-at-once-if-one t)
+        (helm-quit-if-no-candidate
+         (lambda ()
+             (message "[Helm-dabbrev: No expansion found]"))))
+    (cl-assert (and (stringp dabbrev) (not (string= dabbrev "")))
+               nil "[Helm-dabbrev: Nothing found before point]")
+    (when (and
+           ;; have been called at least once.
+           (helm-dabbrev-info-p helm-dabbrev--data)
+           ;; But user have moved with some other command
+           ;; in the meaning time.
+           (not (eq last-command 'helm-dabbrev)))
+      (setq helm-dabbrev--data nil))
+    (when cycling-disabled-p
+      (setq helm-dabbrev--cache (helm-dabbrev--get-candidates dabbrev)))
+    (unless (or cycling-disabled-p
+                (helm-dabbrev-info-p helm-dabbrev--data))
+      (setq helm-dabbrev--cache (helm-dabbrev--get-candidates dabbrev))
+      (setq helm-dabbrev--data
+            (make-helm-dabbrev-info
+             :dabbrev dabbrev
+             :limits limits
+             :iterator
+             (helm-iter-list
+              (cl-loop for i in helm-dabbrev--cache when
+                       (and i (string-match
+                               (concat "^" (regexp-quote dabbrev)) i))
+                       collect i into selection
+                       when (and selection
+                                 (= (length selection)
+                                    helm-dabbrev-cycle-threshold))
+                       ;; When selection len reach
+                       ;; `helm-dabbrev-cycle-threshold'
+                       ;; return selection.
+                       return selection
+                       ;; selection len never reach
+                       ;; `helm-dabbrev-cycle-threshold'
+                       ;; return selection.
+                       finally return selection)))))
+    (let ((iter (and (helm-dabbrev-info-p helm-dabbrev--data)
+                     (helm-dabbrev-info-iterator helm-dabbrev--data)))
+          deactivate-mark)
+      ;; Cycle until iterator is consumed.
+      (helm-aif (and iter (helm-iter-next iter))
+          (progn
+            (helm-insert-completion-at-point
+             (car (helm-dabbrev-info-limits helm-dabbrev--data))
+             (cdr limits) it)
+            ;; Move already tried candidates to end of list.
+            (setq helm-dabbrev--cache (append (remove it helm-dabbrev--cache)
+                                              (list it))))
+        ;; If the length of candidates is only one when computed
+        ;; that's mean the unique matched item have already been
+        ;; inserted by the iterator, so no need to reinsert the old dabbrev,
+        ;; just let helm exiting with "No expansion found".
+        (let ((old-dabbrev (if (helm-dabbrev-info-p helm-dabbrev--data)
+                               (helm-dabbrev-info-dabbrev helm-dabbrev--data)
+                               dabbrev)))
+          (unless (cdr (all-completions old-dabbrev helm-dabbrev--cache))
+            (setq cycling-disabled-p t))
+          ;; Iterator is now empty, reset dabbrev to initial value
+          ;; and start helm completion.
+          (unless cycling-disabled-p
+            (setq dabbrev old-dabbrev
+                  limits  (helm-dabbrev-info-limits helm-dabbrev--data))
+            (setq helm-dabbrev--data nil)
+            (delete-region (car limits) (point))
+            (insert dabbrev))
+          (with-helm-show-completion (car limits) (cdr limits)
+            (helm :sources (helm-build-in-buffer-source "Dabbrev Expand"
+                             :data helm-dabbrev--cache
+                             :persistent-action 'ignore
+                             :persistent-help "DoNothing"
+                             :keymap helm-dabbrev-map
+                             :action 'helm-dabbrev-default-action)
+                  :buffer "*helm dabbrev*"
+                  :input (concat "^" dabbrev " ")
+                  :resume 'noresume
+                  :allow-nest t)))))))
+
+(provide 'helm-dabbrev)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-dabbrev.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-easymenu.el b/emacs.d/elpa/helm-20160115.2200/helm-easymenu.el
new file mode 100644
index 0000000..1cbca12
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-easymenu.el
@@ -0,0 +1,91 @@
+;;; helm-easymenu.el --- Helm easymenu definitions. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'easymenu)
+
+(easy-menu-add-item
+ nil '("Tools")
+ '("Helm"
+   ["Find any Files/Buffers" helm-multi-files t]
+   ["Helm Everywhere (Toggle)" helm-mode t]
+   ["Helm resume" helm-resume t]
+   "----"
+   ("Files"
+    ["Find files" helm-find-files t]
+    ["Recent Files" helm-recentf t]
+    ["Locate" helm-locate t]
+    ["Search Files with find" helm-find t]
+    ["Bookmarks" helm-filtered-bookmarks t])
+   ("Buffers"
+    ["Find buffers" helm-buffers-list t])
+   ("Commands"
+    ["Emacs Commands" helm-M-x t]
+    ["Externals Commands" helm-run-external-command t])
+   ("Help"
+    ["Helm Apropos" helm-apropos t])
+   ("Info"
+    ["Info at point" helm-info-at-point t]
+    ["Emacs Manual index" helm-info-emacs t]
+    ["Gnus Manual index" helm-info-gnus t]
+    ["Helm documentation" helm-documentation t])
+   ("Org"
+    ["Org headlines in org agenda files" helm-org-agenda-files-headings t]
+    ["Org headlines in buffer" helm-org-in-buffer-headings t])
+   ("Elpa"
+    ["Elisp packages" helm-list-elisp-packages t]
+    ["Elisp packages no fetch" helm-list-elisp-packages-no-fetch t])
+   ("Tools"
+    ["Occur" helm-occur t]
+    ["Grep" helm-do-grep t]
+    ["Grep current directory with AG" helm-do-grep-ag t]
+    ["Gid"  helm-gid t]
+    ["Etags" helm-etags-select t]
+    ["Lisp complete at point" helm-lisp-completion-at-point t]
+    ["Browse Kill ring" helm-show-kill-ring t]
+    ["Browse register" helm-register t]
+    ["Mark Ring" helm-all-mark-rings t]
+    ["Regexp handler" helm-regexp t]
+    ["Colors & Faces" helm-colors t]
+    ["Show xfonts" helm-select-xfont t]
+    ["Ucs Symbols" helm-ucs t]
+    ["Imenu" helm-imenu t]
+    ["Imenu all" helm-imenu-in-all-buffers t]
+    ["Semantic or Imenu" helm-semantic-or-imenu t]
+    ["Google Suggest" helm-google-suggest t]
+    ["Eval expression" helm-eval-expression-with-eldoc t]
+    ["Calcul expression" helm-calcul-expression t]
+    ["Man pages" helm-man-woman t]
+    ["Top externals process" helm-top t]
+    ["Emacs internals process" helm-list-emacs-process t])
+   "----"
+   ["Preferred Options" helm-configuration t])
+ "Spell Checking")
+
+(easy-menu-add-item nil '("Tools") '("----") "Spell Checking")
+
+
+(provide 'helm-easymenu)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-easymenu.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-elisp-package.el b/emacs.d/elpa/helm-20160115.2200/helm-elisp-package.el
new file mode 100644
index 0000000..abbb545
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-elisp-package.el
@@ -0,0 +1,390 @@
+;;; helm-elisp-package.el --- helm interface for package.el -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'package)
+
+(defgroup helm-el-package nil
+  "helm elisp packages."
+  :group 'helm)
+
+(defcustom helm-el-package-initial-filter 'all
+  "Show only installed, upgraded or all packages at startup."
+  :group 'helm-el-package
+  :type '(radio :tag "Initial filter for elisp packages"
+          (const :tag "Show all packages" all)
+          (const :tag "Show installed packages" installed)
+          (const :tag "Show not installed packages" uninstalled)
+          (const :tag "Show upgradable packages" upgrade)))
+
+;; internals vars
+(defvar helm-el-package--show-only 'all)
+(defvar helm-el-package--initialized-p nil)
+(defvar helm-el-package--tabulated-list nil)
+(defvar helm-el-package--upgrades nil)
+(defvar helm-el-package--removable-packages nil)
+
+(defun helm-el-package--init ()
+  (when (null package-alist)
+    (setq helm-el-package--show-only 'all))
+  (when (fboundp 'package--removable-packages)
+    (setq helm-el-package--removable-packages
+          (package--removable-packages)))
+  (save-selected-window
+    (list-packages helm-el-package--initialized-p)
+    (setq helm-el-package--initialized-p t)
+    (message nil))
+  (helm-init-candidates-in-buffer
+      'global
+    (with-current-buffer (get-buffer "*Packages*")
+      (setq helm-el-package--tabulated-list tabulated-list-entries)
+      (buffer-string)))
+  (setq helm-el-package--upgrades (helm-el-package-menu--find-upgrades))
+  (if helm-force-updating-p
+      (if helm-el-package--upgrades
+          (message "%d package(s) can be upgraded, Refreshing packages list done"
+                   (length helm-el-package--upgrades))
+          (message "Refreshing packages list done, no upgrades available"))
+      (setq helm-el-package--show-only (if helm-el-package--upgrades
+                                           'upgrade
+                                           helm-el-package-initial-filter)))
+  (kill-buffer "*Packages*"))
+
+(defun helm-el-package-describe (candidate)
+  (let ((id (get-text-property 0 'tabulated-list-id candidate)))
+    (describe-package (if (fboundp 'package-desc-name)
+                          (package-desc-name id)
+                        (car id)))))
+
+(defun helm-el-package-visit-homepage (candidate)
+  (let* ((id (get-text-property 0 'tabulated-list-id candidate))
+         (pkg (if (fboundp 'package-desc-name) (package-desc-name id)
+                (car id)))
+         (desc (cadr (assoc pkg package-archive-contents)))
+         (extras (package-desc-extras desc))
+         (url (and (listp extras) (cdr-safe (assoc :url extras)))))
+    (if (stringp url)
+        (browse-url url)
+      (message "Package %s has no homepage"
+               (propertize (symbol-name pkg)
+                           'face 'font-lock-keyword-face)))))
+
+(defun helm-el-run-visit-homepage ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-el-package-visit-homepage)))
+(put 'helm-el-run-visit-homepage 'helm-only t)
+
+(defun helm-el-package-install-1 (pkg-list)
+  (cl-loop with mkd = pkg-list
+        for p in mkd
+        for id = (get-text-property 0 'tabulated-list-id p)
+        do (package-install
+            (if (fboundp 'package-desc-name)
+                (package-desc-name id)
+              (car id)))
+        collect (if (fboundp 'package-desc-full-name)
+                        id
+                      (car id))
+        into installed-list
+        finally do (progn
+                     (when (boundp 'package-selected-packages)
+                       (customize-save-variable
+                        'package-selected-packages
+                        (append (mapcar 'package-desc-name installed-list)
+                                package-selected-packages)))
+                     (if (fboundp 'package-desc-full-name)
+                         (message (format "%d packages installed:\n(%s)"
+                                          (length installed-list)
+                                          (mapconcat #'package-desc-full-name
+                                                     installed-list ", ")))
+                         (message (format "%d packages installed:\n(%s)"
+                                          (length installed-list)
+                                          (mapconcat 'symbol-name installed-list ", ")))))))
+
+(defun helm-el-package-install (_candidate)
+  (helm-el-package-install-1 (helm-marked-candidates)))
+
+(defun helm-el-run-package-install ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-el-package-install)))
+(put 'helm-el-run-package-install 'helm-only t)
+
+(defun helm-el-package-uninstall-1 (pkg-list)
+  (cl-loop with mkd = pkg-list
+        for p in mkd
+        for id = (get-text-property 0 'tabulated-list-id p)
+        do
+        (condition-case-unless-debug err
+            (with-no-warnings
+              (if (fboundp 'package-desc-full-name)
+                  ;; emacs 24.4
+                  (package-delete id)
+                ;; emacs 24.3
+                (package-delete (symbol-name (car id))
+                                (package-version-join (cdr id)))))
+          (error (message (cadr err))))
+        unless (assoc (elt id 1) package-alist)
+        collect (if (fboundp 'package-desc-full-name)
+                        id
+                      (cons (symbol-name (car id))
+                            (package-version-join (cdr id))))
+        into delete-list
+        finally do (if delete-list
+                       (if (fboundp 'package-desc-full-name)
+                           ;; emacs 24.4
+                           (message (format "%d packages deleted:\n(%s)"
+                                            (length delete-list)
+                                            (mapconcat #'package-desc-full-name
+                                                       delete-list ", ")))
+                           ;; emacs 24.3
+                           (message (format "%d packages deleted:\n(%s)"
+                                            (length delete-list)
+                                            (mapconcat (lambda (x)
+                                                         (concat (car x) "-" (cdr x)))
+                                                       delete-list ", ")))
+                           ;; emacs 24.3 doesn't update
+                           ;; its `package-alist' after deleting.
+                           (cl-loop for p in package-alist
+                                    when (assq (symbol-name (car p)) delete-list)
+                                    do (setq package-alist (delete p package-alist))))
+                       "No package deleted")))
+
+(defun helm-el-package-uninstall (_candidate)
+  (helm-el-package-uninstall-1 (helm-marked-candidates)))
+
+(defun helm-el-run-package-uninstall ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-el-package-uninstall)))
+(put 'helm-el-run-package-uninstall 'helm-only t)
+
+(defun helm-el-package-menu--find-upgrades ()
+  (cl-loop for entry in helm-el-package--tabulated-list
+           for pkg-desc = (car entry)
+           for status = (package-desc-status pkg-desc)
+           when (member status '("installed" "unsigned" "dependency"))
+           collect pkg-desc
+           into installed
+           when (member status '("available" "new"))
+           collect (cons (package-desc-name pkg-desc) pkg-desc)
+           into available
+           finally return
+           (cl-loop for pkg in installed
+                    for avail-pkg = (assq (package-desc-name pkg) available)
+                    when (and avail-pkg
+                              (version-list-< (package-desc-version pkg)
+                                              (package-desc-version
+                                               (cdr avail-pkg))))
+                    collect avail-pkg)))
+
+(defun helm-el-package-upgrade-1 (pkg-list)
+  (cl-loop for p in pkg-list
+           for pkg-desc = (car p)
+           for upgrade = (cdr (assq (package-desc-name pkg-desc)
+                                    helm-el-package--upgrades))
+           do
+           (cond ((null upgrade)
+                  (ignore))
+                 ((equal pkg-desc upgrade)
+                  ;;Install.
+                  (package-install pkg-desc))
+                 (t
+                  ;; Delete.
+                  (if (boundp 'package-selected-packages)
+                      (with-no-warnings
+                        (package-delete pkg-desc t t))
+                      (package-delete pkg-desc))))))
+
+(defun helm-el-package-upgrade (_candidate)
+  (helm-el-package-upgrade-1
+   (cl-loop with pkgs = (helm-marked-candidates)
+            for p in helm-el-package--tabulated-list
+            for pkg = (car p)
+            if (member (symbol-name (package-desc-name pkg)) pkgs)
+            collect p)))
+
+(defun helm-el-run-package-upgrade ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-el-package-upgrade)))
+(put 'helm-el-run-package-upgrade 'helm-only t)
+
+(defun helm-el-package-upgrade-all ()
+  (if helm-el-package--upgrades
+      (with-helm-display-marked-candidates
+        helm-marked-buffer-name (mapcar (lambda (x) (symbol-name (car x)))
+                                        helm-el-package--upgrades)
+        (when (y-or-n-p "Upgrade all packages? ")
+          (helm-el-package-upgrade-1 helm-el-package--tabulated-list)))
+      (message "No packages to upgrade actually!")))
+
+(defun helm-el-package-upgrade-all-action (_candidate)
+  (helm-el-package-upgrade-all))
+
+(defun helm-el-run-package-upgrade-all ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-el-package-upgrade-all-action)))
+(put 'helm-el-run-package-upgrade-all 'helm-only t)
+
+(defun helm-el-package--transformer (candidates _source)
+  (cl-loop for c in candidates
+           for id = (get-text-property 0 'tabulated-list-id c)
+           for name = (if (fboundp 'package-desc-name)
+                          (package-desc-name id)
+                          (car id))
+           for installed-p = (assq name package-alist)
+           for upgrade-p = (assq name helm-el-package--upgrades)
+           for user-installed-p = (and (boundp 'package-selected-packages)
+                                       (memq name package-selected-packages))
+           do (when user-installed-p (put-text-property 0 2 'display "S " c))
+           do (when (memq name helm-el-package--removable-packages)
+                (put-text-property 0 2 'display "U " c)
+                (put-text-property
+                 2 (+ (length (symbol-name name)) 2)
+                 'face 'font-lock-variable-name-face c))
+           for cand = (cons c (car (split-string c)))
+           when (or (and upgrade-p
+                         (eq helm-el-package--show-only 'upgrade))
+                    (and installed-p
+                         (eq helm-el-package--show-only 'installed))
+                    (and (not installed-p)
+                         (eq helm-el-package--show-only 'uninstalled)) 
+                    (eq helm-el-package--show-only 'all))
+           collect cand))
+
+(defun helm-el-package-show-upgrade ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-el-package--show-only 'upgrade)
+    (helm-update)))
+(put 'helm-el-package-show-upgrade 'helm-only t)
+
+(defun helm-el-package-show-installed ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-el-package--show-only 'installed)
+    (helm-update)))
+(put 'helm-el-package-show-installed 'helm-only t)
+
+(defun helm-el-package-show-all ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-el-package--show-only 'all)
+    (helm-update)))
+(put 'helm-el-package-show-all 'helm-only t)
+
+(defun helm-el-package-show-uninstalled ()
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-el-package--show-only 'uninstalled)
+    (helm-update)))
+(put 'helm-el-package-show-uninstalled 'helm-only t)
+
+(defvar helm-el-package-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-I")   'helm-el-package-show-installed)
+    (define-key map (kbd "M-O")   'helm-el-package-show-uninstalled)
+    (define-key map (kbd "M-U")   'helm-el-package-show-upgrade)
+    (define-key map (kbd "M-A")   'helm-el-package-show-all)
+    (define-key map (kbd "C-c i") 'helm-el-run-package-install)
+    (define-key map (kbd "C-c r") 'helm-el-run-package-reinstall)
+    (define-key map (kbd "C-c d") 'helm-el-run-package-uninstall)
+    (define-key map (kbd "C-c u") 'helm-el-run-package-upgrade)
+    (define-key map (kbd "C-c U") 'helm-el-run-package-upgrade-all)
+    (define-key map (kbd "C-c @") 'helm-el-run-visit-homepage)
+    map))
+
+(defvar helm-source-list-el-package nil)
+(defclass helm-list-el-package-source (helm-source-in-buffer)
+  ((init :initform 'helm-el-package--init)
+   (get-line :initform 'buffer-substring)
+   (filtered-candidate-transformer :initform 'helm-el-package--transformer)
+   (action-transformer
+    :initform
+    (lambda (actions candidate)
+      (let ((pkg-desc (get-text-property
+                       0 'tabulated-list-id candidate))
+            (acts (if helm-el-package--upgrades
+                      (append actions '(("Upgrade all packages"
+                                         . helm-el-package-upgrade-all-action)))
+                      actions)))
+        (cond ((and (package-installed-p (package-desc-name pkg-desc))
+                    (cdr (assq (package-desc-name pkg-desc)
+                          helm-el-package--upgrades)))
+               (append '(("Upgrade package(s)" . helm-el-package-upgrade)
+                         ("Uninstall package(s)" . helm-el-package-uninstall)) acts))
+              ((cdr (assq (package-desc-name pkg-desc)
+                          helm-el-package--upgrades))
+               (append '(("Upgrade package(s)" . helm-el-package-upgrade)) acts))
+              ((package-installed-p (package-desc-name pkg-desc))
+               (append acts '(("Reinstall package(s)" . helm-el-package-reinstall)
+                              ("Uninstall package(s)" . helm-el-package-uninstall))))
+              (t (append acts '(("Install packages(s)" . helm-el-package-install))))))))
+   (help-message :initform 'helm-el-package-help-message)
+   (keymap :initform helm-el-package-map)
+   (update :initform 'helm-el-package--update)
+   (candidate-number-limit :initform 9999)
+   (action :initform '(("Describe package" . helm-el-package-describe)
+                       ("Visit homepage" . helm-el-package-visit-homepage)))))
+
+(defun helm-el-package--update ()
+  (setq helm-el-package--initialized-p nil))
+
+(defun helm-el-package-reinstall (_pkg)
+  (cl-loop for p in (helm-marked-candidates)
+           for pkg-desc = (get-text-property 0 'tabulated-list-id p)
+           for name = (package-desc-name pkg-desc)
+           do (if (fboundp 'package-reinstall)
+                  (package-reinstall name)
+                  (package-delete pkg-desc)
+                  (package-install name))))
+
+(defun helm-el-run-package-reinstall ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-el-package-reinstall)))
+(put 'helm-el-run-package-reinstall 'helm-only t)
+
+;;;###autoload
+(defun helm-list-elisp-packages (arg)
+  "Preconfigured helm for listing and handling emacs packages."
+  (interactive "P")
+  (when arg (setq helm-el-package--initialized-p nil))
+  (unless helm-source-list-el-package
+    (setq helm-source-list-el-package
+          (helm-make-source "list packages" 'helm-list-el-package-source)))
+  (helm :sources 'helm-source-list-el-package
+        :buffer "*helm list packages*"))
+
+;;;###autoload
+(defun helm-list-elisp-packages-no-fetch ()
+  "Preconfigured helm for emacs packages.
+Same as `helm-list-elisp-packages' but don't fetch packages on remote."
+  (interactive)
+  (let ((helm-el-package--initialized-p t))
+    (helm-list-elisp-packages nil)))
+
+(provide 'helm-elisp-package)
+
+;;; helm-elisp-package.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-elisp.el b/emacs.d/elpa/helm-20160115.2200/helm-elisp.el
new file mode 100644
index 0000000..b2f40b4
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-elisp.el
@@ -0,0 +1,903 @@
+;;; helm-elisp.el --- Elisp symbols completion for helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-types)
+(require 'helm-utils)
+(require 'helm-info)
+(require 'helm-eval)
+(require 'helm-files)
+(require 'advice)
+
+(declare-function 'helm-describe-function "helm-lib")
+(declare-function 'helm-describe-variable "helm-lib")
+(declare-function 'helm-describe-face "helm-lib")
+
+
+;;; Customizable values
+
+(defgroup helm-elisp nil
+  "Elisp related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-turn-on-show-completion t
+  "Display candidate in buffer while moving selection when non--nil."
+  :group 'helm-elisp
+  :type  'boolean)
+
+(defcustom helm-show-completion-use-special-display t
+  "A special display will be used in Lisp completion if non--nil.
+All functions that are wrapped in macro `with-helm-show-completion'
+will be affected."
+  :group 'helm-elisp
+  :type  'boolean)
+
+(defcustom helm-show-completion-min-window-height 7
+  "Minimum completion window height used in show completion.
+This is used in macro `with-helm-show-completion'."
+  :group 'helm-elisp
+  :type  'integer)
+
+(defcustom helm-lisp-quoted-function-list
+  '(funcall apply mapc cl-mapc mapcar cl-mapcar
+    callf callf2 cl-callf cl-callf2 fset
+    fboundp fmakunbound symbol-function)
+  "List of function where quoted function completion happen.
+e.g give only function names after \(funcall '."
+  :group 'helm-elisp
+  :type '(repeat (choice symbol)))
+
+(defcustom helm-lisp-unquoted-function-list
+  '(function defadvice)
+  "List of function where unquoted function completion happen.
+e.g give only function names after \(function ."
+  :group 'helm-elisp
+  :type '(repeat (choice symbol)))
+
+(defcustom helm-apropos-fuzzy-match nil
+  "Enable fuzzy matching for `helm-apropos' when non-nil."
+  :group 'helm-elisp
+  :type 'boolean)
+
+(defcustom helm-lisp-fuzzy-completion nil
+  "Enable fuzzy matching in emacs-lisp completion when non-nil.
+NOTE: This enable fuzzy matching in helm native implementation of
+elisp completion, but not on helmized elisp completion, i.e
+fuzzy completion is not available in `completion-at-point'."
+  :group 'helm-elisp
+  :type 'boolean)
+
+(defcustom helm-apropos-function-list '(helm-def-source--emacs-commands
+                                        helm-def-source--emacs-functions
+                                        helm-def-source--eieio-classes
+                                        helm-def-source--eieio-generic
+                                        helm-def-source--emacs-variables
+                                        helm-def-source--emacs-faces
+                                        helm-def-source--helm-attributes)
+  "A list of functions that build helm sources to use in `helm-apropos'."
+  :group 'helm-elisp
+  :type '(repeat (choice symbol)))
+
+
+;;; Faces
+;;
+;;
+(defgroup helm-elisp-faces nil
+  "Customize the appearance of helm-elisp."
+  :prefix "helm-"
+  :group 'helm-elisp
+  :group 'helm-faces)
+
+(defface helm-lisp-show-completion
+    '((t (:background "DarkSlateGray")))
+  "Face used for showing candidates in `helm-lisp-completion'."
+  :group 'helm-elisp-faces)
+
+(defface helm-lisp-completion-info
+    '((t (:foreground "red")))
+  "Face used for showing info in `helm-lisp-completion'."
+  :group 'helm-elisp-faces)
+
+(defcustom helm-elisp-help-function
+  'helm-elisp-show-help
+  "Function for displaying help for Lisp symbols."
+  :group 'helm-elisp
+  :type '(choice (function :tag "Open help for the symbol."
+                  helm-elisp-show-help)
+                 (function :tag "Show one liner in modeline."
+                  helm-elisp-show-doc-modeline)))
+
+
+;;; Show completion.
+;;
+;; Provide show completion with macro `with-helm-show-completion'.
+
+(defvar helm-show-completion-overlay nil)
+
+;; Called each time cursor move in helm-buffer.
+(defun helm-show-completion ()
+  (with-helm-current-buffer
+    (overlay-put helm-show-completion-overlay
+                 'display (substring-no-properties
+                           (helm-get-selection)))))
+
+(defun helm-show-completion-init-overlay (beg end)
+  (when (and helm-turn-on-show-completion beg end)
+    (setq helm-show-completion-overlay (make-overlay beg end))
+    (overlay-put helm-show-completion-overlay
+                 'face 'helm-lisp-show-completion)))
+
+(defun helm-show-completion-display-function (buffer &rest _args)
+  "A special resized helm window is used depending on position in BUFFER."
+  (with-selected-window (selected-window)
+    (if (window-dedicated-p)
+        (helm-default-display-buffer buffer)
+      (let* ((screen-size  (+ (count-screen-lines (window-start) (point) t)
+                              1                         ; mode-line
+                              (if header-line-format 1 0))) ; header-line
+             (def-size     (- (window-height)
+                              helm-show-completion-min-window-height))
+             (upper-height (max window-min-height (min screen-size def-size)))
+             split-window-keep-point)
+        (recenter -1)
+        (set-window-buffer (if (active-minibuffer-window)
+                               (minibuffer-selected-window)
+                               (split-window nil upper-height
+                                             helm-split-window-default-side))
+                           buffer)))))
+
+(defmacro with-helm-show-completion (beg end &rest body)
+  "Show helm candidate in an overlay at point.
+BEG and END are the beginning and end position of the current completion
+in `helm-current-buffer'.
+BODY is an helm call where we want to enable show completion.
+If `helm-turn-on-show-completion' is nil just do nothing."
+  (declare (indent 2) (debug t))
+  `(let ((helm-move-selection-after-hook
+          (and helm-turn-on-show-completion
+               (append (list 'helm-show-completion)
+                       helm-move-selection-after-hook))))
+     (with-helm-temp-hook 'helm-after-initialize-hook
+       (with-helm-buffer
+         (set (make-local-variable 'helm-display-function)
+              (if helm-show-completion-use-special-display
+                  'helm-show-completion-display-function
+                'helm-default-display-buffer))))
+     (unwind-protect
+          (progn
+            (helm-show-completion-init-overlay ,beg ,end)
+            ,@body)
+       (when (and helm-turn-on-show-completion
+                  helm-show-completion-overlay
+                  (overlayp helm-show-completion-overlay))
+         (delete-overlay helm-show-completion-overlay)))))
+
+
+;;; Lisp symbol completion.
+;;
+;;
+(defun helm-lisp-completion--predicate-at-point (beg)
+  ;; Return a predicate for `all-completions'.
+  (let ((fn-sym-p (lambda ()
+                    (or
+                     (and (eq (char-before) ?\ )
+                          (save-excursion
+                            (skip-syntax-backward " " (point-at-bol))
+                            (memq (symbol-at-point)
+                                  helm-lisp-unquoted-function-list)))
+                     (and (eq (char-before) ?\')
+                          (save-excursion
+                            (forward-char -1)
+                            (eq (char-before) ?\#)))))))
+    (save-excursion
+      (goto-char beg)
+      (if (or
+           ;; Complete on all symbols in non--lisp modes (logs mail etc..)
+           (not (memq major-mode '(emacs-lisp-mode
+                                   lisp-interaction-mode
+                                   inferior-emacs-lisp-mode)))
+           (not (or (funcall fn-sym-p)
+                    (and (eq (char-before) ?\')
+                         (save-excursion
+                           (forward-char (if (funcall fn-sym-p) -2 -1))
+                           (skip-syntax-backward " " (point-at-bol))
+                           (memq (symbol-at-point)
+                                 helm-lisp-quoted-function-list)))
+                    (eq (char-before) ?\())) ; no paren before str.
+           ;; Looks like we are in a let statement.
+           (condition-case nil
+               (progn (up-list -2) (forward-char 1)
+                      (eq (char-after) ?\())
+             (error nil)))
+          (lambda (sym)
+            (or (boundp sym) (fboundp sym) (symbol-plist sym)))
+        #'fboundp))))
+
+(defun helm-thing-before-point (&optional limits regexp)
+  "Return symbol name before point.
+If REGEXP is specified return what REGEXP find before point.
+By default match the beginning of symbol before point.
+With LIMITS arg specified return the beginning and end position
+of symbol before point."
+  (save-excursion
+    (let (beg
+          (end (point))
+          (boundary (field-beginning nil nil (point-at-bol))))
+      (if (re-search-backward (or regexp "\\_<") boundary t)
+          (setq beg (match-end 0))
+        (setq beg boundary))
+      (unless (= beg end)
+        (if limits
+            (cons beg end)
+          (buffer-substring-no-properties beg end))))))
+
+(defun helm-bounds-of-thing-before-point (&optional regexp)
+  "Get the beginning and end position of `helm-thing-before-point'.
+Return a cons \(beg . end\)."
+  (helm-thing-before-point 'limits regexp))
+
+(defun helm-insert-completion-at-point (beg end str)
+  ;; When there is no space after point
+  ;; we are completing inside a symbol or
+  ;; after a partial symbol with the next arg aside
+  ;; without space, in this case mark the region.
+  ;; deleting it would remove the
+  ;; next arg which is unwanted.
+  (delete-region beg end)
+  (insert str)
+  (let ((pos (cdr (or (bounds-of-thing-at-point 'symbol)
+                      ;; needed for helm-dabbrev.
+                      (bounds-of-thing-at-point 'filename)))))
+    (when (and pos (< (point) pos))
+      (push-mark pos t t))))
+
+(defvar helm-lisp-completion--cache nil)
+(defvar helm-lgst-len nil)
+;;;###autoload
+(defun helm-lisp-completion-at-point ()
+  "Preconfigured helm for lisp symbol completion at point."
+  (interactive)
+  (setq helm-lgst-len 0)
+  (let* ((target     (helm-thing-before-point))
+         (beg        (car (helm-bounds-of-thing-before-point)))
+         (end        (point))
+         (pred       (and beg (helm-lisp-completion--predicate-at-point beg)))
+         (loc-vars   (and (fboundp 'elisp--local-variables)
+                          (ignore-errors
+                            (mapcar #'symbol-name (elisp--local-variables)))))
+         (glob-syms  (and target pred (all-completions target obarray pred)))
+         (candidates (append loc-vars glob-syms))
+         (helm-quit-if-no-candidate t)
+         (helm-execute-action-at-once-if-one t)
+         (enable-recursive-minibuffers t))
+    (setq helm-lisp-completion--cache (cl-loop for sym in candidates
+                                            for len = (length sym)
+                                            when (> len helm-lgst-len)
+                                            do (setq helm-lgst-len len)
+                                            collect sym))
+    (if candidates
+        (with-helm-show-completion beg end
+          ;; Overlay is initialized now in helm-current-buffer.
+          (helm
+           :sources (helm-build-in-buffer-source "Lisp completion"
+                      :data helm-lisp-completion--cache
+                      :persistent-action 'helm-lisp-completion-persistent-action
+                      :nomark t
+                      :fuzzy-match helm-lisp-fuzzy-completion
+                      :persistent-help (helm-lisp-completion-persistent-help)
+                      :filtered-candidate-transformer
+                      'helm-lisp-completion-transformer
+                      :action `(lambda (candidate)
+                                 (with-helm-current-buffer
+                                   (run-with-timer
+                                    0.01 nil
+                                    'helm-insert-completion-at-point
+                                    ,beg ,end candidate))))
+           :input (if helm-lisp-fuzzy-completion
+                      target (concat target " "))
+           :resume 'noresume
+           :buffer "*helm lisp completion*"
+           :allow-nest t))
+      (message "[No Match]"))))
+
+(defun helm-lisp-completion-persistent-action (candidate &optional name)
+  "Show documentation for the function.
+Documentation is shown briefly in mode-line or completely
+in other window according to the value of `helm-elisp-help-function'."
+  (funcall helm-elisp-help-function candidate name))
+
+(defun helm-lisp-completion-persistent-help ()
+  "Return persistent-help according to the value of `helm-elisp-help-function'"
+    (cl-ecase helm-elisp-help-function
+      (helm-elisp-show-doc-modeline "Show brief doc in mode-line")
+      (helm-elisp-show-help "Toggle show help for the symbol")))
+
+(defun helm-elisp--show-help-1 (candidate &optional name)
+  (let ((sym (intern-soft candidate)))
+    (cl-typecase sym
+      ((and fboundp boundp)
+       (if (member name '("describe-function" "describe-variable"))
+           (funcall (intern (format "helm-%s" name)) sym)
+           ;; When there is no way to know what to describe
+           ;; prefer describe-function.
+           (helm-describe-function sym)))
+      (fboundp  (helm-describe-function sym))
+      (bound    (helm-describe-variable sym))
+      (face     (helm-describe-face sym)))))
+
+(defun helm-elisp-show-help (candidate &optional name)
+  "Show full help for the function CANDIDATE.
+Arg NAME specify the name of the top level function
+calling helm generic completion (e.g \"describe-function\")."
+  (helm-elisp--persistent-help
+   candidate 'helm-elisp--show-help-1 name))
+
+(defun helm-elisp-show-doc-modeline (candidate &optional name)
+  "Show brief documentation for the function in modeline."
+  (let ((cursor-in-echo-area t)
+        mode-line-in-non-selected-windows)
+    (helm-show-info-in-mode-line
+     (propertize
+      (helm-get-first-line-documentation
+       (intern candidate) name)
+      'face 'helm-lisp-completion-info))))
+
+(defun helm-lisp-completion-transformer (candidates _source)
+  "Helm candidates transformer for lisp completion."
+  (cl-loop for c in candidates
+        for sym = (intern c)
+        for annot = (cl-typecase sym
+                      (command " (Com)")
+                      (class   " (Class)")
+                      (generic " (Gen)")
+                      (fbound  " (Fun)")
+                      (bound   " (Var)")
+                      (face    " (Face)"))
+        for spaces = (make-string (- helm-lgst-len (length c)) ? )
+        collect (cons (concat c spaces annot) c) into lst
+        finally return (sort lst #'helm-generic-sort-fn)))
+
+(defun helm-get-first-line-documentation (sym &optional name)
+  "Return first line documentation of symbol SYM.
+If SYM is not documented, return \"Not documented\"."
+  (let ((doc (cl-typecase sym
+               ((and fboundp boundp)
+                (cond ((string= name "describe-function")
+                       (documentation sym t))
+                      ((string= name  "describe-variable")
+                       (documentation-property sym 'variable-documentation t))
+                      (t (documentation sym t))))
+               (fbound  (documentation sym t))
+               (bound   (documentation-property sym 'variable-documentation t))
+               (face    (face-documentation sym)))))
+    (if (and doc (not (string= doc ""))
+             ;; `documentation' return "\n\n(args...)"
+             ;; for CL-style functions.
+             (not (string-match-p "^\n\n" doc)))
+        (car (split-string doc "\n"))
+      "Not documented")))
+
+;;; File completion.
+;;
+;; Complete file name at point.
+
+;;;###autoload
+(defun helm-complete-file-name-at-point (&optional force)
+  "Preconfigured helm to complete file name at point."
+  (interactive)
+  (require 'helm-mode)
+  (let* ((tap (thing-at-point 'filename))
+         beg
+         (init (and tap
+                    (or force
+                        (save-excursion
+                          (end-of-line)
+                          (search-backward tap (point-at-bol) t)
+                          (setq beg (point))
+                          (looking-back "[^'`( ]" (1- (point)))))
+                    (expand-file-name
+                     (substring-no-properties tap))))
+         (end  (point))
+         (helm-quit-if-no-candidate t)
+         (helm-execute-action-at-once-if-one t)
+         completion)
+    (with-helm-show-completion beg end
+      (setq completion (helm-read-file-name "FileName: "
+                                            :initial-input init)))
+    (when (and completion (not (string= completion "")))
+      (delete-region beg end) (insert (if (string-match "^~" tap)
+                                          (abbreviate-file-name completion)
+                                        completion)))))
+
+;;;###autoload
+(defun helm-lisp-indent ()
+  ;; It is meant to use with `helm-define-multi-key' which
+  ;; does not support args for functions yet, so use `current-prefix-arg'
+  ;; for now instead of (interactive "P").
+  (interactive)
+  (let ((tab-always-indent (or (eq tab-always-indent 'complete)
+                               tab-always-indent)))
+    (indent-for-tab-command current-prefix-arg)))
+
+;;;###autoload
+(defun helm-lisp-completion-or-file-name-at-point ()
+  "Preconfigured helm to complete lisp symbol or filename at point.
+Filename completion happen if string start after or between a double quote."
+  (interactive)
+  (let* ((tap (thing-at-point 'filename)))
+    (if (and tap (save-excursion
+                   (end-of-line)
+                   (search-backward tap (point-at-bol) t)
+                   (looking-back "[^'`( ]" (1- (point)))))
+        (helm-complete-file-name-at-point)
+      (helm-lisp-completion-at-point))))
+
+
+;;; Apropos
+;;
+;;
+(defun helm-apropos-init (test default)
+  "Init candidates buffer for `helm-apropos' sources."
+  (require 'helm-help)
+  (helm-init-candidates-in-buffer 'global
+    (let ((default-symbol (and (stringp default)
+                               (intern-soft default)))
+          (symbols (all-completions "" obarray test)))
+      (if (and default-symbol (funcall test default-symbol))
+          (cons default-symbol symbols)
+        symbols))))
+
+(defun helm-apropos-init-faces (default)
+  "Init candidates buffer for faces for `helm-apropos'."
+  (require 'helm-help)
+  (with-current-buffer (helm-candidate-buffer 'global)
+    (goto-char (point-min))
+    (let ((default-symbol (and (stringp default)
+                               (intern-soft default)))
+          (faces (face-list)))
+      (when (and default-symbol (facep default-symbol))
+        (insert (concat default "\n")))
+      (insert
+       (mapconcat #'prin1-to-string
+                  (if default
+                      (cl-remove-if (lambda (sym) (string= sym default)) faces)
+                    faces)
+                  "\n")))))
+
+(defun helm-apropos-default-sort-fn (candidates _source)
+  (if (string= helm-pattern "")
+      candidates
+      (sort candidates #'helm-generic-sort-fn)))
+
+(defun helm-def-source--emacs-variables (&optional default)
+  (helm-build-in-buffer-source "Variables"
+    :init `(lambda ()
+             (helm-apropos-init
+              (lambda (x) (and (boundp x) (not (keywordp x)))) ,default))
+    :fuzzy-match helm-apropos-fuzzy-match
+    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
+                                         'helm-apropos-default-sort-fn)
+    :nomark t
+    :persistent-action (lambda (candidate)
+                         (helm-elisp--persistent-help
+                          candidate 'helm-describe-variable))
+    :persistent-help "Describe variable"
+    :action '(("Describe variable" . helm-describe-variable)
+              ("Find variable" . helm-find-variable)
+              ("Info lookup" . helm-info-lookup-symbol)
+              ("Set variable" . helm-set-variable))
+    :action-transformer
+    (lambda (actions candidate)
+      (let ((sym (helm-symbolify candidate)))
+        (if (custom-variable-p sym)
+            (append
+             actions
+             (let ((standard-value (eval (car (get sym 'standard-value)))))
+               (unless (equal standard-value (symbol-value sym))
+                 `(("Reset Variable to default value" .
+                    ,(lambda (candidate)
+                       (let ((sym (helm-symbolify candidate)))
+                         (set sym standard-value)))))))
+             '(("Customize variable" .
+                (lambda (candidate)
+                  (customize-option (helm-symbolify candidate))))))
+          actions)))))
+
+(defun helm-def-source--emacs-faces (&optional default)
+  "Create `helm' source for faces to be displayed with
+`helm-apropos'."
+  (helm-build-in-buffer-source "Faces"
+    :init (lambda () (helm-apropos-init-faces default))
+    :fuzzy-match helm-apropos-fuzzy-match
+    :filtered-candidate-transformer
+    (append (and (null helm-apropos-fuzzy-match)
+                 '(helm-apropos-default-sort-fn))
+            (list
+             (lambda (candidates _source)
+               (cl-loop for c in candidates
+                        collect (propertize c 'face (intern c))))))
+    :persistent-action (lambda (candidate)
+                         (helm-elisp--persistent-help
+                          candidate 'helm-describe-face))
+    :persistent-help "Describe face"
+    :nomark t
+    :action '(("Describe face" . helm-describe-face)
+              ("Find face" . helm-find-face-definition)
+              ("Customize face" . (lambda (candidate)
+                                    (customize-face (helm-symbolify candidate)))))))
+
+(defun helm-def-source--helm-attributes (&optional _default)
+  (let ((def-act (lambda (candidate)
+                   (let (special-display-buffer-names
+                         special-display-regexps
+                         helm-persistent-action-use-special-display)
+                     (with-output-to-temp-buffer "*Help*"
+                       (princ (get (intern candidate) 'helm-attrdoc)))))))
+    (helm-build-sync-source "Helm attributes"
+      :candidates (lambda ()
+                    (mapcar 'symbol-name helm-attributes))
+      :fuzzy-match helm-apropos-fuzzy-match
+      :nomark t
+      :persistent-action (lambda (candidate)
+                           (helm-elisp--persistent-help
+                            candidate def-act))
+      :persistent-help "Describe helm attribute"
+      :action def-act)))
+
+(defun helm-def-source--emacs-commands (&optional default)
+  (helm-build-in-buffer-source "Commands"
+    :init `(lambda ()
+             (helm-apropos-init 'commandp ,default))
+    :fuzzy-match helm-apropos-fuzzy-match
+    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
+                                         'helm-apropos-default-sort-fn)
+    :nomark t
+    :persistent-action (lambda (candidate)
+                         (helm-elisp--persistent-help
+                          candidate 'helm-describe-function))
+    :persistent-help "Describe command"
+    :action '(("Describe function" . helm-describe-function)
+              ("Find function" . helm-find-function)
+              ("Info lookup" . helm-info-lookup-symbol))))
+
+(defun helm-def-source--emacs-functions (&optional default)
+  (helm-build-in-buffer-source "Functions"
+    :init `(lambda ()
+             (helm-apropos-init (lambda (x)
+                                    (and (fboundp x)
+                                         (not (commandp x))
+                                         (not (generic-p x))
+                                         (not (class-p x))))
+                                ,default))
+    :fuzzy-match helm-apropos-fuzzy-match
+    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
+                                         'helm-apropos-default-sort-fn)
+    :persistent-action (lambda (candidate)
+                         (helm-elisp--persistent-help
+                          candidate 'helm-describe-function))
+    :persistent-help "Describe function"
+    :nomark t
+    :action '(("Describe function" . helm-describe-function)
+              ("Find function" . helm-find-function)
+              ("Info lookup" . helm-info-lookup-symbol))))
+
+(defun helm-def-source--eieio-classes (&optional default)
+  (helm-build-in-buffer-source "Classes"
+    :init `(lambda ()
+             (helm-apropos-init (lambda (x)
+                                    (class-p x))
+                                ,default))
+    :fuzzy-match helm-apropos-fuzzy-match
+    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
+                                         'helm-apropos-default-sort-fn)
+    :nomark t
+    :persistent-action (lambda (candidate)
+                         (helm-elisp--persistent-help
+                          candidate 'helm-describe-function))
+    :persistent-help "Describe class"
+    :action '(("Describe function" . helm-describe-function)
+              ("Find function" . helm-find-function)
+              ("Info lookup" . helm-info-lookup-symbol))))
+
+(defun helm-def-source--eieio-generic (&optional default)
+  (helm-build-in-buffer-source "Generic functions"
+    :init `(lambda ()
+             (helm-apropos-init (lambda (x)
+                                  (generic-p x))
+                                ,default))
+    :fuzzy-match helm-apropos-fuzzy-match
+    :filtered-candidate-transformer (and (null helm-apropos-fuzzy-match)
+                                         'helm-apropos-default-sort-fn)
+    :nomark t
+    :persistent-action (lambda (candidate)
+                         (helm-elisp--persistent-help
+                          candidate 'helm-describe-function))
+    :persistent-help "Describe generic function"
+    :action '(("Describe function" . helm-describe-function)
+              ("Find function" . helm-find-function)
+              ("Info lookup" . helm-info-lookup-symbol))))
+
+(defun helm-info-lookup-symbol-1 (c)
+  (let ((helm-execute-action-at-once-if-one t)
+        (helm-quit-if-no-candidate
+         `(lambda ()
+            (message "`%s' Not Documented as a symbol" ,c))))
+    (helm :sources '(helm-source-info-elisp
+                     helm-source-info-cl
+                     helm-source-info-eieio)
+          :resume 'noresume
+          :buffer "*helm lookup*"
+          :input c)))
+
+(defun helm-info-lookup-symbol (candidate)
+  (run-with-timer 0.01 nil #'helm-info-lookup-symbol-1 candidate))
+
+(defun helm-elisp--persistent-help (candidate fun &optional name)
+  (let ((hbuf (get-buffer (help-buffer))))
+    (if (and (helm-attr 'help-running-p)
+             (string= candidate (helm-attr 'help-current-symbol))
+             (null helm-persistent-action-use-special-display))
+        (progn
+          ;; When started from a help buffer,
+          ;; Don't kill this buffer as it is helm-current-buffer.
+          (unless (equal hbuf helm-current-buffer)
+            (kill-buffer hbuf)
+            (set-window-buffer (get-buffer-window hbuf)
+                               helm-current-buffer))
+          (helm-attrset 'help-running-p nil))
+        (if name (funcall fun candidate name) (funcall fun candidate))
+        (helm-attrset 'help-running-p t))
+    (helm-attrset 'help-current-symbol candidate)))
+
+;;;###autoload
+(defun helm-apropos ()
+  "Preconfigured helm to describe commands, functions, variables and faces."
+  (interactive)
+  (let ((default (thing-at-point 'symbol)))
+    (helm :sources
+          (mapcar (lambda (func)
+                    (funcall func default))
+                  helm-apropos-function-list)
+          :buffer "*helm apropos*"
+          :preselect (and default (concat "\\_<" (regexp-quote default) "\\_>")))))
+
+
+;;; Advices
+;;
+;;
+(defvar helm-source-advice
+  '((name . "Function Advice")
+    (candidates . helm-advice-candidates)
+    (action ("Toggle Enable/Disable" . helm-advice-toggle))
+    (persistent-action . helm-advice-persistent-action)
+    (nomark)
+    (multiline)
+    (persistent-help . "Describe function / C-u C-j: Toggle advice")))
+
+(defun helm-advice-candidates ()
+  (cl-loop for (fname) in ad-advised-functions
+        for function = (intern fname)
+        append
+        (cl-loop for class in ad-advice-classes append
+              (cl-loop for advice in (ad-get-advice-info-field function class)
+                    for enabled = (ad-advice-enabled advice)
+                    collect
+                    (cons (format
+                           "%s %s %s"
+                           (if enabled "Enabled " "Disabled")
+                           (propertize fname 'face 'font-lock-function-name-face)
+                           (ad-make-single-advice-docstring advice class nil))
+                          (list function class advice))))))
+
+(defun helm-advice-persistent-action (func-class-advice)
+  (if current-prefix-arg
+      (helm-advice-toggle func-class-advice)
+    (describe-function (car func-class-advice))))
+
+(defun helm-advice-toggle (func-class-advice)
+  (cl-destructuring-bind (function _class advice) func-class-advice
+    (cond ((ad-advice-enabled advice)
+           (ad-advice-set-enabled advice nil)
+           (message "Disabled"))
+          (t
+           (ad-advice-set-enabled advice t)
+           (message "Enabled")))
+    (ad-activate function)
+    (and helm-in-persistent-action
+         (helm-advice-update-current-display-string))))
+
+(defun helm-advice-update-current-display-string ()
+  (helm-edit-current-selection
+    (let ((newword (cond ((looking-at "Disabled") "Enabled")
+                         ((looking-at "Enabled")  "Disabled"))))
+      (when newword
+        (delete-region (point) (progn (forward-word 1) (point)))
+        (insert newword)))))
+
+;;;###autoload
+(defun helm-manage-advice ()
+  "Preconfigured `helm' to disable/enable function advices."
+  (interactive)
+  (helm-other-buffer 'helm-source-advice "*helm advice*"))
+
+
+;;; Locate elisp library
+;;
+;;
+(defun helm-locate-library-scan-list ()
+  (cl-loop for dir in load-path
+        when (file-directory-p dir)
+        append (directory-files dir t (concat (regexp-opt (get-load-suffixes))
+                                              "\\'"))
+        into lst
+        finally return (helm-fast-remove-dups lst :test 'equal)))
+
+;;;###autoload
+(defun helm-locate-library ()
+  "Preconfigured helm to locate elisp libraries."
+  (interactive)
+  (helm :sources (helm-build-in-buffer-source  "Elisp libraries (Scan)"
+                   :data (lambda () (helm-locate-library-scan-list))
+                   :fuzzy-match t
+                   :keymap helm-generic-files-map
+                   :match-part (lambda (candidate)
+                                 (if helm-ff-transformer-show-only-basename
+                                     (helm-basename candidate) candidate))
+                   :filter-one-by-one (lambda (c)
+                                        (if helm-ff-transformer-show-only-basename
+                                            (cons (helm-basename c) c) c))
+                   :action (helm-actions-from-type-file))
+        :buffer "*helm locate library*"))
+
+(defun helm-set-variable (var)
+  "Set value to VAR interactively."
+  (let* ((sym (helm-symbolify var))
+         (val (default-value sym)))
+    (set-default sym (eval-minibuffer (format "Set `%s': " var)
+                                      (if (or (stringp val) (memq val '(nil t)))
+                                          (prin1-to-string val)
+                                          (format "'%s" (prin1-to-string val)))))))
+
+
+;;; Elisp Timers.
+;;
+;;
+(defclass helm-absolute-time-timers-class (helm-source-sync helm-type-timers)
+  ((candidates :initform timer-list)
+   (allow-dups :initform t)
+   (candidate-transformer
+    :initform
+    (lambda (candidates)
+      (cl-loop for timer in candidates
+               collect (cons (helm-elisp--format-timer timer) timer))))))
+
+(defvar helm-source-absolute-time-timers
+  (helm-make-source "Absolute Time Timers" 'helm-absolute-time-timers-class))
+
+(defclass helm-idle-time-timers-class (helm-source-sync helm-type-timers)
+  ((candidates :initform timer-idle-list)
+   (allow-dups :initform t)
+   (candidate-transformer
+    :initform
+    (lambda (candidates)
+      (cl-loop for timer in candidates
+               collect (cons (helm-elisp--format-timer timer) timer))))))
+
+(defvar helm-source-idle-time-timers
+  (helm-make-source "Idle Time Timers" 'helm-idle-time-timers-class))
+
+(defun helm-elisp--format-timer (timer)
+  (format "%s repeat=%s %s(%s)"
+          (let ((time (timer--time timer)))
+            (if (timer--idle-delay timer)
+                (format-time-string "idle-for=%5s" time)
+              (format-time-string "%m/%d %T" time)))
+          (or (timer--repeat-delay timer) "nil")
+          (mapconcat 'identity (split-string
+                                (prin1-to-string (timer--function timer))
+                                "\n") " ")
+          (mapconcat 'prin1-to-string (timer--args timer) " ")))
+
+;;;###autoload
+(defun helm-timers ()
+  "Preconfigured `helm' for timers."
+  (interactive)
+  (helm :sources '(helm-source-absolute-time-timers
+                   helm-source-idle-time-timers)
+        :buffer "*helm timers*"))
+
+
+;;; Complex command history
+;;
+;;
+(defun helm-btf--usable-p ()
+  "Return t if current version of `backtrace-frame' accept 2 arguments."
+  (condition-case nil
+      (progn (backtrace-frame 1 'condition-case) t)
+    (wrong-number-of-arguments nil)))
+
+(if (helm-btf--usable-p)        ; Check if BTF accept more than one arg.
+    ;; Emacs 24.4.
+    (dont-compile
+      (defvar helm-sexp--last-sexp nil)
+      ;; This wont work compiled.
+      (defun helm-sexp-eval-1 ()
+        (interactive)
+        (unwind-protect
+             (progn
+               ;; Trick called-interactively-p into thinking that `cand' is
+               ;; an interactive call, See `repeat-complex-command'.
+               (add-hook 'called-interactively-p-functions
+                         #'helm-complex-command-history--called-interactively-skip)
+               (eval (read helm-sexp--last-sexp)))
+          (remove-hook 'called-interactively-p-functions
+                       #'helm-complex-command-history--called-interactively-skip)))
+
+      (defun helm-complex-command-history--called-interactively-skip (i _frame1 frame2)
+        (and (eq 'eval (cadr frame2))
+             (eq 'helm-sexp-eval-1
+                 (cadr (backtrace-frame (+ i 2) #'called-interactively-p)))
+             1))
+
+      (defun helm-sexp-eval (_candidate)
+        (call-interactively #'helm-sexp-eval-1)))
+  ;; Emacs 24.3
+  (defun helm-sexp-eval (cand)
+    (let ((sexp (read cand)))
+      (condition-case err
+          (if (> (length (remove nil sexp)) 1)
+              (eval sexp)
+            (apply 'call-interactively sexp))
+        (error (message "Evaluating gave an error: %S" err)
+               nil)))))
+
+(defvar helm-source-complex-command-history
+  (helm-build-sync-source "Complex Command History"
+    :candidates (lambda ()
+                  ;; Use cdr to avoid adding
+                  ;; `helm-complex-command-history' here.
+                  (cl-loop for i in command-history
+                           unless (equal i '(helm-complex-command-history))
+                           collect (prin1-to-string i)))
+    :action (helm-make-actions
+             "Eval" (lambda (candidate)
+                      (and (boundp 'helm-sexp--last-sexp)
+                           (setq helm-sexp--last-sexp candidate))
+                      (run-with-timer 0.1 nil #'helm-sexp-eval candidate))
+             "Edit and eval" (lambda (candidate)
+                               (edit-and-eval-command "Eval: " (read candidate))))
+    :persistent-action #'helm-sexp-eval))
+
+;;;###autoload
+(defun helm-complex-command-history ()
+  "Preconfigured helm for complex command history."
+  (interactive)
+  (helm :sources 'helm-source-complex-command-history
+        :buffer "*helm complex commands*"))
+
+(provide 'helm-elisp)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-elisp.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-elscreen.el b/emacs.d/elpa/helm-20160115.2200/helm-elscreen.el
new file mode 100644
index 0000000..ea16b0d
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-elscreen.el
@@ -0,0 +1,102 @@
+;;; helm-elscreen.el -- Elscreen support -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+
+(declare-function elscreen-find-screen-by-buffer "ext:elscreen.el" (buffer &optional create))
+(declare-function elscreen-find-file "ext:elscreen.el" (filename))
+(declare-function elscreen-goto "ext:elscreen.el" (screen))
+(declare-function elscreen-get-conf-list "ext:elscreen.el" (type))
+
+(defun helm-find-buffer-on-elscreen (candidate)
+  "Open buffer in new screen, if marked buffers open all in elscreens."
+  (helm-require-or-error 'elscreen 'helm-find-buffer-on-elscreen)
+  (helm-aif (helm-marked-candidates)
+      (cl-dolist (i it)
+        (let ((target-screen (elscreen-find-screen-by-buffer
+                              (get-buffer i) 'create)))
+          (elscreen-goto target-screen)))
+    (let ((target-screen (elscreen-find-screen-by-buffer
+                          (get-buffer candidate) 'create)))
+      (elscreen-goto target-screen))))
+
+(defun helm-elscreen-find-file (file)
+  (helm-require-or-error 'elscreen 'helm-elscreen-find-file)
+  (elscreen-find-file file))
+
+(defclass helm-source-elscreen (helm-source-sync)
+  ((candidates
+    :initform
+    (lambda ()
+      (when (cdr (elscreen-get-screen-to-name-alist))
+        (cl-sort (cl-loop for (screen . name) in (elscreen-get-screen-to-name-alist)
+                       collect (cons (format "[%d] %s" screen name) screen))
+                 #'< :key #'cdr))))
+   (action :initform
+           '(("Change Screen" .
+              (lambda (candidate)
+                (elscreen-goto candidate)))
+             ("Kill Screen(s)" .
+              (lambda (_)
+                (cl-dolist (i (helm-marked-candidates))
+                  (elscreen-goto i)
+                  (elscreen-kill))))
+             ("Only Screen" .
+              (lambda (candidate)
+                (elscreen-goto candidate)
+                (elscreen-kill-others)))))
+   (migemo :initform t)))
+
+(defclass helm-source-elscreen-history (helm-source-elscreen)
+  ((candidates
+    :initform
+    (lambda ()
+      (let ((sname (elscreen-get-screen-to-name-alist)))
+        (when (cdr sname)
+          (cl-loop for screen in (cdr (elscreen-get-conf-list 'screen-history))
+                collect (cons (format "[%d] %s" screen (cdr (assq screen sname)))
+                              screen))))))))
+
+(defvar helm-source-elscreen-list
+  (helm-make-source "ElScreen" 'helm-source-elscreen))
+
+(defvar helm-source-elscreen-history-list
+  (helm-make-source "ElScreen History" 'helm-source-elscreen-history))
+
+;;;###autoload
+(defun helm-elscreen ()
+  "Preconfigured helm to list elscreen."
+  (interactive)
+  (helm-other-buffer 'helm-source-elscreen-list "*Helm ElScreen*"))
+
+;;;###autoload
+(defun helm-elscreen-history ()
+  "Preconfigured helm to list elscreen in history order."
+  (interactive)
+  (helm-other-buffer 'helm-source-elscreen-history-list "*Helm ElScreen*"))
+
+(provide 'helm-elscreen)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-elscreen.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-eshell.el b/emacs.d/elpa/helm-20160115.2200/helm-eshell.el
new file mode 100644
index 0000000..aa61329
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-eshell.el
@@ -0,0 +1,268 @@
+;;; helm-eshell.el --- pcomplete and eshell completion for helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Enable like this in .emacs:
+;; (add-hook 'eshell-mode-hook
+;;           (lambda ()
+;;               (eshell-cmpl-initialize)
+;;               (define-key eshell-mode-map [remap pcomplete] 'helm-esh-pcomplete)
+;;               (define-key eshell-mode-map (kbd "M-p") 'helm-eshell-history)))
+
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-lib)
+(require 'helm-help)
+(require 'helm-elisp)
+
+(declare-function eshell-read-aliases-list "em-alias")
+(declare-function eshell-send-input "esh-mode" (&optional use-region queue-p no-newline))
+(declare-function eshell-bol "esh-mode")
+(declare-function eshell-parse-arguments "esh-arg" (beg end))
+(declare-function eshell-backward-argument "esh-mode" (&optional arg))
+(declare-function helm-quote-whitespace "helm-lib")
+
+
+(defgroup helm-eshell nil
+  "Helm eshell completion and history."
+  :group 'helm)
+
+(defcustom helm-eshell-hist-ignoredups nil
+  "Same as `eshell-hist-ignoredups' which see but for helm."
+  :group 'helm-eshell
+  :type 'boolean)
+
+
+(defvar helm-eshell-history-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-p") 'helm-next-line)
+    map)
+  "Keymap for `helm-eshell-history'.")
+
+(defvar helm-esh-completion-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "TAB") 'helm-next-line)
+    map)
+  "Keymap for `helm-esh-pcomplete'.")
+
+
+(defclass helm-esh-source (helm-source-sync)
+  ((init :initform (lambda ()
+                     (setq pcomplete-current-completions nil
+                           pcomplete-last-completion-raw nil)
+                     ;; Eshell-command add this hook in all minibuffers
+                     ;; Remove it for the helm one. (Fixed in Emacs24)
+                     (remove-hook 'minibuffer-setup-hook 'eshell-mode)))
+   (candidates :initform 'helm-esh-get-candidates)
+   (nomark :initform t)
+   (persistent-action :initform 'ignore)
+   (filtered-candidate-transformer
+    :initform
+    (lambda (candidates _sources)
+      (cl-loop 
+       for i in candidates
+       collect
+       (cond ((string-match "\\`~/?" helm-ec-target)
+              (abbreviate-file-name i))
+             ((string-match "\\`/" helm-ec-target) i)
+             (t
+              (file-relative-name i)))
+       into lst
+       finally return (sort lst 'helm-generic-sort-fn))))
+   (action :initform 'helm-ec-insert))
+  "Helm class to define source for Eshell completion.")
+
+;; Internal.
+(defvar helm-ec-target "")
+(defun helm-ec-insert (candidate)
+  "Replace text at point with CANDIDATE.
+The function that call this should set `helm-ec-target' to thing at point."
+  (let ((pt (point)))
+    (when (and helm-ec-target
+               (search-backward helm-ec-target nil t)
+               (string= (buffer-substring (point) pt) helm-ec-target))
+      (delete-region (point) pt)))
+  (when (string-match "\\`\\*" helm-ec-target) (insert "*"))
+  (cond ((string-match "\\`~/?" helm-ec-target)
+         (insert (helm-quote-whitespace (abbreviate-file-name candidate))))
+        ((string-match "\\`/" helm-ec-target)
+         (insert (helm-quote-whitespace candidate)))
+        (t
+         (insert (concat (and (string-match "\\`[.]/" helm-ec-target) "./")
+                         (helm-quote-whitespace
+                          (file-relative-name candidate)))))))
+
+(defun helm-esh-get-candidates ()
+  "Get candidates for eshell completion using `pcomplete'."
+  (catch 'pcompleted
+    (with-helm-current-buffer
+      (let* ((pcomplete-stub)
+             pcomplete-seen pcomplete-norm-func
+             pcomplete-args pcomplete-last pcomplete-index
+             (pcomplete-autolist pcomplete-autolist)
+             (pcomplete-suffix-list pcomplete-suffix-list)
+             (table (pcomplete-completions))
+             (entry (or (try-completion helm-pattern
+                                        (pcomplete-entries))
+                        helm-pattern)))
+        (cl-loop ;; expand entry too to be able to compare it with file-cand.
+              with exp-entry = (and (stringp entry)
+                                    (not (string= entry ""))
+                                    (file-name-as-directory
+                                     (expand-file-name entry default-directory)))
+              for i in (all-completions pcomplete-stub table)
+              ;; Transform the related names to abs names.
+              for file-cand = (and exp-entry
+                                   (if (file-remote-p i) i
+                                     (expand-file-name
+                                      i (file-name-directory entry))))
+              ;; Compare them to avoid dups.
+              for file-entry-p = (and (stringp exp-entry)
+                                      (stringp file-cand)
+                                      ;; Fix :/tmp/foo/ $ cd foo
+                                      (not (file-directory-p file-cand))
+                                      (file-equal-p exp-entry file-cand))
+              if (and file-cand (or (file-remote-p file-cand)
+                                    (file-exists-p file-cand))
+                      (not file-entry-p))
+              collect file-cand into ls
+              else
+              ;; Avoid adding entry here.
+              unless file-entry-p collect i into ls
+              finally return
+              (if (and exp-entry
+                       (file-directory-p exp-entry)
+                       ;; If the car of completion list is
+                       ;; an executable, probably we are in
+                       ;; command completion, so don't add a
+                       ;; possible file related entry here.
+                       (and ls (not (executable-find (car ls))))
+                       ;; Don't add entry if already in prompt.
+                       (not (file-equal-p exp-entry pcomplete-stub)))
+                  (append (list exp-entry)
+                          ;; Entry should not be here now but double check.
+                          (remove entry ls))
+                ls))))))
+
+;;; Eshell history.
+;;
+;;
+(defclass helm-eshell-history-source (helm-source-in-buffer)
+  ((init :initform
+         (lambda ()
+           (let ((eshell-hist-ignoredups helm-eshell-hist-ignoredups))
+             (eshell-write-history eshell-history-file-name t)
+             (with-current-buffer (helm-candidate-buffer 'global)
+               (insert-file-contents eshell-history-file-name)))
+           ;; Same comment as in `helm-source-esh'
+           (remove-hook 'minibuffer-setup-hook 'eshell-mode)))
+   (nomark :initform t)
+   (keymap :initform helm-eshell-history-map)
+   (filtered-candidate-transformer :initform (lambda (candidates sources)
+                                               (reverse candidates)))
+   (candidate-number-limit :initform 9999)
+   (action :initform (lambda (candidate)
+                       (eshell-kill-input)
+                       (insert candidate))))
+  "Helm class to define source for Eshell history.")
+
+
+;;;###autoload
+(defun helm-esh-pcomplete ()
+  "Preconfigured helm to provide helm completion in eshell."
+  (interactive)
+  (let* ((helm-quit-if-no-candidate t)
+         (helm-execute-action-at-once-if-one t)
+         (end (point-marker))
+         (beg (save-excursion (eshell-bol) (point)))
+         (args (catch 'eshell-incomplete
+                 (eshell-parse-arguments beg end)))
+         (target
+          (or (and (looking-back " " (1- (point))) " ")
+              (buffer-substring-no-properties
+               (save-excursion
+                 (eshell-backward-argument 1) (point))
+               end)))
+         (first (car args)) ; Maybe lisp delimiter "(".
+         last ; Will be the last but parsed by pcomplete.
+         del-space)
+    (setq helm-ec-target (or target " ")
+          end (point)
+          ;; Reset beg for `with-helm-show-completion'.
+          beg (or (and target (not (string= target " "))
+                       (- end (length target)))
+                  ;; Nothing at point.
+                  (progn (insert " ") (setq del-space t) (point))))
+    (cond ((eq first ?\()
+           (helm-lisp-completion-or-file-name-at-point))
+          ;; In eshell `pcomplete-parse-arguments' is called
+          ;; with `pcomplete-parse-arguments-function'
+          ;; locally bound to `eshell-complete-parse-arguments'
+          ;; which is calling `lisp-complete-symbol',
+          ;; calling it before would popup the
+          ;; *completions* buffer.
+          (t (setq last (replace-regexp-in-string
+                         "\\`\\*" ""
+                         (car (last (ignore-errors
+                                      (pcomplete-parse-arguments))))))
+             (with-helm-show-completion beg end
+               (or (helm :sources (helm-make-source "Eshell completions" 'helm-esh-source)
+                         :buffer "*helm pcomplete*"
+                         :keymap helm-esh-completion-map
+                         :resume 'noresume
+                         :input (and (stringp last)
+                                     (helm-ff-set-pattern last)))
+                   (and del-space (looking-back "\\s-" (1- (point)))
+                        (delete-char -1))))))))
+
+;;;###autoload
+(defun helm-eshell-history ()
+  "Preconfigured helm for eshell history."
+  (interactive)
+  (let* ((end   (point))
+         (beg   (save-excursion (eshell-bol) (point)))
+         (input (buffer-substring beg end))
+         flag-empty)
+    (when (eq beg end)
+      (insert " ")
+      (setq flag-empty t)
+      (setq end (point)))
+    (unwind-protect
+         (with-helm-show-completion beg end
+           (helm :sources (helm-make-source "Eshell history"
+                              'helm-eshell-history-source)
+                 :buffer "*helm eshell history*"
+                 :resume 'noresume
+                 :input input))
+      (when (and flag-empty
+                 (looking-back " " (1- (point))))
+        (delete-char -1)))))
+
+(provide 'helm-eshell)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-eshell ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-eval.el b/emacs.d/elpa/helm-20160115.2200/helm-eval.el
new file mode 100644
index 0000000..6f30435
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-eval.el
@@ -0,0 +1,204 @@
+;;; helm-eval.el --- eval expressions from helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'eldoc)
+(require 'edebug)
+
+
+(defgroup helm-eval nil
+  "Eval related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-eldoc-in-minibuffer-show-fn
+  'helm-show-info-in-mode-line
+  "A function to display eldoc info.
+Should take one arg: the string to display."
+  :group 'helm-eval
+  :type  'symbol)
+
+(defcustom helm-show-info-in-mode-line-delay 12
+  "Eldoc will show info in mode-line during this delay if user is idle."
+  :type  'integer
+  :group 'helm-eval)
+
+
+;;; Eldoc compatibility between emacs-24 and emacs-25
+;;
+(if (require 'elisp-mode nil t)    ; emacs-25
+    ;; Maybe the eldoc functions have been
+    ;; already aliased by eldoc-eval.
+    (cl-loop for (f . a) in '((eldoc-current-symbol .
+                               elisp--current-symbol)
+                              (eldoc-fnsym-in-current-sexp .
+                               elisp--fnsym-in-current-sexp) 
+                              (eldoc-get-fnsym-args-string .
+                               elisp-get-fnsym-args-string) 
+                              (eldoc-get-var-docstring .
+                               elisp-get-var-docstring))
+             unless (fboundp f)
+             do (defalias f a))
+    ;; Emacs-24.
+    (declare-function eldoc-current-symbol "eldoc")
+    (declare-function eldoc-get-fnsym-args-string "eldoc" (sym &optional index))
+    (declare-function eldoc-get-var-docstring "eldoc" (sym))
+    (declare-function eldoc-fnsym-in-current-sexp "eldoc"))
+
+;;; Evaluation Result
+;;
+;;
+;; Internal
+(defvar helm-eldoc-active-minibuffers-list nil)
+
+(defvar helm-eval-expression-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "<C-return>") 'helm-eval-new-line-and-indent)
+    (define-key map (kbd "<M-tab>")      'lisp-indent-line)
+    (define-key map (kbd "<C-tab>")    'helm-lisp-completion-at-point)
+    (define-key map (kbd "C-p")        'previous-line)
+    (define-key map (kbd "C-n")        'next-line)
+    (define-key map (kbd "<up>")       'previous-line)
+    (define-key map (kbd "<down>")     'next-line)
+    (define-key map (kbd "<right>")    'forward-char)
+    (define-key map (kbd "<left>")     'backward-char)
+    map))
+
+(defun helm-build-evaluation-result-source ()
+  (helm-build-dummy-source "Evaluation Result"
+    :multiline t
+    :mode-line "C-RET: nl-and-indent, M-tab: reindent, C-tab:complete, C-p/n: next/prec-line."
+    :filtered-candidate-transformer (lambda (_candidates _source)
+                                      (list
+                                       (condition-case nil
+                                           (with-helm-current-buffer
+                                             (pp-to-string
+                                              (if edebug-active
+                                                  (edebug-eval-expression
+                                                   (read helm-pattern))
+                                                  (eval (read helm-pattern)))))
+                                         (error "Error"))))
+    :nohighlight t
+    :action '(("Copy result to kill-ring" . (lambda (candidate)
+                                              (kill-new
+                                               (replace-regexp-in-string
+                                                "\n" "" candidate))
+                                              (message "Result copied to kill-ring")))
+              ("copy sexp to kill-ring" . (lambda (_candidate)
+                                            (kill-new helm-input)
+                                            (message "Sexp copied to kill-ring"))))))
+
+(defun helm-eval-new-line-and-indent ()
+  (interactive)
+  (newline) (lisp-indent-line))
+
+(defun helm-eldoc-store-minibuffer ()
+  "Store minibuffer buffer name in `helm-eldoc-active-minibuffers-list'."
+  (with-selected-window (minibuffer-window)
+    (push (current-buffer) helm-eldoc-active-minibuffers-list)))
+
+(defun helm-eldoc-show-in-eval ()
+  "Return eldoc in mode-line for current minibuffer input."
+  (let ((buf (window-buffer (active-minibuffer-window))))
+    (condition-case err
+        (when (member buf helm-eldoc-active-minibuffers-list)
+          (with-current-buffer buf
+            (let* ((sym     (save-excursion
+                              (unless (looking-back ")\\|\"" (1- (point)))
+                                (forward-char -1))
+                              (eldoc-current-symbol)))
+                   (info-fn (eldoc-fnsym-in-current-sexp))
+                   (doc     (or (eldoc-get-var-docstring sym)
+                                (eldoc-get-fnsym-args-string
+                                 (car info-fn) (cadr info-fn)))))
+              (when doc (funcall helm-eldoc-in-minibuffer-show-fn doc)))))
+      (error (message "Eldoc in minibuffer error: %S" err) nil))))
+
+(defun helm-show-info-in-mode-line (str)
+  "Display string STR in mode-line."
+  (save-selected-window
+    (with-current-buffer helm-buffer
+      (let ((mode-line-format (concat " " str)))
+        (force-mode-line-update)
+        (sit-for helm-show-info-in-mode-line-delay))
+      (force-mode-line-update))))
+
+;;; Calculation Result
+;;
+;;
+(defvar helm-source-calculation-result
+  (helm-build-dummy-source "Calculation Result"
+    :filtered-candidate-transformer (lambda (_candidates _source)
+                                      (list
+                                       (condition-case nil
+                                           (calc-eval helm-pattern)
+                                         (error "error"))))
+    :nohighlight t
+    :action '(("Copy result to kill-ring" . (lambda (candidate)
+                                              (kill-new candidate)
+                                              (message "Result \"%s\" copied to kill-ring"
+                                                       candidate)))
+              ("Copy operation to kill-ring" . (lambda (_candidate)
+                                                 (kill-new helm-input)
+                                                 (message "Calculation copied to kill-ring"))))))
+
+;;;###autoload
+(defun helm-eval-expression (arg)
+  "Preconfigured helm for `helm-source-evaluation-result'."
+  (interactive "P")
+  (helm :sources (helm-build-evaluation-result-source)
+        :input (when arg (thing-at-point 'sexp))
+        :buffer "*helm eval*"
+        :echo-input-in-header-line nil
+        :history 'read-expression-history
+        :keymap helm-eval-expression-map))
+
+(defvar eldoc-idle-delay)
+;;;###autoload
+(defun helm-eval-expression-with-eldoc ()
+  "Preconfigured helm for `helm-source-evaluation-result' with `eldoc' support. "
+  (interactive)
+  (let ((timer (run-with-idle-timer
+                eldoc-idle-delay 'repeat
+                'helm-eldoc-show-in-eval)))
+    (unwind-protect
+         (minibuffer-with-setup-hook
+             'helm-eldoc-store-minibuffer
+           (call-interactively 'helm-eval-expression))
+      (and timer (cancel-timer timer))
+      (setq helm-eldoc-active-minibuffers-list
+            (cdr helm-eldoc-active-minibuffers-list)))))
+
+;;;###autoload
+(defun helm-calcul-expression ()
+  "Preconfigured helm for `helm-source-calculation-result'."
+  (interactive)
+  (helm :sources 'helm-source-calculation-result
+        :buffer "*helm calcul*"))
+
+(provide 'helm-eval)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-eval.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-external.el b/emacs.d/elpa/helm-20160115.2200/helm-external.el
new file mode 100644
index 0000000..693e1c4
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-external.el
@@ -0,0 +1,217 @@
+;;; helm-external.el --- Run Externals commands within Emacs with helm completion. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-net)
+
+
+(defgroup helm-external nil
+  "External related Applications and libraries for Helm." 
+  :group 'helm)
+
+(defcustom helm-raise-command nil
+  "A shell command to jump to a window running specific program.
+Need external program wmctrl.
+This will be use with `format', so use something like \"wmctrl -xa %s\"."
+  :type 'string
+  :group 'helm-external)
+
+(defcustom helm-external-programs-associations nil
+  "Alist to store externals programs associated with file extension.
+This variable overhide setting in .mailcap file.
+e.g : '\(\(\"jpg\" . \"gqview\"\) (\"pdf\" . \"xpdf\"\)\) "
+  :type '(alist :key-type string :value-type string)
+  :group 'helm-external)
+
+(defcustom helm-default-external-file-browser "nautilus"
+  "Default external file browser for your system.
+Directories will be opened externally with it when
+opening file externally in `helm-find-files'.
+Set to nil if you do not have external file browser
+or do not want to use it.
+Windows users should set that to \"explorer.exe\"."
+  :group 'helm-external
+  :type  'string)
+
+
+;;; Internals
+(defvar helm-external-command-history nil)
+(defvar helm-external-commands-list nil
+  "A list of all external commands the user can execute.
+If this variable is not set by the user, it will be calculated
+automatically.")
+
+(defun helm-external-commands-list-1 (&optional sort)
+  "Returns a list of all external commands the user can execute.
+If `helm-external-commands-list' is non-nil it will
+return its contents.  Else it calculates all external commands
+and sets `helm-external-commands-list'."
+  (helm-aif helm-external-commands-list
+      it
+    (setq helm-external-commands-list
+          (cl-loop
+                for dir in (split-string (getenv "PATH") path-separator)
+                when (and (file-exists-p dir) (file-accessible-directory-p dir))
+                for lsdir = (cl-loop for i in (directory-files dir t)
+                                  for bn = (file-name-nondirectory i)
+                                  when (and (not (member bn completions))
+                                            (not (file-directory-p i))
+                                            (file-executable-p i))
+                                  collect bn)
+                append lsdir into completions
+                finally return
+                (if sort (sort completions 'string-lessp) completions)))))
+
+(defun helm-run-or-raise (exe &optional file)
+  "Generic command that run asynchronously EXE.
+If EXE is already running just jump to his window if `helm-raise-command'
+is non--nil.
+When FILE argument is provided run EXE with FILE.
+In this case EXE must be provided as \"EXE %s\"."
+  (let* ((real-com (car (split-string (replace-regexp-in-string
+                                       "%s" "" exe))))
+         (proc     (if file (concat real-com " " file) real-com))
+         process-connection-type)
+    (if (get-process proc)
+        (if helm-raise-command
+            (shell-command  (format helm-raise-command real-com))
+          (error "Error: %s is already running" real-com))
+      (when (cl-loop for i in helm-external-commands-list thereis (string= real-com i))
+        (message "Starting %s..." real-com)
+        (if file
+            (start-process-shell-command
+             proc nil (format exe (shell-quote-argument
+                                   (if (eq system-type 'windows-nt)
+                                       (helm-w32-prepare-filename file)
+                                     file))))
+          (start-process-shell-command proc nil real-com))
+        (set-process-sentinel
+         (get-process proc)
+         (lambda (process event)
+             (when (and (string= event "finished\n")
+                        helm-raise-command
+                        (not (helm-get-pid-from-process-name real-com)))
+               (shell-command  (format helm-raise-command "emacs")))
+             (message "%s process...Finished." process))))
+      (setq helm-external-commands-list
+            (cons real-com
+                  (delete real-com helm-external-commands-list))))))
+
+(defun helm-get-mailcap-for-file (filename)
+  "Get the command to use for FILENAME from mailcap files.
+The command is like <command %s> and is meant to use with `format'."
+  (mailcap-parse-mailcaps)
+  (let* ((ext  (file-name-extension filename))
+         (mime (when ext (mailcap-extension-to-mime ext)))
+         (result (when mime (mailcap-mime-info mime))))
+    ;; If elisp file have no associations in .mailcap
+    ;; `mailcap-maybe-eval' is returned, in this case just return nil.
+    (when (stringp result) result)))
+
+(defun helm-get-default-program-for-file (filename)
+  "Try to find a default program to open FILENAME.
+Try first in `helm-external-programs-associations' and then in mailcap file
+if nothing found return nil."
+  (let* ((ext      (file-name-extension filename))
+         (def-prog (assoc-default ext helm-external-programs-associations)))
+    (cond ((and def-prog (not (string= def-prog "")))
+           (concat def-prog " %s"))
+          ((and helm-default-external-file-browser
+                (file-directory-p filename))
+           (concat helm-default-external-file-browser " %s"))
+          (t (helm-get-mailcap-for-file filename)))))
+
+(defun helm-open-file-externally (file)
+  "Open FILE with an external program.
+Try to guess which program to use with `helm-get-default-program-for-file'.
+If not found or a prefix arg is given query the user which tool to use."
+  (let* ((fname          (expand-file-name file))
+         (collection     (helm-external-commands-list-1 'sort))
+         (def-prog       (helm-get-default-program-for-file fname))
+         (real-prog-name (if (or helm-current-prefix-arg (not def-prog))
+                             ;; Prefix arg or no default program.
+                             (prog1
+                                 (helm-comp-read
+                                  "Program: " collection
+                                  :must-match t
+                                  :name "Open file Externally"
+                                  :del-input nil
+                                  :history helm-external-command-history)
+                               ;; Always prompt to set this program as default.
+                               (setq def-prog nil))
+                           ;; No prefix arg or default program exists.
+                           (replace-regexp-in-string " %s\\| '%s'" "" def-prog)))
+         (program        (concat real-prog-name " %s")))
+    (unless (or def-prog ; Association exists, no need to record it.
+                ;; Don't try to record non--filenames associations (e.g urls).
+                (not (file-exists-p fname)))
+      (when
+          (y-or-n-p
+           (format
+            "Do you want to make `%s' the default program for this kind of files? "
+            real-prog-name))
+        (helm-aif (assoc (file-name-extension fname)
+                         helm-external-programs-associations)
+            (setq helm-external-programs-associations
+                  (delete it helm-external-programs-associations)))
+        (push (cons (file-name-extension fname)
+                    (helm-read-string
+                     "Program (Add args maybe and confirm): " real-prog-name))
+              helm-external-programs-associations)
+        (customize-save-variable 'helm-external-programs-associations
+                                 helm-external-programs-associations)))
+    (helm-run-or-raise program file)
+    (setq helm-external-command-history
+          (cons real-prog-name
+                (delete real-prog-name
+                        (cl-loop for i in helm-external-command-history
+                              when (executable-find i) collect i))))))
+
+;;;###autoload
+(defun helm-run-external-command (program)
+  "Preconfigured `helm' to run External PROGRAM asyncronously from Emacs.
+If program is already running exit with error.
+You can set your own list of commands with
+`helm-external-commands-list'."
+  (interactive (list
+                (helm-comp-read
+                 "RunProgram: "
+                 (helm-external-commands-list-1 'sort)
+                 :must-match t
+                 :del-input nil
+                 :name "External Commands"
+                 :history helm-external-command-history)))
+  (helm-run-or-raise program)
+  (setq helm-external-command-history
+        (cons program (delete program
+                              (cl-loop for i in helm-external-command-history
+                                    when (executable-find i) collect i)))))
+
+
+(provide 'helm-external)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-external ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-files.el b/emacs.d/elpa/helm-20160115.2200/helm-files.el
new file mode 100644
index 0000000..3f84e9a
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-files.el
@@ -0,0 +1,3498 @@
+;;; helm-files.el --- helm file browser and related. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-types)
+(require 'helm-utils)
+(require 'helm-external)
+(require 'helm-grep)
+(require 'helm-help)
+(require 'helm-locate)
+(require 'helm-bookmark)
+(require 'helm-tags)
+(require 'helm-buffers)
+(require 'thingatpt)
+(require 'ffap)
+(require 'dired-aux)
+(require 'dired-x)
+(require 'tramp)
+(require 'image-dired)
+
+(declare-function find-library-name "find-func.el" (library))
+(declare-function w32-shell-execute "ext:w32fns.c" (operation document &optional parameters show-flag))
+(declare-function gnus-dired-attach "ext:gnus-dired.el" (files-to-attach))
+(declare-function image-dired-display-image "image-dired.el" (file &optional original-size))
+(declare-function image-dired-update-property "image-dired.el" (prop value))
+(declare-function eshell-read-aliases-list "em-alias")
+(declare-function eshell-send-input "esh-mode" (&optional use-region queue-p no-newline))
+(declare-function eshell-kill-input "esh-mode")
+(declare-function eshell-bol "esh-mode")
+(declare-function eshell-quote-argument "esh-arg.el")
+(declare-function helm-ls-git-ls "ext:helm-ls-git")
+(declare-function helm-hg-find-files-in-project "ext:helm-ls-hg")
+(declare-function helm-gid "helm-id-utils.el")
+(declare-function helm-ls-svn-ls "ext:helm-ls-svn")
+
+(defvar recentf-list)
+(defvar helm-mm-matching-method)
+
+
+(defgroup helm-files nil
+  "Files applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-boring-file-regexp-list
+  (mapcar (lambda (f)
+            (concat
+             (rx-to-string
+              (replace-regexp-in-string
+               "/$" "" f) t) "$"))
+          completion-ignored-extensions)
+  "The regexp list matching boring files."
+  :group 'helm-files
+  :type  '(repeat (choice regexp)))
+
+(defcustom helm-for-files-preferred-list
+  '(helm-source-buffers-list
+    helm-source-recentf
+    helm-source-bookmarks
+    helm-source-file-cache
+    helm-source-files-in-current-dir
+    helm-source-locate)
+  "Your preferred sources to find files."
+  :type '(repeat (choice symbol))
+  :group 'helm-files)
+
+(defcustom helm-tramp-verbose 0
+  "Just like `tramp-verbose' but specific to helm.
+When set to 0 don't show tramp messages in helm.
+If you want to have the default tramp messages set it to 3."
+  :type 'integer
+  :group 'helm-files)
+
+(defcustom helm-ff-auto-update-initial-value nil
+  "Auto update when only one candidate directory is matched.
+Default value when starting `helm-find-files' is nil because
+it prevent using <backspace> to delete char backward and by the way
+confuse beginners.
+For a better experience with `helm-find-files' set this to non--nil
+and use C-<backspace> to toggle it."
+  :group 'helm-files
+  :type  'boolean)
+
+(defcustom helm-ff-lynx-style-map t
+  "Use arrow keys to navigate with `helm-find-files'.
+You will have to restart Emacs or reeval `helm-find-files-map'
+and `helm-read-file-map' for this take effect."
+  :group 'helm-files
+  :type 'boolean)
+
+(defcustom helm-ff-history-max-length 100
+  "Number of elements shown in `helm-find-files' history."
+  :group 'helm-files
+  :type 'integer)
+
+(defcustom helm-ff-fuzzy-matching t
+  "Enable fuzzy matching for `helm-find-files' when non--nil.
+See `helm-ff--transform-pattern-for-completion' for more info."
+  :group 'helm-files
+  :type 'boolean)
+
+(defcustom helm-ff-tramp-not-fancy t
+  "No colors when listing remote files when set to non--nil.
+This make listing much faster, specially on slow machines."
+  :group 'helm-files
+  :type  'boolean)
+
+(defcustom helm-ff-exif-data-program "exiftran"
+  "Program used to extract exif data of an image file."
+  :group 'helm-files
+  :type 'string)
+
+(defcustom helm-ff-exif-data-program-args "-d"
+  "Arguments used for `helm-ff-exif-data-program'."
+  :group 'helm-files
+  :type 'string)
+
+(defcustom helm-ff-newfile-prompt-p t
+  "Whether Prompt or not when creating new file.
+This set `ffap-newfile-prompt'."
+  :type  'boolean
+  :group 'helm-files)
+
+(defcustom helm-ff-avfs-directory "~/.avfs"
+  "The default avfs directory, usually '~/.avfs'.
+When this is set you will be able to expand archive filenames with `C-j'
+inside an avfs directory mounted with mountavfs.
+See <http://sourceforge.net/projects/avf/>."
+  :type  'string
+  :group 'helm-files)
+
+(defcustom helm-ff-file-compressed-list '("gz" "bz2" "zip" "7z")
+  "Minimal list of compressed files extension."
+  :type  '(repeat (choice string))
+  :group 'helm-files)
+
+(defcustom helm-ff-printer-list nil
+  "A list of available printers on your system.
+When non--nil let you choose a printer to print file.
+Otherwise when nil the variable `printer-name' will be used.
+On Unix based systems (lpstat command needed) you don't need to set this,
+`helm-ff-find-printers' will find a list of available printers for you."
+  :type '(repeat (choice string))
+  :group 'helm-files)
+
+(defcustom helm-ff-transformer-show-only-basename t
+  "Show only basename of candidates in `helm-find-files'.
+This can be toggled at anytime from `helm-find-files' with \
+\\<helm-find-files-map>\\[helm-ff-run-toggle-basename]."
+  :type 'boolean
+  :group 'helm-files)
+
+(defcustom helm-ff-signal-error-on-dot-files t
+  "Signal error when file is `.' or `..' on file deletion when non--nil.
+Default is non--nil.
+WARNING: Setting this to nil is unsafe and can cause deletion of a whole tree."
+  :group 'helm-files
+  :type  'boolean)
+
+(defcustom helm-ff-search-library-in-sexp nil
+  "Search for library in `require' and `declare-function' sexp."
+  :group 'helm-files
+  :type  'boolean)
+
+(defcustom helm-tooltip-hide-delay 25
+  "Hide tooltips automatically after this many seconds."
+  :group 'helm-files
+  :type 'integer)
+
+(defcustom helm-ff-file-name-history-use-recentf nil
+  "Use `recentf-list' instead of `file-name-history' in `helm-find-files'."
+  :group 'helm-files
+  :type 'boolean)
+
+(defcustom helm-ff-skip-boring-files nil
+  "Non--nil to skip files matching regexps in `helm-boring-file-regexp-list'.
+This take effect in `helm-find-files' and file completion used by `helm-mode'
+i.e `helm-read-file-name'."
+  :group 'helm-files
+  :type  'boolean)
+
+(defcustom helm-ff-candidate-number-limit 5000
+  "The `helm-candidate-number-limit' for `helm-find-files', `read-file-name' and friends."
+  :group 'helm-files
+  :type 'integer)
+
+(defcustom helm-findutils-skip-boring-files t
+  "Ignore files matching regexps in `completion-ignored-extensions'."
+  :group 'helm-files
+  :type  'boolean)
+
+(defcustom helm-findutils-search-full-path nil
+  "Search in full path with shell command find when non--nil.
+I.e use the -path/ipath arguments of find instead of -name/iname."
+  :group 'helm-files
+  :type 'boolean)
+
+(defcustom helm-files-save-history-extra-sources
+  '("Find" "Locate" "Recentf"
+    "Files from Current Directory" "File Cache")
+  "Extras source that save candidate to `file-name-history'."
+  :group 'helm-files
+  :type '(repeat (choice string)))
+
+(defcustom helm-find-files-before-init-hook nil
+  "Hook that run before initialization of `helm-find-files'."
+  :group 'helm-files
+  :type 'hook)
+
+(defcustom helm-find-files-after-init-hook nil
+  "Hook that run after initialization of `helm-find-files'."
+  :group 'helm-files
+  :type 'hook)
+
+(defcustom helm-multi-files-toggle-locate-binding "C-c p"
+  "Default binding to switch back and forth locate in `helm-multi-files'."
+  :group 'helm-files
+  :type 'string)
+
+(defcustom helm-find-files-bookmark-prefix "Helm-find-files: "
+  "bookmark name prefix of `helm-find-files' sessions."
+  :group 'helm-files
+  :type 'string)
+
+(defcustom helm-ff-guess-ffap-filenames nil
+  "Use ffap to guess local filenames at point in `helm-find-files'.
+This doesn't disable url or mail at point, see
+`helm-ff-guess-ffap-urls' for this."
+  :group 'helm-files
+  :type 'boolean)
+
+(defcustom helm-ff-guess-ffap-urls t
+  "Use ffap to guess local urls at point in `helm-find-files'.
+This doesn't disable guessing filenames at point,
+see `helm-ff-guess-ffap-filenames' for this."
+  :group 'helm-files
+  :type 'boolean)
+
+;;; Faces
+;;
+;;
+(defgroup helm-files-faces nil
+  "Customize the appearance of helm-files."
+  :prefix "helm-"
+  :group 'helm-files
+  :group 'helm-faces)
+
+(defface helm-ff-prefix
+    '((t (:background "yellow" :foreground "black")))
+  "Face used to prefix new file or url paths in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-executable
+    '((t (:foreground "green")))
+  "Face used for executable files in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-directory
+    '((t (:foreground "DarkRed" :background "LightGray")))
+  "Face used for directories in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-dotted-directory
+    '((t (:foreground "black" :background "DimGray")))
+  "Face used for dotted directories in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-dotted-symlink-directory
+    '((t (:foreground "DarkOrange" :background "DimGray")))
+  "Face used for dotted symlinked directories in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-symlink
+    '((t (:foreground "DarkOrange")))
+  "Face used for symlinks in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-invalid-symlink
+    '((t (:foreground "black" :background "red")))
+  "Face used for invalid symlinks in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-ff-file
+    '((t (:inherit font-lock-builtin-face)))
+  "Face used for file names in `helm-find-files'."
+  :group 'helm-files-faces)
+
+(defface helm-history-deleted
+    '((t (:inherit helm-ff-invalid-symlink)))
+  "Face used for deleted files in `file-name-history'."
+  :group 'helm-files-faces)
+
+(defface helm-history-remote
+    '((t (:foreground "Indianred1")))
+  "Face used for remote files in `file-name-history'."
+  :group 'helm-files-faces)
+
+
+;;; Helm-find-files - The helm file browser.
+;;
+;; Keymaps
+(defvar helm-find-files-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "C-]")           'helm-ff-run-toggle-basename)
+    (define-key map (kbd "C-x C-f")       'helm-ff-run-locate)
+    (define-key map (kbd "C-x C-d")       'helm-ff-run-browse-project)
+    (define-key map (kbd "C-x r m")       'helm-ff-bookmark-set)
+    (define-key map (kbd "C-x r b")       'helm-find-files-toggle-to-bookmark)
+    (define-key map (kbd "C-s")           'helm-ff-run-grep)
+    (define-key map (kbd "M-g s")         'helm-ff-run-grep)
+    (define-key map (kbd "M-g p")         'helm-ff-run-pdfgrep)
+    (define-key map (kbd "M-g z")         'helm-ff-run-zgrep)
+    (define-key map (kbd "M-g a")         'helm-ff-run-grep-ag)
+    (define-key map (kbd "M-g g")         'helm-ff-run-git-grep)
+    (define-key map (kbd "C-c g")         'helm-ff-run-gid)
+    (define-key map (kbd "M-.")           'helm-ff-run-etags)
+    (define-key map (kbd "M-R")           'helm-ff-run-rename-file)
+    (define-key map (kbd "M-C")           'helm-ff-run-copy-file)
+    (define-key map (kbd "M-B")           'helm-ff-run-byte-compile-file)
+    (define-key map (kbd "M-L")           'helm-ff-run-load-file)
+    (define-key map (kbd "M-S")           'helm-ff-run-symlink-file)
+    (define-key map (kbd "M-H")           'helm-ff-run-hardlink-file)
+    (define-key map (kbd "M-D")           'helm-ff-run-delete-file)
+    (define-key map (kbd "M-K")           'helm-ff-run-kill-buffer-persistent)
+    (define-key map (kbd "C-c d")         'helm-ff-persistent-delete)
+    (define-key map (kbd "M-e")           'helm-ff-run-switch-to-eshell)
+    (define-key map (kbd "C-c i")         'helm-ff-run-complete-fn-at-point)
+    (define-key map (kbd "C-c o")         'helm-ff-run-switch-other-window)
+    (define-key map (kbd "C-c C-o")       'helm-ff-run-switch-other-frame)
+    (define-key map (kbd "C-c C-x")       'helm-ff-run-open-file-externally)
+    (define-key map (kbd "C-c X")         'helm-ff-run-open-file-with-default-tool)
+    (define-key map (kbd "M-!")           'helm-ff-run-eshell-command-on-file)
+    (define-key map (kbd "M-%")           'helm-ff-run-query-replace-on-marked)
+    (define-key map (kbd "C-c =")         'helm-ff-run-ediff-file)
+    (define-key map (kbd "M-=")           'helm-ff-run-ediff-merge-file)
+    (define-key map (kbd "M-p")           'helm-ff-run-switch-to-history)
+    (define-key map (kbd "C-c h")         'helm-ff-file-name-history)
+    (define-key map (kbd "M-i")           'helm-ff-properties-persistent)
+    (define-key map (kbd "C-}")           'helm-narrow-window)
+    (define-key map (kbd "C-{")           'helm-enlarge-window)
+    (define-key map (kbd "C-<backspace>") 'helm-ff-run-toggle-auto-update)
+    (define-key map (kbd "C-c <DEL>")     'helm-ff-run-toggle-auto-update)
+    (define-key map (kbd "C-c C-a")       'helm-ff-run-gnus-attach-files)
+    (define-key map (kbd "C-c p")         'helm-ff-run-print-file)
+    (define-key map (kbd "C-c /")         'helm-ff-run-find-sh-command)
+    ;; Next 2 have no effect if candidate is not an image file.
+    (define-key map (kbd "M-l")           'helm-ff-rotate-left-persistent)
+    (define-key map (kbd "M-r")           'helm-ff-rotate-right-persistent)
+    (define-key map (kbd "C-l")           'helm-find-files-up-one-level)
+    (define-key map (kbd "C-r")           'helm-find-files-down-last-level)
+    (define-key map (kbd "C-c r")         'helm-ff-run-find-file-as-root)
+    (define-key map (kbd "C-x C-v")       'helm-ff-run-find-alternate-file)
+    (define-key map (kbd "C-c @")         'helm-ff-run-insert-org-link)
+    (helm-define-key-with-subkeys map (kbd "DEL") ?\d 'helm-ff-delete-char-backward
+                                  nil nil 'helm-ff-delete-char-backward--exit-fn)
+    (when helm-ff-lynx-style-map
+      (define-key map (kbd "<left>")      'helm-find-files-up-one-level)
+      (define-key map (kbd "<right>")     'helm-execute-persistent-action))
+    (delq nil map))
+  "Keymap for `helm-find-files'.")
+
+(defvar helm-read-file-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "<C-return>")    'helm-cr-empty-string)
+    (define-key map (kbd "<M-RET>")       'helm-cr-empty-string)
+    (define-key map (kbd "C-]")           'helm-ff-run-toggle-basename)
+    (define-key map (kbd "C-.")           'helm-find-files-up-one-level)
+    (define-key map (kbd "C-l")           'helm-find-files-up-one-level)
+    (define-key map (kbd "C-r")           'helm-find-files-down-last-level)
+    (define-key map (kbd "C-c h")         'helm-ff-file-name-history)
+    (define-key map (kbd "C-<backspace>") 'helm-ff-run-toggle-auto-update)
+    (define-key map (kbd "C-c <DEL>")     'helm-ff-run-toggle-auto-update)
+    (helm-define-key-with-subkeys map (kbd "DEL") ?\d 'helm-ff-delete-char-backward
+                                  nil nil 'helm-ff-delete-char-backward--exit-fn)
+    (when helm-ff-lynx-style-map
+      (define-key map (kbd "<left>")      'helm-find-files-up-one-level)
+      (define-key map (kbd "<right>")     'helm-execute-persistent-action)
+      (define-key map (kbd "<M-left>")    'helm-previous-source)
+      (define-key map (kbd "<M-right>")   'helm-next-source))
+    (delq nil map))
+  "Keymap for `helm-read-file-name'.")
+
+
+;; Internal.
+(defvar helm-find-files-doc-header " (\\<helm-find-files-map>\\[helm-find-files-up-one-level]: Go up one level)"
+  "*The doc that is inserted in the Name header of a find-files or dired source.")
+(defvar helm-ff-auto-update-flag nil
+  "Internal, flag to turn on/off auto-update in `helm-find-files'.
+Don't set it directly, use instead `helm-ff-auto-update-initial-value'.")
+(defvar helm-ff-last-expanded nil
+  "Store last expanded directory or file.")
+(defvar helm-ff-default-directory nil)
+(defvar helm-ff-history nil)
+(defvar helm-ff-cand-to-mark nil)
+(defvar helm-ff-url-regexp
+  "\\`\\(news\\(post\\)?:\\|nntp:\\|mailto:\\|file:\\|\\(ftp\\|https?\\|telnet\\|gopher\\|www\\|wais\\):/?/?\\).*"
+  "Same as `ffap-url-regexp' but match earlier possible url.")
+(defvar helm-tramp-file-name-regexp "\\`/\\([^[/:]+\\|[^/]+]\\):")
+(defvar helm-marked-buffer-name "*helm marked*")
+(defvar helm-ff--auto-update-state nil)
+(defvar helm-ff--deleting-char-backward nil)
+(defvar helm-multi-files--toggle-locate nil)
+(defvar helm-ff--move-to-first-real-candidate t)
+(defvar helm-find-files--toggle-bookmark nil)
+
+
+;;; Helm-find-files
+;;
+;;
+(defcustom helm-find-files-actions
+  (helm-make-actions
+   "Find File" 'helm-find-file-or-marked
+   "Find file in Dired" 'helm-point-file-in-dired
+   (lambda () (and (locate-library "elscreen") "Find file in Elscreen"))
+   'helm-elscreen-find-file
+   "View file" 'view-file
+   "Checksum File" 'helm-ff-checksum
+   "Query replace fnames on marked" 'helm-ff-query-replace-on-marked
+   "Query replace contents on marked" 'helm-ff-query-replace
+   "Query replace regexp contents on marked" 'helm-ff-query-replace-regexp
+   "Serial rename files" 'helm-ff-serial-rename
+   "Serial rename by symlinking files" 'helm-ff-serial-rename-by-symlink
+   "Serial rename by copying files" 'helm-ff-serial-rename-by-copying
+   "Open file with default tool" 'helm-open-file-with-default-tool
+   "Find file in hex dump" 'hexl-find-file
+   "Browse project" 'helm-ff-browse-project
+   "Complete at point `C-c i'" 'helm-insert-file-name-completion-at-point
+   "Insert as org link `C-c @'" 'helm-files-insert-as-org-link
+   "Find shell command `C-c /'" 'helm-ff-find-sh-command
+   "Add marked files to file-cache" 'helm-ff-cache-add-file
+   "Open file externally `C-c C-x, C-u to choose'" 'helm-open-file-externally
+   "Grep File(s) `C-s, C-u Recurse'" 'helm-find-files-grep
+   "Grep current directory with AG" 'helm-find-files-ag
+   "Git grep" 'helm-ff-git-grep
+   "Zgrep File(s) `M-g z, C-u Recurse'" 'helm-ff-zgrep
+   "Gid" 'helm-ff-gid
+   "Switch to Eshell `M-e'" 'helm-ff-switch-to-eshell
+   "Etags `M-., C-u reload tag file'" 'helm-ff-etags-select
+   "Eshell command on file(s) `M-!, C-u take all marked as arguments.'"
+   'helm-find-files-eshell-command-on-file
+   "Find file as root `C-c r'" 'helm-find-file-as-root
+   "Find alternate file" 'find-alternate-file
+   "Ediff File `C-='" 'helm-find-files-ediff-files
+   "Ediff Merge File `C-c ='" 'helm-find-files-ediff-merge-files
+   "Delete File(s) `M-D'" 'helm-delete-marked-files
+   "Copy file(s) `M-C, C-u to follow'" 'helm-find-files-copy
+   "Rename file(s) `M-R, C-u to follow'" 'helm-find-files-rename
+   "Symlink files(s) `M-S, C-u to follow'" 'helm-find-files-symlink
+   "Relsymlink file(s) `C-u to follow'" 'helm-find-files-relsymlink
+   "Hardlink file(s) `M-H, C-u to follow'" 'helm-find-files-hardlink
+   "Find file other window `C-c o'" 'helm-find-files-other-window
+   "Switch to history `M-p'" 'helm-find-files-switch-to-hist
+   "Find file other frame `C-c C-o'" 'find-file-other-frame
+   "Print File `C-c p, C-u to refresh'" 'helm-ff-print
+   "Locate `C-x C-f, C-u to specify locate db'" 'helm-ff-locate)
+  "Actions for `helm-find-files'."
+  :group 'helm-files
+  :type '(alist :key-type string :value-type function))
+
+(defvar helm-source-find-files nil
+  "The main source to browse files.
+Should not be used among other sources.")
+
+(defclass helm-source-ffiles (helm-source-sync)
+  ((header-name
+    :initform (lambda (name)
+                (concat name (substitute-command-keys
+                              helm-find-files-doc-header))))
+   (init
+    :initform (lambda ()
+                (setq helm-ff-auto-update-flag
+                      helm-ff-auto-update-initial-value)
+                (setq helm-ff--auto-update-state
+                      helm-ff-auto-update-flag)
+                (helm-set-local-variable 'bookmark-make-record-function
+                                         #'helm-ff-make-bookmark-record)))
+   (candidates :initform 'helm-find-files-get-candidates)
+   (filtered-candidate-transformer :initform 'helm-ff-sort-candidates)
+   (filter-one-by-one :initform 'helm-ff-filter-candidate-one-by-one)
+   (persistent-action :initform 'helm-find-files-persistent-action)
+   (persistent-help :initform "Hit1 Expand Candidate, Hit2 or (C-u) Find file")
+   (help-message :initform 'helm-ff-help-message)
+   (volatile :initform t)
+   (migemo :initform t)
+   (nohighlight :initform t)
+   (keymap :initform helm-find-files-map)
+   (candidate-number-limit :initform 'helm-ff-candidate-number-limit)
+   (action-transformer
+    :initform 'helm-find-files-action-transformer)
+   (action :initform 'helm-find-files-actions)
+   (before-init-hook :initform 'helm-find-files-before-init-hook)
+   (after-init-hook :initform 'helm-find-files-after-init-hook)))
+
+;; Bookmark handlers.
+;;
+(defun helm-ff-make-bookmark-record ()
+  "The `bookmark-make-record-function' for `helm-find-files'."
+  (with-helm-buffer
+    `((filename . ,helm-ff-default-directory)
+      (presel . ,(helm-get-selection))
+      (handler . helm-ff-bookmark-jump))))
+
+(defun helm-ff-bookmark-jump (bookmark)
+  "bookmark handler for `helm-find-files'."
+  (let ((fname (bookmark-prop-get bookmark 'filename))
+        (presel (bookmark-prop-get bookmark 'presel)))
+    (helm-find-files-1 fname (if helm-ff-transformer-show-only-basename
+                                 (helm-basename presel)
+                                 presel))))
+
+(defun helm-ff-bookmark-set ()
+  "Record `helm-find-files' session in bookmarks."
+  (interactive)
+  (with-helm-buffer
+    (bookmark-set
+     (concat helm-find-files-bookmark-prefix
+             (abbreviate-file-name helm-ff-default-directory))))
+  (message "Helm find files session bookmarked! "))
+
+(defun helm-dwim-target-directory ()
+  "Return value of `default-directory' of buffer in other window.
+If there is only one window return the value ot `default-directory'
+for current buffer."
+  (with-helm-current-buffer
+    (let ((num-windows (length (remove (get-buffer-window helm-marked-buffer-name)
+                                       (window-list)))))
+      (expand-file-name
+       (if (> num-windows 1)
+           (save-selected-window
+             (other-window 1)
+             default-directory)
+           ;; Using the car of *ff-history allow
+           ;; allow staying in the directory visited instead of current.
+           (or (car-safe helm-ff-history) default-directory))))))
+
+(defun helm-find-files-do-action (action)
+  "Generic function for creating actions from `helm-source-find-files'.
+ACTION must be an action supported by `helm-dired-action'."
+  (let* ((ifiles (mapcar 'expand-file-name ; Allow modify '/foo/.' -> '/foo'
+                         (helm-marked-candidates :with-wildcard t)))
+         (cand   (helm-get-selection)) ; Target
+         (prompt (format "%s %s file(s) to: "
+                         (capitalize (symbol-name action))
+                         (length ifiles)))
+         helm-ff--move-to-first-real-candidate
+         (helm-always-two-windows t)
+         (helm-reuse-last-window-split-state t)
+         (helm-split-window-default-side
+          (eq helm-split-window-default-side 'same))
+         helm-split-window-in-side-p
+         (parg   helm-current-prefix-arg)
+         helm-display-source-at-screen-top ; prevent setting window-start.
+         helm-ff-auto-update-initial-value
+         (dest   (with-helm-display-marked-candidates
+                   helm-marked-buffer-name
+                   (mapcar (lambda (f)
+                               (if (file-directory-p f)
+                                   (concat (helm-basename f) "/")
+                                 (helm-basename f)))
+                           ifiles)
+                   (with-helm-current-buffer
+                     (helm-read-file-name
+                      prompt
+                      :preselect (unless (cdr ifiles)
+                                   (if helm-ff-transformer-show-only-basename
+                                       (helm-basename cand) cand))
+                      :initial-input (helm-dwim-target-directory)
+                      :history (helm-find-files-history :comp-read nil))))))
+    (helm-dired-action
+     dest :files ifiles :action action :follow parg)))
+
+(defun helm-find-files-copy (_candidate)
+  "Copy files from `helm-find-files'."
+  (helm-find-files-do-action 'copy))
+
+(defun helm-find-files-rename (_candidate)
+  "Rename files from `helm-find-files'."
+  (helm-find-files-do-action 'rename))
+
+(defun helm-find-files-symlink (_candidate)
+  "Symlink files from `helm-find-files'."
+  (helm-find-files-do-action 'symlink))
+
+(defun helm-find-files-relsymlink (_candidate)
+  "Relsymlink files from `helm-find-files'."
+  (helm-find-files-do-action 'relsymlink))
+
+(defun helm-find-files-hardlink (_candidate)
+  "Hardlink files from `helm-find-files'."
+  (helm-find-files-do-action 'hardlink))
+
+(defun helm-find-files-other-window (_candidate)
+  "Keep current-buffer and open files in separate windows."
+  (let* ((files (helm-marked-candidates))
+         (buffers (mapcar 'find-file-noselect files)))
+    (switch-to-buffer-other-window (car buffers))
+    (helm-aif (cdr buffers)
+        (save-selected-window
+          (cl-loop for buffer in it
+                   do (progn
+                        (select-window (split-window))
+                        (switch-to-buffer buffer)))))))
+
+(defun helm-find-files-byte-compile (_candidate)
+  "Byte compile elisp files from `helm-find-files'."
+  (let ((files    (helm-marked-candidates :with-wildcard t))
+        (parg     helm-current-prefix-arg))
+    (cl-loop for fname in files
+          do (byte-compile-file fname parg))))
+
+(defun helm-find-files-load-files (_candidate)
+  "Load elisp files from `helm-find-files'."
+  (let ((files    (helm-marked-candidates :with-wildcard t)))
+    (cl-loop for fname in files
+          do (load fname))))
+
+(defun helm-find-files-ediff-files-1 (candidate &optional merge)
+  "Generic function to ediff/merge files in `helm-find-files'."
+  (let* ((bname  (helm-basename candidate))
+         (marked (helm-marked-candidates :with-wildcard t))
+         (prompt (if merge "Ediff Merge `%s' With File: "
+                   "Ediff `%s' With File: "))
+         (fun    (if merge 'ediff-merge-files 'ediff-files))
+         (input  (helm-dwim-target-directory))
+         (presel (if helm-ff-transformer-show-only-basename
+                     (helm-basename candidate)
+                   (expand-file-name
+                    (helm-basename candidate)
+                    input))))
+    (if (= (length marked) 2)
+        (funcall fun (car marked) (cadr marked))
+      (funcall fun candidate (helm-read-file-name
+                              (format prompt bname)
+                              :initial-input input
+                              :preselect presel)))))
+
+(defun helm-find-files-ediff-files (candidate)
+  (helm-find-files-ediff-files-1 candidate))
+
+(defun helm-find-files-ediff-merge-files (candidate)
+  (helm-find-files-ediff-files-1 candidate 'merge))
+
+(defun helm-find-files-grep (_candidate)
+  "Default action to grep files from `helm-find-files'."
+  (helm-do-grep-1 (helm-marked-candidates :with-wildcard t)
+                  helm-current-prefix-arg))
+
+(defun helm-ff-git-grep (_candidate)
+  "Default action to git-grep `helm-ff-default-directory'."
+  (helm-grep-git-1 helm-ff-default-directory helm-current-prefix-arg))
+
+(defun helm-find-files-ag (_candidate)
+  (helm-grep-ag-1 helm-ff-default-directory))
+
+(defun helm-ff-zgrep (_candidate)
+  "Default action to zgrep files from `helm-find-files'."
+  (helm-ff-zgrep-1 (helm-marked-candidates :with-wildcard t) helm-current-prefix-arg))
+
+(defun helm-ff-pdfgrep (_candidate)
+  "Default action to pdfgrep files from `helm-find-files'."
+  (let ((cands (cl-loop for file in (helm-marked-candidates :with-wildcard t)
+                     if (or (string= (file-name-extension file) "pdf")
+                            (string= (file-name-extension file) "PDF"))
+                     collect file))
+        (helm-pdfgrep-default-function 'helm-pdfgrep-init))
+    (when cands
+      (helm-do-pdfgrep-1 cands))))
+
+(defun helm-ff-etags-select (candidate)
+  "Default action to jump to etags from `helm-find-files'."
+  (when (get-buffer helm-action-buffer)
+    (kill-buffer helm-action-buffer))
+  (let* ((source-name (assoc-default 'name (helm-get-current-source)))
+         (default-directory (if (string= source-name "Find Files")
+                                helm-ff-default-directory
+                              (file-name-directory candidate))))
+    (helm-etags-select helm-current-prefix-arg)))
+
+(defun helm-find-files-switch-to-hist (_candidate)
+  "Switch to helm-find-files history."
+  (helm-find-files t))
+
+(defvar eshell-command-aliases-list nil)
+(defvar helm-eshell-command-on-file-input-history nil)
+(defun helm-find-files-eshell-command-on-file-1 (&optional map)
+  "Run `eshell-command' on CANDIDATE or marked candidates.
+This is done possibly with an eshell alias, if no alias found, you can type in
+an eshell command.
+
+Basename of CANDIDATE can be a wild-card.
+e.g you can do \"eshell-command command *.el\"
+Where \"*.el\" is the CANDIDATE.
+
+It is possible to do eshell-command command <CANDIDATE> <some more args>
+like this: \"command %s some more args\".
+
+If MAP is given run `eshell-command' on all marked files at once,
+Otherwise, run `eshell-command' on each marked files.
+In other terms, with a prefix arg do on the three marked files
+\"foo\" \"bar\" \"baz\":
+
+\"eshell-command command foo bar baz\"
+
+otherwise do
+
+\"eshell-command command foo\"
+\"eshell-command command bar\"
+\"eshell-command command baz\"
+
+Note:
+If `eshell' or `eshell-command' have not been run once,
+or if you have no eshell aliases `eshell-command-aliases-list'
+will not be loaded first time you use this."
+  (when (or eshell-command-aliases-list
+            (y-or-n-p "Eshell is not loaded, run eshell-command without alias anyway? "))
+    (and eshell-command-aliases-list (eshell-read-aliases-list))
+    (let* ((cand-list (helm-marked-candidates))
+           (default-directory (or helm-ff-default-directory
+                                  ;; If candidate is an url *-ff-default-directory is nil
+                                  ;; so keep value of default-directory.
+                                  default-directory))
+           (command (helm-comp-read
+                     "Command: "
+                     (cl-loop for (a . c) in eshell-command-aliases-list
+                              when (string-match "\\(\\$1\\|\\$\\*\\)$" (car c))
+                              collect (propertize a 'help-echo (car c)) into ls
+                              finally return (sort ls 'string<))
+                     :buffer "*helm eshell on file*"
+                     :name "Eshell command"
+                     :mode-line
+                     '("Eshell alias"
+                       "C-h m: Help, \\[universal-argument]: Insert output at point")
+                     :help-message 'helm-esh-help-message
+                     :input-history
+                     'helm-eshell-command-on-file-input-history))
+           (alias-value (car (assoc-default command eshell-command-aliases-list)))
+           cmd-line)
+      (if (or (equal helm-current-prefix-arg '(16))
+              (equal map '(16)))
+          ;; Two time C-u from `helm-comp-read' mean print to current-buffer.
+          ;; i.e `eshell-command' will use this value.
+          (setq current-prefix-arg '(16))
+          ;; Else reset the value of `current-prefix-arg'
+          ;; to avoid printing in current-buffer.
+          (setq current-prefix-arg nil))
+      (if (and (or
+                ;; One prefix-arg have been passed before `helm-comp-read'.
+                ;; If map have been set with C-u C-u (value == '(16))
+                ;; ignore it.
+                (and map (equal map '(4)))
+                ;; One C-u from `helm-comp-read'.
+                (equal helm-current-prefix-arg '(4))
+                ;; An alias that finish with $*
+                (and alias-value
+                     ;; If command is an alias be sure it accept
+                     ;; more than one arg i.e $*.
+                     (string-match "\\$\\*$" alias-value)))
+               (cdr cand-list))
+
+          ;; Run eshell-command with ALL marked files as arguments.
+          ;; This wont work on remote files, because tramp handlers depends
+          ;; on `default-directory' (limitation).
+          (let ((mapfiles (mapconcat 'eshell-quote-argument cand-list " ")))
+            (if (string-match "'%s'\\|\"%s\"\\|%s" command)
+                (setq cmd-line (format command mapfiles)) ; See [1]
+                (setq cmd-line (format "%s %s" command mapfiles)))
+            (helm-log "%S" cmd-line)
+            (eshell-command cmd-line))
+
+          ;; Run eshell-command on EACH marked files.
+          ;; To work with tramp handler we have to call
+          ;; COMMAND on basename of each file, using
+          ;; its basedir as `default-directory'.
+          (cl-loop for f in cand-list
+                   for dir = (and (not (string-match ffap-url-regexp f))
+                                  (helm-basedir f))
+                   for file = (eshell-quote-argument
+                               (format "%s" (if (and dir (file-remote-p dir))
+                                                (helm-basename f) f)))
+                   for com = (if (string-match "'%s'\\|\"%s\"\\|%s" command)
+                                 ;; [1] This allow to enter other args AFTER filename
+                                 ;; i.e <command %s some_more_args>
+                                 (format command file)
+                                 (format "%s %s" command file))
+                   do (let ((default-directory (or dir default-directory)))
+                        (eshell-command com)))))))
+
+(defun helm-find-files-eshell-command-on-file (_candidate)
+  "Run `eshell-command' on CANDIDATE or marked candidates.
+See `helm-find-files-eshell-command-on-file-1' for more info."
+  (helm-find-files-eshell-command-on-file-1 helm-current-prefix-arg))
+
+(defun helm-ff-switch-to-eshell (_candidate)
+  "Switch to eshell and cd to `helm-ff-default-directory'."
+  (let ((cd-eshell (lambda ()
+                       (eshell-kill-input)
+                       (goto-char (point-max))
+                       (insert
+                        (format "cd '%s'" helm-ff-default-directory))
+                       (eshell-send-input))))
+    (if (get-buffer "*eshell*")
+        (switch-to-buffer "*eshell*")
+      (call-interactively 'eshell))
+    (unless (get-buffer-process (current-buffer))
+      (funcall cd-eshell))))
+
+(defun helm-ff-serial-rename-action (method)
+  "Rename all marked files in `helm-ff-default-directory' with METHOD.
+See `helm-ff-serial-rename-1'."
+  (let* ((helm--reading-passwd-or-string t)
+         (cands     (helm-marked-candidates :with-wildcard t))
+         (def-name  (car cands))
+         (name      (helm-read-string "NewName: "
+                                      (replace-regexp-in-string
+                                       "[0-9]+$" ""
+                                       (helm-basename
+                                        def-name
+                                        (file-name-extension def-name)))))
+         (start     (read-number "StartAtNumber: "))
+         (extension (helm-read-string "Extension: "
+                                      (file-name-extension (car cands))))
+         (dir       (expand-file-name
+                     (helm-read-file-name
+                      "Serial Rename to directory: "
+                      :initial-input
+                      (expand-file-name helm-ff-default-directory)
+                      :test 'file-directory-p
+                      :must-match t)))
+         done)
+    (with-helm-display-marked-candidates
+      helm-marked-buffer-name (mapcar 'helm-basename cands)
+      (if (y-or-n-p
+           (format "Rename %s file(s) to <%s> like this ?\n%s "
+                   (length cands) dir (format "%s <-> %s%s.%s"
+                                              (helm-basename (car cands))
+                                              name start extension)))
+          (progn
+            (helm-ff-serial-rename-1
+             dir cands name start extension :method method)
+            (setq done t)
+            (message nil))))
+    (if done
+        (with-helm-current-buffer (helm-find-files-1 dir))
+      (message "Operation aborted"))))
+
+(defun helm-ff-member-directory-p (file directory)
+  (let ((dir-file (expand-file-name
+                   (file-name-as-directory (file-name-directory file))))
+        (cur-dir  (expand-file-name (file-name-as-directory directory))))
+    (string= dir-file cur-dir)))
+
+(cl-defun helm-ff-serial-rename-1
+    (directory collection new-name start-at-num extension &key (method 'rename))
+  "rename files in COLLECTION to DIRECTORY with the prefix name NEW-NAME.
+Rename start at number START-AT-NUM - ex: prefixname-01.jpg.
+EXTENSION is the file extension to use, in empty prompt,
+reuse the original extension of file.
+METHOD can be one of rename, copy or symlink.
+Files will be renamed if they are files of current directory, otherwise they
+will be treated with METHOD.
+Default METHOD is rename."
+  ;; Maybe remove directories selected by error in collection.
+  (setq collection (cl-remove-if 'file-directory-p collection))
+  (let* ((tmp-dir  (file-name-as-directory
+                    (concat (file-name-as-directory directory)
+                            (symbol-name (cl-gensym "tmp")))))
+         (fn       (cl-case method
+                     (copy    'copy-file)
+                     (symlink 'make-symbolic-link)
+                     (rename  'rename-file)
+                     (t (error "Error: Unknown method %s" method)))))
+    (make-directory tmp-dir)
+    (unwind-protect
+         (progn
+           ;; Rename all files to tmp-dir with new-name.
+           ;; If files are not from start directory, use method
+           ;; to move files to tmp-dir.
+           (cl-loop for i in collection
+                 for count from start-at-num
+                 for fnum = (if (< count 10) "0%s" "%s")
+                 for nname = (concat tmp-dir new-name (format fnum count)
+                                     (if (not (string= extension ""))
+                                         (format ".%s" (replace-regexp-in-string
+                                                        "[.]" "" extension))
+                                       (file-name-extension i 'dot)))
+                 do (if (helm-ff-member-directory-p i directory)
+                        (rename-file i nname)
+                      (funcall fn i nname)))
+           ;; Now move all from tmp-dir to destination.
+           (cl-loop with dirlist = (directory-files
+                                    tmp-dir t directory-files-no-dot-files-regexp)
+                 for f in dirlist do
+                 (if (file-symlink-p f)
+                     (make-symbolic-link (file-truename f)
+                                         (concat (file-name-as-directory directory)
+                                                 (helm-basename f)))
+                   (rename-file f directory))))
+      (delete-directory tmp-dir t))))
+
+(defun helm-ff-serial-rename (_candidate)
+  "Serial rename all marked files to `helm-ff-default-directory'.
+Rename only file of current directory, and symlink files coming from
+other directories.
+See `helm-ff-serial-rename-1'."
+  (helm-ff-serial-rename-action 'rename))
+
+(defun helm-ff-serial-rename-by-symlink (_candidate)
+  "Serial rename all marked files to `helm-ff-default-directory'.
+Rename only file of current directory, and symlink files coming from
+other directories.
+See `helm-ff-serial-rename-1'."
+  (helm-ff-serial-rename-action 'symlink))
+
+(defun helm-ff-serial-rename-by-copying (_candidate)
+  "Serial rename all marked files to `helm-ff-default-directory'.
+Rename only file of current directory, and copy files coming from
+other directories.
+See `helm-ff-serial-rename-1'."
+  (helm-ff-serial-rename-action 'copy))
+
+(defun helm-ff-query-replace-on-marked-1 (candidates)
+  "Query replace on filenames of CANDIDATES.
+This doesn't replace inside the files, only modify filenames."
+  (with-helm-display-marked-candidates
+    helm-marked-buffer-name
+    (mapcar 'helm-basename candidates)
+    (let* ((regexp (read-string "Replace regexp on filename(s): "))
+           (str    (read-string (format "Replace regexp `%s' with: " regexp))))
+      (cl-loop with query = "y"
+               with count = 0
+               for old in candidates
+               for new = (concat (helm-basedir old)
+                                 (replace-regexp-in-string
+                                  regexp str
+                                  (helm-basename old)))
+               ;; If `regexp' is not matched in `old'
+               ;; `replace-regexp-in-string' will
+               ;; return `old' unmodified.
+               unless (string= old new)
+               do (progn
+                    (unless (string= query "!")
+                      (while (not (member
+                                   (setq query
+                                         (string
+                                          (read-key
+                                           (propertize
+                                            (format
+                                             "Replace `%s' by `%s' [!,y,n,q]"
+                                             old new)
+                                            'face 'minibuffer-prompt))))
+                                   '("y" "!" "n" "q")))
+                        (message "Please answer by y,n,! or q") (sit-for 1)))
+                    (when (string= query "q")
+                      (cl-return (message "Operation aborted")))
+                    (unless (string= query "n")
+                      (rename-file old new)
+                      (cl-incf count)))
+               finally (message "%d Files renamed" count))))
+  ;; This fix the emacs bug where "Emacs-Lisp:" is sent
+  ;; in minibuffer (not the echo area).
+  (sit-for 0.1)
+  (with-current-buffer (window-buffer (minibuffer-window))
+    (delete-minibuffer-contents)))
+
+;; The action.
+(defun helm-ff-query-replace-on-marked (_candidate)
+  (let ((marked (helm-marked-candidates :with-wildcard t)))
+    (helm-ff-query-replace-on-marked-1 marked)))
+
+;; The command for `helm-find-files-map'.
+(defun helm-ff-run-query-replace-on-marked ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-query-replace-on-marked)))
+(put 'helm-ff-run-query-replace-on-marked 'helm-only t)
+
+(defun helm-ff-query-replace (_candidate)
+  (let ((bufs (cl-loop for f in (helm-marked-candidates :with-wildcard t)
+                       collect (buffer-name (find-file-noselect f)))))
+    (helm-buffer-query-replace-1 nil bufs)))
+
+(defun helm-ff-query-replace-regexp (_candidate)
+  (let ((bufs (cl-loop for f in (helm-marked-candidates :with-wildcard t)
+                       collect (buffer-name (find-file-noselect f)))))
+    (helm-buffer-query-replace-1 'regexp bufs)))
+
+(defun helm-ff-run-query-replace ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-query-replace)))
+(put 'helm-ff-run-query-replace 'helm-only t)
+
+(defun helm-ff-run-query-replace-regexp ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-query-replace-regexp)))
+(put 'helm-ff-run-query-replace-regexp 'helm-only t)
+
+(defun helm-ff-toggle-auto-update (_candidate)
+  (setq helm-ff-auto-update-flag (not helm-ff-auto-update-flag))
+  (setq helm-ff--auto-update-state helm-ff-auto-update-flag)
+  (message "[Auto expansion %s]"
+           (if helm-ff-auto-update-flag "enabled" "disabled")))
+
+(defun helm-ff-run-toggle-auto-update ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'toggle-auto-update '(helm-ff-toggle-auto-update . never-split))
+    (helm-execute-persistent-action 'toggle-auto-update)))
+(put 'helm-ff-run-toggle-auto-update 'helm-only t)
+
+(defun helm-ff-delete-char-backward ()
+  "Disable helm find files auto update and delete char backward."
+  (interactive)
+  (setq helm-ff-auto-update-flag nil)
+  (setq helm-ff--deleting-char-backward t)
+  (call-interactively
+   (lookup-key (current-global-map)
+               (read-kbd-macro "DEL"))))
+
+(defun helm-ff-delete-char-backward--exit-fn ()
+  (setq helm-ff-auto-update-flag helm-ff--auto-update-state)
+  (setq helm-ff--deleting-char-backward nil))
+
+(defun helm-ff-run-switch-to-history ()
+  "Run Switch to history action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (when (helm-file-completion-source-p)
+      (helm-exit-and-execute-action 'helm-find-files-switch-to-hist))))
+(put 'helm-ff-run-switch-to-history 'helm-only t)
+
+(defun helm-ff-run-grep ()
+  "Run Grep action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-grep)))
+(put 'helm-ff-run-grep 'helm-only t)
+
+(defun helm-ff-run-git-grep ()
+  "Run git-grep action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-git-grep)))
+(put 'helm-ff-run-git-grep 'helm-only t)
+
+(defun helm-ff-run-grep-ag ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-ag)))
+(put 'helm-ff-run-grep-ag 'helm-only t)
+
+(defun helm-ff-run-pdfgrep ()
+  "Run Pdfgrep action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-pdfgrep)))
+(put 'helm-ff-run-pdfgrep 'helm-only t)
+
+(defun helm-ff-run-zgrep ()
+  "Run Grep action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-zgrep)))
+(put 'helm-ff-run-zgrep 'helm-only t)
+
+(defun helm-ff-run-copy-file ()
+  "Run Copy file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-copy)))
+(put 'helm-ff-run-copy-file 'helm-only t)
+
+(defun helm-ff-run-rename-file ()
+  "Run Rename file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-rename)))
+(put 'helm-ff-run-rename-file 'helm-only t)
+
+(defun helm-ff-run-byte-compile-file ()
+  "Run Byte compile file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-byte-compile)))
+(put 'helm-ff-run-byte-compile-file 'helm-only t)
+
+(defun helm-ff-run-load-file ()
+  "Run Load file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-load-files)))
+(put 'helm-ff-run-load-file 'helm-only t)
+
+(defun helm-ff-run-eshell-command-on-file ()
+  "Run eshell command on file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action
+     'helm-find-files-eshell-command-on-file)))
+(put 'helm-ff-run-eshell-command-on-file 'helm-only t)
+
+(defun helm-ff-run-ediff-file ()
+  "Run Ediff file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-ediff-files)))
+(put 'helm-ff-run-ediff-file 'helm-only t)
+
+(defun helm-ff-run-ediff-merge-file ()
+  "Run Ediff merge file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action
+     'helm-find-files-ediff-merge-files)))
+(put 'helm-ff-run-ediff-merge-file 'helm-only t)
+
+(defun helm-ff-run-symlink-file ()
+  "Run Symlink file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-symlink)))
+(put 'helm-ff-run-symlink-file 'helm-only t)
+
+(defun helm-ff-run-hardlink-file ()
+  "Run Hardlink file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-hardlink)))
+(put 'helm-ff-run-hardlink-file 'helm-only t)
+
+(defun helm-ff-run-delete-file ()
+  "Run Delete file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-delete-marked-files)))
+(put 'helm-ff-run-delete-file 'helm-only t)
+
+(defun helm-ff-run-complete-fn-at-point ()
+  "Run complete file name action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action
+     'helm-insert-file-name-completion-at-point)))
+(put 'helm-ff-run-complete-fn-at-point 'helm-only t)
+
+(defun helm-ff-run-switch-to-eshell ()
+  "Run switch to eshell action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-switch-to-eshell)))
+(put 'helm-ff-run-switch-to-eshell 'helm-only t)
+
+(defun helm-ff-run-switch-other-window ()
+  "Run switch to other window action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-files-other-window)))
+(put 'helm-ff-run-switch-other-window 'helm-only t)
+
+(defun helm-ff-run-switch-other-frame ()
+  "Run switch to other frame action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'find-file-other-frame)))
+(put 'helm-ff-run-switch-other-frame 'helm-only t)
+
+(defun helm-ff-run-open-file-externally ()
+  "Run open file externally command action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-open-file-externally)))
+(put 'helm-ff-run-open-file-externally 'helm-only t)
+
+(defun helm-ff-run-open-file-with-default-tool ()
+  "Run open file externally command action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-open-file-with-default-tool)))
+(put 'helm-ff-run-open-file-with-default-tool 'helm-only t)
+
+(defun helm-ff-locate (candidate)
+  "Locate action function for `helm-find-files'."
+  (helm-locate-set-command)
+  (let ((input (concat (helm-basename
+                        (expand-file-name
+                         candidate
+                         helm-ff-default-directory))
+                       ;; The locate '-b' option doesn't exists
+                       ;; in everything (es).
+                       (unless (and (eq system-type 'windows-nt)
+                                    (string-match "^es" helm-locate-command))
+                         " -b"))))
+    (helm-locate-1 helm-current-prefix-arg nil 'from-ff input)))
+
+(defun helm-ff-run-locate ()
+  "Run locate action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-locate)))
+(put 'helm-ff-run-locate 'helm-only t)
+
+(defun helm-files-insert-as-org-link (candidate)
+  (insert (format "[[%s][]]" candidate))
+  (goto-char (- (point) 2)))
+
+(defun helm-ff-run-insert-org-link ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-files-insert-as-org-link)))
+(put 'helm-ff-run-insert-org-link 'helm-only t)
+
+(defun helm-ff-run-find-file-as-root ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-find-file-as-root)))
+(put 'helm-ff-run-find-file-as-root 'helm-only t)
+
+(defun helm-ff-run-find-alternate-file ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'find-alternate-file)))
+(put 'helm-ff-run-find-alternate-file 'helm-only t)
+
+(defun helm-ff-run-gnus-attach-files ()
+  "Run gnus attach files command action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-gnus-attach-files)))
+(put 'helm-ff-run-gnus-attach-files 'helm-only t)
+
+(defun helm-ff-run-etags ()
+  "Run Etags command action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-etags-select)))
+(put 'helm-ff-run-etags 'helm-only t)
+
+(defvar lpr-printer-switch)
+(defun helm-ff-print (_candidate)
+  "Print marked files.
+
+You may to set in order
+variables `lpr-command',`lpr-switches' and/or `printer-name',
+but with no settings helm should detect your printer(s) and
+print with the default `lpr' settings.
+
+NOTE: DO NOT set the \"-P\" flag in `lpr-switches', if you really
+have to modify this, do it in `lpr-printer-switch'.
+  
+Same as `dired-do-print' but for helm."
+  (require 'lpr)
+  (when (or helm-current-prefix-arg
+            (not helm-ff-printer-list))
+    (setq helm-ff-printer-list
+          (helm-ff-find-printers)))
+  (let* ((file-list (helm-marked-candidates :with-wildcard t))
+         (len (length file-list))
+         (printer-name (if helm-ff-printer-list
+                           (helm-comp-read
+                            "Printer: " helm-ff-printer-list)
+                         printer-name))
+         (lpr-switches
+	  (if (and (stringp printer-name)
+		   (string< "" printer-name))
+	      (cons (concat lpr-printer-switch printer-name)
+		    lpr-switches)
+              lpr-switches))
+         (command (helm-read-string
+                   (format "Print *%s File(s):\n%s with: "
+                           len
+                           (mapconcat
+                            (lambda (f) (format "- %s\n" f))
+                            file-list ""))
+                   (when (and lpr-command lpr-switches)
+                     (mapconcat 'identity
+                                (cons lpr-command
+                                      (if (stringp lpr-switches)
+                                          (list lpr-switches)
+                                          lpr-switches))
+                                " "))))
+         (file-args (mapconcat (lambda (x)
+                                   (format "'%s'" x))
+                               file-list " "))
+         (cmd-line (concat command " " file-args)))
+    (if command
+        (start-process-shell-command "helm-print" nil cmd-line)
+      (error "Error: Please verify your printer settings in Emacs."))))
+
+(defun helm-ff-run-print-file ()
+  "Run Print file action from `helm-source-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-print)))
+(put 'helm-ff-run-print-file 'helm-only t)
+
+(defun helm-ff-checksum (file)
+  "Calculate the checksum of FILE.
+The checksum is copied to kill-ring."
+  (let ((algo (intern (helm-comp-read
+                       "Algorithm: "
+                       '(md5 sha1 sha224 sha256 sha384 sha512)))))
+    (kill-new (with-temp-buffer
+                (insert-file-contents-literally file)
+                (secure-hash algo (current-buffer))))
+    (message "Checksum copied to kill-ring.")))
+
+(defun helm-ff-toggle-basename (_candidate)
+  (with-helm-buffer
+    (setq helm-ff-transformer-show-only-basename
+          (not helm-ff-transformer-show-only-basename))
+    (let* ((cand   (helm-get-selection nil t))
+           (target (if helm-ff-transformer-show-only-basename
+                       (helm-basename cand) cand)))
+      (helm-force-update (regexp-quote target)))))
+
+(defun helm-ff-run-toggle-basename ()
+  (interactive)
+  (with-helm-alive-p
+    (unless (helm-empty-source-p)
+      (helm-ff-toggle-basename nil))))
+(put 'helm-ff-run-toggle-basename 'helm-only t)
+
+(cl-defun helm-reduce-file-name (fname level &key unix-close expand)
+  "Reduce FNAME by LEVEL from end or beginning depending LEVEL value.
+If LEVEL is positive reduce from end else from beginning.
+If UNIX-CLOSE is non--nil close filename with /.
+If EXPAND is non--nil expand-file-name."
+  (let* ((exp-fname  (expand-file-name fname))
+         (fname-list (split-string
+		      (if (or (string= fname "~/") expand)
+			  exp-fname fname)
+		      "/" t))
+         (len        (length fname-list))
+         (pop-list   (if (< level 0)
+                         (cl-subseq fname-list (* level -1))
+                       (cl-subseq fname-list 0 (- len level))))
+         (result     (mapconcat 'identity pop-list "/"))
+	 (abbrev-fname  (string-match "^~" result))
+         (empty      (string= result "")))
+    (when unix-close (setq result (concat result "/")))
+    (cond ((and abbrev-fname (string= result "~/")) "~/")
+	  (abbrev-fname result)
+	  ((and (< level 0) empty) "../")
+	  ((< level 0) (concat "../" result))
+	  ((and (eq system-type 'windows-nt)
+                (not (file-remote-p fname)))
+           ;; Result is starting by a volume name i.e "c:/".
+           result)
+          ;; Expand to "/" or "c:/".
+	  (empty (expand-file-name "/"))
+	  (t (concat "/" result)))))
+
+(defvar helm-find-files--level-tree nil)
+(defvar helm-find-files--level-tree-iterator nil)
+(defun helm-find-files-up-one-level (arg)
+  "Go up one level like unix command `cd ..'.
+If prefix numeric arg is given go ARG level up."
+  (interactive "p")
+  (with-helm-alive-p
+    (when (and (helm-file-completion-source-p)
+               (not (helm-ff-invalid-tramp-name-p)))
+      (with-helm-window
+        (when helm-follow-mode
+          (helm-follow-mode -1) (message nil)))
+      ;; When going up one level we want to be at the line
+      ;; corresponding to actual directory, so store this info
+      ;; in `helm-ff-last-expanded'.
+      (let ((cur-cand (helm-get-selection))
+            (new-pattern (helm-reduce-file-name
+                          helm-pattern arg :unix-close t :expand t)))
+        (cond ((file-directory-p helm-pattern)
+               (setq helm-ff-last-expanded helm-ff-default-directory))
+              ((file-exists-p helm-pattern)
+               (setq helm-ff-last-expanded helm-pattern))
+              ((and cur-cand (file-exists-p cur-cand))
+               (setq helm-ff-last-expanded cur-cand)))
+        (unless helm-find-files--level-tree
+          (setq helm-find-files--level-tree
+                (cons helm-ff-default-directory
+                      helm-find-files--level-tree)))
+        (setq helm-find-files--level-tree-iterator nil)
+        (push new-pattern helm-find-files--level-tree)
+        (helm-set-pattern new-pattern helm-suspend-update-flag)
+        (with-helm-after-update-hook (helm-ff-retrieve-last-expanded))))))
+(put 'helm-find-files-up-one-level 'helm-only t)
+
+(defun helm-find-files-down-last-level ()
+  "Retrieve previous paths reached by `C-l' in helm-find-files."
+  (interactive)
+  (with-helm-alive-p
+    (when (and (helm-file-completion-source-p)
+               (not (helm-ff-invalid-tramp-name-p)))
+      (unless helm-find-files--level-tree-iterator 
+        (setq helm-find-files--level-tree-iterator
+              (helm-iter-list (cdr helm-find-files--level-tree))))
+      (setq helm-find-files--level-tree nil)
+      (helm-aif (helm-iter-next helm-find-files--level-tree-iterator)
+          (helm-set-pattern it)
+        (setq helm-find-files--level-tree-iterator nil)))))
+(put 'helm-find-files-down-last-level 'helm-only t)
+
+(defun helm-find-files--reset-level-tree ()
+  (setq helm-find-files--level-tree-iterator nil
+        helm-find-files--level-tree nil))
+
+(add-hook 'helm-cleanup-hook 'helm-find-files--reset-level-tree)
+(add-hook 'post-self-insert-hook 'helm-find-files--reset-level-tree)
+(add-hook 'helm-after-persistent-action-hook 'helm-find-files--reset-level-tree)
+
+(defun helm-ff-retrieve-last-expanded ()
+  "Move overlay to last visited directory `helm-ff-last-expanded'.
+This happen after using `helm-find-files-up-one-level',
+or hitting C-j on \"..\"."
+  (when helm-ff-last-expanded
+    (let ((presel (if helm-ff-transformer-show-only-basename
+                      (helm-basename
+                       (directory-file-name helm-ff-last-expanded))
+                    (directory-file-name helm-ff-last-expanded))))
+      (with-helm-window
+        (when (re-search-forward (concat "^" (regexp-quote presel) "$") nil t)
+          (forward-line 0)
+          (helm-mark-current-line)))
+      (setq helm-ff-last-expanded nil))))
+
+(defun helm-ff-move-to-first-real-candidate ()
+  "When candidate is an incomplete file name move to first real candidate."
+  (helm-aif (and (helm-file-completion-source-p)
+                 (not (helm-empty-source-p))
+                 (not (string-match
+                       "\\`[Dd]ired-"
+                       (assoc-default 'name (helm-get-current-source))))
+                 helm-ff--move-to-first-real-candidate
+                 (helm-get-selection))
+      (unless (or (not (stringp it))
+                  (and (string-match helm-tramp-file-name-regexp it)
+                       (not (file-remote-p it nil t)))
+                  (file-exists-p it))
+        (helm-next-line))))
+(add-hook 'helm-after-update-hook 'helm-ff-move-to-first-real-candidate)
+
+;;; Auto-update - helm-find-files auto expansion of directories.
+;;
+;;
+(defun helm-ff-update-when-only-one-matched ()
+  "Expand to directory when sole completion.
+When only one candidate is remaining and it is a directory,
+expand to this directory.
+This happen only when `helm-ff-auto-update-flag' is non--nil
+or when `helm-pattern' is equal to \"~/\"."
+  (when (and (helm-file-completion-source-p)
+             (not (helm-ff-invalid-tramp-name-p)))
+    (with-helm-window
+      (let* ((history-p   (string= (assoc-default
+                                    'name (helm-get-current-source))
+                                   "Read File Name History"))
+             (pat         (if (string-match helm-tramp-file-name-regexp
+                                            helm-pattern)
+                              (helm-create-tramp-name helm-pattern)
+                              helm-pattern))
+             (completed-p (string= (file-name-as-directory
+                                    (expand-file-name
+                                     (substitute-in-file-name pat)))
+                                   helm-ff-default-directory))
+             (candnum (helm-get-candidate-number))
+             (lt2-p   (and (<= candnum 2)
+                           (>= (string-width (helm-basename helm-pattern)) 2)))
+             (cur-cand (prog2
+                           (unless (or completed-p
+                                       (file-exists-p pat)
+                                       history-p (null lt2-p))
+                             ;; Only one non--existing candidate
+                             ;; and one directory candidate, move to it,
+                             ;; but not when renaming, copying etc...,
+                             ;; so for this use
+                             ;; `helm-ff-move-to-first-real-candidate'
+                             ;; instead of `helm-next-line' (Issue #910).
+                             (helm-ff-move-to-first-real-candidate))
+                           (helm-get-selection))))
+        (when (and (or (and helm-ff-auto-update-flag
+                            (null helm-ff--deleting-char-backward)
+                            (not (get-buffer-window helm-action-buffer 'visible))
+                            ;; Issue #295
+                            ;; File predicates are returning t
+                            ;; with paths like //home/foo.
+                            ;; So check it is not the case by regexp
+                            ;; to allow user to do C-a / to start e.g
+                            ;; entering a tramp method e.g /sudo::.
+                            (not (string-match "\\`//" helm-pattern))
+                            (not (eq last-command 'helm-yank-text-at-point)))
+                       ;; Fix issue #542.
+                       (string= helm-pattern "~/")
+                       ;; Only one remaining directory, expand it.
+                       (and (= candnum 1)
+                            helm-ff--auto-update-state
+                            (file-accessible-directory-p pat)
+                            (null helm-ff--deleting-char-backward)))
+                   (or
+                    ;; Only one candidate remaining
+                    ;; and at least 2 char in basename.
+                    lt2-p
+                    ;; Already completed.
+                    completed-p)
+                   (not history-p) ; Don't try to auto complete in history.
+                   (stringp cur-cand)
+                   (file-accessible-directory-p cur-cand))
+          (if (and (not (helm-dir-is-dot cur-cand)) ; [1]
+                   ;; Maybe we are here because completed-p is true
+                   ;; but check this again to be sure. (Windows fix)
+                   (<= candnum 2))      ; [2]
+              ;; If after going to next line the candidate
+              ;; is not one of "." or ".." [1]
+              ;; and only one candidate is remaining [2],
+              ;; assume candidate is a new directory to expand, and do it.
+              (helm-set-pattern (file-name-as-directory cur-cand))
+              ;; The candidate is one of "." or ".."
+              ;; that mean we have entered the last letter of the directory name
+              ;; in prompt, so expansion is already done, just add the "/" at end
+              ;; of name unless helm-pattern ends with "."
+              ;; (i.e we are writing something starting with ".")
+              (unless (string-match "\\`.*[.]\\{1\\}\\'" helm-pattern)
+                (helm-set-pattern
+                 ;; Need to expand-file-name to avoid e.g /ssh:host:./ in prompt.
+                 (expand-file-name (file-name-as-directory helm-pattern)))))
+          (helm-check-minibuffer-input))))))
+
+(defun helm-ff-auto-expand-to-home-or-root ()
+  "Allow expanding to home/user directory or root or text yanked after pattern."
+  (when (and (helm-file-completion-source-p)
+             (string-match
+              "/?\\$.*/\\|/\\./\\|/\\.\\./\\|/~.*/\\|//\\|\\(/[[:alpha:]]:/\\|\\s\\+\\)"
+              helm-pattern)
+             (with-current-buffer (window-buffer (minibuffer-window)) (eolp))
+             (not (string-match helm-ff-url-regexp helm-pattern)))
+    (let* ((match (match-string 0 helm-pattern))
+           (input (cond ((string= match "/./")
+                         (expand-file-name default-directory))
+                        ((string= helm-pattern "/../") "/")
+                        ((string-match-p "\\`/\\$" match)
+                         (let ((sub (substitute-in-file-name match)))
+                           (if (file-directory-p sub)
+                               sub (replace-regexp-in-string "/\\'" "" sub))))
+                        (t (expand-file-name
+                            (helm-substitute-in-filename helm-pattern)
+                            ;; [Windows] On UNC paths "/" expand to current machine,
+                            ;; so use the root of current Drive. (i.e "C:/")
+                            (and (memq system-type '(windows-nt ms-dos))
+                                 (getenv "SystemDrive")) ; nil on Unix.
+                            )))))
+      (if (file-directory-p input)
+          (setq helm-ff-default-directory
+                (setq input (file-name-as-directory input)))
+        (setq helm-ff-default-directory (file-name-as-directory
+                                         (file-name-directory input))))
+      (with-helm-window
+        (helm-set-pattern input)
+        (helm-check-minibuffer-input)))))
+
+(defun helm-substitute-in-filename (fname)
+  "Substitute all parts of FNAME from start up to \"~/\" or \"/\".
+On windows system substitute from start up to \"/[[:lower:]]:/\".
+This function is needed for `helm-ff-auto-expand-to-home-or-root'
+and should be used carefully elsewhere, or not at all, using
+`substitute-in-file-name' instead."
+  (if (and ffap-url-regexp
+           (string-match-p ffap-url-regexp fname))
+      fname
+      (with-temp-buffer
+        (insert fname)
+        (goto-char (point-min))
+        (skip-chars-forward "/") ;; Avoid infloop in UNC paths Issue #424
+        (if (re-search-forward "~.*/?\\|//\\|/[[:alpha:]]:/" nil t)
+            (let ((match (match-string 0)))
+              (goto-char (if (or (string= match "//")
+                                 (string-match-p "/[[:alpha:]]:/" match))
+                             (1+ (match-beginning 0))
+                             (match-beginning 0)))
+              (buffer-substring-no-properties (point) (point-at-eol)))
+            fname))))
+
+(add-hook 'helm-after-update-hook 'helm-ff-update-when-only-one-matched)
+(add-hook 'helm-after-update-hook 'helm-ff-auto-expand-to-home-or-root)
+
+(defun helm-point-file-in-dired (file)
+  "Put point on filename FILE in dired buffer."
+  (unless (and ffap-url-regexp
+               (string-match-p ffap-url-regexp file))
+    (let ((target (expand-file-name (helm-substitute-in-filename file))))
+      (dired (file-name-directory target))
+      (dired-goto-file target))))
+
+(defun helm-create-tramp-name (fname)
+  "Build filename for `helm-pattern' like /su:: or /sudo::."
+  (apply #'tramp-make-tramp-file-name
+         (cl-loop with v = (tramp-dissect-file-name fname)
+               for i across v collect i)))
+
+(cl-defun helm-ff-tramp-hostnames (&optional (pattern helm-pattern))
+  "Get a list of hosts for tramp method found in `helm-pattern'.
+Argument PATTERN default to `helm-pattern', it is here only for debugging
+purpose."
+  (when (string-match helm-tramp-file-name-regexp pattern)
+    (let ((method      (match-string 1 pattern))
+          (tn          (match-string 0 pattern))
+          (all-methods (mapcar 'car tramp-methods)))
+      (helm-fast-remove-dups
+       (cl-loop for (f . h) in (tramp-get-completion-function method)
+             append (cl-loop for e in (funcall f (car h))
+                          for host = (and (consp e) (cadr e))
+                          when (and host (not (member host all-methods)))
+                          collect (concat tn host)))
+       :test 'equal))))
+
+(defun helm-ff-before-action-hook-fn ()
+  "Exit helm when user try to execute action on an invalid tramp fname."
+  (let ((cand (helm-get-selection)))
+    (when (and (helm-file-completion-source-p)
+               (stringp cand)
+               (helm-ff-invalid-tramp-name-p cand) ; Check candidate.
+               (helm-ff-invalid-tramp-name-p)) ; check helm-pattern.
+      (error "Error: Unknown file or directory `%s'" cand))))
+(add-hook 'helm-before-action-hook 'helm-ff-before-action-hook-fn)
+
+(cl-defun helm-ff-invalid-tramp-name-p (&optional (pattern helm-pattern))
+  "Return non--nil when PATTERN is an invalid tramp filename."
+  (string= (helm-ff-set-pattern pattern)
+           "Invalid tramp file name"))
+
+(defun helm-ff-set-pattern (pattern)
+  "Handle tramp filenames in `helm-pattern'."
+  (let ((methods (mapcar 'car tramp-methods))
+        (reg "\\`/\\([^[/:]+\\|[^/]+]\\):.*:")
+        cur-method tramp-name)
+    ;; In some rare cases tramp can return a nil input,
+    ;; so be sure pattern is a string for safety (Issue #476).
+    (unless pattern (setq pattern ""))
+    (cond ((string-match helm-ff-url-regexp pattern) pattern)
+          ((string-match "\\`\\$" pattern)
+           (substitute-in-file-name pattern))
+          ((string= pattern "") "")
+          ((string-match "\\`[.]\\{1,2\\}/\\'" pattern)
+           (expand-file-name pattern))
+          ((string-match ".*\\(~?/?[.]\\{1\\}/\\)\\'" pattern)
+           (expand-file-name default-directory))
+          ((string-match ".*\\(~//\\|//\\)\\'" pattern)
+           (expand-file-name "/")) ; Expand to "/" or "c:/"
+          ((string-match "\\`\\(~/\\|.*/~/\\)\\'" pattern)
+           (expand-file-name "~/"))
+          ;; Match "/method:maybe_hostname:~"
+          ((and (string-match (concat reg "~") pattern)
+                (setq cur-method (match-string 1 pattern))
+                (member cur-method methods))
+           (setq tramp-name (expand-file-name
+                             (helm-create-tramp-name
+                              (match-string 0 pattern))))
+           (replace-match tramp-name nil t pattern))
+          ;; Match "/method:maybe_hostname:"
+          ((and (string-match reg pattern)
+                (setq cur-method (match-string 1 pattern))
+                (member cur-method methods))
+           (setq tramp-name (helm-create-tramp-name
+                             (match-string 0 pattern)))
+           (replace-match tramp-name nil t pattern))
+          ;; Match "/hostname:"
+          ((and (string-match  helm-tramp-file-name-regexp pattern)
+                (setq cur-method (match-string 1 pattern))
+                (and cur-method (not (member cur-method methods))))
+           (setq tramp-name (helm-create-tramp-name
+                             (match-string 0 pattern)))
+           (replace-match tramp-name nil t pattern))
+          ;; Match "/method:" in this case don't try to connect.
+          ((and (not (string-match reg pattern))
+                (string-match helm-tramp-file-name-regexp pattern)
+                (member (match-string 1 pattern) methods))
+           "Invalid tramp file name")   ; Write in helm-buffer.
+          ;; Return PATTERN unchanged.
+          (t pattern))))
+
+(defun helm-find-files-get-candidates (&optional require-match)
+  "Create candidate list for `helm-source-find-files'."
+  (let* ((path          (helm-ff-set-pattern helm-pattern))
+         (dir-p         (file-accessible-directory-p path))
+         basedir
+         invalid-basedir
+         non-essential
+         (tramp-verbose helm-tramp-verbose)) ; No tramp message when 0.
+    (set-text-properties 0 (length path) nil path)
+    ;; Issue #118 allow creation of newdir+newfile.
+    (unless (or
+             ;; A tramp file name not completed.
+             (string= path "Invalid tramp file name")
+             ;; An empty pattern
+             (string= path "")
+             ;; Check if base directory of PATH is valid.
+             (helm-aif (file-name-directory path)
+                 ;; If PATH is a valid directory IT=PATH,
+                 ;; else IT=basedir of PATH.
+                 (file-directory-p it)))
+      ;; BASEDIR is invalid, that's mean user is starting
+      ;; to write a non--existing path in minibuffer
+      ;; probably to create a 'new_dir' or a 'new_dir+new_file'.
+      (setq invalid-basedir t))
+    ;; Don't set now `helm-pattern' if `path' == "Invalid tramp file name"
+    ;; like that the actual value (e.g /ssh:) is passed to
+    ;; `helm-ff-tramp-hostnames'.
+    (unless (or (string= path "Invalid tramp file name")
+                invalid-basedir)      ; Leave  helm-pattern unchanged.
+      (setq helm-ff-auto-update-flag  ; [1]
+            ;; Unless auto update is disabled at startup or
+            ;; interactively, start auto updating only at third char.
+            (unless (or (null helm-ff-auto-update-initial-value)
+                        (null helm-ff--auto-update-state)
+                        ;; But don't enable auto update when
+                        ;; deleting backward.
+                        helm-ff--deleting-char-backward
+                        (and dir-p (not (string-match-p "/\\'" path))))
+              (or (>= (length (helm-basename path)) 3) dir-p)))
+      (setq helm-pattern (helm-ff--transform-pattern-for-completion path))
+      ;; This have to be set after [1] to allow deleting char backward.
+      (setq basedir (expand-file-name
+                     (if (and dir-p helm-ff-auto-update-flag)
+                         ;; Add the final "/" to path
+                         ;; when `helm-ff-auto-update-flag' is enabled.
+                         (file-name-as-directory path)
+                         (if (string= path "") "/"
+                             (file-name-directory path)))))
+      (setq helm-ff-default-directory
+            (if (string= helm-pattern "")
+                (expand-file-name "/")  ; Expand to "/" or "c:/"
+                ;; If path is an url *default-directory have to be nil.
+                (unless (or (string-match helm-ff-url-regexp path)
+                            (and ffap-url-regexp
+                                 (string-match ffap-url-regexp path)))
+                  basedir))))
+    (cond ((string= path "Invalid tramp file name")
+           (or (helm-ff-tramp-hostnames) ; Hostnames completion.
+               (prog2
+                   ;; `helm-pattern' have not been modified yet.
+                   ;; Set it here to the value of `path' that should be now
+                   ;; "Invalid tramp file name" and set the candidates list
+                   ;; to ("Invalid tramp file name") to make `helm-pattern'
+                   ;; match single candidate "Invalid tramp file name".
+                   (setq helm-pattern path)
+                   ;; "Invalid tramp file name" is now printed
+                   ;; in `helm-buffer'.
+                   (list path))))
+          ((or (and (file-regular-p path)
+                    (eq last-repeatable-command 'helm-execute-persistent-action))
+               ;; `ffap-url-regexp' don't match until url is complete.
+               (string-match helm-ff-url-regexp path)
+               invalid-basedir
+               (and (not (file-exists-p path)) (string-match "/$" path))
+               (and ffap-url-regexp (string-match ffap-url-regexp path)))
+           (list path))
+          ((string= path "") (helm-ff-directory-files "/" t))
+          ;; Check here if directory is accessible (not working on Windows).
+          ((and (file-directory-p path) (not (file-readable-p path)))
+           (list (format "file-error: Opening directory permission denied `%s'" path)))
+          ;; A fast expansion of PATH is made only if `helm-ff-auto-update-flag'
+          ;; is enabled.
+          ((and dir-p helm-ff-auto-update-flag)
+           (helm-ff-directory-files path t))
+          (t (append (unless (or require-match
+                                 ;; When `helm-ff-auto-update-flag' has been
+                                 ;; disabled, whe don't want PATH to be added on top
+                                 ;; if it is a directory.
+                                 dir-p)
+                       (list path))
+                     (helm-ff-directory-files basedir t))))))
+
+(defun helm-ff-directory-files (directory &optional full)
+  "List contents of DIRECTORY.
+Argument FULL mean absolute path.
+It is same as `directory-files' but always returns the
+dotted filename '.' and '..' even on root directories in Windows
+systems."
+  (setq directory (file-name-as-directory
+                   (expand-file-name directory)))
+  (let* (file-error
+         (ls   (condition-case err
+                   (directory-files
+                    directory full directory-files-no-dot-files-regexp)
+                 ;; Handle file-error from here for Windows
+                 ;; because predicates like `file-readable-p' and friends
+                 ;; seem broken on emacs for Windows systems (always returns t).
+                 ;; This should never be called on GNU/Linux/Unix
+                 ;; as the error is properly intercepted in
+                 ;; `helm-find-files-get-candidates' by `file-readable-p'.
+                 (file-error
+                  (prog1
+                      (list (format "%s:%s"
+                                    (car err)
+                                    (mapconcat 'identity (cdr err) " ")))
+                    (setq file-error t)))))
+        (dot  (concat directory "."))
+        (dot2 (concat directory "..")))
+    (append (and (not file-error) (list dot dot2)) ls)))
+
+(defun helm-ff-handle-backslash (fname)
+  ;; Allow creation of filenames containing a backslash.
+  (cl-loop with bad = '((92 . ""))
+        for i across fname
+        for isbad = (assq i bad)
+        if isbad concat (cdr isbad)
+        else concat (string i)))
+
+(defun helm-ff-fuzzy-matching-p ()
+  (and helm-ff-fuzzy-matching
+       (not (memq helm-mm-matching-method '(multi1 multi3p)))))
+
+(defun helm-ff--transform-pattern-for-completion (pattern)
+  "Maybe return PATTERN with it's basename modified as a regexp.
+This happen only when `helm-ff-fuzzy-matching' is enabled.
+This provide a similar behavior as `ido-enable-flex-matching'.
+See also `helm--mapconcat-pattern'.
+If PATTERN is an url returns it unmodified.
+When PATTERN contain a space fallback to multi-match.
+If basename contain one or more space fallback to multi-match.
+If PATTERN is a valid directory name,return PATTERN unchanged."
+  ;; handle bad filenames containing a backslash.
+  (setq pattern (helm-ff-handle-backslash pattern))
+  (let ((bn      (helm-basename pattern))
+        (bd      (or (helm-basedir pattern) ""))
+        (dir-p   (file-directory-p pattern))
+        (tramp-p (cl-loop for (m . f) in tramp-methods
+                       thereis (string-match m pattern))))
+    ;; Always regexp-quote base directory name to handle
+    ;; crap dirnames such e.g bookmark+
+    (cond
+      ((or (and dir-p tramp-p (string-match ":\\'" pattern))
+           (string= pattern "")
+           (and dir-p (<= (length bn) 2))
+           ;; Fix Issue #541 when BD have a subdir similar
+           ;; to BN, don't switch to match plugin
+           ;; which will match both.
+           (and dir-p (string-match (regexp-quote bn) bd)))
+       ;; Use full PATTERN on e.g "/ssh:host:".
+       (regexp-quote pattern))
+      ;; Prefixing BN with a space call multi-match completion.
+      ;; This allow showing all files/dirs matching BN (Issue #518).
+      ;; FIXME: some multi-match methods may not work here.
+      (dir-p (concat (regexp-quote bd) " " (regexp-quote bn)))
+      ((or (not (helm-ff-fuzzy-matching-p))
+           (string-match "\\s-" bn))    ; Fall back to multi-match.
+       (concat (regexp-quote bd) bn))
+      ((or (string-match "[*][.]?.*" bn) ; Allow entering wilcard.
+           (string-match "/$" pattern)     ; Allow mkdir.
+           (string-match helm-ff-url-regexp pattern)
+           (and (string= helm-ff-default-directory "/") tramp-p))
+       ;; Don't treat wildcards ("*") as regexp char.
+       ;; (e.g ./foo/*.el => ./foo/[*].el)
+       (concat (regexp-quote bd)
+               (replace-regexp-in-string "[*]" "[*]" bn)))
+      (t (concat (regexp-quote bd)
+                 (if (>= (length bn) 2) ; wait 2nd char before concating.
+                     (helm--mapconcat-pattern bn)
+                     (concat ".*" (regexp-quote bn))))))))
+
+(defun helm-dir-is-dot (dir)
+  (string-match "\\(?:/\\|\\`\\)\\.\\{1,2\\}\\'" dir))
+
+(defun helm-ff-save-history ()
+  "Store the last value of `helm-ff-default-directory' in `helm-ff-history'.
+Note that only existing directories are saved here."
+  (when (and helm-ff-default-directory
+             (helm-file-completion-source-p)
+             (file-directory-p helm-ff-default-directory))
+    (set-text-properties 0 (length helm-ff-default-directory)
+                         nil helm-ff-default-directory)
+    (push helm-ff-default-directory helm-ff-history)))
+(add-hook 'helm-cleanup-hook 'helm-ff-save-history)
+
+(defun helm-files-save-file-name-history (&optional force)
+  "Save selected file to `file-name-history'."
+  (let ((src-name (assoc-default 'name (helm-get-current-source))))
+    (when (or force (helm-file-completion-source-p)
+              (member src-name helm-files-save-history-extra-sources))
+      (let ((mkd (helm-marked-candidates))
+            (history-delete-duplicates t))
+        (cl-loop for sel in mkd
+              when (and sel
+                        (stringp sel)
+                        (file-exists-p sel)
+                        (not (file-directory-p sel)))
+              do
+              ;; we use `abbreviate-file-name' here because
+              ;; other parts of Emacs seems to,
+              ;; and we don't want to introduce duplicates.
+              (add-to-history 'file-name-history
+                              (abbreviate-file-name sel)))))))
+(add-hook 'helm-exit-minibuffer-hook 'helm-files-save-file-name-history)
+
+(defun helm-ff-valid-symlink-p (file)
+  (helm-aif (condition-case-unless-debug nil
+                ;; `file-truename' send error
+                ;; on cyclic symlinks (Issue #692).
+                (file-truename file)
+              (error nil))
+      (file-exists-p it)))
+
+(defun helm-get-default-mode-for-file (filename)
+  "Return the default mode to open FILENAME."
+  (let ((mode (cl-loop for (r . m) in auto-mode-alist
+                    thereis (and (string-match r filename) m))))
+    (or (and (symbolp mode) mode) "Fundamental")))
+
+(defun helm-ff-properties (candidate)
+  "Show file properties of CANDIDATE in a tooltip or message."
+  (let* ((all                (helm-file-attributes candidate))
+         (dired-line         (helm-file-attributes
+                              candidate :dired t :human-size t))
+         (type               (cl-getf all :type))
+         (mode-type          (cl-getf all :mode-type))
+         (owner              (cl-getf all :uid))
+         (owner-right        (cl-getf all :user t))
+         (group              (cl-getf all :gid))
+         (group-right        (cl-getf all :group))
+         (other-right        (cl-getf all :other))
+         (size               (helm-file-human-size (cl-getf all :size)))
+         (modif              (cl-getf all :modif-time))
+         (access             (cl-getf all :access-time))
+         (ext                (helm-get-default-program-for-file candidate))
+         (tooltip-hide-delay (or helm-tooltip-hide-delay tooltip-hide-delay)))
+    (if (and (window-system) tooltip-mode)
+        (tooltip-show
+         (concat
+          (helm-basename candidate) "\n"
+          dired-line "\n"
+          (format "Mode: %s\n" (helm-get-default-mode-for-file candidate))
+          (format "Ext prog: %s\n" (or (and ext (replace-regexp-in-string
+                                                 " %s" "" ext))
+                                       "Not defined"))
+          (format "Type: %s: %s\n" type mode-type)
+          (when (string= type "symlink")
+            (format "True name: '%s'\n"
+                    (cond ((string-match "^\.#" (helm-basename candidate))
+                           "Autosave symlink")
+                          ((helm-ff-valid-symlink-p candidate)
+                           (file-truename candidate))
+                          (t "Invalid Symlink"))))
+          (format "Owner: %s: %s\n" owner owner-right)
+          (format "Group: %s: %s\n" group group-right)
+          (format "Others: %s\n" other-right)
+          (format "Size: %s\n" size)
+          (format "Modified: %s\n" modif)
+          (format "Accessed: %s\n" access)))
+      (message dired-line) (sit-for 5))))
+
+(defun helm-ff-properties-persistent ()
+  "Show properties without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'properties-action '(helm-ff-properties . never-split))
+    (helm-execute-persistent-action 'properties-action)))
+(put 'helm-ff-properties-persistent 'helm-only t)
+
+(defun helm-ff-persistent-delete ()
+  "Delete current candidate without quitting."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'quick-delete '(helm-ff-quick-delete . never-split))
+    (helm-execute-persistent-action 'quick-delete)))
+(put 'helm-ff-persistent-delete 'helm-only t)
+
+(defun helm-ff-dot-file-p (file)
+  "Check if FILE is `.' or `..'."
+  (member (helm-basename file) '("." "..")))
+
+(defun helm-ff-quick-delete (_candidate)
+  "Delete file CANDIDATE without quitting."
+  (let ((marked (helm-marked-candidates)))
+    (unwind-protect
+         (save-selected-window
+           (cl-loop for c in marked do
+                    (progn (helm-preselect
+                            (if (and helm-ff-transformer-show-only-basename
+                                     (not (helm-ff-dot-file-p c)))
+                                (helm-basename c) c))
+                           (when (y-or-n-p
+                                  (format "Really Delete file `%s'? " c))
+                             (helm-delete-file
+                              c helm-ff-signal-error-on-dot-files 'synchro)
+                             (helm-delete-current-selection)
+                             (message nil)))))
+      (with-helm-buffer
+        (setq helm-marked-candidates nil
+              helm-visible-mark-overlays nil))
+      (helm-force-update
+       (let ((presel (helm-get-selection)))
+         (regexp-quote (if (and helm-ff-transformer-show-only-basename
+                                (not (helm-ff-dot-file-p presel)))
+                           (helm-basename presel) presel)))))))
+
+(defun helm-ff-kill-buffer-fname (candidate)
+  (let* ((buf      (get-file-buffer candidate))
+         (buf-name (buffer-name buf)))
+    (cond ((and buf (eq buf (get-buffer helm-current-buffer)))
+           (user-error
+            "Can't kill `helm-current-buffer' without quitting session"))
+          (buf (kill-buffer buf) (message "Buffer `%s' killed" buf-name))
+          (t (message "No buffer to kill")))))
+
+(defun helm-ff-kill-or-find-buffer-fname (candidate)
+  "Find file CANDIDATE or kill it's buffer if it is visible.
+Never kill `helm-current-buffer'.
+Never kill buffer modified.
+This is called normally on third hit of \
+\\<helm-map>\\[helm-execute-persistent-action]
+in `helm-find-files-persistent-action'."
+  (let* ((buf      (get-file-buffer candidate))
+         (buf-name (buffer-name buf))
+         (win (get-buffer-window buf))
+         (helm--reading-passwd-or-string t))
+    (cond ((and buf win (eq buf (get-buffer helm-current-buffer)))
+           (user-error
+            "Can't kill `helm-current-buffer' without quitting session"))
+          ((and buf win (buffer-modified-p buf))
+           (message "Can't kill modified buffer, please save it before"))
+          ((and buf win)
+           (kill-buffer buf)
+           (set-window-buffer win helm-current-buffer)
+           (message "Buffer `%s' killed" buf-name))
+          (t (find-file candidate)))))
+
+(defun helm-ff-run-kill-buffer-persistent ()
+  "Execute `helm-ff-kill-buffer-fname' without quitting."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'kill-buffer-fname 'helm-ff-kill-buffer-fname)
+    (helm-execute-persistent-action 'kill-buffer-fname)))
+(put 'helm-ff-run-kill-buffer-persistent 'helm-only t)
+
+(defun helm-ff-prefix-filename (fname &optional file-or-symlinkp new-file)
+  "Return filename FNAME maybe prefixed with [?] or [@].
+If FILE-OR-SYMLINKP is non--nil this mean we assume FNAME is an
+existing filename or valid symlink and there is no need to test it.
+NEW-FILE when non--nil mean FNAME is a non existing file and
+return FNAME prefixed with [?]."
+  (let* ((prefix-new (propertize
+                      " " 'display
+                      (propertize "[?]" 'face 'helm-ff-prefix)))
+         (prefix-url (propertize
+                      " " 'display
+                      (propertize "[@]" 'face 'helm-ff-prefix))))
+    (cond (file-or-symlinkp fname)
+          ((or (string-match helm-ff-url-regexp fname)
+               (and ffap-url-regexp (string-match ffap-url-regexp fname)))
+           (concat prefix-url " " fname))
+          (new-file (concat prefix-new " " fname)))))
+
+(defun helm-ff-score-candidate-for-pattern (str pattern)
+  (if (member str '("." ".."))
+      200
+      (helm-score-candidate-for-pattern str pattern)))
+
+(defun helm-ff-sort-candidates (candidates _source)
+  "Sort function for `helm-source-find-files'.
+Return candidates prefixed with basename of `helm-input' first."
+  (if (or (and (file-directory-p helm-input)
+               (string-match "/\\'" helm-input))
+          (string-match "\\`\\$" helm-input)
+          (null candidates))
+      candidates
+      (let* ((c1        (car candidates))
+             (cand1real (if (consp c1) (cdr c1) c1))
+             (cand1     (unless (file-exists-p cand1real) c1))
+             (rest-cand (if cand1 (cdr candidates) candidates))
+             (memo-src  (make-hash-table :test 'equal))
+             (all (sort rest-cand
+                        (lambda (s1 s2)
+                            (let* ((score (lambda (str)
+                                            (helm-ff-score-candidate-for-pattern
+                                             str (helm-basename helm-input))))
+                                   (bn1 (helm-basename (if (consp s1) (cdr s1) s1)))
+                                   (bn2 (helm-basename (if (consp s2) (cdr s2) s2)))
+                                   (sc1 (or (gethash bn1 memo-src)
+                                            (puthash bn1 (funcall score bn1) memo-src)))
+                                   (sc2 (or (gethash bn2 memo-src)
+                                            (puthash bn2 (funcall score bn2) memo-src))))
+                              (cond ((= sc1 sc2)
+                                     (< (string-width bn1)
+                                        (string-width bn2)))
+                                    ((> sc1 sc2))))))))
+        (if cand1 (cons cand1 all) all))))
+
+(defun helm-ff-filter-candidate-one-by-one (file)
+  "`filter-one-by-one' Transformer function for `helm-source-find-files'."
+  ;; Handle boring files
+  (unless (and helm-ff-skip-boring-files
+               (cl-loop for r in helm-boring-file-regexp-list
+                        ;; Prevent user doing silly thing like
+                        ;; adding the dotted files to boring regexps (#924).
+                        thereis (and (not (string-match "\\.$" file))
+                                     (string-match r file))))
+    ;; Handle tramp files.
+    (if (and (string-match helm-tramp-file-name-regexp helm-pattern)
+             helm-ff-tramp-not-fancy)
+        (if helm-ff-transformer-show-only-basename
+            (if (helm-dir-is-dot file)
+                file
+              (cons (or (helm-ff-get-host-from-tramp-invalid-fname file)
+                        (helm-basename file))
+                    file))
+          file)
+      ;; Now highlight.
+      (let* ((disp (if (and helm-ff-transformer-show-only-basename
+                            (not (helm-dir-is-dot file))
+                            (not (and ffap-url-regexp
+                                      (string-match ffap-url-regexp file)))
+                            (not (string-match helm-ff-url-regexp file)))
+                       (or (helm-ff-get-host-from-tramp-invalid-fname file)
+                           (helm-basename file)) file))
+             (attr (file-attributes file))
+             (type (car attr)))
+
+        (cond ((string-match "file-error" file) file)
+              ( ;; A not already saved file.
+               (and (stringp type)
+                    (not (helm-ff-valid-symlink-p file))
+                    (not (string-match "^\.#" (helm-basename file))))
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-invalid-symlink) t)
+                     file))
+              ;; A dotted directory symlinked.
+              ((and (helm-ff-dot-file-p file) (stringp type))
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-dotted-symlink-directory) t)
+                     file))
+              ;; A dotted directory.
+              ((helm-ff-dot-file-p file)
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-dotted-directory) t)
+                     file))
+              ;; A symlink.
+              ((stringp type)
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-symlink) t)
+                     file))
+              ;; A directory.
+              ((eq t type)
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-directory) t)
+                     file))
+              ;; An executable file.
+              ((and attr (string-match "x" (nth 8 attr)))
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-executable) t)
+                     file))
+              ;; A file.
+              ((and attr (null type))
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-file) t)
+                     file))
+              ;; A non--existing file.
+              (t
+               (cons (helm-ff-prefix-filename
+                      (propertize disp 'face 'helm-ff-file) nil 'new-file)
+                     file)))))))
+
+(defun helm-find-files-action-transformer (actions candidate)
+  "Action transformer for `helm-source-find-files'."
+  (let ((str-at-point (with-helm-current-buffer
+                        (buffer-substring-no-properties
+                         (point-at-bol) (point-at-eol)))))
+    (cond ((with-helm-current-buffer
+             (eq major-mode 'message-mode))
+           (append actions
+                   '(("Gnus attach file(s)" . helm-ff-gnus-attach-files))))
+          ((save-match-data
+             (and ffap-url-regexp
+                  (not (string-match-p ffap-url-regexp str-at-point))
+                  (not (with-helm-current-buffer (eq major-mode 'dired-mode)))
+                  (string-match ":\\([0-9]+:?\\)" str-at-point)
+                  ))
+           (append '(("Find file to line number" . helm-ff-goto-linum))
+                   actions))
+          ((string-match (image-file-name-regexp) candidate)
+           (append actions
+                   '(("Rotate image right `M-r'" . helm-ff-rotate-image-right)
+                     ("Rotate image left `M-l'" . helm-ff-rotate-image-left))))
+          ((string-match "\.el$" (helm-aif (helm-marked-candidates)
+                                     (car it) candidate))
+           (append actions
+                   '(("Byte compile lisp file(s) `M-B, C-u to load'"
+                      . helm-find-files-byte-compile)
+                     ("Load File(s) `M-L'" . helm-find-files-load-files))))
+          ((and (string-match "\.html?$" candidate)
+                (file-exists-p candidate))
+           (append actions
+                   '(("Browse url file" . browse-url-of-file))))
+          ((or (string= (file-name-extension candidate) "pdf")
+               (string= (file-name-extension candidate) "PDF"))
+           (append actions
+                   '(("Pdfgrep File(s)" . helm-ff-pdfgrep))))
+          (t actions))))
+
+(defun helm-ff-goto-linum (candidate)
+  "Find file CANDIDATE and maybe jump to line number found in fname at point.
+line number should be added at end of fname preceded with \":\".
+e.g \"foo:12\"."
+  (let ((linum (with-helm-current-buffer
+                 (let ((str (buffer-substring-no-properties
+                             (point-at-bol) (point-at-eol))))
+                   (when (string-match ":\\([0-9]+:?\\)" str)
+                     (match-string 1 str))))))
+    (find-file candidate)
+    (and linum (not (string= linum ""))
+         (helm-goto-line (string-to-number linum) t))))
+
+(defun helm-ff-gnus-attach-files (_candidate)
+  "Run `gnus-dired-attach' on `helm-marked-candidates' or CANDIDATE."
+  (require 'gnus-dired)
+  (let ((flist (helm-marked-candidates :with-wildcard t)))
+    (gnus-dired-attach flist)))
+
+(defvar image-dired-display-image-buffer)
+(defun helm-ff-rotate-current-image-1 (file &optional num-arg)
+  "Rotate current image at NUM-ARG degrees.
+This is a destructive operation on FILE made by external tool mogrify."
+  (setq file (file-truename file)) ; For symlinked images.
+  ;; When FILE is not an image-file, do nothing.
+  (when (string-match (image-file-name-regexp) file)
+    (if (executable-find "mogrify")
+        (progn
+          (shell-command (format "mogrify -rotate %s %s"
+                                 (or num-arg 90)
+                                 (shell-quote-argument file)))
+          (when (buffer-live-p image-dired-display-image-buffer)
+            (kill-buffer image-dired-display-image-buffer))
+          (image-dired-display-image file)
+          (message nil)
+          (display-buffer (get-buffer image-dired-display-image-buffer)))
+      (error "mogrify not found"))))
+
+(defun helm-ff-rotate-image-left (candidate)
+  "Rotate image file CANDIDATE left.
+This affect directly file CANDIDATE."
+  (helm-ff-rotate-current-image-1 candidate -90))
+
+(defun helm-ff-rotate-image-right (candidate)
+  "Rotate image file CANDIDATE right.
+This affect directly file CANDIDATE."
+  (helm-ff-rotate-current-image-1 candidate))
+
+(defun helm-ff-rotate-left-persistent ()
+  "Rotate image left without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'image-action1 'helm-ff-rotate-image-left)
+    (helm-execute-persistent-action 'image-action1)))
+(put 'helm-ff-rotate-left-persistent 'helm-only t)
+
+(defun helm-ff-rotate-right-persistent ()
+  "Rotate image right without quitting helm."
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'image-action2 'helm-ff-rotate-image-right)
+    (helm-execute-persistent-action 'image-action2)))
+(put 'helm-ff-rotate-right-persistent 'helm-only t)
+
+(defun helm-ff-exif-data (candidate)
+  "Extract exif data from file CANDIDATE using `helm-ff-exif-data-program'."
+  (if (and helm-ff-exif-data-program
+           (executable-find helm-ff-exif-data-program))
+      (shell-command-to-string (format "%s %s %s"
+                                       helm-ff-exif-data-program
+                                       helm-ff-exif-data-program-args
+                                       candidate))
+    (format "No program %s found to extract exif"
+            helm-ff-exif-data-program)))
+
+(defun helm-find-files-persistent-action (candidate)
+  "Open subtree CANDIDATE without quitting helm.
+If CANDIDATE is not a directory expand CANDIDATE filename.
+If CANDIDATE is alone, open file CANDIDATE filename.
+That's mean:
+First hit on C-j expand CANDIDATE second hit open file.
+If a prefix arg is given or `helm-follow-mode' is on open file."
+  (let* ((follow        (or (buffer-local-value
+                             'helm-follow-mode
+                             (get-buffer-create helm-buffer))
+                            helm--temp-follow-flag))
+         (new-pattern   (helm-get-selection))
+         (num-lines-buf (with-current-buffer helm-buffer
+                          (count-lines (point-min) (point-max))))
+         (insert-in-minibuffer (lambda (fname)
+                                   (with-selected-window (minibuffer-window)
+                                     (unless follow
+                                       (delete-minibuffer-contents)
+                                       (set-text-properties 0 (length fname)
+                                                            nil fname)
+                                       (insert fname))))))
+    (cond ((and (helm-ff-invalid-tramp-name-p)
+                (string-match helm-tramp-file-name-regexp candidate))
+           ;; First hit insert hostname and
+           ;; second hit insert ":" and expand.
+           (if (string= candidate helm-pattern)
+               (funcall insert-in-minibuffer (concat candidate ":"))
+               (funcall insert-in-minibuffer candidate)))
+          (;; A symlink directory, expand it but not to its truename
+           ;; unless a prefix arg is given.
+           (and (file-directory-p candidate) (file-symlink-p candidate))
+           (funcall insert-in-minibuffer
+                    (file-name-as-directory
+                     (if current-prefix-arg
+                         (file-truename (expand-file-name candidate))
+                         (expand-file-name candidate)))))
+          ;; A directory, open it.
+          ((file-directory-p candidate)
+           (when (string= (helm-basename candidate) "..")
+             (setq helm-ff-last-expanded helm-ff-default-directory))
+           (funcall insert-in-minibuffer (file-name-as-directory
+                                          (expand-file-name candidate))))
+          ;; A symlink file, expand to it's true name. (first hit)
+          ((and (file-symlink-p candidate) (not current-prefix-arg) (not follow))
+           (funcall insert-in-minibuffer (file-truename candidate)))
+          ;; A regular file, expand it, (first hit)
+          ((and (>= num-lines-buf 3) (not current-prefix-arg) (not follow))
+           (setq helm-pattern "")       ; Force update.
+           (funcall insert-in-minibuffer new-pattern))
+          ;; An image file and it is the second hit on C-j,
+          ;; show the file in `image-dired'.
+          ((string-match (image-file-name-regexp) candidate)
+           (when (buffer-live-p (get-buffer image-dired-display-image-buffer))
+             (kill-buffer image-dired-display-image-buffer))
+           ;; Fix emacs bug never fixed upstream.
+           (unless (file-directory-p image-dired-dir)
+             (make-directory image-dired-dir))
+           (image-dired-display-image candidate)
+           (message nil)
+           (switch-to-buffer image-dired-display-image-buffer)
+           (with-current-buffer image-dired-display-image-buffer
+             (let ((exif-data (helm-ff-exif-data candidate)))
+               (setq default-directory helm-ff-default-directory)
+               (image-dired-update-property 'help-echo exif-data))))
+          ;; Allow browsing archive on avfs fs.
+          ;; Assume volume is already mounted with mountavfs.
+          ((and helm-ff-avfs-directory
+                (string-match
+                 (regexp-quote (expand-file-name helm-ff-avfs-directory))
+                 (file-name-directory candidate))
+                (helm-ff-file-compressed-p candidate))
+           (funcall insert-in-minibuffer (concat candidate "#")))
+          ;; On second hit we open file.
+          ;; On Third hit we kill it's buffer maybe.
+          (t
+           (helm-ff-kill-or-find-buffer-fname candidate)))))
+
+(defun helm-ff-file-compressed-p (candidate)
+  "Whether CANDIDATE is a compressed file or not."
+  (member (file-name-extension candidate)
+          helm-ff-file-compressed-list))
+
+(defun helm-insert-file-name-completion-at-point (candidate)
+  "Insert file name completion at point."
+  (with-helm-current-buffer
+    (if buffer-read-only
+        (error "Error: Buffer `%s' is read-only" (buffer-name))
+      (let* ((end         (point))
+             (tap         (thing-at-point 'filename))
+             (guess       (and (stringp tap) (substring-no-properties tap)))
+             (beg         (- (point) (length guess)))
+             (full-path-p (and (stringp guess)
+                               (or (string-match-p
+                                    (concat "^" (getenv "HOME"))
+                                    guess)
+                                   (string-match-p
+                                    "\\`\\(/\\|[[:lower:][:upper:]]:/\\)"
+                                    guess)))))
+        (set-text-properties 0 (length candidate) nil candidate)
+        (if (and guess (not (string= guess ""))
+                 (or (string-match "^\\(~/\\|/\\|[[:lower:][:upper:]]:/\\)"
+                                   guess)
+                     (file-exists-p candidate)))
+            (progn
+              (delete-region beg end)
+              (insert (cond (full-path-p
+                             (expand-file-name candidate))
+                            ((string= (match-string 1 guess) "~/")
+                              (abbreviate-file-name candidate))
+                            (t (file-relative-name candidate)))))
+            (insert (cond ((equal helm-current-prefix-arg '(4))
+                           (abbreviate-file-name candidate))
+                          ((equal helm-current-prefix-arg '(16))
+                           (file-relative-name candidate))
+                          (t candidate))))))))
+
+(cl-defun helm-find-files-history (&key (comp-read t))
+  "The `helm-find-files' history.
+Show the first `helm-ff-history-max-length' elements of
+`helm-ff-history' in an `helm-comp-read'."
+  (let ((history (when helm-ff-history
+                   (helm-fast-remove-dups helm-ff-history
+                                          :test 'equal))))
+    (when history
+      (setq helm-ff-history
+            (if (>= (length history) helm-ff-history-max-length)
+                (cl-subseq history 0 helm-ff-history-max-length)
+              history))
+      (if comp-read
+          (helm-comp-read
+           "Switch to Directory: "
+           helm-ff-history
+           :name "Helm Find Files History"
+           :must-match t)
+        helm-ff-history))))
+
+(defun helm-find-files-1 (fname &optional preselect)
+  "Find FNAME with `helm' completion.
+Like `find-file' but with `helm' support.
+Use it for non--interactive calls of `helm-find-files'."
+  (when (get-buffer helm-action-buffer)
+    (kill-buffer helm-action-buffer))
+  (setq helm-find-files--toggle-bookmark nil)
+  (let* ( ;; Be sure we don't erase the precedent minibuffer if some.
+         (helm-ff-auto-update-initial-value
+          (and helm-ff-auto-update-initial-value
+               (not (minibuffer-window-active-p (minibuffer-window)))))
+         (tap (thing-at-point 'filename))
+         (def (and tap (or (file-remote-p tap)
+                           (expand-file-name tap)))))
+    (unless helm-source-find-files
+      (setq helm-source-find-files (helm-make-source
+                                    "Find Files" 'helm-source-ffiles)))
+    (unwind-protect
+         (helm :sources 'helm-source-find-files
+               :input fname
+               :case-fold-search helm-file-name-case-fold-search
+               :preselect preselect
+               :ff-transformer-show-only-basename
+               helm-ff-transformer-show-only-basename
+               :default def
+               :prompt "Find Files or Url: "
+               :buffer "*Helm Find Files*")
+      (setq helm-ff-default-directory nil))))
+
+(defun helm-find-files-toggle-to-bookmark ()
+  "Toggle helm-bookmark for `helm-find-files' and `helm-find-files.'"
+  (interactive)
+  (with-helm-alive-p
+    (with-helm-buffer
+      (if (setq helm-find-files--toggle-bookmark
+                (not helm-find-files--toggle-bookmark))
+          (progn
+            (helm-set-pattern "" t)
+            (helm-set-sources '(helm-source-bookmark-helm-find-files)))
+          ;; Switch back to helm-find-files.
+          (helm-set-pattern "./" t) ; Back to initial directory of hff session.
+          (helm-set-sources '(helm-source-find-files))
+          (helm--maybe-update-keymap))))) 
+(put 'helm-find-files-toggle-to-bookmark 'helm-only t)
+
+(defun helm-find-files-initial-input (&optional input)
+  "Return INPUT if present, otherwise try to guess it."
+  (let ((ffap-machine-p-known 'reject)
+        (ffap-alist (and helm-ff-guess-ffap-filenames ffap-alist))
+        (ffap-url-regexp (and helm-ff-guess-ffap-urls ffap-url-regexp)))
+    (unless (eq major-mode 'image-mode)
+      (or (and input (or (and (file-remote-p input) input)
+                         (expand-file-name input)))
+          (helm-find-files-input
+           (ffap-guesser)
+           (thing-at-point 'filename))))))
+
+(defun helm-find-files-input (file-at-pt thing-at-pt)
+  "Try to guess a default input for `helm-find-files'."
+  (let* ((non-essential t)
+         (remp (or (and file-at-pt (file-remote-p file-at-pt))
+                   (and thing-at-pt (file-remote-p thing-at-pt))))
+         (def-dir (helm-current-directory))
+         (urlp (and file-at-pt ffap-url-regexp
+                    (string-match ffap-url-regexp file-at-pt)))
+         (lib     (when helm-ff-search-library-in-sexp
+                    (helm-find-library-at-point)))
+         (hlink   (helm-ff-find-url-at-point))
+         (file-p  (and file-at-pt
+                       (not (string= file-at-pt ""))
+                       (not remp)
+                       (file-exists-p file-at-pt)
+                       thing-at-pt
+                       (not (string= thing-at-pt ""))
+                       (file-exists-p
+                        (file-name-directory
+                         (expand-file-name thing-at-pt def-dir))))))
+    (cond (lib)      ; e.g we are inside a require sexp.
+          (hlink)    ; String at point is an hyperlink.
+          (file-p    ; a regular file
+           (helm-aif (ffap-file-at-point) (expand-file-name it)))
+          (urlp file-at-pt) ; possibly an url or email.
+          ((and file-at-pt
+                (not remp)
+                (file-exists-p file-at-pt))
+           file-at-pt))))
+
+(defun helm-ff-find-url-at-point ()
+  "Try to find link to an url in text-property at point."
+  (let* ((he      (get-text-property (point) 'help-echo))
+         (ov      (overlays-at (point)))
+         (ov-he   (and ov (overlay-get
+                           (car (overlays-at (point))) 'help-echo)))
+         (w3m-l   (get-text-property (point) 'w3m-href-anchor))
+         (nt-prop (get-text-property (point) 'nt-link)))
+    ;; Org link.
+    (when (and (stringp he) (string-match "^LINK: " he))
+      (setq he (replace-match "" t t he)))
+    (cl-loop for i in (list he ov-he w3m-l nt-prop)
+          thereis (and (stringp i) ffap-url-regexp (string-match ffap-url-regexp i) i))))
+
+(defun helm-find-library-at-point ()
+  "Try to find library path at point.
+Find inside `require' and `declare-function' sexp."
+  (require 'find-func)
+  (let* ((beg-sexp (save-excursion (search-backward "(" (point-at-bol) t)))
+         (end-sexp (save-excursion (search-forward ")" (point-at-eol) t)))
+         (sexp     (and beg-sexp end-sexp
+                        (buffer-substring-no-properties
+                         (1+ beg-sexp) (1- end-sexp)))))
+    (ignore-errors
+      (cond ((and sexp (string-match "require \'.+[^)]" sexp))
+             (find-library-name
+              (replace-regexp-in-string
+               "'\\|\)\\|\(" ""
+               ;; If require use third arg, ignore it,
+               ;; always use library path found in `load-path'.
+               (cl-second (split-string (match-string 0 sexp))))))
+            ((and sexp (string-match-p "^declare-function" sexp))
+             (find-library-name
+              (replace-regexp-in-string
+               "\"\\|ext:" ""
+               (cl-third (split-string sexp)))))
+            (t nil)))))
+
+
+;;; Handle copy, rename, symlink, relsymlink and hardlink from helm.
+;;
+;;
+(defun helm-ff--valid-default-directory ()
+  (with-helm-current-buffer
+    (cl-loop for b in (buffer-list)
+             for cd = (with-current-buffer b default-directory)
+             when (eq (car (file-attributes cd)) t)
+             return cd)))
+
+(defvar dired-async-mode)
+(cl-defun helm-dired-action (candidate
+                             &key action follow (files (dired-get-marked-files)))
+  "Execute ACTION on FILES to CANDIDATE.
+Where ACTION is a symbol that can be one of:
+'copy, 'rename, 'symlink,'relsymlink, 'hardlink.
+Argument FOLLOW when non--nil specify to follow FILES to destination for the actions
+copy and rename."
+  (when (get-buffer dired-log-buffer) (kill-buffer dired-log-buffer))
+  ;; When default-directory in current-buffer is an invalid directory,
+  ;; (e.g buffer-file directory have been renamed somewhere else)
+  ;; be sure to use a valid value to give to dired-create-file.
+  ;; i.e start-process is creating a process buffer based on default-directory.
+  (let ((default-directory (helm-ff--valid-default-directory))
+        (fn     (cl-case action
+                  (copy       'dired-copy-file)
+                  (rename     'dired-rename-file)
+                  (symlink    'make-symbolic-link)
+                  (relsymlink 'dired-make-relative-symlink)
+                  (hardlink   'dired-hardlink)))
+        (marker (cl-case action
+                  ((copy rename)   dired-keep-marker-copy)
+                  (symlink        dired-keep-marker-symlink)
+                  (relsymlink     dired-keep-marker-relsymlink)
+                  (hardlink       dired-keep-marker-hardlink)))
+        (dirflag (and (= (length files) 1)
+                      (file-directory-p (car files))
+                      (not (file-directory-p candidate))))
+        (dired-async-state (if (and (boundp 'dired-async-mode)
+                                    dired-async-mode)
+                               1 -1)))
+    (and follow (fboundp 'dired-async-mode) (dired-async-mode -1))
+    (when (and (cdr files) (not (file-directory-p candidate)))
+      (error "%s: target `%s' is not a directory" action candidate))
+    (unwind-protect
+         (dired-create-files
+          fn (symbol-name action) files
+          ;; CANDIDATE is the destination.
+          (if (file-directory-p candidate)
+              ;; When CANDIDATE is a directory, build file-name in this directory.
+              ;; Else we use CANDIDATE.
+              (lambda (from)
+                  (expand-file-name (file-name-nondirectory from) candidate))
+              (lambda (_from) candidate))
+          marker)
+      (and (fboundp 'dired-async-mode)
+           (dired-async-mode dired-async-state)))
+    (push (file-name-as-directory
+           (if (file-directory-p candidate)
+               (expand-file-name candidate)
+             (file-name-directory candidate)))
+          helm-ff-history)
+    ;; If follow is non--nil we should not be in async mode.
+    (when (and follow
+               (not (memq action '(symlink relsymlink hardlink)))
+               (not (get-buffer dired-log-buffer)))
+      (let ((target (directory-file-name candidate)))
+        (unwind-protect
+             (progn
+               (setq helm-ff-cand-to-mark
+                     (helm-get-dest-fnames-from-list files candidate dirflag))
+               (with-helm-after-update-hook (helm-ff-maybe-mark-candidates))
+               (if (and dirflag (eq action 'rename))
+                   (helm-find-files-1 (file-name-directory target)
+                                      (if helm-ff-transformer-show-only-basename
+                                          (helm-basename target) target))
+                 (helm-find-files-1 (file-name-as-directory
+                                     (expand-file-name candidate)))))
+          (setq helm-ff-cand-to-mark nil))))))
+
+(defun helm-get-dest-fnames-from-list (flist dest-cand rename-dir-flag)
+  "Transform filenames of FLIST to abs of DEST-CAND.
+If RENAME-DIR-FLAG is non--nil collect the `directory-file-name' of transformed
+members of FLIST."
+  ;; At this point files have been renamed/copied at destination.
+  ;; That's mean DEST-CAND exists.
+  (cl-loop
+        with dest = (expand-file-name dest-cand)
+        for src in flist
+        for basename-src = (helm-basename src)
+        for fname = (cond (rename-dir-flag (directory-file-name dest))
+                          ((file-directory-p dest)
+                           (concat (file-name-as-directory dest) basename-src))
+                          (t dest))
+        when (file-exists-p fname)
+        collect fname into tmp-list
+        finally return (sort tmp-list 'string<)))
+
+(defun helm-ff-maybe-mark-candidates ()
+  "Mark all candidates of list `helm-ff-cand-to-mark'.
+This is used when copying/renaming/symlinking etc... and
+following files to destination."
+  (when (and (string= (assoc-default 'name (helm-get-current-source))
+                      (assoc-default 'name helm-source-find-files))
+             helm-ff-cand-to-mark)
+    (with-helm-window
+      (while helm-ff-cand-to-mark
+        (if (string= (car helm-ff-cand-to-mark) (helm-get-selection))
+            (progn
+              (helm-make-visible-mark)
+              (helm-next-line)
+              (setq helm-ff-cand-to-mark (cdr helm-ff-cand-to-mark)))
+          (helm-next-line)))
+      (unless (helm-this-visible-mark)
+        (helm-prev-visible-mark)))))
+
+
+;;; Routines for files
+;;
+;;
+(defun helm-file-buffers (filename)
+  "Returns a list of buffer names corresponding to FILENAME."
+  (cl-loop with name = (expand-file-name filename)
+        for buf in (buffer-list)
+        for bfn = (buffer-file-name buf)
+        when (and bfn (string= name bfn))
+        collect (buffer-name buf)))
+
+(defun helm-delete-file (file &optional error-if-dot-file-p synchro)
+  "Delete the given file after querying the user.
+Ask to kill buffers associated with that file, too."
+  (when (and error-if-dot-file-p
+             (helm-ff-dot-file-p file))
+    (error "Error: Cannot operate on `.' or `..'"))
+  (let ((buffers (helm-file-buffers file))
+        (helm--reading-passwd-or-string t))
+    (if (or (< emacs-major-version 24) synchro)
+        ;; `dired-delete-file' in Emacs versions < 24
+        ;; doesn't support delete-by-moving-to-trash
+        ;; so use `delete-directory' and `delete-file'
+        ;; that handle it.
+        (cond ((and (not (file-symlink-p file))
+                    (file-directory-p file)
+                    (directory-files file t dired-re-no-dot))
+               (when (y-or-n-p (format "Recursive delete of `%s'? " file))
+                 (delete-directory file 'recursive)))
+              ((and (not (file-symlink-p file))
+                    (file-directory-p file))
+               (delete-directory file))
+              (t (delete-file file)))
+      (dired-delete-file
+       file dired-recursive-deletes delete-by-moving-to-trash))
+    (when buffers
+      (cl-dolist (buf buffers)
+        (when (y-or-n-p (format "Kill buffer %s, too? " buf))
+          (kill-buffer buf))))))
+
+(defun helm-delete-marked-files (_ignore)
+  (let* ((files (helm-marked-candidates :with-wildcard t))
+         (len (length files)))
+    (with-helm-display-marked-candidates
+      helm-marked-buffer-name
+      (mapcar (lambda (f)
+                  (if (file-directory-p f)
+                      (concat (helm-basename f) "/")
+                    (helm-basename f)))
+              files)
+      (if (not (y-or-n-p (format "Delete *%s File(s)" len)))
+          (message "(No deletions performed)")
+        (cl-dolist (i files)
+          (set-text-properties 0 (length i) nil i)
+          (helm-delete-file i helm-ff-signal-error-on-dot-files))
+        (message "%s File(s) deleted" len)))))
+
+(defun helm-find-file-or-marked (candidate)
+  "Open file CANDIDATE or open helm marked files in separate windows.
+Called with a prefix arg open files in background without selecting them."
+  (let ((marked (helm-marked-candidates :with-wildcard t))
+        (url-p (and ffap-url-regexp ; we should have only one candidate.
+                    (string-match ffap-url-regexp candidate)))
+        (ffap-newfile-prompt helm-ff-newfile-prompt-p)
+        (find-file-wildcards nil)
+        (make-dir-fn
+         (lambda (dir &optional helm-ff)
+             (when (or (not confirm-nonexistent-file-or-buffer)
+                     (y-or-n-p (format "Create directory `%s'? " dir)))
+               (let ((dirfname (directory-file-name dir)))
+                 (if (file-exists-p dirfname)
+                     (error
+                      "Mkdir: Unable to create directory `%s': file exists."
+                      (helm-basename dirfname))
+                   (make-directory dir 'parent)))
+               (when helm-ff
+                 ;; Allow having this new dir in history
+                 ;; to be able to retrieve it immediately
+                 ;; if we want to e.g copy a file from somewhere in it.
+                 (setq helm-ff-default-directory
+                       (file-name-as-directory dir))
+                 (push helm-ff-default-directory helm-ff-history))
+               (or (and helm-ff (helm-find-files-1 dir)) t))))
+        (helm--reading-passwd-or-string t))
+    (if (cdr marked)
+        (if helm-current-prefix-arg
+            (dired-simultaneous-find-file marked nil)
+            (mapc 'find-file-noselect (cdr marked))
+            (find-file (car marked)))
+      (if (and (not (file-exists-p candidate))
+               (not url-p)
+               (string-match "/$" candidate))
+          ;; A a non--existing filename ending with /
+          ;; Create a directory and jump to it.
+          (funcall make-dir-fn candidate 'helm-ff)
+        ;; A non--existing filename NOT ending with / or
+        ;; an existing filename, create or jump to it.
+        ;; If the basedir of candidate doesn't exists,
+        ;; ask for creating it.
+        (let ((dir (and (not url-p) (helm-basedir candidate))))
+          (find-file-at-point
+           (cond ((and dir (file-directory-p dir))
+                  (substitute-in-file-name candidate))
+                 (url-p candidate)
+                 ((funcall make-dir-fn dir) candidate))))))))
+
+(defun helm-shadow-boring-files (files)
+  "Files matching `helm-boring-file-regexp' will be
+displayed with the `file-name-shadow' face if available."
+  (helm-shadow-entries files helm-boring-file-regexp-list))
+
+(defun helm-skip-boring-files (files)
+  "Files matching `helm-boring-file-regexp' will be skipped."
+  (helm-skip-entries files helm-boring-file-regexp-list))
+
+(defun helm-skip-current-file (files)
+  "Current file will be skipped."
+  (remove (buffer-file-name helm-current-buffer) files))
+
+(defun helm-w32-pathname-transformer (args)
+  "Change undesirable features of windows pathnames to ones more acceptable to
+other candidate transformers."
+  (if (eq system-type 'windows-nt)
+      (helm-transform-mapcar
+       (lambda (x)
+         (replace-regexp-in-string
+          "/cygdrive/\\(.\\)" "\\1:"
+          (replace-regexp-in-string "\\\\" "/" x)))
+       args)
+    args))
+
+(defun helm-transform-file-load-el (actions candidate)
+  "Add action to load the file CANDIDATE if it is an emacs lisp
+file.  Else return ACTIONS unmodified."
+  (if (member (file-name-extension candidate) '("el" "elc"))
+      (append actions '(("Load Emacs Lisp File" . load-file)))
+    actions))
+
+(defun helm-transform-file-browse-url (actions candidate)
+  "Add an action to browse the file CANDIDATE if it is a html file or URL.
+Else return ACTIONS unmodified."
+  (let ((browse-action '("Browse with Browser" . browse-url)))
+    (cond ((string-match "^http\\|^ftp" candidate)
+           (cons browse-action actions))
+          ((string-match "\\.html?$" candidate)
+           (append actions (list browse-action)))
+          (t actions))))
+
+(defun helm-multi-files-toggle-to-locate ()
+  (interactive)
+  (with-helm-buffer
+  (if (setq helm-multi-files--toggle-locate
+            (not helm-multi-files--toggle-locate))
+      (progn
+        (helm-set-sources (unless (memq 'helm-source-locate
+                                        helm-sources)
+                            (cons 'helm-source-locate helm-sources)))
+        (helm-set-source-filter '(helm-source-locate)))
+      (helm-kill-async-processes)
+      (helm-set-sources (remove 'helm-source-locate
+                                helm-for-files-preferred-list))
+      (helm-set-source-filter nil))))
+
+
+;;; List of files gleaned from every dired buffer
+;;
+;;
+(defun helm-files-in-all-dired-candidates ()
+  (save-excursion
+    (cl-loop for (f . b) in dired-buffers
+          when (buffer-live-p b)
+          append (let ((dir (with-current-buffer b dired-directory)))
+                   (if (listp dir) (cdr dir)
+                     (directory-files f t dired-re-no-dot))))))
+
+;; (dired '("~/" "~/.emacs.d/.emacs-custom.el" "~/.emacs.d/.emacs.bmk"))
+
+(defclass helm-files-dired-source (helm-source-sync helm-type-file)
+  ((candidates :initform #'helm-files-in-all-dired-candidates)))
+
+(defvar helm-source-files-in-all-dired
+  (helm-make-source "Files in all dired buffer." 'helm-files-dired-source))
+
+
+;;; File Cache
+;;
+;;
+(defvar file-cache-alist)
+
+(defclass helm-file-cache (helm-source-in-buffer helm-type-file)
+  ((init :initform (lambda () (require 'filecache)))))
+
+(defun helm-file-cache-get-candidates ()
+  (cl-loop for item in file-cache-alist append
+           (cl-destructuring-bind (base &rest dirs) item
+             (cl-loop for dir in dirs collect
+                      (concat dir base)))))
+
+(defvar helm-source-file-cache nil)
+
+(defcustom helm-file-cache-fuzzy-match nil
+  "Enable fuzzy matching in `helm-source-file-cache' when non--nil."
+  :group 'helm-files
+  :type 'boolean
+  :set (lambda (var val)
+         (set var val)
+         (setq helm-source-file-cache
+               (helm-make-source "File Cache" 'helm-file-cache
+                 :fuzzy-match helm-file-cache-fuzzy-match
+                 :data 'helm-file-cache-get-candidates))))
+
+(cl-defun helm-file-cache-add-directory-recursively
+    (dir &optional match (ignore-dirs t))
+  (require 'filecache)
+  (cl-loop for f in (helm-walk-directory
+                     dir
+                     :path 'full
+                     :directories nil
+                     :match match
+                     :skip-subdirs ignore-dirs) 
+           do (file-cache-add-file f)))
+
+(defun helm-ff-cache-add-file (_candidate)
+  (require 'filecache)
+  (let ((mkd (helm-marked-candidates :with-wildcard t)))
+    (mapc 'file-cache-add-file mkd)))
+
+(defun helm-ff-file-cache-remove-file-1 (file)
+  "Remove FILE from `file-cache-alist'."
+  (let ((entry (assoc (helm-basename file) file-cache-alist))
+        (dir   (helm-basedir file))
+        new-entry)
+    (setq new-entry (remove dir entry))
+    (when (= (length entry) 1)
+      (setq new-entry nil))
+    (setq file-cache-alist
+          (cons new-entry (remove entry file-cache-alist)))))
+
+(defun helm-ff-file-cache-remove-file (_file)
+  "Remove marked files from `file-cache-alist.'"
+  (let ((mkd (helm-marked-candidates)))
+    (mapc 'helm-ff-file-cache-remove-file-1 mkd)))
+
+(defun helm-transform-file-cache (actions _candidate)
+  (let ((source (helm-get-current-source)))
+    (if (string= (assoc-default 'name source) "File Cache")
+        (append actions
+                '(("Remove marked files from file-cache"
+                   . helm-ff-file-cache-remove-file)))
+        actions)))
+
+
+;;; File name history
+;;
+;;
+(defvar helm-source-file-name-history
+  (helm-build-sync-source "File Name History"
+    :candidates 'file-name-history
+    :persistent-action #'ignore
+    :filtered-candidate-transformer #'helm-file-name-history-transformer
+    :action 'helm-type-file-actions))
+
+(defvar helm-source--ff-file-name-history nil
+  "[Internal] This source is build to be used with `helm-find-files'.
+Don't use it in your own code unless you know what you are doing.")
+
+(defun helm-file-name-history-transformer (candidates _source)
+  (cl-loop for c in candidates collect
+        (cond ((file-remote-p c)
+               (cons (propertize c 'face 'helm-history-remote) c))
+              ((file-exists-p c)
+               (cons (propertize c 'face 'helm-ff-file) c))
+              (t (cons (propertize c 'face 'helm-history-deleted) c)))))
+
+(defun helm-ff-file-name-history ()
+  "Switch to `file-name-history' without quitting `helm-find-files'."
+  (interactive)
+  (unless helm-source--ff-file-name-history
+    (setq helm-source--ff-file-name-history
+          (helm-build-sync-source "File name history"
+            :init (lambda ()
+                    (with-helm-alive-p
+                      (when helm-ff-file-name-history-use-recentf
+                        (require 'recentf)
+                        (or recentf-mode (recentf-mode 1)))))
+            :candidates (lambda ()
+                          (if helm-ff-file-name-history-use-recentf
+                              recentf-list
+                              file-name-history))
+            :fuzzy-match t
+            :persistent-action 'ignore
+            :migemo t
+            :filtered-candidate-transformer 'helm-file-name-history-transformer
+            :action (helm-make-actions
+                     "Find file" (lambda (candidate)
+                                   (helm-set-pattern
+                                    (expand-file-name candidate))
+                                   (with-helm-after-update-hook (helm-exit-minibuffer)))
+                     "Find file in helm" (lambda (candidate)
+                                           (helm-set-pattern
+                                            (expand-file-name candidate)))))))
+  (with-helm-alive-p
+    (helm :sources 'helm-source--ff-file-name-history
+          :buffer "*helm-file-name-history*"
+          :allow-nest t
+          :resume 'noresume)))
+(put 'helm-ff-file-name-history 'helm-only t)
+
+;;; Recentf files
+;;
+;;
+(defvar helm-recentf--basename-flag nil)
+
+(defun helm-recentf-pattern-transformer (pattern)
+  (let ((pattern-no-flag (replace-regexp-in-string " -b" "" pattern)))
+    (cond ((and (string-match " " pattern-no-flag)
+                (string-match " -b\\'" pattern))
+           (setq helm-recentf--basename-flag t)
+           pattern-no-flag)
+        ((string-match "\\([^ ]*\\) -b\\'" pattern)
+         (prog1 (match-string 1 pattern)
+           (setq helm-recentf--basename-flag t)))
+        (t (setq helm-recentf--basename-flag nil)
+           pattern))))
+
+(defclass helm-recentf-source (helm-source-sync helm-type-file)
+  ((init :initform (lambda ()
+                     (require 'recentf)
+                     (recentf-mode 1)))
+   (candidates :initform (lambda () recentf-list))
+   (pattern-transformer :initform 'helm-recentf-pattern-transformer)
+   (match-part :initform (lambda (candidate)
+                           (if (or helm-ff-transformer-show-only-basename
+                                   helm-recentf--basename-flag)
+                               (helm-basename candidate) candidate)))
+   (migemo :initform t)
+   (persistent-action :initform 'helm-ff-kill-or-find-buffer-fname)))
+
+(defmethod helm--setup-source :after ((source helm-recentf-source))
+  (set-slot-value
+   source 'action
+   (append (symbol-value (helm-actions-from-type-file))
+           '(("Delete file(s) from recentf" .
+              (lambda (_candidate)
+                (cl-loop for file in (helm-marked-candidates)
+                         do (setq recentf-list (delq file recentf-list)))))))))
+
+(defvar helm-source-recentf nil 
+  "See (info \"(emacs)File Conveniences\").
+Set `recentf-max-saved-items' to a bigger value if default is too small.")
+
+(defcustom helm-recentf-fuzzy-match nil
+  "Enable fuzzy matching in `helm-source-recentf' when non--nil."
+  :group 'helm-files
+  :type 'boolean
+  :set (lambda (var val)
+         (set var val)
+         (setq helm-source-recentf
+               (helm-make-source "Recentf" 'helm-recentf-source
+                 :fuzzy-match helm-recentf-fuzzy-match))))
+
+;;; Browse project
+;; Need dependencies:
+;; <https://github.com/emacs-helm/helm-ls-git>
+;; <https://github.com/emacs-helm/helm-ls-hg>
+;; Only hg and git are supported for now.
+(defvar helm--browse-project-cache (make-hash-table :test 'equal))
+
+(defun helm-browse-project-get-buffers (root-directory)
+  (cl-loop for b in (helm-buffer-list)
+           ;; FIXME: Why default-directory is root-directory
+           ;; for current-buffer when coming from helm-quit-and-find-file.
+           for cd = (with-current-buffer b default-directory)
+           for bn = (buffer-file-name (get-buffer b))
+           if (or (and bn (file-in-directory-p bn root-directory))
+                  (and (null bn)
+                       (file-in-directory-p cd root-directory)))
+           collect b))
+
+(defun helm-browse-project-build-buffers-source (directory)
+  (helm-make-source "Buffers in project" 'helm-source-buffers
+    :header-name (lambda (name)
+                   (format
+                    "%s (%s)"
+                    name (abbreviate-file-name directory)))
+    :buffer-list (lambda () (helm-browse-project-get-buffers directory))))
+
+(defun helm-browse-project-find-files (directory &optional refresh)
+  (when refresh (remhash directory helm--browse-project-cache))
+  (unless (gethash directory helm--browse-project-cache)
+    (puthash directory (helm-walk-directory
+                        directory
+                        :directories nil :path 'full :skip-subdirs t)
+             helm--browse-project-cache))
+  (helm :sources `(,(helm-browse-project-build-buffers-source directory)
+                   ,(helm-build-in-buffer-source "Browse project"
+                     :data (gethash directory helm--browse-project-cache)
+                     :header-name (lambda (name)
+                                    (format
+                                     "%s (%s)"
+                                     name (abbreviate-file-name directory)))
+                     :match-part (lambda (c)
+                                   (if helm-ff-transformer-show-only-basename
+                                       (helm-basename c) c))
+                     :filter-one-by-one
+                     (lambda (c)
+                       (if helm-ff-transformer-show-only-basename
+                           (cons (propertize (helm-basename c)
+                                             'face 'helm-ff-file)
+                                 c)
+                           (propertize c 'face 'helm-ff-file)))
+                     :keymap helm-generic-files-map
+                     :action 'helm-type-file-actions)) 
+        :buffer "*helm browse project*"))
+
+;;;###autoload
+(defun helm-browse-project (arg)
+  "Preconfigured helm to browse projects.
+Browse files and see status of project with its vcs.
+Only HG and GIT are supported for now.
+Fall back to `helm-browse-project-find-files'
+if current directory is not under control of one of those vcs.
+With a prefix ARG browse files recursively, with two prefix ARG
+rebuild the cache.
+If the current directory is found in the cache, start
+`helm-browse-project-find-files' even with no prefix ARG.
+NOTE: The prefix ARG have no effect on the VCS controlled directories.
+
+Needed dependencies for VCS:
+<https://github.com/emacs-helm/helm-ls-git>
+and
+<https://github.com/emacs-helm/helm-ls-hg>
+and
+<http://melpa.org/#/helm-ls-svn>."
+  (interactive "P")
+  (cond ((and (require 'helm-ls-git nil t)
+              (fboundp 'helm-ls-git-root-dir)
+              (helm-ls-git-root-dir))
+         (helm-ls-git-ls))
+        ((and (require 'helm-ls-hg nil t)
+              (fboundp 'helm-hg-root)
+              (helm-hg-root))
+         (helm-hg-find-files-in-project))
+        ((and (require 'helm-ls-svn nil t)
+              (fboundp 'helm-ls-svn-root-dir)
+              (helm-ls-svn-root-dir))
+         (helm-ls-svn-ls))
+        (t (let ((cur-dir (helm-browse-project-get--root-dir
+                           (helm-current-directory))))
+             (if (or arg (gethash cur-dir helm--browse-project-cache))
+                 (helm-browse-project-find-files cur-dir (equal arg '(16)))
+                 (helm :sources (helm-browse-project-build-buffers-source cur-dir)
+                       :buffer "*helm browse project*"))))))
+
+(defun helm-browse-project-get--root-dir (directory)
+  (cl-loop with dname = (file-name-as-directory directory)
+           while (and dname (not (gethash dname helm--browse-project-cache)))
+           if (file-remote-p dname)
+           do (setq dname nil) else
+           do (setq dname (helm-basedir (substring dname 0 (1- (length dname)))))
+           finally return (or dname (file-name-as-directory directory))))
+
+(defun helm-ff-browse-project (_candidate)
+  "Browse project in current directory.
+See `helm-browse-project'."
+  (with-helm-default-directory helm-ff-default-directory
+      (helm-browse-project helm-current-prefix-arg)))
+
+(defun helm-ff-run-browse-project ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-browse-project)))
+(put 'helm-ff-run-browse-project 'helm-only t)
+
+(defun helm-ff-gid (_candidate)
+  (with-helm-default-directory helm-ff-default-directory
+      (helm-gid)))
+
+(defun helm-ff-run-gid ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-gid)))
+(put 'helm-ff-run-gid 'helm-only t)
+
+;;; session.el files
+;;
+;;  session (http://emacs-session.sourceforge.net/) is an alternative to
+;;  recentf that saves recent file history and much more.
+(defvar session-file-alist)
+(defvar helm-source-session
+  (helm-build-sync-source "Session"
+    :candidates (lambda ()
+                  (cl-delete-if-not (lambda (f)
+                                        (or (string-match helm-tramp-file-name-regexp f)
+                                            (file-exists-p f)))
+                                    (mapcar 'car session-file-alist)))
+    :keymap helm-generic-files-map
+    :help-message helm-generic-file-help-message
+    :action 'helm-type-file-actions)
+  "File list from emacs-session.")
+
+
+;;; Files in current dir
+;;
+;;
+(defun helm-highlight-files (files)
+  "A basic transformer for helm files sources.
+Colorize only symlinks, directories and files."
+  (cl-loop for i in files
+        for disp = (if (and helm-ff-transformer-show-only-basename
+                            (not (helm-dir-is-dot i))
+                            (not (and ffap-url-regexp
+                                      (string-match ffap-url-regexp i)))
+                            (not (string-match helm-ff-url-regexp i)))
+                       (helm-basename i) i)
+        for type = (and (null helm-ff-tramp-not-fancy)
+                        (car (file-attributes i)))
+        collect
+        (cond ((and helm-ff-tramp-not-fancy
+                    (string-match helm-tramp-file-name-regexp i))
+               (cons disp i))
+              ((stringp type)
+               (cons (propertize disp
+                                 'face 'helm-ff-symlink
+                                 'help-echo (expand-file-name i))
+                     i))
+              ((eq type t)
+               (cons (propertize disp
+                                 'face 'helm-ff-directory
+                                 'help-echo (expand-file-name i))
+                     i))
+              (t (cons (propertize disp
+                                   'face 'helm-ff-file
+                                   'help-echo (expand-file-name i))
+                       i)))))
+
+(defclass helm-files-in-current-dir-source (helm-source-sync helm-type-file)
+  ((candidates :initform (lambda ()
+                           (with-helm-current-buffer
+                             (let ((dir (helm-current-directory)))
+                               (when (file-accessible-directory-p dir)
+                                 (directory-files dir t))))))
+   (pattern-transformer :initform 'helm-recentf-pattern-transformer)
+   (match-part :initform (lambda (candidate)
+                           (if (or helm-ff-transformer-show-only-basename
+                                   helm-recentf--basename-flag)
+                               (helm-basename candidate) candidate)))
+   (fuzzy-match :initform t)
+   (migemo :initform t)))
+
+(defvar helm-source-files-in-current-dir
+  (helm-make-source "Files from Current Directory"
+      helm-files-in-current-dir-source))
+
+
+;;; External searching file tools.
+;;
+;; Tracker desktop search
+(defvar helm-source-tracker-cand-incomplete nil "Contains incomplete candidate")
+(defun helm-source-tracker-transformer (candidates _source)
+  (helm-log "received: %S" candidates)
+  (cl-loop for cand in candidates
+           for path = (when (stringp helm-source-tracker-cand-incomplete)
+                        (caar (helm-highlight-files
+                               (list helm-source-tracker-cand-incomplete))))
+           for built = (if (not (stringp cand)) cand
+                         (let ((snippet cand))
+                           (unless (or (null path)
+                                      (string= "" path)
+                                      (not (string-match-p
+                                          "\\`[[:space:]]*\\.\\.\\."
+                                          snippet)))
+                             (let ((complete-candidate
+                                    (cons (concat path "\n" snippet) path)))
+                               (setq helm-source-tracker-cand-incomplete nil)
+                               (helm-log "built: %S" complete-candidate)
+                               complete-candidate))))
+           when (and (stringp cand)
+                   (string-match "\\`[[:space:]]*file://" cand))
+           do (setq helm-source-tracker-cand-incomplete ; save path
+                    (replace-match "" t t cand)) end
+           collect built))
+
+(defvar helm-source-tracker-search
+  (helm-build-async-source "Tracker Search"
+    :candidates-process
+     (lambda ()
+       (start-process "tracker-search-process" nil
+                      "tracker-search"
+                      "--disable-color"
+                      "--limit=512"
+                      helm-pattern))
+    :filtered-candidate-transformer #'helm-source-tracker-transformer
+    ;;(multiline) ; https://github.com/emacs-helm/helm/issues/529
+    :keymap helm-generic-files-map
+    :action 'helm-type-file-actions
+    :action-transformer '(helm-transform-file-load-el
+                          helm-transform-file-browse-url)
+    :requires-pattern 3)
+  "Source for retrieving files matching the current input pattern
+with the tracker desktop search.")
+
+;; Spotlight (MacOS X desktop search)
+(defclass helm-mac-spotlight-source (helm-source-async helm-type-file)
+  ((candidates-process :initform
+                       (lambda ()
+                         (start-process
+                          "mdfind-process" nil "mdfind" helm-pattern)))
+   (requires-pattern :initform 3)))
+
+(defvar helm-source-mac-spotlight
+  (helm-make-source "mdfind" helm-mac-spotlight-source)
+  "Source for retrieving files via Spotlight's command line
+utility mdfind.")
+
+
+;;; Findutils
+;;
+;;
+(defvar helm-source-findutils
+  (helm-build-async-source "Find"
+    :header-name (lambda (name)
+                   (concat name " in [" (helm-default-directory) "]"))
+    :candidates-process 'helm-find-shell-command-fn
+    :filtered-candidate-transformer 'helm-findutils-transformer
+    :action-transformer 'helm-transform-file-load-el
+    :persistent-action 'helm-ff-kill-or-find-buffer-fname
+    :action 'helm-type-file-actions
+    :keymap helm-generic-files-map
+    :candidate-number-limit 9999
+    :requires-pattern 3))
+
+(defun helm-findutils-transformer (candidates _source)
+  (let (non-essential
+        (default-directory (helm-default-directory)))
+    (cl-loop for i in candidates
+             for abs = (expand-file-name
+                        (helm-aif (file-remote-p default-directory)
+                            (concat it i) i))
+             for type = (car (file-attributes abs))
+             for disp = (if (and helm-ff-transformer-show-only-basename
+                                 (not (string-match "[.]\\{1,2\\}$" i)))
+                            (helm-basename abs) abs)
+             collect (cond ((eq t type)
+                            (cons (propertize disp 'face 'helm-ff-directory)
+                                  abs))
+                           ((stringp type)
+                            (cons (propertize disp 'face 'helm-ff-symlink)
+                                  abs))
+                           (t (cons (propertize disp 'face 'helm-ff-file)
+                                    abs))))))
+
+(defun helm-find--build-cmd-line ()
+  (require 'find-cmd)
+  (let* ((default-directory (or (file-remote-p default-directory 'localname)
+                                default-directory))
+         (patterns+options (split-string helm-pattern "\\(\\`\\| +\\)\\* +"))
+         (fold-case (helm-set-case-fold-search (car patterns+options)))
+         (patterns (split-string (car patterns+options)))
+         (additional-options (and (cdr patterns+options)
+                                  (list (concat (cadr patterns+options) " "))))
+         (ignored-dirs ())
+         (ignored-files (when helm-findutils-skip-boring-files
+                          (cl-loop for f in completion-ignored-extensions
+                                   if (string-match "/$" f)
+                                   do (push (replace-match "" nil t f)
+                                            ignored-dirs)
+                                   else collect (concat "*" f))))
+         (path-or-name (if helm-findutils-search-full-path
+                           '(ipath path) '(iname name)))
+         (name-or-iname (if fold-case
+                            (car path-or-name) (cadr path-or-name))))
+    (find-cmd (and ignored-dirs
+                   `(prune (name ,@ignored-dirs)))
+              (and ignored-files
+                   `(not (name ,@ignored-files)))
+              `(and ,@(mapcar
+                       (lambda (pattern)
+                         `(,name-or-iname ,(concat "*" pattern "*")))
+                       patterns)
+                    ,@additional-options))))
+
+(defun helm-find-shell-command-fn ()
+  "Asynchronously fetch candidates for `helm-find'.
+Additional find options can be specified after a \"*\"
+separator."
+  (let* (process-connection-type
+         non-essential
+         (cmd (helm-find--build-cmd-line))
+         (proc (start-file-process-shell-command "hfind" helm-buffer cmd)))
+    (helm-log "Find command:\n%s" cmd)
+    (prog1 proc
+      (set-process-sentinel
+       proc
+       (lambda (process event)
+           (helm-process-deferred-sentinel-hook
+            process event (helm-default-directory))
+           (if (string= event "finished\n")
+               (with-helm-window
+                 (setq mode-line-format
+                       '(" " mode-line-buffer-identification " "
+                         (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                         (:eval (propertize
+                                 (format "[Find process finished - (%s results)]" 
+                                         (max (1- (count-lines
+                                                   (point-min) (point-max)))
+                                              0))
+                                 'face 'helm-locate-finish))))
+                 (force-mode-line-update))
+               (helm-log "Error: Find %s"
+                         (replace-regexp-in-string "\n" "" event))))))))
+
+(defun helm-find-1 (dir)
+  (let ((default-directory (file-name-as-directory dir)))
+    (helm :sources 'helm-source-findutils
+          :buffer "*helm find*"
+          :ff-transformer-show-only-basename nil
+          :case-fold-search helm-file-name-case-fold-search)))
+
+;; helm-find-files integration.
+(defun helm-ff-find-sh-command (_candidate)
+  "Run `helm-find' from `helm-find-files'."
+  (helm-find-1 helm-ff-default-directory))
+
+(defun helm-ff-run-find-sh-command ()
+  "Run find shell command action with key from `helm-find-files'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-ff-find-sh-command)))
+(put 'helm-ff-run-find-sh-command 'helm-only t)
+
+
+;;; Preconfigured commands
+;;
+;;
+;;;###autoload
+(defun helm-find (arg)
+  "Preconfigured `helm' for the find shell command."
+  (interactive "P")
+  (let ((directory
+         (if arg
+             (file-name-as-directory
+              (read-directory-name "DefaultDirectory: "))
+           default-directory)))
+    (helm-find-1 directory)))
+
+(defvar org-directory)
+;;;###autoload
+(defun helm-find-files (arg)
+  "Preconfigured `helm' for helm implementation of `find-file'.
+Called with a prefix arg show history if some.
+Don't call it from programs, use `helm-find-files-1' instead.
+This is the starting point for nearly all actions you can do on files."
+  (interactive "P")
+  (let* ((hist            (and arg helm-ff-history (helm-find-files-history)))
+         (default-input   (or hist (helm-find-files-initial-input)))
+         (input           (cond ((and (eq major-mode 'org-agenda-mode)
+                                      org-directory
+                                      (not default-input))
+                                 (expand-file-name org-directory))
+                                ((and (eq major-mode 'dired-mode) default-input)
+                                 (file-name-directory default-input))
+                                ((and (not (string= default-input ""))
+                                      default-input))
+                                (t (expand-file-name (helm-current-directory)))))
+         (input-as-presel (null (nth 0 (file-attributes input))))
+         (presel          (helm-aif (or hist
+                                        (and input-as-presel input)
+                                        (buffer-file-name (current-buffer))
+                                        (and (eq major-mode 'dired-mode)
+                                             default-input))
+                              (if helm-ff-transformer-show-only-basename
+                                  (helm-basename it) it))))
+    (set-text-properties 0 (length input) nil input)
+    (helm-find-files-1 input (and presel (concat "^" (regexp-quote presel))))))
+
+;;;###autoload
+(defun helm-for-files ()
+  "Preconfigured `helm' for opening files.
+Run all sources defined in `helm-for-files-preferred-list'."
+  (interactive)
+  (unless helm-source-buffers-list
+    (setq helm-source-buffers-list
+          (helm-make-source "Buffers" 'helm-source-buffers)))
+  (helm :sources helm-for-files-preferred-list
+        :ff-transformer-show-only-basename nil
+        :buffer "*helm for files*"))
+
+;;;###autoload
+(defun helm-multi-files ()
+  "Preconfigured helm similar to `helm-for-files' but that don't run locate.
+Allow toggling from locate to others sources.
+This allow seeing first if what you search is in other sources before launching
+locate."
+  (interactive)
+  (unless helm-source-buffers-list
+    (setq helm-source-buffers-list
+          (helm-make-source "Buffers" 'helm-source-buffers)))
+  (setq helm-multi-files--toggle-locate nil)
+  (let ((sources (remove 'helm-source-locate helm-for-files-preferred-list))
+        (old-key (lookup-key
+                  helm-map
+                  (read-kbd-macro helm-multi-files-toggle-locate-binding))))
+    (with-helm-temp-hook 'helm-after-initialize-hook
+      (define-key helm-map (kbd helm-multi-files-toggle-locate-binding)
+        'helm-multi-files-toggle-to-locate))
+    (unwind-protect
+         (helm :sources sources
+               :ff-transformer-show-only-basename nil
+               :buffer "*helm multi files*")
+      (define-key helm-map (kbd helm-multi-files-toggle-locate-binding)
+        old-key))))
+
+;;;###autoload
+(defun helm-recentf ()
+  "Preconfigured `helm' for `recentf'."
+  (interactive)
+  (helm :sources 'helm-source-recentf
+        :ff-transformer-show-only-basename nil
+        :buffer "*helm recentf*"))
+
+(provide 'helm-files)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-files.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-font.el b/emacs.d/elpa/helm-20160115.2200/helm-font.el
new file mode 100644
index 0000000..551cd7b
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-font.el
@@ -0,0 +1,183 @@
+;;; helm-font --- Font and ucs selection for Helm -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+
+(defvar helm-ucs-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "<C-backspace>") 'helm-ucs-persistent-delete)
+    (define-key map (kbd "<C-left>")      'helm-ucs-persistent-backward)
+    (define-key map (kbd "<C-right>")     'helm-ucs-persistent-forward)
+    (define-key map (kbd "<C-return>")    'helm-ucs-persistent-insert)
+    map)
+  "Keymap for `helm-ucs'.")
+
+
+;;; Xfont selection
+;;
+;;
+(defvar helm-xfonts-cache nil)
+(defvar helm-previous-font nil)
+(defvar helm-source-xfonts
+  (helm-build-sync-source "X Fonts"
+    :init (lambda ()
+            (unless helm-xfonts-cache
+              (setq helm-xfonts-cache
+                    (x-list-fonts "*")))
+            ;; Save current font so it can be restored in cleanup
+            (setq helm-previous-font (cdr (assoc 'font (frame-parameters)))))
+    :candidates 'helm-xfonts-cache
+    :action '(("Copy font to kill ring" . (lambda (elm)
+                                            (kill-new elm)))
+              ("Set font" . (lambda (elm)
+                              (kill-new elm)
+                              (set-frame-font elm 'keep-size)
+                              (message "Font copied to kill ring"))))
+    :cleanup (lambda ()
+               ;; Restore previous font
+               (set-frame-font helm-previous-font 'keep-size))
+    :persistent-action (lambda (new-font)
+                         (set-frame-font new-font 'keep-size)
+                         (kill-new new-font))
+    :persistent-help "Preview font and copy to kill-ring"))
+
+;;; 𝕌𝕔𝕤 𝕊𝕪𝕞𝕓𝕠𝕝 𝕔𝕠𝕞𝕡𝕝𝕖𝕥𝕚𝕠𝕟
+;;
+;;
+(defvar helm-ucs--max-len 0)
+(defvar helm-ucs--names nil)
+(defun helm-calculate-ucs-max-len ()
+  "Calculate the length of longest `ucs-names' candidate."
+  (cl-loop with count = 0
+        for (n . v) in (ucs-names)
+        for len = (length n)
+        if (> len count)
+        do (setq count len)
+        finally return count))
+
+(defun helm-ucs-init ()
+  "Initialize an helm buffer with ucs symbols.
+Only math* symbols are collected."
+  (unless (> helm-ucs--max-len 0)
+    (setq helm-ucs--max-len
+          (helm-calculate-ucs-max-len)))
+  (or helm-ucs--names
+      (setq helm-ucs--names
+            (cl-loop for (n . v) in (ucs-names)
+                     for len = (length n)
+                     for diff = (+ (- helm-ucs--max-len len) 2)
+                     unless (string= "" n)
+                     collect (format "%s:%s%c #x%x"
+                                     n (make-string diff ? ) v v)))))
+
+(defun helm-ucs-forward-char (_candidate)
+  (with-helm-current-buffer
+    (forward-char 1)))
+
+(defun helm-ucs-backward-char (_candidate)
+  (with-helm-current-buffer
+    (forward-char -1)))
+
+(defun helm-ucs-delete-backward (_candidate)
+  (with-helm-current-buffer
+    (delete-char -1)))
+
+(defun helm-ucs-insert (candidate n)
+  (with-helm-current-buffer
+    (string-match "^\\([^:]+\\): +\\(.\\) \\(#x[a-f0-9]+\\)$" candidate)
+    (insert (match-string n candidate))))
+
+(defun helm-ucs-insert-name (candidate)
+  (helm-ucs-insert candidate 1))
+
+(defun helm-ucs-insert-char (candidate)
+  (helm-ucs-insert candidate 2))
+
+(defun helm-ucs-insert-code (candidate)
+  (helm-ucs-insert candidate 3))
+
+(defun helm-ucs-persistent-insert ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'action-insert 'helm-ucs-insert-char)
+    (helm-execute-persistent-action 'action-insert)))
+(put 'helm-ucs-persistent-insert 'helm-only t)
+
+(defun helm-ucs-persistent-forward ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'action-forward 'helm-ucs-forward-char)
+    (helm-execute-persistent-action 'action-forward)))
+(put 'helm-ucs-persistent-forward 'helm-only t)
+
+(defun helm-ucs-persistent-backward ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'action-back 'helm-ucs-backward-char)
+    (helm-execute-persistent-action 'action-back)))
+(put 'helm-ucs-persistent-backward 'helm-only t)
+
+(defun helm-ucs-persistent-delete ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-attrset 'action-delete 'helm-ucs-delete-backward)
+    (helm-execute-persistent-action 'action-delete)))
+(put 'helm-ucs-persistent-delete 'helm-only t)
+
+(defvar helm-source-ucs
+  (helm-build-in-buffer-source "Ucs names"
+    :data #'helm-ucs-init
+    :help-message 'helm-ucs-help-message
+    :match-part (lambda (candidate) (car (split-string candidate ":")))
+    :filtered-candidate-transformer
+    (lambda (candidates _source) (sort candidates #'helm-generic-sort-fn))
+    :action '(("Insert character" . helm-ucs-insert-char)
+              ("Insert character name" . helm-ucs-insert-name)
+              ("Insert character code in hex" . helm-ucs-insert-code)
+              ("Forward char" . helm-ucs-forward-char)
+              ("Backward char" . helm-ucs-backward-char)
+              ("Delete char backward" . helm-ucs-delete-backward)))
+  "Source for collecting `ucs-names' math symbols.")
+
+;;;###autoload
+(defun helm-select-xfont ()
+  "Preconfigured `helm' to select Xfont."
+  (interactive)
+  (helm :sources 'helm-source-xfonts
+        :buffer "*helm select xfont*"))
+
+;;;###autoload
+(defun helm-ucs ()
+  "Preconfigured helm for `ucs-names' math symbols."
+  (interactive)
+  (helm :sources 'helm-source-ucs
+        :keymap  helm-ucs-map))
+
+(provide 'helm-font)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-font.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-grep.el b/emacs.d/elpa/helm-20160115.2200/helm-grep.el
new file mode 100644
index 0000000..f7df895
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-grep.el
@@ -0,0 +1,1330 @@
+;;; helm-grep.el --- Helm Incremental Grep. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-regexp)
+
+;;; load wgrep proxy if it's available
+(require 'wgrep-helm nil t)
+
+(declare-function helm-buffer-list "helm-buffers")
+(declare-function helm-elscreen-find-file "helm-elscreen" (file))
+(declare-function View-quit "view")
+(declare-function doc-view-goto-page "doc-view" (page))
+(declare-function helm-mm-split-pattern "helm-multi-match")
+(declare-function helm--ansi-color-apply "helm-lib")
+(defvar helm--ansi-color-regexp)
+
+
+(defgroup helm-grep nil
+  "Grep related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-grep-default-command
+  "grep --color=always -a -d skip %e -n%cH -e %p %f"
+  "Default grep format command for `helm-do-grep-1'.
+Where:
+'%e' format spec is for --exclude or --include grep options or
+     ack-grep --type option.               (Not mandatory)
+
+'%c' format spec is for case-fold-search,
+     whether to use the -i option of grep. (Not mandatory)
+     When you specify this spec, helm grep will use smartcase
+     that is when a upcase character is found in pattern case will
+     be respected and no '-i' option will be used, otherwise, when
+     no upcase character is found in pattern always use '-i'.
+     If you don't want this behavior, don't use this spec and
+     specify or not the '-i' option.
+     Note that with ack-grep this is not needed, just specify
+     the '--smart-case' option.
+
+'%p' format spec is for pattern.           (Mandatory)
+
+'%f' format spec is for filenames.         (Mandatory)
+
+If your grep version doesn't support the --exclude/include args
+don't specify the '%e' format spec.
+
+Helm also support ack-grep and git-grep ,
+here a default command example for ack-grep:
+
+\(setq helm-grep-default-command \"ack-grep -Hn --smart-case --no-group %e %p %f\"
+       helm-grep-default-recurse-command \"ack-grep -H --smart-case --no-group %e %p %f\")
+
+You can ommit the %e spec if you don't want to be prompted for types.
+
+NOTE: Helm for ack-grep support ANSI sequences, so you can remove
+the \"--no-color\" option safely (recommended).
+
+Same for grep you can use safely the option \"--color=always\" (default).
+You can customize the color of matches using GREP_COLORS env var.
+e.g: \(setenv \"GREP_COLORS\" \"ms=30;43:mc=30;43:sl=01;37:cx=:fn=35:ln=32:bn=32:se=36\")
+
+To enable ANSI color in git-grep just add \"--color=always\".
+To customize the ANSI color in git-grep, GREP_COLORS have no effect,
+you will have to setup this in your .gitconfig:
+
+    [color \"grep\"]
+        match = black yellow
+
+where \"black\" is the foreground and \"yellow\" the background.
+See the git documentation for more infos.
+
+`helm-grep-default-command' and `helm-grep-default-recurse-command'are
+independents, so you can enable `helm-grep-default-command' with ack-grep
+and `helm-grep-default-recurse-command' with grep if you want to be faster
+on recursive grep.
+
+NOTE: Remote grepping is not available with ack-grep,
+      and badly supported with grep because tramp handle badly
+      repeated remote processes in a short delay (< to 5s)."
+  :group 'helm-grep
+  :type  'string)
+
+(defcustom helm-grep-default-recurse-command
+  "grep --color=always -a -d recurse %e -n%cH -e %p %f"
+  "Default recursive grep format command for `helm-do-grep-1'.
+See `helm-grep-default-command' for format specs and infos about ack-grep."
+  :group 'helm-grep
+  :type  'string)
+
+(defcustom helm-default-zgrep-command
+  "zgrep --color=always -a -n%cH -e %p %f"
+  "Default command for Zgrep.
+See `helm-grep-default-command' for infos on format specs.
+Option --color=always is supported and can be used safely
+to replace the helm internal match highlighting,
+see `helm-grep-default-command' for more infos."
+  :group 'helm-grep
+  :type  'string)
+
+(defcustom helm-pdfgrep-default-command
+  "pdfgrep --color always -niH %s %s"
+  "Default command for pdfgrep.
+Option \"--color always\" is supported starting helm version 1.7.8,
+when used matchs will be highlighted according to GREP_COLORS env var."
+  :group 'helm-grep
+  :type  'string)
+
+(defcustom helm-grep-use-ioccur-style-keys t
+  "Use Arrow keys to jump to occurences."
+  :group 'helm-grep
+  :type  'boolean)
+
+(defcustom helm-pdfgrep-default-read-command nil
+  "Default command to read pdf files from pdfgrep.
+Where '%f' format spec is filename and '%p' is page number.
+e.g In Ubuntu you can set it to:
+
+    \"evince --page-label=%p '%f'\"
+
+If set to nil `doc-view-mode' will be used instead of an external command."
+  :group 'helm-grep
+  :type  'string)
+
+(defcustom helm-grep-max-length-history 100
+  "Max number of elements to save in `helm-grep-history'."
+  :group 'helm-grep
+  :type 'integer)
+
+(defcustom helm-zgrep-file-extension-regexp
+  ".*\\(\\.gz\\|\\.bz\\|\\.xz\\|\\.lzma\\)$"
+  "Default file extensions zgrep will search in."
+  :group 'helm-grep
+  :type 'string)
+
+(defcustom helm-grep-preferred-ext nil
+  "This file extension will be preselected for grep."
+  :group 'helm-grep
+  :type  'string)
+
+(defcustom helm-grep-save-buffer-name-no-confirm nil
+  "when *hgrep* already exists,auto append suffix."
+  :group 'helm-grep
+  :type 'boolean)
+
+(defcustom helm-grep-ignored-files
+  (cons ".#*" (delq nil (mapcar (lambda (s)
+                                  (unless (string-match-p "/\\'" s)
+                                    (concat "*" s)))
+                                completion-ignored-extensions)))
+  "List of file names which `helm-grep' shall exclude."
+  :group 'helm-grep
+  :type '(repeat string))
+
+(defcustom helm-grep-ignored-directories
+  helm-walk-ignore-directories
+  "List of names of sub-directories which `helm-grep' shall not recurse into."
+  :group 'helm-grep
+  :type '(repeat string))
+
+(defcustom helm-grep-truncate-lines t
+  "When nil the grep line that appears will not be truncated."
+  :group 'helm-grep
+  :type 'boolean)
+
+(defcustom helm-grep-file-path-style 'basename
+  "File path display style when grep results are displayed.
+Possible value are:
+    basename: displays only the filename, none of the directory path
+    absolute: displays absolute path
+    relative: displays relative path from root grep directory."
+  :group 'helm-grep
+  :type '(choice (const :tag "Basename" basename)
+                 (const :tag "Absolute" absolute)
+                 (const :tag "Relative" relative)))
+
+
+;;; Faces
+;;
+;;
+(defgroup helm-grep-faces nil
+  "Customize the appearance of helm-grep."
+  :prefix "helm-"
+  :group 'helm-grep
+  :group 'helm-faces)
+
+(defface helm-grep-match
+  '((((background light)) :foreground "#b00000")
+    (((background dark))  :foreground "gold1"))
+  "Face used to highlight grep matches."
+  :group 'helm-grep-faces)
+
+(defface helm-grep-file
+    '((t (:foreground "BlueViolet"
+          :underline t)))
+  "Face used to highlight grep results filenames."
+  :group 'helm-grep-faces)
+
+(defface helm-grep-lineno
+    '((t (:foreground "Darkorange1")))
+  "Face used to highlight grep number lines."
+  :group 'helm-grep-faces)
+
+(defface helm-grep-finish
+    '((t (:foreground "Green")))
+  "Face used in mode line when grep is finish."
+  :group 'helm-grep-faces)
+
+(defface helm-grep-cmd-line
+    '((t (:inherit diff-added)))
+  "Face used to highlight grep command line when no results."
+  :group 'helm-grep-faces)
+
+
+;;; Keymaps
+;;
+;;
+(defvar helm-grep-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
+    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
+    (define-key map (kbd "C-c o")    'helm-grep-run-other-window-action)
+    (define-key map (kbd "C-c C-o")  'helm-grep-run-other-frame-action)
+    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
+    (define-key map (kbd "C-x C-s")  'helm-grep-run-save-buffer)
+    (when helm-grep-use-ioccur-style-keys
+      (define-key map (kbd "<right>")  'helm-execute-persistent-action)
+      (define-key map (kbd "<left>")  'helm-grep-run-default-action))
+    (delq nil map))
+  "Keymap used in Grep sources.")
+
+(defvar helm-pdfgrep-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
+    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
+    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
+    map)
+  "Keymap used in pdfgrep.")
+
+(defvar helm-grep-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "RET")      'helm-grep-mode-jump)
+    (define-key map (kbd "C-o")      'helm-grep-mode-jump-other-window)
+    (define-key map (kbd "<C-down>") 'helm-grep-mode-jump-other-window-forward)
+    (define-key map (kbd "<C-up>")   'helm-grep-mode-jump-other-window-backward)
+    (define-key map (kbd "<M-down>") 'helm-gm-next-file)
+    (define-key map (kbd "<M-up>")   'helm-gm-precedent-file)
+    (define-key map (kbd "M-n")      'helm-grep-mode-jump-other-window-forward)
+    (define-key map (kbd "M-p")      'helm-grep-mode-jump-other-window-backward)
+    (define-key map (kbd "M-N")      'helm-gm-next-file)
+    (define-key map (kbd "M-P")      'helm-gm-precedent-file)
+    map))
+
+
+;;; Internals vars
+;;
+;;
+(defvar helm-rzgrep-cache (make-hash-table :test 'equal))
+(defvar helm-grep-default-function 'helm-grep-init)
+(defvar helm-zgrep-recurse-flag nil)
+(defvar helm-grep-history nil)
+(defvar helm-grep-last-targets nil)
+(defvar helm-grep-include-files nil)
+(defvar helm-grep-in-recurse nil)
+(defvar helm-grep-use-zgrep nil)
+(defvar helm-grep-default-directory-fn nil
+  "A function that should return a directory to expand candidate to.
+It is intended to use as a let-bound variable, DON'T set this globaly.")
+(defvar helm-pdfgrep-targets nil)
+(defvar helm-grep-last-cmd-line nil)
+(defvar helm-grep-split-line-regexp "^\\([[:lower:][:upper:]]?:?.*?\\):\\([0-9]+\\):\\(.*\\)")
+
+
+;;; Init
+;;
+;;
+(defun helm-grep-prepare-candidates (candidates in-directory)
+  "Prepare filenames and directories CANDIDATES for grep command line."
+  ;; If one or more candidate is a directory, search in all files
+  ;; of this candidate (e.g /home/user/directory/*).
+  ;; If r option is enabled search also in subdidrectories.
+  ;; We need here to expand wildcards to support crap windows filenames
+  ;; as grep doesn't accept quoted wildcards (e.g "dir/*.el").
+  (if helm-zgrep-recurse-flag
+      (mapconcat 'shell-quote-argument candidates " ")
+    ;; When candidate is a directory, search in all its files.
+    ;; NOTE that `file-expand-wildcards' will return also
+    ;; directories, they will be ignored by grep but not
+    ;; by ack-grep that will grep all files of this directory
+    ;; without recursing in their subdirs though, see that as a one
+    ;; level recursion with ack-grep.
+    ;; So I leave it as it is, considering it is a feature. [1]
+    (cl-loop for i in candidates append
+          (cond ((string-match "^git" helm-grep-default-command)
+                 (list i))
+                ;; Candidate is a directory and we use recursion or ack.
+                ((and (file-directory-p i)
+                      (or helm-grep-in-recurse
+                          ;; ack-grep accept directory [1].
+                          (helm-grep-use-ack-p)))
+                 (list (expand-file-name i)))
+                ;; Grep doesn't support directory only when not in recurse.
+                ((file-directory-p i)
+                 (file-expand-wildcards
+                  (concat (file-name-as-directory (expand-file-name i)) "*") t))
+                ;; Candidate is a file or wildcard and we use recursion, use the
+                ;; current directory instead of candidate.
+                ((and (or (file-exists-p i) (string-match "[*]" i))
+                      helm-grep-in-recurse)
+                 (list (expand-file-name
+                        (directory-file-name ; Needed for windoze.
+                         (file-name-directory (directory-file-name i))))))
+                ;; Else should be one or more file/directory
+                ;; possibly marked.
+                ;; When real is a normal filename without wildcard
+                ;; file-expand-wildcards returns a list of one file.
+                ;; wildcards should have been already handled by
+                ;; helm-read-file-name or helm-find-files but do it from
+                ;; here too in case we are called from elsewhere.
+                (t (file-expand-wildcards i t))) into all-files ; [1]
+          finally return
+          (let ((files (if (file-remote-p in-directory)
+                       ;; Grep don't understand tramp filenames
+                       ;; use the local name.
+                       (mapcar (lambda (x)
+                                   (file-remote-p x 'localname))
+                               all-files)
+                       all-files)))
+            (if (string-match "^git" helm-grep-default-command)
+                (mapconcat 'identity files " ")
+                (mapconcat 'shell-quote-argument files " "))))))
+
+(defun helm-grep-command (&optional recursive)
+  (let* ((com (if recursive
+                  helm-grep-default-recurse-command
+                  helm-grep-default-command))
+         (exe (and com (car (split-string com " ")))))
+    (if (and exe (string= exe "git")) "git-grep" exe)))
+
+(cl-defun helm-grep-use-ack-p (&key where)
+  (let* ((rec-com (helm-grep-command t))
+         (norm-com (helm-grep-command))
+         (norm-com-ack-p (string-match "\\`ack" norm-com))
+         (rec-com-ack-p (and rec-com (string-match "\\`ack" rec-com))))
+    (cl-case where
+      (default   (and norm-com norm-com-ack-p))
+      (recursive (and rec-com rec-com-ack-p))
+      (strict    (and norm-com rec-com rec-com-ack-p norm-com-ack-p))
+      (t         (and (not (and norm-com (string= norm-com "git-grep")))
+                      (or (and norm-com norm-com-ack-p)
+                          (and rec-com rec-com-ack-p)))))))
+
+(defun helm-grep--prepare-cmd-line (only-files &optional include zgrep)
+  (let* ((default-directory (or (helm-default-directory)
+                                (expand-file-name helm-ff-default-directory)))
+         (fnargs            (helm-grep-prepare-candidates
+                             only-files default-directory))
+         (ignored-files     (unless (helm-grep-use-ack-p)
+                              (mapconcat
+                               (lambda (x)
+                                   (concat "--exclude="
+                                           (shell-quote-argument x)))
+                               helm-grep-ignored-files " ")))
+         (ignored-dirs      (unless (helm-grep-use-ack-p)
+                              (mapconcat
+                               ;; Need grep version >=2.5.4
+                               ;; of Gnuwin32 on windoze.
+                               (lambda (x)
+                                   (concat "--exclude-dir="
+                                           (shell-quote-argument x)))
+                               helm-grep-ignored-directories " ")))
+         (exclude           (unless (helm-grep-use-ack-p)
+                              (if helm-grep-in-recurse
+                                  (concat (or include ignored-files)
+                                          " " ignored-dirs)
+                                ignored-files)))
+         (types             (and (helm-grep-use-ack-p)
+                                 ;; When %e format spec is not specified
+                                 ;; in `helm-grep-default-command'
+                                 ;; we need to pass an empty string
+                                 ;; to types to avoid error.
+                                 (or include "")))
+         (smartcase         (if (helm-grep-use-ack-p) ""
+                              (unless (let ((case-fold-search nil))
+                                        (string-match-p
+                                         "[[:upper:]]" helm-pattern)) "i"))))
+    (format-spec
+     helm-grep-default-command
+     (delq nil
+           (list (unless zgrep
+                   (if types
+                       (cons ?e types)
+                     (cons ?e exclude)))
+                 (cons ?c (or smartcase ""))
+                 (cons ?p (shell-quote-argument helm-pattern))
+                 (cons ?f fnargs))))))
+
+(defun helm-grep-init (cmd-line)
+  "Start an asynchronous grep process with CMD-LINE using ZGREP if non--nil."
+  (let* ((default-directory (or helm-ff-default-directory
+                                (helm-default-directory)))
+         (zgrep (string-match "\\`zgrep" cmd-line))
+         ;; Use pipe only with grep, zgrep or git-grep.
+         (process-connection-type (and (not zgrep) (helm-grep-use-ack-p)))
+         (tramp-verbose helm-tramp-verbose)
+         non-essential)
+    ;; Start grep process.
+    (helm-log "Starting Grep process in directory `%s'" default-directory)
+    (helm-log "Command line used was:\n\n%s"
+              (concat ">>> " (propertize cmd-line 'face 'helm-grep-cmd-line) "\n\n"))
+    (prog1            ; This function should return the process first.
+        (start-file-process-shell-command
+         "grep" helm-buffer cmd-line)
+      ;; Init sentinel.
+      (set-process-sentinel
+       (get-buffer-process helm-buffer)
+       (lambda (process event)
+           (let* ((err      (process-exit-status process))
+                  (noresult (= err 1)))
+             (unless err
+               (helm-process-deferred-sentinel-hook
+                process event (helm-default-directory)))
+             (cond ((and noresult
+                         ;; [FIXME] This is a workaround for zgrep
+                         ;; that exit with code 1
+                         ;; after a certain amount of results.
+                         (not (with-helm-buffer helm-grep-use-zgrep)))
+                    (with-helm-buffer
+                      (insert (concat "* Exit with code 1, no result found,"
+                                      " Command line was:\n\n "
+                                      (propertize helm-grep-last-cmd-line
+                                                  'face 'helm-grep-cmd-line)))
+                      (setq mode-line-format
+                            '(" " mode-line-buffer-identification " "
+                              (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                              (:eval (propertize
+                                      (format
+                                       "[%s process finished - (no results)] "
+                                       (if helm-grep-use-zgrep
+                                           "Zgrep"
+                                         (capitalize
+                                          (if helm-grep-in-recurse
+                                              (helm-grep-command t)
+                                            (helm-grep-command)))))
+                                      'face 'helm-grep-finish))))))
+                   ((string= event "finished\n")
+                    (with-helm-window
+                      (setq mode-line-format
+                            '(" " mode-line-buffer-identification " "
+                              (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                              (:eval (propertize
+                                      (format
+                                       "[%s process finished - (%s results)] "
+                                       (if helm-grep-use-zgrep
+                                           "Zgrep"
+                                         (capitalize
+                                          (if helm-grep-in-recurse
+                                              (helm-grep-command t)
+                                            (helm-grep-command))))
+                                       (max (1- (count-lines
+                                                 (point-min)
+                                                 (point-max)))
+                                            0))
+                                      'face 'helm-grep-finish))))
+                      (force-mode-line-update)))
+                   ;; Catch error output in log.
+                   (t (helm-log
+                       "Error: %s %s"
+                       (if helm-grep-use-zgrep "Zgrep" "Grep")
+                       (replace-regexp-in-string "\n" "" event))))))))))
+
+(defun helm-grep-collect-candidates ()
+  (let ((cmd-line (helm-grep--prepare-cmd-line
+                   helm-grep-last-targets
+                   helm-grep-include-files
+                   helm-grep-use-zgrep)))
+    (set (make-local-variable 'helm-grep-last-cmd-line) cmd-line)
+    (funcall helm-grep-default-function cmd-line)))
+
+
+;;; Actions
+;;
+;;
+(defun helm-grep-action (candidate &optional where mark)
+  "Define a default action for `helm-do-grep' on CANDIDATE.
+WHERE can be one of other-window, elscreen, other-frame."
+  (let* ((split        (helm-grep-split-line candidate))
+         (lineno       (string-to-number (nth 1 split)))
+         (loc-fname        (or (with-current-buffer
+                                   (if (eq major-mode 'helm-grep-mode)
+                                       (current-buffer)
+                                       helm-buffer)
+                                 (get-text-property (point-at-bol) 'help-echo))
+                               (car split)))
+         (tramp-method (file-remote-p (or helm-ff-default-directory
+                                          default-directory) 'method))
+         (tramp-host   (file-remote-p (or helm-ff-default-directory
+                                          default-directory) 'host))
+         (tramp-prefix (concat "/" tramp-method ":" tramp-host ":"))
+         (fname        (if tramp-host
+                           (concat tramp-prefix loc-fname) loc-fname)))
+    (cl-case where
+      (other-window (find-file-other-window fname))
+      (elscreen     (helm-elscreen-find-file fname))
+      (other-frame  (find-file-other-frame fname))
+      (grep         (helm-grep-save-results-1))
+      (pdf          (if helm-pdfgrep-default-read-command
+                        (helm-pdfgrep-action-1 split lineno (car split))
+                      (find-file (car split)) (doc-view-goto-page lineno)))
+      (t            (find-file fname)))
+    (unless (or (eq where 'grep) (eq where 'pdf))
+      (helm-goto-line lineno))
+    (when mark
+      (set-marker (mark-marker) (point))
+      (push-mark (point) 'nomsg))
+    ;; Save history
+    (unless (or helm-in-persistent-action
+                (eq major-mode 'helm-grep-mode)
+                (string= helm-pattern ""))
+      (setq helm-grep-history
+            (cons helm-pattern
+                  (delete helm-pattern helm-grep-history)))
+      (when (> (length helm-grep-history)
+               helm-grep-max-length-history)
+        (setq helm-grep-history
+              (delete (car (last helm-grep-history))
+                      helm-grep-history))))))
+
+(defun helm-grep-persistent-action (candidate)
+  "Persistent action for `helm-do-grep'.
+With a prefix arg record CANDIDATE in `mark-ring'."
+  (if current-prefix-arg
+      (helm-grep-action candidate nil 'mark)
+    (helm-grep-action candidate))
+  (helm-highlight-current-line))
+
+(defun helm-grep-other-window (candidate)
+  "Jump to result in other window from helm grep."
+  (helm-grep-action candidate 'other-window))
+
+(defun helm-grep-other-frame (candidate)
+  "Jump to result in other frame from helm grep."
+  (helm-grep-action candidate 'other-frame))
+
+(defun helm-grep-jump-elscreen (candidate)
+  "Jump to result in elscreen from helm grep."
+  (helm-grep-action candidate 'elscreen))
+
+(defun helm-goto-next-or-prec-file (n)
+  "Go to next or precedent candidate file in helm grep/etags buffers.
+If N is positive go forward otherwise go backward."
+  (let* ((allow-mode (or (eq major-mode 'helm-grep-mode)
+                         (eq major-mode 'helm-moccur-mode)))
+         (sel (if allow-mode
+                  (buffer-substring (point-at-bol) (point-at-eol))
+                (helm-get-selection nil t)))
+         (current-line-list  (helm-grep-split-line sel))
+         (current-fname      (nth 0 current-line-list))
+         (bob-or-eof         (if (eq n 1) 'eobp 'bobp))
+         (mark-maybe (lambda ()
+                         (if allow-mode
+                             (ignore)
+                           (helm-mark-current-line)))))
+    (catch 'break
+      (while (not (funcall bob-or-eof))
+        (forward-line n) ; Go forward or backward depending of n value.
+        ;; Exit when current-fname is not matched or in `helm-grep-mode'
+        ;; the line is not a grep line i.e 'fname:num:tag'.
+        (setq sel (buffer-substring (point-at-bol) (point-at-eol)))
+        (unless (or (string= current-fname
+                             (car (helm-grep-split-line sel)))
+                    (and (eq major-mode 'helm-grep-mode)
+                         (not (get-text-property (point-at-bol) 'help-echo))))
+          (funcall mark-maybe)
+          (throw 'break nil))))
+    (cond ((and (> n 0) (eobp))
+           (re-search-backward ".")
+           (forward-line 0)
+           (funcall mark-maybe))
+          ((and (< n 0) (bobp))
+           (helm-aif (next-single-property-change (point-at-bol) 'help-echo)
+               (goto-char it)
+             (forward-line 1))
+           (funcall mark-maybe)))
+    (helm-log-run-hook 'helm-move-selection-after-hook)))
+
+;;;###autoload
+(defun helm-goto-precedent-file ()
+  "Go to precedent file in helm grep/etags buffers."
+  (interactive)
+  (with-helm-alive-p
+    (with-helm-window
+      (helm-goto-next-or-prec-file -1))))
+(put 'helm-goto-precedent-file 'helm-only t)
+
+;;;###autoload
+(defun helm-goto-next-file ()
+  "Go to precedent file in helm grep/etags buffers."
+  (interactive)
+  (with-helm-window
+    (helm-goto-next-or-prec-file 1)))
+
+(defun helm-grep-run-default-action ()
+  "Run grep default action from `helm-do-grep-1'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-grep-action)))
+(put 'helm-grep-run-default-action 'helm-only t)
+
+(defun helm-grep-run-other-window-action ()
+  "Run grep goto other window action from `helm-do-grep-1'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-grep-other-window)))
+(put 'helm-grep-run-other-window-action 'helm-only t)
+
+(defun helm-grep-run-other-frame-action ()
+  "Run grep goto other frame action from `helm-do-grep-1'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-grep-other-frame)))
+(put 'helm-grep-run-other-frame-action 'helm-only t)
+
+(defun helm-grep-run-save-buffer ()
+  "Run grep save results action from `helm-do-grep-1'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-grep-save-results)))
+(put 'helm-grep-run-save-buffer 'helm-only t)
+
+
+;;; helm-grep-mode
+;;
+;;
+(defun helm-grep-save-results (candidate)
+  (helm-grep-action candidate 'grep))
+
+(defun helm-grep-save-results-1 ()
+  "Save helm grep result in a `helm-grep-mode' buffer."
+  (let ((buf "*hgrep*")
+        new-buf)
+    (when (get-buffer buf)
+      (if helm-grep-save-buffer-name-no-confirm
+          (setq new-buf  (format "*hgrep|%s|-%s" helm-pattern
+                                 (format-time-string "%H-%M-%S*")))
+          (setq new-buf (helm-read-string "GrepBufferName: " buf))
+          (cl-loop for b in (helm-buffer-list)
+                   when (and (string= new-buf b)
+                             (not (y-or-n-p
+                                   (format "Buffer `%s' already exists overwrite? "
+                                           new-buf))))
+                   do (setq new-buf (helm-read-string "GrepBufferName: " "*hgrep "))))
+      (setq buf new-buf))
+    (with-current-buffer (get-buffer-create buf)
+      (setq buffer-read-only t)
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (insert "-*- mode: helm-grep -*-\n\n"
+                (format "Grep Results for `%s':\n\n" helm-pattern))
+        (save-excursion
+          (insert (with-current-buffer helm-buffer
+                    (goto-char (point-min)) (forward-line 1)
+                    (buffer-substring (point) (point-max))))))
+      (helm-grep-mode) (pop-to-buffer buf))
+    (message "Helm Grep Results saved in `%s' buffer" buf)))
+
+(define-derived-mode helm-grep-mode
+    special-mode "helm-grep"
+    "Major mode to provide actions in helm grep saved buffer.
+
+Special commands:
+\\{helm-grep-mode-map}"
+    (set (make-local-variable 'helm-grep-last-cmd-line)
+         (with-helm-buffer helm-grep-last-cmd-line))
+    (set (make-local-variable 'revert-buffer-function)
+         #'helm-grep-mode--revert-buffer-function))
+
+(defun helm-grep-mode--revert-buffer-function (&optional _ignore-auto _noconfirm)
+  (goto-char (point-min))
+  (re-search-forward "^Grep Results for" nil t)
+  (forward-line 0)
+  (when (re-search-forward "^$" nil t)
+    (forward-line 1))
+  (let ((inhibit-read-only t))
+    (delete-region (point) (point-max)))
+  (message "Reverting buffer...")
+  (set-process-sentinel
+   (start-file-process-shell-command
+    "hgrep"  (generate-new-buffer "*hgrep revert*") helm-grep-last-cmd-line)
+   (lambda (process event)
+     (when (string= event "finished\n")
+       (with-current-buffer (current-buffer)
+         (let ((inhibit-read-only t))
+           (save-excursion
+             (cl-loop for line in (with-current-buffer (process-buffer process)
+                                    (prog1 (split-string (buffer-string) "\n")
+                                      (kill-buffer)))
+                      when (string-match helm-grep-split-line-regexp line)
+                      do (insert (propertize
+                                  (car (helm-grep-filter-one-by-one line))
+                                  ;; needed for wgrep.
+                                  'helm-realvalue line)
+                                 "\n"))))
+         (message "Reverting buffer done"))))))
+
+(defun helm-gm-next-file ()
+  (interactive)
+  (helm-goto-next-or-prec-file 1))
+
+(defun helm-gm-precedent-file ()
+  (interactive)
+  (helm-goto-next-or-prec-file -1))
+
+(defun helm-grep-mode-jump ()
+  (interactive)
+  (helm-grep-action
+   (buffer-substring (point-at-bol) (point-at-eol))))
+
+(defun helm-grep-mode-jump-other-window-1 (arg)
+  (let ((candidate (buffer-substring (point-at-bol) (point-at-eol))))
+    (condition-case nil
+        (progn
+          (save-selected-window
+            (helm-grep-action candidate 'other-window)
+            (recenter))
+          (forward-line arg))
+      (error nil))))
+
+(defun helm-grep-mode-jump-other-window-forward ()
+  (interactive)
+  (helm-grep-mode-jump-other-window-1 1))
+
+(defun helm-grep-mode-jump-other-window-backward ()
+  (interactive)
+  (helm-grep-mode-jump-other-window-1 -1))
+
+(defun helm-grep-mode-jump-other-window ()
+  (interactive)
+  (let ((candidate (buffer-substring (point-at-bol) (point-at-eol))))
+    (condition-case nil
+        (helm-grep-action candidate 'other-window)
+      (error nil))))
+
+
+;;; ack-grep types
+;;
+;;
+(defun helm-grep-hack-types ()
+  "Return a list of known ack-grep types."
+  (with-temp-buffer
+    ;; "--help-types" works with both 1.96 and 2.1+, while
+    ;; "--help types" works only with 1.96 Issue #422.
+    ;; `helm-grep-command' should return the ack executable
+    ;; when this function is used in the right context
+    ;; i.e After checking is we are using ack-grep with
+    ;; `helm-grep-use-ack-p'.
+    (call-process (helm-grep-command t) nil t nil "--help-types")
+    (goto-char (point-min))
+    (cl-loop while (re-search-forward
+                    "^ *--\\(\\[no\\]\\)\\([^. ]+\\) *\\(.*\\)" nil t)
+             collect (cons (concat (match-string 2)
+                                   " [" (match-string 3) "]")
+                           (match-string 2))
+             collect (cons (concat "no" (match-string 2)
+                                   " [" (match-string 3) "]")
+                           (concat "no" (match-string 2))))))
+
+(defun helm-grep-ack-types-transformer (candidates _source)
+  (cl-loop for i in candidates
+        if (stringp i)
+        collect (rassoc i helm-grep-ack-types-cache)
+        else
+        collect i))
+
+(defvar helm-grep-ack-types-cache nil)
+(defun helm-grep-read-ack-type ()
+  "Select types for the '--type' argument of ack-grep."
+  (require 'helm-mode)
+  (require 'helm-adaptive)
+  (setq helm-grep-ack-types-cache (helm-grep-hack-types))
+  (let ((types (helm-comp-read
+                "Types: " helm-grep-ack-types-cache
+                :name "*Ack-grep types*"
+                :marked-candidates t
+                :must-match t
+                :fc-transformer '(helm-adaptive-sort
+                                  helm-grep-ack-types-transformer)
+                :buffer "*helm ack-types*")))
+    (mapconcat (lambda (type) (concat "--type=" type)) types " ")))
+
+
+;;; grep extensions
+;;
+;;
+(defun helm-grep-guess-extensions (files)
+  "Try to guess file extensions in FILES list when using grep recurse.
+These extensions will be added to command line with --include arg of grep."
+  (cl-loop with ext-list = (list helm-grep-preferred-ext "*")
+        with lst = (if (file-directory-p (car files))
+                       (directory-files
+                        (car files) nil
+                        directory-files-no-dot-files-regexp)
+                     files)
+        for i in lst
+        for ext = (file-name-extension i 'dot)
+        for glob = (and ext (not (string= ext ""))
+                        (concat "*" ext))
+        unless (or (not glob)
+                   (and glob-list (member glob glob-list))
+                   (and glob-list (member glob ext-list))
+                   (and glob-list (member glob helm-grep-ignored-files)))
+        collect glob into glob-list
+        finally return (delq nil (append ext-list glob-list))))
+
+(defun helm-grep-get-file-extensions (files)
+  "Try to return a list of file extensions to pass to '--include' arg of grep."
+  (let* ((all-exts (helm-grep-guess-extensions
+                    (mapcar 'expand-file-name files)))
+         (extensions (helm-comp-read "Search Only in: " all-exts
+                                     :marked-candidates t
+                                     :fc-transformer 'helm-adaptive-sort
+                                     :buffer "*helm grep exts*"
+                                     :name "*helm grep extensions*")))
+    (when (listp extensions) ; Otherwise it is empty string returned by C-RET.
+      ;; If extensions is a list of one string containing spaces,
+      ;; assume user entered more than one glob separated by space(s) and
+      ;; split this string to pass it later to mapconcat.
+      ;; e.g '("*.el *.py")
+      (cl-loop for i in extensions
+               append (split-string-and-unquote i " ")))))
+
+
+;;; Set up source
+;;
+;;
+(defvar helm-source-grep nil)
+(defun helm-do-grep-1 (targets &optional recurse zgrep exts default-input input)
+  "Launch grep on a list of TARGETS files.
+When RECURSE is given use -r option of grep and prompt user
+to set the --include args of grep.
+You can give more than one arg separated by space at prompt.
+e.g *.el *.py *.tex.
+From lisp use the EXTS argument as a list of extensions as above.
+If you are using ack-grep, you will be prompted for --type
+instead and EXTS will be ignored.
+If prompt is empty `helm-grep-ignored-files' are added to --exclude.
+Argument DEFAULT-INPUT is use as `default' arg of `helm' and INPUT
+is used as `input' arg of `helm', See `helm' docstring.
+ZGREP when non--nil use zgrep instead, without prompting for a choice
+in recurse, and ignoring EXTS, search being made on
+`helm-zgrep-file-extension-regexp'."
+  (when (and (helm-grep-use-ack-p)
+             helm-ff-default-directory
+             (file-remote-p helm-ff-default-directory))
+    (error "Error: Remote operation not supported with ack-grep."))
+  (let* (non-essential
+         (exts (and recurse
+                    ;; [FIXME] I could handle this from helm-walk-directory.
+                    (not zgrep) ; zgrep doesn't handle -r opt.
+                    (not (helm-grep-use-ack-p :where 'recursive))
+                    (or exts (helm-grep-get-file-extensions targets))))
+         (include-files (and exts
+                             (mapconcat (lambda (x)
+                                            (concat "--include="
+                                                    (shell-quote-argument x)))
+                                        (if (> (length exts) 1)
+                                            (remove "*" exts)
+                                          exts) " ")))
+         (types (and (not include-files)
+                     (not zgrep)
+                     recurse
+                     (helm-grep-use-ack-p :where 'recursive)
+                     ;; When %e format spec is not specified
+                     ;; ignore types and do not prompt for choice.
+                     (string-match "%e" helm-grep-default-command)
+                     (helm-grep-read-ack-type)))
+         (follow (and helm-follow-mode-persistent
+                      (assoc-default 'follow helm-source-grep))))
+    ;; When called as action from an other source e.g *-find-files
+    ;; we have to kill action buffer.
+    (when (get-buffer helm-action-buffer)
+      (kill-buffer helm-action-buffer))
+    ;; If `helm-find-files' haven't already started,
+    ;; give a default value to `helm-ff-default-directory'.
+    (unless helm-ff-default-directory
+      (setq helm-ff-default-directory default-directory))
+    ;; We need to store these vars locally
+    ;; to pass infos later to `helm-resume'.
+    (helm-set-local-variable 'helm-zgrep-recurse-flag (and recurse zgrep)
+                             'helm-grep-last-targets targets
+                             'helm-grep-include-files (or include-files types)
+                             'helm-grep-in-recurse recurse
+                             'helm-grep-use-zgrep zgrep
+                             'helm-grep-default-command
+                             (cond (zgrep helm-default-zgrep-command)
+                                   (recurse helm-grep-default-recurse-command)
+                                   ;; When resuming the local value of
+                                   ;; `helm-grep-default-command' is used, only git-grep
+                                   ;; should need this.
+                                   (t helm-grep-default-command)))
+    ;; Setup the source.
+    (setq helm-source-grep
+          (helm-build-async-source
+           (if zgrep "Zgrep" (capitalize (if recurse
+                                             (helm-grep-command t)
+                                             (helm-grep-command))))
+            :candidates-process 'helm-grep-collect-candidates
+            :filter-one-by-one 'helm-grep-filter-one-by-one
+            :keymap helm-grep-map
+            :nohighlight t
+            :nomark t
+            :candidate-number-limit 9999
+            :help-message 'helm-grep-help-message
+            :history 'helm-grep-history
+            :action (helm-make-actions
+                     "Find File" 'helm-grep-action
+                     "Find file other frame" 'helm-grep-other-frame
+                     (lambda () (and (locate-library "elscreen")
+                                     "Find file in Elscreen"))
+                     'helm-grep-jump-elscreen
+                     "Save results in grep buffer" 'helm-grep-save-results
+                     "Find file other window" 'helm-grep-other-window)
+            :persistent-action 'helm-grep-persistent-action
+            :persistent-help "Jump to line (`C-u' Record in mark ring)"
+            :requires-pattern 2
+            :follow follow))
+    (helm
+     :sources 'helm-source-grep
+     :buffer (format "*helm %s*" (if zgrep "zgrep" (helm-grep-command recurse)))
+     :default default-input
+     :input input
+     :keymap helm-grep-map
+     :history 'helm-grep-history
+     :truncate-lines helm-grep-truncate-lines)))
+
+
+
+;;; zgrep
+;;
+;;
+(defun helm-ff-zgrep-1 (flist recursive)
+  (unwind-protect
+       (let* ((def-dir (or helm-ff-default-directory
+                           default-directory))
+              (only    (if recursive
+                           (or (gethash def-dir helm-rzgrep-cache)
+                               (puthash
+                                def-dir
+                                (helm-walk-directory
+                                 def-dir
+                                 :directories nil
+                                 :path 'full
+                                 :match helm-zgrep-file-extension-regexp)
+                                helm-rzgrep-cache))
+                         flist)))
+         (helm-do-grep-1 only recursive 'zgrep))
+    (setq helm-zgrep-recurse-flag nil)))
+
+
+;;; transformers
+;;
+;;
+(defun helm-grep-split-line (line)
+  "Split a grep output line."
+  ;; The output of grep may send a truncated line in this chunk,
+  ;; so don't split until grep line is valid, that is
+  ;; once the second part of the line comes with next chunk
+  ;; send by process.
+  (when (string-match helm-grep-split-line-regexp line)
+    ;; Don't use split-string because buffer/file name or string
+    ;; may contain a ":".
+    (cl-loop for n from 1 to 3 collect (match-string n line))))
+
+(defun helm-grep--filter-candidate-1 (candidate &optional dir)
+  (let* ((root   (or dir (and helm-grep-default-directory-fn
+                              (funcall helm-grep-default-directory-fn))))
+         (ansi-p (string-match-p helm--ansi-color-regexp candidate))
+         (line   (if ansi-p (helm--ansi-color-apply candidate) candidate))
+         (split  (helm-grep-split-line line))
+         (fname  (if (and root split)
+                     (expand-file-name (car split) root)
+                   (car-safe split)))
+         (lineno (nth 1 split))
+         (str    (nth 2 split))
+         (display-fname (cl-ecase helm-grep-file-path-style
+                          (basename (and fname (file-name-nondirectory fname)))
+                          (absolute fname)
+                          (relative (and fname root
+                                         (file-relative-name fname root))))))
+    (if (and display-fname lineno str)
+        (cons (concat (propertize display-fname
+                                  'face 'helm-grep-file
+                                  'help-echo fname)
+                      ":"
+                      (propertize lineno 'face 'helm-grep-lineno)
+                      ":"
+                      (if ansi-p str (helm-grep-highlight-match str)))
+              line)
+        "")))
+
+(defun helm-grep-filter-one-by-one (candidate)
+  "`filter-one-by-one' transformer function for `helm-do-grep'."
+  (let ((helm-grep-default-directory-fn
+         (or helm-grep-default-directory-fn
+             (lambda () (or helm-ff-default-directory
+                            (helm-default-directory)
+                            default-directory)))))
+    (if (consp candidate)
+        ;; Already computed do nothing (default as input).
+        candidate
+        (and (stringp candidate)
+             (helm-grep--filter-candidate-1 candidate)))))
+
+(defun helm-grep-highlight-match (str &optional multi-match)
+  "Highlight in string STR all occurences matching `helm-pattern'."
+  (let (beg end)
+    (condition-case-unless-debug nil
+        (with-temp-buffer
+          (insert (propertize str 'read-only nil)) ; Fix (#1176)
+          (goto-char (point-min))
+          (cl-loop for reg in
+                   (if multi-match
+                       ;; (m)occur.
+                       (cl-loop for r in (helm-mm-split-pattern
+                                          helm-pattern)
+                                unless (string-match "\\`!" r)
+                                collect
+                                (helm-aif (and helm-migemo-mode
+                                               (assoc r helm-mm--previous-migemo-info))
+                                    (cdr it) r))
+                       ;; async sources (grep, gid etc...)
+                       (list helm-input))
+                   do
+                   (while (and (re-search-forward reg nil t)
+                               (> (- (setq end (match-end 0))
+                                     (setq beg (match-beginning 0))) 0))
+                     (add-text-properties beg end '(face helm-grep-match)))
+                   do (goto-char (point-min))) 
+          (buffer-string))
+      (error nil))))
+
+
+;;; Grep from buffer list
+;;
+;;
+(defun helm-grep-buffers-1 (candidate &optional zgrep)
+  "Run grep on all file--buffers or CANDIDATE if it is a file--buffer.
+If one of selected buffers is not a file--buffer,
+it is ignored and grep will run on all others file--buffers.
+If only one candidate is selected and it is not a file--buffer,
+switch to this buffer and run `helm-occur'.
+If a prefix arg is given run grep on all buffers ignoring non--file-buffers."
+  (let* ((prefarg (or current-prefix-arg helm-current-prefix-arg))
+         (helm-ff-default-directory
+          (if (and helm-ff-default-directory
+                   (file-remote-p helm-ff-default-directory))
+              default-directory
+            helm-ff-default-directory))
+         (cands (if prefarg
+                    (buffer-list)
+                  (helm-marked-candidates)))
+         (win-conf (current-window-configuration))
+         ;; Non--fname and remote buffers are ignored.
+         (bufs (cl-loop for buf in cands
+                     for fname = (buffer-file-name (get-buffer buf))
+                     when (and fname (not (file-remote-p fname)))
+                     collect (expand-file-name fname))))
+    (if bufs
+        (if zgrep
+            (helm-do-grep-1 bufs nil 'zgrep)
+          (helm-do-grep-1 bufs))
+      ;; bufs is empty, thats mean we have only CANDIDATE
+      ;; and it is not a buffer-filename, fallback to occur.
+      (switch-to-buffer candidate)
+      (when (get-buffer helm-action-buffer)
+        (kill-buffer helm-action-buffer))
+      (helm-occur)
+      (when (eq helm-exit-status 1)
+        (set-window-configuration win-conf)))))
+
+(defun helm-grep-buffers (candidate)
+  "Action to grep buffers."
+  (helm-grep-buffers-1 candidate))
+
+(defun helm-zgrep-buffers (candidate)
+  "Action to zgrep buffers."
+  (helm-grep-buffers-1 candidate 'zgrep))
+
+
+;;; Helm interface for pdfgrep
+;;  pdfgrep program <http://pdfgrep.sourceforge.net/>
+;;  and a pdf-reader (e.g xpdf) are needed.
+;;
+(defvar helm-pdfgrep-default-function 'helm-pdfgrep-init)
+(defun helm-pdfgrep-init (only-files)
+  "Start an asynchronous pdfgrep process in ONLY-FILES list."
+  (let* ((default-directory (or helm-ff-default-directory
+                                default-directory))
+         (fnargs   (helm-grep-prepare-candidates
+                    (if (file-remote-p default-directory)
+                        (mapcar (lambda (x)
+                                    (file-remote-p x 'localname))
+                                only-files)
+                      only-files)
+                    default-directory))
+         (cmd-line (format helm-pdfgrep-default-command
+                           helm-pattern
+                           fnargs))
+         process-connection-type)
+    ;; Start pdf grep process.
+    (helm-log "Starting Pdf Grep process in directory `%s'" default-directory)
+    (helm-log "Command line used was:\n\n%s"
+              (concat ">>> " (propertize cmd-line 'face 'helm-grep-cmd-line) "\n\n"))
+    (prog1
+        (start-file-process-shell-command
+         "pdfgrep" helm-buffer cmd-line)
+      (message nil)
+      (set-process-sentinel
+       (get-buffer-process helm-buffer)
+       (lambda (_process event)
+           (if (string= event "finished\n")
+               (with-helm-window
+                 (setq mode-line-format
+                       '(" " mode-line-buffer-identification " "
+                         (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                         (:eval (propertize
+                                 (format "[Pdfgrep Process Finish - %s result(s)] "
+                                         (max (1- (count-lines
+                                                   (point-min) (point-max))) 0))
+                                 'face 'helm-grep-finish))))
+                 (force-mode-line-update))
+             (helm-log "Error: Pdf grep %s"
+                       (replace-regexp-in-string "\n" "" event))))))))
+
+(defun helm-do-pdfgrep-1 (only)
+  "Launch pdfgrep with a list of ONLY files."
+  (unless (executable-find "pdfgrep")
+    (error "Error: No such program `pdfgrep'."))
+  (let* (helm-grep-in-recurse) ; recursion is never used in pdfgrep.
+    ;; When called as action from an other source e.g *-find-files
+    ;; we have to kill action buffer.
+    (when (get-buffer helm-action-buffer)
+      (kill-buffer helm-action-buffer))
+    (setq helm-pdfgrep-targets only)
+    (helm
+     :sources (helm-build-async-source "PdfGrep"
+                :init (lambda ()
+                        ;; If `helm-find-files' haven't already started,
+                        ;; give a default value to `helm-ff-default-directory'.
+                        (setq helm-ff-default-directory (or helm-ff-default-directory
+                                                            default-directory)))
+                :candidates-process (lambda ()
+                                      (funcall helm-pdfgrep-default-function helm-pdfgrep-targets))
+                :nohighlight t
+                :nomark t
+                :filter-one-by-one #'helm-grep-filter-one-by-one
+                :candidate-number-limit 9999
+                :history 'helm-grep-history
+                :keymap helm-pdfgrep-map
+                :help-message 'helm-pdfgrep-help-message
+                :action #'helm-pdfgrep-action
+                :persistent-help "Jump to PDF Page"
+                :requires-pattern 2)
+     :buffer "*helm pdfgrep*"
+     :history 'helm-grep-history)))
+
+(defun helm-pdfgrep-action (candidate)
+  (helm-grep-action candidate 'pdf))
+
+(defun helm-pdfgrep-action-1 (_split pageno fname)
+  (save-selected-window
+    (start-file-process-shell-command
+     "pdf-reader" nil
+     (format-spec helm-pdfgrep-default-read-command
+                  (list (cons ?f fname) (cons ?p pageno))))))
+
+;;; AG - AT
+;;
+;;  https://github.com/ggreer/the_silver_searcher
+;;  https://github.com/monochromegane/the_platinum_searcher
+
+(defcustom helm-grep-ag-command
+  "ag --line-numbers -S --hidden --color --nogroup %s %s"
+  "The default command for AG or PT.
+Takes two format specs, the first for pattern and the second for directory.
+
+You must use an output format that fit with helm grep, that is:
+
+    \"filename:line-number:string\"
+
+The option \"--nogroup\" allow this.
+The option \"--line-numbers\" is also mandatory except with PT (not supported).
+
+You can use safely \"--color\" (default)."
+  :group 'helm-grep
+  :type 'string)
+
+(defun helm-grep--ag-command ()
+  (car (split-string helm-grep-ag-command)))
+
+(defun helm-grep-ag-init (directory)
+  (let ((cmd-line (format helm-grep-ag-command
+                          (shell-quote-argument helm-pattern)
+                          (shell-quote-argument directory))))
+    (set (make-local-variable 'helm-grep-last-cmd-line) cmd-line)
+    (prog1
+        (start-process-shell-command
+         "ag" helm-buffer cmd-line)
+      (set-process-sentinel
+       (get-buffer-process helm-buffer)
+       (lambda (_process event)
+         (when (string= event "finished\n")
+           (with-helm-window
+             (setq mode-line-format
+                   '(" " mode-line-buffer-identification " "
+                     (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                     (:eval (propertize
+                             (format
+                              "[%s process finished - (%s results)] "
+                              (upcase (helm-grep--ag-command))
+                              (max (1- (count-lines
+                                        (point-min)
+                                        (point-max)))
+                                   0))
+                             'face 'helm-grep-finish))))
+             (force-mode-line-update))))))))
+
+(defvar helm-source-grep-ag nil)
+(defun helm-grep-ag-1 (directory)
+  (setq helm-source-grep-ag
+        (helm-build-async-source (upcase (helm-grep--ag-command))
+          :header-name (lambda (name)
+                         (format "%s [%s]"
+                                 name (abbreviate-file-name directory)))
+          :candidates-process
+          (lambda () (helm-grep-ag-init directory))
+          :nohighlight t
+          :keymap helm-grep-map
+          :help-message 'helm-grep-help-message
+          :filter-one-by-one 'helm-grep-filter-one-by-one
+          :persistent-action 'helm-grep-persistent-action
+          :candidate-number-limit 99999
+          :requires-pattern 2
+          :nomark t
+          :action (helm-make-actions
+                   "Find File" 'helm-grep-action
+                   "Find file other frame" 'helm-grep-other-frame
+                   (lambda () (and (locate-library "elscreen")
+                                   "Find file in Elscreen"))
+                   'helm-grep-jump-elscreen
+                   "Save results in grep buffer" 'helm-grep-save-results
+                   "Find file other window" 'helm-grep-other-window)))
+  (helm :sources 'helm-source-grep-ag
+        :keymap helm-grep-map
+        :truncate-lines helm-grep-truncate-lines
+        :buffer (format "*helm %s*" (helm-grep--ag-command))))
+
+;;; Git grep
+;;
+;;
+(defcustom helm-grep-git-grep-command
+  "git grep -n%cH --color=always --exclude-standard --no-index --full-name -e %p -- %f"
+  "The git grep default command line.
+The option \"--color=always\" can be used safely.
+The color of matched items can be customized in your .gitconfig
+See `helm-grep-default-command' for more infos.
+
+The \"--exclude-standard\" and \"--no-index\" switches allow
+skipping unwanted files specified in ~/.gitignore_global
+and searching files not already staged.
+You have also to enable this in global \".gitconfig\" with
+    \"git config --global core.excludesfile ~/.gitignore_global\"."
+  :group 'helm-grep
+  :type 'string)
+
+(defun helm-grep-git-1 (directory &optional all)
+  (require 'vc)
+  (let* ((helm-grep-default-command helm-grep-git-grep-command)
+         helm-grep-default-recurse-command
+         ;; Expand filename of each candidate with the git root dir.
+         ;; The filename will be in the help-echo prop.
+         (helm-grep-default-directory-fn (lambda ()
+                                           (vc-find-root directory ".git")))
+         (helm-ff-default-directory (funcall helm-grep-default-directory-fn)))
+    (cl-assert helm-ff-default-directory nil "Not inside a Git repository")
+    (helm-do-grep-1 (if all '("") `(,(expand-file-name directory))))))
+
+
+;;;###autoload
+(defun helm-do-grep-ag ()
+  "Preconfigured helm for grepping with AG in `default-directory'."
+  (interactive)
+  (helm-grep-ag-1 default-directory))
+
+;;;###autoload
+(defun helm-grep-do-git-grep (arg)
+  "Preconfigured helm for git-grepping `default-directory'.
+With a prefix arg ARG git-grep the whole repository."
+  (interactive "P")
+  (helm-grep-git-1 default-directory arg))
+
+
+(provide 'helm-grep)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-grep.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-help.el b/emacs.d/elpa/helm-20160115.2200/helm-help.el
new file mode 100644
index 0000000..edecf3a
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-help.el
@@ -0,0 +1,1433 @@
+;;; helm-help.el --- Help messages for Helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'helm)
+
+(defvar helm-org-headings--nofilename)
+(declare-function helm-source-org-headings-for-files "helm-org.el")
+
+
+(defgroup helm-help nil
+  "Embedded help for `helm'."
+  :group 'helm)
+
+(defface helm-helper
+    '((t :inherit helm-header))
+  "Face for helm help string in minibuffer."
+  :group 'helm-help)
+
+(defcustom helm-documentation-file "~/.emacs.d/helm-doc.org"
+  "The file where you want to save helm documentation."
+  :group 'helm-help
+  :type 'string)
+
+(defvar helm-help--string-list '(helm-help-message
+                                 helm-buffer-help-message
+                                 helm-ff-help-message
+                                 helm-read-file-name-help-message
+                                 helm-generic-file-help-message
+                                 helm-grep-help-message
+                                 helm-pdfgrep-help-message
+                                 helm-etags-help-message
+                                 helm-ucs-help-message
+                                 helm-bookmark-help-message
+                                 helm-esh-help-message
+                                 helm-buffers-ido-virtual-help-message
+                                 helm-moccur-help-message
+                                 helm-top-help-message
+                                 helm-apt-help-message
+                                 helm-el-package-help-message
+                                 helm-M-x-help-message
+                                 helm-imenu-help-message
+                                 helm-colors-help-message
+                                 helm-semantic-help-message
+                                 helm-kmacro-help-message))
+
+
+;;;###autoload
+(defun helm-documentation (arg)
+  "Preconfigured helm for helm documentation.
+With a prefix arg refresh the documentation.
+
+Find here the documentation of all sources actually documented."
+  (interactive "P")
+  (require 'helm-org)
+  (when arg (delete-file helm-documentation-file)
+        (helm-aif (get-file-buffer helm-documentation-file)
+            (kill-buffer it)))
+  (unless (file-exists-p helm-documentation-file)
+    (with-temp-file helm-documentation-file
+      (erase-buffer)
+      (cl-loop for elm in helm-help--string-list
+               for str = (symbol-value elm)
+               do (insert (substitute-command-keys
+                           (if (functionp str) (funcall str) str))
+                          "\n\n"))))
+  (let ((helm-org-headings--nofilename t))
+    (helm :sources (helm-source-org-headings-for-files
+                    (list helm-documentation-file))
+          :candidate-number-limit 99999
+          :buffer "*helm documentation*")))
+
+;;; Local help messages.
+
+;;; `helm-buffer-list' help
+;;
+;;
+(defvar helm-buffer-help-message
+  "* Helm Buffer
+
+** Tips
+
+*** Completion
+
+**** Major-mode
+
+You can enter a partial name of major-mode (e.g. lisp, sh) to narrow down buffers.
+To specify the major-mode, prefix it with \"*\" e.g. \"*lisp\".
+If you want to match all buffers but the ones with a specific major-mode (negation),
+prefix the major-mode with \"!\" e.g. \"*!lisp\".
+If you want to specify more than one major-mode, separate them with \",\",
+e.g. \"*!lisp,!sh,!fun\" will list all buffers but the ones in lisp-mode, sh-mode and
+fundamental-mode.
+
+Enter then a space and a pattern to narrow down to buffers matching this pattern.
+
+**** Search inside buffers
+
+If you enter a space and a pattern prefixed by \"@\" helm will search for text matching
+this pattern INSIDE the buffer (i.e not in the name of buffer).
+NOTE that if you enter your pattern prefixed with \"@\" but escaped, helm will search a buffer
+matching \"@pattern\" but will not search inside.
+
+**** Search by directory name
+
+If you prefix the beginning of pattern with \"/\" the match will occur on directory name
+of buffer, it is interesting to narrow down to one directory for example, subsequent string
+entered after a space will match on buffer-name only.
+Note that negation is not supported for matching on buffer-file-name.
+You can specify more than one directory starting from helm v1.6.8
+ 
+**** Fuzzy matching
+
+Note that if `helm-buffers-fuzzy-matching' is non--nil you will have
+fuzzy matching on buffer names (not on directory name matching and major-mode though).
+A pattern starting with \"^\" will disable fuzzy matching and will match by exact regexp.
+
+**** Examples
+
+if I enter in pattern prompt:
+
+    \"*lisp ^helm @moc\"
+
+helm will narrow down the list by selecting only buffers that are in lisp mode, start by helm
+and match \"moc\" in their contents.
+
+if I enter in pattern prompt:
+
+    \"*lisp ^helm moc\"
+
+Notice there is no \"@\" this time
+helm will look for lisp mode buffers starting by \"helm\" and have \"moc\" in their name.
+
+if I enter in pattern prompt:
+
+    \"*!lisp !helm\"
+
+helm will narrow down to buffers that are not in \"lisp\" mode and that do not match \"helm\"
+
+if I enter in pattern prompt:
+
+    /helm/ w3
+
+helm will narrow down to buffers that are in any \"helm\" subdirectory and matching w3.
+
+*** Creating buffers
+
+When creating a new buffer use \\[universal-argument] to choose a mode for your buffer in a list.
+This list is customizable, see `helm-buffers-favorite-modes'.
+
+*** Killing buffers
+
+You have a command to kill buffer(s) and quit emacs and a command to kill buffers one by one
+\(no marked\) without quitting helm.
+
+You can run this persistent kill buffer command either with the regular
+`helm-execute-persistent-action' called with a prefix arg (C-u C-j) or with its specific command
+`helm-buffer-run-kill-persistent' see binding below.
+
+*** Meaning of colors and prefixes for buffers
+
+Remote buffers are prefixed with '@'.
+Red        => Buffer have its file modified on disk by an external process.
+Indianred2 => Buffer exists but its file have been deleted.
+Orange     => Buffer is modified and its file not saved to disk.
+Italic     => A non--file buffer.
+
+** Commands
+\\<helm-buffer-map>
+\\[helm-buffer-run-zgrep]\t\tGrep Buffer(s) works as zgrep too (C-u grep all buffers but non--file buffers).
+\\[helm-buffers-run-multi-occur]\t\tMulti Occur buffer or marked buffers. (C-u toggle force searching current-buffer).
+\\[helm-buffer-switch-other-window]\t\tSwitch other window.
+\\[helm-buffer-switch-other-frame]\t\tSwitch other frame.
+\\[helm-buffer-run-query-replace-regexp]\t\tQuery replace regexp in marked buffers.
+\\[helm-buffer-run-query-replace]\t\tQuery replace in marked buffers.
+\\[helm-buffer-run-ediff]\t\tEdiff current buffer with candidate.  If two marked buffers ediff those buffers.
+\\[helm-buffer-run-ediff-merge]\t\tEdiff merge current buffer with candidate.  If two marked buffers ediff merge those buffers.
+\\[helm-buffer-diff-persistent]\t\tToggle Diff buffer with saved file without quitting.
+\\[helm-buffer-revert-persistent]\t\tRevert buffer without quitting.
+\\[helm-buffer-save-persistent]\t\tSave buffer without quitting.
+\\[helm-buffer-run-kill-buffers]\t\tDelete marked buffers and quit.
+\\[helm-buffer-run-kill-persistent]\t\tDelete buffer without quitting helm.
+\\[helm-toggle-all-marks]\t\tToggle all marks.
+\\[helm-mark-all]\t\tMark all.
+\\[helm-toggle-buffers-details]\t\tToggle details.
+\\[helm-buffers-toggle-show-hidden-buffers]\t\tShow hidden buffers.
+\\[helm-buffers-mark-similar-buffers]\t\tMark all buffers with same type (color) than current.")
+
+;;; Find files help (`helm-find-files')
+;;
+;;
+(defvar helm-ff-help-message
+  "* Helm Find Files
+
+** Tips
+
+*** Navigation summary
+
+For a better experience you can enable auto completion by setting
+`helm-ff-auto-update-initial-value' to non-nil in your init file.
+It is not enabled by default to not confuse new users.
+
+**** Use `C-j' (persistent action) on a directory to go down one level
+
+On a symlinked directory a prefix arg will allow expanding to its true name.
+
+**** Use `C-l' on a directory to go up one level
+
+**** Use `C-r' to walk back the resulting tree of all the `C-l' you did
+
+Note: The tree is reinitialized each time you enter a new tree with `C-j'
+or by entering some pattern in prompt.
+
+*** Find file at point
+
+Helm is using `ffap' partially or completely to find file at point
+depending on value of `helm-ff-guess-ffap-filenames'.
+You can use full `ffap' by setting this to non-nil (annoying).
+Default value is nil which make `ffap' working partially.
+
+**** Find file at number line
+
+With something like this at point:
+
+    ~/elisp/helm/helm.el:1234
+
+Helm will find this file at line number 1234.
+
+**** Find url at point
+
+When an url is found at point, helm expand to that url only.
+Pressing RET jump to that url using `browse-url-browser-function'.
+
+**** Find mail at point
+
+When a mail address is found at point helm expand to this email address
+prefixed by \"mailto:\". Pressing RET open a message buffer with this mail
+address.
+
+*** Quick pattern expansion
+
+**** Enter `~/' at end of pattern to quickly reach home directory
+
+**** Enter `/' at end of pattern to quickly reach root of your file system
+
+**** Enter `./' at end of pattern to quickly reach `default-directory' (initial start of session)
+
+If you are already in `default-directory' this will move cursor on top.
+
+**** Enter `../' at end of pattern will reach upper directory, moving cursor on top
+
+NOTE: This is different to using `C-l' in that `C-l' don't move cursor on top but stay on previous
+subdir name.
+
+**** Enter any environment var (e.g. `$HOME') at end of pattern, it will be expanded
+
+**** You can yank any valid filename after pattern, it will be expanded
+
+*** Helm find files is fuzzy matching (start on third char entered)
+
+e.g. \"fob\" or \"fbr\" will complete \"foobar\"
+but \"fb\" will wait for a third char for completing.
+
+*** Use `C-u C-j' to watch an image or `C-<down>'
+
+*** `C-j' on a filename will expand in helm-buffer to this filename
+
+Second hit on `C-j' will display buffer filename.
+Third hit on `C-j' will kill buffer filename.
+NOTE: `C-u C-j' will display buffer directly.
+
+*** To browse images directories turn on `helm-follow-mode' and navigate with arrow keys
+
+You can also use `helm-follow-action-forward' and `helm-follow-action-backward'
+\(`C-<down' and `C-<left>').
+
+*** You can turn off/on (toggle) autoupdate completion at any moment with `C-DEL'
+
+It is useful when auto completion is enabled and when trying to create a new file
+or directory you want to prevent helm trying to complete what you are writing.
+NOTE: On a terminal C-<backspace> may not work, use in this case C-c <backspace>.
+
+*** You can create a new directory and a new file at the same time
+
+Just write the path in prompt and press `<RET>'.
+e.g. You can create \"~/new/newnew/newnewnew/my_newfile.txt\".
+
+*** To create a new directory, add a \"/\" at end of new name and press <RET>
+
+*** To create a new file just write the filename not ending with \"/\"
+
+*** Recursive search from helm find files
+
+**** You can use helm browse project (see binding below)
+
+- With no prefix arg
+  If your current directory is under version control
+  with one of git or hg and you have installed helm-ls-git and/or helm-ls-hg
+  https://github.com/emacs-helm/helm-ls-git.git
+  https://github.com/emacs-helm/helm-ls-hg
+  you will see all your files under version control, otherwise
+  you will be back to helm-find-files.
+- With one prefix arg
+  You will see all the files under this directory
+  and other subdirectories (recursion) and this list of files will be cached.
+- With two prefix args
+  same but the cache will be refreshed.
+
+**** You can start a recursive search with Locate of Find (See commands below)
+
+With Locate you can use a local db with a prefix arg. If the localdb doesn't already
+exists, you will be prompted for its creation, if it exists and you want to refresh it,
+give two prefix args.
+
+*** Insert filename at point or complete filename at point
+
+On insertion (no completion, i.e nothing at point):
+
+- `C-c i'         => insert absolute file name.
+- `C-u C-c i'     => insert abbreviate file name.
+- `C-u C-u C-c i' => insert relative file name.
+
+On completion:
+
+- target starts by ~/           => insert abbreviate file name.
+- target starts by / or [a-z]:/ => insert full path.
+- otherwise                     => insert relative file name.
+
+*** Using wildcard to select multiple files
+
+Use of wilcard is supported to give a set of files to an action:
+
+e.g. You can copy all the files with \".el\" extension by using \"*.el\"
+and then run your copy action.
+
+You can do the same but with \"**.el\" (note the two stars),
+this will select recursively all \".el\" files under current directory.
+
+NOTE: When using an action that involve an external backend (e.g. grep), using \"**\"
+is not advised (even if it works fine) because it will be slower to select all your files,
+you have better time letting the backend doing it, it will be faster.
+However, if you know you have not many files it is reasonable to use this,
+also using not recursive wilcard (e.g. \"*.el\") is perfectly fine for this.
+
+This feature (\"**\") is activated by default with the option `helm-file-globstar'.
+The directory selection with \"**foo/\" like bash shopt globstar option is not supported yet.
+
+*** Copying renaming asynchronously
+
+If you use async library (if you have installed helm from MELPA you do) you can enable
+async for copying/renaming etc... your files by enabling `dired-async-mode'.
+
+Note that even when async is enabled, running a copy/rename action with a prefix arg
+will execute action synchronously, it will follow also the first file of the marked files
+in its destination directory.
+
+*** Bookmark your `helm-find-files' session
+
+You can bookmark your `helm-find-files' session with `C-x r m'.
+You can retrieve later these bookmarks easily by using M-x helm-filtered-bookmarks
+or from the current `helm-find-files' session just hitting `C-x r b'.
+
+*** Run Gid from `helm-find-files'
+
+You can navigate to a project containing an ID file created with the `mkid'
+command from id-utils, and run the `gid' command which will use the symbol at point
+in `helm-current-buffer' as default.
+
+** Commands
+\\<helm-find-files-map>
+\\[helm-ff-run-locate]\t\tRun Locate (C-u to specify locate db, M-n insert basename of candidate)
+\\[helm-ff-run-browse-project]\t\tBrowse project (`C-u' recurse, `C-u C-u' recurse and refresh db)
+\\[helm-ff-run-find-sh-command]\t\tRun Find shell command from this directory.
+\\[helm-ff-run-grep]\t\tRun Grep (C-u Recursive).
+\\[helm-ff-run-pdfgrep]\t\tRun Pdfgrep on marked files.
+\\[helm-ff-run-zgrep]\t\tRun zgrep (C-u Recursive).
+\\[helm-ff-run-grep-ag]\t\tRun AG grep on current directory.
+\\[helm-ff-run-git-grep]\t\tRun git-grep on current directory.
+\\[helm-ff-run-gid]\t\tRun gid (id-utils).
+\\[helm-ff-run-etags]\t\tRun Etags (C-u use thing-at-point `C-u C-u' reload cache)
+\\[helm-ff-run-rename-file]\t\tRename File (C-u Follow).
+\\[helm-ff-run-query-replace-on-marked]\t\tQuery replace on marked files.
+\\[helm-ff-run-copy-file]\t\tCopy File (C-u Follow).
+\\[helm-ff-run-byte-compile-file]\t\tByte Compile File (C-u Load).
+\\[helm-ff-run-load-file]\t\tLoad File.
+\\[helm-ff-run-symlink-file]\t\tSymlink File.
+\\[helm-ff-run-hardlink-file]\t\tHardlink file.
+\\[helm-ff-run-delete-file]\t\tDelete File.
+\\[helm-ff-run-kill-buffer-persistent]\t\tKill buffer candidate without quitting.
+\\[helm-ff-persistent-delete]\t\tDelete file without quitting.
+\\[helm-ff-run-switch-to-eshell]\t\tSwitch to Eshell.
+\\[helm-ff-run-eshell-command-on-file]\t\tEshell command on file (C-u Apply on marked files, otherwise treat them sequentially).
+\\[helm-ff-run-ediff-file]\t\tEdiff file.
+\\[helm-ff-run-ediff-merge-file]\t\tEdiff merge file.
+\\[helm-ff-run-complete-fn-at-point]\t\tComplete file name at point.
+\\[helm-ff-run-switch-other-window]\t\tSwitch other window.
+\\[helm-ff-run-switch-other-frame]\t\tSwitch other frame.
+\\[helm-ff-run-open-file-externally]\t\tOpen file with external program (C-u to choose).
+\\[helm-ff-run-open-file-with-default-tool]\t\tOpen file externally with default tool.
+\\[helm-ff-rotate-left-persistent]\t\tRotate Image Left.
+\\[helm-ff-rotate-right-persistent]\t\tRotate Image Right.
+\\[helm-find-files-up-one-level]\t\tGo down precedent directory.
+\\[helm-ff-run-switch-to-history]\t\tSwitch to last visited directories history.
+\\[helm-ff-file-name-history]\t\tSwitch to file name history.
+\\[helm-ff-properties-persistent]\t\tShow file properties in a tooltip.
+\\[helm-mark-all]\t\tMark all visibles candidates.
+\\[helm-ff-run-toggle-auto-update]\t\tToggle auto expansion of directories.
+\\[helm-unmark-all]\t\tUnmark all candidates, visibles and invisibles.
+\\[helm-ff-run-gnus-attach-files]\t\tGnus attach files to message buffer.
+\\[helm-ff-run-print-file]\t\tPrint file, (C-u to refresh printers list).
+\\[helm-enlarge-window]\t\tEnlarge helm window.
+\\[helm-narrow-window]\t\tNarrow helm window.
+\\[helm-ff-run-toggle-basename]\t\tToggle basename/fullpath.
+\\[helm-ff-run-find-file-as-root]\t\tFind file as root.
+\\[helm-ff-run-find-alternate-file]\t\tFind alternate file.
+\\[helm-ff-run-insert-org-link]\t\tInsert org link.")
+
+;;; Help for `helm-read-file-name'
+;;
+;;
+(defvar helm-read-file-name-help-message
+  "* Helm read file name
+
+** Tips
+
+If you are here, you are probably using a vanilla command like `find-file'
+helmized by `helm-mode', this is cool, but it is even better for your file
+navigation to use `helm-find-files' which is fully featured.
+
+*** Navigation
+
+**** Enter `~/' at end of pattern to quickly reach home directory
+
+**** Enter `/' at end of pattern to quickly reach root of your file system
+
+**** Enter `./' at end of pattern to quickly reach `default-directory' (initial start of session)
+
+If you are in `default-directory' move cursor on top.
+
+**** Enter `../' at end of pattern will reach upper directory, moving cursor on top
+
+NOTE: This different to using `C-l' in that `C-l' don't move cursor on top but stay on previous
+subdir name.
+
+**** You can complete with partial basename (start on third char entered)
+
+E.g. \"fob\" or \"fbr\" will complete \"foobar\"
+but \"fb\" will wait for a third char for completing.
+
+*** Persistent actions
+
+By default `helm-read-file-name' use the persistent actions of `helm-find-files'
+
+**** Use `C-u C-j' to watch an image
+
+**** `C-j' on a filename will expand in helm-buffer to this filename
+
+Second hit on `C-j' will display buffer filename.
+Third hit on `C-j' will kill buffer filename.
+NOTE: `C-u C-j' will display buffer directly.
+
+**** To browse images directories turn on `helm-follow-mode' and navigate with arrow keys
+
+*** Delete characters backward
+
+When you want to delete backward characters, e.g. to create a new file or directory,
+autoupdate may keep updating to an existent directory preventing you from doing so.
+In this case, type C-<backspace> and then <backspace>.
+This should not be needed when copying/renaming files because autoupdate is disabled
+by default in that case.
+NOTE: On a terminal C-<backspace> may not work, use in this case C-c <backspace>.
+
+*** Create new directory and files
+
+**** Create a new directory and a new file at the same time
+
+You can create a new directory and a new file at the same time, 
+just write the path in prompt and press <RET>.
+E.g. You can create \"~/new/newnew/newnewnew/my_newfile.txt\".
+
+**** To create a new directory, add a \"/\" at end of new name and press <RET>
+
+**** To create a new file just write the filename not ending with \"/\"
+
+_NOTE_: File and directory creation work only in some commands (e.g `find-file')
+and will not work in other commands where it is not intended to return a file or a directory
+\(e.g `list-directory').
+
+** Commands
+\\<helm-read-file-map>
+\\[helm-find-files-up-one-level]\t\tGo down precedent directory.
+\\[helm-ff-run-toggle-auto-update]\t\tToggle auto expansion of directories.
+\\[helm-ff-run-toggle-basename]\t\tToggle basename.
+\\[helm-ff-file-name-history]\t\tFile name history.
+C/\\[helm-cr-empty-string]\t\tMaybe return empty string (unless `must-match').
+\\[helm-next-source]\t\tGoto next source.
+\\[helm-previous-source]\t\tGoto previous source.")
+
+;;; Generic file help - Used by locate.
+;;
+;;
+(defvar helm-generic-file-help-message
+  "* Helm Generic files
+
+** Tips
+
+*** Locate
+
+You can add after writing search pattern any of the locate command line options.
+e.g. -b, -e, -n <number>...etc.
+See Man locate for more infos.
+
+Some other sources (at the moment recentf and file in current directory sources)
+support the -b flag for compatibility with locate when they are used with it.
+
+*** Browse project
+
+When your directory is not under version control,
+don't forget to refresh your cache when files have been added/removed in your directory.
+
+*** Find command
+
+Recursively search files using \"find\" shell command.
+
+Candidates are all filenames that match all given globbing patterns.
+This respects the options `helm-case-fold-search' and
+`helm-findutils-search-full-path'.
+
+You can pass arbitrary options directly to find after a \"*\" separator.
+For example, this would find all files matching \"book\" that are larger
+than 1 megabyte:
+
+    book * -size +1M
+
+** Commands
+\\<helm-generic-files-map>
+\\[helm-ff-run-toggle-basename]\t\tToggle basename.
+\\[helm-ff-run-grep]\t\tRun grep (C-u recurse).
+\\[helm-ff-run-zgrep]\t\tRun zgrep.
+\\[helm-ff-run-gid]\t\tRun gid (id-utils).
+\\[helm-ff-run-pdfgrep]\t\tRun Pdfgrep on marked files.
+\\[helm-ff-run-copy-file]\t\tCopy file(s)
+\\[helm-ff-run-rename-file]\t\tRename file(s).
+\\[helm-ff-run-symlink-file]\t\tSymlink file(s).
+\\[helm-ff-run-hardlink-file]\t\tHardlink file(s).
+\\[helm-ff-run-delete-file]\t\tDelete file(s).
+\\[helm-ff-run-byte-compile-file]\t\tByte compile file(s) (C-u load) (elisp).
+\\[helm-ff-run-load-file]\t\tLoad file(s) (elisp).
+\\[helm-ff-run-ediff-file]\t\tEdiff file.
+\\[helm-ff-run-ediff-merge-file]\t\tEdiff merge file.
+\\[helm-ff-run-switch-other-window]\t\tSwitch other window.
+\\[helm-ff-properties-persistent]\t\tShow file properties.
+\\[helm-ff-run-etags]\t\tRun etags (C-u use tap, C-u C-u reload DB).
+\\[helm-yank-text-at-point]\t\tYank text at point.
+\\[helm-ff-run-open-file-externally]\t\tOpen file with external program (C-u to choose).
+\\[helm-ff-run-open-file-with-default-tool]\t\tOpen file externally with default tool.
+\\[helm-ff-run-insert-org-link]\t\tInsert org link.")
+
+;;; Grep help
+;;
+;;
+(defvar helm-grep-help-message
+  "* Helm Grep
+
+** Tips
+
+*** You can start grep with a prefix arg to recurse in subdirectories
+
+*** You can use wild card when selecting files (e.g. *.el)
+
+*** You can grep in many differents directories by marking files or wild cards
+
+*** You can save your results in a `helm-grep-mode' buffer, see commands below
+
+Once in this buffer you can use emacs-wgrep to edit your changes.
+
+*** Important
+
+Grepping on remote file will work only with grep, not ack-grep, but it is
+anyway bad supported as tramp doesn't support multiple process running in a
+short delay (less than 5s actually) among other things,
+so I strongly advice hitting `C-!' (i.e suspend process)
+before entering anything in pattern, and hit again `C-!' when
+your regexp is ready to send to remote process, even if helm is handling
+this by delaying each process at 5s. 
+Or even better don't use tramp at all and mount your remote file system on SSHFS.
+
+* Helm Gid
+
+** Tips
+
+Helm gid read the database created with the `mkid' command from id-utils.
+The name of the database file can be customized with `helm-gid-db-file-name', it
+is usually \"ID\".
+Helm Gid use the symbol at point as default-input.
+You have access to this command also from `helm-find-files' which allow you to
+navigate to another directory to consult its database.
+
+* Helm AG
+
+** Tips
+
+Helm AG is different from grep or ack-grep in that it works on a directory and not
+a list of files.
+You can ignore files and directories by using a \".agignore\" file, local to directory
+or global when placed in home directory (See AG man page for more infos).
+This file supports same entries as what you will find in `helm-grep-ignored-files' and
+`helm-grep-ignored-directories'.
+As always you can access helm AG from `helm-find-files'.
+
+** Commands
+\\<helm-grep-map>
+\\[helm-goto-next-file]\t\tNext File.
+\\[helm-goto-precedent-file]\t\tPrecedent File.
+\\[helm-yank-text-at-point]\t\tYank Text at point in minibuffer.
+\\[helm-grep-run-other-window-action]\t\tJump other window.
+\\[helm-grep-run-other-frame-action]\t\tJump other frame.
+\\[helm-grep-run-default-action]\t\tRun default action (Same as RET).
+\\[helm-grep-run-save-buffer]\t\tSave to a `helm-grep-mode' enabled buffer.")
+
+;;; Pdf grep help
+;;
+;;
+(defvar helm-pdfgrep-help-message
+  "* Helm PdfGrep Map
+
+** Commands
+\\<helm-pdfgrep-map>
+\\[helm-goto-next-file]\t\tNext File.
+\\[helm-goto-precedent-file]\t\tPrecedent File.
+\\[helm-yank-text-at-point]\t\tYank Text at point in minibuffer.")
+
+;;; Etags help
+;;
+;;
+(defvar helm-etags-help-message
+  "* Helm Etags Map
+
+** Commands
+\\<helm-etags-map>
+\\[helm-goto-next-file]\t\tNext File.
+\\[helm-goto-precedent-file]\t\tPrecedent File.
+\\[helm-yank-text-at-point]\t\tYank Text at point in minibuffer.")
+
+;;; Ucs help
+;;
+;;
+(defvar helm-ucs-help-message
+  "* Helm Ucs
+
+** Tips
+
+Use commands below to insert unicode characters
+in current-buffer without quitting helm.
+
+** Commands
+\\<helm-ucs-map>
+\\[helm-ucs-persistent-insert]\t\tInsert char.
+\\[helm-ucs-persistent-forward]\t\tForward char.
+\\[helm-ucs-persistent-backward]\t\tBackward char.
+\\[helm-ucs-persistent-delete]\t\tDelete char backward.")
+
+;;; Bookmark help
+;;
+;;
+(defvar helm-bookmark-help-message
+  "* Helm bookmark name
+
+** Commands
+\\<helm-bookmark-map>
+\\[helm-bookmark-run-jump-other-window]\t\tJump other window.
+\\[helm-bookmark-run-delete]\t\tDelete bookmark.
+\\[helm-bookmark-run-edit]\t\tEdit bookmark.
+\\[helm-bookmark-toggle-filename]\t\tToggle bookmark location visibility.")
+
+;;; Eshell command on file help
+;;
+;;
+(defvar helm-esh-help-message
+  "* Helm eshell on file
+
+** Tips
+
+*** Passing extra args after filename
+
+Normally your command or alias will be called with file as argument. E.g.,
+
+    <command> 'candidate_file'
+
+But you can also pass an argument or more after 'candidate_file' like this:
+
+    <command> %s [extra_args]
+
+'candidate_file' will be added at '%s' and your command will look at this:
+
+    <command> 'candidate_file' [extra_args]
+
+*** Specify many files as args (marked files)
+
+E.g. <command> file1 file2 ...
+
+Call `helm-find-files-eshell-command-on-file' with one prefix-arg
+Otherwise you can pass one prefix-arg from the command selection buffer.
+NOTE: This is not working on remote files.
+
+With two prefix-arg before starting or from the command selection buffer
+the output is printed to your `current-buffer'.
+
+Note that with no prefix-arg or a prefix-arg value of '(16) (C-u C-u)
+the command is called once for each file like this:
+
+    <command> file1 <command> file2 etc...
+
+** Commands
+\\<helm-esh-on-file-map>")
+
+;;; Ido virtual buffer help
+;;
+;;
+(defvar helm-buffers-ido-virtual-help-message
+  "* Helm ido virtual buffers
+
+** Commands
+\\<helm-buffers-ido-virtual-map>
+\\[helm-ff-run-switch-other-window]\t\tSwitch other window.
+\\[helm-ff-run-switch-other-frame]\t\tSwitch other frame.
+\\[helm-ff-run-grep]\t\tGrep file.
+\\[helm-ff-run-zgrep]\t\tZgrep file.
+\\[helm-ff-run-delete-file]\t\tDelete file.
+\\[helm-ff-run-open-file-externally]\t\tOpen file externally.")
+
+;;; Moccur help
+;;
+;;
+(defvar helm-moccur-help-message
+  "* Helm Moccur
+
+** Tips
+
+*** Matching
+
+Multiple regexp matching is allowed, just enter a space to separate your regexps.
+
+Matching empty lines is supported with the regexp \"^$\", you will get the results
+with only the buffer-name and the line number, you can of course save and edit these
+results (i.e add text to the empty line) .
+
+*** Automatically matching symbol at point
+
+You can match automatically the symbol at point, but keeping
+the minibuffer empty ready to write into.
+This is disabled by default, to enable this you have to add `helm-source-occur'
+and `helm-source-moccur' to `helm-sources-using-default-as-input'.
+
+*** Jump to the corresponding line in the searched buffer
+
+You can do this with `C-j' (persistent-action), to do it repetitively
+you can use `C-<up>' and `C-<down>' or enable `helm-follow-mode' with `C-c C-f'.
+
+*** Saving results
+
+Same as with helm-grep, you can save the results with `C-x C-s'.
+Of course if you don't save your results, you can get back your session
+with `helm-resume'.
+
+*** Refreshing the resumed session.
+
+When the buffer(s) where you ran helm-(m)occur have been modified, you will be
+warned of this with the buffer flashing to red, you can refresh the buffer by running
+`C-c C-u'.
+This can be done automatically by customizing `helm-moccur-auto-update-on-resume'.
+
+*** Refreshing a saved buffer
+
+Type `g' to update your buffer.
+
+*** Edit a saved buffer
+
+First, install wgrep https://github.com/mhayashi1120/Emacs-wgrep
+and then:
+
+1) C-c C-p to edit the buffer(s).
+2) C-x C-s to save your changes.
+
+Tip: Use the excellent iedit https://github.com/tsdh/iedit
+to modify occurences in your buffer.
+
+** Commands
+\\<helm-moccur-map>
+\\[helm-goto-next-file]\t\tNext Buffer.
+\\[helm-goto-precedent-file]\t\tPrecedent Buffer.
+\\[helm-yank-text-at-point]\t\tYank Text at point in minibuffer.
+\\[helm-moccur-run-goto-line-ow]\t\tGoto line in other window.
+\\[helm-moccur-run-goto-line-of]\t\tGoto line in new frame.")
+
+;;; Helm Top
+;;
+;;
+(defvar helm-top-help-message
+  "* Helm Top
+
+** Tips
+
+** Commands
+\\<helm-top-map>
+\\[helm-top-run-sort-by-com]\t\tSort by commands.
+\\[helm-top-run-sort-by-cpu]\t\tSort by cpu usage.
+\\[helm-top-run-sort-by-user]\t\tSort alphabetically by user.
+\\[helm-top-run-sort-by-mem]\t\tSort by memory.")
+
+;;; Helm Apt
+;;
+;;
+(defvar helm-apt-help-message
+  "* Helm Apt
+
+** Tips
+
+** Commands
+\\<helm-apt-map>
+\\[helm-apt-show-all]\t\tShow all packages.
+\\[helm-apt-show-only-installed]\t\tShow installed packages only.
+\\[helm-apt-show-only-not-installed]\t\tShow not installed packages only.
+\\[helm-apt-show-only-deinstalled]\t\tShow deinstalled (not purged yet) packages only.>")
+
+;;; Helm elisp package
+;;
+;;
+(defvar helm-el-package-help-message
+  "* Helm elisp package
+
+** Tips
+
+*** Compile all your packages asynchronously
+
+When using async (if you have installed from MELPA you do), only helm, helm-core,
+and magit are compiled asynchronously, if you want all your packages compiled async,
+add to your init file:
+    
+     (setq async-bytecomp-allowed-packages '(all))
+    
+*** Upgrade elisp packages
+
+On initial start (when emacs is fetching packages on remote), if helm find
+package to upgrade it will start in the upgradables packages view showing the packages
+availables to upgrade.
+On further starts, you will have to refresh the list with `C-c C-u', if helm find upgrades
+you will have a message telling you some packages are available for upgrade, you can switch to
+upgrade view (see below) to see what packages are available for upgrade or just hit `C-c U'.
+to upgrade all.
+
+To see upgradables packages hit <M-U>.
+
+Then you can install all upgradables packages with the upgrade all action (`C-c C-u'),
+or upgrade only the specific packages by marking them (the new ones) and running
+the upgrade action (visible only when there is upgradables packages).
+Of course you can upgrade a single package by just running the upgrade action
+without marking it (`C-c u' or RET) .
+
+\*WARNING* You are strongly advised to RESTART emacs after UPGRADING packages.
+
+*** Meaning of flags prefixing packages (Emacs-25)
+
+- The flag \"S\" that prefix package names mean that this package is one of `package-selected-packages'.
+This feature is only available with emacs-25.
+
+- The flag \"U\" that prefix package names mean that this package is no more needed.
+This feature is only available with emacs-25.
+
+** Commands
+\\<helm-el-package-map>
+\\[helm-el-package-show-all]\t\tShow all packages.
+\\[helm-el-package-show-installed]\t\tShow installed packages only.
+\\[helm-el-package-show-uninstalled]\t\tShow not installed packages only.
+\\[helm-el-package-show-upgrade]\t\tShow upgradable packages only.
+\\[helm-el-run-package-install]\t\tInstall package(s).
+\\[helm-el-run-package-reinstall]\t\tReinstall package(s).
+\\[helm-el-run-package-uninstall]\t\tUninstall package(s).
+\\[helm-el-run-package-upgrade]\t\tUpgrade package(s).
+\\[helm-el-run-package-upgrade-all]\t\tUpgrade all packages upgradables.
+\\[helm-el-run-visit-homepage]\t\tVisit package homepage.")
+
+;;; Helm M-x
+;;
+;;
+(defvar helm-M-x-help-message
+  "* Helm M-x
+
+** Tips
+
+*** You can get help on any command with persistent action (C-j)
+
+*** Prefix Args
+
+All the prefix args passed BEFORE running `helm-M-x' are ignored,
+you should get an error message if you do so.
+When you want to pass prefix args, pass them AFTER starting `helm-M-x',
+you will see a prefix arg counter appearing in mode-line notifying you
+the number of prefix args entered.")
+
+;;; helm-imenu
+;;
+;;
+(defvar helm-imenu-help-message
+  "* Helm imenu
+
+** Tips
+
+** Commands
+\\<helm-imenu-map>
+\\[helm-imenu-next-section]\t\tGo to next section.
+\\[helm-imenu-previous-section]\t\tGo to previous section.")
+
+;;; helm-colors
+;;
+;;
+(defvar helm-colors-help-message
+  "* Helm colors
+
+** Commands
+\\<helm-color-map>
+\\[helm-color-run-insert-name]\t\tInsert the entry'name.
+\\[helm-color-run-kill-name]\t\tKill the entry's name.
+\\[helm-color-run-insert-rgb]\t\tInsert entry in RGB format.
+\\[helm-color-run-kill-rgb]\t\tKill entry in RGB format.")
+
+;;; helm semantic
+;;
+;;
+(defvar helm-semantic-help-message
+  "* Helm semantic
+
+** Tips
+
+** Commands
+\\<helm-semantic-map>")
+
+;;; helm kmacro
+;;
+;;
+(defvar helm-kmacro-help-message
+  "* Helm kmacro
+
+** Tips
+
+- Start recording some keys with `f3'
+- Record new kmacro with `f4'
+- Start `helm-execute-kmacro' to list all your macros.
+
+Use persistent action to run your kmacro as many time as needed,
+you can change of kmacro with `helm-next-line' `helm-previous-line'.
+
+NOTE: You can't record keys running helm commands except `helm-M-x' unless
+you don't choose from there a command using helm completion.
+
+** Commands
+\\<helm-kmacro-map>")
+
+
+;;; Mode line strings
+;;
+;;
+;;;###autoload
+(defvar helm-comp-read-mode-line "\
+\\<helm-comp-read-map>\
+C/\\[helm-cr-empty-string]:Empty \
+\\<helm-map>\
+\\[helm-help]:Help \
+\\[helm-select-action]:Act \
+\\[helm-maybe-exit-minibuffer]/\
+f1/f2/f-n:NthAct \
+\\[helm-toggle-suspend-update]:Tog.suspend")
+
+;;;###autoload
+(defvar helm-read-file-name-mode-line-string "\
+\\<helm-read-file-map>\
+\\[helm-help]:Help \
+C/\\[helm-cr-empty-string]:Empty \
+\\<helm-map>\
+\\[helm-select-action]:Act \
+\\[helm-maybe-exit-minibuffer]/\
+f1/f2/f-n:NthAct \
+\\[helm-toggle-suspend-update]:Tog.suspend"
+  "String displayed in mode-line in `helm-source-find-files'.")
+
+;;;###autoload
+(defvar helm-top-mode-line "\
+\\<helm-top-map>\
+\\[helm-help]:Help \
+\\<helm-map>\
+\\[helm-select-action]:Act \
+\\[helm-maybe-exit-minibuffer]/\
+f1/f2/f-n:NthAct \
+\\[helm-toggle-suspend-update]:Tog.suspend")
+
+
+;;; Attribute Documentation
+;;
+;;
+;;;###autoload
+(defun helm-describe-helm-attribute (helm-attribute)
+  "Display the full documentation of HELM-ATTRIBUTE.
+HELM-ATTRIBUTE should be a symbol."
+  (interactive (list (intern
+                      (completing-read
+                       "Describe helm attribute: "
+                       (mapcar 'symbol-name helm-attributes)
+                       nil t))))
+  (with-output-to-temp-buffer "*Help*"
+    (princ (get helm-attribute 'helm-attrdoc))))
+
+(helm-document-attribute 'name "mandatory"
+  "  The name of the source. It is also the heading which appears
+  above the list of matches from the source. Must be unique.")
+
+(helm-document-attribute 'header-name "optional"
+  "  A function returning the display string of the header. Its
+  argument is the name of the source. This attribute is useful to
+  add an additional information with the source name.")
+
+(helm-document-attribute 'candidates "mandatory if candidates-in-buffer attribute is not provided"
+  "  Specifies how to retrieve candidates from the source. It can
+  either be a variable name, a function called with no parameters
+  or the actual list of candidates.
+
+  The list must be a list whose members are strings, symbols
+  or (DISPLAY . REAL) pairs.
+
+  In case of (DISPLAY . REAL) pairs, the DISPLAY string is shown
+  in the Helm buffer, but the REAL one is used as action
+  argument when the candidate is selected. This allows a more
+  readable presentation for candidates which would otherwise be,
+  for example, too long or have a common part shared with other
+  candidates which can be safely replaced with an abbreviated
+  string for display purposes.
+
+  Note that if the (DISPLAY . REAL) form is used then pattern
+  matching is done on the displayed string, not on the real
+  value.
+
+  If the candidates have to be retrieved asynchronously (for
+  example, by an external command which takes a while to run)
+  then the function should start the external command
+  asynchronously and return the associated process object.
+  Helm will take care of managing the process (receiving the
+  output from it, killing it if necessary, etc.). The process
+  should return candidates matching the current pattern (see
+  variable `helm-pattern'.)
+  You should use instead `candidates-process' attribute for
+  async processes, a warning will popup when using async process
+  in a `candidates' attribute.
+
+  Note that currently results from asynchronous sources appear
+  last in the helm buffer regardless of their position in
+  `helm-sources'.")
+
+(helm-document-attribute 'candidates-process
+    "Same as `candidates' attributes but for process function."
+  "  You should use this attribute when using a function involving
+  an async process instead of `candidates'.")
+
+(helm-document-attribute 'action "mandatory if type attribute is not provided"
+  "  It is a list of (DISPLAY . FUNCTION) pairs or FUNCTION.
+  FUNCTION is called with one parameter: the selected candidate.
+
+  An action other than the default can be chosen from this list
+  of actions for the currently selected candidate (by default
+  with TAB). The DISPLAY string is shown in the completions
+  buffer and the FUNCTION is invoked when an action is
+  selected. The first action of the list is the default.")
+
+(helm-document-attribute 'coerce "optional"
+  "  It's a function called with one argument: the selected
+  candidate.
+
+  This function is intended for type convertion. In normal case,
+  the selected candidate (string) is passed to action
+  function. If coerce function is specified, it is called just
+  before action function.
+
+  Example: converting string to symbol
+    (coerce . intern)")
+
+(helm-document-attribute 'type "optional if action attribute is provided"
+  "  Indicates the type of the items the source returns.
+
+  Merge attributes not specified in the source itself from
+  `helm-type-attributes'.
+
+  This attribute is implemented by plug-in.")
+
+(helm-document-attribute 'init "optional"
+  "  Function called with no parameters when helm is started. It
+  is useful for collecting current state information which can be
+  used to create the list of candidates later.
+
+  For example, if a source needs to work with the current
+  directory then it can store its value here, because later
+  helm does its job in the minibuffer and in the
+  `helm-buffer' and the current directory can be different
+  there.")
+
+(helm-document-attribute 'match "optional"
+  "  List of functions called with one parameter: a candidate. The
+  function should return non-nil if the candidate matches the
+  current pattern (see variable `helm-pattern').
+
+  This attribute allows the source to override the default
+  pattern matching based on `string-match'. It can be used, for
+  example, to implement a source for file names and do the
+  pattern matching on the basename of files, since it's more
+  likely one is typing part of the basename when searching for a
+  file, instead of some string anywhere else in its path.
+
+  If the list contains more than one function then the list of
+  matching candidates from the source is constructed by appending
+  the results after invoking the first function on all the
+  potential candidates, then the next function, and so on. The
+  matching candidates supplied by the first function appear first
+  in the list of results and then results from the other
+  functions, respectively.
+
+  This attribute has no effect for asynchronous sources (see
+  attribute `candidates'), since they perform pattern matching
+  themselves.")
+
+(helm-document-attribute 'candidate-transformer "optional"
+  "  It's a function or a list of functions called with one argument
+  when the completion list from the source is built. The argument
+  is the list of candidates retrieved from the source. The
+  function should return a transformed list of candidates which
+  will be used for the actual completion.  If it is a list of
+  functions, it calls each function sequentially.
+
+  This can be used to transform or remove items from the list of
+  candidates.
+
+  Note that `candidates' is run already, so the given transformer
+  function should also be able to handle candidates with (DISPLAY
+  . REAL) format.")
+
+(helm-document-attribute 'filtered-candidate-transformer "optional"
+  "  It has the same format as `candidate-transformer', except the
+  function is called with two parameters: the candidate list and
+  the source.
+
+  This transformer is run on the candidate list which is already
+  filtered by the current pattern. While `candidate-transformer'
+  is run only once, it is run every time the input pattern is
+  changed.
+
+  It can be used to transform the candidate list dynamically, for
+  example, based on the current pattern.
+
+  In some cases it may also be more efficent to perform candidate
+  transformation here, instead of with `candidate-transformer'
+  even if this transformation is done every time the pattern is
+  changed.  For example, if a candidate set is very large then
+  `candidate-transformer' transforms every candidate while only
+  some of them will actually be dislpayed due to the limit
+  imposed by `helm-candidate-number-limit'.
+
+  Note that `candidates' and `candidate-transformer' is run
+  already, so the given transformer function should also be able
+  to handle candidates with (DISPLAY . REAL) format.
+
+  This option has no effect for asynchronous sources. (Not yet,
+  at least.")
+
+(helm-document-attribute 'action-transformer "optional"
+  "  It's a function or a list of functions called with two
+  arguments when the action list from the source is
+  assembled. The first argument is the list of actions, the
+  second is the current selection.  If it is a list of functions,
+  it calls each function sequentially.
+
+  The function should return a transformed action list.
+
+  This can be used to customize the list of actions based on the
+  currently selected candidate.")
+
+(helm-document-attribute 'pattern-transformer "optional"
+  "  It's a function or a list of functions called with one argument
+  before computing matches. Its argument is `helm-pattern'.
+  Functions should return transformed `helm-pattern'.
+
+  It is useful to change interpretation of `helm-pattern'.")
+
+(helm-document-attribute 'delayed "optional"
+  "  Candidates from the source are shown only if the user stops
+  typing and is idle for `helm-idle-delay' seconds.
+  If a value is given to delayed attr, this value is used instead only
+  if it is > to `helm-idle-delay'.")
+
+(helm-document-attribute 'volatile "optional"
+  "  Indicates the source assembles the candidate list dynamically,
+  so it shouldn't be cached within a single Helm
+  invocation. It is only applicable to synchronous sources,
+  because asynchronous sources are not cached.")
+
+(helm-document-attribute 'requires-pattern "optional"
+  "  If present matches from the source are shown only if the
+  pattern is not empty. Optionally, it can have an integer
+  parameter specifying the required length of input which is
+  useful in case of sources with lots of candidates.")
+
+(helm-document-attribute 'persistent-action "optional"
+  "  Can be a either a Function called with one parameter (the
+  selected candidate) or a cons cell where first element is this
+  same function and second element a symbol (e.g. never-split)
+  that inform `helm-execute-persistent-action'to not split his
+  window to execute this persistent action.")
+
+(helm-document-attribute 'candidates-in-buffer "optional"
+  "  Shortcut attribute for making and narrowing candidates using
+  buffers.  This newly-introduced attribute prevents us from
+  forgetting to add volatile and match attributes.
+
+  See docstring of `helm-candidates-in-buffer'.
+
+  (candidates-in-buffer) is equivalent of three attributes:
+    (candidates . helm-candidates-in-buffer)
+    (volatile)
+    (match identity)
+
+  (candidates-in-buffer . candidates-function) is equivalent of:
+    (candidates . candidates-function)
+    (volatile)
+    (match identity)
+
+  This attribute is implemented by plug-in.")
+
+(helm-document-attribute 'search "optional"
+  "  List of functions like `re-search-forward' or `search-forward'.
+  Buffer search function used by `helm-candidates-in-buffer'.
+  By default, `helm-candidates-in-buffer' uses
+  `re-search-forward'. This attribute is meant to be used with
+  (candidates . helm-candidates-in-buffer) or
+  (candidates-in-buffer) in short.")
+
+(helm-document-attribute 'get-line "optional"
+  "  A function like `buffer-substring-no-properties' or `buffer-substring'.
+  This function converts point of line-beginning and point of line-end,
+  which represents a candidate computed by `helm-candidates-in-buffer'.
+  By default, `helm-candidates-in-buffer' uses
+  `buffer-substring-no-properties'.")
+
+(helm-document-attribute 'display-to-real "optional"
+  "  Function called with one parameter; the selected candidate.
+
+  The function transforms the selected candidate, and the result
+  is passed to the action function.  The display-to-real
+  attribute provides another way to pass other string than one
+  shown in Helm buffer.
+
+  Traditionally, it is possible to make candidates,
+  candidate-transformer or filtered-candidate-transformer
+  function return a list with (DISPLAY . REAL) pairs. But if REAL
+  can be generated from DISPLAY, display-to-real is more
+  convenient and faster.")
+
+(helm-document-attribute 'real-to-display "optional"
+  "  Function called with one parameter; the selected candidate.
+
+  The inverse of display-to-real attribute.
+
+  The function transforms the selected candidate, which is passed
+  to the action function, for display.  The real-to-display
+  attribute provides the other way to pass other string than one
+  shown in Helm buffer.
+
+  Traditionally, it is possible to make candidates,
+  candidate-transformer or filtered-candidate-transformer
+  function return a list with (DISPLAY . REAL) pairs. But if
+  DISPLAY can be generated from REAL, real-to-display is more
+  convenient.
+
+  Note that DISPLAY parts returned from candidates /
+  candidate-transformer are IGNORED as the name `display-to-real'
+  says.")
+
+(helm-document-attribute 'cleanup "optional"
+  "  Function called with no parameters when *helm* buffer is
+  closed. It is useful for killing unneeded candidates buffer.
+
+  Note that the function is executed BEFORE performing action.")
+
+(helm-document-attribute 'candidate-number-limit "optional"
+  "  Override `helm-candidate-number-limit' only for this source.")
+
+(helm-document-attribute 'accept-empty "optional"
+  "  Pass empty string \"\" to action function.")
+
+(helm-document-attribute 'dummy "optional"
+  "  Set `helm-pattern' to candidate. If this attribute is
+  specified, The candidates attribute is ignored.
+
+  This attribute is implemented by plug-in.")
+
+(helm-document-attribute 'multiline "optional"
+  "  Enable to selection multiline candidates.")
+
+(helm-document-attribute 'update "optional"
+  (substitute-command-keys
+   "  Function called with no parameters at before \"init\" function when \
+\\<helm-map>\\[helm-force-update] is pressed."))
+
+(helm-document-attribute 'mode-line "optional"
+  "  Source local `helm-mode-line-string' (included in
+  `mode-line-format'). It accepts also variable/function name.")
+
+(helm-document-attribute 'header-line "optional"
+  "  Source local `header-line-format'.
+  It accepts also variable/function name. ")
+
+(helm-document-attribute
+    'resume "optional"
+  "  Function called with no parameters at end of initialization
+  when `helm-resume' is started.
+  If this function try to do something against `helm-buffer', \(e.g. updating,
+  searching etc...\) probably you should run it in a timer to ensure
+  `helm-buffer' is ready.")
+
+(helm-document-attribute 'keymap "optional"
+  "  Specific keymap for this source.
+  It is useful to have a keymap per source when using more than
+  one source.  Otherwise, a keymap can be set per command with
+  `helm' argument KEYMAP.  NOTE: when a source have `helm-map' as
+  keymap attr, the global value of `helm-map' will override the
+  actual local one.")
+
+(helm-document-attribute 'help-message "optional"
+  "  Help message for this source.
+  If not present, `helm-help-message' value will be used.")
+
+(helm-document-attribute 'match-part "optional"
+  "  Allow matching candidate in the line with `candidates-in-buffer'.
+  In candidates-in-buffer sources, match is done with
+  `re-search-forward' which allow matching only a regexp on the
+  `helm-buffer'; when this search is done, match-part allow
+  matching only a specific part of the current line e.g. with a
+  line like this:
+
+  filename:candidate-containing-the-word-filename
+
+  What you want is to ignore \"filename\" part and match only
+  \"candidate-containing-the-word-filename\"
+
+  So give a function matching only the part of candidate after \":\"
+
+  If source contain match-part attribute, match is computed only
+  on part of candidate returned by the call of function provided
+  by this attribute. The function should have one arg, candidate,
+  and return only a specific part of candidate.
+
+  NOTE: This have effect only on sources using
+  `candidates-in-buffer'.")
+
+(helm-document-attribute 'match-strict "optional"
+  "  When specifying a match function within a source and
+  helm-multi-match is enabled, the result of all matching
+  functions will be concatened, which in some cases is not what
+  is wanted. When using `match-strict' only this or these
+  functions will be used. You can specify those functions as a
+  list of functions or a single symbol function. For anonymous
+  function don't add the dot, e.g:
+
+  \(match-strict (lambda () (foo))).")
+
+(helm-document-attribute 'nohighlight "optional"
+  "  Disable highlight match in this source.")
+
+(helm-document-attribute 'no-matchplugin "optional"
+  "  Disable matchplugin for this source.")
+
+(helm-document-attribute 'history "optional"
+  "  Allow passing history variable to helm from source.
+  It should be a quoted symbol evaluated from source, i.e:
+  (history . ,'history-var)")
+
+(helm-document-attribute 'follow "optional"
+  "  Enable `helm-follow-mode' for this source only.
+  You must give it a value of 1 or -1, though giving a -1 value
+  is surely not what you want, e.g: (follow . 1)
+
+  See `helm-follow-mode' for more infos")
+
+(helm-document-attribute 'follow-delay "optional"
+  "  `helm-follow-mode' will execute persistent-action after this delay.
+  Otherwise value of `helm-follow-input-idle-delay' is used if non--nil,
+  If none of these are found fallback to `helm-input-idle-delay'.")
+
+(helm-document-attribute 'allow-dups "optional"
+  "  Allow helm collecting duplicates candidates.")
+
+(helm-document-attribute 'filter-one-by-one "optional"
+  "  A transformer function that treat candidates one by one.
+  It is called with one arg the candidate.
+  It is faster than `filtered-candidate-transformer' or `candidates-transformer',
+  but should be used only in sources that recompute constantly their candidates,
+  e.g. `helm-source-find-files'.
+  Filtering happen early and candidates are treated
+  one by one instead of re-looping on the whole list.
+  If used with `filtered-candidate-transformer' or `candidates-transformer'
+  these functions should treat the candidates transformed by the `filter-one-by-one'
+  function in consequence.")
+
+(helm-document-attribute 'nomark "optional"
+  "  Don't allow marking candidates when this attribute is present.")
+
+(provide 'helm-help)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-help.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-id-utils.el b/emacs.d/elpa/helm-20160115.2200/helm-id-utils.el
new file mode 100644
index 0000000..15f6bc4
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-id-utils.el
@@ -0,0 +1,126 @@
+;;; helm-id-utils.el --- Helm interface for id-utils. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'helm-grep)
+(require 'helm-help)
+
+(defgroup helm-id-utils nil
+  "ID-Utils related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-gid-program "gid"
+  "Name of gid command (usually `gid').
+For Mac OS X users, if you install GNU coreutils, the name `gid'
+might be occupied by `id' from GNU coreutils, and you should set
+it to correct name (or absolute path), for example, if using
+MacPorts to install id-utils, it should be `gid32'."
+  :group 'helm-id-utils
+  :type 'file)
+
+(defcustom helm-gid-db-file-name "ID"
+  "Name of a database file created by `mkid' command from `ID-utils'."
+  :group 'helm-id-utils
+  :type 'string)
+
+(defun helm-gid-candidates-process ()
+  (let ((proc (start-process
+               "gid" nil helm-gid-program
+               "-r" helm-pattern)))
+    (set (make-local-variable 'helm-grep-last-cmd-line)
+         (format "%s -r %s" helm-gid-program helm-pattern))
+    (prog1 proc
+      (set-process-sentinel
+       proc (lambda (_process event)
+              (when (string= event "finished\n")
+                (with-helm-window
+                  (setq mode-line-format
+                        '(" " mode-line-buffer-identification " "
+                          (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                          (:eval (propertize
+                                  (format "[Helm Gid process finished - (%s results)]" 
+                                          (max (1- (count-lines
+                                                    (point-min) (point-max)))
+                                               0))
+                                  'face 'helm-locate-finish))))
+                  (force-mode-line-update))
+                (helm-log "Error: Gid %s"
+                          (replace-regexp-in-string "\n" "" event))))))))
+
+(defun helm-gid-filtered-candidate-transformer (candidates _source)
+  ;; "gid -r" may add dups in some rare cases.
+  (cl-loop for c in (helm-fast-remove-dups candidates :test 'equal)
+           collect (helm-grep--filter-candidate-1 c)))
+
+(defclass helm-gid-source (helm-source-async)
+  ((header-name
+    :initform
+    (lambda (name)
+      (concat name " [" (helm-attr 'db-dir) "]")))
+   (db-dir :initarg :db-dir
+           :initform nil
+           :custom string
+           :documentation " Location of ID file.")
+   (candidates-process :initform #'helm-gid-candidates-process)
+   (filtered-candidate-transformer
+    :initform #'helm-gid-filtered-candidate-transformer)
+   (candidate-number-limit :initform 99999)
+   (action :initform (helm-make-actions
+                      "Find File" 'helm-grep-action
+                      "Find file other frame" 'helm-grep-other-frame
+                      (lambda () (and (locate-library "elscreen")
+                                      "Find file in Elscreen"))
+                      'helm-grep-jump-elscreen
+                      "Save results in grep buffer" 'helm-grep-save-results
+                      "Find file other window" 'helm-grep-other-window))
+   (persistent-action :initform 'helm-grep-persistent-action)
+   (history :initform 'helm-grep-history)
+   (nohighlight :initform t)
+   (help-message :initform 'helm-grep-help-message)
+   (requires-pattern :initform 2)))
+
+;;;###autoload
+(defun helm-gid ()
+  "Preconfigured helm for `gid' command line of `ID-Utils'.
+Need A database created with the command `mkid'
+above `default-directory'.
+Need id-utils as dependency which provide `mkid', `gid' etc...
+See <https://www.gnu.org/software/idutils/>."
+  (interactive)
+  (let* ((db (locate-dominating-file
+              default-directory
+              helm-gid-db-file-name))
+         (helm-grep-default-directory-fn
+          (lambda () default-directory))
+         (helm--maybe-use-default-as-input t))
+    (cl-assert db nil "No DataBase found, create one with `mkid'")
+    (helm :sources (helm-make-source "Gid" 'helm-gid-source
+                     :db-dir db)
+          :buffer "*helm gid*"
+          :keymap helm-grep-map
+          :truncate-lines helm-grep-truncate-lines)))
+
+(provide 'helm-id-utils)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-id-utils ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-imenu.el b/emacs.d/elpa/helm-20160115.2200/helm-imenu.el
new file mode 100644
index 0000000..ba4848a
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-imenu.el
@@ -0,0 +1,276 @@
+;;; helm-imenu.el --- Helm interface for Imenu -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'imenu)
+(require 'helm-utils)
+(require 'helm-help)
+
+
+(defgroup helm-imenu nil
+  "Imenu related libraries and applications for helm."
+  :group 'helm)
+
+(defcustom helm-imenu-delimiter " / "
+  "Delimit types of candidates and his value in `helm-buffer'."
+  :group 'helm-imenu
+  :type 'string)
+
+(defcustom helm-imenu-execute-action-at-once-if-one
+  #'helm-imenu--execute-action-at-once-p
+  "Goto the candidate when only one is remaining."
+  :group 'helm-imenu
+  :type 'function)
+
+(defcustom helm-imenu-lynx-style-map t
+  "Use Arrow keys to jump to occurences."
+  :group 'helm-imenu
+  :type  'boolean)
+
+
+;;; keymap
+(defvar helm-imenu-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-<down>") 'helm-imenu-next-section)
+    (define-key map (kbd "M-<up>")   'helm-imenu-previous-section)
+    (when helm-imenu-lynx-style-map
+      (define-key map (kbd "<left>")  'helm-maybe-exit-minibuffer)
+      (define-key map (kbd "<right>") 'helm-execute-persistent-action))
+    (delq nil map)))
+
+(defun helm-imenu-next-or-previous-section (n)
+  (with-helm-buffer
+    (let* ((fn (lambda ()
+                 (car (split-string (helm-get-selection nil t)
+                                    helm-imenu-delimiter))))
+           (curtype (funcall fn))
+           (move-fn (if (> n 0) #'helm-next-line #'helm-previous-line))
+           (stop-fn (if (> n 0)
+                        #'helm-end-of-source-p
+                        #'helm-beginning-of-source-p)))
+      (catch 'break
+        (while (not (funcall stop-fn))
+          (funcall move-fn)
+          (unless (string= curtype (funcall fn))
+            (throw 'break nil)))))))
+
+(defun helm-imenu-next-section ()
+  (interactive)
+  (helm-imenu-next-or-previous-section 1))
+
+(defun helm-imenu-previous-section ()
+  (interactive)
+  (helm-imenu-next-or-previous-section -1))
+
+
+;;; Internals
+(defvar helm-cached-imenu-alist nil)
+(make-variable-buffer-local 'helm-cached-imenu-alist)
+
+(defvar helm-cached-imenu-candidates nil)
+(make-variable-buffer-local 'helm-cached-imenu-candidates)
+
+(defvar helm-cached-imenu-tick nil)
+(make-variable-buffer-local 'helm-cached-imenu-tick)
+
+
+(defvar helm-source-imenu nil "See (info \"(emacs)Imenu\")")
+(defvar helm-source-imenu-all nil)
+
+(defclass helm-imenu-source (helm-source-sync)
+  ((candidates :initform 'helm-imenu-candidates)
+   (candidate-transformer :initform 'helm-imenu-transformer)
+   (persistent-action :initform 'helm-imenu-persistent-action)
+   (persistent-help :initform "Show this entry")
+   (keymap :initform helm-imenu-map)
+   (help-message :initform 'helm-imenu-help-message)
+   (action :initform 'helm-imenu-action)))
+
+(defcustom helm-imenu-fuzzy-match nil
+  "Enable fuzzy matching in `helm-source-imenu'."
+  :group 'helm-imenu
+  :type  'boolean
+  :set (lambda (var val)
+         (set var val)
+         (setq helm-source-imenu
+               (helm-make-source "Imenu" 'helm-imenu-source
+                 :fuzzy-match helm-imenu-fuzzy-match))))
+
+(defun helm-imenu--maybe-switch-to-buffer (candidate)
+  (helm-aif (marker-buffer (cdr candidate))
+      (switch-to-buffer it)))
+
+(defun helm-imenu--execute-action-at-once-p ()
+  (let ((cur (helm-get-selection))
+        (mb (with-helm-current-buffer
+              (save-excursion
+                (goto-char (point-at-bol))
+                 (point-marker)))))
+    (if (equal (cdr cur) mb)
+        (prog1 nil
+          (helm-set-pattern "")
+          (helm-force-update))
+        t)))
+
+(defun helm-imenu-action (candidate)
+  "Default action for `helm-source-imenu'."
+  (helm-log-run-hook 'helm-goto-line-before-hook)
+  (helm-imenu--maybe-switch-to-buffer candidate)
+  (imenu candidate)
+  ;; If semantic is supported in this buffer
+  ;; imenu used `semantic-imenu-goto-function'
+  ;; and position have been highlighted,
+  ;; no need to highlight again.
+  (unless (eq imenu-default-goto-function
+              'semantic-imenu-goto-function)
+    (helm-highlight-current-line nil nil nil nil 'pulse)))
+
+(defun helm-imenu-persistent-action (candidate)
+  "Default persistent action for `helm-source-imenu'."
+  (helm-imenu--maybe-switch-to-buffer candidate)
+  (imenu candidate)
+  (helm-highlight-current-line))
+
+(defun helm-imenu-candidates (&optional buffer)
+  (with-current-buffer (or buffer helm-current-buffer)
+    (let ((tick (buffer-modified-tick)))
+      (if (eq helm-cached-imenu-tick tick)
+          helm-cached-imenu-candidates
+        (setq imenu--index-alist nil)
+        (prog1 (setq helm-cached-imenu-candidates
+                     (let ((index (imenu--make-index-alist t))) 
+                       (helm-imenu--candidates-1
+                        (delete (assoc "*Rescan*" index) index))))
+          (setq helm-cached-imenu-tick tick))))))
+
+(defun helm-imenu-candidates-in-all-buffers ()
+  (let* ((lst (buffer-list))
+         (progress-reporter (make-progress-reporter
+                             "Imenu indexing buffers..." 1 (length lst))))
+    (prog1
+        (cl-loop for b in lst
+                 for count from 1
+                 for mm = (with-current-buffer b major-mode)
+                 for cmm = (with-helm-current-buffer major-mode)
+                 when (or (with-helm-current-buffer
+                            (derived-mode-p mm))
+                          (with-current-buffer b
+                            (derived-mode-p cmm)))
+                 do (progress-reporter-update progress-reporter count)
+                 and
+                 append (with-current-buffer b
+                          (helm-imenu-candidates b)))
+      (progress-reporter-done progress-reporter))))
+
+(defun helm-imenu--candidates-1 (alist)
+  (cl-loop for elm in alist
+           nconc (if (imenu--subalist-p elm)
+                     (helm-imenu--candidates-1
+                      (cl-loop for (e . v) in (cdr elm) collect
+                               (cons (propertize
+                                      e 'helm-imenu-type (car elm))
+                                     ;; If value is an integer, convert it
+                                     ;; to a marker, otherwise it is a cons cell
+                                     ;; and it will be converted on next recursions.
+                                     ;; (Issue #1060) [1]. 
+                                     (if (integerp v) (copy-marker v) v))))
+                     (and (cdr elm) ; bug in imenu, should not be needed.
+                          (setcdr elm (copy-marker (cdr elm))) ; Same as [1].
+                          (list elm)))))
+
+(defun helm-imenu--get-prop (item)
+  ;; property value of ITEM can have itself
+  ;; a property value which have itself a property value
+  ;; ...and so on; Return a list of all these
+  ;; properties values starting at ITEM.
+  (let* ((prop (get-text-property 0 'helm-imenu-type item))
+         (lst  (list prop item)))
+    (when prop
+      (while prop
+        (setq prop (get-text-property 0 'helm-imenu-type prop))
+        (and prop (push prop lst)))
+      lst)))
+
+(defun helm-imenu-transformer (candidates)
+  (cl-loop for (k . v) in candidates
+        for types = (or (helm-imenu--get-prop k)
+                        (list "Function" k))
+        for bufname = (buffer-name (marker-buffer v))
+        for disp1 = (mapconcat
+                     (lambda (x)
+                       (propertize
+                        x 'face (cond ((string= x "Variables")
+                                       'font-lock-variable-name-face)
+                                      ((string= x "Function")
+                                       'font-lock-function-name-face)
+                                      ((string= x "Types")
+                                       'font-lock-type-face))))
+                     types helm-imenu-delimiter)
+        for disp = (propertize disp1 'help-echo bufname)
+        collect
+        (cons disp (cons k v))))
+
+;;;###autoload
+(defun helm-imenu ()
+  "Preconfigured `helm' for `imenu'."
+  (interactive)
+  (unless helm-source-imenu
+    (setq helm-source-imenu
+          (helm-make-source "Imenu" 'helm-imenu-source
+            :fuzzy-match helm-imenu-fuzzy-match)))
+  (let ((imenu-auto-rescan t)
+        (str (thing-at-point 'symbol))
+        (helm-execute-action-at-once-if-one
+         helm-imenu-execute-action-at-once-if-one))
+    (helm :sources 'helm-source-imenu
+          :default (list (concat "\\_<" str "\\_>") str)
+          :preselect str
+          :buffer "*helm imenu*")))
+
+;;;###autoload
+(defun helm-imenu-in-all-buffers ()
+  "Preconfigured helm for fetching imenu entries of all buffers."
+  (interactive)
+  (unless helm-source-imenu-all
+    (setq helm-source-imenu-all
+          (helm-make-source "Imenu in all buffers" 'helm-imenu-source
+            :candidates 'helm-imenu-candidates-in-all-buffers
+            :fuzzy-match helm-imenu-fuzzy-match)))
+  (let ((imenu-auto-rescan t)
+        (str (thing-at-point 'symbol))
+        (helm-execute-action-at-once-if-one
+         helm-imenu-execute-action-at-once-if-one))
+    (helm :sources 'helm-source-imenu-all
+          :default (list (concat "\\_<" str "\\_>") str)
+          :preselect (unless (memq 'helm-source-imenu-all
+                                   helm-sources-using-default-as-input)
+                       str)
+          :buffer "*helm imenu all*")))
+
+(provide 'helm-imenu)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-imenu.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-info.el b/emacs.d/elpa/helm-20160115.2200/helm-info.el
new file mode 100644
index 0000000..1abcd2e
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-info.el
@@ -0,0 +1,238 @@
+;;; helm-info.el --- Browse info index with helm -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-lib)
+(require 'helm-plugin)
+(require 'info)
+
+(declare-function Info-index-nodes "info" (&optional file))
+(declare-function Info-goto-node "info" (&optional fork))
+(declare-function Info-find-node "info.el" (filename nodename &optional no-going-back))
+(defvar Info-history)
+(defvar Info-directory-list)
+
+;;; Customize
+
+(defgroup helm-info nil
+  "Info-related applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-info-default-sources
+  '(helm-source-info-elisp
+    helm-source-info-cl
+    helm-source-info-eieio
+    helm-source-info-pages)
+  "Default sources to use for looking up symbols at point in Info
+files with `helm-info-at-point'."
+  :group 'helm-info
+  :type '(repeat (choice symbol)))
+
+;;; Build info-index sources with `helm-info-source' class.
+
+(cl-defun helm-info-init (&optional (file (helm-attr 'info-file)))
+  ;; Allow reinit candidate buffer when using edebug.
+  (helm-aif (and debug-on-error
+                 (helm-candidate-buffer))
+      (kill-buffer it))
+  (unless (helm-candidate-buffer)
+    (save-window-excursion
+      (info file)
+      (let ((tobuf (helm-candidate-buffer 'global))
+            (infobuf (current-buffer))
+            Info-history
+            start end)
+        (cl-dolist (node (Info-index-nodes))
+          (Info-goto-node node)
+          (goto-char (point-min))
+          (while (search-forward "\n* " nil t)
+            (unless (search-forward "Menu:\n" (1+ (point-at-eol)) t)
+              (setq start (point-at-bol)
+                    end (point-at-eol))
+              (with-current-buffer tobuf
+                (insert-buffer-substring infobuf start end)
+                (insert "\n")))))))))
+
+(defun helm-info-goto (node-line)
+  (Info-goto-node (car node-line))
+  (helm-goto-line (cdr node-line)))
+
+(defun helm-info-display-to-real (line)
+  (and (string-match
+        ;; This regexp is stolen from Info-apropos-matches
+        "\\* +\\([^\n]*.+[^\n]*\\):[ \t]+\\([^\n]*\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?" line)
+       (cons (format "(%s)%s" (helm-attr 'info-file) (match-string 2 line))
+             (string-to-number (or (match-string 3 line) "1")))))
+
+(defclass helm-info-source (helm-source-in-buffer)
+  ((info-file :initarg :info-file
+              :initform nil
+              :custom 'string)
+   (init :initform #'helm-info-init)
+   (display-to-real :initform #'helm-info-display-to-real)
+   (get-line :initform #'buffer-substring)
+   (action :initform '(("Goto node" . helm-info-goto)))))
+
+(defmacro helm-build-info-source (fname &rest args)
+  `(helm-make-source (concat "Info Index: " ,fname) 'helm-info-source
+     :info-file ,fname ,@args))
+
+(defun helm-build-info-index-command (name doc source buffer)
+  "Define a helm command NAME with documentation DOC.
+Arg SOURCE will be an existing helm source named
+`helm-source-info-<NAME>' and BUFFER a string buffer name."
+  (defalias (intern (concat "helm-info-" name))
+      (lambda ()
+        (interactive)
+        (helm :sources source
+              :buffer buffer
+              :candidate-number-limit 1000))
+    doc))
+
+(defun helm-define-info-index-sources (var-value &optional commands)
+  "Define helm sources named helm-source-info-<NAME>.
+Sources are generated for all entries of `helm-default-info-index-list'.
+If COMMANDS arg is non-nil, also build commands named `helm-info-<NAME>'.
+Where NAME is an element of `helm-default-info-index-list'."
+  (cl-loop for str in var-value
+           for sym = (intern (concat "helm-source-info-" str))
+           do (set sym (helm-build-info-source str))
+           when commands
+           do (helm-build-info-index-command
+               str (format "Predefined helm for %s info." str)
+               sym (format "*helm info %s*" str))))
+
+(defun helm-info-index-set (var value)
+  (set var value)
+  (helm-define-info-index-sources value t))
+
+;;; Search Info files
+
+;; `helm-info' is the main entry point here. It prompts the user for an Info
+;; file, then a term in the file's index to jump to.
+
+(defvar helm-info-searched (make-ring 32)
+  "Ring of previously searched Info files.")
+
+(defun helm-get-info-files ()
+  "Return list of Info files to use for `helm-info'.
+
+Elements of the list are strings of Info file names without
+extensions (e.g. \"emacs\" for file \"emacs.info.gz\"). Info
+files are found by searching directories in
+`Info-directory-list'."
+  (let ((files (cl-loop for d in (or Info-directory-list
+                                     Info-default-directory-list)
+                        when (file-directory-p d)
+                        append (directory-files d nil "\\.info"))))
+    (helm-fast-remove-dups
+     (cl-loop for f in files collect
+              (helm-file-name-sans-extension f))
+     :test 'equal)))
+
+(defcustom helm-default-info-index-list
+  (helm-get-info-files)
+  "Info files to search in with `helm-info'."
+  :group 'helm-info
+  :type  '(repeat (choice string))
+  :set   'helm-info-index-set)
+
+(defun helm-info-search-index (candidate)
+  "Search the index of CANDIDATE's Info file using the function
+helm-info-<CANDIDATE>."
+  (let ((helm-info-function
+         (intern-soft (concat "helm-info-" candidate))))
+    (when (fboundp helm-info-function)
+      (funcall helm-info-function)
+      (ring-insert helm-info-searched candidate))))
+
+(defun helm-def-source--info-files ()
+  "Return a `helm' source for Info files."
+  (helm-build-sync-source "Helm Info"
+    :candidates
+    (lambda () (copy-sequence helm-default-info-index-list))
+    :candidate-number-limit 999
+    :candidate-transformer
+    (lambda (candidates)
+      (sort candidates #'string-lessp))
+    :nomark t
+    :action '(("Search index" . helm-info-search-index))))
+
+;;;###autoload
+(defun helm-info ()
+  "Preconfigured `helm' for searching Info files' indices."
+  (interactive)
+  (let ((default (unless (ring-empty-p helm-info-searched)
+                   (ring-ref helm-info-searched 0))))
+    (helm :sources (helm-def-source--info-files)
+          :buffer "*helm Info*"
+          :preselect (and default
+                          (concat "\\_<" (regexp-quote default) "\\_>")))))
+
+;;;; Info at point
+
+;; `helm-info-at-point' is the main entry point here. It searches for the
+;; symbol at point through the Info sources defined in
+;; `helm-info-default-sources' and jumps to it.
+
+(defvar helm-info--pages-cache nil
+  "Cache for all Info pages on the system.")
+
+(defvar helm-source-info-pages
+  (helm-build-sync-source "Info Pages"
+    :init #'helm-info-pages-init
+    :candidates (lambda () helm-info--pages-cache)
+    :action '(("Show with Info" .(lambda (node-str)
+                                  (info (replace-regexp-in-string
+                                         "^[^:]+: " "" node-str)))))
+    :requires-pattern 2)
+  "Helm source for Info pages.")
+
+(defun helm-info-pages-init ()
+  "Collect candidates for initial Info node Top."
+  (if helm-info--pages-cache
+      helm-info--pages-cache
+    (let ((info-topic-regexp "\\* +\\([^:]+: ([^)]+)[^.]*\\)\\.")
+          topics)
+      (with-temp-buffer
+        (Info-find-node "dir" "top")
+        (goto-char (point-min))
+        (while (re-search-forward info-topic-regexp nil t)
+          (push (match-string-no-properties 1) topics))
+        (kill-buffer))
+      (setq helm-info--pages-cache topics))))
+
+;;;###autoload
+(defun helm-info-at-point ()
+  "Preconfigured `helm' for searching info at point.
+With a prefix-arg insert symbol at point."
+  (interactive)
+  (helm :sources helm-info-default-sources
+        :buffer "*helm info*"))
+
+(provide 'helm-info)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-info.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-locate.el b/emacs.d/elpa/helm-20160115.2200/helm-locate.el
new file mode 100644
index 0000000..05dac7f
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-locate.el
@@ -0,0 +1,401 @@
+;;; helm-locate.el --- helm interface for locate. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; NOTE for WINDOZE users:
+;; You have to install Everything with his command line interface here:
+;; http://www.voidtools.com/download.php
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-types)
+(require 'helm-help)
+
+
+(defgroup helm-locate nil
+  "Locate related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-locate-db-file-regexp "m?locate\.db$"
+  "Default regexp to match locate database.
+If nil Search in all files."
+  :type  'string
+  :group 'helm-locate)
+
+(defcustom helm-ff-locate-db-filename "locate.db"
+  "The basename of the locatedb file you use locally in your directories.
+When this is set and `helm' find such a file in the directory from
+where you launch locate, it will use this file and will not prompt you
+for a db file.
+Note that this happen only when locate is launched with a prefix arg."
+  :group 'helm-locate
+  :type 'string)
+
+(defcustom helm-locate-command nil
+  "A list of arguments for locate program.
+Normally the default value should work on any system.
+
+If nil it will be calculated when `helm-locate' startup
+with these default values for different systems:
+
+Gnu/linux: \"locate %s -e --regex %s\"
+berkeley-unix: \"locate %s %s\"
+windows-nt: \"es %s %s\"
+Others: \"locate %s %s\"
+
+This string will be passed to format so it should end with `%s'.
+The first format spec is used for the \"-i\" value of locate/es,
+So don't set it directly but use `helm-locate-case-fold-search'
+for this.
+The \"-r\" option must be the last option, however if not specified you will
+be able to specify it during helm invocation by prefixing the pattern
+you enter with \"-r\"."
+  :type 'string
+  :group 'helm-locate)
+
+(defcustom helm-locate-create-db-command
+  "updatedb -l 0 -o %s -U %s"
+  "Command used to create a locale locate db file."
+  :type 'string
+  :group 'helm-locate)
+
+(defcustom helm-locate-case-fold-search helm-case-fold-search
+  "It have the same meaning as `helm-case-fold-search'.
+The -i option of locate will be used depending of value of
+`helm-pattern' when this is set to 'smart.
+When nil \"-i\" will not be used at all.
+and when non--nil it will always be used.
+NOTE: the -i option of the \"es\" command used on windows does
+the opposite of \"locate\" command."
+  :group 'helm-locate
+  :type 'symbol)
+
+(defcustom helm-locate-fuzzy-match nil
+  "Enable fuzzy matching in `helm-locate'."
+  :group 'helm-locate
+  :type 'boolean)
+
+(defcustom helm-locate-project-list nil
+  "A list of directories, your projects.
+When set, allow browsing recursively files in all
+directories of this list with `helm-projects-find-files'."
+  :group 'helm-locate
+  :type '(repeat string))
+
+
+(defvar helm-generic-files-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "C-]")     'helm-ff-run-toggle-basename)
+    (define-key map (kbd "C-s")     'helm-ff-run-grep)
+    (define-key map (kbd "M-g s")   'helm-ff-run-grep)
+    (define-key map (kbd "M-g z")   'helm-ff-run-zgrep)
+    (define-key map (kbd "M-g p")   'helm-ff-run-pdfgrep)
+    (define-key map (kbd "C-c g")   'helm-ff-run-gid)
+    (define-key map (kbd "M-R")     'helm-ff-run-rename-file)
+    (define-key map (kbd "M-C")     'helm-ff-run-copy-file)
+    (define-key map (kbd "M-B")     'helm-ff-run-byte-compile-file)
+    (define-key map (kbd "M-L")     'helm-ff-run-load-file)
+    (define-key map (kbd "M-S")     'helm-ff-run-symlink-file)
+    (define-key map (kbd "M-H")     'helm-ff-run-hardlink-file)
+    (define-key map (kbd "M-D")     'helm-ff-run-delete-file)
+    (define-key map (kbd "C-=")     'helm-ff-run-ediff-file)
+    (define-key map (kbd "C-c =")   'helm-ff-run-ediff-merge-file)
+    (define-key map (kbd "C-c o")   'helm-ff-run-switch-other-window)
+    (define-key map (kbd "C-c C-o") 'helm-ff-run-switch-other-frame)
+    (define-key map (kbd "M-i")     'helm-ff-properties-persistent)
+    (define-key map (kbd "C-c C-x") 'helm-ff-run-open-file-externally)
+    (define-key map (kbd "C-c X")   'helm-ff-run-open-file-with-default-tool)
+    (define-key map (kbd "M-.")     'helm-ff-run-etags)
+    (define-key map (kbd "C-w")     'helm-yank-text-at-point)
+    (define-key map (kbd "C-c @")   'helm-ff-run-insert-org-link)
+    map)
+  "Generic Keymap for files.")
+
+
+(defface helm-locate-finish
+    '((t (:foreground "Green")))
+  "Face used in mode line when locate process is finish."
+  :group 'helm-locate)
+
+
+(defun helm-ff-find-locatedb (&optional from-ff)
+  "Try to find if a local locatedb file is available.
+The search is done in `helm-ff-default-directory' or
+fall back to `default-directory' if FROM-FF is nil."
+  (when helm-ff-locate-db-filename
+    (cond ((and helm-ff-default-directory
+                from-ff
+                (file-exists-p (expand-file-name
+                                helm-ff-locate-db-filename
+                                helm-ff-default-directory))
+                (expand-file-name
+                 helm-ff-locate-db-filename
+                 helm-ff-default-directory)))
+          ((and (not from-ff)
+                (file-exists-p (expand-file-name
+                                helm-ff-locate-db-filename
+                                default-directory))
+                (expand-file-name
+                 helm-ff-locate-db-filename
+                 default-directory))))))
+
+
+(defun helm-locate-create-db-default-function (db-name directory)
+  "Default function used to create a locale locate db file.
+Argument DB-NAME name of the db file.
+Argument DIRECTORY root of file system subtree to scan."
+  (format helm-locate-create-db-command db-name directory))
+
+(defvar helm-locate-create-db-function
+  #'helm-locate-create-db-default-function
+  "Function used to create a locale locate db file.
+It should receive the same arguments as
+`helm-locate-create-db-default-function'.")
+
+(defun helm-locate-1 (&optional localdb init from-ff default)
+  "Generic function to run Locate.
+Prefix arg LOCALDB when (4) search and use a local locate db file when it
+exists or create it, when (16) force update of existing db file
+even if exists.
+It have no effect when locate command is 'es'.
+INIT is a string to use as initial input in prompt.
+See `helm-locate-with-db' and `helm-locate'."
+  (require 'helm-mode)
+  (helm-locate-set-command)
+  (let ((pfn (lambda (candidate)
+                 (if (file-directory-p candidate)
+                     (message "Error: The locate Db should be a file")
+                   (if (= (shell-command
+                           (funcall helm-locate-create-db-function
+                                    candidate
+                                    helm-ff-default-directory))
+                          0)
+                       (message "New locatedb file `%s' created" candidate)
+                     (error "Failed to create locatedb file `%s'" candidate)))))
+        (locdb (and localdb
+                    (not (string-match "^es" helm-locate-command))
+                    (or (and (equal '(4) localdb)
+                             (helm-ff-find-locatedb from-ff))
+                        (helm-read-file-name
+                         "Create Locate Db file: "
+                         :initial-input (expand-file-name "locate.db"
+                                                          (or helm-ff-default-directory
+                                                              default-directory))
+                         :preselect helm-locate-db-file-regexp
+                         :test (lambda (x)
+                                   (if helm-locate-db-file-regexp
+                                       ;; Select only locate db files and directories
+                                       ;; to allow navigation.
+                                       (or (string-match
+                                            helm-locate-db-file-regexp x)
+                                           (file-directory-p x))
+                                     x)))))))
+    (when (and locdb (or (equal localdb '(16))
+                         (not (file-exists-p locdb))))
+      (funcall pfn locdb))
+    (helm-locate-with-db (and localdb locdb) init default)))
+
+(defun helm-locate-set-command ()
+  "Setup `helm-locate-command' if not already defined."
+  (unless helm-locate-command
+    (setq helm-locate-command
+          (cl-case system-type
+            (gnu/linux "locate %s -e --regex %s")
+            (berkeley-unix "locate %s %s")
+            (windows-nt "es %s %s")
+            (t "locate %s %s")))))
+
+(defvar helm-file-name-history nil)
+(defun helm-locate-with-db (&optional db initial-input default)
+  "Run locate -d DB.
+If DB is not given or nil use locate without -d option.
+Argument DB can be given as a string or list of db files.
+Argument INITIAL-INPUT is a string to use as initial-input.
+See also `helm-locate'."
+  (require 'helm-files)
+  (when (and db (stringp db)) (setq db (list db)))
+  (helm-locate-set-command)
+  (let ((helm-locate-command
+         (if db
+             (replace-regexp-in-string
+              "locate"
+              (format "locate -d %s"
+                      (mapconcat 'identity
+                                 ;; Remove eventually
+                                 ;; marked directories by error.
+                                 (cl-loop for i in db
+                                       unless (file-directory-p i)
+                                       collect i) ":"))
+              helm-locate-command)
+           helm-locate-command)))
+    (setq helm-file-name-history (mapcar 'helm-basename file-name-history))
+    (helm :sources 'helm-source-locate
+          :buffer "*helm locate*"
+          :ff-transformer-show-only-basename nil
+          :input initial-input
+          :default default
+          :history 'helm-file-name-history)))
+
+(defun helm-locate-init ()
+  "Initialize async locate process for `helm-source-locate'."
+  (let* ((locate-is-es (string-match "\\`es" helm-locate-command))
+         (real-locate (string-match "\\`locate" helm-locate-command))
+         (case-sensitive-flag (if locate-is-es "-i" ""))
+         (ignore-case-flag (if (or locate-is-es
+                                   (not real-locate)) "" "-i"))
+         (args (split-string helm-pattern " "))
+         (cmd (format helm-locate-command
+                      (cl-case helm-locate-case-fold-search
+                        (smart (let ((case-fold-search nil))
+                                 (if (string-match "[[:upper:]]" helm-pattern)
+                                     case-sensitive-flag
+                                     ignore-case-flag)))
+                        (t (if helm-locate-case-fold-search
+                               ignore-case-flag
+                               case-sensitive-flag)))
+                      (concat
+                       ;; The pattern itself.
+                       (shell-quote-argument (car args)) " "
+                       ;; Possible locate args added
+                       ;; after pattern, don't quote them.
+                       (mapconcat 'identity (cdr args) " ")))))
+    (helm-log "Starting helm-locate process")
+    (helm-log "Command line used was:\n\n%s"
+              (concat ">>> " (propertize cmd 'face 'font-lock-comment-face) "\n\n"))
+    (prog1
+        (start-process-shell-command
+         "locate-process" helm-buffer
+         cmd)
+      (set-process-sentinel
+       (get-buffer-process helm-buffer)
+       (lambda (_process event)
+           (if (string= event "finished\n")
+               (with-helm-window
+                 (setq mode-line-format
+                       '(" " mode-line-buffer-identification " "
+                         (:eval (format "L%s" (helm-candidate-number-at-point))) " "
+                         (:eval (propertize
+                                 (format "[Locate process finished - (%s results)]"
+                                         (max (1- (count-lines
+                                                   (point-min) (point-max)))
+                                              0))
+                                 'face 'helm-locate-finish))))
+                 (force-mode-line-update))
+             (helm-log "Error: Locate %s"
+                       (replace-regexp-in-string "\n" "" event))))))))
+
+(defclass helm-locate-source (helm-source-async helm-type-file)
+  ((init :initform 'helm-locate-set-command)
+   (candidates-process :initform 'helm-locate-init)
+   (requires-pattern :initform 3)
+   (history :initform 'helm-file-name-history)
+   (persistent-action :initform 'helm-ff-kill-or-find-buffer-fname)
+   (candidate-number-limit :initform 9999)))
+
+(defvar helm-source-locate
+  (helm-make-source "Locate" 'helm-locate-source
+    :pattern-transformer 'helm-locate-pattern-transformer))
+
+(defun helm-locate-pattern-transformer (pattern)
+  (if helm-locate-fuzzy-match
+      (cond ((string-match
+              " " (replace-regexp-in-string " -b" "" pattern)) pattern)
+            ((string-match "\\([^ ]*\\) -b" pattern)
+             (concat (helm--mapconcat-pattern
+                      (match-string 1 pattern)) " -b"))
+            (t (helm--mapconcat-pattern pattern)))
+      pattern))
+
+(defun helm-locate-find-dbs-in-projects (&optional update)
+  (let* ((pfn (lambda (candidate directory)
+                (unless (= (shell-command
+                            (funcall helm-locate-create-db-function
+                                     candidate
+                                     directory))
+                           0)
+                  (error "Failed to create locatedb file `%s'" candidate)))))
+    (cl-loop for p in helm-locate-project-list
+             for db = (expand-file-name
+                       helm-ff-locate-db-filename
+                       (file-name-as-directory p))
+             if (and (null update) (file-exists-p db))
+             collect db
+             else do (funcall pfn db p)
+             and collect db)))
+
+;;;###autoload
+(defun helm-projects-find-files (update)
+  "Find files with locate in `helm-locate-project-list'.
+With a prefix arg refresh the database in each project."
+  (interactive "P")
+  (helm-locate-set-command)
+  (cl-assert (and (string-match-p "\\`locate" helm-locate-command)
+                  (executable-find "updatedb"))
+             nil "Unsupported locate version")
+  (let ((dbs (helm-locate-find-dbs-in-projects update)))
+    (if dbs
+        (helm-locate-with-db dbs)
+        (user-error "No projects found, please setup `helm-locate-project-list'"))))
+
+;;;###autoload
+(defun helm-locate-read-file-name (prompt)
+  (let* ((src `((name . "Locate read fname")
+                (init . helm-locate-set-command)
+                (candidates-process . helm-locate-init)
+                (action . identity)
+                (requires-pattern . 3)
+                (history . ,'helm-file-name-history)
+                (candidate-transformer . (helm-skip-boring-files
+                                          helm-highlight-files))
+                (candidate-number-limit . 9999)
+                (no-matchplugin))))
+    (or (helm :sources src
+              :ff-transformer-show-only-basename nil
+              :prompt prompt
+              :buffer "*helm locate read fname*"
+              :resume 'noresume)
+        (keyboard-quit))))
+
+;;;###autoload
+(defun helm-locate (arg)
+  "Preconfigured `helm' for Locate.
+Note: you can add locate options after entering pattern.
+See 'man locate' for valid options and also `helm-locate-command'.
+
+You can specify a local database with prefix argument ARG.
+With two prefix arg, refresh the current local db or create it
+if it doesn't exists.
+
+To create a user specific db, use
+\"updatedb -l 0 -o db_path -U directory\".
+Where db_path is a filename matched by
+`helm-locate-db-file-regexp'."
+  (interactive "P")
+  (setq helm-ff-default-directory default-directory)
+  (helm-locate-1 arg nil nil (thing-at-point 'filename)))
+
+(provide 'helm-locate)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-locate.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-man.el b/emacs.d/elpa/helm-20160115.2200/helm-man.el
new file mode 100644
index 0000000..8ba5795
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-man.el
@@ -0,0 +1,115 @@
+;;; helm-man.el --- Man and woman UI -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+
+(defvar woman-topic-all-completions)
+(defvar woman-manpath)
+(defvar woman-path)
+(defvar woman-expanded-directory-path)
+(declare-function woman-file-name "woman.el" (topic &optional re-cache))
+(declare-function woman-file-name-all-completions "woman.el" (topic))
+(declare-function Man-getpage-in-background "man.el" (topic))
+(declare-function woman-expand-directory-path "woman.el" (path-dirs path-regexps))
+(declare-function woman-topic-all-completions "woman.el" (path))
+(declare-function helm-generic-sort-fn "helm-utils.el" (S1 S2))
+
+(defgroup helm-man nil
+  "Man and Woman applications for helm."
+  :group 'helm)
+
+(defcustom helm-man-or-woman-function 'Man-getpage-in-background
+  "Default command to display a man page."
+  :group 'helm-man
+  :type '(radio :tag "Preferred command to display a man page"
+          (const :tag "Man" Man-getpage-in-background)
+          (const :tag "Woman" woman)))
+
+(defcustom helm-man-format-switches "-l %s"
+  "Arguments to pass to the `manual-entry' function.
+Arguments are passed to `manual-entry' with `format.'
+Default use \"-l\" which may not be supported on old man versions,
+in this case use \"%s\" as value to pass only the filename as argument.
+See Issue #1035"
+  :group 'helm-man
+  :type 'string)
+
+;; Internal
+(defvar helm-man--pages nil
+  "All man pages on system.
+Will be calculated the first time you invoke helm with this
+source.")
+
+(defun helm-man-default-action (candidate)
+  "Default action for jumping to a woman or man page from helm."
+  (let ((wfiles (mapcar
+                 'car (woman-file-name-all-completions candidate))))
+    (condition-case nil
+        (if (> (length wfiles) 1)
+            (let ((file (helm-comp-read
+                         "ManFile: " wfiles :must-match t)))
+              (if (eq helm-man-or-woman-function 'Man-getpage-in-background)
+                  (manual-entry (format helm-man-format-switches file))
+                  (woman-find-file file)))
+          (funcall helm-man-or-woman-function candidate))
+      ;; If woman is unable to format correctly
+      ;; use man instead.
+      (error (kill-buffer)              ; Kill woman buffer.
+             (Man-getpage-in-background candidate)))))
+
+(defun helm-man--init ()
+  (require 'woman)
+  (require 'helm-utils)
+  (unless helm-man--pages
+    (setq woman-expanded-directory-path
+          (woman-expand-directory-path woman-manpath woman-path))
+    (setq woman-topic-all-completions
+          (woman-topic-all-completions woman-expanded-directory-path))
+    (setq helm-man--pages (mapcar 'car woman-topic-all-completions)))
+  (helm-init-candidates-in-buffer 'global helm-man--pages))
+
+(defvar helm-source-man-pages
+  (helm-build-in-buffer-source "Manual Pages"
+    :init #'helm-man--init 
+    :persistent-action #'ignore
+    :filtered-candidate-transformer
+     (lambda (candidates _source)
+       (sort candidates #'helm-generic-sort-fn))
+    :action  '(("Display Man page" . helm-man-default-action))))
+
+;;;###autoload
+(defun helm-man-woman (arg)
+  "Preconfigured `helm' for Man and Woman pages.
+With a prefix arg reinitialize the cache."
+  (interactive "P")
+  (when arg (setq helm-man--pages nil))
+    (helm :sources 'helm-source-man-pages
+          :buffer "*Helm man woman*"))
+
+(provide 'helm-man)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-man.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-misc.el b/emacs.d/elpa/helm-20160115.2200/helm-misc.el
new file mode 100644
index 0000000..b297a62
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-misc.el
@@ -0,0 +1,334 @@
+;;; helm-misc.el --- Various functions for helm -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-types)
+
+(declare-function display-time-world-display "time.el")
+(defvar display-time-world-list)
+
+
+(defgroup helm-misc nil
+  "Various Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-time-zone-home-location "Paris"
+  "The time zone of your home"
+  :group 'helm-misc
+  :type 'string)
+
+(defcustom helm-timezone-actions
+  '(("Set timezone env (TZ)" . (lambda (candidate)
+                                 (setenv "TZ" candidate))))
+  "Actions for helm-timezone."
+  :group 'helm-misc
+  :type '(alist :key-type string :value-type function))
+
+(defcustom helm-mini-default-sources '(helm-source-buffers-list
+                                       helm-source-recentf
+                                       helm-source-buffer-not-found)
+  "Default sources list used in `helm-mini'."
+  :group 'helm-misc
+  :type '(repeat (choice symbol)))
+
+(defface helm-time-zone-current
+    '((t (:foreground "green")))
+  "Face used to colorize current time in `helm-world-time'."
+  :group 'helm-misc)
+
+(defface helm-time-zone-home
+    '((t (:foreground "red")))
+  "Face used to colorize home time in `helm-world-time'."
+  :group 'helm-misc)
+
+
+
+;;; Latex completion
+(defvar LaTeX-math-menu)
+(defun helm-latex-math-candidates ()
+  "Collect candidates for latex math completion."
+  (cl-loop for i in (cddr LaTeX-math-menu)
+        for elm = (cl-loop for s in i when (vectorp s)
+                        collect (cons (aref s 0) (aref s 1)))
+        append elm))
+
+(defvar helm-source-latex-math
+  '((name . "Latex Math Menu")
+    (init . (lambda ()
+              (with-helm-current-buffer
+                (LaTeX-math-mode 1))))
+    (candidate-number-limit . 9999)
+    (candidates . helm-latex-math-candidates)
+    (action . (lambda (candidate)
+                (call-interactively candidate)))))
+
+
+;;; Jabber Contacts (jabber.el)
+(defun helm-jabber-online-contacts ()
+  "List online Jabber contacts."
+  (with-no-warnings
+    (cl-loop for item in (jabber-concat-rosters)
+          when (get item 'connected)
+          collect
+          (if (get item 'name)
+              (cons (get item 'name) item)
+            (cons (symbol-name item) item)))))
+
+(defvar helm-source-jabber-contacts
+  '((name . "Jabber Contacts")
+    (init . (lambda () (require 'jabber)))
+    (candidates . (lambda () (mapcar 'car (helm-jabber-online-contacts))))
+    (action . (lambda (x)
+                (jabber-chat-with
+                 (jabber-read-account)
+                 (symbol-name
+                  (cdr (assoc x (helm-jabber-online-contacts)))))))))
+
+;;; World time
+;;
+(defun helm-time-zone-transformer (candidates _source)
+  (cl-loop for i in candidates
+           for (z . p) in display-time-world-list
+           collect
+           (cons 
+            (cond ((string-match (format-time-string "%H:%M" (current-time)) i)
+                   (propertize i 'face 'helm-time-zone-current))
+                  ((string-match helm-time-zone-home-location i)
+                   (propertize i 'face 'helm-time-zone-home))
+                  (t i))
+            z)))
+
+(defvar helm-source-time-world
+  (helm-build-in-buffer-source "Time World List"
+    :data (lambda ()
+            (with-temp-buffer
+              (display-time-world-display display-time-world-list)
+              (buffer-string)))
+    :action 'helm-timezone-actions
+    :filtered-candidate-transformer 'helm-time-zone-transformer))
+
+;;; LaCarte
+;;
+;;
+(declare-function lacarte-get-overall-menu-item-alist "ext:lacarte.el" (&optional MAPS))
+
+(defun helm-lacarte-candidate-transformer (cands)
+  (mapcar (lambda (cand)
+            (let* ((item (car cand))
+                   (match (string-match "[^>] \\((.*)\\)$" item)))
+              (when match
+                (put-text-property (match-beginning 1) (match-end 1)
+                                   'face 'helm-M-x-key item))
+              cand))
+          cands))
+
+(defclass helm-lacarte (helm-source-sync helm-type-command)
+    ((init :initform (lambda () (require 'lacarte)))
+     (candidates :initform 'helm-lacarte-get-candidates)
+     (candidate-transformer :initform 'helm-lacarte-candidate-transformer)
+     (candidate-number-limit :initform 9999)))
+
+(defun helm-lacarte-get-candidates (&optional maps)
+  "Extract candidates for menubar using lacarte.el.
+See http://www.emacswiki.org/cgi-bin/wiki/download/lacarte.el.
+Optional argument MAPS is a list specifying which keymaps to use: it
+can contain the symbols `local', `global', and `minor', mean the
+current local map, current global map, and all current minor maps."
+  (with-helm-current-buffer
+    ;; FIXME: do we still need to remove possible '(nil) candidates.
+    (lacarte-get-overall-menu-item-alist maps)))
+
+;;;###autoload
+(defun helm-browse-menubar ()
+  "Preconfigured helm to the menubar using lacarte.el."
+  (interactive)
+  (require 'lacarte)
+  (helm :sources (mapcar 
+                  (lambda (spec) (helm-make-source (car spec) 'helm-lacarte
+                              :candidates (lambda () (helm-lacarte-get-candidates (cdr spec)))))
+                  '(("Major Mode"  . (local))
+                    ("Minor Modes" . (minor))
+                    ("Global Map"  . (global))))
+        :buffer "*helm lacarte*"))
+
+(defun helm-call-interactively (cmd-or-name)
+  "Execute CMD-OR-NAME as Emacs command.
+It is added to `extended-command-history'.
+`helm-current-prefix-arg' is used as the command's prefix argument."
+  (setq extended-command-history
+        (cons (helm-stringify cmd-or-name)
+              (delete (helm-stringify cmd-or-name) extended-command-history)))
+  (let ((current-prefix-arg helm-current-prefix-arg)
+        (cmd (helm-symbolify cmd-or-name)))
+    (if (stringp (symbol-function cmd))
+        (execute-kbd-macro (symbol-function cmd))
+      (setq this-command cmd)
+      (call-interactively cmd))))
+
+;;; Minibuffer History
+;;
+;;
+(defvar helm-source-minibuffer-history
+  (helm-build-sync-source "Minibuffer History"
+    :header-name (lambda (name)
+                   (format "%s (%s)" name minibuffer-history-variable))
+    :candidates
+     (lambda ()
+       (let ((history (cl-loop for i in
+                               (symbol-value minibuffer-history-variable)
+                               unless (string= "" i) collect i)))
+         (if (consp (car history))
+             (mapcar 'prin1-to-string history)
+             history)))
+    :migemo t
+    :multiline t
+    :action (lambda (candidate)
+              (delete-minibuffer-contents)
+              (insert candidate))))
+
+;;; Shell history
+;;
+;;
+(defun helm-comint-input-ring-action (candidate)
+  "Default action for comint history."
+  (with-helm-current-buffer
+    (delete-region (comint-line-beginning-position) (point-max))
+    (insert candidate)))
+
+(defvar helm-source-comint-input-ring
+  '((name . "Comint history")
+    (candidates . (lambda ()
+                    (with-helm-current-buffer
+                      (ring-elements comint-input-ring))))
+    (action . helm-comint-input-ring-action))
+  "Source that provide helm completion against `comint-input-ring'.")
+
+
+;;; Helm ratpoison UI
+;;
+;;
+(defvar helm-source-ratpoison-commands
+  '((name . "Ratpoison Commands")
+    (init . helm-ratpoison-commands-init)
+    (candidates-in-buffer)
+    (action ("Execute the command" . helm-ratpoison-commands-execute))
+    (display-to-real . helm-ratpoison-commands-display-to-real)
+    (candidate-number-limit)))
+
+(defun helm-ratpoison-commands-init ()
+  (unless (helm-candidate-buffer)
+    (with-current-buffer (helm-candidate-buffer 'global)
+      ;; with ratpoison prefix key
+      (save-excursion
+        (call-process "ratpoison" nil (current-buffer) nil "-c" "help"))
+      (while (re-search-forward "^\\([^ ]+\\) \\(.+\\)$" nil t)
+        (replace-match "<ratpoison> \\1: \\2"))
+      (goto-char (point-max))
+      ;; direct binding
+      (save-excursion
+        (call-process "ratpoison" nil (current-buffer) nil "-c" "help top"))
+      (while (re-search-forward "^\\([^ ]+\\) \\(.+\\)$" nil t)
+        (replace-match "\\1: \\2")))))
+
+(defun helm-ratpoison-commands-display-to-real (display)
+  (and (string-match ": " display)
+       (substring display (match-end 0))))
+
+(defun helm-ratpoison-commands-execute (candidate)
+  (call-process "ratpoison" nil nil nil "-ic" candidate))
+
+;;; Helm stumpwm UI
+;;
+;;
+(defvar helm-source-stumpwm-commands
+  '((name . "Stumpwm Commands")
+    (init . helm-stumpwm-commands-init)
+    (candidates-in-buffer)
+    (action ("Execute the command" . helm-stumpwm-commands-execute))
+    (candidate-number-limit)))
+
+(defun helm-stumpwm-commands-init ()
+  (with-current-buffer (helm-candidate-buffer 'global)
+    (save-excursion
+      (call-process "stumpish" nil (current-buffer) nil "commands"))
+    (while (re-search-forward "[ ]*\\([^ ]+\\)[ ]*\n?" nil t)
+      (replace-match "\n\\1\n"))
+    (delete-blank-lines)
+    (sort-lines nil (point-min) (point-max))
+    (goto-char (point-max))))
+
+(defun helm-stumpwm-commands-execute (candidate)
+  (call-process "stumpish" nil nil nil  candidate))
+
+;;;###autoload
+(defun helm-world-time ()
+  "Preconfigured `helm' to show world time.
+Default action change TZ environment variable locally to emacs."
+  (interactive)
+  (helm-other-buffer 'helm-source-time-world "*helm world time*"))
+
+;;;###autoload
+(defun helm-insert-latex-math ()
+  "Preconfigured helm for latex math symbols completion."
+  (interactive)
+  (helm-other-buffer 'helm-source-latex-math "*helm latex*"))
+
+;;;###autoload
+(defun helm-ratpoison-commands ()
+  "Preconfigured `helm' to execute ratpoison commands."
+  (interactive)
+  (helm-other-buffer 'helm-source-ratpoison-commands
+                     "*helm ratpoison commands*"))
+
+;;;###autoload
+(defun helm-stumpwm-commands()
+  "Preconfigured helm for stumpwm commands."
+  (interactive)
+  (helm-other-buffer 'helm-source-stumpwm-commands
+                     "*helm stumpwm commands*"))
+
+;;;###autoload
+(defun helm-minibuffer-history ()
+  "Preconfigured `helm' for `minibuffer-history'."
+  (interactive)
+  (let ((enable-recursive-minibuffers t))
+    (helm :sources 'helm-source-minibuffer-history
+          :buffer "*helm minibuffer-history*")))
+
+;;;###autoload
+(defun helm-comint-input-ring ()
+  "Preconfigured `helm' that provide completion of `comint' history."
+  (interactive)
+  (when (derived-mode-p 'comint-mode)
+    (helm :sources 'helm-source-comint-input-ring
+          :input (buffer-substring-no-properties (comint-line-beginning-position)
+                                                 (point-at-eol))
+          :buffer "*helm comint history*")))
+
+
+(provide 'helm-misc)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-misc.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-mode.el b/emacs.d/elpa/helm-20160115.2200/helm-mode.el
new file mode 100644
index 0000000..b9fb2e1
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-mode.el
@@ -0,0 +1,1211 @@
+;;; helm-mode.el --- Enable helm completion everywhere. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-files)
+
+
+(defgroup helm-mode nil
+  "Enable helm completion."
+  :group 'helm)
+
+(defcustom helm-completing-read-handlers-alist
+  '((describe-function . helm-completing-read-symbols)
+    (describe-variable . helm-completing-read-symbols)
+    (describe-symbol . helm-completing-read-symbols)
+    (debug-on-entry . helm-completing-read-symbols)
+    (find-function . helm-completing-read-symbols)
+    (disassemble . helm-completing-read-symbols)
+    (trace-function . helm-completing-read-symbols)
+    (trace-function-foreground . helm-completing-read-symbols)
+    (trace-function-background . helm-completing-read-symbols)
+    (find-tag . helm-completing-read-with-cands-in-buffer)
+    (ffap-alternate-file . nil)
+    (tmm-menubar . nil)
+    (find-file . nil)
+    (execute-extended-command . nil))
+  "Alist of handlers to replace `completing-read', `read-file-name' in `helm-mode'.
+Each entry is a cons cell like \(emacs_command . completing-read_handler\)
+where key and value are symbols.
+
+Each key is an Emacs command that use originaly `completing-read'.
+
+Each value maybe an helm function that take same arguments as
+`completing-read' plus NAME and BUFFER, where NAME is the name of the new
+helm source and BUFFER the name of the buffer we will use.
+This function prefix name must start by \"helm\".
+
+See `helm-completing-read-symbols' for example.
+
+Note that this function will be reused for ALL the `completing-read'
+of this command, so it should handle all cases, e.g
+If first `completing-read' complete against symbols and
+second `completing-read' should handle only buffer,
+your specialized function should handle the both.
+
+If the value of an entry is nil completion will fall back to
+emacs vanilla behavior.
+e.g If you want to disable helm completion for `describe-function':
+\(describe-function . nil\).
+
+Ido is also supported, you can use `ido-completing-read' and
+`ido-read-file-name' as value of an entry or just 'ido.
+e.g ido completion for `find-file':
+\(find-file . ido\)
+same as
+\(find-file . ido-read-file-name\)
+Note that you don't need to enable `ido-mode' for this to work."
+  :group 'helm-mode
+  :type '(alist :key-type symbol :value-type symbol))
+
+(defcustom helm-comp-read-case-fold-search helm-case-fold-search
+  "Default Local setting of `helm-case-fold-search' for `helm-comp-read'.
+See `helm-case-fold-search' for more info."
+  :group 'helm-mode
+  :type 'symbol)
+
+(defcustom helm-mode-handle-completion-in-region t
+  "Whether to replace or not `completion-in-region-function'.
+This enable support for `completing-read-multiple' and `completion-at-point'
+when non--nil."
+  :group 'helm-mode
+  :type 'boolean)
+
+(defcustom helm-mode-reverse-history t
+  "Display history source after current source in `helm-mode' handled commands."
+  :group 'helm-mode
+  :type 'boolean)
+
+(defcustom helm-mode-no-completion-in-region-in-modes nil
+  "A list of modes that do not want helm for `completion-in-region'."
+  :group 'helm-mode
+  :type 'boolean)
+
+(defcustom helm-completion-in-region-fuzzy-match nil
+  "Whether `helm-completion-in-region' use fuzzy matching or not.
+Affect among others `completion-at-point', `completing-read-multiple'."
+  :group 'helm-mode
+  :type 'boolean)
+
+(defcustom helm-completion-in-region-file-completion-style 'emacs
+  "This tells to helm which completion list is used.
+If the completion list is giving a full filename (bash style) the actual insertion
+is deleted and the new one inserted, otherwise (emacs style)
+new filename is inserted after the first valid path name,
+the partial one being deleted.
+If you use the package `bash-completion' use `bash' as value instead of `emacs'
+otherwise you will endup with duplicate insertion in shell buffers."
+  :group 'helm-mode
+  :type 'symbol)
+
+(defcustom helm-mode-fuzzy-match nil
+  "Enable fuzzy matching in `helm-mode' globally.
+Note that this will slow down completion and modify sorting
+which is unwanted in many places.
+This affect only the functions with completing-read helmized by helm-mode.
+To fuzzy match `completion-at-point' and friends see
+`helm-completion-in-region-fuzzy-match'."
+  :group 'helm-mode
+  :type 'boolean)
+
+(defcustom helm-mode-minibuffer-setup-hook-black-list '(minibuffer-completion-help)
+  "Incompatible `minibuffer-setup-hook' functions go here.
+A list of symbols.
+Helm-mode is rejecting all lambda's, byte-code fns
+and all functions belonging in this list from `minibuffer-setup-hook'."
+  :group 'helm-mode
+  :type '(repeat (choice symbol)))
+
+
+(defvar helm-comp-read-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "<C-return>") 'helm-cr-empty-string)
+    (define-key map (kbd "<M-RET>") 'helm-cr-empty-string)
+    map)
+  "Keymap for `helm-comp-read'.")
+
+(defvar helm-comp-read-must-match-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "RET")
+      'helm-confirm-and-exit-minibuffer)
+    map)
+  "Keymap use as must-match-map in `helm-comp-read' and `helm-read-file-name'.")
+
+
+;;; Internal
+;;
+;;
+;; Flag to know if `helm-pattern' have been added
+;; to candidate list in `helm-comp-read'.
+(defvar helm-cr-unknown-pattern-flag nil)
+
+
+;;; Helm `completing-read' replacement
+;;
+;;
+(defun helm-cr-empty-string ()
+  "Return empty string."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action
+     (lambda (_candidate)
+         (identity "")))))
+(put 'helm-cr-empty-string 'helm-only t)
+
+(defun helm-mode--keyboard-quit ()
+  ;; Use this instead of `keyboard-quit'
+  ;; to avoid deactivating mark in current-buffer.
+  (let ((debug-on-quit nil))
+    (signal 'quit nil)))
+
+(defun helm-comp-read-get-candidates (collection &optional test sort-fn alistp)
+  "Convert COLLECTION to list removing elements that don't match TEST.
+See `helm-comp-read' about supported COLLECTION arguments.
+
+SORT-FN is a predicate to sort COLLECTION.
+
+ALISTP when non--nil will not use `all-completions' to collect
+candidates because it doesn't handle alists correctly for helm.
+i.e In `all-completions' the car of each pair is used as value.
+In helm we want to use the cdr instead like \(display . real\),
+so we return the alist as it is with no transformation by all-completions.
+
+e.g
+
+\(setq A '((a . 1) (b . 2) (c . 3)))
+==>((a . 1) (b . 2) (c . 3))
+\(helm-comp-read \"test: \" A :alistp nil
+                              :exec-when-only-one t
+                              :initial-input \"a\")
+==>\"a\" Which is not what we expect.
+
+\(helm-comp-read \"test: \" A :alistp t
+                              :exec-when-only-one t
+                              :initial-input \"1\")
+==>\"1\"
+
+See docstring of `all-completions' for more info.
+
+If COLLECTION is an `obarray', a TEST should be needed. See `obarray'."
+  ;; Ensure COLLECTION is computed from `helm-current-buffer'
+  ;; because some functions used as COLLECTION work
+  ;; only in the context of current-buffer (Issue #1030) .
+  (with-helm-current-buffer
+    (let ((cands
+           (cond ((vectorp collection)
+                  (all-completions "" collection test))
+                 ((and (symbolp collection) (boundp collection)
+                       ;; Issue #324 history is let-bounded and given
+                       ;; quoted as hist argument of completing-read.
+                       ;; See example in `rcirc-browse-url'.
+                       (symbolp (symbol-value collection)))
+                  nil)
+                 ;; When collection is a symbol, most of the time
+                 ;; it should be a symbol used as a minibuffer-history.
+                 ;; The value of this symbol in this case return a list
+                 ;; of string which maybe are converted later as symbol
+                 ;; in special cases.
+                 ;; we treat here commandp as a special case as it return t
+                 ;; also with a string unless its last arg is provided.
+                 ;; Also, the history collections generally collect their
+                 ;; elements as string, so intern them to call predicate.
+                 ((and (symbolp collection) (boundp collection) test)
+                  (let ((predicate `(lambda (elm)
+                                      (condition-case err
+                                          (if (eq (quote ,test) 'commandp)
+                                              (funcall (quote ,test) (intern elm))
+                                              (funcall (quote ,test) elm))
+                                        (wrong-type-argument
+                                         (funcall (quote ,test) (intern elm)))))))
+                    (all-completions "" (symbol-value collection) predicate)))
+                 ((and (symbolp collection) (boundp collection))
+                  (all-completions "" (symbol-value collection)))
+                 ;; Normally file completion should not be handled here,
+                 ;; but special cases like `find-file-at-point' do it.
+                 ;; Handle here specially such cases.
+                 ((and (functionp collection) minibuffer-completing-file-name)
+                  (cl-loop for f in (funcall collection helm-pattern test t)
+                           unless (member f '("./" "../"))
+                           if (string-match ffap-url-regexp helm-pattern)
+                           collect f
+                           else
+                           collect (concat (file-name-as-directory
+                                            (helm-basedir helm-pattern)) f)))
+                 ((functionp collection)
+                  (funcall collection "" test t))
+                 ((and alistp test)
+                  (cl-loop for i in collection when (funcall test i) collect i))
+                 (alistp collection)
+                 (t (all-completions "" collection test)))))
+      (if sort-fn (sort cands sort-fn) cands))))
+
+(defun helm-cr-default-transformer (candidates _source)
+  "Default filter candidate function for `helm-comp-read'."
+  (cl-loop for c in candidates
+        for cand = (if (stringp c) (replace-regexp-in-string "\\s\\" "" c) c)
+        for pat = (replace-regexp-in-string "\\s\\" "" helm-pattern)
+        if (and (equal cand pat) helm-cr-unknown-pattern-flag)
+        collect
+        (cons (concat (propertize
+                       " " 'display
+                       (propertize "[?]" 'face 'helm-ff-prefix))
+                      c)
+              c)
+        into lst
+        else collect (if (and (stringp c)
+                              (string-match "\n" c))
+                         (cons (replace-regexp-in-string "\n" "->" c) c)
+                         c)
+        into lst
+        finally return (helm-fast-remove-dups lst :test 'equal)))
+
+(defun helm-comp-read--move-to-first-real-candidate ()
+  (helm-aif (helm-get-selection nil 'withprop)
+      (when (string= (get-text-property 0 'display it) "[?]")
+        (helm-next-line))))
+
+;;;###autoload
+(cl-defun helm-comp-read (prompt collection
+                          &key
+                            test
+                            initial-input
+                            default
+                            preselect
+                            (buffer "*Helm Completions*")
+                            must-match
+                            fuzzy
+                            reverse-history
+                            (requires-pattern 0)
+                            history
+                            input-history
+                            (case-fold helm-comp-read-case-fold-search)
+                            (del-input t)
+                            (persistent-action nil)
+                            (persistent-help "DoNothing")
+                            (mode-line helm-comp-read-mode-line)
+                            help-message
+                            (keymap helm-comp-read-map)
+                            (name "Helm Completions")
+                            candidates-in-buffer
+                            exec-when-only-one
+                            quit-when-no-cand
+                            (volatile t)
+                            sort
+                            (fc-transformer 'helm-cr-default-transformer)
+                            hist-fc-transformer
+                            marked-candidates
+                            nomark
+                            (alistp t)
+                            (candidate-number-limit helm-candidate-number-limit))
+  "Read a string in the minibuffer, with helm completion.
+
+It is helm `completing-read' equivalent.
+
+- PROMPT is the prompt name to use.
+
+- COLLECTION can be a list, vector, obarray or hash-table.
+  It can be also a function that receives three arguments:
+  the values string, predicate and t. See `all-completions' for more details.
+
+Keys description:
+
+- TEST: A predicate called with one arg i.e candidate.
+
+- INITIAL-INPUT: Same as input arg in `helm'.
+
+- PRESELECT: See preselect arg of `helm'.
+
+- DEFAULT: This option is used only for compatibility with regular
+  Emacs `completing-read' (Same as DEFAULT arg of `completing-read').
+
+- BUFFER: Name of helm-buffer.
+
+- MUST-MATCH: Candidate selected must be one of COLLECTION.
+
+- FUZZY: Enable fuzzy matching.
+
+- REVERSE-HISTORY: When non--nil display history source after current
+  source completion.
+
+- REQUIRES-PATTERN: Same as helm attribute, default is 0.
+
+- HISTORY: A list containing specific history, default is nil.
+  When it is non--nil, all elements of HISTORY are displayed in
+  a special source before COLLECTION.
+
+- INPUT-HISTORY: A symbol. the minibuffer input history will be
+  stored there, if nil or not provided, `minibuffer-history'
+  will be used instead.
+
+- CASE-FOLD: Same as `helm-case-fold-search'.
+
+- DEL-INPUT: Boolean, when non--nil (default) remove the partial
+  minibuffer input from HISTORY is present.
+
+- PERSISTENT-ACTION: A function called with one arg i.e candidate.
+
+- PERSISTENT-HELP: A string to document PERSISTENT-ACTION.
+
+- MODE-LINE: A string or list to display in mode line.
+  Default is `helm-comp-read-mode-line'.
+
+- KEYMAP: A keymap to use in this `helm-comp-read'.
+  (the keymap will be shared with history source)
+
+- NAME: The name related to this local source.
+
+- EXEC-WHEN-ONLY-ONE: Bound `helm-execute-action-at-once-if-one'
+  to non--nil. (possibles values are t or nil).
+
+- VOLATILE: Use volatile attribute \(enabled by default\).
+
+- SORT: A predicate to give to `sort' e.g `string-lessp'
+  Use this only on small data as it is ineficient.
+  If you want to sort faster add a sort function to
+  FC-TRANSFORMER.
+  Note that FUZZY when enabled is already providing a sort function.
+
+- FC-TRANSFORMER: A `filtered-candidate-transformer' function
+  or a list of functions.
+
+- HIST-FC-TRANSFORMER: A `filtered-candidate-transformer'
+  function for the history source.
+
+- MARKED-CANDIDATES: If non--nil return candidate or marked candidates as a list.
+
+- NOMARK: When non--nil don't allow marking candidates.
+
+- ALISTP: \(default is non--nil\) See `helm-comp-read-get-candidates'.
+
+- CANDIDATES-IN-BUFFER: when non--nil use a source build with
+  `helm-source-in-buffer' which is much faster.
+  Argument VOLATILE have no effect when CANDIDATES-IN-BUFFER is non--nil.
+
+Any prefix args passed during `helm-comp-read' invocation will be recorded
+in `helm-current-prefix-arg', otherwise if prefix args were given before
+`helm-comp-read' invocation, the value of `current-prefix-arg' will be used.
+That's mean you can pass prefix args before or after calling a command
+that use `helm-comp-read' See `helm-M-x' for example."
+
+  (when (get-buffer helm-action-buffer)
+    (kill-buffer helm-action-buffer))
+  (let ((action-fn `(("Sole action (Identity)"
+                      . (lambda (candidate)
+                          (if ,marked-candidates
+                              (helm-marked-candidates)
+                            (identity candidate)))))))
+    ;; Assume completion have been already required,
+    ;; so always use 'confirm.
+    (when (eq must-match 'confirm-after-completion)
+      (setq must-match 'confirm))
+    (let* ((minibuffer-completion-confirm must-match)
+           (must-match-map (when must-match helm-comp-read-must-match-map))
+           (loc-map (if must-match-map
+                        (make-composed-keymap
+                         must-match-map (or keymap helm-map))
+                      (or keymap helm-map)))
+           (minibuffer-completion-predicate test)
+           (minibuffer-completion-table collection)
+           (helm-read-file-name-mode-line-string
+            (replace-regexp-in-string "helm-maybe-exit-minibuffer"
+                                      "helm-confirm-and-exit-minibuffer"
+                                      helm-read-file-name-mode-line-string))
+           (get-candidates (lambda ()
+                             (let ((cands (helm-comp-read-get-candidates
+                                           collection test sort alistp)))
+                               (setq helm-cr-unknown-pattern-flag nil)
+                               (unless (or (eq must-match t)
+                                           (string= helm-pattern "")
+                                           (assoc helm-pattern cands)
+                                           (assoc (intern helm-pattern) cands)
+                                           (member helm-pattern cands)
+                                           (member (downcase helm-pattern) cands)
+                                           (member (upcase helm-pattern) cands))
+                                 (setq cands (append (list
+                                                      ;; Unquote helm-pattern
+                                                      ;; when it is added
+                                                      ;; as candidate.
+                                                      (replace-regexp-in-string
+                                                       "\\s\\" "" helm-pattern))
+                                                     cands))
+                                 (setq helm-cr-unknown-pattern-flag t))
+                               ;; When DEFAULT is initially a list, candidates
+                               ;; come already computed with DEFAULT list appended,
+                               ;; and DEFAULT is set to the car of this list.
+                               (if (and default (not (string= default "")))
+                                   (delq nil (cons default (delete default cands)))
+                                 cands))))
+           (history-get-candidates (lambda ()
+                                     (let ((all (helm-comp-read-get-candidates
+                                                 history test nil alistp)))
+                                       (when all
+                                         (delete
+                                          ""
+                                          (helm-fast-remove-dups
+                                           (if (and default (not (string= default "")))
+                                               (delq nil (cons default
+                                                               (delete default all)))
+                                             all)
+                                           :test 'equal))))))
+           (src-hist (helm-build-sync-source (format "%s History" name)
+                         :candidates history-get-candidates
+                         :fuzzy-match fuzzy
+                         :filtered-candidate-transformer
+                         (append '((lambda (candidates sources)
+                                     (cl-loop for i in candidates
+                                              ;; Input is added to history in completing-read's
+                                              ;; and may be regexp-quoted, so unquote it.
+                                              for cand = (replace-regexp-in-string "\\s\\" "" i)
+                                              collect cand)))
+                                 (and hist-fc-transformer (helm-mklist hist-fc-transformer)))
+                         :persistent-action persistent-action
+                         :persistent-help persistent-help
+                         :mode-line mode-line
+                         :help-message help-message
+                         :action action-fn))
+           (src (helm-build-sync-source name
+                  :candidates get-candidates
+                  :filtered-candidate-transformer fc-transformer
+                  :requires-pattern requires-pattern
+                  :persistent-action persistent-action
+                  :persistent-help persistent-help
+                  :fuzzy-match fuzzy
+                  :mode-line mode-line
+                  :help-message help-message
+                  :action action-fn))
+           (src-1 (helm-build-in-buffer-source name
+                    :data get-candidates
+                    :filtered-candidate-transformer fc-transformer
+                    :requires-pattern requires-pattern
+                    :persistent-action persistent-action
+                    :fuzzy-match fuzzy
+                    :persistent-help persistent-help
+                    :mode-line mode-line
+                    :help-message help-message
+                    :action action-fn))
+           (src-list (list src-hist
+                           (if candidates-in-buffer
+                               src-1
+                             (if volatile
+                                 (append src '((volatile)))
+                               src))))
+           (helm-execute-action-at-once-if-one exec-when-only-one)
+           (helm-quit-if-no-candidate quit-when-no-cand)
+           result)
+      (when nomark
+        (setq src-list (cl-loop for src in src-list
+                             collect (cons '(nomark) src))))
+      (when reverse-history (setq src-list (nreverse src-list)))
+      (add-hook 'helm-after-update-hook 'helm-comp-read--move-to-first-real-candidate)
+      (unwind-protect
+           (setq result (helm
+                         :sources src-list
+                         :input initial-input
+                         :default default
+                         :preselect preselect
+                         :prompt prompt
+                         :resume 'noresume
+                         :candidate-number-limit candidate-number-limit
+                         :case-fold-search case-fold
+                         :keymap loc-map
+                         :history (and (symbolp input-history) input-history)
+                         :buffer buffer))
+        (remove-hook 'helm-after-update-hook 'helm-comp-read--move-to-first-real-candidate))
+      ;; Avoid adding an incomplete input to history.
+      (when (and result history del-input)
+        (cond ((and (symbolp history) ; History is a symbol.
+                    (not (symbolp (symbol-value history)))) ; Fix Issue #324.
+               ;; Be sure history is not a symbol with a nil value.
+               (helm-aif (symbol-value history) (setcar it result)))
+              ((consp history) ; A list with a non--nil value.
+               (setcar history result))
+              (t ; Possibly a symbol with a nil value.
+               (set history (list result)))))
+      (or
+       result
+       (when (and (eq helm-exit-status 0)
+                  (eq must-match 'confirm))
+         ;; Return empty string only if it is the DEFAULT
+         ;; value and helm-pattern is empty.
+         ;; otherwise return helm-pattern
+         (if (and (string= helm-pattern "") default)
+             default (identity helm-pattern)))
+       (unless (or (eq helm-exit-status 1)
+                   must-match)  ; FIXME this should not be needed now.
+         default)
+       (helm-mode--keyboard-quit)))))
+
+;; Generic completing-read
+;;
+;; Support also function as collection.
+;; e.g M-x man is supported.
+;; Support hash-table and vectors as collection.
+;; NOTE:
+;; Some crap emacs functions may not be supported
+;; like ffap-alternate-file (bad use of completing-read)
+;; and maybe others.
+;; Provide a mode `helm-mode' which turn on
+;; helm in all `completing-read' and `read-file-name' in Emacs.
+;;
+(defvar helm-completion-mode-string " Helm")
+
+(defvar helm-completion-mode-quit-message
+  "Helm completion disabled")
+
+(defvar helm-completion-mode-start-message
+  "Helm completion enabled")
+
+;;; Specialized handlers
+;;
+;;
+(defun helm-completing-read-symbols
+    (prompt _collection test _require-match init
+     hist default _inherit-input-method name buffer)
+  "Specialized function for fast symbols completion in `helm-mode'."
+  (require 'helm-elisp)
+  (or
+   (helm
+    :sources (helm-build-in-buffer-source name
+               :init (lambda ()
+                       (helm-apropos-init (lambda (x)
+                                            (and (funcall test x)
+                                                 (not (keywordp x))))
+                                          (or (car-safe default) default)))
+               :filtered-candidate-transformer 'helm-apropos-default-sort-fn
+               :fuzzy-match helm-mode-fuzzy-match
+               :persistent-action
+               (lambda (candidate)
+                 (helm-lisp-completion-persistent-action
+                  candidate name))
+               :persistent-help (helm-lisp-completion-persistent-help))
+    :prompt prompt
+    :buffer buffer
+    :input init
+    :history hist
+    :resume 'noresume
+    :default (or default ""))
+     (helm-mode--keyboard-quit)))
+
+
+;;; Generic completing read
+;;
+;;
+(defun helm-completing-read-default-1
+    (prompt collection test require-match
+     init hist default _inherit-input-method
+     name buffer &optional cands-in-buffer exec-when-only-one)
+  "Call `helm-comp-read' with same args as `completing-read'.
+Extra optional arg CANDS-IN-BUFFER mean use `candidates-in-buffer'
+method which is faster.
+It should be used when candidate list don't need to rebuild dynamically."
+  (let ((history (or (car-safe hist) hist))
+        (alistp cands-in-buffer))
+    (when (and default (listp default))
+      ;; When DEFAULT is a list move the list on head of COLLECTION
+      ;; and set it to its car. #bugfix `grep-read-files'.
+      (setq collection
+            ;; COLLECTION is maybe a function or a table.
+            (append default
+                    (helm-comp-read-get-candidates
+                     collection test nil (listp collection))))
+      ;; Ensure `all-completions' will not be used
+      ;; a second time to recompute COLLECTION [1].
+      (setq alistp t)
+      (setq default (car default)))
+    (helm-comp-read
+     prompt collection
+     :test test
+     :history history
+     :reverse-history helm-mode-reverse-history
+     :input-history history
+     :must-match require-match
+     :alistp alistp ; Ensure `all-completions' is used when non-nil [1].
+     :name name
+     :requires-pattern (if (and (string= default "")
+                                (or (eq require-match 'confirm)
+                                    (eq require-match
+                                        'confirm-after-completion)))
+                           1 0)
+     :candidates-in-buffer cands-in-buffer
+     :exec-when-only-one exec-when-only-one
+     :fuzzy helm-mode-fuzzy-match
+     :buffer buffer
+     ;; If DEF is not provided, fallback to empty string
+     ;; to avoid `thing-at-point' to be appended on top of list
+     :default (or default "")
+     ;; Fail with special characters (e.g in gnus "nnimap+gmail:")
+     ;; if regexp-quote is not used.
+     ;; when init is added to history, it will be unquoted by
+     ;; helm-comp-read.
+     :initial-input (helm-aif (pcase init
+                                ((pred (stringp)) init)
+                                ;; INIT is a cons cell.
+                                (`(,l . ,_ll) l))
+                        (if minibuffer-completing-file-name it
+                            (regexp-quote it))))))
+
+(defun helm-completing-read-with-cands-in-buffer
+    (prompt collection test require-match
+     init hist default inherit-input-method
+     name buffer)
+  "Same as `helm-completing-read-default-1' but use candidates-in-buffer."
+  ;; Some commands like find-tag may use `read-file-name' from inside
+  ;; the calculation of collection. in this case it clash with
+  ;; candidates-in-buffer that reuse precedent data (files) which is wrong.
+  ;; So (re)calculate collection outside of main helm-session.
+  (let ((cands (all-completions "" collection)))
+    (helm-completing-read-default-1 prompt cands test require-match
+                                    init hist default inherit-input-method
+                                    name buffer t)))
+
+(cl-defun helm--completing-read-default
+    (prompt collection &optional
+                         predicate require-match
+                         initial-input hist def
+                         inherit-input-method)
+  "An helm replacement of `completing-read'.
+This function should be used only as a `completing-read-function'.
+
+Don't use it directly, use instead `helm-comp-read' in your programs.
+
+See documentation of `completing-read' and `all-completions' for details."
+  (let* ((current-command (or (helm-this-command) this-command))
+         (str-command     (helm-symbol-name current-command))
+         (buf-name        (format "*helm-mode-%s*" str-command))
+         (entry           (assq current-command
+                                helm-completing-read-handlers-alist))
+         (def-com         (cdr-safe entry))
+         (str-defcom      (and def-com (helm-symbol-name def-com)))
+         (def-args        (list prompt collection predicate require-match
+                                initial-input hist def inherit-input-method))
+         ;; Append the two extra args needed to set the buffer and source name
+         ;; in helm specialized functions.
+         (any-args        (append def-args (list str-command buf-name)))
+         helm-completion-mode-start-message ; Be quiet
+         helm-completion-mode-quit-message
+         ;; Be sure this pesty *completion* buffer doesn't popup.
+         ;; Note: `minibuffer-with-setup-hook' may setup a lambda
+         ;; calling `minibuffer-completion-help' or other minibuffer
+         ;; functions we DONT WANT here, in these cases removing the hook
+         ;; (a symbol) have no effect. Issue #448.
+         ;; Because `minibuffer-completion-table' and
+         ;; `minibuffer-completion-predicate' are not bound
+         ;; anymore here, these functions should have no effect now,
+         ;; except in some rare cases like in `woman-file-name',
+         ;; so remove all incompatible functions
+         ;; from `minibuffer-setup-hook' (Issue #1205, #1240).
+         ;; otherwise helm have not the time to close its initial session.
+         (minibuffer-setup-hook
+          (cl-loop for h in minibuffer-setup-hook
+                   unless (or (consp h) ; a lambda.
+                              (byte-code-function-p h)
+                              (memq h helm-mode-minibuffer-setup-hook-black-list))
+                   collect h))
+         ;; Disable hack that could be used before `completing-read'.
+         ;; i.e (push ?\t unread-command-events).
+         unread-command-events)
+    (when (eq def-com 'ido) (setq def-com 'ido-completing-read))
+    (unless (or (not entry) def-com)
+      ;; An entry in *read-handlers-alist exists but have
+      ;; a nil value, so we exit from here, disable `helm-mode'
+      ;; and run the command again with it original behavior.
+      ;; `helm-mode' will be restored on exit.
+      (cl-return-from helm--completing-read-default
+        (unwind-protect
+             (progn
+               (helm-mode -1)
+               (apply completing-read-function def-args))
+          (helm-mode 1))))
+    ;; If we use now `completing-read' we MUST turn off `helm-mode'
+    ;; to avoid infinite recursion and CRASH. It will be reenabled on exit.
+    (when (or (eq def-com 'completing-read)
+              ;; All specialized functions are prefixed by "helm"
+              (and (stringp str-defcom)
+                   (not (string-match "^helm" str-defcom))))
+      (helm-mode -1))
+    (unwind-protect
+         (cond (;; An helm specialized function exists, run it.
+                (and def-com helm-mode)
+                (apply def-com any-args))
+               (;; Try to handle `ido-completing-read' everywhere.
+                (and def-com (eq def-com 'ido-completing-read))
+                (setcar (memq collection def-args)
+                        (all-completions "" collection predicate))
+                (apply def-com def-args))
+               (;; User set explicitely `completing-read' or something similar
+                ;; in *read-handlers-alist, use this with exactly the same
+                ;; args as in `completing-read'.
+                ;; If we are here `helm-mode' is now disabled.
+                def-com
+                (apply def-com def-args))
+               (t ; Fall back to classic `helm-comp-read'.
+                (helm-completing-read-default-1
+                 prompt collection predicate require-match
+                 initial-input hist def inherit-input-method
+                 str-command buf-name)))
+      (helm-mode 1)
+      ;; When exiting minibuffer, `this-command' is set to
+      ;; `helm-exit-minibuffer', which is unwanted when starting
+      ;; on another `completing-read', so restore `this-command' to
+      ;; initial value when exiting.
+      (setq this-command current-command))))
+
+;;; Generic read-file-name
+;;
+;;
+;;;###autoload
+(cl-defun helm-read-file-name
+    (prompt
+     &key
+       (name "Read File Name")
+       (initial-input default-directory)
+       (buffer "*Helm file completions*")
+       test
+       (case-fold helm-file-name-case-fold-search)
+       preselect
+       history
+       must-match
+       default
+       marked-candidates
+       (candidate-number-limit helm-ff-candidate-number-limit)
+       nomark
+       (alistp t)
+       (persistent-action 'helm-find-files-persistent-action)
+       (persistent-help "Hit1 Expand Candidate, Hit2 or (C-u) Find file")
+       (mode-line helm-read-file-name-mode-line-string))
+  "Read a file name with helm completion.
+It is helm `read-file-name' emulation.
+
+Argument PROMPT is the default prompt to use.
+
+Keys description:
+
+- NAME: Source name, default to \"Read File Name\".
+
+- INITIAL-INPUT: Where to start read file name, default to `default-directory'.
+
+- BUFFER: `helm-buffer' name default to \"*Helm Completions*\".
+
+- TEST: A predicate called with one arg 'candidate'.
+
+- CASE-FOLD: Same as `helm-case-fold-search'.
+
+- PRESELECT: helm preselection.
+
+- HISTORY: Display HISTORY in a special source.
+
+- MUST-MATCH: Can be 'confirm, nil, or t.
+
+- MARKED-CANDIDATES: When non--nil return a list of marked candidates.
+
+- NOMARK: When non--nil don't allow marking candidates.
+
+- ALISTP: Don't use `all-completions' in history (take effect only on history).
+
+- PERSISTENT-ACTION: a persistent action function.
+
+- PERSISTENT-HELP: persistent help message.
+
+- MODE-LINE: A mode line message, default is `helm-read-file-name-mode-line-string'."
+  
+  (when (get-buffer helm-action-buffer)
+    (kill-buffer helm-action-buffer))
+  ;; Assume completion have been already required,
+  ;; so always use 'confirm.
+  (when (eq must-match 'confirm-after-completion)
+    (setq must-match 'confirm))
+  (let* ((action-fn `(("Sole action (Identity)"
+                       . (lambda (candidate)
+                           (if ,marked-candidates
+                               (helm-marked-candidates :with-wildcard t)
+                             (identity candidate))))))
+         ;; Be sure we don't erase the underlying minibuffer if some.
+         (helm-ff-auto-update-initial-value
+          (and helm-ff-auto-update-initial-value
+               (not (minibuffer-window-active-p (minibuffer-window)))))
+         helm-full-frame
+         (hist (and history (helm-comp-read-get-candidates
+                             history nil nil alistp)))
+         (minibuffer-completion-confirm must-match)
+         (must-match-map (when must-match helm-comp-read-must-match-map))
+         (cmap (if must-match-map
+                   (make-composed-keymap
+                    must-match-map helm-read-file-map)
+                 helm-read-file-map))
+         (minibuffer-completion-predicate test)
+         (minibuffer-completing-file-name t)
+         (helm-read-file-name-mode-line-string
+          (replace-regexp-in-string "helm-maybe-exit-minibuffer"
+                                    "helm-confirm-and-exit-minibuffer"
+                                    helm-read-file-name-mode-line-string))
+         (src-list
+          (list
+           ;; History source.
+           (helm-build-sync-source (format "%s History" name)
+             :header-name (lambda (name)
+                            (concat name (substitute-command-keys
+                                          helm-find-files-doc-header)))
+             :mode-line mode-line
+             :candidates hist
+             :nohighlight t
+             :persistent-action persistent-action
+             :persistent-help persistent-help
+             :nomark nomark
+             :action action-fn)
+           ;; Other source.
+           (helm-build-sync-source name
+             :header-name (lambda (name)
+                            (concat name (substitute-command-keys
+                                          helm-find-files-doc-header)))
+             :init (lambda ()
+                     (setq helm-ff-auto-update-flag
+                           helm-ff-auto-update-initial-value)
+                     (setq helm-ff--auto-update-state
+                           helm-ff-auto-update-flag))
+             :mode-line mode-line
+             :help-message 'helm-read-file-name-help-message
+             :nohighlight t
+             :candidates
+             (lambda ()
+               (append (and (not (file-exists-p helm-pattern))
+                            (list helm-pattern))
+                       (if test
+                           (cl-loop with hn = (helm-ff-tramp-hostnames)
+                                    for i in (helm-find-files-get-candidates
+                                              must-match)
+                                    when (or (member i hn) ; A tramp host
+                                             (funcall test i)) ; Test ok
+                                    collect i)
+                           (helm-find-files-get-candidates must-match))))
+             :filtered-candidate-transformer 'helm-ff-sort-candidates
+             :filter-one-by-one 'helm-ff-filter-candidate-one-by-one
+             :persistent-action persistent-action
+             :persistent-help persistent-help
+             :volatile t
+             :nomark nomark
+             :action action-fn)))
+         ;; Helm result.
+         (result (helm
+                  :sources src-list
+                  :input (expand-file-name initial-input)
+                  :prompt prompt
+                  :keymap cmap
+                  :candidate-number-limit candidate-number-limit
+                  :resume 'noresume
+                  :case-fold-search case-fold
+                  :default default
+                  :buffer buffer
+                  :preselect preselect)))
+    (or
+     (cond ((and result (stringp result)
+                 (string= result "") ""))
+           ((and result
+                 (stringp result)
+                 (file-equal-p result initial-input)
+                 default)
+            (if (listp default) (car default) default))
+           ((and result (stringp result))
+            (expand-file-name result))
+           ((and result (listp result))
+            (mapcar #'expand-file-name result))
+           (t result))
+     (when (and (not (string= helm-pattern ""))
+                (eq helm-exit-status 0)
+                (eq must-match 'confirm))
+       (identity helm-pattern))
+     (helm-mode--keyboard-quit))))
+
+(defun helm-mode--default-filename (fname dir initial)
+  (unless dir (setq dir default-directory))
+  (unless (file-name-absolute-p dir)
+    (setq dir (expand-file-name dir)))
+  (unless (or fname (consp fname))
+    (setq fname (expand-file-name
+                 (or initial buffer-file-name dir)
+                 dir)))
+  (if (and fname (consp fname))
+      (setq fname (cl-loop for f in fname
+                           collect (expand-file-name f dir)))
+      (if (file-name-absolute-p fname)
+          fname (expand-file-name fname dir))))
+
+(cl-defun helm--generic-read-file-name
+    (prompt &optional dir default-filename mustmatch initial predicate)
+  "Generic helm replacement of `read-file-name'.
+Don't use it directly, use instead `helm-read-file-name' in your programs."
+  (let* ((init (or initial dir default-directory))
+         (current-command (or (helm-this-command) this-command))
+         (str-command (helm-symbol-name current-command))
+         (helm--file-completion-sources
+          (cons str-command
+                (remove str-command helm--file-completion-sources)))
+         (buf-name (format "*helm-mode-%s*" str-command))
+         (entry (assq current-command
+                      helm-completing-read-handlers-alist))
+         (def-com  (cdr-safe entry))
+         (str-defcom (and def-com (helm-symbol-name def-com)))
+         (def-args (list prompt dir default-filename mustmatch initial predicate))
+         ;; Append the two extra args needed to set the buffer and source name
+         ;; in helm specialized functions.
+         (any-args (append def-args (list str-command buf-name)))
+         (ido-state ido-mode)
+         helm-completion-mode-start-message ; Be quiet
+         helm-completion-mode-quit-message  ; Same here
+         fname)
+    (setq default-filename (helm-mode--default-filename
+                            default-filename dir initial))
+    ;; Some functions that normally call `completing-read' can switch
+    ;; brutally to `read-file-name' (e.g find-tag), in this case
+    ;; the helm specialized function will fail because it is build
+    ;; for `completing-read', so set it to 'incompatible to be sure
+    ;; we switch to `helm-read-file-name' and don't try to call it
+    ;; with wrong number of args.
+    (when (eq def-com 'ido)
+      (setq def-com 'ido-read-file-name) (ido-mode 1))
+    (when (and def-com (> (length (help-function-arglist def-com)) 8))
+      (setq def-com 'incompatible))
+    (unless (or (not entry) def-com)
+      (cl-return-from helm--generic-read-file-name
+        (unwind-protect
+             (progn
+               (helm-mode -1)
+               (apply read-file-name-function def-args))
+          (helm-mode 1))))
+    ;; If we use now `read-file-name' we MUST turn off `helm-mode'
+    ;; to avoid infinite recursion and CRASH. It will be reenabled on exit.
+    (when (or (eq def-com 'read-file-name)
+              (eq def-com 'ido-read-file-name)
+              (and (stringp str-defcom)
+                   (not (string-match "^helm" str-defcom))))
+      (helm-mode -1))
+    (unwind-protect
+         (setq fname
+               (cond (;; A specialized function exists, run it
+                      ;; with the two extra args specific to helm..
+                      (and def-com helm-mode
+                           (not (eq def-com 'ido-read-file-name))
+                           (not (eq def-com 'incompatible)))
+                      (apply def-com any-args))
+                     (;; Def-com value is `ido-read-file-name'
+                      ;; run it with default args.
+                      (and def-com (eq def-com 'ido-read-file-name))
+                      (ido-mode 1)
+                      (apply def-com def-args))
+                     (;; Def-com value is `read-file-name'
+                      ;; run it with default args.
+                      (eq def-com 'read-file-name)
+                      (apply def-com def-args))
+                     (t ; Fall back to classic `helm-read-file-name'.
+                      (helm-read-file-name
+                       prompt
+                       :name str-command
+                       :buffer buf-name
+                       :default default-filename
+                       :initial-input (expand-file-name init dir)
+                       :alistp nil
+                       :must-match mustmatch
+                       :test predicate))))
+      (helm-mode 1)
+      (ido-mode (if ido-state 1 -1))
+      ;; Same comment as in `helm--completing-read-default'.
+      (setq this-command current-command))
+    (if (eq predicate 'file-directory-p) ; Using `read-directory-name'.
+        (file-name-as-directory fname) fname)))
+
+(defun helm-mode--advice-lisp--local-variables (old--fn &rest args)
+  (ignore-errors
+    (apply old--fn args)))
+
+(defun helm--completion-in-region (start end collection &optional predicate)
+  "Helm replacement of `completion--in-region'.
+Can be used as value for `completion-in-region-function'."
+  (cl-declare (special require-match prompt))
+  (if (memq major-mode helm-mode-no-completion-in-region-in-modes)
+      (funcall helm--old-completion-in-region-function
+               start end collection predicate)
+      (advice-add
+       'lisp--local-variables
+       :around #'helm-mode--advice-lisp--local-variables)
+      (unwind-protect
+           (let* ((enable-recursive-minibuffers t)
+                  (input (buffer-substring-no-properties start end))
+                  (current-command (or (helm-this-command) this-command))
+                  (str-command (helm-symbol-name current-command))
+                  (buf-name (format "*helm-mode-%s*" str-command))
+                  (require-match (or (and (boundp 'require-match) require-match)
+                                     minibuffer-completion-confirm
+                                     ;; If prompt have not been propagated here, that's
+                                     ;; probably mean we have no prompt and we are in
+                                     ;; completion-at-point or friend, so use a non--nil
+                                     ;; value for require-match.
+                                     (not (boundp 'prompt))))
+                  ;; `completion-extra-properties' is let-bounded in `completion-at-point'.
+                  ;; `afun' is a closure to call against each string in `data'.
+                  ;; it provide the annotation info for each string.
+                  ;; e.g "foo" => "foo <f>" where foo is a function.
+                  ;; See Issue #407.
+                  (afun (plist-get completion-extra-properties :annotation-function))
+                  (data (all-completions input collection predicate))
+                  (init-space-suffix (unless (or helm-completion-in-region-fuzzy-match
+                                                 (string-suffix-p " " input))
+                                       " "))
+                  ;; Assume that when `afun' and `predicate' are null
+                  ;; we are in filename completion.
+                  (file-comp-p (or (helm-mode--in-file-completion-p)
+                                   (and (null afun) (null predicate))))
+                  ;; Completion-at-point and friends have no prompt.
+                  (result (if (stringp data)
+                              data
+                              (helm-comp-read
+                               (or (and (boundp 'prompt) prompt) "Pattern: ")
+                               (if file-comp-p
+                                   (cl-loop for f in data unless
+                                            (string-match "\\`\\.\\{1,2\\}/\\'" f)
+                                            collect f)
+                                   (if afun
+                                       (mapcar (lambda (s)
+                                                 (let ((ann (funcall afun s)))
+                                                   (if ann
+                                                       (cons
+                                                        (concat
+                                                         s
+                                                         (propertize
+                                                          " " 'display
+                                                          (propertize
+                                                           ann
+                                                           'face 'completions-annotations)))
+                                                        s)
+                                                       s)))
+                                               data)
+                                       data))
+                               :name str-command
+                               :fuzzy helm-completion-in-region-fuzzy-match
+                               :nomark t
+                               :initial-input
+                               (cond ((and file-comp-p
+                                           (not (string-match "/\\'" input)))
+                                      (concat (helm-basename input)
+                                              (unless (string= input "")
+                                                init-space-suffix)))
+                                     ((string-match "/\\'" input) nil)
+                                     ((or (null require-match)
+                                          (stringp require-match))
+                                      input)
+                                     (t (concat input init-space-suffix)))
+                               :buffer buf-name
+                               :fc-transformer (append (list 'helm-cr-default-transformer)
+                                                       (list (lambda (candidates _source)
+                                                               (sort candidates 'helm-generic-sort-fn))))
+                               :exec-when-only-one t
+                               :quit-when-no-cand
+                               (lambda ()
+                                   ;; Delay message to overwrite "Quit".
+                                   (run-with-timer
+                                    0.01 nil
+                                    (lambda ()
+                                        (message "[No matches]")))
+                                   t)   ; exit minibuffer immediately.
+                               :must-match require-match))))
+             (when result
+               (delete-region
+                (if (and file-comp-p
+                         (save-excursion
+                           (re-search-backward "~?/" start t))
+                         (cl-ecase helm-completion-in-region-file-completion-style
+                           (emacs t)
+                           (bash nil)))
+                    (match-end 0) start)
+                end)
+               (insert result)))
+        (advice-remove 'lisp--local-variables
+                       #'helm-mode--advice-lisp--local-variables))))
+
+(defun helm-mode--in-file-completion-p ()
+  (with-helm-current-buffer
+    (run-hook-with-args-until-success 'file-name-at-point-functions)))
+
+(when (boundp 'completion-in-region-function)
+  (defconst helm--old-completion-in-region-function completion-in-region-function))
+
+;;;###autoload
+(define-minor-mode helm-mode
+    "Toggle generic helm completion.
+
+All functions in Emacs that use `completing-read'
+or `read-file-name' and friends will use helm interface
+when this mode is turned on.
+However you can modify this behavior for functions of your choice
+with `helm-completing-read-handlers-alist'.
+
+Called with a positive arg, turn on unconditionally, with a
+negative arg turn off.
+You can turn it on with `helm-mode'.
+
+Some crap emacs functions may not be supported,
+e.g `ffap-alternate-file' and maybe others
+You can add such functions to `helm-completing-read-handlers-alist'
+with a nil value.
+
+Note: This mode is incompatible with Emacs23."
+  :group 'helm-mode
+  :global t
+  :lighter helm-completion-mode-string
+  (cl-assert (boundp 'completing-read-function) nil
+             "`helm-mode' not available, upgrade to Emacs-24")
+  (if helm-mode
+      (if (fboundp 'add-function)
+          (progn
+            (add-function :override completing-read-function
+                          #'helm--completing-read-default)
+            (add-function :override read-file-name-function
+                          #'helm--generic-read-file-name)
+            (when helm-mode-handle-completion-in-region
+              (add-function :override completion-in-region-function
+                            #'helm--completion-in-region)))
+          (setq completing-read-function 'helm--completing-read-default
+                read-file-name-function  'helm--generic-read-file-name)
+          (when (and (boundp 'completion-in-region-function)
+                     helm-mode-handle-completion-in-region)
+            (setq completion-in-region-function #'helm--completion-in-region))
+          (message helm-completion-mode-start-message))
+      (if (fboundp 'remove-function)
+          (progn
+            (remove-function completing-read-function #'helm--completing-read-default)
+            (remove-function read-file-name-function #'helm--generic-read-file-name)
+            (remove-function completion-in-region-function #'helm--completion-in-region))
+          (setq completing-read-function (and (fboundp 'completing-read-default)
+                                        'completing-read-default)
+                read-file-name-function  (and (fboundp 'read-file-name-default)
+                                              'read-file-name-default))
+          (when (and (boundp 'completion-in-region-function)
+                     (boundp 'helm--old-completion-in-region-function))
+            (setq completion-in-region-function helm--old-completion-in-region-function))
+          (message helm-completion-mode-quit-message))))
+
+(provide 'helm-mode)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-mode.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-multi-match.el b/emacs.d/elpa/helm-20160115.2200/helm-multi-match.el
new file mode 100644
index 0000000..3e740da
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-multi-match.el
@@ -0,0 +1,373 @@
+;;; helm-multi-match.el --- Multiple regexp matching methods for helm -*- lexical-binding: t -*-
+
+;; Original Author: rubikitch
+
+;; Copyright (C) 2008 ~ 2011 rubikitch
+;; Copyright (C) 2011 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: http://github.com/emacs-helm/helm
+
+;; 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/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm-lib)
+
+
+(defgroup helm-multi-match nil
+  "Helm multi match."
+  :group 'helm)
+
+(defcustom helm-mm-matching-method 'multi3
+  "Matching method for helm match plugin.
+You can set here different methods to match candidates in helm.
+Here are the possible value of this symbol and their meaning:
+- multi1: Respect order, prefix of pattern must match.
+- multi2: Same but with partial match.
+- multi3: The best, multiple regexp match, allow negation.
+- multi3p: Same but prefix must match.
+
+Default is multi3, you should keep this for a better experience.
+
+Note that multi1 and multi3p are incompatible with fuzzy matching
+in file completion and by the way fuzzy matching will be disabled there
+when these options are used."
+  :type  '(radio :tag "Matching methods for helm"
+           (const :tag "Multiple regexp 1 ordered with prefix match"         multi1)
+           (const :tag "Multiple regexp 2 ordered with partial match"        multi2)
+           (const :tag "Multiple regexp 3 matching no order, partial, best." multi3)
+           (const :tag "Multiple regexp 3p matching with prefix match"       multi3p))
+  :group 'helm-multi-match)
+
+
+;; Internal
+(defconst helm-mm-default-match-functions
+  '(helm-mm-exact-match helm-mm-match))
+(defconst helm-mm-default-search-functions
+  '(helm-mm-exact-search helm-mm-search))
+
+
+;;; Build regexps
+;;
+;;
+(defvar helm-mm-space-regexp "[\\ ] "
+  "Regexp to represent space itself in multiple regexp match.")
+
+(defun helm-mm-split-pattern (pattern)
+  "Split PATTERN if it contain spaces and return resulting list.
+If spaces in PATTERN are escaped, don't split at this place.
+i.e \"foo bar\"=> (\"foo\" \"bar\")
+but \"foo\ bar\"=> (\"foobar\")."
+  (if (string= pattern "")
+      '("")
+    (cl-loop for s in (split-string
+                       (replace-regexp-in-string helm-mm-space-regexp
+                                                 "\000\000" pattern)
+                       " " t)
+          collect (replace-regexp-in-string "\000\000" " " s))))
+
+(defun helm-mm-1-make-regexp (pattern)
+  "Replace spaces in PATTERN with \"\.*\"."
+  (mapconcat 'identity (helm-mm-split-pattern pattern) ".*"))
+
+
+;;; Exact match.
+;;
+;;
+;; Internal.
+(defvar helm-mm-exact-pattern-str nil)
+(defvar helm-mm-exact-pattern-real nil)
+
+(defun helm-mm-exact-get-pattern (pattern)
+  (unless (equal pattern helm-mm-exact-pattern-str)
+    (setq helm-mm-exact-pattern-str pattern
+          helm-mm-exact-pattern-real (concat "\n" pattern "\n")))
+  helm-mm-exact-pattern-real)
+
+
+(cl-defun helm-mm-exact-match (str &optional (pattern helm-pattern))
+  (if case-fold-search
+      (progn
+        (setq str (downcase str)
+              pattern (downcase pattern))
+        (string= str pattern))
+      (string= str pattern)))
+
+(defun helm-mm-exact-search (pattern &rest _ignore)
+  (and (search-forward (helm-mm-exact-get-pattern pattern) nil t)
+       (forward-line -1)))
+
+
+;;; Prefix match
+;;
+;;
+;; Internal
+(defvar helm-mm-prefix-pattern-str nil)
+(defvar helm-mm-prefix-pattern-real nil)
+
+(defun helm-mm-prefix-get-pattern (pattern)
+  (unless (equal pattern helm-mm-prefix-pattern-str)
+    (setq helm-mm-prefix-pattern-str pattern
+          helm-mm-prefix-pattern-real (concat "\n" pattern)))
+  helm-mm-prefix-pattern-real)
+
+(defun helm-mm-prefix-match (str &optional pattern)
+  ;; In filename completion basename and basedir may be
+  ;; quoted, unquote them for string comparison (Issue #1283).
+  (setq pattern (replace-regexp-in-string
+                 "\\\\" "" (or pattern helm-pattern)))
+  (let ((len (length pattern)))
+    (and (<= len (length str))
+         (string= (substring str 0 len) pattern ))))
+
+(defun helm-mm-prefix-search (pattern &rest _ignore)
+  (search-forward (helm-mm-prefix-get-pattern pattern) nil t))
+
+
+;;; Multiple regexp patterns 1 (order is preserved / prefix).
+;;
+;;
+;; Internal
+(defvar helm-mm-1-pattern-str nil)
+(defvar helm-mm-1-pattern-real nil)
+
+(defun helm-mm-1-get-pattern (pattern)
+  (unless (equal pattern helm-mm-1-pattern-str)
+    (setq helm-mm-1-pattern-str pattern
+          helm-mm-1-pattern-real
+          (concat "^" (helm-mm-1-make-regexp pattern))))
+  helm-mm-1-pattern-real)
+
+(cl-defun helm-mm-1-match (str &optional (pattern helm-pattern))
+  (string-match (helm-mm-1-get-pattern pattern) str))
+
+(defun helm-mm-1-search (pattern &rest _ignore)
+  (re-search-forward (helm-mm-1-get-pattern pattern) nil t))
+
+
+;;; Multiple regexp patterns 2 (order is preserved / partial).
+;;
+;;
+;; Internal
+(defvar helm-mm-2-pattern-str nil)
+(defvar helm-mm-2-pattern-real nil)
+
+(defun helm-mm-2-get-pattern (pattern)
+  (unless (equal pattern helm-mm-2-pattern-str)
+    (setq helm-mm-2-pattern-str pattern
+          helm-mm-2-pattern-real
+          (concat "^.*" (helm-mm-1-make-regexp pattern))))
+  helm-mm-2-pattern-real)
+
+(cl-defun helm-mm-2-match (str &optional (pattern helm-pattern))
+  (string-match (helm-mm-2-get-pattern pattern) str))
+
+(defun helm-mm-2-search (pattern &rest _ignore)
+  (re-search-forward (helm-mm-2-get-pattern pattern) nil t))
+
+
+;;; Multiple regexp patterns 3 (permutation).
+;;
+;;
+;; Internal
+(defvar helm-mm-3-pattern-str nil)
+(defvar helm-mm-3-pattern-list nil)
+
+(defun helm-mm-3-get-patterns (pattern)
+  "Return `helm-mm-3-pattern-list', a list of predicate/regexp cons cells.
+e.g ((identity . \"foo\") (identity . \"bar\")).
+This is done only if `helm-mm-3-pattern-str' is same as PATTERN."
+  (unless (equal pattern helm-mm-3-pattern-str)
+    (setq helm-mm-3-pattern-str pattern
+          helm-mm-3-pattern-list
+          (helm-mm-3-get-patterns-internal pattern)))
+  helm-mm-3-pattern-list)
+
+(defun helm-mm-3-get-patterns-internal (pattern)
+  "Return a list of predicate/regexp cons cells.
+e.g ((identity . \"foo\") (identity . \"bar\"))."
+  (unless (string= pattern "")
+    (cl-loop for pat in (helm-mm-split-pattern pattern)
+          collect (if (string= "!" (substring pat 0 1))
+                      (cons 'not (substring pat 1))
+                    (cons 'identity pat)))))
+
+(cl-defun helm-mm-3-match (str &optional (pattern helm-pattern))
+  "Check if PATTERN match STR.
+When PATTERN contain a space, it is splitted and matching is done
+with the several resulting regexps against STR.
+e.g \"bar foo\" will match \"foobar\" and \"barfoo\".
+Argument PATTERN, a string, is transformed in a list of
+cons cell with `helm-mm-3-get-patterns' if it contain a space.
+e.g \"foo bar\"=>((identity . \"foo\") (identity . \"bar\")).
+Then each predicate of cons cell(s) is called with regexp of same
+cons cell against STR (a candidate).
+i.e (identity (string-match \"foo\" \"foo bar\")) => t."
+  (let ((pat (helm-mm-3-get-patterns pattern)))
+    (cl-loop for (predicate . regexp) in pat
+             always (funcall predicate
+                             (condition-case _err
+                                 ;; FIXME: Probably do nothing when
+                                 ;; using fuzzy leaving the job
+                                 ;; to the fuzzy fn.
+                                 (string-match regexp str)
+                               (invalid-regexp nil))))))
+
+(defun helm-mm-3-search-base (pattern searchfn1 searchfn2)
+  "Try to find PATTERN in `helm-buffer' with SEARCHFN1 and SEARCHFN2.
+This is the search function for `candidates-in-buffer' enabled sources.
+Use the same method as `helm-mm-3-match' except it search in buffer
+instead of matching on a string.
+i.e (identity (re-search-forward \"foo\" (point-at-eol) t)) => t."
+  (cl-loop with pat = (if (stringp pattern)
+                          (helm-mm-3-get-patterns pattern)
+                          pattern)
+           when (eq (caar pat) 'not) return
+           ;; Pass the job to `helm-search-match-part'.
+           (prog1 (list (point-at-bol) (point-at-eol))
+             (forward-line 1))
+           while (condition-case _err
+                     (funcall searchfn1 (or (cdar pat) "") nil t)
+                   (invalid-regexp nil))
+           for bol = (point-at-bol)
+           for eol = (point-at-eol)
+           if (cl-loop for (pred . str) in (cdr pat) always
+                       (progn (goto-char bol)
+                              (funcall pred (condition-case _err
+                                                (funcall searchfn2 str eol t)
+                                              (invalid-regexp nil)))))
+           do (goto-char eol) and return t
+           else do (goto-char eol)
+           finally return nil))
+
+(defun helm-mm-3-search (pattern &rest _ignore)
+  (when (stringp pattern)
+    (setq pattern (helm-mm-3-get-patterns pattern)))
+  (helm-mm-3-search-base
+   pattern 're-search-forward 're-search-forward))
+
+;;; mp-3 with migemo
+;;
+;;
+(defvar helm-mm--previous-migemo-info nil
+  "[Internal] Cache previous migemo query.")
+(make-local-variable 'helm-mm--previous-migemo-info)
+
+(declare-function migemo-get-pattern "ext:migemo.el")
+(declare-function migemo-search-pattern-get "ext:migemo.el")
+
+(define-minor-mode helm-migemo-mode
+    "Enable migemo in helm.
+It will be available in the sources handling it,
+i.e the sources which have the slot :migemo with non--nil value."
+  :lighter " Hmio"
+  :group 'helm
+  :global t
+  (cl-assert (featurep 'migemo)
+             nil "No feature called migemo found, install migemo.el."))
+
+(defun helm-mm-migemo-get-pattern (pattern)
+  (let ((regex (migemo-get-pattern pattern)))
+    (if (ignore-errors (string-match regex "") t)
+        (concat regex "\\|" pattern) pattern)))
+
+(defun helm-mm-migemo-search-pattern-get (pattern)
+  (let ((regex (migemo-search-pattern-get pattern)))
+    (if (ignore-errors (string-match regex "") t)
+        (concat regex "\\|" pattern) pattern)))
+
+(defun helm-mm-migemo-string-match (pattern str)
+  "Migemo version of `string-match'."
+  (unless (assoc pattern helm-mm--previous-migemo-info)
+    (with-helm-buffer
+      (setq helm-mm--previous-migemo-info
+            (push (cons pattern (helm-mm-migemo-get-pattern pattern))
+                  helm-mm--previous-migemo-info))))
+  (string-match (assoc-default pattern helm-mm--previous-migemo-info) str))
+
+(cl-defun helm-mm-3-migemo-match (str &optional (pattern helm-pattern))
+  (and helm-migemo-mode
+       (cl-loop for (pred . re) in (helm-mm-3-get-patterns pattern)
+                always (funcall pred (helm-mm-migemo-string-match re str)))))
+
+(defun helm-mm-migemo-forward (word &optional bound noerror count)
+  (with-helm-buffer
+    (unless (assoc word helm-mm--previous-migemo-info)
+      (setq helm-mm--previous-migemo-info
+            (push (cons word (if (delq 'ascii (find-charset-string word))
+                                 word
+                               (helm-mm-migemo-search-pattern-get word)))
+                  helm-mm--previous-migemo-info))))
+  (re-search-forward
+   (assoc-default word helm-mm--previous-migemo-info) bound noerror count))
+
+(defun helm-mm-3-migemo-search (pattern &rest _ignore)
+  (and helm-migemo-mode
+       (helm-mm-3-search-base
+        pattern 'helm-mm-migemo-forward 'helm-mm-migemo-forward)))
+
+
+;;; mp-3p- (multiple regexp pattern 3 with prefix search)
+;;
+;;
+(defun helm-mm-3p-match (str &optional pattern)
+  "Check if PATTERN match STR.
+Same as `helm-mm-3-match' but more strict, matching against prefix also.
+e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to
+`helm-mm-3-match'."
+  (let* ((pat (helm-mm-3-get-patterns (or pattern helm-pattern)))
+         (first (car pat)))
+    (and (funcall (car first) (helm-mm-prefix-match str (cdr first)))
+         (cl-loop for (predicate . regexp) in (cdr pat)
+               always (funcall predicate (string-match regexp str))))))
+
+(defun helm-mm-3p-search (pattern &rest _ignore)
+  (when (stringp pattern)
+    (setq pattern (helm-mm-3-get-patterns pattern)))
+  (helm-mm-3-search-base
+   pattern 'helm-mm-prefix-search 're-search-forward))
+
+
+;;; Generic multi-match/search functions
+;;
+;;
+(cl-defun helm-mm-match (str &optional (pattern helm-pattern))
+  (let ((fun (cl-ecase helm-mm-matching-method
+               (multi1 #'helm-mm-1-match)
+               (multi2 #'helm-mm-2-match)
+               (multi3 #'helm-mm-3-match)
+               (multi3p #'helm-mm-3p-match))))
+    (funcall fun str pattern)))
+
+(defun helm-mm-search (pattern &rest _ignore)
+  (let ((fun (cl-ecase helm-mm-matching-method
+               (multi1 #'helm-mm-1-search)
+               (multi2 #'helm-mm-2-search)
+               (multi3 #'helm-mm-3-search)
+               (multi3p #'helm-mm-3p-search))))
+    (funcall fun pattern)))
+
+
+(provide 'helm-multi-match)
+
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-multi-match.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-net.el b/emacs.d/elpa/helm-20160115.2200/helm-net.el
new file mode 100644
index 0000000..cdcc53e
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-net.el
@@ -0,0 +1,526 @@
+;;; helm-net.el --- helm browse url and search web. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'url)
+(require 'xml)
+(require 'browse-url)
+
+
+(defgroup helm-net nil
+  "Net related applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-google-suggest-default-browser-function nil
+  "The browse url function you prefer to use with google suggest.
+When nil, use the first browser function available
+See `helm-browse-url-default-browser-alist'."
+  :group 'helm-net
+  :type 'symbol)
+
+(defcustom helm-home-url "http://www.google.fr"
+  "Default url to use as home url."
+  :group 'helm-net
+  :type 'string)
+
+(defcustom helm-surfraw-default-browser-function nil
+  "The browse url function you prefer to use with surfraw.
+When nil, fallback to `browse-url-browser-function'."
+  :group 'helm-net
+  :type 'symbol)
+
+(defcustom helm-google-suggest-url
+  "http://google.com/complete/search?output=toolbar&q="
+  "URL used for looking up Google suggestions."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-google-suggest-search-url
+  "http://www.google.com/search?ie=utf-8&oe=utf-8&q=%s"
+  "URL used for Google searching."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-net-prefer-curl nil
+  "When non--nil use CURL external program to fetch data.
+Otherwise `url-retrieve-synchronously' is used."
+  :type 'boolean
+  :group 'helm-net)
+
+(defvaralias 'helm-google-suggest-use-curl-p 'helm-net-prefer-curl)
+(make-obsolete-variable 'helm-google-suggest-use-curl-p 'helm-net-prefer-curl "1.7.7")
+
+(defcustom helm-surfraw-duckduckgo-url
+  "https://duckduckgo.com/lite/?q=%s&kp=1"
+  "The duckduckgo url.
+This is a format string, don't forget the `%s'.
+If you have personal settings saved on duckduckgo you should have
+a personal url, see your settings on duckduckgo."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-wikipedia-suggest-url
+  "https://en.wikipedia.org/w/api.php?action=opensearch&search="
+  "Url used for looking up Wikipedia suggestions."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-search-suggest-action-wikipedia-url
+  "https://en.wikipedia.org/wiki/Special:Search?search=%s"
+  "The Wikipedia search url.
+This is a format string, don't forget the `%s'."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-wikipedia-summary-url
+  "http://en.wikipedia.org/w/api.php?action=parse&format=json&prop=text&section=0&page="
+  "URL for getting the summary of a Wikipedia topic."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-wikipedia-follow-delay 2
+  "Delay before wikipedia summary popup."
+  :type 'number
+  :group 'helm-net)
+
+(defcustom helm-search-suggest-action-youtube-url
+  "http://www.youtube.com/results?aq=f&search_query=%s"
+  "The Youtube search url.
+This is a format string, don't forget the `%s'."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-search-suggest-action-imdb-url
+  "http://www.imdb.com/find?s=all&q=%s"
+  "The IMDb search url.
+This is a format string, don't forget the `%s'."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-search-suggest-action-google-maps-url
+  "http://maps.google.com/maps?f=q&source=s_q&q=%s"
+  "The Google Maps search url.
+This is a format string, don't forget the `%s'."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-search-suggest-action-google-news-url
+  "http://www.google.com/search?safe=off&prmd=nvlifd&source=lnms&tbs=nws:1&q=%s"
+  "The Google News search url.
+This is a format string, don't forget the `%s'."
+  :type 'string
+  :group 'helm-net)
+
+(defcustom helm-google-suggest-actions
+  '(("Google Search" . helm-google-suggest-action)
+    ("Wikipedia" . (lambda (candidate)
+                     (helm-search-suggest-perform-additional-action
+                      helm-search-suggest-action-wikipedia-url
+                      candidate)))
+    ("Youtube" . (lambda (candidate)
+                   (helm-search-suggest-perform-additional-action
+                    helm-search-suggest-action-youtube-url
+                    candidate)))
+    ("IMDb" . (lambda (candidate)
+                (helm-search-suggest-perform-additional-action
+                 helm-search-suggest-action-imdb-url
+                 candidate)))
+    ("Google Maps" . (lambda (candidate)
+                       (helm-search-suggest-perform-additional-action
+                        helm-search-suggest-action-google-maps-url
+                        candidate)))
+    ("Google News" . (lambda (candidate)
+                       (helm-search-suggest-perform-additional-action
+                        helm-search-suggest-action-google-news-url
+                        candidate))))
+  "List of actions for google suggest sources."
+  :group 'helm-net
+  :type '(alist :key-type string :value-type function))
+
+(defcustom helm-browse-url-firefox-new-window "-new-tab"
+  "Allow choosing to browse url in new window or new tab.
+Can be \"-new-tab\" (default) or \"-new-window\"."
+  :group 'helm-net
+  :type '(radio
+          (const :tag "New tab" "-new-tab")
+          (const :tag "New window" "-new-window")))
+
+
+;;; Additional actions for search suggestions
+;;
+;;
+;; Internal
+
+(defun helm-search-suggest-perform-additional-action (url query)
+  "Perform the search via URL using QUERY as input."
+  (browse-url (format url (url-hexify-string query))))
+
+(defun helm-net--url-retrieve-sync (request parser)
+  (if helm-net-prefer-curl
+      (with-temp-buffer
+        (call-process "curl" nil t nil request)
+        (funcall parser))
+      (with-current-buffer (url-retrieve-synchronously request)
+        (funcall parser))))
+
+
+;;; Google Suggestions
+;;
+;;
+(defun helm-google-suggest-parser ()
+  (cl-loop
+   with result-alist = (xml-get-children
+                        (car (xml-parse-region
+                              (point-min) (point-max)))
+                        'CompleteSuggestion)
+   for i in result-alist collect
+   (cdr (cl-caadr (assoc 'suggestion i)))))
+
+(defun helm-google-suggest-fetch (input)
+  "Fetch suggestions for INPUT from XML buffer."
+  (let ((request (concat helm-google-suggest-url
+                         (url-hexify-string input))))
+    (helm-net--url-retrieve-sync
+     request #'helm-google-suggest-parser)))
+
+(defun helm-google-suggest-set-candidates (&optional request-prefix)
+  "Set candidates with result and number of google results found."
+  (let ((suggestions (helm-google-suggest-fetch
+                      (or (and request-prefix
+                               (concat request-prefix
+                                       " " helm-pattern))
+                          helm-pattern))))
+    (if (member helm-pattern suggestions)
+        suggestions
+        ;; if there is no suggestion exactly matching the input then
+        ;; prepend a Search on Google item to the list
+        (append
+         suggestions
+         (list (cons (format "Search for '%s' on Google" helm-input)
+                     helm-input))))))
+
+(defun helm-ggs-set-number-result (num)
+  (if num
+      (progn
+        (and (numberp num) (setq num (number-to-string num)))
+        (cl-loop for i in (reverse (split-string num "" t))
+              for count from 1
+              append (list i) into C
+              when (= count 3)
+              append (list ",") into C
+              and do (setq count 0)
+              finally return
+              (replace-regexp-in-string
+               "^," "" (mapconcat 'identity (reverse C) ""))))
+    "?"))
+
+(defun helm-google-suggest-action (candidate)
+  "Default action to jump to a google suggested candidate."
+  (let ((arg (format helm-google-suggest-search-url
+                     (url-hexify-string candidate))))
+    (helm-aif helm-google-suggest-default-browser-function
+        (funcall it arg)
+      (helm-browse-url arg))))
+
+(defvar helm-google-suggest-default-function
+  'helm-google-suggest-set-candidates
+  "Default function to use in helm google suggest.")
+
+(defvar helm-source-google-suggest
+  (helm-build-sync-source "Google Suggest"
+    :candidates (lambda ()
+                  (funcall helm-google-suggest-default-function))
+    :action 'helm-google-suggest-actions
+    :volatile t
+    :keymap helm-map
+    :requires-pattern 3))
+
+(defun helm-google-suggest-emacs-lisp ()
+  "Try to emacs lisp complete with google suggestions."
+  (helm-google-suggest-set-candidates "emacs lisp"))
+
+;;; Wikipedia suggestions
+;;
+;;
+(declare-function json-read-from-string "json" (string))
+(defun helm-wikipedia-suggest-fetch ()
+  "Fetch Wikipedia suggestions and return them as a list."
+  (require 'json)
+  (let ((request (concat helm-wikipedia-suggest-url
+                         (url-hexify-string helm-pattern))))
+    (helm-net--url-retrieve-sync
+     request #'helm-wikipedia--parse-buffer)))
+
+(defun helm-wikipedia--parse-buffer ()
+  (goto-char (point-min))
+  (when (re-search-forward "^\\[.+\\[\\(.*\\)\\]\\]" nil t)
+    (cl-loop for i across (aref (json-read-from-string (match-string 0)) 1)
+          collect i into result
+          finally return (or result
+                             (append
+                              result
+                              (list (cons (format "Search for '%s' on wikipedia"
+                                                  helm-pattern)
+                                          helm-pattern)))))))
+
+(defvar helm-wikipedia--summary-cache (make-hash-table :test 'equal))
+(defun helm-wikipedia-persistent-action (candidate)
+  (unless (string= (format "Search for '%s' on wikipedia"
+                           helm-pattern)
+                   (helm-get-selection nil t))
+    (message "Fetching summary from Wikipedia...")
+    (let ((buf (get-buffer-create "*helm wikipedia summary*"))
+          result mess)
+      (while (progn
+               (setq result (or (gethash candidate helm-wikipedia--summary-cache)
+                                (puthash candidate
+                                         (prog1
+                                             (helm-wikipedia-fetch-summary candidate)
+                                           (setq mess "Done"))
+                                         helm-wikipedia--summary-cache)))
+               (when (and result
+                          (listp result))
+                 (setq candidate (cdr result))
+                 (message "Redirected to %s" candidate)
+                 t)))
+      (if (not result)
+          (message "Error when getting summary.")
+        (with-current-buffer buf
+          (erase-buffer)
+          (setq cursor-type nil)
+          (insert result)
+          (fill-region (point-min) (point-max))
+          (goto-char (point-min)))
+        (display-buffer buf)
+        (message mess)))))
+
+(defun helm-wikipedia-fetch-summary (input)
+  (let* ((request (concat helm-wikipedia-summary-url
+                          (url-hexify-string input))))
+    (helm-net--url-retrieve-sync
+     request #'helm-wikipedia--parse-summary)))
+
+(defun helm-wikipedia--parse-summary ()
+  (goto-char (point-min))
+  (when (search-forward "{" nil t)
+    (let ((result (cdr (assoc '*
+                              (assoc 'text
+                                     (assoc 'parse
+                                            (json-read-from-string
+                                             (buffer-substring-no-properties
+                                              (1- (point)) (point-max)))))))))
+      (when result
+        (if (string-match "<span class=\"redirectText\"><a href=[^>]+>\\([^<]+\\)" result)
+            (cons 'redirect (match-string 1 result))
+
+          ;; find the beginning of the summary text in the result
+
+          ;; check if there is a table before the summary and skip that
+          (when (or (string-match "</table>\\(\n<div.*?</div>\\)?\n<p>" result)
+                    ;; otherwise just find the first paragraph
+                    (string-match "<p>" result))
+            ;; remove cruft and do a simple formatting 
+            (replace-regexp-in-string
+             "Cite error: .*" ""
+             (replace-regexp-in-string
+              "&#160;" ""
+              (replace-regexp-in-string
+               "\\[[^\]]+\\]" ""
+               (replace-regexp-in-string
+                "<[^>]*>" ""
+                (replace-regexp-in-string
+                 "</p>\n<p>" "\n\n"
+                 (substring result (match-end 0)))))))))))))
+
+
+(defvar helm-source-wikipedia-suggest
+  (helm-build-sync-source "Wikipedia Suggest"
+    :candidates #'helm-wikipedia-suggest-fetch
+    :action '(("Wikipedia" . (lambda (candidate)
+                               (helm-search-suggest-perform-additional-action
+                                helm-search-suggest-action-wikipedia-url
+                                candidate))))
+    :persistent-action #'helm-wikipedia-persistent-action
+    :volatile t
+    :keymap helm-map
+    :follow 1
+    :follow-delay helm-wikipedia-follow-delay
+    :requires-pattern 3))
+
+
+;;; Web browser functions.
+;;
+;;
+;; If default setting of `w3m-command' is not
+;; what you want and you modify it, you will have to reeval
+;; also `helm-browse-url-default-browser-alist'.
+
+(defvar helm-browse-url-chromium-program "chromium-browser")
+(defvar helm-browse-url-uzbl-program "uzbl-browser")
+(defvar helm-browse-url-conkeror-program "conkeror")
+(defvar helm-browse-url-default-browser-alist
+  `((,(or (and (boundp 'w3m-command) w3m-command)
+          "/usr/bin/w3m") . w3m-browse-url)
+    (,browse-url-firefox-program . browse-url-firefox)
+    (,helm-browse-url-chromium-program . helm-browse-url-chromium)
+    (,helm-browse-url-conkeror-program . helm-browse-url-conkeror)
+    (,helm-browse-url-uzbl-program . helm-browse-url-uzbl)
+    (,browse-url-kde-program . browse-url-kde)
+    (,browse-url-gnome-moz-program . browse-url-gnome-moz)
+    (,browse-url-mozilla-program . browse-url-mozilla)
+    (,browse-url-galeon-program . browse-url-galeon)
+    (,browse-url-netscape-program . browse-url-netscape)
+    (,browse-url-mosaic-program . browse-url-mosaic)
+    (,browse-url-xterm-program . browse-url-text-xterm)
+    ("emacs" . eww-browse-url))
+  "*Alist of \(executable . function\) to try to find a suitable url browser.")
+
+(cl-defun helm-generic-browser (url cmd-name &rest args)
+  "Browse URL with NAME browser."
+  (let ((proc (concat cmd-name " " url)))
+    (message "Starting %s..." cmd-name)
+    (apply 'start-process proc nil cmd-name
+           (append args (list url)))
+    (set-process-sentinel
+     (get-process proc)
+     (lambda (process event)
+         (when (string= event "finished\n")
+           (message "%s process %s" process event))))))
+
+(defun helm-browse-url-firefox (url &optional _ignore)
+  "Same as `browse-url-firefox' but detach from emacs.
+So when you quit emacs you can keep your firefox open
+and not be prompted to kill firefox process.
+
+NOTE: Probably not supported on some systems (e.g Windows)."
+  (interactive (list (read-string "URL: " (browse-url-url-at-point))
+                     nil))
+  (let ((process-environment (browse-url-process-environment)))
+    (call-process-shell-command
+     (format "(%s %s %s &)"
+             browse-url-firefox-program
+             helm-browse-url-firefox-new-window
+             url))))
+
+(defun helm-browse-url-chromium (url &optional _ignore)
+  "Browse URL with google chrome browser."
+  (interactive "sURL: ")
+  (helm-generic-browser
+   url helm-browse-url-chromium-program))
+
+(defun helm-browse-url-uzbl (url &optional _ignore)
+  "Browse URL with uzbl browser."
+  (interactive "sURL: ")
+  (helm-generic-browser url helm-browse-url-uzbl-program "-u"))
+
+(defun helm-browse-url-conkeror (url &optional _ignore)
+  "Browse URL with conkeror browser."
+  (interactive "sURL: ")
+  (helm-generic-browser url helm-browse-url-conkeror-program))
+
+(defun helm-browse-url-default-browser (url &rest args)
+  "Find the first available browser and ask it to load URL."
+  (let ((default-browser-fn
+         (cl-loop for (exe . fn) in helm-browse-url-default-browser-alist
+               thereis (and exe (executable-find exe) (fboundp fn) fn))))
+    (if default-browser-fn
+        (apply default-browser-fn url args)
+      (error "No usable browser found"))))
+
+(defun helm-browse-url (url &rest args)
+  "Default command to browse URL."
+  (if browse-url-browser-function
+      (browse-url url args)
+    (helm-browse-url-default-browser url args)))
+
+
+;;; Surfraw
+;;
+;; Need external program surfraw.
+;; <http://surfraw.alioth.debian.org/>
+
+;; Internal
+(defvar helm-surfraw-engines-history nil)
+(defvar helm-surfraw-input-history nil)
+(defvar helm-surfraw--elvi-cache nil)
+
+(defun helm-build-elvi-list ()
+  "Return list of all engines and descriptions handled by surfraw."
+  (or helm-surfraw--elvi-cache
+      (setq helm-surfraw--elvi-cache
+            (cdr (with-temp-buffer
+                   (call-process "surfraw" nil t nil "-elvi")
+                   (split-string (buffer-string) "\n"))))))
+
+;;;###autoload
+(defun helm-surfraw (pattern engine)
+  "Preconfigured `helm' to search PATTERN with search ENGINE."
+  (interactive (list (read-string "SearchFor: "
+                                  nil 'helm-surfraw-input-history
+                                  (thing-at-point 'symbol))
+                     (helm-comp-read
+                      "Engine: "
+                      (helm-build-elvi-list)
+                      :must-match t
+                      :name "Surfraw Search Engines"
+                      :del-input nil
+                      :history helm-surfraw-engines-history)))
+  (let* ((engine-nodesc (car (split-string engine)))
+         (url (if (string= engine-nodesc "duckduckgo")
+                  ;; "sr duckduckgo -p foo" is broken, workaround.
+                  (format helm-surfraw-duckduckgo-url
+                          (url-hexify-string pattern))
+                (with-temp-buffer
+                  (apply 'call-process "surfraw" nil t nil
+                         (append  (list engine-nodesc "-p") (split-string pattern)))
+                  (replace-regexp-in-string
+                   "\n" "" (buffer-string)))))
+         (browse-url-browser-function (or helm-surfraw-default-browser-function
+                                          browse-url-browser-function)))
+    (if (string= engine-nodesc "W")
+        (helm-browse-url helm-home-url)
+      (helm-browse-url url)
+      (setq helm-surfraw-engines-history
+            (cons engine (delete engine helm-surfraw-engines-history))))))
+
+;;;###autoload
+(defun helm-google-suggest ()
+  "Preconfigured `helm' for google search with google suggest."
+  (interactive)
+  (helm-other-buffer 'helm-source-google-suggest "*helm google*"))
+
+;;;###autoload
+(defun helm-wikipedia-suggest ()
+  "Preconfigured `helm' for Wikipedia lookup with Wikipedia suggest."
+  (interactive)
+  (helm :sources 'helm-source-wikipedia-suggest
+        :buffer "*helm wikipedia*"))
+
+
+(provide 'helm-net)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-net.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-org.el b/emacs.d/elpa/helm-20160115.2200/helm-org.el
new file mode 100644
index 0000000..422c273
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-org.el
@@ -0,0 +1,221 @@
+;;; helm-org.el --- Helm for org headlines and keywords completion -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-utils)
+(require 'org)
+
+(declare-function org-agenda-switch-to "org-agenda.el")
+
+(defgroup helm-org nil
+  "Org related functions for helm."
+  :group 'helm)
+
+(defcustom helm-org-headings-fontify nil
+  "Fontify org buffers before parsing them.
+This reflect fontification in helm-buffer when non--nil.
+NOTE: This will be slow on large org buffers."
+  :group 'helm-org
+  :type 'boolean)
+
+(defcustom helm-org-format-outline-path nil
+  "Show all org level as path."
+  :group 'helm-org
+  :type 'boolean)
+
+(defcustom helm-org-show-filename nil
+  "Show org filenames in `helm-org-agenda-files-headings' when non--nil.
+Note this have no effect in `helm-org-in-buffer-headings'."
+  :group 'helm-org
+  :type 'boolean)
+
+(defcustom helm-org-headings-min-depth 1
+  "Minimum depth of org headings to start with."
+  :group 'helm-org
+  :type 'integer)
+
+(defcustom helm-org-headings-max-depth 8
+  "Go down to this maximum depth of org headings."
+  :group 'helm-org
+  :type 'integer)
+
+;;; Org capture templates
+;;
+;;
+(defvar org-capture-templates)
+(defun helm-source-org-capture-templates ()
+  (helm-build-sync-source "Org Capture Templates:"
+    :candidates (cl-loop for template in org-capture-templates
+                         collect (cons (nth 1 template) (nth 0 template)))
+    :action '(("Do capture" . (lambda (template-shortcut)
+                                (org-capture nil template-shortcut))))))
+
+;;; Org headings
+;;
+;;
+(defun helm-org-goto-marker (marker)
+  (switch-to-buffer (marker-buffer marker))
+  (goto-char (marker-position marker))
+  (org-show-context)
+  (re-search-backward "^\\*+ " nil t)
+  (org-show-entry))
+
+(defun helm-source-org-headings-for-files (filenames &optional parents)
+  (helm-build-sync-source "Org Headings"
+    :candidates filenames ; Start with only filenames.
+    :match (lambda (candidate)
+             (string-match
+              helm-pattern
+              (helm-aif (get-text-property 0 'helm-real-display candidate)
+                  it
+                candidate)))
+    :candidate-transformer
+    ;; Now that the helm-window is available proceed to truncation
+    ;; and other transformations.
+    (lambda (candidates)
+      (let ((cands (helm-org-get-candidates candidates parents)))
+         (if parents (nreverse cands) cands)))
+    :action '(("Go to line" . helm-org-goto-marker)
+              ("Refile to this heading" . helm-org-heading-refile)
+              ("Insert link to this heading"
+               . helm-org-insert-link-to-heading-at-marker))))
+
+(defun helm-org-get-candidates (filenames &optional parents)
+  (helm-flatten-list
+   (mapcar (lambda (filename)
+             (helm-org--get-candidates-in-file
+              filename
+              helm-org-headings-fontify
+              (or parents (null helm-org-show-filename))
+              parents))
+           filenames)
+   t))
+
+(defun helm-org--get-candidates-in-file (filename &optional fontify nofname parents)
+  (with-current-buffer (pcase filename
+                         ((pred bufferp) filename)
+                         ((pred stringp) (find-file-noselect filename)))
+    (and fontify (jit-lock-fontify-now))
+    (let ((match-fn (if fontify
+                        #'match-string
+                        #'match-string-no-properties))
+          (search-fn (lambda ()
+                       (when (or (null parents)
+                                 (org-up-heading-safe))
+                         (re-search-forward
+                          org-complex-heading-regexp nil t)))))
+      (save-excursion
+        (save-restriction
+          (widen)
+          (unless parents (goto-char (point-min)))
+          (cl-loop with width = (window-width (helm-window))
+                   while (funcall search-fn)
+                   for all = (funcall match-fn  0)
+                   for truncated-all = (if (and all (> (length all) width))
+                                           (substring all 0 width) all)
+                   for level = (length (match-string-no-properties 1))
+                   for heading = (funcall match-fn 4)
+                   for file = (unless nofname
+                                (concat (helm-basename filename) ":"))
+                   if (and (>= level helm-org-headings-min-depth)
+                           (<= level helm-org-headings-max-depth))
+                   collect (cons (propertize
+                                  (if helm-org-format-outline-path
+                                      (org-format-outline-path
+                                       (append (apply #'org-get-outline-path
+                                                      (unless parents
+                                                        (list t level heading)))
+                                               (list heading))
+                                       width file)
+                                      (if file
+                                          (concat file truncated-all)
+                                          truncated-all))
+                                  'helm-real-display heading)
+                                 (point-marker))))))))
+
+(defun helm-org-insert-link-to-heading-at-marker (marker)
+  (with-current-buffer (marker-buffer marker)
+    (let ((heading-name (save-excursion (goto-char (marker-position marker))
+                                        (nth 4 (org-heading-components))))
+          (file-name (buffer-file-name)))
+      (with-helm-current-buffer
+        (org-insert-link
+         file-name (concat "file:" file-name "::*" heading-name))))))
+
+(defun helm-org-heading-refile (marker)
+  (save-selected-window
+    (when (eq major-mode 'org-agenda-mode)
+      (org-agenda-switch-to))
+    (org-cut-subtree)
+    (let ((target-level (with-current-buffer (marker-buffer marker)
+                          (goto-char (marker-position marker))
+                          (org-current-level))))
+      (helm-org-goto-marker marker)
+      (org-end-of-subtree t t)
+      (org-paste-subtree (+ target-level 1)))))
+
+;;;###autoload
+(defun helm-org-agenda-files-headings ()
+  "Preconfigured helm for org files headings."
+  (interactive)
+  (helm :sources (helm-source-org-headings-for-files (org-agenda-files))
+        :candidate-number-limit 99999
+        :buffer "*helm org headings*"))
+
+;;;###autoload
+(defun helm-org-in-buffer-headings ()
+  "Preconfigured helm for org buffer headings."
+  (interactive)
+  (let ((helm-org-show-filename nil))
+    (helm :sources (helm-source-org-headings-for-files
+                    (list (current-buffer)))
+          :candidate-number-limit 99999
+          :buffer "*helm org inbuffer*")))
+
+;;;###autoload
+(defun helm-org-parent-headings ()
+  "Preconfigured helm for org headings that are parents of the
+current heading."
+  (interactive)
+  ;; Use a large max-depth to ensure all parents are displayed.
+  (let ((helm-org-headings-min-depth 1)
+        (helm-org-headings-max-depth  50))
+    (helm :sources (helm-source-org-headings-for-files
+                    (list (current-buffer)) t)
+          :candidate-number-limit 99999
+          :buffer "*helm org parent headings*")))
+
+;;;###autoload
+(defun helm-org-capture-templates ()
+  "Preconfigured helm for org templates."
+  (interactive)
+  (helm :sources (helm-source-org-capture-templates)
+        :candidate-number-limit 99999
+        :buffer "*helm org capture templates*"))
+
+
+(provide 'helm-org)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-org.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-pkg.el b/emacs.d/elpa/helm-20160115.2200/helm-pkg.el
new file mode 100644
index 0000000..69fa391
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-pkg.el
@@ -0,0 +1,9 @@
+(define-package "helm" "20160115.2200" "Helm is an Emacs incremental and narrowing framework"
+  '((emacs "24")
+    (cl-lib "0.5")
+    (async "1.6")
+    (helm-core "1.9.1"))
+  :url "https://emacs-helm.github.io/helm/")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/helm-20150623.1310/helm-plugin.el b/emacs.d/elpa/helm-20160115.2200/helm-plugin.el
similarity index 100%
rename from emacs.d/elpa/helm-20150623.1310/helm-plugin.el
rename to emacs.d/elpa/helm-20160115.2200/helm-plugin.el
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-regexp.el b/emacs.d/elpa/helm-20160115.2200/helm-regexp.el
new file mode 100644
index 0000000..793144d
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-regexp.el
@@ -0,0 +1,643 @@
+;;; helm-regexp.el --- In buffer regexp searching and replacement for helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-utils)
+(require 'helm-plugin)
+
+(declare-function helm-mm-split-pattern "helm-multi-match")
+
+
+(defgroup helm-regexp nil
+  "Regexp related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-moccur-always-search-in-current nil
+  "Helm multi occur always search in current buffer when non--nil."
+  :group 'helm-regexp
+  :type 'boolean)
+
+(defcustom helm-moccur-use-ioccur-style-keys t
+  "Similar to `helm-grep-use-ioccur-style-keys' but for multi occur."
+  :group 'helm-regexp
+  :type 'boolean)
+
+(defcustom helm-moccur-auto-update-on-resume nil
+  "Allow auto updating helm-(m)occur buffer when outdated.
+noask => Always update without asking
+nil   => Don't update but signal buffer needs update
+never => Never update and do not signal buffer needs update
+Any other non--nil value update after confirmation."
+  :group 'helm-regexp
+  :type '(radio :tag "Allow auto updating helm-(m)occur buffer when outdated."
+          (const :tag "Always update without asking" noask)
+          (const :tag "Never update and do not signal buffer needs update" never)
+          (const :tag "Don't update but signal buffer needs update" nil)
+          (const :tag "Update after confirmation" t)))
+
+(defcustom helm-source-multi-occur-actions
+  '(("Go to Line" . helm-moccur-goto-line)
+    ("Goto line other window" . helm-moccur-goto-line-ow)
+    ("Goto line new frame" . helm-moccur-goto-line-of))
+  "Actions for helm-occur and helm-moccur."
+  :group 'helm-regexp
+  :type '(alist :key-type string :value-type function))
+
+(defcustom helm-moccur-truncate-lines t
+  "When nil the (m)occur line that appears will not be truncated."
+  :group 'helm-regexp
+  :type 'boolean)
+
+
+(defface helm-moccur-buffer
+    '((t (:foreground "DarkTurquoise" :underline t)))
+  "Face used to highlight moccur buffer names."
+  :group 'helm-regexp)
+
+(defface helm-resume-need-update
+    '((t (:background "red")))
+  "Face used to flash moccur buffer when it needs update."
+  :group 'helm-regexp)
+
+
+(defvar helm-moccur-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
+    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
+    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
+    (define-key map (kbd "C-c o")    'helm-moccur-run-goto-line-ow)
+    (define-key map (kbd "C-c C-o")  'helm-moccur-run-goto-line-of)
+    (define-key map (kbd "C-x C-s")  'helm-moccur-run-save-buffer)
+    (when helm-moccur-use-ioccur-style-keys
+      (define-key map (kbd "<right>")  'helm-execute-persistent-action)
+      (define-key map (kbd "<left>")   'helm-moccur-run-default-action))
+    (delq nil map))
+  "Keymap used in Moccur source.")
+
+
+;; History vars
+(defvar helm-build-regexp-history nil)
+(defvar helm-occur-history nil)
+
+(defun helm-query-replace-regexp (_candidate)
+  "Query replace regexp from `helm-regexp'.
+With a prefix arg replace only matches surrounded by word boundaries,
+i.e Don't replace inside a word, regexp is surrounded with \\bregexp\\b."
+  (let ((regexp helm-input))
+    (apply 'query-replace-regexp
+           (helm-query-replace-args regexp))))
+
+(defun helm-kill-regexp-as-sexp (_candidate)
+  "Kill regexp in a format usable in lisp code."
+  (helm-regexp-kill-new
+   (prin1-to-string helm-input)))
+
+(defun helm-kill-regexp (_candidate)
+  "Kill regexp as it is in `helm-pattern'."
+  (helm-regexp-kill-new helm-input))
+
+(defun helm-query-replace-args (regexp)
+  "create arguments of `query-replace-regexp' action in `helm-regexp'."
+  (let ((region-only (helm-region-active-p)))
+    (list
+     regexp
+     (query-replace-read-to regexp
+                            (format "Query replace %sregexp %s"
+                                    (if helm-current-prefix-arg "word " "")
+                                    (if region-only "in region " ""))
+                            t)
+     helm-current-prefix-arg
+     (when region-only (region-beginning))
+     (when region-only (region-end)))))
+
+(defvar helm-source-regexp
+  (helm-build-in-buffer-source "Regexp Builder"
+    :init (lambda ()
+            (helm-init-candidates-in-buffer
+                'global (with-temp-buffer
+                          (insert-buffer-substring helm-current-buffer)
+                          (buffer-string))))
+    :get-line #'helm-regexp-get-line
+    :persistent-action #'helm-regexp-persistent-action
+    :persistent-help "Show this line"
+    :multiline t
+    :matchplugin nil
+    :requires-pattern 2
+    :mode-line "Press TAB to select action."
+    :action '(("Kill Regexp as sexp" . helm-kill-regexp-as-sexp)
+              ("Query Replace Regexp (C-u Not inside word.)"
+               . helm-query-replace-regexp)
+              ("Kill Regexp" . helm-kill-regexp))))
+
+(defun helm-regexp-get-line (s e)
+  (let ((matches (match-data))
+        (line    (buffer-substring s e)))
+    (propertize
+     (cl-loop with ln = (format "%5d: %s" (1- (line-number-at-pos s)) line)
+           for i from 0 to (1- (/ (length matches) 2))
+           concat (format "\n         %s'%s'" (format "Group %d: " i)
+                          (match-string i))
+           into ln1
+           finally return (concat ln ln1))
+     'helm-realvalue s)))
+
+(defun helm-regexp-persistent-action (pt)
+  (helm-goto-char pt)
+  (helm-highlight-current-line))
+
+(defun helm-regexp-kill-new (input)
+  (kill-new input)
+  (message "Killed: %s" input))
+
+
+;;; Occur
+;;
+;;
+(defvar helm-source-occur nil)
+(defun helm-occur-init-source ()
+  (unless helm-source-occur
+    (setq helm-source-occur
+          (helm-make-source "Occur" 'helm-source-multi-occur))))
+
+
+;;; Multi occur
+;;
+;;
+
+;; Internal
+(defvar helm-multi-occur-buffer-list nil)
+(defvar helm-multi-occur-buffer-tick nil)
+(defun helm-moccur-init ()
+  "Create the initial helm multi occur buffer."
+  (helm-init-candidates-in-buffer
+      'global
+    (cl-loop with buffers = (helm-attr 'moccur-buffers)
+             for buf in buffers
+             for bufstr = (with-current-buffer buf (buffer-string))
+             do (add-text-properties
+                 0 (length bufstr)
+                 `(buffer-name ,(buffer-name (get-buffer buf)))
+                 bufstr)
+             concat bufstr)))
+
+(defun helm-moccur--next-or-previous-char ()
+  (save-excursion
+    (or (re-search-forward "^." nil t)
+        (re-search-backward "^." nil t))))
+
+(defun helm-moccur-get-line (beg end)
+  "Format line for `helm-source-moccur'."
+  (prog1
+      (format "%s:%d:%s"
+              (get-text-property (if (= beg end)
+                                     (helm-moccur--next-or-previous-char)
+                                     beg)
+                                 'buffer-name)
+              (save-restriction
+                (narrow-to-region (or (previous-single-property-change
+                                       (point) 'buffer-name) 1)
+                                  (or (next-single-property-change
+                                       (if (= beg end)
+                                           (helm-moccur--next-or-previous-char)
+                                           (point))
+                                       'buffer-name)
+                                      (point-max)))
+                (line-number-at-pos beg))
+              ;; When matching empty line, use empty string
+              ;; to allow saving and modifying with wgrep.
+              (if (= beg end) "" (buffer-substring beg end)))
+    ;; When matching empty line, forward char ("\n")
+    ;; to not be blocked forever here.
+    (when (= beg end) (forward-char 1))))
+
+(cl-defun helm-moccur-action (candidate
+                              &optional (method (quote buffer)) mark)
+  "Jump to CANDIDATE with METHOD.
+arg METHOD can be one of buffer, buffer-other-window, buffer-other-frame."
+  (require 'helm-grep)
+  (let* ((split (helm-grep-split-line candidate))
+         (buf (car split))
+         (lineno (string-to-number (nth 1 split)))
+         (split-pat (helm-mm-split-pattern helm-input)))
+    (cl-case method
+      (buffer              (switch-to-buffer buf))
+      (buffer-other-window (switch-to-buffer-other-window buf))
+      (buffer-other-frame  (switch-to-buffer-other-frame buf)))
+    (helm-goto-line lineno)
+    ;; Move point to the nearest matching regexp from bol.
+    (cl-loop for reg in split-pat
+          when (save-excursion
+                 (condition-case _err
+                     (if helm-migemo-mode
+                         (helm-mm-migemo-forward reg (point-at-eol) t)
+                       (re-search-forward reg (point-at-eol) t))
+                   (invalid-regexp nil)))
+          collect (match-beginning 0) into pos-ls
+          finally (when pos-ls (goto-char (apply #'min pos-ls))))
+    (when mark
+      (set-marker (mark-marker) (point))
+      (push-mark (point) 'nomsg))))
+
+(defun helm-moccur-persistent-action (candidate)
+  (helm-moccur-goto-line candidate)
+  (helm-highlight-current-line))
+
+(defun helm-moccur-goto-line (candidate)
+  "From multi occur, switch to buffer and go to nth 1 CANDIDATE line."
+  (helm-moccur-action
+   candidate 'buffer (or current-prefix-arg         ; persistent.
+                         helm-current-prefix-arg))) ; exit.
+
+(defun helm-moccur-goto-line-ow (candidate)
+  "Go to CANDIDATE line in other window.
+Same as `helm-moccur-goto-line' but go in other window."
+  (helm-moccur-action
+   candidate 'buffer-other-window
+   (or current-prefix-arg         ; persistent.
+       helm-current-prefix-arg))) ; exit.
+
+(defun helm-moccur-goto-line-of (candidate)
+  "Go to CANDIDATE line in new frame.
+Same as `helm-moccur-goto-line' but go in new frame."
+  (helm-moccur-action
+   candidate 'buffer-other-frame
+   (or current-prefix-arg         ; persistent.
+       helm-current-prefix-arg))) ; exit.
+
+(defun helm-moccur-run-goto-line-ow ()
+  "Run goto line other window action from `helm-source-moccur'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-moccur-goto-line-ow)))
+(put 'helm-moccur-run-goto-line-ow 'helm-only t)
+
+(defun helm-moccur-run-goto-line-of ()
+  "Run goto line new frame action from `helm-source-moccur'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-moccur-goto-line-of)))
+(put 'helm-moccur-run-goto-line-of 'helm-only t)
+
+(defun helm-moccur-run-default-action ()
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-moccur-goto-line)))
+(put 'helm-moccur-run-default-action 'helm-only t)
+
+(defvar helm-source-moccur nil)
+(defclass helm-source-multi-occur (helm-source-in-buffer)
+  ((init :initform (lambda ()
+                     (require 'helm-grep)
+                     (helm-moccur-init)))
+   (filter-one-by-one :initform 'helm-moccur-filter-one-by-one)
+   (get-line :initform helm-moccur-get-line)
+   (nohighlight :initform t)
+   (nomark :initform t)
+   (migemo :initform t)
+   (action :initform 'helm-source-multi-occur-actions)
+   (persistent-action :initform 'helm-moccur-persistent-action)
+   (persistent-help :initform "Go to line")
+   (resume :initform 'helm-moccur-resume-fn)
+   (candidate-number-limit :initform 9999)
+   (help-message :initform 'helm-moccur-help-message)
+   (keymap :initform helm-moccur-map)
+   (history :initform 'helm-occur-history)
+   (requires-pattern :initform 2)))
+
+(defun helm-moccur-resume-fn ()
+  (with-helm-buffer
+    (let (new-tick-ls buffer-is-modified)
+      (set (make-local-variable 'helm-multi-occur-buffer-list)
+           (cl-loop for b in helm-multi-occur-buffer-list
+                    when (buffer-live-p (get-buffer b))
+                    collect b))
+      (setq buffer-is-modified (/= (length helm-multi-occur-buffer-list)
+                                   (length (helm-attr 'moccur-buffers))))
+      (helm-attrset 'moccur-buffers helm-multi-occur-buffer-list)
+      (setq new-tick-ls (cl-loop for b in helm-multi-occur-buffer-list
+                                 collect (buffer-chars-modified-tick (get-buffer b))))
+      (when buffer-is-modified
+        (setq helm-multi-occur-buffer-tick new-tick-ls))
+      (cl-assert (> (length helm-multi-occur-buffer-list) 0) nil
+                 "helm-resume error: helm-(m)occur buffer list is empty")
+      (unless (eq helm-moccur-auto-update-on-resume 'never)
+        (when (or buffer-is-modified
+                  (cl-loop for b in helm-multi-occur-buffer-list
+                           for new-tick = (buffer-chars-modified-tick (get-buffer b))
+                           for tick in helm-multi-occur-buffer-tick
+                           thereis (/= tick new-tick)))
+          (helm-aif helm-moccur-auto-update-on-resume
+              (when (or (eq it 'noask)
+                        (y-or-n-p "Helm (m)occur Buffer outdated, update? "))
+                (run-with-idle-timer 0.1 nil (lambda ()
+                                               (with-helm-buffer
+                                                 (helm-force-update)
+                                                 (message "Helm (m)occur Buffer have been udated")
+                                                 (sit-for 1) (message nil))))
+                (unless buffer-is-modified (setq helm-multi-occur-buffer-tick new-tick-ls)))
+            (run-with-idle-timer 0.1 nil (lambda ()
+                                           (with-helm-buffer
+                                             (let ((ov (make-overlay (save-excursion
+                                                                       (goto-char (point-min))
+                                                                       (forward-line 1)
+                                                                       (point))
+                                                                     (point-max))))
+                                               (overlay-put ov 'face 'helm-resume-need-update)
+                                               (sit-for 0.3) (delete-overlay ov)
+                                               (message "[Helm occur Buffer outdated (C-c C-u to update)]")))))
+            (unless buffer-is-modified
+              (with-helm-after-update-hook
+                (setq helm-multi-occur-buffer-tick new-tick-ls)
+                (message "Helm (m)occur Buffer have been udated")))))))))
+
+(defun helm-moccur-filter-one-by-one (candidate)
+  "`filter-one-by-one' function for `helm-source-moccur'."
+  (require 'helm-grep)
+  (let* ((split  (helm-grep-split-line candidate))
+         (buf    (car split))
+         (lineno (nth 1 split))
+         (str    (nth 2 split)))
+    (cons (concat (propertize
+                   buf
+                   'face 'helm-moccur-buffer
+                   'help-echo (buffer-file-name
+                               (get-buffer buf))
+                   'buffer-name buf)
+                  ":"
+                  (propertize lineno 'face 'helm-grep-lineno)
+                  ":"
+                  (helm-grep-highlight-match str t))
+          candidate)))
+
+(defun helm-multi-occur-1 (buffers &optional input)
+  "Main function to call `helm-source-moccur' with BUFFERS list."
+  (let ((bufs (if helm-moccur-always-search-in-current
+                  (cons
+                   ;; will become helm-current-buffer later.
+                   (buffer-name (current-buffer))
+                   (remove helm-current-buffer buffers))
+                  buffers)))
+    (unless helm-source-moccur
+      (setq helm-source-moccur
+            (helm-make-source "Moccur" 'helm-source-multi-occur)))
+    (helm-attrset 'moccur-buffers bufs helm-source-moccur)
+    (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
+    (helm-set-local-variable
+     'helm-multi-occur-buffer-tick
+     (cl-loop for b in bufs
+              collect (buffer-chars-modified-tick (get-buffer b)))))
+  (helm :sources 'helm-source-moccur
+        :buffer "*helm multi occur*"
+        :history 'helm-occur-history
+        :keymap helm-moccur-map
+        :input input
+        :truncate-lines helm-moccur-truncate-lines))
+
+(defun helm-moccur-run-save-buffer ()
+  "Run moccur save results action from `helm-moccur'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action 'helm-moccur-save-results)))
+(put 'helm-moccur-run-save-buffer 'helm-only t)
+
+
+;;; helm-moccur-mode
+;;
+;;
+(defvar helm-moccur-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "RET")      'helm-moccur-mode-goto-line)
+    (define-key map (kbd "C-o")      'helm-moccur-mode-goto-line-ow)
+    (define-key map (kbd "<C-down>") 'helm-moccur-mode-goto-line-ow-forward)
+    (define-key map (kbd "<C-up>")   'helm-moccur-mode-goto-line-ow-backward)
+    (define-key map (kbd "<M-down>") 'helm-gm-next-file)
+    (define-key map (kbd "<M-up>")   'helm-gm-precedent-file)
+    (define-key map (kbd "M-n")      'helm-moccur-mode-goto-line-ow-forward)
+    (define-key map (kbd "M-p")      'helm-moccur-mode-goto-line-ow-backward)
+    (define-key map (kbd "M-N")      'helm-gm-next-file)
+    (define-key map (kbd "M-P")      'helm-gm-precedent-file)
+    map))
+
+(defun helm-moccur-mode-goto-line ()
+  (interactive)
+  (helm-aif (get-text-property (point) 'helm-realvalue)
+    (helm-moccur-goto-line it)))
+
+(defun helm-moccur-mode-goto-line-ow ()
+  (interactive)
+  (helm-aif (get-text-property (point) 'helm-realvalue)
+    (helm-moccur-goto-line-ow it)))
+
+(defun helm-moccur-mode-goto-line-ow-forward-1 (arg)
+  (condition-case nil
+      (progn
+        (save-selected-window
+          (helm-moccur-mode-goto-line-ow)
+          (recenter))
+        (forward-line arg))
+    (error nil)))
+
+(defun helm-moccur-mode-goto-line-ow-forward ()
+  (interactive)
+  (helm-moccur-mode-goto-line-ow-forward-1 1))
+
+(defun helm-moccur-mode-goto-line-ow-backward ()
+  (interactive)
+  (helm-moccur-mode-goto-line-ow-forward-1 -1))
+
+(defun helm-moccur-save-results (_candidate)
+  "Save helm moccur results in a `helm-moccur-mode' buffer."
+  (let ((buf "*hmoccur*")
+        new-buf)
+    (when (get-buffer buf)
+      (setq new-buf (helm-read-string "OccurBufferName: " buf))
+      (cl-loop for b in (helm-buffer-list)
+            when (and (string= new-buf b)
+                      (not (y-or-n-p
+                            (format "Buffer `%s' already exists overwrite? "
+                                    new-buf))))
+            do (setq new-buf (helm-read-string "OccurBufferName: " "*hmoccur ")))
+      (setq buf new-buf))
+    (with-current-buffer (get-buffer-create buf)
+      (setq buffer-read-only t)
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (insert "-*- mode: helm-moccur -*-\n\n"
+                (format "Moccur Results for `%s':\n\n" helm-input))
+        (save-excursion
+          (insert (with-current-buffer helm-buffer
+                    (goto-char (point-min)) (forward-line 1)
+                    (buffer-substring (point) (point-max))))))
+      (helm-moccur-mode) (pop-to-buffer buf))
+    (message "Helm Moccur Results saved in `%s' buffer" buf)))
+
+;;;###autoload
+(define-derived-mode helm-moccur-mode
+    special-mode "helm-moccur"
+    "Major mode to provide actions in helm moccur saved buffer.
+
+Special commands:
+\\{helm-moccur-mode-map}"
+    (set (make-local-variable 'helm-multi-occur-buffer-list)
+         (with-helm-buffer helm-multi-occur-buffer-list))
+    (set (make-local-variable 'revert-buffer-function)
+         #'helm-moccur-mode--revert-buffer-function))
+
+(defun helm-moccur-mode--revert-buffer-function (&optional _ignore-auto _noconfirm)
+  (goto-char (point-min))
+  (let (pattern)
+    (when (re-search-forward "^Moccur Results for `\\(.*\\)'" nil t)
+      (setq pattern (match-string 1))
+      (forward-line 0)
+      (when (re-search-forward "^$" nil t)
+        (forward-line 1))
+      (let ((inhibit-read-only t)
+            (buffer (current-buffer))
+            (buflst helm-multi-occur-buffer-list))
+        (delete-region (point) (point-max))
+        (message "Reverting buffer...")
+        (save-excursion
+          (with-temp-buffer
+            (insert
+             "\n"
+             (cl-loop for buf in buflst
+                      for bufstr = (or (and (buffer-live-p (get-buffer buf))
+                                            (with-current-buffer buf
+                                              (buffer-string)))
+                                       "")
+                      unless (string= bufstr "")
+                      do (add-text-properties
+                          0 (length bufstr)
+                          `(buffer-name ,(buffer-name (get-buffer buf)))
+                          bufstr)
+                      concat bufstr)
+             "\n")
+            (goto-char (point-min))
+            (cl-loop while (re-search-forward pattern nil t)
+                     for line = (helm-moccur-get-line (point-at-bol) (point-at-eol))
+                     when line
+                     do (with-current-buffer buffer
+                          (insert
+                           (propertize
+                            (car (helm-moccur-filter-one-by-one line))
+                            'helm-realvalue line)
+                           "\n")))))
+        (message "Reverting buffer done")))))
+
+
+;;; Predefined commands
+;;
+;;
+
+;;;###autoload
+(defun helm-regexp ()
+  "Preconfigured helm to build regexps.
+`query-replace-regexp' can be run from there against found regexp."
+  (interactive)
+  (save-restriction
+    (when (and (helm-region-active-p)
+               ;; Don't narrow to region if buffer is already narrowed.
+               (not (helm-current-buffer-narrowed-p (current-buffer))))
+      (narrow-to-region (region-beginning) (region-end)))
+    (helm :sources helm-source-regexp
+          :buffer "*helm regexp*"
+          :prompt "Regexp: "
+          :history 'helm-build-regexp-history)))
+
+;;;###autoload
+(defun helm-occur ()
+  "Preconfigured helm for Occur."
+  (interactive)
+  (helm-occur-init-source)
+  (let ((bufs (list (buffer-name (current-buffer)))))
+    (helm-attrset 'moccur-buffers bufs helm-source-occur)
+    (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
+    (helm-set-local-variable
+     'helm-multi-occur-buffer-tick
+     (cl-loop for b in bufs
+              collect (buffer-chars-modified-tick (get-buffer b)))))
+  (helm :sources 'helm-source-occur
+        :buffer "*helm occur*"
+        :history 'helm-occur-history
+        :preselect (and (memq 'helm-source-occur helm-sources-using-default-as-input)
+                        (format "%s:%d:" (regexp-quote (buffer-name))
+                                (line-number-at-pos (point))))
+        :truncate-lines helm-moccur-truncate-lines))
+
+;;;###autoload
+(defun helm-occur-from-isearch ()
+  "Invoke `helm-occur' from isearch."
+  (interactive)
+  (let ((input (if isearch-regexp
+                   isearch-string
+                 (regexp-quote isearch-string)))
+        (bufs (list (buffer-name (current-buffer)))))
+    (isearch-exit)
+    (helm-occur-init-source)
+    (helm-attrset 'moccur-buffers bufs helm-source-occur)
+    (helm-set-local-variable 'helm-multi-occur-buffer-list bufs)
+    (helm-set-local-variable
+     'helm-multi-occur-buffer-tick
+     (cl-loop for b in bufs
+              collect (buffer-chars-modified-tick (get-buffer b))))
+    (helm :sources 'helm-source-occur
+          :buffer "*helm occur*"
+          :history 'helm-occur-history
+          :input input
+          :truncate-lines helm-moccur-truncate-lines)))
+
+;;;###autoload
+(defun helm-multi-occur-from-isearch (&optional _arg)
+  "Invoke `helm-multi-occur' from isearch.
+
+With a prefix arg, reverse the behavior of
+`helm-moccur-always-search-in-current'.
+The prefix arg can be set before calling
+`helm-multi-occur-from-isearch' or during the buffer selection."
+  (interactive "p")
+  (let (buf-list
+        helm-moccur-always-search-in-current
+        (input (if isearch-regexp
+                   isearch-string
+                 (regexp-quote isearch-string))))
+    (isearch-exit)
+    (setq buf-list (helm-comp-read "Buffers: "
+                                   (helm-buffer-list)
+                                   :name "Occur in buffer(s)"
+                                   :marked-candidates t))
+    (setq helm-moccur-always-search-in-current
+          (if (or current-prefix-arg
+                  helm-current-prefix-arg)
+              (not helm-moccur-always-search-in-current)
+            helm-moccur-always-search-in-current))
+    (helm-multi-occur-1 buf-list input)))
+
+
+(provide 'helm-regexp)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-regexp.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-ring.el b/emacs.d/elpa/helm-20160115.2200/helm-ring.el
new file mode 100644
index 0000000..04df6ae
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-ring.el
@@ -0,0 +1,470 @@
+;;; helm-ring.el --- kill-ring, mark-ring, and register browsers for helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-utils)
+(require 'helm-help)
+(require 'helm-elisp)
+
+(declare-function undo-tree-restore-state-from-register "ext:undo-tree.el" (register))
+
+
+(defgroup helm-ring nil
+  "Ring related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-kill-ring-threshold 3
+  "Minimum length of a candidate to be listed by `helm-source-kill-ring'."
+  :type 'integer
+  :group 'helm-ring)
+
+(defcustom helm-kill-ring-max-lines-number 5
+  "Max number of lines displayed per candidate in kill-ring browser.
+If nil or zero (disabled), don't truncate candidate, show all."
+  :type '(choice (const :tag "Disabled" nil)
+          (integer :tag "Max number of lines"))
+  :group 'helm-ring)
+
+(defcustom helm-register-max-offset 160
+  "Max size of string register entries before truncating."
+  :group 'helm-ring
+  :type  'integer)
+
+(defcustom helm-kill-ring-actions
+  '(("Yank" . helm-kill-ring-action)
+    ("Delete" . (lambda (_candidate)
+                  (cl-loop for cand in (helm-marked-candidates)
+                           do (setq kill-ring
+                                    (delete cand kill-ring))))))
+  "List of actions for kill ring source."
+  :group 'helm-ring
+  :type '(alist :key-type string :value-type function))
+
+
+;;; Kill ring
+;;
+;;
+(defvar helm-kill-ring-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-y") 'helm-next-line)
+    (define-key map (kbd "M-u") 'helm-previous-line)
+    map)
+  "Keymap for `helm-show-kill-ring'.")
+
+(defvar helm-source-kill-ring
+  (helm-build-sync-source "Kill Ring"
+    :init (lambda () (helm-attrset 'last-command last-command))
+    :candidates #'helm-kill-ring-candidates
+    :filtered-candidate-transformer #'helm-kill-ring-transformer
+    :action 'helm-kill-ring-actions
+    :persistent-action (lambda (_candidate) (ignore))
+    :persistent-help "DoNothing"
+    :keymap helm-kill-ring-map
+    :migemo t
+    :multiline t)
+  "Source for browse and insert contents of kill-ring.")
+
+(defun helm-kill-ring-candidates ()
+  (cl-loop for kill in (helm-fast-remove-dups kill-ring :test 'equal)
+        unless (or (< (length kill) helm-kill-ring-threshold)
+                   (string-match "\\`[\n[:blank:]]+\\'" kill))
+        collect kill))
+
+(defun helm-kill-ring-transformer (candidates _source)
+  "Display only the `helm-kill-ring-max-lines-number' lines of candidate."
+  (cl-loop for i in candidates
+           when (get-text-property 0 'read-only i)
+           do (set-text-properties 0 (length i) '(read-only nil) i)
+           for nlines = (with-temp-buffer (insert i) (count-lines (point-min) (point-max)))
+           if (and helm-kill-ring-max-lines-number
+                   (> nlines helm-kill-ring-max-lines-number))
+           collect (cons
+                    (with-temp-buffer
+                      (insert i)
+                      (goto-char (point-min))
+                      (concat
+                       (buffer-substring
+                        (point-min)
+                        (save-excursion
+                          (forward-line helm-kill-ring-max-lines-number)
+                          (point)))
+                       "[...]")) i)
+           else collect i))
+
+(defun helm-kill-ring-action (str)
+  "Insert STR in `kill-ring' and set STR to the head.
+If this action is executed just after `yank',
+replace with STR as yanked string."
+  (with-helm-current-buffer
+    (setq kill-ring (delete str kill-ring))
+    (if (not (eq (helm-attr 'last-command helm-source-kill-ring) 'yank))
+        (insert-for-yank str)
+      ;; from `yank-pop'
+      (let ((inhibit-read-only t)
+            (before (< (point) (mark t))))
+        (if before
+            (funcall (or yank-undo-function 'delete-region) (point) (mark t))
+          (funcall (or yank-undo-function 'delete-region) (mark t) (point)))
+        (setq yank-undo-function nil)
+        (set-marker (mark-marker) (point) helm-current-buffer)
+        (insert-for-yank str)
+        ;; Set the window start back where it was in the yank command,
+        ;; if possible.
+        (set-window-start (selected-window) yank-window-start t)
+        (when before
+          ;; This is like exchange-point-and-mark, but doesn't activate the mark.
+          ;; It is cleaner to avoid activation, even though the command
+          ;; loop would deactivate the mark because we inserted text.
+          (goto-char (prog1 (mark t)
+                       (set-marker (mark-marker) (point) helm-current-buffer))))))
+    (kill-new str)))
+
+
+;;;; <Mark ring>
+;; DO NOT use these sources with other sources use
+;; the commands `helm-mark-ring', `helm-global-mark-ring' or
+;; `helm-all-mark-rings' instead.
+
+(defun helm-mark-ring-line-string-at-pos (pos)
+  "Return line string at position POS."
+  (save-excursion
+    (goto-char pos)
+    (forward-line 0)
+    (let ((line (car (split-string (thing-at-point 'line) "[\n\r]"))))
+      (if (string= "" line)
+          "<EMPTY LINE>"
+        line))))
+
+(defun helm-mark-ring-get-candidates ()
+  (with-helm-current-buffer
+    (cl-loop with marks = (if (mark t) (cons (mark-marker) mark-ring) mark-ring)
+             for i in marks
+             with max-line-number = (line-number-at-pos (point-max))
+             with width = (length (number-to-string max-line-number))
+             for m = (format (concat "%" (number-to-string width) "d: %s")
+                             (line-number-at-pos i)
+                             (helm-mark-ring-line-string-at-pos i))
+             unless (and recip (member m recip))
+             collect m into recip
+             finally return recip)))
+
+(defvar helm-source-mark-ring
+  (helm-build-sync-source "mark-ring"
+    :candidates #'helm-mark-ring-get-candidates
+    :action '(("Goto line"
+               . (lambda (candidate)
+                   (helm-goto-line (string-to-number candidate))))) 
+    :persistent-action (lambda (candidate)
+                         (helm-goto-line (string-to-number candidate))
+                         (helm-highlight-current-line))
+    :persistent-help "Show this line"))
+
+;;; Global-mark-ring
+(defvar helm-source-global-mark-ring
+  (helm-build-sync-source "global-mark-ring"
+    :candidates #'helm-global-mark-ring-get-candidates
+    :action '(("Goto line"
+              . (lambda (candidate)
+                  (let ((items (split-string candidate ":")))
+                    (switch-to-buffer (cl-second items))
+                    (helm-goto-line (string-to-number (car items)))))))
+    :persistent-action (lambda (candidate)
+                         (let ((items (split-string candidate ":")))
+                           (switch-to-buffer (cl-second items))
+                           (helm-goto-line (string-to-number (car items)))
+                           (helm-highlight-current-line)))
+    :persistent-help "Show this line"))
+
+(defun helm-global-mark-ring-format-buffer (marker)
+  (with-current-buffer (marker-buffer marker)
+    (goto-char marker)
+    (forward-line 0)
+    (let ((line (pcase (thing-at-point 'line)
+                  ((and line (pred stringp)
+                        (guard (not (string-match-p "\\`\n?\\'" line))))
+                   (car (split-string line "[\n\r]")))
+                  (_ "<EMPTY LINE>"))))
+      (format "%7d:%s:    %s"
+              (line-number-at-pos) (marker-buffer marker) line))))
+
+(defun helm-global-mark-ring-get-candidates ()
+  (let ((marks global-mark-ring))
+    (when marks
+      (cl-loop for i in marks
+               for mb = (marker-buffer i)
+               for gm = (unless (or (string-match "^ " (format "%s" mb))
+                                    (null mb))
+                          (helm-global-mark-ring-format-buffer i))
+               when (and gm (not (member gm recip)))
+               collect gm into recip
+               finally return recip))))
+
+(defun helm--push-mark (&optional location nomsg activate)
+  "[Internal] Don't use directly, use instead `helm-push-mark-mode'."
+  (unless (null (mark t))
+    (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
+    (when (> (length mark-ring) mark-ring-max)
+      (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
+      (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil)))
+  (set-marker (mark-marker) (or location (point)) (current-buffer))
+  ;; Now push the mark on the global mark ring.
+  (setq global-mark-ring (cons (copy-marker (mark-marker))
+                               ;; Avoid having multiple entries
+                               ;; for same buffer in `global-mark-ring'.
+                               (cl-loop with mb = (current-buffer)
+                                        for m in global-mark-ring
+                                        for nmb = (marker-buffer m)
+                                        unless (eq mb nmb)
+                                        collect m)))
+  (when (> (length global-mark-ring) global-mark-ring-max)
+    (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) nil)
+    (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil))
+  (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
+      (message "Mark set"))
+  (when (or activate (not transient-mark-mode))
+    (set-mark (mark t)))
+  nil)
+
+(defadvice push-mark (around helm-push-mark-mode)
+  (helm--push-mark location nomsg activate))
+
+;;;###autoload
+(define-minor-mode helm-push-mark-mode
+    "Provide an improved version of `push-mark'.
+Modify the behavior of `push-mark' to update
+the `global-mark-ring' after each new visit."
+  :group 'helm-ring
+  :global t
+  (if helm-push-mark-mode
+      (if (fboundp 'advice-add)
+          (advice-add 'push-mark :override #'helm--push-mark)
+          (ad-activate 'push-mark))
+      (if (fboundp 'advice-remove)
+          (advice-remove 'push-mark #'helm--push-mark)
+          (ad-deactivate 'push-mark))))
+
+;;;; <Register>
+;;; Insert from register
+(defvar helm-source-register
+  (helm-build-sync-source "Registers"
+    :candidates #'helm-register-candidates
+    :action-transformer #'helm-register-action-transformer
+    :persistent-help ""
+    :multiline t
+    :action '(("Delete Register(s)" .
+               (lambda (_candidate)
+                 (cl-loop for candidate in (helm-marked-candidates)
+                          for register = (car candidate)
+                          do (setq register-alist
+                                (delq (assoc register register-alist)
+                                      register-alist)))))))
+  "See (info \"(emacs)Registers\")")
+
+(defun helm-register-candidates ()
+  "Collecting register contents and appropriate commands."
+  (cl-loop for (char . val) in register-alist
+        for key    = (single-key-description char)
+        for string-actions =
+        (cond
+          ((numberp val)
+           (list (int-to-string val)
+                 'insert-register
+                 'increment-register))
+          ((markerp val)
+           (let ((buf (marker-buffer val)))
+             (if (null buf)
+                 (list "a marker in no buffer")
+               (list (concat
+                      "a buffer position:"
+                      (buffer-name buf)
+                      ", position "
+                      (int-to-string (marker-position val)))
+                     'jump-to-register
+                     'insert-register))))
+          ((and (consp val) (window-configuration-p (car val)))
+           (list "window configuration."
+                 'jump-to-register))
+          ((and (vectorp val)
+                (fboundp 'undo-tree-register-data-p)
+                (undo-tree-register-data-p (elt val 1)))
+           (list
+            "Undo-tree entry."
+            'undo-tree-restore-state-from-register))
+          ((or (and (vectorp val) (eq 'registerv (aref val 0)))
+               (and (consp val) (frame-configuration-p (car val))))
+           (list "frame configuration."
+                 'jump-to-register))
+          ((and (consp val) (eq (car val) 'file))
+           (list (concat "file:"
+                         (prin1-to-string (cdr val))
+                         ".")
+                 'jump-to-register))
+          ((and (consp val) (eq (car val) 'file-query))
+           (list (concat "file:a file-query reference: file "
+                         (car (cdr val))
+                         ", position "
+                         (int-to-string (car (cdr (cdr val))))
+                         ".")
+                 'jump-to-register))
+          ((consp val)
+           (let ((lines (format "%4d" (length val))))
+             (list (format "%s: %s\n" lines
+                           (truncate-string-to-width
+                            (mapconcat 'identity (list (car val))
+                                       "^J") (- (window-width) 15)))
+                   'insert-register)))
+          ((stringp val)
+           (list
+            ;; without properties
+            (concat (substring-no-properties
+                     val 0 (min (length val) helm-register-max-offset))
+                    (if (> (length val) helm-register-max-offset)
+                        "[...]" ""))
+            'insert-register
+            'append-to-register
+            'prepend-to-register)))
+        unless (null string-actions) ; Fix Issue #1107.
+        collect (cons (format "Register %3s:\n %s" key (car string-actions))
+                      (cons char (cdr string-actions)))))
+
+(defun helm-register-action-transformer (actions register-and-functions)
+  "Decide actions by the contents of register."
+  (cl-loop with transformer-actions = nil
+           with func-actions =
+        '((insert-register
+           "Insert Register" .
+           (lambda (c) (insert-register (car c))))
+          (jump-to-register
+           "Jump to Register" .
+           (lambda (c) (jump-to-register (car c))))
+          (append-to-register
+           "Append Region to Register" .
+           (lambda (c) (append-to-register
+                        (car c) (region-beginning) (region-end))))
+          (prepend-to-register
+           "Prepend Region to Register" .
+           (lambda (c) (prepend-to-register
+                        (car c) (region-beginning) (region-end))))
+          (increment-register
+           "Increment Prefix Arg to Register" .
+           (lambda (c) (increment-register
+                        helm-current-prefix-arg (car c))))
+          (undo-tree-restore-state-from-register
+           "Restore Undo-tree register"
+           (lambda (c) (and (fboundp 'undo-tree-restore-state-from-register)
+                            (undo-tree-restore-state-from-register (car c))))))
+        for func in (cdr register-and-functions)
+        for cell = (assq func func-actions)
+        when cell
+        do (push (cdr cell) transformer-actions)
+        finally return (append (nreverse transformer-actions) actions)))
+
+;;;###autoload
+(defun helm-mark-ring ()
+  "Preconfigured `helm' for `helm-source-mark-ring'."
+  (interactive)
+  (helm :sources 'helm-source-mark-ring
+        :resume 'noresume
+        :buffer "*helm mark*"))
+
+;;;###autoload
+(defun helm-global-mark-ring ()
+  "Preconfigured `helm' for `helm-source-global-mark-ring'."
+  (interactive)
+  (helm :sources 'helm-source-global-mark-ring
+        :resume 'noresume
+        :buffer "*helm global mark*"))
+
+;;;###autoload
+(defun helm-all-mark-rings ()
+  "Preconfigured `helm' for `helm-source-global-mark-ring' and \
+`helm-source-mark-ring'."
+  (interactive)
+  (helm :sources '(helm-source-mark-ring
+                   helm-source-global-mark-ring)
+        :resume 'noresume
+        :buffer "*helm mark ring*"))
+
+;;;###autoload
+(defun helm-register ()
+  "Preconfigured `helm' for Emacs registers."
+  (interactive)
+  (helm :sources 'helm-source-register
+        :resume 'noresume
+        :buffer "*helm register*"))
+
+;;;###autoload
+(defun helm-show-kill-ring ()
+  "Preconfigured `helm' for `kill-ring'.
+It is drop-in replacement of `yank-pop'.
+
+First call open the kill-ring browser, next calls move to next line."
+  (interactive)
+  (let ((enable-recursive-minibuffers t))
+    (helm :sources helm-source-kill-ring
+          :buffer "*helm kill ring*"
+          :resume 'noresume
+          :allow-nest t)))
+
+;;;###autoload
+(defun helm-execute-kmacro ()
+  "Preconfigured helm for keyboard macros.
+Define your macros with `f3' and `f4'.
+See (info \"(emacs) Keyboard Macros\") for detailed infos.
+This command is useful when used with persistent action."
+  (interactive)
+  (helm :sources
+        (helm-build-sync-source "Kmacro"
+          :candidates (lambda ()
+                        (helm-fast-remove-dups
+                         (cons (kmacro-ring-head)
+                               kmacro-ring)
+                         :test 'equal))
+          :multiline t
+          :candidate-transformer
+          (lambda (candidates)
+            (cl-loop for c in candidates collect
+                     (propertize (help-key-description (car c) nil)
+                                 'helm-realvalue c)))
+          :persistent-help "Execute kmacro"
+          :help-message 'helm-kmacro-help-message
+          :action
+          (helm-make-actions
+           "Execute kmacro (`C-u <n>' to execute <n> times)"
+           (lambda (candidate)
+             (interactive)
+             ;; Move candidate on top of list for next use.
+             (setq kmacro-ring (delete candidate kmacro-ring))
+             (kmacro-push-ring)
+             (kmacro-split-ring-element candidate)
+             (kmacro-exec-ring-item
+              candidate helm-current-prefix-arg))))
+        :buffer "*helm kmacro*"))
+
+(provide 'helm-ring)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-ring.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-semantic.el b/emacs.d/elpa/helm-20160115.2200/helm-semantic.el
new file mode 100644
index 0000000..1380182
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-semantic.el
@@ -0,0 +1,223 @@
+;;; helm-semantic.el --- Helm interface for Semantic -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Daniel Hackney <dan@haxney.org>
+;; Author: Daniel Hackney <dan@haxney.org>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Uses `candidates-in-buffer' for speed.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'semantic)
+(require 'helm-help)
+(require 'helm-imenu)
+
+(declare-function pulse-momentary-highlight-one-line "pulse.el" (point &optional face))
+
+(defgroup helm-semantic nil
+  "Semantic tags related libraries and applications for helm."
+  :group 'helm)
+
+(defcustom helm-semantic-lynx-style-map t
+  "Use Arrow keys to jump to occurences."
+  :group 'helm-semantic
+  :type  'boolean)
+
+(defcustom helm-semantic-display-style
+  '((python-mode . semantic-format-tag-summarize)
+    (c-mode . semantic-format-tag-concise-prototype-c-mode)
+    (emacs-lisp-mode . semantic-format-tag-abbreviate-emacs-lisp-mode))
+  "Function to present a semantic tag according to `major-mode'.
+
+It is an alist where the `car' of each element is a `major-mode' and
+the `cdr' a `semantic-format-tag-*' function.
+
+If no function is found for current `major-mode', fall back to
+`semantic-format-tag-summarize' default function.
+
+You can have more or less informations depending of the `semantic-format-tag-*'
+function you choose.
+
+All the supported functions are prefixed with \"semantic-format-tag-\",
+you have completion on these functions with `C-M i' in the customize interface."
+  :group 'helm-semantic
+  :type '(alist :key-type symbol :value-type symbol))
+
+;;; keymap
+(defvar helm-semantic-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (when helm-semantic-lynx-style-map
+      (define-key map (kbd "<left>")  'helm-maybe-exit-minibuffer)
+      (define-key map (kbd "<right>") 'helm-execute-persistent-action))
+    (delq nil map)))
+
+;; Internals vars
+(defvar helm-semantic--tags-cache nil)
+
+(defun helm-semantic--fetch-candidates (tags depth &optional class)
+  "Write the contents of TAGS to the current buffer."
+  (let ((class class) cur-type
+        (stylefn (or (with-helm-current-buffer
+                       (assoc-default major-mode helm-semantic-display-style))
+                     #'semantic-format-tag-summarize)))
+    (cl-dolist (tag tags)
+      (when (listp tag)
+        (cl-case (setq cur-type (semantic-tag-class tag))
+          ((function variable type)
+           (let ((spaces (make-string (* depth 2) ?\s))
+                 (type-p (eq cur-type 'type)))
+             (unless (and (> depth 0) (not type-p))
+               (setq class nil))
+             (insert
+              (if (and class (not type-p))
+                  (format "%s%s(%s) "
+                          spaces (if (< depth 2) "" "├►") class)
+                spaces)
+              ;; Save the tag for later
+              (propertize (funcall stylefn tag nil t)
+                          'semantic-tag tag)
+              "\n")
+             (and type-p (setq class (car tag)))
+             ;; Recurse to children
+             (unless (eq cur-type 'function)
+               (helm-semantic--fetch-candidates
+                (semantic-tag-components tag) (1+ depth) class))))
+
+          ;; Don't do anything with packages or includes for now
+          ((package include)
+           (insert
+            (propertize (funcall stylefn tag nil t)
+                        'semantic-tag tag)
+            "\n")
+           )
+          ;; Catch-all
+          (t))))))
+
+(defun helm-semantic-default-action (_candidate &optional persistent)
+  ;; By default, helm doesn't pass on the text properties of the selection.
+  ;; Fix this.
+  (helm-log-run-hook 'helm-goto-line-before-hook)
+  (with-current-buffer helm-buffer
+    (when (looking-at " ")
+      (goto-char (next-single-property-change
+                  (point-at-bol) 'semantic-tag nil (point-at-eol)))) 
+    (let ((tag (get-text-property (point) 'semantic-tag)))
+      (semantic-go-to-tag tag)
+      (unless persistent
+        (pulse-momentary-highlight-one-line (point))))))
+
+(defun helm-semantic--maybe-set-needs-update ()
+  (with-helm-current-buffer
+    (when (semantic-parse-tree-needs-update-p)
+      (semantic-parse-tree-set-needs-update))))
+
+(defvar helm-source-semantic nil)
+
+(defclass helm-semantic-source (helm-source-in-buffer)
+  ((init :initform (lambda ()
+                     (helm-semantic--maybe-set-needs-update)
+                     (setq helm-semantic--tags-cache (semantic-fetch-tags))
+                     (with-current-buffer (helm-candidate-buffer 'global)
+                       (let ((major-mode (with-helm-current-buffer major-mode)))
+                         (helm-semantic--fetch-candidates helm-semantic--tags-cache 0)))))
+   (get-line :initform 'buffer-substring)
+   (persistent-help :initform "Show this entry")
+   (keymap :initform 'helm-semantic-map)
+   (help-message :initform 'helm-semantic-help-message)
+   (persistent-action :initform (lambda (elm)
+                                  (helm-semantic-default-action elm t)
+                                  (helm-highlight-current-line)))
+   (action :initform 'helm-semantic-default-action)))
+
+(defcustom helm-semantic-fuzzy-match nil
+  "Enable fuzzy matching in `helm-source-semantic'."
+  :group 'helm-semantic
+  :type  'boolean
+  :set (lambda (var val)
+         (set var val)
+         (setq helm-source-semantic
+               (helm-make-source "Semantic Tags" 'helm-semantic-source
+                 :fuzzy-match helm-semantic-fuzzy-match))))
+
+;;;###autoload
+(defun helm-semantic (arg)
+  "Preconfigured `helm' for `semantic'.
+If ARG is supplied, pre-select symbol at point instead of current"
+  (interactive "P")
+  (let ((tag (helm-aif (semantic-current-tag-parent)
+                  (cons (format "\\_<%s\\_>" (car it))
+                        (format "\\_<%s\\_>" (car (semantic-current-tag))))
+                (format "\\_<%s\\_>" (car (semantic-current-tag))))))
+    (unless helm-source-semantic
+      (setq helm-source-semantic
+            (helm-make-source "Semantic Tags" 'helm-semantic-source
+              :fuzzy-match helm-semantic-fuzzy-match)))
+    (helm :sources 'helm-source-semantic
+          :candidate-number-limit 9999
+          :preselect (if arg
+                         (thing-at-point 'symbol)
+                       tag)
+          :buffer "*helm semantic*")))
+
+;;;###autoload
+(defun helm-semantic-or-imenu (arg)
+  "Preconfigured helm for `semantic' or `imenu'.
+If ARG is supplied, pre-select symbol at point instead of current
+semantic tag in scope.
+
+If `semantic-mode' is active in the current buffer, then use
+semantic for generating tags, otherwise fall back to `imenu'.
+Fill in the symbol at point by default."
+  (interactive "P")
+  (unless helm-source-semantic
+    (setq helm-source-semantic
+          (helm-make-source "Semantic Tags" 'helm-semantic-source
+            :fuzzy-match helm-semantic-fuzzy-match)))
+  (unless helm-source-imenu
+    (setq helm-source-imenu
+          (helm-make-source "Imenu" 'helm-imenu-source
+            :fuzzy-match helm-imenu-fuzzy-match)))
+  (let* ((source (if (semantic-active-p)
+                     'helm-source-semantic
+                     'helm-source-imenu))
+         (imenu-p (eq source 'helm-source-imenu))
+         (imenu-auto-rescan imenu-p)
+         (helm-execute-action-at-once-if-one
+          (and imenu-p
+               helm-imenu-execute-action-at-once-if-one))
+         (tag (helm-aif (semantic-current-tag-parent)
+                  (cons (format "\\_<%s\\_>" (car it))
+                        (format "\\_<%s\\_>" (car (semantic-current-tag))))
+                (format "\\_<%s\\_>" (car (semantic-current-tag))))))
+    (helm :sources source
+          :candidate-number-limit 9999
+          :preselect (if (or arg imenu-p)
+                         (thing-at-point 'symbol)
+                         tag)
+          :buffer "*helm semantic/imenu*")))
+
+(provide 'helm-semantic)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-semantic.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-sys.el b/emacs.d/elpa/helm-20160115.2200/helm-sys.el
new file mode 100644
index 0000000..4c94ff2
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-sys.el
@@ -0,0 +1,300 @@
+;;; helm-sys.el --- System related functions for helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-utils)
+
+
+(defgroup helm-sys nil
+  "System related helm library."
+  :group 'helm)
+
+(defface helm-top-columns
+    '((t :inherit helm-header))
+  "Face for helm help string in minibuffer."
+  :group 'helm-sys)
+
+
+(defun helm-top-command-set-fn (var _value)
+  (set var
+       (cl-case system-type
+         (darwin "env COLUMNS=%s ps -axo pid,user,pri,nice,ucomm,tty,start,vsz,%%cpu,%%mem,etime,command")
+         (t      "env COLUMNS=%s top -b -n 1"))))
+
+(defcustom helm-top-command "env COLUMNS=%s top -b -n 1"
+  "Top command used to display output of top.
+To use top command, a version supporting batch mode (-b option) is needed.
+On Mac OSX top command doesn't support this, so ps command
+is used by default instead.
+If you modify this the number and order of elements displayed
+should be the same as top command to have the sort commands
+working properly, that is 12 elements with the 2 first being
+PID and USER and the last 4 being %CPU, %MEM, TIME and COMMAND.
+A format string where %s will be replaced with `frame-width'."
+  :group 'helm-sys
+  :type 'string
+  :set  'helm-top-command-set-fn)
+
+
+;;; Top (process)
+;;
+;;
+(defvar helm-top-sort-fn nil)
+(defvar helm-top-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-P")   'helm-top-run-sort-by-cpu)
+    (define-key map (kbd "M-C")   'helm-top-run-sort-by-com)
+    (define-key map (kbd "M-M")   'helm-top-run-sort-by-mem)
+    (define-key map (kbd "M-U")   'helm-top-run-sort-by-user)
+    map))
+
+(defvar helm-source-top
+  (helm-build-in-buffer-source "Top"
+    :header-name (lambda (name) (concat name " (Press C-c C-u to refresh)"))
+    :init #'helm-top-init
+    :nomark t
+    :display-to-real #'helm-top-display-to-real
+    :persistent-action #'helm-top-sh-persistent-action
+    :persistent-help "SIGTERM"
+    :help-message 'helm-top-help-message
+    :follow 'never
+    :keymap helm-top-map
+    :filtered-candidate-transformer #'helm-top-sort-transformer
+    :action-transformer #'helm-top-action-transformer))
+
+(defun helm-top-transformer (candidates _source)
+  "Transformer for `helm-top'.
+Return empty string for non--valid candidates."
+  (cl-loop for disp in candidates collect
+        (cond ((string-match "^ *[0-9]+" disp) disp)
+              ((string-match "^ *PID" disp)
+               (cons (propertize disp 'face 'helm-top-columns) ""))
+              (t (cons disp "")))))
+
+(defun helm-top-action-transformer (actions _candidate)
+  "Action transformer for `top'.
+Show actions only on line starting by a PID."
+  (let ((disp (helm-get-selection nil t)))
+    (cond ((string-match "^ *[0-9]+" disp)
+           (list '("kill (SIGTERM)" . (lambda (pid) (helm-top-sh "TERM" pid)))
+                 '("kill (SIGKILL)" . (lambda (pid) (helm-top-sh "KILL" pid)))
+                 '("kill (SIGINT)" .  (lambda (pid) (helm-top-sh "INT" pid)))
+                 '("kill (Choose signal)"
+                   . (lambda (pid)
+                       (helm-top-sh
+                        (helm-comp-read (format "Kill [%s] with signal: " pid)
+                                        '("ALRM" "HUP" "INT" "KILL" "PIPE" "POLL"
+                                          "PROF" "TERM" "USR1" "USR2" "VTALRM"
+                                          "STKFLT" "PWR" "WINCH" "CHLD" "URG"
+                                          "TSTP" "TTIN" "TTOU" "STOP" "CONT"
+                                          "ABRT" "FPE" "ILL" "QUIT" "SEGV"
+                                          "TRAP" "SYS" "EMT" "BUS" "XCPU" "XFSZ")
+                                        :must-match t)
+                        pid)))))
+          (t actions))))
+
+(defun helm-top-sh (sig pid)
+  "Run kill shell command with signal SIG on PID for `helm-top'."
+  (let ((cmd (format "kill -%s %s" sig pid)))
+    (message "Executed %s\n%s" cmd (shell-command-to-string cmd))))
+
+(defun helm-top-sh-persistent-action (pid)
+  (delete-other-windows)
+  (helm-top-sh "TERM" pid)
+  (helm-force-update))
+
+(defun helm-top-init ()
+  "Insert output of top command in candidate buffer."
+  (unless helm-top-sort-fn (helm-top-set-mode-line "CPU"))
+  (with-current-buffer (helm-candidate-buffer 'global)
+    (call-process-shell-command
+     (format helm-top-command (frame-width))
+     nil (current-buffer))))
+
+(defun helm-top-display-to-real (line)
+  "Return pid only from LINE."
+  (car (split-string line)))
+
+;; Sort top command
+
+(defun helm-top-set-mode-line (str)
+  (if (string-match "Sort:\\[\\(.*\\)\\] " helm-top-mode-line)
+      (setq helm-top-mode-line (replace-match str nil nil helm-top-mode-line 1))
+    (setq helm-top-mode-line (concat (format "Sort:[%s] " str) helm-top-mode-line))))
+
+(defun helm-top-sort-transformer (candidates source)
+  (helm-top-transformer
+   (if helm-top-sort-fn
+       (cl-loop for c in candidates
+                if (string-match "^ *[0-9]+" c)
+                collect c into pid-cands
+                else collect c into header-cands
+                finally return (append
+                                header-cands
+                                (sort pid-cands helm-top-sort-fn)))
+       candidates)
+   source))
+
+(defun helm-top-sort-by-com (s1 s2)
+  (let* ((split-1 (split-string s1))
+         (split-2 (split-string s2))
+         (com-1 (nth 11 split-1))
+         (com-2 (nth 11 split-2)))
+    (string< com-1 com-2)))
+
+(defun helm-top-sort-by-mem (s1 s2)
+  (let* ((split-1 (split-string s1))
+         (split-2 (split-string s2))
+         (mem-1 (string-to-number (nth 9 split-1)))
+         (mem-2 (string-to-number (nth 9 split-2))))
+    (> mem-1 mem-2)))
+
+(defun helm-top-sort-by-user (s1 s2)
+  (let* ((split-1 (split-string s1))
+         (split-2 (split-string s2))
+         (user-1 (nth 1 split-1))
+         (user-2 (nth 1 split-2)))
+    (string< user-1 user-2)))
+
+(defun helm-top-run-sort-by-com ()
+  (interactive)
+  (helm-top-set-mode-line "COM")
+  (setq helm-top-sort-fn 'helm-top-sort-by-com)
+  (helm-force-update))
+
+(defun helm-top-run-sort-by-cpu ()
+  (interactive)
+  (helm-top-set-mode-line "CPU")
+  (setq helm-top-sort-fn nil)
+  (helm-force-update))
+
+(defun helm-top-run-sort-by-mem ()
+  (interactive)
+  (helm-top-set-mode-line "MEM")
+  (setq helm-top-sort-fn 'helm-top-sort-by-mem)
+  (helm-force-update))
+
+(defun helm-top-run-sort-by-user ()
+  (interactive)
+  (helm-top-set-mode-line "USER")
+  (setq helm-top-sort-fn 'helm-top-sort-by-user)
+  (helm-force-update))
+
+
+;;; X RandR resolution change
+;;
+;;
+;;; FIXME I do not care multi-display.
+
+(defun helm-xrandr-info ()
+  "Return a pair with current X screen number and current X display name."
+  (with-temp-buffer
+    (call-process "xrandr" nil (current-buffer) nil
+                  "--current")
+    (let (screen output)
+      (goto-char (point-min))
+      (save-excursion
+        (when (re-search-forward "\\(^Screen \\)\\([0-9]\\):" nil t)
+          (setq screen (match-string 2))))
+      (when (re-search-forward "^\\(.*\\) connected" nil t)
+        (setq output (match-string 1)))
+      (list screen output))))
+
+(defun helm-xrandr-screen ()
+  "Return current X screen number."
+  (car (helm-xrandr-info)))
+
+(defun helm-xrandr-output ()
+  "Return current X display name."
+  (cadr (helm-xrandr-info)))
+
+(defvar helm-source-xrandr-change-resolution
+  '((name . "Change Resolution")
+    (candidates
+     . (lambda ()
+         (with-temp-buffer
+           (call-process "xrandr" nil (current-buffer) nil
+                         "--screen" (helm-xrandr-screen) "-q")
+           (goto-char 1)
+           (cl-loop with modes = nil
+                 while (re-search-forward "   \\([0-9]+x[0-9]+\\)" nil t)
+                 for mode = (match-string 1)
+                 unless (member mode modes)
+                 collect mode into modes
+                 finally return modes))))
+    (action
+     ("Change Resolution"
+      . (lambda (mode)
+          (call-process "xrandr" nil nil nil
+                        "--screen" (helm-xrandr-screen)
+                        "--output" (helm-xrandr-output)
+                        "--mode" mode))))))
+
+
+;;; Emacs process
+;;
+;;
+(defvar helm-source-emacs-process
+  '((name . "Emacs Process")
+    (init . (lambda () (list-processes--refresh)))
+    (candidates . (lambda () (mapcar #'process-name (process-list))))
+    (persistent-action . (lambda (elm)
+                           (delete-process (get-process elm))
+                           (helm-delete-current-selection)))
+    (persistent-help . "Kill Process")
+    (action ("Kill Process" . (lambda (elm)
+                                (delete-process (get-process elm)))))))
+
+
+;;;###autoload
+(defun helm-top ()
+  "Preconfigured `helm' for top command."
+  (interactive)
+  (save-window-excursion
+    (unless helm-alive-p (delete-other-windows))
+    (helm :sources 'helm-source-top
+          :buffer "*helm top*" :full-frame t
+          :candidate-number-limit 9999
+          :preselect "^\\s-*[0-9]+")))
+
+;;;###autoload
+(defun helm-list-emacs-process ()
+  "Preconfigured `helm' for emacs process."
+  (interactive)
+  (helm-other-buffer 'helm-source-emacs-process "*helm process*"))
+
+;;;###autoload
+(defun helm-xrandr-set ()
+  "Preconfigured helm for xrandr."
+  (interactive)
+  (helm :sources 'helm-source-xrandr-change-resolution
+        :buffer "*helm xrandr*"))
+
+(provide 'helm-sys)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-sys.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-tags.el b/emacs.d/elpa/helm-20160115.2200/helm-tags.el
new file mode 100644
index 0000000..eb61aed
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-tags.el
@@ -0,0 +1,346 @@
+;;; helm-tags.el --- Helm for Etags. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'helm-utils)
+(require 'helm-grep)
+
+
+(defgroup helm-tags nil
+  "Tags related Applications and libraries for Helm."
+  :group 'helm)
+
+(defcustom helm-etags-tag-file-name "TAGS"
+  "Etags tag file name."
+  :type  'string
+  :group 'helm-tags)
+
+(defcustom helm-etags-tag-file-search-limit 10
+  "The limit level of directory to search tag file.
+Don't search tag file deeply if outside this value."
+  :type  'number
+  :group 'helm-tags)
+
+(defcustom helm-etags-match-part-only 'tag
+  "Allow choosing the tag part of CANDIDATE in `helm-source-etags-select'.
+A tag looks like this:
+    filename: \(defun foo
+You can choose matching against only end part of tag (i.e \"foo\"),
+against only the tag part (i.e \"(defun foo\"),
+or against the whole candidate (i.e \"(filename: (defun foo\")."
+  :type '(choice
+          (const :tag "Match only tag" tag)
+          (const :tag "Match last part of tag" endtag)
+          (const :tag "Match all file+tag" all))
+  :group 'helm-tags)
+
+(defcustom helm-etags-execute-action-at-once-if-one t
+  "Whether to jump straight to the selected tag if there's only
+one match."
+  :type 'boolean
+  :group 'helm-tags)
+
+
+(defgroup helm-tags-faces nil
+  "Customize the appearance of helm-tags faces."
+  :prefix "helm-"
+  :group 'helm-tags
+  :group 'helm-faces)
+
+(defface helm-etags-file
+    '((t (:foreground "Lightgoldenrod4"
+          :underline t)))
+  "Face used to highlight etags filenames."
+  :group 'helm-tags-faces)
+
+
+;;; Etags
+;;
+;;
+(defun helm-etags-run-switch-other-window ()
+  "Run switch to other window action from `helm-source-etags-select'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action
+     (lambda (c)
+       (helm-etags-action-goto 'find-file-other-window c)))))
+(put 'helm-etags-run-switch-other-window 'helm-only t)
+
+(defun helm-etags-run-switch-other-frame ()
+  "Run switch to other frame action from `helm-source-etags-select'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-exit-and-execute-action
+     (lambda (c)
+       (helm-etags-action-goto 'find-file-other-frame c)))))
+(put 'helm-etags-run-switch-other-frame 'helm-only t)
+
+(defvar helm-etags-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map (kbd "M-<down>") 'helm-goto-next-file)
+    (define-key map (kbd "M-<up>")   'helm-goto-precedent-file)
+    (define-key map (kbd "C-w")      'helm-yank-text-at-point)
+    (define-key map (kbd "C-c o")    'helm-etags-run-switch-other-window)
+    (define-key map (kbd "C-c C-o")  'helm-etags-run-switch-other-frame)
+    map)
+  "Keymap used in Etags.")
+
+(defvar helm-etags-mtime-alist nil
+  "Store the last modification time of etags files here.")
+(defvar helm-etags-cache (make-hash-table :test 'equal)
+  "Cache content of etags files used here for faster access.")
+
+(defun helm-etags-get-tag-file (&optional directory)
+  "Return the path of etags file if found.
+Lookes recursively in parents directorys for a
+`helm-etags-tag-file-name' file."
+  ;; Get tag file from `default-directory' or upper directory.
+  (let ((current-dir (helm-etags-find-tag-file-directory
+                      (or directory default-directory))))
+    ;; Return nil if not find tag file.
+    (when current-dir
+      (expand-file-name helm-etags-tag-file-name current-dir))))
+
+(defun helm-etags-all-tag-files ()
+  "Return files from the following sources;
+  1) An automatically located file in the parent directories, by `helm-etags-get-tag-file'.
+  2) `tags-file-name', which is commonly set by `find-tag' command.
+  3) `tags-table-list' which is commonly set by `visit-tags-table' command."
+  (helm-fast-remove-dups
+   (delq nil
+         (append (list (helm-etags-get-tag-file)
+                       tags-file-name)
+                 tags-table-list))
+   :test 'equal))
+
+(defun helm-etags-find-tag-file-directory (current-dir)
+  "Try to find the directory containing tag file.
+If not found in CURRENT-DIR search in upper directory."
+  (let ((file-exists? (lambda (dir)
+                          (let ((tag-path (expand-file-name
+                                           helm-etags-tag-file-name dir)))
+                            (and (stringp tag-path)
+                                 (file-regular-p tag-path)
+                                 (file-readable-p tag-path))))))
+    (cl-loop with count = 0
+          until (funcall file-exists? current-dir)
+          ;; Return nil if outside the value of
+          ;; `helm-etags-tag-file-search-limit'.
+          if (= count helm-etags-tag-file-search-limit)
+          do (cl-return nil)
+          ;; Or search upper directories.
+          else
+          do (cl-incf count)
+          (setq current-dir (expand-file-name (concat current-dir "../")))
+          finally return current-dir)))
+
+(defun helm-etags-get-header-name (_x)
+  "Create header name for this helm etags session."
+  (concat "Etags in "
+          (with-helm-current-buffer
+            (helm-etags-get-tag-file))))
+
+(defun helm-etags-create-buffer (file)
+  "Create the `helm-buffer' based on contents of etags tag FILE."
+  (let* ((tag-fname file)
+         max
+         (split (with-current-buffer (find-file-noselect tag-fname)
+                  (prog1
+                      (split-string (buffer-string) "\n" 'omit-nulls)
+                    (setq max (line-number-at-pos (point-max)))
+                    (kill-buffer))))
+         (progress-reporter (make-progress-reporter "Loading tag file..." 0 max)))
+    (cl-loop
+          with fname
+          with cand
+          for i in split for count from 0
+          for elm = (unless (string-match "^\x0c" i)    ;; "^L"
+                      (helm-aif (string-match "\177" i) ;; "^?"
+                          (substring i 0 it)
+                        i))
+          for linum = (when (string-match "[0-9]+,?[0-9]*$" i)
+                        (car (split-string (match-string 0 i) ",")))
+          do (cond ((and elm (string-match "^\\([^,]+\\),[0-9]+$" elm))
+                    (setq fname (propertize (match-string 1 elm)
+                                            'face 'helm-etags-file)))
+                   (elm (setq cand (format "%s:%s:%s" fname linum elm)))
+                   (t (setq cand nil)))
+          when cand do (progn
+                         (insert (propertize (concat cand "\n") 'linum linum))
+                         (progress-reporter-update progress-reporter count)))))
+
+(defun helm-etags-init ()
+  "Feed `helm-buffer' using `helm-etags-cache' or tag file.
+If no entry in cache, create one."
+  (let ((tagfiles (helm-etags-all-tag-files)))
+    (when tagfiles
+      (with-current-buffer (helm-candidate-buffer 'global)
+        (dolist (f tagfiles)
+          (helm-aif (gethash f helm-etags-cache)
+              ;; An entry is present in cache, insert it.
+              (insert it)
+            ;; No entry, create a new buffer using content of tag file (slower).
+            (helm-etags-create-buffer f)
+            ;; Store content of buffer in cache.
+            (puthash f (buffer-string) helm-etags-cache)
+            ;; Store or set the last modification of tag file.
+            (helm-aif (assoc f helm-etags-mtime-alist)
+                ;; If an entry exists modify it.
+                (setcdr it (helm-etags-mtime f))
+              ;; No entry create a new one.
+              (add-to-list 'helm-etags-mtime-alist
+                           (cons f (helm-etags-mtime f))))))))))
+
+(defvar helm-source-etags-select nil
+  "Helm source for Etags.")
+
+(defun helm-etags-build-source ()
+  (helm-build-in-buffer-source "Etags"
+    :header-name 'helm-etags-get-header-name
+    :init 'helm-etags-init
+    :get-line 'buffer-substring
+    :match-part (lambda (candidate)
+                  ;; Match only the tag part of CANDIDATE
+                  ;; and not the filename.
+                  (cl-ecase helm-etags-match-part-only
+                      (endtag (cadr (split-string
+                                     (cl-caddr (helm-grep-split-line candidate)))))
+                      (tag    (cl-caddr (helm-grep-split-line candidate)))
+                      (all    candidate)))
+    :fuzzy-match helm-etags-fuzzy-match
+    :help-message 'helm-etags-help-message
+    :keymap helm-etags-map
+    :action '(("Go to tag" . (lambda (c)
+                               (helm-etags-action-goto 'find-file c)))
+              ("Go to tag in other window" . (lambda (c)
+                                               (helm-etags-action-goto
+                                                'find-file-other-window
+                                                c)))
+              ("Go to tag in other frame" . (lambda (c)
+                                              (helm-etags-action-goto
+                                               'find-file-other-frame
+                                               c))))
+    :persistent-help "Go to line"
+    :persistent-action (lambda (candidate)
+                         (helm-etags-action-goto 'find-file candidate)
+                         (helm-highlight-current-line))))
+
+(defcustom helm-etags-fuzzy-match nil
+  "Use fuzzy matching in `helm-etags-select'."
+  :group 'helm-tags
+  :type 'boolean
+  :set (lambda (var val)
+         (set var val)
+         (setq helm-source-etags-select
+                (helm-etags-build-source))))
+
+(defvar find-tag-marker-ring)
+
+(defun helm-etags-action-goto (switcher candidate)
+  "Helm default action to jump to an etags entry in other window."
+  (require 'etags)
+  (helm-log-run-hook 'helm-goto-line-before-hook)
+  (let* ((split (helm-grep-split-line candidate))
+         (fname (cl-loop for tagf being the hash-keys of helm-etags-cache
+                      for f = (expand-file-name
+                               (car split) (file-name-directory tagf))
+                      when (file-exists-p f)
+                      return f))
+         (elm   (cl-caddr split))
+         (linum (string-to-number (cadr split))))
+    (if (null fname)
+        (error "file %s not found" fname)
+      (ring-insert find-tag-marker-ring (point-marker))
+      (funcall switcher fname)
+      (helm-goto-line linum t)
+      (when (search-forward elm nil t)
+        (goto-char (match-beginning 0))))))
+
+(defun helm-etags-mtime (file)
+  "Last modification time of etags tag FILE."
+  (cadr (nth 5 (file-attributes file))))
+
+(defun helm-etags-file-modified-p (file)
+  "Check if tag FILE have been modified in this session.
+If FILE is nil return nil."
+  (let ((last-modif (and file
+                         (assoc-default file helm-etags-mtime-alist))))
+    (and last-modif
+         (/= last-modif (helm-etags-mtime file)))))
+
+;;;###autoload
+(defun helm-etags-select (reinit)
+  "Preconfigured helm for etags.
+If called with a prefix argument REINIT
+or if any of the tag files have been modified, reinitialize cache.
+
+This function aggregates three sources of tag files:
+
+  1) An automatically located file in the parent directories,
+     by `helm-etags-get-tag-file'.
+  2) `tags-file-name', which is commonly set by `find-tag' command.
+  3) `tags-table-list' which is commonly set by `visit-tags-table' command."
+  (interactive "P")
+  (let ((tag-files (helm-etags-all-tag-files))
+        (helm-execute-action-at-once-if-one
+         helm-etags-execute-action-at-once-if-one)
+        (str (if (region-active-p)
+                 (buffer-substring-no-properties
+                  (region-beginning) (region-end))
+                 ;; Use a raw syntax-table to determine tap.
+                 ;; This may be wrong when calling etags
+                 ;; with hff from a buffer that use
+                 ;; a different syntax, but most of the time it
+                 ;; should be better.
+                 (with-syntax-table (standard-syntax-table)
+                   (thing-at-point 'symbol)))))
+    (if (cl-notany 'file-exists-p tag-files)
+        (message "Error: No tag file found.\
+Create with etags shell command, or visit with `find-tag' or `visit-tags-table'.")
+        (cl-loop for k being the hash-keys of helm-etags-cache
+                 unless (member k tag-files)
+                 do (remhash k helm-etags-cache))
+        (mapc (lambda (f)
+                (when (or (equal reinit '(4))
+                          (and helm-etags-mtime-alist
+                               (helm-etags-file-modified-p f)))
+                  (remhash f helm-etags-cache)))
+              tag-files)
+        (unless helm-source-etags-select
+          (setq helm-source-etags-select
+                (helm-etags-build-source)))
+        (helm :sources 'helm-source-etags-select
+              :keymap helm-etags-map
+              :default (if helm-etags-fuzzy-match
+                           str
+                           (list (concat "\\_<" str "\\_>") str))
+              :buffer "*helm etags*"))))
+
+(provide 'helm-tags)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-tags.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-types.el b/emacs.d/elpa/helm-20160115.2200/helm-types.el
new file mode 100644
index 0000000..9c5755c
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-types.el
@@ -0,0 +1,277 @@
+;;; helm-types.el --- Helm types classes and methods. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: http://github.com/emacs-helm/helm
+
+;; 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/>.
+
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'eieio)
+
+
+;;  Files
+(defclass helm-type-file (helm-source) ()
+  "A class to define helm type file.")
+
+(defmethod helm-source-get-action-from-type ((object helm-type-file))
+  (slot-value object 'action))
+
+(defun helm-actions-from-type-file ()
+  (let ((source (make-instance 'helm-type-file)))
+    (helm--setup-source source)
+    (helm-source-get-action-from-type source)))
+
+(defcustom helm-type-file-actions
+  (helm-make-actions
+    "Find file"                             'helm-find-many-files
+    "Find file as root"                     'helm-find-file-as-root
+    "Find file other window"                'helm-find-files-other-window
+    "Find file other frame"                 'find-file-other-frame
+    "Open dired in file's directory"        'helm-open-dired
+    "Grep File(s) `C-u recurse'"            'helm-find-files-grep
+    "Zgrep File(s) `C-u Recurse'"           'helm-ff-zgrep
+    "Pdfgrep File(s)"                       'helm-ff-pdfgrep
+    "Insert as org link"                    'helm-files-insert-as-org-link
+    "Checksum File"                         'helm-ff-checksum
+    "Ediff File"                            'helm-find-files-ediff-files
+    "Ediff Merge File"                      'helm-find-files-ediff-merge-files
+    "Etags `M-., C-u reload tag file'"      'helm-ff-etags-select
+    "View file"                             'view-file
+    "Insert file"                           'insert-file
+    "Add marked files to file-cache"        'helm-ff-cache-add-file
+    "Delete file(s)"                        'helm-delete-marked-files
+    "Copy file(s) `M-C, C-u to follow'"     'helm-find-files-copy
+    "Rename file(s) `M-R, C-u to follow'"   'helm-find-files-rename
+    "Symlink files(s) `M-S, C-u to follow'" 'helm-find-files-symlink
+    "Relsymlink file(s) `C-u to follow'"    'helm-find-files-relsymlink
+    "Hardlink file(s) `M-H, C-u to follow'" 'helm-find-files-hardlink
+    "Open file externally (C-u to choose)"  'helm-open-file-externally
+    "Open file with default tool"           'helm-open-file-with-default-tool
+    "Find file in hex dump"                 'hexl-find-file)
+  "Default actions for type files."
+  :group 'helm-files
+  :type '(alist :key-type string :value-type function))
+
+(defmethod helm--setup-source :primary ((_source helm-type-file)))
+
+(defmethod helm--setup-source :before ((source helm-type-file))
+  (set-slot-value source 'action 'helm-type-file-actions)
+  (set-slot-value source 'persistent-help "Show this file")
+  (set-slot-value source 'action-transformer '(helm-transform-file-load-el
+                                               helm-transform-file-browse-url
+                                               helm-transform-file-cache))
+  (set-slot-value source 'candidate-transformer '(helm-skip-boring-files
+                                                  helm-highlight-files
+                                                  helm-w32-pathname-transformer))
+  (set-slot-value source 'help-message 'helm-generic-file-help-message)
+  (set-slot-value source 'keymap helm-generic-files-map))
+
+
+;; Bookmarks
+(defclass helm-type-bookmark (helm-source) ()
+  "A class to define type bookmarks.")
+
+(defcustom helm-type-bookmark-actions
+  (helm-make-actions
+   "Jump to bookmark" 'helm-bookmark-jump
+   "Jump to BM other window" 'helm-bookmark-jump-other-window
+   "Bookmark edit annotation" 'bookmark-edit-annotation
+   "Bookmark show annotation" 'bookmark-show-annotation
+   "Delete bookmark(s)" 'helm-delete-marked-bookmarks
+   "Edit Bookmark" 'helm-bookmark-edit-bookmark
+   "Rename bookmark" 'helm-bookmark-rename
+   "Relocate bookmark" 'bookmark-relocate)
+  "Default actions for type bookmarks."
+  :group 'helm-bookmark
+  :type '(alist :key-type string
+                   :value-type function))
+
+(defmethod helm-source-get-action-from-type ((object helm-type-bookmark))
+  (slot-value object 'action))
+
+(defmethod helm--setup-source :primary ((_source helm-type-bookmark)))
+
+(defmethod helm--setup-source :before ((source helm-type-bookmark))
+  (set-slot-value source 'action 'helm-type-bookmark-actions)
+  (set-slot-value source 'keymap helm-bookmark-map)
+  (set-slot-value source 'help-message 'helm-bookmark-help-message)
+  (set-slot-value source 'migemo t))
+
+
+;; Buffers
+(defclass helm-type-buffer (helm-source) ()
+  "A class to define type buffer.")
+
+(defcustom helm-type-buffer-actions
+  (helm-make-actions
+   "Switch to buffer(s)" 'helm-switch-to-buffers
+   (lambda () (and (locate-library "popwin")
+                   "Switch to buffer in popup window"))
+   'popwin:popup-buffer
+   "Switch to buffer(s) other window `C-c o'"
+   'helm-switch-to-buffers-other-window
+   "Switch to buffer other frame `C-c C-o'"
+   'switch-to-buffer-other-frame
+   (lambda () (and (locate-library "elscreen")
+                   "Display buffer in Elscreen"))
+   'helm-find-buffer-on-elscreen
+   "Query replace regexp `C-M-%'"
+   'helm-buffer-query-replace-regexp
+   "Query replace `M-%'" 'helm-buffer-query-replace
+   "View buffer" 'view-buffer
+   "Display buffer" 'display-buffer
+   "Grep buffers `M-g s' (C-u grep all buffers)"
+   'helm-zgrep-buffers
+   "Multi occur buffer(s) `C-s'" 'helm-multi-occur-as-action
+   "Revert buffer(s) `M-U'" 'helm-revert-marked-buffers
+   "Insert buffer" 'insert-buffer
+   "Kill buffer(s) `M-D'" 'helm-kill-marked-buffers
+   "Diff with file `C-='" 'diff-buffer-with-file
+   "Ediff Marked buffers `C-c ='" 'helm-ediff-marked-buffers
+   "Ediff Merge marked buffers `M-='"
+   (lambda (candidate)
+     (helm-ediff-marked-buffers candidate t)))
+  "Default actions for type buffers."
+  :group 'helm-buffers
+  :type '(alist :key-type string :value-type function))
+
+(defmethod helm-source-get-action-from-type ((object helm-type-buffer))
+  (slot-value object 'action))
+
+(defmethod helm--setup-source :primary ((_source helm-type-buffer)))
+
+(defmethod helm--setup-source :before ((source helm-type-buffer))
+  (set-slot-value source 'action 'helm-type-buffer-actions)
+  (set-slot-value source 'persistent-help "Show this buffer")
+  (set-slot-value
+   source 'filtered-candidate-transformer
+   '(helm-skip-boring-buffers
+     helm-buffers-sort-transformer
+     helm-highlight-buffers)))
+
+;; Functions
+(defclass helm-type-function (helm-source) ()
+  "A class to define helm type function.")
+
+(defcustom helm-type-function-actions
+  (helm-make-actions
+   "Describe command" 'describe-function
+   "Add command to kill ring" 'helm-kill-new
+   "Go to command's definition" 'find-function
+   "Debug on entry" 'debug-on-entry
+   "Cancel debug on entry" 'cancel-debug-on-entry
+   "Trace function" 'trace-function
+   "Trace function (background)" 'trace-function-background
+   "Untrace function" 'untrace-function)
+    "Default actions for type functions."
+  :group 'helm-elisp
+  :type '(alist :key-type string :value-type function))
+
+(defmethod helm-source-get-action-from-type ((object helm-type-function))
+  (slot-value object 'action))
+
+(defun helm-actions-from-type-function ()
+  (let ((source (make-instance 'helm-type-function)))
+    (helm--setup-source source)
+    (helm-source-get-action-from-type source)))
+
+(defmethod helm--setup-source :primary ((_source helm-type-function)))
+
+(defmethod helm--setup-source :before ((source helm-type-function))
+  (set-slot-value source 'action 'helm-type-function-actions)
+  (set-slot-value source 'action-transformer
+                  'helm-transform-function-call-interactively)
+  (set-slot-value source 'candidate-transformer
+                  'helm-mark-interactive-functions)
+  (set-slot-value source 'coerce 'helm-symbolify))
+
+
+;; Commands
+(defclass helm-type-command (helm-source) ()
+  "A class to define helm type command.")
+
+(defun helm-actions-from-type-command ()
+  (let ((source (make-instance 'helm-type-command)))
+    (helm--setup-source source)
+    (helm-source-get-action-from-type source)))
+
+(defcustom helm-type-command-actions
+  (append (helm-make-actions
+           "Call interactively" 'helm-call-interactively)
+          (helm-actions-from-type-function))
+  "Default actions for type command."
+  :group 'helm-command
+  :type '(alist :key-type string :value-type function))
+
+(defmethod helm--setup-source :primary ((_source helm-type-command)))
+
+(defmethod helm--setup-source :before ((source helm-type-command))
+  (set-slot-value
+   source 'action 'helm-type-command-actions)
+  (set-slot-value source 'coerce 'helm-symbolify)
+  (set-slot-value source 'persistent-action 'describe-function))
+
+;; Timers
+(defclass helm-type-timers (helm-source) ()
+  "A class to define helm type timers.")
+
+(defcustom helm-type-timers-actions
+  '(("Cancel Timer" . (lambda (_timer)
+                        (let ((mkd (helm-marked-candidates)))
+                          (cl-loop for timer in mkd
+                                   do (cancel-timer timer)))))
+    ("Describe Function" . (lambda (tm)
+                             (describe-function (timer--function tm))))
+    ("Find Function" . (lambda (tm)
+                         (helm-aif (timer--function tm)
+                             (if (byte-code-function-p it)
+                                 (message "Can't find anonymous function `%s'" it)
+                                 (find-function it))))))
+  "Default actions for type timers."
+  :group 'helm-elisp
+  :type '(alist :key-type string :value-type function))
+
+(defmethod helm--setup-source :primary ((_source helm-type-timers)))
+
+(defmethod helm--setup-source :before ((source helm-type-timers))
+  (set-slot-value source 'action 'helm-type-timers-actions)
+  (set-slot-value source 'persistent-action
+                  (lambda (tm)
+                    (describe-function (timer--function tm))))
+  (set-slot-value source 'persistent-help "Describe Function"))
+
+;; Builders.
+(defun helm-build-type-file ()
+  (helm-make-type 'helm-type-file))
+
+(defun helm-build-type-function ()
+  (helm-make-type 'helm-type-function))
+
+(defun helm-build-type-command ()
+  (helm-make-type 'helm-type-command))
+
+(provide 'helm-types)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-types.el ends here
diff --git a/emacs.d/elpa/helm-20160115.2200/helm-utils.el b/emacs.d/elpa/helm-20160115.2200/helm-utils.el
new file mode 100644
index 0000000..72d09a2
--- /dev/null
+++ b/emacs.d/elpa/helm-20160115.2200/helm-utils.el
@@ -0,0 +1,611 @@
+;;; helm-utils.el --- Utilities Functions for helm. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm)
+(require 'helm-help)
+(require 'compile) ; Fixme: Is this needed?
+(require 'dired)
+
+(declare-function helm-find-files-1 "helm-files.el" (fname &optional preselect))
+(defvar winner-boring-buffers)
+
+
+(defgroup helm-utils nil
+  "Utilities routines for Helm."
+  :group 'helm)
+
+(defcustom helm-su-or-sudo "sudo"
+  "What command to use for root access."
+  :type 'string
+  :group 'helm-utils)
+
+(defcustom helm-default-kbsize 1024.0
+  "Default Kbsize to use for showing files size.
+It is a float, usually 1024.0 but could be 1000.0 on some systems."
+  :group 'helm-utils
+  :type 'float)
+
+(defcustom helm-highlight-number-lines-around-point 15
+  "Number of lines around point where matched items are highlighted."
+  :group 'helm-utils
+  :type 'integer)
+
+(defcustom helm-buffers-to-resize-on-pa nil
+  "A list of helm buffers where the helm-window should be reduced on persistent actions."
+  :group 'helm-utils
+  :type '(repeat (choice string)))
+
+(defcustom helm-resize-on-pa-text-height 12
+  "The size of the helm-window when resizing on persistent action."
+  :group 'helm-utils
+  :type 'integer)
+
+
+(defvar helm-goto-line-before-hook '(helm-save-current-pos-to-mark-ring)
+  "Run before jumping to line.
+This hook run when jumping from `helm-goto-line', `helm-etags-default-action',
+and `helm-imenu-default-action'.
+This allow you to retrieve a previous position after using the different helm
+tools for searching (etags, grep, gid, (m)occur etc...).
+By default positions are added to `mark-ring' you can also add to register
+by using instead (or adding) `helm-save-pos-to-register-before-jump'.
+In this case last position is added to the register
+`helm-save-pos-before-jump-register'.")
+
+(defvar helm-save-pos-before-jump-register ?_
+  "The register where `helm-save-pos-to-register-before-jump' save position.")
+
+
+;;; Faces.
+;;
+(defface helm-selection-line
+    '((t (:inherit highlight :distant-foreground "black")))
+  "Face used in the `helm-current-buffer' when jumping to candidate."
+  :group 'helm-faces)
+
+(defface helm-match-item
+    '((t (:inherit isearch)))
+  "Face used to highlight item matched in a selected line."
+  :group 'helm-faces)
+
+
+;; CUA workaround
+(defadvice cua-delete-region (around helm-avoid-cua activate)
+  (ignore-errors ad-do-it))
+
+(defadvice copy-region-as-kill (around helm-avoid-cua activate)
+  (if cua-mode
+      (ignore-errors ad-do-it)
+    ad-do-it))
+
+
+;;; Utils functions
+;;
+;;
+(defun helm-switch-to-buffers (buffer-or-name &optional other-window)
+  "Switch to buffer BUFFER-OR-NAME.
+If more than one buffer marked switch to these buffers in separate windows.
+If OTHER-WINDOW is specified keep current-buffer and switch to others buffers
+in separate windows."
+  (let* ((mkds (helm-marked-candidates))
+         (size (/ (window-height) (length mkds))))
+    (or (<= window-min-height size)
+        (error "Too many buffers to visit simultaneously."))
+    (helm-aif (cdr mkds)
+        (progn
+          (if other-window
+              (switch-to-buffer-other-window (car mkds))
+            (switch-to-buffer (car mkds)))
+          (save-selected-window
+            (cl-loop for b in it
+                  do (progn
+                       (select-window (split-window))
+                       (switch-to-buffer b)))))
+      (if other-window
+          (switch-to-buffer-other-window buffer-or-name)
+        (switch-to-buffer buffer-or-name)))))
+
+(defun helm-switch-to-buffers-other-window (buffer-or-name)
+  "switch to buffer BUFFER-OR-NAME in other window.
+See `helm-switch-to-buffers' for switching to marked buffers."
+  (helm-switch-to-buffers buffer-or-name t))
+
+(cl-defun helm-current-buffer-narrowed-p (&optional
+                                            (buffer helm-current-buffer))
+  "Check if BUFFER is narrowed.
+Default is `helm-current-buffer'."
+  (with-current-buffer buffer
+    (let ((beg (point-min))
+          (end (point-max))
+          (total (buffer-size)))
+      (or (/= beg 1) (/= end (1+ total))))))
+
+(defun helm-goto-char (loc)
+  "Go to char, revealing if necessary."
+  (goto-char loc)
+  (when (or (eq major-mode 'org-mode)
+            (and (boundp 'outline-minor-mode)
+                 outline-minor-mode))
+    (require 'org) ; On some old Emacs versions org may not be loaded.
+    (org-reveal)))
+
+(defun helm-goto-line (lineno &optional noanim)
+  "Goto LINENO opening only outline headline if needed.
+Animation is used unless NOANIM is non--nil."
+  (helm-log-run-hook 'helm-goto-line-before-hook)
+  (goto-char (point-min))
+  (helm-goto-char (point-at-bol lineno))
+  (unless noanim
+    (helm-highlight-current-line nil nil nil nil 'pulse)))
+
+(defun helm-save-pos-to-register-before-jump ()
+  "Save current buffer position to `helm-save-pos-before-jump-register'.
+To use this add it to `helm-goto-line-before-hook'."
+  (with-helm-current-buffer
+    (unless helm-in-persistent-action
+      (point-to-register helm-save-pos-before-jump-register))))
+
+(defun helm-save-current-pos-to-mark-ring ()
+  "Save current buffer position to mark ring.
+To use this add it to `helm-goto-line-before-hook'."
+  (with-helm-current-buffer
+    (unless helm-in-persistent-action
+      (set-marker (mark-marker) (point))
+      (push-mark (point) 'nomsg))))
+
+(defun helm-show-all-in-this-source-only (arg)
+  "Show only current source of this helm session with all its candidates.
+With a numeric prefix arg show only the ARG number of candidates."
+  (interactive "p")
+  (with-helm-alive-p
+    (with-helm-window
+      (with-helm-default-directory (helm-default-directory)
+          (let ((helm-candidate-number-limit (and (> arg 1) arg)))
+            (helm-set-source-filter
+             (list (assoc-default 'name (helm-get-current-source)))))))))
+(put 'helm-show-all-in-this-source-only 'helm-only t)
+
+(defun helm-display-all-sources ()
+  "Display all sources previously hidden by `helm-set-source-filter'."
+  (interactive)
+  (with-helm-alive-p
+    (helm-set-source-filter nil)))
+(put 'helm-display-all-sources 'helm-only t)
+
+(defun helm-displaying-source-names ()
+  "Return the list of sources name for this helm session."
+  (with-current-buffer helm-buffer
+    (goto-char (point-min))
+    (cl-loop with pos
+          while (setq pos (next-single-property-change (point) 'helm-header))
+          do (goto-char pos)
+          collect (buffer-substring-no-properties (point-at-bol)(point-at-eol))
+          do (forward-line 1))))
+
+(defun helm-handle-winner-boring-buffers ()
+  "Add `helm-buffer' to `winner-boring-buffers' when quitting/exiting helm.
+Add this function to `helm-cleanup-hook' when you don't want to see helm buffers
+after running winner-undo/redo."
+  (require 'winner)
+  (cl-pushnew helm-buffer winner-boring-buffers :test 'equal))
+(add-hook 'helm-cleanup-hook #'helm-handle-winner-boring-buffers)
+
+(defun helm-quit-and-find-file ()
+  "Drop into `helm-find-files' from `helm'.
+If current selection is a buffer or a file, `helm-find-files'
+from its directory."
+  (interactive)
+  (with-helm-alive-p
+    (require 'helm-grep)
+    (helm-run-after-exit
+     (lambda (f)
+       (if (file-exists-p f)
+           (helm-find-files-1 (file-name-directory f)
+                              (concat
+                               "^"
+                               (regexp-quote
+                                (if helm-ff-transformer-show-only-basename
+                                    (helm-basename f) f))))
+           (helm-find-files-1 f)))
+     (let* ((sel       (helm-get-selection))
+            (grep-line (and (stringp sel)
+                            (helm-grep-split-line sel)))
+            (bmk-name  (and (stringp sel)
+                            (not grep-line)
+                            (replace-regexp-in-string "\\`\\*" "" sel)))
+            (bmk       (and bmk-name (assoc bmk-name bookmark-alist)))
+            (buf       (helm-aif (and (bufferp sel) (get-buffer sel))
+                           (buffer-name it)))
+            (default-preselection (or (buffer-file-name helm-current-buffer)
+                                      default-directory)))
+       (cond
+         ;; Buffer.
+         (buf (or (buffer-file-name sel)
+                  (car (rassoc buf dired-buffers))
+                  (and (with-current-buffer buf
+                         (eq major-mode 'org-agenda-mode))
+                       org-directory
+                       (expand-file-name org-directory))
+                  (with-current-buffer buf default-directory)))
+         ;; Bookmark.
+         (bmk (helm-aif (bookmark-get-filename bmk)
+                  (if (and ffap-url-regexp
+                           (string-match ffap-url-regexp it))
+                      it (expand-file-name it))
+                default-directory))
+         ((or (file-remote-p sel)
+              (file-exists-p sel))
+          (expand-file-name sel))
+         ;; Grep.
+         ((and grep-line (file-exists-p (car grep-line)))
+          (expand-file-name (car grep-line)))
+         ;; Occur.
+         (grep-line
+          (with-current-buffer (get-buffer (car grep-line))
+            (or (buffer-file-name) default-directory)))
+         ;; Url.
+         ((and ffap-url-regexp (string-match ffap-url-regexp sel)) sel)
+         ;; Default.
+         (t default-preselection))))))
+(put 'helm-quit-and-find-file 'helm-only t)
+
+(defun helm-generic-sort-fn (s1 s2)
+  "Sort predicate function for helm candidates.
+Args S1 and S2 can be single or \(display . real\) candidates,
+that is sorting is done against real value of candidate."
+  (let* ((pattern (regexp-quote helm-pattern))
+         (reg1  (concat "\\_<" pattern "\\_>"))
+         (reg2  (concat "\\_<" pattern))
+         (reg3  helm-pattern)
+         (split (split-string pattern))
+         (str1  (if (consp s1) (cdr s1) s1))
+         (str2  (if (consp s2) (cdr s2) s2))
+         (score (lambda (str r1 r2 r3 lst)
+                    (+ (if (string-match (concat "\\`" pattern) str) 1 0)
+                       (cond ((string-match r1 str) 5)
+                             ((and (string-match " " pattern)
+                                   (string-match (concat "\\_<" (car lst)) str)
+                                   (cl-loop for r in (cdr lst)
+                                            always (string-match r str))) 4)
+                             ((and (string-match " " pattern)
+                                   (cl-loop for r in lst always (string-match r str))) 3)
+                             ((string-match r2 str) 2)
+                             ((string-match r3 str) 1)
+                             (t 0)))))
+         (sc1 (funcall score str1 reg1 reg2 reg3 split))
+         (sc2 (funcall score str2 reg1 reg2 reg3 split)))
+    (cond ((or (zerop (string-width pattern))
+               (and (zerop sc1) (zerop sc2)))
+           (string-lessp str1 str2))
+          ((= sc1 sc2)
+           (< (length str1) (length str2)))
+          (t (> sc1 sc2)))))
+
+(defun helm-ff-get-host-from-tramp-invalid-fname (fname)
+  "Extract hostname from an incomplete tramp file name.
+Return nil on valid file name remote or not."
+  (let* ((str (helm-basename fname))
+         (split (split-string str ":"))
+         (meth (car (member (car split) (mapcar 'car tramp-methods))))) 
+    (when (and meth (<= (length split) 2))
+      (cadr split))))
+
+(cl-defun helm-file-human-size (size &optional (kbsize helm-default-kbsize))
+  "Return a string showing SIZE of a file in human readable form.
+SIZE can be an integer or a float depending it's value.
+`file-attributes' will take care of that to avoid overflow error.
+KBSIZE if a floating point number, defaulting to `helm-default-kbsize'."
+  (let ((M (cons "M" (/ size (expt kbsize 2))))
+        (G (cons "G" (/ size (expt kbsize 3))))
+        (K (cons "K" (/ size kbsize)))
+        (B (cons "B" size)))
+    (cl-loop with result = B
+          for (a . b) in
+          (cl-loop for (x . y) in (list M G K B)
+                unless (< y 1) collect (cons x y))
+          when (< b (cdr result)) do (setq result (cons a b))
+          finally return (if (string= (car result) "B")
+                             (format "%s" size)
+                           (format "%.1f%s" (cdr result) (car result))))))
+
+(cl-defun helm-file-attributes
+    (file &key type links uid gid access-time modif-time
+            status size mode gid-change inode device-num dired human-size
+            mode-type mode-owner mode-group mode-other (string t))
+  "Return `file-attributes' elements of FILE separately according to key value.
+Availables keys are:
+- TYPE: Same as nth 0 `files-attributes' if STRING is nil
+        otherwise return either symlink, directory or file (default).
+- LINKS: See nth 1 `files-attributes'.
+- UID: See nth 2 `files-attributes'.
+- GID: See nth 3 `files-attributes'.
+- ACCESS-TIME: See nth 4 `files-attributes', however format time
+               when STRING is non--nil (the default).
+- MODIF-TIME: See nth 5 `files-attributes', same as above.
+- STATUS: See nth 6 `files-attributes', same as above.
+- SIZE: See nth 7 `files-attributes'.
+- MODE: See nth 8 `files-attributes'.
+- GID-CHANGE: See nth 9 `files-attributes'.
+- INODE: See nth 10 `files-attributes'.
+- DEVICE-NUM: See nth 11 `files-attributes'.
+- DIRED: A line similar to what 'ls -l' return.
+- HUMAN-SIZE: The size in human form, see `helm-file-human-size'.
+- MODE-TYPE, mode-owner,mode-group, mode-other: Split what
+  nth 7 `files-attributes' return in four categories.
+- STRING: When non--nil (default) `helm-file-attributes' return
+          more friendly values.
+If you want the same behavior as `files-attributes' ,
+\(but with return values in proplist\) use a nil value for STRING.
+However when STRING is non--nil, time and type value are different from what
+you have in `file-attributes'."
+  (let* ((all (cl-destructuring-bind
+                    (type links uid gid access-time modif-time
+                          status size mode gid-change inode device-num)
+                  (file-attributes file string)
+                (list :type        (if string
+                                       (cond ((stringp type) "symlink") ; fname
+                                             (type "directory")         ; t
+                                             (t "file"))                ; nil
+                                     type)
+                      :links       links
+                      :uid         uid
+                      :gid         gid
+                      :access-time (if string
+                                       (format-time-string
+                                        "%Y-%m-%d %R" access-time)
+                                     access-time)
+                      :modif-time  (if string
+                                       (format-time-string
+                                        "%Y-%m-%d %R" modif-time)
+                                     modif-time)
+                      :status      (if string
+                                       (format-time-string
+                                        "%Y-%m-%d %R" status)
+                                     status)
+                      :size        size
+                      :mode        mode
+                      :gid-change  gid-change
+                      :inode       inode
+                      :device-num  device-num)))
+         (modes (helm-split-mode-file-attributes (cl-getf all :mode))))
+    (cond (type (cl-getf all :type))
+          (links (cl-getf all :links))
+          (uid   (cl-getf all :uid))
+          (gid   (cl-getf all :gid))
+          (access-time (cl-getf all :access-time))
+          (modif-time (cl-getf all :modif-time))
+          (status (cl-getf all :status))
+          (size (cl-getf all :size))
+          (mode (cl-getf all :mode))
+          (gid-change (cl-getf all :gid-change))
+          (inode (cl-getf all :inode))
+          (device-num (cl-getf all :device-num))
+          (dired
+           (concat
+            (helm-split-mode-file-attributes (cl-getf all :mode) t) " "
+            (number-to-string (cl-getf all :links)) " "
+            (cl-getf all :uid) ":"
+            (cl-getf all :gid) " "
+            (if human-size
+                (helm-file-human-size (cl-getf all :size))
+              (int-to-string (cl-getf all :size))) " "
+              (cl-getf all :modif-time)))
+          (human-size (helm-file-human-size (cl-getf all :size)))
+          (mode-type (cl-getf modes :mode-type))
+          (mode-owner (cl-getf modes :user))
+          (mode-group (cl-getf modes :group))
+          (mode-other (cl-getf modes :other))
+          (t (append all modes)))))
+
+(defun helm-split-mode-file-attributes (str &optional string)
+  "Split mode file attributes STR into a proplist.
+If STRING is non--nil return instead a space separated string."
+  (cl-loop with type = (substring str 0 1)
+        with cdr = (substring str 1)
+        for i across cdr
+        for count from 1
+        if (<= count 3)
+        concat (string i) into user
+        if (and (> count 3) (<= count 6))
+        concat (string i) into group
+        if (and (> count 6) (<= count 9))
+        concat (string i) into other
+        finally return
+        (if string
+            (mapconcat 'identity (list type user group other) " ")
+          (list :mode-type type :user user :group group :other other))))
+
+(defmacro with-helm-display-marked-candidates (buffer-or-name candidates &rest body)
+  (declare (indent 0) (debug t))
+  (helm-with-gensyms (buffer window)
+    `(let* ((,buffer (temp-buffer-window-setup ,buffer-or-name))
+            ,window)
+       (unwind-protect
+            (with-current-buffer ,buffer
+              (dired-format-columns-of-files ,candidates)
+              (select-window
+               (setq ,window (temp-buffer-window-show
+                              ,buffer
+                              '(display-buffer-below-selected
+                                (window-height . fit-window-to-buffer)))))
+              (progn ,@body))
+         (quit-window 'kill ,window)))))
+
+;;; Persistent Action Helpers
+;;
+;;
+;; Internal
+(defvar helm-match-line-overlay nil)
+(defvar helm--match-item-overlays nil)
+
+(defun helm-highlight-current-line (&optional start end buf face pulse)
+  "Highlight and underline current position"
+  (let* ((start (or start (line-beginning-position)))
+         (end (or end (1+ (line-end-position))))
+         (start-match (if (or (null helm-highlight-number-lines-around-point)
+                              (zerop helm-highlight-number-lines-around-point))
+                          start
+                        (save-excursion
+                          (forward-line
+                           (- helm-highlight-number-lines-around-point))
+                          (point-at-bol))))
+         (end-match   (if (or (null helm-highlight-number-lines-around-point)
+                              (zerop helm-highlight-number-lines-around-point))
+                          end
+                        (save-excursion
+                          (forward-line
+                           helm-highlight-number-lines-around-point)
+                          (point-at-eol))))
+         (args (list start end buf)))
+    (if (not helm-match-line-overlay)
+        (setq helm-match-line-overlay (apply 'make-overlay args))
+      (apply 'move-overlay helm-match-line-overlay args))
+    (overlay-put helm-match-line-overlay
+                 'face (or face 'helm-selection-line))
+    (catch 'empty-line
+      (cl-loop with ov
+               for r in (helm-remove-if-match
+                         "\\`!" (split-string helm-input))
+               do (save-excursion
+                    (goto-char start-match)
+                    (while (condition-case _err
+                               (if helm-migemo-mode
+                                   (helm-mm-migemo-forward r end-match t)
+                                 (re-search-forward r end-match t))
+                             (invalid-regexp nil))
+                      (let ((s (match-beginning 0))
+                            (e (match-end 0)))
+                        (if (= s e)
+                            (throw 'empty-line nil)
+                          (push (setq ov (make-overlay s e))
+                                helm--match-item-overlays)
+                          (overlay-put ov 'face 'helm-match-item)
+                          (overlay-put ov 'priority 1)))))))
+    (recenter)
+    (when pulse
+      (sit-for 0.3)
+      (helm-match-line-cleanup))))
+
+(defun helm-match-line-cleanup ()
+  (when helm-match-line-overlay
+    (delete-overlay helm-match-line-overlay)
+    (setq helm-match-line-overlay nil))
+  (when helm--match-item-overlays
+    (mapc 'delete-overlay helm--match-item-overlays)))
+
+(defun helm-match-line-update ()
+  (when helm-match-line-overlay
+    (delete-overlay helm-match-line-overlay)
+    (helm-highlight-current-line)))
+
+(defun helm-persistent-autoresize-hook ()
+  (when (and helm-buffers-to-resize-on-pa
+             (member helm-buffer helm-buffers-to-resize-on-pa)
+             (eq helm-split-window-state 'vertical))
+    (set-window-text-height (helm-window) helm-resize-on-pa-text-height)))
+
+(add-hook 'helm-after-persistent-action-hook 'helm-persistent-autoresize-hook)
+(add-hook 'helm-cleanup-hook 'helm-match-line-cleanup)
+(add-hook 'helm-after-persistent-action-hook 'helm-match-line-update)
+
+(defun helm-open-file-with-default-tool (file)
+  "Open FILE with the default tool on this platform."
+  (let (process-connection-type)
+    (if (eq system-type 'windows-nt)
+        (helm-w32-shell-execute-open-file file)
+      (start-process "helm-open-file-with-default-tool"
+                     nil
+                     (cond ((eq system-type 'gnu/linux)
+                            "xdg-open")
+                           ((or (eq system-type 'darwin) ;; Mac OS X
+                                (eq system-type 'macos)) ;; Mac OS 9
+                            "open"))
+                     file))))
+
+(defun helm-open-dired (file)
+  "Opens a dired buffer in FILE's directory.  If FILE is a
+directory, open this directory."
+  (if (file-directory-p file)
+      (dired file)
+    (dired (file-name-directory file))
+    (dired-goto-file file)))
+
+(defun helm-require-or-error (feature function)
+  (or (require feature nil t)
+      (error "Need %s to use `%s'." feature function)))
+
+(defun helm-find-file-as-root (candidate)
+  (let* ((buf (helm-basename candidate))
+         (host (file-remote-p candidate 'host))
+         (remote-path (format "/%s:%s:%s"
+                              helm-su-or-sudo
+                              (or host "")
+                              (expand-file-name
+                               (if host
+                                   (file-remote-p candidate 'localname)
+                                 candidate))))
+         non-essential)
+    (if (buffer-live-p (get-buffer buf))
+        (progn
+          (set-buffer buf)
+          (find-alternate-file remote-path))
+      (find-file remote-path))))
+
+(defun helm-find-many-files (_ignore)
+  (let ((helm--reading-passwd-or-string t))
+    (mapc 'find-file (helm-marked-candidates))))
+
+(defun helm-read-repeat-string (prompt &optional count)
+  "Prompt as many time PROMPT is not empty.
+If COUNT is non--nil add a number after each prompt."
+  (cl-loop with elm
+        while (not (string= elm ""))
+        for n from 1
+        do (when count
+             (setq prompt (concat prompt (int-to-string n) ": ")))
+        collect (setq elm (helm-read-string prompt)) into lis
+        finally return (remove "" lis)))
+
+(defun helm-html-bookmarks-to-alist (file url-regexp bmk-regexp)
+  "Parse html bookmark FILE and return an alist with (title . url) as elements."
+  (let (bookmarks-alist url title)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (goto-char (point-min))
+      (while (re-search-forward "href=\\|^ *<DT><A HREF=" nil t)
+        (forward-line 0)
+        (when (re-search-forward url-regexp nil t)
+          (setq url (match-string 0)))
+        (when (re-search-forward bmk-regexp nil t)
+          (setq title (match-string 1)))
+        (push (cons title url) bookmarks-alist)
+        (forward-line)))
+    (nreverse bookmarks-alist)))
+
+
+(provide 'helm-utils)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-utils.el ends here
diff --git a/emacs.d/elpa/helm-core-20160116.2343/helm-core-autoloads.el b/emacs.d/elpa/helm-core-20160116.2343/helm-core-autoloads.el
new file mode 100644
index 0000000..e340b7c
--- /dev/null
+++ b/emacs.d/elpa/helm-core-20160116.2343/helm-core-autoloads.el
@@ -0,0 +1,202 @@
+;;; helm-core-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "helm" "helm.el" (22171 46562 0 0))
+;;; Generated autoloads from helm.el
+
+(autoload 'helm-define-multi-key "helm" "\
+In KEYMAP, define key sequence KEY for function list FUNCTIONS.
+Each function run sequentially each time the key KEY is pressed.
+If DELAY is specified switch back to initial function of FUNCTIONS list
+after DELAY seconds.
+The functions in FUNCTIONS list are functions with no args.
+e.g
+  (defun foo ()
+    (message \"Run foo\"))
+  (defun bar ()
+    (message \"Run bar\"))
+  (defun baz ()
+    (message \"Run baz\"))
+
+\(helm-define-multi-key global-map \"<f5> q\" '(foo bar baz) 2)
+
+Each time \"<f5> q\" is pressed the next function is executed, if you wait
+More than 2 seconds, next hit will run again the first function and so on.
+
+\(fn KEYMAP KEY FUNCTIONS &optional DELAY)" nil nil)
+
+(autoload 'helm-multi-key-defun "helm" "\
+Define NAME as a multi-key command running FUNS.
+After DELAY seconds the FUNS list is reinitialised.
+See `helm-define-multi-key'.
+
+\(fn NAME DOCSTRING FUNS &optional DELAY)" nil t)
+
+(put 'helm-multi-key-defun 'lisp-indent-function '2)
+
+(autoload 'helm-define-key-with-subkeys "helm" "\
+Allow defining in MAP a KEY and SUBKEY to COMMAND.
+
+This allow typing KEY to call COMMAND the first time and
+type only SUBKEY on subsequent calls.
+
+Arg MAP is the keymap to use, SUBKEY is the initial short keybinding to
+call COMMAND.
+
+Arg OTHER-SUBKEYS is an alist specifying other short keybindings
+to use once started.
+e.g:
+
+\(helm-define-key-with-subkeys global-map
+   (kbd \"C-x v n\") ?n 'git-gutter:next-hunk '((?p . git-gutter:previous-hunk)))
+
+
+In this example, `C-x v n' will run `git-gutter:next-hunk'
+subsequent hits on \"n\" will run this command again
+and subsequent hits on \"p\" will run `git-gutter:previous-hunk'.
+
+Arg MENU is a string to display in minibuffer
+to describe SUBKEY and OTHER-SUBKEYS.
+Arg EXIT-FN specify a function to run on exit.
+
+Any other keys pressed run their assigned command defined in MAP
+and exit the loop running EXIT-FN if specified.
+
+NOTE: SUBKEY and OTHER-SUBKEYS bindings support
+only char syntax actually (e.g ?n)
+so don't use strings, vectors or whatever to define them.
+
+\(fn MAP KEY SUBKEY COMMAND &optional OTHER-SUBKEYS MENU EXIT-FN)" nil nil)
+
+(put 'helm-define-key-with-subkeys 'lisp-indent-function '1)
+
+(autoload 'helm-debug-open-last-log "helm" "\
+Open helm log file of last helm session.
+If `helm-last-log-file' is nil, switch to `helm-debug-buffer' .
+
+\(fn)" t nil)
+
+(autoload 'helm "helm" "\
+Main function to execute helm sources.
+
+Keywords supported:
+:sources :input :prompt :resume :preselect
+:buffer :keymap :default :history :allow-nest
+
+Extra LOCAL-VARS keywords are supported, see below.
+
+PLIST is a list like (:key1 val1 :key2 val2 ...) or
+\(&optional sources input prompt resume
+            preselect buffer keymap default history).
+
+Basic keywords are the following:
+
+:sources
+
+A list of sources used for this session.  It also accepts a
+symbol, interpreted as a variable of a helm source
+i.e (a symbol can be passed instead of a list of sources).
+It also accepts an alist representing a helm source, which is
+detected by (assq 'name ANY-SOURCES).
+NOTE: In this case the source is embedded in the helm command and
+have no symbol name, so it is not reachable from outside.
+It will be referenced in `helm-sources' as a whole alist.
+
+:input
+
+Temporary value of `helm-pattern', ie. initial input of minibuffer.
+
+:prompt
+
+Prompt other than \"pattern: \".
+
+:resume
+
+If t, Resurrect previously instance of `helm'.  Skip the initialization.
+If 'noresume, this instance of `helm' cannot be resumed.
+
+:preselect
+
+Initially selected candidate.  Specified by exact candidate or a regexp.
+
+:buffer
+
+`helm-buffer' instead of *helm*.
+
+:keymap
+
+`helm-map' for current `helm' session.
+
+:default
+
+A default argument that will be inserted in minibuffer with \\<minibuffer-local-map>\\[next-history-element].
+When nil or not present `thing-at-point' will be used instead.
+If `helm--maybe-use-default-as-input' is non--nil display will be
+updated using :default arg as input unless :input is specified,
+which in this case will take precedence on :default
+This is a string or a list, in this case the car of the list will
+be used as initial default input, but you will be able to cycle in this
+list with \\<minibuffer-local-map>\\[next-history-element].
+
+:history
+
+By default all minibuffer input is pushed to `minibuffer-history',
+if an argument HISTORY is provided, input will be pushed to HISTORY.
+History element should be a symbol.
+
+:allow-nest
+
+Allow running this helm command within a running helm session.
+
+Of course, conventional arguments are supported, the two are same.
+
+\(helm :sources sources :input input :prompt prompt :resume resume
+       :preselect preselect :buffer buffer :keymap keymap :default default
+       :history history)
+
+and
+
+\(helm sources input prompt resume preselect buffer keymap default history)
+
+are the same.
+
+However the use of non keyword args is deprecated and should not be used.
+
+Other keywords are interpreted as local variables of this helm session.
+The `helm-' prefix can be omitted.  For example,
+
+\(helm :sources 'helm-source-buffers-list
+       :buffer \"*buffers*\" :candidate-number-limit 10)
+
+means starting helm session with `helm-source-buffers'
+source in *buffers* buffer and set variable `helm-candidate-number-limit'
+to 10 as session local variable.
+
+\(fn &key SOURCES INPUT PROMPT RESUME PRESELECT BUFFER KEYMAP DEFAULT HISTORY ALLOW-NEST OTHER-LOCAL-VARS)" nil nil)
+
+(autoload 'helm-other-buffer "helm" "\
+Simplified interface of `helm' with other `helm-buffer'.
+Call `helm' with only ANY-SOURCES and ANY-BUFFER as args.
+
+\(fn ANY-SOURCES ANY-BUFFER)" nil nil)
+
+(autoload 'helm-debug-toggle "helm" "\
+Enable/disable helm debug from outside of helm session.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("helm-core-pkg.el" "helm-lib.el" "helm-multi-match.el"
+;;;;;;  "helm-source.el") (22171 46562 961817 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; helm-core-autoloads.el ends here
diff --git a/emacs.d/elpa/helm-core-20160116.2343/helm-core-pkg.el b/emacs.d/elpa/helm-core-20160116.2343/helm-core-pkg.el
new file mode 100644
index 0000000..1aeaf17
--- /dev/null
+++ b/emacs.d/elpa/helm-core-20160116.2343/helm-core-pkg.el
@@ -0,0 +1,8 @@
+(define-package "helm-core" "20160116.2343" "Development files for Helm"
+  '((emacs "24")
+    (cl-lib "0.5")
+    (async "1.6"))
+  :url "https://emacs-helm.github.io/helm/")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/helm-core-20160116.2343/helm-lib.el b/emacs.d/elpa/helm-core-20160116.2343/helm-lib.el
new file mode 100644
index 0000000..e4005f5
--- /dev/null
+++ b/emacs.d/elpa/helm-core-20160116.2343/helm-lib.el
@@ -0,0 +1,683 @@
+;;; helm-lib.el --- Helm routines. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: http://github.com/emacs-helm/helm
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;; All helm functions that don't require specific helm code should go here.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'dired)
+
+
+;;; User vars.
+;;
+(defcustom helm-file-globstar t
+  "Same as globstar bash shopt option.
+When non--nil a pattern beginning with two stars will expand recursively.
+Directories expansion is not supported yet."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-yank-text-at-point-function nil
+  "The function used to forward point with `helm-yank-text-at-point'.
+With a nil value, fallback to default `forward-word'.
+The function should take one arg, an integer like `forward-word'.
+NOTE: Using `forward-symbol' here is not very useful as it is already
+provided by \\<helm-map>\\[next-history-element]."
+  :type  'function
+  :group 'helm)
+
+(defcustom helm-scroll-amount nil
+  "Scroll amount when scrolling other window in a helm session.
+It is used by `helm-scroll-other-window'
+and `helm-scroll-other-window-down'.
+
+If you prefer scrolling line by line, set this value to 1."
+  :group 'helm
+  :type 'integer)
+
+
+;;; Internal vars
+;;
+(defvar helm-yank-point nil)
+(defvar helm-pattern ""
+  "The input pattern used to update the helm buffer.")
+(defvar helm-buffer "*helm*"
+  "Buffer showing completions.")
+(defvar helm-current-buffer nil
+  "Current buffer when `helm' is invoked.")
+(defvar helm-suspend-update-flag nil)
+(defvar helm-action-buffer "*helm action*"
+  "Buffer showing actions.")
+
+;;; Macros helper.
+;;
+(defmacro helm-with-gensyms (symbols &rest body)
+  "Bind the SYMBOLS to fresh uninterned symbols and eval BODY."
+  (declare (indent 1))
+  `(let ,(mapcar (lambda (s)
+                   ;; Use cl-gensym here instead of make-symbol
+                   ;; to ensure a symbol that have a live that go
+                   ;; beyond the live of its macro have different name.
+                   ;; i.e symbols created with `with-helm-temp-hook'
+                   ;; should have random names.
+                   `(,s (cl-gensym (symbol-name ',s))))
+                 symbols)
+     ,@body))
+
+;;; Iterators
+;;
+(defun helm-iter-list (seq)
+  "Return an iterator object from SEQ."
+  (let ((lis seq))
+    (lambda ()
+      (let ((elm (car lis)))
+        (setq lis (cdr lis))
+        elm))))
+
+(defun helm-iter-next (iterator)
+  "Return next elm of ITERATOR."
+  (funcall iterator))
+
+(defun helm-make-actions (&rest args)
+  "Build an alist with (NAME . ACTION) elements with each pairs in ARGS.
+Where NAME is a string or a function returning a string or nil and ACTION
+a function.
+If NAME returns nil the pair is skipped.
+
+\(fn NAME ACTION ...)"
+  (cl-loop for i on args by #'cddr
+           for name  = (car i)
+           when (functionp name)
+           do (setq name (funcall name))
+           when name
+           collect (cons name (cadr i))))
+
+(defmacro helm-aif (test-form then-form &rest else-forms)
+  "Like `if' but set the result of TEST-FORM in a temprary variable called `it'.
+THEN-FORM and ELSE-FORMS are then excuted just like in `if'."
+  (declare (indent 2) (debug t))
+  `(let ((it ,test-form))
+     (if it ,then-form ,@else-forms)))
+
+(defun helm-current-line-contents ()
+  "Current line string without properties."
+  (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
+
+;;; Fuzzy matching routines
+;;
+(defsubst helm--mapconcat-pattern (pattern)
+  "Transform string PATTERN in regexp for further fuzzy matching.
+e.g helm.el$
+    => \"[^h]*h[^e]*e[^l]*l[^m]*m[^.]*[.][^e]*e[^l]*l$\"
+    ^helm.el$
+    => \"helm[.]el$\"."
+  (let ((ls (split-string-and-unquote pattern "")))
+    (if (string= "^" (car ls))
+        ;; Exact match.
+        (mapconcat (lambda (c)
+                     (if (and (string= c "$")
+                              (string-match "$\\'" pattern))
+                         c (regexp-quote c)))
+                   (cdr ls) "")
+        ;; Fuzzy match.
+        (mapconcat (lambda (c)
+                     (if (and (string= c "$")
+                              (string-match "$\\'" pattern))
+                         c (format "[^%s]*%s" c (regexp-quote c))))
+                   ls ""))))
+
+(defsubst helm--collect-pairs-in-string (string)
+  (cl-loop for str on (split-string string "" t) by 'cdr
+           when (cdr str)
+           collect (list (car str) (cadr str))))
+
+;;; Help routines.
+;;
+(defun helm-help-internal (bufname insert-content-fn)
+  "Show long message during `helm' session in BUFNAME.
+INSERT-CONTENT-FN is the function that insert
+text to be displayed in BUFNAME."
+  (let ((winconf (current-frame-configuration)))
+    (unwind-protect
+         (progn
+           (setq helm-suspend-update-flag t)
+           (set-buffer (get-buffer-create bufname))
+           (switch-to-buffer bufname)
+           (delete-other-windows)
+           (delete-region (point-min) (point-max))
+           (org-mode)
+           (save-excursion
+             (funcall insert-content-fn))
+           (setq cursor-type nil)
+           (buffer-disable-undo)
+           (helm-help-event-loop))
+      (setq helm-suspend-update-flag nil)
+      (set-frame-configuration winconf))))
+
+(defun helm-help-scroll-up (amount)
+  (condition-case _err
+      (scroll-up-command amount)
+    (beginning-of-buffer nil)
+    (end-of-buffer nil)))
+
+(defun helm-help-scroll-down (amount)
+  (condition-case _err
+      (scroll-down-command amount)
+    (beginning-of-buffer nil)
+    (end-of-buffer nil)))
+
+(defun helm-help-event-loop ()
+  (let ((prompt (propertize
+                 "[SPC,C-v,down,next:NextPage  b,M-v,up,prior:PrevPage C-s/r:Isearch q:Quit]"
+                 'face 'helm-helper))
+        scroll-error-top-bottom)
+    (cl-loop for event = (read-key prompt) do
+             (cl-case event
+               ((?\C-v ? down next) (helm-help-scroll-up helm-scroll-amount))
+               ((?\M-v ?b up prior) (helm-help-scroll-down helm-scroll-amount))
+               (?\C-s (isearch-forward))
+               (?\C-r (isearch-backward))
+               (?q (cl-return))
+               (t (ignore))))))
+
+
+;;; List processing
+;;
+(defun helm-flatten-list (seq &optional omit-nulls)
+  "Return a list of all single elements of sublists in SEQ."
+  (let (result)
+    (cl-labels ((flatten (seq)
+                  (cl-loop
+                        for elm in seq
+                        if (and (or elm
+                                    (null omit-nulls))
+                                (or (atom elm)
+                                    (functionp elm)
+                                    (and (consp elm)
+                                         (cdr elm)
+                                         (atom (cdr elm)))))
+                        do (push elm result)
+                        else do (flatten elm))))
+      (flatten seq))
+    (nreverse result)))
+
+(defun helm-mklist (obj)
+  "If OBJ is a list \(but not lambda\), return itself.
+Otherwise make a list with one element."
+  (if (and (listp obj) (not (functionp obj)))
+      obj
+    (list obj)))
+
+(cl-defmacro helm-position (item seq &key (test 'eq) all)
+  "A simple and faster replacement of CL `position'.
+Return position of first occurence of ITEM found in SEQ.
+Argument SEQ can be a string, in this case ITEM have to be a char.
+Argument ALL, if non--nil specify to return a list of positions of
+all ITEM found in SEQ."
+  (let ((key (if (stringp seq) 'across 'in)))
+    `(cl-loop for c ,key ,seq
+           for index from 0
+           when (funcall ,test c ,item)
+           if ,all collect index into ls
+           else return index
+           finally return ls)))
+
+(cl-defun helm-fast-remove-dups (seq &key (test 'eq))
+  "Remove duplicates elements in list SEQ.
+This is same as `remove-duplicates' but with memoisation.
+It is much faster, especially in large lists.
+A test function can be provided with TEST argument key.
+Default is `eq'."
+  (cl-loop with cont = (make-hash-table :test test)
+        for elm in seq
+        unless (gethash elm cont)
+        do (puthash elm elm cont)
+        finally return
+        (cl-loop for i being the hash-values in cont collect i)))
+
+(defun helm-skip-entries (seq black-regexp-list &optional white-regexp-list)
+  "Remove entries which matches one of REGEXP-LIST from SEQ."
+  (cl-loop for i in seq
+           unless (and (cl-loop for re in black-regexp-list
+                                thereis (and (stringp i)
+                                             (string-match-p re i)))
+                       (null
+                        (cl-loop for re in white-regexp-list
+                                thereis (and (stringp i)
+                                             (string-match-p re i)))))
+           collect i))
+
+(defun helm-shadow-entries (seq regexp-list)
+  "Put shadow property on entries in SEQ matching a regexp in REGEXP-LIST."
+  (let ((face 'italic))
+    (cl-loop for i in seq
+          if (cl-loop for regexp in regexp-list
+                   thereis (and (stringp i)
+                                (string-match regexp i)))
+          collect (propertize i 'face face)
+          else collect i)))
+
+(defun helm-remove-if-not-match (regexp seq)
+  "Remove all elements of SEQ that don't match REGEXP."
+  (cl-loop for s in seq
+           for str = (cond ((symbolp s)
+                            (symbol-name s))
+                           ((consp s)
+                            (car s))
+                           (t s))
+           when (string-match-p regexp str)
+           collect s))
+
+(defun helm-remove-if-match (regexp seq)
+  "Remove all elements of SEQ that match REGEXP."
+  (cl-loop for s in seq
+           for str = (cond ((symbolp s)
+                            (symbol-name s))
+                           ((consp s)
+                            (car s))
+                           (t s))
+           unless (string-match-p regexp str)
+           collect s))
+
+(defun helm-transform-mapcar (function args)
+  "`mapcar' for candidate-transformer.
+
+ARGS is (cand1 cand2 ...) or ((disp1 . real1) (disp2 . real2) ...)
+
+\(helm-transform-mapcar 'upcase '(\"foo\" \"bar\"))
+=> (\"FOO\" \"BAR\")
+\(helm-transform-mapcar 'upcase '((\"1st\" . \"foo\") (\"2nd\" . \"bar\")))
+=> ((\"1st\" . \"FOO\") (\"2nd\" . \"BAR\"))
+"
+  (cl-loop for arg in args
+        if (consp arg)
+        collect (cons (car arg) (funcall function (cdr arg)))
+        else
+        collect (funcall function arg)))
+
+;;; Strings processing.
+;;
+(defun helm-stringify (str-or-sym)
+  "Get string of STR-OR-SYM."
+  (if (stringp str-or-sym)
+      str-or-sym
+    (symbol-name str-or-sym)))
+
+(defun helm-substring (str width)
+  "Return the substring of string STR from 0 to WIDTH.
+Handle multibyte characters by moving by columns."
+  (with-temp-buffer
+    (save-excursion
+      (insert str))
+    (move-to-column width)
+    (buffer-substring (point-at-bol) (point))))
+
+(defun helm-substring-by-width (str width &optional endstr)
+  "Truncate string STR to end at column WIDTH.
+Similar to `truncate-string-to-width'.
+Add ENDSTR at end of truncated STR.
+Add spaces at end if needed to reach WIDTH when STR is shorter than WIDTH."
+  (cl-loop for ini-str = str
+        then (substring ini-str 0 (1- (length ini-str)))
+        for sw = (string-width ini-str)
+        when (<= sw width) return
+        (concat ini-str endstr (make-string (- width sw) ? ))))
+
+(defun helm-string-multibyte-p (str)
+  "Check if string STR contains multibyte characters."
+  (cl-loop for c across str
+        thereis (> (char-width c) 1)))
+
+(defun helm-get-pid-from-process-name (process-name)
+  "Get pid from running process PROCESS-NAME."
+  (cl-loop with process-list = (list-system-processes)
+        for pid in process-list
+        for process = (assoc-default 'comm (process-attributes pid))
+        when (and process (string-match process-name process))
+        return pid))
+
+(defun helm-ff-find-printers ()
+  "Return a list of available printers on Unix systems."
+  (when (executable-find "lpstat")
+    (let ((printer-list (with-temp-buffer
+                          (call-process "lpstat" nil t nil "-a")
+                          (split-string (buffer-string) "\n"))))
+      (cl-loop for p in printer-list
+            for printer = (car (split-string p))
+            when printer
+            collect printer))))
+
+(defun helm-region-active-p ()
+  (and transient-mark-mode mark-active (/= (mark) (point))))
+
+(defun helm-quote-whitespace (candidate)
+  "Quote whitespace, if some, in string CANDIDATE."
+  (replace-regexp-in-string " " "\\\\ " candidate))
+
+
+;;; Symbols routines
+;;
+(defun helm-symbolify (str-or-sym)
+  "Get symbol of STR-OR-SYM."
+  (if (symbolp str-or-sym)
+      str-or-sym
+    (intern str-or-sym)))
+
+(defun helm-symbol-name (obj)
+  (if (or (consp obj) (byte-code-function-p obj))
+      "Anonymous"
+      (symbol-name obj)))
+
+(defun helm-describe-function (func)
+  "FUNC is symbol or string."
+  (describe-function (helm-symbolify func))
+  (message nil))
+
+(defun helm-describe-variable (var)
+  "VAR is symbol or string."
+  (describe-variable (helm-symbolify var))
+  (message nil))
+
+(defun helm-describe-face (face)
+  "VAR is symbol or string."
+  (describe-face (helm-symbolify face))
+  (message nil))
+
+(defun helm-find-function (func)
+  "FUNC is symbol or string."
+  (find-function (helm-symbolify func)))
+
+(defun helm-find-variable (var)
+  "VAR is symbol or string."
+  (find-variable (helm-symbolify var)))
+
+(defun helm-find-face-definition (face)
+  "FACE is symbol or string."
+  (find-face-definition (helm-symbolify face)))
+
+(defun helm-kill-new (candidate &optional replace)
+  "CANDIDATE is symbol or string.
+See `kill-new' for argument REPLACE."
+  (kill-new (helm-stringify candidate) replace))
+
+;;; Files routines
+;;
+(defun helm-file-name-sans-extension (filename)
+  "Same as `file-name-sans-extension' but remove all extensions."
+  (helm-aif (file-name-sans-extension filename)
+      ;; Start searching at index 1 for files beginning with a dot (#1335).
+      (if (string-match "\\." (helm-basename it) 1)
+          (helm-file-name-sans-extension it)
+          it)))
+
+(defun helm-basename (fname &optional ext)
+  "Print FNAME  with any  leading directory  components removed.
+If specified, also remove filename extension EXT.
+Arg EXT can be specified as a string with or without dot."
+  (let ((non-essential t))
+    (if (and ext (or (string= (file-name-extension fname) ext)
+                     (string= (file-name-extension fname t) ext))
+             (not (file-directory-p fname)))
+        (file-name-sans-extension (file-name-nondirectory fname))
+      (file-name-nondirectory (directory-file-name fname)))))
+
+(defun helm-basedir (fname)
+  "Return the base directory of filename ending by a slash."
+  (helm-aif (and fname
+                 (or (and (string= fname "~") "~")
+                     (file-name-directory fname)))
+      (file-name-as-directory it)))
+
+(defun helm-current-directory ()
+  "Return current-directory name at point.
+Useful in dired buffers when there is inserted subdirs."
+  (expand-file-name
+   (if (eq major-mode 'dired-mode)
+       (dired-current-directory)
+       default-directory)))
+
+(defun helm-w32-prepare-filename (file)
+  "Convert filename FILE to something usable by external w32 executables."
+  (replace-regexp-in-string ; For UNC paths
+   "/" "\\"
+   (replace-regexp-in-string ; Strip cygdrive paths
+    "/cygdrive/\\(.\\)" "\\1:"
+    file nil nil) nil t))
+
+(defun helm-w32-shell-execute-open-file (file)
+  (interactive "fOpen file:")
+  (with-no-warnings
+    (w32-shell-execute "open" (helm-w32-prepare-filename file))))
+
+;; Same as `vc-directory-exclusion-list'.
+(defvar helm-walk-ignore-directories
+  '("SCCS" "RCS" "CVS" "MCVS" ".svn" ".git" ".hg" ".bzr"
+    "_MTN" "_darcs" "{arch}" ".gvfs"))
+
+(cl-defun helm-walk-directory (directory &key (path 'basename)
+                                           (directories t)
+                                           match skip-subdirs)
+  "Walk through DIRECTORY tree.
+Argument PATH can be one of basename, relative, full, or a function
+called on file name, default to basename.
+Argument DIRECTORIES when non--nil (default) return also directories names,
+otherwise skip directories names.
+Argument MATCH can be a predicate or a regexp.
+Argument SKIP-SUBDIRS when non--nil will skip `helm-walk-ignore-directories'
+unless it is given as a list of directories, in this case this list will be used
+instead of `helm-walk-ignore-directories'."
+  (let* ((result '())
+         (fn (cl-case path
+               (basename 'file-name-nondirectory)
+               (relative 'file-relative-name)
+               (full     'identity)
+               (t        path))))
+    (cl-labels ((ls-rec (dir)
+                  (unless (and skip-subdirs
+                               (member (helm-basename dir)
+                                       (if (listp skip-subdirs)
+                                           skip-subdirs
+                                         helm-walk-ignore-directories)))
+                    (cl-loop with ls = (sort (file-name-all-completions "" dir)
+                                             'string-lessp)
+                          for f in ls
+                          ;; Use `directory-file-name' to remove the final slash.
+                          ;; Needed to avoid infloop on symlinks symlinking
+                          ;; a directory inside it [1].
+                          for file = (directory-file-name
+                                      (expand-file-name f dir))
+                          unless (member f '("./" "../"))
+                          ;; A directory.
+                          if (char-equal (aref f (1- (length f))) ?/)
+                          do (progn (when directories
+                                      (push (funcall fn file) result))
+                                    ;; Don't recurse in symlinks.
+                                    ;; `file-symlink-p' have to be called
+                                    ;; on the directory with its final
+                                    ;; slash removed [1].
+                                    (and (not (file-symlink-p file))
+                                         (ls-rec file)))
+                          else do
+                          (if match
+                              (and (if (functionp match)
+                                       (funcall match f)
+                                     (and (stringp match)
+                                          (string-match match f)))
+                                   (push (funcall fn file) result))
+                            (push (funcall fn file) result))))))
+      (ls-rec directory)
+      (nreverse result))))
+
+(defun helm-file-expand-wildcards (pattern &optional full)
+  "Same as `file-expand-wildcards' but allow recursion.
+Recursion happen when PATTERN starts with two stars.
+Directories expansion is not supported."
+  (let ((bn (helm-basename pattern)))
+    (if (and helm-file-globstar
+             (string-match "\\`\\*\\{2\\}\\(.*\\)" bn))
+        (helm-walk-directory (helm-basedir pattern)
+                             :path (cl-case full
+                                     (full 'full)
+                                     (relative 'relative)
+                                     ((basename nil) 'basename)
+                                     (t 'full))
+                             :directories nil
+                             :match (wildcard-to-regexp bn)
+                             :skip-subdirs t)
+        (file-expand-wildcards pattern full))))
+
+;;; helm internals
+;;
+(defun helm-set-pattern (pattern &optional noupdate)
+  "Set minibuffer contents to PATTERN.
+if optional NOUPDATE is non-nil, helm buffer is not changed."
+  (with-selected-window (or (active-minibuffer-window) (minibuffer-window))
+    (delete-minibuffer-contents)
+    (insert pattern))
+  (when noupdate
+    (setq helm-pattern pattern)))
+
+(defun helm-minibuffer-completion-contents ()
+  "Return the user input in a minibuffer before point as a string.
+That is what completion commands operate on."
+  (buffer-substring (field-beginning) (point)))
+
+(defmacro with-helm-buffer (&rest body)
+  "Eval BODY inside `helm-buffer'."
+  (declare (indent 0) (debug t))
+  `(with-current-buffer (helm-buffer-get)
+     ,@body))
+
+(defmacro with-helm-current-buffer (&rest body)
+  "Eval BODY inside `helm-current-buffer'."
+  (declare (indent 0) (debug t))
+  `(with-current-buffer (or (and (buffer-live-p helm-current-buffer)
+                                 helm-current-buffer)
+                            (setq helm-current-buffer
+                                  (current-buffer)))
+     ,@body))
+
+(defun helm-buffer-get ()
+  "Return `helm-action-buffer' if shown otherwise `helm-buffer'."
+  (if (helm-action-window)
+      helm-action-buffer
+    helm-buffer))
+
+(defun helm-window ()
+  "Window of `helm-buffer'."
+  (get-buffer-window (helm-buffer-get) 0))
+
+(defun helm-action-window ()
+  "Window of `helm-action-buffer'."
+  (get-buffer-window helm-action-buffer 'visible))
+
+(defmacro with-helm-window (&rest body)
+  "Be sure BODY is excuted in the helm window."
+  (declare (indent 0) (debug t))
+  `(with-selected-window (helm-window)
+     ,@body))
+
+
+;; Yank text at point.
+;;
+;;
+(defun helm-yank-text-at-point ()
+  "Yank text at point in `helm-current-buffer' into minibuffer."
+  (interactive)
+  (with-helm-current-buffer
+    (let ((fwd-fn (or helm-yank-text-at-point-function #'forward-word)))
+      ;; Start to initial point if C-w have never been hit.
+      (unless helm-yank-point (setq helm-yank-point (point)))
+      (save-excursion
+        (goto-char helm-yank-point)
+        (funcall fwd-fn 1)
+        (helm-set-pattern
+         (concat
+          helm-pattern (replace-regexp-in-string
+                        "\\`\n" ""
+                        (buffer-substring-no-properties
+                         helm-yank-point (point)))))
+        (setq helm-yank-point (point))))))
+
+(defun helm-reset-yank-point ()
+  (setq helm-yank-point nil))
+
+(add-hook 'helm-cleanup-hook 'helm-reset-yank-point)
+(add-hook 'helm-after-initialize-hook 'helm-reset-yank-point)
+
+;;; Ansi
+;;
+;;
+(defvar helm--ansi-color-regexp
+  "\033\\[\\(K\\|[0-9;]*m\\)")
+(defvar helm--ansi-color-drop-regexp
+  "\033\\[\\([ABCDsuK]\\|[12][JK]\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)")
+(defun helm--ansi-color-apply (string)
+  "A version of `ansi-color-apply' immune to upstream changes.
+
+Similar to the emacs-24.5 version without support to `ansi-color-context'
+which is buggy in emacs.
+
+Modify also `ansi-color-regexp' by using own variable `helm--ansi-color-regexp'
+that match whole STRING.
+
+This is needed to provide compatibility for both emacs-25 and emacs-24.5
+as emacs-25 version of `ansi-color-apply' is partially broken."
+  (let ((start 0)
+        codes end escape-sequence
+        result colorized-substring)
+    ;; Find the next escape sequence.
+    (while (setq end (string-match helm--ansi-color-regexp string start))
+      (setq escape-sequence (match-string 1 string))
+      ;; Colorize the old block from start to end using old face.
+      (when codes
+        (put-text-property
+         start end 'font-lock-face (ansi-color--find-face codes) string))
+      (setq colorized-substring (substring string start end)
+            start (match-end 0))
+      ;; Eliminate unrecognized ANSI sequences.
+      (while (string-match helm--ansi-color-drop-regexp colorized-substring)
+        (setq colorized-substring
+              (replace-match "" nil nil colorized-substring)))
+      (push colorized-substring result)
+      ;; Create new face, by applying escape sequence parameters.
+      (setq codes (ansi-color-apply-sequence escape-sequence codes)))
+    ;; If the rest of the string should have a face, put it there.
+    (when codes
+      (put-text-property
+       start (length string)
+       'font-lock-face (ansi-color--find-face codes) string))
+    ;; Save the remainder of the string to the result.
+    (if (string-match "\033" string start)
+        (push (substring string start (match-beginning 0)) result)
+        (push (substring string start) result))
+    (apply 'concat (nreverse result))))
+
+(provide 'helm-lib)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-lib ends here
diff --git a/emacs.d/elpa/helm-core-20160116.2343/helm-multi-match.el b/emacs.d/elpa/helm-core-20160116.2343/helm-multi-match.el
new file mode 100644
index 0000000..3e740da
--- /dev/null
+++ b/emacs.d/elpa/helm-core-20160116.2343/helm-multi-match.el
@@ -0,0 +1,373 @@
+;;; helm-multi-match.el --- Multiple regexp matching methods for helm -*- lexical-binding: t -*-
+
+;; Original Author: rubikitch
+
+;; Copyright (C) 2008 ~ 2011 rubikitch
+;; Copyright (C) 2011 ~ 2015 Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: http://github.com/emacs-helm/helm
+
+;; 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/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'helm-lib)
+
+
+(defgroup helm-multi-match nil
+  "Helm multi match."
+  :group 'helm)
+
+(defcustom helm-mm-matching-method 'multi3
+  "Matching method for helm match plugin.
+You can set here different methods to match candidates in helm.
+Here are the possible value of this symbol and their meaning:
+- multi1: Respect order, prefix of pattern must match.
+- multi2: Same but with partial match.
+- multi3: The best, multiple regexp match, allow negation.
+- multi3p: Same but prefix must match.
+
+Default is multi3, you should keep this for a better experience.
+
+Note that multi1 and multi3p are incompatible with fuzzy matching
+in file completion and by the way fuzzy matching will be disabled there
+when these options are used."
+  :type  '(radio :tag "Matching methods for helm"
+           (const :tag "Multiple regexp 1 ordered with prefix match"         multi1)
+           (const :tag "Multiple regexp 2 ordered with partial match"        multi2)
+           (const :tag "Multiple regexp 3 matching no order, partial, best." multi3)
+           (const :tag "Multiple regexp 3p matching with prefix match"       multi3p))
+  :group 'helm-multi-match)
+
+
+;; Internal
+(defconst helm-mm-default-match-functions
+  '(helm-mm-exact-match helm-mm-match))
+(defconst helm-mm-default-search-functions
+  '(helm-mm-exact-search helm-mm-search))
+
+
+;;; Build regexps
+;;
+;;
+(defvar helm-mm-space-regexp "[\\ ] "
+  "Regexp to represent space itself in multiple regexp match.")
+
+(defun helm-mm-split-pattern (pattern)
+  "Split PATTERN if it contain spaces and return resulting list.
+If spaces in PATTERN are escaped, don't split at this place.
+i.e \"foo bar\"=> (\"foo\" \"bar\")
+but \"foo\ bar\"=> (\"foobar\")."
+  (if (string= pattern "")
+      '("")
+    (cl-loop for s in (split-string
+                       (replace-regexp-in-string helm-mm-space-regexp
+                                                 "\000\000" pattern)
+                       " " t)
+          collect (replace-regexp-in-string "\000\000" " " s))))
+
+(defun helm-mm-1-make-regexp (pattern)
+  "Replace spaces in PATTERN with \"\.*\"."
+  (mapconcat 'identity (helm-mm-split-pattern pattern) ".*"))
+
+
+;;; Exact match.
+;;
+;;
+;; Internal.
+(defvar helm-mm-exact-pattern-str nil)
+(defvar helm-mm-exact-pattern-real nil)
+
+(defun helm-mm-exact-get-pattern (pattern)
+  (unless (equal pattern helm-mm-exact-pattern-str)
+    (setq helm-mm-exact-pattern-str pattern
+          helm-mm-exact-pattern-real (concat "\n" pattern "\n")))
+  helm-mm-exact-pattern-real)
+
+
+(cl-defun helm-mm-exact-match (str &optional (pattern helm-pattern))
+  (if case-fold-search
+      (progn
+        (setq str (downcase str)
+              pattern (downcase pattern))
+        (string= str pattern))
+      (string= str pattern)))
+
+(defun helm-mm-exact-search (pattern &rest _ignore)
+  (and (search-forward (helm-mm-exact-get-pattern pattern) nil t)
+       (forward-line -1)))
+
+
+;;; Prefix match
+;;
+;;
+;; Internal
+(defvar helm-mm-prefix-pattern-str nil)
+(defvar helm-mm-prefix-pattern-real nil)
+
+(defun helm-mm-prefix-get-pattern (pattern)
+  (unless (equal pattern helm-mm-prefix-pattern-str)
+    (setq helm-mm-prefix-pattern-str pattern
+          helm-mm-prefix-pattern-real (concat "\n" pattern)))
+  helm-mm-prefix-pattern-real)
+
+(defun helm-mm-prefix-match (str &optional pattern)
+  ;; In filename completion basename and basedir may be
+  ;; quoted, unquote them for string comparison (Issue #1283).
+  (setq pattern (replace-regexp-in-string
+                 "\\\\" "" (or pattern helm-pattern)))
+  (let ((len (length pattern)))
+    (and (<= len (length str))
+         (string= (substring str 0 len) pattern ))))
+
+(defun helm-mm-prefix-search (pattern &rest _ignore)
+  (search-forward (helm-mm-prefix-get-pattern pattern) nil t))
+
+
+;;; Multiple regexp patterns 1 (order is preserved / prefix).
+;;
+;;
+;; Internal
+(defvar helm-mm-1-pattern-str nil)
+(defvar helm-mm-1-pattern-real nil)
+
+(defun helm-mm-1-get-pattern (pattern)
+  (unless (equal pattern helm-mm-1-pattern-str)
+    (setq helm-mm-1-pattern-str pattern
+          helm-mm-1-pattern-real
+          (concat "^" (helm-mm-1-make-regexp pattern))))
+  helm-mm-1-pattern-real)
+
+(cl-defun helm-mm-1-match (str &optional (pattern helm-pattern))
+  (string-match (helm-mm-1-get-pattern pattern) str))
+
+(defun helm-mm-1-search (pattern &rest _ignore)
+  (re-search-forward (helm-mm-1-get-pattern pattern) nil t))
+
+
+;;; Multiple regexp patterns 2 (order is preserved / partial).
+;;
+;;
+;; Internal
+(defvar helm-mm-2-pattern-str nil)
+(defvar helm-mm-2-pattern-real nil)
+
+(defun helm-mm-2-get-pattern (pattern)
+  (unless (equal pattern helm-mm-2-pattern-str)
+    (setq helm-mm-2-pattern-str pattern
+          helm-mm-2-pattern-real
+          (concat "^.*" (helm-mm-1-make-regexp pattern))))
+  helm-mm-2-pattern-real)
+
+(cl-defun helm-mm-2-match (str &optional (pattern helm-pattern))
+  (string-match (helm-mm-2-get-pattern pattern) str))
+
+(defun helm-mm-2-search (pattern &rest _ignore)
+  (re-search-forward (helm-mm-2-get-pattern pattern) nil t))
+
+
+;;; Multiple regexp patterns 3 (permutation).
+;;
+;;
+;; Internal
+(defvar helm-mm-3-pattern-str nil)
+(defvar helm-mm-3-pattern-list nil)
+
+(defun helm-mm-3-get-patterns (pattern)
+  "Return `helm-mm-3-pattern-list', a list of predicate/regexp cons cells.
+e.g ((identity . \"foo\") (identity . \"bar\")).
+This is done only if `helm-mm-3-pattern-str' is same as PATTERN."
+  (unless (equal pattern helm-mm-3-pattern-str)
+    (setq helm-mm-3-pattern-str pattern
+          helm-mm-3-pattern-list
+          (helm-mm-3-get-patterns-internal pattern)))
+  helm-mm-3-pattern-list)
+
+(defun helm-mm-3-get-patterns-internal (pattern)
+  "Return a list of predicate/regexp cons cells.
+e.g ((identity . \"foo\") (identity . \"bar\"))."
+  (unless (string= pattern "")
+    (cl-loop for pat in (helm-mm-split-pattern pattern)
+          collect (if (string= "!" (substring pat 0 1))
+                      (cons 'not (substring pat 1))
+                    (cons 'identity pat)))))
+
+(cl-defun helm-mm-3-match (str &optional (pattern helm-pattern))
+  "Check if PATTERN match STR.
+When PATTERN contain a space, it is splitted and matching is done
+with the several resulting regexps against STR.
+e.g \"bar foo\" will match \"foobar\" and \"barfoo\".
+Argument PATTERN, a string, is transformed in a list of
+cons cell with `helm-mm-3-get-patterns' if it contain a space.
+e.g \"foo bar\"=>((identity . \"foo\") (identity . \"bar\")).
+Then each predicate of cons cell(s) is called with regexp of same
+cons cell against STR (a candidate).
+i.e (identity (string-match \"foo\" \"foo bar\")) => t."
+  (let ((pat (helm-mm-3-get-patterns pattern)))
+    (cl-loop for (predicate . regexp) in pat
+             always (funcall predicate
+                             (condition-case _err
+                                 ;; FIXME: Probably do nothing when
+                                 ;; using fuzzy leaving the job
+                                 ;; to the fuzzy fn.
+                                 (string-match regexp str)
+                               (invalid-regexp nil))))))
+
+(defun helm-mm-3-search-base (pattern searchfn1 searchfn2)
+  "Try to find PATTERN in `helm-buffer' with SEARCHFN1 and SEARCHFN2.
+This is the search function for `candidates-in-buffer' enabled sources.
+Use the same method as `helm-mm-3-match' except it search in buffer
+instead of matching on a string.
+i.e (identity (re-search-forward \"foo\" (point-at-eol) t)) => t."
+  (cl-loop with pat = (if (stringp pattern)
+                          (helm-mm-3-get-patterns pattern)
+                          pattern)
+           when (eq (caar pat) 'not) return
+           ;; Pass the job to `helm-search-match-part'.
+           (prog1 (list (point-at-bol) (point-at-eol))
+             (forward-line 1))
+           while (condition-case _err
+                     (funcall searchfn1 (or (cdar pat) "") nil t)
+                   (invalid-regexp nil))
+           for bol = (point-at-bol)
+           for eol = (point-at-eol)
+           if (cl-loop for (pred . str) in (cdr pat) always
+                       (progn (goto-char bol)
+                              (funcall pred (condition-case _err
+                                                (funcall searchfn2 str eol t)
+                                              (invalid-regexp nil)))))
+           do (goto-char eol) and return t
+           else do (goto-char eol)
+           finally return nil))
+
+(defun helm-mm-3-search (pattern &rest _ignore)
+  (when (stringp pattern)
+    (setq pattern (helm-mm-3-get-patterns pattern)))
+  (helm-mm-3-search-base
+   pattern 're-search-forward 're-search-forward))
+
+;;; mp-3 with migemo
+;;
+;;
+(defvar helm-mm--previous-migemo-info nil
+  "[Internal] Cache previous migemo query.")
+(make-local-variable 'helm-mm--previous-migemo-info)
+
+(declare-function migemo-get-pattern "ext:migemo.el")
+(declare-function migemo-search-pattern-get "ext:migemo.el")
+
+(define-minor-mode helm-migemo-mode
+    "Enable migemo in helm.
+It will be available in the sources handling it,
+i.e the sources which have the slot :migemo with non--nil value."
+  :lighter " Hmio"
+  :group 'helm
+  :global t
+  (cl-assert (featurep 'migemo)
+             nil "No feature called migemo found, install migemo.el."))
+
+(defun helm-mm-migemo-get-pattern (pattern)
+  (let ((regex (migemo-get-pattern pattern)))
+    (if (ignore-errors (string-match regex "") t)
+        (concat regex "\\|" pattern) pattern)))
+
+(defun helm-mm-migemo-search-pattern-get (pattern)
+  (let ((regex (migemo-search-pattern-get pattern)))
+    (if (ignore-errors (string-match regex "") t)
+        (concat regex "\\|" pattern) pattern)))
+
+(defun helm-mm-migemo-string-match (pattern str)
+  "Migemo version of `string-match'."
+  (unless (assoc pattern helm-mm--previous-migemo-info)
+    (with-helm-buffer
+      (setq helm-mm--previous-migemo-info
+            (push (cons pattern (helm-mm-migemo-get-pattern pattern))
+                  helm-mm--previous-migemo-info))))
+  (string-match (assoc-default pattern helm-mm--previous-migemo-info) str))
+
+(cl-defun helm-mm-3-migemo-match (str &optional (pattern helm-pattern))
+  (and helm-migemo-mode
+       (cl-loop for (pred . re) in (helm-mm-3-get-patterns pattern)
+                always (funcall pred (helm-mm-migemo-string-match re str)))))
+
+(defun helm-mm-migemo-forward (word &optional bound noerror count)
+  (with-helm-buffer
+    (unless (assoc word helm-mm--previous-migemo-info)
+      (setq helm-mm--previous-migemo-info
+            (push (cons word (if (delq 'ascii (find-charset-string word))
+                                 word
+                               (helm-mm-migemo-search-pattern-get word)))
+                  helm-mm--previous-migemo-info))))
+  (re-search-forward
+   (assoc-default word helm-mm--previous-migemo-info) bound noerror count))
+
+(defun helm-mm-3-migemo-search (pattern &rest _ignore)
+  (and helm-migemo-mode
+       (helm-mm-3-search-base
+        pattern 'helm-mm-migemo-forward 'helm-mm-migemo-forward)))
+
+
+;;; mp-3p- (multiple regexp pattern 3 with prefix search)
+;;
+;;
+(defun helm-mm-3p-match (str &optional pattern)
+  "Check if PATTERN match STR.
+Same as `helm-mm-3-match' but more strict, matching against prefix also.
+e.g \"bar foo\" will match \"barfoo\" but not \"foobar\" contrarily to
+`helm-mm-3-match'."
+  (let* ((pat (helm-mm-3-get-patterns (or pattern helm-pattern)))
+         (first (car pat)))
+    (and (funcall (car first) (helm-mm-prefix-match str (cdr first)))
+         (cl-loop for (predicate . regexp) in (cdr pat)
+               always (funcall predicate (string-match regexp str))))))
+
+(defun helm-mm-3p-search (pattern &rest _ignore)
+  (when (stringp pattern)
+    (setq pattern (helm-mm-3-get-patterns pattern)))
+  (helm-mm-3-search-base
+   pattern 'helm-mm-prefix-search 're-search-forward))
+
+
+;;; Generic multi-match/search functions
+;;
+;;
+(cl-defun helm-mm-match (str &optional (pattern helm-pattern))
+  (let ((fun (cl-ecase helm-mm-matching-method
+               (multi1 #'helm-mm-1-match)
+               (multi2 #'helm-mm-2-match)
+               (multi3 #'helm-mm-3-match)
+               (multi3p #'helm-mm-3p-match))))
+    (funcall fun str pattern)))
+
+(defun helm-mm-search (pattern &rest _ignore)
+  (let ((fun (cl-ecase helm-mm-matching-method
+               (multi1 #'helm-mm-1-search)
+               (multi2 #'helm-mm-2-search)
+               (multi3 #'helm-mm-3-search)
+               (multi3p #'helm-mm-3p-search))))
+    (funcall fun pattern)))
+
+
+(provide 'helm-multi-match)
+
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-multi-match.el ends here
diff --git a/emacs.d/elpa/helm-core-20160116.2343/helm-source.el b/emacs.d/elpa/helm-core-20160116.2343/helm-source.el
new file mode 100644
index 0000000..71d22b5
--- /dev/null
+++ b/emacs.d/elpa/helm-core-20160116.2343/helm-source.el
@@ -0,0 +1,1016 @@
+;;; helm-source.el --- Helm source creation. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: http://github.com/emacs-helm/helm
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Interface to create helm sources easily.
+;; Actually the eieo objects are transformed in alist for compatibility.
+;; In the future this package should allow creating source as eieo objects
+;; without conversion to alist, teaching helm to read such a structure.
+;; The compatibility with alists would be kept.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'eieio)
+(require 'helm-lib)
+
+(defvar helm-fuzzy-sort-fn)
+(defvar helm-fuzzy-match-fn)
+(defvar helm-fuzzy-search-fn)
+
+(declare-function helm-init-candidates-in-buffer "helm.el")
+(declare-function helm-interpret-value "helm.el")
+(declare-function helm-fuzzy-highlight-matches "helm.el")
+
+
+(defgeneric helm--setup-source (source)
+  "Prepare slots and handle slot errors before creating a helm source.")
+
+(defgeneric helm-setup-user-source (source)
+  "Allow users modifying slots in SOURCE just before creation.")
+
+
+;;; Classes for sources
+;;
+;;
+(defclass helm-source ()
+  ((name
+    :initarg :name
+    :initform nil
+    :custom string
+    :documentation
+    "  The name of the source.
+  A string which is also the heading which appears
+  above the list of matches from the source. Must be unique.")
+
+   (header-name
+    :initarg :header-name
+    :initform nil
+    :custom function
+    :documentation
+    "  A function returning the display string of the header.
+  Its argument is the name of the source. This attribute is useful to
+  add an additional information with the source name.
+  It doesn't modify the name of the source.")
+
+   (init
+    :initarg :init
+    :initform nil
+    :custom function
+    :documentation
+    "  Function called with no parameters when helm is started.
+  It is useful for collecting current state information which can be
+  used to create the list of candidates later.
+  Initialization of `candidates-in-buffer' is done here
+  with `helm-init-candidates-in-buffer'.")
+
+   (candidates
+    :initarg :candidates
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  Specifies how to retrieve candidates from the source.
+  It can either be a variable name, a function called with no parameters
+  or the actual list of candidates.
+
+  The list must be a list whose members are strings, symbols
+  or (DISPLAY . REAL) pairs.
+
+  In case of (DISPLAY . REAL) pairs, the DISPLAY string is shown
+  in the Helm buffer, but the REAL one is used as action
+  argument when the candidate is selected. This allows a more
+  readable presentation for candidates which would otherwise be,
+  for example, too long or have a common part shared with other
+  candidates which can be safely replaced with an abbreviated
+  string for display purposes.
+
+  Note that if the (DISPLAY . REAL) form is used then pattern
+  matching is done on the displayed string, not on the real
+  value.")
+
+   (update
+    :initarg :update
+    :initform nil
+    :custom function
+    :documentation
+    "  Function called with no parameters at before \"init\" function
+  when `helm-force-update' is called.")
+
+   (cleanup
+    :initarg :cleanup
+    :initform nil
+    :custom function
+    :documentation
+    "  Function called with no parameters when *helm* buffer is
+  closed. It is useful for killing unneeded candidates buffer.
+
+  Note that the function is executed BEFORE performing action.")
+
+   (delayed
+    :initarg :delayed
+    :initform nil
+    :custom (choice null integer)
+    :documentation
+    "  Candidates from the source are shown only if the user stops
+  typing and is idle for `helm-idle-delay' seconds.
+  If a value is given to delayed attr, this value is used instead only
+  if it is > to `helm-idle-delay'.")
+
+   (keymap
+    :initarg :keymap
+    :initform nil
+    :custom sexp
+    :documentation
+    "  Specific keymap for this source.
+  It is useful to have a keymap per source when using more than
+  one source.  Otherwise, a keymap can be set per command with
+  `helm' argument KEYMAP.  NOTE: when a source have `helm-map' as
+  keymap attr, the global value of `helm-map' will override the
+  actual local one.")
+
+   (action
+    :initarg :action
+    :initform 'identity
+    :custom (alist :key-type string
+                   :value-type function)
+    :documentation
+    "  An alist of (DISPLAY . FUNCTION) pairs, a variable name  or a function.
+  FUNCTION is called with one parameter: the selected candidate.
+
+  An action other than the default can be chosen from this list
+  of actions for the currently selected candidate (by default
+  with TAB). The DISPLAY string is shown in the completions
+  buffer and the FUNCTION is invoked when an action is
+  selected. The first action of the list is the default.
+
+  You should use `helm-make-actions' to build this alist easily.")
+
+   (persistent-action
+    :initarg :persistent-action
+    :initform nil
+    :custom function
+    :documentation
+    "  Can be a either a Function called with one parameter (the
+  selected candidate) or a cons cell where first element is this
+  same function and second element a symbol (e.g never-split)
+  that inform `helm-execute-persistent-action'to not split his
+  window to execute this persistent action.")
+
+   (persistent-help
+    :initarg :persistent-help
+    :initform nil
+    :custom string
+    :documentation
+    "  A string to explain persistent-action of this source. It also
+  accepts a function or a variable name.
+  It will be displayed in `header-line'.
+  Have no effect when `helm-echo-input-in-header-line' is non--nil.")
+
+   (help-message
+    :initarg :help-message
+    :initform nil
+    :custom (choice string function)
+    :documentation
+    "  Help message for this source.
+  If not present, `helm-help-message' value will be used.")
+
+   (multiline
+    :initarg :multiline
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Enable to selection multiline candidates.")
+
+   (requires-pattern
+    :initarg :requires-pattern
+    :initform nil
+    :custom integer
+    :documentation
+    "  If present matches from the source are shown only if the
+  pattern is not empty. Optionally, it can have an integer
+  parameter specifying the required length of input which is
+  useful in case of sources with lots of candidates.")
+
+   (candidate-transformer
+    :initarg :candidate-transformer
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  It's a function or a list of functions called with one argument
+  when the completion list from the source is built. The argument
+  is the list of candidates retrieved from the source. The
+  function should return a transformed list of candidates which
+  will be used for the actual completion.  If it is a list of
+  functions, it calls each function sequentially.
+
+  This can be used to transform or remove items from the list of
+  candidates.
+
+  Note that `candidates' is run already, so the given transformer
+  function should also be able to handle candidates with (DISPLAY
+  . REAL) format.")
+
+   (filtered-candidate-transformer
+    :initarg :filtered-candidate-transformer
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  It has the same format as `candidate-transformer', except the
+  function is called with two parameters: the candidate list and
+  the source.
+
+  This transformer is run on the candidate list which is already
+  filtered by the current pattern. While `candidate-transformer'
+  is run only once, it is run every time the input pattern is
+  changed.
+
+  It can be used to transform the candidate list dynamically, for
+  example, based on the current pattern.
+
+  In some cases it may also be more efficent to perform candidate
+  transformation here, instead of with `candidate-transformer'
+  even if this transformation is done every time the pattern is
+  changed.  For example, if a candidate set is very large then
+  `candidate-transformer' transforms every candidate while only
+  some of them will actually be displayed due to the limit
+  imposed by `helm-candidate-number-limit'.
+
+  Note that `candidates' and `candidate-transformer' is run
+  already, so the given transformer function should also be able
+  to handle candidates with (DISPLAY . REAL) format.")
+
+   (filter-one-by-one
+    :initarg :filter-one-by-one
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  A transformer function that treat candidates one by one.
+  It is called with one arg the candidate.
+  It is faster than `filtered-candidate-transformer' or
+  `candidates-transformer', but should be used only in sources
+  that recompute constantly their candidates, e.g `helm-source-find-files'.
+  Filtering happen early and candidates are treated
+  one by one instead of re-looping on the whole list.
+  If used with `filtered-candidate-transformer' or `candidates-transformer'
+  these functions should treat the candidates transformed by the
+  `filter-one-by-one' function in consequence.")
+
+   (display-to-real
+    :initarg :display-to-real
+    :initform nil
+    :custom function
+    :documentation
+    "  Function called with one parameter; the selected candidate.
+
+  The function transforms the selected candidate, and the result
+  is passed to the action function.  The display-to-real
+  attribute provides another way to pass to action other string than
+  the one shown in Helm buffer.
+
+  Traditionally, it is possible to make candidates,
+  candidate-transformer or filtered-candidate-transformer
+  function return a list with (DISPLAY . REAL) pairs. But if REAL
+  can be generated from DISPLAY, display-to-real is more
+  convenient and faster.
+
+  NOTE: This is deprecated and you have better time using `filter-one-by-one'.")
+
+   (real-to-display
+    :initarg :real-to-display
+    :initform nil
+    :custom function
+    :documentation
+    "  Function called with one parameter; the selected candidate.
+  The real value of candidates will be shown in display.
+  See `display-to-real'.")
+
+   (action-transformer
+    :initarg :action-transformer
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  It's a function or a list of functions called with two
+  arguments when the action list from the source is
+  assembled. The first argument is the list of actions, the
+  second is the current selection.  If it is a list of functions,
+  it calls each function sequentially.
+
+  The function should return a transformed action list.
+
+  This can be used to customize the list of actions based on the
+  currently selected candidate.")
+
+   (pattern-transformer
+    :initarg :pattern-transformer
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  It's a function or a list of functions called with one argument
+  before computing matches. Its argument is `helm-pattern'.
+  Functions should return transformed `helm-pattern'.
+
+  It is useful to change interpretation of `helm-pattern'.")
+
+   (candidate-number-limit
+    :initarg :candidate-number-limit
+    :initform nil
+    :custom integer
+    :documentation
+    "  Override `helm-candidate-number-limit' only for this source.")
+
+   (volatile
+    :initarg :volatile
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Indicates the source assembles the candidate list dynamically,
+  so it shouldn't be cached within a single Helm
+  invocation. It is only applicable to synchronous sources,
+  because asynchronous sources are not cached.")
+
+   (match
+    :initarg :match
+    :initform nil
+    :custom (choice function list)
+    :documentation
+    "  List of functions called with one parameter: a candidate. The
+  function should return non-nil if the candidate matches the
+  current pattern (see variable `helm-pattern').
+
+  When using `candidates-in-buffer' its default value is `identity' and
+  don't have to be changed, use the `search' slot instead.
+
+  This attribute allows the source to override the default
+  pattern matching based on `string-match'. It can be used, for
+  example, to implement a source for file names and do the
+  pattern matching on the basename of files, since it's more
+  likely one is typing part of the basename when searching for a
+  file, instead of some string anywhere else in its path.
+
+  If the list contains more than one function then the list of
+  matching candidates from the source is constructed by appending
+  the results after invoking the first function on all the
+  potential candidates, then the next function, and so on. The
+  matching candidates supplied by the first function appear first
+  in the list of results and then results from the other
+  functions, respectively.
+
+  This attribute has no effect for asynchronous sources (see
+  attribute `candidates'), since they perform pattern matching
+  themselves.
+
+  Note that FUZZY-MATCH slot will overhide value of this slot.")
+
+   (fuzzy-match
+    :initarg :fuzzy-match
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Enable fuzzy matching in this source.
+  This will overwrite settings in MATCH slot, and for
+  sources built with child class `helm-source-in-buffer' the SEARCH slot.
+  This is an easy way of enabling fuzzy matching, but you can use the MATCH
+  or SEARCH slots yourself if you want something more elaborated, mixing
+  different type of match (See `helm-source-buffers' class for example).")
+
+   (nomark
+    :initarg :nomark
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Don't allow marking candidates when this attribute is present.")
+
+   (nohighlight
+    :initarg :nohighlight
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Disable highlighting matches in this source.
+  This will disable generic highlighting of matches,
+  but some specialized highlighting can be done from elsewhere,
+  i.e from `filtered-candidate-transformer' or `filter-one-by-one' slots.
+  So use this to either disable completely highlighting in your source,
+  or to disable highlighting and use a specialized highlighting matches
+  function for this source.
+  Remember that this function should run AFTER all filter functions if those
+  filter functions are modifying face properties, though it is possible to
+  avoid this by using new `add-face-text-property' in your filter functions.")
+
+   (allow-dups
+    :initarg :allow-dups
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Allow helm collecting duplicates candidates.")
+
+   (history
+    :initarg :history
+    :initform nil
+    :custom symbol
+    :documentation
+    "  Allow passing history variable to helm from source.
+  It should be a quoted symbol.")
+
+   (coerce
+    :initarg :coerce
+    :initform nil
+    :custom function
+    :documentation
+    "  It's a function called with one argument: the selected candidate.
+  This function is intended for type convertion. In normal case,
+  the selected candidate (string) is passed to action
+  function. If coerce function is specified, it is called just
+  before action function.
+
+  Example: converting string to symbol
+    (coerce . intern)")
+
+   (mode-line
+    :initarg :mode-line
+    :initform nil
+    :custom (choice string sexp)
+    :documentation
+    "  Source local `helm-mode-line-string' (included in
+  `mode-line-format'). It accepts also variable/function name.")
+
+   (header-line
+    :initarg :header-line
+    :initform nil
+    :custom (choice string function)
+    :documentation
+    "  Source local `header-line-format'.
+  Have no effect when `helm-echo-input-in-header-line' is non--nil.
+  It accepts also variable/function name.")
+
+   (resume
+    :initarg :resume
+    :initform nil
+    :custom function
+    :documentation
+    "  Function called with no parameters at end of initialization
+  when `helm-resume' is started.
+  If this function try to do something against `helm-buffer', \(e.g updating,
+  searching etc...\) probably you should run it in a timer to ensure
+  `helm-buffer' is ready.")
+
+   (follow
+    :initarg :follow
+    :initform nil
+    :custom integer
+    :documentation
+    "  Enable `helm-follow-mode' for this source only.
+  You must give it a value of 1 or -1, though giving a -1 value
+  is surely not what you want, e.g: (follow . 1)
+
+  See `helm-follow-mode' for more infos.")
+
+   (follow-delay
+    :initarg :follow-delay
+    :initform nil
+    :custom integer
+    :documentation
+    "  `helm-follow-mode' will execute persistent-action after this delay.
+  Otherwise value of `helm-follow-input-idle-delay' is used if non--nil,
+  If none of these are found fallback to `helm-input-idle-delay'.")
+
+   (dont-plug
+    :initarg :dont-plug
+    :initform '(helm-compile-source--persistent-help)
+    :custom list
+    :documentation
+    "  A list of compile functions plugin to ignore.")
+
+   (matchplugin
+    :initarg :matchplugin
+    :initform t
+    :custom boolean)
+
+   (match-part
+    :initarg :match-part
+    :initform nil
+    :custom function
+    :documentation
+    "  Allow matching only one part of candidate.
+  If source contain match-part attribute, match is computed only
+  on part of candidate returned by the call of function provided
+  by this attribute. The function should have one arg, candidate,
+  and return only a specific part of candidate.")
+
+   (before-init-hook
+    :initarg :before-init-hook
+    :initform nil
+    :custom symbol
+    :documentation
+    "  A local hook that run at beginning of initilization of this source.
+  i.e Before the creation of `helm-buffer'.
+
+  Should be a variable (defined with defvar).
+  Can be also an anonymous function or a list of functions
+  directly added to slot, this is not recommended though.")
+
+   (after-init-hook
+    :initarg :after-init-hook
+    :initform nil
+    :custom symbol
+    :documentation
+    "  A local hook that run at end of initilization of this source.
+  i.e After the creation of `helm-buffer'.
+
+  Should be a variable.
+  Can be also an anonymous function or a list of functions
+  directly added to slot, this is not recommended though."))
+
+  "Main interface to define helm sources."
+  :abstract t)
+
+(defclass helm-source-sync (helm-source)
+  ((candidates
+    :initform '("ERROR: You must specify the `candidates' slot, either with a list or a function"))
+
+   (dont-plug
+    :initform '(helm-compile-source--multi-match
+                helm-compile-source--persistent-help
+                ;; Ensure this will not be plugged
+                ;; if user have somewhere old helm-migemo.el.
+                helm-compile-source--migemo))
+
+   (migemo
+    :initarg :migemo
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Enable migemo.
+  When multimatch is disabled, you can give the symbol 'nomultimatch as value
+  to force not using generic migemo matching function.
+  In this case you have to provide your own migemo matching funtion
+  that kick in when `helm-migemo-mode' is enabled.
+  Otherwise it will be available for this source once `helm-migemo-mode'
+  is enabled when non-nil.")
+
+   (match-strict
+    :initarg :match-strict
+    :initform nil
+    :custom function
+    :documentation
+    "  When specifying a match function within a source and
+  helm-multi-match is enabled, the result of all matching
+  functions will be concatened, which in some cases is not what
+  is wanted. When using `match-strict' only this or these
+  functions will be used. You can specify those functions as a
+  list of functions or a single symbol function.
+
+  NOTE: This have the same effect as using :MATCHPLUGIN nil."))
+
+  "Use this class to make helm sources using a list of candidates.
+This list should be given as a normal list, a variable handling a list
+or a function returning a list.
+Matching is done basically with `string-match' against each candidate.")
+
+(defclass helm-source-async (helm-source)
+  ((candidates-process
+    :initarg :candidates-process
+    :initform nil
+    :custom function
+    :documentation
+    "  This attribute is used to define a process as candidate.
+  The value must be a process.
+
+  NOTE:
+  When building the source at runtime you can give directly a process
+  as value, otherwise wrap the process call into a function.
+  The process buffer should be nil, otherwise, if you use
+  `helm-buffer' give to the process a sentinel.")
+
+   (matchplugin :initform nil)
+   (dont-plug :initform '(helm-compile-source--multi-match
+                          helm-compile-source--persistent-help)))
+
+  "Use this class to define a helm source calling an external process.
+The :candidates slot is not allowed even if described because this class
+inherit from `helm-source'.")
+
+(defclass helm-source-in-buffer (helm-source)
+  ((init
+    :initform 'helm-default-init-source-in-buffer-function)
+
+   (data
+    :initarg :data
+    :initform nil
+    :custom (choice list string)
+    :documentation
+    "  A string or a list that will be used to feed the `helm-candidates-buffer'.
+  This data will be passed in a function added to the init slot and
+  the buffer will be build with `helm-init-candidates-in-buffer'.
+  This is an easy and fast method to build a `candidates-in-buffer' source.")
+
+   (dont-plug
+    :initform '(helm-compile-source--candidates-in-buffer
+                helm-compile-source--multi-match
+                helm-compile-source--persistent-help
+                helm-compile-source--migemo))
+
+   (migemo
+    :initarg :migemo
+    :initform nil
+    :custom boolean
+    :documentation
+    "  Enable migemo.
+  When multimatch is disabled, you can give the symbol 'nomultimatch as value
+  to force not using generic migemo matching function.
+  In this case you have to provide your own migemo matching funtion
+  that kick in when `helm-migemo-mode' is enabled.
+  Otherwise it will be available for this source once `helm-migemo-mode'
+  is enabled when non-nil.")
+
+   (candidates
+    :initform 'helm-candidates-in-buffer)
+
+   (volatile
+    :initform t)
+
+   (match
+    :initform '(identity))
+
+   (get-line
+    :initarg :get-line
+    :initform 'buffer-substring-no-properties
+    :custom function
+    :documentation
+    "  A function like `buffer-substring-no-properties' or `buffer-substring'.
+  This function converts point of line-beginning and point of line-end,
+  which represents a candidate computed by `helm-candidates-in-buffer'.
+  By default, `helm-candidates-in-buffer' uses
+  `buffer-substring-no-properties'.")
+
+   (search
+    :initarg :search
+    :initform '(helm-candidates-in-buffer-search-default-fn)
+    :custom (choice function list)
+    :documentation
+    "  List of functions like `re-search-forward' or `search-forward'.
+  Buffer search function used by `helm-candidates-in-buffer'.
+  By default, `helm-candidates-in-buffer' uses `re-search-forward'.
+  The function should take one arg PATTERN.
+  If your search function needs to handle negation like matchplugin,
+  this function should returns in such case a cons cell of two integers defining
+  the beg and end positions to match in the line previously matched by
+  `re-search-forward' or similar, and move point to next line
+  (See how the `helm-mm-3-search-base' and `helm-fuzzy-search' functions are working).
+
+  NOTE: FUZZY-MATCH slot will overhide value of this slot.")
+
+   (search-strict
+    :initarg :search-strict
+    :initform nil
+    :custom function
+    :documentation
+    "  When specifying a search function within a source and
+  helm-multi-match is enabled, the result of all searching
+  functions will be concatened, which in some cases is not what
+  is wanted. When using `search-strict' only this or these
+  functions will be used. You can specify those functions as a
+  list of functions or a single symbol function.
+
+  NOTE: This have the same effect as using a nil value for
+        :MATCHPLUGIN slot."))
+
+  "Use this source to make helm sources storing candidates inside a buffer.
+Contrarily to `helm-source-sync' candidates are matched using a function
+like `re-search-forward', see below documentation of :search slot.")
+
+(defclass helm-source-dummy (helm-source)
+  ((candidates
+    :initform '("dummy"))
+
+   (filtered-candidate-transformer
+    :initform 'helm-dummy-candidate)
+
+   (matchplugin
+    :initform nil)
+
+   (accept-empty
+    :initarg :accept-empty
+    :initform t
+    :custom boolean
+    :documentation
+    "  Allow exiting with an empty string.
+  You should keep the default value.")
+
+   (match
+    :initform 'identity)
+
+   (volatile
+    :initform t)))
+
+(defclass helm-source-in-file (helm-source-in-buffer)
+  ((init :initform (lambda ()
+                     (let ((file (helm-attr 'candidates-file)))
+                       (with-current-buffer (helm-candidate-buffer 'global)
+                         (insert-file-contents file)))))
+   (candidates-file
+    :initarg :candidates-file
+    :initform nil
+    :custom string
+    :documentation "A filename."))
+
+  "The contents of the file will be used as candidates in buffer.")
+
+
+;;; Error functions
+;;
+;;
+(defun helm-default-init-source-in-buffer-function ()
+  (helm-init-candidates-in-buffer 'global
+    '("ERROR: No buffer handling your data, use either the `init' slot or the `data' slot.")))
+
+
+;;; Internal Builder functions.
+;;
+;;
+(defun helm--create-source (object)
+  "[INTERNAL] Build a helm source from OBJECT.
+Where OBJECT is an instance of an eieio class."
+  (cl-loop for s in (object-slots object)
+           for slot-val = (slot-value object s)
+           when slot-val
+           collect (cons s (unless (eq t slot-val) slot-val))))
+
+(defun helm-make-source (name class &rest args)
+  "Build a `helm' source named NAME with ARGS for CLASS.
+Argument NAME is a string which define the source name, so no need to use
+the keyword :name in your source, NAME will be used instead.
+Argument CLASS is an eieio class object.
+Arguments ARGS are keyword value pairs as defined in CLASS."
+  (declare (indent 2))
+  (let ((source (apply #'make-instance class name args)))
+    (set-slot-value source 'name name)
+    (helm--setup-source source)
+    (helm-setup-user-source source)
+    (helm--create-source source)))
+
+(defun helm-make-type (class &rest args)
+  (let ((source (apply #'make-instance class args)))
+    (set-slot-value source 'name nil)
+    (helm--setup-source source)
+    (helm--create-source source)))
+
+(defvar helm-mm-default-search-functions)
+(defvar helm-mm-default-match-functions)
+
+(defun helm-source-mm-get-search-or-match-fns (source method)
+  (let ((defmatch         (helm-aif (slot-value source 'match)
+                              (helm-mklist it)))
+        (defmatch-strict  (helm-aif (and (eq method 'match)
+                                         (slot-value source 'match-strict))
+                              (helm-mklist it)))
+        (defsearch        (helm-aif (and (eq method 'search)
+                                         (slot-value source 'search))
+                              (helm-mklist it)))
+        (defsearch-strict (helm-aif (and (eq method 'search-strict)
+                                         (slot-value source 'search-strict))
+                              (helm-mklist it)))
+        (migemo           (slot-value source 'migemo)))
+    (cl-case method
+      (match (cond (defmatch-strict)
+                   (migemo
+                    (append helm-mm-default-match-functions
+                            defmatch '(helm-mm-3-migemo-match)))
+                   (defmatch
+                    (append helm-mm-default-match-functions defmatch))
+                   (t helm-mm-default-match-functions)))
+      (search (cond (defsearch-strict)
+                    (migemo
+                     (append helm-mm-default-search-functions
+                             defsearch '(helm-mm-3-migemo-search)))
+                    (defsearch
+                     (append helm-mm-default-search-functions defsearch))
+                    (t helm-mm-default-search-functions))))))
+
+
+;;; Modifiers
+;;
+(cl-defun helm-source-add-action-to-source-if (name fn source predicate
+                                                    &optional (index 4))
+  "Same as `helm-add-action-to-source-if' but for SOURCE defined as eieio object.
+You can use this inside a `helm--setup-source' method for a SOURCE defined as
+an eieio class."
+  (let* ((actions     (slot-value source 'action))
+         (action-transformers (slot-value source 'action-transformer))
+         (new-action  (list (cons name fn)))
+         (transformer `(lambda (actions candidate)
+                         (cond ((funcall (quote ,predicate) candidate)
+                                (helm-append-at-nth
+                                 actions (quote ,new-action) ,index))
+                               (t actions)))))
+    (if (functionp actions)
+        (set-slot-value source 'action (list (cons "Default action" actions)))
+        (set-slot-value source 'action (helm-interpret-value actions source)))
+    (when (or (symbolp action-transformers) (functionp action-transformers))
+      (setq action-transformers (list action-transformers)))
+    (set-slot-value
+     source
+     'action-transformer
+     (delq nil (append (list transformer) action-transformers)))))
+
+
+;;; Methods to build sources.
+;;
+;;
+(defun helm-source--persistent-help-string (string source)
+  (substitute-command-keys
+   (concat "\\<helm-map>\\[helm-execute-persistent-action]: "
+           (or (format "%s (keeping session)" string)
+               (slot-value source 'header-line)))))
+
+(defun helm-source--header-line (source)
+  (substitute-command-keys
+   (concat "\\<helm-map>\\[helm-execute-persistent-action]: "
+           (helm-aif (or (slot-value source 'persistent-action)
+                         (slot-value source 'action))
+               (cond ((and (symbolp it)
+                           (functionp it)
+                           (eq it 'identity))
+                      "Do Nothing")
+                     ((and (symbolp it)
+                           (boundp it)
+                           (listp (symbol-value it))
+                           (stringp (caar (symbol-value it))))
+                      (caar (symbol-value it)))
+                     ((or (symbolp it) (functionp it))
+                      (helm-symbol-name it))
+                     ((listp it)
+                      (let ((action (car it)))
+                        ;; It comes from :action ("foo" . function).
+                        (if (stringp (car action))
+                            (car action)
+                            ;; It comes from :persistent-action
+                            ;; (function . 'nosplit) Fix Issue #788.
+                            (if (or (symbolp action)
+                                    (functionp action))
+                                (helm-symbol-name action)))))
+                     (t ""))
+             "")
+           " (keeping session)")))
+
+(defmethod helm--setup-source :primary ((_source helm-source)))
+
+(defmethod helm--setup-source :before ((source helm-source))
+  (helm-aif (slot-value source 'keymap)
+      (and (symbolp it) (set-slot-value source 'keymap (symbol-value it))))
+  (helm-aif (slot-value source 'persistent-help)
+      (set-slot-value source 'header-line
+                      (helm-source--persistent-help-string it source))
+    (set-slot-value source 'header-line (helm-source--header-line source)))
+  (helm-aif (slot-value source 'candidate-number-limit)
+      (and (symbolp it) (set-slot-value
+                         source 'candidate-number-limit (symbol-value it))))
+  (when (and (slot-value source 'fuzzy-match) helm-fuzzy-sort-fn)
+    (set-slot-value source 'filtered-candidate-transformer
+                    (helm-aif (slot-value source 'filtered-candidate-transformer)
+                        (append (helm-mklist it)
+                                (list helm-fuzzy-sort-fn))
+                      (list helm-fuzzy-sort-fn))))
+  (unless (slot-value source 'nohighlight)
+    (set-slot-value source 'filtered-candidate-transformer
+                    (helm-aif (slot-value source 'filtered-candidate-transformer)
+                        (append (helm-mklist it)
+                                (list #'helm-fuzzy-highlight-matches))
+                      (list #'helm-fuzzy-highlight-matches)))))
+
+(defmethod helm-setup-user-source ((_source helm-source)))
+
+(defmethod helm--setup-source ((source helm-source-sync))
+  (when (slot-value source 'fuzzy-match)
+    (helm-aif (slot-value source 'match)
+        (set-slot-value source 'match (append (helm-mklist it)
+                                              (list helm-fuzzy-match-fn)))
+      (set-slot-value source 'match helm-fuzzy-match-fn)))
+  (when (slot-value source 'matchplugin)
+    (set-slot-value source 'match
+                    (helm-source-mm-get-search-or-match-fns source 'match)))
+  (helm-aif (and (null (slot-value source 'matchplugin))
+                 (slot-value source 'migemo))
+      (unless (eq it 'nomultimatch) ; Use own migemo fn.
+        (set-slot-value source 'match
+                        (append (helm-mklist (slot-value source 'match))
+                                '(helm-mm-3-migemo-match))))))
+
+(defmethod helm--setup-source ((source helm-source-in-buffer))
+  (let ((cur-init (slot-value source 'init)))
+    (helm-aif (slot-value source 'data)
+        (set-slot-value
+         source
+         'init (delq
+                nil
+                (list
+                 (and (null (eq 'helm-default-init-source-in-buffer-function
+                                cur-init))
+                      cur-init)
+                 (lambda ()
+                   (helm-init-candidates-in-buffer
+                       'global
+                     (if (functionp it) (funcall it) it))))))))
+  (when (slot-value source 'fuzzy-match)
+    (helm-aif (slot-value source 'search)
+        (set-slot-value source 'search (append (helm-mklist it)
+                                               (list helm-fuzzy-search-fn)))
+      (set-slot-value source 'search (list helm-fuzzy-search-fn))))
+  (when (slot-value source 'matchplugin)
+    (set-slot-value
+     source 'search (helm-source-mm-get-search-or-match-fns source 'search)))
+  (helm-aif (and (null (slot-value source 'matchplugin))
+                 (slot-value source 'migemo))
+      (unless (eq it 'nomultimatch)
+        (set-slot-value source 'search
+                        (append (helm-mklist (slot-value source 'search))
+                                '(helm-mm-3-migemo-search)))))
+  (let ((mtc (slot-value source 'match)))
+    (cl-assert (or (equal '(identity) mtc)
+                   (eq 'identity mtc))
+               nil "Invalid slot value for `match'")
+    (cl-assert (eq (slot-value source 'volatile) t)
+               nil "Invalid slot value for `volatile'")))
+
+(defmethod helm--setup-source ((source helm-source-async))
+  (cl-assert (null (slot-value source 'candidates))
+             nil "Incorrect use of `candidates' use `candidates-process' instead")
+  (cl-assert (null (slot-value source 'matchplugin))
+             nil "`matchplugin' not allowed in async sources."))
+
+(defmethod helm--setup-source ((source helm-source-dummy))
+  (let ((mtc (slot-value source 'match)))
+    (cl-assert (or (equal '(identity) mtc)
+                   (eq 'identity mtc))
+               nil "Invalid slot value for `match'")
+    (cl-assert (eq (slot-value source 'volatile) t)
+               nil "Invalid slot value for `volatile'")
+    (cl-assert (equal (slot-value source 'candidates) '("dummy"))
+               nil "Invalid slot value for `candidates'")
+    (cl-assert (eq (slot-value source 'accept-empty) t)
+               nil "Invalid slot value for `accept-empty'")))
+
+
+;;; User functions
+;;
+;;  Sources
+(defmacro helm-build-sync-source (name &rest args)
+  "Build a synchronous helm source with name NAME.
+Args ARGS are keywords provided by `helm-source-sync'."
+  (declare (indent 1))
+  `(helm-make-source ,name 'helm-source-sync ,@args))
+
+(defmacro helm-build-async-source (name &rest args)
+  "Build a asynchronous helm source with name NAME.
+Args ARGS are keywords provided by `helm-source-async'."
+  (declare (indent 1))
+  `(helm-make-source ,name 'helm-source-async ,@args))
+
+(defmacro helm-build-in-buffer-source (name &rest args)
+  "Build a helm source with name NAME using `candidates-in-buffer' method.
+Args ARGS are keywords provided by `helm-source-in-buffer'."
+  (declare (indent 1))
+  `(helm-make-source ,name 'helm-source-in-buffer ,@args))
+
+(defmacro helm-build-dummy-source (name &rest args)
+  "Build a helm source with name NAME using `dummy' method.
+Args ARGS are keywords provided by `helm-source-dummy'."
+  (declare (indent 1))
+  `(helm-make-source ,name 'helm-source-dummy ,@args))
+
+(defmacro helm-build-in-file-source (name file &rest args)
+  "Build a helm source with NAME name using `candidates-in-files' method.
+Arg FILE is a filename, the contents of this file will be
+used as candidates in buffer.
+Args ARGS are keywords provided by `helm-source-in-file'."
+  (declare (indent 1))
+  `(helm-make-source ,name 'helm-source-in-file
+     :candidates-file ,file ,@args))
+
+
+(provide 'helm-source)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm-source ends here
diff --git a/emacs.d/elpa/helm-core-20160116.2343/helm.el b/emacs.d/elpa/helm-core-20160116.2343/helm.el
new file mode 100644
index 0000000..987fc4c
--- /dev/null
+++ b/emacs.d/elpa/helm-core-20160116.2343/helm.el
@@ -0,0 +1,5587 @@
+;;; helm.el --- Emacs incremental and narrowing framework -*- lexical-binding: t -*-
+
+;; Copyright (C) 2007         Tamas Patrovics
+;;               2008 ~ 2011  rubikitch <rubikitch@ruby-lang.org>
+;;               2011 ~ 2015  Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; This is a fork of anything.el wrote by Tamas Patrovics.
+
+;; Authors of anything.el: Tamas Patrovics
+;;                         rubikitch <rubikitch@ruby-lang.org>
+;;                         Thierry Volpiatto <thierry.volpiatto@gmail.com>
+
+;; Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
+;; URL: http://github.com/emacs-helm/helm
+
+;; 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/>.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'advice) ; Shutup byte compiler about ad-deactivate.
+(require 'helm-lib)
+(require 'helm-multi-match)
+(require 'helm-source)
+
+
+;;; Multi keys
+;;
+;;
+;;;###autoload
+(defun helm-define-multi-key (keymap key functions &optional delay)
+  "In KEYMAP, define key sequence KEY for function list FUNCTIONS.
+Each function run sequentially each time the key KEY is pressed.
+If DELAY is specified switch back to initial function of FUNCTIONS list
+after DELAY seconds.
+The functions in FUNCTIONS list are functions with no args.
+e.g
+  \(defun foo ()
+    (message \"Run foo\"))
+  \(defun bar ()
+    (message \"Run bar\"))
+  \(defun baz ()
+    (message \"Run baz\"))
+
+\(helm-define-multi-key global-map \"<f5> q\" '(foo bar baz) 2)
+
+Each time \"<f5> q\" is pressed the next function is executed, if you wait
+More than 2 seconds, next hit will run again the first function and so on."
+  (define-key keymap key (helm-make-multi-command functions delay)))
+
+;;;###autoload
+(defmacro helm-multi-key-defun (name docstring funs &optional delay)
+  "Define NAME as a multi-key command running FUNS.
+After DELAY seconds the FUNS list is reinitialised.
+See `helm-define-multi-key'."
+  (declare (indent 2))
+  (setq docstring (if docstring (concat docstring "\n\n")
+                    "This is a helmish multi-key command."))
+  `(defalias (quote ,name) (helm-make-multi-command ,funs ,delay) ,docstring))
+
+(defun helm-make-multi-command (functions &optional delay)
+  "Return an anonymous multi-key command running FUNCTIONS.
+Run each function of FUNCTIONS list in turn when called within DELAY seconds."
+  (declare (indent 1))
+  (let ((funs functions)
+        (iter (cl-gensym "helm-iter-key"))
+        (timeout delay))
+    (eval (list 'defvar iter nil))
+    (lambda () (interactive) (helm-run-multi-key-command funs iter timeout))))
+
+(defun helm-run-multi-key-command (functions iterator delay)
+  (let ((fn (lambda ()
+                (cl-loop for count from 1 to (length functions)
+                      collect count)))
+        next)
+    (unless (and (symbol-value iterator)
+                 ;; Reset iterator when another key is pressed.
+                 (eq this-command real-last-command))
+      (set iterator (helm-iter-list (funcall fn))))
+    (setq next (helm-iter-next (symbol-value iterator)))
+    (unless next
+      (set iterator (helm-iter-list (funcall fn)))
+      (setq next (helm-iter-next (symbol-value iterator))))
+    (and next (symbol-value iterator) (call-interactively (nth (1- next) functions)))
+    (when delay (run-with-idle-timer delay nil `(lambda ()
+                                                  (setq ,iterator nil))))))
+
+(helm-multi-key-defun helm-toggle-resplit-and-swap-windows
+    "Multi key command to resplit and swap helm window.
+First call run `helm-toggle-resplit-window',
+second call within 0.5s run `helm-swap-windows'."
+  '(helm-toggle-resplit-window helm-swap-windows) 1)
+(put 'helm-toggle-resplit-and-swap-windows 'helm-only t)
+
+;;;###autoload
+(defun helm-define-key-with-subkeys (map key subkey command
+                                         &optional other-subkeys menu exit-fn)
+  "Allow defining in MAP a KEY and SUBKEY to COMMAND.
+
+This allow typing KEY to call COMMAND the first time and
+type only SUBKEY on subsequent calls.
+
+Arg MAP is the keymap to use, SUBKEY is the initial short keybinding to
+call COMMAND.
+
+Arg OTHER-SUBKEYS is an alist specifying other short keybindings
+to use once started.
+e.g:
+
+\(helm-define-key-with-subkeys global-map
+   \(kbd \"C-x v n\") ?n 'git-gutter:next-hunk '((?p . git-gutter:previous-hunk))\)
+
+
+In this example, `C-x v n' will run `git-gutter:next-hunk'
+subsequent hits on \"n\" will run this command again
+and subsequent hits on \"p\" will run `git-gutter:previous-hunk'.
+
+Arg MENU is a string to display in minibuffer
+to describe SUBKEY and OTHER-SUBKEYS.
+Arg EXIT-FN specify a function to run on exit.
+
+Any other keys pressed run their assigned command defined in MAP
+and exit the loop running EXIT-FN if specified.
+
+NOTE: SUBKEY and OTHER-SUBKEYS bindings support
+only char syntax actually (e.g ?n)
+so don't use strings, vectors or whatever to define them."
+  (declare (indent 1))
+  (define-key map key
+    (lambda ()
+      (interactive)
+      (unwind-protect
+          (progn
+            (call-interactively command)
+            (while (let ((input (read-key menu)) other kb com)
+                     (setq last-command-event input)
+                     (cond
+                      ((eq input subkey)
+                       (call-interactively command)
+                       t)
+                      ((setq other (assoc input other-subkeys))
+                       (call-interactively (cdr other))
+                       t)
+                      (t
+                       (setq kb (vector last-command-event))
+                       (setq com (lookup-key map kb))
+                       (if (commandp com)
+                           (call-interactively com)
+                         (setq unread-command-events
+                               (nconc (mapcar 'identity kb)
+                                      unread-command-events)))
+                       nil)))))
+        (and exit-fn (funcall exit-fn))))))
+
+
+;;; Keymap
+;;
+;;
+(defvar helm-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map minibuffer-local-map)
+    (define-key map (kbd "<down>")     'helm-next-line)
+    (define-key map (kbd "<up>")       'helm-previous-line)
+    (define-key map (kbd "C-n")        'helm-next-line)
+    (define-key map (kbd "C-p")        'helm-previous-line)
+    (define-key map (kbd "<C-down>")   'helm-follow-action-forward)
+    (define-key map (kbd "<C-up>")     'helm-follow-action-backward)
+    (define-key map (kbd "<prior>")    'helm-previous-page)
+    (define-key map (kbd "<next>")     'helm-next-page)
+    (define-key map (kbd "M-v")        'helm-previous-page)
+    (define-key map (kbd "C-v")        'helm-next-page)
+    (define-key map (kbd "M-<")        'helm-beginning-of-buffer)
+    (define-key map (kbd "M->")        'helm-end-of-buffer)
+    (define-key map (kbd "C-g")        'helm-keyboard-quit)
+    (define-key map (kbd "<right>")    'helm-next-source)
+    (define-key map (kbd "<left>")     'helm-previous-source)
+    (define-key map (kbd "<RET>")      'helm-maybe-exit-minibuffer)
+    (define-key map (kbd "C-i")        'helm-select-action)
+    (define-key map (kbd "C-z")        'helm-execute-persistent-action)
+    (define-key map (kbd "C-j")        'helm-execute-persistent-action)
+    (define-key map (kbd "C-o")        'helm-next-source)
+    (define-key map (kbd "C-l")        'helm-recenter-top-bottom-other-window)
+    (define-key map (kbd "M-C-l")      'helm-reposition-window-other-window)
+    (define-key map (kbd "C-M-v")      'helm-scroll-other-window)
+    (define-key map (kbd "M-<next>")   'helm-scroll-other-window)
+    (define-key map (kbd "C-M-y")      'helm-scroll-other-window-down)
+    (define-key map (kbd "C-M-S-v")    'helm-scroll-other-window-down)
+    (define-key map (kbd "M-<prior>")  'helm-scroll-other-window-down)
+    (define-key map (kbd "<C-M-down>") 'helm-scroll-other-window)
+    (define-key map (kbd "<C-M-up>")   'helm-scroll-other-window-down)
+    (define-key map (kbd "C-@")        'helm-toggle-visible-mark)
+    (define-key map (kbd "C-SPC")      'helm-toggle-visible-mark)
+    (define-key map (kbd "M-SPC")      'helm-toggle-visible-mark)
+    (define-key map (kbd "M-[")        nil)
+    (define-key map (kbd "M-(")        'helm-prev-visible-mark)
+    (define-key map (kbd "M-)")        'helm-next-visible-mark)
+    (define-key map (kbd "C-k")        'helm-delete-minibuffer-contents)
+    (define-key map (kbd "C-x C-f")    'helm-quit-and-find-file)
+    (define-key map (kbd "M-m")        'helm-toggle-all-marks)
+    (define-key map (kbd "M-a")        'helm-mark-all)
+    (define-key map (kbd "M-U")        'helm-unmark-all)
+    (define-key map (kbd "C-w")        'helm-yank-text-at-point)
+    (define-key map (kbd "C-M-a")      'helm-show-all-in-this-source-only)
+    (define-key map (kbd "C-M-e")      'helm-display-all-sources)
+    (define-key map (kbd "C-r")        'undefined)
+    (define-key map (kbd "C-s")        'undefined)
+    (define-key map (kbd "M-s")        'undefined)
+    (define-key map (kbd "C-}")        'helm-narrow-window)
+    (define-key map (kbd "C-{")        'helm-enlarge-window)
+    (define-key map (kbd "C-c -")      'helm-swap-windows)
+    (define-key map (kbd "C-c C-d")    'helm-delete-current-selection)
+    (define-key map (kbd "C-c C-y")    'helm-yank-selection)
+    (define-key map (kbd "C-c C-k")    'helm-kill-selection-and-quit)
+    (define-key map (kbd "C-c C-i")    'helm-copy-to-buffer)
+    (define-key map (kbd "C-c C-f")    'helm-follow-mode)
+    (define-key map (kbd "C-c C-u")    'helm-refresh)
+    (define-key map (kbd "C-c >")      'helm-toggle-truncate-line)
+    (define-key map (kbd "M-p")        'previous-history-element)
+    (define-key map (kbd "M-n")        'next-history-element)
+    (define-key map (kbd "C-!")        'helm-toggle-suspend-update)
+    (define-key map (kbd "C-x b")      'helm-resume-previous-session-after-quit)
+    (define-key map (kbd "C-x C-b")    'helm-resume-list-buffers-after-quit)
+    ;; Disable `file-cache-minibuffer-complete'.
+    (define-key map (kbd "<C-tab>")    'undefined)
+    ;; Multi keys
+    (define-key map (kbd "C-t")        'helm-toggle-resplit-and-swap-windows)
+    ;; Debugging command
+    (define-key map (kbd "C-h C-d")    'undefined)
+    (define-key map (kbd "C-h C-d")    'helm-enable-or-switch-to-debug)
+    ;; Allow to eval keymap without errors.
+    (define-key map [f1] nil)
+    (define-key map (kbd "C-h C-h")    'undefined)
+    (define-key map (kbd "C-h h")      'undefined)
+    ;; Use `describe-mode' key in `global-map'.
+    (cl-dolist (k (where-is-internal 'describe-mode global-map))
+      (define-key map k 'helm-help))
+    (define-key map (kbd "C-c ?")    'helm-help)
+    ;; Bind all actions from 1 to 12 to their corresponding nth index+1.
+    (cl-loop for n from 0 to 12 do
+             (define-key map (kbd (format "<f%s>" (1+ n)))
+               `(lambda ()
+                  (interactive)
+                  (helm-select-nth-action ,n))))
+    ;; Bind keys to allow executing default action
+    ;; on first 9 candidates before and after selection.
+    (cl-loop for n from 1 to 9
+         for key = (format "C-c %d" n)
+         for key- = (format "C-x %d" n)
+         for fn = `(lambda ()
+                     (interactive)
+                     (helm-execute-selection-action-at-nth ,n))
+         for fn- = `(lambda ()
+                      (interactive)
+                      (helm-execute-selection-action-at-nth ,(- n)))
+         do (progn
+              (define-key map (kbd key) fn)
+              (define-key map (kbd key-) fn-)))
+    map)
+  "Keymap for helm.")
+
+
+(defgroup helm nil
+  "Open helm."
+  :prefix "helm-" :group 'convenience)
+
+(defcustom helm-completion-window-scroll-margin 5
+  " `scroll-margin' to use for helm completion window.
+Which see.  Set to 0 to disable.
+NOTE: This have no effect when `helm-display-source-at-screen-top'
+id non--nil."
+  :group 'helm
+  :type  'integer)
+
+(defcustom helm-display-source-at-screen-top t
+  "Display candidates at the top of screen.
+This happen when using `helm-next-source' and `helm-previous-source'.
+NOTE: When non--nil (default) disable `helm-completion-window-scroll-margin'."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-candidate-number-limit 100
+  "Limit candidate number globally.
+Do not show more candidates than this limit from individual sources.
+It is usually pointless to show hundreds of matches
+when the pattern is empty, because it is much simpler to type a
+few characters to narrow down the list of potential candidates.
+
+Set it to nil if you don't want this limit."
+  :group 'helm
+  :type '(choice (const :tag "Disabled" nil) integer))
+
+(defcustom helm-idle-delay 0.01
+  "Be idle for this many seconds, before updating in delayed sources.
+This is useful for sources involving heavy operations
+\(like launching external programs\), so that candidates
+from the source are not retrieved unnecessarily if the user keeps typing.
+
+It also can be used to declutter the results helm displays,
+so that results from certain sources are not shown with every
+character typed, only if the user hesitates a bit.
+Be sure to know what you are doing when modifying this."
+  :group 'helm
+  :type 'float)
+
+(defcustom helm-input-idle-delay 0.01
+  "Be idle for this many seconds, before updating.
+
+Unlike `helm-idle-delay', it is also effective for non-delayed sources.
+If nil, candidates are collected immediately.
+
+Note:  If this value is too low compared to `helm-idle-delay',
+you may have duplicated sources when using multiples sources.
+Safe value is always >= `helm-idle-delay'.
+Default settings are equal value for both.
+Be sure to know what you are doing when modifying this."
+  :group 'helm
+  :type 'float)
+
+(defcustom helm-exit-idle-delay 0
+  "Be idle for this many seconds before exiting minibuffer while helm is updating.
+Note that this does nothing when helm-buffer is up to date
+\(i.e exit without delay in this condition\)."
+  :group 'helm
+  :type 'float)
+
+(defcustom helm-full-frame nil
+  "Use current window to show the candidates.
+If t then Helm doesn't pop up a new window."
+  :group 'helm
+  :type 'boolean)
+
+(defvaralias 'helm-samewindow 'helm-full-frame)
+(make-obsolete-variable 'helm-samewindow 'helm-full-frame "1.4.8.1")
+
+(defcustom helm-quick-update nil
+  "If non-nil, suppress displaying sources which are out of screen at first.
+They are treated as delayed sources at this input.
+This flag makes `helm' a bit faster with many sources."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-candidate-separator
+  "--------------------"
+  "Candidates separator of `multiline' source."
+  :group 'helm
+  :type 'string)
+
+(defcustom helm-save-configuration-functions
+  '(set-window-configuration . current-window-configuration)
+  "The functions used to restore/save window or frame configurations.
+It is a pair where the car is the function to restore window or frame config,
+and the cdr is the function to save the window or frame config.
+
+If you want to save and restore frame configuration, set this variable to
+ '\(set-frame-configuration . current-frame-configuration\)
+NOTE: This may not work properly with own-frame minibuffer settings.
+Older version saves/restores frame configuration, but the default is changed now
+because flickering can occur in some environment."
+  :group 'helm
+  :type 'sexp)
+
+(defcustom helm-persistent-action-use-special-display nil
+  "If non-nil, use `special-display-function' in persistent action."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-display-function 'helm-default-display-buffer
+  "Function to display *helm* buffer.
+It is `helm-default-display-buffer' by default,
+which affects `helm-full-frame'."
+  :group 'helm
+  :type 'symbol)
+
+(defcustom helm-case-fold-search 'smart
+  "Add 'smart' option to `case-fold-search'.
+When smart is enabled, ignore case in the search strings
+if pattern contains no uppercase characters.
+Otherwise, with a nil or t value, the behavior is same as
+`case-fold-search'.
+Default value is smart, other possible values are nil and t.
+NOTE: This have no effect in asynchronous sources, you will
+have to implement a similar feature directly in the process.
+See in helm-grep.el how it is implemented."
+  :group 'helm
+  :type '(choice (const :tag "Ignore case" t)
+          (const :tag "Respect case" nil)
+          (other :tag "Smart" 'smart)))
+
+(defcustom helm-file-name-case-fold-search
+  (if (memq system-type
+            '(cygwin windows-nt ms-dos darwin))
+      t
+    helm-case-fold-search)
+  "Local setting of `helm-case-fold-search' for reading filenames.
+
+See `helm-case-fold-search' for more info."
+  :group 'helm
+  :type 'symbol)
+
+(defcustom helm-reuse-last-window-split-state nil
+  "Reuse the last state of window split, vertical or horizontal.
+That is when you use `helm-toggle-resplit-window' the next helm session
+will reuse the same window scheme than the one of last session unless
+`helm-split-window-default-side' is 'same or 'other."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-split-window-preferred-function 'helm-split-window-default-fn
+  "Default function used for splitting window."
+  :group 'helm
+  :type 'function)
+
+(defcustom helm-split-window-default-side 'below
+  "The default side to display `helm-buffer'.
+Must be one acceptable arg for `split-window' SIDE,
+that is `below', `above', `left' or `right'.
+
+Other acceptable values are `same' which always display `helm-buffer'
+in current window and `other' that display `helm-buffer' below if only one
+window or in `other-window-for-scrolling' if available.
+
+A nil value as same effect as `below'.
+If `helm-full-frame' is non--nil, it take precedence on this.
+
+See also `helm-split-window-in-side-p' and `helm-always-two-windows' that
+take precedence on this.
+
+NOTE: this have no effect if `helm-split-window-preferred-function' is not
+`helm-split-window-default-fn' unless this new function handle this."
+  :group 'helm
+  :type 'symbol)
+
+(defcustom helm-display-buffer-default-size nil
+  "Initial height of `helm-buffer', an integer or a function.
+If a function, it should take one arg the window and it is in charge of
+resizing the window, its return value is ignored.
+See `display-buffer' for more info."
+  :group 'helm
+  :type '(choice integer function))
+
+(defcustom helm-split-window-in-side-p nil
+  "Force splitting inside selected window when non--nil.
+See also `helm-split-window-default-side'.
+
+NOTE: this have no effect if `helm-split-window-preferred-function' is not
+`helm-split-window-default-fn' unless this new function handle this."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-always-two-windows nil
+  "When non--nil helm will use two windows in this frame.
+That is one window to display `helm-buffer' and one to display
+`helm-current-buffer'.
+
+Note: this have no effect when `helm-split-window-in-side-p' is non--nil,
+or when `helm-split-window-default-side' is set to 'same.
+
+When `helm-autoresize-mode' is enabled, setting this to nil
+will have no effect.
+
+Also when non-nil it overhides the effect of `helm-split-window-default-side'
+set to `other'."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-sources-using-default-as-input '(helm-source-imenu
+                                                 helm-source-imenu-all
+                                                 helm-source-info-elisp
+                                                 helm-source-etags-select
+                                                 helm-source-man-pages
+                                                 helm-source-occur
+                                                 helm-source-moccur)
+  "List of helm sources that need to use `helm--maybe-use-default-as-input'.
+When a source is member of this list, default `thing-at-point'
+will be used as input."
+  :group 'helm
+  :type '(repeat (choice symbol)))
+
+(defcustom helm-delete-minibuffer-contents-from-point t
+  "When non--nil, `helm-delete-minibuffer-contents' delete region from `point'.
+Otherwise delete `minibuffer-contents'.
+See documentation of `helm-delete-minibuffer-contents'."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-follow-mode-persistent nil
+  "Retrieve last state of `helm-follow-mode' in next helm session when non--nil.
+This will not make it persistent through emacs sessions though,
+you will have to set explicitely the `follow' attribute in the source where
+you want this mode enabled definitely."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-prevent-escaping-from-minibuffer t
+  "Prevent escaping from minibuffer during helm session."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-move-to-line-cycle-in-source nil
+  "Move to end or beginning of source when reaching top or bottom of source.
+This happen when using `helm-next/previous-line'."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-fuzzy-match-fn 'helm-fuzzy-match
+  "The function for fuzzy matching in `helm-source-sync' based sources."
+  :group 'helm
+  :type 'function)
+
+(defcustom helm-fuzzy-search-fn 'helm-fuzzy-search
+  "The function for fuzzy matching in `helm-source-in-buffer' based sources."
+  :group 'helm
+  :type 'function)
+
+(defcustom helm-fuzzy-sort-fn 'helm-fuzzy-matching-default-sort-fn
+  "The sort transformer function used in fuzzy matching.
+When nil no sorting will be done."
+  :group 'helm
+  :type 'function)
+
+(defcustom helm-fuzzy-matching-highlight-fn 'helm-fuzzy-default-highlight-match
+  "The function to highlight matches in fuzzy matching.
+When nil no highlighting will be done."
+  :group 'helm
+  :type 'function)
+
+(defcustom helm-autoresize-max-height 40
+  "Specifies a maximum height and defaults to the height of helm window's frame in percentage.
+
+See `fit-window-to-buffer' for more infos."
+  :group 'helm
+  :type 'integer)
+
+(defcustom helm-autoresize-min-height 10
+  "Specifies a minimum height and defaults to the height of helm window's frame in percentage.
+
+If nil the default of `window-min-height' is used
+See `fit-window-to-buffer' for more infos."
+  :group 'helm
+  :type 'integer)
+
+(defcustom helm-input-method-verbose-flag nil
+  "The default value of `input-method-verbose-flag' to use in helm minibuffer.
+It is nil by default to allow helm updating and exiting without turning off
+the input method when complex methods are in use, if you set it to any other
+value allowed by `input-method-verbose-flag' you will have at each time you want
+to exit or helm update to disable the `current-input-method' with `C-\\'."
+  :group 'helm
+  :type '(radio :tag "A flag to control extra guidance given by input methods in helm."
+          (const :tag "Never provide guidance" nil)
+          (const :tag "Always provide guidance" t)
+          (const :tag "Provide guidance only in complex methods" complex-only)))
+
+(defcustom helm-display-header-line t
+  "Display header-line when non nil."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-inherit-input-method t
+  "Inherit `current-input-method' from `current-buffer' when non--nil.
+The default is to enable this by default, the user can toggle the current
+input method with `toggle-input-method'."
+  :group 'helm
+  :type 'boolean)
+
+(defcustom helm-echo-input-in-header-line nil
+  "Send current input in header-line."
+  :group 'helm
+  :type 'boolean)
+
+
+;;; Faces
+;;
+;;
+(defgroup helm-faces nil
+  "Customize the appearance of helm."
+  :prefix "helm-"
+  :group 'faces
+  :group 'helm)
+
+(defface helm-source-header
+    '((((background dark))
+       :background "#22083397778B"
+       :foreground "white"
+       :weight bold :height 1.3 :family "Sans Serif")
+      (((background light))
+       :background "#abd7f0"
+       :foreground "black"
+       :weight bold :height 1.3 :family "Sans Serif"))
+  "Face for source header in the helm buffer."
+  :group 'helm-faces)
+
+(defface helm-visible-mark
+    '((((min-colors 88) (background dark))
+       (:background "green1" :foreground "black"))
+      (((background dark))
+       (:background "green" :foreground "black"))
+      (((background light)) :background "#d1f5ea")
+      (((min-colors 88))
+       (:background "green1"))
+      (t (:background "green")))
+  "Face for visible mark."
+  :group 'helm-faces)
+
+(defface helm-header
+    '((t (:inherit header-line)))
+  "Face for header lines in the helm buffer."
+  :group 'helm-faces)
+
+(defface helm-candidate-number
+    '((((background dark)) :background "Yellow" :foreground "black")
+      (((background light)) :background "#faffb5" :foreground "black"))
+  "Face for candidate number in mode-line." :group 'helm-faces)
+
+(defface helm-selection
+    '((((background dark)) :background "ForestGreen"
+       :distant-foreground "black")
+      (((background light)) :background "#b5ffd1"
+       :distant-foreground "black"))
+  "Face for currently selected item in the helm buffer."
+  :group 'helm-faces)
+
+(defface helm-separator
+    '((((background dark)) :foreground "red")
+      (((background light)) :foreground "#ffbfb5"))
+  "Face for multiline source separator."
+  :group 'helm-faces)
+
+(defface helm-action
+    '((t (:underline t)))
+  "Face for action lines in the helm action buffer."
+  :group 'helm-faces)
+
+(defface helm-prefarg
+    '((((background dark)) :foreground "green")
+      (((background light)) :foreground "red"))
+  "Face for showing prefix arg in mode-line."
+  :group 'helm-faces)
+
+(defface helm-match
+  '((((background light)) :foreground "#b00000")
+    (((background dark))  :foreground "gold1"))
+  "Face used to highlight matches."
+  :group 'helm-faces)
+
+(defface helm-header-line-left-margin
+  '((t (:foreground "black" :background "yellow")))
+  "Face used to highlight helm-header sign in left-margin."
+  :group 'helm-faces)
+
+
+;;; Variables.
+;;
+;;
+(defvar helm-type-attributes nil
+  "It's a list of \(TYPE ATTRIBUTES ...\).
+ATTRIBUTES are the same as attributes for `helm-sources'.
+TYPE connects the value to the appropriate sources.
+Don't set this directly, use instead `define-helm-type-attribute'.
+
+This allows specifying common attributes for several sources.
+For example, sources which provide files can specify
+common attributes with a `file' type.")
+
+(defvar helm-source-filter nil
+  "A list of source names to be displayed.
+Other sources won't appear in the search results.
+If nil then there is no filtering.
+See also `helm-set-source-filter'.")
+
+(defvar helm-selection-overlay nil
+  "Overlay used to highlight the currently selected item.")
+
+(defvar helm-async-processes nil
+  "List of information about asynchronous processes managed by helm.")
+
+(defvar helm-before-initialize-hook nil
+  "Run before helm initialization.
+This hook is run before init functions in `helm-sources',
+that is before creation of `helm-buffer'.
+Local variables for `helm-buffer' that need a value from `current-buffer'
+can be set here with `helm-set-local-variable'.")
+
+(defvar helm-after-initialize-hook nil
+  "Run after helm initialization.
+This hook run after `helm-buffer' is created but not from `helm-buffer'
+so the hook have to specify in which buffer it should run.")
+
+(defvar helm-update-hook nil
+  "Run after the helm buffer was updated according the new input pattern.
+This hook is run at the beginning of buffer.
+The first candidate is selected after running this hook.
+See also `helm-after-update-hook'.")
+
+(defvar helm-after-update-hook nil
+  "Run after the helm buffer was updated according the new input pattern.
+This is very similar to `helm-update-hook' but selection is not moved.
+It is useful to select a particular object instead of the first one.")
+
+(defvar helm-cleanup-hook nil
+  "Run after helm minibuffer is closed.
+IOW this hook is executed BEFORE performing action.")
+
+(defvar helm-select-action-hook nil
+  "Run when opening the action buffer.")
+
+(defvar helm-before-action-hook nil
+  "Run before executing action.
+Contrarily to `helm-cleanup-hook',
+this hook run before helm minibuffer is closed
+and before performing action.")
+
+(defvar helm-after-action-hook nil
+  "Run after executing action.")
+
+(defvar helm-exit-minibuffer-hook nil
+  "Run just before exiting minibuffer.")
+
+(defvar helm-after-persistent-action-hook nil
+  "Run after executing persistent action.")
+
+(defvar helm-move-selection-before-hook nil
+  "Run before moving selection in `helm-buffer'.")
+
+(defvar helm-move-selection-after-hook nil
+  "Run after moving selection in `helm-buffer'.")
+
+(defvar helm-after-preselection-hook nil
+  "Run after preselection in `helm-buffer'.")
+
+(defvar helm-window-configuration-hook nil
+  "Run when switching to and back from action buffer.")
+
+(defconst helm-restored-variables
+  '(helm-candidate-number-limit
+    helm-source-filter
+    helm-source-in-each-line-flag
+    helm-map
+    helm-sources)
+  "Variables which are restored after `helm' invocation.")
+
+(defvar helm-execute-action-at-once-if-one nil
+  "Execute default action and exit when only one candidate is remaining.
+It can be also a function called with no args returning a boolean value.")
+
+(defvar helm-quit-if-no-candidate nil
+  "Quit when there is no candidates when non--nil.
+This variable accepts a function, which is executed if no candidate.")
+
+(defvar helm-source-in-each-line-flag nil
+  "Non-nil means add helm-source text-property in each candidate.
+experimental feature.")
+
+(defvar helm-debug-variables nil
+  "A list of helm variables to show in `helm-debug-output'.
+Otherwise all variables started with `helm-' are shown.")
+
+(defvar helm-debug-buffer "*Debug Helm Log*")
+
+(defvar helm-debug nil
+  "If non-nil, write log message into `helm-debug-buffer' buffer.
+It is disabled by default because `helm-debug-buffer' grows quickly.")
+
+(defvar helm-compile-source-functions
+  '(helm-compile-source--type
+    helm-compile-source--dummy
+    helm-compile-source--candidates-in-buffer)
+  "Functions to compile elements of `helm-sources' (plug-in).")
+
+(defvar helm-mode-line-string "\
+\\<helm-map>\
+\\[helm-help]:Help \
+\\[helm-select-action]:Act \
+\\[helm-maybe-exit-minibuffer]/\
+f1/f2/f-n:NthAct \
+\\[helm-toggle-suspend-update]:Tog.suspend"
+  "Help string displayed in mode-line in `helm'.
+It can be a string or a list of two args, in this case,
+first arg is a string that will be used as name for candidates number,
+second arg any string to display in mode line.
+If nil, use default `mode-line-format'.")
+
+(defvar helm-minibuffer-set-up-hook nil
+  "Hook that run at initialization of minibuffer.
+Useful for modifying the settings of minibuffer in helm.
+
+Here an example to hide minibuffer when using
+`helm-echo-input-in-header-line':
+
+      (add-hook 'helm-minibuffer-set-up-hook #'helm-hide-minibuffer-maybe)
+
+Note that we check `helm-echo-input-in-header-line' value
+from `helm-buffer' which allow detecting possible local
+value of this var.")
+
+(defvar helm-help-message
+     "* Helm Generic Help
+
+\\<helm-map>`helm' is an Emacs incremental completion and selection narrowing framework.
+
+Narrow the list by typing some pattern,
+Multiple patterns are allowed by separating with a space.
+Select with natural Emacs operations, choose with RET.
+
+** Help
+
+C-h m\t\tRun this generic help for helm.
+
+** Basic Operations
+
+These are the default key bindings:
+
+| Key     | Alternative Keys | Command                                                   |
+|---------+------------------+-----------------------------------------------------------|
+| C-p     | Up               | Previous Line                                             |
+| C-n     | Down             | Next Line                                                 |
+| M-v     | PageUp           | Previous Page                                             |
+| C-v     | PageDown         | Next Page                                                 |
+| Enter   |                  | Execute first (default) action / Select                   |
+| M-<     |                  | First Line                                                |
+| M->     |                  | Last Line                                                 |
+| C-M-S-v | M-PageUp, C-M-y  | Previous Page (other-window)                              |
+| C-M-v   | M-PageDown       | Next Page (other-window)                                  |
+| Tab     | C-i              | Show action list                                          |
+| Left    |                  | Previous Source                                           |
+| Right   | C-o              | Next Source                                               |
+| C-k     |                  | Delete pattern (with prefix arg delete from point to end) |
+| C-j     | C-z              | Persistent Action (Execute and keep helm session)         |
+
+** Shortcuts For nth Action
+
+f1-12: Execute nth 1 to 12 Action(s).
+
+** Shortcuts for executing Default Action on nth candidate
+
+C-x <n> => execute default action on number <n> candidate before selection.
+C-c <n> => execute default action on number <n> candidate after selection.
+
+Of course this works only on the 9 first and previous candidates.
+
+Helm provides nothing to visualize candidates numbers, up to you to install
+linum-relative package and enable linum-relative in helm..
+
+** Visible Marks
+
+Visible marks store candidate. Some actions uses marked candidates.
+
+** Miscellaneous Commands
+
+\\[helm-toggle-resplit-and-swap-windows]\t\tToggle vertical/horizontal split on first hit and swap helm window on second hit.
+\\[helm-quit-and-find-file]\t\tDrop into `helm-find-files'.
+\\[helm-delete-current-selection]\t\tDelete selected item (visually).
+\\[helm-kill-selection-and-quit]\t\tKill display value of candidate and quit (with prefix arg kill the real value).
+\\[helm-yank-selection]\t\tYank selection into pattern.
+\\[helm-follow-mode]\t\tToggle automatical execution of persistent action.
+\\[helm-follow-action-forward]\tRun persistent action and goto next line.
+\\[helm-follow-action-backward]\t\tRun persistent action and goto previous line.
+\\[helm-refresh]\t\tRecalculate and redisplay candidates.
+\\[helm-toggle-suspend-update]\t\tSuspend/reenable update.
+ 
+** Global Commands
+
+\\<global-map>\\[helm-resume] revives last `helm' session.
+It is very useful, so you should bind any key.
+
+** Helm Map
+\\{helm-map}"
+  "Detailed help message string for `helm'.
+It also accepts function or variable symbol.")
+
+(defvar helm-autoresize-mode) ;; Undefined in `helm-default-display-buffer'.
+
+
+;;; Internal Variables
+;;
+;;
+(defvar helm-current-prefix-arg nil
+  "Record `current-prefix-arg' when exiting minibuffer.")
+(defvar helm-saved-action nil
+  "Saved value of the currently selected action by key.")
+(defvar helm-saved-current-source nil
+  "Value of the current source when the action list is shown.")
+(defvar helm-compiled-sources nil
+  "Compiled version of `helm-sources'.")
+(defvar helm-in-persistent-action nil
+  "Flag whether in persistent-action or not.")
+(defvar helm-last-buffer nil
+  "`helm-buffer' of previously `helm' session.")
+(defvar helm-saved-selection nil
+  "Value of the currently selected object when the action list is shown.")
+(defvar helm-sources nil
+  "[INTERNAL] Value of current sources in use, a list.")
+(defvar helm-buffer-file-name nil
+  "Variable `buffer-file-name' when `helm' is invoked.")
+(defvar helm-candidate-cache (make-hash-table :test 'equal)
+  "Holds the available candidate within a single helm invocation.")
+(defvar helm-input ""
+  "The input typed in the candidates panel.")
+(defvar helm-input-local nil
+  "Internal, store locally `helm-pattern' value for later use in `helm-resume'.")
+(defvar helm-source-name nil)
+(defvar helm-current-source nil)
+(defvar helm-candidate-buffer-alist nil)
+(defvar helm-match-hash (make-hash-table :test 'equal))
+(defvar helm-cib-hash (make-hash-table :test 'equal))
+(defvar helm-tick-hash (make-hash-table :test 'equal))
+(defvar helm-issued-errors nil)
+(defvar helm-debug-root-directory nil
+  "When non--nil, save helm log to `helm-last-log-file'.
+Be aware that if you set that, you will end up with a huge directory
+of log files, so use that only for debugging purpose.
+See `helm-log-save-maybe' for more info.")
+(defvar helm-last-log-file nil
+  "The name of the last helm session log file.")
+(defvar helm-follow-mode nil)
+(defvar helm--local-variables nil)
+(defvar helm-split-window-state nil)
+(defvar helm--window-side-state nil)
+(defvar helm-selection-point nil)
+(defvar helm-alive-p nil)
+(defvar helm-visible-mark-overlays nil)
+(defvar helm-update-blacklist-regexps '("^" "^ *" "$" "!" " " "\\b"
+                                        "\\<" "\\>" "\\_<" "\\_>" ".*"))
+(defvar helm-force-updating-p nil)
+(defvar helm-exit-status 0
+  "Flag to inform whether helm have exited or quitted.
+Exit with 0 mean helm have exited executing an action.
+Exit with 1 mean helm have quitted with \\[keyboard-quit]
+It is useful for example to restore a window config if helm abort
+in special cases.
+See `helm-exit-minibuffer' and `helm-keyboard-quit'.")
+(defvar helm-minibuffer-confirm-state nil)
+(defvar helm-quit nil)
+(defvar helm-attributes nil "List of all `helm' attributes.")
+(defvar helm-buffers nil
+  "All of `helm-buffer' in most recently used order.")
+(defvar helm-current-position nil
+  "Cons of \(point . window-start\)  when `helm' is invoked.
+It is needed to restore position in `helm-current-buffer'
+when `helm' is keyboard-quitted.")
+(defvar helm-last-frame-or-window-configuration nil
+  "Used to store window or frame configuration when helm start.")
+(defvar helm-onewindow-p nil)
+(defvar helm-types nil)
+(defvar helm--mode-line-string-real nil) ; The string to display in mode-line.
+(defvar helm-persistent-action-display-window nil)
+(defvar helm-marked-candidates nil
+  "Marked candadates.  List of \(source . real\) pair.")
+(defvar helm--mode-line-display-prefarg nil)
+(defvar helm--temp-follow-flag nil
+  "[INTERNAL] A simple flag to notify persistent action we are following.")
+(defvar helm--reading-passwd-or-string nil)
+(defvar helm--in-update nil)
+(defvar helm--in-fuzzy nil)
+(defvar helm--maybe-use-default-as-input nil
+  "Flag to notify the use of use-default-as-input.
+Use only in let-bindings.
+Use :default arg of `helm' as input to update display.
+Note that if also :input is specified as `helm' arg, it will take
+precedence on :default.")
+(defvar helm--temp-hooks nil
+  "Store temporary hooks added by `with-helm-temp-hook'.")
+(defvar helm-truncate-lines nil
+  "[Internal] Don't set this globally, it is used as a local var.")
+(defvar helm--prompt nil)
+(defvar helm--file-completion-sources
+  '("Find Files" "Read File Name" "Read File Name History")
+  "Sources that use the *find-files mechanism can be added here.
+Sources generated by `helm-mode' don't need to be added here, it will
+be done automatically.
+You should not modify this yourself unless you know what you do.")
+;; Same as `ffap-url-regexp' but keep it here to ensure `ffap-url-regexp' is not nil.
+(defvar helm--url-regexp "\\(news\\(post\\)?:\\|mailto:\\|file:\\|\\(ftp\\|https?\\|telnet\\|gopher\\|www\\|wais\\)://\\)")
+
+;; Utility: logging
+(defun helm-log (format-string &rest args)
+  "Log message `helm-debug' is non-nil.
+Messages are written to the `helm-debug-buffer' buffer.
+
+Argument FORMAT-STRING is a string to use with `format'.
+Use optional arguments ARGS like in `format'."
+  (when helm-debug
+    (with-current-buffer (get-buffer-create helm-debug-buffer)
+      (outline-mode)
+      (buffer-disable-undo)
+      (set (make-local-variable 'inhibit-read-only) t)
+      (goto-char (point-max))
+      (insert (let ((tm (current-time)))
+                (format (concat (if (string-match "Start session" format-string)
+                                    "* " "** ")
+                                "%s.%06d (%s)\n %s\n")
+                        (format-time-string "%H:%M:%S" tm)
+                        (nth 2 tm)
+                        (helm-log-get-current-function)
+                        (apply #'format (cons format-string args))))))))
+
+(defun helm-log-run-hook (hook)
+  "Run HOOK like `run-hooks' but write these actions to helm log buffer."
+  (helm-log "Executing %s with value = %S" hook (symbol-value hook))
+  (helm-log "Executing %s with global value = %S" hook (default-value hook))
+  (run-hooks hook)
+  (helm-log "executed %s" hook))
+
+(defun helm-log-get-current-function ()
+  "Get function name calling `helm-log'.
+The original idea is from `tramp-debug-message'."
+  (cl-loop with exclude-func-re = "^helm-\\(?:interpret\\|log\\|.*funcall\\)"
+        for btn from 1 to 40
+        for btf = (cl-second (backtrace-frame btn))
+        for fn  = (if (symbolp btf) (symbol-name btf) "")
+        if (and (string-match "^helm" fn)
+                (not (string-match exclude-func-re fn)))
+        return fn))
+
+(defun helm-log-error (&rest args)
+  "Accumulate error messages into `helm-issued-errors'.
+ARGS are args given to `format'.
+e.g (helm-log-error \"Error %s: %s\" (car err) (cdr err))."
+  (apply 'helm-log (concat "ERROR: " (car args)) (cdr args))
+  (let ((msg (apply 'format args)))
+    (unless (member msg helm-issued-errors)
+      (add-to-list 'helm-issued-errors msg))))
+
+(defun helm-log-save-maybe ()
+  "May be save log buffer to `helm-last-log-file'.
+If `helm-debug-root-directory' is non--nil and a valid directory,
+a directory named 'helm-debug-<date of today>'
+will be created there and the log recorded in a file named
+at the date and time of today in this directory."
+  (when (and (stringp helm-debug-root-directory)
+             (file-directory-p helm-debug-root-directory)
+             helm-debug)
+    (let ((logdir (expand-file-name (concat "helm-debug-"
+                                            (format-time-string "%Y%m%d"))
+                                    helm-debug-root-directory)))
+      (make-directory logdir t)
+      (with-current-buffer (get-buffer-create helm-debug-buffer)
+        (write-region (point-min) (point-max)
+                      (setq helm-last-log-file
+                            (expand-file-name
+                             (format-time-string "%Y%m%d-%H%M%S")
+                             logdir))
+                      nil 'silent)
+        (kill-buffer)))))
+
+;;;###autoload
+(defun helm-debug-open-last-log ()
+  "Open helm log file of last helm session.
+If `helm-last-log-file' is nil, switch to `helm-debug-buffer' ."
+  (interactive)
+  (if helm-last-log-file
+      (view-file helm-last-log-file)
+    (switch-to-buffer helm-debug-buffer)
+    (view-mode 1) (visual-line-mode 1)))
+
+(defun helm-print-error-messages ()
+  "Print error messages in `helm-issued-errors'."
+  (and helm-issued-errors
+       (message "Helm issued errors: %s"
+                (mapconcat 'identity (reverse helm-issued-errors) "\n"))))
+
+
+;; Programming Tools
+
+(defun helm-this-command ()
+  "Return the actual command in action.
+Like `this-command' but return the real command,
+not `exit-minibuffer' or unwanted functions."
+  (cl-loop with bl = '(helm-maybe-exit-minibuffer
+                       helm-confirm-and-exit-minibuffer
+                       helm-exit-minibuffer
+                       exit-minibuffer)
+        for count from 1 to 50
+        for btf = (backtrace-frame count)
+        for fn = (cl-second btf)
+        if (and
+            ;; In some case we may have in the way an
+            ;; advice compiled resulting in byte-code,
+            ;; ignore it (Issue #691).
+            (symbolp fn)
+            (commandp fn)
+            (not (memq fn bl)))
+        return fn
+        else
+        if (and (eq fn 'call-interactively)
+                (> (length btf) 2))
+        return (cadr (cdr btf))))
+
+
+;; Test tools
+(defmacro with-helm-time-after-update (&rest body)
+  (helm-with-gensyms (start-time time-elapsed)
+    `(let ((,start-time (float-time)) ,time-elapsed)
+       (add-hook 'helm-after-update-hook
+                 (lambda ()
+                   (setq ,time-elapsed (- (float-time) ,start-time))
+                   (keyboard-quit)))
+       (unwind-protect ,@body
+         (remove-hook 'helm-after-update-hook
+                      (lambda ()
+                        (setq  ,time-elapsed (- (float-time) ,start-time))
+                        (keyboard-quit))))
+       ,time-elapsed)))
+
+
+;; Helm API
+
+(defmacro with-helm-restore-variables (&rest body)
+  "Restore `helm-restored-variables' after executing BODY."
+  (declare (indent 0) (debug t))
+  (helm-with-gensyms (orig-vars)
+    `(let ((,orig-vars (mapcar (lambda (v)
+                                 (cons v (symbol-value v)))
+                               helm-restored-variables)))
+       (unwind-protect (progn ,@body)
+         (cl-loop for (var . value) in ,orig-vars
+               do (set var value))
+         (helm-log "restore variables")))))
+
+(defmacro with-helm-default-directory (directory &rest body)
+  (declare (indent 2) (debug t))
+  `(let ((default-directory (or (and ,directory
+                                     (file-name-as-directory ,directory))
+                                default-directory)))
+     ,@body))
+
+(defun helm-default-directory ()
+  "Return the local value of `default-directory' in `helm-buffer'."
+  (buffer-local-value 'default-directory (get-buffer helm-buffer)))
+
+(defmacro with-helm-temp-hook (hook &rest body)
+  "Execute temporarily BODY as a function for HOOK."
+  (declare (indent 1) (debug t))
+  (helm-with-gensyms (helm--hook)
+    `(progn
+       (defun ,helm--hook ()
+         (unwind-protect
+              (progn ,@body)
+           (remove-hook ,hook (quote ,helm--hook))
+           (fmakunbound (quote ,helm--hook))))
+       (push (cons ',helm--hook ,hook) helm--temp-hooks)
+       (add-hook ,hook (quote ,helm--hook)))))
+
+(defmacro with-helm-after-update-hook (&rest body)
+  "Execute BODY at end of `helm-update'."
+  (declare (indent 0) (debug t))
+  `(with-helm-temp-hook 'helm-after-update-hook ,@body))
+
+(defmacro with-helm-alive-p (&rest body)
+  "Return error when BODY run outside helm context."
+  (declare (indent 0) (debug t))
+  `(progn
+     (if helm-alive-p
+         (progn ,@body)
+       (error "Running helm command outside of context"))))
+
+(defun helm-attr (attribute-name &optional source compute)
+  "Get the value of ATTRIBUTE-NAME of SRC.
+If SRC is omitted, use current source.
+If COMPUTE is non--nil compute value of ATTRIBUTE-NAME
+with `helm-interpret-value'.  COMPUTE can have also 'ignorefn as
+value, in this case `helm-interpret-value' will return a function
+as value inchanged, but will eval a symbol which is bound
+(i.e a variable)."
+  (let ((src (or source (helm-get-current-source))))
+    (helm-aif (or (assq attribute-name src)
+                  (helm-get-attribute-from-source-type attribute-name src))
+        (if compute
+            (helm-interpret-value (cdr it) src compute)
+            (cdr it)))))
+
+(cl-defun helm-attr-defined (attribute-name
+                             &optional (src (helm-get-current-source)))
+  "Return non-nil if ATTRIBUTE-NAME of SRC is defined.
+if SRC is omitted, use current source."
+  (and (helm-attr attribute-name src) t))
+
+(cl-defun helm-attrset (attribute-name value
+                        &optional
+                          (src (helm-get-current-source))
+                          alter-type)
+  "Set the value of ATTRIBUTE-NAME of source SRC to VALUE.
+If ATTRIBUTE-NAME doesn't exists in source it is created with value VALUE.
+If ALTER-TYPE is non--nil alter the value of ATTRIBUTE-NAME in `helm-attributes'
+if it exists.
+If SRC is omitted, use current source.
+If operation succeed, return value, otherwise nil."
+  (let ((from-type (helm-get-attribute-from-source-type attribute-name src))
+        done)
+    (helm-aif (or (assq attribute-name src)
+                  (and alter-type from-type))
+        (prog1 (setcdr it value) (setq done t))
+      (unless from-type
+        (setcdr src (cons (cons attribute-name value) (cdr src)))
+        (setq done t)))
+    (and done value)))
+
+(defun helm-get-attribute-from-source-type (attribute source)
+  "Get ATTRIBUTE from type attribute of SOURCE."
+  (when (assq 'type source)
+    (assq attribute
+          (assq (cdr (assq 'type source))
+                helm-type-attributes))))
+
+(defun helm-get-attribute-from-type (attribute type)
+  "Get ATTRIBUTE from TYPE.
+arg TYPE is an existing type defined in `helm-type-attributes'."
+  (assq attribute (assq type helm-type-attributes)))
+
+(defun helm-get-actions-from-type (source)
+  "Get actions list from type attribute of SOURCE."
+  (when (assq 'type source)
+    (helm-get-attribute-from-source-type 'action source)))
+
+(defun helm-inherit-attribute-from-source (attribute source)
+  "Get the ATTRIBUTE of SOURCE."
+  (helm-aif (assq attribute source)
+      it
+    (helm-get-attribute-from-source-type attribute source)))
+
+(defun helm-append-at-nth (seq elm index)
+  "Append ELM at INDEX in SEQ."
+  (let ((len (length seq)))
+    (cond ((> index len) (setq index len))
+          ((< index 0) (setq index 0)))
+    (if (zerop index)
+        (append elm seq)
+        (cl-loop for i in seq
+                 for count from 1 collect i
+                 when (= count index)
+                 if (listp elm) append elm
+                 else collect elm))))
+
+(defun helm-add-action-to-source (name fn source &optional index)
+  "Add new action NAME linked to function FN to SOURCE.
+Function FN should be a valid function that take one arg i.e candidate,
+argument NAME is a string that will appear in action menu
+and SOURCE should be an existing helm source already loaded.
+If INDEX is specified, action is added in action list at INDEX,
+otherwise it is added at end.
+This allow user to add a specific action to an existing source
+without modifying source code."
+  (let ((actions    (helm-attr 'action source 'ignorefn))
+        (new-action (list (cons name fn))))
+    (when (functionp actions)
+      (setq actions (list (cons "Default action" actions))))
+    (helm-attrset 'action
+                  (if index
+                      (helm-append-at-nth actions new-action index)
+                    (append actions new-action))
+                  source)))
+
+(defun helm-delete-action-from-source (action-or-name source)
+  "Delete ACTION-OR-NAME from SOURCE.
+ACTION-OR-NAME can either be the name of action or the symbol function
+associated to name."
+  (let* ((actions    (helm-attr 'action source 'ignorefn))
+         (del-action (if (symbolp action-or-name)
+                         (rassoc action-or-name actions)
+                       (assoc action-or-name actions))))
+    (helm-attrset 'action (delete del-action actions) source)))
+
+(cl-defun helm-add-action-to-source-if (name fn source predicate
+                                        &optional (index 4) test-only)
+  "Add new action NAME linked to function FN to SOURCE.
+Action NAME will be available when the current candidate matches PREDICATE.
+This function add an entry in the `action-transformer' attribute
+of SOURCE (or create one if not found).
+Function PREDICATE should take one arg candidate.
+Function FN should be a valid function that take one arg i.e candidate,
+argument NAME is a string that will appear in action menu
+and SOURCE should be an existing helm source already loaded.
+If INDEX is specified, action is added in action list at INDEX.
+Value of INDEX should be always >=1, default to 4.
+This allow user to add a specific `action-tranformer'
+to an existing source without modifying source code.
+E.g
+Add the action \"Byte compile file async\" linked to
+function 'async-byte-compile-file to source `helm-source-find-files'
+only when predicate helm-ff-candidates-lisp-p return non--nil:
+
+\(helm-add-action-to-source-if \"Byte compile file async\"
+                              'async-byte-compile-file
+                              helm-source-find-files
+                              'helm-ff-candidates-lisp-p\)."
+  (let* ((actions     (helm-attr 'action source 'ignorefn))
+         (action-transformers (helm-attr 'action-transformer source))
+         (new-action  (list (cons name fn)))
+         (transformer `(lambda (actions candidate)
+                         (cond ((funcall (quote ,predicate) candidate)
+                                (helm-append-at-nth
+                                 actions (quote ,new-action) ,index))
+                               (t actions)))))
+    (when (functionp actions)
+      (helm-attrset 'action (list (cons "Default action" actions)) source))
+    (when (or (symbolp action-transformers) (functionp action-transformers))
+      (setq action-transformers (list action-transformers)))
+    (if test-only                       ; debug
+        (delq nil (append (list transformer) action-transformers))
+      (helm-attrset 'action-transformer
+                    (helm-fast-remove-dups
+                     (delq nil (append (list transformer) action-transformers))
+                     :test 'equal)
+                    source))))
+
+(defun helm-set-source-filter (sources)
+  "Set the value of `helm-source-filter' to SOURCES and update.
+
+This function sets a filter for helm sources and it may be
+called while helm is running. It can be used to toggle
+displaying of sources dynamically. For example, additional keys
+can be bound into `helm-map' to display only the file-related
+results if there are too many matches from other sources and
+you're after files only:
+
+Shift+F shows only file results from some sources:
+
+\(define-key helm-map \"F\" 'helm-my-show-files-only)
+
+\(defun helm-my-show-files-only ()
+  (interactive)
+  (helm-set-source-filter '(\"File Name History\"
+                                  \"Files from Current Directory\")))
+
+Shift+A shows all results:
+
+\(define-key helm-map \"A\" 'helm-my-show-all)
+
+\(defun helm-my-show-all ()
+  (interactive)
+  (helm-set-source-filter nil))
+
+The -my- part is added to avoid collisions with
+existing Helm function names."
+  (let ((cur-disp-sel (with-current-buffer helm-buffer
+                        (helm-get-selection nil t))))
+    (setq helm-source-filter (helm--normalize-filter-sources sources))
+    (helm-log "helm-source-filter = %S" helm-source-filter)
+    ;; Use force-update to run init/update functions.
+    (helm-force-update (and (stringp cur-disp-sel)
+                            (regexp-quote cur-disp-sel)))))
+
+(defun helm--normalize-filter-sources (sources)
+  (cl-loop for s in sources collect
+           (cond ((symbolp s)
+                  (assoc-default 'name (symbol-value s)))
+                 ((listp s)
+                  (assoc-default 'name s))
+                 ((stringp s) s))))
+
+(defun helm-set-sources (sources &optional no-init no-update)
+  "Set SOURCES during `helm' invocation.
+If NO-INIT is non-nil, skip executing init functions of SOURCES.
+If NO-UPDATE is non-nil, skip executing `helm-update'."
+  (with-current-buffer helm-buffer
+    (setq helm-compiled-sources nil
+          helm-sources sources)
+    (helm-log "helm-compiled-sources = %S" helm-compiled-sources)
+    (helm-log "helm-sources = %S" helm-sources))
+  (unless no-init (helm-funcall-foreach 'init))
+  (unless no-update (helm-update)))
+
+(defun helm-get-sources ()
+  "Return compiled `helm-sources', which is memoized.
+
+Attributes:
+
+- type
+  `helm-type-attributes' are merged in.
+- candidates-buffer
+  candidates, volatile and match attribute are created."
+  (cond
+    ;; action
+    ((helm-action-window)
+     helm-sources)
+    ;; memoized
+    (helm-compiled-sources)
+    ;; first time
+    (t
+     (prog1
+         (setq helm-compiled-sources
+               (helm-compile-sources
+                helm-sources helm-compile-source-functions))
+       (helm-log "helm-compiled-sources = %S" helm-compiled-sources)))))
+
+(cl-defun helm-get-selection (&optional (buffer nil buffer-s)
+                                force-display-part)
+  "Return the currently selected item or nil.
+if BUFFER is nil or unspecified, use helm-buffer as default value.
+If FORCE-DISPLAY-PART is non-nil, return the display string.
+If FORCE-DISPLAY-PART value is 'withprop the display string is returned
+with its properties."
+  (setq buffer (if (and buffer buffer-s) buffer helm-buffer))
+  (unless (helm-empty-buffer-p buffer)
+    (with-current-buffer buffer
+      (let* ((disp-fn (if (eq force-display-part 'withprop)
+                          'buffer-substring
+                        'buffer-substring-no-properties))
+             (selection
+              (or (and (not force-display-part)
+                       (get-text-property (overlay-start
+                                           helm-selection-overlay)
+                                          'helm-realvalue))
+                  ;; It is needed to return properties of DISP in some case,
+                  ;; e.g for `helm-confirm-and-exit-minibuffer',
+                  ;; so use `buffer-substring' here when 'withprop is specified.
+                  (let ((disp (funcall
+                               disp-fn
+                               (overlay-start helm-selection-overlay)
+                               (1- (overlay-end helm-selection-overlay))))
+                        (source (helm-get-current-source)))
+                    (helm-aif (and (not force-display-part)
+                                   (assoc-default 'display-to-real source))
+                        (helm-funcall-with-source source it disp)
+                      disp)))))
+        (unless (equal selection "")
+          (helm-log "selection = %S" selection)
+          selection)))))
+
+(defun helm-get-actions-from-current-source ()
+  "Return the associated action for the selected candidate.
+It is a function symbol \(sole action\) or list
+of \(action-display . function\)."
+  (unless (helm-empty-buffer-p (helm-buffer-get))
+    (helm-aif (helm-attr 'action-transformer)
+        (helm-composed-funcall-with-source
+         (helm-get-current-source) it
+         (helm-attr 'action nil 'ignorefn)
+         ;; Check if the first given transformer
+         ;; returns the same set of actions for each
+         ;; candidate in marked candidates.
+         ;; If so use the car of marked to determine
+         ;; the set of actions, otherwise use the selection.
+         (if (cl-loop with marked = (helm-marked-candidates)
+                      with act = (car (helm-mklist it))
+                      with acts = (funcall act nil (car marked))
+                      for c in marked
+                      always (equal (funcall act nil c) acts))
+             (car (helm-marked-candidates))
+             (helm-get-selection)))
+      (helm-attr 'action nil 'ignorefn))))
+
+(defun helm-get-current-source ()
+  "Return the source for the current selection.
+Allow also checking if helm-buffer contain candidates."
+  (or helm-current-source
+      (with-current-buffer (helm-buffer-get)
+        (or
+         ;; This happen only when `helm-source-in-each-line-flag'
+         ;; is non--nil and there is candidates in buffer.
+         (get-text-property (point) 'helm-source)
+         ;; Return nil when no--candidates.
+         (cl-block exit
+           ;; This goto-char shouldn't be necessary, but point is moved to
+           ;; point-min somewhere else which shouldn't happen.
+           (goto-char (overlay-start helm-selection-overlay))
+           (let* ((header-pos (or (helm-get-previous-header-pos)
+                                  (helm-get-next-header-pos)))
+                  (source-name
+                   (save-excursion
+                     (unless header-pos
+                       (cl-return-from exit nil))
+                     (goto-char header-pos)
+                     (helm-current-line-contents))))
+             (cl-loop for source in (helm-get-sources) thereis
+                   (and (equal (assoc-default 'name source) source-name)
+                        source))))))))
+
+(defun helm-buffer-is-modified (buffer)
+  "Return non-nil when BUFFER is modified since `helm' was invoked."
+  (let* ((b (get-buffer buffer))
+         (key (concat (buffer-name b) "/" (helm-attr 'name)))
+         (source-tick (or (gethash key helm-tick-hash) 0))
+         (buffer-tick (buffer-chars-modified-tick b))
+         (modifiedp (/= source-tick buffer-tick)))
+    (puthash key buffer-tick helm-tick-hash)
+    (helm-log "buffer = %S" buffer)
+    (helm-log "modifiedp = %S" modifiedp)
+    modifiedp))
+
+(defun helm-current-buffer-is-modified ()
+  "Check if `helm-current-buffer' is modified since `helm' was invoked."
+  (helm-buffer-is-modified helm-current-buffer))
+
+(defun helm-run-after-exit (function &rest args)
+  "Exectute FUNCTION with ARGS after exiting `helm'.
+The action is to call FUNCTION with arguments ARGS.
+Contrarily to `helm-exit-and-execute-action' this can be used
+to call non--actions functions with any ARGS or no ARGS at all.
+
+Use this on commands invoked from keybindings, but not
+on action functions invoked as action from the action menu,
+i.e functions called with RET."
+  (helm-kill-async-processes)
+  (helm-log "function = %S" function)
+  (helm-log "args = %S" args)
+  (helm-exit-and-execute-action
+   (lambda (_candidate)
+     (apply function args))))
+
+(defun helm-exit-and-execute-action (action)
+  "Exit current helm session and execute ACTION.
+Argument ACTION is a function called with one arg (candidate)
+and part of the actions of current source.
+
+Use this on commands invoked from keybindings, but not
+on action functions invoked as action from the action menu,
+i.e functions called with RET."
+  (setq helm-saved-action action)
+  (setq helm-saved-selection (helm-get-selection))
+  (helm-exit-minibuffer))
+
+(defalias 'helm-run-after-quit 'helm-run-after-exit)
+(make-obsolete 'helm-run-after-quit 'helm-run-after-exit "1.7.7")
+(defalias 'helm-quit-and-execute-action 'helm-exit-and-execute-action)
+(make-obsolete 'helm-quit-and-execute-action 'helm-exit-and-execute-action "1.7.7")
+
+(defun helm-interpret-value (value &optional source compute)
+  "Interpret VALUE as variable, function or literal and return it.
+If VALUE is a function, call it with no arguments and return the value
+unless COMPUTE value is 'ignorefn.
+If SOURCE compute VALUE for this source.
+If VALUE is a variable, return the value.
+If VALUE is a symbol, but it is not a function or a variable, cause an error.
+Otherwise, return VALUE itself."
+  (cond ((and source (functionp value) (not (eq compute 'ignorefn)))
+         (helm-funcall-with-source source value))
+        ((and (functionp value) (not (eq compute 'ignorefn)))
+         (funcall value))
+        ((and (symbolp value) (boundp value))
+         (symbol-value value))
+        ((and (symbolp value) (not (functionp value)))
+         (error
+          "helm-interpret-value: Symbol must be a function or a variable"))
+        (t
+         value)))
+
+(defun helm-set-local-variable (&rest args)
+  "Bind each pair in ARGS locally to `helm-buffer'.
+
+Use this to set local vars before calling helm.
+
+When used from an init or update function
+(i.e when `helm-force-update' is running) the variables are set
+using `make-local-variable' within the `helm-buffer'.
+
+Usage: helm-set-local-variable ([VAR VALUE]...)
+Just like `setq' except that the vars are not set sequentially.
+IOW Don't use VALUE of previous VAR to set the VALUE of next VAR.
+
+\(fn VAR VALUE ...)"
+  (if helm-force-updating-p
+      (with-helm-buffer
+        (cl-loop for i on args by #'cddr
+                 do (set (make-local-variable (car i)) (cadr i))))
+      (setq helm--local-variables
+            (append (cl-loop for i on args by #'cddr
+                             collect (cons (car i) (cadr i)))
+                    helm--local-variables))))
+
+
+;; Core: API helper
+(cl-defun helm-empty-buffer-p (&optional (buffer helm-buffer))
+  "Check if BUFFER have candidates.
+Default value for BUFFER is `helm-buffer'."
+  (zerop (buffer-size (and buffer (get-buffer buffer)))))
+
+(defun helm-empty-source-p ()
+  "Check if current source contains candidates.
+This happen only in certains cases when e.g the last element
+of a source is deleted without updating the source."
+  (with-helm-window
+    (or (helm-empty-buffer-p)
+        (and (helm-end-of-source-p)
+             (eq (point-at-bol) (point-at-eol))
+             (or
+              (save-excursion
+                (forward-line -1)
+                (helm-pos-header-line-p))
+              (bobp))))))
+
+
+;; Core: tools
+
+(defun helm-funcall-with-source (source functions &rest args)
+  "Call from SOURCE FUNCTIONS list or single function FUNCTIONS with ARGS.
+FUNCTIONS can be a symbol or a list of functions.
+Return the result of last function call."
+  (let ((helm-source-name (assoc-default 'name source))
+        (helm-current-source source)
+        (funs (if (functionp functions) (list functions) functions)))
+    (helm-log "helm-source-name = %S" helm-source-name)
+    (helm-log "functions = %S" functions)
+    (helm-log "args = %S" args)
+    (cl-loop with result for fn in funs
+             do (setq result (apply fn args))
+             finally return result)))
+
+(defun helm-funcall-foreach (sym &optional sources)
+  "Call the associated function to SYM for each source if any."
+  (let ((sources (or sources (helm-get-sources))))
+    (cl-dolist (source sources)
+      (helm-aif (assoc-default sym source)
+          (helm-funcall-with-source source it)))))
+
+(defun helm-normalize-sources (sources)
+  "If SOURCES is only one source, make a list of one element."
+  (cond ((or (and sources
+                  (symbolp sources))
+             (and (listp sources) (assq 'name sources)))
+         (list sources))
+        (sources)
+        (t helm-sources)))
+
+(defun helm-get-candidate-number (&optional in-current-source)
+  "Return candidates number in `helm-buffer'.
+If IN-CURRENT-SOURCE is provided return number of candidates
+in the source where point is."
+  (with-current-buffer (helm-buffer-get)
+    (if (or (helm-empty-buffer-p)
+            (helm-empty-source-p))
+        0
+      (save-excursion
+        (if in-current-source
+            (goto-char (helm-get-previous-header-pos))
+          (goto-char (point-min)))
+        (forward-line 1)
+        (if (helm-pos-multiline-p)
+            (save-excursion
+              (cl-loop with count-multi = 1
+                    while (and (not (if in-current-source
+                                        (save-excursion
+                                          (forward-line 2)
+                                          (or (helm-pos-header-line-p) (eobp)))
+                                      (eobp)))
+                               (search-forward helm-candidate-separator nil t))
+                    do (cl-incf count-multi)
+                    finally return count-multi))
+          (save-excursion
+            (cl-loop with ln = 0
+                  while (not (if in-current-source
+                                 (or (helm-pos-header-line-p) (eobp))
+                               (eobp)))
+                  unless (helm-pos-header-line-p)
+                  do (cl-incf ln)
+                  do (forward-line 1) finally return ln)))))))
+
+(defmacro with-helm-quittable (&rest body)
+  "If an error occur in execution of BODY, quit helm safely."
+  (declare (indent 0) (debug t))
+  `(condition-case _v
+       (let (inhibit-quit)
+         ,@body)
+     (quit (setq quit-flag t)
+           (setq helm-quit t)
+           (exit-minibuffer)
+           (keyboard-quit)
+           ;; See comment about this in `with-local-quit'.
+           (eval '(ignore nil)))))
+
+(defun helm-compose (arg-lst func-lst)
+  "Apply arguments specified in ARG-LST with each function of FUNC-LST.
+The result of each function will be the new `car' of ARG-LST.
+Each function in FUNC-LST must accept (length ARG-LST) arguments
+\(See examples below) .
+This function allows easy sequencing of transformer functions.
+Where generally, ARG-LST is '(candidates-list source) and FUNC-LST a
+list of transformer functions that take one or two arguments depending
+we are using 'filtered-candidate-transformer' or 'candidate-transformer'.
+e.g
+filtered-candidate-transformer:
+\(helm-compose '((1 2 3 4 5 6 7)
+                '((name . \"A helm source\") (candidates . (a b c))))
+              '((lambda (candidates _source)
+                  (cl-loop for i in candidates
+                        when (cl-oddp i) collect i))
+                (lambda (candidates _source)
+                  (cl-loop for i in candidates collect (1+ i)))))
+=>(2 4 6 8)
+
+candidate-transformer:
+\(helm-compose '((1 2 3 4 5 6 7))
+                '((lambda (candidates)
+                  (cl-loop for i in candidates
+                        when (cl-oddp i) collect i))
+                (lambda (candidates)
+                  (cl-loop for i in candidates collect (1+ i)))))
+=> (2 4 6 8)."
+  (cl-dolist (func func-lst)
+    (setcar arg-lst (apply func arg-lst)))
+  (car arg-lst))
+
+(defun helm-composed-funcall-with-source (source funcs &rest args)
+  "With SOURCE apply `helm-funcall-with-source' with each FUNCS and ARGS.
+This is used in transformers to modify candidates list."
+  (if (functionp funcs)
+      (apply 'helm-funcall-with-source source funcs args)
+      (apply 'helm-funcall-with-source source
+             (lambda (&rest oargs) (helm-compose oargs funcs))
+             args)))
+
+
+;; Core: entry point
+;; `:allow-nest' is not in this list because it is treated before.
+(defconst helm-argument-keys
+  '(:sources :input :prompt :resume
+    :preselect :buffer :keymap :default :history))
+
+;;;###autoload
+(defun helm (&rest plist)
+  "Main function to execute helm sources.
+
+Keywords supported:
+:sources :input :prompt :resume :preselect
+:buffer :keymap :default :history :allow-nest
+
+Extra LOCAL-VARS keywords are supported, see below.
+
+PLIST is a list like \(:key1 val1 :key2 val2 ...\) or
+\(&optional sources input prompt resume
+            preselect buffer keymap default history\).
+
+Basic keywords are the following:
+
+\:sources
+
+A list of sources used for this session.  It also accepts a
+symbol, interpreted as a variable of a helm source
+i.e (a symbol can be passed instead of a list of sources).
+It also accepts an alist representing a helm source, which is
+detected by \(assq 'name ANY-SOURCES\).
+NOTE: In this case the source is embedded in the helm command and
+have no symbol name, so it is not reachable from outside.
+It will be referenced in `helm-sources' as a whole alist.
+
+\:input
+
+Temporary value of `helm-pattern', ie. initial input of minibuffer.
+
+\:prompt
+
+Prompt other than \"pattern: \".
+
+\:resume
+
+If t, Resurrect previously instance of `helm'.  Skip the initialization.
+If 'noresume, this instance of `helm' cannot be resumed.
+
+\:preselect
+
+Initially selected candidate.  Specified by exact candidate or a regexp.
+
+\:buffer
+
+`helm-buffer' instead of *helm*.
+
+\:keymap
+
+`helm-map' for current `helm' session.
+
+\:default
+
+A default argument that will be inserted in minibuffer \
+with \\<minibuffer-local-map>\\[next-history-element].
+When nil or not present `thing-at-point' will be used instead.
+If `helm--maybe-use-default-as-input' is non--nil display will be
+updated using :default arg as input unless :input is specified,
+which in this case will take precedence on :default
+This is a string or a list, in this case the car of the list will
+be used as initial default input, but you will be able to cycle in this
+list with \\<minibuffer-local-map>\\[next-history-element].
+
+\:history
+
+By default all minibuffer input is pushed to `minibuffer-history',
+if an argument HISTORY is provided, input will be pushed to HISTORY.
+History element should be a symbol.
+
+\:allow-nest
+
+Allow running this helm command within a running helm session.
+
+Of course, conventional arguments are supported, the two are same.
+
+\(helm :sources sources :input input :prompt prompt :resume resume
+       :preselect preselect :buffer buffer :keymap keymap :default default
+       :history history\)
+
+and
+
+\(helm sources input prompt resume preselect buffer keymap default history\)
+
+are the same.
+
+However the use of non keyword args is deprecated and should not be used.
+
+Other keywords are interpreted as local variables of this helm session.
+The `helm-' prefix can be omitted.  For example,
+
+\(helm :sources 'helm-source-buffers-list
+       :buffer \"*buffers*\" :candidate-number-limit 10\)
+
+means starting helm session with `helm-source-buffers'
+source in *buffers* buffer and set variable `helm-candidate-number-limit'
+to 10 as session local variable.
+
+\(fn &key SOURCES INPUT PROMPT RESUME PRESELECT BUFFER KEYMAP DEFAULT HISTORY ALLOW-NEST OTHER-LOCAL-VARS)"
+  (let ((fn (cond ((or (and helm-alive-p (plist-get plist :allow-nest))
+                       (and helm-alive-p (memq 'allow-nest plist)))
+                   #'helm-nest)
+                  ((keywordp (car plist))
+                   #'helm)
+                  (t #'helm-internal))))
+    (if (and helm-alive-p (eq fn #'helm))
+        (if (helm-alive-p)
+            ;; A helm session is normally running.
+            (error "Error: Trying to run helm within a running helm session")
+          ;; A helm session is already running and user jump somewhere else
+          ;; without desactivating it.
+          (with-helm-buffer
+            (prog1
+                (message "Aborting an helm session running in background")
+              ;; `helm-alive-p' will be reset in unwind-protect forms.
+              (helm-keyboard-quit))))
+      (if (keywordp (car plist))
+          ;; Parse `plist' and move not regular `helm-argument-keys'
+          ;; to `helm--local-variables', then calling helm on itself
+          ;; with normal arguments (the non--arguments-keys removed)
+          ;; will end up in [1].
+          (progn
+            (setq helm--local-variables
+                  (append helm--local-variables
+                          ;; Vars passed by keyword on helm call
+                          ;; take precedence on same vars
+                          ;; that may have been passed before helm call.
+                          (helm-parse-keys plist)))
+            (apply fn (mapcar (lambda (key) (plist-get plist key))
+                              helm-argument-keys)))
+        (apply fn plist))))) ; [1] fn == helm-internal.
+
+(defun helm-alive-p ()
+  "Check if `helm' is alive.
+An `helm' session is considered alive if `helm-alive-p' is non--nil,
+the `helm-buffer' is visible, and cursor is in minibuffer."
+  (and helm-alive-p
+       (get-buffer-window helm-buffer 'visible)
+       (minibuffer-window-active-p (minibuffer-window))
+       (minibufferp (current-buffer))))
+
+(defun helm-parse-keys (keys)
+  "Parse the KEYS arguments of `helm'.
+Return only the keys that are not in `helm-argument-keys',
+prefix them with \"helm\" and convert them to alist.
+This allow to add arguments that are not part of `helm-argument-keys',
+but are valid helm variables.
+e.g :candidate-number-limit will be bound to `helm-candidate-number-limit'
+in source.
+
+  (helm-parse-keys '(:sources ((name . \"test\")
+                               (candidates . (a b c)))
+                     :buffer \"toto\"
+                     :candidate-number-limit 4))
+  ==> ((helm-candidate-number-limit . 4))."
+
+  (cl-loop for (key value) on keys by #'cddr
+           for symname = (substring (symbol-name key) 1)
+           for sym = (intern (if (string-match "^helm-" symname)
+                                 symname
+                                 (concat "helm-" symname)))
+           unless (memq key helm-argument-keys)
+           collect (cons sym value)))
+
+;;; Core: entry point helper
+(defun helm-internal (&optional
+                        any-sources any-input
+                        any-prompt any-resume
+                        any-preselect any-buffer
+                        any-keymap any-default any-history)
+  "The internal helm function called by `helm'.
+For ANY-SOURCES ANY-INPUT ANY-PROMPT ANY-RESUME ANY-PRESELECT ANY-BUFFER and
+ANY-KEYMAP ANY-DEFAULT ANY-HISTORY See `helm'."
+  ;; Activate the advice for `tramp-read-passwd'.
+  (if (fboundp 'advice-add)
+      (progn
+        (advice-add 'tramp-read-passwd :around #'helm--advice-tramp-read-passwd)
+        (advice-add 'ange-ftp-get-passwd :around #'helm--advice-ange-ftp-get-passwd))
+      (ad-activate 'tramp-read-passwd)
+      (ad-activate 'ange-ftp-get-passwd))
+  (helm-log (concat "[Start session] " (make-string 41 ?+)))
+  (helm-log "any-prompt = %S" any-prompt)
+  (helm-log "any-preselect = %S" any-preselect)
+  (helm-log "any-buffer = %S" any-buffer)
+  (helm-log "any-keymap = %S" any-keymap)
+  (helm-log "any-default = %S" any-default)
+  (helm-log "any-history = %S" any-history)
+  (setq helm--prompt (or any-prompt "pattern: "))
+  (let ((non-essential t)
+        (input-method-verbose-flag helm-input-method-verbose-flag)
+        (old--cua cua-mode)
+        (helm--maybe-use-default-as-input
+         (and (null any-input)
+              (or helm--maybe-use-default-as-input ; it is let-bounded so use it.
+                  (cl-loop for s in (helm-normalize-sources any-sources)
+                           thereis (memq s helm-sources-using-default-as-input))))))
+    ;; cua-mode overhide local helm bindings.
+    ;; disable this stupid thing if enabled.
+    (and cua-mode (cua-mode -1))
+    (unwind-protect
+         (condition-case-unless-debug _v
+             (let ( ;; `helm-source-name' is non-nil
+                   ;; when `helm' is invoked by action, reset it.
+                   helm-source-name
+                   helm-current-source
+                   helm-in-persistent-action
+                   helm-quit
+                   (helm-buffer (or any-buffer helm-buffer)))
+               (with-helm-restore-variables
+                 (helm-initialize
+                  any-resume any-input any-default any-sources)
+                 (helm-display-buffer helm-buffer)
+                 ;; We are now in helm-buffer.
+                 (when helm-prevent-escaping-from-minibuffer
+                   (helm--remap-mouse-mode 1)) ; Disable mouse bindings.
+                 (add-hook 'post-command-hook 'helm--maybe-update-keymap)
+                 (add-hook 'post-command-hook 'helm--update-header-line)
+                 (helm-log "show prompt")
+                 (unwind-protect
+                      (helm-read-pattern-maybe
+                       any-prompt any-input any-preselect
+                       any-resume any-keymap any-default any-history)
+                   (helm-cleanup)))
+               (prog1
+                   (unless helm-quit (helm-execute-selection-action))
+                 (helm-log (concat "[End session] " (make-string 41 ?-)))))
+           (quit
+            (helm-restore-position-on-quit)
+            (helm-log (concat "[End session (quit)] " (make-string 34 ?-)))
+            nil))
+      (if (fboundp 'advice-add)
+          (progn
+            (advice-remove 'tramp-read-passwd
+                           #'helm--advice-tramp-read-passwd)
+            (advice-remove 'ange-ftp-get-passwd
+                           #'helm--advice-ange-ftp-get-passwd))
+          (ad-deactivate 'tramp-read-passwd)
+          (ad-deactivate 'ange-ftp-get-passwd))
+      (helm-log "helm-alive-p = %S" (setq helm-alive-p nil))
+      (helm--remap-mouse-mode -1)       ; Reenable mouse bindings.
+      (setq helm-alive-p nil)
+      ;; Reset helm-pattern so that lambda's using it
+      ;; before running helm will not start with its old value.
+      (setq helm-pattern "")
+      (and old--cua (cua-mode 1))
+      (helm-log-save-maybe))))
+
+
+;;; Helm resume
+;;
+;;
+(defun helm-resume (arg)
+  "Resurrect previously invoked `helm'.
+Called with a prefix arg, allow choosing among all existing
+helm buffers.  i.e choose among various helm sessions.
+Called from lisp, you can specify a buffer-name as a string with ARG."
+  (interactive "P")
+  (let (any-buffer helm-full-frame cur-dir)
+    (if arg
+        (if (and (stringp arg) (bufferp (get-buffer arg)))
+            (setq any-buffer arg)
+          (setq any-buffer (helm-resume-select-buffer)))
+      (setq any-buffer helm-last-buffer))
+    (cl-assert any-buffer nil
+               "helm-resume: No helm buffers found to resume")
+    ;; Reset `cursor-type' to nil as it have been set to t
+    ;; when quitting previous session.
+    (with-current-buffer any-buffer (setq cursor-type nil))
+    (setq helm-full-frame (buffer-local-value
+                           'helm-full-frame (get-buffer any-buffer)))
+    (setq helm-compiled-sources nil)
+    (setq cur-dir (buffer-local-value
+                   'default-directory (get-buffer any-buffer)))
+    (setq helm-saved-selection nil
+          helm-saved-action nil)
+    (unless (buffer-live-p helm-current-buffer)
+      ;; `helm-current-buffer' may have been killed.
+      (setq helm-current-buffer (current-buffer)))
+    ;; Restart with same `default-directory' value this session
+    ;; was initially started with.
+    (with-helm-default-directory cur-dir
+        (helm
+         :sources (buffer-local-value
+                   'helm-sources (get-buffer any-buffer))
+         :input (buffer-local-value 'helm-input-local (get-buffer any-buffer))
+         :resume t
+         :buffer any-buffer))))
+
+(defun helm-resume-previous-session-after-quit (arg)
+  "Resume previous helm session within running helm."
+  (interactive "p")
+  (with-helm-alive-p
+    (if (> (length helm-buffers) arg)
+        (helm-run-after-exit `(lambda () (helm-resume (nth ,arg helm-buffers))))
+        (message "No previous helm sessions to resume yet!"))))
+(put 'helm-resume-previous-session-after-quit 'helm-only t)
+
+(defun helm-resume-list-buffers-after-quit ()
+  "List resumable helm buffers within running helm."
+  (interactive)
+  (with-helm-alive-p
+    (if (> (length helm-buffers) 0)
+        (helm-run-after-exit (lambda () (helm-resume t)))
+        (message "No previous helm sessions to resume yet!"))))
+(put 'helm-resume-list-buffers-after-quit 'helm-only t)
+
+(defun helm-resume-p (any-resume)
+  "Whether current helm session is resumed or not."
+  (eq any-resume t))
+
+(defun helm-resume-select-buffer ()
+  "Select an `helm-buffer' in `helm-buffers' list to resume a helm session.
+Return nil if no `helm-buffer' found."
+  (when helm-buffers
+    (or (helm :sources '(((name . "Resume helm buffer")
+                          (candidates . helm-buffers)
+                          (action . identity)))
+              :resume 'noresume
+              :buffer "*helm resume*")
+        (keyboard-quit))))
+
+
+;;;###autoload
+(defun helm-other-buffer (any-sources any-buffer)
+  "Simplified interface of `helm' with other `helm-buffer'.
+Call `helm' with only ANY-SOURCES and ANY-BUFFER as args."
+  (helm :sources any-sources :buffer any-buffer))
+
+(defun helm-nest (&rest same-as-helm)
+  "Allow calling `helm' whithin a running helm session.
+Arguments SAME-AS-HELM are the same as `helm', which see."
+  (with-helm-window
+    (let ((orig-helm-current-buffer helm-current-buffer)
+          (orig-helm-buffer helm-buffer)
+          (orig-helm--prompt helm--prompt)
+          (orig-helm--in-fuzzy helm--in-fuzzy)
+          (orig-helm-last-frame-or-window-configuration
+           helm-last-frame-or-window-configuration)
+          (orig-one-window-p helm-onewindow-p))
+      (unwind-protect
+           (let (helm-current-position
+                 helm-current-buffer
+                 helm-pattern
+                 (helm-buffer (or (cl-getf same-as-helm :buffer)
+                                  (nth 5 same-as-helm)
+                                  "*Helm*"))
+                 helm-sources
+                 helm-compiled-sources
+                 (helm-full-frame t)
+                 (enable-recursive-minibuffers t))
+             (apply #'helm same-as-helm))
+        (with-current-buffer orig-helm-buffer
+          (setq helm-alive-p t) ; Nested session set this to nil on exit.
+          (setq helm-buffer orig-helm-buffer)
+          (setq helm--prompt orig-helm--prompt)
+          (setq helm--in-fuzzy orig-helm--in-fuzzy)
+          (helm-initialize-overlays helm-buffer)
+          (unless (helm-empty-buffer-p) (helm-mark-current-line t))
+          (setq helm-last-frame-or-window-configuration
+                orig-helm-last-frame-or-window-configuration)
+          (setq cursor-type nil)
+          (setq helm-current-buffer orig-helm-current-buffer)
+          (setq helm-onewindow-p orig-one-window-p)
+          ;; Be sure advices, hooks, and local modes keep running.
+          (if (fboundp 'advice-add)
+              (progn
+                (advice-add 'tramp-read-passwd
+                            :around #'helm--advice-tramp-read-passwd)
+                (advice-add 'ange-ftp-get-passwd
+                            :around #'helm--advice-ange-ftp-get-passwd))
+              (ad-activate 'tramp-read-passwd)
+              (ad-activate 'ange-ftp-get-passwd))
+          (when helm-prevent-escaping-from-minibuffer
+            (helm--remap-mouse-mode 1))
+          (unless (cl-loop for h in post-command-hook
+                           thereis (memq h '(helm--maybe-update-keymap
+                                             helm--update-header-line)))
+            (add-hook 'post-command-hook 'helm--maybe-update-keymap)
+            (add-hook 'post-command-hook 'helm--update-header-line))
+          (helm-display-mode-line (helm-get-current-source)))))))
+
+
+;;; Core: Accessors
+;;
+(defun helm-current-position (save-or-restore)
+  "Restore or save current position in `helm-current-buffer'.
+Argument SAVE-OR-RESTORE is one of save or restore."
+  (cl-case save-or-restore
+    (save
+     (helm-log "Save position at %S" (cons (point) (window-start)))
+     (setq helm-current-position (cons (point) (window-start))))
+    (restore
+     ;; Maybe `helm-current-buffer' have been deleted
+     ;; during helm session so check if it is here
+     ;; otherwise position in underlaying buffer will be lost.
+     (when (get-buffer-window helm-current-buffer 'visible)
+       (helm-log "Restore position at  %S in buffer %s"
+                 helm-current-position
+                 (buffer-name (current-buffer)))
+       (goto-char (car helm-current-position))
+       ;; Fix this position with the NOFORCE arg of `set-window-start'
+       ;; otherwise, if there is some other buffer than `helm-current-buffer'
+       ;; one, position will be lost.
+       (set-window-start (selected-window) (cdr helm-current-position) t)))))
+
+
+(defun helm-frame-or-window-configuration (save-or-restore)
+  "Save or restore last frame or window configuration.
+Possible value of SAVE-OR-RESTORE are 'save and 'restore.
+window or frame configuration is saved/restored according to values of
+`helm-save-configuration-functions'."
+  (helm-log "helm-save-configuration-functions = %S"
+            helm-save-configuration-functions)
+  (let ((window-persistent-parameters (append '((no-other-window . t))
+                                              window-persistent-parameters)))
+    (cl-case save-or-restore
+      (save    (setq helm-last-frame-or-window-configuration
+                     (funcall (cdr helm-save-configuration-functions))))
+      (restore (funcall (car helm-save-configuration-functions)
+                        helm-last-frame-or-window-configuration)
+               ;; Restore frame focus.
+               ;; This is needed for minibuffer own-frame config
+               ;; when recursive minibuffers are in use.
+               ;; e.g M-: + helm-minibuffer-history.
+               (let ((frame (if (minibufferp helm-current-buffer)
+                                (selected-frame)
+                              (last-nonminibuffer-frame))))
+                 (select-frame-set-input-focus frame))))))
+
+(defun helm-split-window-default-fn (window)
+  (let (split-width-threshold)
+    (if (and (fboundp 'window-in-direction)
+             ;; Don't try to split when starting in a minibuffer
+             ;; e.g M-: and try to use helm-show-kill-ring.
+             (not (minibufferp helm-current-buffer)))
+        (if (or (one-window-p t)
+                helm-split-window-in-side-p)
+            (split-window
+             (selected-window) nil (if (eq helm-split-window-default-side 'other)
+                                       'below helm-split-window-default-side))
+          ;; If more than one window reuse one of them.
+          (cl-case helm-split-window-default-side
+            (left  (or (helm-window-in-direction 'left)
+                       (helm-window-in-direction 'above)
+                       (selected-window)))
+            (above (or (helm-window-in-direction 'above)
+                       (helm-window-in-direction 'left)
+                       (selected-window)))
+            (right (or (helm-window-in-direction 'right)
+                       (helm-window-in-direction 'below)
+                       (selected-window)))
+            (below (or (helm-window-in-direction 'below)
+                       (helm-window-in-direction 'right)
+                       (selected-window)))
+            (same  (selected-window))
+            (other (other-window-for-scrolling))
+            (t     (or (window-next-sibling) (selected-window)))))
+      (split-window-sensibly window))))
+
+(defun helm-window-in-direction (direction)
+  "Same as `window-in-direction' but check if window is dedicated."
+  (helm-aif (window-in-direction direction)
+      (and (not (window-dedicated-p it)) it)))
+
+
+;;; Display helm buffer
+;;
+;;
+(defun helm-display-buffer (buffer)
+  "Display BUFFER.
+The function used to display `helm-buffer'."
+  (let (pop-up-frames
+        (split-window-preferred-function
+         helm-split-window-preferred-function)
+        (helm-split-window-default-side
+         (if (and (not helm-full-frame)
+                  helm-reuse-last-window-split-state)
+             (cond ((eq helm-split-window-default-side 'same) 'same)
+                   ((eq helm-split-window-default-side 'other) 'other)
+                   (helm--window-side-state)
+                   (t helm-split-window-default-side))
+           helm-split-window-default-side)))
+    (prog1
+        (funcall (with-current-buffer buffer helm-display-function) buffer)
+      (setq helm-onewindow-p (one-window-p t))
+      ;; Don't allow other-window and friends switching out of minibuffer.
+      (when helm-prevent-escaping-from-minibuffer
+        (helm-prevent-switching-other-window)))))
+
+(cl-defun helm-prevent-switching-other-window (&key (enabled t))
+  "Allow setting `no-other-window' window parameter in all windows.
+Arg ENABLE will be the value of the `no-other-window' window property."
+  (walk-windows
+   (lambda (w)
+       (unless (window-dedicated-p w)
+         (set-window-parameter w 'no-other-window enabled)))
+   0))
+
+(defun helm-default-display-buffer (buffer)
+  "Default function to display `helm-buffer' BUFFER.
+It uses `switch-to-buffer' or `display-buffer' depending of value
+of `helm-full-frame' and/or `helm-split-window-default-side'."
+  (if (or (buffer-local-value 'helm-full-frame (get-buffer buffer))
+          (and (eq helm-split-window-default-side 'same)
+               (one-window-p t)))
+      (progn (delete-other-windows) (switch-to-buffer buffer))
+    (when (and (or helm-always-two-windows helm-autoresize-mode
+                   (and (not helm-split-window-in-side-p)
+                        (eq (save-selected-window
+                              (funcall helm-split-window-preferred-function
+                                       (selected-window)))
+                            (get-buffer-window helm-current-buffer))))
+               (not (eq helm-split-window-default-side 'same))
+               (not (minibufferp helm-current-buffer))
+               (not helm-split-window-in-side-p))
+      (delete-other-windows))
+    (display-buffer
+     buffer `(nil . ((window-height . ,helm-display-buffer-default-size))))))
+
+
+;;; Core: initialize
+;;
+(defun helm-initialize (any-resume any-input any-default any-sources)
+  "Start initialization of `helm' session.
+For ANY-RESUME ANY-INPUT ANY-DEFAULT and ANY-SOURCES See `helm'."
+  (helm-log "start initialization: any-resume=%S any-input=%S"
+            any-resume any-input)
+  (helm-frame-or-window-configuration 'save)
+  (setq helm-sources (helm-normalize-sources any-sources))
+  (setq helm--in-fuzzy
+        (cl-loop for s in helm-sources
+                 for matchfns = (helm-match-functions
+                                 (if (symbolp s) (symbol-value s) s))
+                 for searchfns = (helm-search-functions
+                                  (if (symbolp s) (symbol-value s) s))
+                 when (or (member 'helm-fuzzy-match matchfns)
+                          (member 'helm-fuzzy-search searchfns))
+                 return t))
+  (helm-log "sources = %S" helm-sources)
+  (helm-current-position 'save)
+  (if (helm-resume-p any-resume)
+      (helm-initialize-overlays (helm-buffer-get))
+    (helm-initial-setup any-default))
+  (setq helm-alive-p t)
+  (unless (eq any-resume 'noresume)
+    (helm-recent-push helm-buffer 'helm-buffers)
+    (setq helm-last-buffer helm-buffer))
+  (when any-input
+    (setq helm-input any-input
+          helm-pattern any-input)
+    (helm--fuzzy-match-maybe-set-pattern))
+  ;; If a `resume' attribute is present `helm-funcall-foreach'
+  ;; will run its function.
+  (when (helm-resume-p any-resume)
+    (helm-funcall-foreach 'resume))
+  (helm-log "end initialization"))
+
+(defun helm-initialize-overlays (buffer)
+  "Initialize helm overlays in BUFFER."
+  (helm-log "overlay setup")
+  (if helm-selection-overlay
+      ;; make sure the overlay belongs to the helm buffer if
+      ;; it's newly created
+      (move-overlay helm-selection-overlay (point-min) (point-min)
+                    (get-buffer buffer))
+
+    (setq helm-selection-overlay
+          (make-overlay (point-min) (point-min) (get-buffer buffer)))
+    (overlay-put helm-selection-overlay 'face 'helm-selection)
+    (overlay-put helm-selection-overlay 'priority 1)))
+
+(defun helm-restore-position-on-quit ()
+  "Restore position in `helm-current-buffer' when quitting."
+  (helm-current-position 'restore))
+
+(defun helm-recent-push (elt list-var)
+  "Add ELT to the value of LIST-VAR as most recently used value."
+  (let ((m (member elt (symbol-value list-var))))
+    (and m (set list-var (delq (car m) (symbol-value list-var))))
+    (push elt (symbol-value list-var))))
+
+(defun helm--current-buffer ()
+  "[internal] Return `current-buffer' BEFORE `helm-buffer' is initialized.
+Note that this will return the minibuffer in use after helm have started,
+so to get the buffer where helm started while in a helm session,
+use `helm-current-buffer'.
+It is intended to use this only in `helm-initial-setup'."
+  (if (minibuffer-window-active-p (minibuffer-window))
+      ;; If minibuffer is active be sure to use it's buffer
+      ;; as `helm-current-buffer', this allow to use helm
+      ;; from an already active minibuffer (M-: etc...)
+      (window-buffer (active-minibuffer-window))
+    ;; Fix Issue #456
+    ;; Use this instead of `current-buffer' to ensure
+    ;; helm session started in helm-mode from a completing-read
+    ;; Use really the buffer where we started and not the one
+    ;; where the completing-read is wrapped. i.e
+    ;; (with-current-buffer SOME-OTHER-BUFFER (completing-read [...])
+    (window-buffer (with-selected-window (minibuffer-window)
+                     (minibuffer-selected-window)))))
+
+(defun helm--run-init-hooks (hook)
+  "Run after and before init hooks local to source.
+See :after-init-hook and :before-init-hook in `helm-source'."
+  (cl-loop with sname = (cl-ecase hook
+                          (before-init-hook "h-before-init-hook")
+                          (after-init-hook "h-after-init-hook"))
+           with h = (cl-gensym sname)
+           for s in (helm-get-sources)
+           for hv = (assoc-default hook s)
+           if (and hv (not (symbolp hv)))
+           do (set h hv)
+           and do (helm-log-run-hook h)
+           else do (helm-log-run-hook hv)))
+
+(defun helm-initial-setup (any-default)
+  "Initialize helm settings and set up the helm buffer."
+  ;; Run global hook.
+  (helm-log-run-hook 'helm-before-initialize-hook)
+  ;; Run local source hook.
+  (helm--run-init-hooks 'before-init-hook)
+  ;; For initialization of helm locals vars that need
+  ;; a value from current buffer, it is here.
+  (helm-set-local-variable 'current-input-method current-input-method)
+  (setq helm-current-prefix-arg nil
+        helm-saved-action nil
+        helm-saved-selection nil
+        helm-suspend-update-flag nil
+        helm-current-buffer (helm--current-buffer)
+        helm-buffer-file-name buffer-file-name
+        helm-issued-errors nil
+        helm-compiled-sources nil
+        helm-saved-current-source nil)
+  (unless (and (or helm-split-window-state
+                   helm--window-side-state)
+               helm-reuse-last-window-split-state)
+    (setq helm-split-window-state
+          (if (or (null split-width-threshold)
+                  (and (integerp split-width-threshold)
+                       (>= split-width-threshold (+ (frame-width) 4))))
+              'vertical 'horizontal))
+    (setq helm--window-side-state
+          (or helm-split-window-default-side 'below)))
+  ;; Call the init function for sources where appropriate
+  (helm-funcall-foreach
+   'init (and helm-source-filter
+              (cl-remove-if-not (lambda (s)
+                                    (member (assoc-default 'name s)
+                                            helm-source-filter))
+                                (helm-get-sources))))
+  (setq helm-pattern (or (and helm--maybe-use-default-as-input
+                              (or (if (listp any-default)
+                                      (car any-default) any-default)
+                                  (with-helm-current-buffer
+                                    (thing-at-point 'symbol))))
+                         ""))
+  (setq helm-input "")
+  (clrhash helm-candidate-cache)
+  (helm-create-helm-buffer)
+  (helm-clear-visible-mark)
+  ;; Run global hook.
+  (helm-log-run-hook 'helm-after-initialize-hook)
+  ;; Run local source hook.
+  (helm--run-init-hooks 'after-init-hook))
+
+(defun helm-create-helm-buffer ()
+  "Create and setup `helm-buffer'."
+  (let ((root-dir default-directory))
+    (with-current-buffer (get-buffer-create helm-buffer)
+      (helm-log "kill local variables: %S" (buffer-local-variables))
+      (kill-all-local-variables)
+      (set (make-local-variable 'inhibit-read-only) t)
+      (buffer-disable-undo)
+      (erase-buffer)
+      (set (make-local-variable 'helm-map) helm-map)
+      (make-local-variable 'helm-sources)
+      (set (make-local-variable 'helm-follow-mode) nil)
+      (set (make-local-variable 'helm-display-function) helm-display-function)
+      (set (make-local-variable 'helm-selection-point) nil)
+      (set (make-local-variable 'scroll-margin)
+           (if helm-display-source-at-screen-top
+               0 helm-completion-window-scroll-margin))
+      (set (make-local-variable 'default-directory) root-dir)
+      (set (make-local-variable 'helm-marked-candidates) nil)
+      (helm-initialize-persistent-action)
+      (helm-log "helm-display-function = %S" helm-display-function)
+      (helm-log "helm--local-variables = %S" helm--local-variables)
+      (cl-loop for (var . val) in helm--local-variables
+               do (set (make-local-variable var) val)
+               finally (setq helm--local-variables nil))
+      (setq truncate-lines helm-truncate-lines) ; already local.
+      (setq cursor-type nil)
+      (setq mode-name "Helm"))
+    (helm-initialize-overlays helm-buffer)
+    (get-buffer helm-buffer)))
+
+(define-minor-mode helm--minor-mode
+    "[INTERNAL] Enable keymap in helm minibuffer.
+This mode have no effect when run outside of helm context.
+Please don't use it.
+
+\\{helm-map}"
+  :group 'helm
+  :keymap (and helm-alive-p helm-map)
+  (unless helm-alive-p (setq helm--minor-mode nil)))
+
+(defun helm--reset-default-pattern ()
+  (setq helm-pattern "")
+  (setq helm--maybe-use-default-as-input nil))
+
+(defun helm-read-pattern-maybe (any-prompt any-input
+                                any-preselect any-resume any-keymap
+                                any-default any-history)
+  "Read pattern with prompt ANY-PROMPT and initial input ANY-INPUT.
+For ANY-PRESELECT ANY-RESUME ANY-KEYMAP ANY-DEFAULT ANY-HISTORY, See `helm'."
+  (if (and (helm-resume-p any-resume)
+           ;; When no source, helm-buffer is empty
+           ;; or contain non--candidate lines (e.g grep exit status)
+           (helm-get-current-source))
+      (helm-mark-current-line t)
+      (helm-update any-preselect))
+  (with-current-buffer (helm-buffer-get)
+    (let* ((src        (helm-get-current-source))
+           (src-keymap (assoc-default 'keymap src))
+           (hist       (or (and any-history (symbolp any-history) any-history)
+                           ;; Needed for resuming.
+                           (assoc-default 'history src)))
+           (timer nil)
+           blink-matching-paren
+           (resize-mini-windows (and (null helm-echo-input-in-header-line)
+                                     resize-mini-windows))
+           (first-src (car helm-sources))
+           (first-src-val (if (symbolp first-src)
+                              (symbol-value first-src)
+                              first-src))
+           (source-process-p (or (assq 'candidates-process src)
+                                 (assq 'candidates-process first-src-val)))
+           (source-delayed-p (or (assq 'delayed src)
+                                 (assq 'delayed first-src-val))))
+      (helm-log "helm-get-candidate-number => %S"
+                (helm-get-candidate-number))
+      (helm-log "helm-execute-action-at-once-if-one = %S"
+                helm-execute-action-at-once-if-one)
+      (helm-log "helm-quit-if-no-candidate = %S" helm-quit-if-no-candidate)
+      ;; If source is delayed `helm-execute-action-at-once-if-one'
+      ;; and `helm-quit-if-no-candidate' are handled after update finish.
+      (when source-delayed-p
+        ;; Note that we quickly add the hook now when `helm-update'
+        ;; is already started, but because source is delayed the hook
+        ;; should have the time to be passed !!!
+        ;; the hook will remove itself once done.
+        (with-helm-after-update-hook (helm-exit-or-quit-maybe)))
+      ;; Reset `helm-pattern' for non--delayed sources and update
+      ;; display if no result found with precedent value of `helm-pattern'
+      ;; unless `helm-quit-if-no-candidate' is non--nil, in this case
+      ;; Don't force update with an empty pattern.
+      ;; Reset also `helm--maybe-use-default-as-input' as this checking
+      ;; happen only on startup.
+      (when helm--maybe-use-default-as-input
+        ;; Store value of `default' temporarily here waiting next update
+        ;; to allow actions like helm-moccur-action matching pattern
+        ;; at the place it jump to.
+        (setq helm-input helm-pattern)
+        (if (or source-delayed-p source-process-p)
+            ;; Reset pattern to next update.
+            (with-helm-after-update-hook
+              (helm--reset-default-pattern))
+            ;; Reset pattern right now.
+            (helm--reset-default-pattern))
+        ;; Ensure force-update when no candidates
+        ;; when we start with an empty pattern.
+        (and (helm-empty-buffer-p)
+             (null helm-quit-if-no-candidate)
+             (helm-force-update)))
+      ;; Handle `helm-execute-action-at-once-if-one' and
+      ;; `helm-quit-if-no-candidate' now only for not--delayed sources.
+      (cond ((and (if (functionp helm-execute-action-at-once-if-one)
+                      (funcall helm-execute-action-at-once-if-one)
+                      helm-execute-action-at-once-if-one)
+                  (not source-delayed-p)
+                  (= (helm-get-candidate-number) 1))
+             (ignore))              ; Don't enter the minibuffer loop.
+            ((and helm-quit-if-no-candidate
+                  (not source-delayed-p)
+                  (= (helm-get-candidate-number) 0))
+             (setq helm-quit t)
+             (and (functionp helm-quit-if-no-candidate)
+                  (funcall helm-quit-if-no-candidate)))
+            (t              ; Enter now minibuffer and wait for input.
+             (let ((tap (or any-default
+                            (with-helm-current-buffer
+                              (thing-at-point 'symbol)))))
+               (unwind-protect
+                    (minibuffer-with-setup-hook
+                        (lambda ()
+                          ;; Start minor-mode with global value of helm-map.
+                          (helm--minor-mode 1)
+                          ;; Now overhide the global value of `helm-map' with
+                          ;; the local one which is in this order:
+                          ;; - The keymap of current source.
+                          ;; - The value passed in ANY-KEYMAP
+                          ;;   which will become buffer local.
+                          ;; - Or fallback to the global value of helm-map.
+                          (helm--maybe-update-keymap
+                           (or src-keymap any-keymap helm-map))
+                          (helm-log-run-hook 'helm-minibuffer-set-up-hook)
+                          (setq timer
+                                (run-with-idle-timer
+                                 (max helm-input-idle-delay 0.001) 'repeat
+                                 (lambda ()
+                                   ;; Stop updating in persistent action
+                                   ;; or when `helm-suspend-update-flag'
+                                   ;; is non--nil.
+                                   (unless (or helm-in-persistent-action
+                                               helm-suspend-update-flag)
+                                     (save-selected-window
+                                       (helm-check-minibuffer-input)
+                                       (helm-print-error-messages))))))
+                          (helm--update-header-line)) ; minibuffer has already been filled here
+                      (read-from-minibuffer (or any-prompt "pattern: ")
+                                            any-input helm-map
+                                            nil hist tap
+                                            helm-inherit-input-method))
+                 (when timer (cancel-timer timer) (setq timer nil)))))))))
+
+(defun helm-exit-or-quit-maybe ()
+  "Exit and run default action if only one candidate, quit if no candidates.
+This function is handling `helm-execute-action-at-once-if-one' and
+`helm-quit-if-no-candidate' in delayed sources."
+  (with-helm-window
+    (cond ((and (if (functionp helm-execute-action-at-once-if-one)
+                    (funcall helm-execute-action-at-once-if-one)
+                    helm-execute-action-at-once-if-one)
+                (= (helm-get-candidate-number) 1))
+           (helm-exit-minibuffer))
+          ((and helm-quit-if-no-candidate
+                (= (helm-get-candidate-number) 0))
+           (setq helm-quit t)
+           (and (functionp helm-quit-if-no-candidate)
+                (funcall helm-quit-if-no-candidate))
+           (keyboard-quit)))))
+
+(defun helm-toggle-suspend-update ()
+  "Enable or disable update of display in helm.
+This can be useful for e.g writing quietly a complex regexp."
+  (interactive)
+  (with-helm-alive-p
+    (when (setq helm-suspend-update-flag (not helm-suspend-update-flag))
+      (helm-kill-async-processes)
+      (setq helm-pattern ""))
+    (message (if helm-suspend-update-flag
+                 "Helm update suspended!"
+                 "Helm update reenabled!"))))
+(put 'helm-toggle-suspend-update 'helm-only t)
+
+(defadvice tramp-read-passwd (around disable-helm-update)
+  ;; Suspend update when prompting for a tramp password.
+  (setq helm-suspend-update-flag t)
+  (setq overriding-terminal-local-map nil)
+  (setq helm--reading-passwd-or-string t)
+  (let (stimers)
+    (unwind-protect
+         (progn
+           (setq stimers (with-timeout-suspend))
+           ad-do-it)
+      (with-timeout-unsuspend stimers)
+      (setq helm--reading-passwd-or-string nil)
+      (setq helm-suspend-update-flag nil))))
+
+(defun helm--advice-tramp-read-passwd (old--fn &rest args)
+  ;; Suspend update when prompting for a tramp password.
+  (setq helm-suspend-update-flag t)
+  (setq overriding-terminal-local-map nil)
+  (setq helm--reading-passwd-or-string t)
+  (unwind-protect
+       ;; No need to suspend timer in emacs-24.4
+       ;; it is fixed upstream.
+       (apply old--fn args)
+    (setq helm--reading-passwd-or-string nil)
+    (setq helm-suspend-update-flag nil)))
+
+(defun helm--advice-ange-ftp-get-passwd (old--fn &rest args)
+  ;; Suspend update when prompting for a ange password.
+  (setq helm-suspend-update-flag t)
+  (setq overriding-terminal-local-map nil)
+  (setq helm--reading-passwd-or-string t)
+  (unwind-protect
+       (apply old--fn args)
+    (setq helm--reading-passwd-or-string nil)
+    (setq helm-suspend-update-flag nil)))
+
+(defadvice ange-ftp-get-passwd (around disable-helm-update)
+  ;; Suspend update when prompting for a ange password.
+  (setq helm-suspend-update-flag t)
+  (setq overriding-terminal-local-map nil)
+  (setq helm--reading-passwd-or-string t)
+  (unwind-protect
+       ad-do-it
+    (setq helm--reading-passwd-or-string nil)
+    (setq helm-suspend-update-flag nil)))
+
+(defun helm--maybe-update-keymap (&optional map)
+  "Handle differents keymaps in multiples sources.
+
+It will override `helm-map' with the local map of current source.
+If no map is found in current source do nothing (keep previous map)."
+  (with-helm-buffer
+    (helm-aif (or map (assoc-default 'keymap (helm-get-current-source)))
+        ;; We used a timer in the past to leave
+        ;; enough time to helm to setup its keymap
+        ;; when changing source from a recursive minibuffer.
+        ;; e.g C-x C-f M-y C-g
+        ;; => *find-files have now the bindings of *kill-ring.
+        ;; It is no more true now we are using `minor-mode-overriding-map-alist'
+        ;; and `helm--minor-mode' thus it fix issue #1076 for emacs-24.3
+        ;; where concurrent timers are not supported.
+        ;; i.e update keymap+check input.
+        (with-current-buffer (window-buffer (minibuffer-window))
+          (setq minor-mode-overriding-map-alist `((helm--minor-mode . ,it)))))))
+
+;;; Prevent loosing focus when using mouse.
+;;
+(defvar helm--remap-mouse-mode-map
+  (let ((map (make-sparse-keymap)))
+    (cl-loop for k in '([mouse-1] [mouse-2] [mouse-3]
+                        [down-mouse-1] [down-mouse-2] [down-mouse-3]
+                        [drag-mouse-1] [drag-mouse-2] [drag-mouse-3]
+                        [double-mouse-1] [double-mouse-2] [double-mouse-3]
+                        [triple-mouse-1] [triple-mouse-2] [triple-mouse-3])
+             do (define-key map k 'undefined))
+    map))
+
+(define-minor-mode helm--remap-mouse-mode
+    "[INTERNAL] Prevent escaping helm minibuffer with mouse clicks.
+Do nothing when used outside of helm context.
+
+WARNING: Do not use this mode yourself, it is internal to helm."
+  :group 'helm
+  :global t
+  :keymap helm--remap-mouse-mode-map
+  (unless helm-alive-p
+    (setq helm--remap-mouse-mode-map nil)))
+
+;; Core: clean up
+
+(defun helm-cleanup ()
+  "Clean up the mess when helm exit or quit."
+  (helm-log "start cleanup")
+  (with-current-buffer helm-buffer
+    ;; bury-buffer from this window.
+    (bury-buffer) ;[1]
+    (remove-hook 'post-command-hook 'helm--maybe-update-keymap)
+    (remove-hook 'post-command-hook 'helm--update-header-line)
+    ;; Be sure we call this from helm-buffer.
+    (helm-funcall-foreach 'cleanup))
+  (helm-kill-async-processes)
+  ;; Remove the temporary hooks added
+  ;; by `with-helm-temp-hook' that
+  ;; may not have been consumed.
+  (when helm--temp-hooks
+    (cl-loop for (fn . hook) in helm--temp-hooks
+             do (set hook (delete fn (symbol-value hook)))))
+  ;; When running helm from a dedicated frame
+  ;; with no minibuffer, helm will run in the main frame
+  ;; which have a minibuffer, so be sure to disable
+  ;; the `no-other-window' prop there.
+  (helm-prevent-switching-other-window :enabled nil)
+  (helm-log-run-hook 'helm-cleanup-hook)
+  (helm-frame-or-window-configuration 'restore)
+  ;; [1] now bury-buffer from underlying windows otherwise,
+  ;; if this window is killed the underlying buffer will
+  ;; be a helm buffer.
+  (replace-buffer-in-windows helm-buffer)
+  (setq helm-alive-p nil)
+  (setq helm-debug nil)
+  ;; This is needed in some cases where last input
+  ;; is yielded infinitely in minibuffer after helm session.
+  (helm-clean-up-minibuffer))
+
+(defun helm-clean-up-minibuffer ()
+  "Remove contents of minibuffer."
+  (let ((miniwin (minibuffer-window)))
+    ;; Clean only current minibuffer used by helm.
+    ;; i.e The precedent one is active.
+    (unless (minibuffer-window-active-p miniwin)
+      (with-current-buffer (window-buffer miniwin)
+        (delete-minibuffer-contents)))))
+
+
+;;; Core: input handling
+;;
+;;
+(defun helm-check-minibuffer-input ()
+  "Check minibuffer content."
+  (with-helm-quittable
+    (with-selected-window (or (active-minibuffer-window)
+                              (minibuffer-window))
+      (helm-check-new-input (minibuffer-contents)))))
+
+(defun helm-check-new-input (input)
+  "Check INPUT string and update the helm buffer if necessary."
+  ;; First time minibuffer is entered
+  ;; we check value of `helm-pattern' that have been set
+  ;; in `helm-initial-setup' when `helm--maybe-use-default-as-input'
+  ;; is non--nil.  After this initial check, reset
+  ;; `helm--maybe-use-default-as-input' and ignore this.
+  ;; This happen only when source is `delayed'.
+  (when helm--maybe-use-default-as-input ; nil when non--delayed.
+    (setq input helm-pattern))
+  (unless (equal input helm-pattern)
+    (setq helm-pattern input)
+    (unless (helm-action-window)
+      (setq helm-input helm-pattern))
+    (helm-log "helm-pattern = %S" helm-pattern)
+    (helm-log "helm-input = %S" helm-input)
+    (setq helm--in-update t)
+    (helm-update)))
+
+(defun helm--reset-update-flag ()
+  (run-with-idle-timer
+   helm-exit-idle-delay nil
+   (lambda () (setq helm--in-update nil))))
+
+(add-hook 'helm-after-update-hook #'helm--reset-update-flag)
+
+
+;;; Core: source compiler
+;;
+;;
+(defun helm-compile-sources (sources funcs)
+  "Compile SOURCES with FUNCS.
+See `helm-compile-source-functions'.
+Helm plug-ins are realized by this function."
+  (mapcar
+   (lambda (source)
+     (cl-loop with src = (if (listp source) source (symbol-value source))
+              for noplug = (assoc 'dont-plug src)
+              for f in funcs
+              unless (and noplug (memq f (cdr noplug)))
+              do (setq src (funcall f src))
+              finally (cl-return src)))
+   sources))
+
+
+;; Core: all candidates
+
+(defun helm-get-candidates (source)
+  "Retrieve and return the list of candidates from SOURCE."
+  (let* (inhibit-quit
+         (candidate-fn (assoc-default 'candidates source))
+         (candidate-proc (assoc-default 'candidates-process source))
+         (type-error (lambda ()
+                       (error
+                        "`%s' must either be a function, a variable or a list"
+                        (or candidate-fn candidate-proc))))
+         (candidates (condition-case-unless-debug err
+                         ;; Process candidates-(process) function
+                         ;; It may return a process or a list of candidates.
+                         (if candidate-proc
+                             ;; Calling `helm-interpret-value' with no
+                             ;; SOURCE arg force the use of `funcall'
+                             ;; and not `helm-funcall-with-source'.
+                             (helm-interpret-value candidate-proc)
+                           (helm-interpret-value candidate-fn source))
+                       (error (helm-log "Error: %S" err) nil))))
+    (when (and (processp candidates) (not candidate-proc))
+      (warn "Candidates function `%s' should be called in a `candidates-process' attribute"
+            candidate-fn))
+    (cond ((processp candidates)
+           ;; Candidates will be filtered later in process filter.
+           candidates)
+          ((or (null candidates)
+               ;; Can happen when the output of a process
+               ;; is empty, and the candidates function call
+               ;; something like (split-string (buffer-string) "\n")
+               ;; which result in a list of one empty string (Issue #938).
+               ;; e.g (completing-read "test: " '(""))
+               (equal candidates '("")))
+           nil)
+          ((listp candidates)
+           ;; Transform candidates with `candidate-transformer' functions if
+           ;; some, otherwise return candidates.
+           (helm-transform-candidates candidates source))
+          (t (funcall type-error)))))
+
+(defmacro helm-while-no-input (&rest body)
+  "Same as `while-no-input' but without testing with `input-pending-p'."
+  (declare (debug t) (indent 0))
+  (let ((catch-sym (make-symbol "input"))
+        inhibit-quit)
+    `(with-local-quit
+       (catch ',catch-sym
+	 (let ((throw-on-input ',catch-sym))
+           ,@body)))))
+
+(defun helm-get-cached-candidates (source)
+  "Return the cached value of candidates for SOURCE.
+Cache the candidates if there is not yet a cached value."
+  (let* ((name (assoc-default 'name source))
+         (candidate-cache (gethash name helm-candidate-cache)))
+    (helm-aif candidate-cache
+        (prog1 it (helm-log "Use cached candidates"))
+      (helm-log "No cached candidates, calculate candidates")
+      (let ((candidates (helm-get-candidates source)))
+        (cond ((processp candidates)
+               (push (cons candidates
+                           (append source
+                                   (list (cons 'item-count 0)
+                                         (cons 'incomplete-line ""))))
+                     helm-async-processes)
+               (set-process-filter candidates 'helm-output-filter)
+               (setq candidates nil))
+              ((not (assoc 'volatile source))
+               (puthash name candidates helm-candidate-cache)))
+        candidates))))
+
+
+;;; Core: candidate transformers
+
+(defun helm-process-candidate-transformer (candidates source)
+  "Execute `candidate-transformer' function(s) on CANDIDATES in SOURCE."
+  (helm-aif (assoc-default 'candidate-transformer source)
+      (helm-composed-funcall-with-source source it candidates)
+    candidates))
+
+(defun helm-process-filtered-candidate-transformer (candidates source)
+  "Execute `filtered-candidate-transformer' function(s) on CANDIDATES in SOURCE."
+  (helm-aif (assoc-default 'filtered-candidate-transformer source)
+      (helm-composed-funcall-with-source source it candidates source)
+    candidates))
+
+(defmacro helm--maybe-process-filter-one-by-one-candidate (candidate source)
+  "Execute `filter-one-by-one' function(s) on CANDIDATE in SOURCE."
+  `(helm-aif (assoc-default 'filter-one-by-one ,source)
+       (if (and (listp it)
+                (not (functionp it))) ;; Don't treat lambda's as list.
+           (cl-loop for f in it
+                 do (setq ,candidate (funcall f ,candidate))
+                 finally return ,candidate)
+         (setq ,candidate (funcall it ,candidate)))
+     ,candidate))
+
+(defun helm--initialize-one-by-one-candidates (candidates source)
+  "Process the CANDIDATES with the `filter-one-by-one' function in SOURCE.
+Return CANDIDATES when pattern is empty."
+  (helm-aif (and (string= helm-pattern "")
+                 (assoc-default 'filter-one-by-one source))
+      (cl-loop for cand in candidates collect
+               (helm--maybe-process-filter-one-by-one-candidate cand source))
+    candidates))
+
+(defun helm-process-filtered-candidate-transformer-maybe
+    (candidates source process-p)
+  "Execute `filtered-candidate-transformer' function(s) on CANDIDATES in SOURCE.
+When PROCESS-P is non-nil execute `filtered-candidate-transformer'
+functions if some, otherwise return CANDIDATES."
+  (if process-p
+      ;; When no filter return CANDIDATES unmodified.
+      (helm-process-filtered-candidate-transformer candidates source)
+    candidates))
+
+(defun helm-process-real-to-display (candidates source)
+  "Execute real-to-display function on all CANDIDATES of SOURCE."
+  (helm-aif (assoc-default 'real-to-display source)
+      (setq candidates (helm-funcall-with-source
+                        source 'mapcar
+                        (lambda (cand_)
+                          (if (consp cand_)
+                              ;; override DISPLAY from candidate-transformer
+                              (cons (funcall it (cdr cand_)) (cdr cand_))
+                            (cons (funcall it cand_) cand_)))
+                        candidates))
+    candidates))
+
+(defun helm-transform-candidates (candidates source &optional process-p)
+  "Transform CANDIDATES of SOURCE according to candidate transformers.
+When PROCESS-P is non-nil execute the `filtered-candidate-transformer' functions
+otherwise only the `candidate-transformer' functions are processed.
+When attribute `real-to-display' is present, execute its function on all maybe
+filtered CANDIDATES."
+  (helm-process-real-to-display
+   (helm-process-filtered-candidate-transformer-maybe
+    (helm-process-candidate-transformer
+     (helm--initialize-one-by-one-candidates candidates source) source)
+    source process-p)
+   source))
+
+
+;; Core: narrowing candidates
+(defun helm-candidate-number-limit (source)
+  "Apply candidate-number-limit attribute value.
+This overhide variable `helm-candidate-number-limit'.
+
+e.g:
+If \(candidate-number-limit\) is in SOURCE, show all candidates in SOURCE.
+If \(candidate-number-limit . 123\) is in SOURCE limit candidate to 123."
+  (helm-aif (assq 'candidate-number-limit source)
+      (or (cdr it) 99999999)
+    (or helm-candidate-number-limit 99999999)))
+
+(defun helm-candidate-get-display (candidate)
+  "Get searched display part from CANDIDATE.
+CANDIDATE is a string, a symbol, or \(DISPLAY . REAL\) cons cell."
+  (cond ((car-safe candidate))
+        ((symbolp candidate)
+         (symbol-name candidate))
+        ((numberp candidate)
+         (number-to-string candidate))
+        (t candidate)))
+
+(defun helm-process-pattern-transformer (pattern source)
+  "Execute pattern-transformer attribute PATTERN function in SOURCE."
+  (helm-aif (assoc-default 'pattern-transformer source)
+      (helm-composed-funcall-with-source source it pattern)
+    pattern))
+
+(defun helm-default-match-function (candidate)
+  "Check if `helm-pattern' match CANDIDATE.
+Default function to match candidates according to `helm-pattern'."
+  (string-match helm-pattern candidate))
+
+
+;;; Fuzzy matching
+;;
+;;
+(defvar helm--fuzzy-regexp-cache (make-hash-table :test 'eq))
+(defun helm--fuzzy-match-maybe-set-pattern ()
+  ;; Computing helm-pattern with helm--mapconcat-pattern
+  ;; is costly, so cache it once time for all and reuse it
+  ;; until pattern change.
+  (when helm--in-fuzzy
+    (let ((fun (if (string-match "\\`\\^" helm-pattern)
+                   #'identity
+                   #'helm--mapconcat-pattern)))
+      (clrhash helm--fuzzy-regexp-cache)
+      ;; FIXME: Splitted part are not handled here,
+      ;; I must compute them in `helm-search-match-part'
+      ;; when negation and in-buffer are used.
+      (if (string-match "\\`!" helm-pattern)
+          (puthash 'helm-pattern
+                   (if (> (length helm-pattern) 1)
+                       (list (funcall fun (substring helm-pattern 1 2))
+                             (funcall fun (substring helm-pattern 1)))
+                       '("" ""))
+                   helm--fuzzy-regexp-cache)
+          (puthash 'helm-pattern
+                   (if (> (length helm-pattern) 0)
+                       (list (funcall fun (substring helm-pattern 0 1))
+                             (funcall fun helm-pattern))
+                       '("" ""))
+                   helm--fuzzy-regexp-cache)))))
+
+(defun helm-fuzzy-match (candidate)
+  "Check if `helm-pattern' fuzzy match CANDIDATE.
+This function is used with sources build with `helm-source-sync'."
+  (unless (string-match " " helm-pattern)
+    ;; When pattern have one or more spaces, let
+    ;; multi-match doing the job with no fuzzy matching.[1]
+    (let ((regexp (cadr (gethash 'helm-pattern helm--fuzzy-regexp-cache))))
+      (if (string-match "\\`!" helm-pattern)
+          (not (string-match regexp candidate))
+          (string-match regexp candidate)))))
+
+(defun helm-fuzzy-search (pattern)
+  "Same as `helm-fuzzy-match' but for sources build with `helm-source-in-buffer'."
+  (unless (string-match " " helm-pattern)
+    ;; Same as in `helm-fuzzy-match' ref[1].
+    (let* ((regexps (gethash 'helm-pattern helm--fuzzy-regexp-cache))
+           (partial-regexp (car regexps))
+           (regexp (cadr regexps)))
+      (if (string-match "\\`!" pattern)
+          ;; Don't try to search here, just return
+          ;; the position of line and go ahead,
+          ;; letting `helm-search-match-part' checking if
+          ;; pattern match against this line.
+          (prog1 (list (point-at-bol) (point-at-eol))
+            (forward-line 1))
+          ;; We could use here directly `re-search-forward'
+          ;; on the regexp produced by `helm--mapconcat-pattern',
+          ;; but it is very slow because emacs have to do an incredible
+          ;; amount of loops to match e.g "[^f]*o[^o]..." in the whole buffer,
+          ;; more the regexp is long more the amount of loops grow.
+          ;; (Probably leading to a max-lisp-eval-depth error if both
+          ;; regexp and buffer are too big)
+          ;; So just search the first bit of pattern e.g "[^f]*f", and
+          ;; then search the corresponding line with the whole regexp,
+          ;; which increase dramatically the speed of the search.
+          (cl-loop while (re-search-forward partial-regexp nil t)
+                   for bol = (point-at-bol)
+                   for eol = (point-at-eol)
+                   if (progn (goto-char bol)
+                             (re-search-forward regexp eol t))
+                   do (goto-char eol) and return t
+                   else do (goto-char eol)
+                   finally return nil)))))
+
+(defun helm-score-candidate-for-pattern (candidate pattern)
+  "Give a score to CANDIDATE according to PATTERN.
+Score is calculated against number of contiguous matches found with PATTERN.
+If PATTERN is fully matched in CANDIDATE a maximal score (100) is given.
+A bonus of one point is given when PATTERN prefix match CANDIDATE.
+Contiguous matches have a coefficient of 2."
+  (let* ((cand (if (stringp candidate)
+                   candidate (helm-stringify candidate)))
+         (pat-lookup (helm--collect-pairs-in-string pattern))
+         (str-lookup (helm--collect-pairs-in-string cand))
+         (bonus (if (equal (car pat-lookup) (car str-lookup)) 1 0))
+         (bonus1 (and (string-match (concat "\\<" (regexp-quote pattern) "\\>")
+                                    cand)
+                      100)))
+    (+ bonus (or bonus1
+                 ;; Give a coefficient of 2 for contiguous matches.
+                 ;; That's mean that "wiaaaki" will not take precedence
+                 ;; on "aaawiki" when matching on "wiki" even if "wiaaaki"
+                 ;; starts by "wi".
+                 (* (length (cl-nintersection
+                             pat-lookup str-lookup :test 'equal))
+                    2)))))
+
+(defun helm-fuzzy-matching-default-sort-fn (candidates _source &optional use-real)
+  "The transformer for sorting candidates in fuzzy matching.
+It is sorting on the display part of by default.
+
+Sort CANDIDATES according to their score calculated by
+`helm-score-candidate-for-pattern'.  When two candidates have the
+same score sort is made by length.  Set USE-REAL to non-nil to
+sort on the real part."
+  (if (string= helm-pattern "")
+      candidates
+    (let ((table-scr (make-hash-table :test 'equal)))
+      (sort candidates
+            (lambda (s1 s2)
+              ;; Score and measure the length on real or display part of candidate
+              ;; according to `use-real'.
+              (let* ((real-or-disp-fn (if use-real #'cdr #'car))
+                     (cand1 (if (consp s1)
+                                (funcall real-or-disp-fn s1)
+                              s1))
+                     (cand2 (if (consp s2)
+                                (funcall real-or-disp-fn s2)
+                              s2))
+                     (data1 (or (gethash cand1 table-scr)
+                                (puthash cand1
+                                         (list (helm-score-candidate-for-pattern
+                                                cand1 helm-pattern)
+                                               (length (helm-stringify cand1)))
+                                         table-scr)))
+                     (data2 (or (gethash cand2 table-scr)
+                                (puthash cand2
+                                         (list (helm-score-candidate-for-pattern
+                                                cand2 helm-pattern)
+                                               (length (helm-stringify cand2)))
+                                         table-scr)))
+                     (len1 (cadr data1))
+                     (len2 (cadr data2))
+                     (scr1 (car data1))
+                     (scr2 (car data2)))
+                (cond ((= scr1 scr2)
+                       (< len1 len2))
+                      ((> scr1 scr2)))))))))
+
+(defun helm-fuzzy-default-highlight-match (candidate)
+  "The default function to highlight matches in fuzzy matching.
+It is meant to use with `filter-one-by-one' slot."
+  (let* ((pair (and (consp candidate) candidate))
+         (display (helm-stringify (if pair (car pair) candidate)))
+         (real (cdr pair))
+         (regex (helm-aif (and helm-migemo-mode
+                               (assoc helm-pattern
+                                      helm-mm--previous-migemo-info))
+                    (cdr it)
+                  helm-pattern))
+         ;; FIXME This is called at each turn, cache it to optimize.
+         (mp (helm-aif (helm-attr 'match-part (helm-get-current-source))
+                 (funcall it display))))
+    (with-temp-buffer
+      (insert (propertize display 'read-only nil)) ; Fix (#1176)
+      (goto-char (point-min))
+      (when mp
+        ;; FIXME the first part of display may contain an occurence of mp.
+        ;; e.g "helm-adaptive.el:27:(defgroup helm-adapt" 
+        (search-forward mp nil t)
+        (goto-char (match-beginning 0)))
+      (if (re-search-forward regex (and mp (+ (point) (length mp))) t)
+          (add-text-properties
+           (match-beginning 0) (match-end 0) '(face helm-match))
+          (cl-loop with multi-match
+                   with patterns = (if (string-match-p " " helm-pattern)
+                                       (prog1 (split-string helm-pattern)
+                                         (setq multi-match t))
+                                       (split-string helm-pattern "" t))
+                   for p in patterns
+                   for re = (or (and helm-migemo-mode
+                                     (assoc-default
+                                      p helm-mm--previous-migemo-info))
+                                p)
+                   do
+                   (when (re-search-forward re nil t)
+                     (add-text-properties
+                      (match-beginning 0) (match-end 0)
+                      '(face helm-match)))
+                   (when multi-match (goto-char (point-min)))))
+      (setq display (buffer-string)))
+    (if real (cons display real) display)))
+
+(defun helm-fuzzy-highlight-matches (candidates _source)
+  "The filtered-candidate-transformer function to highlight matches in fuzzy.
+See `helm-fuzzy-default-highlight-match'."
+  (cl-loop for c in candidates
+           collect (funcall helm-fuzzy-matching-highlight-fn c)))
+
+(defun helm-match-functions (source)
+  (let ((matchfns (or (assoc-default 'match source)
+                      (assoc-default 'match-strict source)
+                      #'helm-default-match-function)))
+    (if (and (listp matchfns) (not (functionp matchfns)))
+        matchfns (list matchfns))))
+
+(defun helm-search-functions (source)
+  (let ((searchfns (assoc-default 'search source)))
+    (if (and (listp searchfns) (not (functionp searchfns)))
+        searchfns (list searchfns))))
+
+(defmacro helm--accumulate-candidates (candidate newmatches
+                                       hash item-count limit source)
+  "Add CAND into NEWMATCHES and use HASH to uniq NEWMATCHES.
+Argument ITEM-COUNT count the matches.
+if ITEM-COUNT reaches LIMIT, exit from inner loop."
+  `(unless (gethash ,candidate ,hash)
+     (unless (assq 'allow-dups ,source)
+       (puthash ,candidate t ,hash))
+     (helm--maybe-process-filter-one-by-one-candidate ,candidate ,source)
+     (push ,candidate ,newmatches)
+     (cl-incf ,item-count)
+     (when (= ,item-count ,limit) (cl-return))))
+
+(defun helm-take-first-elements (seq n)
+  "Return the N first element of SEQ if SEQ is longer than N.
+It is used to narrow down list of candidates to `helm-candidate-number-limit'."
+  (if (> (length seq) n) (cl-subseq seq 0 n) seq))
+
+(cl-defun helm-set-case-fold-search (&optional (pattern helm-pattern))
+  "Used to set the value of `case-fold-search' in helm.
+Return t or nil depending of value of `helm-case-fold-search'
+and `helm-pattern'."
+  (let ((helm-case-fold-search
+         (helm-aif (assq 'case-fold-search (helm-get-current-source))
+             (cdr it)
+           helm-case-fold-search))
+        ;; Only parse basename for filenames
+        ;; to avoid setting case sensitivity
+        ;; when expanded directories contains upcase
+        ;; characters.
+        (bn-or-pattern (if (string-match "[~/]*" pattern)
+                           ;; `helm-basename' is not available yet.
+                           (file-name-nondirectory
+                            (directory-file-name pattern))
+                         pattern)))
+    (helm-set-case-fold-search-1 bn-or-pattern)))
+
+(defun helm-set-case-fold-search-1 (pattern)
+  (cl-case helm-case-fold-search
+    (smart (let ((case-fold-search nil))
+             (if (string-match "[[:upper:]]" pattern) nil t)))
+    (t helm-case-fold-search)))
+
+(defun helm-match-from-candidates (cands matchfns match-part-fn limit source)
+  (let (matches)
+    (condition-case-unless-debug err
+        (let ((item-count 0)
+              (case-fold-search (helm-set-case-fold-search)))
+          (clrhash helm-match-hash)
+          (cl-dolist (match matchfns)
+            (when (< item-count limit)
+              (let (newmatches)
+                (cl-dolist (candidate cands)
+                  (unless (gethash candidate helm-match-hash)
+                    (let ((target (helm-candidate-get-display candidate)))
+                      (when (funcall match
+                                     (if match-part-fn
+                                         (funcall match-part-fn target) target))
+                        (helm--accumulate-candidates
+                         candidate newmatches
+                         helm-match-hash item-count limit source)))))
+                ;; filter-one-by-one may return nil candidates, so delq them if some.
+                (setq matches (nconc matches (nreverse (delq nil newmatches))))))))
+      (error (unless (eq (car err) 'invalid-regexp) ; Always ignore regexps errors.
+               (helm-log-error "helm-match-from-candidates in source `%s': %s %s"
+                               (assoc-default 'name source) (car err) (cdr err)))
+             (setq matches nil)))
+    matches))
+
+(defun helm-compute-matches (source)
+  "Start computing candidates in SOURCE."
+  (save-current-buffer
+    (let ((matchfns (helm-match-functions source))
+          (matchpartfn (assoc-default 'match-part source))
+          (helm-source-name (assoc-default 'name source))
+          (helm-current-source source)
+          (limit (helm-candidate-number-limit source))
+          (helm-pattern (helm-process-pattern-transformer
+                         helm-pattern source)))
+      (helm--fuzzy-match-maybe-set-pattern)
+      ;; If source have a `filtered-candidate-transformer' attr
+      ;; Filter candidates with this func, otherwise just compute
+      ;; candidates.
+      (helm-process-filtered-candidate-transformer
+       (if (or (equal helm-pattern "")
+               (equal matchfns '(identity)))
+           ;; Compute all candidates up to LIMIT.
+           (helm-take-first-elements
+            (helm-get-cached-candidates source) limit)
+         ;; Compute candidates according to pattern with their match fns.
+         (helm-match-from-candidates
+          ;; FIXME: What when volatile is used, and the display expected
+          ;; comes from the filtered-candidate-transformer fn ?
+          ;; In this case match function try to match on real which is maybe not
+          ;; a string.
+          (helm-get-cached-candidates source) matchfns matchpartfn limit source))
+       source))))
+
+(defun helm-render-source (source matches)
+  "Display MATCHES from SOURCE according to its settings."
+  (helm-log "Source name = %S" (assoc-default 'name source))
+  (when matches
+    (helm-insert-header-from-source source)
+    (if (not (assq 'multiline source))
+        (cl-loop for m in matches
+                 for count from 1
+                 do (helm-insert-match m 'insert source count))
+      (let ((start (point))
+            (count 0)
+            separate)
+        (cl-dolist (match matches)
+          (cl-incf count)
+          (if separate
+              (helm-insert-candidate-separator)
+            (setq separate t))
+          (helm-insert-match match 'insert source count))
+        (put-text-property start (point) 'helm-multiline t)))))
+
+(defmacro helm--maybe-use-while-no-input (&rest body)
+  "Wrap BODY in `helm-while-no-input' unless initializing a remote connection."
+  `(progn
+     (if (and (file-remote-p helm-pattern)
+              (not (file-remote-p helm-pattern nil t)))
+         ;; Tramp will ask for passwd, don't use `helm-while-no-input'.
+         ,@body
+       (helm-log "Using here `helm-while-no-input'")
+       (helm-while-no-input ,@body))))
+
+(defun helm--collect-matches (src-list)
+  (let ((matches (helm--maybe-use-while-no-input
+                  (cl-loop for src in src-list
+                           collect (helm-compute-matches src)))))
+    (unless (eq matches t) matches)))
+
+(defun helm--compute-sources (src-list)
+  (cl-loop with matches = (helm--collect-matches src-list)
+        for src in src-list
+        for mtc in matches
+        do (helm-render-source src mtc)))
+
+(cl-defun helm-process-delayed-sources (delayed-sources &optional preselect source)
+  "Process helm DELAYED-SOURCES.
+Move selection to string or regexp PRESELECT if non--nil.
+This function is called in `helm-process-delayed-sources-timer'
+when emacs is idle for `helm-idle-delay'."
+  (with-helm-quittable
+    (helm-log "Delayed sources = %S"
+              (mapcar (lambda (s)
+                        (assoc-default 'name s))
+                      delayed-sources))
+    (with-current-buffer (helm-buffer-get)
+      (save-excursion
+        (goto-char (point-max))
+        (helm--compute-sources delayed-sources)
+        (when (and (not (helm-empty-buffer-p))
+                   ;; No selection yet.
+                   (= (overlay-start helm-selection-overlay)
+                      (overlay-end helm-selection-overlay)))
+          (helm-update-move-first-line 'without-hook)))
+      (save-excursion
+        (goto-char (point-min))
+        (helm-log-run-hook 'helm-update-hook))
+      (setq helm-force-updating-p nil)
+      (unless (assoc 'candidates-process source)
+        (helm-display-mode-line (helm-get-current-source))
+        (helm-log-run-hook 'helm-after-update-hook))
+      (when preselect (helm-preselect preselect source)))))
+
+
+;;; Core: helm-update
+;;
+(defun helm-update (&optional preselect source)
+  "Update candidates list in `helm-buffer' according to `helm-pattern'.
+Argument PRESELECT is a string or regexp used to move selection to a particular
+place once updating is done.  It should be used on single source because search
+is done on whole `helm-buffer' and not on current source."
+  (helm-log "Start updating")
+  (helm-kill-async-processes)
+  ;; When persistent action have been called
+  ;; we have two windows even with `helm-full-frame'.
+  ;; So go back to one window when updating if `helm-full-frame'
+  ;; is non--nil.
+  (with-helm-window
+    (when helm-onewindow-p (delete-other-windows)))
+  (with-current-buffer (helm-buffer-get)
+    (set (make-local-variable 'helm-input-local) helm-pattern)
+    (let (normal-sources
+          delayed-sources
+          matches)
+      (unwind-protect
+           (progn
+             ;; Iterate over all the sources
+             (cl-loop for source in (cl-remove-if-not
+                                     'helm-update-source-p (helm-get-sources))
+                   if (helm-delayed-source-p source)
+                   ;; Delayed sources just get collected for later
+                   ;; processing
+                   collect source into ds
+                   else
+                   ;; Collect the normal sources
+                   collect source into ns
+                   ;; Export the variables from cl-loop
+                   finally (setq delayed-sources ds
+                                 normal-sources ns))
+             ;; When no normal-sources erase buffer
+             ;; for the next possible delayed source
+             ;; or the already computed normal-source
+             ;; that is no more "updateable" (requires-pattern).
+             (unless normal-sources (erase-buffer))
+             ;; Compute matches without rendering the sources.
+             (helm-log "Matches: %S"
+                       (setq matches (helm--collect-matches normal-sources)))
+             ;; If computing matches finished and is not interrupted
+             ;; erase the helm-buffer and render results (Fix #1157).
+             (when matches
+               (erase-buffer)
+               (cl-loop for src in normal-sources
+                        for mtc in matches
+                        do (helm-render-source src mtc))))
+        (helm-log "Delayed sources = %S"
+                  (mapcar (lambda (s) (assoc-default 'name s))
+                          delayed-sources))
+        (cond ((and preselect delayed-sources normal-sources)
+               ;; Preselection run here when there is
+               ;; normal AND delayed sources.
+               (helm-log "Update preselect candidate %s" preselect)
+               (helm-preselect preselect source))
+              (delayed-sources ; Preselection and hooks will run later.
+               (helm-update-move-first-line 'without-hook))
+              (t              ; No delayed sources, run the hooks now.
+               (helm-update-move-first-line)
+               (unless (assoc 'candidates-process source)
+                 (helm-display-mode-line (helm-get-current-source))
+                 (helm-log-run-hook 'helm-after-update-hook))
+               (when preselect
+                 (helm-log "Update preselect candidate %s" preselect)
+                 (helm-preselect preselect source))
+               (setq helm-force-updating-p nil)))
+        (when delayed-sources
+          ;; Allow giving a value to `delayed' attr from inside source.
+          ;; Retain the biggest value (the slower) found in DELAYED-SOURCES.
+          (let ((helm-idle-delay (cl-loop with delay = helm-idle-delay
+                                       for s in delayed-sources
+                                       for d = (assoc-default 'delayed s)
+                                       when d do (setq delay (max delay d))
+                                       finally return delay)))
+            (run-with-idle-timer
+             ;; Be sure helm-idle-delay is >
+             ;; to helm-input-idle-delay
+             ;; otherwise use value of helm-input-idle-delay
+             ;; or 0.01 if == to 0.
+             (max helm-idle-delay helm-input-idle-delay 0.001) nil
+             'helm-process-delayed-sources delayed-sources preselect source)))
+        (helm-log "end update")))))
+
+;; Update keymap after updating.
+;; Now we run this in post-command-hook, it is
+;; probably no more needed in helm-after-update-hook.
+;; Leave it commented as a reminder for now.
+;; (add-hook 'helm-after-update-hook 'helm--maybe-update-keymap)
+
+(defun helm-update-source-p (source)
+  "Whether SOURCE need updating or not."
+  (let ((len (string-width
+              (if (or (assoc 'matchplugin source)
+                      (null (assoc 'no-matchplugin source)))
+                  ;; Don't count spaces entered when using
+                  ;; multi-match.
+                  (replace-regexp-in-string " " "" helm-pattern)
+                helm-pattern))))
+    (and (or (not helm-source-filter)
+             (member (assoc-default 'name source) helm-source-filter))
+         (>= len
+             (helm-aif (assoc 'requires-pattern source) (or (cdr it) 1) 0))
+         ;; These incomplete regexps hang helm forever
+         ;; so defer update. Maybe replace spaces quoted when using
+         ;; multi-match.
+         (not (member (replace-regexp-in-string "\\s\\ " " " helm-pattern)
+                      helm-update-blacklist-regexps)))))
+
+(defun helm-delayed-source-p (source)
+  "Wheter SOURCE is a delayed source or not."
+  (or (assoc 'delayed source)
+      (and helm-quick-update
+           (> (length helm-sources) 1)
+           (< (window-height (get-buffer-window (current-buffer)))
+              (line-number-at-pos (point-max))))))
+
+(defun helm-update-move-first-line (&optional without-hook)
+  "Goto first line of `helm-buffer'."
+  (goto-char (point-min))
+  (unless without-hook
+    (save-excursion (helm-log-run-hook 'helm-update-hook)))
+  (helm-next-line))
+
+(defun helm-force-update (&optional preselect)
+  "Force recalculation and update of candidates.
+
+The difference with `helm-update' is this function is reevaling
+the `init' and `update' attributes functions when present
+before running `helm-update', also `helm-candidate-cache',
+if some (async candidates are not cached)
+is not reinitialized so that candidates are not recomputed
+unless pattern have changed.
+
+Selection is preserved to current candidate or moved to PRESELECT
+if specified."
+  (let ((source    (helm-get-current-source))
+        (selection (helm-get-selection nil t))
+        ;; `helm-goto-source' need to have all sources displayed
+        ;; So disable `helm-quick-update'.
+        helm-quick-update)
+    (setq helm-force-updating-p t)
+    (when source
+      (mapc 'helm-force-update--reinit
+            (helm-get-sources)))
+    (helm-update (or preselect selection) source)
+    (with-helm-window (recenter))))
+
+(defun helm-refresh ()
+  "Force recalculation and update of candidates."
+  (interactive)
+  (with-helm-alive-p
+    (helm-force-update)))
+(put 'helm-refresh 'helm-only t)
+
+(defun helm-force-update--reinit (source)
+  "Reinit SOURCE by calling his update and/or init functions."
+  (helm-aif (helm-funcall-with-source
+             source 'helm-candidate-buffer)
+      (kill-buffer it))
+  (cl-dolist (attr '(update init))
+    (helm-aif (assoc-default attr source)
+        (helm-funcall-with-source source it)))
+  (helm-remove-candidate-cache source))
+
+(defun helm-remove-candidate-cache (source)
+  "Remove SOURCE from `helm-candidate-cache'."
+  (remhash (assoc-default 'name source) helm-candidate-cache))
+
+(defun helm-insert-match (match insert-function source &optional num)
+  "Insert MATCH into `helm-buffer' with INSERT-FUNCTION for SOURCE.
+If MATCH is a list then insert the string intended to appear on the display
+and store the real value in a text property."
+  (let ((start     (point-at-bol (point)))
+        (dispvalue (helm-candidate-get-display match))
+        (realvalue (cdr-safe match)))
+    (when (and (stringp dispvalue)
+             (not (zerop (length dispvalue))))
+      (funcall insert-function dispvalue)
+      ;; Some sources with candidates-in-buffer have already added
+      ;; 'helm-realvalue property when creating candidate buffer.
+      (unless (get-text-property start 'helm-realvalue)
+        (and realvalue
+             (put-text-property start (point-at-eol)
+                                'helm-realvalue realvalue)))
+      (when num
+        (put-text-property start (point-at-eol) 'helm-cand-num num))
+      (when helm-source-in-each-line-flag
+        (put-text-property start (point-at-eol) 'helm-source source))
+      (funcall insert-function "\n"))))
+
+(defun helm-insert-header-from-source (source)
+  "Insert SOURCE name in `helm-buffer' header.
+Maybe insert by overlay additional info after source name if SOURCE have
+header-name attribute."
+  (let ((name (assoc-default 'name source)))
+    (helm-insert-header
+     name
+     (helm-aif (assoc-default 'header-name source)
+         (helm-funcall-with-source source it name)))))
+
+(defun helm-insert-header (name &optional display-string)
+  "Insert header of source NAME into the helm buffer.
+If DISPLAY-STRING is non--nil and a string, display this additional info
+after the source name by overlay."
+  (unless (bobp)
+    (let ((start (point)))
+      (insert "\n")
+      (put-text-property start (point) 'helm-header-separator t)))
+  (let ((start (point)))
+    (insert name)
+    (put-text-property (point-at-bol)
+                       (point-at-eol) 'helm-header t)
+    (when display-string
+      (overlay-put (make-overlay (point-at-bol) (point-at-eol))
+                   'display display-string))
+    (insert "\n")
+    (put-text-property start (point) 'face 'helm-source-header)))
+
+(defun helm-insert-candidate-separator ()
+  "Insert separator of candidates into the helm buffer."
+  (insert (propertize helm-candidate-separator 'face 'helm-separator))
+  (put-text-property (point-at-bol)
+                     (point-at-eol) 'helm-candidate-separator t)
+  (insert "\n"))
+
+
+;;; Core: async process
+;;
+(defun helm-output-filter (process output-string)
+  "The `process-filter' function for helm async sources."
+  (with-helm-quittable
+    (helm-output-filter-1 (assoc process helm-async-processes) output-string)))
+
+(defun helm-output-filter-1 (process-assoc output-string)
+  (helm-log "output-string = %S" output-string)
+  (with-current-buffer helm-buffer
+    (let ((source (cdr process-assoc)))
+      (save-excursion
+        (helm-aif (assoc-default 'insertion-marker source)
+            (goto-char it)
+          (goto-char (point-max))
+          (helm-insert-header-from-source source)
+          (setcdr process-assoc
+                  (append source `((insertion-marker . ,(point-marker))))))
+        (helm-output-filter--process-source
+         (car process-assoc) output-string source
+         (helm-candidate-number-limit source))))
+    (helm-output-filter--post-process)))
+
+(defun helm-output-filter--process-source (process output-string source limit)
+  (cl-dolist (candidate (helm-transform-candidates
+                         (helm-output-filter--collect-candidates
+                          (split-string output-string "\n")
+                          (assoc 'incomplete-line source))
+                         source t))
+    (setq candidate
+          (helm--maybe-process-filter-one-by-one-candidate candidate source))
+    (if (assq 'multiline source)
+        (let ((start (point)))
+          (helm-insert-candidate-separator)
+          (helm-insert-match candidate 'insert-before-markers source
+                             (1+ (cdr (assoc 'item-count source))))
+          (put-text-property start (point) 'helm-multiline t))
+        (helm-insert-match candidate 'insert-before-markers source
+                           (1+ (cdr (assoc 'item-count source)))))
+    (cl-incf (cdr (assoc 'item-count source)))
+    (when (>= (assoc-default 'item-count source) limit)
+      (helm-kill-async-process process)
+      (cl-return))))
+
+(defun helm-output-filter--collect-candidates (lines incomplete-line-info)
+  "Collect LINES maybe completing the truncated first and last lines."
+  ;; The output of process may come in chunks of any size,
+  ;; so the last line of LINES come truncated, this truncated line is
+  ;; stored in INCOMPLETE-LINE-INFO and will be concated with the first
+  ;; incomplete line of next chunk arriving.
+  ;; INCOMPLETE-LINE-INFO is an attribute of source which is created
+  ;; with an empty string when the source is computed => (incomplete-line . "")
+  (helm-log "incomplete-line-info = %S" (cdr incomplete-line-info))
+  (butlast
+   (cl-loop for line in lines
+            ;; On start `incomplete-line-info' value is empty string.
+            for newline = (helm-aif (cdr incomplete-line-info)
+                              (prog1
+                                  (concat it line)
+                                (setcdr incomplete-line-info nil))
+                            line)
+            collect newline
+            ;; Store last incomplete line (last chunk truncated)
+            ;; until new output arrives.
+            ;; Previously we were storing 'line' in incomplete-line-info
+            ;; assuming output is truncated in only two chunks,
+            ;; which may be wrong if output is very large and is truncated
+            ;; in more than two chunks, so store now 'newline' which
+            ;; contain the previous chunks (Issue #1187).
+            finally do (setcdr incomplete-line-info newline))))
+
+(defun helm-output-filter--post-process ()
+  (let ((src (helm-get-current-source)))
+    (helm-log-run-hook 'helm-update-hook)
+    (helm-aif (get-buffer-window helm-buffer 'visible)
+        (with-selected-window it
+          (helm-skip-noncandidate-line 'next)
+          (helm-mark-current-line)
+          (helm-display-mode-line src)
+          (helm-log-run-hook 'helm-after-update-hook)))))
+
+(defun helm-process-deferred-sentinel-hook (process event file)
+  "Defer remote processes in sentinels.
+Meant to be called at beginning of a sentinel process function."
+  (when (and (string= event "finished\n")
+             (or (file-remote-p file)
+                 ;; `helm-suspend-update-flag'
+                 ;; is non--nil here only during a
+                 ;; running process, this will never be called
+                 ;; when user set it explicitely with `C-!'.
+                 helm-suspend-update-flag))
+    (setq helm-suspend-update-flag t)
+    ;; Kill the process but don't delete entry in
+    ;; `helm-async-processes'.
+    (helm-kill-async-process process)
+    ;; When tramp tries to open the same connection twice in a
+    ;; short time frame (less than 5s) it throw 'suppress which
+    ;; call the real-handler on the main "Emacs", so we wait
+    ;; 5s before updating to avoid this [1], but allowing user to
+    ;; enter input during this delay.
+    ;; [1] On last Emacs versions, this is fixed and tramp return
+    ;; nil in this situation.
+    ;; Note: It is difficult to have a value < to 5 for
+    ;; `tramp-connection-min-time-diff', because the process die
+    ;; when calling too quickly same process.
+    (run-at-time (or (and (boundp 'tramp-connection-min-time-diff)
+                          tramp-connection-min-time-diff)
+                     5)
+                 nil (lambda ()
+                         (when helm-alive-p ; Don't run timer fn after quit.
+                           (setq helm-suspend-update-flag nil)
+                           (helm-check-minibuffer-input))))))
+
+(defun helm-kill-async-processes ()
+  "Kill all asynchronous processes registered in `helm-async-processes'."
+  (while helm-async-processes
+    (helm-kill-async-process (caar helm-async-processes))
+    (setq helm-async-processes (cdr helm-async-processes))))
+
+(defun helm-kill-async-process (process)
+  "Stop output from `helm-output-filter' and kill associated PROCESS."
+  (set-process-filter process nil)
+  (delete-process process))
+
+
+;;; Core: action
+;;
+(defun helm-execute-selection-action ()
+  "Execute current action and kill the action buffer if present."
+  (helm-log-run-hook 'helm-before-action-hook)
+  ;; Position can be different when `helm-current-buffer'
+  ;; is splitted, so jump to this position before executing action.
+  (helm-current-position 'restore)
+  (unwind-protect
+       (helm-execute-selection-action-1)
+    (helm-aif (get-buffer helm-action-buffer)
+        (kill-buffer it))
+    (helm-log-run-hook 'helm-after-action-hook)))
+
+(defun helm-execute-selection-action-1 (&optional
+                                          selection action
+                                          preserve-saved-action)
+  "Execute ACTION on current SELECTION.
+If PRESERVE-SAVED-ACTION is non--nil save action."
+  (helm-log "executing action")
+  (setq action (helm-get-default-action
+                (or action
+                    helm-saved-action
+                    (if (get-buffer helm-action-buffer)
+                        (helm-get-selection helm-action-buffer)
+                      (helm-get-actions-from-current-source)))))
+  (let ((source (or helm-saved-current-source
+                    (helm-get-current-source)))
+        non-essential)
+    (setq selection (helm-coerce-selection
+                     (or selection
+                         helm-saved-selection
+                         (helm-get-selection)
+                         (and (assoc 'accept-empty source) ""))
+                     source))
+    (unless preserve-saved-action (setq helm-saved-action nil))
+    (when (and selection action) (funcall action selection))))
+
+(defun helm-coerce-selection (selection source)
+  "Apply coerce attribute function to SELECTION in SOURCE.
+Coerce source with coerce function."
+  (helm-aif (assoc-default 'coerce source)
+      (helm-funcall-with-source source it selection)
+    selection))
+
+(defun helm-get-default-action (action)
+  "Get the first ACTION value of action list in source."
+  (if (and (listp action) (not (functionp action)))
+      (cdar action)
+    action))
+
+(defun helm-select-action ()
+  "Select an action for the currently selected candidate.
+If action buffer is selected, back to the helm buffer."
+  (interactive)
+  (helm-log-run-hook 'helm-select-action-hook)
+  (setq helm-saved-selection (helm-get-selection))
+  (with-selected-frame (with-helm-window (selected-frame))
+    (prog1
+        (cond ((get-buffer-window helm-action-buffer 'visible)
+               (set-window-buffer (get-buffer-window helm-action-buffer)
+                                  helm-buffer)
+               (kill-buffer helm-action-buffer)
+               (helm-set-pattern helm-input 'noupdate))
+              (helm-saved-selection
+               (setq helm-saved-current-source (helm-get-current-source))
+               (let ((actions (helm-get-actions-from-current-source)))
+                 (if (functionp actions)
+                     (message "Sole action: %s" actions)
+                     (helm-show-action-buffer actions)
+                     ;; Be sure the minibuffer is entirely deleted (#907).
+                     (helm--delete-minibuffer-contents-from "")
+                     ;; Make `helm-pattern' differs from the previous value.
+                     (setq helm-pattern 'dummy)
+                     (helm-check-minibuffer-input))))
+              (t (message "No Actions available")))
+      (helm-display-mode-line (helm-get-current-source))
+      (run-hooks 'helm-window-configuration-hook))))
+
+(defun helm-show-action-buffer (actions)
+  (with-current-buffer (get-buffer-create helm-action-buffer)
+    (erase-buffer)
+    (buffer-disable-undo)
+    (set-window-buffer (get-buffer-window helm-buffer) helm-action-buffer)
+    (set (make-local-variable 'helm-sources)
+         (list
+          (helm-build-sync-source "Actions"
+            :volatile t
+            :nomark t
+            :keymap 'helm-map
+            :candidates actions
+            :mode-line '("Action(s)" "TAB:BackToCands RET/f1/f2/fn:NthAct")
+            :candidate-transformer
+             (lambda (candidates)
+               (cl-loop for (i . j) in candidates
+                        for count from 1
+                        collect
+                        (cons (concat (cond ((> count 12)
+                                             "      ")
+                                            ((< count 10)
+                                             (format "[f%s]  " count))
+                                            (t (format "[f%s] " count)))
+                                      (propertize i 'face 'helm-action))
+                              j)))
+            :candidate-number-limit nil)))
+    (set (make-local-variable 'helm-source-filter) nil)
+    (set (make-local-variable 'helm-selection-overlay) nil)
+    (helm-initialize-overlays helm-action-buffer)))
+
+
+;; Core: selection
+
+(defun helm-display-source-at-screen-top-maybe (unit)
+  "Display source at top of screen when UNIT value is 'source.
+With any other value of UNIT return nil."
+  (when (and helm-display-source-at-screen-top (eq unit 'source))
+    (set-window-start (selected-window)
+                      (save-excursion (forward-line -1) (point)))))
+
+(defun helm-skip-noncandidate-line (direction)
+  "Skip source header or candidates separator when going in DIRECTION.
+Possible value of DIRECTION are 'next or 'previous.
+Same as `helm-skip-header-and-separator-line' but ensure
+point is moved to the right place when at bop or eob."
+  (helm-skip-header-and-separator-line direction)
+  (and (bobp) (forward-line 1))     ; Skip first header.
+  (and (eobp) (forward-line -1)))   ; Avoid last empty line.
+
+(defun helm-skip-header-and-separator-line (direction)
+  "Skip source header or candidate separator when going to next/previous line.
+Possible value of DIRECTION are 'next or 'previous."
+  (let ((fn (cl-ecase direction
+              (next 'eobp)
+              (previous 'bobp))))
+  (while (and (not (funcall fn))
+              (or (helm-pos-header-line-p)
+                  (helm-pos-candidate-separator-p)))
+    (forward-line (if (and (eq direction 'previous)
+                           (not (eq (point-at-bol) (point-min))))
+                      -1 1)))))
+
+(defun helm-display-mode-line (source &optional force)
+  "Setup mode-line and header-line for `helm-buffer'."
+  (set (make-local-variable 'helm-mode-line-string)
+       (helm-interpret-value (or (and (listp source) ; Check if source is empty.
+                                      (assoc-default 'mode-line source))
+                                 (default-value 'helm-mode-line-string))
+                             source))
+  (let ((follow (and (eq (cdr (assq 'follow source)) 1) " (HF)"))
+        (marked (and helm-marked-candidates
+                     (cl-loop with cur-name = (assoc-default 'name source)
+                              for c in helm-marked-candidates
+                              for name = (assoc-default 'name (car c))
+                              when (string= name cur-name)
+                              collect c))))
+    ;; Setup mode-line.
+    (if helm-mode-line-string
+        (setq mode-line-format
+              `(" " mode-line-buffer-identification " "
+                    (:eval (format "L%-3d" (helm-candidate-number-at-point)))
+                    ,follow
+                    (:eval ,(and marked
+                                 (concat
+                                  " "
+                                  (propertize
+                                   (format "M%d" (length marked))
+                                   'face 'helm-visible-mark))))
+                    (:eval (when ,helm--mode-line-display-prefarg
+                             (let ((arg (prefix-numeric-value
+                                         (or prefix-arg current-prefix-arg))))
+                               (unless (= arg 1)
+                                 (propertize (format " [prefarg:%s]" arg)
+                                             'face 'helm-prefarg)))))
+                    " "
+                    (:eval (helm-show-candidate-number
+                            (car-safe helm-mode-line-string)))
+                    " " helm--mode-line-string-real " " mode-line-end-spaces)
+              helm--mode-line-string-real
+              (substitute-command-keys (if (listp helm-mode-line-string)
+                                           (cadr helm-mode-line-string)
+                                           helm-mode-line-string)))
+        (setq mode-line-format (default-value 'mode-line-format)))
+    ;; Setup header-line.
+    (cond (helm-echo-input-in-header-line
+           (setq force t)
+           (helm--set-header-line))
+          (helm-display-header-line
+           (let ((hlstr (helm-interpret-value
+                          (and (listp source)
+                               (assoc-default 'header-line source))
+                          source))
+                 (endstr (make-string (window-width) ? )))
+             (setq header-line-format
+                   (propertize (concat " " hlstr endstr)
+                               'face 'helm-header))))))
+  (when force (force-mode-line-update)))
+
+(defun helm--set-header-line (&optional update)
+  (with-selected-window (minibuffer-window)
+    (let* ((beg  (save-excursion (vertical-motion 0 (helm-window)) (point)))
+           (end  (save-excursion (end-of-visual-line) (point)))
+           ;; The visual line where the cursor is.
+           (cont (buffer-substring beg end))
+           (pref (propertize
+                  " "
+                  'display (if (string-match-p (regexp-quote helm--prompt) cont)
+                               '(space :width left-fringe)
+                               (propertize
+                                "->"
+                                'face 'helm-header-line-left-margin))))
+           (pos  (- (point) beg)))
+      (with-helm-buffer
+        (setq header-line-format (concat pref cont " "))
+        (put-text-property
+         ;; Increment pos to handle the space before prompt (i.e `pref').
+         (1+ pos) (+ 2 pos)
+         'face ;don't just use 'cursor; this can hide the current character
+         (list :inverse-video t
+               :foreground (face-background 'cursor)
+               :background (face-background 'default))
+         header-line-format)
+        (when update (force-mode-line-update))))))
+
+(defun helm--update-header-line ()
+  ;; This should be used in `post-command-hook',
+  ;; nowhere else.
+  (when (with-helm-buffer helm-echo-input-in-header-line)
+    (helm--set-header-line t)))
+
+(defun helm-hide-minibuffer-maybe ()
+  "Hide minibuffer contents in a Helm session.
+This function should normally go to `helm-minibuffer-set-up-hook'.
+It has no effect if `helm-echo-input-in-header-line' is nil."
+  (when (with-helm-buffer helm-echo-input-in-header-line)
+    (let ((ov (make-overlay (point-min) (point-max) nil nil t)))
+      (overlay-put ov 'window (selected-window))
+      (overlay-put ov 'face (let ((bg-color (face-background 'default nil)))
+                              `(:background ,bg-color :foreground ,bg-color)))
+      (setq cursor-type nil))))
+
+(defun helm-show-candidate-number (&optional name)
+  "Used to display candidate number in mode-line.
+You can specify NAME of candidates e.g \"Buffers\" otherwise
+it is \"Candidate\(s\)\" by default."
+  (when helm-alive-p
+    (unless (helm-empty-source-p)
+      ;; Build a fixed width string when candidate-number < 1000
+      (let* ((cand-name (or name "Candidate(s)"))
+             (width (length (format "[999 %s]" cand-name))))
+        (propertize
+         (format (concat "%-" (number-to-string width) "s")
+                 (format "[%s %s]"
+                         (helm-get-candidate-number 'in-current-source)
+                         cand-name))
+         'face 'helm-candidate-number)))))
+
+(cl-defun helm-move-selection-common (&key where direction)
+  "Move the selection marker to a new position.
+Position is determined by WHERE and DIRECTION.
+Key arg WHERE can be one of:
+ - line
+ - page
+ - edge
+ - source
+Key arg DIRECTION can be one of:
+ - previous
+ - next
+ - A source or a source name when used with :WHERE 'source."
+  (let ((move-func (cl-case where
+                     (line (cl-ecase direction
+                             (previous 'helm-move--previous-line-fn)
+                             (next 'helm-move--next-line-fn)))
+                     (page (cl-ecase direction
+                             (previous 'helm-move--previous-page-fn)
+                             (next 'helm-move--next-page-fn)))
+                     (edge (cl-ecase direction
+                             (previous 'helm-move--beginning-of-buffer-fn)
+                             (next 'helm-move--end-of-buffer-fn)))
+                     (source (cl-case direction
+                               (previous 'helm-move--previous-source-fn)
+                               (next 'helm-move--next-source-fn)
+                               (t (lambda () ; A source is passed as DIRECTION arg.
+                                    (helm-move--goto-source-fn direction))))))))
+    (unless (or (helm-empty-buffer-p (helm-buffer-get))
+                (not (helm-window)))
+      (with-helm-window
+        (helm-log-run-hook 'helm-move-selection-before-hook)
+        (funcall move-func)
+        (and (memq direction '(next previous))
+             (helm-skip-noncandidate-line direction))
+        (when (helm-pos-multiline-p)
+          (helm-move--beginning-of-multiline-candidate))
+        (helm-display-source-at-screen-top-maybe where)
+        (when (helm-get-previous-header-pos)
+          (helm-mark-current-line))
+        (helm-display-mode-line (helm-get-current-source))
+        (helm-log-run-hook 'helm-move-selection-after-hook)))))
+
+(defun helm-move--beginning-of-multiline-candidate ()
+  (let ((header-pos (helm-get-previous-header-pos))
+        (separator-pos (helm-get-previous-candidate-separator-pos)))
+    (when header-pos
+      (goto-char (if (or (null separator-pos)
+                         (< separator-pos header-pos))
+                     header-pos
+                     separator-pos))
+      (forward-line 1))))
+
+(defun helm-move--previous-multi-line-fn ()
+  (forward-line -1)
+  (unless (helm-pos-header-line-p)
+    (helm-skip-header-and-separator-line 'previous)
+    (helm-move--beginning-of-multiline-candidate)))
+
+(defun helm-move--previous-line-fn ()
+  (if (not (helm-pos-multiline-p))
+      (forward-line -1)
+    (helm-move--previous-multi-line-fn))
+  (when (and helm-move-to-line-cycle-in-source
+             (helm-pos-header-line-p))
+    (forward-line 1)
+    (helm-move--end-of-source)
+    ;; We are at end of helm-buffer
+    ;; check if last candidate is a multiline candidate
+    ;; and jump to it
+    (when (and (eobp)
+               (save-excursion (forward-line -1) (helm-pos-multiline-p)))
+      (helm-move--previous-multi-line-fn))))
+
+(defun helm-move--next-multi-line-fn ()
+  (let ((header-pos (helm-get-next-header-pos))
+        (separator-pos (helm-get-next-candidate-separator-pos)))
+    (cond ((and separator-pos
+                (or (null header-pos) (< separator-pos header-pos)))
+           (goto-char separator-pos))
+          (header-pos
+           (goto-char header-pos)))))
+
+(defun helm-move--next-line-fn ()
+  (if (not (helm-pos-multiline-p))
+      (forward-line 1)
+    (helm-move--next-multi-line-fn))
+  (when (and helm-move-to-line-cycle-in-source
+             (or (save-excursion (and (helm-pos-multiline-p)
+                                      (goto-char (overlay-end
+                                                  helm-selection-overlay))
+                                      (helm-end-of-source-p t)))
+                 (helm-end-of-source-p t)))
+    (helm-move--beginning-of-source)))
+
+(defun helm-move--previous-page-fn ()
+  (condition-case nil
+      (scroll-down)
+    (beginning-of-buffer (goto-char (point-min)))))
+
+(defun helm-move--next-page-fn ()
+  (condition-case nil
+      (scroll-up)
+    (end-of-buffer (goto-char (point-max)))))
+
+(defun helm-move--beginning-of-buffer-fn ()
+  (goto-char (point-min)))
+
+(defun helm-move--end-of-buffer-fn ()
+  (goto-char (point-max)))
+
+(defun helm-move--end-of-source ()
+  (goto-char (or (helm-get-next-header-pos) (point-max)))
+  (when (helm-pos-header-line-p) (forward-line -2)))
+
+(defun helm-move--beginning-of-source ()
+  (goto-char (helm-get-previous-header-pos))
+  (forward-line 1))
+
+(defun helm-move--previous-source-fn ()
+  (forward-line -1)
+  (if (bobp)
+      (goto-char (point-max))
+    (helm-skip-header-and-separator-line 'previous))
+  (goto-char (helm-get-previous-header-pos))
+  (forward-line 1))
+
+(defun helm-move--next-source-fn ()
+  (goto-char (or (and (not (save-excursion
+                             (forward-line 1) (eobp)))
+                      ;; Empty source at eob are just
+                      ;; not displayed unless they are dummy.
+                      ;; Issue #1117.
+                      (helm-get-next-header-pos))
+                 (point-min))))
+
+(defun helm-move--goto-source-fn (source-or-name)
+  (goto-char (point-min))
+  (let ((name (if (stringp source-or-name) source-or-name
+                (assoc-default 'name source-or-name))))
+    (condition-case err
+        (while (not (string= name (helm-current-line-contents)))
+          (goto-char (helm-get-next-header-pos)))
+      (error (helm-log "%S" err)))))
+
+(defun helm-candidate-number-at-point ()
+  (with-helm-buffer
+    (or (get-text-property (point) 'helm-cand-num) 1)))
+
+(defun helm--next-or-previous-line (direction &optional arg)
+  ;; Be sure to not use this in non--interactives calls.
+  (let ((helm-move-to-line-cycle-in-source
+         (and helm-move-to-line-cycle-in-source arg)))
+    (if (and arg (> arg 1))
+        (cl-loop with pos = (helm-candidate-number-at-point)
+                 with cand-num = (helm-get-candidate-number t)
+                 with iter = (min arg (if (eq direction 'next)
+                                          (- cand-num pos)
+                                          (min arg (1- pos))))
+                 for count from 1
+                 while (<= count iter)
+                 do
+                 (helm-move-selection-common :where 'line :direction direction))
+        (helm-move-selection-common :where 'line :direction direction))))
+
+(defun helm-previous-line (&optional arg)
+  "Move selection to the ARG previous line(s).
+Same behavior than `helm-next-line' when called with a numeric prefix arg."
+  (interactive "p")
+  (with-helm-alive-p
+    (helm--next-or-previous-line 'previous arg)))
+(put 'helm-previous-line 'helm-only t)
+
+(defun helm-next-line (&optional arg)
+  "Move selection to the next ARG line(s).
+When a numeric prefix arg is given and this numeric arg
+is > to the number of candidates, move to last candidate of
+current source (i.e don't move to next source if some)."
+  (interactive "p")
+  (with-helm-alive-p
+    (helm--next-or-previous-line 'next arg)))
+(put 'helm-next-line 'helm-only t)
+
+(defun helm-previous-page ()
+  "Move selection back with a pageful."
+  (interactive)
+  (with-helm-alive-p
+    (helm-move-selection-common :where 'page :direction 'previous)))
+(put 'helm-previous-page 'helm-only t)
+
+(defun helm-next-page ()
+  "Move selection forward with a pageful."
+  (interactive)
+  (with-helm-alive-p
+    (helm-move-selection-common :where 'page :direction 'next)))
+(put 'helm-next-page 'helm-only t)
+
+(defun helm-beginning-of-buffer ()
+  "Move selection at the top."
+  (interactive)
+  (with-helm-alive-p
+    (helm-move-selection-common :where 'edge :direction 'previous)))
+(put 'helm-beginning-of-buffer 'helm-only t)
+
+(defun helm-end-of-buffer ()
+  "Move selection at the bottom."
+  (interactive)
+  (with-helm-alive-p
+    (helm-move-selection-common :where 'edge :direction 'next)))
+(put 'helm-end-of-buffer 'helm-only t)
+
+(defun helm-previous-source ()
+  "Move selection to the previous source."
+  (interactive)
+  (with-helm-alive-p
+    (helm-move-selection-common :where 'source :direction 'previous)))
+(put 'helm-previous-source 'helm-only t)
+
+(defun helm-next-source ()
+  "Move selection to the next source."
+  (interactive)
+  (with-helm-alive-p
+    (helm-move-selection-common :where 'source :direction 'next)))
+(put 'helm-next-source 'helm-only t)
+
+(defun helm-goto-source (source-or-name)
+  "Move the selection to the source SOURCE-OR-NAME."
+  (helm-move-selection-common :where 'source :direction source-or-name))
+
+(defun helm--follow-action (arg)
+  (let ((helm--temp-follow-flag t))
+    (when (or (eq last-command 'helm-follow-action-forward)
+              (eq last-command 'helm-follow-action-backward)
+              (eq last-command 'helm-execute-persistent-action))
+      (if (> arg 0)
+          (helm-next-line 1)
+        (helm-previous-line 1)))
+    (helm-execute-persistent-action)))
+
+(defun helm-follow-action-forward ()
+  "Go to next line and execute persistent action."
+  (interactive)
+  (helm--follow-action 1))
+
+(defun helm-follow-action-backward ()
+  "Go to previous line and execute persistent action."
+  (interactive)
+  (helm--follow-action -1))
+
+(defun helm-mark-current-line (&optional resumep)
+  "Move `helm-selection-overlay' to current line.
+Note that this is not related with visibles marks, which are used
+to mark candidates."
+  (with-helm-window
+    (when resumep
+      (goto-char helm-selection-point))
+    (move-overlay
+     helm-selection-overlay (point-at-bol)
+     (if (helm-pos-multiline-p)
+         (let ((header-pos (helm-get-next-header-pos))
+               (separator-pos (helm-get-next-candidate-separator-pos)))
+           (or (and (null header-pos) separator-pos)
+               (and header-pos separator-pos
+                    (< separator-pos header-pos)
+                    separator-pos)
+               header-pos
+               (point-max)))
+       (1+ (point-at-eol))))
+    (setq helm-selection-point (overlay-start helm-selection-overlay)))
+  (helm-follow-execute-persistent-action-maybe))
+
+(defun helm-confirm-and-exit-minibuffer ()
+  "Maybe ask for confirmation when exiting helm.
+It is similar to `minibuffer-complete-and-exit' adapted to helm.
+If `minibuffer-completion-confirm' value is 'confirm,
+send in minibuffer confirm message and exit on next hit.
+If `minibuffer-completion-confirm' value is t,
+don't exit and send message 'no match'."
+  (interactive)
+  (if (and (helm--updating-p)
+           (null helm--reading-passwd-or-string))
+      (progn (message "[Display not ready]")
+             (sit-for 0.5) (message nil))
+      (let* ((empty-buffer-p (with-current-buffer helm-buffer
+                               (eq (point-min) (point-max))))
+             (sel (helm-get-selection))
+             (unknown (and (not empty-buffer-p)
+                           (string= (get-text-property
+                                     0 'display
+                                     (helm-get-selection nil 'withprop))
+                                    "[?]"))))
+        (cond ((and (or empty-buffer-p unknown)
+                    (eq minibuffer-completion-confirm 'confirm))
+               (setq helm-minibuffer-confirm-state
+                     'confirm)
+               (setq minibuffer-completion-confirm nil)
+               (minibuffer-message " [confirm]"))
+              ((and (or empty-buffer-p
+                        (unless (if minibuffer-completing-file-name
+                                    (and minibuffer-completion-predicate
+                                         (funcall minibuffer-completion-predicate sel))
+                                    (and (stringp sel)
+                                         ;; SEL may be a cons cell when helm-comp-read
+                                         ;; is called directly with a collection composed
+                                         ;; of (display . real) and real is a cons cell.
+                                         (try-completion sel minibuffer-completion-table
+                                                         minibuffer-completion-predicate)))
+                          unknown))
+                    (eq minibuffer-completion-confirm t))
+               (minibuffer-message " [No match]"))
+              (t
+               (setq helm-minibuffer-confirm-state nil)
+               (helm-exit-minibuffer))))))
+(add-hook 'helm-after-update-hook 'helm-confirm-and-exit-hook)
+
+(defun helm-confirm-and-exit-hook ()
+  "Restore `minibuffer-completion-confirm' when helm update."
+  (unless (or (eq minibuffer-completion-confirm t)
+              (not helm-minibuffer-confirm-state))
+    (setq minibuffer-completion-confirm
+          helm-minibuffer-confirm-state)))
+
+(defun helm-read-string (prompt &optional initial-input history
+                                  default-value inherit-input-method)
+  "Same as `read-string' but for reading string from a helm session."
+  (let ((helm--reading-passwd-or-string t))
+    (read-string
+     prompt initial-input history default-value inherit-input-method)))
+
+(defun helm--updating-p ()
+  ;; helm timer is between two cycles.
+  ;; IOW `helm-check-minibuffer-input' haven't yet compared input
+  ;; and `helm-pattern'.
+  (or (not (equal (minibuffer-contents) helm-pattern))
+      ;; `helm-check-minibuffer-input' have launched `helm-update'.
+      helm--in-update))
+
+(defun helm-maybe-exit-minibuffer ()
+  (interactive)
+  (if (and (helm--updating-p)
+           (null helm--reading-passwd-or-string))
+      (progn (message "[Display not ready]")
+             (sit-for 0.5) (message nil))
+      (helm-exit-minibuffer)))
+
+(defun helm-exit-minibuffer ()
+  "Select the current candidate by exiting the minibuffer."
+  (unless helm-current-prefix-arg
+    (setq helm-current-prefix-arg current-prefix-arg))
+  (setq helm-exit-status 0)
+  (helm-log-run-hook 'helm-exit-minibuffer-hook)
+  (exit-minibuffer))
+
+(defun helm-keyboard-quit ()
+  "Quit minibuffer in helm.
+If action buffer is displayed, kill it."
+  (interactive)
+  (when (get-buffer-window helm-action-buffer 'visible)
+    (kill-buffer helm-action-buffer))
+  (setq helm-exit-status 1)
+  (abort-recursive-edit))
+
+(defun helm-get-next-header-pos ()
+  "Return the position of the next header from point."
+  (next-single-property-change (point) 'helm-header))
+
+(defun helm-get-previous-header-pos ()
+  "Return the position of the previous header from point."
+  (previous-single-property-change (point) 'helm-header))
+
+(defun helm-pos-multiline-p ()
+  "Return non-nil if the current position is in the multiline source region."
+  (get-text-property (point) 'helm-multiline))
+
+(defun helm-get-next-candidate-separator-pos ()
+  "Return the position of the next candidate separator from point."
+  (let ((hp (helm-get-next-header-pos)))
+    (helm-aif (next-single-property-change (point) 'helm-candidate-separator)
+        (or
+         ;; Be sure we don't catch
+         ;; the separator of next source.
+         (and hp (< it hp) it)
+         ;; The separator found is in next source
+         ;; we are at last cand, so use the header pos.
+         (and hp (< hp it) hp)
+         ;; A single source, just try next separator.
+         it))))
+
+(defun helm-get-previous-candidate-separator-pos ()
+  "Return the position of the previous candidate separator from point."
+  (previous-single-property-change (point) 'helm-candidate-separator))
+
+(defun helm-pos-header-line-p ()
+  "Return t if the current line is a header line."
+  (or (get-text-property (point-at-bol) 'helm-header)
+      (get-text-property (point-at-bol) 'helm-header-separator)))
+
+(defun helm-pos-candidate-separator-p ()
+  "Return t if the current line is a candidate separator."
+  (get-text-property (point-at-bol) 'helm-candidate-separator))
+
+
+;;; Debugging
+;;
+;;
+(defun helm-debug-output ()
+  "Show all helm-related variables at this time."
+  (interactive)
+  (helm-help-internal " *Helm Debug*" 'helm-debug-output-function))
+
+(defun helm-debug-output-function (&optional vars)
+  (message "Calculating all helm-related values...")
+  (insert "If you debug some variables or forms, set `helm-debug-variables'
+to a list of forms.\n\n")
+  (cl-dolist (v (or vars
+                    helm-debug-variables
+                    (apropos-internal "^helm-" 'boundp)))
+    (insert "** "
+            (pp-to-string v) "\n"
+            (pp-to-string (with-current-buffer helm-buffer (eval v))) "\n"))
+  (message "Calculating all helm-related values...Done"))
+
+;;;###autoload
+(defun helm-debug-toggle ()
+  "Enable/disable helm debug from outside of helm session."
+  (interactive)
+  (with-helm-alive-p
+    (setq helm-debug (not helm-debug))
+    (message "Helm Debug is now %s"
+             (if helm-debug "Enabled" "Disabled"))))
+(put 'helm-debug-toggle 'helm-only t)
+
+(defun helm-enable-or-switch-to-debug ()
+  "First hit enable helm debugging, second hit switch to debug buffer."
+  (interactive)
+  (with-helm-alive-p
+    (if helm-debug
+        (helm-run-after-exit
+         #'helm-debug-open-last-log)
+        (setq helm-debug t)
+        (message "Debugging enabled"))))
+(put 'helm-enable-or-switch-to-debug 'helm-only t)
+
+
+;; Core: misc
+(defun helm-kill-buffer-hook ()
+  "Remove tick entry from `helm-tick-hash' and remove buffer from
+`helm-buffers' when killing a buffer."
+  (cl-loop for key being the hash-keys in helm-tick-hash
+        if (string-match (format "^%s/" (regexp-quote (buffer-name))) key)
+        do (remhash key helm-tick-hash))
+  (setq helm-buffers (remove (buffer-name) helm-buffers)))
+(add-hook 'kill-buffer-hook 'helm-kill-buffer-hook)
+
+(defun helm-preselect (candidate-or-regexp &optional source)
+  "Move `helm-selection-overlay' to CANDIDATE-OR-REGEXP on startup.
+Arg CANDIDATE-OR-REGEXP can be a string or a cons cell of two strings.
+When it is a cons cell helm will try to jump first to first element of cons cell
+and then to second, allowing a finer preselection when possible duplicates are
+before the candidate we want to preselect."
+  (with-helm-window
+    (when candidate-or-regexp
+      (if (and helm-force-updating-p source)
+          (helm-goto-source source)
+        (goto-char (point-min))
+        (forward-line 1))
+      (let ((start (point)))
+        (or
+         (if (consp candidate-or-regexp)
+             (and (re-search-forward (car candidate-or-regexp) nil t)
+                  (re-search-forward (cdr candidate-or-regexp) nil t))
+             (re-search-forward candidate-or-regexp nil t))
+         (goto-char start))))
+    (forward-line 0) ; Avoid scrolling right on long lines.
+    (when (helm-pos-multiline-p)
+      (helm-move--beginning-of-multiline-candidate))
+    (when (helm-pos-header-line-p) (forward-line 1))
+    (helm-mark-current-line)
+    (helm-display-mode-line (helm-get-current-source))
+    (helm-log-run-hook 'helm-after-preselection-hook)))
+
+(defun helm-delete-current-selection ()
+  "Delete the currently selected item."
+  (interactive)
+  (with-helm-window
+    (cond ((helm-pos-multiline-p)
+           (helm-aif (helm-get-next-candidate-separator-pos)
+               (delete-region (point-at-bol)
+                              (1+ (progn (goto-char it) (point-at-eol))))
+             ;; last candidate
+             (goto-char (helm-get-previous-candidate-separator-pos))
+             (delete-region (point-at-bol) (point-max)))
+           (when (helm-end-of-source-p)
+             (goto-char (or (helm-get-previous-candidate-separator-pos)
+                            (point-min)))
+             (forward-line 1)))
+          (t
+           (delete-region (point-at-bol) (1+ (point-at-eol)))
+           (when (helm-end-of-source-p t)
+             (let ((headp (save-excursion
+                            (forward-line -1)
+                            (not (helm-pos-header-line-p)))))
+               (and headp (forward-line -1))))))
+    (unless (helm-end-of-source-p t)
+      (helm-mark-current-line))))
+
+(defun helm-end-of-source-p (&optional at-point)
+  "Return non--nil if we are at eob or end of source."
+  (save-excursion
+    (if (and (helm-pos-multiline-p) (null at-point))
+        (null (helm-get-next-candidate-separator-pos))
+      (forward-line (if at-point 0 1))
+      (or (eq (point-at-bol) (point-at-eol))
+          (helm-pos-header-line-p)
+          (eobp)))))
+
+(defun helm-beginning-of-source-p (&optional at-point)
+  "Return non--nil if we are at bob or beginning of source."
+  (save-excursion
+    (if (and (helm-pos-multiline-p) (null at-point))
+        (null (helm-get-previous-candidate-separator-pos))
+      (forward-line (if at-point 0 -1))
+      (or (eq (point-at-bol) (point-at-eol))
+          (helm-pos-header-line-p)
+          (bobp)))))
+
+(defun helm-edit-current-selection-internal (func)
+  (with-helm-window
+    (forward-line 0)
+    (let ((realvalue (get-text-property (point) 'helm-realvalue))
+          (multiline (get-text-property (point) 'helm-multiline)))
+      (funcall func)
+      (forward-line 0)
+      (and realvalue
+           (put-text-property (point) (point-at-eol)
+                              'helm-realvalue realvalue))
+      (and multiline
+           (put-text-property (point) (point-at-eol)
+                              'helm-multiline multiline))
+      (helm-mark-current-line))))
+
+(defmacro helm-edit-current-selection (&rest forms)
+  "Evaluate FORMS at current selection in the helm buffer.
+Used generally to modify current selection."
+  (declare (indent 0) (debug t))
+  `(helm-edit-current-selection-internal
+    (lambda () ,@forms)))
+
+(defun helm--delete-minibuffer-contents-from (from-str)
+  ;; Giving an empty string value to FROM-STR delete all.
+  (let ((input (minibuffer-contents)))
+    (helm-reset-yank-point)
+    (if (> (length input) 0)
+        ;; minibuffer is not empty, delete contents from end
+        ;; of FROM-STR and update.
+        (helm-set-pattern from-str)
+        ;; minibuffer is already empty, force update.
+        (helm-force-update))))
+
+(defun helm-delete-minibuffer-contents (&optional arg)
+  "Delete minibuffer contents.
+When `helm-delete-minibuffer-contents-from-point' is non--nil,
+delete minibuffer contents from point instead of deleting all.
+Giving a prefix arg reverse this behavior.
+When at end of minibuffer delete all."
+  (interactive "P")
+  (let ((str (if helm-delete-minibuffer-contents-from-point
+                 (if (or arg (eobp))
+                     "" (helm-minibuffer-completion-contents))
+                 (if (and arg (not (eobp)))
+                     (helm-minibuffer-completion-contents) ""))))
+    (helm--delete-minibuffer-contents-from str)))
+
+
+;;; Plugins (Deprecated in favor of helm-types)
+;;
+;; i.e Inherit instead of helm-type-* classes in your own classes.
+
+;; [DEPRECATED] Enable multi-match by default in old sources.
+;; This is deprecated and will not run in sources
+;; created by helm-source.
+;; Keep it for backward compatibility with old sources.
+(defun helm-compile-source--multi-match (source)
+  (if (assoc 'no-matchplugin source)
+      source
+    (let* ((searchers        helm-mm-default-search-functions)
+           (defmatch         (helm-aif (assoc-default 'match source)
+                                 (helm-mklist it)))
+           (defmatch-strict  (helm-aif (assoc-default 'match-strict source)
+                                 (helm-mklist it)))
+           (defsearch        (helm-aif (assoc-default 'search source)
+                                 (helm-mklist it)))
+           (defsearch-strict (helm-aif (assoc-default 'search-strict source)
+                                 (helm-mklist it)))
+           (matchfns         (cond (defmatch-strict)
+                                   (defmatch
+                                    (append helm-mm-default-match-functions defmatch))
+                                   (t helm-mm-default-match-functions)))
+           (searchfns        (cond (defsearch-strict)
+                                   (defsearch
+                                    (append searchers defsearch))
+                                   (t searchers))))
+      `(,(if (assoc 'candidates-in-buffer source)
+             `(search ,@searchfns) `(match ,@matchfns))
+         ,@source))))
+
+(add-to-list 'helm-compile-source-functions 'helm-compile-source--multi-match)
+
+(defun helm-compile-source--type (source)
+  (helm-aif (assoc-default 'type source)
+      (append source (assoc-default it helm-type-attributes) nil)
+    source))
+
+(defun define-helm-type-attribute (type definition &optional doc)
+  "Register type attribute of TYPE as DEFINITION with DOC.
+DOC is displayed in `helm-type-attributes' docstring.
+
+Use this function is better than setting `helm-type-attributes' directly."
+  (cl-loop for i in definition do
+        ;; without `ignore-errors', error at emacs22
+        (ignore-errors (setf i (delete nil i))))
+  (helm-add-type-attribute type definition)
+  (and doc (helm-document-type-attribute type doc))
+  nil)
+
+(defun helm-document-attribute (attribute short-doc &optional long-doc)
+  "Register ATTRIBUTE documentation introduced by plug-in.
+SHORT-DOC is displayed beside attribute name.
+LONG-DOC is displayed below attribute name and short documentation."
+  (declare (indent 2))
+  (if long-doc
+      (setq short-doc (concat "(" short-doc ")"))
+    (setq long-doc short-doc
+          short-doc ""))
+  (add-to-list 'helm-attributes attribute t)
+  (put attribute 'helm-attrdoc
+       (concat "- " (symbol-name attribute)
+               " " short-doc "\n\n" long-doc "\n")))
+
+(defun helm-add-type-attribute (type definition)
+  (helm-aif (assq type helm-type-attributes)
+      (setq helm-type-attributes (delete it helm-type-attributes)))
+  (push (cons type definition) helm-type-attributes))
+
+(defun helm-document-type-attribute (type doc)
+  (add-to-list 'helm-types type t)
+  (put type 'helm-typeattrdoc
+       (concat "- " (symbol-name type) "\n\n" doc "\n")))
+
+;; Built-in plug-in: dummy
+(defun helm-dummy-candidate (_candidate _source)
+  "Use `helm-pattern' as CANDIDATE in SOURCE."
+  ;; `source' is defined in filtered-candidate-transformer
+  (list helm-pattern))
+
+(defun helm-compile-source--dummy (source)
+  (if (assoc 'dummy source)
+      (progn
+        (unless (helm-attr-defined
+                 'filtered-candidate-transformer source)
+          (helm-attrset 'filtered-candidate-transformer
+                        'helm-dummy-candidate source))
+        (append source
+                '((candidates "dummy")
+                  (accept-empty)
+                  (match identity)
+                  (volatile))))
+    source))
+
+;; Built-in plug-in: candidates-in-buffer
+(defun helm-candidates-in-buffer (&optional source)
+  "The top level function used to store candidates in `helm-source-in-buffer'.
+
+Candidates are stored in a buffer generated internally by the function
+`helm-candidate-buffer'.  Each candidate must be placed in one line.
+This function is meant to be used in candidates-in-buffer or candidates
+attribute of an helm source.  Especially fast for many (1000+) candidates.
+
+The buffer is created and feeded in the init attribute function of helm.
+
+e.g:
+
+     (helm-build-in-buffer-source \"test\"
+       :init (lambda ()
+               (helm-init-candidates-in-buffer
+                   'global '(foo foa fob bar baz))))
+
+A shortcut can be used to simplify:
+          
+     (helm-build-in-buffer-source \"test\"
+       :data '(foo foa fob bar baz))
+
+The usage of the `candidates-in-buffer' is deprecated in favor
+of `helm-source-in-buffer' class.
+
+It is anyway described below and provided for backward compatibility.
+
+By default, `helm' makes candidates by evaluating the
+candidates function, then narrows them by `string-match' for each
+candidate.
+
+But this way is very slow for many candidates. The new way is
+storing all candidates in a buffer and narrowing them by
+`re-search-forward'. Search function is customizable by search
+attribute. The important point is that buffer processing is MUCH
+FASTER than string list processing and is the Emacs way.
+
+The init function writes all candidates to a newly-created
+candidate buffer.  The candidates buffer is created or specified
+by `helm-candidate-buffer'.  Candidates are stored in a line.
+
+The candidates function narrows all candidates, IOW creates a
+subset of candidates dynamically. It is the task of
+`helm-candidates-in-buffer'.  As long as
+`helm-candidate-buffer' is used,`(candidates-in-buffer)' is
+sufficient in most cases.
+
+Note that `(candidates-in-buffer)' is shortcut of three attributes:
+  (candidates . helm-candidates-in-buffer)
+  (volatile)
+  (match identity)
+And `(candidates-in-buffer . func)' is shortcut of three attributes:
+  (candidates . func)
+  (volatile)
+  (match identity)
+The expansion is performed in `helm-get-sources'.
+
+The `candidates-in-buffer' attribute implies the volatile attribute.
+The volatile attribute is needed because `helm-candidates-in-buffer'
+creates candidates dynamically and need to be called everytime
+`helm-pattern' changes.
+
+Because `helm-candidates-in-buffer' plays the role of `match' attribute
+function, specifying `(match identity)' makes the source slightly faster.
+
+However if source contain `match-part' attribute, match is computed only
+on part of candidate returned by the call of function provided by this attribute.
+The function should have one arg, candidate, and return only
+a specific part of candidate.
+
+To customize `helm-candidates-in-buffer' behavior, use `search',
+`get-line' and `match-part' attributes."
+  (let ((src (or source (helm-get-current-source))))
+    (helm-candidates-in-buffer-1
+     (helm-candidate-buffer)
+     helm-pattern
+     (or (assoc-default 'get-line src)
+         #'buffer-substring-no-properties)
+     (or (assoc-default 'search src)
+         '(helm-candidates-in-buffer-search-default-fn))
+     (helm-candidate-number-limit src)
+     (helm-attr 'match-part)
+     src)))
+
+(defun helm-candidates-in-buffer-search-default-fn (pattern)
+  "Search PATTERN with `re-search-forward' with bound and noerror args."
+  (condition-case _err
+      (re-search-forward pattern nil t)
+    (invalid-regexp nil)))
+
+(defun helm-candidates-in-buffer-1 (buffer pattern get-line-fn
+                                    search-fns limit
+                                    match-part-fn source)
+  "Return the list of candidates inserted in BUFFER matching PATTERN."
+  ;; buffer == nil when candidates buffer does not exist.
+  (when buffer
+    (with-current-buffer buffer
+      (let ((inhibit-point-motion-hooks t)
+            (start-point (1- (point-min))))
+        (goto-char start-point)
+        (if (string= pattern "")
+            (helm-initial-candidates-from-candidate-buffer
+             get-line-fn limit)
+          (helm-search-from-candidate-buffer
+           pattern get-line-fn search-fns limit
+           start-point match-part-fn source))))))
+
+(defun helm-search-from-candidate-buffer (pattern get-line-fn search-fns
+                                          limit start-point match-part-fn source)
+  (let (buffer-read-only
+        matches
+        newmatches
+        (item-count 0)
+        (case-fold-search (helm-set-case-fold-search)))
+    (helm--search-from-candidate-buffer-1
+     (lambda ()
+       (clrhash helm-cib-hash)
+       (cl-dolist (searcher search-fns)
+         (goto-char start-point)
+         (forward-line 1) ; >>>[1]
+         (setq newmatches nil)
+         (cl-loop with pos-lst
+                  while (and (setq pos-lst (funcall searcher pattern))
+                             (not (eobp)))
+                  for cand = (apply get-line-fn
+                                    (if (and pos-lst (listp pos-lst))
+                                        pos-lst
+                                        (list (point-at-bol) (point-at-eol))))
+                  when (and (not (gethash cand helm-cib-hash))
+                            (or
+                             ;; Always collect when cand is matched
+                             ;; by searcher funcs and match-part attr
+                             ;; is not present.
+                             (and (not match-part-fn)
+                                  (not (consp pos-lst)))
+                             ;; If match-part attr is present, or if SEARCHER fn
+                             ;; returns a cons cell, collect PATTERN only if it
+                             ;; match the part of CAND specified by
+                             ;; the match-part func.
+                             (helm-search-match-part
+                              cand pattern (or match-part-fn #'identity))))
+                  do (helm--accumulate-candidates
+                      cand newmatches helm-cib-hash item-count limit source))
+         (setq matches (append matches (nreverse newmatches))))
+       (delq nil matches)))))
+
+(defun helm-search-match-part (candidate pattern match-part-fn)
+  "Match PATTERN only on part of CANDIDATE returned by MATCH-PART-FN.
+Because `helm-search-match-part' maybe called even if unspecified
+in source (negation), MATCH-PART-FN default to `identity'
+to match whole candidate.
+When using fuzzy matching and negation (i.e \"!\"),
+this function is always called."
+  (let ((part (funcall match-part-fn candidate))
+        (fuzzy-regexp (cadr (gethash 'helm-pattern helm--fuzzy-regexp-cache)))
+        (matchfn (if helm-migemo-mode
+                     'helm-mm-migemo-string-match 'string-match)))
+    (if (string-match " " pattern)
+        (cl-loop for i in (split-string pattern) always
+                 (if (string-match "\\`!" i)
+                     (not (funcall matchfn (substring i 1) part))
+                     (funcall matchfn i part)))
+        (if (string-match "\\`!" pattern)
+            (if helm--in-fuzzy
+                ;; Fuzzy regexp have already been
+                ;; computed with substring 1.
+                (not (string-match fuzzy-regexp part))
+                (not (funcall matchfn (substring pattern 1) part)))
+            (funcall matchfn (if helm--in-fuzzy fuzzy-regexp pattern) part)))))
+
+(defun helm-initial-candidates-from-candidate-buffer (get-line-fn limit)
+  (delq nil (cl-loop for i from 1 to limit
+                     until (eobp)
+                     collect (funcall get-line-fn
+                                      (point-at-bol) (point-at-eol))
+                     do (forward-line 1))))
+
+(defun helm--search-from-candidate-buffer-1 (search-fn)
+  ;; We are adding a newline at bob and at eol
+  ;; and removing these newlines afterward.
+  ;; This is a bad hack that should be removed.
+  ;; To avoid matching the empty line at first line
+  ;; when searching with e.g occur and "^$" just
+  ;; forward-line before searching (See >>>[1] above).
+  (goto-char (point-min))
+  (insert "\n")
+  (goto-char (point-max))
+  (insert "\n")
+  (unwind-protect
+       (funcall search-fn)
+    (goto-char (point-min))
+    (delete-char 1)
+    (goto-char (1- (point-max)))
+    (delete-char 1)
+    (set-buffer-modified-p nil)))
+
+(defun helm-candidate-buffer (&optional create-or-buffer)
+  "Register and return a buffer containing candidates of current source.
+`helm-candidate-buffer' searches buffer-local candidates buffer first,
+then global candidates buffer.
+
+Acceptable values of CREATE-OR-BUFFER:
+
+- nil (omit)
+  Only return the candidates buffer.
+- a buffer
+  Register a buffer as a candidates buffer.
+- 'global
+  Create a new global candidates buffer,
+  named \" *helm candidates:SOURCE*\".
+- other non-nil value
+  Create a new local candidates buffer,
+  named \" *helm candidates:SOURCE*HELM-CURRENT-BUFFER\"."
+  (let* ((global-bname (format " *helm candidates:%s*"
+                               helm-source-name))
+         (local-bname (format " *helm candidates:%s*%s"
+                              helm-source-name
+                              (buffer-name helm-current-buffer)))
+         (register-func
+          (lambda ()
+            (setq helm-candidate-buffer-alist
+                  (cons (cons helm-source-name create-or-buffer)
+                        (delete (assoc helm-source-name
+                                       helm-candidate-buffer-alist)
+                                helm-candidate-buffer-alist)))))
+         (kill-buffers-func
+          (lambda ()
+            (cl-loop for b in (buffer-list)
+                     if (string-match (format "^%s" (regexp-quote global-bname))
+                                      (buffer-name b))
+                     do (kill-buffer b))))
+         (create-func
+          (lambda ()
+            (with-current-buffer
+                (get-buffer-create (if (eq create-or-buffer 'global)
+                                       global-bname
+                                       local-bname))
+              (set (make-local-variable 'inhibit-read-only) t) ; Fix (#1176)
+              (buffer-disable-undo)
+              (erase-buffer)
+              (font-lock-mode -1))))
+         (return-func
+          (lambda ()
+            (or (get-buffer local-bname)
+                (get-buffer global-bname)
+                (helm-aif (assoc-default helm-source-name
+                                         helm-candidate-buffer-alist)
+                    (and (buffer-live-p it) it))))))
+    (when create-or-buffer
+      (funcall register-func)
+      (unless (bufferp create-or-buffer)
+        (and (eq create-or-buffer 'global) (funcall kill-buffers-func))
+        (funcall create-func)))
+    (funcall return-func)))
+
+(defun helm-init-candidates-in-buffer (buffer data)
+  "Register BUFFER with DATA for a helm candidates-in-buffer session.
+Arg BUFFER can be a string, a buffer object (bufferp), or a symbol,
+either 'local or 'global which is passed to `helm-candidate-buffer'.
+Arg DATA can be either a list or a plain string.
+Returns the resulting buffer."
+  (declare (indent 1))
+  (let ((buf (helm-candidate-buffer
+              (if (or (stringp buffer)
+                      (bufferp buffer))
+                  (get-buffer-create buffer)
+                buffer)))) ; a symbol.
+    (with-current-buffer buf
+      (erase-buffer)
+      (if (listp data)
+          (insert (mapconcat (lambda (i)
+                               (cond ((symbolp i) (symbol-name i))
+                                     ((numberp i) (number-to-string i))
+                                     (t i)))
+                             data "\n"))
+        (and (stringp data) (insert data))))
+    buf))
+
+(defun helm-compile-source--candidates-in-buffer (source)
+  (helm-aif (assoc 'candidates-in-buffer source)
+      (append source
+              `((candidates . ,(or (cdr it)
+                                   (lambda ()
+                                     (helm-candidates-in-buffer source))))
+                (volatile) (match identity)))
+    source))
+
+
+;;; Resplit helm window
+;;
+;;
+(defun helm-toggle-resplit-window ()
+  "Toggle resplit helm window, vertically or horizontally."
+  (interactive)
+  (with-helm-alive-p
+    (when helm-prevent-escaping-from-minibuffer
+      (helm-prevent-switching-other-window :enabled nil))
+    (unwind-protect
+         (with-helm-window
+           (if (or helm-full-frame (one-window-p t))
+               (message "Error: Attempt to resplit a single window")
+               (let ((before-height (window-height)))
+                 (delete-window)
+                 (set-window-buffer
+                  (select-window
+                   (if (= (window-height) before-height) ; initial split was horizontal.
+                       ;; Split window vertically with `helm-buffer' placed
+                       ;; on the good side according to actual value of
+                       ;; `helm-split-window-default-side'.
+                       (prog1
+                           (cond ((or (eq helm-split-window-default-side 'above)
+                                      (eq helm-split-window-default-side 'left))
+                                  (split-window
+                                   (selected-window) nil 'above))
+                                 (t (split-window-vertically)))
+                         (setq helm-split-window-state 'vertical))
+                       ;; Split window vertically, same comment as above.
+                       (setq helm-split-window-state 'horizontal)
+                       (cond ((or (eq helm-split-window-default-side 'left)
+                                  (eq helm-split-window-default-side 'above))
+                              (split-window (selected-window) nil 'left))
+                             (t (split-window-horizontally)))))
+                  helm-buffer)))
+           (setq helm--window-side-state (helm--get-window-side-state)))
+      (when helm-prevent-escaping-from-minibuffer
+        (helm-prevent-switching-other-window :enabled t)))))
+(put 'helm-toggle-resplit-window 'helm-only t)
+
+;; Utility: Resize helm window.
+(defun helm-enlarge-window-1 (n)
+  "Enlarge or narrow helm window.
+If N is positive enlarge, if negative narrow."
+  (unless helm-full-frame
+    (let ((horizontal-p (eq helm-split-window-state 'horizontal)))
+      (with-helm-window
+        (enlarge-window n horizontal-p)))))
+
+(defun helm-narrow-window ()
+  "Narrow helm window."
+  (interactive)
+  (helm-enlarge-window-1 -1))
+
+(defun helm-enlarge-window ()
+  "Enlarge helm window."
+  (interactive)
+  (helm-enlarge-window-1 1))
+
+(defun helm-swap-windows ()
+  "Swap window holding `helm-buffer' with other window."
+  (interactive)
+  (with-helm-alive-p
+    (if (and helm-full-frame (one-window-p t))
+        (error "Error: Can't swap windows in a single window")
+        (let* ((w1          (helm-window))
+               (split-state (eq helm-split-window-state 'horizontal))
+               (w1size      (window-total-size w1 split-state))
+               (b1          (window-buffer w1)) ; helm-buffer
+               (s1          (window-start w1))
+               (cur-frame   (window-frame w1))
+               (w2          (with-selected-window (helm-window)
+                              ;; Don't try to display helm-buffer
+                              ;; in a dedicated window.
+                              (get-window-with-predicate
+                               (lambda (w) (not (window-dedicated-p w)))
+                               1 cur-frame)))
+               (w2size      (window-total-size w2 split-state))
+               (b2          (window-buffer w2)) ; probably helm-current-buffer
+               (s2          (window-start w2))
+               resize)
+          (with-selected-frame (window-frame w1)
+            (helm-replace-buffer-in-window w1 b1 b2)
+            (helm-replace-buffer-in-window w2 b2 b1)
+            (setq resize
+                  (cond ( ;; helm-window is smaller than other window.
+                         (< w1size w2size)
+                         (- (- (max w2size w1size)
+                               (min w2size w1size))))
+                        ( ;; helm-window is larger than other window.
+                         (> w1size w2size)
+                         (- (max w2size w1size)
+                            (min w2size w1size)))
+                        ( ;; windows have probably same size.
+                         t nil)))
+            ;; Maybe resize the window holding helm-buffer.
+            (and resize (window-resize w2 resize split-state))
+            (set-window-start w1 s2 t)
+            (set-window-start w2 s1 t))
+          (setq helm--window-side-state (helm--get-window-side-state))))))
+(put 'helm-swap-windows 'helm-only t)
+
+(defun helm--get-window-side-state ()
+  "Return the position of `helm-window' from `helm-current-buffer'.
+Possible values are 'left 'right 'below or 'above."
+  (let ((side-list '(left right below above)))
+    (cl-loop for side in side-list
+          thereis (and (equal (helm-window)
+                              (window-in-direction
+                               side (get-buffer-window helm-current-buffer t)
+                               t))
+                       side))))
+
+(defun helm-replace-buffer-in-window (window buffer1 buffer2)
+  "Replace BUFFER1 by BUFFER2 in WINDOW registering BUFFER1."
+  (when (get-buffer-window buffer1)
+    (unrecord-window-buffer window buffer1)
+    (set-window-buffer window buffer2)))
+
+;; Utility: select another action by key
+(defun helm-select-nth-action (n)
+  "Select the N nth action for the currently selected candidate."
+  (setq helm-saved-selection (helm-get-selection))
+  (unless helm-saved-selection
+    (error "Nothing is selected"))
+  (setq helm-saved-action
+        (helm-get-nth-action
+         n
+         (if (get-buffer-window helm-action-buffer 'visible)
+             (assoc-default 'candidates (helm-get-current-source))
+             (helm-get-actions-from-current-source))))
+  (helm-maybe-exit-minibuffer))
+
+(defun helm-get-nth-action (n action)
+  (cond ((and (zerop n) (functionp action))
+         action)
+        ((listp action)
+         (or (cdr (elt action n))
+             (error "No such action")))
+        ((and (functionp action) (< 0 n))
+         (error "Sole action"))
+        (t
+         (error "Error in `helm-select-nth-action'"))))
+
+(defun helm-execute-selection-action-at-nth (linum)
+  "Allow to execute default action on candidate at LINUM."
+  (let ((prefarg current-prefix-arg))
+    (if (>= linum 0)
+        (helm-next-line linum)
+        (helm-previous-line (lognot (1- linum))))
+    (setq current-prefix-arg prefarg)
+    (helm-exit-minibuffer)))
+
+;; Utility: Persistent Action
+(defmacro with-helm-display-same-window (&rest body)
+  "Execute BODY in the window used for persistent action.
+Make `pop-to-buffer' and `display-buffer' display in the same window."
+  (declare (indent 0) (debug t))
+  `(let ((display-buffer-function 'helm-persistent-action-display-buffer))
+     ,@body))
+
+(defun helm-initialize-persistent-action ()
+  (set (make-local-variable 'helm-persistent-action-display-window) nil))
+
+(cl-defun helm-execute-persistent-action
+    (&optional (attr 'persistent-action) split-onewindow)
+  "Perform the associated action ATTR without quitting helm.
+ATTR default is 'persistent-action', but it can be anything else.
+In this case you have to add this new attribute to your source.
+
+When `helm-full-frame' or SPLIT-ONEWINDOW are non--nil,
+and `helm-buffer' is displayed in only one window,
+the helm window is splitted to display
+`helm-select-persistent-action-window' in other window
+and keep its visibility."
+  (interactive)
+  (helm-log "executing persistent-action")
+  (let* ((attr-val (assoc-default attr (helm-get-current-source)))
+         ;; If attr value is a cons, use its car as persistent function
+         ;; and its car to decide if helm window should be splitted.
+         (fn       (if (and (consp attr-val)
+                            ;; maybe a lambda.
+                            (not (functionp attr-val)))
+                       (car attr-val) attr-val))
+         (no-split (and (consp attr-val)
+                        (not (functionp attr-val))
+                        (cdr attr-val))))
+    (with-helm-window
+      (save-selected-window
+        (if no-split
+            (helm-select-persistent-action-window)
+          (helm-select-persistent-action-window
+           (or split-onewindow helm-onewindow-p)))
+        (helm-log "current-buffer = %S" (current-buffer))
+        (let ((helm-in-persistent-action t))
+          (with-helm-display-same-window
+            (helm-execute-selection-action-1
+             nil (or fn (helm-get-actions-from-current-source)) t)
+            (helm-log-run-hook 'helm-after-persistent-action-hook))
+          ;; A typical case is when a persistent action delete
+          ;; the buffer already displayed in
+          ;; `helm-persistent-action-display-window' and `helm-full-frame'
+          ;; is enabled, we end up with the `helm-buffer'
+          ;; displayed in two windows.
+          (when (and helm-onewindow-p
+                     (> (length (window-list)) 1)
+                     (equal (buffer-name
+                             (window-buffer
+                              helm-persistent-action-display-window))
+                            (helm-buffer-get)))
+            (delete-other-windows)))))))
+
+(defun helm-persistent-action-display-window (&optional split-onewindow)
+  "Return the window that will be used for persistent action.
+If SPLIT-ONEWINDOW is non--nil window will be splitted in persistent action."
+  (with-helm-window
+    (setq helm-persistent-action-display-window
+          (cond ((and (window-live-p helm-persistent-action-display-window)
+                      (not (member helm-persistent-action-display-window
+                                   (get-buffer-window-list helm-buffer))))
+                 helm-persistent-action-display-window)
+                (split-onewindow (split-window))
+                ((get-buffer-window helm-current-buffer))
+                (t (next-window (selected-window) 1))))))
+
+(defun helm-select-persistent-action-window (&optional split-onewindow)
+  "Select the window that will be used for persistent action.
+See `helm-persistent-action-display-window' for how to use SPLIT-ONEWINDOW."
+  (select-window (get-buffer-window (helm-buffer-get)))
+  (select-window
+   (setq minibuffer-scroll-window
+         (helm-persistent-action-display-window split-onewindow))))
+
+(defun helm-persistent-action-display-buffer (buf &optional  action)
+  "Make `pop-to-buffer' and `display-buffer' display in the same window.
+If `helm-persistent-action-use-special-display' is non-nil and
+BUF is to be displayed by `special-display-function', use it.
+Otherwise ignores `special-display-buffer-names' and `special-display-regexps'.
+Argument ACTION if present will be used as second argument of `display-buffer'."
+  (let* ((name (buffer-name buf))
+         display-buffer-function pop-up-windows pop-up-frames
+         ;; Disable `special-display-regexps' and `special-display-buffer-names'
+         ;; unless `helm-persistent-action-use-special-display' is non--nil.
+         (special-display-buffer-names
+          (and helm-persistent-action-use-special-display
+               special-display-buffer-names))
+         (special-display-regexps
+          (and helm-persistent-action-use-special-display
+               special-display-regexps))
+         (same-window-regexps
+          (unless (and helm-persistent-action-use-special-display
+                       (or (member name
+                                   (mapcar (lambda (x) (or (car-safe x) x))
+                                           special-display-buffer-names))
+                           (cl-loop for x in special-display-regexps
+                                 thereis (string-match (or (car-safe x) x)
+                                                       name))))
+            '("."))))
+    ;; Don't loose minibuffer when displaying persistent window in
+    ;; another frame.
+    ;; This happen when the displayed persistent buffer-name is one of
+    ;; `special-display-buffer-names' or match `special-display-regexps'
+    ;; and `helm-persistent-action-use-special-display' is enabled.
+    (with-selected-window (if (or special-display-regexps
+                                  special-display-buffer-names)
+                              (minibuffer-window)
+                            (selected-window))
+      ;; Be sure window of BUF is not dedicated.
+      (set-window-dedicated-p (get-buffer-window buf) nil)
+      (display-buffer buf action))))
+
+;; scroll-other-window(-down)? for persistent-action
+(defun helm-other-window-base (command &optional scroll-amount)
+  (setq scroll-amount (unless (eq scroll-amount 'noscroll)
+                        helm-scroll-amount))
+  (with-selected-window (helm-persistent-action-display-window)
+    (funcall command scroll-amount)))
+
+(defun helm-scroll-other-window ()
+  "Scroll other window (not *Helm* window) upward."
+  (interactive)
+  (helm-other-window-base 'scroll-up))
+
+(defun helm-scroll-other-window-down ()
+  "Scroll other window (not *Helm* window) downward."
+  (interactive)
+  (helm-other-window-base 'scroll-down))
+
+(defun helm-recenter-top-bottom-other-window ()
+  "`recenter-top-bottom' in other window (not *Helm* window)."
+  (interactive)
+  (helm-other-window-base 'recenter-top-bottom 'noscroll))
+
+(defun helm-reposition-window-other-window ()
+  "`helm-reposition-window' in other window (not *Helm* window)."
+  (interactive)
+  (helm-other-window-base 'reposition-window 'noscroll))
+
+
+
+;; Utility: Visible Mark
+
+(defun helm-clear-visible-mark ()
+  (with-current-buffer (helm-buffer-get)
+    (mapc 'delete-overlay helm-visible-mark-overlays)
+    (set (make-local-variable 'helm-visible-mark-overlays) nil)))
+
+(defun helm-this-visible-mark ()
+  (cl-loop for o in helm-visible-mark-overlays
+        when (equal (point-at-bol) (overlay-start o))
+        return o))
+
+(defun helm-delete-visible-mark (overlay)
+  (setq helm-marked-candidates
+        (remove
+         (cons (helm-get-current-source) (helm-get-selection))
+         helm-marked-candidates))
+  (delete-overlay overlay)
+  (setq helm-visible-mark-overlays
+        (delq overlay helm-visible-mark-overlays)))
+
+(defun helm-make-visible-mark ()
+  (let ((o (make-overlay (point-at-bol)
+                          (if (helm-pos-multiline-p)
+                              (or (helm-get-next-candidate-separator-pos)
+                                  (point-max))
+                            (1+ (point-at-eol))))))
+    (overlay-put o 'priority 0)
+    (overlay-put o 'face   'helm-visible-mark)
+    (overlay-put o 'source (assoc-default 'name (helm-get-current-source)))
+    (overlay-put o 'string (buffer-substring (overlay-start o) (overlay-end o)))
+    (overlay-put o 'real   (helm-get-selection))
+    (add-to-list 'helm-visible-mark-overlays o))
+  (push (cons (helm-get-current-source) (helm-get-selection))
+        helm-marked-candidates))
+
+(defun helm-toggle-visible-mark ()
+  "Toggle helm visible mark at point."
+  (interactive)
+  (with-helm-alive-p
+    (with-helm-window
+      (let ((nomark (assq 'nomark (helm-get-current-source))))
+        (if nomark
+            (message "Marking not allowed in this source")
+            (helm-aif (helm-this-visible-mark)
+                (helm-delete-visible-mark it)
+              (helm-make-visible-mark))
+            (if (helm-end-of-source-p)
+                (helm-display-mode-line (helm-get-current-source))
+                (helm-next-line)))))))
+(put 'helm-toggle-visible-mark 'helm-only t)
+
+(defun helm-file-completion-source-p ()
+  "Return non--nil if current source is a file completion source."
+  (or minibuffer-completing-file-name
+      (let ((cur-source (cdr (assoc 'name (helm-get-current-source)))))
+        (cl-loop for i in helm--file-completion-sources
+              thereis (string= cur-source i)))))
+
+(defun helm-mark-all ()
+  "Mark all visible unmarked candidates in current source."
+  (interactive)
+  (with-helm-window
+    (let ((nomark (assq 'nomark (helm-get-current-source)))
+          (follow (if helm-follow-mode 1 -1)))
+      (helm-follow-mode -1)
+      (unwind-protect
+           (if nomark
+               (message "Marking not allowed in this source")
+               (save-excursion
+                 (goto-char (helm-get-previous-header-pos))
+                 (helm-next-line)
+                 (let* ((next-head (helm-get-next-header-pos))
+                        (end       (and next-head
+                                        (save-excursion
+                                          (goto-char next-head)
+                                          (forward-line -1)
+                                          (point))))
+                        (maxpoint  (or end (point-max))))
+                   (while (< (point) maxpoint)
+                     (helm-mark-current-line)
+                     (let* ((prefix (get-text-property (point-at-bol) 'display))
+                            (cand   (helm-get-selection))
+                            (bn     (and (helm-file-completion-source-p)
+                                         (helm-basename cand)))
+                            (src-name    (assoc-default 'name
+                                                   (helm-get-current-source))))
+                       (when (and (not (helm-this-visible-mark))
+                                  (not (or (string= prefix "[?]")
+                                           (string= prefix "[@]"))))
+                         ;; Don't mark possibles directories ending with . or ..
+                         ;; autosave files/links and non--existent file.
+                         (unless
+                             (and (or (helm-file-completion-source-p)
+                                      (string=
+                                       src-name "Files from Current Directory"))
+                                  (or (string-match
+                                       "^[.]?#.*#?$\\|[^#]*[.]\\{1,2\\}$" bn)
+                                      ;; We need to test here when not using
+                                      ;; a transformer that tag prefix
+                                      ;; (i.e on tramp).
+                                      (not (file-exists-p cand))))
+                           (helm-make-visible-mark))))
+                     (if (helm-pos-multiline-p)
+                         (progn
+                           (goto-char
+                            (or (helm-get-next-candidate-separator-pos)
+                                (point-max)))
+                           (forward-line 1))
+                         (forward-line 1))
+                     (end-of-line))))
+               (helm-mark-current-line))
+        (helm-follow-mode follow) (message nil)))))
+
+(defun helm-unmark-all ()
+  "Unmark all candidates in all sources of current helm session."
+  (interactive)
+  (with-helm-window
+    (save-excursion
+      (helm-clear-visible-mark))
+    (setq helm-marked-candidates nil)
+    (helm-mark-current-line)
+    (helm-display-mode-line (helm-get-current-source))))
+
+(defun helm-toggle-all-marks ()
+  "Toggle all marks.
+Mark all visible candidates of current source or unmark all candidates
+visible or invisible in all sources of current helm session"
+  (interactive)
+  (let ((marked (helm-marked-candidates)))
+    (if (and (>= (length marked) 1)
+             (with-helm-window helm-visible-mark-overlays))
+        (helm-unmark-all)
+      (helm-mark-all))))
+
+(defun helm--compute-marked (real source wildcard)
+  (let* ((coerced (helm-coerce-selection real source))
+         (wilds   (and wildcard
+                       (condition-case nil
+                           (helm-file-expand-wildcards coerced t)
+                         (error nil)))))
+    ;; Avoid returning a not expanded wilcard fname.
+    ;; e.g assuming "/tmp" doesn't contain "*.el"
+    ;; return nil when coerced is "/tmp/*.el".
+    (unless (or wilds (null wildcard)
+                (string-match-p helm--url-regexp coerced)
+                (file-exists-p coerced)
+                (and (stringp coerced)
+                     (null (string-match-p "[[*?]" coerced))))
+      (setq coerced nil))
+    (or wilds (and coerced (list coerced)))))
+
+(cl-defun helm-marked-candidates (&key with-wildcard)
+  "Return marked candidates of current source if any.
+Otherwise one element list of current selection.
+When key WITH-WILDCARD is specified try to expand a wilcard if some."
+  (with-current-buffer helm-buffer
+    (let ((candidates
+           (cl-loop with current-src = (helm-get-current-source)
+                    for (source . real) in (reverse helm-marked-candidates)
+                    when (equal (assq 'name source) (assq 'name current-src))
+                    append (helm--compute-marked real source with-wildcard) 
+                    into cands
+                    finally return (or cands
+                                       (append
+                                        (helm--compute-marked
+                                         (helm-get-selection) current-src
+                                         with-wildcard)
+                                        cands)))))
+      (helm-log "Marked candidates = %S" candidates)
+      candidates)))
+
+(defun helm-current-source-name= (name)
+  (save-excursion
+    (goto-char (helm-get-previous-header-pos))
+    (equal name (helm-current-line-contents))))
+
+(defun helm-revive-visible-mark ()
+  "Restore marked candidates when helm update display."
+  (with-current-buffer helm-buffer
+    (save-excursion
+      (cl-dolist (o helm-visible-mark-overlays)
+        (goto-char (point-min))
+        (while (and (search-forward (overlay-get o 'string) nil t)
+                    (helm-current-source-name= (overlay-get o 'source)))
+          ;; Calculate real value of candidate.
+          ;; It can be nil if candidate have only a display value.
+          (let ((real (get-text-property (point-at-bol 0) 'helm-realvalue)))
+            (if real
+                ;; Check if real value of current candidate is the same
+                ;; than the one stored in overlay.
+                ;; This is needed when some cands have same display names.
+                ;; Using equal allow testing any type of value for real cand.
+                ;; Issue (#706).
+                (and (equal (overlay-get o 'real) real)
+                     (move-overlay o (point-at-bol 0) (1+ (point-at-eol 0))))
+                (move-overlay o (point-at-bol 0) (1+ (point-at-eol 0))))))))))
+(add-hook 'helm-update-hook 'helm-revive-visible-mark)
+
+(defun helm-next-point-in-list (curpos points &optional prev)
+  (cond
+    ;; rule out special cases.
+    ((null points) curpos)
+    ((and prev (<= curpos (car points)))
+     (nth (1- (length points)) points))
+    ((< (car (last points)) curpos)
+     (if prev (car (last points)) (nth 0 points)))
+    ((and (not prev) (>= curpos (car (last points))))
+     (nth 0 points))
+    (t
+     (nth (if prev
+              (cl-loop for pt in points
+                    for i from 0
+                    if (<= curpos pt) return (1- i))
+            (cl-loop for pt in points
+                  for i from 0
+                  if (< curpos pt) return i))
+          points))))
+
+(defun helm-next-visible-mark (&optional prev)
+  "Move next helm visible mark.
+If PREV is non-nil move to precedent."
+  (interactive)
+  (with-helm-window
+    (ignore-errors
+      (goto-char (helm-next-point-in-list
+                  (point)
+                  (sort (mapcar 'overlay-start helm-visible-mark-overlays) '<)
+                  prev)))
+    (helm-mark-current-line)))
+
+(defun helm-prev-visible-mark ()
+  "Move previous helm visible mark."
+  (interactive)
+  (helm-next-visible-mark t))
+
+;;; Utility: Selection Paste
+;;
+(defun helm-yank-selection (arg)
+  "Set minibuffer contents to current display selection.
+With a prefix arg set to real value of current selection."
+  (interactive "P")
+  (let ((str (helm-get-selection nil (not arg))))
+    (kill-new str)
+    (helm-set-pattern str)))
+
+(defun helm-kill-selection-and-quit (arg)
+  "Store display value of current selection to kill ring.
+With a prefix arg set to real value of current selection.
+Display value is what you see in `helm-buffer' and real value
+is what is used to perform actions."
+  (interactive "P")
+  (helm-run-after-exit
+   (lambda (sel)
+     (kill-new sel)
+     ;; Return nil to force `helm-mode--keyboard-quit'
+     ;; in `helm-comp-read' otherwise the value "Saved to kill-ring: foo"
+     ;; is used as exit value for `helm-comp-read'.
+     (prog1 nil (message "Saved to kill-ring: %s" sel) (sit-for 1)))
+   (helm-get-selection nil (not arg))))
+
+(defun helm-copy-to-buffer ()
+  "Copy selection or marked candidates to `helm-current-buffer'."
+  (interactive)
+  (with-helm-buffer
+    (cl-loop for cand in (helm-marked-candidates)
+             do (with-helm-current-buffer
+                  (insert (format "%s\n" cand))))))
+
+
+;;; Follow-mode: Automatical execution of persistent-action
+;;
+;;
+(defun helm-follow-mode (&optional arg)
+  "Execute persistent action everytime the cursor is moved when enabled.
+The mode is enabled for the current source only, you will have to turn it
+on again when you go to next source if you want it there also.
+This mode can be enabled or disabled interactively at anytime during
+helm session or enabled specifically by source by adding the `follow'
+attribute to this source.
+Even when the attribute `follow' exists in source, it is still possible
+to disable/enable this mode interactively.
+Note that when you disable it interactively and `follow' attribute exists,
+`helm-follow-mode' will be disabled on next helm session even if `follow'
+attribute is specified in source. To avoid this set your `follow' attribute
+in source in `helm-before-initialize-hook'.
+
+e.g:
+
+\(add-hook 'helm-before-initialize-hook
+          (lambda () (helm-attrset 'follow 1 helm-source-buffers-list)))
+
+This will enable `helm-follow-mode' automatically in `helm-source-buffers-list'."
+  (interactive "p")
+  (with-current-buffer helm-buffer
+    (let* ((src      (helm-get-current-source))
+           (name     (assoc-default 'name src))
+           (sym      (cl-loop for s in helm-sources
+                           for sname = (and (symbolp s)
+                                            (assoc-default
+                                             'name (symbol-value s)))
+                           thereis (and sname (string= sname name) s)))
+           (fol-attr (assq 'follow src))
+           (enabled  (or
+                      ;; If `helm-follow-mode' is called with a negative
+                      ;; ARG, assume follow is already enabled.
+                      ;; i.e turn it off now.
+                      (< arg 0)
+                      (eq (cdr fol-attr) 1)
+                      helm-follow-mode)))
+      (if src
+          (progn
+            (if (eq (cdr fol-attr) 'never)
+                (message "helm-follow-mode not allowed in this source")
+                ;; Make follow attr persistent for this emacs session.
+                (helm-attrset 'follow (if enabled -1 1) src)
+                (setq helm-follow-mode (not enabled))
+                (message "helm-follow-mode is %s"
+                         (if helm-follow-mode
+                             "enabled" "disabled"))
+                (helm-display-mode-line src t))
+            (unless helm-follow-mode-persistent
+              (and sym (set sym (remove (assq 'follow src) src)))))
+          (message "Not enough candidates for helm-follow-mode")))))
+
+(defvar helm-follow-input-idle-delay nil
+  "`helm-follow-mode' will execute its persistent action after this delay.
+Note that if the `follow-delay' attr is present in source,
+it will take precedence on this.")
+(defun helm-follow-execute-persistent-action-maybe ()
+  "Execute persistent action in mode `helm-follow-mode'.
+This happen after `helm-input-idle-delay' secs."
+  (let ((src (helm-get-current-source)))
+    (and (not (get-buffer-window helm-action-buffer 'visible))
+         (eq (assoc-default 'follow src) 1)
+         (sit-for (or (assoc-default 'follow-delay src)
+                      helm-follow-input-idle-delay
+                      (and helm-input-idle-delay
+                           (max helm-input-idle-delay 0.01))))
+         (helm-window)
+         (helm-get-selection)
+         (save-excursion
+           (helm-execute-persistent-action)))))
+
+
+;;; Auto-resize mode
+;;
+(defun helm--autoresize-hook (&optional max-height min-height)
+  (with-helm-window
+    (fit-window-to-buffer nil
+                          (/ (* (frame-height)
+                                (or max-height helm-autoresize-max-height))
+                             100)
+                          (/ (* (frame-height)
+                                (or min-height helm-autoresize-min-height))
+                             100))))
+
+(define-minor-mode helm-autoresize-mode
+    "Auto resize helm window when enabled.
+Helm window is resized according to values of `helm-autoresize-max-height'
+and `helm-autoresize-min-height'.
+Note that when this mode is enabled, helm behave like when
+`helm-always-two-windows' is enabled.
+
+See `fit-window-to-buffer' for more infos."
+  :group 'helm
+  :global t
+  (if helm-autoresize-mode
+      (progn (add-hook 'helm-after-update-hook 'helm--autoresize-hook)
+             (add-hook 'helm-window-configuration-hook 'helm--autoresize-hook))
+      (remove-hook 'helm-after-update-hook 'helm--autoresize-hook)
+      (remove-hook 'helm-window-configuration-hook 'helm--autoresize-hook)))
+
+(defun helm-help ()
+  "Help of `helm'."
+  (interactive)
+  (with-helm-alive-p
+    (save-selected-window
+      (helm-help-internal
+       "*Helm Help*"
+       (lambda ()
+         (helm-aif (assoc-default 'help-message (helm-get-current-source))
+             (insert (substitute-command-keys
+                      (helm-interpret-value it)))
+           (insert "* No specific help for this source at this time.\n
+It may appear after first results popup in helm buffer."))
+         (insert "\n\n"
+                 (substitute-command-keys
+                  (helm-interpret-value helm-help-message))))))))
+(put 'helm-help 'helm-only t)
+
+(defun helm-toggle-truncate-line ()
+  "Toggle `truncate-lines' value in `helm-buffer'"
+  (interactive)
+  (with-helm-alive-p
+    (with-helm-buffer
+      (setq truncate-lines (not truncate-lines))
+      (helm-update (regexp-quote (helm-get-selection nil t))))))
+(put 'helm-toggle-truncate-line 'helm-only t)
+
+(provide 'helm)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions obsolete)
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; helm.el ends here
diff --git a/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile-autoloads.el b/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile-autoloads.el
deleted file mode 100644
index 53b844d..0000000
--- a/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile-autoloads.el
+++ /dev/null
@@ -1,70 +0,0 @@
-;;; helm-projectile-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "helm-projectile" "helm-projectile.el" (21898
-;;;;;;  47974 0 0))
-;;; Generated autoloads from helm-projectile.el
-
-(defvar helm-projectile-fuzzy-match t "\
-Enable fuzzy matching for Helm Projectile commands.
-This needs to be set before loading helm-projectile.")
-
-(custom-autoload 'helm-projectile-fuzzy-match "helm-projectile" t)
-
-(autoload 'helm-projectile-find-file-dwim "helm-projectile" "\
-Find file at point based on context.
-
-\(fn)" t nil)
-
-(autoload 'helm-projectile-find-other-file "helm-projectile" "\
-Switch between files with the same name but different extensions using Helm.
-With FLEX-MATCHING, match any file that contains the base name of current file.
-Other file extensions can be customized with the variable `projectile-other-file-alist'.
-
-\(fn &optional FLEX-MATCHING)" t nil)
-
-(autoload 'helm-projectile-on "helm-projectile" "\
-Turn on helm-projectile key bindings.
-
-\(fn)" t nil)
-
-(autoload 'helm-projectile-off "helm-projectile" "\
-Turn off helm-projectile key bindings.
-
-\(fn)" t nil)
-
-(autoload 'helm-projectile-grep "helm-projectile" "\
-Helm version of projectile-grep.
-
-\(fn)" t nil)
-
-(autoload 'helm-projectile-ack "helm-projectile" "\
-Helm version of projectile-ack.
-
-\(fn)" t nil)
-
-(autoload 'helm-projectile-ag "helm-projectile" "\
-Helm version of projectile-ag.
-
-\(fn &optional OPTIONS)" t nil)
-
-(autoload 'helm-projectile "helm-projectile" "\
-Use projectile with Helm instead of ido.
-
-With a prefix ARG invalidates the cache first.
-If invoked outside of a project, displays a list of known projects to jump.
-
-\(fn &optional ARG)" t nil)
-
-(eval-after-load 'projectile '(progn (define-key projectile-command-map (kbd "h") 'helm-projectile)))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; helm-projectile-autoloads.el ends here
diff --git a/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile-pkg.el b/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile-pkg.el
deleted file mode 100644
index f097838..0000000
--- a/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "helm-projectile" "20150621.1322" "Helm integration for Projectile" '((helm "1.4.0") (projectile "0.12.0") (dash "1.5.0") (cl-lib "0.3")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
diff --git a/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile.el b/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile.el
deleted file mode 100644
index fb51fce..0000000
--- a/emacs.d/elpa/helm-projectile-20150621.1322/helm-projectile.el
+++ /dev/null
@@ -1,841 +0,0 @@
-;;; helm-projectile.el --- Helm integration for Projectile
-
-;; Copyright (C) 2011-2015 Bozhidar Batsov
-
-;; Author: Bozhidar Batsov
-;; URL: https://github.com/bbatsov/projectile
-;; Package-Version: 20150621.1322
-;; Created: 2011-31-07
-;; Keywords: project, convenience
-;; Version: 0.12.0
-;; Package-Requires: ((helm "1.4.0") (projectile "0.12.0") (dash "1.5.0") (cl-lib "0.3"))
-
-;; This file is NOT part of GNU Emacs.
-
-;;; License:
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-;;
-;; This library provides easy project management and navigation.  The
-;; concept of a project is pretty basic - just a folder containing
-;; special file.  Currently git, mercurial and bazaar repos are
-;; considered projects by default.  If you want to mark a folder
-;; manually as a project just create an empty .projectile file in
-;; it.  See the README for more details.
-;;
-;;; Code:
-
-(require 'projectile)
-(require 'helm-locate)
-(require 'helm-buffers)
-(require 'helm-files)
-(require 'cl-lib)
-
-(declare-function eshell "eshell")
-(declare-function helm-do-ag "helm-ag")
-(defvar helm-ag-base-command)
-
-(defgroup helm-projectile nil
-  "Helm support for projectile."
-  :prefix "helm-projectile-"
-  :group 'projectile
-  :link `(url-link :tag "helm-projectile homepage" "https://github.com/bbatsov/projectile"))
-
-(defvar helm-projectile-current-project-root)
-
-;;;###autoload
-(defcustom helm-projectile-fuzzy-match t
-  "Enable fuzzy matching for Helm Projectile commands.
-This needs to be set before loading helm-projectile."
-  :group 'helm-projectile
-  :type 'boolean)
-
-(defun helm-projectile-coerce-file (candidate)
-  (with-current-buffer (helm-candidate-buffer)
-    (expand-file-name candidate (projectile-project-root))))
-
-(defmacro helm-projectile-define-key (keymap key def &rest bindings)
-  "In KEYMAP, define key sequence KEY1 as DEF1, KEY2 as DEF2 ..."
-  (declare (indent defun))
-  (let ((ret '(progn)))
-    (while key
-      (push
-       `(define-key ,keymap ,key
-          (lambda ()
-            (interactive)
-            (helm-quit-and-execute-action ,def)))
-       ret)
-      (setq key (pop bindings)
-            def (pop bindings)))
-    (reverse ret)))
-
-(defun helm-projectile-hack-actions (actions &rest prescription)
-  "Given a Helm action list and a prescription, return a hacked
-Helm action list, after applying the PRESCRIPTION.
-
-The Helm action list ACTIONS is of the form:
-
-\(\(DESCRIPTION1 . FUNCTION1\)
- \(DESCRIPTION2 . FUNCTION2\)
- ...
- \(DESCRIPTIONn . FUNCTIONn\)\)
-
-PRESCRIPTION is in the form:
-
-\(INSTRUCTION1 INSTRUCTION2 ... INSTRUCTIONn\)
-
-If an INSTRUCTION is a symbol, the action with function name
-INSTRUCTION is deleted.
-
-If an INSTRUCTION is of the form \(FUNCTION1 . FUNCTION2\), the
-action with function name FUNCTION1 will change it's function to
-FUNCTION2.
-
-If an INSTRUCTION is of the form \(FUNCTION . DESCRIPTION\), and
-if an action with function name FUNCTION exists in the original
-Helm action list, the action in the Helm action list, with
-function name FUNCTION will change it's description to
-DESCRIPTION. Otherwise, (FUNCTION . DESCRIPTION) will be added to
-the action list.
-
-Please check out how `helm-projectile-file-actions' is defined
-for an example of how this function is being used."
-  (let* ((to-delete (cl-remove-if (lambda (entry) (listp entry)) prescription))
-         (actions (cl-delete-if (lambda (action) (memq (cdr action) to-delete))
-                                (copy-alist actions)))
-         new)
-    (cl-dolist (action actions)
-      (when (setq new (cdr (assq (cdr action) prescription)))
-        (if (stringp new)
-            (setcar action new)
-          (setcdr action new))))
-    ;; Add new actions from PRESCRIPTION
-    (setq new nil)
-    (cl-dolist (instruction prescription)
-      (when (and (listp instruction)
-                 (null (rassq (car instruction) actions))
-                 (symbolp (car instruction)) (stringp (cdr instruction)))
-        (push (cons (cdr instruction) (car instruction)) new)))
-    (append actions (nreverse new))))
-
-(defun helm-projectile-vc (dir)
-  "A Helm action for jumping to project root using `vc-dir' or Magit.
-DIR is a directory to be switched"
-  (let ((projectile-require-project-root nil))
-    (projectile-vc dir)))
-
-(defun helm-projectile-compile-project (dir)
-  "A Helm action for compile a project.
-DIR is the project root."
-  (let ((helm--reading-passwd-or-string t)
-        (default-directory dir))
-    (projectile-compile-project helm-current-prefix-arg dir)))
-
-(defun helm-projectile-remove-known-project (_ignore)
-  "Delete selected projects.
-_IGNORE means the argument does not matter.
-It is there because Helm requires it."
-  (let* ((projects (helm-marked-candidates :with-wildcard t))
-         (len (length projects)))
-    (with-helm-display-marked-candidates
-      helm-marked-buffer-name
-      projects
-      (if (not (y-or-n-p (format "Delete *%s projects(s)" len)))
-          (message "(No deletion performed)")
-        (progn
-          (mapc (lambda (p)
-                  (delete p projectile-known-projects))
-                projects)
-          (projectile-save-known-projects))
-        (message "%s projects(s) deleted" len)))))
-
-(defvar helm-source-projectile-projects
-  (helm-build-in-buffer-source "Projectile projects"
-    :data (lambda ()
-            (if (projectile-project-p)
-                (cons (abbreviate-file-name (projectile-project-root))
-                      (projectile-relevant-known-projects))
-              projectile-known-projects))
-    :fuzzy-match helm-projectile-fuzzy-match
-    :keymap (let ((map (make-sparse-keymap)))
-              (set-keymap-parent map helm-map)
-              (helm-projectile-define-key map
-                (kbd "C-d") 'dired
-                (kbd "M-g") 'helm-projectile-vc
-                (kbd "M-e") 'helm-projectile-switch-to-eshell
-                (kbd "C-s") 'helm-find-files-grep
-                (kbd "M-c") 'helm-projectile-compile-project
-                (kbd "M-D") 'helm-projectile-remove-known-project)
-              map)
-    :mode-line helm-ff-mode-line-string
-    :action '(("Switch to project" .
-               (lambda (project)
-                 (let ((projectile-completion-system 'helm))
-                   (projectile-switch-project-by-name project))))
-              ("Open Dired in project's directory `C-d'" . dired)
-              ("Open project root in vc-dir or magit `M-g'" . helm-projectile-vc)
-              ("Switch to Eshell `M-e'" . helm-projectile-switch-to-eshell)
-              ("Grep in projects `C-s'.  With C-u, recurse" . helm-find-files-grep)
-              ("Compile project `M-c'. With C-u, new compile command"
-               . helm-projectile-compile-project)
-              ("Remove project(s) `M-D'" . helm-projectile-remove-known-project)))
-  "Helm source for known projectile projects.")
-
-(define-key helm-etags-map (kbd "C-c p f") (lambda ()
-                                             (interactive)
-                                             (helm-run-after-quit 'helm-projectile-find-file nil)))
-
-(defun helm-projectile-find-files-eshell-command-on-file-action (_candidate)
-  (interactive)
-  (let* ((helm-ff-default-directory (file-name-directory _candidate)))
-    (helm-find-files-eshell-command-on-file _candidate)))
-
-(defun helm-projectile-ff-etags-select-action (_candidate)
-  (interactive)
-  (let* ((helm-ff-default-directory (file-name-directory _candidate)))
-    (helm-ff-etags-select _candidate)))
-
-(defun helm-projectile-switch-to-eshell (dir)
-  (interactive)
-  (let* ((projectile-require-project-root nil)
-         (helm-ff-default-directory (file-name-directory (projectile-expand-root dir))))
-    (helm-ff-switch-to-eshell dir)))
-
-(defun helm-projectile-files-in-current-dired-buffer ()
-  "Return a list of files (only) in the current dired buffer."
-  (let (flist)
-    (cl-flet ((fpush (fname) (push fname flist)))
-      (save-excursion
-        (let (file buffer-read-only)
-          (goto-char (point-min))
-          (while (not (eobp))
-            (save-excursion
-              (and (not (eolp))
-                   (setq file (dired-get-filename t t)) ; nil on non-file
-                   (progn (end-of-line)
-                          (funcall #'fpush file))))
-            (forward-line 1)))))
-    (mapcar 'file-truename (nreverse flist))))
-
-(defun helm-projectile-all-dired-buffers ()
-  "Get all current Dired buffers."
-  (mapcar (lambda (b)
-            (with-current-buffer b (buffer-name)))
-          (-filter (lambda (b)
-                     (with-current-buffer b
-                       (and (eq major-mode 'dired-mode)
-                            (buffer-name))))
-                   (buffer-list))))
-
-(defvar helm-projectile-virtual-dired-remote-enable nil
-  "Enable virtual Dired manager in remote host. Disabled by default.")
-
-(defun helm-projectile-dired-files-new-action (candidate)
-  "Create a Dired buffer from chosen files.
-CANDIDATE is the selected file, but choose the marked files if available."
-  (if (and (file-remote-p (projectile-project-root))
-           (not helm-projectile-virtual-dired-remote-enable))
-      (message "Virtual Dired manager is disabled in remote host. Enable with %s."
-               (propertize "helm-projectile-virtual-dired-remote-enable" 'face 'font-lock-keyword-face))
-    (let ((new-name (completing-read "Select or enter a new buffer name: "
-                                     (helm-projectile-all-dired-buffers)))
-          (helm--reading-passwd-or-string t)
-          (files (-filter (lambda (f)
-                            (not (string= f "")))
-                          (mapcar (lambda (file)
-                                    (replace-regexp-in-string (projectile-project-root) "" file))
-                                  (helm-marked-candidates :with-wildcard t))))
-          (default-directory (projectile-project-root)))
-      ;; create a unique buffer that is unique to any directory in default-directory
-      ;; or opened buffer; when Dired is passed with a non-existence directory name,
-      ;; it only creates a buffer and insert everything. If a new name user supplied
-      ;; exists as default-directory, Dired throws error when insert anything that
-      ;; does not exist in current directory.
-      (with-current-buffer (dired (cons (make-temp-name new-name)
-                                        (if files
-                                            files
-                                          (list candidate))))
-        (when (get-buffer new-name)
-          (kill-buffer new-name))
-        (rename-buffer new-name)))))
-
-(defun helm-projectile-dired-files-add-action (candidate)
-  "Add files to a Dired buffer.
-CANDIDATE is the selected file.  Used when no file is explicitly marked."
-  (if (and (file-remote-p (projectile-project-root))
-           (not helm-projectile-virtual-dired-remote-enable))
-      (message "Virtual Dired manager is disabled in remote host. Enable with %s."
-               (propertize "helm-projectile-virtual-dired-remote-enable" 'face 'font-lock-keyword-face))
-    (if (eq (with-helm-current-buffer major-mode) 'dired-mode)
-        (let* ((helm--reading-passwd-or-string t)
-               (root (projectile-project-root)) ; store root for later use
-               (dired-buffer-name (or (and (eq major-mode 'dired-mode) (buffer-name))
-                                      (completing-read "Select a Dired buffer:"
-                                                       (helm-projectile-all-dired-buffers))))
-               (dired-files (with-current-buffer dired-buffer-name
-                              (helm-projectile-files-in-current-dired-buffer)))
-               (marked-files (helm-marked-candidates :with-wildcard t))
-               (files (sort (mapcar (lambda (file)
-                                      (replace-regexp-in-string (projectile-project-root) "" file))
-                                    (cl-nunion (if marked-files
-                                                   marked-files
-                                                 (list candidate))
-                                               dired-files
-                                               :test #'string-equal))
-                            'string-lessp)))
-          (kill-buffer dired-buffer-name)
-          ;; Rebind default-directory because after killing a buffer, we
-          ;; could be in any buffer and default-directory is set to that
-          ;; random buffer
-          ;;
-          ;; Also use saved root directory, because after killing a buffer,
-          ;; we could be outside of current project
-          (let ((default-directory root))
-            (with-current-buffer (dired (cons (make-temp-name dired-buffer-name)
-                                              (if files
-                                                  (mapcar (lambda (file)
-                                                            (replace-regexp-in-string root "" file))
-                                                          files)
-                                                (list candidate))))
-              (rename-buffer dired-buffer-name))))
-      (error "You're not in a Dired buffer to add."))))
-
-(defun helm-projectile-dired-files-delete-action (candidate)
-  "Delete selected entries from a Dired buffer.
-CANDIDATE is the selected file.  Used when no file is explicitly marked."
-  (if (and (file-remote-p (projectile-project-root))
-           (not helm-projectile-virtual-dired-remote-enable))
-      (message "Virtual Dired manager is disabled in remote host. Enable with %s."
-               (propertize "helm-projectile-virtual-dired-remote-enable" 'face 'font-lock-keyword-face))
-    (let* ((helm--reading-passwd-or-string t)
-           (root (projectile-project-root))
-           (dired-buffer-name (with-helm-current-buffer (buffer-name)))
-           (dired-files (with-current-buffer dired-buffer-name
-                          (helm-projectile-files-in-current-dired-buffer)))
-           (files (sort (cl-set-exclusive-or (helm-marked-candidates :with-wildcard t)
-                                             dired-files
-                                             :test #'string-equal) #'string-lessp)))
-      (kill-buffer dired-buffer-name)
-      ;; similar reason to `helm-projectile-dired-files-add-action'
-      (let ((default-directory root))
-        (with-current-buffer (dired (cons (make-temp-name dired-buffer-name)
-                                          (if files
-                                              (mapcar (lambda (file)
-                                                        (replace-regexp-in-string root "" file))
-                                                      files)
-                                            (list candidate))))
-          (rename-buffer dired-buffer-name))))))
-
-(defvar helm-projectile-find-file-map
-  (let ((map (copy-keymap helm-find-files-map)))
-    (helm-projectile-define-key map
-      (kbd "C-c f") 'helm-projectile-dired-files-new-action
-      (kbd "C-c a") 'helm-projectile-dired-files-add-action
-      (kbd "M-e") 'helm-projectile-switch-to-eshell
-      (kbd "M-.") 'helm-projectile-ff-etags-select-action
-      (kbd "M-!") 'helm-projectile-find-files-eshell-command-on-file-action)
-    (define-key map (kbd "<left>") 'helm-previous-source)
-    (define-key map (kbd "<right>") 'helm-next-source)
-    map)
-  "Mapping for file commands in Helm Projectile.")
-
-(defvar helm-projectile-file-actions
-  (helm-projectile-hack-actions
-   (cdr (assq 'action (or helm-source-find-files
-                          (helm-make-source "Find files" 'helm-source-ffiles))))
-   ;; Delete these actions
-   'helm-ff-browse-project
-   'helm-insert-file-name-completion-at-point
-   'helm-ff-find-sh-command
-   'helm-ff-cache-add-file
-   ;; Substitute these actions
-   '(helm-ff-switch-to-eshell . helm-projectile-switch-to-eshell)
-   '(helm-ff-etags-select     . helm-projectile-ff-etags-select-action)
-   '(helm-find-files-eshell-command-on-file
-     . helm-projectile-find-files-eshell-command-on-file-action)
-   ;; Change action descriptions
-   '(helm-find-file-as-root . "Find file as root `C-c r'")
-   ;; New actions
-   '(helm-projectile-dired-files-new-action
-     . "Create Dired buffer from files `C-c f'")
-   '(helm-projectile-dired-files-add-action
-     . "Add files to Dired buffer `C-c a'"))
-  "Action for files.")
-
-(defun helm-projectile-build-dwim-source (candidates)
-  "Dynamically build a Helm source definition for Projectile files based on context with CANDIDATES."
-  ""
-  (helm-build-in-buffer-source "Projectile files"
-    :data candidates
-    :fuzzy-match helm-projectile-fuzzy-match
-    :coerce 'helm-projectile-coerce-file
-    :action-transformer 'helm-find-files-action-transformer
-    :keymap helm-projectile-find-file-map
-    :help-message helm-ff-help-message
-    :mode-line helm-ff-mode-line-string
-    :action helm-projectile-file-actions))
-
-(defvar helm-source-projectile-files-list
-  (helm-build-in-buffer-source "Projectile files"
-    :data (lambda ()
-            (condition-case nil
-                (projectile-current-project-files)
-              (error nil)))
-    :fuzzy-match helm-projectile-fuzzy-match
-    :coerce 'helm-projectile-coerce-file
-    :keymap helm-projectile-find-file-map
-    :help-message 'helm-ff-help-message
-    :mode-line helm-ff-mode-line-string
-    :action helm-projectile-file-actions
-    )
-  "Helm source definition for Projectile files.")
-
-(defvar helm-source-projectile-files-in-all-projects-list
-  (helm-build-in-buffer-source "Projectile files in all Projects"
-    :data (lambda ()
-            (condition-case nil
-                (let ((projectile-require-project-root nil))
-                  (projectile-all-project-files))
-              (error nil)))
-    :coerce 'helm-projectile-coerce-file
-    :keymap helm-find-files-map
-    :help-message 'helm-ff-help-message
-    :mode-line helm-ff-mode-line-string
-    :action helm-projectile-file-actions
-    )
-  "Helm source definition for all Projectile files in all projects.")
-
-(defvar helm-projectile-dired-file-actions
-  (helm-projectile-hack-actions
-   helm-projectile-file-actions
-   ;; New actions
-   '(helm-projectile-dired-files-delete-action . "Remove entry(s) from Dired buffer `C-c d'")))
-
-(defvar helm-source-projectile-dired-files-list
-  (helm-build-in-buffer-source "Projectile files in current Dired buffer"
-    :data (lambda ()
-            (condition-case nil
-                (if (and (file-remote-p (projectile-project-root))
-                         (not helm-projectile-virtual-dired-remote-enable))
-                    nil
-                  (let ((default-directory (projectile-project-root)))
-                    (when (eq major-mode 'dired-mode)
-                      (mapcar (lambda (file)
-                                (replace-regexp-in-string default-directory "" file))
-                              (helm-projectile-files-in-current-dired-buffer)))))
-              (error nil)))
-    :coerce 'helm-projectile-coerce-file
-    :filter-one-by-one (lambda (file)
-                         (let ((default-directory (projectile-project-root)))
-                           (helm-ff-filter-candidate-one-by-one file)))
-    :action-transformer 'helm-find-files-action-transformer
-    :keymap (let ((map (copy-keymap helm-projectile-find-file-map)))
-              (helm-projectile-define-key map
-                (kbd "C-c d") 'helm-projectile-dired-files-delete-action)
-              map)
-    :help-message 'helm-ff-help-message
-    :mode-line helm-ff-mode-line-string
-    :action helm-projectile-dired-file-actions)
-  "Helm source definition for Projectile delete files.")
-
-(defun helm-projectile-dired-find-dir (dir)
-  "Jump to a selected directory DIR from helm-projectile."
-  (dired (expand-file-name dir (projectile-project-root)))
-  (run-hooks 'projectile-find-dir-hook))
-
-(defun helm-projectile-dired-find-dir-other-window (dir)
-  "Jump to a selected directory DIR from helm-projectile."
-  (dired-other-window (expand-file-name dir (projectile-project-root)))
-  (run-hooks 'projectile-find-dir-hook))
-
-(defvar helm-source-projectile-directories-list
-  (helm-build-in-buffer-source "Projectile directories"
-    :data (lambda ()
-            (condition-case nil
-                (if projectile-find-dir-includes-top-level
-                    (append '("./") (projectile-current-project-dirs))
-                  (projectile-current-project-dirs))
-              (error nil)))
-    :fuzzy-match helm-projectile-fuzzy-match
-    :coerce 'helm-projectile-coerce-file
-    :action-transformer 'helm-find-files-action-transformer
-    :keymap (let ((map (make-sparse-keymap)))
-              (set-keymap-parent map helm-map)
-              (helm-projectile-define-key map
-                (kbd "<left>") 'helm-previous-source
-                (kbd "<right>") 'helm-next-source
-                (kbd "C-c o") 'helm-projectile-dired-find-dir-other-window
-                (kbd "M-e")   'helm-projectile-switch-to-eshell
-                (kbd "C-c f") 'helm-projectile-dired-files-new-action
-                (kbd "C-c a") 'helm-projectile-dired-files-add-action
-                (kbd "C-s")   'helm-find-files-grep)
-              map)
-    :help-message 'helm-ff-help-message
-    :mode-line helm-ff-mode-line-string
-    :action '(("Open Dired" . helm-projectile-dired-find-dir)
-              ("Open Dired in other window `C-c o'" . helm-projectile-dired-find-dir)
-              ("Switch to Eshell `M-e'" . helm-projectile-switch-to-eshell)
-              ("Grep in projects `C-s C-u Recurse'" . helm-find-files-grep)
-              ("Create Dired buffer from files `C-c f'" . helm-projectile-dired-files-new-action)
-              ("Add files to Dired buffer `C-c a'" . helm-projectile-dired-files-add-action)))
-  "Helm source for listing project directories.")
-
-(defvar helm-projectile-buffers-list-cache nil)
-
-(defclass helm-source-projectile-buffer (helm-source-sync helm-type-buffer)
-  ((init :initform (lambda ()
-                     ;; Issue #51 Create the list before `helm-buffer' creation.
-                     (setq helm-projectile-buffers-list-cache (condition-case nil
-                                                                  (cdr (projectile-project-buffer-names))
-                                                                (error nil)))
-                     (let ((result (cl-loop for b in helm-projectile-buffers-list-cache
-                                            maximize (length b) into len-buf
-                                            maximize (length (with-current-buffer b
-                                                               (symbol-name major-mode)))
-                                            into len-mode
-                                            finally return (cons len-buf len-mode))))
-                       (unless helm-buffer-max-length
-                         (setq helm-buffer-max-length (car result)))
-                       (unless helm-buffer-max-len-mode
-                         ;; If a new buffer is longer that this value
-                         ;; this value will be updated
-                         (setq helm-buffer-max-len-mode (cdr result))))))
-   (candidates :initform helm-projectile-buffers-list-cache)
-   (matchplugin :initform nil)
-   (match :initform 'helm-buffers-match-function)
-   (persistent-action :initform 'helm-buffers-list-persistent-action)
-   (keymap :initform helm-buffer-map)
-   (volatile :initform t)
-   (mode-line :initform helm-buffer-mode-line-string)
-   (persistent-help
-    :initform
-    "Show this buffer / C-u \\[helm-execute-persistent-action]: Kill this buffer")))
-
-(defvar helm-source-projectile-buffers-list (helm-make-source "Project buffers" 'helm-source-projectile-buffer))
-
-(defvar helm-source-projectile-recentf-list
-  (helm-build-in-buffer-source "Projectile recent files"
-    :data (lambda ()
-            (condition-case nil
-                (projectile-recentf-files)
-              (error nil)))
-    :fuzzy-match helm-projectile-fuzzy-match
-    :coerce 'helm-projectile-coerce-file
-    :keymap helm-projectile-find-file-map
-    :help-message 'helm-ff-help-message
-    :mode-line helm-ff-mode-line-string
-    :action helm-projectile-file-actions
-    )
-  "Helm source definition for recent files in current project.")
-
-(defvar helm-source-projectile-files-and-dired-list
-  '(helm-source-projectile-dired-files-list
-    helm-source-projectile-files-list))
-
-(defvar helm-source-projectile-directories-and-dired-list
-  '(helm-source-projectile-dired-files-list
-    helm-source-projectile-directories-list))
-
-(defcustom helm-projectile-sources-list
-  '(helm-source-projectile-buffers-list
-    helm-source-projectile-files-list
-    helm-source-projectile-projects
-    )
-  "Default sources for `helm-projectile'."
-  :group 'helm-projectile)
-
-(defmacro helm-projectile-command (command source prompt &optional not-require-root)
-  "Template for generic helm-projectile commands.
-COMMAND is a command name to be appended with \"helm-projectile\" prefix.
-SOURCE is a Helm source that should be Projectile specific.
-PROMPT is a string for displaying as a prompt.
-NOT-REQUIRE-ROOT specifies the command doesn't need to be used in a
-project root."
-  `(defun ,(intern (concat "helm-projectile-" command)) (&optional arg)
-     "Use projectile with Helm for finding files in project
-
-With a prefix ARG invalidates the cache first."
-     (interactive "P")
-     (if (projectile-project-p)
-         (projectile-maybe-invalidate-cache arg)
-       (unless ,not-require-root
-         (error "You're not in a project")))
-     (let ((helm-ff-transformer-show-only-basename nil)
-           ;; for consistency, we should just let Projectile take care of ignored files
-           (helm-boring-file-regexp-list nil))
-       (helm :sources ,source
-             :buffer "*helm projectile*"
-             :prompt (projectile-prepend-project-name ,prompt)))))
-
-(helm-projectile-command "switch-project" 'helm-source-projectile-projects "Switch to project: " t)
-(helm-projectile-command "find-file" helm-source-projectile-files-and-dired-list "Find file: ")
-(helm-projectile-command "find-file-in-known-projects" 'helm-source-projectile-files-in-all-projects-list "Find file in projects: ")
-(helm-projectile-command "find-dir" helm-source-projectile-directories-and-dired-list "Find dir: ")
-(helm-projectile-command "recentf" 'helm-source-projectile-recentf-list "Recently visited file: ")
-(helm-projectile-command "switch-to-buffer" 'helm-source-projectile-buffers-list "Switch to buffer: ")
-
-;;;###autoload
-(defun helm-projectile-find-file-dwim ()
-  "Find file at point based on context."
-  (interactive)
-  (let* ((project-files (projectile-current-project-files))
-         (files (projectile-select-files project-files)))
-    (if (= (length files) 1)
-        (find-file (expand-file-name (car files) (projectile-project-root)))
-      (helm :sources (helm-projectile-build-dwim-source (if (> (length files) 1)
-                                                            files
-                                                          project-files))
-            :buffer "*helm projectile*"
-            :prompt (projectile-prepend-project-name "Find file: ")))))
-
-;;;###autoload
-(defun helm-projectile-find-other-file (&optional flex-matching)
-  "Switch between files with the same name but different extensions using Helm.
-With FLEX-MATCHING, match any file that contains the base name of current file.
-Other file extensions can be customized with the variable `projectile-other-file-alist'."
-  (interactive "P")
-  (-if-let (other-files (projectile-get-other-files (buffer-file-name)
-                                                    (projectile-current-project-files)
-                                                    flex-matching))
-      (if (= (length other-files) 1)
-          (find-file (expand-file-name (car other-files) (projectile-project-root)))
-        (progn
-          (let* ((helm-ff-transformer-show-only-basename nil))
-            (helm :sources (helm-build-in-buffer-source "Projectile other files"
-                             :data other-files
-                             :coerce 'helm-projectile-coerce-file
-                             :keymap (let ((map (copy-keymap helm-find-files-map)))
-                                       (define-key map (kbd "<left>") 'helm-previous-source)
-                                       (define-key map (kbd "<right>") 'helm-next-source)
-                                       map)
-                             :help-message helm-ff-help-message
-                             :mode-line helm-ff-mode-line-string
-                             :action helm-projectile-file-actions)
-                  :buffer "*helm projectile*"
-                  :prompt (projectile-prepend-project-name "Find other file: ")))))
-    (error "No other file found")))
-
-(defun helm-projectile-grep-or-ack (&optional use-ack-p ack-ignored-pattern ack-executable)
-  "Perform helm-grep at project root.
-USE-ACK-P indicates whether to use ack or not.
-ACK-IGNORED-PATTERN is a file regex to exclude from searching.
-ACK-EXECUTABLE is the actual ack binary name.
-It is usually \"ack\" or \"ack-grep\".
-If it is nil, or ack/ack-grep not found then use default grep command."
-  (let* ((default-directory (projectile-project-root))
-         (helm-ff-default-directory (projectile-project-root))
-         (follow (and helm-follow-mode-persistent
-                      (assoc-default 'follow helm-source-grep)))
-         (helm-grep-in-recurse t)
-         (grep-find-ignored-files (-union (projectile-ignored-files-rel)  grep-find-ignored-files))
-         (grep-find-ignored-directories (-union (projectile-ignored-directories-rel) grep-find-ignored-directories))
-         (helm-grep-default-command (if use-ack-p
-                                        (concat ack-executable " -H --no-group --no-color " ack-ignored-pattern " %p %f")
-                                      "grep -a -r %e -n%cH -e %p %f ."))
-         (helm-grep-default-recurse-command helm-grep-default-command)
-         (helm-source-grep
-          (helm-build-async-source
-              (capitalize (helm-grep-command t))
-            :header-name (lambda (name)
-                           (let ((name (if use-ack-p
-                                           "Helm Projectile Ack"
-                                         "Helm Projectile Grep")))
-                             (concat name " " "(C-c ? Help)")))
-            :candidates-process 'helm-grep-collect-candidates
-            :filter-one-by-one 'helm-grep-filter-one-by-one
-            :candidate-number-limit 9999
-            :nohighlight t
-            :mode-line helm-grep-mode-line-string
-            ;; We need to specify keymap here and as :keymap arg [1]
-            ;; to make it available in further resuming.
-            :keymap helm-grep-map
-            :history 'helm-grep-history
-            :action (helm-make-actions
-                     "Find file" 'helm-grep-action
-                     "Find file other frame" 'helm-grep-other-frame
-                     (lambda () (and (locate-library "elscreen")
-                                     "Find file in Elscreen"))
-                     'helm-grep-jump-elscreen
-                     "Save results in grep buffer" 'helm-grep-save-results
-                     "Find file other window" 'helm-grep-other-window)
-            :persistent-action 'helm-grep-persistent-action
-            :persistent-help "Jump to line (`C-u' Record in mark ring)"
-            :requires-pattern 2)))
-    (helm
-     :sources 'helm-source-grep
-     :input (if (region-active-p)
-                (buffer-substring-no-properties (region-beginning) (region-end))
-              (thing-at-point 'symbol))
-     :buffer (format "*helm %s*" (if use-ack-p
-                                     "ack"
-                                   "grep"))
-     :default-directory (projectile-project-root)
-     :keymap helm-grep-map
-     :history 'helm-grep-history
-     :truncate-lines t)))
-
-;;;###autoload
-(defun helm-projectile-on ()
-  "Turn on helm-projectile key bindings."
-  (interactive)
-  (message "Turn on helm-projectile key bindings")
-  (helm-projectile-toggle 1))
-
-;;;###autoload
-(defun helm-projectile-off ()
-  "Turn off helm-projectile key bindings."
-  (interactive)
-  (message "Turn off helm-projectile key bindings")
-  (helm-projectile-toggle -1))
-
-;;;###autoload
-(defun helm-projectile-grep ()
-  "Helm version of projectile-grep."
-  (interactive)
-  (if (projectile-project-p)
-      (funcall'run-with-timer 0.01 nil
-                              #'helm-projectile-grep-or-ack nil)
-    (error "You're not in a project")))
-
-;;;###autoload
-(defun helm-projectile-ack ()
-  "Helm version of projectile-ack."
-  (interactive)
-  (if (projectile-project-p)
-      (let ((ack-ignored (mapconcat
-                          'identity
-                          (-union (-map (lambda (path)
-                                          (concat "--ignore-dir=" (file-name-nondirectory (directory-file-name path))))
-                                        (projectile-ignored-directories))
-                                  (-map (lambda (path)
-                                          (concat "--ignore-file=match:" (shell-quote-argument path)))
-                                        (projectile-ignored-files))) " "))
-            (helm-ack-grep-executable (cond
-                                       ((executable-find "ack") "ack")
-                                       ((executable-find "ack-grep") "ack-grep")
-                                       (t (error "ack or ack-grep is not available.")))))
-        (funcall 'run-with-timer 0.01 nil
-                 #'helm-projectile-grep-or-ack t ack-ignored helm-ack-grep-executable))
-    (error "You're not in a project")))
-
-;;;###autoload
-(defun helm-projectile-ag (&optional options)
-  "Helm version of projectile-ag."
-  (interactive (if current-prefix-arg (list (read-string "option: " "" 'helm-ag-command-history))))
-  (if (require 'helm-ag nil  'noerror)
-      (if (projectile-project-p)
-          (let* ((grep-find-ignored-files (-union (projectile-ignored-files-rel)  grep-find-ignored-files))
-                 (grep-find-ignored-directories (-union (projectile-ignored-directories-rel) grep-find-ignored-directories))
-                 (ignored (mapconcat (lambda (i)
-                                       (concat "--ignore " i))
-                                     (append grep-find-ignored-files grep-find-ignored-directories)
-                                     " "))
-                 (helm-ag-command-option options)
-                 (helm-ag-base-command (concat helm-ag-base-command " " ignored)))
-            (helm-do-ag (projectile-project-root)))
-        (error "You're not in a project"))
-    (error "helm-ag not available")))
-
-(defun helm-projectile-commander-bindings ()
-  (def-projectile-commander-method ?a
-    "Run ack on project."
-    (call-interactively 'helm-projectile-ack))
-
-  (def-projectile-commander-method ?A
-    "Find ag on project."
-    (call-interactively 'helm-projectile-ag))
-
-  (def-projectile-commander-method ?f
-    "Find file in project."
-    (helm-projectile-find-file))
-
-  (def-projectile-commander-method ?b
-    "Switch to project buffer."
-    (helm-projectile-switch-to-buffer))
-
-  (def-projectile-commander-method ?d
-    "Find directory in project."
-    (helm-projectile-find-dir))
-
-  (def-projectile-commander-method ?g
-    "Run grep on project."
-    (helm-projectile-grep))
-
-  (def-projectile-commander-method ?s
-    "Switch project."
-    (helm-projectile-switch-project))
-
-  (def-projectile-commander-method ?e
-    "Find recently visited file in project."
-    (helm-projectile-recentf)))
-
-(defun helm-projectile-toggle (toggle)
-  "Toggle Helm version of Projectile commands."
-  (if (> toggle 0)
-      (progn
-        (setq projectile-switch-project-action 'helm-projectile-find-file)
-        (define-key projectile-command-map (kbd "a") 'helm-projectile-find-other-file)
-        (define-key projectile-command-map (kbd "f") 'helm-projectile-find-file)
-        (define-key projectile-command-map (kbd "F") 'helm-projectile-find-file-in-known-projects)
-        (define-key projectile-command-map (kbd "g") 'helm-projectile-find-file-dwim)
-        (define-key projectile-command-map (kbd "d") 'helm-projectile-find-dir)
-        (define-key projectile-command-map (kbd "p") 'helm-projectile-switch-project)
-        (define-key projectile-command-map (kbd "e") 'helm-projectile-recentf)
-        (define-key projectile-command-map (kbd "b") 'helm-projectile-switch-to-buffer)
-        (define-key projectile-command-map (kbd "s g") 'helm-projectile-grep)
-        (define-key projectile-command-map (kbd "s a") 'helm-projectile-ack)
-        (define-key projectile-command-map (kbd "s s") 'helm-projectile-ag)
-        (helm-projectile-commander-bindings))
-    (progn
-      (setq projectile-switch-project-action 'projectile-find-file)
-      (define-key projectile-command-map (kbd "a") 'projectile-find-other-file)
-      (define-key projectile-command-map (kbd "f") 'projectile-find-file)
-      (define-key projectile-command-map (kbd "F") 'projectile-find-file-in-known-projects)
-      (define-key projectile-command-map (kbd "g") 'helm-projectile-find-file-dwim)
-      (define-key projectile-command-map (kbd "d") 'projectile-find-dir)
-      (define-key projectile-command-map (kbd "p") 'projectile-switch-project)
-      (define-key projectile-command-map (kbd "e") 'projectile-recentf)
-      (define-key projectile-command-map (kbd "b") 'projectile-switch-to-buffer)
-      (define-key projectile-command-map (kbd "s g") 'projectile-grep)
-      (define-key projectile-command-map (kbd "s s") 'projectile-ag)
-      (projectile-commander-bindings))))
-
-;;;###autoload
-(defun helm-projectile (&optional arg)
-  "Use projectile with Helm instead of ido.
-
-With a prefix ARG invalidates the cache first.
-If invoked outside of a project, displays a list of known projects to jump."
-  (interactive "P")
-  (if (projectile-project-p)
-      (projectile-maybe-invalidate-cache arg))
-  (let ((helm-ff-transformer-show-only-basename nil))
-    (helm :sources helm-projectile-sources-list
-          :buffer "*helm projectile*"
-          :prompt (projectile-prepend-project-name (if (projectile-project-p)
-                                                       "pattern: "
-                                                     "Switch to project: ")))))
-
-;;;###autoload
-(eval-after-load 'projectile
-  '(progn
-     (define-key projectile-command-map (kbd "h") 'helm-projectile)))
-
-(provide 'helm-projectile)
-
-;;; helm-projectile.el ends here
diff --git a/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile-autoloads.el b/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile-autoloads.el
new file mode 100644
index 0000000..12dfb24
--- /dev/null
+++ b/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile-autoloads.el
@@ -0,0 +1,71 @@
+;;; helm-projectile-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "helm-projectile" "helm-projectile.el" (22171
+;;;;;;  46562 0 0))
+;;; Generated autoloads from helm-projectile.el
+
+(defvar helm-projectile-fuzzy-match t "\
+Enable fuzzy matching for Helm Projectile commands.
+This needs to be set before loading helm-projectile.")
+
+(custom-autoload 'helm-projectile-fuzzy-match "helm-projectile" t)
+
+(autoload 'helm-projectile-find-file-dwim "helm-projectile" "\
+Find file at point based on context.
+
+\(fn)" t nil)
+
+(autoload 'helm-projectile-find-other-file "helm-projectile" "\
+Switch between files with the same name but different extensions using Helm.
+With FLEX-MATCHING, match any file that contains the base name of current file.
+Other file extensions can be customized with the variable `projectile-other-file-alist'.
+
+\(fn &optional FLEX-MATCHING)" t nil)
+
+(autoload 'helm-projectile-on "helm-projectile" "\
+Turn on helm-projectile key bindings.
+
+\(fn)" t nil)
+
+(autoload 'helm-projectile-off "helm-projectile" "\
+Turn off helm-projectile key bindings.
+
+\(fn)" t nil)
+
+(autoload 'helm-projectile-grep "helm-projectile" "\
+Helm version of `projectile-grep'.
+DIR is the project root, if not set then current directory is used
+
+\(fn &optional DIR)" t nil)
+
+(autoload 'helm-projectile-ack "helm-projectile" "\
+Helm version of projectile-ack.
+
+\(fn &optional DIR)" t nil)
+
+(autoload 'helm-projectile-ag "helm-projectile" "\
+Helm version of projectile-ag.
+
+\(fn &optional OPTIONS)" t nil)
+
+(autoload 'helm-projectile "helm-projectile" "\
+Use projectile with Helm instead of ido.
+
+With a prefix ARG invalidates the cache first.
+If invoked outside of a project, displays a list of known projects to jump.
+
+\(fn &optional ARG)" t nil)
+
+(eval-after-load 'projectile '(progn (define-key projectile-command-map (kbd "h") #'helm-projectile)))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; helm-projectile-autoloads.el ends here
diff --git a/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile-pkg.el b/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile-pkg.el
new file mode 100644
index 0000000..633bf7c
--- /dev/null
+++ b/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile-pkg.el
@@ -0,0 +1 @@
+(define-package "helm-projectile" "20151220.221" "Helm integration for Projectile" '((helm "1.7.7") (projectile "0.13.0") (dash "1.5.0") (cl-lib "0.3")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
diff --git a/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile.el b/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile.el
new file mode 100644
index 0000000..e44b871
--- /dev/null
+++ b/emacs.d/elpa/helm-projectile-20151220.221/helm-projectile.el
@@ -0,0 +1,868 @@
+;;; helm-projectile.el --- Helm integration for Projectile
+
+;; Copyright (C) 2011-2015 Bozhidar Batsov
+
+;; Author: Bozhidar Batsov
+;; URL: https://github.com/bbatsov/projectile
+;; Package-Version: 20151220.221
+;; Created: 2011-31-07
+;; Keywords: project, convenience
+;; Version: 0.13.0
+;; Package-Requires: ((helm "1.7.7") (projectile "0.13.0") (dash "1.5.0") (cl-lib "0.3"))
+
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library provides easy project management and navigation.  The
+;; concept of a project is pretty basic - just a folder containing
+;; special file.  Currently git, mercurial and bazaar repos are
+;; considered projects by default.  If you want to mark a folder
+;; manually as a project just create an empty .projectile file in
+;; it.  See the README for more details.
+;;
+;;; Code:
+
+(require 'projectile)
+(require 'cl-lib)
+(require 'grep)
+(require 'helm)
+(require 'helm-types)
+(require 'helm-locate)
+(require 'helm-buffers)
+(require 'helm-files)
+
+(declare-function eshell "eshell")
+(declare-function helm-do-ag "helm-ag")
+(defvar helm-ag-base-command)
+
+(defvar grep-find-ignored-directories)
+(defvar grep-find-ignored-files)
+
+(defgroup helm-projectile nil
+  "Helm support for projectile."
+  :prefix "helm-projectile-"
+  :group 'projectile
+  :link `(url-link :tag "helm-projectile homepage" "https://github.com/bbatsov/projectile"))
+
+(defvar helm-projectile-current-project-root)
+
+;;;###autoload
+(defcustom helm-projectile-fuzzy-match t
+  "Enable fuzzy matching for Helm Projectile commands.
+This needs to be set before loading helm-projectile."
+  :group 'helm-projectile
+  :type 'boolean)
+
+(defun helm-projectile-coerce-file (candidate)
+  (with-current-buffer (helm-candidate-buffer)
+    (expand-file-name candidate (projectile-project-root))))
+
+(defmacro helm-projectile-define-key (keymap key def &rest bindings)
+  "In KEYMAP, define key sequence KEY1 as DEF1, KEY2 as DEF2 ..."
+  (declare (indent defun))
+  (let ((ret '(progn)))
+    (while key
+      (push
+       `(define-key ,keymap ,key
+          (lambda ()
+            (interactive)
+            (helm-exit-and-execute-action ,def)))
+       ret)
+      (setq key (pop bindings)
+            def (pop bindings)))
+    (reverse ret)))
+
+(defun helm-projectile-hack-actions (actions &rest prescription)
+  "Given a Helm action list and a prescription, return a hacked
+Helm action list, after applying the PRESCRIPTION.
+
+The Helm action list ACTIONS is of the form:
+
+\(\(DESCRIPTION1 . FUNCTION1\)
+ \(DESCRIPTION2 . FUNCTION2\)
+ ...
+ \(DESCRIPTIONn . FUNCTIONn\)\)
+
+PRESCRIPTION is in the form:
+
+\(INSTRUCTION1 INSTRUCTION2 ... INSTRUCTIONn\)
+
+If an INSTRUCTION is a symbol, the action with function name
+INSTRUCTION is deleted.
+
+If an INSTRUCTION is of the form \(FUNCTION1 . FUNCTION2\), the
+action with function name FUNCTION1 will change it's function to
+FUNCTION2.
+
+If an INSTRUCTION is of the form \(FUNCTION . DESCRIPTION\), and
+if an action with function name FUNCTION exists in the original
+Helm action list, the action in the Helm action list, with
+function name FUNCTION will change it's description to
+DESCRIPTION. Otherwise, (FUNCTION . DESCRIPTION) will be added to
+the action list.
+
+Please check out how `helm-projectile-file-actions' is defined
+for an example of how this function is being used."
+  (let* ((to-delete (cl-remove-if (lambda (entry) (listp entry)) prescription))
+         (actions (cl-delete-if (lambda (action) (memq (cdr action) to-delete))
+                                (copy-alist actions)))
+         new)
+    (cl-dolist (action actions)
+      (when (setq new (cdr (assq (cdr action) prescription)))
+        (if (stringp new)
+            (setcar action new)
+          (setcdr action new))))
+    ;; Add new actions from PRESCRIPTION
+    (setq new nil)
+    (cl-dolist (instruction prescription)
+      (when (and (listp instruction)
+                 (null (rassq (car instruction) actions))
+                 (symbolp (car instruction)) (stringp (cdr instruction)))
+        (push (cons (cdr instruction) (car instruction)) new)))
+    (append actions (nreverse new))))
+
+(defun helm-projectile-vc (dir)
+  "A Helm action for jumping to project root using `vc-dir' or Magit.
+DIR is a directory to be switched"
+  (let ((projectile-require-project-root nil))
+    (projectile-vc dir)))
+
+(defun helm-projectile-compile-project (dir)
+  "A Helm action for compile a project.
+DIR is the project root."
+  (let ((helm--reading-passwd-or-string t)
+        (default-directory dir))
+    (projectile-compile-project helm-current-prefix-arg dir)))
+
+(defun helm-projectile-test-project (dir)
+  "A Helm action for test a project.
+DIR is the project root."
+  (let ((helm--reading-passwd-or-string t)
+        (default-directory dir))
+    (projectile-test-project helm-current-prefix-arg)))
+
+(defun helm-projectile-run-project (dir)
+  "A Helm action for run a project.
+DIR is the project root."
+  (let ((helm--reading-passwd-or-string t)
+        (default-directory dir))
+    (projectile-run-project helm-current-prefix-arg)))
+
+(defun helm-projectile-remove-known-project (_ignore)
+  "Delete selected projects.
+_IGNORE means the argument does not matter.
+It is there because Helm requires it."
+  (let* ((projects (helm-marked-candidates :with-wildcard t))
+         (len (length projects)))
+    (with-helm-display-marked-candidates
+      helm-marked-buffer-name
+      projects
+      (if (not (y-or-n-p (format "Delete *%s projects(s)? " len)))
+          (message "(No deletion performed)")
+        (progn
+          (mapc (lambda (p)
+                  (delete p projectile-known-projects))
+                projects)
+          (projectile-save-known-projects))
+        (message "%s projects(s) deleted" len)))))
+
+(defvar helm-projectile-projects-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (helm-projectile-define-key map
+      (kbd "C-d") #'dired
+      (kbd "M-g") #'helm-projectile-vc
+      (kbd "M-e") #'helm-projectile-switch-to-eshell
+      (kbd "C-s") #'helm-projectile-grep
+      (kbd "M-c") #'helm-projectile-compile-project
+      (kbd "M-t") #'helm-projectile-test-project
+      (kbd "M-r") #'helm-projectile-run-project
+      (kbd "M-D") #'helm-projectile-remove-known-project)
+    map)
+  "Mapping for known projectile projects.")
+
+(defvar helm-source-projectile-projects
+  (helm-build-in-buffer-source "Projectile projects"
+    :data (lambda ()
+            (if (projectile-project-p)
+                (cons (abbreviate-file-name (projectile-project-root))
+                      (projectile-relevant-known-projects))
+              projectile-known-projects))
+    :fuzzy-match helm-projectile-fuzzy-match
+    :keymap helm-projectile-projects-map
+    :mode-line helm-read-file-name-mode-line-string
+    :action '(("Switch to project" .
+               (lambda (project)
+                 (let ((projectile-completion-system 'helm))
+                   (projectile-switch-project-by-name project))))
+              ("Open Dired in project's directory `C-d'" . dired)
+              ("Open project root in vc-dir or magit `M-g'" . helm-projectile-vc)
+              ("Switch to Eshell `M-e'" . helm-projectile-switch-to-eshell)
+              ("Grep in projects `C-s'" . helm-projectile-grep)
+              ("Compile project `M-c'. With C-u, new compile command"
+               . helm-projectile-compile-project)
+              ("Remove project(s) `M-D'" . helm-projectile-remove-known-project)))
+  "Helm source for known projectile projects.")
+
+(define-key helm-etags-map (kbd "C-c p f")
+  (lambda ()
+    (interactive)
+    (helm-run-after-exit 'helm-projectile-find-file nil)))
+
+(defun helm-projectile-find-files-eshell-command-on-file-action (_candidate)
+  (interactive)
+  (let* ((helm-ff-default-directory (file-name-directory _candidate)))
+    (helm-find-files-eshell-command-on-file _candidate)))
+
+(defun helm-projectile-ff-etags-select-action (_candidate)
+  (interactive)
+  (let* ((helm-ff-default-directory (file-name-directory _candidate)))
+    (helm-ff-etags-select _candidate)))
+
+(defun helm-projectile-switch-to-eshell (dir)
+  (interactive)
+  (let* ((projectile-require-project-root nil)
+         (helm-ff-default-directory (file-name-directory (projectile-expand-root dir))))
+    (helm-ff-switch-to-eshell dir)))
+
+(defun helm-projectile-files-in-current-dired-buffer ()
+  "Return a list of files (only) in the current dired buffer."
+  (let (flist)
+    (cl-flet ((fpush (fname) (push fname flist)))
+      (save-excursion
+        (let (file buffer-read-only)
+          (goto-char (point-min))
+          (while (not (eobp))
+            (save-excursion
+              (and (not (eolp))
+                   (setq file (dired-get-filename t t)) ; nil on non-file
+                   (progn (end-of-line)
+                          (funcall #'fpush file))))
+            (forward-line 1)))))
+    (mapcar 'file-truename (nreverse flist))))
+
+(defun helm-projectile-all-dired-buffers ()
+  "Get all current Dired buffers."
+  (mapcar (lambda (b)
+            (with-current-buffer b (buffer-name)))
+          (-filter (lambda (b)
+                     (with-current-buffer b
+                       (and (eq major-mode 'dired-mode)
+                            (buffer-name))))
+                   (buffer-list))))
+
+(defvar helm-projectile-virtual-dired-remote-enable nil
+  "Enable virtual Dired manager on remote host.
+Disabled by default.")
+
+(defun helm-projectile-dired-files-new-action (candidate)
+  "Create a Dired buffer from chosen files.
+CANDIDATE is the selected file, but choose the marked files if available."
+  (if (and (file-remote-p (projectile-project-root))
+           (not helm-projectile-virtual-dired-remote-enable))
+      (message "Virtual Dired manager is disabled in remote host. Enable with %s."
+               (propertize "helm-projectile-virtual-dired-remote-enable" 'face 'font-lock-keyword-face))
+    (let ((files (-filter (lambda (f)
+                            (not (string= f "")))
+                          (mapcar (lambda (file)
+                                    (replace-regexp-in-string (projectile-project-root) "" file))
+                                  (helm-marked-candidates :with-wildcard t))))
+          (new-name (completing-read "Select or enter a new buffer name: "
+                                     (helm-projectile-all-dired-buffers)))
+          (helm--reading-passwd-or-string t)
+          (default-directory (projectile-project-root)))
+      ;; create a unique buffer that is unique to any directory in default-directory
+      ;; or opened buffer; when Dired is passed with a non-existence directory name,
+      ;; it only creates a buffer and insert everything. If a new name user supplied
+      ;; exists as default-directory, Dired throws error when insert anything that
+      ;; does not exist in current directory.
+      (with-current-buffer (dired (cons (make-temp-name new-name)
+                                        (if files
+                                            files
+                                          (list candidate))))
+        (when (get-buffer new-name)
+          (kill-buffer new-name))
+        (rename-buffer new-name)))))
+
+(defun helm-projectile-dired-files-add-action (candidate)
+  "Add files to a Dired buffer.
+CANDIDATE is the selected file.  Used when no file is explicitly marked."
+  (if (and (file-remote-p (projectile-project-root))
+           (not helm-projectile-virtual-dired-remote-enable))
+      (message "Virtual Dired manager is disabled in remote host. Enable with %s."
+               (propertize "helm-projectile-virtual-dired-remote-enable" 'face 'font-lock-keyword-face))
+    (if (eq (with-helm-current-buffer major-mode) 'dired-mode)
+        (let* ((marked-files (helm-marked-candidates :with-wildcard t))
+               (helm--reading-passwd-or-string t)
+               (root (projectile-project-root)) ; store root for later use
+               (dired-buffer-name (or (and (eq major-mode 'dired-mode) (buffer-name))
+                                      (completing-read "Select a Dired buffer:"
+                                                       (helm-projectile-all-dired-buffers))))
+               (dired-files (with-current-buffer dired-buffer-name
+                              (helm-projectile-files-in-current-dired-buffer)))
+               (files (sort (mapcar (lambda (file)
+                                      (replace-regexp-in-string (projectile-project-root) "" file))
+                                    (cl-nunion (if marked-files
+                                                   marked-files
+                                                 (list candidate))
+                                               dired-files
+                                               :test #'string-equal))
+                            'string-lessp)))
+          (kill-buffer dired-buffer-name)
+          ;; Rebind default-directory because after killing a buffer, we
+          ;; could be in any buffer and default-directory is set to that
+          ;; random buffer
+          ;;
+          ;; Also use saved root directory, because after killing a buffer,
+          ;; we could be outside of current project
+          (let ((default-directory root))
+            (with-current-buffer (dired (cons (make-temp-name dired-buffer-name)
+                                              (if files
+                                                  (mapcar (lambda (file)
+                                                            (replace-regexp-in-string root "" file))
+                                                          files)
+                                                (list candidate))))
+              (rename-buffer dired-buffer-name))))
+      (error "You're not in a Dired buffer to add"))))
+
+(defun helm-projectile-dired-files-delete-action (candidate)
+  "Delete selected entries from a Dired buffer.
+CANDIDATE is the selected file.  Used when no file is explicitly marked."
+  (if (and (file-remote-p (projectile-project-root))
+           (not helm-projectile-virtual-dired-remote-enable))
+      (message "Virtual Dired manager is disabled in remote host. Enable with %s."
+               (propertize "helm-projectile-virtual-dired-remote-enable" 'face 'font-lock-keyword-face))
+    (let* ((helm--reading-passwd-or-string t)
+           (root (projectile-project-root))
+           (dired-buffer-name (with-helm-current-buffer (buffer-name)))
+           (dired-files (with-current-buffer dired-buffer-name
+                          (helm-projectile-files-in-current-dired-buffer)))
+           (files (sort (cl-set-exclusive-or (helm-marked-candidates :with-wildcard t)
+                                             dired-files
+                                             :test #'string-equal) #'string-lessp)))
+      (kill-buffer dired-buffer-name)
+      ;; similar reason to `helm-projectile-dired-files-add-action'
+      (let ((default-directory root))
+        (with-current-buffer (dired (cons (make-temp-name dired-buffer-name)
+                                          (if files
+                                              (mapcar (lambda (file)
+                                                        (replace-regexp-in-string root "" file))
+                                                      files)
+                                            (list candidate))))
+          (rename-buffer dired-buffer-name))))))
+
+(defvar helm-projectile-find-file-map
+  (let ((map (copy-keymap helm-find-files-map)))
+    (helm-projectile-define-key map
+      (kbd "C-c f") #'helm-projectile-dired-files-new-action
+      (kbd "C-c a") #'helm-projectile-dired-files-add-action
+      (kbd "M-e") #'helm-projectile-switch-to-eshell
+      (kbd "M-.") #'helm-projectile-ff-etags-select-action
+      (kbd "M-!") #'helm-projectile-find-files-eshell-command-on-file-action)
+    (define-key map (kbd "<left>") #'helm-previous-source)
+    (define-key map (kbd "<right>") #'helm-next-source)
+    map)
+  "Mapping for file commands in Helm Projectile.")
+
+(defvar helm-projectile-file-actions
+  (helm-projectile-hack-actions
+   helm-find-files-actions
+   ;; Delete these actions
+   'helm-ff-browse-project
+   'helm-insert-file-name-completion-at-point
+   'helm-ff-find-sh-command
+   'helm-ff-cache-add-file
+   ;; Substitute these actions
+   '(helm-ff-switch-to-eshell . helm-projectile-switch-to-eshell)
+   '(helm-ff-etags-select     . helm-projectile-ff-etags-select-action)
+   '(helm-find-files-eshell-command-on-file
+     . helm-projectile-find-files-eshell-command-on-file-action)
+   ;; Change action descriptions
+   '(helm-find-file-as-root . "Find file as root `C-c r'")
+   ;; New actions
+   '(helm-projectile-dired-files-new-action
+     . "Create Dired buffer from files `C-c f'")
+   '(helm-projectile-dired-files-add-action
+     . "Add files to Dired buffer `C-c a'"))
+  "Action for files.")
+
+(defun helm-projectile-build-dwim-source (candidates)
+  "Dynamically build a Helm source definition for Projectile files based on context with CANDIDATES."
+  ""
+  (helm-build-in-buffer-source "Projectile files"
+    :data candidates
+    :fuzzy-match helm-projectile-fuzzy-match
+    :coerce 'helm-projectile-coerce-file
+    :action-transformer 'helm-find-files-action-transformer
+    :keymap helm-projectile-find-file-map
+    :help-message helm-ff-help-message
+    :mode-line helm-read-file-name-mode-line-string
+    :action helm-projectile-file-actions))
+
+(defvar helm-source-projectile-files-list
+  (helm-build-in-buffer-source "Projectile files"
+    :data (lambda ()
+            (condition-case nil
+                (projectile-current-project-files)
+              (error nil)))
+    :fuzzy-match helm-projectile-fuzzy-match
+    :coerce 'helm-projectile-coerce-file
+    :keymap helm-projectile-find-file-map
+    :help-message 'helm-ff-help-message
+    :mode-line helm-read-file-name-mode-line-string
+    :action helm-projectile-file-actions
+    )
+  "Helm source definition for Projectile files.")
+
+(defvar helm-source-projectile-files-in-all-projects-list
+  (helm-build-in-buffer-source "Projectile files in all Projects"
+    :data (lambda ()
+            (condition-case nil
+                (let ((projectile-require-project-root nil))
+                  (projectile-all-project-files))
+              (error nil)))
+    :keymap helm-find-files-map
+    :help-message 'helm-ff-help-message
+    :mode-line helm-read-file-name-mode-line-string
+    :action helm-projectile-file-actions
+    )
+  "Helm source definition for all Projectile files in all projects.")
+
+(defvar helm-projectile-dired-file-actions
+  (helm-projectile-hack-actions
+   helm-projectile-file-actions
+   ;; New actions
+   '(helm-projectile-dired-files-delete-action . "Remove entry(s) from Dired buffer `C-c d'")))
+
+(defvar helm-source-projectile-dired-files-list
+  (helm-build-in-buffer-source "Projectile files in current Dired buffer"
+    :data (lambda ()
+            (condition-case nil
+                (if (and (file-remote-p (projectile-project-root))
+                         (not helm-projectile-virtual-dired-remote-enable))
+                    nil
+                  (let ((default-directory (projectile-project-root)))
+                    (when (eq major-mode 'dired-mode)
+                      (mapcar (lambda (file)
+                                (replace-regexp-in-string default-directory "" file))
+                              (helm-projectile-files-in-current-dired-buffer)))))
+              (error nil)))
+    :coerce 'helm-projectile-coerce-file
+    :filter-one-by-one (lambda (file)
+                         (let ((default-directory (projectile-project-root)))
+                           (helm-ff-filter-candidate-one-by-one file)))
+    :action-transformer 'helm-find-files-action-transformer
+    :keymap (let ((map (copy-keymap helm-projectile-find-file-map)))
+              (helm-projectile-define-key map
+                (kbd "C-c d") 'helm-projectile-dired-files-delete-action)
+              map)
+    :help-message 'helm-ff-help-message
+    :mode-line helm-read-file-name-mode-line-string
+    :action helm-projectile-dired-file-actions)
+  "Helm source definition for Projectile delete files.")
+
+(defun helm-projectile-dired-find-dir (dir)
+  "Jump to a selected directory DIR from helm-projectile."
+  (dired (expand-file-name dir (projectile-project-root)))
+  (run-hooks 'projectile-find-dir-hook))
+
+(defun helm-projectile-dired-find-dir-other-window (dir)
+  "Jump to a selected directory DIR from helm-projectile."
+  (dired-other-window (expand-file-name dir (projectile-project-root)))
+  (run-hooks 'projectile-find-dir-hook))
+
+(defvar helm-source-projectile-directories-list
+  (helm-build-in-buffer-source "Projectile directories"
+    :data (lambda ()
+            (condition-case nil
+                (if projectile-find-dir-includes-top-level
+                    (append '("./") (projectile-current-project-dirs))
+                  (projectile-current-project-dirs))
+              (error nil)))
+    :fuzzy-match helm-projectile-fuzzy-match
+    :coerce 'helm-projectile-coerce-file
+    :action-transformer 'helm-find-files-action-transformer
+    :keymap (let ((map (make-sparse-keymap)))
+              (set-keymap-parent map helm-map)
+              (helm-projectile-define-key map
+                (kbd "<left>") #'helm-previous-source
+                (kbd "<right>") #'helm-next-source
+                (kbd "C-c o") #'helm-projectile-dired-find-dir-other-window
+                (kbd "M-e")   #'helm-projectile-switch-to-eshell
+                (kbd "C-c f") #'helm-projectile-dired-files-new-action
+                (kbd "C-c a") #'helm-projectile-dired-files-add-action
+                (kbd "C-s")   #'helm-projectile-grep)
+              map)
+    :help-message 'helm-ff-help-message
+    :mode-line helm-read-file-name-mode-line-string
+    :action '(("Open Dired" . helm-projectile-dired-find-dir)
+              ("Open Dired in other window `C-c o'" . helm-projectile-dired-find-dir)
+              ("Switch to Eshell `M-e'" . helm-projectile-switch-to-eshell)
+              ("Grep in projects `C-s'" . helm-projectile-grep)
+              ("Create Dired buffer from files `C-c f'" . helm-projectile-dired-files-new-action)
+              ("Add files to Dired buffer `C-c a'" . helm-projectile-dired-files-add-action)))
+  "Helm source for listing project directories.")
+
+(defvar helm-projectile-buffers-list-cache nil)
+
+(defclass helm-source-projectile-buffer (helm-source-sync helm-type-buffer)
+  ((init :initform (lambda ()
+                     ;; Issue #51 Create the list before `helm-buffer' creation.
+                     (setq helm-projectile-buffers-list-cache (condition-case nil
+                                                                  (cdr (projectile-project-buffer-names))
+                                                                (error nil)))
+                     (let ((result (cl-loop for b in helm-projectile-buffers-list-cache
+                                            maximize (length b) into len-buf
+                                            maximize (length (with-current-buffer b
+                                                               (symbol-name major-mode)))
+                                            into len-mode
+                                            finally return (cons len-buf len-mode))))
+                       (unless helm-buffer-max-length
+                         (setq helm-buffer-max-length (car result)))
+                       (unless helm-buffer-max-len-mode
+                         ;; If a new buffer is longer that this value
+                         ;; this value will be updated
+                         (setq helm-buffer-max-len-mode (cdr result))))))
+   (candidates :initform helm-projectile-buffers-list-cache)
+   (matchplugin :initform nil)
+   (match :initform 'helm-buffers-match-function)
+   (persistent-action :initform 'helm-buffers-list-persistent-action)
+   (keymap :initform helm-buffer-map)
+   (volatile :initform t)
+   (persistent-help
+    :initform
+    "Show this buffer / C-u \\[helm-execute-persistent-action]: Kill this buffer")))
+
+(defvar helm-source-projectile-buffers-list (helm-make-source "Project buffers" 'helm-source-projectile-buffer))
+
+(defvar helm-source-projectile-recentf-list
+  (helm-build-in-buffer-source "Projectile recent files"
+    :data (lambda ()
+            (condition-case nil
+                (projectile-recentf-files)
+              (error nil)))
+    :fuzzy-match helm-projectile-fuzzy-match
+    :coerce 'helm-projectile-coerce-file
+    :keymap helm-projectile-find-file-map
+    :help-message 'helm-ff-help-message
+    :mode-line helm-read-file-name-mode-line-string
+    :action helm-projectile-file-actions
+    )
+  "Helm source definition for recent files in current project.")
+
+(defvar helm-source-projectile-files-and-dired-list
+  '(helm-source-projectile-dired-files-list
+    helm-source-projectile-files-list))
+
+(defvar helm-source-projectile-directories-and-dired-list
+  '(helm-source-projectile-dired-files-list
+    helm-source-projectile-directories-list))
+
+(defcustom helm-projectile-sources-list
+  '(helm-source-projectile-buffers-list
+    helm-source-projectile-files-list
+    helm-source-projectile-projects
+    )
+  "Default sources for `helm-projectile'."
+  :group 'helm-projectile)
+
+(defmacro helm-projectile-command (command source prompt &optional not-require-root)
+  "Template for generic helm-projectile commands.
+COMMAND is a command name to be appended with \"helm-projectile\" prefix.
+SOURCE is a Helm source that should be Projectile specific.
+PROMPT is a string for displaying as a prompt.
+NOT-REQUIRE-ROOT specifies the command doesn't need to be used in a
+project root."
+  `(defun ,(intern (concat "helm-projectile-" command)) (&optional arg)
+     "Use projectile with Helm for finding files in project
+
+With a prefix ARG invalidates the cache first."
+     (interactive "P")
+     (if (projectile-project-p)
+         (projectile-maybe-invalidate-cache arg)
+       (unless ,not-require-root
+         (error "You're not in a project")))
+     (let ((helm-ff-transformer-show-only-basename nil)
+           ;; for consistency, we should just let Projectile take care of ignored files
+           (helm-boring-file-regexp-list nil))
+       (helm :sources ,source
+             :buffer "*helm projectile*"
+             :prompt (projectile-prepend-project-name ,prompt)))))
+
+(helm-projectile-command "switch-project" 'helm-source-projectile-projects "Switch to project: " t)
+(helm-projectile-command "find-file" helm-source-projectile-files-and-dired-list "Find file: ")
+(helm-projectile-command "find-file-in-known-projects" 'helm-source-projectile-files-in-all-projects-list "Find file in projects: " t)
+(helm-projectile-command "find-dir" helm-source-projectile-directories-and-dired-list "Find dir: ")
+(helm-projectile-command "recentf" 'helm-source-projectile-recentf-list "Recently visited file: ")
+(helm-projectile-command "switch-to-buffer" 'helm-source-projectile-buffers-list "Switch to buffer: ")
+
+;;;###autoload
+(defun helm-projectile-find-file-dwim ()
+  "Find file at point based on context."
+  (interactive)
+  (let* ((project-files (projectile-current-project-files))
+         (files (projectile-select-files project-files)))
+    (if (= (length files) 1)
+        (find-file (expand-file-name (car files) (projectile-project-root)))
+      (helm :sources (helm-projectile-build-dwim-source (if (> (length files) 1)
+                                                            files
+                                                          project-files))
+            :buffer "*helm projectile*"
+            :prompt (projectile-prepend-project-name "Find file: ")))))
+
+;;;###autoload
+(defun helm-projectile-find-other-file (&optional flex-matching)
+  "Switch between files with the same name but different extensions using Helm.
+With FLEX-MATCHING, match any file that contains the base name of current file.
+Other file extensions can be customized with the variable `projectile-other-file-alist'."
+  (interactive "P")
+  (-if-let (other-files (projectile-get-other-files (buffer-file-name)
+                                                    (projectile-current-project-files)
+                                                    flex-matching))
+      (if (= (length other-files) 1)
+          (find-file (expand-file-name (car other-files) (projectile-project-root)))
+        (progn
+          (let* ((helm-ff-transformer-show-only-basename nil))
+            (helm :sources (helm-build-in-buffer-source "Projectile other files"
+                             :data other-files
+                             :coerce 'helm-projectile-coerce-file
+                             :keymap (let ((map (copy-keymap helm-find-files-map)))
+                                       (define-key map (kbd "<left>") 'helm-previous-source)
+                                       (define-key map (kbd "<right>") 'helm-next-source)
+                                       map)
+                             :help-message helm-ff-help-message
+                             :mode-line helm-read-file-name-mode-line-string
+                             :action helm-projectile-file-actions)
+                  :buffer "*helm projectile*"
+                  :prompt (projectile-prepend-project-name "Find other file: ")))))
+    (error "No other file found")))
+
+(defun helm-projectile-grep-or-ack (&optional dir use-ack-p ack-ignored-pattern ack-executable)
+  "Perform helm-grep at project root.
+DIR directory where to search
+USE-ACK-P indicates whether to use ack or not.
+ACK-IGNORED-PATTERN is a file regex to exclude from searching.
+ACK-EXECUTABLE is the actual ack binary name.
+It is usually \"ack\" or \"ack-grep\".
+If it is nil, or ack/ack-grep not found then use default grep command."
+  (let* ((default-directory (or dir (projectile-project-root)))
+         (helm-ff-default-directory default-directory)
+         (follow (and helm-follow-mode-persistent
+                      (assoc-default 'follow helm-source-grep)))
+         (helm-grep-in-recurse t)
+         (helm-grep-ignored-files (-union (projectile-ignored-files-rel)  grep-find-ignored-files))
+         (helm-grep-ignored-directories (-union (projectile-ignored-directories-rel) grep-find-ignored-directories))
+         (helm-grep-default-command (if use-ack-p
+                                        (concat ack-executable " -H --no-group --no-color " ack-ignored-pattern " %p %f")
+                                      (if (and projectile-use-git-grep (eq (projectile-project-vcs) 'git))
+                                          "git --no-pager grep --no-color -n -e %p -- %f"
+                                        "grep -a -r %e -n%cH -e %p %f .")))
+         (helm-grep-default-recurse-command helm-grep-default-command)
+         (helm-source-grep
+          (helm-build-async-source
+              (capitalize (helm-grep-command t))
+            :header-name (lambda (name)
+                           (let ((name (if use-ack-p
+                                           "Helm Projectile Ack"
+                                         "Helm Projectile Grep")))
+                             (concat name " " "(C-c ? Help)")))
+            :candidates-process 'helm-grep-collect-candidates
+            :filter-one-by-one 'helm-grep-filter-one-by-one
+            :candidate-number-limit 9999
+            :nohighlight t
+            ;; We need to specify keymap here and as :keymap arg [1]
+            ;; to make it available in further resuming.
+            :keymap helm-grep-map
+            :history 'helm-grep-history
+            :action (helm-make-actions
+                     "Find file" 'helm-grep-action
+                     "Find file other frame" 'helm-grep-other-frame
+                     (lambda () (and (locate-library "elscreen")
+                                     "Find file in Elscreen"))
+                     'helm-grep-jump-elscreen
+                     "Save results in grep buffer" 'helm-grep-save-results
+                     "Find file other window" 'helm-grep-other-window)
+            :persistent-action 'helm-grep-persistent-action
+            :persistent-help "Jump to line (`C-u' Record in mark ring)"
+            :requires-pattern 2)))
+    (helm
+     :sources 'helm-source-grep
+     :input (if (region-active-p)
+                (buffer-substring-no-properties (region-beginning) (region-end))
+              (thing-at-point 'symbol))
+     :buffer (format "*helm %s*" (if use-ack-p
+                                     "ack"
+                                   "grep"))
+     :default-directory default-directory
+     :keymap helm-grep-map
+     :history 'helm-grep-history
+     :truncate-lines t)))
+
+;;;###autoload
+(defun helm-projectile-on ()
+  "Turn on helm-projectile key bindings."
+  (interactive)
+  (message "Turn on helm-projectile key bindings")
+  (helm-projectile-toggle 1))
+
+;;;###autoload
+(defun helm-projectile-off ()
+  "Turn off helm-projectile key bindings."
+  (interactive)
+  (message "Turn off helm-projectile key bindings")
+  (helm-projectile-toggle -1))
+
+;;;###autoload
+(defun helm-projectile-grep (&optional dir)
+  "Helm version of `projectile-grep'.
+DIR is the project root, if not set then current directory is used"
+  (interactive)
+  (let ((project-root (or dir (projectile-project-root) (error "You're not in a project"))))
+    (funcall'run-with-timer 0.01 nil
+                              #'helm-projectile-grep-or-ack project-root nil)))
+
+;;;###autoload
+(defun helm-projectile-ack (&optional dir)
+  "Helm version of projectile-ack."
+  (interactive)
+  (let ((project-root (or dir (projectile-project-root) (error "You're not in a project"))))
+    (let ((ack-ignored (mapconcat
+                        'identity
+                        (-union (-map (lambda (path)
+                                        (concat "--ignore-dir=" (file-name-nondirectory (directory-file-name path))))
+                                      (projectile-ignored-directories))
+                                (-map (lambda (path)
+                                        (concat "--ignore-file=match:" (shell-quote-argument path)))
+                                      (projectile-ignored-files))) " "))
+          (helm-ack-grep-executable (cond
+                                     ((executable-find "ack") "ack")
+                                     ((executable-find "ack-grep") "ack-grep")
+                                     (t (error "ack or ack-grep is not available.")))))
+      (funcall 'run-with-timer 0.01 nil
+               #'helm-projectile-grep-or-ack project-root t ack-ignored helm-ack-grep-executable))))
+
+;;;###autoload
+(defun helm-projectile-ag (&optional options)
+  "Helm version of projectile-ag."
+  (interactive (if current-prefix-arg (list (read-string "option: " "" 'helm-ag--extra-options-history))))
+  (if (require 'helm-ag nil  'noerror)
+      (if (projectile-project-p)
+          (let* ((grep-find-ignored-files (-union (projectile-ignored-files-rel) grep-find-ignored-files))
+                 (grep-find-ignored-directories (-union (projectile-ignored-directories-rel) grep-find-ignored-directories))
+                 (ignored (mapconcat (lambda (i)
+                                       (concat "--ignore " i))
+                                     (append grep-find-ignored-files grep-find-ignored-directories)
+                                     " "))
+                 (helm-ag-command-option options)
+                 (helm-ag-base-command (concat helm-ag-base-command " " ignored))
+                 (current-prefix-arg nil))
+            (helm-do-ag (projectile-project-root)))
+        (error "You're not in a project"))
+    (error "helm-ag not available")))
+
+(defun helm-projectile-commander-bindings ()
+  (def-projectile-commander-method ?a
+    "Run ack on project."
+    (call-interactively 'helm-projectile-ack))
+
+  (def-projectile-commander-method ?A
+    "Find ag on project."
+    (call-interactively 'helm-projectile-ag))
+
+  (def-projectile-commander-method ?f
+    "Find file in project."
+    (helm-projectile-find-file))
+
+  (def-projectile-commander-method ?b
+    "Switch to project buffer."
+    (helm-projectile-switch-to-buffer))
+
+  (def-projectile-commander-method ?d
+    "Find directory in project."
+    (helm-projectile-find-dir))
+
+  (def-projectile-commander-method ?g
+    "Run grep on project."
+    (helm-projectile-grep))
+
+  (def-projectile-commander-method ?s
+    "Switch project."
+    (helm-projectile-switch-project))
+
+  (def-projectile-commander-method ?e
+    "Find recently visited file in project."
+    (helm-projectile-recentf)))
+
+(defun helm-projectile-toggle (toggle)
+  "Toggle Helm version of Projectile commands."
+  (if (> toggle 0)
+      (progn
+        (setq projectile-switch-project-action #'helm-projectile-find-file)
+        (define-key projectile-command-map (kbd "a") #'helm-projectile-find-other-file)
+        (define-key projectile-command-map (kbd "f") #'helm-projectile-find-file)
+        (define-key projectile-command-map (kbd "F") #'helm-projectile-find-file-in-known-projects)
+        (define-key projectile-command-map (kbd "g") #'helm-projectile-find-file-dwim)
+        (define-key projectile-command-map (kbd "d") #'helm-projectile-find-dir)
+        (define-key projectile-command-map (kbd "p") #'helm-projectile-switch-project)
+        (define-key projectile-command-map (kbd "e") #'helm-projectile-recentf)
+        (define-key projectile-command-map (kbd "b") #'helm-projectile-switch-to-buffer)
+        (define-key projectile-command-map (kbd "s g") #'helm-projectile-grep)
+        (define-key projectile-command-map (kbd "s a") #'helm-projectile-ack)
+        (define-key projectile-command-map (kbd "s s") #'helm-projectile-ag)
+        (helm-projectile-commander-bindings))
+    (progn
+      (setq projectile-switch-project-action #'projectile-find-file)
+      (define-key projectile-command-map (kbd "a") #'projectile-find-other-file)
+      (define-key projectile-command-map (kbd "f") #'projectile-find-file)
+      (define-key projectile-command-map (kbd "F") #'projectile-find-file-in-known-projects)
+      (define-key projectile-command-map (kbd "g") #'helm-projectile-find-file-dwim)
+      (define-key projectile-command-map (kbd "d") #'projectile-find-dir)
+      (define-key projectile-command-map (kbd "p") #'projectile-switch-project)
+      (define-key projectile-command-map (kbd "e") #'projectile-recentf)
+      (define-key projectile-command-map (kbd "b") #'projectile-switch-to-buffer)
+      (define-key projectile-command-map (kbd "s g") #'projectile-grep)
+      (define-key projectile-command-map (kbd "s s") #'projectile-ag)
+      (projectile-commander-bindings))))
+
+;;;###autoload
+(defun helm-projectile (&optional arg)
+  "Use projectile with Helm instead of ido.
+
+With a prefix ARG invalidates the cache first.
+If invoked outside of a project, displays a list of known projects to jump."
+  (interactive "P")
+  (if (projectile-project-p)
+      (projectile-maybe-invalidate-cache arg))
+  (let ((helm-ff-transformer-show-only-basename nil))
+    (helm :sources helm-projectile-sources-list
+          :buffer "*helm projectile*"
+          :prompt (projectile-prepend-project-name (if (projectile-project-p)
+                                                       "pattern: "
+                                                     "Switch to project: ")))))
+
+;;;###autoload
+(eval-after-load 'projectile
+  '(progn
+     (define-key projectile-command-map (kbd "h") #'helm-projectile)))
+
+(provide 'helm-projectile)
+
+;;; helm-projectile.el ends here
diff --git a/emacs.d/elpa/jade-mode-20150402.2053/jade-mode-autoloads.el b/emacs.d/elpa/jade-mode-20150402.2053/jade-mode-autoloads.el
deleted file mode 100644
index 7eac119..0000000
--- a/emacs.d/elpa/jade-mode-20150402.2053/jade-mode-autoloads.el
+++ /dev/null
@@ -1,23 +0,0 @@
-;;; jade-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "jade-mode" "jade-mode.el" (21796 17145 0 0))
-;;; Generated autoloads from jade-mode.el
-
-(autoload 'jade-mode "jade-mode" "\
-Major mode for editing jade node.js templates
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("\\.jade\\'" . jade-mode))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; jade-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/jade-mode-20150402.2053/jade-mode-pkg.el b/emacs.d/elpa/jade-mode-20150402.2053/jade-mode-pkg.el
deleted file mode 100644
index 4b17c83..0000000
--- a/emacs.d/elpa/jade-mode-20150402.2053/jade-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "jade-mode" "20150402.2053" "Major mode for editing .jade files" 'nil :url "https://github.com/brianc/jade-mode")
diff --git a/emacs.d/elpa/jade-mode-20150402.2053/jade-mode.el b/emacs.d/elpa/jade-mode-20150402.2053/jade-mode.el
deleted file mode 100644
index d078c30..0000000
--- a/emacs.d/elpa/jade-mode-20150402.2053/jade-mode.el
+++ /dev/null
@@ -1,395 +0,0 @@
-;;; jade-mode.el --- Major mode for editing .jade files
-;;;
-;;; URL: https://github.com/brianc/jade-mode
-;; Package-Version: 20150402.2053
-;;; Author: Brian M. Carlson and other contributors
-;;; inspired by http://xahlee.org/emacs/elisp_syntax_coloring.html
-(require 'font-lock)
-(require 'js)
-
-(defvar jade-tab-width)
-
-(defun jade-debug (string &rest args)
-  "Prints a debug message"
-  (apply 'message (append (list string) args)))
-
-(defmacro jade-line-as-string ()
-  "Returns the current line as a string."
-  `(buffer-substring-no-properties (point-at-bol) (point-at-eol)))
-
-(defun jade-empty-line-p ()
-  "If line is empty or not."
-  (= (point-at-eol) (point-at-bol)))
-
-(defun jade-blank-line-p ()
-  "Returns t when line contains only whitespace chars, nil otherwise."
-  (string-match-p "^\\s-*$" (jade-line-as-string)))
-
-(defun jade-comment-dwim (arg)
-  "Comment or uncomment current line or region in a smart way."
-  (interactive "*P")
-  (require 'newcomment)
-  (let ((start (if (region-active-p)
-
-                   ;; when region is active, use beginning of line at
-                   ;; beginning of region (this way we don't start
-                   ;; commenting in the middle of a line)
-                   (progn
-                     (save-excursion
-                       (goto-char (region-beginning))
-                       (point-at-bol)))
-
-                 ;; without a region, just use beginning of current line
-                 (point-at-bol)))
-
-        ;; same logic applies for end of line/region
-        (end (if (region-active-p)
-                 (progn
-                   (save-excursion
-                     (goto-char (region-end))
-                     (point-at-eol)))
-               (point-at-eol))))
-
-    ;; once we pick good values for start/end of region, simply use
-    ;; `comment-or-uncomment-region' from `newcomment' lib, and skip
-    ;; to next line for convenience
-    (comment-or-uncomment-region start end)
-    (forward-line)))
-
-(defconst jade-keywords
-  (eval-when-compile
-    (regexp-opt
-     '("if" "else" "for" "in" "each" "case" "when" "default" "block" "extends"
-       "block append" "block prepend" "append" "prepend"
-       "include" "yield" "mixin") 'words))
-  "Jade keywords.")
-
-(defvar jade-tag-re "[a-z][a-z0-9]*"
-  "Regexp used to match a basic html tag, e.g. link, a, div")
-
-(defvar jade-id-re "#[a-zA-Z][0-9a-zA-Z_\\-]*"
-  "Regexp used to match an ID literal, e.g. #id, #id-one_23")
-
-(defvar jade-class-re "[.][a-zA-Z][0-9a-zA-Z_\\-]*"
-  "Regexp used to match a class literal, e.g. .class, .class_name-123")
-
-(defvar jade-double-quote-string-re "[\"]\\(\\\\.\\|[^\"\n]\\)*[\"]"
-  "Regexp used to match a double-quoted string literal")
-
-(defvar jade-single-quote-string-re "[']\\(\\\\.\\|[^'\n]\\)*[']"
-  "Regexp used to match a single-quoted string literal")
-
-(defvar jade-tag-declaration-char-re "[-a-zA-Z0-9_.#]"
-  "Regexp used to match a character in a tag declaration")
-
-(defvar jade-font-lock-keywords
-  `(
-    (,jade-keywords . font-lock-keyword-face) ;; keywords
-    ("#\\(\\w\\|_\\|-\\)*" . font-lock-variable-name-face) ;; id
-    ("\\(?:^[ {2,}]*\\(?:[a-z0-9_:\\-]*\\)\\)?\\(#[A-Za-z0-9\-\_]*[^ ]\\)" 1 font-lock-variable-name-face) ;; id
-    ("\\(?:^[ {2,}]*\\(?:[a-z0-9_:\\-]*\\)\\)?\\(\\.[A-Za-z0-9\-\_]*\\)" 1 font-lock-type-face) ;; class name
-    ("^[ \t]*\\([a-zA-Z0-9]+\\)" 1 font-lock-function-name-face) ;; tag name
-    ("^[ \t]*\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
-
-    ;; remove highlighting from literal content following tag/class/id
-    ;; e.g. tag Inner text
-    ;;      tag#id.class INNER text
-    (,(concat "^\\s-*"
-
-              ;; start with a basic html tag, an ID, or a class
-              "\\(" jade-tag-re "\\|" jade-id-re "\\|" jade-class-re "\\)"
-
-              ;; followed by zero or more of either an ID or a class
-              "\\(" jade-id-re "\\|" jade-class-re "\\)*"
-
-              ;; then an optional set of parens with JS inside
-              ;; TODO highlight JS in a meaningful way
-              "\\(" "(.*)" "\\)?"
-
-              ;; then a space (not an equals sign), and match the rest of the line
-              ;; and remove any font-lock faces applied
-              "[ ]\\(.+\\)") 4 nil t)
-
-    ;; remove highlighting from lines opening with a pipe `|'
-    ;; e.g. | keywords like for should not be highlighted here
-    ;;      | I'm not supposed to highlight single quotes either
-    (,(concat "^[ \t]*" "\\(" "|.*" "\\)") 1 nil t)
-
-    ;; we abuse font-lock a bit here; these functions inject js-mode
-    ;; highlighting under the guise of matching text for more standard
-    ;; font-lock face application (like we do with regexps above)
-    (jade-highlight-js-in-parens 1 font-lock-preprocessor-face)
-    (jade-highlight-js-after-tag 1 font-lock-preprocessor-face)
-
-    ;; doctype re-overrides some of the fontification rules
-    ("^!!!\\|doctype[ ]?.*" 0 font-lock-comment-face t)))
-
-(defun jade-highlight-js-in-parens (limit)
-  "Search for a tag declaration (up to LIMIT) which contains a paren
-block, then highlight the region between the parentheses as
-javascript."
-  (when (re-search-forward (concat "^[ \t]*" jade-tag-declaration-char-re "+" "(") limit t)
-    (forward-char -1)
-    (let ((start (point))
-          (end (progn
-                   (forward-sexp)
-                   (1- (point)))))
-          (jade-fontify-region-as-js start end))
-
-      ;; return some empty match data to appease the font-lock gods
-      (looking-at "\\(\\)")))
-
-(defun jade-highlight-js-after-tag (limit)
-  "Search for a valid js block, then highlight its contents with js-mode syntax highlighting"
-  (when (re-search-forward "^[ \t]*" limit t)
-    (when (not (eolp))
-
-      ;; before parsing/skipping ahead, check the first char; if it's
-      ;; - (not a comment starter!) or =, then we know it's a JS block
-      (if (or (looking-at "-[^/]") (looking-at "="))
-          (jade-fontify-region-as-js (point) (point-at-eol))
-
-        ;; no luck with the first char, so parse to the end of the tag
-        ;; (including optional paren block) and check for '='
-        (jade-goto-end-of-tag)
-        (if (and (looking-at "=") (not (eolp)))
-            (jade-fontify-region-as-js (point) (point-at-eol)))))
-
-    ;; return some empty match data to appease the font-lock gods
-    (looking-at "\\(\\)")))
-
-(defun jade-goto-end-of-tag ()
-  "Skip ahead over whitespace, tag characters (defined in
-`jade-tag-declaration-char-re'), and paren blocks (using
-`forward-sexp') to put point at the end of a full tag declaration (but
-before its content). Use when point is inside or to the left of a tag
-declaration"
-  (interactive)
-
-  ;; skip indentation characters
-  (while (looking-at "[ \t]")
-    (forward-char 1))
-
-  (while (looking-at jade-tag-declaration-char-re)
-    (forward-char 1))
-  (if (looking-at "(")
-      (forward-sexp 1)))
-
-
-(defvar jade-syntax-table
-  (let ((table (make-syntax-table)))
-    (modify-syntax-entry ?\" "\"" table)
-    (modify-syntax-entry ?\' "\"" table)
-    (modify-syntax-entry ?_ "w" table)
-    table)
-  "Syntax table for `jade-mode'.")
-
-(defun jade-region-for-sexp ()
-  "Selects the current sexp as the region"
-  (interactive)
-  (beginning-of-line)
-  (let ((ci (current-indentation)))
-    (push-mark nil nil t)
-    (while (> (jade-next-line-indentation) ci)
-      (forward-line)
-      (end-of-line))))
-
-(defun jade-indent ()
-  "Indent current region or line.
-Calls `jade-indent-region' with an active region or `jade-indent-line'
-without."
-  (interactive)
-  (if (region-active-p)
-      (jade-indent-region
-
-       ;; use beginning of line at region-beginning
-       (save-excursion
-         (goto-char (region-beginning))
-         (line-beginning-position))
-
-       ;; use end of line at region-end
-       (save-excursion
-         (goto-char (region-end))
-         (line-end-position)))
-    (jade-indent-line)))
-
-(defun jade-indent-line ()
-  "Indent current line of jade code.
-If the cursor is left of the current indentation, then the first call
-will simply jump to the current indent. Subsequent calls will indent
-the current line by `jade-tab-width' until current indentation is
-nested one tab-width deeper than its parent tag. At that point, an
-additional call will reset indentation to column 0."
-  (interactive)
-  (let ((left-of-indent (>= (current-column) (current-indentation)))
-        (indent (jade-calculate-indent-target)))
-    (if left-of-indent
-
-        ;; if cursor is at or beyond current indent, indent normally
-        (indent-line-to indent)
-
-      ;; if cursor is trailing current indent, first indentation should
-      ;; jump to the current indentation column (subsequent calls
-      ;; will indent normally)
-      (indent-line-to (current-indentation)))))
-
-(defun jade-indent-region (start end)
-  "Indent active region according to indentation of region's first
-line relative to its parent. Keep region active after command
-terminates (to facilitate subsequent indentations of the same region)"
-  (interactive "r")
-  (save-excursion
-
-    ;; go to start of region so we can find out its target indent
-    (goto-char start)
-
-    ;; keep region active after command
-    (let* ((deactivate-mark)
-
-           ;; find indent target for first line
-           (first-line-indent-target (jade-calculate-indent-target))
-
-           ;; use current-indentation to turn target indent into
-           ;; a relative indent to apply to each line in region
-           (first-line-relative-indent
-            (- first-line-indent-target (current-indentation))))
-
-      ;; apply relative indent
-      (indent-rigidly start end first-line-relative-indent))))
-
-(defun jade-calculate-indent-target ()
-  "Return the column to which the current line should be indented."
-  (let ((max-indent (+ (jade-previous-line-indentation) jade-tab-width)))
-    (if (>= (current-indentation) max-indent) ;; if at max indentation
-        0
-      (+ (current-indentation) jade-tab-width))))
-
-(defun jade-unindent ()
-  "Unindent active region or current line."
-  (interactive)
-  (if (region-active-p)
-      (jade-unindent-region
-
-       ;; use beginning of line at region-beginning
-       (save-excursion
-         (goto-char (region-beginning))
-         (line-beginning-position))
-
-       ;; use end of line at region-end
-       (save-excursion
-         (goto-char (region-end))
-         (line-end-position)))
-
-    ;; when no region is active
-    (jade-unindent-line)))
-
-(defun jade-unindent-line ()
-  "Unindent line under point by `jade-tab-width'.
-Calling when `current-indentation' is 0 will have no effect."
-  (indent-line-to
-   (max
-    (- (current-indentation) jade-tab-width)
-    0)))
-
-(defun jade-unindent-region (start end)
-  "Unindent active region by `jade-tab-width'.
-Follows indentation behavior of `indent-rigidly'."
-  (interactive "r")
-  (let (deactivate-mark)
-    (indent-rigidly start end (- jade-tab-width))))
-
-(defun jade-previous-line-indentation ()
-  "Get the indentation of the previous (non-blank) line (from point)."
-  (interactive)
-  (save-excursion
-
-    ;; move up to the nearest non-blank line (or buffer start)
-    (while (progn ;; progn used to get do...while control flow
-             (forward-line -1)
-             (and (jade-blank-line-p) (not (= (point-at-bol) (point-min))))))
-    (let ((prev-line-indent (current-indentation)))
-      prev-line-indent)))
-
-(defun jade-next-line-indentation ()
-  "Get the indentation of the next (non-blank) line (from point)."
-  (interactive)
-  (save-excursion
-
-    ;; move down to the next non-blank line (or buffer end)
-    (while (progn ;; progn used to get do...while control flow
-             (forward-line 1)
-             (and (jade-blank-line-p) (not (= (point-at-eol) (point-max))))))
-    (let ((next-line-indent (current-indentation)))
-      next-line-indent)))
-
-(defun jade-newline-and-indent ()
-  "Insert newline and indent to parent's indentation level."
-  (interactive)
-  (newline)
-  (indent-line-to (max (jade-previous-line-indentation) 0)))
-
-(defun jade-fontify-region-as-js (beg end)
-  "Fontify a region between BEG and END using js-mode fontification.
-Inspired by (read: stolen from) from `haml-mode'. Note the clever use
-of `narrow-to-region' by the author of `haml-mode' to keep syntactic
-highlighting (maybe other things too?) from looking beyond the
-region defined by BEG and END."
-  (save-excursion
-    (save-match-data
-      (let ((font-lock-keywords js--font-lock-keywords-3)
-            (font-lock-syntax-table js-mode-syntax-table)
-            (font-lock-syntactic-keywords nil)
-            (syntax-propertize-function nil)
-            (font-lock-multiline 'undecided)
-            (font-lock-dont-widen t)
-            font-lock-keywords-only
-            font-lock-extend-region-functions
-            font-lock-keywords-case-fold-search)
-        (when (and (fboundp 'js--update-quick-match-re) (null js--quick-match-re-func))
-          (js--update-quick-match-re))
-        (save-restriction
-          (narrow-to-region beg end)
-          (font-lock-fontify-region beg end))))))
-
-(defvar jade-mode-map (make-sparse-keymap))
-
-;; mode declaration
-;;;###autoload
-(define-derived-mode jade-mode fundamental-mode
-  "Jade"
-  "Major mode for editing jade node.js templates"
-  :syntax-table jade-syntax-table
-
-  ;; turn off electric indent mode for jade buffers (by default, at least)
-  (when (fboundp 'electric-indent-local-mode)
-    (electric-indent-local-mode 0))
-  (setq mode-name "Jade")
-  (setq major-mode 'jade-mode)
-
-  ;; comment syntax
-  (set (make-local-variable 'comment-start) "//- ")
-  (set (make-local-variable 'comment-start-skip) "//-\\s-*")
-
-  (set (make-local-variable 'jade-tab-width) 2)
-  (set (make-local-variable 'indent-line-function) 'jade-indent-line)
-  (set (make-local-variable 'indent-region-function) 'jade-indent-region)
-  (set (make-local-variable 'indent-tabs-mode) nil)
-
-  ;; keymap
-  (use-local-map jade-mode-map)
-
-  ;; modify the keymap
-  (define-key jade-mode-map [remap comment-dwim] 'jade-comment-dwim)
-  (define-key jade-mode-map [tab] 'jade-indent)
-  (define-key jade-mode-map [backtab] 'jade-unindent)
-  (define-key jade-mode-map (kbd "RET") 'jade-newline-and-indent)
-
-  ;; highlight keywords, ignore syntactic font-lock
-  (setq font-lock-defaults '(jade-font-lock-keywords t)))
-
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.jade\\'" . jade-mode))
-
-(provide 'jade-mode)
-;;; jade-mode.el ends here
diff --git a/emacs.d/elpa/jade-mode-20150801.944/jade-mode-autoloads.el b/emacs.d/elpa/jade-mode-20150801.944/jade-mode-autoloads.el
new file mode 100644
index 0000000..70a5ed9
--- /dev/null
+++ b/emacs.d/elpa/jade-mode-20150801.944/jade-mode-autoloads.el
@@ -0,0 +1,23 @@
+;;; jade-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "jade-mode" "jade-mode.el" (22171 46561 0 0))
+;;; Generated autoloads from jade-mode.el
+
+(autoload 'jade-mode "jade-mode" "\
+Major mode for editing jade node.js templates
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.jade\\'" . jade-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; jade-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/jade-mode-20150801.944/jade-mode-pkg.el b/emacs.d/elpa/jade-mode-20150801.944/jade-mode-pkg.el
new file mode 100644
index 0000000..7fe5067
--- /dev/null
+++ b/emacs.d/elpa/jade-mode-20150801.944/jade-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "jade-mode" "20150801.944" "Major mode for editing .jade files" 'nil :url "https://github.com/brianc/jade-mode")
diff --git a/emacs.d/elpa/jade-mode-20150801.944/jade-mode.el b/emacs.d/elpa/jade-mode-20150801.944/jade-mode.el
new file mode 100644
index 0000000..816db2e
--- /dev/null
+++ b/emacs.d/elpa/jade-mode-20150801.944/jade-mode.el
@@ -0,0 +1,399 @@
+;;; jade-mode.el --- Major mode for editing .jade files
+;;;
+;;; URL: https://github.com/brianc/jade-mode
+;; Package-Version: 20150801.944
+;;; Author: Brian M. Carlson and other contributors
+;;; inspired by http://xahlee.org/emacs/elisp_syntax_coloring.html
+(require 'font-lock)
+(require 'js)
+
+(defvar jade-tab-width)
+
+(defun jade-debug (string &rest args)
+  "Prints a debug message"
+  (apply 'message (append (list string) args)))
+
+(defmacro jade-line-as-string ()
+  "Returns the current line as a string."
+  `(buffer-substring-no-properties (point-at-bol) (point-at-eol)))
+
+(defun jade-empty-line-p ()
+  "If line is empty or not."
+  (= (point-at-eol) (point-at-bol)))
+
+(defun jade-blank-line-p ()
+  "Returns t when line contains only whitespace chars, nil otherwise."
+  (string-match-p "^\\s-*$" (jade-line-as-string)))
+
+(defun jade-comment-dwim (arg)
+  "Comment or uncomment current line or region in a smart way."
+  (interactive "*P")
+  (require 'newcomment)
+  (let ((start (if (region-active-p)
+
+                   ;; when region is active, use beginning of line at
+                   ;; beginning of region (this way we don't start
+                   ;; commenting in the middle of a line)
+                   (progn
+                     (save-excursion
+                       (goto-char (region-beginning))
+                       (point-at-bol)))
+
+                 ;; without a region, just use beginning of current line
+                 (point-at-bol)))
+
+        ;; same logic applies for end of line/region
+        (end (if (region-active-p)
+                 (progn
+                   (save-excursion
+                     (goto-char (region-end))
+                     (point-at-eol)))
+               (point-at-eol))))
+
+    ;; once we pick good values for start/end of region, simply use
+    ;; `comment-or-uncomment-region' from `newcomment' lib, and skip
+    ;; to next line for convenience
+    (comment-or-uncomment-region start end)
+    (forward-line)))
+
+(defconst jade-keywords
+  (eval-when-compile
+    (regexp-opt
+     '("if" "else" "for" "in" "each" "case" "when" "default" "block" "extends"
+       "block append" "block prepend" "append" "prepend"
+       "include" "yield" "mixin") 'words))
+  "Jade keywords.")
+
+(defvar jade-tag-re "[a-z][a-z0-9]*"
+  "Regexp used to match a basic html tag, e.g. link, a, div")
+
+(defvar jade-id-re "#[a-zA-Z][0-9a-zA-Z_\\-]*"
+  "Regexp used to match an ID literal, e.g. #id, #id-one_23")
+
+(defvar jade-class-re "[.][a-zA-Z][0-9a-zA-Z_\\-]*"
+  "Regexp used to match a class literal, e.g. .class, .class_name-123")
+
+(defvar jade-mixin-re "[+][a-zA-Z][0-9a-zA-Z_\\-]*"
+  "Regexp used to match a mixin name")
+
+(defvar jade-double-quote-string-re "[\"]\\(\\\\.\\|[^\"\n]\\)*[\"]"
+  "Regexp used to match a double-quoted string literal")
+
+(defvar jade-single-quote-string-re "[']\\(\\\\.\\|[^'\n]\\)*[']"
+  "Regexp used to match a single-quoted string literal")
+
+(defvar jade-tag-declaration-char-re "[-a-zA-Z0-9_.#+]"
+  "Regexp used to match a character in a tag declaration")
+
+(defvar jade-font-lock-keywords
+  `(
+    (,jade-keywords . font-lock-keyword-face) ;; keywords
+    (,jade-id-re . font-lock-variable-name-face) ;; id
+    (,jade-class-re . font-lock-type-face) ;; class name
+    (,jade-tag-re . font-lock-function-name-face)
+    (,jade-mixin-re 0 font-lock-constant-face t)
+    ("\\(-?//.*\\)" 1 font-lock-comment-face t) ;; jade block comments
+    ;; tag name
+
+    ;; remove highlighting from literal content following tag/class/id
+    ;; e.g. tag Inner text
+    ;;      tag#id.class INNER text
+    (,(concat "^\\s-*"
+
+              ;; start with a basic html tag, an ID, or a class
+              "\\(" jade-tag-re "\\|" jade-id-re "\\|" jade-class-re "\\)"
+
+              ;; followed by zero or more of either an ID or a class
+              "\\(" jade-id-re "\\|" jade-class-re "\\)*"
+
+              ;; then an optional set of parens with JS inside
+              ;; TODO highlight JS in a meaningful way
+              "\\(" "(.*)" "\\)?"
+
+              ;; then a space (not an equals sign), and match the rest of the line
+              ;; and remove any font-lock faces applied
+              "[ ]\\(.+\\)") 4 nil t)
+
+    ;; remove highlighting from lines opening with a pipe `|'
+    ;; e.g. | keywords like for should not be highlighted here
+    ;;      | I'm not supposed to highlight single quotes either
+    (,(concat "^[ \t]*" "\\(" "|.*" "\\)") 1 nil t)
+
+    ;; we abuse font-lock a bit here; these functions inject js-mode
+    ;; highlighting under the guise of matching text for more standard
+    ;; font-lock face application (like we do with regexps above)
+    (jade-highlight-js-in-parens 1 font-lock-preprocessor-face)
+    (jade-highlight-js-after-tag 1 font-lock-preprocessor-face)
+
+    ;; doctype re-overrides some of the fontification rules
+    ("^!!!\\|doctype[ ]?.*" 0 font-lock-comment-face t)))
+
+(defun jade-highlight-js-in-parens (limit)
+  "Search for a tag declaration (up to LIMIT) which contains a paren
+block, then highlight the region between the parentheses as
+javascript."
+  (when (re-search-forward (concat "^[ \t]*" jade-tag-declaration-char-re "+" "(") limit t)
+    (forward-char -1)
+    (let ((start (point))
+          (end (progn
+                   (forward-sexp)
+                   (1- (point)))))
+          (jade-fontify-region-as-js start end))
+
+      ;; return some empty match data to appease the font-lock gods
+      (looking-at "\\(\\)")))
+
+(defun jade-highlight-js-after-tag (limit)
+  "Search for a valid js block, then highlight its contents with js-mode syntax highlighting"
+  (when (re-search-forward "^[ \t]*" limit t)
+    (when (not (eolp))
+
+      ;; before parsing/skipping ahead, check the first char; if it's
+      ;; - (not a comment starter!) or =, then we know it's a JS block
+      (if (or (looking-at "-[^/]") (looking-at "="))
+          (jade-fontify-region-as-js (point) (point-at-eol))
+
+        ;; no luck with the first char, so parse to the end of the tag
+        ;; (including optional paren block) and check for '='
+        (jade-goto-end-of-tag)
+        (if (and (looking-at "=") (not (eolp)))
+            (jade-fontify-region-as-js (point) (point-at-eol)))))
+
+    ;; return some empty match data to appease the font-lock gods
+    (looking-at "\\(\\)")))
+
+(defun jade-goto-end-of-tag ()
+  "Skip ahead over whitespace, tag characters (defined in
+`jade-tag-declaration-char-re'), and paren blocks (using
+`forward-sexp') to put point at the end of a full tag declaration (but
+before its content). Use when point is inside or to the left of a tag
+declaration"
+  (interactive)
+
+  ;; skip indentation characters
+  (while (looking-at "[ \t]")
+    (forward-char 1))
+
+  (while (looking-at jade-tag-declaration-char-re)
+    (forward-char 1))
+  (if (looking-at "(")
+      (forward-sexp 1)))
+
+
+(defvar jade-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?\" "\"" table)
+    (modify-syntax-entry ?\' "\"" table)
+    (modify-syntax-entry ?_ "w" table)
+    table)
+  "Syntax table for `jade-mode'.")
+
+(defun jade-region-for-sexp ()
+  "Selects the current sexp as the region"
+  (interactive)
+  (beginning-of-line)
+  (let ((ci (current-indentation)))
+    (push-mark nil nil t)
+    (while (> (jade-next-line-indentation) ci)
+      (forward-line)
+      (end-of-line))))
+
+(defun jade-indent ()
+  "Indent current region or line.
+Calls `jade-indent-region' with an active region or `jade-indent-line'
+without."
+  (interactive)
+  (if (region-active-p)
+      (jade-indent-region
+
+       ;; use beginning of line at region-beginning
+       (save-excursion
+         (goto-char (region-beginning))
+         (line-beginning-position))
+
+       ;; use end of line at region-end
+       (save-excursion
+         (goto-char (region-end))
+         (line-end-position)))
+    (jade-indent-line)))
+
+(defun jade-indent-line ()
+  "Indent current line of jade code.
+If the cursor is left of the current indentation, then the first call
+will simply jump to the current indent. Subsequent calls will indent
+the current line by `jade-tab-width' until current indentation is
+nested one tab-width deeper than its parent tag. At that point, an
+additional call will reset indentation to column 0."
+  (interactive)
+  (let ((left-of-indent (>= (current-column) (current-indentation)))
+        (indent (jade-calculate-indent-target)))
+    (if left-of-indent
+
+        ;; if cursor is at or beyond current indent, indent normally
+        (indent-line-to indent)
+
+      ;; if cursor is trailing current indent, first indentation should
+      ;; jump to the current indentation column (subsequent calls
+      ;; will indent normally)
+      (indent-line-to (current-indentation)))))
+
+(defun jade-indent-region (start end)
+  "Indent active region according to indentation of region's first
+line relative to its parent. Keep region active after command
+terminates (to facilitate subsequent indentations of the same region)"
+  (interactive "r")
+  (save-excursion
+
+    ;; go to start of region so we can find out its target indent
+    (goto-char start)
+
+    ;; keep region active after command
+    (let* ((deactivate-mark)
+
+           ;; find indent target for first line
+           (first-line-indent-target (jade-calculate-indent-target))
+
+           ;; use current-indentation to turn target indent into
+           ;; a relative indent to apply to each line in region
+           (first-line-relative-indent
+            (- first-line-indent-target (current-indentation))))
+
+      ;; apply relative indent
+      (indent-rigidly start end first-line-relative-indent))))
+
+(defun jade-calculate-indent-target ()
+  "Return the column to which the current line should be indented."
+  (let ((max-indent (+ (jade-previous-line-indentation) jade-tab-width)))
+    (if (>= (current-indentation) max-indent) ;; if at max indentation
+        0
+      (+ (current-indentation) jade-tab-width))))
+
+(defun jade-unindent ()
+  "Unindent active region or current line."
+  (interactive)
+  (if (region-active-p)
+      (jade-unindent-region
+
+       ;; use beginning of line at region-beginning
+       (save-excursion
+         (goto-char (region-beginning))
+         (line-beginning-position))
+
+       ;; use end of line at region-end
+       (save-excursion
+         (goto-char (region-end))
+         (line-end-position)))
+
+    ;; when no region is active
+    (jade-unindent-line)))
+
+(defun jade-unindent-line ()
+  "Unindent line under point by `jade-tab-width'.
+Calling when `current-indentation' is 0 will have no effect."
+  (indent-line-to
+   (max
+    (- (current-indentation) jade-tab-width)
+    0)))
+
+(defun jade-unindent-region (start end)
+  "Unindent active region by `jade-tab-width'.
+Follows indentation behavior of `indent-rigidly'."
+  (interactive "r")
+  (let (deactivate-mark)
+    (indent-rigidly start end (- jade-tab-width))))
+
+(defun jade-previous-line-indentation ()
+  "Get the indentation of the previous (non-blank) line (from point)."
+  (interactive)
+  (save-excursion
+
+    ;; move up to the nearest non-blank line (or buffer start)
+    (while (progn ;; progn used to get do...while control flow
+             (forward-line -1)
+             (and (jade-blank-line-p) (not (= (point-at-bol) (point-min))))))
+    (let ((prev-line-indent (current-indentation)))
+      prev-line-indent)))
+
+(defun jade-next-line-indentation ()
+  "Get the indentation of the next (non-blank) line (from point)."
+  (interactive)
+  (save-excursion
+
+    ;; move down to the next non-blank line (or buffer end)
+    (while (progn ;; progn used to get do...while control flow
+             (forward-line 1)
+             (and (jade-blank-line-p) (not (= (point-at-eol) (point-max))))))
+    (let ((next-line-indent (current-indentation)))
+      next-line-indent)))
+
+(defun jade-newline-and-indent ()
+  "Insert newline and indent to parent's indentation level."
+  (interactive)
+  (newline)
+  (indent-line-to (max (jade-previous-line-indentation) 0)))
+
+(defun jade-fontify-region-as-js (beg end)
+  "Fontify a region between BEG and END using js-mode fontification.
+Inspired by (read: stolen from) from `haml-mode'. Note the clever use
+of `narrow-to-region' by the author of `haml-mode' to keep syntactic
+highlighting (maybe other things too?) from looking beyond the
+region defined by BEG and END."
+  (save-excursion
+    (save-match-data
+      (let ((font-lock-keywords js--font-lock-keywords-3)
+            (font-lock-syntax-table js-mode-syntax-table)
+            (font-lock-syntactic-keywords nil)
+            (syntax-propertize-function nil)
+            (font-lock-multiline 'undecided)
+            (font-lock-dont-widen t)
+            font-lock-keywords-only
+            font-lock-extend-region-functions
+            font-lock-keywords-case-fold-search)
+        (when (and (fboundp 'js--update-quick-match-re) (null js--quick-match-re-func))
+          (js--update-quick-match-re))
+        (save-restriction
+          (narrow-to-region beg end)
+          (font-lock-fontify-region beg end))))))
+
+(defvar jade-mode-map (make-sparse-keymap))
+
+;; mode declaration
+;;;###autoload
+(define-derived-mode jade-mode fundamental-mode
+  "Jade"
+  "Major mode for editing jade node.js templates"
+  :syntax-table jade-syntax-table
+
+  ;; turn off electric indent mode for jade buffers (by default, at least)
+  (when (fboundp 'electric-indent-local-mode)
+    (electric-indent-local-mode 0))
+  (setq mode-name "Jade")
+  (setq major-mode 'jade-mode)
+
+  ;; comment syntax
+  (set (make-local-variable 'comment-start) "//- ")
+  (set (make-local-variable 'comment-start-skip) "//-\\s-*")
+
+  (set (make-local-variable 'jade-tab-width) 2)
+  (set (make-local-variable 'indent-line-function) 'jade-indent-line)
+  (set (make-local-variable 'indent-region-function) 'jade-indent-region)
+  (set (make-local-variable 'indent-tabs-mode) nil)
+
+  ;; keymap
+  (use-local-map jade-mode-map)
+
+  ;; modify the keymap
+  (define-key jade-mode-map [remap comment-dwim] 'jade-comment-dwim)
+  (define-key jade-mode-map [tab] 'jade-indent)
+  (define-key jade-mode-map [backtab] 'jade-unindent)
+  (define-key jade-mode-map (kbd "RET") 'jade-newline-and-indent)
+
+  ;; highlight keywords, ignore syntactic font-lock
+  (setq font-lock-defaults '(jade-font-lock-keywords t)))
+
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.jade\\'" . jade-mode))
+
+(provide 'jade-mode)
+;;; jade-mode.el ends here
diff --git a/emacs.d/elpa/jedi-20150623.2335/jedi-autoloads.el b/emacs.d/elpa/jedi-20150623.2335/jedi-autoloads.el
deleted file mode 100644
index a402988..0000000
--- a/emacs.d/elpa/jedi-20150623.2335/jedi-autoloads.el
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; jedi-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "jedi" "jedi.el" (21898 47974 0 0))
-;;; Generated autoloads from jedi.el
-
-(autoload 'jedi:ac-setup "jedi" "\
-Add Jedi AC sources to `ac-sources'.
-
-If auto-completion is all you need, you can call this function instead
-of `jedi:setup', like this::
-
-   (add-hook 'python-mode-hook 'jedi:ac-setup)
-
-Note that this function calls `auto-complete-mode' if it is not
-already enabled, for people who don't call `global-auto-complete-mode'
-in their Emacs configuration.
-
-\(fn)" t nil)
-
-(autoload 'jedi:complete "jedi" "\
-Complete code at point.
-
-\(fn &key (expand ac-expand-on-auto-complete))" t nil)
-
-(autoload 'jedi:auto-complete-mode "jedi" "\
-
-
-\(fn)" nil nil)
-
-(setq jedi:setup-function #'jedi:ac-setup jedi:mode-function #'jedi:auto-complete-mode)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; jedi-autoloads.el ends here
diff --git a/emacs.d/elpa/jedi-20150623.2335/jedi-pkg.el b/emacs.d/elpa/jedi-20150623.2335/jedi-pkg.el
deleted file mode 100644
index b296f88..0000000
--- a/emacs.d/elpa/jedi-20150623.2335/jedi-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "jedi" "20150623.2335" "a Python auto-completion for Emacs" '((emacs "24") (jedi-core "0.2.2") (auto-complete "1.4")))
diff --git a/emacs.d/elpa/jedi-20150623.2335/jedi.el b/emacs.d/elpa/jedi-20150623.2335/jedi.el
deleted file mode 100644
index 3ca2a28..0000000
--- a/emacs.d/elpa/jedi-20150623.2335/jedi.el
+++ /dev/null
@@ -1,113 +0,0 @@
-;;; jedi.el --- a Python auto-completion for Emacs -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2015 Takafumi Arakaki
-
-;; Author: Takafumi Arakaki <aka.tkf at gmail.com>
-;; Package-Requires: ((emacs "24") (jedi-core "0.2.2") (auto-complete "1.4"))
-;; Version: 0.2.5
-;; Package-Version: 20150623.2335
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'auto-complete)
-(require 'jedi-core)
-
-;;; AC source
-(defun jedi:ac-direct-matches ()
-  (mapcar
-   (lambda (x)
-     (destructuring-bind (&key word doc description symbol)
-         x
-       (popup-make-item word
-                        :symbol symbol
-                        :document (unless (equal doc "") doc)
-                        :summary description)))
-   jedi:complete-reply))
-
-;;;###autoload
-(defun jedi:ac-setup ()
-  "Add Jedi AC sources to `ac-sources'.
-
-If auto-completion is all you need, you can call this function instead
-of `jedi:setup', like this::
-
-   (add-hook 'python-mode-hook 'jedi:ac-setup)
-
-Note that this function calls `auto-complete-mode' if it is not
-already enabled, for people who don't call `global-auto-complete-mode'
-in their Emacs configuration."
-  (interactive)
-  (add-to-list 'ac-sources 'ac-source-jedi-direct)
-  (unless auto-complete-mode
-    (auto-complete-mode)))
-
-(defun jedi:ac-direct-prefix ()
-  (or (ac-prefix-default)
-      (when (= jedi:complete-request-point (point))
-        jedi:complete-request-point)))
-
-(defun jedi:after-change-handler (&rest _)
-  (unless (or (ac-menu-live-p) (ac-inline-live-p))
-    (jedi:defined-names--singleton-deferred)))
-
-;; (makunbound 'ac-source-jedi-direct)
-(ac-define-source jedi-direct
-  '((candidates . jedi:ac-direct-matches)
-    (prefix . jedi:ac-direct-prefix)
-    (init . jedi:complete-request)
-    (requires . -1)))
-
-;;;###autoload
-(cl-defun jedi:complete (&key (expand ac-expand-on-auto-complete))
-  "Complete code at point."
-  (interactive)
-  (deferred:nextc (jedi:complete-request)
-    (lambda ()
-      (let ((ac-expand-on-auto-complete expand))
-        (ac-start :triggered 'command)))))
-;; Calling `auto-complete' or `ac-update-greedy' instead of `ac-start'
-;; here did not work.
-
-(defun jedi:dot-complete (nchars)
-  "Insert dot and complete code at point."
-  (interactive "p")
-  (self-insert-command nchars)
-  (unless (or (/= nchars 1) ;; don't complete if inserted 2+ dots
-              (ac-cursor-on-diable-face-p)
-              ;; don't complete if the dot is immediately after int literal
-              (looking-back "\\(\\`\\|[^._[:alnum:]]\\)[0-9]+\\."))
-    (jedi:complete :expand nil)))
-
-;;;###autoload
-(defun jedi:auto-complete-mode ()
-  (let ((map jedi-mode-map))
-    (if jedi:complete-on-dot
-        (define-key map "." 'jedi:dot-complete)
-      (define-key map "." nil)))
-  (when jedi:install-imenu
-    (if jedi-mode
-        (add-hook 'after-change-functions 'jedi:after-change-handler nil t)
-      (remove-hook 'after-change-functions 'jedi:after-change-handler t))))
-
-;;;###autoload
-(setq jedi:setup-function #'jedi:ac-setup
-      jedi:mode-function #'jedi:auto-complete-mode)
-
-(provide 'jedi)
-;;; jedi.el ends here
diff --git a/emacs.d/elpa/jedi-20151214.705/jedi-autoloads.el b/emacs.d/elpa/jedi-20151214.705/jedi-autoloads.el
new file mode 100644
index 0000000..1197073
--- /dev/null
+++ b/emacs.d/elpa/jedi-20151214.705/jedi-autoloads.el
@@ -0,0 +1,42 @@
+;;; jedi-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "jedi" "jedi.el" (22171 46561 0 0))
+;;; Generated autoloads from jedi.el
+
+(autoload 'jedi:ac-setup "jedi" "\
+Add Jedi AC sources to `ac-sources'.
+
+If auto-completion is all you need, you can call this function instead
+of `jedi:setup', like this::
+
+   (add-hook 'python-mode-hook 'jedi:ac-setup)
+
+Note that this function calls `auto-complete-mode' if it is not
+already enabled, for people who don't call `global-auto-complete-mode'
+in their Emacs configuration.
+
+\(fn)" t nil)
+
+(autoload 'jedi:complete "jedi" "\
+Complete code at point.
+
+\(fn &key (expand ac-expand-on-auto-complete))" t nil)
+
+(autoload 'jedi:auto-complete-mode "jedi" "\
+
+
+\(fn)" nil nil)
+
+(setq jedi:setup-function #'jedi:ac-setup jedi:mode-function #'jedi:auto-complete-mode)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; jedi-autoloads.el ends here
diff --git a/emacs.d/elpa/jedi-20151214.705/jedi-pkg.el b/emacs.d/elpa/jedi-20151214.705/jedi-pkg.el
new file mode 100644
index 0000000..b4a922d
--- /dev/null
+++ b/emacs.d/elpa/jedi-20151214.705/jedi-pkg.el
@@ -0,0 +1 @@
+(define-package "jedi" "20151214.705" "a Python auto-completion for Emacs" '((emacs "24") (jedi-core "0.2.2") (auto-complete "1.4")))
diff --git a/emacs.d/elpa/jedi-20151214.705/jedi.el b/emacs.d/elpa/jedi-20151214.705/jedi.el
new file mode 100644
index 0000000..54a9114
--- /dev/null
+++ b/emacs.d/elpa/jedi-20151214.705/jedi.el
@@ -0,0 +1,113 @@
+;;; jedi.el --- a Python auto-completion for Emacs -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015 Takafumi Arakaki
+
+;; Author: Takafumi Arakaki <aka.tkf at gmail.com>
+;; Package-Requires: ((emacs "24") (jedi-core "0.2.2") (auto-complete "1.4"))
+;; Version: 0.2.7
+;; Package-Version: 20151214.705
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'auto-complete)
+(require 'jedi-core)
+
+;;; AC source
+(defun jedi:ac-direct-matches ()
+  (mapcar
+   (lambda (x)
+     (destructuring-bind (&key word doc description symbol)
+         x
+       (popup-make-item word
+                        :symbol symbol
+                        :document (unless (equal doc "") doc)
+                        :summary description)))
+   jedi:complete-reply))
+
+;;;###autoload
+(defun jedi:ac-setup ()
+  "Add Jedi AC sources to `ac-sources'.
+
+If auto-completion is all you need, you can call this function instead
+of `jedi:setup', like this::
+
+   (add-hook 'python-mode-hook 'jedi:ac-setup)
+
+Note that this function calls `auto-complete-mode' if it is not
+already enabled, for people who don't call `global-auto-complete-mode'
+in their Emacs configuration."
+  (interactive)
+  (add-to-list 'ac-sources 'ac-source-jedi-direct)
+  (unless auto-complete-mode
+    (auto-complete-mode)))
+
+(defun jedi:ac-direct-prefix ()
+  (or (ac-prefix-default)
+      (when (= jedi:complete-request-point (point))
+        jedi:complete-request-point)))
+
+(defun jedi:after-change-handler (&rest _)
+  (unless (or (ac-menu-live-p) (ac-inline-live-p))
+    (jedi:defined-names--singleton-deferred)))
+
+;; (makunbound 'ac-source-jedi-direct)
+(ac-define-source jedi-direct
+  '((candidates . jedi:ac-direct-matches)
+    (prefix . jedi:ac-direct-prefix)
+    (init . jedi:complete-request)
+    (requires . -1)))
+
+;;;###autoload
+(cl-defun jedi:complete (&key (expand ac-expand-on-auto-complete))
+  "Complete code at point."
+  (interactive)
+  (deferred:nextc (jedi:complete-request)
+    (lambda ()
+      (let ((ac-expand-on-auto-complete expand))
+        (ac-start :triggered 'command)))))
+;; Calling `auto-complete' or `ac-update-greedy' instead of `ac-start'
+;; here did not work.
+
+(defun jedi:dot-complete (nchars)
+  "Insert dot and complete code at point."
+  (interactive "p")
+  (self-insert-command nchars)
+  (unless (or (/= nchars 1) ;; don't complete if inserted 2+ dots
+              (ac-cursor-on-diable-face-p)
+              ;; don't complete if the dot is immediately after int literal
+              (looking-back "\\(\\`\\|[^._[:alnum:]]\\)[0-9]+\\."))
+    (jedi:complete :expand nil)))
+
+;;;###autoload
+(defun jedi:auto-complete-mode ()
+  (let ((map jedi-mode-map))
+    (if jedi:complete-on-dot
+        (define-key map "." 'jedi:dot-complete)
+      (define-key map "." nil)))
+  (when jedi:install-imenu
+    (if jedi-mode
+        (add-hook 'after-change-functions 'jedi:after-change-handler nil t)
+      (remove-hook 'after-change-functions 'jedi:after-change-handler t))))
+
+;;;###autoload
+(setq jedi:setup-function #'jedi:ac-setup
+      jedi:mode-function #'jedi:auto-complete-mode)
+
+(provide 'jedi)
+;;; jedi.el ends here
diff --git a/emacs.d/elpa/jedi-core-20150623.2335/jedi-core-autoloads.el b/emacs.d/elpa/jedi-core-20150623.2335/jedi-core-autoloads.el
deleted file mode 100644
index ab850f2..0000000
--- a/emacs.d/elpa/jedi-core-20150623.2335/jedi-core-autoloads.el
+++ /dev/null
@@ -1,107 +0,0 @@
-;;; jedi-core-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "jedi-core" "jedi-core.el" (21898 47973 0 0))
-;;; Generated autoloads from jedi-core.el
-
-(autoload 'jedi:start-dedicated-server "jedi-core" "\
-Start Jedi server dedicated to this buffer.
-This is useful, for example, when you want to use different
-`sys.path' for some buffer.  When invoked as an interactive
-command, it asks you how to start the Jedi server.  You can edit
-the command in minibuffer to specify the way Jedi server run.
-
-If you want to setup how Jedi server is started programmatically
-per-buffer/per-project basis, make `jedi:server-command' and
-`jedi:server-args' buffer local and set it in `python-mode-hook'.
-See also: `jedi:server-args'.
-
-\(fn COMMAND)" t nil)
-
-(autoload 'helm-jedi-related-names "jedi-core" "\
-Find related names of the object at point using `helm' interface.
-
-\(fn)" t nil)
-
-(autoload 'anything-jedi-related-names "jedi-core" "\
-Find related names of the object at point using `anything' interface.
-
-\(fn)" t nil)
-
-(autoload 'jedi:setup "jedi-core" "\
-Fully setup jedi.el for current buffer.
-It setups `ac-sources' or `company-backends' and turns
-`jedi-mode' on.
-
-This function is intended to be called from `python-mode-hook',
-like this::
-
-       (add-hook 'python-mode-hook 'jedi:setup)
-
-You can also call this function as a command, to quickly test
-what jedi can do.
-
-\(fn)" t nil)
-
-(autoload 'jedi:install-server "jedi-core" "\
-This command installs Jedi server script jediepcserver.py in a
-Python environment dedicated to Emacs.  By default, the
-environment is at ``~/.emacs.d/.python-environments/default/``.
-This environment is automatically created by ``virtualenv`` if it
-does not exist.
-
-Run this command (i.e., type ``M-x jedi:install-server RET``)
-whenever Jedi.el shows a message to do so.  It is a good idea to
-run this every time after you update Jedi.el to sync version of
-Python modules used by Jedi.el and Jedi.el itself.
-
-You can modify the location of the environment by changing
-`jedi:environment-root' and/or `python-environment-directory'.  More
-specifically, Jedi.el will install Python modules under the directory
-``PYTHON-ENVIRONMENT-DIRECTORY/JEDI:ENVIRONMENT-ROOT``.  Note that you
-need command line program ``virtualenv``.  If you have the command in
-an unusual location, use `python-environment-virtualenv' to specify the
-location.
-
-.. NOTE:: jediepcserver.py is installed in a virtual environment but it
-   does not mean Jedi.el cannot recognize the modules in virtual
-   environment you are using for your Python development.  Jedi
-   EPC server recognize the virtualenv it is in (i.e., the
-   environment variable ``VIRTUAL_ENV`` in your Emacs) and then
-   add modules in that environment to its ``sys.path``.  You can
-   also add ``--virtual-env PATH/TO/ENV`` to `jedi:server-args'
-   to include modules of virtual environment even you launch
-   Emacs outside of the virtual environment.
-
-.. NOTE:: It is highly recommended to use this command to install
-   Python modules for Jedi.el.  You still can install Python
-   modules used by Jedi.el manually.  However, you are then
-   responsible for keeping Jedi.el and Python modules compatible.
-
-See also:
-
-- https://github.com/tkf/emacs-jedi/pull/72
-- https://github.com/tkf/emacs-jedi/issues/140#issuecomment-37358527
-
-\(fn)" t nil)
-
-(autoload 'jedi:install-server-block "jedi-core" "\
-Blocking version `jedi:install-server'.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("jedi-core-pkg.el") (21898 47973 718570
-;;;;;;  0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; jedi-core-autoloads.el ends here
diff --git a/emacs.d/elpa/jedi-core-20150623.2335/jedi-core-pkg.el b/emacs.d/elpa/jedi-core-20150623.2335/jedi-core-pkg.el
deleted file mode 100644
index d529f3f..0000000
--- a/emacs.d/elpa/jedi-core-20150623.2335/jedi-core-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-(define-package "jedi-core" "20150623.2335" "Common code of jedi.el and company-jedi.el"
-  '((emacs "24")
-    (epc "0.1.0")
-    (python-environment "0.0.2")
-    (cl-lib "0.5")))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/jedi-core-20150623.2335/jedi-core.el b/emacs.d/elpa/jedi-core-20150623.2335/jedi-core.el
deleted file mode 100644
index 12851fd..0000000
--- a/emacs.d/elpa/jedi-core-20150623.2335/jedi-core.el
+++ /dev/null
@@ -1,1283 +0,0 @@
-;;; jedi-core.el --- Common code of jedi.el and company-jedi.el -*- lexical-binding: t; -*-
-
-;; Author: Takafumi Arakaki <aka.tkf at gmail.com>
-;; Package-Requires: ((emacs "24") (epc "0.1.0") (python-environment "0.0.2") (cl-lib "0.5"))
-;; Version: 0.2.5
-
-;; This file is NOT part of GNU Emacs.
-
-;; jedi.el 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.
-
-;; jedi.el 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 jedi.el.
-;; If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'ring)
-
-(require 'epc)
-(require 'python-environment)
-
-(declare-function popup-tip "popup")
-(declare-function pos-tip-show "pos-tip")
-
-
-(defgroup jedi nil
-  "Auto-completion for Python."
-  :group 'completion
-  :prefix "jedi:")
-
-(defconst jedi:version "0.2.5")
-
-(defvar jedi:source-dir (if load-file-name
-                            (file-name-directory load-file-name)
-                          default-directory))
-
-(defvar jedi:epc nil)
-(make-variable-buffer-local 'jedi:epc)
-
-(defvar jedi:server-script
-  (convert-standard-filename
-   (expand-file-name "jediepcserver.py" jedi:source-dir))
-  "Full path to Jedi server script file ``jediepcserver.py``.")
-
-(defvar jedi:setup-function nil)
-(defvar jedi:mode-function nil)
-
-
-;;; Configuration variables
-
-(defcustom jedi:environment-root nil
-  "Name of Python environment to use.
-If it is nil, `python-environment-default-root-name' is used.
-
-You can specify a full path instead of a name (relative path).
-In that case, `python-environment-directory' is ignored and
-Python virtual environment is created at the specified path."
-  :group 'jedi)
-
-(defcustom jedi:environment-virtualenv nil
-  "``virtualenv`` command to use.  A list of string.
-If it is nil, `python-environment-virtualenv' is used instead.
-
-You must set non-`nil' value to `jedi:environment-root' in order
-to make this setting work."
-  :group 'jedi)
-
-(defun jedi:-env-server-command ()
-  (let* ((getbin (lambda (x) (python-environment-bin x jedi:environment-root)))
-         (script (or (funcall getbin "jediepcserver")
-                     (funcall getbin "jediepcserver.py"))))
-    (when script
-      (list script))))
-
-(defcustom jedi:server-command
-  (or (jedi:-env-server-command)
-      (list "python" jedi:server-script))
-  "Command used to run Jedi server.
-
-.. NOTE::
-
-   If you used `jedi:install-server' (recommended) to install
-   Python server jediepcserver.py, you don't need to mess around
-   with jediepcserver.py.  Jedi.el handles everything
-   automatically.
-
-If you install Python server jediepcserver.py using
-`jedi:install-server' command, `jedi:server-command' should be
-automatically set to::
-
-    '(\"~/.emacs.d/.python-environments/default/bin/jediepcserver.py\")
-
-Otherwise, it is set to::
-
-    '(\"python\" \"JEDI:SOURCE-DIR/jediepcserver.py\")
-
-.. NOTE:: If you installed jediepcserver.py manually, then you
-   have to set `jedi:server-command' appropriately.
-
-   If you can run ``jediepcserver.py --help`` in your shell, then
-   you can simply set::
-
-       (setq jedi:server-command '(\"jediepcserver.py\"))
-
-   Otherwise, you need to find where you installed
-   jediepcserver.py then set the path directly::
-
-       (setq jedi:server-command '(\"PATH/TO/jediepcserver.py\"))
-
-If you want to use a specific version of Python, setup
-`jedi:environment-virtualenv' variable appropriately and
-reinstall jediepcserver.py.
-
-If you want to pass some arguments to the Jedi server command,
-use `jedi:server-args' instead of appending them
-`jedi:server-command'."
-  :group 'jedi)
-
-(defcustom jedi:server-args nil
-  "Command line arguments to be appended to `jedi:server-command'.
-
-If you want to add some special `sys.path' when starting Jedi
-server, do something like this::
-
-    (setq jedi:server-args
-          '(\"--sys-path\" \"MY/SPECIAL/PATH\"
-            \"--sys-path\" \"MY/OTHER/SPECIAL/PATH\"))
-
-If you want to include some virtualenv, do something like the
-following.  Note that actual environment variable ``VIRTUAL_ENV``
-is treated automatically so you don't need to pass it.  Also,
-you need to start Jedi EPC server with the same python version
-that you use for the virtualenv.::
-
-    (setq jedi:server-args
-          '(\"--virtual-env\" \"SOME/VIRTUAL_ENV_1\"
-            \"--virtual-env\" \"SOME/VIRTUAL_ENV_2\"))
-
-To see what other arguments Jedi server can take, execute the
-following command::
-
-    python jediepcserver.py --help
-
-
-**Advanced usage**
-
-Sometimes you want to configure how Jedi server is started per
-buffer.  To do that, you should make this variable buffer local
-in `python-mode-hook' and set it to some buffer specific variable,
-like this::
-
-  (defun my-jedi-server-setup ()
-    (let ((cmds (GET-SOME-PROJECT-SPECIFIC-COMMAND))
-          (args (GET-SOME-PROJECT-SPECIFIC-ARGS)))
-      (when cmds (set (make-local-variable 'jedi:server-command) cmds))
-      (when args (set (make-local-variable 'jedi:server-args) args))))
-
-  (add-hook 'python-mode-hook 'my-jedi-server-setup)
-
-Note that Jedi server run by the same command is pooled.  So,
-there is only one Jedi server for the same set of command.  If
-you want to check how many EPC servers are running, use the EPC
-GUI: M-x `epc:controller'.  You will see a table of EPC connections
-for Jedi.el and other EPC applications.
-
-If you want to start a new ad-hoc server for the current buffer,
-use the command `jedi:start-dedicated-server'."
-  :group 'jedi)
-
-(defcustom jedi:complete-on-dot nil
-  "Non-`nil' means automatically start completion after inserting a dot.
-To make this option work, you need to use `jedi:setup' instead of
-`jedi:ac-setup' to start Jedi."
-  :group 'jedi)
-
-(defcustom jedi:tooltip-method '(pos-tip popup)
-  "Configuration for `jedi:tooltip-show'.
-This is a list which may contain symbol(s) `pos-tip' and/or
-`popup'.  It determines tooltip method to use.  Setting this
-value to nil means to use minibuffer instead of tooltip."
-  :group 'jedi)
-
-(defcustom jedi:get-in-function-call-timeout 3000
-  "Cancel request to server for call signature after this period
-specified in in millisecond."
-  :group 'jedi)
-
-(defcustom  jedi:get-in-function-call-delay 1000
-  "How long Jedi should wait before showing call signature
-tooltip in millisecond."
-  :group 'jedi)
-
-(defcustom jedi:goto-definition-config
-  '((nil nil        nil)
-    (t   nil        nil)
-    (nil definition nil)
-    (t   definition nil)
-    (nil nil        t  )
-    (t   nil        t  )
-    (nil definition t  )
-    (t   definition t  ))
-  "Configure how prefix argument modifies `jedi:goto-definition' behavior.
-
-Each element of the list is arguments (list) passed to
-`jedi:goto-definition'.  Note that this variable has no effect on
-`jedi:goto-definition' when it is used as a lisp function
-
-The following setting is default (last parts are omitted).
-Nth element is used as the argument when N universal prefix
-arguments (``C-u``) are given.::
-
-    (setq jedi:goto-definition-config
-          '((nil nil        nil)        ; C-.
-            (t   nil        nil)        ; C-u C-.
-            (nil definition nil)        ; C-u C-u C-.
-            (t   definition nil)        ; C-u C-u C-u C-.
-            ...))
-
-For example, if you want to follow \"substitution path\" by default,
-use the setting like this::
-
-    (setq jedi:goto-definition-config
-          '((nil definition nil)
-            (t   definition nil)
-            (nil nil        nil)
-            (t   nil        nil)
-            (nil definition t  )
-            (t   definition t  )
-            (nil nil        t  )
-            (t   nil        t  )))
-
-You can rearrange the order to have most useful sets of arguments
-at the top."
-  :group 'jedi)
-
-(defcustom jedi:doc-mode 'rst-mode
-  "Major mode to use when showing document."
-  :group 'jedi)
-
-(defcustom jedi:doc-hook '(view-mode)
-  "The hook that's run after showing a document."
-  :type 'hook
-  :group 'jedi)
-
-(defcustom jedi:doc-display-buffer 'display-buffer
-  "A function to be called with a buffer to show document."
-  :group 'jedi)
-
-(defcustom jedi:install-imenu nil
-  "[EXPERIMENTAL] If `t', use Jedi to create `imenu' index.
-To use this feature, you need to install the developmental
-version (\"dev\" branch) of Jedi."
-  :group 'jedi)
-
-(defcustom jedi:imenu-create-index-function 'jedi:create-nested-imenu-index
-  "`imenu-create-index-function' for Jedi.el.
-It must be a function that takes no argument and return an object
-described in `imenu--index-alist'.
-This can be set to `jedi:create-flat-imenu-index'.
-Default is `jedi:create-nested-imenu-index'."
-  :group 'jedi)
-
-(make-obsolete-variable 'jedi:setup-keys nil "0.1.3")
-(defcustom jedi:setup-keys nil
-  "Setup recommended keybinds.
-
-.. warning:: Use of this value is obsolete now.  As of 0.1.3,
-   jedi.el has default keybinds, which are different than these. See also
-   `jedi-mode'.
-
-.. admonition:: Default keybinds
-
-   ``<C-tab>`` : = `jedi:key-complete'
-       Complete code at point. (`jedi:complete')
-
-   ``C-.`` : = `jedi:key-goto-definition'
-       Goto the definition of the object at point. (`jedi:goto-definition')
-
-   ``C-c d`` : = `jedi:key-show-doc'
-       Show the documentation of the object at point. (`jedi:show-doc')
-
-   ``C-c r`` : = `jedi:key-related-names'
-       Find related names of the object at point.
-       (`helm-jedi-related-names' / `anything-jedi-related-names')
-
-When `jedi:setup-keys' is non-`nil', recommended keybinds are set
-in `jedi-mode-map' when **loading** jedi.el.  Therefore, you must
-set this value before jedi.el is loaded.  As recommended usage of
-jedi.el is to call `jedi:setup' via `python-mode-hook' where
-`jedi:setup' is autloaded, setting `jedi:setup-keys' to `t' in
-you emacs setup (e.g., ``.emacs.d/init.el``) works fine.::
-
-    (setq jedi:setup-keys t)
-    (add-hook 'python-mode-hook 'jedi:setup)
-
-If you want to require jedi.el explicitly when loading Emacs,
-make sure to set `jedi:setup-keys' before loading jedi.el::
-
-    (setq jedi:setup-keys t)
-    (require 'jedi)
-
-Byte compiler warns about unbound variable if you set
-`jedi:setup-keys' before loading jedi.el.  The proper way to
-suppress this warning is the following::
-
-    (eval-when-compile (require 'jedi nil t))
-    (setq jedi:setup-keys t)
-
-You can change these keybinds by changing `jedi:key-complete',
-`jedi:key-goto-definition', `jedi:key-show-doc', and
-`jedi:key-related-names'.  For example, default keybind for
-ropemacs's `rope-show-doc' is same as `jedi:show-doc'.  You can
-avoid collision by something like this::
-
-    (setq jedi:key-show-doc (kbd \"C-c D\"))"
-  :group 'jedi)
-
-(defcustom jedi:key-complete (kbd "<C-tab>")
-  "Keybind for command `jedi:complete'."
-  :group 'jedi)
-
-(defcustom jedi:key-goto-definition (kbd "C-.")
-  "Keybind for command `jedi:goto-definition'."
-  :group 'jedi)
-
-(defcustom jedi:key-show-doc (kbd "C-c d")
-  "Keybind for command `jedi:show-doc'."
-  :group 'jedi)
-
-(defcustom jedi:key-related-names (kbd "C-c r")
-  "Keybind for command `helm-jedi-related-names' or
-`anything-jedi-related-names'."
-  :group 'jedi)
-
-(defcustom jedi:key-goto-definition-pop-marker (kbd "C-,")
-  "Keybind for command `jedi:goto-definition-pop-marker'."
-  :group 'jedi)
-
-(defcustom jedi:use-shortcuts nil
-  "If non-`nil', enable the following shortcuts:
-
-| ``M-.``  `jedi:goto-definition'
-| ``M-,``  `jedi:goto-definition-pop-marker'
-"
-  :group 'jedi)
-
-(defcustom jedi:import-python-el-settings t
-  "Automatically import setting from python.el variables."
-  :group 'jedi)
-
-(defcustom jedi:goto-definition-marker-ring-length 16
-  "Length of marker ring to store `jedi:goto-definition' call positions"
-  :group 'jedi)
-
-
-;;; Internal variables
-
-(defvar jedi:get-in-function-call--d nil
-  "Bounded to deferred object while requesting get-in-function-call.")
-
-(defvar jedi:defined-names--singleton-d nil
-  "Bounded to deferred object while requesting defined_names.")
-
-
-;;; Jedi mode
-
-(defvar jedi-mode-map (make-sparse-keymap))
-
-(defun jedi:handle-post-command ()
-  (jedi:get-in-function-call-when-idle))
-
-(define-minor-mode jedi-mode
-  "Jedi mode.
-When `jedi-mode' is on, call signature is automatically shown as
-toolitp when inside of function call.
-
-\\{jedi-mode-map}"
-  :keymap jedi-mode-map
-  :group 'jedi
-  (let ((map jedi-mode-map))
-    (when jedi:use-shortcuts
-      (define-key map (kbd "M-.") 'jedi:goto-definition)
-      (define-key map (kbd "M-,") 'jedi:goto-definition-pop-marker)))
-  (if jedi-mode
-      (progn
-        (when jedi:install-imenu
-          (jedi:defined-names-deferred)
-          (setq imenu-create-index-function jedi:imenu-create-index-function))
-        (add-hook 'post-command-hook 'jedi:handle-post-command nil t)
-        (add-hook 'kill-buffer-hook 'jedi:server-pool--gc-when-idle nil t))
-    (remove-hook 'post-command-hook 'jedi:handle-post-command t)
-    (remove-hook 'kill-buffer-hook 'jedi:server-pool--gc-when-idle t)
-    (jedi:server-pool--gc-when-idle))
-  (when jedi:mode-function
-    (funcall jedi:mode-function)))
-
-;; Define keybinds.
-;; See: https://github.com/tkf/emacs-jedi/issues/47
-(let ((map jedi-mode-map))
-  (when (and (boundp 'auto-complete-mode) auto-complete-mode)
-    (define-key map (kbd "<C-tab>") 'jedi:complete))
-  (define-key map (kbd "C-c ?") 'jedi:show-doc)
-  (define-key map (kbd "C-c .") 'jedi:goto-definition)
-  (define-key map (kbd "C-c ,") 'jedi:goto-definition-pop-marker)
-  (let ((command (cond
-                  ((featurep 'helm) 'helm-jedi-related-names)
-                  ((featurep 'anything) 'anything-jedi-related-names)
-                  ((locate-library "helm") 'helm-jedi-related-names)
-                  ((locate-library "anything") 'anything-jedi-related-names))))
-    (when command
-      (define-key map (kbd "C-c /") command))))
-
-(when jedi:setup-keys
-  (let ((map jedi-mode-map))
-    (define-key map jedi:key-complete        'jedi:complete)
-    (define-key map jedi:key-goto-definition 'jedi:goto-definition)
-    (define-key map jedi:key-show-doc        'jedi:show-doc)
-    (define-key map jedi:key-goto-definition-pop-marker
-      'jedi:goto-definition-pop-marker)
-    (let ((command (cond
-                    ((featurep 'helm) 'helm-jedi-related-names)
-                    ((featurep 'anything) 'anything-jedi-related-names))))
-      (when command
-        (define-key map jedi:key-related-names command)))))
-
-
-;;; EPC utils
-
-(defun jedi:epc--live-p (mngr)
-  "Return non-nil when MNGR is an EPC manager object with a live
-connection."
-  (let ((proc (ignore-errors
-                (epc:connection-process (epc:manager-connection mngr)))))
-    (and (processp proc)
-         ;; Same as `process-live-p' in Emacs >= 24:
-         (memq (process-status proc) '(run open listen connect stop)))))
-
-(defmacro jedi:-with-run-on-error (body &rest run-on-error)
-  (declare (indent 1))
-  `(let ((something-happened t))
-     (unwind-protect
-         (prog1 ,body
-           (setq something-happened nil))
-       (when something-happened
-         ,@run-on-error))))
-
-(defun jedi:epc--start-epc (server-prog server-args)
-  "Same as `epc:start-epc', but set query-on-exit flag for
-associated processes to nil."
-  (let ((mngr (jedi:-with-run-on-error
-                  (epc:start-epc server-prog server-args)
-                (display-warning 'jedi "\
-Failed to start Jedi EPC server.
-*** You may need to run \"M-x jedi:install-server\". ***
-This could solve the problem especially if you haven't run the command yet
-since Jedi.el installation or update and if the server complains about
-Python module imports." :error))))
-    (set-process-query-on-exit-flag (epc:connection-process
-                                     (epc:manager-connection mngr))
-                                    nil)
-    (set-process-query-on-exit-flag (epc:manager-server-process mngr) nil)
-    mngr))
-
-
-;;; Server pool
-
-(defvar jedi:server-pool--table (make-hash-table :test 'equal)
-  "A hash table that holds a pool of EPC server instances.")
-
-(defun jedi:server-pool--start (command)
-  "Get an EPC server instance from server pool by COMMAND as a
-key, or start new one if there is none."
-  (let ((cached (gethash command jedi:server-pool--table)))
-    (if (and cached (jedi:epc--live-p cached))
-        cached
-      (let* ((default-directory "/")
-             (mngr (jedi:epc--start-epc (car command) (cdr command))))
-        (puthash command mngr jedi:server-pool--table)
-        (jedi:server-pool--gc-when-idle)
-        mngr))))
-
-(defun jedi:-get-servers-in-use ()
-  "Return a list of non-nil `jedi:epc' in all buffers."
-  (cl-loop with mngr-list
-           for buffer in (buffer-list)
-           for mngr = (with-current-buffer buffer jedi:epc)
-           when (and mngr (not (memq mngr mngr-list)))
-           collect mngr into mngr-list
-           finally return mngr-list))
-
-(defvar jedi:server-pool--gc-timer nil)
-
-(defun jedi:server-pool--gc ()
-  "Stop unused servers."
-  (let ((servers-in-use (jedi:-get-servers-in-use)))
-    (maphash
-     (lambda (key mngr)
-       (unless (memq mngr servers-in-use)
-         (remhash key jedi:server-pool--table)
-         (epc:stop-epc mngr)))
-     jedi:server-pool--table))
-  ;; Clear timer so that GC is started next time
-  ;; `jedi:server-pool--gc-when-idle' is called.
-  (setq jedi:server-pool--gc-timer nil))
-
-(defun jedi:server-pool--gc-when-idle ()
-  "Run `jedi:server-pool--gc' when idle."
-  (unless jedi:server-pool--gc-timer
-    (setq jedi:server-pool--gc-timer
-          (run-with-idle-timer 10 nil 'jedi:server-pool--gc))))
-
-
-;;; Server management
-
-(defun jedi:start-server ()
-  (if (jedi:epc--live-p jedi:epc)
-      (message "Jedi server is already started!")
-    (setq jedi:epc (jedi:server-pool--start
-                    (append jedi:server-command jedi:server-args))))
-  jedi:epc)
-
-(defun jedi:stop-server ()
-  "Stop Jedi server.  Use this command when you want to restart
-Jedi server (e.g., when you changed `jedi:server-command' or
-`jedi:server-args').  Jedi srever will be restarted automatically
-later when it is needed."
-  (interactive)
-  (if jedi:epc
-      (epc:stop-epc jedi:epc)
-    (message "Jedi server is already killed."))
-  (setq jedi:epc nil)
-  ;; It could be non-nil due to some error.  Rescue it in that case.
-  (setq jedi:get-in-function-call--d nil)
-  (setq jedi:defined-names--singleton-d nil))
-
-(defun jedi:get-epc ()
-  (if (jedi:epc--live-p jedi:epc)
-      jedi:epc
-    (jedi:start-server)))
-
-;;;###autoload
-(defun jedi:start-dedicated-server (command)
-  "Start Jedi server dedicated to this buffer.
-This is useful, for example, when you want to use different
-`sys.path' for some buffer.  When invoked as an interactive
-command, it asks you how to start the Jedi server.  You can edit
-the command in minibuffer to specify the way Jedi server run.
-
-If you want to setup how Jedi server is started programmatically
-per-buffer/per-project basis, make `jedi:server-command' and
-`jedi:server-args' buffer local and set it in `python-mode-hook'.
-See also: `jedi:server-args'."
-  (interactive
-   (list (split-string-and-unquote
-          (read-string "Run Jedi server: "
-                       (mapconcat
-                        #'identity
-                        (append jedi:server-command
-                                jedi:server-args)
-                        " ")))))
-  ;; Reset `jedi:epc' so that a new server is created when COMMAND is
-  ;; new.  If it is already in the server pool, the server instance
-  ;; already in the pool is picked up by `jedi:start-server'.
-  (setq jedi:epc nil)
-  ;; Set `jedi:server-command', so that this command is used
-  ;; when restarting EPC server of this buffer.
-  (set (make-local-variable 'jedi:server-command) command)
-  (set (make-local-variable 'jedi:server-args) nil)
-  (jedi:start-server))
-
-(defun jedi:-buffer-file-name ()
-  "Return `buffer-file-name' without text properties.
-See: https://github.com/tkf/emacs-jedi/issues/54"
-  (substring-no-properties (or (buffer-file-name) "")))
-
-(defun jedi:call-deferred (method-name)
-  "Call ``Script(...).METHOD-NAME`` and return a deferred object."
-  (let ((source      (buffer-substring-no-properties (point-min) (point-max)))
-        (line        (count-lines (point-min) (min (1+ (point)) (point-max))))
-        (column      (- (point) (line-beginning-position)))
-        (source-path (jedi:-buffer-file-name)))
-    (epc:call-deferred (jedi:get-epc)
-                       method-name
-                       (list source line column source-path))))
-
-
-;;; Completion
-
-(defvar jedi:complete-reply nil
-  "Last reply to `jedi:complete-request'.")
-
-(defvar jedi:complete-request-point 0
-  ;; It is passed to `=', so do not initialize this value by `nil'.
-  "The point where `jedi:complete-request' is called.")
-
-(defun jedi:complete-request ()
-  "Request ``Script(...).complete`` and return a deferred object.
-`jedi:complete-reply' is set to the reply sent from the server."
-  (setq jedi:complete-request-point (point))
-  (deferred:nextc (jedi:call-deferred 'complete)
-    (lambda (reply)
-      (setq jedi:complete-reply reply))))
-
-
-;;; Call signature (get_in_function_call)
-
-(defface jedi:highlight-function-argument
-  '((t (:inherit bold)))
-  "Face used for the argument at point in a function's argument list"
-  :group 'jedi)
-
-(cl-defun jedi:get-in-function-call--construct-call-signature
-    (&key params index call_name)
-  (if (not index)
-      (concat call_name "()")
-    (let ((current-arg (nth index params)))
-      (when (and current-arg (null jedi:tooltip-method))
-        (setf (nth index params)
-              (propertize current-arg 'face 'jedi:highlight-function-argument)))
-      (concat call_name "(" (mapconcat #'identity params ", ") ")"))))
-
-(defun jedi:get-in-function-call--tooltip-show (args)
-  (when (and args (or (not (boundp 'auto-complete-mode))
-                      (and (boundp 'ac-completing) (not ac-completing))))
-    (jedi:tooltip-show
-     (apply #'jedi:get-in-function-call--construct-call-signature args))))
-
-(defun jedi:get-in-function-call ()
-  "Manually show call signature tooltip."
-  (interactive)
-  (deferred:nextc
-    (jedi:call-deferred 'get_in_function_call)
-    #'jedi:get-in-function-call--tooltip-show))
-
-(defun jedi:get-in-function-call-when-idle ()
-  "Show tooltip when Emacs is ilde."
-  (unless jedi:get-in-function-call--d
-    (setq jedi:get-in-function-call--d
-          (deferred:try
-            (deferred:$
-              (deferred:wait-idle jedi:get-in-function-call-delay)
-              (deferred:nextc it
-                (lambda ()
-                  (when jedi-mode         ; cursor may be moved
-                    (deferred:timeout
-                      jedi:get-in-function-call-timeout
-                      nil
-                      (jedi:call-deferred 'get_in_function_call)))))
-              (deferred:nextc it #'jedi:get-in-function-call--tooltip-show))
-            :finally
-            (lambda ()
-              (setq jedi:get-in-function-call--d nil))))))
-
-(defun jedi:tooltip-show (string)
-  (cond
-   ((and (memq 'pos-tip jedi:tooltip-method) window-system
-         (featurep 'pos-tip))
-    (pos-tip-show (jedi:string-fill-paragraph string)
-                  'popup-tip-face nil nil 0))
-   ((and (memq 'popup jedi:tooltip-method)
-         (featurep 'popup))
-    (popup-tip string))
-   (t (when (stringp string)
-        (let ((message-log-max nil))
-          (message string))))))
-
-(defun jedi:string-fill-paragraph (string &optional justify)
-  (with-temp-buffer
-    (erase-buffer)
-    (insert string)
-    (goto-char (point-min))
-    (fill-paragraph justify)
-    (buffer-string)))
-
-
-;;; Goto
-
-(defvar jedi:goto-definition--index nil)
-(defvar jedi:goto-definition--cache nil)
-(defvar jedi:goto-definition--marker-ring
-  (make-ring jedi:goto-definition-marker-ring-length)
-  "Marker ring that stores `jedi:goto-definition' call positions")
-
-(defun jedi:goto-definition (&optional other-window deftype use-cache index)
-  "Goto the definition of the object at point.
-
-See `jedi:goto-definition-config' for how this function works
-when universal prefix arguments \(``C-u``) are given.  If
-*numeric* prefix argument(s) \(e.g., ``M-0``) are given, goto
-point of the INDEX-th result.  Note that you cannot mix universal
-and numeric prefixes.  It is Emacs's limitation.  If you mix both
-kinds of prefix, you get numeric prefix.
-
-When used as a lisp function, popup a buffer when OTHER-WINDOW is
-non-nil.  DEFTYPE must be either `assignment' (default) or
-`definition'.  When USE-CACHE is non-nil, use the locations of
-the last invocation of this command.  If INDEX is specified, goto
-INDEX-th result."
-  (interactive
-   (if (integerp current-prefix-arg)
-       (list nil nil nil current-prefix-arg)
-     (nth (let ((i (car current-prefix-arg)))
-            (if i (floor (log i 4)) 0))
-          jedi:goto-definition-config)))
-  (cond
-   ((and (or use-cache index)
-         jedi:goto-definition--cache)
-    (setq jedi:goto-definition--index (or index 0))
-    (jedi:goto-definition--nth other-window))
-   ((and (eq last-command 'jedi:goto-definition)
-         (> (length jedi:goto-definition--cache) 1))
-    (jedi:goto-definition-next other-window))
-   (t
-    (setq jedi:goto-definition--index (or index 0))
-    (deferred:nextc (jedi:call-deferred
-                     (cl-case deftype
-                       ((assignment nil) 'goto)
-                       (definition 'get_definition)
-                       (t (error "Unsupported deftype: %s" deftype))))
-      (lambda (reply)
-        (jedi:goto-definition--callback reply other-window))))))
-
-(defun jedi:goto-definition-push-marker ()
-  "Push point onto goto-definition marker ring."
-  (ring-insert jedi:goto-definition--marker-ring (point-marker)))
-
-(defun jedi:goto-definition-pop-marker ()
-  "Goto the last point where `jedi:goto-definition' was called."
-  (interactive)
-  (if (ring-empty-p jedi:goto-definition--marker-ring)
-      (error "Jedi marker ring is empty, can't pop")
-    (let ((marker (ring-remove jedi:goto-definition--marker-ring 0)))
-      (switch-to-buffer (or (marker-buffer marker)
-                            (error "Buffer has been deleted")))
-      (goto-char (marker-position marker))
-      ;; Cleanup the marker so as to avoid them piling up.
-      (set-marker marker nil nil))))
-
-(defun jedi:goto-definition-next (&optional other-window)
-  "Goto the next cached definition.  See: `jedi:goto-definition'."
-  (interactive "P")
-  (let ((len (length jedi:goto-definition--cache))
-        (n (1+ jedi:goto-definition--index)))
-    (setq jedi:goto-definition--index (if (>= n len) 0 n))
-    (jedi:goto-definition--nth other-window)))
-
-(defun jedi:goto-definition--callback (reply other-window)
-  (if (not reply)
-      (message "Definition not found.")
-    (setq jedi:goto-definition--cache reply)
-    (jedi:goto-definition--nth other-window t)))
-
-(defun jedi:goto--line-column (line column)
-  "Like `goto-char' but specify the position by LINE and COLUMN."
-  (goto-char (point-min))
-  (forward-line (1- line))
-  (forward-char column))
-
-(defun jedi:goto-definition--nth (other-window &optional try-next)
-  (let* ((len (length jedi:goto-definition--cache))
-         (n jedi:goto-definition--index)
-         (next (lambda ()
-                 (when (< n (1- len))
-                   (cl-incf jedi:goto-definition--index)
-                   (jedi:goto-definition--nth other-window)
-                   t))))
-    (cl-destructuring-bind (&key line_nr column module_path module_name
-                                 &allow-other-keys)
-        (nth n jedi:goto-definition--cache)
-      (cond
-       ((equal module_name "__builtin__")
-        (unless (and try-next (funcall next))
-          (message "Cannot see the definition of __builtin__.")))
-       ((not (and module_path (file-exists-p module_path)))
-        (unless (and try-next (funcall next))
-          (message "File '%s' does not exist." module_path)))
-       (t
-        (jedi:goto-definition-push-marker)
-        (funcall (if other-window #'find-file-other-window #'find-file)
-                 module_path)
-        (jedi:goto--line-column line_nr column)
-        (jedi:goto-definition--notify-alternatives len n))))))
-
-(defun jedi:goto-definition--notify-alternatives (len n)
-  (unless (= len 1)
-    (message
-     "%d-th point in %d candidates.%s"
-     (1+ n)
-     len
-     ;; Note: It must be `last-command', not `last-command' because
-     ;;       this function is called in deferred at the first time.
-     (if (eq last-command 'jedi:goto-definition)
-         (format "  Type %s to go to the next point."
-                 (key-description
-                  (car (where-is-internal 'jedi:goto-definition))))
-       ""))))
-
-
-;;; Full name
-
-(defun jedi:get-full-name-deferred ()
-  (deferred:$
-    (jedi:call-deferred 'get_definition)
-    (deferred:nextc it
-      (lambda (reply)
-        (cl-loop for def in reply
-                 do (cl-destructuring-bind (&key full_name &allow-other-keys)
-                        def
-                      (when full_name
-                        (return full_name))))))))
-
-(cl-defun jedi:get-full-name-sync (&key (timeout 500))
-  (epc:sync
-   (jedi:get-epc)
-   (deferred:timeout timeout nil (jedi:get-full-name-deferred))))
-
-
-;;; Related names
-
-(defun jedi:related-names--source (name candidates)
-  `((name . ,name)
-    (candidates . ,candidates)
-    (recenter)
-    (type . file-line)))
-
-(defun jedi:related-names--to-file-line (reply)
-  (mapcar
-   (lambda (x)
-     (cl-destructuring-bind
-         (&key line_nr module_name module_path description &allow-other-keys)
-         x
-       (format "%s:%s: %s - %s" module_path line_nr
-               module_name description)))
-   reply))
-
-(defun jedi:related-names--helm (helm)
-  (deferred:nextc
-    (let ((to-file-line #'jedi:related-names--to-file-line))
-      (deferred:parallel
-        (deferred:nextc (jedi:call-deferred 'related_names) to-file-line)
-        (deferred:nextc (jedi:call-deferred 'goto)          to-file-line)))
-    (lambda (candidates-list)
-      (funcall
-       helm
-       :sources (list (jedi:related-names--source "Jedi Related Names"
-                                                  (car candidates-list))
-                      (jedi:related-names--source "Jedi Goto"
-                                                  (cadr candidates-list)))
-       :buffer (format "*%s jedi:related-names*" helm)))))
-
-;;;###autoload
-(defun helm-jedi-related-names ()
-  "Find related names of the object at point using `helm' interface."
-  (interactive)
-  (jedi:related-names--helm 'helm))
-
-;;;###autoload
-(defun anything-jedi-related-names ()
-  "Find related names of the object at point using `anything' interface."
-  (interactive)
-  (jedi:related-names--helm 'anything))
-
-
-;;; Show document (get-definition)
-
-(defvar jedi:doc-buffer-name "*jedi:doc*")
-
-(defun jedi:show-doc ()
-  "Show the documentation of the object at point."
-  (interactive)
-  (deferred:nextc (jedi:call-deferred 'get_definition)
-    (lambda (reply)
-      (with-current-buffer (get-buffer-create jedi:doc-buffer-name)
-        (cl-loop with has-doc = nil
-                 with first = t
-                 with inhibit-read-only = t
-                 initially (erase-buffer)
-                 for def in reply
-                 do (cl-destructuring-bind
-                        (&key doc desc_with_module &allow-other-keys)
-                        def
-                      (unless (or (null doc) (equal doc ""))
-                        (if first
-                            (setq first nil)
-                          (insert "\n\n---\n\n"))
-                        (insert "Docstring for " desc_with_module "\n\n" doc)
-                        (setq has-doc t)))
-                 finally do
-                 (if (not has-doc)
-                     (message "Document not found.")
-                   (progn
-                     (goto-char (point-min))
-                     (when (fboundp jedi:doc-mode)
-                       (funcall jedi:doc-mode))
-                     (run-hooks 'jedi:doc-hook)
-                     (funcall jedi:doc-display-buffer (current-buffer)))))))))
-
-
-;;; Defined names (imenu)
-
-(defvar jedi:defined-names--cache nil)
-(make-variable-buffer-local 'jedi:defined-names--cache)
-
-(defun jedi:defined-names-deferred ()
-  (deferred:nextc
-    (epc:call-deferred
-     (jedi:get-epc)
-     'defined_names
-     (list (buffer-substring-no-properties (point-min) (point-max))
-           (jedi:-buffer-file-name)))
-    (lambda (reply)
-      (setq jedi:defined-names--cache reply))))
-
-(defun jedi:defined-names--singleton-deferred ()
-  "Like `jedi:defined-names-deferred', but make sure that only
-one request at the time is emitted."
-  (unless jedi:defined-names--singleton-d
-    (setq jedi:defined-names--singleton-d
-          (deferred:watch (jedi:defined-names-deferred)
-            (lambda (_) (setq jedi:defined-names--singleton-d nil))))))
-
-(defun jedi:defined-names--sync ()
-  (unless jedi:defined-names--cache
-    (epc:sync (jedi:get-epc) (jedi:defined-names--singleton-deferred)))
-  jedi:defined-names--cache)
-
-(defun jedi:imenu-make-marker (def)
-  (cl-destructuring-bind (&key line_nr column &allow-other-keys) def
-    (save-excursion (jedi:goto--line-column line_nr column)
-                    (point-marker))))
-
-(defun jedi:create-nested-imenu-index--item (def)
-  (cons (plist-get def :name) (jedi:imenu-make-marker def)))
-
-(defun jedi:create-nested-imenu-index ()
-  "`imenu-create-index-function' for Jedi.el.
-See also `jedi:imenu-create-index-function'."
-  (when (called-interactively-p 'interactive) (jedi:defined-names--sync))
-  (jedi:create-nested-imenu-index-1))
-
-(defun jedi:create-nested-imenu-index-1 (&optional items)
-  (cl-loop for (def . subdefs) in (or items jedi:defined-names--cache)
-           if subdefs
-           collect (append
-                    (list (plist-get def :local_name)
-                          (jedi:create-nested-imenu-index--item def))
-                    (jedi:create-nested-imenu-index-1 subdefs))
-           else
-           collect (jedi:create-nested-imenu-index--item def)))
-
-(defun jedi:create-flat-imenu-index ()
-  "`imenu-create-index-function' for Jedi.el to create flatten index.
-See also `jedi:imenu-create-index-function'."
-  (when (called-interactively-p 'interactive) (jedi:defined-names--sync))
-  (jedi:create-flat-imenu-index-1))
-
-(defun jedi:create-flat-imenu-index-1 (&optional items)
-  (cl-loop for (def . subdefs) in (or items jedi:defined-names--cache)
-           collect (cons (plist-get def :local_name) (jedi:imenu-make-marker def))
-           when subdefs
-           append (jedi:create-flat-imenu-index-1 subdefs)))
-
-
-;;; Meta info
-
-(defun jedi:show-setup-info ()
-  "Show installation and configuration info in a buffer.
-Paste the result of this function when asking question or
-reporting bug.  This command also tries to detect errors when
-communicating with Jedi EPC server.  If you have some problem you
-may find some information about communication error."
-  (interactive)
-  (let (epc get-epc-error version-reply)
-    (condition-case err
-        (setq epc (jedi:get-epc))
-      (error (setq get-epc-error err)))
-    (when epc
-      (setq version-reply
-            (condition-case err
-                (epc:sync
-                 epc
-                 (deferred:$
-                   (deferred:timeout 500
-                     '(:timeout nil)
-                     (epc:call-deferred epc 'get_jedi_version nil))
-                   (deferred:error it
-                     (lambda (err) `(:error ,err)))))
-              (error `(:sync-error ,err)))))
-    (let ((standard-output (get-buffer-create "*jedi:show-setup-info*")))
-      (with-current-buffer standard-output
-        (emacs-lisp-mode)
-        (erase-buffer)
-        (insert ";; Emacs Lisp version:\n")
-        (pp `(:emacs-version ,emacs-version
-              :jedi-version ,jedi:version
-              :python-environment-version ,python-environment-version))
-        (insert ";; Python version:\n")
-        (pp version-reply)
-        (when get-epc-error
-          (insert "\n;; EPC error:\n")
-          (pp `(:get-epc-error ,get-epc-error)))
-        (insert ";; Command line:\n")
-        (pp `(:virtualenv
-              ,(executable-find (car python-environment-virtualenv))
-              :virtualenv-version
-              ,(ignore-errors (jedi:-virtualenv-version))))
-        (insert ";; Customization:\n")
-        (pp (jedi:-list-customization))
-        (display-buffer standard-output)))))
-
-(defun jedi:-list-defcustoms ()
-  (cl-loop for sym being the symbols
-           for name = (symbol-name sym)
-           when (and (or (string-prefix-p "jedi:" name)
-                         (string-prefix-p "python-environment-" name))
-                     (custom-variable-p sym))
-           collect sym))
-
-(defun jedi:-list-customization ()
-  (cl-loop for sym in (sort (jedi:-list-defcustoms)
-                            (lambda (x y)
-                              (string< (symbol-name x)
-                                       (symbol-name y))))
-           collect (cons sym (symbol-value sym))))
-
-(defun jedi:-virtualenv-version ()
-  "Return output of virtualenv --version"
-  (with-temp-buffer
-    (erase-buffer)
-    (call-process (executable-find (car python-environment-virtualenv))
-                  nil t nil
-                  "--version")
-    (buffer-string)))
-
-(defun jedi:get-jedi-version-request ()
-  "Request version of Python modules and return a deferred object."
-  (epc:call-deferred (jedi:get-epc) 'get_jedi_version nil))
-
-(defun jedi:show-version-info ()
-  "Show version info of Python modules used by the server.
-Paste the result of this function in bug report."
-  (interactive)
-  (deferred:nextc (jedi:get-jedi-version-request)
-    (lambda (reply)
-      (let ((standard-output (get-buffer-create "*jedi:version*")))
-        (with-current-buffer standard-output
-          (emacs-lisp-mode)
-          (erase-buffer)
-          (pp `(:emacs-version ,emacs-version :jedi-version ,jedi:version))
-          (pp reply)
-          (display-buffer standard-output))))))
-
-(define-obsolete-function-alias
-  'jedi:show-jedi-version 'jedi:show-version-info "0.1.3")
-
-(defun jedi:print-jedi-version ()
-  (pp (epc:sync (jedi:get-epc) (jedi:get-jedi-version-request))))
-
-
-;;; Setup
-
-(defun jedi:import-python-el-settings-setup ()
-  "Make jedi aware of python.el virtualenv and path settings.
-This is automatically added to the `jedi-mode-hook' when
-`jedi:import-python-el-settings' is non-nil."
-  (let ((args))
-    (when (bound-and-true-p python-shell-extra-pythonpaths)
-      (mapc
-       (lambda (path)
-         (setq args (append (list "--sys-path" path) args)))
-       python-shell-extra-pythonpaths))
-    (when (bound-and-true-p python-shell-virtualenv-path)
-      (setq args
-            (append
-             (list "--virtual-env" python-shell-virtualenv-path)
-             args)))
-    (when args
-      (set (make-local-variable 'jedi:server-args)
-           (append args jedi:server-args)))))
-
-;;;###autoload
-(defun jedi:setup ()
-  "Fully setup jedi.el for current buffer.
-It setups `ac-sources' or `company-backends' and turns
-`jedi-mode' on.
-
-This function is intended to be called from `python-mode-hook',
-like this::
-
-       (add-hook 'python-mode-hook 'jedi:setup)
-
-You can also call this function as a command, to quickly test
-what jedi can do."
-  (interactive)
-  (when jedi:setup-function
-    (funcall jedi:setup-function))
-  (when jedi:import-python-el-settings
-    ;; Hack to access buffer/dir-local vars: http://bit.ly/Y5IfMV.
-    ;; Given that `jedi:setup' is added to the `python-mode-hook'
-    ;; this will modify `hack-local-variables-hook' on python
-    ;; buffers only and will allow us to access buffer/directory
-    ;; local variables in `jedi:import-python-el-settings-setup'.
-    (add-hook 'hack-local-variables-hook
-              #'jedi:import-python-el-settings-setup nil t))
-  (jedi-mode 1))
-
-
-;;; Virtualenv setup
-(defvar jedi:install-server--command
-  `("pip" "install" "--upgrade" ,(convert-standard-filename jedi:source-dir)))
-
-;;;###autoload
-(defun jedi:install-server ()
-  "This command installs Jedi server script jediepcserver.py in a
-Python environment dedicated to Emacs.  By default, the
-environment is at ``~/.emacs.d/.python-environments/default/``.
-This environment is automatically created by ``virtualenv`` if it
-does not exist.
-
-Run this command (i.e., type ``M-x jedi:install-server RET``)
-whenever Jedi.el shows a message to do so.  It is a good idea to
-run this every time after you update Jedi.el to sync version of
-Python modules used by Jedi.el and Jedi.el itself.
-
-You can modify the location of the environment by changing
-`jedi:environment-root' and/or `python-environment-directory'.  More
-specifically, Jedi.el will install Python modules under the directory
-``PYTHON-ENVIRONMENT-DIRECTORY/JEDI:ENVIRONMENT-ROOT``.  Note that you
-need command line program ``virtualenv``.  If you have the command in
-an unusual location, use `python-environment-virtualenv' to specify the
-location.
-
-.. NOTE:: jediepcserver.py is installed in a virtual environment but it
-   does not mean Jedi.el cannot recognize the modules in virtual
-   environment you are using for your Python development.  Jedi
-   EPC server recognize the virtualenv it is in (i.e., the
-   environment variable ``VIRTUAL_ENV`` in your Emacs) and then
-   add modules in that environment to its ``sys.path``.  You can
-   also add ``--virtual-env PATH/TO/ENV`` to `jedi:server-args'
-   to include modules of virtual environment even you launch
-   Emacs outside of the virtual environment.
-
-.. NOTE:: It is highly recommended to use this command to install
-   Python modules for Jedi.el.  You still can install Python
-   modules used by Jedi.el manually.  However, you are then
-   responsible for keeping Jedi.el and Python modules compatible.
-
-See also:
-
-- https://github.com/tkf/emacs-jedi/pull/72
-- https://github.com/tkf/emacs-jedi/issues/140#issuecomment-37358527"
-  (interactive)
-  (deferred:$
-    (python-environment-run jedi:install-server--command
-                            jedi:environment-root
-                            jedi:environment-virtualenv)
-    (deferred:watch it
-      (lambda (_)
-        (setq-default jedi:server-command (jedi:-env-server-command))))))
-
-;;;###autoload
-(defun jedi:install-server-block ()
-  "Blocking version `jedi:install-server'."
-  (prog1
-      (python-environment-run-block jedi:install-server--command
-                                    jedi:environment-root
-                                    jedi:environment-virtualenv)
-    (setq-default jedi:server-command (jedi:-env-server-command))))
-
-(defcustom jedi:install-python-jedi-dev-command
-  '("pip" "install" "--upgrade"
-    "git+https://github.com/davidhalter/jedi.git@dev#egg=jedi")
-  "Pip command to be used for `jedi:install-python-jedi-dev'."
-  :group 'jedi)
-
-(defun jedi:install-python-jedi-dev ()
-  "Install developmental version of Python-Jedi from GitHub."
-  (interactive)
-  (deferred:$
-    (python-environment-run jedi:install-python-jedi-dev-command
-                            jedi:environment-root
-                            jedi:environment-virtualenv)
-    (deferred:watch it
-      (lambda (_)
-        (message "\
-Now restart EPC servers.  Then you are ready to go with Jedi-dev!")))))
-
-
-;;; Debugging
-
-(defun jedi:pop-to-epc-buffer ()
-  "Open the buffer associated with EPC server process.
-Use this command to see the output (e.g., traceback) of the server process."
-  (interactive)
-  (pop-to-buffer (process-buffer (epc:manager-server-process jedi:epc))))
-
-(defun jedi:toggle-log-traceback ()
-  "Toggle on/off traceback logging for EPC server for the current buffer.
-When there is an error during traceback logging is enabled, traceback
-is printed in the EPC buffer.  You can use `jedi:pop-to-epc-buffer' to
-open that buffer.
-
-You can also pass ``--log-traceback`` option to jediepcserver.py
-to start server with traceback logging turned on.  This is useful when
-there is a problem in communication (thus this command does not work).
-You can use `jedi:start-dedicated-server' to restart EPC server for the
-current buffer with specific arguments."
-  (interactive)
-  (deferred:$
-    (epc:call-deferred (jedi:get-epc) 'toggle_log_traceback nil)
-    (deferred:nextc it
-      (lambda (flag)
-        (message "Traceback logging is %s" (if flag "enabled" "disabled"))))))
-
-(defvar jedi:server-command--backup nil)
-(defvar jedi:server-args--backup nil)
-
-(defun jedi:toggle-debug-server ()
-  "Setup `jedi:server-command' and `jedi:server-args' to debug
-server using pdb or ipdb.
-
-When this command is called, it essentially execute the following
-code::
-
-  (jedi:stop-server)
-  (setq jedi:server-command (list \"cat\" \"jedi-port.log\" )
-        jedi:server-args nil)
-
-It means to pass the port number recorded in the file
-jedi-port.log to EPC client.
-
-To start Jedi server in terminal and record port to the file,
-use the following command::
-
-   python jediepcserver.py --port-file jedi-port.log --pdb
-
-This command will be copied in the kill-ring (clipboard) when
-this command is called.  You can use `--ipdb` instead of `--pdb`
-to use ipdb instead of pdb.
-
-Calling this command again restores the original setting of
-`jedi:server-command' and `jedi:server-args' then stops the
-running server."
-  (interactive)
-  (if jedi:server-command--backup
-      (progn
-        (setq jedi:server-command jedi:server-command--backup
-              jedi:server-command--backup nil
-              jedi:server-args jedi:server-args--backup)
-        (jedi:stop-server)
-        (message "Quit debugging.  Original setting restored."))
-    (setq jedi:server-command--backup jedi:server-command
-          jedi:server-args--backup jedi:server-args
-          jedi:server-command (list "cat" (expand-file-name
-                                           "jedi-port.log" jedi:source-dir))
-          jedi:server-args nil)
-    (jedi:stop-server)
-    (kill-new "python jediepcserver.py --port-file jedi-port.log --ipdb")
-    (message "Now, start server with: --port-file jedi-port.log --ipdb.\
- (command is copied in the kill-ring)")))
-
-
-(provide 'jedi-core)
-
-;; Local Variables:
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
-
-;;; jedi-core.el ends here
diff --git a/emacs.d/elpa/jedi-core-20150623.2335/jediepcserver.py b/emacs.d/elpa/jedi-core-20150623.2335/jediepcserver.py
deleted file mode 100755
index 5ea4f79..0000000
--- a/emacs.d/elpa/jedi-core-20150623.2335/jediepcserver.py
+++ /dev/null
@@ -1,322 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Jedi EPC server.
-
-Copyright (C) 2012 Takafumi Arakaki
-
-Author: Takafumi Arakaki <aka.tkf at gmail.com>
-
-This file is NOT part of GNU Emacs.
-
-Jedi EPC server 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.
-
-Jedi EPC server 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 Jedi EPC server.
-If not, see <http://www.gnu.org/licenses/>.
-
-"""
-
-import os
-import sys
-import re
-import itertools
-import logging
-import site
-import glob
-
-jedi = None  # I will load it later
-
-
-PY3 = (sys.version_info[0] >= 3)
-NEED_ENCODE = not PY3
-
-
-def jedi_script(source, line, column, source_path):
-    if NEED_ENCODE:
-        source = source.encode('utf-8')
-        source_path = source_path and source_path.encode('utf-8')
-    return jedi.Script(source, line, column, source_path or '')
-
-
-def candidate_symbol(comp):
-    """
-    Return a character representing completion type.
-
-    :type comp: jedi.api.Completion
-    :arg  comp: A completion object returned by `jedi.Script.completions`.
-
-    """
-    try:
-        return comp.type[0].lower()
-    except (AttributeError, TypeError):
-        return '?'
-
-
-def candidates_description(comp):
-    """
-    Return `comp.description` in an appropriate format.
-
-    * Avoid return a string 'None'.
-    * Strip off all newlines. This is required for using
-      `comp.description` as candidate summary.
-
-    """
-    desc = comp.description
-    return _WHITESPACES_RE.sub(' ', desc) if desc and desc != 'None' else ''
-_WHITESPACES_RE = re.compile(r'\s+')
-
-
-def complete(*args):
-    reply = []
-    for comp in jedi_script(*args).completions():
-        reply.append(dict(
-            word=comp.name,
-            doc=comp.doc,
-            description=candidates_description(comp),
-            symbol=candidate_symbol(comp),
-        ))
-    return reply
-
-
-def get_in_function_call(*args):
-    sig = jedi_script(*args).call_signatures()
-    call_def = sig[0] if sig else None
-
-    if call_def:
-        return dict(
-            # p.get_code(False) should do the job.  But jedi-vim use replace.
-            # So follow what jedi-vim does...
-            params=[p.get_code().replace('\n', '') for p in call_def.params],
-            index=call_def.index,
-            call_name=call_def.call_name,
-        )
-    else:
-        return []  # nil
-
-
-def _goto(method, *args):
-    """
-    Helper function for `goto_assignments` and `usages`.
-
-    :arg  method: `jedi.Script.goto_assignments` or `jedi.Script.usages`
-    :arg    args: Arguments to `jedi_script`
-
-    """
-    # `definitions` is a list. Each element is an instances of
-    # `jedi.api_classes.BaseOutput` subclass, i.e.,
-    # `jedi.api_classes.RelatedName` or `jedi.api_classes.Definition`.
-    definitions = method(jedi_script(*args))
-    return [dict(
-        column=d.column,
-        line_nr=d.line,
-        module_path=d.module_path if d.module_path != '__builtin__' else [],
-        module_name=d.module_name,
-        description=d.description,
-    ) for d in definitions]
-
-
-def goto(*args):
-    return _goto(jedi.Script.goto_assignments, *args)
-
-
-def related_names(*args):
-    return _goto(jedi.Script.usages, *args)
-
-
-def definition_to_dict(d):
-    return dict(
-        doc=d.docstring(),
-        description=d.description,
-        desc_with_module=d.desc_with_module,
-        line_nr=d.line,
-        column=d.column,
-        module_path=d.module_path,
-        name=getattr(d, 'name', []),
-        full_name=getattr(d, 'full_name', []),
-        type=getattr(d, 'type', []),
-    )
-
-
-def get_definition(*args):
-    definitions = jedi_script(*args).goto_definitions()
-    return list(map(definition_to_dict, definitions))
-
-
-def get_names_recursively(definition, parent=None):
-    """
-    Fetch interesting defined names in sub-scopes under `definition`.
-
-    :type names: jedi.api_classes.Definition
-
-    """
-    d = definition_to_dict(definition)
-    try:
-        d['local_name'] = parent['local_name'] + '.' + d['name']
-    except (AttributeError, TypeError):
-        d['local_name'] = d['name']
-    if definition.type == 'class':
-        ds = definition.defined_names()
-        return [d] + [get_names_recursively(c, d) for c in ds]
-    else:
-        return [d]
-
-
-def defined_names(*args):
-    return list(map(get_names_recursively, jedi.api.defined_names(*args)))
-
-
-def get_module_version(module):
-    try:
-        from pkg_resources import get_distribution, DistributionNotFound
-        try:
-            return get_distribution(module.__name__).version
-        except DistributionNotFound:
-            pass
-    except ImportError:
-        pass
-
-    notfound = object()
-    for key in ['__version__', 'version']:
-        version = getattr(module, key, notfound)
-        if version is not notfound:
-            return version
-
-
-def get_jedi_version():
-    import epc
-    import sexpdata
-    return [dict(
-        name=module.__name__,
-        file=getattr(module, '__file__', []),
-        version=get_module_version(module) or [],
-    ) for module in [sys, jedi, epc, sexpdata]]
-
-
-def path_expand_vars_and_user(p):
-    return os.path.expandvars(os.path.expanduser(p))
-
-
-def jedi_epc_server(address='localhost', port=0, port_file=sys.stdout,
-                    sys_path=[], virtual_env=[],
-                    debugger=None, log=None, log_level=None,
-                    log_traceback=None):
-    default_venv = os.getenv('VIRTUAL_ENV')
-    if default_venv:
-        add_virtualenv_path(default_venv)
-
-    for p in virtual_env:
-        add_virtualenv_path(path_expand_vars_and_user(p))
-    sys_path = map(path_expand_vars_and_user, sys_path)
-    sys.path = [''] + list(filter(None, itertools.chain(sys_path, sys.path)))
-    # Workaround Jedi's module cache.  Use this workaround until Jedi
-    # got an API to set module paths.
-    # See also: https://github.com/davidhalter/jedi/issues/36
-    import_jedi()
-    import epc.server
-    server = epc.server.EPCServer((address, port))
-    server.register_function(complete)
-    server.register_function(get_in_function_call)
-    server.register_function(goto)
-    server.register_function(related_names)
-    server.register_function(get_definition)
-    server.register_function(defined_names)
-    server.register_function(get_jedi_version)
-
-    @server.register_function
-    def toggle_log_traceback():
-        server.log_traceback = not server.log_traceback
-        return server.log_traceback
-
-    port_file.write(str(server.server_address[1]))  # needed for Emacs client
-    port_file.write("\n")
-    port_file.flush()
-    if port_file is not sys.stdout:
-        port_file.close()
-
-    # This is not supported Python-EPC API, but I am using this for
-    # backward compatibility for Python-EPC < 0.0.4.  In the future,
-    # it should be passed to the constructor.
-    server.log_traceback = bool(log_traceback)
-
-    if log:
-        handler = logging.FileHandler(filename=log, mode='w')
-        if log_level:
-            log_level = getattr(logging, log_level.upper())
-            handler.setLevel(log_level)
-            server.logger.setLevel(log_level)
-        server.logger.addHandler(handler)
-    if debugger:
-        server.set_debugger(debugger)
-        handler = logging.StreamHandler()
-        handler.setLevel(logging.DEBUG)
-        server.logger.addHandler(handler)
-        server.logger.setLevel(logging.DEBUG)
-
-    return server
-
-
-def import_jedi():
-    global jedi
-    import jedi
-    import jedi.api
-
-
-def add_virtualenv_path(venv):
-    """Add virtualenv's site-packages to `sys.path`."""
-    venv = os.path.abspath(venv)
-    paths = glob.glob(os.path.join(
-        venv, 'lib', 'python*', 'site-packages'))
-    for path in paths:
-        site.addsitedir(path)
-
-
-def main(args=None):
-    import argparse
-    parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawTextHelpFormatter,
-        description=__doc__)
-    parser.add_argument(
-        '--address', default='localhost')
-    parser.add_argument(
-        '--port', default=0, type=int)
-    parser.add_argument(
-        '--port-file', '-f', default='-', type=argparse.FileType('wt'),
-        help='file to write port on.  default is stdout.')
-    parser.add_argument(
-        '--sys-path', '-p', default=[], action='append',
-        help='paths to be inserted at the top of `sys.path`.')
-    parser.add_argument(
-        '--virtual-env', '-v', default=[], action='append',
-        help='paths to be used as if VIRTUAL_ENV is set to it.')
-    parser.add_argument(
-        '--log', help='save server log to this file.')
-    parser.add_argument(
-        '--log-level',
-        choices=['CRITICAL', 'ERROR', 'WARN', 'INFO', 'DEBUG'],
-        help='logging level for log file.')
-    parser.add_argument(
-        '--log-traceback', action='store_true', default=False,
-        help='Include traceback in logging output.')
-    parser.add_argument(
-        '--pdb', dest='debugger', const='pdb', action='store_const',
-        help='start pdb when error occurs.')
-    parser.add_argument(
-        '--ipdb', dest='debugger', const='ipdb', action='store_const',
-        help='start ipdb when error occurs.')
-    ns = parser.parse_args(args)
-    server = jedi_epc_server(**vars(ns))
-    server.serve_forever()
-    server.logger.info('exit')
-
-
-if __name__ == '__main__':
-    main()
diff --git a/emacs.d/elpa/jedi-core-20150623.2335/Makefile b/emacs.d/elpa/jedi-core-20151214.705/Makefile
similarity index 100%
rename from emacs.d/elpa/jedi-core-20150623.2335/Makefile
rename to emacs.d/elpa/jedi-core-20151214.705/Makefile
diff --git a/emacs.d/elpa/jedi-core-20151214.705/jedi-core-autoloads.el b/emacs.d/elpa/jedi-core-20151214.705/jedi-core-autoloads.el
new file mode 100644
index 0000000..f00ef2a
--- /dev/null
+++ b/emacs.d/elpa/jedi-core-20151214.705/jedi-core-autoloads.el
@@ -0,0 +1,107 @@
+;;; jedi-core-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "jedi-core" "jedi-core.el" (22171 46560 0 0))
+;;; Generated autoloads from jedi-core.el
+
+(autoload 'jedi:start-dedicated-server "jedi-core" "\
+Start Jedi server dedicated to this buffer.
+This is useful, for example, when you want to use different
+`sys.path' for some buffer.  When invoked as an interactive
+command, it asks you how to start the Jedi server.  You can edit
+the command in minibuffer to specify the way Jedi server run.
+
+If you want to setup how Jedi server is started programmatically
+per-buffer/per-project basis, make `jedi:server-command' and
+`jedi:server-args' buffer local and set it in `python-mode-hook'.
+See also: `jedi:server-args'.
+
+\(fn COMMAND)" t nil)
+
+(autoload 'helm-jedi-related-names "jedi-core" "\
+Find related names of the object at point using `helm' interface.
+
+\(fn)" t nil)
+
+(autoload 'anything-jedi-related-names "jedi-core" "\
+Find related names of the object at point using `anything' interface.
+
+\(fn)" t nil)
+
+(autoload 'jedi:setup "jedi-core" "\
+Fully setup jedi.el for current buffer.
+It setups `ac-sources' or `company-backends' and turns
+`jedi-mode' on.
+
+This function is intended to be called from `python-mode-hook',
+like this::
+
+       (add-hook 'python-mode-hook 'jedi:setup)
+
+You can also call this function as a command, to quickly test
+what jedi can do.
+
+\(fn)" t nil)
+
+(autoload 'jedi:install-server "jedi-core" "\
+This command installs Jedi server script jediepcserver.py in a
+Python environment dedicated to Emacs.  By default, the
+environment is at ``~/.emacs.d/.python-environments/default/``.
+This environment is automatically created by ``virtualenv`` if it
+does not exist.
+
+Run this command (i.e., type ``M-x jedi:install-server RET``)
+whenever Jedi.el shows a message to do so.  It is a good idea to
+run this every time after you update Jedi.el to sync version of
+Python modules used by Jedi.el and Jedi.el itself.
+
+You can modify the location of the environment by changing
+`jedi:environment-root' and/or `python-environment-directory'.  More
+specifically, Jedi.el will install Python modules under the directory
+``PYTHON-ENVIRONMENT-DIRECTORY/JEDI:ENVIRONMENT-ROOT``.  Note that you
+need command line program ``virtualenv``.  If you have the command in
+an unusual location, use `python-environment-virtualenv' to specify the
+location.
+
+.. NOTE:: jediepcserver.py is installed in a virtual environment but it
+   does not mean Jedi.el cannot recognize the modules in virtual
+   environment you are using for your Python development.  Jedi
+   EPC server recognize the virtualenv it is in (i.e., the
+   environment variable ``VIRTUAL_ENV`` in your Emacs) and then
+   add modules in that environment to its ``sys.path``.  You can
+   also add ``--virtual-env PATH/TO/ENV`` to `jedi:server-args'
+   to include modules of virtual environment even you launch
+   Emacs outside of the virtual environment.
+
+.. NOTE:: It is highly recommended to use this command to install
+   Python modules for Jedi.el.  You still can install Python
+   modules used by Jedi.el manually.  However, you are then
+   responsible for keeping Jedi.el and Python modules compatible.
+
+See also:
+
+- https://github.com/tkf/emacs-jedi/pull/72
+- https://github.com/tkf/emacs-jedi/issues/140#issuecomment-37358527
+
+\(fn)" t nil)
+
+(autoload 'jedi:install-server-block "jedi-core" "\
+Blocking version `jedi:install-server'.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("jedi-core-pkg.el") (22171 46560 853306
+;;;;;;  0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; jedi-core-autoloads.el ends here
diff --git a/emacs.d/elpa/jedi-core-20151214.705/jedi-core-pkg.el b/emacs.d/elpa/jedi-core-20151214.705/jedi-core-pkg.el
new file mode 100644
index 0000000..74e193a
--- /dev/null
+++ b/emacs.d/elpa/jedi-core-20151214.705/jedi-core-pkg.el
@@ -0,0 +1,8 @@
+(define-package "jedi-core" "20151214.705" "Common code of jedi.el and company-jedi.el"
+  '((emacs "24")
+    (epc "0.1.0")
+    (python-environment "0.0.2")
+    (cl-lib "0.5")))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/jedi-core-20151214.705/jedi-core.el b/emacs.d/elpa/jedi-core-20151214.705/jedi-core.el
new file mode 100644
index 0000000..e2408f7
--- /dev/null
+++ b/emacs.d/elpa/jedi-core-20151214.705/jedi-core.el
@@ -0,0 +1,1284 @@
+;;; jedi-core.el --- Common code of jedi.el and company-jedi.el -*- lexical-binding: t; -*-
+
+;; Author: Takafumi Arakaki <aka.tkf at gmail.com>
+;; Package-Requires: ((emacs "24") (epc "0.1.0") (python-environment "0.0.2") (cl-lib "0.5"))
+;; Version: 0.2.7
+
+;; This file is NOT part of GNU Emacs.
+
+;; jedi.el 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.
+
+;; jedi.el 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 jedi.el.
+;; If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'ring)
+
+(require 'epc)
+(require 'python-environment)
+
+(declare-function popup-tip "popup")
+(declare-function pos-tip-show "pos-tip")
+
+
+(defgroup jedi nil
+  "Auto-completion for Python."
+  :group 'completion
+  :prefix "jedi:")
+
+(defconst jedi:version "0.2.7")
+
+(defvar jedi:source-dir (if load-file-name
+                            (file-name-directory load-file-name)
+                          default-directory))
+
+(defvar jedi:epc nil)
+(make-variable-buffer-local 'jedi:epc)
+
+(defvar jedi:server-script
+  (convert-standard-filename
+   (expand-file-name "jediepcserver.py" jedi:source-dir))
+  "Full path to Jedi server script file ``jediepcserver.py``.")
+
+(defvar jedi:setup-function nil)
+(defvar jedi:mode-function nil)
+
+
+;;; Configuration variables
+
+(defcustom jedi:environment-root nil
+  "Name of Python environment to use.
+If it is nil, `python-environment-default-root-name' is used.
+
+You can specify a full path instead of a name (relative path).
+In that case, `python-environment-directory' is ignored and
+Python virtual environment is created at the specified path."
+  :group 'jedi)
+
+(defcustom jedi:environment-virtualenv nil
+  "``virtualenv`` command to use.  A list of string.
+If it is nil, `python-environment-virtualenv' is used instead.
+
+You must set non-`nil' value to `jedi:environment-root' in order
+to make this setting work."
+  :group 'jedi)
+
+(defun jedi:-env-server-command ()
+  (let* ((getbin (lambda (x) (python-environment-bin x jedi:environment-root)))
+         (script (or (funcall getbin "jediepcserver")
+                     (funcall getbin "jediepcserver.py"))))
+    (when script
+      (list script))))
+
+(defcustom jedi:server-command
+  (or (jedi:-env-server-command)
+      (list "python" jedi:server-script))
+  "Command used to run Jedi server.
+
+.. NOTE::
+
+   If you used `jedi:install-server' (recommended) to install
+   Python server jediepcserver.py, you don't need to mess around
+   with jediepcserver.py.  Jedi.el handles everything
+   automatically.
+
+If you install Python server jediepcserver.py using
+`jedi:install-server' command, `jedi:server-command' should be
+automatically set to::
+
+    '(\"~/.emacs.d/.python-environments/default/bin/jediepcserver.py\")
+
+Otherwise, it is set to::
+
+    '(\"python\" \"JEDI:SOURCE-DIR/jediepcserver.py\")
+
+.. NOTE:: If you installed jediepcserver.py manually, then you
+   have to set `jedi:server-command' appropriately.
+
+   If you can run ``jediepcserver.py --help`` in your shell, then
+   you can simply set::
+
+       (setq jedi:server-command '(\"jediepcserver.py\"))
+
+   Otherwise, you need to find where you installed
+   jediepcserver.py then set the path directly::
+
+       (setq jedi:server-command '(\"PATH/TO/jediepcserver.py\"))
+
+If you want to use a specific version of Python, setup
+`jedi:environment-virtualenv' variable appropriately and
+reinstall jediepcserver.py.
+
+If you want to pass some arguments to the Jedi server command,
+use `jedi:server-args' instead of appending them
+`jedi:server-command'."
+  :group 'jedi)
+
+(defcustom jedi:server-args nil
+  "Command line arguments to be appended to `jedi:server-command'.
+
+If you want to add some special `sys.path' when starting Jedi
+server, do something like this::
+
+    (setq jedi:server-args
+          '(\"--sys-path\" \"MY/SPECIAL/PATH\"
+            \"--sys-path\" \"MY/OTHER/SPECIAL/PATH\"))
+
+If you want to include some virtualenv, do something like the
+following.  Note that actual environment variable ``VIRTUAL_ENV``
+is treated automatically so you don't need to pass it.  Also,
+you need to start Jedi EPC server with the same python version
+that you use for the virtualenv.::
+
+    (setq jedi:server-args
+          '(\"--virtual-env\" \"SOME/VIRTUAL_ENV_1\"
+            \"--virtual-env\" \"SOME/VIRTUAL_ENV_2\"))
+
+To see what other arguments Jedi server can take, execute the
+following command::
+
+    python jediepcserver.py --help
+
+
+**Advanced usage**
+
+Sometimes you want to configure how Jedi server is started per
+buffer.  To do that, you should make this variable buffer local
+in `python-mode-hook' and set it to some buffer specific variable,
+like this::
+
+  (defun my-jedi-server-setup ()
+    (let ((cmds (GET-SOME-PROJECT-SPECIFIC-COMMAND))
+          (args (GET-SOME-PROJECT-SPECIFIC-ARGS)))
+      (when cmds (set (make-local-variable 'jedi:server-command) cmds))
+      (when args (set (make-local-variable 'jedi:server-args) args))))
+
+  (add-hook 'python-mode-hook 'my-jedi-server-setup)
+
+Note that Jedi server run by the same command is pooled.  So,
+there is only one Jedi server for the same set of command.  If
+you want to check how many EPC servers are running, use the EPC
+GUI: M-x `epc:controller'.  You will see a table of EPC connections
+for Jedi.el and other EPC applications.
+
+If you want to start a new ad-hoc server for the current buffer,
+use the command `jedi:start-dedicated-server'."
+  :group 'jedi)
+
+(defcustom jedi:complete-on-dot nil
+  "Non-`nil' means automatically start completion after inserting a dot.
+To make this option work, you need to use `jedi:setup' instead of
+`jedi:ac-setup' to start Jedi."
+  :group 'jedi)
+
+(defcustom jedi:tooltip-method '(pos-tip popup)
+  "Configuration for `jedi:tooltip-show'.
+This is a list which may contain symbol(s) `pos-tip' and/or
+`popup'.  It determines tooltip method to use.  Setting this
+value to nil means to use minibuffer instead of tooltip."
+  :group 'jedi)
+
+(defcustom jedi:get-in-function-call-timeout 3000
+  "Cancel request to server for call signature after this period
+specified in in millisecond."
+  :group 'jedi)
+
+(defcustom  jedi:get-in-function-call-delay 1000
+  "How long Jedi should wait before showing call signature
+tooltip in millisecond."
+  :group 'jedi)
+
+(defcustom jedi:goto-definition-config
+  '((nil nil        nil)
+    (t   nil        nil)
+    (nil definition nil)
+    (t   definition nil)
+    (nil nil        t  )
+    (t   nil        t  )
+    (nil definition t  )
+    (t   definition t  ))
+  "Configure how prefix argument modifies `jedi:goto-definition' behavior.
+
+Each element of the list is arguments (list) passed to
+`jedi:goto-definition'.  Note that this variable has no effect on
+`jedi:goto-definition' when it is used as a lisp function
+
+The following setting is default (last parts are omitted).
+Nth element is used as the argument when N universal prefix
+arguments (``C-u``) are given.::
+
+    (setq jedi:goto-definition-config
+          '((nil nil        nil)        ; C-.
+            (t   nil        nil)        ; C-u C-.
+            (nil definition nil)        ; C-u C-u C-.
+            (t   definition nil)        ; C-u C-u C-u C-.
+            ...))
+
+For example, if you want to follow \"substitution path\" by default,
+use the setting like this::
+
+    (setq jedi:goto-definition-config
+          '((nil definition nil)
+            (t   definition nil)
+            (nil nil        nil)
+            (t   nil        nil)
+            (nil definition t  )
+            (t   definition t  )
+            (nil nil        t  )
+            (t   nil        t  )))
+
+You can rearrange the order to have most useful sets of arguments
+at the top."
+  :group 'jedi)
+
+(defcustom jedi:doc-mode 'rst-mode
+  "Major mode to use when showing document."
+  :group 'jedi)
+
+(defcustom jedi:doc-hook '(view-mode)
+  "The hook that's run after showing a document."
+  :type 'hook
+  :group 'jedi)
+
+(defcustom jedi:doc-display-buffer 'display-buffer
+  "A function to be called with a buffer to show document."
+  :group 'jedi)
+
+(defcustom jedi:install-imenu nil
+  "[EXPERIMENTAL] If `t', use Jedi to create `imenu' index.
+To use this feature, you need to install the developmental
+version (\"dev\" branch) of Jedi."
+  :group 'jedi)
+
+(defcustom jedi:imenu-create-index-function 'jedi:create-nested-imenu-index
+  "`imenu-create-index-function' for Jedi.el.
+It must be a function that takes no argument and return an object
+described in `imenu--index-alist'.
+This can be set to `jedi:create-flat-imenu-index'.
+Default is `jedi:create-nested-imenu-index'."
+  :group 'jedi)
+
+(make-obsolete-variable 'jedi:setup-keys nil "0.1.3")
+(defcustom jedi:setup-keys nil
+  "Setup recommended keybinds.
+
+.. warning:: Use of this value is obsolete now.  As of 0.1.3,
+   jedi.el has default keybinds, which are different than these. See also
+   `jedi-mode'.
+
+.. admonition:: Default keybinds
+
+   ``<C-tab>`` : = `jedi:key-complete'
+       Complete code at point. (`jedi:complete')
+
+   ``C-.`` : = `jedi:key-goto-definition'
+       Goto the definition of the object at point. (`jedi:goto-definition')
+
+   ``C-c d`` : = `jedi:key-show-doc'
+       Show the documentation of the object at point. (`jedi:show-doc')
+
+   ``C-c r`` : = `jedi:key-related-names'
+       Find related names of the object at point.
+       (`helm-jedi-related-names' / `anything-jedi-related-names')
+
+When `jedi:setup-keys' is non-`nil', recommended keybinds are set
+in `jedi-mode-map' when **loading** jedi.el.  Therefore, you must
+set this value before jedi.el is loaded.  As recommended usage of
+jedi.el is to call `jedi:setup' via `python-mode-hook' where
+`jedi:setup' is autloaded, setting `jedi:setup-keys' to `t' in
+you emacs setup (e.g., ``.emacs.d/init.el``) works fine.::
+
+    (setq jedi:setup-keys t)
+    (add-hook 'python-mode-hook 'jedi:setup)
+
+If you want to require jedi.el explicitly when loading Emacs,
+make sure to set `jedi:setup-keys' before loading jedi.el::
+
+    (setq jedi:setup-keys t)
+    (require 'jedi)
+
+Byte compiler warns about unbound variable if you set
+`jedi:setup-keys' before loading jedi.el.  The proper way to
+suppress this warning is the following::
+
+    (eval-when-compile (require 'jedi nil t))
+    (setq jedi:setup-keys t)
+
+You can change these keybinds by changing `jedi:key-complete',
+`jedi:key-goto-definition', `jedi:key-show-doc', and
+`jedi:key-related-names'.  For example, default keybind for
+ropemacs's `rope-show-doc' is same as `jedi:show-doc'.  You can
+avoid collision by something like this::
+
+    (setq jedi:key-show-doc (kbd \"C-c D\"))"
+  :group 'jedi)
+
+(defcustom jedi:key-complete (kbd "<C-tab>")
+  "Keybind for command `jedi:complete'."
+  :group 'jedi)
+
+(defcustom jedi:key-goto-definition (kbd "C-.")
+  "Keybind for command `jedi:goto-definition'."
+  :group 'jedi)
+
+(defcustom jedi:key-show-doc (kbd "C-c d")
+  "Keybind for command `jedi:show-doc'."
+  :group 'jedi)
+
+(defcustom jedi:key-related-names (kbd "C-c r")
+  "Keybind for command `helm-jedi-related-names' or
+`anything-jedi-related-names'."
+  :group 'jedi)
+
+(defcustom jedi:key-goto-definition-pop-marker (kbd "C-,")
+  "Keybind for command `jedi:goto-definition-pop-marker'."
+  :group 'jedi)
+
+(defcustom jedi:use-shortcuts nil
+  "If non-`nil', enable the following shortcuts:
+
+| ``M-.``  `jedi:goto-definition'
+| ``M-,``  `jedi:goto-definition-pop-marker'
+"
+  :group 'jedi)
+
+(defcustom jedi:import-python-el-settings t
+  "Automatically import setting from python.el variables."
+  :group 'jedi)
+
+(defcustom jedi:goto-definition-marker-ring-length 16
+  "Length of marker ring to store `jedi:goto-definition' call positions"
+  :group 'jedi)
+
+
+;;; Internal variables
+
+(defvar jedi:get-in-function-call--d nil
+  "Bounded to deferred object while requesting get-in-function-call.")
+
+(defvar jedi:defined-names--singleton-d nil
+  "Bounded to deferred object while requesting defined_names.")
+
+
+;;; Jedi mode
+
+(defvar jedi-mode-map (make-sparse-keymap))
+
+(defun jedi:handle-post-command ()
+  (jedi:get-in-function-call-when-idle))
+
+(define-minor-mode jedi-mode
+  "Jedi mode.
+When `jedi-mode' is on, call signature is automatically shown as
+toolitp when inside of function call.
+
+\\{jedi-mode-map}"
+  :keymap jedi-mode-map
+  :group 'jedi
+  (let ((map jedi-mode-map))
+    (when jedi:use-shortcuts
+      (define-key map (kbd "M-.") 'jedi:goto-definition)
+      (define-key map (kbd "M-,") 'jedi:goto-definition-pop-marker)))
+  (if jedi-mode
+      (progn
+        (when jedi:install-imenu
+          (jedi:defined-names-deferred)
+          (setq imenu-create-index-function jedi:imenu-create-index-function))
+        (add-hook 'post-command-hook 'jedi:handle-post-command nil t)
+        (add-hook 'kill-buffer-hook 'jedi:server-pool--gc-when-idle nil t))
+    (remove-hook 'post-command-hook 'jedi:handle-post-command t)
+    (remove-hook 'kill-buffer-hook 'jedi:server-pool--gc-when-idle t)
+    (jedi:server-pool--gc-when-idle))
+  (when jedi:mode-function
+    (funcall jedi:mode-function)))
+
+;; Define keybinds.
+;; See: https://github.com/tkf/emacs-jedi/issues/47
+(let ((map jedi-mode-map))
+  (when (and (boundp 'auto-complete-mode) auto-complete-mode)
+    (define-key map (kbd "<C-tab>") 'jedi:complete))
+  (define-key map (kbd "C-c ?") 'jedi:show-doc)
+  (define-key map (kbd "C-c .") 'jedi:goto-definition)
+  (define-key map (kbd "C-c ,") 'jedi:goto-definition-pop-marker)
+  (let ((command (cond
+                  ((featurep 'helm) 'helm-jedi-related-names)
+                  ((featurep 'anything) 'anything-jedi-related-names)
+                  ((locate-library "helm") 'helm-jedi-related-names)
+                  ((locate-library "anything") 'anything-jedi-related-names))))
+    (when command
+      (define-key map (kbd "C-c /") command))))
+
+(when jedi:setup-keys
+  (let ((map jedi-mode-map))
+    (define-key map jedi:key-complete        'jedi:complete)
+    (define-key map jedi:key-goto-definition 'jedi:goto-definition)
+    (define-key map jedi:key-show-doc        'jedi:show-doc)
+    (define-key map jedi:key-goto-definition-pop-marker
+      'jedi:goto-definition-pop-marker)
+    (let ((command (cond
+                    ((featurep 'helm) 'helm-jedi-related-names)
+                    ((featurep 'anything) 'anything-jedi-related-names))))
+      (when command
+        (define-key map jedi:key-related-names command)))))
+
+
+;;; EPC utils
+
+(defun jedi:epc--live-p (mngr)
+  "Return non-nil when MNGR is an EPC manager object with a live
+connection."
+  (let ((proc (ignore-errors
+                (epc:connection-process (epc:manager-connection mngr)))))
+    (and (processp proc)
+         ;; Same as `process-live-p' in Emacs >= 24:
+         (memq (process-status proc) '(run open listen connect stop)))))
+
+(defmacro jedi:-with-run-on-error (body &rest run-on-error)
+  (declare (indent 1))
+  `(let ((something-happened t))
+     (unwind-protect
+         (prog1 ,body
+           (setq something-happened nil))
+       (when something-happened
+         ,@run-on-error))))
+
+(defun jedi:epc--start-epc (server-prog server-args)
+  "Same as `epc:start-epc', but set query-on-exit flag for
+associated processes to nil."
+  (let ((mngr (jedi:-with-run-on-error
+                  (epc:start-epc server-prog server-args)
+                (display-warning 'jedi "\
+Failed to start Jedi EPC server.
+*** You may need to run \"M-x jedi:install-server\". ***
+This could solve the problem especially if you haven't run the command yet
+since Jedi.el installation or update and if the server complains about
+Python module imports." :error))))
+    (set-process-query-on-exit-flag (epc:connection-process
+                                     (epc:manager-connection mngr))
+                                    nil)
+    (set-process-query-on-exit-flag (epc:manager-server-process mngr) nil)
+    mngr))
+
+
+;;; Server pool
+
+(defvar jedi:server-pool--table (make-hash-table :test 'equal)
+  "A hash table that holds a pool of EPC server instances.")
+
+(defun jedi:server-pool--start (command)
+  "Get an EPC server instance from server pool by COMMAND as a
+key, or start new one if there is none."
+  (let ((cached (gethash command jedi:server-pool--table)))
+    (if (and cached (jedi:epc--live-p cached))
+        cached
+      (let* ((default-directory "/")
+             (mngr (jedi:epc--start-epc (car command) (cdr command))))
+        (puthash command mngr jedi:server-pool--table)
+        (jedi:server-pool--gc-when-idle)
+        mngr))))
+
+(defun jedi:-get-servers-in-use ()
+  "Return a list of non-nil `jedi:epc' in all buffers."
+  (cl-loop with mngr-list
+           for buffer in (buffer-list)
+           for mngr = (with-current-buffer buffer jedi:epc)
+           when (and mngr (not (memq mngr mngr-list)))
+           collect mngr into mngr-list
+           finally return mngr-list))
+
+(defvar jedi:server-pool--gc-timer nil)
+
+(defun jedi:server-pool--gc ()
+  "Stop unused servers."
+  (let ((servers-in-use (jedi:-get-servers-in-use)))
+    (maphash
+     (lambda (key mngr)
+       (unless (memq mngr servers-in-use)
+         (remhash key jedi:server-pool--table)
+         (epc:stop-epc mngr)))
+     jedi:server-pool--table))
+  ;; Clear timer so that GC is started next time
+  ;; `jedi:server-pool--gc-when-idle' is called.
+  (setq jedi:server-pool--gc-timer nil))
+
+(defun jedi:server-pool--gc-when-idle ()
+  "Run `jedi:server-pool--gc' when idle."
+  (unless jedi:server-pool--gc-timer
+    (setq jedi:server-pool--gc-timer
+          (run-with-idle-timer 10 nil 'jedi:server-pool--gc))))
+
+
+;;; Server management
+
+(defun jedi:start-server ()
+  (if (jedi:epc--live-p jedi:epc)
+      (message "Jedi server is already started!")
+    (setq jedi:epc (jedi:server-pool--start
+                    (append jedi:server-command jedi:server-args))))
+  jedi:epc)
+
+(defun jedi:stop-server ()
+  "Stop Jedi server.  Use this command when you want to restart
+Jedi server (e.g., when you changed `jedi:server-command' or
+`jedi:server-args').  Jedi srever will be restarted automatically
+later when it is needed."
+  (interactive)
+  (if jedi:epc
+      (epc:stop-epc jedi:epc)
+    (message "Jedi server is already killed."))
+  (setq jedi:epc nil)
+  ;; It could be non-nil due to some error.  Rescue it in that case.
+  (setq jedi:get-in-function-call--d nil)
+  (setq jedi:defined-names--singleton-d nil))
+
+(defun jedi:get-epc ()
+  (if (jedi:epc--live-p jedi:epc)
+      jedi:epc
+    (jedi:start-server)))
+
+;;;###autoload
+(defun jedi:start-dedicated-server (command)
+  "Start Jedi server dedicated to this buffer.
+This is useful, for example, when you want to use different
+`sys.path' for some buffer.  When invoked as an interactive
+command, it asks you how to start the Jedi server.  You can edit
+the command in minibuffer to specify the way Jedi server run.
+
+If you want to setup how Jedi server is started programmatically
+per-buffer/per-project basis, make `jedi:server-command' and
+`jedi:server-args' buffer local and set it in `python-mode-hook'.
+See also: `jedi:server-args'."
+  (interactive
+   (list (split-string-and-unquote
+          (read-string "Run Jedi server: "
+                       (mapconcat
+                        #'identity
+                        (append jedi:server-command
+                                jedi:server-args)
+                        " ")))))
+  ;; Reset `jedi:epc' so that a new server is created when COMMAND is
+  ;; new.  If it is already in the server pool, the server instance
+  ;; already in the pool is picked up by `jedi:start-server'.
+  (setq jedi:epc nil)
+  ;; Set `jedi:server-command', so that this command is used
+  ;; when restarting EPC server of this buffer.
+  (set (make-local-variable 'jedi:server-command) command)
+  (set (make-local-variable 'jedi:server-args) nil)
+  (jedi:start-server))
+
+(defun jedi:-buffer-file-name ()
+  "Return `buffer-file-name' without text properties.
+See: https://github.com/tkf/emacs-jedi/issues/54"
+  (substring-no-properties (or (buffer-file-name) "")))
+
+(defun jedi:call-deferred (method-name)
+  "Call ``Script(...).METHOD-NAME`` and return a deferred object."
+  (let ((source      (buffer-substring-no-properties (point-min) (point-max)))
+        (line        (count-lines (point-min) (min (1+ (point)) (point-max))))
+        (column      (- (point) (line-beginning-position)))
+        (source-path (jedi:-buffer-file-name)))
+    (epc:call-deferred (jedi:get-epc)
+                       method-name
+                       (list source line column source-path))))
+
+
+;;; Completion
+
+(defvar jedi:complete-reply nil
+  "Last reply to `jedi:complete-request'.")
+
+(defvar jedi:complete-request-point 0
+  ;; It is passed to `=', so do not initialize this value by `nil'.
+  "The point where `jedi:complete-request' is called.")
+
+(defun jedi:complete-request ()
+  "Request ``Script(...).complete`` and return a deferred object.
+`jedi:complete-reply' is set to the reply sent from the server."
+  (setq jedi:complete-request-point (point))
+  (deferred:nextc (jedi:call-deferred 'complete)
+    (lambda (reply)
+      (setq jedi:complete-reply reply))))
+
+
+;;; Call signature (get_in_function_call)
+
+(defface jedi:highlight-function-argument
+  '((t (:inherit bold)))
+  "Face used for the argument at point in a function's argument list"
+  :group 'jedi)
+
+(cl-defun jedi:get-in-function-call--construct-call-signature
+    (&key params index call_name)
+  (if (not index)
+      (concat call_name "()")
+    (let ((current-arg (nth index params)))
+      (when (and current-arg (null jedi:tooltip-method))
+        (setf (nth index params)
+              (propertize current-arg 'face 'jedi:highlight-function-argument)))
+      (concat call_name "(" (mapconcat #'identity params ", ") ")"))))
+
+(defun jedi:get-in-function-call--tooltip-show (args)
+  (when (and args (or (and (boundp 'ac-completing) (not ac-completing))
+                      (and (boundp 'company-pseudo-tooltip-overlay)
+                           (not company-pseudo-tooltip-overlay))))
+    (jedi:tooltip-show
+     (apply #'jedi:get-in-function-call--construct-call-signature args))))
+
+(defun jedi:get-in-function-call ()
+  "Manually show call signature tooltip."
+  (interactive)
+  (deferred:nextc
+    (jedi:call-deferred 'get_in_function_call)
+    #'jedi:get-in-function-call--tooltip-show))
+
+(defun jedi:get-in-function-call-when-idle ()
+  "Show tooltip when Emacs is ilde."
+  (unless jedi:get-in-function-call--d
+    (setq jedi:get-in-function-call--d
+          (deferred:try
+            (deferred:$
+              (deferred:wait-idle jedi:get-in-function-call-delay)
+              (deferred:nextc it
+                (lambda ()
+                  (when jedi-mode         ; cursor may be moved
+                    (deferred:timeout
+                      jedi:get-in-function-call-timeout
+                      nil
+                      (jedi:call-deferred 'get_in_function_call)))))
+              (deferred:nextc it #'jedi:get-in-function-call--tooltip-show))
+            :finally
+            (lambda ()
+              (setq jedi:get-in-function-call--d nil))))))
+
+(defun jedi:tooltip-show (string)
+  (cond
+   ((and (memq 'pos-tip jedi:tooltip-method) window-system
+         (featurep 'pos-tip))
+    (pos-tip-show (jedi:string-fill-paragraph string)
+                  'popup-tip-face nil nil 0))
+   ((and (memq 'popup jedi:tooltip-method)
+         (featurep 'popup))
+    (popup-tip string))
+   (t (when (stringp string)
+        (let ((message-log-max nil))
+          (message string))))))
+
+(defun jedi:string-fill-paragraph (string &optional justify)
+  (with-temp-buffer
+    (erase-buffer)
+    (insert string)
+    (goto-char (point-min))
+    (fill-paragraph justify)
+    (buffer-string)))
+
+
+;;; Goto
+
+(defvar jedi:goto-definition--index nil)
+(defvar jedi:goto-definition--cache nil)
+(defvar jedi:goto-definition--marker-ring
+  (make-ring jedi:goto-definition-marker-ring-length)
+  "Marker ring that stores `jedi:goto-definition' call positions")
+
+(defun jedi:goto-definition (&optional other-window deftype use-cache index)
+  "Goto the definition of the object at point.
+
+See `jedi:goto-definition-config' for how this function works
+when universal prefix arguments \(``C-u``) are given.  If
+*numeric* prefix argument(s) \(e.g., ``M-0``) are given, goto
+point of the INDEX-th result.  Note that you cannot mix universal
+and numeric prefixes.  It is Emacs's limitation.  If you mix both
+kinds of prefix, you get numeric prefix.
+
+When used as a lisp function, popup a buffer when OTHER-WINDOW is
+non-nil.  DEFTYPE must be either `assignment' (default) or
+`definition'.  When USE-CACHE is non-nil, use the locations of
+the last invocation of this command.  If INDEX is specified, goto
+INDEX-th result."
+  (interactive
+   (if (integerp current-prefix-arg)
+       (list nil nil nil current-prefix-arg)
+     (nth (let ((i (car current-prefix-arg)))
+            (if i (floor (log i 4)) 0))
+          jedi:goto-definition-config)))
+  (cond
+   ((and (or use-cache index)
+         jedi:goto-definition--cache)
+    (setq jedi:goto-definition--index (or index 0))
+    (jedi:goto-definition--nth other-window))
+   ((and (eq last-command 'jedi:goto-definition)
+         (> (length jedi:goto-definition--cache) 1))
+    (jedi:goto-definition-next other-window))
+   (t
+    (setq jedi:goto-definition--index (or index 0))
+    (deferred:nextc (jedi:call-deferred
+                     (cl-case deftype
+                       ((assignment nil) 'goto)
+                       (definition 'get_definition)
+                       (t (error "Unsupported deftype: %s" deftype))))
+      (lambda (reply)
+        (jedi:goto-definition--callback reply other-window))))))
+
+(defun jedi:goto-definition-push-marker ()
+  "Push point onto goto-definition marker ring."
+  (ring-insert jedi:goto-definition--marker-ring (point-marker)))
+
+(defun jedi:goto-definition-pop-marker ()
+  "Goto the last point where `jedi:goto-definition' was called."
+  (interactive)
+  (if (ring-empty-p jedi:goto-definition--marker-ring)
+      (error "Jedi marker ring is empty, can't pop")
+    (let ((marker (ring-remove jedi:goto-definition--marker-ring 0)))
+      (switch-to-buffer (or (marker-buffer marker)
+                            (error "Buffer has been deleted")))
+      (goto-char (marker-position marker))
+      ;; Cleanup the marker so as to avoid them piling up.
+      (set-marker marker nil nil))))
+
+(defun jedi:goto-definition-next (&optional other-window)
+  "Goto the next cached definition.  See: `jedi:goto-definition'."
+  (interactive "P")
+  (let ((len (length jedi:goto-definition--cache))
+        (n (1+ jedi:goto-definition--index)))
+    (setq jedi:goto-definition--index (if (>= n len) 0 n))
+    (jedi:goto-definition--nth other-window)))
+
+(defun jedi:goto-definition--callback (reply other-window)
+  (if (not reply)
+      (message "Definition not found.")
+    (setq jedi:goto-definition--cache reply)
+    (jedi:goto-definition--nth other-window t)))
+
+(defun jedi:goto--line-column (line column)
+  "Like `goto-char' but specify the position by LINE and COLUMN."
+  (goto-char (point-min))
+  (forward-line (1- line))
+  (forward-char column))
+
+(defun jedi:goto-definition--nth (other-window &optional try-next)
+  (let* ((len (length jedi:goto-definition--cache))
+         (n jedi:goto-definition--index)
+         (next (lambda ()
+                 (when (< n (1- len))
+                   (cl-incf jedi:goto-definition--index)
+                   (jedi:goto-definition--nth other-window)
+                   t))))
+    (cl-destructuring-bind (&key line_nr column module_path module_name
+                                 &allow-other-keys)
+        (nth n jedi:goto-definition--cache)
+      (cond
+       ((equal module_name "__builtin__")
+        (unless (and try-next (funcall next))
+          (message "Cannot see the definition of __builtin__.")))
+       ((not (and module_path (file-exists-p module_path)))
+        (unless (and try-next (funcall next))
+          (message "File '%s' does not exist." module_path)))
+       (t
+        (jedi:goto-definition-push-marker)
+        (funcall (if other-window #'find-file-other-window #'find-file)
+                 module_path)
+        (jedi:goto--line-column line_nr column)
+        (jedi:goto-definition--notify-alternatives len n))))))
+
+(defun jedi:goto-definition--notify-alternatives (len n)
+  (unless (= len 1)
+    (message
+     "%d-th point in %d candidates.%s"
+     (1+ n)
+     len
+     ;; Note: It must be `last-command', not `last-command' because
+     ;;       this function is called in deferred at the first time.
+     (if (eq last-command 'jedi:goto-definition)
+         (format "  Type %s to go to the next point."
+                 (key-description
+                  (car (where-is-internal 'jedi:goto-definition))))
+       ""))))
+
+
+;;; Full name
+
+(defun jedi:get-full-name-deferred ()
+  (deferred:$
+    (jedi:call-deferred 'get_definition)
+    (deferred:nextc it
+      (lambda (reply)
+        (cl-loop for def in reply
+                 do (cl-destructuring-bind (&key full_name &allow-other-keys)
+                        def
+                      (when full_name
+                        (return full_name))))))))
+
+(cl-defun jedi:get-full-name-sync (&key (timeout 500))
+  (epc:sync
+   (jedi:get-epc)
+   (deferred:timeout timeout nil (jedi:get-full-name-deferred))))
+
+
+;;; Related names
+
+(defun jedi:related-names--source (name candidates)
+  `((name . ,name)
+    (candidates . ,candidates)
+    (recenter)
+    (type . file-line)))
+
+(defun jedi:related-names--to-file-line (reply)
+  (mapcar
+   (lambda (x)
+     (cl-destructuring-bind
+         (&key line_nr module_name module_path description &allow-other-keys)
+         x
+       (format "%s:%s: %s - %s" module_path line_nr
+               module_name description)))
+   reply))
+
+(defun jedi:related-names--helm (helm)
+  (deferred:nextc
+    (let ((to-file-line #'jedi:related-names--to-file-line))
+      (deferred:parallel
+        (deferred:nextc (jedi:call-deferred 'related_names) to-file-line)
+        (deferred:nextc (jedi:call-deferred 'goto)          to-file-line)))
+    (lambda (candidates-list)
+      (funcall
+       helm
+       :sources (list (jedi:related-names--source "Jedi Related Names"
+                                                  (car candidates-list))
+                      (jedi:related-names--source "Jedi Goto"
+                                                  (cadr candidates-list)))
+       :buffer (format "*%s jedi:related-names*" helm)))))
+
+;;;###autoload
+(defun helm-jedi-related-names ()
+  "Find related names of the object at point using `helm' interface."
+  (interactive)
+  (jedi:related-names--helm 'helm))
+
+;;;###autoload
+(defun anything-jedi-related-names ()
+  "Find related names of the object at point using `anything' interface."
+  (interactive)
+  (jedi:related-names--helm 'anything))
+
+
+;;; Show document (get-definition)
+
+(defvar jedi:doc-buffer-name "*jedi:doc*")
+
+(defun jedi:show-doc ()
+  "Show the documentation of the object at point."
+  (interactive)
+  (deferred:nextc (jedi:call-deferred 'get_definition)
+    (lambda (reply)
+      (with-current-buffer (get-buffer-create jedi:doc-buffer-name)
+        (cl-loop with has-doc = nil
+                 with first = t
+                 with inhibit-read-only = t
+                 initially (erase-buffer)
+                 for def in reply
+                 do (cl-destructuring-bind
+                        (&key doc desc_with_module &allow-other-keys)
+                        def
+                      (unless (or (null doc) (equal doc ""))
+                        (if first
+                            (setq first nil)
+                          (insert "\n\n---\n\n"))
+                        (insert "Docstring for " desc_with_module "\n\n" doc)
+                        (setq has-doc t)))
+                 finally do
+                 (if (not has-doc)
+                     (message "Document not found.")
+                   (progn
+                     (goto-char (point-min))
+                     (when (fboundp jedi:doc-mode)
+                       (funcall jedi:doc-mode))
+                     (run-hooks 'jedi:doc-hook)
+                     (funcall jedi:doc-display-buffer (current-buffer)))))))))
+
+
+;;; Defined names (imenu)
+
+(defvar jedi:defined-names--cache nil)
+(make-variable-buffer-local 'jedi:defined-names--cache)
+
+(defun jedi:defined-names-deferred ()
+  (deferred:nextc
+    (epc:call-deferred
+     (jedi:get-epc)
+     'defined_names
+     (list (buffer-substring-no-properties (point-min) (point-max))
+           (jedi:-buffer-file-name)))
+    (lambda (reply)
+      (setq jedi:defined-names--cache reply))))
+
+(defun jedi:defined-names--singleton-deferred ()
+  "Like `jedi:defined-names-deferred', but make sure that only
+one request at the time is emitted."
+  (unless jedi:defined-names--singleton-d
+    (setq jedi:defined-names--singleton-d
+          (deferred:watch (jedi:defined-names-deferred)
+            (lambda (_) (setq jedi:defined-names--singleton-d nil))))))
+
+(defun jedi:defined-names--sync ()
+  (unless jedi:defined-names--cache
+    (epc:sync (jedi:get-epc) (jedi:defined-names--singleton-deferred)))
+  jedi:defined-names--cache)
+
+(defun jedi:imenu-make-marker (def)
+  (cl-destructuring-bind (&key line_nr column &allow-other-keys) def
+    (save-excursion (jedi:goto--line-column line_nr column)
+                    (point-marker))))
+
+(defun jedi:create-nested-imenu-index--item (def)
+  (cons (plist-get def :name) (jedi:imenu-make-marker def)))
+
+(defun jedi:create-nested-imenu-index ()
+  "`imenu-create-index-function' for Jedi.el.
+See also `jedi:imenu-create-index-function'."
+  (when (called-interactively-p 'interactive) (jedi:defined-names--sync))
+  (jedi:create-nested-imenu-index-1))
+
+(defun jedi:create-nested-imenu-index-1 (&optional items)
+  (cl-loop for (def . subdefs) in (or items jedi:defined-names--cache)
+           if subdefs
+           collect (append
+                    (list (plist-get def :local_name)
+                          (jedi:create-nested-imenu-index--item def))
+                    (jedi:create-nested-imenu-index-1 subdefs))
+           else
+           collect (jedi:create-nested-imenu-index--item def)))
+
+(defun jedi:create-flat-imenu-index ()
+  "`imenu-create-index-function' for Jedi.el to create flatten index.
+See also `jedi:imenu-create-index-function'."
+  (when (called-interactively-p 'interactive) (jedi:defined-names--sync))
+  (jedi:create-flat-imenu-index-1))
+
+(defun jedi:create-flat-imenu-index-1 (&optional items)
+  (cl-loop for (def . subdefs) in (or items jedi:defined-names--cache)
+           collect (cons (plist-get def :local_name) (jedi:imenu-make-marker def))
+           when subdefs
+           append (jedi:create-flat-imenu-index-1 subdefs)))
+
+
+;;; Meta info
+
+(defun jedi:show-setup-info ()
+  "Show installation and configuration info in a buffer.
+Paste the result of this function when asking question or
+reporting bug.  This command also tries to detect errors when
+communicating with Jedi EPC server.  If you have some problem you
+may find some information about communication error."
+  (interactive)
+  (let (epc get-epc-error version-reply)
+    (condition-case err
+        (setq epc (jedi:get-epc))
+      (error (setq get-epc-error err)))
+    (when epc
+      (setq version-reply
+            (condition-case err
+                (epc:sync
+                 epc
+                 (deferred:$
+                   (deferred:timeout 500
+                     '(:timeout nil)
+                     (epc:call-deferred epc 'get_jedi_version nil))
+                   (deferred:error it
+                     (lambda (err) `(:error ,err)))))
+              (error `(:sync-error ,err)))))
+    (let ((standard-output (get-buffer-create "*jedi:show-setup-info*")))
+      (with-current-buffer standard-output
+        (emacs-lisp-mode)
+        (erase-buffer)
+        (insert ";; Emacs Lisp version:\n")
+        (pp `(:emacs-version ,emacs-version
+              :jedi-version ,jedi:version
+              :python-environment-version ,python-environment-version))
+        (insert ";; Python version:\n")
+        (pp version-reply)
+        (when get-epc-error
+          (insert "\n;; EPC error:\n")
+          (pp `(:get-epc-error ,get-epc-error)))
+        (insert ";; Command line:\n")
+        (pp `(:virtualenv
+              ,(executable-find (car python-environment-virtualenv))
+              :virtualenv-version
+              ,(ignore-errors (jedi:-virtualenv-version))))
+        (insert ";; Customization:\n")
+        (pp (jedi:-list-customization))
+        (display-buffer standard-output)))))
+
+(defun jedi:-list-defcustoms ()
+  (cl-loop for sym being the symbols
+           for name = (symbol-name sym)
+           when (and (or (string-prefix-p "jedi:" name)
+                         (string-prefix-p "python-environment-" name))
+                     (custom-variable-p sym))
+           collect sym))
+
+(defun jedi:-list-customization ()
+  (cl-loop for sym in (sort (jedi:-list-defcustoms)
+                            (lambda (x y)
+                              (string< (symbol-name x)
+                                       (symbol-name y))))
+           collect (cons sym (symbol-value sym))))
+
+(defun jedi:-virtualenv-version ()
+  "Return output of virtualenv --version"
+  (with-temp-buffer
+    (erase-buffer)
+    (call-process (executable-find (car python-environment-virtualenv))
+                  nil t nil
+                  "--version")
+    (buffer-string)))
+
+(defun jedi:get-jedi-version-request ()
+  "Request version of Python modules and return a deferred object."
+  (epc:call-deferred (jedi:get-epc) 'get_jedi_version nil))
+
+(defun jedi:show-version-info ()
+  "Show version info of Python modules used by the server.
+Paste the result of this function in bug report."
+  (interactive)
+  (deferred:nextc (jedi:get-jedi-version-request)
+    (lambda (reply)
+      (let ((standard-output (get-buffer-create "*jedi:version*")))
+        (with-current-buffer standard-output
+          (emacs-lisp-mode)
+          (erase-buffer)
+          (pp `(:emacs-version ,emacs-version :jedi-version ,jedi:version))
+          (pp reply)
+          (display-buffer standard-output))))))
+
+(define-obsolete-function-alias
+  'jedi:show-jedi-version 'jedi:show-version-info "0.1.3")
+
+(defun jedi:print-jedi-version ()
+  (pp (epc:sync (jedi:get-epc) (jedi:get-jedi-version-request))))
+
+
+;;; Setup
+
+(defun jedi:import-python-el-settings-setup ()
+  "Make jedi aware of python.el virtualenv and path settings.
+This is automatically added to the `jedi-mode-hook' when
+`jedi:import-python-el-settings' is non-nil."
+  (let ((args))
+    (when (bound-and-true-p python-shell-extra-pythonpaths)
+      (mapc
+       (lambda (path)
+         (setq args (append (list "--sys-path" path) args)))
+       python-shell-extra-pythonpaths))
+    (when (bound-and-true-p python-shell-virtualenv-path)
+      (setq args
+            (append
+             (list "--virtual-env" python-shell-virtualenv-path)
+             args)))
+    (when args
+      (set (make-local-variable 'jedi:server-args)
+           (append args jedi:server-args)))))
+
+;;;###autoload
+(defun jedi:setup ()
+  "Fully setup jedi.el for current buffer.
+It setups `ac-sources' or `company-backends' and turns
+`jedi-mode' on.
+
+This function is intended to be called from `python-mode-hook',
+like this::
+
+       (add-hook 'python-mode-hook 'jedi:setup)
+
+You can also call this function as a command, to quickly test
+what jedi can do."
+  (interactive)
+  (when jedi:setup-function
+    (funcall jedi:setup-function))
+  (when jedi:import-python-el-settings
+    ;; Hack to access buffer/dir-local vars: http://bit.ly/Y5IfMV.
+    ;; Given that `jedi:setup' is added to the `python-mode-hook'
+    ;; this will modify `hack-local-variables-hook' on python
+    ;; buffers only and will allow us to access buffer/directory
+    ;; local variables in `jedi:import-python-el-settings-setup'.
+    (add-hook 'hack-local-variables-hook
+              #'jedi:import-python-el-settings-setup nil t))
+  (jedi-mode 1))
+
+
+;;; Virtualenv setup
+(defvar jedi:install-server--command
+  `("pip" "install" "--upgrade" ,(convert-standard-filename jedi:source-dir)))
+
+;;;###autoload
+(defun jedi:install-server ()
+  "This command installs Jedi server script jediepcserver.py in a
+Python environment dedicated to Emacs.  By default, the
+environment is at ``~/.emacs.d/.python-environments/default/``.
+This environment is automatically created by ``virtualenv`` if it
+does not exist.
+
+Run this command (i.e., type ``M-x jedi:install-server RET``)
+whenever Jedi.el shows a message to do so.  It is a good idea to
+run this every time after you update Jedi.el to sync version of
+Python modules used by Jedi.el and Jedi.el itself.
+
+You can modify the location of the environment by changing
+`jedi:environment-root' and/or `python-environment-directory'.  More
+specifically, Jedi.el will install Python modules under the directory
+``PYTHON-ENVIRONMENT-DIRECTORY/JEDI:ENVIRONMENT-ROOT``.  Note that you
+need command line program ``virtualenv``.  If you have the command in
+an unusual location, use `python-environment-virtualenv' to specify the
+location.
+
+.. NOTE:: jediepcserver.py is installed in a virtual environment but it
+   does not mean Jedi.el cannot recognize the modules in virtual
+   environment you are using for your Python development.  Jedi
+   EPC server recognize the virtualenv it is in (i.e., the
+   environment variable ``VIRTUAL_ENV`` in your Emacs) and then
+   add modules in that environment to its ``sys.path``.  You can
+   also add ``--virtual-env PATH/TO/ENV`` to `jedi:server-args'
+   to include modules of virtual environment even you launch
+   Emacs outside of the virtual environment.
+
+.. NOTE:: It is highly recommended to use this command to install
+   Python modules for Jedi.el.  You still can install Python
+   modules used by Jedi.el manually.  However, you are then
+   responsible for keeping Jedi.el and Python modules compatible.
+
+See also:
+
+- https://github.com/tkf/emacs-jedi/pull/72
+- https://github.com/tkf/emacs-jedi/issues/140#issuecomment-37358527"
+  (interactive)
+  (deferred:$
+    (python-environment-run jedi:install-server--command
+                            jedi:environment-root
+                            jedi:environment-virtualenv)
+    (deferred:watch it
+      (lambda (_)
+        (setq-default jedi:server-command (jedi:-env-server-command))))))
+
+;;;###autoload
+(defun jedi:install-server-block ()
+  "Blocking version `jedi:install-server'."
+  (prog1
+      (python-environment-run-block jedi:install-server--command
+                                    jedi:environment-root
+                                    jedi:environment-virtualenv)
+    (setq-default jedi:server-command (jedi:-env-server-command))))
+
+(defcustom jedi:install-python-jedi-dev-command
+  '("pip" "install" "--upgrade"
+    "git+https://github.com/davidhalter/jedi.git@dev#egg=jedi")
+  "Pip command to be used for `jedi:install-python-jedi-dev'."
+  :group 'jedi)
+
+(defun jedi:install-python-jedi-dev ()
+  "Install developmental version of Python-Jedi from GitHub."
+  (interactive)
+  (deferred:$
+    (python-environment-run jedi:install-python-jedi-dev-command
+                            jedi:environment-root
+                            jedi:environment-virtualenv)
+    (deferred:watch it
+      (lambda (_)
+        (message "\
+Now restart EPC servers.  Then you are ready to go with Jedi-dev!")))))
+
+
+;;; Debugging
+
+(defun jedi:pop-to-epc-buffer ()
+  "Open the buffer associated with EPC server process.
+Use this command to see the output (e.g., traceback) of the server process."
+  (interactive)
+  (pop-to-buffer (process-buffer (epc:manager-server-process jedi:epc))))
+
+(defun jedi:toggle-log-traceback ()
+  "Toggle on/off traceback logging for EPC server for the current buffer.
+When there is an error during traceback logging is enabled, traceback
+is printed in the EPC buffer.  You can use `jedi:pop-to-epc-buffer' to
+open that buffer.
+
+You can also pass ``--log-traceback`` option to jediepcserver.py
+to start server with traceback logging turned on.  This is useful when
+there is a problem in communication (thus this command does not work).
+You can use `jedi:start-dedicated-server' to restart EPC server for the
+current buffer with specific arguments."
+  (interactive)
+  (deferred:$
+    (epc:call-deferred (jedi:get-epc) 'toggle_log_traceback nil)
+    (deferred:nextc it
+      (lambda (flag)
+        (message "Traceback logging is %s" (if flag "enabled" "disabled"))))))
+
+(defvar jedi:server-command--backup nil)
+(defvar jedi:server-args--backup nil)
+
+(defun jedi:toggle-debug-server ()
+  "Setup `jedi:server-command' and `jedi:server-args' to debug
+server using pdb or ipdb.
+
+When this command is called, it essentially execute the following
+code::
+
+  (jedi:stop-server)
+  (setq jedi:server-command (list \"cat\" \"jedi-port.log\" )
+        jedi:server-args nil)
+
+It means to pass the port number recorded in the file
+jedi-port.log to EPC client.
+
+To start Jedi server in terminal and record port to the file,
+use the following command::
+
+   python jediepcserver.py --port-file jedi-port.log --pdb
+
+This command will be copied in the kill-ring (clipboard) when
+this command is called.  You can use `--ipdb` instead of `--pdb`
+to use ipdb instead of pdb.
+
+Calling this command again restores the original setting of
+`jedi:server-command' and `jedi:server-args' then stops the
+running server."
+  (interactive)
+  (if jedi:server-command--backup
+      (progn
+        (setq jedi:server-command jedi:server-command--backup
+              jedi:server-command--backup nil
+              jedi:server-args jedi:server-args--backup)
+        (jedi:stop-server)
+        (message "Quit debugging.  Original setting restored."))
+    (setq jedi:server-command--backup jedi:server-command
+          jedi:server-args--backup jedi:server-args
+          jedi:server-command (list "cat" (expand-file-name
+                                           "jedi-port.log" jedi:source-dir))
+          jedi:server-args nil)
+    (jedi:stop-server)
+    (kill-new "python jediepcserver.py --port-file jedi-port.log --ipdb")
+    (message "Now, start server with: --port-file jedi-port.log --ipdb.\
+ (command is copied in the kill-ring)")))
+
+
+(provide 'jedi-core)
+
+;; Local Variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; jedi-core.el ends here
diff --git a/emacs.d/elpa/jedi-core-20151214.705/jediepcserver.py b/emacs.d/elpa/jedi-core-20151214.705/jediepcserver.py
new file mode 100755
index 0000000..fc6b6aa
--- /dev/null
+++ b/emacs.d/elpa/jedi-core-20151214.705/jediepcserver.py
@@ -0,0 +1,327 @@
+#!/usr/bin/env python
+
+"""
+Jedi EPC server.
+
+Copyright (C) 2012 Takafumi Arakaki
+
+Author: Takafumi Arakaki <aka.tkf at gmail.com>
+
+This file is NOT part of GNU Emacs.
+
+Jedi EPC server 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.
+
+Jedi EPC server 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 Jedi EPC server.
+If not, see <http://www.gnu.org/licenses/>.
+
+"""
+
+import os
+import sys
+import re
+import itertools
+import logging
+import site
+import glob
+
+jedi = None  # I will load it later
+
+
+PY3 = (sys.version_info[0] >= 3)
+NEED_ENCODE = not PY3
+
+
+def jedi_script(source, line, column, source_path):
+    if NEED_ENCODE:
+        source = source.encode('utf-8')
+        source_path = source_path and source_path.encode('utf-8')
+    return jedi.Script(source, line, column, source_path or '')
+
+
+def candidate_symbol(comp):
+    """
+    Return a character representing completion type.
+
+    :type comp: jedi.api.Completion
+    :arg  comp: A completion object returned by `jedi.Script.completions`.
+
+    """
+    try:
+        return comp.type[0].lower()
+    except (AttributeError, TypeError):
+        return '?'
+
+
+def candidates_description(comp):
+    """
+    Return `comp.description` in an appropriate format.
+
+    * Avoid return a string 'None'.
+    * Strip off all newlines. This is required for using
+      `comp.description` as candidate summary.
+
+    """
+    desc = comp.description
+    return _WHITESPACES_RE.sub(' ', desc) if desc and desc != 'None' else ''
+_WHITESPACES_RE = re.compile(r'\s+')
+
+
+def complete(*args):
+    reply = []
+    for comp in jedi_script(*args).completions():
+        try:
+            docstr = comp.docstring()
+        except KeyError:
+            docstr = ""
+
+        reply.append(dict(
+            word=comp.name,
+            doc=docstr,
+            description=candidates_description(comp),
+            symbol=candidate_symbol(comp),
+        ))
+    return reply
+
+
+def get_in_function_call(*args):
+    sig = jedi_script(*args).call_signatures()
+    call_def = sig[0] if sig else None
+
+    if call_def:
+        return dict(
+            # p.get_code(False) should do the job.  But jedi-vim use replace.
+            # So follow what jedi-vim does...
+            params=[p.get_code().replace('\n', '') for p in call_def.params],
+            index=call_def.index,
+            call_name=call_def.call_name,
+        )
+    else:
+        return []  # nil
+
+
+def _goto(method, *args):
+    """
+    Helper function for `goto_assignments` and `usages`.
+
+    :arg  method: `jedi.Script.goto_assignments` or `jedi.Script.usages`
+    :arg    args: Arguments to `jedi_script`
+
+    """
+    # `definitions` is a list. Each element is an instances of
+    # `jedi.api_classes.BaseOutput` subclass, i.e.,
+    # `jedi.api_classes.RelatedName` or `jedi.api_classes.Definition`.
+    definitions = method(jedi_script(*args))
+    return [dict(
+        column=d.column,
+        line_nr=d.line,
+        module_path=d.module_path if d.module_path != '__builtin__' else [],
+        module_name=d.module_name,
+        description=d.description,
+    ) for d in definitions]
+
+
+def goto(*args):
+    return _goto(jedi.Script.goto_assignments, *args)
+
+
+def related_names(*args):
+    return _goto(jedi.Script.usages, *args)
+
+
+def definition_to_dict(d):
+    return dict(
+        doc=d.docstring(),
+        description=d.description,
+        desc_with_module=d.desc_with_module,
+        line_nr=d.line,
+        column=d.column,
+        module_path=d.module_path,
+        name=getattr(d, 'name', []),
+        full_name=getattr(d, 'full_name', []),
+        type=getattr(d, 'type', []),
+    )
+
+
+def get_definition(*args):
+    definitions = jedi_script(*args).goto_definitions()
+    return list(map(definition_to_dict, definitions))
+
+
+def get_names_recursively(definition, parent=None):
+    """
+    Fetch interesting defined names in sub-scopes under `definition`.
+
+    :type names: jedi.api_classes.Definition
+
+    """
+    d = definition_to_dict(definition)
+    try:
+        d['local_name'] = parent['local_name'] + '.' + d['name']
+    except (AttributeError, TypeError):
+        d['local_name'] = d['name']
+    if definition.type == 'class':
+        ds = definition.defined_names()
+        return [d] + [get_names_recursively(c, d) for c in ds]
+    else:
+        return [d]
+
+
+def defined_names(*args):
+    return list(map(get_names_recursively, jedi.api.defined_names(*args)))
+
+
+def get_module_version(module):
+    try:
+        from pkg_resources import get_distribution, DistributionNotFound
+        try:
+            return get_distribution(module.__name__).version
+        except DistributionNotFound:
+            pass
+    except ImportError:
+        pass
+
+    notfound = object()
+    for key in ['__version__', 'version']:
+        version = getattr(module, key, notfound)
+        if version is not notfound:
+            return version
+
+
+def get_jedi_version():
+    import epc
+    import sexpdata
+    return [dict(
+        name=module.__name__,
+        file=getattr(module, '__file__', []),
+        version=get_module_version(module) or [],
+    ) for module in [sys, jedi, epc, sexpdata]]
+
+
+def path_expand_vars_and_user(p):
+    return os.path.expandvars(os.path.expanduser(p))
+
+
+def jedi_epc_server(address='localhost', port=0, port_file=sys.stdout,
+                    sys_path=[], virtual_env=[],
+                    debugger=None, log=None, log_level=None,
+                    log_traceback=None):
+    default_venv = os.getenv('VIRTUAL_ENV')
+    if default_venv:
+        add_virtualenv_path(default_venv)
+
+    for p in virtual_env:
+        add_virtualenv_path(path_expand_vars_and_user(p))
+    sys_path = map(path_expand_vars_and_user, sys_path)
+    sys.path = [''] + list(filter(None, itertools.chain(sys_path, sys.path)))
+    # Workaround Jedi's module cache.  Use this workaround until Jedi
+    # got an API to set module paths.
+    # See also: https://github.com/davidhalter/jedi/issues/36
+    import_jedi()
+    import epc.server
+    server = epc.server.EPCServer((address, port))
+    server.register_function(complete)
+    server.register_function(get_in_function_call)
+    server.register_function(goto)
+    server.register_function(related_names)
+    server.register_function(get_definition)
+    server.register_function(defined_names)
+    server.register_function(get_jedi_version)
+
+    @server.register_function
+    def toggle_log_traceback():
+        server.log_traceback = not server.log_traceback
+        return server.log_traceback
+
+    port_file.write(str(server.server_address[1]))  # needed for Emacs client
+    port_file.write("\n")
+    port_file.flush()
+    if port_file is not sys.stdout:
+        port_file.close()
+
+    # This is not supported Python-EPC API, but I am using this for
+    # backward compatibility for Python-EPC < 0.0.4.  In the future,
+    # it should be passed to the constructor.
+    server.log_traceback = bool(log_traceback)
+
+    if log:
+        handler = logging.FileHandler(filename=log, mode='w')
+        if log_level:
+            log_level = getattr(logging, log_level.upper())
+            handler.setLevel(log_level)
+            server.logger.setLevel(log_level)
+        server.logger.addHandler(handler)
+    if debugger:
+        server.set_debugger(debugger)
+        handler = logging.StreamHandler()
+        handler.setLevel(logging.DEBUG)
+        server.logger.addHandler(handler)
+        server.logger.setLevel(logging.DEBUG)
+
+    return server
+
+
+def import_jedi():
+    global jedi
+    import jedi
+    import jedi.api
+
+
+def add_virtualenv_path(venv):
+    """Add virtualenv's site-packages to `sys.path`."""
+    venv = os.path.abspath(venv)
+    paths = glob.glob(os.path.join(
+        venv, 'lib', 'python*', 'site-packages'))
+    for path in paths:
+        site.addsitedir(path)
+
+
+def main(args=None):
+    import argparse
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawTextHelpFormatter,
+        description=__doc__)
+    parser.add_argument(
+        '--address', default='localhost')
+    parser.add_argument(
+        '--port', default=0, type=int)
+    parser.add_argument(
+        '--port-file', '-f', default='-', type=argparse.FileType('wt'),
+        help='file to write port on.  default is stdout.')
+    parser.add_argument(
+        '--sys-path', '-p', default=[], action='append',
+        help='paths to be inserted at the top of `sys.path`.')
+    parser.add_argument(
+        '--virtual-env', '-v', default=[], action='append',
+        help='paths to be used as if VIRTUAL_ENV is set to it.')
+    parser.add_argument(
+        '--log', help='save server log to this file.')
+    parser.add_argument(
+        '--log-level',
+        choices=['CRITICAL', 'ERROR', 'WARN', 'INFO', 'DEBUG'],
+        help='logging level for log file.')
+    parser.add_argument(
+        '--log-traceback', action='store_true', default=False,
+        help='Include traceback in logging output.')
+    parser.add_argument(
+        '--pdb', dest='debugger', const='pdb', action='store_const',
+        help='start pdb when error occurs.')
+    parser.add_argument(
+        '--ipdb', dest='debugger', const='ipdb', action='store_const',
+        help='start ipdb when error occurs.')
+    ns = parser.parse_args(args)
+    server = jedi_epc_server(**vars(ns))
+    server.serve_forever()
+    server.logger.info('exit')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/emacs.d/elpa/jedi-core-20150623.2335/setup.py b/emacs.d/elpa/jedi-core-20151214.705/setup.py
similarity index 100%
rename from emacs.d/elpa/jedi-core-20150623.2335/setup.py
rename to emacs.d/elpa/jedi-core-20151214.705/setup.py
diff --git a/emacs.d/elpa/js2-mode-20150524.426/js2-mode-autoloads.el b/emacs.d/elpa/js2-mode-20150524.426/js2-mode-autoloads.el
deleted file mode 100644
index 9071709..0000000
--- a/emacs.d/elpa/js2-mode-20150524.426/js2-mode-autoloads.el
+++ /dev/null
@@ -1,55 +0,0 @@
-;;; js2-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "js2-imenu-extras" "js2-imenu-extras.el" (21898
-;;;;;;  47968 0 0))
-;;; Generated autoloads from js2-imenu-extras.el
-
-(autoload 'js2-imenu-extras-setup "js2-imenu-extras" "\
-
-
-\(fn)" nil nil)
-
-(autoload 'js2-imenu-extras-mode "js2-imenu-extras" "\
-Toggle Imenu support for frameworks and structural patterns.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "js2-mode" "js2-mode.el" (21898 47968 0 0))
-;;; Generated autoloads from js2-mode.el
-
-(autoload 'js2-highlight-unused-variables-mode "js2-mode" "\
-Toggle highlight of unused variables.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'js2-minor-mode "js2-mode" "\
-Minor mode for running js2 as a background linter.
-This allows you to use a different major mode for JavaScript editing,
-such as `js-mode', while retaining the asynchronous error/warning
-highlighting features of `js2-mode'.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'js2-mode "js2-mode" "\
-Major mode for editing JavaScript code.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("js2-mode-pkg.el") (21898 47968 67776
-;;;;;;  0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; js2-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/js2-mode-20150524.426/js2-mode-pkg.el b/emacs.d/elpa/js2-mode-20150524.426/js2-mode-pkg.el
deleted file mode 100644
index 7563f81..0000000
--- a/emacs.d/elpa/js2-mode-20150524.426/js2-mode-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-(define-package "js2-mode" "20150524.426" "Improved JavaScript editing mode"
-  '((emacs "24.1")
-    (cl-lib "0.5"))
-  :url "https://github.com/mooz/js2-mode/" :keywords
-  '("languages" "javascript"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/js2-mode-20150524.426/js2-mode.el b/emacs.d/elpa/js2-mode-20150524.426/js2-mode.el
deleted file mode 100644
index fbbfeef..0000000
--- a/emacs.d/elpa/js2-mode-20150524.426/js2-mode.el
+++ /dev/null
@@ -1,12624 +0,0 @@
-;;; js2-mode.el --- Improved JavaScript editing mode
-
-;; Copyright (C) 2009, 2011-2015  Free Software Foundation, Inc.
-
-;; Author: Steve Yegge <steve.yegge@gmail.com>
-;;         mooz <stillpedant@gmail.com>
-;;         Dmitry Gutov <dgutov@yandex.ru>
-;; URL:  https://github.com/mooz/js2-mode/
-;;       http://code.google.com/p/js2-mode/
-;; Version: 20150202
-;; Keywords: languages, javascript
-;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This JavaScript editing mode supports:
-
-;;  - strict recognition of the Ecma-262 language standard
-;;  - support for most Rhino and SpiderMonkey extensions from 1.5 and up
-;;  - parsing support for ECMAScript for XML (E4X, ECMA-357)
-;;  - accurate syntax highlighting using a recursive-descent parser
-;;  - on-the-fly reporting of syntax errors and strict-mode warnings
-;;  - undeclared-variable warnings using a configurable externs framework
-;;  - "bouncing" line indentation to choose among alternate indentation points
-;;  - smart line-wrapping within comments and strings
-;;  - code folding:
-;;    - show some or all function bodies as {...}
-;;    - show some or all block comments as /*...*/
-;;  - context-sensitive menu bar and popup menus
-;;  - code browsing using the `imenu' package
-;;  - many customization options
-
-;; Installation:
-;;
-;; To install it as your major mode for JavaScript editing:
-
-;;   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
-
-;; Alternatively, to install it as a minor mode just for JavaScript linting,
-;; you must add it to the appropriate major-mode hook.  Normally this would be:
-
-;;   (add-hook 'js-mode-hook 'js2-minor-mode)
-
-;; You may also want to hook it in for shell scripts running via node.js:
-
-;;   (add-to-list 'interpreter-mode-alist '("node" . js2-mode))
-
-;; To customize how it works:
-;;   M-x customize-group RET js2-mode RET
-
-;; Notes:
-
-;; This mode includes a port of Mozilla Rhino's scanner, parser and
-;; symbol table.  Ideally it should stay in sync with Rhino, keeping
-;; `js2-mode' current as the EcmaScript language standard evolves.
-
-;; Unlike cc-engine based language modes, js2-mode's line-indentation is not
-;; customizable.  It is a surprising amount of work to support customizable
-;; indentation.  The current compromise is that the tab key lets you cycle among
-;; various likely indentation points, similar to the behavior of python-mode.
-
-;; This mode does not yet work with "multi-mode" modes such as `mmm-mode'
-;; and `mumamo', although it could be made to do so with some effort.
-;; This means that `js2-mode' is currently only useful for editing JavaScript
-;; files, and not for editing JavaScript within <script> tags or templates.
-
-;; The project page on GitHub is used for development and issue tracking.
-;; The original homepage at Google Code has outdated information and is mostly
-;; unmaintained.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'imenu)
-(require 'cc-cmds)  ; for `c-fill-paragraph'
-
-(eval-and-compile
-  (require 'cc-mode)     ; (only) for `c-populate-syntax-table'
-  (require 'cc-engine))  ; for `c-paragraph-start' et. al.
-
-(defvar electric-layout-rules)
-
-;;; Externs (variables presumed to be defined by the host system)
-
-(defvar js2-ecma-262-externs
-  (mapcar 'symbol-name
-          '(Array Boolean Date Error EvalError Function Infinity JSON
-          Math NaN Number Object RangeError ReferenceError RegExp
-          String SyntaxError TypeError URIError
-          decodeURI decodeURIComponent encodeURI
-          encodeURIComponent escape eval isFinite isNaN
-          parseFloat parseInt undefined unescape))
-"Ecma-262 externs.  Included in `js2-externs' by default.")
-
-(defvar js2-browser-externs
-  (mapcar 'symbol-name
-          '(;; DOM level 1
-            Attr CDATASection CharacterData Comment DOMException
-            DOMImplementation Document DocumentFragment
-            DocumentType Element Entity EntityReference
-            ExceptionCode NamedNodeMap Node NodeList Notation
-            ProcessingInstruction Text
-
-            ;; DOM level 2
-            HTMLAnchorElement HTMLAppletElement HTMLAreaElement
-            HTMLBRElement HTMLBaseElement HTMLBaseFontElement
-            HTMLBodyElement HTMLButtonElement HTMLCollection
-            HTMLDListElement HTMLDirectoryElement HTMLDivElement
-            HTMLDocument HTMLElement HTMLFieldSetElement
-            HTMLFontElement HTMLFormElement HTMLFrameElement
-            HTMLFrameSetElement HTMLHRElement HTMLHeadElement
-            HTMLHeadingElement HTMLHtmlElement HTMLIFrameElement
-            HTMLImageElement HTMLInputElement HTMLIsIndexElement
-            HTMLLIElement HTMLLabelElement HTMLLegendElement
-            HTMLLinkElement HTMLMapElement HTMLMenuElement
-            HTMLMetaElement HTMLModElement HTMLOListElement
-            HTMLObjectElement HTMLOptGroupElement
-            HTMLOptionElement HTMLOptionsCollection
-            HTMLParagraphElement HTMLParamElement HTMLPreElement
-            HTMLQuoteElement HTMLScriptElement HTMLSelectElement
-            HTMLStyleElement HTMLTableCaptionElement
-            HTMLTableCellElement HTMLTableColElement
-            HTMLTableElement HTMLTableRowElement
-            HTMLTableSectionElement HTMLTextAreaElement
-            HTMLTitleElement HTMLUListElement
-
-            ;; DOM level 3
-            DOMConfiguration DOMError DOMException
-            DOMImplementationList DOMImplementationSource
-            DOMLocator DOMStringList NameList TypeInfo
-            UserDataHandler
-
-            ;; Window
-            window alert confirm document java navigator prompt screen
-            self top requestAnimationFrame cancelAnimationFrame
-
-            ;; W3C CSS
-            CSSCharsetRule CSSFontFace CSSFontFaceRule
-            CSSImportRule CSSMediaRule CSSPageRule
-            CSSPrimitiveValue CSSProperties CSSRule CSSRuleList
-            CSSStyleDeclaration CSSStyleRule CSSStyleSheet
-            CSSValue CSSValueList Counter DOMImplementationCSS
-            DocumentCSS DocumentStyle ElementCSSInlineStyle
-            LinkStyle MediaList RGBColor Rect StyleSheet
-            StyleSheetList ViewCSS
-
-            ;; W3C Event
-            EventListener EventTarget Event DocumentEvent UIEvent
-            MouseEvent MutationEvent KeyboardEvent
-
-            ;; W3C Range
-            DocumentRange Range RangeException
-
-            ;; W3C XML
-            XPathResult XMLHttpRequest
-
-            ;; console object.  Provided by at least Chrome and Firefox.
-            console))
-  "Browser externs.
-You can cause these to be included or excluded with the custom
-variable `js2-include-browser-externs'.")
-
-(defvar js2-rhino-externs
-  (mapcar 'symbol-name
-          '(Packages importClass importPackage com org java
-            ;; Global object (shell) externs.
-            defineClass deserialize doctest gc help load
-            loadClass print quit readFile readUrl runCommand seal
-            serialize spawn sync toint32 version))
-  "Mozilla Rhino externs.
-Set `js2-include-rhino-externs' to t to include them.")
-
-(defvar js2-node-externs
-  (mapcar 'symbol-name
-          '(__dirname __filename Buffer clearInterval clearTimeout require
-            console exports global module process setInterval setTimeout
-            querystring))
-  "Node.js externs.
-Set `js2-include-node-externs' to t to include them.")
-
-(defvar js2-typed-array-externs
-  (mapcar 'symbol-name
-          '(ArrayBuffer Uint8ClampedArray DataView
-            Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array
-            Float32Array Float64Array))
-  "Khronos typed array externs. Available in most modern browsers and
-in node.js >= 0.6. If `js2-include-node-externs' or `js2-include-browser-externs'
-are enabled, these will also be included.")
-
-(defvar js2-harmony-externs
-  (mapcar 'symbol-name
-          '(Map Promise Proxy Reflect Set Symbol WeakMap WeakSet))
-  "ES6 externs.  If `js2-include-browser-externs' is enabled and
-`js2-language-version' is sufficiently high, these will be included.")
-
-;;; Variables
-
-(defun js2-mark-safe-local (name pred)
-  "Make the variable NAME buffer-local and mark it as safe file-local
-variable with predicate PRED."
-  (make-variable-buffer-local name)
-  (put name 'safe-local-variable pred))
-
-(defcustom js2-highlight-level 2
-  "Amount of syntax highlighting to perform.
-0 or a negative value means none.
-1 adds basic syntax highlighting.
-2 adds highlighting of some Ecma built-in properties.
-3 adds highlighting of many Ecma built-in functions."
-  :group 'js2-mode
-  :type '(choice (const :tag "None" 0)
-                 (const :tag "Basic" 1)
-                 (const :tag "Include Properties" 2)
-                 (const :tag "Include Functions" 3)))
-
-(defvar js2-mode-dev-mode-p nil
-  "Non-nil if running in development mode.  Normally nil.")
-
-(defgroup js2-mode nil
-  "An improved JavaScript mode."
-  :group 'languages)
-
-(defcustom js2-basic-offset (if (and (boundp 'c-basic-offset)
-                                     (numberp c-basic-offset))
-                                c-basic-offset
-                              4)
-  "Number of spaces to indent nested statements.
-Similar to `c-basic-offset'."
-  :group 'js2-mode
-  :type 'integer)
-(js2-mark-safe-local 'js2-basic-offset 'integerp)
-
-(defcustom js2-bounce-indent-p nil
-  "Non-nil to have indent-line function choose among alternatives.
-If nil, the indent-line function will indent to a predetermined column
-based on heuristic guessing.  If non-nil, then if the current line is
-already indented to that predetermined column, indenting will choose
-another likely column and indent to that spot.  Repeated invocation of
-the indent-line function will cycle among the computed alternatives.
-See the function `js2-bounce-indent' for details.  When it is non-nil,
-js2-mode also binds `js2-bounce-indent-backwards' to Shift-Tab."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-pretty-multiline-declarations t
-  "Non-nil to line up multiline declarations vertically:
-
-  var a = 10,
-      b = 20,
-      c = 30;
-
-If the value is t, and the first assigned value in the
-declaration is a function/array/object literal spanning several
-lines, it won't be indented additionally:
-
-  var o = {                   var bar = 2,
-    foo: 3          vs.           o = {
-  },                                foo: 3
-      bar = 2;                    };
-
-If the value is `all', it will always be indented additionally:
-
-  var o = {
-        foo: 3
-      };
-
-  var o = {
-        foo: 3
-      },
-      bar = 2;
-
-If the value is `dynamic', it will be indented additionally only
-if the declaration contains more than one variable:
-
-  var o = {
-    foo: 3
-  };
-
-  var o = {
-        foo: 3
-      },
-      bar = 2;"
-  :group 'js2-mode
-  :type 'symbol)
-(js2-mark-safe-local 'js2-pretty-multiline-declarations 'symbolp)
-
-(defcustom js2-indent-switch-body nil
-  "When nil, case labels are indented on the same level as the
-containing switch statement.  Otherwise, all lines inside
-switch statement body are indented one additional level."
-  :type 'boolean
-  :group 'js2-mode)
-(js2-mark-safe-local 'js2-indent-case-same-as-switch 'booleanp)
-
-(defcustom js2-idle-timer-delay 0.2
-  "Delay in secs before re-parsing after user makes changes.
-Multiplied by `js2-dynamic-idle-timer-adjust', which see."
-  :type 'number
-  :group 'js2-mode)
-(make-variable-buffer-local 'js2-idle-timer-delay)
-
-(defcustom js2-dynamic-idle-timer-adjust 0
-  "Positive to adjust `js2-idle-timer-delay' based on file size.
-The idea is that for short files, parsing is faster so we can be
-more responsive to user edits without interfering with editing.
-The buffer length in characters (typically bytes) is divided by
-this value and used to multiply `js2-idle-timer-delay' for the
-buffer.  For example, a 21k file and 10k adjust yields 21k/10k
-== 2, so js2-idle-timer-delay is multiplied by 2.
-If `js2-dynamic-idle-timer-adjust' is 0 or negative,
-`js2-idle-timer-delay' is not dependent on the file size."
-  :type 'number
-  :group 'js2-mode)
-
-(defcustom js2-concat-multiline-strings t
-  "When non-nil, `js2-line-break' in mid-string will make it a
-string concatenation. When `eol', the '+' will be inserted at the
-end of the line, otherwise, at the beginning of the next line."
-  :type '(choice (const t) (const eol) (const nil))
-  :group 'js2-mode)
-
-(defcustom js2-mode-show-parse-errors t
-  "True to highlight parse errors."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-mode-show-strict-warnings t
-  "Non-nil to emit Ecma strict-mode warnings.
-Some of the warnings can be individually disabled by other flags,
-even if this flag is non-nil."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-trailing-comma-warning t
-  "Non-nil to warn about trailing commas in array literals.
-Ecma-262-5.1 allows them, but older versions of IE raise an error."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-missing-semi-warning t
-  "Non-nil to warn about semicolon auto-insertion after statement.
-Technically this is legal per Ecma-262, but some style guides disallow
-depending on it."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-missing-semi-one-line-override nil
-  "Non-nil to permit missing semicolons in one-line functions.
-In one-liner functions such as `function identity(x) {return x}'
-people often omit the semicolon for a cleaner look.  If you are
-such a person, you can suppress the missing-semicolon warning
-by setting this variable to t."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-inconsistent-return-warning t
-  "Non-nil to warn about mixing returns with value-returns.
-It's perfectly legal to have a `return' and a `return foo' in the
-same function, but it's often an indicator of a bug, and it also
-interferes with type inference (in systems that support it.)"
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-cond-assign-warning t
-  "Non-nil to warn about expressions like if (a = b).
-This often should have been '==' instead of '='.  If the warning
-is enabled, you can suppress it on a per-expression basis by
-parenthesizing the expression, e.g. if ((a = b)) ..."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-var-redeclaration-warning t
-  "Non-nil to warn about redeclaring variables in a script or function."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-strict-var-hides-function-arg-warning t
-  "Non-nil to warn about a var decl hiding a function argument."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-skip-preprocessor-directives nil
-  "Non-nil to treat lines beginning with # as comments.
-Useful for viewing Mozilla JavaScript source code."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-language-version 200
-  "Configures what JavaScript language version to recognize.
-Currently versions 150, 160, 170, 180 and 200 are supported,
-corresponding to JavaScript 1.5, 1.6, 1.7, 1.8 and 2.0 (Harmony),
-respectively.  In a nutshell, 1.6 adds E4X support, 1.7 adds let,
-yield, and Array comprehensions, and 1.8 adds function closures."
-  :type 'integer
-  :group 'js2-mode)
-
-(defcustom js2-instanceof-has-side-effects nil
-  "If non-nil, treats the instanceof operator as having side effects.
-This is useful for xulrunner apps."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-move-point-on-right-click t
-  "Non-nil to move insertion point when you right-click.
-This makes right-click context menu behavior a bit more intuitive,
-since menu operations generally apply to the point.  The exception
-is if there is a region selection, in which case the point does -not-
-move, so cut/copy/paste can work properly.
-
-Note that IntelliJ moves the point, and Eclipse leaves it alone,
-so this behavior is customizable."
-  :group 'js2-mode
-  :type 'boolean)
-
-(defcustom js2-allow-rhino-new-expr-initializer t
-  "Non-nil to support a Rhino's experimental syntactic construct.
-
-Rhino supports the ability to follow a `new' expression with an object
-literal, which is used to set additional properties on the new object
-after calling its constructor.  Syntax:
-
-  new <expr> [ ( arglist ) ] [initializer]
-
-Hence, this expression:
-
-  new Object {a: 1, b: 2}
-
-results in an Object with properties a=1 and b=2.  This syntax is
-apparently not configurable in Rhino - it's currently always enabled,
-as of Rhino version 1.7R2."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-allow-member-expr-as-function-name nil
-  "Non-nil to support experimental Rhino syntax for function names.
-
-Rhino supports an experimental syntax configured via the Rhino Context
-setting `allowMemberExprAsFunctionName'.  The experimental syntax is:
-
-  function <member-expr> ( [ arg-list ] ) { <body> }
-
-Where member-expr is a non-parenthesized 'member expression', which
-is anything at the grammar level of a new-expression or lower, meaning
-any expression that does not involve infix or unary operators.
-
-When <member-expr> is not a simple identifier, then it is syntactic
-sugar for assigning the anonymous function to the <member-expr>.  Hence,
-this code:
-
-  function a.b().c[2] (x, y) { ... }
-
-is rewritten as:
-
-  a.b().c[2] = function(x, y) {...}
-
-which doesn't seem particularly useful, but Rhino permits it."
-  :type 'boolean
-  :group 'js2-mode)
-
-;; scanner variables
-
-(defmacro js2-deflocal (name value &optional comment)
-  "Define a buffer-local variable NAME with VALUE and COMMENT."
-  (declare (debug defvar) (doc-string 3))
-  `(progn
-     (defvar ,name ,value ,comment)
-     (make-variable-buffer-local ',name)))
-
-(defvar js2-EOF_CHAR -1
-  "Represents end of stream.  Distinct from js2-EOF token type.")
-
-;; I originally used symbols to represent tokens, but Rhino uses
-;; ints and then sets various flag bits in them, so ints it is.
-;; The upshot is that we need a `js2-' prefix in front of each name.
-(defvar js2-ERROR -1)
-(defvar js2-EOF 0)
-(defvar js2-EOL 1)
-(defvar js2-ENTERWITH 2)       ; begin interpreter bytecodes
-(defvar js2-LEAVEWITH 3)
-(defvar js2-RETURN 4)
-(defvar js2-GOTO 5)
-(defvar js2-IFEQ 6)
-(defvar js2-IFNE 7)
-(defvar js2-SETNAME 8)
-(defvar js2-BITOR 9)
-(defvar js2-BITXOR 10)
-(defvar js2-BITAND 11)
-(defvar js2-EQ 12)
-(defvar js2-NE 13)
-(defvar js2-LT 14)
-(defvar js2-LE 15)
-(defvar js2-GT 16)
-(defvar js2-GE 17)
-(defvar js2-LSH 18)
-(defvar js2-RSH 19)
-(defvar js2-URSH 20)
-(defvar js2-ADD 21)            ; infix plus
-(defvar js2-SUB 22)            ; infix minus
-(defvar js2-MUL 23)
-(defvar js2-DIV 24)
-(defvar js2-MOD 25)
-(defvar js2-NOT 26)
-(defvar js2-BITNOT 27)
-(defvar js2-POS 28)            ; unary plus
-(defvar js2-NEG 29)            ; unary minus
-(defvar js2-NEW 30)
-(defvar js2-DELPROP 31)
-(defvar js2-TYPEOF 32)
-(defvar js2-GETPROP 33)
-(defvar js2-GETPROPNOWARN 34)
-(defvar js2-SETPROP 35)
-(defvar js2-GETELEM 36)
-(defvar js2-SETELEM 37)
-(defvar js2-CALL 38)
-(defvar js2-NAME 39)           ; an identifier
-(defvar js2-NUMBER 40)
-(defvar js2-STRING 41)
-(defvar js2-NULL 42)
-(defvar js2-THIS 43)
-(defvar js2-FALSE 44)
-(defvar js2-TRUE 45)
-(defvar js2-SHEQ 46)           ; shallow equality (===)
-(defvar js2-SHNE 47)           ; shallow inequality (!==)
-(defvar js2-REGEXP 48)
-(defvar js2-BINDNAME 49)
-(defvar js2-THROW 50)
-(defvar js2-RETHROW 51)        ; rethrow caught exception: catch (e if ) uses it
-(defvar js2-IN 52)
-(defvar js2-INSTANCEOF 53)
-(defvar js2-LOCAL_LOAD 54)
-(defvar js2-GETVAR 55)
-(defvar js2-SETVAR 56)
-(defvar js2-CATCH_SCOPE 57)
-(defvar js2-ENUM_INIT_KEYS 58) ; FIXME: what are these?
-(defvar js2-ENUM_INIT_VALUES 59)
-(defvar js2-ENUM_INIT_ARRAY 60)
-(defvar js2-ENUM_NEXT 61)
-(defvar js2-ENUM_ID 62)
-(defvar js2-THISFN 63)
-(defvar js2-RETURN_RESULT 64)  ; to return previously stored return result
-(defvar js2-ARRAYLIT 65)       ; array literal
-(defvar js2-OBJECTLIT 66)      ; object literal
-(defvar js2-GET_REF 67)        ; *reference
-(defvar js2-SET_REF 68)        ; *reference = something
-(defvar js2-DEL_REF 69)        ; delete reference
-(defvar js2-REF_CALL 70)       ; f(args) = something or f(args)++
-(defvar js2-REF_SPECIAL 71)    ; reference for special properties like __proto
-(defvar js2-YIELD 72)          ; JS 1.7 yield pseudo keyword
-
-;; XML support
-(defvar js2-DEFAULTNAMESPACE 73)
-(defvar js2-ESCXMLATTR 74)
-(defvar js2-ESCXMLTEXT 75)
-(defvar js2-REF_MEMBER 76)     ; Reference for x.@y, x..y etc.
-(defvar js2-REF_NS_MEMBER 77)  ; Reference for x.ns::y, x..ns::y etc.
-(defvar js2-REF_NAME 78)       ; Reference for @y, @[y] etc.
-(defvar js2-REF_NS_NAME 79)    ; Reference for ns::y, @ns::y@[y] etc.
-
-(defvar js2-first-bytecode js2-ENTERWITH)
-(defvar js2-last-bytecode js2-REF_NS_NAME)
-
-(defvar js2-TRY 80)
-(defvar js2-SEMI 81)           ; semicolon
-(defvar js2-LB 82)             ; left and right brackets
-(defvar js2-RB 83)
-(defvar js2-LC 84)             ; left and right curly-braces
-(defvar js2-RC 85)
-(defvar js2-LP 86)             ; left and right parens
-(defvar js2-RP 87)
-(defvar js2-COMMA 88)          ; comma operator
-
-(defvar js2-ASSIGN 89)         ; simple assignment (=)
-(defvar js2-ASSIGN_BITOR 90)   ; |=
-(defvar js2-ASSIGN_BITXOR 91)  ; ^=
-(defvar js2-ASSIGN_BITAND 92)  ; &=
-(defvar js2-ASSIGN_LSH 93)     ; <<=
-(defvar js2-ASSIGN_RSH 94)     ; >>=
-(defvar js2-ASSIGN_URSH 95)    ; >>>=
-(defvar js2-ASSIGN_ADD 96)     ; +=
-(defvar js2-ASSIGN_SUB 97)     ; -=
-(defvar js2-ASSIGN_MUL 98)     ; *=
-(defvar js2-ASSIGN_DIV 99)     ; /=
-(defvar js2-ASSIGN_MOD 100)    ; %=
-
-(defvar js2-first-assign js2-ASSIGN)
-(defvar js2-last-assign js2-ASSIGN_MOD)
-
-(defvar js2-HOOK 101)          ; conditional (?:)
-(defvar js2-COLON 102)
-(defvar js2-OR 103)            ; logical or (||)
-(defvar js2-AND 104)           ; logical and (&&)
-(defvar js2-INC 105)           ; increment/decrement (++ --)
-(defvar js2-DEC 106)
-(defvar js2-DOT 107)           ; member operator (.)
-(defvar js2-FUNCTION 108)      ; function keyword
-(defvar js2-EXPORT 109)        ; export keyword
-(defvar js2-IMPORT 110)        ; import keyword
-(defvar js2-IF 111)            ; if keyword
-(defvar js2-ELSE 112)          ; else keyword
-(defvar js2-SWITCH 113)        ; switch keyword
-(defvar js2-CASE 114)          ; case keyword
-(defvar js2-DEFAULT 115)       ; default keyword
-(defvar js2-WHILE 116)         ; while keyword
-(defvar js2-DO 117)            ; do keyword
-(defvar js2-FOR 118)           ; for keyword
-(defvar js2-BREAK 119)         ; break keyword
-(defvar js2-CONTINUE 120)      ; continue keyword
-(defvar js2-VAR 121)           ; var keyword
-(defvar js2-WITH 122)          ; with keyword
-(defvar js2-CATCH 123)         ; catch keyword
-(defvar js2-FINALLY 124)       ; finally keyword
-(defvar js2-VOID 125)          ; void keyword
-(defvar js2-RESERVED 126)      ; reserved keywords
-
-(defvar js2-EMPTY 127)
-
-;; Types used for the parse tree - never returned by scanner.
-
-(defvar js2-BLOCK 128)         ; statement block
-(defvar js2-LABEL 129)         ; label
-(defvar js2-TARGET 130)
-(defvar js2-LOOP 131)
-(defvar js2-EXPR_VOID 132)     ; expression statement in functions
-(defvar js2-EXPR_RESULT 133)   ; expression statement in scripts
-(defvar js2-JSR 134)
-(defvar js2-SCRIPT 135)        ; top-level node for entire script
-(defvar js2-TYPEOFNAME 136)    ; for typeof(simple-name)
-(defvar js2-USE_STACK 137)
-(defvar js2-SETPROP_OP 138)    ; x.y op= something
-(defvar js2-SETELEM_OP 139)    ; x[y] op= something
-(defvar js2-LOCAL_BLOCK 140)
-(defvar js2-SET_REF_OP 141)    ; *reference op= something
-
-;; For XML support:
-(defvar js2-DOTDOT 142)        ; member operator (..)
-(defvar js2-COLONCOLON 143)    ; namespace::name
-(defvar js2-XML 144)           ; XML type
-(defvar js2-DOTQUERY 145)      ; .() -- e.g., x.emps.emp.(name == "terry")
-(defvar js2-XMLATTR 146)       ; @
-(defvar js2-XMLEND 147)
-
-;; Optimizer-only tokens
-(defvar js2-TO_OBJECT 148)
-(defvar js2-TO_DOUBLE 149)
-
-(defvar js2-GET 150)           ; JS 1.5 get pseudo keyword
-(defvar js2-SET 151)           ; JS 1.5 set pseudo keyword
-(defvar js2-LET 152)           ; JS 1.7 let pseudo keyword
-(defvar js2-CONST 153)
-(defvar js2-SETCONST 154)
-(defvar js2-SETCONSTVAR 155)
-(defvar js2-ARRAYCOMP 156)
-(defvar js2-LETEXPR 157)
-(defvar js2-WITHEXPR 158)
-(defvar js2-DEBUGGER 159)
-
-(defvar js2-COMMENT 160)
-(defvar js2-TRIPLEDOT 161)     ; for rest parameter
-(defvar js2-ARROW 162)         ; function arrow (=>)
-(defvar js2-CLASS 163)
-(defvar js2-EXTENDS 164)
-(defvar js2-SUPER 165)
-(defvar js2-TEMPLATE_HEAD 166)    ; part of template literal before substitution
-(defvar js2-NO_SUBS_TEMPLATE 167) ; template literal without substitutions
-(defvar js2-TAGGED_TEMPLATE 168)  ; tagged template literal
-
-(defconst js2-num-tokens (1+ js2-TAGGED_TEMPLATE))
-
-(defconst js2-debug-print-trees nil)
-
-;; Rhino accepts any string or stream as input.  Emacs character
-;; processing works best in buffers, so we'll assume the input is a
-;; buffer.  JavaScript strings can be copied into temp buffers before
-;; scanning them.
-
-;; Buffer-local variables yield much cleaner code than using `defstruct'.
-;; They're the Emacs equivalent of instance variables, more or less.
-
-(js2-deflocal js2-ts-dirty-line nil
-  "Token stream buffer-local variable.
-Indicates stuff other than whitespace since start of line.")
-
-(js2-deflocal js2-ts-hit-eof nil
-  "Token stream buffer-local variable.")
-
-;; FIXME: Unused.
-(js2-deflocal js2-ts-line-start 0
-  "Token stream buffer-local variable.")
-
-(js2-deflocal js2-ts-lineno 1
-  "Token stream buffer-local variable.")
-
-;; FIXME: Unused.
-(js2-deflocal js2-ts-line-end-char -1
-  "Token stream buffer-local variable.")
-
-(js2-deflocal js2-ts-cursor 1  ; emacs buffers are 1-indexed
-  "Token stream buffer-local variable.
-Current scan position.")
-
-;; FIXME: Unused.
-(js2-deflocal js2-ts-is-xml-attribute nil
-  "Token stream buffer-local variable.")
-
-(js2-deflocal js2-ts-xml-is-tag-content nil
-  "Token stream buffer-local variable.")
-
-(js2-deflocal js2-ts-xml-open-tags-count 0
-  "Token stream buffer-local variable.")
-
-(js2-deflocal js2-ts-string-buffer nil
-  "Token stream buffer-local variable.
-List of chars built up while scanning various tokens.")
-
-(cl-defstruct (js2-token
-               (:constructor nil)
-               (:constructor make-js2-token (beg)))
-  "Value returned from the token stream."
-  (type js2-EOF)
-  (beg 1)
-  (end -1)
-  (string "")
-  number
-  regexp-flags
-  comment-type
-  follows-eol-p)
-
-;; Have to call `js2-init-scanner' to initialize the values.
-(js2-deflocal js2-ti-tokens nil)
-(js2-deflocal js2-ti-tokens-cursor nil)
-(js2-deflocal js2-ti-lookahead nil)
-
-(cl-defstruct (js2-ts-state
-               (:constructor make-js2-ts-state (&key (lineno js2-ts-lineno)
-                                                     (cursor js2-ts-cursor)
-                                                     (tokens (copy-sequence js2-ti-tokens))
-                                                     (tokens-cursor js2-ti-tokens-cursor)
-                                                     (lookahead js2-ti-lookahead))))
-  lineno
-  cursor
-  tokens
-  tokens-cursor
-  lookahead)
-
-;;; Parser variables
-
-(js2-deflocal js2-parsed-errors nil
-  "List of errors produced during scanning/parsing.")
-
-(js2-deflocal js2-parsed-warnings nil
-  "List of warnings produced during scanning/parsing.")
-
-(js2-deflocal js2-recover-from-parse-errors t
-  "Non-nil to continue parsing after a syntax error.
-
-In recovery mode, the AST will be built in full, and any error
-nodes will be flagged with appropriate error information.  If
-this flag is nil, a syntax error will result in an error being
-signaled.
-
-The variable is automatically buffer-local, because different
-modes that use the parser will need different settings.")
-
-(js2-deflocal js2-parse-hook nil
-  "List of callbacks for receiving parsing progress.")
-
-(defvar js2-parse-finished-hook nil
-  "List of callbacks to notify when parsing finishes.
-Not called if parsing was interrupted.")
-
-(js2-deflocal js2-is-eval-code nil
-  "True if we're evaluating code in a string.
-If non-nil, the tokenizer will record the token text, and the AST nodes
-will record their source text.  Off by default for IDE modes, since the
-text is available in the buffer.")
-
-(defvar js2-parse-ide-mode t
-  "Non-nil if the parser is being used for `js2-mode'.
-If non-nil, the parser will set text properties for fontification
-and the syntax table.  The value should be nil when using the
-parser as a frontend to an interpreter or byte compiler.")
-
-;;; Parser instance variables (buffer-local vars for js2-parse)
-
-(defconst js2-ti-after-eol (lsh 1 16)
-  "Flag:  first token of the source line.")
-
-;; Inline Rhino's CompilerEnvirons vars as buffer-locals.
-
-(js2-deflocal js2-compiler-generate-debug-info t)
-(js2-deflocal js2-compiler-use-dynamic-scope nil)
-(js2-deflocal js2-compiler-reserved-keywords-as-identifier nil)
-(js2-deflocal js2-compiler-xml-available t)
-(js2-deflocal js2-compiler-optimization-level 0)
-(js2-deflocal js2-compiler-generating-source t)
-(js2-deflocal js2-compiler-strict-mode nil)
-(js2-deflocal js2-compiler-report-warning-as-error nil)
-(js2-deflocal js2-compiler-generate-observer-count nil)
-(js2-deflocal js2-compiler-activation-names nil)
-
-;; SKIP:  sourceURI
-
-;; There's a compileFunction method in Context.java - may need it.
-(js2-deflocal js2-called-by-compile-function nil
-  "True if `js2-parse' was called by `js2-compile-function'.
-Will only be used when we finish implementing the interpreter.")
-
-;; SKIP:  ts  (we just call `js2-init-scanner' and use its vars)
-
-;; SKIP:  node factory - we're going to just call functions directly,
-;; and eventually go to a unified AST format.
-
-(js2-deflocal js2-nesting-of-function 0)
-
-(js2-deflocal js2-recorded-identifiers nil
-  "Tracks identifiers found during parsing.")
-
-(js2-deflocal js2-is-in-destructuring nil
-  "True while parsing destructuring expression.")
-
-(defcustom js2-global-externs nil
-  "A list of any extern names you'd like to consider always declared.
-This list is global and is used by all `js2-mode' files.
-You can create buffer-local externs list using `js2-additional-externs'.
-
-There is also a buffer-local variable `js2-default-externs',
-which is initialized by default to include the Ecma-262 externs
-and the standard browser externs.  The three lists are all
-checked during highlighting."
-  :type 'list
-  :group 'js2-mode)
-
-(js2-deflocal js2-default-externs nil
-  "Default external declarations.
-
-These are currently only used for highlighting undeclared variables,
-which only worries about top-level (unqualified) references.
-As js2-mode's processing improves, we will flesh out this list.
-
-The initial value is set to `js2-ecma-262-externs', unless some
-of the `js2-include-?-externs' variables are set to t, in which
-case the browser, Rhino and/or Node.js externs are also included.
-
-See `js2-additional-externs' for more information.")
-
-(defcustom js2-include-browser-externs t
-  "Non-nil to include browser externs in the master externs list.
-If you work on JavaScript files that are not intended for browsers,
-such as Mozilla Rhino server-side JavaScript, set this to nil.
-See `js2-additional-externs' for more information about externs."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-include-rhino-externs nil
-  "Non-nil to include Mozilla Rhino externs in the master externs list.
-See `js2-additional-externs' for more information about externs."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-include-node-externs nil
-  "Non-nil to include Node.js externs in the master externs list.
-See `js2-additional-externs' for more information about externs."
-  :type 'boolean
-  :group 'js2-mode)
-
-(js2-deflocal js2-additional-externs nil
-  "A buffer-local list of additional external declarations.
-It is used to decide whether variables are considered undeclared
-for purposes of highlighting.
-
-Each entry is a Lisp string.  The string should be the fully qualified
-name of an external entity.  All externs should be added to this list,
-so that as js2-mode's processing improves it can take advantage of them.
-
-You may want to declare your externs in three ways.
-First, you can add externs that are valid for all your JavaScript files.
-You should probably do this by adding them to `js2-global-externs', which
-is a global list used for all js2-mode files.
-
-Next, you can add a function to `js2-init-hook' that adds additional
-externs appropriate for the specific file, perhaps based on its path.
-These should go in `js2-additional-externs', which is buffer-local.
-
-Third, you can use JSLint's global declaration, as long as
-`js2-include-jslint-globals' is non-nil, which see.
-
-Finally, you can add a function to `js2-post-parse-callbacks',
-which is called after parsing completes, and `js2-mode-ast' is bound to
-the root of the parse tree.  At this stage you can set up an AST
-node visitor using `js2-visit-ast' and examine the parse tree
-for specific import patterns that may imply the existence of
-other externs, possibly tied to your build system.  These should also
-be added to `js2-additional-externs'.
-
-Your post-parse callback may of course also use the simpler and
-faster (but perhaps less robust) approach of simply scanning the
-buffer text for your imports, using regular expressions.")
-
-;; SKIP:  decompiler
-;; SKIP:  encoded-source
-
-;;; The following variables are per-function and should be saved/restored
-;;; during function parsing...
-
-(js2-deflocal js2-current-script-or-fn nil)
-(js2-deflocal js2-current-scope nil)
-(js2-deflocal js2-nesting-of-with 0)
-(js2-deflocal js2-label-set nil
-  "An alist mapping label names to nodes.")
-
-(js2-deflocal js2-loop-set nil)
-(js2-deflocal js2-loop-and-switch-set nil)
-(js2-deflocal js2-has-return-value nil)
-(js2-deflocal js2-end-flags 0)
-
-;;; ...end of per function variables
-
-;; These flags enumerate the possible ways a statement/function can
-;; terminate. These flags are used by endCheck() and by the Parser to
-;; detect inconsistent return usage.
-;;
-;; END_UNREACHED is reserved for code paths that are assumed to always be
-;; able to execute (example: throw, continue)
-;;
-;; END_DROPS_OFF indicates if the statement can transfer control to the
-;; next one. Statement such as return dont. A compound statement may have
-;; some branch that drops off control to the next statement.
-;;
-;; END_RETURNS indicates that the statement can return (without arguments)
-;; END_RETURNS_VALUE indicates that the statement can return a value.
-;;
-;; A compound statement such as
-;; if (condition) {
-;;   return value;
-;; }
-;; Will be detected as (END_DROPS_OFF | END_RETURN_VALUE) by endCheck()
-
-(defconst js2-end-unreached     #x0)
-(defconst js2-end-drops-off     #x1)
-(defconst js2-end-returns       #x2)
-(defconst js2-end-returns-value #x4)
-
-;; Rhino awkwardly passes a statementLabel parameter to the
-;; statementHelper() function, the main statement parser, which
-;; is then used by quite a few of the sub-parsers.  We just make
-;; it a buffer-local variable and make sure it's cleaned up properly.
-(js2-deflocal js2-labeled-stmt nil)  ; type `js2-labeled-stmt-node'
-
-;; Similarly, Rhino passes an inForInit boolean through about half
-;; the expression parsers.  We use a dynamically-scoped variable,
-;; which makes it easier to funcall the parsers individually without
-;; worrying about whether they take the parameter or not.
-(js2-deflocal js2-in-for-init nil)
-(js2-deflocal js2-temp-name-counter 0)
-(js2-deflocal js2-parse-stmt-count 0)
-
-(defsubst js2-get-next-temp-name ()
-  (format "$%d" (cl-incf js2-temp-name-counter)))
-
-(defvar js2-parse-interruptable-p t
-  "Set this to nil to force parse to continue until finished.
-This will mostly be useful for interpreters.")
-
-(defvar js2-statements-per-pause 50
-  "Pause after this many statements to check for user input.
-If user input is pending, stop the parse and discard the tree.
-This makes for a smoother user experience for large files.
-You may have to wait a second or two before the highlighting
-and error-reporting appear, but you can always type ahead if
-you wish.  This appears to be more or less how Eclipse, IntelliJ
-and other editors work.")
-
-(js2-deflocal js2-record-comments t
-  "Instructs the scanner to record comments in `js2-scanned-comments'.")
-
-(js2-deflocal js2-scanned-comments nil
-  "List of all comments from the current parse.")
-
-(defcustom js2-mode-indent-inhibit-undo nil
-  "Non-nil to disable collection of Undo information when indenting lines.
-Some users have requested this behavior.  It's nil by default because
-other Emacs modes don't work this way."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-mode-indent-ignore-first-tab nil
-  "If non-nil, ignore first TAB keypress if we look indented properly.
-It's fairly common for users to navigate to an already-indented line
-and press TAB for reassurance that it's been indented.  For this class
-of users, we want the first TAB press on a line to be ignored if the
-line is already indented to one of the precomputed alternatives.
-
-This behavior is only partly implemented.  If you TAB-indent a line,
-navigate to another line, and then navigate back, it fails to clear
-the last-indented variable, so it thinks you've already hit TAB once,
-and performs the indent.  A full solution would involve getting on the
-point-motion hooks for the entire buffer.  If we come across another
-use cases that requires watching point motion, I'll consider doing it.
-
-If you set this variable to nil, then the TAB key will always change
-the indentation of the current line, if more than one alternative
-indentation spot exists."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defvar js2-indent-hook nil
-  "A hook for user-defined indentation rules.
-
-Functions on this hook should expect two arguments:    (LIST INDEX)
-The LIST argument is the list of computed indentation points for
-the current line.  INDEX is the list index of the indentation point
-that `js2-bounce-indent' plans to use.  If INDEX is nil, then the
-indent function is not going to change the current line indentation.
-
-If a hook function on this list returns a non-nil value, then
-`js2-bounce-indent' assumes the hook function has performed its own
-indentation, and will do nothing.  If all hook functions on the list
-return nil, then `js2-bounce-indent' will use its computed indentation
-and reindent the line.
-
-When hook functions on this hook list are called, the variable
-`js2-mode-ast' may or may not be set, depending on whether the
-parse tree is available.  If the variable is nil, you can pass a
-callback to `js2-mode-wait-for-parse', and your callback will be
-called after the new parse tree is built.  This can take some time
-in large files.")
-
-(defface js2-warning
-  `((((class color) (background light))
-     (:underline  "orange"))
-    (((class color) (background dark))
-     (:underline "orange"))
-    (t (:underline t)))
-  "Face for JavaScript warnings."
-  :group 'js2-mode)
-
-(defface js2-error
-  `((((class color) (background light))
-     (:foreground "red"))
-    (((class color) (background dark))
-     (:foreground "red"))
-    (t (:foreground "red")))
-  "Face for JavaScript errors."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-tag
-  '((t :foreground "SlateGray"))
-  "Face used to highlight @whatever tags in jsdoc comments."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-type
-  '((t :foreground "SteelBlue"))
-  "Face used to highlight {FooBar} types in jsdoc comments."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-value
-  '((t :foreground "PeachPuff3"))
-  "Face used to highlight tag values in jsdoc comments."
-  :group 'js2-mode)
-
-(defface js2-function-param
-  '((t :foreground "SeaGreen"))
-  "Face used to highlight function parameters in javascript."
-  :group 'js2-mode)
-
-(defface js2-function-call
-  '((t :inherit default))
-  "Face used to highlight function name in calls."
-  :group 'js2-mode)
-
-(defface js2-instance-member
-  '((t :foreground "DarkOrchid"))
-  "Face used to highlight instance variables in javascript.
-Not currently used."
-  :group 'js2-mode)
-
-(defface js2-private-member
-  '((t :foreground "PeachPuff3"))
-  "Face used to highlight calls to private methods in javascript.
-Not currently used."
-  :group 'js2-mode)
-
-(defface js2-private-function-call
-  '((t :foreground "goldenrod"))
-  "Face used to highlight calls to private functions in javascript.
-Not currently used."
-  :group 'js2-mode)
-
-(defface js2-jsdoc-html-tag-name
-  '((((class color) (min-colors 88) (background light))
-     (:foreground "rosybrown"))
-    (((class color) (min-colors 8) (background dark))
-     (:foreground "yellow"))
-    (((class color) (min-colors 8) (background light))
-     (:foreground "magenta")))
-    "Face used to highlight jsdoc html tag names"
-  :group 'js2-mode)
-
-(defface js2-jsdoc-html-tag-delimiter
-  '((((class color) (min-colors 88) (background light))
-     (:foreground "dark khaki"))
-    (((class color) (min-colors 8) (background dark))
-     (:foreground "green"))
-    (((class color) (min-colors 8) (background light))
-     (:foreground "green")))
-  "Face used to highlight brackets in jsdoc html tags."
-  :group 'js2-mode)
-
-(defface js2-external-variable
-  '((t :foreground "orange"))
-  "Face used to highlight undeclared variable identifiers.")
-
-(defcustom js2-init-hook nil
-  "List of functions to be called after `js2-mode' or
-`js2-minor-mode' has initialized all variables, before parsing
-the buffer for the first time."
-  :type 'hook
-  :group 'js2-mode
-  :version "20130608")
-
-(defcustom js2-post-parse-callbacks nil
-  "List of callback functions invoked after parsing finishes.
-Currently, the main use for this function is to add synthetic
-declarations to `js2-recorded-identifiers', which see."
-  :type 'hook
-  :group 'js2-mode)
-
-(defcustom js2-build-imenu-callbacks nil
-  "List of functions called during Imenu index generation.
-It's a good place to add additional entries to it, using
-`js2-record-imenu-entry'."
-  :type 'hook
-  :group 'js2-mode)
-
-(defcustom js2-highlight-external-variables t
-  "Non-nil to highlight undeclared variable identifiers.
-An undeclared variable is any variable not declared with var or let
-in the current scope or any lexically enclosing scope.  If you use
-such a variable, then you are either expecting it to originate from
-another file, or you've got a potential bug."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defcustom js2-warn-about-unused-function-arguments nil
-  "Non-nil to treat function arguments like declared-but-unused variables."
-  :type 'booleanp
-  :group 'js2-mode)
-
-(defcustom js2-include-jslint-globals t
-  "Non-nil to include the identifiers from JSLint global
-declaration (see http://www.jslint.com/lint.html#global) in the
-buffer-local externs list.  See `js2-additional-externs' for more
-information."
-  :type 'boolean
-  :group 'js2-mode)
-
-(defvar js2-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] #'js2-mode-show-node)
-    (define-key map (kbd "M-j") #'js2-line-break)
-    (define-key map (kbd "C-c C-e") #'js2-mode-hide-element)
-    (define-key map (kbd "C-c C-s") #'js2-mode-show-element)
-    (define-key map (kbd "C-c C-a") #'js2-mode-show-all)
-    (define-key map (kbd "C-c C-f") #'js2-mode-toggle-hide-functions)
-    (define-key map (kbd "C-c C-t") #'js2-mode-toggle-hide-comments)
-    (define-key map (kbd "C-c C-o") #'js2-mode-toggle-element)
-    (define-key map (kbd "C-c C-w") #'js2-mode-toggle-warnings-and-errors)
-    (define-key map [down-mouse-3] #'js2-down-mouse-3)
-    (when js2-bounce-indent-p
-      (define-key map (kbd "<backtab>") #'js2-indent-bounce-backwards))
-
-    (define-key map [menu-bar javascript]
-      (cons "JavaScript" (make-sparse-keymap "JavaScript")))
-
-    (define-key map [menu-bar javascript customize-js2-mode]
-      '(menu-item "Customize js2-mode" js2-mode-customize
-                  :help "Customize the behavior of this mode"))
-
-    (define-key map [menu-bar javascript js2-force-refresh]
-      '(menu-item "Force buffer refresh" js2-mode-reset
-                  :help "Re-parse the buffer from scratch"))
-
-    (define-key map [menu-bar javascript separator-2]
-      '("--"))
-
-    (define-key map [menu-bar javascript next-error]
-      '(menu-item "Next warning or error" next-error
-                  :enabled (and js2-mode-ast
-                                (or (js2-ast-root-errors js2-mode-ast)
-                                    (js2-ast-root-warnings js2-mode-ast)))
-                  :help "Move to next warning or error"))
-
-    (define-key map [menu-bar javascript display-errors]
-      '(menu-item "Show errors and warnings" js2-mode-display-warnings-and-errors
-                  :visible (not js2-mode-show-parse-errors)
-                  :help "Turn on display of warnings and errors"))
-
-    (define-key map [menu-bar javascript hide-errors]
-      '(menu-item "Hide errors and warnings" js2-mode-hide-warnings-and-errors
-                  :visible js2-mode-show-parse-errors
-                  :help "Turn off display of warnings and errors"))
-
-    (define-key map [menu-bar javascript separator-1]
-      '("--"))
-
-    (define-key map [menu-bar javascript js2-toggle-function]
-      '(menu-item "Show/collapse element" js2-mode-toggle-element
-                  :help "Hide or show function body or comment"))
-
-    (define-key map [menu-bar javascript show-comments]
-      '(menu-item "Show block comments" js2-mode-toggle-hide-comments
-                  :visible js2-mode-comments-hidden
-                  :help "Expand all hidden block comments"))
-
-    (define-key map [menu-bar javascript hide-comments]
-      '(menu-item "Hide block comments" js2-mode-toggle-hide-comments
-                  :visible (not js2-mode-comments-hidden)
-                  :help "Show block comments as /*...*/"))
-
-    (define-key map [menu-bar javascript show-all-functions]
-      '(menu-item "Show function bodies" js2-mode-toggle-hide-functions
-                  :visible js2-mode-functions-hidden
-                  :help "Expand all hidden function bodies"))
-
-    (define-key map [menu-bar javascript hide-all-functions]
-      '(menu-item "Hide function bodies" js2-mode-toggle-hide-functions
-                  :visible (not js2-mode-functions-hidden)
-                  :help "Show {...} for all top-level function bodies"))
-
-    map)
-  "Keymap used in `js2-mode' buffers.")
-
-(defconst js2-mode-identifier-re "[[:alpha:]_$][[:alnum:]_$]*")
-
-(defvar js2-mode-//-comment-re "^\\(\\s-*\\)//.+"
-  "Matches a //-comment line.  Must be first non-whitespace on line.
-First match-group is the leading whitespace.")
-
-(defvar js2-mode-hook nil)
-
-(js2-deflocal js2-mode-ast nil "Private variable.")
-(js2-deflocal js2-mode-parse-timer nil "Private variable.")
-(js2-deflocal js2-mode-buffer-dirty-p nil "Private variable.")
-(js2-deflocal js2-mode-parsing nil "Private variable.")
-(js2-deflocal js2-mode-node-overlay nil)
-
-(defvar js2-mode-show-overlay js2-mode-dev-mode-p
-  "Debug:  Non-nil to highlight AST nodes on mouse-down.")
-
-(js2-deflocal js2-mode-fontifications nil "Private variable")
-(js2-deflocal js2-mode-deferred-properties nil "Private variable")
-(js2-deflocal js2-imenu-recorder nil "Private variable")
-(js2-deflocal js2-imenu-function-map nil "Private variable")
-
-(defvar js2-paragraph-start
-  "\\(@[[:alpha:]]+\\>\\|$\\)")
-
-;; Note that we also set a 'c-in-sws text property in html comments,
-;; so that `c-forward-sws' and `c-backward-sws' work properly.
-(defvar js2-syntactic-ws-start
-  "\\s \\|/[*/]\\|[\n\r]\\|\\\\[\n\r]\\|\\s!\\|<!--\\|^\\s-*-->")
-
-(defvar js2-syntactic-ws-end
-  "\\s \\|[\n\r/]\\|\\s!")
-
-(defvar js2-syntactic-eol
-  (concat "\\s *\\(/\\*[^*\n\r]*"
-          "\\(\\*+[^*\n\r/][^*\n\r]*\\)*"
-          "\\*+/\\s *\\)*"
-          "\\(//\\|/\\*[^*\n\r]*"
-          "\\(\\*+[^*\n\r/][^*\n\r]*\\)*$"
-          "\\|\\\\$\\|$\\)")
-  "Copied from `java-mode'.  Needed for some cc-engine functions.")
-
-(defvar js2-comment-prefix-regexp
-  "//+\\|\\**")
-
-(defvar js2-comment-start-skip
-  "\\(//+\\|/\\*+\\)\\s *")
-
-(defvar js2-mode-verbose-parse-p js2-mode-dev-mode-p
-  "Non-nil to emit status messages during parsing.")
-
-(defvar js2-mode-functions-hidden nil "Private variable.")
-(defvar js2-mode-comments-hidden nil "Private variable.")
-
-(defvar js2-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (c-populate-syntax-table table)
-    (modify-syntax-entry ?` "\"" table)
-    table)
-  "Syntax table used in `js2-mode' buffers.")
-
-(defvar js2-mode-abbrev-table nil
-  "Abbrev table in use in `js2-mode' buffers.")
-(define-abbrev-table 'js2-mode-abbrev-table ())
-
-(defvar js2-mode-pending-parse-callbacks nil
-  "List of functions waiting to be notified that parse is finished.")
-
-(defvar js2-mode-last-indented-line -1)
-
-;;; Localizable error and warning messages
-
-;; Messages are copied from Rhino's Messages.properties.
-;; Many of the Java-specific messages have been elided.
-;; Add any js2-specific ones at the end, so we can keep
-;; this file synced with changes to Rhino's.
-
-(defvar js2-message-table
-  (make-hash-table :test 'equal :size 250)
-  "Contains localized messages for `js2-mode'.")
-
-;; TODO(stevey):  construct this table at compile-time.
-(defmacro js2-msg (key &rest strings)
-  `(puthash ,key (concat ,@strings)
-            js2-message-table))
-
-(defun js2-get-msg (msg-key)
-  "Look up a localized message.
-MSG-KEY is a list of (MSG ARGS).  If the message takes parameters,
-the correct number of ARGS must be provided."
-  (let* ((key (if (listp msg-key) (car msg-key) msg-key))
-         (args (if (listp msg-key) (cdr msg-key)))
-         (msg (gethash key js2-message-table)))
-    (if msg
-        (apply #'format msg args)
-      key)))  ; default to showing the key
-
-(js2-msg "msg.dup.parms"
-         "Duplicate parameter name '%s'.")
-
-(js2-msg "msg.too.big.jump"
-         "Program too complex: jump offset too big.")
-
-(js2-msg "msg.too.big.index"
-         "Program too complex: internal index exceeds 64K limit.")
-
-(js2-msg "msg.while.compiling.fn"
-         "Encountered code generation error while compiling function '%s': %s")
-
-(js2-msg "msg.while.compiling.script"
-         "Encountered code generation error while compiling script: %s")
-
-;; Context
-(js2-msg "msg.ctor.not.found"
-         "Constructor for '%s' not found.")
-
-(js2-msg "msg.not.ctor"
-         "'%s' is not a constructor.")
-
-;; FunctionObject
-(js2-msg "msg.varargs.ctor"
-         "Method or constructor '%s' must be static "
-         "with the signature (Context cx, Object[] args, "
-         "Function ctorObj, boolean inNewExpr) "
-         "to define a variable arguments constructor.")
-
-(js2-msg "msg.varargs.fun"
-         "Method '%s' must be static with the signature "
-         "(Context cx, Scriptable thisObj, Object[] args, Function funObj) "
-         "to define a variable arguments function.")
-
-(js2-msg "msg.incompat.call"
-         "Method '%s' called on incompatible object.")
-
-(js2-msg "msg.bad.parms"
-         "Unsupported parameter type '%s' in method '%s'.")
-
-(js2-msg "msg.bad.method.return"
-         "Unsupported return type '%s' in method '%s'.")
-
-(js2-msg "msg.bad.ctor.return"
-         "Construction of objects of type '%s' is not supported.")
-
-(js2-msg "msg.no.overload"
-         "Method '%s' occurs multiple times in class '%s'.")
-
-(js2-msg "msg.method.not.found"
-         "Method '%s' not found in '%s'.")
-
-;; IRFactory
-
-(js2-msg "msg.bad.for.in.lhs"
-         "Invalid left-hand side of for..in loop.")
-
-(js2-msg "msg.mult.index"
-         "Only one variable allowed in for..in loop.")
-
-(js2-msg "msg.bad.for.in.destruct"
-         "Left hand side of for..in loop must be an array of "
-         "length 2 to accept key/value pair.")
-
-(js2-msg "msg.cant.convert"
-         "Can't convert to type '%s'.")
-
-(js2-msg "msg.bad.assign.left"
-         "Invalid assignment left-hand side.")
-
-(js2-msg "msg.bad.decr"
-         "Invalid decrement operand.")
-
-(js2-msg "msg.bad.incr"
-         "Invalid increment operand.")
-
-(js2-msg "msg.bad.yield"
-         "yield must be in a function.")
-
-(js2-msg "msg.yield.parenthesized"
-         "yield expression must be parenthesized.")
-
-;; NativeGlobal
-(js2-msg "msg.cant.call.indirect"
-          "Function '%s' must be called directly, and not by way of a "
-          "function of another name.")
-
-(js2-msg "msg.eval.nonstring"
-          "Calling eval() with anything other than a primitive "
-          "string value will simply return the value. "
-          "Is this what you intended?")
-
-(js2-msg "msg.eval.nonstring.strict"
-         "Calling eval() with anything other than a primitive "
-         "string value is not allowed in strict mode.")
-
-(js2-msg "msg.bad.destruct.op"
-         "Invalid destructuring assignment operator")
-
-;; NativeCall
-(js2-msg "msg.only.from.new"
-         "'%s' may only be invoked from a `new' expression.")
-
-(js2-msg "msg.deprec.ctor"
-         "The '%s' constructor is deprecated.")
-
-;; NativeFunction
-(js2-msg "msg.no.function.ref.found"
-         "no source found to decompile function reference %s")
-
-(js2-msg "msg.arg.isnt.array"
-         "second argument to Function.prototype.apply must be an array")
-
-;; NativeGlobal
-(js2-msg "msg.bad.esc.mask"
-         "invalid string escape mask")
-
-;; NativeRegExp
-(js2-msg "msg.bad.quant"
-  "Invalid quantifier %s")
-
-(js2-msg "msg.overlarge.backref"
-  "Overly large back reference %s")
-
-(js2-msg "msg.overlarge.min"
-  "Overly large minimum %s")
-
-(js2-msg "msg.overlarge.max"
-  "Overly large maximum %s")
-
-(js2-msg "msg.zero.quant"
-  "Zero quantifier %s")
-
-(js2-msg "msg.max.lt.min"
-  "Maximum %s less than minimum")
-
-(js2-msg "msg.unterm.quant"
-  "Unterminated quantifier %s")
-
-(js2-msg "msg.unterm.paren"
-  "Unterminated parenthetical %s")
-
-(js2-msg "msg.unterm.class"
-  "Unterminated character class %s")
-
-(js2-msg "msg.bad.range"
-  "Invalid range in character class.")
-
-(js2-msg "msg.trail.backslash"
-  "Trailing \\ in regular expression.")
-
-(js2-msg "msg.re.unmatched.right.paren"
-  "unmatched ) in regular expression.")
-
-(js2-msg "msg.no.regexp"
-  "Regular expressions are not available.")
-
-(js2-msg "msg.bad.backref"
-  "back-reference exceeds number of capturing parentheses.")
-
-(js2-msg "msg.bad.regexp.compile"
-         "Only one argument may be specified if the first "
-         "argument to RegExp.prototype.compile is a RegExp object.")
-
-;; Parser
-(js2-msg "msg.got.syntax.errors"
-         "Compilation produced %s syntax errors.")
-
-(js2-msg "msg.var.redecl"
-         "TypeError: redeclaration of var %s.")
-
-(js2-msg "msg.const.redecl"
-         "TypeError: redeclaration of const %s.")
-
-(js2-msg "msg.let.redecl"
-         "TypeError: redeclaration of variable %s.")
-
-(js2-msg "msg.parm.redecl"
-         "TypeError: redeclaration of formal parameter %s.")
-
-(js2-msg "msg.fn.redecl"
-         "TypeError: redeclaration of function %s.")
-
-(js2-msg "msg.let.decl.not.in.block"
-         "SyntaxError: let declaration not directly within block")
-
-(js2-msg "msg.mod.import.decl.at.top.level"
-         "SyntaxError: import declarations may only appear at the top level")
-
-(js2-msg "msg.mod.as.after.reserved.word"
-         "SyntaxError: missing keyword 'as' after reserved word %s")
-
-(js2-msg "msg.mod.rc.after.import.spec.list"
-         "SyntaxError: missing '}' after module specifier list")
-
-(js2-msg "msg.mod.from.after.import.spec.set"
-         "SyntaxError: missing keyword 'from' after import specifier set")
-
-(js2-msg "msg.mod.declaration.after.import"
-         "SyntaxError: missing declaration after 'import' keyword")
-
-(js2-msg "msg.mod.spec.after.from"
-         "SyntaxError: missing module specifier after 'from' keyword")
-
-(js2-msg "msg.mod.export.decl.at.top.level"
-         "SyntaxError: export declarations may only appear at top level")
-
-(js2-msg "msg.mod.rc.after.export.spec.list"
-         "SyntaxError: missing '}' after export specifier list")
-
-;; NodeTransformer
-(js2-msg "msg.dup.label"
-         "duplicated label")
-
-(js2-msg "msg.undef.label"
-         "undefined label")
-
-(js2-msg "msg.bad.break"
-         "unlabelled break must be inside loop or switch")
-
-(js2-msg "msg.continue.outside"
-         "continue must be inside loop")
-
-(js2-msg "msg.continue.nonloop"
-         "continue can only use labels of iteration statements")
-
-(js2-msg "msg.bad.throw.eol"
-         "Line terminator is not allowed between the throw "
-         "keyword and throw expression.")
-
-(js2-msg "msg.unnamed.function.stmt" ; added by js2-mode
-         "function statement requires a name")
-
-(js2-msg "msg.no.paren.parms"
-         "missing ( before function parameters.")
-
-(js2-msg "msg.no.parm"
-         "missing formal parameter")
-
-(js2-msg "msg.no.paren.after.parms"
-         "missing ) after formal parameters")
-
-(js2-msg "msg.no.default.after.default.param" ; added by js2-mode
-         "parameter without default follows parameter with default")
-
-(js2-msg "msg.param.after.rest" ; added by js2-mode
-         "parameter after rest parameter")
-
-(js2-msg "msg.bad.arrow.args" ; added by js2-mode
-         "invalid arrow-function arguments (parentheses around the arrow-function may help)")
-
-(js2-msg "msg.no.brace.body"
-         "missing '{' before function body")
-
-(js2-msg "msg.no.brace.after.body"
-         "missing } after function body")
-
-(js2-msg "msg.no.paren.cond"
-         "missing ( before condition")
-
-(js2-msg "msg.no.paren.after.cond"
-         "missing ) after condition")
-
-(js2-msg "msg.no.semi.stmt"
-         "missing ; before statement")
-
-(js2-msg "msg.missing.semi"
-         "missing ; after statement")
-
-(js2-msg "msg.no.name.after.dot"
-         "missing name after . operator")
-
-(js2-msg "msg.no.name.after.coloncolon"
-         "missing name after :: operator")
-
-(js2-msg "msg.no.name.after.dotdot"
-         "missing name after .. operator")
-
-(js2-msg "msg.no.name.after.xmlAttr"
-         "missing name after .@")
-
-(js2-msg "msg.no.bracket.index"
-         "missing ] in index expression")
-
-(js2-msg "msg.no.paren.switch"
-         "missing ( before switch expression")
-
-(js2-msg "msg.no.paren.after.switch"
-         "missing ) after switch expression")
-
-(js2-msg "msg.no.brace.switch"
-         "missing '{' before switch body")
-
-(js2-msg "msg.bad.switch"
-         "invalid switch statement")
-
-(js2-msg "msg.no.colon.case"
-         "missing : after case expression")
-
-(js2-msg "msg.double.switch.default"
-         "double default label in the switch statement")
-
-(js2-msg "msg.no.while.do"
-         "missing while after do-loop body")
-
-(js2-msg "msg.no.paren.for"
-         "missing ( after for")
-
-(js2-msg "msg.no.semi.for"
-         "missing ; after for-loop initializer")
-
-(js2-msg "msg.no.semi.for.cond"
-         "missing ; after for-loop condition")
-
-(js2-msg "msg.in.after.for.name"
-         "missing in or of after for")
-
-(js2-msg "msg.no.paren.for.ctrl"
-         "missing ) after for-loop control")
-
-(js2-msg "msg.no.paren.with"
-         "missing ( before with-statement object")
-
-(js2-msg "msg.no.paren.after.with"
-         "missing ) after with-statement object")
-
-(js2-msg "msg.no.paren.after.let"
-         "missing ( after let")
-
-(js2-msg "msg.no.paren.let"
-         "missing ) after variable list")
-
-(js2-msg "msg.no.curly.let"
-         "missing } after let statement")
-
-(js2-msg "msg.bad.return"
-         "invalid return")
-
-(js2-msg "msg.no.brace.block"
-         "missing } in compound statement")
-
-(js2-msg "msg.bad.label"
-         "invalid label")
-
-(js2-msg "msg.bad.var"
-         "missing variable name")
-
-(js2-msg "msg.bad.var.init"
-         "invalid variable initialization")
-
-(js2-msg "msg.no.colon.cond"
-         "missing : in conditional expression")
-
-(js2-msg "msg.no.paren.arg"
-         "missing ) after argument list")
-
-(js2-msg "msg.no.bracket.arg"
-         "missing ] after element list")
-
-(js2-msg "msg.bad.prop"
-         "invalid property id")
-
-(js2-msg "msg.no.colon.prop"
-         "missing : after property id")
-
-(js2-msg "msg.no.brace.prop"
-         "missing } after property list")
-
-(js2-msg "msg.no.paren"
-         "missing ) in parenthetical")
-
-(js2-msg "msg.reserved.id"
-         "'%s' is a reserved identifier")
-
-(js2-msg "msg.no.paren.catch"
-         "missing ( before catch-block condition")
-
-(js2-msg "msg.bad.catchcond"
-         "invalid catch block condition")
-
-(js2-msg "msg.catch.unreachable"
-         "any catch clauses following an unqualified catch are unreachable")
-
-(js2-msg "msg.no.brace.try"
-         "missing '{' before try block")
-
-(js2-msg "msg.no.brace.catchblock"
-         "missing '{' before catch-block body")
-
-(js2-msg "msg.try.no.catchfinally"
-         "'try' without 'catch' or 'finally'")
-
-(js2-msg "msg.no.return.value"
-         "function %s does not always return a value")
-
-(js2-msg "msg.anon.no.return.value"
-         "anonymous function does not always return a value")
-
-(js2-msg "msg.return.inconsistent"
-         "return statement is inconsistent with previous usage")
-
-(js2-msg "msg.generator.returns"
-         "TypeError: legacy generator function '%s' returns a value")
-
-(js2-msg "msg.anon.generator.returns"
-         "TypeError: anonymous legacy generator function returns a value")
-
-(js2-msg "msg.syntax"
-         "syntax error")
-
-(js2-msg "msg.unexpected.eof"
-         "Unexpected end of file")
-
-(js2-msg "msg.XML.bad.form"
-         "illegally formed XML syntax")
-
-(js2-msg "msg.XML.not.available"
-         "XML runtime not available")
-
-(js2-msg "msg.too.deep.parser.recursion"
-         "Too deep recursion while parsing")
-
-(js2-msg "msg.no.side.effects"
-         "Code has no side effects")
-
-(js2-msg "msg.extra.trailing.comma"
-         "Trailing comma is not supported in some browsers")
-
-(js2-msg "msg.array.trailing.comma"
-         "Trailing comma yields different behavior across browsers")
-
-(js2-msg "msg.equal.as.assign"
-         (concat "Test for equality (==) mistyped as assignment (=)?"
-                 " (parenthesize to suppress warning)"))
-
-(js2-msg "msg.var.hides.arg"
-         "Variable %s hides argument")
-
-(js2-msg "msg.destruct.assign.no.init"
-         "Missing = in destructuring declaration")
-
-;; ScriptRuntime
-(js2-msg "msg.no.properties"
-         "%s has no properties.")
-
-(js2-msg "msg.invalid.iterator"
-         "Invalid iterator value")
-
-(js2-msg "msg.iterator.primitive"
-         "__iterator__ returned a primitive value")
-
-(js2-msg "msg.assn.create.strict"
-         "Assignment to undeclared variable %s")
-
-(js2-msg "msg.undeclared.variable"  ; added by js2-mode
-         "Undeclared variable or function '%s'")
-
-(js2-msg "msg.unused.variable"  ; added by js2-mode
-         "Unused variable or function '%s'")
-
-(js2-msg "msg.uninitialized.variable"  ; added by js2-mode
-         "Variable '%s' referenced but never initialized")
-
-(js2-msg "msg.ref.undefined.prop"
-         "Reference to undefined property '%s'")
-
-(js2-msg "msg.prop.not.found"
-         "Property %s not found.")
-
-(js2-msg "msg.invalid.type"
-         "Invalid JavaScript value of type %s")
-
-(js2-msg "msg.primitive.expected"
-         "Primitive type expected (had %s instead)")
-
-(js2-msg "msg.namespace.expected"
-         "Namespace object expected to left of :: (found %s instead)")
-
-(js2-msg "msg.null.to.object"
-         "Cannot convert null to an object.")
-
-(js2-msg "msg.undef.to.object"
-         "Cannot convert undefined to an object.")
-
-(js2-msg "msg.cyclic.value"
-         "Cyclic %s value not allowed.")
-
-(js2-msg "msg.is.not.defined"
-         "'%s' is not defined.")
-
-(js2-msg "msg.undef.prop.read"
-         "Cannot read property '%s' from %s")
-
-(js2-msg "msg.undef.prop.write"
-         "Cannot set property '%s' of %s to '%s'")
-
-(js2-msg "msg.undef.prop.delete"
-         "Cannot delete property '%s' of %s")
-
-(js2-msg "msg.undef.method.call"
-         "Cannot call method '%s' of %s")
-
-(js2-msg "msg.undef.with"
-         "Cannot apply 'with' to %s")
-
-(js2-msg "msg.isnt.function"
-         "%s is not a function, it is %s.")
-
-(js2-msg "msg.isnt.function.in"
-         "Cannot call property %s in object %s. "
-         "It is not a function, it is '%s'.")
-
-(js2-msg "msg.function.not.found"
-         "Cannot find function %s.")
-
-(js2-msg "msg.function.not.found.in"
-         "Cannot find function %s in object %s.")
-
-(js2-msg "msg.isnt.xml.object"
-         "%s is not an xml object.")
-
-(js2-msg "msg.no.ref.to.get"
-         "%s is not a reference to read reference value.")
-
-(js2-msg "msg.no.ref.to.set"
-         "%s is not a reference to set reference value to %s.")
-
-(js2-msg "msg.no.ref.from.function"
-         "Function %s can not be used as the left-hand "
-         "side of assignment or as an operand of ++ or -- operator.")
-
-(js2-msg "msg.bad.default.value"
-         "Object's getDefaultValue() method returned an object.")
-
-(js2-msg "msg.instanceof.not.object"
-         "Can't use instanceof on a non-object.")
-
-(js2-msg "msg.instanceof.bad.prototype"
-         "'prototype' property of %s is not an object.")
-
-(js2-msg "msg.bad.radix"
-         "illegal radix %s.")
-
-;; ScriptableObject
-(js2-msg "msg.default.value"
-         "Cannot find default value for object.")
-
-(js2-msg "msg.zero.arg.ctor"
-         "Cannot load class '%s' which has no zero-parameter constructor.")
-
-(js2-msg "msg.ctor.multiple.parms"
-         "Can't define constructor or class %s since more than "
-         "one constructor has multiple parameters.")
-
-(js2-msg "msg.extend.scriptable"
-         "%s must extend ScriptableObject in order to define property %s.")
-
-(js2-msg "msg.bad.getter.parms"
-         "In order to define a property, getter %s must have zero "
-         "parameters or a single ScriptableObject parameter.")
-
-(js2-msg "msg.obj.getter.parms"
-         "Expected static or delegated getter %s to take "
-         "a ScriptableObject parameter.")
-
-(js2-msg "msg.getter.static"
-         "Getter and setter must both be static or neither be static.")
-
-(js2-msg "msg.setter.return"
-         "Setter must have void return type: %s")
-
-(js2-msg "msg.setter2.parms"
-         "Two-parameter setter must take a ScriptableObject as "
-         "its first parameter.")
-
-(js2-msg "msg.setter1.parms"
-         "Expected single parameter setter for %s")
-
-(js2-msg "msg.setter2.expected"
-         "Expected static or delegated setter %s to take two parameters.")
-
-(js2-msg "msg.setter.parms"
-         "Expected either one or two parameters for setter.")
-
-(js2-msg "msg.setter.bad.type"
-         "Unsupported parameter type '%s' in setter '%s'.")
-
-(js2-msg "msg.add.sealed"
-         "Cannot add a property to a sealed object: %s.")
-
-(js2-msg "msg.remove.sealed"
-         "Cannot remove a property from a sealed object: %s.")
-
-(js2-msg "msg.modify.sealed"
-         "Cannot modify a property of a sealed object: %s.")
-
-(js2-msg "msg.modify.readonly"
-         "Cannot modify readonly property: %s.")
-
-;; TokenStream
-(js2-msg "msg.missing.exponent"
-         "missing exponent")
-
-(js2-msg "msg.caught.nfe"
-         "number format error")
-
-(js2-msg "msg.unterminated.string.lit"
-         "unterminated string literal")
-
-(js2-msg "msg.unterminated.comment"
-         "unterminated comment")
-
-(js2-msg "msg.unterminated.re.lit"
-         "unterminated regular expression literal")
-
-(js2-msg "msg.invalid.re.flag"
-         "invalid flag after regular expression")
-
-(js2-msg "msg.no.re.input.for"
-         "no input for %s")
-
-(js2-msg "msg.illegal.character"
-         "illegal character")
-
-(js2-msg "msg.invalid.escape"
-         "invalid Unicode escape sequence")
-
-(js2-msg "msg.bad.namespace"
-         "not a valid default namespace statement. "
-         "Syntax is: default xml namespace = EXPRESSION;")
-
-;; TokensStream warnings
-(js2-msg "msg.bad.octal.literal"
-         "illegal octal literal digit %s; "
-         "interpreting it as a decimal digit")
-
-(js2-msg "msg.missing.hex.digits"
-         "missing hexadecimal digits after '0x'")
-
-(js2-msg "msg.missing.binary.digits"
-         "missing binary digits after '0b'")
-
-(js2-msg "msg.missing.octal.digits"
-         "missing octal digits after '0o'")
-
-(js2-msg "msg.script.is.not.constructor"
-         "Script objects are not constructors.")
-
-;; Arrays
-(js2-msg "msg.arraylength.bad"
-         "Inappropriate array length.")
-
-;; Arrays
-(js2-msg "msg.arraylength.too.big"
-         "Array length %s exceeds supported capacity limit.")
-
-;; URI
-(js2-msg "msg.bad.uri"
-         "Malformed URI sequence.")
-
-;; Number
-(js2-msg "msg.bad.precision"
-         "Precision %s out of range.")
-
-;; NativeGenerator
-(js2-msg "msg.send.newborn"
-         "Attempt to send value to newborn generator")
-
-(js2-msg "msg.already.exec.gen"
-         "Already executing generator")
-
-(js2-msg "msg.StopIteration.invalid"
-         "StopIteration may not be changed to an arbitrary object.")
-
-;; Interpreter
-(js2-msg "msg.yield.closing"
-         "Yield from closing generator")
-
-;; Classes
-(js2-msg "msg.unnamed.class.stmt" ; added by js2-mode
-         "class statement requires a name")
-
-(js2-msg "msg.class.unexpected.comma" ; added by js2-mode
-         "unexpected ',' between class properties")
-
-(js2-msg "msg.unexpected.static" ; added by js2-mode
-         "unexpected 'static'")
-
-(js2-msg "msg.missing.extends" ; added by js2-mode
-         "name is required after extends")
-
-(js2-msg "msg.no.brace.class" ; added by js2-mode
-         "missing '{' before class body")
-
-(js2-msg "msg.missing.computed.rb" ; added by js2-mode
-         "missing ']' after computed property expression")
-
-;;; Tokens Buffer
-
-(defconst js2-ti-max-lookahead 2)
-(defconst js2-ti-ntokens (1+ js2-ti-max-lookahead))
-
-(defun js2-new-token (offset)
-  (let ((token (make-js2-token (+ offset js2-ts-cursor))))
-    (setq js2-ti-tokens-cursor (mod (1+ js2-ti-tokens-cursor) js2-ti-ntokens))
-    (aset js2-ti-tokens js2-ti-tokens-cursor token)
-    token))
-
-(defsubst js2-current-token ()
-  (aref js2-ti-tokens js2-ti-tokens-cursor))
-
-(defsubst js2-current-token-string ()
-  (js2-token-string (js2-current-token)))
-
-(defsubst js2-current-token-type ()
-  (js2-token-type (js2-current-token)))
-
-(defsubst js2-current-token-beg ()
-  (js2-token-beg (js2-current-token)))
-
-(defsubst js2-current-token-end ()
-  (js2-token-end (js2-current-token)))
-
-(defun js2-current-token-len ()
-  (let ((token (js2-current-token)))
-    (- (js2-token-end token)
-       (js2-token-beg token))))
-
-(defun js2-ts-seek (state)
-  (setq js2-ts-lineno (js2-ts-state-lineno state)
-        js2-ts-cursor (js2-ts-state-cursor state)
-        js2-ti-tokens (js2-ts-state-tokens state)
-        js2-ti-tokens-cursor (js2-ts-state-tokens-cursor state)
-        js2-ti-lookahead (js2-ts-state-lookahead state)))
-
-;;; Utilities
-
-(defun js2-delete-if (predicate list)
-  "Remove all items satisfying PREDICATE in LIST."
-  (cl-loop for item in list
-           if (not (funcall predicate item))
-           collect item))
-
-(defun js2-position (element list)
-  "Find 0-indexed position of ELEMENT in LIST comparing with `eq'.
-Returns nil if element is not found in the list."
-  (let ((count 0)
-        found)
-    (while (and list (not found))
-      (if (eq element (car list))
-          (setq found t)
-        (setq count (1+ count)
-              list (cdr list))))
-    (if found count)))
-
-(defun js2-find-if (predicate list)
-  "Find first item satisfying PREDICATE in LIST."
-  (let (result)
-    (while (and list (not result))
-      (if (funcall predicate (car list))
-          (setq result (car list)))
-      (setq list (cdr list)))
-    result))
-
-(defmacro js2-time (form)
-  "Evaluate FORM, discard result, and return elapsed time in sec."
-  (declare (debug t))
-  (let ((beg (make-symbol "--js2-time-beg--")))
-    `(let ((,beg (current-time)))
-       ,form
-       (/ (truncate (* (- (float-time (current-time))
-                          (float-time ,beg))
-                       10000))
-          10000.0))))
-
-(defsubst js2-same-line (pos)
-  "Return t if POS is on the same line as current point."
-  (and (>= pos (point-at-bol))
-       (<= pos (point-at-eol))))
-
-(defun js2-code-bug ()
-  "Signal an error when we encounter an unexpected code path."
-  (error "failed assertion"))
-
-(defsubst js2-record-text-property (beg end prop value)
-  "Record a text property to set when parsing finishes."
-  (push (list beg end prop value) js2-mode-deferred-properties))
-
-;; I'd like to associate errors with nodes, but for now the
-;; easiest thing to do is get the context info from the last token.
-(defun js2-record-parse-error (msg &optional arg pos len)
-  (push (list (list msg arg)
-              (or pos (js2-current-token-beg))
-              (or len (js2-current-token-len)))
-        js2-parsed-errors))
-
-(defun js2-report-error (msg &optional msg-arg pos len)
-  "Signal a syntax error or record a parse error."
-  (if js2-recover-from-parse-errors
-      (js2-record-parse-error msg msg-arg pos len)
-  (signal 'js2-syntax-error
-          (list msg
-                js2-ts-lineno
-                (save-excursion
-                  (goto-char js2-ts-cursor)
-                  (current-column))
-                js2-ts-hit-eof))))
-
-(defun js2-report-warning (msg &optional msg-arg pos len face)
-  (if js2-compiler-report-warning-as-error
-      (js2-report-error msg msg-arg pos len)
-    (push (list (list msg msg-arg)
-                (or pos (js2-current-token-beg))
-                (or len (js2-current-token-len))
-                face)
-          js2-parsed-warnings)))
-
-(defun js2-add-strict-warning (msg-id &optional msg-arg beg end)
-  (if js2-compiler-strict-mode
-      (js2-report-warning msg-id msg-arg beg
-                          (and beg end (- end beg)))))
-
-(put 'js2-syntax-error 'error-conditions
-     '(error syntax-error js2-syntax-error))
-(put 'js2-syntax-error 'error-message "Syntax error")
-
-(put 'js2-parse-error 'error-conditions
-     '(error parse-error js2-parse-error))
-(put 'js2-parse-error 'error-message "Parse error")
-
-(defmacro js2-clear-flag (flags flag)
-  `(setq ,flags (logand ,flags (lognot ,flag))))
-
-(defmacro js2-set-flag (flags flag)
-  "Logical-or FLAG into FLAGS."
-  `(setq ,flags (logior ,flags ,flag)))
-
-(defsubst js2-flag-set-p (flags flag)
-  (/= 0 (logand flags flag)))
-
-(defsubst js2-flag-not-set-p (flags flag)
-  (zerop (logand flags flag)))
-
-(defmacro js2-with-underscore-as-word-syntax (&rest body)
-  "Evaluate BODY with the _ character set to be word-syntax."
-  (declare (indent 0) (debug t))
-  (let ((old-syntax (make-symbol "old-syntax")))
-  `(let ((,old-syntax (string (char-syntax ?_))))
-     (unwind-protect
-         (progn
-           (modify-syntax-entry ?_ "w" js2-mode-syntax-table)
-           ,@body)
-       (modify-syntax-entry ?_ ,old-syntax js2-mode-syntax-table)))))
-
-;;; AST struct and function definitions
-
-;; flags for ast node property 'member-type (used for e4x operators)
-(defvar js2-property-flag    #x1 "Property access: element is valid name.")
-(defvar js2-attribute-flag   #x2 "x.@y or x..@y.")
-(defvar js2-descendants-flag #x4 "x..y or x..@i.")
-
-(defsubst js2-relpos (pos anchor)
-  "Convert POS to be relative to ANCHOR.
-If POS is nil, returns nil."
-  (and pos (- pos anchor)))
-
-(defun js2-make-pad (indent)
-  (if (zerop indent)
-      ""
-    (make-string (* indent js2-basic-offset) ? )))
-
-(defun js2-visit-ast (node callback)
-  "Visit every node in ast NODE with visitor CALLBACK.
-
-CALLBACK is a function that takes two arguments:  (NODE END-P).  It is
-called twice:  once to visit the node, and again after all the node's
-children have been processed.  The END-P argument is nil on the first
-call and non-nil on the second call.  The return value of the callback
-affects the traversal:  if non-nil, the children of NODE are processed.
-If the callback returns nil, or if the node has no children, then the
-callback is called immediately with a non-nil END-P argument.
-
-The node traversal is approximately lexical-order, although there
-are currently no guarantees around this."
-  (when node
-    (let ((vfunc (get (aref node 0) 'js2-visitor)))
-      ;; visit the node
-      (when  (funcall callback node nil)
-        ;; visit the kids
-        (cond
-         ((eq vfunc 'js2-visit-none)
-          nil)                            ; don't even bother calling it
-         ;; Each AST node type has to define a `js2-visitor' function
-         ;; that takes a node and a callback, and calls `js2-visit-ast'
-         ;; on each child of the node.
-         (vfunc
-          (funcall vfunc node callback))
-         (t
-          (error "%s does not define a visitor-traversal function"
-                 (aref node 0)))))
-      ;; call the end-visit
-      (funcall callback node t))))
-
-(cl-defstruct (js2-node
-               (:constructor nil))  ; abstract
-  "Base AST node type."
-  (type -1)  ; token type
-  (pos -1)   ; start position of this AST node in parsed input
-  (len 1)    ; num characters spanned by the node
-  props      ; optional node property list (an alist)
-  parent)    ; link to parent node; null for root
-
-(defsubst js2-node-get-prop (node prop &optional default)
-  (or (cadr (assoc prop (js2-node-props node))) default))
-
-(defsubst js2-node-set-prop (node prop value)
-  (setf (js2-node-props node)
-        (cons (list prop value) (js2-node-props node))))
-
-(defun js2-fixup-starts (n nodes)
-  "Adjust the start positions of NODES to be relative to N.
-Any node in the list may be nil, for convenience."
-  (dolist (node nodes)
-    (when node
-      (setf (js2-node-pos node) (- (js2-node-pos node)
-                                   (js2-node-pos n))))))
-
-(defun js2-node-add-children (parent &rest nodes)
-  "Set parent node of NODES to PARENT, and return PARENT.
-Does nothing if we're not recording parent links.
-If any given node in NODES is nil, doesn't record that link."
-  (js2-fixup-starts parent nodes)
-  (dolist (node nodes)
-    (and node
-         (setf (js2-node-parent node) parent))))
-
-;; Non-recursive since it's called a frightening number of times.
-(defun js2-node-abs-pos (n)
-  (let ((pos (js2-node-pos n)))
-    (while (setq n (js2-node-parent n))
-      (setq pos (+ pos (js2-node-pos n))))
-    pos))
-
-(defsubst js2-node-abs-end (n)
-  "Return absolute buffer position of end of N."
-  (+ (js2-node-abs-pos n) (js2-node-len n)))
-
-;; It's important to make sure block nodes have a Lisp list for the
-;; child nodes, to limit printing recursion depth in an AST that
-;; otherwise consists of defstruct vectors.  Emacs will crash printing
-;; a sufficiently large vector tree.
-
-(cl-defstruct (js2-block-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-block-node (&key (type js2-BLOCK)
-                                                       (pos (js2-current-token-beg))
-                                                       len
-                                                       props
-                                                       kids)))
-  "A block of statements."
-  kids)  ; a Lisp list of the child statement nodes
-
-(put 'cl-struct-js2-block-node 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-block-node 'js2-printer 'js2-print-block)
-
-(defun js2-visit-block (ast callback)
-  "Visit the `js2-block-node' children of AST."
-  (dolist (kid (js2-block-node-kids ast))
-    (js2-visit-ast kid callback)))
-
-(defun js2-print-block (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "{\n")
-    (dolist (kid (js2-block-node-kids n))
-      (js2-print-ast kid (1+ i)))
-    (insert pad "}")))
-
-(cl-defstruct (js2-scope
-               (:include js2-block-node)
-               (:constructor nil)
-               (:constructor make-js2-scope (&key (type js2-BLOCK)
-                                                  (pos (js2-current-token-beg))
-                                                  len
-                                                  kids)))
-  ;; The symbol-table is a LinkedHashMap<String,Symbol> in Rhino.
-  ;; I don't have one of those handy, so I'll use an alist for now.
-  ;; It's as fast as an emacs hashtable for up to about 50 elements,
-  ;; and is much lighter-weight to construct (both CPU and mem).
-  ;; The keys are interned strings (symbols) for faster lookup.
-  ;; Should switch to hybrid alist/hashtable eventually.
-  symbol-table  ; an alist of (symbol . js2-symbol)
-  parent-scope  ; a `js2-scope'
-  top)          ; top-level `js2-scope' (script/function)
-
-(put 'cl-struct-js2-scope 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-scope 'js2-printer 'js2-print-none)
-
-(defun js2-node-get-enclosing-scope (node)
-  "Return the innermost `js2-scope' node surrounding NODE.
-Returns nil if there is no enclosing scope node."
-  (while (and (setq node (js2-node-parent node))
-              (not (js2-scope-p node))))
-  node)
-
-(defun js2-get-defining-scope (scope name &optional point)
-  "Search up scope chain from SCOPE looking for NAME, a string or symbol.
-Returns `js2-scope' in which NAME is defined, or nil if not found.
-
-If POINT is non-nil, and if the found declaration type is
-`js2-LET', also check that the declaration node is before POINT."
-  (let ((sym (if (symbolp name)
-                 name
-               (intern name)))
-        result
-        (continue t))
-    (while (and scope continue)
-      (if (or
-           (let ((entry (cdr (assq sym (js2-scope-symbol-table scope)))))
-             (and entry
-                  (or (not point)
-                      (not (eq js2-LET (js2-symbol-decl-type entry)))
-                      (>= point
-                          (js2-node-abs-pos (js2-symbol-ast-node entry))))))
-           (and (eq sym 'arguments)
-                (js2-function-node-p scope)))
-          (setq continue nil
-                result scope)
-        (setq scope (js2-scope-parent-scope scope))))
-    result))
-
-(defun js2-scope-get-symbol (scope name)
-  "Return symbol table entry for NAME in SCOPE.
-NAME can be a string or symbol.   Returns a `js2-symbol' or nil if not found."
-  (and (js2-scope-symbol-table scope)
-       (cdr (assq (if (symbolp name)
-                      name
-                    (intern name))
-                  (js2-scope-symbol-table scope)))))
-
-(defun js2-scope-put-symbol (scope name symbol)
-  "Enter SYMBOL into symbol-table for SCOPE under NAME.
-NAME can be a Lisp symbol or string.  SYMBOL is a `js2-symbol'."
-  (let* ((table (js2-scope-symbol-table scope))
-         (sym (if (symbolp name) name (intern name)))
-         (entry (assq sym table)))
-    (if entry
-        (setcdr entry symbol)
-      (push (cons sym symbol)
-            (js2-scope-symbol-table scope)))))
-
-(cl-defstruct (js2-symbol
-               (:constructor nil)
-               (:constructor make-js2-symbol (decl-type name &optional ast-node)))
-  "A symbol table entry."
-  ;; One of js2-FUNCTION, js2-LP (for parameters), js2-VAR,
-  ;; js2-LET, or js2-CONST
-  decl-type
-  name  ; string
-  ast-node) ; a `js2-node'
-
-(cl-defstruct (js2-error-node
-               (:include js2-node)
-               (:constructor nil) ; silence emacs21 byte-compiler
-               (:constructor make-js2-error-node (&key (type js2-ERROR)
-                                                       (pos (js2-current-token-beg))
-                                                       len)))
-  "AST node representing a parse error.")
-
-(put 'cl-struct-js2-error-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-error-node 'js2-printer 'js2-print-none)
-
-(cl-defstruct (js2-script-node
-               (:include js2-scope)
-               (:constructor nil)
-               (:constructor make-js2-script-node (&key (type js2-SCRIPT)
-                                                        (pos (js2-current-token-beg))
-                                                        len
-                                                        ;; FIXME: What are those?
-                                                        var-decls
-                                                        fun-decls)))
-  functions   ; Lisp list of nested functions
-  regexps     ; Lisp list of (string . flags)
-  symbols     ; alist (every symbol gets unique index)
-  (param-count 0)
-  var-names   ; vector of string names
-  consts      ; bool-vector matching var-decls
-  (temp-number 0))  ; for generating temp variables
-
-(put 'cl-struct-js2-script-node 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-script-node 'js2-printer 'js2-print-script)
-
-(defun js2-print-script (node indent)
-  (dolist (kid (js2-block-node-kids node))
-    (js2-print-ast kid indent)))
-
-(cl-defstruct (js2-ast-root
-               (:include js2-script-node)
-               (:constructor nil)
-               (:constructor make-js2-ast-root (&key (type js2-SCRIPT)
-                                                     (pos (js2-current-token-beg))
-                                                     len
-                                                     buffer)))
-  "The root node of a js2 AST."
-  buffer         ; the source buffer from which the code was parsed
-  comments       ; a Lisp list of comments, ordered by start position
-  errors         ; a Lisp list of errors found during parsing
-  warnings       ; a Lisp list of warnings found during parsing
-  node-count)    ; number of nodes in the tree, including the root
-
-(put 'cl-struct-js2-ast-root 'js2-visitor 'js2-visit-ast-root)
-(put 'cl-struct-js2-ast-root 'js2-printer 'js2-print-script)
-
-(defun js2-visit-ast-root (ast callback)
-  (dolist (kid (js2-ast-root-kids ast))
-    (js2-visit-ast kid callback))
-  (dolist (comment (js2-ast-root-comments ast))
-    (js2-visit-ast comment callback)))
-
-(cl-defstruct (js2-comment-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-comment-node (&key (type js2-COMMENT)
-                                                         (pos (js2-current-token-beg))
-                                                         len
-                                                         format)))
-  format)  ; 'line, 'block, 'jsdoc or 'html
-
-(put 'cl-struct-js2-comment-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-comment-node 'js2-printer 'js2-print-comment)
-
-(defun js2-print-comment (n i)
-  ;; We really ought to link end-of-line comments to their nodes.
-  ;; Or maybe we could add a new comment type, 'endline.
-  (insert (js2-make-pad i)
-          (js2-node-string n)))
-
-(cl-defstruct (js2-expr-stmt-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-expr-stmt-node (&key (type js2-EXPR_VOID)
-                                                           (pos js2-ts-cursor)
-                                                           len
-                                                           expr)))
-  "An expression statement."
-  expr)
-
-(defsubst js2-expr-stmt-node-set-has-result (node)
-  "Change NODE type to `js2-EXPR_RESULT'.  Used for code generation."
-  (setf (js2-node-type node) js2-EXPR_RESULT))
-
-(put 'cl-struct-js2-expr-stmt-node 'js2-visitor 'js2-visit-expr-stmt-node)
-(put 'cl-struct-js2-expr-stmt-node 'js2-printer 'js2-print-expr-stmt-node)
-
-(defun js2-visit-expr-stmt-node (n v)
-  (js2-visit-ast (js2-expr-stmt-node-expr n) v))
-
-(defun js2-print-expr-stmt-node (n indent)
-  (js2-print-ast (js2-expr-stmt-node-expr n) indent)
-  (insert ";\n"))
-
-(cl-defstruct (js2-loop-node
-               (:include js2-scope)
-               (:constructor nil))
-  "Abstract supertype of loop nodes."
-  body      ; a `js2-block-node'
-  lp        ; position of left-paren, nil if omitted
-  rp)       ; position of right-paren, nil if omitted
-
-(cl-defstruct (js2-do-node
-               (:include js2-loop-node)
-               (:constructor nil)
-               (:constructor make-js2-do-node (&key (type js2-DO)
-                                                    (pos (js2-current-token-beg))
-                                                    len
-                                                    body
-                                                    condition
-                                                    while-pos
-                                                    lp
-                                                    rp)))
-  "AST node for do-loop."
-  condition  ; while (expression)
-  while-pos) ; buffer position of 'while' keyword
-
-(put 'cl-struct-js2-do-node 'js2-visitor 'js2-visit-do-node)
-(put 'cl-struct-js2-do-node 'js2-printer 'js2-print-do-node)
-
-(defun js2-visit-do-node (n v)
-  (js2-visit-ast (js2-do-node-body n) v)
-  (js2-visit-ast (js2-do-node-condition n) v))
-
-(defun js2-print-do-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "do {\n")
-    (dolist (kid (js2-block-node-kids (js2-do-node-body n)))
-      (js2-print-ast kid (1+ i)))
-    (insert pad "} while (")
-    (js2-print-ast (js2-do-node-condition n) 0)
-    (insert ");\n")))
-
-(cl-defstruct (js2-export-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-export-node (&key (type js2-EXPORT)
-                                                        (pos (js2-current-token-beg))
-                                                        len
-                                                        exports-list
-                                                        from-clause
-                                                        declaration
-                                                        default)))
-  "AST node for an export statement. There are many things that can be exported,
-so many of its properties will be nil.
-"
-  exports-list ; lisp list of js2-export-binding-node to export
-  from-clause ; js2-from-clause-node for re-exporting symbols from another module
-  declaration ; js2-var-decl-node (var, let, const) or js2-class-node
-  default) ; js2-function-node or js2-assign-node
-
-(put 'cl-struct-js2-export-node 'js2-visitor 'js2-visit-export-node)
-(put 'cl-struct-js2-export-node 'js2-printer 'js2-print-export-node)
-
-(defun js2-visit-export-node (n v)
-  (let ((exports-list (js2-export-node-exports-list n))
-        (from (js2-export-node-from-clause n))
-        (declaration (js2-export-node-declaration n))
-        (default (js2-export-node-default n)))
-    (when exports-list
-      (dolist (export exports-list)
-        (js2-visit-ast export v)))
-    (when from
-      (js2-visit-ast from v))
-    (when declaration
-      (js2-visit-ast declaration v))
-    (when default
-      (js2-visit-ast default v))))
-
-(defun js2-print-export-node (n i)
-  (let ((pad (js2-make-pad i))
-        (exports-list (js2-export-node-exports-list n))
-        (from (js2-export-node-from-clause n))
-        (declaration (js2-export-node-declaration n))
-        (default (js2-export-node-default n)))
-    (insert pad "export ")
-    (cond
-     (default
-       (insert "default ")
-       (js2-print-ast default i))
-     (declaration
-       (js2-print-ast declaration i))
-     ((and exports-list from)
-      (js2-print-named-imports exports-list)
-      (insert " ")
-      (js2-print-from-clause from))
-     (from
-      (insert "* ")
-      (js2-print-from-clause from))
-     (exports-list
-      (js2-print-named-imports exports-list)))
-    (insert ";\n")))
-
-(cl-defstruct (js2-while-node
-               (:include js2-loop-node)
-               (:constructor nil)
-               (:constructor make-js2-while-node (&key (type js2-WHILE)
-                                                       (pos (js2-current-token-beg))
-                                                       len body
-                                                       condition lp
-                                                       rp)))
-  "AST node for while-loop."
-  condition)    ; while-condition
-
-(put 'cl-struct-js2-while-node 'js2-visitor 'js2-visit-while-node)
-(put 'cl-struct-js2-while-node 'js2-printer 'js2-print-while-node)
-
-(defun js2-visit-while-node (n v)
-  (js2-visit-ast (js2-while-node-condition n) v)
-  (js2-visit-ast (js2-while-node-body n) v))
-
-(defun js2-print-while-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "while (")
-    (js2-print-ast (js2-while-node-condition n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-while-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(cl-defstruct (js2-for-node
-               (:include js2-loop-node)
-               (:constructor nil)
-               (:constructor make-js2-for-node (&key (type js2-FOR)
-                                                     (pos js2-ts-cursor)
-                                                     len body init
-                                                     condition
-                                                     update lp rp)))
-  "AST node for a C-style for-loop."
-  init       ; initialization expression
-  condition  ; loop condition
-  update)    ; update clause
-
-(put 'cl-struct-js2-for-node 'js2-visitor 'js2-visit-for-node)
-(put 'cl-struct-js2-for-node 'js2-printer 'js2-print-for-node)
-
-(defun js2-visit-for-node (n v)
-  (js2-visit-ast (js2-for-node-init n) v)
-  (js2-visit-ast (js2-for-node-condition n) v)
-  (js2-visit-ast (js2-for-node-update n) v)
-  (js2-visit-ast (js2-for-node-body n) v))
-
-(defun js2-print-for-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "for (")
-    (js2-print-ast (js2-for-node-init n) 0)
-    (insert "; ")
-    (js2-print-ast (js2-for-node-condition n) 0)
-    (insert "; ")
-    (js2-print-ast (js2-for-node-update n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-for-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(cl-defstruct (js2-for-in-node
-               (:include js2-loop-node)
-               (:constructor nil)
-               (:constructor make-js2-for-in-node (&key (type js2-FOR)
-                                                        (pos js2-ts-cursor)
-                                                        len body
-                                                        iterator
-                                                        object
-                                                        in-pos
-                                                        each-pos
-                                                        foreach-p forof-p
-                                                        lp rp)))
-  "AST node for a for..in loop."
-  iterator  ; [var] foo in ...
-  object    ; object over which we're iterating
-  in-pos    ; buffer position of 'in' keyword
-  each-pos  ; buffer position of 'each' keyword, if foreach-p
-  foreach-p ; t if it's a for-each loop
-  forof-p)  ; t if it's a for-of loop
-
-(put 'cl-struct-js2-for-in-node 'js2-visitor 'js2-visit-for-in-node)
-(put 'cl-struct-js2-for-in-node 'js2-printer 'js2-print-for-in-node)
-
-(defun js2-visit-for-in-node (n v)
-  (js2-visit-ast (js2-for-in-node-iterator n) v)
-  (js2-visit-ast (js2-for-in-node-object n) v)
-  (js2-visit-ast (js2-for-in-node-body n) v))
-
-(defun js2-print-for-in-node (n i)
-  (let ((pad (js2-make-pad i))
-        (foreach (js2-for-in-node-foreach-p n))
-        (forof (js2-for-in-node-forof-p n)))
-    (insert pad "for ")
-    (if foreach
-        (insert "each "))
-    (insert "(")
-    (js2-print-ast (js2-for-in-node-iterator n) 0)
-    (insert (if forof " of " " in "))
-    (js2-print-ast (js2-for-in-node-object n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-for-in-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(cl-defstruct (js2-return-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-return-node (&key (type js2-RETURN)
-                                                        (pos js2-ts-cursor)
-                                                        len
-                                                        retval)))
-  "AST node for a return statement."
-  retval)  ; expression to return, or 'undefined
-
-(put 'cl-struct-js2-return-node 'js2-visitor 'js2-visit-return-node)
-(put 'cl-struct-js2-return-node 'js2-printer 'js2-print-return-node)
-
-(defun js2-visit-return-node (n v)
-  (js2-visit-ast (js2-return-node-retval n) v))
-
-(defun js2-print-return-node (n i)
-  (insert (js2-make-pad i) "return")
-  (when (js2-return-node-retval n)
-    (insert " ")
-    (js2-print-ast (js2-return-node-retval n) 0))
-  (insert ";\n"))
-
-(cl-defstruct (js2-if-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-if-node (&key (type js2-IF)
-                                                    (pos js2-ts-cursor)
-                                                    len condition
-                                                    then-part
-                                                    else-pos
-                                                    else-part lp
-                                                    rp)))
-  "AST node for an if-statement."
-  condition   ; expression
-  then-part   ; statement or block
-  else-pos    ; optional buffer position of 'else' keyword
-  else-part   ; optional statement or block
-  lp          ; position of left-paren, nil if omitted
-  rp)         ; position of right-paren, nil if omitted
-
-(put 'cl-struct-js2-if-node 'js2-visitor 'js2-visit-if-node)
-(put 'cl-struct-js2-if-node 'js2-printer 'js2-print-if-node)
-
-(defun js2-visit-if-node (n v)
-  (js2-visit-ast (js2-if-node-condition n) v)
-  (js2-visit-ast (js2-if-node-then-part n) v)
-  (js2-visit-ast (js2-if-node-else-part n) v))
-
-(defun js2-print-if-node (n i)
-  (let ((pad (js2-make-pad i))
-        (then-part (js2-if-node-then-part n))
-        (else-part (js2-if-node-else-part n)))
-    (insert pad "if (")
-    (js2-print-ast (js2-if-node-condition n) 0)
-    (insert ") {\n")
-    (js2-print-body then-part (1+ i))
-    (insert pad "}")
-    (cond
-     ((not else-part)
-      (insert "\n"))
-     ((js2-if-node-p else-part)
-      (insert " else ")
-      (js2-print-body else-part i))
-     (t
-      (insert " else {\n")
-      (js2-print-body else-part (1+ i))
-      (insert pad "}\n")))))
-
-(cl-defstruct (js2-export-binding-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-export-binding-node (&key (type -1)
-                                                                pos
-                                                                len
-                                                                local-name
-                                                                extern-name)))
-  "AST node for an external symbol binding.
-It contains a local-name node which is the name of the value in the
-current scope, and extern-name which is the name of the value in the
-imported or exported scope. By default these are the same, but if the
-name is aliased as in {foo as bar}, it would have an extern-name node
-containing 'foo' and a local-name node containing 'bar'."
-  local-name ; js2-name-node with the variable name in this scope
-  extern-name)   ; js2-name-node with the value name in the exporting module
-
-(put 'cl-struct-js2-export-binding-node 'js2-printer 'js2-print-extern-binding)
-(put 'cl-struct-js2-export-binding-node 'js2-visitor 'js2-visit-extern-binding)
-
-(defun js2-visit-extern-binding (n v)
-  "Visit an extern binding node. First visit the local-name, and, if
-different, visit the extern-name."
-  (let ((local-name (js2-export-binding-node-local-name n))
-        (extern-name (js2-export-binding-node-extern-name n)))
-    (when local-name
-      (js2-visit-ast local-name v))
-    (when (not (equal local-name extern-name))
-      (js2-visit-ast extern-name v))))
-
-(defun js2-print-extern-binding (n _i)
-  "Print a representation of a single extern binding. E.g. 'foo' or
-'foo as bar'."
-  (let ((local-name (js2-export-binding-node-local-name n))
-        (extern-name (js2-export-binding-node-extern-name n)))
-    (insert (js2-name-node-name extern-name))
-    (when (not (equal local-name extern-name))
-      (insert " as ")
-      (insert (js2-name-node-name local-name)))))
-
-
-(cl-defstruct (js2-import-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-import-node (&key (type js2-IMPORT)
-                                                        (pos (js2-current-token-beg))
-                                                        len
-                                                        import
-                                                        from
-                                                        module-id)))
-  "AST node for an import statement. It follows the form
-
-import ModuleSpecifier;
-import ImportClause FromClause;"
-  import     ; js2-import-clause-node specifying which names are to imported.
-  from       ; js2-from-clause-node indicating the module from which to import.
-  module-id) ; module-id of the import. E.g. 'src/mylib'.
-
-(put 'cl-struct-js2-import-node 'js2-printer 'js2-print-import)
-(put 'cl-struct-js2-import-node 'js2-visitor 'js2-visit-import)
-
-(defun js2-visit-import (n v)
-  (let ((import-clause (js2-import-node-import n))
-        (from-clause (js2-import-node-from n)))
-    (when import-clause
-      (js2-visit-ast import-clause v))
-    (when from-clause
-      (js2-visit-ast from-clause v))))
-
-(defun js2-print-import (n i)
-  "Prints a representation of the import node"
-  (let ((pad (js2-make-pad i))
-        (import-clause (js2-import-node-import n))
-        (from-clause (js2-import-node-from n))
-        (module-id (js2-import-node-module-id n)))
-    (insert pad "import ")
-    (if import-clause
-        (progn
-          (js2-print-import-clause import-clause)
-          (insert " ")
-          (js2-print-from-clause from-clause))
-      (insert "'")
-      (insert module-id)
-      (insert "'"))
-    (insert ";\n")))
-
-(cl-defstruct (js2-import-clause-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-import-clause-node (&key (type -1)
-                                                               pos
-                                                               len
-                                                               namespace-import
-                                                               named-imports
-                                                               default-binding)))
-  "AST node corresponding to the import clause of an import statement. This is
-the portion of the import that bindings names from the external context to the
-local context."
-  namespace-import ; js2-namespace-import-node. E.g. '* as lib'
-  named-imports    ; lisp list of js2-export-binding-node for all named imports.
-  default-binding) ; js2-export-binding-node for the default import binding
-
-(put 'cl-struct-js2-import-clause-node 'js2-visitor 'js2-visit-import-clause)
-(put 'cl-struct-js2-import-clause-node 'js2-printer 'js2-print-import-clause)
-
-(defun js2-visit-import-clause (n v)
-  (let ((ns-import (js2-import-clause-node-namespace-import n))
-        (named-imports (js2-import-clause-node-named-imports n))
-        (default (js2-import-clause-node-default-binding n)))
-    (when ns-import
-      (js2-visit-ast ns-import v))
-    (when named-imports
-      (dolist (import named-imports)
-        (js2-visit-ast import v)))
-    (when default
-      (js2-visit-ast default v))))
-
-(defun js2-print-import-clause (n)
-  (let ((ns-import (js2-import-clause-node-namespace-import n))
-        (named-imports (js2-import-clause-node-named-imports n))
-        (default (js2-import-clause-node-default-binding n)))
-    (cond
-     ((and default ns-import)
-      (js2-print-ast default)
-      (insert ", ")
-      (js2-print-namespace-import ns-import))
-     ((and default named-imports)
-      (js2-print-ast default)
-      (insert ", ")
-      (js2-print-named-imports named-imports))
-     (default
-      (js2-print-ast default))
-     (ns-import
-      (js2-print-namespace-import ns-import))
-     (named-imports
-      (js2-print-named-imports named-imports)))))
-
-(defun js2-print-namespace-import (node)
-  (insert "* as ")
-  (insert (js2-name-node-name (js2-namespace-import-node-name node))))
-
-(defun js2-print-named-imports (imports)
-  (insert "{")
-  (let ((len (length imports))
-        (n 0))
-    (while (< n len)
-      (js2-print-extern-binding (nth n imports) 0)
-      (unless (= n (- len 1))
-        (insert ", "))
-      (setq n (+ n 1))))
-  (insert "}"))
-
-(cl-defstruct (js2-namespace-import-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-namespace-import-node (&key (type -1)
-                                                                  pos
-                                                                  len
-                                                                  name)))
-  "AST node for a complete namespace import.
-E.g. the '* as lib' expression in:
-
-import * as lib from 'src/lib'
-
-It contains a single name node referring to the bound name."
-  name) ; js2-name-node of the bound name.
-
-(defun js2-visit-namespace-import (n v)
-  (js2-visit-ast (js2-namespace-import-node-name n) v))
-
-(put 'cl-struct-js2-namespace-import-node 'js2-visitor 'js2-visit-namespace-import)
-(put 'cl-struct-js2-namespace-import-node 'js2-printer 'js2-print-namespace-import)
-
-(cl-defstruct (js2-from-clause-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-from-clause-node (&key (type js2-NAME)
-                                                             pos
-                                                             len
-                                                             module-id
-                                                             metadata-p)))
-  "AST node for the from clause in an import or export statement.
-E.g. from 'my/module'. It can refere to either an external module, or to the
-modules metadata itself."
-  module-id ; string containing the module specifier.
-  metadata-p) ; true if this clause refers to the module's metadata
-
-(put 'cl-struct-js2-from-clause-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-from-clause-node 'js2-printer 'js2-print-from-clause)
-
-(defun js2-print-from-clause (n)
-  (insert "from ")
-  (if (js2-from-clause-node-metadata-p n)
-      (insert "this module")
-    (insert "'")
-    (insert (js2-from-clause-node-module-id n))
-    (insert "'")))
-
-(cl-defstruct (js2-try-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-try-node (&key (type js2-TRY)
-                                                     (pos js2-ts-cursor)
-                                                     len
-                                                     try-block
-                                                     catch-clauses
-                                                     finally-block)))
-  "AST node for a try-statement."
-  try-block
-  catch-clauses  ; a Lisp list of `js2-catch-node'
-  finally-block) ; a `js2-finally-node'
-
-(put 'cl-struct-js2-try-node 'js2-visitor 'js2-visit-try-node)
-(put 'cl-struct-js2-try-node 'js2-printer 'js2-print-try-node)
-
-(defun js2-visit-try-node (n v)
-  (js2-visit-ast (js2-try-node-try-block n) v)
-  (dolist (clause (js2-try-node-catch-clauses n))
-    (js2-visit-ast clause v))
-  (js2-visit-ast (js2-try-node-finally-block n) v))
-
-(defun js2-print-try-node (n i)
-  (let ((pad (js2-make-pad i))
-        (catches (js2-try-node-catch-clauses n))
-        (finally (js2-try-node-finally-block n)))
-    (insert pad "try {\n")
-    (js2-print-body (js2-try-node-try-block n) (1+ i))
-    (insert pad "}")
-    (when catches
-      (dolist (catch catches)
-        (js2-print-ast catch i)))
-    (if finally
-        (js2-print-ast finally i)
-      (insert "\n"))))
-
-(cl-defstruct (js2-catch-node
-               (:include js2-scope)
-               (:constructor nil)
-               (:constructor make-js2-catch-node (&key (type js2-CATCH)
-                                                       (pos js2-ts-cursor)
-                                                       len
-                                                       param
-                                                       guard-kwd
-                                                       guard-expr
-                                                       lp rp)))
-  "AST node for a catch clause."
-  param       ; destructuring form or simple name node
-  guard-kwd   ; relative buffer position of "if" in "catch (x if ...)"
-  guard-expr  ; catch condition, a `js2-node'
-  lp          ; buffer position of left-paren, nil if omitted
-  rp)         ; buffer position of right-paren, nil if omitted
-
-(put 'cl-struct-js2-catch-node 'js2-visitor 'js2-visit-catch-node)
-(put 'cl-struct-js2-catch-node 'js2-printer 'js2-print-catch-node)
-
-(defun js2-visit-catch-node (n v)
-  (js2-visit-ast (js2-catch-node-param n) v)
-  (when (js2-catch-node-guard-kwd n)
-    (js2-visit-ast (js2-catch-node-guard-expr n) v))
-  (js2-visit-block n v))
-
-(defun js2-print-catch-node (n i)
-  (let ((pad (js2-make-pad i))
-        (guard-kwd (js2-catch-node-guard-kwd n))
-        (guard-expr (js2-catch-node-guard-expr n)))
-    (insert " catch (")
-    (js2-print-ast (js2-catch-node-param n) 0)
-    (when guard-kwd
-      (insert " if ")
-      (js2-print-ast guard-expr 0))
-    (insert ") {\n")
-    (js2-print-body n (1+ i))
-    (insert pad "}")))
-
-(cl-defstruct (js2-finally-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-finally-node (&key (type js2-FINALLY)
-                                                         (pos js2-ts-cursor)
-                                                         len body)))
-  "AST node for a finally clause."
-  body)  ; a `js2-node', often but not always a block node
-
-(put 'cl-struct-js2-finally-node 'js2-visitor 'js2-visit-finally-node)
-(put 'cl-struct-js2-finally-node 'js2-printer 'js2-print-finally-node)
-
-(defun js2-visit-finally-node (n v)
-  (js2-visit-ast (js2-finally-node-body n) v))
-
-(defun js2-print-finally-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert " finally {\n")
-    (js2-print-body (js2-finally-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(cl-defstruct (js2-switch-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-switch-node (&key (type js2-SWITCH)
-                                                        (pos js2-ts-cursor)
-                                                        len
-                                                        discriminant
-                                                        cases lp
-                                                        rp)))
-  "AST node for a switch statement."
-  discriminant  ; a `js2-node' (switch expression)
-  cases  ; a Lisp list of `js2-case-node'
-  lp     ; position of open-paren for discriminant, nil if omitted
-  rp)    ; position of close-paren for discriminant, nil if omitted
-
-(put 'cl-struct-js2-switch-node 'js2-visitor 'js2-visit-switch-node)
-(put 'cl-struct-js2-switch-node 'js2-printer 'js2-print-switch-node)
-
-(defun js2-visit-switch-node (n v)
-  (js2-visit-ast (js2-switch-node-discriminant n) v)
-  (dolist (c (js2-switch-node-cases n))
-    (js2-visit-ast c v)))
-
-(defun js2-print-switch-node (n i)
-  (let ((pad (js2-make-pad i))
-        (cases (js2-switch-node-cases n)))
-    (insert pad "switch (")
-    (js2-print-ast (js2-switch-node-discriminant n) 0)
-    (insert ") {\n")
-    (dolist (case cases)
-      (js2-print-ast case i))
-    (insert pad "}\n")))
-
-(cl-defstruct (js2-case-node
-               (:include js2-block-node)
-               (:constructor nil)
-               (:constructor make-js2-case-node (&key (type js2-CASE)
-                                                      (pos js2-ts-cursor)
-                                                      len kids expr)))
-  "AST node for a case clause of a switch statement."
-  expr)   ; the case expression (nil for default)
-
-(put 'cl-struct-js2-case-node 'js2-visitor 'js2-visit-case-node)
-(put 'cl-struct-js2-case-node 'js2-printer 'js2-print-case-node)
-
-(defun js2-visit-case-node (n v)
-  (js2-visit-ast (js2-case-node-expr n) v)
-  (js2-visit-block n v))
-
-(defun js2-print-case-node (n i)
-  (let ((pad (js2-make-pad i))
-        (expr (js2-case-node-expr n)))
-    (insert pad)
-    (if (null expr)
-        (insert "default:\n")
-      (insert "case ")
-      (js2-print-ast expr 0)
-      (insert ":\n"))
-    (dolist (kid (js2-case-node-kids n))
-      (js2-print-ast kid (1+ i)))))
-
-(cl-defstruct (js2-throw-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-throw-node (&key (type js2-THROW)
-                                                       (pos js2-ts-cursor)
-                                                       len expr)))
-  "AST node for a throw statement."
-  expr)   ; the expression to throw
-
-(put 'cl-struct-js2-throw-node 'js2-visitor 'js2-visit-throw-node)
-(put 'cl-struct-js2-throw-node 'js2-printer 'js2-print-throw-node)
-
-(defun js2-visit-throw-node (n v)
-  (js2-visit-ast (js2-throw-node-expr n) v))
-
-(defun js2-print-throw-node (n i)
-  (insert (js2-make-pad i) "throw ")
-  (js2-print-ast (js2-throw-node-expr n) 0)
-  (insert ";\n"))
-
-(cl-defstruct (js2-with-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-with-node (&key (type js2-WITH)
-                                                      (pos js2-ts-cursor)
-                                                      len object
-                                                      body lp rp)))
-  "AST node for a with-statement."
-  object
-  body
-  lp    ; buffer position of left-paren around object, nil if omitted
-  rp)   ; buffer position of right-paren around object, nil if omitted
-
-(put 'cl-struct-js2-with-node 'js2-visitor 'js2-visit-with-node)
-(put 'cl-struct-js2-with-node 'js2-printer 'js2-print-with-node)
-
-(defun js2-visit-with-node (n v)
-  (js2-visit-ast (js2-with-node-object n) v)
-  (js2-visit-ast (js2-with-node-body n) v))
-
-(defun js2-print-with-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad "with (")
-    (js2-print-ast (js2-with-node-object n) 0)
-    (insert ") {\n")
-    (js2-print-body (js2-with-node-body n) (1+ i))
-    (insert pad "}\n")))
-
-(cl-defstruct (js2-label-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-label-node (&key (type js2-LABEL)
-                                                       (pos js2-ts-cursor)
-                                                       len name)))
-  "AST node for a statement label or case label."
-  name   ; a string
-  loop)  ; for validating and code-generating continue-to-label
-
-(put 'cl-struct-js2-label-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-label-node 'js2-printer 'js2-print-label)
-
-(defun js2-print-label (n i)
-  (insert (js2-make-pad i)
-          (js2-label-node-name n)
-          ":\n"))
-
-(cl-defstruct (js2-labeled-stmt-node
-               (:include js2-node)
-               (:constructor nil)
-               ;; type needs to be in `js2-side-effecting-tokens' to avoid spurious
-               ;; no-side-effects warnings, hence js2-EXPR_RESULT.
-               (:constructor make-js2-labeled-stmt-node (&key (type js2-EXPR_RESULT)
-                                                              (pos js2-ts-cursor)
-                                                              len labels stmt)))
-  "AST node for a statement with one or more labels.
-Multiple labels for a statement are collapsed into the labels field."
-  labels  ; Lisp list of `js2-label-node'
-  stmt)   ; the statement these labels are for
-
-(put 'cl-struct-js2-labeled-stmt-node 'js2-visitor 'js2-visit-labeled-stmt)
-(put 'cl-struct-js2-labeled-stmt-node 'js2-printer 'js2-print-labeled-stmt)
-
-(defun js2-get-label-by-name (lbl-stmt name)
-  "Return a `js2-label-node' by NAME from LBL-STMT's labels list.
-Returns nil if no such label is in the list."
-  (let ((label-list (js2-labeled-stmt-node-labels lbl-stmt))
-        result)
-    (while (and label-list (not result))
-      (if (string= (js2-label-node-name (car label-list)) name)
-          (setq result (car label-list))
-        (setq label-list (cdr label-list))))
-    result))
-
-(defun js2-visit-labeled-stmt (n v)
-  (dolist (label (js2-labeled-stmt-node-labels n))
-    (js2-visit-ast label v))
-  (js2-visit-ast (js2-labeled-stmt-node-stmt n) v))
-
-(defun js2-print-labeled-stmt (n i)
-  (dolist (label (js2-labeled-stmt-node-labels n))
-    (js2-print-ast label i))
-  (js2-print-ast (js2-labeled-stmt-node-stmt n) i))
-
-(defun js2-labeled-stmt-node-contains (node label)
-  "Return t if NODE contains LABEL in its label set.
-NODE is a `js2-labels-node'.  LABEL is an identifier."
-  (cl-loop for nl in (js2-labeled-stmt-node-labels node)
-           if (string= label (js2-label-node-name nl))
-           return t
-           finally return nil))
-
-(defsubst js2-labeled-stmt-node-add-label (node label)
-  "Add a `js2-label-node' to the label set for this statement."
-  (setf (js2-labeled-stmt-node-labels node)
-        (nconc (js2-labeled-stmt-node-labels node) (list label))))
-
-(cl-defstruct (js2-jump-node
-               (:include js2-node)
-               (:constructor nil))
-  "Abstract supertype of break and continue nodes."
-  label   ; `js2-name-node' for location of label identifier, if present
-  target) ; target js2-labels-node or loop/switch statement
-
-(defun js2-visit-jump-node (n v)
-  ;; We don't visit the target, since it's a back-link.
-  (js2-visit-ast (js2-jump-node-label n) v))
-
-(cl-defstruct (js2-break-node
-               (:include js2-jump-node)
-               (:constructor nil)
-               (:constructor make-js2-break-node (&key (type js2-BREAK)
-                                                       (pos js2-ts-cursor)
-                                                       len label target)))
-  "AST node for a break statement.
-The label field is a `js2-name-node', possibly nil, for the named label
-if provided.  E.g. in 'break foo', it represents 'foo'.  The target field
-is the target of the break - a label node or enclosing loop/switch statement.")
-
-(put 'cl-struct-js2-break-node 'js2-visitor 'js2-visit-jump-node)
-(put 'cl-struct-js2-break-node 'js2-printer 'js2-print-break-node)
-
-(defun js2-print-break-node (n i)
-  (insert (js2-make-pad i) "break")
-  (when (js2-break-node-label n)
-    (insert " ")
-    (js2-print-ast (js2-break-node-label n) 0))
-  (insert ";\n"))
-
-(cl-defstruct (js2-continue-node
-               (:include js2-jump-node)
-               (:constructor nil)
-               (:constructor make-js2-continue-node (&key (type js2-CONTINUE)
-                                                          (pos js2-ts-cursor)
-                                                          len label target)))
-  "AST node for a continue statement.
-The label field is the user-supplied enclosing label name, a `js2-name-node'.
-It is nil if continue specifies no label.  The target field is the jump target:
-a `js2-label-node' or the innermost enclosing loop.")
-
-(put 'cl-struct-js2-continue-node 'js2-visitor 'js2-visit-jump-node)
-(put 'cl-struct-js2-continue-node 'js2-printer 'js2-print-continue-node)
-
-(defun js2-print-continue-node (n i)
-  (insert (js2-make-pad i) "continue")
-  (when (js2-continue-node-label n)
-    (insert " ")
-    (js2-print-ast (js2-continue-node-label n) 0))
-  (insert ";\n"))
-
-(cl-defstruct (js2-function-node
-               (:include js2-script-node)
-               (:constructor nil)
-               (:constructor make-js2-function-node (&key (type js2-FUNCTION)
-                                                          (pos js2-ts-cursor)
-                                                          len
-                                                          (ftype 'FUNCTION)
-                                                          (form 'FUNCTION_STATEMENT)
-                                                          (name "")
-                                                          params rest-p
-                                                          body
-                                                          generator-type
-                                                          lp rp)))
-  "AST node for a function declaration.
-The `params' field is a Lisp list of nodes.  Each node is either a simple
-`js2-name-node', or if it's a destructuring-assignment parameter, a
-`js2-array-node' or `js2-object-node'."
-  ftype            ; FUNCTION, GETTER or SETTER
-  form             ; FUNCTION_{STATEMENT|EXPRESSION|ARROW}
-  name             ; function name (a `js2-name-node', or nil if anonymous)
-  params           ; a Lisp list of destructuring forms or simple name nodes
-  rest-p           ; if t, the last parameter is rest parameter
-  body             ; a `js2-block-node' or expression node (1.8 only)
-  lp               ; position of arg-list open-paren, or nil if omitted
-  rp               ; position of arg-list close-paren, or nil if omitted
-  ignore-dynamic   ; ignore value of the dynamic-scope flag (interpreter only)
-  needs-activation ; t if we need an activation object for this frame
-  generator-type   ; STAR, LEGACY, COMPREHENSION or nil
-  member-expr)     ; nonstandard Ecma extension from Rhino
-
-(put 'cl-struct-js2-function-node 'js2-visitor 'js2-visit-function-node)
-(put 'cl-struct-js2-function-node 'js2-printer 'js2-print-function-node)
-
-(defun js2-visit-function-node (n v)
-  (js2-visit-ast (js2-function-node-name n) v)
-  (dolist (p (js2-function-node-params n))
-    (js2-visit-ast p v))
-  (js2-visit-ast (js2-function-node-body n) v))
-
-(defun js2-print-function-node (n i)
-  (let* ((pad (js2-make-pad i))
-         (getter (js2-node-get-prop n 'GETTER_SETTER))
-         (name (or (js2-function-node-name n)
-                   (js2-function-node-member-expr n)))
-         (params (js2-function-node-params n))
-         (arrow (eq (js2-function-node-form n) 'FUNCTION_ARROW))
-         (rest-p (js2-function-node-rest-p n))
-         (body (js2-function-node-body n))
-         (expr (not (eq (js2-function-node-form n) 'FUNCTION_STATEMENT))))
-    (unless (or getter arrow)
-      (insert pad "function")
-      (when (eq (js2-function-node-generator-type n) 'STAR)
-        (insert "*")))
-    (when name
-      (insert " ")
-      (js2-print-ast name 0))
-    (insert "(")
-    (cl-loop with len = (length params)
-             for param in params
-             for count from 1
-             do
-             (when (and rest-p (= count len))
-               (insert "..."))
-             (js2-print-ast param 0)
-             (when (< count len)
-               (insert ", ")))
-    (insert ") ")
-    (when arrow
-      (insert "=> "))
-    (insert "{")
-    ;; TODO:  fix this to be smarter about indenting, etc.
-    (unless expr
-      (insert "\n"))
-    (if (js2-block-node-p body)
-        (js2-print-body body (1+ i))
-      (js2-print-ast body 0))
-    (insert pad "}")
-    (unless expr
-      (insert "\n"))))
-
-(defun js2-function-name (node)
-  "Return function name for NODE, a `js2-function-node', or nil if anonymous."
-  (and (js2-function-node-name node)
-       (js2-name-node-name (js2-function-node-name node))))
-
-;; Having this be an expression node makes it more flexible.
-;; There are IDE contexts, such as indentation in a for-loop initializer,
-;; that work better if you assume it's an expression.  Whenever we have
-;; a standalone var/const declaration, we just wrap with an expr stmt.
-;; Eclipse apparently screwed this up and now has two versions, expr and stmt.
-(cl-defstruct (js2-var-decl-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-var-decl-node (&key (type js2-VAR)
-                                                          (pos (js2-current-token-beg))
-                                                          len kids
-                                                          decl-type)))
-  "AST node for a variable declaration list (VAR, CONST or LET).
-The node bounds differ depending on the declaration type.  For VAR or
-CONST declarations, the bounds include the var/const keyword.  For LET
-declarations, the node begins at the position of the first child."
-  kids        ; a Lisp list of `js2-var-init-node' structs.
-  decl-type)  ; js2-VAR, js2-CONST or js2-LET
-
-(put 'cl-struct-js2-var-decl-node 'js2-visitor 'js2-visit-var-decl)
-(put 'cl-struct-js2-var-decl-node 'js2-printer 'js2-print-var-decl)
-
-(defun js2-visit-var-decl (n v)
-  (dolist (kid (js2-var-decl-node-kids n))
-    (js2-visit-ast kid v)))
-
-(defun js2-print-var-decl (n i)
-  (let ((pad (js2-make-pad i))
-        (tt (js2-var-decl-node-decl-type n)))
-    (insert pad)
-    (insert (cond
-             ((= tt js2-VAR) "var ")
-             ((= tt js2-LET) "let ")
-             ((= tt js2-CONST) "const ")
-             (t
-              (error "malformed var-decl node"))))
-    (cl-loop with kids = (js2-var-decl-node-kids n)
-             with len = (length kids)
-             for kid in kids
-             for count from 1
-             do
-             (js2-print-ast kid 0)
-             (if (< count len)
-                 (insert ", ")))))
-
-(cl-defstruct (js2-var-init-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-var-init-node (&key (type js2-VAR)
-                                                          (pos js2-ts-cursor)
-                                                          len target
-                                                          initializer)))
-  "AST node for a variable declaration.
-The type field will be js2-CONST for a const decl."
-  target        ; `js2-name-node', `js2-object-node', or `js2-array-node'
-  initializer)  ; initializer expression, a `js2-node'
-
-(put 'cl-struct-js2-var-init-node 'js2-visitor 'js2-visit-var-init-node)
-(put 'cl-struct-js2-var-init-node 'js2-printer 'js2-print-var-init-node)
-
-(defun js2-visit-var-init-node (n v)
-  (js2-visit-ast (js2-var-init-node-target n) v)
-  (js2-visit-ast (js2-var-init-node-initializer n) v))
-
-(defun js2-print-var-init-node (n i)
-  (let ((pad (js2-make-pad i))
-        (name (js2-var-init-node-target n))
-        (init (js2-var-init-node-initializer n)))
-    (insert pad)
-    (js2-print-ast name 0)
-    (when init
-      (insert " = ")
-      (js2-print-ast init 0))))
-
-(cl-defstruct (js2-cond-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-cond-node (&key (type js2-HOOK)
-                                                      (pos js2-ts-cursor)
-                                                      len
-                                                      test-expr
-                                                      true-expr
-                                                      false-expr
-                                                      q-pos c-pos)))
-  "AST node for the ternary operator"
-  test-expr
-  true-expr
-  false-expr
-  q-pos   ; buffer position of ?
-  c-pos)  ; buffer position of :
-
-(put 'cl-struct-js2-cond-node 'js2-visitor 'js2-visit-cond-node)
-(put 'cl-struct-js2-cond-node 'js2-printer 'js2-print-cond-node)
-
-(defun js2-visit-cond-node (n v)
-  (js2-visit-ast (js2-cond-node-test-expr n) v)
-  (js2-visit-ast (js2-cond-node-true-expr n) v)
-  (js2-visit-ast (js2-cond-node-false-expr n) v))
-
-(defun js2-print-cond-node (n i)
-  (let ((pad (js2-make-pad i)))
-    (insert pad)
-    (js2-print-ast (js2-cond-node-test-expr n) 0)
-    (insert " ? ")
-    (js2-print-ast (js2-cond-node-true-expr n) 0)
-    (insert " : ")
-    (js2-print-ast (js2-cond-node-false-expr n) 0)))
-
-(cl-defstruct (js2-infix-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-infix-node (&key type
-                                                       (pos js2-ts-cursor)
-                                                       len op-pos
-                                                       left right)))
-  "Represents infix expressions.
-Includes assignment ops like `|=', and the comma operator.
-The type field inherited from `js2-node' holds the operator."
-  op-pos    ; buffer position where operator begins
-  left      ; any `js2-node'
-  right)    ; any `js2-node'
-
-(put 'cl-struct-js2-infix-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-infix-node 'js2-printer 'js2-print-infix-node)
-
-(defun js2-visit-infix-node (n v)
-  (js2-visit-ast (js2-infix-node-left n) v)
-  (js2-visit-ast (js2-infix-node-right n) v))
-
-(defconst js2-operator-tokens
-  (let ((table (make-hash-table :test 'eq))
-        (tokens
-         (list (cons js2-IN "in")
-               (cons js2-TYPEOF "typeof")
-               (cons js2-INSTANCEOF "instanceof")
-               (cons js2-DELPROP "delete")
-               (cons js2-COMMA ",")
-               (cons js2-COLON ":")
-               (cons js2-OR "||")
-               (cons js2-AND "&&")
-               (cons js2-INC "++")
-               (cons js2-DEC "--")
-               (cons js2-BITOR "|")
-               (cons js2-BITXOR "^")
-               (cons js2-BITAND "&")
-               (cons js2-EQ "==")
-               (cons js2-NE "!=")
-               (cons js2-LT "<")
-               (cons js2-LE "<=")
-               (cons js2-GT ">")
-               (cons js2-GE ">=")
-               (cons js2-LSH "<<")
-               (cons js2-RSH ">>")
-               (cons js2-URSH ">>>")
-               (cons js2-ADD "+")       ; infix plus
-               (cons js2-SUB "-")       ; infix minus
-               (cons js2-MUL "*")
-               (cons js2-DIV "/")
-               (cons js2-MOD "%")
-               (cons js2-NOT "!")
-               (cons js2-BITNOT "~")
-               (cons js2-POS "+")       ; unary plus
-               (cons js2-NEG "-")       ; unary minus
-               (cons js2-TRIPLEDOT "...")
-               (cons js2-SHEQ "===")    ; shallow equality
-               (cons js2-SHNE "!==")    ; shallow inequality
-               (cons js2-ASSIGN "=")
-               (cons js2-ASSIGN_BITOR "|=")
-               (cons js2-ASSIGN_BITXOR "^=")
-               (cons js2-ASSIGN_BITAND "&=")
-               (cons js2-ASSIGN_LSH "<<=")
-               (cons js2-ASSIGN_RSH ">>=")
-               (cons js2-ASSIGN_URSH ">>>=")
-               (cons js2-ASSIGN_ADD "+=")
-               (cons js2-ASSIGN_SUB "-=")
-               (cons js2-ASSIGN_MUL "*=")
-               (cons js2-ASSIGN_DIV "/=")
-               (cons js2-ASSIGN_MOD "%="))))
-    (cl-loop for (k . v) in tokens do
-             (puthash k v table))
-    table))
-
-(defun js2-print-infix-node (n i)
-  (let* ((tt (js2-node-type n))
-         (op (gethash tt js2-operator-tokens)))
-    (unless op
-      (error "unrecognized infix operator %s" (js2-node-type n)))
-    (insert (js2-make-pad i))
-    (js2-print-ast (js2-infix-node-left n) 0)
-    (unless (= tt js2-COMMA)
-      (insert " "))
-    (insert op)
-    (insert " ")
-    (js2-print-ast (js2-infix-node-right n) 0)))
-
-(cl-defstruct (js2-assign-node
-               (:include js2-infix-node)
-               (:constructor nil)
-               (:constructor make-js2-assign-node (&key type
-                                                        (pos js2-ts-cursor)
-                                                        len op-pos
-                                                        left right)))
-  "Represents any assignment.
-The type field holds the actual assignment operator.")
-
-(put 'cl-struct-js2-assign-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-assign-node 'js2-printer 'js2-print-infix-node)
-
-(cl-defstruct (js2-unary-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-unary-node (&key type ; required
-                                                       (pos js2-ts-cursor)
-                                                       len operand)))
-  "AST node type for unary operator nodes.
-The type field can be NOT, BITNOT, POS, NEG, INC, DEC,
-TYPEOF, DELPROP or TRIPLEDOT.  For INC or DEC, a 'postfix node
-property is added if the operator follows the operand."
-  operand)  ; a `js2-node' expression
-
-(put 'cl-struct-js2-unary-node 'js2-visitor 'js2-visit-unary-node)
-(put 'cl-struct-js2-unary-node 'js2-printer 'js2-print-unary-node)
-
-(defun js2-visit-unary-node (n v)
-  (js2-visit-ast (js2-unary-node-operand n) v))
-
-(defun js2-print-unary-node (n i)
-  (let* ((tt (js2-node-type n))
-         (op (gethash tt js2-operator-tokens))
-         (postfix (js2-node-get-prop n 'postfix)))
-    (unless op
-      (error "unrecognized unary operator %s" tt))
-    (insert (js2-make-pad i))
-    (unless postfix
-      (insert op))
-    (if (or (= tt js2-TYPEOF)
-            (= tt js2-DELPROP))
-        (insert " "))
-    (js2-print-ast (js2-unary-node-operand n) 0)
-    (when postfix
-      (insert op))))
-
-(cl-defstruct (js2-let-node
-               (:include js2-scope)
-               (:constructor nil)
-               (:constructor make-js2-let-node (&key (type js2-LETEXPR)
-                                                     (pos (js2-current-token-beg))
-                                                     len vars body
-                                                     lp rp)))
-  "AST node for a let expression or a let statement.
-Note that a let declaration such as let x=6, y=7 is a `js2-var-decl-node'."
-  vars   ; a `js2-var-decl-node'
-  body   ; a `js2-node' representing the expression or body block
-  lp
-  rp)
-
-(put 'cl-struct-js2-let-node 'js2-visitor 'js2-visit-let-node)
-(put 'cl-struct-js2-let-node 'js2-printer 'js2-print-let-node)
-
-(defun js2-visit-let-node (n v)
-  (js2-visit-ast (js2-let-node-vars n) v)
-  (js2-visit-ast (js2-let-node-body n) v))
-
-(defun js2-print-let-node (n i)
-  (insert (js2-make-pad i) "let (")
-  (let ((p (point)))
-    (js2-print-ast (js2-let-node-vars n) 0)
-    (delete-region p (+ p 4)))
-  (insert ") ")
-  (js2-print-ast (js2-let-node-body n) i))
-
-(cl-defstruct (js2-keyword-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-keyword-node (&key type
-                                                         (pos (js2-current-token-beg))
-                                                         (len (- js2-ts-cursor pos)))))
-  "AST node representing a literal keyword such as `null'.
-Used for `null', `this', `true', `false' and `debugger'.
-The node type is set to js2-NULL, js2-THIS, etc.")
-
-(put 'cl-struct-js2-keyword-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-keyword-node 'js2-printer 'js2-print-keyword-node)
-
-(defun js2-print-keyword-node (n i)
-  (insert (js2-make-pad i)
-          (let ((tt (js2-node-type n)))
-            (cond
-             ((= tt js2-THIS) "this")
-             ((= tt js2-SUPER) "super")
-             ((= tt js2-NULL) "null")
-             ((= tt js2-TRUE) "true")
-             ((= tt js2-FALSE) "false")
-             ((= tt js2-DEBUGGER) "debugger")
-             (t (error "Invalid keyword literal type: %d" tt))))))
-
-(defsubst js2-this-or-super-node-p (node)
-  "Return t if NODE is a `js2-literal-node' of type js2-THIS or js2-SUPER."
-  (let ((type (js2-node-type node)))
-    (or (eq type js2-THIS) (eq type js2-SUPER))))
-
-(cl-defstruct (js2-new-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-new-node (&key (type js2-NEW)
-                                                     (pos (js2-current-token-beg))
-                                                     len target
-                                                     args initializer
-                                                     lp rp)))
-  "AST node for new-expression such as new Foo()."
-  target  ; an identifier or reference
-  args    ; a Lisp list of argument nodes
-  lp      ; position of left-paren, nil if omitted
-  rp      ; position of right-paren, nil if omitted
-  initializer) ; experimental Rhino syntax:  optional `js2-object-node'
-
-(put 'cl-struct-js2-new-node 'js2-visitor 'js2-visit-new-node)
-(put 'cl-struct-js2-new-node 'js2-printer 'js2-print-new-node)
-
-(defun js2-visit-new-node (n v)
-  (js2-visit-ast (js2-new-node-target n) v)
-  (dolist (arg (js2-new-node-args n))
-    (js2-visit-ast arg v))
-  (js2-visit-ast (js2-new-node-initializer n) v))
-
-(defun js2-print-new-node (n i)
-  (insert (js2-make-pad i) "new ")
-  (js2-print-ast (js2-new-node-target n))
-  (insert "(")
-  (js2-print-list (js2-new-node-args n))
-  (insert ")")
-  (when (js2-new-node-initializer n)
-    (insert " ")
-    (js2-print-ast (js2-new-node-initializer n))))
-
-(cl-defstruct (js2-name-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-name-node (&key (type js2-NAME)
-                                                      (pos (js2-current-token-beg))
-                                                      (len (- js2-ts-cursor
-                                                              (js2-current-token-beg)))
-                                                      (name (js2-current-token-string)))))
-  "AST node for a JavaScript identifier"
-  name   ; a string
-  scope) ; a `js2-scope' (optional, used for codegen)
-
-(put 'cl-struct-js2-name-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-name-node 'js2-printer 'js2-print-name-node)
-
-(defun js2-print-name-node (n i)
-  (insert (js2-make-pad i)
-          (js2-name-node-name n)))
-
-(defsubst js2-name-node-length (node)
-  "Return identifier length of NODE, a `js2-name-node'.
-Returns 0 if NODE is nil or its identifier field is nil."
-  (if node
-      (length (js2-name-node-name node))
-    0))
-
-(cl-defstruct (js2-number-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-number-node (&key (type js2-NUMBER)
-                                                        (pos (js2-current-token-beg))
-                                                        (len (- js2-ts-cursor
-                                                                (js2-current-token-beg)))
-                                                        (value (js2-current-token-string))
-                                                        (num-value (js2-token-number
-                                                                    (js2-current-token))))))
-  "AST node for a number literal."
-  value      ; the original string, e.g. "6.02e23"
-  num-value) ; the parsed number value
-
-(put 'cl-struct-js2-number-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-number-node 'js2-printer 'js2-print-number-node)
-
-(defun js2-print-number-node (n i)
-  (insert (js2-make-pad i)
-          (number-to-string (js2-number-node-num-value n))))
-
-(cl-defstruct (js2-regexp-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-regexp-node (&key (type js2-REGEXP)
-                                                        (pos (js2-current-token-beg))
-                                                        (len (- js2-ts-cursor
-                                                                (js2-current-token-beg)))
-                                                        value flags)))
-  "AST node for a regular expression literal."
-  value  ; the regexp string, without // delimiters
-  flags) ; a string of flags, e.g. `mi'.
-
-(put 'cl-struct-js2-regexp-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-regexp-node 'js2-printer 'js2-print-regexp)
-
-(defun js2-print-regexp (n i)
-  (insert (js2-make-pad i)
-          "/"
-          (js2-regexp-node-value n)
-          "/")
-  (if (js2-regexp-node-flags n)
-      (insert (js2-regexp-node-flags n))))
-
-(cl-defstruct (js2-string-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-string-node (&key (type js2-STRING)
-                                                        (pos (js2-current-token-beg))
-                                                        (len (- js2-ts-cursor
-                                                                (js2-current-token-beg)))
-                                                        (value (js2-current-token-string)))))
-  "String literal.
-Escape characters are not evaluated; e.g. \n is 2 chars in value field.
-You can tell the quote type by looking at the first character."
-  value) ; the characters of the string, including the quotes
-
-(put 'cl-struct-js2-string-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-string-node 'js2-printer 'js2-print-string-node)
-
-(defun js2-print-string-node (n i)
-  (insert (js2-make-pad i)
-          (js2-node-string n)))
-
-(cl-defstruct (js2-template-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-template-node (&key (type js2-TEMPLATE_HEAD)
-                                                          beg len kids)))
-  "Template literal."
-  kids)  ; `js2-string-node' is used for string segments, other nodes
-         ; for substitutions inside.
-
-(put 'cl-struct-js2-template-node 'js2-visitor 'js2-visit-template)
-(put 'cl-struct-js2-template-node 'js2-printer 'js2-print-template)
-
-(defun js2-visit-template (n callback)
-  (dolist (kid (js2-template-node-kids n))
-    (js2-visit-ast kid callback)))
-
-(defun js2-print-template (n i)
-  (insert (js2-make-pad i))
-  (dolist (kid (js2-template-node-kids n))
-    (if (js2-string-node-p kid)
-        (insert (js2-node-string kid))
-      (js2-print-ast kid))))
-
-(cl-defstruct (js2-tagged-template-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-tagged-template-node (&key (type js2-TAGGED_TEMPLATE)
-                                                                 beg len tag template)))
-  "Tagged template literal."
-  tag       ; `js2-node' with the tag expression.
-  template) ; `js2-template-node' with the template.
-
-(put 'cl-struct-js2-tagged-template-node 'js2-visitor 'js2-visit-tagged-template)
-(put 'cl-struct-js2-tagged-template-node 'js2-printer 'js2-print-tagged-template)
-
-(defun js2-visit-tagged-template (n callback)
-  (js2-visit-ast (js2-tagged-template-node-tag n) callback)
-  (js2-visit-ast (js2-tagged-template-node-template n) callback))
-
-(defun js2-print-tagged-template (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-tagged-template-node-tag n))
-  (js2-print-ast (js2-tagged-template-node-template n)))
-
-(cl-defstruct (js2-array-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-array-node (&key (type js2-ARRAYLIT)
-                                                       (pos js2-ts-cursor)
-                                                       len elems)))
-  "AST node for an array literal."
-  elems)  ; list of expressions.  [foo,,bar] yields a nil middle element.
-
-(put 'cl-struct-js2-array-node 'js2-visitor 'js2-visit-array-node)
-(put 'cl-struct-js2-array-node 'js2-printer 'js2-print-array-node)
-
-(defun js2-visit-array-node (n v)
-  (dolist (e (js2-array-node-elems n))
-    (js2-visit-ast e v)))  ; Can be nil; e.g. [a, ,b].
-
-(defun js2-print-array-node (n i)
-  (insert (js2-make-pad i) "[")
-  (let ((elems (js2-array-node-elems n)))
-    (js2-print-list elems)
-    (when (and elems (null (car (last elems))))
-      (insert ",")))
-  (insert "]"))
-
-(cl-defstruct (js2-class-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-class-node (&key (type js2-CLASS)
-                                                       (pos js2-ts-cursor)
-                                                       (form 'CLASS_STATEMENT)
-                                                       (name "")
-                                                       extends len elems)))
-  "AST node for an class expression.
-`elems' is a list of `js2-object-prop-node', and `extends' is an
-optional `js2-expr-node'"
-  form             ; CLASS_{STATEMENT|EXPRESSION}
-  name             ; class name (a `js2-node-name', or nil if anonymous)
-  extends          ; class heritage (a `js2-expr-node', or nil if none)
-  elems)
-
-(put 'cl-struct-js2-class-node 'js2-visitor 'js2-visit-class-node)
-(put 'cl-struct-js2-class-node 'js2-printer 'js2-print-class-node)
-
-(defun js2-visit-class-node (n v)
-  (js2-visit-ast (js2-class-node-name n) v)
-  (js2-visit-ast (js2-class-node-extends n) v)
-  (dolist (e (js2-class-node-elems n))
-    (js2-visit-ast e v)))
-
-(defun js2-print-class-node (n i)
-  (let* ((pad (js2-make-pad i))
-         (name (js2-class-node-name n))
-         (extends (js2-class-node-extends n))
-         (elems (js2-class-node-elems n)))
-    (insert pad "class")
-    (when name
-      (insert " ")
-      (js2-print-ast name 0))
-    (when extends
-      (insert " extends ")
-      (js2-print-ast extends))
-    (insert " {")
-    (dolist (elem elems)
-      (insert "\n")
-      (if (js2-node-get-prop elem 'STATIC)
-          (progn (insert (js2-make-pad (1+ i)) "static ")
-                 (js2-print-ast elem 0)) ;; TODO(sdh): indentation isn't quite right
-        (js2-print-ast elem (1+ i))))
-    (insert "\n" pad "}")))
-
-(cl-defstruct (js2-object-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-object-node (&key (type js2-OBJECTLIT)
-                                                        (pos js2-ts-cursor)
-                                                        len
-                                                        elems)))
-  "AST node for an object literal expression.
-`elems' is a list of `js2-object-prop-node'."
-  elems)
-
-(put 'cl-struct-js2-object-node 'js2-visitor 'js2-visit-object-node)
-(put 'cl-struct-js2-object-node 'js2-printer 'js2-print-object-node)
-
-(defun js2-visit-object-node (n v)
-  (dolist (e (js2-object-node-elems n))
-    (js2-visit-ast e v)))
-
-(defun js2-print-object-node (n i)
-  (insert (js2-make-pad i) "{")
-  (js2-print-list (js2-object-node-elems n))
-  (insert "}"))
-
-(cl-defstruct (js2-object-prop-node
-               (:include js2-infix-node)
-               (:constructor nil)
-               (:constructor make-js2-object-prop-node (&key (type js2-COLON)
-                                                             (pos js2-ts-cursor)
-                                                             len left
-                                                             right op-pos)))
-  "AST node for an object literal prop:value entry.
-The `left' field is the property:  a name node, string node or number node.
-The `right' field is a `js2-node' representing the initializer value.
-If the property is abbreviated, the node's `SHORTHAND' property is non-nil
-and both fields have the same value.")
-
-(put 'cl-struct-js2-object-prop-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-object-prop-node 'js2-printer 'js2-print-object-prop-node)
-
-(defun js2-print-object-prop-node (n i)
-  (let* ((left (js2-object-prop-node-left n))
-         (right (js2-object-prop-node-right n))
-         (computed (not (or (js2-string-node-p left)
-                            (js2-number-node-p left)
-                            (js2-name-node-p left)))))
-    (insert (js2-make-pad i))
-    (if computed
-        (insert "["))
-    (js2-print-ast left 0)
-    (if computed
-        (insert "]"))
-    (if (not (js2-node-get-prop n 'SHORTHAND))
-        (progn
-          (insert ": ")
-          (js2-print-ast right 0)))))
-
-(cl-defstruct (js2-getter-setter-node
-               (:include js2-infix-node)
-               (:constructor nil)
-               (:constructor make-js2-getter-setter-node (&key type ; GET, SET, or FUNCTION
-                                                               (pos js2-ts-cursor)
-                                                               len left right)))
-  "AST node for a getter/setter property in an object literal.
-The `left' field is the `js2-name-node' naming the getter/setter prop.
-The `right' field is always an anonymous `js2-function-node' with a node
-property `GETTER_SETTER' set to js2-GET, js2-SET, or js2-FUNCTION. ")
-
-(put 'cl-struct-js2-getter-setter-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-getter-setter-node 'js2-printer 'js2-print-getter-setter)
-
-(defun js2-print-getter-setter (n i)
-  (let* ((pad (js2-make-pad i))
-         (left (js2-getter-setter-node-left n))
-         (right (js2-getter-setter-node-right n))
-         (computed (not (or (js2-string-node-p left)
-                            (js2-number-node-p left)
-                            (js2-name-node-p left)))))
-    (insert pad)
-    (if (/= (js2-node-type n) js2-FUNCTION)
-        (insert (if (= (js2-node-type n) js2-GET) "get " "set ")))
-    (when (and (js2-function-node-p right)
-               (eq 'STAR (js2-function-node-generator-type right)))
-      (insert "*"))
-    (when computed
-      (insert "["))
-    (js2-print-ast left 0)
-    (when computed
-      (insert "]"))
-    (js2-print-ast right 0)))
-
-(cl-defstruct (js2-prop-get-node
-               (:include js2-infix-node)
-               (:constructor nil)
-               (:constructor make-js2-prop-get-node (&key (type js2-GETPROP)
-                                                          (pos js2-ts-cursor)
-                                                          len left right)))
-  "AST node for a dotted property reference, e.g. foo.bar or foo().bar")
-
-(put 'cl-struct-js2-prop-get-node 'js2-visitor 'js2-visit-prop-get-node)
-(put 'cl-struct-js2-prop-get-node 'js2-printer 'js2-print-prop-get-node)
-
-(defun js2-visit-prop-get-node (n v)
-  (js2-visit-ast (js2-prop-get-node-left n) v)
-  (js2-visit-ast (js2-prop-get-node-right n) v))
-
-(defun js2-print-prop-get-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-prop-get-node-left n) 0)
-  (insert ".")
-  (js2-print-ast (js2-prop-get-node-right n) 0))
-
-(cl-defstruct (js2-elem-get-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-elem-get-node (&key (type js2-GETELEM)
-                                                          (pos js2-ts-cursor)
-                                                          len target element
-                                                          lb rb)))
-  "AST node for an array index expression such as foo[bar]."
-  target  ; a `js2-node' - the expression preceding the "."
-  element ; a `js2-node' - the expression in brackets
-  lb      ; position of left-bracket, nil if omitted
-  rb)     ; position of right-bracket, nil if omitted
-
-(put 'cl-struct-js2-elem-get-node 'js2-visitor 'js2-visit-elem-get-node)
-(put 'cl-struct-js2-elem-get-node 'js2-printer 'js2-print-elem-get-node)
-
-(defun js2-visit-elem-get-node (n v)
-  (js2-visit-ast (js2-elem-get-node-target n) v)
-  (js2-visit-ast (js2-elem-get-node-element n) v))
-
-(defun js2-print-elem-get-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-elem-get-node-target n) 0)
-  (insert "[")
-  (js2-print-ast (js2-elem-get-node-element n) 0)
-  (insert "]"))
-
-(cl-defstruct (js2-call-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-call-node (&key (type js2-CALL)
-                                                      (pos js2-ts-cursor)
-                                                      len target args
-                                                      lp rp)))
-  "AST node for a JavaScript function call."
-  target  ; a `js2-node' evaluating to the function to call
-  args  ; a Lisp list of `js2-node' arguments
-  lp    ; position of open-paren, or nil if missing
-  rp)   ; position of close-paren, or nil if missing
-
-(put 'cl-struct-js2-call-node 'js2-visitor 'js2-visit-call-node)
-(put 'cl-struct-js2-call-node 'js2-printer 'js2-print-call-node)
-
-(defun js2-visit-call-node (n v)
-  (js2-visit-ast (js2-call-node-target n) v)
-  (dolist (arg (js2-call-node-args n))
-    (js2-visit-ast arg v)))
-
-(defun js2-print-call-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-call-node-target n) 0)
-  (insert "(")
-  (js2-print-list (js2-call-node-args n))
-  (insert ")"))
-
-(cl-defstruct (js2-yield-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-yield-node (&key (type js2-YIELD)
-                                                       (pos js2-ts-cursor)
-                                                       len value star-p)))
-  "AST node for yield statement or expression."
-  star-p ; whether it's yield*
-  value) ; optional:  value to be yielded
-
-(put 'cl-struct-js2-yield-node 'js2-visitor 'js2-visit-yield-node)
-(put 'cl-struct-js2-yield-node 'js2-printer 'js2-print-yield-node)
-
-(defun js2-visit-yield-node (n v)
-  (js2-visit-ast (js2-yield-node-value n) v))
-
-(defun js2-print-yield-node (n i)
-  (insert (js2-make-pad i))
-  (insert "yield")
-  (when (js2-yield-node-star-p n)
-    (insert "*"))
-  (when (js2-yield-node-value n)
-    (insert " ")
-    (js2-print-ast (js2-yield-node-value n) 0)))
-
-(cl-defstruct (js2-paren-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-paren-node (&key (type js2-LP)
-                                                       (pos js2-ts-cursor)
-                                                       len expr)))
-  "AST node for a parenthesized expression.
-In particular, used when the parens are syntactically optional,
-as opposed to required parens such as those enclosing an if-conditional."
-  expr)   ; `js2-node'
-
-(put 'cl-struct-js2-paren-node 'js2-visitor 'js2-visit-paren-node)
-(put 'cl-struct-js2-paren-node 'js2-printer 'js2-print-paren-node)
-
-(defun js2-visit-paren-node (n v)
-  (js2-visit-ast (js2-paren-node-expr n) v))
-
-(defun js2-print-paren-node (n i)
-  (insert (js2-make-pad i))
-  (insert "(")
-  (js2-print-ast (js2-paren-node-expr n) 0)
-  (insert ")"))
-
-(cl-defstruct (js2-comp-node
-               (:include js2-scope)
-               (:constructor nil)
-               (:constructor make-js2-comp-node (&key (type js2-ARRAYCOMP)
-                                                      (pos js2-ts-cursor)
-                                                      len result
-                                                      loops filters
-                                                      form)))
-  "AST node for an Array comprehension such as [[x,y] for (x in foo) for (y in bar)]."
-  result  ; result expression (just after left-bracket)
-  loops   ; a Lisp list of `js2-comp-loop-node'
-  filters ; a Lisp list of guard/filter expressions
-  form    ; ARRAY, LEGACY_ARRAY or STAR_GENERATOR
-          ; SpiderMonkey also supports "legacy generator expressions", but we dont.
-  )
-
-(put 'cl-struct-js2-comp-node 'js2-visitor 'js2-visit-comp-node)
-(put 'cl-struct-js2-comp-node 'js2-printer 'js2-print-comp-node)
-
-(defun js2-visit-comp-node (n v)
-  (js2-visit-ast (js2-comp-node-result n) v)
-  (dolist (l (js2-comp-node-loops n))
-    (js2-visit-ast l v))
-  (dolist (f (js2-comp-node-filters n))
-    (js2-visit-ast f v)))
-
-(defun js2-print-comp-node (n i)
-  (let ((pad (js2-make-pad i))
-        (result (js2-comp-node-result n))
-        (loops (js2-comp-node-loops n))
-        (filters (js2-comp-node-filters n))
-        (legacy-p (eq (js2-comp-node-form n) 'LEGACY_ARRAY))
-        (gen-p (eq (js2-comp-node-form n) 'STAR_GENERATOR)))
-    (insert pad (if gen-p "(" "["))
-    (when legacy-p
-      (js2-print-ast result 0))
-    (dolist (l loops)
-      (when legacy-p
-        (insert " "))
-      (js2-print-ast l 0)
-      (unless legacy-p
-        (insert " ")))
-    (dolist (f filters)
-      (when legacy-p
-        (insert " "))
-      (insert "if (")
-      (js2-print-ast f 0)
-      (insert ")")
-      (unless legacy-p
-        (insert " ")))
-    (unless legacy-p
-      (js2-print-ast result 0))
-    (insert (if gen-p ")" "]"))))
-
-(cl-defstruct (js2-comp-loop-node
-               (:include js2-for-in-node)
-               (:constructor nil)
-               (:constructor make-js2-comp-loop-node (&key (type js2-FOR)
-                                                           (pos js2-ts-cursor)
-                                                           len iterator
-                                                           object in-pos
-                                                           foreach-p
-                                                           each-pos
-                                                           forof-p
-                                                           lp rp)))
-  "AST subtree for each 'for (foo in bar)' loop in an array comprehension.")
-
-(put 'cl-struct-js2-comp-loop-node 'js2-visitor 'js2-visit-comp-loop)
-(put 'cl-struct-js2-comp-loop-node 'js2-printer 'js2-print-comp-loop)
-
-(defun js2-visit-comp-loop (n v)
-  (js2-visit-ast (js2-comp-loop-node-iterator n) v)
-  (js2-visit-ast (js2-comp-loop-node-object n) v))
-
-(defun js2-print-comp-loop (n _i)
-  (insert "for ")
-  (when (js2-comp-loop-node-foreach-p n) (insert "each "))
-  (insert "(")
-  (js2-print-ast (js2-comp-loop-node-iterator n) 0)
-  (insert (if (js2-comp-loop-node-forof-p n)
-              " of " " in "))
-  (js2-print-ast (js2-comp-loop-node-object n) 0)
-  (insert ")"))
-
-(cl-defstruct (js2-empty-expr-node
-               (:include js2-node)
-               (:constructor nil)
-               (:constructor make-js2-empty-expr-node (&key (type js2-EMPTY)
-                                                            (pos (js2-current-token-beg))
-                                                            len)))
-  "AST node for an empty expression.")
-
-(put 'cl-struct-js2-empty-expr-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-empty-expr-node 'js2-printer 'js2-print-none)
-
-(cl-defstruct (js2-xml-node
-               (:include js2-block-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-node (&key (type js2-XML)
-                                                     (pos (js2-current-token-beg))
-                                                     len kids)))
-  "AST node for initial parse of E4X literals.
-The kids field is a list of XML fragments, each a `js2-string-node' or
-a `js2-xml-js-expr-node'.  Equivalent to Rhino's XmlLiteral node.")
-
-(put 'cl-struct-js2-xml-node 'js2-visitor 'js2-visit-block)
-(put 'cl-struct-js2-xml-node 'js2-printer 'js2-print-xml-node)
-
-(defun js2-print-xml-node (n i)
-  (dolist (kid (js2-xml-node-kids n))
-    (js2-print-ast kid i)))
-
-(cl-defstruct (js2-xml-js-expr-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-js-expr-node (&key (type js2-XML)
-                                                             (pos js2-ts-cursor)
-                                                             len expr)))
-  "AST node for an embedded JavaScript {expression} in an E4X literal.
-The start and end fields correspond to the curly-braces."
-  expr)  ; a `js2-expr-node' of some sort
-
-(put 'cl-struct-js2-xml-js-expr-node 'js2-visitor 'js2-visit-xml-js-expr)
-(put 'cl-struct-js2-xml-js-expr-node 'js2-printer 'js2-print-xml-js-expr)
-
-(defun js2-visit-xml-js-expr (n v)
-  (js2-visit-ast (js2-xml-js-expr-node-expr n) v))
-
-(defun js2-print-xml-js-expr (n i)
-  (insert (js2-make-pad i))
-  (insert "{")
-  (js2-print-ast (js2-xml-js-expr-node-expr n) 0)
-  (insert "}"))
-
-(cl-defstruct (js2-xml-dot-query-node
-               (:include js2-infix-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-dot-query-node (&key (type js2-DOTQUERY)
-                                                               (pos js2-ts-cursor)
-                                                               op-pos len left
-                                                               right rp)))
-  "AST node for an E4X foo.(bar) filter expression.
-Note that the left-paren is automatically the character immediately
-following the dot (.) in the operator.  No whitespace is permitted
-between the dot and the lp by the scanner."
-  rp)
-
-(put 'cl-struct-js2-xml-dot-query-node 'js2-visitor 'js2-visit-infix-node)
-(put 'cl-struct-js2-xml-dot-query-node 'js2-printer 'js2-print-xml-dot-query)
-
-(defun js2-print-xml-dot-query (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-xml-dot-query-node-left n) 0)
-  (insert ".(")
-  (js2-print-ast (js2-xml-dot-query-node-right n) 0)
-  (insert ")"))
-
-(cl-defstruct (js2-xml-ref-node
-               (:include js2-node)
-               (:constructor nil))  ; abstract
-  "Base type for E4X XML attribute-access or property-get expressions.
-Such expressions can take a variety of forms.  The general syntax has
-three parts:
-
-  - (optional) an @ (specifying an attribute access)
-  - (optional) a namespace (a `js2-name-node') and double-colon
-  - (required) either a `js2-name-node' or a bracketed [expression]
-
-The property-name expressions (examples:  ns::name, @name) are
-represented as `js2-xml-prop-ref' nodes.  The bracketed-expression
-versions (examples:  ns::[name], @[name]) become `js2-xml-elem-ref' nodes.
-
-This node type (or more specifically, its subclasses) will sometimes
-be the right-hand child of a `js2-prop-get-node' or a
-`js2-infix-node' of type `js2-DOTDOT', the .. xml-descendants operator.
-The `js2-xml-ref-node' may also be a standalone primary expression with
-no explicit target, which is valid in certain expression contexts such as
-
-  company..employee.(@id < 100)
-
-in this case, the @id is a `js2-xml-ref' that is part of an infix '<'
-expression whose parent is a `js2-xml-dot-query-node'."
-  namespace
-  at-pos
-  colon-pos)
-
-(defsubst js2-xml-ref-node-attr-access-p (node)
-  "Return non-nil if this expression began with an @-token."
-  (and (numberp (js2-xml-ref-node-at-pos node))
-       (cl-plusp (js2-xml-ref-node-at-pos node))))
-
-(cl-defstruct (js2-xml-prop-ref-node
-               (:include js2-xml-ref-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-prop-ref-node (&key (type js2-REF_NAME)
-                                                              (pos (js2-current-token-beg))
-                                                              len propname
-                                                              namespace at-pos
-                                                              colon-pos)))
-  "AST node for an E4X XML [expr] property-ref expression.
-The JavaScript syntax is an optional @, an optional ns::, and a name.
-
-  [ '@' ] [ name '::' ] name
-
-Examples include name, ns::name, ns::*, *::name, *::*, @attr, @ns::attr,
-@ns::*, @*::attr, @*::*, and @*.
-
-The node starts at the @ token, if present.  Otherwise it starts at the
-namespace name.  The node bounds extend through the closing right-bracket,
-or if it is missing due to a syntax error, through the end of the index
-expression."
-  propname)
-
-(put 'cl-struct-js2-xml-prop-ref-node 'js2-visitor 'js2-visit-xml-prop-ref-node)
-(put 'cl-struct-js2-xml-prop-ref-node 'js2-printer 'js2-print-xml-prop-ref-node)
-
-(defun js2-visit-xml-prop-ref-node (n v)
-  (js2-visit-ast (js2-xml-prop-ref-node-namespace n) v)
-  (js2-visit-ast (js2-xml-prop-ref-node-propname n) v))
-
-(defun js2-print-xml-prop-ref-node (n i)
-  (insert (js2-make-pad i))
-  (if (js2-xml-ref-node-attr-access-p n)
-      (insert "@"))
-  (when (js2-xml-prop-ref-node-namespace n)
-    (js2-print-ast (js2-xml-prop-ref-node-namespace n) 0)
-    (insert "::"))
-  (if (js2-xml-prop-ref-node-propname n)
-      (js2-print-ast (js2-xml-prop-ref-node-propname n) 0)))
-
-(cl-defstruct (js2-xml-elem-ref-node
-               (:include js2-xml-ref-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-elem-ref-node (&key (type js2-REF_MEMBER)
-                                                              (pos (js2-current-token-beg))
-                                                              len expr lb rb
-                                                              namespace at-pos
-                                                              colon-pos)))
-  "AST node for an E4X XML [expr] member-ref expression.
-Syntax:
-
- [ '@' ] [ name '::' ] '[' expr ']'
-
-Examples include ns::[expr], @ns::[expr], @[expr], *::[expr] and @*::[expr].
-
-Note that the form [expr] (i.e. no namespace or attribute-qualifier)
-is not a legal E4X XML element-ref expression, since it's already used
-for standard JavaScript element-get array indexing.  Hence, a
-`js2-xml-elem-ref-node' always has either the attribute-qualifier, a
-non-nil namespace node, or both.
-
-The node starts at the @ token, if present.  Otherwise it starts
-at the namespace name.  The node bounds extend through the closing
-right-bracket, or if it is missing due to a syntax error, through the
-end of the index expression."
-  expr  ; the bracketed index expression
-  lb
-  rb)
-
-(put 'cl-struct-js2-xml-elem-ref-node 'js2-visitor 'js2-visit-xml-elem-ref-node)
-(put 'cl-struct-js2-xml-elem-ref-node 'js2-printer 'js2-print-xml-elem-ref-node)
-
-(defun js2-visit-xml-elem-ref-node (n v)
-  (js2-visit-ast (js2-xml-elem-ref-node-namespace n) v)
-  (js2-visit-ast (js2-xml-elem-ref-node-expr n) v))
-
-(defun js2-print-xml-elem-ref-node (n i)
-  (insert (js2-make-pad i))
-  (if (js2-xml-ref-node-attr-access-p n)
-      (insert "@"))
-  (when (js2-xml-elem-ref-node-namespace n)
-    (js2-print-ast (js2-xml-elem-ref-node-namespace n) 0)
-    (insert "::"))
-  (insert "[")
-  (if (js2-xml-elem-ref-node-expr n)
-      (js2-print-ast (js2-xml-elem-ref-node-expr n) 0))
-  (insert "]"))
-
-;;; Placeholder nodes for when we try parsing the XML literals structurally.
-
-(cl-defstruct (js2-xml-start-tag-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-start-tag-node (&key (type js2-XML)
-                                                               (pos js2-ts-cursor)
-                                                               len name attrs kids
-                                                               empty-p)))
-  "AST node for an XML start-tag.  Not currently used.
-The `kids' field is a Lisp list of child content nodes."
-  name      ; a `js2-xml-name-node'
-  attrs     ; a Lisp list of `js2-xml-attr-node'
-  empty-p)  ; t if this is an empty element such as <foo bar="baz"/>
-
-(put 'cl-struct-js2-xml-start-tag-node 'js2-visitor 'js2-visit-xml-start-tag)
-(put 'cl-struct-js2-xml-start-tag-node 'js2-printer 'js2-print-xml-start-tag)
-
-(defun js2-visit-xml-start-tag (n v)
-  (js2-visit-ast (js2-xml-start-tag-node-name n) v)
-  (dolist (attr (js2-xml-start-tag-node-attrs n))
-    (js2-visit-ast attr v))
-  (js2-visit-block n v))
-
-(defun js2-print-xml-start-tag (n i)
-  (insert (js2-make-pad i) "<")
-  (js2-print-ast (js2-xml-start-tag-node-name n) 0)
-  (when (js2-xml-start-tag-node-attrs n)
-    (insert " ")
-    (js2-print-list (js2-xml-start-tag-node-attrs n) " "))
-  (insert ">"))
-
-;; I -think- I'm going to make the parent node the corresponding start-tag,
-;; and add the end-tag to the kids list of the parent as well.
-(cl-defstruct (js2-xml-end-tag-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-end-tag-node (&key (type js2-XML)
-                                                             (pos js2-ts-cursor)
-                                                             len name)))
-  "AST node for an XML end-tag.  Not currently used."
-  name)  ; a `js2-xml-name-node'
-
-(put 'cl-struct-js2-xml-end-tag-node 'js2-visitor 'js2-visit-xml-end-tag)
-(put 'cl-struct-js2-xml-end-tag-node 'js2-printer 'js2-print-xml-end-tag)
-
-(defun js2-visit-xml-end-tag (n v)
-  (js2-visit-ast (js2-xml-end-tag-node-name n) v))
-
-(defun js2-print-xml-end-tag (n i)
-  (insert (js2-make-pad i))
-  (insert "</")
-  (js2-print-ast (js2-xml-end-tag-node-name n) 0)
-  (insert ">"))
-
-(cl-defstruct (js2-xml-name-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-name-node (&key (type js2-XML)
-                                                          (pos js2-ts-cursor)
-                                                          len namespace kids)))
-  "AST node for an E4X XML name.  Not currently used.
-Any XML name can be qualified with a namespace, hence the namespace field.
-Further, any E4X name can be comprised of arbitrary JavaScript {} expressions.
-The kids field is a list of `js2-name-node' and `js2-xml-js-expr-node'.
-For a simple name, the kids list has exactly one node, a `js2-name-node'."
-  namespace)  ; a `js2-string-node'
-
-(put 'cl-struct-js2-xml-name-node 'js2-visitor 'js2-visit-xml-name-node)
-(put 'cl-struct-js2-xml-name-node 'js2-printer 'js2-print-xml-name-node)
-
-(defun js2-visit-xml-name-node (n v)
-  (js2-visit-ast (js2-xml-name-node-namespace n) v))
-
-(defun js2-print-xml-name-node (n i)
-  (insert (js2-make-pad i))
-  (when (js2-xml-name-node-namespace n)
-    (js2-print-ast (js2-xml-name-node-namespace n) 0)
-    (insert "::"))
-  (dolist (kid (js2-xml-name-node-kids n))
-    (js2-print-ast kid 0)))
-
-(cl-defstruct (js2-xml-pi-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-pi-node (&key (type js2-XML)
-                                                        (pos js2-ts-cursor)
-                                                        len name attrs)))
-  "AST node for an E4X XML processing instruction.  Not currently used."
-  name   ; a `js2-xml-name-node'
-  attrs) ; a list of `js2-xml-attr-node'
-
-(put 'cl-struct-js2-xml-pi-node 'js2-visitor 'js2-visit-xml-pi-node)
-(put 'cl-struct-js2-xml-pi-node 'js2-printer 'js2-print-xml-pi-node)
-
-(defun js2-visit-xml-pi-node (n v)
-  (js2-visit-ast (js2-xml-pi-node-name n) v)
-  (dolist (attr (js2-xml-pi-node-attrs n))
-    (js2-visit-ast attr v)))
-
-(defun js2-print-xml-pi-node (n i)
-  (insert (js2-make-pad i) "<?")
-  (js2-print-ast (js2-xml-pi-node-name n))
-  (when (js2-xml-pi-node-attrs n)
-    (insert " ")
-    (js2-print-list (js2-xml-pi-node-attrs n)))
-  (insert "?>"))
-
-(cl-defstruct (js2-xml-cdata-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-cdata-node (&key (type js2-XML)
-                                                           (pos js2-ts-cursor)
-                                                           len content)))
-  "AST node for a CDATA escape section.  Not currently used."
-  content)  ; a `js2-string-node' with node-property 'quote-type 'cdata
-
-(put 'cl-struct-js2-xml-cdata-node 'js2-visitor 'js2-visit-xml-cdata-node)
-(put 'cl-struct-js2-xml-cdata-node 'js2-printer 'js2-print-xml-cdata-node)
-
-(defun js2-visit-xml-cdata-node (n v)
-  (js2-visit-ast (js2-xml-cdata-node-content n) v))
-
-(defun js2-print-xml-cdata-node (n i)
-  (insert (js2-make-pad i))
-  (js2-print-ast (js2-xml-cdata-node-content n)))
-
-(cl-defstruct (js2-xml-attr-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-attr-node (&key (type js2-XML)
-                                                      (pos js2-ts-cursor)
-                                                      len name value
-                                                      eq-pos quote-type)))
-  "AST node representing a foo='bar' XML attribute value.  Not yet used."
-  name   ; a `js2-xml-name-node'
-  value  ; a `js2-xml-name-node'
-  eq-pos ; buffer position of "=" sign
-  quote-type) ; 'single or 'double
-
-(put 'cl-struct-js2-xml-attr-node 'js2-visitor 'js2-visit-xml-attr-node)
-(put 'cl-struct-js2-xml-attr-node 'js2-printer 'js2-print-xml-attr-node)
-
-(defun js2-visit-xml-attr-node (n v)
-  (js2-visit-ast (js2-xml-attr-node-name n) v)
-  (js2-visit-ast (js2-xml-attr-node-value n) v))
-
-(defun js2-print-xml-attr-node (n i)
-  (let ((quote (if (eq (js2-xml-attr-node-quote-type n) 'single)
-                   "'"
-                 "\"")))
-    (insert (js2-make-pad i))
-    (js2-print-ast (js2-xml-attr-node-name n) 0)
-    (insert "=" quote)
-    (js2-print-ast (js2-xml-attr-node-value n) 0)
-    (insert quote)))
-
-(cl-defstruct (js2-xml-text-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-text-node (&key (type js2-XML)
-                                                      (pos js2-ts-cursor)
-                                                      len content)))
-  "AST node for an E4X XML text node.  Not currently used."
-  content)  ; a Lisp list of `js2-string-node' and `js2-xml-js-expr-node'
-
-(put 'cl-struct-js2-xml-text-node 'js2-visitor 'js2-visit-xml-text-node)
-(put 'cl-struct-js2-xml-text-node 'js2-printer 'js2-print-xml-text-node)
-
-(defun js2-visit-xml-text-node (n v)
-  (js2-visit-ast (js2-xml-text-node-content n) v))
-
-(defun js2-print-xml-text-node (n i)
-  (insert (js2-make-pad i))
-  (dolist (kid (js2-xml-text-node-content n))
-    (js2-print-ast kid)))
-
-(cl-defstruct (js2-xml-comment-node
-               (:include js2-xml-node)
-               (:constructor nil)
-               (:constructor make-js2-xml-comment-node (&key (type js2-XML)
-                                                             (pos js2-ts-cursor)
-                                                             len)))
-  "AST node for E4X XML comment.  Not currently used.")
-
-(put 'cl-struct-js2-xml-comment-node 'js2-visitor 'js2-visit-none)
-(put 'cl-struct-js2-xml-comment-node 'js2-printer 'js2-print-xml-comment)
-
-(defun js2-print-xml-comment (n i)
-  (insert (js2-make-pad i)
-          (js2-node-string n)))
-
-;;; Node utilities
-
-(defsubst js2-node-line (n)
-  "Fetch the source line number at the start of node N.
-This is O(n) in the length of the source buffer; use prudently."
-  (1+ (count-lines (point-min) (js2-node-abs-pos n))))
-
-(defsubst js2-block-node-kid (n i)
-  "Return child I of node N, or nil if there aren't that many."
-  (nth i (js2-block-node-kids n)))
-
-(defsubst js2-block-node-first (n)
-  "Return first child of block node N, or nil if there is none."
-  (cl-first (js2-block-node-kids n)))
-
-(defun js2-node-root (n)
-  "Return the root of the AST containing N.
-If N has no parent pointer, returns N."
-  (let ((parent (js2-node-parent n)))
-    (if parent
-        (js2-node-root parent)
-      n)))
-
-(defsubst js2-node-short-name (n)
-  "Return the short name of node N as a string, e.g. `js2-if-node'."
-  (substring (symbol-name (aref n 0))
-             (length "cl-struct-")))
-
-(defun js2-node-child-list (node)
-  "Return the child list for NODE, a Lisp list of nodes.
-Works for block nodes, array nodes, obj literals, funarg lists,
-var decls and try nodes (for catch clauses).  Note that you should call
-`js2-block-node-kids' on the function body for the body statements.
-Returns nil for zero-length child lists or unsupported nodes."
-  (cond
-   ((js2-function-node-p node)
-    (js2-function-node-params node))
-   ((js2-block-node-p node)
-    (js2-block-node-kids node))
-   ((js2-try-node-p node)
-    (js2-try-node-catch-clauses node))
-   ((js2-array-node-p node)
-    (js2-array-node-elems node))
-   ((js2-object-node-p node)
-    (js2-object-node-elems node))
-   ((js2-call-node-p node)
-    (js2-call-node-args node))
-   ((js2-new-node-p node)
-    (js2-new-node-args node))
-   ((js2-var-decl-node-p node)
-    (js2-var-decl-node-kids node))
-   (t
-    nil)))
-
-(defun js2-node-set-child-list (node kids)
-  "Set the child list for NODE to KIDS."
-   (cond
-    ((js2-function-node-p node)
-     (setf (js2-function-node-params node) kids))
-    ((js2-block-node-p node)
-     (setf (js2-block-node-kids node) kids))
-    ((js2-try-node-p node)
-     (setf (js2-try-node-catch-clauses node) kids))
-    ((js2-array-node-p node)
-     (setf (js2-array-node-elems node) kids))
-    ((js2-object-node-p node)
-     (setf (js2-object-node-elems node) kids))
-    ((js2-call-node-p node)
-     (setf (js2-call-node-args node) kids))
-    ((js2-new-node-p node)
-     (setf (js2-new-node-args node) kids))
-    ((js2-var-decl-node-p node)
-     (setf (js2-var-decl-node-kids node) kids))
-    (t
-     (error "Unsupported node type: %s" (js2-node-short-name node))))
-   kids)
-
-;; All because Common Lisp doesn't support multiple inheritance for defstructs.
-(defconst js2-paren-expr-nodes
-  '(cl-struct-js2-comp-loop-node
-    cl-struct-js2-comp-node
-    cl-struct-js2-call-node
-    cl-struct-js2-catch-node
-    cl-struct-js2-do-node
-    cl-struct-js2-elem-get-node
-    cl-struct-js2-for-in-node
-    cl-struct-js2-for-node
-    cl-struct-js2-function-node
-    cl-struct-js2-if-node
-    cl-struct-js2-let-node
-    cl-struct-js2-new-node
-    cl-struct-js2-paren-node
-    cl-struct-js2-switch-node
-    cl-struct-js2-while-node
-    cl-struct-js2-with-node
-    cl-struct-js2-xml-dot-query-node)
-  "Node types that can have a parenthesized child expression.
-In particular, nodes that respond to `js2-node-lp' and `js2-node-rp'.")
-
-(defsubst js2-paren-expr-node-p (node)
-  "Return t for nodes that typically have a parenthesized child expression.
-Useful for computing the indentation anchors for arg-lists and conditions.
-Note that it may return a false positive, for instance when NODE is
-a `js2-new-node' and there are no arguments or parentheses."
-  (memq (aref node 0) js2-paren-expr-nodes))
-
-;; Fake polymorphism... yech.
-(defun js2-node-lp (node)
-  "Return relative left-paren position for NODE, if applicable.
-For `js2-elem-get-node' structs, returns left-bracket position.
-Note that the position may be nil in the case of a parse error."
-  (cond
-   ((js2-elem-get-node-p node)
-    (js2-elem-get-node-lb node))
-   ((js2-loop-node-p node)
-    (js2-loop-node-lp node))
-   ((js2-function-node-p node)
-    (js2-function-node-lp node))
-   ((js2-if-node-p node)
-    (js2-if-node-lp node))
-   ((js2-new-node-p node)
-    (js2-new-node-lp node))
-   ((js2-call-node-p node)
-    (js2-call-node-lp node))
-   ((js2-paren-node-p node)
-    0)
-   ((js2-switch-node-p node)
-    (js2-switch-node-lp node))
-   ((js2-catch-node-p node)
-    (js2-catch-node-lp node))
-   ((js2-let-node-p node)
-    (js2-let-node-lp node))
-   ((js2-comp-node-p node)
-    0)
-   ((js2-with-node-p node)
-    (js2-with-node-lp node))
-   ((js2-xml-dot-query-node-p node)
-    (1+ (js2-infix-node-op-pos node)))
-   (t
-    (error "Unsupported node type: %s" (js2-node-short-name node)))))
-
-;; Fake polymorphism... blech.
-(defun js2-node-rp (node)
-  "Return relative right-paren position for NODE, if applicable.
-For `js2-elem-get-node' structs, returns right-bracket position.
-Note that the position may be nil in the case of a parse error."
-  (cond
-   ((js2-elem-get-node-p node)
-    (js2-elem-get-node-rb node))
-   ((js2-loop-node-p node)
-    (js2-loop-node-rp node))
-   ((js2-function-node-p node)
-    (js2-function-node-rp node))
-   ((js2-if-node-p node)
-    (js2-if-node-rp node))
-   ((js2-new-node-p node)
-    (js2-new-node-rp node))
-   ((js2-call-node-p node)
-    (js2-call-node-rp node))
-   ((js2-paren-node-p node)
-    (1- (js2-node-len node)))
-   ((js2-switch-node-p node)
-    (js2-switch-node-rp node))
-   ((js2-catch-node-p node)
-    (js2-catch-node-rp node))
-   ((js2-let-node-p node)
-    (js2-let-node-rp node))
-   ((js2-comp-node-p node)
-    (1- (js2-node-len node)))
-   ((js2-with-node-p node)
-    (js2-with-node-rp node))
-   ((js2-xml-dot-query-node-p node)
-    (1+ (js2-xml-dot-query-node-rp node)))
-   (t
-    (error "Unsupported node type: %s" (js2-node-short-name node)))))
-
-(defsubst js2-node-first-child (node)
-  "Return the first element of `js2-node-child-list' for NODE."
-  (car (js2-node-child-list node)))
-
-(defsubst js2-node-last-child (node)
-  "Return the last element of `js2-node-last-child' for NODE."
-  (car (last (js2-node-child-list node))))
-
-(defun js2-node-prev-sibling (node)
-  "Return the previous statement in parent.
-Works for parents supported by `js2-node-child-list'.
-Returns nil if NODE is not in the parent, or PARENT is
-not a supported node, or if NODE is the first child."
-  (let* ((p (js2-node-parent node))
-         (kids (js2-node-child-list p))
-         (sib (car kids)))
-    (while (and kids
-                (not (eq node (cadr kids))))
-      (setq kids (cdr kids)
-            sib (car kids)))
-    sib))
-
-(defun js2-node-next-sibling (node)
-  "Return the next statement in parent block.
-Returns nil if NODE is not in the block, or PARENT is not
-a block node, or if NODE is the last statement."
-  (let* ((p (js2-node-parent node))
-         (kids (js2-node-child-list p)))
-    (while (and kids
-                (not (eq node (car kids))))
-      (setq kids (cdr kids)))
-    (cadr kids)))
-
-(defun js2-node-find-child-before (pos parent &optional after)
-  "Find the last child that starts before POS in parent.
-If AFTER is non-nil, returns first child starting after POS.
-POS is an absolute buffer position.  PARENT is any node
-supported by `js2-node-child-list'.
-Returns nil if no applicable child is found."
-  (let ((kids (if (js2-function-node-p parent)
-                  (js2-block-node-kids (js2-function-node-body parent))
-                (js2-node-child-list parent)))
-        (beg (js2-node-abs-pos (if (js2-function-node-p parent)
-                                   (js2-function-node-body parent)
-                                 parent)))
-        kid result fn
-        (continue t))
-    (setq fn (if after '>= '<))
-    (while (and kids continue)
-      (setq kid (car kids))
-      (if (funcall fn (+ beg (js2-node-pos kid)) pos)
-          (setq result kid
-                continue (not after))
-        (setq continue after))
-      (setq kids (cdr kids)))
-    result))
-
-(defun js2-node-find-child-after (pos parent)
-  "Find first child that starts after POS in parent.
-POS is an absolute buffer position.  PARENT is any node
-supported by `js2-node-child-list'.
-Returns nil if no applicable child is found."
-  (js2-node-find-child-before pos parent 'after))
-
-(defun js2-node-replace-child (pos parent new-node)
-  "Replace node at index POS in PARENT with NEW-NODE.
-Only works for parents supported by `js2-node-child-list'."
-  (let ((kids (js2-node-child-list parent))
-        (i 0))
-    (while (< i pos)
-      (setq kids (cdr kids)
-            i (1+ i)))
-    (setcar kids new-node)
-    (js2-node-add-children parent new-node)))
-
-(defun js2-node-buffer (n)
-  "Return the buffer associated with AST N.
-Returns nil if the buffer is not set as a property on the root
-node, or if parent links were not recorded during parsing."
-  (let ((root (js2-node-root n)))
-    (and root
-         (js2-ast-root-p root)
-         (js2-ast-root-buffer root))))
-
-(defun js2-block-node-push (n kid)
-  "Push js2-node KID onto the end of js2-block-node N's child list.
-KID is always added to the -end- of the kids list.
-Function also calls `js2-node-add-children' to add the parent link."
-  (let ((kids (js2-node-child-list n)))
-    (if kids
-        (setcdr kids (nconc (cdr kids) (list kid)))
-      (js2-node-set-child-list n (list kid)))
-    (js2-node-add-children n kid)))
-
-(defun js2-node-string (node)
-  (with-current-buffer (or (js2-node-buffer node)
-                           (error "No buffer available for node %s" node))
-    (let ((pos (js2-node-abs-pos node)))
-      (buffer-substring-no-properties pos (+ pos (js2-node-len node))))))
-
-;; Container for storing the node we're looking for in a traversal.
-(js2-deflocal js2-discovered-node nil)
-
-;; Keep track of absolute node position during traversals.
-(js2-deflocal js2-visitor-offset nil)
-
-(js2-deflocal js2-node-search-point nil)
-
-(when js2-mode-dev-mode-p
-  (defun js2-find-node-at-point ()
-    (interactive)
-    (let ((node (js2-node-at-point)))
-      (message "%s" (or node "No node found at point"))))
-  (defun js2-node-name-at-point ()
-    (interactive)
-    (let ((node (js2-node-at-point)))
-      (message "%s" (if node
-                        (js2-node-short-name node)
-                      "No node found at point.")))))
-
-(defun js2-node-at-point (&optional pos skip-comments)
-  "Return AST node at POS, a buffer position, defaulting to current point.
-The `js2-mode-ast' variable must be set to the current parse tree.
-Signals an error if the AST (`js2-mode-ast') is nil.
-Always returns a node - if it can't find one, it returns the root.
-If SKIP-COMMENTS is non-nil, comment nodes are ignored."
-  (let ((ast js2-mode-ast)
-        result)
-    (unless ast
-      (error "No JavaScript AST available"))
-    ;; Look through comments first, since they may be inside nodes that
-    ;; would otherwise report a match.
-    (setq pos (or pos (point))
-          result (if (> pos (js2-node-abs-end ast))
-                     ast
-                   (if (not skip-comments)
-                       (js2-comment-at-point pos))))
-    (unless result
-      (setq js2-discovered-node nil
-            js2-visitor-offset 0
-            js2-node-search-point pos)
-      (unwind-protect
-          (catch 'js2-visit-done
-            (js2-visit-ast ast #'js2-node-at-point-visitor))
-        (setq js2-visitor-offset nil
-              js2-node-search-point nil))
-      (setq result js2-discovered-node))
-    ;; may have found a comment beyond end of last child node,
-    ;; since visiting the ast-root looks at the comment-list last.
-    (if (and skip-comments
-             (js2-comment-node-p result))
-        (setq result nil))
-    (or result js2-mode-ast)))
-
-(defun js2-node-at-point-visitor (node end-p)
-  (let ((rel-pos (js2-node-pos node))
-        abs-pos
-        abs-end
-        (point js2-node-search-point))
-    (cond
-     (end-p
-      ;; this evaluates to a non-nil return value, even if it's zero
-      (cl-decf js2-visitor-offset rel-pos))
-     ;; we already looked for comments before visiting, and don't want them now
-     ((js2-comment-node-p node)
-      nil)
-     (t
-      (setq abs-pos (cl-incf js2-visitor-offset rel-pos)
-            ;; we only want to use the node if the point is before
-            ;; the last character position in the node, so we decrement
-            ;; the absolute end by 1.
-            abs-end (+ abs-pos (js2-node-len node) -1))
-      (cond
-       ;; If this node starts after search-point, stop the search.
-       ((> abs-pos point)
-        (throw 'js2-visit-done nil))
-       ;; If this node ends before the search-point, don't check kids.
-       ((> point abs-end)
-        nil)
-       (t
-        ;; Otherwise point is within this node, possibly in a child.
-        (setq js2-discovered-node node)
-        t))))))  ; keep processing kids to look for more specific match
-
-(defsubst js2-block-comment-p (node)
-  "Return non-nil if NODE is a comment node of format `jsdoc' or `block'."
-  (and (js2-comment-node-p node)
-       (memq (js2-comment-node-format node) '(jsdoc block))))
-
-;; TODO:  put the comments in a vector and binary-search them instead
-(defun js2-comment-at-point (&optional pos)
-  "Look through scanned comment nodes for one containing POS.
-POS is a buffer position that defaults to current point.
-Function returns nil if POS was not in any comment node."
-  (let ((ast js2-mode-ast)
-        (x (or pos (point)))
-        beg end)
-    (unless ast
-      (error "No JavaScript AST available"))
-    (catch 'done
-      ;; Comments are stored in lexical order.
-      (dolist (comment (js2-ast-root-comments ast) nil)
-        (setq beg (js2-node-abs-pos comment)
-              end (+ beg (js2-node-len comment)))
-        (if (and (>= x beg)
-                 (<= x end))
-            (throw 'done comment))))))
-
-(defun js2-mode-find-parent-fn (node)
-  "Find function enclosing NODE.
-Returns nil if NODE is not inside a function."
-  (setq node (js2-node-parent node))
-  (while (and node (not (js2-function-node-p node)))
-    (setq node (js2-node-parent node)))
-  (and (js2-function-node-p node) node))
-
-(defun js2-mode-find-enclosing-fn (node)
-  "Find function or root enclosing NODE."
-  (if (js2-ast-root-p node)
-      node
-    (setq node (js2-node-parent node))
-    (while (not (or (js2-ast-root-p node)
-                    (js2-function-node-p node)))
-      (setq node (js2-node-parent node)))
-    node))
-
- (defun js2-mode-find-enclosing-node (beg end)
-  "Find node fully enclosing BEG and END."
-  (let ((node (js2-node-at-point beg))
-        pos
-        (continue t))
-    (while continue
-      (if (or (js2-ast-root-p node)
-              (and
-               (<= (setq pos (js2-node-abs-pos node)) beg)
-               (>= (+ pos (js2-node-len node)) end)))
-          (setq continue nil)
-        (setq node (js2-node-parent node))))
-    node))
-
-(defun js2-node-parent-script-or-fn (node)
-  "Find script or function immediately enclosing NODE.
-If NODE is the ast-root, returns nil."
-  (if (js2-ast-root-p node)
-      nil
-    (setq node (js2-node-parent node))
-    (while (and node (not (or (js2-function-node-p node)
-                              (js2-script-node-p node))))
-      (setq node (js2-node-parent node)))
-    node))
-
-(defun js2-node-is-descendant (node ancestor)
-  "Return t if NODE is a descendant of ANCESTOR."
-  (while (and node
-              (not (eq node ancestor)))
-    (setq node (js2-node-parent node)))
-  node)
-
-;;; visitor infrastructure
-
-(defun js2-visit-none (_node _callback)
-  "Visitor for AST node that have no node children."
-  nil)
-
-(defun js2-print-none (_node _indent)
-  "Visitor for AST node with no printed representation.")
-
-(defun js2-print-body (node indent)
-  "Print a statement, or a block without braces."
-  (if (js2-block-node-p node)
-      (dolist (kid (js2-block-node-kids node))
-        (js2-print-ast kid indent))
-    (js2-print-ast node indent)))
-
-(defun js2-print-list (args &optional delimiter)
-  (cl-loop with len = (length args)
-           for arg in args
-           for count from 1
-           do
-           (when arg (js2-print-ast arg 0))
-           (if (< count len)
-               (insert (or delimiter ", ")))))
-
-(defun js2-print-tree (ast)
-  "Prints an AST to the current buffer.
-Makes `js2-ast-parent-nodes' available to the printer functions."
-  (let ((max-lisp-eval-depth (max max-lisp-eval-depth 1500)))
-    (js2-print-ast ast)))
-
-(defun js2-print-ast (node &optional indent)
-  "Helper function for printing AST nodes.
-Requires `js2-ast-parent-nodes' to be non-nil.
-You should use `js2-print-tree' instead of this function."
-  (let ((printer (get (aref node 0) 'js2-printer))
-        (i (or indent 0)))
-    ;; TODO:  wedge comments in here somewhere
-    (if printer
-        (funcall printer node i))))
-
-(defconst js2-side-effecting-tokens
-  (let ((tokens (make-bool-vector js2-num-tokens nil)))
-    (dolist (tt (list js2-ASSIGN
-                      js2-ASSIGN_ADD
-                      js2-ASSIGN_BITAND
-                      js2-ASSIGN_BITOR
-                      js2-ASSIGN_BITXOR
-                      js2-ASSIGN_DIV
-                      js2-ASSIGN_LSH
-                      js2-ASSIGN_MOD
-                      js2-ASSIGN_MUL
-                      js2-ASSIGN_RSH
-                      js2-ASSIGN_SUB
-                      js2-ASSIGN_URSH
-                      js2-BLOCK
-                      js2-BREAK
-                      js2-CALL
-                      js2-CATCH
-                      js2-CATCH_SCOPE
-                      js2-CLASS
-                      js2-CONST
-                      js2-CONTINUE
-                      js2-DEBUGGER
-                      js2-DEC
-                      js2-DELPROP
-                      js2-DEL_REF
-                      js2-DO
-                      js2-ELSE
-                      js2-EMPTY
-                      js2-ENTERWITH
-                      js2-EXPORT
-                      js2-EXPR_RESULT
-                      js2-FINALLY
-                      js2-FOR
-                      js2-FUNCTION
-                      js2-GOTO
-                      js2-IF
-                      js2-IFEQ
-                      js2-IFNE
-                      js2-IMPORT
-                      js2-INC
-                      js2-JSR
-                      js2-LABEL
-                      js2-LEAVEWITH
-                      js2-LET
-                      js2-LETEXPR
-                      js2-LOCAL_BLOCK
-                      js2-LOOP
-                      js2-NEW
-                      js2-REF_CALL
-                      js2-RETHROW
-                      js2-RETURN
-                      js2-RETURN_RESULT
-                      js2-SEMI
-                      js2-SETELEM
-                      js2-SETELEM_OP
-                      js2-SETNAME
-                      js2-SETPROP
-                      js2-SETPROP_OP
-                      js2-SETVAR
-                      js2-SET_REF
-                      js2-SET_REF_OP
-                      js2-SWITCH
-                      js2-TARGET
-                      js2-THROW
-                      js2-TRY
-                      js2-VAR
-                      js2-WHILE
-                      js2-WITH
-                      js2-WITHEXPR
-                      js2-YIELD))
-      (aset tokens tt t))
-    (if js2-instanceof-has-side-effects
-        (aset tokens js2-INSTANCEOF t))
-    tokens))
-
-(defun js2-node-has-side-effects (node)
-  "Return t if NODE has side effects."
-  (when node  ; makes it easier to handle malformed expressions
-    (let ((tt (js2-node-type node)))
-      (cond
-       ;; This doubtless needs some work, since EXPR_VOID is used
-       ;; in several ways in Rhino and I may not have caught them all.
-       ;; I'll wait for people to notice incorrect warnings.
-       ((and (= tt js2-EXPR_VOID)
-             (js2-expr-stmt-node-p node)) ; but not if EXPR_RESULT
-        (let ((expr (js2-expr-stmt-node-expr node)))
-          (or (js2-node-has-side-effects expr)
-              (when (js2-string-node-p expr)
-                (member (js2-string-node-value expr) '("use strict" "use asm"))))))
-       ((= tt js2-COMMA)
-        (js2-node-has-side-effects (js2-infix-node-right node)))
-       ((or (= tt js2-AND)
-            (= tt js2-OR))
-        (or (js2-node-has-side-effects (js2-infix-node-right node))
-            (js2-node-has-side-effects (js2-infix-node-left node))))
-       ((= tt js2-HOOK)
-        (and (js2-node-has-side-effects (js2-cond-node-true-expr node))
-             (js2-node-has-side-effects (js2-cond-node-false-expr node))))
-       ((js2-paren-node-p node)
-        (js2-node-has-side-effects (js2-paren-node-expr node)))
-       ((= tt js2-ERROR) ; avoid cascaded error messages
-        nil)
-       (t
-        (aref js2-side-effecting-tokens tt))))))
-
-(defconst js2-stmt-node-types
-  (list js2-BLOCK
-        js2-BREAK
-        js2-CONTINUE
-        js2-DEFAULT  ; e4x "default xml namespace" statement
-        js2-DO
-        js2-EXPORT
-        js2-EXPR_RESULT
-        js2-EXPR_VOID
-        js2-FOR
-        js2-IF
-        js2-IMPORT
-        js2-RETURN
-        js2-SWITCH
-        js2-THROW
-        js2-TRY
-        js2-WHILE
-        js2-WITH)
-  "Node types that only appear in statement contexts.
-The list does not include nodes that always appear as the child
-of another specific statement type, such as switch-cases,
-catch and finally blocks, and else-clauses.  The list also excludes
-nodes like yield, let and var, which may appear in either expression
-or statement context, and in the latter context always have a
-`js2-expr-stmt-node' parent.  Finally, the list does not include
-functions or scripts, which are treated separately from statements
-by the JavaScript parser and runtime.")
-
-(defun js2-stmt-node-p (node)
-  "Heuristic for figuring out if NODE is a statement.
-Some node types can appear in either an expression context or a
-statement context, e.g. let-nodes, yield-nodes, and var-decl nodes.
-For these node types in a statement context, the parent will be a
-`js2-expr-stmt-node'.
-Functions aren't included in the check."
-  (memq (js2-node-type node) js2-stmt-node-types))
-
-(defun js2-mode-find-first-stmt (node)
-  "Search upward starting from NODE looking for a statement.
-For purposes of this function, a `js2-function-node' counts."
-  (while (not (or (js2-stmt-node-p node)
-                  (js2-function-node-p node)))
-    (setq node (js2-node-parent node)))
-  node)
-
-(defun js2-node-parent-stmt (node)
-  "Return the node's first ancestor that is a statement.
-Returns nil if NODE is a `js2-ast-root'.  Note that any expression
-appearing in a statement context will have a parent that is a
-`js2-expr-stmt-node' that will be returned by this function."
-  (let ((parent (js2-node-parent node)))
-    (if (or (null parent)
-            (js2-stmt-node-p parent)
-            (and (js2-function-node-p parent)
-                 (not (eq (js2-function-node-form parent)
-                          'FUNCTION_EXPRESSION))))
-        parent
-      (js2-node-parent-stmt parent))))
-
-;; In the Mozilla Rhino sources, Roshan James writes:
-;;  Does consistent-return analysis on the function body when strict mode is
-;;  enabled.
-;;
-;;    function (x) { return (x+1) }
-;;
-;;  is ok, but
-;;
-;;    function (x) { if (x < 0) return (x+1); }
-;;
-;;  is not because the function can potentially return a value when the
-;;  condition is satisfied and if not, the function does not explicitly
-;;  return a value.
-;;
-;;  This extends to checking mismatches such as "return" and "return <value>"
-;;  used in the same function. Warnings are not emitted if inconsistent
-;;  returns exist in code that can be statically shown to be unreachable.
-;;  Ex.
-;;    function (x) { while (true) { ... if (..) { return value } ... } }
-;;
-;;  emits no warning. However if the loop had a break statement, then a
-;;  warning would be emitted.
-;;
-;;  The consistency analysis looks at control structures such as loops, ifs,
-;;  switch, try-catch-finally blocks, examines the reachable code paths and
-;;  warns the user about an inconsistent set of termination possibilities.
-;;
-;;  These flags enumerate the possible ways a statement/function can
-;;  terminate. These flags are used by endCheck() and by the Parser to
-;;  detect inconsistent return usage.
-;;
-;;  END_UNREACHED is reserved for code paths that are assumed to always be
-;;  able to execute (example: throw, continue)
-;;
-;;  END_DROPS_OFF indicates if the statement can transfer control to the
-;;  next one. Statement such as return dont. A compound statement may have
-;;  some branch that drops off control to the next statement.
-;;
-;;  END_RETURNS indicates that the statement can return with no value.
-;;  END_RETURNS_VALUE indicates that the statement can return a value.
-;;
-;;  A compound statement such as
-;;  if (condition) {
-;;    return value;
-;;  }
-;;  Will be detected as (END_DROPS_OFF | END_RETURN_VALUE) by endCheck()
-
-(defconst js2-END_UNREACHED 0)
-(defconst js2-END_DROPS_OFF 1)
-(defconst js2-END_RETURNS 2)
-(defconst js2-END_RETURNS_VALUE 4)
-(defconst js2-END_YIELDS 8)
-
-(defun js2-has-consistent-return-usage (node)
-  "Check that every return usage in a function body is consistent.
-Returns t if the function satisfies strict mode requirement."
-  (let ((n (js2-end-check node)))
-    ;; either it doesn't return a value in any branch...
-    (or (js2-flag-not-set-p n js2-END_RETURNS_VALUE)
-        ;; or it returns a value (or is unreached) at every branch
-        (js2-flag-not-set-p n (logior js2-END_DROPS_OFF
-                                      js2-END_RETURNS
-                                      js2-END_YIELDS)))))
-
-(defun js2-end-check-if (node)
-  "Ensure that return usage in then/else blocks is consistent.
-If there is no else block, then the return statement can fall through.
-Returns logical OR of END_* flags"
-  (let ((th (js2-if-node-then-part node))
-        (el (js2-if-node-else-part node)))
-    (if (null th)
-        js2-END_UNREACHED
-      (logior (js2-end-check th) (if el
-                                     (js2-end-check el)
-                                   js2-END_DROPS_OFF)))))
-
-(defun js2-end-check-switch (node)
-  "Consistency of return statements is checked between the case statements.
-If there is no default, then the switch can fall through. If there is a
-default, we check to see if all code paths in the default return or if
-there is a code path that can fall through.
-Returns logical OR of END_* flags."
-  (let ((rv js2-END_UNREACHED)
-        default-case)
-    ;; examine the cases
-    (catch 'break
-      (dolist (c (js2-switch-node-cases node))
-        (if (js2-case-node-expr c)
-            (js2-set-flag rv (js2-end-check-block c))
-          (setq default-case c)
-          (throw 'break nil))))
-    ;; we don't care how the cases drop into each other
-    (js2-clear-flag rv js2-END_DROPS_OFF)
-    ;; examine the default
-    (js2-set-flag rv (if default-case
-                         (js2-end-check default-case)
-                       js2-END_DROPS_OFF))
-    rv))
-
-(defun js2-end-check-try (node)
- "If the block has a finally, return consistency is checked in the
-finally block. If all code paths in the finally return, then the
-returns in the try-catch blocks don't matter. If there is a code path
-that does not return or if there is no finally block, the returns
-of the try and catch blocks are checked for mismatch.
-Returns logical OR of END_* flags."
- (let ((finally (js2-try-node-finally-block node))
-       rv)
-   ;; check the finally if it exists
-   (setq rv (if finally
-                (js2-end-check (js2-finally-node-body finally))
-              js2-END_DROPS_OFF))
-   ;; If the finally block always returns, then none of the returns
-   ;; in the try or catch blocks matter.
-   (when (js2-flag-set-p rv js2-END_DROPS_OFF)
-     (js2-clear-flag rv js2-END_DROPS_OFF)
-     ;; examine the try block
-     (js2-set-flag rv (js2-end-check (js2-try-node-try-block node)))
-     ;; check each catch block
-     (dolist (cb (js2-try-node-catch-clauses node))
-       (js2-set-flag rv (js2-end-check cb))))
-   rv))
-
-(defun js2-end-check-loop (node)
-  "Return statement in the loop body must be consistent.
-The default assumption for any kind of a loop is that it will eventually
-terminate.  The only exception is a loop with a constant true condition.
-Code that follows such a loop is examined only if one can determine
-statically that there is a break out of the loop.
-
-    for(... ; ... ; ...) {}
-    for(... in ... ) {}
-    while(...) { }
-    do { } while(...)
-
-Returns logical OR of END_* flags."
-  (let ((rv (js2-end-check (js2-loop-node-body node)))
-        (condition (cond
-                    ((js2-while-node-p node)
-                     (js2-while-node-condition node))
-                     ((js2-do-node-p node)
-                      (js2-do-node-condition node))
-                     ((js2-for-node-p node)
-                      (js2-for-node-condition node)))))
-
-    ;; check to see if the loop condition is always true
-    (if (and condition
-             (eq (js2-always-defined-boolean-p condition) 'ALWAYS_TRUE))
-        (js2-clear-flag rv js2-END_DROPS_OFF))
-
-    ;; look for effect of breaks
-    (js2-set-flag rv (js2-node-get-prop node
-                                        'CONTROL_BLOCK_PROP
-                                        js2-END_UNREACHED))
-    rv))
-
-(defun js2-end-check-block (node)
-  "A general block of code is examined statement by statement.
-If any statement (even a compound one) returns in all branches, then
-subsequent statements are not examined.
-Returns logical OR of END_* flags."
-  (let* ((rv js2-END_DROPS_OFF)
-         (kids (js2-block-node-kids node))
-         (n (car kids)))
-    ;; Check each statement.  If the statement can continue onto the next
-    ;; one (i.e. END_DROPS_OFF is set), then check the next statement.
-    (while (and n (js2-flag-set-p rv js2-END_DROPS_OFF))
-      (js2-clear-flag rv js2-END_DROPS_OFF)
-      (js2-set-flag rv (js2-end-check n))
-      (setq kids (cdr kids)
-            n (car kids)))
-    rv))
-
-(defun js2-end-check-label (node)
-  "A labeled statement implies that there may be a break to the label.
-The function processes the labeled statement and then checks the
-CONTROL_BLOCK_PROP property to see if there is ever a break to the
-particular label.
-Returns logical OR of END_* flags."
-  (let ((rv (js2-end-check (js2-labeled-stmt-node-stmt node))))
-    (logior rv (js2-node-get-prop node
-                                  'CONTROL_BLOCK_PROP
-                                  js2-END_UNREACHED))))
-
-(defun js2-end-check-break (node)
-  "When a break is encountered annotate the statement being broken
-out of by setting its CONTROL_BLOCK_PROP property.
-Returns logical OR of END_* flags."
-  (and (js2-break-node-target node)
-       (js2-node-set-prop (js2-break-node-target node)
-                          'CONTROL_BLOCK_PROP
-                          js2-END_DROPS_OFF))
-  js2-END_UNREACHED)
-
-(defun js2-end-check (node)
-  "Examine the body of a function, doing a basic reachability analysis.
-Returns a combination of flags END_* flags that indicate
-how the function execution can terminate. These constitute only the
-pessimistic set of termination conditions. It is possible that at
-runtime certain code paths will never be actually taken. Hence this
-analysis will flag errors in cases where there may not be errors.
-Returns logical OR of END_* flags"
-  (let (kid)
-    (cond
-     ((js2-break-node-p node)
-      (js2-end-check-break node))
-     ((js2-expr-stmt-node-p node)
-      (if (setq kid (js2-expr-stmt-node-expr node))
-          (js2-end-check kid)
-        js2-END_DROPS_OFF))
-     ((or (js2-continue-node-p node)
-          (js2-throw-node-p node))
-      js2-END_UNREACHED)
-     ((js2-return-node-p node)
-      (if (setq kid (js2-return-node-retval node))
-          js2-END_RETURNS_VALUE
-        js2-END_RETURNS))
-     ((js2-loop-node-p node)
-      (js2-end-check-loop node))
-     ((js2-switch-node-p node)
-      (js2-end-check-switch node))
-     ((js2-labeled-stmt-node-p node)
-      (js2-end-check-label node))
-     ((js2-if-node-p node)
-      (js2-end-check-if node))
-     ((js2-try-node-p node)
-      (js2-end-check-try node))
-     ((js2-block-node-p node)
-      (if (null (js2-block-node-kids node))
-          js2-END_DROPS_OFF
-        (js2-end-check-block node)))
-     ((js2-yield-node-p node)
-      js2-END_YIELDS)
-     (t
-      js2-END_DROPS_OFF))))
-
-(defun js2-always-defined-boolean-p (node)
-  "Check if NODE always evaluates to true or false in boolean context.
-Returns 'ALWAYS_TRUE, 'ALWAYS_FALSE, or nil if it's neither always true
-nor always false."
-  (let ((tt (js2-node-type node))
-        num)
-    (cond
-     ((or (= tt js2-FALSE) (= tt js2-NULL))
-      'ALWAYS_FALSE)
-     ((= tt js2-TRUE)
-      'ALWAYS_TRUE)
-     ((= tt js2-NUMBER)
-      (setq num (js2-number-node-num-value node))
-      (if (and (not (eq num 0.0e+NaN))
-               (not (zerop num)))
-          'ALWAYS_TRUE
-        'ALWAYS_FALSE))
-     (t
-      nil))))
-
-;;; Scanner -- a port of Mozilla Rhino's lexer.
-;; Corresponds to Rhino files Token.java and TokenStream.java.
-
-(defvar js2-tokens nil
-  "List of all defined token names.")  ; initialized in `js2-token-names'
-
-(defconst js2-token-names
-  (let* ((names (make-vector js2-num-tokens -1))
-         (case-fold-search nil)  ; only match js2-UPPER_CASE
-         (syms (apropos-internal "^js2-\\(?:[[:upper:]_]+\\)")))
-    (cl-loop for sym in syms
-             for i from 0
-             do
-             (unless (or (memq sym '(js2-EOF_CHAR js2-ERROR))
-                         (not (boundp sym)))
-               (aset names (symbol-value sym)           ; code, e.g. 152
-                     (downcase
-                      (substring (symbol-name sym) 4))) ; name, e.g. "let"
-               (push sym js2-tokens)))
-    names)
-  "Vector mapping int values to token string names, sans `js2-' prefix.")
-
-(defun js2-tt-name (tok)
-  "Return a string name for TOK, a token symbol or code.
-Signals an error if it's not a recognized token."
-  (let ((code tok))
-    (if (symbolp tok)
-        (setq code (symbol-value tok)))
-    (if (eq code -1)
-        "ERROR"
-      (if (and (numberp code)
-               (not (cl-minusp code))
-               (< code js2-num-tokens))
-          (aref js2-token-names code)
-        (error "Invalid token: %s" code)))))
-
-(defsubst js2-tt-sym (tok)
-  "Return symbol for TOK given its code, e.g. 'js2-LP for code 86."
-  (intern (js2-tt-name tok)))
-
-(defconst js2-token-codes
-  (let ((table (make-hash-table :test 'eq :size 256)))
-    (cl-loop for name across js2-token-names
-             for sym = (intern (concat "js2-" (upcase name)))
-             do
-             (puthash sym (symbol-value sym) table))
-    ;; clean up a few that are "wrong" in Rhino's token codes
-    (puthash 'js2-DELETE js2-DELPROP table)
-    table)
-  "Hashtable mapping token type symbols to their bytecodes.")
-
-(defsubst js2-tt-code (sym)
-  "Return code for token symbol SYM, e.g. 86 for 'js2-LP."
-  (or (gethash sym js2-token-codes)
-      (error "Invalid token symbol: %s " sym)))  ; signal code bug
-
-(defun js2-report-scan-error (msg &optional no-throw beg len)
-  (setf (js2-token-end (js2-current-token)) js2-ts-cursor)
-  (js2-report-error msg nil
-                    (or beg (js2-current-token-beg))
-                    (or len (js2-current-token-len)))
-  (unless no-throw
-    (throw 'return js2-ERROR)))
-
-(defun js2-set-string-from-buffer (token)
-  "Set `string' and `end' slots for TOKEN, return the string."
-  (setf (js2-token-end token) js2-ts-cursor
-        (js2-token-string token) (js2-collect-string js2-ts-string-buffer)))
-
-;; TODO:  could potentially avoid a lot of consing by allocating a
-;; char buffer the way Rhino does.
-(defsubst js2-add-to-string (c)
-  (push c js2-ts-string-buffer))
-
-;; Note that when we "read" the end-of-file, we advance js2-ts-cursor
-;; to (1+ (point-max)), which lets the scanner treat end-of-file like
-;; any other character:  when it's not part of the current token, we
-;; unget it, allowing it to be read again by the following call.
-(defsubst js2-unget-char ()
-  (cl-decf js2-ts-cursor))
-
-;; Rhino distinguishes \r and \n line endings.  We don't need to
-;; because we only scan from Emacs buffers, which always use \n.
-(defun js2-get-char ()
-  "Read and return the next character from the input buffer.
-Increments `js2-ts-lineno' if the return value is a newline char.
-Updates `js2-ts-cursor' to the point after the returned char.
-Returns `js2-EOF_CHAR' if we hit the end of the buffer.
-Also updates `js2-ts-hit-eof' and `js2-ts-line-start' as needed."
-  (let (c)
-    ;; check for end of buffer
-    (if (>= js2-ts-cursor (point-max))
-        (setq js2-ts-hit-eof t
-              js2-ts-cursor (1+ js2-ts-cursor)
-              c js2-EOF_CHAR)  ; return value
-      ;; otherwise read next char
-      (setq c (char-before (cl-incf js2-ts-cursor)))
-      ;; if we read a newline, update counters
-      (if (= c ?\n)
-          (setq js2-ts-line-start js2-ts-cursor
-                js2-ts-lineno (1+ js2-ts-lineno)))
-      ;; TODO:  skip over format characters
-      c)))
-
-(defun js2-read-unicode-escape ()
-  "Read a \\uNNNN sequence from the input.
-Assumes the ?\ and ?u have already been read.
-Returns the unicode character, or nil if it wasn't a valid character.
-Doesn't change the values of any scanner variables."
-  ;; I really wish I knew a better way to do this, but I can't
-  ;; find the Emacs function that takes a 16-bit int and converts
-  ;; it to a Unicode/utf-8 character.  So I basically eval it with (read).
-  ;; Have to first check that it's 4 hex characters or it may stop
-  ;; the read early.
-  (ignore-errors
-    (let ((s (buffer-substring-no-properties js2-ts-cursor
-                                             (+ 4 js2-ts-cursor))))
-      (if (string-match "[0-9a-fA-F]\\{4\\}" s)
-          (read (concat "?\\u" s))))))
-
-(defun js2-match-char (test)
-  "Consume and return next character if it matches TEST, a character.
-Returns nil and consumes nothing if TEST is not the next character."
-  (let ((c (js2-get-char)))
-    (if (eq c test)
-        t
-      (js2-unget-char)
-      nil)))
-
-(defun js2-peek-char ()
-  (prog1
-      (js2-get-char)
-    (js2-unget-char)))
-
-(defun js2-identifier-start-p (c)
-  "Is C a valid start to an ES5 Identifier?
-See http://es5.github.io/#x7.6"
-  (or
-   (memq c '(?$ ?_))
-   (memq (get-char-code-property c 'general-category)
-         ;; Letters
-         '(Lu Ll Lt Lm Lo Nl))))
-
-(defun js2-identifier-part-p (c)
-  "Is C a valid part of an ES5 Identifier?
-See http://es5.github.io/#x7.6"
-  (or
-   (memq c '(?$ ?_ ?\u200c  ?\u200d))
-   (memq (get-char-code-property c 'general-category)
-         '(;; Letters
-           Lu Ll Lt Lm Lo Nl
-           ;; Combining Marks
-           Mn Mc
-           ;; Digits
-           Nd
-           ;; Connector Punctuation
-           Pc))))
-
-(defun js2-alpha-p (c)
-  (cond ((and (<= ?A c) (<= c ?Z)) t)
-        ((and (<= ?a c) (<= c ?z)) t)
-        (t nil)))
-
-(defsubst js2-digit-p (c)
-  (and (<= ?0 c) (<= c ?9)))
-
-(defun js2-js-space-p (c)
-  (if (<= c 127)
-      (memq c '(#x20 #x9 #xB #xC #xD))
-    (or
-     (eq c #xA0)
-     ;; TODO:  change this nil to check for Unicode space character
-     nil)))
-
-(defconst js2-eol-chars (list js2-EOF_CHAR ?\n ?\r))
-
-(defun js2-skip-line ()
-  "Skip to end of line."
-  (while (not (memq (js2-get-char) js2-eol-chars)))
-  (js2-unget-char)
-  (setf (js2-token-end (js2-current-token)) js2-ts-cursor))
-
-(defun js2-init-scanner (&optional buf line)
-  "Create token stream for BUF starting on LINE.
-BUF defaults to `current-buffer' and LINE defaults to 1.
-
-A buffer can only have one scanner active at a time, which yields
-dramatically simpler code than using a defstruct.  If you need to
-have simultaneous scanners in a buffer, copy the regions to scan
-into temp buffers."
-  (with-current-buffer (or buf (current-buffer))
-    (setq js2-ts-dirty-line nil
-          js2-ts-hit-eof nil
-          js2-ts-line-start 0
-          js2-ts-lineno (or line 1)
-          js2-ts-line-end-char -1
-          js2-ts-cursor (point-min)
-          js2-ti-tokens (make-vector js2-ti-ntokens nil)
-          js2-ti-tokens-cursor 0
-          js2-ti-lookahead 0
-          js2-ts-is-xml-attribute nil
-          js2-ts-xml-is-tag-content nil
-          js2-ts-xml-open-tags-count 0
-          js2-ts-string-buffer nil)))
-
-;; This function uses the cached op, string and number fields in
-;; TokenStream; if getToken has been called since the passed token
-;; was scanned, the op or string printed may be incorrect.
-(defun js2-token-to-string (token)
-  ;; Not sure where this function is used in Rhino.  Not tested.
-  (if (not js2-debug-print-trees)
-      ""
-    (let ((name (js2-tt-name token)))
-      (cond
-       ((memq token '(js2-STRING js2-REGEXP js2-NAME
-                      js2-TEMPLATE_HEAD js2-NO_SUBS_TEMPLATE))
-        (concat name " `" (js2-current-token-string) "'"))
-       ((eq token js2-NUMBER)
-        (format "NUMBER %g" (js2-token-number (js2-current-token))))
-       (t
-        name)))))
-
-(defconst js2-keywords
-  '(break
-    case catch class const continue
-    debugger default delete do
-    else extends export
-    false finally for function
-    if in instanceof import
-    let
-    new null
-    return
-    super switch
-    this throw true try typeof
-    var void
-    while with
-    yield))
-
-;; Token names aren't exactly the same as the keywords, unfortunately.
-;; E.g. delete is js2-DELPROP.
-(defconst js2-kwd-tokens
-  (let ((table (make-vector js2-num-tokens nil))
-        (tokens
-         (list js2-BREAK
-               js2-CASE js2-CATCH js2-CLASS js2-CONST js2-CONTINUE
-               js2-DEBUGGER js2-DEFAULT js2-DELPROP js2-DO
-               js2-ELSE js2-EXPORT
-               js2-ELSE js2-EXTENDS js2-EXPORT
-               js2-FALSE js2-FINALLY js2-FOR js2-FUNCTION
-               js2-IF js2-IN js2-INSTANCEOF js2-IMPORT
-               js2-LET
-               js2-NEW js2-NULL
-               js2-RETURN
-               js2-SUPER js2-SWITCH
-               js2-THIS js2-THROW js2-TRUE js2-TRY js2-TYPEOF
-               js2-VAR
-               js2-WHILE js2-WITH
-               js2-YIELD)))
-    (dolist (i tokens)
-      (aset table i 'font-lock-keyword-face))
-    (aset table js2-STRING 'font-lock-string-face)
-    (aset table js2-REGEXP 'font-lock-string-face)
-    (aset table js2-NO_SUBS_TEMPLATE 'font-lock-string-face)
-    (aset table js2-TEMPLATE_HEAD 'font-lock-string-face)
-    (aset table js2-COMMENT 'font-lock-comment-face)
-    (aset table js2-THIS 'font-lock-builtin-face)
-    (aset table js2-SUPER 'font-lock-builtin-face)
-    (aset table js2-VOID 'font-lock-constant-face)
-    (aset table js2-NULL 'font-lock-constant-face)
-    (aset table js2-TRUE 'font-lock-constant-face)
-    (aset table js2-FALSE 'font-lock-constant-face)
-    (aset table js2-NOT 'font-lock-negation-char-face)
-    table)
-  "Vector whose values are non-nil for tokens that are keywords.
-The values are default faces to use for highlighting the keywords.")
-
-;; FIXME: Support strict mode-only future reserved words, after we know
-;; which parts scopes are in strict mode, and which are not.
-(defconst js2-reserved-words '(class enum export extends import static super)
-  "Future reserved keywords in ECMAScript 5.1.")
-
-(defconst js2-keyword-names
-  (let ((table (make-hash-table :test 'equal)))
-    (cl-loop for k in js2-keywords
-             do (puthash
-                 (symbol-name k)                            ; instanceof
-                 (intern (concat "js2-"
-                                 (upcase (symbol-name k)))) ; js2-INSTANCEOF
-                 table))
-    table)
-  "JavaScript keywords by name, mapped to their symbols.")
-
-(defconst js2-reserved-word-names
-  (let ((table (make-hash-table :test 'equal)))
-    (cl-loop for k in js2-reserved-words
-             do
-             (puthash (symbol-name k) 'js2-RESERVED table))
-    table)
-  "JavaScript reserved words by name, mapped to 'js2-RESERVED.")
-
-(defun js2-collect-string (buf)
-  "Convert BUF, a list of chars, to a string.
-Reverses BUF before converting."
-  (if buf
-      (apply #'string (nreverse buf))
-    ""))
-
-(defun js2-string-to-keyword (s)
-  "Return token for S, a string, if S is a keyword or reserved word.
-Returns a symbol such as 'js2-BREAK, or nil if not keyword/reserved."
-  (or (gethash s js2-keyword-names)
-      (gethash s js2-reserved-word-names)))
-
-(defsubst js2-ts-set-char-token-bounds (token)
-  "Used when next token is one character."
-  (setf (js2-token-beg token) (1- js2-ts-cursor)
-        (js2-token-end token) js2-ts-cursor))
-
-(defsubst js2-ts-return (token type)
-  "Update the `end' and `type' slots of TOKEN,
-then throw `return' with value TYPE."
-  (setf (js2-token-end token) js2-ts-cursor
-        (js2-token-type token) type)
-  (throw 'return type))
-
-(defun js2-x-digit-to-int (c accumulator)
-  "Build up a hex number.
-If C is a hexadecimal digit, return ACCUMULATOR * 16 plus
-corresponding number.  Otherwise return -1."
-  (catch 'return
-    (catch 'check
-      ;; Use 0..9 < A..Z < a..z
-      (cond
-       ((<= c ?9)
-        (cl-decf c ?0)
-        (if (<= 0 c)
-            (throw 'check nil)))
-       ((<= c ?F)
-        (when (<= ?A c)
-          (cl-decf c (- ?A 10))
-          (throw 'check nil)))
-       ((<= c ?f)
-        (when (<= ?a c)
-          (cl-decf c (- ?a 10))
-          (throw 'check nil))))
-      (throw 'return -1))
-    (logior c (lsh accumulator 4))))
-
-(defun js2-get-token (&optional modifier)
-  "If `js2-ti-lookahead' is zero, call scanner to get new token.
-Otherwise, move `js2-ti-tokens-cursor' and return the type of
-next saved token.
-
-This function will not return a newline (js2-EOL) - instead, it
-gobbles newlines until it finds a non-newline token.  Call
-`js2-peek-token-or-eol' when you care about newlines.
-
-This function will also not return a js2-COMMENT.  Instead, it
-records comments found in `js2-scanned-comments'.  If the token
-returned by this function immediately follows a jsdoc comment,
-the token is flagged as such."
-  (if (zerop js2-ti-lookahead)
-      (js2-get-token-internal modifier)
-    (cl-decf js2-ti-lookahead)
-    (setq js2-ti-tokens-cursor (mod (1+ js2-ti-tokens-cursor) js2-ti-ntokens))
-    (let ((tt (js2-current-token-type)))
-      (cl-assert (not (= tt js2-EOL)))
-      tt)))
-
-(defun js2-unget-token ()
-  (cl-assert (< js2-ti-lookahead js2-ti-max-lookahead))
-  (cl-incf js2-ti-lookahead)
-  (setq js2-ti-tokens-cursor (mod (1- js2-ti-tokens-cursor) js2-ti-ntokens)))
-
-(defun js2-get-token-internal (modifier)
-  (let* ((token (js2-get-token-internal-1 modifier)) ; call scanner
-         (tt (js2-token-type token))
-         saw-eol
-         face)
-    ;; process comments
-    (while (or (= tt js2-EOL) (= tt js2-COMMENT))
-      (if (= tt js2-EOL)
-          (setq saw-eol t)
-        (setq saw-eol nil)
-        (when js2-record-comments
-          (js2-record-comment token)))
-      (setq js2-ti-tokens-cursor (mod (1- js2-ti-tokens-cursor) js2-ti-ntokens))
-      (setq token (js2-get-token-internal-1 modifier) ; call scanner again
-            tt (js2-token-type token)))
-
-    (when saw-eol
-      (setf (js2-token-follows-eol-p token) t))
-
-    ;; perform lexical fontification as soon as token is scanned
-    (when js2-parse-ide-mode
-      (cond
-       ((cl-minusp tt)
-        (js2-record-face 'js2-error token))
-       ((setq face (aref js2-kwd-tokens tt))
-        (js2-record-face face token))
-       ((and (= tt js2-NAME)
-             (equal (js2-token-string token) "undefined"))
-        (js2-record-face 'font-lock-constant-face token))))
-    tt))
-
-(defsubst js2-string-to-number (str base)
-  ;; TODO:  Maybe port ScriptRuntime.stringToNumber.
-  (condition-case nil
-      (string-to-number str base)
-    (overflow-error -1)))
-
-(defun js2-get-token-internal-1 (modifier)
-  "Return next JavaScript token type, an int such as js2-RETURN.
-During operation, creates an instance of `js2-token' struct, sets
-its relevant fields and puts it into `js2-ti-tokens'."
-  (let (identifier-start
-        is-unicode-escape-start c
-        contains-escape escape-val str result base
-        look-for-slash continue tt
-        (token (js2-new-token 0)))
-    (setq
-     tt
-     (catch 'return
-       (when (eq modifier 'TEMPLATE_TAIL)
-         (setf (js2-token-beg token) (1- js2-ts-cursor))
-         (throw 'return (js2-get-string-or-template-token ?` token)))
-       (while t
-         ;; Eat whitespace, possibly sensitive to newlines.
-         (setq continue t)
-         (while continue
-           (setq c (js2-get-char))
-           (cond
-            ((eq c js2-EOF_CHAR)
-             (js2-unget-char)
-             (js2-ts-set-char-token-bounds token)
-             (throw 'return js2-EOF))
-            ((eq c ?\n)
-             (js2-ts-set-char-token-bounds token)
-             (setq js2-ts-dirty-line nil)
-             (throw 'return js2-EOL))
-            ((not (js2-js-space-p c))
-             (if (/= c ?-)              ; in case end of HTML comment
-                 (setq js2-ts-dirty-line t))
-             (setq continue nil))))
-         ;; Assume the token will be 1 char - fixed up below.
-         (js2-ts-set-char-token-bounds token)
-         (when (eq c ?@)
-           (throw 'return js2-XMLATTR))
-         ;; identifier/keyword/instanceof?
-         ;; watch out for starting with a <backslash>
-         (cond
-          ((eq c ?\\)
-           (setq c (js2-get-char))
-           (if (eq c ?u)
-               (setq identifier-start t
-                     is-unicode-escape-start t
-                     js2-ts-string-buffer nil)
-             (setq identifier-start nil)
-             (js2-unget-char)
-             (setq c ?\\)))
-          (t
-           (when (setq identifier-start (js2-identifier-start-p c))
-             (setq js2-ts-string-buffer nil)
-             (js2-add-to-string c))))
-         (when identifier-start
-           (setq contains-escape is-unicode-escape-start)
-           (catch 'break
-             (while t
-               (if is-unicode-escape-start
-                   ;; strictly speaking we should probably push-back
-                   ;; all the bad characters if the <backslash>uXXXX
-                   ;; sequence is malformed. But since there isn't a
-                   ;; correct context(is there?) for a bad Unicode
-                   ;; escape sequence in an identifier, we can report
-                   ;; an error here.
-                   (progn
-                     (setq escape-val 0)
-                     (dotimes (_ 4)
-                       (setq c (js2-get-char)
-                             escape-val (js2-x-digit-to-int c escape-val))
-                       ;; Next check takes care of c < 0 and bad escape
-                       (if (cl-minusp escape-val)
-                           (throw 'break nil)))
-                     (if (cl-minusp escape-val)
-                         (js2-report-scan-error "msg.invalid.escape" t))
-                     (js2-add-to-string escape-val)
-                     (setq is-unicode-escape-start nil))
-                 (setq c (js2-get-char))
-                 (cond
-                  ((eq c ?\\)
-                   (setq c (js2-get-char))
-                   (if (eq c ?u)
-                       (setq is-unicode-escape-start t
-                             contains-escape t)
-                     (js2-report-scan-error "msg.illegal.character" t)))
-                  (t
-                   (if (or (eq c js2-EOF_CHAR)
-                           (not (js2-identifier-part-p c)))
-                       (throw 'break nil))
-                   (js2-add-to-string c))))))
-           (js2-unget-char)
-           (setf str (js2-collect-string js2-ts-string-buffer)
-                 (js2-token-end token) js2-ts-cursor)
-           ;; FIXME: Invalid in ES5 and ES6, see
-           ;; https://bugzilla.mozilla.org/show_bug.cgi?id=694360
-           ;; Probably should just drop this conditional.
-           (unless contains-escape
-             ;; OPT we shouldn't have to make a string (object!) to
-             ;; check if it's a keyword.
-             ;; Return the corresponding token if it's a keyword
-             (when (and (not (eq modifier 'KEYWORD_IS_NAME))
-                        (setq result (js2-string-to-keyword str)))
-               (if (and (< js2-language-version 170)
-                        (memq result '(js2-LET js2-YIELD)))
-                   ;; LET and YIELD are tokens only in 1.7 and later
-                   (setq result 'js2-NAME))
-               (when (eq result 'js2-RESERVED)
-                 (setf (js2-token-string token) str))
-               (throw 'return (js2-tt-code result))))
-           ;; If we want to intern these as Rhino does, just use (intern str)
-           (setf (js2-token-string token) str)
-           (throw 'return js2-NAME))    ; end identifier/kwd check
-         ;; is it a number?
-         (when (or (js2-digit-p c)
-                   (and (eq c ?.) (js2-digit-p (js2-peek-char))))
-           (setq js2-ts-string-buffer nil
-                 base 10)
-           (when (eq c ?0)
-             (setq c (js2-get-char))
-             (cond
-              ((or (eq c ?x) (eq c ?X))
-               (setq base 16)
-               (setq c (js2-get-char)))
-              ((and (or (eq c ?b) (eq c ?B))
-                    (>= js2-language-version 200))
-               (setq base 2)
-               (setq c (js2-get-char)))
-              ((and (or (eq c ?o) (eq c ?O))
-                    (>= js2-language-version 200))
-               (setq base 8)
-               (setq c (js2-get-char)))
-              ((js2-digit-p c)
-               (setq base 'maybe-8))
-              (t
-               (js2-add-to-string ?0))))
-           (cond
-            ((eq base 16)
-             (if (> 0 (js2-x-digit-to-int c 0))
-                 (js2-report-scan-error "msg.missing.hex.digits")
-               (while (<= 0 (js2-x-digit-to-int c 0))
-                 (js2-add-to-string c)
-                 (setq c (js2-get-char)))))
-            ((eq base 2)
-             (if (not (memq c '(?0 ?1)))
-                 (js2-report-scan-error "msg.missing.binary.digits")
-               (while (memq c '(?0 ?1))
-                 (js2-add-to-string c)
-                 (setq c (js2-get-char)))))
-            ((eq base 8)
-             (if (or (> ?0 c) (< ?7 c))
-                 (js2-report-scan-error "msg.missing.octal.digits")
-               (while (and (<= ?0 c) (>= ?7 c))
-                 (js2-add-to-string c)
-                 (setq c (js2-get-char)))))
-            (t
-             (while (and (<= ?0 c) (<= c ?9))
-               ;; We permit 08 and 09 as decimal numbers, which
-               ;; makes our behavior a superset of the ECMA
-               ;; numeric grammar.  We might not always be so
-               ;; permissive, so we warn about it.
-               (when (and (eq base 'maybe-8) (>= c ?8))
-                 (js2-report-warning "msg.bad.octal.literal"
-                                     (if (eq c ?8) "8" "9"))
-                 (setq base 10))
-               (js2-add-to-string c)
-               (setq c (js2-get-char)))
-             (when (eq base 'maybe-8)
-               (setq base 8))))
-           (when (and (eq base 10) (memq c '(?. ?e ?E)))
-             (when (eq c ?.)
-               (cl-loop do
-                        (js2-add-to-string c)
-                        (setq c (js2-get-char))
-                        while (js2-digit-p c)))
-             (when (memq c '(?e ?E))
-               (js2-add-to-string c)
-               (setq c (js2-get-char))
-               (when (memq c '(?+ ?-))
-                 (js2-add-to-string c)
-                 (setq c (js2-get-char)))
-               (unless (js2-digit-p c)
-                 (js2-report-scan-error "msg.missing.exponent" t))
-               (cl-loop do
-                        (js2-add-to-string c)
-                        (setq c (js2-get-char))
-                        while (js2-digit-p c))))
-           (js2-unget-char)
-           (let ((str (js2-set-string-from-buffer token)))
-             (setf (js2-token-number token)
-                   (js2-string-to-number str base)))
-           (throw 'return js2-NUMBER))
-         ;; is it a string?
-         (when (or (memq c '(?\" ?\'))
-                   (and (>= js2-language-version 200)
-                        (= c ?`)))
-           (throw 'return
-                  (js2-get-string-or-template-token c token)))
-         (js2-ts-return token
-                        (cl-case c
-                          (?\;
-                           (throw 'return js2-SEMI))
-                          (?\[
-                           (throw 'return js2-LB))
-                          (?\]
-                           (throw 'return js2-RB))
-                          (?{
-                           (throw 'return js2-LC))
-                          (?}
-                           (throw 'return js2-RC))
-                          (?\(
-                           (throw 'return js2-LP))
-                          (?\)
-                           (throw 'return js2-RP))
-                          (?,
-                           (throw 'return js2-COMMA))
-                          (??
-                           (throw 'return js2-HOOK))
-                          (?:
-                           (if (js2-match-char ?:)
-                               js2-COLONCOLON
-                             (throw 'return js2-COLON)))
-                          (?.
-                           (if (js2-match-char ?.)
-                               (if (js2-match-char ?.)
-                                   js2-TRIPLEDOT js2-DOTDOT)
-                             (if (js2-match-char ?\()
-                                 js2-DOTQUERY
-                               (throw 'return js2-DOT))))
-                          (?|
-                           (if (js2-match-char ?|)
-                               (throw 'return js2-OR)
-                             (if (js2-match-char ?=)
-                                 js2-ASSIGN_BITOR
-                               (throw 'return js2-BITOR))))
-                          (?^
-                           (if (js2-match-char ?=)
-                               js2-ASSIGN_BITOR
-                             (throw 'return js2-BITXOR)))
-                          (?&
-                           (if (js2-match-char ?&)
-                               (throw 'return js2-AND)
-                             (if (js2-match-char ?=)
-                                 js2-ASSIGN_BITAND
-                               (throw 'return js2-BITAND))))
-                          (?=
-                           (if (js2-match-char ?=)
-                               (if (js2-match-char ?=)
-                                   js2-SHEQ
-                                 (throw 'return js2-EQ))
-                             (if (js2-match-char ?>)
-                                 (js2-ts-return token js2-ARROW)
-                               (throw 'return js2-ASSIGN))))
-                          (?!
-                           (if (js2-match-char ?=)
-                               (if (js2-match-char ?=)
-                                   js2-SHNE
-                                 js2-NE)
-                             (throw 'return js2-NOT)))
-                          (?<
-                           ;; NB:treat HTML begin-comment as comment-till-eol
-                           (when (js2-match-char ?!)
-                             (when (js2-match-char ?-)
-                               (when (js2-match-char ?-)
-                                 (js2-skip-line)
-                                 (setf (js2-token-comment-type (js2-current-token)) 'html)
-                                 (throw 'return js2-COMMENT)))
-                             (js2-unget-char))
-                           (if (js2-match-char ?<)
-                               (if (js2-match-char ?=)
-                                   js2-ASSIGN_LSH
-                                 js2-LSH)
-                             (if (js2-match-char ?=)
-                                 js2-LE
-                               (throw 'return js2-LT))))
-                          (?>
-                           (if (js2-match-char ?>)
-                               (if (js2-match-char ?>)
-                                   (if (js2-match-char ?=)
-                                       js2-ASSIGN_URSH
-                                     js2-URSH)
-                                 (if (js2-match-char ?=)
-                                     js2-ASSIGN_RSH
-                                   js2-RSH))
-                             (if (js2-match-char ?=)
-                                 js2-GE
-                               (throw 'return js2-GT))))
-                          (?*
-                           (if (js2-match-char ?=)
-                               js2-ASSIGN_MUL
-                             (throw 'return js2-MUL)))
-                          (?/
-                           ;; is it a // comment?
-                           (when (js2-match-char ?/)
-                             (setf (js2-token-beg token) (- js2-ts-cursor 2))
-                             (js2-skip-line)
-                             (setf (js2-token-comment-type token) 'line)
-                             ;; include newline so highlighting goes to end of
-                             ;; window, if there actually is a newline; if we
-                             ;; hit eof, then implicitly there isn't
-                             (unless js2-ts-hit-eof
-                               (cl-incf (js2-token-end token)))
-                             (throw 'return js2-COMMENT))
-                           ;; is it a /* comment?
-                           (when (js2-match-char ?*)
-                             (setf look-for-slash nil
-                                   (js2-token-beg token) (- js2-ts-cursor 2)
-                                   (js2-token-comment-type token)
-                                   (if (js2-match-char ?*)
-                                       (progn
-                                         (setq look-for-slash t)
-                                         'jsdoc)
-                                     'block))
-                             (while t
-                               (setq c (js2-get-char))
-                               (cond
-                                ((eq c js2-EOF_CHAR)
-                                 (setf (js2-token-end token) (1- js2-ts-cursor))
-                                 (js2-report-error "msg.unterminated.comment")
-                                 (throw 'return js2-COMMENT))
-                                ((eq c ?*)
-                                 (setq look-for-slash t))
-                                ((eq c ?/)
-                                 (if look-for-slash
-                                     (js2-ts-return token js2-COMMENT)))
-                                (t
-                                 (setf look-for-slash nil
-                                       (js2-token-end token) js2-ts-cursor)))))
-                           (if (js2-match-char ?=)
-                               js2-ASSIGN_DIV
-                             (throw 'return js2-DIV)))
-                          (?#
-                           (when js2-skip-preprocessor-directives
-                             (js2-skip-line)
-                             (setf (js2-token-comment-type token) 'preprocessor
-                                   (js2-token-end token) js2-ts-cursor)
-                             (throw 'return js2-COMMENT))
-                           (throw 'return js2-ERROR))
-                          (?%
-                           (if (js2-match-char ?=)
-                               js2-ASSIGN_MOD
-                             (throw 'return js2-MOD)))
-                          (?~
-                           (throw 'return js2-BITNOT))
-                          (?+
-                           (if (js2-match-char ?=)
-                               js2-ASSIGN_ADD
-                             (if (js2-match-char ?+)
-                                 js2-INC
-                               (throw 'return js2-ADD))))
-                          (?-
-                           (cond
-                            ((js2-match-char ?=)
-                             (setq c js2-ASSIGN_SUB))
-                            ((js2-match-char ?-)
-                             (unless js2-ts-dirty-line
-                               ;; treat HTML end-comment after possible whitespace
-                               ;; after line start as comment-until-eol
-                               (when (js2-match-char ?>)
-                                 (js2-skip-line)
-                                 (setf (js2-token-comment-type (js2-current-token)) 'html)
-                                 (throw 'return js2-COMMENT)))
-                             (setq c js2-DEC))
-                            (t
-                             (setq c js2-SUB)))
-                           (setq js2-ts-dirty-line t)
-                           c)
-                          (otherwise
-                           (js2-report-scan-error "msg.illegal.character")))))))
-    (setf (js2-token-type token) tt)
-    token))
-
-(defun js2-get-string-or-template-token (quote-char token)
-  ;; We attempt to accumulate a string the fast way, by
-  ;; building it directly out of the reader.  But if there
-  ;; are any escaped characters in the string, we revert to
-  ;; building it out of a string buffer.
-  (let ((c (js2-get-char))
-        js2-ts-string-buffer
-        nc c1 val escape-val)
-    (catch 'break
-      (while (/= c quote-char)
-        (catch 'continue
-          (when (eq c js2-EOF_CHAR)
-            (js2-unget-char)
-            (js2-report-error "msg.unterminated.string.lit")
-            (throw 'break nil))
-          (when (and (eq c ?\n) (not (eq quote-char ?`)))
-            (js2-unget-char)
-            (js2-report-error "msg.unterminated.string.lit")
-            (throw 'break nil))
-          (when (eq c ?\\)
-            ;; We've hit an escaped character
-            (setq c (js2-get-char))
-            (cl-case c
-              (?b (setq c ?\b))
-              (?f (setq c ?\f))
-              (?n (setq c ?\n))
-              (?r (setq c ?\r))
-              (?t (setq c ?\t))
-              (?v (setq c ?\v))
-              (?u
-               (setq c1 (js2-read-unicode-escape))
-               (if js2-parse-ide-mode
-                   (if c1
-                       (progn
-                         ;; just copy the string in IDE-mode
-                         (js2-add-to-string ?\\)
-                         (js2-add-to-string ?u)
-                         (dotimes (_ 3)
-                           (js2-add-to-string (js2-get-char)))
-                         (setq c (js2-get-char))) ; added at end of loop
-                     ;; flag it as an invalid escape
-                     (js2-report-warning "msg.invalid.escape"
-                                         nil (- js2-ts-cursor 2) 6))
-                 ;; Get 4 hex digits; if the u escape is not
-                 ;; followed by 4 hex digits, use 'u' + the
-                 ;; literal character sequence that follows.
-                 (js2-add-to-string ?u)
-                 (setq escape-val 0)
-                 (dotimes (_ 4)
-                   (setq c (js2-get-char)
-                         escape-val (js2-x-digit-to-int c escape-val))
-                   (if (cl-minusp escape-val)
-                       (throw 'continue nil))
-                   (js2-add-to-string c))
-                 ;; prepare for replace of stored 'u' sequence by escape value
-                 (setq js2-ts-string-buffer (nthcdr 5 js2-ts-string-buffer)
-                       c escape-val)))
-              (?x
-               ;; Get 2 hex digits, defaulting to 'x'+literal
-               ;; sequence, as above.
-               (setq c (js2-get-char)
-                     escape-val (js2-x-digit-to-int c 0))
-               (if (cl-minusp escape-val)
-                   (progn
-                     (js2-add-to-string ?x)
-                     (throw 'continue nil))
-                 (setq c1 c
-                       c (js2-get-char)
-                       escape-val (js2-x-digit-to-int c escape-val))
-                 (if (cl-minusp escape-val)
-                     (progn
-                       (js2-add-to-string ?x)
-                       (js2-add-to-string c1)
-                       (throw 'continue nil))
-                   ;; got 2 hex digits
-                   (setq c escape-val))))
-              (?\n
-               ;; Remove line terminator after escape to follow
-               ;; SpiderMonkey and C/C++
-               (setq c (js2-get-char))
-               (throw 'continue nil))
-              (t
-               (when (and (<= ?0 c) (< c ?8))
-                 (setq val (- c ?0)
-                       c (js2-get-char))
-                 (when (and (<= ?0 c) (< c ?8))
-                   (setq val (- (+ (* 8 val) c) ?0)
-                         c (js2-get-char))
-                   (when (and (<= ?0 c)
-                              (< c ?8)
-                              (< val #o37))
-                     ;; c is 3rd char of octal sequence only
-                     ;; if the resulting val <= 0377
-                     (setq val (- (+ (* 8 val) c) ?0)
-                           c (js2-get-char))))
-                 (js2-unget-char)
-                 (setq c val)))))
-          (when (and (eq quote-char ?`) (eq c ?$))
-            (when (eq (setq nc (js2-get-char)) ?\{)
-              (throw 'break nil))
-            (js2-unget-char))
-          (js2-add-to-string c)
-          (setq c (js2-get-char)))))
-    (js2-set-string-from-buffer token)
-    (if (not (eq quote-char ?`))
-        js2-STRING
-      (if (and (eq c ?$) (eq nc ?\{))
-          js2-TEMPLATE_HEAD
-        js2-NO_SUBS_TEMPLATE))))
-
-(defun js2-read-regexp (start-tt)
-  "Called by parser when it gets / or /= in literal context."
-  (let (c err
-        in-class  ; inside a '[' .. ']' character-class
-        flags
-        (continue t)
-        (token (js2-new-token 0)))
-    (setq js2-ts-string-buffer nil)
-    (if (eq start-tt js2-ASSIGN_DIV)
-        ;; mis-scanned /=
-        (js2-add-to-string ?=)
-      (if (not (eq start-tt js2-DIV))
-          (error "failed assertion")))
-    (while (and (not err)
-                (or (/= (setq c (js2-get-char)) ?/)
-                    in-class))
-      (cond
-       ((or (= c ?\n)
-            (= c js2-EOF_CHAR))
-        (setf (js2-token-end token) (1- js2-ts-cursor)
-              err t
-              (js2-token-string token) (js2-collect-string js2-ts-string-buffer))
-        (js2-report-error "msg.unterminated.re.lit"))
-       (t (cond
-           ((= c ?\\)
-            (js2-add-to-string c)
-            (setq c (js2-get-char)))
-           ((= c ?\[)
-            (setq in-class t))
-           ((= c ?\])
-            (setq in-class nil)))
-          (js2-add-to-string c))))
-    (unless err
-      (while continue
-        (cond
-         ((js2-match-char ?g)
-          (push ?g flags))
-         ((js2-match-char ?i)
-          (push ?i flags))
-         ((js2-match-char ?m)
-          (push ?m flags))
-         ((and (js2-match-char ?u)
-               (>= js2-language-version 200))
-          (push ?u flags))
-         ((and (js2-match-char ?y)
-               (>= js2-language-version 200))
-          (push ?y flags))
-         (t
-          (setq continue nil))))
-      (if (js2-alpha-p (js2-peek-char))
-          (js2-report-scan-error "msg.invalid.re.flag" t
-                                 js2-ts-cursor 1))
-      (js2-set-string-from-buffer token))
-    (js2-collect-string flags)))
-
-(defun js2-get-first-xml-token ()
-  (setq js2-ts-xml-open-tags-count 0
-        js2-ts-is-xml-attribute nil
-        js2-ts-xml-is-tag-content nil)
-  (js2-unget-char)
-  (js2-get-next-xml-token))
-
-(defun js2-xml-discard-string (token)
-  "Throw away the string in progress and flag an XML parse error."
-  (setf js2-ts-string-buffer nil
-        (js2-token-string token) nil)
-  (js2-report-scan-error "msg.XML.bad.form" t))
-
-(defun js2-get-next-xml-token ()
-  (setq js2-ts-string-buffer nil)  ; for recording the XML
-  (let ((token (js2-new-token 0))
-        c result)
-    (setq result
-          (catch 'return
-            (while t
-              (setq c (js2-get-char))
-              (cond
-               ((= c js2-EOF_CHAR)
-                (throw 'return js2-ERROR))
-               (js2-ts-xml-is-tag-content
-                (cl-case c
-                  (?>
-                   (js2-add-to-string c)
-                   (setq js2-ts-xml-is-tag-content nil
-                         js2-ts-is-xml-attribute nil))
-                  (?/
-                   (js2-add-to-string c)
-                   (when (eq ?> (js2-peek-char))
-                     (setq c (js2-get-char))
-                     (js2-add-to-string c)
-                     (setq js2-ts-xml-is-tag-content nil)
-                     (cl-decf js2-ts-xml-open-tags-count)))
-                  (?{
-                   (js2-unget-char)
-                   (js2-set-string-from-buffer token)
-                   (throw 'return js2-XML))
-                  ((?\' ?\")
-                   (js2-add-to-string c)
-                   (unless (js2-read-quoted-string c token)
-                     (throw 'return js2-ERROR)))
-                  (?=
-                   (js2-add-to-string c)
-                   (setq js2-ts-is-xml-attribute t))
-                  ((? ?\t ?\r ?\n)
-                   (js2-add-to-string c))
-                  (t
-                   (js2-add-to-string c)
-                   (setq js2-ts-is-xml-attribute nil)))
-                (when (and (not js2-ts-xml-is-tag-content)
-                           (zerop js2-ts-xml-open-tags-count))
-                  (js2-set-string-from-buffer token)
-                  (throw 'return js2-XMLEND)))
-               (t
-                ;; else not tag content
-                (cl-case c
-                  (?<
-                   (js2-add-to-string c)
-                   (setq c (js2-peek-char))
-                   (cl-case c
-                     (?!
-                      (setq c (js2-get-char)) ;; skip !
-                      (js2-add-to-string c)
-                      (setq c (js2-peek-char))
-                      (cl-case c
-                        (?-
-                         (setq c (js2-get-char)) ;; skip -
-                         (js2-add-to-string c)
-                         (if (eq c ?-)
-                             (progn
-                               (js2-add-to-string c)
-                               (unless (js2-read-xml-comment token)
-                                 (throw 'return js2-ERROR)))
-                           (js2-xml-discard-string token)
-                           (throw 'return js2-ERROR)))
-                        (?\[
-                         (setq c (js2-get-char)) ;; skip [
-                         (js2-add-to-string c)
-                         (if (and (= (js2-get-char) ?C)
-                                  (= (js2-get-char) ?D)
-                                  (= (js2-get-char) ?A)
-                                  (= (js2-get-char) ?T)
-                                  (= (js2-get-char) ?A)
-                                  (= (js2-get-char) ?\[))
-                             (progn
-                               (js2-add-to-string ?C)
-                               (js2-add-to-string ?D)
-                               (js2-add-to-string ?A)
-                               (js2-add-to-string ?T)
-                               (js2-add-to-string ?A)
-                               (js2-add-to-string ?\[)
-                               (unless (js2-read-cdata token)
-                                 (throw 'return js2-ERROR)))
-                           (js2-xml-discard-string token)
-                           (throw 'return js2-ERROR)))
-                        (t
-                         (unless (js2-read-entity token)
-                           (throw 'return js2-ERROR))))
-                      ;; Allow bare CDATA section, e.g.:
-                      ;;   let xml = <![CDATA[ foo bar baz ]]>;
-                      (when (zerop js2-ts-xml-open-tags-count)
-                        (throw 'return js2-XMLEND)))
-                     (??
-                      (setq c (js2-get-char)) ;; skip ?
-                      (js2-add-to-string c)
-                      (unless (js2-read-PI token)
-                        (throw 'return js2-ERROR)))
-                     (?/
-                      ;; end tag
-                      (setq c (js2-get-char)) ;; skip /
-                      (js2-add-to-string c)
-                      (when (zerop js2-ts-xml-open-tags-count)
-                        (js2-xml-discard-string token)
-                        (throw 'return js2-ERROR))
-                      (setq js2-ts-xml-is-tag-content t)
-                      (cl-decf js2-ts-xml-open-tags-count))
-                     (t
-                      ;; start tag
-                      (setq js2-ts-xml-is-tag-content t)
-                      (cl-incf js2-ts-xml-open-tags-count))))
-                  (?{
-                   (js2-unget-char)
-                   (js2-set-string-from-buffer token)
-                   (throw 'return js2-XML))
-                  (t
-                   (js2-add-to-string c))))))))
-    (setf (js2-token-end token) js2-ts-cursor)
-    (setf (js2-token-type token) result)
-    result))
-
-(defun js2-read-quoted-string (quote token)
-  (let (c)
-    (catch 'return
-      (while (/= (setq c (js2-get-char)) js2-EOF_CHAR)
-        (js2-add-to-string c)
-        (if (eq c quote)
-            (throw 'return t)))
-      (js2-xml-discard-string token)  ;; throw away string in progress
-      nil)))
-
-(defun js2-read-xml-comment (token)
-  (let ((c (js2-get-char)))
-    (catch 'return
-      (while (/= c js2-EOF_CHAR)
-        (catch 'continue
-          (js2-add-to-string c)
-          (when (and (eq c ?-) (eq ?- (js2-peek-char)))
-            (setq c (js2-get-char))
-            (js2-add-to-string c)
-            (if (eq (js2-peek-char) ?>)
-                (progn
-                  (setq c (js2-get-char)) ;; skip >
-                  (js2-add-to-string c)
-                  (throw 'return t))
-              (throw 'continue nil)))
-          (setq c (js2-get-char))))
-      (js2-xml-discard-string token)
-      nil)))
-
-(defun js2-read-cdata (token)
-  (let ((c (js2-get-char)))
-    (catch 'return
-      (while (/= c js2-EOF_CHAR)
-        (catch 'continue
-          (js2-add-to-string c)
-          (when (and (eq c ?\]) (eq (js2-peek-char) ?\]))
-            (setq c (js2-get-char))
-            (js2-add-to-string c)
-            (if (eq (js2-peek-char) ?>)
-                (progn
-                  (setq c (js2-get-char)) ;; Skip >
-                  (js2-add-to-string c)
-                  (throw 'return t))
-              (throw 'continue nil)))
-          (setq c (js2-get-char))))
-      (js2-xml-discard-string token)
-      nil)))
-
-(defun js2-read-entity (token)
-  (let ((decl-tags 1)
-        c)
-    (catch 'return
-      (while (/= js2-EOF_CHAR (setq c (js2-get-char)))
-        (js2-add-to-string c)
-        (cl-case c
-          (?<
-           (cl-incf decl-tags))
-          (?>
-           (cl-decf decl-tags)
-           (if (zerop decl-tags)
-               (throw 'return t)))))
-      (js2-xml-discard-string token)
-      nil)))
-
-(defun js2-read-PI (token)
-  "Scan an XML processing instruction."
-  (let (c)
-    (catch 'return
-      (while (/= js2-EOF_CHAR (setq c (js2-get-char)))
-        (js2-add-to-string c)
-        (when (and (eq c ??) (eq (js2-peek-char) ?>))
-          (setq c (js2-get-char))  ;; Skip >
-          (js2-add-to-string c)
-          (throw 'return t)))
-      (js2-xml-discard-string token)
-      nil)))
-
-;;; Highlighting
-
-(defun js2-set-face (beg end face &optional record)
-  "Fontify a region.  If RECORD is non-nil, record for later."
-  (when (cl-plusp js2-highlight-level)
-    (setq beg (min (point-max) beg)
-          beg (max (point-min) beg)
-          end (min (point-max) end)
-          end (max (point-min) end))
-    (if record
-        (push (list beg end face) js2-mode-fontifications)
-      (put-text-property beg end 'font-lock-face face))))
-
-(defsubst js2-clear-face (beg end)
-  (remove-text-properties beg end '(font-lock-face nil
-                                    help-echo nil
-                                    point-entered nil
-                                    cursor-sensor-functions nil
-                                    c-in-sws nil)))
-
-(defconst js2-ecma-global-props
-  (concat "^"
-          (regexp-opt
-           '("Infinity" "NaN" "undefined" "arguments") t)
-          "$")
-  "Value properties of the Ecma-262 Global Object.
-Shown at or above `js2-highlight-level' 2.")
-
-;; might want to add the name "arguments" to this list?
-(defconst js2-ecma-object-props
-  (concat "^"
-          (regexp-opt
-           '("prototype" "__proto__" "__parent__") t)
-          "$")
-  "Value properties of the Ecma-262 Object constructor.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-global-funcs
-  (concat
-   "^"
-   (regexp-opt
-    '("decodeURI" "decodeURIComponent" "encodeURI" "encodeURIComponent"
-      "eval" "isFinite" "isNaN" "parseFloat" "parseInt") t)
-   "$")
-  "Function properties of the Ecma-262 Global object.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-number-props
-  (concat "^"
-          (regexp-opt '("MAX_VALUE" "MIN_VALUE" "NaN"
-                        "NEGATIVE_INFINITY"
-                        "POSITIVE_INFINITY") t)
-          "$")
-  "Properties of the Ecma-262 Number constructor.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-date-props "^\\(parse\\|UTC\\)$"
-  "Properties of the Ecma-262 Date constructor.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-math-props
-  (concat "^"
-          (regexp-opt
-           '("E" "LN10" "LN2" "LOG2E" "LOG10E" "PI" "SQRT1_2" "SQRT2")
-           t)
-          "$")
-  "Properties of the Ecma-262 Math object.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-math-funcs
-  (concat "^"
-          (regexp-opt
-           '("abs" "acos" "asin" "atan" "atan2" "ceil" "cos" "exp" "floor"
-             "log" "max" "min" "pow" "random" "round" "sin" "sqrt" "tan") t)
-          "$")
-  "Function properties of the Ecma-262 Math object.
-Shown at or above `js2-highlight-level' 2.")
-
-(defconst js2-ecma-function-props
-  (concat
-   "^"
-   (regexp-opt
-    '(;; properties of the Object prototype object
-      "hasOwnProperty" "isPrototypeOf" "propertyIsEnumerable"
-      "toLocaleString" "toString" "valueOf"
-      ;; properties of the Function prototype object
-      "apply" "call"
-      ;; properties of the Array prototype object
-      "concat" "join" "pop" "push" "reverse" "shift" "slice" "sort"
-      "splice" "unshift"
-      ;; properties of the String prototype object
-      "charAt" "charCodeAt" "fromCharCode" "indexOf" "lastIndexOf"
-      "localeCompare" "match" "replace" "search" "split" "substring"
-      "toLocaleLowerCase" "toLocaleUpperCase" "toLowerCase"
-      "toUpperCase"
-      ;; properties of the Number prototype object
-      "toExponential" "toFixed" "toPrecision"
-      ;; properties of the Date prototype object
-      "getDate" "getDay" "getFullYear" "getHours" "getMilliseconds"
-      "getMinutes" "getMonth" "getSeconds" "getTime"
-      "getTimezoneOffset" "getUTCDate" "getUTCDay" "getUTCFullYear"
-      "getUTCHours" "getUTCMilliseconds" "getUTCMinutes" "getUTCMonth"
-      "getUTCSeconds" "setDate" "setFullYear" "setHours"
-      "setMilliseconds" "setMinutes" "setMonth" "setSeconds" "setTime"
-      "setUTCDate" "setUTCFullYear" "setUTCHours" "setUTCMilliseconds"
-      "setUTCMinutes" "setUTCMonth" "setUTCSeconds" "toDateString"
-      "toLocaleDateString" "toLocaleString" "toLocaleTimeString"
-      "toTimeString" "toUTCString"
-      ;; properties of the RegExp prototype object
-      "exec" "test"
-      ;; properties of the JSON prototype object
-      "parse" "stringify"
-      ;; SpiderMonkey/Rhino extensions, versions 1.5+
-      "toSource" "__defineGetter__" "__defineSetter__"
-      "__lookupGetter__" "__lookupSetter__" "__noSuchMethod__"
-      "every" "filter" "forEach" "lastIndexOf" "map" "some")
-    t)
-   "$")
-  "Built-in functions defined by Ecma-262 and SpiderMonkey extensions.
-Shown at or above `js2-highlight-level' 3.")
-
-(defun js2-parse-highlight-prop-get (parent target prop call-p)
-  (let ((target-name (and target
-                          (js2-name-node-p target)
-                          (js2-name-node-name target)))
-        (prop-name (if prop (js2-name-node-name prop)))
-        (level2 (>= js2-highlight-level 2))
-        (level3 (>= js2-highlight-level 3)))
-    (when level2
-      (let ((face
-             (if call-p
-                 (cond
-                  ((and target prop)
-                   (cond
-                    ((and level3 (string-match js2-ecma-function-props prop-name))
-                     'font-lock-builtin-face)
-                    ((and target-name prop)
-                     (cond
-                      ((string= target-name "Date")
-                       (if (string-match js2-ecma-date-props prop-name)
-                           'font-lock-builtin-face))
-                      ((string= target-name "Math")
-                       (if (string-match js2-ecma-math-funcs prop-name)
-                           'font-lock-builtin-face))))))
-                  (prop
-                   (if (string-match js2-ecma-global-funcs prop-name)
-                       'font-lock-builtin-face)))
-               (cond
-                ((and target prop)
-                 (cond
-                  ((string= target-name "Number")
-                   (if (string-match js2-ecma-number-props prop-name)
-                       'font-lock-constant-face))
-                  ((string= target-name "Math")
-                   (if (string-match js2-ecma-math-props prop-name)
-                       'font-lock-constant-face))))
-                (prop
-                 (if (string-match js2-ecma-object-props prop-name)
-                     'font-lock-constant-face))))))
-        (when face
-          (let ((pos (+ (js2-node-pos parent)  ; absolute
-                        (js2-node-pos prop)))) ; relative
-            (js2-set-face pos
-                          (+ pos (js2-node-len prop))
-                          face 'record)))))))
-
-(defun js2-parse-highlight-member-expr-node (node)
-  "Perform syntax highlighting of EcmaScript built-in properties.
-The variable `js2-highlight-level' governs this highlighting."
-  (let (face target prop name pos end parent call-p callee)
-    (cond
-     ;; case 1:  simple name, e.g. foo
-     ((js2-name-node-p node)
-      (setq name (js2-name-node-name node))
-      ;; possible for name to be nil in rare cases - saw it when
-      ;; running js2-mode on an elisp buffer.  Might as well try to
-      ;; make it so js2-mode never barfs.
-      (when name
-        (setq face (if (string-match js2-ecma-global-props name)
-                       'font-lock-constant-face))
-        (when face
-          (setq pos (js2-node-pos node)
-                end (+ pos (js2-node-len node)))
-          (js2-set-face pos end face 'record))))
-     ;; case 2:  property access or function call
-     ((or (js2-prop-get-node-p node)
-          ;; highlight function call if expr is a prop-get node
-          ;; or a plain name (i.e. unqualified function call)
-          (and (setq call-p (js2-call-node-p node))
-               (setq callee (js2-call-node-target node)) ; separate setq!
-               (or (js2-prop-get-node-p callee)
-                   (js2-name-node-p callee))))
-      (setq parent node
-            node (if call-p callee node))
-      (if (and call-p (js2-name-node-p callee))
-          (setq prop callee)
-        (setq target (js2-prop-get-node-left node)
-              prop (js2-prop-get-node-right node)))
-      (cond
-       ((js2-name-node-p prop)
-        ;; case 2(a&c):  simple or complex target, simple name, e.g. x[y].bar
-        (js2-parse-highlight-prop-get parent target prop call-p))
-       ((js2-name-node-p target)
-        ;; case 2b:  simple target, complex name, e.g. foo.x[y]
-        (js2-parse-highlight-prop-get parent target nil call-p)))))))
-
-(defun js2-parse-highlight-member-expr-fn-name (expr)
-  "Highlight the `baz' in function foo.bar.baz(args) {...}.
-This is experimental Rhino syntax.  EXPR is the foo.bar.baz member expr.
-We currently only handle the case where the last component is a prop-get
-of a simple name.  Called before EXPR has a parent node."
-  (let (pos
-        (name (and (js2-prop-get-node-p expr)
-                   (js2-prop-get-node-right expr))))
-    (when (js2-name-node-p name)
-      (js2-set-face (setq pos (+ (js2-node-pos expr)  ; parent is absolute
-                                 (js2-node-pos name)))
-                    (+ pos (js2-node-len name))
-                    'font-lock-function-name-face
-                    'record))))
-
-;; source:  http://jsdoc.sourceforge.net/
-;; Note - this syntax is for Google's enhanced jsdoc parser that
-;; allows type specifications, and needs work before entering the wild.
-
-(defconst js2-jsdoc-param-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@"
-          "\\(?:param\\|argument\\)"
-          "\\)"
-          "\\s-*\\({[^}]+}\\)?"         ; optional type
-          "\\s-*\\[?\\([[:alnum:]_$\.]+\\)?\\]?"  ; name
-          "\\>")
-  "Matches jsdoc tags with optional type and optional param name.")
-
-(defconst js2-jsdoc-typed-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
-          (regexp-opt
-           '("enum"
-             "extends"
-             "field"
-             "id"
-             "implements"
-             "lends"
-             "mods"
-             "requires"
-             "return"
-             "returns"
-             "throw"
-             "throws"))
-          "\\)\\)\\s-*\\({[^}]+}\\)?")
-  "Matches jsdoc tags with optional type.")
-
-(defconst js2-jsdoc-arg-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
-          (regexp-opt
-           '("alias"
-             "augments"
-             "borrows"
-             "bug"
-             "base"
-             "config"
-             "default"
-             "define"
-             "exception"
-             "function"
-             "member"
-             "memberOf"
-             "name"
-             "namespace"
-             "property"
-             "since"
-             "suppress"
-             "this"
-             "throws"
-             "type"
-             "version"))
-          "\\)\\)\\s-+\\([^ \t]+\\)")
-  "Matches jsdoc tags with a single argument.")
-
-(defconst js2-jsdoc-empty-tag-regexp
-  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
-          (regexp-opt
-           '("addon"
-             "author"
-             "class"
-             "const"
-             "constant"
-             "constructor"
-             "constructs"
-             "deprecated"
-             "desc"
-             "description"
-             "event"
-             "example"
-             "exec"
-             "export"
-             "fileoverview"
-             "final"
-             "function"
-             "hidden"
-             "ignore"
-             "implicitCast"
-             "inheritDoc"
-             "inner"
-             "interface"
-             "license"
-             "noalias"
-             "noshadow"
-             "notypecheck"
-             "override"
-             "owner"
-             "preserve"
-             "preserveTry"
-             "private"
-             "protected"
-             "public"
-             "static"
-             "supported"
-             ))
-          "\\)\\)\\s-*")
-  "Matches empty jsdoc tags.")
-
-(defconst js2-jsdoc-link-tag-regexp
-  "{\\(@\\(?:link\\|code\\)\\)\\s-+\\([^#}\n]+\\)\\(#.+\\)?}"
-  "Matches a jsdoc link or code tag.")
-
-(defconst js2-jsdoc-see-tag-regexp
-  "^\\s-*\\*+\\s-*\\(@see\\)\\s-+\\([^#}\n]+\\)\\(#.+\\)?"
-  "Matches a jsdoc @see tag.")
-
-(defconst js2-jsdoc-html-tag-regexp
-  "\\(</?\\)\\([[:alpha:]]+\\)\\s-*\\(/?>\\)"
-  "Matches a simple (no attributes) html start- or end-tag.")
-
-(defun js2-jsdoc-highlight-helper ()
-  (js2-set-face (match-beginning 1)
-                (match-end 1)
-                'js2-jsdoc-tag)
-  (if (match-beginning 2)
-      (if (save-excursion
-            (goto-char (match-beginning 2))
-            (= (char-after) ?{))
-          (js2-set-face (1+ (match-beginning 2))
-                        (1- (match-end 2))
-                        'js2-jsdoc-type)
-        (js2-set-face (match-beginning 2)
-                      (match-end 2)
-                      'js2-jsdoc-value)))
-  (if (match-beginning 3)
-      (js2-set-face (match-beginning 3)
-                    (match-end 3)
-                    'js2-jsdoc-value)))
-
-(defun js2-highlight-jsdoc (ast)
-  "Highlight doc comment tags."
-  (let ((comments (js2-ast-root-comments ast))
-        beg end)
-    (save-excursion
-      (dolist (node comments)
-        (when (eq (js2-comment-node-format node) 'jsdoc)
-          (setq beg (js2-node-abs-pos node)
-                end (+ beg (js2-node-len node)))
-          (save-restriction
-            (narrow-to-region beg end)
-            (dolist (re (list js2-jsdoc-param-tag-regexp
-                              js2-jsdoc-typed-tag-regexp
-                              js2-jsdoc-arg-tag-regexp
-                              js2-jsdoc-link-tag-regexp
-                              js2-jsdoc-see-tag-regexp
-                              js2-jsdoc-empty-tag-regexp))
-              (goto-char beg)
-              (while (re-search-forward re nil t)
-                (js2-jsdoc-highlight-helper)))
-            ;; simple highlighting for html tags
-            (goto-char beg)
-            (while (re-search-forward js2-jsdoc-html-tag-regexp nil t)
-              (js2-set-face (match-beginning 1)
-                            (match-end 1)
-                            'js2-jsdoc-html-tag-delimiter)
-              (js2-set-face (match-beginning 2)
-                            (match-end 2)
-                            'js2-jsdoc-html-tag-name)
-              (js2-set-face (match-beginning 3)
-                            (match-end 3)
-                            'js2-jsdoc-html-tag-delimiter))))))))
-
-(defun js2-highlight-assign-targets (_node left right)
-  "Highlight function properties and external variables."
-  (let (leftpos name)
-    ;; highlight vars and props assigned function values
-    (when (or (js2-function-node-p right)
-              (js2-class-node-p right))
-      (cond
-       ;; var foo = function() {...}
-       ((js2-name-node-p left)
-        (setq name left))
-       ;; foo.bar.baz = function() {...}
-       ((and (js2-prop-get-node-p left)
-             (js2-name-node-p (js2-prop-get-node-right left)))
-        (setq name (js2-prop-get-node-right left))))
-      (when name
-        (js2-set-face (setq leftpos (js2-node-abs-pos name))
-                      (+ leftpos (js2-node-len name))
-                      'font-lock-function-name-face
-                      'record)))))
-
-(defun js2-record-name-node (node)
-  "Saves NODE to `js2-recorded-identifiers' to check for undeclared variables
-later. NODE must be a name node."
-  (let ((leftpos (js2-node-abs-pos node)))
-    (push (list node js2-current-scope
-                leftpos
-                (+ leftpos (js2-node-len node)))
-          js2-recorded-identifiers)))
-
-(defun js2-highlight-undeclared-vars ()
-  "After entire parse is finished, look for undeclared variable references.
-We have to wait until entire buffer is parsed, since JavaScript permits var
-decls to occur after they're used.
-
-If any undeclared var name is in `js2-externs' or `js2-additional-externs',
-it is considered declared."
-  (let (name)
-    (dolist (entry js2-recorded-identifiers)
-      (cl-destructuring-bind (name-node scope pos end) entry
-        (setq name (js2-name-node-name name-node))
-        (unless (or (member name js2-global-externs)
-                    (member name js2-default-externs)
-                    (member name js2-additional-externs)
-                    (js2-get-defining-scope scope name pos))
-          (js2-report-warning "msg.undeclared.variable" name pos (- end pos)
-                              'js2-external-variable))))))
-
-(defun js2--add-or-update-symbol (symbol inition used vars)
-  "Add or update SYMBOL entry in VARS, an hash table.
-SYMBOL is a js2-name-node, INITION either nil, t, or ?P,
-respectively meaning that SYMBOL is a mere declaration, an
-assignment or a function parameter; when USED is t, the symbol
-node is assumed to be an usage and thus added to the list stored
-in the cdr of the entry.
-"
-  (let* ((nm (js2-name-node-name symbol))
-         (es (js2-node-get-enclosing-scope symbol))
-         (ds (js2-get-defining-scope es nm)))
-    (when (and ds (not (equal nm "arguments")))
-      (let* ((sym (js2-scope-get-symbol ds nm))
-             (var (gethash sym vars))
-             (err-var-p (js2-catch-node-p ds)))
-        (unless inition
-          (setq inition err-var-p))
-        (if var
-            (progn
-              (when (and inition (not (equal (car var) ?P)))
-                (setcar var inition))
-              (when used
-                (push symbol (cdr var))))
-          ;; do not consider the declaration of catch parameter as an usage
-          (when (and err-var-p used)
-            (setq used nil))
-          (puthash sym (cons inition (if used (list symbol))) vars))))))
-
-(defun js2--classify-variables ()
-  "Collect and classify variables declared or used within js2-mode-ast.
-Traverse the whole ast tree returning a summary of the variables
-usage as an hash-table, keyed by their corresponding symbol table
-entry.
-Each variable is described by a tuple where the car is a flag
-indicating whether the variable has been initialized and the cdr
-is a possibly empty list of name nodes where it is used. External
-symbols, i.e. those not present in the whole scopes hierarchy,
-are ignored."
-  (let ((vars (make-hash-table :test #'eq :size 100)))
-    (js2-visit-ast
-     js2-mode-ast
-     (lambda (node end-p)
-       (when (null end-p)
-         (cond
-          ((js2-var-init-node-p node)
-           ;; take note about possibly initialized declarations
-           (let ((target (js2-var-init-node-target node))
-                 (initializer (js2-var-init-node-initializer node)))
-             (when target
-               (let* ((parent (js2-node-parent node))
-                      (grandparent (if parent (js2-node-parent parent)))
-                      (inited (not (null initializer))))
-                 (unless inited
-                   (setq inited
-                         (and grandparent
-                              (js2-for-in-node-p grandparent)
-                              (memq target
-                                    (mapcar #'js2-var-init-node-target
-                                            (js2-var-decl-node-kids
-                                             (js2-for-in-node-iterator grandparent)))))))
-                 (js2--add-or-update-symbol target inited nil vars)))))
-
-          ((js2-assign-node-p node)
-           ;; take note about assignments
-           (let ((left (js2-assign-node-left node)))
-             (when (js2-name-node-p left)
-               (js2--add-or-update-symbol left t nil vars))))
-
-          ((js2-prop-get-node-p node)
-           ;; handle x.y.z nodes, considering only x
-           (let ((left (js2-prop-get-node-left node)))
-             (when (js2-name-node-p left)
-               (js2--add-or-update-symbol left nil t vars))))
-
-          ((js2-name-node-p node)
-           ;; take note about used variables
-           (let ((parent (js2-node-parent node)))
-             (when parent
-               (unless (or (and (js2-var-init-node-p parent) ; handled above
-                                (eq node (js2-var-init-node-target parent)))
-                           (and (js2-assign-node-p parent)
-                                (eq node (js2-assign-node-left parent)))
-                           (js2-prop-get-node-p parent))
-                 (let ((used t) inited)
-                   (cond
-                    ((and (js2-function-node-p parent)
-                          (js2-wrapper-function-p parent))
-                     (setq inited (if (memq node (js2-function-node-params parent)) ?P t)))
-
-                    ((js2-for-in-node-p parent)
-                     (if (eq node (js2-for-in-node-iterator parent))
-                         (setq inited t used nil)))
-
-                    ((js2-function-node-p parent)
-                     (setq inited (if (memq node (js2-function-node-params parent)) ?P t)
-                           used nil)))
-
-                   (unless used
-                     (let ((grandparent (js2-node-parent parent)))
-                       (when grandparent
-                         (setq used (js2-return-node-p grandparent)))))
-
-                   (js2--add-or-update-symbol node inited used vars))))))))
-       t))
-    vars))
-
-(defun js2--get-name-node (node)
-  (cond
-   ((js2-name-node-p node) node)
-   ((js2-function-node-p node)
-    (js2-function-node-name node))
-   ((js2-class-node-p node)
-    (js2-class-node-name node))
-   ((js2-comp-loop-node-p node)
-    (js2-comp-loop-node-iterator node))
-   (t node)))
-
-(defun js2--highlight-unused-variable (symbol info)
-  (let ((name (js2-symbol-name symbol))
-        (inited (car info))
-        (refs (cdr info))
-        pos len)
-    (unless (and inited refs)
-      (if refs
-          (dolist (ref refs)
-            (setq pos (js2-node-abs-pos ref))
-            (setq len (js2-name-node-len ref))
-            (js2-report-warning "msg.uninitialized.variable" name pos len
-                                'js2-warning))
-        (when (or js2-warn-about-unused-function-arguments
-                  (not (eq inited ?P)))
-          (let* ((symn (js2-symbol-ast-node symbol))
-                 (namen (js2--get-name-node symn)))
-            (unless (js2-node-top-level-decl-p namen)
-              (setq pos (js2-node-abs-pos namen))
-              (setq len (js2-name-node-len namen))
-              (js2-report-warning "msg.unused.variable" name pos len
-                                  'js2-warning))))))))
-
-(defun js2-highlight-unused-variables ()
-  "Highlight unused variables."
-  (let ((vars (js2--classify-variables)))
-    (maphash #'js2--highlight-unused-variable vars)))
-
-;;;###autoload
-(define-minor-mode js2-highlight-unused-variables-mode
-  "Toggle highlight of unused variables."
-  :lighter ""
-  (if js2-highlight-unused-variables-mode
-      (add-hook 'js2-post-parse-callbacks
-                #'js2-highlight-unused-variables nil t)
-    (remove-hook 'js2-post-parse-callbacks
-                 #'js2-highlight-unused-variables t)))
-
-(defun js2-set-default-externs ()
-  "Set the value of `js2-default-externs' based on the various
-`js2-include-?-externs' variables."
-  (setq js2-default-externs
-        (append js2-ecma-262-externs
-                (if js2-include-browser-externs js2-browser-externs)
-                (if (and js2-include-browser-externs
-                         (>= js2-language-version 200)) js2-harmony-externs)
-                (if js2-include-rhino-externs js2-rhino-externs)
-                (if js2-include-node-externs js2-node-externs)
-                (if (or js2-include-browser-externs js2-include-node-externs)
-                    js2-typed-array-externs))))
-
-(defun js2-apply-jslint-globals ()
-  (setq js2-additional-externs
-        (nconc (js2-get-jslint-globals)
-               js2-additional-externs)))
-
-(defun js2-get-jslint-globals ()
-  (cl-loop for node in (js2-ast-root-comments js2-mode-ast)
-           when (and (eq 'block (js2-comment-node-format node))
-                     (save-excursion
-                       (goto-char (js2-node-abs-pos node))
-                       (looking-at "/\\*global ")))
-           append (js2-get-jslint-globals-in
-                   (match-end 0)
-                   (js2-node-abs-end node))))
-
-(defun js2-get-jslint-globals-in (beg end)
-  (let (res)
-    (save-excursion
-      (goto-char beg)
-      (while (re-search-forward js2-mode-identifier-re end t)
-        (let ((match (match-string 0)))
-          (unless (member match '("true" "false"))
-            (push match res)))))
-    (nreverse res)))
-
-;;; IMenu support
-
-;; We currently only support imenu, but eventually should support speedbar and
-;; possibly other browsing mechanisms.
-
-;; The basic strategy is to identify function assignment targets of the form
-;; `foo.bar.baz', convert them to (list fn foo bar baz <position>), and push the
-;; list into `js2-imenu-recorder'.  The lists are merged into a trie-like tree
-;; for imenu after parsing is finished.
-
-;; A `foo.bar.baz' assignment target may be expressed in many ways in
-;; JavaScript, and the general problem is undecidable.  However, several forms
-;; are readily recognizable at parse-time; the forms we attempt to recognize
-;; include:
-
-;;  function foo()  -- function declaration
-;;  foo = function()  -- function expression assigned to variable
-;;  foo.bar.baz = function()  -- function expr assigned to nested property-get
-;;  foo = {bar: function()}  -- fun prop in object literal assigned to var
-;;  foo = {bar: {baz: function()}} -- inside nested object literal
-;;  foo.bar = {baz: function()}} -- obj lit assigned to nested prop get
-;;  a.b = {c: {d: function()}} -- nested obj lit assigned to nested prop get
-;;  foo = {get bar() {...}}  -- getter/setter in obj literal
-;;  function foo() {function bar() {...}}  -- nested function
-;;  foo['a'] = function()  -- fun expr assigned to deterministic element-get
-
-;; This list boils down to a few forms that can be combined recursively.
-;; Top-level named function declarations include both the left-hand (name)
-;; and the right-hand (function value) expressions needed to produce an imenu
-;; entry.  The other "right-hand" forms we need to look for are:
-;;  - functions declared as props/getters/setters in object literals
-;;  - nested named function declarations
-;; The "left-hand" expressions that functions can be assigned to include:
-;;  - local/global variables
-;;  - nested property-get expressions like a.b.c.d
-;;  - element gets like foo[10] or foo['bar'] where the index
-;;    expression can be trivially converted to a property name.  They
-;;    effectively then become property gets.
-
-;; All the different definition types are canonicalized into the form
-;; foo.bar.baz = position-of-function-keyword
-
-;; We need to build a trie-like structure for imenu.  As an example,
-;; consider the following JavaScript code:
-
-;; a = function() {...}  // function at position 5
-;; b = function() {...}  // function at position 25
-;; foo = function() {...} // function at position 100
-;; foo.bar = function() {...} // function at position 200
-;; foo.bar.baz = function() {...} // function at position 300
-;; foo.bar.zab = function() {...} // function at position 400
-
-;; During parsing we accumulate an entry for each definition in
-;; the variable `js2-imenu-recorder', like so:
-
-;; '((fn a 5)
-;;   (fn b 25)
-;;   (fn foo 100)
-;;   (fn foo bar 200)
-;;   (fn foo bar baz 300)
-;;   (fn foo bar zab 400))
-
-;; Where 'fn' is the respective function node.
-;; After parsing these entries are merged into this alist-trie:
-
-;; '((a . 1)
-;;   (b . 2)
-;;   (foo (<definition> . 3)
-;;        (bar (<definition> . 6)
-;;             (baz . 100)
-;;             (zab . 200))))
-
-;; Note the wacky need for a <definition> name.  The token can be anything
-;; that isn't a valid JavaScript identifier, because you might make foo
-;; a function and then start setting properties on it that are also functions.
-
-(defun js2-prop-node-name (node)
-  "Return the name of a node that may be a property-get/property-name.
-If NODE is not a valid name-node, string-node or integral number-node,
-returns nil.  Otherwise returns the string name/value of the node."
-  (cond
-   ((js2-name-node-p node)
-    (js2-name-node-name node))
-   ((js2-string-node-p node)
-    (js2-string-node-value node))
-   ((and (js2-number-node-p node)
-         (string-match "^[0-9]+$" (js2-number-node-value node)))
-    (js2-number-node-value node))
-   ((eq (js2-node-type node) js2-THIS)
-    "this")
-   ((eq (js2-node-type node) js2-SUPER)
-    "super")))
-
-(defun js2-node-qname-component (node)
-  "Return the name of this node, if it contributes to a qname.
-Returns nil if the node doesn't contribute."
-  (copy-sequence
-   (or (js2-prop-node-name node)
-       (if (and (js2-function-node-p node)
-                (js2-function-node-name node))
-           (js2-name-node-name (js2-function-node-name node))))))
-
-(defun js2-record-imenu-entry (fn-node qname pos)
-  "Add an entry to `js2-imenu-recorder'.
-FN-NODE should be the current item's function node.
-
-Associate FN-NODE with its QNAME for later lookup.
-This is used in postprocessing the chain list.  For each chain, we find
-the parent function, look up its qname, then prepend a copy of it to the chain."
-  (push (cons fn-node (append qname (list pos))) js2-imenu-recorder)
-  (unless js2-imenu-function-map
-    (setq js2-imenu-function-map (make-hash-table :test 'eq)))
-  (puthash fn-node qname js2-imenu-function-map))
-
-(defun js2-record-imenu-functions (node &optional var)
-  "Record function definitions for imenu.
-NODE is a function node or an object literal.
-VAR, if non-nil, is the expression that NODE is being assigned to.
-When passed arguments of wrong type, does nothing."
-  (when js2-parse-ide-mode
-    (let ((fun-p (js2-function-node-p node))
-          qname fname-node)
-      (cond
-       ;; non-anonymous function declaration?
-       ((and fun-p
-             (not var)
-             (setq fname-node (js2-function-node-name node)))
-        (js2-record-imenu-entry node (list fname-node) (js2-node-pos node)))
-       ;; for remaining forms, compute left-side tree branch first
-       ((and var (setq qname (js2-compute-nested-prop-get var)))
-        (cond
-         ;; foo.bar.baz = function
-         (fun-p
-          (js2-record-imenu-entry node qname (js2-node-pos node)))
-         ;; foo.bar.baz = object-literal
-         ;; look for nested functions:  {a: {b: function() {...} }}
-         ((js2-object-node-p node)
-          ;; Node position here is still absolute, since the parser
-          ;; passes the assignment target and value expressions
-          ;; to us before they are added as children of the assignment node.
-          (js2-record-object-literal node qname (js2-node-pos node)))))))))
-
-(defun js2-compute-nested-prop-get (node)
-  "If NODE is of form foo.bar, foo['bar'], or any nested combination, return
-component nodes as a list.  Otherwise return nil.  Element-gets are treated
-as property-gets if the index expression is a string, or a positive integer."
-  (let (left right head)
-    (cond
-     ((or (js2-name-node-p node)
-          (js2-this-or-super-node-p node))
-      (list node))
-     ;; foo.bar.baz is parenthesized as (foo.bar).baz => right operand is a leaf
-     ((js2-prop-get-node-p node)        ; foo.bar
-      (setq left (js2-prop-get-node-left node)
-            right (js2-prop-get-node-right node))
-      (if (setq head (js2-compute-nested-prop-get left))
-          (nconc head (list right))))
-     ((js2-elem-get-node-p node)        ; foo['bar'] or foo[101]
-      (setq left (js2-elem-get-node-target node)
-            right (js2-elem-get-node-element node))
-      (if (or (js2-string-node-p right)      ; ['bar']
-              (and (js2-number-node-p right) ; [10]
-                   (string-match "^[0-9]+$"
-                                 (js2-number-node-value right))))
-          (if (setq head (js2-compute-nested-prop-get left))
-              (nconc head (list right))))))))
-
-(defun js2-record-object-literal (node qname pos)
-  "Recursively process an object literal looking for functions.
-NODE is an object literal that is the right-hand child of an assignment
-expression.  QNAME is a list of nodes representing the assignment target,
-e.g. for foo.bar.baz = {...}, QNAME is (foo-node bar-node baz-node).
-POS is the absolute position of the node.
-We do a depth-first traversal of NODE.  For any functions we find,
-we append the property name to QNAME, then call `js2-record-imenu-entry'."
-  (let (right)
-    (dolist (e (js2-object-node-elems node))  ; e is a `js2-object-prop-node'
-      (let ((left (js2-infix-node-left e))
-            ;; Element positions are relative to the parent position.
-            (pos (+ pos (js2-node-pos e))))
-        (cond
-         ;; foo: function() {...}
-         ((js2-function-node-p (setq right (js2-infix-node-right e)))
-          (when (js2-prop-node-name left)
-            ;; As a policy decision, we record the position of the property,
-            ;; not the position of the `function' keyword, since the property
-            ;; is effectively the name of the function.
-            (js2-record-imenu-entry right (append qname (list left)) pos)))
-         ;; foo: {object-literal} -- add foo to qname, offset position, and recurse
-         ((js2-object-node-p right)
-          (js2-record-object-literal right
-                                     (append qname (list (js2-infix-node-left e)))
-                                     (+ pos (js2-node-pos right)))))))))
-
-(defun js2-node-top-level-decl-p (node)
-  "Return t if NODE's name is defined in the top-level scope.
-Also returns t if NODE's name is not defined in any scope, since it implies
-that it's an external variable, which must also be in the top-level scope."
-  (let* ((name (js2-prop-node-name node))
-         (this-scope (js2-node-get-enclosing-scope node))
-         defining-scope)
-    (cond
-     ((js2-this-or-super-node-p node)
-      nil)
-     ((null this-scope)
-      t)
-     ((setq defining-scope (js2-get-defining-scope this-scope name))
-      (js2-ast-root-p defining-scope))
-     (t t))))
-
-(defun js2-wrapper-function-p (node)
-  "Return t if NODE is a function expression that's immediately invoked.
-NODE must be `js2-function-node'."
-  (let ((parent (js2-node-parent node)))
-    (or
-     ;; function(){...}();
-     (and (js2-call-node-p parent)
-          (eq node (js2-call-node-target parent)))
-     (and (js2-paren-node-p parent)
-          ;; (function(){...})();
-          (or (js2-call-node-p (setq parent (js2-node-parent parent)))
-              ;; (function(){...}).call(this);
-              (and (js2-prop-get-node-p parent)
-                   (member (js2-name-node-name (js2-prop-get-node-right parent))
-                           '("call" "apply"))
-                   (js2-call-node-p (js2-node-parent parent))))))))
-
-(defun js2-browse-postprocess-chains ()
-  "Modify function-declaration name chains after parsing finishes.
-Some of the information is only available after the parse tree is complete.
-For instance, processing a nested scope requires a parent function node."
-  (let (result fn parent-qname p elem)
-    (dolist (entry js2-imenu-recorder)
-      ;; function node goes first
-      (cl-destructuring-bind (current-fn &rest (&whole chain head &rest)) entry
-        ;; Examine head's defining scope:
-        ;; Pre-processed chain, or top-level/external, keep as-is.
-        (if (or (stringp head) (js2-node-top-level-decl-p head))
-            (push chain result)
-          (when (js2-this-or-super-node-p head)
-            (setq chain (cdr chain))) ; discard this-node
-          (when (setq fn (js2-node-parent-script-or-fn current-fn))
-            (setq parent-qname (gethash fn js2-imenu-function-map 'not-found))
-            (when (eq parent-qname 'not-found)
-              ;; anonymous function expressions are not recorded
-              ;; during the parse, so we need to handle this case here
-              (setq parent-qname
-                    (if (js2-wrapper-function-p fn)
-                        (let ((grandparent (js2-node-parent-script-or-fn fn)))
-                          (if (js2-ast-root-p grandparent)
-                              nil
-                            (gethash grandparent js2-imenu-function-map 'skip)))
-                      'skip))
-              (puthash fn parent-qname js2-imenu-function-map))
-            (if (eq parent-qname 'skip)
-                ;; We don't show it, let's record that fact.
-                (remhash current-fn js2-imenu-function-map)
-              ;; Prepend parent fn qname to this chain.
-              (let ((qname (append parent-qname chain)))
-                (puthash current-fn (butlast qname) js2-imenu-function-map)
-                (push qname result)))))))
-    ;; Collect chains obtained by third-party code.
-    (let (js2-imenu-recorder)
-      (run-hooks 'js2-build-imenu-callbacks)
-      (dolist (entry js2-imenu-recorder)
-        (push (cdr entry) result)))
-    ;; Finally replace each node in each chain with its name.
-    (dolist (chain result)
-      (setq p chain)
-      (while p
-        (if (js2-node-p (setq elem (car p)))
-            (setcar p (js2-node-qname-component elem)))
-        (setq p (cdr p))))
-    result))
-
-;; Merge name chains into a trie-like tree structure of nested lists.
-;; To simplify construction of the trie, we first build it out using the rule
-;; that the trie consists of lists of pairs.  Each pair is a 2-element array:
-;; [key, num-or-list].  The second element can be a number; if so, this key
-;; is a leaf-node with only one value.  (I.e. there is only one declaration
-;; associated with the key at this level.)  Otherwise the second element is
-;; a list of pairs, with the rule applied recursively.  This symmetry permits
-;; a simple recursive formulation.
-;;
-;; js2-mode is building the data structure for imenu.  The imenu documentation
-;; claims that it's the structure above, but in practice it wants the children
-;; at the same list level as the key for that level, which is how I've drawn
-;; the "Expected final result" above.  We'll postprocess the trie to remove the
-;; list wrapper around the children at each level.
-;;
-;; A completed nested imenu-alist entry looks like this:
-;;       '(("foo"
-;;          ("<definition>" . 7)
-;;          ("bar"
-;;           ("a" . 40)
-;;           ("b" . 60))))
-;;
-;; In particular, the documentation for `imenu--index-alist' says that
-;; a nested sub-alist element looks like (INDEX-NAME SUB-ALIST).
-;; The sub-alist entries immediately follow INDEX-NAME, the head of the list.
-
-(defun js2-treeify (lst)
-  "Convert (a b c d) to (a ((b ((c d)))))."
-  (if (null (cddr lst))  ; list length <= 2
-      lst
-    (list (car lst) (list (js2-treeify (cdr lst))))))
-
-(defun js2-build-alist-trie (chains trie)
-  "Merge declaration name chains into a trie-like alist structure for imenu.
-CHAINS is the qname chain list produced during parsing. TRIE is a
-list of elements built up so far."
-  (let (head tail pos branch kids)
-    (dolist (chain chains)
-      (setq head (car chain)
-            tail (cdr chain)
-            pos (if (numberp (car tail)) (car tail))
-            branch (js2-find-if (lambda (n)
-                                  (string= (car n) head))
-                                trie)
-            kids (cl-second branch))
-      (cond
-       ;; case 1:  this key isn't in the trie yet
-       ((null branch)
-        (if trie
-            (setcdr (last trie) (list (js2-treeify chain)))
-          (setq trie (list (js2-treeify chain)))))
-       ;; case 2:  key is present with a single number entry:  replace w/ list
-       ;;  ("a1" 10)  +  ("a1" 20) => ("a1" (("<definition>" 10)
-       ;;                                    ("<definition>" 20)))
-       ((numberp kids)
-        (setcar (cdr branch)
-                (list (list "<definition-1>" kids)
-                      (if pos
-                          (list "<definition-2>" pos)
-                        (js2-treeify tail)))))
-       ;; case 3:  key is there (with kids), and we're a number entry
-       (pos
-        (setcdr (last kids)
-                (list
-                 (list (format "<definition-%d>"
-                               (1+ (cl-loop for kid in kids
-                                            count (eq ?< (aref (car kid) 0)))))
-                       pos))))
-       ;; case 4:  key is there with kids, need to merge in our chain
-       (t
-        (js2-build-alist-trie (list tail) kids))))
-    trie))
-
-(defun js2-flatten-trie (trie)
-  "Convert TRIE to imenu-format.
-Recurses through nodes, and for each one whose second element is a list,
-appends the list's flattened elements to the current element.  Also
-changes the tails into conses.  For instance, this pre-flattened trie
-
-'(a ((b 20)
-     (c ((d 30)
-         (e 40)))))
-
-becomes
-
-'(a (b . 20)
-    (c (d . 30)
-       (e . 40)))
-
-Note that the root of the trie has no key, just a list of chains.
-This is also true for the value of any key with multiple children,
-e.g. key 'c' in the example above."
-  (cond
-   ((listp (car trie))
-    (mapcar #'js2-flatten-trie trie))
-   (t
-    (if (numberp (cl-second trie))
-        (cons (car trie) (cl-second trie))
-      ;; else pop list and append its kids
-      (apply #'append (list (car trie)) (js2-flatten-trie (cdr trie)))))))
-
-(defun js2-build-imenu-index ()
-  "Turn `js2-imenu-recorder' into an imenu data structure."
-  (when (eq js2-imenu-recorder 'empty)
-    (setq js2-imenu-recorder nil))
-  (let* ((chains (js2-browse-postprocess-chains))
-         (result (js2-build-alist-trie chains nil)))
-    (js2-flatten-trie result)))
-
-(defun js2-test-print-chains (chains)
-  "Print a list of qname chains.
-Each element of CHAINS is a list of the form (NODE [NODE *] pos);
-i.e. one or more nodes, and an integer position as the list tail."
-  (mapconcat (lambda (chain)
-               (concat "("
-                       (mapconcat (lambda (elem)
-                                    (if (js2-node-p elem)
-                                        (or (js2-node-qname-component elem)
-                                            "nil")
-                                      (number-to-string elem)))
-                                  chain
-                                  " ")
-                       ")"))
-             chains
-             "\n"))
-
-;;; Parser
-
-(defconst js2-version "1.8.5"
-  "Version of JavaScript supported.")
-
-(defun js2-record-face (face &optional token)
-  "Record a style run of FACE for TOKEN or the current token."
-  (unless token (setq token (js2-current-token)))
-  (js2-set-face (js2-token-beg token) (js2-token-end token) face 'record))
-
-(defsubst js2-node-end (n)
-  "Computes the absolute end of node N.
-Use with caution!  Assumes `js2-node-pos' is -absolute-, which
-is only true until the node is added to its parent; i.e., while parsing."
-  (+ (js2-node-pos n)
-     (js2-node-len n)))
-
-(defun js2-record-comment (token)
-  "Record a comment in `js2-scanned-comments'."
-  (let ((ct (js2-token-comment-type token))
-        (beg (js2-token-beg token))
-        (end (js2-token-end token)))
-    (push (make-js2-comment-node :len (- end beg)
-                                 :format ct)
-          js2-scanned-comments)
-    (when js2-parse-ide-mode
-      (js2-record-face (if (eq ct 'jsdoc)
-                           'font-lock-doc-face
-                         'font-lock-comment-face)
-                       token)
-      (when (memq ct '(html preprocessor))
-        ;; Tell cc-engine the bounds of the comment.
-        (js2-record-text-property beg (1- end) 'c-in-sws t)))))
-
-(defun js2-peek-token ()
-  "Return the next token type without consuming it.
-If `js2-ti-lookahead' is positive, return the type of next token
-from `js2-ti-tokens'.  Otherwise, call `js2-get-token'."
-  (if (not (zerop js2-ti-lookahead))
-      (js2-token-type
-       (aref js2-ti-tokens (mod (1+ js2-ti-tokens-cursor) js2-ti-ntokens)))
-    (let ((tt (js2-get-token-internal nil)))
-      (js2-unget-token)
-      tt)))
-
-(defalias 'js2-next-token 'js2-get-token)
-
-(defun js2-match-token (match &optional dont-unget)
-  "Get next token and return t if it matches MATCH, a bytecode.
-Returns nil and consumes nothing if MATCH is not the next token."
-  (if (/= (js2-get-token) match)
-      (ignore (unless dont-unget (js2-unget-token)))
-    t))
-
-(defun js2-match-contextual-kwd (name)
-  "Consume and return t if next token is `js2-NAME', and its
-string is NAME.  Returns nil and keeps current token otherwise."
-  (if (or (/= (js2-get-token) js2-NAME)
-          (not (string= (js2-current-token-string) name)))
-      (progn
-        (js2-unget-token)
-        nil)
-    (js2-record-face 'font-lock-keyword-face)
-    t))
-
-(defun js2-get-prop-name-token ()
-  (js2-get-token (and (>= js2-language-version 170) 'KEYWORD_IS_NAME)))
-
-(defun js2-match-prop-name ()
-  "Consume token and return t if next token is a valid property name.
-If `js2-language-version' is >= 180, a keyword or reserved word
-is considered valid name as well."
-  (if (eq js2-NAME (js2-get-prop-name-token))
-      t
-    (js2-unget-token)
-    nil))
-
-(defun js2-must-match-prop-name (msg-id &optional pos len)
-  (if (js2-match-prop-name)
-      t
-    (js2-report-error msg-id nil pos len)
-    nil))
-
-(defun js2-peek-token-or-eol ()
-  "Return js2-EOL if the next token immediately follows a newline.
-Else returns the next token.  Used in situations where we don't
-consider certain token types valid if they are preceded by a newline.
-One example is the postfix ++ or -- operator, which has to be on the
-same line as its operand."
-  (let ((tt (js2-get-token))
-        (follows-eol (js2-token-follows-eol-p (js2-current-token))))
-    (js2-unget-token)
-    (if follows-eol
-        js2-EOL
-      tt)))
-
-(defun js2-must-match (token msg-id &optional pos len)
-  "Match next token to token code TOKEN, or record a syntax error.
-MSG-ID is the error message to report if the match fails.
-Returns t on match, nil if no match."
-  (if (js2-match-token token t)
-      t
-    (js2-report-error msg-id nil pos len)
-    (js2-unget-token)
-    nil))
-
-(defun js2-must-match-name (msg-id)
-  (if (js2-match-token js2-NAME t)
-      t
-    (if (eq (js2-current-token-type) js2-RESERVED)
-        (js2-report-error "msg.reserved.id" (js2-current-token-string))
-      (js2-report-error msg-id)
-      (js2-unget-token))
-    nil))
-
-(defsubst js2-inside-function ()
-  (cl-plusp js2-nesting-of-function))
-
-(defun js2-set-requires-activation ()
-  (if (js2-function-node-p js2-current-script-or-fn)
-      (setf (js2-function-node-needs-activation js2-current-script-or-fn) t)))
-
-(defun js2-check-activation-name (name _token)
-  (when (js2-inside-function)
-    ;; skip language-version 1.2 check from Rhino
-    (if (or (string= "arguments" name)
-            (and js2-compiler-activation-names  ; only used in codegen
-                 (gethash name js2-compiler-activation-names)))
-        (js2-set-requires-activation))))
-
-(defun js2-set-is-generator ()
-  (let ((fn-node js2-current-script-or-fn))
-    (when (and (js2-function-node-p fn-node)
-               (not (js2-function-node-generator-type fn-node)))
-      (setf (js2-function-node-generator-type js2-current-script-or-fn) 'LEGACY))))
-
-(defun js2-must-have-xml ()
-  (unless js2-compiler-xml-available
-    (js2-report-error "msg.XML.not.available")))
-
-(defun js2-push-scope (scope)
-  "Push SCOPE, a `js2-scope', onto the lexical scope chain."
-  (cl-assert (js2-scope-p scope))
-  (cl-assert (null (js2-scope-parent-scope scope)))
-  (cl-assert (not (eq js2-current-scope scope)))
-  (setf (js2-scope-parent-scope scope) js2-current-scope
-        js2-current-scope scope))
-
-(defsubst js2-pop-scope ()
-  (setq js2-current-scope
-        (js2-scope-parent-scope js2-current-scope)))
-
-(defun js2-enter-loop (loop-node)
-  (push loop-node js2-loop-set)
-  (push loop-node js2-loop-and-switch-set)
-  (js2-push-scope loop-node)
-  ;; Tell the current labeled statement (if any) its statement,
-  ;; and set the jump target of the first label to the loop.
-  ;; These are used in `js2-parse-continue' to verify that the
-  ;; continue target is an actual labeled loop.  (And for codegen.)
-  (when js2-labeled-stmt
-    (setf (js2-labeled-stmt-node-stmt js2-labeled-stmt) loop-node
-          (js2-label-node-loop (car (js2-labeled-stmt-node-labels
-                                     js2-labeled-stmt))) loop-node)))
-
-(defun js2-exit-loop ()
-  (pop js2-loop-set)
-  (pop js2-loop-and-switch-set)
-  (js2-pop-scope))
-
-(defsubst js2-enter-switch (switch-node)
-  (push switch-node js2-loop-and-switch-set))
-
-(defsubst js2-exit-switch ()
-  (pop js2-loop-and-switch-set))
-
-(defun js2-parse (&optional buf cb)
-  "Tell the js2 parser to parse a region of JavaScript.
-
-BUF is a buffer or buffer name containing the code to parse.
-Call `narrow-to-region' first to parse only part of the buffer.
-
-The returned AST root node is given some additional properties:
-  `node-count' - total number of nodes in the AST
-  `buffer' - BUF.  The buffer it refers to may change or be killed,
-             so the value is not necessarily reliable.
-
-An optional callback CB can be specified to report parsing
-progress.  If `(functionp CB)' returns t, it will be called with
-the current line number once before parsing begins, then again
-each time the lexer reaches a new line number.
-
-CB can also be a list of the form `(symbol cb ...)' to specify
-multiple callbacks with different criteria.  Each symbol is a
-criterion keyword, and the following element is the callback to
-call
-
-  :line  - called whenever the line number changes
-  :token - called for each new token consumed
-
-The list of criteria could be extended to include entering or
-leaving a statement, an expression, or a function definition."
-  (if (and cb (not (functionp cb)))
-      (error "criteria callbacks not yet implemented"))
-  (let ((inhibit-point-motion-hooks t)
-        (js2-compiler-xml-available (>= js2-language-version 160))
-        ;; This is a recursive-descent parser, so give it a big stack.
-        (max-lisp-eval-depth (max max-lisp-eval-depth 3000))
-        (max-specpdl-size (max max-specpdl-size 3000))
-        (case-fold-search nil)
-        ast)
-    (with-current-buffer (or buf (current-buffer))
-      (setq js2-scanned-comments nil
-            js2-parsed-errors nil
-            js2-parsed-warnings nil
-            js2-imenu-recorder nil
-            js2-imenu-function-map nil
-            js2-label-set nil)
-      (js2-init-scanner)
-      (setq ast (js2-do-parse))
-      (unless js2-ts-hit-eof
-        (js2-report-error "msg.got.syntax.errors" (length js2-parsed-errors)))
-      (setf (js2-ast-root-errors ast) js2-parsed-errors
-            (js2-ast-root-warnings ast) js2-parsed-warnings)
-      ;; if we didn't find any declarations, put a dummy in this list so we
-      ;; don't end up re-parsing the buffer in `js2-mode-create-imenu-index'
-      (unless js2-imenu-recorder
-        (setq js2-imenu-recorder 'empty))
-      (run-hooks 'js2-parse-finished-hook)
-      ast)))
-
-;; Corresponds to Rhino's Parser.parse() method.
-(defun js2-do-parse ()
-  "Parse current buffer starting from current point.
-Scanner should be initialized."
-  (let ((pos js2-ts-cursor)
-        (end js2-ts-cursor)  ; in case file is empty
-        root n tt)
-    ;; initialize buffer-local parsing vars
-    (setf root (make-js2-ast-root :buffer (buffer-name) :pos pos)
-          js2-current-script-or-fn root
-          js2-current-scope root
-          js2-nesting-of-function 0
-          js2-labeled-stmt nil
-          js2-recorded-identifiers nil)  ; for js2-highlight
-    (while (/= (setq tt (js2-get-token)) js2-EOF)
-      (if (= tt js2-FUNCTION)
-          (progn
-            (setq n (if js2-called-by-compile-function
-                        (js2-parse-function-expr)
-                      (js2-parse-function-stmt))))
-        ;; not a function - parse a statement
-        (js2-unget-token)
-        (setq n (js2-parse-statement)))
-      ;; add function or statement to script
-      (setq end (js2-node-end n))
-      (js2-block-node-push root n))
-    ;; add comments to root in lexical order
-    (when js2-scanned-comments
-      ;; if we find a comment beyond end of normal kids, use its end
-      (setq end (max end (js2-node-end (cl-first js2-scanned-comments))))
-      (dolist (comment js2-scanned-comments)
-        (push comment (js2-ast-root-comments root))
-        (js2-node-add-children root comment)))
-    (setf (js2-node-len root) (- end pos))
-    (setq js2-mode-ast root)  ; Make sure this is available for callbacks.
-    ;; Give extensions a chance to muck with things before highlighting starts.
-    (let ((js2-additional-externs js2-additional-externs))
-      (save-excursion
-        (run-hooks 'js2-post-parse-callbacks))
-      (js2-highlight-undeclared-vars))
-    root))
-
-(defun js2-parse-function-closure-body (fn-node)
-  "Parse a JavaScript 1.8 function closure body."
-  (let ((js2-nesting-of-function (1+ js2-nesting-of-function)))
-    (if js2-ts-hit-eof
-        (js2-report-error "msg.no.brace.body" nil
-                          (js2-node-pos fn-node)
-                          (- js2-ts-cursor (js2-node-pos fn-node)))
-      (js2-node-add-children fn-node
-                             (setf (js2-function-node-body fn-node)
-                                   (js2-parse-expr t))))))
-
-(defun js2-parse-function-body (fn-node)
-  (js2-must-match js2-LC "msg.no.brace.body"
-                  (js2-node-pos fn-node)
-                  (- js2-ts-cursor (js2-node-pos fn-node)))
-  (let ((pos (js2-current-token-beg))         ; LC position
-        (pn (make-js2-block-node))  ; starts at LC position
-        tt
-        end)
-    (cl-incf js2-nesting-of-function)
-    (unwind-protect
-        (while (not (or (= (setq tt (js2-peek-token)) js2-ERROR)
-                        (= tt js2-EOF)
-                        (= tt js2-RC)))
-          (js2-block-node-push pn (if (/= tt js2-FUNCTION)
-                                      (js2-parse-statement)
-                                    (js2-get-token)
-                                    (js2-parse-function-stmt))))
-      (cl-decf js2-nesting-of-function))
-    (setq end (js2-current-token-end))  ; assume no curly and leave at current token
-    (if (js2-must-match js2-RC "msg.no.brace.after.body" pos)
-        (setq end (js2-current-token-end)))
-    (setf (js2-node-pos pn) pos
-          (js2-node-len pn) (- end pos))
-    (setf (js2-function-node-body fn-node) pn)
-    (js2-node-add-children fn-node pn)
-    pn))
-
-(defun js2-define-destruct-symbols (node decl-type face &optional ignore-not-in-block)
-  "Declare and fontify destructuring parameters inside NODE.
-NODE is either `js2-array-node', `js2-object-node', or `js2-name-node'."
-  (cond
-   ((js2-name-node-p node)
-    (let (leftpos)
-      (js2-define-symbol decl-type (js2-name-node-name node)
-                         node ignore-not-in-block)
-      (when face
-        (js2-set-face (setq leftpos (js2-node-abs-pos node))
-                      (+ leftpos (js2-node-len node))
-                      face 'record))))
-   ((js2-object-node-p node)
-    (dolist (elem (js2-object-node-elems node))
-      (js2-define-destruct-symbols
-       ;; In abbreviated destructuring {a, b}, right == left.
-       (js2-object-prop-node-right elem)
-       decl-type face ignore-not-in-block)))
-   ((js2-array-node-p node)
-    (dolist (elem (js2-array-node-elems node))
-      (when elem
-        (js2-define-destruct-symbols elem decl-type face ignore-not-in-block))))
-   (t (js2-report-error "msg.no.parm" nil (js2-node-abs-pos node)
-                        (js2-node-len node)))))
-
-(defun js2-parse-function-params (function-type fn-node pos)
-  (if (js2-match-token js2-RP)
-      (setf (js2-function-node-rp fn-node) (- (js2-current-token-beg) pos))
-    (let ((paren-free-arrow (and (eq function-type 'FUNCTION_ARROW)
-                                 (eq (js2-current-token-type) js2-NAME)))
-          params param default-found rest-param-at)
-      (when paren-free-arrow
-        (js2-unget-token))
-      (cl-loop for tt = (js2-peek-token)
-               do
-               (cond
-                ;; destructuring param
-                ((and (not paren-free-arrow)
-                      (or (= tt js2-LB) (= tt js2-LC)))
-                 (js2-get-token)
-                 (when default-found
-                   (js2-report-error "msg.no.default.after.default.param"))
-                 (setq param (js2-parse-destruct-primary-expr))
-                 (js2-define-destruct-symbols param
-                                              js2-LP
-                                              'js2-function-param)
-                 (push param params))
-                ;; variable name
-                (t
-                 (when (and (>= js2-language-version 200)
-                            (not paren-free-arrow)
-                            (js2-match-token js2-TRIPLEDOT)
-                            (not rest-param-at))
-                   ;; to report errors if there are more parameters
-                   (setq rest-param-at (length params)))
-                 (js2-must-match-name "msg.no.parm")
-                 (js2-record-face 'js2-function-param)
-                 (setq param (js2-create-name-node))
-                 (js2-define-symbol js2-LP (js2-current-token-string) param)
-                 ;; default parameter value
-                 (when (or (and default-found
-                                (not rest-param-at)
-                                (js2-must-match js2-ASSIGN
-                                                "msg.no.default.after.default.param"
-                                                (js2-node-pos param)
-                                                (js2-node-len param)))
-                           (and (>= js2-language-version 200)
-                                (js2-match-token js2-ASSIGN)))
-                   (cl-assert (not paren-free-arrow))
-                   (let* ((pos (js2-node-pos param))
-                          (tt (js2-current-token-type))
-                          (op-pos (- (js2-current-token-beg) pos))
-                          (left param)
-                          (right (js2-parse-assign-expr))
-                          (len (- (js2-node-end right) pos)))
-                     (setq param (make-js2-assign-node
-                                  :type tt :pos pos :len len :op-pos op-pos
-                                  :left left :right right)
-                           default-found t)
-                     (js2-node-add-children param left right)))
-                 (push param params)))
-               (when (and rest-param-at (> (length params) (1+ rest-param-at)))
-                 (js2-report-error "msg.param.after.rest" nil
-                                   (js2-node-pos param) (js2-node-len param)))
-               while
-               (js2-match-token js2-COMMA))
-      (when (and (not paren-free-arrow)
-                 (js2-must-match js2-RP "msg.no.paren.after.parms"))
-        (setf (js2-function-node-rp fn-node) (- (js2-current-token-beg) pos)))
-      (when rest-param-at
-        (setf (js2-function-node-rest-p fn-node) t))
-      (dolist (p params)
-        (js2-node-add-children fn-node p)
-        (push p (js2-function-node-params fn-node))))))
-
-(defun js2-check-inconsistent-return-warning (fn-node name)
-  "Possibly show inconsistent-return warning.
-Last token scanned is the close-curly for the function body."
-  (when (and js2-mode-show-strict-warnings
-             js2-strict-inconsistent-return-warning
-             (not (js2-has-consistent-return-usage
-                   (js2-function-node-body fn-node))))
-    ;; Have it extend from close-curly to bol or beginning of block.
-    (let ((pos (save-excursion
-                 (goto-char (js2-current-token-end))
-                 (max (js2-node-abs-pos (js2-function-node-body fn-node))
-                      (point-at-bol))))
-          (end (js2-current-token-end)))
-      (if (cl-plusp (js2-name-node-length name))
-          (js2-add-strict-warning "msg.no.return.value"
-                                  (js2-name-node-name name) pos end)
-        (js2-add-strict-warning "msg.anon.no.return.value" nil pos end)))))
-
-(defun js2-parse-function-stmt ()
-  (let ((pos (js2-current-token-beg))
-        (star-p (js2-match-token js2-MUL)))
-    (js2-must-match-name "msg.unnamed.function.stmt")
-    (let ((name (js2-create-name-node t))
-          pn member-expr)
-      (cond
-       ((js2-match-token js2-LP)
-        (js2-parse-function 'FUNCTION_STATEMENT pos star-p name))
-       (js2-allow-member-expr-as-function-name
-        (setq member-expr (js2-parse-member-expr-tail nil name))
-        (js2-parse-highlight-member-expr-fn-name member-expr)
-        (js2-must-match js2-LP "msg.no.paren.parms")
-        (setf pn (js2-parse-function 'FUNCTION_STATEMENT pos star-p)
-              (js2-function-node-member-expr pn) member-expr)
-        pn)
-       (t
-        (js2-report-error "msg.no.paren.parms")
-        (make-js2-error-node))))))
-
-(defun js2-parse-function-expr ()
-  (let ((pos (js2-current-token-beg))
-        (star-p (js2-match-token js2-MUL))
-        name)
-    (when (js2-match-token js2-NAME)
-      (setq name (js2-create-name-node t)))
-    (js2-must-match js2-LP "msg.no.paren.parms")
-    (js2-parse-function 'FUNCTION_EXPRESSION pos star-p name)))
-
-(defun js2-parse-function (function-type pos star-p &optional name)
-  "Function parser.  FUNCTION-TYPE is a symbol, POS is the
-beginning of the first token (function keyword, unless it's an
-arrow function), NAME is js2-name-node."
-  (let (fn-node lp)
-    (if (= (js2-current-token-type) js2-LP) ; eventually matched LP?
-        (setq lp (js2-current-token-beg)))
-    (setf fn-node (make-js2-function-node :pos pos
-                                          :name name
-                                          :form function-type
-                                          :lp (if lp (- lp pos))
-                                          :generator-type (and star-p 'STAR)))
-    (when name
-      (js2-set-face (js2-node-pos name) (js2-node-end name)
-                    'font-lock-function-name-face 'record)
-      (when (and (eq function-type 'FUNCTION_STATEMENT)
-                 (cl-plusp (js2-name-node-length name)))
-        ;; Function statements define a symbol in the enclosing scope
-        (js2-define-symbol js2-FUNCTION (js2-name-node-name name) fn-node)))
-    (if (or (js2-inside-function) (cl-plusp js2-nesting-of-with))
-        ;; 1. Nested functions are not affected by the dynamic scope flag
-        ;;    as dynamic scope is already a parent of their scope.
-        ;; 2. Functions defined under the with statement also immune to
-        ;;    this setup, in which case dynamic scope is ignored in favor
-        ;;    of the with object.
-        (setf (js2-function-node-ignore-dynamic fn-node) t))
-    ;; dynamically bind all the per-function variables
-    (let ((js2-current-script-or-fn fn-node)
-          (js2-current-scope fn-node)
-          (js2-nesting-of-with 0)
-          (js2-end-flags 0)
-          js2-label-set
-          js2-loop-set
-          js2-loop-and-switch-set)
-      (js2-parse-function-params function-type fn-node pos)
-      (when (eq function-type 'FUNCTION_ARROW)
-        (js2-must-match js2-ARROW "msg.bad.arrow.args"))
-      (if (and (>= js2-language-version 180)
-               (/= (js2-peek-token) js2-LC))
-          (js2-parse-function-closure-body fn-node)
-        (js2-parse-function-body fn-node))
-      (js2-check-inconsistent-return-warning fn-node name)
-
-      (when name
-        (js2-node-add-children fn-node name)
-        ;; Function expressions define a name only in the body of the
-        ;; function, and only if not hidden by a parameter name
-        (when (and (eq function-type 'FUNCTION_EXPRESSION)
-                   (null (js2-scope-get-symbol js2-current-scope
-                                               (js2-name-node-name name))))
-          (js2-define-symbol js2-FUNCTION
-                             (js2-name-node-name name)
-                             fn-node))
-        (when (eq function-type 'FUNCTION_STATEMENT)
-          (js2-record-imenu-functions fn-node))))
-
-    (setf (js2-node-len fn-node) (- js2-ts-cursor pos))
-    ;; Rhino doesn't do this, but we need it for finding undeclared vars.
-    ;; We wait until after parsing the function to set its parent scope,
-    ;; since `js2-define-symbol' needs the defining-scope check to stop
-    ;; at the function boundary when checking for redeclarations.
-    (setf (js2-scope-parent-scope fn-node) js2-current-scope)
-    fn-node))
-
-(defun js2-parse-statements (&optional parent)
-  "Parse a statement list.  Last token consumed must be js2-LC.
-
-PARENT can be a `js2-block-node', in which case the statements are
-appended to PARENT.  Otherwise a new `js2-block-node' is created
-and returned.
-
-This function does not match the closing js2-RC: the caller
-matches the RC so it can provide a suitable error message if not
-matched.  This means it's up to the caller to set the length of
-the node to include the closing RC.  The node start pos is set to
-the absolute buffer start position, and the caller should fix it
-up to be relative to the parent node.  All children of this block
-node are given relative start positions and correct lengths."
-  (let ((pn (or parent (make-js2-block-node)))
-        tt)
-    (while (and (> (setq tt (js2-peek-token)) js2-EOF)
-                (/= tt js2-RC))
-      (js2-block-node-push pn (js2-parse-statement)))
-    pn))
-
-(defun js2-parse-statement ()
-  (let (pn beg end)
-    ;; coarse-grained user-interrupt check - needs work
-    (and js2-parse-interruptable-p
-         (zerop (% (cl-incf js2-parse-stmt-count)
-                   js2-statements-per-pause))
-         (input-pending-p)
-         (throw 'interrupted t))
-    (setq pn (js2-statement-helper))
-    ;; no-side-effects warning check
-    (unless (js2-node-has-side-effects pn)
-      (setq end (js2-node-end pn))
-      (save-excursion
-        (goto-char end)
-        (setq beg (max (js2-node-pos pn) (point-at-bol))))
-      (js2-add-strict-warning "msg.no.side.effects" nil beg end))
-    pn))
-
-;; These correspond to the switch cases in Parser.statementHelper
-(defconst js2-parsers
-  (let ((parsers (make-vector js2-num-tokens
-                                #'js2-parse-expr-stmt)))
-    (aset parsers js2-BREAK     #'js2-parse-break)
-    (aset parsers js2-CLASS     #'js2-parse-class-stmt)
-    (aset parsers js2-CONST     #'js2-parse-const-var)
-    (aset parsers js2-CONTINUE  #'js2-parse-continue)
-    (aset parsers js2-DEBUGGER  #'js2-parse-debugger)
-    (aset parsers js2-DEFAULT   #'js2-parse-default-xml-namespace)
-    (aset parsers js2-DO        #'js2-parse-do)
-    (aset parsers js2-EXPORT    #'js2-parse-export)
-    (aset parsers js2-FOR       #'js2-parse-for)
-    (aset parsers js2-FUNCTION  #'js2-parse-function-stmt)
-    (aset parsers js2-IF        #'js2-parse-if)
-    (aset parsers js2-IMPORT    #'js2-parse-import)
-    (aset parsers js2-LC        #'js2-parse-block)
-    (aset parsers js2-LET       #'js2-parse-let-stmt)
-    (aset parsers js2-NAME      #'js2-parse-name-or-label)
-    (aset parsers js2-RETURN    #'js2-parse-ret-yield)
-    (aset parsers js2-SEMI      #'js2-parse-semi)
-    (aset parsers js2-SWITCH    #'js2-parse-switch)
-    (aset parsers js2-THROW     #'js2-parse-throw)
-    (aset parsers js2-TRY       #'js2-parse-try)
-    (aset parsers js2-VAR       #'js2-parse-const-var)
-    (aset parsers js2-WHILE     #'js2-parse-while)
-    (aset parsers js2-WITH      #'js2-parse-with)
-    (aset parsers js2-YIELD     #'js2-parse-ret-yield)
-    parsers)
-  "A vector mapping token types to parser functions.")
-
-(defun js2-parse-warn-missing-semi (beg end)
-  (and js2-mode-show-strict-warnings
-       js2-strict-missing-semi-warning
-       (js2-add-strict-warning
-        "msg.missing.semi" nil
-        ;; back up to beginning of statement or line
-        (max beg (save-excursion
-                   (goto-char end)
-                   (point-at-bol)))
-        end)))
-
-(defconst js2-no-semi-insertion
-  (list js2-IF
-        js2-SWITCH
-        js2-WHILE
-        js2-DO
-        js2-FOR
-        js2-TRY
-        js2-WITH
-        js2-LC
-        js2-ERROR
-        js2-SEMI
-        js2-CLASS
-        js2-FUNCTION
-        js2-EXPORT)
-  "List of tokens that don't do automatic semicolon insertion.")
-
-(defconst js2-autoinsert-semi-and-warn
-  (list js2-ERROR js2-EOF js2-RC))
-
-(defun js2-statement-helper ()
-  (let* ((tt (js2-get-token))
-         (first-tt tt)
-         (parser (if (= tt js2-ERROR)
-                     #'js2-parse-semi
-                   (aref js2-parsers tt)))
-         pn)
-    ;; If the statement is set, then it's been told its label by now.
-    (and js2-labeled-stmt
-         (js2-labeled-stmt-node-stmt js2-labeled-stmt)
-         (setq js2-labeled-stmt nil))
-    (setq pn (funcall parser))
-    ;; Don't do auto semi insertion for certain statement types.
-    (unless (or (memq first-tt js2-no-semi-insertion)
-                (js2-labeled-stmt-node-p pn))
-      (js2-auto-insert-semicolon pn))
-    pn))
-
-(defun js2-auto-insert-semicolon (pn)
-  (let* ((tt (js2-get-token))
-         (pos (js2-node-pos pn)))
-      (cond
-       ((= tt js2-SEMI)
-        ;; extend the node bounds to include the semicolon.
-        (setf (js2-node-len pn) (- (js2-current-token-end) pos)))
-       ((memq tt js2-autoinsert-semi-and-warn)
-        (js2-unget-token) ; Not ';', do not consume.
-        ;; Autoinsert ;
-        (js2-parse-warn-missing-semi pos (js2-node-end pn)))
-       (t
-        (if (not (js2-token-follows-eol-p (js2-current-token)))
-            ;; Report error if no EOL or autoinsert ';' otherwise
-            (js2-report-error "msg.no.semi.stmt")
-          (js2-parse-warn-missing-semi pos (js2-node-end pn)))
-        (js2-unget-token) ; Not ';', do not consume.
-        ))))
-
-(defun js2-parse-condition ()
-  "Parse a parenthesized boolean expression, e.g. in an if- or while-stmt.
-The parens are discarded and the expression node is returned.
-The `pos' field of the return value is set to an absolute position
-that must be fixed up by the caller.
-Return value is a list (EXPR LP RP), with absolute paren positions."
-  (let (pn lp rp)
-    (if (js2-must-match js2-LP "msg.no.paren.cond")
-        (setq lp (js2-current-token-beg)))
-    (setq pn (js2-parse-expr))
-    (if (js2-must-match js2-RP "msg.no.paren.after.cond")
-        (setq rp (js2-current-token-beg)))
-    ;; Report strict warning on code like "if (a = 7) ..."
-    (if (and js2-strict-cond-assign-warning
-             (js2-assign-node-p pn))
-        (js2-add-strict-warning "msg.equal.as.assign" nil
-                                (js2-node-pos pn)
-                                (+ (js2-node-pos pn)
-                                   (js2-node-len pn))))
-    (list pn lp rp)))
-
-(defun js2-parse-if ()
-  "Parser for if-statement.  Last matched token must be js2-IF."
-  (let ((pos (js2-current-token-beg))
-        cond if-true if-false else-pos end pn)
-    (setq cond (js2-parse-condition)
-          if-true (js2-parse-statement)
-          if-false (if (js2-match-token js2-ELSE)
-                       (progn
-                         (setq else-pos (- (js2-current-token-beg) pos))
-                         (js2-parse-statement)))
-          end (js2-node-end (or if-false if-true))
-          pn (make-js2-if-node :pos pos
-                               :len (- end pos)
-                               :condition (car cond)
-                               :then-part if-true
-                               :else-part if-false
-                               :else-pos else-pos
-                               :lp (js2-relpos (cl-second cond) pos)
-                               :rp (js2-relpos (cl-third cond) pos)))
-    (js2-node-add-children pn (car cond) if-true if-false)
-    pn))
-
-(defun js2-parse-import ()
-  "Parse import statement. The current token must be js2-IMPORT."
-  (unless (js2-ast-root-p js2-current-scope)
-    (js2-report-error "msg.mod.import.decl.at.top.level"))
-  (let ((beg (js2-current-token-beg)))
-    (cond ((js2-match-token js2-STRING)
-           (make-js2-import-node
-            :pos beg
-            :len (- (js2-current-token-end) beg)
-            :module-id (js2-current-token-string)))
-          (t
-           (let* ((import-clause (js2-parse-import-clause))
-                  (from-clause (and import-clause (js2-parse-from-clause)))
-                  (module-id (when from-clause (js2-from-clause-node-module-id from-clause)))
-                  (node (make-js2-import-node
-                         :pos beg
-                         :len (- (js2-current-token-end) beg)
-                         :import import-clause
-                         :from from-clause
-                         :module-id module-id)))
-             (when import-clause
-               (js2-node-add-children node import-clause))
-             (when from-clause
-               (js2-node-add-children node from-clause))
-             node)))))
-
-(defun js2-parse-import-clause ()
-  "Parse the bindings in an import statement.
-This can take many forms:
-
-ImportedDefaultBinding -> 'foo'
-NameSpaceImport -> '* as lib'
-NamedImports -> '{foo as bar, bang}'
-ImportedDefaultBinding , NameSpaceImport -> 'foo, * as lib'
-ImportedDefaultBinding , NamedImports -> 'foo, {bar, baz as bif}'
-
-Try to match namespace imports and named imports first because nothing can
-come after them. If it is an imported default binding, then it could have named
-imports or a namespace import that follows it.
-"
-  (let* ((beg (js2-current-token-beg))
-         (clause (make-js2-import-clause-node
-                  :pos beg))
-         (children (list)))
-    (cond
-     ((js2-match-token js2-MUL)
-      (let ((ns-import (js2-parse-namespace-import)))
-        (when ns-import
-          (let ((name-node (js2-namespace-import-node-name ns-import)))
-            (js2-define-symbol
-             js2-LET (js2-name-node-name name-node) name-node t)))
-        (setf (js2-import-clause-node-namespace-import clause) ns-import)
-        (push ns-import children)))
-     ((js2-match-token js2-LC)
-      (let ((imports (js2-parse-export-bindings t)))
-        (setf (js2-import-clause-node-named-imports clause) imports)
-        (dolist (import imports)
-          (push import children)
-          (let ((name-node (js2-export-binding-node-local-name import)))
-            (when name-node
-              (js2-define-symbol
-               js2-LET (js2-name-node-name name-node) name-node t))))))
-     ((= (js2-peek-token) js2-NAME)
-      (let ((binding (js2-maybe-parse-export-binding)))
-        (let ((node-name (js2-export-binding-node-local-name binding)))
-          (js2-define-symbol js2-LET (js2-name-node-name node-name) node-name t))
-        (setf (js2-import-clause-node-default-binding clause) binding)
-        (push binding children))
-      (when (js2-match-token js2-COMMA)
-        (cond
-         ((js2-match-token js2-MUL)
-          (let ((ns-import (js2-parse-namespace-import)))
-            (let ((name-node (js2-namespace-import-node-name ns-import)))
-              (js2-define-symbol
-               js2-LET (js2-name-node-name name-node) name-node t))
-            (setf (js2-import-clause-node-namespace-import clause) ns-import)
-            (push ns-import children)))
-         ((js2-match-token js2-LC)
-          (let ((imports (js2-parse-export-bindings t)))
-            (setf (js2-import-clause-node-named-imports clause) imports)
-            (dolist (import imports)
-              (push import children)
-              (let ((name-node (js2-export-binding-node-local-name import)))
-                (when name-node
-                  (js2-define-symbol
-                   js2-LET (js2-name-node-name name-node) name-node t))))))
-         (t (js2-report-error "msg.syntax")))))
-     (t (js2-report-error "msg.mod.declaration.after.import")))
-    (setf (js2-node-len clause) (- (js2-current-token-end) beg))
-    (apply #'js2-node-add-children clause children)
-    clause))
-
-(defun js2-parse-namespace-import ()
-  "Parse a namespace import expression such as  '* as bar'.
-The current token must be js2-MUL."
-  (let ((beg (js2-current-token-beg)))
-    (when (js2-must-match js2-NAME "msg.syntax")
-        (if (equal "as" (js2-current-token-string))
-            (when (js2-must-match-prop-name "msg.syntax")
-              (let ((node (make-js2-namespace-import-node
-                           :pos beg
-                           :len (- (js2-current-token-end) beg)
-                           :name (make-js2-name-node
-                                  :pos (js2-current-token-beg)
-                                  :len (js2-current-token-end)
-                                  :name (js2-current-token-string)))))
-                (js2-node-add-children node (js2-namespace-import-node-name node))
-                node))
-          (js2-unget-token)
-          (js2-report-error "msg.syntax")))))
-
-
-(defun js2-parse-from-clause ()
-  "Parse the from clause in an import or export statement. E.g. from 'src/lib'"
-  (when (js2-must-match-name "msg.mod.from.after.import.spec.set")
-    (let ((beg (js2-current-token-beg)))
-      (if (equal "from" (js2-current-token-string))
-          (cond
-           ((js2-match-token js2-STRING)
-            (make-js2-from-clause-node
-             :pos beg
-             :len (- (js2-current-token-end) beg)
-             :module-id (js2-current-token-string)
-             :metadata-p nil))
-           ((js2-match-token js2-THIS)
-            (when (js2-must-match-name "msg.mod.spec.after.from")
-              (if (equal "module" (js2-current-token-string))
-                  (make-js2-from-clause-node
-                   :pos beg
-                   :len (- (js2-current-token-end) beg)
-                   :module-id "this"
-                   :metadata-p t)
-                (js2-unget-token)
-                (js2-unget-token)
-                (js2-report-error "msg.mod.spec.after.from")
-                nil)))
-           (t (js2-report-error "msg.mod.spec.after.from") nil))
-        (js2-unget-token)
-        (js2-report-error "msg.mod.from.after.import.spec.set")
-        nil))))
-
-(defun js2-parse-export-bindings (&optional import-p)
-  "Parse a list of export binding expressions such as {}, {foo, bar}, and
-{foo as bar, baz as bang}. The current token must be
-js2-LC. Return a lisp list of js2-export-binding-node"
-  (let ((bindings (list)))
-    (while
-        (let ((binding (js2-maybe-parse-export-binding)))
-          (when binding
-            (push binding bindings))
-          (js2-match-token js2-COMMA)))
-    (when (js2-must-match js2-RC (if import-p
-                                     "msg.mod.rc.after.import.spec.list"
-                                   "msg.mod.rc.after.export.spec.list"))
-      (reverse bindings))))
-
-(defun js2-maybe-parse-export-binding ()
-  "Attempt to parse a binding expression found inside an import/export statement.
-This can take the form of either as single js2-NAME token as in 'foo' or as in a
-rebinding expression 'bar as foo'. If it matches, it will return an instance of
-js2-export-binding-node and consume all the tokens. If it does not match, it
-consumes no tokens."
-  (let ((extern-name (when (js2-match-prop-name) (js2-current-token-string)))
-        (beg (js2-current-token-beg))
-        (extern-name-len (js2-current-token-len))
-        (is-reserved-name (or (= (js2-current-token-type) js2-RESERVED)
-                              (aref js2-kwd-tokens (js2-current-token-type)))))
-    (if extern-name
-        (let ((as (and (js2-match-token js2-NAME) (js2-current-token-string))))
-          (if (and as (equal "as" (js2-current-token-string)))
-              (let ((name
-                     (or
-                      (and (js2-match-token js2-DEFAULT) "default")
-                      (and (js2-match-token js2-NAME) (js2-current-token-string)))))
-                (if name
-                    (let ((node (make-js2-export-binding-node
-                                 :pos beg
-                                 :len (- (js2-current-token-end) beg)
-                                 :local-name (make-js2-name-node
-                                              :name name
-                                              :pos (js2-current-token-beg)
-                                              :len (js2-current-token-len))
-                                 :extern-name (make-js2-name-node
-                                               :name extern-name
-                                               :pos beg
-                                               :len extern-name-len))))
-                      (js2-node-add-children
-                       node
-                       (js2-export-binding-node-local-name node)
-                       (js2-export-binding-node-extern-name node))
-                      node)
-                  (js2-unget-token)
-                  nil))
-            (when as (js2-unget-token))
-            (let* ((name-node (make-js2-name-node
-                              :name (js2-current-token-string)
-                              :pos (js2-current-token-beg)
-                              :len (js2-current-token-len)))
-                  (node (make-js2-export-binding-node
-                         :pos (js2-current-token-beg)
-                         :len (js2-current-token-len)
-                         :local-name name-node
-                         :extern-name name-node)))
-              (when is-reserved-name
-                (js2-report-error "msg.mod.as.after.reserved.word" extern-name))
-              (js2-node-add-children node name-node)
-              node)))
-      nil)))
-
-(defun js2-parse-switch ()
-  "Parser for switch-statement.  Last matched token must be js2-SWITCH."
-  (let ((pos (js2-current-token-beg))
-        tt pn discriminant has-default case-expr case-node
-        case-pos cases stmt lp)
-    (if (js2-must-match js2-LP "msg.no.paren.switch")
-        (setq lp (js2-current-token-beg)))
-    (setq discriminant (js2-parse-expr)
-          pn (make-js2-switch-node :discriminant discriminant
-                                   :pos pos
-                                   :lp (js2-relpos lp pos)))
-    (js2-node-add-children pn discriminant)
-    (js2-enter-switch pn)
-    (unwind-protect
-        (progn
-          (if (js2-must-match js2-RP "msg.no.paren.after.switch")
-              (setf (js2-switch-node-rp pn) (- (js2-current-token-beg) pos)))
-          (js2-must-match js2-LC "msg.no.brace.switch")
-          (catch 'break
-            (while t
-              (setq tt (js2-next-token)
-                    case-pos (js2-current-token-beg))
-              (cond
-               ((= tt js2-RC)
-                (setf (js2-node-len pn) (- (js2-current-token-end) pos))
-                (throw 'break nil))  ; done
-               ((= tt js2-CASE)
-                (setq case-expr (js2-parse-expr))
-                (js2-must-match js2-COLON "msg.no.colon.case"))
-               ((= tt js2-DEFAULT)
-                (if has-default
-                    (js2-report-error "msg.double.switch.default"))
-                (setq has-default t
-                      case-expr nil)
-                (js2-must-match js2-COLON "msg.no.colon.case"))
-               (t
-                (js2-report-error "msg.bad.switch")
-                (throw 'break nil)))
-              (setq case-node (make-js2-case-node :pos case-pos
-                                                  :len (- (js2-current-token-end) case-pos)
-                                                  :expr case-expr))
-              (js2-node-add-children case-node case-expr)
-              (while (and (/= (setq tt (js2-peek-token)) js2-RC)
-                          (/= tt js2-CASE)
-                          (/= tt js2-DEFAULT)
-                          (/= tt js2-EOF))
-                (setf stmt (js2-parse-statement)
-                      (js2-node-len case-node) (- (js2-node-end stmt) case-pos))
-                (js2-block-node-push case-node stmt))
-              (push case-node cases)))
-          ;; add cases last, as pushing reverses the order to be correct
-          (dolist (kid cases)
-            (js2-node-add-children pn kid)
-            (push kid (js2-switch-node-cases pn)))
-          pn)  ; return value
-      (js2-exit-switch))))
-
-(defun js2-parse-while ()
-  "Parser for while-statement.  Last matched token must be js2-WHILE."
-  (let ((pos (js2-current-token-beg))
-        (pn (make-js2-while-node))
-        cond body)
-    (js2-enter-loop pn)
-    (unwind-protect
-        (progn
-          (setf cond (js2-parse-condition)
-                (js2-while-node-condition pn) (car cond)
-                body (js2-parse-statement)
-                (js2-while-node-body pn) body
-                (js2-node-len pn) (- (js2-node-end body) pos)
-                (js2-while-node-lp pn) (js2-relpos (cl-second cond) pos)
-                (js2-while-node-rp pn) (js2-relpos (cl-third cond) pos))
-          (js2-node-add-children pn body (car cond)))
-      (js2-exit-loop))
-    pn))
-
-(defun js2-parse-do ()
-  "Parser for do-statement.  Last matched token must be js2-DO."
-  (let ((pos (js2-current-token-beg))
-        (pn (make-js2-do-node))
-        cond body end)
-    (js2-enter-loop pn)
-    (unwind-protect
-        (progn
-          (setq body (js2-parse-statement))
-          (js2-must-match js2-WHILE "msg.no.while.do")
-          (setf (js2-do-node-while-pos pn) (- (js2-current-token-beg) pos)
-                cond (js2-parse-condition)
-                (js2-do-node-condition pn) (car cond)
-                (js2-do-node-body pn) body
-                end js2-ts-cursor
-                (js2-do-node-lp pn) (js2-relpos (cl-second cond) pos)
-                (js2-do-node-rp pn) (js2-relpos (cl-third cond) pos))
-          (js2-node-add-children pn (car cond) body))
-      (js2-exit-loop))
-    ;; Always auto-insert semicolon to follow SpiderMonkey:
-    ;; It is required by ECMAScript but is ignored by the rest of
-    ;; world; see bug 238945
-    (if (js2-match-token js2-SEMI)
-        (setq end js2-ts-cursor))
-    (setf (js2-node-len pn) (- end pos))
-    pn))
-
-(defun js2-parse-export ()
-  "Parse an export statement.
-The Last matched token must be js2-EXPORT. Currently, the 'default' and 'expr'
-expressions should only be either hoistable expressions (function or generator)
-or assignment expressions, but there is no checking to enforce that and so it
-will parse without error a small subset of
-invalid export statements."
-  (unless (js2-ast-root-p js2-current-scope)
-    (js2-report-error "msg.mod.export.decl.at.top.level"))
-  (let ((beg (js2-current-token-beg))
-        (children (list))
-        exports-list from-clause declaration default)
-    (cond
-     ((js2-match-token js2-MUL)
-      (setq from-clause (js2-parse-from-clause))
-      (when from-clause
-        (push from-clause children)))
-     ((js2-match-token js2-LC)
-      (setq exports-list (js2-parse-export-bindings))
-      (when exports-list
-        (dolist (export exports-list)
-          (push export children)))
-      (when (js2-match-token js2-NAME)
-        (if (equal "from" (js2-current-token-string))
-            (progn
-              (js2-unget-token)
-              (setq from-clause (js2-parse-from-clause)))
-          (js2-unget-token))))
-     ((js2-match-token js2-DEFAULT)
-      (setq default (js2-parse-expr)))
-     ((or (js2-match-token js2-VAR) (js2-match-token js2-CONST) (js2-match-token js2-LET))
-      (setq declaration (js2-parse-variables (js2-current-token-type) (js2-current-token-beg))))
-     (t
-      (setq declaration (js2-parse-expr))))
-    (when from-clause
-      (push from-clause children))
-    (when declaration
-      (push declaration children)
-      (when (not (js2-function-node-p declaration))
-        (js2-auto-insert-semicolon declaration)))
-    (when default
-      (push default children)
-      (when (not (js2-function-node-p default))
-        (js2-auto-insert-semicolon default)))
-    (let ((node (make-js2-export-node
-                  :pos beg
-                  :len (- (js2-current-token-end) beg)
-                  :exports-list exports-list
-                  :from-clause from-clause
-                  :declaration declaration
-                  :default default)))
-      (apply #'js2-node-add-children node children)
-      node)))
-
-(defun js2-parse-for ()
-  "Parse a for, for-in or for each-in statement.
-Last matched token must be js2-FOR."
-  (let ((for-pos (js2-current-token-beg))
-        (tmp-scope (make-js2-scope))
-        pn is-for-each is-for-in-or-of is-for-of
-        in-pos each-pos tmp-pos
-        init  ; Node init is also foo in 'foo in object'.
-        cond  ; Node cond is also object in 'foo in object'.
-        incr  ; 3rd section of for-loop initializer.
-        body tt lp rp)
-    ;; See if this is a for each () instead of just a for ()
-    (when (js2-match-token js2-NAME)
-      (if (string= "each" (js2-current-token-string))
-          (progn
-            (setq is-for-each t
-                  each-pos (- (js2-current-token-beg) for-pos)) ; relative
-            (js2-record-face 'font-lock-keyword-face))
-        (js2-report-error "msg.no.paren.for")))
-    (if (js2-must-match js2-LP "msg.no.paren.for")
-        (setq lp (- (js2-current-token-beg) for-pos)))
-    (setq tt (js2-get-token))
-    ;; Capture identifiers inside parens.  We can't create the node
-    ;; (and use it as the current scope) until we know its type.
-    (js2-push-scope tmp-scope)
-    (unwind-protect
-        (progn
-          ;; parse init clause
-          (let ((js2-in-for-init t))  ; set as dynamic variable
-            (cond
-             ((= tt js2-SEMI)
-              (js2-unget-token)
-              (setq init (make-js2-empty-expr-node)))
-             ((or (= tt js2-VAR) (= tt js2-LET))
-              (setq init (js2-parse-variables tt (js2-current-token-beg))))
-             (t
-              (js2-unget-token)
-              (setq init (js2-parse-expr)))))
-          (if (or (js2-match-token js2-IN)
-                  (and (>= js2-language-version 200)
-                       (js2-match-contextual-kwd "of")
-                       (setq is-for-of t)))
-              (setq is-for-in-or-of t
-                    in-pos (- (js2-current-token-beg) for-pos)
-                    ;; scope of iteration target object is not the scope we've created above.
-                    ;; stash current scope temporary.
-                    cond (let ((js2-current-scope (js2-scope-parent-scope js2-current-scope)))
-                           (js2-parse-expr)))  ; object over which we're iterating
-            ;; else ordinary for loop - parse cond and incr
-            (js2-must-match js2-SEMI "msg.no.semi.for")
-            (setq cond (if (= (js2-peek-token) js2-SEMI)
-                           (make-js2-empty-expr-node) ; no loop condition
-                         (js2-parse-expr)))
-            (js2-must-match js2-SEMI "msg.no.semi.for.cond")
-            (setq tmp-pos (js2-current-token-end)
-                  incr (if (= (js2-peek-token) js2-RP)
-                           (make-js2-empty-expr-node :pos tmp-pos)
-                         (js2-parse-expr)))))
-      (js2-pop-scope))
-    (if (js2-must-match js2-RP "msg.no.paren.for.ctrl")
-        (setq rp (- (js2-current-token-beg) for-pos)))
-    (if (not is-for-in-or-of)
-        (setq pn (make-js2-for-node :init init
-                                    :condition cond
-                                    :update incr
-                                    :lp lp
-                                    :rp rp))
-      ;; cond could be null if 'in obj' got eaten by the init node.
-      (if (js2-infix-node-p init)
-          ;; it was (foo in bar) instead of (var foo in bar)
-          (setq cond (js2-infix-node-right init)
-                init (js2-infix-node-left init))
-        (if (and (js2-var-decl-node-p init)
-                 (> (length (js2-var-decl-node-kids init)) 1))
-            (js2-report-error "msg.mult.index")))
-      (setq pn (make-js2-for-in-node :iterator init
-                                     :object cond
-                                     :in-pos in-pos
-                                     :foreach-p is-for-each
-                                     :each-pos each-pos
-                                     :forof-p is-for-of
-                                     :lp lp
-                                     :rp rp)))
-    ;; Transplant the declarations.
-    (setf (js2-scope-symbol-table pn)
-          (js2-scope-symbol-table tmp-scope))
-    (unwind-protect
-        (progn
-          (js2-enter-loop pn)
-          ;; We have to parse the body -after- creating the loop node,
-          ;; so that the loop node appears in the js2-loop-set, allowing
-          ;; break/continue statements to find the enclosing loop.
-          (setf body (js2-parse-statement)
-                (js2-loop-node-body pn) body
-                (js2-node-pos pn) for-pos
-                (js2-node-len pn) (- (js2-node-end body) for-pos))
-          (js2-node-add-children pn init cond incr body))
-      ;; finally
-      (js2-exit-loop))
-    pn))
-
-(defun js2-parse-try ()
-  "Parse a try statement.  Last matched token must be js2-TRY."
-  (let ((try-pos (js2-current-token-beg))
-        try-end
-        try-block
-        catch-blocks
-        finally-block
-        saw-default-catch
-        peek)
-    (if (/= (js2-peek-token) js2-LC)
-        (js2-report-error "msg.no.brace.try"))
-    (setq try-block (js2-parse-statement)
-          try-end (js2-node-end try-block)
-          peek (js2-peek-token))
-    (cond
-     ((= peek js2-CATCH)
-      (while (js2-match-token js2-CATCH)
-        (let* ((catch-pos (js2-current-token-beg))
-               (catch-node (make-js2-catch-node :pos catch-pos))
-               param
-               guard-kwd
-               catch-cond
-               lp rp)
-          (if saw-default-catch
-              (js2-report-error "msg.catch.unreachable"))
-          (if (js2-must-match js2-LP "msg.no.paren.catch")
-              (setq lp (- (js2-current-token-beg) catch-pos)))
-          (js2-push-scope catch-node)
-          (let ((tt (js2-peek-token)))
-            (cond
-             ;; Destructuring pattern:
-             ;;     catch ({ message, file }) { ... }
-             ((or (= tt js2-LB) (= tt js2-LC))
-              (js2-get-token)
-              (setq param (js2-parse-destruct-primary-expr))
-              (js2-define-destruct-symbols param js2-LET nil))
-             ;; Simple name.
-             (t
-              (js2-must-match-name "msg.bad.catchcond")
-              (setq param (js2-create-name-node))
-              (js2-define-symbol js2-LET (js2-current-token-string) param))))
-          ;; Catch condition.
-          (if (js2-match-token js2-IF)
-              (setq guard-kwd (- (js2-current-token-beg) catch-pos)
-                    catch-cond (js2-parse-expr))
-            (setq saw-default-catch t))
-          (if (js2-must-match js2-RP "msg.bad.catchcond")
-              (setq rp (- (js2-current-token-beg) catch-pos)))
-          (js2-must-match js2-LC "msg.no.brace.catchblock")
-          (js2-parse-statements catch-node)
-          (if (js2-must-match js2-RC "msg.no.brace.after.body")
-              (setq try-end (js2-current-token-end)))
-          (js2-pop-scope)
-          (setf (js2-node-len catch-node) (- try-end catch-pos)
-                (js2-catch-node-param catch-node) param
-                (js2-catch-node-guard-expr catch-node) catch-cond
-                (js2-catch-node-guard-kwd catch-node) guard-kwd
-                (js2-catch-node-lp catch-node) lp
-                (js2-catch-node-rp catch-node) rp)
-          (js2-node-add-children catch-node param catch-cond)
-          (push catch-node catch-blocks))))
-     ((/= peek js2-FINALLY)
-      (js2-must-match js2-FINALLY "msg.try.no.catchfinally"
-                      (js2-node-pos try-block)
-                      (- (setq try-end (js2-node-end try-block))
-                         (js2-node-pos try-block)))))
-    (when (js2-match-token js2-FINALLY)
-      (let ((finally-pos (js2-current-token-beg))
-            (block (js2-parse-statement)))
-        (setq try-end (js2-node-end block)
-              finally-block (make-js2-finally-node :pos finally-pos
-                                                   :len (- try-end finally-pos)
-                                                   :body block))
-        (js2-node-add-children finally-block block)))
-    (let ((pn (make-js2-try-node :pos try-pos
-                                 :len (- try-end try-pos)
-                                 :try-block try-block
-                                 :finally-block finally-block)))
-      (js2-node-add-children pn try-block finally-block)
-      ;; Push them onto the try-node, which reverses and corrects their order.
-      (dolist (cb catch-blocks)
-        (js2-node-add-children pn cb)
-        (push cb (js2-try-node-catch-clauses pn)))
-      pn)))
-
-(defun js2-parse-throw ()
-  "Parser for throw-statement.  Last matched token must be js2-THROW."
-  (let ((pos (js2-current-token-beg))
-        expr pn)
-    (if (= (js2-peek-token-or-eol) js2-EOL)
-        ;; ECMAScript does not allow new lines before throw expression,
-        ;; see bug 256617
-        (js2-report-error "msg.bad.throw.eol"))
-    (setq expr (js2-parse-expr)
-          pn (make-js2-throw-node :pos pos
-                                  :len (- (js2-node-end expr) pos)
-                                  :expr expr))
-    (js2-node-add-children pn expr)
-    pn))
-
-(defun js2-match-jump-label-name (label-name)
-  "If break/continue specified a label, return that label's labeled stmt.
-Returns the corresponding `js2-labeled-stmt-node', or if LABEL-NAME
-does not match an existing label, reports an error and returns nil."
-  (let ((bundle (cdr (assoc label-name js2-label-set))))
-    (if (null bundle)
-        (js2-report-error "msg.undef.label"))
-    bundle))
-
-(defun js2-parse-break ()
-  "Parser for break-statement.  Last matched token must be js2-BREAK."
-  (let ((pos (js2-current-token-beg))
-        (end (js2-current-token-end))
-        break-target ; statement to break from
-        break-label  ; in "break foo", name-node representing the foo
-        labels       ; matching labeled statement to break to
-        pn)
-    (when (eq (js2-peek-token-or-eol) js2-NAME)
-      (js2-get-token)
-      (setq break-label (js2-create-name-node)
-            end (js2-node-end break-label)
-            ;; matchJumpLabelName only matches if there is one
-            labels (js2-match-jump-label-name (js2-current-token-string))
-            break-target (if labels (car (js2-labeled-stmt-node-labels labels)))))
-    (unless (or break-target break-label)
-      ;; no break target specified - try for innermost enclosing loop/switch
-      (if (null js2-loop-and-switch-set)
-          (unless break-label
-            (js2-report-error "msg.bad.break" nil pos (length "break")))
-        (setq break-target (car js2-loop-and-switch-set))))
-    (setq pn (make-js2-break-node :pos pos
-                                  :len (- end pos)
-                                  :label break-label
-                                  :target break-target))
-    (js2-node-add-children pn break-label)  ; but not break-target
-    pn))
-
-(defun js2-parse-continue ()
-  "Parser for continue-statement.  Last matched token must be js2-CONTINUE."
-  (let ((pos (js2-current-token-beg))
-        (end (js2-current-token-end))
-        label   ; optional user-specified label, a `js2-name-node'
-        labels  ; current matching labeled stmt, if any
-        target  ; the `js2-loop-node' target of this continue stmt
-        pn)
-    (when (= (js2-peek-token-or-eol) js2-NAME)
-      (js2-get-token)
-      (setq label (js2-create-name-node)
-            end (js2-node-end label)
-            ;; matchJumpLabelName only matches if there is one
-            labels (js2-match-jump-label-name (js2-current-token-string))))
-    (cond
-     ((null labels)  ; no current label to go to
-      (if (null js2-loop-set)  ; no loop to continue to
-          (js2-report-error "msg.continue.outside" nil pos
-                            (length "continue"))
-        (setq target (car js2-loop-set))))  ; innermost enclosing loop
-     (t
-      (if (js2-loop-node-p (js2-labeled-stmt-node-stmt labels))
-          (setq target (js2-labeled-stmt-node-stmt labels))
-        (js2-report-error "msg.continue.nonloop" nil pos (- end pos)))))
-    (setq pn (make-js2-continue-node :pos pos
-                                     :len (- end pos)
-                                     :label label
-                                     :target target))
-    (js2-node-add-children pn label)  ; but not target - it's not our child
-    pn))
-
-(defun js2-parse-with ()
-  "Parser for with-statement.  Last matched token must be js2-WITH."
-  (let ((pos (js2-current-token-beg))
-        obj body pn lp rp)
-    (if (js2-must-match js2-LP "msg.no.paren.with")
-        (setq lp (js2-current-token-beg)))
-    (setq obj (js2-parse-expr))
-    (if (js2-must-match js2-RP "msg.no.paren.after.with")
-        (setq rp (js2-current-token-beg)))
-    (let ((js2-nesting-of-with (1+ js2-nesting-of-with)))
-        (setq body (js2-parse-statement)))
-    (setq pn (make-js2-with-node :pos pos
-                                 :len (- (js2-node-end body) pos)
-                                 :object obj
-                                 :body body
-                                 :lp (js2-relpos lp pos)
-                                 :rp (js2-relpos rp pos)))
-    (js2-node-add-children pn obj body)
-    pn))
-
-(defun js2-parse-const-var ()
-  "Parser for var- or const-statement.
-Last matched token must be js2-CONST or js2-VAR."
-  (let ((tt (js2-current-token-type))
-        (pos (js2-current-token-beg))
-        expr pn)
-    (setq expr (js2-parse-variables tt (js2-current-token-beg))
-          pn (make-js2-expr-stmt-node :pos pos
-                                      :len (- (js2-node-end expr) pos)
-                                      :expr expr))
-    (js2-node-add-children pn expr)
-    pn))
-
-(defun js2-wrap-with-expr-stmt (pos expr &optional add-child)
-  (let ((pn (make-js2-expr-stmt-node :pos pos
-                                     :len (js2-node-len expr)
-                                     :type (if (js2-inside-function)
-                                               js2-EXPR_VOID
-                                             js2-EXPR_RESULT)
-                                     :expr expr)))
-    (if add-child
-        (js2-node-add-children pn expr))
-    pn))
-
-(defun js2-parse-let-stmt ()
-  "Parser for let-statement.  Last matched token must be js2-LET."
-  (let ((pos (js2-current-token-beg))
-        expr pn)
-    (if (= (js2-peek-token) js2-LP)
-        ;; let expression in statement context
-        (setq expr (js2-parse-let pos 'statement)
-              pn (js2-wrap-with-expr-stmt pos expr t))
-      ;; else we're looking at a statement like let x=6, y=7;
-      (setf expr (js2-parse-variables js2-LET pos)
-            pn (js2-wrap-with-expr-stmt pos expr t)
-            (js2-node-type pn) js2-EXPR_RESULT))
-    pn))
-
-(defun js2-parse-ret-yield ()
-  (js2-parse-return-or-yield (js2-current-token-type) nil))
-
-(defconst js2-parse-return-stmt-enders
-  (list js2-SEMI js2-RC js2-EOF js2-EOL js2-ERROR js2-RB js2-RP js2-YIELD))
-
-(defsubst js2-now-all-set (before after mask)
-  "Return whether or not the bits in the mask have changed to all set.
-BEFORE is bits before change, AFTER is bits after change, and MASK is
-the mask for bits.  Returns t if all the bits in the mask are set in AFTER
-but not BEFORE."
-  (and (/= (logand before mask) mask)
-       (= (logand after mask) mask)))
-
-(defun js2-parse-return-or-yield (tt expr-context)
-  (let* ((pos (js2-current-token-beg))
-         (end (js2-current-token-end))
-         (before js2-end-flags)
-         (inside-function (js2-inside-function))
-         (gen-type (and inside-function (js2-function-node-generator-type
-                                         js2-current-script-or-fn)))
-         e ret name yield-star-p)
-    (unless inside-function
-      (js2-report-error (if (eq tt js2-RETURN)
-                            "msg.bad.return"
-                          "msg.bad.yield")))
-    (when (and inside-function
-               (eq gen-type 'STAR)
-               (js2-match-token js2-MUL))
-      (setq yield-star-p t))
-    ;; This is ugly, but we don't want to require a semicolon.
-    (unless (memq (js2-peek-token-or-eol) js2-parse-return-stmt-enders)
-      (setq e (js2-parse-expr)
-            end (js2-node-end e)))
-    (cond
-     ((eq tt js2-RETURN)
-      (js2-set-flag js2-end-flags (if (null e)
-                                      js2-end-returns
-                                    js2-end-returns-value))
-      (setq ret (make-js2-return-node :pos pos
-                                      :len (- end pos)
-                                      :retval e))
-      (js2-node-add-children ret e)
-      ;; See if we need a strict mode warning.
-      ;; TODO:  The analysis done by `js2-has-consistent-return-usage' is
-      ;; more thorough and accurate than this before/after flag check.
-      ;; E.g. if there's a finally-block that always returns, we shouldn't
-      ;; show a warning generated by inconsistent returns in the catch blocks.
-      ;; Basically `js2-has-consistent-return-usage' needs to keep more state,
-      ;; so we know which returns/yields to highlight, and we should get rid of
-      ;; all the checking in `js2-parse-return-or-yield'.
-      (if (and js2-strict-inconsistent-return-warning
-               (js2-now-all-set before js2-end-flags
-                                (logior js2-end-returns js2-end-returns-value)))
-          (js2-add-strict-warning "msg.return.inconsistent" nil pos end)))
-     ((eq gen-type 'COMPREHENSION)
-      ;; FIXME: We should probably switch to saving and using lastYieldOffset,
-      ;; like SpiderMonkey does.
-      (js2-report-error "msg.syntax" nil pos 5))
-     (t
-      (setq ret (make-js2-yield-node :pos pos
-                                     :len (- end pos)
-                                     :value e
-                                     :star-p yield-star-p))
-      (js2-node-add-children ret e)
-      (unless expr-context
-        (setq e ret
-              ret (js2-wrap-with-expr-stmt pos e t))
-      (js2-set-requires-activation)
-      (js2-set-is-generator))))
-    ;; see if we are mixing yields and value returns.
-    (when (and inside-function
-               (js2-flag-set-p js2-end-flags js2-end-returns-value)
-               (eq (js2-function-node-generator-type js2-current-script-or-fn)
-                   'LEGACY))
-      (setq name (js2-function-name js2-current-script-or-fn))
-      (if (zerop (length name))
-          (js2-report-error "msg.anon.generator.returns" nil pos (- end pos))
-        (js2-report-error "msg.generator.returns" name pos (- end pos))))
-    ret))
-
-(defun js2-parse-debugger ()
-  (make-js2-keyword-node :type js2-DEBUGGER))
-
-(defun js2-parse-block ()
-  "Parser for a curly-delimited statement block.
-Last token matched must be `js2-LC'."
-  (let ((pos (js2-current-token-beg))
-        (pn (make-js2-scope)))
-    (js2-push-scope pn)
-    (unwind-protect
-        (progn
-          (js2-parse-statements pn)
-          (js2-must-match js2-RC "msg.no.brace.block")
-          (setf (js2-node-len pn) (- (js2-current-token-end) pos)))
-      (js2-pop-scope))
-    pn))
-
-;; For `js2-ERROR' too, to have a node for error recovery to work on.
-(defun js2-parse-semi ()
-  "Parse a statement or handle an error.
-Current token type is `js2-SEMI' or `js2-ERROR'."
-  (let ((tt (js2-current-token-type)) pos len)
-    (if (eq tt js2-SEMI)
-        (make-js2-empty-expr-node :len 1)
-      (setq pos (js2-current-token-beg)
-            len (- (js2-current-token-end) pos))
-      (js2-report-error "msg.syntax" nil pos len)
-      (make-js2-error-node :pos pos :len len))))
-
-(defun js2-parse-default-xml-namespace ()
-  "Parse a `default xml namespace = <expr>' e4x statement."
-  (let ((pos (js2-current-token-beg))
-        end len expr unary)
-    (js2-must-have-xml)
-    (js2-set-requires-activation)
-    (setq len (- js2-ts-cursor pos))
-    (unless (and (js2-match-token js2-NAME)
-                 (string= (js2-current-token-string) "xml"))
-      (js2-report-error "msg.bad.namespace" nil pos len))
-    (unless (and (js2-match-token js2-NAME)
-                 (string= (js2-current-token-string) "namespace"))
-      (js2-report-error "msg.bad.namespace" nil pos len))
-    (unless (js2-match-token js2-ASSIGN)
-      (js2-report-error "msg.bad.namespace" nil pos len))
-    (setq expr (js2-parse-expr)
-          end (js2-node-end expr)
-          unary (make-js2-unary-node :type js2-DEFAULTNAMESPACE
-                                     :pos pos
-                                     :len (- end pos)
-                                     :operand expr))
-    (js2-node-add-children unary expr)
-    (make-js2-expr-stmt-node :pos pos
-                             :len (- end pos)
-                             :expr unary)))
-
-(defun js2-record-label (label bundle)
-  ;; current token should be colon that `js2-parse-primary-expr' left untouched
-  (js2-get-token)
-  (let ((name (js2-label-node-name label))
-        labeled-stmt
-        dup)
-    (when (setq labeled-stmt (cdr (assoc name js2-label-set)))
-      ;; flag both labels if possible when used in editing mode
-      (if (and js2-parse-ide-mode
-               (setq dup (js2-get-label-by-name labeled-stmt name)))
-          (js2-report-error "msg.dup.label" nil
-                            (js2-node-abs-pos dup) (js2-node-len dup)))
-      (js2-report-error "msg.dup.label" nil
-                        (js2-node-pos label) (js2-node-len label)))
-    (js2-labeled-stmt-node-add-label bundle label)
-    (js2-node-add-children bundle label)
-    ;; Add one reference to the bundle per label in `js2-label-set'
-    (push (cons name bundle) js2-label-set)))
-
-(defun js2-parse-name-or-label ()
-  "Parser for identifier or label.  Last token matched must be js2-NAME.
-Called when we found a name in a statement context.  If it's a label, we gather
-up any following labels and the next non-label statement into a
-`js2-labeled-stmt-node' bundle and return that.  Otherwise we parse an
-expression and return it wrapped in a `js2-expr-stmt-node'."
-  (let ((pos (js2-current-token-beg))
-        expr stmt bundle
-        (continue t))
-    ;; set check for label and call down to `js2-parse-primary-expr'
-    (setq expr (js2-maybe-parse-label))
-    (if (null expr)
-        ;; Parse the non-label expression and wrap with expression stmt.
-        (js2-wrap-with-expr-stmt pos (js2-parse-expr) t)
-      ;; else parsed a label
-      (setq bundle (make-js2-labeled-stmt-node :pos pos))
-      (js2-record-label expr bundle)
-      ;; look for more labels
-      (while (and continue (= (js2-get-token) js2-NAME))
-        (if (setq expr (js2-maybe-parse-label))
-            (js2-record-label expr bundle)
-          (setq expr (js2-parse-expr)
-                stmt (js2-wrap-with-expr-stmt (js2-node-pos expr) expr t)
-                continue nil)
-          (js2-auto-insert-semicolon stmt)))
-      ;; no more labels; now parse the labeled statement
-      (unwind-protect
-            (unless stmt
-              (let ((js2-labeled-stmt bundle))  ; bind dynamically
-                (js2-unget-token)
-                (setq stmt (js2-statement-helper))))
-        ;; remove the labels for this statement from the global set
-        (dolist (label (js2-labeled-stmt-node-labels bundle))
-          (setq js2-label-set (remove label js2-label-set))))
-      (setf (js2-labeled-stmt-node-stmt bundle) stmt
-            (js2-node-len bundle) (- (js2-node-end stmt) pos))
-      (js2-node-add-children bundle stmt)
-      bundle)))
-
-(defun js2-maybe-parse-label ()
-  (cl-assert (= (js2-current-token-type) js2-NAME))
-  (let (label-pos
-        (next-tt (js2-get-token))
-        (label-end (js2-current-token-end)))
-    ;; Do not consume colon, it is used as unwind indicator
-    ;; to return to statementHelper.
-    (js2-unget-token)
-    (if (= next-tt js2-COLON)
-        (prog2
-            (setq label-pos (js2-current-token-beg))
-            (make-js2-label-node :pos label-pos
-                                 :len (- label-end label-pos)
-                                 :name (js2-current-token-string))
-          (js2-set-face label-pos
-                        label-end
-                        'font-lock-variable-name-face 'record))
-      ;; Backtrack from the name token, too.
-      (js2-unget-token)
-      nil)))
-
-(defun js2-parse-expr-stmt ()
-  "Default parser in statement context, if no recognized statement found."
-  (js2-wrap-with-expr-stmt (js2-current-token-beg)
-                           (progn
-                             (js2-unget-token)
-                             (js2-parse-expr)) t))
-
-(defun js2-parse-variables (decl-type pos)
-  "Parse a comma-separated list of variable declarations.
-Could be a 'var', 'const' or 'let' expression, possibly in a for-loop initializer.
-
-DECL-TYPE is a token value: either VAR, CONST, or LET depending on context.
-For 'var' or 'const', the keyword should be the token last scanned.
-
-POS is the position where the node should start. It's sometimes the
-var/const/let keyword, and other times the beginning of the first token
-in the first variable declaration.
-
-Returns the parsed `js2-var-decl-node' expression node."
-  (let* ((result (make-js2-var-decl-node :decl-type decl-type
-                                         :pos pos))
-         destructuring kid-pos tt init name end nbeg nend vi
-         (continue t))
-    ;; Example:
-    ;; var foo = {a: 1, b: 2}, bar = [3, 4];
-    ;; var {b: s2, a: s1} = foo, x = 6, y, [s3, s4] = bar;
-    ;; var {a, b} = baz;
-    (while continue
-      (setq destructuring nil
-            name nil
-            tt (js2-get-token)
-            kid-pos (js2-current-token-beg)
-            end (js2-current-token-end)
-            init nil)
-      (if (or (= tt js2-LB) (= tt js2-LC))
-          ;; Destructuring assignment, e.g., var [a, b] = ...
-          (setq destructuring (js2-parse-destruct-primary-expr)
-                end (js2-node-end destructuring))
-        ;; Simple variable name
-        (js2-unget-token)
-        (when (js2-must-match-name "msg.bad.var")
-          (setq name (js2-create-name-node)
-                nbeg (js2-current-token-beg)
-                nend (js2-current-token-end)
-                end nend)
-          (js2-define-symbol decl-type (js2-current-token-string) name js2-in-for-init)))
-      (when (js2-match-token js2-ASSIGN)
-        (setq init (js2-parse-assign-expr)
-              end (js2-node-end init))
-        (js2-record-imenu-functions init name))
-      (when name
-        (js2-set-face nbeg nend (if (js2-function-node-p init)
-                                    'font-lock-function-name-face
-                                  'font-lock-variable-name-face)
-                      'record))
-      (setq vi (make-js2-var-init-node :pos kid-pos
-                                       :len (- end kid-pos)
-                                       :type decl-type))
-      (if destructuring
-          (progn
-            (if (and (null init) (not js2-in-for-init))
-                (js2-report-error "msg.destruct.assign.no.init"))
-            (js2-define-destruct-symbols destructuring
-                                         decl-type
-                                         'font-lock-variable-name-face)
-            (setf (js2-var-init-node-target vi) destructuring))
-        (setf (js2-var-init-node-target vi) name))
-      (setf (js2-var-init-node-initializer vi) init)
-      (js2-node-add-children vi name destructuring init)
-      (js2-block-node-push result vi)
-      (unless (js2-match-token js2-COMMA)
-        (setq continue nil)))
-    (setf (js2-node-len result) (- end pos))
-    result))
-
-(defun js2-parse-let (pos &optional stmt-p)
-  "Parse a let expression or statement.
-A let-expression is of the form `let (vars) expr'.
-A let-statement is of the form `let (vars) {statements}'.
-The third form of let is a variable declaration list, handled
-by `js2-parse-variables'."
-  (let ((pn (make-js2-let-node :pos pos))
-        beg vars body)
-    (if (js2-must-match js2-LP "msg.no.paren.after.let")
-        (setf (js2-let-node-lp pn) (- (js2-current-token-beg) pos)))
-    (js2-push-scope pn)
-    (unwind-protect
-        (progn
-          (setq vars (js2-parse-variables js2-LET (js2-current-token-beg)))
-          (if (js2-must-match js2-RP "msg.no.paren.let")
-              (setf (js2-let-node-rp pn) (- (js2-current-token-beg) pos)))
-          (if (and stmt-p (js2-match-token js2-LC))
-              ;; let statement
-              (progn
-                (setf beg (js2-current-token-beg)  ; position stmt at LC
-                      body (js2-parse-statements))
-                (js2-must-match js2-RC "msg.no.curly.let")
-                (setf (js2-node-len body) (- (js2-current-token-end) beg)
-                      (js2-node-len pn) (- (js2-current-token-end) pos)
-                      (js2-let-node-body pn) body
-                      (js2-node-type pn) js2-LET))
-            ;; let expression
-            (setf body (js2-parse-expr)
-                  (js2-node-len pn) (- (js2-node-end body) pos)
-                  (js2-let-node-body pn) body))
-          (setf (js2-let-node-vars pn) vars)
-          (js2-node-add-children pn vars body))
-      (js2-pop-scope))
-    pn))
-
-(defun js2-define-new-symbol (decl-type name node &optional scope)
-  (js2-scope-put-symbol (or scope js2-current-scope)
-                        name
-                        (make-js2-symbol decl-type name node)))
-
-(defun js2-define-symbol (decl-type name &optional node ignore-not-in-block)
-  "Define a symbol in the current scope.
-If NODE is non-nil, it is the AST node associated with the symbol."
-  (let* ((defining-scope (js2-get-defining-scope js2-current-scope name))
-         (symbol (if defining-scope
-                     (js2-scope-get-symbol defining-scope name)))
-         (sdt (if symbol (js2-symbol-decl-type symbol) -1))
-         (pos (if node (js2-node-abs-pos node)))
-         (len (if node (js2-node-len node))))
-    (cond
-     ((and symbol ; already defined
-           (or (= sdt js2-CONST) ; old version is const
-               (= decl-type js2-CONST) ; new version is const
-               ;; two let-bound vars in this block have same name
-               (and (= sdt js2-LET)
-                    (eq defining-scope js2-current-scope))))
-      (js2-report-error
-       (cond
-        ((= sdt js2-CONST) "msg.const.redecl")
-        ((= sdt js2-LET) "msg.let.redecl")
-        ((= sdt js2-VAR) "msg.var.redecl")
-        ((= sdt js2-FUNCTION) "msg.function.redecl")
-        (t "msg.parm.redecl"))
-       name pos len))
-     ((= decl-type js2-LET)
-      (if (and (not ignore-not-in-block)
-               (or (= (js2-node-type js2-current-scope) js2-IF)
-                   (js2-loop-node-p js2-current-scope)))
-          (js2-report-error "msg.let.decl.not.in.block")
-        (js2-define-new-symbol decl-type name node)))
-     ((or (= decl-type js2-VAR)
-          (= decl-type js2-CONST)
-          (= decl-type js2-FUNCTION))
-      (if symbol
-          (if (and js2-strict-var-redeclaration-warning (= sdt js2-VAR))
-              (js2-add-strict-warning "msg.var.redecl" name)
-            (if (and js2-strict-var-hides-function-arg-warning (= sdt js2-LP))
-                (js2-add-strict-warning "msg.var.hides.arg" name)))
-        (js2-define-new-symbol decl-type name node
-                               js2-current-script-or-fn)))
-     ((= decl-type js2-LP)
-      (if symbol
-          ;; must be duplicate parameter. Second parameter hides the
-          ;; first, so go ahead and add the second pararameter
-          (js2-report-warning "msg.dup.parms" name))
-      (js2-define-new-symbol decl-type name node))
-     (t (js2-code-bug)))))
-
-(defun js2-parse-paren-expr-or-generator-comp ()
-  (let ((px-pos (js2-current-token-beg)))
-    (cond
-     ((and (>= js2-language-version 200)
-           (js2-match-token js2-FOR))
-      (js2-parse-generator-comp px-pos))
-     ((and (>= js2-language-version 200)
-           (js2-match-token js2-RP))
-      ;; Not valid expression syntax, but this is valid in an arrow
-      ;; function with no params: () => body.
-      (if (eq (js2-peek-token) js2-ARROW)
-          ;; Return whatever, it will hopefully be rewinded and
-          ;; reparsed when we reach the =>.
-          (make-js2-keyword-node :type js2-NULL)
-        (js2-report-error "msg.syntax")
-        (make-js2-error-node)))
-     (t
-      (let* ((js2-in-for-init nil)
-             (expr (js2-parse-expr))
-             (pn (make-js2-paren-node :pos px-pos
-                                      :expr expr)))
-        (js2-node-add-children pn (js2-paren-node-expr pn))
-        (js2-must-match js2-RP "msg.no.paren")
-        (setf (js2-node-len pn) (- (js2-current-token-end) px-pos))
-        pn)))))
-
-(defun js2-parse-expr (&optional oneshot)
-  (let* ((pn (js2-parse-assign-expr))
-         (pos (js2-node-pos pn))
-         left
-         right
-         op-pos)
-    (while (and (not oneshot)
-                (js2-match-token js2-COMMA))
-      (setq op-pos (- (js2-current-token-beg) pos))  ; relative
-      (if (= (js2-peek-token) js2-YIELD)
-          (js2-report-error "msg.yield.parenthesized"))
-      (setq right (js2-parse-assign-expr)
-            left pn
-            pn (make-js2-infix-node :type js2-COMMA
-                                    :pos pos
-                                    :len (- js2-ts-cursor pos)
-                                    :op-pos op-pos
-                                    :left left
-                                    :right right))
-      (js2-node-add-children pn left right))
-    pn))
-
-(defun js2-parse-assign-expr ()
-  (let ((tt (js2-get-token))
-        (pos (js2-current-token-beg))
-        pn left right op-pos
-        ts-state recorded-identifiers parsed-errors)
-    (if (= tt js2-YIELD)
-        (js2-parse-return-or-yield tt t)
-      ;; Save the tokenizer state in case we find an arrow function
-      ;; and have to rewind.
-      (setq ts-state (make-js2-ts-state)
-            recorded-identifiers js2-recorded-identifiers
-            parsed-errors js2-parsed-errors)
-      ;; not yield - parse assignment expression
-      (setq pn (js2-parse-cond-expr)
-            tt (js2-get-token))
-      (cond
-       ((and (<= js2-first-assign tt)
-             (<= tt js2-last-assign))
-        ;; tt express assignment (=, |=, ^=, ..., %=)
-        (setq op-pos (- (js2-current-token-beg) pos)  ; relative
-              left pn)
-        (setq right (js2-parse-assign-expr)
-              pn (make-js2-assign-node :type tt
-                                       :pos pos
-                                       :len (- (js2-node-end right) pos)
-                                       :op-pos op-pos
-                                       :left left
-                                       :right right))
-        (when js2-parse-ide-mode
-          (js2-highlight-assign-targets pn left right)
-          (js2-record-imenu-functions right left))
-        ;; do this last so ide checks above can use absolute positions
-        (js2-node-add-children pn left right))
-       ((and (= tt js2-ARROW)
-             (>= js2-language-version 200))
-        (js2-ts-seek ts-state)
-        (setq js2-recorded-identifiers recorded-identifiers
-              js2-parsed-errors parsed-errors)
-        (setq pn (js2-parse-function 'FUNCTION_ARROW (js2-current-token-beg) nil)))
-       (t
-        (js2-unget-token)))
-      pn)))
-
-(defun js2-parse-cond-expr ()
-  (let ((pos (js2-current-token-beg))
-        (pn (js2-parse-or-expr))
-        test-expr
-        if-true
-        if-false
-        q-pos
-        c-pos)
-    (when (js2-match-token js2-HOOK)
-      (setq q-pos (- (js2-current-token-beg) pos)
-            if-true (let (js2-in-for-init) (js2-parse-assign-expr)))
-      (js2-must-match js2-COLON "msg.no.colon.cond")
-      (setq c-pos (- (js2-current-token-beg) pos)
-            if-false (js2-parse-assign-expr)
-            test-expr pn
-            pn (make-js2-cond-node :pos pos
-                                   :len (- (js2-node-end if-false) pos)
-                                   :test-expr test-expr
-                                   :true-expr if-true
-                                   :false-expr if-false
-                                   :q-pos q-pos
-                                   :c-pos c-pos))
-      (js2-node-add-children pn test-expr if-true if-false))
-    pn))
-
-(defun js2-make-binary (type left parser)
-  "Helper for constructing a binary-operator AST node.
-LEFT is the left-side-expression, already parsed, and the
-binary operator should have just been matched.
-PARSER is a function to call to parse the right operand,
-or a `js2-node' struct if it has already been parsed.
-FIXME: The latter option is unused?"
-  (let* ((pos (js2-node-pos left))
-         (op-pos (- (js2-current-token-beg) pos))
-         (right (if (js2-node-p parser)
-                    parser
-                  (js2-get-token)
-                  (funcall parser)))
-         (pn (make-js2-infix-node :type type
-                                  :pos pos
-                                  :len (- (js2-node-end right) pos)
-                                  :op-pos op-pos
-                                  :left left
-                                  :right right)))
-    (js2-node-add-children pn left right)
-    pn))
-
-(defun js2-parse-or-expr ()
-  (let ((pn (js2-parse-and-expr)))
-    (when (js2-match-token js2-OR)
-      (setq pn (js2-make-binary js2-OR
-                                pn
-                                'js2-parse-or-expr)))
-    pn))
-
-(defun js2-parse-and-expr ()
-  (let ((pn (js2-parse-bit-or-expr)))
-    (when (js2-match-token js2-AND)
-      (setq pn (js2-make-binary js2-AND
-                                pn
-                                'js2-parse-and-expr)))
-    pn))
-
-(defun js2-parse-bit-or-expr ()
-  (let ((pn (js2-parse-bit-xor-expr)))
-    (while (js2-match-token js2-BITOR)
-      (setq pn (js2-make-binary js2-BITOR
-                                pn
-                                'js2-parse-bit-xor-expr)))
-    pn))
-
-(defun js2-parse-bit-xor-expr ()
-  (let ((pn (js2-parse-bit-and-expr)))
-    (while (js2-match-token js2-BITXOR)
-      (setq pn (js2-make-binary js2-BITXOR
-                                pn
-                                'js2-parse-bit-and-expr)))
-    pn))
-
-(defun js2-parse-bit-and-expr ()
-  (let ((pn (js2-parse-eq-expr)))
-    (while (js2-match-token js2-BITAND)
-      (setq pn (js2-make-binary js2-BITAND
-                                pn
-                                'js2-parse-eq-expr)))
-    pn))
-
-(defconst js2-parse-eq-ops
-  (list js2-EQ js2-NE js2-SHEQ js2-SHNE))
-
-(defun js2-parse-eq-expr ()
-  (let ((pn (js2-parse-rel-expr))
-        tt)
-    (while (memq (setq tt (js2-get-token)) js2-parse-eq-ops)
-      (setq pn (js2-make-binary tt
-                                pn
-                                'js2-parse-rel-expr)))
-    (js2-unget-token)
-    pn))
-
-(defconst js2-parse-rel-ops
-  (list js2-IN js2-INSTANCEOF js2-LE js2-LT js2-GE js2-GT))
-
-(defun js2-parse-rel-expr ()
-  (let ((pn (js2-parse-shift-expr))
-        (continue t)
-        tt)
-    (while continue
-      (setq tt (js2-get-token))
-      (cond
-       ((and js2-in-for-init (= tt js2-IN))
-        (js2-unget-token)
-        (setq continue nil))
-       ((memq tt js2-parse-rel-ops)
-        (setq pn (js2-make-binary tt pn 'js2-parse-shift-expr)))
-       (t
-        (js2-unget-token)
-        (setq continue nil))))
-    pn))
-
-(defconst js2-parse-shift-ops
-  (list js2-LSH js2-URSH js2-RSH))
-
-(defun js2-parse-shift-expr ()
-  (let ((pn (js2-parse-add-expr))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-get-token))
-      (if (memq tt js2-parse-shift-ops)
-          (setq pn (js2-make-binary tt pn 'js2-parse-add-expr))
-        (js2-unget-token)
-        (setq continue nil)))
-    pn))
-
-(defun js2-parse-add-expr ()
-  (let ((pn (js2-parse-mul-expr))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-get-token))
-      (if (or (= tt js2-ADD) (= tt js2-SUB))
-          (setq pn (js2-make-binary tt pn 'js2-parse-mul-expr))
-        (js2-unget-token)
-        (setq continue nil)))
-    pn))
-
-(defconst js2-parse-mul-ops
-  (list js2-MUL js2-DIV js2-MOD))
-
-(defun js2-parse-mul-expr ()
-  (let ((pn (js2-parse-unary-expr))
-        tt
-        (continue t))
-    (while continue
-      (setq tt (js2-get-token))
-      (if (memq tt js2-parse-mul-ops)
-          (setq pn (js2-make-binary tt pn 'js2-parse-unary-expr))
-        (js2-unget-token)
-        (setq continue nil)))
-    pn))
-
-(defun js2-make-unary (type parser &rest args)
-  "Make a unary node of type TYPE.
-PARSER is either a node (for postfix operators) or a function to call
-to parse the operand (for prefix operators)."
-  (let* ((pos (js2-current-token-beg))
-         (postfix (js2-node-p parser))
-         (expr (if postfix
-                   parser
-                 (apply parser args)))
-         end
-         pn)
-    (if postfix  ; e.g. i++
-        (setq pos (js2-node-pos expr)
-              end (js2-current-token-end))
-      (setq end (js2-node-end expr)))
-    (setq pn (make-js2-unary-node :type type
-                                  :pos pos
-                                  :len (- end pos)
-                                  :operand expr))
-    (js2-node-add-children pn expr)
-    pn))
-
-(defconst js2-incrementable-node-types
-  (list js2-NAME js2-GETPROP js2-GETELEM js2-GET_REF js2-CALL)
-  "Node types that can be the operand of a ++ or -- operator.")
-
-(defun js2-check-bad-inc-dec (tt beg end unary)
-  (unless (memq (js2-node-type (js2-unary-node-operand unary))
-                js2-incrementable-node-types)
-    (js2-report-error (if (= tt js2-INC)
-                          "msg.bad.incr"
-                        "msg.bad.decr")
-                      nil beg (- end beg))))
-
-(defun js2-parse-unary-expr ()
-  (let ((tt (js2-current-token-type))
-        pn expr beg end)
-    (cond
-     ((or (= tt js2-VOID)
-          (= tt js2-NOT)
-          (= tt js2-BITNOT)
-          (= tt js2-TYPEOF))
-      (js2-get-token)
-      (js2-make-unary tt 'js2-parse-unary-expr))
-     ((= tt js2-ADD)
-      (js2-get-token)
-      ;; Convert to special POS token in decompiler and parse tree
-      (js2-make-unary js2-POS 'js2-parse-unary-expr))
-     ((= tt js2-SUB)
-      (js2-get-token)
-      ;; Convert to special NEG token in decompiler and parse tree
-      (js2-make-unary js2-NEG 'js2-parse-unary-expr))
-     ((or (= tt js2-INC)
-          (= tt js2-DEC))
-      (js2-get-token)
-      (prog1
-          (setq beg (js2-current-token-beg)
-                end (js2-current-token-end)
-                expr (js2-make-unary tt 'js2-parse-member-expr t))
-        (js2-check-bad-inc-dec tt beg end expr)))
-     ((= tt js2-DELPROP)
-      (js2-get-token)
-      (js2-make-unary js2-DELPROP 'js2-parse-unary-expr))
-     ((= tt js2-ERROR)
-      (js2-get-token)
-      (make-js2-error-node))  ; try to continue
-     ((and (= tt js2-LT)
-           js2-compiler-xml-available)
-      ;; XML stream encountered in expression.
-      (js2-parse-member-expr-tail t (js2-parse-xml-initializer)))
-     (t
-      (setq pn (js2-parse-member-expr t)
-            ;; Don't look across a newline boundary for a postfix incop.
-            tt (js2-peek-token-or-eol))
-      (when (or (= tt js2-INC) (= tt js2-DEC))
-        (js2-get-token)
-        (setf expr pn
-              pn (js2-make-unary tt expr))
-        (js2-node-set-prop pn 'postfix t)
-        (js2-check-bad-inc-dec tt (js2-current-token-beg) (js2-current-token-end) pn))
-      pn))))
-
-(defun js2-parse-xml-initializer ()
-  "Parse an E4X XML initializer.
-I'm parsing it the way Rhino parses it, but without the tree-rewriting.
-Then I'll postprocess the result, depending on whether we're in IDE
-mode or codegen mode, and generate the appropriate rewritten AST.
-IDE mode uses a rich AST that models the XML structure.  Codegen mode
-just concatenates everything and makes a new XML or XMLList out of it."
-  (let ((tt (js2-get-first-xml-token))
-        pn-xml pn expr kids expr-pos
-        (continue t)
-        (first-token t))
-    (when (not (or (= tt js2-XML) (= tt js2-XMLEND)))
-      (js2-report-error "msg.syntax"))
-    (setq pn-xml (make-js2-xml-node))
-    (while continue
-      (if first-token
-          (setq first-token nil)
-        (setq tt (js2-get-next-xml-token)))
-      (cond
-       ;; js2-XML means we found a {expr} in the XML stream.
-       ;; The token string is the XML up to the left-curly.
-       ((= tt js2-XML)
-        (push (make-js2-string-node :pos (js2-current-token-beg)
-                                    :len (- js2-ts-cursor (js2-current-token-beg)))
-              kids)
-        (js2-must-match js2-LC "msg.syntax")
-        (setq expr-pos js2-ts-cursor
-              expr (if (eq (js2-peek-token) js2-RC)
-                       (make-js2-empty-expr-node :pos expr-pos)
-                     (js2-parse-expr)))
-        (js2-must-match js2-RC "msg.syntax")
-        (setq pn (make-js2-xml-js-expr-node :pos (js2-node-pos expr)
-                                            :len (js2-node-len expr)
-                                            :expr expr))
-        (js2-node-add-children pn expr)
-        (push pn kids))
-       ;; a js2-XMLEND token means we hit the final close-tag.
-       ((= tt js2-XMLEND)
-        (push (make-js2-string-node :pos (js2-current-token-beg)
-                                    :len (- js2-ts-cursor (js2-current-token-beg)))
-              kids)
-        (dolist (kid (nreverse kids))
-          (js2-block-node-push pn-xml kid))
-        (setf (js2-node-len pn-xml) (- js2-ts-cursor
-                                       (js2-node-pos pn-xml))
-              continue nil))
-       (t
-        (js2-report-error "msg.syntax")
-        (setq continue nil))))
-    pn-xml))
-
-
-(defun js2-parse-argument-list ()
-  "Parse an argument list and return it as a Lisp list of nodes.
-Returns the list in reverse order.  Consumes the right-paren token."
-  (let (result)
-    (unless (js2-match-token js2-RP)
-      (cl-loop do
-               (let ((tt (js2-get-token)))
-                 (if (= tt js2-YIELD)
-                     (js2-report-error "msg.yield.parenthesized"))
-                 (if (and (= tt js2-TRIPLEDOT)
-                          (>= js2-language-version 200))
-                     (push (js2-make-unary tt 'js2-parse-assign-expr) result)
-                   (js2-unget-token)
-                   (push (js2-parse-assign-expr) result)))
-               while
-               (js2-match-token js2-COMMA))
-      (js2-must-match js2-RP "msg.no.paren.arg")
-      result)))
-
-(defun js2-parse-member-expr (&optional allow-call-syntax)
-  (let ((tt (js2-current-token-type))
-        pn pos target args beg end init)
-    (if (/= tt js2-NEW)
-        (setq pn (js2-parse-primary-expr))
-      ;; parse a 'new' expression
-      (js2-get-token)
-      (setq pos (js2-current-token-beg)
-            beg pos
-            target (js2-parse-member-expr)
-            end (js2-node-end target)
-            pn (make-js2-new-node :pos pos
-                                  :target target
-                                  :len (- end pos)))
-      (js2-highlight-function-call (js2-current-token))
-      (js2-node-add-children pn target)
-      (when (js2-match-token js2-LP)
-        ;; Add the arguments to pn, if any are supplied.
-        (setf beg pos  ; start of "new" keyword
-              pos (js2-current-token-beg)
-              args (nreverse (js2-parse-argument-list))
-              (js2-new-node-args pn) args
-              end (js2-current-token-end)
-              (js2-new-node-lp pn) (- pos beg)
-              (js2-new-node-rp pn) (- end 1 beg))
-        (apply #'js2-node-add-children pn args))
-      (when (and js2-allow-rhino-new-expr-initializer
-                 (js2-match-token js2-LC))
-        (setf init (js2-parse-object-literal)
-              end (js2-node-end init)
-              (js2-new-node-initializer pn) init)
-        (js2-node-add-children pn init))
-        (setf (js2-node-len pn) (- end beg)))  ; end outer if
-    (js2-parse-member-expr-tail allow-call-syntax pn)))
-
-(defun js2-parse-member-expr-tail (allow-call-syntax pn)
-  "Parse a chain of property/array accesses or function calls.
-Includes parsing for E4X operators like `..' and `.@'.
-If ALLOW-CALL-SYNTAX is nil, stops when we encounter a left-paren.
-Returns an expression tree that includes PN, the parent node."
-  (let (tt
-        (continue t))
-    (while continue
-      (setq tt (js2-get-token))
-      (cond
-       ((or (= tt js2-DOT) (= tt js2-DOTDOT))
-        (setq pn (js2-parse-property-access tt pn)))
-       ((= tt js2-DOTQUERY)
-        (setq pn (js2-parse-dot-query pn)))
-       ((= tt js2-LB)
-        (setq pn (js2-parse-element-get pn)))
-       ((= tt js2-LP)
-        (js2-unget-token)
-        (if allow-call-syntax
-            (setq pn (js2-parse-function-call pn))
-          (setq continue nil)))
-       ((= tt js2-TEMPLATE_HEAD)
-        (setq pn (js2-parse-tagged-template pn (js2-parse-template-literal))))
-       ((= tt js2-NO_SUBS_TEMPLATE)
-        (setq pn (js2-parse-tagged-template pn (make-js2-string-node :type tt))))
-       (t
-        (js2-unget-token)
-        (setq continue nil))))
-    (if (>= js2-highlight-level 2)
-        (js2-parse-highlight-member-expr-node pn))
-    pn))
-
-(defun js2-parse-tagged-template (tag-node tpl-node)
-  "Parse tagged template expression."
-  (let* ((beg (js2-node-pos tag-node))
-         (pn (make-js2-tagged-template-node :beg beg
-                                            :len (- (js2-current-token-end) beg)
-                                            :tag tag-node
-                                            :template tpl-node)))
-    (js2-node-add-children pn tag-node tpl-node)
-    pn))
-
-(defun js2-parse-dot-query (pn)
-  "Parse a dot-query expression, e.g. foo.bar.(@name == 2)
-Last token parsed must be `js2-DOTQUERY'."
-  (let ((pos (js2-node-pos pn))
-        op-pos expr end)
-    (js2-must-have-xml)
-    (js2-set-requires-activation)
-    (setq op-pos (js2-current-token-beg)
-          expr (js2-parse-expr)
-          end (js2-node-end expr)
-          pn (make-js2-xml-dot-query-node :left pn
-                                          :pos pos
-                                          :op-pos op-pos
-                                          :right expr))
-    (js2-node-add-children pn
-                           (js2-xml-dot-query-node-left pn)
-                           (js2-xml-dot-query-node-right pn))
-    (if (js2-must-match js2-RP "msg.no.paren")
-        (setf (js2-xml-dot-query-node-rp pn) (js2-current-token-beg)
-              end (js2-current-token-end)))
-    (setf (js2-node-len pn) (- end pos))
-    pn))
-
-(defun js2-parse-element-get (pn)
-  "Parse an element-get expression, e.g. foo[bar].
-Last token parsed must be `js2-RB'."
-  (let ((lb (js2-current-token-beg))
-        (pos (js2-node-pos pn))
-        rb expr)
-    (setq expr (js2-parse-expr))
-    (if (js2-must-match js2-RB "msg.no.bracket.index")
-        (setq rb (js2-current-token-beg)))
-    (setq pn (make-js2-elem-get-node :target pn
-                                     :pos pos
-                                     :element expr
-                                     :lb (js2-relpos lb pos)
-                                     :rb (js2-relpos rb pos)
-                                     :len (- (js2-current-token-end) pos)))
-    (js2-node-add-children pn
-                           (js2-elem-get-node-target pn)
-                           (js2-elem-get-node-element pn))
-    pn))
-
-(defun js2-highlight-function-call (token)
-  (when (eq (js2-token-type token) js2-NAME)
-    (js2-record-face 'js2-function-call token)))
-
-(defun js2-parse-function-call (pn)
-  (js2-highlight-function-call (js2-current-token))
-  (js2-get-token)
-  (let (args
-        (pos (js2-node-pos pn)))
-    (setq pn (make-js2-call-node :pos pos
-                                 :target pn
-                                 :lp (- (js2-current-token-beg) pos)))
-    (js2-node-add-children pn (js2-call-node-target pn))
-    ;; Add the arguments to pn, if any are supplied.
-    (setf args (nreverse (js2-parse-argument-list))
-          (js2-call-node-rp pn) (- (js2-current-token-beg) pos)
-          (js2-call-node-args pn) args)
-    (apply #'js2-node-add-children pn args)
-    (setf (js2-node-len pn) (- js2-ts-cursor pos))
-    pn))
-
-(defun js2-parse-property-access (tt pn)
-  "Parse a property access, XML descendants access, or XML attr access."
-  (let ((member-type-flags 0)
-        (dot-pos (js2-current-token-beg))
-        (dot-len (if (= tt js2-DOTDOT) 2 1))
-        name
-        ref  ; right side of . or .. operator
-        result)
-    (when (= tt js2-DOTDOT)
-      (js2-must-have-xml)
-      (setq member-type-flags js2-descendants-flag))
-    (if (not js2-compiler-xml-available)
-        (progn
-          (js2-must-match-prop-name "msg.no.name.after.dot")
-          (setq name (js2-create-name-node t js2-GETPROP)
-                result (make-js2-prop-get-node :left pn
-                                               :pos (js2-current-token-beg)
-                                               :right name
-                                               :len (js2-current-token-len)))
-          (js2-node-add-children result pn name)
-          result)
-      ;; otherwise look for XML operators
-      (setf result (if (= tt js2-DOT)
-                       (make-js2-prop-get-node)
-                     (make-js2-infix-node :type js2-DOTDOT))
-            (js2-node-pos result) (js2-node-pos pn)
-            (js2-infix-node-op-pos result) dot-pos
-            (js2-infix-node-left result) pn  ; do this after setting position
-            tt (js2-get-prop-name-token))
-      (cond
-       ;; handles: name, ns::name, ns::*, ns::[expr]
-       ((= tt js2-NAME)
-        (setq ref (js2-parse-property-name -1 nil member-type-flags)))
-       ;; handles: *, *::name, *::*, *::[expr]
-       ((= tt js2-MUL)
-        (setq ref (js2-parse-property-name nil "*" member-type-flags)))
-       ;; handles: '@attr', '@ns::attr', '@ns::*', '@ns::[expr]', etc.
-       ((= tt js2-XMLATTR)
-        (setq result (js2-parse-attribute-access)))
-       (t
-        (js2-report-error "msg.no.name.after.dot" nil dot-pos dot-len)))
-      (if ref
-          (setf (js2-node-len result) (- (js2-node-end ref)
-                                         (js2-node-pos result))
-                (js2-infix-node-right result) ref))
-      (if (js2-infix-node-p result)
-          (js2-node-add-children result
-                                 (js2-infix-node-left result)
-                                 (js2-infix-node-right result)))
-      result)))
-
-(defun js2-parse-attribute-access ()
-  "Parse an E4X XML attribute expression.
-This includes expressions of the forms:
-
-  @attr      @ns::attr     @ns::*
-  @*         @*::attr      @*::*
-  @[expr]    @*::[expr]    @ns::[expr]
-
-Called if we peeked an '@' token."
-  (let ((tt (js2-get-prop-name-token))
-        (at-pos (js2-current-token-beg)))
-    (cond
-     ;; handles: @name, @ns::name, @ns::*, @ns::[expr]
-     ((= tt js2-NAME)
-      (js2-parse-property-name at-pos nil 0))
-     ;; handles: @*, @*::name, @*::*, @*::[expr]
-     ((= tt js2-MUL)
-      (js2-parse-property-name (js2-current-token-beg) "*" 0))
-     ;; handles @[expr]
-     ((= tt js2-LB)
-      (js2-parse-xml-elem-ref at-pos))
-     (t
-      (js2-report-error "msg.no.name.after.xmlAttr")
-      ;; Avoid cascaded errors that happen if we make an error node here.
-      (js2-parse-property-name (js2-current-token-beg) "" 0)))))
-
-(defun js2-parse-property-name (at-pos s member-type-flags)
-  "Check if :: follows name in which case it becomes qualified name.
-
-AT-POS is a natural number if we just read an '@' token, else nil.
-S is the name or string that was matched:  an identifier, 'throw' or '*'.
-MEMBER-TYPE-FLAGS is a bit set tracking whether we're a '.' or '..' child.
-
-Returns a `js2-xml-ref-node' if it's an attribute access, a child of a '..'
-operator, or the name is followed by ::.  For a plain name, returns a
-`js2-name-node'.  Returns a `js2-error-node' for malformed XML expressions."
-  (let ((pos (or at-pos (js2-current-token-beg)))
-        colon-pos
-        (name (js2-create-name-node t (js2-current-token-type) s))
-        ns tt pn)
-    (catch 'return
-      (when (js2-match-token js2-COLONCOLON)
-        (setq ns name
-              colon-pos (js2-current-token-beg)
-              tt (js2-get-prop-name-token))
-        (cond
-         ;; handles name::name
-         ((= tt js2-NAME)
-          (setq name (js2-create-name-node)))
-         ;; handles name::*
-         ((= tt js2-MUL)
-          (setq name (js2-create-name-node nil nil "*")))
-         ;; handles name::[expr]
-         ((= tt js2-LB)
-          (throw 'return (js2-parse-xml-elem-ref at-pos ns colon-pos)))
-         (t
-          (js2-report-error "msg.no.name.after.coloncolon"))))
-      (if (and (null ns) (zerop member-type-flags))
-          name
-        (prog1
-            (setq pn
-                  (make-js2-xml-prop-ref-node :pos pos
-                                              :len (- (js2-node-end name) pos)
-                                              :at-pos at-pos
-                                              :colon-pos colon-pos
-                                              :propname name))
-          (js2-node-add-children pn name))))))
-
-(defun js2-parse-xml-elem-ref (at-pos &optional namespace colon-pos)
-  "Parse the [expr] portion of an xml element reference.
-For instance, @[expr], @*::[expr], or ns::[expr]."
-  (let* ((lb (js2-current-token-beg))
-         (pos (or at-pos lb))
-         rb
-         (expr (js2-parse-expr))
-         (end (js2-node-end expr))
-         pn)
-    (if (js2-must-match js2-RB "msg.no.bracket.index")
-        (setq rb (js2-current-token-beg)
-              end (js2-current-token-end)))
-    (prog1
-        (setq pn
-              (make-js2-xml-elem-ref-node :pos pos
-                                          :len (- end pos)
-                                          :namespace namespace
-                                          :colon-pos colon-pos
-                                          :at-pos at-pos
-                                          :expr expr
-                                          :lb (js2-relpos lb pos)
-                                          :rb (js2-relpos rb pos)))
-      (js2-node-add-children pn namespace expr))))
-
-(defun js2-parse-destruct-primary-expr ()
-  (let ((js2-is-in-destructuring t))
-    (js2-parse-primary-expr)))
-
-(defun js2-parse-primary-expr ()
-  "Parse a literal (leaf) expression of some sort.
-Includes complex literals such as functions, object-literals,
-array-literals, array comprehensions and regular expressions."
-  (let (tt)
-    (setq tt (js2-current-token-type))
-    (cond
-     ((= tt js2-CLASS)
-      (js2-parse-class-expr))
-     ((= tt js2-FUNCTION)
-      (js2-parse-function-expr))
-     ((= tt js2-LB)
-      (js2-parse-array-comp-or-literal))
-     ((= tt js2-LC)
-      (js2-parse-object-literal))
-     ((= tt js2-LET)
-      (js2-parse-let (js2-current-token-beg)))
-     ((= tt js2-LP)
-      (js2-parse-paren-expr-or-generator-comp))
-     ((= tt js2-XMLATTR)
-      (js2-must-have-xml)
-      (js2-parse-attribute-access))
-     ((= tt js2-NAME)
-      (js2-parse-name tt))
-     ((= tt js2-NUMBER)
-      (make-js2-number-node))
-     ((or (= tt js2-STRING) (= tt js2-NO_SUBS_TEMPLATE))
-      (make-js2-string-node :type tt))
-     ((= tt js2-TEMPLATE_HEAD)
-      (js2-parse-template-literal))
-     ((or (= tt js2-DIV) (= tt js2-ASSIGN_DIV))
-      ;; Got / or /= which in this context means a regexp literal
-      (let ((px-pos (js2-current-token-beg))
-            (flags (js2-read-regexp tt))
-            (end (js2-current-token-end)))
-        (prog1
-            (make-js2-regexp-node :pos px-pos
-                                  :len (- end px-pos)
-                                  :value (js2-current-token-string)
-                                  :flags flags)
-          (js2-set-face px-pos end 'font-lock-string-face 'record)
-          (js2-record-text-property px-pos end 'syntax-table '(2)))))
-     ((or (= tt js2-NULL)
-          (= tt js2-THIS)
-          (= tt js2-SUPER)
-          (= tt js2-FALSE)
-          (= tt js2-TRUE))
-      (make-js2-keyword-node :type tt))
-     ((= tt js2-TRIPLEDOT)
-      ;; Likewise, only valid in an arrow function with a rest param.
-      (if (and (js2-match-token js2-NAME)
-               (js2-match-token js2-RP)
-               (eq (js2-peek-token) js2-ARROW))
-          (progn
-            (js2-unget-token)  ; Put back the right paren.
-            ;; See the previous case.
-            (make-js2-keyword-node :type js2-NULL))
-        (js2-report-error "msg.syntax")
-        (make-js2-error-node)))
-     ((= tt js2-RESERVED)
-      (js2-report-error "msg.reserved.id")
-      (make-js2-name-node))
-     ((= tt js2-ERROR)
-      ;; the scanner or one of its subroutines reported the error.
-      (make-js2-error-node))
-     ((= tt js2-EOF)
-      (let* ((px-pos (point-at-bol))
-             (len (- js2-ts-cursor px-pos)))
-        (js2-report-error "msg.unexpected.eof" nil px-pos len))
-      (make-js2-error-node :pos (1- js2-ts-cursor)))
-     (t
-      (js2-report-error "msg.syntax")
-      (make-js2-error-node)))))
-
-(defun js2-parse-template-literal ()
-  (let ((beg (js2-current-token-beg))
-        (kids (list (make-js2-string-node :type js2-TEMPLATE_HEAD)))
-        (tt js2-TEMPLATE_HEAD))
-    (while (eq tt js2-TEMPLATE_HEAD)
-      (push (js2-parse-expr) kids)
-      (js2-must-match js2-RC "msg.syntax")
-      (setq tt (js2-get-token 'TEMPLATE_TAIL))
-      (push (make-js2-string-node :type tt) kids))
-    (setq kids (nreverse kids))
-    (let ((tpl (make-js2-template-node :beg beg
-                                       :len (- (js2-current-token-end) beg)
-                                       :kids kids)))
-      (apply #'js2-node-add-children tpl kids)
-      tpl)))
-
-(defun js2-parse-name (_tt)
-  (let ((name (js2-current-token-string))
-        node)
-    (setq node (if js2-compiler-xml-available
-                   (js2-parse-property-name nil name 0)
-                 (js2-create-name-node 'check-activation nil name)))
-    (if js2-highlight-external-variables
-        (js2-record-name-node node))
-    node))
-
-(defun js2-parse-warn-trailing-comma (msg pos elems comma-pos)
-  (js2-add-strict-warning
-   msg nil
-   ;; back up from comma to beginning of line or array/objlit
-   (max (if elems
-            (js2-node-pos (car elems))
-          pos)
-        (save-excursion
-          (goto-char comma-pos)
-          (back-to-indentation)
-          (point)))
-   comma-pos))
-
-(defun js2-parse-array-comp-or-literal ()
-  (let ((pos (js2-current-token-beg)))
-    (if (and (>= js2-language-version 200)
-             (js2-match-token js2-FOR))
-        (js2-parse-array-comp pos)
-      (js2-parse-array-literal pos))))
-
-(defun js2-parse-array-literal (pos)
-  (let ((after-lb-or-comma t)
-        after-comma tt elems pn
-        (continue t))
-    (unless js2-is-in-destructuring
-      (js2-push-scope (make-js2-scope))) ; for the legacy array comp
-    (while continue
-      (setq tt (js2-get-token))
-      (cond
-       ;; comma
-       ((= tt js2-COMMA)
-        (setq after-comma (js2-current-token-end))
-        (if (not after-lb-or-comma)
-            (setq after-lb-or-comma t)
-          (push nil elems)))
-       ;; end of array
-       ((or (= tt js2-RB)
-            (= tt js2-EOF))  ; prevent infinite loop
-        (if (= tt js2-EOF)
-            (js2-report-error "msg.no.bracket.arg" nil pos))
-        (when (and after-comma (< js2-language-version 170))
-          (js2-parse-warn-trailing-comma "msg.array.trailing.comma"
-                                         pos (remove nil elems) after-comma))
-        (setq continue nil
-              pn (make-js2-array-node :pos pos
-                                      :len (- js2-ts-cursor pos)
-                                      :elems (nreverse elems)))
-        (apply #'js2-node-add-children pn (js2-array-node-elems pn)))
-       ;; destructuring binding
-       (js2-is-in-destructuring
-        (push (if (or (= tt js2-LC)
-                      (= tt js2-LB)
-                      (= tt js2-NAME))
-                  ;; [a, b, c] | {a, b, c} | {a:x, b:y, c:z} | a
-                  (js2-parse-destruct-primary-expr)
-                ;; invalid pattern
-                (js2-report-error "msg.bad.var")
-                (make-js2-error-node))
-              elems)
-        (setq after-lb-or-comma nil
-              after-comma nil))
-       ;; array comp
-       ((and (>= js2-language-version 170)
-             (= tt js2-FOR)          ; check for array comprehension
-             (not after-lb-or-comma) ; "for" can't follow a comma
-             elems                   ; must have at least 1 element
-             (not (cdr elems)))      ; but no 2nd element
-        (js2-unget-token)
-        (setf continue nil
-              pn (js2-parse-legacy-array-comp (car elems) pos)))
-       ;; another element
-       (t
-        (unless after-lb-or-comma
-          (js2-report-error "msg.no.bracket.arg"))
-        (if (and (= tt js2-TRIPLEDOT)
-                 (>= js2-language-version 200))
-            ;; spread operator
-            (push (js2-make-unary tt 'js2-parse-assign-expr)
-                  elems)
-          (js2-unget-token)
-          (push (js2-parse-assign-expr) elems))
-        (setq after-lb-or-comma nil
-              after-comma nil))))
-    (unless js2-is-in-destructuring
-      (js2-pop-scope))
-    pn))
-
-(defun js2-parse-legacy-array-comp (expr pos)
-  "Parse a legacy array comprehension (JavaScript 1.7).
-EXPR is the first expression after the opening left-bracket.
-POS is the beginning of the LB token preceding EXPR.
-We should have just parsed the 'for' keyword before calling this function."
-  (let ((current-scope js2-current-scope)
-        loops first filter result)
-    (unwind-protect
-        (progn
-          (while (js2-match-token js2-FOR)
-            (let ((loop (make-js2-comp-loop-node)))
-              (js2-push-scope loop)
-              (push loop loops)
-              (js2-parse-comp-loop loop)))
-          ;; First loop takes expr scope's parent.
-          (setf (js2-scope-parent-scope (setq first (car (last loops))))
-                (js2-scope-parent-scope current-scope))
-          ;; Set expr scope's parent to the last loop.
-          (setf (js2-scope-parent-scope current-scope) (car loops))
-          (if (/= (js2-get-token) js2-IF)
-              (js2-unget-token)
-            (setq filter (js2-parse-condition))))
-      (dotimes (_ (1- (length loops)))
-        (js2-pop-scope)))
-    (js2-must-match js2-RB "msg.no.bracket.arg" pos)
-    (setq result (make-js2-comp-node :pos pos
-                                     :len (- js2-ts-cursor pos)
-                                     :result expr
-                                     :loops (nreverse loops)
-                                     :filters (and filter (list (car filter)))
-                                     :form 'LEGACY_ARRAY))
-    ;; Set comp loop's parent to the last loop.
-    ;; TODO: Get rid of the bogus expr scope.
-    (setf (js2-scope-parent-scope result) first)
-    (apply #'js2-node-add-children result expr (car filter)
-           (js2-comp-node-loops result))
-    result))
-
-(defun js2-parse-array-comp (pos)
-  "Parse an ES6 array comprehension.
-POS is the beginning of the LB token.
-We should have just parsed the 'for' keyword before calling this function."
-  (let ((pn (js2-parse-comprehension pos 'ARRAY)))
-    (js2-must-match js2-RB "msg.no.bracket.arg" pos)
-    pn))
-
-(defun js2-parse-generator-comp (pos)
-  (let* ((js2-nesting-of-function (1+ js2-nesting-of-function))
-         (js2-current-script-or-fn
-          (make-js2-function-node :generator-type 'COMPREHENSION))
-         (pn (js2-parse-comprehension pos 'STAR_GENERATOR)))
-    (js2-must-match js2-RP "msg.no.paren" pos)
-    pn))
-
-(defun js2-parse-comprehension (pos form)
-  (let (loops filters expr result last)
-    (unwind-protect
-        (progn
-          (js2-unget-token)
-          (while (js2-match-token js2-FOR)
-            (let ((loop (make-js2-comp-loop-node)))
-              (js2-push-scope loop)
-              (push loop loops)
-              (js2-parse-comp-loop loop)))
-          (while (js2-match-token js2-IF)
-            (push (car (js2-parse-condition)) filters))
-          (setq expr (js2-parse-assign-expr))
-          (setq last (car loops)))
-      (dolist (_ loops)
-        (js2-pop-scope)))
-    (setq result (make-js2-comp-node :pos pos
-                                     :len (- js2-ts-cursor pos)
-                                     :result expr
-                                     :loops (nreverse loops)
-                                     :filters (nreverse filters)
-                                     :form form))
-    (apply #'js2-node-add-children result (js2-comp-node-loops result))
-    (apply #'js2-node-add-children result expr (js2-comp-node-filters result))
-    (setf (js2-scope-parent-scope result) last)
-    result))
-
-(defun js2-parse-comp-loop (pn &optional only-of-p)
-  "Parse a 'for [each] (foo [in|of] bar)' expression in an Array comprehension.
-The current token should be the initial FOR.
-If ONLY-OF-P is non-nil, only the 'for (foo of bar)' form is allowed."
-  (let ((pos (js2-comp-loop-node-pos pn))
-        tt iter obj foreach-p forof-p in-pos each-pos lp rp)
-    (when (and (not only-of-p) (js2-match-token js2-NAME))
-      (if (string= (js2-current-token-string) "each")
-          (progn
-            (setq foreach-p t
-                  each-pos (- (js2-current-token-beg) pos)) ; relative
-            (js2-record-face 'font-lock-keyword-face))
-        (js2-report-error "msg.no.paren.for")))
-    (if (js2-must-match js2-LP "msg.no.paren.for")
-        (setq lp (- (js2-current-token-beg) pos)))
-    (setq tt (js2-peek-token))
-    (cond
-     ((or (= tt js2-LB)
-          (= tt js2-LC))
-      (js2-get-token)
-      (setq iter (js2-parse-destruct-primary-expr))
-      (js2-define-destruct-symbols iter js2-LET
-                                   'font-lock-variable-name-face t))
-     ((js2-match-token js2-NAME)
-      (setq iter (js2-create-name-node)))
-     (t
-      (js2-report-error "msg.bad.var")))
-    ;; Define as a let since we want the scope of the variable to
-    ;; be restricted to the array comprehension
-    (if (js2-name-node-p iter)
-        (js2-define-symbol js2-LET (js2-name-node-name iter) pn t))
-    (if (or (and (not only-of-p) (js2-match-token js2-IN))
-            (and (>= js2-language-version 200)
-                 (js2-match-contextual-kwd "of")
-                 (setq forof-p t)))
-        (setq in-pos (- (js2-current-token-beg) pos))
-      (js2-report-error "msg.in.after.for.name"))
-    (setq obj (js2-parse-expr))
-    (if (js2-must-match js2-RP "msg.no.paren.for.ctrl")
-        (setq rp (- (js2-current-token-beg) pos)))
-    (setf (js2-node-pos pn) pos
-          (js2-node-len pn) (- js2-ts-cursor pos)
-          (js2-comp-loop-node-iterator pn) iter
-          (js2-comp-loop-node-object pn) obj
-          (js2-comp-loop-node-in-pos pn) in-pos
-          (js2-comp-loop-node-each-pos pn) each-pos
-          (js2-comp-loop-node-foreach-p pn) foreach-p
-          (js2-comp-loop-node-forof-p pn) forof-p
-          (js2-comp-loop-node-lp pn) lp
-          (js2-comp-loop-node-rp pn) rp)
-    (js2-node-add-children pn iter obj)
-    pn))
-
-(defun js2-parse-class-stmt ()
-  (let ((pos (js2-current-token-beg))
-        (_ (js2-must-match-name "msg.unnamed.class.stmt"))
-        (name (js2-create-name-node t)))
-    (js2-set-face (js2-node-pos name) (js2-node-end name)
-                  'font-lock-function-name-face 'record)
-    (let ((node (js2-parse-class pos 'CLASS_STATEMENT name)))
-      (js2-define-symbol js2-FUNCTION
-                         (js2-name-node-name name)
-                         node)
-      node)))
-
-(defun js2-parse-class-expr ()
-  (let ((pos (js2-current-token-beg))
-        name)
-    (when (js2-match-token js2-NAME)
-      (setq name (js2-create-name-node t)))
-    (js2-parse-class pos 'CLASS_EXPRESSION name)))
-
-(defun js2-parse-class (pos form name)
-  ;; class X [extends ...] {
-  (let (pn elems extends)
-    (if (js2-match-token js2-EXTENDS)
-        (if (= (js2-peek-token) js2-LC)
-            (js2-report-error "msg.missing.extends")
-          ;; TODO(sdh): this should be left-hand-side-expr, not assign-expr
-          (setq extends (js2-parse-assign-expr))
-          (if (not extends)
-              (js2-report-error "msg.bad.extends"))))
-    (js2-must-match js2-LC "msg.no.brace.class")
-    (setq elems (js2-parse-object-literal-elems t)
-          pn (make-js2-class-node :pos pos
-                                  :len (- js2-ts-cursor pos)
-                                  :form form
-                                  :name name
-                                  :extends extends
-                                  :elems elems))
-    (apply #'js2-node-add-children pn (js2-class-node-elems pn))
-    pn))
-
-(defun js2-parse-object-literal ()
-  (let* ((pos (js2-current-token-beg))
-         (elems (js2-parse-object-literal-elems))
-         (result (make-js2-object-node :pos pos
-                                       :len (- js2-ts-cursor pos)
-                                       :elems elems)))
-    (apply #'js2-node-add-children result (js2-object-node-elems result))
-    result))
-
-(defun js2-parse-object-literal-elems (&optional class-p)
-  (let ((pos (js2-current-token-beg))
-        (static nil)
-        (continue t)
-        tt elems elem after-comma previous-token)
-    (while continue
-      (setq tt (js2-get-prop-name-token)
-            static nil
-            elem nil
-            previous-token nil)
-      ;; Handle 'static' keyword only if we're in a class
-      (when (and class-p (= js2-NAME tt)
-                 (string= "static" (js2-current-token-string)))
-        (js2-record-face 'font-lock-keyword-face)
-        (setq static t
-              tt (js2-get-prop-name-token)))
-      ;; Handle generator * before the property name for in-line functions
-      (when (and (>= js2-language-version 200)
-                 (= js2-MUL tt))
-        (setq previous-token (js2-current-token)
-              tt (js2-get-prop-name-token)))
-      ;; Handle 'get' or 'set' keywords
-      (let ((prop (js2-current-token-string)))
-        (when (and (>= js2-language-version 200)
-                   (= js2-NAME tt)
-                   (or (string= prop "get")
-                       (string= prop "set"))
-                   (member (js2-peek-token)
-                           (list js2-NAME js2-STRING js2-NUMBER js2-LB)))
-          (setq previous-token (js2-current-token)
-                tt (js2-get-prop-name-token))))
-      (cond
-       ;; Found a property (of any sort)
-       ((member tt (list js2-NAME js2-STRING js2-NUMBER js2-LB))
-        (setq after-comma nil
-              elem (js2-parse-named-prop tt pos previous-token))
-        (if (and (null elem)
-                 (not js2-recover-from-parse-errors))
-            (setq continue nil)))
-       ;; Break out of loop, and handle trailing commas.
-       ((or (= tt js2-RC)
-            (= tt js2-EOF))
-        (js2-unget-token)
-        (setq continue nil)
-        (if after-comma
-            (js2-parse-warn-trailing-comma "msg.extra.trailing.comma"
-                                           pos elems after-comma)))
-       (t
-        (js2-report-error "msg.bad.prop")
-        (unless js2-recover-from-parse-errors
-          (setq continue nil))))         ; end switch
-      ;; Handle static for classes' codegen.
-      (if static
-          (if elem (js2-node-set-prop elem 'STATIC t)
-            (js2-report-error "msg.unexpected.static")))
-      ;; Handle commas, depending on class-p.
-      (let ((tok (js2-get-prop-name-token)))
-        (if (eq tok js2-COMMA)
-            (if class-p
-                (js2-report-error "msg.class.unexpected.comma")
-              (setq after-comma (js2-current-token-end)))
-          (js2-unget-token)
-          (unless class-p (setq continue nil))))
-      ;; Append any parsed element.
-      (if elem (push elem elems)))       ; end loop
-    (js2-must-match js2-RC "msg.no.brace.prop")
-    (nreverse elems)))
-
-(defun js2-parse-named-prop (tt pos previous-token)
-  "Parse a name, string, or getter/setter object property.
-When `js2-is-in-destructuring' is t, forms like {a, b, c} will be permitted."
-  (let ((key (cond
-              ;; Literal string keys: {'foo': 'bar'}
-              ((= tt js2-STRING)
-               (make-js2-string-node))
-              ;; Handle computed keys: {[Symbol.iterator]: ...}, *[1+2]() {...}},
-              ;; {[foo + bar]() { ... }}, {[get ['x' + 1]() {...}}
-              ((and (= tt js2-LB)
-                    (>= js2-language-version 200))
-               (prog1 (js2-parse-expr)
-                 (js2-must-match js2-RB "msg.missing.computed.rb")))
-              ;; Numeric keys: {12: 'foo'}, {10.7: 'bar'}
-              ((= tt js2-NUMBER)
-               (make-js2-number-node))
-              ;; Unquoted names: {foo: 12}
-              ((= tt js2-NAME)
-               (js2-create-name-node))
-              ;; Anything else is an error
-              (t (js2-report-error "msg.bad.prop"))))
-        (prop (and previous-token (js2-token-string previous-token)))
-        (property-type (when previous-token
-                             (if (= (js2-token-type previous-token) js2-MUL)
-                                 "*"
-                               (js2-token-string previous-token)))))
-    (when (or (string= prop "get")
-              (string= prop "set"))
-      (js2-set-face (js2-token-beg previous-token)
-                    (js2-token-end previous-token)
-                    'font-lock-keyword-face 'record))  ; get/set
-    (cond
-     ;; method definition: {f() {...}}
-     ((and (= (js2-peek-token) js2-LP)
-           (>= js2-language-version 200))
-      (when (js2-name-node-p key)  ; highlight function name properties
-        (js2-record-face 'font-lock-function-name-face))
-      (js2-parse-getter-setter-prop pos key property-type))
-     ;; regular prop
-     (t
-      (let ((beg (js2-current-token-beg))
-            (end (js2-current-token-end))
-            (expr (js2-parse-plain-property key)))
-        (when (and (= tt js2-NAME)
-                   (not js2-is-in-destructuring)
-                   js2-highlight-external-variables
-                   (js2-node-get-prop expr 'SHORTHAND))
-          (js2-record-name-node key))
-        (js2-set-face beg end
-                      (if (js2-function-node-p
-                           (js2-object-prop-node-right expr))
-                          'font-lock-function-name-face
-                        'font-lock-variable-name-face)
-                      'record)
-        expr)))))
-
-(defun js2-parse-plain-property (prop)
-  "Parse a non-getter/setter property in an object literal.
-PROP is the node representing the property:  a number, name or string."
-  (let* ((tt (js2-get-token))
-         (pos (js2-node-pos prop))
-         colon expr result)
-    (cond
-     ;; Abbreviated property, as in {foo, bar}
-     ((and (>= js2-language-version 200)
-           (or (= tt js2-COMMA)
-               (= tt js2-RC))
-           (not (js2-number-node-p prop)))
-      (js2-unget-token)
-      (setq result (make-js2-object-prop-node
-                    :pos pos
-                    :left prop
-                    :right prop
-                    :op-pos (js2-current-token-len)))
-      (js2-node-add-children result prop)
-      (js2-node-set-prop result 'SHORTHAND t)
-      result)
-     ;; Normal property
-     (t
-      (if (= tt js2-COLON)
-          (setq colon (- (js2-current-token-beg) pos)
-                expr (js2-parse-assign-expr))
-        (js2-report-error "msg.no.colon.prop")
-        (setq expr (make-js2-error-node)))
-      (setq result (make-js2-object-prop-node
-                   :pos pos
-                   ;; don't include last consumed token in length
-                   :len (- (+ (js2-node-pos expr)
-                              (js2-node-len expr))
-                           pos)
-                   :left prop
-                   :right expr
-                   :op-pos colon))
-      (js2-node-add-children result prop expr)
-      result))))
-
-(defun js2-parse-getter-setter-prop (pos prop type-string)
-  "Parse getter or setter property in an object literal.
-JavaScript syntax is:
-
-  { get foo() {...}, set foo(x) {...} }
-
-and expression closure style is also supported
-
-  { get foo() x, set foo(x) _x = x }
-
-POS is the start position of the `get' or `set' keyword.
-PROP is the `js2-name-node' representing the property name.
-TYPE-STRING is a string `get', `set', `*', or nil, indicating a found keyword."
-  (let ((type (cond
-               ((string= "get" type-string) js2-GET)
-               ((string= "set" type-string) js2-SET)
-               (t js2-FUNCTION)))
-        result end
-        (fn (js2-parse-function-expr)))
-    ;; it has to be an anonymous function, as we already parsed the name
-    (if (/= (js2-node-type fn) js2-FUNCTION)
-        (js2-report-error "msg.bad.prop")
-      (if (cl-plusp (length (js2-function-name fn)))
-          (js2-report-error "msg.bad.prop")))
-    (js2-node-set-prop fn 'GETTER_SETTER type)  ; for codegen
-    (when (string= type-string "*")
-      (setf (js2-function-node-generator-type fn) 'STAR))
-    (setq end (js2-node-end fn)
-          result (make-js2-getter-setter-node :type type
-                                              :pos pos
-                                              :len (- end pos)
-                                              :left prop
-                                              :right fn))
-    (js2-node-add-children result prop fn)
-    result))
-
-(defun js2-create-name-node (&optional check-activation-p token string)
-  "Create a name node using the current token and, optionally, STRING.
-And, if CHECK-ACTIVATION-P is non-nil, use the value of TOKEN."
-  (let* ((beg (js2-current-token-beg))
-         (tt (js2-current-token-type))
-         (s (or string
-                (if (= js2-NAME tt)
-                    (js2-current-token-string)
-                  (js2-tt-name tt))))
-         name)
-    (setq name (make-js2-name-node :pos beg
-                                   :name s
-                                   :len (length s)))
-    (if check-activation-p
-        (js2-check-activation-name s (or token js2-NAME)))
-    name))
-
-;;; Indentation support
-
-;; This indenter is based on Karl Landström's "javascript.el" indenter.
-;; Karl cleverly deduces that the desired indentation level is often a
-;; function of paren/bracket/brace nesting depth, which can be determined
-;; quickly via the built-in `parse-partial-sexp' function.  His indenter
-;; then does some equally clever checks to see if we're in the context of a
-;; substatement of a possibly braceless statement keyword such as if, while,
-;; or finally.  This approach yields pretty good results.
-
-;; The indenter is often "wrong", however, and needs to be overridden.
-;; The right long-term solution is probably to emulate (or integrate
-;; with) cc-engine, but it's a nontrivial amount of coding.  Even when a
-;; parse tree from `js2-parse' is present, which is not true at the
-;; moment the user is typing, computing indentation is still thousands
-;; of lines of code to handle every possible syntactic edge case.
-
-;; In the meantime, the compromise solution is that we offer a "bounce
-;; indenter", configured with `js2-bounce-indent-p', which cycles the
-;; current line indent among various likely guess points.  This approach
-;; is far from perfect, but should at least make it slightly easier to
-;; move the line towards its desired indentation when manually
-;; overriding Karl's heuristic nesting guesser.
-
-;; I've made miscellaneous tweaks to Karl's code to handle some Ecma
-;; extensions such as `let' and Array comprehensions.  Major kudos to
-;; Karl for coming up with the initial approach, which packs a lot of
-;; punch for so little code.
-
-(defconst js2-possibly-braceless-keywords-re
-  (concat "else[ \t]+if\\|for[ \t]+each\\|"
-          (regexp-opt '("catch" "do" "else" "finally" "for" "if"
-                        "try" "while" "with" "let")))
-  "Regular expression matching keywords that are optionally
-followed by an opening brace.")
-
-(defconst js2-indent-operator-re
-  (concat "[-+*/%<>&^|?:.]\\([^-+*/]\\|$\\)\\|!?=\\|"
-          (regexp-opt '("in" "instanceof") 'words))
-  "Regular expression matching operators that affect indentation
-of continued expressions.")
-
-(defconst js2-declaration-keyword-re
-  (regexp-opt '("var" "let" "const") 'words)
-  "Regular expression matching variable declaration keywords.")
-
-(defun js2-re-search-forward-inner (regexp &optional bound count)
-  "Auxiliary function for `js2-re-search-forward'."
-  (let (parse saved-point)
-    (while (> count 0)
-      (re-search-forward regexp bound)
-      (setq parse (if saved-point
-                      (parse-partial-sexp saved-point (point))
-                    (syntax-ppss (point))))
-      (cond ((nth 3 parse)
-             (re-search-forward
-              (concat "\\(\\=\\|[^\\]\\|^\\)" (string (nth 3 parse)))
-              (save-excursion (end-of-line) (point)) t))
-            ((nth 7 parse)
-             (forward-line))
-            ((or (nth 4 parse)
-                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
-             (re-search-forward "\\*/"))
-            (t
-             (setq count (1- count))))
-      (setq saved-point (point))))
-  (point))
-
-(defun js2-re-search-forward (regexp &optional bound noerror count)
-  "Search forward but ignore strings and comments.
-Invokes `re-search-forward' but treats the buffer as if strings
-and comments have been removed."
-  (let ((saved-point (point)))
-    (condition-case err
-        (cond ((null count)
-               (js2-re-search-forward-inner regexp bound 1))
-              ((< count 0)
-               (js2-re-search-backward-inner regexp bound (- count)))
-              ((> count 0)
-               (js2-re-search-forward-inner regexp bound count)))
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
-
-(defun js2-re-search-backward-inner (regexp &optional bound count)
-  "Auxiliary function for `js2-re-search-backward'."
-  (let (parse)
-    (while (> count 0)
-      (re-search-backward regexp bound)
-      (setq parse (syntax-ppss (point)))
-      (cond ((nth 3 parse)
-             (re-search-backward
-              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
-              (line-beginning-position) t))
-            ((nth 7 parse)
-             (goto-char (nth 8 parse)))
-            ((or (nth 4 parse)
-                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
-             (re-search-backward "/\\*"))
-            (t
-             (setq count (1- count))))))
-  (point))
-
-(defun js2-re-search-backward (regexp &optional bound noerror count)
-  "Search backward but ignore strings and comments.
-Invokes `re-search-backward' but treats the buffer as if strings
-and comments have been removed."
-  (let ((saved-point (point)))
-    (condition-case err
-        (cond ((null count)
-               (js2-re-search-backward-inner regexp bound 1))
-              ((< count 0)
-               (js2-re-search-forward-inner regexp bound (- count)))
-              ((> count 0)
-               (js2-re-search-backward-inner regexp bound count)))
-      (search-failed
-       (goto-char saved-point)
-       (unless noerror
-         (error (error-message-string err)))))))
-
-(defun js2-looking-at-operator-p ()
-  "Return non-nil if text after point is a non-comma operator."
-  (and (looking-at js2-indent-operator-re)
-       (or (not (looking-at ":"))
-           (save-excursion
-             (and (js2-re-search-backward "[?:{]\\|\\<case\\>" nil t)
-                  (looking-at "?"))))))
-
-(defun js2-continued-expression-p ()
-  "Return non-nil if the current line continues an expression."
-  (save-excursion
-    (back-to-indentation)
-    (or (js2-looking-at-operator-p)
-        (when (catch 'found
-                (while (and (re-search-backward "\n" nil t)
-                            (let ((state (syntax-ppss)))
-                              (when (nth 4 state)
-                                (goto-char (nth 8 state))) ;; skip comments
-                              (skip-chars-backward " \t")
-                              (if (bolp)
-                                  t
-                                (throw 'found t))))))
-          (backward-char)
-          (when (js2-looking-at-operator-p)
-            (backward-char)
-            (not (looking-at "\\*\\|\\+\\+\\|--\\|/[/*]")))))))
-
-(defun js2-end-of-do-while-loop-p ()
-  "Return non-nil if word after point is `while' of a do-while
-statement, else returns nil. A braceless do-while statement
-spanning several lines requires that the start of the loop is
-indented to the same column as the current line."
-  (interactive)
-  (save-excursion
-    (when (looking-at "\\s-*\\<while\\>")
-      (if (save-excursion
-            (skip-chars-backward "[ \t\n]*}")
-            (looking-at "[ \t\n]*}"))
-          (save-excursion
-            (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
-        (js2-re-search-backward "\\<do\\>" (point-at-bol) t)
-        (or (looking-at "\\<do\\>")
-            (let ((saved-indent (current-indentation)))
-              (while (and (js2-re-search-backward "^[ \t]*\\<" nil t)
-                          (/= (current-indentation) saved-indent)))
-              (and (looking-at "[ \t]*\\<do\\>")
-                   (not (js2-re-search-forward
-                         "\\<while\\>" (point-at-eol) t))
-                   (= (current-indentation) saved-indent))))))))
-
-(defun js2-multiline-decl-indentation ()
-  "Return the declaration indentation column if the current line belongs
-to a multiline declaration statement.  See `js2-pretty-multiline-declarations'."
-  (let (forward-sexp-function ; use Lisp version
-        at-opening-bracket)
-    (save-excursion
-      (back-to-indentation)
-      (when (not (looking-at js2-declaration-keyword-re))
-        (when (looking-at js2-indent-operator-re)
-          (goto-char (match-end 0))) ; continued expressions are ok
-        (while (and (not at-opening-bracket)
-                    (not (bobp))
-                    (let ((pos (point)))
-                      (save-excursion
-                        (js2-backward-sws)
-                        (or (eq (char-before) ?,)
-                            (and (not (eq (char-before) ?\;))
-                                 (prog2 (skip-syntax-backward ".")
-                                     (looking-at js2-indent-operator-re)
-                                   (js2-backward-sws))
-                                 (not (eq (char-before) ?\;)))
-                            (js2-same-line pos)))))
-          (condition-case _
-              (backward-sexp)
-            (scan-error (setq at-opening-bracket t))))
-        (when (looking-at js2-declaration-keyword-re)
-          (goto-char (match-end 0))
-          (1+ (current-column)))))))
-
-(defun js2-ctrl-statement-indentation ()
-  "Return the proper indentation of current line if it is a control statement.
-Returns an indentation if this line starts the body of a control
-statement without braces, else returns nil."
-  (let (forward-sexp-function)
-    (save-excursion
-      (back-to-indentation)
-      (when (and (not (js2-same-line (point-min)))
-                 (not (looking-at "{"))
-                 (js2-re-search-backward "[[:graph:]]" nil t)
-                 (not (looking-at "[{([]"))
-                 (progn
-                   (forward-char)
-                   (when (= (char-before) ?\))
-                     ;; scan-sexps sometimes throws an error
-                     (ignore-errors (backward-sexp))
-                     (skip-chars-backward " \t" (point-at-bol)))
-                   (let ((pt (point)))
-                     (back-to-indentation)
-                     (when (looking-at "}[ \t]*")
-                       (goto-char (match-end 0)))
-                     (and (looking-at js2-possibly-braceless-keywords-re)
-                          (= (match-end 0) pt)
-                          (not (js2-end-of-do-while-loop-p))))))
-        (+ (current-indentation) js2-basic-offset)))))
-
-(defun js2-indent-in-array-comp (parse-status)
-  "Return non-nil if we think we're in an array comprehension.
-In particular, return the buffer position of the first `for' kwd."
-  (let ((bracket (nth 1 parse-status))
-        (end (point)))
-    (when bracket
-      (save-excursion
-        (goto-char bracket)
-        (when (looking-at "\\[")
-          (forward-char 1)
-          (js2-forward-sws)
-          (if (looking-at "[[{]")
-              (let (forward-sexp-function) ; use Lisp version
-                (forward-sexp)             ; skip destructuring form
-                (js2-forward-sws)
-                (if (and (/= (char-after) ?,) ; regular array
-                         (looking-at "for"))
-                    (match-beginning 0)))
-            ;; to skip arbitrary expressions we need the parser,
-            ;; so we'll just guess at it.
-            (if (and (> end (point)) ; not empty literal
-                     (re-search-forward "[^,]]* \\(for\\) " end t)
-                     ;; not inside comment or string literal
-                     (let ((state (parse-partial-sexp bracket (point))))
-                       (not (or (nth 3 state) (nth 4 state)))))
-                (match-beginning 1))))))))
-
-(defun js2-array-comp-indentation (parse-status for-kwd)
-  (if (js2-same-line for-kwd)
-      ;; first continuation line
-      (save-excursion
-        (goto-char (nth 1 parse-status))
-        (forward-char 1)
-        (skip-chars-forward " \t")
-        (current-column))
-    (save-excursion
-      (goto-char for-kwd)
-      (current-column))))
-
-(defun js2-maybe-goto-declaration-keyword-end (bracket)
-  "Helper function for `js2-proper-indentation'.
-Depending on the value of `js2-pretty-multiline-declarations',
-move point to the end of a variable declaration keyword so that
-indentation is aligned to that column."
-  (cond
-   ((eq js2-pretty-multiline-declarations 'all)
-    (when (looking-at js2-declaration-keyword-re)
-      (goto-char (1+ (match-end 0)))))
-   ((eq js2-pretty-multiline-declarations 'dynamic)
-    (let (declaration-keyword-end
-          at-closing-bracket-p
-          comma-p)
-      (when (looking-at js2-declaration-keyword-re)
-        ;; Preserve the match data lest it somehow be overridden.
-        (setq declaration-keyword-end (match-end 0))
-        (save-excursion
-          (goto-char bracket)
-          (setq at-closing-bracket-p
-                ;; Handle scan errors gracefully.
-                (condition-case nil
-                    (progn
-                      ;; Use the regular `forward-sexp-function' because the
-                      ;; normal one for this mode uses the AST.
-                      (let (forward-sexp-function)
-                        (forward-sexp))
-                      t)
-                  (error nil)))
-          (when at-closing-bracket-p
-            (js2-forward-sws)
-            (setq comma-p (looking-at-p ","))))
-        (when comma-p
-          (goto-char (1+ declaration-keyword-end))))))))
-
-(defun js2-proper-indentation (parse-status)
-  "Return the proper indentation for the current line."
-  (save-excursion
-    (back-to-indentation)
-    (let* ((ctrl-stmt-indent (js2-ctrl-statement-indentation))
-           (at-closing-bracket (looking-at "[]})]"))
-           (same-indent-p (or at-closing-bracket
-                              (looking-at "\\<case\\>[^:]")
-                              (and (looking-at "\\<default:")
-                                   (save-excursion
-                                     (js2-backward-sws)
-                                     (not (memq (char-before) '(?, ?{)))))))
-           (continued-expr-p (js2-continued-expression-p))
-           (declaration-indent (and js2-pretty-multiline-declarations
-                                    (js2-multiline-decl-indentation)))
-           (bracket (nth 1 parse-status))
-           beg indent)
-      (cond
-       ;; indent array comprehension continuation lines specially
-       ((and bracket
-             (>= js2-language-version 170)
-             (not (js2-same-line bracket))
-             (setq beg (js2-indent-in-array-comp parse-status))
-             (>= (point) (save-excursion
-                           (goto-char beg)
-                           (point-at-bol)))) ; at or after first loop?
-        (js2-array-comp-indentation parse-status beg))
-
-       (ctrl-stmt-indent)
-
-       ((and declaration-indent continued-expr-p)
-        (+ declaration-indent js2-basic-offset))
-
-       (declaration-indent)
-
-       (bracket
-        (goto-char bracket)
-        (cond
-         ((looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
-          (when (save-excursion (skip-chars-backward " \t)")
-                                (looking-at ")"))
-            (backward-list))
-          (back-to-indentation)
-          (js2-maybe-goto-declaration-keyword-end bracket)
-          (setq indent
-                (cond (same-indent-p
-                       (current-column))
-                      (continued-expr-p
-                       (+ (current-column) (* 2 js2-basic-offset)))
-                      (t
-                       (+ (current-column) js2-basic-offset))))
-          (if (and js2-indent-switch-body
-                   (not at-closing-bracket)
-                   (looking-at "\\_<switch\\_>"))
-              (+ indent js2-basic-offset)
-            indent))
-         (t
-          (unless same-indent-p
-            (forward-char)
-            (skip-chars-forward " \t"))
-          (current-column))))
-
-       (continued-expr-p js2-basic-offset)
-
-       (t 0)))))
-
-(defun js2-lineup-comment (parse-status)
-  "Indent a multi-line block comment continuation line."
-  (let* ((beg (nth 8 parse-status))
-         (first-line (js2-same-line beg))
-         (offset (save-excursion
-                   (goto-char beg)
-                   (if (looking-at "/\\*")
-                       (+ 1 (current-column))
-                     0))))
-    (unless first-line
-      (indent-line-to offset))))
-
-(defun js2-backward-sws ()
-  "Move backward through whitespace and comments."
-  (interactive)
-  (while (forward-comment -1)))
-
-(defun js2-forward-sws ()
-  "Move forward through whitespace and comments."
-  (interactive)
-  (while (forward-comment 1)))
-
-(defun js2-current-indent (&optional pos)
-  "Return column of indentation on current line.
-If POS is non-nil, go to that point and return indentation for that line."
-  (save-excursion
-    (if pos
-        (goto-char pos))
-    (back-to-indentation)
-    (current-column)))
-
-(defun js2-arglist-close ()
-  "Return non-nil if we're on a line beginning with a close-paren/brace."
-  (save-excursion
-    (goto-char (point-at-bol))
-    (js2-forward-sws)
-    (looking-at "[])}]")))
-
-(defun js2-indent-looks-like-label-p ()
-  (goto-char (point-at-bol))
-  (js2-forward-sws)
-  (looking-at (concat js2-mode-identifier-re ":")))
-
-(defun js2-indent-in-objlit-p (parse-status)
-  "Return non-nil if this looks like an object-literal entry."
-  (let ((start (nth 1 parse-status)))
-    (and
-     start
-     (save-excursion
-       (and (zerop (forward-line -1))
-            (not (< (point) start))     ; crossed a {} boundary
-            (js2-indent-looks-like-label-p)))
-     (save-excursion
-       (js2-indent-looks-like-label-p)))))
-
-;; If prev line looks like foobar({ then we're passing an object
-;; literal to a function call, and people pretty much always want to
-;; de-dent back to the previous line, so move the 'basic-offset'
-;; position to the front.
-(defun js2-indent-objlit-arg-p (parse-status)
-  (save-excursion
-    (back-to-indentation)
-    (js2-backward-sws)
-    (and (eq (1- (point)) (nth 1 parse-status))
-         (eq (char-before) ?{)
-         (progn
-           (forward-char -1)
-           (skip-chars-backward " \t")
-           (eq (char-before) ?\()))))
-
-(defun js2-indent-case-block-p ()
-  (save-excursion
-    (back-to-indentation)
-    (js2-backward-sws)
-    (goto-char (point-at-bol))
-    (skip-chars-forward " \t")
-    (looking-at "case\\s-.+:")))
-
-(defun js2-bounce-indent (normal-col parse-status &optional backwards)
-  "Cycle among alternate computed indentation positions.
-PARSE-STATUS is the result of `parse-partial-sexp' from the beginning
-of the buffer to the current point.  NORMAL-COL is the indentation
-column computed by the heuristic guesser based on current paren,
-bracket, brace and statement nesting.  If BACKWARDS, cycle positions
-in reverse."
-  (let ((cur-indent (js2-current-indent))
-        (old-buffer-undo-list buffer-undo-list)
-        ;; Emacs 21 only has `count-lines', not `line-number-at-pos'
-        (current-line (save-excursion
-                        (forward-line 0)  ; move to bol
-                        (1+ (count-lines (point-min) (point)))))
-        positions pos main-pos anchor arglist-cont same-indent
-        basic-offset computed-pos)
-    ;; temporarily don't record undo info, if user requested this
-    (when js2-mode-indent-inhibit-undo
-      (setq buffer-undo-list t))
-    (unwind-protect
-        (progn
-          ;; First likely point:  indent from beginning of previous code line
-          (push (setq basic-offset
-                      (+ (save-excursion
-                           (back-to-indentation)
-                           (js2-backward-sws)
-                           (back-to-indentation)
-                           (current-column))
-                         js2-basic-offset))
-                positions)
-
-          ;; (First + epsilon) likely point:  indent 2x from beginning of
-          ;; previous code line.  Google does it this way.
-          (push (setq basic-offset
-                      (+ (save-excursion
-                           (back-to-indentation)
-                           (js2-backward-sws)
-                           (back-to-indentation)
-                           (current-column))
-                         (* 2 js2-basic-offset)))
-                positions)
-
-          ;; Second likely point:  indent from assign-expr RHS.  This
-          ;; is just a crude guess based on finding " = " on the previous
-          ;; line containing actual code.
-          (setq pos (save-excursion
-                      (forward-line -1)
-                      (goto-char (point-at-bol))
-                      (when (re-search-forward "\\s-+\\(=\\)\\s-+"
-                                               (point-at-eol) t)
-                        (goto-char (match-end 1))
-                        (skip-chars-forward " \t\r\n")
-                        (current-column))))
-          (when pos
-            (cl-incf pos js2-basic-offset)
-            (push pos positions))
-
-          ;; Third likely point:  same indent as previous line of code.
-          ;; Make it the first likely point if we're not on an
-          ;; arglist-close line and previous line ends in a comma, or
-          ;; both this line and prev line look like object-literal
-          ;; elements.
-          (setq pos (save-excursion
-                      (goto-char (point-at-bol))
-                      (js2-backward-sws)
-                      (back-to-indentation)
-                      (prog1
-                          (current-column)
-                        ;; while we're here, look for trailing comma
-                        (if (save-excursion
-                              (goto-char (point-at-eol))
-                              (js2-backward-sws)
-                              (eq (char-before) ?,))
-                            (setq arglist-cont (1- (point)))))))
-          (when pos
-            (if (and (or arglist-cont
-                         (js2-indent-in-objlit-p parse-status))
-                     (not (js2-arglist-close)))
-                (setq same-indent pos))
-            (push pos positions))
-
-          ;; Fourth likely point:  first preceding code with less indentation.
-          ;; than the immediately preceding code line.
-          (setq pos (save-excursion
-                      (back-to-indentation)
-                      (js2-backward-sws)
-                      (back-to-indentation)
-                      (setq anchor (current-column))
-                      (while (and (zerop (forward-line -1))
-                                  (>= (progn
-                                        (back-to-indentation)
-                                        (current-column))
-                                      anchor)))
-                      (setq pos (current-column))))
-          (push pos positions)
-
-          ;; nesting-heuristic position, main by default
-          (push (setq main-pos normal-col) positions)
-
-          ;; delete duplicates and sort positions list
-          (setq positions (sort (delete-dups positions) '<))
-
-          ;; comma-list continuation lines:  prev line indent takes precedence
-          (if same-indent
-              (setq main-pos same-indent))
-
-          ;; common special cases where we want to indent in from previous line
-          (if (or (js2-indent-case-block-p)
-                  (js2-indent-objlit-arg-p parse-status))
-              (setq main-pos basic-offset))
-
-          ;; if bouncing backwards, reverse positions list
-          (if backwards
-              (setq positions (reverse positions)))
-
-          ;; record whether we're already sitting on one of the alternatives
-          (setq pos (member cur-indent positions))
-
-          (cond
-           ;; case 0:  we're one one of the alternatives and this is the
-           ;; first time they've pressed TAB on this line (best-guess).
-           ((and js2-mode-indent-ignore-first-tab
-                 pos
-                 ;; first time pressing TAB on this line?
-                 (not (eq js2-mode-last-indented-line current-line)))
-            ;; do nothing
-            (setq computed-pos nil))
-           ;; case 1:  only one computed position => use it
-           ((null (cdr positions))
-            (setq computed-pos 0))
-           ;; case 2:  not on any of the computed spots => use main spot
-           ((not pos)
-            (setq computed-pos (js2-position main-pos positions)))
-           ;; case 3:  on last position:  cycle to first position
-           ((null (cdr pos))
-            (setq computed-pos 0))
-           ;; case 4:  on intermediate position:  cycle to next position
-           (t
-            (setq computed-pos (js2-position (cl-second pos) positions))))
-
-          ;; see if any hooks want to indent; otherwise we do it
-          (cl-loop with result = nil
-                   for hook in js2-indent-hook
-                   while (null result)
-                   do
-                   (setq result (funcall hook positions computed-pos))
-                   finally do
-                   (unless (or result (null computed-pos))
-                     (indent-line-to (nth computed-pos positions)))))
-
-      ;; finally
-      (if js2-mode-indent-inhibit-undo
-          (setq buffer-undo-list old-buffer-undo-list))
-      ;; see commentary for `js2-mode-last-indented-line'
-      (setq js2-mode-last-indented-line current-line))))
-
-(defun js2-indent-bounce-backwards ()
-  "Calls `js2-indent-line'.  When `js2-bounce-indent-p',
-cycles between the computed indentation positions in reverse order."
-  (interactive)
-  (js2-indent-line t))
-
-(defun js2-1-line-comment-continuation-p ()
-  "Return t if we're in a 1-line comment continuation.
-If so, we don't ever want to use bounce-indent."
-  (save-excursion
-    (and (progn
-           (forward-line 0)
-           (looking-at "\\s-*//"))
-         (progn
-           (forward-line -1)
-           (forward-line 0)
-           (when (looking-at "\\s-*$")
-             (js2-backward-sws)
-             (forward-line 0))
-           (looking-at "\\s-*//")))))
-
-(defun js2-indent-line (&optional bounce-backwards)
-  "Indent the current line as JavaScript source text."
-  (interactive)
-  (let (parse-status offset indent-col
-        ;; Don't whine about errors/warnings when we're indenting.
-        ;; This has to be set before calling parse-partial-sexp below.
-        (inhibit-point-motion-hooks t))
-    (setq parse-status (save-excursion
-                         (syntax-ppss (point-at-bol)))
-          offset (- (point) (save-excursion
-                              (back-to-indentation)
-                              (point))))
-    ;; Don't touch multiline strings.
-    (unless (nth 3 parse-status)
-      (js2-with-underscore-as-word-syntax
-        (if (nth 4 parse-status)
-            (js2-lineup-comment parse-status)
-          (setq indent-col (js2-proper-indentation parse-status))
-          ;; See comments below about `js2-mode-last-indented-line'.
-          (cond
-           ;; bounce-indenting is disabled during electric-key indent.
-           ;; It doesn't work well on first line of buffer.
-           ((and js2-bounce-indent-p
-                 (not (js2-same-line (point-min)))
-                 (not (js2-1-line-comment-continuation-p)))
-            (js2-bounce-indent indent-col parse-status bounce-backwards))
-           ;; just indent to the guesser's likely spot
-           (t (indent-line-to indent-col))))
-        (when (cl-plusp offset)
-          (forward-char offset))))))
-
-(defun js2-indent-region (start end)
-  "Indent the region, but don't use bounce indenting."
-  (let ((js2-bounce-indent-p nil)
-        (indent-region-function nil)
-        (after-change-functions (remq 'js2-mode-edit
-                                      after-change-functions)))
-    (indent-region start end nil) ; nil for byte-compiler
-    (js2-mode-edit start end (- end start))))
-
-(defvar js2-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-`") #'js2-next-error)
-    (define-key map [mouse-1] #'js2-mode-show-node)
-    map)
-  "Keymap used when `js2-minor-mode' is active.")
-
-;;;###autoload
-(define-minor-mode js2-minor-mode
-  "Minor mode for running js2 as a background linter.
-This allows you to use a different major mode for JavaScript editing,
-such as `js-mode', while retaining the asynchronous error/warning
-highlighting features of `js2-mode'."
-  :group 'js2-mode
-  :lighter " js-lint"
-  (if js2-minor-mode
-      (js2-minor-mode-enter)
-    (js2-minor-mode-exit)))
-
-(defun js2-minor-mode-enter ()
-  "Initialization for `js2-minor-mode'."
-  (set (make-local-variable 'max-lisp-eval-depth)
-       (max max-lisp-eval-depth 3000))
-  (setq next-error-function #'js2-next-error)
-  (js2-set-default-externs)
-  ;; Experiment:  make reparse-delay longer for longer files.
-  (if (cl-plusp js2-dynamic-idle-timer-adjust)
-      (setq js2-idle-timer-delay
-            (* js2-idle-timer-delay
-               (/ (point-max) js2-dynamic-idle-timer-adjust))))
-  (setq js2-mode-buffer-dirty-p t
-        js2-mode-parsing nil)
-  (set (make-local-variable 'js2-highlight-level) 0) ; no syntax highlighting
-  (add-hook 'after-change-functions #'js2-minor-mode-edit nil t)
-  (add-hook 'change-major-mode-hook #'js2-minor-mode-exit nil t)
-  (when js2-include-jslint-globals
-    (add-hook 'js2-post-parse-callbacks 'js2-apply-jslint-globals nil t))
-  (run-hooks 'js2-init-hook)
-  (js2-reparse))
-
-(defun js2-minor-mode-exit ()
-  "Turn off `js2-minor-mode'."
-  (setq next-error-function nil)
-  (remove-hook 'after-change-functions #'js2-mode-edit t)
-  (remove-hook 'change-major-mode-hook #'js2-minor-mode-exit t)
-  (when js2-mode-node-overlay
-    (delete-overlay js2-mode-node-overlay)
-    (setq js2-mode-node-overlay nil))
-  (js2-remove-overlays)
-  (remove-hook 'js2-post-parse-callbacks 'js2-apply-jslint-globals t)
-  (setq js2-mode-ast nil))
-
-(defvar js2-source-buffer nil "Linked source buffer for diagnostics view")
-(make-variable-buffer-local 'js2-source-buffer)
-
-(cl-defun js2-display-error-list ()
-  "Display a navigable buffer listing parse errors/warnings."
-  (interactive)
-  (unless (js2-have-errors-p)
-    (message "No errors")
-    (cl-return-from js2-display-error-list))
-  (cl-labels ((annotate-list
-               (lst type)
-               "Add diagnostic TYPE and line number to errs list"
-               (mapcar (lambda (err)
-                         (list err type (line-number-at-pos (nth 1 err))))
-                       lst)))
-    (let* ((srcbuf (current-buffer))
-           (errbuf (get-buffer-create "*js-lint*"))
-           (errors (annotate-list
-                    (when js2-mode-ast (js2-ast-root-errors js2-mode-ast))
-                    'js2-error))  ; must be a valid face name
-           (warnings (annotate-list
-                      (when js2-mode-ast (js2-ast-root-warnings js2-mode-ast))
-                      'js2-warning))  ; must be a valid face name
-           (all-errs (sort (append errors warnings)
-                           (lambda (e1 e2) (< (cl-cadar e1) (cl-cadar e2))))))
-      (with-current-buffer errbuf
-        (let ((inhibit-read-only t))
-          (erase-buffer)
-          (dolist (err all-errs)
-            (cl-destructuring-bind ((msg-key beg _end &rest) type line) err
-              (insert-text-button
-               (format "line %d: %s" line (js2-get-msg msg-key))
-               'face type
-               'follow-link "\C-m"
-               'action 'js2-error-buffer-jump
-               'js2-msg (js2-get-msg msg-key)
-               'js2-pos beg)
-              (insert "\n"))))
-        (js2-error-buffer-mode)
-        (setq js2-source-buffer srcbuf)
-        (pop-to-buffer errbuf)
-        (goto-char (point-min))
-        (unless (eobp)
-          (js2-error-buffer-view))))))
-
-(defvar js2-error-buffer-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "n" #'js2-error-buffer-next)
-    (define-key map "p" #'js2-error-buffer-prev)
-    (define-key map (kbd "RET") #'js2-error-buffer-jump)
-    (define-key map "o" #'js2-error-buffer-view)
-    (define-key map "q" #'js2-error-buffer-quit)
-    map)
-  "Keymap used for js2 diagnostics buffers.")
-
-(defun js2-error-buffer-mode ()
-  "Major mode for js2 diagnostics buffers.
-Selecting an error will jump it to the corresponding source-buffer error.
-\\{js2-error-buffer-mode-map}"
-  (interactive)
-  (setq major-mode 'js2-error-buffer-mode
-        mode-name "JS Lint Diagnostics")
-  (use-local-map js2-error-buffer-mode-map)
-  (setq truncate-lines t)
-  (set-buffer-modified-p nil)
-  (setq buffer-read-only t)
-  (run-hooks 'js2-error-buffer-mode-hook))
-
-(defun js2-error-buffer-next ()
-  "Move to next error and view it."
-  (interactive)
-  (when (zerop (forward-line 1))
-    (js2-error-buffer-view)))
-
-(defun js2-error-buffer-prev ()
-  "Move to previous error and view it."
-  (interactive)
-  (when (zerop (forward-line -1))
-    (js2-error-buffer-view)))
-
-(defun js2-error-buffer-quit ()
-  "Kill the current buffer."
-  (interactive)
-  (kill-buffer))
-
-(defun js2-error-buffer-jump (&rest ignored)
-  "Jump cursor to current error in source buffer."
-  (interactive)
-  (when (js2-error-buffer-view)
-    (pop-to-buffer js2-source-buffer)))
-
-(defun js2-error-buffer-view ()
-  "Scroll source buffer to show error at current line."
-  (interactive)
-  (cond
-   ((not (eq major-mode 'js2-error-buffer-mode))
-    (message "Not in a js2 errors buffer"))
-   ((not (buffer-live-p js2-source-buffer))
-    (message "Source buffer has been killed"))
-   ((not (wholenump (get-text-property (point) 'js2-pos)))
-    (message "There does not seem to be an error here"))
-   (t
-    (let ((pos (get-text-property (point) 'js2-pos))
-          (msg (get-text-property (point) 'js2-msg)))
-      (save-selected-window
-        (pop-to-buffer js2-source-buffer)
-        (goto-char pos)
-        (message msg))))))
-
-;;;###autoload
-(define-derived-mode js2-mode prog-mode "Javascript-IDE"
-  ;; FIXME: Should derive from js-mode.
-  "Major mode for editing JavaScript code."
-  ;; Used by comment-region; don't change it.
-  (set (make-local-variable 'comment-start) "//")
-  (set (make-local-variable 'comment-end) "")
-  (set (make-local-variable 'comment-start-skip) js2-comment-start-skip)
-  (set (make-local-variable 'max-lisp-eval-depth)
-       (max max-lisp-eval-depth 3000))
-  (set (make-local-variable 'indent-line-function) #'js2-indent-line)
-  (set (make-local-variable 'indent-region-function) #'js2-indent-region)
-  (set (make-local-variable 'fill-paragraph-function) #'c-fill-paragraph)
-  (set (make-local-variable 'comment-line-break-function) #'js2-line-break)
-  (set (make-local-variable 'beginning-of-defun-function) #'js2-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function) #'js2-end-of-defun)
-  ;; We un-confuse `parse-partial-sexp' by setting syntax-table properties
-  ;; for characters inside regexp literals.
-  (set (make-local-variable 'parse-sexp-lookup-properties) t)
-  ;; this is necessary to make `show-paren-function' work properly
-  (set (make-local-variable 'parse-sexp-ignore-comments) t)
-  ;; needed for M-x rgrep, among other things
-  (put 'js2-mode 'find-tag-default-function #'js2-mode-find-tag)
-
-  (set (make-local-variable 'electric-indent-chars)
-       (append "{}()[]:;,*." electric-indent-chars))
-  (set (make-local-variable 'electric-layout-rules)
-       '((?\; . after) (?\{ . after) (?\} . before)))
-
-  ;; some variables needed by cc-engine for paragraph-fill, etc.
-  (setq c-comment-prefix-regexp js2-comment-prefix-regexp
-        c-comment-start-regexp "/[*/]\\|\\s|"
-        c-line-comment-starter "//"
-        c-paragraph-start js2-paragraph-start
-        c-paragraph-separate "$"
-        c-syntactic-ws-start js2-syntactic-ws-start
-        c-syntactic-ws-end js2-syntactic-ws-end
-        c-syntactic-eol js2-syntactic-eol)
-
-  (let ((c-buffer-is-cc-mode t))
-    ;; Copied from `js-mode'.  Also see Bug#6071.
-    (make-local-variable 'paragraph-start)
-    (make-local-variable 'paragraph-separate)
-    (make-local-variable 'paragraph-ignore-fill-prefix)
-    (make-local-variable 'adaptive-fill-mode)
-    (make-local-variable 'adaptive-fill-regexp)
-    (c-setup-paragraph-variables))
-
-  (setq font-lock-defaults '(nil t))
-
-  ;; Experiment:  make reparse-delay longer for longer files.
-  (when (cl-plusp js2-dynamic-idle-timer-adjust)
-    (setq js2-idle-timer-delay
-          (* js2-idle-timer-delay
-             (/ (point-max) js2-dynamic-idle-timer-adjust))))
-
-  (add-hook 'change-major-mode-hook #'js2-mode-exit nil t)
-  (add-hook 'after-change-functions #'js2-mode-edit nil t)
-  (setq imenu-create-index-function #'js2-mode-create-imenu-index)
-  (setq next-error-function #'js2-next-error)
-  (imenu-add-to-menubar (concat "IM-" mode-name))
-  (add-to-invisibility-spec '(js2-outline . t))
-  (set (make-local-variable 'line-move-ignore-invisible) t)
-  (set (make-local-variable 'forward-sexp-function) #'js2-mode-forward-sexp)
-  (when (fboundp 'cursor-sensor-mode) (cursor-sensor-mode 1))
-
-  (setq js2-mode-functions-hidden nil
-        js2-mode-comments-hidden nil
-        js2-mode-buffer-dirty-p t
-        js2-mode-parsing nil)
-
-  (js2-set-default-externs)
-
-  (when js2-include-jslint-globals
-    (add-hook 'js2-post-parse-callbacks 'js2-apply-jslint-globals nil t))
-
-  (run-hooks 'js2-init-hook)
-
-  (js2-reparse))
-
-(defun js2-mode-exit ()
-  "Exit `js2-mode' and clean up."
-  (interactive)
-  (when js2-mode-node-overlay
-    (delete-overlay js2-mode-node-overlay)
-    (setq js2-mode-node-overlay nil))
-  (js2-remove-overlays)
-  (setq js2-mode-ast nil)
-  (remove-hook 'change-major-mode-hook #'js2-mode-exit t)
-  (remove-from-invisibility-spec '(js2-outline . t))
-  (js2-mode-show-all)
-  (with-silent-modifications
-    (js2-clear-face (point-min) (point-max))))
-
-(defun js2-mode-reset-timer ()
-  "Cancel any existing parse timer and schedule a new one."
-  (if js2-mode-parse-timer
-      (cancel-timer js2-mode-parse-timer))
-  (setq js2-mode-parsing nil)
-  (let ((timer (timer-create)))
-    (setq js2-mode-parse-timer timer)
-    (timer-set-function timer 'js2-mode-idle-reparse (list (current-buffer)))
-    (timer-set-idle-time timer js2-idle-timer-delay)
-    ;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12326
-    (timer-activate-when-idle timer nil)))
-
-(defun js2-mode-idle-reparse (buffer)
-  "Run `js2-reparse' if BUFFER is the current buffer, or schedule
-it to be reparsed when the buffer is selected."
-  (cond ((eq buffer (current-buffer))
-         (js2-reparse))
-        ((buffer-live-p buffer)
-         ;; reparse when the buffer is selected again
-         (with-current-buffer buffer
-           (add-hook 'window-configuration-change-hook
-                     #'js2-mode-idle-reparse-inner
-                     nil t)))))
-
-(defun js2-mode-idle-reparse-inner ()
-  (remove-hook 'window-configuration-change-hook
-               #'js2-mode-idle-reparse-inner
-               t)
-  (js2-reparse))
-
-(defun js2-mode-edit (_beg _end _len)
-  "Schedule a new parse after buffer is edited.
-Buffer edit spans from BEG to END and is of length LEN."
-  (setq js2-mode-buffer-dirty-p t)
-  (js2-mode-hide-overlay)
-  (js2-mode-reset-timer))
-
-(defun js2-minor-mode-edit (_beg _end _len)
-  "Callback for buffer edits in `js2-mode'.
-Schedules a new parse after buffer is edited.
-Buffer edit spans from BEG to END and is of length LEN."
-  (setq js2-mode-buffer-dirty-p t)
-  (js2-mode-hide-overlay)
-  (js2-mode-reset-timer))
-
-(defun js2-reparse (&optional force)
-  "Re-parse current buffer after user finishes some data entry.
-If we get any user input while parsing, including cursor motion,
-we discard the parse and reschedule it.  If FORCE is nil, then the
-buffer will only rebuild its `js2-mode-ast' if the buffer is dirty."
-  (let (time
-        interrupted-p
-        (js2-compiler-strict-mode js2-mode-show-strict-warnings))
-    (unless js2-mode-parsing
-      (setq js2-mode-parsing t)
-      (unwind-protect
-          (when (or js2-mode-buffer-dirty-p force)
-            (js2-remove-overlays)
-            (setq js2-mode-buffer-dirty-p nil
-                  js2-mode-fontifications nil
-                  js2-mode-deferred-properties nil)
-            (if js2-mode-verbose-parse-p
-                (message "parsing..."))
-            (setq time
-                  (js2-time
-                   (setq interrupted-p
-                         (catch 'interrupted
-                           (js2-parse)
-                           (with-silent-modifications
-                             ;; if parsing is interrupted, comments and regex
-                             ;; literals stay ignored by `parse-partial-sexp'
-                             (remove-text-properties (point-min) (point-max)
-                                                     '(syntax-table))
-                             (js2-mode-apply-deferred-properties)
-                             (js2-mode-remove-suppressed-warnings)
-                             (js2-mode-show-warnings)
-                             (js2-mode-show-errors)
-                             (if (>= js2-highlight-level 1)
-                                 (js2-highlight-jsdoc js2-mode-ast)))
-                           nil))))
-            (if interrupted-p
-                (progn
-                  ;; unfinished parse => try again
-                  (setq js2-mode-buffer-dirty-p t)
-                  (js2-mode-reset-timer))
-              (if js2-mode-verbose-parse-p
-                  (message "Parse time: %s" time))))
-        (setq js2-mode-parsing nil)
-        (unless interrupted-p
-          (setq js2-mode-parse-timer nil))))))
-
-(defun js2-mode-show-node (event)
-  "Debugging aid:  highlight selected AST node on mouse click."
-  (interactive "e")
-  (mouse-set-point event)
-  (setq deactivate-mark t)
-  (when js2-mode-show-overlay
-    (let ((node (js2-node-at-point))
-          beg end)
-      (if (null node)
-          (message "No node found at location %s" (point))
-        (setq beg (js2-node-abs-pos node)
-              end (+ beg (js2-node-len node)))
-        (if js2-mode-node-overlay
-            (move-overlay js2-mode-node-overlay beg end)
-          (setq js2-mode-node-overlay (make-overlay beg end))
-          (overlay-put js2-mode-node-overlay 'font-lock-face 'highlight))
-        (with-silent-modifications
-          (if (fboundp 'cursor-sensor-mode)
-              (put-text-property beg end 'cursor-sensor-functions
-                                 '(js2-mode-hide-overlay))
-            (put-text-property beg end 'point-left #'js2-mode-hide-overlay)))
-        (message "%s, parent: %s"
-                 (js2-node-short-name node)
-                 (if (js2-node-parent node)
-                     (js2-node-short-name (js2-node-parent node))
-                   "nil"))))))
-
-(defun js2-mode-hide-overlay (&optional arg1 arg2 _arg3)
-  "Remove the debugging overlay when point moves.
-ARG1, ARG2 and ARG3 have different values depending on whether this function
-was found on `point-left' or in `cursor-sensor-functions'."
-  (when js2-mode-node-overlay
-    (let ((beg (overlay-start js2-mode-node-overlay))
-          (end (overlay-end js2-mode-node-overlay))
-          (p2 (if (windowp arg1)
-                  ;; Called from cursor-sensor-functions.
-                  (window-point arg1)
-                ;; Called from point-left.
-                arg2)))
-      ;; Sometimes we're called spuriously.
-      (unless (and p2
-                   (>= p2 beg)
-                   (<= p2 end))
-        (with-silent-modifications
-          (remove-text-properties beg end
-                                  '(point-left nil cursor-sensor-functions)))
-        (delete-overlay js2-mode-node-overlay)
-        (setq js2-mode-node-overlay nil)))))
-
-(defun js2-mode-reset ()
-  "Debugging helper:  reset everything."
-  (interactive)
-  (js2-mode-exit)
-  (js2-mode))
-
-(defun js2-mode-show-warn-or-err (e face)
-  "Highlight a warning or error E with FACE.
-E is a list of ((MSG-KEY MSG-ARG) BEG LEN OVERRIDE-FACE).
-The last element is optional.  When present, use instead of FACE."
-  (let* ((key (cl-first e))
-         (beg (cl-second e))
-         (end (+ beg (cl-third e)))
-         ;; Don't inadvertently go out of bounds.
-         (beg (max (point-min) (min beg (point-max))))
-         (end (max (point-min) (min end (point-max))))
-         (ovl (make-overlay beg end)))
-    ;; FIXME: Why a mix of overlays and text-properties?
-    (overlay-put ovl 'font-lock-face (or (cl-fourth e) face))
-    (overlay-put ovl 'js2-error t)
-    (put-text-property beg end 'help-echo (js2-get-msg key))
-    (if (fboundp 'cursor-sensor-mode)
-        (put-text-property beg end 'cursor-sensor-functions '(js2-echo-error))
-      (put-text-property beg end 'point-entered #'js2-echo-error))))
-
-(defun js2-remove-overlays ()
-  "Remove overlays from buffer that have a `js2-error' property."
-  (let ((beg (point-min))
-        (end (point-max)))
-    (save-excursion
-      (dolist (o (overlays-in beg end))
-        (when (overlay-get o 'js2-error)
-          (delete-overlay o))))))
-
-(defun js2-mode-apply-deferred-properties ()
-  "Apply fontifications and other text properties recorded during parsing."
-  (when (cl-plusp js2-highlight-level)
-    ;; We defer clearing faces as long as possible to eliminate flashing.
-    (js2-clear-face (point-min) (point-max))
-    ;; Have to reverse the recorded fontifications list so that errors
-    ;; and warnings overwrite the normal fontifications.
-    (dolist (f (nreverse js2-mode-fontifications))
-      (put-text-property (cl-first f) (cl-second f) 'font-lock-face (cl-third f)))
-    (setq js2-mode-fontifications nil))
-  (dolist (p js2-mode-deferred-properties)
-    (apply #'put-text-property p))
-  (setq js2-mode-deferred-properties nil))
-
-(defun js2-mode-show-errors ()
-  "Highlight syntax errors."
-  (when js2-mode-show-parse-errors
-    (dolist (e (js2-ast-root-errors js2-mode-ast))
-      (js2-mode-show-warn-or-err e 'js2-error))))
-
-(defun js2-mode-remove-suppressed-warnings ()
-  "Take suppressed warnings out of the AST warnings list.
-This ensures that the counts and `next-error' are correct."
-  (setf (js2-ast-root-warnings js2-mode-ast)
-        (js2-delete-if
-         (lambda (e)
-           (let ((key (caar e)))
-             (or
-              (and (not js2-strict-trailing-comma-warning)
-                   (string-match "trailing\\.comma" key))
-              (and (not js2-strict-cond-assign-warning)
-                   (string= key "msg.equal.as.assign"))
-              (and js2-missing-semi-one-line-override
-                   (string= key "msg.missing.semi")
-                   (let* ((beg (cl-second e))
-                          (node (js2-node-at-point beg))
-                          (fn (js2-mode-find-parent-fn node))
-                          (body (and fn (js2-function-node-body fn)))
-                          (lc (and body (js2-node-abs-pos body)))
-                          (rc (and lc (+ lc (js2-node-len body)))))
-                     (and fn
-                          (or (null body)
-                              (save-excursion
-                                (goto-char beg)
-                                (and (js2-same-line lc)
-                                     (js2-same-line rc))))))))))
-         (js2-ast-root-warnings js2-mode-ast))))
-
-(defun js2-mode-show-warnings ()
-  "Highlight strict-mode warnings."
-  (when js2-mode-show-strict-warnings
-    (dolist (e (js2-ast-root-warnings js2-mode-ast))
-      (js2-mode-show-warn-or-err e 'js2-warning))))
-
-(defun js2-echo-error (arg1 arg2 &optional _arg3)
-  "Called by point-motion hooks.
-ARG1, ARG2 and ARG3 have different values depending on whether this function
-was found on `point-entered' or in `cursor-sensor-functions'."
-  (let* ((new-point (if (windowp arg1)
-                        ;; Called from cursor-sensor-functions.
-                        (window-point arg1)
-                      ;; Called from point-left.
-                      arg2))
-         (msg (get-text-property new-point 'help-echo)))
-    (when (and (stringp msg)
-               (not (active-minibuffer-window))
-               (not (current-message)))
-      (message msg))))
-
-(defun js2-line-break (&optional _soft)
-  "Break line at point and indent, continuing comment if within one.
-If inside a string, and `js2-concat-multiline-strings' is not
-nil, turn it into concatenation."
-  (interactive)
-  (let ((parse-status (syntax-ppss)))
-    (cond
-     ;; Check if we're inside a string.
-     ((nth 3 parse-status)
-      (if js2-concat-multiline-strings
-          (js2-mode-split-string parse-status)
-        (insert "\n")))
-     ;; Check if inside a block comment.
-     ((nth 4 parse-status)
-      (js2-mode-extend-comment (nth 8 parse-status)))
-     (t
-      (newline-and-indent)))))
-
-(defun js2-mode-split-string (parse-status)
-  "Turn a newline in mid-string into a string concatenation.
-PARSE-STATUS is as documented in `parse-partial-sexp'."
-  (let* ((quote-char (nth 3 parse-status))
-         (at-eol (eq js2-concat-multiline-strings 'eol)))
-    (insert quote-char)
-    (insert (if at-eol " +\n" "\n"))
-    (unless at-eol
-      (insert "+ "))
-    (js2-indent-line)
-    (insert quote-char)
-    (when (eolp)
-      (insert quote-char)
-      (backward-char 1))))
-
-(defun js2-mode-extend-comment (start-pos)
-  "Indent the line and, when inside a comment block, add comment prefix."
-  (let (star single col first-line needs-close)
-    (save-excursion
-      (back-to-indentation)
-      (when (< (point) start-pos)
-        (goto-char start-pos))
-      (cond
-       ((looking-at "\\*[^/]")
-        (setq star t
-              col (current-column)))
-       ((looking-at "/\\*")
-        (setq star t
-              first-line t
-              col (1+ (current-column))))
-       ((looking-at "//")
-        (setq single t
-              col (current-column)))))
-    ;; Heuristic for whether we need to close the comment:
-    ;; if we've got a parse error here, assume it's an unterminated
-    ;; comment.
-    (setq needs-close
-          (or
-           (get-char-property (1- (point)) 'js2-error)
-           ;; The heuristic above doesn't work well when we're
-           ;; creating a comment and there's another one downstream,
-           ;; as our parser thinks this one ends at the end of the
-           ;; next one.  (You can have a /* inside a js block comment.)
-           ;; So just close it if the next non-ws char isn't a *.
-           (and first-line
-                (eolp)
-                (save-excursion
-                  (skip-chars-forward " \t\r\n")
-                  (not (eq (char-after) ?*))))))
-    (delete-horizontal-space)
-    (insert "\n")
-    (cond
-     (star
-      (indent-to col)
-      (insert "* ")
-      (if (and first-line needs-close)
-          (save-excursion
-            (insert "\n")
-            (indent-to col)
-            (insert "*/"))))
-     ((and single
-           (save-excursion
-              (and (zerop (forward-line 1))
-                   (looking-at "\\s-*//"))))
-      (indent-to col)
-      (insert "// ")))
-    ;; Don't need to extend the comment after all.
-    (js2-indent-line)))
-
-(defun js2-beginning-of-line ()
-  "Toggle point between bol and first non-whitespace char in line.
-Also moves past comment delimiters when inside comments."
-  (interactive)
-  (let (node)
-    (cond
-     ((bolp)
-      (back-to-indentation))
-     ((looking-at "//")
-      (skip-chars-forward "/ \t"))
-     ((and (eq (char-after) ?*)
-           (setq node (js2-comment-at-point))
-           (memq (js2-comment-node-format node) '(jsdoc block))
-           (save-excursion
-             (skip-chars-backward " \t")
-             (bolp)))
-      (skip-chars-forward "\* \t"))
-     (t
-      (goto-char (point-at-bol))))))
-
-(defun js2-end-of-line ()
-  "Toggle point between eol and last non-whitespace char in line."
-  (interactive)
-  (if (eolp)
-      (skip-chars-backward " \t")
-    (goto-char (point-at-eol))))
-
-(defun js2-mode-wait-for-parse (callback)
-  "Invoke CALLBACK when parsing is finished.
-If parsing is already finished, calls CALLBACK immediately."
-  (if (not js2-mode-buffer-dirty-p)
-      (funcall callback)
-    (push callback js2-mode-pending-parse-callbacks)
-    (add-hook 'js2-parse-finished-hook #'js2-mode-parse-finished)))
-
-(defun js2-mode-parse-finished ()
-  "Invoke callbacks in `js2-mode-pending-parse-callbacks'."
-  ;; We can't let errors propagate up, since it prevents the
-  ;; `js2-parse' method from completing normally and returning
-  ;; the ast, which makes things mysteriously not work right.
-  (unwind-protect
-      (dolist (cb js2-mode-pending-parse-callbacks)
-        (condition-case err
-            (funcall cb)
-          (error (message "%s" err))))
-    (setq js2-mode-pending-parse-callbacks nil)))
-
-(defun js2-mode-flag-region (from to flag)
-  "Hide or show text from FROM to TO, according to FLAG.
-If FLAG is nil then text is shown, while if FLAG is t the text is hidden.
-Returns the created overlay if FLAG is non-nil."
-  (remove-overlays from to 'invisible 'js2-outline)
-  (when flag
-    (let ((o (make-overlay from to)))
-      (overlay-put o 'invisible 'js2-outline)
-      (overlay-put o 'isearch-open-invisible
-                   'js2-isearch-open-invisible)
-      o)))
-
-;; Function to be set as an outline-isearch-open-invisible' property
-;; to the overlay that makes the outline invisible (see
-;; `js2-mode-flag-region').
-(defun js2-isearch-open-invisible (_overlay)
-  ;; We rely on the fact that isearch places point on the matched text.
-  (js2-mode-show-element))
-
-(defun js2-mode-invisible-overlay-bounds (&optional pos)
-  "Return cons cell of bounds of folding overlay at POS.
-Returns nil if not found."
-  (let ((overlays (overlays-at (or pos (point))))
-        o)
-    (while (and overlays
-                (not o))
-      (if (overlay-get (car overlays) 'invisible)
-          (setq o (car overlays))
-        (setq overlays (cdr overlays))))
-    (if o
-        (cons (overlay-start o) (overlay-end o)))))
-
-(defun js2-mode-function-at-point (&optional pos)
-  "Return the innermost function node enclosing current point.
-Returns nil if point is not in a function."
-  (let ((node (js2-node-at-point pos)))
-    (while (and node (not (js2-function-node-p node)))
-      (setq node (js2-node-parent node)))
-    (if (js2-function-node-p node)
-        node)))
-
-(defun js2-mode-toggle-element ()
-  "Hide or show the foldable element at the point."
-  (interactive)
-  (let (comment fn pos)
-    (save-excursion
-      (cond
-       ;; /* ... */ comment?
-       ((js2-block-comment-p (setq comment (js2-comment-at-point)))
-        (if (js2-mode-invisible-overlay-bounds
-             (setq pos (+ 3 (js2-node-abs-pos comment))))
-            (progn
-              (goto-char pos)
-              (js2-mode-show-element))
-          (js2-mode-hide-element)))
-       ;; //-comment?
-       ((save-excursion
-          (back-to-indentation)
-          (looking-at js2-mode-//-comment-re))
-        (js2-mode-toggle-//-comment))
-       ;; function?
-       ((setq fn (js2-mode-function-at-point))
-        (setq pos (and (js2-function-node-body fn)
-                       (js2-node-abs-pos (js2-function-node-body fn))))
-        (goto-char (1+ pos))
-        (if (js2-mode-invisible-overlay-bounds)
-            (js2-mode-show-element)
-          (js2-mode-hide-element)))
-       (t
-        (message "Nothing at point to hide or show"))))))
-
-(defun js2-mode-hide-element ()
-  "Fold/hide contents of a block, showing ellipses.
-Show the hidden text with \\[js2-mode-show-element]."
-  (interactive)
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-hide-element))
-  (let (node body beg end)
-    (cond
-     ((js2-mode-invisible-overlay-bounds)
-      (message "already hidden"))
-     (t
-      (setq node (js2-node-at-point))
-      (cond
-       ((js2-block-comment-p node)
-        (js2-mode-hide-comment node))
-       (t
-        (while (and node (not (js2-function-node-p node)))
-          (setq node (js2-node-parent node)))
-        (if (and node
-                 (setq body (js2-function-node-body node)))
-            (progn
-              (setq beg (js2-node-abs-pos body)
-                    end (+ beg (js2-node-len body)))
-              (js2-mode-flag-region (1+ beg) (1- end) 'hide))
-          (message "No collapsable element found at point"))))))))
-
-(defun js2-mode-show-element ()
-  "Show the hidden element at current point."
-  (interactive)
-  (let ((bounds (js2-mode-invisible-overlay-bounds)))
-    (if bounds
-        (js2-mode-flag-region (car bounds) (cdr bounds) nil)
-      (message "Nothing to un-hide"))))
-
-(defun js2-mode-show-all ()
-  "Show all of the text in the buffer."
-  (interactive)
-  (js2-mode-flag-region (point-min) (point-max) nil))
-
-(defun js2-mode-toggle-hide-functions ()
-  (interactive)
-  (if js2-mode-functions-hidden
-      (js2-mode-show-functions)
-    (js2-mode-hide-functions)))
-
-(defun js2-mode-hide-functions ()
-  "Hides all non-nested function bodies in the buffer.
-Use \\[js2-mode-show-all] to reveal them, or \\[js2-mode-show-element]
-to open an individual entry."
-  (interactive)
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-hide-functions))
-  (if (null js2-mode-ast)
-      (message "Oops - parsing failed")
-    (setq js2-mode-functions-hidden t)
-    (js2-visit-ast js2-mode-ast #'js2-mode-function-hider)))
-
-(defun js2-mode-function-hider (n endp)
-  (when (not endp)
-    (let ((tt (js2-node-type n))
-          body beg end)
-      (cond
-       ((and (= tt js2-FUNCTION)
-             (setq body (js2-function-node-body n)))
-        (setq beg (js2-node-abs-pos body)
-              end (+ beg (js2-node-len body)))
-        (js2-mode-flag-region (1+ beg) (1- end) 'hide)
-        nil)   ; don't process children of function
-       (t
-        t))))) ; keep processing other AST nodes
-
-(defun js2-mode-show-functions ()
-  "Un-hide any folded function bodies in the buffer."
-  (interactive)
-  (setq js2-mode-functions-hidden nil)
-  (save-excursion
-    (goto-char (point-min))
-    (while (/= (goto-char (next-overlay-change (point)))
-               (point-max))
-      (dolist (o (overlays-at (point)))
-        (when (and (overlay-get o 'invisible)
-                   (not (overlay-get o 'comment)))
-          (js2-mode-flag-region (overlay-start o) (overlay-end o) nil))))))
-
-(defun js2-mode-hide-comment (n)
-  (let* ((head (if (eq (js2-comment-node-format n) 'jsdoc)
-                   3  ; /**
-                 2))  ; /*
-         (beg (+ (js2-node-abs-pos n) head))
-         (end (- (+ beg (js2-node-len n)) head 2))
-         (o (js2-mode-flag-region beg end 'hide)))
-    (overlay-put o 'comment t)))
-
-(defun js2-mode-toggle-hide-comments ()
-  "Folds all block comments in the buffer.
-Use \\[js2-mode-show-all] to reveal them, or \\[js2-mode-show-element]
-to open an individual entry."
-  (interactive)
-  (if js2-mode-comments-hidden
-      (js2-mode-show-comments)
-    (js2-mode-hide-comments)))
-
-(defun js2-mode-hide-comments ()
-  (interactive)
-  (if js2-mode-buffer-dirty-p
-      (js2-mode-wait-for-parse #'js2-mode-hide-comments))
-  (if (null js2-mode-ast)
-      (message "Oops - parsing failed")
-    (setq js2-mode-comments-hidden t)
-    (dolist (n (js2-ast-root-comments js2-mode-ast))
-      (when (js2-block-comment-p n)
-        (js2-mode-hide-comment n)))
-    (js2-mode-hide-//-comments)))
-
-(defun js2-mode-extend-//-comment (direction)
-  "Find start or end of a block of similar //-comment lines.
-DIRECTION is -1 to look back, 1 to look forward.
-INDENT is the indentation level to match.
-Returns the end-of-line position of the furthest adjacent
-//-comment line with the same indentation as the current line.
-If there is no such matching line, returns current end of line."
-  (let ((pos (point-at-eol))
-        (indent (current-indentation)))
-    (save-excursion
-      (while (and (zerop (forward-line direction))
-                  (looking-at js2-mode-//-comment-re)
-                  (eq indent (length (match-string 1))))
-        (setq pos (point-at-eol)))
-      pos)))
-
-(defun js2-mode-hide-//-comments ()
-  "Fold adjacent 1-line comments, showing only snippet of first one."
-  (let (beg end)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward js2-mode-//-comment-re nil t)
-        (setq beg (point)
-              end (js2-mode-extend-//-comment 1))
-        (unless (eq beg end)
-          (overlay-put (js2-mode-flag-region beg end 'hide)
-                       'comment t))
-        (goto-char end)
-        (forward-char 1)))))
-
-(defun js2-mode-toggle-//-comment ()
-  "Fold or un-fold any multi-line //-comment at point.
-Caller should have determined that this line starts with a //-comment."
-  (let* ((beg (point-at-eol))
-         (end beg))
-    (save-excursion
-      (goto-char end)
-      (if (js2-mode-invisible-overlay-bounds)
-          (js2-mode-show-element)
-        ;; else hide the comment
-        (setq beg (js2-mode-extend-//-comment -1)
-              end (js2-mode-extend-//-comment 1))
-        (unless (eq beg end)
-          (overlay-put (js2-mode-flag-region beg end 'hide)
-                       'comment t))))))
-
-(defun js2-mode-show-comments ()
-  "Un-hide any hidden comments, leaving other hidden elements alone."
-  (interactive)
-  (setq js2-mode-comments-hidden nil)
-  (save-excursion
-    (goto-char (point-min))
-    (while (/= (goto-char (next-overlay-change (point)))
-               (point-max))
-      (dolist (o (overlays-at (point)))
-        (when (overlay-get o 'comment)
-          (js2-mode-flag-region (overlay-start o) (overlay-end o) nil))))))
-
-(defun js2-mode-display-warnings-and-errors ()
-  "Turn on display of warnings and errors."
-  (interactive)
-  (setq js2-mode-show-parse-errors t
-        js2-mode-show-strict-warnings t)
-  (js2-reparse 'force))
-
-(defun js2-mode-hide-warnings-and-errors ()
-  "Turn off display of warnings and errors."
-  (interactive)
-  (setq js2-mode-show-parse-errors nil
-        js2-mode-show-strict-warnings nil)
-  (js2-reparse 'force))
-
-(defun js2-mode-toggle-warnings-and-errors ()
-  "Toggle the display of warnings and errors.
-Some users don't like having warnings/errors reported while they type."
-  (interactive)
-  (setq js2-mode-show-parse-errors (not js2-mode-show-parse-errors)
-        js2-mode-show-strict-warnings (not js2-mode-show-strict-warnings))
-  (if (called-interactively-p 'any)
-      (message "warnings and errors %s"
-               (if js2-mode-show-parse-errors
-                   "enabled"
-                 "disabled")))
-  (js2-reparse 'force))
-
-(defun js2-mode-customize ()
-  (interactive)
-  (customize-group 'js2-mode))
-
-(defun js2-mode-forward-sexp (&optional arg)
-  "Move forward across one statement or balanced expression.
-With ARG, do it that many times.  Negative arg -N means
-move backward across N balanced expressions."
-  (interactive "p")
-  (setq arg (or arg 1))
-  (save-restriction
-    (widen) ;; `blink-matching-open' calls `narrow-to-region'
-    (js2-reparse)
-    (let (forward-sexp-function
-          node (start (point)) pos lp rp child)
-      (cond
-       ;; backward-sexp
-       ;; could probably make this better for some cases:
-       ;;  - if in statement block (e.g. function body), go to parent
-       ;;  - infix exprs like (foo in bar) - maybe go to beginning
-       ;;    of infix expr if in the right-side expression?
-       ((and arg (cl-minusp arg))
-        (dotimes (_ (- arg))
-          (js2-backward-sws)
-          (forward-char -1)   ; Enter the node we backed up to.
-          (when (setq node (js2-node-at-point (point) t))
-            (setq pos (js2-node-abs-pos node))
-            (let ((parens (js2-mode-forward-sexp-parens node pos)))
-              (setq lp (car parens)
-                    rp (cdr parens)))
-            (when (and lp (> start lp))
-              (if (and rp (<= start rp))
-                  ;; Between parens, check if there's a child node we can jump.
-                  (when (setq child (js2-node-closest-child node (point) lp t))
-                    (setq pos (js2-node-abs-pos child)))
-                ;; Before both parens.
-                (setq pos lp)))
-            (let ((state (parse-partial-sexp start pos)))
-              (goto-char (if (not (zerop (car state)))
-                             ;; Stumble at the unbalanced paren if < 0, or
-                             ;; jump a bit further if > 0.
-                             (scan-sexps start -1)
-                           pos))))
-          (unless pos (goto-char (point-min)))))
-       (t
-        ;; forward-sexp
-        (dotimes (_ arg)
-          (js2-forward-sws)
-          (when (setq node (js2-node-at-point (point) t))
-            (setq pos (js2-node-abs-pos node))
-            (let ((parens (js2-mode-forward-sexp-parens node pos)))
-              (setq lp (car parens)
-                    rp (cdr parens)))
-            (or
-             (when (and rp (<= start rp))
-               (if (> start lp)
-                   (when (setq child (js2-node-closest-child node (point) rp))
-                     (setq pos (js2-node-abs-end child)))
-                 (setq pos (1+ rp))))
-             ;; No parens or child nodes, looks for the end of the current node.
-             (cl-incf pos (js2-node-len
-                           (if (js2-expr-stmt-node-p (js2-node-parent node))
-                               ;; Stop after the semicolon.
-                               (js2-node-parent node)
-                             node))))
-            (let ((state (save-excursion (parse-partial-sexp start pos))))
-              (goto-char (if (not (zerop (car state)))
-                             (scan-sexps start 1)
-                           pos))))
-          (unless pos (goto-char (point-max)))))))))
-
-(defun js2-mode-forward-sexp-parens (node abs-pos)
-  "Return a cons cell with positions of main parens in NODE."
-  (cond
-   ((or (js2-array-node-p node)
-        (js2-object-node-p node)
-        (js2-comp-node-p node)
-        (memq (aref node 0) '(cl-struct-js2-block-node cl-struct-js2-scope)))
-    (cons abs-pos (+ abs-pos (js2-node-len node) -1)))
-   ((js2-paren-expr-node-p node)
-    (let ((lp (js2-node-lp node))
-          (rp (js2-node-rp node)))
-      (cons (when lp (+ abs-pos lp))
-            (when rp (+ abs-pos rp)))))))
-
-(defun js2-node-closest-child (parent point limit &optional before)
-  (let* ((parent-pos (js2-node-abs-pos parent))
-         (rpoint (- point parent-pos))
-         (rlimit (- limit parent-pos))
-         (min (min rpoint rlimit))
-         (max (max rpoint rlimit))
-         found)
-    (catch 'done
-      (js2-visit-ast
-       parent
-       (lambda (node _end-p)
-         (if (eq node parent)
-             t
-           (let ((pos (js2-node-pos node)) ;; Both relative values.
-                 (end (+ (js2-node-pos node) (js2-node-len node))))
-             (when (and (>= pos min) (<= end max)
-                        (if before (< pos rpoint) (> end rpoint)))
-               (setq found node))
-             (when (> end rpoint)
-               (throw 'done nil)))
-           nil))))
-    found))
-
-(defun js2-errors ()
-  "Return a list of errors found."
-  (and js2-mode-ast
-       (js2-ast-root-errors js2-mode-ast)))
-
-(defun js2-warnings ()
-  "Return a list of warnings found."
-  (and js2-mode-ast
-       (js2-ast-root-warnings js2-mode-ast)))
-
-(defun js2-have-errors-p ()
-  "Return non-nil if any parse errors or warnings were found."
-  (or (js2-errors) (js2-warnings)))
-
-(defun js2-errors-and-warnings ()
-  "Return a copy of the concatenated errors and warnings lists.
-They are appended:  first the errors, then the warnings.
-Entries are of the form (MSG BEG END)."
-  (when js2-mode-ast
-    (append (js2-ast-root-errors js2-mode-ast)
-            (copy-sequence (js2-ast-root-warnings js2-mode-ast)))))
-
-(defun js2-next-error (&optional arg reset)
-  "Move to next parse error.
-Typically invoked via \\[next-error].
-ARG is the number of errors, forward or backward, to move.
-RESET means start over from the beginning."
-  (interactive "p")
-  (if (not (or (js2-errors) (js2-warnings)))
-      (message "No errors")
-    (when reset
-      (goto-char (point-min)))
-    (let* ((errs (js2-errors-and-warnings))
-           (continue t)
-           (start (point))
-           (count (or arg 1))
-           (backward (cl-minusp count))
-           (sorter (if backward '> '<))
-           (stopper (if backward '< '>))
-           (count (abs count))
-           all-errs err)
-      ;; Sort by start position.
-      (setq errs (sort errs (lambda (e1 e2)
-                              (funcall sorter (cl-second e1) (cl-second e2))))
-            all-errs errs)
-      ;; Find nth error with pos > start.
-      (while (and errs continue)
-        (when (funcall stopper (cl-cadar errs) start)
-          (setq err (car errs))
-          (if (zerop (cl-decf count))
-              (setq continue nil)))
-        (setq errs (cdr errs)))
-      ;; Clear for `js2-echo-error'.
-      (message nil)
-      (if err
-          (goto-char (cl-second err))
-        ;; Wrap around to first error.
-        (goto-char (cl-second (car all-errs)))
-        ;; If we were already on it, echo msg again.
-        (if (= (point) start)
-            (js2-echo-error (point) (point)))))))
-
-(defun js2-down-mouse-3 ()
-  "Make right-click move the point to the click location.
-This makes right-click context menu operations a bit more intuitive.
-The point will not move if the region is active, however, to avoid
-destroying the region selection."
-  (interactive)
-  (when (and js2-move-point-on-right-click
-             (not mark-active))
-    (let ((e last-input-event))
-      (ignore-errors
-        (goto-char (cl-cadadr e))))))
-
-(defun js2-mode-create-imenu-index ()
-  "Return an alist for `imenu--index-alist'."
-  ;; This is built up in `js2-parse-record-imenu' during parsing.
-  (when js2-mode-ast
-    ;; if we have an ast but no recorder, they're requesting a rescan
-    (unless js2-imenu-recorder
-      (js2-reparse 'force))
-    (prog1
-        (js2-build-imenu-index)
-      (setq js2-imenu-recorder nil
-            js2-imenu-function-map nil))))
-
-(defun js2-mode-find-tag ()
-  "Replacement for `find-tag-default'.
-`find-tag-default' returns a ridiculous answer inside comments."
-  (let (beg end)
-    (js2-with-underscore-as-word-syntax
-      (save-excursion
-        (if (and (not (looking-at "[[:alnum:]_$]"))
-                 (looking-back "[[:alnum:]_$]"))
-            (setq beg (progn (forward-word -1) (point))
-                  end (progn (forward-word 1) (point)))
-          (setq beg (progn (forward-word 1) (point))
-                end (progn (forward-word -1) (point))))
-        (replace-regexp-in-string
-         "[\"']" ""
-         (buffer-substring-no-properties beg end))))))
-
-(defun js2-mode-forward-sibling ()
-  "Move to the end of the sibling following point in parent.
-Returns non-nil if successful, or nil if there was no following sibling."
-  (let* ((node (js2-node-at-point))
-         (parent (js2-mode-find-enclosing-fn node))
-         sib)
-    (when (setq sib (js2-node-find-child-after (point) parent))
-      (goto-char (+ (js2-node-abs-pos sib)
-                    (js2-node-len sib))))))
-
-(defun js2-mode-backward-sibling ()
-  "Move to the beginning of the sibling node preceding point in parent.
-Parent is defined as the enclosing script or function."
-  (let* ((node (js2-node-at-point))
-         (parent (js2-mode-find-enclosing-fn node))
-         sib)
-    (when (setq sib (js2-node-find-child-before (point) parent))
-      (goto-char (js2-node-abs-pos sib)))))
-
-(defun js2-beginning-of-defun (&optional arg)
-  "Go to line on which current function starts, and return t on success.
-If we're not in a function or already at the beginning of one, go
-to beginning of previous script-level element.
-With ARG N, do that N times. If N is negative, move forward."
-  (setq arg (or arg 1))
-  (if (cl-plusp arg)
-      (let ((parent (js2-node-parent-script-or-fn (js2-node-at-point))))
-        (when (cond
-               ((js2-function-node-p parent)
-                (goto-char (js2-node-abs-pos parent)))
-               (t
-                (js2-mode-backward-sibling)))
-          (if (> arg 1)
-              (js2-beginning-of-defun (1- arg))
-            t)))
-    (when (js2-end-of-defun)
-      (js2-beginning-of-defun (if (>= arg -1) 1 (1+ arg))))))
-
-(defun js2-end-of-defun ()
-  "Go to the char after the last position of the current function
-or script-level element."
-  (let* ((node (js2-node-at-point))
-         (parent (or (and (js2-function-node-p node) node)
-                     (js2-node-parent-script-or-fn node)))
-         script)
-    (unless (js2-function-node-p parent)
-      ;; Use current script-level node, or, if none, the next one.
-      (setq script (or parent node)
-            parent (js2-node-find-child-before (point) script))
-      (when (or (null parent)
-                (>= (point) (+ (js2-node-abs-pos parent)
-                               (js2-node-len parent))))
-        (setq parent (js2-node-find-child-after (point) script))))
-    (when parent
-      (goto-char (+ (js2-node-abs-pos parent)
-                    (js2-node-len parent))))))
-
-(defun js2-mark-defun (&optional allow-extend)
-  "Put mark at end of this function, point at beginning.
-The function marked is the one that contains point.
-
-Interactively, if this command is repeated,
-or (in Transient Mark mode) if the mark is active,
-it marks the next defun after the ones already marked."
-  (interactive "p")
-  (let (extended)
-    (when (and allow-extend
-               (or (and (eq last-command this-command) (mark t))
-                   (and transient-mark-mode mark-active)))
-      (let ((sib (save-excursion
-                   (goto-char (mark))
-                   (if (js2-mode-forward-sibling)
-                       (point)))))
-        (if sib
-            (progn
-              (set-mark sib)
-              (setq extended t))
-          ;; no more siblings - try extending to enclosing node
-          (goto-char (mark t)))))
-   (when (not extended)
-     (let ((node (js2-node-at-point (point) t)) ; skip comments
-           ast fn stmt parent beg end)
-       (when (js2-ast-root-p node)
-         (setq ast node
-               node (or (js2-node-find-child-after (point) node)
-                        (js2-node-find-child-before (point) node))))
-       ;; only mark whole buffer if we can't find any children
-       (if (null node)
-           (setq node ast))
-       (if (js2-function-node-p node)
-           (setq parent node)
-         (setq fn (js2-mode-find-enclosing-fn node)
-               stmt (if (or (null fn)
-                            (js2-ast-root-p fn))
-                        (js2-mode-find-first-stmt node))
-               parent (or stmt fn)))
-       (setq beg (js2-node-abs-pos parent)
-             end (+ beg (js2-node-len parent)))
-       (push-mark beg)
-       (goto-char end)
-       (exchange-point-and-mark)))))
-
-(defun js2-narrow-to-defun ()
-  "Narrow to the function enclosing point."
-  (interactive)
-  (let* ((node (js2-node-at-point (point) t))  ; skip comments
-         (fn (if (js2-script-node-p node)
-                 node
-               (js2-mode-find-enclosing-fn node)))
-         (beg (js2-node-abs-pos fn)))
-    (unless (js2-ast-root-p fn)
-      (narrow-to-region beg (+ beg (js2-node-len fn))))))
-
-(provide 'js2-mode)
-
-;;; js2-mode.el ends here
diff --git a/emacs.d/elpa/js2-mode-20150524.426/js2-imenu-extras.el b/emacs.d/elpa/js2-mode-20160109.148/js2-imenu-extras.el
similarity index 100%
rename from emacs.d/elpa/js2-mode-20150524.426/js2-imenu-extras.el
rename to emacs.d/elpa/js2-mode-20160109.148/js2-imenu-extras.el
diff --git a/emacs.d/elpa/js2-mode-20160109.148/js2-mode-autoloads.el b/emacs.d/elpa/js2-mode-20160109.148/js2-mode-autoloads.el
new file mode 100644
index 0000000..f16289d
--- /dev/null
+++ b/emacs.d/elpa/js2-mode-20160109.148/js2-mode-autoloads.el
@@ -0,0 +1,67 @@
+;;; js2-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "js2-imenu-extras" "js2-imenu-extras.el" (22171
+;;;;;;  46556 0 0))
+;;; Generated autoloads from js2-imenu-extras.el
+
+(autoload 'js2-imenu-extras-setup "js2-imenu-extras" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'js2-imenu-extras-mode "js2-imenu-extras" "\
+Toggle Imenu support for frameworks and structural patterns.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "js2-mode" "js2-mode.el" (22171 46556 0 0))
+;;; Generated autoloads from js2-mode.el
+
+(autoload 'js2-highlight-unused-variables-mode "js2-mode" "\
+Toggle highlight of unused variables.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'js2-minor-mode "js2-mode" "\
+Minor mode for running js2 as a background linter.
+This allows you to use a different major mode for JavaScript editing,
+such as `js-mode', while retaining the asynchronous error/warning
+highlighting features of `js2-mode'.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'js2-mode "js2-mode" "\
+Major mode for editing JavaScript code.
+
+\(fn)" t nil)
+
+(autoload 'js2-jsx-mode "js2-mode" "\
+Major mode for editing JSX code.
+
+To customize the indentation for this mode, set the SGML offset
+variables (`sgml-basic-offset' et al) locally, like so:
+
+  (defun set-jsx-indentation ()
+    (setq-local sgml-basic-offset js2-basic-offset))
+  (add-hook 'js2-jsx-mode-hook #'set-jsx-indentation)
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("js2-mode-pkg.el" "js2-old-indent.el")
+;;;;;;  (22171 46556 923429 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; js2-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/js2-mode-20160109.148/js2-mode-pkg.el b/emacs.d/elpa/js2-mode-20160109.148/js2-mode-pkg.el
new file mode 100644
index 0000000..48ccc6e
--- /dev/null
+++ b/emacs.d/elpa/js2-mode-20160109.148/js2-mode-pkg.el
@@ -0,0 +1,8 @@
+(define-package "js2-mode" "20160109.148" "Improved JavaScript editing mode"
+  '((emacs "24.1")
+    (cl-lib "0.5"))
+  :url "https://github.com/mooz/js2-mode/" :keywords
+  '("languages" "javascript"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/js2-mode-20160109.148/js2-mode.el b/emacs.d/elpa/js2-mode-20160109.148/js2-mode.el
new file mode 100644
index 0000000..aa1d60d
--- /dev/null
+++ b/emacs.d/elpa/js2-mode-20160109.148/js2-mode.el
@@ -0,0 +1,12692 @@
+;;; js2-mode.el --- Improved JavaScript editing mode
+
+;; Copyright (C) 2009, 2011-2015  Free Software Foundation, Inc.
+
+;; Author: Steve Yegge <steve.yegge@gmail.com>
+;;         mooz <stillpedant@gmail.com>
+;;         Dmitry Gutov <dgutov@yandex.ru>
+;; URL:  https://github.com/mooz/js2-mode/
+;;       http://code.google.com/p/js2-mode/
+;; Version: 20150909
+;; Keywords: languages, javascript
+;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This JavaScript editing mode supports:
+
+;;  - strict recognition of the Ecma-262 language standard
+;;  - support for most Rhino and SpiderMonkey extensions from 1.5 and up
+;;  - parsing support for ECMAScript for XML (E4X, ECMA-357)
+;;  - accurate syntax highlighting using a recursive-descent parser
+;;  - on-the-fly reporting of syntax errors and strict-mode warnings
+;;  - undeclared-variable warnings using a configurable externs framework
+;;  - "bouncing" line indentation to choose among alternate indentation points
+;;  - smart line-wrapping within comments and strings
+;;  - code folding:
+;;    - show some or all function bodies as {...}
+;;    - show some or all block comments as /*...*/
+;;  - context-sensitive menu bar and popup menus
+;;  - code browsing using the `imenu' package
+;;  - many customization options
+
+;; Installation:
+;;
+;; To install it as your major mode for JavaScript editing:
+
+;;   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+
+;; Alternatively, to install it as a minor mode just for JavaScript linting,
+;; you must add it to the appropriate major-mode hook.  Normally this would be:
+
+;;   (add-hook 'js-mode-hook 'js2-minor-mode)
+
+;; You may also want to hook it in for shell scripts running via node.js:
+
+;;   (add-to-list 'interpreter-mode-alist '("node" . js2-mode))
+
+;; Support for JSX is available via the derived mode `js2-jsx-mode'.  If you
+;; also want JSX support, use that mode instead:
+
+;;   (add-to-list 'auto-mode-alist '("\\.jsx?\\'" . js2-jsx-mode))
+;;   (add-to-list 'interpreter-mode-alist '("node" . js2-jsx-mode))
+
+;; To customize how it works:
+;;   M-x customize-group RET js2-mode RET
+
+;; Notes:
+
+;; This mode includes a port of Mozilla Rhino's scanner, parser and
+;; symbol table.  Ideally it should stay in sync with Rhino, keeping
+;; `js2-mode' current as the EcmaScript language standard evolves.
+
+;; Unlike cc-engine based language modes, js2-mode's line-indentation is not
+;; customizable.  It is a surprising amount of work to support customizable
+;; indentation.  The current compromise is that the tab key lets you cycle among
+;; various likely indentation points, similar to the behavior of python-mode.
+
+;; This mode does not yet work with "multi-mode" modes such as `mmm-mode'
+;; and `mumamo', although it could be made to do so with some effort.
+;; This means that `js2-mode' is currently only useful for editing JavaScript
+;; files, and not for editing JavaScript within <script> tags or templates.
+
+;; The project page on GitHub is used for development and issue tracking.
+;; The original homepage at Google Code has outdated information and is mostly
+;; unmaintained.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'imenu)
+(require 'js)
+(require 'etags)
+
+(eval-and-compile
+  (if (version< emacs-version "25.0")
+      (require 'js2-old-indent)
+    (defvaralias 'js2-basic-offset 'js-indent-level nil)
+    (defalias 'js2-proper-indentation 'js--proper-indentation)
+    (defalias 'js2-jsx-indent-line 'js-jsx-indent-line)
+    (defalias 'js2-indent-line 'js-indent-line)
+    (defalias 'js2-re-search-forward 'js--re-search-forward)))
+
+;;; Externs (variables presumed to be defined by the host system)
+
+(defvar js2-ecma-262-externs
+  (mapcar 'symbol-name
+          '(Array Boolean Date Error EvalError Function Infinity JSON
+          Math NaN Number Object RangeError ReferenceError RegExp
+          String SyntaxError TypeError URIError
+          decodeURI decodeURIComponent encodeURI
+          encodeURIComponent escape eval isFinite isNaN
+          parseFloat parseInt undefined unescape))
+"Ecma-262 externs.  Included in `js2-externs' by default.")
+
+(defvar js2-browser-externs
+  (mapcar 'symbol-name
+          '(;; DOM level 1
+            Attr CDATASection CharacterData Comment DOMException
+            DOMImplementation Document DocumentFragment
+            DocumentType Element Entity EntityReference
+            ExceptionCode NamedNodeMap Node NodeList Notation
+            ProcessingInstruction Text
+
+            ;; DOM level 2
+            HTMLAnchorElement HTMLAppletElement HTMLAreaElement
+            HTMLBRElement HTMLBaseElement HTMLBaseFontElement
+            HTMLBodyElement HTMLButtonElement HTMLCollection
+            HTMLDListElement HTMLDirectoryElement HTMLDivElement
+            HTMLDocument HTMLElement HTMLFieldSetElement
+            HTMLFontElement HTMLFormElement HTMLFrameElement
+            HTMLFrameSetElement HTMLHRElement HTMLHeadElement
+            HTMLHeadingElement HTMLHtmlElement HTMLIFrameElement
+            HTMLImageElement HTMLInputElement HTMLIsIndexElement
+            HTMLLIElement HTMLLabelElement HTMLLegendElement
+            HTMLLinkElement HTMLMapElement HTMLMenuElement
+            HTMLMetaElement HTMLModElement HTMLOListElement
+            HTMLObjectElement HTMLOptGroupElement
+            HTMLOptionElement HTMLOptionsCollection
+            HTMLParagraphElement HTMLParamElement HTMLPreElement
+            HTMLQuoteElement HTMLScriptElement HTMLSelectElement
+            HTMLStyleElement HTMLTableCaptionElement
+            HTMLTableCellElement HTMLTableColElement
+            HTMLTableElement HTMLTableRowElement
+            HTMLTableSectionElement HTMLTextAreaElement
+            HTMLTitleElement HTMLUListElement
+
+            ;; DOM level 3
+            DOMConfiguration DOMError DOMException
+            DOMImplementationList DOMImplementationSource
+            DOMLocator DOMStringList NameList TypeInfo
+            UserDataHandler
+
+            ;; Window
+            window alert confirm document java navigator prompt screen
+            self top requestAnimationFrame cancelAnimationFrame
+
+            ;; W3C CSS
+            CSSCharsetRule CSSFontFace CSSFontFaceRule
+            CSSImportRule CSSMediaRule CSSPageRule
+            CSSPrimitiveValue CSSProperties CSSRule CSSRuleList
+            CSSStyleDeclaration CSSStyleRule CSSStyleSheet
+            CSSValue CSSValueList Counter DOMImplementationCSS
+            DocumentCSS DocumentStyle ElementCSSInlineStyle
+            LinkStyle MediaList RGBColor Rect StyleSheet
+            StyleSheetList ViewCSS
+
+            ;; W3C Event
+            EventListener EventTarget Event DocumentEvent UIEvent
+            MouseEvent MutationEvent KeyboardEvent
+
+            ;; W3C Range
+            DocumentRange Range RangeException
+
+            ;; W3C XML
+            XPathResult XMLHttpRequest
+
+            ;; console object.  Provided by at least Chrome and Firefox.
+            console))
+  "Browser externs.
+You can cause these to be included or excluded with the custom
+variable `js2-include-browser-externs'.")
+
+(defvar js2-rhino-externs
+  (mapcar 'symbol-name
+          '(Packages importClass importPackage com org java
+            ;; Global object (shell) externs.
+            defineClass deserialize doctest gc help load
+            loadClass print quit readFile readUrl runCommand seal
+            serialize spawn sync toint32 version))
+  "Mozilla Rhino externs.
+Set `js2-include-rhino-externs' to t to include them.")
+
+(defvar js2-node-externs
+  (mapcar 'symbol-name
+          '(__dirname __filename Buffer clearInterval clearTimeout require
+            console exports global module process setInterval setTimeout
+            querystring setImmediate clearImmediate))
+  "Node.js externs.
+Set `js2-include-node-externs' to t to include them.")
+
+(defvar js2-typed-array-externs
+  (mapcar 'symbol-name
+          '(ArrayBuffer Uint8ClampedArray DataView
+            Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array
+            Float32Array Float64Array))
+  "Khronos typed array externs. Available in most modern browsers and
+in node.js >= 0.6. If `js2-include-node-externs' or `js2-include-browser-externs'
+are enabled, these will also be included.")
+
+(defvar js2-harmony-externs
+  (mapcar 'symbol-name
+          '(Map Promise Proxy Reflect Set Symbol WeakMap WeakSet))
+  "ES6 externs.  If `js2-include-browser-externs' is enabled and
+`js2-language-version' is sufficiently high, these will be included.")
+
+;;; Variables
+
+(defun js2-mark-safe-local (name pred)
+  "Make the variable NAME buffer-local and mark it as safe file-local
+variable with predicate PRED."
+  (make-variable-buffer-local name)
+  (put name 'safe-local-variable pred))
+
+(defcustom js2-highlight-level 2
+  "Amount of syntax highlighting to perform.
+0 or a negative value means none.
+1 adds basic syntax highlighting.
+2 adds highlighting of some Ecma built-in properties.
+3 adds highlighting of many Ecma built-in functions."
+  :group 'js2-mode
+  :type '(choice (const :tag "None" 0)
+                 (const :tag "Basic" 1)
+                 (const :tag "Include Properties" 2)
+                 (const :tag "Include Functions" 3)))
+
+(defvar js2-mode-dev-mode-p nil
+  "Non-nil if running in development mode.  Normally nil.")
+
+(defgroup js2-mode nil
+  "An improved JavaScript mode."
+  :group 'languages)
+
+(defcustom js2-idle-timer-delay 0.2
+  "Delay in secs before re-parsing after user makes changes.
+Multiplied by `js2-dynamic-idle-timer-adjust', which see."
+  :type 'number
+  :group 'js2-mode)
+(make-variable-buffer-local 'js2-idle-timer-delay)
+
+(defcustom js2-dynamic-idle-timer-adjust 0
+  "Positive to adjust `js2-idle-timer-delay' based on file size.
+The idea is that for short files, parsing is faster so we can be
+more responsive to user edits without interfering with editing.
+The buffer length in characters (typically bytes) is divided by
+this value and used to multiply `js2-idle-timer-delay' for the
+buffer.  For example, a 21k file and 10k adjust yields 21k/10k
+== 2, so js2-idle-timer-delay is multiplied by 2.
+If `js2-dynamic-idle-timer-adjust' is 0 or negative,
+`js2-idle-timer-delay' is not dependent on the file size."
+  :type 'number
+  :group 'js2-mode)
+
+(defcustom js2-concat-multiline-strings t
+  "When non-nil, `js2-line-break' in mid-string will make it a
+string concatenation. When `eol', the '+' will be inserted at the
+end of the line, otherwise, at the beginning of the next line."
+  :type '(choice (const t) (const eol) (const nil))
+  :group 'js2-mode)
+
+(defcustom js2-mode-show-parse-errors t
+  "True to highlight parse errors."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-mode-show-strict-warnings t
+  "Non-nil to emit Ecma strict-mode warnings.
+Some of the warnings can be individually disabled by other flags,
+even if this flag is non-nil."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-strict-trailing-comma-warning t
+  "Non-nil to warn about trailing commas in array literals.
+Ecma-262-5.1 allows them, but older versions of IE raise an error."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-strict-missing-semi-warning t
+  "Non-nil to warn about semicolon auto-insertion after statement.
+Technically this is legal per Ecma-262, but some style guides disallow
+depending on it."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-missing-semi-one-line-override nil
+  "Non-nil to permit missing semicolons in one-line functions.
+In one-liner functions such as `function identity(x) {return x}'
+people often omit the semicolon for a cleaner look.  If you are
+such a person, you can suppress the missing-semicolon warning
+by setting this variable to t."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-strict-inconsistent-return-warning t
+  "Non-nil to warn about mixing returns with value-returns.
+It's perfectly legal to have a `return' and a `return foo' in the
+same function, but it's often an indicator of a bug, and it also
+interferes with type inference (in systems that support it.)"
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-strict-cond-assign-warning t
+  "Non-nil to warn about expressions like if (a = b).
+This often should have been '==' instead of '='.  If the warning
+is enabled, you can suppress it on a per-expression basis by
+parenthesizing the expression, e.g. if ((a = b)) ..."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-strict-var-redeclaration-warning t
+  "Non-nil to warn about redeclaring variables in a script or function."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-strict-var-hides-function-arg-warning t
+  "Non-nil to warn about a var decl hiding a function argument."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-skip-preprocessor-directives nil
+  "Non-nil to treat lines beginning with # as comments.
+Useful for viewing Mozilla JavaScript source code."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-language-version 200
+  "Configures what JavaScript language version to recognize.
+Currently versions 150, 160, 170, 180 and 200 are supported,
+corresponding to JavaScript 1.5, 1.6, 1.7, 1.8 and 2.0 (Harmony),
+respectively.  In a nutshell, 1.6 adds E4X support, 1.7 adds let,
+yield, and Array comprehensions, and 1.8 adds function closures."
+  :type 'integer
+  :group 'js2-mode)
+
+(defcustom js2-instanceof-has-side-effects nil
+  "If non-nil, treats the instanceof operator as having side effects.
+This is useful for xulrunner apps."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-move-point-on-right-click t
+  "Non-nil to move insertion point when you right-click.
+This makes right-click context menu behavior a bit more intuitive,
+since menu operations generally apply to the point.  The exception
+is if there is a region selection, in which case the point does -not-
+move, so cut/copy/paste can work properly.
+
+Note that IntelliJ moves the point, and Eclipse leaves it alone,
+so this behavior is customizable."
+  :group 'js2-mode
+  :type 'boolean)
+
+(defcustom js2-allow-rhino-new-expr-initializer t
+  "Non-nil to support a Rhino's experimental syntactic construct.
+
+Rhino supports the ability to follow a `new' expression with an object
+literal, which is used to set additional properties on the new object
+after calling its constructor.  Syntax:
+
+  new <expr> [ ( arglist ) ] [initializer]
+
+Hence, this expression:
+
+  new Object {a: 1, b: 2}
+
+results in an Object with properties a=1 and b=2.  This syntax is
+apparently not configurable in Rhino - it's currently always enabled,
+as of Rhino version 1.7R2."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-allow-member-expr-as-function-name nil
+  "Non-nil to support experimental Rhino syntax for function names.
+
+Rhino supports an experimental syntax configured via the Rhino Context
+setting `allowMemberExprAsFunctionName'.  The experimental syntax is:
+
+  function <member-expr> ( [ arg-list ] ) { <body> }
+
+Where member-expr is a non-parenthesized 'member expression', which
+is anything at the grammar level of a new-expression or lower, meaning
+any expression that does not involve infix or unary operators.
+
+When <member-expr> is not a simple identifier, then it is syntactic
+sugar for assigning the anonymous function to the <member-expr>.  Hence,
+this code:
+
+  function a.b().c[2] (x, y) { ... }
+
+is rewritten as:
+
+  a.b().c[2] = function(x, y) {...}
+
+which doesn't seem particularly useful, but Rhino permits it."
+  :type 'boolean
+  :group 'js2-mode)
+
+;; scanner variables
+
+(defmacro js2-deflocal (name value &optional comment)
+  "Define a buffer-local variable NAME with VALUE and COMMENT."
+  (declare (debug defvar) (doc-string 3))
+  `(progn
+     (defvar ,name ,value ,comment)
+     (make-variable-buffer-local ',name)))
+
+(defvar js2-EOF_CHAR -1
+  "Represents end of stream.  Distinct from js2-EOF token type.")
+
+;; I originally used symbols to represent tokens, but Rhino uses
+;; ints and then sets various flag bits in them, so ints it is.
+;; The upshot is that we need a `js2-' prefix in front of each name.
+(defvar js2-ERROR -1)
+(defvar js2-EOF 0)
+(defvar js2-EOL 1)
+(defvar js2-ENTERWITH 2)       ; begin interpreter bytecodes
+(defvar js2-LEAVEWITH 3)
+(defvar js2-RETURN 4)
+(defvar js2-GOTO 5)
+(defvar js2-IFEQ 6)
+(defvar js2-IFNE 7)
+(defvar js2-SETNAME 8)
+(defvar js2-BITOR 9)
+(defvar js2-BITXOR 10)
+(defvar js2-BITAND 11)
+(defvar js2-EQ 12)
+(defvar js2-NE 13)
+(defvar js2-LT 14)
+(defvar js2-LE 15)
+(defvar js2-GT 16)
+(defvar js2-GE 17)
+(defvar js2-LSH 18)
+(defvar js2-RSH 19)
+(defvar js2-URSH 20)
+(defvar js2-ADD 21)            ; infix plus
+(defvar js2-SUB 22)            ; infix minus
+(defvar js2-MUL 23)
+(defvar js2-DIV 24)
+(defvar js2-MOD 25)
+(defvar js2-NOT 26)
+(defvar js2-BITNOT 27)
+(defvar js2-POS 28)            ; unary plus
+(defvar js2-NEG 29)            ; unary minus
+(defvar js2-NEW 30)
+(defvar js2-DELPROP 31)
+(defvar js2-TYPEOF 32)
+(defvar js2-GETPROP 33)
+(defvar js2-GETPROPNOWARN 34)
+(defvar js2-SETPROP 35)
+(defvar js2-GETELEM 36)
+(defvar js2-SETELEM 37)
+(defvar js2-CALL 38)
+(defvar js2-NAME 39)           ; an identifier
+(defvar js2-NUMBER 40)
+(defvar js2-STRING 41)
+(defvar js2-NULL 42)
+(defvar js2-THIS 43)
+(defvar js2-FALSE 44)
+(defvar js2-TRUE 45)
+(defvar js2-SHEQ 46)           ; shallow equality (===)
+(defvar js2-SHNE 47)           ; shallow inequality (!==)
+(defvar js2-REGEXP 48)
+(defvar js2-BINDNAME 49)
+(defvar js2-THROW 50)
+(defvar js2-RETHROW 51)        ; rethrow caught exception: catch (e if ) uses it
+(defvar js2-IN 52)
+(defvar js2-INSTANCEOF 53)
+(defvar js2-LOCAL_LOAD 54)
+(defvar js2-GETVAR 55)
+(defvar js2-SETVAR 56)
+(defvar js2-CATCH_SCOPE 57)
+(defvar js2-ENUM_INIT_KEYS 58) ; FIXME: what are these?
+(defvar js2-ENUM_INIT_VALUES 59)
+(defvar js2-ENUM_INIT_ARRAY 60)
+(defvar js2-ENUM_NEXT 61)
+(defvar js2-ENUM_ID 62)
+(defvar js2-THISFN 63)
+(defvar js2-RETURN_RESULT 64)  ; to return previously stored return result
+(defvar js2-ARRAYLIT 65)       ; array literal
+(defvar js2-OBJECTLIT 66)      ; object literal
+(defvar js2-GET_REF 67)        ; *reference
+(defvar js2-SET_REF 68)        ; *reference = something
+(defvar js2-DEL_REF 69)        ; delete reference
+(defvar js2-REF_CALL 70)       ; f(args) = something or f(args)++
+(defvar js2-REF_SPECIAL 71)    ; reference for special properties like __proto
+(defvar js2-YIELD 72)          ; JS 1.7 yield pseudo keyword
+
+;; XML support
+(defvar js2-DEFAULTNAMESPACE 73)
+(defvar js2-ESCXMLATTR 74)
+(defvar js2-ESCXMLTEXT 75)
+(defvar js2-REF_MEMBER 76)     ; Reference for x.@y, x..y etc.
+(defvar js2-REF_NS_MEMBER 77)  ; Reference for x.ns::y, x..ns::y etc.
+(defvar js2-REF_NAME 78)       ; Reference for @y, @[y] etc.
+(defvar js2-REF_NS_NAME 79)    ; Reference for ns::y, @ns::y@[y] etc.
+
+(defvar js2-first-bytecode js2-ENTERWITH)
+(defvar js2-last-bytecode js2-REF_NS_NAME)
+
+(defvar js2-TRY 80)
+(defvar js2-SEMI 81)           ; semicolon
+(defvar js2-LB 82)             ; left and right brackets
+(defvar js2-RB 83)
+(defvar js2-LC 84)             ; left and right curly-braces
+(defvar js2-RC 85)
+(defvar js2-LP 86)             ; left and right parens
+(defvar js2-RP 87)
+(defvar js2-COMMA 88)          ; comma operator
+
+(defvar js2-ASSIGN 89)         ; simple assignment (=)
+(defvar js2-ASSIGN_BITOR 90)   ; |=
+(defvar js2-ASSIGN_BITXOR 91)  ; ^=
+(defvar js2-ASSIGN_BITAND 92)  ; &=
+(defvar js2-ASSIGN_LSH 93)     ; <<=
+(defvar js2-ASSIGN_RSH 94)     ; >>=
+(defvar js2-ASSIGN_URSH 95)    ; >>>=
+(defvar js2-ASSIGN_ADD 96)     ; +=
+(defvar js2-ASSIGN_SUB 97)     ; -=
+(defvar js2-ASSIGN_MUL 98)     ; *=
+(defvar js2-ASSIGN_DIV 99)     ; /=
+(defvar js2-ASSIGN_MOD 100)    ; %=
+
+(defvar js2-first-assign js2-ASSIGN)
+(defvar js2-last-assign js2-ASSIGN_MOD)
+
+(defvar js2-HOOK 101)          ; conditional (?:)
+(defvar js2-COLON 102)
+(defvar js2-OR 103)            ; logical or (||)
+(defvar js2-AND 104)           ; logical and (&&)
+(defvar js2-INC 105)           ; increment/decrement (++ --)
+(defvar js2-DEC 106)
+(defvar js2-DOT 107)           ; member operator (.)
+(defvar js2-FUNCTION 108)      ; function keyword
+(defvar js2-EXPORT 109)        ; export keyword
+(defvar js2-IMPORT 110)        ; import keyword
+(defvar js2-IF 111)            ; if keyword
+(defvar js2-ELSE 112)          ; else keyword
+(defvar js2-SWITCH 113)        ; switch keyword
+(defvar js2-CASE 114)          ; case keyword
+(defvar js2-DEFAULT 115)       ; default keyword
+(defvar js2-WHILE 116)         ; while keyword
+(defvar js2-DO 117)            ; do keyword
+(defvar js2-FOR 118)           ; for keyword
+(defvar js2-BREAK 119)         ; break keyword
+(defvar js2-CONTINUE 120)      ; continue keyword
+(defvar js2-VAR 121)           ; var keyword
+(defvar js2-WITH 122)          ; with keyword
+(defvar js2-CATCH 123)         ; catch keyword
+(defvar js2-FINALLY 124)       ; finally keyword
+(defvar js2-VOID 125)          ; void keyword
+(defvar js2-RESERVED 126)      ; reserved keywords
+
+(defvar js2-EMPTY 127)
+
+;; Types used for the parse tree - never returned by scanner.
+
+(defvar js2-BLOCK 128)         ; statement block
+(defvar js2-LABEL 129)         ; label
+(defvar js2-TARGET 130)
+(defvar js2-LOOP 131)
+(defvar js2-EXPR_VOID 132)     ; expression statement in functions
+(defvar js2-EXPR_RESULT 133)   ; expression statement in scripts
+(defvar js2-JSR 134)
+(defvar js2-SCRIPT 135)        ; top-level node for entire script
+(defvar js2-TYPEOFNAME 136)    ; for typeof(simple-name)
+(defvar js2-USE_STACK 137)
+(defvar js2-SETPROP_OP 138)    ; x.y op= something
+(defvar js2-SETELEM_OP 139)    ; x[y] op= something
+(defvar js2-LOCAL_BLOCK 140)
+(defvar js2-SET_REF_OP 141)    ; *reference op= something
+
+;; For XML support:
+(defvar js2-DOTDOT 142)        ; member operator (..)
+(defvar js2-COLONCOLON 143)    ; namespace::name
+(defvar js2-XML 144)           ; XML type
+(defvar js2-DOTQUERY 145)      ; .() -- e.g., x.emps.emp.(name == "terry")
+(defvar js2-XMLATTR 146)       ; @
+(defvar js2-XMLEND 147)
+
+;; Optimizer-only tokens
+(defvar js2-TO_OBJECT 148)
+(defvar js2-TO_DOUBLE 149)
+
+(defvar js2-GET 150)           ; JS 1.5 get pseudo keyword
+(defvar js2-SET 151)           ; JS 1.5 set pseudo keyword
+(defvar js2-LET 152)           ; JS 1.7 let pseudo keyword
+(defvar js2-CONST 153)
+(defvar js2-SETCONST 154)
+(defvar js2-SETCONSTVAR 155)
+(defvar js2-ARRAYCOMP 156)
+(defvar js2-LETEXPR 157)
+(defvar js2-WITHEXPR 158)
+(defvar js2-DEBUGGER 159)
+
+(defvar js2-COMMENT 160)
+(defvar js2-TRIPLEDOT 161)     ; for rest parameter
+(defvar js2-ARROW 162)         ; function arrow (=>)
+(defvar js2-CLASS 163)
+(defvar js2-EXTENDS 164)
+(defvar js2-SUPER 165)
+(defvar js2-TEMPLATE_HEAD 166)    ; part of template literal before substitution
+(defvar js2-NO_SUBS_TEMPLATE 167) ; template literal without substitutions
+(defvar js2-TAGGED_TEMPLATE 168)  ; tagged template literal
+
+(defvar js2-AWAIT 169)  ; await (pseudo keyword)
+
+(defconst js2-num-tokens (1+ js2-AWAIT))
+
+(defconst js2-debug-print-trees nil)
+
+;; Rhino accepts any string or stream as input.  Emacs character
+;; processing works best in buffers, so we'll assume the input is a
+;; buffer.  JavaScript strings can be copied into temp buffers before
+;; scanning them.
+
+;; Buffer-local variables yield much cleaner code than using `defstruct'.
+;; They're the Emacs equivalent of instance variables, more or less.
+
+(js2-deflocal js2-ts-dirty-line nil
+  "Token stream buffer-local variable.
+Indicates stuff other than whitespace since start of line.")
+
+(js2-deflocal js2-ts-hit-eof nil
+  "Token stream buffer-local variable.")
+
+;; FIXME: Unused.
+(js2-deflocal js2-ts-line-start 0
+  "Token stream buffer-local variable.")
+
+(js2-deflocal js2-ts-lineno 1
+  "Token stream buffer-local variable.")
+
+;; FIXME: Unused.
+(js2-deflocal js2-ts-line-end-char -1
+  "Token stream buffer-local variable.")
+
+(js2-deflocal js2-ts-cursor 1  ; emacs buffers are 1-indexed
+  "Token stream buffer-local variable.
+Current scan position.")
+
+;; FIXME: Unused.
+(js2-deflocal js2-ts-is-xml-attribute nil
+  "Token stream buffer-local variable.")
+
+(js2-deflocal js2-ts-xml-is-tag-content nil
+  "Token stream buffer-local variable.")
+
+(js2-deflocal js2-ts-xml-open-tags-count 0
+  "Token stream buffer-local variable.")
+
+(js2-deflocal js2-ts-string-buffer nil
+  "Token stream buffer-local variable.
+List of chars built up while scanning various tokens.")
+
+(cl-defstruct (js2-token
+               (:constructor nil)
+               (:constructor make-js2-token (beg)))
+  "Value returned from the token stream."
+  (type js2-EOF)
+  (beg 1)
+  (end -1)
+  (string "")
+  number
+  number-base
+  number-legacy-octal-p
+  regexp-flags
+  comment-type
+  follows-eol-p)
+
+;; Have to call `js2-init-scanner' to initialize the values.
+(js2-deflocal js2-ti-tokens nil)
+(js2-deflocal js2-ti-tokens-cursor nil)
+(js2-deflocal js2-ti-lookahead nil)
+
+(cl-defstruct (js2-ts-state
+               (:constructor make-js2-ts-state (&key (lineno js2-ts-lineno)
+                                                     (cursor js2-ts-cursor)
+                                                     (tokens (copy-sequence js2-ti-tokens))
+                                                     (tokens-cursor js2-ti-tokens-cursor)
+                                                     (lookahead js2-ti-lookahead))))
+  lineno
+  cursor
+  tokens
+  tokens-cursor
+  lookahead)
+
+;;; Parser variables
+
+(js2-deflocal js2-parsed-errors nil
+  "List of errors produced during scanning/parsing.")
+
+(js2-deflocal js2-parsed-warnings nil
+  "List of warnings produced during scanning/parsing.")
+
+(js2-deflocal js2-recover-from-parse-errors t
+  "Non-nil to continue parsing after a syntax error.
+
+In recovery mode, the AST will be built in full, and any error
+nodes will be flagged with appropriate error information.  If
+this flag is nil, a syntax error will result in an error being
+signaled.
+
+The variable is automatically buffer-local, because different
+modes that use the parser will need different settings.")
+
+(js2-deflocal js2-parse-hook nil
+  "List of callbacks for receiving parsing progress.")
+
+(defvar js2-parse-finished-hook nil
+  "List of callbacks to notify when parsing finishes.
+Not called if parsing was interrupted.")
+
+(js2-deflocal js2-is-eval-code nil
+  "True if we're evaluating code in a string.
+If non-nil, the tokenizer will record the token text, and the AST nodes
+will record their source text.  Off by default for IDE modes, since the
+text is available in the buffer.")
+
+(defvar js2-parse-ide-mode t
+  "Non-nil if the parser is being used for `js2-mode'.
+If non-nil, the parser will set text properties for fontification
+and the syntax table.  The value should be nil when using the
+parser as a frontend to an interpreter or byte compiler.")
+
+;;; Parser instance variables (buffer-local vars for js2-parse)
+
+(defconst js2-ti-after-eol (lsh 1 16)
+  "Flag:  first token of the source line.")
+
+;; Inline Rhino's CompilerEnvirons vars as buffer-locals.
+
+(js2-deflocal js2-compiler-generate-debug-info t)
+(js2-deflocal js2-compiler-use-dynamic-scope nil)
+(js2-deflocal js2-compiler-reserved-keywords-as-identifier nil)
+(js2-deflocal js2-compiler-xml-available t)
+(js2-deflocal js2-compiler-optimization-level 0)
+(js2-deflocal js2-compiler-generating-source t)
+(js2-deflocal js2-compiler-strict-mode nil)
+(js2-deflocal js2-compiler-report-warning-as-error nil)
+(js2-deflocal js2-compiler-generate-observer-count nil)
+(js2-deflocal js2-compiler-activation-names nil)
+
+;; SKIP:  sourceURI
+
+;; There's a compileFunction method in Context.java - may need it.
+(js2-deflocal js2-called-by-compile-function nil
+  "True if `js2-parse' was called by `js2-compile-function'.
+Will only be used when we finish implementing the interpreter.")
+
+;; SKIP:  ts  (we just call `js2-init-scanner' and use its vars)
+
+;; SKIP:  node factory - we're going to just call functions directly,
+;; and eventually go to a unified AST format.
+
+(js2-deflocal js2-nesting-of-function 0)
+
+(js2-deflocal js2-recorded-identifiers nil
+  "Tracks identifiers found during parsing.")
+
+(js2-deflocal js2-is-in-destructuring nil
+  "True while parsing destructuring expression.")
+
+(js2-deflocal js2-in-use-strict-directive nil
+  "True while inside a script or function under strict mode.")
+
+(defcustom js2-global-externs nil
+  "A list of any extern names you'd like to consider always declared.
+This list is global and is used by all `js2-mode' files.
+You can create buffer-local externs list using `js2-additional-externs'.
+
+There is also a buffer-local variable `js2-default-externs',
+which is initialized by default to include the Ecma-262 externs
+and the standard browser externs.  The three lists are all
+checked during highlighting."
+  :type 'list
+  :group 'js2-mode)
+
+(js2-deflocal js2-default-externs nil
+  "Default external declarations.
+
+These are currently only used for highlighting undeclared variables,
+which only worries about top-level (unqualified) references.
+As js2-mode's processing improves, we will flesh out this list.
+
+The initial value is set to `js2-ecma-262-externs', unless some
+of the `js2-include-?-externs' variables are set to t, in which
+case the browser, Rhino and/or Node.js externs are also included.
+
+See `js2-additional-externs' for more information.")
+
+(defcustom js2-include-browser-externs t
+  "Non-nil to include browser externs in the master externs list.
+If you work on JavaScript files that are not intended for browsers,
+such as Mozilla Rhino server-side JavaScript, set this to nil.
+See `js2-additional-externs' for more information about externs."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-include-rhino-externs nil
+  "Non-nil to include Mozilla Rhino externs in the master externs list.
+See `js2-additional-externs' for more information about externs."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-include-node-externs nil
+  "Non-nil to include Node.js externs in the master externs list.
+See `js2-additional-externs' for more information about externs."
+  :type 'boolean
+  :group 'js2-mode)
+
+(js2-deflocal js2-additional-externs nil
+  "A buffer-local list of additional external declarations.
+It is used to decide whether variables are considered undeclared
+for purposes of highlighting.
+
+Each entry is a Lisp string.  The string should be the fully qualified
+name of an external entity.  All externs should be added to this list,
+so that as js2-mode's processing improves it can take advantage of them.
+
+You may want to declare your externs in three ways.
+First, you can add externs that are valid for all your JavaScript files.
+You should probably do this by adding them to `js2-global-externs', which
+is a global list used for all js2-mode files.
+
+Next, you can add a function to `js2-init-hook' that adds additional
+externs appropriate for the specific file, perhaps based on its path.
+These should go in `js2-additional-externs', which is buffer-local.
+
+Third, you can use JSLint's global declaration, as long as
+`js2-include-jslint-globals' is non-nil, which see.
+
+Finally, you can add a function to `js2-post-parse-callbacks',
+which is called after parsing completes, and `js2-mode-ast' is bound to
+the root of the parse tree.  At this stage you can set up an AST
+node visitor using `js2-visit-ast' and examine the parse tree
+for specific import patterns that may imply the existence of
+other externs, possibly tied to your build system.  These should also
+be added to `js2-additional-externs'.
+
+Your post-parse callback may of course also use the simpler and
+faster (but perhaps less robust) approach of simply scanning the
+buffer text for your imports, using regular expressions.")
+
+;; SKIP:  decompiler
+;; SKIP:  encoded-source
+
+;;; The following variables are per-function and should be saved/restored
+;;; during function parsing...
+
+(js2-deflocal js2-current-script-or-fn nil)
+(js2-deflocal js2-current-scope nil)
+(js2-deflocal js2-nesting-of-with 0)
+(js2-deflocal js2-label-set nil
+  "An alist mapping label names to nodes.")
+
+(js2-deflocal js2-loop-set nil)
+(js2-deflocal js2-loop-and-switch-set nil)
+(js2-deflocal js2-has-return-value nil)
+(js2-deflocal js2-end-flags 0)
+
+;;; ...end of per function variables
+
+;; These flags enumerate the possible ways a statement/function can
+;; terminate. These flags are used by endCheck() and by the Parser to
+;; detect inconsistent return usage.
+;;
+;; END_UNREACHED is reserved for code paths that are assumed to always be
+;; able to execute (example: throw, continue)
+;;
+;; END_DROPS_OFF indicates if the statement can transfer control to the
+;; next one. Statement such as return dont. A compound statement may have
+;; some branch that drops off control to the next statement.
+;;
+;; END_RETURNS indicates that the statement can return (without arguments)
+;; END_RETURNS_VALUE indicates that the statement can return a value.
+;;
+;; A compound statement such as
+;; if (condition) {
+;;   return value;
+;; }
+;; Will be detected as (END_DROPS_OFF | END_RETURN_VALUE) by endCheck()
+
+(defconst js2-end-unreached     #x0)
+(defconst js2-end-drops-off     #x1)
+(defconst js2-end-returns       #x2)
+(defconst js2-end-returns-value #x4)
+
+;; Rhino awkwardly passes a statementLabel parameter to the
+;; statementHelper() function, the main statement parser, which
+;; is then used by quite a few of the sub-parsers.  We just make
+;; it a buffer-local variable and make sure it's cleaned up properly.
+(js2-deflocal js2-labeled-stmt nil)  ; type `js2-labeled-stmt-node'
+
+;; Similarly, Rhino passes an inForInit boolean through about half
+;; the expression parsers.  We use a dynamically-scoped variable,
+;; which makes it easier to funcall the parsers individually without
+;; worrying about whether they take the parameter or not.
+(js2-deflocal js2-in-for-init nil)
+(js2-deflocal js2-temp-name-counter 0)
+(js2-deflocal js2-parse-stmt-count 0)
+
+(defsubst js2-get-next-temp-name ()
+  (format "$%d" (cl-incf js2-temp-name-counter)))
+
+(defvar js2-parse-interruptable-p t
+  "Set this to nil to force parse to continue until finished.
+This will mostly be useful for interpreters.")
+
+(defvar js2-statements-per-pause 50
+  "Pause after this many statements to check for user input.
+If user input is pending, stop the parse and discard the tree.
+This makes for a smoother user experience for large files.
+You may have to wait a second or two before the highlighting
+and error-reporting appear, but you can always type ahead if
+you wish.  This appears to be more or less how Eclipse, IntelliJ
+and other editors work.")
+
+(js2-deflocal js2-record-comments t
+  "Instructs the scanner to record comments in `js2-scanned-comments'.")
+
+(js2-deflocal js2-scanned-comments nil
+  "List of all comments from the current parse.")
+
+(defcustom js2-mode-indent-inhibit-undo nil
+  "Non-nil to disable collection of Undo information when indenting lines.
+Some users have requested this behavior.  It's nil by default because
+other Emacs modes don't work this way."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-mode-indent-ignore-first-tab nil
+  "If non-nil, ignore first TAB keypress if we look indented properly.
+It's fairly common for users to navigate to an already-indented line
+and press TAB for reassurance that it's been indented.  For this class
+of users, we want the first TAB press on a line to be ignored if the
+line is already indented to one of the precomputed alternatives.
+
+This behavior is only partly implemented.  If you TAB-indent a line,
+navigate to another line, and then navigate back, it fails to clear
+the last-indented variable, so it thinks you've already hit TAB once,
+and performs the indent.  A full solution would involve getting on the
+point-motion hooks for the entire buffer.  If we come across another
+use cases that requires watching point motion, I'll consider doing it.
+
+If you set this variable to nil, then the TAB key will always change
+the indentation of the current line, if more than one alternative
+indentation spot exists."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defvar js2-indent-hook nil
+  "A hook for user-defined indentation rules.
+
+Functions on this hook should expect two arguments:    (LIST INDEX)
+The LIST argument is the list of computed indentation points for
+the current line.  INDEX is the list index of the indentation point
+that `js2-bounce-indent' plans to use.  If INDEX is nil, then the
+indent function is not going to change the current line indentation.
+
+If a hook function on this list returns a non-nil value, then
+`js2-bounce-indent' assumes the hook function has performed its own
+indentation, and will do nothing.  If all hook functions on the list
+return nil, then `js2-bounce-indent' will use its computed indentation
+and reindent the line.
+
+When hook functions on this hook list are called, the variable
+`js2-mode-ast' may or may not be set, depending on whether the
+parse tree is available.  If the variable is nil, you can pass a
+callback to `js2-mode-wait-for-parse', and your callback will be
+called after the new parse tree is built.  This can take some time
+in large files.")
+
+(defface js2-warning
+  `((((class color) (background light))
+     (:underline  "orange"))
+    (((class color) (background dark))
+     (:underline "orange"))
+    (t (:underline t)))
+  "Face for JavaScript warnings."
+  :group 'js2-mode)
+
+(defface js2-error
+  `((((class color) (background light))
+     (:foreground "red"))
+    (((class color) (background dark))
+     (:foreground "red"))
+    (t (:foreground "red")))
+  "Face for JavaScript errors."
+  :group 'js2-mode)
+
+(defface js2-jsdoc-tag
+  '((t :foreground "SlateGray"))
+  "Face used to highlight @whatever tags in jsdoc comments."
+  :group 'js2-mode)
+
+(defface js2-jsdoc-type
+  '((t :foreground "SteelBlue"))
+  "Face used to highlight {FooBar} types in jsdoc comments."
+  :group 'js2-mode)
+
+(defface js2-jsdoc-value
+  '((t :foreground "PeachPuff3"))
+  "Face used to highlight tag values in jsdoc comments."
+  :group 'js2-mode)
+
+(defface js2-function-param
+  '((t :foreground "SeaGreen"))
+  "Face used to highlight function parameters in javascript."
+  :group 'js2-mode)
+
+(defface js2-function-call
+  '((t :inherit default))
+  "Face used to highlight function name in calls."
+  :group 'js2-mode)
+
+(defface js2-object-property
+  '((t :inherit default))
+  "Face used to highlight named property in object literal."
+  :group 'js2-mode)
+
+(defface js2-instance-member
+  '((t :foreground "DarkOrchid"))
+  "Face used to highlight instance variables in javascript.
+Not currently used."
+  :group 'js2-mode)
+
+(defface js2-private-member
+  '((t :foreground "PeachPuff3"))
+  "Face used to highlight calls to private methods in javascript.
+Not currently used."
+  :group 'js2-mode)
+
+(defface js2-private-function-call
+  '((t :foreground "goldenrod"))
+  "Face used to highlight calls to private functions in javascript.
+Not currently used."
+  :group 'js2-mode)
+
+(defface js2-jsdoc-html-tag-name
+  '((((class color) (min-colors 88) (background light))
+     (:foreground "rosybrown"))
+    (((class color) (min-colors 8) (background dark))
+     (:foreground "yellow"))
+    (((class color) (min-colors 8) (background light))
+     (:foreground "magenta")))
+    "Face used to highlight jsdoc html tag names"
+  :group 'js2-mode)
+
+(defface js2-jsdoc-html-tag-delimiter
+  '((((class color) (min-colors 88) (background light))
+     (:foreground "dark khaki"))
+    (((class color) (min-colors 8) (background dark))
+     (:foreground "green"))
+    (((class color) (min-colors 8) (background light))
+     (:foreground "green")))
+  "Face used to highlight brackets in jsdoc html tags."
+  :group 'js2-mode)
+
+(defface js2-external-variable
+  '((t :foreground "orange"))
+  "Face used to highlight undeclared variable identifiers.")
+
+(defcustom js2-init-hook nil
+  "List of functions to be called after `js2-mode' or
+`js2-minor-mode' has initialized all variables, before parsing
+the buffer for the first time."
+  :type 'hook
+  :group 'js2-mode
+  :version "20130608")
+
+(defcustom js2-post-parse-callbacks nil
+  "List of callback functions invoked after parsing finishes.
+Currently, the main use for this function is to add synthetic
+declarations to `js2-recorded-identifiers', which see."
+  :type 'hook
+  :group 'js2-mode)
+
+(defcustom js2-build-imenu-callbacks nil
+  "List of functions called during Imenu index generation.
+It's a good place to add additional entries to it, using
+`js2-record-imenu-entry'."
+  :type 'hook
+  :group 'js2-mode)
+
+(defcustom js2-highlight-external-variables t
+  "Non-nil to highlight undeclared variable identifiers.
+An undeclared variable is any variable not declared with var or let
+in the current scope or any lexically enclosing scope.  If you use
+such a variable, then you are either expecting it to originate from
+another file, or you've got a potential bug."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defcustom js2-warn-about-unused-function-arguments nil
+  "Non-nil to treat function arguments like declared-but-unused variables."
+  :type 'booleanp
+  :group 'js2-mode)
+
+(defcustom js2-include-jslint-globals t
+  "Non-nil to include the identifiers from JSLint global
+declaration (see http://www.jslint.com/lint.html#global) in the
+buffer-local externs list.  See `js2-additional-externs' for more
+information."
+  :type 'boolean
+  :group 'js2-mode)
+
+(defvar js2-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [mouse-1] #'js2-mode-show-node)
+    (define-key map (kbd "M-j") #'js2-line-break)
+    (define-key map (kbd "C-c C-e") #'js2-mode-hide-element)
+    (define-key map (kbd "C-c C-s") #'js2-mode-show-element)
+    (define-key map (kbd "C-c C-a") #'js2-mode-show-all)
+    (define-key map (kbd "C-c C-f") #'js2-mode-toggle-hide-functions)
+    (define-key map (kbd "C-c C-t") #'js2-mode-toggle-hide-comments)
+    (define-key map (kbd "C-c C-o") #'js2-mode-toggle-element)
+    (define-key map (kbd "C-c C-w") #'js2-mode-toggle-warnings-and-errors)
+    (define-key map [down-mouse-3] #'js2-down-mouse-3)
+    (define-key map [remap js-find-symbol] #'js2-jump-to-definition)
+
+    (define-key map [menu-bar javascript]
+      (cons "JavaScript" (make-sparse-keymap "JavaScript")))
+
+    (define-key map [menu-bar javascript customize-js2-mode]
+      '(menu-item "Customize js2-mode" js2-mode-customize
+                  :help "Customize the behavior of this mode"))
+
+    (define-key map [menu-bar javascript js2-force-refresh]
+      '(menu-item "Force buffer refresh" js2-mode-reset
+                  :help "Re-parse the buffer from scratch"))
+
+    (define-key map [menu-bar javascript separator-2]
+      '("--"))
+
+    (define-key map [menu-bar javascript next-error]
+      '(menu-item "Next warning or error" next-error
+                  :enabled (and js2-mode-ast
+                                (or (js2-ast-root-errors js2-mode-ast)
+                                    (js2-ast-root-warnings js2-mode-ast)))
+                  :help "Move to next warning or error"))
+
+    (define-key map [menu-bar javascript display-errors]
+      '(menu-item "Show errors and warnings" js2-mode-display-warnings-and-errors
+                  :visible (not js2-mode-show-parse-errors)
+                  :help "Turn on display of warnings and errors"))
+
+    (define-key map [menu-bar javascript hide-errors]
+      '(menu-item "Hide errors and warnings" js2-mode-hide-warnings-and-errors
+                  :visible js2-mode-show-parse-errors
+                  :help "Turn off display of warnings and errors"))
+
+    (define-key map [menu-bar javascript separator-1]
+      '("--"))
+
+    (define-key map [menu-bar javascript js2-toggle-function]
+      '(menu-item "Show/collapse element" js2-mode-toggle-element
+                  :help "Hide or show function body or comment"))
+
+    (define-key map [menu-bar javascript show-comments]
+      '(menu-item "Show block comments" js2-mode-toggle-hide-comments
+                  :visible js2-mode-comments-hidden
+                  :help "Expand all hidden block comments"))
+
+    (define-key map [menu-bar javascript hide-comments]
+      '(menu-item "Hide block comments" js2-mode-toggle-hide-comments
+                  :visible (not js2-mode-comments-hidden)
+                  :help "Show block comments as /*...*/"))
+
+    (define-key map [menu-bar javascript show-all-functions]
+      '(menu-item "Show function bodies" js2-mode-toggle-hide-functions
+                  :visible js2-mode-functions-hidden
+                  :help "Expand all hidden function bodies"))
+
+    (define-key map [menu-bar javascript hide-all-functions]
+      '(menu-item "Hide function bodies" js2-mode-toggle-hide-functions
+                  :visible (not js2-mode-functions-hidden)
+                  :help "Show {...} for all top-level function bodies"))
+
+    map)
+  "Keymap used in `js2-mode' buffers.")
+
+(defcustom js2-bounce-indent-p nil
+  "Non-nil to bind `js2-indent-bounce' and `js2-indent-bounce-backward'.
+They will augment the default indent-line behavior with cycling
+among several computed alternatives.  See the function
+`js2-bounce-indent' for details.  The above commands will be
+bound to TAB and backtab."
+  :type 'boolean
+  :group 'js2-mode
+  :set (lambda (sym value)
+         (set-default sym value)
+         (let ((map js2-mode-map))
+           (if (not value)
+               (progn
+                 (define-key map "\t" nil)
+                 (define-key map (kbd "<backtab>") nil))
+             (define-key map "\t" #'js2-indent-bounce)
+             (define-key map (kbd "<backtab>") #'js2-indent-bounce-backward)))))
+
+(defconst js2-mode-identifier-re "[[:alpha:]_$][[:alnum:]_$]*")
+
+(defvar js2-mode-//-comment-re "^\\(\\s-*\\)//.+"
+  "Matches a //-comment line.  Must be first non-whitespace on line.
+First match-group is the leading whitespace.")
+
+(defvar js2-mode-hook nil)
+
+(js2-deflocal js2-mode-ast nil "Private variable.")
+(js2-deflocal js2-mode-parse-timer nil "Private variable.")
+(js2-deflocal js2-mode-buffer-dirty-p nil "Private variable.")
+(js2-deflocal js2-mode-parsing nil "Private variable.")
+(js2-deflocal js2-mode-node-overlay nil)
+
+(defvar js2-mode-show-overlay js2-mode-dev-mode-p
+  "Debug:  Non-nil to highlight AST nodes on mouse-down.")
+
+(js2-deflocal js2-mode-fontifications nil "Private variable")
+(js2-deflocal js2-mode-deferred-properties nil "Private variable")
+(js2-deflocal js2-imenu-recorder nil "Private variable")
+(js2-deflocal js2-imenu-function-map nil "Private variable")
+
+(defvar js2-mode-verbose-parse-p js2-mode-dev-mode-p
+  "Non-nil to emit status messages during parsing.")
+
+(defvar js2-mode-functions-hidden nil "Private variable.")
+(defvar js2-mode-comments-hidden nil "Private variable.")
+
+(defvar js2-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (c-populate-syntax-table table)
+    (modify-syntax-entry ?` "\"" table)
+    table)
+  "Syntax table used in `js2-mode' buffers.")
+
+(defvar js2-mode-abbrev-table nil
+  "Abbrev table in use in `js2-mode' buffers.")
+(define-abbrev-table 'js2-mode-abbrev-table ())
+
+(defvar js2-mode-pending-parse-callbacks nil
+  "List of functions waiting to be notified that parse is finished.")
+
+(defvar js2-mode-last-indented-line -1)
+
+;;; Localizable error and warning messages
+
+;; Messages are copied from Rhino's Messages.properties.
+;; Many of the Java-specific messages have been elided.
+;; Add any js2-specific ones at the end, so we can keep
+;; this file synced with changes to Rhino's.
+
+(defvar js2-message-table
+  (make-hash-table :test 'equal :size 250)
+  "Contains localized messages for `js2-mode'.")
+
+;; TODO(stevey):  construct this table at compile-time.
+(defmacro js2-msg (key &rest strings)
+  `(puthash ,key (concat ,@strings)
+            js2-message-table))
+
+(defun js2-get-msg (msg-key)
+  "Look up a localized message.
+MSG-KEY is a list of (MSG ARGS).  If the message takes parameters,
+the correct number of ARGS must be provided."
+  (let* ((key (if (listp msg-key) (car msg-key) msg-key))
+         (args (if (listp msg-key) (cdr msg-key)))
+         (msg (gethash key js2-message-table)))
+    (if msg
+        (apply #'format msg args)
+      key)))  ; default to showing the key
+
+(js2-msg "msg.dup.parms"
+         "Duplicate parameter name '%s'.")
+
+(js2-msg "msg.too.big.jump"
+         "Program too complex: jump offset too big.")
+
+(js2-msg "msg.too.big.index"
+         "Program too complex: internal index exceeds 64K limit.")
+
+(js2-msg "msg.while.compiling.fn"
+         "Encountered code generation error while compiling function '%s': %s")
+
+(js2-msg "msg.while.compiling.script"
+         "Encountered code generation error while compiling script: %s")
+
+;; Context
+(js2-msg "msg.ctor.not.found"
+         "Constructor for '%s' not found.")
+
+(js2-msg "msg.not.ctor"
+         "'%s' is not a constructor.")
+
+;; FunctionObject
+(js2-msg "msg.varargs.ctor"
+         "Method or constructor '%s' must be static "
+         "with the signature (Context cx, Object[] args, "
+         "Function ctorObj, boolean inNewExpr) "
+         "to define a variable arguments constructor.")
+
+(js2-msg "msg.varargs.fun"
+         "Method '%s' must be static with the signature "
+         "(Context cx, Scriptable thisObj, Object[] args, Function funObj) "
+         "to define a variable arguments function.")
+
+(js2-msg "msg.incompat.call"
+         "Method '%s' called on incompatible object.")
+
+(js2-msg "msg.bad.parms"
+         "Unsupported parameter type '%s' in method '%s'.")
+
+(js2-msg "msg.bad.method.return"
+         "Unsupported return type '%s' in method '%s'.")
+
+(js2-msg "msg.bad.ctor.return"
+         "Construction of objects of type '%s' is not supported.")
+
+(js2-msg "msg.no.overload"
+         "Method '%s' occurs multiple times in class '%s'.")
+
+(js2-msg "msg.method.not.found"
+         "Method '%s' not found in '%s'.")
+
+;; IRFactory
+
+(js2-msg "msg.bad.for.in.lhs"
+         "Invalid left-hand side of for..in loop.")
+
+(js2-msg "msg.mult.index"
+         "Only one variable allowed in for..in loop.")
+
+(js2-msg "msg.bad.for.in.destruct"
+         "Left hand side of for..in loop must be an array of "
+         "length 2 to accept key/value pair.")
+
+(js2-msg "msg.cant.convert"
+         "Can't convert to type '%s'.")
+
+(js2-msg "msg.bad.assign.left"
+         "Invalid assignment left-hand side.")
+
+(js2-msg "msg.bad.decr"
+         "Invalid decrement operand.")
+
+(js2-msg "msg.bad.incr"
+         "Invalid increment operand.")
+
+(js2-msg "msg.bad.yield"
+         "yield must be in a function.")
+
+(js2-msg "msg.yield.parenthesized"
+         "yield expression must be parenthesized.")
+
+(js2-msg "msg.bad.await"
+         "await must be in async functions.")
+
+;; NativeGlobal
+(js2-msg "msg.cant.call.indirect"
+          "Function '%s' must be called directly, and not by way of a "
+          "function of another name.")
+
+(js2-msg "msg.eval.nonstring"
+          "Calling eval() with anything other than a primitive "
+          "string value will simply return the value. "
+          "Is this what you intended?")
+
+(js2-msg "msg.eval.nonstring.strict"
+         "Calling eval() with anything other than a primitive "
+         "string value is not allowed in strict mode.")
+
+(js2-msg "msg.bad.destruct.op"
+         "Invalid destructuring assignment operator")
+
+;; NativeCall
+(js2-msg "msg.only.from.new"
+         "'%s' may only be invoked from a `new' expression.")
+
+(js2-msg "msg.deprec.ctor"
+         "The '%s' constructor is deprecated.")
+
+;; NativeFunction
+(js2-msg "msg.no.function.ref.found"
+         "no source found to decompile function reference %s")
+
+(js2-msg "msg.arg.isnt.array"
+         "second argument to Function.prototype.apply must be an array")
+
+;; NativeGlobal
+(js2-msg "msg.bad.esc.mask"
+         "invalid string escape mask")
+
+;; NativeRegExp
+(js2-msg "msg.bad.quant"
+  "Invalid quantifier %s")
+
+(js2-msg "msg.overlarge.backref"
+  "Overly large back reference %s")
+
+(js2-msg "msg.overlarge.min"
+  "Overly large minimum %s")
+
+(js2-msg "msg.overlarge.max"
+  "Overly large maximum %s")
+
+(js2-msg "msg.zero.quant"
+  "Zero quantifier %s")
+
+(js2-msg "msg.max.lt.min"
+  "Maximum %s less than minimum")
+
+(js2-msg "msg.unterm.quant"
+  "Unterminated quantifier %s")
+
+(js2-msg "msg.unterm.paren"
+  "Unterminated parenthetical %s")
+
+(js2-msg "msg.unterm.class"
+  "Unterminated character class %s")
+
+(js2-msg "msg.bad.range"
+  "Invalid range in character class.")
+
+(js2-msg "msg.trail.backslash"
+  "Trailing \\ in regular expression.")
+
+(js2-msg "msg.re.unmatched.right.paren"
+  "unmatched ) in regular expression.")
+
+(js2-msg "msg.no.regexp"
+  "Regular expressions are not available.")
+
+(js2-msg "msg.bad.backref"
+  "back-reference exceeds number of capturing parentheses.")
+
+(js2-msg "msg.bad.regexp.compile"
+         "Only one argument may be specified if the first "
+         "argument to RegExp.prototype.compile is a RegExp object.")
+
+;; Parser
+(js2-msg "msg.got.syntax.errors"
+         "Compilation produced %s syntax errors.")
+
+(js2-msg "msg.var.redecl"
+         "TypeError: redeclaration of var %s.")
+
+(js2-msg "msg.const.redecl"
+         "TypeError: redeclaration of const %s.")
+
+(js2-msg "msg.let.redecl"
+         "TypeError: redeclaration of variable %s.")
+
+(js2-msg "msg.parm.redecl"
+         "TypeError: redeclaration of formal parameter %s.")
+
+(js2-msg "msg.fn.redecl"
+         "TypeError: redeclaration of function %s.")
+
+(js2-msg "msg.let.decl.not.in.block"
+         "SyntaxError: let declaration not directly within block")
+
+(js2-msg "msg.mod.import.decl.at.top.level"
+         "SyntaxError: import declarations may only appear at the top level")
+
+(js2-msg "msg.mod.as.after.reserved.word"
+         "SyntaxError: missing keyword 'as' after reserved word %s")
+
+(js2-msg "msg.mod.rc.after.import.spec.list"
+         "SyntaxError: missing '}' after module specifier list")
+
+(js2-msg "msg.mod.from.after.import.spec.set"
+         "SyntaxError: missing keyword 'from' after import specifier set")
+
+(js2-msg "msg.mod.declaration.after.import"
+         "SyntaxError: missing declaration after 'import' keyword")
+
+(js2-msg "msg.mod.spec.after.from"
+         "SyntaxError: missing module specifier after 'from' keyword")
+
+(js2-msg "msg.mod.export.decl.at.top.level"
+         "SyntaxError: export declarations may only appear at top level")
+
+(js2-msg "msg.mod.rc.after.export.spec.list"
+         "SyntaxError: missing '}' after export specifier list")
+
+;; NodeTransformer
+(js2-msg "msg.dup.label"
+         "duplicated label")
+
+(js2-msg "msg.undef.label"
+         "undefined label")
+
+(js2-msg "msg.bad.break"
+         "unlabelled break must be inside loop or switch")
+
+(js2-msg "msg.continue.outside"
+         "continue must be inside loop")
+
+(js2-msg "msg.continue.nonloop"
+         "continue can only use labels of iteration statements")
+
+(js2-msg "msg.bad.throw.eol"
+         "Line terminator is not allowed between the throw "
+         "keyword and throw expression.")
+
+(js2-msg "msg.unnamed.function.stmt" ; added by js2-mode
+         "function statement requires a name")
+
+(js2-msg "msg.no.paren.parms"
+         "missing ( before function parameters.")
+
+(js2-msg "msg.no.parm"
+         "missing formal parameter")
+
+(js2-msg "msg.no.paren.after.parms"
+         "missing ) after formal parameters")
+
+(js2-msg "msg.no.default.after.default.param" ; added by js2-mode
+         "parameter without default follows parameter with default")
+
+(js2-msg "msg.param.after.rest" ; added by js2-mode
+         "parameter after rest parameter")
+
+(js2-msg "msg.bad.arrow.args" ; added by js2-mode
+         "invalid arrow-function arguments (parentheses around the arrow-function may help)")
+
+(js2-msg "msg.no.brace.body"
+         "missing '{' before function body")
+
+(js2-msg "msg.no.brace.after.body"
+         "missing } after function body")
+
+(js2-msg "msg.no.paren.cond"
+         "missing ( before condition")
+
+(js2-msg "msg.no.paren.after.cond"
+         "missing ) after condition")
+
+(js2-msg "msg.no.semi.stmt"
+         "missing ; before statement")
+
+(js2-msg "msg.missing.semi"
+         "missing ; after statement")
+
+(js2-msg "msg.no.name.after.dot"
+         "missing name after . operator")
+
+(js2-msg "msg.no.name.after.coloncolon"
+         "missing name after :: operator")
+
+(js2-msg "msg.no.name.after.dotdot"
+         "missing name after .. operator")
+
+(js2-msg "msg.no.name.after.xmlAttr"
+         "missing name after .@")
+
+(js2-msg "msg.no.bracket.index"
+         "missing ] in index expression")
+
+(js2-msg "msg.no.paren.switch"
+         "missing ( before switch expression")
+
+(js2-msg "msg.no.paren.after.switch"
+         "missing ) after switch expression")
+
+(js2-msg "msg.no.brace.switch"
+         "missing '{' before switch body")
+
+(js2-msg "msg.bad.switch"
+         "invalid switch statement")
+
+(js2-msg "msg.no.colon.case"
+         "missing : after case expression")
+
+(js2-msg "msg.double.switch.default"
+         "double default label in the switch statement")
+
+(js2-msg "msg.no.while.do"
+         "missing while after do-loop body")
+
+(js2-msg "msg.no.paren.for"
+         "missing ( after for")
+
+(js2-msg "msg.no.semi.for"
+         "missing ; after for-loop initializer")
+
+(js2-msg "msg.no.semi.for.cond"
+         "missing ; after for-loop condition")
+
+(js2-msg "msg.in.after.for.name"
+         "missing in or of after for")
+
+(js2-msg "msg.no.paren.for.ctrl"
+         "missing ) after for-loop control")
+
+(js2-msg "msg.no.paren.with"
+         "missing ( before with-statement object")
+
+(js2-msg "msg.no.paren.after.with"
+         "missing ) after with-statement object")
+
+(js2-msg "msg.no.with.strict"
+         "with statements not allowed in strict mode")
+
+(js2-msg "msg.no.paren.after.let"
+         "missing ( after let")
+
+(js2-msg "msg.no.paren.let"
+         "missing ) after variable list")
+
+(js2-msg "msg.no.curly.let"
+         "missing } after let statement")
+
+(js2-msg "msg.bad.return"
+         "invalid return")
+
+(js2-msg "msg.no.brace.block"
+         "missing } in compound statement")
+
+(js2-msg "msg.bad.label"
+         "invalid label")
+
+(js2-msg "msg.bad.var"
+         "missing variable name")
+
+(js2-msg "msg.bad.var.init"
+         "invalid variable initialization")
+
+(js2-msg "msg.no.colon.cond"
+         "missing : in conditional expression")
+
+(js2-msg "msg.no.paren.arg"
+         "missing ) after argument list")
+
+(js2-msg "msg.no.bracket.arg"
+         "missing ] after element list")
+
+(js2-msg "msg.bad.prop"
+         "invalid property id")
+
+(js2-msg "msg.no.colon.prop"
+         "missing : after property id")
+
+(js2-msg "msg.no.brace.prop"
+         "missing } after property list")
+
+(js2-msg "msg.no.paren"
+         "missing ) in parenthetical")
+
+(js2-msg "msg.reserved.id"
+         "'%s' is a reserved identifier")
+
+(js2-msg "msg.no.paren.catch"
+         "missing ( before catch-block condition")
+
+(js2-msg "msg.bad.catchcond"
+         "invalid catch block condition")
+
+(js2-msg "msg.catch.unreachable"
+         "any catch clauses following an unqualified catch are unreachable")
+
+(js2-msg "msg.no.brace.try"
+         "missing '{' before try block")
+
+(js2-msg "msg.no.brace.catchblock"
+         "missing '{' before catch-block body")
+
+(js2-msg "msg.try.no.catchfinally"
+         "'try' without 'catch' or 'finally'")
+
+(js2-msg "msg.no.return.value"
+         "function %s does not always return a value")
+
+(js2-msg "msg.anon.no.return.value"
+         "anonymous function does not always return a value")
+
+(js2-msg "msg.return.inconsistent"
+         "return statement is inconsistent with previous usage")
+
+(js2-msg "msg.generator.returns"
+         "TypeError: legacy generator function '%s' returns a value")
+
+(js2-msg "msg.anon.generator.returns"
+         "TypeError: anonymous legacy generator function returns a value")
+
+(js2-msg "msg.syntax"
+         "syntax error")
+
+(js2-msg "msg.unexpected.eof"
+         "Unexpected end of file")
+
+(js2-msg "msg.XML.bad.form"
+         "illegally formed XML syntax")
+
+(js2-msg "msg.XML.not.available"
+         "XML runtime not available")
+
+(js2-msg "msg.too.deep.parser.recursion"
+         "Too deep recursion while parsing")
+
+(js2-msg "msg.no.side.effects"
+         "Code has no side effects")
+
+(js2-msg "msg.extra.trailing.comma"
+         "Trailing comma is not supported in some browsers")
+
+(js2-msg "msg.array.trailing.comma"
+         "Trailing comma yields different behavior across browsers")
+
+(js2-msg "msg.equal.as.assign"
+         (concat "Test for equality (==) mistyped as assignment (=)?"
+                 " (parenthesize to suppress warning)"))
+
+(js2-msg "msg.var.hides.arg"
+         "Variable %s hides argument")
+
+(js2-msg "msg.destruct.assign.no.init"
+         "Missing = in destructuring declaration")
+
+(js2-msg "msg.init.no.destruct"
+         "Binding initializer not in destructuring assignment")
+
+(js2-msg "msg.no.octal.strict"
+         "Octal numbers prohibited in strict mode.")
+
+(js2-msg "msg.dup.obj.lit.prop.strict"
+         "Property '%s' already defined in this object literal.")
+
+(js2-msg "msg.dup.param.strict"
+         "Parameter '%s' already declared in this function.")
+
+(js2-msg "msg.bad.id.strict"
+         "'%s' is not a valid identifier for this use in strict mode.")
+
+;; ScriptRuntime
+(js2-msg "msg.no.properties"
+         "%s has no properties.")
+
+(js2-msg "msg.invalid.iterator"
+         "Invalid iterator value")
+
+(js2-msg "msg.iterator.primitive"
+         "__iterator__ returned a primitive value")
+
+(js2-msg "msg.assn.create.strict"
+         "Assignment to undeclared variable %s")
+
+(js2-msg "msg.undeclared.variable"  ; added by js2-mode
+         "Undeclared variable or function '%s'")
+
+(js2-msg "msg.unused.variable"  ; added by js2-mode
+         "Unused variable or function '%s'")
+
+(js2-msg "msg.uninitialized.variable"  ; added by js2-mode
+         "Variable '%s' referenced but never initialized")
+
+(js2-msg "msg.ref.undefined.prop"
+         "Reference to undefined property '%s'")
+
+(js2-msg "msg.prop.not.found"
+         "Property %s not found.")
+
+(js2-msg "msg.invalid.type"
+         "Invalid JavaScript value of type %s")
+
+(js2-msg "msg.primitive.expected"
+         "Primitive type expected (had %s instead)")
+
+(js2-msg "msg.namespace.expected"
+         "Namespace object expected to left of :: (found %s instead)")
+
+(js2-msg "msg.null.to.object"
+         "Cannot convert null to an object.")
+
+(js2-msg "msg.undef.to.object"
+         "Cannot convert undefined to an object.")
+
+(js2-msg "msg.cyclic.value"
+         "Cyclic %s value not allowed.")
+
+(js2-msg "msg.is.not.defined"
+         "'%s' is not defined.")
+
+(js2-msg "msg.undef.prop.read"
+         "Cannot read property '%s' from %s")
+
+(js2-msg "msg.undef.prop.write"
+         "Cannot set property '%s' of %s to '%s'")
+
+(js2-msg "msg.undef.prop.delete"
+         "Cannot delete property '%s' of %s")
+
+(js2-msg "msg.undef.method.call"
+         "Cannot call method '%s' of %s")
+
+(js2-msg "msg.undef.with"
+         "Cannot apply 'with' to %s")
+
+(js2-msg "msg.isnt.function"
+         "%s is not a function, it is %s.")
+
+(js2-msg "msg.isnt.function.in"
+         "Cannot call property %s in object %s. "
+         "It is not a function, it is '%s'.")
+
+(js2-msg "msg.function.not.found"
+         "Cannot find function %s.")
+
+(js2-msg "msg.function.not.found.in"
+         "Cannot find function %s in object %s.")
+
+(js2-msg "msg.isnt.xml.object"
+         "%s is not an xml object.")
+
+(js2-msg "msg.no.ref.to.get"
+         "%s is not a reference to read reference value.")
+
+(js2-msg "msg.no.ref.to.set"
+         "%s is not a reference to set reference value to %s.")
+
+(js2-msg "msg.no.ref.from.function"
+         "Function %s can not be used as the left-hand "
+         "side of assignment or as an operand of ++ or -- operator.")
+
+(js2-msg "msg.bad.default.value"
+         "Object's getDefaultValue() method returned an object.")
+
+(js2-msg "msg.instanceof.not.object"
+         "Can't use instanceof on a non-object.")
+
+(js2-msg "msg.instanceof.bad.prototype"
+         "'prototype' property of %s is not an object.")
+
+(js2-msg "msg.bad.radix"
+         "illegal radix %s.")
+
+;; ScriptableObject
+(js2-msg "msg.default.value"
+         "Cannot find default value for object.")
+
+(js2-msg "msg.zero.arg.ctor"
+         "Cannot load class '%s' which has no zero-parameter constructor.")
+
+(js2-msg "msg.ctor.multiple.parms"
+         "Can't define constructor or class %s since more than "
+         "one constructor has multiple parameters.")
+
+(js2-msg "msg.extend.scriptable"
+         "%s must extend ScriptableObject in order to define property %s.")
+
+(js2-msg "msg.bad.getter.parms"
+         "In order to define a property, getter %s must have zero "
+         "parameters or a single ScriptableObject parameter.")
+
+(js2-msg "msg.obj.getter.parms"
+         "Expected static or delegated getter %s to take "
+         "a ScriptableObject parameter.")
+
+(js2-msg "msg.getter.static"
+         "Getter and setter must both be static or neither be static.")
+
+(js2-msg "msg.setter.return"
+         "Setter must have void return type: %s")
+
+(js2-msg "msg.setter2.parms"
+         "Two-parameter setter must take a ScriptableObject as "
+         "its first parameter.")
+
+(js2-msg "msg.setter1.parms"
+         "Expected single parameter setter for %s")
+
+(js2-msg "msg.setter2.expected"
+         "Expected static or delegated setter %s to take two parameters.")
+
+(js2-msg "msg.setter.parms"
+         "Expected either one or two parameters for setter.")
+
+(js2-msg "msg.setter.bad.type"
+         "Unsupported parameter type '%s' in setter '%s'.")
+
+(js2-msg "msg.add.sealed"
+         "Cannot add a property to a sealed object: %s.")
+
+(js2-msg "msg.remove.sealed"
+         "Cannot remove a property from a sealed object: %s.")
+
+(js2-msg "msg.modify.sealed"
+         "Cannot modify a property of a sealed object: %s.")
+
+(js2-msg "msg.modify.readonly"
+         "Cannot modify readonly property: %s.")
+
+;; TokenStream
+(js2-msg "msg.missing.exponent"
+         "missing exponent")
+
+(js2-msg "msg.caught.nfe"
+         "number format error")
+
+(js2-msg "msg.unterminated.string.lit"
+         "unterminated string literal")
+
+(js2-msg "msg.unterminated.comment"
+         "unterminated comment")
+
+(js2-msg "msg.unterminated.re.lit"
+         "unterminated regular expression literal")
+
+(js2-msg "msg.invalid.re.flag"
+         "invalid flag after regular expression")
+
+(js2-msg "msg.no.re.input.for"
+         "no input for %s")
+
+(js2-msg "msg.illegal.character"
+         "illegal character")
+
+(js2-msg "msg.invalid.escape"
+         "invalid Unicode escape sequence")
+
+(js2-msg "msg.bad.namespace"
+         "not a valid default namespace statement. "
+         "Syntax is: default xml namespace = EXPRESSION;")
+
+;; TokensStream warnings
+(js2-msg "msg.bad.octal.literal"
+         "illegal octal literal digit %s; "
+         "interpreting it as a decimal digit")
+
+(js2-msg "msg.missing.hex.digits"
+         "missing hexadecimal digits after '0x'")
+
+(js2-msg "msg.missing.binary.digits"
+         "missing binary digits after '0b'")
+
+(js2-msg "msg.missing.octal.digits"
+         "missing octal digits after '0o'")
+
+(js2-msg "msg.script.is.not.constructor"
+         "Script objects are not constructors.")
+
+;; Arrays
+(js2-msg "msg.arraylength.bad"
+         "Inappropriate array length.")
+
+;; Arrays
+(js2-msg "msg.arraylength.too.big"
+         "Array length %s exceeds supported capacity limit.")
+
+;; URI
+(js2-msg "msg.bad.uri"
+         "Malformed URI sequence.")
+
+;; Number
+(js2-msg "msg.bad.precision"
+         "Precision %s out of range.")
+
+;; NativeGenerator
+(js2-msg "msg.send.newborn"
+         "Attempt to send value to newborn generator")
+
+(js2-msg "msg.already.exec.gen"
+         "Already executing generator")
+
+(js2-msg "msg.StopIteration.invalid"
+         "StopIteration may not be changed to an arbitrary object.")
+
+;; Interpreter
+(js2-msg "msg.yield.closing"
+         "Yield from closing generator")
+
+;; Classes
+(js2-msg "msg.unnamed.class.stmt" ; added by js2-mode
+         "class statement requires a name")
+
+(js2-msg "msg.class.unexpected.comma" ; added by js2-mode
+         "unexpected ',' between class properties")
+
+(js2-msg "msg.unexpected.static" ; added by js2-mode
+         "unexpected 'static'")
+
+(js2-msg "msg.missing.extends" ; added by js2-mode
+         "name is required after extends")
+
+(js2-msg "msg.no.brace.class" ; added by js2-mode
+         "missing '{' before class body")
+
+(js2-msg "msg.missing.computed.rb" ; added by js2-mode
+         "missing ']' after computed property expression")
+
+;;; Tokens Buffer
+
+(defconst js2-ti-max-lookahead 2)
+(defconst js2-ti-ntokens (1+ js2-ti-max-lookahead))
+
+(defun js2-new-token (offset)
+  (let ((token (make-js2-token (+ offset js2-ts-cursor))))
+    (setq js2-ti-tokens-cursor (mod (1+ js2-ti-tokens-cursor) js2-ti-ntokens))
+    (aset js2-ti-tokens js2-ti-tokens-cursor token)
+    token))
+
+(defsubst js2-current-token ()
+  (aref js2-ti-tokens js2-ti-tokens-cursor))
+
+(defsubst js2-current-token-string ()
+  (js2-token-string (js2-current-token)))
+
+(defsubst js2-current-token-type ()
+  (js2-token-type (js2-current-token)))
+
+(defsubst js2-current-token-beg ()
+  (js2-token-beg (js2-current-token)))
+
+(defsubst js2-current-token-end ()
+  (js2-token-end (js2-current-token)))
+
+(defun js2-current-token-len ()
+  (let ((token (js2-current-token)))
+    (- (js2-token-end token)
+       (js2-token-beg token))))
+
+(defun js2-ts-seek (state)
+  (setq js2-ts-lineno (js2-ts-state-lineno state)
+        js2-ts-cursor (js2-ts-state-cursor state)
+        js2-ti-tokens (js2-ts-state-tokens state)
+        js2-ti-tokens-cursor (js2-ts-state-tokens-cursor state)
+        js2-ti-lookahead (js2-ts-state-lookahead state)))
+
+;;; Utilities
+
+(defun js2-delete-if (predicate list)
+  "Remove all items satisfying PREDICATE in LIST."
+  (cl-loop for item in list
+           if (not (funcall predicate item))
+           collect item))
+
+(defun js2-position (element list)
+  "Find 0-indexed position of ELEMENT in LIST comparing with `eq'.
+Returns nil if element is not found in the list."
+  (let ((count 0)
+        found)
+    (while (and list (not found))
+      (if (eq element (car list))
+          (setq found t)
+        (setq count (1+ count)
+              list (cdr list))))
+    (if found count)))
+
+(defun js2-find-if (predicate list)
+  "Find first item satisfying PREDICATE in LIST."
+  (let (result)
+    (while (and list (not result))
+      (if (funcall predicate (car list))
+          (setq result (car list)))
+      (setq list (cdr list)))
+    result))
+
+(defmacro js2-time (form)
+  "Evaluate FORM, discard result, and return elapsed time in sec."
+  (declare (debug t))
+  (let ((beg (make-symbol "--js2-time-beg--")))
+    `(let ((,beg (current-time)))
+       ,form
+       (/ (truncate (* (- (float-time (current-time))
+                          (float-time ,beg))
+                       10000))
+          10000.0))))
+
+(defsubst js2-same-line (pos)
+  "Return t if POS is on the same line as current point."
+  (and (>= pos (point-at-bol))
+       (<= pos (point-at-eol))))
+
+(defun js2-code-bug ()
+  "Signal an error when we encounter an unexpected code path."
+  (error "failed assertion"))
+
+(defsubst js2-record-text-property (beg end prop value)
+  "Record a text property to set when parsing finishes."
+  (push (list beg end prop value) js2-mode-deferred-properties))
+
+;; I'd like to associate errors with nodes, but for now the
+;; easiest thing to do is get the context info from the last token.
+(defun js2-record-parse-error (msg &optional arg pos len)
+  (push (list (list msg arg)
+              (or pos (js2-current-token-beg))
+              (or len (js2-current-token-len)))
+        js2-parsed-errors))
+
+(defun js2-report-error (msg &optional msg-arg pos len)
+  "Signal a syntax error or record a parse error."
+  (if js2-recover-from-parse-errors
+      (js2-record-parse-error msg msg-arg pos len)
+  (signal 'js2-syntax-error
+          (list msg
+                js2-ts-lineno
+                (save-excursion
+                  (goto-char js2-ts-cursor)
+                  (current-column))
+                js2-ts-hit-eof))))
+
+(defun js2-report-warning (msg &optional msg-arg pos len face)
+  (if js2-compiler-report-warning-as-error
+      (js2-report-error msg msg-arg pos len)
+    (push (list (list msg msg-arg)
+                (or pos (js2-current-token-beg))
+                (or len (js2-current-token-len))
+                face)
+          js2-parsed-warnings)))
+
+(defun js2-add-strict-warning (msg-id &optional msg-arg beg end)
+  (if js2-compiler-strict-mode
+      (js2-report-warning msg-id msg-arg beg
+                          (and beg end (- end beg)))))
+
+(put 'js2-syntax-error 'error-conditions
+     '(error syntax-error js2-syntax-error))
+(put 'js2-syntax-error 'error-message "Syntax error")
+
+(put 'js2-parse-error 'error-conditions
+     '(error parse-error js2-parse-error))
+(put 'js2-parse-error 'error-message "Parse error")
+
+(defmacro js2-clear-flag (flags flag)
+  `(setq ,flags (logand ,flags (lognot ,flag))))
+
+(defmacro js2-set-flag (flags flag)
+  "Logical-or FLAG into FLAGS."
+  `(setq ,flags (logior ,flags ,flag)))
+
+(defsubst js2-flag-set-p (flags flag)
+  (/= 0 (logand flags flag)))
+
+(defsubst js2-flag-not-set-p (flags flag)
+  (zerop (logand flags flag)))
+
+;;; AST struct and function definitions
+
+;; flags for ast node property 'member-type (used for e4x operators)
+(defvar js2-property-flag    #x1 "Property access: element is valid name.")
+(defvar js2-attribute-flag   #x2 "x.@y or x..@y.")
+(defvar js2-descendants-flag #x4 "x..y or x..@i.")
+
+(defsubst js2-relpos (pos anchor)
+  "Convert POS to be relative to ANCHOR.
+If POS is nil, returns nil."
+  (and pos (- pos anchor)))
+
+(defun js2-make-pad (indent)
+  (if (zerop indent)
+      ""
+    (make-string (* indent js2-basic-offset) ? )))
+
+(defun js2-visit-ast (node callback)
+  "Visit every node in ast NODE with visitor CALLBACK.
+
+CALLBACK is a function that takes two arguments:  (NODE END-P).  It is
+called twice:  once to visit the node, and again after all the node's
+children have been processed.  The END-P argument is nil on the first
+call and non-nil on the second call.  The return value of the callback
+affects the traversal:  if non-nil, the children of NODE are processed.
+If the callback returns nil, or if the node has no children, then the
+callback is called immediately with a non-nil END-P argument.
+
+The node traversal is approximately lexical-order, although there
+are currently no guarantees around this."
+  (when node
+    (let ((vfunc (get (aref node 0) 'js2-visitor)))
+      ;; visit the node
+      (when  (funcall callback node nil)
+        ;; visit the kids
+        (cond
+         ((eq vfunc 'js2-visit-none)
+          nil)                            ; don't even bother calling it
+         ;; Each AST node type has to define a `js2-visitor' function
+         ;; that takes a node and a callback, and calls `js2-visit-ast'
+         ;; on each child of the node.
+         (vfunc
+          (funcall vfunc node callback))
+         (t
+          (error "%s does not define a visitor-traversal function"
+                 (aref node 0)))))
+      ;; call the end-visit
+      (funcall callback node t))))
+
+(cl-defstruct (js2-node
+               (:constructor nil))  ; abstract
+  "Base AST node type."
+  (type -1)  ; token type
+  (pos -1)   ; start position of this AST node in parsed input
+  (len 1)    ; num characters spanned by the node
+  props      ; optional node property list (an alist)
+  parent)    ; link to parent node; null for root
+
+(defsubst js2-node-get-prop (node prop &optional default)
+  (or (cadr (assoc prop (js2-node-props node))) default))
+
+(defsubst js2-node-set-prop (node prop value)
+  (setf (js2-node-props node)
+        (cons (list prop value) (js2-node-props node))))
+
+(defun js2-fixup-starts (n nodes)
+  "Adjust the start positions of NODES to be relative to N.
+Any node in the list may be nil, for convenience."
+  (dolist (node nodes)
+    (when node
+      (setf (js2-node-pos node) (- (js2-node-pos node)
+                                   (js2-node-pos n))))))
+
+(defun js2-node-add-children (parent &rest nodes)
+  "Set parent node of NODES to PARENT, and return PARENT.
+Does nothing if we're not recording parent links.
+If any given node in NODES is nil, doesn't record that link."
+  (js2-fixup-starts parent nodes)
+  (dolist (node nodes)
+    (and node
+         (setf (js2-node-parent node) parent))))
+
+;; Non-recursive since it's called a frightening number of times.
+(defun js2-node-abs-pos (n)
+  (let ((pos (js2-node-pos n)))
+    (while (setq n (js2-node-parent n))
+      (setq pos (+ pos (js2-node-pos n))))
+    pos))
+
+(defsubst js2-node-abs-end (n)
+  "Return absolute buffer position of end of N."
+  (+ (js2-node-abs-pos n) (js2-node-len n)))
+
+;; It's important to make sure block nodes have a Lisp list for the
+;; child nodes, to limit printing recursion depth in an AST that
+;; otherwise consists of defstruct vectors.  Emacs will crash printing
+;; a sufficiently large vector tree.
+
+(cl-defstruct (js2-block-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-block-node (&key (type js2-BLOCK)
+                                                       (pos (js2-current-token-beg))
+                                                       len
+                                                       props
+                                                       kids)))
+  "A block of statements."
+  kids)  ; a Lisp list of the child statement nodes
+
+(put 'cl-struct-js2-block-node 'js2-visitor 'js2-visit-block)
+(put 'cl-struct-js2-block-node 'js2-printer 'js2-print-block)
+
+(defun js2-visit-block (ast callback)
+  "Visit the `js2-block-node' children of AST."
+  (dolist (kid (js2-block-node-kids ast))
+    (js2-visit-ast kid callback)))
+
+(defun js2-print-block (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert pad "{\n")
+    (dolist (kid (js2-block-node-kids n))
+      (js2-print-ast kid (1+ i)))
+    (insert pad "}")))
+
+(cl-defstruct (js2-scope
+               (:include js2-block-node)
+               (:constructor nil)
+               (:constructor make-js2-scope (&key (type js2-BLOCK)
+                                                  (pos (js2-current-token-beg))
+                                                  len
+                                                  kids)))
+  ;; The symbol-table is a LinkedHashMap<String,Symbol> in Rhino.
+  ;; I don't have one of those handy, so I'll use an alist for now.
+  ;; It's as fast as an emacs hashtable for up to about 50 elements,
+  ;; and is much lighter-weight to construct (both CPU and mem).
+  ;; The keys are interned strings (symbols) for faster lookup.
+  ;; Should switch to hybrid alist/hashtable eventually.
+  symbol-table  ; an alist of (symbol . js2-symbol)
+  parent-scope  ; a `js2-scope'
+  top)          ; top-level `js2-scope' (script/function)
+
+(put 'cl-struct-js2-scope 'js2-visitor 'js2-visit-block)
+(put 'cl-struct-js2-scope 'js2-printer 'js2-print-none)
+
+(defun js2-node-get-enclosing-scope (node)
+  "Return the innermost `js2-scope' node surrounding NODE.
+Returns nil if there is no enclosing scope node."
+  (while (and (setq node (js2-node-parent node))
+              (not (js2-scope-p node))))
+  node)
+
+(defun js2-get-defining-scope (scope name &optional point)
+  "Search up scope chain from SCOPE looking for NAME, a string or symbol.
+Returns `js2-scope' in which NAME is defined, or nil if not found.
+
+If POINT is non-nil, and if the found declaration type is
+`js2-LET', also check that the declaration node is before POINT."
+  (let ((sym (if (symbolp name)
+                 name
+               (intern name)))
+        result
+        (continue t))
+    (while (and scope continue)
+      (if (or
+           (let ((entry (cdr (assq sym (js2-scope-symbol-table scope)))))
+             (and entry
+                  (or (not point)
+                      (not (eq js2-LET (js2-symbol-decl-type entry)))
+                      (>= point
+                          (js2-node-abs-pos (js2-symbol-ast-node entry))))))
+           (and (eq sym 'arguments)
+                (js2-function-node-p scope)))
+          (setq continue nil
+                result scope)
+        (setq scope (js2-scope-parent-scope scope))))
+    result))
+
+(defun js2-scope-get-symbol (scope name)
+  "Return symbol table entry for NAME in SCOPE.
+NAME can be a string or symbol.   Returns a `js2-symbol' or nil if not found."
+  (and (js2-scope-symbol-table scope)
+       (cdr (assq (if (symbolp name)
+                      name
+                    (intern name))
+                  (js2-scope-symbol-table scope)))))
+
+(defun js2-scope-put-symbol (scope name symbol)
+  "Enter SYMBOL into symbol-table for SCOPE under NAME.
+NAME can be a Lisp symbol or string.  SYMBOL is a `js2-symbol'."
+  (let* ((table (js2-scope-symbol-table scope))
+         (sym (if (symbolp name) name (intern name)))
+         (entry (assq sym table)))
+    (if entry
+        (setcdr entry symbol)
+      (push (cons sym symbol)
+            (js2-scope-symbol-table scope)))))
+
+(cl-defstruct (js2-symbol
+               (:constructor nil)
+               (:constructor make-js2-symbol (decl-type name &optional ast-node)))
+  "A symbol table entry."
+  ;; One of js2-FUNCTION, js2-LP (for parameters), js2-VAR,
+  ;; js2-LET, or js2-CONST
+  decl-type
+  name  ; string
+  ast-node) ; a `js2-node'
+
+(cl-defstruct (js2-error-node
+               (:include js2-node)
+               (:constructor nil) ; silence emacs21 byte-compiler
+               (:constructor make-js2-error-node (&key (type js2-ERROR)
+                                                       (pos (js2-current-token-beg))
+                                                       len)))
+  "AST node representing a parse error.")
+
+(put 'cl-struct-js2-error-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-error-node 'js2-printer 'js2-print-none)
+
+(cl-defstruct (js2-script-node
+               (:include js2-scope)
+               (:constructor nil)
+               (:constructor make-js2-script-node (&key (type js2-SCRIPT)
+                                                        (pos (js2-current-token-beg))
+                                                        len
+                                                        ;; FIXME: What are those?
+                                                        var-decls
+                                                        fun-decls)))
+  functions   ; Lisp list of nested functions
+  regexps     ; Lisp list of (string . flags)
+  symbols     ; alist (every symbol gets unique index)
+  (param-count 0)
+  var-names   ; vector of string names
+  consts      ; bool-vector matching var-decls
+  (temp-number 0))  ; for generating temp variables
+
+(put 'cl-struct-js2-script-node 'js2-visitor 'js2-visit-block)
+(put 'cl-struct-js2-script-node 'js2-printer 'js2-print-script)
+
+(defun js2-print-script (node indent)
+  (dolist (kid (js2-block-node-kids node))
+    (js2-print-ast kid indent)))
+
+(cl-defstruct (js2-ast-root
+               (:include js2-script-node)
+               (:constructor nil)
+               (:constructor make-js2-ast-root (&key (type js2-SCRIPT)
+                                                     (pos (js2-current-token-beg))
+                                                     len
+                                                     buffer)))
+  "The root node of a js2 AST."
+  buffer         ; the source buffer from which the code was parsed
+  comments       ; a Lisp list of comments, ordered by start position
+  errors         ; a Lisp list of errors found during parsing
+  warnings       ; a Lisp list of warnings found during parsing
+  node-count)    ; number of nodes in the tree, including the root
+
+(put 'cl-struct-js2-ast-root 'js2-visitor 'js2-visit-ast-root)
+(put 'cl-struct-js2-ast-root 'js2-printer 'js2-print-script)
+
+(defun js2-visit-ast-root (ast callback)
+  (dolist (kid (js2-ast-root-kids ast))
+    (js2-visit-ast kid callback))
+  (dolist (comment (js2-ast-root-comments ast))
+    (js2-visit-ast comment callback)))
+
+(cl-defstruct (js2-comment-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-comment-node (&key (type js2-COMMENT)
+                                                         (pos (js2-current-token-beg))
+                                                         len
+                                                         format)))
+  format)  ; 'line, 'block, 'jsdoc or 'html
+
+(put 'cl-struct-js2-comment-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-comment-node 'js2-printer 'js2-print-comment)
+
+(defun js2-print-comment (n i)
+  ;; We really ought to link end-of-line comments to their nodes.
+  ;; Or maybe we could add a new comment type, 'endline.
+  (insert (js2-make-pad i)
+          (js2-node-string n)))
+
+(cl-defstruct (js2-expr-stmt-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-expr-stmt-node (&key (type js2-EXPR_VOID)
+                                                           (pos js2-ts-cursor)
+                                                           len
+                                                           expr)))
+  "An expression statement."
+  expr)
+
+(defsubst js2-expr-stmt-node-set-has-result (node)
+  "Change NODE type to `js2-EXPR_RESULT'.  Used for code generation."
+  (setf (js2-node-type node) js2-EXPR_RESULT))
+
+(put 'cl-struct-js2-expr-stmt-node 'js2-visitor 'js2-visit-expr-stmt-node)
+(put 'cl-struct-js2-expr-stmt-node 'js2-printer 'js2-print-expr-stmt-node)
+
+(defun js2-visit-expr-stmt-node (n v)
+  (js2-visit-ast (js2-expr-stmt-node-expr n) v))
+
+(defun js2-print-expr-stmt-node (n indent)
+  (js2-print-ast (js2-expr-stmt-node-expr n) indent)
+  (insert ";\n"))
+
+(cl-defstruct (js2-loop-node
+               (:include js2-scope)
+               (:constructor nil))
+  "Abstract supertype of loop nodes."
+  body      ; a `js2-block-node'
+  lp        ; position of left-paren, nil if omitted
+  rp)       ; position of right-paren, nil if omitted
+
+(cl-defstruct (js2-do-node
+               (:include js2-loop-node)
+               (:constructor nil)
+               (:constructor make-js2-do-node (&key (type js2-DO)
+                                                    (pos (js2-current-token-beg))
+                                                    len
+                                                    body
+                                                    condition
+                                                    while-pos
+                                                    lp
+                                                    rp)))
+  "AST node for do-loop."
+  condition  ; while (expression)
+  while-pos) ; buffer position of 'while' keyword
+
+(put 'cl-struct-js2-do-node 'js2-visitor 'js2-visit-do-node)
+(put 'cl-struct-js2-do-node 'js2-printer 'js2-print-do-node)
+
+(defun js2-visit-do-node (n v)
+  (js2-visit-ast (js2-do-node-body n) v)
+  (js2-visit-ast (js2-do-node-condition n) v))
+
+(defun js2-print-do-node (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert pad "do {\n")
+    (dolist (kid (js2-block-node-kids (js2-do-node-body n)))
+      (js2-print-ast kid (1+ i)))
+    (insert pad "} while (")
+    (js2-print-ast (js2-do-node-condition n) 0)
+    (insert ");\n")))
+
+(cl-defstruct (js2-export-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-export-node (&key (type js2-EXPORT)
+                                                        (pos (js2-current-token-beg))
+                                                        len
+                                                        exports-list
+                                                        from-clause
+                                                        declaration
+                                                        default)))
+  "AST node for an export statement. There are many things that can be exported,
+so many of its properties will be nil.
+"
+  exports-list ; lisp list of js2-export-binding-node to export
+  from-clause ; js2-from-clause-node for re-exporting symbols from another module
+  declaration ; js2-var-decl-node (var, let, const) or js2-class-node
+  default) ; js2-function-node or js2-assign-node
+
+(put 'cl-struct-js2-export-node 'js2-visitor 'js2-visit-export-node)
+(put 'cl-struct-js2-export-node 'js2-printer 'js2-print-export-node)
+
+(defun js2-visit-export-node (n v)
+  (let ((exports-list (js2-export-node-exports-list n))
+        (from (js2-export-node-from-clause n))
+        (declaration (js2-export-node-declaration n))
+        (default (js2-export-node-default n)))
+    (when exports-list
+      (dolist (export exports-list)
+        (js2-visit-ast export v)))
+    (when from
+      (js2-visit-ast from v))
+    (when declaration
+      (js2-visit-ast declaration v))
+    (when default
+      (js2-visit-ast default v))))
+
+(defun js2-print-export-node (n i)
+  (let ((pad (js2-make-pad i))
+        (exports-list (js2-export-node-exports-list n))
+        (from (js2-export-node-from-clause n))
+        (declaration (js2-export-node-declaration n))
+        (default (js2-export-node-default n)))
+    (insert pad "export ")
+    (cond
+     (default
+       (insert "default ")
+       (js2-print-ast default i))
+     (declaration
+       (js2-print-ast declaration i))
+     ((and exports-list from)
+      (js2-print-named-imports exports-list)
+      (insert " ")
+      (js2-print-from-clause from))
+     (from
+      (insert "* ")
+      (js2-print-from-clause from))
+     (exports-list
+      (js2-print-named-imports exports-list)))
+    (unless (or (and default (not (js2-assign-node-p default)))
+                (and declaration (or (js2-function-node-p declaration)
+                                     (js2-class-node-p declaration))))
+      (insert ";\n"))))
+
+(cl-defstruct (js2-while-node
+               (:include js2-loop-node)
+               (:constructor nil)
+               (:constructor make-js2-while-node (&key (type js2-WHILE)
+                                                       (pos (js2-current-token-beg))
+                                                       len body
+                                                       condition lp
+                                                       rp)))
+  "AST node for while-loop."
+  condition)    ; while-condition
+
+(put 'cl-struct-js2-while-node 'js2-visitor 'js2-visit-while-node)
+(put 'cl-struct-js2-while-node 'js2-printer 'js2-print-while-node)
+
+(defun js2-visit-while-node (n v)
+  (js2-visit-ast (js2-while-node-condition n) v)
+  (js2-visit-ast (js2-while-node-body n) v))
+
+(defun js2-print-while-node (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert pad "while (")
+    (js2-print-ast (js2-while-node-condition n) 0)
+    (insert ") {\n")
+    (js2-print-body (js2-while-node-body n) (1+ i))
+    (insert pad "}\n")))
+
+(cl-defstruct (js2-for-node
+               (:include js2-loop-node)
+               (:constructor nil)
+               (:constructor make-js2-for-node (&key (type js2-FOR)
+                                                     (pos js2-ts-cursor)
+                                                     len body init
+                                                     condition
+                                                     update lp rp)))
+  "AST node for a C-style for-loop."
+  init       ; initialization expression
+  condition  ; loop condition
+  update)    ; update clause
+
+(put 'cl-struct-js2-for-node 'js2-visitor 'js2-visit-for-node)
+(put 'cl-struct-js2-for-node 'js2-printer 'js2-print-for-node)
+
+(defun js2-visit-for-node (n v)
+  (js2-visit-ast (js2-for-node-init n) v)
+  (js2-visit-ast (js2-for-node-condition n) v)
+  (js2-visit-ast (js2-for-node-update n) v)
+  (js2-visit-ast (js2-for-node-body n) v))
+
+(defun js2-print-for-node (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert pad "for (")
+    (js2-print-ast (js2-for-node-init n) 0)
+    (insert "; ")
+    (js2-print-ast (js2-for-node-condition n) 0)
+    (insert "; ")
+    (js2-print-ast (js2-for-node-update n) 0)
+    (insert ") {\n")
+    (js2-print-body (js2-for-node-body n) (1+ i))
+    (insert pad "}\n")))
+
+(cl-defstruct (js2-for-in-node
+               (:include js2-loop-node)
+               (:constructor nil)
+               (:constructor make-js2-for-in-node (&key (type js2-FOR)
+                                                        (pos js2-ts-cursor)
+                                                        len body
+                                                        iterator
+                                                        object
+                                                        in-pos
+                                                        each-pos
+                                                        foreach-p forof-p
+                                                        lp rp)))
+  "AST node for a for..in loop."
+  iterator  ; [var] foo in ...
+  object    ; object over which we're iterating
+  in-pos    ; buffer position of 'in' keyword
+  each-pos  ; buffer position of 'each' keyword, if foreach-p
+  foreach-p ; t if it's a for-each loop
+  forof-p)  ; t if it's a for-of loop
+
+(put 'cl-struct-js2-for-in-node 'js2-visitor 'js2-visit-for-in-node)
+(put 'cl-struct-js2-for-in-node 'js2-printer 'js2-print-for-in-node)
+
+(defun js2-visit-for-in-node (n v)
+  (js2-visit-ast (js2-for-in-node-iterator n) v)
+  (js2-visit-ast (js2-for-in-node-object n) v)
+  (js2-visit-ast (js2-for-in-node-body n) v))
+
+(defun js2-print-for-in-node (n i)
+  (let ((pad (js2-make-pad i))
+        (foreach (js2-for-in-node-foreach-p n))
+        (forof (js2-for-in-node-forof-p n)))
+    (insert pad "for ")
+    (if foreach
+        (insert "each "))
+    (insert "(")
+    (js2-print-ast (js2-for-in-node-iterator n) 0)
+    (insert (if forof " of " " in "))
+    (js2-print-ast (js2-for-in-node-object n) 0)
+    (insert ") {\n")
+    (js2-print-body (js2-for-in-node-body n) (1+ i))
+    (insert pad "}\n")))
+
+(cl-defstruct (js2-return-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-return-node (&key (type js2-RETURN)
+                                                        (pos js2-ts-cursor)
+                                                        len
+                                                        retval)))
+  "AST node for a return statement."
+  retval)  ; expression to return, or 'undefined
+
+(put 'cl-struct-js2-return-node 'js2-visitor 'js2-visit-return-node)
+(put 'cl-struct-js2-return-node 'js2-printer 'js2-print-return-node)
+
+(defun js2-visit-return-node (n v)
+  (js2-visit-ast (js2-return-node-retval n) v))
+
+(defun js2-print-return-node (n i)
+  (insert (js2-make-pad i) "return")
+  (when (js2-return-node-retval n)
+    (insert " ")
+    (js2-print-ast (js2-return-node-retval n) 0))
+  (insert ";\n"))
+
+(cl-defstruct (js2-if-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-if-node (&key (type js2-IF)
+                                                    (pos js2-ts-cursor)
+                                                    len condition
+                                                    then-part
+                                                    else-pos
+                                                    else-part lp
+                                                    rp)))
+  "AST node for an if-statement."
+  condition   ; expression
+  then-part   ; statement or block
+  else-pos    ; optional buffer position of 'else' keyword
+  else-part   ; optional statement or block
+  lp          ; position of left-paren, nil if omitted
+  rp)         ; position of right-paren, nil if omitted
+
+(put 'cl-struct-js2-if-node 'js2-visitor 'js2-visit-if-node)
+(put 'cl-struct-js2-if-node 'js2-printer 'js2-print-if-node)
+
+(defun js2-visit-if-node (n v)
+  (js2-visit-ast (js2-if-node-condition n) v)
+  (js2-visit-ast (js2-if-node-then-part n) v)
+  (js2-visit-ast (js2-if-node-else-part n) v))
+
+(defun js2-print-if-node (n i)
+  (let ((pad (js2-make-pad i))
+        (then-part (js2-if-node-then-part n))
+        (else-part (js2-if-node-else-part n)))
+    (insert pad "if (")
+    (js2-print-ast (js2-if-node-condition n) 0)
+    (insert ") {\n")
+    (js2-print-body then-part (1+ i))
+    (insert pad "}")
+    (cond
+     ((not else-part)
+      (insert "\n"))
+     ((js2-if-node-p else-part)
+      (insert " else ")
+      (js2-print-body else-part i))
+     (t
+      (insert " else {\n")
+      (js2-print-body else-part (1+ i))
+      (insert pad "}\n")))))
+
+(cl-defstruct (js2-export-binding-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-export-binding-node (&key (type -1)
+                                                                pos
+                                                                len
+                                                                local-name
+                                                                extern-name)))
+  "AST node for an external symbol binding.
+It contains a local-name node which is the name of the value in the
+current scope, and extern-name which is the name of the value in the
+imported or exported scope. By default these are the same, but if the
+name is aliased as in {foo as bar}, it would have an extern-name node
+containing 'foo' and a local-name node containing 'bar'."
+  local-name ; js2-name-node with the variable name in this scope
+  extern-name)   ; js2-name-node with the value name in the exporting module
+
+(put 'cl-struct-js2-export-binding-node 'js2-printer 'js2-print-extern-binding)
+(put 'cl-struct-js2-export-binding-node 'js2-visitor 'js2-visit-extern-binding)
+
+(defun js2-visit-extern-binding (n v)
+  "Visit an extern binding node. First visit the local-name, and, if
+different, visit the extern-name."
+  (let ((local-name (js2-export-binding-node-local-name n))
+        (extern-name (js2-export-binding-node-extern-name n)))
+    (when local-name
+      (js2-visit-ast local-name v))
+    (when (not (equal local-name extern-name))
+      (js2-visit-ast extern-name v))))
+
+(defun js2-print-extern-binding (n _i)
+  "Print a representation of a single extern binding. E.g. 'foo' or
+'foo as bar'."
+  (let ((local-name (js2-export-binding-node-local-name n))
+        (extern-name (js2-export-binding-node-extern-name n)))
+    (insert (js2-name-node-name extern-name))
+    (when (not (equal local-name extern-name))
+      (insert " as ")
+      (insert (js2-name-node-name local-name)))))
+
+
+(cl-defstruct (js2-import-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-import-node (&key (type js2-IMPORT)
+                                                        (pos (js2-current-token-beg))
+                                                        len
+                                                        import
+                                                        from
+                                                        module-id)))
+  "AST node for an import statement. It follows the form
+
+import ModuleSpecifier;
+import ImportClause FromClause;"
+  import     ; js2-import-clause-node specifying which names are to imported.
+  from       ; js2-from-clause-node indicating the module from which to import.
+  module-id) ; module-id of the import. E.g. 'src/mylib'.
+
+(put 'cl-struct-js2-import-node 'js2-printer 'js2-print-import)
+(put 'cl-struct-js2-import-node 'js2-visitor 'js2-visit-import)
+
+(defun js2-visit-import (n v)
+  (let ((import-clause (js2-import-node-import n))
+        (from-clause (js2-import-node-from n)))
+    (when import-clause
+      (js2-visit-ast import-clause v))
+    (when from-clause
+      (js2-visit-ast from-clause v))))
+
+(defun js2-print-import (n i)
+  "Prints a representation of the import node"
+  (let ((pad (js2-make-pad i))
+        (import-clause (js2-import-node-import n))
+        (from-clause (js2-import-node-from n))
+        (module-id (js2-import-node-module-id n)))
+    (insert pad "import ")
+    (if import-clause
+        (progn
+          (js2-print-import-clause import-clause)
+          (insert " ")
+          (js2-print-from-clause from-clause))
+      (insert "'")
+      (insert module-id)
+      (insert "'"))
+    (insert ";\n")))
+
+(cl-defstruct (js2-import-clause-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-import-clause-node (&key (type -1)
+                                                               pos
+                                                               len
+                                                               namespace-import
+                                                               named-imports
+                                                               default-binding)))
+  "AST node corresponding to the import clause of an import statement. This is
+the portion of the import that bindings names from the external context to the
+local context."
+  namespace-import ; js2-namespace-import-node. E.g. '* as lib'
+  named-imports    ; lisp list of js2-export-binding-node for all named imports.
+  default-binding) ; js2-export-binding-node for the default import binding
+
+(put 'cl-struct-js2-import-clause-node 'js2-visitor 'js2-visit-import-clause)
+(put 'cl-struct-js2-import-clause-node 'js2-printer 'js2-print-import-clause)
+
+(defun js2-visit-import-clause (n v)
+  (let ((ns-import (js2-import-clause-node-namespace-import n))
+        (named-imports (js2-import-clause-node-named-imports n))
+        (default (js2-import-clause-node-default-binding n)))
+    (when ns-import
+      (js2-visit-ast ns-import v))
+    (when named-imports
+      (dolist (import named-imports)
+        (js2-visit-ast import v)))
+    (when default
+      (js2-visit-ast default v))))
+
+(defun js2-print-import-clause (n)
+  (let ((ns-import (js2-import-clause-node-namespace-import n))
+        (named-imports (js2-import-clause-node-named-imports n))
+        (default (js2-import-clause-node-default-binding n)))
+    (cond
+     ((and default ns-import)
+      (js2-print-ast default)
+      (insert ", ")
+      (js2-print-namespace-import ns-import))
+     ((and default named-imports)
+      (js2-print-ast default)
+      (insert ", ")
+      (js2-print-named-imports named-imports))
+     (default
+      (js2-print-ast default))
+     (ns-import
+      (js2-print-namespace-import ns-import))
+     (named-imports
+      (js2-print-named-imports named-imports)))))
+
+(defun js2-print-namespace-import (node)
+  (insert "* as ")
+  (insert (js2-name-node-name (js2-namespace-import-node-name node))))
+
+(defun js2-print-named-imports (imports)
+  (insert "{")
+  (let ((len (length imports))
+        (n 0))
+    (while (< n len)
+      (js2-print-extern-binding (nth n imports) 0)
+      (unless (= n (- len 1))
+        (insert ", "))
+      (setq n (+ n 1))))
+  (insert "}"))
+
+(cl-defstruct (js2-namespace-import-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-namespace-import-node (&key (type -1)
+                                                                  pos
+                                                                  len
+                                                                  name)))
+  "AST node for a complete namespace import.
+E.g. the '* as lib' expression in:
+
+import * as lib from 'src/lib'
+
+It contains a single name node referring to the bound name."
+  name) ; js2-name-node of the bound name.
+
+(defun js2-visit-namespace-import (n v)
+  (js2-visit-ast (js2-namespace-import-node-name n) v))
+
+(put 'cl-struct-js2-namespace-import-node 'js2-visitor 'js2-visit-namespace-import)
+(put 'cl-struct-js2-namespace-import-node 'js2-printer 'js2-print-namespace-import)
+
+(cl-defstruct (js2-from-clause-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-from-clause-node (&key (type js2-NAME)
+                                                             pos
+                                                             len
+                                                             module-id
+                                                             metadata-p)))
+  "AST node for the from clause in an import or export statement.
+E.g. from 'my/module'. It can refere to either an external module, or to the
+modules metadata itself."
+  module-id ; string containing the module specifier.
+  metadata-p) ; true if this clause refers to the module's metadata
+
+(put 'cl-struct-js2-from-clause-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-from-clause-node 'js2-printer 'js2-print-from-clause)
+
+(defun js2-print-from-clause (n)
+  (insert "from ")
+  (if (js2-from-clause-node-metadata-p n)
+      (insert "this module")
+    (insert "'")
+    (insert (js2-from-clause-node-module-id n))
+    (insert "'")))
+
+(cl-defstruct (js2-try-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-try-node (&key (type js2-TRY)
+                                                     (pos js2-ts-cursor)
+                                                     len
+                                                     try-block
+                                                     catch-clauses
+                                                     finally-block)))
+  "AST node for a try-statement."
+  try-block
+  catch-clauses  ; a Lisp list of `js2-catch-node'
+  finally-block) ; a `js2-finally-node'
+
+(put 'cl-struct-js2-try-node 'js2-visitor 'js2-visit-try-node)
+(put 'cl-struct-js2-try-node 'js2-printer 'js2-print-try-node)
+
+(defun js2-visit-try-node (n v)
+  (js2-visit-ast (js2-try-node-try-block n) v)
+  (dolist (clause (js2-try-node-catch-clauses n))
+    (js2-visit-ast clause v))
+  (js2-visit-ast (js2-try-node-finally-block n) v))
+
+(defun js2-print-try-node (n i)
+  (let ((pad (js2-make-pad i))
+        (catches (js2-try-node-catch-clauses n))
+        (finally (js2-try-node-finally-block n)))
+    (insert pad "try {\n")
+    (js2-print-body (js2-try-node-try-block n) (1+ i))
+    (insert pad "}")
+    (when catches
+      (dolist (catch catches)
+        (js2-print-ast catch i)))
+    (if finally
+        (js2-print-ast finally i)
+      (insert "\n"))))
+
+(cl-defstruct (js2-catch-node
+               (:include js2-scope)
+               (:constructor nil)
+               (:constructor make-js2-catch-node (&key (type js2-CATCH)
+                                                       (pos js2-ts-cursor)
+                                                       len
+                                                       param
+                                                       guard-kwd
+                                                       guard-expr
+                                                       lp rp)))
+  "AST node for a catch clause."
+  param       ; destructuring form or simple name node
+  guard-kwd   ; relative buffer position of "if" in "catch (x if ...)"
+  guard-expr  ; catch condition, a `js2-node'
+  lp          ; buffer position of left-paren, nil if omitted
+  rp)         ; buffer position of right-paren, nil if omitted
+
+(put 'cl-struct-js2-catch-node 'js2-visitor 'js2-visit-catch-node)
+(put 'cl-struct-js2-catch-node 'js2-printer 'js2-print-catch-node)
+
+(defun js2-visit-catch-node (n v)
+  (js2-visit-ast (js2-catch-node-param n) v)
+  (when (js2-catch-node-guard-kwd n)
+    (js2-visit-ast (js2-catch-node-guard-expr n) v))
+  (js2-visit-block n v))
+
+(defun js2-print-catch-node (n i)
+  (let ((pad (js2-make-pad i))
+        (guard-kwd (js2-catch-node-guard-kwd n))
+        (guard-expr (js2-catch-node-guard-expr n)))
+    (insert " catch (")
+    (js2-print-ast (js2-catch-node-param n) 0)
+    (when guard-kwd
+      (insert " if ")
+      (js2-print-ast guard-expr 0))
+    (insert ") {\n")
+    (js2-print-body n (1+ i))
+    (insert pad "}")))
+
+(cl-defstruct (js2-finally-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-finally-node (&key (type js2-FINALLY)
+                                                         (pos js2-ts-cursor)
+                                                         len body)))
+  "AST node for a finally clause."
+  body)  ; a `js2-node', often but not always a block node
+
+(put 'cl-struct-js2-finally-node 'js2-visitor 'js2-visit-finally-node)
+(put 'cl-struct-js2-finally-node 'js2-printer 'js2-print-finally-node)
+
+(defun js2-visit-finally-node (n v)
+  (js2-visit-ast (js2-finally-node-body n) v))
+
+(defun js2-print-finally-node (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert " finally {\n")
+    (js2-print-body (js2-finally-node-body n) (1+ i))
+    (insert pad "}\n")))
+
+(cl-defstruct (js2-switch-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-switch-node (&key (type js2-SWITCH)
+                                                        (pos js2-ts-cursor)
+                                                        len
+                                                        discriminant
+                                                        cases lp
+                                                        rp)))
+  "AST node for a switch statement."
+  discriminant  ; a `js2-node' (switch expression)
+  cases  ; a Lisp list of `js2-case-node'
+  lp     ; position of open-paren for discriminant, nil if omitted
+  rp)    ; position of close-paren for discriminant, nil if omitted
+
+(put 'cl-struct-js2-switch-node 'js2-visitor 'js2-visit-switch-node)
+(put 'cl-struct-js2-switch-node 'js2-printer 'js2-print-switch-node)
+
+(defun js2-visit-switch-node (n v)
+  (js2-visit-ast (js2-switch-node-discriminant n) v)
+  (dolist (c (js2-switch-node-cases n))
+    (js2-visit-ast c v)))
+
+(defun js2-print-switch-node (n i)
+  (let ((pad (js2-make-pad i))
+        (cases (js2-switch-node-cases n)))
+    (insert pad "switch (")
+    (js2-print-ast (js2-switch-node-discriminant n) 0)
+    (insert ") {\n")
+    (dolist (case cases)
+      (js2-print-ast case i))
+    (insert pad "}\n")))
+
+(cl-defstruct (js2-case-node
+               (:include js2-block-node)
+               (:constructor nil)
+               (:constructor make-js2-case-node (&key (type js2-CASE)
+                                                      (pos js2-ts-cursor)
+                                                      len kids expr)))
+  "AST node for a case clause of a switch statement."
+  expr)   ; the case expression (nil for default)
+
+(put 'cl-struct-js2-case-node 'js2-visitor 'js2-visit-case-node)
+(put 'cl-struct-js2-case-node 'js2-printer 'js2-print-case-node)
+
+(defun js2-visit-case-node (n v)
+  (js2-visit-ast (js2-case-node-expr n) v)
+  (js2-visit-block n v))
+
+(defun js2-print-case-node (n i)
+  (let ((pad (js2-make-pad i))
+        (expr (js2-case-node-expr n)))
+    (insert pad)
+    (if (null expr)
+        (insert "default:\n")
+      (insert "case ")
+      (js2-print-ast expr 0)
+      (insert ":\n"))
+    (dolist (kid (js2-case-node-kids n))
+      (js2-print-ast kid (1+ i)))))
+
+(cl-defstruct (js2-throw-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-throw-node (&key (type js2-THROW)
+                                                       (pos js2-ts-cursor)
+                                                       len expr)))
+  "AST node for a throw statement."
+  expr)   ; the expression to throw
+
+(put 'cl-struct-js2-throw-node 'js2-visitor 'js2-visit-throw-node)
+(put 'cl-struct-js2-throw-node 'js2-printer 'js2-print-throw-node)
+
+(defun js2-visit-throw-node (n v)
+  (js2-visit-ast (js2-throw-node-expr n) v))
+
+(defun js2-print-throw-node (n i)
+  (insert (js2-make-pad i) "throw ")
+  (js2-print-ast (js2-throw-node-expr n) 0)
+  (insert ";\n"))
+
+(cl-defstruct (js2-with-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-with-node (&key (type js2-WITH)
+                                                      (pos js2-ts-cursor)
+                                                      len object
+                                                      body lp rp)))
+  "AST node for a with-statement."
+  object
+  body
+  lp    ; buffer position of left-paren around object, nil if omitted
+  rp)   ; buffer position of right-paren around object, nil if omitted
+
+(put 'cl-struct-js2-with-node 'js2-visitor 'js2-visit-with-node)
+(put 'cl-struct-js2-with-node 'js2-printer 'js2-print-with-node)
+
+(defun js2-visit-with-node (n v)
+  (js2-visit-ast (js2-with-node-object n) v)
+  (js2-visit-ast (js2-with-node-body n) v))
+
+(defun js2-print-with-node (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert pad "with (")
+    (js2-print-ast (js2-with-node-object n) 0)
+    (insert ") {\n")
+    (js2-print-body (js2-with-node-body n) (1+ i))
+    (insert pad "}\n")))
+
+(cl-defstruct (js2-label-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-label-node (&key (type js2-LABEL)
+                                                       (pos js2-ts-cursor)
+                                                       len name)))
+  "AST node for a statement label or case label."
+  name   ; a string
+  loop)  ; for validating and code-generating continue-to-label
+
+(put 'cl-struct-js2-label-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-label-node 'js2-printer 'js2-print-label)
+
+(defun js2-print-label (n i)
+  (insert (js2-make-pad i)
+          (js2-label-node-name n)
+          ":\n"))
+
+(cl-defstruct (js2-labeled-stmt-node
+               (:include js2-node)
+               (:constructor nil)
+               ;; type needs to be in `js2-side-effecting-tokens' to avoid spurious
+               ;; no-side-effects warnings, hence js2-EXPR_RESULT.
+               (:constructor make-js2-labeled-stmt-node (&key (type js2-EXPR_RESULT)
+                                                              (pos js2-ts-cursor)
+                                                              len labels stmt)))
+  "AST node for a statement with one or more labels.
+Multiple labels for a statement are collapsed into the labels field."
+  labels  ; Lisp list of `js2-label-node'
+  stmt)   ; the statement these labels are for
+
+(put 'cl-struct-js2-labeled-stmt-node 'js2-visitor 'js2-visit-labeled-stmt)
+(put 'cl-struct-js2-labeled-stmt-node 'js2-printer 'js2-print-labeled-stmt)
+
+(defun js2-get-label-by-name (lbl-stmt name)
+  "Return a `js2-label-node' by NAME from LBL-STMT's labels list.
+Returns nil if no such label is in the list."
+  (let ((label-list (js2-labeled-stmt-node-labels lbl-stmt))
+        result)
+    (while (and label-list (not result))
+      (if (string= (js2-label-node-name (car label-list)) name)
+          (setq result (car label-list))
+        (setq label-list (cdr label-list))))
+    result))
+
+(defun js2-visit-labeled-stmt (n v)
+  (dolist (label (js2-labeled-stmt-node-labels n))
+    (js2-visit-ast label v))
+  (js2-visit-ast (js2-labeled-stmt-node-stmt n) v))
+
+(defun js2-print-labeled-stmt (n i)
+  (dolist (label (js2-labeled-stmt-node-labels n))
+    (js2-print-ast label i))
+  (js2-print-ast (js2-labeled-stmt-node-stmt n) i))
+
+(defun js2-labeled-stmt-node-contains (node label)
+  "Return t if NODE contains LABEL in its label set.
+NODE is a `js2-labels-node'.  LABEL is an identifier."
+  (cl-loop for nl in (js2-labeled-stmt-node-labels node)
+           if (string= label (js2-label-node-name nl))
+           return t
+           finally return nil))
+
+(defsubst js2-labeled-stmt-node-add-label (node label)
+  "Add a `js2-label-node' to the label set for this statement."
+  (setf (js2-labeled-stmt-node-labels node)
+        (nconc (js2-labeled-stmt-node-labels node) (list label))))
+
+(cl-defstruct (js2-jump-node
+               (:include js2-node)
+               (:constructor nil))
+  "Abstract supertype of break and continue nodes."
+  label   ; `js2-name-node' for location of label identifier, if present
+  target) ; target js2-labels-node or loop/switch statement
+
+(defun js2-visit-jump-node (n v)
+  ;; We don't visit the target, since it's a back-link.
+  (js2-visit-ast (js2-jump-node-label n) v))
+
+(cl-defstruct (js2-break-node
+               (:include js2-jump-node)
+               (:constructor nil)
+               (:constructor make-js2-break-node (&key (type js2-BREAK)
+                                                       (pos js2-ts-cursor)
+                                                       len label target)))
+  "AST node for a break statement.
+The label field is a `js2-name-node', possibly nil, for the named label
+if provided.  E.g. in 'break foo', it represents 'foo'.  The target field
+is the target of the break - a label node or enclosing loop/switch statement.")
+
+(put 'cl-struct-js2-break-node 'js2-visitor 'js2-visit-jump-node)
+(put 'cl-struct-js2-break-node 'js2-printer 'js2-print-break-node)
+
+(defun js2-print-break-node (n i)
+  (insert (js2-make-pad i) "break")
+  (when (js2-break-node-label n)
+    (insert " ")
+    (js2-print-ast (js2-break-node-label n) 0))
+  (insert ";\n"))
+
+(cl-defstruct (js2-continue-node
+               (:include js2-jump-node)
+               (:constructor nil)
+               (:constructor make-js2-continue-node (&key (type js2-CONTINUE)
+                                                          (pos js2-ts-cursor)
+                                                          len label target)))
+  "AST node for a continue statement.
+The label field is the user-supplied enclosing label name, a `js2-name-node'.
+It is nil if continue specifies no label.  The target field is the jump target:
+a `js2-label-node' or the innermost enclosing loop.")
+
+(put 'cl-struct-js2-continue-node 'js2-visitor 'js2-visit-jump-node)
+(put 'cl-struct-js2-continue-node 'js2-printer 'js2-print-continue-node)
+
+(defun js2-print-continue-node (n i)
+  (insert (js2-make-pad i) "continue")
+  (when (js2-continue-node-label n)
+    (insert " ")
+    (js2-print-ast (js2-continue-node-label n) 0))
+  (insert ";\n"))
+
+(cl-defstruct (js2-function-node
+               (:include js2-script-node)
+               (:constructor nil)
+               (:constructor make-js2-function-node (&key (type js2-FUNCTION)
+                                                          (pos js2-ts-cursor)
+                                                          len
+                                                          (ftype 'FUNCTION)
+                                                          (form 'FUNCTION_STATEMENT)
+                                                          (name "")
+                                                          params rest-p
+                                                          body
+                                                          generator-type
+                                                          async
+                                                          lp rp)))
+  "AST node for a function declaration.
+The `params' field is a Lisp list of nodes.  Each node is either a simple
+`js2-name-node', or if it's a destructuring-assignment parameter, a
+`js2-array-node' or `js2-object-node'."
+  ftype            ; FUNCTION, GETTER or SETTER
+  form             ; FUNCTION_{STATEMENT|EXPRESSION|ARROW}
+  name             ; function name (a `js2-name-node', or nil if anonymous)
+  params           ; a Lisp list of destructuring forms or simple name nodes
+  rest-p           ; if t, the last parameter is rest parameter
+  body             ; a `js2-block-node' or expression node (1.8 only)
+  lp               ; position of arg-list open-paren, or nil if omitted
+  rp               ; position of arg-list close-paren, or nil if omitted
+  ignore-dynamic   ; ignore value of the dynamic-scope flag (interpreter only)
+  needs-activation ; t if we need an activation object for this frame
+  generator-type   ; STAR, LEGACY, COMPREHENSION or nil
+  async            ; t if the function is defined as `async function`
+  member-expr)     ; nonstandard Ecma extension from Rhino
+
+(put 'cl-struct-js2-function-node 'js2-visitor 'js2-visit-function-node)
+(put 'cl-struct-js2-function-node 'js2-printer 'js2-print-function-node)
+
+(defun js2-visit-function-node (n v)
+  (js2-visit-ast (js2-function-node-name n) v)
+  (dolist (p (js2-function-node-params n))
+    (js2-visit-ast p v))
+  (js2-visit-ast (js2-function-node-body n) v))
+
+(defun js2-print-function-node (n i)
+  (let* ((pad (js2-make-pad i))
+         (method (js2-node-get-prop n 'METHOD_TYPE))
+         (name (or (js2-function-node-name n)
+                   (js2-function-node-member-expr n)))
+         (params (js2-function-node-params n))
+         (arrow (eq (js2-function-node-form n) 'FUNCTION_ARROW))
+         (rest-p (js2-function-node-rest-p n))
+         (body (js2-function-node-body n))
+         (expr (not (eq (js2-function-node-form n) 'FUNCTION_STATEMENT))))
+    (unless method
+      (insert pad)
+      (when (js2-function-node-async n) (insert "async "))
+      (unless arrow (insert "function"))
+      (when (eq (js2-function-node-generator-type n) 'STAR)
+        (insert "*")))
+    (when name
+      (insert " ")
+      (js2-print-ast name 0))
+    (insert "(")
+    (cl-loop with len = (length params)
+             for param in params
+             for count from 1
+             do
+             (when (and rest-p (= count len))
+               (insert "..."))
+             (js2-print-ast param 0)
+             (when (< count len)
+               (insert ", ")))
+    (insert ") ")
+    (when arrow
+      (insert "=> "))
+    (insert "{")
+    ;; TODO:  fix this to be smarter about indenting, etc.
+    (unless expr
+      (insert "\n"))
+    (if (js2-block-node-p body)
+        (js2-print-body body (1+ i))
+      (js2-print-ast body 0))
+    (insert pad "}")
+    (unless expr
+      (insert "\n"))))
+
+(defun js2-function-name (node)
+  "Return function name for NODE, a `js2-function-node', or nil if anonymous."
+  (and (js2-function-node-name node)
+       (js2-name-node-name (js2-function-node-name node))))
+
+;; Having this be an expression node makes it more flexible.
+;; There are IDE contexts, such as indentation in a for-loop initializer,
+;; that work better if you assume it's an expression.  Whenever we have
+;; a standalone var/const declaration, we just wrap with an expr stmt.
+;; Eclipse apparently screwed this up and now has two versions, expr and stmt.
+(cl-defstruct (js2-var-decl-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-var-decl-node (&key (type js2-VAR)
+                                                          (pos (js2-current-token-beg))
+                                                          len kids
+                                                          decl-type)))
+  "AST node for a variable declaration list (VAR, CONST or LET).
+The node bounds differ depending on the declaration type.  For VAR or
+CONST declarations, the bounds include the var/const keyword.  For LET
+declarations, the node begins at the position of the first child."
+  kids        ; a Lisp list of `js2-var-init-node' structs.
+  decl-type)  ; js2-VAR, js2-CONST or js2-LET
+
+(put 'cl-struct-js2-var-decl-node 'js2-visitor 'js2-visit-var-decl)
+(put 'cl-struct-js2-var-decl-node 'js2-printer 'js2-print-var-decl)
+
+(defun js2-visit-var-decl (n v)
+  (dolist (kid (js2-var-decl-node-kids n))
+    (js2-visit-ast kid v)))
+
+(defun js2-print-var-decl (n i)
+  (let ((pad (js2-make-pad i))
+        (tt (js2-var-decl-node-decl-type n)))
+    (insert pad)
+    (insert (cond
+             ((= tt js2-VAR) "var ")
+             ((= tt js2-LET) "let ")
+             ((= tt js2-CONST) "const ")
+             (t
+              (error "malformed var-decl node"))))
+    (cl-loop with kids = (js2-var-decl-node-kids n)
+             with len = (length kids)
+             for kid in kids
+             for count from 1
+             do
+             (js2-print-ast kid 0)
+             (if (< count len)
+                 (insert ", ")))))
+
+(cl-defstruct (js2-var-init-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-var-init-node (&key (type js2-VAR)
+                                                          (pos js2-ts-cursor)
+                                                          len target
+                                                          initializer)))
+  "AST node for a variable declaration.
+The type field will be js2-CONST for a const decl."
+  target        ; `js2-name-node', `js2-object-node', or `js2-array-node'
+  initializer)  ; initializer expression, a `js2-node'
+
+(put 'cl-struct-js2-var-init-node 'js2-visitor 'js2-visit-var-init-node)
+(put 'cl-struct-js2-var-init-node 'js2-printer 'js2-print-var-init-node)
+
+(defun js2-visit-var-init-node (n v)
+  (js2-visit-ast (js2-var-init-node-target n) v)
+  (js2-visit-ast (js2-var-init-node-initializer n) v))
+
+(defun js2-print-var-init-node (n i)
+  (let ((pad (js2-make-pad i))
+        (name (js2-var-init-node-target n))
+        (init (js2-var-init-node-initializer n)))
+    (insert pad)
+    (js2-print-ast name 0)
+    (when init
+      (insert " = ")
+      (js2-print-ast init 0))))
+
+(cl-defstruct (js2-cond-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-cond-node (&key (type js2-HOOK)
+                                                      (pos js2-ts-cursor)
+                                                      len
+                                                      test-expr
+                                                      true-expr
+                                                      false-expr
+                                                      q-pos c-pos)))
+  "AST node for the ternary operator"
+  test-expr
+  true-expr
+  false-expr
+  q-pos   ; buffer position of ?
+  c-pos)  ; buffer position of :
+
+(put 'cl-struct-js2-cond-node 'js2-visitor 'js2-visit-cond-node)
+(put 'cl-struct-js2-cond-node 'js2-printer 'js2-print-cond-node)
+
+(defun js2-visit-cond-node (n v)
+  (js2-visit-ast (js2-cond-node-test-expr n) v)
+  (js2-visit-ast (js2-cond-node-true-expr n) v)
+  (js2-visit-ast (js2-cond-node-false-expr n) v))
+
+(defun js2-print-cond-node (n i)
+  (let ((pad (js2-make-pad i)))
+    (insert pad)
+    (js2-print-ast (js2-cond-node-test-expr n) 0)
+    (insert " ? ")
+    (js2-print-ast (js2-cond-node-true-expr n) 0)
+    (insert " : ")
+    (js2-print-ast (js2-cond-node-false-expr n) 0)))
+
+(cl-defstruct (js2-infix-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-infix-node (&key type
+                                                       (pos js2-ts-cursor)
+                                                       len op-pos
+                                                       left right)))
+  "Represents infix expressions.
+Includes assignment ops like `|=', and the comma operator.
+The type field inherited from `js2-node' holds the operator."
+  op-pos    ; buffer position where operator begins
+  left      ; any `js2-node'
+  right)    ; any `js2-node'
+
+(put 'cl-struct-js2-infix-node 'js2-visitor 'js2-visit-infix-node)
+(put 'cl-struct-js2-infix-node 'js2-printer 'js2-print-infix-node)
+
+(defun js2-visit-infix-node (n v)
+  (js2-visit-ast (js2-infix-node-left n) v)
+  (js2-visit-ast (js2-infix-node-right n) v))
+
+(defconst js2-operator-tokens
+  (let ((table (make-hash-table :test 'eq))
+        (tokens
+         (list (cons js2-IN "in")
+               (cons js2-TYPEOF "typeof")
+               (cons js2-INSTANCEOF "instanceof")
+               (cons js2-DELPROP "delete")
+               (cons js2-AWAIT "await")
+               (cons js2-VOID "void")
+               (cons js2-COMMA ",")
+               (cons js2-COLON ":")
+               (cons js2-OR "||")
+               (cons js2-AND "&&")
+               (cons js2-INC "++")
+               (cons js2-DEC "--")
+               (cons js2-BITOR "|")
+               (cons js2-BITXOR "^")
+               (cons js2-BITAND "&")
+               (cons js2-EQ "==")
+               (cons js2-NE "!=")
+               (cons js2-LT "<")
+               (cons js2-LE "<=")
+               (cons js2-GT ">")
+               (cons js2-GE ">=")
+               (cons js2-LSH "<<")
+               (cons js2-RSH ">>")
+               (cons js2-URSH ">>>")
+               (cons js2-ADD "+")       ; infix plus
+               (cons js2-SUB "-")       ; infix minus
+               (cons js2-MUL "*")
+               (cons js2-DIV "/")
+               (cons js2-MOD "%")
+               (cons js2-NOT "!")
+               (cons js2-BITNOT "~")
+               (cons js2-POS "+")       ; unary plus
+               (cons js2-NEG "-")       ; unary minus
+               (cons js2-TRIPLEDOT "...")
+               (cons js2-SHEQ "===")    ; shallow equality
+               (cons js2-SHNE "!==")    ; shallow inequality
+               (cons js2-ASSIGN "=")
+               (cons js2-ASSIGN_BITOR "|=")
+               (cons js2-ASSIGN_BITXOR "^=")
+               (cons js2-ASSIGN_BITAND "&=")
+               (cons js2-ASSIGN_LSH "<<=")
+               (cons js2-ASSIGN_RSH ">>=")
+               (cons js2-ASSIGN_URSH ">>>=")
+               (cons js2-ASSIGN_ADD "+=")
+               (cons js2-ASSIGN_SUB "-=")
+               (cons js2-ASSIGN_MUL "*=")
+               (cons js2-ASSIGN_DIV "/=")
+               (cons js2-ASSIGN_MOD "%="))))
+    (cl-loop for (k . v) in tokens do
+             (puthash k v table))
+    table))
+
+(defun js2-print-infix-node (n i)
+  (let* ((tt (js2-node-type n))
+         (op (gethash tt js2-operator-tokens)))
+    (unless op
+      (error "unrecognized infix operator %s" (js2-node-type n)))
+    (insert (js2-make-pad i))
+    (js2-print-ast (js2-infix-node-left n) 0)
+    (unless (= tt js2-COMMA)
+      (insert " "))
+    (insert op)
+    (insert " ")
+    (js2-print-ast (js2-infix-node-right n) 0)))
+
+(cl-defstruct (js2-assign-node
+               (:include js2-infix-node)
+               (:constructor nil)
+               (:constructor make-js2-assign-node (&key type
+                                                        (pos js2-ts-cursor)
+                                                        len op-pos
+                                                        left right)))
+  "Represents any assignment.
+The type field holds the actual assignment operator.")
+
+(put 'cl-struct-js2-assign-node 'js2-visitor 'js2-visit-infix-node)
+(put 'cl-struct-js2-assign-node 'js2-printer 'js2-print-infix-node)
+
+(cl-defstruct (js2-unary-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-unary-node (&key type ; required
+                                                       (pos js2-ts-cursor)
+                                                       len operand)))
+  "AST node type for unary operator nodes.
+The type field can be NOT, BITNOT, POS, NEG, INC, DEC,
+TYPEOF, DELPROP, TRIPLEDOT or AWAIT.  For INC or DEC, a 'postfix node
+property is added if the operator follows the operand."
+  operand)  ; a `js2-node' expression
+
+(put 'cl-struct-js2-unary-node 'js2-visitor 'js2-visit-unary-node)
+(put 'cl-struct-js2-unary-node 'js2-printer 'js2-print-unary-node)
+
+(defun js2-visit-unary-node (n v)
+  (js2-visit-ast (js2-unary-node-operand n) v))
+
+(defun js2-print-unary-node (n i)
+  (let* ((tt (js2-node-type n))
+         (op (gethash tt js2-operator-tokens))
+         (postfix (js2-node-get-prop n 'postfix)))
+    (unless op
+      (error "unrecognized unary operator %s" tt))
+    (insert (js2-make-pad i))
+    (unless postfix
+      (insert op))
+    (if (or (= tt js2-TYPEOF)
+            (= tt js2-DELPROP)
+            (= tt js2-AWAIT)
+            (= tt js2-VOID))
+        (insert " "))
+    (js2-print-ast (js2-unary-node-operand n) 0)
+    (when postfix
+      (insert op))))
+
+(cl-defstruct (js2-let-node
+               (:include js2-scope)
+               (:constructor nil)
+               (:constructor make-js2-let-node (&key (type js2-LETEXPR)
+                                                     (pos (js2-current-token-beg))
+                                                     len vars body
+                                                     lp rp)))
+  "AST node for a let expression or a let statement.
+Note that a let declaration such as let x=6, y=7 is a `js2-var-decl-node'."
+  vars   ; a `js2-var-decl-node'
+  body   ; a `js2-node' representing the expression or body block
+  lp
+  rp)
+
+(put 'cl-struct-js2-let-node 'js2-visitor 'js2-visit-let-node)
+(put 'cl-struct-js2-let-node 'js2-printer 'js2-print-let-node)
+
+(defun js2-visit-let-node (n v)
+  (js2-visit-ast (js2-let-node-vars n) v)
+  (js2-visit-ast (js2-let-node-body n) v))
+
+(defun js2-print-let-node (n i)
+  (insert (js2-make-pad i) "let (")
+  (let ((p (point)))
+    (js2-print-ast (js2-let-node-vars n) 0)
+    (delete-region p (+ p 4)))
+  (insert ") ")
+  (js2-print-ast (js2-let-node-body n) i))
+
+(cl-defstruct (js2-keyword-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-keyword-node (&key type
+                                                         (pos (js2-current-token-beg))
+                                                         (len (- js2-ts-cursor pos)))))
+  "AST node representing a literal keyword such as `null'.
+Used for `null', `this', `true', `false' and `debugger'.
+The node type is set to js2-NULL, js2-THIS, etc.")
+
+(put 'cl-struct-js2-keyword-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-keyword-node 'js2-printer 'js2-print-keyword-node)
+
+(defun js2-print-keyword-node (n i)
+  (insert (js2-make-pad i)
+          (let ((tt (js2-node-type n)))
+            (cond
+             ((= tt js2-THIS) "this")
+             ((= tt js2-SUPER) "super")
+             ((= tt js2-NULL) "null")
+             ((= tt js2-TRUE) "true")
+             ((= tt js2-FALSE) "false")
+             ((= tt js2-DEBUGGER) "debugger")
+             (t (error "Invalid keyword literal type: %d" tt))))))
+
+(defsubst js2-this-or-super-node-p (node)
+  "Return t if NODE is a `js2-literal-node' of type js2-THIS or js2-SUPER."
+  (let ((type (js2-node-type node)))
+    (or (eq type js2-THIS) (eq type js2-SUPER))))
+
+(cl-defstruct (js2-new-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-new-node (&key (type js2-NEW)
+                                                     (pos (js2-current-token-beg))
+                                                     len target
+                                                     args initializer
+                                                     lp rp)))
+  "AST node for new-expression such as new Foo()."
+  target  ; an identifier or reference
+  args    ; a Lisp list of argument nodes
+  lp      ; position of left-paren, nil if omitted
+  rp      ; position of right-paren, nil if omitted
+  initializer) ; experimental Rhino syntax:  optional `js2-object-node'
+
+(put 'cl-struct-js2-new-node 'js2-visitor 'js2-visit-new-node)
+(put 'cl-struct-js2-new-node 'js2-printer 'js2-print-new-node)
+
+(defun js2-visit-new-node (n v)
+  (js2-visit-ast (js2-new-node-target n) v)
+  (dolist (arg (js2-new-node-args n))
+    (js2-visit-ast arg v))
+  (js2-visit-ast (js2-new-node-initializer n) v))
+
+(defun js2-print-new-node (n i)
+  (insert (js2-make-pad i) "new ")
+  (js2-print-ast (js2-new-node-target n))
+  (insert "(")
+  (js2-print-list (js2-new-node-args n))
+  (insert ")")
+  (when (js2-new-node-initializer n)
+    (insert " ")
+    (js2-print-ast (js2-new-node-initializer n))))
+
+(cl-defstruct (js2-name-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-name-node (&key (type js2-NAME)
+                                                      (pos (js2-current-token-beg))
+                                                      (len (- js2-ts-cursor
+                                                              (js2-current-token-beg)))
+                                                      (name (js2-current-token-string)))))
+  "AST node for a JavaScript identifier"
+  name   ; a string
+  scope) ; a `js2-scope' (optional, used for codegen)
+
+(put 'cl-struct-js2-name-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-name-node 'js2-printer 'js2-print-name-node)
+
+(defun js2-print-name-node (n i)
+  (insert (js2-make-pad i)
+          (js2-name-node-name n)))
+
+(defsubst js2-name-node-length (node)
+  "Return identifier length of NODE, a `js2-name-node'.
+Returns 0 if NODE is nil or its identifier field is nil."
+  (if node
+      (length (js2-name-node-name node))
+    0))
+
+(cl-defstruct (js2-number-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-number-node (&key (type js2-NUMBER)
+                                                        (pos (js2-current-token-beg))
+                                                        (len (- js2-ts-cursor
+                                                                (js2-current-token-beg)))
+                                                        (value (js2-current-token-string))
+                                                        (num-value (js2-token-number
+                                                                    (js2-current-token)))
+                                                        (num-base (js2-token-number-base
+                                                                   (js2-current-token)))
+                                                        (legacy-octal-p (js2-token-number-legacy-octal-p
+                                                                         (js2-current-token))))))
+  "AST node for a number literal."
+  value      ; the original string, e.g. "6.02e23"
+  num-value  ; the parsed number value
+  num-base  ; the number's base
+  legacy-octal-p)  ; whether the number is a legacy octal (0123 instead of 0o123)
+
+(put 'cl-struct-js2-number-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-number-node 'js2-printer 'js2-print-number-node)
+
+(defun js2-print-number-node (n i)
+  (insert (js2-make-pad i)
+          (number-to-string (js2-number-node-num-value n))))
+
+(cl-defstruct (js2-regexp-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-regexp-node (&key (type js2-REGEXP)
+                                                        (pos (js2-current-token-beg))
+                                                        (len (- js2-ts-cursor
+                                                                (js2-current-token-beg)))
+                                                        value flags)))
+  "AST node for a regular expression literal."
+  value  ; the regexp string, without // delimiters
+  flags) ; a string of flags, e.g. `mi'.
+
+(put 'cl-struct-js2-regexp-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-regexp-node 'js2-printer 'js2-print-regexp)
+
+(defun js2-print-regexp (n i)
+  (insert (js2-make-pad i)
+          "/"
+          (js2-regexp-node-value n)
+          "/")
+  (if (js2-regexp-node-flags n)
+      (insert (js2-regexp-node-flags n))))
+
+(cl-defstruct (js2-string-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-string-node (&key (type js2-STRING)
+                                                        (pos (js2-current-token-beg))
+                                                        (len (- js2-ts-cursor
+                                                                (js2-current-token-beg)))
+                                                        (value (js2-current-token-string)))))
+  "String literal.
+Escape characters are not evaluated; e.g. \n is 2 chars in value field.
+You can tell the quote type by looking at the first character."
+  value) ; the characters of the string, including the quotes
+
+(put 'cl-struct-js2-string-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-string-node 'js2-printer 'js2-print-string-node)
+
+(defun js2-print-string-node (n i)
+  (insert (js2-make-pad i)
+          (js2-node-string n)))
+
+(cl-defstruct (js2-template-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-template-node (&key (type js2-TEMPLATE_HEAD)
+                                                          beg len kids)))
+  "Template literal."
+  kids)  ; `js2-string-node' is used for string segments, other nodes
+         ; for substitutions inside.
+
+(put 'cl-struct-js2-template-node 'js2-visitor 'js2-visit-template)
+(put 'cl-struct-js2-template-node 'js2-printer 'js2-print-template)
+
+(defun js2-visit-template (n callback)
+  (dolist (kid (js2-template-node-kids n))
+    (js2-visit-ast kid callback)))
+
+(defun js2-print-template (n i)
+  (insert (js2-make-pad i))
+  (dolist (kid (js2-template-node-kids n))
+    (if (js2-string-node-p kid)
+        (insert (js2-node-string kid))
+      (js2-print-ast kid))))
+
+(cl-defstruct (js2-tagged-template-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-tagged-template-node (&key (type js2-TAGGED_TEMPLATE)
+                                                                 beg len tag template)))
+  "Tagged template literal."
+  tag       ; `js2-node' with the tag expression.
+  template) ; `js2-template-node' with the template.
+
+(put 'cl-struct-js2-tagged-template-node 'js2-visitor 'js2-visit-tagged-template)
+(put 'cl-struct-js2-tagged-template-node 'js2-printer 'js2-print-tagged-template)
+
+(defun js2-visit-tagged-template (n callback)
+  (js2-visit-ast (js2-tagged-template-node-tag n) callback)
+  (js2-visit-ast (js2-tagged-template-node-template n) callback))
+
+(defun js2-print-tagged-template (n i)
+  (insert (js2-make-pad i))
+  (js2-print-ast (js2-tagged-template-node-tag n))
+  (js2-print-ast (js2-tagged-template-node-template n)))
+
+(cl-defstruct (js2-array-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-array-node (&key (type js2-ARRAYLIT)
+                                                       (pos js2-ts-cursor)
+                                                       len elems)))
+  "AST node for an array literal."
+  elems)  ; list of expressions.  [foo,,bar] yields a nil middle element.
+
+(put 'cl-struct-js2-array-node 'js2-visitor 'js2-visit-array-node)
+(put 'cl-struct-js2-array-node 'js2-printer 'js2-print-array-node)
+
+(defun js2-visit-array-node (n v)
+  (dolist (e (js2-array-node-elems n))
+    (js2-visit-ast e v)))  ; Can be nil; e.g. [a, ,b].
+
+(defun js2-print-array-node (n i)
+  (insert (js2-make-pad i) "[")
+  (let ((elems (js2-array-node-elems n)))
+    (js2-print-list elems)
+    (when (and elems (null (car (last elems))))
+      (insert ",")))
+  (insert "]"))
+
+(cl-defstruct (js2-object-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-object-node (&key (type js2-OBJECTLIT)
+                                                        (pos js2-ts-cursor)
+                                                        len
+                                                        elems)))
+  "AST node for an object literal expression.
+`elems' is a list of `js2-object-prop-node'."
+  elems)
+
+(put 'cl-struct-js2-object-node 'js2-visitor 'js2-visit-object-node)
+(put 'cl-struct-js2-object-node 'js2-printer 'js2-print-object-node)
+
+(defun js2-visit-object-node (n v)
+  (dolist (e (js2-object-node-elems n))
+    (js2-visit-ast e v)))
+
+(defun js2-print-object-node (n i)
+  (insert (js2-make-pad i) "{")
+  (js2-print-list (js2-object-node-elems n))
+  (insert "}"))
+
+(cl-defstruct (js2-class-node
+               (:include js2-object-node)
+               (:constructor nil)
+               (:constructor make-js2-class-node (&key (type js2-CLASS)
+                                                       (pos js2-ts-cursor)
+                                                       (form 'CLASS_STATEMENT)
+                                                       (name "")
+                                                       extends len elems)))
+  "AST node for an class expression.
+`elems' is a list of `js2-object-prop-node', and `extends' is an
+optional `js2-expr-node'"
+  form             ; CLASS_{STATEMENT|EXPRESSION}
+  name             ; class name (a `js2-node-name', or nil if anonymous)
+  extends          ; class heritage (a `js2-expr-node', or nil if none)
+  )
+
+(put 'cl-struct-js2-class-node 'js2-visitor 'js2-visit-class-node)
+(put 'cl-struct-js2-class-node 'js2-printer 'js2-print-class-node)
+
+(defun js2-visit-class-node (n v)
+  (js2-visit-ast (js2-class-node-name n) v)
+  (js2-visit-ast (js2-class-node-extends n) v)
+  (dolist (e (js2-class-node-elems n))
+    (js2-visit-ast e v)))
+
+(defun js2-print-class-node (n i)
+  (let* ((pad (js2-make-pad i))
+         (name (js2-class-node-name n))
+         (extends (js2-class-node-extends n))
+         (elems (js2-class-node-elems n)))
+    (insert pad "class")
+    (when name
+      (insert " ")
+      (js2-print-ast name 0))
+    (when extends
+      (insert " extends ")
+      (js2-print-ast extends))
+    (insert " {")
+    (dolist (elem elems)
+      (insert "\n")
+      (if (js2-node-get-prop elem 'STATIC)
+          (progn (insert (js2-make-pad (1+ i)) "static ")
+                 (js2-print-ast elem 0)) ;; TODO(sdh): indentation isn't quite right
+        (js2-print-ast elem (1+ i))))
+    (insert "\n" pad "}")))
+
+(cl-defstruct (js2-computed-prop-name-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-computed-prop-name-node
+                             (&key
+                              (type js2-LB)
+                              expr
+                              (pos (js2-current-token-beg))
+                              (len (- js2-ts-cursor
+                                      (js2-current-token-beg))))))
+  "AST node for a `ComputedPropertyName'."
+  expr)
+
+(put 'cl-struct-js2-computed-prop-name-node 'js2-visitor 'js2-visit-computed-prop-name-node)
+(put 'cl-struct-js2-computed-prop-name-node 'js2-printer 'js2-print-computed-prop-name-node)
+
+(defun js2-visit-computed-prop-name-node (n v)
+  (js2-visit-ast (js2-computed-prop-name-node-expr n) v))
+
+(defun js2-print-computed-prop-name-node (n i)
+  (insert (js2-make-pad i) "[")
+  (js2-print-ast (js2-computed-prop-name-node-expr n) 0)
+  (insert "]"))
+
+(cl-defstruct (js2-object-prop-node
+               (:include js2-infix-node)
+               (:constructor nil)
+               (:constructor make-js2-object-prop-node (&key (type js2-COLON)
+                                                             (pos js2-ts-cursor)
+                                                             len left
+                                                             right op-pos)))
+  "AST node for an object literal prop:value entry.
+The `left' field is the property: a name node, string node,
+number node or expression node.  The `right' field is a
+`js2-node' representing the initializer value.  If the property
+is abbreviated, the node's `SHORTHAND' property is non-nil and
+both fields have the same value.")
+
+(put 'cl-struct-js2-object-prop-node 'js2-visitor 'js2-visit-infix-node)
+(put 'cl-struct-js2-object-prop-node 'js2-printer 'js2-print-object-prop-node)
+
+(defun js2-print-object-prop-node (n i)
+  (let* ((left (js2-object-prop-node-left n))
+         (right (js2-object-prop-node-right n)))
+    (js2-print-ast left i)
+    (if (not (js2-node-get-prop n 'SHORTHAND))
+        (progn
+          (insert ": ")
+          (js2-print-ast right 0)))))
+
+(cl-defstruct (js2-method-node
+               (:include js2-infix-node)
+               (:constructor nil)
+               (:constructor make-js2-method-node (&key (pos js2-ts-cursor)
+                                                        len left right)))
+  "AST node for a method in an object literal or a class body.
+The `left' field is the `js2-name-node' naming the method.
+The `right' field is always an anonymous `js2-function-node' with a node
+property `METHOD_TYPE' set to 'GET or 'SET. ")
+
+(put 'cl-struct-js2-method-node 'js2-visitor 'js2-visit-infix-node)
+(put 'cl-struct-js2-method-node 'js2-printer 'js2-print-method)
+
+(defun js2-print-method (n i)
+  (let* ((pad (js2-make-pad i))
+         (left (js2-method-node-left n))
+         (right (js2-method-node-right n))
+         (type (js2-node-get-prop right 'METHOD_TYPE)))
+    (insert pad)
+    (when type
+      (insert (cdr (assoc type '((GET . "get ")
+                                 (SET . "set ")
+                                 (ASYNC . "async ")
+                                 (FUNCTION . ""))))))
+    (when (and (js2-function-node-p right)
+               (eq 'STAR (js2-function-node-generator-type right)))
+      (insert "*"))
+    (js2-print-ast left 0)
+    (js2-print-ast right 0)))
+
+(cl-defstruct (js2-prop-get-node
+               (:include js2-infix-node)
+               (:constructor nil)
+               (:constructor make-js2-prop-get-node (&key (type js2-GETPROP)
+                                                          (pos js2-ts-cursor)
+                                                          len left right)))
+  "AST node for a dotted property reference, e.g. foo.bar or foo().bar")
+
+(put 'cl-struct-js2-prop-get-node 'js2-visitor 'js2-visit-prop-get-node)
+(put 'cl-struct-js2-prop-get-node 'js2-printer 'js2-print-prop-get-node)
+
+(defun js2-visit-prop-get-node (n v)
+  (js2-visit-ast (js2-prop-get-node-left n) v)
+  (js2-visit-ast (js2-prop-get-node-right n) v))
+
+(defun js2-print-prop-get-node (n i)
+  (insert (js2-make-pad i))
+  (js2-print-ast (js2-prop-get-node-left n) 0)
+  (insert ".")
+  (js2-print-ast (js2-prop-get-node-right n) 0))
+
+(cl-defstruct (js2-elem-get-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-elem-get-node (&key (type js2-GETELEM)
+                                                          (pos js2-ts-cursor)
+                                                          len target element
+                                                          lb rb)))
+  "AST node for an array index expression such as foo[bar]."
+  target  ; a `js2-node' - the expression preceding the "."
+  element ; a `js2-node' - the expression in brackets
+  lb      ; position of left-bracket, nil if omitted
+  rb)     ; position of right-bracket, nil if omitted
+
+(put 'cl-struct-js2-elem-get-node 'js2-visitor 'js2-visit-elem-get-node)
+(put 'cl-struct-js2-elem-get-node 'js2-printer 'js2-print-elem-get-node)
+
+(defun js2-visit-elem-get-node (n v)
+  (js2-visit-ast (js2-elem-get-node-target n) v)
+  (js2-visit-ast (js2-elem-get-node-element n) v))
+
+(defun js2-print-elem-get-node (n i)
+  (insert (js2-make-pad i))
+  (js2-print-ast (js2-elem-get-node-target n) 0)
+  (insert "[")
+  (js2-print-ast (js2-elem-get-node-element n) 0)
+  (insert "]"))
+
+(cl-defstruct (js2-call-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-call-node (&key (type js2-CALL)
+                                                      (pos js2-ts-cursor)
+                                                      len target args
+                                                      lp rp)))
+  "AST node for a JavaScript function call."
+  target  ; a `js2-node' evaluating to the function to call
+  args  ; a Lisp list of `js2-node' arguments
+  lp    ; position of open-paren, or nil if missing
+  rp)   ; position of close-paren, or nil if missing
+
+(put 'cl-struct-js2-call-node 'js2-visitor 'js2-visit-call-node)
+(put 'cl-struct-js2-call-node 'js2-printer 'js2-print-call-node)
+
+(defun js2-visit-call-node (n v)
+  (js2-visit-ast (js2-call-node-target n) v)
+  (dolist (arg (js2-call-node-args n))
+    (js2-visit-ast arg v)))
+
+(defun js2-print-call-node (n i)
+  (insert (js2-make-pad i))
+  (js2-print-ast (js2-call-node-target n) 0)
+  (insert "(")
+  (js2-print-list (js2-call-node-args n))
+  (insert ")"))
+
+(cl-defstruct (js2-yield-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-yield-node (&key (type js2-YIELD)
+                                                       (pos js2-ts-cursor)
+                                                       len value star-p)))
+  "AST node for yield statement or expression."
+  star-p ; whether it's yield*
+  value) ; optional:  value to be yielded
+
+(put 'cl-struct-js2-yield-node 'js2-visitor 'js2-visit-yield-node)
+(put 'cl-struct-js2-yield-node 'js2-printer 'js2-print-yield-node)
+
+(defun js2-visit-yield-node (n v)
+  (js2-visit-ast (js2-yield-node-value n) v))
+
+(defun js2-print-yield-node (n i)
+  (insert (js2-make-pad i))
+  (insert "yield")
+  (when (js2-yield-node-star-p n)
+    (insert "*"))
+  (when (js2-yield-node-value n)
+    (insert " ")
+    (js2-print-ast (js2-yield-node-value n) 0)))
+
+(cl-defstruct (js2-paren-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-paren-node (&key (type js2-LP)
+                                                       (pos js2-ts-cursor)
+                                                       len expr)))
+  "AST node for a parenthesized expression.
+In particular, used when the parens are syntactically optional,
+as opposed to required parens such as those enclosing an if-conditional."
+  expr)   ; `js2-node'
+
+(put 'cl-struct-js2-paren-node 'js2-visitor 'js2-visit-paren-node)
+(put 'cl-struct-js2-paren-node 'js2-printer 'js2-print-paren-node)
+
+(defun js2-visit-paren-node (n v)
+  (js2-visit-ast (js2-paren-node-expr n) v))
+
+(defun js2-print-paren-node (n i)
+  (insert (js2-make-pad i))
+  (insert "(")
+  (js2-print-ast (js2-paren-node-expr n) 0)
+  (insert ")"))
+
+(cl-defstruct (js2-comp-node
+               (:include js2-scope)
+               (:constructor nil)
+               (:constructor make-js2-comp-node (&key (type js2-ARRAYCOMP)
+                                                      (pos js2-ts-cursor)
+                                                      len result
+                                                      loops filters
+                                                      form)))
+  "AST node for an Array comprehension such as [[x,y] for (x in foo) for (y in bar)]."
+  result  ; result expression (just after left-bracket)
+  loops   ; a Lisp list of `js2-comp-loop-node'
+  filters ; a Lisp list of guard/filter expressions
+  form    ; ARRAY, LEGACY_ARRAY or STAR_GENERATOR
+          ; SpiderMonkey also supports "legacy generator expressions", but we dont.
+  )
+
+(put 'cl-struct-js2-comp-node 'js2-visitor 'js2-visit-comp-node)
+(put 'cl-struct-js2-comp-node 'js2-printer 'js2-print-comp-node)
+
+(defun js2-visit-comp-node (n v)
+  (js2-visit-ast (js2-comp-node-result n) v)
+  (dolist (l (js2-comp-node-loops n))
+    (js2-visit-ast l v))
+  (dolist (f (js2-comp-node-filters n))
+    (js2-visit-ast f v)))
+
+(defun js2-print-comp-node (n i)
+  (let ((pad (js2-make-pad i))
+        (result (js2-comp-node-result n))
+        (loops (js2-comp-node-loops n))
+        (filters (js2-comp-node-filters n))
+        (legacy-p (eq (js2-comp-node-form n) 'LEGACY_ARRAY))
+        (gen-p (eq (js2-comp-node-form n) 'STAR_GENERATOR)))
+    (insert pad (if gen-p "(" "["))
+    (when legacy-p
+      (js2-print-ast result 0))
+    (dolist (l loops)
+      (when legacy-p
+        (insert " "))
+      (js2-print-ast l 0)
+      (unless legacy-p
+        (insert " ")))
+    (dolist (f filters)
+      (when legacy-p
+        (insert " "))
+      (insert "if (")
+      (js2-print-ast f 0)
+      (insert ")")
+      (unless legacy-p
+        (insert " ")))
+    (unless legacy-p
+      (js2-print-ast result 0))
+    (insert (if gen-p ")" "]"))))
+
+(cl-defstruct (js2-comp-loop-node
+               (:include js2-for-in-node)
+               (:constructor nil)
+               (:constructor make-js2-comp-loop-node (&key (type js2-FOR)
+                                                           (pos js2-ts-cursor)
+                                                           len iterator
+                                                           object in-pos
+                                                           foreach-p
+                                                           each-pos
+                                                           forof-p
+                                                           lp rp)))
+  "AST subtree for each 'for (foo in bar)' loop in an array comprehension.")
+
+(put 'cl-struct-js2-comp-loop-node 'js2-visitor 'js2-visit-comp-loop)
+(put 'cl-struct-js2-comp-loop-node 'js2-printer 'js2-print-comp-loop)
+
+(defun js2-visit-comp-loop (n v)
+  (js2-visit-ast (js2-comp-loop-node-iterator n) v)
+  (js2-visit-ast (js2-comp-loop-node-object n) v))
+
+(defun js2-print-comp-loop (n _i)
+  (insert "for ")
+  (when (js2-comp-loop-node-foreach-p n) (insert "each "))
+  (insert "(")
+  (js2-print-ast (js2-comp-loop-node-iterator n) 0)
+  (insert (if (js2-comp-loop-node-forof-p n)
+              " of " " in "))
+  (js2-print-ast (js2-comp-loop-node-object n) 0)
+  (insert ")"))
+
+(cl-defstruct (js2-empty-expr-node
+               (:include js2-node)
+               (:constructor nil)
+               (:constructor make-js2-empty-expr-node (&key (type js2-EMPTY)
+                                                            (pos (js2-current-token-beg))
+                                                            len)))
+  "AST node for an empty expression.")
+
+(put 'cl-struct-js2-empty-expr-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-empty-expr-node 'js2-printer 'js2-print-none)
+
+(cl-defstruct (js2-xml-node
+               (:include js2-block-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-node (&key (type js2-XML)
+                                                     (pos (js2-current-token-beg))
+                                                     len kids)))
+  "AST node for initial parse of E4X literals.
+The kids field is a list of XML fragments, each a `js2-string-node' or
+a `js2-xml-js-expr-node'.  Equivalent to Rhino's XmlLiteral node.")
+
+(put 'cl-struct-js2-xml-node 'js2-visitor 'js2-visit-block)
+(put 'cl-struct-js2-xml-node 'js2-printer 'js2-print-xml-node)
+
+(defun js2-print-xml-node (n i)
+  (dolist (kid (js2-xml-node-kids n))
+    (js2-print-ast kid i)))
+
+(cl-defstruct (js2-xml-js-expr-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-js-expr-node (&key (type js2-XML)
+                                                             (pos js2-ts-cursor)
+                                                             len expr)))
+  "AST node for an embedded JavaScript {expression} in an E4X literal.
+The start and end fields correspond to the curly-braces."
+  expr)  ; a `js2-expr-node' of some sort
+
+(put 'cl-struct-js2-xml-js-expr-node 'js2-visitor 'js2-visit-xml-js-expr)
+(put 'cl-struct-js2-xml-js-expr-node 'js2-printer 'js2-print-xml-js-expr)
+
+(defun js2-visit-xml-js-expr (n v)
+  (js2-visit-ast (js2-xml-js-expr-node-expr n) v))
+
+(defun js2-print-xml-js-expr (n i)
+  (insert (js2-make-pad i))
+  (insert "{")
+  (js2-print-ast (js2-xml-js-expr-node-expr n) 0)
+  (insert "}"))
+
+(cl-defstruct (js2-xml-dot-query-node
+               (:include js2-infix-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-dot-query-node (&key (type js2-DOTQUERY)
+                                                               (pos js2-ts-cursor)
+                                                               op-pos len left
+                                                               right rp)))
+  "AST node for an E4X foo.(bar) filter expression.
+Note that the left-paren is automatically the character immediately
+following the dot (.) in the operator.  No whitespace is permitted
+between the dot and the lp by the scanner."
+  rp)
+
+(put 'cl-struct-js2-xml-dot-query-node 'js2-visitor 'js2-visit-infix-node)
+(put 'cl-struct-js2-xml-dot-query-node 'js2-printer 'js2-print-xml-dot-query)
+
+(defun js2-print-xml-dot-query (n i)
+  (insert (js2-make-pad i))
+  (js2-print-ast (js2-xml-dot-query-node-left n) 0)
+  (insert ".(")
+  (js2-print-ast (js2-xml-dot-query-node-right n) 0)
+  (insert ")"))
+
+(cl-defstruct (js2-xml-ref-node
+               (:include js2-node)
+               (:constructor nil))  ; abstract
+  "Base type for E4X XML attribute-access or property-get expressions.
+Such expressions can take a variety of forms.  The general syntax has
+three parts:
+
+  - (optional) an @ (specifying an attribute access)
+  - (optional) a namespace (a `js2-name-node') and double-colon
+  - (required) either a `js2-name-node' or a bracketed [expression]
+
+The property-name expressions (examples:  ns::name, @name) are
+represented as `js2-xml-prop-ref' nodes.  The bracketed-expression
+versions (examples:  ns::[name], @[name]) become `js2-xml-elem-ref' nodes.
+
+This node type (or more specifically, its subclasses) will sometimes
+be the right-hand child of a `js2-prop-get-node' or a
+`js2-infix-node' of type `js2-DOTDOT', the .. xml-descendants operator.
+The `js2-xml-ref-node' may also be a standalone primary expression with
+no explicit target, which is valid in certain expression contexts such as
+
+  company..employee.(@id < 100)
+
+in this case, the @id is a `js2-xml-ref' that is part of an infix '<'
+expression whose parent is a `js2-xml-dot-query-node'."
+  namespace
+  at-pos
+  colon-pos)
+
+(defsubst js2-xml-ref-node-attr-access-p (node)
+  "Return non-nil if this expression began with an @-token."
+  (and (numberp (js2-xml-ref-node-at-pos node))
+       (cl-plusp (js2-xml-ref-node-at-pos node))))
+
+(cl-defstruct (js2-xml-prop-ref-node
+               (:include js2-xml-ref-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-prop-ref-node (&key (type js2-REF_NAME)
+                                                              (pos (js2-current-token-beg))
+                                                              len propname
+                                                              namespace at-pos
+                                                              colon-pos)))
+  "AST node for an E4X XML [expr] property-ref expression.
+The JavaScript syntax is an optional @, an optional ns::, and a name.
+
+  [ '@' ] [ name '::' ] name
+
+Examples include name, ns::name, ns::*, *::name, *::*, @attr, @ns::attr,
+@ns::*, @*::attr, @*::*, and @*.
+
+The node starts at the @ token, if present.  Otherwise it starts at the
+namespace name.  The node bounds extend through the closing right-bracket,
+or if it is missing due to a syntax error, through the end of the index
+expression."
+  propname)
+
+(put 'cl-struct-js2-xml-prop-ref-node 'js2-visitor 'js2-visit-xml-prop-ref-node)
+(put 'cl-struct-js2-xml-prop-ref-node 'js2-printer 'js2-print-xml-prop-ref-node)
+
+(defun js2-visit-xml-prop-ref-node (n v)
+  (js2-visit-ast (js2-xml-prop-ref-node-namespace n) v)
+  (js2-visit-ast (js2-xml-prop-ref-node-propname n) v))
+
+(defun js2-print-xml-prop-ref-node (n i)
+  (insert (js2-make-pad i))
+  (if (js2-xml-ref-node-attr-access-p n)
+      (insert "@"))
+  (when (js2-xml-prop-ref-node-namespace n)
+    (js2-print-ast (js2-xml-prop-ref-node-namespace n) 0)
+    (insert "::"))
+  (if (js2-xml-prop-ref-node-propname n)
+      (js2-print-ast (js2-xml-prop-ref-node-propname n) 0)))
+
+(cl-defstruct (js2-xml-elem-ref-node
+               (:include js2-xml-ref-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-elem-ref-node (&key (type js2-REF_MEMBER)
+                                                              (pos (js2-current-token-beg))
+                                                              len expr lb rb
+                                                              namespace at-pos
+                                                              colon-pos)))
+  "AST node for an E4X XML [expr] member-ref expression.
+Syntax:
+
+ [ '@' ] [ name '::' ] '[' expr ']'
+
+Examples include ns::[expr], @ns::[expr], @[expr], *::[expr] and @*::[expr].
+
+Note that the form [expr] (i.e. no namespace or attribute-qualifier)
+is not a legal E4X XML element-ref expression, since it's already used
+for standard JavaScript element-get array indexing.  Hence, a
+`js2-xml-elem-ref-node' always has either the attribute-qualifier, a
+non-nil namespace node, or both.
+
+The node starts at the @ token, if present.  Otherwise it starts
+at the namespace name.  The node bounds extend through the closing
+right-bracket, or if it is missing due to a syntax error, through the
+end of the index expression."
+  expr  ; the bracketed index expression
+  lb
+  rb)
+
+(put 'cl-struct-js2-xml-elem-ref-node 'js2-visitor 'js2-visit-xml-elem-ref-node)
+(put 'cl-struct-js2-xml-elem-ref-node 'js2-printer 'js2-print-xml-elem-ref-node)
+
+(defun js2-visit-xml-elem-ref-node (n v)
+  (js2-visit-ast (js2-xml-elem-ref-node-namespace n) v)
+  (js2-visit-ast (js2-xml-elem-ref-node-expr n) v))
+
+(defun js2-print-xml-elem-ref-node (n i)
+  (insert (js2-make-pad i))
+  (if (js2-xml-ref-node-attr-access-p n)
+      (insert "@"))
+  (when (js2-xml-elem-ref-node-namespace n)
+    (js2-print-ast (js2-xml-elem-ref-node-namespace n) 0)
+    (insert "::"))
+  (insert "[")
+  (if (js2-xml-elem-ref-node-expr n)
+      (js2-print-ast (js2-xml-elem-ref-node-expr n) 0))
+  (insert "]"))
+
+;;; Placeholder nodes for when we try parsing the XML literals structurally.
+
+(cl-defstruct (js2-xml-start-tag-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-start-tag-node (&key (type js2-XML)
+                                                               (pos js2-ts-cursor)
+                                                               len name attrs kids
+                                                               empty-p)))
+  "AST node for an XML start-tag.  Not currently used.
+The `kids' field is a Lisp list of child content nodes."
+  name      ; a `js2-xml-name-node'
+  attrs     ; a Lisp list of `js2-xml-attr-node'
+  empty-p)  ; t if this is an empty element such as <foo bar="baz"/>
+
+(put 'cl-struct-js2-xml-start-tag-node 'js2-visitor 'js2-visit-xml-start-tag)
+(put 'cl-struct-js2-xml-start-tag-node 'js2-printer 'js2-print-xml-start-tag)
+
+(defun js2-visit-xml-start-tag (n v)
+  (js2-visit-ast (js2-xml-start-tag-node-name n) v)
+  (dolist (attr (js2-xml-start-tag-node-attrs n))
+    (js2-visit-ast attr v))
+  (js2-visit-block n v))
+
+(defun js2-print-xml-start-tag (n i)
+  (insert (js2-make-pad i) "<")
+  (js2-print-ast (js2-xml-start-tag-node-name n) 0)
+  (when (js2-xml-start-tag-node-attrs n)
+    (insert " ")
+    (js2-print-list (js2-xml-start-tag-node-attrs n) " "))
+  (insert ">"))
+
+;; I -think- I'm going to make the parent node the corresponding start-tag,
+;; and add the end-tag to the kids list of the parent as well.
+(cl-defstruct (js2-xml-end-tag-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-end-tag-node (&key (type js2-XML)
+                                                             (pos js2-ts-cursor)
+                                                             len name)))
+  "AST node for an XML end-tag.  Not currently used."
+  name)  ; a `js2-xml-name-node'
+
+(put 'cl-struct-js2-xml-end-tag-node 'js2-visitor 'js2-visit-xml-end-tag)
+(put 'cl-struct-js2-xml-end-tag-node 'js2-printer 'js2-print-xml-end-tag)
+
+(defun js2-visit-xml-end-tag (n v)
+  (js2-visit-ast (js2-xml-end-tag-node-name n) v))
+
+(defun js2-print-xml-end-tag (n i)
+  (insert (js2-make-pad i))
+  (insert "</")
+  (js2-print-ast (js2-xml-end-tag-node-name n) 0)
+  (insert ">"))
+
+(cl-defstruct (js2-xml-name-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-name-node (&key (type js2-XML)
+                                                          (pos js2-ts-cursor)
+                                                          len namespace kids)))
+  "AST node for an E4X XML name.  Not currently used.
+Any XML name can be qualified with a namespace, hence the namespace field.
+Further, any E4X name can be comprised of arbitrary JavaScript {} expressions.
+The kids field is a list of `js2-name-node' and `js2-xml-js-expr-node'.
+For a simple name, the kids list has exactly one node, a `js2-name-node'."
+  namespace)  ; a `js2-string-node'
+
+(put 'cl-struct-js2-xml-name-node 'js2-visitor 'js2-visit-xml-name-node)
+(put 'cl-struct-js2-xml-name-node 'js2-printer 'js2-print-xml-name-node)
+
+(defun js2-visit-xml-name-node (n v)
+  (js2-visit-ast (js2-xml-name-node-namespace n) v))
+
+(defun js2-print-xml-name-node (n i)
+  (insert (js2-make-pad i))
+  (when (js2-xml-name-node-namespace n)
+    (js2-print-ast (js2-xml-name-node-namespace n) 0)
+    (insert "::"))
+  (dolist (kid (js2-xml-name-node-kids n))
+    (js2-print-ast kid 0)))
+
+(cl-defstruct (js2-xml-pi-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-pi-node (&key (type js2-XML)
+                                                        (pos js2-ts-cursor)
+                                                        len name attrs)))
+  "AST node for an E4X XML processing instruction.  Not currently used."
+  name   ; a `js2-xml-name-node'
+  attrs) ; a list of `js2-xml-attr-node'
+
+(put 'cl-struct-js2-xml-pi-node 'js2-visitor 'js2-visit-xml-pi-node)
+(put 'cl-struct-js2-xml-pi-node 'js2-printer 'js2-print-xml-pi-node)
+
+(defun js2-visit-xml-pi-node (n v)
+  (js2-visit-ast (js2-xml-pi-node-name n) v)
+  (dolist (attr (js2-xml-pi-node-attrs n))
+    (js2-visit-ast attr v)))
+
+(defun js2-print-xml-pi-node (n i)
+  (insert (js2-make-pad i) "<?")
+  (js2-print-ast (js2-xml-pi-node-name n))
+  (when (js2-xml-pi-node-attrs n)
+    (insert " ")
+    (js2-print-list (js2-xml-pi-node-attrs n)))
+  (insert "?>"))
+
+(cl-defstruct (js2-xml-cdata-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-cdata-node (&key (type js2-XML)
+                                                           (pos js2-ts-cursor)
+                                                           len content)))
+  "AST node for a CDATA escape section.  Not currently used."
+  content)  ; a `js2-string-node' with node-property 'quote-type 'cdata
+
+(put 'cl-struct-js2-xml-cdata-node 'js2-visitor 'js2-visit-xml-cdata-node)
+(put 'cl-struct-js2-xml-cdata-node 'js2-printer 'js2-print-xml-cdata-node)
+
+(defun js2-visit-xml-cdata-node (n v)
+  (js2-visit-ast (js2-xml-cdata-node-content n) v))
+
+(defun js2-print-xml-cdata-node (n i)
+  (insert (js2-make-pad i))
+  (js2-print-ast (js2-xml-cdata-node-content n)))
+
+(cl-defstruct (js2-xml-attr-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-attr-node (&key (type js2-XML)
+                                                      (pos js2-ts-cursor)
+                                                      len name value
+                                                      eq-pos quote-type)))
+  "AST node representing a foo='bar' XML attribute value.  Not yet used."
+  name   ; a `js2-xml-name-node'
+  value  ; a `js2-xml-name-node'
+  eq-pos ; buffer position of "=" sign
+  quote-type) ; 'single or 'double
+
+(put 'cl-struct-js2-xml-attr-node 'js2-visitor 'js2-visit-xml-attr-node)
+(put 'cl-struct-js2-xml-attr-node 'js2-printer 'js2-print-xml-attr-node)
+
+(defun js2-visit-xml-attr-node (n v)
+  (js2-visit-ast (js2-xml-attr-node-name n) v)
+  (js2-visit-ast (js2-xml-attr-node-value n) v))
+
+(defun js2-print-xml-attr-node (n i)
+  (let ((quote (if (eq (js2-xml-attr-node-quote-type n) 'single)
+                   "'"
+                 "\"")))
+    (insert (js2-make-pad i))
+    (js2-print-ast (js2-xml-attr-node-name n) 0)
+    (insert "=" quote)
+    (js2-print-ast (js2-xml-attr-node-value n) 0)
+    (insert quote)))
+
+(cl-defstruct (js2-xml-text-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-text-node (&key (type js2-XML)
+                                                      (pos js2-ts-cursor)
+                                                      len content)))
+  "AST node for an E4X XML text node.  Not currently used."
+  content)  ; a Lisp list of `js2-string-node' and `js2-xml-js-expr-node'
+
+(put 'cl-struct-js2-xml-text-node 'js2-visitor 'js2-visit-xml-text-node)
+(put 'cl-struct-js2-xml-text-node 'js2-printer 'js2-print-xml-text-node)
+
+(defun js2-visit-xml-text-node (n v)
+  (js2-visit-ast (js2-xml-text-node-content n) v))
+
+(defun js2-print-xml-text-node (n i)
+  (insert (js2-make-pad i))
+  (dolist (kid (js2-xml-text-node-content n))
+    (js2-print-ast kid)))
+
+(cl-defstruct (js2-xml-comment-node
+               (:include js2-xml-node)
+               (:constructor nil)
+               (:constructor make-js2-xml-comment-node (&key (type js2-XML)
+                                                             (pos js2-ts-cursor)
+                                                             len)))
+  "AST node for E4X XML comment.  Not currently used.")
+
+(put 'cl-struct-js2-xml-comment-node 'js2-visitor 'js2-visit-none)
+(put 'cl-struct-js2-xml-comment-node 'js2-printer 'js2-print-xml-comment)
+
+(defun js2-print-xml-comment (n i)
+  (insert (js2-make-pad i)
+          (js2-node-string n)))
+
+;;; Node utilities
+
+(defsubst js2-node-line (n)
+  "Fetch the source line number at the start of node N.
+This is O(n) in the length of the source buffer; use prudently."
+  (1+ (count-lines (point-min) (js2-node-abs-pos n))))
+
+(defsubst js2-block-node-kid (n i)
+  "Return child I of node N, or nil if there aren't that many."
+  (nth i (js2-block-node-kids n)))
+
+(defsubst js2-block-node-first (n)
+  "Return first child of block node N, or nil if there is none."
+  (cl-first (js2-block-node-kids n)))
+
+(defun js2-node-root (n)
+  "Return the root of the AST containing N.
+If N has no parent pointer, returns N."
+  (let ((parent (js2-node-parent n)))
+    (if parent
+        (js2-node-root parent)
+      n)))
+
+(defsubst js2-node-short-name (n)
+  "Return the short name of node N as a string, e.g. `js2-if-node'."
+  (substring (symbol-name (aref n 0))
+             (length "cl-struct-")))
+
+(defun js2-node-child-list (node)
+  "Return the child list for NODE, a Lisp list of nodes.
+Works for block nodes, array nodes, obj literals, funarg lists,
+var decls and try nodes (for catch clauses).  Note that you should call
+`js2-block-node-kids' on the function body for the body statements.
+Returns nil for zero-length child lists or unsupported nodes."
+  (cond
+   ((js2-function-node-p node)
+    (js2-function-node-params node))
+   ((js2-block-node-p node)
+    (js2-block-node-kids node))
+   ((js2-try-node-p node)
+    (js2-try-node-catch-clauses node))
+   ((js2-array-node-p node)
+    (js2-array-node-elems node))
+   ((js2-object-node-p node)
+    (js2-object-node-elems node))
+   ((js2-call-node-p node)
+    (js2-call-node-args node))
+   ((js2-new-node-p node)
+    (js2-new-node-args node))
+   ((js2-var-decl-node-p node)
+    (js2-var-decl-node-kids node))
+   (t
+    nil)))
+
+(defun js2-node-set-child-list (node kids)
+  "Set the child list for NODE to KIDS."
+   (cond
+    ((js2-function-node-p node)
+     (setf (js2-function-node-params node) kids))
+    ((js2-block-node-p node)
+     (setf (js2-block-node-kids node) kids))
+    ((js2-try-node-p node)
+     (setf (js2-try-node-catch-clauses node) kids))
+    ((js2-array-node-p node)
+     (setf (js2-array-node-elems node) kids))
+    ((js2-object-node-p node)
+     (setf (js2-object-node-elems node) kids))
+    ((js2-call-node-p node)
+     (setf (js2-call-node-args node) kids))
+    ((js2-new-node-p node)
+     (setf (js2-new-node-args node) kids))
+    ((js2-var-decl-node-p node)
+     (setf (js2-var-decl-node-kids node) kids))
+    (t
+     (error "Unsupported node type: %s" (js2-node-short-name node))))
+   kids)
+
+;; All because Common Lisp doesn't support multiple inheritance for defstructs.
+(defconst js2-paren-expr-nodes
+  '(cl-struct-js2-comp-loop-node
+    cl-struct-js2-comp-node
+    cl-struct-js2-call-node
+    cl-struct-js2-catch-node
+    cl-struct-js2-do-node
+    cl-struct-js2-elem-get-node
+    cl-struct-js2-for-in-node
+    cl-struct-js2-for-node
+    cl-struct-js2-function-node
+    cl-struct-js2-if-node
+    cl-struct-js2-let-node
+    cl-struct-js2-new-node
+    cl-struct-js2-paren-node
+    cl-struct-js2-switch-node
+    cl-struct-js2-while-node
+    cl-struct-js2-with-node
+    cl-struct-js2-xml-dot-query-node)
+  "Node types that can have a parenthesized child expression.
+In particular, nodes that respond to `js2-node-lp' and `js2-node-rp'.")
+
+(defsubst js2-paren-expr-node-p (node)
+  "Return t for nodes that typically have a parenthesized child expression.
+Useful for computing the indentation anchors for arg-lists and conditions.
+Note that it may return a false positive, for instance when NODE is
+a `js2-new-node' and there are no arguments or parentheses."
+  (memq (aref node 0) js2-paren-expr-nodes))
+
+;; Fake polymorphism... yech.
+(defun js2-node-lp (node)
+  "Return relative left-paren position for NODE, if applicable.
+For `js2-elem-get-node' structs, returns left-bracket position.
+Note that the position may be nil in the case of a parse error."
+  (cond
+   ((js2-elem-get-node-p node)
+    (js2-elem-get-node-lb node))
+   ((js2-loop-node-p node)
+    (js2-loop-node-lp node))
+   ((js2-function-node-p node)
+    (js2-function-node-lp node))
+   ((js2-if-node-p node)
+    (js2-if-node-lp node))
+   ((js2-new-node-p node)
+    (js2-new-node-lp node))
+   ((js2-call-node-p node)
+    (js2-call-node-lp node))
+   ((js2-paren-node-p node)
+    0)
+   ((js2-switch-node-p node)
+    (js2-switch-node-lp node))
+   ((js2-catch-node-p node)
+    (js2-catch-node-lp node))
+   ((js2-let-node-p node)
+    (js2-let-node-lp node))
+   ((js2-comp-node-p node)
+    0)
+   ((js2-with-node-p node)
+    (js2-with-node-lp node))
+   ((js2-xml-dot-query-node-p node)
+    (1+ (js2-infix-node-op-pos node)))
+   (t
+    (error "Unsupported node type: %s" (js2-node-short-name node)))))
+
+;; Fake polymorphism... blech.
+(defun js2-node-rp (node)
+  "Return relative right-paren position for NODE, if applicable.
+For `js2-elem-get-node' structs, returns right-bracket position.
+Note that the position may be nil in the case of a parse error."
+  (cond
+   ((js2-elem-get-node-p node)
+    (js2-elem-get-node-rb node))
+   ((js2-loop-node-p node)
+    (js2-loop-node-rp node))
+   ((js2-function-node-p node)
+    (js2-function-node-rp node))
+   ((js2-if-node-p node)
+    (js2-if-node-rp node))
+   ((js2-new-node-p node)
+    (js2-new-node-rp node))
+   ((js2-call-node-p node)
+    (js2-call-node-rp node))
+   ((js2-paren-node-p node)
+    (1- (js2-node-len node)))
+   ((js2-switch-node-p node)
+    (js2-switch-node-rp node))
+   ((js2-catch-node-p node)
+    (js2-catch-node-rp node))
+   ((js2-let-node-p node)
+    (js2-let-node-rp node))
+   ((js2-comp-node-p node)
+    (1- (js2-node-len node)))
+   ((js2-with-node-p node)
+    (js2-with-node-rp node))
+   ((js2-xml-dot-query-node-p node)
+    (1+ (js2-xml-dot-query-node-rp node)))
+   (t
+    (error "Unsupported node type: %s" (js2-node-short-name node)))))
+
+(defsubst js2-node-first-child (node)
+  "Return the first element of `js2-node-child-list' for NODE."
+  (car (js2-node-child-list node)))
+
+(defsubst js2-node-last-child (node)
+  "Return the last element of `js2-node-last-child' for NODE."
+  (car (last (js2-node-child-list node))))
+
+(defun js2-node-prev-sibling (node)
+  "Return the previous statement in parent.
+Works for parents supported by `js2-node-child-list'.
+Returns nil if NODE is not in the parent, or PARENT is
+not a supported node, or if NODE is the first child."
+  (let* ((p (js2-node-parent node))
+         (kids (js2-node-child-list p))
+         (sib (car kids)))
+    (while (and kids
+                (not (eq node (cadr kids))))
+      (setq kids (cdr kids)
+            sib (car kids)))
+    sib))
+
+(defun js2-node-next-sibling (node)
+  "Return the next statement in parent block.
+Returns nil if NODE is not in the block, or PARENT is not
+a block node, or if NODE is the last statement."
+  (let* ((p (js2-node-parent node))
+         (kids (js2-node-child-list p)))
+    (while (and kids
+                (not (eq node (car kids))))
+      (setq kids (cdr kids)))
+    (cadr kids)))
+
+(defun js2-node-find-child-before (pos parent &optional after)
+  "Find the last child that starts before POS in parent.
+If AFTER is non-nil, returns first child starting after POS.
+POS is an absolute buffer position.  PARENT is any node
+supported by `js2-node-child-list'.
+Returns nil if no applicable child is found."
+  (let ((kids (if (js2-function-node-p parent)
+                  (js2-block-node-kids (js2-function-node-body parent))
+                (js2-node-child-list parent)))
+        (beg (js2-node-abs-pos (if (js2-function-node-p parent)
+                                   (js2-function-node-body parent)
+                                 parent)))
+        kid result fn
+        (continue t))
+    (setq fn (if after '>= '<))
+    (while (and kids continue)
+      (setq kid (car kids))
+      (if (funcall fn (+ beg (js2-node-pos kid)) pos)
+          (setq result kid
+                continue (not after))
+        (setq continue after))
+      (setq kids (cdr kids)))
+    result))
+
+(defun js2-node-find-child-after (pos parent)
+  "Find first child that starts after POS in parent.
+POS is an absolute buffer position.  PARENT is any node
+supported by `js2-node-child-list'.
+Returns nil if no applicable child is found."
+  (js2-node-find-child-before pos parent 'after))
+
+(defun js2-node-replace-child (pos parent new-node)
+  "Replace node at index POS in PARENT with NEW-NODE.
+Only works for parents supported by `js2-node-child-list'."
+  (let ((kids (js2-node-child-list parent))
+        (i 0))
+    (while (< i pos)
+      (setq kids (cdr kids)
+            i (1+ i)))
+    (setcar kids new-node)
+    (js2-node-add-children parent new-node)))
+
+(defun js2-node-buffer (n)
+  "Return the buffer associated with AST N.
+Returns nil if the buffer is not set as a property on the root
+node, or if parent links were not recorded during parsing."
+  (let ((root (js2-node-root n)))
+    (and root
+         (js2-ast-root-p root)
+         (js2-ast-root-buffer root))))
+
+(defun js2-block-node-push (n kid)
+  "Push js2-node KID onto the end of js2-block-node N's child list.
+KID is always added to the -end- of the kids list.
+Function also calls `js2-node-add-children' to add the parent link."
+  (let ((kids (js2-node-child-list n)))
+    (if kids
+        (setcdr kids (nconc (cdr kids) (list kid)))
+      (js2-node-set-child-list n (list kid)))
+    (js2-node-add-children n kid)))
+
+(defun js2-node-string (node)
+  (with-current-buffer (or (js2-node-buffer node)
+                           (error "No buffer available for node %s" node))
+    (let ((pos (js2-node-abs-pos node)))
+      (buffer-substring-no-properties pos (+ pos (js2-node-len node))))))
+
+;; Container for storing the node we're looking for in a traversal.
+(js2-deflocal js2-discovered-node nil)
+
+;; Keep track of absolute node position during traversals.
+(js2-deflocal js2-visitor-offset nil)
+
+(js2-deflocal js2-node-search-point nil)
+
+(when js2-mode-dev-mode-p
+  (defun js2-find-node-at-point ()
+    (interactive)
+    (let ((node (js2-node-at-point)))
+      (message "%s" (or node "No node found at point"))))
+  (defun js2-node-name-at-point ()
+    (interactive)
+    (let ((node (js2-node-at-point)))
+      (message "%s" (if node
+                        (js2-node-short-name node)
+                      "No node found at point.")))))
+
+(defun js2-node-at-point (&optional pos skip-comments)
+  "Return AST node at POS, a buffer position, defaulting to current point.
+The `js2-mode-ast' variable must be set to the current parse tree.
+Signals an error if the AST (`js2-mode-ast') is nil.
+Always returns a node - if it can't find one, it returns the root.
+If SKIP-COMMENTS is non-nil, comment nodes are ignored."
+  (let ((ast js2-mode-ast)
+        result)
+    (unless ast
+      (error "No JavaScript AST available"))
+    ;; Look through comments first, since they may be inside nodes that
+    ;; would otherwise report a match.
+    (setq pos (or pos (point))
+          result (if (> pos (js2-node-abs-end ast))
+                     ast
+                   (if (not skip-comments)
+                       (js2-comment-at-point pos))))
+    (unless result
+      (setq js2-discovered-node nil
+            js2-visitor-offset 0
+            js2-node-search-point pos)
+      (unwind-protect
+          (catch 'js2-visit-done
+            (js2-visit-ast ast #'js2-node-at-point-visitor))
+        (setq js2-visitor-offset nil
+              js2-node-search-point nil))
+      (setq result js2-discovered-node))
+    ;; may have found a comment beyond end of last child node,
+    ;; since visiting the ast-root looks at the comment-list last.
+    (if (and skip-comments
+             (js2-comment-node-p result))
+        (setq result nil))
+    (or result js2-mode-ast)))
+
+(defun js2-node-at-point-visitor (node end-p)
+  (let ((rel-pos (js2-node-pos node))
+        abs-pos
+        abs-end
+        (point js2-node-search-point))
+    (cond
+     (end-p
+      ;; this evaluates to a non-nil return value, even if it's zero
+      (cl-decf js2-visitor-offset rel-pos))
+     ;; we already looked for comments before visiting, and don't want them now
+     ((js2-comment-node-p node)
+      nil)
+     (t
+      (setq abs-pos (cl-incf js2-visitor-offset rel-pos)
+            ;; we only want to use the node if the point is before
+            ;; the last character position in the node, so we decrement
+            ;; the absolute end by 1.
+            abs-end (+ abs-pos (js2-node-len node) -1))
+      (cond
+       ;; If this node starts after search-point, stop the search.
+       ((> abs-pos point)
+        (throw 'js2-visit-done nil))
+       ;; If this node ends before the search-point, don't check kids.
+       ((> point abs-end)
+        nil)
+       (t
+        ;; Otherwise point is within this node, possibly in a child.
+        (setq js2-discovered-node node)
+        t))))))  ; keep processing kids to look for more specific match
+
+(defsubst js2-block-comment-p (node)
+  "Return non-nil if NODE is a comment node of format `jsdoc' or `block'."
+  (and (js2-comment-node-p node)
+       (memq (js2-comment-node-format node) '(jsdoc block))))
+
+;; TODO:  put the comments in a vector and binary-search them instead
+(defun js2-comment-at-point (&optional pos)
+  "Look through scanned comment nodes for one containing POS.
+POS is a buffer position that defaults to current point.
+Function returns nil if POS was not in any comment node."
+  (let ((ast js2-mode-ast)
+        (x (or pos (point)))
+        beg end)
+    (unless ast
+      (error "No JavaScript AST available"))
+    (catch 'done
+      ;; Comments are stored in lexical order.
+      (dolist (comment (js2-ast-root-comments ast) nil)
+        (setq beg (js2-node-abs-pos comment)
+              end (+ beg (js2-node-len comment)))
+        (if (and (>= x beg)
+                 (<= x end))
+            (throw 'done comment))))))
+
+(defun js2-mode-find-parent-fn (node)
+  "Find function enclosing NODE.
+Returns nil if NODE is not inside a function."
+  (setq node (js2-node-parent node))
+  (while (and node (not (js2-function-node-p node)))
+    (setq node (js2-node-parent node)))
+  (and (js2-function-node-p node) node))
+
+(defun js2-mode-find-enclosing-fn (node)
+  "Find function or root enclosing NODE."
+  (if (js2-ast-root-p node)
+      node
+    (setq node (js2-node-parent node))
+    (while (not (or (js2-ast-root-p node)
+                    (js2-function-node-p node)))
+      (setq node (js2-node-parent node)))
+    node))
+
+ (defun js2-mode-find-enclosing-node (beg end)
+  "Find node fully enclosing BEG and END."
+  (let ((node (js2-node-at-point beg))
+        pos
+        (continue t))
+    (while continue
+      (if (or (js2-ast-root-p node)
+              (and
+               (<= (setq pos (js2-node-abs-pos node)) beg)
+               (>= (+ pos (js2-node-len node)) end)))
+          (setq continue nil)
+        (setq node (js2-node-parent node))))
+    node))
+
+(defun js2-node-parent-script-or-fn (node)
+  "Find script or function immediately enclosing NODE.
+If NODE is the ast-root, returns nil."
+  (if (js2-ast-root-p node)
+      nil
+    (setq node (js2-node-parent node))
+    (while (and node (not (or (js2-function-node-p node)
+                              (js2-script-node-p node))))
+      (setq node (js2-node-parent node)))
+    node))
+
+(defun js2-node-is-descendant (node ancestor)
+  "Return t if NODE is a descendant of ANCESTOR."
+  (while (and node
+              (not (eq node ancestor)))
+    (setq node (js2-node-parent node)))
+  node)
+
+;;; visitor infrastructure
+
+(defun js2-visit-none (_node _callback)
+  "Visitor for AST node that have no node children."
+  nil)
+
+(defun js2-print-none (_node _indent)
+  "Visitor for AST node with no printed representation.")
+
+(defun js2-print-body (node indent)
+  "Print a statement, or a block without braces."
+  (if (js2-block-node-p node)
+      (dolist (kid (js2-block-node-kids node))
+        (js2-print-ast kid indent))
+    (js2-print-ast node indent)))
+
+(defun js2-print-list (args &optional delimiter)
+  (cl-loop with len = (length args)
+           for arg in args
+           for count from 1
+           do
+           (when arg (js2-print-ast arg 0))
+           (if (< count len)
+               (insert (or delimiter ", ")))))
+
+(defun js2-print-tree (ast)
+  "Prints an AST to the current buffer.
+Makes `js2-ast-parent-nodes' available to the printer functions."
+  (let ((max-lisp-eval-depth (max max-lisp-eval-depth 1500)))
+    (js2-print-ast ast)))
+
+(defun js2-print-ast (node &optional indent)
+  "Helper function for printing AST nodes.
+Requires `js2-ast-parent-nodes' to be non-nil.
+You should use `js2-print-tree' instead of this function."
+  (let ((printer (get (aref node 0) 'js2-printer))
+        (i (or indent 0)))
+    ;; TODO:  wedge comments in here somewhere
+    (if printer
+        (funcall printer node i))))
+
+(defconst js2-side-effecting-tokens
+  (let ((tokens (make-bool-vector js2-num-tokens nil)))
+    (dolist (tt (list js2-ASSIGN
+                      js2-ASSIGN_ADD
+                      js2-ASSIGN_BITAND
+                      js2-ASSIGN_BITOR
+                      js2-ASSIGN_BITXOR
+                      js2-ASSIGN_DIV
+                      js2-ASSIGN_LSH
+                      js2-ASSIGN_MOD
+                      js2-ASSIGN_MUL
+                      js2-ASSIGN_RSH
+                      js2-ASSIGN_SUB
+                      js2-ASSIGN_URSH
+                      js2-BLOCK
+                      js2-BREAK
+                      js2-CALL
+                      js2-CATCH
+                      js2-CATCH_SCOPE
+                      js2-CLASS
+                      js2-CONST
+                      js2-CONTINUE
+                      js2-DEBUGGER
+                      js2-DEC
+                      js2-DELPROP
+                      js2-DEL_REF
+                      js2-DO
+                      js2-ELSE
+                      js2-EMPTY
+                      js2-ENTERWITH
+                      js2-EXPORT
+                      js2-EXPR_RESULT
+                      js2-FINALLY
+                      js2-FOR
+                      js2-FUNCTION
+                      js2-GOTO
+                      js2-IF
+                      js2-IFEQ
+                      js2-IFNE
+                      js2-IMPORT
+                      js2-INC
+                      js2-JSR
+                      js2-LABEL
+                      js2-LEAVEWITH
+                      js2-LET
+                      js2-LETEXPR
+                      js2-LOCAL_BLOCK
+                      js2-LOOP
+                      js2-NEW
+                      js2-REF_CALL
+                      js2-RETHROW
+                      js2-RETURN
+                      js2-RETURN_RESULT
+                      js2-SEMI
+                      js2-SETELEM
+                      js2-SETELEM_OP
+                      js2-SETNAME
+                      js2-SETPROP
+                      js2-SETPROP_OP
+                      js2-SETVAR
+                      js2-SET_REF
+                      js2-SET_REF_OP
+                      js2-SWITCH
+                      js2-TARGET
+                      js2-THROW
+                      js2-TRY
+                      js2-VAR
+                      js2-WHILE
+                      js2-WITH
+                      js2-WITHEXPR
+                      js2-YIELD))
+      (aset tokens tt t))
+    (if js2-instanceof-has-side-effects
+        (aset tokens js2-INSTANCEOF t))
+    tokens))
+
+(defun js2-node-has-side-effects (node)
+  "Return t if NODE has side effects."
+  (when node  ; makes it easier to handle malformed expressions
+    (let ((tt (js2-node-type node)))
+      (cond
+       ;; This doubtless needs some work, since EXPR_VOID is used
+       ;; in several ways in Rhino and I may not have caught them all.
+       ;; I'll wait for people to notice incorrect warnings.
+       ((and (= tt js2-EXPR_VOID)
+             (js2-expr-stmt-node-p node)) ; but not if EXPR_RESULT
+        (let ((expr (js2-expr-stmt-node-expr node)))
+          (or (js2-node-has-side-effects expr)
+              (when (js2-string-node-p expr)
+                (member (js2-string-node-value expr) '("use strict" "use asm"))))))
+       ((= tt js2-AWAIT)
+        (js2-node-has-side-effects (js2-unary-node-operand node)))
+       ((= tt js2-COMMA)
+        (js2-node-has-side-effects (js2-infix-node-right node)))
+       ((or (= tt js2-AND)
+            (= tt js2-OR))
+        (or (js2-node-has-side-effects (js2-infix-node-right node))
+            (js2-node-has-side-effects (js2-infix-node-left node))))
+       ((= tt js2-HOOK)
+        (and (js2-node-has-side-effects (js2-cond-node-true-expr node))
+             (js2-node-has-side-effects (js2-cond-node-false-expr node))))
+       ((js2-paren-node-p node)
+        (js2-node-has-side-effects (js2-paren-node-expr node)))
+       ((= tt js2-ERROR) ; avoid cascaded error messages
+        nil)
+       (t
+        (aref js2-side-effecting-tokens tt))))))
+
+(defconst js2-stmt-node-types
+  (list js2-BLOCK
+        js2-BREAK
+        js2-CONTINUE
+        js2-DEFAULT  ; e4x "default xml namespace" statement
+        js2-DO
+        js2-EXPORT
+        js2-EXPR_RESULT
+        js2-EXPR_VOID
+        js2-FOR
+        js2-IF
+        js2-IMPORT
+        js2-RETURN
+        js2-SWITCH
+        js2-THROW
+        js2-TRY
+        js2-WHILE
+        js2-WITH)
+  "Node types that only appear in statement contexts.
+The list does not include nodes that always appear as the child
+of another specific statement type, such as switch-cases,
+catch and finally blocks, and else-clauses.  The list also excludes
+nodes like yield, let and var, which may appear in either expression
+or statement context, and in the latter context always have a
+`js2-expr-stmt-node' parent.  Finally, the list does not include
+functions or scripts, which are treated separately from statements
+by the JavaScript parser and runtime.")
+
+(defun js2-stmt-node-p (node)
+  "Heuristic for figuring out if NODE is a statement.
+Some node types can appear in either an expression context or a
+statement context, e.g. let-nodes, yield-nodes, and var-decl nodes.
+For these node types in a statement context, the parent will be a
+`js2-expr-stmt-node'.
+Functions aren't included in the check."
+  (memq (js2-node-type node) js2-stmt-node-types))
+
+(defun js2-mode-find-first-stmt (node)
+  "Search upward starting from NODE looking for a statement.
+For purposes of this function, a `js2-function-node' counts."
+  (while (not (or (js2-stmt-node-p node)
+                  (js2-function-node-p node)))
+    (setq node (js2-node-parent node)))
+  node)
+
+(defun js2-node-parent-stmt (node)
+  "Return the node's first ancestor that is a statement.
+Returns nil if NODE is a `js2-ast-root'.  Note that any expression
+appearing in a statement context will have a parent that is a
+`js2-expr-stmt-node' that will be returned by this function."
+  (let ((parent (js2-node-parent node)))
+    (if (or (null parent)
+            (js2-stmt-node-p parent)
+            (and (js2-function-node-p parent)
+                 (not (eq (js2-function-node-form parent)
+                          'FUNCTION_EXPRESSION))))
+        parent
+      (js2-node-parent-stmt parent))))
+
+;; In the Mozilla Rhino sources, Roshan James writes:
+;;  Does consistent-return analysis on the function body when strict mode is
+;;  enabled.
+;;
+;;    function (x) { return (x+1) }
+;;
+;;  is ok, but
+;;
+;;    function (x) { if (x < 0) return (x+1); }
+;;
+;;  is not because the function can potentially return a value when the
+;;  condition is satisfied and if not, the function does not explicitly
+;;  return a value.
+;;
+;;  This extends to checking mismatches such as "return" and "return <value>"
+;;  used in the same function. Warnings are not emitted if inconsistent
+;;  returns exist in code that can be statically shown to be unreachable.
+;;  Ex.
+;;    function (x) { while (true) { ... if (..) { return value } ... } }
+;;
+;;  emits no warning. However if the loop had a break statement, then a
+;;  warning would be emitted.
+;;
+;;  The consistency analysis looks at control structures such as loops, ifs,
+;;  switch, try-catch-finally blocks, examines the reachable code paths and
+;;  warns the user about an inconsistent set of termination possibilities.
+;;
+;;  These flags enumerate the possible ways a statement/function can
+;;  terminate. These flags are used by endCheck() and by the Parser to
+;;  detect inconsistent return usage.
+;;
+;;  END_UNREACHED is reserved for code paths that are assumed to always be
+;;  able to execute (example: throw, continue)
+;;
+;;  END_DROPS_OFF indicates if the statement can transfer control to the
+;;  next one. Statement such as return dont. A compound statement may have
+;;  some branch that drops off control to the next statement.
+;;
+;;  END_RETURNS indicates that the statement can return with no value.
+;;  END_RETURNS_VALUE indicates that the statement can return a value.
+;;
+;;  A compound statement such as
+;;  if (condition) {
+;;    return value;
+;;  }
+;;  Will be detected as (END_DROPS_OFF | END_RETURN_VALUE) by endCheck()
+
+(defconst js2-END_UNREACHED 0)
+(defconst js2-END_DROPS_OFF 1)
+(defconst js2-END_RETURNS 2)
+(defconst js2-END_RETURNS_VALUE 4)
+(defconst js2-END_YIELDS 8)
+
+(defun js2-has-consistent-return-usage (node)
+  "Check that every return usage in a function body is consistent.
+Returns t if the function satisfies strict mode requirement."
+  (let ((n (js2-end-check node)))
+    ;; either it doesn't return a value in any branch...
+    (or (js2-flag-not-set-p n js2-END_RETURNS_VALUE)
+        ;; or it returns a value (or is unreached) at every branch
+        (js2-flag-not-set-p n (logior js2-END_DROPS_OFF
+                                      js2-END_RETURNS
+                                      js2-END_YIELDS)))))
+
+(defun js2-end-check-if (node)
+  "Ensure that return usage in then/else blocks is consistent.
+If there is no else block, then the return statement can fall through.
+Returns logical OR of END_* flags"
+  (let ((th (js2-if-node-then-part node))
+        (el (js2-if-node-else-part node)))
+    (if (null th)
+        js2-END_UNREACHED
+      (logior (js2-end-check th) (if el
+                                     (js2-end-check el)
+                                   js2-END_DROPS_OFF)))))
+
+(defun js2-end-check-switch (node)
+  "Consistency of return statements is checked between the case statements.
+If there is no default, then the switch can fall through. If there is a
+default, we check to see if all code paths in the default return or if
+there is a code path that can fall through.
+Returns logical OR of END_* flags."
+  (let ((rv js2-END_UNREACHED)
+        default-case)
+    ;; examine the cases
+    (catch 'break
+      (dolist (c (js2-switch-node-cases node))
+        (if (js2-case-node-expr c)
+            (js2-set-flag rv (js2-end-check-block c))
+          (setq default-case c)
+          (throw 'break nil))))
+    ;; we don't care how the cases drop into each other
+    (js2-clear-flag rv js2-END_DROPS_OFF)
+    ;; examine the default
+    (js2-set-flag rv (if default-case
+                         (js2-end-check default-case)
+                       js2-END_DROPS_OFF))
+    rv))
+
+(defun js2-end-check-try (node)
+ "If the block has a finally, return consistency is checked in the
+finally block. If all code paths in the finally return, then the
+returns in the try-catch blocks don't matter. If there is a code path
+that does not return or if there is no finally block, the returns
+of the try and catch blocks are checked for mismatch.
+Returns logical OR of END_* flags."
+ (let ((finally (js2-try-node-finally-block node))
+       rv)
+   ;; check the finally if it exists
+   (setq rv (if finally
+                (js2-end-check (js2-finally-node-body finally))
+              js2-END_DROPS_OFF))
+   ;; If the finally block always returns, then none of the returns
+   ;; in the try or catch blocks matter.
+   (when (js2-flag-set-p rv js2-END_DROPS_OFF)
+     (js2-clear-flag rv js2-END_DROPS_OFF)
+     ;; examine the try block
+     (js2-set-flag rv (js2-end-check (js2-try-node-try-block node)))
+     ;; check each catch block
+     (dolist (cb (js2-try-node-catch-clauses node))
+       (js2-set-flag rv (js2-end-check cb))))
+   rv))
+
+(defun js2-end-check-loop (node)
+  "Return statement in the loop body must be consistent.
+The default assumption for any kind of a loop is that it will eventually
+terminate.  The only exception is a loop with a constant true condition.
+Code that follows such a loop is examined only if one can determine
+statically that there is a break out of the loop.
+
+    for(... ; ... ; ...) {}
+    for(... in ... ) {}
+    while(...) { }
+    do { } while(...)
+
+Returns logical OR of END_* flags."
+  (let ((rv (js2-end-check (js2-loop-node-body node)))
+        (condition (cond
+                    ((js2-while-node-p node)
+                     (js2-while-node-condition node))
+                     ((js2-do-node-p node)
+                      (js2-do-node-condition node))
+                     ((js2-for-node-p node)
+                      (js2-for-node-condition node)))))
+
+    ;; check to see if the loop condition is always true
+    (if (and condition
+             (eq (js2-always-defined-boolean-p condition) 'ALWAYS_TRUE))
+        (js2-clear-flag rv js2-END_DROPS_OFF))
+
+    ;; look for effect of breaks
+    (js2-set-flag rv (js2-node-get-prop node
+                                        'CONTROL_BLOCK_PROP
+                                        js2-END_UNREACHED))
+    rv))
+
+(defun js2-end-check-block (node)
+  "A general block of code is examined statement by statement.
+If any statement (even a compound one) returns in all branches, then
+subsequent statements are not examined.
+Returns logical OR of END_* flags."
+  (let* ((rv js2-END_DROPS_OFF)
+         (kids (js2-block-node-kids node))
+         (n (car kids)))
+    ;; Check each statement.  If the statement can continue onto the next
+    ;; one (i.e. END_DROPS_OFF is set), then check the next statement.
+    (while (and n (js2-flag-set-p rv js2-END_DROPS_OFF))
+      (js2-clear-flag rv js2-END_DROPS_OFF)
+      (js2-set-flag rv (js2-end-check n))
+      (setq kids (cdr kids)
+            n (car kids)))
+    rv))
+
+(defun js2-end-check-label (node)
+  "A labeled statement implies that there may be a break to the label.
+The function processes the labeled statement and then checks the
+CONTROL_BLOCK_PROP property to see if there is ever a break to the
+particular label.
+Returns logical OR of END_* flags."
+  (let ((rv (js2-end-check (js2-labeled-stmt-node-stmt node))))
+    (logior rv (js2-node-get-prop node
+                                  'CONTROL_BLOCK_PROP
+                                  js2-END_UNREACHED))))
+
+(defun js2-end-check-break (node)
+  "When a break is encountered annotate the statement being broken
+out of by setting its CONTROL_BLOCK_PROP property.
+Returns logical OR of END_* flags."
+  (and (js2-break-node-target node)
+       (js2-node-set-prop (js2-break-node-target node)
+                          'CONTROL_BLOCK_PROP
+                          js2-END_DROPS_OFF))
+  js2-END_UNREACHED)
+
+(defun js2-end-check (node)
+  "Examine the body of a function, doing a basic reachability analysis.
+Returns a combination of flags END_* flags that indicate
+how the function execution can terminate. These constitute only the
+pessimistic set of termination conditions. It is possible that at
+runtime certain code paths will never be actually taken. Hence this
+analysis will flag errors in cases where there may not be errors.
+Returns logical OR of END_* flags"
+  (let (kid)
+    (cond
+     ((js2-break-node-p node)
+      (js2-end-check-break node))
+     ((js2-expr-stmt-node-p node)
+      (if (setq kid (js2-expr-stmt-node-expr node))
+          (js2-end-check kid)
+        js2-END_DROPS_OFF))
+     ((or (js2-continue-node-p node)
+          (js2-throw-node-p node))
+      js2-END_UNREACHED)
+     ((js2-return-node-p node)
+      (if (setq kid (js2-return-node-retval node))
+          js2-END_RETURNS_VALUE
+        js2-END_RETURNS))
+     ((js2-loop-node-p node)
+      (js2-end-check-loop node))
+     ((js2-switch-node-p node)
+      (js2-end-check-switch node))
+     ((js2-labeled-stmt-node-p node)
+      (js2-end-check-label node))
+     ((js2-if-node-p node)
+      (js2-end-check-if node))
+     ((js2-try-node-p node)
+      (js2-end-check-try node))
+     ((js2-block-node-p node)
+      (if (null (js2-block-node-kids node))
+          js2-END_DROPS_OFF
+        (js2-end-check-block node)))
+     ((js2-yield-node-p node)
+      js2-END_YIELDS)
+     (t
+      js2-END_DROPS_OFF))))
+
+(defun js2-always-defined-boolean-p (node)
+  "Check if NODE always evaluates to true or false in boolean context.
+Returns 'ALWAYS_TRUE, 'ALWAYS_FALSE, or nil if it's neither always true
+nor always false."
+  (let ((tt (js2-node-type node))
+        num)
+    (cond
+     ((or (= tt js2-FALSE) (= tt js2-NULL))
+      'ALWAYS_FALSE)
+     ((= tt js2-TRUE)
+      'ALWAYS_TRUE)
+     ((= tt js2-NUMBER)
+      (setq num (js2-number-node-num-value node))
+      (if (and (not (eq num 0.0e+NaN))
+               (not (zerop num)))
+          'ALWAYS_TRUE
+        'ALWAYS_FALSE))
+     (t
+      nil))))
+
+;;; Scanner -- a port of Mozilla Rhino's lexer.
+;; Corresponds to Rhino files Token.java and TokenStream.java.
+
+(defvar js2-tokens nil
+  "List of all defined token names.")  ; initialized in `js2-token-names'
+
+(defconst js2-token-names
+  (let* ((names (make-vector js2-num-tokens -1))
+         (case-fold-search nil)  ; only match js2-UPPER_CASE
+         (syms (apropos-internal "^js2-\\(?:[[:upper:]_]+\\)")))
+    (cl-loop for sym in syms
+             for i from 0
+             do
+             (unless (or (memq sym '(js2-EOF_CHAR js2-ERROR))
+                         (not (boundp sym)))
+               (aset names (symbol-value sym)           ; code, e.g. 152
+                     (downcase
+                      (substring (symbol-name sym) 4))) ; name, e.g. "let"
+               (push sym js2-tokens)))
+    names)
+  "Vector mapping int values to token string names, sans `js2-' prefix.")
+
+(defun js2-tt-name (tok)
+  "Return a string name for TOK, a token symbol or code.
+Signals an error if it's not a recognized token."
+  (let ((code tok))
+    (if (symbolp tok)
+        (setq code (symbol-value tok)))
+    (if (eq code -1)
+        "ERROR"
+      (if (and (numberp code)
+               (not (cl-minusp code))
+               (< code js2-num-tokens))
+          (aref js2-token-names code)
+        (error "Invalid token: %s" code)))))
+
+(defsubst js2-tt-sym (tok)
+  "Return symbol for TOK given its code, e.g. 'js2-LP for code 86."
+  (intern (js2-tt-name tok)))
+
+(defconst js2-token-codes
+  (let ((table (make-hash-table :test 'eq :size 256)))
+    (cl-loop for name across js2-token-names
+             for sym = (intern (concat "js2-" (upcase name)))
+             do
+             (puthash sym (symbol-value sym) table))
+    ;; clean up a few that are "wrong" in Rhino's token codes
+    (puthash 'js2-DELETE js2-DELPROP table)
+    table)
+  "Hashtable mapping token type symbols to their bytecodes.")
+
+(defsubst js2-tt-code (sym)
+  "Return code for token symbol SYM, e.g. 86 for 'js2-LP."
+  (or (gethash sym js2-token-codes)
+      (error "Invalid token symbol: %s " sym)))  ; signal code bug
+
+(defun js2-report-scan-error (msg &optional no-throw beg len)
+  (setf (js2-token-end (js2-current-token)) js2-ts-cursor)
+  (js2-report-error msg nil
+                    (or beg (js2-current-token-beg))
+                    (or len (js2-current-token-len)))
+  (unless no-throw
+    (throw 'return js2-ERROR)))
+
+(defun js2-set-string-from-buffer (token)
+  "Set `string' and `end' slots for TOKEN, return the string."
+  (setf (js2-token-end token) js2-ts-cursor
+        (js2-token-string token) (js2-collect-string js2-ts-string-buffer)))
+
+;; TODO:  could potentially avoid a lot of consing by allocating a
+;; char buffer the way Rhino does.
+(defsubst js2-add-to-string (c)
+  (push c js2-ts-string-buffer))
+
+;; Note that when we "read" the end-of-file, we advance js2-ts-cursor
+;; to (1+ (point-max)), which lets the scanner treat end-of-file like
+;; any other character:  when it's not part of the current token, we
+;; unget it, allowing it to be read again by the following call.
+(defsubst js2-unget-char ()
+  (cl-decf js2-ts-cursor))
+
+;; Rhino distinguishes \r and \n line endings.  We don't need to
+;; because we only scan from Emacs buffers, which always use \n.
+(defun js2-get-char ()
+  "Read and return the next character from the input buffer.
+Increments `js2-ts-lineno' if the return value is a newline char.
+Updates `js2-ts-cursor' to the point after the returned char.
+Returns `js2-EOF_CHAR' if we hit the end of the buffer.
+Also updates `js2-ts-hit-eof' and `js2-ts-line-start' as needed."
+  (let (c)
+    ;; check for end of buffer
+    (if (>= js2-ts-cursor (point-max))
+        (setq js2-ts-hit-eof t
+              js2-ts-cursor (1+ js2-ts-cursor)
+              c js2-EOF_CHAR)  ; return value
+      ;; otherwise read next char
+      (setq c (char-before (cl-incf js2-ts-cursor)))
+      ;; if we read a newline, update counters
+      (if (= c ?\n)
+          (setq js2-ts-line-start js2-ts-cursor
+                js2-ts-lineno (1+ js2-ts-lineno)))
+      ;; TODO:  skip over format characters
+      c)))
+
+(defun js2-read-unicode-escape ()
+  "Read a \\uNNNN sequence from the input.
+Assumes the ?\ and ?u have already been read.
+Returns the unicode character, or nil if it wasn't a valid character.
+Doesn't change the values of any scanner variables."
+  ;; I really wish I knew a better way to do this, but I can't
+  ;; find the Emacs function that takes a 16-bit int and converts
+  ;; it to a Unicode/utf-8 character.  So I basically eval it with (read).
+  ;; Have to first check that it's 4 hex characters or it may stop
+  ;; the read early.
+  (ignore-errors
+    (let ((s (buffer-substring-no-properties js2-ts-cursor
+                                             (+ 4 js2-ts-cursor))))
+      (if (string-match "[0-9a-fA-F]\\{4\\}" s)
+          (read (concat "?\\u" s))))))
+
+(defun js2-match-char (test)
+  "Consume and return next character if it matches TEST, a character.
+Returns nil and consumes nothing if TEST is not the next character."
+  (let ((c (js2-get-char)))
+    (if (eq c test)
+        t
+      (js2-unget-char)
+      nil)))
+
+(defun js2-peek-char ()
+  (prog1
+      (js2-get-char)
+    (js2-unget-char)))
+
+(defun js2-identifier-start-p (c)
+  "Is C a valid start to an ES5 Identifier?
+See http://es5.github.io/#x7.6"
+  (or
+   (memq c '(?$ ?_))
+   (memq (get-char-code-property c 'general-category)
+         ;; Letters
+         '(Lu Ll Lt Lm Lo Nl))))
+
+(defun js2-identifier-part-p (c)
+  "Is C a valid part of an ES5 Identifier?
+See http://es5.github.io/#x7.6"
+  (or
+   (memq c '(?$ ?_ ?\u200c  ?\u200d))
+   (memq (get-char-code-property c 'general-category)
+         '(;; Letters
+           Lu Ll Lt Lm Lo Nl
+           ;; Combining Marks
+           Mn Mc
+           ;; Digits
+           Nd
+           ;; Connector Punctuation
+           Pc))))
+
+(defun js2-alpha-p (c)
+  (cond ((and (<= ?A c) (<= c ?Z)) t)
+        ((and (<= ?a c) (<= c ?z)) t)
+        (t nil)))
+
+(defsubst js2-digit-p (c)
+  (and (<= ?0 c) (<= c ?9)))
+
+(defun js2-js-space-p (c)
+  (if (<= c 127)
+      (memq c '(#x20 #x9 #xB #xC #xD))
+    (or
+     (eq c #xA0)
+     ;; TODO:  change this nil to check for Unicode space character
+     nil)))
+
+(defconst js2-eol-chars (list js2-EOF_CHAR ?\n ?\r))
+
+(defun js2-skip-line ()
+  "Skip to end of line."
+  (while (not (memq (js2-get-char) js2-eol-chars)))
+  (js2-unget-char)
+  (setf (js2-token-end (js2-current-token)) js2-ts-cursor))
+
+(defun js2-init-scanner (&optional buf line)
+  "Create token stream for BUF starting on LINE.
+BUF defaults to `current-buffer' and LINE defaults to 1.
+
+A buffer can only have one scanner active at a time, which yields
+dramatically simpler code than using a defstruct.  If you need to
+have simultaneous scanners in a buffer, copy the regions to scan
+into temp buffers."
+  (with-current-buffer (or buf (current-buffer))
+    (setq js2-ts-dirty-line nil
+          js2-ts-hit-eof nil
+          js2-ts-line-start 0
+          js2-ts-lineno (or line 1)
+          js2-ts-line-end-char -1
+          js2-ts-cursor (point-min)
+          js2-ti-tokens (make-vector js2-ti-ntokens nil)
+          js2-ti-tokens-cursor 0
+          js2-ti-lookahead 0
+          js2-ts-is-xml-attribute nil
+          js2-ts-xml-is-tag-content nil
+          js2-ts-xml-open-tags-count 0
+          js2-ts-string-buffer nil)))
+
+;; This function uses the cached op, string and number fields in
+;; TokenStream; if getToken has been called since the passed token
+;; was scanned, the op or string printed may be incorrect.
+(defun js2-token-to-string (token)
+  ;; Not sure where this function is used in Rhino.  Not tested.
+  (if (not js2-debug-print-trees)
+      ""
+    (let ((name (js2-tt-name token)))
+      (cond
+       ((memq token '(js2-STRING js2-REGEXP js2-NAME
+                      js2-TEMPLATE_HEAD js2-NO_SUBS_TEMPLATE))
+        (concat name " `" (js2-current-token-string) "'"))
+       ((eq token js2-NUMBER)
+        (format "NUMBER %g" (js2-token-number (js2-current-token))))
+       (t
+        name)))))
+
+(defconst js2-keywords
+  '(break
+    case catch class const continue
+    debugger default delete do
+    else extends export
+    false finally for function
+    if in instanceof import
+    let
+    new null
+    return
+    super switch
+    this throw true try typeof
+    var void
+    while with
+    yield))
+
+;; Token names aren't exactly the same as the keywords, unfortunately.
+;; E.g. delete is js2-DELPROP.
+(defconst js2-kwd-tokens
+  (let ((table (make-vector js2-num-tokens nil))
+        (tokens
+         (list js2-BREAK
+               js2-CASE js2-CATCH js2-CLASS js2-CONST js2-CONTINUE
+               js2-DEBUGGER js2-DEFAULT js2-DELPROP js2-DO
+               js2-ELSE js2-EXPORT
+               js2-ELSE js2-EXTENDS js2-EXPORT
+               js2-FALSE js2-FINALLY js2-FOR js2-FUNCTION
+               js2-IF js2-IN js2-INSTANCEOF js2-IMPORT
+               js2-LET
+               js2-NEW js2-NULL
+               js2-RETURN
+               js2-SUPER js2-SWITCH
+               js2-THIS js2-THROW js2-TRUE js2-TRY js2-TYPEOF
+               js2-VAR
+               js2-WHILE js2-WITH
+               js2-YIELD)))
+    (dolist (i tokens)
+      (aset table i 'font-lock-keyword-face))
+    (aset table js2-STRING 'font-lock-string-face)
+    (aset table js2-REGEXP 'font-lock-string-face)
+    (aset table js2-NO_SUBS_TEMPLATE 'font-lock-string-face)
+    (aset table js2-TEMPLATE_HEAD 'font-lock-string-face)
+    (aset table js2-COMMENT 'font-lock-comment-face)
+    (aset table js2-THIS 'font-lock-builtin-face)
+    (aset table js2-SUPER 'font-lock-builtin-face)
+    (aset table js2-VOID 'font-lock-constant-face)
+    (aset table js2-NULL 'font-lock-constant-face)
+    (aset table js2-TRUE 'font-lock-constant-face)
+    (aset table js2-FALSE 'font-lock-constant-face)
+    (aset table js2-NOT 'font-lock-negation-char-face)
+    table)
+  "Vector whose values are non-nil for tokens that are keywords.
+The values are default faces to use for highlighting the keywords.")
+
+;; FIXME: Support strict mode-only future reserved words, after we know
+;; which parts scopes are in strict mode, and which are not.
+(defconst js2-reserved-words '(class enum export extends import static super)
+  "Future reserved keywords in ECMAScript 5.1.")
+
+(defconst js2-keyword-names
+  (let ((table (make-hash-table :test 'equal)))
+    (cl-loop for k in js2-keywords
+             do (puthash
+                 (symbol-name k)                            ; instanceof
+                 (intern (concat "js2-"
+                                 (upcase (symbol-name k)))) ; js2-INSTANCEOF
+                 table))
+    table)
+  "JavaScript keywords by name, mapped to their symbols.")
+
+(defconst js2-reserved-word-names
+  (let ((table (make-hash-table :test 'equal)))
+    (cl-loop for k in js2-reserved-words
+             do
+             (puthash (symbol-name k) 'js2-RESERVED table))
+    table)
+  "JavaScript reserved words by name, mapped to 'js2-RESERVED.")
+
+(defun js2-collect-string (buf)
+  "Convert BUF, a list of chars, to a string.
+Reverses BUF before converting."
+  (if buf
+      (apply #'string (nreverse buf))
+    ""))
+
+(defun js2-string-to-keyword (s)
+  "Return token for S, a string, if S is a keyword or reserved word.
+Returns a symbol such as 'js2-BREAK, or nil if not keyword/reserved."
+  (or (gethash s js2-keyword-names)
+      (gethash s js2-reserved-word-names)))
+
+(defsubst js2-ts-set-char-token-bounds (token)
+  "Used when next token is one character."
+  (setf (js2-token-beg token) (1- js2-ts-cursor)
+        (js2-token-end token) js2-ts-cursor))
+
+(defsubst js2-ts-return (token type)
+  "Update the `end' and `type' slots of TOKEN,
+then throw `return' with value TYPE."
+  (setf (js2-token-end token) js2-ts-cursor
+        (js2-token-type token) type)
+  (throw 'return type))
+
+(defun js2-x-digit-to-int (c accumulator)
+  "Build up a hex number.
+If C is a hexadecimal digit, return ACCUMULATOR * 16 plus
+corresponding number.  Otherwise return -1."
+  (catch 'return
+    (catch 'check
+      ;; Use 0..9 < A..Z < a..z
+      (cond
+       ((<= c ?9)
+        (cl-decf c ?0)
+        (if (<= 0 c)
+            (throw 'check nil)))
+       ((<= c ?F)
+        (when (<= ?A c)
+          (cl-decf c (- ?A 10))
+          (throw 'check nil)))
+       ((<= c ?f)
+        (when (<= ?a c)
+          (cl-decf c (- ?a 10))
+          (throw 'check nil))))
+      (throw 'return -1))
+    (logior c (lsh accumulator 4))))
+
+(defun js2-get-token (&optional modifier)
+  "If `js2-ti-lookahead' is zero, call scanner to get new token.
+Otherwise, move `js2-ti-tokens-cursor' and return the type of
+next saved token.
+
+This function will not return a newline (js2-EOL) - instead, it
+gobbles newlines until it finds a non-newline token.  Call
+`js2-peek-token-or-eol' when you care about newlines.
+
+This function will also not return a js2-COMMENT.  Instead, it
+records comments found in `js2-scanned-comments'.  If the token
+returned by this function immediately follows a jsdoc comment,
+the token is flagged as such."
+  (if (zerop js2-ti-lookahead)
+      (js2-get-token-internal modifier)
+    (cl-decf js2-ti-lookahead)
+    (setq js2-ti-tokens-cursor (mod (1+ js2-ti-tokens-cursor) js2-ti-ntokens))
+    (let ((tt (js2-current-token-type)))
+      (cl-assert (not (= tt js2-EOL)))
+      tt)))
+
+(defun js2-unget-token ()
+  (cl-assert (< js2-ti-lookahead js2-ti-max-lookahead))
+  (cl-incf js2-ti-lookahead)
+  (setq js2-ti-tokens-cursor (mod (1- js2-ti-tokens-cursor) js2-ti-ntokens)))
+
+(defun js2-get-token-internal (modifier)
+  (let* ((token (js2-get-token-internal-1 modifier)) ; call scanner
+         (tt (js2-token-type token))
+         saw-eol
+         face)
+    ;; process comments
+    (while (or (= tt js2-EOL) (= tt js2-COMMENT))
+      (if (= tt js2-EOL)
+          (setq saw-eol t)
+        (setq saw-eol nil)
+        (when js2-record-comments
+          (js2-record-comment token)))
+      (setq js2-ti-tokens-cursor (mod (1- js2-ti-tokens-cursor) js2-ti-ntokens))
+      (setq token (js2-get-token-internal-1 modifier) ; call scanner again
+            tt (js2-token-type token)))
+
+    (when saw-eol
+      (setf (js2-token-follows-eol-p token) t))
+
+    ;; perform lexical fontification as soon as token is scanned
+    (when js2-parse-ide-mode
+      (cond
+       ((cl-minusp tt)
+        (js2-record-face 'js2-error token))
+       ((setq face (aref js2-kwd-tokens tt))
+        (js2-record-face face token))
+       ((and (= tt js2-NAME)
+             (equal (js2-token-string token) "undefined"))
+        (js2-record-face 'font-lock-constant-face token))))
+    tt))
+
+(defsubst js2-string-to-number (str base)
+  ;; TODO:  Maybe port ScriptRuntime.stringToNumber.
+  (condition-case nil
+      (string-to-number str base)
+    (overflow-error -1)))
+
+(defun js2-get-token-internal-1 (modifier)
+  "Return next JavaScript token type, an int such as js2-RETURN.
+During operation, creates an instance of `js2-token' struct, sets
+its relevant fields and puts it into `js2-ti-tokens'."
+  (let (identifier-start
+        is-unicode-escape-start c
+        contains-escape escape-val str result base
+        look-for-slash continue tt legacy-octal
+        (token (js2-new-token 0)))
+    (setq
+     tt
+     (catch 'return
+       (when (eq modifier 'TEMPLATE_TAIL)
+         (setf (js2-token-beg token) (1- js2-ts-cursor))
+         (throw 'return (js2-get-string-or-template-token ?` token)))
+       (while t
+         ;; Eat whitespace, possibly sensitive to newlines.
+         (setq continue t)
+         (while continue
+           (setq c (js2-get-char))
+           (cond
+            ((eq c js2-EOF_CHAR)
+             (js2-unget-char)
+             (js2-ts-set-char-token-bounds token)
+             (throw 'return js2-EOF))
+            ((eq c ?\n)
+             (js2-ts-set-char-token-bounds token)
+             (setq js2-ts-dirty-line nil)
+             (throw 'return js2-EOL))
+            ((not (js2-js-space-p c))
+             (if (/= c ?-)              ; in case end of HTML comment
+                 (setq js2-ts-dirty-line t))
+             (setq continue nil))))
+         ;; Assume the token will be 1 char - fixed up below.
+         (js2-ts-set-char-token-bounds token)
+         (when (eq c ?@)
+           (throw 'return js2-XMLATTR))
+         ;; identifier/keyword/instanceof?
+         ;; watch out for starting with a <backslash>
+         (cond
+          ((eq c ?\\)
+           (setq c (js2-get-char))
+           (if (eq c ?u)
+               (setq identifier-start t
+                     is-unicode-escape-start t
+                     js2-ts-string-buffer nil)
+             (setq identifier-start nil)
+             (js2-unget-char)
+             (setq c ?\\)))
+          (t
+           (when (setq identifier-start (js2-identifier-start-p c))
+             (setq js2-ts-string-buffer nil)
+             (js2-add-to-string c))))
+         (when identifier-start
+           (setq contains-escape is-unicode-escape-start)
+           (catch 'break
+             (while t
+               (if is-unicode-escape-start
+                   ;; strictly speaking we should probably push-back
+                   ;; all the bad characters if the <backslash>uXXXX
+                   ;; sequence is malformed. But since there isn't a
+                   ;; correct context(is there?) for a bad Unicode
+                   ;; escape sequence in an identifier, we can report
+                   ;; an error here.
+                   (progn
+                     (setq escape-val 0)
+                     (dotimes (_ 4)
+                       (setq c (js2-get-char)
+                             escape-val (js2-x-digit-to-int c escape-val))
+                       ;; Next check takes care of c < 0 and bad escape
+                       (if (cl-minusp escape-val)
+                           (throw 'break nil)))
+                     (if (cl-minusp escape-val)
+                         (js2-report-scan-error "msg.invalid.escape" t))
+                     (js2-add-to-string escape-val)
+                     (setq is-unicode-escape-start nil))
+                 (setq c (js2-get-char))
+                 (cond
+                  ((eq c ?\\)
+                   (setq c (js2-get-char))
+                   (if (eq c ?u)
+                       (setq is-unicode-escape-start t
+                             contains-escape t)
+                     (js2-report-scan-error "msg.illegal.character" t)))
+                  (t
+                   (if (or (eq c js2-EOF_CHAR)
+                           (not (js2-identifier-part-p c)))
+                       (throw 'break nil))
+                   (js2-add-to-string c))))))
+           (js2-unget-char)
+           (setf str (js2-collect-string js2-ts-string-buffer)
+                 (js2-token-end token) js2-ts-cursor)
+           ;; FIXME: Invalid in ES5 and ES6, see
+           ;; https://bugzilla.mozilla.org/show_bug.cgi?id=694360
+           ;; Probably should just drop this conditional.
+           (unless contains-escape
+             ;; OPT we shouldn't have to make a string (object!) to
+             ;; check if it's a keyword.
+             ;; Return the corresponding token if it's a keyword
+             (when (and (not (eq modifier 'KEYWORD_IS_NAME))
+                        (setq result (js2-string-to-keyword str)))
+               (if (and (< js2-language-version 170)
+                        (memq result '(js2-LET js2-YIELD)))
+                   ;; LET and YIELD are tokens only in 1.7 and later
+                   (setq result 'js2-NAME))
+               (when (eq result 'js2-RESERVED)
+                 (setf (js2-token-string token) str))
+               (throw 'return (js2-tt-code result))))
+           ;; If we want to intern these as Rhino does, just use (intern str)
+           (setf (js2-token-string token) str)
+           (throw 'return js2-NAME))    ; end identifier/kwd check
+         ;; is it a number?
+         (when (or (js2-digit-p c)
+                   (and (eq c ?.) (js2-digit-p (js2-peek-char))))
+           (setq js2-ts-string-buffer nil
+                 base 10)
+           (when (eq c ?0)
+             (setq c (js2-get-char))
+             (cond
+              ((or (eq c ?x) (eq c ?X))
+               (setq base 16)
+               (setq c (js2-get-char)))
+              ((and (or (eq c ?b) (eq c ?B))
+                    (>= js2-language-version 200))
+               (setq base 2)
+               (setq c (js2-get-char)))
+              ((and (or (eq c ?o) (eq c ?O))
+                    (>= js2-language-version 200))
+               (setq base 8)
+               (setq legacy-octal nil)
+               (setq c (js2-get-char)))
+              ((js2-digit-p c)
+               (setq base 'maybe-8))
+              (t
+               (js2-add-to-string ?0))))
+           (cond
+            ((eq base 16)
+             (if (> 0 (js2-x-digit-to-int c 0))
+                 (js2-report-scan-error "msg.missing.hex.digits")
+               (while (<= 0 (js2-x-digit-to-int c 0))
+                 (js2-add-to-string c)
+                 (setq c (js2-get-char)))))
+            ((eq base 2)
+             (if (not (memq c '(?0 ?1)))
+                 (js2-report-scan-error "msg.missing.binary.digits")
+               (while (memq c '(?0 ?1))
+                 (js2-add-to-string c)
+                 (setq c (js2-get-char)))))
+            ((eq base 8)
+             (if (or (> ?0 c) (< ?7 c))
+                 (js2-report-scan-error "msg.missing.octal.digits")
+               (while (and (<= ?0 c) (>= ?7 c))
+                 (js2-add-to-string c)
+                 (setq c (js2-get-char)))))
+            (t
+             (while (and (<= ?0 c) (<= c ?9))
+               ;; We permit 08 and 09 as decimal numbers, which
+               ;; makes our behavior a superset of the ECMA
+               ;; numeric grammar.  We might not always be so
+               ;; permissive, so we warn about it.
+               (when (and (eq base 'maybe-8) (>= c ?8))
+                 (js2-report-warning "msg.bad.octal.literal"
+                                     (if (eq c ?8) "8" "9"))
+                 (setq base 10))
+               (js2-add-to-string c)
+               (setq c (js2-get-char)))
+             (when (eq base 'maybe-8)
+               (setq base 8
+                     legacy-octal t))))
+           (when (and (eq base 10) (memq c '(?. ?e ?E)))
+             (when (eq c ?.)
+               (cl-loop do
+                        (js2-add-to-string c)
+                        (setq c (js2-get-char))
+                        while (js2-digit-p c)))
+             (when (memq c '(?e ?E))
+               (js2-add-to-string c)
+               (setq c (js2-get-char))
+               (when (memq c '(?+ ?-))
+                 (js2-add-to-string c)
+                 (setq c (js2-get-char)))
+               (unless (js2-digit-p c)
+                 (js2-report-scan-error "msg.missing.exponent" t))
+               (cl-loop do
+                        (js2-add-to-string c)
+                        (setq c (js2-get-char))
+                        while (js2-digit-p c))))
+           (js2-unget-char)
+           (let ((str (js2-set-string-from-buffer token)))
+             (setf (js2-token-number token) (js2-string-to-number str base)
+                   (js2-token-number-base token) base
+                   (js2-token-number-legacy-octal-p token) (and (= base 8) legacy-octal)))
+           (throw 'return js2-NUMBER))
+         ;; is it a string?
+         (when (or (memq c '(?\" ?\'))
+                   (and (>= js2-language-version 200)
+                        (= c ?`)))
+           (throw 'return
+                  (js2-get-string-or-template-token c token)))
+         (js2-ts-return token
+                        (cl-case c
+                          (?\;
+                           (throw 'return js2-SEMI))
+                          (?\[
+                           (throw 'return js2-LB))
+                          (?\]
+                           (throw 'return js2-RB))
+                          (?{
+                           (throw 'return js2-LC))
+                          (?}
+                           (throw 'return js2-RC))
+                          (?\(
+                           (throw 'return js2-LP))
+                          (?\)
+                           (throw 'return js2-RP))
+                          (?,
+                           (throw 'return js2-COMMA))
+                          (??
+                           (throw 'return js2-HOOK))
+                          (?:
+                           (if (js2-match-char ?:)
+                               js2-COLONCOLON
+                             (throw 'return js2-COLON)))
+                          (?.
+                           (if (js2-match-char ?.)
+                               (if (js2-match-char ?.)
+                                   js2-TRIPLEDOT js2-DOTDOT)
+                             (if (js2-match-char ?\()
+                                 js2-DOTQUERY
+                               (throw 'return js2-DOT))))
+                          (?|
+                           (if (js2-match-char ?|)
+                               (throw 'return js2-OR)
+                             (if (js2-match-char ?=)
+                                 js2-ASSIGN_BITOR
+                               (throw 'return js2-BITOR))))
+                          (?^
+                           (if (js2-match-char ?=)
+                               js2-ASSIGN_BITOR
+                             (throw 'return js2-BITXOR)))
+                          (?&
+                           (if (js2-match-char ?&)
+                               (throw 'return js2-AND)
+                             (if (js2-match-char ?=)
+                                 js2-ASSIGN_BITAND
+                               (throw 'return js2-BITAND))))
+                          (?=
+                           (if (js2-match-char ?=)
+                               (if (js2-match-char ?=)
+                                   js2-SHEQ
+                                 (throw 'return js2-EQ))
+                             (if (js2-match-char ?>)
+                                 (js2-ts-return token js2-ARROW)
+                               (throw 'return js2-ASSIGN))))
+                          (?!
+                           (if (js2-match-char ?=)
+                               (if (js2-match-char ?=)
+                                   js2-SHNE
+                                 js2-NE)
+                             (throw 'return js2-NOT)))
+                          (?<
+                           ;; NB:treat HTML begin-comment as comment-till-eol
+                           (when (js2-match-char ?!)
+                             (when (js2-match-char ?-)
+                               (when (js2-match-char ?-)
+                                 (js2-skip-line)
+                                 (setf (js2-token-comment-type (js2-current-token)) 'html)
+                                 (throw 'return js2-COMMENT)))
+                             (js2-unget-char))
+                           (if (js2-match-char ?<)
+                               (if (js2-match-char ?=)
+                                   js2-ASSIGN_LSH
+                                 js2-LSH)
+                             (if (js2-match-char ?=)
+                                 js2-LE
+                               (throw 'return js2-LT))))
+                          (?>
+                           (if (js2-match-char ?>)
+                               (if (js2-match-char ?>)
+                                   (if (js2-match-char ?=)
+                                       js2-ASSIGN_URSH
+                                     js2-URSH)
+                                 (if (js2-match-char ?=)
+                                     js2-ASSIGN_RSH
+                                   js2-RSH))
+                             (if (js2-match-char ?=)
+                                 js2-GE
+                               (throw 'return js2-GT))))
+                          (?*
+                           (if (js2-match-char ?=)
+                               js2-ASSIGN_MUL
+                             (throw 'return js2-MUL)))
+                          (?/
+                           ;; is it a // comment?
+                           (when (js2-match-char ?/)
+                             (setf (js2-token-beg token) (- js2-ts-cursor 2))
+                             (js2-skip-line)
+                             (setf (js2-token-comment-type token) 'line)
+                             ;; include newline so highlighting goes to end of
+                             ;; window, if there actually is a newline; if we
+                             ;; hit eof, then implicitly there isn't
+                             (unless js2-ts-hit-eof
+                               (cl-incf (js2-token-end token)))
+                             (throw 'return js2-COMMENT))
+                           ;; is it a /* comment?
+                           (when (js2-match-char ?*)
+                             (setf look-for-slash nil
+                                   (js2-token-beg token) (- js2-ts-cursor 2)
+                                   (js2-token-comment-type token)
+                                   (if (js2-match-char ?*)
+                                       (progn
+                                         (setq look-for-slash t)
+                                         'jsdoc)
+                                     'block))
+                             (while t
+                               (setq c (js2-get-char))
+                               (cond
+                                ((eq c js2-EOF_CHAR)
+                                 (setf (js2-token-end token) (1- js2-ts-cursor))
+                                 (js2-report-error "msg.unterminated.comment")
+                                 (throw 'return js2-COMMENT))
+                                ((eq c ?*)
+                                 (setq look-for-slash t))
+                                ((eq c ?/)
+                                 (if look-for-slash
+                                     (js2-ts-return token js2-COMMENT)))
+                                (t
+                                 (setf look-for-slash nil
+                                       (js2-token-end token) js2-ts-cursor)))))
+                           (if (js2-match-char ?=)
+                               js2-ASSIGN_DIV
+                             (throw 'return js2-DIV)))
+                          (?#
+                           (when js2-skip-preprocessor-directives
+                             (js2-skip-line)
+                             (setf (js2-token-comment-type token) 'preprocessor
+                                   (js2-token-end token) js2-ts-cursor)
+                             (throw 'return js2-COMMENT))
+                           (throw 'return js2-ERROR))
+                          (?%
+                           (if (js2-match-char ?=)
+                               js2-ASSIGN_MOD
+                             (throw 'return js2-MOD)))
+                          (?~
+                           (throw 'return js2-BITNOT))
+                          (?+
+                           (if (js2-match-char ?=)
+                               js2-ASSIGN_ADD
+                             (if (js2-match-char ?+)
+                                 js2-INC
+                               (throw 'return js2-ADD))))
+                          (?-
+                           (cond
+                            ((js2-match-char ?=)
+                             (setq c js2-ASSIGN_SUB))
+                            ((js2-match-char ?-)
+                             (unless js2-ts-dirty-line
+                               ;; treat HTML end-comment after possible whitespace
+                               ;; after line start as comment-until-eol
+                               (when (js2-match-char ?>)
+                                 (js2-skip-line)
+                                 (setf (js2-token-comment-type (js2-current-token)) 'html)
+                                 (throw 'return js2-COMMENT)))
+                             (setq c js2-DEC))
+                            (t
+                             (setq c js2-SUB)))
+                           (setq js2-ts-dirty-line t)
+                           c)
+                          (otherwise
+                           (js2-report-scan-error "msg.illegal.character")))))))
+    (setf (js2-token-type token) tt)
+    token))
+
+(defun js2-get-string-or-template-token (quote-char token)
+  ;; We attempt to accumulate a string the fast way, by
+  ;; building it directly out of the reader.  But if there
+  ;; are any escaped characters in the string, we revert to
+  ;; building it out of a string buffer.
+  (let ((c (js2-get-char))
+        js2-ts-string-buffer
+        nc c1 val escape-val)
+    (catch 'break
+      (while (/= c quote-char)
+        (catch 'continue
+          (when (eq c js2-EOF_CHAR)
+            (js2-unget-char)
+            (js2-report-error "msg.unterminated.string.lit")
+            (throw 'break nil))
+          (when (and (eq c ?\n) (not (eq quote-char ?`)))
+            (js2-unget-char)
+            (js2-report-error "msg.unterminated.string.lit")
+            (throw 'break nil))
+          (when (eq c ?\\)
+            ;; We've hit an escaped character
+            (setq c (js2-get-char))
+            (cl-case c
+              (?b (setq c ?\b))
+              (?f (setq c ?\f))
+              (?n (setq c ?\n))
+              (?r (setq c ?\r))
+              (?t (setq c ?\t))
+              (?v (setq c ?\v))
+              (?u
+               (setq c1 (js2-read-unicode-escape))
+               (if js2-parse-ide-mode
+                   (if c1
+                       (progn
+                         ;; just copy the string in IDE-mode
+                         (js2-add-to-string ?\\)
+                         (js2-add-to-string ?u)
+                         (dotimes (_ 3)
+                           (js2-add-to-string (js2-get-char)))
+                         (setq c (js2-get-char))) ; added at end of loop
+                     ;; flag it as an invalid escape
+                     (js2-report-warning "msg.invalid.escape"
+                                         nil (- js2-ts-cursor 2) 6))
+                 ;; Get 4 hex digits; if the u escape is not
+                 ;; followed by 4 hex digits, use 'u' + the
+                 ;; literal character sequence that follows.
+                 (js2-add-to-string ?u)
+                 (setq escape-val 0)
+                 (dotimes (_ 4)
+                   (setq c (js2-get-char)
+                         escape-val (js2-x-digit-to-int c escape-val))
+                   (if (cl-minusp escape-val)
+                       (throw 'continue nil))
+                   (js2-add-to-string c))
+                 ;; prepare for replace of stored 'u' sequence by escape value
+                 (setq js2-ts-string-buffer (nthcdr 5 js2-ts-string-buffer)
+                       c escape-val)))
+              (?x
+               ;; Get 2 hex digits, defaulting to 'x'+literal
+               ;; sequence, as above.
+               (setq c (js2-get-char)
+                     escape-val (js2-x-digit-to-int c 0))
+               (if (cl-minusp escape-val)
+                   (progn
+                     (js2-add-to-string ?x)
+                     (throw 'continue nil))
+                 (setq c1 c
+                       c (js2-get-char)
+                       escape-val (js2-x-digit-to-int c escape-val))
+                 (if (cl-minusp escape-val)
+                     (progn
+                       (js2-add-to-string ?x)
+                       (js2-add-to-string c1)
+                       (throw 'continue nil))
+                   ;; got 2 hex digits
+                   (setq c escape-val))))
+              (?\n
+               ;; Remove line terminator after escape to follow
+               ;; SpiderMonkey and C/C++
+               (setq c (js2-get-char))
+               (throw 'continue nil))
+              (t
+               (when (and (<= ?0 c) (< c ?8))
+                 (setq val (- c ?0)
+                       c (js2-get-char))
+                 (when (and (<= ?0 c) (< c ?8))
+                   (setq val (- (+ (* 8 val) c) ?0)
+                         c (js2-get-char))
+                   (when (and (<= ?0 c)
+                              (< c ?8)
+                              (< val #o37))
+                     ;; c is 3rd char of octal sequence only
+                     ;; if the resulting val <= 0377
+                     (setq val (- (+ (* 8 val) c) ?0)
+                           c (js2-get-char))))
+                 (js2-unget-char)
+                 (setq c val)))))
+          (when (and (eq quote-char ?`) (eq c ?$))
+            (when (eq (setq nc (js2-get-char)) ?\{)
+              (throw 'break nil))
+            (js2-unget-char))
+          (js2-add-to-string c)
+          (setq c (js2-get-char)))))
+    (js2-set-string-from-buffer token)
+    (if (not (eq quote-char ?`))
+        js2-STRING
+      (if (and (eq c ?$) (eq nc ?\{))
+          js2-TEMPLATE_HEAD
+        js2-NO_SUBS_TEMPLATE))))
+
+(defun js2-read-regexp (start-tt)
+  "Called by parser when it gets / or /= in literal context."
+  (let (c err
+        in-class  ; inside a '[' .. ']' character-class
+        flags
+        (continue t)
+        (token (js2-new-token 0)))
+    (setq js2-ts-string-buffer nil)
+    (if (eq start-tt js2-ASSIGN_DIV)
+        ;; mis-scanned /=
+        (js2-add-to-string ?=)
+      (if (not (eq start-tt js2-DIV))
+          (error "failed assertion")))
+    (while (and (not err)
+                (or (/= (setq c (js2-get-char)) ?/)
+                    in-class))
+      (cond
+       ((or (= c ?\n)
+            (= c js2-EOF_CHAR))
+        (setf (js2-token-end token) (1- js2-ts-cursor)
+              err t
+              (js2-token-string token) (js2-collect-string js2-ts-string-buffer))
+        (js2-report-error "msg.unterminated.re.lit"))
+       (t (cond
+           ((= c ?\\)
+            (js2-add-to-string c)
+            (setq c (js2-get-char)))
+           ((= c ?\[)
+            (setq in-class t))
+           ((= c ?\])
+            (setq in-class nil)))
+          (js2-add-to-string c))))
+    (unless err
+      (while continue
+        (cond
+         ((js2-match-char ?g)
+          (push ?g flags))
+         ((js2-match-char ?i)
+          (push ?i flags))
+         ((js2-match-char ?m)
+          (push ?m flags))
+         ((and (js2-match-char ?u)
+               (>= js2-language-version 200))
+          (push ?u flags))
+         ((and (js2-match-char ?y)
+               (>= js2-language-version 200))
+          (push ?y flags))
+         (t
+          (setq continue nil))))
+      (if (js2-alpha-p (js2-peek-char))
+          (js2-report-scan-error "msg.invalid.re.flag" t
+                                 js2-ts-cursor 1))
+      (js2-set-string-from-buffer token))
+    (js2-collect-string flags)))
+
+(defun js2-get-first-xml-token ()
+  (setq js2-ts-xml-open-tags-count 0
+        js2-ts-is-xml-attribute nil
+        js2-ts-xml-is-tag-content nil)
+  (js2-unget-char)
+  (js2-get-next-xml-token))
+
+(defun js2-xml-discard-string (token)
+  "Throw away the string in progress and flag an XML parse error."
+  (setf js2-ts-string-buffer nil
+        (js2-token-string token) nil)
+  (js2-report-scan-error "msg.XML.bad.form" t))
+
+(defun js2-get-next-xml-token ()
+  (setq js2-ts-string-buffer nil)  ; for recording the XML
+  (let ((token (js2-new-token 0))
+        c result)
+    (setq result
+          (catch 'return
+            (while t
+              (setq c (js2-get-char))
+              (cond
+               ((= c js2-EOF_CHAR)
+                (throw 'return js2-ERROR))
+               (js2-ts-xml-is-tag-content
+                (cl-case c
+                  (?>
+                   (js2-add-to-string c)
+                   (setq js2-ts-xml-is-tag-content nil
+                         js2-ts-is-xml-attribute nil))
+                  (?/
+                   (js2-add-to-string c)
+                   (when (eq ?> (js2-peek-char))
+                     (setq c (js2-get-char))
+                     (js2-add-to-string c)
+                     (setq js2-ts-xml-is-tag-content nil)
+                     (cl-decf js2-ts-xml-open-tags-count)))
+                  (?{
+                   (js2-unget-char)
+                   (js2-set-string-from-buffer token)
+                   (throw 'return js2-XML))
+                  ((?\' ?\")
+                   (js2-add-to-string c)
+                   (unless (js2-read-quoted-string c token)
+                     (throw 'return js2-ERROR)))
+                  (?=
+                   (js2-add-to-string c)
+                   (setq js2-ts-is-xml-attribute t))
+                  ((? ?\t ?\r ?\n)
+                   (js2-add-to-string c))
+                  (t
+                   (js2-add-to-string c)
+                   (setq js2-ts-is-xml-attribute nil)))
+                (when (and (not js2-ts-xml-is-tag-content)
+                           (zerop js2-ts-xml-open-tags-count))
+                  (js2-set-string-from-buffer token)
+                  (throw 'return js2-XMLEND)))
+               (t
+                ;; else not tag content
+                (cl-case c
+                  (?<
+                   (js2-add-to-string c)
+                   (setq c (js2-peek-char))
+                   (cl-case c
+                     (?!
+                      (setq c (js2-get-char)) ;; skip !
+                      (js2-add-to-string c)
+                      (setq c (js2-peek-char))
+                      (cl-case c
+                        (?-
+                         (setq c (js2-get-char)) ;; skip -
+                         (js2-add-to-string c)
+                         (if (eq c ?-)
+                             (progn
+                               (js2-add-to-string c)
+                               (unless (js2-read-xml-comment token)
+                                 (throw 'return js2-ERROR)))
+                           (js2-xml-discard-string token)
+                           (throw 'return js2-ERROR)))
+                        (?\[
+                         (setq c (js2-get-char)) ;; skip [
+                         (js2-add-to-string c)
+                         (if (and (= (js2-get-char) ?C)
+                                  (= (js2-get-char) ?D)
+                                  (= (js2-get-char) ?A)
+                                  (= (js2-get-char) ?T)
+                                  (= (js2-get-char) ?A)
+                                  (= (js2-get-char) ?\[))
+                             (progn
+                               (js2-add-to-string ?C)
+                               (js2-add-to-string ?D)
+                               (js2-add-to-string ?A)
+                               (js2-add-to-string ?T)
+                               (js2-add-to-string ?A)
+                               (js2-add-to-string ?\[)
+                               (unless (js2-read-cdata token)
+                                 (throw 'return js2-ERROR)))
+                           (js2-xml-discard-string token)
+                           (throw 'return js2-ERROR)))
+                        (t
+                         (unless (js2-read-entity token)
+                           (throw 'return js2-ERROR))))
+                      ;; Allow bare CDATA section, e.g.:
+                      ;;   let xml = <![CDATA[ foo bar baz ]]>;
+                      (when (zerop js2-ts-xml-open-tags-count)
+                        (throw 'return js2-XMLEND)))
+                     (??
+                      (setq c (js2-get-char)) ;; skip ?
+                      (js2-add-to-string c)
+                      (unless (js2-read-PI token)
+                        (throw 'return js2-ERROR)))
+                     (?/
+                      ;; end tag
+                      (setq c (js2-get-char)) ;; skip /
+                      (js2-add-to-string c)
+                      (when (zerop js2-ts-xml-open-tags-count)
+                        (js2-xml-discard-string token)
+                        (throw 'return js2-ERROR))
+                      (setq js2-ts-xml-is-tag-content t)
+                      (cl-decf js2-ts-xml-open-tags-count))
+                     (t
+                      ;; start tag
+                      (setq js2-ts-xml-is-tag-content t)
+                      (cl-incf js2-ts-xml-open-tags-count))))
+                  (?{
+                   (js2-unget-char)
+                   (js2-set-string-from-buffer token)
+                   (throw 'return js2-XML))
+                  (t
+                   (js2-add-to-string c))))))))
+    (setf (js2-token-end token) js2-ts-cursor)
+    (setf (js2-token-type token) result)
+    result))
+
+(defun js2-read-quoted-string (quote token)
+  (let (c)
+    (catch 'return
+      (while (/= (setq c (js2-get-char)) js2-EOF_CHAR)
+        (js2-add-to-string c)
+        (if (eq c quote)
+            (throw 'return t)))
+      (js2-xml-discard-string token)  ;; throw away string in progress
+      nil)))
+
+(defun js2-read-xml-comment (token)
+  (let ((c (js2-get-char)))
+    (catch 'return
+      (while (/= c js2-EOF_CHAR)
+        (catch 'continue
+          (js2-add-to-string c)
+          (when (and (eq c ?-) (eq ?- (js2-peek-char)))
+            (setq c (js2-get-char))
+            (js2-add-to-string c)
+            (if (eq (js2-peek-char) ?>)
+                (progn
+                  (setq c (js2-get-char)) ;; skip >
+                  (js2-add-to-string c)
+                  (throw 'return t))
+              (throw 'continue nil)))
+          (setq c (js2-get-char))))
+      (js2-xml-discard-string token)
+      nil)))
+
+(defun js2-read-cdata (token)
+  (let ((c (js2-get-char)))
+    (catch 'return
+      (while (/= c js2-EOF_CHAR)
+        (catch 'continue
+          (js2-add-to-string c)
+          (when (and (eq c ?\]) (eq (js2-peek-char) ?\]))
+            (setq c (js2-get-char))
+            (js2-add-to-string c)
+            (if (eq (js2-peek-char) ?>)
+                (progn
+                  (setq c (js2-get-char)) ;; Skip >
+                  (js2-add-to-string c)
+                  (throw 'return t))
+              (throw 'continue nil)))
+          (setq c (js2-get-char))))
+      (js2-xml-discard-string token)
+      nil)))
+
+(defun js2-read-entity (token)
+  (let ((decl-tags 1)
+        c)
+    (catch 'return
+      (while (/= js2-EOF_CHAR (setq c (js2-get-char)))
+        (js2-add-to-string c)
+        (cl-case c
+          (?<
+           (cl-incf decl-tags))
+          (?>
+           (cl-decf decl-tags)
+           (if (zerop decl-tags)
+               (throw 'return t)))))
+      (js2-xml-discard-string token)
+      nil)))
+
+(defun js2-read-PI (token)
+  "Scan an XML processing instruction."
+  (let (c)
+    (catch 'return
+      (while (/= js2-EOF_CHAR (setq c (js2-get-char)))
+        (js2-add-to-string c)
+        (when (and (eq c ??) (eq (js2-peek-char) ?>))
+          (setq c (js2-get-char))  ;; Skip >
+          (js2-add-to-string c)
+          (throw 'return t)))
+      (js2-xml-discard-string token)
+      nil)))
+
+;;; Highlighting
+
+(defun js2-set-face (beg end face &optional record)
+  "Fontify a region.  If RECORD is non-nil, record for later."
+  (when (cl-plusp js2-highlight-level)
+    (setq beg (min (point-max) beg)
+          beg (max (point-min) beg)
+          end (min (point-max) end)
+          end (max (point-min) end))
+    (if record
+        (push (list beg end face) js2-mode-fontifications)
+      (put-text-property beg end 'font-lock-face face))))
+
+(defsubst js2-clear-face (beg end)
+  (remove-text-properties beg end '(font-lock-face nil
+                                    help-echo nil
+                                    point-entered nil
+                                    cursor-sensor-functions nil
+                                    c-in-sws nil)))
+
+(defconst js2-ecma-global-props
+  (concat "^"
+          (regexp-opt
+           '("Infinity" "NaN" "undefined" "arguments") t)
+          "$")
+  "Value properties of the Ecma-262 Global Object.
+Shown at or above `js2-highlight-level' 2.")
+
+;; might want to add the name "arguments" to this list?
+(defconst js2-ecma-object-props
+  (concat "^"
+          (regexp-opt
+           '("prototype" "__proto__" "__parent__") t)
+          "$")
+  "Value properties of the Ecma-262 Object constructor.
+Shown at or above `js2-highlight-level' 2.")
+
+(defconst js2-ecma-global-funcs
+  (concat
+   "^"
+   (regexp-opt
+    '("decodeURI" "decodeURIComponent" "encodeURI" "encodeURIComponent"
+      "eval" "isFinite" "isNaN" "parseFloat" "parseInt") t)
+   "$")
+  "Function properties of the Ecma-262 Global object.
+Shown at or above `js2-highlight-level' 2.")
+
+(defconst js2-ecma-number-props
+  (concat "^"
+          (regexp-opt '("MAX_VALUE" "MIN_VALUE" "NaN"
+                        "NEGATIVE_INFINITY"
+                        "POSITIVE_INFINITY") t)
+          "$")
+  "Properties of the Ecma-262 Number constructor.
+Shown at or above `js2-highlight-level' 2.")
+
+(defconst js2-ecma-date-props "^\\(parse\\|UTC\\)$"
+  "Properties of the Ecma-262 Date constructor.
+Shown at or above `js2-highlight-level' 2.")
+
+(defconst js2-ecma-math-props
+  (concat "^"
+          (regexp-opt
+           '("E" "LN10" "LN2" "LOG2E" "LOG10E" "PI" "SQRT1_2" "SQRT2")
+           t)
+          "$")
+  "Properties of the Ecma-262 Math object.
+Shown at or above `js2-highlight-level' 2.")
+
+(defconst js2-ecma-math-funcs
+  (concat "^"
+          (regexp-opt
+           '("abs" "acos" "asin" "atan" "atan2" "ceil" "cos" "exp" "floor"
+             "log" "max" "min" "pow" "random" "round" "sin" "sqrt" "tan") t)
+          "$")
+  "Function properties of the Ecma-262 Math object.
+Shown at or above `js2-highlight-level' 2.")
+
+(defconst js2-ecma-function-props
+  (concat
+   "^"
+   (regexp-opt
+    '(;; properties of the Object prototype object
+      "hasOwnProperty" "isPrototypeOf" "propertyIsEnumerable"
+      "toLocaleString" "toString" "valueOf"
+      ;; properties of the Function prototype object
+      "apply" "call"
+      ;; properties of the Array prototype object
+      "concat" "join" "pop" "push" "reverse" "shift" "slice" "sort"
+      "splice" "unshift"
+      ;; properties of the String prototype object
+      "charAt" "charCodeAt" "fromCharCode" "indexOf" "lastIndexOf"
+      "localeCompare" "match" "replace" "search" "split" "substring"
+      "toLocaleLowerCase" "toLocaleUpperCase" "toLowerCase"
+      "toUpperCase"
+      ;; properties of the Number prototype object
+      "toExponential" "toFixed" "toPrecision"
+      ;; properties of the Date prototype object
+      "getDate" "getDay" "getFullYear" "getHours" "getMilliseconds"
+      "getMinutes" "getMonth" "getSeconds" "getTime"
+      "getTimezoneOffset" "getUTCDate" "getUTCDay" "getUTCFullYear"
+      "getUTCHours" "getUTCMilliseconds" "getUTCMinutes" "getUTCMonth"
+      "getUTCSeconds" "setDate" "setFullYear" "setHours"
+      "setMilliseconds" "setMinutes" "setMonth" "setSeconds" "setTime"
+      "setUTCDate" "setUTCFullYear" "setUTCHours" "setUTCMilliseconds"
+      "setUTCMinutes" "setUTCMonth" "setUTCSeconds" "toDateString"
+      "toLocaleDateString" "toLocaleString" "toLocaleTimeString"
+      "toTimeString" "toUTCString"
+      ;; properties of the RegExp prototype object
+      "exec" "test"
+      ;; properties of the JSON prototype object
+      "parse" "stringify"
+      ;; SpiderMonkey/Rhino extensions, versions 1.5+
+      "toSource" "__defineGetter__" "__defineSetter__"
+      "__lookupGetter__" "__lookupSetter__" "__noSuchMethod__"
+      "every" "filter" "forEach" "lastIndexOf" "map" "some")
+    t)
+   "$")
+  "Built-in functions defined by Ecma-262 and SpiderMonkey extensions.
+Shown at or above `js2-highlight-level' 3.")
+
+(defun js2-parse-highlight-prop-get (parent target prop call-p)
+  (let ((target-name (and target
+                          (js2-name-node-p target)
+                          (js2-name-node-name target)))
+        (prop-name (if prop (js2-name-node-name prop)))
+        (level2 (>= js2-highlight-level 2))
+        (level3 (>= js2-highlight-level 3)))
+    (when level2
+      (let ((face
+             (if call-p
+                 (cond
+                  ((and target prop)
+                   (cond
+                    ((and level3 (string-match js2-ecma-function-props prop-name))
+                     'font-lock-builtin-face)
+                    ((and target-name prop)
+                     (cond
+                      ((string= target-name "Date")
+                       (if (string-match js2-ecma-date-props prop-name)
+                           'font-lock-builtin-face))
+                      ((string= target-name "Math")
+                       (if (string-match js2-ecma-math-funcs prop-name)
+                           'font-lock-builtin-face))))))
+                  (prop
+                   (if (string-match js2-ecma-global-funcs prop-name)
+                       'font-lock-builtin-face)))
+               (cond
+                ((and target prop)
+                 (cond
+                  ((string= target-name "Number")
+                   (if (string-match js2-ecma-number-props prop-name)
+                       'font-lock-constant-face))
+                  ((string= target-name "Math")
+                   (if (string-match js2-ecma-math-props prop-name)
+                       'font-lock-constant-face))))
+                (prop
+                 (if (string-match js2-ecma-object-props prop-name)
+                     'font-lock-constant-face))))))
+        (when (and (not face) target (not call-p) prop-name)
+          (setq face 'js2-object-property))
+        (when face
+          (let ((pos (+ (js2-node-pos parent)  ; absolute
+                        (js2-node-pos prop)))) ; relative
+            (js2-set-face pos
+                          (+ pos (js2-node-len prop))
+                          face 'record)))))))
+
+(defun js2-parse-highlight-member-expr-node (node)
+  "Perform syntax highlighting of EcmaScript built-in properties.
+The variable `js2-highlight-level' governs this highlighting."
+  (let (face target prop name pos end parent call-p callee)
+    (cond
+     ;; case 1:  simple name, e.g. foo
+     ((js2-name-node-p node)
+      (setq name (js2-name-node-name node))
+      ;; possible for name to be nil in rare cases - saw it when
+      ;; running js2-mode on an elisp buffer.  Might as well try to
+      ;; make it so js2-mode never barfs.
+      (when name
+        (setq face (if (string-match js2-ecma-global-props name)
+                       'font-lock-constant-face))
+        (when face
+          (setq pos (js2-node-pos node)
+                end (+ pos (js2-node-len node)))
+          (js2-set-face pos end face 'record))))
+     ;; case 2:  property access or function call
+     ((or (js2-prop-get-node-p node)
+          ;; highlight function call if expr is a prop-get node
+          ;; or a plain name (i.e. unqualified function call)
+          (and (setq call-p (js2-call-node-p node))
+               (setq callee (js2-call-node-target node)) ; separate setq!
+               (or (js2-prop-get-node-p callee)
+                   (js2-name-node-p callee))))
+      (setq parent node
+            node (if call-p callee node))
+      (if (and call-p (js2-name-node-p callee))
+          (setq prop callee)
+        (setq target (js2-prop-get-node-left node)
+              prop (js2-prop-get-node-right node)))
+      (cond
+       ((js2-name-node-p prop)
+        ;; case 2(a&c):  simple or complex target, simple name, e.g. x[y].bar
+        (js2-parse-highlight-prop-get parent target prop call-p))
+       ((js2-name-node-p target)
+        ;; case 2b:  simple target, complex name, e.g. foo.x[y]
+        (js2-parse-highlight-prop-get parent target nil call-p)))))))
+
+(defun js2-parse-highlight-member-expr-fn-name (expr)
+  "Highlight the `baz' in function foo.bar.baz(args) {...}.
+This is experimental Rhino syntax.  EXPR is the foo.bar.baz member expr.
+We currently only handle the case where the last component is a prop-get
+of a simple name.  Called before EXPR has a parent node."
+  (let (pos
+        (name (and (js2-prop-get-node-p expr)
+                   (js2-prop-get-node-right expr))))
+    (when (js2-name-node-p name)
+      (js2-set-face (setq pos (+ (js2-node-pos expr)  ; parent is absolute
+                                 (js2-node-pos name)))
+                    (+ pos (js2-node-len name))
+                    'font-lock-function-name-face
+                    'record))))
+
+;; source:  http://jsdoc.sourceforge.net/
+;; Note - this syntax is for Google's enhanced jsdoc parser that
+;; allows type specifications, and needs work before entering the wild.
+
+(defconst js2-jsdoc-param-tag-regexp
+  (concat "^\\s-*\\*+\\s-*\\(@"
+          "\\(?:param\\|arg\\(?:ument\\)?\\|prop\\(?:erty\\)?\\)"
+          "\\)"
+          "\\s-*\\({[^}]+}\\)?"         ; optional type
+          "\\s-*\\[?\\([[:alnum:]_$\.]+\\)?\\]?"  ; name
+          "\\_>")
+  "Matches jsdoc tags with optional type and optional param name.")
+
+(defconst js2-jsdoc-typed-tag-regexp
+  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
+          (regexp-opt
+           '("enum"
+             "extends"
+             "field"
+             "id"
+             "implements"
+             "lends"
+             "mods"
+             "requires"
+             "return"
+             "returns"
+             "throw"
+             "throws"))
+          "\\)\\)\\s-*\\({[^}]+}\\)?")
+  "Matches jsdoc tags with optional type.")
+
+(defconst js2-jsdoc-arg-tag-regexp
+  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
+          (regexp-opt
+           '("alias"
+             "augments"
+             "borrows"
+             "bug"
+             "base"
+             "config"
+             "default"
+             "define"
+             "exception"
+             "function"
+             "member"
+             "memberOf"
+             "name"
+             "namespace"
+             "since"
+             "suppress"
+             "this"
+             "throws"
+             "type"
+             "version"))
+          "\\)\\)\\s-+\\([^ \t]+\\)")
+  "Matches jsdoc tags with a single argument.")
+
+(defconst js2-jsdoc-empty-tag-regexp
+  (concat "^\\s-*\\*+\\s-*\\(@\\(?:"
+          (regexp-opt
+           '("addon"
+             "author"
+             "class"
+             "const"
+             "constant"
+             "constructor"
+             "constructs"
+             "deprecated"
+             "desc"
+             "description"
+             "event"
+             "example"
+             "exec"
+             "export"
+             "fileoverview"
+             "final"
+             "function"
+             "hidden"
+             "ignore"
+             "implicitCast"
+             "inheritDoc"
+             "inner"
+             "interface"
+             "license"
+             "noalias"
+             "noshadow"
+             "notypecheck"
+             "override"
+             "owner"
+             "preserve"
+             "preserveTry"
+             "private"
+             "protected"
+             "public"
+             "static"
+             "supported"
+             ))
+          "\\)\\)\\s-*")
+  "Matches empty jsdoc tags.")
+
+(defconst js2-jsdoc-link-tag-regexp
+  "{\\(@\\(?:link\\|code\\)\\)\\s-+\\([^#}\n]+\\)\\(#.+\\)?}"
+  "Matches a jsdoc link or code tag.")
+
+(defconst js2-jsdoc-see-tag-regexp
+  "^\\s-*\\*+\\s-*\\(@see\\)\\s-+\\([^#}\n]+\\)\\(#.+\\)?"
+  "Matches a jsdoc @see tag.")
+
+(defconst js2-jsdoc-html-tag-regexp
+  "\\(</?\\)\\([[:alpha:]]+\\)\\s-*\\(/?>\\)"
+  "Matches a simple (no attributes) html start- or end-tag.")
+
+(defun js2-jsdoc-highlight-helper ()
+  (js2-set-face (match-beginning 1)
+                (match-end 1)
+                'js2-jsdoc-tag)
+  (if (match-beginning 2)
+      (if (save-excursion
+            (goto-char (match-beginning 2))
+            (= (char-after) ?{))
+          (js2-set-face (1+ (match-beginning 2))
+                        (1- (match-end 2))
+                        'js2-jsdoc-type)
+        (js2-set-face (match-beginning 2)
+                      (match-end 2)
+                      'js2-jsdoc-value)))
+  (if (match-beginning 3)
+      (js2-set-face (match-beginning 3)
+                    (match-end 3)
+                    'js2-jsdoc-value)))
+
+(defun js2-highlight-jsdoc (ast)
+  "Highlight doc comment tags."
+  (let ((comments (js2-ast-root-comments ast))
+        beg end)
+    (save-excursion
+      (dolist (node comments)
+        (when (eq (js2-comment-node-format node) 'jsdoc)
+          (setq beg (js2-node-abs-pos node)
+                end (+ beg (js2-node-len node)))
+          (save-restriction
+            (narrow-to-region beg end)
+            (dolist (re (list js2-jsdoc-param-tag-regexp
+                              js2-jsdoc-typed-tag-regexp
+                              js2-jsdoc-arg-tag-regexp
+                              js2-jsdoc-link-tag-regexp
+                              js2-jsdoc-see-tag-regexp
+                              js2-jsdoc-empty-tag-regexp))
+              (goto-char beg)
+              (while (re-search-forward re nil t)
+                (js2-jsdoc-highlight-helper)))
+            ;; simple highlighting for html tags
+            (goto-char beg)
+            (while (re-search-forward js2-jsdoc-html-tag-regexp nil t)
+              (js2-set-face (match-beginning 1)
+                            (match-end 1)
+                            'js2-jsdoc-html-tag-delimiter)
+              (js2-set-face (match-beginning 2)
+                            (match-end 2)
+                            'js2-jsdoc-html-tag-name)
+              (js2-set-face (match-beginning 3)
+                            (match-end 3)
+                            'js2-jsdoc-html-tag-delimiter))))))))
+
+(defun js2-highlight-assign-targets (_node left right)
+  "Highlight function properties and external variables."
+  (let (leftpos name)
+    ;; highlight vars and props assigned function values
+    (when (or (js2-function-node-p right)
+              (js2-class-node-p right))
+      (cond
+       ;; var foo = function() {...}
+       ((js2-name-node-p left)
+        (setq name left))
+       ;; foo.bar.baz = function() {...}
+       ((and (js2-prop-get-node-p left)
+             (js2-name-node-p (js2-prop-get-node-right left)))
+        (setq name (js2-prop-get-node-right left))))
+      (when name
+        (js2-set-face (setq leftpos (js2-node-abs-pos name))
+                      (+ leftpos (js2-node-len name))
+                      'font-lock-function-name-face
+                      'record)))))
+
+(defun js2-record-name-node (node)
+  "Saves NODE to `js2-recorded-identifiers' to check for undeclared variables
+later. NODE must be a name node."
+  (let ((leftpos (js2-node-abs-pos node)))
+    (push (list node js2-current-scope
+                leftpos
+                (+ leftpos (js2-node-len node)))
+          js2-recorded-identifiers)))
+
+(defun js2-highlight-undeclared-vars ()
+  "After entire parse is finished, look for undeclared variable references.
+We have to wait until entire buffer is parsed, since JavaScript permits var
+decls to occur after they're used.
+
+If any undeclared var name is in `js2-externs' or `js2-additional-externs',
+it is considered declared."
+  (let (name)
+    (dolist (entry js2-recorded-identifiers)
+      (cl-destructuring-bind (name-node scope pos end) entry
+        (setq name (js2-name-node-name name-node))
+        (unless (or (member name js2-global-externs)
+                    (member name js2-default-externs)
+                    (member name js2-additional-externs)
+                    (js2-get-defining-scope scope name pos))
+          (js2-report-warning "msg.undeclared.variable" name pos (- end pos)
+                              'js2-external-variable))))))
+
+(defun js2--add-or-update-symbol (symbol inition used vars)
+  "Add or update SYMBOL entry in VARS, an hash table.
+SYMBOL is a js2-name-node, INITION either nil, t, or ?P,
+respectively meaning that SYMBOL is a mere declaration, an
+assignment or a function parameter; when USED is t, the symbol
+node is assumed to be an usage and thus added to the list stored
+in the cdr of the entry.
+"
+  (let* ((nm (js2-name-node-name symbol))
+         (es (js2-node-get-enclosing-scope symbol))
+         (ds (js2-get-defining-scope es nm)))
+    (when (and ds (not (equal nm "arguments")))
+      (let* ((sym (js2-scope-get-symbol ds nm))
+             (var (gethash sym vars))
+             (err-var-p (js2-catch-node-p ds)))
+        (unless inition
+          (setq inition err-var-p))
+        (if var
+            (progn
+              (when (and inition (not (equal (car var) ?P)))
+                (setcar var inition))
+              (when used
+                (push symbol (cdr var))))
+          ;; do not consider the declaration of catch parameter as an usage
+          (when (and err-var-p used)
+            (setq used nil))
+          (puthash sym (cons inition (if used (list symbol))) vars))))))
+
+(defun js2--classify-variables ()
+  "Collect and classify variables declared or used within js2-mode-ast.
+Traverse the whole ast tree returning a summary of the variables
+usage as an hash-table, keyed by their corresponding symbol table
+entry.
+Each variable is described by a tuple where the car is a flag
+indicating whether the variable has been initialized and the cdr
+is a possibly empty list of name nodes where it is used. External
+symbols, i.e. those not present in the whole scopes hierarchy,
+are ignored."
+  (let ((vars (make-hash-table :test #'eq :size 100)))
+    (js2-visit-ast
+     js2-mode-ast
+     (lambda (node end-p)
+       (when (null end-p)
+         (cond
+          ((js2-var-init-node-p node)
+           ;; take note about possibly initialized declarations
+           (let ((target (js2-var-init-node-target node))
+                 (initializer (js2-var-init-node-initializer node)))
+             (when target
+               (let* ((parent (js2-node-parent node))
+                      (grandparent (if parent (js2-node-parent parent)))
+                      (inited (not (null initializer))))
+                 (unless inited
+                   (setq inited
+                         (and grandparent
+                              (js2-for-in-node-p grandparent)
+                              (memq target
+                                    (mapcar #'js2-var-init-node-target
+                                            (js2-var-decl-node-kids
+                                             (js2-for-in-node-iterator grandparent)))))))
+                 (js2--add-or-update-symbol target inited nil vars)))))
+
+          ((js2-assign-node-p node)
+           ;; take note about assignments
+           (let ((left (js2-assign-node-left node)))
+             (when (js2-name-node-p left)
+               (js2--add-or-update-symbol left t nil vars))))
+
+          ((js2-prop-get-node-p node)
+           ;; handle x.y.z nodes, considering only x
+           (let ((left (js2-prop-get-node-left node)))
+             (when (js2-name-node-p left)
+               (js2--add-or-update-symbol left nil t vars))))
+
+          ((js2-name-node-p node)
+           ;; take note about used variables
+           (let ((parent (js2-node-parent node)))
+             (when parent
+               (unless (or (and (js2-var-init-node-p parent) ; handled above
+                                (eq node (js2-var-init-node-target parent)))
+                           (and (js2-assign-node-p parent)
+                                (eq node (js2-assign-node-left parent)))
+                           (js2-prop-get-node-p parent))
+                 (let ((used t) inited)
+                   (cond
+                    ((and (js2-function-node-p parent)
+                          (js2-wrapper-function-p parent))
+                     (setq inited (if (memq node (js2-function-node-params parent)) ?P t)))
+
+                    ((js2-for-in-node-p parent)
+                     (if (eq node (js2-for-in-node-iterator parent))
+                         (setq inited t used nil)))
+
+                    ((js2-function-node-p parent)
+                     (setq inited (if (memq node (js2-function-node-params parent)) ?P t)
+                           used nil)))
+
+                   (unless used
+                     (let ((grandparent (js2-node-parent parent)))
+                       (when grandparent
+                         (setq used (js2-return-node-p grandparent)))))
+
+                   (js2--add-or-update-symbol node inited used vars))))))))
+       t))
+    vars))
+
+(defun js2--get-name-node (node)
+  (cond
+   ((js2-name-node-p node) node)
+   ((js2-function-node-p node)
+    (js2-function-node-name node))
+   ((js2-class-node-p node)
+    (js2-class-node-name node))
+   ((js2-comp-loop-node-p node)
+    (js2-comp-loop-node-iterator node))
+   (t node)))
+
+(defun js2--highlight-unused-variable (symbol info)
+  (let ((name (js2-symbol-name symbol))
+        (inited (car info))
+        (refs (cdr info))
+        pos len)
+    (unless (and inited refs)
+      (if refs
+          (dolist (ref refs)
+            (setq pos (js2-node-abs-pos ref))
+            (setq len (js2-name-node-len ref))
+            (js2-report-warning "msg.uninitialized.variable" name pos len
+                                'js2-warning))
+        (when (or js2-warn-about-unused-function-arguments
+                  (not (eq inited ?P)))
+          (let* ((symn (js2-symbol-ast-node symbol))
+                 (namen (js2--get-name-node symn)))
+            (unless (js2-node-top-level-decl-p namen)
+              (setq pos (js2-node-abs-pos namen))
+              (setq len (js2-name-node-len namen))
+              (js2-report-warning "msg.unused.variable" name pos len
+                                  'js2-warning))))))))
+
+(defun js2-highlight-unused-variables ()
+  "Highlight unused variables."
+  (let ((vars (js2--classify-variables)))
+    (maphash #'js2--highlight-unused-variable vars)))
+
+;;;###autoload
+(define-minor-mode js2-highlight-unused-variables-mode
+  "Toggle highlight of unused variables."
+  :lighter ""
+  (if js2-highlight-unused-variables-mode
+      (add-hook 'js2-post-parse-callbacks
+                #'js2-highlight-unused-variables nil t)
+    (remove-hook 'js2-post-parse-callbacks
+                 #'js2-highlight-unused-variables t)))
+
+(defun js2-set-default-externs ()
+  "Set the value of `js2-default-externs' based on the various
+`js2-include-?-externs' variables."
+  (setq js2-default-externs
+        (append js2-ecma-262-externs
+                (if js2-include-browser-externs js2-browser-externs)
+                (if (and js2-include-browser-externs
+                         (>= js2-language-version 200)) js2-harmony-externs)
+                (if js2-include-rhino-externs js2-rhino-externs)
+                (if js2-include-node-externs js2-node-externs)
+                (if (or js2-include-browser-externs js2-include-node-externs)
+                    js2-typed-array-externs))))
+
+(defun js2-apply-jslint-globals ()
+  (setq js2-additional-externs
+        (nconc (js2-get-jslint-globals)
+               js2-additional-externs)))
+
+(defun js2-get-jslint-globals ()
+  (cl-loop for node in (js2-ast-root-comments js2-mode-ast)
+           when (and (eq 'block (js2-comment-node-format node))
+                     (save-excursion
+                       (goto-char (js2-node-abs-pos node))
+                       (looking-at "/\\*global ")))
+           append (js2-get-jslint-globals-in
+                   (match-end 0)
+                   (js2-node-abs-end node))))
+
+(defun js2-get-jslint-globals-in (beg end)
+  (let (res)
+    (save-excursion
+      (goto-char beg)
+      (while (re-search-forward js2-mode-identifier-re end t)
+        (let ((match (match-string 0)))
+          (unless (member match '("true" "false"))
+            (push match res)))))
+    (nreverse res)))
+
+;;; IMenu support
+
+;; We currently only support imenu, but eventually should support speedbar and
+;; possibly other browsing mechanisms.
+
+;; The basic strategy is to identify function assignment targets of the form
+;; `foo.bar.baz', convert them to (list fn foo bar baz <position>), and push the
+;; list into `js2-imenu-recorder'.  The lists are merged into a trie-like tree
+;; for imenu after parsing is finished.
+
+;; A `foo.bar.baz' assignment target may be expressed in many ways in
+;; JavaScript, and the general problem is undecidable.  However, several forms
+;; are readily recognizable at parse-time; the forms we attempt to recognize
+;; include:
+
+;;  function foo()  -- function declaration
+;;  foo = function()  -- function expression assigned to variable
+;;  foo.bar.baz = function()  -- function expr assigned to nested property-get
+;;  foo = {bar: function()}  -- fun prop in object literal assigned to var
+;;  foo = {bar: {baz: function()}} -- inside nested object literal
+;;  foo.bar = {baz: function()}} -- obj lit assigned to nested prop get
+;;  a.b = {c: {d: function()}} -- nested obj lit assigned to nested prop get
+;;  foo = {get bar() {...}}  -- getter/setter in obj literal
+;;  function foo() {function bar() {...}}  -- nested function
+;;  foo['a'] = function()  -- fun expr assigned to deterministic element-get
+
+;; This list boils down to a few forms that can be combined recursively.
+;; Top-level named function declarations include both the left-hand (name)
+;; and the right-hand (function value) expressions needed to produce an imenu
+;; entry.  The other "right-hand" forms we need to look for are:
+;;  - functions declared as props/getters/setters in object literals
+;;  - nested named function declarations
+;; The "left-hand" expressions that functions can be assigned to include:
+;;  - local/global variables
+;;  - nested property-get expressions like a.b.c.d
+;;  - element gets like foo[10] or foo['bar'] where the index
+;;    expression can be trivially converted to a property name.  They
+;;    effectively then become property gets.
+
+;; All the different definition types are canonicalized into the form
+;; foo.bar.baz = position-of-function-keyword
+
+;; We need to build a trie-like structure for imenu.  As an example,
+;; consider the following JavaScript code:
+
+;; a = function() {...}  // function at position 5
+;; b = function() {...}  // function at position 25
+;; foo = function() {...} // function at position 100
+;; foo.bar = function() {...} // function at position 200
+;; foo.bar.baz = function() {...} // function at position 300
+;; foo.bar.zab = function() {...} // function at position 400
+
+;; During parsing we accumulate an entry for each definition in
+;; the variable `js2-imenu-recorder', like so:
+
+;; '((fn a 5)
+;;   (fn b 25)
+;;   (fn foo 100)
+;;   (fn foo bar 200)
+;;   (fn foo bar baz 300)
+;;   (fn foo bar zab 400))
+
+;; Where 'fn' is the respective function node.
+;; After parsing these entries are merged into this alist-trie:
+
+;; '((a . 1)
+;;   (b . 2)
+;;   (foo (<definition> . 3)
+;;        (bar (<definition> . 6)
+;;             (baz . 100)
+;;             (zab . 200))))
+
+;; Note the wacky need for a <definition> name.  The token can be anything
+;; that isn't a valid JavaScript identifier, because you might make foo
+;; a function and then start setting properties on it that are also functions.
+
+(defun js2-prop-node-name (node)
+  "Return the name of a node that may be a property-get/property-name.
+If NODE is not a valid name-node, string-node or integral number-node,
+returns nil.  Otherwise returns the string name/value of the node."
+  (cond
+   ((js2-name-node-p node)
+    (js2-name-node-name node))
+   ((js2-string-node-p node)
+    (js2-string-node-value node))
+   ((and (js2-number-node-p node)
+         (string-match "^[0-9]+$" (js2-number-node-value node)))
+    (js2-number-node-value node))
+   ((eq (js2-node-type node) js2-THIS)
+    "this")
+   ((eq (js2-node-type node) js2-SUPER)
+    "super")))
+
+(defun js2-node-qname-component (node)
+  "Return the name of this node, if it contributes to a qname.
+Returns nil if the node doesn't contribute."
+  (copy-sequence
+   (or (js2-prop-node-name node)
+       (if (and (js2-function-node-p node)
+                (js2-function-node-name node))
+           (js2-name-node-name (js2-function-node-name node))))))
+
+(defun js2-record-imenu-entry (fn-node qname pos)
+  "Add an entry to `js2-imenu-recorder'.
+FN-NODE should be the current item's function node.
+
+Associate FN-NODE with its QNAME for later lookup.
+This is used in postprocessing the chain list.  For each chain, we find
+the parent function, look up its qname, then prepend a copy of it to the chain."
+  (push (cons fn-node (append qname (list pos))) js2-imenu-recorder)
+  (unless js2-imenu-function-map
+    (setq js2-imenu-function-map (make-hash-table :test 'eq)))
+  (puthash fn-node qname js2-imenu-function-map))
+
+(defun js2-record-imenu-functions (node &optional var)
+  "Record function definitions for imenu.
+NODE is a function node or an object literal.
+VAR, if non-nil, is the expression that NODE is being assigned to.
+When passed arguments of wrong type, does nothing."
+  (when js2-parse-ide-mode
+    (let ((fun-p (js2-function-node-p node))
+          qname fname-node)
+      (cond
+       ;; non-anonymous function declaration?
+       ((and fun-p
+             (not var)
+             (setq fname-node (js2-function-node-name node)))
+        (js2-record-imenu-entry node (list fname-node) (js2-node-pos node)))
+       ;; for remaining forms, compute left-side tree branch first
+       ((and var (setq qname (js2-compute-nested-prop-get var)))
+        (cond
+         ;; foo.bar.baz = function
+         (fun-p
+          (js2-record-imenu-entry node qname (js2-node-pos node)))
+         ;; foo.bar.baz = object-literal
+         ;; look for nested functions:  {a: {b: function() {...} }}
+         ((js2-object-node-p node)
+          ;; Node position here is still absolute, since the parser
+          ;; passes the assignment target and value expressions
+          ;; to us before they are added as children of the assignment node.
+          (js2-record-object-literal node qname (js2-node-pos node)))))))))
+
+(defun js2-compute-nested-prop-get (node)
+  "If NODE is of form foo.bar, foo['bar'], or any nested combination, return
+component nodes as a list.  Otherwise return nil.  Element-gets are treated
+as property-gets if the index expression is a string, or a positive integer."
+  (let (left right head)
+    (cond
+     ((or (js2-name-node-p node)
+          (js2-this-or-super-node-p node))
+      (list node))
+     ;; foo.bar.baz is parenthesized as (foo.bar).baz => right operand is a leaf
+     ((js2-prop-get-node-p node)        ; foo.bar
+      (setq left (js2-prop-get-node-left node)
+            right (js2-prop-get-node-right node))
+      (if (setq head (js2-compute-nested-prop-get left))
+          (nconc head (list right))))
+     ((js2-elem-get-node-p node)        ; foo['bar'] or foo[101]
+      (setq left (js2-elem-get-node-target node)
+            right (js2-elem-get-node-element node))
+      (if (or (js2-string-node-p right)      ; ['bar']
+              (and (js2-number-node-p right) ; [10]
+                   (string-match "^[0-9]+$"
+                                 (js2-number-node-value right))))
+          (if (setq head (js2-compute-nested-prop-get left))
+              (nconc head (list right))))))))
+
+(defun js2-record-object-literal (node qname pos)
+  "Recursively process an object literal looking for functions.
+NODE is an object literal that is the right-hand child of an assignment
+expression.  QNAME is a list of nodes representing the assignment target,
+e.g. for foo.bar.baz = {...}, QNAME is (foo-node bar-node baz-node).
+POS is the absolute position of the node.
+We do a depth-first traversal of NODE.  For any functions we find,
+we append the property name to QNAME, then call `js2-record-imenu-entry'."
+  (let (right)
+    (dolist (e (js2-object-node-elems node))  ; e is a `js2-object-prop-node'
+      (let ((left (js2-infix-node-left e))
+            ;; Element positions are relative to the parent position.
+            (pos (+ pos (js2-node-pos e))))
+        (cond
+         ;; foo: function() {...}
+         ((js2-function-node-p (setq right (js2-infix-node-right e)))
+          (when (js2-prop-node-name left)
+            ;; As a policy decision, we record the position of the property,
+            ;; not the position of the `function' keyword, since the property
+            ;; is effectively the name of the function.
+            (js2-record-imenu-entry right (append qname (list left)) pos)))
+         ;; foo: {object-literal} -- add foo to qname, offset position, and recurse
+         ((js2-object-node-p right)
+          (js2-record-object-literal right
+                                     (append qname (list (js2-infix-node-left e)))
+                                     (+ pos (js2-node-pos right)))))))))
+
+(defun js2-node-top-level-decl-p (node)
+  "Return t if NODE's name is defined in the top-level scope.
+Also returns t if NODE's name is not defined in any scope, since it implies
+that it's an external variable, which must also be in the top-level scope."
+  (let* ((name (js2-prop-node-name node))
+         (this-scope (js2-node-get-enclosing-scope node))
+         defining-scope)
+    (cond
+     ((js2-this-or-super-node-p node)
+      nil)
+     ((null this-scope)
+      t)
+     ((setq defining-scope (js2-get-defining-scope this-scope name))
+      (js2-ast-root-p defining-scope))
+     (t t))))
+
+(defun js2-wrapper-function-p (node)
+  "Return t if NODE is a function expression that's immediately invoked.
+NODE must be `js2-function-node'."
+  (let ((parent (js2-node-parent node)))
+    (or
+     ;; function(){...}();
+     (and (js2-call-node-p parent)
+          (eq node (js2-call-node-target parent)))
+     (and (js2-paren-node-p parent)
+          ;; (function(){...})();
+          (or (js2-call-node-p (setq parent (js2-node-parent parent)))
+              ;; (function(){...}).call(this);
+              (and (js2-prop-get-node-p parent)
+                   (member (js2-name-node-name (js2-prop-get-node-right parent))
+                           '("call" "apply"))
+                   (js2-call-node-p (js2-node-parent parent))))))))
+
+(defun js2-browse-postprocess-chains ()
+  "Modify function-declaration name chains after parsing finishes.
+Some of the information is only available after the parse tree is complete.
+For instance, processing a nested scope requires a parent function node."
+  (let (result fn parent-qname p elem)
+    (dolist (entry js2-imenu-recorder)
+      ;; function node goes first
+      (cl-destructuring-bind (current-fn &rest (&whole chain head &rest _)) entry
+        ;; Examine head's defining scope:
+        ;; Pre-processed chain, or top-level/external, keep as-is.
+        (if (or (stringp head) (js2-node-top-level-decl-p head))
+            (push chain result)
+          (when (js2-this-or-super-node-p head)
+            (setq chain (cdr chain))) ; discard this-node
+          (when (setq fn (js2-node-parent-script-or-fn current-fn))
+            (setq parent-qname (gethash fn js2-imenu-function-map 'not-found))
+            (when (eq parent-qname 'not-found)
+              ;; anonymous function expressions are not recorded
+              ;; during the parse, so we need to handle this case here
+              (setq parent-qname
+                    (if (js2-wrapper-function-p fn)
+                        (let ((grandparent (js2-node-parent-script-or-fn fn)))
+                          (if (js2-ast-root-p grandparent)
+                              nil
+                            (gethash grandparent js2-imenu-function-map 'skip)))
+                      'skip))
+              (puthash fn parent-qname js2-imenu-function-map))
+            (if (eq parent-qname 'skip)
+                ;; We don't show it, let's record that fact.
+                (remhash current-fn js2-imenu-function-map)
+              ;; Prepend parent fn qname to this chain.
+              (let ((qname (append parent-qname chain)))
+                (puthash current-fn (butlast qname) js2-imenu-function-map)
+                (push qname result)))))))
+    ;; Collect chains obtained by third-party code.
+    (let (js2-imenu-recorder)
+      (run-hooks 'js2-build-imenu-callbacks)
+      (dolist (entry js2-imenu-recorder)
+        (push (cdr entry) result)))
+    ;; Finally replace each node in each chain with its name.
+    (dolist (chain result)
+      (setq p chain)
+      (while p
+        (if (js2-node-p (setq elem (car p)))
+            (setcar p (js2-node-qname-component elem)))
+        (setq p (cdr p))))
+    result))
+
+;; Merge name chains into a trie-like tree structure of nested lists.
+;; To simplify construction of the trie, we first build it out using the rule
+;; that the trie consists of lists of pairs.  Each pair is a 2-element array:
+;; [key, num-or-list].  The second element can be a number; if so, this key
+;; is a leaf-node with only one value.  (I.e. there is only one declaration
+;; associated with the key at this level.)  Otherwise the second element is
+;; a list of pairs, with the rule applied recursively.  This symmetry permits
+;; a simple recursive formulation.
+;;
+;; js2-mode is building the data structure for imenu.  The imenu documentation
+;; claims that it's the structure above, but in practice it wants the children
+;; at the same list level as the key for that level, which is how I've drawn
+;; the "Expected final result" above.  We'll postprocess the trie to remove the
+;; list wrapper around the children at each level.
+;;
+;; A completed nested imenu-alist entry looks like this:
+;;       '(("foo"
+;;          ("<definition>" . 7)
+;;          ("bar"
+;;           ("a" . 40)
+;;           ("b" . 60))))
+;;
+;; In particular, the documentation for `imenu--index-alist' says that
+;; a nested sub-alist element looks like (INDEX-NAME SUB-ALIST).
+;; The sub-alist entries immediately follow INDEX-NAME, the head of the list.
+
+(defun js2-treeify (lst)
+  "Convert (a b c d) to (a ((b ((c d)))))."
+  (if (null (cddr lst))  ; list length <= 2
+      lst
+    (list (car lst) (list (js2-treeify (cdr lst))))))
+
+(defun js2-build-alist-trie (chains trie)
+  "Merge declaration name chains into a trie-like alist structure for imenu.
+CHAINS is the qname chain list produced during parsing. TRIE is a
+list of elements built up so far."
+  (let (head tail pos branch kids)
+    (dolist (chain chains)
+      (setq head (car chain)
+            tail (cdr chain)
+            pos (if (numberp (car tail)) (car tail))
+            branch (js2-find-if (lambda (n)
+                                  (string= (car n) head))
+                                trie)
+            kids (cl-second branch))
+      (cond
+       ;; case 1:  this key isn't in the trie yet
+       ((null branch)
+        (if trie
+            (setcdr (last trie) (list (js2-treeify chain)))
+          (setq trie (list (js2-treeify chain)))))
+       ;; case 2:  key is present with a single number entry:  replace w/ list
+       ;;  ("a1" 10)  +  ("a1" 20) => ("a1" (("<definition>" 10)
+       ;;                                    ("<definition>" 20)))
+       ((numberp kids)
+        (setcar (cdr branch)
+                (list (list "<definition-1>" kids)
+                      (if pos
+                          (list "<definition-2>" pos)
+                        (js2-treeify tail)))))
+       ;; case 3:  key is there (with kids), and we're a number entry
+       (pos
+        (setcdr (last kids)
+                (list
+                 (list (format "<definition-%d>"
+                               (1+ (cl-loop for kid in kids
+                                            count (eq ?< (aref (car kid) 0)))))
+                       pos))))
+       ;; case 4:  key is there with kids, need to merge in our chain
+       (t
+        (js2-build-alist-trie (list tail) kids))))
+    trie))
+
+(defun js2-flatten-trie (trie)
+  "Convert TRIE to imenu-format.
+Recurses through nodes, and for each one whose second element is a list,
+appends the list's flattened elements to the current element.  Also
+changes the tails into conses.  For instance, this pre-flattened trie
+
+'(a ((b 20)
+     (c ((d 30)
+         (e 40)))))
+
+becomes
+
+'(a (b . 20)
+    (c (d . 30)
+       (e . 40)))
+
+Note that the root of the trie has no key, just a list of chains.
+This is also true for the value of any key with multiple children,
+e.g. key 'c' in the example above."
+  (cond
+   ((listp (car trie))
+    (mapcar #'js2-flatten-trie trie))
+   (t
+    (if (numberp (cl-second trie))
+        (cons (car trie) (cl-second trie))
+      ;; else pop list and append its kids
+      (apply #'append (list (car trie)) (js2-flatten-trie (cdr trie)))))))
+
+(defun js2-build-imenu-index ()
+  "Turn `js2-imenu-recorder' into an imenu data structure."
+  (when (eq js2-imenu-recorder 'empty)
+    (setq js2-imenu-recorder nil))
+  (let* ((chains (js2-browse-postprocess-chains))
+         (result (js2-build-alist-trie chains nil)))
+    (js2-flatten-trie result)))
+
+(defun js2-test-print-chains (chains)
+  "Print a list of qname chains.
+Each element of CHAINS is a list of the form (NODE [NODE *] pos);
+i.e. one or more nodes, and an integer position as the list tail."
+  (mapconcat (lambda (chain)
+               (concat "("
+                       (mapconcat (lambda (elem)
+                                    (if (js2-node-p elem)
+                                        (or (js2-node-qname-component elem)
+                                            "nil")
+                                      (number-to-string elem)))
+                                  chain
+                                  " ")
+                       ")"))
+             chains
+             "\n"))
+
+;;; Parser
+
+(defconst js2-version "1.8.5"
+  "Version of JavaScript supported.")
+
+(defun js2-record-face (face &optional token)
+  "Record a style run of FACE for TOKEN or the current token."
+  (unless token (setq token (js2-current-token)))
+  (js2-set-face (js2-token-beg token) (js2-token-end token) face 'record))
+
+(defsubst js2-node-end (n)
+  "Computes the absolute end of node N.
+Use with caution!  Assumes `js2-node-pos' is -absolute-, which
+is only true until the node is added to its parent; i.e., while parsing."
+  (+ (js2-node-pos n)
+     (js2-node-len n)))
+
+(defun js2-record-comment (token)
+  "Record a comment in `js2-scanned-comments'."
+  (let ((ct (js2-token-comment-type token))
+        (beg (js2-token-beg token))
+        (end (js2-token-end token)))
+    (push (make-js2-comment-node :len (- end beg)
+                                 :format ct)
+          js2-scanned-comments)
+    (when js2-parse-ide-mode
+      (js2-record-face (if (eq ct 'jsdoc)
+                           'font-lock-doc-face
+                         'font-lock-comment-face)
+                       token)
+      (when (memq ct '(html preprocessor))
+        ;; Tell cc-engine the bounds of the comment.
+        (js2-record-text-property beg (1- end) 'c-in-sws t)))))
+
+(defun js2-peek-token ()
+  "Return the next token type without consuming it.
+If `js2-ti-lookahead' is positive, return the type of next token
+from `js2-ti-tokens'.  Otherwise, call `js2-get-token'."
+  (if (not (zerop js2-ti-lookahead))
+      (js2-token-type
+       (aref js2-ti-tokens (mod (1+ js2-ti-tokens-cursor) js2-ti-ntokens)))
+    (let ((tt (js2-get-token-internal nil)))
+      (js2-unget-token)
+      tt)))
+
+(defalias 'js2-next-token 'js2-get-token)
+
+(defun js2-match-token (match &optional dont-unget)
+  "Get next token and return t if it matches MATCH, a bytecode.
+Returns nil and consumes nothing if MATCH is not the next token."
+  (if (/= (js2-get-token) match)
+      (ignore (unless dont-unget (js2-unget-token)))
+    t))
+
+(defun js2-match-contextual-kwd (name)
+  "Consume and return t if next token is `js2-NAME', and its
+string is NAME.  Returns nil and keeps current token otherwise."
+  (if (js2-contextual-kwd-p (progn (js2-get-token)
+                                   (js2-current-token))
+                            name)
+      (progn (js2-record-face 'font-lock-keyword-face) t)
+    (js2-unget-token)
+    nil))
+
+(defun js2-contextual-kwd-p (token name)
+  "Return t if TOKEN is `js2-NAME', and its string is NAME."
+  (and (= (js2-token-type token) js2-NAME)
+       (string= (js2-token-string token) name)))
+
+(defun js2-match-async-function ()
+  (when (and (js2-contextual-kwd-p (js2-current-token) "async")
+             (= (js2-peek-token) js2-FUNCTION))
+    (js2-record-face 'font-lock-keyword-face)
+    (js2-get-token)
+    t))
+
+(defun js2-match-async-arrow-function ()
+  (and (js2-contextual-kwd-p (js2-current-token) "async")
+       (/= (js2-peek-token) js2-FUNCTION)))
+
+(defsubst js2-inside-function ()
+  (cl-plusp js2-nesting-of-function))
+
+(defsubst js2-inside-async-function ()
+  (and (js2-inside-function)
+       (js2-function-node-async js2-current-script-or-fn)))
+
+(defun js2-parse-await-maybe (tt)
+  "Parse \"await\" as an AwaitExpression, if it is one."
+  (and (= tt js2-NAME)
+       (js2-contextual-kwd-p (js2-current-token) "await")
+       ;; Per the proposal, AwaitExpression consists of "await"
+       ;; followed by a UnaryExpression.  So look ahead for one.
+       (let ((ts-state (make-js2-ts-state))
+             (recorded-identifiers js2-recorded-identifiers)
+             (parsed-errors js2-parsed-errors)
+             (current-token (js2-current-token))
+             (beg (js2-current-token-beg))
+             (end (js2-current-token-end))
+             pn)
+         (js2-get-token)
+         (setq pn (js2-make-unary js2-AWAIT 'js2-parse-unary-expr))
+         (if (= (js2-node-type (js2-unary-node-operand pn)) js2-ERROR)
+             ;; The parse failed, so pretend like nothing happened and restore
+             ;; the previous parsing state.
+             (progn
+               (js2-ts-seek ts-state)
+               (setq js2-recorded-identifiers recorded-identifiers
+                     js2-parsed-errors parsed-errors)
+               ;; And ensure the caller knows about the failure.
+               nil)
+           ;; The parse was successful, so process and return the "await".
+           (js2-record-face 'font-lock-keyword-face current-token)
+           (unless (js2-inside-async-function)
+             (js2-report-error "msg.bad.await" nil
+                               beg (- end beg)))
+           pn))))
+
+(defun js2-get-prop-name-token ()
+  (js2-get-token (and (>= js2-language-version 170) 'KEYWORD_IS_NAME)))
+
+(defun js2-match-prop-name ()
+  "Consume token and return t if next token is a valid property name.
+If `js2-language-version' is >= 180, a keyword or reserved word
+is considered valid name as well."
+  (if (eq js2-NAME (js2-get-prop-name-token))
+      t
+    (js2-unget-token)
+    nil))
+
+(defun js2-must-match-prop-name (msg-id &optional pos len)
+  (if (js2-match-prop-name)
+      t
+    (js2-report-error msg-id nil pos len)
+    nil))
+
+(defun js2-peek-token-or-eol ()
+  "Return js2-EOL if the next token immediately follows a newline.
+Else returns the next token.  Used in situations where we don't
+consider certain token types valid if they are preceded by a newline.
+One example is the postfix ++ or -- operator, which has to be on the
+same line as its operand."
+  (let ((tt (js2-get-token))
+        (follows-eol (js2-token-follows-eol-p (js2-current-token))))
+    (js2-unget-token)
+    (if follows-eol
+        js2-EOL
+      tt)))
+
+(defun js2-must-match (token msg-id &optional pos len)
+  "Match next token to token code TOKEN, or record a syntax error.
+MSG-ID is the error message to report if the match fails.
+Returns t on match, nil if no match."
+  (if (js2-match-token token t)
+      t
+    (js2-report-error msg-id nil pos len)
+    (js2-unget-token)
+    nil))
+
+(defun js2-must-match-name (msg-id)
+  (if (js2-match-token js2-NAME t)
+      t
+    (if (eq (js2-current-token-type) js2-RESERVED)
+        (js2-report-error "msg.reserved.id" (js2-current-token-string))
+      (js2-report-error msg-id)
+      (js2-unget-token))
+    nil))
+
+(defun js2-set-requires-activation ()
+  (if (js2-function-node-p js2-current-script-or-fn)
+      (setf (js2-function-node-needs-activation js2-current-script-or-fn) t)))
+
+(defun js2-check-activation-name (name _token)
+  (when (js2-inside-function)
+    ;; skip language-version 1.2 check from Rhino
+    (if (or (string= "arguments" name)
+            (and js2-compiler-activation-names  ; only used in codegen
+                 (gethash name js2-compiler-activation-names)))
+        (js2-set-requires-activation))))
+
+(defun js2-set-is-generator ()
+  (let ((fn-node js2-current-script-or-fn))
+    (when (and (js2-function-node-p fn-node)
+               (not (js2-function-node-generator-type fn-node)))
+      (setf (js2-function-node-generator-type js2-current-script-or-fn) 'LEGACY))))
+
+(defun js2-must-have-xml ()
+  (unless js2-compiler-xml-available
+    (js2-report-error "msg.XML.not.available")))
+
+(defun js2-push-scope (scope)
+  "Push SCOPE, a `js2-scope', onto the lexical scope chain."
+  (cl-assert (js2-scope-p scope))
+  (cl-assert (null (js2-scope-parent-scope scope)))
+  (cl-assert (not (eq js2-current-scope scope)))
+  (setf (js2-scope-parent-scope scope) js2-current-scope
+        js2-current-scope scope))
+
+(defsubst js2-pop-scope ()
+  (setq js2-current-scope
+        (js2-scope-parent-scope js2-current-scope)))
+
+(defun js2-enter-loop (loop-node)
+  (push loop-node js2-loop-set)
+  (push loop-node js2-loop-and-switch-set)
+  (js2-push-scope loop-node)
+  ;; Tell the current labeled statement (if any) its statement,
+  ;; and set the jump target of the first label to the loop.
+  ;; These are used in `js2-parse-continue' to verify that the
+  ;; continue target is an actual labeled loop.  (And for codegen.)
+  (when js2-labeled-stmt
+    (setf (js2-labeled-stmt-node-stmt js2-labeled-stmt) loop-node
+          (js2-label-node-loop (car (js2-labeled-stmt-node-labels
+                                     js2-labeled-stmt))) loop-node)))
+
+(defun js2-exit-loop ()
+  (pop js2-loop-set)
+  (pop js2-loop-and-switch-set)
+  (js2-pop-scope))
+
+(defsubst js2-enter-switch (switch-node)
+  (push switch-node js2-loop-and-switch-set))
+
+(defsubst js2-exit-switch ()
+  (pop js2-loop-and-switch-set))
+
+(defsubst js2-get-directive (node)
+  "Return NODE's value if it is a directive, nil otherwise.
+
+A directive is an otherwise-meaningless expression statement
+consisting of a string literal, such as \"use strict\"."
+  (and (js2-expr-stmt-node-p node)
+       (js2-string-node-p (setq node (js2-expr-stmt-node-expr node)))
+       (js2-string-node-value node)))
+
+(defun js2-parse (&optional buf cb)
+  "Tell the js2 parser to parse a region of JavaScript.
+
+BUF is a buffer or buffer name containing the code to parse.
+Call `narrow-to-region' first to parse only part of the buffer.
+
+The returned AST root node is given some additional properties:
+  `node-count' - total number of nodes in the AST
+  `buffer' - BUF.  The buffer it refers to may change or be killed,
+             so the value is not necessarily reliable.
+
+An optional callback CB can be specified to report parsing
+progress.  If `(functionp CB)' returns t, it will be called with
+the current line number once before parsing begins, then again
+each time the lexer reaches a new line number.
+
+CB can also be a list of the form `(symbol cb ...)' to specify
+multiple callbacks with different criteria.  Each symbol is a
+criterion keyword, and the following element is the callback to
+call
+
+  :line  - called whenever the line number changes
+  :token - called for each new token consumed
+
+The list of criteria could be extended to include entering or
+leaving a statement, an expression, or a function definition."
+  (if (and cb (not (functionp cb)))
+      (error "criteria callbacks not yet implemented"))
+  (let ((inhibit-point-motion-hooks t)
+        (js2-compiler-xml-available (>= js2-language-version 160))
+        ;; This is a recursive-descent parser, so give it a big stack.
+        (max-lisp-eval-depth (max max-lisp-eval-depth 3000))
+        (max-specpdl-size (max max-specpdl-size 3000))
+        (case-fold-search nil)
+        ast)
+    (with-current-buffer (or buf (current-buffer))
+      (setq js2-scanned-comments nil
+            js2-parsed-errors nil
+            js2-parsed-warnings nil
+            js2-imenu-recorder nil
+            js2-imenu-function-map nil
+            js2-label-set nil)
+      (js2-init-scanner)
+      (setq ast (js2-do-parse))
+      (unless js2-ts-hit-eof
+        (js2-report-error "msg.got.syntax.errors" (length js2-parsed-errors)))
+      (setf (js2-ast-root-errors ast) js2-parsed-errors
+            (js2-ast-root-warnings ast) js2-parsed-warnings)
+      ;; if we didn't find any declarations, put a dummy in this list so we
+      ;; don't end up re-parsing the buffer in `js2-mode-create-imenu-index'
+      (unless js2-imenu-recorder
+        (setq js2-imenu-recorder 'empty))
+      (run-hooks 'js2-parse-finished-hook)
+      ast)))
+
+;; Corresponds to Rhino's Parser.parse() method.
+(defun js2-do-parse ()
+  "Parse current buffer starting from current point.
+Scanner should be initialized."
+  (let ((pos js2-ts-cursor)
+        (end js2-ts-cursor)  ; in case file is empty
+        root n tt
+        (in-directive-prologue t)
+        (js2-in-use-strict-directive js2-in-use-strict-directive)
+        directive)
+    ;; initialize buffer-local parsing vars
+    (setf root (make-js2-ast-root :buffer (buffer-name) :pos pos)
+          js2-current-script-or-fn root
+          js2-current-scope root
+          js2-nesting-of-function 0
+          js2-labeled-stmt nil
+          js2-recorded-identifiers nil  ; for js2-highlight
+          js2-in-use-strict-directive nil)
+    (while (/= (setq tt (js2-get-token)) js2-EOF)
+      (if (= tt js2-FUNCTION)
+          (progn
+            (setq n (if js2-called-by-compile-function
+                        (js2-parse-function-expr)
+                      (js2-parse-function-stmt))))
+        ;; not a function - parse a statement
+        (js2-unget-token)
+        (setq n (js2-parse-statement))
+        (when in-directive-prologue
+          (setq directive (js2-get-directive n))
+          (cond
+           ((null directive)
+            (setq in-directive-prologue nil))
+           ((string= directive "use strict")
+            (setq js2-in-use-strict-directive t)))))
+      ;; add function or statement to script
+      (setq end (js2-node-end n))
+      (js2-block-node-push root n))
+    ;; add comments to root in lexical order
+    (when js2-scanned-comments
+      ;; if we find a comment beyond end of normal kids, use its end
+      (setq end (max end (js2-node-end (cl-first js2-scanned-comments))))
+      (dolist (comment js2-scanned-comments)
+        (push comment (js2-ast-root-comments root))
+        (js2-node-add-children root comment)))
+    (setf (js2-node-len root) (- end pos))
+    (setq js2-mode-ast root)  ; Make sure this is available for callbacks.
+    ;; Give extensions a chance to muck with things before highlighting starts.
+    (let ((js2-additional-externs js2-additional-externs))
+      (save-excursion
+        (run-hooks 'js2-post-parse-callbacks))
+      (js2-highlight-undeclared-vars))
+    root))
+
+(defun js2-parse-function-closure-body (fn-node)
+  "Parse a JavaScript 1.8 function closure body."
+  (let ((js2-nesting-of-function (1+ js2-nesting-of-function)))
+    (if js2-ts-hit-eof
+        (js2-report-error "msg.no.brace.body" nil
+                          (js2-node-pos fn-node)
+                          (- js2-ts-cursor (js2-node-pos fn-node)))
+      (js2-node-add-children fn-node
+                             (setf (js2-function-node-body fn-node)
+                                   (js2-parse-expr t))))))
+
+(defun js2-parse-function-body (fn-node)
+  (js2-must-match js2-LC "msg.no.brace.body"
+                  (js2-node-pos fn-node)
+                  (- js2-ts-cursor (js2-node-pos fn-node)))
+  (let ((pos (js2-current-token-beg))         ; LC position
+        (pn (make-js2-block-node))  ; starts at LC position
+        tt
+        end
+        not-in-directive-prologue
+        node
+        directive)
+    (cl-incf js2-nesting-of-function)
+    (unwind-protect
+        (while (not (or (= (setq tt (js2-peek-token)) js2-ERROR)
+                        (= tt js2-EOF)
+                        (= tt js2-RC)))
+          (js2-block-node-push
+           pn
+           (if (/= tt js2-FUNCTION)
+               (if not-in-directive-prologue
+                   (js2-parse-statement)
+                 (setq node (js2-parse-statement)
+                       directive (js2-get-directive node))
+                 (cond
+                  ((null directive)
+                   (setq not-in-directive-prologue t))
+                  ((string= directive "use strict")
+                   ;; Back up and reparse the function, because new rules apply
+                   ;; to the function name and parameters.
+                   (when (not js2-in-use-strict-directive)
+                     (setq js2-in-use-strict-directive t)
+                     (throw 'reparse t))))
+                 node)
+             (js2-get-token)
+             (js2-parse-function-stmt))))
+      (cl-decf js2-nesting-of-function))
+    (setq end (js2-current-token-end))  ; assume no curly and leave at current token
+    (if (js2-must-match js2-RC "msg.no.brace.after.body" pos)
+        (setq end (js2-current-token-end)))
+    (setf (js2-node-pos pn) pos
+          (js2-node-len pn) (- end pos))
+    (setf (js2-function-node-body fn-node) pn)
+    (js2-node-add-children fn-node pn)
+    pn))
+
+(defun js2-define-destruct-symbols (node decl-type face &optional ignore-not-in-block)
+  "Declare and fontify destructuring parameters inside NODE.
+NODE is either `js2-array-node', `js2-object-node', or `js2-name-node'.
+
+Return a list of `js2-name-node' nodes representing the symbols
+declared; probably to check them for errors."
+  (let (name-nodes)
+    (cond
+     ((js2-name-node-p node)
+      (let (leftpos)
+        (js2-define-symbol decl-type (js2-name-node-name node)
+                           node ignore-not-in-block)
+        (when face
+          (js2-set-face (setq leftpos (js2-node-abs-pos node))
+                        (+ leftpos (js2-node-len node))
+                        face 'record))
+        (list node)))
+     ((js2-object-node-p node)
+      (dolist (elem (js2-object-node-elems node))
+        ;; js2-infix-node-p catches both object prop node and initialized
+        ;; binding element (which is directly an infix node).
+        (when (js2-infix-node-p elem)
+          (push (js2-define-destruct-symbols
+                 (js2-infix-node-left elem)
+                 decl-type face ignore-not-in-block)
+                name-nodes)))
+      (apply #'append (nreverse name-nodes)))
+     ((js2-array-node-p node)
+      (dolist (elem (js2-array-node-elems node))
+        (when elem
+          (if (js2-infix-node-p elem) (setq elem (js2-infix-node-left elem)))
+          (push (js2-define-destruct-symbols
+                 elem decl-type face ignore-not-in-block)
+                name-nodes)))
+      (apply #'append (nreverse name-nodes)))
+     (t (js2-report-error "msg.no.parm" nil (js2-node-abs-pos node)
+                          (js2-node-len node))
+        nil))))
+
+(defvar js2-illegal-strict-identifiers
+  '("eval" "arguments")
+  "Identifiers not allowed as variables in strict mode.")
+
+(defun js2-check-strict-identifier (name-node)
+  "Check that NAME-NODE makes a legal strict mode identifier."
+  (when js2-in-use-strict-directive
+    (let ((param-name (js2-name-node-name name-node)))
+      (when (member param-name js2-illegal-strict-identifiers)
+        (js2-report-error "msg.bad.id.strict" param-name
+                          (js2-node-abs-pos name-node) (js2-node-len name-node))))))
+
+(defun js2-check-strict-function-params (preceding-params params)
+  "Given PRECEDING-PARAMS in a function's parameter list, check
+for strict mode errors caused by PARAMS."
+  (when js2-in-use-strict-directive
+    (dolist (param params)
+      (let ((param-name (js2-name-node-name param)))
+        (js2-check-strict-identifier param)
+        (when (cl-some (lambda (param)
+                         (string= (js2-name-node-name param) param-name))
+                       preceding-params)
+          (js2-report-error "msg.dup.param.strict" param-name
+                            (js2-node-abs-pos param) (js2-node-len param)))))))
+
+(defun js2-parse-function-params (function-type fn-node pos)
+  "Parse the parameters of a function of FUNCTION-TYPE
+represented by FN-NODE at POS."
+  (if (js2-match-token js2-RP)
+      (setf (js2-function-node-rp fn-node) (- (js2-current-token-beg) pos))
+    (let ((paren-free-arrow (and (eq function-type 'FUNCTION_ARROW)
+                                 (eq (js2-current-token-type) js2-NAME)))
+          params param
+          param-name-nodes new-param-name-nodes
+          rest-param-at)
+      (when paren-free-arrow
+        (js2-unget-token))
+      (cl-loop for tt = (js2-peek-token)
+               do
+               (cond
+                ;; destructuring param
+                ((and (not paren-free-arrow)
+                      (or (= tt js2-LB) (= tt js2-LC)))
+                 (js2-get-token)
+                 (setq param (js2-parse-destruct-primary-expr)
+                       new-param-name-nodes (js2-define-destruct-symbols
+                                             param js2-LP 'js2-function-param))
+                 (js2-check-strict-function-params param-name-nodes new-param-name-nodes)
+                 (setq param-name-nodes (append param-name-nodes new-param-name-nodes)))
+                ;; variable name
+                (t
+                 (when (and (>= js2-language-version 200)
+                            (not paren-free-arrow)
+                            (js2-match-token js2-TRIPLEDOT)
+                            (not rest-param-at))
+                   ;; to report errors if there are more parameters
+                   (setq rest-param-at (length params)))
+                 (js2-must-match-name "msg.no.parm")
+                 (js2-record-face 'js2-function-param)
+                 (setq param (js2-create-name-node))
+                 (js2-define-symbol js2-LP (js2-current-token-string) param)
+                 (js2-check-strict-function-params param-name-nodes (list param))
+                 (setq param-name-nodes (append param-name-nodes (list param)))))
+               ;; default parameter value
+               (when (and (not rest-param-at)
+                          (>= js2-language-version 200)
+                          (js2-match-token js2-ASSIGN))
+                 (cl-assert (not paren-free-arrow))
+                 (let* ((pos (js2-node-pos param))
+                        (tt (js2-current-token-type))
+                        (op-pos (- (js2-current-token-beg) pos))
+                        (left param)
+                        (right (js2-parse-assign-expr))
+                        (len (- (js2-node-end right) pos)))
+                   (setq param (make-js2-assign-node
+                                :type tt :pos pos :len len :op-pos op-pos
+                                :left left :right right))
+                   (js2-node-add-children param left right)))
+               (push param params)
+               (when (and rest-param-at (> (length params) (1+ rest-param-at)))
+                 (js2-report-error "msg.param.after.rest" nil
+                                   (js2-node-pos param) (js2-node-len param)))
+               while
+               (js2-match-token js2-COMMA))
+      (when (and (not paren-free-arrow)
+                 (js2-must-match js2-RP "msg.no.paren.after.parms"))
+        (setf (js2-function-node-rp fn-node) (- (js2-current-token-beg) pos)))
+      (when rest-param-at
+        (setf (js2-function-node-rest-p fn-node) t))
+      (dolist (p params)
+        (js2-node-add-children fn-node p)
+        (push p (js2-function-node-params fn-node))))))
+
+(defun js2-check-inconsistent-return-warning (fn-node name)
+  "Possibly show inconsistent-return warning.
+Last token scanned is the close-curly for the function body."
+  (when (and js2-mode-show-strict-warnings
+             js2-strict-inconsistent-return-warning
+             (not (js2-has-consistent-return-usage
+                   (js2-function-node-body fn-node))))
+    ;; Have it extend from close-curly to bol or beginning of block.
+    (let ((pos (save-excursion
+                 (goto-char (js2-current-token-end))
+                 (max (js2-node-abs-pos (js2-function-node-body fn-node))
+                      (point-at-bol))))
+          (end (js2-current-token-end)))
+      (if (cl-plusp (js2-name-node-length name))
+          (js2-add-strict-warning "msg.no.return.value"
+                                  (js2-name-node-name name) pos end)
+        (js2-add-strict-warning "msg.anon.no.return.value" nil pos end)))))
+
+(defun js2-parse-function-stmt (&optional async-p)
+  (let ((pos (js2-current-token-beg))
+        (star-p (js2-match-token js2-MUL)))
+    (js2-must-match-name "msg.unnamed.function.stmt")
+    (let ((name (js2-create-name-node t))
+          pn member-expr)
+      (cond
+       ((js2-match-token js2-LP)
+        (js2-parse-function 'FUNCTION_STATEMENT pos star-p async-p name))
+       (js2-allow-member-expr-as-function-name
+        (setq member-expr (js2-parse-member-expr-tail nil name))
+        (js2-parse-highlight-member-expr-fn-name member-expr)
+        (js2-must-match js2-LP "msg.no.paren.parms")
+        (setf pn (js2-parse-function 'FUNCTION_STATEMENT pos star-p async-p)
+              (js2-function-node-member-expr pn) member-expr)
+        pn)
+       (t
+        (js2-report-error "msg.no.paren.parms")
+        (make-js2-error-node))))))
+
+(defun js2-parse-async-function-stmt ()
+  (js2-parse-function-stmt t))
+
+(defun js2-parse-function-expr (&optional async-p)
+  (let ((pos (js2-current-token-beg))
+        (star-p (js2-match-token js2-MUL))
+        name)
+    (when (js2-match-token js2-NAME)
+      (setq name (js2-create-name-node t)))
+    (js2-must-match js2-LP "msg.no.paren.parms")
+    (js2-parse-function 'FUNCTION_EXPRESSION pos star-p async-p name)))
+
+(defun js2-parse-function-internal (function-type pos star-p &optional async-p name)
+  (let (fn-node lp)
+    (if (= (js2-current-token-type) js2-LP) ; eventually matched LP?
+        (setq lp (js2-current-token-beg)))
+    (setf fn-node (make-js2-function-node :pos pos
+                                          :name name
+                                          :form function-type
+                                          :lp (if lp (- lp pos))
+                                          :generator-type (and star-p 'STAR)
+                                          :async async-p))
+    (when name
+      (js2-set-face (js2-node-pos name) (js2-node-end name)
+                    'font-lock-function-name-face 'record)
+      (when (and (eq function-type 'FUNCTION_STATEMENT)
+                 (cl-plusp (js2-name-node-length name)))
+        ;; Function statements define a symbol in the enclosing scope
+        (js2-define-symbol js2-FUNCTION (js2-name-node-name name) fn-node))
+      (when js2-in-use-strict-directive
+        (js2-check-strict-identifier name)))
+    (if (or (js2-inside-function) (cl-plusp js2-nesting-of-with))
+        ;; 1. Nested functions are not affected by the dynamic scope flag
+        ;;    as dynamic scope is already a parent of their scope.
+        ;; 2. Functions defined under the with statement also immune to
+        ;;    this setup, in which case dynamic scope is ignored in favor
+        ;;    of the with object.
+        (setf (js2-function-node-ignore-dynamic fn-node) t))
+    ;; dynamically bind all the per-function variables
+    (let ((js2-current-script-or-fn fn-node)
+          (js2-current-scope fn-node)
+          (js2-nesting-of-with 0)
+          (js2-end-flags 0)
+          js2-label-set
+          js2-loop-set
+          js2-loop-and-switch-set)
+      (js2-parse-function-params function-type fn-node pos)
+      (when (eq function-type 'FUNCTION_ARROW)
+        (js2-must-match js2-ARROW "msg.bad.arrow.args"))
+      (if (and (>= js2-language-version 180)
+               (/= (js2-peek-token) js2-LC))
+          (js2-parse-function-closure-body fn-node)
+        (js2-parse-function-body fn-node))
+      (js2-check-inconsistent-return-warning fn-node name)
+
+      (when name
+        (js2-node-add-children fn-node name)
+        ;; Function expressions define a name only in the body of the
+        ;; function, and only if not hidden by a parameter name
+        (when (and (eq function-type 'FUNCTION_EXPRESSION)
+                   (null (js2-scope-get-symbol js2-current-scope
+                                               (js2-name-node-name name))))
+          (js2-define-symbol js2-FUNCTION
+                             (js2-name-node-name name)
+                             fn-node))
+        (when (eq function-type 'FUNCTION_STATEMENT)
+          (js2-record-imenu-functions fn-node))))
+
+    (setf (js2-node-len fn-node) (- js2-ts-cursor pos))
+    ;; Rhino doesn't do this, but we need it for finding undeclared vars.
+    ;; We wait until after parsing the function to set its parent scope,
+    ;; since `js2-define-symbol' needs the defining-scope check to stop
+    ;; at the function boundary when checking for redeclarations.
+    (setf (js2-scope-parent-scope fn-node) js2-current-scope)
+    fn-node))
+
+(defun js2-parse-function (function-type pos star-p &optional async-p name)
+  "Function parser.  FUNCTION-TYPE is a symbol, POS is the
+beginning of the first token (function keyword, unless it's an
+arrow function), NAME is js2-name-node."
+  (let ((continue t)
+        ts-state
+        fn-node
+        ;; Preserve strict state outside this function.
+        (js2-in-use-strict-directive js2-in-use-strict-directive))
+    ;; Parse multiple times if a new strict mode directive is discovered in the
+    ;; function body, as new rules will be retroactively applied to the legality
+    ;; of function names and parameters.
+    (while continue
+      (setq ts-state (make-js2-ts-state))
+      (setq continue (catch 'reparse
+                       (setq fn-node (js2-parse-function-internal
+                                      function-type pos star-p async-p name))
+                       ;; Don't continue.
+                       nil))
+      (when continue
+        (js2-ts-seek ts-state)))
+    fn-node))
+
+(defun js2-parse-statements (&optional parent)
+  "Parse a statement list.  Last token consumed must be js2-LC.
+
+PARENT can be a `js2-block-node', in which case the statements are
+appended to PARENT.  Otherwise a new `js2-block-node' is created
+and returned.
+
+This function does not match the closing js2-RC: the caller
+matches the RC so it can provide a suitable error message if not
+matched.  This means it's up to the caller to set the length of
+the node to include the closing RC.  The node start pos is set to
+the absolute buffer start position, and the caller should fix it
+up to be relative to the parent node.  All children of this block
+node are given relative start positions and correct lengths."
+  (let ((pn (or parent (make-js2-block-node)))
+        tt)
+    (while (and (> (setq tt (js2-peek-token)) js2-EOF)
+                (/= tt js2-RC))
+      (js2-block-node-push pn (js2-parse-statement)))
+    pn))
+
+(defun js2-parse-statement ()
+  (let (pn beg end)
+    ;; coarse-grained user-interrupt check - needs work
+    (and js2-parse-interruptable-p
+         (zerop (% (cl-incf js2-parse-stmt-count)
+                   js2-statements-per-pause))
+         (input-pending-p)
+         (throw 'interrupted t))
+    (setq pn (js2-statement-helper))
+    ;; no-side-effects warning check
+    (unless (js2-node-has-side-effects pn)
+      (setq end (js2-node-end pn))
+      (save-excursion
+        (goto-char end)
+        (setq beg (max (js2-node-pos pn) (point-at-bol))))
+      (js2-add-strict-warning "msg.no.side.effects" nil beg end))
+    pn))
+
+;; These correspond to the switch cases in Parser.statementHelper
+(defconst js2-parsers
+  (let ((parsers (make-vector js2-num-tokens
+                                #'js2-parse-expr-stmt)))
+    (aset parsers js2-BREAK     #'js2-parse-break)
+    (aset parsers js2-CLASS     #'js2-parse-class-stmt)
+    (aset parsers js2-CONST     #'js2-parse-const-var)
+    (aset parsers js2-CONTINUE  #'js2-parse-continue)
+    (aset parsers js2-DEBUGGER  #'js2-parse-debugger)
+    (aset parsers js2-DEFAULT   #'js2-parse-default-xml-namespace)
+    (aset parsers js2-DO        #'js2-parse-do)
+    (aset parsers js2-EXPORT    #'js2-parse-export)
+    (aset parsers js2-FOR       #'js2-parse-for)
+    (aset parsers js2-FUNCTION  #'js2-parse-function-stmt)
+    (aset parsers js2-IF        #'js2-parse-if)
+    (aset parsers js2-IMPORT    #'js2-parse-import)
+    (aset parsers js2-LC        #'js2-parse-block)
+    (aset parsers js2-LET       #'js2-parse-let-stmt)
+    (aset parsers js2-NAME      #'js2-parse-name-or-label)
+    (aset parsers js2-RETURN    #'js2-parse-ret-yield)
+    (aset parsers js2-SEMI      #'js2-parse-semi)
+    (aset parsers js2-SWITCH    #'js2-parse-switch)
+    (aset parsers js2-THROW     #'js2-parse-throw)
+    (aset parsers js2-TRY       #'js2-parse-try)
+    (aset parsers js2-VAR       #'js2-parse-const-var)
+    (aset parsers js2-WHILE     #'js2-parse-while)
+    (aset parsers js2-WITH      #'js2-parse-with)
+    (aset parsers js2-YIELD     #'js2-parse-ret-yield)
+    parsers)
+  "A vector mapping token types to parser functions.")
+
+(defun js2-parse-warn-missing-semi (beg end)
+  (and js2-mode-show-strict-warnings
+       js2-strict-missing-semi-warning
+       (js2-add-strict-warning
+        "msg.missing.semi" nil
+        ;; back up to beginning of statement or line
+        (max beg (save-excursion
+                   (goto-char end)
+                   (point-at-bol)))
+        end)))
+
+(defconst js2-no-semi-insertion
+  (list js2-IF
+        js2-SWITCH
+        js2-WHILE
+        js2-DO
+        js2-FOR
+        js2-TRY
+        js2-WITH
+        js2-LC
+        js2-ERROR
+        js2-SEMI
+        js2-CLASS
+        js2-FUNCTION
+        js2-EXPORT)
+  "List of tokens that don't do automatic semicolon insertion.")
+
+(defconst js2-autoinsert-semi-and-warn
+  (list js2-ERROR js2-EOF js2-RC))
+
+(defun js2-statement-helper ()
+  (let* ((tt (js2-get-token))
+         (first-tt tt)
+         (async-stmt (js2-match-async-function))
+         (parser (if (= tt js2-ERROR)
+                     #'js2-parse-semi
+                   (if async-stmt
+                       #'js2-parse-async-function-stmt
+                     (aref js2-parsers tt))))
+         pn)
+    ;; If the statement is set, then it's been told its label by now.
+    (and js2-labeled-stmt
+         (js2-labeled-stmt-node-stmt js2-labeled-stmt)
+         (setq js2-labeled-stmt nil))
+    (setq pn (funcall parser))
+    ;; Don't do auto semi insertion for certain statement types.
+    (unless (or (memq first-tt js2-no-semi-insertion)
+                (js2-labeled-stmt-node-p pn)
+                async-stmt)
+      (js2-auto-insert-semicolon pn))
+    pn))
+
+(defun js2-auto-insert-semicolon (pn)
+  (let* ((tt (js2-get-token))
+         (pos (js2-node-pos pn)))
+      (cond
+       ((= tt js2-SEMI)
+        ;; extend the node bounds to include the semicolon.
+        (setf (js2-node-len pn) (- (js2-current-token-end) pos)))
+       ((memq tt js2-autoinsert-semi-and-warn)
+        (js2-unget-token) ; Not ';', do not consume.
+        ;; Autoinsert ;
+        (js2-parse-warn-missing-semi pos (js2-node-end pn)))
+       (t
+        (if (not (js2-token-follows-eol-p (js2-current-token)))
+            ;; Report error if no EOL or autoinsert ';' otherwise
+            (js2-report-error "msg.no.semi.stmt")
+          (js2-parse-warn-missing-semi pos (js2-node-end pn)))
+        (js2-unget-token) ; Not ';', do not consume.
+        ))))
+
+(defun js2-parse-condition ()
+  "Parse a parenthesized boolean expression, e.g. in an if- or while-stmt.
+The parens are discarded and the expression node is returned.
+The `pos' field of the return value is set to an absolute position
+that must be fixed up by the caller.
+Return value is a list (EXPR LP RP), with absolute paren positions."
+  (let (pn lp rp)
+    (if (js2-must-match js2-LP "msg.no.paren.cond")
+        (setq lp (js2-current-token-beg)))
+    (setq pn (js2-parse-expr))
+    (if (js2-must-match js2-RP "msg.no.paren.after.cond")
+        (setq rp (js2-current-token-beg)))
+    ;; Report strict warning on code like "if (a = 7) ..."
+    (if (and js2-strict-cond-assign-warning
+             (js2-assign-node-p pn))
+        (js2-add-strict-warning "msg.equal.as.assign" nil
+                                (js2-node-pos pn)
+                                (+ (js2-node-pos pn)
+                                   (js2-node-len pn))))
+    (list pn lp rp)))
+
+(defun js2-parse-if ()
+  "Parser for if-statement.  Last matched token must be js2-IF."
+  (let ((pos (js2-current-token-beg))
+        cond if-true if-false else-pos end pn)
+    (setq cond (js2-parse-condition)
+          if-true (js2-parse-statement)
+          if-false (if (js2-match-token js2-ELSE)
+                       (progn
+                         (setq else-pos (- (js2-current-token-beg) pos))
+                         (js2-parse-statement)))
+          end (js2-node-end (or if-false if-true))
+          pn (make-js2-if-node :pos pos
+                               :len (- end pos)
+                               :condition (car cond)
+                               :then-part if-true
+                               :else-part if-false
+                               :else-pos else-pos
+                               :lp (js2-relpos (cl-second cond) pos)
+                               :rp (js2-relpos (cl-third cond) pos)))
+    (js2-node-add-children pn (car cond) if-true if-false)
+    pn))
+
+(defun js2-parse-import ()
+  "Parse import statement. The current token must be js2-IMPORT."
+  (unless (js2-ast-root-p js2-current-scope)
+    (js2-report-error "msg.mod.import.decl.at.top.level"))
+  (let ((beg (js2-current-token-beg)))
+    (cond ((js2-match-token js2-STRING)
+           (make-js2-import-node
+            :pos beg
+            :len (- (js2-current-token-end) beg)
+            :module-id (js2-current-token-string)))
+          (t
+           (let* ((import-clause (js2-parse-import-clause))
+                  (from-clause (and import-clause (js2-parse-from-clause)))
+                  (module-id (when from-clause (js2-from-clause-node-module-id from-clause)))
+                  (node (make-js2-import-node
+                         :pos beg
+                         :len (- (js2-current-token-end) beg)
+                         :import import-clause
+                         :from from-clause
+                         :module-id module-id)))
+             (when import-clause
+               (js2-node-add-children node import-clause))
+             (when from-clause
+               (js2-node-add-children node from-clause))
+             node)))))
+
+(defun js2-parse-import-clause ()
+  "Parse the bindings in an import statement.
+This can take many forms:
+
+ImportedDefaultBinding -> 'foo'
+NameSpaceImport -> '* as lib'
+NamedImports -> '{foo as bar, bang}'
+ImportedDefaultBinding , NameSpaceImport -> 'foo, * as lib'
+ImportedDefaultBinding , NamedImports -> 'foo, {bar, baz as bif}'
+
+Try to match namespace imports and named imports first because nothing can
+come after them. If it is an imported default binding, then it could have named
+imports or a namespace import that follows it.
+"
+  (let* ((beg (js2-current-token-beg))
+         (clause (make-js2-import-clause-node
+                  :pos beg))
+         (children (list)))
+    (cond
+     ((js2-match-token js2-MUL)
+      (let ((ns-import (js2-parse-namespace-import)))
+        (when ns-import
+          (let ((name-node (js2-namespace-import-node-name ns-import)))
+            (js2-define-symbol
+             js2-LET (js2-name-node-name name-node) name-node t)))
+        (setf (js2-import-clause-node-namespace-import clause) ns-import)
+        (push ns-import children)))
+     ((js2-match-token js2-LC)
+      (let ((imports (js2-parse-export-bindings t)))
+        (setf (js2-import-clause-node-named-imports clause) imports)
+        (dolist (import imports)
+          (push import children)
+          (let ((name-node (js2-export-binding-node-local-name import)))
+            (when name-node
+              (js2-define-symbol
+               js2-LET (js2-name-node-name name-node) name-node t))))))
+     ((= (js2-peek-token) js2-NAME)
+      (let ((binding (js2-maybe-parse-export-binding)))
+        (let ((node-name (js2-export-binding-node-local-name binding)))
+          (js2-define-symbol js2-LET (js2-name-node-name node-name) node-name t))
+        (setf (js2-import-clause-node-default-binding clause) binding)
+        (push binding children))
+      (when (js2-match-token js2-COMMA)
+        (cond
+         ((js2-match-token js2-MUL)
+          (let ((ns-import (js2-parse-namespace-import)))
+            (let ((name-node (js2-namespace-import-node-name ns-import)))
+              (js2-define-symbol
+               js2-LET (js2-name-node-name name-node) name-node t))
+            (setf (js2-import-clause-node-namespace-import clause) ns-import)
+            (push ns-import children)))
+         ((js2-match-token js2-LC)
+          (let ((imports (js2-parse-export-bindings t)))
+            (setf (js2-import-clause-node-named-imports clause) imports)
+            (dolist (import imports)
+              (push import children)
+              (let ((name-node (js2-export-binding-node-local-name import)))
+                (when name-node
+                  (js2-define-symbol
+                   js2-LET (js2-name-node-name name-node) name-node t))))))
+         (t (js2-report-error "msg.syntax")))))
+     (t (js2-report-error "msg.mod.declaration.after.import")))
+    (setf (js2-node-len clause) (- (js2-current-token-end) beg))
+    (apply #'js2-node-add-children clause children)
+    clause))
+
+(defun js2-parse-namespace-import ()
+  "Parse a namespace import expression such as  '* as bar'.
+The current token must be js2-MUL."
+  (let ((beg (js2-current-token-beg)))
+    (when (js2-must-match js2-NAME "msg.syntax")
+        (if (equal "as" (js2-current-token-string))
+            (when (js2-must-match-prop-name "msg.syntax")
+              (let ((node (make-js2-namespace-import-node
+                           :pos beg
+                           :len (- (js2-current-token-end) beg)
+                           :name (make-js2-name-node
+                                  :pos (js2-current-token-beg)
+                                  :len (js2-current-token-end)
+                                  :name (js2-current-token-string)))))
+                (js2-node-add-children node (js2-namespace-import-node-name node))
+                node))
+          (js2-unget-token)
+          (js2-report-error "msg.syntax")))))
+
+
+(defun js2-parse-from-clause ()
+  "Parse the from clause in an import or export statement. E.g. from 'src/lib'"
+  (when (js2-must-match-name "msg.mod.from.after.import.spec.set")
+    (let ((beg (js2-current-token-beg)))
+      (if (equal "from" (js2-current-token-string))
+          (cond
+           ((js2-match-token js2-STRING)
+            (make-js2-from-clause-node
+             :pos beg
+             :len (- (js2-current-token-end) beg)
+             :module-id (js2-current-token-string)
+             :metadata-p nil))
+           ((js2-match-token js2-THIS)
+            (when (js2-must-match-name "msg.mod.spec.after.from")
+              (if (equal "module" (js2-current-token-string))
+                  (make-js2-from-clause-node
+                   :pos beg
+                   :len (- (js2-current-token-end) beg)
+                   :module-id "this"
+                   :metadata-p t)
+                (js2-unget-token)
+                (js2-unget-token)
+                (js2-report-error "msg.mod.spec.after.from")
+                nil)))
+           (t (js2-report-error "msg.mod.spec.after.from") nil))
+        (js2-unget-token)
+        (js2-report-error "msg.mod.from.after.import.spec.set")
+        nil))))
+
+(defun js2-parse-export-bindings (&optional import-p)
+  "Parse a list of export binding expressions such as {}, {foo, bar}, and
+{foo as bar, baz as bang}. The current token must be
+js2-LC. Return a lisp list of js2-export-binding-node"
+  (let ((bindings (list)))
+    (while
+        (let ((binding (js2-maybe-parse-export-binding)))
+          (when binding
+            (push binding bindings))
+          (js2-match-token js2-COMMA)))
+    (when (js2-must-match js2-RC (if import-p
+                                     "msg.mod.rc.after.import.spec.list"
+                                   "msg.mod.rc.after.export.spec.list"))
+      (reverse bindings))))
+
+(defun js2-maybe-parse-export-binding ()
+  "Attempt to parse a binding expression found inside an import/export statement.
+This can take the form of either as single js2-NAME token as in 'foo' or as in a
+rebinding expression 'bar as foo'. If it matches, it will return an instance of
+js2-export-binding-node and consume all the tokens. If it does not match, it
+consumes no tokens."
+  (let ((extern-name (when (js2-match-prop-name) (js2-current-token-string)))
+        (beg (js2-current-token-beg))
+        (extern-name-len (js2-current-token-len))
+        (is-reserved-name (or (= (js2-current-token-type) js2-RESERVED)
+                              (aref js2-kwd-tokens (js2-current-token-type)))))
+    (if extern-name
+        (let ((as (and (js2-match-token js2-NAME) (js2-current-token-string))))
+          (if (and as (equal "as" (js2-current-token-string)))
+              (let ((name
+                     (or
+                      (and (js2-match-token js2-DEFAULT) "default")
+                      (and (js2-match-token js2-NAME) (js2-current-token-string)))))
+                (if name
+                    (let ((node (make-js2-export-binding-node
+                                 :pos beg
+                                 :len (- (js2-current-token-end) beg)
+                                 :local-name (make-js2-name-node
+                                              :name name
+                                              :pos (js2-current-token-beg)
+                                              :len (js2-current-token-len))
+                                 :extern-name (make-js2-name-node
+                                               :name extern-name
+                                               :pos beg
+                                               :len extern-name-len))))
+                      (js2-node-add-children
+                       node
+                       (js2-export-binding-node-local-name node)
+                       (js2-export-binding-node-extern-name node))
+                      node)
+                  (js2-unget-token)
+                  nil))
+            (when as (js2-unget-token))
+            (let* ((name-node (make-js2-name-node
+                              :name (js2-current-token-string)
+                              :pos (js2-current-token-beg)
+                              :len (js2-current-token-len)))
+                  (node (make-js2-export-binding-node
+                         :pos (js2-current-token-beg)
+                         :len (js2-current-token-len)
+                         :local-name name-node
+                         :extern-name name-node)))
+              (when is-reserved-name
+                (js2-report-error "msg.mod.as.after.reserved.word" extern-name))
+              (js2-node-add-children node name-node)
+              node)))
+      nil)))
+
+(defun js2-parse-switch ()
+  "Parser for switch-statement.  Last matched token must be js2-SWITCH."
+  (let ((pos (js2-current-token-beg))
+        tt pn discriminant has-default case-expr case-node
+        case-pos cases stmt lp)
+    (if (js2-must-match js2-LP "msg.no.paren.switch")
+        (setq lp (js2-current-token-beg)))
+    (setq discriminant (js2-parse-expr)
+          pn (make-js2-switch-node :discriminant discriminant
+                                   :pos pos
+                                   :lp (js2-relpos lp pos)))
+    (js2-node-add-children pn discriminant)
+    (js2-enter-switch pn)
+    (unwind-protect
+        (progn
+          (if (js2-must-match js2-RP "msg.no.paren.after.switch")
+              (setf (js2-switch-node-rp pn) (- (js2-current-token-beg) pos)))
+          (js2-must-match js2-LC "msg.no.brace.switch")
+          (catch 'break
+            (while t
+              (setq tt (js2-next-token)
+                    case-pos (js2-current-token-beg))
+              (cond
+               ((= tt js2-RC)
+                (setf (js2-node-len pn) (- (js2-current-token-end) pos))
+                (throw 'break nil))  ; done
+               ((= tt js2-CASE)
+                (setq case-expr (js2-parse-expr))
+                (js2-must-match js2-COLON "msg.no.colon.case"))
+               ((= tt js2-DEFAULT)
+                (if has-default
+                    (js2-report-error "msg.double.switch.default"))
+                (setq has-default t
+                      case-expr nil)
+                (js2-must-match js2-COLON "msg.no.colon.case"))
+               (t
+                (js2-report-error "msg.bad.switch")
+                (throw 'break nil)))
+              (setq case-node (make-js2-case-node :pos case-pos
+                                                  :len (- (js2-current-token-end) case-pos)
+                                                  :expr case-expr))
+              (js2-node-add-children case-node case-expr)
+              (while (and (/= (setq tt (js2-peek-token)) js2-RC)
+                          (/= tt js2-CASE)
+                          (/= tt js2-DEFAULT)
+                          (/= tt js2-EOF))
+                (setf stmt (js2-parse-statement)
+                      (js2-node-len case-node) (- (js2-node-end stmt) case-pos))
+                (js2-block-node-push case-node stmt))
+              (push case-node cases)))
+          ;; add cases last, as pushing reverses the order to be correct
+          (dolist (kid cases)
+            (js2-node-add-children pn kid)
+            (push kid (js2-switch-node-cases pn)))
+          pn)  ; return value
+      (js2-exit-switch))))
+
+(defun js2-parse-while ()
+  "Parser for while-statement.  Last matched token must be js2-WHILE."
+  (let ((pos (js2-current-token-beg))
+        (pn (make-js2-while-node))
+        cond body)
+    (js2-enter-loop pn)
+    (unwind-protect
+        (progn
+          (setf cond (js2-parse-condition)
+                (js2-while-node-condition pn) (car cond)
+                body (js2-parse-statement)
+                (js2-while-node-body pn) body
+                (js2-node-len pn) (- (js2-node-end body) pos)
+                (js2-while-node-lp pn) (js2-relpos (cl-second cond) pos)
+                (js2-while-node-rp pn) (js2-relpos (cl-third cond) pos))
+          (js2-node-add-children pn body (car cond)))
+      (js2-exit-loop))
+    pn))
+
+(defun js2-parse-do ()
+  "Parser for do-statement.  Last matched token must be js2-DO."
+  (let ((pos (js2-current-token-beg))
+        (pn (make-js2-do-node))
+        cond body end)
+    (js2-enter-loop pn)
+    (unwind-protect
+        (progn
+          (setq body (js2-parse-statement))
+          (js2-must-match js2-WHILE "msg.no.while.do")
+          (setf (js2-do-node-while-pos pn) (- (js2-current-token-beg) pos)
+                cond (js2-parse-condition)
+                (js2-do-node-condition pn) (car cond)
+                (js2-do-node-body pn) body
+                end js2-ts-cursor
+                (js2-do-node-lp pn) (js2-relpos (cl-second cond) pos)
+                (js2-do-node-rp pn) (js2-relpos (cl-third cond) pos))
+          (js2-node-add-children pn (car cond) body))
+      (js2-exit-loop))
+    ;; Always auto-insert semicolon to follow SpiderMonkey:
+    ;; It is required by ECMAScript but is ignored by the rest of
+    ;; world; see bug 238945
+    (if (js2-match-token js2-SEMI)
+        (setq end js2-ts-cursor))
+    (setf (js2-node-len pn) (- end pos))
+    pn))
+
+(defun js2-parse-export ()
+  "Parse an export statement.
+The Last matched token must be js2-EXPORT. Currently, the 'default' and 'expr'
+expressions should only be either hoistable expressions (function or generator)
+or assignment expressions, but there is no checking to enforce that and so it
+will parse without error a small subset of
+invalid export statements."
+  (unless (js2-ast-root-p js2-current-scope)
+    (js2-report-error "msg.mod.export.decl.at.top.level"))
+  (let ((beg (js2-current-token-beg))
+        (children (list))
+        exports-list from-clause declaration default)
+    (cond
+     ((js2-match-token js2-MUL)
+      (setq from-clause (js2-parse-from-clause))
+      (when from-clause
+        (push from-clause children)))
+     ((js2-match-token js2-LC)
+      (setq exports-list (js2-parse-export-bindings))
+      (when exports-list
+        (dolist (export exports-list)
+          (push export children)))
+      (when (js2-match-token js2-NAME)
+        (if (equal "from" (js2-current-token-string))
+            (progn
+              (js2-unget-token)
+              (setq from-clause (js2-parse-from-clause)))
+          (js2-unget-token))))
+     ((js2-match-token js2-DEFAULT)
+      (setq default (cond ((js2-match-token js2-CLASS)
+                           (js2-parse-class-stmt))
+                          ((js2-match-token js2-NAME)
+                           (if (js2-match-async-function)
+                               (js2-parse-async-function-stmt)
+                             (js2-unget-token)
+                             (js2-parse-expr)))
+                          ((js2-match-token js2-FUNCTION)
+                           (js2-parse-function-stmt))
+                          (t (js2-parse-expr)))))
+     ((or (js2-match-token js2-VAR) (js2-match-token js2-CONST) (js2-match-token js2-LET))
+      (setq declaration (js2-parse-variables (js2-current-token-type) (js2-current-token-beg))))
+     ((js2-match-token js2-CLASS)
+      (setq declaration (js2-parse-class-stmt)))
+     ((js2-match-token js2-NAME)
+      (setq declaration
+            (if (js2-match-async-function)
+                (js2-parse-async-function-stmt)
+              (js2-unget-token)
+              (js2-parse-expr))))
+     ((js2-match-token js2-FUNCTION)
+      (setq declaration (js2-parse-function-stmt)))
+     (t
+      (setq declaration (js2-parse-expr))))
+    (when from-clause
+      (push from-clause children))
+    (when declaration
+      (push declaration children)
+      (when (not (or (js2-function-node-p declaration)
+                     (js2-class-node-p declaration)))
+        (js2-auto-insert-semicolon declaration)))
+    (when default
+      (push default children)
+      (when (not (or (js2-function-node-p default)
+                     (js2-class-node-p default)))
+        (js2-auto-insert-semicolon default)))
+    (let ((node (make-js2-export-node
+                  :pos beg
+                  :len (- (js2-current-token-end) beg)
+                  :exports-list exports-list
+                  :from-clause from-clause
+                  :declaration declaration
+                  :default default)))
+      (apply #'js2-node-add-children node children)
+      node)))
+
+(defun js2-parse-for ()
+  "Parse a for, for-in or for each-in statement.
+Last matched token must be js2-FOR."
+  (let ((for-pos (js2-current-token-beg))
+        (tmp-scope (make-js2-scope))
+        pn is-for-each is-for-in-or-of is-for-of
+        in-pos each-pos tmp-pos
+        init  ; Node init is also foo in 'foo in object'.
+        cond  ; Node cond is also object in 'foo in object'.
+        incr  ; 3rd section of for-loop initializer.
+        body tt lp rp)
+    ;; See if this is a for each () instead of just a for ()
+    (when (js2-match-token js2-NAME)
+      (if (string= "each" (js2-current-token-string))
+          (progn
+            (setq is-for-each t
+                  each-pos (- (js2-current-token-beg) for-pos)) ; relative
+            (js2-record-face 'font-lock-keyword-face))
+        (js2-report-error "msg.no.paren.for")))
+    (if (js2-must-match js2-LP "msg.no.paren.for")
+        (setq lp (- (js2-current-token-beg) for-pos)))
+    (setq tt (js2-get-token))
+    ;; Capture identifiers inside parens.  We can't create the node
+    ;; (and use it as the current scope) until we know its type.
+    (js2-push-scope tmp-scope)
+    (unwind-protect
+        (progn
+          ;; parse init clause
+          (let ((js2-in-for-init t))  ; set as dynamic variable
+            (cond
+             ((= tt js2-SEMI)
+              (js2-unget-token)
+              (setq init (make-js2-empty-expr-node)))
+             ((or (= tt js2-VAR) (= tt js2-LET) (= tt js2-CONST))
+              (setq init (js2-parse-variables tt (js2-current-token-beg))))
+             (t
+              (js2-unget-token)
+              (setq init (js2-parse-expr)))))
+          (if (or (js2-match-token js2-IN)
+                  (and (>= js2-language-version 200)
+                       (js2-match-contextual-kwd "of")
+                       (setq is-for-of t)))
+              (setq is-for-in-or-of t
+                    in-pos (- (js2-current-token-beg) for-pos)
+                    ;; scope of iteration target object is not the scope we've created above.
+                    ;; stash current scope temporary.
+                    cond (let ((js2-current-scope (js2-scope-parent-scope js2-current-scope)))
+                           (js2-parse-expr)))  ; object over which we're iterating
+            ;; else ordinary for loop - parse cond and incr
+            (js2-must-match js2-SEMI "msg.no.semi.for")
+            (setq cond (if (= (js2-peek-token) js2-SEMI)
+                           (make-js2-empty-expr-node) ; no loop condition
+                         (js2-parse-expr)))
+            (js2-must-match js2-SEMI "msg.no.semi.for.cond")
+            (setq tmp-pos (js2-current-token-end)
+                  incr (if (= (js2-peek-token) js2-RP)
+                           (make-js2-empty-expr-node :pos tmp-pos)
+                         (js2-parse-expr)))))
+      (js2-pop-scope))
+    (if (js2-must-match js2-RP "msg.no.paren.for.ctrl")
+        (setq rp (- (js2-current-token-beg) for-pos)))
+    (if (not is-for-in-or-of)
+        (setq pn (make-js2-for-node :init init
+                                    :condition cond
+                                    :update incr
+                                    :lp lp
+                                    :rp rp))
+      ;; cond could be null if 'in obj' got eaten by the init node.
+      (if (js2-infix-node-p init)
+          ;; it was (foo in bar) instead of (var foo in bar)
+          (setq cond (js2-infix-node-right init)
+                init (js2-infix-node-left init))
+        (if (and (js2-var-decl-node-p init)
+                 (> (length (js2-var-decl-node-kids init)) 1))
+            (js2-report-error "msg.mult.index")))
+      (setq pn (make-js2-for-in-node :iterator init
+                                     :object cond
+                                     :in-pos in-pos
+                                     :foreach-p is-for-each
+                                     :each-pos each-pos
+                                     :forof-p is-for-of
+                                     :lp lp
+                                     :rp rp)))
+    ;; Transplant the declarations.
+    (setf (js2-scope-symbol-table pn)
+          (js2-scope-symbol-table tmp-scope))
+    (unwind-protect
+        (progn
+          (js2-enter-loop pn)
+          ;; We have to parse the body -after- creating the loop node,
+          ;; so that the loop node appears in the js2-loop-set, allowing
+          ;; break/continue statements to find the enclosing loop.
+          (setf body (js2-parse-statement)
+                (js2-loop-node-body pn) body
+                (js2-node-pos pn) for-pos
+                (js2-node-len pn) (- (js2-node-end body) for-pos))
+          (js2-node-add-children pn init cond incr body))
+      ;; finally
+      (js2-exit-loop))
+    pn))
+
+(defun js2-parse-try ()
+  "Parse a try statement.  Last matched token must be js2-TRY."
+  (let ((try-pos (js2-current-token-beg))
+        try-end
+        try-block
+        catch-blocks
+        finally-block
+        saw-default-catch
+        peek)
+    (if (/= (js2-peek-token) js2-LC)
+        (js2-report-error "msg.no.brace.try"))
+    (setq try-block (js2-parse-statement)
+          try-end (js2-node-end try-block)
+          peek (js2-peek-token))
+    (cond
+     ((= peek js2-CATCH)
+      (while (js2-match-token js2-CATCH)
+        (let* ((catch-pos (js2-current-token-beg))
+               (catch-node (make-js2-catch-node :pos catch-pos))
+               param
+               guard-kwd
+               catch-cond
+               lp rp)
+          (if saw-default-catch
+              (js2-report-error "msg.catch.unreachable"))
+          (if (js2-must-match js2-LP "msg.no.paren.catch")
+              (setq lp (- (js2-current-token-beg) catch-pos)))
+          (js2-push-scope catch-node)
+          (let ((tt (js2-peek-token)))
+            (cond
+             ;; Destructuring pattern:
+             ;;     catch ({ message, file }) { ... }
+             ((or (= tt js2-LB) (= tt js2-LC))
+              (js2-get-token)
+              (setq param (js2-parse-destruct-primary-expr))
+              (js2-define-destruct-symbols param js2-LET nil))
+             ;; Simple name.
+             (t
+              (js2-must-match-name "msg.bad.catchcond")
+              (setq param (js2-create-name-node))
+              (js2-define-symbol js2-LET (js2-current-token-string) param)
+              (js2-check-strict-identifier param))))
+          ;; Catch condition.
+          (if (js2-match-token js2-IF)
+              (setq guard-kwd (- (js2-current-token-beg) catch-pos)
+                    catch-cond (js2-parse-expr))
+            (setq saw-default-catch t))
+          (if (js2-must-match js2-RP "msg.bad.catchcond")
+              (setq rp (- (js2-current-token-beg) catch-pos)))
+          (js2-must-match js2-LC "msg.no.brace.catchblock")
+          (js2-parse-statements catch-node)
+          (if (js2-must-match js2-RC "msg.no.brace.after.body")
+              (setq try-end (js2-current-token-end)))
+          (js2-pop-scope)
+          (setf (js2-node-len catch-node) (- try-end catch-pos)
+                (js2-catch-node-param catch-node) param
+                (js2-catch-node-guard-expr catch-node) catch-cond
+                (js2-catch-node-guard-kwd catch-node) guard-kwd
+                (js2-catch-node-lp catch-node) lp
+                (js2-catch-node-rp catch-node) rp)
+          (js2-node-add-children catch-node param catch-cond)
+          (push catch-node catch-blocks))))
+     ((/= peek js2-FINALLY)
+      (js2-must-match js2-FINALLY "msg.try.no.catchfinally"
+                      (js2-node-pos try-block)
+                      (- (setq try-end (js2-node-end try-block))
+                         (js2-node-pos try-block)))))
+    (when (js2-match-token js2-FINALLY)
+      (let ((finally-pos (js2-current-token-beg))
+            (block (js2-parse-statement)))
+        (setq try-end (js2-node-end block)
+              finally-block (make-js2-finally-node :pos finally-pos
+                                                   :len (- try-end finally-pos)
+                                                   :body block))
+        (js2-node-add-children finally-block block)))
+    (let ((pn (make-js2-try-node :pos try-pos
+                                 :len (- try-end try-pos)
+                                 :try-block try-block
+                                 :finally-block finally-block)))
+      (js2-node-add-children pn try-block finally-block)
+      ;; Push them onto the try-node, which reverses and corrects their order.
+      (dolist (cb catch-blocks)
+        (js2-node-add-children pn cb)
+        (push cb (js2-try-node-catch-clauses pn)))
+      pn)))
+
+(defun js2-parse-throw ()
+  "Parser for throw-statement.  Last matched token must be js2-THROW."
+  (let ((pos (js2-current-token-beg))
+        expr pn)
+    (if (= (js2-peek-token-or-eol) js2-EOL)
+        ;; ECMAScript does not allow new lines before throw expression,
+        ;; see bug 256617
+        (js2-report-error "msg.bad.throw.eol"))
+    (setq expr (js2-parse-expr)
+          pn (make-js2-throw-node :pos pos
+                                  :len (- (js2-node-end expr) pos)
+                                  :expr expr))
+    (js2-node-add-children pn expr)
+    pn))
+
+(defun js2-match-jump-label-name (label-name)
+  "If break/continue specified a label, return that label's labeled stmt.
+Returns the corresponding `js2-labeled-stmt-node', or if LABEL-NAME
+does not match an existing label, reports an error and returns nil."
+  (let ((bundle (cdr (assoc label-name js2-label-set))))
+    (if (null bundle)
+        (js2-report-error "msg.undef.label"))
+    bundle))
+
+(defun js2-parse-break ()
+  "Parser for break-statement.  Last matched token must be js2-BREAK."
+  (let ((pos (js2-current-token-beg))
+        (end (js2-current-token-end))
+        break-target ; statement to break from
+        break-label  ; in "break foo", name-node representing the foo
+        labels       ; matching labeled statement to break to
+        pn)
+    (when (eq (js2-peek-token-or-eol) js2-NAME)
+      (js2-get-token)
+      (setq break-label (js2-create-name-node)
+            end (js2-node-end break-label)
+            ;; matchJumpLabelName only matches if there is one
+            labels (js2-match-jump-label-name (js2-current-token-string))
+            break-target (if labels (car (js2-labeled-stmt-node-labels labels)))))
+    (unless (or break-target break-label)
+      ;; no break target specified - try for innermost enclosing loop/switch
+      (if (null js2-loop-and-switch-set)
+          (unless break-label
+            (js2-report-error "msg.bad.break" nil pos (length "break")))
+        (setq break-target (car js2-loop-and-switch-set))))
+    (setq pn (make-js2-break-node :pos pos
+                                  :len (- end pos)
+                                  :label break-label
+                                  :target break-target))
+    (js2-node-add-children pn break-label)  ; but not break-target
+    pn))
+
+(defun js2-parse-continue ()
+  "Parser for continue-statement.  Last matched token must be js2-CONTINUE."
+  (let ((pos (js2-current-token-beg))
+        (end (js2-current-token-end))
+        label   ; optional user-specified label, a `js2-name-node'
+        labels  ; current matching labeled stmt, if any
+        target  ; the `js2-loop-node' target of this continue stmt
+        pn)
+    (when (= (js2-peek-token-or-eol) js2-NAME)
+      (js2-get-token)
+      (setq label (js2-create-name-node)
+            end (js2-node-end label)
+            ;; matchJumpLabelName only matches if there is one
+            labels (js2-match-jump-label-name (js2-current-token-string))))
+    (cond
+     ((null labels)  ; no current label to go to
+      (if (null js2-loop-set)  ; no loop to continue to
+          (js2-report-error "msg.continue.outside" nil pos
+                            (length "continue"))
+        (setq target (car js2-loop-set))))  ; innermost enclosing loop
+     (t
+      (if (js2-loop-node-p (js2-labeled-stmt-node-stmt labels))
+          (setq target (js2-labeled-stmt-node-stmt labels))
+        (js2-report-error "msg.continue.nonloop" nil pos (- end pos)))))
+    (setq pn (make-js2-continue-node :pos pos
+                                     :len (- end pos)
+                                     :label label
+                                     :target target))
+    (js2-node-add-children pn label)  ; but not target - it's not our child
+    pn))
+
+(defun js2-parse-with ()
+  "Parser for with-statement.  Last matched token must be js2-WITH."
+  (when js2-in-use-strict-directive
+    (js2-report-error "msg.no.with.strict"))
+  (let ((pos (js2-current-token-beg))
+        obj body pn lp rp)
+    (if (js2-must-match js2-LP "msg.no.paren.with")
+        (setq lp (js2-current-token-beg)))
+    (setq obj (js2-parse-expr))
+    (if (js2-must-match js2-RP "msg.no.paren.after.with")
+        (setq rp (js2-current-token-beg)))
+    (let ((js2-nesting-of-with (1+ js2-nesting-of-with)))
+        (setq body (js2-parse-statement)))
+    (setq pn (make-js2-with-node :pos pos
+                                 :len (- (js2-node-end body) pos)
+                                 :object obj
+                                 :body body
+                                 :lp (js2-relpos lp pos)
+                                 :rp (js2-relpos rp pos)))
+    (js2-node-add-children pn obj body)
+    pn))
+
+(defun js2-parse-const-var ()
+  "Parser for var- or const-statement.
+Last matched token must be js2-CONST or js2-VAR."
+  (let ((tt (js2-current-token-type))
+        (pos (js2-current-token-beg))
+        expr pn)
+    (setq expr (js2-parse-variables tt (js2-current-token-beg))
+          pn (make-js2-expr-stmt-node :pos pos
+                                      :len (- (js2-node-end expr) pos)
+                                      :expr expr))
+    (js2-node-add-children pn expr)
+    pn))
+
+(defun js2-wrap-with-expr-stmt (pos expr &optional add-child)
+  (let ((pn (make-js2-expr-stmt-node :pos pos
+                                     :len (js2-node-len expr)
+                                     :type (if (js2-inside-function)
+                                               js2-EXPR_VOID
+                                             js2-EXPR_RESULT)
+                                     :expr expr)))
+    (if add-child
+        (js2-node-add-children pn expr))
+    pn))
+
+(defun js2-parse-let-stmt ()
+  "Parser for let-statement.  Last matched token must be js2-LET."
+  (let ((pos (js2-current-token-beg))
+        expr pn)
+    (if (= (js2-peek-token) js2-LP)
+        ;; let expression in statement context
+        (setq expr (js2-parse-let pos 'statement)
+              pn (js2-wrap-with-expr-stmt pos expr t))
+      ;; else we're looking at a statement like let x=6, y=7;
+      (setf expr (js2-parse-variables js2-LET pos)
+            pn (js2-wrap-with-expr-stmt pos expr t)
+            (js2-node-type pn) js2-EXPR_RESULT))
+    pn))
+
+(defun js2-parse-ret-yield ()
+  (js2-parse-return-or-yield (js2-current-token-type) nil))
+
+(defconst js2-parse-return-stmt-enders
+  (list js2-SEMI js2-RC js2-EOF js2-EOL js2-ERROR js2-RB js2-RP js2-YIELD))
+
+(defsubst js2-now-all-set (before after mask)
+  "Return whether or not the bits in the mask have changed to all set.
+BEFORE is bits before change, AFTER is bits after change, and MASK is
+the mask for bits.  Returns t if all the bits in the mask are set in AFTER
+but not BEFORE."
+  (and (/= (logand before mask) mask)
+       (= (logand after mask) mask)))
+
+(defun js2-parse-return-or-yield (tt expr-context)
+  (let* ((pos (js2-current-token-beg))
+         (end (js2-current-token-end))
+         (before js2-end-flags)
+         (inside-function (js2-inside-function))
+         (gen-type (and inside-function (js2-function-node-generator-type
+                                         js2-current-script-or-fn)))
+         e ret name yield-star-p)
+    (unless inside-function
+      (js2-report-error (if (eq tt js2-RETURN)
+                            "msg.bad.return"
+                          "msg.bad.yield")))
+    (when (and inside-function
+               (eq gen-type 'STAR)
+               (js2-match-token js2-MUL))
+      (setq yield-star-p t))
+    ;; This is ugly, but we don't want to require a semicolon.
+    (unless (memq (js2-peek-token-or-eol) js2-parse-return-stmt-enders)
+      (setq e (js2-parse-expr)
+            end (js2-node-end e)))
+    (cond
+     ((eq tt js2-RETURN)
+      (js2-set-flag js2-end-flags (if (null e)
+                                      js2-end-returns
+                                    js2-end-returns-value))
+      (setq ret (make-js2-return-node :pos pos
+                                      :len (- end pos)
+                                      :retval e))
+      (js2-node-add-children ret e)
+      ;; See if we need a strict mode warning.
+      ;; TODO:  The analysis done by `js2-has-consistent-return-usage' is
+      ;; more thorough and accurate than this before/after flag check.
+      ;; E.g. if there's a finally-block that always returns, we shouldn't
+      ;; show a warning generated by inconsistent returns in the catch blocks.
+      ;; Basically `js2-has-consistent-return-usage' needs to keep more state,
+      ;; so we know which returns/yields to highlight, and we should get rid of
+      ;; all the checking in `js2-parse-return-or-yield'.
+      (if (and js2-strict-inconsistent-return-warning
+               (js2-now-all-set before js2-end-flags
+                                (logior js2-end-returns js2-end-returns-value)))
+          (js2-add-strict-warning "msg.return.inconsistent" nil pos end)))
+     ((eq gen-type 'COMPREHENSION)
+      ;; FIXME: We should probably switch to saving and using lastYieldOffset,
+      ;; like SpiderMonkey does.
+      (js2-report-error "msg.syntax" nil pos 5))
+     (t
+      (setq ret (make-js2-yield-node :pos pos
+                                     :len (- end pos)
+                                     :value e
+                                     :star-p yield-star-p))
+      (js2-node-add-children ret e)
+      (unless expr-context
+        (setq e ret
+              ret (js2-wrap-with-expr-stmt pos e t))
+      (js2-set-requires-activation)
+      (js2-set-is-generator))))
+    ;; see if we are mixing yields and value returns.
+    (when (and inside-function
+               (js2-flag-set-p js2-end-flags js2-end-returns-value)
+               (eq (js2-function-node-generator-type js2-current-script-or-fn)
+                   'LEGACY))
+      (setq name (js2-function-name js2-current-script-or-fn))
+      (if (zerop (length name))
+          (js2-report-error "msg.anon.generator.returns" nil pos (- end pos))
+        (js2-report-error "msg.generator.returns" name pos (- end pos))))
+    ret))
+
+(defun js2-parse-debugger ()
+  (make-js2-keyword-node :type js2-DEBUGGER))
+
+(defun js2-parse-block ()
+  "Parser for a curly-delimited statement block.
+Last token matched must be `js2-LC'."
+  (let ((pos (js2-current-token-beg))
+        (pn (make-js2-scope)))
+    (js2-push-scope pn)
+    (unwind-protect
+        (progn
+          (js2-parse-statements pn)
+          (js2-must-match js2-RC "msg.no.brace.block")
+          (setf (js2-node-len pn) (- (js2-current-token-end) pos)))
+      (js2-pop-scope))
+    pn))
+
+;; For `js2-ERROR' too, to have a node for error recovery to work on.
+(defun js2-parse-semi ()
+  "Parse a statement or handle an error.
+Current token type is `js2-SEMI' or `js2-ERROR'."
+  (let ((tt (js2-current-token-type)) pos len)
+    (if (eq tt js2-SEMI)
+        (make-js2-empty-expr-node :len 1)
+      (setq pos (js2-current-token-beg)
+            len (- (js2-current-token-end) pos))
+      (js2-report-error "msg.syntax" nil pos len)
+      (make-js2-error-node :pos pos :len len))))
+
+(defun js2-parse-default-xml-namespace ()
+  "Parse a `default xml namespace = <expr>' e4x statement."
+  (let ((pos (js2-current-token-beg))
+        end len expr unary)
+    (js2-must-have-xml)
+    (js2-set-requires-activation)
+    (setq len (- js2-ts-cursor pos))
+    (unless (and (js2-match-token js2-NAME)
+                 (string= (js2-current-token-string) "xml"))
+      (js2-report-error "msg.bad.namespace" nil pos len))
+    (unless (and (js2-match-token js2-NAME)
+                 (string= (js2-current-token-string) "namespace"))
+      (js2-report-error "msg.bad.namespace" nil pos len))
+    (unless (js2-match-token js2-ASSIGN)
+      (js2-report-error "msg.bad.namespace" nil pos len))
+    (setq expr (js2-parse-expr)
+          end (js2-node-end expr)
+          unary (make-js2-unary-node :type js2-DEFAULTNAMESPACE
+                                     :pos pos
+                                     :len (- end pos)
+                                     :operand expr))
+    (js2-node-add-children unary expr)
+    (make-js2-expr-stmt-node :pos pos
+                             :len (- end pos)
+                             :expr unary)))
+
+(defun js2-record-label (label bundle)
+  ;; current token should be colon that `js2-parse-primary-expr' left untouched
+  (js2-get-token)
+  (let ((name (js2-label-node-name label))
+        labeled-stmt
+        dup)
+    (when (setq labeled-stmt (cdr (assoc name js2-label-set)))
+      ;; flag both labels if possible when used in editing mode
+      (if (and js2-parse-ide-mode
+               (setq dup (js2-get-label-by-name labeled-stmt name)))
+          (js2-report-error "msg.dup.label" nil
+                            (js2-node-abs-pos dup) (js2-node-len dup)))
+      (js2-report-error "msg.dup.label" nil
+                        (js2-node-pos label) (js2-node-len label)))
+    (js2-labeled-stmt-node-add-label bundle label)
+    (js2-node-add-children bundle label)
+    ;; Add one reference to the bundle per label in `js2-label-set'
+    (push (cons name bundle) js2-label-set)))
+
+(defun js2-parse-name-or-label ()
+  "Parser for identifier or label.  Last token matched must be js2-NAME.
+Called when we found a name in a statement context.  If it's a label, we gather
+up any following labels and the next non-label statement into a
+`js2-labeled-stmt-node' bundle and return that.  Otherwise we parse an
+expression and return it wrapped in a `js2-expr-stmt-node'."
+  (let ((pos (js2-current-token-beg))
+        expr stmt bundle
+        (continue t))
+    ;; set check for label and call down to `js2-parse-primary-expr'
+    (setq expr (js2-maybe-parse-label))
+    (if (null expr)
+        ;; Parse the non-label expression and wrap with expression stmt.
+        (js2-wrap-with-expr-stmt pos (js2-parse-expr) t)
+      ;; else parsed a label
+      (setq bundle (make-js2-labeled-stmt-node :pos pos))
+      (js2-record-label expr bundle)
+      ;; look for more labels
+      (while (and continue (= (js2-get-token) js2-NAME))
+        (if (setq expr (js2-maybe-parse-label))
+            (js2-record-label expr bundle)
+          (setq expr (js2-parse-expr)
+                stmt (js2-wrap-with-expr-stmt (js2-node-pos expr) expr t)
+                continue nil)
+          (js2-auto-insert-semicolon stmt)))
+      ;; no more labels; now parse the labeled statement
+      (unwind-protect
+            (unless stmt
+              (let ((js2-labeled-stmt bundle))  ; bind dynamically
+                (js2-unget-token)
+                (setq stmt (js2-statement-helper))))
+        ;; remove the labels for this statement from the global set
+        (dolist (label (js2-labeled-stmt-node-labels bundle))
+          (setq js2-label-set (remove label js2-label-set))))
+      (setf (js2-labeled-stmt-node-stmt bundle) stmt
+            (js2-node-len bundle) (- (js2-node-end stmt) pos))
+      (js2-node-add-children bundle stmt)
+      bundle)))
+
+(defun js2-maybe-parse-label ()
+  (cl-assert (= (js2-current-token-type) js2-NAME))
+  (let (label-pos
+        (next-tt (js2-get-token))
+        (label-end (js2-current-token-end)))
+    ;; Do not consume colon, it is used as unwind indicator
+    ;; to return to statementHelper.
+    (js2-unget-token)
+    (if (= next-tt js2-COLON)
+        (prog2
+            (setq label-pos (js2-current-token-beg))
+            (make-js2-label-node :pos label-pos
+                                 :len (- label-end label-pos)
+                                 :name (js2-current-token-string))
+          (js2-set-face label-pos
+                        label-end
+                        'font-lock-variable-name-face 'record))
+      ;; Backtrack from the name token, too.
+      (js2-unget-token)
+      nil)))
+
+(defun js2-parse-expr-stmt ()
+  "Default parser in statement context, if no recognized statement found."
+  (js2-wrap-with-expr-stmt (js2-current-token-beg)
+                           (progn
+                             (js2-unget-token)
+                             (js2-parse-expr)) t))
+
+(defun js2-parse-variables (decl-type pos)
+  "Parse a comma-separated list of variable declarations.
+Could be a 'var', 'const' or 'let' expression, possibly in a for-loop initializer.
+
+DECL-TYPE is a token value: either VAR, CONST, or LET depending on context.
+For 'var' or 'const', the keyword should be the token last scanned.
+
+POS is the position where the node should start. It's sometimes the
+var/const/let keyword, and other times the beginning of the first token
+in the first variable declaration.
+
+Returns the parsed `js2-var-decl-node' expression node."
+  (let* ((result (make-js2-var-decl-node :decl-type decl-type
+                                         :pos pos))
+         destructuring kid-pos tt init name end nbeg nend vi
+         (continue t))
+    ;; Example:
+    ;; var foo = {a: 1, b: 2}, bar = [3, 4];
+    ;; var {b: s2, a: s1} = foo, x = 6, y, [s3, s4] = bar;
+    ;; var {a, b} = baz;
+    (while continue
+      (setq destructuring nil
+            name nil
+            tt (js2-get-token)
+            kid-pos (js2-current-token-beg)
+            end (js2-current-token-end)
+            init nil)
+      (if (or (= tt js2-LB) (= tt js2-LC))
+          ;; Destructuring assignment, e.g., var [a, b] = ...
+          (setq destructuring (js2-parse-destruct-primary-expr)
+                end (js2-node-end destructuring))
+        ;; Simple variable name
+        (js2-unget-token)
+        (when (js2-must-match-name "msg.bad.var")
+          (setq name (js2-create-name-node)
+                nbeg (js2-current-token-beg)
+                nend (js2-current-token-end)
+                end nend)
+          (js2-define-symbol decl-type (js2-current-token-string) name js2-in-for-init)
+          (js2-check-strict-identifier name)))
+      (when (js2-match-token js2-ASSIGN)
+        (setq init (js2-parse-assign-expr)
+              end (js2-node-end init))
+        (js2-record-imenu-functions init name))
+      (when name
+        (js2-set-face nbeg nend (if (js2-function-node-p init)
+                                    'font-lock-function-name-face
+                                  'font-lock-variable-name-face)
+                      'record))
+      (setq vi (make-js2-var-init-node :pos kid-pos
+                                       :len (- end kid-pos)
+                                       :type decl-type))
+      (if destructuring
+          (progn
+            (if (and (null init) (not js2-in-for-init))
+                (js2-report-error "msg.destruct.assign.no.init"))
+            (js2-define-destruct-symbols destructuring
+                                         decl-type
+                                         'font-lock-variable-name-face)
+            (setf (js2-var-init-node-target vi) destructuring))
+        (setf (js2-var-init-node-target vi) name))
+      (setf (js2-var-init-node-initializer vi) init)
+      (js2-node-add-children vi name destructuring init)
+      (js2-block-node-push result vi)
+      (unless (js2-match-token js2-COMMA)
+        (setq continue nil)))
+    (setf (js2-node-len result) (- end pos))
+    result))
+
+(defun js2-parse-let (pos &optional stmt-p)
+  "Parse a let expression or statement.
+A let-expression is of the form `let (vars) expr'.
+A let-statement is of the form `let (vars) {statements}'.
+The third form of let is a variable declaration list, handled
+by `js2-parse-variables'."
+  (let ((pn (make-js2-let-node :pos pos))
+        beg vars body)
+    (if (js2-must-match js2-LP "msg.no.paren.after.let")
+        (setf (js2-let-node-lp pn) (- (js2-current-token-beg) pos)))
+    (js2-push-scope pn)
+    (unwind-protect
+        (progn
+          (setq vars (js2-parse-variables js2-LET (js2-current-token-beg)))
+          (if (js2-must-match js2-RP "msg.no.paren.let")
+              (setf (js2-let-node-rp pn) (- (js2-current-token-beg) pos)))
+          (if (and stmt-p (js2-match-token js2-LC))
+              ;; let statement
+              (progn
+                (setf beg (js2-current-token-beg)  ; position stmt at LC
+                      body (js2-parse-statements))
+                (js2-must-match js2-RC "msg.no.curly.let")
+                (setf (js2-node-len body) (- (js2-current-token-end) beg)
+                      (js2-node-len pn) (- (js2-current-token-end) pos)
+                      (js2-let-node-body pn) body
+                      (js2-node-type pn) js2-LET))
+            ;; let expression
+            (setf body (js2-parse-expr)
+                  (js2-node-len pn) (- (js2-node-end body) pos)
+                  (js2-let-node-body pn) body))
+          (setf (js2-let-node-vars pn) vars)
+          (js2-node-add-children pn vars body))
+      (js2-pop-scope))
+    pn))
+
+(defun js2-define-new-symbol (decl-type name node &optional scope)
+  (js2-scope-put-symbol (or scope js2-current-scope)
+                        name
+                        (make-js2-symbol decl-type name node)))
+
+(defun js2-define-symbol (decl-type name &optional node ignore-not-in-block)
+  "Define a symbol in the current scope.
+If NODE is non-nil, it is the AST node associated with the symbol."
+  (let* ((defining-scope (js2-get-defining-scope js2-current-scope name))
+         (symbol (if defining-scope
+                     (js2-scope-get-symbol defining-scope name)))
+         (sdt (if symbol (js2-symbol-decl-type symbol) -1))
+         (pos (if node (js2-node-abs-pos node)))
+         (len (if node (js2-node-len node))))
+    (cond
+     ((and symbol ; already defined
+           (or (if js2-in-use-strict-directive
+                   ;; two const-bound vars in this block have same name
+                   (and (= sdt js2-CONST)
+                        (eq defining-scope js2-current-scope))
+                 (or (= sdt js2-CONST)          ; old version is const
+                     (= decl-type js2-CONST)))  ; new version is const
+               ;; two let-bound vars in this block have same name
+               (and (= sdt js2-LET)
+                    (eq defining-scope js2-current-scope))))
+      (js2-report-error
+       (cond
+        ((= sdt js2-CONST) "msg.const.redecl")
+        ((= sdt js2-LET) "msg.let.redecl")
+        ((= sdt js2-VAR) "msg.var.redecl")
+        ((= sdt js2-FUNCTION) "msg.function.redecl")
+        (t "msg.parm.redecl"))
+       name pos len))
+     ((or (= decl-type js2-LET)
+          ;; strict mode const is scoped to the current LexicalEnvironment
+          (and js2-in-use-strict-directive
+               (= decl-type js2-CONST)))
+      (if (and (= decl-type js2-LET)
+               (not ignore-not-in-block)
+               (or (= (js2-node-type js2-current-scope) js2-IF)
+                   (js2-loop-node-p js2-current-scope)))
+          (js2-report-error "msg.let.decl.not.in.block")
+        (js2-define-new-symbol decl-type name node)))
+     ((or (= decl-type js2-VAR)
+          (= decl-type js2-FUNCTION)
+          ;; sloppy mode const is scoped to the current VariableEnvironment
+          (and (not js2-in-use-strict-directive)
+               (= decl-type js2-CONST)))
+      (if symbol
+          (if (and js2-strict-var-redeclaration-warning (= sdt js2-VAR))
+              (js2-add-strict-warning "msg.var.redecl" name)
+            (if (and js2-strict-var-hides-function-arg-warning (= sdt js2-LP))
+                (js2-add-strict-warning "msg.var.hides.arg" name)))
+        (js2-define-new-symbol decl-type name node
+                               js2-current-script-or-fn)))
+     ((= decl-type js2-LP)
+      (if symbol
+          ;; must be duplicate parameter. Second parameter hides the
+          ;; first, so go ahead and add the second pararameter
+          (js2-report-warning "msg.dup.parms" name))
+      (js2-define-new-symbol decl-type name node))
+     (t (js2-code-bug)))))
+
+(defun js2-parse-paren-expr-or-generator-comp ()
+  (let ((px-pos (js2-current-token-beg)))
+    (cond
+     ((and (>= js2-language-version 200)
+           (js2-match-token js2-FOR))
+      (js2-parse-generator-comp px-pos))
+     ((and (>= js2-language-version 200)
+           (js2-match-token js2-RP))
+      ;; Not valid expression syntax, but this is valid in an arrow
+      ;; function with no params: () => body.
+      (if (eq (js2-peek-token) js2-ARROW)
+          ;; Return whatever, it will hopefully be rewinded and
+          ;; reparsed when we reach the =>.
+          (make-js2-keyword-node :type js2-NULL)
+        (js2-report-error "msg.syntax")
+        (make-js2-error-node)))
+     (t
+      (let* ((js2-in-for-init nil)
+             (expr (js2-parse-expr))
+             (pn (make-js2-paren-node :pos px-pos
+                                      :expr expr)))
+        (js2-node-add-children pn (js2-paren-node-expr pn))
+        (js2-must-match js2-RP "msg.no.paren")
+        (setf (js2-node-len pn) (- (js2-current-token-end) px-pos))
+        pn)))))
+
+(defun js2-parse-expr (&optional oneshot)
+  (let* ((pn (js2-parse-assign-expr))
+         (pos (js2-node-pos pn))
+         left
+         right
+         op-pos)
+    (while (and (not oneshot)
+                (js2-match-token js2-COMMA))
+      (setq op-pos (- (js2-current-token-beg) pos))  ; relative
+      (if (= (js2-peek-token) js2-YIELD)
+          (js2-report-error "msg.yield.parenthesized"))
+      (setq right (js2-parse-assign-expr)
+            left pn
+            pn (make-js2-infix-node :type js2-COMMA
+                                    :pos pos
+                                    :len (- js2-ts-cursor pos)
+                                    :op-pos op-pos
+                                    :left left
+                                    :right right))
+      (js2-node-add-children pn left right))
+    pn))
+
+(defun js2-parse-assign-expr ()
+  (let ((tt (js2-get-token))
+        (pos (js2-current-token-beg))
+        pn left right op-pos
+        ts-state recorded-identifiers parsed-errors
+        async-p)
+    (if (= tt js2-YIELD)
+        (js2-parse-return-or-yield tt t)
+      ;; TODO(mooz): Bit confusing.
+      ;; If we meet `async` token and it's not part of `async
+      ;; function`, then this `async` is for a succeeding async arrow
+      ;; function.
+      ;; Since arrow function parsing doesn't rely on neither
+      ;; `js2-parse-function-stmt' nor `js2-parse-function-expr' that
+      ;; interpret `async` token, we trash `async` and just remember
+      ;; we met `async` keyword to `async-p'.
+      (when (js2-match-async-arrow-function)
+        (setq async-p t))
+      ;; Save the tokenizer state in case we find an arrow function
+      ;; and have to rewind.
+      (setq ts-state (make-js2-ts-state)
+            recorded-identifiers js2-recorded-identifiers
+            parsed-errors js2-parsed-errors)
+      ;; not yield - parse assignment expression
+      (setq pn (js2-parse-cond-expr)
+            tt (js2-get-token))
+      (cond
+       ((and (<= js2-first-assign tt)
+             (<= tt js2-last-assign))
+        ;; tt express assignment (=, |=, ^=, ..., %=)
+        (setq op-pos (- (js2-current-token-beg) pos)  ; relative
+              left pn)
+        ;; The assigned node could be a js2-prop-get-node (foo.bar = 0), we only
+        ;; care about assignment to strict variable names.
+        (when (js2-name-node-p left)
+          (js2-check-strict-identifier left))
+        (setq right (js2-parse-assign-expr)
+              pn (make-js2-assign-node :type tt
+                                       :pos pos
+                                       :len (- (js2-node-end right) pos)
+                                       :op-pos op-pos
+                                       :left left
+                                       :right right))
+        (when js2-parse-ide-mode
+          (js2-highlight-assign-targets pn left right)
+          (js2-record-imenu-functions right left))
+        ;; do this last so ide checks above can use absolute positions
+        (js2-node-add-children pn left right))
+       ((and (= tt js2-ARROW)
+             (>= js2-language-version 200))
+        (js2-ts-seek ts-state)
+        (when async-p
+          (js2-record-face 'font-lock-keyword-face)
+          (js2-get-token))
+        (setq js2-recorded-identifiers recorded-identifiers
+              js2-parsed-errors parsed-errors)
+        (setq pn (js2-parse-function 'FUNCTION_ARROW (js2-current-token-beg) nil async-p)))
+       (t
+        (js2-unget-token)))
+      pn)))
+
+(defun js2-parse-cond-expr ()
+  (let ((pos (js2-current-token-beg))
+        (pn (js2-parse-or-expr))
+        test-expr
+        if-true
+        if-false
+        q-pos
+        c-pos)
+    (when (js2-match-token js2-HOOK)
+      (setq q-pos (- (js2-current-token-beg) pos)
+            if-true (let (js2-in-for-init) (js2-parse-assign-expr)))
+      (js2-must-match js2-COLON "msg.no.colon.cond")
+      (setq c-pos (- (js2-current-token-beg) pos)
+            if-false (js2-parse-assign-expr)
+            test-expr pn
+            pn (make-js2-cond-node :pos pos
+                                   :len (- (js2-node-end if-false) pos)
+                                   :test-expr test-expr
+                                   :true-expr if-true
+                                   :false-expr if-false
+                                   :q-pos q-pos
+                                   :c-pos c-pos))
+      (js2-node-add-children pn test-expr if-true if-false))
+    pn))
+
+(defun js2-make-binary (type left parser &optional no-get)
+  "Helper for constructing a binary-operator AST node.
+LEFT is the left-side-expression, already parsed, and the
+binary operator should have just been matched.
+PARSER is a function to call to parse the right operand,
+or a `js2-node' struct if it has already been parsed.
+FIXME: The latter option is unused?"
+  (let* ((pos (js2-node-pos left))
+         (op-pos (- (js2-current-token-beg) pos))
+         (right (if (js2-node-p parser)
+                    parser
+                  (unless no-get (js2-get-token))
+                  (funcall parser)))
+         (pn (make-js2-infix-node :type type
+                                  :pos pos
+                                  :len (- (js2-node-end right) pos)
+                                  :op-pos op-pos
+                                  :left left
+                                  :right right)))
+    (js2-node-add-children pn left right)
+    pn))
+
+(defun js2-parse-or-expr ()
+  (let ((pn (js2-parse-and-expr)))
+    (when (js2-match-token js2-OR)
+      (setq pn (js2-make-binary js2-OR
+                                pn
+                                'js2-parse-or-expr)))
+    pn))
+
+(defun js2-parse-and-expr ()
+  (let ((pn (js2-parse-bit-or-expr)))
+    (when (js2-match-token js2-AND)
+      (setq pn (js2-make-binary js2-AND
+                                pn
+                                'js2-parse-and-expr)))
+    pn))
+
+(defun js2-parse-bit-or-expr ()
+  (let ((pn (js2-parse-bit-xor-expr)))
+    (while (js2-match-token js2-BITOR)
+      (setq pn (js2-make-binary js2-BITOR
+                                pn
+                                'js2-parse-bit-xor-expr)))
+    pn))
+
+(defun js2-parse-bit-xor-expr ()
+  (let ((pn (js2-parse-bit-and-expr)))
+    (while (js2-match-token js2-BITXOR)
+      (setq pn (js2-make-binary js2-BITXOR
+                                pn
+                                'js2-parse-bit-and-expr)))
+    pn))
+
+(defun js2-parse-bit-and-expr ()
+  (let ((pn (js2-parse-eq-expr)))
+    (while (js2-match-token js2-BITAND)
+      (setq pn (js2-make-binary js2-BITAND
+                                pn
+                                'js2-parse-eq-expr)))
+    pn))
+
+(defconst js2-parse-eq-ops
+  (list js2-EQ js2-NE js2-SHEQ js2-SHNE))
+
+(defun js2-parse-eq-expr ()
+  (let ((pn (js2-parse-rel-expr))
+        tt)
+    (while (memq (setq tt (js2-get-token)) js2-parse-eq-ops)
+      (setq pn (js2-make-binary tt
+                                pn
+                                'js2-parse-rel-expr)))
+    (js2-unget-token)
+    pn))
+
+(defconst js2-parse-rel-ops
+  (list js2-IN js2-INSTANCEOF js2-LE js2-LT js2-GE js2-GT))
+
+(defun js2-parse-rel-expr ()
+  (let ((pn (js2-parse-shift-expr))
+        (continue t)
+        tt)
+    (while continue
+      (setq tt (js2-get-token))
+      (cond
+       ((and js2-in-for-init (= tt js2-IN))
+        (js2-unget-token)
+        (setq continue nil))
+       ((memq tt js2-parse-rel-ops)
+        (setq pn (js2-make-binary tt pn 'js2-parse-shift-expr)))
+       (t
+        (js2-unget-token)
+        (setq continue nil))))
+    pn))
+
+(defconst js2-parse-shift-ops
+  (list js2-LSH js2-URSH js2-RSH))
+
+(defun js2-parse-shift-expr ()
+  (let ((pn (js2-parse-add-expr))
+        tt
+        (continue t))
+    (while continue
+      (setq tt (js2-get-token))
+      (if (memq tt js2-parse-shift-ops)
+          (setq pn (js2-make-binary tt pn 'js2-parse-add-expr))
+        (js2-unget-token)
+        (setq continue nil)))
+    pn))
+
+(defun js2-parse-add-expr ()
+  (let ((pn (js2-parse-mul-expr))
+        tt
+        (continue t))
+    (while continue
+      (setq tt (js2-get-token))
+      (if (or (= tt js2-ADD) (= tt js2-SUB))
+          (setq pn (js2-make-binary tt pn 'js2-parse-mul-expr))
+        (js2-unget-token)
+        (setq continue nil)))
+    pn))
+
+(defconst js2-parse-mul-ops
+  (list js2-MUL js2-DIV js2-MOD))
+
+(defun js2-parse-mul-expr ()
+  (let ((pn (js2-parse-unary-expr))
+        tt
+        (continue t))
+    (while continue
+      (setq tt (js2-get-token))
+      (if (memq tt js2-parse-mul-ops)
+          (setq pn (js2-make-binary tt pn 'js2-parse-unary-expr))
+        (js2-unget-token)
+        (setq continue nil)))
+    pn))
+
+(defun js2-make-unary (type parser &rest args)
+  "Make a unary node of type TYPE.
+PARSER is either a node (for postfix operators) or a function to call
+to parse the operand (for prefix operators)."
+  (let* ((pos (js2-current-token-beg))
+         (postfix (js2-node-p parser))
+         (expr (if postfix
+                   parser
+                 (apply parser args)))
+         end
+         pn)
+    (if postfix  ; e.g. i++
+        (setq pos (js2-node-pos expr)
+              end (js2-current-token-end))
+      (setq end (js2-node-end expr)))
+    (setq pn (make-js2-unary-node :type type
+                                  :pos pos
+                                  :len (- end pos)
+                                  :operand expr))
+    (js2-node-add-children pn expr)
+    pn))
+
+(defconst js2-incrementable-node-types
+  (list js2-NAME js2-GETPROP js2-GETELEM js2-GET_REF js2-CALL)
+  "Node types that can be the operand of a ++ or -- operator.")
+
+(defun js2-check-bad-inc-dec (tt beg end unary)
+  (unless (memq (js2-node-type (js2-unary-node-operand unary))
+                js2-incrementable-node-types)
+    (js2-report-error (if (= tt js2-INC)
+                          "msg.bad.incr"
+                        "msg.bad.decr")
+                      nil beg (- end beg))))
+
+(defun js2-parse-unary-expr ()
+  (let ((tt (js2-current-token-type))
+        pn expr beg end)
+    (cond
+     ((or (= tt js2-VOID)
+          (= tt js2-NOT)
+          (= tt js2-BITNOT)
+          (= tt js2-TYPEOF))
+      (js2-get-token)
+      (js2-make-unary tt 'js2-parse-unary-expr))
+     ((= tt js2-ADD)
+      (js2-get-token)
+      ;; Convert to special POS token in decompiler and parse tree
+      (js2-make-unary js2-POS 'js2-parse-unary-expr))
+     ((= tt js2-SUB)
+      (js2-get-token)
+      ;; Convert to special NEG token in decompiler and parse tree
+      (js2-make-unary js2-NEG 'js2-parse-unary-expr))
+     ((or (= tt js2-INC)
+          (= tt js2-DEC))
+      (js2-get-token)
+      (prog1
+          (setq beg (js2-current-token-beg)
+                end (js2-current-token-end)
+                expr (js2-make-unary tt 'js2-parse-member-expr t))
+        (js2-check-bad-inc-dec tt beg end expr)))
+     ((= tt js2-DELPROP)
+      (js2-get-token)
+      (js2-make-unary js2-DELPROP 'js2-parse-unary-expr))
+     ((js2-parse-await-maybe tt))
+     ((= tt js2-ERROR)
+      (js2-get-token)
+      (make-js2-error-node))  ; try to continue
+     ((and (= tt js2-LT)
+           js2-compiler-xml-available)
+      ;; XML stream encountered in expression.
+      (js2-parse-member-expr-tail t (js2-parse-xml-initializer)))
+     (t
+      (setq pn (js2-parse-member-expr t)
+            ;; Don't look across a newline boundary for a postfix incop.
+            tt (js2-peek-token-or-eol))
+      (when (or (= tt js2-INC) (= tt js2-DEC))
+        (js2-get-token)
+        (setf expr pn
+              pn (js2-make-unary tt expr))
+        (js2-node-set-prop pn 'postfix t)
+        (js2-check-bad-inc-dec tt (js2-current-token-beg) (js2-current-token-end) pn))
+      pn))))
+
+(defun js2-parse-xml-initializer ()
+  "Parse an E4X XML initializer.
+I'm parsing it the way Rhino parses it, but without the tree-rewriting.
+Then I'll postprocess the result, depending on whether we're in IDE
+mode or codegen mode, and generate the appropriate rewritten AST.
+IDE mode uses a rich AST that models the XML structure.  Codegen mode
+just concatenates everything and makes a new XML or XMLList out of it."
+  (let ((tt (js2-get-first-xml-token))
+        pn-xml pn expr kids expr-pos
+        (continue t)
+        (first-token t))
+    (when (not (or (= tt js2-XML) (= tt js2-XMLEND)))
+      (js2-report-error "msg.syntax"))
+    (setq pn-xml (make-js2-xml-node))
+    (while continue
+      (if first-token
+          (setq first-token nil)
+        (setq tt (js2-get-next-xml-token)))
+      (cond
+       ;; js2-XML means we found a {expr} in the XML stream.
+       ;; The token string is the XML up to the left-curly.
+       ((= tt js2-XML)
+        (push (make-js2-string-node :pos (js2-current-token-beg)
+                                    :len (- js2-ts-cursor (js2-current-token-beg)))
+              kids)
+        (js2-must-match js2-LC "msg.syntax")
+        (setq expr-pos js2-ts-cursor
+              expr (if (eq (js2-peek-token) js2-RC)
+                       (make-js2-empty-expr-node :pos expr-pos)
+                     (js2-parse-expr)))
+        (js2-must-match js2-RC "msg.syntax")
+        (setq pn (make-js2-xml-js-expr-node :pos (js2-node-pos expr)
+                                            :len (js2-node-len expr)
+                                            :expr expr))
+        (js2-node-add-children pn expr)
+        (push pn kids))
+       ;; a js2-XMLEND token means we hit the final close-tag.
+       ((= tt js2-XMLEND)
+        (push (make-js2-string-node :pos (js2-current-token-beg)
+                                    :len (- js2-ts-cursor (js2-current-token-beg)))
+              kids)
+        (dolist (kid (nreverse kids))
+          (js2-block-node-push pn-xml kid))
+        (setf (js2-node-len pn-xml) (- js2-ts-cursor
+                                       (js2-node-pos pn-xml))
+              continue nil))
+       (t
+        (js2-report-error "msg.syntax")
+        (setq continue nil))))
+    pn-xml))
+
+
+(defun js2-parse-argument-list ()
+  "Parse an argument list and return it as a Lisp list of nodes.
+Returns the list in reverse order.  Consumes the right-paren token."
+  (let (result)
+    (unless (js2-match-token js2-RP)
+      (cl-loop do
+               (let ((tt (js2-get-token)))
+                 (if (= tt js2-YIELD)
+                     (js2-report-error "msg.yield.parenthesized"))
+                 (if (and (= tt js2-TRIPLEDOT)
+                          (>= js2-language-version 200))
+                     (push (js2-make-unary tt 'js2-parse-assign-expr) result)
+                   (js2-unget-token)
+                   (push (js2-parse-assign-expr) result)))
+               while
+               (js2-match-token js2-COMMA))
+      (js2-must-match js2-RP "msg.no.paren.arg")
+      result)))
+
+(defun js2-parse-member-expr (&optional allow-call-syntax)
+  (let ((tt (js2-current-token-type))
+        pn pos target args beg end init)
+    (if (/= tt js2-NEW)
+        (setq pn (js2-parse-primary-expr))
+      ;; parse a 'new' expression
+      (js2-get-token)
+      (setq pos (js2-current-token-beg)
+            beg pos
+            target (js2-parse-member-expr)
+            end (js2-node-end target)
+            pn (make-js2-new-node :pos pos
+                                  :target target
+                                  :len (- end pos)))
+      (js2-highlight-function-call (js2-current-token))
+      (js2-node-add-children pn target)
+      (when (js2-match-token js2-LP)
+        ;; Add the arguments to pn, if any are supplied.
+        (setf beg pos  ; start of "new" keyword
+              pos (js2-current-token-beg)
+              args (nreverse (js2-parse-argument-list))
+              (js2-new-node-args pn) args
+              end (js2-current-token-end)
+              (js2-new-node-lp pn) (- pos beg)
+              (js2-new-node-rp pn) (- end 1 beg))
+        (apply #'js2-node-add-children pn args))
+      (when (and js2-allow-rhino-new-expr-initializer
+                 (js2-match-token js2-LC))
+        (setf init (js2-parse-object-literal)
+              end (js2-node-end init)
+              (js2-new-node-initializer pn) init)
+        (js2-node-add-children pn init))
+        (setf (js2-node-len pn) (- end beg)))  ; end outer if
+    (js2-parse-member-expr-tail allow-call-syntax pn)))
+
+(defun js2-parse-member-expr-tail (allow-call-syntax pn)
+  "Parse a chain of property/array accesses or function calls.
+Includes parsing for E4X operators like `..' and `.@'.
+If ALLOW-CALL-SYNTAX is nil, stops when we encounter a left-paren.
+Returns an expression tree that includes PN, the parent node."
+  (let (tt
+        (continue t))
+    (while continue
+      (setq tt (js2-get-token))
+      (cond
+       ((or (= tt js2-DOT) (= tt js2-DOTDOT))
+        (setq pn (js2-parse-property-access tt pn)))
+       ((= tt js2-DOTQUERY)
+        (setq pn (js2-parse-dot-query pn)))
+       ((= tt js2-LB)
+        (setq pn (js2-parse-element-get pn)))
+       ((= tt js2-LP)
+        (js2-unget-token)
+        (if allow-call-syntax
+            (setq pn (js2-parse-function-call pn))
+          (setq continue nil)))
+       ((= tt js2-TEMPLATE_HEAD)
+        (setq pn (js2-parse-tagged-template pn (js2-parse-template-literal))))
+       ((= tt js2-NO_SUBS_TEMPLATE)
+        (setq pn (js2-parse-tagged-template pn (make-js2-string-node :type tt))))
+       (t
+        (js2-unget-token)
+        (setq continue nil)))
+      (if (>= js2-highlight-level 2)
+          (js2-parse-highlight-member-expr-node pn)))
+    pn))
+
+(defun js2-parse-tagged-template (tag-node tpl-node)
+  "Parse tagged template expression."
+  (let* ((beg (js2-node-pos tag-node))
+         (pn (make-js2-tagged-template-node :beg beg
+                                            :len (- (js2-current-token-end) beg)
+                                            :tag tag-node
+                                            :template tpl-node)))
+    (js2-node-add-children pn tag-node tpl-node)
+    pn))
+
+(defun js2-parse-dot-query (pn)
+  "Parse a dot-query expression, e.g. foo.bar.(@name == 2)
+Last token parsed must be `js2-DOTQUERY'."
+  (let ((pos (js2-node-pos pn))
+        op-pos expr end)
+    (js2-must-have-xml)
+    (js2-set-requires-activation)
+    (setq op-pos (js2-current-token-beg)
+          expr (js2-parse-expr)
+          end (js2-node-end expr)
+          pn (make-js2-xml-dot-query-node :left pn
+                                          :pos pos
+                                          :op-pos op-pos
+                                          :right expr))
+    (js2-node-add-children pn
+                           (js2-xml-dot-query-node-left pn)
+                           (js2-xml-dot-query-node-right pn))
+    (if (js2-must-match js2-RP "msg.no.paren")
+        (setf (js2-xml-dot-query-node-rp pn) (js2-current-token-beg)
+              end (js2-current-token-end)))
+    (setf (js2-node-len pn) (- end pos))
+    pn))
+
+(defun js2-parse-element-get (pn)
+  "Parse an element-get expression, e.g. foo[bar].
+Last token parsed must be `js2-RB'."
+  (let ((lb (js2-current-token-beg))
+        (pos (js2-node-pos pn))
+        rb expr)
+    (setq expr (js2-parse-expr))
+    (if (js2-must-match js2-RB "msg.no.bracket.index")
+        (setq rb (js2-current-token-beg)))
+    (setq pn (make-js2-elem-get-node :target pn
+                                     :pos pos
+                                     :element expr
+                                     :lb (js2-relpos lb pos)
+                                     :rb (js2-relpos rb pos)
+                                     :len (- (js2-current-token-end) pos)))
+    (js2-node-add-children pn
+                           (js2-elem-get-node-target pn)
+                           (js2-elem-get-node-element pn))
+    pn))
+
+(defun js2-highlight-function-call (token)
+  (when (eq (js2-token-type token) js2-NAME)
+    (js2-record-face 'js2-function-call token)))
+
+(defun js2-parse-function-call (pn)
+  (js2-highlight-function-call (js2-current-token))
+  (js2-get-token)
+  (let (args
+        (pos (js2-node-pos pn)))
+    (setq pn (make-js2-call-node :pos pos
+                                 :target pn
+                                 :lp (- (js2-current-token-beg) pos)))
+    (js2-node-add-children pn (js2-call-node-target pn))
+    ;; Add the arguments to pn, if any are supplied.
+    (setf args (nreverse (js2-parse-argument-list))
+          (js2-call-node-rp pn) (- (js2-current-token-beg) pos)
+          (js2-call-node-args pn) args)
+    (apply #'js2-node-add-children pn args)
+    (setf (js2-node-len pn) (- js2-ts-cursor pos))
+    pn))
+
+(defun js2-parse-property-access (tt pn)
+  "Parse a property access, XML descendants access, or XML attr access."
+  (let ((member-type-flags 0)
+        (dot-pos (js2-current-token-beg))
+        (dot-len (if (= tt js2-DOTDOT) 2 1))
+        name
+        ref  ; right side of . or .. operator
+        result)
+    (when (= tt js2-DOTDOT)
+      (js2-must-have-xml)
+      (setq member-type-flags js2-descendants-flag))
+    (if (not js2-compiler-xml-available)
+        (progn
+          (js2-must-match-prop-name "msg.no.name.after.dot")
+          (setq name (js2-create-name-node t js2-GETPROP)
+                result (make-js2-prop-get-node :left pn
+                                               :pos (js2-current-token-beg)
+                                               :right name
+                                               :len (js2-current-token-len)))
+          (js2-node-add-children result pn name)
+          result)
+      ;; otherwise look for XML operators
+      (setf result (if (= tt js2-DOT)
+                       (make-js2-prop-get-node)
+                     (make-js2-infix-node :type js2-DOTDOT))
+            (js2-node-pos result) (js2-node-pos pn)
+            (js2-infix-node-op-pos result) dot-pos
+            (js2-infix-node-left result) pn  ; do this after setting position
+            tt (js2-get-prop-name-token))
+      (cond
+       ;; handles: name, ns::name, ns::*, ns::[expr]
+       ((= tt js2-NAME)
+        (setq ref (js2-parse-property-name -1 nil member-type-flags)))
+       ;; handles: *, *::name, *::*, *::[expr]
+       ((= tt js2-MUL)
+        (setq ref (js2-parse-property-name nil "*" member-type-flags)))
+       ;; handles: '@attr', '@ns::attr', '@ns::*', '@ns::[expr]', etc.
+       ((= tt js2-XMLATTR)
+        (setq result (js2-parse-attribute-access)))
+       (t
+        (js2-report-error "msg.no.name.after.dot" nil dot-pos dot-len)))
+      (if ref
+          (setf (js2-node-len result) (- (js2-node-end ref)
+                                         (js2-node-pos result))
+                (js2-infix-node-right result) ref))
+      (if (js2-infix-node-p result)
+          (js2-node-add-children result
+                                 (js2-infix-node-left result)
+                                 (js2-infix-node-right result)))
+      result)))
+
+(defun js2-parse-attribute-access ()
+  "Parse an E4X XML attribute expression.
+This includes expressions of the forms:
+
+  @attr      @ns::attr     @ns::*
+  @*         @*::attr      @*::*
+  @[expr]    @*::[expr]    @ns::[expr]
+
+Called if we peeked an '@' token."
+  (let ((tt (js2-get-prop-name-token))
+        (at-pos (js2-current-token-beg)))
+    (cond
+     ;; handles: @name, @ns::name, @ns::*, @ns::[expr]
+     ((= tt js2-NAME)
+      (js2-parse-property-name at-pos nil 0))
+     ;; handles: @*, @*::name, @*::*, @*::[expr]
+     ((= tt js2-MUL)
+      (js2-parse-property-name (js2-current-token-beg) "*" 0))
+     ;; handles @[expr]
+     ((= tt js2-LB)
+      (js2-parse-xml-elem-ref at-pos))
+     (t
+      (js2-report-error "msg.no.name.after.xmlAttr")
+      ;; Avoid cascaded errors that happen if we make an error node here.
+      (js2-parse-property-name (js2-current-token-beg) "" 0)))))
+
+(defun js2-parse-property-name (at-pos s member-type-flags)
+  "Check if :: follows name in which case it becomes qualified name.
+
+AT-POS is a natural number if we just read an '@' token, else nil.
+S is the name or string that was matched:  an identifier, 'throw' or '*'.
+MEMBER-TYPE-FLAGS is a bit set tracking whether we're a '.' or '..' child.
+
+Returns a `js2-xml-ref-node' if it's an attribute access, a child of a '..'
+operator, or the name is followed by ::.  For a plain name, returns a
+`js2-name-node'.  Returns a `js2-error-node' for malformed XML expressions."
+  (let ((pos (or at-pos (js2-current-token-beg)))
+        colon-pos
+        (name (js2-create-name-node t (js2-current-token-type) s))
+        ns tt pn)
+    (catch 'return
+      (when (js2-match-token js2-COLONCOLON)
+        (setq ns name
+              colon-pos (js2-current-token-beg)
+              tt (js2-get-prop-name-token))
+        (cond
+         ;; handles name::name
+         ((= tt js2-NAME)
+          (setq name (js2-create-name-node)))
+         ;; handles name::*
+         ((= tt js2-MUL)
+          (setq name (js2-create-name-node nil nil "*")))
+         ;; handles name::[expr]
+         ((= tt js2-LB)
+          (throw 'return (js2-parse-xml-elem-ref at-pos ns colon-pos)))
+         (t
+          (js2-report-error "msg.no.name.after.coloncolon"))))
+      (if (and (null ns) (zerop member-type-flags))
+          name
+        (prog1
+            (setq pn
+                  (make-js2-xml-prop-ref-node :pos pos
+                                              :len (- (js2-node-end name) pos)
+                                              :at-pos at-pos
+                                              :colon-pos colon-pos
+                                              :propname name))
+          (js2-node-add-children pn name))))))
+
+(defun js2-parse-xml-elem-ref (at-pos &optional namespace colon-pos)
+  "Parse the [expr] portion of an xml element reference.
+For instance, @[expr], @*::[expr], or ns::[expr]."
+  (let* ((lb (js2-current-token-beg))
+         (pos (or at-pos lb))
+         rb
+         (expr (js2-parse-expr))
+         (end (js2-node-end expr))
+         pn)
+    (if (js2-must-match js2-RB "msg.no.bracket.index")
+        (setq rb (js2-current-token-beg)
+              end (js2-current-token-end)))
+    (prog1
+        (setq pn
+              (make-js2-xml-elem-ref-node :pos pos
+                                          :len (- end pos)
+                                          :namespace namespace
+                                          :colon-pos colon-pos
+                                          :at-pos at-pos
+                                          :expr expr
+                                          :lb (js2-relpos lb pos)
+                                          :rb (js2-relpos rb pos)))
+      (js2-node-add-children pn namespace expr))))
+
+(defun js2-parse-destruct-primary-expr ()
+  (let ((js2-is-in-destructuring t))
+    (js2-parse-primary-expr)))
+
+(defun js2-parse-primary-expr ()
+  "Parse a literal (leaf) expression of some sort.
+Includes complex literals such as functions, object-literals,
+array-literals, array comprehensions and regular expressions."
+  (let (tt node)
+    (setq tt (js2-current-token-type))
+    (cond
+     ((= tt js2-CLASS)
+      (js2-parse-class-expr))
+     ((= tt js2-FUNCTION)
+      (js2-parse-function-expr))
+     ((js2-match-async-function)
+      (js2-parse-function-expr t))
+     ((= tt js2-LB)
+      (js2-parse-array-comp-or-literal))
+     ((= tt js2-LC)
+      (js2-parse-object-literal))
+     ((= tt js2-LET)
+      (js2-parse-let (js2-current-token-beg)))
+     ((= tt js2-LP)
+      (js2-parse-paren-expr-or-generator-comp))
+     ((= tt js2-XMLATTR)
+      (js2-must-have-xml)
+      (js2-parse-attribute-access))
+     ((= tt js2-NAME)
+      (js2-parse-name tt))
+     ((= tt js2-NUMBER)
+      (setq node (make-js2-number-node))
+      (when (and js2-in-use-strict-directive
+                 (= (js2-number-node-num-base node) 8)
+                 (js2-number-node-legacy-octal-p node))
+        (js2-report-error "msg.no.octal.strict"))
+      node)
+     ((or (= tt js2-STRING) (= tt js2-NO_SUBS_TEMPLATE))
+      (make-js2-string-node :type tt))
+     ((= tt js2-TEMPLATE_HEAD)
+      (js2-parse-template-literal))
+     ((or (= tt js2-DIV) (= tt js2-ASSIGN_DIV))
+      ;; Got / or /= which in this context means a regexp literal
+      (let ((px-pos (js2-current-token-beg))
+            (flags (js2-read-regexp tt))
+            (end (js2-current-token-end)))
+        (prog1
+            (make-js2-regexp-node :pos px-pos
+                                  :len (- end px-pos)
+                                  :value (js2-current-token-string)
+                                  :flags flags)
+          (js2-set-face px-pos end 'font-lock-string-face 'record)
+          (js2-record-text-property px-pos end 'syntax-table '(2)))))
+     ((or (= tt js2-NULL)
+          (= tt js2-THIS)
+          (= tt js2-SUPER)
+          (= tt js2-FALSE)
+          (= tt js2-TRUE))
+      (make-js2-keyword-node :type tt))
+     ((= tt js2-TRIPLEDOT)
+      ;; Likewise, only valid in an arrow function with a rest param.
+      (if (and (js2-match-token js2-NAME)
+               (js2-match-token js2-RP)
+               (eq (js2-peek-token) js2-ARROW))
+          (progn
+            (js2-unget-token)  ; Put back the right paren.
+            ;; See the previous case.
+            (make-js2-keyword-node :type js2-NULL))
+        (js2-report-error "msg.syntax")
+        (make-js2-error-node)))
+     ((= tt js2-RESERVED)
+      (js2-report-error "msg.reserved.id")
+      (make-js2-name-node))
+     ((= tt js2-ERROR)
+      ;; the scanner or one of its subroutines reported the error.
+      (make-js2-error-node))
+     ((= tt js2-EOF)
+      (let* ((px-pos (point-at-bol))
+             (len (- js2-ts-cursor px-pos)))
+        (js2-report-error "msg.unexpected.eof" nil px-pos len))
+      (make-js2-error-node :pos (1- js2-ts-cursor)))
+     (t
+      (js2-report-error "msg.syntax")
+      (make-js2-error-node)))))
+
+(defun js2-parse-template-literal ()
+  (let ((beg (js2-current-token-beg))
+        (kids (list (make-js2-string-node :type js2-TEMPLATE_HEAD)))
+        (tt js2-TEMPLATE_HEAD))
+    (while (eq tt js2-TEMPLATE_HEAD)
+      (push (js2-parse-expr) kids)
+      (js2-must-match js2-RC "msg.syntax")
+      (setq tt (js2-get-token 'TEMPLATE_TAIL))
+      (push (make-js2-string-node :type tt) kids))
+    (setq kids (nreverse kids))
+    (let ((tpl (make-js2-template-node :beg beg
+                                       :len (- (js2-current-token-end) beg)
+                                       :kids kids)))
+      (apply #'js2-node-add-children tpl kids)
+      tpl)))
+
+(defun js2-parse-name (_tt)
+  (let ((name (js2-current-token-string))
+        node)
+    (setq node (if js2-compiler-xml-available
+                   (js2-parse-property-name nil name 0)
+                 (js2-create-name-node 'check-activation nil name)))
+    (if js2-highlight-external-variables
+        (js2-record-name-node node))
+    node))
+
+(defun js2-parse-warn-trailing-comma (msg pos elems comma-pos)
+  (js2-add-strict-warning
+   msg nil
+   ;; back up from comma to beginning of line or array/objlit
+   (max (if elems
+            (js2-node-pos (car elems))
+          pos)
+        (save-excursion
+          (goto-char comma-pos)
+          (back-to-indentation)
+          (point)))
+   comma-pos))
+
+(defun js2-parse-array-comp-or-literal ()
+  (let ((pos (js2-current-token-beg)))
+    (if (and (>= js2-language-version 200)
+             (js2-match-token js2-FOR))
+        (js2-parse-array-comp pos)
+      (js2-parse-array-literal pos))))
+
+(defun js2-parse-array-literal (pos)
+  (let ((after-lb-or-comma t)
+        after-comma tt elems pn
+        (continue t))
+    (unless js2-is-in-destructuring
+      (js2-push-scope (make-js2-scope))) ; for the legacy array comp
+    (while continue
+      (setq tt (js2-get-token))
+      (cond
+       ;; comma
+       ((= tt js2-COMMA)
+        (setq after-comma (js2-current-token-end))
+        (if (not after-lb-or-comma)
+            (setq after-lb-or-comma t)
+          (push nil elems)))
+       ;; end of array
+       ((or (= tt js2-RB)
+            (= tt js2-EOF))  ; prevent infinite loop
+        (if (= tt js2-EOF)
+            (js2-report-error "msg.no.bracket.arg" nil pos))
+        (when (and after-comma (< js2-language-version 170))
+          (js2-parse-warn-trailing-comma "msg.array.trailing.comma"
+                                         pos (remove nil elems) after-comma))
+        (setq continue nil
+              pn (make-js2-array-node :pos pos
+                                      :len (- js2-ts-cursor pos)
+                                      :elems (nreverse elems)))
+        (apply #'js2-node-add-children pn (js2-array-node-elems pn)))
+       ;; destructuring binding
+       (js2-is-in-destructuring
+        (push (cond
+               ((and (= tt js2-NAME)
+                     (= js2-ASSIGN (js2-peek-token)))
+                ;; a=defaultValue
+                (js2-parse-initialized-binding (js2-parse-name js2-NAME)))
+               ((or (= tt js2-LC)
+                    (= tt js2-LB)
+                    (= tt js2-NAME))
+                ;; [a, b, c] | {a, b, c} | {a:x, b:y, c:z} | a
+                (js2-parse-destruct-primary-expr))
+               ;; invalid pattern
+               (t
+                (js2-report-error "msg.bad.var")
+                (make-js2-error-node)))
+              elems)
+        (setq after-lb-or-comma nil
+              after-comma nil))
+       ;; array comp
+       ((and (>= js2-language-version 170)
+             (= tt js2-FOR)          ; check for array comprehension
+             (not after-lb-or-comma) ; "for" can't follow a comma
+             elems                   ; must have at least 1 element
+             (not (cdr elems)))      ; but no 2nd element
+        (js2-unget-token)
+        (setf continue nil
+              pn (js2-parse-legacy-array-comp (car elems) pos)))
+       ;; another element
+       (t
+        (unless after-lb-or-comma
+          (js2-report-error "msg.no.bracket.arg"))
+        (if (and (= tt js2-TRIPLEDOT)
+                 (>= js2-language-version 200))
+            ;; spread operator
+            (push (js2-make-unary tt 'js2-parse-assign-expr)
+                  elems)
+          (js2-unget-token)
+          (push (js2-parse-assign-expr) elems))
+        (setq after-lb-or-comma nil
+              after-comma nil))))
+    (unless js2-is-in-destructuring
+      (js2-pop-scope))
+    pn))
+
+(defun js2-parse-legacy-array-comp (expr pos)
+  "Parse a legacy array comprehension (JavaScript 1.7).
+EXPR is the first expression after the opening left-bracket.
+POS is the beginning of the LB token preceding EXPR.
+We should have just parsed the 'for' keyword before calling this function."
+  (let ((current-scope js2-current-scope)
+        loops first filter result)
+    (unwind-protect
+        (progn
+          (while (js2-match-token js2-FOR)
+            (let ((loop (make-js2-comp-loop-node)))
+              (js2-push-scope loop)
+              (push loop loops)
+              (js2-parse-comp-loop loop)))
+          ;; First loop takes expr scope's parent.
+          (setf (js2-scope-parent-scope (setq first (car (last loops))))
+                (js2-scope-parent-scope current-scope))
+          ;; Set expr scope's parent to the last loop.
+          (setf (js2-scope-parent-scope current-scope) (car loops))
+          (if (/= (js2-get-token) js2-IF)
+              (js2-unget-token)
+            (setq filter (js2-parse-condition))))
+      (dotimes (_ (1- (length loops)))
+        (js2-pop-scope)))
+    (js2-must-match js2-RB "msg.no.bracket.arg" pos)
+    (setq result (make-js2-comp-node :pos pos
+                                     :len (- js2-ts-cursor pos)
+                                     :result expr
+                                     :loops (nreverse loops)
+                                     :filters (and filter (list (car filter)))
+                                     :form 'LEGACY_ARRAY))
+    ;; Set comp loop's parent to the last loop.
+    ;; TODO: Get rid of the bogus expr scope.
+    (setf (js2-scope-parent-scope result) first)
+    (apply #'js2-node-add-children result expr (car filter)
+           (js2-comp-node-loops result))
+    result))
+
+(defun js2-parse-array-comp (pos)
+  "Parse an ES6 array comprehension.
+POS is the beginning of the LB token.
+We should have just parsed the 'for' keyword before calling this function."
+  (let ((pn (js2-parse-comprehension pos 'ARRAY)))
+    (js2-must-match js2-RB "msg.no.bracket.arg" pos)
+    pn))
+
+(defun js2-parse-generator-comp (pos)
+  (let* ((js2-nesting-of-function (1+ js2-nesting-of-function))
+         (js2-current-script-or-fn
+          (make-js2-function-node :generator-type 'COMPREHENSION))
+         (pn (js2-parse-comprehension pos 'STAR_GENERATOR)))
+    (js2-must-match js2-RP "msg.no.paren" pos)
+    pn))
+
+(defun js2-parse-comprehension (pos form)
+  (let (loops filters expr result last)
+    (unwind-protect
+        (progn
+          (js2-unget-token)
+          (while (js2-match-token js2-FOR)
+            (let ((loop (make-js2-comp-loop-node)))
+              (js2-push-scope loop)
+              (push loop loops)
+              (js2-parse-comp-loop loop)))
+          (while (js2-match-token js2-IF)
+            (push (car (js2-parse-condition)) filters))
+          (setq expr (js2-parse-assign-expr))
+          (setq last (car loops)))
+      (dolist (_ loops)
+        (js2-pop-scope)))
+    (setq result (make-js2-comp-node :pos pos
+                                     :len (- js2-ts-cursor pos)
+                                     :result expr
+                                     :loops (nreverse loops)
+                                     :filters (nreverse filters)
+                                     :form form))
+    (apply #'js2-node-add-children result (js2-comp-node-loops result))
+    (apply #'js2-node-add-children result expr (js2-comp-node-filters result))
+    (setf (js2-scope-parent-scope result) last)
+    result))
+
+(defun js2-parse-comp-loop (pn &optional only-of-p)
+  "Parse a 'for [each] (foo [in|of] bar)' expression in an Array comprehension.
+The current token should be the initial FOR.
+If ONLY-OF-P is non-nil, only the 'for (foo of bar)' form is allowed."
+  (let ((pos (js2-comp-loop-node-pos pn))
+        tt iter obj foreach-p forof-p in-pos each-pos lp rp)
+    (when (and (not only-of-p) (js2-match-token js2-NAME))
+      (if (string= (js2-current-token-string) "each")
+          (progn
+            (setq foreach-p t
+                  each-pos (- (js2-current-token-beg) pos)) ; relative
+            (js2-record-face 'font-lock-keyword-face))
+        (js2-report-error "msg.no.paren.for")))
+    (if (js2-must-match js2-LP "msg.no.paren.for")
+        (setq lp (- (js2-current-token-beg) pos)))
+    (setq tt (js2-peek-token))
+    (cond
+     ((or (= tt js2-LB)
+          (= tt js2-LC))
+      (js2-get-token)
+      (setq iter (js2-parse-destruct-primary-expr))
+      (js2-define-destruct-symbols iter js2-LET
+                                   'font-lock-variable-name-face t))
+     ((js2-match-token js2-NAME)
+      (setq iter (js2-create-name-node)))
+     (t
+      (js2-report-error "msg.bad.var")))
+    ;; Define as a let since we want the scope of the variable to
+    ;; be restricted to the array comprehension
+    (if (js2-name-node-p iter)
+        (js2-define-symbol js2-LET (js2-name-node-name iter) pn t))
+    (if (or (and (not only-of-p) (js2-match-token js2-IN))
+            (and (>= js2-language-version 200)
+                 (js2-match-contextual-kwd "of")
+                 (setq forof-p t)))
+        (setq in-pos (- (js2-current-token-beg) pos))
+      (js2-report-error "msg.in.after.for.name"))
+    (setq obj (js2-parse-expr))
+    (if (js2-must-match js2-RP "msg.no.paren.for.ctrl")
+        (setq rp (- (js2-current-token-beg) pos)))
+    (setf (js2-node-pos pn) pos
+          (js2-node-len pn) (- js2-ts-cursor pos)
+          (js2-comp-loop-node-iterator pn) iter
+          (js2-comp-loop-node-object pn) obj
+          (js2-comp-loop-node-in-pos pn) in-pos
+          (js2-comp-loop-node-each-pos pn) each-pos
+          (js2-comp-loop-node-foreach-p pn) foreach-p
+          (js2-comp-loop-node-forof-p pn) forof-p
+          (js2-comp-loop-node-lp pn) lp
+          (js2-comp-loop-node-rp pn) rp)
+    (js2-node-add-children pn iter obj)
+    pn))
+
+(defun js2-parse-class-stmt ()
+  (let ((pos (js2-current-token-beg))
+        (_ (js2-must-match-name "msg.unnamed.class.stmt"))
+        (name (js2-create-name-node t)))
+    (js2-set-face (js2-node-pos name) (js2-node-end name)
+                  'font-lock-function-name-face 'record)
+    (let ((node (js2-parse-class pos 'CLASS_STATEMENT name)))
+      (js2-record-imenu-functions node name)
+      (js2-define-symbol js2-FUNCTION
+                         (js2-name-node-name name)
+                         node)
+      node)))
+
+(defun js2-parse-class-expr ()
+  (let ((pos (js2-current-token-beg))
+        name)
+    (when (js2-match-token js2-NAME)
+      (setq name (js2-create-name-node t)))
+    (js2-parse-class pos 'CLASS_EXPRESSION name)))
+
+(defun js2-parse-class (pos form name)
+  ;; class X [extends ...] {
+  (let (pn elems extends)
+    (if (js2-match-token js2-EXTENDS)
+        (if (= (js2-peek-token) js2-LC)
+            (js2-report-error "msg.missing.extends")
+          ;; TODO(sdh): this should be left-hand-side-expr, not assign-expr
+          (setq extends (js2-parse-assign-expr))
+          (if (not extends)
+              (js2-report-error "msg.bad.extends"))))
+    (js2-must-match js2-LC "msg.no.brace.class")
+    (setq elems (js2-parse-object-literal-elems t)
+          pn (make-js2-class-node :pos pos
+                                  :len (- js2-ts-cursor pos)
+                                  :form form
+                                  :name name
+                                  :extends extends
+                                  :elems elems))
+    (apply #'js2-node-add-children pn (js2-class-node-elems pn))
+    pn))
+
+(defun js2-parse-object-literal ()
+  (let* ((pos (js2-current-token-beg))
+         (elems (js2-parse-object-literal-elems))
+         (result (make-js2-object-node :pos pos
+                                       :len (- js2-ts-cursor pos)
+                                       :elems elems)))
+    (apply #'js2-node-add-children result (js2-object-node-elems result))
+    result))
+
+(defun js2-property-key-string (property-node)
+  "Return the key of PROPERTY-NODE (a `js2-object-prop-node' or
+`js2-method-node') as a string, or nil if it can't be
+represented as a string (e.g., the key is computed by an
+expression)."
+  (let ((key (js2-infix-node-left property-node)))
+    (when (js2-computed-prop-name-node-p key)
+      (setq key (js2-computed-prop-name-node-expr key)))
+    (cond
+     ((js2-name-node-p key)
+      (js2-name-node-name key))
+     ((js2-string-node-p key)
+      (js2-string-node-value key))
+     ((js2-number-node-p key)
+      (js2-number-node-value key)))))
+
+(defun js2-parse-object-literal-elems (&optional class-p)
+  (let ((pos (js2-current-token-beg))
+        (static nil)
+        (continue t)
+        tt elems elem
+        elem-key-string previous-elem-key-string
+        after-comma previous-token)
+    (while continue
+      (setq tt (js2-get-prop-name-token)
+            static nil
+            elem nil
+            previous-token nil)
+      ;; Handle 'static' keyword only if we're in a class
+      (when (and class-p (= js2-NAME tt)
+                 (string= "static" (js2-current-token-string)))
+        (js2-record-face 'font-lock-keyword-face)
+        (setq static t
+              tt (js2-get-prop-name-token)))
+      ;; Handle generator * before the property name for in-line functions
+      (when (and (>= js2-language-version 200)
+                 (= js2-MUL tt))
+        (setq previous-token (js2-current-token)
+              tt (js2-get-prop-name-token)))
+      ;; Handle getter, setter and async methods
+      (let ((prop (js2-current-token-string)))
+        (when (and (>= js2-language-version 200)
+                   (= js2-NAME tt)
+                   (member prop '("get" "set" "async"))
+                   (member (js2-peek-token)
+                           (list js2-NAME js2-STRING js2-NUMBER js2-LB)))
+          (setq previous-token (js2-current-token)
+                tt (js2-get-prop-name-token))))
+      (cond
+       ;; Found a property (of any sort)
+       ((member tt (list js2-NAME js2-STRING js2-NUMBER js2-LB))
+        (setq after-comma nil
+              elem (js2-parse-named-prop tt previous-token))
+        (if (and (null elem)
+                 (not js2-recover-from-parse-errors))
+            (setq continue nil)))
+       ;; Break out of loop, and handle trailing commas.
+       ((or (= tt js2-RC)
+            (= tt js2-EOF))
+        (js2-unget-token)
+        (setq continue nil)
+        (if after-comma
+            (js2-parse-warn-trailing-comma "msg.extra.trailing.comma"
+                                           pos elems after-comma)))
+       ;; Skip semicolons in a class body
+       ((and class-p
+             (= tt js2-SEMI))
+        nil)
+       (t
+        (js2-report-error "msg.bad.prop")
+        (unless js2-recover-from-parse-errors
+          (setq continue nil))))         ; end switch
+      ;; Handle static for classes' codegen.
+      (if static
+          (if elem (js2-node-set-prop elem 'STATIC t)
+            (js2-report-error "msg.unexpected.static")))
+      ;; Handle commas, depending on class-p.
+      (let ((tok (js2-get-prop-name-token)))
+        (if (eq tok js2-COMMA)
+            (if class-p
+                (js2-report-error "msg.class.unexpected.comma")
+              (setq after-comma (js2-current-token-end)))
+          (js2-unget-token)
+          (unless class-p (setq continue nil))))
+      (when elem
+        (when (and js2-in-use-strict-directive
+                   (setq elem-key-string (js2-property-key-string elem))
+                   (cl-some
+                    (lambda (previous-elem)
+                      (and (setq previous-elem-key-string
+                                 (js2-property-key-string previous-elem))
+                           ;; Check if the property is a duplicate.
+                           (string= previous-elem-key-string elem-key-string)
+                           ;; But make an exception for getter / setter pairs.
+                           (not (and (js2-method-node-p elem)
+                                     (js2-method-node-p previous-elem)
+                                     (let ((type (js2-node-get-prop (js2-method-node-right elem) 'METHOD_TYPE))
+                                           (previous-type (js2-node-get-prop (js2-method-node-right previous-elem) 'METHOD_TYPE)))
+                                       (and (member type '(GET SET))
+                                            (member previous-type '(GET SET))
+                                            (not (eq type previous-type))))))))
+                    elems))
+          (js2-report-error "msg.dup.obj.lit.prop.strict"
+                            elem-key-string
+                            (js2-node-abs-pos (js2-infix-node-left elem))
+                            (js2-node-len (js2-infix-node-left elem))))
+        ;; Append any parsed element.
+        (push elem elems)))       ; end loop
+    (js2-must-match js2-RC "msg.no.brace.prop")
+    (nreverse elems)))
+
+(defun js2-parse-named-prop (tt previous-token)
+  "Parse a name, string, or getter/setter object property.
+When `js2-is-in-destructuring' is t, forms like {a, b, c} will be permitted."
+  (let ((key (js2-parse-prop-name tt))
+        (prop (and previous-token (js2-token-string previous-token)))
+        (property-type (when previous-token
+                             (if (= (js2-token-type previous-token) js2-MUL)
+                                 "*"
+                               (js2-token-string previous-token))))
+        pos)
+    (when (member prop '("get" "set" "async"))
+      (setq pos (js2-token-beg previous-token))
+      (js2-set-face (js2-token-beg previous-token)
+                    (js2-token-end previous-token)
+                    'font-lock-keyword-face 'record))  ; get/set/async
+    (cond
+     ;; method definition: {f() {...}}
+     ((and (= (js2-peek-token) js2-LP)
+           (>= js2-language-version 200))
+      (when (js2-name-node-p key)  ; highlight function name properties
+        (js2-record-face 'font-lock-function-name-face))
+      (js2-parse-method-prop pos key property-type))
+     ;; binding element with initializer
+     ((and (= (js2-peek-token) js2-ASSIGN)
+           (>= js2-language-version 200))
+      (if (not js2-is-in-destructuring)
+          (js2-report-error "msg.init.no.destruct"))
+      (js2-parse-initialized-binding key))
+     ;; regular prop
+     (t
+      (let ((beg (js2-current-token-beg))
+            (end (js2-current-token-end))
+            (expr (js2-parse-plain-property key)))
+        (when (and (= tt js2-NAME)
+                   (not js2-is-in-destructuring)
+                   js2-highlight-external-variables
+                   (js2-node-get-prop expr 'SHORTHAND))
+          (js2-record-name-node key))
+        (js2-set-face beg end
+                      (if (js2-function-node-p
+                           (js2-object-prop-node-right expr))
+                          'font-lock-function-name-face
+                        'js2-object-property)
+                      'record)
+        expr)))))
+
+(defun js2-parse-initialized-binding (name)
+  "Parse a `SingleNameBinding' with initializer.
+
+`name' is the `BindingIdentifier'."
+  (when (js2-match-token js2-ASSIGN)
+    (js2-make-binary js2-ASSIGN name 'js2-parse-assign-expr t)))
+
+(defun js2-parse-prop-name (tt)
+  (cond
+   ;; Literal string keys: {'foo': 'bar'}
+   ((= tt js2-STRING)
+    (make-js2-string-node))
+   ;; Handle computed keys: {[Symbol.iterator]: ...}, *[1+2]() {...}},
+   ;; {[foo + bar]() { ... }}, {[get ['x' + 1]() {...}}
+   ((and (= tt js2-LB)
+         (>= js2-language-version 200))
+    (make-js2-computed-prop-name-node
+     :expr (prog1 (js2-parse-assign-expr)
+             (js2-must-match js2-RB "msg.missing.computed.rb"))))
+   ;; Numeric keys: {12: 'foo'}, {10.7: 'bar'}
+   ((= tt js2-NUMBER)
+    (make-js2-number-node))
+   ;; Unquoted names: {foo: 12}
+   ((= tt js2-NAME)
+    (js2-create-name-node))
+   ;; Anything else is an error
+   (t (js2-report-error "msg.bad.prop"))))
+
+(defun js2-parse-plain-property (prop)
+  "Parse a non-getter/setter property in an object literal.
+PROP is the node representing the property: a number, name,
+string or expression."
+  (let* ((tt (js2-get-token))
+         (pos (js2-node-pos prop))
+         colon expr result)
+    (cond
+     ;; Abbreviated property, as in {foo, bar}
+     ((and (>= js2-language-version 200)
+           (or (= tt js2-COMMA)
+               (= tt js2-RC))
+           (not (js2-number-node-p prop)))
+      (js2-unget-token)
+      (setq result (make-js2-object-prop-node
+                    :pos pos
+                    :left prop
+                    :right prop
+                    :op-pos (js2-current-token-len)))
+      (js2-node-add-children result prop)
+      (js2-node-set-prop result 'SHORTHAND t)
+      result)
+     ;; Normal property
+     (t
+      (if (= tt js2-COLON)
+          (setq colon (- (js2-current-token-beg) pos)
+                expr (js2-parse-assign-expr))
+        (js2-report-error "msg.no.colon.prop")
+        (setq expr (make-js2-error-node)))
+      (setq result (make-js2-object-prop-node
+                   :pos pos
+                   ;; don't include last consumed token in length
+                   :len (- (+ (js2-node-pos expr)
+                              (js2-node-len expr))
+                           pos)
+                   :left prop
+                   :right expr
+                   :op-pos colon))
+      (js2-node-add-children result prop expr)
+      result))))
+
+(defun js2-parse-method-prop (pos prop type-string)
+  "Parse method property in an object literal or a class body.
+JavaScript syntax is:
+
+  { foo(...) {...}, get foo() {...}, set foo(x) {...}, *foo(...) {...},
+    async foo(...) {...} }
+
+and expression closure style is also supported
+
+  { get foo() x, set foo(x) _x = x }
+
+POS is the start position of the `get' or `set' keyword.
+PROP is the `js2-name-node' representing the property name.
+TYPE-STRING is a string `get', `set', `*', or nil, indicating a found keyword."
+  (let* ((type (or (cdr (assoc type-string '(("get" . GET)
+                                             ("set" . SET)
+                                             ("async" . ASYNC))))
+                   'FUNCTION))
+         result end
+         (fn (js2-parse-function-expr (eq type 'ASYNC))))
+    ;; it has to be an anonymous function, as we already parsed the name
+    (if (/= (js2-node-type fn) js2-FUNCTION)
+        (js2-report-error "msg.bad.prop")
+      (if (cl-plusp (length (js2-function-name fn)))
+          (js2-report-error "msg.bad.prop")))
+    (js2-node-set-prop fn 'METHOD_TYPE type)  ; for codegen
+    (when (string= type-string "*")
+      (setf (js2-function-node-generator-type fn) 'STAR))
+    (unless pos (setq pos (js2-node-pos prop)))
+    (setq end (js2-node-end fn)
+          result (make-js2-method-node :pos pos
+                                       :len (- end pos)
+                                       :left prop
+                                       :right fn))
+    (js2-node-add-children result prop fn)
+    result))
+
+(defun js2-create-name-node (&optional check-activation-p token string)
+  "Create a name node using the current token and, optionally, STRING.
+And, if CHECK-ACTIVATION-P is non-nil, use the value of TOKEN."
+  (let* ((beg (js2-current-token-beg))
+         (tt (js2-current-token-type))
+         (s (or string
+                (if (= js2-NAME tt)
+                    (js2-current-token-string)
+                  (js2-tt-name tt))))
+         name)
+    (setq name (make-js2-name-node :pos beg
+                                   :name s
+                                   :len (length s)))
+    (if check-activation-p
+        (js2-check-activation-name s (or token js2-NAME)))
+    name))
+
+;;; Use AST to extract semantic information
+
+(defun js2-get-element-index-from-array-node (elem array-node &optional hardcoded-array-index)
+  "Get index of ELEM from ARRAY-NODE or 0 and return it as string."
+  (let ((idx 0) elems (rlt hardcoded-array-index))
+    (setq elems (js2-array-node-elems array-node))
+    (if (and elem (not hardcoded-array-index))
+        (setq rlt (catch 'nth-elt
+                    (dolist (x elems)
+                      ;; We know the ELEM does belong to ARRAY-NODE,
+                      (if (eq elem x) (throw 'nth-elt idx))
+                      (setq idx (1+ idx)))
+                    0)))
+    (format "[%s]" rlt)))
+
+(defun js2-print-json-path (&optional hardcoded-array-index)
+  "Print the path to the JSON value under point, and save it in the kill ring.
+If HARDCODED-ARRAY-INDEX provided, array index in JSON path is replaced with it."
+  (interactive "P")
+  (let (previous-node current-node
+        key-name
+        rlt)
+
+    ;; The `js2-node-at-point' starts scanning from AST root node.
+    ;; So there is no way to optimize it.
+    (setq current-node (js2-node-at-point))
+
+    (while (not (js2-ast-root-p current-node))
+      (cond
+       ;; JSON property node
+       ((js2-object-prop-node-p current-node)
+        (setq key-name (js2-prop-node-name (js2-object-prop-node-left current-node)))
+        (if rlt (setq rlt (concat "." key-name rlt))
+          (setq rlt (concat "." key-name))))
+
+       ;; Array node
+       ((or (js2-array-node-p current-node))
+        (setq rlt (concat (js2-get-element-index-from-array-node previous-node
+                                                                 current-node
+                                                                 hardcoded-array-index)
+                          rlt)))
+
+       ;; Other nodes are ignored
+       (t))
+
+      ;; current node is archived
+      (setq previous-node current-node)
+      ;; Get parent node and continue the loop
+      (setq current-node (js2-node-parent current-node)))
+
+    (cond
+     (rlt
+      ;; Clean the final result
+      (setq rlt (replace-regexp-in-string "^\\." "" rlt))
+      (kill-new rlt)
+      (message "%s => kill-ring" rlt))
+     (t
+      (message "No JSON path found!")))
+
+    rlt))
+
+;;; Indentation support (bouncing)
+
+;; In recent-enough Emacs, we reuse the indentation code from
+;; `js-mode'.  To continue support for the older versions, some code
+;; that was here previously was moved to `js2-old-indent.el'.
+
+;; Whichever indenter is used, it's often "wrong", however, and needs
+;; to be overridden.  The right long-term solution is probably to
+;; emulate (or integrate with) cc-engine, but it's a nontrivial amount
+;; of coding.  Even when a parse tree from `js2-parse' is present,
+;; which is not true at the moment the user is typing, computing
+;; indentation is still thousands of lines of code to handle every
+;; possible syntactic edge case.
+
+;; In the meantime, the compromise solution is that we offer a "bounce
+;; indenter", configured with `js2-bounce-indent-p', which cycles the
+;; current line indent among various likely guess points.  This approach
+;; is far from perfect, but should at least make it slightly easier to
+;; move the line towards its desired indentation when manually
+;; overriding Karl's heuristic nesting guesser.
+
+(defun js2-backward-sws ()
+  "Move backward through whitespace and comments."
+  (interactive)
+  (while (forward-comment -1)))
+
+(defun js2-forward-sws ()
+  "Move forward through whitespace and comments."
+  (interactive)
+  (while (forward-comment 1)))
+
+(defun js2-arglist-close ()
+  "Return non-nil if we're on a line beginning with a close-paren/brace."
+  (save-excursion
+    (goto-char (point-at-bol))
+    (js2-forward-sws)
+    (looking-at "[])}]")))
+
+(defun js2-indent-looks-like-label-p ()
+  (goto-char (point-at-bol))
+  (js2-forward-sws)
+  (looking-at (concat js2-mode-identifier-re ":")))
+
+(defun js2-indent-in-objlit-p (parse-status)
+  "Return non-nil if this looks like an object-literal entry."
+  (let ((start (nth 1 parse-status)))
+    (and
+     start
+     (save-excursion
+       (and (zerop (forward-line -1))
+            (not (< (point) start))     ; crossed a {} boundary
+            (js2-indent-looks-like-label-p)))
+     (save-excursion
+       (js2-indent-looks-like-label-p)))))
+
+;; If prev line looks like foobar({ then we're passing an object
+;; literal to a function call, and people pretty much always want to
+;; de-dent back to the previous line, so move the 'basic-offset'
+;; position to the front.
+(defun js2-indent-objlit-arg-p (parse-status)
+  (save-excursion
+    (back-to-indentation)
+    (js2-backward-sws)
+    (and (eq (1- (point)) (nth 1 parse-status))
+         (eq (char-before) ?{)
+         (progn
+           (forward-char -1)
+           (skip-chars-backward " \t")
+           (eq (char-before) ?\()))))
+
+(defun js2-indent-case-block-p ()
+  (save-excursion
+    (back-to-indentation)
+    (js2-backward-sws)
+    (goto-char (point-at-bol))
+    (skip-chars-forward " \t")
+    (looking-at "case\\s-.+:")))
+
+(defun js2-bounce-indent (normal-col parse-status &optional backward)
+  "Cycle among alternate computed indentation positions.
+PARSE-STATUS is the result of `parse-partial-sexp' from the beginning
+of the buffer to the current point.  NORMAL-COL is the indentation
+column computed by the heuristic guesser based on current paren,
+bracket, brace and statement nesting.  If BACKWARDS, cycle positions
+in reverse."
+  (let ((cur-indent (current-indentation))
+        (old-buffer-undo-list buffer-undo-list)
+        ;; Emacs 21 only has `count-lines', not `line-number-at-pos'
+        (current-line (save-excursion
+                        (forward-line 0)  ; move to bol
+                        (1+ (count-lines (point-min) (point)))))
+        positions pos main-pos anchor arglist-cont same-indent
+        basic-offset computed-pos)
+    ;; temporarily don't record undo info, if user requested this
+    (when js2-mode-indent-inhibit-undo
+      (setq buffer-undo-list t))
+    (unwind-protect
+        (progn
+          ;; First likely point:  indent from beginning of previous code line
+          (push (setq basic-offset
+                      (+ (save-excursion
+                           (back-to-indentation)
+                           (js2-backward-sws)
+                           (back-to-indentation)
+                           (current-column))
+                         js2-basic-offset))
+                positions)
+
+          ;; (First + epsilon) likely point:  indent 2x from beginning of
+          ;; previous code line.  Google does it this way.
+          (push (setq basic-offset
+                      (+ (save-excursion
+                           (back-to-indentation)
+                           (js2-backward-sws)
+                           (back-to-indentation)
+                           (current-column))
+                         (* 2 js2-basic-offset)))
+                positions)
+
+          ;; Second likely point:  indent from assign-expr RHS.  This
+          ;; is just a crude guess based on finding " = " on the previous
+          ;; line containing actual code.
+          (setq pos (save-excursion
+                      (forward-line -1)
+                      (goto-char (point-at-bol))
+                      (when (re-search-forward "\\s-+\\(=\\)\\s-+"
+                                               (point-at-eol) t)
+                        (goto-char (match-end 1))
+                        (skip-chars-forward " \t\r\n")
+                        (current-column))))
+          (when pos
+            (cl-incf pos js2-basic-offset)
+            (push pos positions))
+
+          ;; Third likely point:  same indent as previous line of code.
+          ;; Make it the first likely point if we're not on an
+          ;; arglist-close line and previous line ends in a comma, or
+          ;; both this line and prev line look like object-literal
+          ;; elements.
+          (setq pos (save-excursion
+                      (goto-char (point-at-bol))
+                      (js2-backward-sws)
+                      (back-to-indentation)
+                      (prog1
+                          (current-column)
+                        ;; while we're here, look for trailing comma
+                        (if (save-excursion
+                              (goto-char (point-at-eol))
+                              (js2-backward-sws)
+                              (eq (char-before) ?,))
+                            (setq arglist-cont (1- (point)))))))
+          (when pos
+            (if (and (or arglist-cont
+                         (js2-indent-in-objlit-p parse-status))
+                     (not (js2-arglist-close)))
+                (setq same-indent pos))
+            (push pos positions))
+
+          ;; Fourth likely point:  first preceding code with less indentation.
+          ;; than the immediately preceding code line.
+          (setq pos (save-excursion
+                      (back-to-indentation)
+                      (js2-backward-sws)
+                      (back-to-indentation)
+                      (setq anchor (current-column))
+                      (while (and (zerop (forward-line -1))
+                                  (>= (progn
+                                        (back-to-indentation)
+                                        (current-column))
+                                      anchor)))
+                      (setq pos (current-column))))
+          (push pos positions)
+
+          ;; nesting-heuristic position, main by default
+          (push (setq main-pos normal-col) positions)
+
+          ;; delete duplicates and sort positions list
+          (setq positions (sort (delete-dups positions) '<))
+
+          ;; comma-list continuation lines:  prev line indent takes precedence
+          (if same-indent
+              (setq main-pos same-indent))
+
+          ;; common special cases where we want to indent in from previous line
+          (if (or (js2-indent-case-block-p)
+                  (js2-indent-objlit-arg-p parse-status))
+              (setq main-pos basic-offset))
+
+          ;; if bouncing backward, reverse positions list
+          (if backward
+              (setq positions (reverse positions)))
+
+          ;; record whether we're already sitting on one of the alternatives
+          (setq pos (member cur-indent positions))
+
+          (cond
+           ;; case 0:  we're one one of the alternatives and this is the
+           ;; first time they've pressed TAB on this line (best-guess).
+           ((and js2-mode-indent-ignore-first-tab
+                 pos
+                 ;; first time pressing TAB on this line?
+                 (not (eq js2-mode-last-indented-line current-line)))
+            ;; do nothing
+            (setq computed-pos nil))
+           ;; case 1:  only one computed position => use it
+           ((null (cdr positions))
+            (setq computed-pos 0))
+           ;; case 2:  not on any of the computed spots => use main spot
+           ((not pos)
+            (setq computed-pos (js2-position main-pos positions)))
+           ;; case 3:  on last position:  cycle to first position
+           ((null (cdr pos))
+            (setq computed-pos 0))
+           ;; case 4:  on intermediate position:  cycle to next position
+           (t
+            (setq computed-pos (js2-position (cl-second pos) positions))))
+
+          ;; see if any hooks want to indent; otherwise we do it
+          (cl-loop with result = nil
+                   for hook in js2-indent-hook
+                   while (null result)
+                   do
+                   (setq result (funcall hook positions computed-pos))
+                   finally do
+                   (unless (or result (null computed-pos))
+                     (indent-line-to (nth computed-pos positions)))))
+
+      ;; finally
+      (if js2-mode-indent-inhibit-undo
+          (setq buffer-undo-list old-buffer-undo-list))
+      ;; see commentary for `js2-mode-last-indented-line'
+      (setq js2-mode-last-indented-line current-line))))
+
+(defun js2-1-line-comment-continuation-p ()
+  "Return t if we're in a 1-line comment continuation.
+If so, we don't ever want to use bounce-indent."
+  (save-excursion
+    (and (progn
+           (forward-line 0)
+           (looking-at "\\s-*//"))
+         (progn
+           (forward-line -1)
+           (forward-line 0)
+           (when (looking-at "\\s-*$")
+             (js2-backward-sws)
+             (forward-line 0))
+           (looking-at "\\s-*//")))))
+
+(defun js2-indent-bounce (&optional backward)
+  "Indent the current line, bouncing between several positions."
+  (interactive)
+  (let (parse-status offset indent-col
+        ;; Don't whine about errors/warnings when we're indenting.
+        ;; This has to be set before calling parse-partial-sexp below.
+        (inhibit-point-motion-hooks t))
+    (setq parse-status (save-excursion
+                         (syntax-ppss (point-at-bol)))
+          offset (- (point) (save-excursion
+                              (back-to-indentation)
+                              (point))))
+    ;; Don't touch multiline strings.
+    (unless (nth 3 parse-status)
+      (setq indent-col (js2-proper-indentation parse-status))
+      (cond
+       ;; It doesn't work well on first line of buffer.
+       ((and (not (nth 4 parse-status))
+             (not (js2-same-line (point-min)))
+             (not (js2-1-line-comment-continuation-p)))
+        (js2-bounce-indent indent-col parse-status backward))
+       ;; just indent to the guesser's likely spot
+       (t (indent-line-to indent-col)))
+      (when (cl-plusp offset)
+        (forward-char offset)))))
+
+(defun js2-indent-bounce-backward ()
+  "Indent the current line, bouncing between positions in reverse."
+  (interactive)
+  (js2-indent-bounce t))
+
+(defun js2-indent-region (start end)
+  "Indent the region, but don't use bounce indenting."
+  (let ((js2-bounce-indent-p nil)
+        (indent-region-function nil)
+        (after-change-functions (remq 'js2-mode-edit
+                                      after-change-functions)))
+    (indent-region start end nil) ; nil for byte-compiler
+    (js2-mode-edit start end (- end start))))
+
+(defvar js2-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-`") #'js2-next-error)
+    (define-key map [mouse-1] #'js2-mode-show-node)
+    map)
+  "Keymap used when `js2-minor-mode' is active.")
+
+;;;###autoload
+(define-minor-mode js2-minor-mode
+  "Minor mode for running js2 as a background linter.
+This allows you to use a different major mode for JavaScript editing,
+such as `js-mode', while retaining the asynchronous error/warning
+highlighting features of `js2-mode'."
+  :group 'js2-mode
+  :lighter " js-lint"
+  (if (derived-mode-p 'js2-mode)
+      (setq js2-minor-mode nil)
+    (if js2-minor-mode
+        (js2-minor-mode-enter)
+      (js2-minor-mode-exit))))
+
+(defun js2-minor-mode-enter ()
+  "Initialization for `js2-minor-mode'."
+  (set (make-local-variable 'max-lisp-eval-depth)
+       (max max-lisp-eval-depth 3000))
+  (setq next-error-function #'js2-next-error)
+  (js2-set-default-externs)
+  ;; Experiment:  make reparse-delay longer for longer files.
+  (if (cl-plusp js2-dynamic-idle-timer-adjust)
+      (setq js2-idle-timer-delay
+            (* js2-idle-timer-delay
+               (/ (point-max) js2-dynamic-idle-timer-adjust))))
+  (setq js2-mode-buffer-dirty-p t
+        js2-mode-parsing nil)
+  (set (make-local-variable 'js2-highlight-level) 0) ; no syntax highlighting
+  (add-hook 'after-change-functions #'js2-minor-mode-edit nil t)
+  (add-hook 'change-major-mode-hook #'js2-minor-mode-exit nil t)
+  (when js2-include-jslint-globals
+    (add-hook 'js2-post-parse-callbacks 'js2-apply-jslint-globals nil t))
+  (run-hooks 'js2-init-hook)
+  (js2-reparse))
+
+(defun js2-minor-mode-exit ()
+  "Turn off `js2-minor-mode'."
+  (setq next-error-function nil)
+  (remove-hook 'after-change-functions #'js2-mode-edit t)
+  (remove-hook 'change-major-mode-hook #'js2-minor-mode-exit t)
+  (when js2-mode-node-overlay
+    (delete-overlay js2-mode-node-overlay)
+    (setq js2-mode-node-overlay nil))
+  (js2-remove-overlays)
+  (remove-hook 'js2-post-parse-callbacks 'js2-apply-jslint-globals t)
+  (setq js2-mode-ast nil))
+
+(defvar js2-source-buffer nil "Linked source buffer for diagnostics view")
+(make-variable-buffer-local 'js2-source-buffer)
+
+(cl-defun js2-display-error-list ()
+  "Display a navigable buffer listing parse errors/warnings."
+  (interactive)
+  (unless (js2-have-errors-p)
+    (message "No errors")
+    (cl-return-from js2-display-error-list))
+  (cl-labels ((annotate-list
+               (lst type)
+               "Add diagnostic TYPE and line number to errs list"
+               (mapcar (lambda (err)
+                         (list err type (line-number-at-pos (nth 1 err))))
+                       lst)))
+    (let* ((srcbuf (current-buffer))
+           (errbuf (get-buffer-create "*js-lint*"))
+           (errors (annotate-list
+                    (when js2-mode-ast (js2-ast-root-errors js2-mode-ast))
+                    'js2-error))  ; must be a valid face name
+           (warnings (annotate-list
+                      (when js2-mode-ast (js2-ast-root-warnings js2-mode-ast))
+                      'js2-warning))  ; must be a valid face name
+           (all-errs (sort (append errors warnings)
+                           (lambda (e1 e2) (< (cl-cadar e1) (cl-cadar e2))))))
+      (with-current-buffer errbuf
+        (let ((inhibit-read-only t))
+          (erase-buffer)
+          (dolist (err all-errs)
+            (cl-destructuring-bind ((msg-key beg _end &rest) type line) err
+              (insert-text-button
+               (format "line %d: %s" line (js2-get-msg msg-key))
+               'face type
+               'follow-link "\C-m"
+               'action 'js2-error-buffer-jump
+               'js2-msg (js2-get-msg msg-key)
+               'js2-pos beg)
+              (insert "\n"))))
+        (js2-error-buffer-mode)
+        (setq js2-source-buffer srcbuf)
+        (pop-to-buffer errbuf)
+        (goto-char (point-min))
+        (unless (eobp)
+          (js2-error-buffer-view))))))
+
+(defvar js2-error-buffer-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "n" #'js2-error-buffer-next)
+    (define-key map "p" #'js2-error-buffer-prev)
+    (define-key map (kbd "RET") #'js2-error-buffer-jump)
+    (define-key map "o" #'js2-error-buffer-view)
+    (define-key map "q" #'js2-error-buffer-quit)
+    map)
+  "Keymap used for js2 diagnostics buffers.")
+
+(defun js2-error-buffer-mode ()
+  "Major mode for js2 diagnostics buffers.
+Selecting an error will jump it to the corresponding source-buffer error.
+\\{js2-error-buffer-mode-map}"
+  (interactive)
+  (setq major-mode 'js2-error-buffer-mode
+        mode-name "JS Lint Diagnostics")
+  (use-local-map js2-error-buffer-mode-map)
+  (setq truncate-lines t)
+  (set-buffer-modified-p nil)
+  (setq buffer-read-only t)
+  (run-hooks 'js2-error-buffer-mode-hook))
+
+(defun js2-error-buffer-next ()
+  "Move to next error and view it."
+  (interactive)
+  (when (zerop (forward-line 1))
+    (js2-error-buffer-view)))
+
+(defun js2-error-buffer-prev ()
+  "Move to previous error and view it."
+  (interactive)
+  (when (zerop (forward-line -1))
+    (js2-error-buffer-view)))
+
+(defun js2-error-buffer-quit ()
+  "Kill the current buffer."
+  (interactive)
+  (kill-buffer))
+
+(defun js2-error-buffer-jump (&rest ignored)
+  "Jump cursor to current error in source buffer."
+  (interactive)
+  (when (js2-error-buffer-view)
+    (pop-to-buffer js2-source-buffer)))
+
+(defun js2-error-buffer-view ()
+  "Scroll source buffer to show error at current line."
+  (interactive)
+  (cond
+   ((not (eq major-mode 'js2-error-buffer-mode))
+    (message "Not in a js2 errors buffer"))
+   ((not (buffer-live-p js2-source-buffer))
+    (message "Source buffer has been killed"))
+   ((not (wholenump (get-text-property (point) 'js2-pos)))
+    (message "There does not seem to be an error here"))
+   (t
+    (let ((pos (get-text-property (point) 'js2-pos))
+          (msg (get-text-property (point) 'js2-msg)))
+      (save-selected-window
+        (pop-to-buffer js2-source-buffer)
+        (goto-char pos)
+        (message msg))))))
+
+;;;###autoload
+(define-derived-mode js2-mode js-mode "Javascript-IDE"
+  "Major mode for editing JavaScript code."
+  (set (make-local-variable 'max-lisp-eval-depth)
+       (max max-lisp-eval-depth 3000))
+  (set (make-local-variable 'indent-line-function) #'js2-indent-line)
+  (set (make-local-variable 'indent-region-function) #'js2-indent-region)
+  (set (make-local-variable 'syntax-propertize-function) nil)
+  (set (make-local-variable 'comment-line-break-function) #'js2-line-break)
+  (set (make-local-variable 'beginning-of-defun-function) #'js2-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function) #'js2-end-of-defun)
+  ;; We un-confuse `parse-partial-sexp' by setting syntax-table properties
+  ;; for characters inside regexp literals.
+  (set (make-local-variable 'parse-sexp-lookup-properties) t)
+  ;; this is necessary to make `show-paren-function' work properly
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  ;; needed for M-x rgrep, among other things
+  (put 'js2-mode 'find-tag-default-function #'js2-mode-find-tag)
+
+  (setq font-lock-defaults '(nil t))
+
+  ;; Experiment:  make reparse-delay longer for longer files.
+  (when (cl-plusp js2-dynamic-idle-timer-adjust)
+    (setq js2-idle-timer-delay
+          (* js2-idle-timer-delay
+             (/ (point-max) js2-dynamic-idle-timer-adjust))))
+
+  (add-hook 'change-major-mode-hook #'js2-mode-exit nil t)
+  (add-hook 'after-change-functions #'js2-mode-edit nil t)
+  (setq imenu-create-index-function #'js2-mode-create-imenu-index)
+  (setq next-error-function #'js2-next-error)
+  (imenu-add-to-menubar (concat "IM-" mode-name))
+  (add-to-invisibility-spec '(js2-outline . t))
+  (set (make-local-variable 'line-move-ignore-invisible) t)
+  (set (make-local-variable 'forward-sexp-function) #'js2-mode-forward-sexp)
+  (when (fboundp 'cursor-sensor-mode) (cursor-sensor-mode 1))
+
+  (setq js2-mode-functions-hidden nil
+        js2-mode-comments-hidden nil
+        js2-mode-buffer-dirty-p t
+        js2-mode-parsing nil)
+
+  (js2-set-default-externs)
+
+  (when js2-include-jslint-globals
+    (add-hook 'js2-post-parse-callbacks 'js2-apply-jslint-globals nil t))
+
+  (run-hooks 'js2-init-hook)
+
+  (js2-reparse))
+
+;; We may eventually want js2-jsx-mode to derive from js-jsx-mode, but that'd be
+;; a bit more complicated and it doesn't net us much yet.
+;;;###autoload
+(define-derived-mode js2-jsx-mode js2-mode "JSX-IDE"
+  "Major mode for editing JSX code.
+
+To customize the indentation for this mode, set the SGML offset
+variables (`sgml-basic-offset' et al) locally, like so:
+
+  (defun set-jsx-indentation ()
+    (setq-local sgml-basic-offset js2-basic-offset))
+  (add-hook 'js2-jsx-mode-hook #'set-jsx-indentation)"
+  (set (make-local-variable 'indent-line-function) #'js2-jsx-indent-line))
+
+(defun js2-mode-exit ()
+  "Exit `js2-mode' and clean up."
+  (interactive)
+  (when js2-mode-node-overlay
+    (delete-overlay js2-mode-node-overlay)
+    (setq js2-mode-node-overlay nil))
+  (js2-remove-overlays)
+  (setq js2-mode-ast nil)
+  (remove-hook 'change-major-mode-hook #'js2-mode-exit t)
+  (remove-from-invisibility-spec '(js2-outline . t))
+  (js2-mode-show-all)
+  (with-silent-modifications
+    (js2-clear-face (point-min) (point-max))))
+
+(defun js2-mode-reset-timer ()
+  "Cancel any existing parse timer and schedule a new one."
+  (if js2-mode-parse-timer
+      (cancel-timer js2-mode-parse-timer))
+  (setq js2-mode-parsing nil)
+  (let ((timer (timer-create)))
+    (setq js2-mode-parse-timer timer)
+    (timer-set-function timer 'js2-mode-idle-reparse (list (current-buffer)))
+    (timer-set-idle-time timer js2-idle-timer-delay)
+    ;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12326
+    (timer-activate-when-idle timer nil)))
+
+(defun js2-mode-idle-reparse (buffer)
+  "Run `js2-reparse' if BUFFER is the current buffer, or schedule
+it to be reparsed when the buffer is selected."
+  (cond ((eq buffer (current-buffer))
+         (js2-reparse))
+        ((buffer-live-p buffer)
+         ;; reparse when the buffer is selected again
+         (with-current-buffer buffer
+           (add-hook 'window-configuration-change-hook
+                     #'js2-mode-idle-reparse-inner
+                     nil t)))))
+
+(defun js2-mode-idle-reparse-inner ()
+  (remove-hook 'window-configuration-change-hook
+               #'js2-mode-idle-reparse-inner
+               t)
+  (js2-reparse))
+
+(defun js2-mode-edit (_beg _end _len)
+  "Schedule a new parse after buffer is edited.
+Buffer edit spans from BEG to END and is of length LEN."
+  (setq js2-mode-buffer-dirty-p t)
+  (js2-mode-hide-overlay)
+  (js2-mode-reset-timer))
+
+(defun js2-minor-mode-edit (_beg _end _len)
+  "Callback for buffer edits in `js2-mode'.
+Schedules a new parse after buffer is edited.
+Buffer edit spans from BEG to END and is of length LEN."
+  (setq js2-mode-buffer-dirty-p t)
+  (js2-mode-hide-overlay)
+  (js2-mode-reset-timer))
+
+(defun js2-reparse (&optional force)
+  "Re-parse current buffer after user finishes some data entry.
+If we get any user input while parsing, including cursor motion,
+we discard the parse and reschedule it.  If FORCE is nil, then the
+buffer will only rebuild its `js2-mode-ast' if the buffer is dirty."
+  (let (time
+        interrupted-p
+        (js2-compiler-strict-mode js2-mode-show-strict-warnings))
+    (unless js2-mode-parsing
+      (setq js2-mode-parsing t)
+      (unwind-protect
+          (when (or js2-mode-buffer-dirty-p force)
+            (js2-remove-overlays)
+            (setq js2-mode-buffer-dirty-p nil
+                  js2-mode-fontifications nil
+                  js2-mode-deferred-properties nil)
+            (if js2-mode-verbose-parse-p
+                (message "parsing..."))
+            (setq time
+                  (js2-time
+                   (setq interrupted-p
+                         (catch 'interrupted
+                           (js2-parse)
+                           (with-silent-modifications
+                             ;; if parsing is interrupted, comments and regex
+                             ;; literals stay ignored by `parse-partial-sexp'
+                             (remove-text-properties (point-min) (point-max)
+                                                     '(syntax-table))
+                             (js2-mode-apply-deferred-properties)
+                             (js2-mode-remove-suppressed-warnings)
+                             (js2-mode-show-warnings)
+                             (js2-mode-show-errors)
+                             (if (>= js2-highlight-level 1)
+                                 (js2-highlight-jsdoc js2-mode-ast)))
+                           nil))))
+            (if interrupted-p
+                (progn
+                  ;; unfinished parse => try again
+                  (setq js2-mode-buffer-dirty-p t)
+                  (js2-mode-reset-timer))
+              (if js2-mode-verbose-parse-p
+                  (message "Parse time: %s" time))))
+        (setq js2-mode-parsing nil)
+        (unless interrupted-p
+          (setq js2-mode-parse-timer nil))))))
+
+(defun js2-mode-show-node (event)
+  "Debugging aid:  highlight selected AST node on mouse click."
+  (interactive "e")
+  (mouse-set-point event)
+  (setq deactivate-mark t)
+  (when js2-mode-show-overlay
+    (let ((node (js2-node-at-point))
+          beg end)
+      (if (null node)
+          (message "No node found at location %s" (point))
+        (setq beg (js2-node-abs-pos node)
+              end (+ beg (js2-node-len node)))
+        (if js2-mode-node-overlay
+            (move-overlay js2-mode-node-overlay beg end)
+          (setq js2-mode-node-overlay (make-overlay beg end))
+          (overlay-put js2-mode-node-overlay 'font-lock-face 'highlight))
+        (with-silent-modifications
+          (if (fboundp 'cursor-sensor-mode)
+              (put-text-property beg end 'cursor-sensor-functions
+                                 '(js2-mode-hide-overlay))
+            (put-text-property beg end 'point-left #'js2-mode-hide-overlay)))
+        (message "%s, parent: %s"
+                 (js2-node-short-name node)
+                 (if (js2-node-parent node)
+                     (js2-node-short-name (js2-node-parent node))
+                   "nil"))))))
+
+(defun js2-mode-hide-overlay (&optional arg1 arg2 _arg3)
+  "Remove the debugging overlay when point moves.
+ARG1, ARG2 and ARG3 have different values depending on whether this function
+was found on `point-left' or in `cursor-sensor-functions'."
+  (when js2-mode-node-overlay
+    (let ((beg (overlay-start js2-mode-node-overlay))
+          (end (overlay-end js2-mode-node-overlay))
+          (p2 (if (windowp arg1)
+                  ;; Called from cursor-sensor-functions.
+                  (window-point arg1)
+                ;; Called from point-left.
+                arg2)))
+      ;; Sometimes we're called spuriously.
+      (unless (and p2
+                   (>= p2 beg)
+                   (<= p2 end))
+        (with-silent-modifications
+          (remove-text-properties beg end
+                                  '(point-left nil cursor-sensor-functions)))
+        (delete-overlay js2-mode-node-overlay)
+        (setq js2-mode-node-overlay nil)))))
+
+(defun js2-mode-reset ()
+  "Debugging helper:  reset everything."
+  (interactive)
+  (js2-mode-exit)
+  (js2-mode))
+
+(defun js2-mode-show-warn-or-err (e face)
+  "Highlight a warning or error E with FACE.
+E is a list of ((MSG-KEY MSG-ARG) BEG LEN OVERRIDE-FACE).
+The last element is optional.  When present, use instead of FACE."
+  (let* ((key (cl-first e))
+         (beg (cl-second e))
+         (end (+ beg (cl-third e)))
+         ;; Don't inadvertently go out of bounds.
+         (beg (max (point-min) (min beg (point-max))))
+         (end (max (point-min) (min end (point-max))))
+         (ovl (make-overlay beg end)))
+    ;; FIXME: Why a mix of overlays and text-properties?
+    (overlay-put ovl 'font-lock-face (or (cl-fourth e) face))
+    (overlay-put ovl 'js2-error t)
+    (put-text-property beg end 'help-echo (js2-get-msg key))
+    (if (fboundp 'cursor-sensor-mode)
+        (put-text-property beg end 'cursor-sensor-functions '(js2-echo-error))
+      (put-text-property beg end 'point-entered #'js2-echo-error))))
+
+(defun js2-remove-overlays ()
+  "Remove overlays from buffer that have a `js2-error' property."
+  (let ((beg (point-min))
+        (end (point-max)))
+    (save-excursion
+      (dolist (o (overlays-in beg end))
+        (when (overlay-get o 'js2-error)
+          (delete-overlay o))))))
+
+(defun js2-mode-apply-deferred-properties ()
+  "Apply fontifications and other text properties recorded during parsing."
+  (when (cl-plusp js2-highlight-level)
+    ;; We defer clearing faces as long as possible to eliminate flashing.
+    (js2-clear-face (point-min) (point-max))
+    ;; Have to reverse the recorded fontifications list so that errors
+    ;; and warnings overwrite the normal fontifications.
+    (dolist (f (nreverse js2-mode-fontifications))
+      (put-text-property (cl-first f) (cl-second f) 'font-lock-face (cl-third f)))
+    (setq js2-mode-fontifications nil))
+  (dolist (p js2-mode-deferred-properties)
+    (apply #'put-text-property p))
+  (setq js2-mode-deferred-properties nil))
+
+(defun js2-mode-show-errors ()
+  "Highlight syntax errors."
+  (when js2-mode-show-parse-errors
+    (dolist (e (js2-ast-root-errors js2-mode-ast))
+      (js2-mode-show-warn-or-err e 'js2-error))))
+
+(defun js2-mode-remove-suppressed-warnings ()
+  "Take suppressed warnings out of the AST warnings list.
+This ensures that the counts and `next-error' are correct."
+  (setf (js2-ast-root-warnings js2-mode-ast)
+        (js2-delete-if
+         (lambda (e)
+           (let ((key (caar e)))
+             (or
+              (and (not js2-strict-trailing-comma-warning)
+                   (string-match "trailing\\.comma" key))
+              (and (not js2-strict-cond-assign-warning)
+                   (string= key "msg.equal.as.assign"))
+              (and js2-missing-semi-one-line-override
+                   (string= key "msg.missing.semi")
+                   (let* ((beg (cl-second e))
+                          (node (js2-node-at-point beg))
+                          (fn (js2-mode-find-parent-fn node))
+                          (body (and fn (js2-function-node-body fn)))
+                          (lc (and body (js2-node-abs-pos body)))
+                          (rc (and lc (+ lc (js2-node-len body)))))
+                     (and fn
+                          (or (null body)
+                              (save-excursion
+                                (goto-char beg)
+                                (and (js2-same-line lc)
+                                     (js2-same-line rc))))))))))
+         (js2-ast-root-warnings js2-mode-ast))))
+
+(defun js2-mode-show-warnings ()
+  "Highlight strict-mode warnings."
+  (when js2-mode-show-strict-warnings
+    (dolist (e (js2-ast-root-warnings js2-mode-ast))
+      (js2-mode-show-warn-or-err e 'js2-warning))))
+
+(defun js2-echo-error (arg1 arg2 &optional _arg3)
+  "Called by point-motion hooks.
+ARG1, ARG2 and ARG3 have different values depending on whether this function
+was found on `point-entered' or in `cursor-sensor-functions'."
+  (let* ((new-point (if (windowp arg1)
+                        ;; Called from cursor-sensor-functions.
+                        (window-point arg1)
+                      ;; Called from point-left.
+                      arg2))
+         (msg (get-text-property new-point 'help-echo)))
+    (when (and (stringp msg)
+               (not (active-minibuffer-window))
+               (not (current-message)))
+      (message msg))))
+
+(defun js2-line-break (&optional _soft)
+  "Break line at point and indent, continuing comment if within one.
+If inside a string, and `js2-concat-multiline-strings' is not
+nil, turn it into concatenation."
+  (interactive)
+  (let ((parse-status (syntax-ppss)))
+    (cond
+     ;; Check if we're inside a string.
+     ((nth 3 parse-status)
+      (if js2-concat-multiline-strings
+          (js2-mode-split-string parse-status)
+        (insert "\n")))
+     ;; Check if inside a block comment.
+     ((nth 4 parse-status)
+      (js2-mode-extend-comment (nth 8 parse-status)))
+     (t
+      (newline-and-indent)))))
+
+(defun js2-mode-split-string (parse-status)
+  "Turn a newline in mid-string into a string concatenation.
+PARSE-STATUS is as documented in `parse-partial-sexp'."
+  (let* ((quote-char (nth 3 parse-status))
+         (at-eol (eq js2-concat-multiline-strings 'eol)))
+    (insert quote-char)
+    (insert (if at-eol " +\n" "\n"))
+    (unless at-eol
+      (insert "+ "))
+    (js2-indent-line)
+    (insert quote-char)
+    (when (eolp)
+      (insert quote-char)
+      (backward-char 1))))
+
+(defun js2-mode-extend-comment (start-pos)
+  "Indent the line and, when inside a comment block, add comment prefix."
+  (let (star single col first-line needs-close)
+    (save-excursion
+      (back-to-indentation)
+      (when (< (point) start-pos)
+        (goto-char start-pos))
+      (cond
+       ((looking-at "\\*[^/]")
+        (setq star t
+              col (current-column)))
+       ((looking-at "/\\*")
+        (setq star t
+              first-line t
+              col (1+ (current-column))))
+       ((looking-at "//")
+        (setq single t
+              col (current-column)))))
+    ;; Heuristic for whether we need to close the comment:
+    ;; if we've got a parse error here, assume it's an unterminated
+    ;; comment.
+    (setq needs-close
+          (or
+           (get-char-property (1- (point)) 'js2-error)
+           ;; The heuristic above doesn't work well when we're
+           ;; creating a comment and there's another one downstream,
+           ;; as our parser thinks this one ends at the end of the
+           ;; next one.  (You can have a /* inside a js block comment.)
+           ;; So just close it if the next non-ws char isn't a *.
+           (and first-line
+                (eolp)
+                (save-excursion
+                  (skip-chars-forward " \t\r\n")
+                  (not (eq (char-after) ?*))))))
+    (delete-horizontal-space)
+    (insert "\n")
+    (cond
+     (star
+      (indent-to col)
+      (insert "* ")
+      (if (and first-line needs-close)
+          (save-excursion
+            (insert "\n")
+            (indent-to col)
+            (insert "*/"))))
+     (single
+      (indent-to col)
+      (insert "// ")))
+    ;; Don't need to extend the comment after all.
+    (js2-indent-line)))
+
+(defun js2-beginning-of-line ()
+  "Toggle point between bol and first non-whitespace char in line.
+Also moves past comment delimiters when inside comments."
+  (interactive)
+  (let (node)
+    (cond
+     ((bolp)
+      (back-to-indentation))
+     ((looking-at "//")
+      (skip-chars-forward "/ \t"))
+     ((and (eq (char-after) ?*)
+           (setq node (js2-comment-at-point))
+           (memq (js2-comment-node-format node) '(jsdoc block))
+           (save-excursion
+             (skip-chars-backward " \t")
+             (bolp)))
+      (skip-chars-forward "\* \t"))
+     (t
+      (goto-char (point-at-bol))))))
+
+(defun js2-end-of-line ()
+  "Toggle point between eol and last non-whitespace char in line."
+  (interactive)
+  (if (eolp)
+      (skip-chars-backward " \t")
+    (goto-char (point-at-eol))))
+
+(defun js2-mode-wait-for-parse (callback)
+  "Invoke CALLBACK when parsing is finished.
+If parsing is already finished, calls CALLBACK immediately."
+  (if (not js2-mode-buffer-dirty-p)
+      (funcall callback)
+    (push callback js2-mode-pending-parse-callbacks)
+    (add-hook 'js2-parse-finished-hook #'js2-mode-parse-finished)))
+
+(defun js2-mode-parse-finished ()
+  "Invoke callbacks in `js2-mode-pending-parse-callbacks'."
+  ;; We can't let errors propagate up, since it prevents the
+  ;; `js2-parse' method from completing normally and returning
+  ;; the ast, which makes things mysteriously not work right.
+  (unwind-protect
+      (dolist (cb js2-mode-pending-parse-callbacks)
+        (condition-case err
+            (funcall cb)
+          (error (message "%s" err))))
+    (setq js2-mode-pending-parse-callbacks nil)))
+
+(defun js2-mode-flag-region (from to flag)
+  "Hide or show text from FROM to TO, according to FLAG.
+If FLAG is nil then text is shown, while if FLAG is t the text is hidden.
+Returns the created overlay if FLAG is non-nil."
+  (remove-overlays from to 'invisible 'js2-outline)
+  (when flag
+    (let ((o (make-overlay from to)))
+      (overlay-put o 'invisible 'js2-outline)
+      (overlay-put o 'isearch-open-invisible
+                   'js2-isearch-open-invisible)
+      o)))
+
+;; Function to be set as an outline-isearch-open-invisible' property
+;; to the overlay that makes the outline invisible (see
+;; `js2-mode-flag-region').
+(defun js2-isearch-open-invisible (_overlay)
+  ;; We rely on the fact that isearch places point on the matched text.
+  (js2-mode-show-element))
+
+(defun js2-mode-invisible-overlay-bounds (&optional pos)
+  "Return cons cell of bounds of folding overlay at POS.
+Returns nil if not found."
+  (let ((overlays (overlays-at (or pos (point))))
+        o)
+    (while (and overlays
+                (not o))
+      (if (overlay-get (car overlays) 'invisible)
+          (setq o (car overlays))
+        (setq overlays (cdr overlays))))
+    (if o
+        (cons (overlay-start o) (overlay-end o)))))
+
+(defun js2-mode-function-at-point (&optional pos)
+  "Return the innermost function node enclosing current point.
+Returns nil if point is not in a function."
+  (let ((node (js2-node-at-point pos)))
+    (while (and node (not (js2-function-node-p node)))
+      (setq node (js2-node-parent node)))
+    (if (js2-function-node-p node)
+        node)))
+
+(defun js2-mode-toggle-element ()
+  "Hide or show the foldable element at the point."
+  (interactive)
+  (let (comment fn pos)
+    (save-excursion
+      (cond
+       ;; /* ... */ comment?
+       ((js2-block-comment-p (setq comment (js2-comment-at-point)))
+        (if (js2-mode-invisible-overlay-bounds
+             (setq pos (+ 3 (js2-node-abs-pos comment))))
+            (progn
+              (goto-char pos)
+              (js2-mode-show-element))
+          (js2-mode-hide-element)))
+       ;; //-comment?
+       ((save-excursion
+          (back-to-indentation)
+          (looking-at js2-mode-//-comment-re))
+        (js2-mode-toggle-//-comment))
+       ;; function?
+       ((setq fn (js2-mode-function-at-point))
+        (setq pos (and (js2-function-node-body fn)
+                       (js2-node-abs-pos (js2-function-node-body fn))))
+        (goto-char (1+ pos))
+        (if (js2-mode-invisible-overlay-bounds)
+            (js2-mode-show-element)
+          (js2-mode-hide-element)))
+       (t
+        (message "Nothing at point to hide or show"))))))
+
+(defun js2-mode-hide-element ()
+  "Fold/hide contents of a block, showing ellipses.
+Show the hidden text with \\[js2-mode-show-element]."
+  (interactive)
+  (if js2-mode-buffer-dirty-p
+      (js2-mode-wait-for-parse #'js2-mode-hide-element))
+  (let (node body beg end)
+    (cond
+     ((js2-mode-invisible-overlay-bounds)
+      (message "already hidden"))
+     (t
+      (setq node (js2-node-at-point))
+      (cond
+       ((js2-block-comment-p node)
+        (js2-mode-hide-comment node))
+       (t
+        (while (and node (not (js2-function-node-p node)))
+          (setq node (js2-node-parent node)))
+        (if (and node
+                 (setq body (js2-function-node-body node)))
+            (progn
+              (setq beg (js2-node-abs-pos body)
+                    end (+ beg (js2-node-len body)))
+              (js2-mode-flag-region (1+ beg) (1- end) 'hide))
+          (message "No collapsable element found at point"))))))))
+
+(defun js2-mode-show-element ()
+  "Show the hidden element at current point."
+  (interactive)
+  (let ((bounds (js2-mode-invisible-overlay-bounds)))
+    (if bounds
+        (js2-mode-flag-region (car bounds) (cdr bounds) nil)
+      (message "Nothing to un-hide"))))
+
+(defun js2-mode-show-all ()
+  "Show all of the text in the buffer."
+  (interactive)
+  (js2-mode-flag-region (point-min) (point-max) nil))
+
+(defun js2-mode-toggle-hide-functions ()
+  (interactive)
+  (if js2-mode-functions-hidden
+      (js2-mode-show-functions)
+    (js2-mode-hide-functions)))
+
+(defun js2-mode-hide-functions ()
+  "Hides all non-nested function bodies in the buffer.
+Use \\[js2-mode-show-all] to reveal them, or \\[js2-mode-show-element]
+to open an individual entry."
+  (interactive)
+  (if js2-mode-buffer-dirty-p
+      (js2-mode-wait-for-parse #'js2-mode-hide-functions))
+  (if (null js2-mode-ast)
+      (message "Oops - parsing failed")
+    (setq js2-mode-functions-hidden t)
+    (js2-visit-ast js2-mode-ast #'js2-mode-function-hider)))
+
+(defun js2-mode-function-hider (n endp)
+  (when (not endp)
+    (let ((tt (js2-node-type n))
+          body beg end)
+      (cond
+       ((and (= tt js2-FUNCTION)
+             (setq body (js2-function-node-body n)))
+        (setq beg (js2-node-abs-pos body)
+              end (+ beg (js2-node-len body)))
+        (js2-mode-flag-region (1+ beg) (1- end) 'hide)
+        nil)   ; don't process children of function
+       (t
+        t))))) ; keep processing other AST nodes
+
+(defun js2-mode-show-functions ()
+  "Un-hide any folded function bodies in the buffer."
+  (interactive)
+  (setq js2-mode-functions-hidden nil)
+  (save-excursion
+    (goto-char (point-min))
+    (while (/= (goto-char (next-overlay-change (point)))
+               (point-max))
+      (dolist (o (overlays-at (point)))
+        (when (and (overlay-get o 'invisible)
+                   (not (overlay-get o 'comment)))
+          (js2-mode-flag-region (overlay-start o) (overlay-end o) nil))))))
+
+(defun js2-mode-hide-comment (n)
+  (let* ((head (if (eq (js2-comment-node-format n) 'jsdoc)
+                   3  ; /**
+                 2))  ; /*
+         (beg (+ (js2-node-abs-pos n) head))
+         (end (- (+ beg (js2-node-len n)) head 2))
+         (o (js2-mode-flag-region beg end 'hide)))
+    (overlay-put o 'comment t)))
+
+(defun js2-mode-toggle-hide-comments ()
+  "Folds all block comments in the buffer.
+Use \\[js2-mode-show-all] to reveal them, or \\[js2-mode-show-element]
+to open an individual entry."
+  (interactive)
+  (if js2-mode-comments-hidden
+      (js2-mode-show-comments)
+    (js2-mode-hide-comments)))
+
+(defun js2-mode-hide-comments ()
+  (interactive)
+  (if js2-mode-buffer-dirty-p
+      (js2-mode-wait-for-parse #'js2-mode-hide-comments))
+  (if (null js2-mode-ast)
+      (message "Oops - parsing failed")
+    (setq js2-mode-comments-hidden t)
+    (dolist (n (js2-ast-root-comments js2-mode-ast))
+      (when (js2-block-comment-p n)
+        (js2-mode-hide-comment n)))
+    (js2-mode-hide-//-comments)))
+
+(defun js2-mode-extend-//-comment (direction)
+  "Find start or end of a block of similar //-comment lines.
+DIRECTION is -1 to look back, 1 to look forward.
+INDENT is the indentation level to match.
+Returns the end-of-line position of the furthest adjacent
+//-comment line with the same indentation as the current line.
+If there is no such matching line, returns current end of line."
+  (let ((pos (point-at-eol))
+        (indent (current-indentation)))
+    (save-excursion
+      (while (and (zerop (forward-line direction))
+                  (looking-at js2-mode-//-comment-re)
+                  (eq indent (length (match-string 1))))
+        (setq pos (point-at-eol)))
+      pos)))
+
+(defun js2-mode-hide-//-comments ()
+  "Fold adjacent 1-line comments, showing only snippet of first one."
+  (let (beg end)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward js2-mode-//-comment-re nil t)
+        (setq beg (point)
+              end (js2-mode-extend-//-comment 1))
+        (unless (eq beg end)
+          (overlay-put (js2-mode-flag-region beg end 'hide)
+                       'comment t))
+        (goto-char end)
+        (forward-char 1)))))
+
+(defun js2-mode-toggle-//-comment ()
+  "Fold or un-fold any multi-line //-comment at point.
+Caller should have determined that this line starts with a //-comment."
+  (let* ((beg (point-at-eol))
+         (end beg))
+    (save-excursion
+      (goto-char end)
+      (if (js2-mode-invisible-overlay-bounds)
+          (js2-mode-show-element)
+        ;; else hide the comment
+        (setq beg (js2-mode-extend-//-comment -1)
+              end (js2-mode-extend-//-comment 1))
+        (unless (eq beg end)
+          (overlay-put (js2-mode-flag-region beg end 'hide)
+                       'comment t))))))
+
+(defun js2-mode-show-comments ()
+  "Un-hide any hidden comments, leaving other hidden elements alone."
+  (interactive)
+  (setq js2-mode-comments-hidden nil)
+  (save-excursion
+    (goto-char (point-min))
+    (while (/= (goto-char (next-overlay-change (point)))
+               (point-max))
+      (dolist (o (overlays-at (point)))
+        (when (overlay-get o 'comment)
+          (js2-mode-flag-region (overlay-start o) (overlay-end o) nil))))))
+
+(defun js2-mode-display-warnings-and-errors ()
+  "Turn on display of warnings and errors."
+  (interactive)
+  (setq js2-mode-show-parse-errors t
+        js2-mode-show-strict-warnings t)
+  (js2-reparse 'force))
+
+(defun js2-mode-hide-warnings-and-errors ()
+  "Turn off display of warnings and errors."
+  (interactive)
+  (setq js2-mode-show-parse-errors nil
+        js2-mode-show-strict-warnings nil)
+  (js2-reparse 'force))
+
+(defun js2-mode-toggle-warnings-and-errors ()
+  "Toggle the display of warnings and errors.
+Some users don't like having warnings/errors reported while they type."
+  (interactive)
+  (setq js2-mode-show-parse-errors (not js2-mode-show-parse-errors)
+        js2-mode-show-strict-warnings (not js2-mode-show-strict-warnings))
+  (if (called-interactively-p 'any)
+      (message "warnings and errors %s"
+               (if js2-mode-show-parse-errors
+                   "enabled"
+                 "disabled")))
+  (js2-reparse 'force))
+
+(defun js2-mode-customize ()
+  (interactive)
+  (customize-group 'js2-mode))
+
+(defun js2-mode-forward-sexp (&optional arg)
+  "Move forward across one statement or balanced expression.
+With ARG, do it that many times.  Negative arg -N means
+move backward across N balanced expressions."
+  (interactive "p")
+  (setq arg (or arg 1))
+  (save-restriction
+    (widen) ;; `blink-matching-open' calls `narrow-to-region'
+    (js2-reparse)
+    (let (forward-sexp-function
+          node (start (point)) pos lp rp child)
+      (cond
+       ;; backward-sexp
+       ;; could probably make this better for some cases:
+       ;;  - if in statement block (e.g. function body), go to parent
+       ;;  - infix exprs like (foo in bar) - maybe go to beginning
+       ;;    of infix expr if in the right-side expression?
+       ((and arg (cl-minusp arg))
+        (dotimes (_ (- arg))
+          (js2-backward-sws)
+          (forward-char -1)   ; Enter the node we backed up to.
+          (when (setq node (js2-node-at-point (point) t))
+            (setq pos (js2-node-abs-pos node))
+            (let ((parens (js2-mode-forward-sexp-parens node pos)))
+              (setq lp (car parens)
+                    rp (cdr parens)))
+            (when (and lp (> start lp))
+              (if (and rp (<= start rp))
+                  ;; Between parens, check if there's a child node we can jump.
+                  (when (setq child (js2-node-closest-child node (point) lp t))
+                    (setq pos (js2-node-abs-pos child)))
+                ;; Before both parens.
+                (setq pos lp)))
+            (let ((state (parse-partial-sexp start pos)))
+              (goto-char (if (not (zerop (car state)))
+                             ;; Stumble at the unbalanced paren if < 0, or
+                             ;; jump a bit further if > 0.
+                             (scan-sexps start -1)
+                           pos))))
+          (unless pos (goto-char (point-min)))))
+       (t
+        ;; forward-sexp
+        (dotimes (_ arg)
+          (js2-forward-sws)
+          (when (setq node (js2-node-at-point (point) t))
+            (setq pos (js2-node-abs-pos node))
+            (let ((parens (js2-mode-forward-sexp-parens node pos)))
+              (setq lp (car parens)
+                    rp (cdr parens)))
+            (or
+             (when (and rp (<= start rp))
+               (if (> start lp)
+                   (when (setq child (js2-node-closest-child node (point) rp))
+                     (setq pos (js2-node-abs-end child)))
+                 (setq pos (1+ rp))))
+             ;; No parens or child nodes, looks for the end of the current node.
+             (cl-incf pos (js2-node-len
+                           (if (js2-expr-stmt-node-p (js2-node-parent node))
+                               ;; Stop after the semicolon.
+                               (js2-node-parent node)
+                             node))))
+            (let ((state (save-excursion (parse-partial-sexp start pos))))
+              (goto-char (if (not (zerop (car state)))
+                             (scan-sexps start 1)
+                           pos))))
+          (unless pos (goto-char (point-max)))))))))
+
+(defun js2-mode-forward-sexp-parens (node abs-pos)
+  "Return a cons cell with positions of main parens in NODE."
+  (cond
+   ((or (js2-array-node-p node)
+        (js2-object-node-p node)
+        (js2-comp-node-p node)
+        (memq (aref node 0) '(cl-struct-js2-block-node cl-struct-js2-scope)))
+    (cons abs-pos (+ abs-pos (js2-node-len node) -1)))
+   ((js2-paren-expr-node-p node)
+    (let ((lp (js2-node-lp node))
+          (rp (js2-node-rp node)))
+      (cons (when lp (+ abs-pos lp))
+            (when rp (+ abs-pos rp)))))))
+
+(defun js2-node-closest-child (parent point limit &optional before)
+  (let* ((parent-pos (js2-node-abs-pos parent))
+         (rpoint (- point parent-pos))
+         (rlimit (- limit parent-pos))
+         (min (min rpoint rlimit))
+         (max (max rpoint rlimit))
+         found)
+    (catch 'done
+      (js2-visit-ast
+       parent
+       (lambda (node _end-p)
+         (if (eq node parent)
+             t
+           (let ((pos (js2-node-pos node)) ;; Both relative values.
+                 (end (+ (js2-node-pos node) (js2-node-len node))))
+             (when (and (>= pos min) (<= end max)
+                        (if before (< pos rpoint) (> end rpoint)))
+               (setq found node))
+             (when (> end rpoint)
+               (throw 'done nil)))
+           nil))))
+    found))
+
+(defun js2-errors ()
+  "Return a list of errors found."
+  (and js2-mode-ast
+       (js2-ast-root-errors js2-mode-ast)))
+
+(defun js2-warnings ()
+  "Return a list of warnings found."
+  (and js2-mode-ast
+       (js2-ast-root-warnings js2-mode-ast)))
+
+(defun js2-have-errors-p ()
+  "Return non-nil if any parse errors or warnings were found."
+  (or (js2-errors) (js2-warnings)))
+
+(defun js2-errors-and-warnings ()
+  "Return a copy of the concatenated errors and warnings lists.
+They are appended:  first the errors, then the warnings.
+Entries are of the form (MSG BEG END)."
+  (when js2-mode-ast
+    (append (js2-ast-root-errors js2-mode-ast)
+            (copy-sequence (js2-ast-root-warnings js2-mode-ast)))))
+
+(defun js2-next-error (&optional arg reset)
+  "Move to next parse error.
+Typically invoked via \\[next-error].
+ARG is the number of errors, forward or backward, to move.
+RESET means start over from the beginning."
+  (interactive "p")
+  (if (not (or (js2-errors) (js2-warnings)))
+      (message "No errors")
+    (when reset
+      (goto-char (point-min)))
+    (let* ((errs (js2-errors-and-warnings))
+           (continue t)
+           (start (point))
+           (count (or arg 1))
+           (backward (cl-minusp count))
+           (sorter (if backward '> '<))
+           (stopper (if backward '< '>))
+           (count (abs count))
+           all-errs err)
+      ;; Sort by start position.
+      (setq errs (sort errs (lambda (e1 e2)
+                              (funcall sorter (cl-second e1) (cl-second e2))))
+            all-errs errs)
+      ;; Find nth error with pos > start.
+      (while (and errs continue)
+        (when (funcall stopper (cl-cadar errs) start)
+          (setq err (car errs))
+          (if (zerop (cl-decf count))
+              (setq continue nil)))
+        (setq errs (cdr errs)))
+      ;; Clear for `js2-echo-error'.
+      (message nil)
+      (if err
+          (goto-char (cl-second err))
+        ;; Wrap around to first error.
+        (goto-char (cl-second (car all-errs)))
+        ;; If we were already on it, echo msg again.
+        (if (= (point) start)
+            (js2-echo-error (point) (point)))))))
+
+(defun js2-down-mouse-3 ()
+  "Make right-click move the point to the click location.
+This makes right-click context menu operations a bit more intuitive.
+The point will not move if the region is active, however, to avoid
+destroying the region selection."
+  (interactive)
+  (when (and js2-move-point-on-right-click
+             (not mark-active))
+    (let ((e last-input-event))
+      (ignore-errors
+        (goto-char (cl-cadadr e))))))
+
+(defun js2-mode-create-imenu-index ()
+  "Return an alist for `imenu--index-alist'."
+  ;; This is built up in `js2-parse-record-imenu' during parsing.
+  (when js2-mode-ast
+    ;; if we have an ast but no recorder, they're requesting a rescan
+    (unless js2-imenu-recorder
+      (js2-reparse 'force))
+    (prog1
+        (js2-build-imenu-index)
+      (setq js2-imenu-recorder nil
+            js2-imenu-function-map nil))))
+
+(defun js2-mode-find-tag ()
+  "Replacement for `find-tag-default'.
+`find-tag-default' returns a ridiculous answer inside comments."
+  (let (beg end)
+    (save-excursion
+      (if (looking-at "\\_>")
+          (setq beg (progn (forward-symbol -1) (point))
+                end (progn (forward-symbol 1) (point)))
+        (setq beg (progn (forward-symbol 1) (point))
+              end (progn (forward-symbol -1) (point))))
+      (replace-regexp-in-string
+       "[\"']" ""
+       (buffer-substring-no-properties beg end)))))
+
+(defun js2-mode-forward-sibling ()
+  "Move to the end of the sibling following point in parent.
+Returns non-nil if successful, or nil if there was no following sibling."
+  (let* ((node (js2-node-at-point))
+         (parent (js2-mode-find-enclosing-fn node))
+         sib)
+    (when (setq sib (js2-node-find-child-after (point) parent))
+      (goto-char (+ (js2-node-abs-pos sib)
+                    (js2-node-len sib))))))
+
+(defun js2-mode-backward-sibling ()
+  "Move to the beginning of the sibling node preceding point in parent.
+Parent is defined as the enclosing script or function."
+  (let* ((node (js2-node-at-point))
+         (parent (js2-mode-find-enclosing-fn node))
+         sib)
+    (when (setq sib (js2-node-find-child-before (point) parent))
+      (goto-char (js2-node-abs-pos sib)))))
+
+(defun js2-beginning-of-defun (&optional arg)
+  "Go to line on which current function starts, and return t on success.
+If we're not in a function or already at the beginning of one, go
+to beginning of previous script-level element.
+With ARG N, do that N times. If N is negative, move forward."
+  (setq arg (or arg 1))
+  (if (cl-plusp arg)
+      (let ((parent (js2-node-parent-script-or-fn (js2-node-at-point))))
+        (when (cond
+               ((js2-function-node-p parent)
+                (goto-char (js2-node-abs-pos parent)))
+               (t
+                (js2-mode-backward-sibling)))
+          (if (> arg 1)
+              (js2-beginning-of-defun (1- arg))
+            t)))
+    (when (js2-end-of-defun)
+      (js2-beginning-of-defun (if (>= arg -1) 1 (1+ arg))))))
+
+(defun js2-end-of-defun ()
+  "Go to the char after the last position of the current function
+or script-level element."
+  (let* ((node (js2-node-at-point))
+         (parent (or (and (js2-function-node-p node) node)
+                     (js2-node-parent-script-or-fn node)))
+         script)
+    (unless (js2-function-node-p parent)
+      ;; Use current script-level node, or, if none, the next one.
+      (setq script (or parent node)
+            parent (js2-node-find-child-before (point) script))
+      (when (or (null parent)
+                (>= (point) (+ (js2-node-abs-pos parent)
+                               (js2-node-len parent))))
+        (setq parent (js2-node-find-child-after (point) script))))
+    (when parent
+      (goto-char (+ (js2-node-abs-pos parent)
+                    (js2-node-len parent))))))
+
+(defun js2-mark-defun (&optional allow-extend)
+  "Put mark at end of this function, point at beginning.
+The function marked is the one that contains point.
+
+Interactively, if this command is repeated,
+or (in Transient Mark mode) if the mark is active,
+it marks the next defun after the ones already marked."
+  (interactive "p")
+  (let (extended)
+    (when (and allow-extend
+               (or (and (eq last-command this-command) (mark t))
+                   (and transient-mark-mode mark-active)))
+      (let ((sib (save-excursion
+                   (goto-char (mark))
+                   (if (js2-mode-forward-sibling)
+                       (point)))))
+        (if sib
+            (progn
+              (set-mark sib)
+              (setq extended t))
+          ;; no more siblings - try extending to enclosing node
+          (goto-char (mark t)))))
+   (when (not extended)
+     (let ((node (js2-node-at-point (point) t)) ; skip comments
+           ast fn stmt parent beg end)
+       (when (js2-ast-root-p node)
+         (setq ast node
+               node (or (js2-node-find-child-after (point) node)
+                        (js2-node-find-child-before (point) node))))
+       ;; only mark whole buffer if we can't find any children
+       (if (null node)
+           (setq node ast))
+       (if (js2-function-node-p node)
+           (setq parent node)
+         (setq fn (js2-mode-find-enclosing-fn node)
+               stmt (if (or (null fn)
+                            (js2-ast-root-p fn))
+                        (js2-mode-find-first-stmt node))
+               parent (or stmt fn)))
+       (setq beg (js2-node-abs-pos parent)
+             end (+ beg (js2-node-len parent)))
+       (push-mark beg)
+       (goto-char end)
+       (exchange-point-and-mark)))))
+
+(defun js2-narrow-to-defun ()
+  "Narrow to the function enclosing point."
+  (interactive)
+  (let* ((node (js2-node-at-point (point) t))  ; skip comments
+         (fn (if (js2-script-node-p node)
+                 node
+               (js2-mode-find-enclosing-fn node)))
+         (beg (js2-node-abs-pos fn)))
+    (unless (js2-ast-root-p fn)
+      (narrow-to-region beg (+ beg (js2-node-len fn))))))
+
+(defun js2-jump-to-definition (&optional arg)
+  "Jump to the definition of an object's property, variable or function."
+  (interactive "P")
+  (ring-insert find-tag-marker-ring (point-marker))
+  (let* ((node (js2-node-at-point))
+         (parent (js2-node-parent node))
+         (names (if (js2-prop-get-node-p parent)
+                    (reverse (let ((temp (js2-compute-nested-prop-get parent)))
+                               (cl-loop for n in temp
+                                        with result = '()
+                                        do (push n result)
+                                        until (equal node n)
+                                        finally return result)))))
+         node-init)
+    (unless (and (js2-name-node-p node)
+                 (not (js2-var-init-node-p parent))
+                 (not (js2-function-node-p parent)))
+      (error "Node is not a supported jump node"))
+    (push (or (and names (pop names))
+              (unless (and (js2-object-prop-node-p parent)
+                           (eq node (js2-object-prop-node-left parent)))
+                node)) names)
+    (setq node-init (js2-search-scope node names))
+
+    ;; todo: display list of results in buffer
+    ;; todo: group found references by buffer
+    (unless node-init
+      (switch-to-buffer
+       (catch 'found
+         (unless arg
+           (mapc (lambda (b)
+                   (with-current-buffer b
+                     (when (derived-mode-p 'js2-mode)
+                       (setq node-init (js2-search-scope js2-mode-ast names))
+                       (if node-init
+                           (throw 'found b)))))
+                 (buffer-list)))
+         nil)))
+    (setq node-init (if (listp node-init) (car node-init) node-init))
+    (unless node-init
+      (pop-tag-mark)
+      (error "No jump location found"))
+    (goto-char (js2-node-abs-pos node-init))))
+
+(defun js2-search-object (node name-node)
+  "Check if object NODE contains element with NAME-NODE."
+  (cl-assert (js2-object-node-p node))
+  ;; Only support name-node and nodes for the time being
+  (cl-loop for elem in (js2-object-node-elems node)
+           for left = (js2-object-prop-node-left elem)
+           if (or (and (js2-name-node-p left)
+                       (equal (js2-name-node-name name-node)
+                              (js2-name-node-name left)))
+                  (and (js2-string-node-p left)
+                       (string= (js2-name-node-name name-node)
+                                (js2-string-node-value left))))
+           return elem))
+
+(defun js2-search-object-for-prop (object prop-names)
+  "Return node in OBJECT that matches PROP-NAMES or nil.
+PROP-NAMES is a list of values representing a path to a value in OBJECT.
+i.e. ('name' 'value') = {name : { value: 3}}"
+  (let (node
+        (temp-object object)
+        (temp t) ;temporay node
+        (names prop-names))
+    (while (and temp names (js2-object-node-p temp-object))
+      (setq temp (js2-search-object temp-object (pop names)))
+      (and (setq node temp)
+         (setq temp-object (js2-object-prop-node-right temp))))
+    (unless names node)))
+
+(defun js2-search-scope (node names)
+  "Searches NODE scope for jump location matching NAMES.
+NAMES is a list of property values to search for. For functions
+and variables NAMES will contain one element."
+  (let (node-init
+        (val (js2-name-node-name (car names))))
+    (setq node-init (js2-get-symbol-declaration node val))
+
+    (when (> (length names) 1)
+
+      ;; Check var declarations
+      (when (and node-init (string= val (js2-name-node-name node-init)))
+        (let ((parent (js2-node-parent node-init))
+              (temp-names names))
+          (pop temp-names) ;; First element is var name
+          (setq node-init (when (js2-var-init-node-p parent)
+                            (js2-search-object-for-prop
+                             (js2-var-init-node-initializer parent)
+                             temp-names)))))
+
+      ;; Check all assign nodes
+      (js2-visit-ast
+       js2-mode-ast
+       (lambda (node endp)
+         (unless endp
+           (if (js2-assign-node-p node)
+               (let ((left (js2-assign-node-left node))
+                     (right (js2-assign-node-right node))
+                     (temp-names names))
+                 (when (js2-prop-get-node-p left)
+                   (let* ((prop-list (js2-compute-nested-prop-get left))
+                          (found (cl-loop for prop in prop-list
+                                          until (not (string= (js2-name-node-name
+                                                               (pop temp-names))
+                                                              (js2-name-node-name prop)))
+                                          if (not temp-names) return prop))
+                          (found-node (or found
+                                          (when (js2-object-node-p right)
+                                            (js2-search-object-for-prop right
+                                                                        temp-names)))))
+                     (if found-node (push found-node node-init))))))
+           t))))
+    node-init))
+
+(defun js2-get-symbol-declaration (node name)
+  "Find scope for NAME from NODE."
+  (let ((scope (js2-get-defining-scope
+          (or (js2-node-get-enclosing-scope node)
+             node) name)))
+    (if scope (js2-symbol-ast-node (js2-scope-get-symbol scope name)))))
+
+(provide 'js2-mode)
+
+;;; js2-mode.el ends here
diff --git a/emacs.d/elpa/js2-mode-20160109.148/js2-old-indent.el b/emacs.d/elpa/js2-mode-20160109.148/js2-old-indent.el
new file mode 100644
index 0000000..82a00b4
--- /dev/null
+++ b/emacs.d/elpa/js2-mode-20160109.148/js2-old-indent.el
@@ -0,0 +1,709 @@
+;;; js2-old-indent.el --- Indentation code kept for compatibility
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; All features of this indentation code have been ported to Emacs's
+;; built-in `js-mode' by now, so we derive from it.  An older
+;; commentary follows.
+
+;; This code is kept for Emacs 24.5 and ealier.
+
+;; This indenter is based on Karl Landström's "javascript.el" indenter.
+;; Karl cleverly deduces that the desired indentation level is often a
+;; function of paren/bracket/brace nesting depth, which can be determined
+;; quickly via the built-in `parse-partial-sexp' function.  His indenter
+;; then does some equally clever checks to see if we're in the context of a
+;; substatement of a possibly braceless statement keyword such as if, while,
+;; or finally.  This approach yields pretty good results.
+
+;; The indenter is often "wrong", however, and needs to be overridden.
+;; The right long-term solution is probably to emulate (or integrate
+;; with) cc-engine, but it's a nontrivial amount of coding.  Even when a
+;; parse tree from `js2-parse' is present, which is not true at the
+;; moment the user is typing, computing indentation is still thousands
+;; of lines of code to handle every possible syntactic edge case.
+
+;; In the meantime, the compromise solution is that we offer a "bounce
+;; indenter", configured with `js2-bounce-indent-p', which cycles the
+;; current line indent among various likely guess points.  This approach
+;; is far from perfect, but should at least make it slightly easier to
+;; move the line towards its desired indentation when manually
+;; overriding Karl's heuristic nesting guesser.
+
+;; I've made miscellaneous tweaks to Karl's code to handle some Ecma
+;; extensions such as `let' and Array comprehensions.  Major kudos to
+;; Karl for coming up with the initial approach, which packs a lot of
+;; punch for so little code. -- Steve
+
+;;; Code:
+
+(require 'sgml-mode)
+
+(defvar js2-language-version)
+
+(declare-function js2-mark-safe-local "js2-mode")
+(declare-function js2-backward-sws "js2-mode")
+(declare-function js2-forward-sws "js2-mode")
+(declare-function js2-same-line "js2-mode")
+
+(defcustom js2-basic-offset (if (and (boundp 'c-basic-offset)
+                                     (numberp c-basic-offset))
+                                c-basic-offset
+                              4)
+  "Number of spaces to indent nested statements.
+Similar to `c-basic-offset'."
+  :group 'js2-mode
+  :safe 'integerp
+  :type 'integer)
+
+(defcustom js2-pretty-multiline-declarations t
+  "Non-nil to line up multiline declarations vertically:
+
+  var a = 10,
+      b = 20,
+      c = 30;
+
+If the value is t, and the first assigned value in the
+declaration is a function/array/object literal spanning several
+lines, it won't be indented additionally:
+
+  var o = {                   var bar = 2,
+    foo: 3          vs.           o = {
+  },                                foo: 3
+      bar = 2;                    };
+
+If the value is `all', it will always be indented additionally:
+
+  var o = {
+        foo: 3
+      };
+
+  var o = {
+        foo: 3
+      },
+      bar = 2;
+
+If the value is `dynamic', it will be indented additionally only
+if the declaration contains more than one variable:
+
+  var o = {
+    foo: 3
+  };
+
+  var o = {
+        foo: 3
+      },
+      bar = 2;"
+  :group 'js2-mode
+  :safe  'symbolp
+  :type 'symbol)
+
+(defcustom js2-indent-switch-body nil
+  "When nil, case labels are indented on the same level as the
+containing switch statement.  Otherwise, all lines inside
+switch statement body are indented one additional level."
+  :type 'boolean
+  :safe 'booleanp
+  :group 'js2-mode)
+
+(defconst js2-possibly-braceless-keywords-re
+  (concat "else[ \t]+if\\|for[ \t]+each\\|"
+          (regexp-opt '("catch" "do" "else" "finally" "for" "if"
+                        "try" "while" "with" "let")))
+  "Regular expression matching keywords that are optionally
+followed by an opening brace.")
+
+(defconst js2-indent-operator-re
+  (concat "[-+*/%<>&^|?:.]\\([^-+*/]\\|$\\)\\|!?=\\|"
+          (regexp-opt '("in" "instanceof") 'words))
+  "Regular expression matching operators that affect indentation
+of continued expressions.")
+
+(defconst js2-declaration-keyword-re
+  (regexp-opt '("var" "let" "const") 'words)
+  "Regular expression matching variable declaration keywords.")
+
+(defun js2-re-search-forward-inner (regexp &optional bound count)
+  "Auxiliary function for `js2-re-search-forward'."
+  (let (parse saved-point)
+    (while (> count 0)
+      (re-search-forward regexp bound)
+      (setq parse (if saved-point
+                      (parse-partial-sexp saved-point (point))
+                    (syntax-ppss (point))))
+      (cond ((nth 3 parse)
+             (re-search-forward
+              (concat "\\(\\=\\|[^\\]\\|^\\)" (string (nth 3 parse)))
+              (save-excursion (end-of-line) (point)) t))
+            ((nth 7 parse)
+             (forward-line))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
+             (re-search-forward "\\*/"))
+            (t
+             (setq count (1- count))))
+      (setq saved-point (point))))
+  (point))
+
+(defun js2-re-search-forward (regexp &optional bound noerror count)
+  "Search forward but ignore strings and comments.
+Invokes `re-search-forward' but treats the buffer as if strings
+and comments have been removed."
+  (let ((saved-point (point)))
+    (condition-case err
+        (cond ((null count)
+               (js2-re-search-forward-inner regexp bound 1))
+              ((< count 0)
+               (js2-re-search-backward-inner regexp bound (- count)))
+              ((> count 0)
+               (js2-re-search-forward-inner regexp bound count)))
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+(defun js2-re-search-backward-inner (regexp &optional bound count)
+  "Auxiliary function for `js2-re-search-backward'."
+  (let (parse)
+    (while (> count 0)
+      (re-search-backward regexp bound)
+      (setq parse (syntax-ppss (point)))
+      (cond ((nth 3 parse)
+             (re-search-backward
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse)))
+              (line-beginning-position) t))
+            ((nth 7 parse)
+             (goto-char (nth 8 parse)))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
+             (re-search-backward "/\\*"))
+            (t
+             (setq count (1- count))))))
+  (point))
+
+(defun js2-re-search-backward (regexp &optional bound noerror count)
+  "Search backward but ignore strings and comments.
+Invokes `re-search-backward' but treats the buffer as if strings
+and comments have been removed."
+  (let ((saved-point (point)))
+    (condition-case err
+        (cond ((null count)
+               (js2-re-search-backward-inner regexp bound 1))
+              ((< count 0)
+               (js2-re-search-forward-inner regexp bound (- count)))
+              ((> count 0)
+               (js2-re-search-backward-inner regexp bound count)))
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+(defun js2-looking-at-operator-p ()
+  "Return non-nil if text after point is a non-comma operator."
+  (defvar js2-mode-identifier-re)
+  (and (looking-at js2-indent-operator-re)
+       (or (not (eq (char-after) ?:))
+           (save-excursion
+             (and (js2-re-search-backward "[?:{]\\|\\_<case\\_>" nil t)
+                  (eq (char-after) ??))))
+       (not (and
+             (eq (char-after) ?*)
+             (looking-at (concat "\\* *" js2-mode-identifier-re " *("))
+             (save-excursion
+               (goto-char (1- (match-end 0)))
+               (let (forward-sexp-function) (forward-sexp))
+               (js2-forward-sws)
+               (eq (char-after) ?{))))))
+
+(defun js2-continued-expression-p ()
+  "Return non-nil if the current line continues an expression."
+  (save-excursion
+    (back-to-indentation)
+    (or (js2-looking-at-operator-p)
+        (when (catch 'found
+                (while (and (re-search-backward "\n" nil t)
+                            (let ((state (syntax-ppss)))
+                              (when (nth 4 state)
+                                (goto-char (nth 8 state))) ;; skip comments
+                              (skip-chars-backward " \t")
+                              (if (bolp)
+                                  t
+                                (throw 'found t))))))
+          (backward-char)
+          (when (js2-looking-at-operator-p)
+            (backward-char)
+            (not (looking-at "\\*\\|\\+\\+\\|--\\|/[/*]")))))))
+
+(defun js2-end-of-do-while-loop-p ()
+  "Return non-nil if word after point is `while' of a do-while
+statement, else returns nil. A braceless do-while statement
+spanning several lines requires that the start of the loop is
+indented to the same column as the current line."
+  (interactive)
+  (save-excursion
+    (when (looking-at "\\s-*\\_<while\\_>")
+      (if (save-excursion
+            (skip-chars-backward "[ \t\n]*}")
+            (looking-at "[ \t\n]*}"))
+          (save-excursion
+            (backward-list) (backward-word 1) (looking-at "\\_<do\\_>"))
+        (js2-re-search-backward "\\_<do\\_>" (point-at-bol) t)
+        (or (looking-at "\\_<do\\_>")
+            (let ((saved-indent (current-indentation)))
+              (while (and (js2-re-search-backward "^[ \t]*\\_<" nil t)
+                          (/= (current-indentation) saved-indent)))
+              (and (looking-at "[ \t]*\\_<do\\_>")
+                   (not (js2-re-search-forward
+                         "\\_<while\\_>" (point-at-eol) t))
+                   (= (current-indentation) saved-indent))))))))
+
+(defun js2-multiline-decl-indentation ()
+  "Return the declaration indentation column if the current line belongs
+to a multiline declaration statement.  See `js2-pretty-multiline-declarations'."
+  (let (forward-sexp-function ; use Lisp version
+        at-opening-bracket)
+    (save-excursion
+      (back-to-indentation)
+      (when (not (looking-at js2-declaration-keyword-re))
+        (when (looking-at js2-indent-operator-re)
+          (goto-char (match-end 0))) ; continued expressions are ok
+        (while (and (not at-opening-bracket)
+                    (not (bobp))
+                    (let ((pos (point)))
+                      (save-excursion
+                        (js2-backward-sws)
+                        (or (eq (char-before) ?,)
+                            (and (not (eq (char-before) ?\;))
+                                 (prog2 (skip-syntax-backward ".")
+                                     (looking-at js2-indent-operator-re)
+                                   (js2-backward-sws))
+                                 (not (eq (char-before) ?\;)))
+                            (js2-same-line pos)))))
+          (condition-case _
+              (backward-sexp)
+            (scan-error (setq at-opening-bracket t))))
+        (when (looking-at js2-declaration-keyword-re)
+          (goto-char (match-end 0))
+          (1+ (current-column)))))))
+
+(defun js2-ctrl-statement-indentation ()
+  "Return the proper indentation of current line if it is a control statement.
+Returns an indentation if this line starts the body of a control
+statement without braces, else returns nil."
+  (let (forward-sexp-function)
+    (save-excursion
+      (back-to-indentation)
+      (when (and (not (js2-same-line (point-min)))
+                 (not (looking-at "{"))
+                 (js2-re-search-backward "[[:graph:]]" nil t)
+                 (not (looking-at "[{([]"))
+                 (progn
+                   (forward-char)
+                   (when (= (char-before) ?\))
+                     ;; scan-sexps sometimes throws an error
+                     (ignore-errors (backward-sexp))
+                     (skip-chars-backward " \t" (point-at-bol)))
+                   (let ((pt (point)))
+                     (back-to-indentation)
+                     (when (looking-at "}[ \t]*")
+                       (goto-char (match-end 0)))
+                     (and (looking-at js2-possibly-braceless-keywords-re)
+                          (= (match-end 0) pt)
+                          (not (js2-end-of-do-while-loop-p))))))
+        (+ (current-indentation) js2-basic-offset)))))
+
+(defun js2-indent-in-array-comp (parse-status)
+  "Return non-nil if we think we're in an array comprehension.
+In particular, return the buffer position of the first `for' kwd."
+  (let ((bracket (nth 1 parse-status))
+        (end (point)))
+    (when bracket
+      (save-excursion
+        (goto-char bracket)
+        (when (looking-at "\\[")
+          (forward-char 1)
+          (js2-forward-sws)
+          (if (looking-at "[[{]")
+              (let (forward-sexp-function) ; use Lisp version
+                (forward-sexp)             ; skip destructuring form
+                (js2-forward-sws)
+                (if (and (/= (char-after) ?,) ; regular array
+                         (looking-at "for"))
+                    (match-beginning 0)))
+            ;; to skip arbitrary expressions we need the parser,
+            ;; so we'll just guess at it.
+            (if (and (> end (point)) ; not empty literal
+                     (re-search-forward "[^,]]* \\(for\\) " end t)
+                     ;; not inside comment or string literal
+                     (let ((state (parse-partial-sexp bracket (point))))
+                       (not (or (nth 3 state) (nth 4 state)))))
+                (match-beginning 1))))))))
+
+(defun js2-array-comp-indentation (parse-status for-kwd)
+  (if (js2-same-line for-kwd)
+      ;; first continuation line
+      (save-excursion
+        (goto-char (nth 1 parse-status))
+        (forward-char 1)
+        (skip-chars-forward " \t")
+        (current-column))
+    (save-excursion
+      (goto-char for-kwd)
+      (current-column))))
+
+(defun js2-maybe-goto-declaration-keyword-end (bracket)
+  "Helper function for `js2-proper-indentation'.
+Depending on the value of `js2-pretty-multiline-declarations',
+move point to the end of a variable declaration keyword so that
+indentation is aligned to that column."
+  (cond
+   ((eq js2-pretty-multiline-declarations 'all)
+    (when (looking-at js2-declaration-keyword-re)
+      (goto-char (1+ (match-end 0)))))
+   ((eq js2-pretty-multiline-declarations 'dynamic)
+    (let (declaration-keyword-end
+          at-closing-bracket-p
+          comma-p)
+      (when (looking-at js2-declaration-keyword-re)
+        ;; Preserve the match data lest it somehow be overridden.
+        (setq declaration-keyword-end (match-end 0))
+        (save-excursion
+          (goto-char bracket)
+          (setq at-closing-bracket-p
+                ;; Handle scan errors gracefully.
+                (condition-case nil
+                    (progn
+                      ;; Use the regular `forward-sexp-function' because the
+                      ;; normal one for this mode uses the AST.
+                      (let (forward-sexp-function)
+                        (forward-sexp))
+                      t)
+                  (error nil)))
+          (when at-closing-bracket-p
+            (js2-forward-sws)
+            (setq comma-p (looking-at-p ","))))
+        (when comma-p
+          (goto-char (1+ declaration-keyword-end))))))))
+
+(cl-defun js2-proper-indentation (parse-status)
+  "Return the proper indentation for the current line."
+  (save-excursion
+    (back-to-indentation)
+    (when (nth 4 parse-status)
+      (cl-return-from js2-proper-indentation (js2--comment-indent parse-status)))
+    (let* ((at-closing-bracket (looking-at "[]})]"))
+           (same-indent-p (or at-closing-bracket
+                              (looking-at "\\_<case\\_>[^:]")
+                              (and (looking-at "\\_<default:")
+                                   (save-excursion
+                                     (js2-backward-sws)
+                                     (not (memq (char-before) '(?, ?{)))))))
+           (continued-expr-p (js2-continued-expression-p))
+           (declaration-indent (and js2-pretty-multiline-declarations
+                                    (js2-multiline-decl-indentation)))
+           (bracket (nth 1 parse-status))
+           beg indent)
+      (cond
+       ;; indent array comprehension continuation lines specially
+       ((and bracket
+             (>= js2-language-version 170)
+             (not (js2-same-line bracket))
+             (setq beg (js2-indent-in-array-comp parse-status))
+             (>= (point) (save-excursion
+                           (goto-char beg)
+                           (point-at-bol)))) ; at or after first loop?
+        (js2-array-comp-indentation parse-status beg))
+
+       ((js2-ctrl-statement-indentation))
+
+       ((and declaration-indent continued-expr-p)
+        (+ declaration-indent js2-basic-offset))
+
+       (declaration-indent)
+
+       (bracket
+        (goto-char bracket)
+        (cond
+         ((looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
+          (when (save-excursion (skip-chars-backward " \t\n)")
+                                (looking-at ")"))
+            (backward-list))
+          (back-to-indentation)
+          (js2-maybe-goto-declaration-keyword-end bracket)
+          (setq indent
+                (cond (same-indent-p
+                       (current-column))
+                      (continued-expr-p
+                       (+ (current-column) (* 2 js2-basic-offset)))
+                      (t
+                       (+ (current-column) js2-basic-offset))))
+          (if (and js2-indent-switch-body
+                   (not at-closing-bracket)
+                   (looking-at "\\_<switch\\_>"))
+              (+ indent js2-basic-offset)
+            indent))
+         (t
+          (unless same-indent-p
+            (forward-char)
+            (skip-chars-forward " \t"))
+          (current-column))))
+
+       (continued-expr-p js2-basic-offset)
+
+       (t 0)))))
+
+(defun js2--comment-indent (parse-status)
+  "Indentation inside a multi-line block comment continuation line."
+  (save-excursion
+    (goto-char (nth 8 parse-status))
+    (if (looking-at "/\\*")
+        (+ 1 (current-column))
+      0)))
+
+(defun js2-indent-line (&optional bounce-backwards)
+  "Indent the current line as JavaScript source text."
+  (interactive)
+  (let (parse-status offset
+        ;; Don't whine about errors/warnings when we're indenting.
+        ;; This has to be set before calling parse-partial-sexp below.
+        (inhibit-point-motion-hooks t))
+    (setq parse-status (save-excursion
+                         (syntax-ppss (point-at-bol)))
+          offset (- (point) (save-excursion
+                              (back-to-indentation)
+                              (point))))
+    ;; Don't touch multiline strings.
+    (unless (nth 3 parse-status)
+      (indent-line-to (js2-proper-indentation parse-status))
+      (when (cl-plusp offset)
+        (forward-char offset)))))
+
+;;; JSX Indentation
+
+;; The following JSX indentation code is copied basically verbatim from js.el at
+;; 958da7f, except that the prefixes on the functions/variables are changed.
+
+(defsubst js2--jsx-find-before-tag ()
+  "Find where JSX starts.
+
+Assume JSX appears in the following instances:
+- Inside parentheses, when returned or as the first argument
+  to a function, and after a newline
+- When assigned to variables or object properties, but only
+  on a single line
+- As the N+1th argument to a function
+
+This is an optimized version of (re-search-backward \"[(,]\n\"
+nil t), except set point to the end of the match.  This logic
+executes up to the number of lines in the file, so it should be
+really fast to reduce that impact."
+  (let (pos)
+    (while (and (> (point) (point-min))
+                (not (progn
+                       (end-of-line 0)
+                       (when (or (eq (char-before) 40)   ; (
+                                 (eq (char-before) 44))  ; ,
+                         (setq pos (1- (point))))))))
+    pos))
+
+(defconst js2--jsx-end-tag-re
+  (concat "</" sgml-name-re ">\\|/>")
+  "Find the end of a JSX element.")
+
+(defconst js2--jsx-after-tag-re "[),]"
+  "Find where JSX ends.
+This complements the assumption of where JSX appears from
+`js--jsx-before-tag-re', which see.")
+
+(defun js2--jsx-indented-element-p ()
+  "Determine if/how the current line should be indented as JSX.
+
+Return `first' for the first JSXElement on its own line.
+Return `nth' for subsequent lines of the first JSXElement.
+Return `expression' for an embedded JS expression.
+Return `after' for anything after the last JSXElement.
+Return nil for non-JSX lines.
+
+Currently, JSX indentation supports the following styles:
+
+- Single-line elements (indented like normal JS):
+
+  var element = <div></div>;
+
+- Multi-line elements (enclosed in parentheses):
+
+  function () {
+    return (
+      <div>
+        <div></div>
+      </div>
+    );
+ }
+
+- Function arguments:
+
+  React.render(
+    <div></div>,
+    document.querySelector('.root')
+  );"
+  (let ((current-pos (point))
+        (current-line (line-number-at-pos))
+        last-pos
+        before-tag-pos before-tag-line
+        tag-start-pos tag-start-line
+        tag-end-pos tag-end-line
+        after-tag-line
+        parens paren type)
+    (save-excursion
+      (and
+       ;; Determine if we're inside a jsx element
+       (progn
+         (end-of-line)
+         (while (and (not tag-start-pos)
+                     (setq last-pos (js2--jsx-find-before-tag)))
+           (while (forward-comment 1))
+           (when (= (char-after) 60) ; <
+             (setq before-tag-pos last-pos
+                   tag-start-pos (point)))
+           (goto-char last-pos))
+         tag-start-pos)
+       (progn
+         (setq before-tag-line (line-number-at-pos before-tag-pos)
+               tag-start-line (line-number-at-pos tag-start-pos))
+         (and
+          ;; A "before" line which also starts an element begins with js, so
+          ;; indent it like js
+          (> current-line before-tag-line)
+          ;; Only indent the jsx lines like jsx
+          (>= current-line tag-start-line)))
+       (cond
+        ;; Analyze bounds if there are any
+        ((progn
+           (while (and (not tag-end-pos)
+                       (setq last-pos (re-search-forward js2--jsx-end-tag-re nil t)))
+             (while (forward-comment 1))
+             (when (looking-at js2--jsx-after-tag-re)
+               (setq tag-end-pos last-pos)))
+           tag-end-pos)
+         (setq tag-end-line (line-number-at-pos tag-end-pos)
+               after-tag-line (line-number-at-pos after-tag-line))
+         (or (and
+              ;; Ensure we're actually within the bounds of the jsx
+              (<= current-line tag-end-line)
+              ;; An "after" line which does not end an element begins with
+              ;; js, so indent it like js
+              (<= current-line after-tag-line))
+             (and
+              ;; Handle another case where there could be e.g. comments after
+              ;; the element
+              (> current-line tag-end-line)
+              (< current-line after-tag-line)
+              (setq type 'after))))
+        ;; They may not be any bounds (yet)
+        (t))
+       ;; Check if we're inside an embedded multi-line js expression
+       (cond
+        ((not type)
+         (goto-char current-pos)
+         (end-of-line)
+         (setq parens (nth 9 (syntax-ppss)))
+         (while (and parens (not type))
+           (setq paren (car parens))
+           (cond
+            ((and (>= paren tag-start-pos)
+                  ;; Curly bracket indicates the start of an embedded expression
+                  (= (char-after paren) 123) ; {
+                  ;; The first line of the expression is indented like sgml
+                  (> current-line (line-number-at-pos paren))
+                  ;; Check if within a closing curly bracket (if any)
+                  ;; (exclusive, as the closing bracket is indented like sgml)
+                  (cond
+                   ((progn
+                      (goto-char paren)
+                      (ignore-errors (let (forward-sexp-function)
+                                       (forward-sexp))))
+                    (< current-line (line-number-at-pos)))
+                   (t)))
+             ;; Indicate this guy will be indented specially
+             (setq type 'expression))
+            (t (setq parens (cdr parens)))))
+         t)
+        (t))
+       (cond
+        (type)
+        ;; Indent the first jsx thing like js so we can indent future jsx things
+        ;; like sgml relative to the first thing
+        ((= current-line tag-start-line) 'first)
+        ('nth))))))
+
+(defmacro js2--as-sgml (&rest body)
+  "Execute BODY as if in sgml-mode."
+  `(with-syntax-table sgml-mode-syntax-table
+     (let (forward-sexp-function
+           parse-sexp-lookup-properties)
+       ,@body)))
+
+(defun js2--expression-in-sgml-indent-line ()
+  "Indent the current line as JavaScript or SGML (whichever is farther)."
+  (let* (indent-col
+         (savep (point))
+         ;; Don't whine about errors/warnings when we're indenting.
+         ;; This has to be set before calling parse-partial-sexp below.
+         (inhibit-point-motion-hooks t)
+         (parse-status (save-excursion
+                         (syntax-ppss (point-at-bol)))))
+    ;; Don't touch multiline strings.
+    (unless (nth 3 parse-status)
+      (setq indent-col (save-excursion
+                         (back-to-indentation)
+                         (if (>= (point) savep) (setq savep nil))
+                         (js2--as-sgml (sgml-calculate-indent))))
+      (if (null indent-col)
+          'noindent
+        ;; Use whichever indentation column is greater, such that the sgml
+        ;; column is effectively a minimum
+        (setq indent-col (max (js2-proper-indentation parse-status)
+                              (+ indent-col js2-basic-offset)))
+        (if savep
+            (save-excursion (indent-line-to indent-col))
+          (indent-line-to indent-col))))))
+
+(defun js2-jsx-indent-line ()
+  "Indent the current line as JSX (with SGML offsets).
+i.e., customize JSX element indentation with `sgml-basic-offset'
+et al."
+  (interactive)
+  (let ((indentation-type (js2--jsx-indented-element-p)))
+    (cond
+     ((eq indentation-type 'expression)
+      (js2--expression-in-sgml-indent-line))
+     ((or (eq indentation-type 'first)
+          (eq indentation-type 'after))
+      ;; Don't treat this first thing as a continued expression (often a "<" or
+      ;; ">" causes this misinterpretation)
+      (cl-letf (((symbol-function #'js2-continued-expression-p) 'ignore))
+        (js2-indent-line)))
+     ((eq indentation-type 'nth)
+      (js2--as-sgml (sgml-indent-line)))
+     (t (js2-indent-line)))))
+
+(provide 'js2-old-indent)
+
+;;; js2-old-indent.el ends here
diff --git a/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode-autoloads.el b/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode-autoloads.el
new file mode 100644
index 0000000..b5b3a18
--- /dev/null
+++ b/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode-autoloads.el
@@ -0,0 +1,36 @@
+;;; less-css-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "less-css-mode" "less-css-mode.el" (22139 31303
+;;;;;;  0 0))
+;;; Generated autoloads from less-css-mode.el
+
+(autoload 'less-css-compile "less-css-mode" "\
+Compiles the current buffer to css using `less-css-lessc-command'.
+
+\(fn)" t nil)
+
+(autoload 'less-css-mode "less-css-mode" "\
+Major mode for editing LESS files, http://lesscss.org/
+Special commands:
+\\{less-css-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.less\\'" . less-css-mode))
+
+;;;***
+
+;;;### (autoloads nil nil ("less-css-mode-pkg.el") (22139 31303 698300
+;;;;;;  0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; less-css-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode-pkg.el b/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode-pkg.el
new file mode 100644
index 0000000..7739208
--- /dev/null
+++ b/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "less-css-mode" "20150511.319" "Major mode for editing LESS CSS files (lesscss.org)" 'nil :url "https://github.com/purcell/less-css-mode" :keywords '("less" "css" "mode"))
diff --git a/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode.el b/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode.el
new file mode 100644
index 0000000..e32ae36
--- /dev/null
+++ b/emacs.d/elpa/less-css-mode-20150511.319/less-css-mode.el
@@ -0,0 +1,249 @@
+;;; less-css-mode.el --- Major mode for editing LESS CSS files (lesscss.org)
+;;
+;; Copyright (C) 2011-2014 Steve Purcell
+;;
+;; Author: Steve Purcell <steve@sanityinc.com>
+;; URL: https://github.com/purcell/less-css-mode
+;; Package-Version: 20150511.319
+;; Keywords: less css mode
+;; Version: DEV
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+;;
+;;; Commentary:
+;;
+;; This mode provides syntax highlighting for LESS CSS files, plus
+;; optional support for compilation of .less files to .css files at
+;; the time they are saved: use `less-css-compile-at-save' to enable
+;; this.
+;;
+;; Command line utility "lessc" is required if setting
+;; `less-css-compile-at-save' to t.  To install "lessc" using the
+;; Node.js package manager, run "npm install less"
+;;
+;; Also make sure the "lessc" executable is in emacs' PATH, example:
+;; (setq exec-path (cons (expand-file-name "~/.gem/ruby/1.8/bin") exec-path))
+;; or customize `less-css-lessc-command' to point to your "lessc" executable.
+;;
+;; We target lessc >= 1.4.0, and thus use the `--no-color' flag by
+;; default.  You may want to adjust `less-css-lessc-options' for
+;; compatibility with older versions.
+;;
+;; `less-css-mode' is derived from `css-mode', and indentation of
+;; nested blocks may not work correctly with versions of `css-mode'
+;; other than that bundled with recent Emacs.
+;;
+;; You can specify per-file values for `less-css-compile-at-save',
+;; `less-css-output-file-name' or `less-css-output-directory' using a
+;; variables header at the top of your .less file, e.g.:
+;;
+;; // -*- less-css-compile-at-save: t; less-css-output-directory: "../css" -*-
+;;
+;; Alternatively, you can use directory local variables to set the
+;; default value of `less-css-output-directory' for your project.
+;;
+;; In the case of files which are included in other .less files, you
+;; may want to trigger the compilation of a "master" .less file on
+;; save: you can accomplish this with `less-css-input-file-name',
+;; which is probably best set using directory local variables.
+;;
+;; If you don't need CSS output but would like to be warned of any
+;; syntax errors in your .less source, consider using `flymake-less':
+;; https://github.com/purcell/flymake-less
+;;
+;;; Credits
+;;
+;; The original code for this mode was, in large part, written using
+;; Anton Johansson's scss-mode as a template -- thanks Anton!
+;; https://github.com/antonj
+;;
+;;; Code:
+
+(require 'derived)
+(require 'compile)
+
+;; There are at least three css-mode.el implementations, but we need
+;; the right one in order to work as expected, not the versions by
+;; Landström or Garshol
+
+(require 'css-mode)
+(unless (or (boundp 'css-navigation-syntax-table)
+            (functionp 'css-smie-rules))
+  (error "Wrong css-mode.el: please use the version by Stefan Monnier, bundled with Emacs >= 23"))
+
+(defgroup less-css nil
+  "Less-css mode"
+  :prefix "less-css-"
+  :group 'css)
+
+(defcustom less-css-lessc-command "lessc"
+  "Command used to compile LESS files.
+Should be lessc or the complete path to your lessc executable,
+  e.g.: \"~/.gem/ruby/1.8/bin/lessc\""
+  :type 'file
+  :group 'less-css)
+(put 'less-css-lessc-command 'safe-local-variable t)
+
+(defcustom less-css-compile-at-save nil
+  "If non-nil, the LESS buffers will be compiled to CSS after each save."
+  :type 'boolean
+  :group 'less-css)
+(put 'less-css-compile-at-save 'safe-local-variable t)
+
+(defcustom less-css-lessc-options '("--no-color")
+  "Command line options for less executable.
+
+Use \"-x\" to minify output."
+  :type '(repeat string)
+  :group 'less-css)
+(put 'less-css-compile-at-save 'safe-local-variable t)
+
+(defvar less-css-output-directory nil
+  "Directory in which to save CSS, or nil to use the LESS file's directory.
+
+This path is expanded relative to the directory of the LESS file
+using `expand-file-name', so both relative and absolute paths
+will work as expected.")
+
+(make-variable-buffer-local 'less-css-output-directory)
+
+(defvar less-css-output-file-name nil
+  "File name in which to save CSS, or nil to use <name>.css for <name>.less.
+
+This can be also be set to a full path, or a relative path.  If
+the path is relative, it will be relative to the value of
+`less-css-output-dir', if set, or the current directory by
+default.")
+
+(make-variable-buffer-local 'less-css-output-file-name)
+
+(defvar less-css-input-file-name nil
+  "File name which will be compiled to CSS.
+
+When the current buffer is saved `less-css-input-file-name' file
+will be compiled to css instead of the current file.
+
+Set this in order to trigger compilation of a \"master\" .less
+file which includes the current file.  The best way to set this
+variable in most cases is likely to be via directory local
+variables.
+
+This can be also be set to a full path, or a relative path. If
+the path is relative, it will be relative to the the current directory by
+default.")
+
+(make-variable-buffer-local 'less-css-input-file-name)
+
+(defconst less-css-default-error-regex
+  "^\\(?:\e\\[31m\\)?\\([^\e\n]*\\|FileError:.*\n\\)\\(?:\e\\[39m\e\\[31m\\)? in \\(?:\e\\[39m\\)?\\([^ \r\n\t\e]+\\)\\(?:\e\\[90m\\)?\\(?::\\| on line \\)\\([0-9]+\\)\\(?::\\|, column \\)\\([0-9]+\\):?\\(?:\e\\[39m\\)?")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Compilation to CSS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(add-to-list 'compilation-error-regexp-alist-alist
+             (list 'less-css less-css-default-error-regex 2 3 4 nil 1))
+(add-to-list 'compilation-error-regexp-alist 'less-css)
+
+
+(defun less-css-compile-maybe ()
+  "Run `less-css-compile' if `less-css-compile-at-save' is non-nil."
+  (if less-css-compile-at-save
+      (less-css-compile)))
+
+(defun less-css--output-path ()
+  "Calculate the path for the compiled CSS file created by `less-css-compile'."
+  (expand-file-name (or less-css-output-file-name
+                        (concat (file-name-nondirectory (file-name-sans-extension buffer-file-name)) ".css"))
+                    (or less-css-output-directory default-directory)))
+
+(defun less-css--maybe-shell-quote-command (command)
+  "Selectively shell-quote COMMAND appropriately for `system-type'."
+  (funcall (if (eq system-type 'windows-nt)
+               'identity
+             'shell-quote-argument) command))
+
+;;;###autoload
+(defun less-css-compile ()
+  "Compiles the current buffer to css using `less-css-lessc-command'."
+  (interactive)
+  (message "Compiling less to css")
+  (let ((compilation-buffer-name-function (lambda (mode-name) "*less-css-compilation*")))
+    (save-window-excursion
+      (with-current-buffer
+          (compile
+           (mapconcat 'identity
+                      (append (list (less-css--maybe-shell-quote-command less-css-lessc-command))
+                              less-css-lessc-options
+                              (list (shell-quote-argument
+                                     (or less-css-input-file-name buffer-file-name))
+                                    ">"
+                                    (shell-quote-argument (less-css--output-path))))
+                      " "))
+        (add-hook 'compilation-finish-functions
+                  (lambda (buf msg)
+                    (unless (string-match-p "^finished" msg)
+                      (display-buffer buf)))
+                  nil
+                  t)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Minor mode
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; TODO: interpolation ("@{val}"), escaped values (~"..."), JS eval (~`...`), custom faces
+(defconst less-css-font-lock-keywords
+  '(;; Variables
+    ("@[a-z_-][a-z-_0-9]*" . font-lock-constant-face)
+    ("&" . font-lock-preprocessor-face)
+    ;; Mixins
+    ("\\(?:[ \t{;]\\|^\\)\\(\\.[a-z_-][a-z-_0-9]*\\)[ \t]*;" . (1 font-lock-keyword-face)))
+  )
+
+;;;###autoload
+(define-derived-mode less-css-mode css-mode "LESS"
+  "Major mode for editing LESS files, http://lesscss.org/
+Special commands:
+\\{less-css-mode-map}"
+  (font-lock-add-keywords nil less-css-font-lock-keywords)
+  ;; cpp-style comments
+  (modify-syntax-entry ?/ ". 124b" less-css-mode-syntax-table)
+  (modify-syntax-entry ?* ". 23" less-css-mode-syntax-table)
+  (modify-syntax-entry ?\n "> b" less-css-mode-syntax-table)
+  ;; Special chars that sometimes come at the beginning of words.
+  (modify-syntax-entry ?. "'" less-css-mode-syntax-table)
+
+  (set (make-local-variable 'comment-start) "//")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'indent-line-function) 'less-css-indent-line)
+  (when (functionp 'css-smie-rules)
+    (smie-setup css-smie-grammar #'css-smie-rules
+                :forward-token #'css-smie--forward-token
+                :backward-token #'css-smie--backward-token))
+
+  (add-hook 'after-save-hook 'less-css-compile-maybe nil t))
+
+(define-key less-css-mode-map "\C-c\C-c" 'less-css-compile)
+
+(defun less-css-indent-line ()
+  "Indent current line according to LESS CSS indentation rules."
+  (let ((css-navigation-syntax-table less-css-mode-syntax-table))
+    (if (fboundp 'css-indent-line)
+        (css-indent-line)
+      (smie-indent-line))))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.less\\'" . less-css-mode))
+
+
+(provide 'less-css-mode)
+;;; less-css-mode.el ends here
diff --git a/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode-autoloads.el b/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode-autoloads.el
deleted file mode 100644
index 33e4f51..0000000
--- a/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode-autoloads.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; markdown-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (21898 47967
-;;;;;;  0 0))
-;;; Generated autoloads from markdown-mode.el
-
-(autoload 'markdown-mode "markdown-mode" "\
-Major mode for editing Markdown files.
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
-
-(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
-
-(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
-
-(autoload 'gfm-mode "markdown-mode" "\
-Major mode for editing GitHub Flavored Markdown files.
-
-\(fn)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; markdown-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode-pkg.el b/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode-pkg.el
deleted file mode 100644
index 2b7c13c..0000000
--- a/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "markdown-mode" "20150623.1128" "Emacs Major mode for Markdown-formatted text files" 'nil :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))
diff --git a/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode.el b/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode.el
deleted file mode 100644
index cab233b..0000000
--- a/emacs.d/elpa/markdown-mode-20150623.1128/markdown-mode.el
+++ /dev/null
@@ -1,4894 +0,0 @@
-;;; markdown-mode.el --- Emacs Major mode for Markdown-formatted text files
-
-;; Copyright (C) 2007-2015 Jason R. Blevins <jrblevin@sdf.org>
-;; Copyright (C) 2007, 2009 Edward O'Connor <ted@oconnor.cx>
-;; Copyright (C) 2007 Conal Elliott <conal@conal.net>
-;; Copyright (C) 2008 Greg Bognar <greg_bognar@hms.harvard.edu>
-;; Copyright (C) 2008 Dmitry Dzhus <mail@sphinx.net.ru>
-;; Copyright (C) 2008 Bryan Kyle <bryan.kyle@gmail.com>
-;; Copyright (C) 2008 Ben Voui <intrigeri@boum.org>
-;; Copyright (C) 2009 Ankit Solanki <ankit.solanki@gmail.com>
-;; Copyright (C) 2009 Hilko Bengen <bengen@debian.org>
-;; Copyright (C) 2009 Peter Williams <pezra@barelyenough.org>
-;; Copyright (C) 2010 George Ogata <george.ogata@gmail.com>
-;; Copyright (C) 2011 Eric Merritt <ericbmerritt@gmail.com>
-;; Copyright (C) 2011 Philippe Ivaldi <pivaldi@sfr.fr>
-;; Copyright (C) 2011 Jeremiah Dodds <jeremiah.dodds@gmail.com>
-;; Copyright (C) 2011 Christopher J. Madsen <cjm@cjmweb.net>
-;; Copyright (C) 2011 Shigeru Fukaya <shigeru.fukaya@gmail.com>
-;; Copyright (C) 2011 Joost Kremers <joostkremers@fastmail.fm>
-;; Copyright (C) 2011-2012 Donald Ephraim Curtis <dcurtis@milkbox.net>
-;; Copyright (C) 2012 Akinori Musha <knu@idaemons.org>
-;; Copyright (C) 2012 Zhenlei Jia <zhenlei.jia@gmail.com>
-;; Copyright (C) 2012 Peter Jones <pjones@pmade.com>
-;; Copyright (C) 2013 Matus Goljer <dota.keys@gmail.com>
-;; Copyright (C) 2015 Google, Inc. (Contributor: Samuel Freilich <sfreilich@google.com>)
-;; Copyright (C) 2015 Antonis Kanouras <antonis@metadosis.gr>
-
-;; Author: Jason R. Blevins <jrblevin@sdf.org>
-;; Maintainer: Jason R. Blevins <jrblevin@sdf.org>
-;; Created: May 24, 2007
-;; Version: 2.0
-;; Package-Version: 20150623.1128
-;; Keywords: Markdown, GitHub Flavored Markdown, itex
-;; URL: http://jblevins.org/projects/markdown-mode/
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, 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, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; markdown-mode is a major mode for editing [Markdown][]-formatted
-;; text files in GNU Emacs.  markdown-mode is free software, licensed
-;; under the GNU GPL.
-;;
-;;  [Markdown]: http://daringfireball.net/projects/markdown/
-;;
-;; The latest stable version is markdown-mode 2.0, released on March 24, 2013:
-;;
-;;    * [markdown-mode.el][]
-;;    * [Screenshot][][^theme]
-;;    * [Release notes][]
-;;
-;;  [markdown-mode.el]: http://jblevins.org/projects/markdown-mode/markdown-mode.el
-;;  [Screenshot]: http://jblevins.org/projects/markdown-mode/screenshots/20130131-002.png
-;;  [Release notes]: http://jblevins.org/projects/markdown-mode/rev-2-0
-;;
-;; [^theme]: The theme used in the screenshot is
-;;     [color-theme-twilight](https://github.com/crafterm/twilight-emacs).
-;;
-;; markdown-mode is also available in several package managers, including:
-;;
-;;    * Debian Linux: [emacs-goodies-el][]
-;;    * Ubuntu Linux: [emacs-goodies-el][emacs-goodies-el-ubuntu]
-;;    * RedHat and Fedora Linux: [emacs-goodies][]
-;;    * NetBSD: [textproc/markdown-mode][]
-;;    * Arch Linux (AUR): [emacs-markdown-mode-git][]
-;;    * MacPorts: [markdown-mode.el][macports-package] ([pending][macports-ticket])
-;;    * FreeBSD: [textproc/markdown-mode.el][freebsd-port]
-;;
-;;  [emacs-goodies-el]: http://packages.debian.org/emacs-goodies-el
-;;  [emacs-goodies-el-ubuntu]: http://packages.ubuntu.com/search?keywords=emacs-goodies-el
-;;  [emacs-goodies]: https://apps.fedoraproject.org/packages/emacs-goodies
-;;  [textproc/markdown-mode]: http://pkgsrc.se/textproc/markdown-mode
-;;  [emacs-markdown-mode-git]: https://aur.archlinux.org/packages/emacs-goodies-el/
-;;  [macports-package]: https://trac.macports.org/browser/trunk/dports/editors/markdown-mode.el/Portfile
-;;  [macports-ticket]: http://trac.macports.org/ticket/35716
-;;  [freebsd-port]: http://svnweb.freebsd.org/ports/head/textproc/markdown-mode.el
-;;
-;; The latest development version can be downloaded directly
-;; ([markdown-mode.el][devel.el]) or it can be obtained from the
-;; (browsable and clonable) Git repository at
-;; <http://jblevins.org/git/markdown-mode.git>.  The entire repository,
-;; including the full project history, can be cloned via the Git protocol
-;; by running
-;;
-;;     git clone git://jblevins.org/git/markdown-mode.git
-;;
-;;  [devel.el]: http://jblevins.org/git/markdown-mode.git/plain/markdown-mode.el
-
-;;; Installation:
-
-;; Make sure to place `markdown-mode.el` somewhere in the load-path and add
-;; the following lines to your `.emacs` file to associate markdown-mode
-;; with `.text`, `.markdown`, and `.md` files:
-;;
-;;     (autoload 'markdown-mode "markdown-mode"
-;;        "Major mode for editing Markdown files" t)
-;;     (add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
-;;     (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
-;;     (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
-;;
-;; There is no official Markdown file extension, nor is there even a
-;; _de facto_ standard, so you can easily add, change, or remove any
-;; of the file extensions above as needed.
-
-;;; Usage:
-
-;; Keybindings are grouped by prefixes based on their function.  For
-;; example, the commands for inserting links are grouped under `C-c
-;; C-a`, where the `C-a` is a mnemonic for the HTML `<a>` tag.  In
-;; other cases, the connection to HTML is not direct.  For example,
-;; commands dealing with headings begin with `C-c C-t` (mnemonic:
-;; titling).  The primary commands in each group will are described
-;; below.  You can obtain a list of all keybindings by pressing `C-c
-;; C-h`.  Movement and shifting commands tend to be associated with
-;; paired delimiters such as `M-{` and `M-}` or `C-c <` and `C-c >`.
-;; Outline navigation keybindings the same as in `org-mode'.  Finally,
-;; commands for running Markdown or doing maintenance on an open file
-;; are grouped under the `C-c C-c` prefix.  The most commonly used
-;; commands are described below.  You can obtain a list of all
-;; keybindings by pressing `C-c C-h`.
-;;
-;;   * Hyperlinks: `C-c C-a`
-;;
-;;     In this group, `C-c C-a l` inserts an inline link of the form
-;;     `[text](url)`.  The link text is determined as follows.  First,
-;;     if there is an active region (i.e., when transient mark mode is
-;;     on and the mark is active), use it as the link text.  Second,
-;;     if the point is at a word, use that word as the link text.  In
-;;     these two cases, the original text will be replaced with the
-;;     link and point will be left at the position for inserting a
-;;     URL.  Otherwise, insert empty link markup and place the point
-;;     for inserting the link text.
-;;
-;;     `C-c C-a L` inserts a reference link of the form `[text][label]`
-;;     and, optionally, a corresponding reference label definition.
-;;     The link text is determined in the same way as with an inline
-;;     link (using the region, when active, or the word at the point),
-;;     but instead of inserting empty markup as a last resort, the
-;;     link text will be read from the minibuffer.  The reference
-;;     label will be read from the minibuffer in both cases, with
-;;     completion from the set of currently defined references.  To
-;;     create an implicit reference link, press `RET` to accept the
-;;     default, an empty label.  If the entered referenced label is
-;;     not defined, additionally prompt for the URL and (optional)
-;;     title.  If a URL is provided, a reference definition will be
-;;     inserted in accordance with `markdown-reference-location'.
-;;     If a title is given, it will be added to the end of the
-;;     reference definition and will be used to populate the title
-;;     attribute when converted to XHTML.
-;;
-;;     `C-c C-a u` inserts a bare url, delimited by angle brackets.  When
-;;     there is an active region, the text in the region is used as the
-;;     URL.  If the point is at a URL, that url is used.  Otherwise,
-;;     insert angle brackets and position the point in between them
-;;     for inserting the URL.
-;;
-;;     `C-c C-a f` inserts a footnote marker at the point, inserts a
-;;     footnote definition below, and positions the point for
-;;     inserting the footnote text.  Note that footnotes are an
-;;     extension to Markdown and are not supported by all processors.
-;;
-;;     `C-c C-a w` behaves much like the inline link insertion command
-;;     and inserts a wiki link of the form `[[WikiLink]]`.  If there
-;;     is an active region, use the region as the link text.  If the
-;;     point is at a word, use the word as the link text.  If there is
-;;     no active region and the point is not at word, simply insert
-;;     link markup.  Note that wiki links are an extension to Markdown
-;;     and are not supported by all processors.
-;;
-;;   * Images: `C-c C-i`
-;;
-;;     `C-c C-i i` inserts markup for an inline image, using the
-;;     active region or the word at point, if any, as the alt text.
-;;     `C-c C-i I` behaves similarly and inserts a reference-style
-;;     image.
-;;
-;;   * Styles: `C-c C-s`
-;;
-;;     `C-c C-s e` inserts markup to make a region or word italic (`e`
-;;     for `<em>` or emphasis).  If there is an active region, make
-;;     the region italic.  If the point is at a non-italic word, make
-;;     the word italic.  If the point is at an italic word or phrase,
-;;     remove the italic markup.  Otherwise, simply insert italic
-;;     delimiters and place the cursor in between them.  Similarly,
-;;     use `C-c C-s s` for bold (`<strong>`) and `C-c C-s c` for
-;;     inline code (`<code>`).
-;;
-;;     `C-c C-s b` inserts a blockquote using the active region, if any,
-;;     or starts a new blockquote.  `C-c C-s C-b` is a variation which
-;;     always operates on the region, regardless of whether it is
-;;     active or not.  The appropriate amount of indentation, if any,
-;;     is calculated automatically given the surrounding context, but
-;;     may be adjusted later using the region indentation commands.
-;;
-;;     `C-c C-s p` behaves similarly for inserting preformatted code
-;;     blocks, with `C-c C-s C-p` being the region-only counterpart.
-;;
-;;   * Headings: `C-c C-t`
-;;
-;;     All heading insertion commands use the text in the active
-;;     region, if any, as the heading text.  Otherwise, if the current
-;;     line is not blank, they use the text on the current line.
-;;     Finally, the setext commands will prompt for heading text if
-;;     there is no active region and the current line is blank.
-;;
-;;     `C-c C-t h` inserts a heading with automatically chosen type and
-;;     level (both determined by the previous heading).  `C-c C-t H`
-;;     behaves similarly, but uses setext (underlined) headings when
-;;     possible, still calculating the level automatically.
-;;     In cases where the automatically-determined level is not what
-;;     you intended, the level can be quickly promoted or demoted
-;;     (as described below).  Alternatively, a `C-u` prefix can be
-;;     given to insert a heading promoted by one level or a `C-u C-u`
-;;     prefix can be given to insert a heading demoted by one level.
-;;
-;;     To insert a heading of a specific level and type, use `C-c C-t 1`
-;;     through `C-c C-t 6` for atx (hash mark) headings and `C-c C-t !` or
-;;     `C-c C-t @` for setext headings of level one or two, respectively.
-;;     Note that `!` is `S-1` and `@` is `S-2`.
-;;
-;;     If the point is at a heading, these commands will replace the
-;;     existing markup in order to update the level and/or type of the
-;;     heading.  To remove the markup of the heading at the point,
-;;     press `C-c C-k` to kill the heading and press `C-y` to yank the
-;;     heading text back into the buffer.
-;;
-;;   * Horizontal Rules: `C-c -`
-;;
-;;     `C-c -` inserts a horizontal rule.  By default, insert the
-;;     first string in the list `markdown-hr-strings' (the most
-;;     prominent rule).  With a `C-u` prefix, insert the last string.
-;;     With a numeric prefix `N`, insert the string in position `N`
-;;     (counting from 1).
-;;
-;;   * Markdown and Maintenance Commands: `C-c C-c`
-;;
-;;     *Compile:* `C-c C-c m` will run Markdown on the current buffer
-;;     and show the output in another buffer.  *Preview*: `C-c C-c p`
-;;     runs Markdown on the current buffer and previews, stores the
-;;     output in a temporary file, and displays the file in a browser.
-;;     *Export:* `C-c C-c e` will run Markdown on the current buffer
-;;     and save the result in the file `basename.html`, where
-;;     `basename` is the name of the Markdown file with the extension
-;;     removed.  *Export and View:* press `C-c C-c v` to export the
-;;     file and view it in a browser.  **For both export commands, the
-;;     output file will be overwritten without notice.**
-;;     *Open:* `C-c C-c o` will open the Markdown source file directly
-;;     using `markdown-open-command'.
-;;
-;;     To summarize:
-;;
-;;       - `C-c C-c m`: `markdown-command' > `*markdown-output*` buffer.
-;;       - `C-c C-c p`: `markdown-command' > temporary file > browser.
-;;       - `C-c C-c e`: `markdown-command' > `basename.html`.
-;;       - `C-c C-c v`: `markdown-command' > `basename.html` > browser.
-;;       - `C-c C-c w`: `markdown-command' > kill ring.
-;;       - `C-c C-c o`: `markdown-open-command'.
-;;
-;;     `C-c C-c c` will check for undefined references.  If there are
-;;     any, a small buffer will open with a list of undefined
-;;     references and the line numbers on which they appear.  In Emacs
-;;     22 and greater, selecting a reference from this list and
-;;     pressing `RET` will insert an empty reference definition at the
-;;     end of the buffer.  Similarly, selecting the line number will
-;;     jump to the corresponding line.
-;;
-;;     `C-c C-c n` renumbers any ordered lists in the buffer that are
-;;     out of sequence.
-;;
-;;     `C-c C-c ]` completes all headings and normalizes all horizontal
-;;     rules in the buffer.
-;;
-;;   * Following Links: `C-c C-o`
-;;
-;;     Press `C-c C-o` when the point is on an inline or reference
-;;     link to open the URL in a browser.  When the point is at a
-;;     wiki link, open it in another buffer (in the current window,
-;;     or in the other window with the `C-u` prefix).  Use `M-p` and
-;;     `M-n` to quickly jump to the previous or next link of any type.
-;;
-;;   * Jumping: `C-c C-j`
-;;
-;;     Use `C-c C-j` to jump from the object at point to its counterpart
-;;     elsewhere in the text, when possible.  Jumps between reference
-;;     links and definitions; between footnote markers and footnote
-;;     text.  If more than one link uses the same reference name, a
-;;     new buffer will be created containing clickable buttons for jumping
-;;     to each link.  You may press `TAB` or `S-TAB` to jump between
-;;     buttons in this window.
-;;
-;;   * Promotion and Demotion: `C-c C--` and `C-c C-=`
-;;
-;;     Headings, horizontal rules, and list items can be promoted and
-;;     demoted, as well as bold and italic text.  For headings,
-;;     "promotion" means *decreasing* the level (i.e., moving from
-;;     `<h2>` to `<h1>`) while "demotion" means *increasing* the
-;;     level.  For horizontal rules, promotion and demotion means
-;;     moving backward or forward through the list of rule strings in
-;;     `markdown-hr-strings'.  For bold and italic text, promotion and
-;;     demotion means changing the markup from underscores to asterisks.
-;;     Press `C-c C--` or `M-LEFT` to promote the element at the point
-;;     if possible.
-;;
-;;     To remember these commands, note that `-` is for decreasing the
-;;     level (promoting), and `=` (on the same key as `+`) is for
-;;     increasing the level (demoting).  Similarly, the left and right
-;;     arrow keys indicate the direction that the atx heading markup
-;;     is moving in when promoting or demoting.
-;;
-;;   * Completion: `C-c C-]`
-;;
-;;     Complete markup is in normalized form, which means, for
-;;     example, that the underline portion of a setext header is the
-;;     same length as the heading text, or that the number of leading
-;;     and trailing hash marks of an atx header are equal and that
-;;     there is no extra whitespace in the header text.  `C-c C-]`
-;;     completes the markup at the point, if it is determined to be
-;;     incomplete.
-;;
-;;   * Editing Lists: `M-RET`, `M-UP`, `M-DOWN`, `M-LEFT`, and `M-RIGHT`
-;;
-;;     New list items can be inserted with `M-RET`.  This command
-;;     determines the appropriate marker (one of the possible
-;;     unordered list markers or the next number in sequence for an
-;;     ordered list) and indentation level by examining nearby list
-;;     items.  If there is no list before or after the point, start a
-;;     new list.  Prefix this command by `C-u` to decrease the
-;;     indentation by one level.  Prefix this command by `C-u C-u` to
-;;     increase the indentation by one level.
-;;
-;;     Existing list items can be moved up or down with `M-UP` or
-;;     `M-DOWN` and indented or exdented with `M-RIGHT` or `M-LEFT`.
-;;
-;;   * Shifting the Region: `C-c <` and `C-c >`
-;;
-;;     Text in the region can be indented or exdented as a group using
-;;     `C-c >` to indent to the next indentation point (calculated in
-;;     the current context), and `C-c <` to exdent to the previous
-;;     indentation point.  These keybindings are the same as those for
-;;     similar commands in `python-mode'.
-;;
-;;   * Killing Elements: `C-c C-k`
-;;
-;;     Press `C-c C-k` to kill the thing at point and add important
-;;     text, without markup, to the kill ring.  Possible things to
-;;     kill include (roughly in order of precedece): inline code,
-;;     headings, horizonal rules, links (add link text to kill ring),
-;;     images (add alt text to kill ring), angle URIs, email
-;;     addresses, bold, italics, reference definitions (add URI to
-;;     kill ring), footnote markers and text (kill both marker and
-;;     text, add text to kill ring), and list items.
-;;
-;;   * Outline Navigation: `C-c C-n`, `C-c C-p`, `C-c C-f`, `C-c C-b`, and `C-c C-u`
-;;
-;;     Navigation between headings is possible using `outline-mode'.
-;;     Use `C-c C-n` and `C-c C-p` to move between the next and previous
-;;     visible headings.  Similarly, `C-c C-f` and `C-c C-b` move to the
-;;     next and previous visible headings at the same level as the one
-;;     at the point.  Finally, `C-c C-u` will move up to a lower-level
-;;     (higher precedence) visible heading.
-;;
-;;   * Movement by Paragraph or Block: `M-{` and `M-}`
-;;
-;;     The definition of a "paragraph" is slightly different in
-;;     markdown-mode than, say, text-mode, because markdown-mode
-;;     supports filling for list items and respects hard line breaks,
-;;     both of which break paragraphs.  So, markdown-mode overrides
-;;     the usual paragraph navigation commands `M-{` and `M-}` so that
-;;     with a `C-u` prefix, these commands jump to the beginning or
-;;     end of an entire block of text, respectively, where "blocks"
-;;     are separated by one or more lines.
-;;
-;;   * Movement by Defun: `C-M-a`, `C-M-e`, and `C-M-h`
-;;
-;;     The usual Emacs commands can be used to move by defuns
-;;     (top-level major definitions).  In markdown-mode, a defun is a
-;;     section.  As usual, `C-M-a` will move the point to the
-;;     beginning of the current or preceding defun, `C-M-e` will move
-;;     to the end of the current or following defun, and `C-M-h` will
-;;     put the region around the entire defun.
-;;
-;; As noted, many of the commands above behave differently depending
-;; on whether Transient Mark mode is enabled or not.  When it makes
-;; sense, if Transient Mark mode is on and the region is active, the
-;; command applies to the text in the region (e.g., `C-c C-s s` makes the
-;; region bold).  For users who prefer to work outside of Transient
-;; Mark mode, since Emacs 22 it can be enabled temporarily by pressing
-;; `C-SPC C-SPC`.  When this is not the case, many commands then
-;; proceed to look work with the word or line at the point.
-;;
-;; When applicable, commands that specifically act on the region even
-;; outside of Transient Mark mode have the same keybinding as their
-;; standard counterpart, but the letter is uppercase.  For example,
-;; `markdown-insert-blockquote' is bound to `C-c C-s b` and only acts on
-;; the region in Transient Mark mode while `markdown-blockquote-region'
-;; is bound to `C-c C-s B` and always applies to the region (when nonempty).
-;;
-;; Note that these region-specific functions are useful in many
-;; cases where it may not be obvious.  For example, yanking text from
-;; the kill ring sets the mark at the beginning of the yanked text
-;; and moves the point to the end.  Therefore, the (inactive) region
-;; contains the yanked text.  So, `C-y` followed by `C-c C-s C-b` will
-;; yank text and turn it into a blockquote.
-;;
-;; markdown-mode attempts to be flexible in how it handles
-;; indentation.  When you press `TAB` repeatedly, the point will cycle
-;; through several possible indentation levels corresponding to things
-;; you might have in mind when you press `RET` at the end of a line or
-;; `TAB`.  For example, you may want to start a new list item,
-;; continue a list item with hanging indentation, indent for a nested
-;; pre block, and so on.  Exdention is handled similarly when backspace
-;; is pressed at the beginning of the non-whitespace portion of a line.
-;;
-;; markdown-mode supports outline-minor-mode as well as org-mode-style
-;; visibility cycling for atx- or hash-style headings.  There are two
-;; types of visibility cycling: Pressing `S-TAB` cycles globally between
-;; the table of contents view (headings only), outline view (top-level
-;; headings only), and the full document view.  Pressing `TAB` while the
-;; point is at a heading will cycle through levels of visibility for the
-;; subtree: completely folded, visible children, and fully visible.
-;; Note that mixing hash and underline style headings will give undesired
-;; results.
-
-;;; Customization:
-
-;; Although no configuration is *necessary* there are a few things
-;; that can be customized.  The `M-x customize-mode` command
-;; provides an interface to all of the possible customizations:
-;;
-;;   * `markdown-command' - the command used to run Markdown (default:
-;;     `markdown`).  This variable may be customized to pass
-;;     command-line options to your Markdown processor of choice.
-;;
-;;   * `markdown-command-needs-filename' - set to `t' if
-;;     `markdown-command' does not accept standard input (default:
-;;     `nil').  When `nil', `markdown-mode' will pass the Markdown
-;;     content to `markdown-command' using standard input (`stdin`).
-;;     When set to `t', `markdown-mode' will pass the name of the file
-;;     as the final command-line argument to `markdown-command'.  Note
-;;     that in the latter case, you will only be able to run
-;;     `markdown-command' from buffers which are visiting a file.
-;;
-;;   * `markdown-open-command' - the command used for calling a standalone
-;;     Markdown previewer which is capable of opening Markdown source files
-;;     directly (default: `nil').  This command will be called
-;;     with a single argument, the filename of the current buffer.
-;;     A representative program is the Mac app [Marked 2][], a
-;;     live-updating Markdown previewer which can be [called from a
-;;     simple shell script](http://jblevins.org/log/marked-2-command).
-;;
-;;   * `markdown-hr-strings' - list of strings to use when inserting
-;;     horizontal rules.  Different strings will not be distinguished
-;;     when converted to HTML--they will all be converted to
-;;     `<hr/>`--but they may add visual distinction and style to plain
-;;     text documents.  To maintain some notion of promotion and
-;;     demotion, keep these sorted from largest to smallest.
-;;
-;;   * `markdown-bold-underscore' - set to a non-nil value to use two
-;;     underscores for bold instead of two asterisks (default: `nil').
-;;
-;;   * `markdown-italic-underscore' - set to a non-nil value to use
-;;     underscores for italic instead of asterisks (default: `nil').
-;;
-;;   * `markdown-indent-function' - the function to use for automatic
-;;     indentation (default: `markdown-indent-line').
-;;
-;;   * `markdown-indent-on-enter' - set to a non-nil value to
-;;     automatically indent new lines when the enter key is pressed
-;;     (default: `t')
-;;
-;;   * `markdown-wiki-link-alias-first' - set to a non-nil value to
-;;     treat aliased wiki links like `[[link text|PageName]]`
-;;     (default: `t').  When set to nil, they will be treated as
-;;     `[[PageName|link text]]'.
-;;
-;;   * `markdown-uri-types' - a list of protocol schemes (e.g., "http")
-;;     for URIs that `markdown-mode' should highlight.
-;;
-;;   * `markdown-enable-math' - syntax highlighting for LaTeX
-;;     fragments (default: `nil').  Set this to `t' to turn on math
-;;     support by default.  Math support can be toggled later using
-;;     the function `markdown-enable-math'."
-;;
-;;   * `markdown-css-paths' - CSS files to link to in XHTML output
-;;     (default: `nil`).
-;;
-;;   * `markdown-content-type' - when set to a nonempty string, an
-;;     `http-equiv` attribute will be included in the XHTML `<head>`
-;;     block (default: `""`).  If needed, the suggested values are
-;;     `application/xhtml+xml` or `text/html`.  See also:
-;;     `markdown-coding-system'.
-;;
-;;   * `markdown-coding-system' - used for specifying the character
-;;     set identifier in the `http-equiv` attribute when included
-;;     (default: `nil').  See `markdown-content-type', which must
-;;     be set before this variable has any effect.  When set to `nil',
-;;     `buffer-file-coding-system' will be used to automatically
-;;     determine the coding system string (falling back to
-;;     `iso-8859-1' when unavailable).  Common settings are `utf-8'
-;;     and `iso-latin-1'.
-;;
-;;   * `markdown-xhtml-header-content' - additional content to include
-;;     in the XHTML `<head>` block (default: `""`).
-;;
-;;   * `markdown-xhtml-standalone-regexp' - a regular expression which
-;;     `markdown-mode' uses to determine whether the output of
-;;     `markdown-command' is a standalone XHTML document or an XHTML
-;;     fragment (default: `"^\\(<\\?xml\\|<!DOCTYPE\\|<html\\)"`).  If
-;;     this regular expression not matched in the first five lines of
-;;     output, `markdown-mode' assumes the output is a fragment and
-;;     adds a header and footer.
-;;
-;;   * `markdown-link-space-sub-char' - a character to replace spaces
-;;     when mapping wiki links to filenames (default: `"_"`).
-;;     For example, use an underscore for compatibility with the
-;;     Python Markdown WikiLinks extension.  In `gfm-mode', this is
-;;     set to `"-"` to conform with GitHub wiki links.
-;;
-;;   * `markdown-reference-location' - where to insert reference
-;;     definitions (default: `header`).  The possible locations are
-;;     the end of the document (`end`), after the current block
-;;     (`immediately`), before the next header (`header`).
-;;
-;;   * `markdown-footnote-location' - where to insert footnote text
-;;     (default: `end`).  The set of location options is the same as
-;;     for `markdown-reference-location'.
-;;
-;;   * `comment-auto-fill-only-comments' - variable is made
-;;     buffer-local and set to `nil' by default.  In programming
-;;     language modes, when this variable is non-nil, only comments
-;;     will be filled by auto-fill-mode.  However, comments in
-;;     Markdown documents are rare and the most users probably intend
-;;     for the actual content of the document to be filled.  Making
-;;     this variable buffer-local allows `markdown-mode' to override
-;;     the default behavior induced when the global variable is non-nil.
-;;
-;; Additionally, the faces used for syntax highlighting can be modified to
-;; your liking by issuing `M-x customize-group RET markdown-faces`
-;; or by using the "Markdown Faces" link at the bottom of the mode
-;; customization screen.
-;;
-;; [Marked 2]: https://itunes.apple.com/us/app/marked-2/id890031187?mt=12&uo=4&at=11l5Vs&ct=mm
-
-;;; Extensions:
-
-;; Besides supporting the basic Markdown syntax, markdown-mode also
-;; includes syntax highlighting for `[[Wiki Links]]` by default.  Wiki
-;; links may be followed by pressing `C-c C-o` when the point
-;; is at a wiki link.  Use `M-p` and `M-n` to quickly jump to the
-;; previous and next links (including links of other types).
-;; Aliased or piped wiki links of the form `[[link text|PageName]]`
-;; are also supported.  Since some wikis reverse these components, set
-;; `markdown-wiki-link-alias-first' to nil to treat them as
-;; `[[PageName|link text]]`.
-;;
-;; [SmartyPants][] support is possible by customizing `markdown-command'.
-;; If you install `SmartyPants.pl` at, say, `/usr/local/bin/smartypants`,
-;; then you can set `markdown-command' to `"markdown | smartypants"`.
-;; You can do this either by using `M-x customize-group markdown`
-;; or by placing the following in your `.emacs` file:
-;;
-;;     (defun markdown-custom ()
-;;       "markdown-mode-hook"
-;;       (setq markdown-command "markdown | smartypants"))
-;;     (add-hook 'markdown-mode-hook '(lambda() (markdown-custom)))
-;;
-;; [SmartyPants]: http://daringfireball.net/projects/smartypants/
-;;
-;; Syntax highlighting for mathematical expressions written
-;; in LaTeX (only expressions denoted by `$..$`, `$$..$$`, or `\[..\]`)
-;; can be enabled by setting `markdown-enable-math' to a non-nil value,
-;; either via customize or by placing `(setq markdown-enable-math t)`
-;; in `.emacs`, and then restarting Emacs or calling
-;; `markdown-reload-extensions'.
-
-;;; GitHub Flavored Markdown:
-
-;; A [GitHub Flavored Markdown][GFM] (GFM) mode, `gfm-mode', is also
-;; available.  The GitHub implementation of differs slightly from
-;; standard Markdown.  The most important differences are that
-;; newlines are significant, triggering hard line breaks, and that
-;; underscores inside of words (e.g., variable names) need not be
-;; escaped.  As such, `gfm-mode' turns off `auto-fill-mode' and turns
-;; on `visual-line-mode' (or `longlines-mode' if `visual-line-mode' is
-;; not available).  Underscores inside of words (such as
-;; test_variable) will not trigger emphasis.
-;;
-;; Wiki links in this mode will be treated as on GitHub, with hyphens
-;; replacing spaces in filenames and where the first letter of the
-;; filename capitalized.  For example, `[[wiki link]]' will map to a
-;; file named `Wiki-link` with the same extension as the current file.
-;;
-;; GFM code blocks, with optional programming language keywords, will
-;; be highlighted.  They can be inserted with `C-c C-s P`.  If there
-;; is an active region, the text in the region will be placed inside
-;; the code block.  You will be prompted for the name of the language,
-;; but may press enter to continue without naming a language.
-;;
-;; Similarly, strike through text is supoorted in GFM mode and can be
-;; inserted (and toggled) using `C-c C-s d`. Following the mnemonics
-;; for the other style keybindings, the letter `d` coincides with the
-;; HTML tag `<del>`.
-;;
-;; For GFM preview can be powered by setting `markdown-command' to
-;; use [Docter][].  This may also be configured to work with [Marked 2][]
-;; for `markdown-open-command'.
-;;
-;; [GFM]: http://github.github.com/github-flavored-markdown/
-;; [Docter]: https://github.com/alampros/Docter
-
-;;; Acknowledgments:
-
-;; markdown-mode has benefited greatly from the efforts of the
-;; following people:
-;;
-;;   * Cyril Brulebois <cyril.brulebois@enst-bretagne.fr> for Debian packaging.
-;;   * Conal Elliott <conal@conal.net> for a font-lock regexp patch.
-;;   * Edward O'Connor <hober0@gmail.com> for a font-lock regexp fix and
-;;     GitHub Flavored Markdown mode (`gfm-mode').
-;;   * Greg Bognar <greg_bognar@hms.harvard.edu> for menus and running
-;;     `markdown' with an active region.
-;;   * Daniel Burrows <dburrows@debian.org> for filing Debian bug #456592.
-;;   * Peter S. Galbraith <psg@debian.org> for maintaining `emacs-goodies-el`.
-;;   * Dmitry Dzhus <mail@sphinx.net.ru> for undefined reference checking.
-;;   * Carsten Dominik <carsten@orgmode.org> for `org-mode', from which the
-;;     visibility cycling functionality was derived, and for a bug fix
-;;     related to `orgtbl-mode'.
-;;   * Bryan Kyle <bryan.kyle@gmail.com> for indentation code.
-;;   * Ben Voui <intrigeri@boum.org> for font-lock face customizations.
-;;   * Ankit Solanki <ankit.solanki@gmail.com> for `longlines.el`
-;;     compatibility and custom CSS.
-;;   * Hilko Bengen <bengen@debian.org> for proper XHTML output.
-;;   * Jose A. Ortega Ruiz <jao@gnu.org> for Emacs 23 fixes.
-;;   * Nelson Minar <nelson@santafe.edu> for `html-helper-mode', from which
-;;     comment matching functions were derived.
-;;   * Alec Resnick <alec@sproutward.org> for bug reports.
-;;   * Joost Kremers <joostkremers@fastmail.fm> for footnote-handling
-;;     functions, bug reports regarding indentation, and
-;;     fixes for byte-compilation warnings.
-;;   * Peter Williams <pezra@barelyenough.org> for `fill-paragraph'
-;;     enhancements.
-;;   * George Ogata <george.ogata@gmail.com> for fixing several
-;;     byte-compilation warnings.
-;;   * Eric Merritt <ericbmerritt@gmail.com> for wiki link features.
-;;   * Philippe Ivaldi <pivaldi@sfr.fr> for XHTML preview
-;;     customizations and XHTML export.
-;;   * Jeremiah Dodds <jeremiah.dodds@gmail.com> for supporting
-;;     Markdown processors which do not accept input from stdin.
-;;   * Werner Dittmann <werner.dittmann@t-online.de> for bug reports
-;;     regarding the `cl` dependency and `auto-fill-mode' and indentation.
-;;   * Scott Pfister <scott.pfister@gmail.com> for generalizing the space
-;;     substitution character for mapping wiki links to filenames.
-;;   * Marcin Kasperski <marcin.kasperski@mekk.waw.pl> for a patch to
-;;     escape shell commands.
-;;   * Christopher J. Madsen <cjm@cjmweb.net> for patches to fix a match
-;;     data bug and to prefer `visual-line-mode' in `gfm-mode'.
-;;   * Shigeru Fukaya <shigeru.fukaya@gmail.com> for better adherence to
-;;     Emacs Lisp coding conventions.
-;;   * Donald Ephraim Curtis <dcurtis@milkbox.net> for fixing the `fill-paragraph'
-;;     regexp, refactoring the compilation and preview functions,
-;;     heading font-lock generalizations, list renumbering,
-;;     and kill ring save.
-;;   * Kevin Porter <kportertx@gmail.com> for wiki link handling in `gfm-mode'.
-;;   * Max Penet <max.penet@gmail.com> and Peter Eisentraut <peter_e@gmx.net>
-;;     for an autoload token for `gfm-mode'.
-;;   * Ian Yang <me@iany.me> for improving the reference definition regex.
-;;   * Akinori Musha <knu@idaemons.org> for an imenu index function.
-;;   * Michael Sperber <sperber@deinprogramm.de> for XEmacs fixes.
-;;   * Francois Gannaz <francois.gannaz@free.fr> for suggesting charset
-;;     declaration in XHTML output.
-;;   * Zhenlei Jia <zhenlei.jia@gmail.com> for smart exdention function.
-;;   * Matus Goljer <dota.keys@gmail.com> for improved wiki link following
-;;     and GFM code block insertion.
-;;   * Peter Jones <pjones@pmade.com> for link following functions.
-;;   * Bryan Fink <bryan.fink@gmail.com> for a bug report regarding
-;;     externally modified files.
-;;   * Vegard Vesterheim <vegard.vesterheim@uninett.no> for a bug fix
-;;     related to `orgtbl-mode'.
-;;   * Makoto Motohashi <mkt.motohashi@gmail.com> for before- and after-
-;;     export hooks, unit test improvements, and updates to support
-;;     wide characters.
-;;   * Michael Dwyer <mdwyer@ehtech.in> for `gfm-mode' underscore regexp.
-;;   * Chris Lott <chris@chrislott.org> for suggesting reference label
-;;     completion.
-;;   * Gunnar Franke <Gunnar.Franke@gmx.de> for a completion bug report.
-;;   * David Glasser <glasser@meteor.com> for a `paragraph-separate' fix.
-;;   * Daniel Brotsky <dev@brotsky.com> for better auto-fill defaults.
-;;   * Samuel Freilich <sfreilich@google.com> for improved filling
-;;     behavior regarding list items, footnotes, and reference
-;;     definitions, improved killing of footnotes, and numerous other
-;;     tests and bug fixes.
-;;   * Antonis Kanouras <antonis@metadosis.gr> for strike through support.
-;;   * Tim Visher <tim.visher@gmail.com> for multiple CSS files and other
-;;     general improvements.
-;;   * Matt McClure <matthewlmcclure@gmail.com> for a patch to prevent
-;;     overwriting source files with .html extensions upon export.
-;;   * Roger Bolsius <roger.bolsius@gmail.com> for ordered list improvements.
-
-;;; Bugs:
-
-;; Although markdown-mode is developed and tested primarily using
-;; GNU Emacs 24, compatibility with earlier Emacsen is also a
-;; priority.
-;;
-;; If you find any bugs in markdown-mode, please construct a test case
-;; or a patch and email me at <jrblevin@sdf.org>.
-
-;;; History:
-
-;; markdown-mode was written and is maintained by Jason Blevins.  The
-;; first version was released on May 24, 2007.
-;;
-;;   * 2007-05-24: Version 1.1
-;;   * 2007-05-25: Version 1.2
-;;   * 2007-06-05: [Version 1.3][]
-;;   * 2007-06-29: Version 1.4
-;;   * 2007-10-11: [Version 1.5][]
-;;   * 2008-06-04: [Version 1.6][]
-;;   * 2009-10-01: [Version 1.7][]
-;;   * 2011-08-12: [Version 1.8][]
-;;   * 2011-08-15: [Version 1.8.1][]
-;;   * 2013-01-25: [Version 1.9][]
-;;   * 2013-03-24: [Version 2.0][]
-;;
-;; [Version 1.3]: http://jblevins.org/projects/markdown-mode/rev-1-3
-;; [Version 1.5]: http://jblevins.org/projects/markdown-mode/rev-1-5
-;; [Version 1.6]: http://jblevins.org/projects/markdown-mode/rev-1-6
-;; [Version 1.7]: http://jblevins.org/projects/markdown-mode/rev-1-7
-;; [Version 1.8]: http://jblevins.org/projects/markdown-mode/rev-1-8
-;; [Version 1.8.1]: http://jblevins.org/projects/markdown-mode/rev-1-8-1
-;; [Version 1.9]: http://jblevins.org/projects/markdown-mode/rev-1-9
-;; [Version 2.0]: http://jblevins.org/projects/markdown-mode/rev-2-0
-
-
-;;; Code:
-
-(require 'easymenu)
-(require 'outline)
-(require 'thingatpt)
-(eval-when-compile (require 'cl))
-
-
-;;; Constants =================================================================
-
-(defconst markdown-mode-version "2.0"
-  "Markdown mode version number.")
-
-(defconst markdown-output-buffer-name "*markdown-output*"
-  "Name of temporary buffer for markdown command output.")
-
-
-;;; Global Variables ==========================================================
-
-(defvar markdown-reference-label-history nil
-  "History of used reference labels.")
-
-
-;;; Customizable Variables ====================================================
-
-(defvar markdown-mode-hook nil
-  "Hook run when entering Markdown mode.")
-
-(defvar markdown-before-export-hook nil
-  "Hook run before running Markdown to export XHTML output.
-The hook may modify the buffer, which will be restored to it's
-original state after exporting is complete.")
-
-(defvar markdown-after-export-hook nil
-  "Hook run after XHTML output has been saved.
-Any changes to the output buffer made by this hook will be saved.")
-
-(defgroup markdown nil
-  "Major mode for editing text files in Markdown format."
-  :prefix "markdown-"
-  :group 'wp
-  :link '(url-link "http://jblevins.org/projects/markdown-mode/"))
-
-(defcustom markdown-command "markdown"
-  "Command to run markdown."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-command-needs-filename nil
-  "Set to non-nil if `markdown-command' does not accept input from stdin.
-Instead, it will be passed a filename as the final command line
-option.  As a result, you will only be able to run Markdown from
-buffers which are visiting a file."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-open-command nil
-  "Command used for opening Markdown files directly.
-For example, a standalone Markdown previewer.  This command will
-be called with a single argument: the filename of the current
-buffer."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-hr-strings
-  '("-------------------------------------------------------------------------------"
-    "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
-    "---------------------------------------"
-    "* * * * * * * * * * * * * * * * * * * *"
-    "---------"
-    "* * * * *")
-  "Strings to use when inserting horizontal rules.
-The first string in the list will be the default when inserting a
-horizontal rule.  Strings should be listed in decreasing order of
-prominence (as in headings from level one to six) for use with
-promotion and demotion functions."
-  :group 'markdown
-  :type 'list)
-
-(defcustom markdown-bold-underscore nil
-  "Use two underscores for bold instead of two asterisks."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-italic-underscore nil
-  "Use underscores for italic instead of asterisks."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-indent-function 'markdown-indent-line
-  "Function to use to indent."
-  :group 'markdown
-  :type 'function)
-
-(defcustom markdown-indent-on-enter t
-  "Automatically indent new lines when enter key is pressed.
-When this variable is set to t, pressing RET will call
-`newline-and-indent'.  When set to nil, define RET to call
-`newline' as usual.  In the latter case, you can still use
-auto-indentation by pressing \\[newline-and-indent]."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-wiki-link-alias-first t
-  "When non-nil, treat aliased wiki links like [[alias text|PageName]].
-Otherwise, they will be treated as [[PageName|alias text]]."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-uri-types
-  '("acap" "cid" "data" "dav" "fax" "file" "ftp" "gopher" "http" "https"
-    "imap" "ldap" "mailto" "mid" "modem" "news" "nfs" "nntp" "pop" "prospero"
-    "rtsp" "service" "sip" "tel" "telnet" "tip" "urn" "vemmi" "wais")
-  "Link types for syntax highlighting of URIs."
-  :group 'markdown
-  :type 'list)
-
-(defcustom markdown-enable-math nil
-  "Syntax highlighting for inline LaTeX and itex expressions.
-Set this to a non-nil value to turn on math support by default.
-Math support can be toggled later using `markdown-enable-math'
-or \\[markdown-enable-math]."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp)
-
-(defcustom markdown-css-paths nil
-  "URL of CSS file to link to in the output XHTML."
-  :group 'markdown
-  :type 'list)
-
-(defcustom markdown-content-type ""
-  "Content type string for the http-equiv header in XHTML output.
-When set to a non-empty string, insert the http-equiv attribute.
-Otherwise, this attribute is omitted."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-coding-system nil
-  "Character set string for the http-equiv header in XHTML output.
-Defaults to `buffer-file-coding-system' (and falling back to
-`iso-8859-1' when not available).  Common settings are `utf-8'
-and `iso-latin-1'.  Use `list-coding-systems' for more choices."
-  :group 'markdown
-  :type 'coding-system)
-
-(defcustom markdown-xhtml-header-content ""
-  "Additional content to include in the XHTML <head> block."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-xhtml-standalone-regexp
-  "^\\(<\\?xml\\|<!DOCTYPE\\|<html\\)"
-  "Regexp indicating whether `markdown-command' output is standalone XHTML."
-  :group 'markdown
-  :type 'regexp)
-
-(defcustom markdown-link-space-sub-char "_"
-  "Character to use instead of spaces when mapping wiki links to filenames."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-reference-location 'header
-  "Position where new reference definitions are inserted in the document."
-  :group 'markdown
-  :type '(choice (const :tag "At the end of the document" end)
-                 (const :tag "Immediately after the current block" immediately)
-                 (const :tag "Before next header" header)))
-
-(defcustom markdown-footnote-location 'end
-  "Position where new footnotes are inserted in the document."
-  :group 'markdown
-  :type '(choice (const :tag "At the end of the document" end)
-                 (const :tag "Immediately after the current block" immediately)
-                 (const :tag "Before next header" header)))
-
-(defcustom markdown-unordered-list-item-prefix "  * "
-  "String inserted before unordered list items."
-  :group 'markdown
-  :type 'string)
-
-
-;;; Font Lock =================================================================
-
-(require 'font-lock)
-
-(defvar markdown-italic-face 'markdown-italic-face
-  "Face name to use for italic text.")
-
-(defvar markdown-bold-face 'markdown-bold-face
-  "Face name to use for bold text.")
-
-(defvar markdown-strike-through-face 'markdown-strike-through-face
-  "Face name to use for strike-through text.")
-
-(defvar markdown-header-delimiter-face 'markdown-header-delimiter-face
-  "Face name to use as a base for header delimiters.")
-
-(defvar markdown-header-rule-face 'markdown-header-rule-face
-  "Face name to use as a base for header rules.")
-
-(defvar markdown-header-face 'markdown-header-face
-  "Face name to use as a base for headers.")
-
-(defvar markdown-header-face-1 'markdown-header-face-1
-  "Face name to use for level-1 headers.")
-
-(defvar markdown-header-face-2 'markdown-header-face-2
-  "Face name to use for level-2 headers.")
-
-(defvar markdown-header-face-3 'markdown-header-face-3
-  "Face name to use for level-3 headers.")
-
-(defvar markdown-header-face-4 'markdown-header-face-4
-  "Face name to use for level-4 headers.")
-
-(defvar markdown-header-face-5 'markdown-header-face-5
-  "Face name to use for level-5 headers.")
-
-(defvar markdown-header-face-6 'markdown-header-face-6
-  "Face name to use for level-6 headers.")
-
-(defvar markdown-inline-code-face 'markdown-inline-code-face
-  "Face name to use for inline code.")
-
-(defvar markdown-list-face 'markdown-list-face
-  "Face name to use for list markers.")
-
-(defvar markdown-blockquote-face 'markdown-blockquote-face
-  "Face name to use for blockquote.")
-
-(defvar markdown-pre-face 'markdown-pre-face
-  "Face name to use for preformatted text.")
-
-(defvar markdown-language-keyword-face 'markdown-language-keyword-face
-  "Face name to use for programming language identifiers.")
-
-(defvar markdown-link-face 'markdown-link-face
-  "Face name to use for links.")
-
-(defvar markdown-missing-link-face 'markdown-missing-link-face
-  "Face name to use for links where the linked file does not exist.")
-
-(defvar markdown-reference-face 'markdown-reference-face
-  "Face name to use for reference.")
-
-(defvar markdown-footnote-face 'markdown-footnote-face
-  "Face name to use for footnote identifiers.")
-
-(defvar markdown-url-face 'markdown-url-face
-  "Face name to use for URLs.")
-
-(defvar markdown-link-title-face 'markdown-link-title-face
-  "Face name to use for reference link titles.")
-
-(defvar markdown-line-break-face 'markdown-line-break-face
-  "Face name to use for hard line breaks.")
-
-(defvar markdown-comment-face 'markdown-comment-face
-  "Face name to use for HTML comments.")
-
-(defvar markdown-math-face 'markdown-math-face
-  "Face name to use for LaTeX expressions.")
-
-(defvar markdown-metadata-key-face 'markdown-metadata-key-face
-  "Face name to use for metadata keys.")
-
-(defvar markdown-metadata-value-face 'markdown-metadata-value-face
-  "Face name to use for metadata values.")
-
-(defgroup markdown-faces nil
-  "Faces used in Markdown Mode"
-  :group 'markdown
-  :group 'faces)
-
-(defface markdown-italic-face
-  '((t (:inherit font-lock-variable-name-face :slant italic)))
-  "Face for italic text."
-  :group 'markdown-faces)
-
-(defface markdown-bold-face
-  '((t (:inherit font-lock-variable-name-face :weight bold)))
-  "Face for bold text."
-  :group 'markdown-faces)
-
-(defface markdown-strike-through-face
-  '((t (:inherit font-lock-variable-name-face :strike-through t)))
-  "Face for strike-through text."
-  :group 'markdown-faces)
-
-(defface markdown-header-rule-face
-  '((t (:inherit font-lock-function-name-face :weight bold)))
-  "Base face for headers rules."
-  :group 'markdown-faces)
-
-(defface markdown-header-delimiter-face
-  '((t (:inherit font-lock-function-name-face :weight bold)))
-  "Base face for headers hash delimiter."
-  :group 'markdown-faces)
-
-(defface markdown-header-face
-  '((t (:inherit font-lock-function-name-face :weight bold)))
-  "Base face for headers."
-  :group 'markdown-faces)
-
-(defface markdown-header-face-1
-  '((t (:inherit markdown-header-face)))
-  "Face for level-1 headers."
-  :group 'markdown-faces)
-
-(defface markdown-header-face-2
-  '((t (:inherit markdown-header-face)))
-  "Face for level-2 headers."
-  :group 'markdown-faces)
-
-(defface markdown-header-face-3
-  '((t (:inherit markdown-header-face)))
-  "Face for level-3 headers."
-  :group 'markdown-faces)
-
-(defface markdown-header-face-4
-  '((t (:inherit markdown-header-face)))
-  "Face for level-4 headers."
-  :group 'markdown-faces)
-
-(defface markdown-header-face-5
-  '((t (:inherit markdown-header-face)))
-  "Face for level-5 headers."
-  :group 'markdown-faces)
-
-(defface markdown-header-face-6
-  '((t (:inherit markdown-header-face)))
-  "Face for level-6 headers."
-  :group 'markdown-faces)
-
-(defface markdown-inline-code-face
-  '((t (:inherit font-lock-constant-face)))
-  "Face for inline code."
-  :group 'markdown-faces)
-
-(defface markdown-list-face
-  '((t (:inherit font-lock-builtin-face)))
-  "Face for list item markers."
-  :group 'markdown-faces)
-
-(defface markdown-blockquote-face
-  '((t (:inherit font-lock-doc-face)))
-  "Face for blockquote sections."
-  :group 'markdown-faces)
-
-(defface markdown-pre-face
-  '((t (:inherit font-lock-constant-face)))
-  "Face for preformatted text."
-  :group 'markdown-faces)
-
-(defface markdown-language-keyword-face
-  '((t (:inherit font-lock-type-face)))
-  "Face for programming language identifiers."
-  :group 'markdown-faces)
-
-(defface markdown-link-face
-  '((t (:inherit font-lock-keyword-face)))
-  "Face for links."
-  :group 'markdown-faces)
-
-(defface markdown-missing-link-face
-  '((t (:inherit font-lock-warning-face)))
-  "Face for missing links."
-  :group 'markdown-faces)
-
-(defface markdown-reference-face
-  '((t (:inherit font-lock-type-face)))
-  "Face for link references."
-  :group 'markdown-faces)
-
-(defface markdown-footnote-face
-  '((t (:inherit font-lock-keyword-face)))
-  "Face for footnote markers."
-  :group 'markdown-faces)
-
-(defface markdown-url-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for URLs."
-  :group 'markdown-faces)
-
-(defface markdown-link-title-face
-  '((t (:inherit font-lock-comment-face)))
-  "Face for reference link titles."
-  :group 'markdown-faces)
-
-(defface markdown-line-break-face
-  '((t (:inherit font-lock-constant-face :underline t)))
-  "Face for hard line breaks."
-  :group 'markdown-faces)
-
-(defface markdown-comment-face
-  '((t (:inherit font-lock-comment-face)))
-  "Face for HTML comments."
-  :group 'markdown-faces)
-
-(defface markdown-math-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for LaTeX expressions."
-  :group 'markdown-faces)
-
-(defface markdown-metadata-key-face
-  '((t (:inherit font-lock-variable-name-face)))
-  "Face for metadata keys."
-  :group 'markdown-faces)
-
-(defface markdown-metadata-value-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for metadata values."
-  :group 'markdown-faces)
-
-(defconst markdown-regex-link-inline
-  "\\(!\\)?\\(\\[\\([^]^][^]]*\\|\\)\\]\\)\\((\\([^)]*?\\)\\(?:\\s-+\\(\"[^\"]*\"\\)\\)?)\\)"
-  "Regular expression for a [text](file) or an image link ![text](file).
-Group 1 matches the leading exclamation point, if any.
-Group 2 matchs the entire square bracket term, including the text.
-Group 3 matches the text inside the square brackets.
-Group 4 matches the entire parenthesis term, including the URL and title.
-Group 5 matches the URL.
-Group 6 matches (optional) title.")
-
-(defconst markdown-regex-link-reference
-  "\\(!\\)?\\(\\[\\([^]^][^]]*\\|\\)\\]\\)[ ]?\\(\\[\\([^]]*?\\)\\]\\)"
-  "Regular expression for a reference link [text][id].
-Group 1 matches the leading exclamation point, if any.
-Group 2 matchs the entire first square bracket term, including the text.
-Group 3 matches the text inside the square brackets.
-Group 4 matches the entire second square bracket term.
-Group 5 matches the reference label.")
-
-(defconst markdown-regex-reference-definition
-  "^ \\{0,3\\}\\(\\[[^\n]+?\\]\\):\\s *\\(.*?\\)\\s *\\( \"[^\"]*\"$\\|$\\)"
-  "Regular expression for a link definition [id]: ...")
-
-(defconst markdown-regex-footnote
-  "\\(\\[\\^.+?\\]\\)"
-  "Regular expression for a footnote marker [^fn].")
-
-(defconst markdown-regex-header
-  "^\\(?:\\(.+\\)\n\\(=+\\)\\|\\(.+\\)\n\\(-+\\)\\|\\(#+\\)\\s-*\\(.*?\\)\\s-*?\\(#*\\)\\)$"
-  "Regexp identifying Markdown headers.")
-
-(defconst markdown-regex-header-1-atx
-  "^\\(#\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for level 1 atx-style (hash mark) headers.")
-
-(defconst markdown-regex-header-2-atx
-  "^\\(##\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for level 2 atx-style (hash mark) headers.")
-
-(defconst markdown-regex-header-3-atx
-  "^\\(###\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for level 3 atx-style (hash mark) headers.")
-
-(defconst markdown-regex-header-4-atx
-  "^\\(####\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for level 4 atx-style (hash mark) headers.")
-
-(defconst markdown-regex-header-5-atx
-  "^\\(#####\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for level 5 atx-style (hash mark) headers.")
-
-(defconst markdown-regex-header-6-atx
-  "^\\(######\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for level 6 atx-style (hash mark) headers.")
-
-(defconst markdown-regex-header-1-setext
-  "^\\(.*\\)\n\\(=+\\)$"
-  "Regular expression for level 1 setext-style (underline) headers.")
-
-(defconst markdown-regex-header-2-setext
-  "^\\(.*\\)\n\\(-+\\)$"
-  "Regular expression for level 2 setext-style (underline) headers.")
-
-(defconst markdown-regex-header-setext
-  "^\\(.+\\)\n\\(\\(?:=\\|-\\)+\\)$"
-  "Regular expression for generic setext-style (underline) headers.")
-
-(defconst markdown-regex-header-atx
-  "^\\(#+\\)[ \t]*\\(.*?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for generic atx-style (hash mark) headers.")
-
-(defconst markdown-regex-hr
-  "^\\(\\*[ ]?\\*[ ]?\\*[ ]?[\\* ]*\\|-[ ]?-[ ]?-[--- ]*\\)$"
-  "Regular expression for matching Markdown horizontal rules.")
-
-(defconst markdown-regex-code
-  "\\(\\`\\|[^\\]\\)\\(\\(`+\\)\\(\\(.\\|\n[^\n]\\)*?[^`]\\)\\3\\)\\([^`]\\|\\'\\)"
-  "Regular expression for matching inline code fragments.
-
-The first group ensures that the leading backquote character
-is not escaped.  The group \\(.\\|\n[^\n]\\) matches any
-character, including newlines, but not two newlines in a row.
-The final group requires that the character following the code
-fragment is not a backquote.")
-
-(defconst markdown-regex-pre
-  "^\\(    \\|\t\\).*$"
-  "Regular expression for matching preformatted text sections.")
-
-(defconst markdown-regex-list
-  "^\\([ \t]*\\)\\([0-9]+\\.\\|[\\*\\+-]\\)\\([ \t]+\\)"
-  "Regular expression for matching list items.")
-
-(defconst markdown-regex-bold
-  "\\(^\\|[^\\]\\)\\(\\([*_]\\{2\\}\\)\\([^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\3\\)\\)"
-  "Regular expression for matching bold text.
-Group 1 matches the character before the opening asterisk or
-underscore, if any, ensuring that it is not a backslash escape.
-Group 2 matches the entire expression, including delimiters.
-Groups 3 and 5 matches the opening and closing delimiters.
-Group 4 matches the text inside the delimiters.")
-
-(defconst markdown-regex-italic
-  "\\(^\\|[^\\]\\)\\(\\([*_]\\)\\([^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\3\\)\\)"
-  "Regular expression for matching italic text.
-Group 1 matches the character before the opening asterisk or
-underscore, if any, ensuring that it is not a backslash escape.
-Group 2 matches the entire expression, including delimiters.
-Groups 3 and 5 matches the opening and closing delimiters.
-Group 4 matches the text inside the delimiters.")
-
-(defconst markdown-regex-strike-through
-  "\\(^\\|[^\\]\\)\\(\\(~~\\)\\([^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(~~\\)\\)"
-  "Regular expression for matching strike-through text.
-Group 1 matches the character before the opening tilde, if any,
-ensuring that it is not a backslash escape.
-Group 2 matches the entire expression, including delimiters.
-Groups 3 and 5 matches the opening and closing delimiters.
-Group 4 matches the text inside the delimiters.")
-
-(defconst markdown-regex-gfm-italic
-  "\\(^\\|\\s-\\)\\(\\([*_]\\)\\([^ \\]\\3\\|[^ ]\\(.\\|\n[^\n]\\)*?[^\\ ]\\3\\)\\)"
-  "Regular expression for matching italic text in GitHub Flavored Markdown.
-Underscores in words are not treated as special.")
-
-(defconst markdown-regex-blockquote
-  "^[ \t]*\\(>\\).*$"
-  "Regular expression for matching blockquote lines.")
-
-(defconst markdown-regex-line-break
-  "[^ \n\t][ \t]*\\(  \\)$"
-  "Regular expression for matching line breaks.")
-
-(defconst markdown-regex-wiki-link
-  "\\(?:^\\|[^\\]\\)\\(\\[\\[\\([^]|]+\\)\\(|\\([^]]+\\)\\)?\\]\\]\\)"
-  "Regular expression for matching wiki links.
-This matches typical bracketed [[WikiLinks]] as well as 'aliased'
-wiki links of the form [[PageName|link text]].  In this regular
-expression, group 1 matches the entire link, including square
-brackets, group 2 matches the first component of the wiki link
-and group 4 matches the second component, after the pipe, when
-present.  The meanings of the first and second components depend
-on the value of `markdown-wiki-link-alias-first'.")
-
-(defconst markdown-regex-uri
-  (concat (regexp-opt markdown-uri-types) ":[^]\t\n\r<>,;() ]+")
-  "Regular expression for matching inline URIs.")
-
-(defconst markdown-regex-angle-uri
-  (concat "\\(<\\)\\(" (regexp-opt markdown-uri-types) ":[^]\t\n\r<>,;()]+\\)\\(>\\)")
-  "Regular expression for matching inline URIs in angle brackets.")
-
-(defconst markdown-regex-email
-  "<\\(\\(\\sw\\|\\s_\\|\\s.\\)+@\\(\\sw\\|\\s_\\|\\s.\\)+\\)>"
-  "Regular expression for matching inline email addresses.")
-
-(defconst markdown-regex-link-generic
-  (concat "\\(?:" markdown-regex-wiki-link
-          "\\|" markdown-regex-link-inline
-          "\\|" markdown-regex-link-reference
-          "\\|" markdown-regex-angle-uri "\\)")
-  "Regular expression for matching any recognized link.")
-
-(defconst markdown-regex-block-separator
-  "\\(\\`\\|\\(\n[ \t]*\n\\)[^\n \t]\\)"
-  "Regular expression for matching block boundaries.")
-
-(defconst markdown-regex-math-inline
-  "\\(^\\|[^\\]\\)\\(\\$\\($\\([^\\$]\\|\\\\.\\)*\\$\\|\\([^\\$]\\|\\\\.\\)*\\)\\$\\)"
-  "Regular expression for itex $..$ or $$..$$ math mode expressions.")
-
-(defconst markdown-regex-math-display
-  "^\\\\\\[\\(.\\|\n\\)*?\\\\\\]$"
-  "Regular expression for itex \[..\] display mode expressions.")
-
-(defconst markdown-regex-multimarkdown-metadata
-  "^\\([[:alpha:]][[:alpha:] _-]*?\\):[ \t]*\\(.*\\)$"
-  "Regular expression for matching MultiMarkdown metadata.")
-
-(defconst markdown-regex-pandoc-metadata
-  "^\\(%\\)[ \t]*\\(.*\\)$"
-  "Regular expression for matching Pandoc metadata.")
-
-(defvar markdown-mode-font-lock-keywords-basic
-  (list
-   (cons 'markdown-match-fenced-code-blocks '((0 markdown-pre-face)))
-   (cons 'markdown-match-pre-blocks '((0 markdown-pre-face)))
-   (cons markdown-regex-blockquote 'markdown-blockquote-face)
-   (cons markdown-regex-header-1-setext '((1 markdown-header-face-1)
-                                          (2 markdown-header-rule-face)))
-   (cons markdown-regex-header-2-setext '((1 markdown-header-face-2)
-                                          (2 markdown-header-rule-face)))
-   (cons markdown-regex-header-6-atx '((1 markdown-header-delimiter-face)
-                                       (2 markdown-header-face-6)
-                                       (3 markdown-header-delimiter-face)))
-   (cons markdown-regex-header-5-atx '((1 markdown-header-delimiter-face)
-                                       (2 markdown-header-face-5)
-                                       (3 markdown-header-delimiter-face)))
-   (cons markdown-regex-header-4-atx '((1 markdown-header-delimiter-face)
-                                       (2 markdown-header-face-4)
-                                       (3 markdown-header-delimiter-face)))
-   (cons markdown-regex-header-3-atx '((1 markdown-header-delimiter-face)
-                                       (2 markdown-header-face-3)
-                                       (3 markdown-header-delimiter-face)))
-   (cons markdown-regex-header-2-atx '((1 markdown-header-delimiter-face)
-                                       (2 markdown-header-face-2)
-                                       (3 markdown-header-delimiter-face)))
-   (cons markdown-regex-header-1-atx '((1 markdown-header-delimiter-face)
-                                       (2 markdown-header-face-1)
-                                       (3 markdown-header-delimiter-face)))
-   (cons 'markdown-match-multimarkdown-metadata '((1 markdown-metadata-key-face)
-                                                  (2 markdown-metadata-value-face)))
-   (cons 'markdown-match-pandoc-metadata '((1 markdown-comment-face)
-                                           (2 markdown-metadata-value-face)))
-   (cons markdown-regex-hr 'markdown-header-face)
-   (cons 'markdown-match-comments '((0 markdown-comment-face)))
-   (cons 'markdown-match-code '((0 markdown-inline-code-face)))
-   (cons markdown-regex-angle-uri 'markdown-link-face)
-   (cons markdown-regex-uri 'markdown-link-face)
-   (cons markdown-regex-email 'markdown-link-face)
-   (cons markdown-regex-list '(2 markdown-list-face))
-   (cons markdown-regex-footnote 'markdown-footnote-face)
-   (cons markdown-regex-link-inline '((1 markdown-link-face t t)
-                                      (2 markdown-link-face t)
-                                      (4 markdown-url-face t)
-                                      (6 markdown-link-title-face t t)))
-   (cons markdown-regex-link-reference '((1 markdown-link-face t t)
-                                         (2 markdown-link-face t)
-                                         (4 markdown-reference-face t)))
-   (cons markdown-regex-reference-definition '((1 markdown-reference-face t)
-                                               (2 markdown-url-face t)
-                                               (3 markdown-link-title-face t)))
-   (cons markdown-regex-bold '(2 markdown-bold-face))
-   (cons markdown-regex-line-break '(1 markdown-line-break-face prepend))
-   )
-  "Syntax highlighting for Markdown files.")
-
-(defvar markdown-mode-font-lock-keywords-core
-  (list
-   (cons markdown-regex-italic '(2 markdown-italic-face))
-   )
-  "Additional syntax highlighting for Markdown files.
-Includes features which are overridden by some variants.")
-
-(defconst markdown-mode-font-lock-keywords-math
-  (list
-   ;; Math mode $..$ or $$..$$
-   (cons markdown-regex-math-inline '(2 markdown-math-face))
-   ;; Display mode equations with brackets: \[ \]
-   (cons markdown-regex-math-display 'markdown-math-face)
-   ;; Equation reference (eq:foo)
-   (cons "(eq:[[:alnum:]:_]+)" 'markdown-reference-face)
-   ;; Equation reference \eqref{foo}
-   (cons "\\\\eqref{[[:alnum:]:_]+}" 'markdown-reference-face))
-  "Syntax highlighting for LaTeX and itex fragments.")
-
-(defvar markdown-mode-font-lock-keywords nil
-  "Default highlighting expressions for Markdown mode.
-This variable is defined as a buffer-local variable for dynamic
-extension support.")
-
-;; Footnotes
-(defvar markdown-footnote-counter 0
-  "Counter for footnote numbers.")
-(make-variable-buffer-local 'markdown-footnote-counter)
-
-(defconst markdown-footnote-chars
-  "[[:alnum:]-]"
-  "Regular expression maching any character that is allowed in a footnote identifier.")
-
-(defconst markdown-regex-footnote-definition
-  (concat "^\\[\\(\\^" markdown-footnote-chars "*?\\)\\]:\\(?:[ \t]+\\|$\\)")
-  "Regular expression matching a footnote definition, capturing the label.")
-
-
-;;; Compatibility =============================================================
-
-(defun markdown-replace-regexp-in-string (regexp rep string)
-  "Replace ocurrences of REGEXP with REP in STRING.
-This is a compatibility wrapper to provide `replace-regexp-in-string'
-in XEmacs 21."
-  (if (featurep 'xemacs)
-      (replace-in-string string regexp rep)
-    (replace-regexp-in-string regexp rep string)))
-
-;; `markdown-use-region-p' is a compatibility function which checks
-;; for an active region, with fallbacks for older Emacsen and XEmacs.
-(eval-and-compile
-  (cond
-   ;; Emacs 23 and newer
-   ((fboundp 'use-region-p)
-    (defalias 'markdown-use-region-p 'use-region-p))
-   ;; Older Emacsen
-   ((and (boundp 'transient-mark-mode) (boundp 'mark-active))
-    (defun markdown-use-region-p ()
-      "Compatibility wrapper to provide `use-region-p'."
-      (and transient-mark-mode mark-active)))
-   ;; XEmacs
-   ((fboundp 'region-active-p)
-    (defalias 'markdown-use-region-p 'region-active-p))))
-
-(defun markdown-use-buttons-p ()
-  "Determine whether this Emacs supports buttons."
-  (or (featurep 'button) (locate-library "button")))
-
-
-;;; Markdown Parsing Functions ================================================
-
-(defun markdown-cur-line-blank-p ()
-  "Return t if the current line is blank and nil otherwise."
-  (save-excursion
-    (beginning-of-line)
-    (re-search-forward "^\\s *$" (line-end-position) t)))
-
-(defun markdown-prev-line-blank-p ()
-  "Return t if the previous line is blank and nil otherwise.
-If we are at the first line, then consider the previous line to be blank."
-  (or (= (line-beginning-position) (point-min))
-      (save-excursion
-        (forward-line -1)
-        (markdown-cur-line-blank-p))))
-
-(defun markdown-next-line-blank-p ()
-  "Return t if the next line is blank and nil otherwise.
-If we are at the last line, then consider the next line to be blank."
-  (or (= (line-end-position) (point-max))
-      (save-excursion
-        (forward-line 1)
-        (markdown-cur-line-blank-p))))
-
-(defun markdown-prev-line-indent-p ()
-  "Return t if the previous line is indented and nil otherwise."
-  (save-excursion
-    (if (= (line-beginning-position) (point-min))
-        nil
-      (forward-line -1)
-      (goto-char (line-beginning-position))
-      (if (re-search-forward "^\\s " (line-end-position) t) t))))
-
-(defun markdown-cur-line-indent ()
-  "Return the number of leading whitespace characters in the current line."
-  (save-match-data
-    (save-excursion
-      (goto-char (line-beginning-position))
-      (re-search-forward "^[ \t]+" (line-end-position) t)
-      (current-column))))
-
-(defun markdown-prev-line-indent ()
-  "Return the number of leading whitespace characters in the previous line.
-Return 0 if the current line is the first line in the buffer."
-  (save-excursion
-    (if (= (line-beginning-position) (point-min))
-        0
-      (forward-line -1)
-      (markdown-cur-line-indent))))
-
-(defun markdown-next-line-indent ()
-  "Return the number of leading whitespace characters in the next line.
-Return 0 if line is the last line in the buffer."
-  (save-excursion
-    (if (= (line-end-position) (point-max))
-        0
-      (forward-line 1)
-      (markdown-cur-line-indent))))
-
-(defun markdown-cur-non-list-indent ()
-  "Return beginning position of list item text (not including the list marker).
-Return nil if the current line is not the beginning of a list item."
-  (save-match-data
-    (save-excursion
-      (beginning-of-line)
-      (when (re-search-forward markdown-regex-list (line-end-position) t)
-        (current-column)))))
-
-(defun markdown-prev-non-list-indent ()
-  "Return position of the first non-list-marker on the previous line."
-  (save-excursion
-    (forward-line -1)
-    (markdown-cur-non-list-indent)))
-
-(defun markdown-new-baseline-p ()
-  "Determine if the current line begins a new baseline level."
-  (save-excursion
-    (beginning-of-line)
-    (save-match-data
-      (or (looking-at markdown-regex-header)
-          (looking-at markdown-regex-hr)
-          (and (null (markdown-cur-non-list-indent))
-               (= (markdown-cur-line-indent) 0)
-               (markdown-prev-line-blank-p))))))
-
-(defun markdown-search-backward-baseline ()
-  "Search backward baseline point with no indentation and not a list item."
-  (end-of-line)
-  (let (stop)
-    (while (not (or stop (bobp)))
-      (re-search-backward markdown-regex-block-separator nil t)
-      (when (match-end 2)
-        (goto-char (match-end 2))
-        (cond
-         ((markdown-new-baseline-p)
-          (setq stop t))
-         ((looking-at markdown-regex-list)
-          (setq stop nil))
-         (t (setq stop t)))))))
-
-(defun markdown-update-list-levels (marker indent levels)
-  "Update list levels given list MARKER, block INDENT, and current LEVELS.
-Here, MARKER is a string representing the type of list, INDENT is an integer
-giving the indentation, in spaces, of the current block, and LEVELS is a
-list of the indentation levels of parent list items.  When LEVELS is nil,
-it means we are at baseline (not inside of a nested list)."
-  (cond
-   ;; New list item at baseline.
-   ((and marker (null levels))
-    (setq levels (list indent)))
-   ;; List item with greater indentation (four or more spaces).
-   ;; Increase list level.
-   ((and marker (>= indent (+ (car levels) 4)))
-    (setq levels (cons indent levels)))
-   ;; List item with greater or equal indentation (less than four spaces).
-   ;; Do not increase list level.
-   ((and marker (>= indent (car levels)))
-    levels)
-   ;; Lesser indentation level.
-   ;; Pop appropriate number of elements off LEVELS list (e.g., lesser
-   ;; indentation could move back more than one list level).  Note
-   ;; that this block need not be the beginning of list item.
-   ((< indent (car levels))
-    (while (and (> (length levels) 1)
-                (< indent (+ (cadr levels) 4)))
-      (setq levels (cdr levels)))
-    levels)
-   ;; Otherwise, do nothing.
-   (t levels)))
-
-(defun markdown-calculate-list-levels ()
-  "Calculate list levels at point.
-Return a list of the form (n1 n2 n3 ...) where n1 is the
-indentation of the deepest nested list item in the branch of
-the list at the point, n2 is the indentation of the parent
-list item, and so on.  The depth of the list item is therefore
-the length of the returned list.  If the point is not at or
-immediately  after a list item, return nil."
-  (save-excursion
-    (let ((first (point)) levels indent pre-regexp)
-      ;; Find a baseline point with zero list indentation
-      (markdown-search-backward-baseline)
-      ;; Search for all list items between baseline and LOC
-      (while (and (< (point) first)
-                  (re-search-forward markdown-regex-list first t))
-        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" (1+ (length levels))))
-        (beginning-of-line)
-        (cond
-         ;; Make sure this is not a header or hr
-         ((markdown-new-baseline-p) (setq levels nil))
-         ;; Make sure this is not a line from a pre block
-         ((looking-at pre-regexp))
-         ;; If not, then update levels
-         (t
-          (setq indent (markdown-cur-line-indent))
-          (setq levels (markdown-update-list-levels (match-string 2)
-                                                    indent levels))))
-        (end-of-line))
-      levels)))
-
-(defun markdown-prev-list-item (level)
-  "Search backward from point for a list item with indentation LEVEL.
-Set point to the beginning of the item, and return point, or nil
-upon failure."
-  (let (bounds indent prev)
-    (setq prev (point))
-    (forward-line -1)
-    (setq indent (markdown-cur-line-indent))
-    (while
-        (cond
-         ;; Stop at beginning of buffer
-         ((bobp) (setq prev nil))
-         ;; Continue if current line is blank
-         ((markdown-cur-line-blank-p) t)
-         ;; List item
-         ((and (looking-at markdown-regex-list)
-               (setq bounds (markdown-cur-list-item-bounds)))
-          (cond
-           ;; Continue at item with greater indentation
-           ((> (nth 3 bounds) level) t)
-           ;; Stop and return point at item of equal indentation
-           ((= (nth 3 bounds) level)
-            (setq prev (point))
-            nil)
-           ;; Stop and return nil at item with lesser indentation
-           ((< (nth 3 bounds) level)
-            (setq prev nil)
-            nil)))
-         ;; Continue while indentation is the same or greater
-         ((>= indent level) t)
-         ;; Stop if current indentation is less than list item
-         ;; and the next is blank
-         ((and (< indent level)
-               (markdown-next-line-blank-p))
-          (setq prev nil))
-         ;; Stop at a header
-         ((looking-at markdown-regex-header) (setq prev nil))
-         ;; Stop at a horizontal rule
-         ((looking-at markdown-regex-hr) (setq prev nil))
-         ;; Otherwise, continue.
-         (t t))
-      (forward-line -1)
-      (setq indent (markdown-cur-line-indent)))
-    prev))
-
-(defun markdown-next-list-item (level)
-  "Search forward from point for the next list item with indentation LEVEL.
-Set point to the beginning of the item, and return point, or nil
-upon failure."
-  (let (bounds indent prev next)
-    (setq next (point))
-    (forward-line)
-    (setq indent (markdown-cur-line-indent))
-    (while
-        (cond
-         ;; Stop at end of the buffer.
-         ((eobp) (setq prev nil))
-         ;; Continue if the current line is blank
-         ((markdown-cur-line-blank-p) t)
-         ;; List item
-         ((and (looking-at markdown-regex-list)
-               (setq bounds (markdown-cur-list-item-bounds)))
-          (cond
-           ;; Continue at item with greater indentation
-           ((> (nth 3 bounds) level) t)
-           ;; Stop and return point at item of equal indentation
-           ((= (nth 3 bounds) level)
-            (setq next (point))
-            nil)
-           ;; Stop and return nil at item with lesser indentation
-           ((< (nth 3 bounds) level)
-            (setq next nil)
-            nil)))
-         ;; Continue while indentation is the same or greater
-         ((>= indent level) t)
-         ;; Stop if current indentation is less than list item
-         ;; and the previous line was blank.
-         ((and (< indent level)
-               (markdown-prev-line-blank-p))
-          (setq next nil))
-         ;; Stop at a header
-         ((looking-at markdown-regex-header) (setq next nil))
-         ;; Stop at a horizontal rule
-         ((looking-at markdown-regex-hr) (setq next nil))
-         ;; Otherwise, continue.
-         (t t))
-      (forward-line)
-      (setq indent (markdown-cur-line-indent)))
-    next))
-
-(defun markdown-cur-list-item-end (level)
-  "Move to the end of the current list item with nonlist indentation LEVEL.
-If the point is not in a list item, do nothing."
-  (let (indent)
-    (forward-line)
-    (setq indent (markdown-cur-line-indent))
-    (while
-        (cond
-         ;; Stop at end of the buffer.
-         ((eobp) nil)
-         ;; Continue if the current line is blank
-         ((markdown-cur-line-blank-p) t)
-         ;; Continue while indentation is the same or greater
-         ((>= indent level) t)
-         ;; Stop if current indentation is less than list item
-         ;; and the previous line was blank.
-         ((and (< indent level)
-               (markdown-prev-line-blank-p))
-          nil)
-         ;; Stop at a new list item of the same or lesser indentation
-         ((looking-at markdown-regex-list) nil)
-         ;; Stop at a header
-         ((looking-at markdown-regex-header) nil)
-         ;; Stop at a horizontal rule
-         ((looking-at markdown-regex-hr) nil)
-         ;; Otherwise, continue.
-         (t t))
-      (forward-line)
-      (setq indent (markdown-cur-line-indent)))
-    ;; Don't skip over whitespace for empty list items (marker and
-    ;; whitespace only), just move to end of whitespace.
-    (if (looking-back (concat markdown-regex-list "\\s-*"))
-          (goto-char (match-end 3))
-      (skip-syntax-backward "-"))))
-
-(defun markdown-cur-list-item-bounds ()
-  "Return bounds and indentation of the current list item.
-Return a list of the form (begin end indent nonlist-indent marker).
-If the point is not inside a list item, return nil.
-Leave match data intact for `markdown-regex-list'."
-  (let (cur prev-begin prev-end indent nonlist-indent marker)
-    ;; Store current location
-    (setq cur (point))
-    ;; Verify that cur is between beginning and end of item
-    (save-excursion
-      (end-of-line)
-      (when (re-search-backward markdown-regex-list nil t)
-        (setq prev-begin (match-beginning 0))
-        (setq indent (length (match-string 1)))
-        (setq nonlist-indent (length (match-string 0)))
-        (setq marker (concat (match-string 2) (match-string 3)))
-        (save-match-data
-          (markdown-cur-list-item-end nonlist-indent)
-          (setq prev-end (point)))
-        (when (and (>= cur prev-begin)
-                   (<= cur prev-end)
-                   nonlist-indent)
-          (list prev-begin prev-end indent nonlist-indent marker))))))
-
-(defun markdown-bounds-of-thing-at-point (thing)
-  "Call `bounds-of-thing-at-point' for THING with slight modifications.
-Does not include trailing newlines when THING is 'line.  Handles the
-end of buffer case by setting both endpoints equal to the value of
-`point-max', since an empty region will trigger empty markup insertion.
-Return bounds of form (beg . end) if THING is found, or nil otherwise."
-  (let* ((bounds (bounds-of-thing-at-point thing))
-         (a (car bounds))
-         (b (cdr bounds)))
-    (when bounds
-      (when (eq thing 'line)
-        (cond ((and (eobp) (markdown-cur-line-blank-p))
-               (setq a b))
-              ((char-equal (char-before b) ?\^J)
-               (setq b (1- b)))))
-      (cons a b))))
-
-(defun markdown-reference-definition (reference)
-  "Find out whether Markdown REFERENCE is defined.
-REFERENCE should include the square brackets, like [this].
-When REFERENCE is defined, return a list of the form (text start end)
-containing the definition text itself followed by the start and end
-locations of the text.  Otherwise, return nil.
-Leave match data for `markdown-regex-reference-definition'
-intact additional processing."
-  (let ((reference (downcase reference)))
-    (save-excursion
-      (goto-char (point-min))
-      (catch 'found
-        (while (re-search-forward markdown-regex-reference-definition nil t)
-          (when (string= reference (downcase (match-string-no-properties 1)))
-            (throw 'found
-                   (list (match-string-no-properties 2)
-                         (match-beginning 2) (match-end 2)))))))))
-
-(defun markdown-get-defined-references ()
-  "Return a list of all defined reference labels (including square brackets)."
-  (save-excursion
-    (goto-char (point-min))
-    (let (refs)
-      (while (re-search-forward markdown-regex-reference-definition nil t)
-        (let ((target (match-string-no-properties 1)))
-          (add-to-list 'refs target t)))
-      refs)))
-
-(defun markdown-code-at-point-p ()
-  "Return non-nil if the point is at an inline code fragment.
-Return nil otherwise.  Set match data according to
-`markdown-match-code' upon success.
-This function searches the block for a code fragment that
-contains the point using `markdown-match-code'.  We do this
-because `thing-at-point-looking-at' does not work reliably with
-`markdown-regex-code'."
-  (interactive)
-  (save-excursion
-    (let ((old-point (point))
-          (end-of-block (progn (markdown-end-of-block) (point)))
-          found)
-      (markdown-beginning-of-block)
-      (while (and (markdown-match-code end-of-block)
-                  (setq found t)
-                  (< (match-end 0) old-point)))
-      (and found                              ; matched something
-           (<= (match-beginning 0) old-point) ; match contains old-point
-           (>= (match-end 0) old-point)))))
-
-
-;;; Markdown Font Lock Matching Functions =====================================
-
-(defun markdown-match-comments (last)
-  "Match HTML comments from the point to LAST."
-  (cond ((search-forward "<!--" last t)
-         (backward-char 4)
-         (let ((beg (point)))
-           (cond ((search-forward-regexp "--[ \t]*>" last t)
-                  (set-match-data (list beg (point)))
-                  t)
-                 (t nil))))
-        (t nil)))
-
-(defun markdown-match-code (last)
-  "Match inline code from the point to LAST."
-  (unless (bobp)
-    (backward-char 1))
-  (cond ((re-search-forward markdown-regex-code last t)
-         (set-match-data (list (match-beginning 2) (match-end 2)
-                               (match-beginning 4) (match-end 4)))
-         (goto-char (match-end 0))
-         t)
-        (t (forward-char 2) nil)))
-
-(defun markdown-match-pre-blocks (last)
-  "Match Markdown pre blocks from point to LAST."
-  (let ((levels (markdown-calculate-list-levels))
-        indent pre-regexp end-regexp begin end stop)
-    (while (and (< (point) last) (not end))
-      ;; Search for a region with sufficient indentation
-      (if (null levels)
-          (setq indent 1)
-        (setq indent (1+ (length levels))))
-      (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" indent))
-      (setq end-regexp (format "^\\(    \\|\t\\)\\{0,%d\\}\\([^ \t]\\)" (1- indent)))
-
-      (cond
-       ;; If not at the beginning of a line, move forward
-       ((not (bolp)) (forward-line))
-       ;; Move past blank lines
-       ((markdown-cur-line-blank-p) (forward-line))
-       ;; At headers and horizontal rules, reset levels
-       ((markdown-new-baseline-p) (forward-line) (setq levels nil))
-       ;; If the current line has sufficient indentation, mark out pre block
-       ((looking-at pre-regexp)
-        (setq begin (match-beginning 0))
-        (while (and (or (looking-at pre-regexp) (markdown-cur-line-blank-p))
-                    (not (eobp)))
-          (forward-line))
-        (setq end (point)))
-       ;; If current line has a list marker, update levels, move to end of block
-       ((looking-at markdown-regex-list)
-        (setq levels (markdown-update-list-levels
-                      (match-string 2) (markdown-cur-line-indent) levels))
-        (markdown-end-of-block-element))
-       ;; If this is the end of the indentation level, adjust levels accordingly.
-       ;; Only match end of indentation level if levels is not the empty list.
-       ((and (car levels) (looking-at end-regexp))
-        (setq levels (markdown-update-list-levels
-                      nil (markdown-cur-line-indent) levels))
-        (markdown-end-of-block-element))
-       (t (markdown-end-of-block-element))))
-
-    (if (not (and begin end))
-        ;; Return nil if no pre block was found
-        nil
-      ;; Set match data and return t upon success
-      (set-match-data (list begin end))
-      t)))
-
-(defun markdown-match-fenced-code-blocks (last)
-  "Match fenced code blocks from the point to LAST."
-  (cond ((search-forward-regexp "^\\([~]\\{3,\\}\\)" last t)
-         (beginning-of-line)
-         (let ((beg (point)))
-           (forward-line)
-           (cond ((search-forward-regexp
-                   (concat "^" (match-string 1) "~*") last t)
-                  (set-match-data (list beg (point)))
-                  t)
-                 (t nil))))
-        (t nil)))
-
-(defun markdown-match-gfm-code-blocks (last)
-  "Match GFM quoted code blocks from point to LAST."
-  (let (open lang body close all)
-    (cond ((and (eq major-mode 'gfm-mode)
-                (search-forward-regexp "^\\(```\\)\\([^[:space:]]+[[:space:]]*\\)?$" last t))
-           (beginning-of-line)
-           (setq open (list (match-beginning 1) (match-end 1))
-                 lang (list (match-beginning 2) (match-end 2)))
-           (forward-line)
-           (setq body (list (point)))
-           (cond ((search-forward-regexp "^```$" last t)
-                  (setq body (reverse (cons (1- (match-beginning 0)) body))
-                        close (list (match-beginning 0) (match-end 0))
-                        all (list (car open) (match-end 0)))
-                  (set-match-data (append all open lang body close))
-                  t)
-                 (t nil)))
-          (t nil))))
-
-(defun markdown-match-generic-metadata (regexp last)
-  "Match generic metadata specified by REGEXP from the point to LAST."
-  (let ((header-end (save-excursion
-                      (goto-char (point-min))
-                      (if (re-search-forward "\n\n" (point-max) t)
-                          (match-beginning 0)
-                        (point-max)))))
-    (cond ((>= (point) header-end)
-           ;; Don't match anything outside of the header.
-           nil)
-          ((re-search-forward regexp (min last header-end) t)
-           ;; If a metadata item is found, it may span several lines.
-           (let ((key-beginning (match-beginning 1))
-                 (key-end (match-end 1))
-                 (value-beginning (match-beginning 2)))
-             (while (and (not (looking-at regexp))
-                         (not (> (point) (min last header-end)))
-                         (not (eobp)))
-               (forward-line))
-             (unless (eobp)
-               (forward-line -1)
-               (end-of-line))
-             (set-match-data (list key-beginning (point) ; complete metadata
-                                   key-beginning key-end ; key
-                                   value-beginning (point))) ; value
-           t))
-          (t nil))))
-
-(defun markdown-match-multimarkdown-metadata (last)
-  "Match MultiMarkdown metadata from the point to LAST."
-  (markdown-match-generic-metadata markdown-regex-multimarkdown-metadata last))
-
-(defun markdown-match-pandoc-metadata (last)
-  "Match Pandoc metadata from the point to LAST."
-  (markdown-match-generic-metadata markdown-regex-pandoc-metadata last))
-
-(defun markdown-font-lock-extend-region ()
-  "Extend the search region to include an entire block of text.
-This helps improve font locking for block constructs such as pre blocks."
-  ;; Avoid compiler warnings about these global variables from font-lock.el.
-  ;; See the documentation for variable `font-lock-extend-region-functions'.
-  (eval-when-compile (defvar font-lock-beg) (defvar font-lock-end))
-  (save-excursion
-    (goto-char font-lock-beg)
-    (unless (looking-back "\n\n")
-      (let ((found (or (re-search-backward "\n\n" nil t) (point-min))))
-        (goto-char font-lock-end)
-        (when (re-search-forward "\n\n" nil t)
-          (setq font-lock-end (match-beginning 0))
-          (setq font-lock-beg found))))))
-
-
-;;; Syntax Table ==============================================================
-
-(defvar markdown-mode-syntax-table
-  (let ((tab (make-syntax-table text-mode-syntax-table)))
-    (modify-syntax-entry ?\" "." tab)
-    tab)
-  "Syntax table for `markdown-mode'.")
-
-
-;;; Element Insertion =========================================================
-
-(defun markdown-ensure-blank-line-before ()
-  "If previous line is not already blank, insert a blank line before point."
-  (unless (bolp) (insert "\n"))
-  (unless (or (bobp) (looking-back "\n\\s-*\n")) (insert "\n")))
-
-(defun markdown-ensure-blank-line-after ()
-  "If following line is not already blank, insert a blank line after point.
-Return the point where it was originally."
-  (save-excursion
-    (unless (eolp) (insert "\n"))
-    (unless (or (eobp) (looking-at "\n\\s-*\n")) (insert "\n"))))
-
-(defun markdown-wrap-or-insert (s1 s2 &optional thing beg end)
-  "Insert the strings S1 and S2, wrapping around region or THING.
-If a region is specified by the optional BEG and END arguments,
-wrap the strings S1 and S2 around that region.
-If there is an active region, wrap the strings S1 and S2 around
-the region.  If there is not an active region but the point is at
-THING, wrap that thing (which defaults to word).  Otherwise, just
-insert S1 and S2 and place the cursor in between.  Return the
-bounds of the entire wrapped string, or nil if nothing was wrapped
-and S1 and S2 were only inserted."
-  (let (a b bounds new-point)
-    (cond
-     ;; Given region
-     ((and beg end)
-      (setq a beg
-            b end
-            new-point (+ (point) (length s1))))
-     ;; Active region
-     ((markdown-use-region-p)
-      (setq a (region-beginning)
-            b (region-end)
-            new-point (+ (point) (length s1))))
-     ;; Thing (word) at point
-     ((setq bounds (markdown-bounds-of-thing-at-point (or thing 'word)))
-      (setq a (car bounds)
-            b (cdr bounds)
-            new-point (+ (point) (length s1))))
-     ;; No active region and no word
-     (t
-      (setq a (point)
-            b (point))))
-    (goto-char b)
-    (insert s2)
-    (goto-char a)
-    (insert s1)
-    (when new-point (goto-char new-point))
-    (if (= a b)
-        nil
-      (setq b (+ b (length s1) (length s2)))
-      (cons a b))))
-
-(defun markdown-point-after-unwrap (cur prefix suffix)
-  "Return desired position of point after an unwrapping operation.
-CUR gives the position of the point before the operation.
-Additionally, two cons cells must be provided.  PREFIX gives the
-bounds of the prefix string and SUFFIX gives the bounds of the
-suffix string."
-  (cond ((< cur (cdr prefix)) (car prefix))
-        ((< cur (car suffix)) (- cur (- (cdr prefix) (car prefix))))
-        ((<= cur (cdr suffix))
-         (- cur (+ (- (cdr prefix) (car prefix))
-                   (- cur (car suffix)))))
-        (t cur)))
-
-(defun markdown-unwrap-thing-at-point (regexp all text)
-  "Remove prefix and suffix of thing at point and reposition the point.
-When the thing at point matches REGEXP, replace the subexpression
-ALL with the string in subexpression TEXT.  Reposition the point
-in an appropriate location accounting for the removal of prefix
-and suffix strings.  Return new bounds of string from group TEXT.
-When REGEXP is nil, assumes match data is already set."
-  (when (or (null regexp)
-            (thing-at-point-looking-at regexp))
-    (let ((cur (point))
-          (prefix (cons (match-beginning all) (match-beginning text)))
-          (suffix (cons (match-end text) (match-end all)))
-          (bounds (cons (match-beginning text) (match-end text))))
-      ;; Replace the thing at point
-      (replace-match (match-string text) t t nil all)
-      ;; Reposition the point
-      (goto-char (markdown-point-after-unwrap cur prefix suffix))
-      ;; Adjust bounds
-      (setq bounds (cons (car prefix)
-                         (- (cdr bounds) (- (cdr prefix) (car prefix))))))))
-
-(defun markdown-unwrap-things-in-region (beg end regexp all text)
-  "Remove prefix and suffix of all things in region from BEG to END.
-When a thing in the region matches REGEXP, replace the
-subexpression ALL with the string in subexpression TEXT.
-Return a cons cell containing updated bounds for the region."
-  (save-excursion
-    (goto-char beg)
-    (let ((removed 0) len-all len-text)
-      (while (re-search-forward regexp (- end removed) t)
-        (setq len-all (length (match-string-no-properties all)))
-        (setq len-text (length (match-string-no-properties text)))
-        (setq removed (+ removed (- len-all len-text)))
-        (replace-match (match-string text) t t nil all))
-      (cons beg (- end removed)))))
-
-(defun markdown-insert-hr (arg)
-  "Insert or replace a horizonal rule.
-By default, use the first element of `markdown-hr-strings'.  When
-ARG is non-nil, as when given a prefix, select a different
-element as follows.  When prefixed with \\[universal-argument],
-use the last element of `markdown-hr-strings' instead.  When
-prefixed with an integer from 1 to the length of
-`markdown-hr-strings', use the element in that position instead."
-  (interactive "*P")
-  (when (thing-at-point-looking-at markdown-regex-hr)
-    (delete-region (match-beginning 0) (match-end 0)))
-  (markdown-ensure-blank-line-before)
-  (cond ((equal arg '(4))
-         (insert (car (reverse markdown-hr-strings))))
-        ((and (integerp arg) (> arg 0)
-              (<= arg (length markdown-hr-strings)))
-         (insert (nth (1- arg) markdown-hr-strings)))
-        (t
-         (insert (car markdown-hr-strings))))
-  (markdown-ensure-blank-line-after))
-
-(defun markdown-insert-bold ()
-  "Insert markup to make a region or word bold.
-If there is an active region, make the region bold.  If the point
-is at a non-bold word, make the word bold.  If the point is at a
-bold word or phrase, remove the bold markup.  Otherwise, simply
-insert bold delimiters and place the cursor in between them."
-  (interactive)
-  (let ((delim (if markdown-bold-underscore "__" "**")))
-    (if (markdown-use-region-p)
-        ;; Active region
-        (let ((bounds (markdown-unwrap-things-in-region
-                       (region-beginning) (region-end)
-                       markdown-regex-bold 2 4)))
-          (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
-      ;; Bold markup removal, bold word at point, or empty markup insertion
-      (if (thing-at-point-looking-at markdown-regex-bold)
-          (markdown-unwrap-thing-at-point nil 2 4)
-        (markdown-wrap-or-insert delim delim 'word nil nil)))))
-
-(defun markdown-insert-italic ()
-  "Insert markup to make a region or word italic.
-If there is an active region, make the region italic.  If the point
-is at a non-italic word, make the word italic.  If the point is at an
-italic word or phrase, remove the italic markup.  Otherwise, simply
-insert italic delimiters and place the cursor in between them."
-  (interactive)
-  (let ((delim (if markdown-italic-underscore "_" "*")))
-    (if (markdown-use-region-p)
-        ;; Active region
-        (let ((bounds (markdown-unwrap-things-in-region
-                       (region-beginning) (region-end)
-                       markdown-regex-italic 2 4)))
-          (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
-      ;; Italic markup removal, italic word at point, or empty markup insertion
-      (if (thing-at-point-looking-at markdown-regex-italic)
-          (markdown-unwrap-thing-at-point nil 2 4)
-        (markdown-wrap-or-insert delim delim 'word nil nil)))))
-
-(defun markdown-insert-strike-through ()
-  "Insert markup to make a region or word strike-through.
-If there is an active region, make the region strike-through.  If the point
-is at a non-bold word, make the word strike-through.  If the point is at a
-strike-through word or phrase, remove the strike-through markup.  Otherwise,
-simply insert bold delimiters and place the cursor in between them."
-  (interactive)
-  (let ((delim "~~"))
-    (if (markdown-use-region-p)
-        ;; Active region
-        (let ((bounds (markdown-unwrap-things-in-region
-                       (region-beginning) (region-end)
-                       markdown-regex-strike-through 2 4)))
-          (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
-      ;; Strike-through markup removal, strike-through word at point, or empty markup insertion
-      (if (thing-at-point-looking-at markdown-regex-strike-through)
-          (markdown-unwrap-thing-at-point nil 2 4)
-        (markdown-wrap-or-insert delim delim 'word nil nil)))))
-
-(defun markdown-insert-code ()
-  "Insert markup to make a region or word an inline code fragment.
-If there is an active region, make the region an inline code
-fragment.  If the point is at a word, make the word an inline
-code fragment.  Otherwise, simply insert code delimiters and
-place the cursor in between them."
-  (interactive)
-  (if (markdown-use-region-p)
-      ;; Active region
-      (let ((bounds (markdown-unwrap-things-in-region
-                     (region-beginning) (region-end)
-                     markdown-regex-code 2 4)))
-        (markdown-wrap-or-insert "`" "`" nil (car bounds) (cdr bounds)))
-    ;; Code markup removal, code markup for word, or empty markup insertion
-    (if (markdown-code-at-point-p)
-        (markdown-unwrap-thing-at-point nil 0 1)
-      (markdown-wrap-or-insert "`" "`" 'word nil nil))))
-
-(defun markdown-insert-link ()
-  "Insert an inline link, using region or word as link text if possible.
-If there is an active region, use the region as the link text.  If the
-point is at a word, use the word as the link text.  In these cases, the
-point will be left at the position for inserting a URL.  If there is no
-active region and the point is not at word, simply insert link markup and
-place the point in the position to enter link text."
-  (interactive)
-  (let ((bounds (markdown-wrap-or-insert "[" "]()")))
-    (when bounds
-      (goto-char (- (cdr bounds) 1)))))
-
-(defun markdown-insert-reference-link (text label &optional url title)
-  "Insert a reference link and, optionally, a reference definition.
-The link TEXT will be inserted followed by the optional LABEL.
-If a URL is given, also insert a definition for the reference
-LABEL according to `markdown-reference-location'.  If a TITLE is
-given, it will be added to the end of the reference definition
-and will be used to populate the title attribute when converted
-to XHTML.  If URL is nil, insert only the link portion (for
-example, when a reference label is already defined)."
-  (insert (concat "[" text "][" label "]"))
-  (when url
-    (let ((end (point))
-          (label (if (> (length label) 0) label text)))
-      (cond
-       ((eq markdown-reference-location 'end) (goto-char (point-max)))
-       ((eq markdown-reference-location 'immediately) (markdown-end-of-block))
-       ((eq markdown-reference-location 'header) (markdown-end-of-defun)))
-      (unless (markdown-cur-line-blank-p) (insert "\n"))
-      (insert "\n[" label "]: " url)
-      (unless (> (length url) 0)
-        (setq end (point)))
-      (when (> (length title) 0)
-        (insert " \"" title "\""))
-      (insert "\n")
-      (unless (or (eobp) (looking-at "\n"))
-        (insert "\n"))
-      (goto-char end)
-      (when (> (length url) 0)
-        (message
-         (substitute-command-keys
-          "Defined reference [%s], press \\[markdown-jump] to jump there")
-         (or label text))))))
-
-(defun markdown-insert-reference-link-dwim ()
-  "Insert a reference link of the form [text][label] at point.
-If there is an active region, the text in the region will be used
-as the link text.  If the point is at an inline link, it will be
-converted to a reference link.  If the point is at a word, it will
-be used as the link text.  Otherwise, the link text will be read from
-the minibuffer.  The link label will be read from the minibuffer in
-both cases, with completion from the set of currently defined
-references.  To create an implicit reference link, press RET to
-accept the default, an empty label.  If the entered referenced
-label is not defined, additionally prompt for the URL
-and (optional) title.  The reference definition is placed at the
-location determined by `markdown-reference-location'."
-  (interactive)
-  (let* ((defined-labels (mapcar (lambda (x) (substring x 1 -1))
-                                 (markdown-get-defined-references)))
-         (switch (thing-at-point-looking-at markdown-regex-link-inline))
-         (bounds (cond ((markdown-use-region-p)
-                        (cons (region-beginning) (region-end)))
-                       (switch
-                        (cons (match-beginning 0) (match-end 0)))
-                       (t
-                        (markdown-bounds-of-thing-at-point 'word))))
-         (text (cond (switch (match-string 3))
-                     (bounds (buffer-substring (car bounds) (cdr bounds)))
-                     (t (read-string "Link Text: "))))
-         (label (completing-read
-                 "Link Label (default: none): " defined-labels
-                 nil nil nil 'markdown-reference-label-history nil))
-         (ref (save-match-data
-                (markdown-reference-definition
-                 (concat "[" (if (> (length label) 0) label text) "]"))))
-         (url (cond (ref nil)
-                    (switch (match-string 5))
-                    (t (read-string "Link URL: "))))
-         (title (cond
-                 ((= (length url) 0) nil)
-                 (switch (if (> (length (match-string 6)) 2)
-                             (substring (match-string 6) 1 -1)
-                           nil))
-                 (t (read-string "Link Title (optional): ")))))
-    (when bounds (delete-region (car bounds) (cdr bounds)))
-    (markdown-insert-reference-link text label url title)))
-
-(defun markdown-insert-uri ()
-  "Insert markup for an inline URI.
-If there is an active region, use it as the URI.  If the point is
-at a URI, wrap it with angle brackets.  If the point is at an
-inline URI, remove the angle brackets.  Otherwise, simply insert
-angle brackets place the point between them."
-  (interactive)
-  (if (markdown-use-region-p)
-      ;; Active region
-      (let ((bounds (markdown-unwrap-things-in-region
-                     (region-beginning) (region-end)
-                     markdown-regex-angle-uri 0 2)))
-        (markdown-wrap-or-insert "<" ">" nil (car bounds) (cdr bounds)))
-    ;; Markup removal, URI at point, or empty markup insertion
-    (if (thing-at-point-looking-at markdown-regex-angle-uri)
-        (markdown-unwrap-thing-at-point nil 0 2)
-      (markdown-wrap-or-insert "<" ">" 'url nil nil))))
-
-(defun markdown-insert-wiki-link ()
-  "Insert a wiki link of the form [[WikiLink]].
-If there is an active region, use the region as the link text.
-If the point is at a word, use the word as the link text.  If
-there is no active region and the point is not at word, simply
-insert link markup."
-  (interactive)
-  (if (markdown-use-region-p)
-      ;; Active region
-      (markdown-wrap-or-insert "[[" "]]" nil (region-beginning) (region-end))
-    ;; Markup removal, wiki link at at point, or empty markup insertion
-    (if (thing-at-point-looking-at markdown-regex-wiki-link)
-        (if (or markdown-wiki-link-alias-first
-                (null (match-string 4)))
-            (markdown-unwrap-thing-at-point nil 1 2)
-          (markdown-unwrap-thing-at-point nil 1 4))
-      (markdown-wrap-or-insert "[[" "]]"))))
-
-(defun markdown-insert-image (&optional arg)
-  "Insert image markup using region or word as alt text if possible.
-If there is an active region, use the region as the alt text.  If the
-point is at a word, use the word as the alt text.  In these cases, the
-point will be left at the position for inserting a URL.  If there is no
-active region and the point is not at word, simply insert image markup and
-place the point in the position to enter alt text.  If ARG is nil, insert
-inline image markup.  Otherwise, insert reference image markup."
-  (interactive "*P")
-  (let ((bounds (if arg
-                    (markdown-wrap-or-insert "![" "][]")
-                  (markdown-wrap-or-insert "![" "]()"))))
-    (when bounds
-      (goto-char (- (cdr bounds) 1)))))
-
-(defun markdown-insert-reference-image ()
-  "Insert reference-style image markup using region or word as alt text.
-Calls `markdown-insert-image' with prefix argument."
-  (interactive)
-  (markdown-insert-image t))
-
-(defun markdown-remove-header ()
-  "Remove header markup if point is at a header.
-Return bounds of remaining header text if a header was removed
-and nil otherwise."
-  (interactive "*")
-  (or (markdown-unwrap-thing-at-point markdown-regex-header-atx 0 2)
-      (markdown-unwrap-thing-at-point markdown-regex-header-setext 0 1)))
-
-(defun markdown-insert-header (&optional level text setext)
-  "Insert or replace header markup.
-The level of the header is specified by LEVEL and header text is
-given by TEXT.  LEVEL must be an integer from 1 and 6, and the
-default value is 1.
-When TEXT is nil, the header text is obtained as follows.
-If there is an active region, it is used as the header text.
-Otherwise, the current line will be used as the header text.
-If there is not an active region and the point is at a header,
-remove the header markup and replace with level N header.
-Otherwise, insert empty header markup and place the cursor in
-between.
-The style of the header will be atx (hash marks) unless
-SETEXT is non-nil, in which case a setext-style (underlined)
-header will be inserted."
-  (interactive "p\nsHeader text: ")
-  (setq level (min (max (or level 1) 1) (if setext 2 6)))
-  ;; Determine header text if not given
-  (when (null text)
-    (if (markdown-use-region-p)
-        ;; Active region
-        (setq text (delete-and-extract-region (region-beginning) (region-end)))
-      ;; No active region
-      (markdown-remove-header)
-      (setq text (delete-and-extract-region
-                  (line-beginning-position) (line-end-position)))
-      (when (and setext (string-match "^[ \t]*$" text))
-        (setq text (read-string "Header text: "))))
-    (setq text (markdown-compress-whitespace-string text)))
-  ;; Insertion with given text
-  (markdown-ensure-blank-line-before)
-  (let (hdr)
-    (cond (setext
-           (setq hdr (make-string (string-width text) (if (= level 2) ?- ?=)))
-           (insert text "\n" hdr))
-          (t
-           (setq hdr (make-string level ?#))
-           (insert hdr " " text " " hdr))))
-  (markdown-ensure-blank-line-after)
-  ;; Leave point at end of text
-  (if setext
-      (backward-char (1+ (string-width text)))
-    (backward-char (1+ level))))
-
-(defun markdown-insert-header-dwim (&optional arg setext)
-  "Insert or replace header markup.
-The level and type of the header are determined automatically by
-the type and level of the previous header, unless a prefix
-argument is given via ARG.
-With a numeric prefix valued 1 to 6, insert a header of the given
-level, with the type being determined automatically (note that
-only level 1 or 2 setext headers are possible).
-
-With a \\[universal-argument] prefix (i.e., when ARG is (4)),
-promote the heading by one level.
-With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
-demote the heading by one level.
-When SETEXT is non-nil, prefer setext-style headers when
-possible (levels one and two).
-
-When there is an active region, use it for the header text.  When
-the point is at an existing header, change the type and level
-according to the rules above.
-Otherwise, if the line is not empty, create a header using the
-text on the current line as the header text.
-Finally, if the point is on a blank line, insert empty header
-markup (atx) or prompt for text (setext).
-See `markdown-insert-header' for more details about how the
-header text is determined."
-  (interactive "*P")
-  (let (level)
-    (save-excursion
-      (when (re-search-backward markdown-regex-header nil t)
-        ;; level of previous header
-        (setq level (markdown-outline-level))
-        ;; match groups 1 and 2 indicate setext headers
-        (setq setext (or setext (match-end 1) (match-end 3)))))
-    ;; check prefix argument
-    (cond
-     ((and (equal arg '(4)) (> level 1)) ;; C-u
-      (decf level))
-     ((and (equal arg '(16)) (< level 6)) ;; C-u C-u
-      (incf level))
-     (arg ;; numeric prefix
-      (setq level (prefix-numeric-value arg))))
-    ;; setext headers must be level one or two
-    (and level (setq setext (and setext (<= level 2))))
-    ;; insert the heading
-    (markdown-insert-header level nil setext)))
-
-(defun markdown-insert-header-setext-dwim (&optional arg)
-  "Insert or replace header markup, with preference for setext.
-See `markdown-insert-header-dwim' for details, including how ARG is handled."
-  (interactive "*P")
-  (markdown-insert-header-dwim arg t))
-
-(defun markdown-insert-header-atx-1 ()
-  "Insert a first level atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 1 nil nil))
-
-(defun markdown-insert-header-atx-2 ()
-  "Insert a level two atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 2 nil nil))
-
-(defun markdown-insert-header-atx-3 ()
-  "Insert a level three atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 3 nil nil))
-
-(defun markdown-insert-header-atx-4 ()
-  "Insert a level four atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 4 nil nil))
-
-(defun markdown-insert-header-atx-5 ()
-  "Insert a level five atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 5 nil nil))
-
-(defun markdown-insert-header-atx-6 ()
-  "Insert a sixth level atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 6 nil nil))
-
-(defun markdown-insert-header-setext-1 ()
-  "Insert a setext-style (underlined) first-level header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 1 nil t))
-
-(defun markdown-insert-header-setext-2 ()
-  "Insert a setext-style (underlined) second-level header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 2 nil t))
-
-(defun markdown-blockquote-indentation (loc)
-  "Return string containing necessary indentation for a blockquote at LOC.
-Also see `markdown-pre-indentation'."
-  (save-excursion
-    (goto-char loc)
-    (let* ((list-level (length (markdown-calculate-list-levels)))
-           (indent ""))
-      (dotimes (count list-level indent)
-        (setq indent (concat indent "    "))))))
-
-(defun markdown-insert-blockquote ()
-  "Start a blockquote section (or blockquote the region).
-If Transient Mark mode is on and a region is active, it is used as
-the blockquote text."
-  (interactive)
-  (if (markdown-use-region-p)
-      (markdown-blockquote-region (region-beginning) (region-end))
-    (markdown-ensure-blank-line-before)
-    (insert (markdown-blockquote-indentation (point)) "> ")
-    (markdown-ensure-blank-line-after)))
-
-(defun markdown-block-region (beg end prefix)
-  "Format the region using a block prefix.
-Arguments BEG and END specify the beginning and end of the
-region.  The characters PREFIX will appear at the beginning
-of each line."
-  (save-excursion
-    (let* ((end-marker (make-marker))
-           (beg-marker (make-marker)))
-      ;; Ensure blank line after and remove extra whitespace
-      (goto-char end)
-      (skip-syntax-backward "-")
-      (set-marker end-marker (point))
-      (delete-horizontal-space)
-      (markdown-ensure-blank-line-after)
-      ;; Ensure blank line before and remove extra whitespace
-      (goto-char beg)
-      (skip-syntax-forward "-")
-      (delete-horizontal-space)
-      (markdown-ensure-blank-line-before)
-      (set-marker beg-marker (point))
-      ;; Insert PREFIX before each line
-      (goto-char beg-marker)
-      (while (and (< (line-beginning-position) end-marker)
-                  (not (eobp)))
-        (insert prefix)
-        (forward-line)))))
-
-(defun markdown-blockquote-region (beg end)
-  "Blockquote the region.
-Arguments BEG and END specify the beginning and end of the region."
-  (interactive "*r")
-  (markdown-block-region
-   beg end (concat (markdown-blockquote-indentation
-                    (max (point-min) (1- beg))) "> ")))
-
-(defun markdown-pre-indentation (loc)
-  "Return string containing necessary whitespace for a pre block at LOC.
-Also see `markdown-blockquote-indentation'."
-  (save-excursion
-    (goto-char loc)
-    (let* ((list-level (length (markdown-calculate-list-levels)))
-           indent)
-      (dotimes (count (1+ list-level) indent)
-        (setq indent (concat indent "    "))))))
-
-(defun markdown-insert-pre ()
-  "Start a preformatted section (or apply to the region).
-If Transient Mark mode is on and a region is active, it is marked
-as preformatted text."
-  (interactive)
-  (if (markdown-use-region-p)
-      (markdown-pre-region (region-beginning) (region-end))
-    (markdown-ensure-blank-line-before)
-    (insert (markdown-pre-indentation (point)))
-    (markdown-ensure-blank-line-after)))
-
-(defun markdown-pre-region (beg end)
-  "Format the region as preformatted text.
-Arguments BEG and END specify the beginning and end of the region."
-  (interactive "*r")
-  (let ((indent (markdown-pre-indentation (max (point-min) (1- beg)))))
-    (markdown-block-region beg end indent)))
-
-(defun markdown-insert-gfm-code-block (&optional lang)
-  "Insert GFM code block for language LANG.
-If LANG is nil, the language will be queried from user.  If a
-region is active, wrap this region with the markup instead.  If
-the region boundaries are not on empty lines, these are added
-automatically in order to have the correct markup."
-  (interactive "sProgramming language [none]: ")
-  (if (markdown-use-region-p)
-      (let ((b (region-beginning)) (e (region-end)))
-        (goto-char e)
-        ;; if we're on a blank line, don't newline, otherwise the ```
-        ;; should go on its own line
-        (unless (looking-back "\n")
-          (newline))
-        (insert "```")
-        (markdown-ensure-blank-line-after)
-        (goto-char b)
-        ;; if we're on a blank line, insert the quotes here, otherwise
-        ;; add a new line first
-        (unless (looking-at "\n")
-          (newline)
-          (forward-line -1))
-        (markdown-ensure-blank-line-before)
-        (insert "```" lang))
-    (markdown-ensure-blank-line-before)
-    (insert "```" lang)
-    (newline 2)
-    (insert "```")
-    (markdown-ensure-blank-line-after)
-    (forward-line -1)))
-
-
-;;; Footnotes ======================================================================
-
-(defun markdown-footnote-counter-inc ()
-  "Increment `markdown-footnote-counter' and return the new value."
-  (when (= markdown-footnote-counter 0) ; hasn't been updated in this buffer yet.
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward (concat "^\\[\\^\\(" markdown-footnote-chars "*?\\)\\]:")
-                                (point-max) t)
-        (let ((fn (string-to-number (match-string 1))))
-          (when (> fn markdown-footnote-counter)
-            (setq markdown-footnote-counter fn))))))
-  (incf markdown-footnote-counter))
-
-(defun markdown-insert-footnote ()
-  "Insert footnote with a new number and move point to footnote definition."
-  (interactive)
-  (let ((fn (markdown-footnote-counter-inc)))
-    (insert (format "[^%d]" fn))
-    (markdown-footnote-text-find-new-location)
-    (markdown-ensure-blank-line-before)
-    (unless (markdown-cur-line-blank-p)
-      (insert "\n"))
-    (insert (format "[^%d]: " fn))
-    (markdown-ensure-blank-line-after)))
-
-(defun markdown-footnote-text-find-new-location ()
-  "Position the cursor at the proper location for a new footnote text."
-  (cond
-   ((eq markdown-footnote-location 'end) (goto-char (point-max)))
-   ((eq markdown-footnote-location 'immediately) (markdown-end-of-block))
-   ((eq markdown-footnote-location 'header) (markdown-end-of-defun))))
-
-(defun markdown-footnote-kill ()
-  "Kill the footnote at point.
-The footnote text is killed (and added to the kill ring), the
-footnote marker is deleted.  Point has to be either at the
-footnote marker or in the footnote text."
-  (interactive)
-  (let ((marker-pos nil)
-        (skip-deleting-marker nil)
-        (starting-footnote-text-positions
-         (markdown-footnote-text-positions)))
-    (when starting-footnote-text-positions
-      ;; We're starting in footnote text, so mark our return position and jump
-      ;; to the marker if possible.
-      (let ((marker-pos (markdown-footnote-find-marker
-                         (first starting-footnote-text-positions))))
-            (if marker-pos
-                (goto-char (1- marker-pos))
-              ;; If there isn't a marker, we still want to kill the text.
-              (setq skip-deleting-marker t))))
-    ;; Either we didn't start in the text, or we started in the text and jumped
-    ;; to the marker. We want to assume we're at the marker now and error if
-    ;; we're not.
-    (unless skip-deleting-marker
-      (let ((marker (markdown-footnote-delete-marker)))
-        (unless marker
-          (error "Not at a footnote"))
-        ;; Even if we knew the text position before, it changed when we deleted
-        ;; the label.
-        (setq marker-pos (second marker))
-        (let ((new-text-pos (markdown-footnote-find-text (first marker))))
-          (unless new-text-pos
-            (error "No text for footnote `%s'" (first marker)))
-          (goto-char new-text-pos))))
-    (let ((pos (markdown-footnote-kill-text)))
-      (goto-char (if starting-footnote-text-positions
-                     pos
-                   marker-pos)))))
-
-(defun markdown-footnote-delete-marker ()
-  "Delete a footnote marker at point.
-Returns a list (ID START) containing the footnote ID and the
-start position of the marker before deletion.  If no footnote
-marker was deleted, this function returns NIL."
-  (let ((marker (markdown-footnote-marker-positions)))
-    (when marker
-      (delete-region (second marker) (third marker))
-      (butlast marker))))
-
-(defun markdown-footnote-kill-text ()
-  "Kill footnote text at point.
-Returns the start position of the footnote text before deletion,
-or NIL if point was not inside a footnote text.
-
-The killed text is placed in the kill ring (without the footnote
-number)."
-  (let ((fn (markdown-footnote-text-positions)))
-    (when fn
-      (let ((text (delete-and-extract-region (second fn) (third fn))))
-        (string-match (concat "\\[\\" (first fn) "\\]:[[:space:]]*\\(\\(.*\n?\\)*\\)") text)
-        (kill-new (match-string 1 text))
-        (when (and (markdown-cur-line-blank-p)
-                   (markdown-prev-line-blank-p)
-                   (not (bobp)))
-          (delete-region (1- (point)) (point)))
-        (second fn)))))
-
-(defun markdown-footnote-goto-text ()
-  "Jump to the text of the footnote at point."
-  (interactive)
-  (let ((fn (car (markdown-footnote-marker-positions))))
-    (unless fn
-      (error "Not at a footnote marker"))
-    (let ((new-pos (markdown-footnote-find-text fn)))
-      (unless new-pos
-        (error "No definition found for footnote `%s'" fn))
-      (goto-char new-pos))))
-
-(defun markdown-footnote-return ()
-  "Return from a footnote to its footnote number in the main text."
-  (interactive)
-  (let ((fn (save-excursion
-              (car (markdown-footnote-text-positions)))))
-    (unless fn
-      (error "Not in a footnote"))
-    (let ((new-pos (markdown-footnote-find-marker fn)))
-      (unless new-pos
-        (error "Footnote marker `%s' not found" fn))
-      (goto-char new-pos))))
-
-(defun markdown-footnote-find-marker (id)
-  "Find the location of the footnote marker with ID.
-The actual buffer position returned is the position directly
-following the marker's closing bracket.  If no marker is found,
-NIL is returned."
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward (concat "\\[" id "\\]\\([^:]\\|\\'\\)") nil t)
-      (skip-chars-backward "^]")
-      (point))))
-
-(defun markdown-footnote-find-text (id)
-  "Find the location of the text of footnote ID.
-The actual buffer position returned is the position of the first
-character of the text, after the footnote's identifier.  If no
-footnote text is found, NIL is returned."
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward (concat "^\\[" id "\\]:") nil t)
-      (skip-chars-forward "[ \t]")
-      (point))))
-
-(defun markdown-footnote-marker-positions ()
-  "Return the position and ID of the footnote marker point is on.
-The return value is a list (ID START END).  If point is not on a
-footnote, NIL is returned."
-  ;; first make sure we're at a footnote marker
-  (if (or (looking-back (concat "\\[\\^" markdown-footnote-chars "*\\]?") (line-beginning-position))
-          (looking-at (concat "\\[?\\^" markdown-footnote-chars "*?\\]")))
-      (save-excursion
-        ;; move point between [ and ^:
-        (if (looking-at "\\[")
-            (forward-char 1)
-          (skip-chars-backward "^["))
-        (looking-at (concat "\\(\\^" markdown-footnote-chars "*?\\)\\]"))
-        (list (match-string 1) (1- (match-beginning 1)) (1+ (match-end 1))))))
-
-(defun markdown-footnote-text-positions ()
-  "Return the start and end positions of the footnote text point is in.
-The exact return value is a list of three elements: (ID START END).
-The start position is the position of the opening bracket
-of the footnote id.  The end position is directly after the
-newline that ends the footnote.  If point is not in a footnote,
-NIL is returned instead."
-  (save-excursion
-    (let (result)
-      (move-beginning-of-line 1)
-      ;; Try to find the label. If we haven't found the label and we're at a blank
-      ;; or indented line, back up if possible.
-      (while (and
-              (not (and (looking-at markdown-regex-footnote-definition)
-                        (setq result (list (match-string 1) (point)))))
-              (and (not (bobp))
-                   (or (markdown-cur-line-blank-p)
-                       (>= (markdown-cur-line-indent) 4))))
-        (forward-line -1))
-      (when result
-        ; Advance if there is a next line that is either blank or indented.
-        ; (Need to check if we're on the last line, because
-        ; markdown-next-line-blank-p returns true for last line in buffer.)
-        (while (and (/= (line-end-position) (point-max))
-                    (or (markdown-next-line-blank-p)
-                        (>= (markdown-next-line-indent) 4)))
-          (forward-line))
-        ; Move back while the current line is blank.
-        (while (markdown-cur-line-blank-p)
-          (forward-line -1))
-        ; Advance to capture this line and a single trailing newline (if there
-        ; is one).
-        (forward-line)
-        (append result (list (point)))))))
-
-
-;;; Element Removal ===========================================================
-
-(defun markdown-kill-thing-at-point ()
-  "Kill thing at point and add important text, without markup, to kill ring.
-Possible things to kill include (roughly in order of precedence):
-inline code, headers, horizonal rules, links (add link text to
-kill ring), images (add alt text to kill ring), angle uri, email
-addresses, bold, italics, reference definition (add URI to kill
-ring), footnote markers and text (kill both marker and text, add
-text to kill ring), and list items."
-  (interactive "*")
-  (let (val tmp)
-    (cond
-     ;; Inline code
-     ((markdown-code-at-point-p)
-      (kill-new (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; ATX header
-     ((thing-at-point-looking-at markdown-regex-header-atx)
-      (kill-new (match-string 2))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Setext header
-     ((thing-at-point-looking-at markdown-regex-header-setext)
-      (kill-new (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Horizonal rule
-     ((thing-at-point-looking-at markdown-regex-hr)
-      (kill-new (match-string 0))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Inline link or image (add link or alt text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-link-inline)
-      (kill-new (match-string 3))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Reference link or image (add link or alt text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-link-reference)
-      (kill-new (match-string 3))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Angle URI (add URL to kill ring)
-     ((thing-at-point-looking-at markdown-regex-angle-uri)
-      (kill-new (match-string 2))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Email address in angle brackets (add email address to kill ring)
-     ((thing-at-point-looking-at markdown-regex-email)
-      (kill-new (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Wiki link (add alias text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-wiki-link)
-      (kill-new (markdown-wiki-link-alias))
-      (delete-region (match-beginning 1) (match-end 1)))
-     ;; Bold
-     ((thing-at-point-looking-at markdown-regex-bold)
-      (kill-new (match-string 4))
-      (delete-region (match-beginning 2) (match-end 2)))
-     ;; Italics
-     ((thing-at-point-looking-at markdown-regex-italic)
-      (kill-new (match-string 4))
-      (delete-region (match-beginning 2) (match-end 2)))
-     ;; Strike-through
-     ((thing-at-point-looking-at markdown-regex-strike-through)
-      (kill-new (match-string 4))
-      (delete-region (match-beginning 2) (match-end 2)))
-     ;; Footnote marker (add footnote text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-footnote)
-      (markdown-footnote-kill))
-     ;; Footnote text (add footnote text to kill ring)
-     ((setq val (markdown-footnote-text-positions))
-      (markdown-footnote-kill))
-     ;; Reference definition (add URL to kill ring)
-     ((thing-at-point-looking-at markdown-regex-reference-definition)
-      (kill-new (match-string 2))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; List item
-     ((setq val (markdown-cur-list-item-bounds))
-      (kill-new (delete-and-extract-region (first val) (second val))))
-     (t
-      (error "Nothing found at point to kill")))))
-
-
-;;; Indentation ====================================================================
-
-(defun markdown-indent-find-next-position (cur-pos positions)
-  "Return the position after the index of CUR-POS in POSITIONS.
-Positions are calculated by `markdown-calc-indents'."
-  (while (and positions
-              (not (equal cur-pos (car positions))))
-    (setq positions (cdr positions)))
-  (or (cadr positions) 0))
-
-(defun markdown-exdent-find-next-position (cur-pos positions)
-  "Return the maximal element that precedes CUR-POS from POSITIONS.
-Positions are calculated by `markdown-calc-indents'."
-  (let ((result 0))
-    (dolist (i positions)
-      (when (< i cur-pos)
-        (setq result (max result i))))
-    result))
-
-(defun markdown-indent-line ()
-  "Indent the current line using some heuristics.
-If the _previous_ command was either `markdown-enter-key' or
-`markdown-cycle', then we should cycle to the next
-reasonable indentation position.  Otherwise, we could have been
-called directly by `markdown-enter-key', by an initial call of
-`markdown-cycle', or indirectly by `auto-fill-mode'.  In
-these cases, indent to the default position.
-Positions are calculated by `markdown-calc-indents'."
-  (interactive)
-  (let ((positions (markdown-calc-indents))
-        (cur-pos (current-column)))
-    (if (not (equal this-command 'markdown-cycle))
-        (indent-line-to (car positions))
-      (setq positions (sort (delete-dups positions) '<))
-      (indent-line-to
-       (markdown-indent-find-next-position cur-pos positions)))))
-
-(defun markdown-calc-indents ()
-  "Return a list of indentation columns to cycle through.
-The first element in the returned list should be considered the
-default indentation level.  This function does not worry about
-duplicate positions, which are handled up by calling functions."
-  (let (pos prev-line-pos positions)
-
-    ;; Indentation of previous line
-    (setq prev-line-pos (markdown-prev-line-indent))
-    (setq positions (cons prev-line-pos positions))
-
-    ;; Indentation of previous non-list-marker text
-    (when (setq pos (markdown-prev-non-list-indent))
-      (setq positions (cons pos positions)))
-
-    ;; Indentation required for a pre block in current context
-    (setq pos (length (markdown-pre-indentation (point))))
-    (setq positions (cons pos positions))
-
-    ;; Indentation of the previous line + tab-width
-    (if prev-line-pos
-        (setq positions (cons (+ prev-line-pos tab-width) positions))
-      (setq positions (cons tab-width positions)))
-
-    ;; Indentation of the previous line - tab-width
-    (if (and prev-line-pos (> prev-line-pos tab-width))
-        (setq positions (cons (- prev-line-pos tab-width) positions)))
-
-    ;; Indentation of all preceeding list markers (when in a list)
-    (when (setq pos (markdown-calculate-list-levels))
-      (setq positions (append pos positions)))
-
-    ;; First column
-    (setq positions (cons 0 positions))
-
-    ;; Return reversed list
-    (reverse positions)))
-
-(defun markdown-enter-key ()
-  "Handle RET according to to the value of `markdown-indent-on-enter'."
-  (interactive)
-  (if markdown-indent-on-enter
-      (newline-and-indent)
-    (newline)))
-
-(defun markdown-exdent-or-delete (arg)
-  "Handle BACKSPACE by cycling through indentation points.
-When BACKSPACE is pressed, if there is only whitespace
-before the current point, then exdent the line one level.
-Otherwise, do normal delete by repeating
-`backward-delete-char-untabify' ARG times."
-  (interactive "*p")
-  (let ((cur-pos (current-column))
-        (start-of-indention (save-excursion
-                              (back-to-indentation)
-                              (current-column)))
-        (positions (markdown-calc-indents)))
-    (if (and (> cur-pos 0) (= cur-pos start-of-indention))
-        (indent-line-to (markdown-exdent-find-next-position cur-pos positions))
-      (backward-delete-char-untabify arg))))
-
-(defun markdown-find-leftmost-column (beg end)
-  "Find the leftmost column in the region from BEG to END."
-  (let ((mincol 1000))
-    (save-excursion
-      (goto-char beg)
-      (while (< (point) end)
-        (back-to-indentation)
-        (unless (looking-at "[ \t]*$")
-          (setq mincol (min mincol (current-column))))
-        (forward-line 1)
-        ))
-    mincol))
-
-(defun markdown-indent-region (beg end arg)
-  "Indent the region from BEG to END using some heuristics.
-When ARG is non-nil, exdent the region instead.
-See `markdown-indent-line' and `markdown-indent-line'."
-  (interactive "*r\nP")
-  (let* ((positions (sort (delete-dups (markdown-calc-indents)) '<))
-         (leftmostcol (markdown-find-leftmost-column beg end))
-         (next-pos (if arg
-                       (markdown-exdent-find-next-position leftmostcol positions)
-                     (markdown-indent-find-next-position leftmostcol positions))))
-    (indent-rigidly beg end (- next-pos leftmostcol))
-    (setq deactivate-mark nil)))
-
-(defun markdown-exdent-region (beg end)
-  "Call `markdown-indent-region' on region from BEG to END with prefix."
-  (interactive "*r")
-  (markdown-indent-region (region-beginning) (region-end) t))
-
-
-;;; Markup Completion =========================================================
-
-(defconst markdown-complete-alist
-  '((markdown-regex-header-atx . markdown-complete-atx)
-    (markdown-regex-header-setext . markdown-complete-setext)
-    (markdown-regex-hr . markdown-complete-hr))
-  "Association list of form (regexp . function) for markup completion.")
-
-(defun markdown-incomplete-atx-p ()
-  "Return t if ATX header markup is incomplete and nil otherwise.
-Assumes match data is available for `markdown-regex-header-atx'.
-Checks that the number of trailing hash marks equals the number of leading
-hash marks, that there is only a single space before and after the text,
-and that there is no extraneous whitespace in the text."
-  (save-match-data
-    (or
-     ;; Number of starting and ending hash marks differs
-     (not (= (length (match-string 1)) (length (match-string 3))))
-     ;; When the header text is not empty...
-     (and (> (length (match-string 2)) 0)
-          ;; ...if there are extra leading, trailing, or interior spaces
-          (or (not (= (match-beginning 2) (1+ (match-end 1))))
-              (not (= (match-beginning 3) (1+ (match-end 2))))
-              (string-match "[ \t\n]\\{2\\}" (match-string 2))))
-     ;; When the header text is empty...
-     (and (= (length (match-string 2)) 0)
-          ;; ...if there are too many or too few spaces
-          (not (= (match-beginning 3) (+ (match-end 1) 2)))))))
-
-(defun markdown-complete-atx ()
-  "Complete and normalize ATX headers.
-Add or remove hash marks to the end of the header to match the
-beginning.  Ensure that there is only a single space between hash
-marks and header text.  Removes extraneous whitespace from header text.
-Assumes match data is available for `markdown-regex-header-atx'.
-Return nil if markup was complete and non-nil if markup was completed."
-  (when (markdown-incomplete-atx-p)
-    (let* ((new-marker (make-marker))
-           (new-marker (set-marker new-marker (match-end 2))))
-      ;; Hash marks and spacing at end
-      (goto-char (match-end 2))
-      (delete-region (match-end 2) (match-end 3))
-      (insert " " (match-string 1))
-      ;; Remove extraneous whitespace from title
-      (replace-match (markdown-compress-whitespace-string (match-string 2))
-                     t t nil 2)
-      ;; Spacing at beginning
-      (goto-char (match-end 1))
-      (delete-region (match-end 1) (match-beginning 2))
-      (insert " ")
-      ;; Leave point at end of text
-      (goto-char new-marker))))
-
-(defun markdown-incomplete-setext-p ()
-  "Return t if setext header markup is incomplete and nil otherwise.
-Assumes match data is available for `markdown-regex-header-setext'.
-Checks that length of underline matches text and that there is no
-extraneous whitespace in the text."
-  (save-match-data
-    (or (not (= (length (match-string 1)) (length (match-string 2))))
-        (string-match "[ \t\n]\\{2\\}" (match-string 1)))))
-
-(defun markdown-complete-setext ()
-  "Complete and normalize setext headers.
-Add or remove underline characters to match length of header
-text.  Removes extraneous whitespace from header text.  Assumes
-match data is available for `markdown-regex-header-setext'.
-Return nil if markup was complete and non-nil if markup was completed."
-  (when (markdown-incomplete-setext-p)
-    (let* ((text (markdown-compress-whitespace-string (match-string 1)))
-           (char (char-after (match-beginning 2)))
-           (level (if (char-equal char ?-) 2 1)))
-      (goto-char (match-beginning 0))
-      (delete-region (match-beginning 0) (match-end 0))
-      (markdown-insert-header level text t)
-      t)))
-
-(defun markdown-incomplete-hr-p ()
-  "Return non-nil if hr is not in `markdown-hr-strings' and nil otherwise.
-Assumes match data is available for `markdown-regex-hr'."
-  (not (member (match-string 0) markdown-hr-strings)))
-
-(defun markdown-complete-hr ()
-  "Complete horizontal rules.
-If horizontal rule string is a member of `markdown-hr-strings',
-do nothing.  Otherwise, replace with the car of
-`markdown-hr-strings'.
-Assumes match data is available for `markdown-regex-hr'.
-Return nil if markup was complete and non-nil if markup was completed."
-  (when (markdown-incomplete-hr-p)
-    (replace-match (car markdown-hr-strings))
-    t))
-
-(defun markdown-complete ()
-  "Complete markup of object near point or in region when active.
-Handle all objects in `markdown-complete-alist', in order.
-See `markdown-complete-at-point' and `markdown-complete-region'."
-  (interactive "*")
-  (if (markdown-use-region-p)
-      (markdown-complete-region (region-beginning) (region-end))
-    (markdown-complete-at-point)))
-
-(defun markdown-complete-at-point ()
-  "Complete markup of object near point.
-Handle all elements of `markdown-complete-alist' in order."
-  (interactive "*")
-  (let ((list markdown-complete-alist) found changed)
-    (while list
-      (let ((regexp (eval (caar list)))
-            (function (cdar list)))
-        (setq list (cdr list))
-        (when (thing-at-point-looking-at regexp)
-          (setq found t)
-          (setq changed (funcall function))
-          (setq list nil))))
-    (if found
-        (or changed (error "Markup at point is complete"))
-      (error "Nothing to complete at point"))))
-
-(defun markdown-complete-region (beg end)
-  "Complete markup of objects in region from BEG to END.
-Handle all objects in `markdown-complete-alist', in order.  Each
-match is checked to ensure that a previous regexp does not also
-match."
-  (interactive "*r")
-  (let ((end-marker (set-marker (make-marker) end))
-        previous)
-    (dolist (element markdown-complete-alist)
-      (let ((regexp (eval (car element)))
-            (function (cdr element)))
-        (goto-char beg)
-        (while (re-search-forward regexp end-marker 'limit)
-          (when (match-string 0)
-            ;; Make sure this is not a match for any of the preceding regexps.
-            ;; This prevents mistaking an HR for a Setext subheading.
-            (let (match)
-              (save-match-data
-                (dolist (prev-regexp previous)
-                  (or match (setq match (looking-back prev-regexp)))))
-              (unless match
-                (save-excursion (funcall function))))))
-        (add-to-list 'previous regexp)))))
-
-(defun markdown-complete-buffer ()
-  "Complete markup for all objects in the current buffer."
-  (interactive "*")
-  (markdown-complete-region (point-min) (point-max)))
-
-
-;;; Markup Cycling ============================================================
-
-(defun markdown-cycle-atx (arg &optional remove)
-  "Cycle ATX header markup.
-Promote header (decrease level) when ARG is 1 and demote
-header (increase level) if arg is -1.  When REMOVE is non-nil,
-remove the header when the level reaches zero and stop cycling
-when it reaches six.  Otherwise, perform a proper cycling through
-levels one through six.  Assumes match data is available for
-`markdown-regex-header-atx'."
-  (let* ((old-level (length (match-string 1)))
-         (new-level (+ old-level arg))
-         (text (match-string 2)))
-    (when (not remove)
-      (setq new-level (% new-level 6))
-      (setq new-level (cond ((= new-level 0) 6)
-                            ((< new-level 0) (+ new-level 6))
-                            (t new-level))))
-    (cond
-     ((= new-level 0)
-      (markdown-unwrap-thing-at-point nil 0 2))
-     ((<= new-level 6)
-      (goto-char (match-beginning 0))
-      (delete-region (match-beginning 0) (match-end 0))
-      (markdown-insert-header new-level text nil)))))
-
-(defun markdown-cycle-setext (arg &optional remove)
-  "Cycle setext header markup.
-Promote header (increase level) when ARG is 1 and demote
-header (decrease level or remove) if arg is -1.  When demoting a
-level-two setext header, replace with a level-three atx header.
-When REMOVE is non-nil, remove the header when the level reaches
-zero.  Otherwise, cycle back to a level six atx header.  Assumes
-match data is available for `markdown-regex-header-setext'."
-  (let* ((char (char-after (match-beginning 2)))
-         (old-level (if (char-equal char ?=) 1 2))
-         (new-level (+ old-level arg))
-         (text (match-string 1)))
-    (when (and (not remove) (= new-level 0))
-      (setq new-level 6))
-    (cond
-     ((= new-level 0)
-      (markdown-unwrap-thing-at-point nil 0 1))
-     ((<= new-level 2)
-      (markdown-insert-header new-level nil t))
-     ((<= new-level 6)
-      (markdown-insert-header new-level nil nil)))))
-
-(defun markdown-cycle-hr (arg &optional remove)
-  "Cycle string used for horizontal rule from `markdown-hr-strings'.
-When ARG is 1, cycle forward (demote), and when ARG is -1, cycle
-backwards (promote).  When REMOVE is non-nil, remove the hr instead
-of cycling when the end of the list is reached.
-Assumes match data is available for `markdown-regex-hr'."
-  (let* ((strings (if (= arg -1)
-                      (reverse markdown-hr-strings)
-                    markdown-hr-strings))
-         (tail (member (match-string 0) strings))
-         (new (or (cadr tail)
-                  (if remove
-                      (if (= arg 1)
-                          ""
-                        (car tail))
-                    (car strings)))))
-    (replace-match new)))
-
-(defun markdown-cycle-bold ()
-  "Cycle bold markup between underscores and asterisks.
-Assumes match data is available for `markdown-regex-bold'."
-  (save-excursion
-    (let* ((old-delim (match-string 3))
-           (new-delim (if (string-equal old-delim "**") "__" "**")))
-      (replace-match new-delim t t nil 3)
-      (replace-match new-delim t t nil 5))))
-
-(defun markdown-cycle-italic ()
-  "Cycle italic markup between underscores and asterisks.
-Assumes match data is available for `markdown-regex-italic'."
-  (save-excursion
-    (let* ((old-delim (match-string 3))
-           (new-delim (if (string-equal old-delim "*") "_" "*")))
-      (replace-match new-delim t t nil 3)
-      (replace-match new-delim t t nil 5))))
-
-
-;;; Keymap ====================================================================
-
-(defvar markdown-mode-map
-  (let ((map (make-keymap)))
-    ;; Element insertion
-    (define-key map "\C-c\C-al" 'markdown-insert-link)
-    (define-key map "\C-c\C-aL" 'markdown-insert-reference-link-dwim)
-    (define-key map "\C-c\C-au" 'markdown-insert-uri)
-    (define-key map "\C-c\C-af" 'markdown-insert-footnote)
-    (define-key map "\C-c\C-aw" 'markdown-insert-wiki-link)
-    (define-key map "\C-c\C-ii" 'markdown-insert-image)
-    (define-key map "\C-c\C-iI" 'markdown-insert-reference-image)
-    (define-key map "\C-c\C-th" 'markdown-insert-header-dwim)
-    (define-key map "\C-c\C-tH" 'markdown-insert-header-setext-dwim)
-    (define-key map "\C-c\C-t1" 'markdown-insert-header-atx-1)
-    (define-key map "\C-c\C-t2" 'markdown-insert-header-atx-2)
-    (define-key map "\C-c\C-t3" 'markdown-insert-header-atx-3)
-    (define-key map "\C-c\C-t4" 'markdown-insert-header-atx-4)
-    (define-key map "\C-c\C-t5" 'markdown-insert-header-atx-5)
-    (define-key map "\C-c\C-t6" 'markdown-insert-header-atx-6)
-    (define-key map "\C-c\C-t!" 'markdown-insert-header-setext-1)
-    (define-key map "\C-c\C-t@" 'markdown-insert-header-setext-2)
-    (define-key map "\C-c\C-ss" 'markdown-insert-bold)
-    (define-key map "\C-c\C-se" 'markdown-insert-italic)
-    (define-key map "\C-c\C-sc" 'markdown-insert-code)
-    (define-key map "\C-c\C-sb" 'markdown-insert-blockquote)
-    (define-key map "\C-c\C-s\C-b" 'markdown-blockquote-region)
-    (define-key map "\C-c\C-sp" 'markdown-insert-pre)
-    (define-key map "\C-c\C-s\C-p" 'markdown-pre-region)
-    (define-key map "\C-c-" 'markdown-insert-hr)
-    ;; Element insertion (deprecated)
-    (define-key map "\C-c\C-ar" 'markdown-insert-reference-link-dwim)
-    (define-key map "\C-c\C-tt" 'markdown-insert-header-setext-1)
-    (define-key map "\C-c\C-ts" 'markdown-insert-header-setext-2)
-    ;; Element removal
-    (define-key map (kbd "C-c C-k") 'markdown-kill-thing-at-point)
-    ;; Promotion, Demotion, Completion, and Cycling
-    (define-key map (kbd "C-c C--") 'markdown-promote)
-    (define-key map (kbd "C-c C-=") 'markdown-demote)
-    (define-key map (kbd "C-c C-]") 'markdown-complete)
-    ;; Following and Jumping
-    (define-key map (kbd "C-c C-o") 'markdown-follow-thing-at-point)
-    (define-key map (kbd "C-c C-j") 'markdown-jump)
-    ;; Indentation
-    (define-key map (kbd "C-m") 'markdown-enter-key)
-    (define-key map (kbd "<backspace>") 'markdown-exdent-or-delete)
-    (define-key map (kbd "C-c >") 'markdown-indent-region)
-    (define-key map (kbd "C-c <") 'markdown-exdent-region)
-    ;; Visibility cycling
-    (define-key map (kbd "<tab>") 'markdown-cycle)
-    (define-key map (kbd "<S-iso-lefttab>") 'markdown-shifttab)
-    (define-key map (kbd "<S-tab>")  'markdown-shifttab)
-    (define-key map (kbd "<backtab>") 'markdown-shifttab)
-    ;; Header navigation
-    (define-key map (kbd "C-c C-n") 'outline-next-visible-heading)
-    (define-key map (kbd "C-c C-p") 'outline-previous-visible-heading)
-    (define-key map (kbd "C-c C-f") 'outline-forward-same-level)
-    (define-key map (kbd "C-c C-b") 'outline-backward-same-level)
-    (define-key map (kbd "C-c C-u") 'outline-up-heading)
-    ;; Buffer-wide commands
-    (define-key map (kbd "C-c C-c m") 'markdown-other-window)
-    (define-key map (kbd "C-c C-c p") 'markdown-preview)
-    (define-key map (kbd "C-c C-c e") 'markdown-export)
-    (define-key map (kbd "C-c C-c v") 'markdown-export-and-preview)
-    (define-key map (kbd "C-c C-c o") 'markdown-open)
-    (define-key map (kbd "C-c C-c w") 'markdown-kill-ring-save)
-    (define-key map (kbd "C-c C-c c") 'markdown-check-refs)
-    (define-key map (kbd "C-c C-c n") 'markdown-cleanup-list-numbers)
-    (define-key map (kbd "C-c C-c ]") 'markdown-complete-buffer)
-    ;; List editing
-    (define-key map (kbd "M-<up>") 'markdown-move-up)
-    (define-key map (kbd "M-<down>") 'markdown-move-down)
-    (define-key map (kbd "M-<left>") 'markdown-promote)
-    (define-key map (kbd "M-<right>") 'markdown-demote)
-    (define-key map (kbd "M-<return>") 'markdown-insert-list-item)
-    ;; Movement
-    (define-key map (kbd "M-{") 'markdown-backward-paragraph)
-    (define-key map (kbd "M-}") 'markdown-forward-paragraph)
-    (define-key map (kbd "M-n") 'markdown-next-link)
-    (define-key map (kbd "M-p") 'markdown-previous-link)
-    ;; Alternative keys (in case of problems with the arrow keys)
-    (define-key map (kbd "C-c C-x u") 'markdown-move-up)
-    (define-key map (kbd "C-c C-x d") 'markdown-move-down)
-    (define-key map (kbd "C-c C-x l") 'markdown-promote)
-    (define-key map (kbd "C-c C-x r") 'markdown-demote)
-    (define-key map (kbd "C-c C-x m") 'markdown-insert-list-item)
-    map)
-  "Keymap for Markdown major mode.")
-
-(defvar gfm-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map markdown-mode-map)
-    (define-key map (kbd "C-c C-s P") 'markdown-insert-gfm-code-block)
-    (define-key map (kbd "C-c C-s d") 'markdown-insert-strike-through)
-    map)
-  "Keymap for `gfm-mode'.
-See also `markdown-mode-map'.")
-
-
-;;; Menu ==================================================================
-
-(easy-menu-define markdown-mode-menu markdown-mode-map
-  "Menu for Markdown mode"
-  '("Markdown"
-    ("Show/Hide"
-     ["Cycle visibility" markdown-cycle (outline-on-heading-p)]
-     ["Cycle global visibility" markdown-shifttab])
-    "---"
-    ["Compile" markdown-other-window]
-    ["Preview" markdown-preview]
-    ["Export" markdown-export]
-    ["Export & View" markdown-export-and-preview]
-    ["Open" markdown-open]
-    ["Kill ring save" markdown-kill-ring-save]
-    "---"
-    ("Headings"
-     ["Automatic" markdown-insert-header-dwim]
-     ["Automatic (prefer setext)" markdown-insert-header-setext-dwim]
-     "---"
-     ["First level setext" markdown-insert-header-setext-1]
-     ["Second level setext" markdown-insert-header-setext-2]
-     "---"
-     ["First level atx" markdown-insert-header-atx-1]
-     ["Second level atx" markdown-insert-header-atx-2]
-     ["Third level atx" markdown-insert-header-atx-3]
-     ["Fourth level atx" markdown-insert-header-atx-4]
-     ["Fifth level atx" markdown-insert-header-atx-5]
-     ["Sixth level atx" markdown-insert-header-atx-6])
-    "---"
-    ["Bold" markdown-insert-bold]
-    ["Italic" markdown-insert-italic]
-    ["Strike-through" markdown-insert-strike-through]
-    ["Blockquote" markdown-insert-blockquote]
-    ["Preformatted" markdown-insert-pre]
-    ["Code" markdown-insert-code]
-    "---"
-    ["Insert inline link" markdown-insert-link]
-    ["Insert reference link" markdown-insert-reference-link-dwim]
-    ["Insert URL" markdown-insert-uri]
-    ["Insert inline image" markdown-insert-image]
-    ["Insert reference image" markdown-insert-reference-image]
-    ["Insert list item" markdown-insert-list-item]
-    ["Insert horizontal rule" markdown-insert-hr]
-    ["Insert footnote" markdown-insert-footnote]
-    ["Kill element" markdown-kill-thing-at-point]
-    "---"
-    ["Jump" markdown-jump]
-    ["Follow link" markdown-follow-thing-at-point]
-    ("Outline"
-     ["Next visible heading" outline-next-visible-heading]
-     ["Previous visible heading" outline-previous-visible-heading]
-     ["Forward same level" outline-forward-same-level]
-     ["Backward same level" outline-backward-same-level]
-     ["Up to parent heading" outline-up-heading])
-    "---"
-    ("Completion and Cycling"
-     ["Complete" markdown-complete]
-     ["Promote" markdown-promote]
-     ["Demote" markdown-demote])
-    ("List editing"
-     ["Indent list item" markdown-demote]
-     ["Exdent list item" markdown-promote])
-    ("Region shifting"
-     ["Indent region" markdown-indent-region]
-     ["Exdent region" markdown-exdent-region])
-    "---"
-    ["Check references" markdown-check-refs]
-    ["Clean up list numbering" markdown-cleanup-list-numbers]
-    ["Complete markup" markdown-complete-buffer]
-    "---"
-    ["Version" markdown-show-version]
-    ))
-
-
-;;; imenu =====================================================================
-
-(defun markdown-imenu-create-index ()
-  "Create and return an imenu index alist for the current buffer.
-See `imenu-create-index-function' and `imenu--index-alist' for details."
-  (let* ((root '(nil . nil))
-         cur-alist
-         (cur-level 0)
-         (empty-heading "-")
-         (self-heading ".")
-         hashes pos level heading)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward markdown-regex-header (point-max) t)
-        (cond
-         ((setq heading (match-string-no-properties 1))
-          (setq pos (match-beginning 1)
-                level 1))
-         ((setq heading (match-string-no-properties 3))
-          (setq pos (match-beginning 3)
-                level 2))
-         ((setq hashes (match-string-no-properties 5))
-          (setq heading (match-string-no-properties 6)
-                pos (match-beginning 5)
-                level (length hashes))))
-        (let ((alist (list (cons heading pos))))
-          (cond
-           ((= cur-level level)         ; new sibling
-            (setcdr cur-alist alist)
-            (setq cur-alist alist))
-           ((< cur-level level)         ; first child
-            (dotimes (i (- level cur-level 1))
-              (setq alist (list (cons empty-heading alist))))
-            (if cur-alist
-                (let* ((parent (car cur-alist))
-                       (self-pos (cdr parent)))
-                  (setcdr parent (cons (cons self-heading self-pos) alist)))
-              (setcdr root alist))      ; primogenitor
-            (setq cur-alist alist)
-            (setq cur-level level))
-           (t                           ; new sibling of an ancestor
-            (let ((sibling-alist (last (cdr root))))
-              (dotimes (i (1- level))
-                (setq sibling-alist (last (cdar sibling-alist))))
-              (setcdr sibling-alist alist)
-              (setq cur-alist alist))
-            (setq cur-level level)))))
-      (cdr root))))
-
-
-;;; References ================================================================
-
-(defun markdown-insert-reference-definition (ref &optional buffer)
-  "Add blank REF definition to the end of BUFFER.
-REF is a Markdown reference in square brackets, like \"[lisp-history]\"."
-  (or buffer (setq buffer (current-buffer)))
-  (with-current-buffer buffer
-    (goto-char (point-max))
-    (indent-new-comment-line)
-    (insert (concat ref ": "))))
-
-(defun markdown-reference-goto-definition ()
-  "Jump to the definition of the reference at point or create it."
-  (interactive)
-  (when (thing-at-point-looking-at markdown-regex-link-reference)
-    (let* ((text (match-string-no-properties 2))
-           (reference (match-string-no-properties 4))
-           (target (downcase (if (string= reference "[]") text reference)))
-           (loc (cadr (markdown-reference-definition target))))
-      (if loc
-          (goto-char loc)
-        (markdown-insert-reference-definition target (current-buffer))))))
-
-(defun markdown-reference-find-links (reference)
-  "Return a list of all links for REFERENCE.
-REFERENCE should include the surrounding square brackets like [this].
-Elements of the list have the form (text start line), where
-text is the link text, start is the location at the beginning of
-the link, and line is the line number on which the link appears."
-  (let* ((ref-quote (regexp-quote (substring reference 1 -1)))
-         (regexp (format "!?\\(?:\\[\\(%s\\)\\][ ]?\\[\\]\\|\\[\\([^]]+?\\)\\][ ]?\\[%s\\]\\)"
-                         ref-quote ref-quote))
-         links)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward regexp nil t)
-        (let* ((text (or (match-string-no-properties 1)
-                         (match-string-no-properties 2)))
-               (start (match-beginning 0))
-               (line (markdown-line-number-at-pos)))
-          (add-to-list 'links (list text start line)))))
-    links))
-
-(defun markdown-get-undefined-refs ()
-  "Return a list of undefined Markdown references.
-Result is an alist of pairs (reference . occurrences), where
-occurrences is itself another alist of pairs (label . line-number).
-For example, an alist corresponding to [Nice editor][Emacs] at line 12,
-\[GNU Emacs][Emacs] at line 45 and [manual][elisp] at line 127 is
-\((\"[emacs]\" (\"[Nice editor]\" . 12) (\"[GNU Emacs]\" . 45)) (\"[elisp]\" (\"[manual]\" . 127)))."
-  (let ((missing))
-    (save-excursion
-      (goto-char (point-min))
-      (while
-          (re-search-forward markdown-regex-link-reference nil t)
-        (let* ((text (match-string-no-properties 2))
-               (reference (match-string-no-properties 4))
-               (target (downcase (if (string= reference "[]") text reference))))
-          (unless (markdown-reference-definition target)
-            (let ((entry (assoc target missing)))
-              (if (not entry)
-                  (add-to-list 'missing (cons target
-                                              (list (cons text (markdown-line-number-at-pos)))) t)
-                (setcdr entry
-                        (append (cdr entry) (list (cons text (markdown-line-number-at-pos))))))))))
-      missing)))
-
-(defconst markdown-reference-check-buffer
-  "*Undefined references for %buffer%*"
-  "Pattern for name of buffer for listing undefined references.
-The string %buffer% will be replaced by the corresponding
-`markdown-mode' buffer name.")
-
-(defun markdown-reference-check-buffer (&optional buffer-name)
-  "Name and return buffer for reference checking.
-BUFFER-NAME is the name of the main buffer being visited."
-  (or buffer-name (setq buffer-name (buffer-name)))
-  (let ((refbuf (get-buffer-create (markdown-replace-regexp-in-string
-                                    "%buffer%" buffer-name
-                                    markdown-reference-check-buffer))))
-    (with-current-buffer refbuf
-      (when view-mode
-        (View-exit-and-edit))
-      (use-local-map button-buffer-map)
-      (erase-buffer))
-    refbuf))
-
-(defconst markdown-reference-links-buffer
-  "*Reference links for %buffer%*"
-  "Pattern for name of buffer for listing references.
-The string %buffer% will be replaced by the corresponding buffer name.")
-
-(defun markdown-reference-links-buffer (&optional buffer-name)
-  "Name, setup, and return a buffer for listing links.
-BUFFER-NAME is the name of the main buffer being visited."
-  (or buffer-name (setq buffer-name (buffer-name)))
-  (let ((linkbuf (get-buffer-create (markdown-replace-regexp-in-string
-                                     "%buffer%" buffer-name
-                                     markdown-reference-links-buffer))))
-    (with-current-buffer linkbuf
-      (when view-mode
-        (View-exit-and-edit))
-      (use-local-map button-buffer-map)
-      (erase-buffer))
-    linkbuf))
-
-(when (markdown-use-buttons-p)
-  ;; Add an empty Markdown reference definition to the end of buffer
-  ;; specified in the 'target-buffer property.  The reference name is
-  ;; the button's label.
-  (define-button-type 'markdown-undefined-reference-button
-    'help-echo "mouse-1, RET: create definition for undefined reference"
-    'follow-link t
-    'face 'bold
-    'action (lambda (b)
-              (let ((buffer (button-get b 'target-buffer)))
-                (markdown-insert-reference-definition (button-label b) buffer)
-                (switch-to-buffer-other-window buffer)
-                (goto-char (point-max))
-                (markdown-check-refs t))))
-
-  ;; Jump to line in buffer specified by 'target-buffer property.
-  ;; Line number is button's 'line property.
-  (define-button-type 'markdown-goto-line-button
-    'help-echo "mouse-1, RET: go to line"
-    'follow-link t
-    'face 'italic
-    'action (lambda (b)
-              (message (button-get b 'buffer))
-              (switch-to-buffer-other-window (button-get b 'target-buffer))
-              ;; use call-interactively to silence compiler
-              (let ((current-prefix-arg (button-get b 'target-line)))
-                (call-interactively 'goto-line))))
-
-  ;; Jumps to a particular link at location given by 'target-char
-  ;; property in buffer given by 'target-buffer property.
-  (define-button-type 'markdown-link-button
-    'help-echo "mouse-1, RET: jump to location of link"
-    'follow-link t
-    'face 'bold
-    'action (lambda (b)
-              (let ((target (button-get b 'target-buffer))
-                    (loc (button-get b 'target-char)))
-                (kill-buffer-and-window)
-                (switch-to-buffer target)
-                (goto-char loc)))))
-
-(defun markdown-insert-undefined-reference-button (reference oldbuf)
-  "Insert a button for creating REFERENCE in buffer OLDBUF.
-REFERENCE should be a list of the form (reference . occurrences),
-as by `markdown-get-undefined-refs'."
-  (let ((label (car reference)))
-    (if (markdown-use-buttons-p)
-        ;; Create a reference button in Emacs 22
-        (insert-button label
-                       :type 'markdown-undefined-reference-button
-                       'target-buffer oldbuf)
-      ;; Insert reference as text in Emacs < 22
-      (insert label))
-    (insert " (")
-    (dolist (occurrence (cdr reference))
-      (let ((line (cdr occurrence)))
-        (if (markdown-use-buttons-p)
-            ;; Create a line number button in Emacs 22
-            (insert-button (number-to-string line)
-                           :type 'markdown-goto-line-button
-                           'target-buffer oldbuf
-                           'target-line line)
-          ;; Insert line number as text in Emacs < 22
-          (insert (number-to-string line)))
-        (insert " ")))
-    (delete-char -1)
-    (insert ")")
-    (newline)))
-
-(defun markdown-insert-link-button (link oldbuf)
-  "Insert a button for jumping to LINK in buffer OLDBUF.
-LINK should be a list of the form (text char line) containing
-the link text, location, and line number."
-  (let ((label (first link))
-        (char (second link))
-        (line (third link)))
-    (if (markdown-use-buttons-p)
-        ;; Create a reference button in Emacs 22
-        (insert-button label
-                       :type 'markdown-link-button
-                       'target-buffer oldbuf
-                       'target-char char)
-      ;; Insert reference as text in Emacs < 22
-      (insert label))
-    (insert (format " (line %d)\n" line))))
-
-(defun markdown-reference-goto-link (&optional reference)
-  "Jump to the location of the first use of REFERENCE."
-  (interactive)
-  (unless reference
-    (if (thing-at-point-looking-at markdown-regex-reference-definition)
-        (setq reference (match-string-no-properties 1))
-      (error "No reference definition at point")))
-  (let ((links (markdown-reference-find-links reference)))
-    (cond ((= (length links) 1)
-           (goto-char (cadr (car links))))
-          ((> (length links) 1)
-           (let ((oldbuf (current-buffer))
-                 (linkbuf (markdown-reference-links-buffer)))
-             (with-current-buffer linkbuf
-               (insert "Links using reference " reference ":\n\n")
-               (dolist (link (reverse links))
-                 (markdown-insert-link-button link oldbuf)))
-             (view-buffer-other-window linkbuf)
-             (goto-char (point-min))
-             (forward-line 2)))
-          (t
-           (error "No links for reference %s" reference)))))
-
-(defun markdown-check-refs (&optional silent)
-  "Show all undefined Markdown references in current `markdown-mode' buffer.
-If SILENT is non-nil, do not message anything when no undefined
-references found.
-Links which have empty reference definitions are considered to be
-defined."
-  (interactive "P")
-  (when (not (eq major-mode 'markdown-mode))
-    (error "Not available in current mode"))
-  (let ((oldbuf (current-buffer))
-        (refs (markdown-get-undefined-refs))
-        (refbuf (markdown-reference-check-buffer)))
-    (if (null refs)
-        (progn
-          (when (not silent)
-            (message "No undefined references found"))
-          (kill-buffer refbuf))
-      (with-current-buffer refbuf
-        (insert "The following references are undefined:\n\n")
-        (dolist (ref refs)
-          (markdown-insert-undefined-reference-button ref oldbuf))
-        (view-buffer-other-window refbuf)
-        (goto-char (point-min))
-        (forward-line 2)))))
-
-
-;;; Lists =====================================================================
-
-(defun markdown-insert-list-item (&optional arg)
-  "Insert a new list item.
-If the point is inside unordered list, insert a bullet mark.  If
-the point is inside ordered list, insert the next number followed
-by a period.  Use the previous list item to determine the amount
-of whitespace to place before and after list markers.
-
-With a \\[universal-argument] prefix (i.e., when ARG is (4)),
-decrease the indentation by one level.
-
-With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
-increase the indentation by one level."
-  (interactive "p")
-  (let (bounds item-indent marker indent new-indent new-loc)
-    (save-match-data
-      ;; Look for a list item on current or previous non-blank line
-      (save-excursion
-        (while (and (not (setq bounds (markdown-cur-list-item-bounds)))
-                    (not (bobp))
-                    (markdown-cur-line-blank-p))
-          (forward-line -1)))
-      (when bounds
-        (cond ((save-excursion
-                 (skip-chars-backward " \t")
-                 (looking-at markdown-regex-list))
-               (beginning-of-line)
-               (insert "\n")
-               (forward-line -1))
-              ((not (markdown-cur-line-blank-p))
-               (newline)))
-        (setq new-loc (point)))
-      ;; Look ahead for a list item on next non-blank line
-      (unless bounds
-        (save-excursion
-          (while (and (null bounds)
-                      (not (eobp))
-                      (markdown-cur-line-blank-p))
-            (forward-line)
-            (setq bounds (markdown-cur-list-item-bounds))))
-        (when bounds
-          (setq new-loc (point))
-          (unless (markdown-cur-line-blank-p)
-            (newline))))
-      (if (not bounds)
-          ;; When not in a list, start a new unordered one
-          (progn
-            (unless (markdown-cur-line-blank-p)
-              (insert "\n"))
-            (insert markdown-unordered-list-item-prefix))
-        ;; Compute indentation for a new list item
-        (setq item-indent (nth 2 bounds))
-        (setq marker (nth 4 bounds))
-        (setq indent (cond
-                      ((= arg 4) (max (- item-indent 4) 0))
-                      ((= arg 16) (+ item-indent 4))
-                      (t item-indent)))
-        (setq new-indent (make-string indent 32))
-        (goto-char new-loc)
-        (cond
-         ;; Ordered list
-         ((string-match "[0-9]" marker)
-          (if (= arg 16) ;; starting a new column indented one more level
-              (insert (concat new-indent "1. "))
-            ;; travel up to the last item and pick the correct number.  If
-            ;; the argument was nil, "new-indent = item-indent" is the same,
-            ;; so we don't need special treatment. Neat.
-            (save-excursion
-              (while (and (not (looking-at (concat new-indent "\\([0-9]+\\)\\(\\.[ \t]*\\)")))
-                          (>= (forward-line -1) 0))))
-            (let* ((old-prefix (match-string 1))
-                   (old-spacing (match-string 2))
-                   (new-prefix (if old-prefix
-                                   (int-to-string (1+ (string-to-number old-prefix)))
-                                 "1"))
-                   (space-adjust (- (length old-prefix) (length new-prefix)))
-                   (new-spacing (if (and (match-string 2)
-                                         (not (string-match "\t" old-spacing))
-                                         (< space-adjust 0)
-                                         (> space-adjust (- 1 (length (match-string 2)))))
-                                    (substring (match-string 2) 0 space-adjust)
-                                  (or old-spacing ". "))))
-              (insert (concat new-indent new-prefix new-spacing)))))
-         ;; Unordered list
-         ((string-match "[\\*\\+-]" marker)
-          (insert new-indent marker)))))))
-
-(defun markdown-move-list-item-up ()
-  "Move the current list item up in the list when possible."
-  (interactive)
-  (let (cur prev old)
-    (when (setq cur (markdown-cur-list-item-bounds))
-      (setq old (point))
-      (goto-char (nth 0 cur))
-      (if (markdown-prev-list-item (nth 3 cur))
-          (progn
-            (setq prev (markdown-cur-list-item-bounds))
-            (condition-case nil
-                (progn
-                  (transpose-regions (nth 0 prev) (nth 1 prev)
-                                     (nth 0 cur) (nth 1 cur) t)
-                  (goto-char (+ (nth 0 prev) (- old (nth 0 cur)))))
-              ;; Catch error in case regions overlap.
-              (error (goto-char old))))
-        (goto-char old)))))
-
-(defun markdown-move-list-item-down ()
-  "Move the current list item down in the list when possible."
-  (interactive)
-  (let (cur next old)
-    (when (setq cur (markdown-cur-list-item-bounds))
-      (setq old (point))
-      (if (markdown-next-list-item (nth 3 cur))
-          (progn
-            (setq next (markdown-cur-list-item-bounds))
-            (condition-case nil
-                (progn
-                  (transpose-regions (nth 0 cur) (nth 1 cur)
-                                     (nth 0 next) (nth 1 next) nil)
-                  (goto-char (+ old (- (nth 1 next) (nth 1 cur)))))
-              ;; Catch error in case regions overlap.
-              (error (goto-char old))))
-        (goto-char old)))))
-
-(defun markdown-demote-list-item (&optional bounds)
-  "Indent (or demote) the current list item.
-Optionally, BOUNDS of the current list item may be provided if available."
-  (interactive)
-  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
-    (save-excursion
-      (save-match-data
-        (let* ((end-marker (make-marker))
-               (end-marker (set-marker end-marker (nth 1 bounds))))
-          (goto-char (nth 0 bounds))
-          (while (< (point) end-marker)
-            (unless (markdown-cur-line-blank-p)
-              (insert "    "))
-            (forward-line)))))))
-
-(defun markdown-promote-list-item (&optional bounds)
-  "Unindent (or promote) the current list item.
-Optionally, BOUNDS of the current list item may be provided if available."
-  (interactive)
-  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
-    (save-excursion
-      (save-match-data
-        (let* ((end-marker (make-marker))
-               (end-marker (set-marker end-marker (nth 1 bounds)))
-               num regexp)
-          (goto-char (nth 0 bounds))
-          (when (looking-at "^[ ]\\{1,4\\}")
-            (setq num (- (match-end 0) (match-beginning 0)))
-            (setq regexp (format "^[ ]\\{1,%d\\}" num))
-            (while (and (< (point) end-marker)
-                        (re-search-forward regexp end-marker t))
-              (replace-match "" nil nil)
-              (forward-line))))))))
-
-(defun markdown-cleanup-list-numbers-level (&optional pfx)
-  "Update the numbering for level PFX (as a string of spaces).
-
-Assume that the previously found match was for a numbered item in
-a list."
-  (let ((cpfx pfx)
-        (idx 0)
-        (continue t)
-        (step t)
-        (sep nil))
-    (while (and continue (not (eobp)))
-      (setq step t)
-      (cond
-       ((looking-at "^\\([\s-]*\\)[0-9]+\\. ")
-        (setq cpfx (match-string-no-properties 1))
-        (cond
-         ((string= cpfx pfx)
-          (replace-match
-           (concat pfx (number-to-string  (setq idx (1+ idx))) ". "))
-          (setq sep nil))
-         ;; indented a level
-         ((string< pfx cpfx)
-          (setq sep (markdown-cleanup-list-numbers-level cpfx))
-          (setq step nil))
-         ;; exit the loop
-         (t
-          (setq step nil)
-          (setq continue nil))))
-
-       ((looking-at "^\\([\s-]*\\)[^ \t\n\r].*$")
-        (setq cpfx (match-string-no-properties 1))
-        (cond
-         ;; reset if separated before
-         ((string= cpfx pfx) (when sep (setq idx 0)))
-         ((string< cpfx pfx)
-          (setq step nil)
-          (setq continue nil))))
-       (t (setq sep t)))
-
-      (when step
-        (beginning-of-line)
-        (setq continue (= (forward-line) 0))))
-    sep))
-
-(defun markdown-cleanup-list-numbers ()
-  "Update the numbering of ordered lists."
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (markdown-cleanup-list-numbers-level "")))
-
-
-;;; Outline ===================================================================
-
-(defvar markdown-cycle-global-status 1)
-(defvar markdown-cycle-subtree-status nil)
-
-(defun markdown-end-of-subtree (&optional invisible-OK)
-  "Move to the end of the current subtree.
-Only visible heading lines are considered, unless INVISIBLE-OK is
-non-nil.
-Derived from `org-end-of-subtree'."
-  (outline-back-to-heading invisible-OK)
-  (let ((first t)
-        (level (funcall outline-level)))
-    (while (and (not (eobp))
-                (or first (> (funcall outline-level) level)))
-      (setq first nil)
-      (outline-next-heading))
-    (if (memq (preceding-char) '(?\n ?\^M))
-        (progn
-          ;; Go to end of line before heading
-          (forward-char -1)
-          (if (memq (preceding-char) '(?\n ?\^M))
-              ;; leave blank line before heading
-              (forward-char -1)))))
-  (point))
-
-(defun markdown-cycle (&optional arg)
-  "Visibility cycling for Markdown mode.
-If ARG is t, perform global visibility cycling.  If the point is
-at an atx-style header, cycle visibility of the corresponding
-subtree.  Otherwise, insert a tab using `indent-relative'.
-Derived from `org-cycle'."
-  (interactive "P")
-  (cond
-   ((eq arg t) ;; Global cycling
-    (cond
-     ((and (eq last-command this-command)
-           (eq markdown-cycle-global-status 2))
-      ;; Move from overview to contents
-      (hide-sublevels 1)
-      (message "CONTENTS")
-      (setq markdown-cycle-global-status 3))
-
-     ((and (eq last-command this-command)
-           (eq markdown-cycle-global-status 3))
-      ;; Move from contents to all
-      (show-all)
-      (message "SHOW ALL")
-      (setq markdown-cycle-global-status 1))
-
-     (t
-      ;; Defaults to overview
-      (hide-body)
-      (message "OVERVIEW")
-      (setq markdown-cycle-global-status 2))))
-
-   ((save-excursion (beginning-of-line 1) (looking-at outline-regexp))
-    ;; At a heading: rotate between three different views
-    (outline-back-to-heading)
-    (let ((goal-column 0) eoh eol eos)
-      ;; Determine boundaries
-      (save-excursion
-        (outline-back-to-heading)
-        (save-excursion
-          (beginning-of-line 2)
-          (while (and (not (eobp)) ;; this is like `next-line'
-                      (get-char-property (1- (point)) 'invisible))
-            (beginning-of-line 2)) (setq eol (point)))
-        (outline-end-of-heading)   (setq eoh (point))
-        (markdown-end-of-subtree t)
-        (skip-chars-forward " \t\n")
-        (beginning-of-line 1) ; in case this is an item
-        (setq eos (1- (point))))
-      ;; Find out what to do next and set `this-command'
-      (cond
-       ((= eos eoh)
-        ;; Nothing is hidden behind this heading
-        (message "EMPTY ENTRY")
-        (setq markdown-cycle-subtree-status nil))
-       ((>= eol eos)
-        ;; Entire subtree is hidden in one line: open it
-        (show-entry)
-        (show-children)
-        (message "CHILDREN")
-        (setq markdown-cycle-subtree-status 'children))
-       ((and (eq last-command this-command)
-             (eq markdown-cycle-subtree-status 'children))
-        ;; We just showed the children, now show everything.
-        (show-subtree)
-        (message "SUBTREE")
-        (setq markdown-cycle-subtree-status 'subtree))
-       (t
-        ;; Default action: hide the subtree.
-        (hide-subtree)
-        (message "FOLDED")
-        (setq markdown-cycle-subtree-status 'folded)))))
-
-   (t
-    (indent-for-tab-command))))
-
-(defun markdown-shifttab ()
-  "Global visibility cycling.
-Calls `markdown-cycle' with argument t."
-  (interactive)
-  (markdown-cycle t))
-
-(defun markdown-outline-level ()
-  "Return the depth to which a statement is nested in the outline."
-  (cond
-   ((match-end 1) 1)
-   ((match-end 3) 2)
-   ((- (match-end 5) (match-beginning 5)))))
-
-
-;;; Movement ==================================================================
-
-(defun markdown-beginning-of-defun (&optional arg)
-  "`beginning-of-defun-function' for Markdown.
-Move backward to the beginning of the current or previous section.
-When ARG is non-nil, repeat that many times.  When ARG is negative,
-move forward to the ARG-th following section."
-  (interactive "P")
-  (or arg (setq arg 1))
-  (or (re-search-backward markdown-regex-header nil t arg)
-      (goto-char (point-min))))
-
-(defun markdown-end-of-defun (&optional arg)
-  "`end-of-defun-function' for Markdown.
-Move forward to the end of the current or following section.
-When ARG is non-nil, repeat that many times.  When ARG is negative,
-move back to the ARG-th preceding section."
-  (interactive "P")
-  (or arg (setq arg 1))
-  (when (looking-at markdown-regex-header)
-    (goto-char (match-beginning 0))
-    (forward-char 1))
-  (if (re-search-forward markdown-regex-header nil t arg)
-      (goto-char (match-beginning 0))
-    (goto-char (point-max)))
-  (skip-syntax-backward "-"))
-
-(defun markdown-beginning-of-block ()
-  "Move the point to the start of the previous text block."
-  (interactive)
-  (if (re-search-backward markdown-regex-block-separator nil t)
-      (goto-char (or (match-end 2) (match-end 0)))
-    (goto-char (point-min))))
-
-(defun markdown-end-of-block ()
-  "Move the point to the start of the next text block."
-  (interactive)
-  (beginning-of-line)
-  (skip-syntax-forward "-")
-  (when (= (point) (point-min))
-    (forward-char))
-  (if (re-search-forward markdown-regex-block-separator nil t)
-      (goto-char (or (match-end 2) (match-end 0)))
-    (goto-char (point-max)))
-  (skip-syntax-backward "-")
-  (forward-line))
-
-(defun markdown-forward-paragraph (arg)
-  "Move forward one or more paragraphs or by one block.
-When ARG is nil or a numeric prefix, call `forward-paragraph'
-with ARG.  When called with \\[universal-argument], call
-`markdown-end-of-block' instead."
-  (interactive "P")
-  (or arg (setq arg 1))
-  (cond ((integerp arg)
-         (forward-paragraph arg))
-        ((equal arg '(4))
-         (markdown-end-of-block))))
-
-(defun markdown-backward-paragraph (arg)
-  "Move backward one or more paragraphs or by one block.
-When ARG is nil or a numeric prefix, call `backward-paragraph'
-with ARG.  When called with \\[universal-argument], call
-`markdown-beginning-of-block' instead."
-  (interactive "P")
-  (or arg (setq arg 1))
-  (cond ((integerp arg)
-         (backward-paragraph arg))
-        ((equal arg '(4))
-         (markdown-beginning-of-block))))
-
-(defun markdown-end-of-block-element ()
-  "Move the point to the start of the next block unit.
-Stops at blank lines, list items, headers, and horizontal rules."
-  (interactive)
-  (forward-line)
-  (while (and (or (not (markdown-prev-line-blank-p))
-                  (markdown-cur-line-blank-p))
-              (not (or (looking-at markdown-regex-list)
-                       (looking-at markdown-regex-header)
-                       (looking-at markdown-regex-hr)))
-              (not (eobp)))
-    (forward-line)))
-
-(defun markdown-next-link ()
-  "Jump to next inline, reference, or wiki link.
-If successful, return point.  Otherwise, return nil.
-See `markdown-wiki-link-p' and `markdown-previous-wiki-link'."
-  (interactive)
-  (let ((opoint (point)))
-    (when (or (markdown-link-p) (markdown-wiki-link-p))
-      ;; At a link already, move past it.
-      (goto-char (+ (match-end 0) 1)))
-    ;; Search for the next wiki link and move to the beginning.
-    (if (re-search-forward markdown-regex-link-generic nil t)
-        ;; Group 1 will move past non-escape character in wiki link regexp.
-        ;; Go to beginning of group zero for all other link types.
-        (goto-char (or (match-beginning 1) (match-beginning 0)))
-      (goto-char opoint)
-      nil)))
-
-(defun markdown-previous-link ()
-  "Jump to previous wiki link.
-If successful, return point.  Otherwise, return nil.
-See `markdown-wiki-link-p' and `markdown-next-wiki-link'."
-  (interactive)
-  (if (re-search-backward markdown-regex-link-generic nil t)
-      (goto-char (or (match-beginning 1) (match-beginning 0)))
-    nil))
-
-
-;;; Generic Structure Editing, Completion, and Cycling Commands ===============
-
-(defun markdown-move-up ()
-  "Move list item up.
-Calls `markdown-move-list-item-up'."
-  (interactive)
-  (markdown-move-list-item-up))
-
-(defun markdown-move-down ()
-  "Move list item down.
-Calls `markdown-move-list-item-down'."
-  (interactive)
-  (markdown-move-list-item-down))
-
-(defun markdown-promote ()
-  "Either promote header or list item at point or cycle markup.
-See `markdown-cycle-atx', `markdown-cycle-setext', and
-`markdown-promote-list-item'."
-  (interactive)
-  (let (bounds)
-    (cond
-     ;; Promote atx header
-     ((thing-at-point-looking-at markdown-regex-header-atx)
-      (markdown-cycle-atx -1))
-     ;; Promote setext header
-     ((thing-at-point-looking-at markdown-regex-header-setext)
-      (markdown-cycle-setext -1))
-     ;; Promote horizonal rule
-     ((thing-at-point-looking-at markdown-regex-hr)
-      (markdown-cycle-hr -1))
-     ;; Promote list item
-     ((setq bounds (markdown-cur-list-item-bounds))
-      (markdown-promote-list-item))
-     ;; Promote bold
-     ((thing-at-point-looking-at markdown-regex-bold)
-      (markdown-cycle-bold))
-     ;; Promote italic
-     ((thing-at-point-looking-at markdown-regex-italic)
-      (markdown-cycle-italic))
-     (t
-      (error "Nothing to promote at point")))))
-
-(defun markdown-demote ()
-  "Either demote header or list item at point or cycle or remove markup.
-See `markdown-cycle-atx', `markdown-cycle-setext', and
-`markdown-demote-list-item'."
-  (interactive)
-  (let (bounds)
-    (cond
-     ;; Demote atx header
-     ((thing-at-point-looking-at markdown-regex-header-atx)
-      (markdown-cycle-atx 1))
-     ;; Demote setext header
-     ((thing-at-point-looking-at markdown-regex-header-setext)
-      (markdown-cycle-setext 1))
-     ;; Demote horizonal rule
-     ((thing-at-point-looking-at markdown-regex-hr)
-      (markdown-cycle-hr 1))
-     ;; Demote list item
-     ((setq bounds (markdown-cur-list-item-bounds))
-      (markdown-demote-list-item))
-     ;; Demote bold
-     ((thing-at-point-looking-at markdown-regex-bold)
-      (markdown-cycle-bold))
-     ;; Demote italic
-     ((thing-at-point-looking-at markdown-regex-italic)
-      (markdown-cycle-italic))
-     (t
-      (error "Nothing to demote at point")))))
-
-
-;;; Commands ==================================================================
-
-(defun markdown (&optional output-buffer-name)
-  "Run `markdown-command' on buffer, sending output to OUTPUT-BUFFER-NAME.
-The output buffer name defaults to `markdown-output-buffer-name'.
-Return the name of the output buffer used."
-  (interactive)
-  (save-window-excursion
-    (let ((begin-region)
-          (end-region))
-      (if (markdown-use-region-p)
-          (setq begin-region (region-beginning)
-                end-region (region-end))
-        (setq begin-region (point-min)
-              end-region (point-max)))
-
-      (unless output-buffer-name
-        (setq output-buffer-name markdown-output-buffer-name))
-
-      (cond
-       ;; Handle case when `markdown-command' does not read from stdin
-       (markdown-command-needs-filename
-        (if (not buffer-file-name)
-            (error "Must be visiting a file")
-          (shell-command (concat markdown-command " "
-                                 (shell-quote-argument buffer-file-name))
-                         output-buffer-name)))
-       ;; Pass region to `markdown-command' via stdin
-       (t
-        (shell-command-on-region begin-region end-region markdown-command
-                                 output-buffer-name))))
-    output-buffer-name))
-
-(defun markdown-standalone (&optional output-buffer-name)
-  "Special function to provide standalone HTML output.
-Insert the output in the buffer named OUTPUT-BUFFER-NAME."
-  (interactive)
-  (setq output-buffer-name (markdown output-buffer-name))
-  (with-current-buffer output-buffer-name
-    (set-buffer output-buffer-name)
-    (unless (markdown-output-standalone-p)
-      (markdown-add-xhtml-header-and-footer output-buffer-name))
-    (goto-char (point-min))
-    (html-mode))
-  output-buffer-name)
-
-(defun markdown-other-window (&optional output-buffer-name)
-  "Run `markdown-command' on current buffer and display in other window.
-When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
-that name."
-  (interactive)
-  (display-buffer (markdown-standalone output-buffer-name)))
-
-(defun markdown-output-standalone-p ()
-  "Determine whether `markdown-command' output is standalone XHTML.
-Standalone XHTML output is identified by an occurrence of
-`markdown-xhtml-standalone-regexp' in the first five lines of output."
-  (save-excursion
-    (goto-char (point-min))
-    (re-search-forward
-     markdown-xhtml-standalone-regexp
-     (save-excursion (goto-char (point-min)) (forward-line 4) (point))
-     t)))
-
-(defun markdown-stylesheet-link-string (stylesheet-path)
-  (concat "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\""
-          stylesheet-path
-          "\"  />"))
-
-(defun markdown-add-xhtml-header-and-footer (title)
-  "Wrap XHTML header and footer with given TITLE around current buffer."
-  (insert "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
-          "\t\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\n"
-          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n\n"
-          "<head>\n<title>")
-  (insert title)
-  (insert "</title>\n")
-  (when (> (length markdown-content-type) 0)
-    (insert
-     (format
-      "<meta http-equiv=\"Content-Type\" content=\"%s;charset=%s\"/>\n"
-      markdown-content-type
-      (or (and markdown-coding-system
-               (fboundp 'coding-system-get)
-               (coding-system-get markdown-coding-system
-                                  'mime-charset))
-          (and (fboundp 'coding-system-get)
-               (coding-system-get buffer-file-coding-system
-                                  'mime-charset))
-          "iso-8859-1"))))
-  (if (> (length markdown-css-paths) 0)
-      (insert (mapconcat 'markdown-stylesheet-link-string markdown-css-paths "\n")))
-  (when (> (length markdown-xhtml-header-content) 0)
-    (insert markdown-xhtml-header-content))
-  (insert "\n</head>\n\n"
-          "<body>\n\n")
-  (goto-char (point-max))
-  (insert "\n"
-          "</body>\n"
-          "</html>\n"))
-
-(defun markdown-preview (&optional output-buffer-name)
-  "Run `markdown-command' on the current buffer and view output in browser.
-When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
-that name."
-  (interactive)
-  (browse-url-of-buffer (markdown-standalone markdown-output-buffer-name)))
-
-(defun markdown-export-file-name (&optional extension)
-  "Attempt to generate a filename for Markdown output.
-The file extension will be EXTENSION if given, or .html by default.
-If the current buffer is visiting a file, we construct a new
-output filename based on that filename.  Otherwise, return nil."
-  (when (buffer-file-name)
-    (unless extension
-      (setq extension ".html"))
-    (let ((candidate
-           (concat
-            (cond
-             ((buffer-file-name)
-              (file-name-sans-extension (buffer-file-name)))
-             (t (buffer-name)))
-            extension)))
-      (cond
-       ((equal candidate (buffer-file-name))
-        (concat candidate extension))
-       (t
-        candidate)))))
-
-(defun markdown-export (&optional output-file)
-  "Run Markdown on the current buffer, save to file, and return the filename.
-If OUTPUT-FILE is given, use that as the filename.  Otherwise, use the filename
-generated by `markdown-export-file-name', which will be constructed using the
-current filename, but with the extension removed and replaced with .html."
-  (interactive)
-  (unless output-file
-    (setq output-file (markdown-export-file-name ".html")))
-  (when output-file
-    (let* ((init-buf (current-buffer))
-           (init-point (point))
-           (init-buf-string (buffer-string))
-           (output-buffer (find-file-noselect output-file))
-           (output-buffer-name (buffer-name output-buffer)))
-      (run-hooks 'markdown-before-export-hook)
-      (markdown-standalone output-buffer-name)
-      (with-current-buffer output-buffer
-        (run-hooks 'markdown-after-export-hook)
-        (save-buffer))
-      ;; if modified, restore initial buffer
-      (when (buffer-modified-p init-buf)
-        (erase-buffer)
-        (insert init-buf-string)
-        (save-buffer)
-        (goto-char init-point))
-      output-file)))
-
-(defun markdown-export-and-preview ()
-  "Export to XHTML using `markdown-export' and browse the resulting file."
-  (interactive)
-  (browse-url-of-file (markdown-export)))
-
-(defun markdown-open ()
-  "Open file for the current buffer with `markdown-open-command'."
-  (interactive)
-  (if (not markdown-open-command)
-      (error "Variable `markdown-open-command' must be set")
-    (if (not buffer-file-name)
-        (error "Must be visiting a file")
-      (call-process markdown-open-command
-                    nil nil nil buffer-file-name))))
-
-(defun markdown-kill-ring-save ()
-  "Run Markdown on file and store output in the kill ring."
-  (interactive)
-  (save-window-excursion
-    (markdown)
-    (with-current-buffer markdown-output-buffer-name
-      (kill-ring-save (point-min) (point-max)))))
-
-
-;;; Links =====================================================================
-
-(defun markdown-link-p ()
-  "Return non-nil when `point' is at a non-wiki link.
-See `markdown-wiki-link-p' for more information."
-  (let ((case-fold-search nil))
-    (and (not (markdown-wiki-link-p))
-         (or (thing-at-point-looking-at markdown-regex-link-inline)
-             (thing-at-point-looking-at markdown-regex-link-reference)
-             (thing-at-point-looking-at markdown-regex-uri)
-             (thing-at-point-looking-at markdown-regex-angle-uri)))))
-
-(defun markdown-link-link ()
-  "Return the link part of the regular (non-wiki) link at point.
-Works with both inline and reference style links.  If point is
-not at a link or the link reference is not defined returns nil."
-  (cond
-   ((thing-at-point-looking-at markdown-regex-link-inline)
-    (match-string-no-properties 5))
-   ((thing-at-point-looking-at markdown-regex-link-reference)
-    (let* ((text (match-string-no-properties 2))
-           (reference (match-string-no-properties 4))
-           (target (downcase (if (string= reference "[]") text reference))))
-      (car (markdown-reference-definition target))))
-   ((thing-at-point-looking-at markdown-regex-uri)
-    (match-string-no-properties 0))
-   ((thing-at-point-looking-at markdown-regex-angle-uri)
-    (match-string-no-properties 2))
-   (t nil)))
-
-(defun markdown-follow-link-at-point ()
-  "Open the current non-wiki link in a browser."
-  (interactive)
-  (if (markdown-link-p) (browse-url (markdown-link-link))
-    (error "Point is not at a Markdown link or URI")))
-
-
-;;; WikiLink Following/Markup =================================================
-
-(defun markdown-wiki-link-p ()
-  "Return non-nil when `point' is at a true wiki link.
-A true wiki link name matches `markdown-regex-wiki-link' but does not
-match the current file name after conversion.  This modifies the data
-returned by `match-data'.  Note that the potential wiki link name must
-be available via `match-string'."
-  (let ((case-fold-search nil))
-    (and (thing-at-point-looking-at markdown-regex-wiki-link)
-         (or (not buffer-file-name)
-             (not (string-equal (buffer-file-name)
-                                (markdown-convert-wiki-link-to-filename
-                                 (markdown-wiki-link-link)))))
-         (not (save-match-data
-                (save-excursion))))))
-
-(defun markdown-wiki-link-link ()
-  "Return the link part of the wiki link using current match data.
-The location of the link component depends on the value of
-`markdown-wiki-link-alias-first'."
-  (if markdown-wiki-link-alias-first
-      (or (match-string-no-properties 4) (match-string-no-properties 2))
-    (match-string-no-properties 2)))
-
-(defun markdown-wiki-link-alias ()
-  "Return the alias or text part of the wiki link using current match data.
-The location of the alias component depends on the value of
-`markdown-wiki-link-alias-first'."
-  (if markdown-wiki-link-alias-first
-      (match-string-no-properties 2)
-    (or (match-string-no-properties 4) (match-string-no-properties 2))))
-
-(defun markdown-convert-wiki-link-to-filename (name)
-  "Generate a filename from the wiki link NAME.
-Spaces in NAME are replaced with `markdown-link-space-sub-char'.
-When in `gfm-mode', follow GitHub's conventions where [[Test Test]]
-and [[test test]] both map to Test-test.ext."
-  (let ((basename (markdown-replace-regexp-in-string
-                   "[[:space:]\n]" markdown-link-space-sub-char name)))
-    (when (eq major-mode 'gfm-mode)
-      (setq basename (concat (upcase (substring basename 0 1))
-                             (downcase (substring basename 1 nil)))))
-    (concat basename
-            (if (buffer-file-name)
-                (concat "."
-                        (file-name-extension (buffer-file-name)))))))
-
-(defun markdown-follow-wiki-link (name &optional other)
-  "Follow the wiki link NAME.
-Convert the name to a file name and call `find-file'.  Ensure that
-the new buffer remains in `markdown-mode'.  Open the link in another
-window when OTHER is non-nil."
-  (let ((filename (markdown-convert-wiki-link-to-filename name))
-        (wp (file-name-directory buffer-file-name)))
-    (when other (other-window 1))
-    (find-file (concat wp filename)))
-  (when (not (eq major-mode 'markdown-mode))
-    (markdown-mode)))
-
-(defun markdown-follow-wiki-link-at-point (&optional arg)
-  "Find Wiki Link at point.
-With prefix argument ARG, open the file in other window.
-See `markdown-wiki-link-p' and `markdown-follow-wiki-link'."
-  (interactive "P")
-  (if (markdown-wiki-link-p)
-      (markdown-follow-wiki-link (markdown-wiki-link-link) arg)
-    (error "Point is not at a Wiki Link")))
-
-(defun markdown-highlight-wiki-link (from to face)
-  "Highlight the wiki link in the region between FROM and TO using FACE."
-  (put-text-property from to 'font-lock-face face))
-
-(defun markdown-unfontify-region-wiki-links (from to)
-  "Remove wiki link faces from the region specified by FROM and TO."
-  (interactive "nfrom: \nnto: ")
-  (remove-text-properties from to '(font-lock-face markdown-link-face))
-  (remove-text-properties from to '(font-lock-face markdown-missing-link-face)))
-
-(defun markdown-fontify-region-wiki-links (from to)
-  "Search region given by FROM and TO for wiki links and fontify them.
-If a wiki link is found check to see if the backing file exists
-and highlight accordingly."
-  (goto-char from)
-  (save-match-data
-    (while (re-search-forward markdown-regex-wiki-link to t)
-      (let ((highlight-beginning (match-beginning 1))
-            (highlight-end (match-end 1))
-            (file-name
-             (markdown-convert-wiki-link-to-filename
-              (markdown-wiki-link-link))))
-        (if (file-exists-p file-name)
-            (markdown-highlight-wiki-link
-             highlight-beginning highlight-end markdown-link-face)
-          (markdown-highlight-wiki-link
-           highlight-beginning highlight-end markdown-link-face)
-          (markdown-highlight-wiki-link
-           highlight-beginning highlight-end markdown-missing-link-face))))))
-
-(defun markdown-extend-changed-region (from to)
-  "Extend region given by FROM and TO so that we can fontify all links.
-The region is extended to the first newline before and the first
-newline after."
-  ;; start looking for the first new line before 'from
-  (goto-char from)
-  (re-search-backward "\n" nil t)
-  (let ((new-from (point-min))
-        (new-to (point-max)))
-    (if (not (= (point) from))
-        (setq new-from (point)))
-    ;; do the same thing for the first new line after 'to
-    (goto-char to)
-    (re-search-forward "\n" nil t)
-    (if (not (= (point) to))
-        (setq new-to (point)))
-    (values new-from new-to)))
-
-(defun markdown-check-change-for-wiki-link (from to change)
-  "Check region between FROM and TO for wiki links and re-fontfy as needed.
-Designed to be used with the `after-change-functions' hook.
-CHANGE is the number of bytes of pre-change text replaced by the
-given range."
-  (interactive "nfrom: \nnto: \nnchange: ")
-  (let* ((modified (buffer-modified-p))
-         (buffer-undo-list t)
-         (inhibit-read-only t)
-         (inhibit-point-motion-hooks t)
-         deactivate-mark
-         buffer-file-truename)
-     (unwind-protect
-         (save-excursion
-           (save-match-data
-             (save-restriction
-               ;; Extend the region to fontify so that it starts
-               ;; and ends at safe places.
-               (multiple-value-bind (new-from new-to)
-                   (markdown-extend-changed-region from to)
-                 ;; Unfontify existing fontification (start from scratch)
-                 (markdown-unfontify-region-wiki-links new-from new-to)
-                 ;; Now do the fontification.
-                 (markdown-fontify-region-wiki-links new-from new-to)))))
-       (and (not modified)
-            (buffer-modified-p)
-            (set-buffer-modified-p nil)))))
-
-(defun markdown-fontify-buffer-wiki-links ()
-  "Refontify all wiki links in the buffer."
-  (interactive)
-  (markdown-check-change-for-wiki-link (point-min) (point-max) 0))
-
-
-;;; Following and Jumping =====================================================
-
-(defun markdown-follow-thing-at-point (arg)
-  "Follow thing at point if possible, such as a reference link or wiki link.
-Opens inline and reference links in a browser.  Opens wiki links
-to other files in the current window, or the another window if
-ARG is non-nil.
-See `markdown-follow-link-at-point' and
-`markdown-follow-wiki-link-at-point'."
-  (interactive "P")
-  (cond ((markdown-link-p)
-         (markdown-follow-link-at-point))
-        ((markdown-wiki-link-p)
-         (markdown-follow-wiki-link-at-point arg))
-        (t
-         (error "Nothing to follow at point"))))
-
-(defun markdown-jump ()
-  "Jump to another location based on context at point.
-Jumps between reference links and definitions; between footnote
-markers and footnote text."
-  (interactive)
-  (cond ((markdown-footnote-text-positions)
-         (markdown-footnote-return))
-        ((markdown-footnote-marker-positions)
-         (markdown-footnote-goto-text))
-        ((thing-at-point-looking-at markdown-regex-link-reference)
-         (markdown-reference-goto-definition))
-        ((thing-at-point-looking-at markdown-regex-reference-definition)
-         (markdown-reference-goto-link (match-string-no-properties 1)))
-        (t
-         (error "Nothing to jump to from context at point"))))
-
-
-;;; Miscellaneous =============================================================
-
-(defun markdown-compress-whitespace-string (str)
-  "Compress whitespace in STR and return result.
-Leading and trailing whitespace is removed.  Sequences of multiple
-spaces, tabs, and newlines are replaced with single spaces."
-  (replace-regexp-in-string "\\(^[ \t\n]+\\|[ \t\n]+$\\)" ""
-                            (replace-regexp-in-string "[ \t\n]+" " " str)))
-
-(defun markdown-line-number-at-pos (&optional pos)
-  "Return (narrowed) buffer line number at position POS.
-If POS is nil, use current buffer location.
-This is an exact copy of `line-number-at-pos' for use in emacs21."
-  (let ((opoint (or pos (point))) start)
-    (save-excursion
-      (goto-char (point-min))
-      (setq start (point))
-      (goto-char opoint)
-      (forward-line 0)
-      (1+ (count-lines start (point))))))
-
-(defun markdown-inside-link-text-p ()
-  "Return nil if not currently within link anchor text."
-  (looking-back "\\[[^]]*"))
-
-(defun markdown-line-is-reference-definition-p ()
-  "Return whether the current line is a (non-footnote) reference defition."
-  (save-excursion
-    (move-beginning-of-line 1)
-    (and (looking-at-p markdown-regex-reference-definition)
-         (not (looking-at-p "[ \t]*\\[^")))))
-
-(defun markdown-adaptive-fill-function ()
-  "Return prefix for filling paragraph or nil if not determined."
-  (cond
-   ;; List item inside blockquote
-   ((looking-at "^[ \t]*>[ \t]*\\([0-9]+\\.\\|[*+-]\\)[ \t]+")
-    (replace-regexp-in-string
-     "[0-9\\.*+-]" " " (match-string-no-properties 0)))
-   ;; Blockquote
-   ((looking-at "^[ \t]*>[ \t]*")
-    (match-string-no-properties 0))
-   ;; List items
-   ((looking-at markdown-regex-list)
-    (match-string-no-properties 0))
-   ((looking-at markdown-regex-footnote-definition)
-    "    ") ; four spaces
-   ;; No match
-   (t nil)))
-
-(defun markdown-fill-forward-paragraph-function (&optional arg)
-  (let* ((arg (or arg 1))
-         (paragraphs-remaining (forward-paragraph arg))
-         (start (point)))
-    (when (< arg 0)
-      (while (and (not (eobp))
-                  (progn (move-to-left-margin) (not (eobp)))
-                  (looking-at paragraph-separate))
-        (forward-line 1))
-      (if (looking-at markdown-regex-list)
-          (forward-char (length (match-string 0)))
-        (goto-char start)))
-    paragraphs-remaining))
-
-
-;;; Extensions ================================================================
-
-(defun markdown-reload-extensions ()
-  "Check settings, update font-lock keywords, and re-fontify buffer."
-  (interactive)
-  (when (eq major-mode 'markdown-mode)
-    (setq markdown-mode-font-lock-keywords
-          (append
-           (when markdown-enable-math
-             markdown-mode-font-lock-keywords-math)
-           markdown-mode-font-lock-keywords-basic
-           markdown-mode-font-lock-keywords-core))
-    (setq font-lock-defaults '(markdown-mode-font-lock-keywords))
-    (when (fboundp 'font-lock-refresh-defaults) (font-lock-refresh-defaults))))
-
-(defun markdown-enable-math (&optional arg)
-  "Toggle support for inline and display LaTeX math expressions.
-With a prefix argument ARG, enable math mode if ARG is positive,
-and disable it otherwise.  If called from Lisp, enable the mode
-if ARG is omitted or nil."
-  (interactive (list (or current-prefix-arg 'toggle)))
-  (setq markdown-enable-math
-        (if (eq arg 'toggle)
-            (not markdown-enable-math)
-          (> (prefix-numeric-value arg) 0)))
-  (if markdown-enable-math
-      (message "markdown-mode math support enabled")
-    (message "markdown-mode math support disabled"))
-  (markdown-reload-extensions))
-
-
-;;; Mode Definition  ==========================================================
-
-(defun markdown-show-version ()
-  "Show the version number in the minibuffer."
-  (interactive)
-  (message "markdown-mode, version %s" markdown-mode-version))
-
-;;;###autoload
-(define-derived-mode markdown-mode text-mode "Markdown"
-  "Major mode for editing Markdown files."
-  ;; Natural Markdown tab width
-  (setq tab-width 4)
-  ;; Comments
-  (make-local-variable 'comment-start)
-  (setq comment-start "<!-- ")
-  (make-local-variable 'comment-end)
-  (setq comment-end " -->")
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "<!--[ \t]*")
-  (make-local-variable 'comment-column)
-  (setq comment-column 0)
-  (set (make-local-variable 'comment-auto-fill-only-comments) nil)
-  ;; Font lock.
-  (set (make-local-variable 'markdown-mode-font-lock-keywords) nil)
-  (set (make-local-variable 'font-lock-defaults) nil)
-  (set (make-local-variable 'font-lock-multiline) t)
-  (markdown-reload-extensions)
-  ;; Extensions
-  (make-local-variable 'markdown-enable-math)
-  (add-hook 'hack-local-variables-hook 'markdown-reload-extensions)
-  ;; For imenu support
-  (setq imenu-create-index-function 'markdown-imenu-create-index)
-  ;; For menu support in XEmacs
-  (easy-menu-add markdown-mode-menu markdown-mode-map)
-  ;; Defun movement
-  (set (make-local-variable 'beginning-of-defun-function)
-       'markdown-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function)
-       'markdown-end-of-defun)
-  ;; Paragraph filling
-  (set
-   ; Should match start of lines that start or seaprate paragraphs
-   (make-local-variable 'paragraph-start)
-       (mapconcat 'identity
-                  '(
-                    "\f" ; starts with a literal line-feed
-                    "[ \t\f]*$" ; space-only line
-                    "[ \t]*[*+-][ \t]+" ; unordered list item
-                    "[ \t]*[0-9]+\\.[ \t]+" ; ordered list item
-                    "[ \t]*\\[\\S-*\\]:[ \t]+" ; link ref def
-                    )
-                  "\\|"))
-  (set
-   ; Should match lines that separate paragraphs without being
-   ; part of any paragraph:
-   (make-local-variable 'paragraph-separate)
-   (mapconcat 'identity
-              '("[ \t\f]*$" ; space-only line
-                ; The following is not ideal, but the Fill customization
-                ; options really only handle paragraph-starting prefixes,
-                ; not paragraph-ending suffixes:
-                ".*  $" ; line ending in two spaces
-                "[ \t]*\\[\\^\\S-*\\]:[ \t]*$") ; just the start of a footnote def
-              "\\|"))
-  (set (make-local-variable 'adaptive-fill-first-line-regexp)
-       "\\`[ \t]*>[ \t]*?\\'")
-  (set (make-local-variable 'adaptive-fill-function)
-       'markdown-adaptive-fill-function)
-  (set (make-local-variable 'fill-forward-paragraph-function)
-       'markdown-fill-forward-paragraph-function)
-  ;; Outline mode
-  (make-local-variable 'outline-regexp)
-  (setq outline-regexp markdown-regex-header)
-  (make-local-variable 'outline-level)
-  (setq outline-level 'markdown-outline-level)
-  ;; Cause use of ellipses for invisible text.
-  (add-to-invisibility-spec '(outline . t))
-
-  ;; Inhibiting line-breaking:
-  ;; Separating out each condition into a separate function so that users can
-  ;; override if desired (with remove-hook)
-  (add-hook 'fill-nobreak-predicate
-            'markdown-inside-link-text-p nil t)
-  (add-hook 'fill-nobreak-predicate
-            'markdown-line-is-reference-definition-p nil t)
-
-  ;; Indentation
-  (setq indent-line-function markdown-indent-function)
-
-  ;; Backwards compatibility with markdown-css-path
-  (when (boundp 'markdown-css-path)
-    (warn "markdown-css-path is deprecated, see markdown-css-paths.")
-    (add-to-list 'markdown-css-paths markdown-css-path))
-
-  ;; Prepare hooks for XEmacs compatibility
-  (when (featurep 'xemacs)
-    (make-local-hook 'after-change-functions)
-    (make-local-hook 'font-lock-extend-region-functions)
-    (make-local-hook 'window-configuration-change-hook))
-
-  ;; Multiline font lock
-  (add-hook 'font-lock-extend-region-functions
-            'markdown-font-lock-extend-region)
-
-  ;; Anytime text changes make sure it gets fontified correctly
-  (add-hook 'after-change-functions 'markdown-check-change-for-wiki-link t t)
-
-  ;; If we left the buffer there is a really good chance we were
-  ;; creating one of the wiki link documents. Make sure we get
-  ;; refontified when we come back.
-  (add-hook 'window-configuration-change-hook
-            'markdown-fontify-buffer-wiki-links t t)
-
-  ;; do the initial link fontification
-  (markdown-fontify-buffer-wiki-links))
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
-
-
-;;; GitHub Flavored Markdown Mode  ============================================
-
-(defvar gfm-font-lock-keywords
-  (append
-   ;; GFM features to match first
-   (list
-    (cons 'markdown-match-gfm-code-blocks '((1 markdown-pre-face)
-                                            (2 markdown-language-keyword-face t t)
-                                            (3 markdown-pre-face)
-                                            (4 markdown-pre-face)))
-    (cons markdown-regex-strike-through '(2 markdown-strike-through-face)))
-   ;; Basic Markdown features (excluding possibly overridden ones)
-   markdown-mode-font-lock-keywords-basic
-   ;; GFM features to match last
-   (list
-    (cons markdown-regex-gfm-italic '(2 markdown-italic-face))))
-  "Default highlighting expressions for GitHub Flavored Markdown mode.")
-
-;;;###autoload
-(define-derived-mode gfm-mode markdown-mode "GFM"
-  "Major mode for editing GitHub Flavored Markdown files."
-  (setq markdown-link-space-sub-char "-")
-  (set (make-local-variable 'font-lock-defaults)
-       '(gfm-font-lock-keywords))
-  (auto-fill-mode 0)
-  ;; Use visual-line-mode if available, fall back to longlines-mode:
-  (cond ((fboundp 'visual-line-mode)
-         (visual-line-mode 1))
-        ((fboundp 'longlines-mode)
-         (longlines-mode 1)))
-  ;; do the initial link fontification
-  (markdown-fontify-buffer-wiki-links))
-
-
-(provide 'markdown-mode)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-;;; markdown-mode.el ends here
diff --git a/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode-autoloads.el b/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode-autoloads.el
new file mode 100644
index 0000000..3dc12be
--- /dev/null
+++ b/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode-autoloads.el
@@ -0,0 +1,33 @@
+;;; markdown-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "markdown-mode" "markdown-mode.el" (22171 46554
+;;;;;;  0 0))
+;;; Generated autoloads from markdown-mode.el
+
+(autoload 'markdown-mode "markdown-mode" "\
+Major mode for editing Markdown files.
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+
+(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
+
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+
+(autoload 'gfm-mode "markdown-mode" "\
+Major mode for editing GitHub Flavored Markdown files.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; markdown-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode-pkg.el b/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode-pkg.el
new file mode 100644
index 0000000..716be79
--- /dev/null
+++ b/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "markdown-mode" "20160115.2318" "Emacs Major mode for Markdown-formatted text files" '((cl-lib "0.5")) :url "http://jblevins.org/projects/markdown-mode/" :keywords '("markdown" "github flavored markdown" "itex"))
diff --git a/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode.el b/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode.el
new file mode 100644
index 0000000..5bc4fb7
--- /dev/null
+++ b/emacs.d/elpa/markdown-mode-20160115.2318/markdown-mode.el
@@ -0,0 +1,6107 @@
+;;; markdown-mode.el --- Emacs Major mode for Markdown-formatted text files
+
+;; Copyright (C) 2007-2016 Jason R. Blevins <jrblevin@sdf.org>
+;; Copyright (C) 2007, 2009 Edward O'Connor <ted@oconnor.cx>
+;; Copyright (C) 2007 Conal Elliott <conal@conal.net>
+;; Copyright (C) 2008 Greg Bognar <greg_bognar@hms.harvard.edu>
+;; Copyright (C) 2008 Dmitry Dzhus <mail@sphinx.net.ru>
+;; Copyright (C) 2008 Bryan Kyle <bryan.kyle@gmail.com>
+;; Copyright (C) 2008 Ben Voui <intrigeri@boum.org>
+;; Copyright (C) 2009 Ankit Solanki <ankit.solanki@gmail.com>
+;; Copyright (C) 2009 Hilko Bengen <bengen@debian.org>
+;; Copyright (C) 2009 Peter Williams <pezra@barelyenough.org>
+;; Copyright (C) 2010 George Ogata <george.ogata@gmail.com>
+;; Copyright (C) 2011 Eric Merritt <ericbmerritt@gmail.com>
+;; Copyright (C) 2011 Philippe Ivaldi <pivaldi@sfr.fr>
+;; Copyright (C) 2011 Jeremiah Dodds <jeremiah.dodds@gmail.com>
+;; Copyright (C) 2011 Christopher J. Madsen <cjm@cjmweb.net>
+;; Copyright (C) 2011 Shigeru Fukaya <shigeru.fukaya@gmail.com>
+;; Copyright (C) 2011 Joost Kremers <joostkremers@fastmail.fm>
+;; Copyright (C) 2011-2012 Donald Ephraim Curtis <dcurtis@milkbox.net>
+;; Copyright (C) 2012 Akinori Musha <knu@idaemons.org>
+;; Copyright (C) 2012 Zhenlei Jia <zhenlei.jia@gmail.com>
+;; Copyright (C) 2012 Peter Jones <pjones@pmade.com>
+;; Copyright (C) 2013 Matus Goljer <dota.keys@gmail.com>
+;; Copyright (C) 2015 Google, Inc. (Contributor: Samuel Freilich <sfreilich@google.com>)
+;; Copyright (C) 2015 Antonis Kanouras <antonis@metadosis.gr>
+;; Copyright (C) 2015 Howard Melman <hmelman@gmail.com>
+;; Copyright (C) 2015-2016 Danny McClanahan <danieldmcclanahan@gmail.com>
+;; Copyright (C) 2015-2016 Syohei Yoshida <syohex@gmail.com>
+
+;; Author: Jason R. Blevins <jrblevin@sdf.org>
+;; Maintainer: Jason R. Blevins <jrblevin@sdf.org>
+;; Created: May 24, 2007
+;; Version: 2.1
+;; Package-Version: 20160115.2318
+;; Package-Requires: ((cl-lib "0.5"))
+;; Keywords: Markdown, GitHub Flavored Markdown, itex
+;; URL: http://jblevins.org/projects/markdown-mode/
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, 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, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; markdown-mode is a major mode for editing [Markdown][]-formatted
+;; text files in GNU Emacs.  markdown-mode is free software, licensed
+;; under the GNU GPL.
+;;
+;;  [Markdown]: http://daringfireball.net/projects/markdown/
+;;
+;; The latest stable version is markdown-mode 2.1, released on January 9, 2016:
+;;
+;;    * [markdown-mode.el][]
+;;    * [Screenshot][][^theme]
+;;    * [Release notes][]
+;;
+;;  [markdown-mode.el]: http://jblevins.org/projects/markdown-mode/markdown-mode.el
+;;  [Screenshot]: http://jblevins.org/projects/markdown-mode/screenshots/20160108-001.png
+;;  [Release notes]: http://jblevins.org/projects/markdown-mode/rev-2-1
+;;
+;; [^theme]: The theme used in the screenshot is
+;;     [color-theme-twilight](https://github.com/crafterm/twilight-emacs).
+;;
+;; The latest development version can be obtained from the Git
+;; repository at <http://jblevins.org/git/markdown-mode.git> or from
+;; [GitHub][]:
+;;
+;;     git clone git://jblevins.org/git/markdown-mode.git
+;;     git clone https://github.com/jrblevin/markdown-mode.git
+;;
+;; [![Build Status][status]][travis]
+;;
+;;  [devel.el]: http://jblevins.org/git/markdown-mode.git/plain/markdown-mode.el
+;;  [GitHub]: https://github.com/jrblevin/markdown-mode/
+;;  [travis]: https://travis-ci.org/jrblevin/markdown-mode
+;;  [status]: https://travis-ci.org/jrblevin/markdown-mode.svg?branch=master
+;;
+;; markdown-mode is also available in several package managers, including:
+;;
+;;    * Debian Linux: [elpa-markdown-mode][] and [emacs-goodies-el][]
+;;    * Ubuntu Linux: [elpa-markdown-mode][elpa-ubuntu] and [emacs-goodies-el][emacs-goodies-el-ubuntu]
+;;    * RedHat and Fedora Linux: [emacs-goodies][]
+;;    * NetBSD: [textproc/markdown-mode][]
+;;    * MacPorts: [markdown-mode.el][macports-package] ([pending][macports-ticket])
+;;    * FreeBSD: [textproc/markdown-mode.el][freebsd-port]
+;;
+;;  [elpa-markdown-mode]: https://packages.debian.org/sid/lisp/elpa-markdown-mode
+;;  [elpa-ubuntu]: http://packages.ubuntu.com/search?keywords=elpa-markdown-mode
+;;  [emacs-goodies-el]: http://packages.debian.org/emacs-goodies-el
+;;  [emacs-goodies-el-ubuntu]: http://packages.ubuntu.com/search?keywords=emacs-goodies-el
+;;  [emacs-goodies]: https://apps.fedoraproject.org/packages/emacs-goodies
+;;  [textproc/markdown-mode]: http://pkgsrc.se/textproc/markdown-mode
+;;  [macports-package]: https://trac.macports.org/browser/trunk/dports/editors/markdown-mode.el/Portfile
+;;  [macports-ticket]: http://trac.macports.org/ticket/35716
+;;  [freebsd-port]: http://svnweb.freebsd.org/ports/head/textproc/markdown-mode.el
+
+;;; Installation:
+
+;; Make sure to place `markdown-mode.el` somewhere in the load-path and add
+;; the following lines to your `.emacs` file to associate markdown-mode
+;; with `.text`, `.markdown`, and `.md` files:
+;;
+;;     (autoload 'markdown-mode "markdown-mode"
+;;        "Major mode for editing Markdown files" t)
+;;     (add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
+;;     (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+;;     (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+;;
+;; There is no official Markdown file extension, nor is there even a
+;; _de facto_ standard, so you can easily add, change, or remove any
+;; of the file extensions above as needed.
+;;
+;; `markdown-mode' depends on `cl-lib', which has been bundled with
+;; GNU Emacs since 24.3.  Users of GNU Emacs 24.1 and 24.2 can install
+;; `cl-lib' with `package.el'.
+
+;;; Usage:
+
+;; Keybindings are grouped by prefixes based on their function.  For
+;; example, the commands for inserting links are grouped under `C-c
+;; C-a`, where the `C-a` is a mnemonic for the HTML `<a>` tag.  In
+;; other cases, the connection to HTML is not direct.  For example,
+;; commands dealing with headings begin with `C-c C-t` (mnemonic:
+;; titling).  The primary commands in each group will are described
+;; below.  You can obtain a list of all keybindings by pressing `C-c
+;; C-h`.  Movement and shifting commands tend to be associated with
+;; paired delimiters such as `M-{` and `M-}` or `C-c <` and `C-c >`.
+;; Outline navigation keybindings the same as in `org-mode'.  Finally,
+;; commands for running Markdown or doing maintenance on an open file
+;; are grouped under the `C-c C-c` prefix.  The most commonly used
+;; commands are described below.  You can obtain a list of all
+;; keybindings by pressing `C-c C-h`.
+;;
+;;   * Hyperlinks: `C-c C-a`
+;;
+;;     In this group, `C-c C-a l` inserts an inline link of the form
+;;     `[text](url)`.  The link text is determined as follows.  First,
+;;     if there is an active region (i.e., when transient mark mode is
+;;     on and the mark is active), use it as the link text.  Second,
+;;     if the point is at a word, use that word as the link text.  In
+;;     these two cases, the original text will be replaced with the
+;;     link and point will be left at the position for inserting a
+;;     URL.  Otherwise, insert empty link markup and place the point
+;;     for inserting the link text.
+;;
+;;     `C-c C-a L` inserts a reference link of the form `[text][label]`
+;;     and, optionally, a corresponding reference label definition.
+;;     The link text is determined in the same way as with an inline
+;;     link (using the region, when active, or the word at the point),
+;;     but instead of inserting empty markup as a last resort, the
+;;     link text will be read from the minibuffer.  The reference
+;;     label will be read from the minibuffer in both cases, with
+;;     completion from the set of currently defined references.  To
+;;     create an implicit reference link, press `RET` to accept the
+;;     default, an empty label.  If the entered referenced label is
+;;     not defined, additionally prompt for the URL and (optional)
+;;     title.  If a URL is provided, a reference definition will be
+;;     inserted in accordance with `markdown-reference-location'.
+;;     If a title is given, it will be added to the end of the
+;;     reference definition and will be used to populate the title
+;;     attribute when converted to XHTML.
+;;
+;;     `C-c C-a u` inserts a bare url, delimited by angle brackets.  When
+;;     there is an active region, the text in the region is used as the
+;;     URL.  If the point is at a URL, that url is used.  Otherwise,
+;;     insert angle brackets and position the point in between them
+;;     for inserting the URL.
+;;
+;;     `C-c C-a f` inserts a footnote marker at the point, inserts a
+;;     footnote definition below, and positions the point for
+;;     inserting the footnote text.  Note that footnotes are an
+;;     extension to Markdown and are not supported by all processors.
+;;
+;;     `C-c C-a w` behaves much like the inline link insertion command
+;;     and inserts a wiki link of the form `[[WikiLink]]`.  If there
+;;     is an active region, use the region as the link text.  If the
+;;     point is at a word, use the word as the link text.  If there is
+;;     no active region and the point is not at word, simply insert
+;;     link markup.  Note that wiki links are an extension to Markdown
+;;     and are not supported by all processors.
+;;
+;;   * Images: `C-c C-i`
+;;
+;;     `C-c C-i i` inserts markup for an inline image, using the
+;;     active region or the word at point, if any, as the alt text.
+;;     `C-c C-i I` behaves similarly and inserts a reference-style
+;;     image.
+;;
+;;   * Styles: `C-c C-s`
+;;
+;;     `C-c C-s e` inserts markup to make a region or word italic (`e`
+;;     for `<em>` or emphasis).  If there is an active region, make
+;;     the region italic.  If the point is at a non-italic word, make
+;;     the word italic.  If the point is at an italic word or phrase,
+;;     remove the italic markup.  Otherwise, simply insert italic
+;;     delimiters and place the cursor in between them.  Similarly,
+;;     use `C-c C-s s` for bold (`<strong>`), `C-c C-s c` for
+;;     inline code (`<code>`), and `C-c C-s k` for inserting `<kbd>`
+;;     tags.
+;;
+;;     `C-c C-s b` inserts a blockquote using the active region, if any,
+;;     or starts a new blockquote.  `C-c C-s C-b` is a variation which
+;;     always operates on the region, regardless of whether it is
+;;     active or not.  The appropriate amount of indentation, if any,
+;;     is calculated automatically given the surrounding context, but
+;;     may be adjusted later using the region indentation commands.
+;;
+;;     `C-c C-s p` behaves similarly for inserting preformatted code
+;;     blocks, with `C-c C-s C-p` being the region-only counterpart.
+;;
+;;   * Headings: `C-c C-t`
+;;
+;;     All heading insertion commands use the text in the active
+;;     region, if any, as the heading text.  Otherwise, if the current
+;;     line is not blank, they use the text on the current line.
+;;     Finally, the setext commands will prompt for heading text if
+;;     there is no active region and the current line is blank.
+;;
+;;     `C-c C-t h` inserts a heading with automatically chosen type and
+;;     level (both determined by the previous heading).  `C-c C-t H`
+;;     behaves similarly, but uses setext (underlined) headings when
+;;     possible, still calculating the level automatically.
+;;     In cases where the automatically-determined level is not what
+;;     you intended, the level can be quickly promoted or demoted
+;;     (as described below).  Alternatively, a `C-u` prefix can be
+;;     given to insert a heading promoted by one level or a `C-u C-u`
+;;     prefix can be given to insert a heading demoted by one level.
+;;
+;;     To insert a heading of a specific level and type, use `C-c C-t 1`
+;;     through `C-c C-t 6` for atx (hash mark) headings and `C-c C-t !` or
+;;     `C-c C-t @` for setext headings of level one or two, respectively.
+;;     Note that `!` is `S-1` and `@` is `S-2`.
+;;
+;;     If the point is at a heading, these commands will replace the
+;;     existing markup in order to update the level and/or type of the
+;;     heading.  To remove the markup of the heading at the point,
+;;     press `C-c C-k` to kill the heading and press `C-y` to yank the
+;;     heading text back into the buffer.
+;;
+;;   * Horizontal Rules: `C-c -`
+;;
+;;     `C-c -` inserts a horizontal rule.  By default, insert the
+;;     first string in the list `markdown-hr-strings' (the most
+;;     prominent rule).  With a `C-u` prefix, insert the last string.
+;;     With a numeric prefix `N`, insert the string in position `N`
+;;     (counting from 1).
+;;
+;;   * Markdown and Maintenance Commands: `C-c C-c`
+;;
+;;     *Compile:* `C-c C-c m` will run Markdown on the current buffer
+;;     and show the output in another buffer.  *Preview*: `C-c C-c p`
+;;     runs Markdown on the current buffer and previews, stores the
+;;     output in a temporary file, and displays the file in a browser.
+;;     *Export:* `C-c C-c e` will run Markdown on the current buffer
+;;     and save the result in the file `basename.html`, where
+;;     `basename` is the name of the Markdown file with the extension
+;;     removed.  *Export and View:* press `C-c C-c v` to export the
+;;     file and view it in a browser.  *Open:* `C-c C-c o` will open
+;;     the Markdown source file directly using `markdown-open-command'.
+;;     *Live Export*: Press `C-c C-c l` to turn on
+;;     `markdown-live-preview-mode' to view the exported output
+;;     side-by-side with the source Markdown. **For all export commands,
+;;     the output file will be overwritten without notice.**
+;;     `markdown-live-preview-window-function' can be customized to open
+;;     in a browser other than `eww'.
+;;
+;;     To summarize:
+;;
+;;       - `C-c C-c m`: `markdown-command' > `*markdown-output*` buffer.
+;;       - `C-c C-c p`: `markdown-command' > temporary file > browser.
+;;       - `C-c C-c e`: `markdown-command' > `basename.html`.
+;;       - `C-c C-c v`: `markdown-command' > `basename.html` > browser.
+;;       - `C-c C-c w`: `markdown-command' > kill ring.
+;;       - `C-c C-c o`: `markdown-open-command'.
+;;       - `C-c C-c l`: `markdown-live-preview-mode' > `*eww*` buffer.
+;;
+;;     `C-c C-c c` will check for undefined references.  If there are
+;;     any, a small buffer will open with a list of undefined
+;;     references and the line numbers on which they appear.  In Emacs
+;;     22 and greater, selecting a reference from this list and
+;;     pressing `RET` will insert an empty reference definition at the
+;;     end of the buffer.  Similarly, selecting the line number will
+;;     jump to the corresponding line.
+;;
+;;     `C-c C-c n` renumbers any ordered lists in the buffer that are
+;;     out of sequence.
+;;
+;;     `C-c C-c ]` completes all headings and normalizes all horizontal
+;;     rules in the buffer.
+;;
+;;   * Following Links: `C-c C-o`
+;;
+;;     Press `C-c C-o` when the point is on an inline or reference
+;;     link to open the URL in a browser.  When the point is at a
+;;     wiki link, open it in another buffer (in the current window,
+;;     or in the other window with the `C-u` prefix).  Use `M-p` and
+;;     `M-n` to quickly jump to the previous or next link of any type.
+;;
+;;   * Jumping: `C-c C-l`
+;;
+;;     Use `C-c C-l` to jump from the object at point to its counterpart
+;;     elsewhere in the text, when possible.  Jumps between reference
+;;     links and definitions; between footnote markers and footnote
+;;     text.  If more than one link uses the same reference name, a
+;;     new buffer will be created containing clickable buttons for jumping
+;;     to each link.  You may press `TAB` or `S-TAB` to jump between
+;;     buttons in this window.
+;;
+;;   * Promotion and Demotion: `C-c C--` and `C-c C-=`
+;;
+;;     Headings, horizontal rules, and list items can be promoted and
+;;     demoted, as well as bold and italic text.  For headings,
+;;     "promotion" means *decreasing* the level (i.e., moving from
+;;     `<h2>` to `<h1>`) while "demotion" means *increasing* the
+;;     level.  For horizontal rules, promotion and demotion means
+;;     moving backward or forward through the list of rule strings in
+;;     `markdown-hr-strings'.  For bold and italic text, promotion and
+;;     demotion means changing the markup from underscores to asterisks.
+;;     Press `C-c C--` or `M-LEFT` to promote the element at the point
+;;     if possible.
+;;
+;;     To remember these commands, note that `-` is for decreasing the
+;;     level (promoting), and `=` (on the same key as `+`) is for
+;;     increasing the level (demoting).  Similarly, the left and right
+;;     arrow keys indicate the direction that the atx heading markup
+;;     is moving in when promoting or demoting.
+;;
+;;   * Completion: `C-c C-]`
+;;
+;;     Complete markup is in normalized form, which means, for
+;;     example, that the underline portion of a setext header is the
+;;     same length as the heading text, or that the number of leading
+;;     and trailing hash marks of an atx header are equal and that
+;;     there is no extra whitespace in the header text.  `C-c C-]`
+;;     completes the markup at the point, if it is determined to be
+;;     incomplete.
+;;
+;;   * Editing Lists: `M-RET`, `M-UP`, `M-DOWN`, `M-LEFT`, and `M-RIGHT`
+;;
+;;     New list items can be inserted with `M-RET` or `C-c C-j`.  This
+;;     command determines the appropriate marker (one of the possible
+;;     unordered list markers or the next number in sequence for an
+;;     ordered list) and indentation level by examining nearby list
+;;     items.  If there is no list before or after the point, start a
+;;     new list.  Prefix this command by `C-u` to decrease the
+;;     indentation by one level.  Prefix this command by `C-u C-u` to
+;;     increase the indentation by one level.
+;;
+;;     Existing list items can be moved up or down with `M-UP` or
+;;     `M-DOWN` and indented or exdented with `M-RIGHT` or `M-LEFT`.
+;;
+;;   * Editing Subtrees: `M-S-UP`, `M-S-DOWN`, `M-S-LEFT`, and `M-S-RIGHT`
+;;
+;;     Entire subtrees of ATX headings can be promoted and demoted
+;;     with `M-S-LEFT` and `M-S-RIGHT`, which mirror the bindings
+;;     for promotion and demotion of list items. Similarly, subtrees
+;;     can be moved up and down with `M-S-UP` and `M-S-DOWN`.
+;;
+;;     Please note the following "boundary" behavior for promotion and
+;;     demotion.  Any level-six headings will not be demoted further
+;;     (i.e., they remain at level six, since Markdown and HTML define
+;;     only six levels) and any level-one headings will promoted away
+;;     entirely (i.e., heading markup will be removed, since a
+;;     level-zero heading is not defined).
+;;
+;;   * Shifting the Region: `C-c <` and `C-c >`
+;;
+;;     Text in the region can be indented or exdented as a group using
+;;     `C-c >` to indent to the next indentation point (calculated in
+;;     the current context), and `C-c <` to exdent to the previous
+;;     indentation point.  These keybindings are the same as those for
+;;     similar commands in `python-mode'.
+;;
+;;   * Killing Elements: `C-c C-k`
+;;
+;;     Press `C-c C-k` to kill the thing at point and add important
+;;     text, without markup, to the kill ring.  Possible things to
+;;     kill include (roughly in order of precedece): inline code,
+;;     headings, horizonal rules, links (add link text to kill ring),
+;;     images (add alt text to kill ring), angle URIs, email
+;;     addresses, bold, italics, reference definitions (add URI to
+;;     kill ring), footnote markers and text (kill both marker and
+;;     text, add text to kill ring), and list items.
+;;
+;;   * Outline Navigation: `C-c C-n`, `C-c C-p`, `C-c C-f`, `C-c C-b`, and `C-c C-u`
+;;
+;;     Navigation between headings is possible using `outline-mode'.
+;;     Use `C-c C-n` and `C-c C-p` to move between the next and previous
+;;     visible headings.  Similarly, `C-c C-f` and `C-c C-b` move to the
+;;     next and previous visible headings at the same level as the one
+;;     at the point.  Finally, `C-c C-u` will move up to a lower-level
+;;     (higher precedence) visible heading.
+;;
+;;   * Movement by Paragraph or Block: `M-{` and `M-}`
+;;
+;;     The definition of a "paragraph" is slightly different in
+;;     markdown-mode than, say, text-mode, because markdown-mode
+;;     supports filling for list items and respects hard line breaks,
+;;     both of which break paragraphs.  So, markdown-mode overrides
+;;     the usual paragraph navigation commands `M-{` and `M-}` so that
+;;     with a `C-u` prefix, these commands jump to the beginning or
+;;     end of an entire block of text, respectively, where "blocks"
+;;     are separated by one or more lines.
+;;
+;;   * Movement by Defun: `C-M-a`, `C-M-e`, and `C-M-h`
+;;
+;;     The usual Emacs commands can be used to move by defuns
+;;     (top-level major definitions).  In markdown-mode, a defun is a
+;;     section.  As usual, `C-M-a` will move the point to the
+;;     beginning of the current or preceding defun, `C-M-e` will move
+;;     to the end of the current or following defun, and `C-M-h` will
+;;     put the region around the entire defun.
+;;
+;; As noted, many of the commands above behave differently depending
+;; on whether Transient Mark mode is enabled or not.  When it makes
+;; sense, if Transient Mark mode is on and the region is active, the
+;; command applies to the text in the region (e.g., `C-c C-s s` makes the
+;; region bold).  For users who prefer to work outside of Transient
+;; Mark mode, since Emacs 22 it can be enabled temporarily by pressing
+;; `C-SPC C-SPC`.  When this is not the case, many commands then
+;; proceed to look work with the word or line at the point.
+;;
+;; When applicable, commands that specifically act on the region even
+;; outside of Transient Mark mode have the same keybinding as their
+;; standard counterpart, but the letter is uppercase.  For example,
+;; `markdown-insert-blockquote' is bound to `C-c C-s b` and only acts on
+;; the region in Transient Mark mode while `markdown-blockquote-region'
+;; is bound to `C-c C-s B` and always applies to the region (when nonempty).
+;;
+;; Note that these region-specific functions are useful in many
+;; cases where it may not be obvious.  For example, yanking text from
+;; the kill ring sets the mark at the beginning of the yanked text
+;; and moves the point to the end.  Therefore, the (inactive) region
+;; contains the yanked text.  So, `C-y` followed by `C-c C-s C-b` will
+;; yank text and turn it into a blockquote.
+;;
+;; markdown-mode attempts to be flexible in how it handles
+;; indentation.  When you press `TAB` repeatedly, the point will cycle
+;; through several possible indentation levels corresponding to things
+;; you might have in mind when you press `RET` at the end of a line or
+;; `TAB`.  For example, you may want to start a new list item,
+;; continue a list item with hanging indentation, indent for a nested
+;; pre block, and so on.  Exdention is handled similarly when backspace
+;; is pressed at the beginning of the non-whitespace portion of a line.
+;;
+;; markdown-mode supports outline-minor-mode as well as org-mode-style
+;; visibility cycling for atx- or hash-style headings.  There are two
+;; types of visibility cycling: Pressing `S-TAB` cycles globally between
+;; the table of contents view (headings only), outline view (top-level
+;; headings only), and the full document view.  Pressing `TAB` while the
+;; point is at a heading will cycle through levels of visibility for the
+;; subtree: completely folded, visible children, and fully visible.
+;; Note that mixing hash and underline style headings will give undesired
+;; results.
+
+;;; Customization:
+
+;; Although no configuration is *necessary* there are a few things
+;; that can be customized.  The `M-x customize-mode` command
+;; provides an interface to all of the possible customizations:
+;;
+;;   * `markdown-command' - the command used to run Markdown (default:
+;;     `markdown`).  This variable may be customized to pass
+;;     command-line options to your Markdown processor of choice.
+;;
+;;   * `markdown-command-needs-filename' - set to `t' if
+;;     `markdown-command' does not accept standard input (default:
+;;     `nil').  When `nil', `markdown-mode' will pass the Markdown
+;;     content to `markdown-command' using standard input (`stdin`).
+;;     When set to `t', `markdown-mode' will pass the name of the file
+;;     as the final command-line argument to `markdown-command'.  Note
+;;     that in the latter case, you will only be able to run
+;;     `markdown-command' from buffers which are visiting a file.
+;;
+;;   * `markdown-open-command' - the command used for calling a standalone
+;;     Markdown previewer which is capable of opening Markdown source files
+;;     directly (default: `nil').  This command will be called
+;;     with a single argument, the filename of the current buffer.
+;;     A representative program is the Mac app [Marked 2][], a
+;;     live-updating Markdown previewer which can be [called from a
+;;     simple shell script](http://jblevins.org/log/marked-2-command).
+;;
+;;   * `markdown-hr-strings' - list of strings to use when inserting
+;;     horizontal rules.  Different strings will not be distinguished
+;;     when converted to HTML--they will all be converted to
+;;     `<hr/>`--but they may add visual distinction and style to plain
+;;     text documents.  To maintain some notion of promotion and
+;;     demotion, keep these sorted from largest to smallest.
+;;
+;;   * `markdown-bold-underscore' - set to a non-nil value to use two
+;;     underscores when inserting bold text instead of two asterisks
+;;     (default: `nil').
+;;
+;;   * `markdown-italic-underscore' - set to a non-nil value to use
+;;     underscores when inserting italic text instead of asterisks
+;;     (default: `nil').
+;;
+;;   * `markdown-asymmetric-header' - set to a non-nil value to use
+;;     asymmetric header styling, placing header characters only on
+;;     the left of headers (default: `nil').
+;;
+;;   * `markdown-list-indent-width' - depth of indentation for lists
+;;     when inserting, promoting, and demoting list items (default: 4).
+;;
+;;   * `markdown-indent-function' - the function to use for automatic
+;;     indentation (default: `markdown-indent-line').
+;;
+;;   * `markdown-indent-on-enter' - set to a non-nil value to
+;;     automatically indent new lines when the enter key is pressed
+;;     (default: `t')
+;;
+;;   * `markdown-wiki-link-alias-first' - set to a non-nil value to
+;;     treat aliased wiki links like `[[link text|PageName]]`
+;;     (default: `t').  When set to nil, they will be treated as
+;;     `[[PageName|link text]]'.
+;;
+;;   * `markdown-uri-types' - a list of protocol schemes (e.g., "http")
+;;     for URIs that `markdown-mode' should highlight.
+;;
+;;   * `markdown-enable-math' - syntax highlighting for LaTeX
+;;     fragments (default: `nil').  Set this to `t' to turn on math
+;;     support by default.  Math support can be toggled later using
+;;     the function `markdown-enable-math'."
+;;
+;;   * `markdown-css-paths' - CSS files to link to in XHTML output
+;;     (default: `nil`).
+;;
+;;   * `markdown-content-type' - when set to a nonempty string, an
+;;     `http-equiv` attribute will be included in the XHTML `<head>`
+;;     block (default: `""`).  If needed, the suggested values are
+;;     `application/xhtml+xml` or `text/html`.  See also:
+;;     `markdown-coding-system'.
+;;
+;;   * `markdown-coding-system' - used for specifying the character
+;;     set identifier in the `http-equiv` attribute when included
+;;     (default: `nil').  See `markdown-content-type', which must
+;;     be set before this variable has any effect.  When set to `nil',
+;;     `buffer-file-coding-system' will be used to automatically
+;;     determine the coding system string (falling back to
+;;     `iso-8859-1' when unavailable).  Common settings are `utf-8'
+;;     and `iso-latin-1'.
+;;
+;;   * `markdown-xhtml-header-content' - additional content to include
+;;     in the XHTML `<head>` block (default: `""`).
+;;
+;;   * `markdown-xhtml-standalone-regexp' - a regular expression which
+;;     `markdown-mode' uses to determine whether the output of
+;;     `markdown-command' is a standalone XHTML document or an XHTML
+;;     fragment (default: `"^\\(<\\?xml\\|<!DOCTYPE\\|<html\\)"`).  If
+;;     this regular expression not matched in the first five lines of
+;;     output, `markdown-mode' assumes the output is a fragment and
+;;     adds a header and footer.
+;;
+;;   * `markdown-link-space-sub-char' - a character to replace spaces
+;;     when mapping wiki links to filenames (default: `"_"`).
+;;     For example, use an underscore for compatibility with the
+;;     Python Markdown WikiLinks extension.  In `gfm-mode', this is
+;;     set to `"-"` to conform with GitHub wiki links.
+;;
+;;   * `markdown-reference-location' - where to insert reference
+;;     definitions (default: `header`).  The possible locations are
+;;     the end of the document (`end`), after the current block
+;;     (`immediately`), before the next header (`header`).
+;;
+;;   * `markdown-footnote-location' - where to insert footnote text
+;;     (default: `end`).  The set of location options is the same as
+;;     for `markdown-reference-location'.
+;;
+;;   * `markdown-nested-imenu-heading-index' - Use nested imenu
+;;     heading instead of a flat index (default: `nil').  A nested
+;;     index may provide more natural browsing from the menu, but a
+;;     flat list may allow for faster keyboard navigation via tab
+;;     completion.
+;;
+;;   * `comment-auto-fill-only-comments' - variable is made
+;;     buffer-local and set to `nil' by default.  In programming
+;;     language modes, when this variable is non-nil, only comments
+;;     will be filled by auto-fill-mode.  However, comments in
+;;     Markdown documents are rare and the most users probably intend
+;;     for the actual content of the document to be filled.  Making
+;;     this variable buffer-local allows `markdown-mode' to override
+;;     the default behavior induced when the global variable is non-nil.
+;;
+;;   * `markdown-gfm-additional-languages', - additional languages to
+;;     make available, aside from those predefined in
+;;     `markdown-gfm-recognized-languages', when inserting GFM code
+;;     blocks (default: `nil`). Language strings must have be trimmed
+;;     of whitespace and not contain any curly braces. They may be of
+;;     arbitrary capitalization, though.
+;;
+;;   * `markdown-gfm-use-electric-backquote' - use
+;;     `markdown-electric-backquote' for interactive insertion of GFM
+;;     code blocks when backquote is pressed three times (default: `t`).
+;;
+;;   * `markdown-make-gfm-checkboxes-buttons' - Whether GitHub
+;;     Flavored Markdown style task lists (checkboxes) should be
+;;     turned into buttons that can be toggled with mouse-1 or RET. If
+;;     non-nil (default), then buttons are enabled.  This works in
+;;     `markdown-mode' as well as `gfm-mode'.
+;;
+;; Additionally, the faces used for syntax highlighting can be modified to
+;; your liking by issuing `M-x customize-group RET markdown-faces`
+;; or by using the "Markdown Faces" link at the bottom of the mode
+;; customization screen.
+;;
+;; [Marked 2]: https://itunes.apple.com/us/app/marked-2/id890031187?mt=12&uo=4&at=11l5Vs&ct=mm
+
+;;; Extensions:
+
+;; Besides supporting the basic Markdown syntax, markdown-mode also
+;; includes syntax highlighting for `[[Wiki Links]]` by default.  Wiki
+;; links may be followed by pressing `C-c C-o` when the point
+;; is at a wiki link.  Use `M-p` and `M-n` to quickly jump to the
+;; previous and next links (including links of other types).
+;; Aliased or piped wiki links of the form `[[link text|PageName]]`
+;; are also supported.  Since some wikis reverse these components, set
+;; `markdown-wiki-link-alias-first' to nil to treat them as
+;; `[[PageName|link text]]`.  By default, Markdown Mode only searches
+;; for target files in the current directory.  Sequential parent
+;; directory search (as in [Ikiwiki][]) can be enabled by setting
+;; `markdown-wiki-link-search-parent-directories' to a non-nil value.
+;;
+;; [Ikiwiki]: https://ikiwiki.info
+;;
+;; [SmartyPants][] support is possible by customizing `markdown-command'.
+;; If you install `SmartyPants.pl` at, say, `/usr/local/bin/smartypants`,
+;; then you can set `markdown-command' to `"markdown | smartypants"`.
+;; You can do this either by using `M-x customize-group markdown`
+;; or by placing the following in your `.emacs` file:
+;;
+;;     (setq markdown-command "markdown | smartypants")
+;;
+;; [SmartyPants]: http://daringfireball.net/projects/smartypants/
+;;
+;; Syntax highlighting for mathematical expressions written
+;; in LaTeX (only expressions denoted by `$..$`, `$$..$$`, or `\[..\]`)
+;; can be enabled by setting `markdown-enable-math' to a non-nil value,
+;; either via customize or by placing `(setq markdown-enable-math t)`
+;; in `.emacs`, and then restarting Emacs or calling
+;; `markdown-reload-extensions'.
+
+;;; GitHub Flavored Markdown (GFM):
+
+;; A [GitHub Flavored Markdown][GFM] mode, `gfm-mode', is also
+;; available.  The GitHub implementation differs slightly from
+;; standard Markdown in that it supports things like different
+;; behavior for underscores inside of words, automatic linking of
+;; URLs, strikethrough text, and fenced code blocks with an optional
+;; language keyword.
+;;
+;; The GFM-specific features above apply to `README.md` files, wiki
+;; pages, and other Markdown-formatted files in repositories on
+;; GitHub.  GitHub also enables [additional features][GFM comments] for
+;; writing on the site (for issues, pull requests, messages, etc.)
+;; that are further extensions of GFM.  These features include task
+;; lists (checkboxes), newlines corresponding to hard line breaks,
+;; auto-linked references to issues and commits, wiki links, and so
+;; on.  To make matters more confusing, although task lists are not
+;; part of [GFM proper][GFM], [since 2014][] they are rendered (in a
+;; read-only fashion) in all Markdown documents in repositories on the
+;; site.  These additional extensions are supported to varying degrees
+;; by `markdown-mode' and `gfm-mode' as described below.
+;;
+;; * **URL autolinking:** Both `markdown-mode' and `gfm-mode' support
+;;   highlighting of URLs without angle brackets.
+;;
+;; * **Multiple underscores in words:** You must enable `gfm-mode' to
+;;   toggle support for underscores inside of words. In this mode
+;;   variable names such as `a_test_variable` will not trigger
+;;   emphasis (italics).
+;;
+;; * **Fenced code blocks:** Code blocks quoted with backticks, with
+;;   optional programming language keywords, are highlighted in
+;;   both `markdown-mode' and `gfm-mode'.  They can be inserted with
+;;   `C-c C-s P`.  If there is an active region, the text in the
+;;   region will be placed inside the code block.  You will be
+;;   prompted for the name of the language, but may press enter to
+;;   continue without naming a language.
+;;
+;; * **Strikethrough:** Strikethrough text is only supported in
+;;   `gfm-mode' and can be inserted (and toggled) using `C-c C-s d`.
+;;   Following the mnemonics for the other style keybindings, the
+;;   letter `d` coincides with the HTML tag `<del>`.
+;;
+;; * **Task lists:** GFM task lists will be rendered as checkboxes
+;;   (Emacs buttons) in both `markdown-mode' and `gfm-mode' when
+;;   `markdown-make-gfm-checkboxes-buttons' is set to a non-nil value
+;;   (and it is set to t by default).  These checkboxes can be
+;;   toggled by clicking `mouse-1` or pressing `RET` over the button.
+;;
+;; * **Wiki links:** Generic wiki links are supported in
+;;   `markdown-mode', but in `gfm-mode' specifically they will be
+;;   treated as they are on GitHub: spaces will be replaced by hyphens
+;;   in filenames and the first letter of the filename will be
+;;   capitalized.  For example, `[[wiki link]]' will map to a file
+;;   named `Wiki-link` with the same extension as the current file.
+;;
+;; * **Newlines:** Neither `markdown-mode' nor `gfm-mode' do anything
+;;   specifically with respect to newline behavior.  If you use
+;;   `gfm-mode' mostly to write text for comments or issues on the
+;;   GitHub site--where newlines are significant and correspond to
+;;   hard line breaks--then you may want to enable `visual-line-mode'
+;;   for line wrapping in buffers.  You can do this with a
+;;   `gfm-mode-hook' as follows:
+;;
+;;         ;; Use visual-line-mode in gfm-mode
+;;         (defun my-gfm-mode-hook ()
+;;           (visual-line-mode 1))
+;;         (add-hook 'gfm-mode-hook 'my-gfm-mode-hook)
+;;
+;; * **Preview:** GFM-specific preview can be powered by setting
+;;   `markdown-command' to use [Docter][].  This may also be
+;;   configured to work with [Marked 2][] for `markdown-open-command'.
+;;
+;; [GFM]: http://github.github.com/github-flavored-markdown/
+;; [GFM comments]: https://help.github.com/articles/writing-on-github/
+;; [since 2014]: https://github.com/blog/1825-task-lists-in-all-markdown-documents
+;; [Docter]: https://github.com/alampros/Docter
+
+;;; Acknowledgments:
+
+;; markdown-mode has benefited greatly from the efforts of the
+;; following people:
+;;
+;;   * Cyril Brulebois <cyril.brulebois@enst-bretagne.fr> for Debian packaging.
+;;   * Conal Elliott <conal@conal.net> for a font-lock regexp patch.
+;;   * Edward O'Connor <hober0@gmail.com> for a font-lock regexp fix and
+;;     GitHub Flavored Markdown mode (`gfm-mode').
+;;   * Greg Bognar <greg_bognar@hms.harvard.edu> for menus and running
+;;     `markdown' with an active region.
+;;   * Daniel Burrows <dburrows@debian.org> for filing Debian bug #456592.
+;;   * Peter S. Galbraith <psg@debian.org> for maintaining `emacs-goodies-el`.
+;;   * Dmitry Dzhus <mail@sphinx.net.ru> for undefined reference checking.
+;;   * Carsten Dominik <carsten@orgmode.org> for `org-mode', from which the
+;;     visibility cycling functionality was derived, and for a bug fix
+;;     related to `orgtbl-mode'.
+;;   * Bryan Kyle <bryan.kyle@gmail.com> for indentation code.
+;;   * Ben Voui <intrigeri@boum.org> for font-lock face customizations.
+;;   * Ankit Solanki <ankit.solanki@gmail.com> for `longlines.el`
+;;     compatibility and custom CSS.
+;;   * Hilko Bengen <bengen@debian.org> for proper XHTML output.
+;;   * Jose A. Ortega Ruiz <jao@gnu.org> for Emacs 23 fixes.
+;;   * Nelson Minar <nelson@santafe.edu> for `html-helper-mode', from which
+;;     comment matching functions were derived.
+;;   * Alec Resnick <alec@sproutward.org> for bug reports.
+;;   * Joost Kremers <joostkremers@fastmail.fm> for footnote-handling
+;;     functions, bug reports regarding indentation, and
+;;     fixes for byte-compilation warnings.
+;;   * Peter Williams <pezra@barelyenough.org> for `fill-paragraph'
+;;     enhancements.
+;;   * George Ogata <george.ogata@gmail.com> for fixing several
+;;     byte-compilation warnings.
+;;   * Eric Merritt <ericbmerritt@gmail.com> for wiki link features.
+;;   * Philippe Ivaldi <pivaldi@sfr.fr> for XHTML preview
+;;     customizations and XHTML export.
+;;   * Jeremiah Dodds <jeremiah.dodds@gmail.com> for supporting
+;;     Markdown processors which do not accept input from stdin.
+;;   * Werner Dittmann <werner.dittmann@t-online.de> for bug reports
+;;     regarding the `cl` dependency and `auto-fill-mode' and indentation.
+;;   * Scott Pfister <scott.pfister@gmail.com> for generalizing the space
+;;     substitution character for mapping wiki links to filenames.
+;;   * Marcin Kasperski <marcin.kasperski@mekk.waw.pl> for a patch to
+;;     escape shell commands.
+;;   * Christopher J. Madsen <cjm@cjmweb.net> for patches to fix a match
+;;     data bug and to prefer `visual-line-mode' in `gfm-mode'.
+;;   * Shigeru Fukaya <shigeru.fukaya@gmail.com> for better adherence to
+;;     Emacs Lisp coding conventions.
+;;   * Donald Ephraim Curtis <dcurtis@milkbox.net> for fixing the `fill-paragraph'
+;;     regexp, refactoring the compilation and preview functions,
+;;     heading font-lock generalizations, list renumbering,
+;;     and kill ring save.
+;;   * Kevin Porter <kportertx@gmail.com> for wiki link handling in `gfm-mode'.
+;;   * Max Penet <max.penet@gmail.com> and Peter Eisentraut <peter_e@gmx.net>
+;;     for an autoload token for `gfm-mode'.
+;;   * Ian Yang <me@iany.me> for improving the reference definition regex.
+;;   * Akinori Musha <knu@idaemons.org> for an imenu index function.
+;;   * Michael Sperber <sperber@deinprogramm.de> for XEmacs fixes.
+;;   * Francois Gannaz <francois.gannaz@free.fr> for suggesting charset
+;;     declaration in XHTML output.
+;;   * Zhenlei Jia <zhenlei.jia@gmail.com> for smart exdention function.
+;;   * Matus Goljer <dota.keys@gmail.com> for improved wiki link following
+;;     and GFM code block insertion.
+;;   * Peter Jones <pjones@pmade.com> for link following functions.
+;;   * Bryan Fink <bryan.fink@gmail.com> for a bug report regarding
+;;     externally modified files.
+;;   * Vegard Vesterheim <vegard.vesterheim@uninett.no> for a bug fix
+;;     related to `orgtbl-mode'.
+;;   * Makoto Motohashi <mkt.motohashi@gmail.com> for before- and after-
+;;     export hooks, unit test improvements, and updates to support
+;;     wide characters.
+;;   * Michael Dwyer <mdwyer@ehtech.in> for `gfm-mode' underscore regexp.
+;;   * Chris Lott <chris@chrislott.org> for suggesting reference label
+;;     completion.
+;;   * Gunnar Franke <Gunnar.Franke@gmx.de> for a completion bug report.
+;;   * David Glasser <glasser@meteor.com> for a `paragraph-separate' fix.
+;;   * Daniel Brotsky <dev@brotsky.com> for better auto-fill defaults.
+;;   * Samuel Freilich <sfreilich@google.com> for improved filling
+;;     behavior regarding list items, footnotes, and reference
+;;     definitions, improved killing of footnotes, and numerous other
+;;     tests and bug fixes.
+;;   * Antonis Kanouras <antonis@metadosis.gr> for strikethrough support.
+;;   * Tim Visher <tim.visher@gmail.com> for multiple CSS files and other
+;;     general improvements.
+;;   * Matt McClure <matthewlmcclure@gmail.com> for a patch to prevent
+;;     overwriting source files with .html extensions upon export.
+;;   * Roger Bolsius <roger.bolsius@gmail.com> for ordered list improvements.
+;;   * Google's Open Source Programs Office for recognizing the project with
+;;     a monetary contribution in June 2015.
+;;   * Howard Melman <hmelman@gmail.com> for supporting GFM checkboxes
+;;     as buttons.
+;;   * Danny McClanahan <danieldmcclanahan@gmail.com> for live preview mode,
+;;     completion of GFM programming language names, and `cl-lib' updates.
+;;   * Syohei Yoshida <syohex@gmail.com> for better heading detection
+;;     and movement functions, improved italic font lock.
+
+;;; Bugs:
+
+;; markdown-mode is developed and tested primarily for compatibility
+;; with GNU Emacs 24.3 and later.  If you find any bugs in
+;; markdown-mode, please construct a test case or a patch and open a
+;; ticket on the [GitHub issue tracker][issues].
+;;
+;;  [issues]: https://github.com/jrblevin/markdown-mode/issues
+
+;;; History:
+
+;; markdown-mode was written and is maintained by Jason Blevins.  The
+;; first version was released on May 24, 2007.
+;;
+;;   * 2007-05-24: Version 1.1
+;;   * 2007-05-25: Version 1.2
+;;   * 2007-06-05: [Version 1.3][]
+;;   * 2007-06-29: Version 1.4
+;;   * 2007-10-11: [Version 1.5][]
+;;   * 2008-06-04: [Version 1.6][]
+;;   * 2009-10-01: [Version 1.7][]
+;;   * 2011-08-12: [Version 1.8][]
+;;   * 2011-08-15: [Version 1.8.1][]
+;;   * 2013-01-25: [Version 1.9][]
+;;   * 2013-03-24: [Version 2.0][]
+;;   * 2016-01-09: [Version 2.1][]
+;;
+;; [Version 1.3]: http://jblevins.org/projects/markdown-mode/rev-1-3
+;; [Version 1.5]: http://jblevins.org/projects/markdown-mode/rev-1-5
+;; [Version 1.6]: http://jblevins.org/projects/markdown-mode/rev-1-6
+;; [Version 1.7]: http://jblevins.org/projects/markdown-mode/rev-1-7
+;; [Version 1.8]: http://jblevins.org/projects/markdown-mode/rev-1-8
+;; [Version 1.8.1]: http://jblevins.org/projects/markdown-mode/rev-1-8-1
+;; [Version 1.9]: http://jblevins.org/projects/markdown-mode/rev-1-9
+;; [Version 2.0]: http://jblevins.org/projects/markdown-mode/rev-2-0
+;; [Version 2.1]: http://jblevins.org/projects/markdown-mode/rev-2-1
+
+
+;;; Code:
+
+(require 'easymenu)
+(require 'outline)
+(require 'thingatpt)
+(require 'cl-lib)
+
+(declare-function eww-open-file "eww")
+
+
+;;; Constants =================================================================
+
+(defconst markdown-mode-version "2.1"
+  "Markdown mode version number.")
+
+(defconst markdown-output-buffer-name "*markdown-output*"
+  "Name of temporary buffer for markdown command output.")
+
+
+;;; Global Variables ==========================================================
+
+(defvar markdown-reference-label-history nil
+  "History of used reference labels.")
+
+(defvar markdown-live-preview-mode nil
+  "Sentinel variable for `markdown-live-preview-mode'.")
+
+(defvar markdown-gfm-language-history nil
+  "History list of languages used in the current buffer in GFM code blocks.")
+
+
+;;; Customizable Variables ====================================================
+
+(defvar markdown-mode-hook nil
+  "Hook run when entering Markdown mode.")
+
+(defvar markdown-before-export-hook nil
+  "Hook run before running Markdown to export XHTML output.
+The hook may modify the buffer, which will be restored to it's
+original state after exporting is complete.")
+
+(defvar markdown-after-export-hook nil
+  "Hook run after XHTML output has been saved.
+Any changes to the output buffer made by this hook will be saved.")
+
+(defgroup markdown nil
+  "Major mode for editing text files in Markdown format."
+  :prefix "markdown-"
+  :group 'wp
+  :link '(url-link "http://jblevins.org/projects/markdown-mode/"))
+
+(defcustom markdown-command "markdown"
+  "Command to run markdown."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-command-needs-filename nil
+  "Set to non-nil if `markdown-command' does not accept input from stdin.
+Instead, it will be passed a filename as the final command line
+option.  As a result, you will only be able to run Markdown from
+buffers which are visiting a file."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-open-command nil
+  "Command used for opening Markdown files directly.
+For example, a standalone Markdown previewer.  This command will
+be called with a single argument: the filename of the current
+buffer."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-hr-strings
+  '("-------------------------------------------------------------------------------"
+    "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
+    "---------------------------------------"
+    "* * * * * * * * * * * * * * * * * * * *"
+    "---------"
+    "* * * * *")
+  "Strings to use when inserting horizontal rules.
+The first string in the list will be the default when inserting a
+horizontal rule.  Strings should be listed in decreasing order of
+prominence (as in headings from level one to six) for use with
+promotion and demotion functions."
+  :group 'markdown
+  :type 'list)
+
+(defcustom markdown-bold-underscore nil
+  "Use two underscores when inserting bold text instead of two asterisks."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-italic-underscore nil
+  "Use underscores when inserting italic text instead of asterisks."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-asymmetric-header nil
+  "Determines if header style will be asymmetric.
+Set to non-nil to only have header characters to the left of the title.
+The default will ensure header characters are placed to the left and right
+of the title."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-indent-function 'markdown-indent-line
+  "Function to use to indent."
+  :group 'markdown
+  :type 'function)
+
+(defcustom markdown-indent-on-enter t
+  "Automatically indent new lines when enter key is pressed.
+When this variable is set to t, pressing RET will call
+`newline-and-indent'.  When set to nil, define RET to call
+`newline' as usual.  In the latter case, you can still use
+auto-indentation by pressing \\[newline-and-indent]."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-wiki-link-alias-first t
+  "When non-nil, treat aliased wiki links like [[alias text|PageName]].
+Otherwise, they will be treated as [[PageName|alias text]]."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+
+(defcustom markdown-wiki-link-search-parent-directories nil
+  "When non-nil, search for wiki link targets in parent directories.
+This is the default search behavior of Ikiwiki."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+
+(defcustom markdown-uri-types
+  '("acap" "cid" "data" "dav" "fax" "file" "ftp" "gopher" "http" "https"
+    "imap" "ldap" "mailto" "mid" "modem" "news" "nfs" "nntp" "pop" "prospero"
+    "rtsp" "service" "sip" "tel" "telnet" "tip" "urn" "vemmi" "wais")
+  "Link types for syntax highlighting of URIs."
+  :group 'markdown
+  :type 'list)
+
+(defcustom markdown-enable-math nil
+  "Syntax highlighting for inline LaTeX and itex expressions.
+Set this to a non-nil value to turn on math support by default.
+Math support can be toggled later using `markdown-enable-math'
+or \\[markdown-enable-math]."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+
+(defcustom markdown-css-paths nil
+  "URL of CSS file to link to in the output XHTML."
+  :group 'markdown
+  :type 'list)
+
+(defcustom markdown-content-type ""
+  "Content type string for the http-equiv header in XHTML output.
+When set to a non-empty string, insert the http-equiv attribute.
+Otherwise, this attribute is omitted."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-coding-system nil
+  "Character set string for the http-equiv header in XHTML output.
+Defaults to `buffer-file-coding-system' (and falling back to
+`iso-8859-1' when not available).  Common settings are `utf-8'
+and `iso-latin-1'.  Use `list-coding-systems' for more choices."
+  :group 'markdown
+  :type 'coding-system)
+
+(defcustom markdown-xhtml-header-content ""
+  "Additional content to include in the XHTML <head> block."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-xhtml-standalone-regexp
+  "^\\(<\\?xml\\|<!DOCTYPE\\|<html\\)"
+  "Regexp indicating whether `markdown-command' output is standalone XHTML."
+  :group 'markdown
+  :type 'regexp)
+
+(defcustom markdown-link-space-sub-char "_"
+  "Character to use instead of spaces when mapping wiki links to filenames."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-reference-location 'header
+  "Position where new reference definitions are inserted in the document."
+  :group 'markdown
+  :type '(choice (const :tag "At the end of the document" end)
+                 (const :tag "Immediately after the current block" immediately)
+                 (const :tag "Before next header" header)))
+
+(defcustom markdown-footnote-location 'end
+  "Position where new footnotes are inserted in the document."
+  :group 'markdown
+  :type '(choice (const :tag "At the end of the document" end)
+                 (const :tag "Immediately after the current block" immediately)
+                 (const :tag "Before next header" header)))
+
+(defcustom markdown-unordered-list-item-prefix "  * "
+  "String inserted before unordered list items."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-nested-imenu-heading-index nil
+  "Use nested or flat imenu heading index.
+A nested index may provide more natural browsing from the menu,
+but a flat list may allow for faster keyboard navigation via tab
+completion."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-make-gfm-checkboxes-buttons t
+  "When non-nil, make GFM checkboxes into buttons."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-live-preview-window-function
+  'markdown-live-preview-window-eww
+  "Function to display preview of Markdown output within Emacs. Function must
+update the buffer containing the preview and return the buffer."
+  :group 'markdown
+  :type 'function)
+
+(defcustom markdown-live-preview-delete-export 'delete-on-destroy
+  "Delete exported html file when using `markdown-live-preview-export' on every
+export by setting to 'delete-on-export, when quitting
+`markdown-live-preview-mode' by setting to 'delete-on-destroy, or not at all
+when nil."
+  :group 'markdown
+  :type 'symbol)
+
+(defcustom markdown-list-indent-width 4
+  "Depth of indentation for markdown lists. Used in `markdown-demote-list-item'
+and `markdown-promote-list-item'."
+  :group 'markdown
+  :type 'integer)
+
+(defcustom markdown-gfm-additional-languages nil
+  "Additional languages to make available when inserting GFM code
+blocks. Language strings must have be trimmed of whitespace and not contain any
+curly braces. They may be of arbitrary capitalization, though."
+  :group 'markdown
+  :type '(repeat (string :validate markdown-validate-language-string)))
+
+(defcustom markdown-gfm-use-electric-backquote t
+  "Use `markdown-electric-backquote' when backquote is hit three times."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-gfm-downcase-languages t
+  "Downcase suggested languages when inserting them to code blocks with
+`markdown-electric-backquote'."
+  :group 'markdown
+  :type 'boolean)
+
+
+;;; Regular Expressions =======================================================
+
+(defconst markdown-regex-comment-start
+  "<!--"
+  "Regular expression matches HTML comment opening.")
+
+(defconst markdown-regex-comment-end
+  "--[ \t]*>"
+  "Regular expression matches HTML comment closing.")
+
+(defconst markdown-regex-link-inline
+  "\\(!\\)?\\(\\[\\)\\([^]^][^]]*\\|\\)\\(\\]\\)\\((\\)\\([^)]*?\\)\\(?:\\s-+\\(\"[^\"]*\"\\)\\)?\\()\\)"
+  "Regular expression for a [text](file) or an image link ![text](file).
+Group 1 matches the leading exclamation point (optional).
+Group 2 matches the opening square bracket.
+Group 3 matches the text inside the square brackets.
+Group 4 matches the closing square bracket.
+Group 5 matches the opening parenthesis.
+Group 6 matches the URL.
+Group 7 matches the title (optional).
+Group 8 matches the closing parenthesis.")
+
+(defconst markdown-regex-link-reference
+  "\\(!\\)?\\(\\[\\)\\([^]^][^]]*\\|\\)\\(\\]\\)[ ]?\\(\\[\\)\\([^]]*?\\)\\(\\]\\)"
+  "Regular expression for a reference link [text][id].
+Group 1 matches the leading exclamation point (optional).
+Group 2 matches the opening square bracket for the link text.
+Group 3 matches the text inside the square brackets.
+Group 4 matches the closing square bracket for the link text.
+Group 5 matches the opening square bracket for the reference label.
+Group 6 matches the reference label.
+Group 7 matches the closing square bracket for the reference label.")
+
+(defconst markdown-regex-reference-definition
+  "^ \\{0,3\\}\\(\\[\\)\\([^]\n]+?\\)\\(\\]\\)\\(:\\)\\s *\\(.*?\\)\\s *\\( \"[^\"]*\"$\\|$\\)"
+  "Regular expression for a reference definition.
+Group 1 matches the opening square bracket.
+Group 2 matches the reference label.
+Group 3 matches the closing square bracket.
+Group 4 matches the colon.
+Group 5 matches the URL.
+Group 6 matches the title attribute (optional).")
+
+(defconst markdown-regex-footnote
+  "\\(\\[\\^\\)\\(.+?\\)\\(\\]\\)"
+  "Regular expression for a footnote marker [^fn].
+Group 1 matches the opening square bracket and carat.
+Group 2 matches only the label, without the surrounding markup.
+Group 3 matches the closing square bracket.")
+
+(defconst markdown-regex-header
+  "^\\(?:\\(.+\\)\n\\(=+\\)\\|\\(.+\\)\n\\(-+\\)\\|\\(#+\\)\\s-*\\(.*?\\)\\s-*?\\(#*\\)\\)$"
+  "Regexp identifying Markdown headings.
+Group 1 matches the text of a level-1 setext heading.
+Group 2 matches the underline of a level-1 setext heading.
+Group 3 matches the text of a level-1 setext heading.
+Group 4 matches the underline of a level-1 setext heading.
+Group 5 matches the opening hash marks of an atx heading.
+Group 6 matches the text, without surrounding whitespace, of an atx heading.
+Group 7 matches the closing hash marks of an atx heading.")
+
+(defconst markdown-regex-header-1-atx
+  "^\\(#\\)[ \t]*\\([^\\.].*?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for level 1 atx-style (hash mark) headers.")
+
+(defconst markdown-regex-header-2-atx
+  "^\\(##\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for level 2 atx-style (hash mark) headers.")
+
+(defconst markdown-regex-header-3-atx
+  "^\\(###\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for level 3 atx-style (hash mark) headers.")
+
+(defconst markdown-regex-header-4-atx
+  "^\\(####\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for level 4 atx-style (hash mark) headers.")
+
+(defconst markdown-regex-header-5-atx
+  "^\\(#####\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for level 5 atx-style (hash mark) headers.")
+
+(defconst markdown-regex-header-6-atx
+  "^\\(######\\)[ \t]*\\(.+?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for level 6 atx-style (hash mark) headers.")
+
+(defconst markdown-regex-header-1-setext
+  "^\\(.*\\)\n\\(=+\\)$"
+  "Regular expression for level 1 setext-style (underline) headers.")
+
+(defconst markdown-regex-header-2-setext
+  "^\\(.*\\)\n\\(-+\\)$"
+  "Regular expression for level 2 setext-style (underline) headers.")
+
+(defconst markdown-regex-header-setext
+  "^\\(.+\\)\n\\(\\(?:=\\|-\\)+\\)$"
+  "Regular expression for generic setext-style (underline) headers.")
+
+(defconst markdown-regex-header-atx
+  "^\\(#+\\)[ \t]*\\(.*?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for generic atx-style (hash mark) headers.")
+
+(defconst markdown-regex-hr
+  "^\\(\\*[ ]?\\*[ ]?\\*[ ]?[\\* ]*\\|-[ ]?-[ ]?-[--- ]*\\)$"
+  "Regular expression for matching Markdown horizontal rules.")
+
+(defconst markdown-regex-code
+  "\\(?:\\`\\|[^\\]\\)\\(\\(`+\\)\\(\\(?:.\\|\n[^\n]\\)*?[^`]\\)\\(\\2\\)\\)\\(?:[^`]\\|\\'\\)"
+  "Regular expression for matching inline code fragments.
+
+Group 1 matches the entire code fragment including the backticks.
+Group 2 matches the opening backticks.
+Group 3 matches the code fragment itself, without backticks.
+Group 4 matches the closing backticks.
+
+The leading, unnumbered group ensures that the leading backquote
+character is not escaped.
+The last group, also unnumbered, requires that the character
+following the code fragment is not a backquote.
+Note that \\(?:.\\|\n[^\n]\\) matches any character, including newlines,
+but not two newlines in a row.")
+
+(defconst markdown-regex-kbd
+  "\\(<kbd>\\)\\(\\(?:.\\|\n[^\n]\\)*?\\)\\(</kbd>\\)"
+  "Regular expression for matching <kbd> tags.
+Groups 1 and 3 match the opening and closing tags.
+Group 2 matches the key sequence.")
+
+(defconst markdown-regex-gfm-code-block-open
+ "^\\s *\\(```\\)[ ]?\\([^[:space:]]+[[:space:]]*\\|{[^}]*}\\)?$"
+ "Regular expression matching opening of GFM code blocks.
+Group 1 matches the opening three backticks.
+Group 2 matches the language identifier (optional).
+Group 3 matches the closing three backticks.")
+
+(defconst markdown-regex-gfm-code-block-close
+ "^\\s *\\(```\\)\\s *$"
+ "Regular expression matching closing of GFM code blocks.
+Group 1 matches the closing three backticks.")
+
+(defconst markdown-regex-pre
+  "^\\(    \\|\t\\).*$"
+  "Regular expression for matching preformatted text sections.")
+
+(defconst markdown-regex-list
+  "^\\([ \t]*\\)\\([0-9#]+\\.\\|[\\*\\+-]\\)\\([ \t]+\\)"
+  "Regular expression for matching list items.")
+
+(defconst markdown-regex-bold
+  "\\(^\\|[^\\]\\)\\(\\([*_]\\{2\\}\\)\\([^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\3\\)\\)"
+  "Regular expression for matching bold text.
+Group 1 matches the character before the opening asterisk or
+underscore, if any, ensuring that it is not a backslash escape.
+Group 2 matches the entire expression, including delimiters.
+Groups 3 and 5 matches the opening and closing delimiters.
+Group 4 matches the text inside the delimiters.")
+
+(defconst markdown-regex-italic
+  "\\(?:^\\|[^\\]\\)\\(\\([*_]\\)\\([^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\2\\)\\)"
+  "Regular expression for matching italic text.
+The leading unnumbered matches the character before the opening
+asterisk or underscore, if any, ensuring that it is not a
+backslash escape.
+Group 1 matches the entire expression, including delimiters.
+Groups 2 and 4 matches the opening and closing delimiters.
+Group 3 matches the text inside the delimiters.")
+
+(defconst markdown-regex-strike-through
+  "\\(^\\|[^\\]\\)\\(\\(~~\\)\\([^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(~~\\)\\)"
+  "Regular expression for matching strike-through text.
+Group 1 matches the character before the opening tilde, if any,
+ensuring that it is not a backslash escape.
+Group 2 matches the entire expression, including delimiters.
+Groups 3 and 5 matches the opening and closing delimiters.
+Group 4 matches the text inside the delimiters.")
+
+(defconst markdown-regex-gfm-italic
+  "\\(?:^\\|\\s-\\)\\(\\([*_]\\)\\([^ \\]\\2\\|[^ ]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\2\\)\\)"
+  "Regular expression for matching italic text in GitHub Flavored Markdown.
+Underscores in words are not treated as special.
+Group 1 matches the entire expression, including delimiters.
+Groups 2 and 4 matches the opening and closing delimiters.
+Group 3 matches the text inside the delimiters.")
+
+(defconst markdown-regex-blockquote
+  "^[ \t]*\\(>\\)\\(.*\\)$"
+  "Regular expression for matching blockquote lines.
+Group 1 matches the leading angle bracket.
+Group 2 matches the text.")
+
+(defconst markdown-regex-line-break
+  "[^ \n\t][ \t]*\\(  \\)$"
+  "Regular expression for matching line breaks.")
+
+(defconst markdown-regex-wiki-link
+  "\\(?:^\\|[^\\]\\)\\(\\(\\[\\[\\)\\([^]|]+\\)\\(?:\\(|\\)\\([^]]+\\)\\)?\\(\\]\\]\\)\\)"
+  "Regular expression for matching wiki links.
+This matches typical bracketed [[WikiLinks]] as well as 'aliased'
+wiki links of the form [[PageName|link text]].
+The meanings of the first and second components depend
+on the value of `markdown-wiki-link-alias-first'.
+
+Group 1 matches the entire link.
+Group 2 matches the opening square brackets.
+Group 3 matches the first component of the wiki link.
+Group 4 matches the pipe separator, when present.
+Group 5 matches the second component of the wiki link, when present.
+Group 6 matches the closing square brackets.")
+
+(defconst markdown-regex-uri
+  (concat (regexp-opt markdown-uri-types) ":[^]\t\n\r<>,;() ]+")
+  "Regular expression for matching inline URIs.")
+
+(defconst markdown-regex-angle-uri
+  (concat "\\(<\\)\\(" (regexp-opt markdown-uri-types) ":[^]\t\n\r<>,;()]+\\)\\(>\\)")
+  "Regular expression for matching inline URIs in angle brackets.")
+
+(defconst markdown-regex-email
+  "<\\(\\(\\sw\\|\\s_\\|\\s.\\)+@\\(\\sw\\|\\s_\\|\\s.\\)+\\)>"
+  "Regular expression for matching inline email addresses.")
+
+(defconst markdown-regex-link-generic
+  (concat "\\(?:" markdown-regex-wiki-link
+          "\\|" markdown-regex-link-inline
+          "\\|" markdown-regex-link-reference
+          "\\|" markdown-regex-angle-uri "\\)")
+  "Regular expression for matching any recognized link.")
+
+(defconst markdown-regex-gfm-checkbox
+  " \\(\\[[ xX]\\]\\) "
+  "Regular expression for matching GFM checkboxes.
+Group 1 matches the text to become a button.")
+
+(defconst markdown-regex-block-separator
+  "\\(\\`\\|\\(\n[ \t]*\n\\)[^\n \t]\\)"
+  "Regular expression for matching block boundaries.")
+
+(defconst markdown-regex-math-inline-single
+  "\\(?:^\\|[^\\]\\)\\(\\$\\)\\(\\(?:[^\\$]\\|\\\\.\\)*\\)\\(\\$\\)"
+  "Regular expression for itex $..$ math mode expressions.
+Groups 1 and 3 match the opening and closing dollar signs.
+Group 3 matches the mathematical expression contained within.")
+
+(defconst markdown-regex-math-inline-double
+  "\\(?:^\\|[^\\]\\)\\(\\$\\$\\)\\(\\(?:[^\\$]\\|\\\\.\\)*\\)\\(\\$\\$\\)"
+  "Regular expression for itex $$..$$ math mode expressions.
+Groups 1 and 3 match opening and closing dollar signs.
+Group 3 matches the mathematical expression contained within.")
+
+(defconst markdown-regex-math-display
+  "^\\(\\\\\\[\\)\\(\\(?:.\\|\n\\)*\\)?\\(\\\\\\]\\)$"
+  "Regular expression for itex \[..\] display mode expressions.
+Groups 1 and 3 matche the opening and closing delimiters.
+Group 2 matches the mathematical expression contained within.")
+
+(defconst markdown-regex-multimarkdown-metadata
+  "^\\([[:alpha:]][[:alpha:] _-]*?\\)\\(:[ \t]*\\)\\(.*\\)$"
+  "Regular expression for matching MultiMarkdown metadata.")
+
+(defconst markdown-regex-pandoc-metadata
+  "^\\(%\\)\\([ \t]*\\)\\(.*\\)$"
+  "Regular expression for matching Pandoc metadata.")
+
+
+;;; Syntax ====================================================================
+
+(defun markdown-syntax-propertize-extend-region (start end)
+  "Extend START to END region to include an entire block of text.
+This helps improve syntax analysis for block constructs.
+Returns a cons (NEW-START . NEW-END) or nil if no adjustment should be made.
+Function is called repeatedly until it returns nil. For details, see
+`syntax-propertize-extend-region-functions'."
+  (save-excursion
+    (let* ((new-start (progn (goto-char start)
+                             (if (re-search-backward "\n\n" nil t)
+                                 (match-end 0) (point-min))))
+           (new-end (progn (goto-char end)
+                           (if (re-search-forward "\n\n" nil t)
+                               (match-beginning 0) (point-max))))
+           (code-match (markdown-code-block-at-pos new-start))
+           (new-start (or (and code-match (cl-first code-match)) new-start))
+           (code-match (markdown-code-block-at-pos end))
+           (new-end (or (and code-match (cl-second code-match)) new-end)))
+      (unless (and (eq new-start start) (eq new-end end))
+        (cons new-start new-end)))))
+
+(defun markdown-syntax-propertize-pre-blocks (start end)
+  "Match preformatted text blocks from START to END."
+  (save-excursion
+    (goto-char start)
+    (let ((levels (markdown-calculate-list-levels))
+          indent pre-regexp close-regexp open close stop)
+      (while (and (< (point) end) (not close))
+        ;; Search for a region with sufficient indentation
+        (if (null levels)
+            (setq indent 1)
+          (setq indent (1+ (length levels))))
+        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" indent))
+        (setq close-regexp (format "^\\(    \\|\t\\)\\{0,%d\\}\\([^ \t]\\)" (1- indent)))
+
+        (cond
+         ;; If not at the beginning of a line, move forward
+         ((not (bolp)) (forward-line))
+         ;; Move past blank lines
+         ((markdown-cur-line-blank-p) (forward-line))
+         ;; At headers and horizontal rules, reset levels
+         ((markdown-new-baseline-p) (forward-line) (setq levels nil))
+         ;; If the current line has sufficient indentation, mark out pre block
+         ;; The opening should be preceded by a blank line.
+         ((and (looking-at pre-regexp)
+               (markdown-prev-line-blank-p))
+          (setq open (match-beginning 0))
+          (while (and (or (looking-at pre-regexp) (markdown-cur-line-blank-p))
+                      (not (eobp)))
+            (forward-line))
+          (skip-syntax-backward "-")
+          (setq close (point)))
+         ;; If current line has a list marker, update levels, move to end of block
+         ((looking-at markdown-regex-list)
+          (setq levels (markdown-update-list-levels
+                        (match-string 2) (markdown-cur-line-indent) levels))
+          (markdown-end-of-block-element))
+         ;; If this is the end of the indentation level, adjust levels accordingly.
+         ;; Only match end of indentation level if levels is not the empty list.
+         ((and (car levels) (looking-at close-regexp))
+          (setq levels (markdown-update-list-levels
+                        nil (markdown-cur-line-indent) levels))
+          (markdown-end-of-block-element))
+         (t (markdown-end-of-block-element))))
+
+      (when (and open close)
+        ;; Set text property data
+        (put-text-property open close 'markdown-pre (list open close))
+        ;; Recursively search again
+        (markdown-syntax-propertize-pre-blocks (point) end)))))
+
+(defun markdown-syntax-propertize-fenced-code-blocks (start end)
+  "Match tilde-fenced code text blocks from START to END."
+  (save-excursion
+    (goto-char start)
+    (while (re-search-forward "^\\([~]\\{3,\\}\\)" end t)
+      (let ((beg (match-beginning 1)))
+        (when (re-search-forward
+               (concat "^" (match-string 1) "~*") end t)
+          (put-text-property beg (match-end 0) 'markdown-fenced-code
+                             (list beg (point))))))))
+
+(defun markdown-syntax-propertize-gfm-code-blocks (start end)
+  "Match GFM code blocks from START to END."
+  (save-excursion
+    (goto-char start)
+    (while (re-search-forward markdown-regex-gfm-code-block-open end t)
+      (let ((open (list (match-beginning 1) (match-end 1)))
+            (lang (list (match-beginning 2) (match-end 2))))
+        (forward-line)
+        (let ((body (point)))
+          (when (re-search-forward
+                 markdown-regex-gfm-code-block-close end t)
+            (let ((close (list (match-beginning 1) (match-end 1)))
+                  (all (list (car open) (match-end 1))))
+              (setq body (list body (1- (match-beginning 0))))
+              (put-text-property (car open) (match-end 1) 'markdown-gfm-code
+                                 (append all open lang body close)))))))))
+
+(defun markdown-syntax-propertize-blockquotes (start end)
+  "Match blockquotes from START to END."
+  (save-excursion
+    (goto-char start)
+    (while (and (re-search-forward markdown-regex-blockquote end t)
+                (not (markdown-code-block-at-pos (match-beginning 0))))
+      (put-text-property (match-beginning 0) (match-end 0)
+                         'markdown-blockquote
+                         (match-data t)))))
+
+(defun markdown-syntax-propertize-headings-generic (symbol regex start end)
+  "Match headings of type SYMBOL with REGEX from START to END."
+  (save-excursion
+    (goto-char start)
+    (while (re-search-forward regex end t)
+      (unless (or (markdown-code-block-at-pos (match-beginning 0))
+                  (get-text-property (match-beginning 0) 'markdown-heading))
+        (put-text-property (match-beginning 0) (match-end 0)
+                           'markdown-heading t)
+        (put-text-property (match-beginning 0) (match-end 0)
+                           symbol (match-data t))))))
+
+(defun markdown-syntax-propertize-comments (start end)
+  "Match HTML comments from the START to END."
+  (let* ((state (syntax-ppss)) (in-comment (nth 4 state)))
+    (goto-char start)
+    (cond
+     ;; Comment start
+     ((and (not in-comment)
+           (re-search-forward markdown-regex-comment-start end t)
+           (save-match-data (not (markdown-code-at-point-p)))
+           (save-match-data (not (markdown-code-block-at-point))))
+      (let ((open-beg (match-beginning 0)))
+        (put-text-property open-beg (1+ open-beg)
+                           'syntax-table (string-to-syntax "<"))
+        (markdown-syntax-propertize-comments (1+ open-beg) end)))
+     ;; Comment end
+     ((and in-comment
+           (re-search-forward markdown-regex-comment-end end t))
+      (put-text-property (1- (match-end 0)) (match-end 0)
+                         'syntax-table (string-to-syntax ">"))
+      (markdown-syntax-propertize-comments (match-end 0) end))
+     ;; Nothing found
+     (t nil))))
+
+(defun markdown-syntax-propertize (start end)
+  "See `syntax-propertize-function'."
+  (remove-text-properties start end '(markdown-gfm-code))
+  (remove-text-properties start end '(markdown-fenced-code))
+  (remove-text-properties start end '(markdown-pre))
+  (remove-text-properties start end '(markdown-blockquote))
+  (remove-text-properties start end '(markdown-heading))
+  (remove-text-properties start end '(markdown-heading-1-setext))
+  (remove-text-properties start end '(markdown-heading-2-setext))
+  (remove-text-properties start end '(markdown-heading-1-atx))
+  (remove-text-properties start end '(markdown-heading-2-atx))
+  (remove-text-properties start end '(markdown-heading-3-atx))
+  (remove-text-properties start end '(markdown-heading-4-atx))
+  (remove-text-properties start end '(markdown-heading-5-atx))
+  (remove-text-properties start end '(markdown-heading-6-atx))
+  (markdown-syntax-propertize-gfm-code-blocks start end)
+  (markdown-syntax-propertize-fenced-code-blocks start end)
+  (markdown-syntax-propertize-pre-blocks start end)
+  (markdown-syntax-propertize-blockquotes start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-1-setext markdown-regex-header-1-setext start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-2-setext markdown-regex-header-2-setext start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-6-atx markdown-regex-header-6-atx start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-5-atx markdown-regex-header-5-atx start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-4-atx markdown-regex-header-4-atx start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-3-atx markdown-regex-header-3-atx start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-2-atx markdown-regex-header-2-atx start end)
+  (markdown-syntax-propertize-headings-generic
+   'markdown-heading-1-atx markdown-regex-header-1-atx start end)
+  (markdown-syntax-propertize-comments start end))
+
+
+;;; Font Lock =================================================================
+
+(require 'font-lock)
+
+(defvar markdown-italic-face 'markdown-italic-face
+  "Face name to use for italic text.")
+
+(defvar markdown-bold-face 'markdown-bold-face
+  "Face name to use for bold text.")
+
+(defvar markdown-strike-through-face 'markdown-strike-through-face
+  "Face name to use for strike-through text.")
+
+(defvar markdown-header-delimiter-face 'markdown-header-delimiter-face
+  "Face name to use as a base for header delimiters.")
+
+(defvar markdown-header-rule-face 'markdown-header-rule-face
+  "Face name to use as a base for header rules.")
+
+(defvar markdown-header-face 'markdown-header-face
+  "Face name to use as a base for headers.")
+
+(defvar markdown-header-face-1 'markdown-header-face-1
+  "Face name to use for level-1 headers.")
+
+(defvar markdown-header-face-2 'markdown-header-face-2
+  "Face name to use for level-2 headers.")
+
+(defvar markdown-header-face-3 'markdown-header-face-3
+  "Face name to use for level-3 headers.")
+
+(defvar markdown-header-face-4 'markdown-header-face-4
+  "Face name to use for level-4 headers.")
+
+(defvar markdown-header-face-5 'markdown-header-face-5
+  "Face name to use for level-5 headers.")
+
+(defvar markdown-header-face-6 'markdown-header-face-6
+  "Face name to use for level-6 headers.")
+
+(defvar markdown-inline-code-face 'markdown-inline-code-face
+  "Face name to use for inline code.")
+
+(defvar markdown-list-face 'markdown-list-face
+  "Face name to use for list markers.")
+
+(defvar markdown-blockquote-face 'markdown-blockquote-face
+  "Face name to use for blockquote.")
+
+(defvar markdown-pre-face 'markdown-pre-face
+  "Face name to use for preformatted text.")
+
+(defvar markdown-language-keyword-face 'markdown-language-keyword-face
+  "Face name to use for programming language identifiers.")
+
+(defvar markdown-link-face 'markdown-link-face
+  "Face name to use for links.")
+
+(defvar markdown-missing-link-face 'markdown-missing-link-face
+  "Face name to use for links where the linked file does not exist.")
+
+(defvar markdown-reference-face 'markdown-reference-face
+  "Face name to use for reference.")
+
+(defvar markdown-footnote-face 'markdown-footnote-face
+  "Face name to use for footnote identifiers.")
+
+(defvar markdown-url-face 'markdown-url-face
+  "Face name to use for URLs.")
+
+(defvar markdown-link-title-face 'markdown-link-title-face
+  "Face name to use for reference link titles.")
+
+(defvar markdown-line-break-face 'markdown-line-break-face
+  "Face name to use for hard line breaks.")
+
+(defvar markdown-comment-face 'markdown-comment-face
+  "Face name to use for HTML comments.")
+
+(defvar markdown-math-face 'markdown-math-face
+  "Face name to use for LaTeX expressions.")
+
+(defvar markdown-metadata-key-face 'markdown-metadata-key-face
+  "Face name to use for metadata keys.")
+
+(defvar markdown-metadata-value-face 'markdown-metadata-value-face
+  "Face name to use for metadata values.")
+
+(defvar markdown-gfm-checkbox-face 'markdown-gfm-checkbox-face
+  "Face name to use for GFM checkboxes.")
+
+(defvar markdown-highlight-face 'markdown-highlight-face
+  "Face name to use for mouse highlighting.")
+
+(defvar markdown-markup-face 'markdown-markup-face
+  "Face name to use for markup elements.")
+
+(defgroup markdown-faces nil
+  "Faces used in Markdown Mode"
+  :group 'markdown
+  :group 'faces)
+
+(defface markdown-italic-face
+  '((t (:inherit font-lock-variable-name-face :slant italic :weight normal)))
+  "Face for italic text."
+  :group 'markdown-faces)
+
+(defface markdown-bold-face
+  '((t (:inherit font-lock-variable-name-face :weight bold :slant normal)))
+  "Face for bold text."
+  :group 'markdown-faces)
+
+(defface markdown-strike-through-face
+  '((t (:inherit font-lock-variable-name-face :strike-through t)))
+  "Face for strike-through text."
+  :group 'markdown-faces)
+
+(defface markdown-markup-face
+  '((t (:inherit shadow :slant normal :weight normal)))
+  "Face for markup elements."
+  :group 'markdown-faces)
+
+(defface markdown-header-rule-face
+  '((t (:inherit markdown-markup-face)))
+  "Base face for headers rules."
+  :group 'markdown-faces)
+
+(defface markdown-header-delimiter-face
+  '((t (:inherit markdown-markup-face)))
+  "Base face for headers hash delimiter."
+  :group 'markdown-faces)
+
+(defface markdown-header-face
+  '((t (:inherit font-lock-function-name-face :weight bold)))
+  "Base face for headers."
+  :group 'markdown-faces)
+
+(defface markdown-header-face-1
+  '((t (:inherit markdown-header-face)))
+  "Face for level-1 headers."
+  :group 'markdown-faces)
+
+(defface markdown-header-face-2
+  '((t (:inherit markdown-header-face)))
+  "Face for level-2 headers."
+  :group 'markdown-faces)
+
+(defface markdown-header-face-3
+  '((t (:inherit markdown-header-face)))
+  "Face for level-3 headers."
+  :group 'markdown-faces)
+
+(defface markdown-header-face-4
+  '((t (:inherit markdown-header-face)))
+  "Face for level-4 headers."
+  :group 'markdown-faces)
+
+(defface markdown-header-face-5
+  '((t (:inherit markdown-header-face)))
+  "Face for level-5 headers."
+  :group 'markdown-faces)
+
+(defface markdown-header-face-6
+  '((t (:inherit markdown-header-face)))
+  "Face for level-6 headers."
+  :group 'markdown-faces)
+
+(defface markdown-inline-code-face
+  '((t (:inherit font-lock-constant-face)))
+  "Face for inline code."
+  :group 'markdown-faces)
+
+(defface markdown-list-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for list item markers."
+  :group 'markdown-faces)
+
+(defface markdown-blockquote-face
+  '((t (:inherit font-lock-doc-face)))
+  "Face for blockquote sections."
+  :group 'markdown-faces)
+
+(defface markdown-pre-face
+  '((t (:inherit font-lock-constant-face)))
+  "Face for preformatted text."
+  :group 'markdown-faces)
+
+(defface markdown-language-keyword-face
+  '((t (:inherit font-lock-type-face)))
+  "Face for programming language identifiers."
+  :group 'markdown-faces)
+
+(defface markdown-link-face
+  '((t (:inherit font-lock-keyword-face)))
+  "Face for links."
+  :group 'markdown-faces)
+
+(defface markdown-missing-link-face
+  '((t (:inherit font-lock-warning-face)))
+  "Face for missing links."
+  :group 'markdown-faces)
+
+(defface markdown-reference-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for link references."
+  :group 'markdown-faces)
+
+(defface markdown-footnote-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for footnote markers."
+  :group 'markdown-faces)
+
+(defface markdown-url-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for URLs."
+  :group 'markdown-faces)
+
+(defface markdown-link-title-face
+  '((t (:inherit font-lock-comment-face)))
+  "Face for reference link titles."
+  :group 'markdown-faces)
+
+(defface markdown-line-break-face
+  '((t (:inherit font-lock-constant-face :underline t)))
+  "Face for hard line breaks."
+  :group 'markdown-faces)
+
+(defface markdown-comment-face
+  '((t (:inherit font-lock-comment-face)))
+  "Face for HTML comments."
+  :group 'markdown-faces)
+
+(defface markdown-math-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for LaTeX expressions."
+  :group 'markdown-faces)
+
+(defface markdown-metadata-key-face
+  '((t (:inherit font-lock-variable-name-face)))
+  "Face for metadata keys."
+  :group 'markdown-faces)
+
+(defface markdown-metadata-value-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for metadata values."
+  :group 'markdown-faces)
+
+(defface markdown-gfm-checkbox-face
+  '((t (:inherit font-lock-builtin-face)))
+  "Face for GFM checkboxes."
+  :group 'markdown-faces)
+
+(defface markdown-highlight-face
+  '((t (:inherit highlight)))
+  "Face for mouse highlighting."
+  :group 'markdown-faces)
+
+(defun markdown-syntactic-face (state)
+  "Returns a font-lock face for characters with given STATE.
+See `font-lock-syntactic-face-function' for details."
+  (let ((in-comment (nth 4 state)))
+    (cond
+     (in-comment 'markdown-comment-face)
+     (t nil))))
+
+(defvar markdown-mode-font-lock-keywords-basic
+  (list
+   (cons 'markdown-match-gfm-code-blocks '((1 markdown-markup-face)
+                                           (2 markdown-language-keyword-face nil t)
+                                           (3 markdown-pre-face)
+                                           (4 markdown-markup-face)))
+   (cons 'markdown-match-fenced-code-blocks '((0 markdown-pre-face)))
+   (cons 'markdown-match-pre-blocks '((0 markdown-pre-face)))
+   (cons 'markdown-match-blockquotes '((1 markdown-markup-face)
+                                       (2 markdown-blockquote-face)))
+   (cons 'markdown-match-heading-1-setext '((1 markdown-header-face-1)
+                                            (2 markdown-header-rule-face)))
+   (cons 'markdown-match-heading-2-setext '((1 markdown-header-face-2)
+                                            (2 markdown-header-rule-face)))
+   (cons 'markdown-match-heading-6-atx '((1 markdown-header-delimiter-face)
+                                         (2 markdown-header-face-6)
+                                         (3 markdown-header-delimiter-face)))
+   (cons 'markdown-match-heading-5-atx '((1 markdown-header-delimiter-face)
+                                         (2 markdown-header-face-5)
+                                         (3 markdown-header-delimiter-face)))
+   (cons 'markdown-match-heading-4-atx '((1 markdown-header-delimiter-face)
+                                         (2 markdown-header-face-4)
+                                         (3 markdown-header-delimiter-face)))
+   (cons 'markdown-match-heading-3-atx '((1 markdown-header-delimiter-face)
+                                         (2 markdown-header-face-3)
+                                         (3 markdown-header-delimiter-face)))
+   (cons 'markdown-match-heading-2-atx '((1 markdown-header-delimiter-face)
+                                         (2 markdown-header-face-2)
+                                         (3 markdown-header-delimiter-face)))
+   (cons 'markdown-match-heading-1-atx '((1 markdown-header-delimiter-face)
+                                         (2 markdown-header-face-1)
+                                         (3 markdown-header-delimiter-face)))
+   (cons 'markdown-match-multimarkdown-metadata '((1 markdown-metadata-key-face)
+                                                  (2 markdown-markup-face)
+                                                  (3 markdown-metadata-value-face)))
+   (cons 'markdown-match-pandoc-metadata '((1 markdown-markup-face)
+                                           (2 markdown-markup-face)
+                                           (3 markdown-metadata-value-face)))
+   (cons 'markdown-match-hr 'markdown-header-delimiter-face)
+   (cons 'markdown-match-code '((1 markdown-markup-face)
+                                (2 markdown-inline-code-face)
+                                (3 markdown-markup-face)))
+   (cons markdown-regex-kbd '((1 markdown-markup-face)
+                              (2 markdown-inline-code-face)
+                              (3 markdown-markup-face)))
+   (cons markdown-regex-angle-uri '((1 markdown-markup-face)
+                                    (2 markdown-link-face)
+                                    (3 markdown-markup-face)))
+   (cons markdown-regex-list '(2 markdown-list-face))
+   (cons markdown-regex-footnote '((1 markdown-markup-face)   ; [^
+                                   (2 markdown-footnote-face) ; label
+                                   (3 markdown-markup-face))) ; ]
+   (cons markdown-regex-link-inline '((1 markdown-markup-face nil t)     ; ! (optional)
+                                      (2 markdown-markup-face)           ; [
+                                      (3 markdown-link-face)             ; text
+                                      (4 markdown-markup-face)           ; ]
+                                      (5 markdown-markup-face)           ; (
+                                      (6 markdown-url-face)              ; url
+                                      (7 markdown-link-title-face nil t) ; "title" (optional)
+                                      (8 markdown-markup-face)))         ; )
+   (cons markdown-regex-link-reference '((1 markdown-markup-face nil t) ; ! (optional)
+                                         (2 markdown-markup-face)       ; [
+                                         (3 markdown-link-face)         ; text
+                                         (4 markdown-markup-face)       ; ]
+                                         (5 markdown-markup-face)       ; [
+                                         (6 markdown-reference-face)    ; label
+                                         (7 markdown-markup-face)))     ; ]
+   (cons markdown-regex-reference-definition '((1 markdown-markup-face)       ; [
+                                               (2 markdown-reference-face)    ; label
+                                               (3 markdown-markup-face)       ; ]
+                                               (4 markdown-markup-face)       ; :
+                                               (5 markdown-url-face)          ; url
+                                               (6 markdown-link-title-face))) ; "title" (optional)
+   ;; Math mode $..$
+   (cons 'markdown-match-math-single '((1 markdown-markup-face prepend)
+                                       (2 markdown-math-face append)
+                                       (3 markdown-markup-face prepend)))
+   ;; Math mode $$..$$
+   (cons 'markdown-match-math-double '((1 markdown-markup-face prepend)
+                                       (2 markdown-math-face append)
+                                       (3 markdown-markup-face prepend)))
+   (cons 'markdown-match-bold '((1 markdown-markup-face prepend)
+                                (2 markdown-bold-face append)
+                                (3 markdown-markup-face prepend)))
+   (cons 'markdown-match-italic '((1 markdown-markup-face prepend)
+                                  (2 markdown-italic-face append)
+                                  (3 markdown-markup-face prepend)))
+   (cons markdown-regex-uri 'markdown-link-face)
+   (cons markdown-regex-email 'markdown-link-face)
+   (cons markdown-regex-line-break '(1 markdown-line-break-face prepend))
+   )
+  "Syntax highlighting for Markdown files.")
+
+(defconst markdown-mode-font-lock-keywords-math
+  (list
+   ;; Display mode equations with brackets: \[ \]
+   (cons markdown-regex-math-display '((1 markdown-markup-face prepend)
+                                       (2 markdown-math-face append)
+                                       (3 markdown-markup-face prepend)))
+   ;; Equation reference (eq:foo)
+   (cons "\\((eq:\\)\\([[:alnum:]:_]+\\)\\()\\)" '((1 markdown-markup-face)
+                                                   (2 markdown-reference-face)
+                                                   (3 markdown-markup-face)))
+   ;; Equation reference \eqref{foo}
+   (cons "\\(\\\\eqref{\\)\\([[:alnum:]:_]+\\)\\(}\\)" '((1 markdown-markup-face)
+                                                         (2 markdown-reference-face)
+                                                         (3 markdown-markup-face))))
+  "Syntax highlighting for LaTeX and itex fragments.")
+
+(defvar markdown-mode-font-lock-keywords nil
+  "Default highlighting expressions for Markdown mode.
+This variable is defined as a buffer-local variable for dynamic
+extension support.")
+
+;; Footnotes
+(defvar markdown-footnote-counter 0
+  "Counter for footnote numbers.")
+(make-variable-buffer-local 'markdown-footnote-counter)
+
+(defconst markdown-footnote-chars
+  "[[:alnum:]-]"
+  "Regular expression maching any character that is allowed in a footnote identifier.")
+
+(defconst markdown-regex-footnote-definition
+  (concat "^\\[\\(\\^" markdown-footnote-chars "*?\\)\\]:\\(?:[ \t]+\\|$\\)")
+  "Regular expression matching a footnote definition, capturing the label.")
+
+
+;;; Compatibility =============================================================
+
+(defun markdown-replace-regexp-in-string (regexp rep string)
+  "Replace ocurrences of REGEXP with REP in STRING.
+This is a compatibility wrapper to provide `replace-regexp-in-string'
+in XEmacs 21."
+  (if (featurep 'xemacs)
+      (replace-in-string string regexp rep)
+    (replace-regexp-in-string regexp rep string)))
+
+;; `markdown-use-region-p' is a compatibility function which checks
+;; for an active region, with fallbacks for older Emacsen and XEmacs.
+(eval-and-compile
+  (cond
+   ;; Emacs 23 and newer
+   ((fboundp 'use-region-p)
+    (defalias 'markdown-use-region-p 'use-region-p))
+   ;; Older Emacsen
+   ((and (boundp 'transient-mark-mode) (boundp 'mark-active))
+    (defun markdown-use-region-p ()
+      "Compatibility wrapper to provide `use-region-p'."
+      (and transient-mark-mode mark-active)))
+   ;; XEmacs
+   ((fboundp 'region-active-p)
+    (defalias 'markdown-use-region-p 'region-active-p))))
+
+(defun markdown-use-buttons-p ()
+  "Determine whether this Emacs supports buttons."
+  (or (featurep 'button) (locate-library "button")))
+
+;; Use new names for outline-mode functions in Emacs 25 and later.
+(eval-and-compile
+  (defalias 'markdown-hide-sublevels
+    (if (fboundp 'outline-hide-sublevels)
+        'outline-hide-sublevels
+      'hide-sublevels))
+  (defalias 'markdown-show-all
+    (if (fboundp 'outline-show-all)
+        'outline-show-all
+      'show-all))
+  (defalias 'markdown-hide-body
+    (if (fboundp 'outline-hide-body)
+        'outline-hide-body
+      'hide-body))
+  (defalias 'markdown-show-children
+    (if (fboundp 'outline-show-children)
+        'outline-show-children
+      'show-children))
+  (defalias 'markdown-show-subtree
+    (if (fboundp 'outline-show-subtree)
+        'outline-show-subtree
+      'show-subtree))
+  (defalias 'markdown-hide-subtree
+    (if (fboundp 'outline-hide-subtree)
+        'outline-hide-subtree
+      'hide-subtree)))
+
+
+;;; Markdown Parsing Functions ================================================
+
+(defun markdown-cur-line-blank-p ()
+  "Return t if the current line is blank and nil otherwise."
+  (save-match-data
+    (save-excursion
+      (beginning-of-line)
+      (re-search-forward "^\\s *$" (line-end-position) t))))
+
+(defun markdown-prev-line-blank-p ()
+  "Return t if the previous line is blank and nil otherwise.
+If we are at the first line, then consider the previous line to be blank."
+  (or (= (line-beginning-position) (point-min))
+      (save-excursion
+        (forward-line -1)
+        (markdown-cur-line-blank-p))))
+
+(defun markdown-next-line-blank-p ()
+  "Return t if the next line is blank and nil otherwise.
+If we are at the last line, then consider the next line to be blank."
+  (or (= (line-end-position) (point-max))
+      (save-excursion
+        (forward-line 1)
+        (markdown-cur-line-blank-p))))
+
+(defun markdown-prev-line-indent-p ()
+  "Return t if the previous line is indented and nil otherwise."
+  (save-excursion
+    (if (= (line-beginning-position) (point-min))
+        nil
+      (forward-line -1)
+      (goto-char (line-beginning-position))
+      (if (re-search-forward "^\\s " (line-end-position) t) t))))
+
+(defun markdown-cur-line-indent ()
+  "Return the number of leading whitespace characters in the current line."
+  (save-match-data
+    (save-excursion
+      (goto-char (line-beginning-position))
+      (re-search-forward "^[ \t]+" (line-end-position) t)
+      (current-column))))
+
+(defun markdown-prev-line-indent ()
+  "Return the number of leading whitespace characters in the previous line.
+Return 0 if the current line is the first line in the buffer."
+  (save-excursion
+    (if (= (line-beginning-position) (point-min))
+        0
+      (forward-line -1)
+      (markdown-cur-line-indent))))
+
+(defun markdown-next-line-indent ()
+  "Return the number of leading whitespace characters in the next line.
+Return 0 if line is the last line in the buffer."
+  (save-excursion
+    (if (= (line-end-position) (point-max))
+        0
+      (forward-line 1)
+      (markdown-cur-line-indent))))
+
+(defun markdown-cur-non-list-indent ()
+  "Return beginning position of list item text (not including the list marker).
+Return nil if the current line is not the beginning of a list item."
+  (save-match-data
+    (save-excursion
+      (beginning-of-line)
+      (when (re-search-forward markdown-regex-list (line-end-position) t)
+        (current-column)))))
+
+(defun markdown-prev-non-list-indent ()
+  "Return position of the first non-list-marker on the previous line."
+  (save-excursion
+    (forward-line -1)
+    (markdown-cur-non-list-indent)))
+
+(defun markdown-new-baseline-p ()
+  "Determine if the current line begins a new baseline level."
+  (save-excursion
+    (beginning-of-line)
+    (save-match-data
+      (or (looking-at markdown-regex-header)
+          (looking-at markdown-regex-hr)
+          (and (null (markdown-cur-non-list-indent))
+               (= (markdown-cur-line-indent) 0)
+               (markdown-prev-line-blank-p))))))
+
+(defun markdown-search-backward-baseline ()
+  "Search backward baseline point with no indentation and not a list item."
+  (end-of-line)
+  (let (stop)
+    (while (not (or stop (bobp)))
+      (re-search-backward markdown-regex-block-separator nil t)
+      (when (match-end 2)
+        (goto-char (match-end 2))
+        (cond
+         ((markdown-new-baseline-p)
+          (setq stop t))
+         ((looking-at markdown-regex-list)
+          (setq stop nil))
+         (t (setq stop t)))))))
+
+(defun markdown-update-list-levels (marker indent levels)
+  "Update list levels given list MARKER, block INDENT, and current LEVELS.
+Here, MARKER is a string representing the type of list, INDENT is an integer
+giving the indentation, in spaces, of the current block, and LEVELS is a
+list of the indentation levels of parent list items.  When LEVELS is nil,
+it means we are at baseline (not inside of a nested list)."
+  (cond
+   ;; New list item at baseline.
+   ((and marker (null levels))
+    (setq levels (list indent)))
+   ;; List item with greater indentation (four or more spaces).
+   ;; Increase list level.
+   ((and marker (>= indent (+ (car levels) 4)))
+    (setq levels (cons indent levels)))
+   ;; List item with greater or equal indentation (less than four spaces).
+   ;; Do not increase list level.
+   ((and marker (>= indent (car levels)))
+    levels)
+   ;; Lesser indentation level.
+   ;; Pop appropriate number of elements off LEVELS list (e.g., lesser
+   ;; indentation could move back more than one list level).  Note
+   ;; that this block need not be the beginning of list item.
+   ((< indent (car levels))
+    (while (and (> (length levels) 1)
+                (< indent (+ (cadr levels) 4)))
+      (setq levels (cdr levels)))
+    levels)
+   ;; Otherwise, do nothing.
+   (t levels)))
+
+(defun markdown-calculate-list-levels ()
+  "Calculate list levels at point.
+Return a list of the form (n1 n2 n3 ...) where n1 is the
+indentation of the deepest nested list item in the branch of
+the list at the point, n2 is the indentation of the parent
+list item, and so on.  The depth of the list item is therefore
+the length of the returned list.  If the point is not at or
+immediately  after a list item, return nil."
+  (save-excursion
+    (let ((first (point)) levels indent pre-regexp)
+      ;; Find a baseline point with zero list indentation
+      (markdown-search-backward-baseline)
+      ;; Search for all list items between baseline and LOC
+      (while (and (< (point) first)
+                  (re-search-forward markdown-regex-list first t))
+        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" (1+ (length levels))))
+        (beginning-of-line)
+        (cond
+         ;; Make sure this is not a header or hr
+         ((markdown-new-baseline-p) (setq levels nil))
+         ;; Make sure this is not a line from a pre block
+         ((looking-at pre-regexp))
+         ;; If not, then update levels
+         (t
+          (setq indent (markdown-cur-line-indent))
+          (setq levels (markdown-update-list-levels (match-string 2)
+                                                    indent levels))))
+        (end-of-line))
+      levels)))
+
+(defun markdown-prev-list-item (level)
+  "Search backward from point for a list item with indentation LEVEL.
+Set point to the beginning of the item, and return point, or nil
+upon failure."
+  (let (bounds indent prev)
+    (setq prev (point))
+    (forward-line -1)
+    (setq indent (markdown-cur-line-indent))
+    (while
+        (cond
+         ;; List item
+         ((and (looking-at markdown-regex-list)
+               (setq bounds (markdown-cur-list-item-bounds)))
+          (cond
+           ;; Stop and return point at item of lesser or equal indentation
+           ((<= (nth 3 bounds) level)
+            (setq prev (point))
+            nil)
+           ;; Stop at beginning of buffer
+           ((bobp) (setq prev nil))
+           ;; Continue at item with greater indentation
+           ((> (nth 3 bounds) level) t)))
+         ;; Stop at beginning of buffer
+         ((bobp) (setq prev nil))
+         ;; Continue if current line is blank
+         ((markdown-cur-line-blank-p) t)
+         ;; Continue while indentation is the same or greater
+         ((>= indent level) t)
+         ;; Stop if current indentation is less than list item
+         ;; and the next is blank
+         ((and (< indent level)
+               (markdown-next-line-blank-p))
+          (setq prev nil))
+         ;; Stop at a header
+         ((looking-at markdown-regex-header) (setq prev nil))
+         ;; Stop at a horizontal rule
+         ((looking-at markdown-regex-hr) (setq prev nil))
+         ;; Otherwise, continue.
+         (t t))
+      (forward-line -1)
+      (setq indent (markdown-cur-line-indent)))
+    prev))
+
+(defun markdown-next-list-item (level)
+  "Search forward from point for the next list item with indentation LEVEL.
+Set point to the beginning of the item, and return point, or nil
+upon failure."
+  (let (bounds indent prev next)
+    (setq next (point))
+    (forward-line)
+    (setq indent (markdown-cur-line-indent))
+    (while
+        (cond
+         ;; Stop at end of the buffer.
+         ((eobp) (setq prev nil))
+         ;; Continue if the current line is blank
+         ((markdown-cur-line-blank-p) t)
+         ;; List item
+         ((and (looking-at markdown-regex-list)
+               (setq bounds (markdown-cur-list-item-bounds)))
+          (cond
+           ;; Continue at item with greater indentation
+           ((> (nth 3 bounds) level) t)
+           ;; Stop and return point at item of equal indentation
+           ((= (nth 3 bounds) level)
+            (setq next (point))
+            nil)
+           ;; Stop and return nil at item with lesser indentation
+           ((< (nth 3 bounds) level)
+            (setq next nil)
+            nil)))
+         ;; Continue while indentation is the same or greater
+         ((>= indent level) t)
+         ;; Stop if current indentation is less than list item
+         ;; and the previous line was blank.
+         ((and (< indent level)
+               (markdown-prev-line-blank-p))
+          (setq next nil))
+         ;; Stop at a header
+         ((looking-at markdown-regex-header) (setq next nil))
+         ;; Stop at a horizontal rule
+         ((looking-at markdown-regex-hr) (setq next nil))
+         ;; Otherwise, continue.
+         (t t))
+      (forward-line)
+      (setq indent (markdown-cur-line-indent)))
+    next))
+
+(defun markdown-cur-list-item-end (level)
+  "Move to the end of the current list item with nonlist indentation LEVEL.
+If the point is not in a list item, do nothing."
+  (let (indent)
+    (forward-line)
+    (setq indent (markdown-cur-line-indent))
+    (while
+        (cond
+         ;; Stop at end of the buffer.
+         ((eobp) nil)
+         ;; Continue if the current line is blank
+         ((markdown-cur-line-blank-p) t)
+         ;; Continue while indentation is the same or greater
+         ((>= indent level) t)
+         ;; Stop if current indentation is less than list item
+         ;; and the previous line was blank.
+         ((and (< indent level)
+               (markdown-prev-line-blank-p))
+          nil)
+         ;; Stop at a new list item of the same or lesser indentation
+         ((looking-at markdown-regex-list) nil)
+         ;; Stop at a header
+         ((looking-at markdown-regex-header) nil)
+         ;; Stop at a horizontal rule
+         ((looking-at markdown-regex-hr) nil)
+         ;; Otherwise, continue.
+         (t t))
+      (forward-line)
+      (setq indent (markdown-cur-line-indent)))
+    ;; Don't skip over whitespace for empty list items (marker and
+    ;; whitespace only), just move to end of whitespace.
+    (if (looking-back (concat markdown-regex-list "\\s-*") nil)
+          (goto-char (match-end 3))
+      (skip-syntax-backward "-"))))
+
+(defun markdown-cur-list-item-bounds ()
+  "Return bounds and indentation of the current list item.
+Return a list of the form (begin end indent nonlist-indent marker).
+If the point is not inside a list item, return nil.
+Leave match data intact for `markdown-regex-list'."
+  (let (cur prev-begin prev-end indent nonlist-indent marker)
+    ;; Store current location
+    (setq cur (point))
+    ;; Verify that cur is between beginning and end of item
+    (save-excursion
+      (end-of-line)
+      (when (re-search-backward markdown-regex-list nil t)
+        (setq prev-begin (match-beginning 0))
+        (setq indent (length (match-string 1)))
+        (setq nonlist-indent (length (match-string 0)))
+        (setq marker (concat (match-string 2) (match-string 3)))
+        (save-match-data
+          (markdown-cur-list-item-end nonlist-indent)
+          (setq prev-end (point)))
+        (when (and (>= cur prev-begin)
+                   (<= cur prev-end)
+                   nonlist-indent)
+          (list prev-begin prev-end indent nonlist-indent marker))))))
+
+(defun markdown-bounds-of-thing-at-point (thing)
+  "Call `bounds-of-thing-at-point' for THING with slight modifications.
+Does not include trailing newlines when THING is 'line.  Handles the
+end of buffer case by setting both endpoints equal to the value of
+`point-max', since an empty region will trigger empty markup insertion.
+Return bounds of form (beg . end) if THING is found, or nil otherwise."
+  (let* ((bounds (bounds-of-thing-at-point thing))
+         (a (car bounds))
+         (b (cdr bounds)))
+    (when bounds
+      (when (eq thing 'line)
+        (cond ((and (eobp) (markdown-cur-line-blank-p))
+               (setq a b))
+              ((char-equal (char-before b) ?\^J)
+               (setq b (1- b)))))
+      (cons a b))))
+
+(defun markdown-reference-definition (reference)
+  "Find out whether Markdown REFERENCE is defined.
+REFERENCE should not include the square brackets.
+When REFERENCE is defined, return a list of the form (text start end)
+containing the definition text itself followed by the start and end
+locations of the text.  Otherwise, return nil.
+Leave match data for `markdown-regex-reference-definition'
+intact additional processing."
+  (let ((reference (downcase reference)))
+    (save-excursion
+      (goto-char (point-min))
+      (catch 'found
+        (while (re-search-forward markdown-regex-reference-definition nil t)
+          (when (string= reference (downcase (match-string-no-properties 2)))
+            (throw 'found
+                   (list (match-string-no-properties 5)
+                         (match-beginning 5) (match-end 5)))))))))
+
+(defun markdown-get-defined-references ()
+  "Return a list of all defined reference labels (not including square brackets)."
+  (save-excursion
+    (goto-char (point-min))
+    (let (refs)
+      (while (re-search-forward markdown-regex-reference-definition nil t)
+        (let ((target (match-string-no-properties 2)))
+          (add-to-list 'refs target t)))
+      refs)))
+
+(defun markdown-code-at-point-p ()
+  "Return non-nil if the point is at an inline code fragment.
+Return nil otherwise.  Set match data according to
+`markdown-match-code' upon success.
+This function searches the block for a code fragment that
+contains the point using `markdown-match-code'.  We do this
+because `thing-at-point-looking-at' does not work reliably with
+`markdown-regex-code'.
+
+The match data is set as follows:
+Group 1 matches the opening backticks.
+Group 2 matches the code fragment itself, without backticks.
+Group 3 matches the closing backticks."
+  (interactive)
+  (save-excursion
+    (let ((old-point (point))
+          (end-of-block (progn (markdown-end-of-block) (point)))
+          found)
+      (markdown-beginning-of-block)
+      (while (and (markdown-match-code end-of-block)
+                  (setq found t)
+                  (< (match-end 0) old-point)))
+      (and found                              ; matched something
+           (<= (match-beginning 0) old-point) ; match contains old-point
+           (>= (match-end 0) old-point)))))
+
+(defun markdown-code-block-at-pos (pos)
+  "Return match data list if there is a code block at POS.
+This includes pre blocks, tilde-fenced code blocks, and GFM
+quoted code blocks.  Return nil otherwise."
+  (or (get-text-property pos 'markdown-pre)
+      (get-text-property pos 'markdown-gfm-code)
+      (get-text-property pos 'markdown-fenced-code)))
+
+(defun markdown-code-block-at-point ()
+  "Return match data if the point is inside a code block.
+This includes pre blocks, tilde-fenced code blocks, and
+GFM quoted code blocks.  Calls `markdown-code-block-at-pos'."
+  (markdown-code-block-at-pos (point)))
+
+
+;;; Markdown Font Lock Matching Functions =====================================
+
+(defun markdown-range-property-any (begin end prop values)
+  "Return t if PROP from BEGIN to END is equal to one of the given VALUES.
+Also returns t if PROP is a list containing one of the VALUES.
+Return nil otherwise."
+  (let (loc props val)
+    (catch 'found
+      (dolist (loc (number-sequence begin end))
+        (when (setq props (get-char-property loc prop))
+          (cond ((listp props)
+                 ;; props is a list, check for membership
+                 (dolist (val values)
+                   (when (memq val props) (throw 'found loc))))
+              (t
+               ;; props is a scalar, check for equality
+               (dolist (val values)
+                 (when (eq val props) (throw 'found loc))))))))))
+
+(defun markdown-match-inline-generic (regex last)
+  "Match inline REGEX from the point to LAST."
+  (when (re-search-forward regex last t)
+    (let ((bounds (markdown-code-block-at-pos (match-beginning 0))))
+      (if (null bounds)
+          ;; Not in a code block: keep match data and return t when in bounds
+          (<= (match-end 0) last)
+        ;; In code block: move past it and recursively search again
+        (when (< (goto-char (nth 1 bounds)) last)
+          (markdown-match-inline-generic regex last))))))
+
+(defun markdown-match-code (last)
+  "Match inline code fragments from point to LAST."
+  (unless (bobp)
+    (backward-char 1))
+  (when (markdown-match-inline-generic markdown-regex-code last)
+    (set-match-data (list (match-beginning 1) (match-end 1)
+                          (match-beginning 2) (match-end 2)
+                          (match-beginning 3) (match-end 3)
+                          (match-beginning 4) (match-end 4)))
+    (goto-char (1+ (match-end 0)))))
+
+(defun markdown-match-bold (last)
+  "Match inline bold from the point to LAST."
+  (when (markdown-match-inline-generic markdown-regex-bold last)
+    (set-match-data (list (match-beginning 2) (match-end 2)
+                          (match-beginning 3) (match-end 3)
+                          (match-beginning 4) (match-end 4)
+                          (match-beginning 5) (match-end 5)))
+    (goto-char (1+ (match-end 0)))))
+
+(defun markdown-match-italic (last)
+  "Match inline italics from the point to LAST."
+  (let ((regex (if (eq major-mode 'gfm-mode)
+                   markdown-regex-gfm-italic markdown-regex-italic)))
+    (when (markdown-match-inline-generic regex last)
+      (let ((begin (match-beginning 1)) (end (match-end 1)))
+        (cond
+         ((markdown-range-property-any
+           begin end 'face (list markdown-inline-code-face
+                                 markdown-bold-face
+                                 markdown-list-face
+                                 markdown-math-face))
+          (goto-char (1+ (match-end 0)))
+          (markdown-match-italic last))
+         (t
+          (set-match-data (list (match-beginning 1) (match-end 1)
+                                (match-beginning 2) (match-end 2)
+                                (match-beginning 3) (match-end 3)
+                                (match-beginning 4) (match-end 4)))
+          (goto-char (1+ (match-end 0)))))))))
+
+(defun markdown-match-math-generic (regex last)
+  "Match quoted $..$ or $$..$$ math from point to LAST."
+  (when (and markdown-enable-math
+             (markdown-match-inline-generic regex last))
+    (let ((begin (match-beginning 1)) (end (match-end 1)))
+      (prog1
+          (if (markdown-range-property-any
+               begin end 'face (list markdown-inline-code-face
+                                     markdown-bold-face))
+              (markdown-match-math-generic regex last)
+            t)
+        (goto-char (1+ (match-end 0)))))))
+
+(defun markdown-match-math-single (last)
+  "Match single quoted $..$ math from point to LAST."
+  (markdown-match-math-generic markdown-regex-math-inline-single last))
+
+(defun markdown-match-math-double (last)
+  "Match double quoted $$..$$ math from point to LAST."
+  (markdown-match-math-generic markdown-regex-math-inline-double last))
+
+(defun markdown-match-propertized-text (property last)
+  "Match text with PROPERTY from point to LAST.
+Restore match data previously stored in PROPERTY."
+  (let (saved pos)
+    (unless (setq saved (get-text-property (point) property))
+      (setq pos (next-single-char-property-change (point) property nil last))
+      (setq saved (get-text-property pos property)))
+    (when saved
+      (set-match-data saved)
+      (goto-char (min (1+ (match-end 0)) (point-max)))
+      saved)))
+
+(defun markdown-match-pre-blocks (last)
+  "Match preformatted blocks from point to LAST.
+Use data stored in 'markdown-pre text property during syntax
+analysis."
+  (markdown-match-propertized-text 'markdown-pre last))
+
+(defun markdown-match-gfm-code-blocks (last)
+  "Match GFM quoted code blocks from point to LAST.
+Use data stored in 'markdown-gfm-code text property during syntax
+analysis."
+  (markdown-match-propertized-text 'markdown-gfm-code last))
+
+(defun markdown-match-fenced-code-blocks (last)
+  "Match fenced code blocks from the point to LAST."
+  (markdown-match-propertized-text 'markdown-fenced-code last))
+
+(defun markdown-match-blockquotes (last)
+  "Match blockquotes from point to LAST.
+Use data stored in 'markdown-blockquote text property during syntax
+analysis."
+  (markdown-match-propertized-text 'markdown-blockquote last))
+
+(defun markdown-match-heading-1-setext (last)
+  "Match level 1 setext headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-1-setext last))
+
+(defun markdown-match-heading-2-setext (last)
+  "Match level 2 setext headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-2-setext last))
+
+(defun markdown-match-heading-1-atx (last)
+  "Match level 1 ATX headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-1-atx last))
+
+(defun markdown-match-heading-2-atx (last)
+  "Match level 2 ATX headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-2-atx last))
+
+(defun markdown-match-heading-3-atx (last)
+  "Match level 3 ATX headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-3-atx last))
+
+(defun markdown-match-heading-4-atx (last)
+  "Match level 4 ATX headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-4-atx last))
+
+(defun markdown-match-heading-5-atx (last)
+  "Match level 5 ATX headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-5-atx last))
+
+(defun markdown-match-heading-6-atx (last)
+  "Match level 6 ATX headings from point to LAST."
+  (markdown-match-propertized-text 'markdown-heading-6-atx last))
+
+(defun markdown-match-hr (last)
+  "Match horizontal rules comments from the point to LAST."
+  (while (and (re-search-forward markdown-regex-hr last t)
+              (or (markdown-on-heading-p)
+                  (markdown-code-block-at-point))
+              (< (match-end 0) last))
+    (forward-line))
+  (beginning-of-line)
+  (cond ((looking-at markdown-regex-hr)
+         (forward-line)
+         t)
+        (t nil)))
+
+(defun markdown-match-comments (last)
+  "Match HTML comments from the point to LAST."
+  (when (and (skip-syntax-forward "^<" last))
+    (let ((beg (point)))
+      (when (and (skip-syntax-forward "^>" last) (< (point) last))
+        (forward-char)
+        (set-match-data (list beg (point)))
+        t))))
+
+(defun markdown-match-generic-metadata (regexp last)
+  "Match generic metadata specified by REGEXP from the point to LAST."
+  (let ((header-end (save-excursion
+                      (goto-char (point-min))
+                      (if (re-search-forward "\n\n" (point-max) t)
+                          (match-beginning 0)
+                        (point-max)))))
+    (cond ((>= (point) header-end)
+           ;; Don't match anything outside of the header.
+           nil)
+          ((re-search-forward regexp (min last header-end) t)
+           ;; If a metadata item is found, it may span several lines.
+           (let ((key-beginning (match-beginning 1))
+                 (key-end (match-end 1))
+                 (markup-begin (match-beginning 2))
+                 (markup-end (match-end 2))
+                 (value-beginning (match-beginning 3)))
+             (while (and (not (looking-at regexp))
+                         (not (> (point) (min last header-end)))
+                         (not (eobp)))
+               (forward-line))
+             (unless (eobp)
+               (forward-line -1)
+               (end-of-line))
+             (set-match-data (list key-beginning (point) ; complete metadata
+                                   key-beginning key-end ; key
+                                   markup-begin markup-end ; markup
+                                   value-beginning (point))) ; value
+           t))
+          (t nil))))
+
+(defun markdown-match-multimarkdown-metadata (last)
+  "Match MultiMarkdown metadata from the point to LAST."
+  (markdown-match-generic-metadata markdown-regex-multimarkdown-metadata last))
+
+(defun markdown-match-pandoc-metadata (last)
+  "Match Pandoc metadata from the point to LAST."
+  (markdown-match-generic-metadata markdown-regex-pandoc-metadata last))
+
+
+;;; Syntax Table ==============================================================
+
+(defvar markdown-mode-syntax-table
+  (let ((tab (make-syntax-table text-mode-syntax-table)))
+    (modify-syntax-entry ?\" "." tab)
+    tab)
+  "Syntax table for `markdown-mode'.")
+
+
+;;; Element Insertion =========================================================
+
+(defun markdown-ensure-blank-line-before ()
+  "If previous line is not already blank, insert a blank line before point."
+  (unless (bolp) (insert "\n"))
+  (unless (or (bobp) (looking-back "\n\\s-*\n" nil)) (insert "\n")))
+
+(defun markdown-ensure-blank-line-after ()
+  "If following line is not already blank, insert a blank line after point.
+Return the point where it was originally."
+  (save-excursion
+    (unless (eolp) (insert "\n"))
+    (unless (or (eobp) (looking-at "\n\\s-*\n")) (insert "\n"))))
+
+(defun markdown-wrap-or-insert (s1 s2 &optional thing beg end)
+  "Insert the strings S1 and S2, wrapping around region or THING.
+If a region is specified by the optional BEG and END arguments,
+wrap the strings S1 and S2 around that region.
+If there is an active region, wrap the strings S1 and S2 around
+the region.  If there is not an active region but the point is at
+THING, wrap that thing (which defaults to word).  Otherwise, just
+insert S1 and S2 and place the cursor in between.  Return the
+bounds of the entire wrapped string, or nil if nothing was wrapped
+and S1 and S2 were only inserted."
+  (let (a b bounds new-point)
+    (cond
+     ;; Given region
+     ((and beg end)
+      (setq a beg
+            b end
+            new-point (+ (point) (length s1))))
+     ;; Active region
+     ((markdown-use-region-p)
+      (setq a (region-beginning)
+            b (region-end)
+            new-point (+ (point) (length s1))))
+     ;; Thing (word) at point
+     ((setq bounds (markdown-bounds-of-thing-at-point (or thing 'word)))
+      (setq a (car bounds)
+            b (cdr bounds)
+            new-point (+ (point) (length s1))))
+     ;; No active region and no word
+     (t
+      (setq a (point)
+            b (point))))
+    (goto-char b)
+    (insert s2)
+    (goto-char a)
+    (insert s1)
+    (when new-point (goto-char new-point))
+    (if (= a b)
+        nil
+      (setq b (+ b (length s1) (length s2)))
+      (cons a b))))
+
+(defun markdown-point-after-unwrap (cur prefix suffix)
+  "Return desired position of point after an unwrapping operation.
+CUR gives the position of the point before the operation.
+Additionally, two cons cells must be provided.  PREFIX gives the
+bounds of the prefix string and SUFFIX gives the bounds of the
+suffix string."
+  (cond ((< cur (cdr prefix)) (car prefix))
+        ((< cur (car suffix)) (- cur (- (cdr prefix) (car prefix))))
+        ((<= cur (cdr suffix))
+         (- cur (+ (- (cdr prefix) (car prefix))
+                   (- cur (car suffix)))))
+        (t cur)))
+
+(defun markdown-unwrap-thing-at-point (regexp all text)
+  "Remove prefix and suffix of thing at point and reposition the point.
+When the thing at point matches REGEXP, replace the subexpression
+ALL with the string in subexpression TEXT.  Reposition the point
+in an appropriate location accounting for the removal of prefix
+and suffix strings.  Return new bounds of string from group TEXT.
+When REGEXP is nil, assumes match data is already set."
+  (when (or (null regexp)
+            (thing-at-point-looking-at regexp))
+    (let ((cur (point))
+          (prefix (cons (match-beginning all) (match-beginning text)))
+          (suffix (cons (match-end text) (match-end all)))
+          (bounds (cons (match-beginning text) (match-end text))))
+      ;; Replace the thing at point
+      (replace-match (match-string text) t t nil all)
+      ;; Reposition the point
+      (goto-char (markdown-point-after-unwrap cur prefix suffix))
+      ;; Adjust bounds
+      (setq bounds (cons (car prefix)
+                         (- (cdr bounds) (- (cdr prefix) (car prefix))))))))
+
+(defun markdown-unwrap-things-in-region (beg end regexp all text)
+  "Remove prefix and suffix of all things in region from BEG to END.
+When a thing in the region matches REGEXP, replace the
+subexpression ALL with the string in subexpression TEXT.
+Return a cons cell containing updated bounds for the region."
+  (save-excursion
+    (goto-char beg)
+    (let ((removed 0) len-all len-text)
+      (while (re-search-forward regexp (- end removed) t)
+        (setq len-all (length (match-string-no-properties all)))
+        (setq len-text (length (match-string-no-properties text)))
+        (setq removed (+ removed (- len-all len-text)))
+        (replace-match (match-string text) t t nil all))
+      (cons beg (- end removed)))))
+
+(defun markdown-insert-hr (arg)
+  "Insert or replace a horizonal rule.
+By default, use the first element of `markdown-hr-strings'.  When
+ARG is non-nil, as when given a prefix, select a different
+element as follows.  When prefixed with \\[universal-argument],
+use the last element of `markdown-hr-strings' instead.  When
+prefixed with an integer from 1 to the length of
+`markdown-hr-strings', use the element in that position instead."
+  (interactive "*P")
+  (when (thing-at-point-looking-at markdown-regex-hr)
+    (delete-region (match-beginning 0) (match-end 0)))
+  (markdown-ensure-blank-line-before)
+  (cond ((equal arg '(4))
+         (insert (car (reverse markdown-hr-strings))))
+        ((and (integerp arg) (> arg 0)
+              (<= arg (length markdown-hr-strings)))
+         (insert (nth (1- arg) markdown-hr-strings)))
+        (t
+         (insert (car markdown-hr-strings))))
+  (markdown-ensure-blank-line-after))
+
+(defun markdown-insert-bold ()
+  "Insert markup to make a region or word bold.
+If there is an active region, make the region bold.  If the point
+is at a non-bold word, make the word bold.  If the point is at a
+bold word or phrase, remove the bold markup.  Otherwise, simply
+insert bold delimiters and place the cursor in between them."
+  (interactive)
+  (let ((delim (if markdown-bold-underscore "__" "**")))
+    (if (markdown-use-region-p)
+        ;; Active region
+        (let ((bounds (markdown-unwrap-things-in-region
+                       (region-beginning) (region-end)
+                       markdown-regex-bold 2 4)))
+          (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
+      ;; Bold markup removal, bold word at point, or empty markup insertion
+      (if (thing-at-point-looking-at markdown-regex-bold)
+          (markdown-unwrap-thing-at-point nil 2 4)
+        (markdown-wrap-or-insert delim delim 'word nil nil)))))
+
+(defun markdown-insert-italic ()
+  "Insert markup to make a region or word italic.
+If there is an active region, make the region italic.  If the point
+is at a non-italic word, make the word italic.  If the point is at an
+italic word or phrase, remove the italic markup.  Otherwise, simply
+insert italic delimiters and place the cursor in between them."
+  (interactive)
+  (let ((delim (if markdown-italic-underscore "_" "*")))
+    (if (markdown-use-region-p)
+        ;; Active region
+        (let ((bounds (markdown-unwrap-things-in-region
+                       (region-beginning) (region-end)
+                       markdown-regex-italic 1 3)))
+          (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
+      ;; Italic markup removal, italic word at point, or empty markup insertion
+      (if (thing-at-point-looking-at markdown-regex-italic)
+          (markdown-unwrap-thing-at-point nil 1 3)
+        (markdown-wrap-or-insert delim delim 'word nil nil)))))
+
+(defun markdown-insert-strike-through ()
+  "Insert markup to make a region or word strikethrough.
+If there is an active region, make the region strikethrough.  If the point
+is at a non-bold word, make the word strikethrough.  If the point is at a
+strikethrough word or phrase, remove the strikethrough markup.  Otherwise,
+simply insert bold delimiters and place the cursor in between them."
+  (interactive)
+  (let ((delim "~~"))
+    (if (markdown-use-region-p)
+        ;; Active region
+        (let ((bounds (markdown-unwrap-things-in-region
+                       (region-beginning) (region-end)
+                       markdown-regex-strike-through 2 4)))
+          (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
+      ;; Strikethrough markup removal, strikethrough word at point, or empty markup insertion
+      (if (thing-at-point-looking-at markdown-regex-strike-through)
+          (markdown-unwrap-thing-at-point nil 2 4)
+        (markdown-wrap-or-insert delim delim 'word nil nil)))))
+
+(defun markdown-insert-code ()
+  "Insert markup to make a region or word an inline code fragment.
+If there is an active region, make the region an inline code
+fragment.  If the point is at a word, make the word an inline
+code fragment.  Otherwise, simply insert code delimiters and
+place the cursor in between them."
+  (interactive)
+  (if (markdown-use-region-p)
+      ;; Active region
+      (let ((bounds (markdown-unwrap-things-in-region
+                     (region-beginning) (region-end)
+                     markdown-regex-code 1 3)))
+        (markdown-wrap-or-insert "`" "`" nil (car bounds) (cdr bounds)))
+    ;; Code markup removal, code markup for word, or empty markup insertion
+    (if (markdown-code-at-point-p)
+        (markdown-unwrap-thing-at-point nil 0 2)
+      (markdown-wrap-or-insert "`" "`" 'word nil nil))))
+
+(defun markdown-insert-kbd ()
+  "Insert markup to wrap region or word in <kbd> tags.
+If there is an active region, use the region.  If the point is at
+a word, use the word.  Otherwise, simply insert <kbd> tags and
+place the cursor in between them."
+  (interactive)
+  (if (markdown-use-region-p)
+      ;; Active region
+      (let ((bounds (markdown-unwrap-things-in-region
+                     (region-beginning) (region-end)
+                     markdown-regex-kbd 0 2)))
+        (markdown-wrap-or-insert "<kbd>" "</kbd>" nil (car bounds) (cdr bounds)))
+    ;; Markup removal, markup for word, or empty markup insertion
+    (if (thing-at-point-looking-at markdown-regex-kbd)
+        (markdown-unwrap-thing-at-point nil 0 2)
+      (markdown-wrap-or-insert "<kbd>" "</kbd>" 'word nil nil))))
+
+(defun markdown-insert-link ()
+  "Insert an inline link, using region or word as link text if possible.
+If there is an active region, use the region as the link text.  If the
+point is at a word, use the word as the link text.  In these cases, the
+point will be left at the position for inserting a URL.  If there is no
+active region and the point is not at word, simply insert link markup and
+place the point in the position to enter link text."
+  (interactive)
+  (let ((bounds (markdown-wrap-or-insert "[" "]()")))
+    (when bounds
+      (goto-char (- (cdr bounds) 1)))))
+
+(defun markdown-insert-reference-link (text label &optional url title)
+  "Insert a reference link and, optionally, a reference definition.
+The link TEXT will be inserted followed by the optional LABEL.
+If a URL is given, also insert a definition for the reference
+LABEL according to `markdown-reference-location'.  If a TITLE is
+given, it will be added to the end of the reference definition
+and will be used to populate the title attribute when converted
+to XHTML.  If URL is nil, insert only the link portion (for
+example, when a reference label is already defined)."
+  (insert (concat "[" text "][" label "]"))
+  (when url
+    (markdown-insert-reference-definition
+     (if (string-equal label "") text label)
+     url title)))
+
+(defun markdown-insert-reference-definition (label &optional url title)
+  "Add definition for reference LABEL with URL and TITLE.
+LABEL is a Markdown reference label without square brackets.
+URL and TITLE are optional.  When given, the TITLE will
+be used to populate the title attribute when converted to XHTML."
+  ;; END specifies where to leave the point upon return
+  (let ((end (point)))
+    (cond
+     ((eq markdown-reference-location 'end) (goto-char (point-max)))
+     ((eq markdown-reference-location 'immediately) (markdown-end-of-block))
+     ((eq markdown-reference-location 'header) (markdown-end-of-defun)))
+    (unless (markdown-cur-line-blank-p) (insert "\n"))
+    (insert "\n[" label "]: ")
+    (if url
+        (insert url)
+      ;; When no URL is given, leave cursor at END following the colon
+      (setq end (point)))
+    (when title
+      (insert " \"" title "\""))
+    (unless (looking-at "\n")
+      (insert "\n"))
+    (goto-char end)
+    (when url
+      (message
+       (substitute-command-keys
+        "Defined reference [%s], press \\[markdown-jump] to jump there")
+       label))))
+
+(defun markdown-insert-reference-link-dwim ()
+  "Insert a reference link of the form [text][label] at point.
+If there is an active region, the text in the region will be used
+as the link text.  If the point is at an inline link, it will be
+converted to a reference link.  If the point is at a word, it will
+be used as the link text.  Otherwise, the link text will be read from
+the minibuffer.  The link label will be read from the minibuffer in
+both cases, with completion from the set of currently defined
+references.  To create an implicit reference link, press RET to
+accept the default, an empty label.  If the entered referenced
+label is not defined, additionally prompt for the URL
+and (optional) title.  The reference definition is placed at the
+location determined by `markdown-reference-location'."
+  (interactive)
+  (let* ((defined-labels (mapcar (lambda (x) (substring x 1 -1))
+                                 (markdown-get-defined-references)))
+         (switch (thing-at-point-looking-at markdown-regex-link-inline))
+         (bounds (cond ((markdown-use-region-p)
+                        (cons (region-beginning) (region-end)))
+                       (switch
+                        (cons (match-beginning 0) (match-end 0)))
+                       (t
+                        (markdown-bounds-of-thing-at-point 'word))))
+         (text (cond (switch (match-string 3))
+                     (bounds (buffer-substring (car bounds) (cdr bounds)))
+                     (t (read-string "Link Text: "))))
+         (label (completing-read
+                 "Link Label (default: none): " defined-labels
+                 nil nil nil 'markdown-reference-label-history nil))
+         (ref (save-match-data
+                (markdown-reference-definition
+                 (if (> (length label) 0) label text))))
+         (url (cond (ref nil)
+                    (switch (match-string 6))
+                    (t (read-string "Link URL: "))))
+         (title (cond
+                 ((= (length url) 0) nil)
+                 (switch (if (> (length (match-string 7)) 2)
+                             (substring (match-string 7) 1 -1)
+                           nil))
+                 (t (read-string "Link Title (optional): ")))))
+    (when bounds (delete-region (car bounds) (cdr bounds)))
+    (markdown-insert-reference-link text label url title)))
+
+(defun markdown-insert-uri ()
+  "Insert markup for an inline URI.
+If there is an active region, use it as the URI.  If the point is
+at a URI, wrap it with angle brackets.  If the point is at an
+inline URI, remove the angle brackets.  Otherwise, simply insert
+angle brackets place the point between them."
+  (interactive)
+  (if (markdown-use-region-p)
+      ;; Active region
+      (let ((bounds (markdown-unwrap-things-in-region
+                     (region-beginning) (region-end)
+                     markdown-regex-angle-uri 0 2)))
+        (markdown-wrap-or-insert "<" ">" nil (car bounds) (cdr bounds)))
+    ;; Markup removal, URI at point, or empty markup insertion
+    (if (thing-at-point-looking-at markdown-regex-angle-uri)
+        (markdown-unwrap-thing-at-point nil 0 2)
+      (markdown-wrap-or-insert "<" ">" 'url nil nil))))
+
+(defun markdown-insert-wiki-link ()
+  "Insert a wiki link of the form [[WikiLink]].
+If there is an active region, use the region as the link text.
+If the point is at a word, use the word as the link text.  If
+there is no active region and the point is not at word, simply
+insert link markup."
+  (interactive)
+  (if (markdown-use-region-p)
+      ;; Active region
+      (markdown-wrap-or-insert "[[" "]]" nil (region-beginning) (region-end))
+    ;; Markup removal, wiki link at at point, or empty markup insertion
+    (if (thing-at-point-looking-at markdown-regex-wiki-link)
+        (if (or markdown-wiki-link-alias-first
+                (null (match-string 5)))
+            (markdown-unwrap-thing-at-point nil 1 3)
+          (markdown-unwrap-thing-at-point nil 1 5))
+      (markdown-wrap-or-insert "[[" "]]"))))
+
+(defun markdown-insert-image (&optional arg)
+  "Insert image markup using region or word as alt text if possible.
+If there is an active region, use the region as the alt text.  If the
+point is at a word, use the word as the alt text.  In these cases, the
+point will be left at the position for inserting a URL.  If there is no
+active region and the point is not at word, simply insert image markup and
+place the point in the position to enter alt text.  If ARG is nil, insert
+inline image markup.  Otherwise, insert reference image markup."
+  (interactive "*P")
+  (let ((bounds (if arg
+                    (markdown-wrap-or-insert "![" "][]")
+                  (markdown-wrap-or-insert "![" "]()"))))
+    (when bounds
+      (goto-char (- (cdr bounds) 1)))))
+
+(defun markdown-insert-reference-image ()
+  "Insert reference-style image markup using region or word as alt text.
+Calls `markdown-insert-image' with prefix argument."
+  (interactive)
+  (markdown-insert-image t))
+
+(defun markdown-remove-header ()
+  "Remove header markup if point is at a header.
+Return bounds of remaining header text if a header was removed
+and nil otherwise."
+  (interactive "*")
+  (or (markdown-unwrap-thing-at-point markdown-regex-header-atx 0 2)
+      (markdown-unwrap-thing-at-point markdown-regex-header-setext 0 1)))
+
+(defun markdown-insert-header (&optional level text setext)
+  "Insert or replace header markup.
+The level of the header is specified by LEVEL and header text is
+given by TEXT.  LEVEL must be an integer from 1 and 6, and the
+default value is 1.
+When TEXT is nil, the header text is obtained as follows.
+If there is an active region, it is used as the header text.
+Otherwise, the current line will be used as the header text.
+If there is not an active region and the point is at a header,
+remove the header markup and replace with level N header.
+Otherwise, insert empty header markup and place the cursor in
+between.
+The style of the header will be atx (hash marks) unless
+SETEXT is non-nil, in which case a setext-style (underlined)
+header will be inserted."
+  (interactive "p\nsHeader text: ")
+  (setq level (min (max (or level 1) 1) (if setext 2 6)))
+  ;; Determine header text if not given
+  (when (null text)
+    (if (markdown-use-region-p)
+        ;; Active region
+        (setq text (delete-and-extract-region (region-beginning) (region-end)))
+      ;; No active region
+      (markdown-remove-header)
+      (setq text (delete-and-extract-region
+                  (line-beginning-position) (line-end-position)))
+      (when (and setext (string-match "^[ \t]*$" text))
+        (setq text (read-string "Header text: "))))
+    (setq text (markdown-compress-whitespace-string text)))
+  ;; Insertion with given text
+  (markdown-ensure-blank-line-before)
+  (let (hdr)
+    (cond (setext
+           (setq hdr (make-string (string-width text) (if (= level 2) ?- ?=)))
+           (insert text "\n" hdr))
+          (t
+           (setq hdr (make-string level ?#))
+           (insert hdr " " text)
+           (when (null markdown-asymmetric-header) (insert " " hdr)))))
+  (markdown-ensure-blank-line-after)
+  ;; Leave point at end of text
+  (if setext
+      (backward-char (1+ (string-width text)))
+    (backward-char (1+ level))))
+
+(defun markdown-insert-header-dwim (&optional arg setext)
+  "Insert or replace header markup.
+The level and type of the header are determined automatically by
+the type and level of the previous header, unless a prefix
+argument is given via ARG.
+With a numeric prefix valued 1 to 6, insert a header of the given
+level, with the type being determined automatically (note that
+only level 1 or 2 setext headers are possible).
+
+With a \\[universal-argument] prefix (i.e., when ARG is (4)),
+promote the heading by one level.
+With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
+demote the heading by one level.
+When SETEXT is non-nil, prefer setext-style headers when
+possible (levels one and two).
+
+When there is an active region, use it for the header text.  When
+the point is at an existing header, change the type and level
+according to the rules above.
+Otherwise, if the line is not empty, create a header using the
+text on the current line as the header text.
+Finally, if the point is on a blank line, insert empty header
+markup (atx) or prompt for text (setext).
+See `markdown-insert-header' for more details about how the
+header text is determined."
+  (interactive "*P")
+  (let (level)
+    (save-excursion
+      (when (or (thing-at-point-looking-at markdown-regex-header)
+                (re-search-backward markdown-regex-header nil t))
+        ;; level of current or previous header
+        (setq level (markdown-outline-level))
+        ;; match groups 1 and 3 indicate setext headers
+        (setq setext (or setext (match-end 1) (match-end 3)))))
+    ;; check prefix argument
+    (cond
+     ((and (equal arg '(4)) level (> level 1)) ;; C-u
+      (cl-decf level))
+     ((and (equal arg '(16)) level (< level 6)) ;; C-u C-u
+      (cl-incf level))
+     (arg ;; numeric prefix
+      (setq level (prefix-numeric-value arg))))
+    ;; setext headers must be level one or two
+    (and level (setq setext (and setext (<= level 2))))
+    ;; insert the heading
+    (markdown-insert-header level nil setext)))
+
+(defun markdown-insert-header-setext-dwim (&optional arg)
+  "Insert or replace header markup, with preference for setext.
+See `markdown-insert-header-dwim' for details, including how ARG is handled."
+  (interactive "*P")
+  (markdown-insert-header-dwim arg t))
+
+(defun markdown-insert-header-atx-1 ()
+  "Insert a first level atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 1 nil nil))
+
+(defun markdown-insert-header-atx-2 ()
+  "Insert a level two atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 2 nil nil))
+
+(defun markdown-insert-header-atx-3 ()
+  "Insert a level three atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 3 nil nil))
+
+(defun markdown-insert-header-atx-4 ()
+  "Insert a level four atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 4 nil nil))
+
+(defun markdown-insert-header-atx-5 ()
+  "Insert a level five atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 5 nil nil))
+
+(defun markdown-insert-header-atx-6 ()
+  "Insert a sixth level atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 6 nil nil))
+
+(defun markdown-insert-header-setext-1 ()
+  "Insert a setext-style (underlined) first-level header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 1 nil t))
+
+(defun markdown-insert-header-setext-2 ()
+  "Insert a setext-style (underlined) second-level header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 2 nil t))
+
+(defun markdown-blockquote-indentation (loc)
+  "Return string containing necessary indentation for a blockquote at LOC.
+Also see `markdown-pre-indentation'."
+  (save-excursion
+    (goto-char loc)
+    (let* ((list-level (length (markdown-calculate-list-levels)))
+           (indent ""))
+      (dotimes (count list-level indent)
+        (setq indent (concat indent "    "))))))
+
+(defun markdown-insert-blockquote ()
+  "Start a blockquote section (or blockquote the region).
+If Transient Mark mode is on and a region is active, it is used as
+the blockquote text."
+  (interactive)
+  (if (markdown-use-region-p)
+      (markdown-blockquote-region (region-beginning) (region-end))
+    (markdown-ensure-blank-line-before)
+    (insert (markdown-blockquote-indentation (point)) "> ")
+    (markdown-ensure-blank-line-after)))
+
+(defun markdown-block-region (beg end prefix)
+  "Format the region using a block prefix.
+Arguments BEG and END specify the beginning and end of the
+region.  The characters PREFIX will appear at the beginning
+of each line."
+  (save-excursion
+    (let* ((end-marker (make-marker))
+           (beg-marker (make-marker)))
+      ;; Ensure blank line after and remove extra whitespace
+      (goto-char end)
+      (skip-syntax-backward "-")
+      (set-marker end-marker (point))
+      (delete-horizontal-space)
+      (markdown-ensure-blank-line-after)
+      ;; Ensure blank line before and remove extra whitespace
+      (goto-char beg)
+      (skip-syntax-forward "-")
+      (delete-horizontal-space)
+      (markdown-ensure-blank-line-before)
+      (set-marker beg-marker (point))
+      ;; Insert PREFIX before each line
+      (goto-char beg-marker)
+      (while (and (< (line-beginning-position) end-marker)
+                  (not (eobp)))
+        (insert prefix)
+        (forward-line)))))
+
+(defun markdown-blockquote-region (beg end)
+  "Blockquote the region.
+Arguments BEG and END specify the beginning and end of the region."
+  (interactive "*r")
+  (markdown-block-region
+   beg end (concat (markdown-blockquote-indentation
+                    (max (point-min) (1- beg))) "> ")))
+
+(defun markdown-pre-indentation (loc)
+  "Return string containing necessary whitespace for a pre block at LOC.
+Also see `markdown-blockquote-indentation'."
+  (save-excursion
+    (goto-char loc)
+    (let* ((list-level (length (markdown-calculate-list-levels)))
+           indent)
+      (dotimes (count (1+ list-level) indent)
+        (setq indent (concat indent "    "))))))
+
+(defun markdown-insert-pre ()
+  "Start a preformatted section (or apply to the region).
+If Transient Mark mode is on and a region is active, it is marked
+as preformatted text."
+  (interactive)
+  (if (markdown-use-region-p)
+      (markdown-pre-region (region-beginning) (region-end))
+    (markdown-ensure-blank-line-before)
+    (insert (markdown-pre-indentation (point)))
+    (markdown-ensure-blank-line-after)))
+
+(defun markdown-pre-region (beg end)
+  "Format the region as preformatted text.
+Arguments BEG and END specify the beginning and end of the region."
+  (interactive "*r")
+  (let ((indent (markdown-pre-indentation (max (point-min) (1- beg)))))
+    (markdown-block-region beg end indent)))
+
+(defun markdown-electric-backquote (arg)
+  "Insert a backquote.
+The numeric prefix argument ARG says how many times to repeat the insertion.
+Call `markdown-insert-gfm-code-block' interactively
+if three backquotes inserted at the beginning of line."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (when (and markdown-gfm-use-electric-backquote (looking-back "^```" nil))
+    (replace-match "")
+    (call-interactively #'markdown-insert-gfm-code-block)))
+
+(defconst markdown-gfm-recognized-languages
+  ;; to reproduce/update, evaluate the let-form in
+  ;; scripts/get-recognized-gfm-languages.el. that produces a single long sexp,
+  ;; but with appropriate use of a keyboard macro, indenting and filling it
+  ;; properly is pretty fast.
+  '("ABAP" "AMPL" "ANTLR" "APL" "ASP" "ATS" "ActionScript" "Ada" "Agda" "Alloy"
+    "ApacheConf" "Apex" "AppleScript" "Arc" "Arduino" "AsciiDoc" "AspectJ"
+    "Assembly" "Augeas" "AutoHotkey" "AutoIt" "Awk" "Batchfile" "Befunge"
+    "Bison" "BitBake" "BlitzBasic" "BlitzMax" "Bluespec" "Boo" "Brainfuck"
+    "Brightscript" "Bro" "C" "C++" "C-ObjDump" "CLIPS" "CMake" "COBOL" "CSS"
+    "CartoCSS" "Ceylon" "Chapel" "Charity" "ChucK" "Cirru" "Clarion" "Clean"
+    "Click" "Clojure" "CoffeeScript" "ColdFusion" "Cool" "Coq" "Cpp-ObjDump"
+    "Creole" "Crystal" "Cucumber" "Cuda" "Cycript" "Cython" "D" "D-ObjDump" "DM"
+    "DTrace" "Dart" "Diff" "Dockerfile" "Dogescript" "Dylan" "E" "ECL" "ECLiPSe"
+    "Eagle" "Eiffel" "Elixir" "Elm" "EmberScript" "Erlang" "FLUX" "FORTRAN"
+    "Factor" "Fancy" "Fantom" "Filterscript" "Formatted" "Forth" "FreeMarker"
+    "Frege" "G-code" "GAMS" "GAP" "GAS" "GDScript" "GLSL" "Genshi" "Glyph"
+    "Gnuplot" "Go" "Golo" "Gosu" "Grace" "Gradle" "Groff" "Groovy" "HCL" "HTML"
+    "HTML+Django" "HTML+EEX" "HTML+ERB" "HTML+PHP" "HTTP" "Hack" "Haml"
+    "Handlebars" "Harbour" "Haskell" "Haxe" "Hy" "HyPhy" "IDL" "INI" "Idris"
+    "Io" "Ioke" "Isabelle" "J" "JFlex" "JSON" "JSON5" "JSONLD" "JSONiq" "JSX"
+    "Jade" "Jasmin" "Java" "JavaScript" "Julia" "KRL" "KiCad" "Kit" "Kotlin"
+    "LFE" "LLVM" "LOLCODE" "LSL" "LabVIEW" "Lasso" "Latte" "Lean" "Less" "Lex"
+    "LilyPond" "Limbo" "Liquid" "LiveScript" "Logos" "Logtalk" "LookML"
+    "LoomScript" "Lua" "M" "MAXScript" "MTML" "MUF" "Makefile" "Mako" "Markdown"
+    "Mask" "Mathematica" "Matlab" "Max" "MediaWiki" "Mercury" "Metal" "MiniD"
+    "Mirah" "Modelica" "Modula-2" "Monkey" "Moocode" "MoonScript" "Myghty" "NCL"
+    "NL" "NSIS" "Nemerle" "NetLinx" "NetLinx+ERB" "NetLogo" "NewLisp" "Nginx"
+    "Nimrod" "Ninja" "Nit" "Nix" "Nu" "NumPy" "OCaml" "ObjDump" "Objective-C"
+    "Objective-C++" "Objective-J" "Omgrofl" "Opa" "Opal" "OpenCL" "OpenSCAD"
+    "Org" "Ox" "Oxygene" "Oz" "PAWN" "PHP" "PLSQL" "PLpgSQL" "Pan" "Papyrus"
+    "Parrot" "Pascal" "Perl" "Perl6" "Pickle" "PicoLisp" "PigLatin" "Pike" "Pod"
+    "PogoScript" "Pony" "PostScript" "PowerShell" "Processing" "Prolog" "Puppet"
+    "PureBasic" "PureScript" "Python" "QML" "QMake" "R" "RAML" "RDoc"
+    "REALbasic" "RHTML" "RMarkdown" "Racket" "Rebol" "Red" "Redcode" "Ren'Py"
+    "RenderScript" "RobotFramework" "Rouge" "Ruby" "Rust" "SAS" "SCSS" "SMT"
+    "SPARQL" "SQF" "SQL" "SQLPL" "STON" "SVG" "Sage" "SaltStack" "Sass" "Scala"
+    "Scaml" "Scheme" "Scilab" "Self" "Shell" "ShellSession" "Shen" "Slash"
+    "Slim" "Smali" "Smalltalk" "Smarty" "SourcePawn" "Squirrel" "Stan" "Stata"
+    "Stylus" "SuperCollider" "Swift" "SystemVerilog" "TOML" "TXL" "Tcl" "Tcsh"
+    "TeX" "Tea" "Text" "Textile" "Thrift" "Turing" "Turtle" "Twig" "TypeScript"
+    "UnrealScript" "UrWeb" "VCL" "VHDL" "Vala" "Verilog" "VimL" "Volt" "Vue"
+    "WebIDL" "X10" "XC" "XML" "XPages" "XProc" "XQuery" "XS" "XSLT" "Xojo"
+    "Xtend" "YAML" "Yacc" "Zephir" "Zimpl" "desktop" "eC" "edn" "fish" "mupad"
+    "nesC" "ooc" "reStructuredText" "wisp" "xBase")
+  "Language specifiers recognized by github's syntax highlighting features.")
+
+(defvar markdown-gfm-used-languages nil
+  "Languages used in the current buffer in GFM code blocks, which are not
+already in `markdown-gfm-recognized-languages' or
+`markdown-gfm-additional-languages'.")
+(make-variable-buffer-local 'markdown-gfm-used-languages)
+(defvar markdown-gfm-last-used-language nil
+  "Last language used in the current buffer in GFM code blocks.")
+(make-variable-buffer-local 'markdown-gfm-last-used-language)
+
+(defun markdown-trim-whitespace (str)
+  (markdown-replace-regexp-in-string
+   "\\(?:[[:space:]\r\n]+\\'\\|\\`[[:space:]\r\n]+\\)" "" str))
+
+(defun markdown-clean-language-string (str)
+  (markdown-replace-regexp-in-string
+   "{\\.?\\|}" "" (markdown-trim-whitespace str)))
+
+(defun markdown-validate-language-string (widget)
+  (let ((str (widget-value widget)))
+    (unless (string= str (markdown-clean-language-string str))
+      (widget-put widget :error (format "Invalid language spec: '%s'" str))
+      widget)))
+
+(defun markdown-gfm-get-corpus ()
+  "Create corpus of recognized GFM code block languages for the given buffer."
+  (let ((given-corpus (append markdown-gfm-additional-languages
+                              markdown-gfm-recognized-languages)))
+    (append
+     markdown-gfm-used-languages
+     (if markdown-gfm-downcase-languages (cl-mapcar #'downcase given-corpus)
+       given-corpus))))
+
+(defun markdown-add-language-if-new (lang)
+  (let* ((cleaned-lang (markdown-clean-language-string lang))
+         (find-result
+          (cl-find cleaned-lang (markdown-gfm-get-corpus)
+                   :test #'equal)))
+    (setq markdown-gfm-last-used-language cleaned-lang)
+    (unless find-result (push cleaned-lang markdown-gfm-used-languages))))
+
+(defun markdown-insert-gfm-code-block (&optional lang)
+  "Insert GFM code block for language LANG.
+If LANG is nil, the language will be queried from user.  If a
+region is active, wrap this region with the markup instead.  If
+the region boundaries are not on empty lines, these are added
+automatically in order to have the correct markup."
+  (interactive
+   (list (let ((completion-ignore-case nil))
+           (condition-case nil
+               (markdown-clean-language-string
+                (completing-read
+                 (format "Programming language [%s]: "
+                         (or markdown-gfm-last-used-language "none"))
+                 (markdown-gfm-get-corpus)
+                 nil 'confirm nil
+                 'markdown-gfm-language-history))
+             (quit "")))))
+  (unless (string= lang "") (markdown-add-language-if-new lang))
+  (when (> (length lang) 0) (setq lang (concat " " lang)))
+  (if (markdown-use-region-p)
+      (let ((b (region-beginning)) (e (region-end)))
+        (goto-char e)
+        ;; if we're on a blank line, don't newline, otherwise the ```
+        ;; should go on its own line
+        (unless (looking-back "\n" nil)
+          (newline))
+        (insert "```")
+        (markdown-ensure-blank-line-after)
+        (goto-char b)
+        ;; if we're on a blank line, insert the quotes here, otherwise
+        ;; add a new line first
+        (unless (looking-at "\n")
+          (newline)
+          (forward-line -1))
+        (markdown-ensure-blank-line-before)
+        (insert "```" lang))
+    (markdown-ensure-blank-line-before)
+    (insert "```" lang "\n\n```")
+    (markdown-ensure-blank-line-after)
+    (forward-line -1)))
+
+(defun markdown-gfm-parse-buffer-for-languages (&optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward markdown-regex-gfm-code-block-open nil t)
+        (let ((lang (match-string-no-properties 2)))
+          (when lang (markdown-add-language-if-new lang)))))))
+
+
+;;; Footnotes ======================================================================
+
+(defun markdown-footnote-counter-inc ()
+  "Increment `markdown-footnote-counter' and return the new value."
+  (when (= markdown-footnote-counter 0) ; hasn't been updated in this buffer yet.
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward (concat "^\\[\\^\\(" markdown-footnote-chars "*?\\)\\]:")
+                                (point-max) t)
+        (let ((fn (string-to-number (match-string 1))))
+          (when (> fn markdown-footnote-counter)
+            (setq markdown-footnote-counter fn))))))
+  (cl-incf markdown-footnote-counter))
+
+(defun markdown-insert-footnote ()
+  "Insert footnote with a new number and move point to footnote definition."
+  (interactive)
+  (let ((fn (markdown-footnote-counter-inc)))
+    (insert (format "[^%d]" fn))
+    (markdown-footnote-text-find-new-location)
+    (markdown-ensure-blank-line-before)
+    (unless (markdown-cur-line-blank-p)
+      (insert "\n"))
+    (insert (format "[^%d]: " fn))
+    (markdown-ensure-blank-line-after)))
+
+(defun markdown-footnote-text-find-new-location ()
+  "Position the cursor at the proper location for a new footnote text."
+  (cond
+   ((eq markdown-footnote-location 'end) (goto-char (point-max)))
+   ((eq markdown-footnote-location 'immediately) (markdown-end-of-block))
+   ((eq markdown-footnote-location 'header) (markdown-end-of-defun))))
+
+(defun markdown-footnote-kill ()
+  "Kill the footnote at point.
+The footnote text is killed (and added to the kill ring), the
+footnote marker is deleted.  Point has to be either at the
+footnote marker or in the footnote text."
+  (interactive)
+  (let ((marker-pos nil)
+        (skip-deleting-marker nil)
+        (starting-footnote-text-positions
+         (markdown-footnote-text-positions)))
+    (when starting-footnote-text-positions
+      ;; We're starting in footnote text, so mark our return position and jump
+      ;; to the marker if possible.
+      (let ((marker-pos (markdown-footnote-find-marker
+                         (cl-first starting-footnote-text-positions))))
+            (if marker-pos
+                (goto-char (1- marker-pos))
+              ;; If there isn't a marker, we still want to kill the text.
+              (setq skip-deleting-marker t))))
+    ;; Either we didn't start in the text, or we started in the text and jumped
+    ;; to the marker. We want to assume we're at the marker now and error if
+    ;; we're not.
+    (unless skip-deleting-marker
+      (let ((marker (markdown-footnote-delete-marker)))
+        (unless marker
+          (error "Not at a footnote"))
+        ;; Even if we knew the text position before, it changed when we deleted
+        ;; the label.
+        (setq marker-pos (cl-second marker))
+        (let ((new-text-pos (markdown-footnote-find-text (cl-first marker))))
+          (unless new-text-pos
+            (error "No text for footnote `%s'" (cl-first marker)))
+          (goto-char new-text-pos))))
+    (let ((pos (markdown-footnote-kill-text)))
+      (goto-char (if starting-footnote-text-positions
+                     pos
+                   marker-pos)))))
+
+(defun markdown-footnote-delete-marker ()
+  "Delete a footnote marker at point.
+Returns a list (ID START) containing the footnote ID and the
+start position of the marker before deletion.  If no footnote
+marker was deleted, this function returns NIL."
+  (let ((marker (markdown-footnote-marker-positions)))
+    (when marker
+      (delete-region (cl-second marker) (cl-third marker))
+      (butlast marker))))
+
+(defun markdown-footnote-kill-text ()
+  "Kill footnote text at point.
+Returns the start position of the footnote text before deletion,
+or NIL if point was not inside a footnote text.
+
+The killed text is placed in the kill ring (without the footnote
+number)."
+  (let ((fn (markdown-footnote-text-positions)))
+    (when fn
+      (let ((text (delete-and-extract-region (cl-second fn) (cl-third fn))))
+        (string-match (concat "\\[\\" (cl-first fn) "\\]:[[:space:]]*\\(\\(.*\n?\\)*\\)") text)
+        (kill-new (match-string 1 text))
+        (when (and (markdown-cur-line-blank-p)
+                   (markdown-prev-line-blank-p)
+                   (not (bobp)))
+          (delete-region (1- (point)) (point)))
+        (cl-second fn)))))
+
+(defun markdown-footnote-goto-text ()
+  "Jump to the text of the footnote at point."
+  (interactive)
+  (let ((fn (car (markdown-footnote-marker-positions))))
+    (unless fn
+      (error "Not at a footnote marker"))
+    (let ((new-pos (markdown-footnote-find-text fn)))
+      (unless new-pos
+        (error "No definition found for footnote `%s'" fn))
+      (goto-char new-pos))))
+
+(defun markdown-footnote-return ()
+  "Return from a footnote to its footnote number in the main text."
+  (interactive)
+  (let ((fn (save-excursion
+              (car (markdown-footnote-text-positions)))))
+    (unless fn
+      (error "Not in a footnote"))
+    (let ((new-pos (markdown-footnote-find-marker fn)))
+      (unless new-pos
+        (error "Footnote marker `%s' not found" fn))
+      (goto-char new-pos))))
+
+(defun markdown-footnote-find-marker (id)
+  "Find the location of the footnote marker with ID.
+The actual buffer position returned is the position directly
+following the marker's closing bracket.  If no marker is found,
+NIL is returned."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward (concat "\\[" id "\\]\\([^:]\\|\\'\\)") nil t)
+      (skip-chars-backward "^]")
+      (point))))
+
+(defun markdown-footnote-find-text (id)
+  "Find the location of the text of footnote ID.
+The actual buffer position returned is the position of the first
+character of the text, after the footnote's identifier.  If no
+footnote text is found, NIL is returned."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward (concat "^\\[" id "\\]:") nil t)
+      (skip-chars-forward "[ \t]")
+      (point))))
+
+(defun markdown-footnote-marker-positions ()
+  "Return the position and ID of the footnote marker point is on.
+The return value is a list (ID START END).  If point is not on a
+footnote, NIL is returned."
+  ;; first make sure we're at a footnote marker
+  (if (or (looking-back (concat "\\[\\^" markdown-footnote-chars "*\\]?") (line-beginning-position))
+          (looking-at (concat "\\[?\\^" markdown-footnote-chars "*?\\]")))
+      (save-excursion
+        ;; move point between [ and ^:
+        (if (looking-at "\\[")
+            (forward-char 1)
+          (skip-chars-backward "^["))
+        (looking-at (concat "\\(\\^" markdown-footnote-chars "*?\\)\\]"))
+        (list (match-string 1) (1- (match-beginning 1)) (1+ (match-end 1))))))
+
+(defun markdown-footnote-text-positions ()
+  "Return the start and end positions of the footnote text point is in.
+The exact return value is a list of three elements: (ID START END).
+The start position is the position of the opening bracket
+of the footnote id.  The end position is directly after the
+newline that ends the footnote.  If point is not in a footnote,
+NIL is returned instead."
+  (save-excursion
+    (let (result)
+      (move-beginning-of-line 1)
+      ;; Try to find the label. If we haven't found the label and we're at a blank
+      ;; or indented line, back up if possible.
+      (while (and
+              (not (and (looking-at markdown-regex-footnote-definition)
+                        (setq result (list (match-string 1) (point)))))
+              (and (not (bobp))
+                   (or (markdown-cur-line-blank-p)
+                       (>= (markdown-cur-line-indent) 4))))
+        (forward-line -1))
+      (when result
+        ; Advance if there is a next line that is either blank or indented.
+        ; (Need to check if we're on the last line, because
+        ; markdown-next-line-blank-p returns true for last line in buffer.)
+        (while (and (/= (line-end-position) (point-max))
+                    (or (markdown-next-line-blank-p)
+                        (>= (markdown-next-line-indent) 4)))
+          (forward-line))
+        ; Move back while the current line is blank.
+        (while (markdown-cur-line-blank-p)
+          (forward-line -1))
+        ; Advance to capture this line and a single trailing newline (if there
+        ; is one).
+        (forward-line)
+        (append result (list (point)))))))
+
+
+;;; Element Removal ===========================================================
+
+(defun markdown-kill-thing-at-point ()
+  "Kill thing at point and add important text, without markup, to kill ring.
+Possible things to kill include (roughly in order of precedence):
+inline code, headers, horizonal rules, links (add link text to
+kill ring), images (add alt text to kill ring), angle uri, email
+addresses, bold, italics, reference definition (add URI to kill
+ring), footnote markers and text (kill both marker and text, add
+text to kill ring), and list items."
+  (interactive "*")
+  (let (val tmp)
+    (cond
+     ;; Inline code
+     ((markdown-code-at-point-p)
+      (kill-new (match-string 2))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; ATX header
+     ((thing-at-point-looking-at markdown-regex-header-atx)
+      (kill-new (match-string 2))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Setext header
+     ((thing-at-point-looking-at markdown-regex-header-setext)
+      (kill-new (match-string 1))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Horizonal rule
+     ((thing-at-point-looking-at markdown-regex-hr)
+      (kill-new (match-string 0))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Inline link or image (add link or alt text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-link-inline)
+      (kill-new (match-string 3))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Reference link or image (add link or alt text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-link-reference)
+      (kill-new (match-string 3))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Angle URI (add URL to kill ring)
+     ((thing-at-point-looking-at markdown-regex-angle-uri)
+      (kill-new (match-string 2))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Email address in angle brackets (add email address to kill ring)
+     ((thing-at-point-looking-at markdown-regex-email)
+      (kill-new (match-string 1))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Wiki link (add alias text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-wiki-link)
+      (kill-new (markdown-wiki-link-alias))
+      (delete-region (match-beginning 1) (match-end 1)))
+     ;; Bold
+     ((thing-at-point-looking-at markdown-regex-bold)
+      (kill-new (match-string 4))
+      (delete-region (match-beginning 2) (match-end 2)))
+     ;; Italics
+     ((thing-at-point-looking-at markdown-regex-italic)
+      (kill-new (match-string 3))
+      (delete-region (match-beginning 1) (match-end 1)))
+     ;; Strikethrough
+     ((thing-at-point-looking-at markdown-regex-strike-through)
+      (kill-new (match-string 4))
+      (delete-region (match-beginning 2) (match-end 2)))
+     ;; Footnote marker (add footnote text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-footnote)
+      (markdown-footnote-kill))
+     ;; Footnote text (add footnote text to kill ring)
+     ((setq val (markdown-footnote-text-positions))
+      (markdown-footnote-kill))
+     ;; Reference definition (add URL to kill ring)
+     ((thing-at-point-looking-at markdown-regex-reference-definition)
+      (kill-new (match-string 5))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; List item
+     ((setq val (markdown-cur-list-item-bounds))
+      (kill-new (delete-and-extract-region (cl-first val) (cl-second val))))
+     (t
+      (error "Nothing found at point to kill")))))
+
+
+;;; Indentation ====================================================================
+
+(defun markdown-indent-find-next-position (cur-pos positions)
+  "Return the position after the index of CUR-POS in POSITIONS.
+Positions are calculated by `markdown-calc-indents'."
+  (while (and positions
+              (not (equal cur-pos (car positions))))
+    (setq positions (cdr positions)))
+  (or (cadr positions) 0))
+
+(defun markdown-exdent-find-next-position (cur-pos positions)
+  "Return the maximal element that precedes CUR-POS from POSITIONS.
+Positions are calculated by `markdown-calc-indents'."
+  (let ((result 0))
+    (dolist (i positions)
+      (when (< i cur-pos)
+        (setq result (max result i))))
+    result))
+
+(defun markdown-indent-line ()
+  "Indent the current line using some heuristics.
+If the _previous_ command was either `markdown-enter-key' or
+`markdown-cycle', then we should cycle to the next
+reasonable indentation position.  Otherwise, we could have been
+called directly by `markdown-enter-key', by an initial call of
+`markdown-cycle', or indirectly by `auto-fill-mode'.  In
+these cases, indent to the default position.
+Positions are calculated by `markdown-calc-indents'."
+  (interactive)
+  (let ((positions (markdown-calc-indents))
+        (cur-pos (current-column)))
+    (if (not (equal this-command 'markdown-cycle))
+        (indent-line-to (car positions))
+      (setq positions (sort (delete-dups positions) '<))
+      (indent-line-to
+       (markdown-indent-find-next-position cur-pos positions)))))
+
+(defun markdown-calc-indents ()
+  "Return a list of indentation columns to cycle through.
+The first element in the returned list should be considered the
+default indentation level.  This function does not worry about
+duplicate positions, which are handled up by calling functions."
+  (let (pos prev-line-pos positions)
+
+    ;; Indentation of previous line
+    (setq prev-line-pos (markdown-prev-line-indent))
+    (setq positions (cons prev-line-pos positions))
+
+    ;; Indentation of previous non-list-marker text
+    (when (setq pos (markdown-prev-non-list-indent))
+      (setq positions (cons pos positions)))
+
+    ;; Indentation required for a pre block in current context
+    (setq pos (length (markdown-pre-indentation (point))))
+    (setq positions (cons pos positions))
+
+    ;; Indentation of the previous line + tab-width
+    (if prev-line-pos
+        (setq positions (cons (+ prev-line-pos tab-width) positions))
+      (setq positions (cons tab-width positions)))
+
+    ;; Indentation of the previous line - tab-width
+    (if (and prev-line-pos (> prev-line-pos tab-width))
+        (setq positions (cons (- prev-line-pos tab-width) positions)))
+
+    ;; Indentation of all preceeding list markers (when in a list)
+    (when (setq pos (markdown-calculate-list-levels))
+      (setq positions (append pos positions)))
+
+    ;; First column
+    (setq positions (cons 0 positions))
+
+    ;; Return reversed list
+    (reverse positions)))
+
+(defun markdown-enter-key ()
+  "Handle RET according to to the value of `markdown-indent-on-enter'."
+  (interactive)
+  (newline)
+  (when markdown-indent-on-enter
+    (markdown-indent-line)))
+
+(defun markdown-exdent-or-delete (arg)
+  "Handle BACKSPACE by cycling through indentation points.
+When BACKSPACE is pressed, if there is only whitespace
+before the current point, then exdent the line one level.
+Otherwise, do normal delete by repeating
+`backward-delete-char-untabify' ARG times."
+  (interactive "*p")
+  (let ((cur-pos (current-column))
+        (start-of-indention (save-excursion
+                              (back-to-indentation)
+                              (current-column)))
+        (positions (markdown-calc-indents)))
+    (if (and (> cur-pos 0) (= cur-pos start-of-indention))
+        (indent-line-to (markdown-exdent-find-next-position cur-pos positions))
+      (backward-delete-char-untabify arg))))
+
+(defun markdown-find-leftmost-column (beg end)
+  "Find the leftmost column in the region from BEG to END."
+  (let ((mincol 1000))
+    (save-excursion
+      (goto-char beg)
+      (while (< (point) end)
+        (back-to-indentation)
+        (unless (looking-at "[ \t]*$")
+          (setq mincol (min mincol (current-column))))
+        (forward-line 1)
+        ))
+    mincol))
+
+(defun markdown-indent-region (beg end arg)
+  "Indent the region from BEG to END using some heuristics.
+When ARG is non-nil, exdent the region instead.
+See `markdown-indent-line' and `markdown-indent-line'."
+  (interactive "*r\nP")
+  (let* ((positions (sort (delete-dups (markdown-calc-indents)) '<))
+         (leftmostcol (markdown-find-leftmost-column beg end))
+         (next-pos (if arg
+                       (markdown-exdent-find-next-position leftmostcol positions)
+                     (markdown-indent-find-next-position leftmostcol positions))))
+    (indent-rigidly beg end (- next-pos leftmostcol))
+    (setq deactivate-mark nil)))
+
+(defun markdown-exdent-region (beg end)
+  "Call `markdown-indent-region' on region from BEG to END with prefix."
+  (interactive "*r")
+  (markdown-indent-region (region-beginning) (region-end) t))
+
+
+;;; Markup Completion =========================================================
+
+(defconst markdown-complete-alist
+  '((markdown-regex-header-atx . markdown-complete-atx)
+    (markdown-regex-header-setext . markdown-complete-setext)
+    (markdown-regex-hr . markdown-complete-hr))
+  "Association list of form (regexp . function) for markup completion.")
+
+(defun markdown-incomplete-atx-p ()
+  "Return t if ATX header markup is incomplete and nil otherwise.
+Assumes match data is available for `markdown-regex-header-atx'.
+Checks that the number of trailing hash marks equals the number of leading
+hash marks, that there is only a single space before and after the text,
+and that there is no extraneous whitespace in the text."
+  (save-match-data
+    (or
+     ;; Number of starting and ending hash marks differs
+     (not (= (length (match-string 1)) (length (match-string 3))))
+     ;; When the header text is not empty...
+     (and (> (length (match-string 2)) 0)
+          ;; ...if there are extra leading, trailing, or interior spaces
+          (or (not (= (match-beginning 2) (1+ (match-end 1))))
+              (not (= (match-beginning 3) (1+ (match-end 2))))
+              (string-match "[ \t\n]\\{2\\}" (match-string 2))))
+     ;; When the header text is empty...
+     (and (= (length (match-string 2)) 0)
+          ;; ...if there are too many or too few spaces
+          (not (= (match-beginning 3) (+ (match-end 1) 2)))))))
+
+(defun markdown-complete-atx ()
+  "Complete and normalize ATX headers.
+Add or remove hash marks to the end of the header to match the
+beginning.  Ensure that there is only a single space between hash
+marks and header text.  Removes extraneous whitespace from header text.
+Assumes match data is available for `markdown-regex-header-atx'.
+Return nil if markup was complete and non-nil if markup was completed."
+  (when (markdown-incomplete-atx-p)
+    (let* ((new-marker (make-marker))
+           (new-marker (set-marker new-marker (match-end 2))))
+      ;; Hash marks and spacing at end
+      (goto-char (match-end 2))
+      (delete-region (match-end 2) (match-end 3))
+      (insert " " (match-string 1))
+      ;; Remove extraneous whitespace from title
+      (replace-match (markdown-compress-whitespace-string (match-string 2))
+                     t t nil 2)
+      ;; Spacing at beginning
+      (goto-char (match-end 1))
+      (delete-region (match-end 1) (match-beginning 2))
+      (insert " ")
+      ;; Leave point at end of text
+      (goto-char new-marker))))
+
+(defun markdown-incomplete-setext-p ()
+  "Return t if setext header markup is incomplete and nil otherwise.
+Assumes match data is available for `markdown-regex-header-setext'.
+Checks that length of underline matches text and that there is no
+extraneous whitespace in the text."
+  (save-match-data
+    (or (not (= (length (match-string 1)) (length (match-string 2))))
+        (string-match "[ \t\n]\\{2\\}" (match-string 1)))))
+
+(defun markdown-complete-setext ()
+  "Complete and normalize setext headers.
+Add or remove underline characters to match length of header
+text.  Removes extraneous whitespace from header text.  Assumes
+match data is available for `markdown-regex-header-setext'.
+Return nil if markup was complete and non-nil if markup was completed."
+  (when (markdown-incomplete-setext-p)
+    (let* ((text (markdown-compress-whitespace-string (match-string 1)))
+           (char (char-after (match-beginning 2)))
+           (level (if (char-equal char ?-) 2 1)))
+      (goto-char (match-beginning 0))
+      (delete-region (match-beginning 0) (match-end 0))
+      (markdown-insert-header level text t)
+      t)))
+
+(defun markdown-incomplete-hr-p ()
+  "Return non-nil if hr is not in `markdown-hr-strings' and nil otherwise.
+Assumes match data is available for `markdown-regex-hr'."
+  (not (member (match-string 0) markdown-hr-strings)))
+
+(defun markdown-complete-hr ()
+  "Complete horizontal rules.
+If horizontal rule string is a member of `markdown-hr-strings',
+do nothing.  Otherwise, replace with the car of
+`markdown-hr-strings'.
+Assumes match data is available for `markdown-regex-hr'.
+Return nil if markup was complete and non-nil if markup was completed."
+  (when (markdown-incomplete-hr-p)
+    (replace-match (car markdown-hr-strings))
+    t))
+
+(defun markdown-complete ()
+  "Complete markup of object near point or in region when active.
+Handle all objects in `markdown-complete-alist', in order.
+See `markdown-complete-at-point' and `markdown-complete-region'."
+  (interactive "*")
+  (if (markdown-use-region-p)
+      (markdown-complete-region (region-beginning) (region-end))
+    (markdown-complete-at-point)))
+
+(defun markdown-complete-at-point ()
+  "Complete markup of object near point.
+Handle all elements of `markdown-complete-alist' in order."
+  (interactive "*")
+  (let ((list markdown-complete-alist) found changed)
+    (while list
+      (let ((regexp (eval (caar list)))
+            (function (cdar list)))
+        (setq list (cdr list))
+        (when (thing-at-point-looking-at regexp)
+          (setq found t)
+          (setq changed (funcall function))
+          (setq list nil))))
+    (if found
+        (or changed (error "Markup at point is complete"))
+      (error "Nothing to complete at point"))))
+
+(defun markdown-complete-region (beg end)
+  "Complete markup of objects in region from BEG to END.
+Handle all objects in `markdown-complete-alist', in order.  Each
+match is checked to ensure that a previous regexp does not also
+match."
+  (interactive "*r")
+  (let ((end-marker (set-marker (make-marker) end))
+        previous)
+    (dolist (element markdown-complete-alist)
+      (let ((regexp (eval (car element)))
+            (function (cdr element)))
+        (goto-char beg)
+        (while (re-search-forward regexp end-marker 'limit)
+          (when (match-string 0)
+            ;; Make sure this is not a match for any of the preceding regexps.
+            ;; This prevents mistaking an HR for a Setext subheading.
+            (let (match)
+              (save-match-data
+                (dolist (prev-regexp previous)
+                  (or match (setq match (looking-back prev-regexp nil)))))
+              (unless match
+                (save-excursion (funcall function))))))
+        (add-to-list 'previous regexp)))))
+
+(defun markdown-complete-buffer ()
+  "Complete markup for all objects in the current buffer."
+  (interactive "*")
+  (markdown-complete-region (point-min) (point-max)))
+
+
+;;; Markup Cycling ============================================================
+
+(defun markdown-cycle-atx (arg &optional remove)
+  "Cycle ATX header markup.
+Promote header (decrease level) when ARG is 1 and demote
+header (increase level) if arg is -1.  When REMOVE is non-nil,
+remove the header when the level reaches zero and stop cycling
+when it reaches six.  Otherwise, perform a proper cycling through
+levels one through six.  Assumes match data is available for
+`markdown-regex-header-atx'."
+  (let* ((old-level (length (match-string 1)))
+         (new-level (+ old-level arg))
+         (text (match-string 2)))
+    (when (not remove)
+      (setq new-level (% new-level 6))
+      (setq new-level (cond ((= new-level 0) 6)
+                            ((< new-level 0) (+ new-level 6))
+                            (t new-level))))
+    (cond
+     ((= new-level 0)
+      (markdown-unwrap-thing-at-point nil 0 2))
+     ((<= new-level 6)
+      (goto-char (match-beginning 0))
+      (delete-region (match-beginning 0) (match-end 0))
+      (markdown-insert-header new-level text nil)))))
+
+(defun markdown-cycle-setext (arg &optional remove)
+  "Cycle setext header markup.
+Promote header (increase level) when ARG is 1 and demote
+header (decrease level or remove) if arg is -1.  When demoting a
+level-two setext header, replace with a level-three atx header.
+When REMOVE is non-nil, remove the header when the level reaches
+zero.  Otherwise, cycle back to a level six atx header.  Assumes
+match data is available for `markdown-regex-header-setext'."
+  (let* ((char (char-after (match-beginning 2)))
+         (old-level (if (char-equal char ?=) 1 2))
+         (new-level (+ old-level arg))
+         (text (match-string 1)))
+    (when (and (not remove) (= new-level 0))
+      (setq new-level 6))
+    (cond
+     ((= new-level 0)
+      (markdown-unwrap-thing-at-point nil 0 1))
+     ((<= new-level 2)
+      (markdown-insert-header new-level nil t))
+     ((<= new-level 6)
+      (markdown-insert-header new-level nil nil)))))
+
+(defun markdown-cycle-hr (arg &optional remove)
+  "Cycle string used for horizontal rule from `markdown-hr-strings'.
+When ARG is 1, cycle forward (demote), and when ARG is -1, cycle
+backwards (promote).  When REMOVE is non-nil, remove the hr instead
+of cycling when the end of the list is reached.
+Assumes match data is available for `markdown-regex-hr'."
+  (let* ((strings (if (= arg -1)
+                      (reverse markdown-hr-strings)
+                    markdown-hr-strings))
+         (tail (member (match-string 0) strings))
+         (new (or (cadr tail)
+                  (if remove
+                      (if (= arg 1)
+                          ""
+                        (car tail))
+                    (car strings)))))
+    (replace-match new)))
+
+(defun markdown-cycle-bold ()
+  "Cycle bold markup between underscores and asterisks.
+Assumes match data is available for `markdown-regex-bold'."
+  (save-excursion
+    (let* ((old-delim (match-string 3))
+           (new-delim (if (string-equal old-delim "**") "__" "**")))
+      (replace-match new-delim t t nil 3)
+      (replace-match new-delim t t nil 5))))
+
+(defun markdown-cycle-italic ()
+  "Cycle italic markup between underscores and asterisks.
+Assumes match data is available for `markdown-regex-italic'."
+  (save-excursion
+    (let* ((old-delim (match-string 2))
+           (new-delim (if (string-equal old-delim "*") "_" "*")))
+      (replace-match new-delim t t nil 2)
+      (replace-match new-delim t t nil 4))))
+
+
+;;; Keymap ====================================================================
+
+(defvar markdown-mode-map
+  (let ((map (make-keymap)))
+    ;; Element insertion
+    (define-key map "\C-c\C-al" 'markdown-insert-link)
+    (define-key map "\C-c\C-aL" 'markdown-insert-reference-link-dwim)
+    (define-key map "\C-c\C-au" 'markdown-insert-uri)
+    (define-key map "\C-c\C-af" 'markdown-insert-footnote)
+    (define-key map "\C-c\C-aw" 'markdown-insert-wiki-link)
+    (define-key map "\C-c\C-ii" 'markdown-insert-image)
+    (define-key map "\C-c\C-iI" 'markdown-insert-reference-image)
+    (define-key map "\C-c\C-th" 'markdown-insert-header-dwim)
+    (define-key map "\C-c\C-tH" 'markdown-insert-header-setext-dwim)
+    (define-key map "\C-c\C-t1" 'markdown-insert-header-atx-1)
+    (define-key map "\C-c\C-t2" 'markdown-insert-header-atx-2)
+    (define-key map "\C-c\C-t3" 'markdown-insert-header-atx-3)
+    (define-key map "\C-c\C-t4" 'markdown-insert-header-atx-4)
+    (define-key map "\C-c\C-t5" 'markdown-insert-header-atx-5)
+    (define-key map "\C-c\C-t6" 'markdown-insert-header-atx-6)
+    (define-key map "\C-c\C-t!" 'markdown-insert-header-setext-1)
+    (define-key map "\C-c\C-t@" 'markdown-insert-header-setext-2)
+    (define-key map "\C-c\C-ss" 'markdown-insert-bold)
+    (define-key map "\C-c\C-se" 'markdown-insert-italic)
+    (define-key map "\C-c\C-sc" 'markdown-insert-code)
+    (define-key map "\C-c\C-sb" 'markdown-insert-blockquote)
+    (define-key map "\C-c\C-sk" 'markdown-insert-kbd)
+    (define-key map "\C-c\C-s\C-b" 'markdown-blockquote-region)
+    (define-key map "\C-c\C-sp" 'markdown-insert-pre)
+    (define-key map "\C-c\C-s\C-p" 'markdown-pre-region)
+    (define-key map "\C-c\C-sP" 'markdown-insert-gfm-code-block)
+    (define-key map "\C-c-" 'markdown-insert-hr)
+    ;; Element insertion (deprecated)
+    (define-key map "\C-c\C-ar" 'markdown-insert-reference-link-dwim)
+    (define-key map "\C-c\C-tt" 'markdown-insert-header-setext-1)
+    (define-key map "\C-c\C-ts" 'markdown-insert-header-setext-2)
+    ;; Element removal
+    (define-key map (kbd "C-c C-k") 'markdown-kill-thing-at-point)
+    ;; Promotion, Demotion, Completion, and Cycling
+    (define-key map (kbd "C-c C--") 'markdown-promote)
+    (define-key map (kbd "C-c C-=") 'markdown-demote)
+    (define-key map (kbd "C-c C-]") 'markdown-complete)
+    ;; Following and Jumping
+    (define-key map (kbd "C-c C-o") 'markdown-follow-thing-at-point)
+    (define-key map (kbd "C-c C-l") 'markdown-jump)
+    ;; Indentation
+    (define-key map (kbd "C-m") 'markdown-enter-key)
+    (define-key map (kbd "DEL") 'markdown-exdent-or-delete)
+    (define-key map (kbd "C-c >") 'markdown-indent-region)
+    (define-key map (kbd "C-c <") 'markdown-exdent-region)
+    ;; Visibility cycling
+    (define-key map (kbd "TAB") 'markdown-cycle)
+    (define-key map (kbd "<S-iso-lefttab>") 'markdown-shifttab)
+    (define-key map (kbd "<S-tab>")  'markdown-shifttab)
+    (define-key map (kbd "<backtab>") 'markdown-shifttab)
+    ;; Header navigation
+    (define-key map (kbd "C-c C-n") 'markdown-next-visible-heading)
+    (define-key map (kbd "C-c C-p") 'markdown-previous-visible-heading)
+    (define-key map (kbd "C-c C-f") 'markdown-forward-same-level)
+    (define-key map (kbd "C-c C-b") 'markdown-backward-same-level)
+    (define-key map (kbd "C-c C-u") 'markdown-up-heading)
+    ;; Buffer-wide commands
+    (define-key map (kbd "C-c C-c m") 'markdown-other-window)
+    (define-key map (kbd "C-c C-c p") 'markdown-preview)
+    (define-key map (kbd "C-c C-c e") 'markdown-export)
+    (define-key map (kbd "C-c C-c v") 'markdown-export-and-preview)
+    (define-key map (kbd "C-c C-c o") 'markdown-open)
+    (define-key map (kbd "C-c C-c l") 'markdown-live-preview-mode)
+    (define-key map (kbd "C-c C-c w") 'markdown-kill-ring-save)
+    (define-key map (kbd "C-c C-c c") 'markdown-check-refs)
+    (define-key map (kbd "C-c C-c n") 'markdown-cleanup-list-numbers)
+    (define-key map (kbd "C-c C-c ]") 'markdown-complete-buffer)
+    ;; List editing
+    (define-key map (kbd "M-<up>") 'markdown-move-up)
+    (define-key map (kbd "M-<down>") 'markdown-move-down)
+    (define-key map (kbd "M-<left>") 'markdown-promote)
+    (define-key map (kbd "M-<right>") 'markdown-demote)
+    (define-key map (kbd "M-<return>") 'markdown-insert-list-item)
+    (define-key map (kbd "C-c C-j") 'markdown-insert-list-item)
+    ;; Subtree editing
+    (define-key map (kbd "M-S-<up>") 'markdown-move-subtree-up)
+    (define-key map (kbd "M-S-<down>") 'markdown-move-subtree-down)
+    (define-key map (kbd "M-S-<left>") 'markdown-promote-subtree)
+    (define-key map (kbd "M-S-<right>") 'markdown-demote-subtree)
+    ;; Movement
+    (define-key map (kbd "M-{") 'markdown-backward-paragraph)
+    (define-key map (kbd "M-}") 'markdown-forward-paragraph)
+    (define-key map (kbd "M-n") 'markdown-next-link)
+    (define-key map (kbd "M-p") 'markdown-previous-link)
+    ;; Alternative keys (in case of problems with the arrow keys)
+    (define-key map (kbd "C-c C-x u") 'markdown-move-up)
+    (define-key map (kbd "C-c C-x d") 'markdown-move-down)
+    (define-key map (kbd "C-c C-x l") 'markdown-promote)
+    (define-key map (kbd "C-c C-x r") 'markdown-demote)
+    (define-key map (kbd "C-c C-x m") 'markdown-insert-list-item)
+    map)
+  "Keymap for Markdown major mode.")
+
+(defvar gfm-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map markdown-mode-map)
+    (define-key map (kbd "C-c C-s d") 'markdown-insert-strike-through)
+    (define-key map "`" 'markdown-electric-backquote)
+    map)
+  "Keymap for `gfm-mode'.
+See also `markdown-mode-map'.")
+
+
+;;; Menu ==================================================================
+
+(easy-menu-define markdown-mode-menu markdown-mode-map
+  "Menu for Markdown mode"
+  '("Markdown"
+    ("Show/Hide"
+     ["Cycle visibility" markdown-cycle (markdown-on-heading-p)]
+     ["Cycle global visibility" markdown-shifttab])
+    "---"
+    ["Compile" markdown-other-window]
+    ["Preview" markdown-preview]
+    ["Export" markdown-export]
+    ["Export & View" markdown-export-and-preview]
+    ["Open" markdown-open]
+    ["Live Export" markdown-live-preview-mode
+     :style toggle :selected markdown-live-preview-mode]
+    ["Kill ring save" markdown-kill-ring-save]
+    "---"
+    ("Headings"
+     ["Automatic" markdown-insert-header-dwim]
+     ["Automatic (prefer setext)" markdown-insert-header-setext-dwim]
+     "---"
+     ["First level setext" markdown-insert-header-setext-1]
+     ["Second level setext" markdown-insert-header-setext-2]
+     "---"
+     ["First level atx" markdown-insert-header-atx-1]
+     ["Second level atx" markdown-insert-header-atx-2]
+     ["Third level atx" markdown-insert-header-atx-3]
+     ["Fourth level atx" markdown-insert-header-atx-4]
+     ["Fifth level atx" markdown-insert-header-atx-5]
+     ["Sixth level atx" markdown-insert-header-atx-6])
+    "---"
+    ["Bold" markdown-insert-bold]
+    ["Italic" markdown-insert-italic]
+    ["Strikethrough" markdown-insert-strike-through]
+    ["Blockquote" markdown-insert-blockquote]
+    ["Preformatted" markdown-insert-pre]
+    ["Code" markdown-insert-code]
+    "---"
+    ["Insert inline link" markdown-insert-link]
+    ["Insert reference link" markdown-insert-reference-link-dwim]
+    ["Insert URL" markdown-insert-uri]
+    ["Insert inline image" markdown-insert-image]
+    ["Insert reference image" markdown-insert-reference-image]
+    ["Insert list item" markdown-insert-list-item]
+    ["Insert horizontal rule" markdown-insert-hr]
+    ["Insert footnote" markdown-insert-footnote]
+    ["Kill element" markdown-kill-thing-at-point]
+    "---"
+    ["Jump" markdown-jump]
+    ["Follow link" markdown-follow-thing-at-point]
+    ("Outline"
+     ["Next visible heading" markdown-next-visible-heading]
+     ["Previous visible heading" markdown-previous-visible-heading]
+     ["Forward same level" markdown-forward-same-level]
+     ["Backward same level" markdown-backward-same-level]
+     ["Up to parent heading" markdown-up-heading])
+    "---"
+    ("Completion and Cycling"
+     ["Complete" markdown-complete]
+     ["Promote" markdown-promote]
+     ["Demote" markdown-demote])
+    ("List editing"
+     ["Indent list item" markdown-demote]
+     ["Exdent list item" markdown-promote])
+    ("Region shifting"
+     ["Indent region" markdown-indent-region]
+     ["Exdent region" markdown-exdent-region])
+    "---"
+    ["Check references" markdown-check-refs]
+    ["Clean up list numbering" markdown-cleanup-list-numbers]
+    ["Complete markup" markdown-complete-buffer]
+    "---"
+    ["Version" markdown-show-version]
+    ))
+
+
+;;; imenu =====================================================================
+
+(defun markdown-imenu-create-nested-index ()
+  "Create and return a nested imenu index alist for the current buffer.
+See `imenu-create-index-function' and `imenu--index-alist' for details."
+  (let* ((root '(nil . nil))
+         cur-alist
+         (cur-level 0)
+         (empty-heading "-")
+         (self-heading ".")
+         hashes pos level heading)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward markdown-regex-header (point-max) t)
+        (unless (markdown-code-block-at-point)
+          (cond
+           ((setq heading (match-string-no-properties 1))
+            (setq pos (match-beginning 1)
+                  level 1))
+           ((setq heading (match-string-no-properties 3))
+            (setq pos (match-beginning 3)
+                  level 2))
+           ((setq hashes (match-string-no-properties 5))
+            (setq heading (match-string-no-properties 6)
+                  pos (match-beginning 5)
+                  level (length hashes))))
+          (let ((alist (list (cons heading pos))))
+            (cond
+             ((= cur-level level)       ; new sibling
+              (setcdr cur-alist alist)
+              (setq cur-alist alist))
+             ((< cur-level level)       ; first child
+              (dotimes (i (- level cur-level 1))
+                (setq alist (list (cons empty-heading alist))))
+              (if cur-alist
+                  (let* ((parent (car cur-alist))
+                         (self-pos (cdr parent)))
+                    (setcdr parent (cons (cons self-heading self-pos) alist)))
+                (setcdr root alist))    ; primogenitor
+              (setq cur-alist alist)
+              (setq cur-level level))
+             (t                         ; new sibling of an ancestor
+              (let ((sibling-alist (last (cdr root))))
+                (dotimes (i (1- level))
+                  (setq sibling-alist (last (cdar sibling-alist))))
+                (setcdr sibling-alist alist)
+                (setq cur-alist alist))
+              (setq cur-level level))))))
+      (cdr root))))
+
+(defun markdown-imenu-create-flat-index ()
+  "Create and return a flat imenu index alist for the current buffer.
+See `imenu-create-index-function' and `imenu--index-alist' for details."
+  (let* ((empty-heading "-") index heading pos)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward markdown-regex-header (point-max) t)
+        (cond
+         ((setq heading (match-string-no-properties 1))
+          (setq pos (match-beginning 1)))
+         ((setq heading (match-string-no-properties 3))
+          (setq pos (match-beginning 3)))
+         ((setq heading (match-string-no-properties 6))
+          (setq pos (match-beginning 5))))
+        (or (> (length heading) 0)
+            (setq heading empty-heading))
+        (setq index (append index (list (cons heading pos)))))
+      index)))
+
+
+;;; References ================================================================
+
+(defun markdown-reference-goto-definition ()
+  "Jump to the definition of the reference at point or create it."
+  (interactive)
+  (when (thing-at-point-looking-at markdown-regex-link-reference)
+    (let* ((text (match-string-no-properties 3))
+           (reference (match-string-no-properties 6))
+           (target (downcase (if (string= reference "") text reference)))
+           (loc (cadr (markdown-reference-definition target))))
+      (if loc
+          (goto-char loc)
+        (goto-char (match-beginning 0))
+        (markdown-insert-reference-definition target)))))
+
+(defun markdown-reference-find-links (reference)
+  "Return a list of all links for REFERENCE.
+REFERENCE should not include the surrounding square brackets.
+Elements of the list have the form (text start line), where
+text is the link text, start is the location at the beginning of
+the link, and line is the line number on which the link appears."
+  (let* ((ref-quote (regexp-quote reference))
+         (regexp (format "!?\\(?:\\[\\(%s\\)\\][ ]?\\[\\]\\|\\[\\([^]]+?\\)\\][ ]?\\[%s\\]\\)"
+                         ref-quote ref-quote))
+         links)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward regexp nil t)
+        (let* ((text (or (match-string-no-properties 1)
+                         (match-string-no-properties 2)))
+               (start (match-beginning 0))
+               (line (markdown-line-number-at-pos)))
+          (add-to-list 'links (list text start line)))))
+    links))
+
+(defun markdown-get-undefined-refs ()
+  "Return a list of undefined Markdown references.
+Result is an alist of pairs (reference . occurrences), where
+occurrences is itself another alist of pairs (label . line-number).
+For example, an alist corresponding to [Nice editor][Emacs] at line 12,
+\[GNU Emacs][Emacs] at line 45 and [manual][elisp] at line 127 is
+\((\"emacs\" (\"Nice editor\" . 12) (\"GNU Emacs\" . 45)) (\"elisp\" (\"manual\" . 127)))."
+  (let ((missing))
+    (save-excursion
+      (goto-char (point-min))
+      (while
+          (re-search-forward markdown-regex-link-reference nil t)
+        (let* ((text (match-string-no-properties 3))
+               (reference (match-string-no-properties 6))
+               (target (downcase (if (string= reference "") text reference))))
+          (unless (markdown-reference-definition target)
+            (let ((entry (assoc target missing)))
+              (if (not entry)
+                  (add-to-list 'missing (cons target
+                                              (list (cons text (markdown-line-number-at-pos)))) t)
+                (setcdr entry
+                        (append (cdr entry) (list (cons text (markdown-line-number-at-pos))))))))))
+      missing)))
+
+(defconst markdown-reference-check-buffer
+  "*Undefined references for %buffer%*"
+  "Pattern for name of buffer for listing undefined references.
+The string %buffer% will be replaced by the corresponding
+`markdown-mode' buffer name.")
+
+(defun markdown-reference-check-buffer (&optional buffer-name)
+  "Name and return buffer for reference checking.
+BUFFER-NAME is the name of the main buffer being visited."
+  (or buffer-name (setq buffer-name (buffer-name)))
+  (let ((refbuf (get-buffer-create (markdown-replace-regexp-in-string
+                                    "%buffer%" buffer-name
+                                    markdown-reference-check-buffer))))
+    (with-current-buffer refbuf
+      (when view-mode
+        (View-exit-and-edit))
+      (use-local-map button-buffer-map)
+      (erase-buffer))
+    refbuf))
+
+(defconst markdown-reference-links-buffer
+  "*Reference links for %buffer%*"
+  "Pattern for name of buffer for listing references.
+The string %buffer% will be replaced by the corresponding buffer name.")
+
+(defun markdown-reference-links-buffer (&optional buffer-name)
+  "Name, setup, and return a buffer for listing links.
+BUFFER-NAME is the name of the main buffer being visited."
+  (or buffer-name (setq buffer-name (buffer-name)))
+  (let ((linkbuf (get-buffer-create (markdown-replace-regexp-in-string
+                                     "%buffer%" buffer-name
+                                     markdown-reference-links-buffer))))
+    (with-current-buffer linkbuf
+      (when view-mode
+        (View-exit-and-edit))
+      (use-local-map button-buffer-map)
+      (erase-buffer))
+    linkbuf))
+
+(when (markdown-use-buttons-p)
+  ;; Add an empty Markdown reference definition to buffer
+  ;; specified in the 'target-buffer property.  The reference name is
+  ;; the button's label.
+  (define-button-type 'markdown-undefined-reference-button
+    'help-echo "mouse-1, RET: create definition for undefined reference"
+    'follow-link t
+    'face 'bold
+    'action (lambda (b)
+              (let ((buffer (button-get b 'target-buffer))
+                    (line (button-get b 'target-line))
+                    (label (button-label b)))
+                (switch-to-buffer-other-window buffer)
+                (goto-char (point-min))
+                (forward-line line)
+                (markdown-insert-reference-definition label)
+                (markdown-check-refs t))))
+
+  ;; Jump to line in buffer specified by 'target-buffer property.
+  ;; Line number is button's 'line property.
+  (define-button-type 'markdown-goto-line-button
+    'help-echo "mouse-1, RET: go to line"
+    'follow-link t
+    'face 'italic
+    'action (lambda (b)
+              (message (button-get b 'buffer))
+              (switch-to-buffer-other-window (button-get b 'target-buffer))
+              ;; use call-interactively to silence compiler
+              (let ((current-prefix-arg (button-get b 'target-line)))
+                (call-interactively 'goto-line))))
+
+  ;; Jumps to a particular link at location given by 'target-char
+  ;; property in buffer given by 'target-buffer property.
+  (define-button-type 'markdown-link-button
+    'help-echo "mouse-1, RET: jump to location of link"
+    'follow-link t
+    'face 'bold
+    'action (lambda (b)
+              (let ((target (button-get b 'target-buffer))
+                    (loc (button-get b 'target-char)))
+                (kill-buffer-and-window)
+                (switch-to-buffer target)
+                (goto-char loc)))))
+
+(defun markdown-insert-undefined-reference-button (reference oldbuf)
+  "Insert a button for creating REFERENCE in buffer OLDBUF.
+REFERENCE should be a list of the form (reference . occurrences),
+as by `markdown-get-undefined-refs'."
+  (let ((label (car reference)))
+    (if (markdown-use-buttons-p)
+        ;; Create a reference button in Emacs 22
+        (insert-button label
+                       :type 'markdown-undefined-reference-button
+                       'target-buffer oldbuf
+                       'target-line (cdr (car (cdr reference))))
+      ;; Insert reference as text in Emacs < 22
+      (insert label))
+    (insert " (")
+    (dolist (occurrence (cdr reference))
+      (let ((line (cdr occurrence)))
+        (if (markdown-use-buttons-p)
+            ;; Create a line number button in Emacs 22
+            (insert-button (number-to-string line)
+                           :type 'markdown-goto-line-button
+                           'target-buffer oldbuf
+                           'target-line line)
+          ;; Insert line number as text in Emacs < 22
+          (insert (number-to-string line)))
+        (insert " ")))
+    (delete-char -1)
+    (insert ")")
+    (newline)))
+
+(defun markdown-insert-link-button (link oldbuf)
+  "Insert a button for jumping to LINK in buffer OLDBUF.
+LINK should be a list of the form (text char line) containing
+the link text, location, and line number."
+  (let ((label (cl-first link))
+        (char (cl-second link))
+        (line (cl-third link)))
+    (if (markdown-use-buttons-p)
+        ;; Create a reference button in Emacs 22
+        (insert-button label
+                       :type 'markdown-link-button
+                       'target-buffer oldbuf
+                       'target-char char)
+      ;; Insert reference as text in Emacs < 22
+      (insert label))
+    (insert (format " (line %d)\n" line))))
+
+(defun markdown-reference-goto-link (&optional reference)
+  "Jump to the location of the first use of REFERENCE."
+  (interactive)
+  (unless reference
+    (if (thing-at-point-looking-at markdown-regex-reference-definition)
+        (setq reference (match-string-no-properties 2))
+      (error "No reference definition at point")))
+  (let ((links (markdown-reference-find-links reference)))
+    (cond ((= (length links) 1)
+           (goto-char (cadr (car links))))
+          ((> (length links) 1)
+           (let ((oldbuf (current-buffer))
+                 (linkbuf (markdown-reference-links-buffer)))
+             (with-current-buffer linkbuf
+               (insert "Links using reference " reference ":\n\n")
+               (dolist (link (reverse links))
+                 (markdown-insert-link-button link oldbuf)))
+             (view-buffer-other-window linkbuf)
+             (goto-char (point-min))
+             (forward-line 2)))
+          (t
+           (error "No links for reference %s" reference)))))
+
+(defun markdown-check-refs (&optional silent)
+  "Show all undefined Markdown references in current `markdown-mode' buffer.
+If SILENT is non-nil, do not message anything when no undefined
+references found.
+Links which have empty reference definitions are considered to be
+defined."
+  (interactive "P")
+  (when (not (eq major-mode 'markdown-mode))
+    (error "Not available in current mode"))
+  (let ((oldbuf (current-buffer))
+        (refs (markdown-get-undefined-refs))
+        (refbuf (markdown-reference-check-buffer)))
+    (if (null refs)
+        (progn
+          (when (not silent)
+            (message "No undefined references found"))
+          (kill-buffer refbuf))
+      (with-current-buffer refbuf
+        (insert "The following references are undefined:\n\n")
+        (dolist (ref refs)
+          (markdown-insert-undefined-reference-button ref oldbuf))
+        (view-buffer-other-window refbuf)
+        (goto-char (point-min))
+        (forward-line 2)))))
+
+
+;;; Lists =====================================================================
+
+(defun markdown-insert-list-item (&optional arg)
+  "Insert a new list item.
+If the point is inside unordered list, insert a bullet mark.  If
+the point is inside ordered list, insert the next number followed
+by a period.  Use the previous list item to determine the amount
+of whitespace to place before and after list markers.
+
+With a \\[universal-argument] prefix (i.e., when ARG is (4)),
+decrease the indentation by one level.
+
+With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
+increase the indentation by one level."
+  (interactive "p")
+  (let (bounds cur-indent marker indent new-indent new-loc)
+    (save-match-data
+      ;; Look for a list item on current or previous non-blank line
+      (save-excursion
+        (while (and (not (setq bounds (markdown-cur-list-item-bounds)))
+                    (not (bobp))
+                    (markdown-cur-line-blank-p))
+          (forward-line -1)))
+      (when bounds
+        (cond ((save-excursion
+                 (skip-chars-backward " \t")
+                 (looking-at markdown-regex-list))
+               (beginning-of-line)
+               (insert "\n")
+               (forward-line -1))
+              ((not (markdown-cur-line-blank-p))
+               (newline)))
+        (setq new-loc (point)))
+      ;; Look ahead for a list item on next non-blank line
+      (unless bounds
+        (save-excursion
+          (while (and (null bounds)
+                      (not (eobp))
+                      (markdown-cur-line-blank-p))
+            (forward-line)
+            (setq bounds (markdown-cur-list-item-bounds))))
+        (when bounds
+          (setq new-loc (point))
+          (unless (markdown-cur-line-blank-p)
+            (newline))))
+      (if (not bounds)
+          ;; When not in a list, start a new unordered one
+          (progn
+            (unless (markdown-cur-line-blank-p)
+              (insert "\n"))
+            (insert markdown-unordered-list-item-prefix))
+        ;; Compute indentation and marker for new list item
+        (setq cur-indent (nth 2 bounds))
+        (setq marker (nth 4 bounds))
+        (cond
+         ;; Dedent: decrement indentation, find previous marker.
+         ((= arg 4)
+          (setq indent (max (- cur-indent 4) 0))
+          (let ((prev-bounds
+                 (save-excursion
+                   (when (markdown-prev-list-item (- (nth 3 bounds) 1))
+                     (markdown-cur-list-item-bounds)))))
+            (when prev-bounds
+              (setq marker (nth 4 prev-bounds)))))
+         ;; Indent: increment indentation by 4, use same marker.
+         ((= arg 16) (setq indent (+ cur-indent 4)))
+         ;; Same level: keep current indentation and marker.
+         (t (setq indent cur-indent)))
+        (setq new-indent (make-string indent 32))
+        (goto-char new-loc)
+        (cond
+         ;; Ordered list
+         ((string-match "[0-9]" marker)
+          (if (= arg 16) ;; starting a new column indented one more level
+              (insert (concat new-indent "1. "))
+            ;; travel up to the last item and pick the correct number.  If
+            ;; the argument was nil, "new-indent = cur-indent" is the same,
+            ;; so we don't need special treatment. Neat.
+            (save-excursion
+              (while (and (not (looking-at (concat new-indent "\\([0-9]+\\)\\(\\.[ \t]*\\)")))
+                          (>= (forward-line -1) 0))))
+            (let* ((old-prefix (match-string 1))
+                   (old-spacing (match-string 2))
+                   (new-prefix (if old-prefix
+                                   (int-to-string (1+ (string-to-number old-prefix)))
+                                 "1"))
+                   (space-adjust (- (length old-prefix) (length new-prefix)))
+                   (new-spacing (if (and (match-string 2)
+                                         (not (string-match "\t" old-spacing))
+                                         (< space-adjust 0)
+                                         (> space-adjust (- 1 (length (match-string 2)))))
+                                    (substring (match-string 2) 0 space-adjust)
+                                  (or old-spacing ". "))))
+              (insert (concat new-indent new-prefix new-spacing)))))
+         ;; Unordered list
+         ((string-match "[\\*\\+-]" marker)
+          (insert new-indent marker)))))))
+
+(defun markdown-move-list-item-up ()
+  "Move the current list item up in the list when possible."
+  (interactive)
+  (let (cur prev old)
+    (when (setq cur (markdown-cur-list-item-bounds))
+      (setq old (point))
+      (goto-char (nth 0 cur))
+      (if (markdown-prev-list-item (nth 3 cur))
+          (progn
+            (setq prev (markdown-cur-list-item-bounds))
+            (condition-case nil
+                (progn
+                  (transpose-regions (nth 0 prev) (nth 1 prev)
+                                     (nth 0 cur) (nth 1 cur) t)
+                  (goto-char (+ (nth 0 prev) (- old (nth 0 cur)))))
+              ;; Catch error in case regions overlap.
+              (error (goto-char old))))
+        (goto-char old)))))
+
+(defun markdown-move-list-item-down ()
+  "Move the current list item down in the list when possible."
+  (interactive)
+  (let (cur next old)
+    (when (setq cur (markdown-cur-list-item-bounds))
+      (setq old (point))
+      (if (markdown-next-list-item (nth 3 cur))
+          (progn
+            (setq next (markdown-cur-list-item-bounds))
+            (condition-case nil
+                (progn
+                  (transpose-regions (nth 0 cur) (nth 1 cur)
+                                     (nth 0 next) (nth 1 next) nil)
+                  (goto-char (+ old (- (nth 1 next) (nth 1 cur)))))
+              ;; Catch error in case regions overlap.
+              (error (goto-char old))))
+        (goto-char old)))))
+
+(defun markdown-demote-list-item (&optional bounds)
+  "Indent (or demote) the current list item.
+Optionally, BOUNDS of the current list item may be provided if available."
+  (interactive)
+  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
+    (save-excursion
+      (save-match-data
+        (let ((end-marker (set-marker (make-marker) (nth 1 bounds))))
+          (goto-char (nth 0 bounds))
+          (while (< (point) end-marker)
+            (unless (markdown-cur-line-blank-p)
+              (insert (make-string markdown-list-indent-width ? )))
+            (forward-line)))))))
+
+(defun markdown-promote-list-item (&optional bounds)
+  "Unindent (or promote) the current list item.
+Optionally, BOUNDS of the current list item may be provided if available."
+  (interactive)
+  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
+    (save-excursion
+      (save-match-data
+        (let ((end-marker (set-marker (make-marker) (nth 1 bounds)))
+              num regexp)
+          (goto-char (nth 0 bounds))
+          (when (looking-at (format "^[ ]\\{1,%d\\}"
+                                    markdown-list-indent-width))
+            (setq num (- (match-end 0) (match-beginning 0)))
+            (setq regexp (format "^[ ]\\{1,%d\\}" num))
+            (while (and (< (point) end-marker)
+                        (re-search-forward regexp end-marker t))
+              (replace-match "" nil nil)
+              (forward-line))))))))
+
+(defun markdown-cleanup-list-numbers-level (&optional pfx)
+  "Update the numbering for level PFX (as a string of spaces).
+
+Assume that the previously found match was for a numbered item in
+a list."
+  (let ((cpfx pfx)
+        (idx 0)
+        (continue t)
+        (step t)
+        (sep nil))
+    (while (and continue (not (eobp)))
+      (setq step t)
+      (cond
+       ((looking-at "^\\([\s-]*\\)[0-9]+\\. ")
+        (setq cpfx (match-string-no-properties 1))
+        (cond
+         ((string= cpfx pfx)
+          (replace-match
+           (concat pfx (number-to-string  (setq idx (1+ idx))) ". "))
+          (setq sep nil))
+         ;; indented a level
+         ((string< pfx cpfx)
+          (setq sep (markdown-cleanup-list-numbers-level cpfx))
+          (setq step nil))
+         ;; exit the loop
+         (t
+          (setq step nil)
+          (setq continue nil))))
+
+       ((looking-at "^\\([\s-]*\\)[^ \t\n\r].*$")
+        (setq cpfx (match-string-no-properties 1))
+        (cond
+         ;; reset if separated before
+         ((string= cpfx pfx) (when sep (setq idx 0)))
+         ((string< cpfx pfx)
+          (setq step nil)
+          (setq continue nil))))
+       (t (setq sep t)))
+
+      (when step
+        (beginning-of-line)
+        (setq continue (= (forward-line) 0))))
+    sep))
+
+(defun markdown-cleanup-list-numbers ()
+  "Update the numbering of ordered lists."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (markdown-cleanup-list-numbers-level "")))
+
+
+;;; Movement ==================================================================
+
+(defun markdown-beginning-of-defun (&optional arg)
+  "`beginning-of-defun-function' for Markdown.
+Move backward to the beginning of the current or previous section.
+When ARG is non-nil, repeat that many times.  When ARG is negative,
+move forward to the ARG-th following section."
+  (interactive "P")
+  (or arg (setq arg 1))
+  (forward-char 1)
+  (or (re-search-backward markdown-regex-header nil t arg)
+      (goto-char (point-min))))
+
+(defun markdown-end-of-defun (&optional arg)
+  "`end-of-defun-function' for Markdown.
+Move forward to the end of the current or following section.
+When ARG is non-nil, repeat that many times.  When ARG is negative,
+move back to the ARG-th preceding section."
+  (interactive "P")
+  (or arg (setq arg 1))
+  (when (looking-at markdown-regex-header)
+    (goto-char (match-beginning 0))
+    (forward-char 1))
+  (if (re-search-forward markdown-regex-header nil t arg)
+      (goto-char (match-beginning 0))
+    (goto-char (point-max)))
+  (skip-syntax-backward "-"))
+
+(defun markdown-beginning-of-block ()
+  "Move the point to the start of the previous text block."
+  (interactive)
+  (if (re-search-backward markdown-regex-block-separator nil t)
+      (goto-char (or (match-end 2) (match-end 0)))
+    (goto-char (point-min))))
+
+(defun markdown-end-of-block ()
+  "Move the point to the start of the next text block."
+  (interactive)
+  (beginning-of-line)
+  (skip-syntax-forward "-")
+  (when (= (point) (point-min))
+    (forward-char))
+  (if (re-search-forward markdown-regex-block-separator nil t)
+      (goto-char (or (match-end 2) (match-end 0)))
+    (goto-char (point-max)))
+  (skip-syntax-backward "-")
+  (forward-line))
+
+(defun markdown-forward-paragraph (arg)
+  "Move forward one or more paragraphs or by one block.
+When ARG is nil or a numeric prefix, call `forward-paragraph'
+with ARG.  When called with \\[universal-argument], call
+`markdown-end-of-block' instead."
+  (interactive "P")
+  (or arg (setq arg 1))
+  (cond ((integerp arg)
+         (forward-paragraph arg))
+        ((equal arg '(4))
+         (markdown-end-of-block))))
+
+(defun markdown-backward-paragraph (arg)
+  "Move backward one or more paragraphs or by one block.
+When ARG is nil or a numeric prefix, call `backward-paragraph'
+with ARG.  When called with \\[universal-argument], call
+`markdown-beginning-of-block' instead."
+  (interactive "P")
+  (or arg (setq arg 1))
+  (cond ((integerp arg)
+         (backward-paragraph arg))
+        ((equal arg '(4))
+         (markdown-beginning-of-block))))
+
+(defun markdown-end-of-block-element ()
+  "Move the point to the start of the next block unit.
+Stops at blank lines, list items, headers, and horizontal rules."
+  (interactive)
+  (forward-line)
+  (while (and (or (not (markdown-prev-line-blank-p))
+                  (markdown-cur-line-blank-p))
+              (not (or (looking-at markdown-regex-list)
+                       (looking-at markdown-regex-header)
+                       (looking-at markdown-regex-hr)))
+              (not (eobp)))
+    (forward-line)))
+
+(defun markdown-next-link ()
+  "Jump to next inline, reference, or wiki link.
+If successful, return point.  Otherwise, return nil.
+See `markdown-wiki-link-p' and `markdown-previous-wiki-link'."
+  (interactive)
+  (let ((opoint (point)))
+    (when (or (markdown-link-p) (markdown-wiki-link-p))
+      ;; At a link already, move past it.
+      (goto-char (+ (match-end 0) 1)))
+    ;; Search for the next wiki link and move to the beginning.
+    (while (and (re-search-forward markdown-regex-link-generic nil t)
+                (markdown-code-block-at-point)
+                (< (point) (point-max))))
+    (if (and (not (eq (point) opoint))
+             (or (markdown-link-p) (markdown-wiki-link-p)))
+        ;; Group 1 will move past non-escape character in wiki link regexp.
+        ;; Go to beginning of group zero for all other link types.
+        (goto-char (or (match-beginning 1) (match-beginning 0)))
+      (goto-char opoint)
+      nil)))
+
+(defun markdown-previous-link ()
+  "Jump to previous wiki link.
+If successful, return point.  Otherwise, return nil.
+See `markdown-wiki-link-p' and `markdown-next-wiki-link'."
+  (interactive)
+  (let ((opoint (point)))
+    (while (and (re-search-backward markdown-regex-link-generic nil t)
+                (markdown-code-block-at-point)
+                (> (point) (point-min))))
+    (if (and (not (eq (point) opoint))
+             (or (markdown-link-p) (markdown-wiki-link-p)))
+        (goto-char (or (match-beginning 1) (match-beginning 0)))
+      (goto-char opoint)
+      nil)))
+
+(defun markdown-next-heading ()
+  "Move to the next heading line of any level.
+With argument, repeats or can move backward if negative."
+  (let ((pos (outline-next-heading)))
+    (while (markdown-code-block-at-point)
+      (setq pos (outline-next-heading)))
+    pos))
+
+(defun markdown-previous-heading ()
+  "Move to the previous heading line of any level.
+With argument, repeats or can move backward if negative."
+  (let ((pos (outline-previous-heading)))
+    (while (markdown-code-block-at-point)
+      (setq pos (outline-previous-heading)))
+    pos))
+
+
+;;; Outline ===================================================================
+
+(defun markdown-move-heading-common (move-fn &optional arg)
+  "Wrapper for `outline-mode' functions to skip false positives.
+For example, headings inside preformatted code blocks may match
+`outline-regexp' but should not be considered as headings."
+  (funcall move-fn arg)
+  (let ((prev -1))
+    (while (and (/= prev (point)) (markdown-code-block-at-point))
+      (setq prev (point))
+      (funcall move-fn arg))))
+
+(defun markdown-next-visible-heading (arg)
+  "Move to the next visible heading line of any level.
+With argument, repeats or can move backward if negative."
+  (interactive "p")
+  (markdown-move-heading-common 'outline-next-visible-heading arg))
+
+(defun markdown-previous-visible-heading (arg)
+  "Move to the previous visible heading line of any level.
+With argument, repeats or can move backward if negative."
+  (interactive "p")
+  (markdown-move-heading-common 'outline-previous-visible-heading arg))
+
+(defun markdown-forward-same-level (arg)
+  "Move forward to the ARG'th heading at same level as this one.
+Stop at the first and last headings of a superior heading."
+  (interactive "p")
+  (markdown-move-heading-common 'outline-forward-same-level arg))
+
+(defun markdown-back-to-heading-over-code-block (&optional invisible-ok)
+  (beginning-of-line)
+  (or (and (outline-on-heading-p invisible-ok)
+           (not (markdown-code-block-at-point)))
+      (let ((header-re (concat "^\\(?:" outline-regexp "\\)"))
+            found)
+        (save-excursion
+          (while (not found)
+            (let (finish)
+              (while (and (not finish) (re-search-backward header-re nil t))
+                (when (and (or invisible-ok (not (outline-invisible-p)))
+                           (not (markdown-code-block-at-point)))
+                  (setq finish t)))
+              (if (not finish)
+                  (error "Before first heading")
+                (setq found (point))))))
+        (goto-char found)
+        found)))
+
+(defun markdown-backward-same-level (arg)
+  "Move backward to the ARG'th heading at same level as this one.
+Stop at the first and last headings of a superior heading."
+  (interactive "p")
+  (markdown-back-to-heading-over-code-block)
+  (while (> arg 0)
+    (let ((point-to-move-to (save-excursion
+			      (outline-get-last-sibling))))
+      (if point-to-move-to
+	  (progn
+	    (goto-char point-to-move-to)
+	    (setq arg (1- arg)))
+        (error "No previous same-level heading")))))
+
+(defun markdown-up-heading (arg)
+  "Move to the visible heading line of which the present line is a subheading.
+With argument, move up ARG levels."
+  (interactive "p")
+  (markdown-move-heading-common 'outline-up-heading arg))
+
+(defun markdown-back-to-heading (&optional invisible-ok)
+  "Move to previous heading line, or beg of this line if it's a heading.
+Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
+  (markdown-move-heading-common 'outline-back-to-heading invisible-ok))
+
+(defalias 'markdown-end-of-heading 'outline-end-of-heading)
+
+(defun markdown-on-heading-p ()
+  "Return t if point is on a (visible) heading line."
+  (get-text-property (point) 'markdown-heading))
+
+(defun markdown-end-of-subtree (&optional invisible-OK)
+  "Move to the end of the current subtree.
+Only visible heading lines are considered, unless INVISIBLE-OK is
+non-nil.
+Derived from `org-end-of-subtree'."
+  (markdown-back-to-heading invisible-OK)
+  (let ((first t)
+        (level (funcall outline-level)))
+    (while (and (not (eobp))
+                (or first (> (funcall outline-level) level)))
+      (setq first nil)
+      (markdown-next-heading))
+    (if (memq (preceding-char) '(?\n ?\^M))
+        (progn
+          ;; Go to end of line before heading
+          (forward-char -1)
+          (if (memq (preceding-char) '(?\n ?\^M))
+              ;; leave blank line before heading
+              (forward-char -1)))))
+  (point))
+
+(defun markdown-outline-fix-visibility ()
+  "Hide any false positive headings that should not be shown.
+For example, headings inside preformatted code blocks may match
+`outline-regexp' but should not be shown as headings when cycling."
+  (save-excursion
+    (goto-char (point-min))
+    (unless (outline-on-heading-p)
+      (outline-next-visible-heading 1))
+    (while (< (point) (point-max))
+      (when (markdown-code-block-at-point)
+        (outline-flag-region (1- (point-at-bol)) (point-at-eol) t))
+      (outline-next-visible-heading 1))))
+
+(defvar markdown-cycle-global-status 1)
+(defvar markdown-cycle-subtree-status nil)
+
+(defun markdown-next-preface ()
+  (let (finish)
+    (while (and (not finish) (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
+                                                nil 'move))
+      (unless (markdown-code-block-at-point)
+        (goto-char (match-beginning 0))
+        (setq finish t))))
+  (when (and (bolp) (or outline-blank-line (eobp)) (not (bobp)))
+    (forward-char -1)))
+
+(defun markdown-show-entry ()
+  (save-excursion
+    (outline-back-to-heading t)
+    (outline-flag-region (1- (point))
+                         (progn
+                           (markdown-next-preface)
+                           (if (= 1 (- (point-max) (point)))
+                               (point-max)
+                             (point)))
+                         nil)))
+
+(defun markdown-cycle (&optional arg)
+  "Visibility cycling for Markdown mode.
+If ARG is t, perform global visibility cycling.  If the point is
+at an atx-style header, cycle visibility of the corresponding
+subtree.  Otherwise, insert a tab using `indent-relative'.
+Derived from `org-cycle'."
+  (interactive "P")
+  (cond
+   ((eq arg t) ;; Global cycling
+    (cond
+     ((and (eq last-command this-command)
+           (eq markdown-cycle-global-status 2))
+      ;; Move from overview to contents
+      (markdown-hide-sublevels 1)
+      (message "CONTENTS")
+      (setq markdown-cycle-global-status 3)
+      (markdown-outline-fix-visibility))
+
+     ((and (eq last-command this-command)
+           (eq markdown-cycle-global-status 3))
+      ;; Move from contents to all
+      (markdown-show-all)
+      (message "SHOW ALL")
+      (setq markdown-cycle-global-status 1))
+
+     (t
+      ;; Defaults to overview
+      (markdown-hide-body)
+      (message "OVERVIEW")
+      (setq markdown-cycle-global-status 2)
+      (markdown-outline-fix-visibility))))
+
+   ((save-excursion (beginning-of-line 1) (markdown-on-heading-p))
+    ;; At a heading: rotate between three different views
+    (markdown-back-to-heading)
+    (let ((goal-column 0) eoh eol eos)
+      ;; Determine boundaries
+      (save-excursion
+        (markdown-back-to-heading)
+        (save-excursion
+          (beginning-of-line 2)
+          (while (and (not (eobp)) ;; this is like `next-line'
+                      (get-char-property (1- (point)) 'invisible))
+            (beginning-of-line 2)) (setq eol (point)))
+        (markdown-end-of-heading)   (setq eoh (point))
+        (markdown-end-of-subtree t)
+        (skip-chars-forward " \t\n")
+        (beginning-of-line 1) ; in case this is an item
+        (setq eos (1- (point))))
+      ;; Find out what to do next and set `this-command'
+      (cond
+       ((= eos eoh)
+        ;; Nothing is hidden behind this heading
+        (message "EMPTY ENTRY")
+        (setq markdown-cycle-subtree-status nil))
+       ((>= eol eos)
+        ;; Entire subtree is hidden in one line: open it
+        (markdown-show-entry)
+        (markdown-show-children)
+        (message "CHILDREN")
+        (setq markdown-cycle-subtree-status 'children))
+       ((and (eq last-command this-command)
+             (eq markdown-cycle-subtree-status 'children))
+        ;; We just showed the children, now show everything.
+        (markdown-show-subtree)
+        (message "SUBTREE")
+        (setq markdown-cycle-subtree-status 'subtree))
+       (t
+        ;; Default action: hide the subtree.
+        (markdown-hide-subtree)
+        (message "FOLDED")
+        (setq markdown-cycle-subtree-status 'folded)))))
+
+   (t
+    (indent-for-tab-command))))
+
+(defun markdown-shifttab ()
+  "Global visibility cycling.
+Calls `markdown-cycle' with argument t."
+  (interactive)
+  (markdown-cycle t))
+
+(defun markdown-outline-level ()
+  "Return the depth to which a statement is nested in the outline."
+  (cond
+   ((markdown-code-block-at-point) 7)
+   ((match-end 1) 1)
+   ((match-end 3) 2)
+   ((- (match-end 5) (match-beginning 5)))))
+
+(defun markdown-promote-subtree (&optional arg)
+  "Promote the current subtree of ATX headings.
+Note that Markdown does not support heading levels higher than six
+and therefore level-six headings will not be promoted further."
+  (interactive "*P")
+  (save-excursion
+    (when (and (or (thing-at-point-looking-at markdown-regex-header-atx)
+                   (re-search-backward markdown-regex-header-atx nil t))
+               (not (markdown-code-block-at-point)))
+      (let ((level (length (match-string 1)))
+            (promote-or-demote (if arg 1 -1))
+            (remove 't))
+        (markdown-cycle-atx promote-or-demote remove)
+        (catch 'end-of-subtree
+          (while (markdown-next-heading)
+            ;; Exit if this not a higher level heading; promote otherwise.
+            (if (and (looking-at markdown-regex-header-atx)
+                     (<= (length (match-string-no-properties 1)) level))
+                (throw 'end-of-subtree nil)
+              (markdown-cycle-atx promote-or-demote remove))))))))
+
+(defun markdown-demote-subtree ()
+  "Demote the current subtree of ATX headings."
+  (interactive)
+  (markdown-promote-subtree t))
+
+(defun markdown-move-subtree-up ()
+  "Move the current subtree of ATX headings up."
+  (interactive)
+  (outline-move-subtree-up 1))
+
+(defun markdown-move-subtree-down ()
+  "Move the current subtree of ATX headings down."
+  (interactive)
+  (outline-move-subtree-down 1))
+
+
+;;; Generic Structure Editing, Completion, and Cycling Commands ===============
+
+(defun markdown-move-up ()
+  "Move list item up.
+Calls `markdown-move-list-item-up'."
+  (interactive)
+  (markdown-move-list-item-up))
+
+(defun markdown-move-down ()
+  "Move list item down.
+Calls `markdown-move-list-item-down'."
+  (interactive)
+  (markdown-move-list-item-down))
+
+(defun markdown-promote ()
+  "Either promote header or list item at point or cycle markup.
+See `markdown-cycle-atx', `markdown-cycle-setext', and
+`markdown-promote-list-item'."
+  (interactive)
+  (let (bounds)
+    (cond
+     ;; Promote atx header
+     ((thing-at-point-looking-at markdown-regex-header-atx)
+      (markdown-cycle-atx -1))
+     ;; Promote setext header
+     ((thing-at-point-looking-at markdown-regex-header-setext)
+      (markdown-cycle-setext -1))
+     ;; Promote horizonal rule
+     ((thing-at-point-looking-at markdown-regex-hr)
+      (markdown-cycle-hr -1))
+     ;; Promote list item
+     ((setq bounds (markdown-cur-list-item-bounds))
+      (markdown-promote-list-item))
+     ;; Promote bold
+     ((thing-at-point-looking-at markdown-regex-bold)
+      (markdown-cycle-bold))
+     ;; Promote italic
+     ((thing-at-point-looking-at markdown-regex-italic)
+      (markdown-cycle-italic))
+     (t
+      (error "Nothing to promote at point")))))
+
+(defun markdown-demote ()
+  "Either demote header or list item at point or cycle or remove markup.
+See `markdown-cycle-atx', `markdown-cycle-setext', and
+`markdown-demote-list-item'."
+  (interactive)
+  (let (bounds)
+    (cond
+     ;; Demote atx header
+     ((thing-at-point-looking-at markdown-regex-header-atx)
+      (markdown-cycle-atx 1))
+     ;; Demote setext header
+     ((thing-at-point-looking-at markdown-regex-header-setext)
+      (markdown-cycle-setext 1))
+     ;; Demote horizonal rule
+     ((thing-at-point-looking-at markdown-regex-hr)
+      (markdown-cycle-hr 1))
+     ;; Demote list item
+     ((setq bounds (markdown-cur-list-item-bounds))
+      (markdown-demote-list-item))
+     ;; Demote bold
+     ((thing-at-point-looking-at markdown-regex-bold)
+      (markdown-cycle-bold))
+     ;; Demote italic
+     ((thing-at-point-looking-at markdown-regex-italic)
+      (markdown-cycle-italic))
+     (t
+      (error "Nothing to demote at point")))))
+
+
+;;; Commands ==================================================================
+
+(defun markdown (&optional output-buffer-name)
+  "Run `markdown-command' on buffer, sending output to OUTPUT-BUFFER-NAME.
+The output buffer name defaults to `markdown-output-buffer-name'.
+Return the name of the output buffer used."
+  (interactive)
+  (save-window-excursion
+    (let ((begin-region)
+          (end-region))
+      (if (markdown-use-region-p)
+          (setq begin-region (region-beginning)
+                end-region (region-end))
+        (setq begin-region (point-min)
+              end-region (point-max)))
+
+      (unless output-buffer-name
+        (setq output-buffer-name markdown-output-buffer-name))
+      (cond
+       ;; Handle case when `markdown-command' does not read from stdin
+       (markdown-command-needs-filename
+        (if (not buffer-file-name)
+            (error "Must be visiting a file")
+          (shell-command (concat markdown-command " "
+                                 (shell-quote-argument buffer-file-name))
+                         output-buffer-name)))
+       ;; Pass region to `markdown-command' via stdin
+       (t
+        (shell-command-on-region begin-region end-region markdown-command
+                                 output-buffer-name))))
+    output-buffer-name))
+
+(defun markdown-standalone (&optional output-buffer-name)
+  "Special function to provide standalone HTML output.
+Insert the output in the buffer named OUTPUT-BUFFER-NAME."
+  (interactive)
+  (setq output-buffer-name (markdown output-buffer-name))
+  (with-current-buffer output-buffer-name
+    (set-buffer output-buffer-name)
+    (unless (markdown-output-standalone-p)
+      (markdown-add-xhtml-header-and-footer output-buffer-name))
+    (goto-char (point-min))
+    (html-mode))
+  output-buffer-name)
+
+(defun markdown-other-window (&optional output-buffer-name)
+  "Run `markdown-command' on current buffer and display in other window.
+When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
+that name."
+  (interactive)
+  (markdown-display-buffer-other-window
+   (markdown-standalone output-buffer-name)))
+
+(defun markdown-output-standalone-p ()
+  "Determine whether `markdown-command' output is standalone XHTML.
+Standalone XHTML output is identified by an occurrence of
+`markdown-xhtml-standalone-regexp' in the first five lines of output."
+  (save-excursion
+    (goto-char (point-min))
+    (re-search-forward
+     markdown-xhtml-standalone-regexp
+     (save-excursion (goto-char (point-min)) (forward-line 4) (point))
+     t)))
+
+(defun markdown-stylesheet-link-string (stylesheet-path)
+  (concat "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\""
+          stylesheet-path
+          "\"  />"))
+
+(defun markdown-add-xhtml-header-and-footer (title)
+  "Wrap XHTML header and footer with given TITLE around current buffer."
+  (goto-char (point-min))
+  (insert "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
+          "\t\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\n"
+          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n\n"
+          "<head>\n<title>")
+  (insert title)
+  (insert "</title>\n")
+  (when (> (length markdown-content-type) 0)
+    (insert
+     (format
+      "<meta http-equiv=\"Content-Type\" content=\"%s;charset=%s\"/>\n"
+      markdown-content-type
+      (or (and markdown-coding-system
+               (fboundp 'coding-system-get)
+               (coding-system-get markdown-coding-system
+                                  'mime-charset))
+          (and (fboundp 'coding-system-get)
+               (coding-system-get buffer-file-coding-system
+                                  'mime-charset))
+          "iso-8859-1"))))
+  (if (> (length markdown-css-paths) 0)
+      (insert (mapconcat 'markdown-stylesheet-link-string markdown-css-paths "\n")))
+  (when (> (length markdown-xhtml-header-content) 0)
+    (insert markdown-xhtml-header-content))
+  (insert "\n</head>\n\n"
+          "<body>\n\n")
+  (goto-char (point-max))
+  (insert "\n"
+          "</body>\n"
+          "</html>\n"))
+
+(defun markdown-preview (&optional output-buffer-name)
+  "Run `markdown-command' on the current buffer and view output in browser.
+When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
+that name."
+  (interactive)
+  (browse-url-of-buffer (markdown-standalone markdown-output-buffer-name)))
+
+(defun markdown-export-file-name (&optional extension)
+  "Attempt to generate a filename for Markdown output.
+The file extension will be EXTENSION if given, or .html by default.
+If the current buffer is visiting a file, we construct a new
+output filename based on that filename.  Otherwise, return nil."
+  (when (buffer-file-name)
+    (unless extension
+      (setq extension ".html"))
+    (let ((candidate
+           (concat
+            (cond
+             ((buffer-file-name)
+              (file-name-sans-extension (buffer-file-name)))
+             (t (buffer-name)))
+            extension)))
+      (cond
+       ((equal candidate (buffer-file-name))
+        (concat candidate extension))
+       (t
+        candidate)))))
+
+(defun markdown-export (&optional output-file)
+  "Run Markdown on the current buffer, save to file, and return the filename.
+If OUTPUT-FILE is given, use that as the filename.  Otherwise, use the filename
+generated by `markdown-export-file-name', which will be constructed using the
+current filename, but with the extension removed and replaced with .html."
+  (interactive)
+  (unless output-file
+    (setq output-file (markdown-export-file-name ".html")))
+  (when output-file
+    (let* ((init-buf (current-buffer))
+           (init-point (point))
+           (init-buf-string (buffer-string))
+           (output-buffer (find-file-noselect output-file))
+           (output-buffer-name (buffer-name output-buffer)))
+      (run-hooks 'markdown-before-export-hook)
+      (markdown-standalone output-buffer-name)
+      (with-current-buffer output-buffer
+        (run-hooks 'markdown-after-export-hook)
+        (save-buffer))
+      ;; if modified, restore initial buffer
+      (when (buffer-modified-p init-buf)
+        (erase-buffer)
+        (insert init-buf-string)
+        (save-buffer)
+        (goto-char init-point))
+      output-file)))
+
+(defun markdown-export-and-preview ()
+  "Export to XHTML using `markdown-export' and browse the resulting file."
+  (interactive)
+  (browse-url-of-file (markdown-export)))
+
+(defvar markdown-live-preview-buffer nil
+  "Buffer used to preview markdown output in `markdown-live-preview-export'.")
+(make-variable-buffer-local 'markdown-live-preview-buffer)
+
+(defvar markdown-live-preview-source-buffer nil
+  "Buffer with markdown source generating the source of the current
+buffer. Inverse of `markdown-live-preview-buffer'.")
+(make-variable-buffer-local 'markdown-live-preview-source-buffer)
+
+(defvar markdown-live-preview-currently-exporting nil)
+
+(defun markdown-live-preview-get-filename ()
+  "Standardize the filename exported by `markdown-live-preview-export'."
+  (markdown-export-file-name ".html"))
+
+(defun markdown-live-preview-window-eww (file)
+  "A `markdown-live-preview-window-function' for previewing with eww."
+  (if (require 'eww nil t)
+      (progn
+        (eww-open-file file)
+        (get-buffer "*eww*"))
+    (error "eww is not present or not loaded on this version of emacs")))
+
+(defun markdown-live-preview-window-serialize (buf)
+  "Get window point and scroll data for all windows displaying BUF if BUF is
+non-nil."
+  (when buf
+    (mapcar (lambda (win) (list win (window-point win) (window-start win)))
+            (get-buffer-window-list buf))))
+
+(defun markdown-live-preview-window-deserialize (window-posns)
+  "Apply window point and scroll data from WINDOW-POSNS, given by
+`markdown-live-preview-window-serialize'."
+  (cl-destructuring-bind (win pt start) window-posns
+    (when (window-live-p win)
+      (set-window-buffer win markdown-live-preview-buffer)
+      (set-window-point win pt)
+      (set-window-start win start))))
+
+(defun markdown-live-preview-export ()
+  "Export to XHTML using `markdown-export' and browse the resulting file within
+Emacs using `markdown-live-preview-window-function' Return the buffer displaying
+the rendered output."
+  (interactive)
+  (let* ((markdown-live-preview-currently-exporting t)
+         (cur-buf (current-buffer))
+         (export-file (markdown-export (markdown-live-preview-get-filename)))
+         ;; get positions in all windows currently displaying output buffer
+         (window-data
+          (markdown-live-preview-window-serialize
+           markdown-live-preview-buffer)))
+    (save-window-excursion
+      (let ((output-buffer
+             (funcall markdown-live-preview-window-function export-file)))
+        (with-current-buffer output-buffer
+          (setq markdown-live-preview-source-buffer cur-buf)
+          (add-hook 'kill-buffer-hook
+                    #'markdown-live-preview-remove-on-kill t t))
+        (with-current-buffer cur-buf
+          (setq markdown-live-preview-buffer output-buffer))))
+    (with-current-buffer cur-buf
+      ;; reset all windows displaying output buffer to where they were,
+      ;; now with the new output
+      (mapc #'markdown-live-preview-window-deserialize window-data)
+      ;; delete html editing buffer
+      (let ((buf (get-file-buffer export-file))) (when buf (kill-buffer buf)))
+      (when (and export-file (file-exists-p export-file)
+                 (eq markdown-live-preview-delete-export
+                     'delete-on-export))
+        (delete-file export-file))
+      markdown-live-preview-buffer)))
+
+(defun markdown-live-preview-remove ()
+  (when (buffer-live-p markdown-live-preview-buffer)
+    (kill-buffer markdown-live-preview-buffer))
+  (setq markdown-live-preview-buffer nil)
+  ;; if set to 'delete-on-export, the output has already been deleted
+  (when (eq markdown-live-preview-delete-export 'delete-on-destroy)
+    (let ((outfile-name (markdown-live-preview-get-filename)))
+      (when (file-exists-p outfile-name)
+        (delete-file outfile-name)))))
+
+(defun markdown-display-buffer-other-window (buf)
+  (let ((cur-buf (current-buffer)))
+    (switch-to-buffer-other-window buf)
+    (set-buffer cur-buf)))
+
+(defun markdown-live-preview-if-markdown ()
+  (when (and (derived-mode-p 'markdown-mode)
+             markdown-live-preview-mode)
+    (unless markdown-live-preview-currently-exporting
+      (if (buffer-live-p markdown-live-preview-buffer)
+          (markdown-live-preview-export)
+        (markdown-display-buffer-other-window
+         (markdown-live-preview-export))))))
+
+(defun markdown-live-preview-remove-on-kill ()
+  (cond ((and (derived-mode-p 'markdown-mode)
+              markdown-live-preview-mode)
+         (markdown-live-preview-remove))
+        (markdown-live-preview-source-buffer
+         (with-current-buffer markdown-live-preview-source-buffer
+           (setq markdown-live-preview-buffer nil))
+         (setq markdown-live-preview-source-buffer nil))))
+
+(defun markdown-live-preview-switch-to-output ()
+  (interactive)
+  "Turn on `markdown-live-preview-mode' if not already on, and switch to its
+output buffer in another window."
+  (if markdown-live-preview-mode
+      (markdown-display-buffer-other-window (markdown-live-preview-export)))
+    (markdown-live-preview-mode))
+
+(defun markdown-live-preview-re-export ()
+  (interactive)
+  "If the current buffer is a buffer displaying the exported version of a
+`markdown-live-preview-mode' buffer, call `markdown-live-preview-export' and
+update this buffer's contents."
+  (when markdown-live-preview-source-buffer
+    (with-current-buffer markdown-live-preview-source-buffer
+      (markdown-live-preview-export))))
+
+(defun markdown-open ()
+  "Open file for the current buffer with `markdown-open-command'."
+  (interactive)
+  (if (not markdown-open-command)
+      (error "Variable `markdown-open-command' must be set")
+    (if (not buffer-file-name)
+        (error "Must be visiting a file")
+      (call-process markdown-open-command
+                    nil nil nil buffer-file-name))))
+
+(defun markdown-kill-ring-save ()
+  "Run Markdown on file and store output in the kill ring."
+  (interactive)
+  (save-window-excursion
+    (markdown)
+    (with-current-buffer markdown-output-buffer-name
+      (kill-ring-save (point-min) (point-max)))))
+
+
+;;; Links =====================================================================
+
+(defun markdown-link-p ()
+  "Return non-nil when `point' is at a non-wiki link.
+See `markdown-wiki-link-p' for more information."
+  (let ((case-fold-search nil))
+    (and (not (markdown-wiki-link-p))
+         (not (markdown-code-block-at-point))
+         (or (thing-at-point-looking-at markdown-regex-link-inline)
+             (thing-at-point-looking-at markdown-regex-link-reference)
+             (thing-at-point-looking-at markdown-regex-uri)
+             (thing-at-point-looking-at markdown-regex-angle-uri)))))
+
+(defun markdown-link-link ()
+  "Return the link part of the regular (non-wiki) link at point.
+Works with both inline and reference style links.  If point is
+not at a link or the link reference is not defined returns nil."
+  (cond
+   ((thing-at-point-looking-at markdown-regex-link-inline)
+    (match-string-no-properties 6))
+   ((thing-at-point-looking-at markdown-regex-link-reference)
+    (let* ((text (match-string-no-properties 3))
+           (reference (match-string-no-properties 6))
+           (target (downcase (if (string= reference "") text reference))))
+      (car (markdown-reference-definition target))))
+   ((thing-at-point-looking-at markdown-regex-uri)
+    (match-string-no-properties 0))
+   ((thing-at-point-looking-at markdown-regex-angle-uri)
+    (match-string-no-properties 2))
+   (t nil)))
+
+(defun markdown-follow-link-at-point ()
+  "Open the current non-wiki link in a browser."
+  (interactive)
+  (if (markdown-link-p) (browse-url (markdown-link-link))
+    (error "Point is not at a Markdown link or URI")))
+
+
+;;; WikiLink Following/Markup =================================================
+
+(defun markdown-wiki-link-p ()
+  "Return non-nil when `point' is at a true wiki link.
+A true wiki link name matches `markdown-regex-wiki-link' but does not
+match the current file name after conversion.  This modifies the data
+returned by `match-data'.  Note that the potential wiki link name must
+be available via `match-string'."
+  (let ((case-fold-search nil))
+    (and (thing-at-point-looking-at markdown-regex-wiki-link)
+         (not (markdown-code-block-at-point))
+         (or (not buffer-file-name)
+             (not (string-equal (buffer-file-name)
+                                (markdown-convert-wiki-link-to-filename
+                                 (markdown-wiki-link-link))))))))
+
+(defun markdown-wiki-link-link ()
+  "Return the link part of the wiki link using current match data.
+The location of the link component depends on the value of
+`markdown-wiki-link-alias-first'."
+  (if markdown-wiki-link-alias-first
+      (or (match-string-no-properties 5) (match-string-no-properties 3))
+    (match-string-no-properties 3)))
+
+(defun markdown-wiki-link-alias ()
+  "Return the alias or text part of the wiki link using current match data.
+The location of the alias component depends on the value of
+`markdown-wiki-link-alias-first'."
+  (if markdown-wiki-link-alias-first
+      (match-string-no-properties 3)
+    (or (match-string-no-properties 5) (match-string-no-properties 3))))
+
+(defun markdown-convert-wiki-link-to-filename (name)
+  "Generate a filename from the wiki link NAME.
+Spaces in NAME are replaced with `markdown-link-space-sub-char'.
+When in `gfm-mode', follow GitHub's conventions where [[Test Test]]
+and [[test test]] both map to Test-test.ext."
+  (let ((basename (markdown-replace-regexp-in-string
+                   "[[:space:]\n]" markdown-link-space-sub-char name)))
+    (when (eq major-mode 'gfm-mode)
+      (setq basename (concat (upcase (substring basename 0 1))
+                             (downcase (substring basename 1 nil)))))
+    (let* ((default
+            (concat basename
+                    (if (and (buffer-file-name)
+                             (file-name-extension (buffer-file-name)))
+                        (concat "."
+                                (file-name-extension (buffer-file-name))))))
+           (current default))
+      (catch 'done
+        (condition-case nil
+            (cl-loop
+             (if (or (not markdown-wiki-link-search-parent-directories)
+                     (file-exists-p current))
+                 (throw 'done current))
+             (if (string-equal (expand-file-name current)
+                               (concat "/" default))
+                 (throw 'done default))
+             (setq current (concat "../" current)))
+          (error default))))))
+
+(defun markdown-follow-wiki-link (name &optional other)
+  "Follow the wiki link NAME.
+Convert the name to a file name and call `find-file'.  Ensure that
+the new buffer remains in `markdown-mode'.  Open the link in another
+window when OTHER is non-nil."
+  (let ((filename (markdown-convert-wiki-link-to-filename name))
+        (wp (file-name-directory buffer-file-name)))
+    (when other (other-window 1))
+    (let ((default-directory wp))
+      (find-file filename)))
+  (when (not (eq major-mode 'markdown-mode))
+    (markdown-mode)))
+
+(defun markdown-follow-wiki-link-at-point (&optional arg)
+  "Find Wiki Link at point.
+With prefix argument ARG, open the file in other window.
+See `markdown-wiki-link-p' and `markdown-follow-wiki-link'."
+  (interactive "P")
+  (if (markdown-wiki-link-p)
+      (markdown-follow-wiki-link (markdown-wiki-link-link) arg)
+    (error "Point is not at a Wiki Link")))
+
+(defun markdown-highlight-wiki-link (from to face)
+  "Highlight the wiki link in the region between FROM and TO using FACE."
+  (put-text-property from to 'font-lock-face face))
+
+(defun markdown-unfontify-region-wiki-links (from to)
+  "Remove wiki link faces from the region specified by FROM and TO."
+  (interactive "*r")
+  (remove-text-properties from to '(font-lock-face markdown-link-face))
+  (remove-text-properties from to '(font-lock-face markdown-missing-link-face)))
+
+(defun markdown-fontify-region-wiki-links (from to)
+  "Search region given by FROM and TO for wiki links and fontify them.
+If a wiki link is found check to see if the backing file exists
+and highlight accordingly."
+  (goto-char from)
+  (save-match-data
+    (while (re-search-forward markdown-regex-wiki-link to t)
+      (when (not (markdown-code-block-at-point))
+        (let ((highlight-beginning (match-beginning 1))
+              (highlight-end (match-end 1))
+              (file-name
+               (markdown-convert-wiki-link-to-filename
+                (markdown-wiki-link-link))))
+          (if (condition-case nil (file-exists-p file-name) (error nil))
+              (markdown-highlight-wiki-link
+               highlight-beginning highlight-end markdown-link-face)
+            (markdown-highlight-wiki-link
+             highlight-beginning highlight-end markdown-missing-link-face)))))))
+
+(defun markdown-extend-changed-region (from to)
+  "Extend region given by FROM and TO so that we can fontify all links.
+The region is extended to the first newline before and the first
+newline after."
+  ;; start looking for the first new line before 'from
+  (goto-char from)
+  (re-search-backward "\n" nil t)
+  (let ((new-from (point-min))
+        (new-to (point-max)))
+    (if (not (= (point) from))
+        (setq new-from (point)))
+    ;; do the same thing for the first new line after 'to
+    (goto-char to)
+    (re-search-forward "\n" nil t)
+    (if (not (= (point) to))
+        (setq new-to (point)))
+    (cl-values new-from new-to)))
+
+(defun markdown-check-change-for-wiki-link (from to)
+  "Check region between FROM and TO for wiki links and re-fontify as needed."
+  (interactive "*r")
+  (let* ((modified (buffer-modified-p))
+         (buffer-undo-list t)
+         (inhibit-read-only t)
+         (inhibit-point-motion-hooks t)
+         deactivate-mark
+         buffer-file-truename)
+    (unwind-protect
+        (save-excursion
+          (save-match-data
+            (save-restriction
+              ;; Extend the region to fontify so that it starts
+              ;; and ends at safe places.
+              (cl-multiple-value-bind (new-from new-to)
+                  (markdown-extend-changed-region from to)
+                (goto-char new-from)
+                ;; Only refontify when the range contains text with a
+                ;; wiki link face or if the wiki link regexp matches.
+                (when (or (markdown-range-property-any
+                           new-from new-to 'font-lock-face
+                           (list markdown-link-face
+                                 markdown-missing-link-face))
+                          (re-search-forward
+                           markdown-regex-wiki-link new-to t))
+                  ;; Unfontify existing fontification (start from scratch)
+                  (markdown-unfontify-region-wiki-links new-from new-to)
+                  ;; Now do the fontification.
+                  (markdown-fontify-region-wiki-links new-from new-to))))))
+      (and (not modified)
+           (buffer-modified-p)
+           (set-buffer-modified-p nil)))))
+
+(defun markdown-check-change-for-wiki-link-after-change (from to _)
+    "Check region between FROM and TO for wiki links and re-fontify as needed.
+Designed to be used with the `after-change-functions' hook."
+  (markdown-check-change-for-wiki-link from to))
+
+(defun markdown-fontify-buffer-wiki-links ()
+  "Refontify all wiki links in the buffer."
+  (interactive)
+  (markdown-check-change-for-wiki-link (point-min) (point-max)))
+
+
+;;; Following and Jumping =====================================================
+
+(defun markdown-follow-thing-at-point (arg)
+  "Follow thing at point if possible, such as a reference link or wiki link.
+Opens inline and reference links in a browser.  Opens wiki links
+to other files in the current window, or the another window if
+ARG is non-nil.
+See `markdown-follow-link-at-point' and
+`markdown-follow-wiki-link-at-point'."
+  (interactive "P")
+  (cond ((markdown-link-p)
+         (markdown-follow-link-at-point))
+        ((markdown-wiki-link-p)
+         (markdown-follow-wiki-link-at-point arg))
+        (t
+         (error "Nothing to follow at point"))))
+
+(defun markdown-jump ()
+  "Jump to another location based on context at point.
+Jumps between reference links and definitions; between footnote
+markers and footnote text."
+  (interactive)
+  (cond ((markdown-footnote-text-positions)
+         (markdown-footnote-return))
+        ((markdown-footnote-marker-positions)
+         (markdown-footnote-goto-text))
+        ((thing-at-point-looking-at markdown-regex-link-reference)
+         (markdown-reference-goto-definition))
+        ((thing-at-point-looking-at markdown-regex-reference-definition)
+         (markdown-reference-goto-link (match-string-no-properties 2)))
+        (t
+         (error "Nothing to jump to from context at point"))))
+
+
+;;; Miscellaneous =============================================================
+
+(defun markdown-compress-whitespace-string (str)
+  "Compress whitespace in STR and return result.
+Leading and trailing whitespace is removed.  Sequences of multiple
+spaces, tabs, and newlines are replaced with single spaces."
+  (markdown-replace-regexp-in-string "\\(^[ \t\n]+\\|[ \t\n]+$\\)" ""
+                            (markdown-replace-regexp-in-string "[ \t\n]+" " " str)))
+
+(defun markdown-line-number-at-pos (&optional pos)
+  "Return (narrowed) buffer line number at position POS.
+If POS is nil, use current buffer location.
+This is an exact copy of `line-number-at-pos' for use in emacs21."
+  (let ((opoint (or pos (point))) start)
+    (save-excursion
+      (goto-char (point-min))
+      (setq start (point))
+      (goto-char opoint)
+      (forward-line 0)
+      (1+ (count-lines start (point))))))
+
+(defun markdown-inside-link-text-p ()
+  "Return nil if not currently within link anchor text."
+  (looking-back "\\[[^]]*" nil))
+
+(defun markdown-line-is-reference-definition-p ()
+  "Return whether the current line is a (non-footnote) reference defition."
+  (save-excursion
+    (move-beginning-of-line 1)
+    (and (looking-at-p markdown-regex-reference-definition)
+         (not (looking-at-p "[ \t]*\\[^")))))
+
+(defun markdown-adaptive-fill-function ()
+  "Return prefix for filling paragraph or nil if not determined."
+  (cond
+   ;; List item inside blockquote
+   ((looking-at "^[ \t]*>[ \t]*\\(\\(?:[0-9]+\\|#\\)\\.\\|[*+-]\\)[ \t]+")
+    (markdown-replace-regexp-in-string
+     "[0-9\\.*+-]" " " (match-string-no-properties 0)))
+   ;; Blockquote
+   ((looking-at "^[ \t]*>[ \t]*")
+    (match-string-no-properties 0))
+   ;; List items
+   ((looking-at markdown-regex-list)
+    (match-string-no-properties 0))
+   ((looking-at markdown-regex-footnote-definition)
+    "    ") ; four spaces
+   ;; No match
+   (t nil)))
+
+(defun markdown-fill-forward-paragraph-function (&optional arg)
+  (let* ((arg (or arg 1))
+         (paragraphs-remaining (forward-paragraph arg))
+         (start (point)))
+    (when (< arg 0)
+      (while (and (not (eobp))
+                  (progn (move-to-left-margin) (not (eobp)))
+                  (looking-at paragraph-separate))
+        (forward-line 1))
+      (if (looking-at markdown-regex-list)
+          (forward-char (length (match-string 0)))
+        (goto-char start)))
+    paragraphs-remaining))
+
+
+;;; Extensions ================================================================
+
+(defun markdown-reload-extensions ()
+  "Check settings, update font-lock keywords, and re-fontify buffer."
+  (interactive)
+  (when (eq major-mode 'markdown-mode)
+    (setq markdown-mode-font-lock-keywords
+          (append
+           markdown-mode-font-lock-keywords-basic
+           (when markdown-enable-math
+             markdown-mode-font-lock-keywords-math)))
+    (setq font-lock-defaults
+          '(markdown-mode-font-lock-keywords
+            nil nil nil nil
+            (font-lock-syntactic-face-function . markdown-syntactic-face)))
+    (when (fboundp 'font-lock-refresh-defaults) (font-lock-refresh-defaults))))
+
+(defun markdown-enable-math (&optional arg)
+  "Toggle support for inline and display LaTeX math expressions.
+With a prefix argument ARG, enable math mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil."
+  (interactive (list (or current-prefix-arg 'toggle)))
+  (setq markdown-enable-math
+        (if (eq arg 'toggle)
+            (not markdown-enable-math)
+          (> (prefix-numeric-value arg) 0)))
+  (if markdown-enable-math
+      (message "markdown-mode math support enabled")
+    (message "markdown-mode math support disabled"))
+  (markdown-reload-extensions))
+
+(defun markdown-handle-local-variables ()
+  "Runs as a `hack-local-variables-hook' to update font lock rules.
+Checks to see if there is actually a markdown-mode file local variable
+before regenerating font-lock rules for extensions."
+  (when (and (boundp 'file-local-variables-alist)
+             (assoc 'markdown-enable-math file-local-variables-alist))
+    (markdown-reload-extensions)))
+
+
+;;; GFM Checkboxes as Buttons =================================================
+
+(require 'button)
+
+(define-button-type 'markdown-gfm-checkbox-button
+  'follow-link t
+  'face 'markdown-gfm-checkbox-face
+  'mouse-face 'markdown-highlight-face
+  'action #'markdown-toggle-gfm-checkbox)
+
+(defun markdown-toggle-gfm-checkbox (button)
+  "Toggle a GFM checkbox clicked on."
+  (save-match-data
+    (save-excursion
+      (goto-char (button-start button))
+      (cond ((looking-at "\\[ \\]")
+             (replace-match "[x]" nil t))
+            ((looking-at "\\[[xX]\\]")
+             (replace-match "[ ]" nil t))))))
+
+(defun markdown-make-gfm-checkboxes-buttons (start end)
+  "Make GFM checkboxes buttons in region between START and END."
+  (save-excursion
+    (goto-char start)
+    (let ((case-fold-search t))
+      (save-excursion
+	(while (re-search-forward markdown-regex-gfm-checkbox end t)
+	  (make-button (match-beginning 1) (match-end 1)
+                       :type 'markdown-gfm-checkbox-button))))))
+
+;; Called when any modification is made to buffer text.
+(defun markdown-gfm-checkbox-after-change-function (beg end old-len)
+  "Add to `after-change-functions' to setup GFM checkboxes as buttons."
+  (save-excursion
+    (save-match-data
+      ;; Rescan between start of line from `beg' and start of line after `end'.
+      (markdown-make-gfm-checkboxes-buttons
+       (progn (goto-char beg) (beginning-of-line) (point))
+       (progn (goto-char end) (forward-line 1) (point))))))
+
+
+;;; Mode Definition  ==========================================================
+
+(defun markdown-show-version ()
+  "Show the version number in the minibuffer."
+  (interactive)
+  (message "markdown-mode, version %s" markdown-mode-version))
+
+;;;###autoload
+(define-derived-mode markdown-mode text-mode "Markdown"
+  "Major mode for editing Markdown files."
+  ;; Natural Markdown tab width
+  (setq tab-width 4)
+  ;; Comments
+  (make-local-variable 'comment-start)
+  (setq comment-start "<!-- ")
+  (make-local-variable 'comment-end)
+  (setq comment-end " -->")
+  (make-local-variable 'comment-start-skip)
+  (setq comment-start-skip "<!--[ \t]*")
+  (make-local-variable 'comment-column)
+  (setq comment-column 0)
+  (set (make-local-variable 'comment-auto-fill-only-comments) nil)
+  ;; Syntax
+  (add-hook 'syntax-propertize-extend-region-functions
+            'markdown-syntax-propertize-extend-region)
+  (set (make-local-variable 'syntax-propertize-function)
+       'markdown-syntax-propertize)
+  ;; Font lock.
+  (set (make-local-variable 'markdown-mode-font-lock-keywords) nil)
+  (set (make-local-variable 'font-lock-defaults) nil)
+  (set (make-local-variable 'font-lock-multiline) t)
+  ;; Extensions
+  (make-local-variable 'markdown-enable-math)
+  ;; Reload extensions
+  (markdown-reload-extensions)
+  ;; Add a buffer-local hook to reload after file-local variables are read
+  (add-hook 'hack-local-variables-hook 'markdown-handle-local-variables nil t)
+  ;; For imenu support
+  (setq imenu-create-index-function
+        (if markdown-nested-imenu-heading-index
+            'markdown-imenu-create-nested-index
+          'markdown-imenu-create-flat-index))
+  ;; For menu support in XEmacs
+  (easy-menu-add markdown-mode-menu markdown-mode-map)
+  ;; Defun movement
+  (set (make-local-variable 'beginning-of-defun-function)
+       'markdown-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       'markdown-end-of-defun)
+  ;; Paragraph filling
+  (set
+   ; Should match start of lines that start or separate paragraphs
+   (make-local-variable 'paragraph-start)
+       (mapconcat 'identity
+                  '(
+                    "\f" ; starts with a literal line-feed
+                    "[ \t\f]*$" ; space-only line
+                    "[ \t]*[*+-][ \t]+" ; unordered list item
+                    "[ \t]*\\(?:[0-9]+\\|#\\)\\.[ \t]+" ; ordered list item
+                    "[ \t]*\\[\\S-*\\]:[ \t]+" ; link ref def
+                    "[ \t]*:[ \t]+" ; definition
+                    )
+                  "\\|"))
+  (set
+   ; Should match lines that separate paragraphs without being
+   ; part of any paragraph:
+   (make-local-variable 'paragraph-separate)
+   (mapconcat 'identity
+              '("[ \t\f]*$" ; space-only line
+                ; The following is not ideal, but the Fill customization
+                ; options really only handle paragraph-starting prefixes,
+                ; not paragraph-ending suffixes:
+                ".*  $" ; line ending in two spaces
+                "[ \t]*\\[\\^\\S-*\\]:[ \t]*$") ; just the start of a footnote def
+              "\\|"))
+  (set (make-local-variable 'adaptive-fill-first-line-regexp)
+       "\\`[ \t]*>[ \t]*?\\'")
+  (set (make-local-variable 'adaptive-fill-function)
+       'markdown-adaptive-fill-function)
+  (set (make-local-variable 'fill-forward-paragraph-function)
+       'markdown-fill-forward-paragraph-function)
+  ;; Outline mode
+  (make-local-variable 'outline-regexp)
+  (setq outline-regexp markdown-regex-header)
+  (make-local-variable 'outline-level)
+  (setq outline-level 'markdown-outline-level)
+  ;; Cause use of ellipses for invisible text.
+  (add-to-invisibility-spec '(outline . t))
+
+  ;; Inhibiting line-breaking:
+  ;; Separating out each condition into a separate function so that users can
+  ;; override if desired (with remove-hook)
+  (add-hook 'fill-nobreak-predicate
+            'markdown-inside-link-text-p nil t)
+  (add-hook 'fill-nobreak-predicate
+            'markdown-line-is-reference-definition-p nil t)
+
+  ;; Indentation
+  (setq indent-line-function markdown-indent-function)
+
+  ;; Backwards compatibility with markdown-css-path
+  (when (boundp 'markdown-css-path)
+    (warn "markdown-css-path is deprecated, see markdown-css-paths.")
+    (add-to-list 'markdown-css-paths markdown-css-path))
+
+  ;; Prepare hooks for XEmacs compatibility
+  (when (featurep 'xemacs)
+    (make-local-hook 'after-change-functions)
+    (make-local-hook 'font-lock-extend-region-functions)
+    (make-local-hook 'window-configuration-change-hook))
+
+  ;; Anytime text changes make sure it gets fontified correctly
+  (add-hook 'after-change-functions
+            'markdown-check-change-for-wiki-link-after-change t t)
+
+  ;; Make checkboxes buttons
+  (when markdown-make-gfm-checkboxes-buttons
+    (markdown-make-gfm-checkboxes-buttons (point-min) (point-max))
+    (add-hook 'after-change-functions 'markdown-gfm-checkbox-after-change-function t t))
+
+  ;; If we left the buffer there is a really good chance we were
+  ;; creating one of the wiki link documents. Make sure we get
+  ;; refontified when we come back.
+  (add-hook 'window-configuration-change-hook
+            'markdown-fontify-buffer-wiki-links t t)
+
+  ;; add live preview export hook
+  (add-hook 'after-save-hook #'markdown-live-preview-if-markdown t t)
+  (add-hook 'kill-buffer-hook #'markdown-live-preview-remove-on-kill t t)
+
+  ;; do the initial link fontification
+  (markdown-fontify-buffer-wiki-links))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+
+
+;;; GitHub Flavored Markdown Mode  ============================================
+
+(defvar gfm-mode-hook nil
+  "Hook run when entering GFM mode.")
+
+(defvar gfm-font-lock-keywords
+  (append
+   ;; GFM features to match first
+   (list
+    (cons markdown-regex-strike-through '((3 markdown-markup-face)
+                                          (4 markdown-strike-through-face)
+                                          (5 markdown-markup-face))))
+   ;; Basic Markdown features (excluding possibly overridden ones)
+   markdown-mode-font-lock-keywords-basic)
+  "Default highlighting expressions for GitHub Flavored Markdown mode.")
+
+;;;###autoload
+(define-derived-mode gfm-mode markdown-mode "GFM"
+  "Major mode for editing GitHub Flavored Markdown files."
+  (setq markdown-link-space-sub-char "-")
+  (set (make-local-variable 'font-lock-defaults)
+       '(gfm-font-lock-keywords))
+  ;; do the initial link fontification
+  (markdown-fontify-buffer-wiki-links)
+  (markdown-gfm-parse-buffer-for-languages))
+
+
+;;; Live Preview Mode  ============================================
+(define-minor-mode markdown-live-preview-mode
+  "Toggle native previewing on save for a specific markdown file."
+  :lighter " MD-Preview"
+  (if markdown-live-preview-mode
+      (markdown-display-buffer-other-window (markdown-live-preview-export))
+    (markdown-live-preview-remove)))
+
+
+(provide 'markdown-mode)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; markdown-mode.el ends here
diff --git a/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme-autoloads.el b/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme-autoloads.el
deleted file mode 100644
index d97c9dc..0000000
--- a/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme-autoloads.el
+++ /dev/null
@@ -1,19 +0,0 @@
-;;; monokai-theme-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "monokai-theme" "monokai-theme.el" (21898 47967
-;;;;;;  0 0))
-;;; Generated autoloads from monokai-theme.el
-
-(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; monokai-theme-autoloads.el ends here
diff --git a/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme-pkg.el b/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme-pkg.el
deleted file mode 100644
index 970f4e4..0000000
--- a/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "monokai-theme" "20150521.2257" "A fruity color theme for Emacs." 'nil :url "http://github.com/oneKelvinSmith/monokai-emacs")
diff --git a/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme.el b/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme.el
deleted file mode 100644
index 076cc57..0000000
--- a/emacs.d/elpa/monokai-theme-20150521.2257/monokai-theme.el
+++ /dev/null
@@ -1,5393 +0,0 @@
-;;; monokai-theme.el --- A fruity color theme for Emacs.
-
-;; Copyright (C) 2011-2013
-
-;; Author: Kelvin Smith <oneKelvinSmith@gmail.com>
-;; URL: http://github.com/oneKelvinSmith/monokai-emacs
-;; Package-Version: 20150521.2257
-;; Version: 0.2.0
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; A port of the popular Textmate theme Monokai for Emacs 24, built on top
-;; of the new built-in theme support in Emacs 24.
-;;
-;;; Credits:
-;;
-;; Wimer Hazenberg created the original theme.
-;; - http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
-;;
-;; Bozhidar Batsov created zenburn-theme.el and solarized-theme.el
-;;  on which this file is based.
-;; - https://github.com/bbatsov/zenburn-emacs
-;;
-;; Color Scheme Designer 3 for complementary colours.
-;; - http://colorschemedesigner.com/
-;;
-;; K. Adam Christensen for his personal monokai theme that addresses 256 colours.
-;; - https://github.com/pope/personal/blob/master/etc/emacs.d/monokai-theme.el
-;;
-;; Thomas Frössman for his work on solarized-emacs.
-;; - http://github.com/bbatsov/solarized-emacs
-;;
-;;; Code:
-
-(unless (>= emacs-major-version 24)
-  (error "The monokai theme requires Emacs 24 or later!"))
-
-(deftheme monokai "The Monokai colour theme")
-
-(defgroup monokai nil
-  "Monokai theme options.
-The theme has to be reloaded after changing anything in this group."
-  :group 'faces)
-
-(defcustom monokai-distinct-fringe-background nil
-  "Make the fringe background different from the normal background color.
-Also affects 'linum-mode' background."
-  :type 'boolean
-  :group 'monokai)
-
-(defcustom monokai-use-variable-pitch t
-  "Use variable pitch face for some headings and titles."
-  :type 'boolean
-  :group 'monokai)
-
-(defcustom monokai-high-contrast-mode-line nil
-  "Make the active/inactive mode line stand out more."
-  :type 'boolean
-  :group 'monokai)
-
-(defcustom monokai-height-minus-1 0.8
-  "Font size -1."
-  :type 'number
-  :group 'monokai)
-
-(defcustom monokai-height-plus-1 1.1
-  "Font size +1."
-  :type 'number
-  :group 'monokai)
-
-(defcustom monokai-height-plus-2 1.15
-  "Font size +2."
-  :type 'number
-  :group 'monokai)
-
-(defcustom monokai-height-plus-3 1.2
-  "Font size +3."
-  :type 'number
-  :group 'monokai)
-
-(defcustom monokai-height-plus-4 1.3
-  "Font size +4."
-  :type 'number
-  :group 'monokai)
-
-(let* ((class                    '((class color) (min-colors 257)))
-       ;; Primary colors
-       (yellow                   "#E6DB74")
-       (orange                   "#FD971F")
-       (red                      "#F92672")
-       (magenta                  "#FD5FF0")
-       (violet                   "#AE81FF")
-       (blue                     "#66D9EF")
-       (cyan                     "#A1EFE4")
-       (green                    "#A6E22E")
-       (gray                     "#474747")
-       ;; Darker and lighter accented colors
-       (yellow-d                 "#968B26")
-       (yellow-l                 "#F3EA98")
-       (orange-d                 "#A45E0A")
-       (orange-l                 "#FEB257")
-       (red-d                    "#A20C41")
-       (red-l                    "#FC5C94")
-       (magenta-d                "#A41F99")
-       (magenta-l                "#FE87F4")
-       (violet-d                 "#562AA6")
-       (violet-l                 "#C2A1FF")
-       (blue-d                   "#21889B")
-       (blue-l                   "#8DE6F7")
-       (cyan-d                   "#349B8D")
-       (cyan-l                   "#BBF7EF")
-       (green-d                  "#67930F")
-       (green-l                  "#C1F161")
-       (gray-d                   "#333333")
-       (gray-l                   "#6b6b6b")
-       ;; Adaptive colors
-       (monokai-fg               "#F8F8F2")
-       (monokai-bg               "#272822")
-       (monokai-hl-line          "#3E3D31")
-       (monokai-hl               "#49483E")
-       (monokai-emph             "#F8F8F0")
-       (monokai-comments         "#75715E")
-       ;; Adaptive higher/lower contrast accented colors
-       (monokai-fg-hc            "#141414")
-       (monokai-fg-lc            "#171A0B")
-       ;; High contrast colors
-       (yellow-hc                yellow-l)
-       (yellow-lc                yellow-d)
-       (orange-hc                orange-l)
-       (orange-lc                orange-d)
-       (red-hc                   red-l)
-       (red-lc                   red-d)
-       (magenta-hc               magenta-l)
-       (magenta-lc               magenta-d)
-       (violet-hc                violet-l)
-       (violet-lc                violet-d)
-       (blue-hc                  blue-l)
-       (blue-lc                  blue-d)
-       (cyan-hc                  cyan-l)
-       (cyan-lc                  cyan-d)
-       (green-hc                 green-l)
-       (green-lc                 green-d)
-       ;; customize based face properties
-       (s-variable-pitch         (if monokai-use-variable-pitch
-                                     'variable-pitch 'default))
-       (s-fringe-bg              (if monokai-distinct-fringe-background
-                                     monokai-hl monokai-bg))
-       (s-mode-line-fg           (if monokai-high-contrast-mode-line
-                                     monokai-bg monokai-fg))
-       (s-mode-line-bg           (if monokai-high-contrast-mode-line
-                                     monokai-fg monokai-hl-line))
-       (s-mode-line-buffer-id-fg (if monokai-high-contrast-mode-line
-                                     'unspecified green))
-       (s-mode-line-inactive-fg  (if monokai-high-contrast-mode-line
-                                     monokai-fg monokai-comments))
-       (s-mode-line-inactive-bg  (if monokai-high-contrast-mode-line
-                                     monokai-hl-line monokai-bg))
-       (s-mode-line-inactive-bc  (if monokai-high-contrast-mode-line
-                                     monokai-fg monokai-hl-line))
-
-       ;; Definitions for terminals that do not support 256 colors
-       (terminal-class                    '((class color) (min-colors 89)))
-       ;; Primary colors
-       (terminal-yellow                   "#CDC673")
-       (terminal-orange                   "#FF8C00")
-       (terminal-red                      "#FF1493")
-       (terminal-magenta                  "#D700D7")
-       (terminal-violet                   "#AF87FF")
-       (terminal-blue                     "#5FD7FF")
-       (terminal-cyan                     "#5FFFFF")
-       (terminal-green                    "#87D700")
-       (terminal-gray                     "#444444")
-       ;; Darker and lighter accented colors
-       ;;
-       ;; TODO: find terminal equivalents for all window colors (on the right)
-       ;;
-       (terminal-yellow-d                 "#968B26")
-       (terminal-yellow-l                 "#FFF68F")
-       (terminal-orange-d                 "#A0522D")
-       (terminal-orange-l                 "#FFA54F")
-       (terminal-red-d                    "#5F0000")
-       (terminal-red-l                    "#EE6AA7")
-       (terminal-magenta-d                "#A41F99")
-       (terminal-magenta-l                "#FE87F4")
-       (terminal-violet-d                 "#562AA6")
-       (terminal-violet-l                 "#C2A1FF")
-       (terminal-blue-d                   "#21889B")
-       (terminal-blue-l                   "#8DE6F7")
-       (terminal-cyan-d                   "#349B8D")
-       (terminal-cyan-l                   "#AFEEEE")
-       (terminal-green-d                  "#6B8E23")
-       (terminal-green-l                  "#B3EE3A")
-       (terminal-gray-d                   "#3a3a3a")
-       (terminal-gray-l                   "#6c6c6c")
-       ;; Adaptive colors
-       (terminal-monokai-fg               "#F5F5F5")
-       (terminal-monokai-bg               "#1B1E1C")
-       (terminal-monokai-hl-line          "#212121")
-       (terminal-monokai-hl               "#303030")
-       (terminal-monokai-emph             "#FFFAFA")
-       (terminal-monokai-comments         "#8B8878")
-       ;; Adaptive higher/lower contrast accented colors
-       (terminal-monokai-fg-hc            "#171A0B")
-       (terminal-monokai-fg-lc            "#141414")
-       ;; High contrast colors
-       (terminal-yellow-hc                yellow-d)
-       (terminal-yellow-lc                yellow-l)
-       (terminal-orange-hc                orange-d)
-       (terminal-orange-lc                orange-l)
-       (terminal-red-hc                   red-d)
-       (terminal-red-lc                   red-l)
-       (terminal-magenta-hc               magenta-d)
-       (terminal-magenta-lc               magenta-l)
-       (terminal-violet-hc                violet-d)
-       (terminal-violet-lc                violet-l)
-       (terminal-blue-hc                  blue-d)
-       (terminal-blue-lc                  blue-l)
-       (terminal-cyan-hc                  cyan-d)
-       (terminal-cyan-lc                  cyan-l)
-       (terminal-green-hc                 green-d)
-       (terminal-green-lc                 green-l)
-       ;; customize based face properties
-       (terminal-s-variable-pitch         (if monokai-use-variable-pitch
-                                              'variable-pitch 'default))
-       (terminal-s-fringe-bg              (if monokai-distinct-fringe-background
-                                              terminal-monokai-hl terminal-monokai-bg))
-       (terminal-s-mode-line-fg           (if monokai-high-contrast-mode-line
-                                              terminal-monokai-bg terminal-monokai-fg))
-       (terminal-s-mode-line-bg           (if monokai-high-contrast-mode-line
-                                              terminal-monokai-fg terminal-monokai-hl-line))
-       (terminal-s-mode-line-buffer-id-fg (if monokai-high-contrast-mode-line
-                                              'unspecified terminal-green))
-       (terminal-s-mode-line-inactive-fg  (if monokai-high-contrast-mode-line
-                                              terminal-monokai-fg terminal-monokai-comments))
-       (terminal-s-mode-line-inactive-bg  (if monokai-high-contrast-mode-line
-                                              terminal-monokai-hl-line terminal-monokai-bg))
-       (terminal-s-mode-line-inactive-bc  (if monokai-high-contrast-mode-line
-                                              terminal-monokai-fg terminal-monokai-hl-line)))
-
-  ;; Define faces
-  (custom-theme-set-faces
-   'monokai
-   '(button ((t (:underline t))))
-
-   ;; basic coloring
-   `(default
-      ((,class (:foreground ,monokai-fg
-                            :background ,monokai-bg))
-       (,terminal-class (:foreground ,terminal-monokai-fg
-                                     :background ,terminal-monokai-bg))))
-
-   `(shadow
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(match
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :weight bold))))
-
-   `(cursor
-     ((,class (:foreground ,monokai-bg
-                           :background ,monokai-fg
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-monokai-fg
-                                    :inverse-video t))))
-
-   `(mouse
-     ((,class (:foreground ,monokai-bg
-                           :background ,monokai-fg
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-monokai-fg
-                                    :inverse-video t))))
-
-   `(escape-glyph-face
-     ((,class (:foreground ,red)))
-     ((,terminal-class (:foreground ,terminal-red))))
-
-   `(fringe
-     ((,class (:foreground ,monokai-fg
-                           :background ,s-fringe-bg))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :background ,terminal-s-fringe-bg))))
-
-   `(highlight
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(link
-     ((,class (:foreground ,blue
-                           :underline t
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :underline t
-                                    :weight bold))))
-
-   `(link-visited
-     ((,class (:foreground ,blue
-                           :underline t
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :underline t
-                                    :weight normal))))
-
-   `(success
-     ((,class (:foreground ,green ))
-      (,terminal-class (:foreground ,terminal-green ))))
-
-   `(warning
-     ((,class (:foreground ,yellow ))
-      (,terminal-class (:foreground ,terminal-yellow ))))
-
-   `(error
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(lazy-highlight
-     ((,class (:foreground ,monokai-bg
-                           :background ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-yellow
-                                    :weight normal))))
-
-   `(escape-glyph
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   ;; compilation
-   `(compilation-column-face
-     ((,class (:foreground ,cyan
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :underline nil))))
-
-   `(compilation-column-number
-     ((,class (:inherit font-lock-doc-face
-                        :foreground ,cyan
-                        :underline nil))
-      (,terminal-class (:inherit font-lock-doc-face
-                                 :foreground ,terminal-cyan
-                                 :underline nil))))
-
-   `(compilation-enter-directory-face
-     ((,class (:foreground ,green
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-green
-                                    :underline nil))))
-
-   `(compilation-error
-     ((,class (:inherit error
-                        :underline nil))
-      (,terminal-class (:inherit error
-                                 :underline nil))))
-
-   `(compilation-error-face
-     ((,class (:foreground ,red
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-red
-                                    :underline nil))))
-
-   `(compilation-face
-     ((,class (:foreground ,monokai-fg
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :underline nil))))
-
-   `(compilation-info
-     ((,class (:foreground ,monokai-comments
-                           :underline nil
-                           :bold nil))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :underline nil
-                                    :bold nil))))
-
-   `(compilation-info-face
-     ((,class (:foreground ,blue
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :underline nil))))
-
-   `(compilation-leave-directory-face
-     ((,class (:foreground ,green
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-green
-                                    :underline nil))))
-
-   `(compilation-line-face
-     ((,class (:foreground ,green
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-green
-                                    :underline nil))))
-
-   `(compilation-line-number
-     ((,class (:foreground ,green
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-green
-                                    :underline nil))))
-
-   `(compilation-warning
-     ((,class (:inherit warning
-                        :underline nil))
-      (,terminal-class (:inherit warning
-                                 :underline nil))))
-
-   `(compilation-warning-face
-     ((,class (:foreground ,yellow
-                           :weight normal
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal
-                                    :underline nil))))
-
-   `(compilation-mode-line-exit
-     ((,class (:inherit compilation-info
-                        :foreground ,green
-                        :weight bold))
-      (,terminal-class (:inherit compilation-info
-                                 :foreground ,terminal-green
-                                 :weight bold))))
-
-   `(compilation-mode-line-fail
-     ((,class (:inherit compilation-error
-                        :foreground ,red
-                        :weight bold))
-      (,terminal-class (:inherit compilation-error
-                                 :foreground ,terminal-red
-                                 :weight bold))))
-
-   `(compilation-mode-line-run
-     ((,class (:foreground ,orange
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold))))
-
-   ;; cua
-   `(cua-global-mark
-     ((,class (:background ,yellow
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(cua-rectangle
-    ((,class (:inherit region
-                        :background ,magenta
-                        :foreground ,monokai-bg))
-      (,terminal-class (:inherit region
-                                 :background ,terminal-magenta
-                                 :foreground ,terminal-monokai-bg))))
-
-   `(cua-rectangle-noselect
-     ((,class (:inherit region
-                        :background ,monokai-hl
-                        :foreground ,monokai-comments))
-      (,terminal-class (:inherit region
-                                 :background ,terminal-monokai-hl
-                                 :foreground ,terminal-monokai-comments))))
-
-   ;; diary
-   `(diary
-     ((,class (:foreground ,yellow))
-      (,class (:foreground ,terminal-yellow))))
-
-   ;; dired
-   `(dired-directory
-     ((,class (:foreground ,blue
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight normal))))
-
-   `(dired-flagged
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(dired-header
-     ((,class (:foreground ,monokai-bg
-                           :background ,blue))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-blue))))
-
-   `(dired-ignored
-     ((,class (:inherit shadow))
-      (,terminal-class (:inherit shadow))))
-
-   `(dired-mark
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(dired-marked
-     ((,class (:foreground ,magenta
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :weight bold))))
-
-   `(dired-perm-write
-     ((,class (:foreground ,monokai-fg
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :underline t))))
-
-   `(dired-symlink
-     ((,class (:foreground ,cyan
-                           :weight normal
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :weight normal
-                                    :slant italic))))
-
-   `(dired-warning
-     ((,class (:foreground ,orange
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :underline t))))
-
-   ;; dropdown
-   `(dropdown-list-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,cyan))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-cyan))))
-
-   `(dropdown-list-selection-face
-     ((,class (:background ,cyan-lc
-                           :foreground ,cyan-hc))
-      (,terminal-class (:background ,terminal-cyan-lc
-                                    :foreground ,terminal-cyan-hc))))
-
-   ;; ecb
-   `(ecb-default-highlight-face
-     ((,class (:background ,blue
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(ecb-history-bucket-node-dir-soure-path-face
-     ((,class (:inherit ecb-history-bucket-node-face
-                        :foreground ,yellow))
-      (,terminal-class (:inherit ecb-history-bucket-node-face
-                                 :foreground ,terminal-yellow))))
-
-   `(ecb-source-in-directories-buffer-face
-     ((,class (:inherit ecb-directories-general-face
-                        :foreground ,monokai-fg))
-      (,terminal-class (:inherit ecb-directories-general-face
-                                 :foreground ,terminal-monokai-fg))))
-
-   `(ecb-history-dead-buffer-face
-     ((,class (:inherit ecb-history-general-face
-                        :foreground ,monokai-comments))
-      (,terminal-class (:inherit ecb-history-general-face
-                                 :foreground ,terminal-monokai-comments))))
-
-   `(ecb-directory-not-accessible-face
-     ((,class (:inherit ecb-directories-general-face
-                        :foreground ,monokai-comments))
-      (,terminal-class (:inherit ecb-directories-general-face
-                                 :foreground ,terminal-monokai-comments))))
-
-   `(ecb-bucket-node-face
-     ((,class (:inherit ecb-default-general-face
-                        :weight normal
-                        :foreground ,blue))
-      (,terminal-class (:inherit ecb-default-general-face
-                                 :weight normal
-                                 :foreground ,terminal-blue))))
-
-   `(ecb-tag-header-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(ecb-analyse-bucket-element-face
-     ((,class (:inherit ecb-analyse-general-face
-                        :foreground ,green))
-      (,terminal-class (:inherit ecb-analyse-general-face
-                                 :foreground ,terminal-green))))
-
-   `(ecb-directories-general-face
-     ((,class (:inherit ecb-default-general-face
-                        :height 1.0))
-      (,terminal-class (:inherit ecb-default-general-face
-                                 :height 1.0))))
-
-   `(ecb-method-non-semantic-face
-     ((,class (:inherit ecb-methods-general-face
-                        :foreground ,cyan))
-      (,terminal-class (:inherit ecb-methods-general-face
-                                 :foreground ,terminal-cyan))))
-
-   `(ecb-mode-line-prefix-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(ecb-tree-guide-line-face
-     ((,class (:inherit ecb-default-general-face
-                        :foreground ,monokai-hl
-                        :height 1.0))
-      (,terminal-class (:inherit ecb-default-general-face
-                                 :foreground ,terminal-monokai-hl
-                                 :height 1.0))))
-
-   ;; ee
-   `(ee-bookmarked
-     ((,class (:foreground ,monokai-emph))
-      (,terminal-class (:foreground ,terminal-monokai-emph))))
-
-   `(ee-category
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(ee-link
-     ((,class (:inherit link))
-      (,terminal-class (:inherit link))))
-
-   `(ee-link-visited
-     ((,class (:inherit link-visited))
-      (,terminal-class (:inherit link-visited))))
-
-   `(ee-marked
-     ((,class (:foreground ,magenta
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :weight bold))))
-
-   `(ee-omitted
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(ee-shadow
-     ((,class (:inherit shadow))
-      (,terminal-class (:inherit shadow))))
-
-   ;; grep
-   `(grep-context-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(grep-error-face
-     ((,class (:foreground ,red
-                           :weight bold
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold
-                                    :underline t))))
-
-   `(grep-hit-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(grep-match-face
-     ((,class (:foreground ,orange
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold))))
-
-   ;; faces used by isearch
-   `(isearch
-     ((,class (:foreground ,monokai-bg
-                           :background ,magenta
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-magenta
-                                    :weight normal))))
-
-   `(isearch-fail
-     ((,class (:foreground ,red
-                           :background ,monokai-bg
-                           :bold t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg
-                                    :bold t))))
-
-   ;; man
-   `(Man-overstrike
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(Man-reverse
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(Man-underline
-     ((,class (:foreground ,green :underline t))
-      (,terminal-class (:foreground ,terminal-green :underline t))))
-
-   ;; misc faces
-   `(menu
-     ((,class (:foreground ,monokai-fg
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :background ,terminal-monokai-bg))))
-
-   `(minibuffer-prompt
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(mode-line
-     ((,class (:inverse-video unspecified
-                              :underline unspecified
-                              :foreground ,s-mode-line-fg
-                              :background ,s-mode-line-bg
-                              :box (:line-width 1
-                                                :color ,s-mode-line-bg
-                                                :style unspecified)))
-      (,terminal-class (:inverse-video unspecified
-                                       :underline unspecified
-                                       :foreground ,terminal-s-mode-line-fg
-                                       :background ,terminal-s-mode-line-bg
-                                       :box (:line-width 1
-                                                         :color ,terminal-s-mode-line-bg
-                                                         :style unspecified)))))
-
-   `(mode-line-buffer-id
-     ((,class (:foreground ,s-mode-line-buffer-id-fg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-s-mode-line-buffer-id-fg
-                                    :weight bold))))
-
-   `(mode-line-inactive
-     ((,class (:inverse-video unspecified
-                              :underline unspecified
-                              :foreground ,s-mode-line-inactive-fg
-                              :background ,s-mode-line-inactive-bg
-                              :box (:line-width 1
-                                                :color ,s-mode-line-inactive-bc
-                                                :style unspecified)))
-      (,terminal-class (:inverse-video unspecified
-                                       :underline unspecified
-                                       :foreground ,terminal-s-mode-line-inactive-fg
-                                       :background ,terminal-s-mode-line-inactive-bg
-                                       :box (:line-width 1
-                                                         :color ,terminal-s-mode-line-inactive-bc
-                                                         :style unspecified)))))
-
-   `(header-line
-     ((,class (:inverse-video unspecified
-                              :underline unspecified
-                              :foreground ,monokai-emph
-                              :background ,monokai-hl
-                              :box (:line-width 1
-                                                :color ,monokai-hl
-                                                :style unspecified)))
-      (,terminal-class (:inverse-video unspecified
-                                       :underline unspecified
-                                       :foreground ,terminal-monokai-emph
-                                       :background ,terminal-monokai-hl
-                                       :box (:line-width 1
-                                                         :color ,terminal-monokai-hl
-                                                         :style unspecified)))))
-
-   `(region
-     ((,class (:background ,monokai-hl
-                           :inherit t))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :inherit t))))
-
-   `(secondary-selection
-     ((,class (:background ,monokai-hl
-                           :inherit t))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :inherit t))))
-
-
-   `(trailing-whitespace
-     ((,class (:background ,red))
-      (,terminal-class (:background ,terminal-red))))
-
-   `(vertical-border
-     ((,class (:foreground ,monokai-hl))
-      (,terminal-class (:foreground ,terminal-monokai-hl))))
-
-   ;; font lock
-   `(font-lock-builtin-face
-     ((,class (:foreground ,red
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight normal))))
-
-   `(font-lock-comment-delimiter-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(font-lock-comment-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(font-lock-constant-face
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(font-lock-doc-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(font-lock-function-name-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(font-lock-keyword-face
-     ((,class (:foreground ,red
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight normal))))
-
-   `(font-lock-negation-char-face
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(font-lock-preprocessor-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(font-lock-regexp-grouping-construct
-     ((,class (:foreground ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal))))
-
-   `(font-lock-regexp-grouping-backslash
-     ((,class (:foreground ,violet
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-violet
-                                    :weight normal))))
-
-   `(font-lock-string-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(font-lock-type-face
-     ((,class (:foreground ,blue
-                           :italic nil))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :italic nil))))
-
-   `(font-lock-variable-name-face
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(font-lock-warning-face
-     ((,class (:foreground ,orange
-                           :weight bold
-                           :italic t
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold
-                                    :italic t
-                                    :underline t))))
-
-   `(c-annotation-face
-     ((,class (:inherit font-lock-constant-face))
-      (,terminal-class (:inherit font-lock-constant-face))))
-
-
-   ;;; external
-
-   ;; ace-jump-mode
-   `(ace-jump-face-background
-     ((,class (:foreground ,monokai-comments
-                           :background ,monokai-bg
-                           :inverse-video nil))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-monokai-bg
-                                    :inverse-video nil))))
-
-   `(ace-jump-face-foreground
-     ((,class (:foreground ,yellow
-                           :background ,monokai-bg
-                           :inverse-video nil
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :background ,terminal-monokai-bg
-                                    :inverse-video nil
-                                    :weight bold))))
-
-   ;; auctex
-   `(font-latex-bold-face
-     ((,class (:inherit bold
-                        :foreground ,monokai-emph))
-      (,terminal-class (:inherit bold
-                                 :foreground ,terminal-monokai-emph))))
-
-   `(font-latex-doctex-documentation-face
-     ((,class (:background unspecified))
-      (,terminal-class (:background unspecified))))
-
-   `(font-latex-doctex-preprocessor-face
-     ((,class
-       (:inherit (font-latex-doctex-documentation-face
-                  font-lock-builtin-face
-                  font-lock-preprocessor-face)))
-      (,class
-       (:inherit (font-latex-doctex-documentation-face
-                  font-lock-builtin-face
-                  font-lock-preprocessor-face)))))
-
-   `(font-latex-italic-face
-     ((,class (:inherit italic :foreground ,monokai-emph))
-      (,terminal-class (:inherit italic :foreground ,terminal-monokai-emph))))
-
-   `(font-latex-math-face
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(font-latex-sectioning-0-face
-     ((,class (:inherit font-latex-sectioning-1-face
-                        :height ,monokai-height-plus-1))
-      (,terminal-class (:inherit font-latex-sectioning-1-face
-                                 :height ,monokai-height-plus-1))))
-
-   `(font-latex-sectioning-1-face
-     ((,class (:inherit font-latex-sectioning-2-face
-                        :height ,monokai-height-plus-1))
-      (,terminal-class (:inherit font-latex-sectioning-2-face
-                                 :height ,monokai-height-plus-1))))
-
-   `(font-latex-sectioning-2-face
-     ((,class (:inherit font-latex-sectioning-3-face
-                        :height ,monokai-height-plus-1))
-      (,terminal-class (:inherit font-latex-sectioning-3-face
-                                 :height ,monokai-height-plus-1))))
-
-   `(font-latex-sectioning-3-face
-     ((,class (:inherit font-latex-sectioning-4-face
-                        :height ,monokai-height-plus-1))
-      (,terminal-class (:inherit font-latex-sectioning-4-face
-                                 :height ,monokai-height-plus-1))))
-
-   `(font-latex-sectioning-4-face
-     ((,class (:inherit font-latex-sectioning-5-face
-                        :height ,monokai-height-plus-1))
-      (,terminal-class (:inherit font-latex-sectioning-5-face
-                                 :height ,monokai-height-plus-1))))
-
-   `(font-latex-sectioning-5-face
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,yellow
-                        :weight bold))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch :
-                                 foreground ,terminal-yellow
-                                 :weight bold))))
-
-   `(font-latex-sedate-face
-     ((,class (:foreground ,monokai-emph))
-      (,terminal-class (:foreground ,terminal-monokai-emph))))
-
-   `(font-latex-slide-title-face
-     ((,class (:inherit (,s-variable-pitch font-lock-type-face)
-                        :weight bold
-                        :height ,monokai-height-plus-3))
-      (,terminal-class (:inherit (,terminal-s-variable-pitch font-lock-type-face)
-                                 :weight bold
-                                 :height ,monokai-height-plus-3))))
-
-   `(font-latex-string-face
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(font-latex-subscript-face
-     ((,class (:height ,monokai-height-minus-1))
-      (,terminal-class (:height ,monokai-height-minus-1))))
-
-   `(font-latex-superscript-face
-     ((,class (:height ,monokai-height-minus-1))
-      (,terminal-class (:height ,monokai-height-minus-1))))
-
-   `(font-latex-verbatim-face
-     ((,class (:inherit fixed-pitch
-                        :foreground ,monokai-fg
-                        :slant italic))
-      (,terminal-class (:inherit fixed-pitch
-                                 :foreground ,terminal-monokai-fg
-                                 :slant italic))))
-
-   `(font-latex-warning-face
-     ((,class (:inherit bold
-                        :foreground ,orange))
-      (,terminal-class (:inherit bold
-                                 :foreground ,terminal-orange))))
-
-   ;; auto-complete
-   `(ac-candidate-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,cyan))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-cyan))))
-
-   `(ac-selection-face
-     ((,class (:background ,cyan-lc
-                           :foreground ,cyan-hc))
-      (,terminal-class (:background ,terminal-cyan-lc
-                                    :foreground ,terminal-cyan-hc))))
-
-   `(ac-candidate-mouse-face
-     ((,class (:background ,cyan-hc
-                           :foreground ,cyan-lc))
-      (,terminal-class (:background ,terminal-cyan-hc
-                                    :foreground ,terminal-cyan-lc))))
-
-   `(ac-completion-face
-     ((,class (:foreground ,monokai-emph
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :underline t))))
-
-   `(ac-gtags-candidate-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,blue))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-blue))))
-
-   `(ac-gtags-selection-face
-     ((,class (:background ,blue-lc
-                           :foreground ,blue-hc))
-      (,terminal-class (:background ,terminal-blue-lc
-                                    :foreground ,terminal-blue-hc))))
-
-   `(ac-yasnippet-candidate-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,yellow))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-yellow))))
-
-   `(ac-yasnippet-selection-face
-     ((,class (:background ,yellow-lc
-                           :foreground ,yellow-hc))
-      (,terminal-class (:background ,terminal-yellow-lc
-                                    :foreground ,terminal-yellow-hc))))
-
-   ;; auto highlight symbol
-   `(ahs-definition-face
-     ((,class (:foreground ,magenta
-                           :background unspecified
-                           :slant normal))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background unspecified
-                                    :slant normal))))
-
-   `(ahs-edit-mode-face
-     ((,class (:foreground ,monokai-bg
-                           :background ,magenta))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-magenta))))
-
-   `(ahs-face
-     ((,class (:foreground ,magenta
-                           :background unspecified))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background unspecified))))
-
-   `(ahs-plugin-bod-face
-     ((,class (:foreground ,magenta
-                           :background unspecified ))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background unspecified ))))
-
-   `(ahs-plugin-defalt-face
-     ((,class (:foreground ,magenta
-                           :background unspecified))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background unspecified))))
-
-   `(ahs-plugin-whole-buffer-face
-     ((,class (:foreground ,magenta
-                           :background unspecified))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background unspecified))))
-
-   `(ahs-warning-face
-     ((,class (:foreground ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   ;; android mode
-   `(android-mode-debug-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(android-mode-error-face
-     ((,class (:foreground ,orange
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold))))
-
-   `(android-mode-info-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(android-mode-verbose-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(android-mode-warning-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   ;; anzu-mode
-   `(anzu-mode-line
-     ((,class (:foreground ,magenta
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :weight bold))))
-
-   ;; bm
-   `(bm-face
-     ((,class (:background ,yellow-lc
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow-lc
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(bm-fringe-face
-     ((,class (:background ,yellow-lc
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow-lc
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(bm-fringe-persistent-face
-     ((,class (:background ,green-lc
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-green-lc
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(bm-persistent-face
-     ((,class (:background ,green-lc
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-green-lc
-                                    :foreground ,terminal-monokai-bg))))
-
-   ;; calfw
-   `(cfw:face-day-title
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(cfw:face-annotation
-     ((,class (:inherit cfw:face-day-title
-                        :foreground ,yellow))
-      (,terminal-class (:inherit cfw:face-day-title
-                                 :foreground ,terminal-yellow))))
-
-   `(cfw:face-default-content
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(cfw:face-default-day
-     ((,class (:inherit cfw:face-day-title
-                        :weight bold))
-      (,terminal-class (:inherit cfw:face-day-title
-                                 :weight bold))))
-
-   `(cfw:face-disable
-     ((,class (:inherit cfw:face-day-title
-                        :foreground ,monokai-comments))
-      (,terminal-class (:inherit cfw:face-day-title
-                                 :foreground ,terminal-monokai-comments))))
-
-   `(cfw:face-grid
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(cfw:face-header
-     ((,class (:foreground ,blue-hc
-                           :background ,blue-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue-hc
-                                    :background ,terminal-blue-lc
-                                    :weight bold))))
-
-   `(cfw:face-holiday
-     ((,class (:background nil
-                           :foreground ,red
-                           :weight bold))
-      (,terminal-class (:background nil
-                                    :foreground ,terminal-red
-                                    :weight bold))))
-
-   `(cfw:face-periods
-     ((,class (:foreground ,magenta))
-      (,terminal-class (:foreground ,terminal-magenta))))
-
-   `(cfw:face-select
-     ((,class (:background ,magenta-lc
-                           :foreground ,magenta-hc))
-      (,terminal-class (:background ,terminal-magenta-lc
-                                    :foreground ,terminal-magenta-hc))))
-
-   `(cfw:face-saturday
-     ((,class (:foreground ,cyan-hc
-                           :background ,cyan-lc))
-      (,terminal-class (:foreground ,terminal-cyan-hc
-                                    :background ,terminal-cyan-lc))))
-
-   `(cfw:face-sunday
-     ((,class (:foreground ,red-hc
-                           :background ,red-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red-hc
-                                    :background ,terminal-red-lc
-                                    :weight bold))))
-
-   `(cfw:face-title
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,yellow
-                        :weight bold
-                        :height ,monokai-height-plus-4))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-yellow
-                                 :weight bold
-                                 :height ,monokai-height-plus-4))))
-
-   `(cfw:face-today
-     ((,class (:weight bold
-                       :background ,monokai-hl
-                       :foreground nil))
-      (,terminal-class (:weight bold
-                                :background ,terminal-monokai-hl
-                                :foreground nil))))
-
-   `(cfw:face-today-title
-     ((,class (:background ,yellow-lc
-                           :foreground ,yellow-hc
-                           :weight bold))
-      (,terminal-class (:background ,terminal-yellow-lc
-                                    :foreground ,terminal-yellow-hc
-                                    :weight bold))))
-
-   `(cfw:face-toolbar
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(cfw:face-toolbar-button-off
-     ((,class (:background ,yellow-lc
-                           :foreground ,yellow-hc
-                           :weight bold))
-      (,terminal-class (:background ,terminal-yellow-lc
-                                    :foreground ,terminal-yellow-hc
-                                    :weight bold))))
-
-   `(cfw:face-toolbar-button-on
-     ((,class (:background ,yellow-hc
-                           :foreground ,yellow-lc
-                           :weight bold))
-      (,terminal-class (:background ,terminal-yellow-hc
-                                    :foreground ,terminal-yellow-lc
-                                    :weight bold))))
-
-
-   ;; clojure-test-mode
-   `(clojure-test-failure-face
-     ((,class (:foreground ,orange
-                           :weight bold
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold
-                                    :underline t))))
-
-   `(clojure-test-error-face
-     ((,class (:foreground ,red
-                           :weight bold
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold
-                                    :underline t))))
-
-   `(clojure-test-success-face
-     ((,class (:foreground ,green
-                           :weight bold
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-green
-                                    :weight bold
-                                    :underline t))))
-
-   ;; company-mode
-   `(company-tooltip
-     ((,class (:background ,monokai-hl
-                           :foreground ,cyan))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-cyan))))
-
-   `(company-tooltip-selection
-     ((,class (:background ,cyan-lc
-                           :foreground ,cyan-hc))
-      (,terminal-class (:background ,terminal-cyan-lc
-                                    :foreground ,terminal-cyan-hc))))
-
-   `(company-tooltip-mouse
-     ((,class (:background ,cyan-hc
-                           :foreground ,cyan-lc))
-      (,terminal-class (:background ,terminal-cyan-hc
-                                    :foreground ,terminal-cyan-lc))))
-
-   `(company-tooltip-common
-     ((,class (:foreground ,monokai-emph
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :underline t))))
-
-   `(company-tooltip-common-selection
-     ((,class (:foreground ,monokai-emph
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :underline t))))
-
-   `(company-preview
-     ((,class (:background ,monokai-hl
-                           :foreground ,cyan))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-cyan))))
-
-   `(company-preview-common
-     ((,class (:foreground ,monokai-emph
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :underline t))))
-
-   `(company-scrollbar-bg
-     ((,class (:background ,gray-l))
-      (,terminal-class (:background ,terminal-gray-l))))
-
-   `(company-scrollbar-fg
-     ((,class (:background ,yellow-d))
-      (,terminal-class (:background ,terminal-yellow-d))))
-
-   ;; cscope
-   `(cscope-file-face
-     ((,class (:foreground ,green
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-green
-                                    :weight bold))))
-
-   `(cscope-function-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(cscope-line-number-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(cscope-line-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(cscope-mouse-face
-     ((,class (:background ,blue
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-fg))))
-
-   ;; ctable
-   `(ctbl:face-cell-select
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :underline ,monokai-emph
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :underline ,terminal-monokai-emph
-                                    :weight bold))))
-
-   `(ctbl:face-continue-bar
-     ((,class (:background ,monokai-hl
-                           :foreground ,yellow))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-yellow))))
-
-   `(ctbl:face-row-select
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg
-                           :underline t))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg
-                                    :underline t))))
-
-   ;; coffee
-   `(coffee-mode-class-name
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(coffee-mode-function-param
-     ((,class (:foreground ,violet
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-violet
-                                    :slant italic))))
-
-   ;; custom
-   `(custom-face-tag
-     ((,class (:inherit ,s-variable-pitch
-                        :height ,monokai-height-plus-3
-                        :foreground ,violet
-                        :weight bold))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :height ,monokai-height-plus-3
-                                 :foreground ,terminal-violet
-                                 :weight bold))))
-
-   `(custom-variable-tag
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,cyan
-                        :height ,monokai-height-plus-3))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-cyan
-                                 :height ,monokai-height-plus-3))))
-
-   `(custom-comment-tag
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(custom-group-tag
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,blue
-                        :height ,monokai-height-plus-3))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-blue
-                                 :height ,monokai-height-plus-3))))
-
-   `(custom-group-tag-1
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,red
-                        :height ,monokai-height-plus-3))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-red
-                                 :height ,monokai-height-plus-3))))
-
-   `(custom-state
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   ;; diff
-   `(diff-added
-     ((,class (:foreground ,green
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-green
-                                    :background ,terminal-monokai-bg))))
-
-   `(diff-changed
-     ((,class (:foreground ,blue
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :background ,terminal-monokai-bg))))
-
-   `(diff-removed
-     ((,class (:foreground ,red
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg))))
-
-   `(diff-header
-     ((,class (:background ,monokai-bg))
-      (,terminal-class (:background ,terminal-monokai-bg))))
-
-   `(diff-file-header
-     ((,class (:background ,monokai-bg
-                           :foreground ,monokai-fg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-monokai-fg
-                                    :weight bold))))
-
-   `(diff-refine-added
-     ((,class :foreground ,monokai-bg
-              :background ,green)
-      (,terminal-class :foreground ,terminal-monokai-bg
-                       :background ,terminal-green)))
-
-   `(diff-refine-change
-     ((,class :foreground ,monokai-bg
-              :background ,blue)
-      (,terminal-class :foreground ,terminal-monokai-bg
-                       :background ,terminal-blue)))
-
-   `(diff-refine-removed
-     ((,class (:foreground ,monokai-bg
-                           :background ,red))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-red))))
-
-   ;; ediff
-   `(ediff-fine-diff-A
-     ((,class (:background ,orange-lc))
-      (,terminal-class (:background ,terminal-orange-lc))))
-
-   `(ediff-fine-diff-B
-     ((,class (:background ,green-lc))
-      (,terminal-class (:background ,terminal-green-lc))))
-
-   `(ediff-fine-diff-C
-     ((,class (:background ,yellow-lc))
-      (,terminal-class (:background ,terminal-yellow-lc))))
-
-   `(ediff-current-diff-C
-     ((,class (:background ,blue-lc))
-      (,terminal-class (:background ,terminal-blue-lc))))
-
-   `(ediff-even-diff-A
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-fg-lc ))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-fg-lc ))))
-
-   `(ediff-odd-diff-A
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-fg-hc ))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-fg-hc ))))
-
-   `(ediff-even-diff-B
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-fg-hc ))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-fg-hc ))))
-
-   `(ediff-odd-diff-B
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-fg-lc ))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-fg-lc ))))
-
-   `(ediff-even-diff-C
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-fg ))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-fg ))))
-
-   `(ediff-odd-diff-C
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-bg ))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-bg ))))
-
-   ;; diff-hl
-   `(diff-hl-change
-     ((,class (:background ,blue-lc
-                           :foreground ,blue-hc))
-      (,terminal-class (:background ,terminal-blue-lc
-                                    :foreground ,terminal-blue-hc))))
-
-   `(diff-hl-delete
-     ((,class (:background ,red-lc
-                           :foreground ,red-hc))
-      (,terminal-class (:background ,terminal-red-lc
-                                    :foreground ,terminal-red-hc))))
-
-   `(diff-hl-insert
-     ((,class (:background ,green-lc
-                           :foreground ,green-hc))
-      (,terminal-class (:background ,terminal-green-lc
-                                    :foreground ,terminal-green-hc))))
-
-   `(diff-hl-unknown
-     ((,class (:background ,cyan-lc
-                           :foreground ,cyan-hc))
-      (,terminal-class (:background ,terminal-cyan-lc
-                                    :foreground ,terminal-cyan-hc))))
-
-   ;; edts
-   `(edts-face-error-line
-     ((,(append '((supports :underline (:style line))) class)
-       (:underline (:style line :color ,red)
-                   :inherit unspecified))
-      (,class (:foreground ,red-hc
-                           :background ,red-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style line))) terminal-class)
-       (:underline (:style line :color ,terminal-red)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-red-hc
-                                    :background ,terminal-red-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(edts-face-warning-line
-     ((,(append '((supports :underline (:style line))) class)
-       (:underline (:style line :color ,yellow)
-                   :inherit unspecified))
-      (,class (:foreground ,yellow-hc
-                           :background ,yellow-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style line))) terminal-class)
-       (:underline (:style line :color ,terminal-yellow)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-yellow-hc
-                                    :background ,terminal-yellow-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(edts-face-error-fringe-bitmap
-     ((,class (:foreground ,red
-                           :background unspecified
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background unspecified
-                                    :weight bold))))
-
-   `(edts-face-warning-fringe-bitmap
-     ((,class (:foreground ,yellow
-                           :background unspecified
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :background unspecified
-                                    :weight bold))))
-
-   `(edts-face-error-mode-line
-     ((,class (:background ,red
-                           :foreground unspecified))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground unspecified))))
-
-   `(edts-face-warning-mode-line
-     ((,class (:background ,yellow
-                           :foreground unspecified))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground unspecified))))
-
-
-   ;; elfeed
-   `(elfeed-search-date-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(elfeed-search-feed-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(elfeed-search-tag-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(elfeed-search-title-face
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   ;; enhanced ruby mode
-   `(enh-ruby-string-delimiter-face
-     ((,class (:inherit font-lock-string-face))
-      (,terminal-class (:inherit font-lock-string-face))))
-
-   `(enh-ruby-heredoc-delimiter-face
-     ((,class (:inherit font-lock-string-face))
-      (,terminal-class (:inherit font-lock-string-face))))
-
-   `(enh-ruby-regexp-delimiter-face
-     ((,class (:inherit font-lock-string-face))
-      (,terminal-class (:inherit font-lock-string-face))))
-
-   `(enh-ruby-op-face
-     ((,class (:inherit font-lock-keyword-face))
-      (,terminal-class (:inherit font-lock-keyword-face))))
-
-   `(erm-syn-errline
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,red)
-                   :inherit unspecified))
-      (,class (:foreground ,red-hc
-                           :background ,red-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-red)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-red-hc
-                                    :background ,terminal-red-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(erm-syn-warnline
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,orange)
-                   :inherit unspecified))
-      (,class (:foreground ,orange-hc
-                           :background ,orange-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-orange)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-orange-hc
-                                    :background ,terminal-orange-lc
-                                    :weight bold
-                                    :underline t))))
-
-   ;; epc
-   `(epc:face-title
-     ((,class (:foreground ,blue
-                           :background ,monokai-bg
-                           :weight normal
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :underline nil))))
-
-   ;; erc
-   `(erc-action-face
-     ((,class (:inherit erc-default-face))
-      (,terminal-class (:inherit erc-default-face))))
-
-   `(erc-bold-face
-     ((,class (:weight bold))
-      (,terminal-class (:weight bold))))
-
-   `(erc-current-nick-face
-     ((,class (:foreground ,blue :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(erc-dangerous-host-face
-     ((,class (:inherit font-lock-warning-face))
-      (,terminal-class (:inherit font-lock-warning-face))))
-
-   `(erc-default-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(erc-highlight-face
-     ((,class (:inherit erc-default-face
-                        :background ,monokai-hl))
-      (,terminal-class (:inherit erc-default-face
-                                 :background ,terminal-monokai-hl))))
-
-   `(erc-direct-msg-face
-     ((,class (:inherit erc-default-face))
-      (,terminal-class (:inherit erc-default-face))))
-
-   `(erc-error-face
-     ((,class (:inherit font-lock-warning-face))
-      (,terminal-class (:inherit font-lock-warning-face))))
-
-   `(erc-fool-face
-     ((,class (:inherit erc-default-face))
-      (,terminal-class (:inherit erc-default-face))))
-
-   `(erc-input-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(erc-keyword-face
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(erc-nick-default-face
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(erc-my-nick-face
-     ((,class (:foreground ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   `(erc-nick-msg-face
-     ((,class (:inherit erc-default-face))
-      (,terminal-class (:inherit erc-default-face))))
-
-   `(erc-notice-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(erc-pal-face
-     ((,class (:foreground ,orange
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold))))
-
-   `(erc-prompt-face
-     ((,class (:foreground ,orange
-                           :background ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :background ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(erc-timestamp-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(erc-underline-face
-     ((t (:underline t))))
-
-   ;; eshell
-   `(eshell-prompt
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(eshell-ls-archive
-     ((,class (:foreground ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   `(eshell-ls-backup
-     ((,class (:inherit font-lock-comment-face))
-      (,terminal-class (:inherit font-lock-comment-face))))
-
-   `(eshell-ls-clutter
-     ((,class (:inherit font-lock-comment-face))
-      (,terminal-class (:inherit font-lock-comment-face))))
-
-   `(eshell-ls-directory
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(eshell-ls-executable
-     ((,class (:foreground ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   `(eshell-ls-unreadable
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(eshell-ls-missing
-     ((,class (:inherit font-lock-warning-face))
-      (,terminal-class (:inherit font-lock-warning-face))))
-
-   `(eshell-ls-product
-     ((,class (:inherit font-lock-doc-face))
-      (,terminal-class (:inherit font-lock-doc-face))))
-
-   `(eshell-ls-special
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(eshell-ls-symlink
-     ((,class (:foreground ,cyan
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :weight bold))))
-
-   ;; fic
-   `(fic-author-face
-     ((,class (:background ,monokai-bg
-                           :foreground ,orange
-                           :underline t
-                           :slant italic))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-orange
-                                    :underline t
-                                    :slant italic))))
-
-   `(fic-face
-     ((,class (:background ,monokai-bg
-                           :foreground ,orange
-                           :weight normal
-                           :slant italic))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-orange
-                                    :weight normal
-                                    :slant italic))))
-
-   `(font-lock-fic-face
-     ((,class (:background ,monokai-bg
-                           :foreground ,orange
-                           :weight normal
-                           :slant italic))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-orange
-                                    :weight normal
-                                    :slant italic))))
-
-   ;; flx
-   `(flx-highlight-face
-     ((,class (:foreground ,blue
-                           :weight normal
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight normal
-                                    :underline nil))))
-
-   ;; flymake
-   `(flymake-errline
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,red)
-                   :inherit unspecified
-                   :foreground unspecified
-                   :background unspecified))
-      (,class (:foreground ,red-hc
-                           :background ,red-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-red)
-                   :inherit unspecified
-                   :foreground unspecified
-                   :background unspecified))
-      (,terminal-class (:foreground ,terminal-red-hc
-                                    :background ,terminal-red-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(flymake-infoline
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,green)
-                   :inherit unspecified
-                   :foreground unspecified
-                   :background unspecified))
-      (,class (:foreground ,green-hc
-                           :background ,green-lc))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-green)
-                   :inherit unspecified
-                   :foreground unspecified
-                   :background unspecified))
-      (,terminal-class (:foreground ,terminal-green-hc
-                                    :background ,terminal-green-lc))))
-
-   `(flymake-warnline
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,yellow)
-                   :inherit unspecified
-                   :foreground unspecified
-                   :background unspecified))
-      (,class (:foreground ,yellow-hc
-                           :background ,yellow-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-yellow)
-                   :inherit unspecified
-                   :foreground unspecified
-                   :background unspecified))
-      (,terminal-class (:foreground ,terminal-yellow-hc
-                                    :background ,terminal-yellow-lc
-                                    :weight bold
-                                    :underline t))))
-
-   ;; flycheck
-   `(flycheck-error
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,red)
-                   :inherit unspecified))
-      (,class (:foreground ,red-hc
-                           :background ,red-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-red)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-red-hc
-                                    :background ,terminal-red-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(flycheck-warning
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,yellow)
-                   :inherit unspecified))
-      (,class (:foreground ,yellow-hc
-                           :background ,yellow-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-yellow)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-yellow-hc
-                                    :background ,terminal-yellow-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(flycheck-info
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,blue)
-                   :inherit unspecified))
-      (,class (:foreground ,blue-hc
-                           :background ,blue-lc
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-blue)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-blue-hc
-                                    :background ,terminal-blue-lc
-                                    :weight bold
-                                    :underline t))))
-
-   `(flycheck-fringe-error
-     ((,class (:foreground ,red-hc
-                           :background ,red-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red-hc
-                                    :background ,terminal-red-lc
-                                    :weight bold))))
-
-   `(flycheck-fringe-warning
-     ((,class (:foreground ,yellow-hc
-                           :background ,yellow-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow-hc
-                                    :background ,terminal-yellow-lc
-                                    :weight bold))))
-
-   `(flycheck-fringe-info
-     ((,class (:foreground ,blue-hc
-                           :background ,blue-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue-hc
-                                    :background ,terminal-blue-lc
-                                    :weight bold))))
-
-   ;; flyspell
-   `(flyspell-duplicate
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,yellow)
-                   :inherit unspecified))
-      (,class (:foreground ,yellow
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-yellow)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold
-                                    :underline t))))
-
-   `(flyspell-incorrect
-     ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,red)
-                   :inherit unspecified))
-      (,class (:foreground ,red
-                           :weight bold
-                           :underline t))
-      (,(append '((supports :underline (:style wave))) terminal-class)
-       (:underline (:style wave :color ,terminal-red)
-                   :inherit unspecified))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold
-                                    :underline t))))
-
-
-   ;; git-gutter
-   `(git-gutter:added
-     ((,class (:background ,green
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-green
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter:deleted
-     ((,class (:background ,red
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter:modified
-     ((,class (:background ,blue
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter:unchanged
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   ;; git-gutter-fr
-   `(git-gutter-fr:added
-     ((,class (:foreground ,green
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-green
-                                    :weight bold))))
-
-   `(git-gutter-fr:deleted
-     ((,class (:foreground ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   `(git-gutter-fr:modified
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   ;; git-gutter+ and git-gutter+-fr
-   `(git-gutter+-added
-     ((,class (:background ,green
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-green
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter+-deleted
-     ((,class (:background ,red
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter+-modified
-     ((,class (:background ,blue
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter+-unchanged
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(git-gutter-fr+-added
-     ((,class (:foreground ,green
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-green
-                                    :weight bold))))
-
-   `(git-gutter-fr+-deleted
-     ((,class (:foreground ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   `(git-gutter-fr+-modified
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   ;; guide-key
-   `(guide-key/highlight-command-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(guide-key/key-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(guide-key/prefix-command-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   ;; gnus
-   `(gnus-group-mail-1
-     ((,class (:weight bold
-                       :inherit gnus-group-mail-1-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-mail-1-empty))))
-
-   `(gnus-group-mail-1-empty
-     ((,class (:inherit gnus-group-news-1-empty))
-      (,terminal-class (:inherit gnus-group-news-1-empty))))
-
-   `(gnus-group-mail-2
-     ((,class (:weight bold
-                       :inherit gnus-group-mail-2-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-mail-2-empty))))
-
-   `(gnus-group-mail-2-empty
-     ((,class (:inherit gnus-group-news-2-empty))
-      (,terminal-class (:inherit gnus-group-news-2-empty))))
-
-   `(gnus-group-mail-3
-     ((,class (:weight bold
-                       :inherit gnus-group-mail-3-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-mail-3-empty))))
-
-   `(gnus-group-mail-3-empty
-     ((,class (:inherit gnus-group-news-3-empty))
-      (,terminal-class (:inherit gnus-group-news-3-empty))))
-
-   `(gnus-group-mail-low
-     ((,class (:weight bold
-                       :inherit gnus-group-mail-low-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-mail-low-empty))))
-
-   `(gnus-group-mail-low-empty
-     ((,class (:inherit gnus-group-news-low-empty))
-      (,terminal-class (:inherit gnus-group-news-low-empty))))
-
-   `(gnus-group-news-1
-     ((,class (:weight bold
-                       :inherit gnus-group-news-1-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-1-empty))))
-
-   `(gnus-group-news-2
-     ((,class (:weight bold
-                       :inherit gnus-group-news-2-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-2-empty))))
-
-   `(gnus-group-news-3
-     ((,class (:weight bold
-                       :inherit gnus-group-news-3-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-3-empty))))
-
-   `(gnus-group-news-4
-     ((,class (:weight bold
-                       :inherit gnus-group-news-4-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-4-empty))))
-
-   `(gnus-group-news-5
-     ((,class (:weight bold
-                       :inherit gnus-group-news-5-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-5-empty))))
-
-   `(gnus-group-news-6
-     ((,class (:weight bold
-                       :inherit gnus-group-news-6-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-6-empty))))
-
-   `(gnus-group-news-low
-     ((,class (:weight bold
-                       :inherit gnus-group-news-low-empty))
-      (,terminal-class (:weight bold
-                                :inherit gnus-group-news-low-empty))))
-
-   `(gnus-header-content
-     ((,class (:inherit message-header-other))
-      (,terminal-class (:inherit message-header-other))))
-
-   `(gnus-header-from
-     ((,class (:inherit message-header-other))
-      (,terminal-class (:inherit message-header-other))))
-
-   `(gnus-header-name
-     ((,class (:inherit message-header-name))
-      (,terminal-class (:inherit message-header-name))))
-
-   `(gnus-header-newsgroups
-     ((,class (:inherit message-header-other))
-      (,terminal-class (:inherit message-header-other))))
-
-   `(gnus-header-subject
-     ((,class (:inherit message-header-subject))
-      (,terminal-class (:inherit message-header-subject))))
-
-   `(gnus-summary-cancelled
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(gnus-summary-high-ancient
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(gnus-summary-high-read
-     ((,class (:foreground ,green
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-green
-                                    :weight bold))))
-
-   `(gnus-summary-high-ticked
-     ((,class (:foreground ,orange
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold))))
-
-   `(gnus-summary-high-unread
-     ((,class (:foreground ,monokai-fg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :weight bold))))
-
-   `(gnus-summary-low-ancient
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-summary-low-read
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-summary-low-ticked
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(gnus-summary-low-unread
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(gnus-summary-normal-ancient
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-summary-normal-read
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-summary-normal-ticked
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(gnus-summary-normal-unread
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(gnus-summary-selected
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(gnus-cite-1
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-cite-2
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-cite-3
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-cite-4
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-cite-5
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-cite-6
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-cite-7
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(gnus-cite-8
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(gnus-cite-9
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(gnus-cite-10
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(gnus-cite-11
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(gnus-group-news-1-empty
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(gnus-group-news-2-empty
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-group-news-3-empty
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(gnus-group-news-4-empty
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-group-news-5-empty
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(gnus-group-news-6-empty
-     ((,class (:foreground ,blue-lc))
-      (,terminal-class (:foreground ,terminal-blue-lc))))
-
-   `(gnus-group-news-low-empty
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(gnus-signature
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(gnus-x-face
-     ((,class (:background ,monokai-fg
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-monokai-fg
-                                    :foreground ,terminal-monokai-bg))))
-
-
-   ;; helm (these probably need tweaking)
-   `(helm-apt-deinstalled
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(helm-apt-installed
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(helm-bookmark-directory
-     ((,class (:inherit helm-ff-directory))
-      (,terminal-class (:inherit helm-ff-directory))))
-
-   `(helm-bookmark-file
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(helm-bookmark-gnus
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(helm-bookmark-info
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(helm-bookmark-man
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(helm-bookmark-w3m
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(helm-bookmarks-su
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(helm-buffer-not-saved
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(helm-buffer-saved-out
-     ((,class (:foreground ,red
-                           :background ,monokai-bg
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg
-                                    :inverse-video t))))
-
-   `(helm-buffer-size
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(helm-candidate-number
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :bold t))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :bold t))))
-
-   `(helm-ff-directory
-     ((,class (:background ,monokai-bg
-                           :foreground ,blue))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-blue))))
-
-   `(helm-ff-executable
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(helm-ff-file
-     ((,class (:background ,monokai-bg
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(helm-ff-invalid-symlink
-     ((,class (:background ,monokai-bg
-                           :foreground ,orange
-                           :slant italic))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-orange
-                                    :slant italic))))
-
-   `(helm-ff-prefix
-     ((,class (:background ,yellow
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(helm-ff-symlink
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(helm-grep-file
-     ((,class (:foreground ,cyan
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :underline t))))
-
-   `(helm-grep-finish
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(helm-grep-lineno
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(helm-grep-match
-     ((,class (:inherit match)))
-     ((,terminal-class (:inherit match))))
-
-   `(helm-grep-running
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(helm-header
-     ((,class (:inherit header-line))
-      (,terminal-class (:inherit terminal-header-line))))
-
-   `(helm-lisp-completion-info
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(helm-lisp-show-completion
-     ((,class (:foreground ,yellow
-                           :background ,monokai-hl
-                           :bold t))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :background ,terminal-monokai-hl
-                                    :bold t))))
-
-   `(helm-M-x-key
-     ((,class (:foreground ,orange
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :underline t))))
-
-   `(helm-moccur-buffer
-     ((,class (:foreground ,cyan
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :underline t))))
-
-   `(helm-match
-     ((,class (:inherit match))
-      (,terminal-class (:inherit match))))
-
-   `(helm-selection
-     ((,class (:background ,monokai-hl
-                           :underline t))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :underline t))))
-
-   `(helm-selection-line
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :underline nil))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :underline nil))))
-
-   `(helm-separator
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(helm-source-header
-     ((,class (:background ,blue-lc
-                           :foreground ,monokai-bg
-                           :underline nil))
-      (,terminal-class (:background ,terminal-blue-lc
-                                    :foreground ,terminal-monokai-bg
-                                    :underline nil))))
-
-   `(helm-swoop-target-line-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(helm-swoop-target-line-block-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(helm-swoop-target-word-face
-     ((,class (:foreground ,magenta
-                           :background unspecified))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background unspecified))))
-
-   `(helm-time-zone-current
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(helm-time-zone-home
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(helm-visible-mark
-     ((,class (:background ,monokai-bg
-                           :foreground ,magenta :bold t))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-magenta :bold t))))
-
-   ;; helm-ls-git
-   `(helm-ls-git-modified-not-staged-face
-     ((,class :foreground ,blue)
-      (,terminal-class :foreground ,terminal-blue)))
-
-   `(helm-ls-git-modified-and-staged-face
-     ((,class :foreground ,blue-l)
-      (,terminal-class :foreground ,terminal-blue-l)))
-
-   `(helm-ls-git-renamed-modified-face
-     ((,class :foreground ,blue-l)
-      (,terminal-class :foreground ,terminal-blue-l)))
-
-   `(helm-ls-git-untracked-face
-     ((,class :foreground ,orange)
-      (,terminal-class :foreground ,terminal-orange)))
-
-   `(helm-ls-git-added-copied-face
-     ((,class :foreground ,green)
-      (,terminal-class :foreground ,terminal-green)))
-
-   `(helm-ls-git-added-modified-face
-     ((,class :foreground ,green-l)
-      (,terminal-class :foreground ,terminal-green-l)))
-
-   `(helm-ls-git-deleted-not-staged-face
-     ((,class :foreground ,red)
-      (,terminal-class :foreground ,terminal-red)))
-
-   `(helm-ls-git-deleted-and-staged-face
-     ((,class :foreground ,red-l)
-      (,terminal-class :foreground ,terminal-red-l)))
-
-   `(helm-ls-git-conflict-face
-     ((,class :foreground ,yellow)
-      (,terminal-class :foreground ,terminal-yellow)))
-
-   ;; hi-lock-mode
-   `(hi-yellown
-     ((,class (:foreground ,yellow-lc
-                           :background ,yellow-hc))
-      (,terminal-class (:foreground ,terminal-yellow-lc
-                                    :background ,terminal-yellow-hc))))
-
-   `(hi-pink
-     ((,class (:foreground ,magenta-lc
-                           :background ,magenta-hc))
-      (,terminal-class (:foreground ,terminal-magenta-lc
-                                    :background ,terminal-magenta-hc))))
-
-   `(hi-green
-     ((,class (:foreground ,green-lc
-                           :background ,green-hc))
-      (,terminal-class (:foreground ,terminal-green-lc
-                                    :background ,terminal-green-hc))))
-
-   `(hi-blue
-     ((,class (:foreground ,blue-lc
-                           :background ,blue-hc))
-      (,terminal-class (:foreground ,terminal-blue-lc
-                                    :background ,terminal-blue-hc))))
-
-   `(hi-black-b
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(hi-blue-b
-     ((,class (:foreground ,blue-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue-lc
-                                    :weight bold))))
-
-   `(hi-green-b
-     ((,class (:foreground ,green-lc
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-green-lc
-                                    :weight bold))))
-
-   `(hi-red-b
-     ((,class (:foreground ,red
-                           :weight bold))))
-
-   `(hi-black-hb
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg
-                                    :weight bold))))
-
-   ;; highlight-changes
-   `(highlight-changes
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(highlight-changes-delete
-     ((,class (:foreground ,red
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :underline t))))
-
-   ;; highlight-indentation
-   `(highlight-indentation-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(highlight-indentation-current-column-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   ;; hl-line-mode
-   `(hl-line
-     ((,class (:background ,monokai-hl-line
-                           :inherit t))
-      (,terminal-class (:background ,terminal-monokai-hl-line
-                                    :inherit t))))
-
-   `(hl-line-face
-     ((,class (:background ,monokai-hl-line
-                           :inherit t))
-      (,terminal-class (:background ,terminal-monokai-hl-line
-                                    :inherit t))))
-
-   ;; ido-mode
-   `(ido-first-match
-     ((,class (:foreground ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal))))
-
-   `(ido-only-match
-     ((,class (:foreground ,monokai-bg
-                           :background ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-yellow
-                                    :weight normal))))
-
-   `(ido-subdir
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(ido-incomplete-regexp
-     ((,class (:foreground ,red
-                           :weight bold ))
-      (,terminal-class (:foreground ,terminal-red
-                                    :weight bold ))))
-
-   `(ido-indicator
-     ((,class (:background ,red
-                           :foreground ,monokai-bg
-                           :width condensed))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground ,terminal-monokai-bg
-                                    :width condensed))))
-
-   `(ido-virtual
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(jabber-activity-face
-     ((,class (:weight bold
-                       :foreground ,red))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-red))))
-
-   `(jabber-activity-personal-face
-     ((,class (:weight bold
-                       :foreground ,blue))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-blue))))
-
-   `(jabber-chat-error
-     ((,class (:weight bold
-                       :foreground ,red))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-red))))
-
-   `(jabber-chat-prompt-foreign
-     ((,class (:weight bold
-                       :foreground ,red))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-red))))
-
-   `(jabber-chat-prompt-local
-     ((,class (:weight bold
-                       :foreground ,blue))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-blue))))
-
-   `(jabber-chat-prompt-system
-     ((,class (:weight bold
-                       :foreground ,green))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-green))))
-
-   `(jabber-chat-text-foreign
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(jabber-chat-text-local
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(jabber-chat-rare-time-face
-     ((,class (:underline t
-                          :foreground ,green))
-      (,terminal-class (:underline t
-                                   :foreground ,terminal-green))))
-
-   `(jabber-roster-user-away
-     ((,class (:slant italic
-                      :foreground ,green))
-      (,terminal-class (:slant italic
-                               :foreground ,terminal-green))))
-
-   `(jabber-roster-user-chatty
-     ((,class (:weight bold
-                       :foreground ,orange))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-orange))))
-
-   `(jabber-roster-user-dnd
-     ((,class (:slant italic
-                      :foreground ,red))
-      (,terminal-class (:slant italic
-                               :foreground ,terminal-red))))
-
-   `(jabber-roster-user-error
-     ((,class (:weight light
-                       :slant italic
-                       :foreground ,red))
-      (,terminal-class (:weight light
-                                :slant italic
-                                :foreground ,terminal-red))))
-
-   `(jabber-roster-user-offline
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(jabber-roster-user-online
-     ((,class (:weight bold
-                       :foreground ,blue))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-blue))))
-
-   `(jabber-roster-user-xa
-     ((,class (:slant italic
-                      :foreground ,magenta))
-      (,terminal-class (:slant italic
-                               :foreground ,terminal-magenta))))
-
-   ;; js2-mode colors
-   `(js2-error
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(js2-external-variable
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(js2-function-param
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(js2-instance-member
-     ((,class (:foreground ,magenta)))
-     ((,terminal-class (:foreground ,terminal-magenta))))
-
-   `(js2-jsdoc-html-tag-delimiter
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(js2-jsdoc-html-tag-name
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(js2-jsdoc-tag
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(js2-jsdoc-type
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(js2-jsdoc-value
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(js2-magic-paren
-     ((,class (:underline t))
-      (,terminal-class (:underline t))))
-
-   `(js2-private-function-call
-     ((,class (:foreground ,yellow)))
-     ((,terminal-class (:foreground ,terminal-yellow))))
-
-   `(js2-private-member
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(js2-warning
-     ((,class (:underline ,orange))
-      (,terminal-class (:underline ,terminal-orange))))
-
-   ;; jedi
-   `(jedi:highlight-function-argument
-     ((,class (:inherit bold))
-      (,terminal-class (:inherit bold))))
-
-   ;; linum-mode
-   `(linum
-     ((,class (:foreground ,monokai-comments
-                           :background ,s-fringe-bg))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-s-fringe-bg))))
-
-   ;; lusty-explorer
-   `(lusty-directory-face
-     ((,class (:inherit dired-directory))
-      (,terminal-class (:inherit dired-directory))))
-
-   `(lusty-file-face
-     ((,class nil)
-      (,terminal-class nil)))
-
-   `(lusty-match-face
-     ((,class (:inherit ido-first-match))
-      (,terminal-class (:inherit ido-first-match))))
-
-   `(lusty-slash-face
-     ((,class (:foreground ,cyan
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :weight bold))))
-
-   ;; magit
-   `(magit-section-title
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(magit-branch
-     ((,class (:foreground ,orange
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight bold))))
-
-   `(magit-item-highlight
-     ((,class (:background ,monokai-hl
-                           :weight unspecified))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :weight unspecified))))
-
-   `(magit-log-author
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(magit-log-graph
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(magit-log-head-label-bisect-bad
-     ((,class (:background ,red-hc
-                           :foreground ,red-lc
-                           :box 1))
-      (,terminal-class (:background ,terminal-red-hc
-                                    :foreground ,terminal-red-lc
-                                    :box 1))))
-
-   `(magit-log-head-label-bisect-good
-     ((,class (:background ,green-hc
-                           :foreground ,green-lc
-                           :box 1))
-      (,terminal-class (:background ,terminal-green-hc
-                                    :foreground ,terminal-green-lc
-                                    :box 1))))
-
-   `(magit-log-head-label-default
-     ((,class (:background ,monokai-hl
-                           :box 1))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :box 1))))
-
-   `(magit-log-head-label-local
-     ((,class (:background ,blue-lc
-                           :foreground ,blue-hc
-                           :box 1))
-      (,terminal-class (:background ,terminal-blue-lc
-                                    :foreground ,terminal-blue-hc
-                                    :box 1))))
-
-   `(magit-log-head-label-patches
-     ((,class (:background ,red-lc
-                           :foreground ,red-hc
-                           :box 1))
-      (,terminal-class (:background ,terminal-red-lc
-                                    :foreground ,terminal-red-hc
-                                    :box 1))))
-
-   `(magit-log-head-label-remote
-     ((,class (:background ,green-lc
-                           :foreground ,green-hc
-                           :box 1))
-      (,terminal-class (:background ,terminal-green-lc
-                                    :foreground ,terminal-green-hc
-                                    :box 1))))
-
-   `(magit-log-head-label-tags
-     ((,class (:background ,yellow-lc
-                           :foreground ,yellow-hc
-                           :box 1))
-      (,terminal-class (:background ,terminal-yellow-lc
-                                    :foreground ,terminal-yellow-hc
-                                    :box 1))))
-
-   `(magit-log-sha1
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   ;; monky
-   `(monky-section-title
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(monky-diff-add
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(monky-diff-del
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   ;; markdown-mode
-   `(markdown-header-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(markdown-header-face-1
-     ((,class (:inherit markdown-header-face
-                        :height ,monokai-height-plus-4))
-      (,terminal-class (:inherit markdown-header-face
-                                 :height ,monokai-height-plus-4))))
-
-   `(markdown-header-face-2
-     ((,class (:inherit markdown-header-face
-                        :height ,monokai-height-plus-3))
-      (,terminal-class (:inherit markdown-header-face
-                                 :height ,monokai-height-plus-3))))
-
-   `(markdown-header-face-3
-     ((,class (:inherit markdown-header-face
-                        :height ,monokai-height-plus-2))
-      (,terminal-class (:inherit markdown-header-face
-                                 :height ,monokai-height-plus-2))))
-
-   `(markdown-header-face-4
-     ((,class (:inherit markdown-header-face
-                        :height ,monokai-height-plus-1))
-      (,terminal-class (:inherit markdown-header-face
-                                 :height ,monokai-height-plus-1))))
-
-   `(markdown-header-face-5
-     ((,class (:inherit markdown-header-face))
-      (,terminal-class (:inherit markdown-header-face))))
-
-   `(markdown-header-face-6
-     ((,class (:inherit markdown-header-face))
-      (,terminal-class (:inherit markdown-header-face))))
-
-   ;; message-mode
-   `(message-cited-text
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(message-header-name
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(message-header-other
-     ((,class (:foreground ,monokai-fg
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :weight normal))))
-
-   `(message-header-to
-     ((,class (:foreground ,monokai-fg
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :weight normal))))
-
-   `(message-header-cc
-     ((,class (:foreground ,monokai-fg
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :weight normal))))
-
-   `(message-header-newsgroups
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(message-header-subject
-     ((,class (:foreground ,cyan
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :weight normal))))
-
-   `(message-header-xheader
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(message-mml
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(message-separator
-     ((,class (:foreground ,monokai-comments
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :slant italic))))
-
-   ;; mew
-   `(mew-face-header-subject
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(mew-face-header-from
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(mew-face-header-date
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-header-to
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(mew-face-header-key
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-header-private
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-header-important
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(mew-face-header-marginal
-     ((,class (:foreground ,monokai-fg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :weight bold))))
-
-   `(mew-face-header-warning
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(mew-face-header-xmew
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-header-xmew-bad
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(mew-face-body-url
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(mew-face-body-comment
-     ((,class (:foreground ,monokai-fg
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :slant italic))))
-
-   `(mew-face-body-cite1
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-body-cite2
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(mew-face-body-cite3
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(mew-face-body-cite4
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(mew-face-body-cite5
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(mew-face-mark-review
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(mew-face-mark-escape
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-mark-delete
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(mew-face-mark-unlink
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(mew-face-mark-refile
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-mark-unread
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(mew-face-eof-message
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(mew-face-eof-part
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   ;; mingus
-   `(mingus-directory-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(mingus-pausing-face
-     ((,class (:foreground ,magenta))
-      (,terminal-class (:foreground ,terminal-magenta))))
-
-   `(mingus-playing-face
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(mingus-playlist-face
-     ((,class (:foreground ,cyan ))
-      (,terminal-class (:foreground ,terminal-cyan ))))
-
-   `(mingus-song-file-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(mingus-stopped-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   ;; moccur
-   `(moccur-current-line-face
-     ((,class (:underline t))
-      (,terminal-class (:underline t))))
-
-   `(moccur-edit-done-face
-     ((,class (:foreground ,monokai-comments
-                           :background ,monokai-bg
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-monokai-bg
-                                    :slant italic))))
-
-   `(moccur-edit-face
-     ((,class (:background ,yellow
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(moccur-edit-file-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(moccur-edit-reject-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(moccur-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :weight bold))))
-
-   `(search-buffers-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :weight bold))))
-
-   `(search-buffers-header-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-yellow
-                                    :weight bold))))
-
-   ;; mu4e
-   `(mu4e-cited-1-face
-     ((,class (:foreground ,green
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-green
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-cited-2-face
-     ((,class (:foreground ,blue
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-cited-3-face
-     ((,class (:foreground ,orange
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-cited-4-face
-     ((,class (:foreground ,yellow
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-cited-5-face
-     ((,class (:foreground ,cyan
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-cited-6-face
-     ((,class (:foreground ,green
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-green
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-cited-7-face
-     ((,class (:foreground ,blue
-                           :slant italic
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :slant italic
-                                    :weight normal))))
-
-   `(mu4e-flagged-face
-     ((,class (:foreground ,magenta
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :weight bold))))
-
-   `(mu4e-view-url-number-face
-     ((,class (:foreground ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal))))
-
-   `(mu4e-warning-face
-     ((,class (:foreground ,red
-                           :slant normal
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-red
-                                    :slant normal
-                                    :weight bold))))
-
-   `(mu4e-header-highlight-face
-     ((,class (:inherit unspecified
-                        :foreground unspecified
-                        :background ,monokai-hl
-                        :underline ,monokai-emph
-                        :weight normal))
-      (,terminal-class (:inherit unspecified
-                                 :foreground unspecified
-                                 :background ,terminal-monokai-hl
-                                 :underline ,terminal-monokai-emph
-                                 :weight normal))))
-
-
-   `(mu4e-draft-face
-     ((,class (:inherit font-lock-string-face))
-      (,terminal-class (:inherit font-lock-string-face))))
-
-   `(mu4e-footer-face
-     ((,class (:inherit font-lock-comment-face))
-      (,terminal-class (:inherit font-lock-comment-face))))
-
-   `(mu4e-forwarded-face
-     ((,class (:inherit font-lock-builtin-face
-                        :weight normal))
-      (,terminal-class (:inherit font-lock-builtin-face
-                                 :weight normal))))
-
-   `(mu4e-header-face
-     ((,class (:inherit default))
-      (,terminal-class (:inherit default))))
-
-   `(mu4e-header-marks-face
-     ((,class (:inherit font-lock-preprocessor-face))
-      (,terminal-class (:inherit font-lock-preprocessor-face))))
-
-   `(mu4e-header-title-face
-     ((,class (:inherit font-lock-type-face))
-      (,terminal-class (:inherit font-lock-type-face))))
-
-   `(mu4e-highlight-face
-     ((,class (:inherit font-lock-pseudo-keyword-face
-                        :weight bold))
-      (,terminal-class (:inherit font-lock-pseudo-keyword-face
-                                 :weight bold))))
-
-   `(mu4e-moved-face
-     ((,class (:inherit font-lock-comment-face
-                        :slant italic))
-      (,terminal-class (:inherit font-lock-comment-face
-                                 :slant italic))))
-
-   `(mu4e-ok-face
-     ((,class (:inherit font-lock-comment-face
-                        :slant normal
-                        :weight bold))
-      (,terminal-class (:inherit font-lock-comment-face
-                                 :slant normal
-                                 :weight bold))))
-
-   `(mu4e-replied-face
-     ((,class (:inherit font-lock-builtin-face
-                        :weight normal))
-      (,terminal-class (:inherit font-lock-builtin-face
-                                 :weight normal))))
-
-   `(mu4e-system-face
-     ((,class (:inherit font-lock-comment-face
-                        :slant italic))
-      (,terminal-class (:inherit font-lock-comment-face
-                                 :slant italic))))
-
-   `(mu4e-title-face
-     ((,class (:inherit font-lock-type-face
-                        :weight bold))
-      (,terminal-class (:inherit font-lock-type-face
-                                 :weight bold))))
-
-   `(mu4e-trashed-face
-     ((,class (:inherit font-lock-comment-face
-                        :strike-through t))
-      (,terminal-class (:inherit font-lock-comment-face
-                                 :strike-through t))))
-
-   `(mu4e-unread-face
-     ((,class (:inherit font-lock-keyword-face
-                        :weight bold))
-      (,terminal-class (:inherit font-lock-keyword-face
-                                 :weight bold))))
-
-   `(mu4e-view-attach-number-face
-     ((,class (:inherit font-lock-variable-name-face
-                        :weight bold))
-      (,terminal-class (:inherit font-lock-variable-name-face
-                                 :weight bold))))
-
-   `(mu4e-view-contact-face
-     ((,class (:foreground ,monokai-fg
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :weight normal))))
-
-   `(mu4e-view-header-key-face
-     ((,class (:inherit message-header-name
-                        :weight normal))
-      (,terminal-class (:inherit message-header-name
-                                 :weight normal))))
-
-   `(mu4e-view-header-value-face
-     ((,class (:foreground ,cyan
-                           :weight normal
-                           :slant normal))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :weight normal
-                                    :slant normal))))
-
-   `(mu4e-view-link-face
-     ((,class (:inherit link))
-      (,terminal-class (:inherit link))))
-
-   `(mu4e-view-special-header-value-face
-     ((,class (:foreground ,blue
-                           :weight normal
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight normal
-                                    :underline nil))))
-
-   ;; mumamo
-   `(mumamo-background-chunk-submode1
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   ;; nav
-   `(nav-face-heading
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(nav-face-button-num
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(nav-face-dir
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(nav-face-hdir
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(nav-face-file
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(nav-face-hfile
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   ;; nav-flash
-   `(nav-flash-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   ;; org-mode
-   `(org-agenda-structure
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-hl
-                           :weight bold
-                           :slant normal
-                           :inverse-video nil
-                           :height ,monokai-height-plus-1
-                           :underline nil
-                           :box (:line-width 2 :color ,monokai-bg)))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-hl
-                                    :weight bold
-                                    :slant normal
-                                    :inverse-video nil
-                                    :height ,monokai-height-plus-1
-                                    :underline nil
-                                    :box (:line-width 2 :color ,terminal-monokai-bg)))))
-
-   `(org-agenda-calendar-event
-     ((,class (:foreground ,monokai-emph))
-      (,terminal-class (:foreground ,terminal-monokai-emph))))
-
-   `(org-agenda-calendar-sexp
-     ((,class (:foreground ,monokai-fg
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :slant italic))))
-
-   `(org-agenda-date
-     ((,class (:foreground ,monokai-comments
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video nil
-                           :overline nil
-                           :slant normal
-                           :height 1.0
-                           :box (:line-width 2 :color ,monokai-bg)))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video nil
-                                    :overline nil
-                                    :slant normal
-                                    :height 1.0
-                                    :box (:line-width 2 :color ,terminal-monokai-bg)))) t)
-
-   `(org-agenda-date-weekend
-     ((,class (:inherit org-agenda-date
-                        :inverse-video nil
-                        :background unspecified
-                        :foreground ,monokai-comments
-                        :weight unspecified
-                        :underline t
-                        :overline nil
-                        :box unspecified))
-      (,terminal-class (:inherit org-agenda-date
-                                 :inverse-video nil
-                                 :background unspecified
-                                 :foreground ,terminal-monokai-comments
-                                 :weight unspecified
-                                 :underline t
-                                 :overline nil
-                                 :box unspecified))) t)
-
-   `(org-agenda-date-today
-     ((,class (:inherit org-agenda-date
-                        :inverse-video t
-                        :weight bold
-                        :underline unspecified
-                        :overline nil
-                        :box unspecified
-                        :foreground ,blue
-                        :background ,monokai-bg))
-      (,terminal-class (:inherit org-agenda-date
-                                 :inverse-video t
-                                 :weight bold
-                                 :underline unspecified
-                                 :overline nil
-                                 :box unspecified
-                                 :foreground ,terminal-blue
-                                 :background ,terminal-monokai-bg))) t)
-
-   `(org-agenda-done
-     ((,class (:foreground ,monokai-comments
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :slant italic))) t)
-
-   `(org-archived
-     ((,class (:foreground ,monokai-comments
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :weight normal))))
-
-   `(org-block
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(org-block-begin-line
-     ((,class (:foreground ,monokai-comments
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :slant italic))))
-
-   `(org-checkbox
-     ((,class (:background ,monokai-bg
-                           :foreground ,monokai-fg
-                           :box (:line-width 1 :style released-button)))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-monokai-fg
-                                    :box (:line-width 1 :style released-button)))))
-
-   `(org-code
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(org-date
-     ((,class (:foreground ,blue
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :underline t))))
-
-   `(org-done
-     ((,class (:weight bold
-                       :foreground ,green))
-      (,terminal-class (:weight bold
-                                :foreground ,terminal-green))))
-
-   `(org-ellipsis
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(org-formula
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(org-headline-done
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(org-hide
-     ((,class (:foreground ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-bg))))
-
-   `(org-level-1
-     ((,class (:inherit ,s-variable-pitch
-                        :height ,monokai-height-plus-4
-                        :foreground ,orange))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :height ,monokai-height-plus-4
-                                 :foreground ,terminal-orange))))
-
-   `(org-level-2
-     ((,class (:inherit ,s-variable-pitch
-                        :height ,monokai-height-plus-3
-                        :foreground ,green))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :height ,monokai-height-plus-3
-                                 :foreground ,terminal-green))))
-
-   `(org-level-3
-     ((,class (:inherit ,s-variable-pitch
-                        :height ,monokai-height-plus-2
-                        :foreground ,blue))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :height ,monokai-height-plus-2
-                                 :foreground ,terminal-blue))))
-
-   `(org-level-4
-     ((,class (:inherit ,s-variable-pitch
-                        :height ,monokai-height-plus-1
-                        :foreground ,yellow))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :height ,monokai-height-plus-1
-                                 :foreground ,terminal-yellow))))
-
-   `(org-level-5
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,cyan))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-cyan))))
-
-   `(org-level-6
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,green))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-green))))
-
-   `(org-level-7
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,red))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-red))))
-
-   `(org-level-8
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,blue))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-blue))))
-
-   `(org-link
-     ((,class (:foreground ,yellow
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :underline t))))
-
-   `(org-sexp-date
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(org-scheduled
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(org-scheduled-previously
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(org-scheduled-today
-     ((,class (:foreground ,blue
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight normal))))
-
-   `(org-special-keyword
-     ((,class (:foreground ,monokai-comments
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :weight bold))))
-
-   `(org-table
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(org-tag
-     ((,class (:weight bold))
-      (,terminal-class (:weight bold))))
-
-   `(org-time-grid
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(org-todo
-     ((,class (:foreground ,red
-                           :weight bold)))
-     ((,terminal-class (:foreground ,terminal-red
-                                    :weight bold))))
-
-   `(org-upcoming-deadline
-     ((,class (:foreground ,yellow
-                           :weight normal
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal
-                                    :underline nil))))
-
-   `(org-warning
-     ((,class (:foreground ,orange
-                           :weight normal
-                           :underline nil))
-      (,terminal-class (:foreground ,terminal-orange
-                                    :weight normal
-                                    :underline nil))))
-
-   ;; org-habit (clear=blue, ready=green, alert=yellow, overdue=red. future=lower contrast)
-   `(org-habit-clear-face
-     ((,class (:background ,blue-lc
-                           :foreground ,blue-hc))
-      (,terminal-class (:background ,terminal-blue-lc
-                                    :foreground ,terminal-blue-hc))))
-
-   `(org-habit-clear-future-face
-     ((,class (:background ,blue-lc))
-      (,terminal-class (:background ,terminal-blue-lc))))
-
-   `(org-habit-ready-face
-     ((,class (:background ,green-lc
-                           :foreground ,green))
-      (,terminal-class (:background ,terminal-green-lc
-                                    :foreground ,terminal-green))))
-
-   `(org-habit-ready-future-face
-     ((,class (:background ,green-lc))
-      (,terminal-class (:background ,terminal-green-lc))))
-
-   `(org-habit-alert-face
-     ((,class (:background ,yellow
-                           :foreground ,yellow-lc))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-yellow-lc))))
-
-   `(org-habit-alert-future-face
-     ((,class (:background ,yellow-lc))
-      (,terminal-class (:background ,terminal-yellow-lc))))
-
-   `(org-habit-overdue-face
-     ((,class (:background ,red
-                           :foreground ,red-lc))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground ,terminal-red-lc))))
-
-   `(org-habit-overdue-future-face
-     ((,class (:background ,red-lc))
-      (,terminal-class (:background ,terminal-red-lc))))
-
-   ;; latest additions
-   `(org-agenda-dimmed-todo-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(org-agenda-restriction-lock
-     ((,class (:background ,yellow))
-      (,terminal-class (:background ,terminal-yellow))))
-
-   `(org-clock-overlay
-     ((,class (:background ,yellow))
-      (,terminal-class (:background ,terminal-yellow))))
-
-   `(org-column
-     ((,class (:background ,monokai-hl
-                           :strike-through nil
-                           :underline nil
-                           :slant normal
-                           :weight normal
-                           :inherit default))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :strike-through nil
-                                    :underline nil
-                                    :slant normal
-                                    :weight normal
-                                    :inherit default))))
-
-   `(org-column-title
-     ((,class (:background ,monokai-hl
-                           :underline t
-                           :weight bold))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :underline t
-                                    :weight bold))))
-
-   `(org-date-selected
-     ((,class (:foreground ,red
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :inverse-video t))))
-
-   `(org-document-info
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(org-document-title
-     ((,class (:foreground ,monokai-emph
-                           :weight bold
-                           :height ,monokai-height-plus-4))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :weight bold
-                                    :height ,monokai-height-plus-4))))
-
-   `(org-drawer
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(org-footnote
-     ((,class (:foreground ,magenta
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :underline t))))
-
-   `(org-latex-and-export-specials
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(org-mode-line-clock-overrun
-     ((,class (:inherit mode-line
-                        :background ,red))
-      (,terminal-class (:inherit mode-line
-                                 :background ,terminal-red))))
-
-   ;; outline
-   `(outline-1
-     ((,class (:inherit org-level-1))
-      (,terminal-class (:inherit org-level-1))))
-
-   `(outline-2
-     ((,class (:inherit org-level-2))
-      (,terminal-class (:inherit org-level-2))))
-
-   `(outline-3
-     ((,class (:inherit org-level-3))
-      (,terminal-class (:inherit org-level-3))))
-
-   `(outline-4
-     ((,class (:inherit org-level-4))
-      (,terminal-class (:inherit org-level-4))))
-
-   `(outline-5
-     ((,class (:inherit org-level-5))
-      (,terminal-class (:inherit org-level-5))))
-
-   `(outline-6
-     ((,class (:inherit org-level-6))
-      (,terminal-class (:inherit org-level-6))))
-
-   `(outline-7
-     ((,class (:inherit org-level-7))
-      (,terminal-class (:inherit org-level-7))))
-
-   `(outline-8
-     ((,class (:inherit org-level-8))
-      (,terminal-class (:inherit org-level-8))))
-
-   ;; parenface
-   `(paren-face
-     ((,terminal-class (:foreground ,monokai-comments))))
-
-   ;; perspective
-   `(persp-selected-face
-     ((,class (:foreground ,blue
-                           :weight bold))))
-
-   ;; pretty-mode
-   `(pretty-mode-symbol-face
-     ((,class (:foreground ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal))))
-
-   ;; popup
-   `(popup-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(popup-isearch-match
-     ((,class (:background ,yellow
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(popup-menu-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(popup-menu-mouse-face
-     ((,class (:background ,blue
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(popup-menu-selection-face
-     ((,class (:background ,magenta
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-magenta
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(popup-scroll-bar-background-face
-     ((,class (:background ,monokai-comments))
-      (,terminal-class (:background ,terminal-monokai-comments))))
-
-   `(popup-scroll-bar-foreground-face
-     ((,class (:background ,monokai-emph))
-      (,terminal-class (:background ,terminal-monokai-emph))))
-
-   `(popup-tip-face
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg))))
-
-   ;; powerline
-   `(powerline-active1
-     ((,class (:background ,gray))
-      (,terminal-class (:background ,terminal-gray))))
-
-   `(powerline-active2
-     ((,class (:background ,gray-l))
-      (,terminal-class (:background ,terminal-gray-l))))
-
-   `(powerline-inactive1
-     ((,class (:background ,gray-d))
-      (,terminal-class (:background ,terminal-gray-d))))
-
-   `(powerline-inactive2
-     ((,class (:background ,gray))
-      (,terminal-class (:background ,terminal-gray))))
-
-   ;; rainbow-delimiters
-   `(rainbow-delimiters-depth-1-face
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(rainbow-delimiters-depth-2-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(rainbow-delimiters-depth-3-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(rainbow-delimiters-depth-4-face
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(rainbow-delimiters-depth-5-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(rainbow-delimiters-depth-6-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(rainbow-delimiters-depth-7-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(rainbow-delimiters-depth-8-face
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(rainbow-delimiters-depth-9-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(rainbow-delimiters-depth-10-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(rainbow-delimiters-depth-11-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(rainbow-delimiters-depth-12-face
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(rainbow-delimiters-unmatched-face
-     ((,class (:foreground ,monokai-fg
-                           :background ,monokai-bg
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :background ,terminal-monokai-bg
-                                    :inverse-video t))))
-
-   ;; rhtm-mode
-   `(erb-face
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-delim-face
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-exec-face
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-exec-delim-face
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-out-face
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-out-delim-face
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-comment-face
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg))))
-
-   `(erb-comment-delim-face
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg))))
-
-   ;; rst-mode
-   `(rst-level-1-face
-     ((,class (:background ,yellow
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(rst-level-2-face
-     ((,class (:background ,cyan
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-cyan
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(rst-level-3-face
-     ((,class (:background ,blue
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(rst-level-4-face
-     ((,class (:background ,violet
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-violet
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(rst-level-5-face
-     ((,class (:background ,magenta
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-magenta
-                                    :foreground ,terminal-monokai-bg))))
-
-   `(rst-level-6-face
-     ((,class (:background ,red
-                           :foreground ,monokai-bg))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground ,terminal-monokai-bg))))
-
-   ;; rpm-mode
-   `(rpm-spec-dir-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(rpm-spec-doc-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(rpm-spec-ghost-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(rpm-spec-macro-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(rpm-spec-obsolete-tag-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(rpm-spec-package-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(rpm-spec-section-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(rpm-spec-tag-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(rpm-spec-var-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   ;; sh-mode
-   `(sh-quoted-exec
-     ((,class (:foreground ,violet
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-violet
-                                    :weight bold))))
-
-   `(sh-escaped-newline
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   `(sh-heredoc
-     ((,class (:foreground ,yellow
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight bold))))
-
-   ;; smartparens
-   `(sp-pair-overlay-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(sp-wrap-overlay-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(sp-wrap-tag-overlay-face
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(sp-show-pair-enclosing
-     ((,class (:inherit highlight))
-      (,terminal-class (:inherit highlight))))
-
-   `(sp-show-pair-match-face
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   `(sp-show-pair-mismatch-face
-     ((,class (:foreground ,red
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   ;; show-paren
-   `(show-paren-match
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   `(show-paren-mismatch
-     ((,class (:foreground ,red
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   ;; mic-paren
-   `(paren-face-match
-     ((,class (:foreground ,cyan
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   `(paren-face-mismatch
-     ((,class (:foreground ,red
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   `(paren-face-no-match
-     ((,class (:foreground ,red
-                           :background ,monokai-bg
-                           :weight normal
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-monokai-bg
-                                    :weight normal
-                                    :inverse-video t))))
-
-   ;; SLIME
-   `(slime-repl-inputed-output-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   ;; speedbar
-   `(speedbar-button-face
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,monokai-comments))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-monokai-comments))))
-
-   `(speedbar-directory-face
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,blue))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-blue))))
-
-   `(speedbar-file-face
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,monokai-fg))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-monokai-fg))))
-
-   `(speedbar-highlight-face
-     ((,class (:inherit ,s-variable-pitch
-                        :background ,monokai-hl))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :background ,terminal-monokai-hl))))
-
-   `(speedbar-selected-face
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,yellow
-                        :underline t))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-yellow
-                                 :underline t))))
-
-   `(speedbar-separator-face
-     ((,class (:inherit ,s-variable-pitch
-                        :background ,blue
-                        :foreground ,monokai-bg
-                        :overline ,cyan-lc))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :background ,terminal-blue
-                                 :foreground ,terminal-monokai-bg
-                                 :overline ,terminal-cyan-lc))))
-
-   `(speedbar-tag-face
-     ((,class (:inherit ,s-variable-pitch
-                        :foreground ,green))
-      (,terminal-class (:inherit ,terminal-s-variable-pitch
-                                 :foreground ,terminal-green))))
-
-   ;; sunrise commander headings
-   `(sr-active-path-face
-     ((,class (:background ,blue
-                           :foreground ,monokai-bg
-                           :height ,monokai-height-plus-1
-                           :weight bold))
-      (,terminal-class (:background ,terminal-blue
-                                    :foreground ,terminal-monokai-bg
-                                    :height ,monokai-height-plus-1
-                                    :weight bold))))
-
-   `(sr-editing-path-face
-     ((,class (:background ,yellow
-                           :foreground ,monokai-bg
-                           :weight bold
-                           :height ,monokai-height-plus-1))
-      (,terminal-class (:background ,terminal-yellow
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold
-                                    :height ,monokai-height-plus-1))))
-
-   `(sr-highlight-path-face
-     ((,class (:background ,green
-                           :foreground ,monokai-bg
-                           :weight bold
-                           :height ,monokai-height-plus-1))
-      (,terminal-class (:background ,terminal-green
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold
-                                    :height ,monokai-height-plus-1))))
-
-   `(sr-passive-path-face
-     ((,class (:background ,monokai-comments
-                           :foreground ,monokai-bg
-                           :weight bold
-                           :height ,monokai-height-plus-1))
-      (,terminal-class (:background ,terminal-monokai-comments
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold
-                                    :height ,monokai-height-plus-1))))
-
-   ;; sunrise commander marked
-   `(sr-marked-dir-face
-     ((,class (:inherit dired-marked))
-      (,terminal-class (:inherit dired-marked))))
-
-   `(sr-marked-file-face
-     ((,class (:inherit dired-marked))
-      (,terminal-class (:inherit dired-marked))))
-
-   `(sr-alt-marked-dir-face
-     ((,class (:background ,magenta
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-magenta
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(sr-alt-marked-file-face
-     ((,class (:background ,magenta
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-magenta
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   ;; sunrise commander fstat
-   `(sr-directory-face
-     ((,class (:inherit dired-directory
-                        :weight normal))
-      (,terminal-class (:inherit dired-directory
-                                 :weight normal))))
-
-   `(sr-symlink-directory-face
-     ((,class (:inherit dired-directory
-                        :slant italic
-                        :weight normal))
-      (,terminal-class (:inherit dired-directory
-                                 :slant italic
-                                 :weight normal))))
-
-   `(sr-symlink-face
-     ((,class (:inherit dired-symlink
-                        :slant italic
-                        :weight normal))
-      (,terminal-class (:inherit dired-symlink
-                                 :slant italic
-                                 :weight normal))))
-
-   `(sr-broken-link-face
-     ((,class (:inherit dired-warning
-                        :slant italic
-                        :weight normal))
-      (,terminal-class (:inherit dired-warning
-                                 :slant italic
-                                 :weight normal))))
-
-   ;; sunrise commander file types
-   `(sr-compressed-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(sr-encrypted-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(sr-log-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(sr-packaged-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(sr-html-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(sr-xml-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   ;; sunrise commander misc
-   `(sr-clex-hotchar-face
-     ((,class (:background ,red
-                           :foreground ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:background ,terminal-red
-                                    :foreground ,terminal-monokai-bg
-                                    :weight bold))))
-
-   ;; syslog-mode
-   `(syslog-ip-face
-     ((,class (:background unspecified
-                           :foreground ,yellow))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-yellow))))
-
-   `(syslog-hour-face
-     ((,class (:background unspecified
-                           :foreground ,green))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-green))))
-
-   `(syslog-error-face
-     ((,class (:background unspecified
-                           :foreground ,red
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-red
-                                    :weight bold))))
-
-   `(syslog-warn-face
-     ((,class (:background unspecified
-                           :foreground ,orange
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-orange
-                                    :weight bold))))
-
-   `(syslog-info-face
-     ((,class (:background unspecified
-                           :foreground ,blue
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(syslog-debug-face
-     ((,class (:background unspecified
-                           :foreground ,cyan
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-cyan
-                                    :weight bold))))
-
-   `(syslog-su-face
-     ((,class (:background unspecified
-                           :foreground ,magenta))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-magenta))))
-
-   ;; table
-   `(table-cell
-     ((,class (:foreground ,monokai-fg
-                           :background ,monokai-hl))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :background ,terminal-monokai-hl))))
-
-   ;; term
-   `(term-color-black
-     ((,class (:foreground ,monokai-bg
-                           :background ,monokai-hl))
-      (,terminal-class (:foreground ,terminal-monokai-bg
-                                    :background ,terminal-monokai-hl))))
-
-   `(term-color-red
-     ((,class (:foreground ,red
-                           :background ,red-d))
-      (,terminal-class (:foreground ,terminal-red
-                                    :background ,terminal-red-d))))
-
-   `(term-color-green
-     ((,class (:foreground ,green
-                           :background ,green-d))
-      (,terminal-class (:foreground ,terminal-green
-                                    :background ,terminal-green-d))))
-
-   `(term-color-yellow
-     ((,class (:foreground ,yellow
-                           :background ,yellow-d))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :background ,terminal-yellow-d))))
-
-   `(term-color-blue
-     ((,class (:foreground ,blue
-                           :background ,blue-d))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :background ,terminal-blue-d))))
-
-   `(term-color-magenta
-     ((,class (:foreground ,magenta
-                           :background ,magenta-d))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :background ,terminal-magenta-d))))
-
-   `(term-color-cyan
-     ((,class (:foreground ,cyan
-                           :background ,cyan-d))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :background ,terminal-cyan-d))))
-
-   `(term-color-white
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-fg))))
-
-   `(term-default-fg-color
-     ((,class (:inherit term-color-white))
-      (,terminal-class (:inherit term-color-white))))
-
-   `(term-default-bg-color
-     ((,class (:inherit term-color-black))
-      (,terminal-class (:inherit term-color-black))))
-
-   ;; tooltip. (NOTE: This setting has no effect on the os widgets for me
-   ;; zencoding uses this)
-   `(tooltip
-     ((,class (:background ,yellow-lc
-                           :foreground ,yellow-hc
-                           :inherit ,s-variable-pitch))))
-
-   ;; tuareg
-   `(tuareg-font-lock-governing-face
-     ((,class (:foreground ,magenta
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-magenta
-                                    :weight bold))))
-
-   `(tuareg-font-lock-multistage-face
-     ((,class (:foreground ,blue
-                           :background ,monokai-hl
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :background ,terminal-monokai-hl
-                                    :weight bold))))
-
-   `(tuareg-font-lock-operator-face
-     ((,class (:foreground ,monokai-emph))
-      (,terminal-class (:foreground ,terminal-monokai-emph))))
-
-   `(tuareg-font-lock-error-face
-     ((,class (:foreground ,yellow
-                           :background ,red
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :background ,terminal-red
-                                    :weight bold))))
-
-   `(tuareg-font-lock-interactive-output-face
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(tuareg-font-lock-interactive-error-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   ;; undo-tree
-   `(undo-tree-visualizer-default-face
-     ((,class (:foreground ,monokai-comments
-                           :background ,monokai-bg))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-monokai-bg))))
-
-   `(undo-tree-visualizer-unmodified-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(undo-tree-visualizer-current-face
-     ((,class (:foreground ,blue
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :inverse-video t))))
-
-   `(undo-tree-visualizer-active-branch-face
-     ((,class (:foreground ,monokai-emph
-                           :background ,monokai-bg
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :background ,terminal-monokai-bg
-                                    :weight bold))))
-
-   `(undo-tree-visualizer-register-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   ;; volatile highlights
-   `(vhl/default-face
-     ((,class (:background ,green-lc
-                           :foreground ,green-hc))
-      (,terminal-class (:background ,terminal-green-lc
-                                    :foreground ,terminal-green-hc))))
-
-   ;; w3m
-   `(w3m-anchor
-     ((,class (:inherit link))
-      (,terminal-class (:inherit link))))
-
-   `(w3m-arrived-anchor
-     ((,class (:inherit link-visited))
-      (,terminal-class (:inherit link-visited))))
-
-   `(w3m-form
-     ((,class (:background ,monokai-bg
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(w3m-header-line-location-title
-     ((,class (:background ,monokai-hl
-                           :foreground ,yellow))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-yellow))))
-
-   `(w3m-header-line-location-content
-
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(w3m-bold
-     ((,class (:foreground ,monokai-emph
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :weight bold))))
-
-   `(w3m-image-anchor
-     ((,class (:background ,monokai-bg
-                           :foreground ,cyan
-                           :inherit link))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-cyan
-                                    :inherit link))))
-
-   `(w3m-image
-     ((,class (:background ,monokai-bg
-                           :foreground ,cyan))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-cyan))))
-
-   `(w3m-lnum-minibuffer-prompt
-     ((,class (:foreground ,monokai-emph))
-      (,terminal-class (:foreground ,terminal-monokai-emph))))
-
-   `(w3m-lnum-match
-     ((,class (:background ,monokai-hl))
-      (,terminal-class (:background ,terminal-monokai-hl))))
-
-   `(w3m-lnum
-     ((,class (:underline nil
-                          :bold nil
-                          :foreground ,red))
-      (,terminal-class (:underline nil
-                                   :bold nil
-                                   :foreground ,terminal-red))))
-
-   `(w3m-session-select
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(w3m-session-selected
-     ((,class (:foreground ,monokai-emph
-                           :bold t
-                           :underline t))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :bold t
-                                    :underline t))))
-
-   `(w3m-tab-background
-     ((,class (:background ,monokai-bg
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(w3m-tab-selected-background
-     ((,class (:background ,monokai-bg
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-bg
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(w3m-tab-mouse
-     ((,class (:background ,monokai-hl
-                           :foreground ,yellow))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-yellow))))
-
-   `(w3m-tab-selected
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-emph
-                           :bold t))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-emph
-                                    :bold t))))
-
-   `(w3m-tab-unselected
-     ((,class (:background ,monokai-hl
-                           :foreground ,monokai-fg))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-monokai-fg))))
-
-   `(w3m-tab-selected-retrieving
-     ((,class (:background ,monokai-hl
-                           :foreground ,red))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-red))))
-
-   `(w3m-tab-unselected-retrieving
-     ((,class (:background ,monokai-hl
-                           :foreground ,orange))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-orange))))
-
-   `(w3m-tab-unselected-unseen
-     ((,class (:background ,monokai-hl
-                           :foreground ,violet))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :foreground ,terminal-violet))))
-
-   ;; web-mode
-   `(web-mode-builtin-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(web-mode-comment-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   `(web-mode-constant-face
-     ((,class (:foreground ,blue
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :weight bold))))
-
-   `(web-mode-current-element-highlight-face
-     ((,class (:underline unspecified
-                          :weight unspecified
-                          :background ,monokai-hl))
-      (,terminal-class (:underline unspecified
-                                   :weight unspecified
-                                   :background ,terminal-monokai-hl))))
-
-   `(web-mode-css-at-rule-face
-     ((,class (:foreground ,violet
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-violet
-                                    :slant italic))))
-
-   `(web-mode-css-pseudo-class-face
-     ((,class (:foreground ,green
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-green
-                                    :slant italic))))
-
-   `(web-mode-doctype-face
-     ((,class (:foreground ,monokai-comments
-                           :slant italic
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :slant italic
-                                    :weight bold))))
-
-   `(web-mode-folded-face
-     ((,class (:underline t))
-      (,terminal-class (:underline t))))
-
-   `(web-mode-function-name-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(web-mode-html-attr-name-face
-     ((,class (:foreground ,blue
-                           :slant normal))
-      (,terminal-class (:foreground ,terminal-blue
-                                    :slant normal))))
-
-   `(web-mode-html-attr-value-face
-     ((,class (:foreground ,cyan
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-cyan
-                                    :slant italic))))
-
-   `(web-mode-html-tag-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(web-mode-keyword-face
-     ((,class (:foreground ,yellow
-                           :weight normal))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :weight normal))))
-
-   `(web-mode-preprocessor-face
-     ((,class (:foreground ,yellow
-                           :slant normal
-                           :weight unspecified))
-      (,terminal-class (:foreground ,terminal-yellow
-                                    :slant normal
-                                    :weight unspecified))))
-
-   `(web-mode-string-face
-     ((,class (:foreground ,cyan))
-      (,terminal-class (:foreground ,terminal-cyan))))
-
-   `(web-mode-type-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(web-mode-variable-name-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(web-mode-warning-face
-     ((,class (:inherit font-lock-warning-face))
-      (,terminal-class (:inherit font-lock-warning-face))))
-
-   `(web-mode-block-attr-name-face
-     ((,class (:inherit web-mode-html-attr-name-face))
-      (,terminal-class (:inherit web-mode-html-attr-name-face))))
-
-   `(web-mode-block-attr-value-face
-     ((,class (:inherit web-mode-html-attr-value-face))
-      (,terminal-class (:inherit web-mode-html-attr-value-face))))
-
-   `(web-mode-block-comment-face
-     ((,class (:inherit web-mode-comment-face))
-      (,terminal-class (:inherit web-mode-comment-face))))
-
-   `(web-mode-block-control-face
-     ((,class (:inherit font-lock-preprocessor-face))
-      (,terminal-class (:inherit font-lock-preprocessor-face))))
-
-   `(web-mode-block-face
-     ((,class (:background unspecified))
-      (,terminal-class (:background unspecified))))
-
-   `(web-mode-block-string-face
-     ((,class (:inherit web-mode-string-face))
-      (,terminal-class (:inherit web-mode-string-face))))
-
-   `(web-mode-comment-keyword-face
-     ((,class (:box 1
-                    :weight bold))
-      (,terminal-class (:box 1
-                             :weight bold))))
-
-   `(web-mode-css-color-face
-     ((,class (:inherit font-lock-builtin-face))
-      (,terminal-class (:inherit font-lock-builtin-face))))
-
-   `(web-mode-css-function-face
-     ((,class (:inherit font-lock-builtin-face))
-      (,terminal-class (:inherit font-lock-builtin-face))))
-
-   `(web-mode-css-priority-face
-     ((,class (:inherit font-lock-builtin-face))
-      (,terminal-class (:inherit font-lock-builtin-face))))
-
-   `(web-mode-css-property-name-face
-     ((,class (:inherit font-lock-variable-name-face))
-      (,terminal-class (:inherit font-lock-variable-name-face))))
-
-   `(web-mode-css-selector-face
-     ((,class (:inherit font-lock-keyword-face))
-      (,terminal-class (:inherit font-lock-keyword-face))))
-
-   `(web-mode-css-string-face
-     ((,class (:inherit web-mode-string-face))
-      (,terminal-class (:inherit web-mode-string-face))))
-
-   `(web-mode-javascript-string-face
-     ((,class (:inherit web-mode-string-face))
-      (,terminal-class (:inherit web-mode-string-face))))
-
-   `(web-mode-json-context-face
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(web-mode-json-key-face
-     ((,class (:foreground ,violet))
-      (,terminal-class (:foreground ,terminal-violet))))
-
-   `(web-mode-json-string-face
-     ((,class (:inherit web-mode-string-face))
-      (,terminal-class (:inherit web-mode-string-face))))
-
-   `(web-mode-param-name-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(web-mode-part-comment-face
-     ((,class (:inherit web-mode-comment-face))
-      (,terminal-class (:inherit web-mode-comment-face))))
-
-   `(web-mode-part-face
-     ((,class (:inherit web-mode-block-face))
-      (,terminal-class (:inherit web-mode-block-face))))
-
-   `(web-mode-part-string-face
-     ((,class (:inherit web-mode-string-face))
-      (,terminal-class (:inherit web-mode-string-face))))
-
-   `(web-mode-symbol-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(web-mode-whitespace-face
-     ((,class (:background ,red))
-      (,terminal-class (:background ,terminal-red))))
-
-   ;; whitespace-mode
-   `(whitespace-space
-     ((,class (:background unspecified
-                           :foreground ,monokai-comments
-                           :inverse-video unspecified
-                           :slant italic))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-monokai-comments
-                                    :inverse-video unspecified
-                                    :slant italic))))
-
-   `(whitespace-hspace
-     ((,class (:background unspecified
-                           :foreground ,monokai-emph
-                           :inverse-video unspecified))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-monokai-emph
-                                    :inverse-video unspecified))))
-
-   `(whitespace-tab
-     ((,class (:background unspecified
-                           :foreground ,red
-                           :inverse-video unspecified
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-red
-                                    :inverse-video unspecified
-                                    :weight bold))))
-
-   `(whitespace-newline
-     ((,class(:background unspecified
-                          :foreground ,monokai-comments
-                          :inverse-video unspecified))
-      (,terminal-class(:background unspecified
-                                   :foreground ,terminal-monokai-comments
-                                   :inverse-video unspecified))))
-
-   `(whitespace-trailing
-     ((,class (:background unspecified
-                           :foreground ,orange-lc
-                           :inverse-video t))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-orange-lc
-                                    :inverse-video t))))
-
-   `(whitespace-line
-     ((,class (:background unspecified
-                           :foreground ,magenta
-                           :inverse-video unspecified))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-magenta
-                                    :inverse-video unspecified))))
-
-   `(whitespace-space-before-tab
-     ((,class (:background ,red-lc
-                           :foreground unspecified
-                           :inverse-video unspecified))
-      (,terminal-class (:background ,terminal-red-lc
-                                    :foreground unspecified
-                                    :inverse-video unspecified))))
-
-   `(whitespace-indentation
-     ((,class (:background unspecified
-                           :foreground ,yellow
-                           :inverse-video unspecified
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-yellow
-                                    :inverse-video unspecified
-                                    :weight bold))))
-
-   `(whitespace-empty
-     ((,class (:background unspecified
-                           :foreground ,red-lc
-                           :inverse-video t))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-red-lc
-                                    :inverse-video t))))
-
-   `(whitespace-space-after-tab
-     ((,class (:background unspecified
-                           :foreground ,orange
-                           :inverse-video t
-                           :weight bold))
-      (,terminal-class (:background unspecified
-                                    :foreground ,terminal-orange
-                                    :inverse-video t
-                                    :weight bold))))
-
-   ;; wanderlust
-   `(wl-highlight-folder-few-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(wl-highlight-folder-many-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(wl-highlight-folder-path-face
-     ((,class (:foreground ,orange))
-      (,terminal-class (:foreground ,terminal-orange))))
-
-   `(wl-highlight-folder-unread-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(wl-highlight-folder-zero-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(wl-highlight-folder-unknown-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(wl-highlight-message-citation-header
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(wl-highlight-message-cited-text-1
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(wl-highlight-message-cited-text-2
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(wl-highlight-message-cited-text-3
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(wl-highlight-message-cited-text-4
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(wl-highlight-message-header-contents-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(wl-highlight-message-headers-face
-     ((,class (:foreground ,red))
-      (,terminal-class (:foreground ,terminal-red))))
-
-   `(wl-highlight-message-important-header-contents
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(wl-highlight-message-header-contents
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(wl-highlight-message-important-header-contents2
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(wl-highlight-message-signature
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   `(wl-highlight-message-unimportant-header-contents
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(wl-highlight-summary-answered-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(wl-highlight-summary-disposed-face
-     ((,class (:foreground ,monokai-fg
-                           :slant italic))
-      (,terminal-class (:foreground ,terminal-monokai-fg
-                                    :slant italic))))
-
-   `(wl-highlight-summary-new-face
-     ((,class (:foreground ,blue))
-      (,terminal-class (:foreground ,terminal-blue))))
-
-   `(wl-highlight-summary-normal-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(wl-highlight-summary-thread-top-face
-     ((,class (:foreground ,yellow))
-      (,terminal-class (:foreground ,terminal-yellow))))
-
-   `(wl-highlight-thread-indent-face
-     ((,class (:foreground ,magenta))
-      (,terminal-class (:foreground ,terminal-magenta))))
-
-   `(wl-highlight-summary-refiled-face
-     ((,class (:foreground ,monokai-fg))
-      (,terminal-class (:foreground ,terminal-monokai-fg))))
-
-   `(wl-highlight-summary-displaying-face
-     ((,class (:underline t
-                          :weight bold))
-      (,terminal-class (:underline t
-                                   :weight bold))))
-
-   ;; weechat
-   `(weechat-error-face
-     ((,class (:inherit error))
-      (,terminal-class (:inherit error))))
-
-   `(weechat-highlight-face
-     ((,class (:foreground ,monokai-emph
-                           :weight bold))
-      (,terminal-class (:foreground ,terminal-monokai-emph
-                                    :weight bold))))
-
-   `(weechat-nick-self-face
-     ((,class (:foreground ,green
-                           :weight unspecified
-                           :inverse-video t))
-      (,terminal-class (:foreground ,terminal-green
-                                    :weight unspecified
-                                    :inverse-video t))))
-
-   `(weechat-prompt-face
-     ((,class (:inherit minibuffer-prompt))
-      (,terminal-class (:inherit minibuffer-prompt))))
-
-   `(weechat-time-face
-     ((,class (:foreground ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments))))
-
-   ;; which-func-mode
-   `(which-func
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   ;; window-number-mode
-   `(window-number-face
-     ((,class (:foreground ,green))
-      (,terminal-class (:foreground ,terminal-green))))
-
-   ;; yascroll
-   `(yascroll:thumb-text-area
-     ((,class (:foreground ,monokai-comments
-                           :background ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-monokai-comments))))
-
-   `(yascroll:thumb-fringe
-     ((,class (:foreground ,monokai-comments
-                           :background ,monokai-comments))
-      (,terminal-class (:foreground ,terminal-monokai-comments
-                                    :background ,terminal-monokai-comments))))
-
-   ;; zencoding
-   `(zencoding-preview-input
-     ((,class (:background ,monokai-hl
-                           :box ,monokai-emph))
-      (,terminal-class (:background ,terminal-monokai-hl
-                                    :box ,terminal-monokai-emph)))))
-
-  (custom-theme-set-variables
-   'monokai
-   `(ansi-color-names-vector [,monokai-bg ,red ,green ,yellow
-                                          ,blue ,magenta ,cyan ,monokai-fg])
-
-   ;; compilation
-   `(compilation-message-face 'default)
-
-   ;; fill-column-indicator
-   `(fci-rule-color ,monokai-hl)
-
-   ;; magit
-   `(magit-diff-use-overlays nil)
-
-   ;; highlight-changes
-   `(highlight-changes-colors (,magenta ,violet))
-
-   ;; highlight-tail
-   `(highlight-tail-colors
-     '((,monokai-hl . 0)(,green-lc . 20)(,cyan-lc . 30)(,blue-lc . 50)
-       (,yellow-lc . 60)(,orange-lc . 70)(,magenta-lc . 85)(,monokai-hl . 100)))
-
-   ;; vc
-   `(vc-annotate-color-map
-     '((20 . ,red)
-       (40 . "#CF4F1F")
-       (60 . "#C26C0F")
-       (80 . ,yellow)
-       (100 . "#AB8C00")
-       (120 . "#A18F00")
-       (140 . "#989200")
-       (160 . "#8E9500")
-       (180 . ,green)
-       (200 . "#729A1E")
-       (220 . "#609C3C")
-       (240 . "#4E9D5B")
-       (260 . "#3C9F79")
-       (280 . ,cyan)
-       (300 . "#299BA6")
-       (320 . "#2896B5")
-       (340 . "#2790C3")
-       (360 . ,blue)))
-   `(vc-annotate-very-old-color nil)
-   `(vc-annotate-background nil)
-
-   ;; weechat
-   `(weechat-color-list
-     (unspecified ,monokai-bg ,monokai-hl
-                  ,red-d ,red
-                  ,green-d ,green
-                  ,yellow-d ,yellow
-                  ,blue-d ,blue
-                  ,magenta-d ,magenta
-                  ,cyan-d ,cyan
-                  ,monokai-fg ,monokai-emph))))
-
-;;;###autoload
-(when (and (boundp 'custom-theme-load-path) load-file-name)
-  (add-to-list 'custom-theme-load-path
-               (file-name-as-directory (file-name-directory load-file-name))))
-
-(provide-theme 'monokai)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; eval: (when (fboundp 'rainbow-mode) (rainbow-mode 1))
-;; eval: (when (fboundp 'aggressive-indent-mode) (aggressive-indent-mode -1))
-;; fill-column: 95
-;; End:
-
-;;; monokai-theme.el ends here
diff --git a/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme-autoloads.el b/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme-autoloads.el
new file mode 100644
index 0000000..96f06e0
--- /dev/null
+++ b/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme-autoloads.el
@@ -0,0 +1,19 @@
+;;; monokai-theme-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "monokai-theme" "monokai-theme.el" (22171 46553
+;;;;;;  0 0))
+;;; Generated autoloads from monokai-theme.el
+
+(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; monokai-theme-autoloads.el ends here
diff --git a/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme-pkg.el b/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme-pkg.el
new file mode 100644
index 0000000..d3de13a
--- /dev/null
+++ b/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme-pkg.el
@@ -0,0 +1 @@
+(define-package "monokai-theme" "20160104.1312" "A fruity color theme for Emacs." 'nil :url "http://github.com/oneKelvinSmith/monokai-emacs")
diff --git a/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme.el b/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme.el
new file mode 100644
index 0000000..8048dd0
--- /dev/null
+++ b/emacs.d/elpa/monokai-theme-20160104.1312/monokai-theme.el
@@ -0,0 +1,5538 @@
+;;; monokai-theme.el --- A fruity color theme for Emacs.
+
+;; Copyright (C) 2011-2015
+
+;; Author: Kelvin Smith <oneKelvinSmith@gmail.com>
+;; URL: http://github.com/oneKelvinSmith/monokai-emacs
+;; Package-Version: 20160104.1312
+;; Version: 0.2.4
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; A port of the popular Textmate theme Monokai for Emacs 24, built on top
+;; of the new built-in theme support in Emacs 24.
+;;
+;;; Credits:
+;;
+;; Wimer Hazenberg created the original theme.
+;; - http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
+;;
+;; Bozhidar Batsov created zenburn-theme.el and solarized-theme.el
+;;  on which this file is based.
+;; - https://github.com/bbatsov/zenburn-emacs
+;;
+;; Color Scheme Designer 3 for complementary colours.
+;; - http://colorschemedesigner.com/
+;;
+;; Xterm 256 Color Chart
+;; - https://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg
+;;
+;; K. Adam Christensen for his personal monokai theme that addresses 256 colours.
+;; - https://github.com/pope/personal/blob/master/etc/emacs.d/monokai-theme.el
+;;
+;; Thomas Frössman for his work on solarized-emacs.
+;; - http://github.com/bbatsov/solarized-emacs
+;;
+;;; Code:
+
+(unless (>= emacs-major-version 24)
+  (error "The monokai theme requires Emacs 24 or later!"))
+
+(deftheme monokai "The Monokai colour theme")
+
+(defgroup monokai nil
+  "Monokai theme options.
+The theme has to be reloaded after changing anything in this group."
+  :group 'faces)
+
+(defcustom monokai-distinct-fringe-background nil
+  "Make the fringe background different from the normal background color.
+Also affects 'linum-mode' background."
+  :type 'boolean
+  :group 'monokai)
+
+(defcustom monokai-use-variable-pitch t
+  "Use variable pitch face for some headings and titles."
+  :type 'boolean
+  :group 'monokai)
+
+(defcustom monokai-high-contrast-mode-line nil
+  "Make the active/inactive mode line stand out more."
+  :type 'boolean
+  :group 'monokai)
+
+(defcustom monokai-height-minus-1 0.8
+  "Font size -1."
+  :type 'number
+  :group 'monokai)
+
+(defcustom monokai-height-plus-1 1.1
+  "Font size +1."
+  :type 'number
+  :group 'monokai)
+
+(defcustom monokai-height-plus-2 1.15
+  "Font size +2."
+  :type 'number
+  :group 'monokai)
+
+(defcustom monokai-height-plus-3 1.2
+  "Font size +3."
+  :type 'number
+  :group 'monokai)
+
+(defcustom monokai-height-plus-4 1.3
+  "Font size +4."
+  :type 'number
+  :group 'monokai)
+
+(let* ((class                    '((class color) (min-colors 257)))
+       ;; Primary colors
+       (yellow                   "#E6DB74")
+       (orange                   "#FD971F")
+       (red                      "#F92672")
+       (magenta                  "#FD5FF0")
+       (violet                   "#AE81FF")
+       (blue                     "#66D9EF")
+       (cyan                     "#A1EFE4")
+       (green                    "#A6E22E")
+       (gray                     "#474747")
+       ;; Darker and lighter accented colors
+       (yellow-d                 "#968B26")
+       (yellow-l                 "#F3EA98")
+       (orange-d                 "#A45E0A")
+       (orange-l                 "#FEB257")
+       (red-d                    "#A20C41")
+       (red-l                    "#FC5C94")
+       (magenta-d                "#A41F99")
+       (magenta-l                "#FE87F4")
+       (violet-d                 "#562AA6")
+       (violet-l                 "#C2A1FF")
+       (blue-d                   "#21889B")
+       (blue-l                   "#8DE6F7")
+       (cyan-d                   "#349B8D")
+       (cyan-l                   "#BBF7EF")
+       (green-d                  "#67930F")
+       (green-l                  "#C1F161")
+       (gray-d                   "#333333")
+       (gray-l                   "#6b6b6b")
+       ;; Adaptive colors
+       (monokai-fg               "#F8F8F2")
+       (monokai-bg               "#272822")
+       (monokai-hl               "#3E3D31")
+       (monokai-hl-line          "#49483E")
+       (monokai-emph             "#F8F8F0")
+       (monokai-comments         "#75715E")
+       ;; Adaptive higher/lower contrast accented colors
+       (monokai-fg-hc            "#141414")
+       (monokai-fg-lc            "#171A0B")
+       ;; High contrast colors
+       (yellow-hc                yellow-l)
+       (yellow-lc                yellow-d)
+       (orange-hc                orange-l)
+       (orange-lc                orange-d)
+       (red-hc                   red-l)
+       (red-lc                   red-d)
+       (magenta-hc               magenta-l)
+       (magenta-lc               magenta-d)
+       (violet-hc                violet-l)
+       (violet-lc                violet-d)
+       (blue-hc                  blue-l)
+       (blue-lc                  blue-d)
+       (cyan-hc                  cyan-l)
+       (cyan-lc                  cyan-d)
+       (green-hc                 green-l)
+       (green-lc                 green-d)
+       ;; customize based face properties
+       (s-variable-pitch         (if monokai-use-variable-pitch
+                                     'variable-pitch 'default))
+       (s-fringe-bg              (if monokai-distinct-fringe-background
+                                     monokai-hl monokai-bg))
+       (s-mode-line-fg           (if monokai-high-contrast-mode-line
+                                     monokai-bg monokai-fg))
+       (s-mode-line-bg           (if monokai-high-contrast-mode-line
+                                     monokai-fg monokai-hl))
+       (s-mode-line-buffer-id-fg (if monokai-high-contrast-mode-line
+                                     'unspecified green))
+       (s-mode-line-inactive-fg  (if monokai-high-contrast-mode-line
+                                     monokai-fg monokai-comments))
+       (s-mode-line-inactive-bg  (if monokai-high-contrast-mode-line
+                                     gray-l monokai-bg))
+       (s-mode-line-inactive-bc  (if monokai-high-contrast-mode-line
+                                     monokai-fg monokai-hl))
+
+       ;; powerline
+       (s-powerline-active1-bg   (if monokai-high-contrast-mode-line
+                                     gray-l gray))
+       (s-powerline-active2-bg   (if monokai-high-contrast-mode-line
+                                     gray gray-l))
+       (s-powerline-inactive1-bg (if monokai-high-contrast-mode-line
+                                     gray gray-d))
+       (s-powerline-inactive2-bg (if monokai-high-contrast-mode-line
+                                     monokai-bg gray))
+
+       ;; Definitions for terminals that do not support 256 colors
+       (terminal-class                    '((class color) (min-colors 89)))
+       ;; Primary colors
+       (terminal-yellow                   "#CDC673")
+       (terminal-orange                   "#FF8C00")
+       (terminal-red                      "#FF1493")
+       (terminal-magenta                  "#D700D7")
+       (terminal-violet                   "#AF87FF")
+       (terminal-blue                     "#5FD7FF")
+       (terminal-cyan                     "#5FFFFF")
+       (terminal-green                    "#87D700")
+       (terminal-gray                     "#444444")
+       ;; Darker and lighter accented colors
+       (terminal-yellow-d                 "#878700")
+       (terminal-yellow-l                 "#FFFF87")
+       (terminal-orange-d                 "#AF5F00")
+       (terminal-orange-l                 "#FFAF5F")
+       (terminal-red-d                    "#870000")
+       (terminal-red-l                    "#FF5F87")
+       (terminal-magenta-d                "#AF0087")
+       (terminal-magenta-l                "#FF87DF")
+       (terminal-violet-d                 "#5F00AF")
+       (terminal-violet-l                 "#AF87D7")
+       (terminal-blue-d                   "#008787")
+       (terminal-blue-l                   "#87D7FF")
+       (terminal-cyan-d                   "#5FAFAF")
+       (terminal-cyan-l                   "#AFFFFF")
+       (terminal-green-d                  "#5F8700")
+       (terminal-green-l                  "#AFD700")
+       (terminal-gray-d                   "#3A3A3A")
+       (terminal-gray-l                   "#6C6C6C")
+       ;; Adaptive colors
+       (terminal-monokai-fg               "#F5F5F5")
+       (terminal-monokai-bg               "#1B1E1C")
+       (terminal-monokai-hl-line          "#212121")
+       (terminal-monokai-hl               "#303030")
+       (terminal-monokai-emph             "#FFFAFA")
+       (terminal-monokai-comments         "#8B8878")
+       ;; Adaptive higher/lower contrast accented colors
+       (terminal-monokai-fg-hc            "#171A0B")
+       (terminal-monokai-fg-lc            "#141414")
+       ;; High contrast colors
+       (terminal-yellow-hc                terminal-yellow-d)
+       (terminal-yellow-lc                terminal-yellow-l)
+       (terminal-orange-hc                terminal-orange-d)
+       (terminal-orange-lc                terminal-orange-l)
+       (terminal-red-hc                   terminal-red-d)
+       (terminal-red-lc                   terminal-red-l)
+       (terminal-magenta-hc               terminal-magenta-d)
+       (terminal-magenta-lc               terminal-magenta-l)
+       (terminal-violet-hc                terminal-violet-d)
+       (terminal-violet-lc                terminal-violet-l)
+       (terminal-blue-hc                  terminal-blue-d)
+       (terminal-blue-lc                  terminal-blue-l)
+       (terminal-cyan-hc                  terminal-cyan-d)
+       (terminal-cyan-lc                  terminal-cyan-l)
+       (terminal-green-hc                 terminal-green-d)
+       (terminal-green-lc                 terminal-green-l)
+       ;; customize based face properties
+       (terminal-s-variable-pitch         (if monokai-use-variable-pitch
+                                              'variable-pitch 'default))
+       (terminal-s-fringe-bg              (if monokai-distinct-fringe-background
+                                              terminal-monokai-hl terminal-monokai-bg))
+       (terminal-s-mode-line-fg           (if monokai-high-contrast-mode-line
+                                              terminal-monokai-bg terminal-monokai-fg))
+       (terminal-s-mode-line-bg           (if monokai-high-contrast-mode-line
+                                              terminal-monokai-fg terminal-monokai-hl))
+       (terminal-s-mode-line-buffer-id-fg (if monokai-high-contrast-mode-line
+                                              'unspecified terminal-green))
+       (terminal-s-mode-line-inactive-fg  (if monokai-high-contrast-mode-line
+                                              terminal-monokai-fg terminal-monokai-comments))
+       (terminal-s-mode-line-inactive-bg  (if monokai-high-contrast-mode-line
+                                              terminal-monokai-hl-line terminal-monokai-bg))
+       (terminal-s-mode-line-inactive-bc  (if monokai-high-contrast-mode-line
+                                              terminal-monokai-fg terminal-monokai-hl)))
+
+  ;; Define faces
+  (custom-theme-set-faces
+   'monokai
+   '(button ((t (:underline t))))
+
+   ;; basic coloring
+   `(default
+      ((,class (:foreground ,monokai-fg
+                            :background ,monokai-bg))
+       (,terminal-class (:foreground ,terminal-monokai-fg
+                                     :background ,terminal-monokai-bg))))
+
+   `(shadow
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(match
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :weight bold))))
+
+   `(cursor
+     ((,class (:foreground ,monokai-bg
+                           :background ,monokai-fg
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-monokai-fg
+                                    :inverse-video t))))
+
+   `(mouse
+     ((,class (:foreground ,monokai-bg
+                           :background ,monokai-fg
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-monokai-fg
+                                    :inverse-video t))))
+
+   `(escape-glyph-face
+     ((,class (:foreground ,red)))
+     ((,terminal-class (:foreground ,terminal-red))))
+
+   `(fringe
+     ((,class (:foreground ,monokai-fg
+                           :background ,s-fringe-bg))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :background ,terminal-s-fringe-bg))))
+
+   `(highlight
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(link
+     ((,class (:foreground ,blue
+                           :underline t
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :underline t
+                                    :weight bold))))
+
+   `(link-visited
+     ((,class (:foreground ,violet
+                           :underline t
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-violet
+                                    :underline t
+                                    :weight normal))))
+
+   `(success
+     ((,class (:foreground ,green ))
+      (,terminal-class (:foreground ,terminal-green ))))
+
+   `(warning
+     ((,class (:foreground ,yellow ))
+      (,terminal-class (:foreground ,terminal-yellow ))))
+
+   `(error
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(lazy-highlight
+     ((,class (:foreground ,monokai-bg
+                           :background ,monokai-comments
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-yellow
+                                    :weight normal))))
+
+   `(escape-glyph
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   ;; compilation
+   `(compilation-column-face
+     ((,class (:foreground ,cyan
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :underline nil))))
+
+   `(compilation-column-number
+     ((,class (:inherit font-lock-doc-face
+                        :foreground ,cyan
+                        :underline nil))
+      (,terminal-class (:inherit font-lock-doc-face
+                                 :foreground ,terminal-cyan
+                                 :underline nil))))
+
+   `(compilation-enter-directory-face
+     ((,class (:foreground ,green
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-green
+                                    :underline nil))))
+
+   `(compilation-error
+     ((,class (:inherit error
+                        :underline nil))
+      (,terminal-class (:inherit error
+                                 :underline nil))))
+
+   `(compilation-error-face
+     ((,class (:foreground ,red
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-red
+                                    :underline nil))))
+
+   `(compilation-face
+     ((,class (:foreground ,monokai-fg
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :underline nil))))
+
+   `(compilation-info
+     ((,class (:foreground ,monokai-comments
+                           :underline nil
+                           :bold nil))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :underline nil
+                                    :bold nil))))
+
+   `(compilation-info-face
+     ((,class (:foreground ,blue
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :underline nil))))
+
+   `(compilation-leave-directory-face
+     ((,class (:foreground ,green
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-green
+                                    :underline nil))))
+
+   `(compilation-line-face
+     ((,class (:foreground ,green
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-green
+                                    :underline nil))))
+
+   `(compilation-line-number
+     ((,class (:foreground ,green
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-green
+                                    :underline nil))))
+
+   `(compilation-warning
+     ((,class (:inherit warning
+                        :underline nil))
+      (,terminal-class (:inherit warning
+                                 :underline nil))))
+
+   `(compilation-warning-face
+     ((,class (:foreground ,yellow
+                           :weight normal
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal
+                                    :underline nil))))
+
+   `(compilation-mode-line-exit
+     ((,class (:inherit compilation-info
+                        :foreground ,green
+                        :weight bold))
+      (,terminal-class (:inherit compilation-info
+                                 :foreground ,terminal-green
+                                 :weight bold))))
+
+   `(compilation-mode-line-fail
+     ((,class (:inherit compilation-error
+                        :foreground ,red
+                        :weight bold))
+      (,terminal-class (:inherit compilation-error
+                                 :foreground ,terminal-red
+                                 :weight bold))))
+
+   `(compilation-mode-line-run
+     ((,class (:foreground ,orange
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold))))
+
+   ;; cua
+   `(cua-global-mark
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(cua-rectangle
+     ((,class (:inherit region
+                        :background ,violet
+                        :foreground ,monokai-bg))
+      (,terminal-class (:inherit region
+                                 :background ,terminal-magenta
+                                 :foreground ,terminal-monokai-bg))))
+
+   `(cua-rectangle-noselect
+     ((,class (:inherit region
+                        :background ,monokai-hl
+                        :foreground ,monokai-comments))
+      (,terminal-class (:inherit region
+                                 :background ,terminal-monokai-hl
+                                 :foreground ,terminal-monokai-comments))))
+
+   ;; diary
+   `(diary
+     ((,class (:foreground ,yellow))
+      (,class (:foreground ,terminal-yellow))))
+
+   ;; dired
+   `(dired-directory
+     ((,class (:foreground ,blue
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight normal))))
+
+   `(dired-flagged
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(dired-header
+     ((,class (:foreground ,monokai-bg
+                           :background ,blue))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-blue))))
+
+   `(dired-ignored
+     ((,class (:inherit shadow))
+      (,terminal-class (:inherit shadow))))
+
+   `(dired-mark
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(dired-marked
+     ((,class (:foreground ,magenta
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :weight bold))))
+
+   `(dired-perm-write
+     ((,class (:foreground ,monokai-fg
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :underline t))))
+
+   `(dired-symlink
+     ((,class (:foreground ,cyan
+                           :weight normal
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :weight normal
+                                    :slant italic))))
+
+   `(dired-warning
+     ((,class (:foreground ,orange
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :underline t))))
+
+   ;; dropdown
+   `(dropdown-list-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,blue))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-blue))))
+
+   `(dropdown-list-selection-face
+     ((,class (:background ,green
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-green
+                                    :foreground ,terminal-monokai-bg))))
+
+   ;; ecb
+   `(ecb-default-highlight-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(ecb-history-bucket-node-dir-soure-path-face
+     ((,class (:inherit ecb-history-bucket-node-face
+                        :foreground ,yellow))
+      (,terminal-class (:inherit ecb-history-bucket-node-face
+                                 :foreground ,terminal-yellow))))
+
+   `(ecb-source-in-directories-buffer-face
+     ((,class (:inherit ecb-directories-general-face
+                        :foreground ,monokai-fg))
+      (,terminal-class (:inherit ecb-directories-general-face
+                                 :foreground ,terminal-monokai-fg))))
+
+   `(ecb-history-dead-buffer-face
+     ((,class (:inherit ecb-history-general-face
+                        :foreground ,monokai-comments))
+      (,terminal-class (:inherit ecb-history-general-face
+                                 :foreground ,terminal-monokai-comments))))
+
+   `(ecb-directory-not-accessible-face
+     ((,class (:inherit ecb-directories-general-face
+                        :foreground ,monokai-comments))
+      (,terminal-class (:inherit ecb-directories-general-face
+                                 :foreground ,terminal-monokai-comments))))
+
+   `(ecb-bucket-node-face
+     ((,class (:inherit ecb-default-general-face
+                        :weight normal
+                        :foreground ,blue))
+      (,terminal-class (:inherit ecb-default-general-face
+                                 :weight normal
+                                 :foreground ,terminal-blue))))
+
+   `(ecb-tag-header-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(ecb-analyse-bucket-element-face
+     ((,class (:inherit ecb-analyse-general-face
+                        :foreground ,green))
+      (,terminal-class (:inherit ecb-analyse-general-face
+                                 :foreground ,terminal-green))))
+
+   `(ecb-directories-general-face
+     ((,class (:inherit ecb-default-general-face
+                        :height 1.0))
+      (,terminal-class (:inherit ecb-default-general-face
+                                 :height 1.0))))
+
+   `(ecb-method-non-semantic-face
+     ((,class (:inherit ecb-methods-general-face
+                        :foreground ,cyan))
+      (,terminal-class (:inherit ecb-methods-general-face
+                                 :foreground ,terminal-cyan))))
+
+   `(ecb-mode-line-prefix-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(ecb-tree-guide-line-face
+     ((,class (:inherit ecb-default-general-face
+                        :foreground ,monokai-hl
+                        :height 1.0))
+      (,terminal-class (:inherit ecb-default-general-face
+                                 :foreground ,terminal-monokai-hl
+                                 :height 1.0))))
+
+   ;; ee
+   `(ee-bookmarked
+     ((,class (:foreground ,monokai-emph))
+      (,terminal-class (:foreground ,terminal-monokai-emph))))
+
+   `(ee-category
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(ee-link
+     ((,class (:inherit link))
+      (,terminal-class (:inherit link))))
+
+   `(ee-link-visited
+     ((,class (:inherit link-visited))
+      (,terminal-class (:inherit link-visited))))
+
+   `(ee-marked
+     ((,class (:foreground ,magenta
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :weight bold))))
+
+   `(ee-omitted
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(ee-shadow
+     ((,class (:inherit shadow))
+      (,terminal-class (:inherit shadow))))
+
+   ;; grep
+   `(grep-context-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(grep-error-face
+     ((,class (:foreground ,red
+                           :weight bold
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold
+                                    :underline t))))
+
+   `(grep-hit-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(grep-match-face
+     ((,class (:foreground ,orange
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold))))
+
+   ;; faces used by isearch
+   `(isearch
+     ((,class (:foreground ,monokai-bg
+                           :background ,violet
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-magenta
+                                    :weight normal))))
+
+   `(isearch-fail
+     ((,class (:foreground ,red
+                           :background ,monokai-bg
+                           :bold t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg
+                                    :bold t))))
+
+   ;; man
+   `(Man-overstrike
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(Man-reverse
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(Man-underline
+     ((,class (:foreground ,green :underline t))
+      (,terminal-class (:foreground ,terminal-green :underline t))))
+
+   ;; misc faces
+   `(menu
+     ((,class (:foreground ,monokai-fg
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :background ,terminal-monokai-bg))))
+
+   `(minibuffer-prompt
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(mode-line
+     ((,class (:inverse-video unspecified
+                              :underline unspecified
+                              :foreground ,s-mode-line-fg
+                              :background ,s-mode-line-bg
+                              :box (:line-width 1
+                                                :color ,s-mode-line-bg
+                                                :style unspecified)))
+      (,terminal-class (:inverse-video unspecified
+                                       :underline unspecified
+                                       :foreground ,terminal-s-mode-line-fg
+                                       :background ,terminal-s-mode-line-bg
+                                       :box (:line-width 1
+                                                         :color ,terminal-s-mode-line-bg
+                                                         :style unspecified)))))
+
+   `(mode-line-buffer-id
+     ((,class (:foreground ,s-mode-line-buffer-id-fg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-s-mode-line-buffer-id-fg
+                                    :weight bold))))
+
+   `(mode-line-inactive
+     ((,class (:inverse-video unspecified
+                              :underline unspecified
+                              :foreground ,s-mode-line-inactive-fg
+                              :background ,s-mode-line-inactive-bg
+                              :box (:line-width 1
+                                                :color ,s-mode-line-inactive-bc
+                                                :style unspecified)))
+      (,terminal-class (:inverse-video unspecified
+                                       :underline unspecified
+                                       :foreground ,terminal-s-mode-line-inactive-fg
+                                       :background ,terminal-s-mode-line-inactive-bg
+                                       :box (:line-width 1
+                                                         :color ,terminal-s-mode-line-inactive-bc
+                                                         :style unspecified)))))
+
+   `(header-line
+     ((,class (:inverse-video unspecified
+                              :underline unspecified
+                              :foreground ,monokai-emph
+                              :background ,monokai-hl
+                              :box (:line-width 1
+                                                :color ,monokai-hl
+                                                :style unspecified)))
+      (,terminal-class (:inverse-video unspecified
+                                       :underline unspecified
+                                       :foreground ,terminal-monokai-emph
+                                       :background ,terminal-monokai-hl
+                                       :box (:line-width 1
+                                                         :color ,terminal-monokai-hl
+                                                         :style unspecified)))))
+
+   `(region
+     ((,class (:foreground ,monokai-bg
+                           :background ,blue))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-blue))))
+
+   `(secondary-selection
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+
+   `(trailing-whitespace
+     ((,class (:background ,red))
+      (,terminal-class (:background ,terminal-red))))
+
+   `(vertical-border
+     ((,class (:foreground ,monokai-hl))
+      (,terminal-class (:foreground ,terminal-monokai-hl))))
+
+   ;; font lock
+   `(font-lock-builtin-face
+     ((,class (:foreground ,red
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight normal))))
+
+   `(font-lock-comment-delimiter-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(font-lock-comment-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(font-lock-constant-face
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(font-lock-doc-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(font-lock-function-name-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(font-lock-keyword-face
+     ((,class (:foreground ,red
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight normal))))
+
+   `(font-lock-negation-char-face
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(font-lock-preprocessor-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(font-lock-regexp-grouping-construct
+     ((,class (:foreground ,yellow
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal))))
+
+   `(font-lock-regexp-grouping-backslash
+     ((,class (:foreground ,violet
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-violet
+                                    :weight normal))))
+
+   `(font-lock-string-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(font-lock-type-face
+     ((,class (:foreground ,blue
+                           :italic nil))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :italic nil))))
+
+   `(font-lock-variable-name-face
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(font-lock-warning-face
+     ((,class (:foreground ,orange
+                           :weight bold
+                           :italic t
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold
+                                    :italic t
+                                    :underline t))))
+
+   `(c-annotation-face
+     ((,class (:inherit font-lock-constant-face))
+      (,terminal-class (:inherit font-lock-constant-face))))
+
+
+   ;;; external
+
+   ;; ace-jump-mode
+   `(ace-jump-face-background
+     ((,class (:foreground ,monokai-comments
+                           :background ,monokai-bg
+                           :inverse-video nil))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-monokai-bg
+                                    :inverse-video nil))))
+
+   `(ace-jump-face-foreground
+     ((,class (:foreground ,yellow
+                           :background ,monokai-bg
+                           :inverse-video nil
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :background ,terminal-monokai-bg
+                                    :inverse-video nil
+                                    :weight bold))))
+
+   ;; auctex
+   `(font-latex-bold-face
+     ((,class (:inherit bold
+                        :foreground ,monokai-emph))
+      (,terminal-class (:inherit bold
+                                 :foreground ,terminal-monokai-emph))))
+
+   `(font-latex-doctex-documentation-face
+     ((,class (:background unspecified))
+      (,terminal-class (:background unspecified))))
+
+   `(font-latex-doctex-preprocessor-face
+     ((,class
+       (:inherit (font-latex-doctex-documentation-face
+                  font-lock-builtin-face
+                  font-lock-preprocessor-face)))
+      (,class
+       (:inherit (font-latex-doctex-documentation-face
+                  font-lock-builtin-face
+                  font-lock-preprocessor-face)))))
+
+   `(font-latex-italic-face
+     ((,class (:inherit italic :foreground ,monokai-emph))
+      (,terminal-class (:inherit italic :foreground ,terminal-monokai-emph))))
+
+   `(font-latex-math-face
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(font-latex-sectioning-0-face
+     ((,class (:inherit font-latex-sectioning-1-face
+                        :height ,monokai-height-plus-1))
+      (,terminal-class (:inherit font-latex-sectioning-1-face
+                                 :height ,monokai-height-plus-1))))
+
+   `(font-latex-sectioning-1-face
+     ((,class (:inherit font-latex-sectioning-2-face
+                        :height ,monokai-height-plus-1))
+      (,terminal-class (:inherit font-latex-sectioning-2-face
+                                 :height ,monokai-height-plus-1))))
+
+   `(font-latex-sectioning-2-face
+     ((,class (:inherit font-latex-sectioning-3-face
+                        :height ,monokai-height-plus-1))
+      (,terminal-class (:inherit font-latex-sectioning-3-face
+                                 :height ,monokai-height-plus-1))))
+
+   `(font-latex-sectioning-3-face
+     ((,class (:inherit font-latex-sectioning-4-face
+                        :height ,monokai-height-plus-1))
+      (,terminal-class (:inherit font-latex-sectioning-4-face
+                                 :height ,monokai-height-plus-1))))
+
+   `(font-latex-sectioning-4-face
+     ((,class (:inherit font-latex-sectioning-5-face
+                        :height ,monokai-height-plus-1))
+      (,terminal-class (:inherit font-latex-sectioning-5-face
+                                 :height ,monokai-height-plus-1))))
+
+   `(font-latex-sectioning-5-face
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,yellow
+                        :weight bold))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch :
+                                 foreground ,terminal-yellow
+                                 :weight bold))))
+
+   `(font-latex-sedate-face
+     ((,class (:foreground ,monokai-emph))
+      (,terminal-class (:foreground ,terminal-monokai-emph))))
+
+   `(font-latex-slide-title-face
+     ((,class (:inherit (,s-variable-pitch font-lock-type-face)
+                        :weight bold
+                        :height ,monokai-height-plus-3))
+      (,terminal-class (:inherit (,terminal-s-variable-pitch font-lock-type-face)
+                                 :weight bold
+                                 :height ,monokai-height-plus-3))))
+
+   `(font-latex-string-face
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(font-latex-subscript-face
+     ((,class (:height ,monokai-height-minus-1))
+      (,terminal-class (:height ,monokai-height-minus-1))))
+
+   `(font-latex-superscript-face
+     ((,class (:height ,monokai-height-minus-1))
+      (,terminal-class (:height ,monokai-height-minus-1))))
+
+   `(font-latex-verbatim-face
+     ((,class (:inherit fixed-pitch
+                        :foreground ,monokai-fg
+                        :slant italic))
+      (,terminal-class (:inherit fixed-pitch
+                                 :foreground ,terminal-monokai-fg
+                                 :slant italic))))
+
+   `(font-latex-warning-face
+     ((,class (:inherit bold
+                        :foreground ,orange))
+      (,terminal-class (:inherit bold
+                                 :foreground ,terminal-orange))))
+
+   ;; auto-complete
+   `(ac-candidate-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,blue))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-blue))))
+
+   `(ac-selection-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(ac-candidate-mouse-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(ac-completion-face
+     ((,class (:foreground ,monokai-emph
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :underline t))))
+
+   `(ac-gtags-candidate-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,blue))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-blue))))
+
+   `(ac-gtags-selection-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(ac-yasnippet-candidate-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,yellow))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-yellow))))
+
+   `(ac-yasnippet-selection-face
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg))))
+
+   ;; auto highlight symbol
+   `(ahs-definition-face
+     ((,class (:foreground ,magenta
+                           :background unspecified
+                           :slant normal))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background unspecified
+                                    :slant normal))))
+
+   `(ahs-edit-mode-face
+     ((,class (:foreground ,monokai-bg
+                           :background ,magenta))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-magenta))))
+
+   `(ahs-face
+     ((,class (:foreground ,magenta
+                           :background unspecified))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background unspecified))))
+
+   `(ahs-plugin-bod-face
+     ((,class (:foreground ,magenta
+                           :background unspecified ))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background unspecified ))))
+
+   `(ahs-plugin-default-face
+     ((,class (:foreground ,magenta
+                           :background unspecified))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background unspecified))))
+
+   `(ahs-plugin-whole-buffer-face
+     ((,class (:foreground ,magenta
+                           :background unspecified))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background unspecified))))
+
+   `(ahs-warning-face
+     ((,class (:foreground ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   ;; android mode
+   `(android-mode-debug-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(android-mode-error-face
+     ((,class (:foreground ,orange
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold))))
+
+   `(android-mode-info-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(android-mode-verbose-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(android-mode-warning-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   ;; anzu-mode
+   `(anzu-mode-line
+     ((,class (:foreground ,magenta
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :weight bold))))
+
+   ;; bm
+   `(bm-face
+     ((,class (:background ,yellow-lc
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow-lc
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(bm-fringe-face
+     ((,class (:background ,yellow-lc
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow-lc
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(bm-fringe-persistent-face
+     ((,class (:background ,green-lc
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-green-lc
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(bm-persistent-face
+     ((,class (:background ,green-lc
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-green-lc
+                                    :foreground ,terminal-monokai-bg))))
+
+   ;; calfw
+   `(cfw:face-day-title
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(cfw:face-annotation
+     ((,class (:inherit cfw:face-day-title
+                        :foreground ,yellow))
+      (,terminal-class (:inherit cfw:face-day-title
+                                 :foreground ,terminal-yellow))))
+
+   `(cfw:face-default-content
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(cfw:face-default-day
+     ((,class (:inherit cfw:face-day-title
+                        :weight bold))
+      (,terminal-class (:inherit cfw:face-day-title
+                                 :weight bold))))
+
+   `(cfw:face-disable
+     ((,class (:inherit cfw:face-day-title
+                        :foreground ,monokai-comments))
+      (,terminal-class (:inherit cfw:face-day-title
+                                 :foreground ,terminal-monokai-comments))))
+
+   `(cfw:face-grid
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(cfw:face-header
+     ((,class (:foreground ,blue-hc
+                           :background ,blue-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue-hc
+                                    :background ,terminal-blue-lc
+                                    :weight bold))))
+
+   `(cfw:face-holiday
+     ((,class (:background nil
+                           :foreground ,red
+                           :weight bold))
+      (,terminal-class (:background nil
+                                    :foreground ,terminal-red
+                                    :weight bold))))
+
+   `(cfw:face-periods
+     ((,class (:foreground ,magenta))
+      (,terminal-class (:foreground ,terminal-magenta))))
+
+   `(cfw:face-select
+     ((,class (:background ,magenta-lc
+                           :foreground ,magenta-hc))
+      (,terminal-class (:background ,terminal-magenta-lc
+                                    :foreground ,terminal-magenta-hc))))
+
+   `(cfw:face-saturday
+     ((,class (:foreground ,cyan-hc
+                           :background ,cyan-lc))
+      (,terminal-class (:foreground ,terminal-cyan-hc
+                                    :background ,terminal-cyan-lc))))
+
+   `(cfw:face-sunday
+     ((,class (:foreground ,red-hc
+                           :background ,red-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red-hc
+                                    :background ,terminal-red-lc
+                                    :weight bold))))
+
+   `(cfw:face-title
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,yellow
+                        :weight bold
+                        :height ,monokai-height-plus-4))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-yellow
+                                 :weight bold
+                                 :height ,monokai-height-plus-4))))
+
+   `(cfw:face-today
+     ((,class (:weight bold
+                       :background ,monokai-hl
+                       :foreground nil))
+      (,terminal-class (:weight bold
+                                :background ,terminal-monokai-hl
+                                :foreground nil))))
+
+   `(cfw:face-today-title
+     ((,class (:background ,yellow-lc
+                           :foreground ,yellow-hc
+                           :weight bold))
+      (,terminal-class (:background ,terminal-yellow-lc
+                                    :foreground ,terminal-yellow-hc
+                                    :weight bold))))
+
+   `(cfw:face-toolbar
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(cfw:face-toolbar-button-off
+     ((,class (:background ,yellow-lc
+                           :foreground ,yellow-hc
+                           :weight bold))
+      (,terminal-class (:background ,terminal-yellow-lc
+                                    :foreground ,terminal-yellow-hc
+                                    :weight bold))))
+
+   `(cfw:face-toolbar-button-on
+     ((,class (:background ,yellow-hc
+                           :foreground ,yellow-lc
+                           :weight bold))
+      (,terminal-class (:background ,terminal-yellow-hc
+                                    :foreground ,terminal-yellow-lc
+                                    :weight bold))))
+
+
+   ;; clojure-test-mode
+   `(clojure-test-failure-face
+     ((,class (:foreground ,orange
+                           :weight bold
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold
+                                    :underline t))))
+
+   `(clojure-test-error-face
+     ((,class (:foreground ,red
+                           :weight bold
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold
+                                    :underline t))))
+
+   `(clojure-test-success-face
+     ((,class (:foreground ,green
+                           :weight bold
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-green
+                                    :weight bold
+                                    :underline t))))
+
+   ;; company-mode
+   `(company-tooltip
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph))))
+
+   `(company-tooltip-selection
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(company-tooltip-mouse
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(company-tooltip-common
+     ((,class (:foreground ,blue
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :underline t))))
+
+   `(company-tooltip-common-selection
+     ((,class (:foreground ,monokai-bg
+			   :background ,blue
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :underline t))))
+
+   `(company-preview
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph))))
+
+   `(company-preview-common
+     ((,class (:foreground ,blue
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :underline t))))
+
+   `(company-scrollbar-bg
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(company-scrollbar-fg
+     ((,class (:background ,monokai-comments))
+      (,terminal-class (:background ,terminal-monokai-comments))))
+
+   ;; company-mode tooltip annnotations
+   `(company-tooltip-annotation
+     ((,class (:background ,monokai-hl
+                           :foreground ,green))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-green))))
+
+   ;; company-mode templates
+   `(company-template-field
+     ((,class (:background ,monokai-hl
+                           :foreground ,blue))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-blue))))
+
+   ;; CSCOPE
+   `(cscope-file-face
+     ((,class (:foreground ,green
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-green
+                                    :weight bold))))
+
+   `(cscope-function-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(cscope-line-number-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(cscope-line-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(cscope-mouse-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-fg))))
+
+   ;; ctable
+   `(ctbl:face-cell-select
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :underline ,monokai-emph
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :underline ,terminal-monokai-emph
+                                    :weight bold))))
+
+   `(ctbl:face-continue-bar
+     ((,class (:background ,monokai-hl
+                           :foreground ,yellow))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-yellow))))
+
+   `(ctbl:face-row-select
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg
+                           :underline t))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg
+                                    :underline t))))
+
+   ;; coffee
+   `(coffee-mode-class-name
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(coffee-mode-function-param
+     ((,class (:foreground ,violet
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-violet
+                                    :slant italic))))
+
+   ;; custom
+   `(custom-face-tag
+     ((,class (:inherit ,s-variable-pitch
+                        :height ,monokai-height-plus-3
+                        :foreground ,violet
+                        :weight bold))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :height ,monokai-height-plus-3
+                                 :foreground ,terminal-violet
+                                 :weight bold))))
+
+   `(custom-variable-tag
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,cyan
+                        :height ,monokai-height-plus-3))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-cyan
+                                 :height ,monokai-height-plus-3))))
+
+   `(custom-comment-tag
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(custom-group-tag
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,blue
+                        :height ,monokai-height-plus-3))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-blue
+                                 :height ,monokai-height-plus-3))))
+
+   `(custom-group-tag-1
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,red
+                        :height ,monokai-height-plus-3))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-red
+                                 :height ,monokai-height-plus-3))))
+
+   `(custom-state
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   ;; diff
+   `(diff-added
+     ((,class (:foreground ,green
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-green
+                                    :background ,terminal-monokai-bg))))
+
+   `(diff-changed
+     ((,class (:foreground ,blue
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :background ,terminal-monokai-bg))))
+
+   `(diff-removed
+     ((,class (:foreground ,red
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg))))
+
+   `(diff-header
+     ((,class (:background ,monokai-bg))
+      (,terminal-class (:background ,terminal-monokai-bg))))
+
+   `(diff-file-header
+     ((,class (:background ,monokai-bg
+                           :foreground ,monokai-fg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-monokai-fg
+                                    :weight bold))))
+
+   `(diff-refine-added
+     ((,class :foreground ,monokai-bg
+              :background ,green)
+      (,terminal-class :foreground ,terminal-monokai-bg
+                       :background ,terminal-green)))
+
+   `(diff-refine-change
+     ((,class :foreground ,monokai-bg
+              :background ,blue)
+      (,terminal-class :foreground ,terminal-monokai-bg
+                       :background ,terminal-blue)))
+
+   `(diff-refine-removed
+     ((,class (:foreground ,monokai-bg
+                           :background ,red))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-red))))
+
+   ;; ediff
+   `(ediff-fine-diff-A
+     ((,class (:background ,orange-lc))
+      (,terminal-class (:background ,terminal-orange-lc))))
+
+   `(ediff-fine-diff-B
+     ((,class (:background ,green-lc))
+      (,terminal-class (:background ,terminal-green-lc))))
+
+   `(ediff-fine-diff-C
+     ((,class (:background ,yellow-lc))
+      (,terminal-class (:background ,terminal-yellow-lc))))
+
+   `(ediff-current-diff-C
+     ((,class (:background ,blue-lc))
+      (,terminal-class (:background ,terminal-blue-lc))))
+
+   `(ediff-even-diff-A
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-fg-lc ))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-fg-lc ))))
+
+   `(ediff-odd-diff-A
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-fg-hc ))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-fg-hc ))))
+
+   `(ediff-even-diff-B
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-fg-hc ))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-fg-hc ))))
+
+   `(ediff-odd-diff-B
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-fg-lc ))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-fg-lc ))))
+
+   `(ediff-even-diff-C
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-fg ))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-fg ))))
+
+   `(ediff-odd-diff-C
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-bg ))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-bg ))))
+
+   ;; diff-hl
+   `(diff-hl-change
+     ((,class (:background ,blue-lc
+                           :foreground ,blue-hc))
+      (,terminal-class (:background ,terminal-blue-lc
+                                    :foreground ,terminal-blue-hc))))
+
+   `(diff-hl-delete
+     ((,class (:background ,red-lc
+                           :foreground ,red-hc))
+      (,terminal-class (:background ,terminal-red-lc
+                                    :foreground ,terminal-red-hc))))
+
+   `(diff-hl-insert
+     ((,class (:background ,green-lc
+                           :foreground ,green-hc))
+      (,terminal-class (:background ,terminal-green-lc
+                                    :foreground ,terminal-green-hc))))
+
+   `(diff-hl-unknown
+     ((,class (:background ,cyan-lc
+                           :foreground ,cyan-hc))
+      (,terminal-class (:background ,terminal-cyan-lc
+                                    :foreground ,terminal-cyan-hc))))
+
+   ;; edts
+   `(edts-face-error-line
+     ((,(append '((supports :underline (:style line))) class)
+       (:underline (:style line :color ,red)
+                   :inherit unspecified))
+      (,class (:foreground ,red-hc
+                           :background ,red-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style line))) terminal-class)
+       (:underline (:style line :color ,terminal-red)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-red-hc
+                                    :background ,terminal-red-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(edts-face-warning-line
+     ((,(append '((supports :underline (:style line))) class)
+       (:underline (:style line :color ,yellow)
+                   :inherit unspecified))
+      (,class (:foreground ,yellow-hc
+                           :background ,yellow-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style line))) terminal-class)
+       (:underline (:style line :color ,terminal-yellow)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-yellow-hc
+                                    :background ,terminal-yellow-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(edts-face-error-fringe-bitmap
+     ((,class (:foreground ,red
+                           :background unspecified
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background unspecified
+                                    :weight bold))))
+
+   `(edts-face-warning-fringe-bitmap
+     ((,class (:foreground ,yellow
+                           :background unspecified
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :background unspecified
+                                    :weight bold))))
+
+   `(edts-face-error-mode-line
+     ((,class (:background ,red
+                           :foreground unspecified))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground unspecified))))
+
+   `(edts-face-warning-mode-line
+     ((,class (:background ,yellow
+                           :foreground unspecified))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground unspecified))))
+
+
+   ;; elfeed
+   `(elfeed-search-date-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(elfeed-search-feed-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(elfeed-search-tag-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(elfeed-search-title-face
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   ;; enhanced ruby mode
+   `(enh-ruby-string-delimiter-face
+     ((,class (:inherit font-lock-string-face))
+      (,terminal-class (:inherit font-lock-string-face))))
+
+   `(enh-ruby-heredoc-delimiter-face
+     ((,class (:inherit font-lock-string-face))
+      (,terminal-class (:inherit font-lock-string-face))))
+
+   `(enh-ruby-regexp-delimiter-face
+     ((,class (:inherit font-lock-string-face))
+      (,terminal-class (:inherit font-lock-string-face))))
+
+   `(enh-ruby-op-face
+     ((,class (:inherit font-lock-keyword-face))
+      (,terminal-class (:inherit font-lock-keyword-face))))
+
+   `(erm-syn-errline
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,red)
+                   :inherit unspecified))
+      (,class (:foreground ,red-hc
+                           :background ,red-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-red)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-red-hc
+                                    :background ,terminal-red-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(erm-syn-warnline
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,orange)
+                   :inherit unspecified))
+      (,class (:foreground ,orange-hc
+                           :background ,orange-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-orange)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-orange-hc
+                                    :background ,terminal-orange-lc
+                                    :weight bold
+                                    :underline t))))
+
+   ;; epc
+   `(epc:face-title
+     ((,class (:foreground ,blue
+                           :background ,monokai-bg
+                           :weight normal
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :underline nil))))
+
+   ;; erc
+   `(erc-action-face
+     ((,class (:inherit erc-default-face))
+      (,terminal-class (:inherit erc-default-face))))
+
+   `(erc-bold-face
+     ((,class (:weight bold))
+      (,terminal-class (:weight bold))))
+
+   `(erc-current-nick-face
+     ((,class (:foreground ,blue :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(erc-dangerous-host-face
+     ((,class (:inherit font-lock-warning-face))
+      (,terminal-class (:inherit font-lock-warning-face))))
+
+   `(erc-default-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(erc-highlight-face
+     ((,class (:inherit erc-default-face
+                        :background ,monokai-hl))
+      (,terminal-class (:inherit erc-default-face
+                                 :background ,terminal-monokai-hl))))
+
+   `(erc-direct-msg-face
+     ((,class (:inherit erc-default-face))
+      (,terminal-class (:inherit erc-default-face))))
+
+   `(erc-error-face
+     ((,class (:inherit font-lock-warning-face))
+      (,terminal-class (:inherit font-lock-warning-face))))
+
+   `(erc-fool-face
+     ((,class (:inherit erc-default-face))
+      (,terminal-class (:inherit erc-default-face))))
+
+   `(erc-input-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(erc-keyword-face
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(erc-nick-default-face
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(erc-my-nick-face
+     ((,class (:foreground ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   `(erc-nick-msg-face
+     ((,class (:inherit erc-default-face))
+      (,terminal-class (:inherit erc-default-face))))
+
+   `(erc-notice-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(erc-pal-face
+     ((,class (:foreground ,orange
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold))))
+
+   `(erc-prompt-face
+     ((,class (:foreground ,orange
+                           :background ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :background ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(erc-timestamp-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(erc-underline-face
+     ((t (:underline t))))
+
+   ;; eshell
+   `(eshell-prompt
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(eshell-ls-archive
+     ((,class (:foreground ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   `(eshell-ls-backup
+     ((,class (:inherit font-lock-comment-face))
+      (,terminal-class (:inherit font-lock-comment-face))))
+
+   `(eshell-ls-clutter
+     ((,class (:inherit font-lock-comment-face))
+      (,terminal-class (:inherit font-lock-comment-face))))
+
+   `(eshell-ls-directory
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(eshell-ls-executable
+     ((,class (:foreground ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   `(eshell-ls-unreadable
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(eshell-ls-missing
+     ((,class (:inherit font-lock-warning-face))
+      (,terminal-class (:inherit font-lock-warning-face))))
+
+   `(eshell-ls-product
+     ((,class (:inherit font-lock-doc-face))
+      (,terminal-class (:inherit font-lock-doc-face))))
+
+   `(eshell-ls-special
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(eshell-ls-symlink
+     ((,class (:foreground ,cyan
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :weight bold))))
+
+   ;; fic
+   `(fic-author-face
+     ((,class (:background ,monokai-bg
+                           :foreground ,orange
+                           :underline t
+                           :slant italic))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-orange
+                                    :underline t
+                                    :slant italic))))
+
+   `(fic-face
+     ((,class (:background ,monokai-bg
+                           :foreground ,orange
+                           :weight normal
+                           :slant italic))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-orange
+                                    :weight normal
+                                    :slant italic))))
+
+   `(font-lock-fic-face
+     ((,class (:background ,monokai-bg
+                           :foreground ,orange
+                           :weight normal
+                           :slant italic))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-orange
+                                    :weight normal
+                                    :slant italic))))
+
+   ;; flx
+   `(flx-highlight-face
+     ((,class (:foreground ,blue
+                           :weight normal
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight normal
+                                    :underline nil))))
+
+   ;; flymake
+   `(flymake-errline
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,red)
+                   :inherit unspecified
+                   :foreground unspecified
+                   :background unspecified))
+      (,class (:foreground ,red-hc
+                           :background ,red-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-red)
+                   :inherit unspecified
+                   :foreground unspecified
+                   :background unspecified))
+      (,terminal-class (:foreground ,terminal-red-hc
+                                    :background ,terminal-red-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(flymake-infoline
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,green)
+                   :inherit unspecified
+                   :foreground unspecified
+                   :background unspecified))
+      (,class (:foreground ,green-hc
+                           :background ,green-lc))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-green)
+                   :inherit unspecified
+                   :foreground unspecified
+                   :background unspecified))
+      (,terminal-class (:foreground ,terminal-green-hc
+                                    :background ,terminal-green-lc))))
+
+   `(flymake-warnline
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,yellow)
+                   :inherit unspecified
+                   :foreground unspecified
+                   :background unspecified))
+      (,class (:foreground ,yellow-hc
+                           :background ,yellow-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-yellow)
+                   :inherit unspecified
+                   :foreground unspecified
+                   :background unspecified))
+      (,terminal-class (:foreground ,terminal-yellow-hc
+                                    :background ,terminal-yellow-lc
+                                    :weight bold
+                                    :underline t))))
+
+   ;; flycheck
+   `(flycheck-error
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,red)
+                   :inherit unspecified))
+      (,class (:foreground ,red-hc
+                           :background ,red-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-red)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-red-hc
+                                    :background ,terminal-red-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(flycheck-warning
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,yellow)
+                   :inherit unspecified))
+      (,class (:foreground ,yellow-hc
+                           :background ,yellow-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-yellow)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-yellow-hc
+                                    :background ,terminal-yellow-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(flycheck-info
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,blue)
+                   :inherit unspecified))
+      (,class (:foreground ,blue-hc
+                           :background ,blue-lc
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-blue)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-blue-hc
+                                    :background ,terminal-blue-lc
+                                    :weight bold
+                                    :underline t))))
+
+   `(flycheck-fringe-error
+     ((,class (:foreground ,red-hc
+                           :background ,red-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red-hc
+                                    :background ,terminal-red-lc
+                                    :weight bold))))
+
+   `(flycheck-fringe-warning
+     ((,class (:foreground ,yellow-hc
+                           :background ,yellow-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow-hc
+                                    :background ,terminal-yellow-lc
+                                    :weight bold))))
+
+   `(flycheck-fringe-info
+     ((,class (:foreground ,blue-hc
+                           :background ,blue-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue-hc
+                                    :background ,terminal-blue-lc
+                                    :weight bold))))
+
+   ;; flyspell
+   `(flyspell-duplicate
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,yellow)
+                   :inherit unspecified))
+      (,class (:foreground ,yellow
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-yellow)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold
+                                    :underline t))))
+
+   `(flyspell-incorrect
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline (:style wave :color ,red)
+                   :inherit unspecified))
+      (,class (:foreground ,red
+                           :weight bold
+                           :underline t))
+      (,(append '((supports :underline (:style wave))) terminal-class)
+       (:underline (:style wave :color ,terminal-red)
+                   :inherit unspecified))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold
+                                    :underline t))))
+
+
+   ;; git-gutter
+   `(git-gutter:added
+     ((,class (:background ,green
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-green
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter:deleted
+     ((,class (:background ,red
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter:modified
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter:unchanged
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   ;; git-gutter-fr
+   `(git-gutter-fr:added
+     ((,class (:foreground ,green
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-green
+                                    :weight bold))))
+
+   `(git-gutter-fr:deleted
+     ((,class (:foreground ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   `(git-gutter-fr:modified
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   ;; git-gutter+ and git-gutter+-fr
+   `(git-gutter+-added
+     ((,class (:background ,green
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-green
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter+-deleted
+     ((,class (:background ,red
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter+-modified
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter+-unchanged
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(git-gutter-fr+-added
+     ((,class (:foreground ,green
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-green
+                                    :weight bold))))
+
+   `(git-gutter-fr+-deleted
+     ((,class (:foreground ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   `(git-gutter-fr+-modified
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   ;; guide-key
+   `(guide-key/highlight-command-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(guide-key/key-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(guide-key/prefix-command-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   ;; gnus
+   `(gnus-group-mail-1
+     ((,class (:weight bold
+                       :inherit gnus-group-mail-1-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-mail-1-empty))))
+
+   `(gnus-group-mail-1-empty
+     ((,class (:inherit gnus-group-news-1-empty))
+      (,terminal-class (:inherit gnus-group-news-1-empty))))
+
+   `(gnus-group-mail-2
+     ((,class (:weight bold
+                       :inherit gnus-group-mail-2-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-mail-2-empty))))
+
+   `(gnus-group-mail-2-empty
+     ((,class (:inherit gnus-group-news-2-empty))
+      (,terminal-class (:inherit gnus-group-news-2-empty))))
+
+   `(gnus-group-mail-3
+     ((,class (:weight bold
+                       :inherit gnus-group-mail-3-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-mail-3-empty))))
+
+   `(gnus-group-mail-3-empty
+     ((,class (:inherit gnus-group-news-3-empty))
+      (,terminal-class (:inherit gnus-group-news-3-empty))))
+
+   `(gnus-group-mail-low
+     ((,class (:weight bold
+                       :inherit gnus-group-mail-low-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-mail-low-empty))))
+
+   `(gnus-group-mail-low-empty
+     ((,class (:inherit gnus-group-news-low-empty))
+      (,terminal-class (:inherit gnus-group-news-low-empty))))
+
+   `(gnus-group-news-1
+     ((,class (:weight bold
+                       :inherit gnus-group-news-1-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-1-empty))))
+
+   `(gnus-group-news-2
+     ((,class (:weight bold
+                       :inherit gnus-group-news-2-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-2-empty))))
+
+   `(gnus-group-news-3
+     ((,class (:weight bold
+                       :inherit gnus-group-news-3-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-3-empty))))
+
+   `(gnus-group-news-4
+     ((,class (:weight bold
+                       :inherit gnus-group-news-4-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-4-empty))))
+
+   `(gnus-group-news-5
+     ((,class (:weight bold
+                       :inherit gnus-group-news-5-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-5-empty))))
+
+   `(gnus-group-news-6
+     ((,class (:weight bold
+                       :inherit gnus-group-news-6-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-6-empty))))
+
+   `(gnus-group-news-low
+     ((,class (:weight bold
+                       :inherit gnus-group-news-low-empty))
+      (,terminal-class (:weight bold
+                                :inherit gnus-group-news-low-empty))))
+
+   `(gnus-header-content
+     ((,class (:inherit message-header-other))
+      (,terminal-class (:inherit message-header-other))))
+
+   `(gnus-header-from
+     ((,class (:inherit message-header-other))
+      (,terminal-class (:inherit message-header-other))))
+
+   `(gnus-header-name
+     ((,class (:inherit message-header-name))
+      (,terminal-class (:inherit message-header-name))))
+
+   `(gnus-header-newsgroups
+     ((,class (:inherit message-header-other))
+      (,terminal-class (:inherit message-header-other))))
+
+   `(gnus-header-subject
+     ((,class (:inherit message-header-subject))
+      (,terminal-class (:inherit message-header-subject))))
+
+   `(gnus-summary-cancelled
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(gnus-summary-high-ancient
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(gnus-summary-high-read
+     ((,class (:foreground ,green
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-green
+                                    :weight bold))))
+
+   `(gnus-summary-high-ticked
+     ((,class (:foreground ,orange
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold))))
+
+   `(gnus-summary-high-unread
+     ((,class (:foreground ,monokai-fg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :weight bold))))
+
+   `(gnus-summary-low-ancient
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-summary-low-read
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-summary-low-ticked
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(gnus-summary-low-unread
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(gnus-summary-normal-ancient
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-summary-normal-read
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-summary-normal-ticked
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(gnus-summary-normal-unread
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(gnus-summary-selected
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(gnus-cite-1
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-cite-2
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-cite-3
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-cite-4
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-cite-5
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-cite-6
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-cite-7
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(gnus-cite-8
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(gnus-cite-9
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(gnus-cite-10
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(gnus-cite-11
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(gnus-group-news-1-empty
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(gnus-group-news-2-empty
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-group-news-3-empty
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(gnus-group-news-4-empty
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-group-news-5-empty
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(gnus-group-news-6-empty
+     ((,class (:foreground ,blue-lc))
+      (,terminal-class (:foreground ,terminal-blue-lc))))
+
+   `(gnus-group-news-low-empty
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(gnus-signature
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(gnus-x-face
+     ((,class (:background ,monokai-fg
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-monokai-fg
+                                    :foreground ,terminal-monokai-bg))))
+
+
+   ;; helm (these probably need tweaking)
+   ;;
+   ;; TODO: make helm navigation look less jarring
+   ;; https://github.com/emacs-helm/helm/search?utf8=%E2%9C%93&q=defface&type=Code
+   ;;
+   `(helm-apt-deinstalled
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(helm-apt-installed
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(helm-bookmark-directory
+     ((,class (:inherit helm-ff-directory))
+      (,terminal-class (:inherit helm-ff-directory))))
+
+   `(helm-bookmark-file
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(helm-bookmark-gnus
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(helm-bookmark-info
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(helm-bookmark-man
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(helm-bookmark-w3m
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(helm-bookmarks-su
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(helm-buffer-not-saved
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(helm-buffer-saved-out
+     ((,class (:foreground ,red
+                           :background ,monokai-bg
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg
+                                    :inverse-video t))))
+
+   `(helm-buffer-size
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(helm-candidate-number
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :bold t))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :bold t))))
+
+   `(helm-ff-directory
+     ((,class (:background ,monokai-bg
+                           :foreground ,blue))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-blue))))
+
+   `(helm-ff-executable
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(helm-ff-file
+     ((,class (:background ,monokai-bg
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(helm-ff-invalid-symlink
+     ((,class (:background ,monokai-bg
+                           :foreground ,orange
+                           :slant italic))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-orange
+                                    :slant italic))))
+
+   `(helm-ff-prefix
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(helm-ff-symlink
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(helm-grep-file
+     ((,class (:foreground ,cyan
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :underline t))))
+
+   `(helm-grep-finish
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(helm-grep-lineno
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(helm-grep-match
+     ((,class (:inherit match)))
+     ((,terminal-class (:inherit match))))
+
+   `(helm-grep-running
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(helm-header
+     ((,class (:inherit header-line))
+      (,terminal-class (:inherit terminal-header-line))))
+
+   `(helm-lisp-completion-info
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(helm-lisp-show-completion
+     ((,class (:foreground ,yellow
+                           :background ,monokai-hl
+                           :bold t))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :background ,terminal-monokai-hl
+                                    :bold t))))
+
+   `(helm-M-x-key
+     ((,class (:foreground ,orange
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :underline t))))
+
+   `(helm-moccur-buffer
+     ((,class (:foreground ,cyan
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :underline t))))
+
+   `(helm-match
+     ((,class (:inherit match))
+      (,terminal-class (:inherit match))))
+
+   `(helm-selection
+     ((,class (:background ,monokai-hl
+                           :underline t))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :underline t))))
+
+   `(helm-selection-line
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :underline nil))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :underline nil))))
+
+   `(helm-separator
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(helm-source-header
+     ((,class (:background ,blue-lc
+                           :foreground ,monokai-bg
+                           :underline nil))
+      (,terminal-class (:background ,terminal-blue-lc
+                                    :foreground ,terminal-monokai-bg
+                                    :underline nil))))
+
+   `(helm-swoop-target-line-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(helm-swoop-target-line-block-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(helm-swoop-target-word-face
+     ((,class (:foreground ,magenta
+                           :background unspecified))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background unspecified))))
+
+   `(helm-time-zone-current
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(helm-time-zone-home
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(helm-visible-mark
+     ((,class (:background ,monokai-bg
+                           :foreground ,magenta :bold t))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-magenta :bold t))))
+
+   ;; helm-ls-git
+   `(helm-ls-git-modified-not-staged-face
+     ((,class :foreground ,blue)
+      (,terminal-class :foreground ,terminal-blue)))
+
+   `(helm-ls-git-modified-and-staged-face
+     ((,class :foreground ,blue-l)
+      (,terminal-class :foreground ,terminal-blue-l)))
+
+   `(helm-ls-git-renamed-modified-face
+     ((,class :foreground ,blue-l)
+      (,terminal-class :foreground ,terminal-blue-l)))
+
+   `(helm-ls-git-untracked-face
+     ((,class :foreground ,orange)
+      (,terminal-class :foreground ,terminal-orange)))
+
+   `(helm-ls-git-added-copied-face
+     ((,class :foreground ,green)
+      (,terminal-class :foreground ,terminal-green)))
+
+   `(helm-ls-git-added-modified-face
+     ((,class :foreground ,green-l)
+      (,terminal-class :foreground ,terminal-green-l)))
+
+   `(helm-ls-git-deleted-not-staged-face
+     ((,class :foreground ,red)
+      (,terminal-class :foreground ,terminal-red)))
+
+   `(helm-ls-git-deleted-and-staged-face
+     ((,class :foreground ,red-l)
+      (,terminal-class :foreground ,terminal-red-l)))
+
+   `(helm-ls-git-conflict-face
+     ((,class :foreground ,yellow)
+      (,terminal-class :foreground ,terminal-yellow)))
+
+   ;; hi-lock-mode
+   `(hi-yellown
+     ((,class (:foreground ,yellow-lc
+                           :background ,yellow-hc))
+      (,terminal-class (:foreground ,terminal-yellow-lc
+                                    :background ,terminal-yellow-hc))))
+
+   `(hi-pink
+     ((,class (:foreground ,magenta-lc
+                           :background ,magenta-hc))
+      (,terminal-class (:foreground ,terminal-magenta-lc
+                                    :background ,terminal-magenta-hc))))
+
+   `(hi-green
+     ((,class (:foreground ,green-lc
+                           :background ,green-hc))
+      (,terminal-class (:foreground ,terminal-green-lc
+                                    :background ,terminal-green-hc))))
+
+   `(hi-blue
+     ((,class (:foreground ,blue-lc
+                           :background ,blue-hc))
+      (,terminal-class (:foreground ,terminal-blue-lc
+                                    :background ,terminal-blue-hc))))
+
+   `(hi-black-b
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(hi-blue-b
+     ((,class (:foreground ,blue-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue-lc
+                                    :weight bold))))
+
+   `(hi-green-b
+     ((,class (:foreground ,green-lc
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-green-lc
+                                    :weight bold))))
+
+   `(hi-red-b
+     ((,class (:foreground ,red
+                           :weight bold))))
+
+   `(hi-black-hb
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg
+                                    :weight bold))))
+
+   ;; highlight-changes
+   `(highlight-changes
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(highlight-changes-delete
+     ((,class (:foreground ,red
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :underline t))))
+
+   ;; highlight-indentation
+   `(highlight-indentation-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(highlight-indentation-current-column-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   ;; hl-line-mode
+   `(hl-line
+     ((,class (:background ,monokai-hl-line))
+      (,terminal-class (:background ,terminal-monokai-hl-line))))
+
+   `(hl-line-face
+     ((,class (:background ,monokai-hl-line))
+      (,terminal-class (:background ,terminal-monokai-hl-line))))
+
+   ;; ido-mode
+   `(ido-first-match
+     ((,class (:foreground ,yellow
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal))))
+
+   `(ido-only-match
+     ((,class (:foreground ,monokai-bg
+                           :background ,yellow
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-yellow
+                                    :weight normal))))
+
+   `(ido-subdir
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(ido-incomplete-regexp
+     ((,class (:foreground ,red
+                           :weight bold ))
+      (,terminal-class (:foreground ,terminal-red
+                                    :weight bold ))))
+
+   `(ido-indicator
+     ((,class (:background ,red
+                           :foreground ,monokai-bg
+                           :width condensed))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground ,terminal-monokai-bg
+                                    :width condensed))))
+
+   `(ido-virtual
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(jabber-activity-face
+     ((,class (:weight bold
+                       :foreground ,red))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-red))))
+
+   `(jabber-activity-personal-face
+     ((,class (:weight bold
+                       :foreground ,blue))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-blue))))
+
+   `(jabber-chat-error
+     ((,class (:weight bold
+                       :foreground ,red))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-red))))
+
+   `(jabber-chat-prompt-foreign
+     ((,class (:weight bold
+                       :foreground ,red))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-red))))
+
+   `(jabber-chat-prompt-local
+     ((,class (:weight bold
+                       :foreground ,blue))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-blue))))
+
+   `(jabber-chat-prompt-system
+     ((,class (:weight bold
+                       :foreground ,green))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-green))))
+
+   `(jabber-chat-text-foreign
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(jabber-chat-text-local
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(jabber-chat-rare-time-face
+     ((,class (:underline t
+                          :foreground ,green))
+      (,terminal-class (:underline t
+                                   :foreground ,terminal-green))))
+
+   `(jabber-roster-user-away
+     ((,class (:slant italic
+                      :foreground ,green))
+      (,terminal-class (:slant italic
+                               :foreground ,terminal-green))))
+
+   `(jabber-roster-user-chatty
+     ((,class (:weight bold
+                       :foreground ,orange))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-orange))))
+
+   `(jabber-roster-user-dnd
+     ((,class (:slant italic
+                      :foreground ,red))
+      (,terminal-class (:slant italic
+                               :foreground ,terminal-red))))
+
+   `(jabber-roster-user-error
+     ((,class (:weight light
+                       :slant italic
+                       :foreground ,red))
+      (,terminal-class (:weight light
+                                :slant italic
+                                :foreground ,terminal-red))))
+
+   `(jabber-roster-user-offline
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(jabber-roster-user-online
+     ((,class (:weight bold
+                       :foreground ,blue))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-blue))))
+
+   `(jabber-roster-user-xa
+     ((,class (:slant italic
+                      :foreground ,magenta))
+      (,terminal-class (:slant italic
+                               :foreground ,terminal-magenta))))
+
+   ;; js2-mode colors
+   `(js2-error
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(js2-external-variable
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(js2-function-param
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(js2-instance-member
+     ((,class (:foreground ,magenta)))
+     ((,terminal-class (:foreground ,terminal-magenta))))
+
+   `(js2-jsdoc-html-tag-delimiter
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(js2-jsdoc-html-tag-name
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(js2-jsdoc-tag
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(js2-jsdoc-type
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(js2-jsdoc-value
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(js2-magic-paren
+     ((,class (:underline t))
+      (,terminal-class (:underline t))))
+
+   `(js2-private-function-call
+     ((,class (:foreground ,yellow)))
+     ((,terminal-class (:foreground ,terminal-yellow))))
+
+   `(js2-private-member
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(js2-warning
+     ((,class (:underline ,orange))
+      (,terminal-class (:underline ,terminal-orange))))
+
+   ;; jedi
+   `(jedi:highlight-function-argument
+     ((,class (:inherit bold))
+      (,terminal-class (:inherit bold))))
+
+   ;; linum-mode
+   `(linum
+     ((,class (:foreground ,monokai-comments
+                           :background ,s-fringe-bg))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-s-fringe-bg))))
+
+   ;; lusty-explorer
+   `(lusty-directory-face
+     ((,class (:inherit dired-directory))
+      (,terminal-class (:inherit dired-directory))))
+
+   `(lusty-file-face
+     ((,class nil)
+      (,terminal-class nil)))
+
+   `(lusty-match-face
+     ((,class (:inherit ido-first-match))
+      (,terminal-class (:inherit ido-first-match))))
+
+   `(lusty-slash-face
+     ((,class (:foreground ,cyan
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :weight bold))))
+
+   ;; magit
+   ;;
+   ;; TODO: Add supports for all magit faces
+   ;; https://github.com/magit/magit/search?utf8=%E2%9C%93&q=face
+   ;;
+   `(magit-diff-added
+     ((,class (:foreground ,green
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-green
+                                    :background ,terminal-monokai-bg))))
+
+   `(magit-diff-added-highlight
+     ((,class (:foreground ,green
+                           :background ,monokai-hl))
+      (,terminal-class (:foreground ,terminal-green
+                                    :background ,terminal-monokai-hl))))
+
+   `(magit-diff-removed
+     ((,class (:foreground ,red
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg))))
+
+   `(magit-diff-removed-highlight
+     ((,class (:foreground ,red
+                           :background ,monokai-hl))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-hl))))
+
+   `(magit-section-title
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(magit-branch
+     ((,class (:foreground ,orange
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight bold))))
+
+   `(magit-item-highlight
+     ((,class (:background ,monokai-hl
+                           :weight unspecified))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :weight unspecified))))
+
+   `(magit-log-author
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(magit-log-graph
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(magit-log-head-label-bisect-bad
+     ((,class (:background ,red-hc
+                           :foreground ,red-lc
+                           :box 1))
+      (,terminal-class (:background ,terminal-red-hc
+                                    :foreground ,terminal-red-lc
+                                    :box 1))))
+
+   `(magit-log-head-label-bisect-good
+     ((,class (:background ,green-hc
+                           :foreground ,green-lc
+                           :box 1))
+      (,terminal-class (:background ,terminal-green-hc
+                                    :foreground ,terminal-green-lc
+                                    :box 1))))
+
+   `(magit-log-head-label-default
+     ((,class (:background ,monokai-hl
+                           :box 1))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :box 1))))
+
+   `(magit-log-head-label-local
+     ((,class (:background ,blue-lc
+                           :foreground ,blue-hc
+                           :box 1))
+      (,terminal-class (:background ,terminal-blue-lc
+                                    :foreground ,terminal-blue-hc
+                                    :box 1))))
+
+   `(magit-log-head-label-patches
+     ((,class (:background ,red-lc
+                           :foreground ,red-hc
+                           :box 1))
+      (,terminal-class (:background ,terminal-red-lc
+                                    :foreground ,terminal-red-hc
+                                    :box 1))))
+
+   `(magit-log-head-label-remote
+     ((,class (:background ,green-lc
+                           :foreground ,green-hc
+                           :box 1))
+      (,terminal-class (:background ,terminal-green-lc
+                                    :foreground ,terminal-green-hc
+                                    :box 1))))
+
+   `(magit-log-head-label-tags
+     ((,class (:background ,yellow-lc
+                           :foreground ,yellow-hc
+                           :box 1))
+      (,terminal-class (:background ,terminal-yellow-lc
+                                    :foreground ,terminal-yellow-hc
+                                    :box 1))))
+
+   `(magit-log-sha1
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   ;; monky
+   `(monky-section-title
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(monky-diff-add
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(monky-diff-del
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   ;; markdown-mode
+   `(markdown-header-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(markdown-header-face-1
+     ((,class (:inherit markdown-header-face
+                        :height ,monokai-height-plus-4))
+      (,terminal-class (:inherit markdown-header-face
+                                 :height ,monokai-height-plus-4))))
+
+   `(markdown-header-face-2
+     ((,class (:inherit markdown-header-face
+                        :height ,monokai-height-plus-3))
+      (,terminal-class (:inherit markdown-header-face
+                                 :height ,monokai-height-plus-3))))
+
+   `(markdown-header-face-3
+     ((,class (:inherit markdown-header-face
+                        :height ,monokai-height-plus-2))
+      (,terminal-class (:inherit markdown-header-face
+                                 :height ,monokai-height-plus-2))))
+
+   `(markdown-header-face-4
+     ((,class (:inherit markdown-header-face
+                        :height ,monokai-height-plus-1))
+      (,terminal-class (:inherit markdown-header-face
+                                 :height ,monokai-height-plus-1))))
+
+   `(markdown-header-face-5
+     ((,class (:inherit markdown-header-face))
+      (,terminal-class (:inherit markdown-header-face))))
+
+   `(markdown-header-face-6
+     ((,class (:inherit markdown-header-face))
+      (,terminal-class (:inherit markdown-header-face))))
+
+   ;; message-mode
+   `(message-cited-text
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(message-header-name
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(message-header-other
+     ((,class (:foreground ,monokai-fg
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :weight normal))))
+
+   `(message-header-to
+     ((,class (:foreground ,monokai-fg
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :weight normal))))
+
+   `(message-header-cc
+     ((,class (:foreground ,monokai-fg
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :weight normal))))
+
+   `(message-header-newsgroups
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(message-header-subject
+     ((,class (:foreground ,cyan
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :weight normal))))
+
+   `(message-header-xheader
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(message-mml
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(message-separator
+     ((,class (:foreground ,monokai-comments
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :slant italic))))
+
+   ;; mew
+   `(mew-face-header-subject
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(mew-face-header-from
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(mew-face-header-date
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-header-to
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(mew-face-header-key
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-header-private
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-header-important
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(mew-face-header-marginal
+     ((,class (:foreground ,monokai-fg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :weight bold))))
+
+   `(mew-face-header-warning
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(mew-face-header-xmew
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-header-xmew-bad
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(mew-face-body-url
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(mew-face-body-comment
+     ((,class (:foreground ,monokai-fg
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :slant italic))))
+
+   `(mew-face-body-cite1
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-body-cite2
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(mew-face-body-cite3
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(mew-face-body-cite4
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(mew-face-body-cite5
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(mew-face-mark-review
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(mew-face-mark-escape
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-mark-delete
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(mew-face-mark-unlink
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(mew-face-mark-refile
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-mark-unread
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(mew-face-eof-message
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(mew-face-eof-part
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   ;; mingus
+   `(mingus-directory-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(mingus-pausing-face
+     ((,class (:foreground ,magenta))
+      (,terminal-class (:foreground ,terminal-magenta))))
+
+   `(mingus-playing-face
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(mingus-playlist-face
+     ((,class (:foreground ,cyan ))
+      (,terminal-class (:foreground ,terminal-cyan ))))
+
+   `(mingus-song-file-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(mingus-stopped-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   ;; moccur
+   `(moccur-current-line-face
+     ((,class (:underline t))
+      (,terminal-class (:underline t))))
+
+   `(moccur-edit-done-face
+     ((,class (:foreground ,monokai-comments
+                           :background ,monokai-bg
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-monokai-bg
+                                    :slant italic))))
+
+   `(moccur-edit-face
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(moccur-edit-file-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(moccur-edit-reject-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(moccur-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :weight bold))))
+
+   `(search-buffers-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :weight bold))))
+
+   `(search-buffers-header-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-yellow
+                                    :weight bold))))
+
+   ;; mu4e
+   `(mu4e-cited-1-face
+     ((,class (:foreground ,green
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-green
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-cited-2-face
+     ((,class (:foreground ,blue
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-cited-3-face
+     ((,class (:foreground ,orange
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-cited-4-face
+     ((,class (:foreground ,yellow
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-cited-5-face
+     ((,class (:foreground ,cyan
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-cited-6-face
+     ((,class (:foreground ,green
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-green
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-cited-7-face
+     ((,class (:foreground ,blue
+                           :slant italic
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :slant italic
+                                    :weight normal))))
+
+   `(mu4e-flagged-face
+     ((,class (:foreground ,magenta
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :weight bold))))
+
+   `(mu4e-view-url-number-face
+     ((,class (:foreground ,yellow
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal))))
+
+   `(mu4e-warning-face
+     ((,class (:foreground ,red
+                           :slant normal
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-red
+                                    :slant normal
+                                    :weight bold))))
+
+   `(mu4e-header-highlight-face
+     ((,class (:inherit unspecified
+                        :foreground unspecified
+                        :background ,monokai-hl
+                        :underline ,monokai-emph
+                        :weight normal))
+      (,terminal-class (:inherit unspecified
+                                 :foreground unspecified
+                                 :background ,terminal-monokai-hl
+                                 :underline ,terminal-monokai-emph
+                                 :weight normal))))
+
+
+   `(mu4e-draft-face
+     ((,class (:inherit font-lock-string-face))
+      (,terminal-class (:inherit font-lock-string-face))))
+
+   `(mu4e-footer-face
+     ((,class (:inherit font-lock-comment-face))
+      (,terminal-class (:inherit font-lock-comment-face))))
+
+   `(mu4e-forwarded-face
+     ((,class (:inherit font-lock-builtin-face
+                        :weight normal))
+      (,terminal-class (:inherit font-lock-builtin-face
+                                 :weight normal))))
+
+   `(mu4e-header-face
+     ((,class (:inherit default))
+      (,terminal-class (:inherit default))))
+
+   `(mu4e-header-marks-face
+     ((,class (:inherit font-lock-preprocessor-face))
+      (,terminal-class (:inherit font-lock-preprocessor-face))))
+
+   `(mu4e-header-title-face
+     ((,class (:inherit font-lock-type-face))
+      (,terminal-class (:inherit font-lock-type-face))))
+
+   `(mu4e-highlight-face
+     ((,class (:inherit font-lock-pseudo-keyword-face
+                        :weight bold))
+      (,terminal-class (:inherit font-lock-pseudo-keyword-face
+                                 :weight bold))))
+
+   `(mu4e-moved-face
+     ((,class (:inherit font-lock-comment-face
+                        :slant italic))
+      (,terminal-class (:inherit font-lock-comment-face
+                                 :slant italic))))
+
+   `(mu4e-ok-face
+     ((,class (:inherit font-lock-comment-face
+                        :slant normal
+                        :weight bold))
+      (,terminal-class (:inherit font-lock-comment-face
+                                 :slant normal
+                                 :weight bold))))
+
+   `(mu4e-replied-face
+     ((,class (:inherit font-lock-builtin-face
+                        :weight normal))
+      (,terminal-class (:inherit font-lock-builtin-face
+                                 :weight normal))))
+
+   `(mu4e-system-face
+     ((,class (:inherit font-lock-comment-face
+                        :slant italic))
+      (,terminal-class (:inherit font-lock-comment-face
+                                 :slant italic))))
+
+   `(mu4e-title-face
+     ((,class (:inherit font-lock-type-face
+                        :weight bold))
+      (,terminal-class (:inherit font-lock-type-face
+                                 :weight bold))))
+
+   `(mu4e-trashed-face
+     ((,class (:inherit font-lock-comment-face
+                        :strike-through t))
+      (,terminal-class (:inherit font-lock-comment-face
+                                 :strike-through t))))
+
+   `(mu4e-unread-face
+     ((,class (:inherit font-lock-keyword-face
+                        :weight bold))
+      (,terminal-class (:inherit font-lock-keyword-face
+                                 :weight bold))))
+
+   `(mu4e-view-attach-number-face
+     ((,class (:inherit font-lock-variable-name-face
+                        :weight bold))
+      (,terminal-class (:inherit font-lock-variable-name-face
+                                 :weight bold))))
+
+   `(mu4e-view-contact-face
+     ((,class (:foreground ,monokai-fg
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :weight normal))))
+
+   `(mu4e-view-header-key-face
+     ((,class (:inherit message-header-name
+                        :weight normal))
+      (,terminal-class (:inherit message-header-name
+                                 :weight normal))))
+
+   `(mu4e-view-header-value-face
+     ((,class (:foreground ,cyan
+                           :weight normal
+                           :slant normal))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :weight normal
+                                    :slant normal))))
+
+   `(mu4e-view-link-face
+     ((,class (:inherit link))
+      (,terminal-class (:inherit link))))
+
+   `(mu4e-view-special-header-value-face
+     ((,class (:foreground ,blue
+                           :weight normal
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight normal
+                                    :underline nil))))
+
+   ;; mumamo
+   `(mumamo-background-chunk-submode1
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   ;; nav
+   `(nav-face-heading
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(nav-face-button-num
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(nav-face-dir
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(nav-face-hdir
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(nav-face-file
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(nav-face-hfile
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   ;; nav-flash
+   `(nav-flash-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   ;; neo-tree
+   `(neo-banner-face
+     ((,class (:foreground ,blue
+                           :background ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :background ,terminal-monokai-bg
+                                    :weight bold))))
+
+
+   `(neo-header-face
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg))))
+
+   `(neo-root-dir-face
+     ((,class (:foreground ,green
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-green
+                                    :background ,terminal-monokai-bg))))
+
+   `(neo-dir-link-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :background ,terminal-monokai-bg))))
+
+   `(neo-file-link-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(neo-button-face
+     ((,class (:underline nil))
+      (,terminal-class (:underline nil))))
+
+   `(neo-expand-btn-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(neo-vc-default-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(neo-vc-user-face
+     ((,class (:foreground ,red
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-red
+                                    :slant italic))))
+
+   `(neo-vc-up-to-date-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(neo-vc-edited-face
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(neo-vc-needs-update-face
+     ((,class (:underline t))
+      (,terminal-class (:underline t))))
+
+   `(neo-vc-needs-merge-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(neo-vc-unlocked-changes-face
+     ((,class (:foreground ,red
+                           :background ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-comments))))
+
+   `(neo-vc-added-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(neo-vc-removed-face
+     ((,class (:strike-through t))
+      (,terminal-class (:strike-through t))))
+
+   `(neo-vc-conflict-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(neo-vc-missing-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(neo-vc-ignored-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+
+   ;; org-mode
+   `(org-agenda-structure
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-hl
+                           :weight bold
+                           :slant normal
+                           :inverse-video nil
+                           :height ,monokai-height-plus-1
+                           :underline nil
+                           :box (:line-width 2 :color ,monokai-bg)))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-hl
+                                    :weight bold
+                                    :slant normal
+                                    :inverse-video nil
+                                    :height ,monokai-height-plus-1
+                                    :underline nil
+                                    :box (:line-width 2 :color ,terminal-monokai-bg)))))
+
+   `(org-agenda-calendar-event
+     ((,class (:foreground ,monokai-emph))
+      (,terminal-class (:foreground ,terminal-monokai-emph))))
+
+   `(org-agenda-calendar-sexp
+     ((,class (:foreground ,monokai-fg
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :slant italic))))
+
+   `(org-agenda-date
+     ((,class (:foreground ,monokai-comments
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video nil
+                           :overline nil
+                           :slant normal
+                           :height 1.0
+                           :box (:line-width 2 :color ,monokai-bg)))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video nil
+                                    :overline nil
+                                    :slant normal
+                                    :height 1.0
+                                    :box (:line-width 2 :color ,terminal-monokai-bg)))) t)
+
+   `(org-agenda-date-weekend
+     ((,class (:inherit org-agenda-date
+                        :inverse-video nil
+                        :background unspecified
+                        :foreground ,monokai-comments
+                        :weight unspecified
+                        :underline t
+                        :overline nil
+                        :box unspecified))
+      (,terminal-class (:inherit org-agenda-date
+                                 :inverse-video nil
+                                 :background unspecified
+                                 :foreground ,terminal-monokai-comments
+                                 :weight unspecified
+                                 :underline t
+                                 :overline nil
+                                 :box unspecified))) t)
+
+   `(org-agenda-date-today
+     ((,class (:inherit org-agenda-date
+                        :inverse-video t
+                        :weight bold
+                        :underline unspecified
+                        :overline nil
+                        :box unspecified
+                        :foreground ,blue
+                        :background ,monokai-bg))
+      (,terminal-class (:inherit org-agenda-date
+                                 :inverse-video t
+                                 :weight bold
+                                 :underline unspecified
+                                 :overline nil
+                                 :box unspecified
+                                 :foreground ,terminal-blue
+                                 :background ,terminal-monokai-bg))) t)
+
+   `(org-agenda-done
+     ((,class (:foreground ,monokai-comments
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :slant italic))) t)
+
+   `(org-archived
+     ((,class (:foreground ,monokai-comments
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :weight normal))))
+
+   `(org-block
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(org-block-begin-line
+     ((,class (:foreground ,monokai-comments
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :slant italic))))
+
+   `(org-checkbox
+     ((,class (:background ,monokai-bg
+                           :foreground ,monokai-fg
+                           :box (:line-width 1 :style released-button)))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-monokai-fg
+                                    :box (:line-width 1 :style released-button)))))
+
+   `(org-code
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(org-date
+     ((,class (:foreground ,blue
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :underline t))))
+
+   `(org-done
+     ((,class (:weight bold
+                       :foreground ,green))
+      (,terminal-class (:weight bold
+                                :foreground ,terminal-green))))
+
+   `(org-ellipsis
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(org-formula
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(org-headline-done
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(org-hide
+     ((,class (:foreground ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-bg))))
+
+   `(org-level-1
+     ((,class (:inherit ,s-variable-pitch
+                        :height ,monokai-height-plus-4
+                        :foreground ,orange))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :height ,monokai-height-plus-4
+                                 :foreground ,terminal-orange))))
+
+   `(org-level-2
+     ((,class (:inherit ,s-variable-pitch
+                        :height ,monokai-height-plus-3
+                        :foreground ,green))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :height ,monokai-height-plus-3
+                                 :foreground ,terminal-green))))
+
+   `(org-level-3
+     ((,class (:inherit ,s-variable-pitch
+                        :height ,monokai-height-plus-2
+                        :foreground ,blue))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :height ,monokai-height-plus-2
+                                 :foreground ,terminal-blue))))
+
+   `(org-level-4
+     ((,class (:inherit ,s-variable-pitch
+                        :height ,monokai-height-plus-1
+                        :foreground ,yellow))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :height ,monokai-height-plus-1
+                                 :foreground ,terminal-yellow))))
+
+   `(org-level-5
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,cyan))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-cyan))))
+
+   `(org-level-6
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,green))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-green))))
+
+   `(org-level-7
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,red))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-red))))
+
+   `(org-level-8
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,blue))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-blue))))
+
+   `(org-link
+     ((,class (:foreground ,yellow
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :underline t))))
+
+   `(org-sexp-date
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(org-scheduled
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(org-scheduled-previously
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(org-scheduled-today
+     ((,class (:foreground ,blue
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight normal))))
+
+   `(org-special-keyword
+     ((,class (:foreground ,monokai-comments
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :weight bold))))
+
+   `(org-table
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(org-tag
+     ((,class (:weight bold))
+      (,terminal-class (:weight bold))))
+
+   `(org-time-grid
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(org-todo
+     ((,class (:foreground ,red
+                           :weight bold)))
+     ((,terminal-class (:foreground ,terminal-red
+                                    :weight bold))))
+
+   `(org-upcoming-deadline
+     ((,class (:foreground ,yellow
+                           :weight normal
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal
+                                    :underline nil))))
+
+   `(org-warning
+     ((,class (:foreground ,orange
+                           :weight normal
+                           :underline nil))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :weight normal
+                                    :underline nil))))
+
+   ;; org-habit (clear=blue, ready=green, alert=yellow, overdue=red. future=lower contrast)
+   `(org-habit-clear-face
+     ((,class (:background ,blue-lc
+                           :foreground ,blue-hc))
+      (,terminal-class (:background ,terminal-blue-lc
+                                    :foreground ,terminal-blue-hc))))
+
+   `(org-habit-clear-future-face
+     ((,class (:background ,blue-lc))
+      (,terminal-class (:background ,terminal-blue-lc))))
+
+   `(org-habit-ready-face
+     ((,class (:background ,green-lc
+                           :foreground ,green))
+      (,terminal-class (:background ,terminal-green-lc
+                                    :foreground ,terminal-green))))
+
+   `(org-habit-ready-future-face
+     ((,class (:background ,green-lc))
+      (,terminal-class (:background ,terminal-green-lc))))
+
+   `(org-habit-alert-face
+     ((,class (:background ,yellow
+                           :foreground ,yellow-lc))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-yellow-lc))))
+
+   `(org-habit-alert-future-face
+     ((,class (:background ,yellow-lc))
+      (,terminal-class (:background ,terminal-yellow-lc))))
+
+   `(org-habit-overdue-face
+     ((,class (:background ,red
+                           :foreground ,red-lc))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground ,terminal-red-lc))))
+
+   `(org-habit-overdue-future-face
+     ((,class (:background ,red-lc))
+      (,terminal-class (:background ,terminal-red-lc))))
+
+   ;; latest additions
+   `(org-agenda-dimmed-todo-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(org-agenda-restriction-lock
+     ((,class (:background ,yellow))
+      (,terminal-class (:background ,terminal-yellow))))
+
+   `(org-clock-overlay
+     ((,class (:background ,yellow))
+      (,terminal-class (:background ,terminal-yellow))))
+
+   `(org-column
+     ((,class (:background ,monokai-hl
+                           :strike-through nil
+                           :underline nil
+                           :slant normal
+                           :weight normal
+                           :inherit default))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :strike-through nil
+                                    :underline nil
+                                    :slant normal
+                                    :weight normal
+                                    :inherit default))))
+
+   `(org-column-title
+     ((,class (:background ,monokai-hl
+                           :underline t
+                           :weight bold))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :underline t
+                                    :weight bold))))
+
+   `(org-date-selected
+     ((,class (:foreground ,red
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :inverse-video t))))
+
+   `(org-document-info
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(org-document-title
+     ((,class (:foreground ,monokai-emph
+                           :weight bold
+                           :height ,monokai-height-plus-4))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :weight bold
+                                    :height ,monokai-height-plus-4))))
+
+   `(org-drawer
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(org-footnote
+     ((,class (:foreground ,magenta
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :underline t))))
+
+   `(org-latex-and-export-specials
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(org-mode-line-clock-overrun
+     ((,class (:inherit mode-line))
+      (,terminal-class (:inherit mode-line))))
+
+   ;; outline
+   `(outline-1
+     ((,class (:inherit org-level-1))
+      (,terminal-class (:inherit org-level-1))))
+
+   `(outline-2
+     ((,class (:inherit org-level-2))
+      (,terminal-class (:inherit org-level-2))))
+
+   `(outline-3
+     ((,class (:inherit org-level-3))
+      (,terminal-class (:inherit org-level-3))))
+
+   `(outline-4
+     ((,class (:inherit org-level-4))
+      (,terminal-class (:inherit org-level-4))))
+
+   `(outline-5
+     ((,class (:inherit org-level-5))
+      (,terminal-class (:inherit org-level-5))))
+
+   `(outline-6
+     ((,class (:inherit org-level-6))
+      (,terminal-class (:inherit org-level-6))))
+
+   `(outline-7
+     ((,class (:inherit org-level-7))
+      (,terminal-class (:inherit org-level-7))))
+
+   `(outline-8
+     ((,class (:inherit org-level-8))
+      (,terminal-class (:inherit org-level-8))))
+
+   ;; parenface
+   `(paren-face
+     ((,terminal-class (:foreground ,monokai-comments))))
+
+   ;; perspective
+   `(persp-selected-face
+     ((,class (:foreground ,blue
+                           :weight bold))))
+
+   ;; pretty-mode
+   `(pretty-mode-symbol-face
+     ((,class (:foreground ,yellow
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal))))
+
+   ;; popup
+   `(popup-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(popup-isearch-match
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(popup-menu-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(popup-menu-mouse-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(popup-menu-selection-face
+     ((,class (:background ,magenta
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-magenta
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(popup-scroll-bar-background-face
+     ((,class (:background ,monokai-comments))
+      (,terminal-class (:background ,terminal-monokai-comments))))
+
+   `(popup-scroll-bar-foreground-face
+     ((,class (:background ,monokai-emph))
+      (,terminal-class (:background ,terminal-monokai-emph))))
+
+   `(popup-tip-face
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg))))
+
+   ;; powerline
+   `(powerline-active1
+     ((,class (:background ,s-powerline-active1-bg :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-gray :foreground ,monokai-fg))))
+
+   `(powerline-active2
+     ((,class (:background ,s-powerline-active2-bg :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-gray-l :foreground ,monokai-fg))))
+
+   `(powerline-inactive1
+     ((,class (:background ,s-powerline-inactive1-bg))
+      (,terminal-class (:background ,terminal-gray-d))))
+
+   `(powerline-inactive2
+     ((,class (:background ,s-powerline-inactive2-bg))
+      (,terminal-class (:background ,terminal-gray))))
+
+   ;; rainbow-delimiters
+   `(rainbow-delimiters-depth-1-face
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(rainbow-delimiters-depth-2-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(rainbow-delimiters-depth-3-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(rainbow-delimiters-depth-4-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(rainbow-delimiters-depth-5-face
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(rainbow-delimiters-depth-6-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(rainbow-delimiters-depth-7-face
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(rainbow-delimiters-depth-8-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(rainbow-delimiters-depth-9-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(rainbow-delimiters-depth-10-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(rainbow-delimiters-depth-11-face
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(rainbow-delimiters-depth-12-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(rainbow-delimiters-unmatched-face
+     ((,class (:foreground ,monokai-fg
+                           :background ,monokai-bg
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :background ,terminal-monokai-bg
+                                    :inverse-video t))))
+
+   ;; rhtm-mode
+   `(erb-face
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-delim-face
+     ((,class (:foreground ,cyan
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-exec-face
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-exec-delim-face
+     ((,class (:foreground ,cyan
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-out-face
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-out-delim-face
+     ((,class (:foreground ,cyan
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-comment-face
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg))))
+
+   `(erb-comment-delim-face
+     ((,class (:foreground ,cyan
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :background ,terminal-monokai-bg))))
+
+   ;; rst-mode
+   `(rst-level-1-face
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(rst-level-2-face
+     ((,class (:background ,cyan
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-cyan
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(rst-level-3-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(rst-level-4-face
+     ((,class (:background ,violet
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-violet
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(rst-level-5-face
+     ((,class (:background ,magenta
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-magenta
+                                    :foreground ,terminal-monokai-bg))))
+
+   `(rst-level-6-face
+     ((,class (:background ,red
+                           :foreground ,monokai-bg))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground ,terminal-monokai-bg))))
+
+   ;; rpm-mode
+   `(rpm-spec-dir-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(rpm-spec-doc-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(rpm-spec-ghost-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(rpm-spec-macro-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(rpm-spec-obsolete-tag-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(rpm-spec-package-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(rpm-spec-section-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(rpm-spec-tag-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(rpm-spec-var-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   ;; sh-mode
+   `(sh-quoted-exec
+     ((,class (:foreground ,violet
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-violet
+                                    :weight bold))))
+
+   `(sh-escaped-newline
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   `(sh-heredoc
+     ((,class (:foreground ,yellow
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight bold))))
+
+   ;; smartparens
+   `(sp-pair-overlay-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(sp-wrap-overlay-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(sp-wrap-tag-overlay-face
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(sp-show-pair-enclosing
+     ((,class (:inherit highlight))
+      (,terminal-class (:inherit highlight))))
+
+   `(sp-show-pair-match-face
+     ((,class (:foreground ,orange
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   `(sp-show-pair-mismatch-face
+     ((,class (:foreground ,red
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   ;; show-paren
+   `(show-paren-match
+     ((,class (:foreground ,orange
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   `(show-paren-mismatch
+     ((,class (:foreground ,red
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   ;; mic-paren
+   `(paren-face-match
+     ((,class (:foreground ,orange
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-orange
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   `(paren-face-mismatch
+     ((,class (:foreground ,red
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   `(paren-face-no-match
+     ((,class (:foreground ,red
+                           :background ,monokai-bg
+                           :weight normal
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-monokai-bg
+                                    :weight normal
+                                    :inverse-video t))))
+
+   ;; SLIME
+   `(slime-repl-inputed-output-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   ;; speedbar
+   `(speedbar-button-face
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,monokai-comments))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-monokai-comments))))
+
+   `(speedbar-directory-face
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,blue))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-blue))))
+
+   `(speedbar-file-face
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,monokai-fg))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-monokai-fg))))
+
+   `(speedbar-highlight-face
+     ((,class (:inherit ,s-variable-pitch
+                        :background ,monokai-hl))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :background ,terminal-monokai-hl))))
+
+   `(speedbar-selected-face
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,yellow
+                        :underline t))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-yellow
+                                 :underline t))))
+
+   `(speedbar-separator-face
+     ((,class (:inherit ,s-variable-pitch
+                        :background ,blue
+                        :foreground ,monokai-bg
+                        :overline ,cyan-lc))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :background ,terminal-blue
+                                 :foreground ,terminal-monokai-bg
+                                 :overline ,terminal-cyan-lc))))
+
+   `(speedbar-tag-face
+     ((,class (:inherit ,s-variable-pitch
+                        :foreground ,green))
+      (,terminal-class (:inherit ,terminal-s-variable-pitch
+                                 :foreground ,terminal-green))))
+
+   ;; sunrise commander headings
+   `(sr-active-path-face
+     ((,class (:background ,blue
+                           :foreground ,monokai-bg
+                           :height ,monokai-height-plus-1
+                           :weight bold))
+      (,terminal-class (:background ,terminal-blue
+                                    :foreground ,terminal-monokai-bg
+                                    :height ,monokai-height-plus-1
+                                    :weight bold))))
+
+   `(sr-editing-path-face
+     ((,class (:background ,yellow
+                           :foreground ,monokai-bg
+                           :weight bold
+                           :height ,monokai-height-plus-1))
+      (,terminal-class (:background ,terminal-yellow
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold
+                                    :height ,monokai-height-plus-1))))
+
+   `(sr-highlight-path-face
+     ((,class (:background ,green
+                           :foreground ,monokai-bg
+                           :weight bold
+                           :height ,monokai-height-plus-1))
+      (,terminal-class (:background ,terminal-green
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold
+                                    :height ,monokai-height-plus-1))))
+
+   `(sr-passive-path-face
+     ((,class (:background ,monokai-comments
+                           :foreground ,monokai-bg
+                           :weight bold
+                           :height ,monokai-height-plus-1))
+      (,terminal-class (:background ,terminal-monokai-comments
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold
+                                    :height ,monokai-height-plus-1))))
+
+   ;; sunrise commander marked
+   `(sr-marked-dir-face
+     ((,class (:inherit dired-marked))
+      (,terminal-class (:inherit dired-marked))))
+
+   `(sr-marked-file-face
+     ((,class (:inherit dired-marked))
+      (,terminal-class (:inherit dired-marked))))
+
+   `(sr-alt-marked-dir-face
+     ((,class (:background ,magenta
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-magenta
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(sr-alt-marked-file-face
+     ((,class (:background ,magenta
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-magenta
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   ;; sunrise commander fstat
+   `(sr-directory-face
+     ((,class (:inherit dired-directory
+                        :weight normal))
+      (,terminal-class (:inherit dired-directory
+                                 :weight normal))))
+
+   `(sr-symlink-directory-face
+     ((,class (:inherit dired-directory
+                        :slant italic
+                        :weight normal))
+      (,terminal-class (:inherit dired-directory
+                                 :slant italic
+                                 :weight normal))))
+
+   `(sr-symlink-face
+     ((,class (:inherit dired-symlink
+                        :slant italic
+                        :weight normal))
+      (,terminal-class (:inherit dired-symlink
+                                 :slant italic
+                                 :weight normal))))
+
+   `(sr-broken-link-face
+     ((,class (:inherit dired-warning
+                        :slant italic
+                        :weight normal))
+      (,terminal-class (:inherit dired-warning
+                                 :slant italic
+                                 :weight normal))))
+
+   ;; sunrise commander file types
+   `(sr-compressed-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(sr-encrypted-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(sr-log-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(sr-packaged-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(sr-html-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(sr-xml-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   ;; sunrise commander misc
+   `(sr-clex-hotchar-face
+     ((,class (:background ,red
+                           :foreground ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:background ,terminal-red
+                                    :foreground ,terminal-monokai-bg
+                                    :weight bold))))
+
+   ;; syslog-mode
+   `(syslog-ip-face
+     ((,class (:background unspecified
+                           :foreground ,yellow))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-yellow))))
+
+   `(syslog-hour-face
+     ((,class (:background unspecified
+                           :foreground ,green))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-green))))
+
+   `(syslog-error-face
+     ((,class (:background unspecified
+                           :foreground ,red
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-red
+                                    :weight bold))))
+
+   `(syslog-warn-face
+     ((,class (:background unspecified
+                           :foreground ,orange
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-orange
+                                    :weight bold))))
+
+   `(syslog-info-face
+     ((,class (:background unspecified
+                           :foreground ,blue
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(syslog-debug-face
+     ((,class (:background unspecified
+                           :foreground ,cyan
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-cyan
+                                    :weight bold))))
+
+   `(syslog-su-face
+     ((,class (:background unspecified
+                           :foreground ,magenta))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-magenta))))
+
+   ;; table
+   `(table-cell
+     ((,class (:foreground ,monokai-fg
+                           :background ,monokai-hl))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :background ,terminal-monokai-hl))))
+
+   ;; term
+   `(term-color-black
+     ((,class (:foreground ,monokai-bg
+                           :background ,monokai-hl))
+      (,terminal-class (:foreground ,terminal-monokai-bg
+                                    :background ,terminal-monokai-hl))))
+
+   `(term-color-red
+     ((,class (:foreground ,red
+                           :background ,red-d))
+      (,terminal-class (:foreground ,terminal-red
+                                    :background ,terminal-red-d))))
+
+   `(term-color-green
+     ((,class (:foreground ,green
+                           :background ,green-d))
+      (,terminal-class (:foreground ,terminal-green
+                                    :background ,terminal-green-d))))
+
+   `(term-color-yellow
+     ((,class (:foreground ,yellow
+                           :background ,yellow-d))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :background ,terminal-yellow-d))))
+
+   `(term-color-blue
+     ((,class (:foreground ,blue
+                           :background ,blue-d))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :background ,terminal-blue-d))))
+
+   `(term-color-magenta
+     ((,class (:foreground ,magenta
+                           :background ,magenta-d))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :background ,terminal-magenta-d))))
+
+   `(term-color-cyan
+     ((,class (:foreground ,cyan
+                           :background ,cyan-d))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :background ,terminal-cyan-d))))
+
+   `(term-color-white
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-fg))))
+
+   `(term-default-fg-color
+     ((,class (:inherit term-color-white))
+      (,terminal-class (:inherit term-color-white))))
+
+   `(term-default-bg-color
+     ((,class (:inherit term-color-black))
+      (,terminal-class (:inherit term-color-black))))
+
+   ;; tooltip. (NOTE: This setting has no effect on the os widgets for me
+   ;; zencoding uses this)
+   `(tooltip
+     ((,class (:background ,green
+                           :foreground ,monokai-bg
+                           :inherit ,s-variable-pitch))))
+
+   ;; tuareg
+   `(tuareg-font-lock-governing-face
+     ((,class (:foreground ,magenta
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-magenta
+                                    :weight bold))))
+
+   `(tuareg-font-lock-multistage-face
+     ((,class (:foreground ,blue
+                           :background ,monokai-hl
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :background ,terminal-monokai-hl
+                                    :weight bold))))
+
+   `(tuareg-font-lock-operator-face
+     ((,class (:foreground ,monokai-emph))
+      (,terminal-class (:foreground ,terminal-monokai-emph))))
+
+   `(tuareg-font-lock-error-face
+     ((,class (:foreground ,yellow
+                           :background ,red
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :background ,terminal-red
+                                    :weight bold))))
+
+   `(tuareg-font-lock-interactive-output-face
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(tuareg-font-lock-interactive-error-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   ;; undo-tree
+   `(undo-tree-visualizer-default-face
+     ((,class (:foreground ,monokai-comments
+                           :background ,monokai-bg))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-monokai-bg))))
+
+   `(undo-tree-visualizer-unmodified-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(undo-tree-visualizer-current-face
+     ((,class (:foreground ,blue
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :inverse-video t))))
+
+   `(undo-tree-visualizer-active-branch-face
+     ((,class (:foreground ,monokai-emph
+                           :background ,monokai-bg
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :background ,terminal-monokai-bg
+                                    :weight bold))))
+
+   `(undo-tree-visualizer-register-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   ;; volatile highlights
+   `(vhl/default-face
+     ((,class (:background ,green-lc
+                           :foreground ,green-hc))
+      (,terminal-class (:background ,terminal-green-lc
+                                    :foreground ,terminal-green-hc))))
+
+   ;; w3m
+   `(w3m-anchor
+     ((,class (:inherit link))
+      (,terminal-class (:inherit link))))
+
+   `(w3m-arrived-anchor
+     ((,class (:inherit link-visited))
+      (,terminal-class (:inherit link-visited))))
+
+   `(w3m-form
+     ((,class (:background ,monokai-bg
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(w3m-header-line-location-title
+     ((,class (:background ,monokai-hl
+                           :foreground ,yellow))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-yellow))))
+
+   `(w3m-header-line-location-content
+
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(w3m-bold
+     ((,class (:foreground ,monokai-emph
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :weight bold))))
+
+   `(w3m-image-anchor
+     ((,class (:background ,monokai-bg
+                           :foreground ,cyan
+                           :inherit link))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-cyan
+                                    :inherit link))))
+
+   `(w3m-image
+     ((,class (:background ,monokai-bg
+                           :foreground ,cyan))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-cyan))))
+
+   `(w3m-lnum-minibuffer-prompt
+     ((,class (:foreground ,monokai-emph))
+      (,terminal-class (:foreground ,terminal-monokai-emph))))
+
+   `(w3m-lnum-match
+     ((,class (:background ,monokai-hl))
+      (,terminal-class (:background ,terminal-monokai-hl))))
+
+   `(w3m-lnum
+     ((,class (:underline nil
+                          :bold nil
+                          :foreground ,red))
+      (,terminal-class (:underline nil
+                                   :bold nil
+                                   :foreground ,terminal-red))))
+
+   `(w3m-session-select
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(w3m-session-selected
+     ((,class (:foreground ,monokai-emph
+                           :bold t
+                           :underline t))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :bold t
+                                    :underline t))))
+
+   `(w3m-tab-background
+     ((,class (:background ,monokai-bg
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(w3m-tab-selected-background
+     ((,class (:background ,monokai-bg
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-bg
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(w3m-tab-mouse
+     ((,class (:background ,monokai-hl
+                           :foreground ,yellow))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-yellow))))
+
+   `(w3m-tab-selected
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-emph
+                           :bold t))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-emph
+                                    :bold t))))
+
+   `(w3m-tab-unselected
+     ((,class (:background ,monokai-hl
+                           :foreground ,monokai-fg))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-monokai-fg))))
+
+   `(w3m-tab-selected-retrieving
+     ((,class (:background ,monokai-hl
+                           :foreground ,red))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-red))))
+
+   `(w3m-tab-unselected-retrieving
+     ((,class (:background ,monokai-hl
+                           :foreground ,orange))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-orange))))
+
+   `(w3m-tab-unselected-unseen
+     ((,class (:background ,monokai-hl
+                           :foreground ,violet))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :foreground ,terminal-violet))))
+
+   ;; web-mode
+   `(web-mode-builtin-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(web-mode-comment-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   `(web-mode-constant-face
+     ((,class (:foreground ,blue
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :weight bold))))
+
+   `(web-mode-current-element-highlight-face
+     ((,class (:underline unspecified
+                          :weight unspecified
+                          :background ,monokai-hl))
+      (,terminal-class (:underline unspecified
+                                   :weight unspecified
+                                   :background ,terminal-monokai-hl))))
+
+   `(web-mode-css-at-rule-face
+     ((,class (:foreground ,violet
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-violet
+                                    :slant italic))))
+
+   `(web-mode-css-pseudo-class-face
+     ((,class (:foreground ,green
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-green
+                                    :slant italic))))
+
+   `(web-mode-doctype-face
+     ((,class (:foreground ,monokai-comments
+                           :slant italic
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :slant italic
+                                    :weight bold))))
+
+   `(web-mode-folded-face
+     ((,class (:underline t))
+      (,terminal-class (:underline t))))
+
+   `(web-mode-function-name-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(web-mode-html-attr-name-face
+     ((,class (:foreground ,blue
+                           :slant normal))
+      (,terminal-class (:foreground ,terminal-blue
+                                    :slant normal))))
+
+   `(web-mode-html-attr-value-face
+     ((,class (:foreground ,cyan
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-cyan
+                                    :slant italic))))
+
+   `(web-mode-html-tag-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(web-mode-keyword-face
+     ((,class (:foreground ,yellow
+                           :weight normal))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :weight normal))))
+
+   `(web-mode-preprocessor-face
+     ((,class (:foreground ,yellow
+                           :slant normal
+                           :weight unspecified))
+      (,terminal-class (:foreground ,terminal-yellow
+                                    :slant normal
+                                    :weight unspecified))))
+
+   `(web-mode-string-face
+     ((,class (:foreground ,cyan))
+      (,terminal-class (:foreground ,terminal-cyan))))
+
+   `(web-mode-type-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(web-mode-variable-name-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(web-mode-warning-face
+     ((,class (:inherit font-lock-warning-face))
+      (,terminal-class (:inherit font-lock-warning-face))))
+
+   `(web-mode-block-attr-name-face
+     ((,class (:inherit web-mode-html-attr-name-face))
+      (,terminal-class (:inherit web-mode-html-attr-name-face))))
+
+   `(web-mode-block-attr-value-face
+     ((,class (:inherit web-mode-html-attr-value-face))
+      (,terminal-class (:inherit web-mode-html-attr-value-face))))
+
+   `(web-mode-block-comment-face
+     ((,class (:inherit web-mode-comment-face))
+      (,terminal-class (:inherit web-mode-comment-face))))
+
+   `(web-mode-block-control-face
+     ((,class (:inherit font-lock-preprocessor-face))
+      (,terminal-class (:inherit font-lock-preprocessor-face))))
+
+   `(web-mode-block-face
+     ((,class (:background unspecified))
+      (,terminal-class (:background unspecified))))
+
+   `(web-mode-block-string-face
+     ((,class (:inherit web-mode-string-face))
+      (,terminal-class (:inherit web-mode-string-face))))
+
+   `(web-mode-comment-keyword-face
+     ((,class (:box 1
+                    :weight bold))
+      (,terminal-class (:box 1
+                             :weight bold))))
+
+   `(web-mode-css-color-face
+     ((,class (:inherit font-lock-builtin-face))
+      (,terminal-class (:inherit font-lock-builtin-face))))
+
+   `(web-mode-css-function-face
+     ((,class (:inherit font-lock-builtin-face))
+      (,terminal-class (:inherit font-lock-builtin-face))))
+
+   `(web-mode-css-priority-face
+     ((,class (:inherit font-lock-builtin-face))
+      (,terminal-class (:inherit font-lock-builtin-face))))
+
+   `(web-mode-css-property-name-face
+     ((,class (:inherit font-lock-variable-name-face))
+      (,terminal-class (:inherit font-lock-variable-name-face))))
+
+   `(web-mode-css-selector-face
+     ((,class (:inherit font-lock-keyword-face))
+      (,terminal-class (:inherit font-lock-keyword-face))))
+
+   `(web-mode-css-string-face
+     ((,class (:inherit web-mode-string-face))
+      (,terminal-class (:inherit web-mode-string-face))))
+
+   `(web-mode-javascript-string-face
+     ((,class (:inherit web-mode-string-face))
+      (,terminal-class (:inherit web-mode-string-face))))
+
+   `(web-mode-json-context-face
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(web-mode-json-key-face
+     ((,class (:foreground ,violet))
+      (,terminal-class (:foreground ,terminal-violet))))
+
+   `(web-mode-json-string-face
+     ((,class (:inherit web-mode-string-face))
+      (,terminal-class (:inherit web-mode-string-face))))
+
+   `(web-mode-param-name-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(web-mode-part-comment-face
+     ((,class (:inherit web-mode-comment-face))
+      (,terminal-class (:inherit web-mode-comment-face))))
+
+   `(web-mode-part-face
+     ((,class (:inherit web-mode-block-face))
+      (,terminal-class (:inherit web-mode-block-face))))
+
+   `(web-mode-part-string-face
+     ((,class (:inherit web-mode-string-face))
+      (,terminal-class (:inherit web-mode-string-face))))
+
+   `(web-mode-symbol-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(web-mode-whitespace-face
+     ((,class (:background ,red))
+      (,terminal-class (:background ,terminal-red))))
+
+   ;; whitespace-mode
+   `(whitespace-space
+     ((,class (:background unspecified
+                           :foreground ,monokai-comments
+                           :inverse-video unspecified
+                           :slant italic))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-monokai-comments
+                                    :inverse-video unspecified
+                                    :slant italic))))
+
+   `(whitespace-hspace
+     ((,class (:background unspecified
+                           :foreground ,monokai-emph
+                           :inverse-video unspecified))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-monokai-emph
+                                    :inverse-video unspecified))))
+
+   `(whitespace-tab
+     ((,class (:background unspecified
+                           :foreground ,red
+                           :inverse-video unspecified
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-red
+                                    :inverse-video unspecified
+                                    :weight bold))))
+
+   `(whitespace-newline
+     ((,class(:background unspecified
+                          :foreground ,monokai-comments
+                          :inverse-video unspecified))
+      (,terminal-class(:background unspecified
+                                   :foreground ,terminal-monokai-comments
+                                   :inverse-video unspecified))))
+
+   `(whitespace-trailing
+     ((,class (:background unspecified
+                           :foreground ,orange-lc
+                           :inverse-video t))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-orange-lc
+                                    :inverse-video t))))
+
+   `(whitespace-line
+     ((,class (:background unspecified
+                           :foreground ,magenta
+                           :inverse-video unspecified))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-magenta
+                                    :inverse-video unspecified))))
+
+   `(whitespace-space-before-tab
+     ((,class (:background ,red-lc
+                           :foreground unspecified
+                           :inverse-video unspecified))
+      (,terminal-class (:background ,terminal-red-lc
+                                    :foreground unspecified
+                                    :inverse-video unspecified))))
+
+   `(whitespace-indentation
+     ((,class (:background unspecified
+                           :foreground ,yellow
+                           :inverse-video unspecified
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-yellow
+                                    :inverse-video unspecified
+                                    :weight bold))))
+
+   `(whitespace-empty
+     ((,class (:background unspecified
+                           :foreground ,red-lc
+                           :inverse-video t))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-red-lc
+                                    :inverse-video t))))
+
+   `(whitespace-space-after-tab
+     ((,class (:background unspecified
+                           :foreground ,orange
+                           :inverse-video t
+                           :weight bold))
+      (,terminal-class (:background unspecified
+                                    :foreground ,terminal-orange
+                                    :inverse-video t
+                                    :weight bold))))
+
+   ;; wanderlust
+   `(wl-highlight-folder-few-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(wl-highlight-folder-many-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(wl-highlight-folder-path-face
+     ((,class (:foreground ,orange))
+      (,terminal-class (:foreground ,terminal-orange))))
+
+   `(wl-highlight-folder-unread-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(wl-highlight-folder-zero-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(wl-highlight-folder-unknown-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(wl-highlight-message-citation-header
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(wl-highlight-message-cited-text-1
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(wl-highlight-message-cited-text-2
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(wl-highlight-message-cited-text-3
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(wl-highlight-message-cited-text-4
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(wl-highlight-message-header-contents-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(wl-highlight-message-headers-face
+     ((,class (:foreground ,red))
+      (,terminal-class (:foreground ,terminal-red))))
+
+   `(wl-highlight-message-important-header-contents
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(wl-highlight-message-header-contents
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(wl-highlight-message-important-header-contents2
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(wl-highlight-message-signature
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   `(wl-highlight-message-unimportant-header-contents
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(wl-highlight-summary-answered-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(wl-highlight-summary-disposed-face
+     ((,class (:foreground ,monokai-fg
+                           :slant italic))
+      (,terminal-class (:foreground ,terminal-monokai-fg
+                                    :slant italic))))
+
+   `(wl-highlight-summary-new-face
+     ((,class (:foreground ,blue))
+      (,terminal-class (:foreground ,terminal-blue))))
+
+   `(wl-highlight-summary-normal-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(wl-highlight-summary-thread-top-face
+     ((,class (:foreground ,yellow))
+      (,terminal-class (:foreground ,terminal-yellow))))
+
+   `(wl-highlight-thread-indent-face
+     ((,class (:foreground ,magenta))
+      (,terminal-class (:foreground ,terminal-magenta))))
+
+   `(wl-highlight-summary-refiled-face
+     ((,class (:foreground ,monokai-fg))
+      (,terminal-class (:foreground ,terminal-monokai-fg))))
+
+   `(wl-highlight-summary-displaying-face
+     ((,class (:underline t
+                          :weight bold))
+      (,terminal-class (:underline t
+                                   :weight bold))))
+
+   ;; weechat
+   `(weechat-error-face
+     ((,class (:inherit error))
+      (,terminal-class (:inherit error))))
+
+   `(weechat-highlight-face
+     ((,class (:foreground ,monokai-emph
+                           :weight bold))
+      (,terminal-class (:foreground ,terminal-monokai-emph
+                                    :weight bold))))
+
+   `(weechat-nick-self-face
+     ((,class (:foreground ,green
+                           :weight unspecified
+                           :inverse-video t))
+      (,terminal-class (:foreground ,terminal-green
+                                    :weight unspecified
+                                    :inverse-video t))))
+
+   `(weechat-prompt-face
+     ((,class (:inherit minibuffer-prompt))
+      (,terminal-class (:inherit minibuffer-prompt))))
+
+   `(weechat-time-face
+     ((,class (:foreground ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments))))
+
+   ;; which-func-mode
+   `(which-func
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   ;; window-number-mode
+   `(window-number-face
+     ((,class (:foreground ,green))
+      (,terminal-class (:foreground ,terminal-green))))
+
+   ;; yascroll
+   `(yascroll:thumb-text-area
+     ((,class (:foreground ,monokai-comments
+                           :background ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-monokai-comments))))
+
+   `(yascroll:thumb-fringe
+     ((,class (:foreground ,monokai-comments
+                           :background ,monokai-comments))
+      (,terminal-class (:foreground ,terminal-monokai-comments
+                                    :background ,terminal-monokai-comments))))
+
+   ;; zencoding
+   `(zencoding-preview-input
+     ((,class (:background ,monokai-hl
+                           :box ,monokai-emph))
+      (,terminal-class (:background ,terminal-monokai-hl
+                                    :box ,terminal-monokai-emph)))))
+
+  (custom-theme-set-variables
+   'monokai
+   `(ansi-color-names-vector [,monokai-bg ,red ,green ,yellow
+                                          ,blue ,magenta ,cyan ,monokai-fg])
+
+   ;; compilation
+   `(compilation-message-face 'default)
+
+   ;; fill-column-indicator
+   `(fci-rule-color ,monokai-hl)
+
+   ;; magit
+   `(magit-diff-use-overlays nil)
+
+   ;; highlight-changes
+   `(highlight-changes-colors '(,magenta ,violet))
+
+   ;; highlight-tail
+   `(highlight-tail-colors
+     '((,monokai-hl . 0)(,green-lc . 20)(,cyan-lc . 30)(,blue-lc . 50)
+       (,yellow-lc . 60)(,orange-lc . 70)(,magenta-lc . 85)(,monokai-hl . 100)))
+
+   ;; pos-tip
+   `(pos-tip-foreground-color ,monokai-bg)
+   `(pos-tip-background-color ,green)
+
+   ;; vc
+   `(vc-annotate-color-map
+     '((20 . ,red)
+       (40 . "#CF4F1F")
+       (60 . "#C26C0F")
+       (80 . ,yellow)
+       (100 . "#AB8C00")
+       (120 . "#A18F00")
+       (140 . "#989200")
+       (160 . "#8E9500")
+       (180 . ,green)
+       (200 . "#729A1E")
+       (220 . "#609C3C")
+       (240 . "#4E9D5B")
+       (260 . "#3C9F79")
+       (280 . ,cyan)
+       (300 . "#299BA6")
+       (320 . "#2896B5")
+       (340 . "#2790C3")
+       (360 . ,blue)))
+   `(vc-annotate-very-old-color nil)
+   `(vc-annotate-background nil)
+
+   ;; weechat
+   `(weechat-color-list
+     (unspecified ,monokai-bg ,monokai-hl
+                  ,red-d ,red
+                  ,green-d ,green
+                  ,yellow-d ,yellow
+                  ,blue-d ,blue
+                  ,magenta-d ,magenta
+                  ,cyan-d ,cyan
+                  ,monokai-fg ,monokai-emph))))
+
+;;;###autoload
+(when (and (boundp 'custom-theme-load-path) load-file-name)
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+
+(provide-theme 'monokai)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; eval: (when (fboundp 'rainbow-mode) (rainbow-mode 1))
+;; eval: (when (fboundp 'aggressive-indent-mode) (aggressive-indent-mode -1))
+;; fill-column: 95
+;; End:
+
+;;; monokai-theme.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-mark-more.el b/emacs.d/elpa/multiple-cursors-20150528.2303/mc-mark-more.el
deleted file mode 100644
index 445f6d3..0000000
--- a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-mark-more.el
+++ /dev/null
@@ -1,583 +0,0 @@
-;;; mc-mark-more.el
-
-;; Copyright (C) 2012 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Keywords: editing cursors
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file contains functions to mark more parts of the buffer.
-;; See ./features/mark-more.feature for examples.
-
-;; Please see multiple-cursors.el for more commentary.
-
-;;; Code:
-
-(require 'multiple-cursors-core)
-(require 'thingatpt)
-
-(defun mc/cursor-end (cursor)
-  (if (overlay-get cursor 'mark-active)
-      (max (overlay-get cursor 'point)
-           (overlay-get cursor 'mark))
-    (overlay-get cursor 'point)))
-
-(defun mc/cursor-beg (cursor)
-  (if (overlay-get cursor 'mark-active)
-      (min (overlay-get cursor 'point)
-           (overlay-get cursor 'mark))
-    (overlay-get cursor 'point)))
-
-(defun mc/furthest-region-end ()
-  (let ((end (max (mark) (point))))
-    (mc/for-each-fake-cursor
-     (setq end (max end (mc/cursor-end cursor))))
-    end))
-
-(defun mc/first-region-start ()
-  (let ((beg (min (mark) (point))))
-    (mc/for-each-fake-cursor
-     (setq beg (min beg (mc/cursor-beg cursor))))
-    beg))
-
-(defun mc/furthest-cursor-before-point ()
-  (let ((beg (min (mark) (point)))
-        furthest)
-    (mc/for-each-fake-cursor
-     (when (< (mc/cursor-beg cursor) beg)
-       (setq beg (mc/cursor-beg cursor))
-       (setq furthest cursor)))
-    furthest))
-
-(defun mc/furthest-cursor-after-point ()
-  (let ((end (max (mark) (point)))
-        furthest)
-    (mc/for-each-fake-cursor
-     (when (> (mc/cursor-end cursor) end)
-       (setq end (mc/cursor-end cursor))
-       (setq furthest cursor)))
-    furthest))
-
-(defun mc/region-strings ()
-  (let ((strings (list (buffer-substring-no-properties (point) (mark)))))
-    (mc/for-each-fake-cursor
-     (add-to-list 'strings (buffer-substring-no-properties
-                            (mc/cursor-beg cursor)
-                            (mc/cursor-end cursor))))
-    strings))
-
-(defvar mc/enclose-search-term nil
-  "How should mc/mark-more-* search for more matches?
-
-Match everything: nil
-Match only whole words: 'words
-Match only whole symbols: 'symbols
-
-Use like case-fold-search, don't recommend setting it globally.")
-
-(defun mc/mark-more-like-this (skip-last direction)
-  (let ((case-fold-search nil)
-        (re (regexp-opt (mc/region-strings) mc/enclose-search-term))
-        (point-out-of-order (ecase direction
-                              (forwards       (< (point) (mark)))
-                              (backwards (not (< (point) (mark))))))
-        (furthest-cursor (ecase direction
-                           (forwards  (mc/furthest-cursor-after-point))
-                           (backwards (mc/furthest-cursor-before-point))))
-        (start-char (ecase direction
-                      (forwards  (mc/furthest-region-end))
-                      (backwards (mc/first-region-start))))
-        (search-function (ecase direction
-                           (forwards  'search-forward-regexp)
-                           (backwards 'search-backward-regexp)))
-        (match-point-getter (ecase direction
-                              (forwards 'match-beginning)
-                              (backwards 'match-end))))
-    (if (and skip-last (not furthest-cursor))
-        (error "No cursors to be skipped")
-      (mc/save-excursion
-       (goto-char start-char)
-       (when skip-last
-         (mc/remove-fake-cursor furthest-cursor))
-       (if (funcall search-function re nil t)
-           (progn
-             (push-mark (funcall match-point-getter 0))
-             (when point-out-of-order
-               (exchange-point-and-mark))
-             (mc/create-fake-cursor-at-point))
-         (error "no more matches found."))))))
-
-;;;###autoload
-(defun mc/mark-next-like-this (arg)
-  "Find and mark the next part of the buffer matching the currently active region
-With negative ARG, delete the last one instead.
-With zero ARG, skip the last one and mark next."
-  (interactive "p")
-  (if (region-active-p)
-      (if (< arg 0)
-          (let ((cursor (mc/furthest-cursor-after-point)))
-            (if cursor
-                (mc/remove-fake-cursor cursor)
-              (error "No cursors to be unmarked")))
-        (mc/mark-more-like-this (= arg 0) 'forwards))
-    (mc/mark-lines arg 'forwards))
-  (mc/maybe-multiple-cursors-mode))
-
-;;;###autoload
-(defun mc/mark-next-word-like-this (arg)
-  (interactive "p")
-  (let ((mc/enclose-search-term 'words))
-    (mc/mark-next-like-this arg)))
-
-;;;###autoload
-(defun mc/mark-next-symbol-like-this (arg)
-  (interactive "p")
-  (let ((mc/enclose-search-term 'symbols))
-    (mc/mark-next-like-this arg)))
-
-;;;###autoload
-(defun mc/mark-previous-like-this (arg)
-  "Find and mark the previous part of the buffer matching the currently active region
-With negative ARG, delete the last one instead.
-With zero ARG, skip the last one and mark next."
-  (interactive "p")
-  (if (region-active-p)
-      (if (< arg 0)
-          (let ((cursor (mc/furthest-cursor-before-point)))
-            (if cursor
-                (mc/remove-fake-cursor cursor)
-              (error "No cursors to be unmarked")))
-        (mc/mark-more-like-this (= arg 0) 'backwards))
-    (mc/mark-lines arg 'backwards))
-  (mc/maybe-multiple-cursors-mode))
-
-;;;###autoload
-(defun mc/mark-previous-word-like-this (arg)
-  (interactive "p")
-  (let ((mc/enclose-search-term 'words))
-    (mc/mark-previous-like-this arg)))
-
-;;;###autoload
-(defun mc/mark-previous-symbol-like-this (arg)
-  (interactive "p")
-  (let ((mc/enclose-search-term 'symbols))
-    (mc/mark-previous-like-this arg)))
-
-(defun mc/mark-lines (num-lines direction)
-  (dotimes (i num-lines)
-    (mc/create-fake-cursor-at-point)
-    (ecase direction
-      (forwards (loop do (next-logical-line 1 nil)
-                      while (mc/all-fake-cursors (point) (1+ (point)))))
-      (backwards (loop do (previous-logical-line 1 nil)
-                       while (mc/all-fake-cursors (point) (1+ (point))))))))
-
-;;;###autoload
-(defun mc/mark-next-lines (arg)
-  (interactive "p")
-  (mc/mark-lines arg 'forwards)
-  (mc/maybe-multiple-cursors-mode))
-
-;;;###autoload
-(defun mc/mark-previous-lines (arg)
-  (interactive "p")
-  (mc/mark-lines arg 'backwards)
-  (mc/maybe-multiple-cursors-mode))
-
-;;;###autoload
-(defun mc/unmark-next-like-this ()
-  "Deselect next part of the buffer matching the currently active region."
-  (interactive)
-  (mc/mark-next-like-this -1))
-
-;;;###autoload
-(defun mc/unmark-previous-like-this ()
-  "Deselect prev part of the buffer matching the currently active region."
-  (interactive)
-  (mc/mark-previous-like-this -1))
-
-;;;###autoload
-(defun mc/skip-to-next-like-this ()
-  "Skip the current one and select the next part of the buffer matching the currently active region."
-  (interactive)
-  (mc/mark-next-like-this 0))
-
-;;;###autoload
-(defun mc/skip-to-previous-like-this ()
-  "Skip the current one and select the prev part of the buffer matching the currently active region."
-  (interactive)
-  (mc/mark-previous-like-this 0))
-
-;;;###autoload
-(defun mc/mark-all-like-this ()
-  "Find and mark all the parts of the buffer matching the currently active region"
-  (interactive)
-  (unless (region-active-p)
-    (error "Mark a region to match first."))
-  (mc/remove-fake-cursors)
-  (let ((master (point))
-        (case-fold-search nil)
-        (point-first (< (point) (mark)))
-        (re (regexp-opt (mc/region-strings) mc/enclose-search-term)))
-    (mc/save-excursion
-     (goto-char 0)
-     (while (search-forward-regexp re nil t)
-       (push-mark (match-beginning 0))
-       (when point-first (exchange-point-and-mark))
-       (unless (= master (point))
-         (mc/create-fake-cursor-at-point))
-       (when point-first (exchange-point-and-mark)))))
-  (if (> (mc/num-cursors) 1)
-      (multiple-cursors-mode 1)
-    (multiple-cursors-mode 0)))
-
-(defun mc--select-thing-at-point (thing)
-  (let ((bound (bounds-of-thing-at-point thing)))
-    (when bound
-      (set-mark (car bound))
-      (goto-char (cdr bound))
-      bound)))
-
-(defun mc--select-thing-at-point-or-bark (thing)
-  (unless (or (region-active-p) (mc--select-thing-at-point thing))
-    (error "Mark a region or set cursor on a %s." thing)))
-
-;;;###autoload
-(defun mc/mark-all-words-like-this ()
-  (interactive)
-  (mc--select-thing-at-point-or-bark 'word)
-  (let ((mc/enclose-search-term 'words))
-    (mc/mark-all-like-this)))
-
-;;;###autoload
-(defun mc/mark-all-symbols-like-this ()
-  (interactive)
-  (mc--select-thing-at-point-or-bark 'symbol)
-  (let ((mc/enclose-search-term 'symbols))
-    (mc/mark-all-like-this)))
-
-;;;###autoload
-(defun mc/mark-all-in-region (beg end &optional search)
-  "Find and mark all the parts in the region matching the given search"
-  (interactive "r")
-  (let ((search (or search (read-from-minibuffer "Mark all in region: ")))
-        (case-fold-search nil))
-    (if (string= search "")
-        (message "Mark aborted")
-      (progn
-        (mc/remove-fake-cursors)
-        (goto-char beg)
-        (while (search-forward search end t)
-          (push-mark (match-beginning 0))
-          (mc/create-fake-cursor-at-point))
-        (let ((first (mc/furthest-cursor-before-point)))
-          (if (not first)
-              (error "Search failed for %S" search)
-            (mc/pop-state-from-overlay first)))
-        (if (> (mc/num-cursors) 1)
-            (multiple-cursors-mode 1)
-          (multiple-cursors-mode 0))))))
-
-;;;###autoload
-(defun mc/mark-all-in-region-regexp (beg end)
-  "Find and mark all the parts in the region matching the given regexp"
-  (interactive "r")
-  (let ((search (read-regexp "Mark regexp in region: "))
-        (case-fold-search nil))
-    (if (string= search "")
-        (message "Mark aborted")
-      (progn
-        (mc/remove-fake-cursors)
-        (goto-char beg)
-        (while (search-forward-regexp search end t)
-          (push-mark (match-beginning 0))
-          (mc/create-fake-cursor-at-point))
-        (let ((first (mc/furthest-cursor-before-point)))
-          (if (not first)
-              (error "Search failed for %S" search)
-            (mc/pop-state-from-overlay first)))
-        (if (> (mc/num-cursors) 1)
-            (multiple-cursors-mode 1)
-          (multiple-cursors-mode 0))))))
-
-(when (not (fboundp 'set-temporary-overlay-map))
-  ;; Backport this function from newer emacs versions
-  (defun set-temporary-overlay-map (map &optional keep-pred)
-    "Set a new keymap that will only exist for a short period of time.
-The new keymap to use must be given in the MAP variable. When to
-remove the keymap depends on user input and KEEP-PRED:
-
-- if KEEP-PRED is nil (the default), the keymap disappears as
-  soon as any key is pressed, whether or not the key is in MAP;
-
-- if KEEP-PRED is t, the keymap disappears as soon as a key *not*
-  in MAP is pressed;
-
-- otherwise, KEEP-PRED must be a 0-arguments predicate that will
-  decide if the keymap should be removed (if predicate returns
-  nil) or kept (otherwise). The predicate will be called after
-  each key sequence."
-
-    (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map"))
-           (overlaysym (make-symbol "t"))
-           (alist (list (cons overlaysym map)))
-           (clearfun
-            `(lambda ()
-               (unless ,(cond ((null keep-pred) nil)
-                              ((eq t keep-pred)
-                               `(eq this-command
-                                    (lookup-key ',map
-                                                (this-command-keys-vector))))
-                              (t `(funcall ',keep-pred)))
-                 (remove-hook 'pre-command-hook ',clearfunsym)
-                 (setq emulation-mode-map-alists
-                       (delq ',alist emulation-mode-map-alists))))))
-      (set overlaysym overlaysym)
-      (fset clearfunsym clearfun)
-      (add-hook 'pre-command-hook clearfunsym)
-
-      (push alist emulation-mode-map-alists))))
-
-;;;###autoload
-(defun mc/mark-more-like-this-extended ()
-  "Like mark-more-like-this, but then lets you adjust with arrows key.
-The adjustments work like this:
-
-   <up>    Mark previous like this and set direction to 'up
-   <down>  Mark next like this and set direction to 'down
-
-If direction is 'up:
-
-   <left>  Skip past the cursor furthest up
-   <right> Remove the cursor furthest up
-
-If direction is 'down:
-
-   <left>  Remove the cursor furthest down
-   <right> Skip past the cursor furthest down
-
-The bindings for these commands can be changed. See `mc/mark-more-like-this-extended-keymap'."
-  (interactive)
-  (mc/mmlte--down)
-  (set-temporary-overlay-map mc/mark-more-like-this-extended-keymap t))
-
-(defvar mc/mark-more-like-this-extended-direction nil
-  "When using mc/mark-more-like-this-extended are we working on the next or previous cursors?")
-
-(make-variable-buffer-local 'mc/mark-more-like-this-extended)
-
-(defun mc/mmlte--message ()
-  (if (eq mc/mark-more-like-this-extended-direction 'up)
-      (message "<up> to mark previous, <left> to skip, <right> to remove, <down> to mark next")
-    (message "<down> to mark next, <right> to skip, <left> to remove, <up> to mark previous")))
-
-(defun mc/mmlte--up ()
-  (interactive)
-  (mc/mark-previous-like-this 1)
-  (setq mc/mark-more-like-this-extended-direction 'up)
-  (mc/mmlte--message))
-
-(defun mc/mmlte--down ()
-  (interactive)
-  (mc/mark-next-like-this 1)
-  (setq mc/mark-more-like-this-extended-direction 'down)
-  (mc/mmlte--message))
-
-(defun mc/mmlte--left ()
-  (interactive)
-  (if (eq mc/mark-more-like-this-extended-direction 'down)
-      (mc/unmark-next-like-this)
-    (mc/skip-to-previous-like-this))
-  (mc/mmlte--message))
-
-(defun mc/mmlte--right ()
-  (interactive)
-  (if (eq mc/mark-more-like-this-extended-direction 'up)
-      (mc/unmark-previous-like-this)
-    (mc/skip-to-next-like-this))
-  (mc/mmlte--message))
-
-(defvar mc/mark-more-like-this-extended-keymap (make-sparse-keymap))
-
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<up>") 'mc/mmlte--up)
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<down>") 'mc/mmlte--down)
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<left>") 'mc/mmlte--left)
-(define-key mc/mark-more-like-this-extended-keymap (kbd "<right>") 'mc/mmlte--right)
-
-(defvar mc--restrict-mark-all-to-symbols nil)
-
-;;;###autoload
-(defun mc/mark-all-like-this-dwim (arg)
-  "Tries to guess what you want to mark all of.
-Can be pressed multiple times to increase selection.
-
-With prefix, it behaves the same as original `mc/mark-all-like-this'"
-  (interactive "P")
-  (if arg
-      (mc/mark-all-like-this)
-    (if (and (not (use-region-p))
-             (derived-mode-p 'sgml-mode)
-             (mc--on-tag-name-p))
-        (mc/mark-sgml-tag-pair)
-      (let ((before (mc/num-cursors)))
-        (unless (eq last-command 'mc/mark-all-like-this-dwim)
-          (setq mc--restrict-mark-all-to-symbols nil))
-        (unless (use-region-p)
-          (mc--mark-symbol-at-point)
-          (setq mc--restrict-mark-all-to-symbols t))
-        (if mc--restrict-mark-all-to-symbols
-            (mc/mark-all-symbols-like-this-in-defun)
-          (mc/mark-all-like-this-in-defun))
-        (when (<= (mc/num-cursors) before)
-          (if mc--restrict-mark-all-to-symbols
-              (mc/mark-all-symbols-like-this)
-            (mc/mark-all-like-this)))
-        (when (<= (mc/num-cursors) before)
-          (mc/mark-all-like-this))))))
-
-;;;###autoload
-(defun mc/mark-all-dwim (arg)
-  "Tries even harder to guess what you want to mark all of.
-
-If the region is active and spans multiple lines, it will behave
-as if `mc/mark-all-in-region'. With the prefix ARG, it will call
-`mc/edit-lines' instead.
-
-If the region is inactive or on a single line, it will behave like 
-`mc/mark-all-like-this-dwim'."
-  (interactive "P")
-  (if (and (use-region-p)
-           (not (> (mc/num-cursors) 1))
-           (not (= (line-number-at-pos (region-beginning))
-                   (line-number-at-pos (region-end)))))
-      (if arg
-          (call-interactively 'mc/edit-lines)
-       (call-interactively 'mc/mark-all-in-region))
-    (progn
-      (setq this-command 'mc/mark-all-like-this-dwim)
-      (mc/mark-all-like-this-dwim arg))))
-
-(defun mc--in-defun ()
-  (bounds-of-thing-at-point 'defun))
-
-;;;###autoload
-(defun mc/mark-all-like-this-in-defun ()
-  "Mark all like this in defun."
-  (interactive)
-  (if (mc--in-defun)
-      (save-restriction
-        (widen)
-        (narrow-to-defun)
-        (mc/mark-all-like-this))
-    (mc/mark-all-like-this)))
-
-;;;###autoload
-(defun mc/mark-all-words-like-this-in-defun ()
-  "Mark all words like this in defun."
-  (interactive)
-  (mc--select-thing-at-point-or-bark 'word)
-  (if (mc--in-defun)
-      (save-restriction
-        (widen)
-        (narrow-to-defun)
-        (mc/mark-all-words-like-this))
-    (mc/mark-all-words-like-this)))
-
-;;;###autoload
-(defun mc/mark-all-symbols-like-this-in-defun ()
-  "Mark all symbols like this in defun."
-  (interactive)
-  (mc--select-thing-at-point-or-bark 'symbol)
-  (if (mc--in-defun)
-      (save-restriction
-        (widen)
-        (narrow-to-defun)
-        (mc/mark-all-symbols-like-this))
-    (mc/mark-all-symbols-like-this)))
-
-(defun mc--mark-symbol-at-point ()
-  "Select the symbol under cursor"
-  (interactive)
-  (when (not (use-region-p))
-    (let ((b (bounds-of-thing-at-point 'symbol)))
-      (goto-char (car b))
-      (set-mark (cdr b)))))
-
-(defun mc--get-nice-sgml-context ()
-  (car
-   (last
-    (progn
-      (when (looking-at "<") (forward-char 1))
-      (when (looking-back ">") (forward-char -1))
-      (sgml-get-context)))))
-
-(defun mc--on-tag-name-p ()
-  (let* ((context (save-excursion (mc--get-nice-sgml-context)))
-         (tag-name-len (length (aref context 4)))
-         (beg (aref context 2))
-         (end (+ beg tag-name-len (if (eq 'open (aref context 1)) 1 3))))
-    (and context
-         (>= (point) beg)
-         (<= (point) end))))
-
-;;;###autoload
-(defun mc/add-cursor-on-click (event)
-  "Add a cursor where you click."
-  (interactive "e")
-  (mouse-minibuffer-check event)
-  ;; Use event-end in case called from mouse-drag-region.
-  ;; If EVENT is a click, event-end and event-start give same value.
-  (let ((position (event-end event)))
-    (if (not (windowp (posn-window position)))
-        (error "Position not in text area of window"))
-    (select-window (posn-window position))
-    (if (numberp (posn-point position))
-        (save-excursion
-          (goto-char (posn-point position))
-          (mc/create-fake-cursor-at-point)))
-    (mc/maybe-multiple-cursors-mode)))
-
-;;;###autoload
-(defun mc/mark-sgml-tag-pair ()
-  "Mark the tag we're in and its pair for renaming."
-  (interactive)
-  (when (not (mc--inside-tag-p))
-    (error "Place point inside tag to rename."))
-  (let ((context (mc--get-nice-sgml-context)))
-    (if (looking-at "</")
-        (setq context (car (last (sgml-get-context)))))
-    (goto-char (aref context 2))
-    (let* ((tag-name (aref context 4))
-           (num-chars (length tag-name))
-           (master-start (1+ (point)))
-           (mirror-end (save-excursion
-                         (sgml-skip-tag-forward 1)
-                         (1- (point)))))
-      (goto-char (- mirror-end num-chars))
-      (set-mark mirror-end)
-      (mc/create-fake-cursor-at-point)
-      (goto-char master-start)
-      (set-mark (+ (point) num-chars))))
-  (mc/maybe-multiple-cursors-mode))
-
-(defun mc--inside-tag-p ()
-  (save-excursion
-    (not (null (sgml-get-context)))))
-
-(provide 'mc-mark-more)
-
-;;; mc-mark-more.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-separate-operations.el b/emacs.d/elpa/multiple-cursors-20150528.2303/mc-separate-operations.el
deleted file mode 100644
index b587530..0000000
--- a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-separate-operations.el
+++ /dev/null
@@ -1,121 +0,0 @@
-;;; mc-separate-operations.el - functions that work differently on each cursor
-
-;; Copyright (C) 2012 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Keywords: editing cursors
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file contains functions that work differently on each cursor,
-;; instead of treating all of them the same.
-
-;; Please see multiple-cursors.el for more commentary.
-
-;;; Code:
-
-(require 'multiple-cursors-core)
-
-;;;###autoload
-(defun mc/insert-numbers (arg)
-  "Insert increasing numbers for each cursor, starting at 0 or ARG."
-  (interactive "P")
-  (setq mc--insert-numbers-number (or arg 0))
-  (mc/for-each-cursor-ordered
-   (mc/execute-command-for-fake-cursor 'mc--insert-number-and-increase cursor)))
-
-(defvar mc--insert-numbers-number 0)
-
-(defun mc--insert-number-and-increase ()
-  (interactive)
-  (insert (number-to-string mc--insert-numbers-number))
-  (setq mc--insert-numbers-number (1+ mc--insert-numbers-number)))
-
-(defun mc--ordered-region-strings ()
-  (let (strings)
-    (save-excursion
-      (mc/for-each-cursor-ordered
-       (setq strings (cons (buffer-substring-no-properties
-                            (mc/cursor-beg cursor)
-                            (mc/cursor-end cursor)) strings))))
-    (nreverse strings)))
-
-(defvar mc--strings-to-replace nil)
-
-(defun mc--replace-region-strings-1 ()
-  (interactive)
-  (delete-region (region-beginning) (region-end))
-  (save-excursion (insert (car mc--strings-to-replace)))
-  (setq mc--strings-to-replace (cdr mc--strings-to-replace)))
-
-(defun mc--replace-region-strings ()
-  (mc/for-each-cursor-ordered
-   (mc/execute-command-for-fake-cursor 'mc--replace-region-strings-1 cursor)))
-
-;;;###autoload
-(defun mc/reverse-regions ()
-  (interactive)
-  (if (not multiple-cursors-mode)
-      (progn
-        (mc/mark-next-lines 1)
-        (mc/reverse-regions)
-        (multiple-cursors-mode 0))
-    (unless (use-region-p)
-      (mc/execute-command-for-all-cursors 'mark-sexp))
-    (setq mc--strings-to-replace (nreverse (mc--ordered-region-strings)))
-    (mc--replace-region-strings)))
-
-;;;###autoload
-(defun mc/sort-regions ()
-  (interactive)
-  (unless (use-region-p)
-    (mc/execute-command-for-all-cursors 'mark-sexp))
-  (setq mc--strings-to-replace (sort (mc--ordered-region-strings) 'string<))
-  (mc--replace-region-strings))
-
-
-;;;###autoload
-(defun mc/vertical-align (character)
-  "Aligns all cursors vertically with a given CHARACTER to the one with the
-highest colum number (the rightest).
-Might not behave as intended if more than one cursors are on the same line."
-  (interactive "c")
-  (let ((rightest-column (current-column)))
-    (mc/execute-command-for-all-cursors 
-     (lambda () "get the rightest cursor"
-       (interactive)
-       (setq rightest-column (max (current-column) rightest-column))
-       ))
-    (mc/execute-command-for-all-cursors 
-     (lambda () 
-       (interactive)
-       (let ((missing-spaces (- rightest-column (current-column))))
-	 (save-excursion (insert (make-string missing-spaces character)))
-	 (forward-char missing-spaces)
-	 )
-       ))
-      )
-    )
-
-;;;###autoload
-(defun mc/vertical-align-with-space ()
-  "Aligns all cursors with whitespace like `mc/vertical-align' does"
-  (interactive)
-  (mc/vertical-align 32)
-  )
-
-(provide 'mc-separate-operations)
-;;; mc-separate-operations.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-autoloads.el b/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-autoloads.el
deleted file mode 100644
index c2ec4f7..0000000
--- a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-autoloads.el
+++ /dev/null
@@ -1,297 +0,0 @@
-;;; multiple-cursors-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "mc-edit-lines" "mc-edit-lines.el" (21898 47966
-;;;;;;  0 0))
-;;; Generated autoloads from mc-edit-lines.el
-
-(autoload 'mc/edit-lines "mc-edit-lines" "\
-Add one cursor to each line of the active region.
-Starts from mark and moves in straight down or up towards the
-line point is on.
-
-What is done with lines which are not long enough is governed by
-`mc/edit-lines-empty-lines'.  The prefix argument ARG can be used
-to override this.  If ARG is a symbol (when called from Lisp),
-that symbol is used instead of `mc/edit-lines-empty-lines'.
-Otherwise, if ARG negative, short lines will be ignored.  Any
-other non-nil value will cause short lines to be padded.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'mc/edit-ends-of-lines "mc-edit-lines" "\
-Add one cursor to the end of each line in the active region.
-
-\(fn)" t nil)
-
-(autoload 'mc/edit-beginnings-of-lines "mc-edit-lines" "\
-Add one cursor to the beginning of each line in the active region.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "mc-hide-unmatched-lines-mode" "mc-hide-unmatched-lines-mode.el"
-;;;;;;  (21898 47966 0 0))
-;;; Generated autoloads from mc-hide-unmatched-lines-mode.el
-
-(autoload 'mc-hide-unmatched-lines-mode "mc-hide-unmatched-lines-mode" "\
-Minor mode when enabled hides all lines where no cursors (and
-also hum/lines-to-expand below and above) To make use of this
-mode press \"C-'\" while multiple-cursor-mode is active. You can
-still edit lines while you are in mc-hide-unmatched-lines
-mode. To leave this mode press <return> or \"C-g\"
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "mc-mark-more" "mc-mark-more.el" (21898 47966
-;;;;;;  0 0))
-;;; Generated autoloads from mc-mark-more.el
-
-(autoload 'mc/mark-next-like-this "mc-mark-more" "\
-Find and mark the next part of the buffer matching the currently active region
-With negative ARG, delete the last one instead.
-With zero ARG, skip the last one and mark next.
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-next-word-like-this "mc-mark-more" "\
-
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-next-symbol-like-this "mc-mark-more" "\
-
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-previous-like-this "mc-mark-more" "\
-Find and mark the previous part of the buffer matching the currently active region
-With negative ARG, delete the last one instead.
-With zero ARG, skip the last one and mark next.
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-previous-word-like-this "mc-mark-more" "\
-
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-previous-symbol-like-this "mc-mark-more" "\
-
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-next-lines "mc-mark-more" "\
-
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-previous-lines "mc-mark-more" "\
-
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/unmark-next-like-this "mc-mark-more" "\
-Deselect next part of the buffer matching the currently active region.
-
-\(fn)" t nil)
-
-(autoload 'mc/unmark-previous-like-this "mc-mark-more" "\
-Deselect prev part of the buffer matching the currently active region.
-
-\(fn)" t nil)
-
-(autoload 'mc/skip-to-next-like-this "mc-mark-more" "\
-Skip the current one and select the next part of the buffer matching the currently active region.
-
-\(fn)" t nil)
-
-(autoload 'mc/skip-to-previous-like-this "mc-mark-more" "\
-Skip the current one and select the prev part of the buffer matching the currently active region.
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-like-this "mc-mark-more" "\
-Find and mark all the parts of the buffer matching the currently active region
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-words-like-this "mc-mark-more" "\
-
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-symbols-like-this "mc-mark-more" "\
-
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-in-region "mc-mark-more" "\
-Find and mark all the parts in the region matching the given search
-
-\(fn BEG END &optional SEARCH)" t nil)
-
-(autoload 'mc/mark-all-in-region-regexp "mc-mark-more" "\
-Find and mark all the parts in the region matching the given regexp
-
-\(fn BEG END)" t nil)
-
-(autoload 'mc/mark-more-like-this-extended "mc-mark-more" "\
-Like mark-more-like-this, but then lets you adjust with arrows key.
-The adjustments work like this:
-
-   <up>    Mark previous like this and set direction to 'up
-   <down>  Mark next like this and set direction to 'down
-
-If direction is 'up:
-
-   <left>  Skip past the cursor furthest up
-   <right> Remove the cursor furthest up
-
-If direction is 'down:
-
-   <left>  Remove the cursor furthest down
-   <right> Skip past the cursor furthest down
-
-The bindings for these commands can be changed. See `mc/mark-more-like-this-extended-keymap'.
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-like-this-dwim "mc-mark-more" "\
-Tries to guess what you want to mark all of.
-Can be pressed multiple times to increase selection.
-
-With prefix, it behaves the same as original `mc/mark-all-like-this'
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-all-dwim "mc-mark-more" "\
-Tries even harder to guess what you want to mark all of.
-
-If the region is active and spans multiple lines, it will behave
-as if `mc/mark-all-in-region'. With the prefix ARG, it will call
-`mc/edit-lines' instead.
-
-If the region is inactive or on a single line, it will behave like
-`mc/mark-all-like-this-dwim'.
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/mark-all-like-this-in-defun "mc-mark-more" "\
-Mark all like this in defun.
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-words-like-this-in-defun "mc-mark-more" "\
-Mark all words like this in defun.
-
-\(fn)" t nil)
-
-(autoload 'mc/mark-all-symbols-like-this-in-defun "mc-mark-more" "\
-Mark all symbols like this in defun.
-
-\(fn)" t nil)
-
-(autoload 'mc/add-cursor-on-click "mc-mark-more" "\
-Add a cursor where you click.
-
-\(fn EVENT)" t nil)
-
-(autoload 'mc/mark-sgml-tag-pair "mc-mark-more" "\
-Mark the tag we're in and its pair for renaming.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "mc-mark-pop" "mc-mark-pop.el" (21898 47966
-;;;;;;  0 0))
-;;; Generated autoloads from mc-mark-pop.el
-
-(autoload 'mc/mark-pop "mc-mark-pop" "\
-Add a cursor at the current point, pop off mark ring and jump
-to the popped mark.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "mc-separate-operations" "mc-separate-operations.el"
-;;;;;;  (21898 47966 0 0))
-;;; Generated autoloads from mc-separate-operations.el
-
-(autoload 'mc/insert-numbers "mc-separate-operations" "\
-Insert increasing numbers for each cursor, starting at 0 or ARG.
-
-\(fn ARG)" t nil)
-
-(autoload 'mc/reverse-regions "mc-separate-operations" "\
-
-
-\(fn)" t nil)
-
-(autoload 'mc/sort-regions "mc-separate-operations" "\
-
-
-\(fn)" t nil)
-
-(autoload 'mc/vertical-align "mc-separate-operations" "\
-Aligns all cursors vertically with a given CHARACTER to the one with the
-highest colum number (the rightest).
-Might not behave as intended if more than one cursors are on the same line.
-
-\(fn CHARACTER)" t nil)
-
-(autoload 'mc/vertical-align-with-space "mc-separate-operations" "\
-Aligns all cursors with whitespace like `mc/vertical-align' does
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "multiple-cursors-core" "multiple-cursors-core.el"
-;;;;;;  (21898 47966 0 0))
-;;; Generated autoloads from multiple-cursors-core.el
-
-(autoload 'multiple-cursors-mode "multiple-cursors-core" "\
-Mode while multiple cursors are active.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "rectangular-region-mode" "rectangular-region-mode.el"
-;;;;;;  (21898 47966 0 0))
-;;; Generated autoloads from rectangular-region-mode.el
-
-(autoload 'set-rectangular-region-anchor "rectangular-region-mode" "\
-Anchors the rectangular region at point.
-
-Think of this one as `set-mark' except you're marking a rectangular region. It is
-an exceedingly quick way of adding multiple cursors to multiple lines.
-
-\(fn)" t nil)
-
-(autoload 'rectangular-region-mode "rectangular-region-mode" "\
-A mode for creating a rectangular region to edit
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("mc-cycle-cursors.el" "multiple-cursors-pkg.el"
-;;;;;;  "multiple-cursors.el") (21898 47966 449261 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; multiple-cursors-autoloads.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-core.el b/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-core.el
deleted file mode 100644
index 8971a42..0000000
--- a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-core.el
+++ /dev/null
@@ -1,735 +0,0 @@
-;;; multiple-cursors-core.el --- An experiment in multiple cursors for emacs.
-
-;; Copyright (C) 2012 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Keywords: editing cursors
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file contains the core functionality of multiple-cursors.
-;; Please see multiple-cursors.el for more commentary.
-
-;;; Code:
-
-(require 'cl)
-
-(require 'rect)
-
-(defvar mc--read-char)
-
-(defface mc/cursor-face
-  '((t (:inverse-video t)))
-  "The face used for fake cursors"
-  :group 'multiple-cursors)
-
-(defface mc/region-face
-  '((t :inherit region))
-  "The face used for fake regions"
-  :group 'multiple-cursors)
-
-(defmacro mc/add-fake-cursor-to-undo-list (&rest forms)
-  "Make sure point is in the right place when undoing"
-  (let ((uc (make-symbol "undo-cleaner")))
-    `(let ((,uc (cons 'apply (cons 'deactivate-cursor-after-undo (list id)))))
-       (setq buffer-undo-list (cons ,uc buffer-undo-list))
-       ,@forms
-       (if (eq ,uc (car buffer-undo-list)) ;; if nothing has been added to the undo-list
-           (setq buffer-undo-list (cdr buffer-undo-list)) ;; then pop the cleaner right off again
-         (setq buffer-undo-list ;; otherwise add a function to activate this cursor
-               (cons (cons 'apply (cons 'activate-cursor-for-undo (list id))) buffer-undo-list))))))
-
-(defun mc/all-fake-cursors (&optional start end)
-  (remove-if-not 'mc/fake-cursor-p
-                 (overlays-in (or start (point-min))
-                              (or end   (point-max)))))
-
-(defmacro mc/for-each-fake-cursor (&rest forms)
-  "Runs the body for each fake cursor, bound to the name cursor"
-  `(mapc #'(lambda (cursor) ,@forms)
-         (mc/all-fake-cursors)))
-
-(defmacro mc/save-excursion (&rest forms)
-  "Saves and restores all the state that multiple-cursors cares about."
-  (let ((cs (make-symbol "current-state")))
-    `(let ((,cs (mc/store-current-state-in-overlay
-                 (make-overlay (point) (point) nil nil t))))
-       (overlay-put ,cs 'type 'original-cursor)
-       (save-excursion ,@forms)
-       (mc/pop-state-from-overlay ,cs))))
-
-(defun mc--compare-by-overlay-start (o1 o2)
-  (< (overlay-start o1) (overlay-start o2)))
-
-(defmacro mc/for-each-cursor-ordered (&rest forms)
-  "Runs the body for each cursor, fake and real, bound to the name cursor"
-  (let ((rci (make-symbol "real-cursor-id")))
-    `(let ((,rci (overlay-get (mc/create-fake-cursor-at-point) 'mc-id)))
-       (mapc #'(lambda (cursor)
-                 (when (mc/fake-cursor-p cursor)
-                   ,@forms))
-             (sort (overlays-in (point-min) (point-max)) 'mc--compare-by-overlay-start))
-       (mc/pop-state-from-overlay (mc/cursor-with-id ,rci)))))
-
-(defmacro mc/save-window-scroll (&rest forms)
-  "Saves and restores the window scroll position"
-  (let ((p (make-symbol "p"))
-        (s (make-symbol "start"))
-        (h (make-symbol "hscroll")))
-    `(let ((,p (set-marker (make-marker) (point)))
-           (,s (set-marker (make-marker) (window-start)))
-           (,h (window-hscroll)))
-       ,@forms
-       (goto-char ,p)
-       (set-window-start nil ,s t)
-       (set-window-hscroll nil ,h)
-       (set-marker ,p nil)
-       (set-marker ,s nil))))
-
-(defun mc/make-cursor-overlay-at-eol (pos)
-  "Create overlay to look like cursor at end of line."
-  (let ((overlay (make-overlay pos pos nil nil nil)))
-    (overlay-put overlay 'after-string (propertize " " 'face 'mc/cursor-face))
-    overlay))
-
-(defun mc/make-cursor-overlay-inline (pos)
-  "Create overlay to look like cursor inside text."
-  (let ((overlay (make-overlay pos (1+ pos) nil nil nil)))
-    (overlay-put overlay 'face 'mc/cursor-face)
-    overlay))
-
-(defun mc/make-cursor-overlay-at-point ()
-  "Create overlay to look like cursor.
-Special case for end of line, because overlay over a newline
-highlights the entire width of the window."
-  (if (eolp)
-      (mc/make-cursor-overlay-at-eol (point))
-    (mc/make-cursor-overlay-inline (point))))
-
-(defun mc/make-region-overlay-between-point-and-mark ()
-  "Create overlay to look like active region."
-  (let ((overlay (make-overlay (mark) (point) nil nil t)))
-    (overlay-put overlay 'face 'mc/region-face)
-    (overlay-put overlay 'type 'additional-region)
-    overlay))
-
-(defvar mc/cursor-specific-vars '(transient-mark-mode
-                                  kill-ring
-                                  kill-ring-yank-pointer
-                                  mark-ring
-                                  mark-active
-                                  yank-undo-function
-                                  autopair-action
-                                  autopair-wrap-action
-                                  er/history)
-  "A list of vars that need to be tracked on a per-cursor basis.")
-
-(defun mc/store-current-state-in-overlay (o)
-  "Store relevant info about point and mark in the given overlay."
-  (overlay-put o 'point (set-marker (make-marker) (point)))
-  (overlay-put o 'mark (set-marker (make-marker) (mark)))
-  (dolist (var mc/cursor-specific-vars)
-    (when (boundp var) (overlay-put o var (symbol-value var))))
-  o)
-
-(defun mc/restore-state-from-overlay (o)
-  "Restore point and mark from stored info in the given overlay."
-  (goto-char (overlay-get o 'point))
-  (set-marker (mark-marker) (overlay-get o 'mark))
-  (dolist (var mc/cursor-specific-vars)
-    (when (boundp var) (set var (overlay-get o var)))))
-
-(defun mc/remove-fake-cursor (o)
-  "Delete overlay with state, including dependent overlays and markers."
-  (set-marker (overlay-get o 'point) nil)
-  (set-marker (overlay-get o 'mark) nil)
-  (mc/delete-region-overlay o)
-  (delete-overlay o))
-
-(defun mc/pop-state-from-overlay (o)
-  "Restore the state stored in given overlay and then remove the overlay."
-  (mc/restore-state-from-overlay o)
-  (mc/remove-fake-cursor o))
-
-(defun mc/delete-region-overlay (o)
-  "Remove the dependent region overlay for a given cursor overlay."
-  (ignore-errors
-    (delete-overlay (overlay-get o 'region-overlay))))
-
-(defvar mc--current-cursor-id 0
-  "Var to store increasing id of fake cursors, used to keep track of them for undo.")
-
-(defun mc/create-cursor-id ()
-  "Returns a unique cursor id"
-  (incf mc--current-cursor-id))
-
-(defun mc/create-fake-cursor-at-point (&optional id)
-  "Add a fake cursor and possibly a fake active region overlay based on point and mark.
-Saves the current state in the overlay to be restored later."
-  (let ((overlay (mc/make-cursor-overlay-at-point)))
-    (overlay-put overlay 'mc-id (or id (mc/create-cursor-id)))
-    (overlay-put overlay 'type 'fake-cursor)
-    (overlay-put overlay 'priority 100)
-    (mc/store-current-state-in-overlay overlay)
-    (when (use-region-p)
-      (overlay-put overlay 'region-overlay
-                   (mc/make-region-overlay-between-point-and-mark)))
-    overlay))
-
-(defun mc/execute-command (cmd)
-  "Run command, simulating the parts of the command loop that makes sense for fake cursors."
-  (setq this-command cmd)
-  (run-hooks 'pre-command-hook)
-  (unless (eq this-command 'ignore)
-    (call-interactively cmd))
-  (run-hooks 'post-command-hook)
-  (when deactivate-mark (deactivate-mark)))
-
-(defvar mc--executing-command-for-fake-cursor nil)
-
-(defun mc/execute-command-for-fake-cursor (cmd cursor)
-  (let ((mc--executing-command-for-fake-cursor t)
-        (id (overlay-get cursor 'mc-id))
-        (annoying-arrows-mode nil)
-        (smooth-scroll-margin 0))
-    (mc/add-fake-cursor-to-undo-list
-     (mc/pop-state-from-overlay cursor)
-     (ignore-errors
-       (mc/execute-command cmd)
-       (mc/create-fake-cursor-at-point id)))))
-
-(defun mc/execute-command-for-all-fake-cursors (cmd)
-  "Calls CMD interactively for each cursor.
-It works by moving point to the fake cursor, setting
-up the proper environment, and then removing the cursor.
-After executing the command, it sets up a new fake
-cursor with updated info."
-  (mc/save-excursion
-   (mc/save-window-scroll
-    (mc/for-each-fake-cursor
-     (save-excursion
-       (mc/execute-command-for-fake-cursor cmd cursor)))))
-  (mc--reset-read-prompts))
-
-(defun mc/execute-command-for-all-cursors (cmd)
-  "Calls CMD interactively for the real cursor and all fakes."
-  (call-interactively cmd)
-  (mc/execute-command-for-all-fake-cursors cmd))
-
-;; Intercept some reading commands so you won't have to
-;; answer them for every single cursor
-
-(defvar mc--read-char nil)
-(defvar multiple-cursors-mode nil)
-(defadvice read-char (around mc-support activate)
-  (if (not multiple-cursors-mode)
-      ad-do-it
-    (unless mc--read-char
-      (setq mc--read-char ad-do-it))
-    (setq ad-return-value mc--read-char)))
-
-(defvar mc--read-quoted-char nil)
-(defadvice read-quoted-char (around mc-support activate)
-  (if (not multiple-cursors-mode)
-      ad-do-it
-    (unless mc--read-quoted-char
-      (setq mc--read-quoted-char ad-do-it))
-    (setq ad-return-value mc--read-quoted-char)))
-
-(defun mc--reset-read-prompts ()
-  (setq mc--read-char nil)
-  (setq mc--read-quoted-char nil))
-
-(mc--reset-read-prompts)
-
-(defun mc/fake-cursor-p (o)
-  "Predicate to check if an overlay is a fake cursor"
-  (eq (overlay-get o 'type) 'fake-cursor))
-
-(defun mc/cursor-with-id (id)
-  "Find the first cursor with the given id, or nil"
-  (find-if #'(lambda (o) (and (mc/fake-cursor-p o)
-                              (= id (overlay-get o 'mc-id))))
-           (overlays-in (point-min) (point-max))))
-
-(defvar mc--stored-state-for-undo nil
-  "Variable to keep the state of the real cursor while undoing a fake one")
-
-(defun activate-cursor-for-undo (id)
-  "Called when undoing to temporarily activate the fake cursor which action is being undone."
-  (let ((cursor (mc/cursor-with-id id)))
-    (when cursor
-      (setq mc--stored-state-for-undo (mc/store-current-state-in-overlay
-                                       (make-overlay (point) (point) nil nil t)))
-      (mc/pop-state-from-overlay cursor))))
-
-(defun deactivate-cursor-after-undo (id)
-  "Called when undoing to reinstate the real cursor after undoing a fake one."
-  (when mc--stored-state-for-undo
-    (mc/create-fake-cursor-at-point id)
-    (mc/pop-state-from-overlay mc--stored-state-for-undo)
-    (setq mc--stored-state-for-undo nil)))
-
-(defun mc/prompt-for-inclusion-in-whitelist (original-command)
-  "Asks the user, then adds the command either to the once-list or the all-list."
-  (let ((all-p (y-or-n-p (format "Do %S for all cursors?" original-command))))
-    (if all-p
-        (add-to-list 'mc/cmds-to-run-for-all original-command)
-      (add-to-list 'mc/cmds-to-run-once original-command))
-    (mc/save-lists)
-    all-p))
-
-(defun mc/num-cursors ()
-  "The number of cursors (real and fake) in the buffer."
-  (1+ (count-if 'mc/fake-cursor-p
-                (overlays-in (point-min) (point-max)))))
-
-(defvar mc--this-command nil
-  "Used to store the original command being run.")
-(make-variable-buffer-local 'mc--this-command)
-
-(defun mc/make-a-note-of-the-command-being-run ()
-  "Used with pre-command-hook to store the original command being run.
-Since that cannot be reliably determined in the post-command-hook.
-
-Specifically, this-original-command isn't always right, because it could have
-been remapped. And certain modes (cua comes to mind) will change their
-remapping based on state. So a command that changes the state will afterwards
-not be recognized through the command-remapping lookup."
-  (unless mc--executing-command-for-fake-cursor
-    (let ((cmd (or (command-remapping this-original-command)
-                   this-original-command)))
-      (setq mc--this-command (and (not (eq cmd 'god-mode-self-insert))
-                                  cmd)))))
-
-(defun mc/execute-this-command-for-all-cursors ()
-  "Wrap around `mc/execute-this-command-for-all-cursors-1' to protect hook."
-  (condition-case error
-      (mc/execute-this-command-for-all-cursors-1)
-    (error
-     (message "[mc] problem in `mc/execute-this-command-for-all-cursors': %s"
-              (error-message-string error)))))
-
-;; execute-kbd-macro should never be run for fake cursors. The real cursor will
-;; execute the keyboard macro, resulting in new commands in the command loop,
-;; and the fake cursors can pick up on those instead.
-(defadvice execute-kbd-macro (around skip-fake-cursors activate)
-  (unless mc--executing-command-for-fake-cursor
-    ad-do-it))
-
-(defun mc/execute-this-command-for-all-cursors-1 ()
-  "Used with post-command-hook to execute supported commands for all cursors.
-
-It uses two lists of commands to know what to do: the run-once
-list and the run-for-all list. If a command is in neither of these lists,
-it will prompt for the proper action and then save that preference.
-
-Some commands are so unsupported that they are even prevented for
-the original cursor, to inform about the lack of support."
-  (unless mc--executing-command-for-fake-cursor
-
-    (if (eq 1 (mc/num-cursors)) ;; no fake cursors? disable mc-mode
-        (multiple-cursors-mode 0)
-      (when this-original-command
-        (let ((original-command (or mc--this-command
-                                    (command-remapping this-original-command)
-                                    this-original-command)))
-
-          ;; skip keyboard macros, since they will generate actual commands that are
-          ;; also run in the command loop - we'll handle those later instead.
-          (when (functionp original-command)
-
-            ;; if it's a lambda, we can't know if it's supported or not
-            ;; - so go ahead and assume it's ok, because we're just optimistic like that
-            (if (or (not (symbolp original-command))
-                    ;; lambda registered by smartrep
-                    (string-prefix-p "(" (symbol-name original-command)))
-                (mc/execute-command-for-all-fake-cursors original-command)
-
-              ;; smartrep `intern's commands into own obarray to help
-              ;; `describe-bindings'.  So, let's re-`intern' here to
-              ;; make the command comparable by `eq'.
-              (setq original-command (intern (symbol-name original-command)))
-
-              ;; otherwise it's a symbol, and we can be more thorough
-              (if (get original-command 'mc--unsupported)
-                  (message "%S is not supported with multiple cursors%s"
-                           original-command
-                           (get original-command 'mc--unsupported))
-                (when (and original-command
-                           (not (memq original-command mc--default-cmds-to-run-once))
-                           (not (memq original-command mc/cmds-to-run-once))
-                           (or (memq original-command mc--default-cmds-to-run-for-all)
-                               (memq original-command mc/cmds-to-run-for-all)
-                               (mc/prompt-for-inclusion-in-whitelist original-command)))
-                  (mc/execute-command-for-all-fake-cursors original-command))))))))))
-
-(defun mc/remove-fake-cursors ()
-  "Remove all fake cursors.
-Do not use to conclude editing with multiple cursors. For that
-you should disable multiple-cursors-mode."
-  (mc/for-each-fake-cursor
-   (mc/remove-fake-cursor cursor)))
-
-(defun mc/keyboard-quit ()
-  "Deactivate mark if there are any active, otherwise exit multiple-cursors-mode."
-  (interactive)
-  (if (not (use-region-p))
-      (multiple-cursors-mode 0)
-    (deactivate-mark)))
-
-(defvar mc/keymap nil
-  "Keymap while multiple cursors are active.
-Main goal of the keymap is to rebind C-g and <return> to conclude
-multiple cursors editing.")
-(unless mc/keymap
-  (setq mc/keymap (make-sparse-keymap))
-  (define-key mc/keymap (kbd "C-g") 'mc/keyboard-quit)
-  (define-key mc/keymap (kbd "<return>") 'multiple-cursors-mode)
-  (when (fboundp 'phi-search)
-    (define-key mc/keymap (kbd "C-s") 'phi-search))
-  (when (fboundp 'phi-search-backward)
-    (define-key mc/keymap (kbd "C-r") 'phi-search-backward)))
-
-(defun mc--all-equal (list)
-  "Are all the items in LIST equal?"
-  (let ((first (car list))
-        (all-equal t))
-    (while (and all-equal list)
-      (setq all-equal (equal first (car list)))
-      (setq list (cdr list)))
-    all-equal))
-
-(defun mc--kill-ring-entries ()
-  "Return the latest kill-ring entry for each cursor.
-The entries are returned in the order they are found in the buffer."
-  (let (entries)
-    (mc/for-each-cursor-ordered
-     (setq entries (cons (car (overlay-get cursor 'kill-ring)) entries)))
-    (reverse entries)))
-
-(defun mc--maybe-set-killed-rectangle ()
-  "Add the latest kill-ring entry for each cursor to killed-rectangle.
-So you can paste it in later with `yank-rectangle'."
-  (let ((entries (mc--kill-ring-entries)))
-    (unless (mc--all-equal entries)
-      (setq killed-rectangle entries))))
-
-(defvar mc/unsupported-minor-modes '(company-mode auto-complete-mode flyspell-mode jedi-mode)
-  "List of minor-modes that does not play well with multiple-cursors.
-They are temporarily disabled when multiple-cursors are active.")
-
-(defvar mc/temporarily-disabled-minor-modes nil
-  "The list of temporarily disabled minor-modes.")
-(make-variable-buffer-local 'mc/temporarily-disabled-minor-modes)
-
-(defun mc/temporarily-disable-minor-mode (mode)
-  "If MODE is available and turned on, remember that and turn it off."
-  (when (and (boundp mode) (eval mode))
-    (add-to-list 'mc/temporarily-disabled-minor-modes mode)
-    (funcall mode -1)))
-
-(defun mc/temporarily-disable-unsupported-minor-modes ()
-  (mapc 'mc/temporarily-disable-minor-mode mc/unsupported-minor-modes))
-
-(defun mc/enable-minor-mode (mode)
-  (funcall mode 1))
-
-(defun mc/enable-temporarily-disabled-minor-modes ()
-  (mapc 'mc/enable-minor-mode mc/temporarily-disabled-minor-modes)
-  (setq mc/temporarily-disabled-minor-modes nil))
-
-(defcustom mc/mode-line
-  `(" mc:" (:eval (format ,(propertize "%d" 'face 'font-lock-warning-face)
-                          (mc/num-cursors))))
-  "What to display in the mode line while multiple-cursors-mode is active."
-  :group 'multiple-cursors)
-(put 'mc/mode-line 'risky-local-variable t)
-
-;;;###autoload
-(define-minor-mode multiple-cursors-mode
-  "Mode while multiple cursors are active."
-  nil mc/mode-line mc/keymap
-  (if multiple-cursors-mode
-      (progn
-        (mc/temporarily-disable-unsupported-minor-modes)
-        (add-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run nil t)
-        (add-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t t)
-        (run-hooks 'multiple-cursors-mode-enabled-hook))
-    (remove-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t)
-    (remove-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run t)
-    (setq mc--this-command nil)
-    (mc--maybe-set-killed-rectangle)
-    (mc/remove-fake-cursors)
-    (mc/enable-temporarily-disabled-minor-modes)
-    (run-hooks 'multiple-cursors-mode-disabled-hook)))
-
-(add-hook 'after-revert-hook #'(lambda () (multiple-cursors-mode 0)))
-
-(defun mc/maybe-multiple-cursors-mode ()
-  "Enable multiple-cursors-mode if there is more than one currently active cursor."
-  (if (> (mc/num-cursors) 1)
-      (multiple-cursors-mode 1)
-    (multiple-cursors-mode 0)))
-
-(defmacro unsupported-cmd (cmd msg)
-  "Adds command to list of unsupported commands and prevents it
-from being executed if in multiple-cursors-mode."
-  `(progn
-     (put (quote ,cmd) 'mc--unsupported ,msg)
-     (defadvice ,cmd (around unsupported-advice activate)
-       "command isn't supported with multiple cursors"
-       (unless (and multiple-cursors-mode (called-interactively-p 'any))
-         ad-do-it))))
-
-;; Commands that does not work with multiple-cursors
-(unsupported-cmd isearch-forward ". Feel free to add a compatible version.")
-(unsupported-cmd isearch-backward ". Feel free to add a compatible version.")
-
-;; Make sure pastes from other programs are added to all kill-rings when yanking
-(defadvice current-kill (before interprogram-paste-for-all-cursors activate)
-  (let ((interprogram-paste (and (= n 0)
-                                 interprogram-paste-function
-                                 (funcall interprogram-paste-function))))
-    (when interprogram-paste
-      ;; Add interprogram-paste to normal kill ring, just
-      ;; like current-kill usually does for itself.
-      ;; We have to do the work for it tho, since the funcall only returns
-      ;; something once. It is not a pure function.
-      (let ((interprogram-cut-function nil))
-        (if (listp interprogram-paste)
-            (mapc 'kill-new (nreverse interprogram-paste))
-          (kill-new interprogram-paste))
-        ;; And then add interprogram-paste to the kill-rings
-        ;; of all the other cursors too.
-        (mc/for-each-fake-cursor
-         (let ((kill-ring (overlay-get cursor 'kill-ring))
-               (kill-ring-yank-pointer (overlay-get cursor 'kill-ring-yank-pointer)))
-           (if (listp interprogram-paste)
-               (mapc 'kill-new (nreverse interprogram-paste))
-             (kill-new interprogram-paste))
-           (overlay-put cursor 'kill-ring kill-ring)
-           (overlay-put cursor 'kill-ring-yank-pointer kill-ring-yank-pointer)))))))
-
-(defvar mc/list-file (locate-user-emacs-file ".mc-lists.el")
-  "The position of the file that keeps track of your preferences
-for running commands with multiple cursors.")
-
-(defun mc/dump-list (list-symbol)
-  "Insert (setq 'LIST-SYMBOL LIST-VALUE) to current buffer."
-  (symbol-macrolet ((value (symbol-value list-symbol)))
-    (insert "(setq " (symbol-name list-symbol) "\n"
-            "      '(")
-    (newline-and-indent)
-    (set list-symbol
-         (sort value (lambda (x y) (string-lessp (symbol-name x)
-                                                 (symbol-name y)))))
-    (mapc #'(lambda (cmd) (insert (format "%S" cmd)) (newline-and-indent))
-          value)
-    (insert "))")
-    (newline)))
-
-(defun mc/save-lists ()
-  "Saves preferences for running commands with multiple cursors to `mc/list-file'"
-  (with-temp-file mc/list-file
-    (emacs-lisp-mode)
-    (insert ";; This file is automatically generated by the multiple-cursors extension.")
-    (newline)
-    (insert ";; It keeps track of your preferences for running commands with multiple cursors.")
-    (newline)
-    (newline)
-    (mc/dump-list 'mc/cmds-to-run-for-all)
-    (newline)
-    (mc/dump-list 'mc/cmds-to-run-once)))
-
-(defvar mc/cmds-to-run-once nil
-  "Commands to run only once in multiple-cursors-mode.")
-
-(defvar mc--default-cmds-to-run-once nil
-  "Default set of commands to run only once in multiple-cursors-mode.")
-
-(setq mc--default-cmds-to-run-once '(mc/edit-lines
-                                     mc/edit-ends-of-lines
-                                     mc/edit-beginnings-of-lines
-                                     mc/mark-next-like-this
-                                     mc/mark-next-word-like-this
-                                     mc/mark-next-symbol-like-this
-                                     mc/mark-previous-like-this
-                                     mc/mark-previous-word-like-this
-                                     mc/mark-previous-symbol-like-this
-                                     mc/mark-all-like-this
-                                     mc/mark-all-words-like-this
-                                     mc/mark-all-symbols-like-this
-                                     mc/mark-more-like-this-extended
-                                     mc/mark-all-like-this-in-defun
-                                     mc/mark-all-words-like-this-in-defun
-                                     mc/mark-all-symbols-like-this-in-defun
-                                     mc/mark-all-like-this-dwim
-                                     mc/mark-all-dwim
-                                     mc/mark-sgml-tag-pair
-                                     mc/insert-numbers
-                                     mc/sort-regions
-                                     mc/reverse-regions
-                                     mc/cycle-forward
-                                     mc/cycle-backward
-                                     mc/add-cursor-on-click
-                                     mc/mark-pop
-                                     mc/add-cursors-to-all-matches
-                                     mc/mmlte--left
-                                     mc/mmlte--right
-                                     mc/mmlte--up
-                                     mc/mmlte--down
-                                     mc/unmark-next-like-this
-                                     mc/unmark-previous-like-this
-                                     mc/skip-to-next-like-this
-                                     mc/skip-to-previous-like-this
-                                     rrm/switch-to-multiple-cursors
-                                     mc-hide-unmatched-lines-mode
-                                     hum/keyboard-quit
-                                     hum/unhide-invisible-overlays
-                                     save-buffer
-                                     ido-exit-minibuffer
-                                     exit-minibuffer
-                                     minibuffer-complete-and-exit
-                                     execute-extended-command
-                                     undo
-                                     redo
-                                     undo-tree-undo
-                                     undo-tree-redo
-                                     universal-argument
-                                     universal-argument-more
-                                     universal-argument-other-key
-                                     negative-argument
-                                     digit-argument
-                                     top-level
-                                     recenter-top-bottom
-                                     describe-mode
-                                     describe-key-1
-                                     describe-function
-                                     describe-bindings
-                                     describe-prefix-bindings
-                                     view-echo-area-messages
-                                     other-window
-                                     kill-buffer-and-window
-                                     split-window-right
-                                     split-window-below
-                                     delete-other-windows
-                                     toggle-window-split
-                                     mwheel-scroll
-                                     scroll-up-command
-                                     scroll-down-command
-                                     mouse-set-point
-                                     mouse-drag-region
-                                     quit-window
-                                     toggle-read-only
-                                     windmove-left
-                                     windmove-right
-                                     windmove-up
-                                     windmove-down))
-
-(defvar mc--default-cmds-to-run-for-all nil
-  "Default set of commands that should be mirrored by all cursors")
-
-(setq mc--default-cmds-to-run-for-all '(mc/keyboard-quit
-                                        self-insert-command
-                                        quoted-insert
-                                        previous-line
-                                        next-line
-                                        newline
-                                        newline-and-indent
-                                        open-line
-                                        delete-blank-lines
-                                        transpose-chars
-                                        transpose-lines
-                                        transpose-paragraphs
-                                        transpose-regions
-                                        join-line
-                                        right-char
-                                        right-word
-                                        forward-char
-                                        forward-word
-                                        left-char
-                                        left-word
-                                        backward-char
-                                        backward-word
-                                        forward-paragraph
-                                        backward-paragraph
-                                        upcase-word
-                                        downcase-word
-                                        capitalize-word
-                                        forward-list
-                                        backward-list
-                                        hippie-expand
-                                        hippie-expand-lines
-                                        yank
-                                        yank-pop
-                                        append-next-kill
-                                        kill-word
-                                        kill-line
-                                        kill-whole-line
-                                        backward-kill-word
-                                        backward-delete-char-untabify
-                                        delete-char delete-forward-char
-                                        delete-backward-char
-                                        py-electric-backspace
-                                        c-electric-backspace
-                                        org-delete-backward-char
-                                        cperl-electric-backspace
-                                        python-indent-dedent-line-backspace
-                                        paredit-backward-delete
-                                        autopair-backspace
-                                        just-one-space
-                                        zap-to-char
-                                        end-of-line
-                                        set-mark-command
-                                        exchange-point-and-mark
-                                        cua-set-mark
-                                        cua-replace-region
-                                        cua-delete-region
-                                        move-end-of-line
-                                        beginning-of-line
-                                        move-beginning-of-line
-                                        kill-ring-save
-                                        back-to-indentation
-                                        subword-forward
-                                        subword-backward
-                                        subword-mark
-                                        subword-kill
-                                        subword-backward-kill
-                                        subword-transpose
-                                        subword-capitalize
-                                        subword-upcase
-                                        subword-downcase
-                                        er/expand-region
-                                        er/contract-region
-                                        smart-forward
-                                        smart-backward
-                                        smart-up
-                                        smart-down))
-
-(defvar mc/cmds-to-run-for-all nil
-  "Commands to run for all cursors in multiple-cursors-mode")
-
-(load mc/list-file t) ;; load, but no errors if it does not exist yet please
-
-(provide 'multiple-cursors-core)
-
-;; Local Variables:
-;; coding: utf-8
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
-;;; multiple-cursors-core.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-pkg.el b/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-pkg.el
deleted file mode 100644
index a591ef7..0000000
--- a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors-pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(define-package "multiple-cursors" "20150528.2303" "Multiple cursors for Emacs." 'nil)
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors.el b/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors.el
deleted file mode 100644
index 9c44db9..0000000
--- a/emacs.d/elpa/multiple-cursors-20150528.2303/multiple-cursors.el
+++ /dev/null
@@ -1,192 +0,0 @@
-;;; multiple-cursors.el --- Multiple cursors for emacs.
-
-;; Copyright (C) 2012-2013 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 1.2.2
-;; Keywords: editing cursors
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Multiple cursors for Emacs. This is some pretty crazy functionality, so yes,
-;; there are kinks. Don't be afraid tho, I've been using it since 2011 with
-;; great success and much merriment.
-
-;; ## Basic usage
-
-;; Start out with:
-
-;;     (require 'multiple-cursors)
-
-;; Then you have to set up your keybindings - multiple-cursors doesn't presume to
-;; know how you'd like them laid out. Here are some examples:
-
-;; When you have an active region that spans multiple lines, the following will
-;; add a cursor to each line:
-
-;;     (global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
-
-;; When you want to add multiple cursors not based on continuous lines, but based on
-;; keywords in the buffer, use:
-
-;;     (global-set-key (kbd "C->") 'mc/mark-next-like-this)
-;;     (global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
-;;     (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
-
-;; First mark the word, then add more cursors.
-
-;; To get out of multiple-cursors-mode, press `<return>` or `C-g`. The latter will
-;; first disable multiple regions before disabling multiple cursors. If you want to
-;; insert a newline in multiple-cursors-mode, use `C-j`.
-
-;; ## Video
-
-;; You can [watch an intro to multiple-cursors at Emacs Rocks](http://emacsrocks.com/e13.html).
-
-;; ## Command overview
-
-;; ### Mark one more occurrence
-
-;;  - `mc/mark-next-like-this`: Adds a cursor and region at the next part of the buffer forwards that matches the current region.
-;;  - `mc/mark-next-word-like-this`: Like `mc/mark-next-like-this` but only for whole words.
-;;  - `mc/mark-next-symbol-like-this`: Like `mc/mark-next-like-this` but only for whole symbols.
-;;  - `mc/mark-previous-like-this`: Adds a cursor and region at the next part of the buffer backwards that matches the current region.
-;;  - `mc/mark-previous-word-like-this`: Like `mc/mark-previous-like-this` but only for whole words.
-;;  - `mc/mark-previous-symbol-like-this`: Like `mc/mark-previous-like-this` but only for whole symbols.
-;;  - `mc/mark-more-like-this-extended`: Use arrow keys to quickly mark/skip next/previous occurances.
-;;  - `mc/add-cursor-on-click`: Bind to a mouse event to add cursors by clicking. See tips-section.
-
-;; ### Mark many occurrences
-
-;;  - `mc/mark-all-like-this`: Marks all parts of the buffer that matches the current region.
-;;  - `mc/mark-all-words-like-this`: Like `mc/mark-all-like-this` but only for whole words.
-;;  - `mc/mark-all-symbols-like-this`: Like `mc/mark-all-like-this` but only for whole symbols.
-;;  - `mc/mark-all-in-region`: Prompts for a string to match in the region, adding cursors to all of them.
-;;  - `mc/mark-all-like-this-in-defun`: Marks all parts of the current defun that matches the current region.
-;;  - `mc/mark-all-words-like-this-in-defun`: Like `mc/mark-all-like-this-in-defun` but only for whole words.
-;;  - `mc/mark-all-symbols-like-this-in-defun`: Like `mc/mark-all-like-this-in-defun` but only for whole symbols.
-;;  - `mc/mark-all-like-this-dwim`: Tries to be smart about marking everything you want. Can be pressed multiple times.
-
-;; ### Special
-
-;;  - `set-rectangular-region-anchor`: Think of this one as `set-mark` except you're marking a rectangular region.
-;;  - `mc/mark-sgml-tag-pair`: Mark the current opening and closing tag.
-;;  - `mc/insert-numbers`: Insert increasing numbers for each cursor, top to bottom.
-;;  - `mc/sort-regions`: Sort the marked regions alphabetically.
-;;  - `mc/reverse-regions`: Reverse the order of the marked regions.
-
-;; ## Tips and tricks
-
-;; - To get out of multiple-cursors-mode, press `<return>` or `C-g`. The latter will
-;;   first disable multiple regions before disabling multiple cursors. If you want to
-;;   insert a newline in multiple-cursors-mode, use `C-j`.
-;;
-;; - Sometimes you end up with cursors outside of your view. You can
-;;   scroll the screen to center on each cursor with `C-v` and `M-v`.
-;;
-;; - Try pressing `mc/mark-next-like-this` with no region selected. It will just add a cursor
-;;   on the next line.
-;;
-;; - Try pressing `mc/mark-all-like-this-dwim` on a tagname in html-mode.
-;;
-;; - Notice that the number of cursors active can be seen in the modeline.
-;;
-;; - If you get out of multiple-cursors-mode and yank - it will yank only
-;;   from the kill-ring of main cursor. To yank from the kill-rings of
-;;   every cursor use yank-rectangle, normally found at C-x r y.
-;;
-;; - You can use `mc/reverse-regions` with nothing selected and just one cursor.
-;;   It will then flip the sexp at point and the one below it.
-;;
-;; - If you would like to keep the global bindings clean, and get custom keybindings
-;;   when the region is active, you can try [region-bindings-mode](https://github.com/fgallina/region-bindings-mode).
-;;
-;; BTW, I highly recommend adding `mc/mark-next-like-this` to a key binding that's
-;; right next to the key for `er/expand-region`.
-
-;; ### Binding mouse events
-
-;; To override a mouse event, you will likely have to also unbind the
-;; `down-mouse` part of the event. Like this:
-;;
-;;     (global-unset-key (kbd "M-<down-mouse-1>"))
-;;     (global-set-key (kbd "M-<mouse-1>") 'mc/add-cursor-on-click)
-;;
-;; Or you can do like me and find an unused, but less convenient, binding:
-;;
-;;     (global-set-key (kbd "C-S-<mouse-1>") 'mc/add-cursor-on-click)
-
-;; ## Unknown commands
-
-;; Multiple-cursors uses two lists of commands to know what to do: the run-once list
-;; and the run-for-all list. It comes with a set of defaults, but it would be beyond silly
-;; to try and include all the known Emacs commands.
-
-;; So that's why multiple-cursors occasionally asks what to do about a command. It will
-;; then remember your choice by saving it in `~/.emacs.d/.mc-lists.el`. You can change
-;; the location with:
-
-;;     (setq mc/list-file "/my/preferred/file")
-
-;; ## Known limitations
-
-;; * isearch-forward and isearch-backward aren't supported with multiple cursors.
-;;   You should feel free to add a simplified version that can work with it.
-;; * Commands run with `M-x` won't be repeated for all cursors.
-;; * All key bindings that refer to lambdas are always run for all cursors. If you
-;;   need to limit it, you will have to give it a name.
-;; * Redo might screw with your cursors. Undo works very well.
-
-;; ## Contribute
-
-;; Yes, please do. There's a suite of tests, so remember to add tests for your
-;; specific feature, or I might break it later.
-
-;; You'll find the repo at:
-
-;;     https://github.com/magnars/multiple-cursors.el
-
-;; To fetch the test dependencies:
-
-;;     $ cd /path/to/multiple-cursors
-;;     $ git submodule update --init
-
-;; Run the tests with:
-
-;;     $ ./util/ecukes/ecukes --graphical
-
-;; ## Contributors
-
-;; * [Takafumi Arakaki](https://github.com/tkf) made .mc-lists.el diff friendly
-;; * [Marco Baringer](https://github.com/segv) contributed looping to mc/cycle and adding cursors without region for mark-more.
-;; * [Ivan Andrus](https://github.com/gvol) added showing number of cursors in mode-line
-;; * [Fuco](https://github.com/Fuco1) added the first version of `mc/mark-all-like-this-dwim`
-
-;; Thanks!
-
-;;; Code:
-
-(require 'mc-edit-lines)
-(require 'mc-cycle-cursors)
-(require 'mc-mark-more)
-(require 'mc-mark-pop)
-(require 'rectangular-region-mode)
-(require 'mc-separate-operations)
-(require 'mc-hide-unmatched-lines-mode)
-
-(provide 'multiple-cursors)
-
-;;; multiple-cursors.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-cycle-cursors.el b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-cycle-cursors.el
similarity index 100%
rename from emacs.d/elpa/multiple-cursors-20150528.2303/mc-cycle-cursors.el
rename to emacs.d/elpa/multiple-cursors-20151205.1225/mc-cycle-cursors.el
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-edit-lines.el b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-edit-lines.el
similarity index 100%
rename from emacs.d/elpa/multiple-cursors-20150528.2303/mc-edit-lines.el
rename to emacs.d/elpa/multiple-cursors-20151205.1225/mc-edit-lines.el
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-hide-unmatched-lines-mode.el b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-hide-unmatched-lines-mode.el
similarity index 100%
rename from emacs.d/elpa/multiple-cursors-20150528.2303/mc-hide-unmatched-lines-mode.el
rename to emacs.d/elpa/multiple-cursors-20151205.1225/mc-hide-unmatched-lines-mode.el
diff --git a/emacs.d/elpa/multiple-cursors-20151205.1225/mc-mark-more.el b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-mark-more.el
new file mode 100644
index 0000000..68addce
--- /dev/null
+++ b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-mark-more.el
@@ -0,0 +1,624 @@
+;;; mc-mark-more.el
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Keywords: editing cursors
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file contains functions to mark more parts of the buffer.
+;; See ./features/mark-more.feature for examples.
+
+;; Please see multiple-cursors.el for more commentary.
+
+;;; Code:
+
+(require 'multiple-cursors-core)
+(require 'thingatpt)
+
+(defun mc/cursor-end (cursor)
+  (if (overlay-get cursor 'mark-active)
+      (max (overlay-get cursor 'point)
+           (overlay-get cursor 'mark))
+    (overlay-get cursor 'point)))
+
+(defun mc/cursor-beg (cursor)
+  (if (overlay-get cursor 'mark-active)
+      (min (overlay-get cursor 'point)
+           (overlay-get cursor 'mark))
+    (overlay-get cursor 'point)))
+
+(defun mc/furthest-region-end ()
+  (let ((end (max (mark) (point))))
+    (mc/for-each-fake-cursor
+     (setq end (max end (mc/cursor-end cursor))))
+    end))
+
+(defun mc/first-region-start ()
+  (let ((beg (min (mark) (point))))
+    (mc/for-each-fake-cursor
+     (setq beg (min beg (mc/cursor-beg cursor))))
+    beg))
+
+(defun mc/furthest-cursor-before-point ()
+  (let ((beg (if mark-active (min (mark) (point)) (point)))
+	furthest)
+    (mc/for-each-fake-cursor
+     (when (< (mc/cursor-beg cursor) beg)
+       (setq beg (mc/cursor-beg cursor))
+       (setq furthest cursor)))
+    furthest))
+
+(defun mc/furthest-cursor-after-point ()
+  (let ((end (if mark-active (max (mark) (point)) (point)))
+	furthest)
+    (mc/for-each-fake-cursor
+     (when (> (mc/cursor-end cursor) end)
+       (setq end (mc/cursor-end cursor))
+       (setq furthest cursor)))
+    furthest))
+
+(defun mc/region-strings ()
+  (let ((strings (list (buffer-substring-no-properties (point) (mark)))))
+    (mc/for-each-fake-cursor
+     (add-to-list 'strings (buffer-substring-no-properties
+                            (mc/cursor-beg cursor)
+                            (mc/cursor-end cursor))))
+    strings))
+
+(defvar mc/enclose-search-term nil
+  "How should mc/mark-more-* search for more matches?
+
+Match everything: nil
+Match only whole words: 'words
+Match only whole symbols: 'symbols
+
+Use like case-fold-search, don't recommend setting it globally.")
+
+(defun mc/mark-more-like-this (skip-last direction)
+  (let ((case-fold-search nil)
+        (re (regexp-opt (mc/region-strings) mc/enclose-search-term))
+        (point-out-of-order (ecase direction
+                              (forwards       (< (point) (mark)))
+                              (backwards (not (< (point) (mark))))))
+        (furthest-cursor (ecase direction
+                           (forwards  (mc/furthest-cursor-after-point))
+                           (backwards (mc/furthest-cursor-before-point))))
+        (start-char (ecase direction
+                      (forwards  (mc/furthest-region-end))
+                      (backwards (mc/first-region-start))))
+        (search-function (ecase direction
+                           (forwards  'search-forward-regexp)
+                           (backwards 'search-backward-regexp)))
+        (match-point-getter (ecase direction
+                              (forwards 'match-beginning)
+                              (backwards 'match-end))))
+    (if (and skip-last (not furthest-cursor))
+        (error "No cursors to be skipped")
+      (mc/save-excursion
+       (goto-char start-char)
+       (when skip-last
+         (mc/remove-fake-cursor furthest-cursor))
+       (if (funcall search-function re nil t)
+           (progn
+             (push-mark (funcall match-point-getter 0))
+             (when point-out-of-order
+               (exchange-point-and-mark))
+             (mc/create-fake-cursor-at-point))
+         (error "no more matches found."))))))
+
+;;;###autoload
+(defun mc/mark-next-like-this (arg)
+  "Find and mark the next part of the buffer matching the currently active region
+If no region is active add a cursor on the next line
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next."
+  (interactive "p")
+  (if (< arg 0)
+      (let ((cursor (mc/furthest-cursor-after-point)))
+	(if cursor
+	    (mc/remove-fake-cursor cursor)
+	  (error "No cursors to be unmarked")))
+    (if (region-active-p)
+        (mc/mark-more-like-this (= arg 0) 'forwards)
+      (mc/mark-lines arg 'forwards)))
+  (mc/maybe-multiple-cursors-mode))
+
+;;;###autoload
+(defun mc/mark-next-like-this-word (arg)
+  "Find and mark the next part of the buffer matching the currently active region
+If no region is active, mark the word at the point and find the next match
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next."
+  (interactive "p")
+  (if (< arg 0)
+      (let ((cursor (mc/furthest-cursor-after-point)))
+	(if cursor
+	    (mc/remove-fake-cursor cursor)
+	  (error "No cursors to be unmarked")))
+    (if (region-active-p)
+        (mc/mark-more-like-this (= arg 0) 'forwards)
+      (mc--select-thing-at-point 'word)
+      (mc/mark-more-like-this (= arg 0) 'forwards)))
+  (mc/maybe-multiple-cursors-mode))
+
+(defun mc/mark-next-like-this-symbol (arg)
+  "Find and mark the next part of the buffer matching the currently active region
+If no region is active, mark the symbol at the point and find the next match
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next."
+  (interactive "p")
+  (if (< arg 0)
+      (let ((cursor (mc/furthest-cursor-after-point)))
+	(if cursor
+	    (mc/remove-fake-cursor cursor)
+	  (error "No cursors to be unmarked")))
+    (if (region-active-p)
+        (mc/mark-more-like-this (= arg 0) 'forwards)
+      (mc--select-thing-at-point 'symbol)
+      (mc/mark-more-like-this (= arg 0) 'forwards)))
+  (mc/maybe-multiple-cursors-mode))
+
+
+;;;###autoload
+(defun mc/mark-next-word-like-this (arg)
+  (interactive "p")
+  (let ((mc/enclose-search-term 'words))
+    (mc/mark-next-like-this arg)))
+
+;;;###autoload
+(defun mc/mark-next-symbol-like-this (arg)
+  (interactive "p")
+  (let ((mc/enclose-search-term 'symbols))
+    (mc/mark-next-like-this arg)))
+
+;;;###autoload
+(defun mc/mark-previous-like-this (arg)
+  "Find and mark the previous part of the buffer matching the currently active region
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next."
+  (interactive "p")
+  (if (< arg 0)
+      (let ((cursor (mc/furthest-cursor-before-point)))
+	(if cursor
+	    (mc/remove-fake-cursor cursor)
+	  (error "No cursors to be unmarked")))
+    (if (region-active-p)
+        (mc/mark-more-like-this (= arg 0) 'backwards)
+      (mc/mark-lines arg 'backwards)))
+  (mc/maybe-multiple-cursors-mode))
+
+;;;###autoload
+(defun mc/mark-previous-word-like-this (arg)
+  (interactive "p")
+  (let ((mc/enclose-search-term 'words))
+    (mc/mark-previous-like-this arg)))
+
+;;;###autoload
+(defun mc/mark-previous-symbol-like-this (arg)
+  (interactive "p")
+  (let ((mc/enclose-search-term 'symbols))
+    (mc/mark-previous-like-this arg)))
+
+(defun mc/mark-lines (num-lines direction)
+  (dotimes (i num-lines)
+    (mc/save-excursion
+     (let ((furthest-cursor (ecase direction
+			      (forwards  (mc/furthest-cursor-after-point))
+			      (backwards (mc/furthest-cursor-before-point)))))
+       (if (overlayp furthest-cursor)
+	   (goto-char (overlay-get furthest-cursor 'point))))
+     (ecase direction
+       (forwards (next-logical-line 1 nil))
+       (backwards (previous-logical-line 1 nil)))
+     (mc/create-fake-cursor-at-point))))
+
+;;;###autoload
+(defun mc/mark-next-lines (arg)
+  (interactive "p")
+  (mc/mark-lines arg 'forwards)
+  (mc/maybe-multiple-cursors-mode))
+
+;;;###autoload
+(defun mc/mark-previous-lines (arg)
+  (interactive "p")
+  (mc/mark-lines arg 'backwards)
+  (mc/maybe-multiple-cursors-mode))
+
+;;;###autoload
+(defun mc/unmark-next-like-this ()
+  "Deselect next part of the buffer matching the currently active region."
+  (interactive)
+  (mc/mark-next-like-this -1))
+
+;;;###autoload
+(defun mc/unmark-previous-like-this ()
+  "Deselect prev part of the buffer matching the currently active region."
+  (interactive)
+  (mc/mark-previous-like-this -1))
+
+;;;###autoload
+(defun mc/skip-to-next-like-this ()
+  "Skip the current one and select the next part of the buffer matching the currently active region."
+  (interactive)
+  (mc/mark-next-like-this 0))
+
+;;;###autoload
+(defun mc/skip-to-previous-like-this ()
+  "Skip the current one and select the prev part of the buffer matching the currently active region."
+  (interactive)
+  (mc/mark-previous-like-this 0))
+
+;;;###autoload
+(defun mc/mark-all-like-this ()
+  "Find and mark all the parts of the buffer matching the currently active region"
+  (interactive)
+  (unless (region-active-p)
+    (error "Mark a region to match first."))
+  (mc/remove-fake-cursors)
+  (let ((master (point))
+        (case-fold-search nil)
+        (point-first (< (point) (mark)))
+        (re (regexp-opt (mc/region-strings) mc/enclose-search-term)))
+    (mc/save-excursion
+     (goto-char 0)
+     (while (search-forward-regexp re nil t)
+       (push-mark (match-beginning 0))
+       (when point-first (exchange-point-and-mark))
+       (unless (= master (point))
+         (mc/create-fake-cursor-at-point))
+       (when point-first (exchange-point-and-mark)))))
+  (if (> (mc/num-cursors) 1)
+      (multiple-cursors-mode 1)
+    (multiple-cursors-mode 0)))
+
+(defun mc--select-thing-at-point (thing)
+  (let ((bound (bounds-of-thing-at-point thing)))
+    (when bound
+      (set-mark (car bound))
+      (goto-char (cdr bound))
+      bound)))
+
+(defun mc--select-thing-at-point-or-bark (thing)
+  (unless (or (region-active-p) (mc--select-thing-at-point thing))
+    (error "Mark a region or set cursor on a %s." thing)))
+
+;;;###autoload
+(defun mc/mark-all-words-like-this ()
+  (interactive)
+  (mc--select-thing-at-point-or-bark 'word)
+  (let ((mc/enclose-search-term 'words))
+    (mc/mark-all-like-this)))
+
+;;;###autoload
+(defun mc/mark-all-symbols-like-this ()
+  (interactive)
+  (mc--select-thing-at-point-or-bark 'symbol)
+  (let ((mc/enclose-search-term 'symbols))
+    (mc/mark-all-like-this)))
+
+;;;###autoload
+(defun mc/mark-all-in-region (beg end &optional search)
+  "Find and mark all the parts in the region matching the given search"
+  (interactive "r")
+  (let ((search (or search (read-from-minibuffer "Mark all in region: ")))
+        (case-fold-search nil))
+    (if (string= search "")
+        (message "Mark aborted")
+      (progn
+        (mc/remove-fake-cursors)
+        (goto-char beg)
+        (while (search-forward search end t)
+          (push-mark (match-beginning 0))
+          (mc/create-fake-cursor-at-point))
+        (let ((first (mc/furthest-cursor-before-point)))
+          (if (not first)
+              (error "Search failed for %S" search)
+            (mc/pop-state-from-overlay first)))
+        (if (> (mc/num-cursors) 1)
+            (multiple-cursors-mode 1)
+          (multiple-cursors-mode 0))))))
+
+;;;###autoload
+(defun mc/mark-all-in-region-regexp (beg end)
+  "Find and mark all the parts in the region matching the given regexp"
+  (interactive "r")
+  (let ((search (read-regexp "Mark regexp in region: "))
+        (case-fold-search nil))
+    (if (string= search "")
+        (message "Mark aborted")
+      (progn
+        (mc/remove-fake-cursors)
+        (goto-char beg)
+        (while (search-forward-regexp search end t)
+          (push-mark (match-beginning 0))
+          (mc/create-fake-cursor-at-point))
+        (let ((first (mc/furthest-cursor-before-point)))
+          (if (not first)
+              (error "Search failed for %S" search)
+            (mc/pop-state-from-overlay first)))
+        (if (> (mc/num-cursors) 1)
+            (multiple-cursors-mode 1)
+          (multiple-cursors-mode 0))))))
+
+(when (not (fboundp 'set-temporary-overlay-map))
+  ;; Backport this function from newer emacs versions
+  (defun set-temporary-overlay-map (map &optional keep-pred)
+    "Set a new keymap that will only exist for a short period of time.
+The new keymap to use must be given in the MAP variable. When to
+remove the keymap depends on user input and KEEP-PRED:
+
+- if KEEP-PRED is nil (the default), the keymap disappears as
+  soon as any key is pressed, whether or not the key is in MAP;
+
+- if KEEP-PRED is t, the keymap disappears as soon as a key *not*
+  in MAP is pressed;
+
+- otherwise, KEEP-PRED must be a 0-arguments predicate that will
+  decide if the keymap should be removed (if predicate returns
+  nil) or kept (otherwise). The predicate will be called after
+  each key sequence."
+
+    (let* ((clearfunsym (make-symbol "clear-temporary-overlay-map"))
+           (overlaysym (make-symbol "t"))
+           (alist (list (cons overlaysym map)))
+           (clearfun
+            `(lambda ()
+               (unless ,(cond ((null keep-pred) nil)
+                              ((eq t keep-pred)
+                               `(eq this-command
+                                    (lookup-key ',map
+                                                (this-command-keys-vector))))
+                              (t `(funcall ',keep-pred)))
+                 (remove-hook 'pre-command-hook ',clearfunsym)
+                 (setq emulation-mode-map-alists
+                       (delq ',alist emulation-mode-map-alists))))))
+      (set overlaysym overlaysym)
+      (fset clearfunsym clearfun)
+      (add-hook 'pre-command-hook clearfunsym)
+
+      (push alist emulation-mode-map-alists))))
+
+;;;###autoload
+(defun mc/mark-more-like-this-extended ()
+  "Like mark-more-like-this, but then lets you adjust with arrows key.
+The adjustments work like this:
+
+   <up>    Mark previous like this and set direction to 'up
+   <down>  Mark next like this and set direction to 'down
+
+If direction is 'up:
+
+   <left>  Skip past the cursor furthest up
+   <right> Remove the cursor furthest up
+
+If direction is 'down:
+
+   <left>  Remove the cursor furthest down
+   <right> Skip past the cursor furthest down
+
+The bindings for these commands can be changed. See `mc/mark-more-like-this-extended-keymap'."
+  (interactive)
+  (mc/mmlte--down)
+  (set-temporary-overlay-map mc/mark-more-like-this-extended-keymap t))
+
+(defvar mc/mark-more-like-this-extended-direction nil
+  "When using mc/mark-more-like-this-extended are we working on the next or previous cursors?")
+
+(make-variable-buffer-local 'mc/mark-more-like-this-extended)
+
+(defun mc/mmlte--message ()
+  (if (eq mc/mark-more-like-this-extended-direction 'up)
+      (message "<up> to mark previous, <left> to skip, <right> to remove, <down> to mark next")
+    (message "<down> to mark next, <right> to skip, <left> to remove, <up> to mark previous")))
+
+(defun mc/mmlte--up ()
+  (interactive)
+  (mc/mark-previous-like-this 1)
+  (setq mc/mark-more-like-this-extended-direction 'up)
+  (mc/mmlte--message))
+
+(defun mc/mmlte--down ()
+  (interactive)
+  (mc/mark-next-like-this 1)
+  (setq mc/mark-more-like-this-extended-direction 'down)
+  (mc/mmlte--message))
+
+(defun mc/mmlte--left ()
+  (interactive)
+  (if (eq mc/mark-more-like-this-extended-direction 'down)
+      (mc/unmark-next-like-this)
+    (mc/skip-to-previous-like-this))
+  (mc/mmlte--message))
+
+(defun mc/mmlte--right ()
+  (interactive)
+  (if (eq mc/mark-more-like-this-extended-direction 'up)
+      (mc/unmark-previous-like-this)
+    (mc/skip-to-next-like-this))
+  (mc/mmlte--message))
+
+(defvar mc/mark-more-like-this-extended-keymap (make-sparse-keymap))
+
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<up>") 'mc/mmlte--up)
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<down>") 'mc/mmlte--down)
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<left>") 'mc/mmlte--left)
+(define-key mc/mark-more-like-this-extended-keymap (kbd "<right>") 'mc/mmlte--right)
+
+(defvar mc--restrict-mark-all-to-symbols nil)
+
+;;;###autoload
+(defun mc/mark-all-like-this-dwim (arg)
+  "Tries to guess what you want to mark all of.
+Can be pressed multiple times to increase selection.
+
+With prefix, it behaves the same as original `mc/mark-all-like-this'"
+  (interactive "P")
+  (if arg
+      (mc/mark-all-like-this)
+    (if (and (not (use-region-p))
+             (derived-mode-p 'sgml-mode)
+             (mc--on-tag-name-p))
+        (mc/mark-sgml-tag-pair)
+      (let ((before (mc/num-cursors)))
+        (unless (eq last-command 'mc/mark-all-like-this-dwim)
+          (setq mc--restrict-mark-all-to-symbols nil))
+        (unless (use-region-p)
+          (mc--mark-symbol-at-point)
+          (setq mc--restrict-mark-all-to-symbols t))
+        (if mc--restrict-mark-all-to-symbols
+            (mc/mark-all-symbols-like-this-in-defun)
+          (mc/mark-all-like-this-in-defun))
+        (when (<= (mc/num-cursors) before)
+          (if mc--restrict-mark-all-to-symbols
+              (mc/mark-all-symbols-like-this)
+            (mc/mark-all-like-this)))
+        (when (<= (mc/num-cursors) before)
+          (mc/mark-all-like-this))))))
+
+;;;###autoload
+(defun mc/mark-all-dwim (arg)
+  "Tries even harder to guess what you want to mark all of.
+
+If the region is active and spans multiple lines, it will behave
+as if `mc/mark-all-in-region'. With the prefix ARG, it will call
+`mc/edit-lines' instead.
+
+If the region is inactive or on a single line, it will behave like
+`mc/mark-all-like-this-dwim'."
+  (interactive "P")
+  (if (and (use-region-p)
+           (not (> (mc/num-cursors) 1))
+           (not (= (line-number-at-pos (region-beginning))
+                   (line-number-at-pos (region-end)))))
+      (if arg
+          (call-interactively 'mc/edit-lines)
+       (call-interactively 'mc/mark-all-in-region))
+    (progn
+      (setq this-command 'mc/mark-all-like-this-dwim)
+      (mc/mark-all-like-this-dwim arg))))
+
+(defun mc--in-defun ()
+  (bounds-of-thing-at-point 'defun))
+
+;;;###autoload
+(defun mc/mark-all-like-this-in-defun ()
+  "Mark all like this in defun."
+  (interactive)
+  (if (mc--in-defun)
+      (save-restriction
+        (widen)
+        (narrow-to-defun)
+        (mc/mark-all-like-this))
+    (mc/mark-all-like-this)))
+
+;;;###autoload
+(defun mc/mark-all-words-like-this-in-defun ()
+  "Mark all words like this in defun."
+  (interactive)
+  (mc--select-thing-at-point-or-bark 'word)
+  (if (mc--in-defun)
+      (save-restriction
+        (widen)
+        (narrow-to-defun)
+        (mc/mark-all-words-like-this))
+    (mc/mark-all-words-like-this)))
+
+;;;###autoload
+(defun mc/mark-all-symbols-like-this-in-defun ()
+  "Mark all symbols like this in defun."
+  (interactive)
+  (mc--select-thing-at-point-or-bark 'symbol)
+  (if (mc--in-defun)
+      (save-restriction
+        (widen)
+        (narrow-to-defun)
+        (mc/mark-all-symbols-like-this))
+    (mc/mark-all-symbols-like-this)))
+
+(defun mc--mark-symbol-at-point ()
+  "Select the symbol under cursor"
+  (interactive)
+  (when (not (use-region-p))
+    (let ((b (bounds-of-thing-at-point 'symbol)))
+      (goto-char (car b))
+      (set-mark (cdr b)))))
+
+(defun mc--get-nice-sgml-context ()
+  (car
+   (last
+    (progn
+      (when (looking-at "<") (forward-char 1))
+      (when (looking-back ">") (forward-char -1))
+      (sgml-get-context)))))
+
+(defun mc--on-tag-name-p ()
+  (let* ((context (save-excursion (mc--get-nice-sgml-context)))
+         (tag-name-len (length (aref context 4)))
+         (beg (aref context 2))
+         (end (+ beg tag-name-len (if (eq 'open (aref context 1)) 1 3))))
+    (and context
+         (>= (point) beg)
+         (<= (point) end))))
+
+;;;###autoload
+(defun mc/add-cursor-on-click (event)
+  "Add a cursor where you click."
+  (interactive "e")
+  (mouse-minibuffer-check event)
+  ;; Use event-end in case called from mouse-drag-region.
+  ;; If EVENT is a click, event-end and event-start give same value.
+  (let ((position (event-end event)))
+    (if (not (windowp (posn-window position)))
+        (error "Position not in text area of window"))
+    (select-window (posn-window position))
+    (if (numberp (posn-point position))
+        (save-excursion
+          (goto-char (posn-point position))
+          (mc/create-fake-cursor-at-point)))
+    (mc/maybe-multiple-cursors-mode)))
+
+;;;###autoload
+(defun mc/mark-sgml-tag-pair ()
+  "Mark the tag we're in and its pair for renaming."
+  (interactive)
+  (when (not (mc--inside-tag-p))
+    (error "Place point inside tag to rename."))
+  (let ((context (mc--get-nice-sgml-context)))
+    (if (looking-at "</")
+        (setq context (car (last (sgml-get-context)))))
+    (goto-char (aref context 2))
+    (let* ((tag-name (aref context 4))
+           (num-chars (length tag-name))
+           (master-start (1+ (point)))
+           (mirror-end (save-excursion
+                         (sgml-skip-tag-forward 1)
+                         (1- (point)))))
+      (goto-char (- mirror-end num-chars))
+      (set-mark mirror-end)
+      (mc/create-fake-cursor-at-point)
+      (goto-char master-start)
+      (set-mark (+ (point) num-chars))))
+  (mc/maybe-multiple-cursors-mode))
+
+(defun mc--inside-tag-p ()
+  (save-excursion
+    (not (null (sgml-get-context)))))
+
+(provide 'mc-mark-more)
+
+;;; mc-mark-more.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/mc-mark-pop.el b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-mark-pop.el
similarity index 100%
rename from emacs.d/elpa/multiple-cursors-20150528.2303/mc-mark-pop.el
rename to emacs.d/elpa/multiple-cursors-20151205.1225/mc-mark-pop.el
diff --git a/emacs.d/elpa/multiple-cursors-20151205.1225/mc-separate-operations.el b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-separate-operations.el
new file mode 100644
index 0000000..412a443
--- /dev/null
+++ b/emacs.d/elpa/multiple-cursors-20151205.1225/mc-separate-operations.el
@@ -0,0 +1,146 @@
+;;; mc-separate-operations.el - functions that work differently on each cursor
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Keywords: editing cursors
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file contains functions that work differently on each cursor,
+;; instead of treating all of them the same.
+
+;; Please see multiple-cursors.el for more commentary.
+
+;;; Code:
+
+(require 'multiple-cursors-core)
+
+;;;###autoload
+(defun mc/insert-numbers (arg)
+  "Insert increasing numbers for each cursor, starting at 0 or ARG."
+  (interactive "P")
+  (setq mc--insert-numbers-number (or arg 0))
+  (mc/for-each-cursor-ordered
+   (mc/execute-command-for-fake-cursor 'mc--insert-number-and-increase cursor)))
+
+(defvar mc--insert-numbers-number 0)
+
+(defun mc--insert-number-and-increase ()
+  (interactive)
+  (insert (number-to-string mc--insert-numbers-number))
+  (setq mc--insert-numbers-number (1+ mc--insert-numbers-number)))
+
+(defun mc--ordered-region-strings ()
+  (let (strings)
+    (save-excursion
+      (mc/for-each-cursor-ordered
+       (setq strings (cons (buffer-substring-no-properties
+                            (mc/cursor-beg cursor)
+                            (mc/cursor-end cursor)) strings))))
+    (nreverse strings)))
+
+;;;###autoload
+(defun mc/insert-letters (arg)
+  "Insert increasing letters for each cursor, starting at 0 or ARG.
+     Where letter[0]=a letter[2]=c letter[26]=aa"
+  (interactive "P")
+  (setq mc--insert-letters-number (or arg 0))
+  (mc/for-each-cursor-ordered
+   (mc/execute-command-for-fake-cursor 'mc--insert-letter-and-increase cursor)))
+
+(defun mc--number-to-letters (number)
+  (let ((letter
+	 (char-to-string
+	  (nth (mod number 26) '(?a ?b ?c ?d ?e ?f ?g ?h ?i ?j ?k ?l ?m ?n ?o ?p ?q ?r ?s ?t ?u ?v ?w ?x ?y ?z))))
+	(number2 (/ number 26)))
+    (if (> number2 0)
+	(concat (mc--number-to-letters (- number2 1)) letter)
+      letter)))
+
+(defvar mc--insert-letters-number 0)
+
+(defun mc--insert-letter-and-increase ()
+  (interactive)
+  (insert (mc--number-to-letters mc--insert-letters-number))
+  (setq mc--insert-letters-number (1+ mc--insert-letters-number)))
+
+(defvar mc--strings-to-replace nil)
+
+(defun mc--replace-region-strings-1 ()
+  (interactive)
+  (delete-region (region-beginning) (region-end))
+  (save-excursion (insert (car mc--strings-to-replace)))
+  (setq mc--strings-to-replace (cdr mc--strings-to-replace)))
+
+(defun mc--replace-region-strings ()
+  (mc/for-each-cursor-ordered
+   (mc/execute-command-for-fake-cursor 'mc--replace-region-strings-1 cursor)))
+
+;;;###autoload
+(defun mc/reverse-regions ()
+  (interactive)
+  (if (not multiple-cursors-mode)
+      (progn
+        (mc/mark-next-lines 1)
+        (mc/reverse-regions)
+        (multiple-cursors-mode 0))
+    (unless (use-region-p)
+      (mc/execute-command-for-all-cursors 'mark-sexp))
+    (setq mc--strings-to-replace (nreverse (mc--ordered-region-strings)))
+    (mc--replace-region-strings)))
+
+;;;###autoload
+(defun mc/sort-regions ()
+  (interactive)
+  (unless (use-region-p)
+    (mc/execute-command-for-all-cursors 'mark-sexp))
+  (setq mc--strings-to-replace (sort (mc--ordered-region-strings) 'string<))
+  (mc--replace-region-strings))
+
+
+;;;###autoload
+(defun mc/vertical-align (character)
+  "Aligns all cursors vertically with a given CHARACTER to the one with the
+highest colum number (the rightest).
+Might not behave as intended if more than one cursors are on the same line."
+  (interactive "c")
+  (let ((rightest-column (current-column)))
+    (mc/execute-command-for-all-cursors
+     (lambda () "get the rightest cursor"
+       (interactive)
+       (setq rightest-column (max (current-column) rightest-column))
+       ))
+    (mc/execute-command-for-all-cursors
+     (lambda ()
+       (interactive)
+       (let ((missing-spaces (- rightest-column (current-column))))
+	 (save-excursion (insert (make-string missing-spaces character)))
+	 (forward-char missing-spaces)
+	 )
+       ))
+      )
+    )
+
+;;;###autoload
+(defun mc/vertical-align-with-space ()
+  "Aligns all cursors with whitespace like `mc/vertical-align' does"
+  (interactive)
+  (mc/vertical-align 32)
+  )
+
+(provide 'mc-separate-operations)
+;;; mc-separate-operations.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-autoloads.el b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-autoloads.el
new file mode 100644
index 0000000..b02e362
--- /dev/null
+++ b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-autoloads.el
@@ -0,0 +1,312 @@
+;;; multiple-cursors-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "mc-edit-lines" "mc-edit-lines.el" (22171 46552
+;;;;;;  0 0))
+;;; Generated autoloads from mc-edit-lines.el
+
+(autoload 'mc/edit-lines "mc-edit-lines" "\
+Add one cursor to each line of the active region.
+Starts from mark and moves in straight down or up towards the
+line point is on.
+
+What is done with lines which are not long enough is governed by
+`mc/edit-lines-empty-lines'.  The prefix argument ARG can be used
+to override this.  If ARG is a symbol (when called from Lisp),
+that symbol is used instead of `mc/edit-lines-empty-lines'.
+Otherwise, if ARG negative, short lines will be ignored.  Any
+other non-nil value will cause short lines to be padded.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'mc/edit-ends-of-lines "mc-edit-lines" "\
+Add one cursor to the end of each line in the active region.
+
+\(fn)" t nil)
+
+(autoload 'mc/edit-beginnings-of-lines "mc-edit-lines" "\
+Add one cursor to the beginning of each line in the active region.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "mc-hide-unmatched-lines-mode" "mc-hide-unmatched-lines-mode.el"
+;;;;;;  (22171 46552 0 0))
+;;; Generated autoloads from mc-hide-unmatched-lines-mode.el
+
+(autoload 'mc-hide-unmatched-lines-mode "mc-hide-unmatched-lines-mode" "\
+Minor mode when enabled hides all lines where no cursors (and
+also hum/lines-to-expand below and above) To make use of this
+mode press \"C-'\" while multiple-cursor-mode is active. You can
+still edit lines while you are in mc-hide-unmatched-lines
+mode. To leave this mode press <return> or \"C-g\"
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "mc-mark-more" "mc-mark-more.el" (22171 46552
+;;;;;;  0 0))
+;;; Generated autoloads from mc-mark-more.el
+
+(autoload 'mc/mark-next-like-this "mc-mark-more" "\
+Find and mark the next part of the buffer matching the currently active region
+If no region is active add a cursor on the next line
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next.
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-next-like-this-word "mc-mark-more" "\
+Find and mark the next part of the buffer matching the currently active region
+If no region is active, mark the word at the point and find the next match
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next.
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-next-word-like-this "mc-mark-more" "\
+
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-next-symbol-like-this "mc-mark-more" "\
+
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-previous-like-this "mc-mark-more" "\
+Find and mark the previous part of the buffer matching the currently active region
+With negative ARG, delete the last one instead.
+With zero ARG, skip the last one and mark next.
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-previous-word-like-this "mc-mark-more" "\
+
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-previous-symbol-like-this "mc-mark-more" "\
+
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-next-lines "mc-mark-more" "\
+
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-previous-lines "mc-mark-more" "\
+
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/unmark-next-like-this "mc-mark-more" "\
+Deselect next part of the buffer matching the currently active region.
+
+\(fn)" t nil)
+
+(autoload 'mc/unmark-previous-like-this "mc-mark-more" "\
+Deselect prev part of the buffer matching the currently active region.
+
+\(fn)" t nil)
+
+(autoload 'mc/skip-to-next-like-this "mc-mark-more" "\
+Skip the current one and select the next part of the buffer matching the currently active region.
+
+\(fn)" t nil)
+
+(autoload 'mc/skip-to-previous-like-this "mc-mark-more" "\
+Skip the current one and select the prev part of the buffer matching the currently active region.
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-like-this "mc-mark-more" "\
+Find and mark all the parts of the buffer matching the currently active region
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-words-like-this "mc-mark-more" "\
+
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-symbols-like-this "mc-mark-more" "\
+
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-in-region "mc-mark-more" "\
+Find and mark all the parts in the region matching the given search
+
+\(fn BEG END &optional SEARCH)" t nil)
+
+(autoload 'mc/mark-all-in-region-regexp "mc-mark-more" "\
+Find and mark all the parts in the region matching the given regexp
+
+\(fn BEG END)" t nil)
+
+(autoload 'mc/mark-more-like-this-extended "mc-mark-more" "\
+Like mark-more-like-this, but then lets you adjust with arrows key.
+The adjustments work like this:
+
+   <up>    Mark previous like this and set direction to 'up
+   <down>  Mark next like this and set direction to 'down
+
+If direction is 'up:
+
+   <left>  Skip past the cursor furthest up
+   <right> Remove the cursor furthest up
+
+If direction is 'down:
+
+   <left>  Remove the cursor furthest down
+   <right> Skip past the cursor furthest down
+
+The bindings for these commands can be changed. See `mc/mark-more-like-this-extended-keymap'.
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-like-this-dwim "mc-mark-more" "\
+Tries to guess what you want to mark all of.
+Can be pressed multiple times to increase selection.
+
+With prefix, it behaves the same as original `mc/mark-all-like-this'
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-all-dwim "mc-mark-more" "\
+Tries even harder to guess what you want to mark all of.
+
+If the region is active and spans multiple lines, it will behave
+as if `mc/mark-all-in-region'. With the prefix ARG, it will call
+`mc/edit-lines' instead.
+
+If the region is inactive or on a single line, it will behave like
+`mc/mark-all-like-this-dwim'.
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/mark-all-like-this-in-defun "mc-mark-more" "\
+Mark all like this in defun.
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-words-like-this-in-defun "mc-mark-more" "\
+Mark all words like this in defun.
+
+\(fn)" t nil)
+
+(autoload 'mc/mark-all-symbols-like-this-in-defun "mc-mark-more" "\
+Mark all symbols like this in defun.
+
+\(fn)" t nil)
+
+(autoload 'mc/add-cursor-on-click "mc-mark-more" "\
+Add a cursor where you click.
+
+\(fn EVENT)" t nil)
+
+(autoload 'mc/mark-sgml-tag-pair "mc-mark-more" "\
+Mark the tag we're in and its pair for renaming.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "mc-mark-pop" "mc-mark-pop.el" (22171 46552
+;;;;;;  0 0))
+;;; Generated autoloads from mc-mark-pop.el
+
+(autoload 'mc/mark-pop "mc-mark-pop" "\
+Add a cursor at the current point, pop off mark ring and jump
+to the popped mark.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "mc-separate-operations" "mc-separate-operations.el"
+;;;;;;  (22171 46552 0 0))
+;;; Generated autoloads from mc-separate-operations.el
+
+(autoload 'mc/insert-numbers "mc-separate-operations" "\
+Insert increasing numbers for each cursor, starting at 0 or ARG.
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/insert-letters "mc-separate-operations" "\
+Insert increasing letters for each cursor, starting at 0 or ARG.
+     Where letter[0]=a letter[2]=c letter[26]=aa
+
+\(fn ARG)" t nil)
+
+(autoload 'mc/reverse-regions "mc-separate-operations" "\
+
+
+\(fn)" t nil)
+
+(autoload 'mc/sort-regions "mc-separate-operations" "\
+
+
+\(fn)" t nil)
+
+(autoload 'mc/vertical-align "mc-separate-operations" "\
+Aligns all cursors vertically with a given CHARACTER to the one with the
+highest colum number (the rightest).
+Might not behave as intended if more than one cursors are on the same line.
+
+\(fn CHARACTER)" t nil)
+
+(autoload 'mc/vertical-align-with-space "mc-separate-operations" "\
+Aligns all cursors with whitespace like `mc/vertical-align' does
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "multiple-cursors-core" "multiple-cursors-core.el"
+;;;;;;  (22171 46552 0 0))
+;;; Generated autoloads from multiple-cursors-core.el
+
+(autoload 'multiple-cursors-mode "multiple-cursors-core" "\
+Mode while multiple cursors are active.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "rectangular-region-mode" "rectangular-region-mode.el"
+;;;;;;  (22171 46552 0 0))
+;;; Generated autoloads from rectangular-region-mode.el
+
+(autoload 'set-rectangular-region-anchor "rectangular-region-mode" "\
+Anchors the rectangular region at point.
+
+Think of this one as `set-mark' except you're marking a rectangular region. It is
+an exceedingly quick way of adding multiple cursors to multiple lines.
+
+\(fn)" t nil)
+
+(autoload 'rectangular-region-mode "rectangular-region-mode" "\
+A mode for creating a rectangular region to edit
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("mc-cycle-cursors.el" "multiple-cursors-pkg.el"
+;;;;;;  "multiple-cursors.el") (22171 46552 834083 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; multiple-cursors-autoloads.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-core.el b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-core.el
new file mode 100644
index 0000000..e25f946
--- /dev/null
+++ b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-core.el
@@ -0,0 +1,769 @@
+;;; multiple-cursors-core.el --- An experiment in multiple cursors for emacs.
+
+;; Copyright (C) 2012 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Keywords: editing cursors
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file contains the core functionality of multiple-cursors.
+;; Please see multiple-cursors.el for more commentary.
+
+;;; Code:
+
+(require 'cl)
+
+(require 'rect)
+
+(defvar mc--read-char)
+
+(defface mc/cursor-face
+  '((t (:inverse-video t)))
+  "The face used for fake cursors"
+  :group 'multiple-cursors)
+
+(defface mc/region-face
+  '((t :inherit region))
+  "The face used for fake regions"
+  :group 'multiple-cursors)
+
+(defmacro mc/add-fake-cursor-to-undo-list (&rest forms)
+  "Make sure point is in the right place when undoing"
+  (let ((uc (make-symbol "undo-cleaner")))
+    `(let ((,uc (cons 'apply (cons 'deactivate-cursor-after-undo (list id)))))
+       (setq buffer-undo-list (cons ,uc buffer-undo-list))
+       ,@forms
+       (if (eq ,uc (car buffer-undo-list)) ;; if nothing has been added to the undo-list
+           (setq buffer-undo-list (cdr buffer-undo-list)) ;; then pop the cleaner right off again
+         (setq buffer-undo-list ;; otherwise add a function to activate this cursor
+               (cons (cons 'apply (cons 'activate-cursor-for-undo (list id))) buffer-undo-list))))))
+
+(defun mc/all-fake-cursors (&optional start end)
+  (remove-if-not 'mc/fake-cursor-p
+                 (overlays-in (or start (point-min))
+                              (or end   (point-max)))))
+
+(defmacro mc/for-each-fake-cursor (&rest forms)
+  "Runs the body for each fake cursor, bound to the name cursor"
+  `(mapc #'(lambda (cursor) ,@forms)
+         (mc/all-fake-cursors)))
+
+(defmacro mc/save-excursion (&rest forms)
+  "Saves and restores all the state that multiple-cursors cares about."
+  (let ((cs (make-symbol "current-state")))
+    `(let ((,cs (mc/store-current-state-in-overlay
+                 (make-overlay (point) (point) nil nil t))))
+       (overlay-put ,cs 'type 'original-cursor)
+       (save-excursion ,@forms)
+       (mc/pop-state-from-overlay ,cs))))
+
+(defun mc--compare-by-overlay-start (o1 o2)
+  (< (overlay-start o1) (overlay-start o2)))
+
+(defmacro mc/for-each-cursor-ordered (&rest forms)
+  "Runs the body for each cursor, fake and real, bound to the name cursor"
+  (let ((rci (make-symbol "real-cursor-id")))
+    `(let ((,rci (overlay-get (mc/create-fake-cursor-at-point) 'mc-id)))
+       (mapc #'(lambda (cursor)
+                 (when (mc/fake-cursor-p cursor)
+                   ,@forms))
+             (sort (overlays-in (point-min) (point-max)) 'mc--compare-by-overlay-start))
+       (mc/pop-state-from-overlay (mc/cursor-with-id ,rci)))))
+
+(defmacro mc/save-window-scroll (&rest forms)
+  "Saves and restores the window scroll position"
+  (let ((p (make-symbol "p"))
+        (s (make-symbol "start"))
+        (h (make-symbol "hscroll")))
+    `(let ((,p (set-marker (make-marker) (point)))
+           (,s (set-marker (make-marker) (window-start)))
+           (,h (window-hscroll)))
+       ,@forms
+       (goto-char ,p)
+       (set-window-start nil ,s t)
+       (set-window-hscroll nil ,h)
+       (set-marker ,p nil)
+       (set-marker ,s nil))))
+
+(defun mc/make-cursor-overlay-at-eol (pos)
+  "Create overlay to look like cursor at end of line."
+  (let ((overlay (make-overlay pos pos nil nil nil)))
+    (overlay-put overlay 'after-string (propertize " " 'face 'mc/cursor-face))
+    overlay))
+
+(defun mc/make-cursor-overlay-inline (pos)
+  "Create overlay to look like cursor inside text."
+  (let ((overlay (make-overlay pos (1+ pos) nil nil nil)))
+    (overlay-put overlay 'face 'mc/cursor-face)
+    overlay))
+
+(defun mc/make-cursor-overlay-at-point ()
+  "Create overlay to look like cursor.
+Special case for end of line, because overlay over a newline
+highlights the entire width of the window."
+  (if (eolp)
+      (mc/make-cursor-overlay-at-eol (point))
+    (mc/make-cursor-overlay-inline (point))))
+
+(defun mc/make-region-overlay-between-point-and-mark ()
+  "Create overlay to look like active region."
+  (let ((overlay (make-overlay (mark) (point) nil nil t)))
+    (overlay-put overlay 'face 'mc/region-face)
+    (overlay-put overlay 'type 'additional-region)
+    overlay))
+
+(defvar mc/cursor-specific-vars '(transient-mark-mode
+                                  kill-ring
+                                  kill-ring-yank-pointer
+                                  mark-ring
+                                  mark-active
+                                  yank-undo-function
+                                  autopair-action
+                                  autopair-wrap-action
+                                  er/history)
+  "A list of vars that need to be tracked on a per-cursor basis.")
+
+(defun mc/store-current-state-in-overlay (o)
+  "Store relevant info about point and mark in the given overlay."
+  (overlay-put o 'point (set-marker (make-marker) (point)))
+  (overlay-put o 'mark (set-marker (make-marker) (mark)))
+  (dolist (var mc/cursor-specific-vars)
+    (when (boundp var) (overlay-put o var (symbol-value var))))
+  o)
+
+(defun mc/restore-state-from-overlay (o)
+  "Restore point and mark from stored info in the given overlay."
+  (goto-char (overlay-get o 'point))
+  (set-marker (mark-marker) (overlay-get o 'mark))
+  (dolist (var mc/cursor-specific-vars)
+    (when (boundp var) (set var (overlay-get o var)))))
+
+(defun mc/remove-fake-cursor (o)
+  "Delete overlay with state, including dependent overlays and markers."
+  (set-marker (overlay-get o 'point) nil)
+  (set-marker (overlay-get o 'mark) nil)
+  (mc/delete-region-overlay o)
+  (delete-overlay o))
+
+(defun mc/pop-state-from-overlay (o)
+  "Restore the state stored in given overlay and then remove the overlay."
+  (mc/restore-state-from-overlay o)
+  (mc/remove-fake-cursor o))
+
+(defun mc/delete-region-overlay (o)
+  "Remove the dependent region overlay for a given cursor overlay."
+  (ignore-errors
+    (delete-overlay (overlay-get o 'region-overlay))))
+
+(defvar mc--current-cursor-id 0
+  "Var to store increasing id of fake cursors, used to keep track of them for undo.")
+
+(defun mc/create-cursor-id ()
+  "Returns a unique cursor id"
+  (incf mc--current-cursor-id))
+
+(defvar mc--max-cursors-original nil
+  "This variable maintains the original maximum number of cursors.
+When `mc/create-fake-cursor-at-point' is called and
+`mc/max-cursors' is overridden, this value serves as a backup so
+that `mc/max-cursors' can take on a new value.  When
+`mc/remove-fake-cursors' is called, the values are reset.")
+
+(defcustom mc/max-cursors nil
+  "Safety ceiling for the number of active cursors.
+If your emacs slows down or freezes when using too many cursors,
+customize this value appropriately.
+
+Cursors will be added until this value is reached, at which point
+you can either temporarily override the value or abort the
+operation entirely.
+
+If this value is nil, there is no ceiling."
+  :type '(integer)
+  :group 'multiple-cursors)
+
+(defun mc/create-fake-cursor-at-point (&optional id)
+  "Add a fake cursor and possibly a fake active region overlay based on point and mark.
+Saves the current state in the overlay to be restored later."
+  (unless mc--max-cursors-original
+    (setq mc--max-cursors-original mc/max-cursors))
+  (when mc/max-cursors
+    (unless (< (mc/num-cursors) mc/max-cursors)
+      (if (yes-or-no-p (format "%d active cursors. Continue? " (mc/num-cursors)))
+          (setq mc/max-cursors (read-number "Enter a new, temporary maximum: "))
+        (mc/remove-fake-cursors)
+        (error "Aborted: too many cursors"))))
+  (let ((overlay (mc/make-cursor-overlay-at-point)))
+    (overlay-put overlay 'mc-id (or id (mc/create-cursor-id)))
+    (overlay-put overlay 'type 'fake-cursor)
+    (overlay-put overlay 'priority 100)
+    (mc/store-current-state-in-overlay overlay)
+    (when (use-region-p)
+      (overlay-put overlay 'region-overlay
+                   (mc/make-region-overlay-between-point-and-mark)))
+    overlay))
+
+(defun mc/execute-command (cmd)
+  "Run command, simulating the parts of the command loop that makes sense for fake cursors."
+  (setq this-command cmd)
+  (run-hooks 'pre-command-hook)
+  (unless (eq this-command 'ignore)
+    (call-interactively cmd))
+  (run-hooks 'post-command-hook)
+  (when deactivate-mark (deactivate-mark)))
+
+(defvar mc--executing-command-for-fake-cursor nil)
+
+(defun mc/execute-command-for-fake-cursor (cmd cursor)
+  (let ((mc--executing-command-for-fake-cursor t)
+        (id (overlay-get cursor 'mc-id))
+        (annoying-arrows-mode nil)
+        (smooth-scroll-margin 0))
+    (mc/add-fake-cursor-to-undo-list
+     (mc/pop-state-from-overlay cursor)
+     (ignore-errors
+       (mc/execute-command cmd)
+       (mc/create-fake-cursor-at-point id)))))
+
+(defun mc/execute-command-for-all-fake-cursors (cmd)
+  "Calls CMD interactively for each cursor.
+It works by moving point to the fake cursor, setting
+up the proper environment, and then removing the cursor.
+After executing the command, it sets up a new fake
+cursor with updated info."
+  (mc/save-excursion
+   (mc/save-window-scroll
+    (mc/for-each-fake-cursor
+     (save-excursion
+       (mc/execute-command-for-fake-cursor cmd cursor)))))
+  (mc--reset-read-prompts))
+
+(defun mc/execute-command-for-all-cursors (cmd)
+  "Calls CMD interactively for the real cursor and all fakes."
+  (call-interactively cmd)
+  (mc/execute-command-for-all-fake-cursors cmd))
+
+;; Intercept some reading commands so you won't have to
+;; answer them for every single cursor
+
+(defvar mc--read-char nil)
+(defvar multiple-cursors-mode nil)
+(defadvice read-char (around mc-support activate)
+  (if (not multiple-cursors-mode)
+      ad-do-it
+    (unless mc--read-char
+      (setq mc--read-char ad-do-it))
+    (setq ad-return-value mc--read-char)))
+
+(defvar mc--read-quoted-char nil)
+(defadvice read-quoted-char (around mc-support activate)
+  (if (not multiple-cursors-mode)
+      ad-do-it
+    (unless mc--read-quoted-char
+      (setq mc--read-quoted-char ad-do-it))
+    (setq ad-return-value mc--read-quoted-char)))
+
+(defun mc--reset-read-prompts ()
+  (setq mc--read-char nil)
+  (setq mc--read-quoted-char nil))
+
+(mc--reset-read-prompts)
+
+(defun mc/fake-cursor-p (o)
+  "Predicate to check if an overlay is a fake cursor"
+  (eq (overlay-get o 'type) 'fake-cursor))
+
+(defun mc/cursor-with-id (id)
+  "Find the first cursor with the given id, or nil"
+  (find-if #'(lambda (o) (and (mc/fake-cursor-p o)
+                              (= id (overlay-get o 'mc-id))))
+           (overlays-in (point-min) (point-max))))
+
+(defvar mc--stored-state-for-undo nil
+  "Variable to keep the state of the real cursor while undoing a fake one")
+
+(defun activate-cursor-for-undo (id)
+  "Called when undoing to temporarily activate the fake cursor which action is being undone."
+  (let ((cursor (mc/cursor-with-id id)))
+    (when cursor
+      (setq mc--stored-state-for-undo (mc/store-current-state-in-overlay
+                                       (make-overlay (point) (point) nil nil t)))
+      (mc/pop-state-from-overlay cursor))))
+
+(defun deactivate-cursor-after-undo (id)
+  "Called when undoing to reinstate the real cursor after undoing a fake one."
+  (when mc--stored-state-for-undo
+    (mc/create-fake-cursor-at-point id)
+    (mc/pop-state-from-overlay mc--stored-state-for-undo)
+    (setq mc--stored-state-for-undo nil)))
+
+(defun mc/prompt-for-inclusion-in-whitelist (original-command)
+  "Asks the user, then adds the command either to the once-list or the all-list."
+  (let ((all-p (y-or-n-p (format "Do %S for all cursors?" original-command))))
+    (if all-p
+        (add-to-list 'mc/cmds-to-run-for-all original-command)
+      (add-to-list 'mc/cmds-to-run-once original-command))
+    (mc/save-lists)
+    all-p))
+
+(defun mc/num-cursors ()
+  "The number of cursors (real and fake) in the buffer."
+  (1+ (count-if 'mc/fake-cursor-p
+                (overlays-in (point-min) (point-max)))))
+
+(defvar mc--this-command nil
+  "Used to store the original command being run.")
+(make-variable-buffer-local 'mc--this-command)
+
+(defun mc/make-a-note-of-the-command-being-run ()
+  "Used with pre-command-hook to store the original command being run.
+Since that cannot be reliably determined in the post-command-hook.
+
+Specifically, this-original-command isn't always right, because it could have
+been remapped. And certain modes (cua comes to mind) will change their
+remapping based on state. So a command that changes the state will afterwards
+not be recognized through the command-remapping lookup."
+  (unless mc--executing-command-for-fake-cursor
+    (let ((cmd (or (command-remapping this-original-command)
+                   this-original-command)))
+      (setq mc--this-command (and (not (eq cmd 'god-mode-self-insert))
+                                  cmd)))))
+
+(defun mc/execute-this-command-for-all-cursors ()
+  "Wrap around `mc/execute-this-command-for-all-cursors-1' to protect hook."
+  (condition-case error
+      (mc/execute-this-command-for-all-cursors-1)
+    (error
+     (message "[mc] problem in `mc/execute-this-command-for-all-cursors': %s"
+              (error-message-string error)))))
+
+;; execute-kbd-macro should never be run for fake cursors. The real cursor will
+;; execute the keyboard macro, resulting in new commands in the command loop,
+;; and the fake cursors can pick up on those instead.
+(defadvice execute-kbd-macro (around skip-fake-cursors activate)
+  (unless mc--executing-command-for-fake-cursor
+    ad-do-it))
+
+(defun mc/execute-this-command-for-all-cursors-1 ()
+  "Used with post-command-hook to execute supported commands for all cursors.
+
+It uses two lists of commands to know what to do: the run-once
+list and the run-for-all list. If a command is in neither of these lists,
+it will prompt for the proper action and then save that preference.
+
+Some commands are so unsupported that they are even prevented for
+the original cursor, to inform about the lack of support."
+  (unless mc--executing-command-for-fake-cursor
+
+    (if (eq 1 (mc/num-cursors)) ;; no fake cursors? disable mc-mode
+        (multiple-cursors-mode 0)
+      (when this-original-command
+        (let ((original-command (or mc--this-command
+                                    (command-remapping this-original-command)
+                                    this-original-command)))
+
+          ;; skip keyboard macros, since they will generate actual commands that are
+          ;; also run in the command loop - we'll handle those later instead.
+          (when (functionp original-command)
+
+            ;; if it's a lambda, we can't know if it's supported or not
+            ;; - so go ahead and assume it's ok, because we're just optimistic like that
+            (if (or (not (symbolp original-command))
+                    ;; lambda registered by smartrep
+                    (string-prefix-p "(" (symbol-name original-command)))
+                (mc/execute-command-for-all-fake-cursors original-command)
+
+              ;; smartrep `intern's commands into own obarray to help
+              ;; `describe-bindings'.  So, let's re-`intern' here to
+              ;; make the command comparable by `eq'.
+              (setq original-command (intern (symbol-name original-command)))
+
+              ;; otherwise it's a symbol, and we can be more thorough
+              (if (get original-command 'mc--unsupported)
+                  (message "%S is not supported with multiple cursors%s"
+                           original-command
+                           (get original-command 'mc--unsupported))
+                (when (and original-command
+                           (not (memq original-command mc--default-cmds-to-run-once))
+                           (not (memq original-command mc/cmds-to-run-once))
+                           (or (memq original-command mc--default-cmds-to-run-for-all)
+                               (memq original-command mc/cmds-to-run-for-all)
+                               (mc/prompt-for-inclusion-in-whitelist original-command)))
+                  (mc/execute-command-for-all-fake-cursors original-command))))))))))
+
+(defun mc/remove-fake-cursors ()
+  "Remove all fake cursors.
+Do not use to conclude editing with multiple cursors. For that
+you should disable multiple-cursors-mode."
+  (mc/for-each-fake-cursor
+   (mc/remove-fake-cursor cursor))
+  (when mc--max-cursors-original
+    (setq mc/max-cursors mc--max-cursors-original))
+  (setq mc--max-cursors-original nil))
+
+(defun mc/keyboard-quit ()
+  "Deactivate mark if there are any active, otherwise exit multiple-cursors-mode."
+  (interactive)
+  (if (not (use-region-p))
+      (multiple-cursors-mode 0)
+    (deactivate-mark)))
+
+(defvar mc/keymap nil
+  "Keymap while multiple cursors are active.
+Main goal of the keymap is to rebind C-g and <return> to conclude
+multiple cursors editing.")
+(unless mc/keymap
+  (setq mc/keymap (make-sparse-keymap))
+  (define-key mc/keymap (kbd "C-g") 'mc/keyboard-quit)
+  (define-key mc/keymap (kbd "<return>") 'multiple-cursors-mode)
+  (when (fboundp 'phi-search)
+    (define-key mc/keymap (kbd "C-s") 'phi-search))
+  (when (fboundp 'phi-search-backward)
+    (define-key mc/keymap (kbd "C-r") 'phi-search-backward)))
+
+(defun mc--all-equal (list)
+  "Are all the items in LIST equal?"
+  (let ((first (car list))
+        (all-equal t))
+    (while (and all-equal list)
+      (setq all-equal (equal first (car list)))
+      (setq list (cdr list)))
+    all-equal))
+
+(defun mc--kill-ring-entries ()
+  "Return the latest kill-ring entry for each cursor.
+The entries are returned in the order they are found in the buffer."
+  (let (entries)
+    (mc/for-each-cursor-ordered
+     (setq entries (cons (car (overlay-get cursor 'kill-ring)) entries)))
+    (reverse entries)))
+
+(defun mc--maybe-set-killed-rectangle ()
+  "Add the latest kill-ring entry for each cursor to killed-rectangle.
+So you can paste it in later with `yank-rectangle'."
+  (let ((entries (let (mc/max-cursors) (mc--kill-ring-entries))))
+    (unless (mc--all-equal entries)
+      (setq killed-rectangle entries))))
+
+(defvar mc/unsupported-minor-modes '(company-mode auto-complete-mode flyspell-mode jedi-mode)
+  "List of minor-modes that does not play well with multiple-cursors.
+They are temporarily disabled when multiple-cursors are active.")
+
+(defvar mc/temporarily-disabled-minor-modes nil
+  "The list of temporarily disabled minor-modes.")
+(make-variable-buffer-local 'mc/temporarily-disabled-minor-modes)
+
+(defun mc/temporarily-disable-minor-mode (mode)
+  "If MODE is available and turned on, remember that and turn it off."
+  (when (and (boundp mode) (eval mode))
+    (add-to-list 'mc/temporarily-disabled-minor-modes mode)
+    (funcall mode -1)))
+
+(defun mc/temporarily-disable-unsupported-minor-modes ()
+  (mapc 'mc/temporarily-disable-minor-mode mc/unsupported-minor-modes))
+
+(defun mc/enable-minor-mode (mode)
+  (funcall mode 1))
+
+(defun mc/enable-temporarily-disabled-minor-modes ()
+  (mapc 'mc/enable-minor-mode mc/temporarily-disabled-minor-modes)
+  (setq mc/temporarily-disabled-minor-modes nil))
+
+(defcustom mc/mode-line
+  `(" mc:" (:eval (format ,(propertize "%d" 'face 'font-lock-warning-face)
+                          (mc/num-cursors))))
+  "What to display in the mode line while multiple-cursors-mode is active."
+  :group 'multiple-cursors)
+(put 'mc/mode-line 'risky-local-variable t)
+
+;;;###autoload
+(define-minor-mode multiple-cursors-mode
+  "Mode while multiple cursors are active."
+  nil mc/mode-line mc/keymap
+  (if multiple-cursors-mode
+      (progn
+        (mc/temporarily-disable-unsupported-minor-modes)
+        (add-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run nil t)
+        (add-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t t)
+        (run-hooks 'multiple-cursors-mode-enabled-hook))
+    (remove-hook 'post-command-hook 'mc/execute-this-command-for-all-cursors t)
+    (remove-hook 'pre-command-hook 'mc/make-a-note-of-the-command-being-run t)
+    (setq mc--this-command nil)
+    (mc--maybe-set-killed-rectangle)
+    (mc/remove-fake-cursors)
+    (mc/enable-temporarily-disabled-minor-modes)
+    (run-hooks 'multiple-cursors-mode-disabled-hook)))
+
+(add-hook 'after-revert-hook #'(lambda () (multiple-cursors-mode 0)))
+
+(defun mc/maybe-multiple-cursors-mode ()
+  "Enable multiple-cursors-mode if there is more than one currently active cursor."
+  (if (> (mc/num-cursors) 1)
+      (multiple-cursors-mode 1)
+    (multiple-cursors-mode 0)))
+
+(defmacro unsupported-cmd (cmd msg)
+  "Adds command to list of unsupported commands and prevents it
+from being executed if in multiple-cursors-mode."
+  `(progn
+     (put (quote ,cmd) 'mc--unsupported ,msg)
+     (defadvice ,cmd (around unsupported-advice activate)
+       "command isn't supported with multiple cursors"
+       (unless (and multiple-cursors-mode (called-interactively-p 'any))
+         ad-do-it))))
+
+;; Commands that does not work with multiple-cursors
+(unsupported-cmd isearch-forward ". Feel free to add a compatible version.")
+(unsupported-cmd isearch-backward ". Feel free to add a compatible version.")
+
+;; Make sure pastes from other programs are added to all kill-rings when yanking
+(defadvice current-kill (before interprogram-paste-for-all-cursors activate)
+  (let ((interprogram-paste (and (= n 0)
+                                 interprogram-paste-function
+                                 (funcall interprogram-paste-function))))
+    (when interprogram-paste
+      ;; Add interprogram-paste to normal kill ring, just
+      ;; like current-kill usually does for itself.
+      ;; We have to do the work for it tho, since the funcall only returns
+      ;; something once. It is not a pure function.
+      (let ((interprogram-cut-function nil))
+        (if (listp interprogram-paste)
+            (mapc 'kill-new (nreverse interprogram-paste))
+          (kill-new interprogram-paste))
+        ;; And then add interprogram-paste to the kill-rings
+        ;; of all the other cursors too.
+        (mc/for-each-fake-cursor
+         (let ((kill-ring (overlay-get cursor 'kill-ring))
+               (kill-ring-yank-pointer (overlay-get cursor 'kill-ring-yank-pointer)))
+           (if (listp interprogram-paste)
+               (mapc 'kill-new (nreverse interprogram-paste))
+             (kill-new interprogram-paste))
+           (overlay-put cursor 'kill-ring kill-ring)
+           (overlay-put cursor 'kill-ring-yank-pointer kill-ring-yank-pointer)))))))
+
+(defvar mc/list-file (locate-user-emacs-file ".mc-lists.el")
+  "The position of the file that keeps track of your preferences
+for running commands with multiple cursors.")
+
+(defun mc/dump-list (list-symbol)
+  "Insert (setq 'LIST-SYMBOL LIST-VALUE) to current buffer."
+  (symbol-macrolet ((value (symbol-value list-symbol)))
+    (insert "(setq " (symbol-name list-symbol) "\n"
+            "      '(")
+    (newline-and-indent)
+    (set list-symbol
+         (sort value (lambda (x y) (string-lessp (symbol-name x)
+                                                 (symbol-name y)))))
+    (mapc #'(lambda (cmd) (insert (format "%S" cmd)) (newline-and-indent))
+          value)
+    (insert "))")
+    (newline)))
+
+(defun mc/save-lists ()
+  "Saves preferences for running commands with multiple cursors to `mc/list-file'"
+  (with-temp-file mc/list-file
+    (emacs-lisp-mode)
+    (insert ";; This file is automatically generated by the multiple-cursors extension.")
+    (newline)
+    (insert ";; It keeps track of your preferences for running commands with multiple cursors.")
+    (newline)
+    (newline)
+    (mc/dump-list 'mc/cmds-to-run-for-all)
+    (newline)
+    (mc/dump-list 'mc/cmds-to-run-once)))
+
+(defvar mc/cmds-to-run-once nil
+  "Commands to run only once in multiple-cursors-mode.")
+
+(defvar mc--default-cmds-to-run-once nil
+  "Default set of commands to run only once in multiple-cursors-mode.")
+
+(setq mc--default-cmds-to-run-once '(mc/edit-lines
+                                     mc/edit-ends-of-lines
+                                     mc/edit-beginnings-of-lines
+                                     mc/mark-next-like-this
+				     mc/mark-next-like-this-word
+				     mc/mark-next-like-this-symbol
+                                     mc/mark-next-word-like-this
+                                     mc/mark-next-symbol-like-this
+                                     mc/mark-previous-like-this
+                                     mc/mark-previous-word-like-this
+                                     mc/mark-previous-symbol-like-this
+                                     mc/mark-all-like-this
+                                     mc/mark-all-words-like-this
+                                     mc/mark-all-symbols-like-this
+                                     mc/mark-more-like-this-extended
+                                     mc/mark-all-like-this-in-defun
+                                     mc/mark-all-words-like-this-in-defun
+                                     mc/mark-all-symbols-like-this-in-defun
+                                     mc/mark-all-like-this-dwim
+                                     mc/mark-all-dwim
+                                     mc/mark-sgml-tag-pair
+                                     mc/insert-numbers
+				     mc/insert-letters
+                                     mc/sort-regions
+                                     mc/reverse-regions
+                                     mc/cycle-forward
+                                     mc/cycle-backward
+                                     mc/add-cursor-on-click
+                                     mc/mark-pop
+                                     mc/add-cursors-to-all-matches
+                                     mc/mmlte--left
+                                     mc/mmlte--right
+                                     mc/mmlte--up
+                                     mc/mmlte--down
+                                     mc/unmark-next-like-this
+                                     mc/unmark-previous-like-this
+                                     mc/skip-to-next-like-this
+                                     mc/skip-to-previous-like-this
+                                     rrm/switch-to-multiple-cursors
+                                     mc-hide-unmatched-lines-mode
+                                     hum/keyboard-quit
+                                     hum/unhide-invisible-overlays
+                                     save-buffer
+                                     ido-exit-minibuffer
+                                     exit-minibuffer
+                                     minibuffer-complete-and-exit
+                                     execute-extended-command
+                                     undo
+                                     redo
+                                     undo-tree-undo
+                                     undo-tree-redo
+                                     universal-argument
+                                     universal-argument-more
+                                     universal-argument-other-key
+                                     negative-argument
+                                     digit-argument
+                                     top-level
+                                     recenter-top-bottom
+                                     describe-mode
+                                     describe-key-1
+                                     describe-function
+                                     describe-bindings
+                                     describe-prefix-bindings
+                                     view-echo-area-messages
+                                     other-window
+                                     kill-buffer-and-window
+                                     split-window-right
+                                     split-window-below
+                                     delete-other-windows
+                                     toggle-window-split
+                                     mwheel-scroll
+                                     scroll-up-command
+                                     scroll-down-command
+                                     mouse-set-point
+                                     mouse-drag-region
+                                     quit-window
+                                     toggle-read-only
+                                     windmove-left
+                                     windmove-right
+                                     windmove-up
+                                     windmove-down))
+
+(defvar mc--default-cmds-to-run-for-all nil
+  "Default set of commands that should be mirrored by all cursors")
+
+(setq mc--default-cmds-to-run-for-all '(mc/keyboard-quit
+                                        self-insert-command
+                                        quoted-insert
+                                        previous-line
+                                        next-line
+                                        newline
+                                        newline-and-indent
+                                        open-line
+                                        delete-blank-lines
+                                        transpose-chars
+                                        transpose-lines
+                                        transpose-paragraphs
+                                        transpose-regions
+                                        join-line
+                                        right-char
+                                        right-word
+                                        forward-char
+                                        forward-word
+                                        left-char
+                                        left-word
+                                        backward-char
+                                        backward-word
+                                        forward-paragraph
+                                        backward-paragraph
+                                        upcase-word
+                                        downcase-word
+                                        capitalize-word
+                                        forward-list
+                                        backward-list
+                                        hippie-expand
+                                        hippie-expand-lines
+                                        yank
+                                        yank-pop
+                                        append-next-kill
+                                        kill-word
+                                        kill-line
+                                        kill-whole-line
+                                        backward-kill-word
+                                        backward-delete-char-untabify
+                                        delete-char delete-forward-char
+                                        delete-backward-char
+                                        py-electric-backspace
+                                        c-electric-backspace
+                                        org-delete-backward-char
+                                        cperl-electric-backspace
+                                        python-indent-dedent-line-backspace
+                                        paredit-backward-delete
+                                        autopair-backspace
+                                        just-one-space
+                                        zap-to-char
+                                        end-of-line
+                                        set-mark-command
+                                        exchange-point-and-mark
+                                        cua-set-mark
+                                        cua-replace-region
+                                        cua-delete-region
+                                        move-end-of-line
+                                        beginning-of-line
+                                        move-beginning-of-line
+                                        kill-ring-save
+                                        back-to-indentation
+                                        subword-forward
+                                        subword-backward
+                                        subword-mark
+                                        subword-kill
+                                        subword-backward-kill
+                                        subword-transpose
+                                        subword-capitalize
+                                        subword-upcase
+                                        subword-downcase
+                                        er/expand-region
+                                        er/contract-region
+                                        smart-forward
+                                        smart-backward
+                                        smart-up
+                                        smart-down))
+
+(defvar mc/cmds-to-run-for-all nil
+  "Commands to run for all cursors in multiple-cursors-mode")
+
+(load mc/list-file t) ;; load, but no errors if it does not exist yet please
+
+(provide 'multiple-cursors-core)
+
+;; Local Variables:
+;; coding: utf-8
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
+;;; multiple-cursors-core.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-pkg.el b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-pkg.el
new file mode 100644
index 0000000..c18772d
--- /dev/null
+++ b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors-pkg.el
@@ -0,0 +1,4 @@
+(define-package "multiple-cursors" "20151205.1225" "Multiple cursors for Emacs." 'nil)
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors.el b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors.el
new file mode 100644
index 0000000..675cf38
--- /dev/null
+++ b/emacs.d/elpa/multiple-cursors-20151205.1225/multiple-cursors.el
@@ -0,0 +1,199 @@
+;;; multiple-cursors.el --- Multiple cursors for emacs.
+
+;; Copyright (C) 2012-2013 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 1.2.2
+;; Keywords: editing cursors
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Multiple cursors for Emacs. This is some pretty crazy functionality, so yes,
+;; there are kinks. Don't be afraid tho, I've been using it since 2011 with
+;; great success and much merriment.
+
+;; ## Basic usage
+
+;; Start out with:
+
+;;     (require 'multiple-cursors)
+
+;; Then you have to set up your keybindings - multiple-cursors doesn't presume to
+;; know how you'd like them laid out. Here are some examples:
+
+;; When you have an active region that spans multiple lines, the following will
+;; add a cursor to each line:
+
+;;     (global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
+
+;; When you want to add multiple cursors not based on continuous lines, but based on
+;; keywords in the buffer, use:
+
+;;     (global-set-key (kbd "C->") 'mc/mark-next-like-this)
+;;     (global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
+;;     (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
+
+;; First mark the word, then add more cursors.
+
+;; To get out of multiple-cursors-mode, press `<return>` or `C-g`. The latter will
+;; first disable multiple regions before disabling multiple cursors. If you want to
+;; insert a newline in multiple-cursors-mode, use `C-j`.
+
+;; ## Video
+
+;; You can [watch an intro to multiple-cursors at Emacs Rocks](http://emacsrocks.com/e13.html).
+
+;; ## Command overview
+
+;; ### Mark one more occurrence
+
+;;  - `mc/mark-next-like-this`: Adds a cursor and region at the next part of the buffer forwards that matches the current region.
+;;  - `mc/mark-next-like-this-word`: Adds a cursor and region at the next part of the buffer forwards that matches the current region, if  no region is selected it selects the word at the point.
+;;  - `mc/mark-next-like-this-symbol`: Adds a cursor and region at the next part of the buffer forwards that matches the current region, if  no region is selected it selects the symbol at the point.
+;;  - `mc/mark-next-word-like-this`: Like `mc/mark-next-like-this` but only for whole words.
+;;  - `mc/mark-next-symbol-like-this`: Like `mc/mark-next-like-this` but only for whole symbols.
+;;  - `mc/mark-previous-like-this`: Adds a cursor and region at the next part of the buffer backwards that matches the current region.
+;;  - `mc/mark-previous-word-like-this`: Like `mc/mark-previous-like-this` but only for whole words.
+;;  - `mc/mark-previous-symbol-like-this`: Like `mc/mark-previous-like-this` but only for whole symbols.
+;;  - `mc/mark-more-like-this-extended`: Use arrow keys to quickly mark/skip next/previous occurances.
+;;  - `mc/add-cursor-on-click`: Bind to a mouse event to add cursors by clicking. See tips-section.
+
+;; ### Mark many occurrences
+
+;;  - `mc/mark-all-like-this`: Marks all parts of the buffer that matches the current region.
+;;  - `mc/mark-all-words-like-this`: Like `mc/mark-all-like-this` but only for whole words.
+;;  - `mc/mark-all-symbols-like-this`: Like `mc/mark-all-like-this` but only for whole symbols.
+;;  - `mc/mark-all-in-region`: Prompts for a string to match in the region, adding cursors to all of them.
+;;  - `mc/mark-all-like-this-in-defun`: Marks all parts of the current defun that matches the current region.
+;;  - `mc/mark-all-words-like-this-in-defun`: Like `mc/mark-all-like-this-in-defun` but only for whole words.
+;;  - `mc/mark-all-symbols-like-this-in-defun`: Like `mc/mark-all-like-this-in-defun` but only for whole symbols.
+;;  - `mc/mark-all-like-this-dwim`: Tries to be smart about marking everything you want. Can be pressed multiple times.
+
+;; ### Special
+
+;;  - `set-rectangular-region-anchor`: Think of this one as `set-mark` except you're marking a rectangular region.
+;;  - `mc/mark-sgml-tag-pair`: Mark the current opening and closing tag.
+;;  - `mc/insert-numbers`: Insert increasing numbers for each cursor, top to bottom.
+;;  - `mc/insert-letters`: Insert increasing letters for each cursor, top to bottom.
+;;  - `mc/sort-regions`: Sort the marked regions alphabetically.
+;;  - `mc/reverse-regions`: Reverse the order of the marked regions.
+
+;; ## Tips and tricks
+
+;; - To get out of multiple-cursors-mode, press `<return>` or `C-g`. The latter will
+;;   first disable multiple regions before disabling multiple cursors. If you want to
+;;   insert a newline in multiple-cursors-mode, use `C-j`.
+;;
+;; - Sometimes you end up with cursors outside of your view. You can
+;;   scroll the screen to center on each cursor with `C-v` and `M-v`.
+;;
+;; - Try pressing `mc/mark-next-like-this` with no region selected. It will just add a cursor
+;;   on the next line.
+;;
+;; - Try pressing `mc/mark-next-like-this-word` or
+;;   `mc/mark-next-like-this-symbol` with no region selected. It will
+;;   mark the symbol and add a cursor at the next occurance
+;;
+;; - Try pressing `mc/mark-all-like-this-dwim` on a tagname in html-mode.
+;;
+;; - Notice that the number of cursors active can be seen in the modeline.
+;;
+;; - If you get out of multiple-cursors-mode and yank - it will yank only
+;;   from the kill-ring of main cursor. To yank from the kill-rings of
+;;   every cursor use yank-rectangle, normally found at C-x r y.
+;;
+;; - You can use `mc/reverse-regions` with nothing selected and just one cursor.
+;;   It will then flip the sexp at point and the one below it.
+;;
+;; - If you would like to keep the global bindings clean, and get custom keybindings
+;;   when the region is active, you can try [region-bindings-mode](https://github.com/fgallina/region-bindings-mode).
+;;
+;; BTW, I highly recommend adding `mc/mark-next-like-this` to a key binding that's
+;; right next to the key for `er/expand-region`.
+
+;; ### Binding mouse events
+
+;; To override a mouse event, you will likely have to also unbind the
+;; `down-mouse` part of the event. Like this:
+;;
+;;     (global-unset-key (kbd "M-<down-mouse-1>"))
+;;     (global-set-key (kbd "M-<mouse-1>") 'mc/add-cursor-on-click)
+;;
+;; Or you can do like me and find an unused, but less convenient, binding:
+;;
+;;     (global-set-key (kbd "C-S-<mouse-1>") 'mc/add-cursor-on-click)
+
+;; ## Unknown commands
+
+;; Multiple-cursors uses two lists of commands to know what to do: the run-once list
+;; and the run-for-all list. It comes with a set of defaults, but it would be beyond silly
+;; to try and include all the known Emacs commands.
+
+;; So that's why multiple-cursors occasionally asks what to do about a command. It will
+;; then remember your choice by saving it in `~/.emacs.d/.mc-lists.el`. You can change
+;; the location with:
+
+;;     (setq mc/list-file "/my/preferred/file")
+
+;; ## Known limitations
+
+;; * isearch-forward and isearch-backward aren't supported with multiple cursors.
+;;   You should feel free to add a simplified version that can work with it.
+;; * Commands run with `M-x` won't be repeated for all cursors.
+;; * All key bindings that refer to lambdas are always run for all cursors. If you
+;;   need to limit it, you will have to give it a name.
+;; * Redo might screw with your cursors. Undo works very well.
+
+;; ## Contribute
+
+;; Yes, please do. There's a suite of tests, so remember to add tests for your
+;; specific feature, or I might break it later.
+
+;; You'll find the repo at:
+
+;;     https://github.com/magnars/multiple-cursors.el
+
+;; To fetch the test dependencies:
+
+;;     $ cd /path/to/multiple-cursors
+;;     $ git submodule update --init
+
+;; Run the tests with:
+
+;;     $ ./util/ecukes/ecukes --graphical
+
+;; ## Contributors
+
+;; * [Takafumi Arakaki](https://github.com/tkf) made .mc-lists.el diff friendly
+;; * [Marco Baringer](https://github.com/segv) contributed looping to mc/cycle and adding cursors without region for mark-more.
+;; * [Ivan Andrus](https://github.com/gvol) added showing number of cursors in mode-line
+;; * [Fuco](https://github.com/Fuco1) added the first version of `mc/mark-all-like-this-dwim`
+
+;; Thanks!
+
+;;; Code:
+
+(require 'mc-edit-lines)
+(require 'mc-cycle-cursors)
+(require 'mc-mark-more)
+(require 'mc-mark-pop)
+(require 'rectangular-region-mode)
+(require 'mc-separate-operations)
+(require 'mc-hide-unmatched-lines-mode)
+
+(provide 'multiple-cursors)
+
+;;; multiple-cursors.el ends here
diff --git a/emacs.d/elpa/multiple-cursors-20150528.2303/rectangular-region-mode.el b/emacs.d/elpa/multiple-cursors-20151205.1225/rectangular-region-mode.el
similarity index 100%
rename from emacs.d/elpa/multiple-cursors-20150528.2303/rectangular-region-mode.el
rename to emacs.d/elpa/multiple-cursors-20151205.1225/rectangular-region-mode.el
diff --git a/emacs.d/elpa/php-mode-20150623.431/php-mode-autoloads.el b/emacs.d/elpa/php-mode-20150623.431/php-mode-autoloads.el
deleted file mode 100644
index 90e0500..0000000
--- a/emacs.d/elpa/php-mode-20150623.431/php-mode-autoloads.el
+++ /dev/null
@@ -1,34 +0,0 @@
-;;; php-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "php-mode" "php-mode.el" (21898 47965 0 0))
-;;; Generated autoloads from php-mode.el
-
-(let ((loads (get 'php 'custom-loads))) (if (member '"php-mode" loads) nil (put 'php 'custom-loads (cons '"php-mode" loads))))
-
-(defvar php-extra-constants 'nil "\
-A list of additional strings to treat as PHP constants.")
-
-(custom-autoload 'php-extra-constants "php-mode" nil)
-
-(add-to-list 'interpreter-mode-alist (cons "php" 'php-mode))
-
-(autoload 'php-mode "php-mode" "\
-Major mode for editing PHP code.
-
-\\{php-mode-map}
-
-\(fn)" t nil)
-
-(dolist (pattern '("\\.php[s345t]?\\'" "\\.phtml\\'" "Amkfile" "\\.amk$")) (add-to-list 'auto-mode-alist `(,pattern . php-mode) t))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; php-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/php-mode-20150623.431/php-mode-pkg.el b/emacs.d/elpa/php-mode-20150623.431/php-mode-pkg.el
deleted file mode 100644
index 2c2fe6b..0000000
--- a/emacs.d/elpa/php-mode-20150623.431/php-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "php-mode" "20150623.431" "Major mode for editing PHP code" 'nil :url "https://github.com/ejmr/php-mode")
diff --git a/emacs.d/elpa/php-mode-20150623.431/php-mode.el b/emacs.d/elpa/php-mode-20150623.431/php-mode.el
deleted file mode 100644
index c908372..0000000
--- a/emacs.d/elpa/php-mode-20150623.431/php-mode.el
+++ /dev/null
@@ -1,1541 +0,0 @@
-;;; php-mode.el --- Major mode for editing PHP code
-
-;; Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
-;;               2008 Aaron S. Hawley
-;;               2011, 2012, 2013, 2014, 2015 Eric James Michael Ritz
-
-;;; Author: Eric James Michael Ritz
-;;; URL: https://github.com/ejmr/php-mode
-;; Package-Version: 20150623.431
-;;; Version: 1.17.0
-
-(defconst php-mode-version-number "1.17.0"
-  "PHP Mode version number.")
-
-(defconst php-mode-modified "2015-06-23"
-  "PHP Mode build date.")
-
-;;; License
-
-;; 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 file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this file; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301, USA.
-
-;;; Usage
-
-;; Put this file in your Emacs lisp path (eg. site-lisp) and add to
-;; your .emacs file:
-;;
-;;   (require 'php-mode)
-
-;; To use abbrev-mode, add lines like this:
-;;   (add-hook 'php-mode-hook
-;;     '(lambda () (define-abbrev php-mode-abbrev-table "ex" "extends")))
-
-;; To make php-mode compatible with html-mode, see http://php-mode.sf.net
-
-;; Many options available under Help:Customize
-;; Options specific to php-mode are in
-;;  Programming/Languages/Php
-;; Since it inherits much functionality from c-mode, look there too
-;;  Programming/Languages/C
-
-;;; Commentary:
-
-;; PHP mode is a major mode for editing PHP source code.  It's an
-;; extension of C mode; thus it inherits all C mode's navigation
-;; functionality.  But it colors according to the PHP grammar and
-;; indents according to the PEAR coding guidelines.  It also includes
-;; a couple handy IDE-type features such as documentation search and a
-;; source and class browser.
-
-;;; Code:
-
-(require 'cc-mode)
-(eval-when-compile
-  (require 'cc-langs)
-  (require 'cc-fonts))
-
-;; Boilerplate from other `cc-mode' derived modes. See
-;; http://cc-mode.sourceforge.net/derived-mode-ex.el for details on how this all
-;; fits together.
-(eval-and-compile
-  (c-add-language 'php-mode 'java-mode))
-
-(require 'font-lock)
-(require 'add-log)
-(require 'custom)
-(require 'flymake)
-(require 'etags)
-(require 'speedbar)
-(eval-when-compile
-  (unless (require 'cl-lib nil t)
-    (require 'cl))
-  (require 'regexp-opt)
-  (defvar c-vsemi-status-unknown-p)
-  (defvar syntax-propertize-via-font-lock))
-
-;; Work around emacs bug#18845, cc-mode expects cl to be loaded
-;; while php-mode only uses cl-lib (without compatibility aliases)
-(eval-and-compile
-  (if (and (= emacs-major-version 24) (>= emacs-minor-version 4))
-    (require 'cl)))
-
-;; Use the recommended cl functions in php-mode but alias them to the
-;; old names when we detect emacs < 24.3
-(if (and (= emacs-major-version 24) (< emacs-minor-version 3))
-    (unless (fboundp 'cl-set-difference)
-      (defalias 'cl-set-difference 'set-difference)))
-
-
-;; Local variables
-;;;###autoload
-(defgroup php nil
-  "Major mode `php-mode' for editing PHP code."
-  :prefix "php-"
-  :group 'languages
-  :link '(url-link :tag "Official Site" "https://github.com/ejmr/php-mode")
-  :link '(url-link :tag "PHP Mode Wiki" "https://github.com/ejmr/php-mode/wiki"))
-
-(defcustom php-executable (or (executable-find "php")
-                              "/usr/bin/php")
-  "The location of the PHP executable."
-  :type 'string
-  :group 'php)
-
-(defcustom php-default-face 'default
-  "Default face in `php-mode' buffers."
-  :type 'face
-  :group 'php)
-
-(defcustom php-speedbar-config t
-  "When set to true automatically configures Speedbar to observe PHP files.
-Ignores php-file patterns option; fixed to expression \"\\.\\(inc\\|php[s345]?\\)\""
-  :type 'boolean
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when val
-             (speedbar-add-supported-extension
-              "\\.\\(inc\\|php[s345]?\\|phtml\\)")))
-  :group 'php)
-
-(defcustom php-mode-speedbar-open nil
-  "Normally `php-mode' starts with the speedbar closed.
-Turning this on will open it whenever `php-mode' is loaded."
-  :type 'boolean
-  :set (lambda (sym val)
-         (set-default sym val)
-         (when val
-             (speedbar 1)))
-  :group 'php)
-
-(defcustom php-template-compatibility t
-  "Should detect presence of html tags."
-  :type 'boolean
-  :group 'php)
-
-(defun php-mode-extra-constants-create-regexp(kwds)
-  "Create regexp for the list of extra constant keywords KWDS."
-   (concat "[^_$]?\\<\\("
-           (regexp-opt
-             (append kwds
-                     (when (boundp 'web-mode-extra-php-constants) web-mode-extra-php-constants)))
-           "\\)\\>[^_]?"))
-
-(defun php-mode-extra-constants-set(sym value)
-  "Apply the list of extra constant keywords VALUE.
-
-This function is called when the custom variable php-extra-constants
-is updated. The web-mode-extra-constants list is appended to the list
-of constants when set."
-  ;; remove old keywords
-  (when (boundp 'php-extra-constants)
-    (font-lock-remove-keywords
-     'php-mode `((,(php-mode-extra-constants-create-regexp php-extra-constants) 1 font-lock-constant-face))))
-  ;; add new keywords
-  (when value
-    (font-lock-add-keywords
-     'php-mode `((,(php-mode-extra-constants-create-regexp value) 1 font-lock-constant-face))))
-  (set sym value))
-
-(defcustom php-lineup-cascaded-calls nil
-  "Indent chained method calls to the previous line"
-  :type 'boolean
-  :group 'php)
-
-;;;###autoload
-(defcustom php-extra-constants '()
-  "A list of additional strings to treat as PHP constants."
-  :type 'list
-  :set 'php-mode-extra-constants-set
-  :group 'php)
-
-(defun php-create-regexp-for-method (visibility)
-  "Make a regular expression for methods with the given VISIBILITY.
-
-VISIBILITY must be a string that names the visibility for a PHP
-method, e.g. 'public'.  The parameter VISIBILITY can itself also
-be a regular expression.
-
-The regular expression this function returns will check for other
-keywords that can appear in method signatures, e.g. 'final' and
-'static'.  The regular expression will have one capture group
-which will be the name of the method."
-  (concat
-   ;; Initial space with possible 'abstract' or 'final' keywords
-   "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?"
-   ;; 'static' keyword may come either before or after visibility
-   "\\(?:" visibility "\\(?:\\s-+static\\)?\\|\\(?:static\\s-+\\)?" visibility "\\)\\s-+"
-   ;; Make sure 'function' comes next with some space after
-   "function\\s-+"
-   ;; Capture the name as the first group and the regexp and make sure
-   ;; by the end we see the opening parenthesis for the parameters.
-   "\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*("))
-
-(defun php-create-regexp-for-classlike (type)
-  "Accepts a `type' of a 'classlike' object as a string, such as
-'class' or 'interface', and returns a regexp as a string which
-can be used to match against definitions for that classlike."
-  (concat
-   ;; First see if 'abstract' or 'final' appear, although really these
-   ;; are not valid for all values of `type' that the function
-   ;; accepts.
-   "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?"
-   ;; The classlike type
-   type
-   ;; Its name, which is the first captured group in the regexp.  We
-   ;; allow backslashes in the name to handle namespaces, but again
-   ;; this is not necessarily correct for all values of `type'.
-   "\\s-+\\(\\(?:\\sw\\|\\\\\\|\\s_\\)+\\)"))
-
-(defvar php-imenu-generic-expression
-  `(("Namespaces"
-    ,(php-create-regexp-for-classlike "namespace") 1)
-   ("Classes"
-    ,(php-create-regexp-for-classlike "class") 1)
-   ("Interfaces"
-    ,(php-create-regexp-for-classlike "interface") 1)
-   ("Traits"
-    ,(php-create-regexp-for-classlike "trait") 1)
-   ("All Methods"
-    ,(php-create-regexp-for-method "\\(?:\\sw\\|\\s_\\)+") 1)
-   ("Private Methods"
-    ,(php-create-regexp-for-method "private") 1)
-   ("Protected Methods"
-    ,(php-create-regexp-for-method "protected")  1)
-   ("Public Methods"
-    ,(php-create-regexp-for-method "public") 1)
-   ("Anonymous Functions"
-    "\\<\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*=\\s-*function\\s-*(" 1)
-   ("Named Functions"
-    "^\\s-*function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1))
- "Imenu generic expression for PHP Mode. See `imenu-generic-expression'.")
-
-(defcustom php-manual-url "http://www.php.net/manual/en/"
-  "URL at which to find PHP manual.
-You can replace \"en\" with your ISO language code."
-  :type 'string
-  :group 'php)
-
-(defcustom php-search-url "http://www.php.net/"
-  "URL at which to search for documentation on a word."
-  :type 'string
-  :group 'php)
-
-(defcustom php-completion-file ""
-  "Path to the file which contains the function names known to PHP."
-  :type 'string
-  :group 'php)
-
-(defcustom php-manual-path ""
-  "Path to the directory which contains the PHP manual."
-  :type 'string
-  :group 'php)
-
-;;;###autoload
-(add-to-list 'interpreter-mode-alist (cons "php" 'php-mode))
-
-(defcustom php-mode-hook nil
-  "List of functions to be executed on entry to `php-mode'."
-  :type 'hook
-  :group 'php)
-
-(defcustom php-mode-pear-hook nil
-  "Hook called when a PHP PEAR file is opened with `php-mode'."
-  :type 'hook
-  :group 'php)
-
-(defcustom php-mode-drupal-hook nil
-  "Hook called when a Drupal file is opened with `php-mode'."
-  :type 'hook
-  :group 'php)
-
-(defcustom php-mode-wordpress-hook nil
-  "Hook called when a WordPress file is opened with `php-mode'."
-  :type 'hook
-  :group 'php)
-
-(defcustom php-mode-symfony2-hook nil
-  "Hook called when a Symfony2 file is opened with `php-mode'."
-  :type 'hook
-  :group 'php)
-
-(defcustom php-mode-psr2-hook nil
-  "Hook called when a PSR-2 file is opened with `php-mode'."
-  :type 'hook
-  :group 'php)
-
-(defcustom php-mode-force-pear nil
-  "Normally PEAR coding rules are enforced only when the filename contains \"PEAR.\"
-Turning this on will force PEAR rules on all PHP files."
-  :type 'boolean
-  :group 'php)
-
-(defcustom php-mode-warn-if-mumamo-off t
-  "Warn once per buffer if you try to indent a buffer without
-mumamo-mode turned on. Detects if there are any HTML tags in the
-buffer before warning, but this is is not very smart; e.g. if you
-have any tags inside a PHP string, it will be fooled."
-  :type '(choice (const :tag "Warg" t) (const "Don't warn" nil))
-  :group 'php)
-
-(defcustom php-mode-coding-style 'pear
-  "Select default coding style to use with php-mode.
-This variable can take one of the following symbol values:
-
-`Default' - use a reasonable default style for PHP.
-
-`PEAR' - use coding styles preferred for PEAR code and modules.
-
-`Drupal' - use coding styles preferred for working with Drupal projects.
-
-`WordPress' - use coding styles preferred for working with WordPress projects.
-
-`Symfony2' - use coding styles preferred for working with Symfony2 projects.
-
-`PSR-2' - use coding styles preferred for working with projects using PSR-2 standards."
-  :type '(choice (const :tag "Default" default)
-                 (const :tag "PEAR" pear)
-                 (const :tag "Drupal" drupal)
-                 (const :tag "WordPress" wordpress)
-                 (const :tag "Symfony2" symfony2)
-                 (const :tag "PSR-2" psr2))
-  :group 'php
-  :set 'php-mode-custom-coding-style-set
-  :initialize 'custom-initialize-default)
-
-(defun php-mode-custom-coding-style-set (sym value)
-  (when (eq major-mode 'php-mode)
-    (set         sym value)
-    (set-default sym value)
-    (cond ((eq value 'pear)
-           (php-enable-pear-coding-style))
-          ((eq value 'default)
-           (php-enable-default-coding-style))
-          ((eq value 'drupal)
-           (php-enable-drupal-coding-style))
-          ((eq value 'wordpress)
-           (php-enable-wordpress-coding-style))
-          ((eq value 'symfony2)
-           (php-enable-symfony2-coding-style))
-          ((eq value 'psr2)
-           (php-enable-psr2-coding-style)))))
-
-(defun php-mode-version ()
-  "Display string describing the version of PHP mode."
-  (interactive)
-  (message "PHP mode %s of %s"
-           php-mode-version-number php-mode-modified))
-
-(defvar php-mode-map
-  (let ((map (make-sparse-keymap)))
-    ;; (define-key map [menu-bar php]
-    ;;   (cons "PHP" (make-sparse-keymap "PHP")))
-
-    ;; (define-key map [menu-bar php complete-function]
-    ;;   '("Complete function name" . php-complete-function))
-    ;; (define-key map [menu-bar php browse-manual]
-    ;;   '("Browse manual" . php-browse-manual))
-    ;; (define-key map [menu-bar php search-documentation]
-    ;;   '("Search documentation" . php-search-documentation))
-
-    ;; By default PHP mode binds C-M-h to c-mark-function, which it
-    ;; inherits from cc-mode.  But there are situations where
-    ;; c-mark-function fails to properly mark a function.  For
-    ;; example, if we use c-mark-function within a method definition
-    ;; then the region will expand beyond the method and into the
-    ;; class definition itself.
-    ;;
-    ;; Changing the default to mark-defun provides behavior that users
-    ;; are more likely to expect.
-    (define-key map (kbd "C-M-h") 'mark-defun)
-
-    ;; Many packages based on cc-mode provide the 'C-c C-w' binding
-    ;; to toggle Subword Mode.  See the page
-    ;;
-    ;;     https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html
-    ;;
-    ;; for more information about Submode Word.
-    (if (boundp 'subword-mode)
-        (if subword-mode
-            (subword-mode nil)
-          (subword-mode t)))
-
-    ;; We inherit c-beginning-of-defun and c-end-of-defun from CC Mode
-    ;; but we have two replacement functions specifically for PHP.  We
-    ;; remap the commands themselves and not their default
-    ;; key-bindings so that our PHP-specific versions will work even
-    ;; if the user has reconfigured their keys, e.g. if they rebind
-    ;; c-end-of-defun to something other than C-M-e.
-    (define-key map [remap c-beginning-of-defun] 'php-beginning-of-defun)
-    (define-key map [remap c-end-of-defun] 'php-end-of-defun)
-
-    (define-key map [(control c) (control f)] 'php-search-documentation)
-    (define-key map [(meta tab)] 'php-complete-function)
-    (define-key map [(control c) (control m)] 'php-browse-manual)
-    (define-key map [(control .)] 'php-show-arglist)
-    (define-key map [(control c) (control r)] 'php-send-region)
-    ;; Use the Emacs standard indentation binding. This may upset c-mode
-    ;; which does not follow this at the moment, but I see no better
-    ;; choice.
-    (define-key map [tab] 'indent-for-tab-command)
-    map)
-  "Keymap for `php-mode'")
-
-(c-lang-defconst c-mode-menu
-  php (append '(["Complete function name" php-complete-function t]
-                ["Browse manual" php-browse-manual t]
-                ["Search documentation" php-search-documentation t]
-                ["----" t])
-              (c-lang-const c-mode-menu)))
-
-(c-lang-defconst c-at-vsemi-p-fn
-  php 'php-c-at-vsemi-p)
-
-(c-lang-defconst c-vsemi-status-unknown-p-fn
-  php 'php-c-vsemi-status-unknown-p)
-
-;; Make php-mode recognize opening tags as preprocessor macro's.
-;;
-;; This is a workaround, the tags must be recognized as something
-;; in order for the syntactic guesses of code below the tag
-;; to be correct and as a result not break indentation.
-;;
-;; Note that submatches or \\| here are not expected by cc-mode.
-(c-lang-defconst c-opt-cpp-prefix
-  php "\\s-*<\\?")
-
-(c-lang-defconst c-identifier-ops
-  php '(
-        (left-assoc "\\" "::" "->")
-        (prefix "\\" "::")))
-
-;; Allow '\' when scanning from open brace back to defining
-;; construct like class
-(c-lang-defconst c-block-prefix-disallowed-chars
-  php (cl-set-difference (c-lang-const c-block-prefix-disallowed-chars)
-                      '(?\\)))
-
-;; Allow $ so variables are recognized in cc-mode and remove @. This
-;; makes cc-mode highlight variables and their type hints in arglists.
-(c-lang-defconst c-symbol-start
-  php (concat "[" c-alpha "_$]"))
-
-;; All string literals can possibly span multiple lines
-(c-lang-defconst c-multiline-string-start-char
-  php t)
-
-(c-lang-defconst c-assignment-operators
-  ;; falls back to java, so no need to specify the language
-  php (append (remove ">>>=" (c-lang-const c-assignment-operators))
-              '(".=")))
-
-(c-lang-defconst beginning-of-defun-function
-  php 'php-beginning-of-defun)
-
-(c-lang-defconst end-of-defun-function
-  php 'php-end-of-defun)
-
-(c-lang-defconst c-primitive-type-kwds
-  php '("int" "integer" "bool" "boolean" "float" "double" "real"
-        "string" "object"))
-
-(c-lang-defconst c-class-decl-kwds
-  "Keywords introducing declarations where the following block (if any)
-contains another declaration level that should be considered a class."
-  php '("class" "trait" "interface"))
-
-(c-lang-defconst c-brace-list-decl-kwds
-  "Keywords introducing declarations where the following block (if
-any) is a brace list.
-
-PHP does not have an \"enum\"-like keyword."
-  php nil)
-
-(c-lang-defconst c-typeless-decl-kwds
-  php (append (c-lang-const c-class-decl-kwds) '("function")))
-
-(c-lang-defconst c-modifier-kwds
-  php '("abstract" "const" "final" "native" "static" "strictfp"
-        "synchronized" "transient" "volatile"))
-
-(c-lang-defconst c-protection-kwds
-  "Access protection label keywords in classes."
-  php '("private" "protected" "public"))
-
-(c-lang-defconst c-postfix-decl-spec-kwds
-  php '("implements" "extends"))
-
-(c-lang-defconst c-type-list-kwds
-  php '("new" "use" "implements" "extends" "namespace" "instanceof" "insteadof"))
-
-(c-lang-defconst c-ref-list-kwds
-  php nil)
-
-(c-lang-defconst c-block-stmt-2-kwds
-  php (append '("elseif" "foreach" "declare")
-              (remove "synchronized" (c-lang-const c-block-stmt-2-kwds))))
-
-(c-lang-defconst c-simple-stmt-kwds
-  php (append '("include" "include_once" "require" "require_once"
-                "echo" "print" "die" "exit")
-              (c-lang-const c-simple-stmt-kwds)))
-
-(c-lang-defconst c-constant-kwds
-  php '("true"
-        "false"
-        "null"))
-
-(c-lang-defconst c-lambda-kwds
-  php '("function"))
-
-(c-lang-defconst c-other-kwds
-  "Keywords not accounted for by any other `*-kwds' language constant."
-  php '(
-    "__halt_compiler"
-    "and"
-    "array"
-    "callable"
-    "as"
-    "break"
-    "catch all"
-    "catch"
-    "clone"
-    "default"
-    "empty"
-    "enddeclare"
-    "endfor"
-    "endforeach"
-    "endif"
-    "endswitch"
-    "endwhile"
-    "eval"
-    "global"
-    "isset"
-    "list"
-    "or"
-    "parent"
-    "static"
-    "unset"
-    "var"
-    "xor"
-    "yield"
-
-    ;; Below keywords are technically not reserved keywords, but
-    ;; threated no differently by php-mode from actual reserved
-    ;; keywords
-    ;;
-    ;;; declare directives:
-    "encoding"
-    "ticks"
-
-    ;;; self for static references:
-    "self"
-    ))
-
-;; PHP does not have <> templates/generics
-(c-lang-defconst c-recognize-<>-arglists
-  php nil)
-
-(c-lang-defconst c-enums-contain-decls
-  php nil)
-
-(c-lang-defconst c-nonlabel-token-key
-  "Regexp matching things that can't occur in generic colon labels.
-
-This overrides cc-mode `c-nonlabel-token-key' to support switching on
-double quoted strings and true/false/null.
-
-Note: this regexp is also applied to goto-labels, a future improvement
-might be to handle switch and goto labels differently."
-  php (concat
-     ;; All keywords except `c-label-kwds' and `c-constant-kwds'.
-     (c-make-keywords-re t
-       (cl-set-difference (c-lang-const c-keywords)
-                       (append (c-lang-const c-label-kwds)
-                               (c-lang-const c-constant-kwds))
-                       :test 'string-equal))))
-
-(defun php-lineup-cascaded-calls (langelem)
-  "Line up chained methods using `c-lineup-cascaded-calls',
-but only if the setting is enabled"
-  (if php-lineup-cascaded-calls
-    (c-lineup-cascaded-calls langelem)))
-
-(c-add-style
- "php"
- '((c-basic-offset . 4)
-   (c-doc-comment-style . javadoc)
-   (c-offsets-alist . ((arglist-close . php-lineup-arglist-close)
-                       (arglist-cont . (first php-lineup-cascaded-calls 0))
-                       (arglist-cont-nonempty . (first php-lineup-cascaded-calls c-lineup-arglist))
-                       (arglist-intro . php-lineup-arglist-intro)
-                       (case-label . +)
-                       (class-open . -)
-                       (comment-intro . 0)
-                       (inlambda . 0)
-                       (inline-open . 0)
-                       (label . +)
-                       (statement-cont . (first php-lineup-cascaded-calls php-lineup-string-cont +))
-                       (substatement-open . 0)
-                       (topmost-intro-cont . (first php-lineup-cascaded-calls +))))))
-
-(defun php-enable-default-coding-style ()
-  "Set PHP Mode to use reasonable default formatting."
-  (interactive)
-  (c-set-style "php"))
-
-(c-add-style
- "pear"
- '("php"
-   (c-basic-offset . 4)
-   (c-offsets-alist . ((case-label . 0)))))
-
-(defun php-enable-pear-coding-style ()
-  "Sets up php-mode to use the coding styles preferred for PEAR
-code and modules."
-  (interactive)
-  (setq tab-width 4
-        indent-tabs-mode nil)
-  (c-set-style "pear")
-
-  ;; Undo drupal/PSR-2 coding style whitespace effects
-  (set (make-local-variable 'show-trailing-whitespace)
-       (default-value 'show-trailing-whitespace)))
-
-(c-add-style
- "drupal"
- '("php"
-   (c-basic-offset . 2)))
-
-(defun php-enable-drupal-coding-style ()
-  "Makes php-mode use coding styles that are preferable for
-working with Drupal."
-  (interactive)
-  (setq tab-width 2
-        indent-tabs-mode nil
-        fill-column 78)
-  (set (make-local-variable 'show-trailing-whitespace) t)
-  (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
-  (c-set-style "drupal"))
-
-(c-add-style
-  "wordpress"
-  '("php"
-    (c-basic-offset . 4)))
-
-(defun php-enable-wordpress-coding-style ()
-  "Makes php-mode use coding styles that are preferable for
-working with Wordpress."
-  (interactive)
-  (setq indent-tabs-mode t
-        fill-column 78
-        tab-width 4
-        c-indent-comments-syntactically-p t)
-  (c-set-style "wordpress")
-
-  ;; Undo drupal/PSR-2 coding style whitespace effects
-  (set (make-local-variable 'show-trailing-whitespace)
-       (default-value 'show-trailing-whitespace)))
-
-(c-add-style
-  "symfony2"
-  '("php"
-    (c-offsets-alist . ((statement-cont . php-lineup-hanging-semicolon)))))
-
-(defun php-enable-symfony2-coding-style ()
-  "Makes php-mode use coding styles that are preferable for
-working with Symfony2."
-  (interactive)
-  (setq indent-tabs-mode nil
-        fill-column 78
-        c-indent-comments-syntactically-p t
-        require-final-newline t)
-  (c-set-style "symfony2")
-
-  ;; Undo drupal/PSR-2 coding style whitespace effects
-  (set (make-local-variable 'show-trailing-whitespace)
-       (default-value 'show-trailing-whitespace)))
-
-(c-add-style
-  "psr2"
-  '("php"
-    (c-offsets-alist . ((statement-cont . +)))))
-
-(defun php-enable-psr2-coding-style ()
-  "Makes php-mode comply to the PSR-2 coding style"
-  (interactive)
-  (setq indent-tabs-mode nil
-        fill-column 78
-        c-indent-comments-syntactically-p t
-        require-final-newline t)
-  (c-set-style "psr2")
-
-  ;; Apply drupal-like coding style whitespace effects
-  (set (make-local-variable 'require-final-newline) t)
-  (set (make-local-variable 'show-trailing-whitespace) t)
-  (add-hook 'before-save-hook 'delete-trailing-whitespace nil t))
-
-(defconst php-beginning-of-defun-regexp
-  "^\\s-*\\(?:\\(?:abstract\\|final\\|private\\|protected\\|public\\|static\\)\\s-+\\)*function\\s-+&?\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*("
-  "Regular expression for a PHP function.")
-
-(defun php-beginning-of-defun (&optional arg)
-  "Move to the beginning of the ARGth PHP function from point.
-Implements PHP version of `beginning-of-defun-function'."
-  (interactive "p")
-  (let ((arg (or arg 1)))
-    (while (> arg 0)
-      (re-search-backward php-beginning-of-defun-regexp
-                          nil 'noerror)
-      (setq arg (1- arg)))
-    (while (< arg 0)
-      (end-of-line 1)
-      (let ((opoint (point)))
-        (beginning-of-defun 1)
-        (forward-list 2)
-        (forward-line 1)
-        (if (eq opoint (point))
-            (re-search-forward php-beginning-of-defun-regexp
-                               nil 'noerror))
-        (setq arg (1+ arg))))))
-
-(defun php-end-of-defun (&optional arg)
-  "Move the end of the ARGth PHP function from point.
-Implements PHP befsion of `end-of-defun-function'
-
-See `php-beginning-of-defun'."
-  (interactive "p")
-  (php-beginning-of-defun (- (or arg 1))))
-
-
-(defvar php-warned-bad-indent nil)
-
-;; Do it but tell it is not good if html tags in buffer.
-(defun php-check-html-for-indentation ()
-  (let ((html-tag-re "^\\s-*</?\\sw+.*?>")
-        (here (point)))
-    (goto-char (line-beginning-position))
-    (if (or (when (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
-            ;; Fix-me: no idea how to check for mmm or multi-mode
-            (save-match-data
-              (not (or (re-search-forward html-tag-re (line-end-position) t)
-                       (re-search-backward html-tag-re (line-beginning-position) t)))))
-        (progn
-          (goto-char here)
-          t)
-      (goto-char here)
-      (setq php-warned-bad-indent t)
-      (let* ((known-multi-libs '(("mumamo" mumamo (lambda () (nxhtml-mumamo)))
-                                 ("mmm-mode" mmm-mode (lambda () (mmm-mode 1)))
-                                 ("multi-mode" multi-mode (lambda () (multi-mode 1)))
-                                 ("web-mode" web-mode (lambda () (web-mode)))))
-             (known-names (mapcar (lambda (lib) (car lib)) known-multi-libs))
-             (available-multi-libs (delq nil
-                                         (mapcar
-                                          (lambda (lib)
-                                            (when (locate-library (car lib)) lib))
-                                          known-multi-libs)))
-             (available-names (mapcar (lambda (lib) (car lib)) available-multi-libs))
-             (base-msg
-              (concat
-               "Indentation fails badly with mixed HTML/PHP in the HTML part in
-plain `php-mode'.  To get indentation to work you must use an
-Emacs library that supports 'multiple major modes' in a buffer.
-Parts of the buffer will then be in `php-mode' and parts in for
-example `html-mode'.  Known such libraries are:\n\t"
-               (mapconcat 'identity known-names ", ")
-               "\n"
-               (if available-multi-libs
-                   (concat
-                    "You have these available in your `load-path':\n\t"
-                    (mapconcat 'identity available-names ", ")
-                    "\n\n"
-                    "Do you want to turn any of those on? ")
-                 "You do not have any of those in your `load-path'.")))
-             (is-using-multi
-              (catch 'is-using
-                (dolist (lib available-multi-libs)
-                  (when (and (boundp (cadr lib))
-                             (symbol-value (cadr lib)))
-                    (throw 'is-using t))))))
-        (unless is-using-multi
-          (if available-multi-libs
-              (if (not (y-or-n-p base-msg))
-                  (message "Did not do indentation, but you can try again now if you want")
-                (let* ((name
-                        (if (= 1 (length available-multi-libs))
-                            (car available-names)
-                          ;; Minibuffer window is more than one line, fix that first:
-                          (message "")
-                          (completing-read "Choose multiple major mode support library: "
-                                           available-names nil t
-                                           (car available-names)
-                                           '(available-names . 1)
-                                           )))
-                       (mode (when name
-                               (caddr (assoc name available-multi-libs)))))
-                  (when mode
-                    ;; Minibuffer window is more than one line, fix that first:
-                    (message "")
-                    (load name)
-                    (funcall mode))))
-            (lwarn 'php-indent :warning base-msg)))
-        nil))))
-
-(defun php-cautious-indent-region (start end &optional quiet)
-  (if (or (not php-mode-warn-if-mumamo-off)
-          php-warned-bad-indent
-          (php-check-html-for-indentation))
-      (funcall 'c-indent-region start end quiet)))
-
-(defun php-cautious-indent-line ()
-  (if (or (not php-mode-warn-if-mumamo-off)
-          php-warned-bad-indent
-          (php-check-html-for-indentation))
-      (let ((here (point))
-            doit)
-        (move-beginning-of-line nil)
-        ;; Don't indent heredoc end mark
-        (save-match-data
-          (unless (and (looking-at "[a-zA-Z0-9_]+;\n")
-                       (php-in-string-p))
-            (setq doit t)))
-        (goto-char here)
-        (when doit
-          (funcall 'c-indent-line)))))
-
-(defun php-c-at-vsemi-p (&optional pos)
-  "Return t on html lines (including php region border), otherwise nil.
-POS is a position on the line in question.
-
-This is was done due to the problem reported here:
-
-  URL `https://answers.launchpad.net/nxhtml/+question/43320'"
-  (if (not php-template-compatibility)
-      nil
-    (setq pos (or pos (point)))
-    (let ((here (point))
-          ret)
-      (save-match-data
-        (goto-char pos)
-        (beginning-of-line)
-        (setq ret (looking-at
-                   (rx
-                    (or (seq
-                         bol
-                         (0+ space)
-                         "<"
-                         (in "a-z\\?"))
-                        (seq
-                         (0+ not-newline)
-                         (in "a-z\\?")
-                         ">"
-                         (0+ space)
-                         eol))))))
-      (goto-char here)
-      ret)))
-
-(defun php-c-vsemi-status-unknown-p ()
-  "See `php-c-at-vsemi-p'."
-  )
-
-(defsubst php-in-string-p ()
-  (nth 3 (syntax-ppss)))
-
-(defsubst php-in-comment-p ()
-  (nth 4 (syntax-ppss)))
-
-(defsubst php-in-string-or-comment-p ()
-  (nth 8 (syntax-ppss)))
-
-(defun php-lineup-string-cont (langelem)
-  "Line up string toward equal sign or dot
-e.g.
-$str = 'some'
-     . 'string';
-this ^ lineup"
-  (save-excursion
-    (goto-char (cdr langelem))
-    (let (ret finish)
-      (while (and (not finish) (re-search-forward "[=.]" (line-end-position) t))
-        (unless (php-in-string-or-comment-p)
-          (setq finish t
-                ret (vector (1- (current-column))))))
-      ret)))
-
-(defun php-lineup-arglist-intro (langelem)
-  (save-excursion
-    (goto-char (cdr langelem))
-    (vector (+ (current-column) c-basic-offset))))
-
-(defun php-lineup-arglist-close (langelem)
-  (save-excursion
-    (goto-char (cdr langelem))
-    (vector (current-column))))
-
-(defun php-lineup-arglist (langelem)
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at-p "\\s-*->") '+ 0)))
-
-(defun php-lineup-hanging-semicolon (langelem)
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at-p "\\s-*;\\s-*$") 0 '+)))
-
-(defconst php-heredoc-start-re
-  "<<<\\(?:\\w+\\|'\\w+'\\)$"
-  "Regular expression for the start of a PHP heredoc.")
-
-(defun php-heredoc-end-re (heredoc-start)
-  "Build a regular expression for the end of a heredoc started by
-the string HEREDOC-START."
-  ;; Extract just the identifier without <<< and quotes.
-  (string-match "\\w+" heredoc-start)
-  (concat "^\\(" (match-string 0 heredoc-start) "\\)\\W"))
-
-(defun php-syntax-propertize-function (start end)
-  "Apply propertize rules from START to END."
-  ;; (defconst php-syntax-propertize-function
-  ;;   (syntax-propertize-rules
-  ;;    (php-heredoc-start-re (0 (ignore (php-heredoc-syntax))))))
-  (goto-char start)
-  (while (and (< (point) end)
-              (re-search-forward php-heredoc-start-re end t))
-    (php-heredoc-syntax))
-  (goto-char start)
-  (while (re-search-forward "['\"]" end t)
-    (when (php-in-comment-p)
-      (c-put-char-property (match-beginning 0)
-                           'syntax-table (string-to-syntax "_")))))
-
-(defun php-heredoc-syntax ()
-  "Mark the boundaries of searched heredoc."
-  (goto-char (match-beginning 0))
-  (c-put-char-property (point) 'syntax-table (string-to-syntax "|"))
-  (if (re-search-forward (php-heredoc-end-re (match-string 0)) nil t)
-      (goto-char (match-end 1))
-    ;; Did not find the delimiter so go to the end of the buffer.
-    (goto-char (point-max)))
-  (c-put-char-property (1- (point)) 'syntax-table (string-to-syntax "|")))
-
-(defun php-syntax-propertize-extend-region (start end)
-  "Extend the propertize region if START or END falls inside a
-PHP heredoc."
-  (let ((new-start)
-        (new-end))
-    (goto-char start)
-    (when (re-search-backward php-heredoc-start-re nil t)
-      (let ((maybe (point)))
-        (when (and (re-search-forward
-                    (php-heredoc-end-re (match-string 0)) nil t)
-                   (> (point) start))
-          (setq new-start maybe))))
-    (goto-char end)
-    (when (re-search-backward php-heredoc-start-re nil t)
-      (if (re-search-forward
-           (php-heredoc-end-re (match-string 0)) nil t)
-          (when (> (point) end)
-            (setq new-end (point)))
-        (setq new-end (point-max))))
-    (when (or new-start new-end)
-      (cons (or new-start start) (or new-end end)))))
-
-(easy-menu-define php-mode-menu php-mode-map "PHP Mode Commands"
-  (cons "PHP" (c-lang-const c-mode-menu php)))
-
-;;;###autoload
-(define-derived-mode php-mode c-mode "PHP"
-  "Major mode for editing PHP code.
-
-\\{php-mode-map}"
-
-  (c-initialize-cc-mode t)
-  (c-init-language-vars php-mode)
-  (c-common-init 'php-mode)
-
-  (modify-syntax-entry ?_    "_" php-mode-syntax-table)
-  (modify-syntax-entry ?`    "\"" php-mode-syntax-table)
-  (modify-syntax-entry ?\"   "\"" php-mode-syntax-table)
-  (modify-syntax-entry ?#    "< b" php-mode-syntax-table)
-  (modify-syntax-entry ?\n   "> b" php-mode-syntax-table)
-
-  (set (make-local-variable 'syntax-propertize-via-font-lock)
-       '(("\\(\"\\)\\(\\\\.\\|[^\"\n\\]\\)*\\(\"\\)" (1 "\"") (3 "\""))
-         ("\\(\'\\)\\(\\\\.\\|[^\'\n\\]\\)*\\(\'\\)" (1 "\"") (3 "\""))))
-
-  (when (boundp 'syntax-propertize-function)
-    (add-to-list (make-local-variable 'syntax-propertize-extend-region-functions)
-                 #'php-syntax-propertize-extend-region)
-    (set (make-local-variable 'syntax-propertize-function)
-         #'php-syntax-propertize-function))
-
-  (setq font-lock-maximum-decoration t
-        imenu-generic-expression php-imenu-generic-expression)
-
-  ;; PHP vars are case-sensitive
-  (setq case-fold-search t)
-
-  ;; Do not force newline at end of file.  Such newlines can cause
-  ;; trouble if the PHP file is included in another file before calls
-  ;; to header() or cookie().
-  (set (make-local-variable 'require-final-newline) nil)
-  (set (make-local-variable 'next-line-add-newlines) nil)
-
-  ;; PEAR coding standards
-  (add-hook 'php-mode-pear-hook 'php-enable-pear-coding-style
-             nil t)
-
-  ;; ;; Drupal coding standards
-  (add-hook 'php-mode-drupal-hook 'php-enable-drupal-coding-style
-             nil t)
-
-  ;; ;; WordPress coding standards
-  (add-hook 'php-mode-wordpress-hook 'php-enable-wordpress-coding-style
-             nil t)
-
-  ;; ;; Symfony2 coding standards
-  (add-hook 'php-mode-symfony2-hook 'php-enable-symfony2-coding-style
-             nil t)
-
-  ;; ;; PSR-2 coding standards
-  (add-hook 'php-mode-psr2-hook 'php-enable-psr2-coding-style
-             nil t)
-
-  (cond ((eq php-mode-coding-style 'pear)
-         (php-enable-pear-coding-style)
-         (run-hooks 'php-mode-pear-hook))
-        ((eq php-mode-coding-style 'drupal)
-         (php-enable-drupal-coding-style)
-         (run-hooks 'php-mode-drupal-hook))
-        ((eq php-mode-coding-style 'wordpress)
-         (php-enable-wordpress-coding-style)
-         (run-hooks 'php-mode-wordpress-hook))
-        ((eq php-mode-coding-style 'symfony2)
-         (php-enable-symfony2-coding-style)
-         (run-hooks 'php-mode-symfony2-hook))
-        ((eq php-mode-coding-style 'psr2)
-         (php-enable-psr2-coding-style)
-         (run-hooks 'php-mode-psr2-hook)))
-
-  (if (or php-mode-force-pear
-          (and (stringp buffer-file-name)
-               (string-match "PEAR\\|pear"
-                             (buffer-file-name))
-               (string-match "\\.php$" (buffer-file-name))))
-      (run-hooks 'php-mode-pear-hook))
-
-  (setq indent-line-function 'php-cautious-indent-line)
-  (setq indent-region-function 'php-cautious-indent-region)
-  (setq c-at-vsemi-p-fn 'php-c-at-vsemi-p)
-  (setq c-vsemi-status-unknown-p 'php-c-vsemi-status-unknown-p)
-
-  (set (make-local-variable 'syntax-begin-function)
-       'c-beginning-of-syntax)
-
-  ;; We map the php-{beginning,end}-of-defun functions so that they
-  ;; replace the similar commands that we inherit from CC Mode.
-  ;; Because of our remapping we may not actually need to keep the
-  ;; following two local variables, but we keep them for now until we
-  ;; are completely sure their removal will not break any current
-  ;; behavior or backwards compatibility.
-  (set (make-local-variable 'beginning-of-defun-function)
-       'php-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function)
-       'php-end-of-defun)
-
-  (set (make-local-variable 'open-paren-in-column-0-is-defun-start)
-       nil)
-  (set (make-local-variable 'defun-prompt-regexp)
-       "^\\s-*function\\s-+&?\\s-*\\(\\(\\sw\\|\\s_\\)+\\)\\s-*")
-  (set (make-local-variable 'add-log-current-defun-header-regexp)
-       php-beginning-of-defun-regexp))
-
-;; Define function name completion function
-(defvar php-completion-table nil
-  "Obarray of tag names defined in current tags table and functions known to PHP.")
-
-(defun php-complete-function ()
-  "Perform function completion on the text around point.
-Completes to the set of names listed in the current tags table
-and the standard php functions.
-The string to complete is chosen in the same way as the default
-for \\[find-tag] (which see)."
-  (interactive)
-  (let ((pattern (php-get-pattern))
-        beg
-        completion
-        (php-functions (php-completion-table)))
-    (if (not pattern) (message "Nothing to complete")
-        (if (not (search-backward pattern nil t))
-            (message "Can't complete here")
-          (setq beg (point))
-          (forward-char (length pattern))
-          (setq completion (try-completion pattern php-functions nil))
-          (cond ((eq completion t))
-                ((null completion)
-                 (message "Can't find completion for \"%s\"" pattern)
-                 (ding))
-                ((not (string= pattern completion))
-                 (delete-region beg (point))
-                 (insert completion))
-                (t
-                 (message "Making completion list...")
-                 (with-output-to-temp-buffer "*Completions*"
-                   (display-completion-list
-                    (all-completions pattern php-functions)))
-                 (message "Making completion list...%s" "done")))))))
-
-(defun php-completion-table ()
-  "Build variable `php-completion-table' on demand.
-The table includes the PHP functions and the tags from the
-current `tags-file-name'."
-  (or (and tags-file-name
-           (save-excursion (tags-verify-table tags-file-name))
-           php-completion-table)
-      (let ((tags-table
-             (when tags-file-name
-               (with-current-buffer (get-file-buffer tags-file-name)
-                 (etags-tags-completion-table))))
-            (php-table
-             (cond ((and (not (string= "" php-completion-file))
-                         (file-readable-p php-completion-file))
-                    (php-build-table-from-file php-completion-file))
-                   (php-manual-path
-                    (php-build-table-from-path php-manual-path))
-                   (t nil))))
-        (unless (or php-table tags-table)
-          (error
-           (concat "No TAGS file active nor are "
-                   "`php-completion-file' or `php-manual-path' set")))
-        (when tags-table
-          ;; Combine the tables.
-          (mapatoms (lambda (sym) (intern (symbol-name sym) php-table))
-                    tags-table))
-        (setq php-completion-table php-table))))
-
-(defun php-build-table-from-file (filename)
-  (let ((table (make-vector 1022 0))
-        (buf (find-file-noselect filename)))
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (while (re-search-forward
-              "^\\([-a-zA-Z0-9_.]+\\)\n"
-              nil t)
-        (intern (buffer-substring (match-beginning 1) (match-end 1))
-                table)))
-    (kill-buffer buf)
-    table))
-
-(defun php-build-table-from-path (path)
-  (let ((table (make-vector 1022 0))
-        (files (directory-files
-                path
-                nil
-                "^function\\..+\\.html$")))
-    (mapc (lambda (file)
-            (string-match "\\.\\([-a-zA-Z_0-9]+\\)\\.html$" file)
-            (intern
-             (replace-regexp-in-string
-              "-" "_" (substring file (match-beginning 1) (match-end 1)) t)
-             table))
-          files)
-    table))
-
-;; Find the pattern we want to complete
-;; find-tag-default from GNU Emacs etags.el
-(defun php-get-pattern ()
-  (save-excursion
-    (while (looking-at "\\sw\\|\\s_")
-      (forward-char 1))
-    (if (or (re-search-backward "\\sw\\|\\s_"
-                                (save-excursion (beginning-of-line) (point))
-                                t)
-            (re-search-forward "\\(\\sw\\|\\s_\\)+"
-                               (save-excursion (end-of-line) (point))
-                               t))
-        (progn (goto-char (match-end 0))
-               (buffer-substring-no-properties
-                (point)
-                (progn (forward-sexp -1)
-                       (while (looking-at "\\s'")
-                         (forward-char 1))
-                       (point))))
-      nil)))
-
-(defun php-show-arglist ()
-  (interactive)
-  (let* ((tagname (php-get-pattern))
-         (buf (find-tag-noselect tagname nil nil))
-         arglist)
-    (with-current-buffer buf
-      (goto-char (point-min))
-      (when (re-search-forward
-             (format "function\\s-+%s\\s-*(\\([^{]*\\))" tagname)
-             nil t)
-        (setq arglist (buffer-substring-no-properties
-                       (match-beginning 1) (match-end 1)))))
-    (if arglist
-        (message "Arglist for %s: %s" tagname arglist)
-        (message "Unknown function: %s" tagname))))
-
-(defcustom php-search-documentation-browser-function nil
-  "Function to display PHP documentation in a WWW browser.
-
-If non-nil, this shadows the value of `browse-url-browser-function' when
-calling `php-search-documentation' or `php-search-local-documentation'."
-  :type '(choice (const :tag "default" nil) function)
-  :link '(variable-link browse-url-browser-function)
-  :group 'php)
-
-(defun php-browse-documentation-url (url)
-  "Browse a documentation URL using the configured browser function.
-
-See `php-search-documentation-browser-function'."
-  (let ((browse-url-browser-function
-         (or php-search-documentation-browser-function
-             browse-url-browser-function)))
-    (browse-url url)))
-
-(defvar php-search-local-documentation-types
-  (list "function" "control-structures" "class" "book")
-  ;; "intro" and "ref" also look interesting, but for all practical purposes
-  ;; their terms are sub-sets of the "book" terms (with the few exceptions
-  ;; being very unlikely search terms).
-  "The set (and priority sequence) of documentation file prefixes
-under which to search for files in the local documentation directory.")
-
-(defvar php-search-local-documentation-words-cache nil)
-
-(defun php--search-documentation-read-arg ()
-  "Obtain interactive argument for searching documentation."
-  ;; Cache the list of documentation words available for completion,
-  ;; based on the defined types-of-interest.
-  (let ((types-list php-search-local-documentation-types)
-        (words-cache php-search-local-documentation-words-cache)
-        (local-manual (and (stringp php-manual-path)
-                           (not (string= php-manual-path "")))))
-    (when (and local-manual
-               (not (assq types-list words-cache)))
-      ;; Generate the cache on the first run, or if the types changed.
-      ;; We read the filenames matching our types list in the local
-      ;; documention directory, and extract the 'middle' component
-      ;; of each. e.g. "function.array-map.html" => "array_map".
-      (let* ((types-opt (regexp-opt types-list))
-             (pattern (concat "\\`" types-opt "\\.\\(.+\\)\\.html\\'"))
-             (collection
-              (mapcar (lambda (filename) (subst-char-in-string
-                                          ?- ?_ (replace-regexp-in-string
-                                                 pattern "\\1" filename)))
-                      (directory-files php-manual-path nil pattern))))
-        ;; Replace the entire cache. If the types changed, we don't need
-        ;; to retain the collection for the previous value.
-        (setq words-cache (list (cons types-list collection)))
-        (setq php-search-local-documentation-words-cache words-cache)))
-    ;; By default we search for (current-word) immediately, without prompting.
-    ;; With a prefix argument, or if there is no (current-word), we perform a
-    ;; completing read for a word from the cached collection.
-    (let* ((default (current-word))
-           (prompt (if default
-                       (format "Search PHP docs (%s): " default)
-                     "Search PHP docs: "))
-           (collection (and local-manual
-                            (cdr (assq types-list words-cache))))
-           (word (if (or current-prefix-arg (not default))
-                     (completing-read prompt collection nil nil nil nil default)
-                   default)))
-      ;; Return interactive argument list.
-      (list word))))
-
-(defun php-search-local-documentation (word)
-  "Search the local PHP documentation (i.e. in `php-manual-path') for
-the word at point.  The function returns t if the requested documentation
-exists, and nil otherwise.
-
-With a prefix argument, prompt (with completion) for a word to search for."
-  (interactive (php--search-documentation-read-arg))
-  (let ((file (catch 'found
-                (loop for type in php-search-local-documentation-types do
-                      (let* ((doc-html (format "%s.%s.html"
-                                               type
-                                               (replace-regexp-in-string
-                                                "_" "-" (downcase word))))
-                             (file (expand-file-name doc-html  php-manual-path)))
-                        (when (file-exists-p file)
-                          (throw 'found file)))))))
-    (when file
-      (let ((file-url (if (string-prefix-p "file://" file)
-                          file
-                        (concat "file://" file))))
-        (php-browse-documentation-url file-url))
-      t)))
-
-(defsubst php-search-web-documentation (word)
-  (php-browse-documentation-url (concat php-search-url word)))
-
-;; Define function documentation function
-(defun php-search-documentation (word)
-  "Search PHP documentation for the word at point.
-
-If `php-manual-path' has a non-empty string value then the command
-will first try searching the local documentation.  If the requested
-documentation does not exist it will fallback to searching the PHP
-website.
-
-With a prefix argument, prompt for a documentation word to search
-for.  If the local documentation is available, it is used to build
-a completion list."
-  (interactive (php--search-documentation-read-arg))
-  (if (and (stringp php-manual-path)
-           (not (string= php-manual-path "")))
-      (or (php-search-local-documentation word)
-          (php-search-web-documentation word))
-    (php-search-web-documentation word)))
-
-;; Define function for browsing manual
-(defun php-browse-manual ()
-  "Bring up manual for PHP."
-  (interactive)
-  (browse-url php-manual-url))
-
-(defconst php-font-lock-keywords-1 (c-lang-const c-matchers-1 php)
-  "Basic highlighting for PHP mode.")
-
-(defconst php-font-lock-keywords-2 (c-lang-const c-matchers-2 php)
-  "Medium level highlighting for PHP mode.")
-
-(defconst php-font-lock-keywords-3
-  (append
-   ;; php-mode patterns *before* cc-mode:
-   ;;  only add patterns here if you want to prevent cc-mode from applying
-   ;;  a different face.
-   '(
-     ;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
-     ;; not in $obj->var()
-     ("->\\(\\sw+\\)\\s-*(" 1 'default)
-
-     ;; Highlight special variables
-     ("\\$\\(this\\|that\\)" 1 font-lock-constant-face)
-     ("\\(\\$\\|->\\)\\([a-zA-Z0-9_]+\\)" 2 font-lock-variable-name-face)
-
-     ;; Highlight function/method names
-     ("\\<function\\s-+&?\\(\\sw+\\)\\s-*(" 1 font-lock-function-name-face)
-
-     ;; The dollar sign should not get a variable-name face, below
-     ;; pattern resets the face to default in case cc-mode sets the
-     ;; variable-name face (cc-mode does this for variables prefixed
-     ;; with type, like in arglist)
-     ("\\(\\$\\)\\(\\sw+\\)" 1 'default)
-
-     ;; Array is a keyword, except when used as cast, so that (int)
-     ;; and (array) look the same
-     ("(\\(array\\))" 1 font-lock-type-face)
-
-     ;; Support the ::class constant in PHP5.6
-     ("\\sw+::\\(class\\)" 1 font-lock-constant-face))
-
-   ;; cc-mode patterns
-   (c-lang-const c-matchers-3 php)
-
-   ;; php-mode patterns *after* cc-mode:
-   ;;   most patterns should go here, faces will only be applied if not
-   ;;   already fontified by another pattern. Note that using OVERRIDE
-   ;;   is usually overkill.
-   `(
-     ;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
-     ;; not in $obj->var()
-     ("->\\(\\sw+\\)\\s-*(" 1 'default)
-
-     ("\\(\\$\\|->\\)\\([a-zA-Z0-9_]+\\)" 2 font-lock-variable-name-face)
-
-     ;; Highlight all upper-cased symbols as constant
-     ("\\<\\([A-Z_][A-Z0-9_]+\\)\\>" 1 font-lock-constant-face)
-
-     ;; Highlight all statically accessed class names as constant,
-     ;; another valid option would be using type-face, but using
-     ;; constant-face because this is how it works in c++-mode.
-     ("\\(\\sw+\\)::" 1 font-lock-constant-face)
-
-     ;; Highlight class name after "use .. as"
-     ("\\<as\\s-+\\(\\sw+\\)" 1 font-lock-type-face)
-
-     ;; Class names are highlighted by cc-mode as defined in
-     ;; c-class-decl-kwds, below regexp is a workaround for a bug
-     ;; where the class names are not highlighted right after opening
-     ;; a buffer (editing a file corrects it).
-     ;;
-     ;; This behaviour is caused by the preceding '<?php', which
-     ;; cc-mode cannot handle easily. Registering it as a cpp
-     ;; preprocessor works well (i.e. the next line is not a
-     ;; statement-cont) but the highlighting glitch remains.
-     (,(concat (regexp-opt (c-lang-const c-class-decl-kwds php))
-               " \\(\\sw+\\)")
-      1 font-lock-type-face)
-
-     ;; While c-opt-cpp-* highlights the <?php opening tags, it is not
-     ;; possible to make it highlight short open tags and closing tags
-     ;; as well. So we force the correct face on all cases that
-     ;; c-opt-cpp-* lacks for this purpose.
-     ;;
-     ;; Note that starting a file with <% breaks indentation, a
-     ;; limitation we can/should live with.
-     (,(regexp-opt '("?>" "<?" "<%" "%>")) 0 font-lock-preprocessor-face)))
-  "Detailed highlighting for PHP mode.")
-
-(defvar php-font-lock-keywords php-font-lock-keywords-3
-  "Default expressions to highlight in PHP mode.")
-
-;;; Provide support for Flymake so that users can see warnings and
-;;; errors in real-time as they write code.
-
-(defun flymake-php-init ()
-  (let* ((temp-file (flymake-init-create-temp-buffer-copy
-                     'flymake-create-temp-inplace))
-         (local-file (file-relative-name
-                      temp-file
-                      (file-name-directory buffer-file-name))))
-    (list php-executable (list "-f" local-file "-l"))))
-
-(add-to-list 'flymake-allowed-file-name-masks
-             '("\\.php[345s]?$"
-               flymake-php-init
-               flymake-simple-cleanup
-               flymake-get-real-file-name))
-
-(add-to-list 'flymake-err-line-patterns
-             '("\\(Parse\\|Fatal\\) error: \\(.*?\\) in \\(.*?\\) on line \\([0-9]+\\)" 3 4 nil 2))
-
-
-(defun php-send-region (start end)
-  "Send the region between `start' and `end' to PHP for execution.
-The output will appear in the buffer *PHP*."
-  (interactive "r")
-  (let ((php-buffer (get-buffer-create "*PHP*"))
-        (code (buffer-substring start end)))
-    ;; Calling 'php -r' will fail if we send it code that starts with
-    ;; '<?php', which is likely.  So we run the code through this
-    ;; function to check for that prefix and remove it.
-    (let ((cleaned-php-code (if (string-prefix-p "<?php" code t)
-                                (substring code 5)
-                              code)))
-      (call-process php-executable nil php-buffer nil "-r" cleaned-php-code))))
-
-
-(defface php-annotations-annotation-face '((t . (:inherit font-lock-constant-face)))
-  "Face used to highlight annotations.")
-
-(defconst php-annotations-re "\\(\\s-\\|{\\)\\(@[[:alpha:]]+\\)")
-
-(defmacro php-annotations-inside-comment-p (pos)
-  "Return non-nil if POS is inside a comment."
-  `(or (eq (get-char-property ,pos 'face) 'font-lock-comment-face)
-       (eq (get-char-property ,pos 'face) 'font-lock-comment-delimiter-face)))
-
-(defun php-annotations-font-lock-find-annotation (limit)
-  (let ((match
-         (catch 'match
-           (save-match-data
-             (while (re-search-forward php-annotations-re limit t)
-               (when (php-annotations-inside-comment-p (match-beginning 0))
-                 (goto-char (match-end 0))
-                 (throw 'match (match-data))))))))
-    (when match
-      (set-match-data match)
-      t)))
-
-(defconst php-string-interpolated-variable-regexp
-  "{\\$[^}\n\\\\]*\\(?:\\\\.[^}\n\\\\]*\\)*}\\|\\${\\sw+}\\|\\$\\sw+")
-
-(defun php-string-intepolated-variable-font-lock-find (limit)
-  (while (re-search-forward php-string-interpolated-variable-regexp limit t)
-    (let ((quoted-stuff (nth 3 (syntax-ppss))))
-      (when (and quoted-stuff (member quoted-stuff '(?\" ?`)))
-        (put-text-property (match-beginning 0) (match-end 0)
-                           'face 'font-lock-variable-name-face))))
-  nil)
-
-(eval-after-load 'php-mode
-  '(progn
-     (font-lock-add-keywords
-      'php-mode
-      '((php-annotations-font-lock-find-annotation (2 'php-annotations-annotation-face t))))
-     (font-lock-add-keywords
-      'php-mode
-      `((php-string-intepolated-variable-font-lock-find))
-      'append)))
-
-
-
-;;; Correct the behavior of `delete-indentation' by modifying the
-;;; logic of `fixup-whitespace'.
-(defadvice fixup-whitespace (after php-mode-fixup-whitespace)
-  "Remove whitespace before certain characters in PHP mode."
-  (let* ((no-behind-space ";\\|,\\|->\\|::")
-         (no-front-space "->\\|::"))
-    (when (and (eq major-mode 'php-mode)
-               (or (looking-at-p (concat " \\(" no-behind-space "\\)"))
-                   (save-excursion
-                     (forward-char -2)
-                     (looking-at-p no-front-space))))
-      (delete-char 1))))
-
-(ad-activate 'fixup-whitespace)
-
-;; Advice `font-lock-fontify-keywords-region' to support namespace
-;; separators in class names. Use word syntax for backslashes when
-;; doing keyword fontification, but not when doing syntactic
-;; fontification because that breaks \ as escape character in strings.
-;;
-;; Special care is taken to restore the original syntax, because we
-;; want \ not to be word for functions like forward-word.
-(defadvice font-lock-fontify-keywords-region (around backslash-as-word activate)
-  "Fontify keywords with backslash as word character"
-  (let ((old-syntax (string (char-syntax ?\\))))
-    (modify-syntax-entry ?\\ "w")
-    ad-do-it
-    (modify-syntax-entry ?\\ old-syntax)))
-
-
-;;;###autoload
-(dolist (pattern '("\\.php[s345t]?\\'" "\\.phtml\\'" "Amkfile" "\\.amk$"))
-  (add-to-list 'auto-mode-alist `(,pattern . php-mode) t))
-
-(provide 'php-mode)
-
-;;; php-mode.el ends here
-
-;; Local Variables:
-;; firestarter: ert-run-tests-interactively
-;; End:
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-array.el b/emacs.d/elpa/php-mode-20151002.2030/php-array.el
new file mode 100644
index 0000000..ecfaedd
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-array.el
@@ -0,0 +1,718 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; Arrays handling functions
+;; http://php.net/manual/en/ref.array.php
+;; file:///usr/share/doc/php-doc/html/ref.array.html
+
+(define-skeleton php-array_change_key_case
+  "Insert an array_change_key_case statement. Changes the case of all keys in an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq case (skeleton-read "case: "))
+  > "array_change_key_case(" array ", " case ");" \n
+)
+
+(define-skeleton php-array_chunk
+  "Insert an array_chunk statement. Split an array into chunks"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq size (skeleton-read "size: "))
+  '(setq preserve_keys (skeleton-read "preserve_keys: "))
+  > "array_chunk(" array ", " size ", " preserve_keys ");" \n
+)
+
+(define-skeleton php-array_column
+  "Insert an array_column statement. Return the values from a single column in the input array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq column_key (skeleton-read "column_key: "))
+  '(setq index_key (skeleton-read "index_key: "))
+  > "array_column(" array ", " column_key ", " index_key ");" \n
+)
+
+(define-skeleton php-array_combine
+  "Insert an array_combine statement. Creates an array by using one array for keys and another for its values"
+  ""
+  '(setq keys (skeleton-read "keys: "))
+  '(setq values (skeleton-read "values: "))
+  > "array_combine(" keys ", " values ");" \n
+)
+
+(define-skeleton php-array_count_values
+  "Insert an array_count_values statement. Counts all the values of an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_count_values(" array ");" \n
+)
+
+(define-skeleton php-array_diff_assoc
+  "Insert an array_diff_assoc statement. Computes the difference of arrays with additional index check"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_diff_assoc(" array   
+  ( "another array?, %s: "
+    ", " str ) 
+  > ");"
+)
+
+(define-skeleton php-array_diff_key
+  "Insert an array_diff_key statement. Computes the difference of arrays using keys for comparison"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_diff_key(" array   
+  ( "another array?, %s: "
+    ", " str ) 
+  > ");"
+)
+
+
+(define-skeleton php-array_diff_uassoc
+  "Insert an array_diff_uassoc statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_diff_uassoc(" array   
+  ( "another array?, %s: "
+    ", " str ) 
+  > ", " (skeleton-read "key compare function: ") ");"
+)
+
+
+(define-skeleton php-array_diff_ukey
+  "Insert an array_diff_ukey statement. Computes the difference of arrays using a callback function on the keys for comparison"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_diff_ukey(" array   
+  ( "another array?, %s: "
+    ", " str ) 
+  > ", " (skeleton-read "key compare function: ") ");"
+)
+
+
+(define-skeleton php-array_diff
+  "Insert an array_diff statement. Computes the difference of arrays"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_diff(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  > ");" \n
+)
+
+(define-skeleton php-array_fill_keys
+  "Insert an array_fill_keys statement."
+  ""
+  '(setq keys (skeleton-read "keys: "))
+  '(setq value (skeleton-read "value: "))
+  > "array_fill_keys(" keys ", " value ");" \n
+)
+
+(define-skeleton php-array_fill
+  "Insert an array_fill statement."
+  ""
+  '(setq start_index (skeleton-read "start_index: "))
+  '(setq num (skeleton-read "num: "))
+  '(setq value (skeleton-read "value: "))
+  > "array_fill(" start_index ", " num ", " value ");" \n
+)
+
+(define-skeleton php-array_filter
+  "Insert an array_filter statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq callback (skeleton-read "callback: "))
+  > "array_filter(" array ", " callback ");" \n
+)
+
+(define-skeleton php-array_flip
+  "Insert an array_flip statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_flip(" array ");" \n
+)
+
+(define-skeleton php-array_intersect_key
+  "Insert an array_intersect_key statement. Computes the intersection of arrays using keys for comparison"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_intersect_key(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_intersect_uassoc
+  "Insert an array_intersect_uassoc statement. "
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_intersect_uassoc(" array2 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  > ", " (skeleton-read "key compare function: ")
+  ");" \n
+)
+
+(define-skeleton php-array_intersect_ukey
+  "Insert an array_intersect_ukey statement. Computes the intersection of arrays using a callback function on the keys for comparison"
+  ""  
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_intersect_ukey(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  > ", " (skeleton-read "key compare function: ")
+  ");" \n
+)
+
+(define-skeleton php-array_intersect
+  "Insert an array_intersect statement. Computes the intersection of arrays
+"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_intersect(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_key_exists
+  "Insert an array_key_exists statement. Checks if the given key or index exists in the array"
+  ""
+  '(setq key (skeleton-read "key: "))
+  '(setq array (skeleton-read "array: "))
+  > "array_key_exists(" key ", " array ");" \n
+)
+
+(define-skeleton php-array_keys
+  "Insert an array_keys statement. Return all the keys or a subset of the keys of an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq search_value (skeleton-read "search_value: "))
+  '(setq strict (skeleton-read "strict: "))
+  > "array_keys(" array ", " search_value ", " strict ");" \n
+)
+
+(define-skeleton php-array_map
+  "Insert an array_map statement. Applies the callback to the elements of the given arrays"
+  ""
+  '(setq callback (skeleton-read "callback: "))
+  '(setq array1 (skeleton-read "array1: "))
+  > "array_map(" callback ", " array1
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_merge_recursive
+  "Insert an array_merge_recursive statement. Merge two or more arrays recursively"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  > "array_merge_recursive(" array1 
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_merge
+  "Insert an array_merge statement. Merge two or more arrays recursively"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  > "array_merge(" array1 
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_multisort
+  "Insert an array_multisort statement. Sort multiple or multi-dimensional arrays"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array1_sort_order (skeleton-read "array1_sort_order: "))
+  '(setq array1_sort_flags (skeleton-read "array1_sort_flags: "))
+  > "array_multisort(" array1 ", " array1_sort_order ", " array_sort_flags ");" \n
+)
+
+(define-skeleton php-array_pad
+  "Insert an array_pad statement. Pad array to the specified length with a value"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq size (skeleton-read "size: "))
+  '(setq value (skeleton-read "value: "))
+  > "array_pad(" array ", " size ", " value ");" \n
+)
+
+(define-skeleton php-array_pop
+  "Insert an array_pop statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_pop(" array ");" \n
+)
+
+(define-skeleton php-array_product
+  "Insert an array_product statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_product(" array ");" \n
+)
+
+(define-skeleton php-array_push
+  "Insert an array_push statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq value1 (skeleton-read "value1: "))
+  > "array_push(" array ", " value1
+  ( "another variable?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_rand
+  "Insert an array_rand statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq num (skeleton-read "num: "))
+  > "array_rand(" array ", " num ");" \n
+)
+
+(define-skeleton php-array_reduce
+  "Insert an array_reduce statement. Iteratively reduce the array to a single value using a callback function"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq callback (skeleton-read "callback: "))
+  '(setq initial (skeleton-read "initial: "))
+  > "array_reduce(" array ", " callback ", " initial ");" \n
+)
+
+(define-skeleton php-array_replace_recursive
+  "Insert an array_replace_recursive statement. Replaces elements from passed arrays into the first array recursively"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_replace_recursive(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_replace
+  "Insert an array_replace statement."
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))  
+  > "array_replace(" array1 ", " array2
+  ( "another array?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-array_reverse
+  "Insert an array_reverse statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq preserve_keys (skeleton-read "preserve_keys: "))
+  > "array_reverse(" array ", " preserve_keys ");" \n
+)
+
+(define-skeleton php-array_search
+  "Insert an array_search statement."
+  ""
+  '(setq needle (skeleton-read "needle: "))
+  '(setq array (skeleton-read "array: "))
+  '(setq strict (skeleton-read "strict: "))
+  > "array_search(" needle ", " array ", " strict ");" \n
+)
+
+(define-skeleton php-array_shift
+  "Insert an array_shift statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_shift(" array ");" \n
+)
+
+(define-skeleton php-array_slice
+  "Insert an array_slice statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq offset (skeleton-read "offset: "))
+  '(setq length (skeleton-read "length: "))
+  '(setq preserve_keys (skeleton-read "preserve_keys: "))
+  > "array_slice(" array ", " offset ", " length ", " preserve_keys ");" \n
+)
+
+(define-skeleton php-array_splice
+  "Insert an array_slice statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq offset (skeleton-read "offset: "))
+  '(setq length (skeleton-read "length: "))
+  '(setq replacement (skeleton-read "replacement: "))
+  > "array_slice(" array ", " offset ", " length ", " replacement ");" \n
+)
+
+(define-skeleton php-array_sum
+  "Insert an array_sum statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_sum(" array ");" \n
+)
+
+(define-skeleton php-array_udiff_assoc
+  "Insert an array_udiff_assoc statement. Computes the difference of arrays with additional index check, compares data by a callback function"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_udiff_assoc(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ", " (skeleton-read "value compare func: ") ");" \n
+)
+
+(define-skeleton php-array_udiff_uassoc
+  "Insert an array_udiff_assoc statement. Computes the difference of arrays with additional index check, compares data and indexes by a callback function"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_udiff_assoc(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ", " (skeleton-read "value compare func: ") 
+  ", " (skeleton-read "key compare func: ") 
+  ");" \n
+)
+
+(define-skeleton php-array_udiff
+  "Insert an array_udiff_assoc statement. Computes the difference of arrays by using a callback function for data comparison"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))
+  > "array_udiff(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ", " (skeleton-read "value compare func: ") ");" \n
+)
+
+(define-skeleton php-array_uintersect_assoc
+  "Insert an array_uintersect_assoc statement. Computes the intersection of arrays with additional index check, compares data by a callback function"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))  
+  > "array_uintersect_assoc(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ", " (skeleton-read "value compare func: ") ");" \n  
+)
+
+(define-skeleton php-array_uintersect_uassoc
+  "Insert an array_uintersect_uassoc statement. Computes the intersection of arrays with additional index check, compares data and indexes by a callback functions"
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))  
+  > "array_uintersect_uassoc(" array1 ", " array2 
+  ( "another array?, %s: "
+    ", " str)
+  ", " (skeleton-read "value compare func: ")  
+  ", " (skeleton-read "key compare func: ") ");" \n  
+)
+
+(define-skeleton php-array_uintersect
+  "Insert an array_uintersect statement."
+  ""
+  '(setq array1 (skeleton-read "array1: "))
+  '(setq array2 (skeleton-read "array2: "))    
+  > "array_uintersect(" array1 ", " array2
+  ( "another array?, %s: "
+    ", " str)
+  ", " (skeleton-read "value compare func: ") ");" \n  
+)
+
+(define-skeleton php-array_unique
+  "Insert an array_unique statement. Removes duplicate values from an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))
+  > "array_unique(" array ", " sort_flags ");" \n
+)
+
+(define-skeleton php-array_unshift
+  "Insert an array_unshift statement. Prepend one or more elements to the beginning of an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq value1 (skeleton-read "value1: "))
+  > "array_unshift(" array ", " value1
+  ( "another value?, %s: "
+    ", " str)
+  ");" \n 
+)
+
+(define-skeleton php-array_values
+  "Insert an array_values statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "array_values(" array ");" \n
+)
+
+(define-skeleton php-array_walk_recursive
+  "Insert an array_walk_recursive statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq callback (skeleton-read "callback: "))
+  '(setq userdata (skeleton-read "userdata: "))
+  > "array_walk_recursive(" array ", " callback ", " userdata ");" \n
+)
+
+(define-skeleton php-array_walk
+  "Insert an array_walk statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq callback (skeleton-read "callback: "))
+  '(setq userdata (skeleton-read "userdata: "))
+  > "array_walk(" array ", " callback ", " userdata ");" \n
+)
+
+(define-skeleton php-array
+  "Insert an array statement."
+  ""
+  > "array(" _ ");" \n
+)
+
+(define-skeleton php-arsort
+  "Insert an arsort statement. Sort an array in reverse order and maintain index association"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))
+  > "arsort(" array ", " sort_flags ");" \n
+)
+
+(define-skeleton php-asort
+  "Insert an asort statement. Sort an array and maintain index association"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))  
+  > "asort(" array ", " sort_flags ");" \n
+)
+
+(define-skeleton php-compact
+  "Insert a compact statement. Create array containing variables and their values"
+  ""
+  '(setq var1 (skeleton-read "variable 1: "))
+  > "compact(" var1
+  ( "another variable?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-count
+  "Insert a count statement. Count all elements in an array, or something in an object"
+  ""
+  '(setq array_or_countable (skeleton-read "array_or_countable: "))
+  '(setq mode (skeleton-read "mode: "))
+  > "count(" array_or_countable ", " mode ");" \n
+)
+
+(define-skeleton php-current
+  "Insert a current statement. Return the current element in an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "current(" array ");" \n
+)
+
+(define-skeleton php-each
+  "Insert a each statement. Return the current key and value pair from an array and advance the array cursor"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "each(" array ");" \n
+)
+
+(define-skeleton php-end
+  "Insert a end statement. Set the internal pointer of an array to its last element"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "end(" array ");" \n
+)
+
+(define-skeleton php-extract
+  "Insert a extract statement. Import variables into the current symbol table from an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq flags (skeleton-read "flags: "))
+  '(setq prefix (skeleton-read "prefix: "))
+  > "extract(" array ", " flags ", " prefix ");" \n
+)
+
+
+(define-skeleton php-in_array
+  "Insert an in_array statement. Checks if a value exists in an array"
+  ""
+  '(setq value (skeleton-read "value: "))
+  '(setq array (skeleton-read "array: "))
+  '(setq strict (skeleton-read "strict: "))
+  > "in_array(" value ", " array ", " strict ");" \n
+)
+
+(define-skeleton php-key_exists
+  "Insert a key_exists statement. Alias of array_key_exists. Checks if the given key or index exists in the array"
+  ""
+  '(setq key (skeleton-read "key: "))
+  '(setq array (skeleton-read "array: "))
+  > "key_exists(" key ", " array");" \n
+)
+
+(define-skeleton php-key
+  "Insert a key statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "key(" array ");" \n
+)
+
+(define-skeleton php-krsort
+  "Insert a krsort statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))
+  > "krsort(" array ", " sort_flags ");" \n
+)
+
+(define-skeleton php-ksort
+  "Insert a ksort statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))  
+  > "ksort(" array ", " sort_flags ");" \n
+)
+
+
+(define-skeleton php-list
+  "Insert a list statement."
+  ""
+  '(setq var1 (skeleton-read "var1: "))
+  > "list(" var1
+  ( "another variable?, %s: "
+    ", " str)
+  ");" \n
+)
+
+(define-skeleton php-natcasesort
+  "Insert a natcasesort statement."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "natcasesort(" array ");" \n
+)
+
+(define-skeleton php-natsort
+  "Insert a natsort statement. Sort an array using a natural order algorithm"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "natsort(" array ");" \n
+)
+
+(define-skeleton php-next
+  "Insert a next statement. Advance the internal array pointer of an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "next(" array ");" \n
+)
+
+(define-skeleton php-pos
+  "Insert a pos statement. Alias of current. Return the current element in an array"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "pos(" array ");" \n
+)
+
+(define-skeleton php-prev
+  "Insert a prev statement. Rewind the internal array pointer"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "prev(" array ");" \n
+)
+
+(define-skeleton php-range
+  "Insert a range statement. Create an array containing a range of elements"
+  ""
+  '(setq start (skeleton-read "start: "))
+  '(setq end (skeleton-read "end: "))
+  '(setq step (skeleton-read "step: "))
+  > "range(" start ", " end ", " step ");" \n
+)
+
+(define-skeleton php-reset
+  "Insert a reset statement. Set the internal pointer of an array to its first element"
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "reset(" array ");" \n
+)
+
+(define-skeleton php-rsort
+  "Insert a rsort statement. Sort an array in reverse order"
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))
+  > "rsort(" array ", " sort_flags ");" \n
+)
+
+(define-skeleton php-shuffle
+  "Insert a shuffle statement. This function shuffles (randomizes the order of the elements in) an array. "
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "shuffle(" array ");" \n
+)
+
+(define-skeleton php-sizeof
+  "Insert a sizeof statement. Alias of count."
+  ""
+  '(setq array (skeleton-read "array: "))
+  > "sizeof(" array ");" \n
+)
+
+(define-skeleton php-sort
+  "Insert a sort statement. Sort an array."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq sort_flags (skeleton-read "sort_flags: "))
+  > "sort(" array ", " sort_flags ");" \n
+)
+
+(define-skeleton php-uasort
+  "Insert a uasort statement. Sort an array with a user-defined comparison function and maintain index association."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq value_compare_func (skeleton-read "value_compare_func: "))
+  > "uasort(" array ", " value_compare_func ");" \n
+)
+
+(define-skeleton php-uksort
+  "Insert a uksort statement. Sort an array by keys using a user-defined comparison function."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq key_compare_func (skeleton-read "key_compare_func: "))
+  > "uksort(" array ", " key_compare_func ");" \n
+)
+
+(define-skeleton php-usort
+  "Insert a usort statement. Sort an array by values using a user-defined comparison function."
+  ""
+  '(setq array (skeleton-read "array: "))
+  '(setq value_compare_func (skeleton-read "value_compare_func: "))
+  > "usort(" array ", " value_compare_func ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-classobj.el b/emacs.d/elpa/php-mode-20151002.2030/php-classobj.el
new file mode 100644
index 0000000..0799312
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-classobj.el
@@ -0,0 +1,172 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Classes Functions
+;; http://php.net/manual/en/ref.classobj.php
+;; file:///usr/share/doc/php-doc/html/ref.classobj.html
+
+(define-skeleton php-class
+  "Insert a class statement."
+  ""
+  '(setq class (skeleton-read "Class name? ")) \n
+  > "class " class \n
+  > "{" \n
+  ( "Variable? %s: "
+    > "var " str ";" \n )
+  ( "Function? %s: "
+    > "function " str "(" ( "Parameter? %s:" str ", " ) ")" \n
+    > "{ " \n
+    _
+    > "} " \n
+    )
+  > "}" \n
+)
+
+(define-skeleton php__autoload 
+  "Insert a __autoload statement. Attempt to load undefined class"
+  ""
+  '(setq class (skeleton-read "Class: "))
+  > "__autoload(" class ");" \n
+)
+
+(define-skeleton php-class_alias
+  "Insert a class_alias statement. Creates an alias for a class"
+  ""
+  '(setq original (skeleton-read "Original: "))
+  '(setq alias (skeleton-read "Alias: "))
+  '(setq autoload (skeleton-read "Autoload: "))
+  > "class_alias(" original ", " alias ", " autoload ");" \n
+)
+
+(define-skeleton php-class_exists
+  "Insert a class_exists statement. Checks if the class has been defined"
+  ""
+  '(setq class_name (skeleton-read "Class name: "))
+  '(setq autoload (skeleton-read "Autoload: "))
+  > "class_exists(" class_name ", " autoload ");" \n
+)
+
+(define-skeleton php-get_called_class
+  "Insert a get_called_class statement. Gets the name of the class the static method is called in."
+  > "get_called_class();" \n
+)
+
+(define-skeleton php-get_class_methods
+  "Insert a get_class_methods statement."
+  ""
+  '(setq str (skeleton-read "Class? "))
+  > "get_class_methods('" str "');" \n
+)
+
+(define-skeleton php-get_class_vars
+  "Insert a get_class_vars statement."
+  ""
+  '(setq str (skeleton-read "Class? "))
+  > "get_class_vars('" str "');" \n
+)
+
+(define-skeleton php-get_class
+  "Insert a get_class statement."
+  ""
+  '(setq str (skeleton-read "Class? "))
+  > "get_class('" str "');" \n
+)
+
+(define-skeleton php-get_declared_classes
+  "Insert a get_declared_classes statement."
+  > "get_declared_classes();" \n
+)
+
+(define-skeleton php-get_declared_interfaces
+  "Insert a get_declared_interfaces statement."
+  > "get_declared_interfaces();" \n
+)
+
+(define-skeleton php-get_declared_traits
+  "Insert a get_declared_traits statement."
+  > "get_declared_traits();" \n
+)
+
+(define-skeleton php-get_object_vars
+  "Insert a get_object_var statement."
+  ""
+  '(setq var (skeleton-read "Var? "))
+  > "get_object_vars(" var ");" \n
+)
+
+(define-skeleton php-get_parent_class
+  "Insert a get_parent_class statement."
+  ""
+  '(setq obj (skeleton-read "Object? "))
+  > "get_parent_class(" obj ");" \n
+)
+
+(define-skeleton php-interface_exists
+  "Insert a interface_exists statement."
+  ""
+  '(setq interface_name (skeleton-read "Interface Name: "))
+  '(setq autoload (skeleton-read "Autoload: "))
+  > "interface_exists(" interface_name ", " autoload ");" \n
+)
+
+(define-skeleton php-is_a
+  "Insert an is_a statement. Checks if the object is of this class or has this class as one of its parents"
+  ""
+  '(setq object (skeleton-read "Object: "))
+  '(setq class_name (skeleton-read "Class name: "))
+  '(setq allow_string (skeleton-read "Allow string: "))
+  > "is_a(" object ", " class_name ", " allow_string ");" \n
+)
+
+(define-skeleton php-is_subclass_of
+  "Insert an is_subclass_of statement."
+  ""
+  '(setq obj (skeleton-read "Object: "))
+  '(setq class (skeleton-read "Class Name: "))
+  '(setq allow_string (skeleton-read "Allow string: "))
+  > "is_subclass_of(" obj ", " class ", " allow_string ");" \n
+)
+
+(define-skeleton php-method_exists
+  "Insert a method_exists statement."
+  ""
+  '(setq obj (skeleton-read "Object: "))
+  '(setq method (skeleton-read "Method: "))
+  > "method_exists(" object ", " method ");" \n
+)
+
+(define-skeleton php-property_exists
+  "Insert a property_exists statement."
+  ""
+  '(setq class (skeleton-read "Class: "))
+  '(setq property (skeleton-read "Property: "))
+  > "property_exists(" class ", " property ");" \n
+)
+  
+(define-skeleton php-trait_exists
+  "Insert a trait_exists statement."
+  ""
+  '(setq trait (skeleton-read "Trait: "))
+  '(setq autoload (skeleton-read "Autoload (TRUE | FALSE): "))
+  > "trait_exists(" trait ", " autoload ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-control-structures.el b/emacs.d/elpa/php-mode-20151002.2030/php-control-structures.el
new file mode 100644
index 0000000..39b86a6
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-control-structures.el
@@ -0,0 +1,124 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Description:
+;; Php ext is some skeleton templates for extend php-mode
+
+;; Control Structure functions
+;; http://php.net/manual/en/language.control-structures.php
+;; file:///usr/share/doc/php-doc/html/language.control-structures.html
+
+(define-skeleton php-if
+  "Insert a if statement"
+  ""
+  '(setq condition (skeleton-read "Condition? ")) \n
+   > "if( " condition " ) {" \n
+   > _ \n
+   ( "other condition, %s: "
+   > -2 "}" \n  
+   > "else if( " str " ) {" \n
+   > _ \n)
+   > -2 "}" \n
+   > "else {" \n
+   > _ \n
+   resume:
+   > -2 "}" \n)
+
+(define-skeleton php-foreach
+  "Insert a foreach statement."
+  ""
+  '(setq value (skeleton-read "Value variable? ")) \n
+  '(setq array (skeleton-read "Array? ")) \n
+  > "foreach (" array " as " value ") {" \n
+  > _ \n
+  > -2 "}" \n)
+
+(define-skeleton php-for
+  "Insert a for statement."
+  ""
+  '(setq index (skeleton-read "Index variable? ")) \n
+  '(setq condition (skeleton-read "Condition? ")) \n
+  > "for (" condition "; " index "++) {" \n
+  > _ \n
+  > -2 "}" \n)
+
+(define-skeleton php-switch
+  "Insert a switch statement."
+  ""
+  '(setq index (skeleton-read "Index variable? ")) \n
+  "switch (" index ") {" \n
+  ( "Some case? %s: "
+    > "case " str ":" \n
+    > _ \n
+    > -2 "break;" \n
+ )
+  "}")
+
+(define-skeleton php-switch-case
+  "Insert a switch statement."
+  ""
+  ( "Some case? %s: "
+    > "case " str ":" \n
+    > _ \n
+    > -2 "break;" \n
+ )
+)
+
+
+(define-skeleton php-include
+  "Insert a include statement."
+  ""
+  '(setq file (skeleton-read "File? ")) \n
+  > "include_once '" file "';")
+
+(define-skeleton php-include_once
+  "Insert a include_once statement."
+  ""
+  '(setq file (skeleton-read "File? ")) \n
+  > "include_once '" file "';")
+
+(define-skeleton php-return
+  "Insert a return statement."
+  ""
+  > "return " _ ";")
+
+(define-skeleton php-require
+  "Insert a require statement."
+  ""
+  '(setq file (skeleton-read "File? ")) \n
+  > "require '" file "';")
+
+(define-skeleton php-require_once
+  "Insert a require_once statement."
+  ""
+  '(setq file (skeleton-read "File? ")) \n
+  > "require_once '" file "';")
+
+(define-skeleton php-goto
+  "Insert a goto statement."
+  ""
+  '(setq index (skeleton-read "Index variable? ")) \n
+  > "goto " index ";" \n
+  > _ \n
+  > index ":" \n
+  > _ \n)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-crack.el b/emacs.d/elpa/php-mode-20151002.2030/php-crack.el
new file mode 100644
index 0000000..b603a69
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-crack.el
@@ -0,0 +1,57 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Description:
+;; Php ext is some skeleton templates for extend php-mode
+;; Functions defined in 
+;; http://php.net/manual/en/ref.crack.php
+;; file:///usr/share/doc/php-doc/html/ref.crack.html
+
+(define-skeleton php-crack-check
+  "Insert a crack_check statement"
+  ""
+  '(setq dictionary (skeleton-read "Dictionary? "))
+  '(setq pass (skeleton-read "Password? "))
+  > "crack_check(" dictionary ", " pass ");" \n
+)
+
+
+(define-skeleton php-crack-closedict
+  "Insert a crack_closedict statement"
+  ""
+  '(setq dictionary (skeleton-read "Dictionary? "))
+  > "crack_closedict(" dictionary ");" \n
+)
+
+(define-skeleton php-crack-getlastmessage
+  "Insert a crack_getlastmessage statement"
+  ""
+  > "crack_getlastmessage();" \n
+)
+
+(define-skeleton php-crack-opendict
+  "Insert a crack_opendict statement"
+  ""
+  '(setq dictionary (skeleton-read "Dictionary? "))
+  > "crack_opendict(" dictionary ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-dio.el b/emacs.d/elpa/php-mode-20151002.2030/php-dio.el
new file mode 100644
index 0000000..6b394f7
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-dio.el
@@ -0,0 +1,102 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; Dio Functions
+;; http://php.net/manual/en/ref.dio.php
+;; file:///usr/share/doc/php-doc/html/ref.dio.html
+
+
+(define-skeleton php-dio_close
+  "Insert a dio_close statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  > "dio_close(" fd ");" \n
+)
+
+(define-skeleton php-dio_fcntl
+  "Insert a dio_fcntl statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  '(setq cmd (skeleton-read "Command: (F_SETLK | F_SETLKW | F_GETLK | F_DUPFD | F_SETFL ) "))
+
+  '(setq args (skeleton-read "Args: (start | length | whence | type ) "))
+  > "dio_fcntl(" fd ", " cmd ", " args ");" \n
+)
+
+
+(define-skeleton php-dio_open
+  "Insert a dio_open statement"
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq flags (skeleton-read "Flags: "))
+  '(setq mode (skeleton-read "Mode: "))
+  > "dio_open(" filename ", " flags ", " mode ");" \n
+)
+
+(define-skeleton php-dio_read
+  "Insert a dio_read statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  '(setq length (skeleton-read "Length: "))
+  > "dio_read(" fd ", " length ");" \n
+)
+
+(define-skeleton php-dio_seek
+  "Insert a dio_seek statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  '(setq pos (skeleton-read "Position: "))
+  '(setq whence (skeleton-read "Specifies how the position pos should be interpreted (SEEK_SET | SEEK_CUR | SEEK_END): "))
+  > "dio_seek(" fd ", " pos ", " whence ");" \n
+)
+
+(define-skeleton php-dio_stat
+  "Insert a dio_read statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  > "dio_stat(" fd ");" \n
+)
+
+(define-skeleton php-dio_tcsetattr
+  "Insert a dio_tcsetattr statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  '(setq options (skeleton-read "Options: "))
+  > "dio_tcsetattr(" fd ", " options ");" \n
+)
+
+(define-skeleton php-dio_truncate
+  "Insert a dio_truncate statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  '(setq offset (skeleton-read "Offset: "))
+  > "dio_truncate(" fd ", " offset ");" \n
+)
+
+(define-skeleton php-dio_write
+  "Insert a dio_write statement"
+  ""
+  '(setq fd (skeleton-read "File Descriptor: "))
+  '(setq data (skeleton-read "Data: "))
+  '(setq len (skeleton-read "Length: "))
+  > "dio_write(" fd ", " data ", " len ");" \n
+)
+
+
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-dom.el b/emacs.d/elpa/php-mode-20151002.2030/php-dom.el
new file mode 100644
index 0000000..ef48c6a
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-dom.el
@@ -0,0 +1,65 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Description:
+;; Php ext is some skeleton templates for extend php-mode
+;; DOM is to manage dom objects
+;; http://php.net/manual/en/book.dom.php
+;; More see file:///usr/share/doc/php-doc/html/book.dom.html
+
+
+(define-skeleton php-domdocument
+  "Insert a new domdocument object"
+  ""
+  > "$" (skeleton-read "Var? ") " = DOMDocument('1.0');" \n
+)
+
+(define-skeleton php-dom-appendChild
+  "Insert a new appendChild dom method"
+  ""
+  >  (skeleton-read "Dom variable? ") "->appendChild(" (skeleton-read "Child? ") ");" \n
+)
+
+(define-skeleton php-dom-createElement
+  "Insert a new appendChild dom method"
+  ""
+  >  (skeleton-read "Dom variable? ") "->createElement(" (skeleton-read "Element? ") ");" \n
+)
+
+(define-skeleton php-dom-createTextNode
+  "Insert a new appendChild dom method"
+  ""
+  >  (skeleton-read "Dom variable? ") "->createTextNode(" (skeleton-read "Text Node? ") ");" \n
+)
+
+(define-skeleton php-dom-setAttribute
+  "Insert a new appendChild dom method"
+  ""
+  >  (skeleton-read "Dom variable? ") "->setAttribute(" (skeleton-read "Attribute? ") ", " (skeleton-read "Value? ") ");" \n
+)
+
+(define-skeleton php-dom-saveXML
+  "Insert a new appendChild dom method"
+  ""
+  >  (skeleton-read "Dom variable? ") "->saveXML();" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-exceptions.el b/emacs.d/elpa/php-mode-20151002.2030/php-exceptions.el
new file mode 100644
index 0000000..d9c8b13
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-exceptions.el
@@ -0,0 +1,54 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Description:
+;; Php ext is some skeleton templates for extend php-mode
+
+;; Exceptions
+;; http://php.net/manual/en/language.exceptions.php
+;; file:///usr/share/doc/php-doc/html/language.exceptions.html
+
+(define-skeleton php-try-catch
+  "Insert a try catch statement"
+  ""
+  > "try {" \n
+  _ \n
+  > "} catch (" (skeleton-read "Exception? ") ") {" \n
+  _ \n
+  > "}" \n
+)
+
+(define-skeleton php-try-catch-finally
+  "Insert a try catch statement"
+  ""
+  > "try {" \n
+  _ \n
+  > "} catch (" (skeleton-read "Exception? ") ") {" \n
+  _ \n
+  > "} finally {" \n
+  _ \n
+  > "}" \n
+)
+
+
+
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-exif.el b/emacs.d/elpa/php-mode-20151002.2030/php-exif.el
new file mode 100644
index 0000000..f7ae2eb
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-exif.el
@@ -0,0 +1,57 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; Exif functions
+;; http://php.net/manual/en/ref.exif.php
+;; file:///usr/share/doc/php-doc/html/ref.exif.html
+
+
+(define-skeleton php-exif_imagetype 
+  "Insert an exif_imagetype statement. Determine the type of an image"
+  > "exif_imagetype(" (skeleton-read "Filename? ") ");"
+)
+
+(define-skeleton php-exif_read_data
+  "Insert an exif_read_data. Reads the EXIF headers from JPEG or TIFF"
+  ""
+  '(setq filename (skeleton-read "Filename? "))
+  '(setq sections (skeleton-read "Sections? "))
+  '(setq arrays (skeleton-read "Arrays (TRUE | FALSE)? "))
+  '(setq thumbnail (skeleton-read "Thumbnail (TRUE | FALSE)? "))
+  > "exif_read_data(" filename ", " sections ", " arrays ", " thumbnail ");" \n
+)
+
+(define-skeleton php-exif_tagname
+  "Insert an exif_tagname. Get the header name for an index"
+  ""
+  '(setq index (skeleton-read "Index? "))
+  > "exif_tagname(" index ");" \n
+)
+
+(define-skeleton php-exif_thumbnail
+  "Insert an exif_thumbnail. Retrieve the embedded thumbnail of a TIFF or JPEG image"
+  ""
+  '(setq filename (skeleton-read "Filename? "))
+  '(setq width (skeleton-read "Width? "))
+  '(setq height (skeleton-read "Height? "))
+  '(setq imagetype (skeleton-read "Image type? "))
+  > "exif_thumbnail(" filename ", " width ", " height ", " imagetype ");" \n
+)
+
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-ext.el b/emacs.d/elpa/php-mode-20151002.2030/php-ext.el
new file mode 100644
index 0000000..1333d8f
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-ext.el
@@ -0,0 +1,132 @@
+;;; php-ext.el --- PHP skeleton templates
+
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+
+;; (require 'php-ext)
+
+;; Description:
+;; Php ext is some skeleton templates for extend php-mode
+
+;; Math functions
+
+(defvar php-ext-path
+  (if load-file-name
+      (file-name-directory load-file-name)
+    default-directory))
+
+(load (concat php-ext-path "php-math.el"))
+
+;; Control Structures
+
+(load (concat php-ext-path "php-control-structures.el"))
+
+;; Classes Functions
+
+(load (concat php-ext-path "php-classobj.el"))
+
+;; Exceptions
+
+(load (concat php-ext-path "php-exceptions.el"))
+
+;; Handling strings
+
+(load (concat php-ext-path "php-strings.el"))
+
+;; Regular expression
+
+(load (concat php-ext-path "php-regex.el"))
+(load (concat php-ext-path "php-pcre.el"))
+
+;; Handling Variables
+;; http://php.net/manual/en/ref.var.php
+;; file:///usr/share/doc/php-doc/html/ref.var.html
+
+(load (concat php-ext-path "php-var.el"))
+
+;; DOM
+;; More see file:///usr/share/doc/php-doc/html/book.dom.html
+
+(load (concat php-ext-path "php-dom.el"))
+
+;; XML Parser
+;; More see file:///usr/share/doc/php-doc/html/function.xml-parse-into-struct.html
+
+(load (concat php-ext-path "php-xmlparser.el"))
+
+;; XML Reader
+;; More see file:///usr/share/doc/php-doc/html/book.xmlreader.html
+
+(load (concat php-ext-path "php-xmlreader.el"))
+
+;; Crack Functions
+
+(load (concat php-ext-path "php-crack.el"))
+
+;; Dio Functions
+
+(load (concat php-ext-path "php-dio.el"))
+
+;; Filesystems functions
+;; file:///usr/share/doc/php-doc/html/ref.filesystem.html
+
+(load (concat php-ext-path "php-filesystem.el"))
+
+;; Graphic functions
+
+;; GD functions
+;; file:///usr/share/doc/php-doc/html/ref.image.html
+;; http://php.net/manual/en/ref.image.php
+
+(load (concat php-ext-path "php-gd.el"))
+
+;; Exif functions
+;; http://php.net/manual/en/ref.exif.php
+;; file:///usr/share/doc/php-doc/html/ref.exif.html
+
+(load (concat php-ext-path "php-exif.el"))
+
+;; Another functions
+
+(define-skeleton php-function
+  "Insert a function statement."
+  ""
+  '(setq function (skeleton-read "Function name? ")) \n
+  '(setq argument (skeleton-read "Argument? ")) \n
+  > "function " function "(" argument
+  ( "Another argument? %s: "
+    > ", " str )
+  > ") {" \n
+  _ \n
+  > "}"
+)
+
+(define-skeleton php-define
+  "Insert a define statement"
+  ""
+  '(setq variable (skeleton-read "Variable? "))
+  '(setq value (skeleton-read "Value? "))
+  "define(\"" variable "\",\"" value "\");")
+
+(provide 'php-ext)
+
+;;; php-ext.el ends here
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-filesystem.el b/emacs.d/elpa/php-mode-20151002.2030/php-filesystem.el
new file mode 100644
index 0000000..516bbf1
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-filesystem.el
@@ -0,0 +1,590 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Filesystem Functions
+;; http://php.net/manual/en/ref.filesystem.php
+;; file:///usr/share/doc/php-doc/html/ref.filesystem.html
+
+(define-skeleton php-basename
+  "Insert an addcslashes statement"
+  ""
+  '(setq path (skeleton-read "Path: "))
+  '(setq suffix (skeleton-read "Suffix? "))
+  > "basename(" path ", " suffix ");" \n)
+
+(define-skeleton php-chgrp
+  "Insert a chgrp statemt"
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq group (skeleton-read "Group: "))
+  > "chgrp(" filename ", " group ");" \n
+)
+
+(define-skeleton php-chmod
+  "Insert a chmod statement."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq perm (skeleton-read "Permissions: "))
+  > "chmod(" filename ", " perm ");" \n
+)
+
+(define-skeleton php-clearstatcache
+  "Insert a clearstatcache statement."
+  > "clearstatcache();" \n
+  )
+
+(define-skeleton php-copy
+  "Insert a clearstatcache statement."
+  ""
+  '(setq file1 (skeleton-read "Filename 1: "))
+  '(setq file2 (skeleton-read "Filename 2: "))
+  > "copy(" file1 ", " file2 ");" \n
+  )
+
+(define-skeleton php-dirname
+  "Insert a dirname statement."
+  ""
+  '(setq dir (skeleton-read "Dirname: "))
+  > "dirname(" dir ");" \n
+  )
+
+(define-skeleton php-disk_free_space
+  "Insert a disk_free_space statement."
+  ""
+  '(setq dir (skeleton-read "Directory: "))
+  > "disk_free_space(" dir ");" \n
+  )
+
+(define-skeleton php-disk_total_space
+  "Insert a disk_total_space statement."
+  ""
+  '(setq dir (skeleton-read "Directory: "))
+  > "disk_total_space(" dir ");" \n
+  )
+
+(define-skeleton php-fclose
+  "Insert a fclose statement. fclose closes an open file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "fclose(" handle ");" \n
+  )
+
+(define-skeleton php-feof
+  "Insert a feof statement. feof tests for end-of-file on a file pointer"
+  ""
+  '(setq file (skeleton-read "file: "))
+  > "feof(" file ");" \n
+  )
+
+(define-skeleton php-fflush
+  "Insert a fflush statement. fflush flushes the output to a file"
+  ""
+  '(setq file (skeleton-read "file: "))
+  > "fflush(" file ");" \n
+  )
+
+(define-skeleton php-fgetc
+  "Insert a fgetc statement. fgetc gets character from file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "fgetc(" handle ");" \n
+  )
+
+(define-skeleton php-fgetcsv
+  "Insert a fgetcsv statement. fgetcsv gets line from file pointer and parse for CSV fields"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq length (skeleton-read "length: "))
+  '(setq delimiter (skeleton-read "delimiter: "))
+  '(setq enclosure (skeleton-read "enclosure: "))
+  '(setq escape (skeleton-read "escape: "))
+  > "fgetc(" handle ", " length ", " delimiter ", " enclosure ", " escape ");" \n
+  )
+
+(define-skeleton php-fgets
+  "Insert a fgets statement. Fgets gets line from file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq length (skeleton-read "length: "))
+  > "fgets(" handle ", " length ");" \n
+  )
+
+(define-skeleton php-fgetss
+  "Insert a fgetss statement. Fgets gets line from file pointer and strip HTML tags"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq length (skeleton-read "length: "))
+  '(setq allowable_tags (skeleton-read "allowable_tags: "))
+  > "fgets(" handle ", " length ", " allowable_tags ");" \n
+  )
+
+(define-skeleton php-file_exists
+  "Insert a file_exists statement."
+  ""
+  '(setq file (skeleton-read "file: "))
+  > "file_exists(" file ");" \n
+  )
+
+(define-skeleton php-file_get_contents
+  "Insert a file_get_contents statement. file_get_contents reads entire file into a string"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq use_include_path (skeleton-read "use_include_path: "))
+  '(setq resource (skeleton-read "resource: "))
+  '(setq offset (skeleton-read "offset: "))
+  '(setq maxlen (skeleton-read "maxlen: "))
+  > "file_get_contents(" filename ", " use_include_path ", " resource ", " offset ", " maxlen ");" \n
+  )
+
+(define-skeleton php-file_put_contents
+  "Insert a file_put_contents statement. file_put_contents writes a string to a file"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq data (skeleton-read "data: "))
+  '(setq flags (skeleton-read "flags: "))
+  '(setq context (skeleton-read "context: "))
+  > "file_put_contents(" filename ", " data ", " flags ", " context ");" \n
+  )
+
+(define-skeleton php-file
+  "Insert a file statement. file reads a string into an array"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq flags (skeleton-read "flags: "))
+  '(setq context (skeleton-read "context: "))
+  > "file(" filename ", " flags ", " context ");" \n
+  )
+
+(define-skeleton php-fileatime
+  "Insert a fileatime statement. fileatime gets last access time of file"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "fileatime(" filename ");" \n
+  )
+
+(define-skeleton php-filectime
+  "Insert a filectime statement. filectime gets inode change time of file"
+  ""
+  '(setq filename (skeleton-read "filectime: "))
+  > "filectime(" filename ");" \n
+  )
+
+(define-skeleton php-fileinode
+  "Insert a fileinode statement. fileinode gets the file inode"
+  ""
+  '(setq filename (skeleton-read "fileinode: "))
+  > "fileinode(" filename ");" \n
+  )
+
+(define-skeleton php-filemtime
+  "Insert a filemtime statement. filemtime gets the file modification"
+  ""
+  '(setq filename (skeleton-read "filemtime: "))
+  > "filemtime(" filename ");" \n
+  )
+
+(define-skeleton php-fileowner
+  "Insert a fileowner statement. fileowner gets the file owner"
+  ""
+  '(setq filename (skeleton-read "fileowner: "))
+  > "fileowner(" filename ");" \n
+  )
+
+(define-skeleton php-fileperms
+  "Insert a fileperms statement. fileperms gets the file permissions"
+  ""
+  '(setq filename (skeleton-read "fileperms: "))
+  > "fileperms(" filename ");" \n
+  )
+
+(define-skeleton php-filesize
+  "Insert a filesize statement. filesize gets the size for the given file"
+  '(setq filename (skeleton-read "filesize: "))
+  > "filesize(" filename ");" \n
+  )
+
+(define-skeleton php-filetype
+  "Insert a filetype statement. filetype gets the type for the given file"
+  '(setq filename (skeleton-read "filetype: "))
+  > "filetype(" filename ");" \n
+  )
+
+(define-skeleton php-flock
+  "Insert a flock statement. flock is a portable advisory file locking"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq operation (skeleton-read "operation: "))
+  '(setq wouldblock (skeleton-read "wouldblock: "))
+  > "flock(" handle ", " operation ", " wouldblock ");" \n
+  )
+
+(define-skeleton php-fnmatch
+  "Insert a fnmatch statement. fnmatch match filename against a pattern"
+  ""
+  '(setq pattern (skeleton-read "pattern: "))
+  '(setq string (skeleton-read "string: "))
+  '(setq flags (skeleton-read "flags: "))
+  > "fnmatch(" pattern ", " string ", " flags ");" \n
+)
+
+(define-skeleton php-fopen
+  "Insert a fopen statement. fopen binds a named resource"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq mode (skeleton-read "mode: "))
+  '(setq use_include_path (skeleton-read "use_include_path: "))
+  '(setq context (skeleton-read "context: "))
+  > "fopen(" filename ", " mode ", " use_include_path ", " context ");" \n
+)
+
+(define-skeleton php-fpassthru
+  "Insert a fpassthru statement. fpassthru output all remaining data on a file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "fpassthru(" handle ");" \n
+)
+
+(define-skeleton php-fputcsv
+  "Insert a fputcsv statement. fputcsv formats line as csv and write to file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq fields (skeleton-read "fields: "))
+  '(setq delimiter (skeleton-read "delimiter: "))
+  '(setq enclosure (skeleton-read "enclosure: "))
+  > "fputcsv(" handle ", " fields ", " delimiter ", " enclosure ");" \n
+)
+
+(define-skeleton php-fread
+  "Insert a fread statement. Binary-safe file read"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq length (skeleton-read "length: "))
+  > "fread(" handle ", " length ");" \n
+)
+
+(define-skeleton php-fscanf
+  "Insert a fscanf statement. fscanf parses input from a file according to a format"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq format (skeleton-read "format: "))
+  > "fscanf(" handle ", " format ");" \n
+)
+
+(define-skeleton php-fseek
+  "Insert a fseek statement. fseek seeks on a file pointer."
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq offset (skeleton-read "offset: "))
+  '(setq whence (skeleton-read "whence: "))
+  > "fseek(" handle ", " offset ", " whence ");" \n
+)
+
+(define-skeleton php-fstat
+  "Insert a fstat statement. fstat gets information about a file using an open file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "fstat(" handle ");" \n
+)
+
+(define-skeleton php-ftell
+  "Insert a ftell statement. ftell returns the current position of the file read/write pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "ftell(" handle ");" \n
+)
+
+(define-skeleton php-ftruncate
+  "Insert a ftruncate statement. ftruncate truncates a file to a given length"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  '(setq size (skeleton-read "size: "))
+  > "ftruncate(" handle ", " size ");" \n
+)
+
+(define-skeleton php-fwrite
+  "Insert a fwrite statement. Binary safe file write"
+  '(setq handle (skeleton-read "handle: "))
+  '(setq string (skeleton-read "string: "))
+  '(setq length (skeleton-read "length: "))
+  > "fwrite(" handle ", " string ", " length ");" \n
+)
+
+(define-skeleton php-glob
+  "Insert a glob statement. Find pathnames matching a pattern"
+  '(setq pattern (skeleton-read "pattern: "))
+  '(setq flags (skeleton-read "flags: "))
+  > "glob(" pattern ", " flags ");" \n
+)
+
+(define-skeleton php-is_dir
+  "Insert a is_dir statement. is_dir tells whether the filename is a directory"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "is_dir(" filename ");" \n
+)
+
+(define-skeleton php-is_executable
+  "Insert a is_executable statement. is_executable tells whether the filename is a executable"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "is_executable(" filename ");" \n
+)
+
+(define-skeleton php-is_file
+  "Insert a is_file statement. is_file tells whether the filename is a regular file"
+  '(setq filename (skeleton-read "filename: "))
+  > "is_file(" filename ");" \n
+)
+
+(define-skeleton php-is_link
+  "Insert a is_link statement. is_link tells whether the filename is a symbolic link"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "is_link(" filename ");" \n
+)
+
+(define-skeleton php-is_readable
+  "Insert a is_readable statement. is_readable tells whether the filename is a readable"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "is_readable(" filename ");" \n
+)
+
+(define-skeleton php-is_uploaded_file
+  "Insert a is_uploaded_file statement. is_uploaded_file tells whether the filename is a executable"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "is_uploaded_file(" filename ");" \n
+)
+
+(define-skeleton php-is_writable
+  "Insert a is_writable statement. is_writable tells whether the filename is a writable"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  > "is_writable(" filename ");" \n
+)
+
+(define-skeleton php-lchgrp
+  "Insert a lchgrp statement. lchgrp changes group ownership of symlink"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq group (skeleton-read "group: "))
+  > "lchgrp(" filename ", " group ");" \n
+)
+
+(define-skeleton php-lchown
+  "Insert a lchown statement. lchown changes user ownership of symlink"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq user (skeleton-read "user: "))
+  > "lchown(" filename ", " user ");" \n
+)
+
+(define-skeleton php-link 
+  "Insert a link statement. link creates a hard link"
+  ""
+  '(setq target (skeleton-read "target of the link: "))
+  '(setq link (skeleton-read "link: "))
+  > "link(" target ", " link ");" \n
+)
+
+(define-skeleton php-linkinfo 
+  "Insert a linkinfo statement. linkinfo gets information about a link"
+  ""
+  '(setq path (skeleton-read "path of the link: "))
+  > "linkinfo(" path ");" \n
+)
+
+(define-skeleton php-lstat 
+  "Insert a lstat statement. lstat gives information about a symbolic link or file"
+  ""
+  '(setq path (skeleton-read "path of the link: "))
+  > "lstat(" path ");" \n
+)
+
+(define-skeleton php-mkdir 
+  "Insert a mkdir statement. mkdir makes a directory"
+  ""
+  '(setq path (skeleton-read "path: "))
+  '(setq mode (skeleton-read "permissions mode (numeric): "))
+  '(setq recursive (skeleton-read "recursive: "))
+  '(setq resource (skeleton-read "context: "))
+  > "mkdir(" path ", " mode ", " recursive ", " resource ");" \n
+)
+
+(define-skeleton php-move_uploaded_file
+  "Insert a move_uploaded_file statement. move an uploaded file to a new location"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq destination (skeleton-read "destination: "))
+  > "move_uploaded_file(" filename ", " destination ");" \n
+)
+
+(define-skeleton php-parse_ini_file
+  "Insert a parse_ini_file statement. parse_ini_file parses a configuration file"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq process_sections (skeleton-read "process sections: "))
+  '(setq scanner_mode (skeleton-read "scanner mode: "))
+  > "parse_ini_file(" filename ", " process_sections ", " scanner_mode ");" \n
+)
+
+(define-skeleton php-parse_ini_string
+  "Insert a parse_ini_string statement. parse_ini_string parses a configuration string"
+  ""
+  '(setq string (skeleton-read "string: "))
+  '(setq process_sections (skeleton-read "process sections: "))
+  '(setq scanner_mode (skeleton-read "scanner mode: "))
+  > "parse_ini_string(" string ", " process_sections ", " scanner_mode ");" \n
+)
+
+(define-skeleton php-pathinfo
+  "Insert a pathinfo statement. pathinfo returns information about a file path"
+  ""
+  '(setq path (skeleton-read "path: "))
+  '(setq options (skeleton-read "options: "))
+  > "pathinfo(" path ", " options ");" \n
+)
+
+(define-skeleton php-pclose 
+  "Insert a pclose statement. pclose closes process file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "pclose(" handle ");" \n
+)
+
+(define-skeleton php-popen 
+  "Insert a popen statement. popen opens process file pointer"
+  ""
+  '(setq command (skeleton-read "command: "))
+  '(setq mode (skeleton-read "mode: "))
+  > "popen(" command ", " mode ");" \n
+)
+
+(define-skeleton php-readfile
+  "Insert a readfile statement. readfile outputs a file"
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq use_include_path (skeleton-read "use_include_path: "))
+  '(setq context (skeleton-read "context: "))
+  > "readfile(" filename ", " use_include_path ", " context ");" \n
+)
+
+(define-skeleton php-readlink
+  "Insert a readlink statement. readlink returns the target of the symbolic link."
+  ""
+  '(setq path (skeleton-read "path: "))
+  > "readlink(" path ");" \n
+)
+
+(define-skeleton php-realpath_cache_get
+  "Insert a realpath_cache_get statement. Returns an array of realpath cache entries."
+  > "realpath_cache_get();" \n
+)
+
+(define-skeleton php-realpath_cache_size
+  "Insert a realpath_cache_size statement. Get the amount of memory used by the realpath cache"
+  > "realpath_cache_size();" \n
+)
+
+
+(define-skeleton php-realpath
+  "Insert a realpath statement. realpath expands all symbolic links and resolves references to '/./', '/../' and extra '/' characters in the input path and returns the canonicalized absolute pathname."
+  ""
+  '(setq path (skeleton-read "path: "))
+  > "realpath(" path ");" \n
+)
+
+(define-skeleton php-rename
+  "Insert a rename statement. Renames a file or directory"
+  ""
+  '(setq oldname (skeleton-read "oldname: "))
+  '(setq newname (skeleton-read "newname: "))
+  '(setq context (skeleton-read "context: "))
+  > "rename(" oldname ", " newname ", " context ");" \n
+)
+
+(define-skeleton php-rewind 
+  "Insert a rewind statement. Rewind the position of a file pointer"
+  ""
+  '(setq handle (skeleton-read "handle: "))
+  > "rewind(" handle ");" \n
+)
+
+(define-skeleton php-rmdir
+  "Insert a rmdir statement. Removes directory."
+  ""
+  '(setq dirname (skeleton-read "dirname: "))
+  > "rmdir(" dirname ");" \n
+)
+
+(define-skeleton php-stat
+  "Insert a stat statement. Gives information about a file."
+  '(setq filename (skeleton-read "filename: "))
+  > "stat(" filename ");" \n
+)
+
+(define-skeleton php-symlink
+  "Insert a symlink statement. symlink creates a symbolic link."
+  ""
+  '(setq target (skeleton-read "target: "))
+  '(setq link (skeleton-read "link: "))
+  > "symlink(" target ", " link ");" \n
+)
+
+(define-skeleton php-tempnam
+  "Insert a tempname statement. tempnam creates file with unique file name."
+  ""
+  '(setq dir (skeleton-read "directory: "))
+  '(setq prefix (skeleton-read "prefix: "))
+  > "tempnam(" dir ", " prefix ");" \n
+)
+
+(define-skeleton php-tmpfile
+  "Insert a tmpfile statement. tmpfile creates a temporary file."
+  > "tmpfile();" \n
+)
+
+(define-skeleton php-touch
+  "Insert a touch statement. touch set access and modification time of file."
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq time (skeleton-read "time: "))
+  '(setq atime (skeleton-read "atime: "))
+  > "touch(" filename ", " time ", " atime ");" \n
+)
+
+(define-skeleton php-umask
+  "Insert umask statement. Changes the current umask."
+  ""
+  '(setq mask (skeleton-read "mask: "))
+  > "umask(" mask ");" \n
+)
+
+(define-skeleton php-unlink
+  "Insert unlink statement. Deletes a file."
+  ""
+  '(setq filename (skeleton-read "filename: "))
+  '(setq context (skeleton-read "context: "))
+  > "unlink(" filename ", " context ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-gd.el b/emacs.d/elpa/php-mode-20151002.2030/php-gd.el
new file mode 100644
index 0000000..bde789f
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-gd.el
@@ -0,0 +1,1097 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; GD functions
+;; file:///usr/share/doc/php-doc/html/ref.image.html
+;; http://php.net/manual/en/ref.image.php
+
+(define-skeleton php-gd_info
+  "Insert a gd_info statement. Retrieve information about the currently installed GD library"
+  ""
+  > "gd_info();" \n
+)
+
+(define-skeleton php-getimagesize
+  "Insert a getimagesize statement."
+  ""
+  '(setq filename (skeleton-read "Filename? "))
+  '(setq imageinfo (skeleton-read "Image info? "))
+  > "getimagesize(" filename ", " imageinfo ");" \n
+)
+
+(define-skeleton php-getimagesizefromstring
+  "Insert a getimagesizefromstring statement."
+  ""
+  '(setq imagedata (skeleton-read "Image data? "))
+  '(setq imageinfo (skeleton-read "Image info? "))
+  > "getimagesizefromstring(" imagedata ", " imageinfo ");" \n
+)
+
+(define-skeleton php-image_type_to_extension
+  "Insert an image_type_to_extension statement. Get file extension for image type"
+  ""
+  '(setq imagetype (skeleton-read "Image type?"))
+  '(setq include_dot (skeleton-read "Include dot to the extension (TRUE | FALSE)"))
+  > "image_type_to_extension(" imagetype ", " include_dot ");" \n
+)
+
+(define-skeleton php-image_type_to_mime_type
+  "Insert an image_type_to_mime_type statement"
+  ""
+  '(setq imagetype (skeleton-read "Image type?"))
+  > "image_type_to_mime_type(" imagetype ");" \n
+) 
+
+(define-skeleton php-image2wbmp
+  "Insert an image2wbmp statement. Output image to browser or file"
+  ""
+  '(setq filename (skeleton-read "Filename? "))
+  '(setq image (skeleton-read "Image? "))
+  '(setq treshold (skeleton-read "Treshold? "))
+  > "image2wbmp(" filename ", " image ", " treshold ");" \n
+)
+
+(define-skeleton php-imageaffine
+  "Insert an imageaffine statement."
+  ""
+  '(setq image (skeleton-read "Image? "))
+  '(setq affine (skeleton-read "Affine array? "))
+  '(setq clip (skeleton-read "Clip? "))
+  > "imageaffine(" image ", " affine ", " clip ");" \n
+)
+
+(define-skeleton php-imageaffinematrixconcat
+  "Insert an imageaffinematrixconcat statement"
+  ""
+  '(setq m1 (skeleton-read "Matrix 1? "))
+  '(setq m2 (skeleton-read "Matrix 2? "))
+  > "imageaffinematrixconcat(" m1 ", " m2 ");" \n
+)
+
+(define-skeleton php-imageaffinematrixget
+  "Insert an imageaffinematrixget statement"
+  ""
+  '(setq type (skeleton-read "Type? "))
+  '(setq options (skeleton-read "Options? "))
+  > "imageaffinematrixget(" m1 ", " m2 ");" \n
+)
+
+(define-skeleton php-imagealphablending
+  "Insert an imagealphablending statement"
+  ""
+  '(setq image (skeleton-read "Image? "))
+  '(setq blendmode (skeleton-read "Blendmode? (TRUE | FALSE)"))
+  > "imagealphablending(" image ", " blendmode ");" \n
+)
+
+(define-skeleton php-imageantialias
+  "Insert an imageantialias statement. Should antialias functions be used or not"
+  ""
+  '(setq image (skeleton-read "Image? "))
+  '(setq enabled (skeleton-read "Enabled? (true | false) "))
+  > "imageantialias(" image ", " enabled ");" \n
+)
+
+(define-skeleton php-imagearc
+  "Insert an imagearc statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq cx (skeleton-read "x-coordinate of the center: "))
+  '(setq cy (skeleton-read "y-coordinate of the center: "))
+  '(setq width (skeleton-read "width: "))
+  '(setq height (skeleton-read "height: "))
+  '(setq start (skeleton-read "start: "))
+  '(setq end (skeleton-read "end: "))
+  '(setq color (skeleton-read "color: "))
+  > "imagearc(" image ", " cx ", " cy ", " width ", " height ", " start ", " end ", " color ");" \n
+)
+
+(define-skeleton php-imagechar
+  "Insert an imagechar statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq font (skeleton-read "Font: ")) 
+  '(setq x (skeleton-read "x: "))
+  '(setq y (skeleton-read "y: "))
+  '(setq c (skeleton-read "c: "))
+  '(setq color (skeleton-read "color: "))
+  > "imagechar(" image ", " font ", " x ", " y ", " c ", " color ");" \n
+)
+
+(define-skeleton php-imagecharup
+  "Insert an imagecharup statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq font (skeleton-read "Font: ")) 
+  '(setq x (skeleton-read "x: "))
+  '(setq y (skeleton-read "y: "))
+  '(setq c (skeleton-read "c: "))
+  '(setq color (skeleton-read "color: "))
+  > "imagecharup(" image ", " font ", " x ", " y ", " c ", " color ");" \n
+)
+
+(define-skeleton php-imagecolorallocate
+  "Insert an imagecolorallocate statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  > "imagecolorallocate(" image ", " red ", " green ", " blue ");" \n
+)
+
+(define-skeleton php-imagecolorallocatealpha
+  "Insert an imagecolorallocatealpha statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  '(setq alpha (skeleton-read "Alpha: "))
+  > "imagecolorallocatealpha(" image ", " red ", " green ", " blue ", " alpha ");" \n
+)
+
+(define-skeleton php-imagecolorat
+  "Insert an imagecolorat statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq x (skeleton-read "x: "))
+  '(setq y (skeleton-read "y: "))
+  > "imagecolorat(" image ", " x ", " y ");" \n
+)
+
+(define-skeleton php-imagecolorclosest 
+  "Insert an imagecolorclosest statement. Get the index of the closest color to the specified color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  > "imagecolorclosest(" image ", " red ", " green ", " blue ");" \n
+)
+
+(define-skeleton php-imagecolorclosestalpha 
+  "Insert an imagecolorclosest statement. Get the index of the closest color to the specified color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  '(setq alpha (skeleton-read "Alpha: "))
+  > "imagecolorclosestalpha(" image ", " red ", " green ", " blue ", " alpha ");" \n
+)
+
+(define-skeleton php-imagecolorclosesthwb
+  "Insert an imagecolorclosesthwb statement. Get the index of the closest color to the specified color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  > "imagecolorclosestalpha(" image ", " red ", " green ", " blue ");" \n
+)
+
+(define-skeleton php-imagecolordeallocate
+  "Insert an imagecolordeallocate statement. De-allocate a color for an image"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq color (skeleton-read "color: "))
+  > "imagecolordeallocate(" image ", " color ");" \n
+)
+
+(define-skeleton php-imagecolorexact
+  "Insert an imagecolorexact statement. Get the index of the specified color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  > "imagecolorexact(" image ", " red ", " green ", " blue ");" \n
+)
+
+(define-skeleton php-imagecolorexactalpha
+  "Insert an imagecolorexact statement. Get the index of the specified color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  '(setq alpha (skeleton-read "Alpha: "))
+  > "imagecolorexact(" image ", " red ", " green ", " blue ", " alpha ");" \n
+)
+
+(define-skeleton php-imagecolormatch
+  "Insert an imagecolormatch. Makes the colors of the palette version of an image more closely match the true color version"
+  '(setq image1 (skeleton-read "Image 1: "))
+  '(setq image2 (skeleton-read "Image 2: "))
+  > "imagecolormatch(" image1 ", " image2 ");" \n
+)
+
+(define-skeleton php-imagecolorresolve
+  "Insert an imagecolorresolve statement. Get the index of the specified color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  > "imagecolorresolve(" image ", " red ", " green ", " blue ");" \n
+)
+
+(define-skeleton php-imagecolorresolvealpha
+  "Insert an imagecolorresolvealpha statement. Get the index of the specified color + alpha or it closest alternative"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  '(setq alpha (skeleton-read "Alpha: "))
+  > "imagecolorresolvealpha(" image ", " red ", " green ", " blue ", " alpha ");" \n
+)
+
+(define-skeleton php-imagecolorset
+  "Insert an imagecolorset statement. Set the color for the specified palette index"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq index (skeleton-read "Index: "))
+  '(setq red (skeleton-read "Red: "))
+  '(setq green (skeleton-read "Green: "))
+  '(setq blue (skeleton-read "Blue: "))
+  '(setq alpha (skeleton-read "Alpha: "))
+  > "imagecolorset(" image ", " index ", " red ", " green ", " blue ", " alpha ");" \n
+)
+
+(define-skeleton php-imagecolorsforindex
+  "Insert an imagecolorsforindex statement. Get the colors for an index"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq index (skeleton-read "Index: "))
+  > "imagecolorsforindex(" image ", " index ");" \n
+)
+
+(define-skeleton php-imagecolorstotal
+  "Insert an imagecolorstotal statement. Get the colors for an index"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  > "imagecolorstotal(" image ");" \n
+)
+
+(define-skeleton php-imagecolortransparent
+  "Insert an imagecolortransparent statement. Sets the transparent color in the given image."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagecolortransparent(" image ", " color ");" \n
+)
+
+(define-skeleton php-imageconvolution
+  "Insert an imageconvolution statement."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq matrix (skeleton-read "Matrix: "))
+  '(setq div (skeleton-read "Divisor result of the convolution: "))
+  '(setq offset (skeleton-read "Offset: "))
+  > "imageconvolution(" image ", " matrix ", " div ", " offset ");" \n
+)
+
+(define-skeleton php-imagecopy
+  "Insert an imagecopy statement."
+  ""
+  '(setq dst_im (skeleton-read "Destination image: "))
+  '(setq src_im (skeleton-read "Source image: "))
+  '(setq dst_x (skeleton-read "X coordinate of destination point: "))
+  '(setq dst_y (skeleton-read "Y coordinate of destination point: "))
+  '(setq src_x (skeleton-read "X coordinate of source point: "))
+  '(setq src_y (skeleton-read "Y coordinate of source point: "))
+  > "imagecopy(" dst_im ", " src_im ", " dst_x ", " dst_y ", " src_x ", " src_y ");" \n
+)
+
+(define-skeleton php-imagecopymerge
+  "Insert an imagecopymerge statement."
+  ""
+  '(setq dst_im (skeleton-read "Destination image: "))
+  '(setq src_im (skeleton-read "Source image: "))
+  '(setq dst_x (skeleton-read "X coordinate of destination point: "))
+  '(setq dst_y (skeleton-read "Y coordinate of destination point: "))
+  '(setq src_x (skeleton-read "X coordinate of source point: "))
+  '(setq src_y (skeleton-read "Y coordinate of source point: "))
+  '(setq src_w (skeleton-read "Source width: "))
+  '(setq src_h (skeleton-read "Source height: "))
+  '(setq pct (skeleton-read "Pct: "))
+  > "imagecopymerge(" dst_im ", " src_im ", " dst_x ", " dst_y ", " src_x ", " src_y ", " src_w ", " src_h ", " pct ");" \n
+)
+
+(define-skeleton php-imagecopymergegray
+  "Insert an imagecopymergegray statement."
+  ""
+  '(setq dst_im (skeleton-read "Destination image: "))
+  '(setq src_im (skeleton-read "Source image: "))
+  '(setq dst_x (skeleton-read "X coordinate of destination point: "))
+  '(setq dst_y (skeleton-read "Y coordinate of destination point: "))
+  '(setq src_x (skeleton-read "X coordinate of source point: "))
+  '(setq src_y (skeleton-read "Y coordinate of source point: "))
+  '(setq src_w (skeleton-read "Source width: "))
+  '(setq src_h (skeleton-read "Source height: "))
+  '(setq pct (skeleton-read "Pct: "))
+  > "imagecopymergegray(" dst_im ", " src_im ", " dst_x ", " dst_y ", " src_x ", " src_y ", " src_w ", " src_h ", " pct ");" \n
+)
+
+
+(define-skeleton php-imagecopyresampled
+  "Insert an imagecopyresampled statement."
+  ""
+  '(setq dst_im (skeleton-read "Destination image: "))
+  '(setq src_im (skeleton-read "Source image: "))
+  '(setq dst_x (skeleton-read "X coordinate of destination point: "))
+  '(setq dst_y (skeleton-read "Y coordinate of destination point: "))
+  '(setq src_x (skeleton-read "X coordinate of source point: "))
+  '(setq src_y (skeleton-read "Y coordinate of source point: "))
+  '(setq dst_w (skeleton-read "Destination width: "))
+  '(setq dst_h (skeleton-read "Destination height: "))
+  '(setq src_w (skeleton-read "Source width: "))
+  '(setq src_h (skeleton-read "Source height: "))
+  '(setq pct (skeleton-read "Pct: "))
+  > "imagecopyresampled(" dst_im ", " src_im ", " dst_x ", " dst_y ", " src_x ", " src_y ", " dst_w ", " dst_h ", " src_w ", " src_h ", " pct ");" \n
+)
+
+(define-skeleton php-imagecopyresized
+  "Insert an imagecopyresized statement."
+  ""
+  '(setq dst_im (skeleton-read "Destination image: "))
+  '(setq src_im (skeleton-read "Source image: "))
+  '(setq dst_x (skeleton-read "X coordinate of destination point: "))
+  '(setq dst_y (skeleton-read "Y coordinate of destination point: "))
+  '(setq src_x (skeleton-read "X coordinate of source point: "))
+  '(setq src_y (skeleton-read "Y coordinate of source point: "))
+  '(setq dst_w (skeleton-read "Destination width: "))
+  '(setq dst_h (skeleton-read "Destination height: "))
+  '(setq src_w (skeleton-read "Source width: "))
+  '(setq src_h (skeleton-read "Source height: "))
+  '(setq pct (skeleton-read "Pct: "))
+  > "imagecopyresized(" dst_im ", " src_im ", " dst_x ", " dst_y ", " src_x ", " src_y ", " dst_w ", " dst_h ", " src_w ", " src_h ", " pct ");" \n
+)
+
+(define-skeleton php-imagecreate
+  "Insert an imagecreate statement."
+  ""
+  '(setq width (skeleton-read "Width: "))
+  '(setq height (skeleton-read "Height: "))
+  > "imagecreate(" width ", " height ");" \n
+)
+
+(define-skeleton php-imagecreatefromgd2
+  "Insert an imagecreatefromgd2."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromgd2(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromgd2part
+  "Insert an imagecreatefromgd2part"
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq src_x (skeleton-read "X coordinate: "))
+  '(setq src_y (skeleton-read "Y coordinate: "))
+  '(setq width (skeleton-read "Width: "))
+  '(setq height (skeleton-read "Height: "))
+  > "imagecreatefromgd2part(" filename ", " src_x ", " src_y ", " width ", " height ");" \n
+)
+
+(define-skeleton php-imagecreatefromgd
+  "Insert an imagecreatefromgd."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromgd(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromgif
+  "Insert an imagecreatefromgif."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromgif(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromjpeg
+  "Insert an imagecreatefromjpeg."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromjpeg(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefrompng
+  "Insert an imagecreatefromjpeg."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromjpeg(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromstring
+  "Insert an imagecreatefromstring."
+  ""
+  '(setq string (skeleton-read "String: "))
+  > "imagecreatefromstring(" string ");" \n
+)
+
+(define-skeleton php-imagecreatefromwbmp
+  "Insert an imagecreatefromwbmp."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromwbmp(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromwebp
+  "Insert an imagecreatefromwebp."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromwebp(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromxbm
+  "Insert an imagecreatefromxbm."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromxbm(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatefromxpm
+  "Insert an imagecreatefromxpm."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagecreatefromxpm(" filename ");" \n
+)
+
+(define-skeleton php-imagecreatetruecolor
+  "Insert an imagecreatetruecolor."
+  ""
+  '(setq width (skeleton-read "Width: "))
+  '(setq heigth (skeleton-read "Heigth: "))
+  > "imagecreatetruecolor(" width ", " heigth ");" \n
+) 
+
+(define-skeleton php-imagecrop
+  "Insert an imagecrop."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq rect (skeleton-read "Array Rect: "))
+  > "imagecrop(" image ", " rect " );" \n
+)
+
+(define-skeleton php-imagecropauto
+  "Insert an imagecropauto statement."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq mode (skeleton-read "Mode: "))
+  '(setq treshold (skeleton-read "Treshold: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagecropauto(" image ", " mode ", " treshold ", " color " );" \n
+)
+
+(define-skeleton php-imagedashedline
+  "Insert a statement to draw a dahsed line"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq x1 (skeleton-read "Upper left X coordinate: "))
+  '(setq y1 (skeleton-read "Upper left Y coordinate: "))
+  '(setq x2 (skeleton-read "Bottom right X coordinate: "))
+  '(setq y2 (skeleton-read "Bottom right Y coordinate: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagedashedline(" image ", " x1 ", " y1 ", " x2 ", " y2 ", " color ");" \n
+)
+
+(define-skeleton php-imagedestroy
+  "Insert an imagedestroy statement."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  > "imagedestroy(" image " );" \n
+)
+
+(define-skeleton php-imageellipse
+  "Insert an imageellipse statement."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq cx (skeleton-read "x-coordinate of the center: "))
+  '(setq cy (skeleton-read "y-coordinate of the center: "))
+  '(setq width (skeleton-read "the ellipse width: "))
+  '(setq heigth (skeleton-read "the ellipse heigth: "))
+  '(setq color (skeleton-read "the ellipse color: "))
+  > "imageellipse(" image ", " cx ", " cy ", " width ", " heigth ", " color ");" \n
+)
+
+(define-skeleton php-imagefill
+  "Insert an imagefill statement."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq x (skeleton-read "x-coordinate of start point: "))
+  '(setq y (skeleton-read "y-coordinate of start point: "))
+  '(setq color (skeleton-read "the fill color: "))
+  > "imagefill(" image ", " x ", " y ", " color ");" \n
+)
+
+(define-skeleton php-imagefilledarc
+  "Insert an imagefilledarc statement. Draw a partial arc and fill it"
+  ""
+  '(setq image (skeleton-read "image: "))
+  '(setq cx (skeleton-read "x-coordinate of the center: "))
+  '(setq cy (skeleton-read "y-coordinate of the center: "))
+  '(setq width (skeleton-read "the arc width: "))
+  '(setq heigth (skeleton-read "the arc heigth: "))
+  '(setq start (skeleton-read "the arc start angle in degrees: "))
+  '(setq end (skeleton-read "the arc end angle in degrees: "))
+  '(setq color (skeleton-read "the ellipse color: "))
+  '(setq style (skeleton-read "style: "))
+  > "imagefilledarc(" image ", " cx ", " cy ", " width ", " heigth ", " start ", " end ", " color ", " style ");" \n
+)
+
+(define-skeleton php-imagefilledellipse
+  "Insert an imagefilledarc statement. Draw a partial arc and fill it"
+  ""
+  '(setq image (skeleton-read "image: "))
+  '(setq cx (skeleton-read "x-coordinate of the center: "))
+  '(setq cy (skeleton-read "y-coordinate of the center: "))
+  '(setq width (skeleton-read "the ellipse width: "))
+  '(setq heigth (skeleton-read "the ellipse heigth: "))
+  '(setq color (skeleton-read "the ellipse color: "))
+  > "imagefilledellipse(" image ", " cx ", " cy ", " width ", " heigth ", " color ");" \n
+)
+
+(define-skeleton php-imagefilledpolygon
+  "Insert an imagefilledpolygon statement. Creates a polygon filled with color."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq points (skeleton-read "Array of points determined by x and y: " ))
+  '(setq num_points (skeleton-read "Total number of vertices: "))
+  '(setq color (skeleton-read "Color to fill: "))
+  > "imagefilledpolygon(" image ", " points ", " num_points ", " color ");" \n
+)
+
+(define-skeleton php-imagefilledrectangle
+  "Insert an imagefilledrectangle statement. Creates a rectangle filled with color"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq x1 (skeleton-read "X coordinate for point 1: "))
+  '(setq y1 (skeleton-read "Y coordinate for point 1: "))
+  '(setq x2 (skeleton-read "X coordinate for point 2: "))
+  '(setq y2 (skeleton-read "Y coordinate for point 2: "))
+  '(setq color (skeleton-read "Color to fill: "))
+  > "imagefilledrectangle(" image ", " x1 ", " y1 ", " x2 ", " y2 ", " color ");" \n
+)
+
+(define-skeleton php-imagefilltoborder
+  "Insert an imagefilltoborder statement."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq x (skeleton-read "X coordinate of start: "))
+  '(setq y (skeleton-read "Y coordinate of start: "))
+  '(setq border (skeleton-read "The border color: "))
+  '(setq color (skeleton-read "Color to fill: "))
+  > "imagefilltoborder(" x ", " y ", " border ", " color ");" \n
+)
+
+(define-skeleton php-imagefilter
+  "Insert an imagefilter statement. Applies a filter to an image"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq filtertype (skeleton-read "Filter type: "))
+  '(setq arg1 (skeleton-read "Arg 1: "))
+  '(setq arg2 (skeleton-read "Arg 2: "))
+  '(setq arg3 (skeleton-read "Arg 3: "))
+  '(setq arg4 (skeleton-read "Arg 4: "))
+  > "imagefilter(" image ", " filtertype ", " arg1 ", " arg2 ", " arg3 ", " arg4 ");" \n
+)
+
+(define-skeleton php-imageflip
+  "Insert an imageflip statement. Flips an image using a given mode"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq mode (skeleton-read "Mode (IMG_FLIP_HORIZONTAL | IMG_FLIP_VERTICAL | IMG_FLIP_BOTH): "))
+  > "imageflip(" image ", " mode ");" \n
+)
+
+(define-skeleton php-imagefontheight
+  "Insert a get font height statement"
+  ""
+  '(setq font (skeleton-read "Font: "))
+  > "imagefontheight(" font ");" \n
+)
+
+(define-skeleton php-imagefontwidth
+  "Insert a get font width statement"
+  ""
+  '(setq font (skeleton-read "Font: ")) 
+  > "imagefontwidth(" font ");" \n
+)
+
+(define-skeleton php-imageftbbox
+  "Insert an imageftbbox statement"
+  ""
+  '(setq size (skeleton-read "Font size: "))
+  '(setq angle (skeleton-read "Angle in degrees: "))
+  '(setq fontfile (skeleton-read "The name of the TrueType font file (can be an URL): "))
+  '(setq text (skeleton-read "The string to be measured: "))
+  '(setq extrainfo (skeleton-read "Extra information: "))
+  > "imageftbbox(" size ", " angle ", " fontfile ", " text ", " extrainfo ");" \n
+)
+
+(define-skeleton php-imagefttext
+  "Insert an imagefttext statement"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq size (skeleton-read "Font size: "))
+  '(setq angle (skeleton-read "Angle in degrees: "))
+  '(setq x (skeleton-read "X: "))
+  '(setq y (skeleton-read "Y: "))
+  '(setq color (skeleton-read "color: "))
+  '(setq fontfile (skeleton-read "The name of the TrueType font file (can be an URL): "))
+  '(setq text (skeleton-read "The string to be measured: "))
+  '(setq extrainfo (skeleton-read "Extra information: "))
+  > "imagefttext(" image ", " size ", " angle ", " x ", " y ", " color ", " fontfile ", " text ", " extrainfo ");" \n
+)
+
+(define-skeleton php-imagegammacorrect
+  "Insert an imagegammacorrect statement. Applies gamma correction."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq inputgamma (skeleton-read "Input gamma: "))
+  '(setq outputgamma (skeleton-read "Output gamma: "))
+  > "imagegammacorrect(" image ", " inputgamma ", " outputgamma ");" \n
+)
+
+(define-skeleton php-imagegd2
+  "Insert an imagegd2 statement. Output gd2 image to browser or file."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq chunk_size (skeleton-read "Chunk Size: "))
+  '(setq type (skeleton-read "Type: "))
+  > "imagegd2(" image ", " filename ", " chunk_size ", " type ");" \n
+)
+
+(define-skeleton php-imagegd
+  "Insert an imagegd statement. Output g2 image to the given filename."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagegd(" image ", " filename ");" \n
+)
+
+(define-skeleton php-imagegif
+  "Insert an imagegif statement. Output image to browser or file."
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagegif(" image ", " filename ");" \n
+)
+
+(define-skeleton php-imagegrabscreen
+  "Insert an imagegrabscreen statement. Captures the whole screen."
+  ""
+  > "imagegrabscreen();" \n
+)
+
+(define-skeleton php-imagegrabwindow
+  "Insert an imagegrabwindow statement. Captures a window."
+  ""
+  '(setq window (skeleton-read "Window handle: "))
+  '(setq client_area (skeleton-read "Client area: "))
+  > "imagegrabwindow(" window ", " client_area ");" \n
+)
+
+(define-skeleton php-imageinterlace
+  "Insert an imageinterlace statement. Enable or disable interlace"
+  ""
+  '(setq image (skeleton-read "Image: "))
+  '(setq interlace (skeleton-read "Interlace: "))
+  > "imageinterlace(" image ", " interlace ");" \n
+)
+
+(define-skeleton php-imageistruecolor
+  "Insert an imageistruecolor statement. Finds whether an image is a truecolor image"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  > "imageistruecolor(" image ");" \n
+)
+
+(define-skeleton php-imagejpeg
+  "Insert an imagejpeg statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq quality (skeleton-read "Quality: "))
+  > "imagejpeg(" image ", " filename ", " quality ");" \n
+)
+
+(define-skeleton php-imagelayereffect 
+  "Insert an imagelayereffect statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq effect (skeleton-read "Effect: "))
+  > "imagelayereffect(" image ", " effect ");" \n
+)
+
+(define-skeleton php-imageline
+  "Insert an imageline statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq x1 (skeleton-read "X1: "))
+  '(setq y1 (skeleton-read "Y1: "))
+  '(setq x2 (skeleton-read "X2: "))
+  '(setq y2 (skeleton-read "Y2: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imageline(" image ", " x1 ", " y1 ", " x2 ", " y2 ", " color ");" \n
+)
+
+(define-skeleton php-imageloadfont
+  "Load a new font."
+  ""
+  '(setq file (skeleton-read "File: "))
+  > "imageloadfont(" file ");" \n
+)
+
+(define-skeleton php-imagepalettecopy
+  "Copy the palette from one image to another."
+  ""
+  '(setq destination (skeleton-read "Destination: "))
+  '(setq source (skeleton-read "Source: "))
+  > "imagepalettecopy(" destination ", " source ");" \n
+)
+
+(define-skeleton php-imagepalettetotruecolor
+  "Converts a palette based image to true color"
+  ""
+  '(setq source (skeleton-read "Source: "))
+  > "imagepalettetotruecolor(" source ");" \n
+)
+
+(define-skeleton php-imagepng 
+  "Output a PNG image to either the browser or a file"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq quality (skeleton-read "Quality: "))
+  '(setq filters (skeleton-read "Filters: "))
+  > "imagepng(" image ", " filename ", " quality ", " filters ");" \n
+)
+
+(define-skeleton php-imagepolygon
+  "Insert an imagepolygon statement. It draws a polygon."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq points (skeleton-read "Array of points: "))
+  '(setq num_points (skeleton-read "Number of points: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagepolygon(" image ", " points ", " num_points ", " color ");" \n
+)
+
+(define-skeleton php-imagepsbbox
+  "Insert an imagepsbbox statement. It gives the bounding box of a text rectangle using PostScript Type1 fonts"
+  ""
+  '(setq text (skeleton-read "Text: "))
+  '(setq font (skeleton-read "Font: "))
+  '(setq size (skeleton-read "Size: "))
+  > "imagepsbbox(" text ", " font ", " size ");" \n
+)
+
+(define-skeleton php-imagepsencodefont
+  "Insert an imagepsencodefont statement. It changes the character encoding vector of a font"
+  ""
+  '(setq font_index (skeleton-read "Font index: "))
+  '(setq encodingfile (skeleton-read "Encoding file: "))
+  > "imagepsencodefont(" font_index ", " encoding_file ");" \n
+)
+
+(define-skeleton php-imagepsextendfont
+  "Insert an imagepsextendfont statement."
+  ""
+  '(setq font_index (skeleton-read "Font index: "))
+  '(setq extend (skeleton-read "Extension value: "))
+  > "imagepsextendfont(" font_index ", " extend ");" \n
+)
+
+(define-skeleton php-imagepsfreefont
+  "Insert an imagepsfreefont statement."
+  ""
+  '(setq font_index (skeleton-read "Font index: "))
+  > "imagepsfreefont(" font_index ");" \n
+)
+
+(define-skeleton php-imagepsloadfont
+  "Insert an imagepsloadfont statement."
+  ""
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagepsloadfont(" filename ");" \n
+)
+
+(define-skeleton php-imagepsslantfont
+  "Insert an imagepsslantfont statement."
+  ""
+  '(setq font_index (skeleton-read "Font index: "))
+  '(setq slant (skeleton-read "Slant: "))
+  > "imagepsslantfont(" font_index ", " slant ");" \n
+)
+
+(define-skeleton php-imagepstext
+  "Insert an imagepstext statement. Draws a text over an image using PostScript Type1 fonts"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq text (skeleton-read "Text: "))
+  '(setq font_index (skeleton-read "Font index: "))
+  '(setq size (skeleton-read "Size: "))
+  '(setq foreground (skeleton-read "Foreground: "))
+  '(setq background (skeleton-read "Background: "))
+  '(setq x (skeleton-read "X: "))
+  '(setq y (skeleton-read "Y: "))
+  '(setq space (skeleton-read "Space: "))
+  '(setq tightness (skeleton-read "Tightness: "))
+  '(setq angle (skeleton-read "Angle: "))
+  '(setq antialias_steps (skeleton-read "Antialias steps: "))
+  > "imagepstext(" image ", " text ", " font_index ", " size ", " foreground ", " background ", " x ", " y ", " space ", " tightness ", " angle ", " antialias ");" \n
+)
+
+(define-skeleton php-imagerectangle
+  "Insert an imagerectangle statement"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq x1 (skeleton-read "X1: "))
+  '(setq y1 (skeleton-read "Y1: "))
+  '(setq x2 (skeleton-read "X2: "))
+  '(setq y2 (skeleton-read "Y2: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagerectangle(" image ", " x1 ", " y1 ", " x2 ", " y2 ", " color ");" \n
+)
+
+(define-skeleton php-imagerotate
+  "Insert an imagerotate statement. Rotate an image with a given angle."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq angle (skeleton-read "Angle: "))
+  '(setq bgd_color (skeleton-read "Color of the uncovered zone: "))
+  '(setq ignore_transparent (skeleton-read "Ignore transparent? "))
+  > "imagerotate(" image ", " angle ", " bgd_color ", " ignore_transparent ");" \n
+)
+
+(define-skeleton php-imagesavealpha
+  "Insert an imagesavealpha statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq saveflag (skeleton-read "Save Flag: "))
+  > "imagesavealpha(" image ", " saveflag ");" \n
+)
+
+(define-skeleton php-imagescale
+  "Insert an imagescale statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq new_width (skeleton-read "New width: "))
+  '(setq new_height (skeleton-read "New height: "))
+  '(setq mode (skeleton-read "Mode: "))
+  > "imagescale(" image ", " new_width ", " new_height ", " mode ");" \n
+)
+
+(define-skeleton php-imagesetbrush
+  "Insert an imagesetbrush statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq brush (skeleton-read "Resource Brush: "))
+  > "imagesetbrush(" image ", " brush ");" \n
+)
+
+(define-skeleton php-imagesetinterpolation
+  "Insert an imagesetinterpolation statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq interpolation (skeleton-read "Interpolation Method: "))
+  > "imagesetinterpolation(" image ", " interpolation ");" \n
+)
+
+(define-skeleton php-imagesetpixel
+  "Insert an imagesetpixel statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq x (skeleton-read "X: "))
+  '(setq y (skeleton-read "Y: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagesetpixel(" image ", " x ", " y ", " color ");" \n
+)
+  
+(define-skeleton php-imagesetstyle
+  "Insert an imagesetstyle statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq style (skeleton-read "Array style: "))
+  > "imagesetstyle(" image ", " style ");" \n
+)
+  
+(define-skeleton php-imagesetthickness
+  "Insert an imagesetthickness statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq thickness (skeleton-read "Array thickness: "))
+  > "imagesetthickness(" image ", " thickness ");" \n
+)
+  
+(define-skeleton php-imagesettile
+  "Insert an imagesettile statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq tile (skeleton-read "Resource Tile: "))
+  > "imagesettile(" image ", " tile ");" \n
+)
+  
+(define-skeleton php-imagestring
+  "Insert an imagestring statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq font (skeleton-read "Font: "))
+  '(setq x (skeleton-read "X: "))
+  '(setq y (skeleton-read "Y: "))
+  '(setq string (skeleton-read "String: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagestring(" image ", " font ", " x ", " y ", " string ", " color ");" \n
+)
+
+(define-skeleton php-imagestringup
+  "Insert an imagestring statement. Draws a string vertically"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq font (skeleton-read "Font: "))
+  '(setq x (skeleton-read "X: "))
+  '(setq y (skeleton-read "Y: "))
+  '(setq string (skeleton-read "String: "))
+  '(setq color (skeleton-read "Color: "))
+  > "imagestringup(" image ", " font ", " x ", " y ", " string ", " color ");" \n
+)
+
+(define-skeleton php-imagesx
+  "Insert an imagesx statement. Get image width."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  > "imagesx(" image ");" \n
+)
+
+(define-skeleton php-imagesy
+  "Insert an imagesy statement. Get image heigth."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  > "imagesx(" image ");" \n
+)
+
+(define-skeleton php-imagetruecolortopalette
+  "Insert an imagetruecolortopalette statement. Convert a true color image to a palette image."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq dither (skeleton-read "Dither: "))
+  '(setq ncolors (skeleton-read "Maximum number of colors in the palette: "))
+  > "imagetruecolortopalette(" image ", " dither ", " ncolors ");" \n
+)
+
+(define-skeleton php-imagettfbbox
+  "Insert an imagettfbbox statement."
+  ""
+  '(setq size (skeleton-read "Size: "))
+  '(setq angle (skeleton-read "Angle: "))
+  '(setq fontfile (skeleton-read "The name of the TrueType font file: "))
+  '(setq text (skeleton-read "String to be measured"))
+  > "imagettfbbox(" size ", " angle ", " fontfile ", " text ");" \n
+)
+
+(define-skeleton php-imagettftext
+  "Insert an imagettftext statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq size (skeleton-read "Size: "))
+  '(setq angle (skeleton-read "Angle: "))
+  '(setq x (skeleton-read "X: "))
+  '(setq y (skeleton-read "Y: "))
+  '(setq string (skeleton-read "String: "))
+  '(setq color (skeleton-read "Color: "))
+  '(setq fontfile (skeleton-read "Fontfile: "))  
+  '(setq text (skeleton-read "The text in UTF-8: "))  
+  > "imagettftext(" image ", " size ", " angle ", " x ", " y ", " string ", " color ", " fontfile ", " text ");" \n
+)
+
+(define-skeleton php-imagetypes
+  "Insert an imagetypes statement."
+  ""
+  > "imagetypes();"
+)
+
+(define-skeleton php-imagewbmp
+  "Insert an imagewbmp statement. Output image to browser or file"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq foreground (skeleton-read "Foreground: "))
+  > "imagewbmp(" image ", " filename ", " foreground ");" \n
+)
+
+(define-skeleton php-imagewebp
+  "Insert an imagewebp statement."
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  > "imagewebp(" image ", " filename ");" \n
+)
+
+(define-skeleton php-imagexbm
+  "Insert an imagexbm statement. Output an xbm image to browser or file"
+  ""
+  '(setq image (skeleton-read "Resource Image: "))
+  '(setq filename (skeleton-read "Filename: "))
+  '(setq foreground (skeleton-read "Foreground: "))
+  > "imagexbm(" image ", " filename ", " foreground ");" \n
+)
+
+(define-skeleton php-iptcembed
+  "Insert an iptcembed statement. Embeds a binary iptc data into a jpeg image"
+  ""
+  '(setq iptcdata (skeleton-read "The iptc data: "))
+  '(setq jpeg_filename (skeleton-read "Path to jpeg image: "))
+  '(setq spool (skeleton-read "Spool flag: "))
+  > "iptcembed(" iptcdata ", " jpeg_filename ", " spool ");" \n
+)
+
+(define-skeleton php-iptcparse
+  "Insert an iptcparse statement. Parse a binary IPTC block into single tags."
+  ""
+  '(setq iptcblock (skeleton-read "The iptc block: "))
+  > "iptcparse(" iptcblock ");" \n
+)
+
+(define-skeleton php-jpeg2wbmp
+  "Insert a jpeg2wbmp. Convert JPEG image file to WBMP image file"
+  ""
+  '(setq jpegname (skeleton-read "Path to jpeg: "))
+  '(setq wbmpname (skeleton-read "Path to destination wbmp: "))
+  '(setq dest_height (skeleton-read "Destination image height: "))
+  '(setq dest_width (skeleton-read "Destination image width: "))
+  '(setq treshold (skeleton-read "Treshold: "))
+  > "jpeg2wbmp(" jpegname ", " wbmpname ", " dest_height ", " dest_width ", " treshold ");" \n
+)
+
+(define-skeleton php-png2wbmp
+  "Insert a png2wbmp. Convert PNG image file to WBMP image file"
+  ""
+  '(setq pngname (skeleton-read "Path to png: "))
+  '(setq wbmpname (skeleton-read "Path to destination wbmp: "))
+  '(setq dest_height (skeleton-read "Destination image height: "))
+  '(setq dest_width (skeleton-read "Destination image width: "))
+  '(setq treshold (skeleton-read "Treshold: "))
+  > "png2wbmp(" pngname ", " wbmpname ", " dest_height ", " dest_width ", " treshold ");" \n
+)
+
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-math.el b/emacs.d/elpa/php-mode-20151002.2030/php-math.el
new file mode 100644
index 0000000..d799917
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-math.el
@@ -0,0 +1,355 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; To install php-ext.el:
+;; You can add (load "path/php-ext/php-ext.el") to your .emacs
+
+;; Description:
+;; Php ext is some skeleton templates for extend php-mode
+
+;; Math functions
+;; http://php.net/manual/en/ref.math.php
+;; file:///usr/share/doc/php-doc/html/ref.math.html
+
+(define-skeleton php-abs
+  "Insert an abs statement"
+  ""
+  > "abs(" (skeleton-read "Number to round? ") ");" \n
+  )
+
+(define-skeleton php-acos
+  "Insert an acos statement"
+  ""
+  > "acos(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-acosh
+  "Insert an acosh statement"
+  ""
+  > "acosh(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-asin
+  "Insert an asin statement"
+  ""
+  > "asin(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-asinh
+  "Insert an asinh statement"
+  ""
+  > "asinh(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-atanh
+  "Insert an asinh statement"
+  ""
+  > "atanh(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-atan
+  "Insert an atan statement"
+  ""
+  > "atan(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-atan2
+  "Insert an atan2 statement"
+  ""
+  > "atan2(" (skeleton-read "Number? ") ", " (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-atanh
+  "Insert an atan statement"
+  ""
+  > "atanh(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-base_convert
+  "Insert a base_convert statement"
+  ""
+  > "base_convert(" (skeleton-read "Number? ") ", " (skeleton-read "Base number? ") ", " (skeleton-read "Base number? ") ");" \n
+)
+
+(define-skeleton php-bcadd
+  "Insert a bcadd statement"
+  ""
+  > "bcadd(" (skeleton-read "Number? ") ", " (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-gmp_add
+  "Insert a bcadd statement"
+  ""
+  > "gmp_add(" (skeleton-read "Number? ") ", " (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-bindec
+  "Insert a bindec statement"
+  ""
+  > "bindec(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-ceil
+  "Insert a ceil statement"
+  ""
+  > "ceil(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-cos
+  "Insert a cos statement"
+  ""
+  > "cos(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-cosh
+  "Insert a cosh statement"
+  ""
+  > "cosh(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-decbin
+  "Insert a decbin statement"
+  ""
+  > "decbin(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-dechex
+  "Insert a dechex statement"
+  ""
+  > "dechex(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-decoct
+  "Insert a dechex statement"
+  ""
+  > "decoct(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-deg2rad
+  "Insert a dechex statement"
+  ""
+  > "deg2rad(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-exp
+  "Insert an exp statement"
+  ""
+  > "exp(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-expm1
+  "Insert an expm1 statement"
+  ""
+  > "expm1(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-floor
+  "Insert a floor statement"
+  ""
+  > "floor(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-fmod
+  "Insert a fmod statement"
+  ""
+  > "fmod(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-getrandmax
+  "Insert an getrandmax statement"
+  ""
+  > "getrandmax(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-mt_rand
+  "Insert an mt_rand statement"
+  ""
+  > "mt_rand(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-mt_srand
+  "Insert an mt_rand statement"
+  ""
+  > "mt_srand(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-hexdec
+  "Insert a hexdec statement"
+  ""
+  > "hexdec(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-hypot
+  "Insert a hypot statement"
+  ""
+  > "hypot(" (skeleton-read "Number? ") ", " (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-is_finite
+  "Insert a is_finite statement"
+  ""
+  > "is_finite(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-is_infinite
+  "Insert a is_infinite statement"
+  ""
+  > "is_infinite(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-is_nan
+  "Insert a is_nan statement"
+  ""
+  > "is_nan(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-lcg_value
+  "Insert a lcg_value statement"
+  ""
+  > "lcg_value(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-log10
+  "Insert a log10 statement"
+  ""
+  > "log10(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-log1p
+  "Insert a log1p statement"
+  ""
+  > "log1p(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-log
+  "Insert a log statement"
+  ""
+  > "log(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-max
+  "Insert a max statement"
+  ""
+  > "max(" (skeleton-read "Number? ") ", " (skeleton-read "Number? ") \n
+   ( "Another number %s: "
+   > ", " str)
+  > ");" \n
+)
+
+(define-skeleton php-min
+  "Insert a min statement"
+  ""
+  > "min(" (skeleton-read "Number? ") ", " (skeleton-read "Number? ") \n
+   ( "Another number %s: "
+   > ", " str)
+  > ");" \n
+)
+
+(define-skeleton php-mt_getrandmax
+  "Insert a mt_getrandmax statement"
+  ""
+  > "mt_getrandmax(); " \n
+)
+
+(define-skeleton php-number_format
+  "Insert a number_format statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "number_format(" number ", " 
+  ( "Another argument %s: "
+   > ", " str)
+)
+
+(define-skeleton php-pi
+  "Insert a pi statement"
+  ""
+  > "pi();" \n
+)
+
+(define-skeleton php-pow
+  "Insert a pow statement"
+  ""
+  '(setq base (skeleton-read "Base? "))
+  '(setq exp (skeleton-read "Exponent? "))
+  > "pow(" base ", " exp ");" \n
+)
+
+(define-skeleton php-rad2deg
+  "Insert a pow statement"
+  ""
+  '(setq base (skeleton-read "Radians? "))
+  '(setq exp (skeleton-read "Degrees? "))
+  > "rad2deg(" base  ");" \n
+)
+
+(define-skeleton php-rand_weighted
+  "Insert an rand_weighted statement"
+  ""
+  > "rand_weighted(" (skeleton-read "Number? ") ");" \n
+)
+
+(define-skeleton php-round
+  "Insert a round statement"
+  ""
+  '(setq number (skeleton-read "Number to round? "))
+  > "round(" number ");" \n
+)
+
+(define-skeleton php-sin
+  "Insert a sin statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "sin(" number ");" \n
+)
+
+(define-skeleton php-sinh
+  "Insert a sin statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "sinh(" number ");" \n
+)
+
+(define-skeleton php-sqrt
+  "Insert a sqrt statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "sqrt(" number ");" \n
+)
+
+(define-skeleton php-srand
+  "Insert a sqrt statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "srand(" number ");" \n
+)
+
+(define-skeleton php-tan
+  "Insert a tan statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "tan(" number ");" \n
+)
+
+(define-skeleton php-tanh
+  "Insert a tan statement"
+  ""
+  '(setq number (skeleton-read "Number? "))
+  > "tanh(" number ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-mode-autoloads.el b/emacs.d/elpa/php-mode-20151002.2030/php-mode-autoloads.el
new file mode 100644
index 0000000..d2c9c76
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-mode-autoloads.el
@@ -0,0 +1,43 @@
+;;; php-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "php-mode" "php-mode.el" (22171 46551 0 0))
+;;; Generated autoloads from php-mode.el
+
+(let ((loads (get 'php 'custom-loads))) (if (member '"php-mode" loads) nil (put 'php 'custom-loads (cons '"php-mode" loads))))
+
+(defvar php-extra-constants 'nil "\
+A list of additional strings to treat as PHP constants.")
+
+(custom-autoload 'php-extra-constants "php-mode" nil)
+
+(add-to-list 'interpreter-mode-alist (cons "php" 'php-mode))
+
+(autoload 'php-mode "php-mode" "\
+Major mode for editing PHP code.
+
+\\{php-mode-map}
+
+\(fn)" t nil)
+
+(dolist (pattern '("\\.php[s345t]?\\'" "\\.phtml\\'" "Amkfile" "\\.amk$")) (add-to-list 'auto-mode-alist `(,pattern . php-mode) t))
+
+;;;***
+
+;;;### (autoloads nil nil ("php-array.el" "php-classobj.el" "php-control-structures.el"
+;;;;;;  "php-crack.el" "php-dio.el" "php-dom.el" "php-exceptions.el"
+;;;;;;  "php-exif.el" "php-ext.el" "php-filesystem.el" "php-gd.el"
+;;;;;;  "php-math.el" "php-mode-pkg.el" "php-pcre.el" "php-regex.el"
+;;;;;;  "php-simplexml.el" "php-strings.el" "php-var.el" "php-xmlparser.el"
+;;;;;;  "php-xmlreader.el") (22171 46551 44838 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; php-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-mode-pkg.el b/emacs.d/elpa/php-mode-20151002.2030/php-mode-pkg.el
new file mode 100644
index 0000000..96c6b00
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-mode-pkg.el
@@ -0,0 +1,4 @@
+(define-package "php-mode" "20151002.2030" "Major mode for editing PHP code" 'nil :url "https://github.com/ejmr/php-mode")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-mode.el b/emacs.d/elpa/php-mode-20151002.2030/php-mode.el
new file mode 100644
index 0000000..6979e8c
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-mode.el
@@ -0,0 +1,1547 @@
+;;; php-mode.el --- Major mode for editing PHP code
+
+;; Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
+;;               2008 Aaron S. Hawley
+;;               2011, 2012, 2013, 2014, 2015 Eric James Michael Ritz
+
+;;; Author: Eric James Michael Ritz
+;;; URL: https://github.com/ejmr/php-mode
+;;; Version: 1.17.0
+
+(defconst php-mode-version-number "1.17.0"
+  "PHP Mode version number.")
+
+(defconst php-mode-modified "2015-10-02"
+  "PHP Mode build date.")
+
+;;; License
+
+;; 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 file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this file; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Usage
+
+;; Put this file in your Emacs lisp path (eg. site-lisp) and add to
+;; your .emacs file:
+;;
+;;   (require 'php-mode)
+
+;; To use abbrev-mode, add lines like this:
+;;   (add-hook 'php-mode-hook
+;;     '(lambda () (define-abbrev php-mode-abbrev-table "ex" "extends")))
+
+;; To make php-mode compatible with html-mode, see http://php-mode.sf.net
+
+;; Many options available under Help:Customize
+;; Options specific to php-mode are in
+;;  Programming/Languages/Php
+;; Since it inherits much functionality from c-mode, look there too
+;;  Programming/Languages/C
+
+;;; Commentary:
+
+;; PHP mode is a major mode for editing PHP source code.  It's an
+;; extension of C mode; thus it inherits all C mode's navigation
+;; functionality.  But it colors according to the PHP grammar and
+;; indents according to the PEAR coding guidelines.  It also includes
+;; a couple handy IDE-type features such as documentation search and a
+;; source and class browser.
+
+;;; Code:
+
+(require 'cc-mode)
+(eval-when-compile
+  (require 'cc-langs)
+  (require 'cc-fonts))
+
+;; Boilerplate from other `cc-mode' derived modes. See
+;; http://cc-mode.sourceforge.net/derived-mode-ex.el for details on how this all
+;; fits together.
+(eval-and-compile
+  (c-add-language 'php-mode 'java-mode))
+
+(require 'font-lock)
+(require 'add-log)
+(require 'custom)
+(require 'flymake)
+(require 'etags)
+(require 'speedbar)
+(eval-when-compile
+  (unless (require 'cl-lib nil t)
+    (require 'cl))
+  (require 'regexp-opt)
+  (defvar c-vsemi-status-unknown-p)
+  (defvar syntax-propertize-via-font-lock))
+
+;; Work around emacs bug#18845, cc-mode expects cl to be loaded
+;; while php-mode only uses cl-lib (without compatibility aliases)
+(eval-and-compile
+  (if (and (= emacs-major-version 24) (>= emacs-minor-version 4))
+    (require 'cl)))
+
+;; Use the recommended cl functions in php-mode but alias them to the
+;; old names when we detect emacs < 24.3
+(if (and (= emacs-major-version 24) (< emacs-minor-version 3))
+    (unless (fboundp 'cl-set-difference)
+      (defalias 'cl-set-difference 'set-difference)))
+
+
+;; Local variables
+;;;###autoload
+(defgroup php nil
+  "Major mode `php-mode' for editing PHP code."
+  :prefix "php-"
+  :group 'languages
+  :link '(url-link :tag "Official Site" "https://github.com/ejmr/php-mode")
+  :link '(url-link :tag "PHP Mode Wiki" "https://github.com/ejmr/php-mode/wiki"))
+
+(defcustom php-executable (or (executable-find "php")
+                              "/usr/bin/php")
+  "The location of the PHP executable."
+  :type 'string
+  :group 'php)
+
+(defcustom php-default-face 'default
+  "Default face in `php-mode' buffers."
+  :type 'face
+  :group 'php)
+
+(defcustom php-speedbar-config t
+  "When set to true automatically configures Speedbar to observe PHP files.
+Ignores php-file patterns option; fixed to expression \"\\.\\(inc\\|php[s345]?\\)\""
+  :type 'boolean
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when val
+             (speedbar-add-supported-extension
+              "\\.\\(inc\\|php[s345]?\\|phtml\\)")))
+  :group 'php)
+
+(defcustom php-mode-speedbar-open nil
+  "Normally `php-mode' starts with the speedbar closed.
+Turning this on will open it whenever `php-mode' is loaded."
+  :type 'boolean
+  :set (lambda (sym val)
+         (set-default sym val)
+         (when val
+             (speedbar 1)))
+  :group 'php)
+
+(defcustom php-template-compatibility t
+  "Should detect presence of html tags."
+  :type 'boolean
+  :group 'php)
+
+(defun php-mode-extra-constants-create-regexp(kwds)
+  "Create regexp for the list of extra constant keywords KWDS."
+   (concat "[^_$]?\\<\\("
+           (regexp-opt
+             (append kwds
+                     (when (boundp 'web-mode-extra-php-constants) web-mode-extra-php-constants)))
+           "\\)\\>[^_]?"))
+
+(defun php-mode-extra-constants-set(sym value)
+  "Apply the list of extra constant keywords VALUE.
+
+This function is called when the custom variable php-extra-constants
+is updated. The web-mode-extra-constants list is appended to the list
+of constants when set."
+  ;; remove old keywords
+  (when (boundp 'php-extra-constants)
+    (font-lock-remove-keywords
+     'php-mode `((,(php-mode-extra-constants-create-regexp php-extra-constants) 1 font-lock-constant-face))))
+  ;; add new keywords
+  (when value
+    (font-lock-add-keywords
+     'php-mode `((,(php-mode-extra-constants-create-regexp value) 1 font-lock-constant-face))))
+  (set sym value))
+
+(defcustom php-lineup-cascaded-calls nil
+  "Indent chained method calls to the previous line"
+  :type 'boolean
+  :group 'php)
+
+;;;###autoload
+(defcustom php-extra-constants '()
+  "A list of additional strings to treat as PHP constants."
+  :type 'list
+  :set 'php-mode-extra-constants-set
+  :group 'php)
+
+(defun php-create-regexp-for-method (visibility)
+  "Make a regular expression for methods with the given VISIBILITY.
+
+VISIBILITY must be a string that names the visibility for a PHP
+method, e.g. 'public'.  The parameter VISIBILITY can itself also
+be a regular expression.
+
+The regular expression this function returns will check for other
+keywords that can appear in method signatures, e.g. 'final' and
+'static'.  The regular expression will have one capture group
+which will be the name of the method."
+  (concat
+   ;; Initial space with possible 'abstract' or 'final' keywords
+   "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?"
+   ;; 'static' keyword may come either before or after visibility
+   "\\(?:" visibility "\\(?:\\s-+static\\)?\\|\\(?:static\\s-+\\)?" visibility "\\)\\s-+"
+   ;; Make sure 'function' comes next with some space after
+   "function\\s-+"
+   ;; Capture the name as the first group and the regexp and make sure
+   ;; by the end we see the opening parenthesis for the parameters.
+   "\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*("))
+
+(defun php-create-regexp-for-classlike (type)
+  "Accepts a `type' of a 'classlike' object as a string, such as
+'class' or 'interface', and returns a regexp as a string which
+can be used to match against definitions for that classlike."
+  (concat
+   ;; First see if 'abstract' or 'final' appear, although really these
+   ;; are not valid for all values of `type' that the function
+   ;; accepts.
+   "^\\s-*\\(?:\\(?:abstract\\|final\\)\\s-+\\)?"
+   ;; The classlike type
+   type
+   ;; Its name, which is the first captured group in the regexp.  We
+   ;; allow backslashes in the name to handle namespaces, but again
+   ;; this is not necessarily correct for all values of `type'.
+   "\\s-+\\(\\(?:\\sw\\|\\\\\\|\\s_\\)+\\)"))
+
+(defvar php-imenu-generic-expression
+  `(("Namespaces"
+    ,(php-create-regexp-for-classlike "namespace") 1)
+   ("Classes"
+    ,(php-create-regexp-for-classlike "class") 1)
+   ("Interfaces"
+    ,(php-create-regexp-for-classlike "interface") 1)
+   ("Traits"
+    ,(php-create-regexp-for-classlike "trait") 1)
+   ("All Methods"
+    ,(php-create-regexp-for-method "\\(?:\\sw\\|\\s_\\)+") 1)
+   ("Private Methods"
+    ,(php-create-regexp-for-method "private") 1)
+   ("Protected Methods"
+    ,(php-create-regexp-for-method "protected")  1)
+   ("Public Methods"
+    ,(php-create-regexp-for-method "public") 1)
+   ("Anonymous Functions"
+    "\\<\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*=\\s-*function\\s-*(" 1)
+   ("Named Functions"
+    "^\\s-*function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1))
+ "Imenu generic expression for PHP Mode. See `imenu-generic-expression'.")
+
+(defcustom php-manual-url "http://www.php.net/manual/en/"
+  "URL at which to find PHP manual.
+You can replace \"en\" with your ISO language code."
+  :type 'string
+  :group 'php)
+
+(defcustom php-search-url "http://www.php.net/"
+  "URL at which to search for documentation on a word."
+  :type 'string
+  :group 'php)
+
+(defcustom php-completion-file ""
+  "Path to the file which contains the function names known to PHP."
+  :type 'string
+  :group 'php)
+
+(defcustom php-manual-path ""
+  "Path to the directory which contains the PHP manual."
+  :type 'string
+  :group 'php)
+
+;;;###autoload
+(add-to-list 'interpreter-mode-alist (cons "php" 'php-mode))
+
+(defcustom php-mode-hook nil
+  "List of functions to be executed on entry to `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-pear-hook nil
+  "Hook called when a PHP PEAR file is opened with `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-drupal-hook nil
+  "Hook called when a Drupal file is opened with `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-wordpress-hook nil
+  "Hook called when a WordPress file is opened with `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-symfony2-hook nil
+  "Hook called when a Symfony2 file is opened with `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-psr2-hook nil
+  "Hook called when a PSR-2 file is opened with `php-mode'."
+  :type 'hook
+  :group 'php)
+
+(defcustom php-mode-force-pear nil
+  "Normally PEAR coding rules are enforced only when the filename contains \"PEAR.\"
+Turning this on will force PEAR rules on all PHP files."
+  :type 'boolean
+  :group 'php)
+
+(defcustom php-mode-warn-if-mumamo-off t
+  "Warn once per buffer if you try to indent a buffer without
+mumamo-mode turned on. Detects if there are any HTML tags in the
+buffer before warning, but this is is not very smart; e.g. if you
+have any tags inside a PHP string, it will be fooled."
+  :type '(choice (const :tag "Warg" t) (const "Don't warn" nil))
+  :group 'php)
+
+(defcustom php-mode-coding-style 'pear
+  "Select default coding style to use with php-mode.
+This variable can take one of the following symbol values:
+
+`Default' - use a reasonable default style for PHP.
+
+`PEAR' - use coding styles preferred for PEAR code and modules.
+
+`Drupal' - use coding styles preferred for working with Drupal projects.
+
+`WordPress' - use coding styles preferred for working with WordPress projects.
+
+`Symfony2' - use coding styles preferred for working with Symfony2 projects.
+
+`PSR-2' - use coding styles preferred for working with projects using PSR-2 standards."
+  :type '(choice (const :tag "Default" default)
+                 (const :tag "PEAR" pear)
+                 (const :tag "Drupal" drupal)
+                 (const :tag "WordPress" wordpress)
+                 (const :tag "Symfony2" symfony2)
+                 (const :tag "PSR-2" psr2))
+  :group 'php
+  :set 'php-mode-custom-coding-style-set
+  :initialize 'custom-initialize-default)
+
+(defun php-mode-custom-coding-style-set (sym value)
+  (when (eq major-mode 'php-mode)
+    (set         sym value)
+    (set-default sym value)
+    (cond ((eq value 'pear)
+           (php-enable-pear-coding-style))
+          ((eq value 'default)
+           (php-enable-default-coding-style))
+          ((eq value 'drupal)
+           (php-enable-drupal-coding-style))
+          ((eq value 'wordpress)
+           (php-enable-wordpress-coding-style))
+          ((eq value 'symfony2)
+           (php-enable-symfony2-coding-style))
+          ((eq value 'psr2)
+           (php-enable-psr2-coding-style)))))
+
+(defun php-mode-version ()
+  "Display string describing the version of PHP mode."
+  (interactive)
+  (message "PHP mode %s of %s"
+           php-mode-version-number php-mode-modified))
+
+(defvar php-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; (define-key map [menu-bar php]
+    ;;   (cons "PHP" (make-sparse-keymap "PHP")))
+
+    ;; (define-key map [menu-bar php complete-function]
+    ;;   '("Complete function name" . php-complete-function))
+    ;; (define-key map [menu-bar php browse-manual]
+    ;;   '("Browse manual" . php-browse-manual))
+    ;; (define-key map [menu-bar php search-documentation]
+    ;;   '("Search documentation" . php-search-documentation))
+
+    ;; By default PHP mode binds C-M-h to c-mark-function, which it
+    ;; inherits from cc-mode.  But there are situations where
+    ;; c-mark-function fails to properly mark a function.  For
+    ;; example, if we use c-mark-function within a method definition
+    ;; then the region will expand beyond the method and into the
+    ;; class definition itself.
+    ;;
+    ;; Changing the default to mark-defun provides behavior that users
+    ;; are more likely to expect.
+    (define-key map (kbd "C-M-h") 'mark-defun)
+
+    ;; Many packages based on cc-mode provide the 'C-c C-w' binding
+    ;; to toggle Subword Mode.  See the page
+    ;;
+    ;;     https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html
+    ;;
+    ;; for more information about Submode Word.
+    (if (boundp 'subword-mode)
+        (if subword-mode
+            (subword-mode nil)
+          (subword-mode t)))
+
+    ;; We inherit c-beginning-of-defun and c-end-of-defun from CC Mode
+    ;; but we have two replacement functions specifically for PHP.  We
+    ;; remap the commands themselves and not their default
+    ;; key-bindings so that our PHP-specific versions will work even
+    ;; if the user has reconfigured their keys, e.g. if they rebind
+    ;; c-end-of-defun to something other than C-M-e.
+    (define-key map [remap c-beginning-of-defun] 'php-beginning-of-defun)
+    (define-key map [remap c-end-of-defun] 'php-end-of-defun)
+
+    (define-key map [(control c) (control f)] 'php-search-documentation)
+    (define-key map [(meta tab)] 'php-complete-function)
+    (define-key map [(control c) (control m)] 'php-browse-manual)
+    (define-key map [(control .)] 'php-show-arglist)
+    (define-key map [(control c) (control r)] 'php-send-region)
+    ;; Use the Emacs standard indentation binding. This may upset c-mode
+    ;; which does not follow this at the moment, but I see no better
+    ;; choice.
+    (define-key map [tab] 'indent-for-tab-command)
+    map)
+  "Keymap for `php-mode'")
+
+(c-lang-defconst c-mode-menu
+  php (append '(["Complete function name" php-complete-function t]
+                ["Browse manual" php-browse-manual t]
+                ["Search documentation" php-search-documentation t]
+                ["----" t])
+              (c-lang-const c-mode-menu)))
+
+(c-lang-defconst c-at-vsemi-p-fn
+  php 'php-c-at-vsemi-p)
+
+(c-lang-defconst c-vsemi-status-unknown-p-fn
+  php 'php-c-vsemi-status-unknown-p)
+
+;; Make php-mode recognize opening tags as preprocessor macro's.
+;;
+;; This is a workaround, the tags must be recognized as something
+;; in order for the syntactic guesses of code below the tag
+;; to be correct and as a result not break indentation.
+;;
+;; Note that submatches or \\| here are not expected by cc-mode.
+(c-lang-defconst c-opt-cpp-prefix
+  php "\\s-*<\\?")
+
+(c-lang-defconst c-identifier-ops
+  php '(
+        (left-assoc "\\" "::" "->")
+        (prefix "\\" "::")))
+
+;; Allow '\' when scanning from open brace back to defining
+;; construct like class
+(c-lang-defconst c-block-prefix-disallowed-chars
+  php (cl-set-difference (c-lang-const c-block-prefix-disallowed-chars)
+                      '(?\\)))
+
+;; Allow $ so variables are recognized in cc-mode and remove @. This
+;; makes cc-mode highlight variables and their type hints in arglists.
+(c-lang-defconst c-symbol-start
+  php (concat "[" c-alpha "_$]"))
+
+;; All string literals can possibly span multiple lines
+(c-lang-defconst c-multiline-string-start-char
+  php t)
+
+(c-lang-defconst c-assignment-operators
+  ;; falls back to java, so no need to specify the language
+  php (append (remove ">>>=" (c-lang-const c-assignment-operators))
+              '(".=")))
+
+(c-lang-defconst beginning-of-defun-function
+  php 'php-beginning-of-defun)
+
+(c-lang-defconst end-of-defun-function
+  php 'php-end-of-defun)
+
+(c-lang-defconst c-primitive-type-kwds
+  php '("int" "integer" "bool" "boolean" "float" "double" "real"
+        "string" "object"))
+
+(c-lang-defconst c-class-decl-kwds
+  "Keywords introducing declarations where the following block (if any)
+contains another declaration level that should be considered a class."
+  php '("class" "trait" "interface"))
+
+(c-lang-defconst c-brace-list-decl-kwds
+  "Keywords introducing declarations where the following block (if
+any) is a brace list.
+
+PHP does not have an \"enum\"-like keyword."
+  php nil)
+
+(c-lang-defconst c-typeless-decl-kwds
+  php (append (c-lang-const c-class-decl-kwds) '("function")))
+
+(c-lang-defconst c-modifier-kwds
+  php '("abstract" "const" "final" "native" "static" "strictfp"
+        "synchronized" "transient" "volatile"))
+
+(c-lang-defconst c-protection-kwds
+  "Access protection label keywords in classes."
+  php '("private" "protected" "public"))
+
+(c-lang-defconst c-postfix-decl-spec-kwds
+  php '("implements" "extends"))
+
+(c-lang-defconst c-type-list-kwds
+  php '("new" "use" "implements" "extends" "namespace" "instanceof" "insteadof"))
+
+(c-lang-defconst c-ref-list-kwds
+  php nil)
+
+(c-lang-defconst c-block-stmt-2-kwds
+  php (append '("elseif" "foreach" "declare")
+              (remove "synchronized" (c-lang-const c-block-stmt-2-kwds))))
+
+(c-lang-defconst c-simple-stmt-kwds
+  php (append '("include" "include_once" "require" "require_once"
+                "echo" "print" "die" "exit")
+              (c-lang-const c-simple-stmt-kwds)))
+
+(c-lang-defconst c-constant-kwds
+  php '("true"
+        "false"
+        "null"))
+
+(c-lang-defconst c-lambda-kwds
+  php '("function"
+        "use"))
+
+(c-lang-defconst c-other-kwds
+  "Keywords not accounted for by any other `*-kwds' language constant."
+  php '(
+    "__halt_compiler"
+    "and"
+    "array"
+    "callable"
+    "as"
+    "break"
+    "catch all"
+    "catch"
+    "clone"
+    "default"
+    "empty"
+    "enddeclare"
+    "endfor"
+    "endforeach"
+    "endif"
+    "endswitch"
+    "endwhile"
+    "eval"
+    "global"
+    "isset"
+    "list"
+    "or"
+    "parent"
+    "static"
+    "unset"
+    "var"
+    "xor"
+    "yield"
+    "yield from"
+
+    ;; Below keywords are technically not reserved keywords, but
+    ;; threated no differently by php-mode from actual reserved
+    ;; keywords
+    ;;
+    ;;; declare directives:
+    "encoding"
+    "ticks"
+    "strict_types"
+
+    ;;; self for static references:
+    "self"
+    ))
+
+;; PHP does not have <> templates/generics
+(c-lang-defconst c-recognize-<>-arglists
+  php nil)
+
+(c-lang-defconst c-enums-contain-decls
+  php nil)
+
+(c-lang-defconst c-nonlabel-token-key
+  "Regexp matching things that can't occur in generic colon labels.
+
+This overrides cc-mode `c-nonlabel-token-key' to support switching on
+double quoted strings and true/false/null.
+
+Note: this regexp is also applied to goto-labels, a future improvement
+might be to handle switch and goto labels differently."
+  php (concat
+     ;; All keywords except `c-label-kwds' and `c-constant-kwds'.
+     (c-make-keywords-re t
+       (cl-set-difference (c-lang-const c-keywords)
+                       (append (c-lang-const c-label-kwds)
+                               (c-lang-const c-constant-kwds))
+                       :test 'string-equal))))
+
+(defun php-lineup-cascaded-calls (langelem)
+  "Line up chained methods using `c-lineup-cascaded-calls',
+but only if the setting is enabled"
+  (if php-lineup-cascaded-calls
+    (c-lineup-cascaded-calls langelem)))
+
+(c-add-style
+ "php"
+ '((c-basic-offset . 4)
+   (c-doc-comment-style . javadoc)
+   (c-offsets-alist . ((arglist-close . php-lineup-arglist-close)
+                       (arglist-cont . (first php-lineup-cascaded-calls 0))
+                       (arglist-cont-nonempty . (first php-lineup-cascaded-calls c-lineup-arglist))
+                       (arglist-intro . php-lineup-arglist-intro)
+                       (case-label . +)
+                       (class-open . -)
+                       (comment-intro . 0)
+                       (inlambda . 0)
+                       (lambda-intro-cont . +)
+                       (inline-open . 0)
+                       (label . +)
+                       (statement-cont . (first php-lineup-cascaded-calls php-lineup-string-cont +))
+                       (substatement-open . 0)
+                       (topmost-intro-cont . (first php-lineup-cascaded-calls +))))))
+
+(defun php-enable-default-coding-style ()
+  "Set PHP Mode to use reasonable default formatting."
+  (interactive)
+  (c-set-style "php"))
+
+(c-add-style
+ "pear"
+ '("php"
+   (c-basic-offset . 4)
+   (c-offsets-alist . ((case-label . 0)))))
+
+(defun php-enable-pear-coding-style ()
+  "Sets up php-mode to use the coding styles preferred for PEAR
+code and modules."
+  (interactive)
+  (setq tab-width 4
+        indent-tabs-mode nil)
+  (c-set-style "pear")
+
+  ;; Undo drupal/PSR-2 coding style whitespace effects
+  (set (make-local-variable 'show-trailing-whitespace)
+       (default-value 'show-trailing-whitespace)))
+
+(c-add-style
+ "drupal"
+ '("php"
+   (c-basic-offset . 2)))
+
+(defun php-enable-drupal-coding-style ()
+  "Makes php-mode use coding styles that are preferable for
+working with Drupal."
+  (interactive)
+  (setq tab-width 2
+        indent-tabs-mode nil
+        fill-column 78)
+  (set (make-local-variable 'show-trailing-whitespace) t)
+  (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
+  (c-set-style "drupal"))
+
+(c-add-style
+  "wordpress"
+  '("php"
+    (c-basic-offset . 4)))
+
+(defun php-enable-wordpress-coding-style ()
+  "Makes php-mode use coding styles that are preferable for
+working with Wordpress."
+  (interactive)
+  (setq indent-tabs-mode t
+        fill-column 78
+        tab-width 4
+        c-indent-comments-syntactically-p t)
+  (c-set-style "wordpress")
+
+  ;; Undo drupal/PSR-2 coding style whitespace effects
+  (set (make-local-variable 'show-trailing-whitespace)
+       (default-value 'show-trailing-whitespace)))
+
+(c-add-style
+  "symfony2"
+  '("php"
+    (c-offsets-alist . ((statement-cont . php-lineup-hanging-semicolon)))))
+
+(defun php-enable-symfony2-coding-style ()
+  "Makes php-mode use coding styles that are preferable for
+working with Symfony2."
+  (interactive)
+  (setq indent-tabs-mode nil
+        fill-column 78
+        c-indent-comments-syntactically-p t
+        require-final-newline t)
+  (c-set-style "symfony2")
+
+  ;; Undo drupal/PSR-2 coding style whitespace effects
+  (set (make-local-variable 'show-trailing-whitespace)
+       (default-value 'show-trailing-whitespace)))
+
+(c-add-style
+  "psr2"
+  '("php"
+    (c-offsets-alist . ((statement-cont . +)))))
+
+(defun php-enable-psr2-coding-style ()
+  "Makes php-mode comply to the PSR-2 coding style"
+  (interactive)
+  (setq indent-tabs-mode nil
+        fill-column 78
+        c-indent-comments-syntactically-p t
+        require-final-newline t)
+  (c-set-style "psr2")
+
+  ;; Apply drupal-like coding style whitespace effects
+  (set (make-local-variable 'require-final-newline) t)
+  (set (make-local-variable 'show-trailing-whitespace) t)
+  (add-hook 'before-save-hook 'delete-trailing-whitespace nil t))
+
+(defconst php-beginning-of-defun-regexp
+  "^\\s-*\\(?:\\(?:abstract\\|final\\|private\\|protected\\|public\\|static\\)\\s-+\\)*function\\s-+&?\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*("
+  "Regular expression for a PHP function.")
+
+(defun php-beginning-of-defun (&optional arg)
+  "Move to the beginning of the ARGth PHP function from point.
+Implements PHP version of `beginning-of-defun-function'."
+  (interactive "p")
+  (let ((arg (or arg 1)))
+    (while (> arg 0)
+      (re-search-backward php-beginning-of-defun-regexp
+                          nil 'noerror)
+      (setq arg (1- arg)))
+    (while (< arg 0)
+      (end-of-line 1)
+      (let ((opoint (point)))
+        (beginning-of-defun 1)
+        (forward-list 2)
+        (forward-line 1)
+        (if (eq opoint (point))
+            (re-search-forward php-beginning-of-defun-regexp
+                               nil 'noerror))
+        (setq arg (1+ arg))))))
+
+(defun php-end-of-defun (&optional arg)
+  "Move the end of the ARGth PHP function from point.
+Implements PHP version of `end-of-defun-function'
+
+See `php-beginning-of-defun'."
+  (interactive "p")
+  (php-beginning-of-defun (- (or arg 1))))
+
+
+(defvar php-warned-bad-indent nil)
+
+;; Do it but tell it is not good if html tags in buffer.
+(defun php-check-html-for-indentation ()
+  (let ((html-tag-re "^\\s-*</?\\sw+.*?>")
+        (here (point)))
+    (goto-char (line-beginning-position))
+    (if (or (when (boundp 'mumamo-multi-major-mode) mumamo-multi-major-mode)
+            ;; Fix-me: no idea how to check for mmm or multi-mode
+            (save-match-data
+              (not (or (re-search-forward html-tag-re (line-end-position) t)
+                       (re-search-backward html-tag-re (line-beginning-position) t)))))
+        (progn
+          (goto-char here)
+          t)
+      (goto-char here)
+      (setq php-warned-bad-indent t)
+      (let* ((known-multi-libs '(("mumamo" mumamo (lambda () (nxhtml-mumamo)))
+                                 ("mmm-mode" mmm-mode (lambda () (mmm-mode 1)))
+                                 ("multi-mode" multi-mode (lambda () (multi-mode 1)))
+                                 ("web-mode" web-mode (lambda () (web-mode)))))
+             (known-names (mapcar (lambda (lib) (car lib)) known-multi-libs))
+             (available-multi-libs (delq nil
+                                         (mapcar
+                                          (lambda (lib)
+                                            (when (locate-library (car lib)) lib))
+                                          known-multi-libs)))
+             (available-names (mapcar (lambda (lib) (car lib)) available-multi-libs))
+             (base-msg
+              (concat
+               "Indentation fails badly with mixed HTML/PHP in the HTML part in
+plain `php-mode'.  To get indentation to work you must use an
+Emacs library that supports 'multiple major modes' in a buffer.
+Parts of the buffer will then be in `php-mode' and parts in for
+example `html-mode'.  Known such libraries are:\n\t"
+               (mapconcat 'identity known-names ", ")
+               "\n"
+               (if available-multi-libs
+                   (concat
+                    "You have these available in your `load-path':\n\t"
+                    (mapconcat 'identity available-names ", ")
+                    "\n\n"
+                    "Do you want to turn any of those on? ")
+                 "You do not have any of those in your `load-path'.")))
+             (is-using-multi
+              (catch 'is-using
+                (dolist (lib available-multi-libs)
+                  (when (and (boundp (cadr lib))
+                             (symbol-value (cadr lib)))
+                    (throw 'is-using t))))))
+        (unless is-using-multi
+          (if available-multi-libs
+              (if (not (y-or-n-p base-msg))
+                  (message "Did not do indentation, but you can try again now if you want")
+                (let* ((name
+                        (if (= 1 (length available-multi-libs))
+                            (car available-names)
+                          ;; Minibuffer window is more than one line, fix that first:
+                          (message "")
+                          (completing-read "Choose multiple major mode support library: "
+                                           available-names nil t
+                                           (car available-names)
+                                           '(available-names . 1)
+                                           )))
+                       (mode (when name
+                               (caddr (assoc name available-multi-libs)))))
+                  (when mode
+                    ;; Minibuffer window is more than one line, fix that first:
+                    (message "")
+                    (load name)
+                    (funcall mode))))
+            (lwarn 'php-indent :warning base-msg)))
+        nil))))
+
+(defun php-cautious-indent-region (start end &optional quiet)
+  (if (or (not php-mode-warn-if-mumamo-off)
+          php-warned-bad-indent
+          (php-check-html-for-indentation))
+      (funcall 'c-indent-region start end quiet)))
+
+(defun php-cautious-indent-line ()
+  (if (or (not php-mode-warn-if-mumamo-off)
+          php-warned-bad-indent
+          (php-check-html-for-indentation))
+      (let ((here (point))
+            doit)
+        (move-beginning-of-line nil)
+        ;; Don't indent heredoc end mark
+        (save-match-data
+          (unless (and (looking-at "[a-zA-Z0-9_]+;\n")
+                       (php-in-string-p))
+            (setq doit t)))
+        (goto-char here)
+        (when doit
+          (funcall 'c-indent-line)))))
+
+(defun php-c-at-vsemi-p (&optional pos)
+  "Return t on html lines (including php region border), otherwise nil.
+POS is a position on the line in question.
+
+This is was done due to the problem reported here:
+
+  URL `https://answers.launchpad.net/nxhtml/+question/43320'"
+  (if (not php-template-compatibility)
+      nil
+    (setq pos (or pos (point)))
+    (let ((here (point))
+          ret)
+      (save-match-data
+        (goto-char pos)
+        (beginning-of-line)
+        (setq ret (looking-at
+                   (rx
+                    (or (seq
+                         bol
+                         (0+ space)
+                         "<"
+                         (in "a-z\\?"))
+                        (seq
+                         (0+ not-newline)
+                         (in "a-z\\?")
+                         ">"
+                         (0+ space)
+                         eol))))))
+      (goto-char here)
+      ret)))
+
+(defun php-c-vsemi-status-unknown-p ()
+  "See `php-c-at-vsemi-p'."
+  )
+
+(defsubst php-in-string-p ()
+  (nth 3 (syntax-ppss)))
+
+(defsubst php-in-comment-p ()
+  (nth 4 (syntax-ppss)))
+
+(defsubst php-in-string-or-comment-p ()
+  (nth 8 (syntax-ppss)))
+
+(defun php-lineup-string-cont (langelem)
+  "Line up string toward equal sign or dot
+e.g.
+$str = 'some'
+     . 'string';
+this ^ lineup"
+  (save-excursion
+    (goto-char (cdr langelem))
+    (let (ret finish)
+      (while (and (not finish) (re-search-forward "[=.]" (line-end-position) t))
+        (unless (php-in-string-or-comment-p)
+          (setq finish t
+                ret (vector (1- (current-column))))))
+      ret)))
+
+(defun php-lineup-arglist-intro (langelem)
+  (save-excursion
+    (goto-char (cdr langelem))
+    (vector (+ (current-column) c-basic-offset))))
+
+(defun php-lineup-arglist-close (langelem)
+  (save-excursion
+    (goto-char (cdr langelem))
+    (vector (current-column))))
+
+(defun php-lineup-arglist (langelem)
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at-p "\\s-*->") '+ 0)))
+
+(defun php-lineup-hanging-semicolon (langelem)
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at-p "\\s-*;\\s-*$") 0 '+)))
+
+(defconst php-heredoc-start-re
+  "<<<\\(?:\\w+\\|'\\w+'\\)$"
+  "Regular expression for the start of a PHP heredoc.")
+
+(defun php-heredoc-end-re (heredoc-start)
+  "Build a regular expression for the end of a heredoc started by
+the string HEREDOC-START."
+  ;; Extract just the identifier without <<< and quotes.
+  (string-match "\\w+" heredoc-start)
+  (concat "^\\(" (match-string 0 heredoc-start) "\\)\\W"))
+
+(defun php-syntax-propertize-function (start end)
+  "Apply propertize rules from START to END."
+  ;; (defconst php-syntax-propertize-function
+  ;;   (syntax-propertize-rules
+  ;;    (php-heredoc-start-re (0 (ignore (php-heredoc-syntax))))))
+  (goto-char start)
+  (while (and (< (point) end)
+              (re-search-forward php-heredoc-start-re end t))
+    (php-heredoc-syntax))
+  (goto-char start)
+  (while (re-search-forward "['\"]" end t)
+    (when (php-in-comment-p)
+      (c-put-char-property (match-beginning 0)
+                           'syntax-table (string-to-syntax "_")))))
+
+(defun php-heredoc-syntax ()
+  "Mark the boundaries of searched heredoc."
+  (goto-char (match-beginning 0))
+  (c-put-char-property (point) 'syntax-table (string-to-syntax "|"))
+  (if (re-search-forward (php-heredoc-end-re (match-string 0)) nil t)
+      (goto-char (match-end 1))
+    ;; Did not find the delimiter so go to the end of the buffer.
+    (goto-char (point-max)))
+  (c-put-char-property (1- (point)) 'syntax-table (string-to-syntax "|")))
+
+(defun php-syntax-propertize-extend-region (start end)
+  "Extend the propertize region if START or END falls inside a
+PHP heredoc."
+  (let ((new-start)
+        (new-end))
+    (goto-char start)
+    (when (re-search-backward php-heredoc-start-re nil t)
+      (let ((maybe (point)))
+        (when (and (re-search-forward
+                    (php-heredoc-end-re (match-string 0)) nil t)
+                   (> (point) start))
+          (setq new-start maybe))))
+    (goto-char end)
+    (when (re-search-backward php-heredoc-start-re nil t)
+      (if (re-search-forward
+           (php-heredoc-end-re (match-string 0)) nil t)
+          (when (> (point) end)
+            (setq new-end (point)))
+        (setq new-end (point-max))))
+    (when (or new-start new-end)
+      (cons (or new-start start) (or new-end end)))))
+
+(easy-menu-define php-mode-menu php-mode-map "PHP Mode Commands"
+  (cons "PHP" (c-lang-const c-mode-menu php)))
+
+;;;###autoload
+(define-derived-mode php-mode c-mode "PHP"
+  "Major mode for editing PHP code.
+
+\\{php-mode-map}"
+
+  (c-initialize-cc-mode t)
+  (c-init-language-vars php-mode)
+  (c-common-init 'php-mode)
+
+  (modify-syntax-entry ?_    "_" php-mode-syntax-table)
+  (modify-syntax-entry ?`    "\"" php-mode-syntax-table)
+  (modify-syntax-entry ?\"   "\"" php-mode-syntax-table)
+  (modify-syntax-entry ?#    "< b" php-mode-syntax-table)
+  (modify-syntax-entry ?\n   "> b" php-mode-syntax-table)
+
+  (set (make-local-variable 'syntax-propertize-via-font-lock)
+       '(("\\(\"\\)\\(\\\\.\\|[^\"\n\\]\\)*\\(\"\\)" (1 "\"") (3 "\""))
+         ("\\(\'\\)\\(\\\\.\\|[^\'\n\\]\\)*\\(\'\\)" (1 "\"") (3 "\""))))
+
+  (when (boundp 'syntax-propertize-function)
+    (add-to-list (make-local-variable 'syntax-propertize-extend-region-functions)
+                 #'php-syntax-propertize-extend-region)
+    (set (make-local-variable 'syntax-propertize-function)
+         #'php-syntax-propertize-function))
+
+  (setq imenu-generic-expression php-imenu-generic-expression)
+
+  ;; PHP vars are case-sensitive
+  (setq case-fold-search t)
+
+  ;; Do not force newline at end of file.  Such newlines can cause
+  ;; trouble if the PHP file is included in another file before calls
+  ;; to header() or cookie().
+  (set (make-local-variable 'require-final-newline) nil)
+  (set (make-local-variable 'next-line-add-newlines) nil)
+
+  ;; PEAR coding standards
+  (add-hook 'php-mode-pear-hook 'php-enable-pear-coding-style
+             nil t)
+
+  ;; ;; Drupal coding standards
+  (add-hook 'php-mode-drupal-hook 'php-enable-drupal-coding-style
+             nil t)
+
+  ;; ;; WordPress coding standards
+  (add-hook 'php-mode-wordpress-hook 'php-enable-wordpress-coding-style
+             nil t)
+
+  ;; ;; Symfony2 coding standards
+  (add-hook 'php-mode-symfony2-hook 'php-enable-symfony2-coding-style
+             nil t)
+
+  ;; ;; PSR-2 coding standards
+  (add-hook 'php-mode-psr2-hook 'php-enable-psr2-coding-style
+             nil t)
+
+  (cond ((eq php-mode-coding-style 'pear)
+         (php-enable-pear-coding-style)
+         (run-hooks 'php-mode-pear-hook))
+        ((eq php-mode-coding-style 'drupal)
+         (php-enable-drupal-coding-style)
+         (run-hooks 'php-mode-drupal-hook))
+        ((eq php-mode-coding-style 'wordpress)
+         (php-enable-wordpress-coding-style)
+         (run-hooks 'php-mode-wordpress-hook))
+        ((eq php-mode-coding-style 'symfony2)
+         (php-enable-symfony2-coding-style)
+         (run-hooks 'php-mode-symfony2-hook))
+        ((eq php-mode-coding-style 'psr2)
+         (php-enable-psr2-coding-style)
+         (run-hooks 'php-mode-psr2-hook)))
+
+  (if (or php-mode-force-pear
+          (and (stringp buffer-file-name)
+               (string-match "PEAR\\|pear"
+                             (buffer-file-name))
+               (string-match "\\.php$" (buffer-file-name))))
+      (run-hooks 'php-mode-pear-hook))
+
+  (setq indent-line-function 'php-cautious-indent-line)
+  (setq indent-region-function 'php-cautious-indent-region)
+  (setq c-at-vsemi-p-fn 'php-c-at-vsemi-p)
+  (setq c-vsemi-status-unknown-p 'php-c-vsemi-status-unknown-p)
+
+  (set (make-local-variable 'syntax-begin-function)
+       'c-beginning-of-syntax)
+
+  ;; We map the php-{beginning,end}-of-defun functions so that they
+  ;; replace the similar commands that we inherit from CC Mode.
+  ;; Because of our remapping we may not actually need to keep the
+  ;; following two local variables, but we keep them for now until we
+  ;; are completely sure their removal will not break any current
+  ;; behavior or backwards compatibility.
+  (set (make-local-variable 'beginning-of-defun-function)
+       'php-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       'php-end-of-defun)
+
+  (set (make-local-variable 'open-paren-in-column-0-is-defun-start)
+       nil)
+  (set (make-local-variable 'defun-prompt-regexp)
+       "^\\s-*function\\s-+&?\\s-*\\(\\(\\sw\\|\\s_\\)+\\)\\s-*")
+  (set (make-local-variable 'add-log-current-defun-header-regexp)
+       php-beginning-of-defun-regexp))
+
+;; Define function name completion function
+(defvar php-completion-table nil
+  "Obarray of tag names defined in current tags table and functions known to PHP.")
+
+(defun php-complete-function ()
+  "Perform function completion on the text around point.
+Completes to the set of names listed in the current tags table
+and the standard php functions.
+The string to complete is chosen in the same way as the default
+for \\[find-tag] (which see)."
+  (interactive)
+  (let ((pattern (php-get-pattern))
+        beg
+        completion
+        (php-functions (php-completion-table)))
+    (if (not pattern) (message "Nothing to complete")
+        (if (not (search-backward pattern nil t))
+            (message "Can't complete here")
+          (setq beg (point))
+          (forward-char (length pattern))
+          (setq completion (try-completion pattern php-functions nil))
+          (cond ((eq completion t))
+                ((null completion)
+                 (message "Can't find completion for \"%s\"" pattern)
+                 (ding))
+                ((not (string= pattern completion))
+                 (delete-region beg (point))
+                 (insert completion))
+                (t
+                 (message "Making completion list...")
+                 (with-output-to-temp-buffer "*Completions*"
+                   (display-completion-list
+                    (all-completions pattern php-functions)))
+                 (message "Making completion list...%s" "done")))))))
+
+(defun php-completion-table ()
+  "Build variable `php-completion-table' on demand.
+The table includes the PHP functions and the tags from the
+current `tags-file-name'."
+  (or (and tags-file-name
+           (save-excursion (tags-verify-table tags-file-name))
+           php-completion-table)
+      (let ((tags-table
+             (when tags-file-name
+               (with-current-buffer (get-file-buffer tags-file-name)
+                 (etags-tags-completion-table))))
+            (php-table
+             (cond ((and (not (string= "" php-completion-file))
+                         (file-readable-p php-completion-file))
+                    (php-build-table-from-file php-completion-file))
+                   (php-manual-path
+                    (php-build-table-from-path php-manual-path))
+                   (t nil))))
+        (unless (or php-table tags-table)
+          (error
+           (concat "No TAGS file active nor are "
+                   "`php-completion-file' or `php-manual-path' set")))
+        (when tags-table
+          ;; Combine the tables.
+          (mapatoms (lambda (sym) (intern (symbol-name sym) php-table))
+                    tags-table))
+        (setq php-completion-table php-table))))
+
+(defun php-build-table-from-file (filename)
+  (let ((table (make-vector 1022 0))
+        (buf (find-file-noselect filename)))
+    (with-current-buffer buf
+      (goto-char (point-min))
+      (while (re-search-forward
+              "^\\([-a-zA-Z0-9_.]+\\)\n"
+              nil t)
+        (intern (buffer-substring (match-beginning 1) (match-end 1))
+                table)))
+    (kill-buffer buf)
+    table))
+
+(defun php-build-table-from-path (path)
+  (let ((table (make-vector 1022 0))
+        (files (directory-files
+                path
+                nil
+                "^function\\..+\\.html$")))
+    (mapc (lambda (file)
+            (string-match "\\.\\([-a-zA-Z_0-9]+\\)\\.html$" file)
+            (intern
+             (replace-regexp-in-string
+              "-" "_" (substring file (match-beginning 1) (match-end 1)) t)
+             table))
+          files)
+    table))
+
+;; Find the pattern we want to complete
+;; find-tag-default from GNU Emacs etags.el
+(defun php-get-pattern ()
+  (save-excursion
+    (while (looking-at "\\sw\\|\\s_")
+      (forward-char 1))
+    (if (or (re-search-backward "\\sw\\|\\s_"
+                                (save-excursion (beginning-of-line) (point))
+                                t)
+            (re-search-forward "\\(\\sw\\|\\s_\\)+"
+                               (save-excursion (end-of-line) (point))
+                               t))
+        (progn (goto-char (match-end 0))
+               (buffer-substring-no-properties
+                (point)
+                (progn (forward-sexp -1)
+                       (while (looking-at "\\s'")
+                         (forward-char 1))
+                       (point))))
+      nil)))
+
+(defun php-show-arglist ()
+  (interactive)
+  (let* ((tagname (php-get-pattern))
+         (buf (find-tag-noselect tagname nil nil))
+         arglist)
+    (with-current-buffer buf
+      (goto-char (point-min))
+      (when (re-search-forward
+             (format "function\\s-+%s\\s-*(\\([^{]*\\))" tagname)
+             nil t)
+        (setq arglist (buffer-substring-no-properties
+                       (match-beginning 1) (match-end 1)))))
+    (if arglist
+        (message "Arglist for %s: %s" tagname arglist)
+        (message "Unknown function: %s" tagname))))
+
+(defcustom php-search-documentation-browser-function nil
+  "Function to display PHP documentation in a WWW browser.
+
+If non-nil, this shadows the value of `browse-url-browser-function' when
+calling `php-search-documentation' or `php-search-local-documentation'."
+  :type '(choice (const :tag "default" nil) function)
+  :link '(variable-link browse-url-browser-function)
+  :group 'php)
+
+(defun php-browse-documentation-url (url)
+  "Browse a documentation URL using the configured browser function.
+
+See `php-search-documentation-browser-function'."
+  (let ((browse-url-browser-function
+         (or php-search-documentation-browser-function
+             browse-url-browser-function)))
+    (browse-url url)))
+
+(defvar php-search-local-documentation-types
+  (list "function" "control-structures" "class" "book")
+  ;; "intro" and "ref" also look interesting, but for all practical purposes
+  ;; their terms are sub-sets of the "book" terms (with the few exceptions
+  ;; being very unlikely search terms).
+  "The set (and priority sequence) of documentation file prefixes
+under which to search for files in the local documentation directory.")
+
+(defvar php-search-local-documentation-words-cache nil)
+
+(defun php--search-documentation-read-arg ()
+  "Obtain interactive argument for searching documentation."
+  ;; Cache the list of documentation words available for completion,
+  ;; based on the defined types-of-interest.
+  (let ((types-list php-search-local-documentation-types)
+        (words-cache php-search-local-documentation-words-cache)
+        (local-manual (and (stringp php-manual-path)
+                           (not (string= php-manual-path "")))))
+    (when (and local-manual
+               (not (assq types-list words-cache)))
+      ;; Generate the cache on the first run, or if the types changed.
+      ;; We read the filenames matching our types list in the local
+      ;; documentation directory, and extract the 'middle' component
+      ;; of each. e.g. "function.array-map.html" => "array_map".
+      (let* ((types-opt (regexp-opt types-list))
+             (pattern (concat "\\`" types-opt "\\.\\(.+\\)\\.html\\'"))
+             (collection
+              (mapcar (lambda (filename) (subst-char-in-string
+                                          ?- ?_ (replace-regexp-in-string
+                                                 pattern "\\1" filename)))
+                      (directory-files php-manual-path nil pattern))))
+        ;; Replace the entire cache. If the types changed, we don't need
+        ;; to retain the collection for the previous value.
+        (setq words-cache (list (cons types-list collection)))
+        (setq php-search-local-documentation-words-cache words-cache)))
+    ;; By default we search for (current-word) immediately, without prompting.
+    ;; With a prefix argument, or if there is no (current-word), we perform a
+    ;; completing read for a word from the cached collection.
+    (let* ((default (current-word))
+           (prompt (if default
+                       (format "Search PHP docs (%s): " default)
+                     "Search PHP docs: "))
+           (collection (and local-manual
+                            (cdr (assq types-list words-cache))))
+           (word (if (or current-prefix-arg (not default))
+                     (completing-read prompt collection nil nil nil nil default)
+                   default)))
+      ;; Return interactive argument list.
+      (list word))))
+
+(defun php-search-local-documentation (word)
+  "Search the local PHP documentation (i.e. in `php-manual-path') for
+the word at point.  The function returns t if the requested documentation
+exists, and nil otherwise.
+
+With a prefix argument, prompt (with completion) for a word to search for."
+  (interactive (php--search-documentation-read-arg))
+  (let ((file (catch 'found
+                (loop for type in php-search-local-documentation-types do
+                      (let* ((doc-html (format "%s.%s.html"
+                                               type
+                                               (replace-regexp-in-string
+                                                "_" "-" (downcase word))))
+                             (file (expand-file-name doc-html  php-manual-path)))
+                        (when (file-exists-p file)
+                          (throw 'found file)))))))
+    (when file
+      (let ((file-url (if (string-prefix-p "file://" file)
+                          file
+                        (concat "file://" file))))
+        (php-browse-documentation-url file-url))
+      t)))
+
+(defsubst php-search-web-documentation (word)
+  (php-browse-documentation-url (concat php-search-url
+                                        (replace-regexp-in-string "_" "-" (downcase word)))))
+
+;; Define function documentation function
+(defun php-search-documentation (word)
+  "Search PHP documentation for the word at point.
+
+If `php-manual-path' has a non-empty string value then the command
+will first try searching the local documentation.  If the requested
+documentation does not exist it will fallback to searching the PHP
+website.
+
+With a prefix argument, prompt for a documentation word to search
+for.  If the local documentation is available, it is used to build
+a completion list."
+  (interactive (php--search-documentation-read-arg))
+  (if (and (stringp php-manual-path)
+           (not (string= php-manual-path "")))
+      (or (php-search-local-documentation word)
+          (php-search-web-documentation word))
+    (php-search-web-documentation word)))
+
+;; Define function for browsing manual
+(defun php-browse-manual ()
+  "Bring up manual for PHP."
+  (interactive)
+  (browse-url php-manual-url))
+
+(defconst php-font-lock-keywords-1 (c-lang-const c-matchers-1 php)
+  "Basic highlighting for PHP mode.")
+
+(defconst php-font-lock-keywords-2 (c-lang-const c-matchers-2 php)
+  "Medium level highlighting for PHP mode.")
+
+(defconst php-font-lock-keywords-3
+  (append
+   ;; php-mode patterns *before* cc-mode:
+   ;;  only add patterns here if you want to prevent cc-mode from applying
+   ;;  a different face.
+   '(
+     ;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
+     ;; not in $obj->var()
+     ("->\\(\\sw+\\)\\s-*(" 1 'default)
+
+     ;; Highlight special variables
+     ("\\$\\(this\\|that\\)" 1 font-lock-constant-face)
+     ("\\(\\$\\|->\\)\\([a-zA-Z0-9_]+\\)" 2 font-lock-variable-name-face)
+
+     ;; Highlight function/method names
+     ("\\<function\\s-+&?\\(\\sw+\\)\\s-*(" 1 font-lock-function-name-face)
+
+     ;; The dollar sign should not get a variable-name face, below
+     ;; pattern resets the face to default in case cc-mode sets the
+     ;; variable-name face (cc-mode does this for variables prefixed
+     ;; with type, like in arglist)
+     ("\\(\\$\\)\\(\\sw+\\)" 1 'default)
+
+     ;; Array is a keyword, except when used as cast, so that (int)
+     ;; and (array) look the same
+     ("(\\(array\\))" 1 font-lock-type-face)
+
+     ;; Support the ::class constant in PHP5.6
+     ("\\sw+::\\(class\\)" 1 font-lock-constant-face))
+
+   ;; cc-mode patterns
+   (c-lang-const c-matchers-3 php)
+
+   ;; php-mode patterns *after* cc-mode:
+   ;;   most patterns should go here, faces will only be applied if not
+   ;;   already fontified by another pattern. Note that using OVERRIDE
+   ;;   is usually overkill.
+   `(
+     ;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
+     ;; not in $obj->var()
+     ("->\\(\\sw+\\)\\s-*(" 1 'default)
+
+     ("\\(\\$\\|->\\)\\([a-zA-Z0-9_]+\\)" 2 font-lock-variable-name-face)
+
+     ;; Highlight all upper-cased symbols as constant
+     ("\\<\\([A-Z_][A-Z0-9_]+\\)\\>" 1 font-lock-constant-face)
+
+     ;; Highlight all statically accessed class names as constant,
+     ;; another valid option would be using type-face, but using
+     ;; constant-face because this is how it works in c++-mode.
+     ("\\(\\sw+\\)::" 1 font-lock-constant-face)
+
+     ;; Highlight class name after "use .. as"
+     ("\\<as\\s-+\\(\\sw+\\)" 1 font-lock-type-face)
+
+     ;; Class names are highlighted by cc-mode as defined in
+     ;; c-class-decl-kwds, below regexp is a workaround for a bug
+     ;; where the class names are not highlighted right after opening
+     ;; a buffer (editing a file corrects it).
+     ;;
+     ;; This behaviour is caused by the preceding '<?php', which
+     ;; cc-mode cannot handle easily. Registering it as a cpp
+     ;; preprocessor works well (i.e. the next line is not a
+     ;; statement-cont) but the highlighting glitch remains.
+     (,(concat (regexp-opt (c-lang-const c-class-decl-kwds php))
+               " \\(\\sw+\\)")
+      1 font-lock-type-face)
+
+     ;; Highlight return types in functions and methods.
+     ("function.+:\\s-?\\(\\sw+\\)" 1 font-lock-type-face)
+
+     ;; While c-opt-cpp-* highlights the <?php opening tags, it is not
+     ;; possible to make it highlight short open tags and closing tags
+     ;; as well. So we force the correct face on all cases that
+     ;; c-opt-cpp-* lacks for this purpose.
+     ;;
+     ;; Note that starting a file with <% breaks indentation, a
+     ;; limitation we can/should live with.
+     (,(regexp-opt '("?>" "<?" "<%" "%>")) 0 font-lock-preprocessor-face)))
+  "Detailed highlighting for PHP mode.")
+
+(defvar php-font-lock-keywords php-font-lock-keywords-3
+  "Default expressions to highlight in PHP mode.")
+
+;;; Provide support for Flymake so that users can see warnings and
+;;; errors in real-time as they write code.
+
+(defun flymake-php-init ()
+  (let* ((temp-file (flymake-init-create-temp-buffer-copy
+                     'flymake-create-temp-inplace))
+         (local-file (file-relative-name
+                      temp-file
+                      (file-name-directory buffer-file-name))))
+    (list php-executable (list "-f" local-file "-l"))))
+
+(add-to-list 'flymake-allowed-file-name-masks
+             '("\\.php[345s]?$"
+               flymake-php-init
+               flymake-simple-cleanup
+               flymake-get-real-file-name))
+
+(add-to-list 'flymake-err-line-patterns
+             '("\\(Parse\\|Fatal\\) error: \\(.*?\\) in \\(.*?\\) on line \\([0-9]+\\)" 3 4 nil 2))
+
+
+(defun php-send-region (start end)
+  "Send the region between `start' and `end' to PHP for execution.
+The output will appear in the buffer *PHP*."
+  (interactive "r")
+  (let ((php-buffer (get-buffer-create "*PHP*"))
+        (code (buffer-substring start end)))
+    ;; Calling 'php -r' will fail if we send it code that starts with
+    ;; '<?php', which is likely.  So we run the code through this
+    ;; function to check for that prefix and remove it.
+    (let ((cleaned-php-code (if (string-prefix-p "<?php" code t)
+                                (substring code 5)
+                              code)))
+      (call-process php-executable nil php-buffer nil "-r" cleaned-php-code))))
+
+
+(defface php-annotations-annotation-face '((t . (:inherit font-lock-constant-face)))
+  "Face used to highlight annotations.")
+
+(defconst php-annotations-re "\\(\\s-\\|{\\)\\(@[[:alpha:]]+\\)")
+
+(defmacro php-annotations-inside-comment-p (pos)
+  "Return non-nil if POS is inside a comment."
+  `(or (eq (get-char-property ,pos 'face) 'font-lock-comment-face)
+       (eq (get-char-property ,pos 'face) 'font-lock-comment-delimiter-face)))
+
+(defun php-annotations-font-lock-find-annotation (limit)
+  (let ((match
+         (catch 'match
+           (save-match-data
+             (while (re-search-forward php-annotations-re limit t)
+               (when (php-annotations-inside-comment-p (match-beginning 0))
+                 (goto-char (match-end 0))
+                 (throw 'match (match-data))))))))
+    (when match
+      (set-match-data match)
+      t)))
+
+(defconst php-string-interpolated-variable-regexp
+  "{\\$[^}\n\\\\]*\\(?:\\\\.[^}\n\\\\]*\\)*}\\|\\${\\sw+}\\|\\$\\sw+")
+
+(defun php-string-intepolated-variable-font-lock-find (limit)
+  (while (re-search-forward php-string-interpolated-variable-regexp limit t)
+    (let ((quoted-stuff (nth 3 (syntax-ppss))))
+      (when (and quoted-stuff (member quoted-stuff '(?\" ?`)))
+        (put-text-property (match-beginning 0) (match-end 0)
+                           'face 'font-lock-variable-name-face))))
+  nil)
+
+(eval-after-load 'php-mode
+  '(progn
+     (font-lock-add-keywords
+      'php-mode
+      '((php-annotations-font-lock-find-annotation (2 'php-annotations-annotation-face t))))
+     (font-lock-add-keywords
+      'php-mode
+      `((php-string-intepolated-variable-font-lock-find))
+      'append)))
+
+
+
+;;; Correct the behavior of `delete-indentation' by modifying the
+;;; logic of `fixup-whitespace'.
+(defadvice fixup-whitespace (after php-mode-fixup-whitespace)
+  "Remove whitespace before certain characters in PHP mode."
+  (let* ((no-behind-space ";\\|,\\|->\\|::")
+         (no-front-space "->\\|::"))
+    (when (and (eq major-mode 'php-mode)
+               (or (looking-at-p (concat " \\(" no-behind-space "\\)"))
+                   (save-excursion
+                     (forward-char -2)
+                     (looking-at-p no-front-space))))
+      (delete-char 1))))
+
+(ad-activate 'fixup-whitespace)
+
+;; Advice `font-lock-fontify-keywords-region' to support namespace
+;; separators in class names. Use word syntax for backslashes when
+;; doing keyword fontification, but not when doing syntactic
+;; fontification because that breaks \ as escape character in strings.
+;;
+;; Special care is taken to restore the original syntax, because we
+;; want \ not to be word for functions like forward-word.
+(defadvice font-lock-fontify-keywords-region (around backslash-as-word activate)
+  "Fontify keywords with backslash as word character"
+  (let ((old-syntax (string (char-syntax ?\\))))
+    (modify-syntax-entry ?\\ "w")
+    ad-do-it
+    (modify-syntax-entry ?\\ old-syntax)))
+
+
+;;;###autoload
+(dolist (pattern '("\\.php[s345t]?\\'" "\\.phtml\\'" "Amkfile" "\\.amk$"))
+  (add-to-list 'auto-mode-alist `(,pattern . php-mode) t))
+
+(provide 'php-mode)
+
+;;; php-mode.el ends here
+
+;; Local Variables:
+;; firestarter: ert-run-tests-interactively
+;; End:
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-pcre.el b/emacs.d/elpa/php-mode-20151002.2030/php-pcre.el
new file mode 100644
index 0000000..cb939fa
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-pcre.el
@@ -0,0 +1,103 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; file:///usr/share/doc/php-doc/html/ref.pcre.html
+
+(define-skeleton php-preg_filter
+  "Insert a preg_filter statement. preg_filter is identical to preg_replace except it only returns the (possibly transformed) subjects where there was a match."
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq replacement (skeleton-read "Replacement: "))
+  '(setq subject (skeleton-read "Subject: "))
+  > "preg_filter(" pattern ", " replacement ", " subject ");" \n)
+
+(define-skeleton php-preg_grep
+  "Insert a preg_grep statement. preg_grep return array entries that match the pattern."
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq input (skeleton-read "Input: "))
+  > "preg_grep(" pattern ", " replacement ");" \n)
+
+(define-skeleton php-preg_last_error
+  "Insert a preg_last_error statement. Returns the error code of the last PCRE regex execution"
+  ""
+  > "preg_last_error();" \n)
+
+
+(define-skeleton php-preg_match_all
+  "Insert a preg_match_all statement. Perform a global regular expression match"
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq subject (skeleton-read "Input string: "))
+  '(setq matches (skeleton-read "The array of all matches: "))
+  '(setq flags (skeleton-read "Flags (PREG_PATTERN_ORDER | PREG_SET_ORDER | PREG_OFFSET_CAPTURE)"))
+  '(setq offset (skeleton-read "Offset: "))
+  > "preg_match_all(" pattern ", " subject ", " matches ", " flags ", " offset ");" \n
+)
+
+(define-skeleton php-preg_match
+  "Insert a preg_match statement. Perform a regular expression match"
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq subject (skeleton-read "Input string: "))
+  '(setq matches (skeleton-read "The array of all matches: "))
+  '(setq flags (skeleton-read "Flags (PREG_PATTERN_ORDER | PREG_SET_ORDER | PREG_OFFSET_CAPTURE)"))
+  '(setq offset (skeleton-read "Offset: "))
+  > "preg_match(" pattern ", " subject ", " matches ", " flags ", " offset ");" \n
+)
+
+(define-skeleton php-preg_quote
+  "Insert a preg_quote statement. Quote regular expression characters"
+  ""
+  '(setq str (skeleton-read "String: "))
+  '(setq delimiter (skeleton-read "Delimiter: "))
+  > "preg_quote(" str ", " delimiter ");" \n
+)
+
+(define-skeleton php-preg_replace_callback
+  "Insert a preg_replace_callback statement."
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq callback (skeleton-read "Callback: "))
+  '(setq subject (skeleton-read "Subject: "))
+  '(setq limit (skeleton-read "Limit: "))
+  '(setq count (skeleton-read "Count: "))
+  > "preg_replace_callback(" pattern ", " callback ", " subject ", " limit ", " count ");" \n
+)
+
+(define-skeleton php-preg_replace
+  "Insert a preg_replace statement. Perform a regular expression search and replace"
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq replacement (skeleton-read "Replacement: "))
+  '(setq subject (skeleton-read "Subject: "))
+  '(setq limit (skeleton-read "Limit: "))
+  '(setq count (skeleton-read "Count: "))
+  > "preg_replace_callback(" pattern ", " replacement ", " subject ", " limit ", " count ");" \n
+)
+
+(define-skeleton php-preg_split
+  "Insert a preg_split statement. Split string by a regular expression"
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq subject (skeleton-read "Subject: "))
+  '(setq limit (skeleton-read "Limit: "))
+  '(setq flags (skeleton-read "Flags: "))
+  > "preg_split(" pattern ", " subject ", " limit ", " flags ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-regex.el b/emacs.d/elpa/php-mode-20151002.2030/php-regex.el
new file mode 100644
index 0000000..9a09956
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-regex.el
@@ -0,0 +1,82 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; Regular expression
+;; http://php.net/manual/en/ref.regex.php
+;; file:///usr/share/doc/php-doc/html/ref.regex.html
+
+(define-skeleton php-ereg
+  "Insert an ereg statement"
+  ""
+  '(setq regexp (skeleton-read "Regexp? "))
+  '(setq string (skeleton-read "String? "))
+  > "ereg(" regexp ", " string ");"
+)
+
+(define-skeleton php-ereg_replace
+  "Insert an eregi_replace statement"
+  ""
+  '(setq pattern (skeleton-read "Pattern? "))
+  '(setq replacement (skeleton-read "Replacement? "))
+  '(setq string (skeleton-read "String? "))
+  > "ereg_replace(" pattern ", " replacement ", " string ");"
+)
+
+(define-skeleton php-eregi
+  "Insert an eregi statement"
+  ""
+  '(setq regexp (skeleton-read "Regexp? "))
+  '(setq string (skeleton-read "String? "))
+  > "ereg(" regexp ", " string ");"
+)
+
+(define-skeleton php-eregi_replace
+  "Insert an eregi_replace statement"
+  ""
+  '(setq pattern (skeleton-read "Pattern? "))
+  '(setq replacement (skeleton-read "Replacement? "))
+  '(setq string (skeleton-read "String? "))
+  > "eregi_replace(" pattern ", " replacement ", " string ");"
+)
+
+(define-skeleton php-split
+  "Insert a split statement"
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq string (skeleton-read "String: "))
+  '(setq limit (skeleton-read "Limit: "))
+  > "split(" pattern ", " string ", " limit ");" \n
+)
+
+(define-skeleton php-spliti
+  "Insert a split statement"
+  ""
+  '(setq pattern (skeleton-read "Pattern: "))
+  '(setq string (skeleton-read "String: "))
+  '(setq limit (skeleton-read "Limit: "))
+  > "spliti(" pattern ", " string ", " limit ");" \n
+)
+
+(define-skeleton php-sql_regcase
+  "Insert a DEPRECATED sql_regcase statement. Creates a regular expression for a case insensitive match"
+  ""
+  '(setq string (skeleton-read "String: "))
+  > "sql_regcase(" string ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-simplexml.el b/emacs.d/elpa/php-mode-20151002.2030/php-simplexml.el
new file mode 100644
index 0000000..fa3c9fb
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-simplexml.el
@@ -0,0 +1,54 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; Simple XML Functions
+;; file:///usr/share/doc/php-doc/html/ref.simplexml.html
+;; http://php.net/manual/en/ref.simplexml.php
+
+(define-skeleton php-simplexml_import_dom
+  "Insert a simplexml_import_dom statement."
+  ""
+  '(setq domnode (skeleton-read "domnode: "))
+  '(setq class_name (skeleton-read "class_name: "))
+  > "simplexml_import_dom(" domnode ", " class_name ");" \n
+)
+
+
+(define-skeleton php-simplexml_load_file
+  "Insert a simplexml_load_file statement."
+  ""
+  '(setq filename (skeleton-read "filename: ")) 
+  '(setq class_name (skeleton-read "class_name: ")) 
+  '(setq options (skeleton-read "options: ")) 
+  '(setq ns (skeleton-read "ns: ")) 
+  '(setq is_prefix (skeleton-read "is_prefix: ")) 
+  > "simplexml_load_file(" filename ", " class_name ", " options ", " ns ", " is_prefix ");" \n
+)
+
+(define-skeleton php-simplexml_load_string
+  "Insert a simplexml_load_string statement."
+  ""
+  '(setq data (skeleton-read "data: "))
+  '(setq class_name (skeleton-read "class_name: "))
+  '(setq options (skeleton-read "options: "))
+  '(setq ns (skeleton-read "ns: "))
+  '(setq is_prefix (skeleton-read "is_prefix: "))
+  > "simplexml_load_string(" data ", " class_name ", " options ", " ns ", " is_prefix ");" \n
+  )
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-strings.el b/emacs.d/elpa/php-mode-20151002.2030/php-strings.el
new file mode 100644
index 0000000..8286628
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-strings.el
@@ -0,0 +1,768 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; http://php.net/manual/en/ref.strings.php
+;; file:///usr/share/doc/php-doc/html/ref.strings.html
+
+(define-skeleton php-addcslashes 
+  "Insert an addcslashes statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq charlist (skeleton-read "Charlist? "))
+  > "addclslashes(" str ", " charlist ");" \n)
+
+(define-skeleton php-addslashes 
+  "Insert an addcslashes statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "addclslashes(" str ");" \n)
+
+(define-skeleton php-bin2hex
+  "Insert a bin2hex statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "bin2hex(" str ");" \n)
+
+(define-skeleton php-chop
+  "Insert a chop statement. Alias of rtrim"
+  ""
+  '(setq str (skeleton-read "String: "))
+  > "chop(" str ");" \n)
+
+(define-skeleton php-chr
+  "Insert a chr statement. Returns a specific character from ascii code"
+  ""
+  '(setq ascii (skeleton-read "String: "))
+  > "chr(" ascii ");" \n)
+
+(define-skeleton php-chunk_split
+  "Insert a chunk_split statement. Split a a string into smaller chunks"
+  ""
+  '(setq body (skeleton-read "String: "))
+  '(setq chunklen (skeleton-read "Chunk length: "))
+  '(setq end (skeleton-read "End: "))
+  > "chunk_split(" body ", " chunklen ", " end ");" \n
+)
+
+(define-skeleton php-convert_cyr_string
+  "Insert a convert_cyr_string statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq from (skeleton-read "From? "))
+  '(setq to (skeleton-read "To? "))
+  > "convert_cyr_string(" str ", " from ", " to ");" \n)
+
+(define-skeleton php-convert_uudecode
+  "Insert a bin2hex statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "convert_uudecode(" str ");" \n)
+
+(define-skeleton php-convert_uuencode
+  "Insert a bin2hex statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "convert_uuencode(" str ");" \n)
+
+(define-skeleton php-count_chars
+  "Insert a count_chars statement. Return information about characters used in a string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq mode (skeleton-read "Mode? "))
+  > "count_chars(" str ", " mode ");" \n
+)
+
+(define-skeleton php-crc32
+  "Insert a crc32 statement. Calculates the crc32 polynomial of a string"
+  ""
+  '(setq str (skeleton-read "String: "))
+  > "crc32(" str ");" \n
+)
+
+(define-skeleton php-crypt
+  "Insert a crypt statement. One-way string hashing"
+  ""
+  '(setq str (skeleton-read "String: "))
+  '(setq salt (skeleton-read "Salt: "))
+  > "crypt(" str ", " salt ");" \n
+)
+
+(define-skeleton php-echo
+  "Insert an echo statement"
+  ""
+  '(setq str (skeleton-read "String: "))
+  > "echo '" str "';" \n)
+
+(define-skeleton php-explode
+  "Insert an explode statement"
+  ""
+  '(setq separator (skeleton-read "Explode separator? "))
+  '(setq var (skeleton-read "Explode variable? "))
+  > "explode('" separator "', " var ");" \n)
+
+(define-skeleton php-fprintf 
+  "Insert a fprintf statement"
+  ""
+  '(setq handle (skeleton-read "Handle: "))
+  '(setq format (skeleton-read "Format: "))
+  '(setq args (skeleton-read "Args: "))
+  > "fprintf(" handle ", " format ", " args ");" \n
+)
+
+(define-skeleton php-get_html_translation_table
+  "Insert a get_html_translation_table statement. Returns the translation table used by htmlspecialchars and htmlentities"
+  ""
+  '(setq table (skeleton-read "Table: "))
+  '(setq flags (skeleton-read "Flags: "))
+  '(setq encoding (skeleton-read "Encoding: "))
+  > "get_html_translation_table(" table ", " flags ", " encoding ");" \n
+)
+
+
+(define-skeleton php-hebrev
+  "Insert a hebrev statement. Convert logical Hebrew text to visual text with newline conversion"
+  ""
+  '(setq hebrew_text (skeleton-read "Hebrew text: "))
+  '(setq max_chars_per_line (skeleton-read "Maximum number of characters per line: "))
+  > "hebrev(" hebrew_text ", " max_chars_per_line ");" \n
+)
+
+(define-skeleton php-hebrevc
+  "Insert a hebrevc statement. Convert logical Hebrew text to visual text with newline conversion"
+  ""
+  '(setq hebrew_text (skeleton-read "Hebrew text: "))
+  '(setq max_chars_per_line (skeleton-read "Maximum number of characters per line: "))
+  > "hebrevc(" hebrew_text ", " max_chars_per_line ");" \n
+)
+
+(define-skeleton php-hex2bin
+  "Insert a hex2bin statement. Decodes a hexadecimally encoded binary string."
+  ""
+  '(setq data (skeleton-read "Data: "))
+  > "hex2bin(" data ");" \n
+)
+
+(define-skeleton php-html_entity_decode
+  "Insert a html_entity_decode statement. Convert special characters to HTML entities"
+  ""
+  '(setq string (skeleton-read "String: "))
+  '(setq flags (skeleton-read "Flags: "))
+  '(setq encoding (skeleton-read "Encoding: "))
+  > "html_entity_decode(" string ", " flags ", " encoding ");" \n
+)
+
+(define-skeleton php-htmlentities
+  "Insert a htmlentities statement. Convert all applicable characters to HTML entities"
+  ""
+  '(setq string (skeleton-read "String: "))
+  '(setq flags (skeleton-read "Flags: "))
+  '(setq encoding (skeleton-read "Encoding: "))
+  > "htmlentities(" string ", " flags ", " encoding ");" \n
+)
+
+(define-skeleton php-htmlspecialchars_decode
+  "Insert a htmlspecialchars_decode statement. Convert special HTML entities back to characters"
+  ""
+  '(setq string (skeleton-read "String: "))
+  '(setq flags (skeleton-read "Flags: "))
+  > "htmlspecialchars_decode(" string ", " flags ");" \n
+)
+
+(define-skeleton php-htmlspecialchars
+  "Insert a htmlspecialchars_decode statement. Convert special HTML entities back to characters"
+  ""
+  '(setq string (skeleton-read "String: "))
+  '(setq flags (skeleton-read "Flags: "))
+  '(setq encoding (skeleton-read "Encoding: "))
+  '(setq double_encode (skeleton-read "Double encode (true | false): "))
+  > "htmlspecialchars_decode(" string ", " flags ");" \n
+)
+
+(define-skeleton php-implode
+  "Insert an implode statement"
+  ""
+  '(setq separator (skeleton-read "Implode separator? "))
+  '(setq var (skeleton-read "Implode variable? "))
+  > "implode('" separator "', " var 
+  (skeleton-read 
+   > ", " str )
+  > ");"
+  )
+
+(define-skeleton php-join
+  "Insert an join statement"
+  ""
+  '(setq separator (skeleton-read "Join separator? "))
+  '(setq var (skeleton-read "Join variable? "))
+  > "join('" separator "', " var 
+  (skeleton-read 
+   > ", " str )
+  > ");"
+  )
+
+(define-skeleton php-lcfirst
+  "Insert a lcfirst statement. Make a string's first character lowercase"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "lcfirst(" str ");" \n
+)
+
+(define-skeleton php-levenshtein
+  "Insert a levenshtein statement. Calculate Levenshtein distance between two strings"
+  ""
+  '(setq str1 (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  > "levenshtein(" str1 ", " str2 ");" \n
+)
+
+(define-skeleton php-localeconv
+  "Insert a localeconv statement."
+  > "localeconv();" \n
+)
+
+(define-skeleton php-ltrim
+  "Insert a ltrim statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq charlist (skeleton-read "Char list? "))
+  > "ltrim(" str ", " charlist ");" \n)
+
+(define-skeleton php-md5_file
+  "Insert a md5_file statement"
+  ""
+  '(setq filename (skeleton-read "Filename? "))
+  '(setq rawoutput (skeleton-read "Raw output? "))
+  > "ltrim(" filename ", " rawoutput ");" \n)
+
+(define-skeleton php-md5
+  "Insert a md5 statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq rawoutput (skeleton-read "Raw output? "))
+  > "md5(" str ", " rawoutput ");" \n)
+
+(define-skeleton php-metaphone
+  "Insert a metaphone statament"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq phonemes (skeleton-read "Phonemes? "))
+  > "metaphone(" str ", " phonemes ");" \n)
+
+(define-skeleton php-money_format
+  "Insert a money_format statement"
+  ""
+  '(setq str (skeleton-read "Format? "))
+  '(setq number (skeleton-read "Number? "))
+  > "money_format(" str ", " number ");" \n)
+
+(define-skeleton php-nl_langinfo
+  "Insert a nl_langinfo statement"
+  ""
+  '(setq str (skeleton-read "Item? "))
+  > "nl_langinfo(" str ");" \n)
+
+(define-skeleton php-nl2br
+  "Insert a nl2br statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq is_xhtml (skeleton-read "Is xhtml? "))
+  > "nl2br(" str ", " is_xhtml ");" \n)
+
+(define-skeleton php-number_format
+  "Insert a number_format statement"
+  ""
+  '(setq float (skeleton-read "Float? "))
+  '(setq number (skeleton-read "Number? "))
+  > "number_format(" float ", " number ");" \n)
+
+(define-skeleton php-ord
+  "Insert an ord statement"
+  ""
+  '(setq char (skeleton-read "Character? "))
+  > "ord(" str ");" \n)
+
+(define-skeleton php-parse_str
+  "Insert a parse_str statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq arr (skeleton-read "Array? "))
+  > "parse_str(" str ", " arr ");" \n)
+
+(define-skeleton php-print
+  "Insert a print statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "print(" str ");" \n)
+
+(define-skeleton php-printf
+  "Insert a printf statement. Output a formatted string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "printf(" str ");" \n)
+
+(define-skeleton php-quoted_printable_decode
+  "Insert a quoted_printable_decode statement. Convert a quoted-printable string to an 8 bit string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "quoted_printable_decode(" str ");" \n)
+
+
+(define-skeleton php-quoted_printable_encode
+  "Insert a quoted_printable_encode statement. Convert a 8 bit string to a quoted-printable string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "quoted_printable_encode(" str ");" \n)
+
+(define-skeleton php-quotemeta
+  "Insert a quotemeta statement. Quote meta characters"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "quotemeta(" str ");" \n)
+
+(define-skeleton php-rtrim
+  "Insert a rtrim statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "rtrim(" str ");" \n)
+
+(define-skeleton php-setlocale
+  "Insert a setlocale statement"
+  '(setq category (skeleton-read "Category? "))
+  '(setq locale (skeleton-read "Locale? "))
+  > "setlocale(" category ", " locale ");" \n
+)
+
+(define-skeleton php-sha1_file
+  "Insert a sha1_file statement. Calculate the sha1 of a file"
+  ""
+  '(setq filename (skeleton-read "Filename? "))
+  '(setq rawoutuput (skeleton-read "Rawoutuput? "))
+  > "sha1_file(" filename ", " rawoutuput ");" \n
+)
+
+(define-skeleton php-sha1
+  "Insert a sha1 statement. Calculate the sha1 of a string"
+  ""
+  '(setq string (skeleton-read "String? "))
+  '(setq rawoutuput (skeleton-read "Rawoutuput? "))
+  > "sha1_file(" string ", " rawoutuput ");" \n
+)
+
+(define-skeleton php-similar_text
+  "Insert a similar_text statement. Calculate the similarity between two words"
+  ""
+  '(setq first (skeleton-read "First string? "))
+  '(setq second (skeleton-read "Second string? "))
+  '(setq percentage (skeleton-read "Percentage? "))
+  > "similar_text(" first ", " second ", " percentage ");" \n
+)
+
+(define-skeleton php-soundex
+  "Insert a soundex statement. Calculates the soundex key of a string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "soundex(" str ");" \n
+)
+
+(define-skeleton php-sprintf
+  "Insert a sprintf statement. Return a formatted string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "sprintf(" str ");" \n
+)
+  
+(define-skeleton php-sscanf
+  "Insert a sscanf statement. Parses input from a string according to a format"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq format (skeleton-read "Format? "))
+  > "sprintf(" str ", " format ");" \n
+)
+  
+(define-skeleton php-str_getcsv
+  "Insert a str_getcsv statement. Parse a CSV string into an array"
+  ""
+  '(setq input (skeleton-read "Input? "))
+  '(setq delimiter (skeleton-read "Delimiter? "))
+  '(setq enclosure (skeleton-read "Enclosure? "))
+  '(setq escape (skeleton-read "Escape? "))
+  > "str_getcsv(" input ", " delimiter ", " enclosure ", " escape ");" \n
+)
+
+(define-skeleton php-str_ireplace
+  "Insert a str_ireplace statement. Case-insensitive version of str_replace."
+  ""
+  '(setq search (skeleton-read "Search? "))
+  '(setq replace (skeleton-read "Replace? "))
+  '(setq subject (skeleton-read "Subject? "))
+  '(setq count (skeleton-read "Count? "))
+  > "str_ireplace(" search ", " replace ", " subject ", " count ");" \n
+)
+
+(define-skeleton php-str_pad
+  "Insert a str_pad statement. Pad a string to a certain length with another string"
+  ""
+  '(setq input (skeleton-read "Input? "))
+  '(setq pad_length (skeleton-read "Pad length? "))
+  '(setq pad_string (skeleton-read "Pad string? "))
+  '(setq pad_type (skeleton-read "Pad type? "))
+  > "str_pad(" input ", " pad_length ", " pad_string ", " pad_type ");" \n
+)
+
+(define-skeleton php-str_repeat
+  "Insert a str_repeat statement. Repeat a string"
+  ""
+  '(setq input (skeleton-read "Input? "))
+  '(setq multiplier (skeleton-read "Multiplier? "))
+  > "str_repeat(" input ", " multiplier ");" \n
+)
+
+
+(define-skeleton php-str_rot13
+  "Insert a str_rot13 statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "str_rot13(" str ");" \n
+)
+
+(define-skeleton php-str_shuffle
+  "Insert a str_shuffle statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "str_shuffle(" str ");" \n
+)
+
+(define-skeleton php-str_split
+  "Insert a str_shuffle statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq split_length (skeleton-read "Split length? "))
+  > "str_split(" str ", " split_length ");" \n
+)
+
+(define-skeleton php-str_word_count
+  "Insert a str_word_count statement. Return information about words used in a string."
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq format (skeleton-read "Format? "))
+  '(setq charlist (skeleton-read "Charlist? "))
+  > "str_word_count(" str ", " format ", " charlist ");" \n
+)
+
+(define-skeleton php-strcasecmp
+  "Insert a strcasecmp statement. Binary safe case-insensitive string comparison"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  > "strcasecmp(" str ", " str2 ");" \n
+)
+
+(define-skeleton php-strcmp
+  "Insert a strcmp statement. Binary safe string comparison"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  > "strcmp(" str ", " str2 ");" \n
+)
+
+(define-skeleton php-strcoll
+  "Insert a strcoll statement. Locale based string comparison"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  > "strcoll(" str ", " str2 ");" \n
+)
+
+(define-skeleton php-strcspn
+  "Insert a strcspn statement. Find length of initial segment not matching mask"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  '(setq start (skeleton-read "The start position of the string? "))
+  '(setq length (skeleton-read "The length of the string? "))
+  > "strcspn(" str ", " str2 ");" \n
+)
+
+(define-skeleton php-strip_tags
+  "Insert a strip_tags statement. Strip HTML and PHP tags from a string"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq allowable_tags (skeleton-read "Allowable tags? "))
+  > "strcoll(" str ", " allowable_tags ");" \n
+)
+
+(define-skeleton php-stripslashes
+  "Insert a stripcslashes statement."
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "stripcslashes(" str ");" \n
+)
+
+(define-skeleton php-stripcslashes
+  "Insert a stripcslashes statement. Find the numeric position of the first occurrence of needle in the haystack string. "
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq offset (skeleton-read "Offset?"))
+  > "stripcslashes(" haystack ", " needle ", " offset ");" \n
+)
+
+(define-skeleton php-stristr
+  "Insert a stristr statement. Case-insensitive strstr "
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq before_needle (skeleton-read "Before needle?"))
+  > "stripcslashes(" haystack ", " needle ", " before_needle ");" \n
+)
+
+(define-skeleton php-strlen
+  "Insert a strlen statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "strlen(" str ");" \n)
+
+(define-skeleton php-strnatcasecmp
+  "Insert a strnatcasecmp statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  > "strnatcasecmp(" str "," str2 ");" \n)
+
+(define-skeleton php-strnatcmp
+  "Insert a strnatcasecmp statement. String comparisons using a natural order algorithm"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  > "strnatcmp(" str "," str2 ");" \n)
+
+(define-skeleton php-strncasecmp
+  "Insert a strncasecmp statement. Binary safe case-insensitive string comparison of the first n characters"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  '(setq len (skeleton-read "Length? "))
+  > "strncasecmp(" str "," str2 ", " len ");" \n)
+
+(define-skeleton php-strncmp
+  "Insert a strncmp statement." 
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq str2 (skeleton-read "String? "))
+  '(setq len (skeleton-read "Length? "))
+  > "strncmp(" str "," str2 ", " len ");" \n)
+
+(define-skeleton php-strpbrk
+  "Insert a strpbrk statement"
+  ""
+  '(setq haystack (skeleton-read "String? "))
+  '(setq charlist (skeleton-read "Char list? "))
+  > "strlen(" str ", " charlist ");" \n)
+
+(define-skeleton php-strpos
+  "Insert a strpos statement."
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq offset (skeleton-read "Offset?"))
+  > "strpos(" haystack ", " needle ", " offset ");" \n
+)
+
+(define-skeleton php-strrchr
+  "Insert a strrchr statement. Find the last occurrence of a character in a string"
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  > "strrchr(" haystack ", " needle ");" \n
+)
+
+(define-skeleton php-strrev
+  "Insert a strrev statement. Reverse a string"
+  ""
+  '(setq string (skeleton-read "String? "))
+  > "strrev(" string ");" \n
+)
+
+(define-skeleton php-strripos
+  "Insert a strripos statement. Find the position of the last occurrence of a case-insensitive substring in a string"
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq offset (skeleton-read "Offset?"))
+  > "strripos(" string ", " needle ", " offset ");" \n
+)
+
+(define-skeleton php-strrpos
+  "Insert a strripos statement. Find the position of the last occurrence of a substring in a string"
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq offset (skeleton-read "Offset?"))
+  > "strrpos(" string ", " needle ", " offset ");" \n
+)
+
+(define-skeleton php-strspn
+  "Insert a strspn statement."
+  ""
+  '(setq subject (skeleton-read "Subject? "))
+  '(setq mask (skeleton-read "Mask? "))
+  '(setq start (skeleton-read "Start? "))
+  '(setq length (skeleton-read "Length? "))
+  > "strspn(" subject ", " mask ", " start ", " length ");" \n
+)
+
+(define-skeleton php-strstr
+  "Insert a strstr statement. Find the first occurrence of a stringFind the first occurrence of a string"
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq before_needle (skeleton-read "Before needle?"))
+  > "strstr(" string ", " needle ", " before_needle ");" \n
+)
+
+(define-skeleton php-strtok
+  "Insert a strlower statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq token (skeleton-read "Token? "))
+  > "strtolower(" str ");" \n)
+
+
+(define-skeleton php-strtolower
+  "Insert a strlower statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "strtolower(" str ");" \n)
+
+(define-skeleton php-strtotime
+  "Insert a strtotime statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "strtotime(" str ");" \n)
+
+(define-skeleton php-strtoupper
+  "Insert a strtoupper statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "strtoupper(" str ");" \n)
+
+
+(define-skeleton php-strtr 
+  "Insert a strtr statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq from (skeleton-read "From? "))
+  '(setq to (skeleton-read "To? "))
+  > "strtr(" str ", " from ", " to ");" \n
+)
+
+(define-skeleton php-substr_compare
+  "Insert a substr_compare"
+  ""
+  '(setq main_str (skeleton-read "The main string being compared? "))
+  '(setq str (skeleton-read "The secondary string being compared? "))
+  '(setq offset (skeleton-read "The start position for the comparison? "))
+  '(setq length (skeleton-read "The length of the comparison? "))
+  > "substr_compare(" main_str ", " str ", " offset ", " length ");" \n
+)
+
+(define-skeleton php-substr_count
+  "Insert a substr_count"
+  ""
+  '(setq haystack (skeleton-read "String haystack? "))
+  '(setq needle (skeleton-read "String needle? "))
+  '(setq offset (skeleton-read "Offset?"))
+  '(setq length (skeleton-read "Length? "))
+  > "substr_count(" haystack ", " needle ", " offset ", " length ");" \n
+)
+
+(define-skeleton php-substr_replace
+  "Insert a substr_replace"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq replacement (skeleton-read "Replacement? "))
+  '(setq start (skeleton-read "Start? "))
+  '(setq length (skeleton-read "Length? "))
+  > "substr_replace(" str ", " replacement ", " start ", " length ");" \n
+)
+
+(define-skeleton php-substr
+  "Insert a substr_replace statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq start (skeleton-read "Start? "))
+  '(setq length (skeleton-read "Length? "))
+  > "substr(" str ", " start ", " length ");" \n
+)
+
+(define-skeleton php-trim
+  "Insert a trim statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq charlist (skeleton-read "Charlist? "))
+  > "trim(" str ", " charlist ");" \n
+)
+
+(define-skeleton php-ucfirst
+  "Insert a ucfirst statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "ucfirst('" str "');" \n)
+
+(define-skeleton php-ucwords
+  "Insert a ucfirst statement"
+  ""
+  '(setq str (skeleton-read "String? "))
+  > "ucwords('" str "');" \n)
+
+(define-skeleton php-vfprintf 
+  "Insert a vfprintf statement"
+  ""
+  '(setq handle (skeleton-read "Handle? "))
+  '(setq format (skeleton-read "Format? "))
+  '(setq args (skeleton-read "Args? "))
+  > "vfprintf(" handle ", " format ", " args ");" \n
+)
+
+(define-skeleton php-vprintf 
+  "Insert a vprintf statement"
+  ""
+  '(setq format (skeleton-read "Format? "))
+  '(setq args (skeleton-read "Args? "))
+  > "vprintf(" format ", " args ");" \n
+)
+
+(define-skeleton php-vsprintf 
+  "Insert a vsprintf statement"
+  ""
+  '(setq format (skeleton-read "Format? "))
+  '(setq args (skeleton-read "Args? "))
+  > "vsprintf(" format ", " args ");" \n
+)
+
+(define-skeleton php-wordwrap
+  "Insert a wordwrap statement. Wraps a string to a given number of characters" 
+  ""
+  '(setq str (skeleton-read "String? "))
+  '(setq width (skeleton-read "Width? "))
+  '(setq break (skeleton-read "Break? "))
+  '(setq cut (skeleton-read "Cut? (TRUE | FALSE) "))
+  > "wordwrap(" str ", " width ", " break ", " cut ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-var.el b/emacs.d/elpa/php-mode-20151002.2030/php-var.el
new file mode 100644
index 0000000..6cd7e31
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-var.el
@@ -0,0 +1,263 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; Variable handling functions
+;; http://php.net/manual/en/ref.var.php
+;; file:///usr/share/doc/php-doc/html/ref.var.html
+
+(define-skeleton php-boolval
+  "Insert a boolval statement"
+  ""
+  '(setq variable (skeleton-read "Variable? "))
+  "boolval(" variable ");"
+)
+ 
+(define-skeleton php-debug_zval_dump
+  "Insert a debug_zval_dump"
+  ""
+  '(setq variable (skeleton-read "Variable: "))
+  "debug_zval_dump(" variable ");" \n
+)
+
+(define-skeleton php-empty
+  "Insert an empty statement"
+  ""
+  '(setq variable (skeleton-read "Variable? "))
+  "empty(" variable ");"
+)
+
+(define-skeleton php-floatval
+  "Insert a floatval statement. Gets the float value of a variable"
+  ""
+  '(setq variable (skeleton-read "Variable: "))
+  > "floatval(" variable ");" \n
+)
+
+(define-skeleton php-get_defined_vars
+  "Insert a get_defined_vars statement. Returns an array of all defined variables"
+  > "get_defined_vars();" \n
+)
+
+(define-skeleton php-get_resource_type
+  "Insert a get_resource_type statement. Returns the resource type"
+  ""
+  '(setq variable (skeleton-read "Variable: "))
+  > "get_resource_type(" variable ");" \n
+)
+
+(define-skeleton php-gettype
+  "Insert a gettype statement. Returns the type of variable"
+  ""
+  '(setq variable (skeleton-read "Variable: "))
+  > "gettype(" variable ");" \n
+)
+
+(define-skeleton php-import_request_variables 
+  "Insert an import_request_variables statement. Import GET/POST/Cookie variables into the global scope"
+  ""
+  '(setq types (skeleton-read "Types: "))
+  '(setq prefix (skeleton-read "Prefix: "))
+  > "import_request_variables(" types ", " prefix ");" \n
+)
+
+(define-skeleton php-intval
+  "Insert an intval statement."
+  ""
+  '(setq variable (skeleton-read "Variable: "))
+  '(setq base (skeleton-read "Base: "))
+  > "intval(" variable ", " base ");" \n
+)
+
+(define-skeleton php-is_array
+  "Insert an is_array statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_array(" variable ");" \n
+)
+
+(define-skeleton php-is_bool
+  "Insert an is_bool statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_bool(" variable ");" \n
+)
+
+(define-skeleton php-is_callable
+  "Insert an is_callable statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_callable(" variable ");" \n
+)
+
+(define-skeleton php-is_double
+  "Insert an is_double statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_double(" variable ");" \n
+)
+
+(define-skeleton php-is_float
+  "Insert an is_float statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_float(" variable ");" \n
+)
+
+(define-skeleton php-is_int
+  "Insert an is_int statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_int(" variable ");" \n
+)
+
+(define-skeleton php-is_integer
+  "Insert an is_integer statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_integer(" variable ");" \n
+)
+
+(define-skeleton php-is_long
+  "Insert an is_long statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_long(" variable ");" \n
+)
+
+(define-skeleton php-is_null
+  "Insert an is_null statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_null(" variable ");" \n
+)
+
+(define-skeleton php-is_numeric
+  "Insert an is_numeric statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_numeric(" variable ");" \n
+)
+
+(define-skeleton php-is_object
+  "Insert an is_object statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_object(" variable ");" \n
+)
+
+(define-skeleton php-is_real
+  "Insert an is_real statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_real(" variable ");" \n
+)
+
+(define-skeleton php-is_resource
+  "Insert an is_resource statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_resource(" variable ");" \n
+)
+
+(define-skeleton php-is_scalar
+  "Insert an is_scalar statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_scalar(" variable ");" \n
+)
+
+(define-skeleton php-is_string
+  "Insert an is_string statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "is_string(" variable ");" \n
+)
+
+(define-skeleton php-isset
+  "Insert an isset statement"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "isset(" variable ");" \n
+)
+
+(define-skeleton php-print_r
+  "Insert a print_r statement"
+  ""
+  '(setq expression (skeleton-read "Expression: "))
+  '(setq return (skeleton-read "Return (true | false): "))
+  > "print_r(" expression ", " return ");"
+)
+
+(define-skeleton php-serialize
+  "Insert an serialize statement. Generates a storable representation of a value
+"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "serialize(" variable ");" \n
+)
+
+(define-skeleton php-settype
+  "Insert a settype statement. Set the type of a variable" 
+  ""
+  '(setq variable (skeleton-read "Variable: "))
+  '(setq type (skeleton-read "Type: "))
+  > "settype(" variable ", " type ");" \n
+)
+
+(define-skeleton php-strval
+  "Insert a strval statement. Get string value of a variable"
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "strval(" variable ");" \n
+)  
+
+(define-skeleton php-unserialize
+  "Insert an unserialize statement. Creates a php value from a stored representation" 
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "unserialize(" variable ");" \n
+)
+
+(define-skeleton php-unset
+  "Insert an unset statement. Unset a given variable." 
+  ""
+  '(setq variable (skeleton-read "Variable: "))  
+  > "unset(" variable ");" \n
+)  
+
+(define-skeleton php-var_dump
+  "Insert a var_dump statement"
+  ""
+  '(setq variable (skeleton-read "Variable? "))
+  > "var_dump(" variable 
+  ( "Other variable? %s: "
+    > ", " str )
+  > ");"
+)
+
+(define-skeleton php-var_export
+  "Insert a var_export statement"
+  ""
+  '(setq variable (skeleton-read "Variable? "))
+  '(setq return (skeleton-read "Return? "))
+  > "var_export(" variable ", " return ");" \n 
+)
+ 
+ 
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-xmlparser.el b/emacs.d/elpa/php-mode-20151002.2030/php-xmlparser.el
new file mode 100644
index 0000000..e9a394a
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-xmlparser.el
@@ -0,0 +1,194 @@
+;; Copyright (C) 2015  David Arroyo Menéndez
+
+;; Author: David Arroyo Menéndez <davidam@gnu.org>
+;; Maintainer: David Arroyo Menéndez <davidam@gnu.org>
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+;; Boston, MA 02110-1301 USA,
+
+;; XML Parser
+;; More see file:///usr/share/doc/php-doc/html/function.xml-parse-into-struct.html
+;; http://php.net/manual/en/book.xml.php
+
+(define-skeleton php-utf8_decode
+  "Insert a utf8_decode statement"
+  ""
+  > "utf8_decode(" (skeleton-read "An utf-8 string ") ");" \n
+)
+
+(define-skeleton php-utf8_encode
+  "Insert a utf8_encode statement"
+  ""
+  > "utf8_encode(" (skeleton-read "An iso-8859-1 string ") ");" \n
+)
+
+(define-skeleton php-xml_error_string
+  "Insert a xml_error_string statement"
+  ""
+  > "xml_error_string(" (skeleton-read "Code? ") ");" \n
+)
+
+(define-skeleton php-xml_get_current_byte_index
+  "Insert a xml_get_current_byte_index"
+  ""
+  > "xml_get_current_byte_index(" (skeleton-read "Parser? ") ");" \n
+)
+
+(define-skeleton php-xml-get_current_column_number
+  "Insert a xml_get_current_column_number"
+  ""
+  > "xml_get_current_column_number(" (skeleton-read "Parser? ") ");" \n
+)
+
+(define-skeleton php-xml-get_current_line_number
+  "Insert a xml_get_current_line_number"
+  ""
+  > "xml_get_current_line_number(" (skeleton-read "Parser? ") ");" \n
+)
+
+(define-skeleton php-xml-get_error_code
+  "Insert a xml_get_error_code"
+  ""
+  > "xml_get_error_code(" (skeleton-read "Parser? ") ");" \n
+)
+
+(define-skeleton php-xml_parse
+  "Insert a xml_parse"
+  ""
+  > "xml_parse(" (skeleton-read "Parser? ") ", " 
+  > (skeleton-read "Data? ") 
+  > ("Is final? " ", " str) _ ");")  
+
+(define-skeleton php-xml_parser_create_ns
+  "Insert a xml_parser_create_ns statement. Create an XML parser with namespace support."
+  ""
+  '(setq encoding (skeleton-read "encoding: "))
+  '(setq separator (skeleton-read "separator: "))
+  > "xml_parser_create_ns(" encoding ", " separator ");" \n
+)
+
+(define-skeleton php-xml_parser_create
+  "Insert a xml_parser_create statement."
+  ""
+  '(setq encoding (skeleton-read "encoding: "))
+  > "xml_parser_create(" encoding ");" \n
+)
+
+(define-skeleton php-xml_parser_free
+  "Insert a xml_parser_free statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  > "xml_parser_free(" parser ");" \n
+)
+
+(define-skeleton php-xml_parser_get_option
+  "Insert a xml_parser_get_option statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq option (skeleton-read "option: "))
+  > "xml_parser_get_option(" parser ", " option ");" \n
+)
+
+(define-skeleton php-xml_parser_set_option
+  "Insert a xml_parser_set_option statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq option (skeleton-read "option: "))
+  '(setq value (skeleton-read "value: "))
+  > "xml_parser_set_option(" parser ", " option ", " value ");" \n
+)
+
+(define-skeleton php-xml_set_character_data_handler
+  "Insert a xml_set_character_data_handler statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))
+  > "xml_set_character_data_handler(" parser ", " handler ");" \n
+)
+
+(define-skeleton php-xml_set_default_handler
+  "Insert a xml_set_default_handler statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))  
+  > "xml_set_default_handler(" parser ", " handler ");" \n
+)
+
+(define-skeleton php-xml_set_element_handler
+  "Insert a xml_set_element_handler statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq start_element_handler (skeleton-read "start_element_handler: "))
+  '(setq end_element_handler (skeleton-read "end_element_handler: "))
+  > "xml_set_element_handler(" parser ", " start_element_handler ", " end_element_handler ");" \n
+)
+
+(define-skeleton php-xml_set_end_namespace_decl_handler
+  "Insert a xml_set_end_namespace_decl_handler statement. Set up end namespace declaration handler "
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))
+  > "xml_set_end_namespace_decl_handler(" parser ", " handler ");" \n
+)
+
+
+(define-skeleton php-xml_set_external_entity_ref_handler
+  "Insert a xml_set_external_entity_ref_handler statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))  
+  > "xml_set_external_entity_ref_handler(" parser ", " handler ");" \n
+)
+
+(define-skeleton php-xml_set_notation_decl_handler
+  "Insert a xml_set_notation_decl_handler statement."
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))  
+  > "xml_set_notation_decl_handler(" parser ", " handler ");" \n
+)
+
+
+(define-skeleton php-xml_set_object
+  "Insert a xml_set_object statement. Use XML Parser within an object"
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq object (skeleton-read "object: "))
+  > "xml_set_object(" parser ", " object ");" \n
+)
+
+(define-skeleton php-xml_set_processing_instruction_handler
+  "Insert a xml_set_processing_instruction_handler statement. Set up processing instruction (PI) handler  "
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))
+  > "xml_set_processing_instruction_handler(" parser ", " handler ");" \n
+)
+
+(define-skeleton php-xml_set_start_namespace_decl_handler
+  "Insert a xml_set_start_namespace_decl_handler statement.  Set up start namespace declaration handler "
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))  
+  > "xml_set_start_namespace_decl_handler(" parser ", " handler ");" \n
+)
+
+(define-skeleton php-xml_set_unparsed_entity_decl_handler
+  "Insert a xml_set_unparsed_entity_decl_handler statement. Set up unparsed entity declaration handler  "
+  ""
+  '(setq parser (skeleton-read "parser: "))
+  '(setq handler (skeleton-read "handler: "))    
+  > "xml_set_unparsed_entity_decl_handler(" parser ", " handler ");" \n
+)
diff --git a/emacs.d/elpa/php-mode-20151002.2030/php-xmlreader.el b/emacs.d/elpa/php-mode-20151002.2030/php-xmlreader.el
new file mode 100644
index 0000000..b000837
--- /dev/null
+++ b/emacs.d/elpa/php-mode-20151002.2030/php-xmlreader.el
@@ -0,0 +1,15 @@
+;; XML Reader
+;; More see file:///usr/share/doc/php-doc/html/book.xmlreader.html
+;; http://php.net/manual/en/class.xmlreader.php
+
+(define-skeleton php-xmlreader
+  "Insert a new xmlreader object"
+  ""
+  > "$" (skeleton-read "Var? ") " = new XMLReader();" \n
+)
+
+(define-skeleton php-xmlreader-open
+  "Insert a new xmlreader object"
+  ""
+  > (skeleton-read "Var? ") "->open(" (skeleton-read "File? ") ")" \n
+)
diff --git a/emacs.d/elpa/polymode-20150523.1626/poly-R.el b/emacs.d/elpa/polymode-20150523.1626/poly-R.el
deleted file mode 100644
index cc579df..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/poly-R.el
+++ /dev/null
@@ -1,360 +0,0 @@
-;;; poly-R.el --- Popymodes for R
-;;
-;; Filename: poly-R.el
-;; Author: Spinu Vitalie
-;; Maintainer: Spinu Vitalie
-;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
-;; Version: 1.0
-;; URL: https://github.com/vitoshka/polymode
-;; Keywords: emacs
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is *NOT* part of GNU Emacs.
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 3, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require 'polymode)
-
-(defcustom pm-poly/R
-  (pm-polymode-one "R"
-                   :hostmode 'pm-host/R
-                   :innermode 'pm-inner/fundamental)
-  "R root polymode. Not intended to be used directly."
-  :group 'polymodes
-  :type 'object)
-
-;; NOWEB
-(require 'poly-noweb)
-(defcustom pm-poly/noweb+R
-  (clone pm-poly/noweb
-         :innermode 'pm-inner/noweb+R)
-  "Noweb for R configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom pm-inner/noweb+R
-  (clone pm-inner/noweb
-         :mode 'R-mode)
-  "Noweb for R"
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-noweb+r-mode "poly-R")
-(define-polymode poly-noweb+r-mode pm-poly/noweb+R :lighter " PM-Rnw")
-
-
-
-;; MARKDOWN
-(require 'poly-markdown)
-;;;###autoload (autoload 'poly-markdown+r-mode "poly-R")
-(define-polymode poly-markdown+r-mode pm-poly/markdown :lighter " PM-Rmd")
-
-
-
-;; RAPPORT
-(defcustom pm-poly/rapport
-  (clone pm-poly/markdown "rapport"
-         :innermodes '(pm-inner/brew+R
-                       pm-inner/rapport+YAML))
-  "Rapport template configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/rapport+YAML
-  (pm-hbtchunkmode "rapport+YAML"
-                   :mode 'yaml-mode
-                   :head-reg "<!--head"
-                   :tail-reg "head-->")
-  "YAML header in Rapport files"
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-rapport-mode "poly-R")
-(define-polymode poly-rapport-mode pm-poly/rapport nil)
-
-
-
-;; HTML
-(defcustom pm-poly/html+R
-  (clone pm-poly/html "html+R" :innermode 'pm-inner/html+R)
-  "HTML + R configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/html+R
-  (pm-hbtchunkmode "html+R"
-                   :mode 'R-mode
-                   :head-reg "<!--[ \t]*begin.rcode"
-                   :tail-reg "end.rcode[ \t]*-->")
-  "HTML KnitR innermode."
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-html+r-mode "poly-R")
-(define-polymode poly-html+r-mode pm-poly/html+R)
-
-
-
-;;; R-brew
-(defcustom pm-poly/brew+R
-  (clone pm-poly/brew "brew+R"
-         :innermode 'pm-inner/brew+R)
-  "Brew + R configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/brew+R
-  (pm-hbtchunkmode "brew+R"
-                   :mode 'R-mode
-                   :head-reg "<%[=%]?"
-                   :tail-reg "[#=%=-]?%>")
-  "Brew R chunk."
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-brew+r-mode "poly-R")
-(define-polymode poly-brew+r-mode pm-poly/brew+R)
-
-
-
-;;; R+C++
-;; todo: move into :matcher-subexp functionality?
-(defun pm--R+C++-head-matcher (ahead)
-  (when (re-search-forward "cppFunction(\\(['\"]\n\\)"
-                           nil t ahead)
-    (cons (match-beginning 1) (match-end 1))))
-
-(defun pm--R+C++-tail-matcher (ahead)
-  (when (< ahead 0)
-    (goto-char (car (pm--R+C++-head-matcher -1))))
-  (goto-char (max 1 (1- (point))))
-  (let ((end (or (ignore-errors (scan-sexps (point) 1))
-                 (buffer-end 1))))
-    (cons (max 1 (1- end)) end)))
-
-(defcustom pm-poly/R+C++
-  (clone pm-poly/R "R+C++" :innermode 'pm-inner/R+C++)
-  "R + C++ configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/R+C++
-  (pm-hbtchunkmode "R+C++"
-                   :mode 'c++-mode
-                   :head-mode 'host
-                   :head-reg 'pm--R+C++-head-matcher
-                   :tail-reg 'pm--R+C++-tail-matcher
-                   :font-lock-narrow nil)
-  "HTML KnitR chunk."
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-r+c++-mode "poly-R")
-(define-polymode poly-r+c++-mode pm-poly/R+C++)
-
-
-
-;;; C++R
-(defun pm--C++R-head-matcher (ahead)
-  (when (re-search-forward "^[ \t]*/[*]+[ \t]*R" nil t ahead)
-    (cons (match-beginning 0) (match-end 0))))
-
-(defun pm--C++R-tail-matcher (ahead)
-  (when (< ahead 0)
-    (error "backwards tail match not implemented"))
-  ;; may be rely on syntactic lookup ?
-  (when (re-search-forward "^[ \t]*\\*/")
-    (cons (match-beginning 0) (match-end 0))))
-
-(defcustom pm-poly/C++R
-  (clone pm-poly/C++ "C++R" :innermode 'pm-inner/C++R)
-  "R + C++ configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/C++R
-  (pm-hbtchunkmode "C++R"
-                   :mode 'R-mode
-                   :head-reg 'pm--C++R-head-matcher
-                   :tail-reg 'pm--C++R-tail-matcher)
-  "HTML KnitR chunk."
-  :group 'polymodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-c++r-mode "poly-R")
-(define-polymode poly-c++r-mode pm-poly/C++R)
-
-
-
-;;; R help
-(defcustom pm-poly/ess-help+R
-  (pm-polymode-one "ess-R-help"
-                   :innermode 'pm-inner/ess-help+R)
-  "ess-R-help"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/ess-help+R
-  (pm-hbtchunkmode "ess-help+R"
-                   :mode 'R-mode
-                   :head-reg "^Examples:"
-                   :tail-reg "\\'"
-                   :indent-offset 5)
-  "Ess help R chunk"
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-ess-help+r-mode "poly-R")
-(define-polymode poly-ess-help+r-mode pm-poly/ess-help+R)
-(add-hook 'ess-help-mode-hook '(lambda ()
-                                 (when (string= ess-dialect "R")
-                                   (poly-ess-help+r-mode))))
-
-
-(defun pm--Rd-examples-head-matcher (ahead)
-  (when (re-search-forward "\\examples *\\({\n\\)" nil t ahead)
-    (cons (match-beginning 1) (match-end 1))))
-
-(defun pm--Rd-examples-tail-matcher (ahead)
-  (when (< ahead 0)
-    (goto-char (car (pm--R+C++-head-matcher -1))))
-  (let ((end (or (ignore-errors (scan-sexps (point) 1))
-                 (buffer-end 1))))
-    (cons (max 1 (- end 1)) end)))
-
-(defcustom pm-poly/Rd
-  (pm-polymode-one "R-documentation"
-                   :innermode 'pm-inner/Rd)
-  "R polymode for Rd files"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom pm-inner/Rd
-  (pm-hbtchunkmode "R+C++"
-                   :mode 'R-mode
-                   :head-mode 'host
-                   :head-reg 'pm--Rd-examples-head-matcher
-                   :tail-reg 'pm--Rd-examples-tail-matcher)
-  "Rd examples chunk."
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-Rd-mode "poly-R")
-(define-polymode poly-Rd-mode pm-poly/Rd)
-(add-hook 'Rd-mode-hook 'poly-Rd-mode)
-
-
-
-;; R SHELL WEAVERS
-(defcustom pm-weaver/knitR
-  (pm-shell-weaver "knitr"
-                   :from-to
-                   '(("latex" "\\.\\(tex\\|rnw\\)\\'" "tex" "LaTeX" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
-                     ("html" "\\.x?html?\\'" "html" "HTML" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
-                     ("markdown" "\\.r?md\\'" "md" "Markdown" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
-                     ("rst" "\\.rst" "rst" "ReStructuredText" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
-                     ("brew" "\\.r?brew\\'" "brew" "Brew" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
-                     ("asciidoc" "\\.asciidoc\\'" "txt" "AsciiDoc" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
-                     ("textile" "\\.textile\\'" "textile" "Textile" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")))
-  "Shell knitR weaver."
-  :group 'polymode-weave
-  :type 'object)
-
-(polymode-register-weaver pm-weaver/knitR nil
-                          pm-poly/noweb+R pm-poly/markdown
-                          pm-poly/rapport pm-poly/html+R)
-
-(defcustom pm-weaver/Sweave
-  (pm-shell-weaver "sweave"
-                   :from-to
-                   '(("latex" "\\.\\(tex\\|r?s?nw\\)\\'"
-                      "tex" "LaTeX" "R CMD Sweave %i --options=\"output='%o'\"")))
-  "Shell 'Sweave' weaver."
-  :group 'polymode-weave
-  :type 'object)
-
-(polymode-register-weaver pm-weaver/Sweave nil
-                          pm-poly/noweb+R)
-
-;; (oref pm-poly/rapport :weavers)
-;; (oref pm-poly/noweb+R :weavers)
-
-
-
-;; R ESS WEAVERS
-(defcustom pm-weaver/knitR-ESS
-  (pm-callback-weaver "knitR-ESS"
-                      :from-to
-                      '(("latex" "\\.\\(tex\\|rnw\\)\\'" "tex" "LaTeX" "library(knitr); knit('%i', output='%o')")
-                        ("html" "\\.x?html?\\'" "html" "HTML" "library(knitr); knit('%i', output='%o')")
-                        ("markdown" "\\.r?md\\'" "md" "Markdown" "library(knitr); knit('%i', output='%o')")
-                        ("rst" "\\.rst\\'" "rst" "ReStructuredText" "library(knitr); knit('%i', output='%o')")
-                        ("brew" "\\.r?brew\\'" "brew" "Brew" "library(knitr); knit('%i', output='%o')")
-                        ("asciidoc" "\\.asciidoc\\'" "txt" "AsciiDoc" "library(knitr); knit('%i', output='%o')")
-                        ("textile" "\\.textile\\'" "textile" "Textile" "library(knitr); knit('%i', output='%o')"))
-                      :function 'pm--run-command-in-ESS
-                      :callback 'pm--ESS-callback)
-  "ESS knitR weaver."
-  :group 'polymode-weave
-  :type 'object)
-
-(polymode-register-weaver pm-weaver/knitR-ESS nil
-                          pm-poly/noweb+R pm-poly/markdown
-                          pm-poly/rapport pm-poly/html+R)
-
-(defcustom pm-weaver/Sweave-ESS
-  (pm-callback-weaver "ESS-Sweave"
-                      :from-to '(("latex" "\\.\\(tex\\|r?s?nw\\)\\'" "tex"
-                                  "LaTeX" "Sweave('%i', output='%o')"))
-                      :function 'pm--run-command-in-ESS
-                      :callback 'pm--ESS-callback)
-  "ESS 'Sweave' weaver."
-  :group 'polymode-weave
-  :type 'object)
-
-(polymode-register-weaver pm-weaver/Sweave-ESS nil
-                          pm-poly/noweb+R)
-
-(declare-function ess-async-command nil)
-(declare-function ess-force-buffer-current nil)
-(declare-function ess-process-get nil)
-(declare-function ess-process-put nil)
-(declare-function comint-next-prompt nil)
-
-(defun pm--ESS-callback (proc string)
-  (let ((ofile (process-get proc 'pm-output-file)))
-    (with-current-buffer (process-buffer proc)
-      (when (string-match-p "Error\\(:\\| +in\\)" string)
-        (error "Errors durring weaving.")))
-    ofile))
-
-(defun pm--run-command-in-ESS (command &optional from to)
-  (require 'ess)
-  (let ((ess-eval-visibly t)
-        ;; R specific, should change eventually
-        (ess-dialect "R")
-        (weaver (symbol-value (oref pm/polymode :weaver))))
-    (ess-force-buffer-current)
-    (ess-process-put 'pm-output-file pm--output-file)
-    (ess-process-put 'callbacks (list (oref weaver :callback)))
-    (ess-process-put 'interruptable? t)
-    (ess-process-put 'running-async? t)
-    (ess-eval-linewise command)))
-
-(provide 'poly-R)
diff --git a/emacs.d/elpa/polymode-20150523.1626/poly-markdown.el b/emacs.d/elpa/polymode-20150523.1626/poly-markdown.el
deleted file mode 100644
index 2127fd7..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/poly-markdown.el
+++ /dev/null
@@ -1,72 +0,0 @@
-;;; poly-markdown.el
-;;
-;; Filename: poly-markdown.el
-;; Author: Spinu Vitalie
-;; Maintainer: Spinu Vitalie
-;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
-;; Version: 1.0
-;; URL: https://github.com/vitoshka/polymode
-;; Keywords: emacs
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is *NOT* part of GNU Emacs.
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 3, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require 'polymode)
-(require 'markdown-mode)
-
-(defcustom pm-host/markdown
-  (pm-bchunkmode "Markdown"
-               :mode 'markdown-mode)
-  "Markdown host chunkmode"
-  :group 'hostmodes
-  :type 'object)
-
-(defcustom  pm-inner/markdown
-  (pm-hbtchunkmode-auto "markdown"
-                     :head-reg "^[ \t]*```[{ \t]*\\w.*$"
-                     :tail-reg "^[ \t]*```[ \t]*$"
-                     :retriever-regexp "```[ \t]*{?\\(\\(\\w\\|\\s_\\)*\\)"
-                     :font-lock-narrow t)
-  "Markdown typical chunk."
-  :group 'innermodes
-  :type 'object)
-
-(defcustom pm-poly/markdown
-  (pm-polymode-multi-auto "markdown"
-                        :hostmode 'pm-host/markdown
-                        :auto-innermode 'pm-inner/markdown
-                        :init-functions '(poly-markdown-remove-markdown-hooks))
-  "Markdown typical configuration"
-  :group 'polymodes
-  :type 'object)
-
-;;;###autoload  (autoload 'poly-markdown-mode "poly-markdown")
-(define-polymode poly-markdown-mode pm-poly/markdown)
-
-;;; FIXES:
-(defun poly-markdown-remove-markdown-hooks ()
-  ;; get rid of awfull hooks
-  (remove-hook 'window-configuration-change-hook 'markdown-fontify-buffer-wiki-links t)
-  (remove-hook 'after-change-functions 'markdown-check-change-for-wiki-link t))
-
-
-(provide 'poly-markdown)
-
diff --git a/emacs.d/elpa/polymode-20150523.1626/poly-noweb.el b/emacs.d/elpa/polymode-20150523.1626/poly-noweb.el
deleted file mode 100644
index 0419778..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/poly-noweb.el
+++ /dev/null
@@ -1,94 +0,0 @@
-;;; poly-noweb.el
-;;
-;; Filename: poly-noweb.el
-;; Author: Spinu Vitalie
-;; Maintainer: Spinu Vitalie
-;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
-;; Version: 1.0
-;; URL: https://github.com/vitoshka/polymode
-;; Keywords: emacs
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is *NOT* part of GNU Emacs.
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 3, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require 'polymode)
-
-(defcustom pm-poly/noweb
-  (pm-polymode-one "noweb"
-                   :hostmode 'pm-host/latex
-                   :innermode 'pm-inner/noweb
-                   :exporters '(pm-exporter/latexmk pm-exporter/pdflatex)
-                   :map '(("<" . poly-noweb-electric-<)))
-  "Noweb typical configuration"
-  :group 'polymodes
-  :type 'object)
-
-(defcustom  pm-inner/noweb
-  (pm-hbtchunkmode "noweb"
-                   :head-reg  "<<\\(.*\\)>>="
-                   :tail-reg    "\\(@ +%def .*\\)$\\|\\(@[ \n]\\)")
-  "Noweb typical chunk."
-  :group 'innermodes
-  :type 'object)
-
-;;;###autoload (autoload 'poly-noweb-mode "poly-noweb")
-(define-polymode poly-noweb-mode pm-poly/noweb)
-
-(defun poly-noweb-electric-< (arg)
-  "Auto insert noweb chunk if at bol followed by white space.
-If given an numerical argument, it simply insert `<'. Otherwise,
-if at the beginning of a line in a host chunk insert \"<<>>=\", a
-closing \"@\" and a newline if necessary."
-  (interactive "P")
-  (if (or arg (not (eq pm/type 'host)))
-      (self-insert-command (if (numberp arg) arg 1))
-    (if (not (looking-back "^[ \t]*"))
-        (self-insert-command 1)
-      (insert "<<")
-      (save-excursion
-        (insert ">>=\n\n@ ")
-        (unless(looking-at "\\s *$")
-          (newline)))
-      (ess-noweb-update-chunk-vector))))
-
-(defcustom pm-exporter/pdflatex
-  (pm-shell-exporter "pdflatex"
-                     :from
-                     '(("latex" "\\.tex\\'" "LaTeX" "latexmk -jobname %O %t %i"))
-                     :to
-                     '(("pdf"  	"pdf"  "PDF" "")))
-  "Shell pdflatex exporter."
-  :group 'polymode-export
-  :type 'object)
-
-(defcustom pm-exporter/latexmk
-  (pm-shell-exporter "latexmk"
-                     :from
-                     '(("latex" "\\.tex\\'" "LaTeX" "latexmk -jobname=%O %t %i"))
-                     :to
-                     '(("dvi"  	"dvi"  "DVI" "-dvi")
-                       ("pdf"  	"pdf"  "PDF" "-pdf")
-                       ("ps"  	"ps"  "PS" "-ps")))
-  "Shell latexmk dvi, ps and pdf exporter."
-  :group 'polymode-export
-  :type 'object)
-
-(provide 'poly-noweb)
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-autoloads.el b/emacs.d/elpa/polymode-20150523.1626/polymode-autoloads.el
deleted file mode 100644
index 725bfce..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-autoloads.el
+++ /dev/null
@@ -1,105 +0,0 @@
-;;; polymode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "poly-R" "poly-R.el" (21898 47964 0 0))
-;;; Generated autoloads from poly-R.el
- (autoload 'poly-noweb+r-mode "poly-R")
- (autoload 'poly-markdown+r-mode "poly-R")
- (autoload 'poly-rapport-mode "poly-R")
- (autoload 'poly-html+r-mode "poly-R")
- (autoload 'poly-brew+r-mode "poly-R")
- (autoload 'poly-r+c++-mode "poly-R")
- (autoload 'poly-c++r-mode "poly-R")
- (autoload 'poly-ess-help+r-mode "poly-R")
- (autoload 'poly-Rd-mode "poly-R")
-
-;;;***
-
-;;;### (autoloads nil "poly-markdown" "poly-markdown.el" (21898 47964
-;;;;;;  0 0))
-;;; Generated autoloads from poly-markdown.el
- (autoload 'poly-markdown-mode "poly-markdown")
-
-;;;***
-
-;;;### (autoloads nil "poly-noweb" "poly-noweb.el" (21898 47964 0
-;;;;;;  0))
-;;; Generated autoloads from poly-noweb.el
- (autoload 'poly-noweb-mode "poly-noweb")
-
-;;;***
-
-;;;### (autoloads nil "poly-org" "poly-org.el" (21898 47964 0 0))
-;;; Generated autoloads from poly-org.el
- (autoload 'poly-org-mode "poly-org")
-
-;;;***
-
-;;;### (autoloads nil "polymode" "polymode.el" (21898 47964 0 0))
-;;; Generated autoloads from polymode.el
-
-(autoload 'define-polymode "polymode" "\
-Define a new polymode MODE.
-This macro defines command MODE and an indicator variable MODE
-that is t when MODE is active and nil othervise.
-
-MODE command is similar to standard emacs major modes and it can
-be used in `auto-mode-alist'. Standard hook MODE-hook is run at
-the end of the initialization of each polymode buffer, indirect
-and base alike. Additionally MODE-map is created based on the
-CONFIG's :map slot and the value of the :keymap argument; see
-below.
-
-CONFIG is a name of a config object representing the mode.
-
-MODE command can also be use as a minor mode. Current major mode
-is not reinitialized if it coincides with the :mode slot of
-CONFIG object or if the :mode slot is nil.
-
-BODY contains code to be executed after the complete
-  initialization of the polymode (`pm-initialize') and before
-  running MODE-hook. Before the actual body code, you can write
-  keyword arguments, i.e. alternating keywords and values.  The
-  following special keywords are supported:
-
-:lighter SPEC   Optional LIGHTER is displayed in the mode line when
-                the mode is on. If omitted, it defaults to
-                the :lighter slot of CONFIG object.
-:keymap MAP	Same as the KEYMAP argument.
-
-                If nil, a new MODE-map keymap is created what
-                directly inherits from the keymap defined by
-                the :map slot of CONFIG object. In most cases it
-                is a simple map inheriting form
-                `polymode-mode-map'. If t or an alist (of
-                bindings suitable to be passed to
-                `easy-mmode-define-keymap') a keymap MODE-MAP is
-                build by mergin this alist with the :map
-                specification of the CONFIG object. If a symbol,
-                it should be a variable whose value is a
-                keymap. No MODE-MAP is automatically created in
-                the latter case and :map slot of the CONFIG
-                object is ignored.
-
-:after-hook     A single lisp form which is evaluated after the mode hooks
-                have been run.  It should not be quoted.
-
-\(fn MODE CONFIG &optional KEYMAP &rest BODY)" nil t)
-
-;;;***
-
-;;;### (autoloads nil nil ("poly-base.el" "polymode-classes.el" "polymode-common.el"
-;;;;;;  "polymode-configuration.el" "polymode-export.el" "polymode-methods.el"
-;;;;;;  "polymode-pkg.el" "polymode-tangle.el" "polymode-weave.el")
-;;;;;;  (21898 47964 603803 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; polymode-autoloads.el ends here
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-classes.el b/emacs.d/elpa/polymode-20150523.1626/polymode-classes.el
deleted file mode 100644
index 2d1f40d..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-classes.el
+++ /dev/null
@@ -1,305 +0,0 @@
-(require 'polymode-common)
-
-;;; ROOT CLASS
-(defclass pm-root (eieio-instance-inheritor) ()
-  "Root polymode class.")
-
-
-;;; CONFIG
-(defclass pm-polymode (pm-root) 
-  ((hostmode
-    :initarg :hostmode
-    :initform 'pm-host/blank
-    :type symbol
-    :custom symbol
-    :documentation
-    "Symbol pointing to an object of class pm-chunkmode
-    representing the host chunkmode.")
-   (minor-mode
-    :initarg :minor-mode
-    :initform 'polymode-minor-mode
-    :type symbol
-    :custom symbol
-    :documentation
-    "Symbol pointing to minor-mode function that should be
-    activated in all buffers (base and indirect). This is a
-    \"glue\" mode and is `polymode-minor-mode' by default. You
-    will rarely need to change this.")
-   (lighter
-    :initarg :lighter
-    :initform " PM"
-    :type string
-    :custom string
-    :documentation "Modline lighter.")
-   (exporters
-    :initarg :exporters
-    :initform '(pm-exporter/pandoc)
-    :type list
-    :custom list
-    :documentation
-    "List of names of polymode exporters available for this polymode.")
-   (exporter
-    :initarg :exporter
-    :initform nil
-    :type (or null symbol)
-    :custom symbol
-    :documentation
-    "Current exporter name. If non-nil should be the name of the
-    default exporter for this polymode. Can be set with
-    `polymode-set-exporter' command.")
-   (weavers
-    :initarg :weavers
-    :initform '()
-    :type list
-    :custom list
-    :documentation
-    "List of names of polymode weavers available for this polymode.")
-   (weaver
-    :initarg :weaver
-    :initform nil
-    :type (or null symbol)
-    :custom symbol
-    :documentation
-    "Current weaver name. If non-nil this is the default weaver
-    for this polymode. Can be dynamically set with
-    `polymode-set-weaver'")
-   (map
-    :initarg :map
-    :initform 'polymode-mode-map
-    :type (or symbol list)
-    "Has a similar role as the :keymap argument in
-     `define-polymode' with the difference that this argument is
-     inherited through cloning, but :keymap argument is not. That
-     is, child objects derived through clone will inherit
-     the :map argument of its parents through the following
-     scheme: if :map is nil or an alist of keys, the parent is
-     inspected for :map argument and the keys are merged
-     recursively from parent to parent till a symbol :map slot is
-     met. If :map is a symbol, it must be a keymap, in which case
-     this keymap is used and no parents are further inspected
-     for :map slot. If :map is an alist it must be suitable for
-     `easy-mmode-define-keymap'.")
-   (init-functions
-    :initarg :init-functions
-    :initform '()
-    :type list
-    :documentation
-    "List of functions to run at the initialization time.
-     All init-functions in the inheritance chain are called. Parents
-     hooks first. So, if current config object C inherits from object
-     B, which in turn inherits from object A. Then A's init-functions
-     are called first, then B's and then C's.
-     Either customize this slot or use `object-add-to-list' function.")
-   
-   (-hostmode
-    :type (or null pm-chunkmode)
-    :documentation
-    "Dynamically populated `pm-chunkmode' object.")
-   (-innermodes
-    :type list
-    :initform '()
-    :documentation
-    "Dynamically populated list of chunkmodes objects that
-    inherit from `pm-hbtchunkmode'.")
-   (-buffers
-    :initform '()
-    :type list
-    :documentation
-    "Holds all buffers associated with current buffer. Dynamically populated.")
-   (-hist
-    :initform '()
-    :type list
-    :documentation "Internal. Used to store various user history
-    values. Use `pm--get-hist' and `pm--put-hist' to place key
-    value pairs into this list."))
-  
-  "Configuration for a polymode. Each polymode buffer contains a local
-variable `pm/polymode' instantiated from this class or a subclass
-of this class.")
-
-(defclass pm-polymode-one (pm-polymode)
-  ((innermode
-    :initarg :innermode
-    :type symbol
-    :custom symbol
-    :documentation
-    "Symbol of the chunkmode. At run time this object is cloned
-     and placed in -innermodes slot."))
-  
-  "Configuration for a simple polymode that allows only one
-innermode. For example noweb.")
-
-(defclass pm-polymode-multi (pm-polymode)
-  ((innermodes
-    :initarg :innermodes
-    :type list
-    :custom list
-    :initform nil
-    :documentation
-    "List of names of the chunkmode objects that are associated
-     with this configuration. At initialization time, all of
-     these are cloned and plased in -innermodes slot."))
-  
-  "Configuration for a polymode that allows multiple (known in
-advance) innermodes.")
-
-(defclass pm-polymode-multi-auto (pm-polymode-multi)
-  ((auto-innermode
-    :initarg :auto-innermode
-    :type symbol
-    :custom symbol
-    :documentation
-    "Name of pm-hbtchunkmode-auto object (a symbol). At run time
-     this object is cloned and placed in -auto-innermodes with
-     coresponding :mode slot initialized at run time.")
-   (-auto-innermodes
-    :type list
-    :initform '()
-    :documentation
-    "List of chunkmode objects that are auto-generated in
-    `pm-get-span' method for this class."))
-  
-  "Configuration for a polymode that allows multiple innermodes
-that are not known in advance. Examples are org-mode and markdown.")
-
-
-
-;;; CHUNKMODE CLASSES
-(defclass pm-chunkmode (pm-root)
-  ((mode :initarg :mode
-    :type symbol
-    :initform nil
-    :custom symbol)
-   (protect-indent-line :initarg :protect-indent-line
-    :type boolean
-    :initform t
-    :custom boolean
-    :documentation
-    "Whether to modify local `indent-line-function' by narrowing
-    to current span first")
-   (indent-offset :initarg :indent-offset
-    :type integer
-    :initform 0
-    :documentation
-    "Offset to add when indenting chunk's line. Takes efeect only
-    when :protect-indent-line is non-nil.")
-   (font-lock-narrow :initarg :font-lock-narrow
-    :type boolean
-    :initform t
-    :documentation
-    "Whether to narrow to span during font lock")
-   (adjust-face :initarg :adjust-face
-    :type (or number face list)
-    :custom (or number face list)
-    :initform nil
-    :documentation
-    "Fontification adjustments chunk face. It should be either,
-    nil, number, face or a list of text properties as in
-    `put-text-property' specification. If nil no highlighting
-    occurs. If a face, use that face. If a number, it is a
-    percentage by which to lighten/darken the default chunk
-    background. If positive - lighten the background on dark
-    themes and darken on light thems. If negative - darken in
-    dark thems and lighten in light thems.")
-   
-   (-buffer
-    :type (or null buffer)
-    :initform nil))
-  
-  "Representatioin of the chunkmode object.")
-
-(defclass pm-bchunkmode (pm-chunkmode)
-  ()
-  "Representation of the hostmode objects. Basemodes are the
-  main (parent) modes in the buffer. For example for a the
-  web-mdoe the hostmode is `html-mode', for nowweb mode the host
-  mode is usually `latex-mode', etc.")
-
-(defclass pm-hbtchunkmode (pm-chunkmode)
-  ((head-mode
-    :initarg :head-mode
-    :type symbol
-    :initform 'fundamental-mode
-    :custom symbol
-    :documentation
-    "Chunks' header mode. If set to 'body, the head is considered
-    part of the chunk body. If set to 'host, head is considered
-    part of the including host mode.")
-   (tail-mode
-    :initarg :tail-mode
-    :type symbol
-    :initform nil
-    :custom symbol
-    :documentation
-    "If nil, it is the same as :HEAD-MODE. Otherwise, the same
-    rules as for the :head-mode apply.")
-   (head-reg
-    :initarg :head-reg
-    :initform ""
-    :type (or string symbol)
-    :custom (or string symbol)
-    :documentation "Regexp for the chunk start (aka head)")
-   (tail-reg
-    :initarg :tail-reg
-    :initform ""
-    :type (or string symbol)
-    :custom (or string symbol)
-    :documentation "Regexp for chunk end (aka tail)")
-   (adjust-face
-    :initform 2)
-   (head-adjust-face
-    :initarg :head-adjust-face
-    :initform font-lock-type-face
-    :type (or null number face list)
-    :custom (or null number face list)
-    :documentation
-    "Can be a number, list or face.")
-   (tail-adjust-face
-    :initarg :tail-adjust-face
-    :initform nil
-    :type (or null number face list)
-    :custom (or null number face list)
-    :documentation
-    "Can be a number, list or face. If nil, take the
-    configuration from :head-adjust-face.")
-   
-   (-head-buffer
-    :type (or null buffer)
-    :initform nil
-    :documentation
-    "This buffer is set automatically to -buffer if :head-mode is
-    'body, and to base-buffer if :head-mode is 'host")
-   (-tail-buffer
-    :initform nil
-    :type (or null buffer)))
-  
-  "Representation of an inner chunkmode.")
-
-(defclass pm-hbtchunkmode-auto (pm-hbtchunkmode)
-  ((retriever-regexp :initarg :retriever-regexp
-    :type (or null string)
-    :custom string
-    :initform nil
-    :documentation
-    "Regexp that is used to retrive the modes symbol from the
-    head of the chunkmode chunk. fixme: elaborate")
-   (retriever-num :initarg :retriever-num
-    :type integer
-    :custom integer
-    :initform 1
-    :documentation
-    "Subexpression to be matched by :retriver-regexp")
-   (retriever-function :initarg :retriever-function
-    :type symbol
-    :custom symbol
-    :initform nil
-    :documentation
-    "Function symbol used to retrive the modes symbol from the
-    head of the chunkmode chunk. It is called with no arguments
-    with the point positioned at the beginning of the chunk
-    header. It must return the mode name string or symbol (need
-    not include '-mode' postfix).)"))
-
-  "Representation of an inner chunkmode")
-
-(provide 'polymode-classes)
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-common.el b/emacs.d/elpa/polymode-20150523.1626/polymode-common.el
deleted file mode 100644
index fa0ccb3..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-common.el
+++ /dev/null
@@ -1,382 +0,0 @@
-;; COMMON INITIALIZATION, UTILITIES and INTERNALS which didn't fit anywhere else
-
-(eval-when-compile
-  (require 'cl))
-(require 'font-lock)
-(require 'color)
-(require 'eieio)
-(require 'eieio-base)
-(require 'eieio-custom)
-(require 'format-spec)
-
-(defcustom polymode-display-process-buffers t
-  "When non-nil, display weaving and exporting process buffers."
-  :group 'polymode
-  :type 'boolean)
-
-;; esential vars
-(defvar-local pm/polymode nil)
-(defvar-local pm/chunkmode nil)
-(defvar-local pm/type nil)
-(defvar-local polymode-major-mode nil)
-(defvar-local pm--fontify-region-original nil)
-(defvar-local pm--indent-line-function-original nil)
-(defvar-local pm--syntax-begin-function-original nil)
-;; (defvar-local pm--killed-once nil)
-(defvar-local polymode-mode nil
-  "This variable is t if current \"mode\" is a polymode.")
-
-;; silence the compiler for now
-(defvar pm--output-file nil)
-(defvar pm--input-buffer nil)
-(defvar pm--input-file nil)
-(defvar pm/type)
-(defvar pm/polymode)
-(defvar pm/chunkmode)
-(defvar *span*)
-
-;; core api from polymode.el, which relies on polymode-methods.el.
-;; fixme: some of these are not api, rename
-(declare-function pm/base-buffer "polymode")
-(declare-function pm/get-innermost-span "polymode")
-(declare-function pm/map-over-spans "polymode")
-(declare-function pm/narrow-to-span "polymode")
-(declare-function pm/fontify-region "polymode")
-(declare-function pm/syntax-begin-function "polymode")
-
-;; methods api from polymode-methods.el
-(declare-function pm-initialize "polymode-methods")
-(declare-function pm-get-buffer "polymode-methods")
-(declare-function pm-select-buffer "polymode-methods")
-(declare-function pm-install-buffer "polymode-methods")
-(declare-function pm-get-adjust-face "polymode-methods")
-(declare-function pm-get-span "polymode-methods")
-(declare-function pm-indent-line "polymode-methods")
-
-;; buffer manipulation function in polymode-methods.el
-;; polymode-common.el:315:1:Warning: the following functions are not known to be defined:
-;; pm--create-indirect-buffer, pm--setup-buffer, pm--span-at-point, polymode-select-buffer
-
-;; temporary debugging facilities
-(defvar pm--dbg-mode-line t)
-(defvar pm--dbg-fontlock t)
-(defvar pm--dbg-hook t)
-
-;; other locals
-(defvar-local pm--process-buffer nil)
-
-
-;;; UTILITIES
-(defun pm--display-file (ofile)
-  (display-buffer (find-file-noselect ofile 'nowarn)))
-
-(defun pm--get-indirect-buffer-of-mode (mode)
-  (loop for bf in (oref pm/polymode -buffers)
-        when (and (buffer-live-p bf)
-                  (eq mode (buffer-local-value 'polymode-major-mode bf)))
-        return bf))
-
-;; ;; This doesn't work in 24.2, pcase bug ((void-variable xcar))
-;; ;; Other pcases in this file don't throw this error
-;; (defun pm--set-chunkmode-buffer (obj type buff)
-;;   (with-slots (buffer head-mode head-buffer tail-mode tail-buffer) obj
-;;     (pcase (list type head-mode tail-mode)
-;;       (`(body body ,(or `nil `body))
-;;        (setq buffer buff
-;;              head-buffer buff
-;;              tail-buffer buff))
-;;       (`(body ,_ body)
-;;        (setq buffer buff
-;;              tail-buffer buff))
-;;       (`(body ,_ ,_ )
-;;        (setq buffer buff))
-;;       (`(head ,_ ,(or `nil `head))
-;;        (setq head-buffer buff
-;;              tail-buffer buff))
-;;       (`(head ,_ ,_)
-;;        (setq head-buffer buff))
-;;       (`(tail ,_ ,(or `nil `head))
-;;        (setq tail-buffer buff
-;;              head-buffer buff))
-;;       (`(tail ,_ ,_)
-;;        (setq tail-buffer buff))
-;;       (_ (error "type must be one of 'body 'head and 'tail")))))
-
-;; a literal transcript of the pcase above
-(defun pm--set-chunkmode-buffer (obj type buff)
-  (with-slots (-buffer head-mode -head-buffer tail-mode -tail-buffer) obj
-    (cond
-     ((and (eq type 'body)
-           (eq head-mode 'body)
-           (or (null tail-mode)
-               (eq tail-mode 'body)))
-      (setq -buffer buff
-            -head-buffer buff
-            -tail-buffer buff))
-     ((and (eq type 'body)
-           (eq tail-mode 'body))
-      (setq -buffer buff
-            -tail-buffer buff))
-     ((eq type 'body)
-      (setq -buffer buff))
-     ((and (eq type 'head)
-           (or (null tail-mode)
-               (eq tail-mode 'head)))
-      (setq -head-buffer buff
-            -tail-buffer buff))
-     ((eq type 'head)
-      (setq -head-buffer buff))
-     ((and (eq type 'tail)
-           (or (null tail-mode)
-               (eq tail-mode 'head)))
-      (setq -tail-buffer buff
-            -head-buffer buff))
-     ((eq type 'tail)
-      (setq -tail-buffer buff))
-     (t (error "type must be one of 'body 'head and 'tail")))))
-
-(defun pm--get-chunkmode-mode (obj type)
-  (with-slots (mode head-mode tail-mode) obj
-    (cond ((or (eq type 'body)
-               (and (eq type 'head)
-                    (eq head-mode 'body))
-               (and (eq type 'tail)
-                    (or (eq tail-mode 'body)
-                        (and (null tail-mode)
-                             (eq head-mode 'body)))))
-           (oref obj :mode))
-          ((or (and (eq type 'head)
-                    (eq head-mode 'host))
-               (and (eq type 'tail)
-                    (or (eq tail-mode 'host)
-                        (and (null tail-mode)
-                             (eq head-mode 'host)))))
-           (oref (oref pm/polymode -hostmode) :mode))
-          ((eq type 'head)
-           (oref obj :head-mode))
-          ((eq type 'tail)
-           (oref obj :tail-mode))
-          (t (error "type must be one of 'head 'tail 'body")))))
-
-(defun pm--create-chunkmode-buffer-maybe (chunkmode type)
-  ;; assumes pm/polymode is set
-  (let ((mode (pm--get-chunkmode-mode chunkmode type)))
-    (or (pm--get-indirect-buffer-of-mode mode)
-        (let ((buff (pm--create-indirect-buffer mode)))
-          (with-current-buffer  buff
-            (setq pm/chunkmode chunkmode)
-            (setq pm/type type)
-            (pm--setup-buffer)
-            (funcall (oref pm/polymode :minor-mode))
-            buff)))))
-
-(defun pm--get-mode-symbol-from-name (str)
-  "Guess and return mode function.
-Return major mode function constructed from STR by appending
-'-mode' if needed. If the constructed symbol is not a function
-return an error."
-  (let* ((str (if (symbolp str)
-		  (symbol-name str)
-		str))
-	 (mname (if (string-match-p "-mode$" str)
-		    str
-		  (concat str "-mode"))))
-    (pm--get-available-mode (intern mname))))
-
-(defun pm--get-available-mode (mode)
-  "Check if MODE symbol is defined and is a valid function.
-If so, return it, otherwise return 'fundamental-mode with a
-warnign."
-  (cond ((fboundp mode) mode)
-        (t (message "Cannot find %s function, using 'fundamental-mode instead" mode)
-           'fundamental-mode)))
-
-(defun pm--oref-with-parents (object slot)
-  "Merge slots SLOT from the OBJECT and all its parent instances."
-  (let (VALS)
-    (while object
-      (setq VALS (append (and (slot-boundp object slot) ; don't cascade
-                              (eieio-oref object slot))
-                         VALS)
-            object (and (slot-boundp object :parent-instance)
-                        (oref object :parent-instance))))
-    VALS))
-
-(defun pm--abrev-names (list abrev-regexp)
-  "Abreviate names in LIST by replacing abrev-regexp with empty
-string."
-  (mapcar (lambda (nm)
-            (let ((str-nm (if (symbolp nm)
-                              (symbol-name nm)
-                            nm)))
-              (propertize (replace-regexp-in-string abrev-regexp "" str-nm)
-                          :orig str-nm)))
-          list))
-
-(defun pm--put-hist (key val)
-  (oset pm/polymode -hist
-        (plist-put (oref pm/polymode -hist) key val)))
-
-(defun pm--get-hist (key)
-  (plist-get (oref pm/polymode -hist) key))
-
-(defun pm--comment-region (beg end)
-  ;; mark as syntactic comment
-  (when (> end 1)
-    (with-silent-modifications
-      (let ((beg (or beg (region-beginning)))
-            (end (or end (region-end))))
-        (let ((ch-beg (char-after beg))
-              (ch-end (char-before end)))
-          (add-text-properties beg (1+ beg)
-                               (list 'syntax-table (cons 11 ch-beg)
-                                     'rear-nonsticky t
-                                     'polymode-comment 'start))
-          (add-text-properties (1- end) end
-                               (list 'syntax-table (cons 12 ch-end)
-                                     'rear-nonsticky t
-                                     'polymode-comment 'end)))))))
-
-(defun pm--uncomment-region (beg end)
-  ;; remove all syntax-table properties. Should not cause any problem as it is
-  ;; always used before font locking
-  (when (> end 1)
-    (with-silent-modifications
-      (let ((props '(syntax-table nil rear-nonsticky nil polymode-comment nil)))
-        (remove-text-properties beg end props)
-        ;; (remove-text-properties beg (1+ beg) props)
-        ;; (remove-text-properties end (1- end) props)
-        ))))
-
-(defun pm--run-command (command sentinel buff-name message)
-  "Run command interactively.
-Run command in a buffer (in comint-shell-mode) so that it accepts
-user interaction."
-  ;; simplified version of TeX-run-TeX
-  (require 'comint)
-  (let* ((buffer (get-buffer-create buff-name))
-         (process nil)
-         (command-buff (current-buffer))
-         (ofile pm--output-file))
-    (with-current-buffer buffer
-      (read-only-mode -1)
-      (erase-buffer)
-      (insert message)
-      (comint-exec buffer buff-name shell-file-name nil
-                   (list shell-command-switch command))
-      (comint-mode)
-      (setq process (get-buffer-process buffer))
-      (set-process-sentinel process sentinel)
-      (setq pm--process-buffer t)
-      ;; for communication with sentinel
-      (set (make-local-variable 'pm--output-file) ofile)
-      (set (make-local-variable 'pm--input-buffer) command-buff)
-      (set-marker (process-mark process) (point-max)))
-    (when polymode-display-process-buffers
-      (display-buffer buffer `(nil . ((inhibit-same-window . ,pop-up-windows)))))
-    nil))
-
-(defun pm--run-command-sentinel (process name message)
-  (let ((buff (process-buffer process)))
-    (with-current-buffer buff
-      ;; fixme: remove this later
-      (sit-for .5)
-      (goto-char (point-min))
-      (let ((case-fold-search t))
-        (if (not (re-search-forward "error" nil 'no-error))
-            pm--output-file
-          (progn
-	    (display-buffer (current-buffer))
-	    (message "Done with %s" message))
-          (error "Bumps while %s (%s)" message name))))))
-
-
-;;; COMPATIBILITY and FIXES
-(defun pm--flyspel-dont-highlight-in-chunkmodes (beg end poss)
-  (or (get-text-property beg 'chunkmode)
-      (get-text-property beg 'chunkmode)))
-
-(defvar object-name)
-(defun pm--object-name (object)
-  (cond ((fboundp 'eieio--object-name)
-	 (eieio--object-name object))
-	((fboundp 'eieio-object-name)
-	 (eieio-object-name object))
-	(t (aref object object-name))))
-
-(defun pm--activate-jit-lock-mode-maybe ()
-  ;; ugly hack for emacs 24.4
-  (when (and (string< "24.4" emacs-version)
-             ;; jit-lock is deactivated after this one is set.
-             jit-lock-functions)
-
-    (setq jit-lock-mode t)
-    ;; Mark the buffer for refontification.
-    (jit-lock-refontify)
-
-    ;; Install an idle timer for stealth fontification.
-    (when (and jit-lock-stealth-time (null jit-lock-stealth-timer))
-      (setq jit-lock-stealth-timer
-            (run-with-idle-timer jit-lock-stealth-time t
-                                 'jit-lock-stealth-fontify)))
-
-    ;; Create, but do not activate, the idle timer for repeated
-    ;; stealth fontification.
-    (when (and jit-lock-stealth-time (null jit-lock-stealth-repeat-timer))
-      (setq jit-lock-stealth-repeat-timer (timer-create))
-      (timer-set-function jit-lock-stealth-repeat-timer
-                          'jit-lock-stealth-fontify '(t)))
-
-    ;; Init deferred fontification timer.
-    (when (and jit-lock-defer-time (null jit-lock-defer-timer))
-      (setq jit-lock-defer-timer
-            (run-with-idle-timer jit-lock-defer-time t
-                                 'jit-lock-deferred-fontify)))
-
-    ;; Initialize contextual fontification if requested.
-    (when (eq jit-lock-contextually t)
-      (unless jit-lock-context-timer
-        (setq jit-lock-context-timer
-              (run-with-idle-timer jit-lock-context-time t
-                                   'jit-lock-context-fontify)))
-      (setq jit-lock-context-unfontify-pos
-            (or jit-lock-context-unfontify-pos (point-max))))
-
-    ;; Setup our hooks.
-    (add-hook 'after-change-functions 'jit-lock-after-change nil t)
-    (add-hook 'fontification-functions 'jit-lock-function)))
-
-
-;;; DEBUG STUFF
-(defun pm--map-over-spans-highlight ()
-  (interactive)
-  (pm/map-over-spans (lambda ()
-                       (let ((start (nth 1 *span*))
-                             (end (nth 2 *span*)))
-                         (ess-blink-region start end)
-                         (sit-for 1)))
-                     (point-min) (point-max)))
-
-(defun pm--highlight-span (&optional hd-matcher tl-matcher)
-  (interactive)
-  (let* ((hd-matcher (or hd-matcher (oref pm/chunkmode :head-reg)))
-         (tl-matcher (or tl-matcher (oref pm/chunkmode :tail-reg)))
-         (span (pm--span-at-point hd-matcher tl-matcher)))
-    (ess-blink-region (nth 1 span) (nth 2 span))
-    (message "%s" span)))
-
-(defun pm--run-over-check ()
-  (interactive)
-  (goto-char (point-min))
-  (let ((start (current-time))
-        (count 1))
-    (polymode-select-buffer)
-    (while (< (point) (point-max))
-      (setq count (1+ count))
-      (forward-char)
-      (polymode-select-buffer))
-    (let ((elapsed  (float-time (time-subtract (current-time) start))))
-      (message "elapsed: %s  per-char: %s" elapsed (/ elapsed count)))))
-
-(provide 'polymode-common)
-
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-configuration.el b/emacs.d/elpa/polymode-20150523.1626/polymode-configuration.el
deleted file mode 100644
index 72193a0..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-configuration.el
+++ /dev/null
@@ -1,25 +0,0 @@
-;; Examples of polymode configuration. Choose what suits your needs and place
-;; into your .emacs file.
-
-;;; MARKDOWN
-(add-to-list 'auto-mode-alist '("\\.md" . poly-markdown-mode))
-
-;;; ORG
-(add-to-list 'auto-mode-alist '("\\.org" . poly-org-mode))
-
-
-;;; R related modes
-(add-to-list 'auto-mode-alist '("\\.Snw" . poly-noweb+r-mode))
-(add-to-list 'auto-mode-alist '("\\.Rnw" . poly-noweb+r-mode))
-(add-to-list 'auto-mode-alist '("\\.Rmd" . poly-markdown+r-mode))
-(add-to-list 'auto-mode-alist '("\\.rapport" . poly-rapport-mode))
-(add-to-list 'auto-mode-alist '("\\.Rhtml" . poly-html+r-mode))
-(add-to-list 'auto-mode-alist '("\\.Rbrew" . poly-brew+r-mode))
-(add-to-list 'auto-mode-alist '("\\.Rcpp" . poly-r+c++-mode))
-(add-to-list 'auto-mode-alist '("\\.cppR" . poly-c++r-mode))
-
-
-(provide 'polymode-configuration)
-
-
-
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-export.el b/emacs.d/elpa/polymode-20150523.1626/polymode-export.el
deleted file mode 100644
index 14bb719..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-export.el
+++ /dev/null
@@ -1,321 +0,0 @@
-(require 'polymode-common)
-(require 'polymode-classes)
-
-(defgroup polymode-export nil
-  "Polymode Exporters"
-  :group 'polymode)
-
-(defcustom polymode-exporter-output-file-format "%s[exported]"
-  "Format of the exported files.
-%s is substituted with the current file name sans extension."
-  :group 'polymode-export
-  :type 'string)
-
-(defclass pm-exporter (pm-root)
-  ((from
-    :initarg :from
-    :initform '()
-    :type list
-    :custom list
-    :documentation
-    "Input specifications. A list of lists of the form (id reg doc commmand).
-	ID is the unique identifier of the spec. REG is a regexp
-	that is used to identify if current file can be exported
-	with this spec. DOC is a short help string shown during
-	interactive export. COMMMAND is the actual exporter
-	specific command. It can contain the following format
-	specs:
-
-	%i - replaced with the input file
-	%o - replaced with the ouput file
-        %O - replaced with the base output file name (no dir, no extension)
-	%t - replaced with the 4th element of the :to spec.
-     ")
-   (to
-    :initarg :to
-    :initform '() 
-    :type list
-    :custom list
-    :documentation
-    "Output specifications. A list of the list of the form (id ext doc %t-spec).
-	EXT is the *exact* extension (not a regexp) of the ouput
-	file. %t-spec is a string what is used to format :from
-	spec commmand.")
-   (function
-    :initarg :function
-    :initform (lambda (command from to)
-                (error "Function not defined for this exporter"))
-    :type (or symbol function)
-    :documentation
-    "Function to process the commmand. Must take 3 arguments
-     COMMAND, FROM-ID and TO-ID. COMMAND is the 4th argument
-     of :from spec with all the formats substituted. FROM-ID is
-     the id of requested :from spec, TO-ID is the id of the :to
-     spec."))
-  "Root exporter class.")
-
-(defclass pm-callback-exporter (pm-exporter)
-  ((callback
-    :initarg :callback
-    :initform (lambda (&optional rest)
-                (error "No callback defined for this exporter."))
-    :type (or symbol function)
-    :documentation
-    "Callback function to be called by :function when a shell
-    call is involved. There is no default callback."))
-  "Class to represent exporters that call processes spanned by
-  emacs. Callback should return the output file name.")
-
-(defclass pm-shell-exporter (pm-exporter)
-  ((function
-    :initform 'pm-default-shell-export-function)
-   (sentinel
-    :initarg :sentinel
-    :initform 'pm-default-export-sentinel
-    :type (or symbol function)
-    :documentation
-    "Sentinel function to be called by :function when a shell
-    call is involved. Sentinel should return the output file
-    name."))
-  "Class to represent exporters that call external processes.")
-
-
-;;; METHODS
-(defgeneric pm-export (exporter from to &optional ifile)
-  "Weave current FILE with EXPORTER.")
-
-(defmethod pm-export ((exporter pm-exporter) from to &optional ifile)
-  (let* ((from-spec (assoc from (oref exporter :from)))
-         (to-spec (assoc to (oref exporter :to)))
-         (ifile (or ifile (file-name-nondirectory buffer-file-name)))
-         (ofile (concat (format polymode-exporter-output-file-format
-                                (file-name-base ifile))
-                        "." (nth 1 to-spec)))
-         (command (format-spec (nth 3 from-spec)
-                               (list (cons ?i ifile)
-                                     (cons ?o ofile)
-                                     (cons ?O (file-name-base ofile))
-                                     (cons ?t (nth 3 to-spec))))))
-    (unless to-spec
-      (error "'to' spec %s is not defined for this exporter '%s'"
-             to (pm--object-name exporter)))
-    ;; compunicate with sentinel and callback with local vars in order to
-    ;; avoid needless clutter
-    ;; fixme: use -hist
-    (set (make-local-variable 'pm--output-file) ofile)
-    (set (make-local-variable 'pm--input-file) ifile)
-    (message "Exporting '%s' with '%s' exporter ..."
-             (file-name-nondirectory ifile) (pm--object-name exporter))
-    (let ((ofile  (funcall (oref exporter :function) command from to)))
-      (and ofile (stringp ofile) (pm--display-file ofile)))))
-
-(defmacro pm--export-wrap-callback (slot)
-  ;; replace exporter's :sentinel or :callback temporally in order to display
-  ;; the output buffer
-  `(let ((sentinel1 (oref exporter ,slot)))
-     (condition-case err
-         (let ((sentinel2 `(lambda (proc name)
-                             (let ((efile (,sentinel1 proc name)))
-                               (pm--display-file efile)
-                               efile))))
-           (oset exporter ,slot sentinel2)
-           (call-next-method exporter from to ifile))
-       (error (oset exporter ,slot sentinel1)
-              (signal (car err) (cdr err))))
-     (oset exporter ,slot sentinel1)))
-
-(defmethod pm-export ((exporter pm-callback-exporter) from to &optional ifile)
-  (pm--export-wrap-callback :callback))
-
-(defmethod pm-export ((exporter pm-shell-exporter) from to &optional ifile)
-  (pm--export-wrap-callback :sentinel))
-
-
-;; UI
-(defvar pm--exporter-hist nil)
-(defvar pm--export:from-hist nil)
-(defvar pm--export:to-hist nil)
-(declare-function polymode-set-weaver "polymode-weave")
-(declare-function pm-weave "polymode-weave")
-
-(defun polymode-export (&optional from to)
-  "Export current file.
-
-FROM and TO are the from-id and to-id in the definition of the
-current exporter. If current exporter hasn't been set yet, call
-`polymode-set-exporter' before exporting.
-
-If called interactively with C-u argument, ask for the FROM type
-interactively, otherwise FROM and TO are determined automatically
-from the current exporter specification and current file
-extension.  See `pm-exporter' for the precise specification.
-
-If called interactively with C-u C-u argument, set new exporter
-first with `polymode-set-exporter'."
-  (interactive "P")
-  ;; todo: '(16) should allow for edditing :from command
-  (let* ((exporter (symbol-value
-                    (if (equal from '(16))
-                        (polymode-set-exporter)
-                      (or (oref pm/polymode :exporter)
-                          (polymode-set-exporter)))))
-         (fname (file-name-nondirectory buffer-file-name))
-         (e:from (oref exporter :from))
-         (e:to (oref exporter :to))
-         (from-opts (mapcar (lambda (el)
-                              (propertize (nth 2 el) :id (car el)))
-                            (oref exporter :from)))
-         (to-opts (mapcar (lambda (el)
-                            (propertize (format "%s (%s)" (nth 2 el) (nth 1 el))
-                                        :id (car el)))
-                          (oref exporter :to)))
-         (from
-          (cond ((or (null from) (equal from '(16)))
-                 (let ((case-fold-search  t))
-                   (or (and (pm--get-hist :export-from)
-                            (get-text-property 0 :id (pm--get-hist :export-from)))
-                       (car (cl-rassoc-if (lambda (el)
-                                            (string-match-p (car el) fname))
-                                          e:from))
-                       ;; guess from weaver and return a cons of (weaver-id . exporter-id)
-                       (let ((weaver (symbol-value (or (oref pm/polymode :weaver)
-                                                       (polymode-set-weaver)))))
-                         (cl-loop for w in (oref weaver :from-to)
-                                  ;; weaver intput extension matches the filename
-                                  if (string-match-p (nth 1 w) fname) 
-                                  return (cl-loop for e in e:from
-                                                  ;; input exporter extensnion matches weaver output extension
-                                                  if (string-match-p (nth 1 e) (concat "dummy." (nth 2 w)))
-                                                  return (cons (car w) (car e)))))
-                       (let* ((prompt (format "No input spec for extension '.%s' in '%s' exporter. Choose one: "
-                                              (file-name-extension fname)
-                                              (pm--object-name exporter)))
-                              (sel (ido-completing-read prompt from-opts nil t nil
-                                                        'pm--export:from-hist
-                                                        (pm--get-hist :export-from))))
-                         (pm--put-hist :export-from sel)
-                         (get-text-property 0 :id sel)))))
-                ;; C-u, force a :from spec
-                ((equal from '(4))
-                 (let ((sel (ido-completing-read "Input type: " from-opts nil t nil
-                                                 'pm--export:from-hist (pm--get-hist :export-from)) ))
-                   (pm--put-hist :export-from sel)
-                   (get-text-property 1 :id sel)))
-                ((stringp from)
-                 (if (assoc from e:from)
-                     from
-                   (error "Cannot find input spec '%s' in %s exporter"
-                          from (pm--object-name exporter))))
-                (t (error "'from' argument must be nil, universal argument or a string"))
-                ))
-         (to
-          (cond ((null to)
-                 (let ((sel (ido-completing-read "Export to: " to-opts nil t nil
-                                                 'pm--export:to-hist (pm--get-hist :export-to))))
-                   (pm--put-hist :export-to sel)
-                   (get-text-property 1 :id sel)))
-                ((stringp to)
-                 (if (assoc to e:to)
-                     to
-                   (error "Cannot find output spec '%s' in %s exporter"
-                          to (pm--object-name exporter))))
-                (t (error "'to' argument must be nil or a string")))))
-    (if (consp from)
-        ;; run through weaver
-        (pm-weave (symbol-value (oref pm/polymode :weaver)) (car from) (cons (cdr from) to))
-      (pm-export exporter from to))))
-
-(defmacro polymode-register-exporter (exporter default? &rest configs)
-  "Add EXPORTER to :exporters slot of all config objects in CONFIGS.
-When DEFAULT? is non-nil, also make EXPORTER the default exporter
-for each polymode in CONFIGS."
-  `(dolist (pm ',configs)
-     (object-add-to-list (symbol-value pm) :exporters ',exporter)
-     (when ,default? (oset (symbol-value pm) :exporter ',exporter))))
-
-(defun polymode-set-exporter ()
-  (interactive)
-  (unless pm/polymode
-    (error "No pm/polymode object found. Not in polymode buffer?"))
-  (let* ((exporters (pm--abrev-names
-                     (delete-dups (pm--oref-with-parents pm/polymode :exporters))
-                     "pm-exporter/"))
-         (sel (ido-completing-read "No default exporter. Choose one: " exporters nil t nil
-                                   'pm--exporter-hist (car pm--exporter-hist)))
-         (out (intern (get-text-property 0 :orig sel))))
-    (oset pm/polymode :exporter out)
-    out))
-
-
-;;; UTILS
-(defun pm-default-export-sentinel (process name)
-  "Default exporter sentinel."
-  (pm--run-command-sentinel process name "exporting"))
-
-(defun pm-default-shell-export-function (command from to)
-  "Run exporting command interactively.
-Run command in a buffer (in comint-shell-mode) so that it accepts
-user interaction. This is a default function in all exporters
-that call a shell command"
-  (pm--run-command command
-                   (oref (symbol-value (oref pm/polymode :exporter)) :sentinel)  
-                   "*polymode export*"
-                   (concat "Exporting " from "-->" to
-                           " with command:\n     " command "\n")))
-
-
-;;; GLOBAL EXPORTERS
-(defcustom pm-exporter/pandoc
-  (pm-shell-exporter "pandoc"
-               :from
-               '(;; ("json"	"\\.json\\'" "JSON native AST"	"pandoc %i -f json -t %t -o %o")
-                 ("markdown"	"\\.md\\'" "pandoc's markdown" 	"pandoc %i -f markdown -t %t -o %o")
-                 ("markdown_strict"	"\\.md\\'" "original markdown"	"pandoc %i -f markdown_strict -t %t -o %o")
-                 ("markdown_phpextra"	"\\.md\\'" "PHP markdown"	"pandoc %i -f markdown_phpextra -t %t -o %o")
-                 ("markdown_phpextra"	"\\.md\\'" "github markdown" 	"pandoc %i -f markdown_phpextra -t %t -o %o")
-                 ("textile"	"\\.textile\\'" "Textile" 		"pandoc %i -f textile -t %t -o %o")
-                 ("rst"		"\\.rst\\'" "reStructuredText"	"pandoc %i -f rst -t %t -o %o")
-                 ("html"	"\\.x?html?\\'" "HTML" 	"pandoc %i -f html -t %t -o %o")
-                 ("doocbook"	"\\.xml\\'" "DocBook" 		"pandoc %i -f doocbook -t %t -o %o")
-                 ("mediawiki"	"\\.wiki\\'" "MediaWiki"		"pandoc %i -f mediawiki -t %t -o %o")
-                 ("latex"	"\\.tex\\'" "LaTeX" 		"pandoc %i -f latex -t %t -o %o")
-                 )
-               :to
-               '(;; ("json"  	"json"  "JSON version of native AST" "json")
-                 ("plain"  	"txt"  "plain text" "plain")
-                 ("markdown"  	"md"  "pandoc's extended markdown" "markdown")
-                 ("markdown_strict"  	"md"  "original markdown" "markdown_strict")
-                 ("markdown_phpextra"  	"md"  "PHP extended markdown" "markdown_phpextra")
-                 ("markdown_github"  	"md"  "github extended markdown" "markdown_github")
-                 ("rst"  	"rst"  "reStructuredText" "rst")
-                 ("html"  	"html"  "XHTML 1" "html")
-                 ("html5"  	"html"  "HTML 5" "html5")
-                 ("latex"  	"tex"  "LaTeX" "latex")
-                 ("beamer"  	"tex"  "LaTeX beamer" "beamer")
-                 ("context"  	"tex"  "ConTeXt" "context")
-                 ("man"  	"man"  "groff man" "man")
-                 ("mediawiki"  	"wiki"  "MediaWiki markup" "mediawiki")
-                 ("textile"  	"textile"  "Textile" "textile")
-                 ("org"  	"org"  "Emacs Org-Mode" "org")
-                 ("texinfo"  	"info"  "GNU Texinfo" "texinfo")
-                 ("docbook"  	"xml"  "DocBook XML" "docbook")
-                 ("opendocument"  	"xml"  "OpenDocument XML" "opendocument")
-                 ("odt"  	"odt"  "OpenOffice text document" "odt")
-                 ("docx"  	"docx"  "Word docx" "docx")
-                 ("epub"  	"epub"  "EPUB book" "epub")
-                 ("epub3"  	"epub"  "EPUB v3" "epub3")
-                 ("fb2"  	"fb"  "FictionBook2 e-book" "fb2")
-                 ("asciidoc"  	"txt"  "AsciiDoc" "asciidoc")
-                 ("slidy"  	"html"  "Slidy HTML slide show" "slidy")
-                 ("slideous"  	"html"  "Slideous HTML slide show" "slideous")
-                 ("dzslides"  	"html"  "HTML5 slide show" "dzslides")
-                 ("s5"  	"html"  "S5 HTML slide show" "s5")
-                 ("rtf"  	"rtf"  "rich text format" "rtf")
-                 )
-               :function 'pm-default-shell-export-function
-               :sentinel 'pm-default-export-sentinel)
-  "Pandoc exporter"
-  :group 'polymode-export
-  :type 'object)
-
-(provide 'polymode-export)
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-methods.el b/emacs.d/elpa/polymode-20150523.1626/polymode-methods.el
deleted file mode 100644
index 93c4934..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-methods.el
+++ /dev/null
@@ -1,606 +0,0 @@
-(require 'polymode-common)
-
-
-;;; INITIALIZATION
-(defgeneric pm-initialize (config)
-  "Initialize current buffer with CONFIG.
-
-First initialize the -hostmode and -innermodes slots of polymode
-object ...")
-
-(defmethod pm-initialize ((config pm-polymode))
-  ;; fixme: reinstalation leads to infloop of pm--fontify-region-original and others ... 
-  ;; On startup with local auto vars emacs reinstals the mode twice .. waf?
-  ;; Temporary fix: don't install twice
-  (unless pm/polymode
-    (let* ((chunkmode (clone (symbol-value (oref config :hostmode))))
-           (_ (oset chunkmode -buffer (current-buffer)))
-           ;; set if nil, to allow unspecified host chunkmodes to be used in minor modes
-           (host-mode (or (oref chunkmode :mode)
-                          (oset chunkmode :mode major-mode))))
-      (unless (or (eq major-mode host-mode)
-                  (eq polymode-major-mode host-mode))
-        (let ((polymode-mode t)) ;;major-modes might check it 
-          (funcall host-mode)))
-      ;; fixme: maybe: inconsistencies?
-      ;; 1)  not calling pm-install-buffer on host-buffer
-      ;; But, we are not creating/installing a new buffer here .. so it is a
-      ;; different thing .. and is probably ok
-      ;; 2)  not calling config's :minor-mode (polymode function).
-      ;; But polymode function calls pm-initialize... so I guess it is ok
-      (oset config -hostmode chunkmode)
-      (setq pm/polymode config)
-      (setq pm/chunkmode chunkmode)
-      (setq pm/type 'host)
-      (add-hook 'flyspell-incorrect-hook 'pm--flyspel-dont-highlight-in-chunkmodes nil t)
-      (prog1 (pm--setup-buffer) ; general setup for host and innermode buffers
-        (let ((PI pm/polymode) IFs)
-          ;; aggregate and run hooks; parents first
-          (while PI
-            (setq IFs (append (and (slot-boundp PI :init-functions) ; don't cascade
-                                   (oref PI :init-functions))
-                              IFs)
-                  PI (and (slot-boundp PI :parent-instance)
-                          (oref PI :parent-instance))))
-          (run-hooks 'IFs))))))
-
-(defmethod pm-initialize ((config pm-polymode-one))
-  (call-next-method)
-  (eval `(oset config -innermodes
-               (list (clone ,(oref config :innermode))))))
-
-(defmethod pm-initialize ((config pm-polymode-multi))
-  (call-next-method)
-  (oset config -innermodes
-        (mapcar (lambda (sub-name)
-                  (clone (symbol-value sub-name)))
-                (oref config :innermodes))))
-
-
-
-;;; BUFFERS
-(defgeneric pm-get-buffer (chunkmode &optional span-type)
-  "Get the indirect buffer associated with SUBMODE and
-SPAN-TYPE. Should return nil if buffer has not yet been
-installed. Also see `pm-get-span'.")
-
-(defmethod pm-get-buffer ((chunkmode pm-chunkmode) &optional type)
-  (oref chunkmode -buffer))
-
-(defmethod pm-get-buffer ((chunkmode pm-hbtchunkmode) &optional type)
-  (cond ((eq 'body type) (oref chunkmode -buffer))
-        ((eq 'head type) (oref chunkmode -head-buffer))
-        ((eq 'tail type) (oref chunkmode -tail-buffer))
-        (t (error "Don't know how to select buffer of type '%s' for chunkmode '%s' of class '%s'"
-                  type (pm--object-name chunkmode) (class-of chunkmode)))))
-
-(defgeneric pm-select-buffer (chunkmode span)
-  "Ask SUBMODE to select (make current) its indirect buffer
-corresponding to the type of the SPAN returned by
-`pm-get-span'.")
-
-(defmethod pm-select-buffer ((chunkmode pm-chunkmode) span)
-  "Select the buffer associated with SUBMODE.
-Install a new indirect buffer if it is not already installed. For
-this method to work correctly, SUBMODE's class should define
-`pm-install-buffer' and `pm-get-buffer' methods."
-  (let* ((type (car span))
-         (buff (pm-get-buffer chunkmode type)))
-    (unless (buffer-live-p buff)
-      (pm-install-buffer chunkmode type)
-      (setq buff (pm-get-buffer chunkmode type)))
-    (pm--select-buffer buff)))
-
-(defmethod pm-select-buffer ((chunkmode pm-hbtchunkmode) span)
-  (call-next-method)
-  (pm--transfer-vars-from-base))
-
-(defmethod pm-select-buffer ((config pm-polymode-multi-auto) &optional span)
-  ;; :fixme: pm-get-span on multi configs returns config as last object of
-  ;; span. That's freaking confusing.
-  (if (null (car span))
-      (pm-select-buffer (oref config -hostmode) span)
-    (let ((type (car span))
-          (proto (symbol-value (oref config :auto-innermode)))
-          chunkmode)
-      (save-excursion
-        (goto-char (cadr span))
-        (unless (eq type 'head)
-          (re-search-backward (oref proto :head-reg) nil 'noerr))
-        (let* ((str (or (and (oref proto :retriever-regexp)
-			     (re-search-forward (oref proto :retriever-regexp))
-			     (match-string-no-properties (oref proto :retriever-num)))
-			(and (oref proto :retriever-function)
-			     (funcall (oref proto :retriever-function)))
-                        (error "retriever subexpression didn't match")))
-               (name (concat "auto-innermode:" str)))
-          (setq chunkmode
-                (or (loop for obj in (oref config -auto-innermodes)
-                          when  (equal name (object-name-string obj))
-                          return obj)
-                    (let ((new-obj (clone proto name
-                                          :mode (pm--get-mode-symbol-from-name str))))
-                      (object-add-to-list config '-auto-innermodes new-obj)
-                      new-obj)))))
-      (pm-select-buffer chunkmode span))))
-
-(defgeneric pm-install-buffer (chunkmode &optional type)
-  "Ask SUBMODE to install an indirect buffer corresponding to
-span TYPE. Should return newly installed/retrieved buffer.")
-
-(defmethod pm-install-buffer ((chunkmode pm-chunkmode) &optional type)
-  "Independently on the TYPE call `pm/create-indirect-buffer'
-create and install a new buffer in slot -buffer of SUBMODE."
-  (oset chunkmode -buffer
-        (pm--create-chunkmode-buffer-maybe chunkmode type)))
-
-(defmethod pm-install-buffer ((chunkmode pm-hbtchunkmode) type)
-  "Depending of the TYPE install an indirect buffer into
-slot -buffer of SUBMODE. Create this buffer if does not exist."
-  (pm--set-chunkmode-buffer chunkmode type
-                          (pm--create-chunkmode-buffer-maybe chunkmode type)))
-
-(defun pm--get-adjusted-background (prop)
-  ;; if > lighten on dark backgroun. Oposite on light.
-  (color-lighten-name (face-background 'default) 
-                      (if (eq (frame-parameter nil 'background-mode) 'light)
-                          (- prop) ;; darken
-                        prop)))
-
-(defun pm--adjust-chunk-face (beg end face)
-  ;; propertize 'face of the region by adding chunk specific configuration
-  (interactive "r")
-  (when face
-    (with-current-buffer (current-buffer)
-      (let ((face (or (and (numberp face)
-                           (list (cons 'background-color
-				       (pm--get-adjusted-background face))))
-                      face))
-            (pchange nil))
-	;; (while (not (eq pchange end))
-        ;;   (setq pchange (next-single-property-change beg 'face nil end))
-        ;;   (put-text-property beg pchange 'face
-        ;;                      `(,face ,@(get-text-property beg 'face)))
-        ;;   (setq beg pchange))
-	(font-lock-prepend-text-property beg end 'face face)))))
-
-(defun pm--adjust-visual-line-mode (vlm)
-  (when (not (eq visual-line-mode vlm))
-    (if (null vlm)
-        (visual-line-mode -1)
-      (visual-line-mode 1))))
-
-;; move only in post-command hook, after buffer selection
-(defvar pm--can-move-overlays nil)
-(defun pm--move-overlays-to (new-buff)
-  (when pm--can-move-overlays 
-    (mapc (lambda (o)
-            (move-overlay o (overlay-start o) (overlay-end o) new-buff))
-          (overlays-in 1 (1+ (buffer-size))))))
-
-(defun pm--transfer-vars-from-base ()
-  (let ((bb (pm/base-buffer)))
-    (dolist (var '(buffer-file-name))
-      (set var (buffer-local-value var bb)))))
-
-(defun pm--select-buffer (buffer)
-  (when (and (not (eq buffer (current-buffer)))
-             (buffer-live-p buffer))
-    (let ((point (point))
-          (window-start (window-start))
-          (visible (pos-visible-in-window-p))
-          (oldbuf (current-buffer))
-          (vlm visual-line-mode)
-          (ractive (region-active-p))
-          (mkt (mark t))
-          (bis buffer-invisibility-spec))
-      (pm--move-overlays-to buffer)
-      (switch-to-buffer buffer)
-      (setq buffer-invisibility-spec bis)
-      (pm--adjust-visual-line-mode vlm)
-      (bury-buffer oldbuf)
-      ;; fixme: wha tis the right way to do this ... activate-mark-hook?
-      (if (not ractive)
-          (deactivate-mark)
-        (set-mark mkt)
-        (activate-mark))
-      (goto-char point)
-      ;; Avoid the display jumping around.
-      (when visible
-        (set-window-start (get-buffer-window buffer t) window-start)))))
-
-(defun pm--setup-buffer (&optional buffer)
-  ;; General buffer setup, should work for indirect and base buffers
-  ;; alike. Assumes pm/polymode and pm/chunkmode is already in place. Return buffer.
-  (let ((buff (or buffer (current-buffer))))
-    (with-current-buffer buff
-      ;; Don't let parse-partial-sexp get fooled by syntax outside
-      ;; the chunk being fontified.
-
-      ;; font-lock, forward-sexp etc should see syntactic comments
-      ;; (set (make-local-variable 'parse-sexp-lookup-properties) t)
-
-      (set (make-local-variable 'font-lock-dont-widen) t)
-      
-      (when pm--dbg-fontlock 
-        (setq pm--fontify-region-original
-              font-lock-fontify-region-function)
-        (set (make-local-variable 'font-lock-fontify-region-function)
-             #'pm/fontify-region)
-        (setq pm--syntax-begin-function-original
-              (or syntax-begin-function ;; Emacs > 23.3
-                  font-lock-beginning-of-syntax-function))
-        (set (make-local-variable 'syntax-begin-function)
-             #'pm/syntax-begin-function))
-
-      (set (make-local-variable 'polymode-mode) t)
-
-      ;; Indentation should first narrow to the chunk.  Modes
-      ;; should normally just bind `indent-line-function' to
-      ;; handle indentation.
-      (when (and indent-line-function ; not that it should ever be nil...
-                 (oref pm/chunkmode :protect-indent-line))
-        (setq pm--indent-line-function-original indent-line-function)
-        (set (make-local-variable 'indent-line-function) 'pm-indent-line-dispatcher))
-
-      ;; Kill the base buffer along with the indirect one; careful not
-      ;; to infloop.
-      ;; (add-hook 'kill-buffer-hook
-      ;;           '(lambda ()
-      ;;              ;; (setq kill-buffer-hook nil) :emacs 24 bug (killing
-      ;;              ;; dead buffer triggers an error)
-      ;;              (let ((base (buffer-base-buffer)))
-      ;;                (if  base
-      ;;                    (unless (buffer-local-value 'pm--killed-once base)
-      ;;                      (kill-buffer base))
-      ;;                  (setq pm--killed-once t))))
-      ;;           t t)
-      
-      (when pm--dbg-hook
-        (add-hook 'post-command-hook 'polymode-select-buffer nil t))
-      (object-add-to-list pm/polymode '-buffers (current-buffer)))
-    buff))
-
-(defvar pm--ib-prefix "")
-(defun pm--create-indirect-buffer (mode)
-  "Create indirect buffer with major MODE and initialize appropriately.
-
-This is a low lever function which must be called, one way or
-another from `pm/install' method. Among other things store
-`pm/polymode' from the base buffer (must always exist!) in
-the newly created buffer.
-
-Return newlly created buffer."
-  (unless   (buffer-local-value 'pm/polymode (pm/base-buffer))
-    (error "`pm/polymode' not found in the base buffer %s" (pm/base-buffer)))
-  
-  (setq mode (pm--get-available-mode mode))
-
-  (with-current-buffer (pm/base-buffer)
-    (let* ((config (buffer-local-value 'pm/polymode (current-buffer)))
-           (new-name
-            (generate-new-buffer-name 
-             (format "%s%s[%s]" pm--ib-prefix (buffer-name)
-                     (replace-regexp-in-string "-mode" "" (symbol-name mode)))))
-           (new-buffer (make-indirect-buffer (current-buffer)  new-name))
-           ;; (hook pm/indirect-buffer-hook)
-           (file (buffer-file-name))
-           (base-name (buffer-name))
-           (jit-lock-mode nil)
-           (coding buffer-file-coding-system))
-
-      (with-current-buffer new-buffer
-        (let ((polymode-mode t)) ;;major-modes might check it
-          (funcall mode))
-
-        ;; hopefully temporary hack:
-        (pm--activate-jit-lock-mode-maybe)
-        
-        (setq polymode-major-mode mode)
-        ;; Avoid the uniqified name for the indirect buffer in the mode line.
-        (when pm--dbg-mode-line
-          (setq mode-line-buffer-identification
-                (propertized-buffer-identification base-name)))
-        (setq pm/polymode config)
-        (setq buffer-file-coding-system coding)
-        (setq buffer-file-name file)
-        (vc-find-file-hook))
-      new-buffer)))
-
-
-;;; SPAN MANIPULATION
-(defgeneric pm-get-span (chunkmode &optional pos)
-  "Ask a chunkmode for the span at point.
-Return a list of three elements (TYPE BEG END OBJECT) where TYPE
-is a symbol representing the type of the span surrounding
-POS (head, tail, body). BEG and END are the coordinates of the
-span. OBJECT is a sutable object which is 'responsable' for this
-span. That is, OBJECT could be dispached upon with
-`pm-select-buffer', .. (fixme: complete list).
-
-Should return nil if there is no SUBMODE specific span around POS.")
-
-(defmethod pm-get-span (chunkmode &optional pos)
-  "Simply return nil. Base mode usually do not compute the span."
-  nil)
-
-(defmethod pm-get-span ((config pm-polymode) &optional pos)
-  "Apply pm-get-span on every element of chunkmodes slot of config object.
-Return a cons (chunkmode . span), for which START is closest to
-POS (and before it); i.e. the innermost span.  POS defaults to
-point."
-  (save-restriction
-    (widen)
-    ;; fixme: host should be last, to take advantage of the chunkmodes computation
-    (let* ((smodes (cons (oref config -hostmode)
-                         (oref config -innermodes)))
-           (start (point-min))
-           (end (point-max))
-           (pos (or pos (point)))
-           (span (list nil start end nil))
-           val)
-
-      (dolist (sm smodes)
-        (setq val (pm-get-span sm pos))
-        (when (and val
-                   (or (> (nth 1 val) start)
-                       (< (nth 2 val) end)))
-          (if (or (car val)
-                  (null span))
-              (setq span val
-                    start (nth 1 val)
-                    end (nth 2 val))
-            ;; nil car means outer chunkmode (usually host). And it can be an
-            ;; intersection of spans returned by 2 different neighbour inner
-            ;; chunkmodes. See rapport mode for an example
-            (setq start (max (nth 1 val)
-                             (nth 1 span))
-                  end (min (nth 2 val)
-                           (nth 2 span)))
-            (setcar (cdr span) start)
-            (setcar (cddr span) end))))
-
-      (unless (and (<= start end) (<= pos end) (>= pos start))
-        (error "Bad polymode selection: %s, %s"
-               (list start end) pos))
-      (when (null (car span)) ; chunkmodes can compute the host span by returning nil
-        (setcar (last span) (oref config -hostmode)))
-      span)))
-
-;; No need for this one so far. Basic method iterates through -innermodes
-;; anyhow.
-;; (defmethod pm-get-span ((config pm-polymode-multi) &optional pos))
-
-(defmethod pm-get-span ((config pm-polymode-multi-auto) &optional pos)
-  (let ((span-other (call-next-method))
-        (proto (symbol-value (oref config :auto-innermode))))
-    (if (oref proto :head-reg)
-        (let ((span (pm--span-at-point (oref proto :head-reg)
-                                       (oref proto :tail-reg)
-                                       pos)))
-          (if (and span-other
-                   (or (> (nth 1 span-other) (nth 1 span))
-                       (< (nth 2 span-other) (nth 2 span))))
-              ;; treat intersections with the host mode
-              (if (car span-other)
-                  span-other ;not host
-                ;; at this stage, car span should better be nil; no explicit check here.
-                (setcar (cdr span-other) (max (nth 1 span-other) (nth 1 span)))
-                (setcar (cddr span-other) (min (nth 2 span-other) (nth 2 span)))
-                span-other)
-            (append span (list config)))) ;fixme: this returns config as last object
-      span-other)))
-
-(defmethod pm-get-span ((chunkmode pm-hbtchunkmode) &optional pos)
-  "Return a list of the form (TYPE POS-START POS-END SELF).
-TYPE can be 'body, 'head or 'tail. SELF is just a chunkmode object
-in this case."
-  (with-slots (head-reg tail-reg head-mode tail-mode) chunkmode
-    (let* ((span (pm--span-at-point head-reg tail-reg pos))
-           (type (car span)))
-      (when (or (and (eq type 'head) (eq head-mode 'host))
-                (and (eq type 'tail) (or (eq tail-mode 'host)
-                                         (and (null tail-mode)
-                                              (eq head-mode 'host)))))
-        (setcar span nil))
-      (append span (list chunkmode)))))
-
-(defun pm--default-matcher (reg ahead)
-  (if (< ahead 0)
-      (if (re-search-backward reg nil t)
-          (cons (match-beginning 0) (match-end 0)))
-    (if (re-search-forward reg nil t)
-        (cons (match-beginning 0) (match-end 0)))))
-
-;; fixme: there should be a simpler way... check the code and document
-(defun pm--span-at-point-fun-fun (hd-matcher tl-matcher)
-  (save-excursion
-    (let ((pos (point))
-          (posh (funcall hd-matcher -1)))
-      (if (null posh)
-          ;; special first chunk
-          (let ((posh1 (progn (goto-char (point-min))
-                              (funcall hd-matcher 1))))
-            (if (and posh1
-                     (<= (car posh1) pos)
-                     (< pos (cdr posh1)))
-                (list 'head (car posh1) (cdr posh1))
-              (list nil (point-min) (or (car posh1)
-                                        (point-max)))))
-        (let ((post (progn (goto-char (car posh))
-                           (or (funcall tl-matcher 1)
-                               (cons (point-max) (point-max))))))
-          (if (and (<= (cdr posh) pos)
-                   (< pos (car post)))
-              (list 'body (cdr posh) (car post))
-            (if (and (<= (car post) pos)
-                     (< pos (cdr post)))
-                (list 'tail (car post) (cdr post))
-              (if (< pos (cdr post))
-                  ;; might be in the head
-                  (progn
-                    (goto-char (car post))
-                    (let ((posh1 (funcall hd-matcher -1)))
-                      (if (and (<= (car posh1) pos)
-                               (< pos (cdr posh1)))
-                          (list 'head (car posh1) (cdr posh1))
-                        (list nil (cdr posh) (car posh1))))) ;; posh is point min, fixme: not true anymore?
-                (goto-char (cdr post))
-                (let ((posh1 (or (funcall hd-matcher 1)
-                                 (cons (point-max) (point-max)))))
-                  (if (and posh
-                           (<= (car posh1) pos )
-                           (< pos (cdr posh1)))
-                      (list 'head (car posh1) (cdr posh1))
-                    (list nil (cdr post) (car posh1))))))))))))
-
-(defun pm--span-at-point-reg-reg (head-matcher tail-matcher)
-  ;; efficent reg-reg lookup with only 2 searches
-  (save-excursion
-    (let* ((pos (point))
-           (reg (concat "\\(?1:\\(" tail-matcher "\\)\\)\\|\\(?2:\\(" head-matcher "\\)\\)"))
-           (pos1-end (if (re-search-backward reg nil t)
-                         (match-end 0)))
-           (pos1-tail? (or (null pos1-end) (match-end 1))) ;; consider point-min as a tail
-           (pos1-end (goto-char (or pos1-end  (point-min))))
-           (pos2-start (if (re-search-forward reg nil t)
-                           (match-beginning 0)))
-           (pos2-end (and pos2-start (match-end 0)))
-           (pos2-tail? (and pos2-start (match-end 1)))
-           (pos2-start (or pos2-start (point-max)))) ;consider pointmax as head
-      (if (or (< pos pos2-start)
-              (eq pos (point-max)))
-          ;; inside doc or chunk body
-          (if pos1-tail? 
-              (list nil pos1-end pos2-start) ;doc
-            (list 'body pos1-end pos2-start)) ; chunk body
-        ;; else inside head or tail
-        (if (< pos pos2-end) ; <- this one should be always true
-            (if pos2-tail?
-                (list 'tail pos2-start pos2-end)
-              (list 'head pos2-start pos2-end)))
-        ))))
-
-(defun pm--span-at-point (head-matcher tail-matcher &optional pos)
-  "Basic span detector with head/tail.
-
-HEAD-MATCHER and TAIL-MATCHER can be regexp or functions
-returning (cons beg end) and accepting one argument AHEAD that
-can be either 1 or -1 for either forward or backward search.
-
-Return (type span-start span-end) where type is one of the
-follwoing symbols:
-
-nil - pos is between (tail-reg or point-min) and (head-reg or point-max)
-body - pos is between head-reg and (tail-reg or point-max)
-head -  head span
-tail -  tail span"
-  ;; ! start of the span is part of the span !
-  (save-restriction
-    (widen)
-    (goto-char (or pos (point)))
-    (cond ((and (stringp head-matcher)
-                (stringp tail-matcher))
-           (pm--span-at-point-reg-reg head-matcher tail-matcher))
-          ((and (stringp head-matcher)
-                (functionp tail-matcher))
-           (pm--span-at-point-fun-fun
-            (lambda (ahead) (pm--default-matcher head-matcher ahead))
-            tail-matcher))
-          ((and (functionp head-matcher)
-                (stringp tail-matcher))
-           (pm--span-at-point-fun-fun
-            head-matcher
-            (lambda (ahead) (pm--default-matcher tail-matcher ahead))))
-          ((and (functionp head-matcher)
-                (functionp tail-matcher))
-           (pm--span-at-point-fun-fun head-matcher tail-matcher))
-          (t (error "head and tail matchers should be either regexp strings or functions")))))
-
-
-;;; INDENT
-
-(defun pm-indent-line-dispatcher ()
-  "Dispatch methods indent methods on current span."
-  (let ((span (pm/get-innermost-span)))
-    (pm-indent-line (car (last span)) span)))
-
-(defgeneric pm-indent-line (&optional chunkmode span)
-  "Indent current line.
-Protect and call original indentation function associated with
-the chunkmode.")
-
-(defun pm--indent-line (span)
-  ;; istr is auto-indent string
-  (unwind-protect
-      (save-restriction
-        (pm--comment-region  1 (nth 1 span))
-        (pm/narrow-to-span span)
-        (funcall pm--indent-line-function-original))
-    (pm--uncomment-region 1 (nth 1 span))))
-
-(defmethod pm-indent-line ((chunkmode pm-chunkmode) &optional span)
-  (pm--indent-line span))
-
-(defmethod pm-indent-line ((chunkmode pm-hbtchunkmode) &optional span)
-  "Indent line in inner chunkmodes.
-When point is at the beginning of head or tail, use parent chunk
-to indent."
-  ;; sloppy work:
-  ;; Assumes multiline chunks and single-line head/tail.
-  ;; Assumes current buffer is the correct buffer.
-  (let ((pos (point))
-        shift delta)
-    (cond ((or (eq 'head (car span))
-               (eq 'tail (car span)))
-           ;; use parent's indentation function in head and tail
-           (back-to-indentation)
-           (setq delta (- pos (point)))
-           (backward-char)
-           (let ((parent-span (pm/get-innermost-span)))
-             (pm-select-buffer (car (last parent-span)) parent-span)
-             (forward-char)
-             (pm--indent-line parent-span)
-             (when (eq 'tail (car span))
-               (setq shift (pm--get-head-shift parent-span))
-               (indent-to (+ shift (- (point) (point-at-bol))))))
-           (if (> delta 0)
-               (goto-char (+ (point) delta))))
-          (t
-           (setq shift (pm--get-head-shift span))
-           (pm--indent-line span)
-           (when (= (current-column) 0)
-             (setq shift (+ shift (oref chunkmode :indent-offset))))
-           (setq delta (- (point) (point-at-bol)))
-           (beginning-of-line)
-           (indent-to shift)
-           (goto-char (+ (point) delta))))))
-
-;; fixme: This one is nowhere used?
-(defmethod pm-indent-line ((chunkmode pm-polymode-multi-auto) &optional span)
-  (pm-select-buffer chunkmode span)
-  (pm-indent-line pm/chunkmode span))
-
-(defun pm--get-head-shift (span)
-  (save-excursion
-    (goto-char (cadr span))
-    (back-to-indentation)
-    (- (point) (point-at-bol))))
-
-
-
-;;; FACES
-(defgeneric pm-get-adjust-face (chunkmode &optional type))
-(defmethod pm-get-adjust-face ((chunkmode pm-chunkmode) &optional type)
-  (oref chunkmode :adjust-face))
-(defmethod pm-get-adjust-face ((chunkmode pm-hbtchunkmode) &optional type)
-  (setq type (or type pm/type))
-  (cond ((eq type 'head)
-         (oref chunkmode :head-adjust-face))
-        ((eq type 'tail)
-         (if (eq 'head (oref pm/chunkmode :tail-adjust-face))
-             (oref pm/chunkmode :head-adjust-face)
-           (oref pm/chunkmode :tail-adjust-face)))
-        (t (oref pm/chunkmode :adjust-face))))
-
-(provide 'polymode-methods)
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-pkg.el b/emacs.d/elpa/polymode-20150523.1626/polymode-pkg.el
deleted file mode 100644
index 8ca92d7..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-pkg.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(define-package "polymode" "20150523.1626" "Versatile multiple modes with extensive literate programming support"
-  '((emacs "24"))
-  :url "https://github.com/vitoshka/polymode" :keywords
-  '("emacs"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-weave.el b/emacs.d/elpa/polymode-20150523.1626/polymode-weave.el
deleted file mode 100644
index a560274..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode-weave.el
+++ /dev/null
@@ -1,230 +0,0 @@
-(require 'polymode-common)
-(require 'polymode-classes)
-
-(defgroup polymode-weave nil
-  "Polymode Weavers"
-  :group 'polymode)
-
-(defcustom polymode-weave-output-file-format "%s[woven]"
-  "Format of the weaved files.
-%s is substituted with the current file name sans extension."
-  :group 'polymode-weave
-  :type 'string)
-
-(defclass pm-weaver (pm-root)
-  ((from-to
-    :initarg :from-to
-    :initform '()
-    :type list
-    :custom list
-    :documentation
-    "Input specifications. A list of lists of the form
-
-          (id reg-from ext-to doc commmand)
-
-     ID is the unique identifier of the spec. REG-FROM is a regexp
-     that is used to identify if current file can be weaved with this
-     spec. EXT-TO is the *exact* (not regexp) extension of the output
-     file. DOC is a short help string shown during interactive
-     weaving. COMMMAND is the actual weaver specific command. It can
-     contain the following format specs:
-	%i - replaced with the input file
-	%o - replaced with the ouput file.
-        %O - replaced with the base output file name (no dir, no extension)")
-   (function
-    :initarg :function
-    :initform (lambda (command id)
-                (error "No weaving function declared for this weaver"))
-    :type (or symbol function)
-    :documentation
-    "Function to process the commmand. Must take 2 arguments
-     COMMAND, ID. COMMAND is the 5th argument of :from spec with
-     all the formats substituted. ID is the id of requested :from
-     spec."))
-  "Root weaver class.")
-
-(defclass pm-callback-weaver (pm-weaver)
-  ((callback
-    :initarg :callback
-    :initform (lambda (&optional rest)
-                (error "No callback defined for this weaver."))
-    :type (or symbol function)
-    :documentation
-    "Callback function to be called by :function when a shell
-    call is involved. There is no default callback."))
-  "Class to represent weavers that call processes spanned by
-  emacs. Callback should return the output file name.")
-
-(defclass pm-shell-weaver (pm-weaver)
-  ((function
-    :initform 'pm-default-shell-weave-function)
-   (sentinel
-    :initarg :sentinel
-    :initform 'pm-default-shell-weave-sentinel
-    :type (or symbol function)
-    :documentation
-    "Sentinel function to be called by :function when a shell
-    call is involved. Sentinel must return the output file
-    name."))
-  "Class to represent weavers that call external processes.")
-
-
-;;; METHODS
-(defgeneric pm-weave (weaver from-to &optional export ifile)
-  "Weave current FILE with WEAVER.
-EXPORT must be a list of the form (FROM TO) sutable for call of
-`polymode-export'. If EXPORT is provided corresponding
-exporter (from to) specification will be called.")
-
-(declare-function pm-export "polymode-export")
-(defmethod pm-weave ((weaver pm-weaver) from-to &optional export ifile)
-  (let ((from-to-spec (assoc from-to (oref weaver :from-to))))
-    (if from-to-spec
-        (let* ((ofile (concat (format polymode-weave-output-file-format
-                                      (file-name-base buffer-file-name))
-                              "." (nth 2 from-to-spec)))
-               (ifile (or ifile
-                          (file-name-nondirectory buffer-file-name)))
-               (command (format-spec (nth 4 from-to-spec)
-                                     (list (cons ?i ifile)
-                                           (cons ?O (file-name-base ofile))
-                                           (cons ?o ofile)))))
-          ;; compunicate with sentinel and callback with local vars in order to
-          ;; avoid needless clutter
-          (set (make-local-variable 'pm--output-file) ofile)
-          (set (make-local-variable 'pm--input-file) ifile)
-          (message "Weaving '%s' with '%s' weaver ..."
-                   (file-name-nondirectory ifile) (pm--object-name weaver))
-          (let ((wfile (funcall (oref weaver :function) command from-to)))
-            (when wfile 
-              (if export    
-                  (pm-export (symbol-value (oref pm/polymode :exporter))
-                             (car export) (cdr export) wfile)
-                ;; display the file only when the worker returns the
-                ;; file. Sentinel and callback based weavers return nil.
-                (pm--display-file wfile)
-                wfile))))
-      (error "from-to spec '%s' is not supported by weaver '%s'"
-             from-to (pm--object-name weaver)))))
-
-(defmacro pm--weave-wrap-callback (slot)
-  ;; replace weaver :sentinel or :callback temporally in order to export as a
-  ;; followup step or display the result
-  `(let ((sentinel1 (oref weaver ,slot)))
-    (condition-case err
-        (let ((sentinel2 (if export
-                             `(lambda (proc name)
-                                (let ((wfile (,sentinel1 proc name)))
-                                  ;;; we don't return file here, kinda okward
-                                  (pm-export (symbol-value ',(oref pm/polymode :exporter))
-                                             ,(car export) ,(cdr export)
-                                             wfile)))
-                           `(lambda (proc name)
-                              (let ((wfile (,sentinel1 proc name)))
-                                (pm--display-file wfile)
-                                wfile)))))
-          (oset weaver ,slot sentinel2)
-          ;; don't pass EXPORT argument, it is called from sentinel 
-          (call-next-method weaver from-to nil ifile))
-      (error (oset weaver ,slot sentinel1)
-             (signal (car err) (cdr err))))
-    (oset weaver ,slot sentinel1)))
-
-(defmethod pm-weave ((weaver pm-shell-weaver) from-to &optional export ifile)
-  (pm--weave-wrap-callback :sentinel))
-
-(defmethod pm-weave ((weaver pm-callback-weaver) from-to &optional export ifile)
-  (pm--weave-wrap-callback :callback))
-
-
-;; UI
-(defvar pm--weaver-hist nil)
-(defvar pm--weave:from-to-hist nil)
-
-(defun polymode-weave (&optional from-to)
-  "todo:
-See `pm-weave' generic.
-FROM-TO ignored as yet"
-  (interactive "P")
-  (let* ((weaver (symbol-value (or (oref pm/polymode :weaver)
-                                   (polymode-set-weaver))))
-         (w:from-to (oref weaver :from-to))
-         (opts (mapcar (lambda (el)
-                         (propertize (format "%s" (nth 3 el)) :id (car el)))
-                       w:from-to))
-         (wname (pm--object-name weaver))
-         (from-to
-          (cond ((null from-to)
-                 (let ((fname (file-name-nondirectory buffer-file-name))
-                       (hist-from-to (pm--get-hist :weave-from-to))
-                       (case-fold-search t))
-                   (or (and hist-from-to
-                            (get-text-property 0 :id  hist-from-to))
-                       (car (cl-rassoc-if (lambda (el)
-                                            ;; (dbg (car el) fname)
-                                            (string-match-p (car el) fname))
-                                          w:from-to))
-                       (let* ((prompt (format "No intpu-output spec for extension '.%s' in '%s' weaver. Choose one: "
-                                              (file-name-extension fname)
-                                              wname))
-                              (sel (ido-completing-read prompt opts nil t nil
-                                                        'pm--weave:from-to-hist
-                                                        (pm--get-hist :weave-from-to))))
-                         (pm--put-hist :weave-from-to sel)
-                         (get-text-property 0 :id sel)))))
-                ;; C-u, force a :from-to spec
-                ((equal from-to '(4))
-                 (let ((sel (ido-completing-read "Input type: " opts nil t nil
-                                                 'pm--weave:from-to-hist
-                                                 (pm--get-hist :weave-from-to)) ))
-                   (pm--put-hist :weave-from-to sel)
-                   (get-text-property 0 :id sel)))
-                ((stringp from-to)
-                 (if (assoc from-to w:from-to)
-                     from-to
-                   (error "Cannot find input-output spec '%s' in %s weaver" from-to wname)))
-                (t (error "'from-to' argument must be nil, universal argument or a string")))))
-    (pm-weave weaver from-to)))
-
-(defmacro polymode-register-weaver (weaver default? &rest configs)
-  "Add WEAVER to :weavers slot of all config objects in CONFIGS.
-When DEFAULT? is non-nil, also make weaver the default WEAVER for
-each polymode in CONFIGS."
-  `(dolist (pm ',configs)
-     (object-add-to-list (symbol-value pm) :weavers ',weaver)
-     (when ,default? (oset (symbol-value pm) :weaver ',weaver))))
-
-
-(defun polymode-set-weaver ()
-  (interactive)
-  (unless pm/polymode
-    (error "No pm/polymode object found. Not in polymode buffer?"))
-  (let* ((weavers (pm--abrev-names
-                     (delete-dups (pm--oref-with-parents pm/polymode :weavers))
-                     "pm-weaver/"))
-         (sel (ido-completing-read "No default weaver. Choose one: " weavers nil t nil
-                                   'pm--weaver-hist (car pm--weaver-hist)))
-         (out (intern (get-text-property 0 :orig sel))))
-    (oset pm/polymode :weaver out)
-    out))
-
-
-
-;; UTILS
-(defun pm-default-shell-weave-sentinel (process name)
-  "Default weaver sentinel."
-  (pm--run-command-sentinel process name "weaving"))
-
-(defun pm-default-shell-weave-function (command from-to)
-  "Run weaving command interactively.
-Run command in a buffer (in comint-shell-mode) so that it accepts
-user interaction. This is a default function in all weavers
-that call a shell command"
-  (pm--run-command command
-                   (oref (symbol-value (oref pm/polymode :weaver))
-                         :sentinel)  
-                   "*polymode weave*"
-                   (concat "weaving " from-to " with command:\n     "
-                           command "\n")))
-
-(provide 'polymode-weave)
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode.el b/emacs.d/elpa/polymode-20150523.1626/polymode.el
deleted file mode 100644
index badd51e..0000000
--- a/emacs.d/elpa/polymode-20150523.1626/polymode.el
+++ /dev/null
@@ -1,559 +0,0 @@
-;;; polymode.el --- Versatile multiple modes with extensive literate programming support 
-;;
-;; Filename: polymode.el
-;; Author: Spinu Vitalie
-;; Maintainer: Spinu Vitalie
-;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
-;; Version: 1.0
-;; Package-Requires: ((emacs "24"))
-;; URL: https://github.com/vitoshka/polymode
-;; Keywords: emacs
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is *NOT* part of GNU Emacs.
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 3, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;;
-;;  Extensible, fast, objected-oriented multimode specifically designed for
-;;  literate programming. Extensible support for weaving, tangling and export.
-;; 
-;;   Usage: https://github.com/vitoshka/polymode
-;;   
-;;   Design new polymodes: https://github.com/vitoshka/polymode/tree/master/modes
-;;
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Code:
-
-(require 'polymode-common)
-(require 'polymode-classes)
-(require 'polymode-methods)
-(require 'polymode-export)
-(require 'polymode-weave)
-;; load all core polymode and host objects
-(require 'poly-base)
-
-(defgroup polymode nil
-  "Object oriented framework for multiple modes based on indirect buffers"
-  :link '(emacs-commentary-link "polymode")
-  :group 'tools)
-
-(defgroup polymodes nil
-  "Polymode Configuration Objects"
-  :group 'polymode)
-
-(defgroup hostmodes nil
-  "Polymode Host Chunkmode Objects"
-  :group 'polymode)
-
-(defgroup innermodes nil
-  "Polymode Chunkmode Objects"
-  :group 'polymode)
-
-(defvar polymode-select-mode-hook nil ;; not used yet
-  "Hook run after a different mode is selected.")
-
-(defvar polymode-indirect-buffer-hook nil ;; not used yet
-  "Hook run by `pm/install-mode' in each indirect buffer.
-It is run after all the indirect buffers have been set up.")
-
-(defcustom polymode-prefix-key "\M-n"
-  "Prefix key for the polymode mode keymap.
-Not effective after loading the polymode library."
-  :group 'polymode
-  :type '(choice string vector))
-
-(defvar polymode-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map polymode-prefix-key
-      (let ((map (make-sparse-keymap)))
-        ;; navigation
-	(define-key map "\C-n" 'polymode-next-chunk)
-	(define-key map "\C-p" 'polymode-previous-chunk)
-        (define-key map "\C-\M-n" 'polymode-next-chunk-same-type)
-	(define-key map "\C-\M-p" 'polymode-previous-chunk-same-type)
-        ;; chunk manipulation
-        (define-key map "\M-k" 'polymode-kill-chunk)
-        (define-key map "\M-m" 'polymode-mark-or-extend-chunk)
-        (define-key map "\C-t" 'polymode-toggle-chunk-narrowing)
-	(define-key map "\M-i" 'polymode-insert-new-chunk)
-        ;; backends
-        (define-key map "e" 'polymode-export)
-        (define-key map "E" 'polymode-set-exporter)
-        (define-key map "w" 'polymode-weave)
-        (define-key map "W" 'polymode-set-weaver)
-        (define-key map "t" 'polymode-tangle)
-        (define-key map "T" 'polymode-set-tangler)
-        (define-key map "$" 'polymode-show-process-buffer)
-        ;; todo: add polymode-goto-process-buffer
-	map))
-    (define-key map [menu-bar Polymode]
-      (cons "Polymode"
-	    (let ((map (make-sparse-keymap "Polymode")))
-              (define-key-after map [next]
-		'(menu-item "Next chunk" polymode-next-chunk))
-	      (define-key-after map [previous]
-		'(menu-item "Previous chunk" polymode-previous-chunk))
-              (define-key-after map [next-same]
-	        '(menu-item "Next chunk same type" polymode-next-chunk-same-type))
-	      (define-key-after map [previous-same]
-	        '(menu-item "Previous chunk same type" polymode-previous-chunk-same-type))
-	      (define-key-after map [mark]
-	        '(menu-item "Mark or extend chunk" polymode-mark-or-extend-chunk))
-	      (define-key-after map [kill]
-	        '(menu-item "Kill chunk" polymode-kill-chunk))
-	      (define-key-after map [insert]
-	        '(menu-item "Insert new chunk" polymode-insert-new-chunk))
-	      map)))
-    map)
-  "The default minor mode keymap that is active in all polymode
-  modes.")
-
-
-;;; COMMANDS
-(defvar *span*)
-(defun polymode-next-chunk (&optional N)
-  "Go COUNT chunks forwards.
-Return, how many chucks actually jumped over."
-  (interactive "p")
-  (let* ((sofar 0)
-         (back (< N 0))
-         (beg (if back (point-min) (point)))
-         (end (if back (point) (point-max)))
-         (N (if back (- N) N)))
-    (condition-case nil
-        (pm/map-over-spans
-         (lambda ()
-           (unless (memq (car *span*) '(head tail))
-             (when (>= sofar N)
-               (signal 'quit nil))
-             (setq sofar (1+ sofar))))
-         beg end nil back)
-      (quit (when (looking-at "\\s *$")
-              (forward-line))))
-    sofar))
-
-;;fixme: problme with long chunks .. point is recentered
-;;todo: merge into next-chunk
-(defun polymode-previous-chunk (&optional N)
-  "Go COUNT chunks backwards .
-Return, how many chucks actually jumped over."
-  (interactive "p")
-  (polymode-next-chunk (- N)))
-  
-(defun polymode-next-chunk-same-type (&optional N)
-  "Go to next COUNT chunk.
-Return, how many chucks actually jumped over."
-  (interactive "p")
-  (let* ((sofar 0)
-         (back (< N 0))
-         (beg (if back (point-min) (point)))
-         (end (if back (point) (point-max)))
-         (N (if back (- N) N))
-         this-type this-class)
-    (condition-case nil
-        (pm/map-over-spans
-         (lambda ()
-           (unless (memq (car *span*) '(head tail))
-             (when (and (equal this-class
-                               (pm--object-name (car (last *span*))))
-                        (eq this-type (car *span*)))
-               (setq sofar (1+ sofar)))
-             (unless this-class
-               (setq this-class (pm--object-name (car (last *span*)))
-                     this-type (car *span*)))
-             (when (>= sofar N)
-               (signal 'quit nil))))
-         beg end nil back)
-      (quit (when (looking-at "\\s *$")
-              (forward-line))))
-    sofar))
-
-(defun polymode-previous-chunk-same-type (&optional N)
-  "Go to previus COUNT chunk.
-Return, how many chucks actually jumped over."
-  (interactive "p")
-  (polymode-next-chunk-same-type (- N)))
-
-(defun pm--kill-span (types)
-  (let ((span (pm/get-innermost-span)))
-    (when (memq (car span) types)
-      (delete-region (nth 1 span) (nth 2 span)))))
-
-(defun polymode-kill-chunk ()
-  "Kill current chunk"
-  (interactive)
-  (pcase (pm/get-innermost-span)
-    (`(,(or `nil `host) ,beg ,end ,_) (delete-region beg end))
-    (`(body ,beg ,end ,_)
-     (goto-char beg)
-     (pm--kill-span '(body))
-     (pm--kill-span '(head tail))
-     (pm--kill-span '(head tail)))
-    (`(tail ,beg ,end ,_)
-     (if (eq beg (point-min))
-         (delete-region beg end)
-       (goto-char (1- beg))
-       (polymode-kill-chunk)))
-    (`(head ,_ ,end ,_)
-     (goto-char end)
-     (polymode-kill-chunk))
-    (_ (error "canoot find chunk to kill"))))
-
-(defun polymode-toggle-chunk-narrowing ()
-  "Toggle narrowing of the current chunk."
-  (interactive)
-  (if (buffer-narrowed-p)
-      (progn (widen) (recenter))
-    (pcase (pm/get-innermost-span)
-      (`(head ,_ ,end ,_)
-       (goto-char end)
-       (pm/narrow-to-span))
-      (`(tail ,beg ,end ,_)
-       (if (eq beg (point-min))
-           (error "Invalid chunk")
-         (goto-char (1- beg))
-         (pm/narrow-to-span)))
-      (_ (pm/narrow-to-span)))))
-
-(defun polymode-mark-or-extend-chunk ()
-  (interactive)
-  (error "Not implemented yet"))
-
-(defun polymode-insert-new-chunk ()
-  (interactive)
-  (error "Not implemented yet"))
-
-(defun polymode-show-process-buffer ()
-  (interactive)
-  (let ((buf (cl-loop for b being the buffers
-                      if (buffer-local-value 'pm--process-buffer b)
-                      return b)))
-    (if buf
-	(pop-to-buffer buf `(nil . ((inhibit-same-window . ,pop-up-windows))))
-      (message "No polymode process buffers found."))))
-
-
-;;; CORE
-(defsubst pm/base-buffer ()
-  ;; fixme: redundant with :base-buffer 
-  "Return base buffer of current buffer, or the current buffer if it's direct."
-  (or (buffer-base-buffer (current-buffer))
-      (current-buffer)))
-
-;; VS[26-08-2012]: Dave's original comment: It would be nice to cache the
-;; results of this on text properties, but that probably won't work well if
-;; chunks can be nested.  In that case, you can't just mark everything between
-;; delimiters -- you have to consider other possible regions between them.  For
-;; now, we do the calculation each time, scanning outwards from point.
-(defun pm/get-innermost-span (&optional pos)
-  (pm-get-span pm/polymode pos))
-
-;; This function is for debug convenience only in order to avoid limited debug
-;; context in polymode-select-buffer
-(defvar pm--ignore-post-command-hook nil)
-(defun pm--sel-buf ()
-  (unless pm--ignore-post-command-hook
-    (let ((*span* (pm/get-innermost-span))
-          (pm--can-move-overlays t))
-      (pm-select-buffer (car (last *span*)) *span*))))
-
-(defun polymode-select-buffer ()
-  "Select the appropriate (indirect) buffer corresponding to point's context.
-This funciton is placed in local post-command hook."
-  (condition-case error
-      (pm--sel-buf)
-    (error (message "polymode error: %s"
-                    (error-message-string error)))))
-
-(defun pm/map-over-spans (fun beg end &optional count backward?)
-  "For all spans between BEG and END, execute FUN.
-FUN is a function of no args. It is executed with point at the
-beginning of the span and with the buffer narrowed to the
-span. If COUNT is non-nil, jump at most that many times. If
-BACKWARD? is non-nil, map backwards.
- 
-During the call of FUN, a dynamically bound variable *span* holds
-the current innermost span."
-  (let ((nr 0)
-        *span*)
-    ;; (save-excursion
-    ;;   (save-window-excursion
-    (goto-char (if backward? end beg))
-    (while (and (if backward?
-                    (> (point) beg)
-                  (< (point) end))
-                (or (null count)
-                    (< nr count)))
-      (setq *span* (pm/get-innermost-span)
-            nr (1+ nr))
-      (pm-select-buffer (car (last *span*)) *span*) ;; object and type
-      (goto-char (nth 1 *span*))
-      (funcall fun)
-      (if backward?
-          (goto-char (max 1 (1- (nth 1 *span*)))) ;; enter previous chunk
-        (goto-char (nth 2 *span*))))));))
-
-(defun pm/narrow-to-span (&optional span)
-  "Narrow to current chunk."
-  (interactive)
-  (unless (= (point-min) (point-max))
-    (let ((span (or span
-                    (pm/get-innermost-span))))
-      (if span
-          (let ((min (nth 1 span))
-                (max (nth 2 span)))
-            (when (boundp 'syntax-ppss-last)
-              (setq syntax-ppss-last
-                    (cons (point-min)
-                          (list 0 nil (point-min) nil nil nil 0 nil nil nil))))
-            (narrow-to-region min max))
-        (error "No span found")))))
-
-(defun pm/fontify-region (beg end &optional verbose)
-  "Polymode font-lock fontification function.
-Fontifies chunk-by chunk within the region. Assigned to
-`font-lock-fontify-region-function'.
-
-A fontification mechanism should call
-`font-lock-fontify-region-function' (`jit-lock-function' does
-that). If it does not, the fontification will probably be screwed
-in polymode buffers."
-  (let* ((buffer-undo-list t)
-	 (inhibit-point-motion-hooks t)
-         (font-lock-dont-widen t)
-         (buff (current-buffer)))
-    (with-silent-modifications
-      (font-lock-unfontify-region beg end)
-      (save-excursion
-        (save-window-excursion
-          (pm/map-over-spans
-           (lambda ()
-             (let ((sbeg (nth 1 *span*))
-                   (send (nth 2 *span*)))
-               (when (and font-lock-mode font-lock-keywords)
-                 (when parse-sexp-lookup-properties
-                   (pm--comment-region 1 sbeg))
-                 (condition-case err
-                     (if (oref pm/chunkmode :font-lock-narrow)
-                         (save-restriction
-                           ;; fixme: optimization oportunity: Cache chunk state
-                           ;; in text properties. For big chunks font-lock
-                           ;; fontifies it by smaller segments, thus
-                           ;; pm/fontify-region is called multiple times per
-                           ;; chunk and spans are computed each time.
-                           (narrow-to-region sbeg send)
-                           (funcall pm--fontify-region-original
-                                    (max sbeg beg) (min send end) verbose))
-                       (funcall pm--fontify-region-original
-                                (max sbeg beg) (min send end) verbose))
-                   (error (message "polymode font-lock error: %s (beg: %s end: %s)"
-                                   (error-message-string err) beg end)))
-                 (when parse-sexp-lookup-properties
-                   (pm--uncomment-region 1 sbeg)))
-               (pm--adjust-chunk-face sbeg send (pm-get-adjust-face pm/chunkmode))
-               ;; might be needed by external applications like flyspell
-               ;; fixme: this should be in a more generic place like pm-get-span
-               (put-text-property sbeg send 'chunkmode
-                                  (object-of-class-p pm/chunkmode 'pm-hbtchunkmode))
-               ;; even if failed, set to t to avoid infloop
-               (put-text-property beg end 'fontified t)))
-           beg end)
-          ;; needed to avoid moving last fontified buffer to second place
-	  ;; switching displayed buffer invalidates internal emacs assumptions
-	  ;; bug bug#19511, fixed in emacs ea1c146acf3
-          ;; (bury-buffer)
-	  )))))
-
-(defun pm/syntax-begin-function ()
-  (goto-char
-   (max (cadr (pm/get-innermost-span))
-        (if pm--syntax-begin-function-original
-            (save-excursion
-              (funcall pm--syntax-begin-function-original)
-              (point))
-          (point-min)))))
-
-
-;;; DEFINE
-;;;###autoload
-(defmacro define-polymode (mode config &optional keymap &rest body)
-  "Define a new polymode MODE.
-This macro defines command MODE and an indicator variable MODE
-that is t when MODE is active and nil othervise.
-
-MODE command is similar to standard emacs major modes and it can
-be used in `auto-mode-alist'. Standard hook MODE-hook is run at
-the end of the initialization of each polymode buffer, indirect
-and base alike. Additionally MODE-map is created based on the
-CONFIG's :map slot and the value of the :keymap argument; see
-below.
-
-CONFIG is a name of a config object representing the mode.
-
-MODE command can also be use as a minor mode. Current major mode
-is not reinitialized if it coincides with the :mode slot of
-CONFIG object or if the :mode slot is nil.
-
-BODY contains code to be executed after the complete
-  initialization of the polymode (`pm-initialize') and before
-  running MODE-hook. Before the actual body code, you can write
-  keyword arguments, i.e. alternating keywords and values.  The
-  following special keywords are supported:
-
-:lighter SPEC   Optional LIGHTER is displayed in the mode line when
-                the mode is on. If omitted, it defaults to
-                the :lighter slot of CONFIG object.
-:keymap MAP	Same as the KEYMAP argument.
-
-                If nil, a new MODE-map keymap is created what
-                directly inherits from the keymap defined by
-                the :map slot of CONFIG object. In most cases it
-                is a simple map inheriting form
-                `polymode-mode-map'. If t or an alist (of
-                bindings suitable to be passed to
-                `easy-mmode-define-keymap') a keymap MODE-MAP is
-                build by mergin this alist with the :map
-                specification of the CONFIG object. If a symbol,
-                it should be a variable whose value is a
-                keymap. No MODE-MAP is automatically created in
-                the latter case and :map slot of the CONFIG
-                object is ignored.
-
-:after-hook     A single lisp form which is evaluated after the mode hooks
-                have been run.  It should not be quoted."
-  (declare 
-   (debug (&define name name
-                   [&optional [&not keywordp] sexp]
-                   [&rest [keywordp sexp]]
-                   def-body)))
-
-  
-  (when (keywordp keymap)
-    (push keymap body)
-    (setq keymap nil))
-
-  (let* ((last-message (make-symbol "last-message"))
-         (mode-name (symbol-name mode))
-         (pretty-name (concat
-                       (replace-regexp-in-string "poly-\\|-mode" "" mode-name)
-                       " polymode"))
-         (keymap-sym (intern (concat mode-name "-map")))
-         (hook (intern (concat mode-name "-hook")))
-	 (extra-keywords nil)
-	 (after-hook nil)
-	 keyw lighter)
-
-    ;; Check keys.
-    (while (keywordp (setq keyw (car body)))
-      (setq body (cdr body))
-      (pcase keyw
-	(`:lighter (setq lighter (purecopy (pop body))))
-	(`:keymap (setq keymap (pop body)))
-	(`:after-hook (setq after-hook (pop body)))
-	(_ (push keyw extra-keywords) (push (pop body) extra-keywords))))
-
-    `(progn
-       :autoload-end
-
-       ;; Define the variable to enable or disable the mode.
-       (defvar ,mode nil ,(format "Non-nil if %s mode is enabled." pretty-name))
-       (make-variable-buffer-local ',mode)
-
-       (let* ((keymap ,keymap)
-              (config ',config)
-              (lighter (or ,lighter
-                           (oref (symbol-value config) :lighter)))
-              key-alist)
-
-         (unless (keymapp keymap)
-           ;; keymap is either nil or list. Iterate through parents' :map slot
-           ;; and gather keys.
-           (setq key-alist keymap)
-           (let* ((pi (symbol-value config))
-                  map mm-name)
-             (while pi
-               (setq map (and (slot-boundp pi :map)
-                              (oref pi :map)))
-               (if (and (symbolp map)
-                        (keymapp (symbol-value map)))
-                   ;; If one of the parent's :map is a keymap, use it as our
-                   ;; keymap and stop further descent.
-                   (setq keymap  (symbol-value map)
-                         pi nil)
-                 ;; Descend to next parent and append the key list to key-alist
-                 (setq pi (and (slot-boundp pi :parent-instance)
-                               (oref pi :parent-instance))
-                       key-alist (append key-alist map))))))
-
-         (unless keymap
-           ;; If we couldn't figure out the original keymap:
-           (setq keymap polymode-mode-map))
-
-         ;; Define the minor-mode keymap:
-         (defvar ,keymap-sym
-           (easy-mmode-define-keymap key-alist nil nil `(:inherit ,keymap))
-           ,(format "Keymap for %s." pretty-name))
-
-         
-         ;; The actual mode function:
-         (defun ,mode (&optional arg) ,(format "%s.\n\n\\{%s}" pretty-name keymap-sym)
-                (interactive)
-                (unless ,mode
-                  (let ((,last-message (current-message)))
-                    (unless pm/polymode ;; don't reinstall for time being
-                      (let ((config (clone ,config)))
-                        (oset config :minor-mode ',mode)
-                        (pm-initialize config)))
-                    ;; set our "minor" mode
-                    (setq ,mode t)
-                    ,@body
-                    (run-hooks ',hook)
-                    ;; Avoid overwriting a message shown by the body,
-                    ;; but do overwrite previous messages.
-                    (when (and (called-interactively-p 'any)
-                               (or (null (current-message))
-                                   (not (equal ,last-message
-                                               (current-message)))))
-                      (message ,(format "%s enabled" pretty-name)))
-                    ,@(when after-hook `(,after-hook))
-                    (force-mode-line-update)))
-                ;; Return the new setting.
-                ,mode)
-         
-         (add-minor-mode ',mode lighter ,keymap-sym)))))
-
-
-(define-minor-mode polymode-minor-mode
-  "Polymode minor mode, used to make everything work."
-  nil " PM" polymode-mode-map)
-
-
-;;; FONT-LOCK
-;; indulge elisp font-lock :) 
-(dolist (mode '(emacs-lisp-mode lisp-interaction-mode))
-  (font-lock-add-keywords
-   mode
-   '(("(\\(define-polymode\\)\\s +\\(\\(\\w\\|\\s_\\)+\\)"
-      (1 font-lock-keyword-face)
-      (2 font-lock-variable-name-face)))))
-
-(provide 'polymode)
diff --git a/emacs.d/elpa/polymode-20151216.533/poly-R.el b/emacs.d/elpa/polymode-20151216.533/poly-R.el
new file mode 100644
index 0000000..cdc1f7c
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/poly-R.el
@@ -0,0 +1,359 @@
+;;; poly-R.el --- Popymodes for R
+;;
+;; Filename: poly-R.el
+;; Author: Spinu Vitalie
+;; Maintainer: Spinu Vitalie
+;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
+;; Version: 1.0
+;; URL: https://github.com/vitoshka/polymode
+;; Keywords: emacs
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This file is *NOT* part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 3, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(require 'polymode)
+
+(defcustom pm-poly/R
+  (pm-polymode-one "R"
+                   :hostmode 'pm-host/R
+                   :innermode 'pm-inner/fundamental)
+  "R root polymode. Not intended to be used directly."
+  :group 'polymodes
+  :type 'object)
+
+;; NOWEB
+(require 'poly-noweb)
+(defcustom pm-poly/noweb+R
+  (clone pm-poly/noweb :innermode 'pm-inner/noweb+R)
+  "Noweb for R configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom pm-inner/noweb+R
+  (clone pm-inner/noweb
+         :mode 'R-mode)
+  "Noweb for R"
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-noweb+r-mode "poly-R")
+(define-polymode poly-noweb+r-mode pm-poly/noweb+R :lighter " PM-Rnw")
+
+
+
+;; MARKDOWN
+(require 'poly-markdown)
+;;;###autoload (autoload 'poly-markdown+r-mode "poly-R")
+(define-polymode poly-markdown+r-mode pm-poly/markdown :lighter " PM-Rmd")
+
+
+
+;; RAPPORT
+(defcustom pm-poly/rapport
+  (clone pm-poly/markdown "rapport"
+         :innermodes '(pm-inner/brew+R
+                       pm-inner/rapport+YAML))
+  "Rapport template configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/rapport+YAML
+  (pm-hbtchunkmode "rapport+YAML"
+                   :mode 'yaml-mode
+                   :head-reg "<!--head"
+                   :tail-reg "head-->")
+  "YAML header in Rapport files"
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-rapport-mode "poly-R")
+(define-polymode poly-rapport-mode pm-poly/rapport nil)
+
+
+
+;; HTML
+(defcustom pm-poly/html+R
+  (clone pm-poly/html "html+R" :innermode 'pm-inner/html+R)
+  "HTML + R configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/html+R
+  (pm-hbtchunkmode "html+R"
+                   :mode 'R-mode
+                   :head-reg "<!--[ \t]*begin.rcode"
+                   :tail-reg "end.rcode[ \t]*-->")
+  "HTML KnitR innermode."
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-html+r-mode "poly-R")
+(define-polymode poly-html+r-mode pm-poly/html+R)
+
+
+
+;;; R-brew
+(defcustom pm-poly/brew+R
+  (clone pm-poly/brew "brew+R"
+         :innermode 'pm-inner/brew+R)
+  "Brew + R configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/brew+R
+  (pm-hbtchunkmode "brew+R"
+                   :mode 'R-mode
+                   :head-reg "<%[=%]?"
+                   :tail-reg "[#=%=-]?%>")
+  "Brew R chunk."
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-brew+r-mode "poly-R")
+(define-polymode poly-brew+r-mode pm-poly/brew+R)
+
+
+
+;;; R+C++
+;; todo: move into :matcher-subexp functionality?
+(defun pm--R+C++-head-matcher (ahead)
+  (when (re-search-forward "cppFunction(\\(['\"]\n\\)"
+                           nil t ahead)
+    (cons (match-beginning 1) (match-end 1))))
+
+(defun pm--R+C++-tail-matcher (ahead)
+  (when (< ahead 0)
+    (goto-char (car (pm--R+C++-head-matcher -1))))
+  (goto-char (max 1 (1- (point))))
+  (let ((end (or (ignore-errors (scan-sexps (point) 1))
+                 (buffer-end 1))))
+    (cons (max 1 (1- end)) end)))
+
+(defcustom pm-poly/R+C++
+  (clone pm-poly/R "R+C++" :innermode 'pm-inner/R+C++)
+  "R + C++ configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/R+C++
+  (pm-hbtchunkmode "R+C++"
+                   :mode 'c++-mode
+                   :head-mode 'host
+                   :head-reg 'pm--R+C++-head-matcher
+                   :tail-reg 'pm--R+C++-tail-matcher
+                   :font-lock-narrow nil)
+  "HTML KnitR chunk."
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-r+c++-mode "poly-R")
+(define-polymode poly-r+c++-mode pm-poly/R+C++)
+
+
+
+;;; C++R
+(defun pm--C++R-head-matcher (ahead)
+  (when (re-search-forward "^[ \t]*/[*]+[ \t]*R" nil t ahead)
+    (cons (match-beginning 0) (match-end 0))))
+
+(defun pm--C++R-tail-matcher (ahead)
+  (when (< ahead 0)
+    (error "backwards tail match not implemented"))
+  ;; may be rely on syntactic lookup ?
+  (when (re-search-forward "^[ \t]*\\*/")
+    (cons (match-beginning 0) (match-end 0))))
+
+(defcustom pm-poly/C++R
+  (clone pm-poly/C++ "C++R" :innermode 'pm-inner/C++R)
+  "R + C++ configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/C++R
+  (pm-hbtchunkmode "C++R"
+                   :mode 'R-mode
+                   :head-reg 'pm--C++R-head-matcher
+                   :tail-reg 'pm--C++R-tail-matcher)
+  "HTML KnitR chunk."
+  :group 'polymodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-c++r-mode "poly-R")
+(define-polymode poly-c++r-mode pm-poly/C++R)
+
+
+
+;;; R help
+(defcustom pm-poly/ess-help+R
+  (pm-polymode-one "ess-R-help"
+                   :innermode 'pm-inner/ess-help+R)
+  "ess-R-help"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/ess-help+R
+  (pm-hbtchunkmode "ess-help+R"
+                   :mode 'R-mode
+                   :head-reg "^Examples:"
+                   :tail-reg "\\'"
+                   :indent-offset 5)
+  "Ess help R chunk"
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-ess-help+r-mode "poly-R")
+(define-polymode poly-ess-help+r-mode pm-poly/ess-help+R)
+(add-hook 'ess-help-mode-hook '(lambda ()
+                                 (when (string= ess-dialect "R")
+                                   (poly-ess-help+r-mode))))
+
+
+(defun pm--Rd-examples-head-matcher (ahead)
+  (when (re-search-forward "\\examples *\\({\n\\)" nil t ahead)
+    (cons (match-beginning 1) (match-end 1))))
+
+(defun pm--Rd-examples-tail-matcher (ahead)
+  (when (< ahead 0)
+    (goto-char (car (pm--R+C++-head-matcher -1))))
+  (let ((end (or (ignore-errors (scan-sexps (point) 1))
+                 (buffer-end 1))))
+    (cons (max 1 (- end 1)) end)))
+
+(defcustom pm-poly/Rd
+  (pm-polymode-one "R-documentation"
+                   :innermode 'pm-inner/Rd)
+  "R polymode for Rd files"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom pm-inner/Rd
+  (pm-hbtchunkmode "R+C++"
+                   :mode 'R-mode
+                   :head-mode 'host
+                   :head-reg 'pm--Rd-examples-head-matcher
+                   :tail-reg 'pm--Rd-examples-tail-matcher)
+  "Rd examples chunk."
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-Rd-mode "poly-R")
+(define-polymode poly-Rd-mode pm-poly/Rd)
+(add-hook 'Rd-mode-hook 'poly-Rd-mode)
+
+
+
+;; R SHELL WEAVERS
+(defcustom pm-weaver/knitR
+  (pm-shell-weaver "knitr"
+                   :from-to
+                   '(("latex" "\\.\\(tex\\|rnw\\)\\'" "tex" "LaTeX" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
+                     ("html" "\\.x?html?\\'" "html" "HTML" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
+                     ("markdown" "\\.r?md\\'" "md" "Markdown" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
+                     ("rst" "\\.rst" "rst" "ReStructuredText" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
+                     ("brew" "\\.r?brew\\'" "brew" "Brew" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
+                     ("asciidoc" "\\.asciidoc\\'" "txt" "AsciiDoc" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")
+                     ("textile" "\\.textile\\'" "textile" "Textile" "Rscript -e \"library(knitr); knit('%i', output='%o')\"")))
+  "Shell knitR weaver."
+  :group 'polymode-weave
+  :type 'object)
+
+(polymode-register-weaver pm-weaver/knitR nil
+                          pm-poly/noweb+R pm-poly/markdown
+                          pm-poly/rapport pm-poly/html+R)
+
+(defcustom pm-weaver/Sweave
+  (pm-shell-weaver "sweave"
+                   :from-to
+                   '(("latex" "\\.\\(tex\\|r?s?nw\\)\\'"
+                      "tex" "LaTeX" "R CMD Sweave %i --options=\"output='%o'\"")))
+  "Shell 'Sweave' weaver."
+  :group 'polymode-weave
+  :type 'object)
+
+(polymode-register-weaver pm-weaver/Sweave nil
+                          pm-poly/noweb+R)
+
+;; (oref pm-poly/rapport :weavers)
+;; (oref pm-poly/noweb+R :weavers)
+
+
+
+;; R ESS WEAVERS
+(defcustom pm-weaver/knitR-ESS
+  (pm-callback-weaver "knitR-ESS"
+                      :from-to
+                      '(("latex" "\\.\\(tex\\|rnw\\)\\'" "tex" "LaTeX" "library(knitr); knit('%i', output='%o')")
+                        ("html" "\\.x?html?\\'" "html" "HTML" "library(knitr); knit('%i', output='%o')")
+                        ("markdown" "\\.r?md\\'" "md" "Markdown" "library(knitr); knit('%i', output='%o')")
+                        ("rst" "\\.rst\\'" "rst" "ReStructuredText" "library(knitr); knit('%i', output='%o')")
+                        ("brew" "\\.r?brew\\'" "brew" "Brew" "library(knitr); knit('%i', output='%o')")
+                        ("asciidoc" "\\.asciidoc\\'" "txt" "AsciiDoc" "library(knitr); knit('%i', output='%o')")
+                        ("textile" "\\.textile\\'" "textile" "Textile" "library(knitr); knit('%i', output='%o')"))
+                      :function 'pm--run-command-in-ESS
+                      :callback 'pm--ESS-callback)
+  "ESS knitR weaver."
+  :group 'polymode-weave
+  :type 'object)
+
+(polymode-register-weaver pm-weaver/knitR-ESS nil
+                          pm-poly/noweb+R pm-poly/markdown
+                          pm-poly/rapport pm-poly/html+R)
+
+(defcustom pm-weaver/Sweave-ESS
+  (pm-callback-weaver "ESS-Sweave"
+                      :from-to '(("latex" "\\.\\(tex\\|r?s?nw\\)\\'" "tex"
+                                  "LaTeX" "Sweave('%i', output='%o')"))
+                      :function 'pm--run-command-in-ESS
+                      :callback 'pm--ESS-callback)
+  "ESS 'Sweave' weaver."
+  :group 'polymode-weave
+  :type 'object)
+
+(polymode-register-weaver pm-weaver/Sweave-ESS nil
+                          pm-poly/noweb+R)
+
+(declare-function ess-async-command nil)
+(declare-function ess-force-buffer-current nil)
+(declare-function ess-process-get nil)
+(declare-function ess-process-put nil)
+(declare-function comint-next-prompt nil)
+
+(defun pm--ESS-callback (proc string)
+  (let ((ofile (process-get proc 'pm-output-file)))
+    (with-current-buffer (process-buffer proc)
+      (when (string-match-p "Error\\(:\\| +in\\)" string)
+        (error "Errors durring weaving.")))
+    ofile))
+
+(defun pm--run-command-in-ESS (command &optional from to)
+  (require 'ess)
+  (let ((ess-eval-visibly t)
+        ;; R specific, should change eventually
+        (ess-dialect "R")
+        (weaver (symbol-value (oref pm/polymode :weaver))))
+    (ess-force-buffer-current)
+    (ess-process-put 'pm-output-file pm--output-file)
+    (ess-process-put 'callbacks (list (oref weaver :callback)))
+    (ess-process-put 'interruptable? t)
+    (ess-process-put 'running-async? t)
+    (ess-eval-linewise command)))
+
+(provide 'poly-R)
diff --git a/emacs.d/elpa/polymode-20150523.1626/poly-base.el b/emacs.d/elpa/polymode-20151216.533/poly-base.el
similarity index 100%
rename from emacs.d/elpa/polymode-20150523.1626/poly-base.el
rename to emacs.d/elpa/polymode-20151216.533/poly-base.el
diff --git a/emacs.d/elpa/polymode-20151216.533/poly-erb.el b/emacs.d/elpa/polymode-20151216.533/poly-erb.el
new file mode 100644
index 0000000..bd7d073
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/poly-erb.el
@@ -0,0 +1,53 @@
+(require 'polymode)
+
+(defcustom pm-host/coffee
+  (pm-bchunkmode "coffee" :mode 'coffee-mode)
+  "coffee host chunkmode"
+  :group 'hostmodes
+  :type 'object)
+
+(defcustom pm-host/javascript
+  (pm-bchunkmode "javascript" :mode 'js-mode)
+  "javascript host chunkmode"
+  :group 'hostmodes
+  :type 'object)
+
+(defcustom pm-inner/erb
+  (pm-hbtchunkmode "erb"
+                   :mode 'ruby-mode
+                   :head-mode 'fundamental-mode
+                   :tail-mode 'fundamental-mode
+                   :head-reg  "\<\% *[-=]?"
+                   :tail-reg  "\%\>")
+  "erb typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-poly/coffee-erb
+  (pm-polymode-one "coffee-erb"
+                   :hostmode 'pm-host/coffee
+                   :innermode 'pm-inner/erb)
+  "coffee-erb typical polymode."
+  :group 'polymodes
+  :type 'object)
+(define-polymode poly-coffee-erb-mode pm-poly/coffee-erb)
+
+(defcustom pm-poly/javascript-erb
+  (pm-polymode-one "javascript-erb"
+                   :hostmode 'pm-host/javascript
+                   :innermode 'pm-inner/erb)
+  "javascript-erb typical polymode."
+  :group 'polymodes
+  :type 'object)
+(define-polymode poly-javascript-erb-mode pm-poly/javascript-erb)
+
+(defcustom pm-poly/html-erb
+  (pm-polymode-one "html-erb"
+                   :hostmode 'pm-host/html
+                   :innermode 'pm-inner/erb)
+  "html-erb typical polymode."
+  :group 'polymodes
+  :type 'object)
+(define-polymode poly-html-erb-mode pm-poly/html-erb)
+
+(provide 'poly-erb)
diff --git a/emacs.d/elpa/polymode-20151216.533/poly-markdown.el b/emacs.d/elpa/polymode-20151216.533/poly-markdown.el
new file mode 100644
index 0000000..bc97eee
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/poly-markdown.el
@@ -0,0 +1,72 @@
+;;; poly-markdown.el
+;;
+;; Filename: poly-markdown.el
+;; Author: Spinu Vitalie
+;; Maintainer: Spinu Vitalie
+;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
+;; Version: 1.0
+;; URL: https://github.com/vitoshka/polymode
+;; Keywords: emacs
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This file is *NOT* part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 3, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(require 'polymode)
+;; (require 'markdown-mode)
+
+(defcustom pm-host/markdown
+  (pm-bchunkmode "Markdown"
+               :mode 'markdown-mode)
+  "Markdown host chunkmode"
+  :group 'hostmodes
+  :type 'object)
+
+(defcustom  pm-inner/markdown
+  (pm-hbtchunkmode-auto "markdown"
+                     :head-reg "^[ \t]*```[{ \t]*\\w.*$"
+                     :tail-reg "^[ \t]*```[ \t]*$"
+                     :retriever-regexp "```[ \t]*\\(?:{\\|lang=\\)?\\(\\(\\w\\|\\s_\\)*\\)"
+                     :font-lock-narrow t)
+  "Markdown typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-poly/markdown
+  (pm-polymode-multi-auto "markdown"
+                        :hostmode 'pm-host/markdown
+                        :auto-innermode 'pm-inner/markdown
+                        :init-functions '(poly-markdown-remove-markdown-hooks))
+  "Markdown typical configuration"
+  :group 'polymodes
+  :type 'object)
+
+;;;###autoload  (autoload 'poly-markdown-mode "poly-markdown")
+(define-polymode poly-markdown-mode pm-poly/markdown)
+
+;;; FIXES:
+(defun poly-markdown-remove-markdown-hooks ()
+  ;; get rid of awful hooks
+  (remove-hook 'window-configuration-change-hook 'markdown-fontify-buffer-wiki-links t)
+  (remove-hook 'after-change-functions 'markdown-check-change-for-wiki-link t))
+
+
+(provide 'poly-markdown)
+
diff --git a/emacs.d/elpa/polymode-20151216.533/poly-noweb.el b/emacs.d/elpa/polymode-20151216.533/poly-noweb.el
new file mode 100644
index 0000000..c457b72
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/poly-noweb.el
@@ -0,0 +1,94 @@
+;;; poly-noweb.el
+;;
+;; Filename: poly-noweb.el
+;; Author: Spinu Vitalie
+;; Maintainer: Spinu Vitalie
+;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
+;; Version: 1.0
+;; URL: https://github.com/vitoshka/polymode
+;; Keywords: emacs
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This file is *NOT* part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 3, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(require 'polymode)
+
+(defcustom pm-poly/noweb
+  (pm-polymode-one "noweb"
+                   :hostmode 'pm-host/latex
+                   :innermode 'pm-inner/noweb
+                   :exporters '(pm-exporter/latexmk pm-exporter/pdflatex)
+                   :map '(("<" . poly-noweb-electric-<)))
+  "Noweb typical configuration"
+  :group 'polymodes
+  :type 'object)
+
+(defcustom  pm-inner/noweb
+  (pm-hbtchunkmode "noweb"
+                   :head-reg "<<\\(.*\\)>>="
+                   :tail-reg "^[ \t]*@ *\\( %def .*\\)?$")
+  "Noweb typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+;;;###autoload (autoload 'poly-noweb-mode "poly-noweb")
+(define-polymode poly-noweb-mode pm-poly/noweb)
+
+(defun poly-noweb-electric-< (arg)
+  "Auto insert noweb chunk if at bol followed by white space.
+If given an numerical argument, it simply insert `<'. Otherwise,
+if at the beginning of a line in a host chunk insert \"<<>>=\", a
+closing \"@\" and a newline if necessary."
+  (interactive "P")
+  (if (or arg (not (eq pm/type 'host)))
+      (self-insert-command (if (numberp arg) arg 1))
+    (if (not (looking-back "^[ \t]*"))
+        (self-insert-command 1)
+      (insert "<<")
+      (save-excursion
+        (insert ">>=\n\n@ ")
+        (unless(looking-at "\\s *$")
+          (newline)))
+      (ess-noweb-update-chunk-vector))))
+
+(defcustom pm-exporter/pdflatex
+  (pm-shell-exporter "pdflatex"
+                     :from
+                     '(("latex" "\\.tex\\'" "LaTeX" "latexmk -jobname %O %t %i"))
+                     :to
+                     '(("pdf"  	"pdf"  "PDF" "")))
+  "Shell pdflatex exporter."
+  :group 'polymode-export
+  :type 'object)
+
+(defcustom pm-exporter/latexmk
+  (pm-shell-exporter "latexmk"
+                     :from
+                     '(("latex" "\\.tex\\'" "LaTeX" "latexmk -jobname=%O %t %i"))
+                     :to
+                     '(("dvi"  	"dvi"  "DVI" "-dvi")
+                       ("pdf"  	"pdf"  "PDF" "-pdf")
+                       ("ps"  	"ps"  "PS" "-ps")))
+  "Shell latexmk dvi, ps and pdf exporter."
+  :group 'polymode-export
+  :type 'object)
+
+(provide 'poly-noweb)
diff --git a/emacs.d/elpa/polymode-20150523.1626/poly-org.el b/emacs.d/elpa/polymode-20151216.533/poly-org.el
similarity index 100%
rename from emacs.d/elpa/polymode-20150523.1626/poly-org.el
rename to emacs.d/elpa/polymode-20151216.533/poly-org.el
diff --git a/emacs.d/elpa/polymode-20151216.533/poly-slim.el b/emacs.d/elpa/polymode-20151216.533/poly-slim.el
new file mode 100644
index 0000000..850ca9d
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/poly-slim.el
@@ -0,0 +1,106 @@
+(require 'polymode)
+
+;; We cannot have all these "requires" as part of polymode
+;; https://github.com/vspinu/polymode/issues/69
+;; (require 'css-mode)
+;; (require 'scss-mode)
+;; (require 'coffee-mode)
+;; (require 'slim-mode)
+;; (require 'ruby-mode)
+;; (require 'markdown-mode)
+
+(defcustom pm-host/slim
+  (pm-bchunkmode "slim" :mode 'slim-mode)
+  "slim host chunkmode"
+  :group 'hostmodes
+  :type 'object)
+
+(pm-create-indented-block-matchers "slim-coffee" "^[^ ]*\\(.*:? *coffee: *\\)$")
+(defcustom pm-inner/slim-coffee
+  (pm-hbtchunkmode "slim coffee include"
+                   :mode 'coffee-mode
+                   :head-mode 'slim-mode
+                   :tail-mode 'slim-mode
+                   :head-reg  'pm-slim-coffee-head-matcher
+                   :tail-reg  'pm-slim-coffee-tail-matcher)
+  "slim-coffee typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(pm-create-indented-block-matchers "slim-css" "^[^ ]*\\(.*:? *css: *\\)$")
+(defcustom pm-inner/slim-css
+  (pm-hbtchunkmode "slim css include"
+                   :mode 'css-mode
+                   :head-mode 'slim-mode
+                   :tail-mode 'slim-mode
+                   :head-reg  'pm-slim-css-head-matcher
+                   :tail-reg  'pm-slim-css-tail-matcher)
+  "slim-css typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(pm-create-indented-block-matchers "slim-scss" "^[^ ]*\\(.*:? *scss: *\\)$")
+(defcustom pm-inner/slim-scss
+  (pm-hbtchunkmode "slim scss include"
+                   :mode 'scss-mode
+                   :head-mode 'slim-mode
+                   :tail-mode 'slim-mode
+                   :head-reg  'pm-slim-scss-head-matcher
+                   :tail-reg  'pm-slim-scss-tail-matcher)
+  "slim-scss typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(pm-create-indented-block-matchers "slim-ruby" "^[^ ]*\\(.*:? *ruby: *\\)$")
+(defcustom pm-inner/slim-ruby
+  (pm-hbtchunkmode "slim ruby include"
+                   :mode 'ruby-mode
+                   :head-mode 'slim-mode
+                   :tail-mode 'slim-mode
+                   :head-reg  'pm-slim-ruby-head-matcher
+                   :tail-reg  'pm-slim-ruby-tail-matcher)
+  "slim-ruby typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(pm-create-indented-block-matchers "slim-js" "^[^ ]*\\(.*:? *javascript: *\\)$")
+(defcustom pm-inner/slim-js
+  (pm-hbtchunkmode "slim js include"
+                   :mode 'js-mode
+                   :head-mode 'slim-mode
+                   :tail-mode 'slim-mode
+                   :head-reg  'pm-slim-js-head-matcher
+                   :tail-reg  'pm-slim-js-tail-matcher)
+  "slim-js typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(pm-create-indented-block-matchers "slim-md" "^[^ ]*\\(.*:? *markdown: *\\)$")
+(defcustom pm-inner/slim-md
+  (pm-hbtchunkmode "slim markdown include"
+                   :mode 'markdown-mode
+                   :head-mode 'slim-mode
+                   :tail-mode 'slim-mode
+                   :head-reg  'pm-slim-md-head-matcher
+                   :tail-reg  'pm-slim-md-tail-matcher)
+  "slim-markdown typical chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-poly/slim
+  (pm-polymode-multi "slim"
+                     :hostmode 'pm-host/slim
+                     :innermodes '(pm-inner/slim-coffee
+                                   pm-inner/slim-css
+                                   pm-inner/slim-scss
+                                   pm-inner/slim-js
+                                   pm-inner/slim-md
+                                   pm-inner/slim-ruby))
+
+  "slim typical polymode."
+  :group 'polymodes
+  :type 'object)
+
+(define-polymode poly-slim-mode pm-poly/slim)
+
+(provide 'poly-slim)
diff --git a/emacs.d/elpa/polymode-20151216.533/poly-verilog.el b/emacs.d/elpa/polymode-20151216.533/poly-verilog.el
new file mode 100644
index 0000000..31a03be
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/poly-verilog.el
@@ -0,0 +1,72 @@
+;;; poly-PL.el
+;;
+;; Author: Rado Rodopski
+
+(require 'polymode)
+
+(defcustom pm-host/verilog
+  (pm-bchunkmode "Verilog" :mode 'verilog-mode)
+  "Verilog host chunkmode"
+  :group 'hostmodes
+  :type 'object)
+
+(defcustom pm-inner/perl-block
+  (pm-hbtchunkmode "perl-block"
+                   :mode 'perl-mode
+                   :head-mode 'body
+                   :tail-mode 'body
+                   :head-reg  "<perl>"
+                   :tail-reg  "</perl>")
+  "Perl typical block chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-inner/perl-eval
+  (pm-hbtchunkmode "perl-eval"
+                   :mode 'perl-mode
+                   :head-mode 'body
+                   :tail-mode 'body
+                   :head-reg  "<%"
+                   :tail-reg  "%>")
+  "Perl typical eval chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-inner/perl-line
+  (pm-hbtchunkmode "perl-line"
+                   :mode 'perl-mode
+                   :head-mode 'host
+                   :tail-mode 'host
+                   :head-reg  "<pl>"
+                   :tail-reg  "$")
+  "Perl typical line chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-inner/perl-inline-var
+  (pm-hbtchunkmode "perl-inline-var"
+                   :mode 'perl-mode
+                   :head-mode 'body
+                   :tail-mode 'body
+                   :head-reg  "<\\$+"
+                   :tail-reg  ">")
+  "Perl typical inline variable chunk."
+  :group 'innermodes
+  :type 'object)
+
+(defcustom pm-poly/verilog+perl
+  (pm-polymode-multi "verilog+perl"
+					 :hostmode 'pm-host/verilog
+					 :innermodes '(pm-inner/perl-block
+								   pm-inner/perl-eval
+								   pm-inner/perl-line
+								   pm-inner/perl-inline-var))
+  "verilog-perl typical polymode."
+  :group 'polymodes
+  :type 'object)
+
+
+(define-polymode poly-verilog+perl-mode pm-poly/verilog+perl)
+
+
+(provide 'poly-verilog)
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-autoloads.el b/emacs.d/elpa/polymode-20151216.533/polymode-autoloads.el
new file mode 100644
index 0000000..2ac96ed
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-autoloads.el
@@ -0,0 +1,106 @@
+;;; polymode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "poly-R" "poly-R.el" (22171 46549 0 0))
+;;; Generated autoloads from poly-R.el
+ (autoload 'poly-noweb+r-mode "poly-R")
+ (autoload 'poly-markdown+r-mode "poly-R")
+ (autoload 'poly-rapport-mode "poly-R")
+ (autoload 'poly-html+r-mode "poly-R")
+ (autoload 'poly-brew+r-mode "poly-R")
+ (autoload 'poly-r+c++-mode "poly-R")
+ (autoload 'poly-c++r-mode "poly-R")
+ (autoload 'poly-ess-help+r-mode "poly-R")
+ (autoload 'poly-Rd-mode "poly-R")
+
+;;;***
+
+;;;### (autoloads nil "poly-markdown" "poly-markdown.el" (22171 46549
+;;;;;;  0 0))
+;;; Generated autoloads from poly-markdown.el
+ (autoload 'poly-markdown-mode "poly-markdown")
+
+;;;***
+
+;;;### (autoloads nil "poly-noweb" "poly-noweb.el" (22171 46549 0
+;;;;;;  0))
+;;; Generated autoloads from poly-noweb.el
+ (autoload 'poly-noweb-mode "poly-noweb")
+
+;;;***
+
+;;;### (autoloads nil "poly-org" "poly-org.el" (22171 46549 0 0))
+;;; Generated autoloads from poly-org.el
+ (autoload 'poly-org-mode "poly-org")
+
+;;;***
+
+;;;### (autoloads nil "polymode" "polymode.el" (22171 46549 0 0))
+;;; Generated autoloads from polymode.el
+
+(autoload 'define-polymode "polymode" "\
+Define a new polymode MODE.
+This macro defines command MODE and an indicator variable MODE
+that is t when MODE is active and nil othervise.
+
+MODE command is similar to standard emacs major modes and it can
+be used in `auto-mode-alist'. Standard hook MODE-hook is run at
+the end of the initialization of each polymode buffer, indirect
+and base alike. Additionally MODE-map is created based on the
+CONFIG's :map slot and the value of the :keymap argument; see
+below.
+
+CONFIG is a name of a config object representing the mode.
+
+MODE command can also be use as a minor mode. Current major mode
+is not reinitialized if it coincides with the :mode slot of
+CONFIG object or if the :mode slot is nil.
+
+BODY contains code to be executed after the complete
+  initialization of the polymode (`pm-initialize') and before
+  running MODE-hook. Before the actual body code, you can write
+  keyword arguments, i.e. alternating keywords and values.  The
+  following special keywords are supported:
+
+:lighter SPEC   Optional LIGHTER is displayed in the mode line when
+                the mode is on. If omitted, it defaults to
+                the :lighter slot of CONFIG object.
+:keymap MAP	Same as the KEYMAP argument.
+
+                If nil, a new MODE-map keymap is created what
+                directly inherits from the keymap defined by
+                the :map slot of CONFIG object. In most cases it
+                is a simple map inheriting form
+                `polymode-mode-map'. If t or an alist (of
+                bindings suitable to be passed to
+                `easy-mmode-define-keymap') a keymap MODE-MAP is
+                build by mergin this alist with the :map
+                specification of the CONFIG object. If a symbol,
+                it should be a variable whose value is a
+                keymap. No MODE-MAP is automatically created in
+                the latter case and :map slot of the CONFIG
+                object is ignored.
+
+:after-hook     A single lisp form which is evaluated after the mode hooks
+                have been run.  It should not be quoted.
+
+\(fn MODE CONFIG &optional KEYMAP &rest BODY)" nil t)
+
+;;;***
+
+;;;### (autoloads nil nil ("poly-base.el" "poly-erb.el" "poly-slim.el"
+;;;;;;  "poly-verilog.el" "polymode-classes.el" "polymode-common.el"
+;;;;;;  "polymode-configuration.el" "polymode-export.el" "polymode-methods.el"
+;;;;;;  "polymode-pkg.el" "polymode-tangle.el" "polymode-weave.el")
+;;;;;;  (22171 46549 576199 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; polymode-autoloads.el ends here
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-classes.el b/emacs.d/elpa/polymode-20151216.533/polymode-classes.el
new file mode 100644
index 0000000..59958e9
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-classes.el
@@ -0,0 +1,309 @@
+(require 'polymode-common)
+
+;;; ROOT CLASS
+(defclass pm-root (eieio-instance-inheritor) ()
+  "Root polymode class.")
+
+
+;;; CONFIG
+(defclass pm-polymode (pm-root) 
+  ((hostmode
+    :initarg :hostmode
+    :initform 'pm-host/blank
+    :type symbol
+    :custom symbol
+    :documentation
+    "Symbol pointing to an object of class pm-chunkmode
+    representing the host chunkmode.")
+   (minor-mode
+    :initarg :minor-mode
+    :initform 'polymode-minor-mode
+    :type symbol
+    :custom symbol
+    :documentation
+    "Symbol pointing to minor-mode function that should be
+    activated in all buffers (base and indirect). This is a
+    \"glue\" mode and is `polymode-minor-mode' by default. You
+    will rarely need to change this.")
+   (lighter
+    :initarg :lighter
+    :initform " PM"
+    :type string
+    :custom string
+    :documentation "Modline lighter.")
+   (exporters
+    :initarg :exporters
+    :initform '(pm-exporter/pandoc)
+    :type list
+    :custom list
+    :documentation
+    "List of names of polymode exporters available for this polymode.")
+   (exporter
+    :initarg :exporter
+    :initform nil
+    :type (or null symbol)
+    :custom symbol
+    :documentation
+    "Current exporter name. If non-nil should be the name of the
+    default exporter for this polymode. Can be set with
+    `polymode-set-exporter' command.")
+   (weavers
+    :initarg :weavers
+    :initform '()
+    :type list
+    :custom list
+    :documentation
+    "List of names of polymode weavers available for this polymode.")
+   (weaver
+    :initarg :weaver
+    :initform nil
+    :type (or null symbol)
+    :custom symbol
+    :documentation
+    "Current weaver name. If non-nil this is the default weaver
+    for this polymode. Can be dynamically set with
+    `polymode-set-weaver'")
+   (map
+    :initarg :map
+    :initform 'polymode-mode-map
+    :type (or symbol list)
+    "Has a similar role as the :keymap argument in
+     `define-polymode' with the difference that this argument is
+     inherited through cloning, but :keymap argument is not. That
+     is, child objects derived through clone will inherit
+     the :map argument of its parents through the following
+     scheme: if :map is nil or an alist of keys, the parent is
+     inspected for :map argument and the keys are merged
+     recursively from parent to parent till a symbol :map slot is
+     met. If :map is a symbol, it must be a keymap, in which case
+     this keymap is used and no parents are further inspected
+     for :map slot. If :map is an alist it must be suitable for
+     `easy-mmode-define-keymap'.")
+   (init-functions
+    :initarg :init-functions
+    :initform '()
+    :type list
+    :documentation
+    "List of functions to run at the initialization time.
+     All init-functions in the inheritance chain are called. Parents
+     hooks first. So, if current config object C inherits from object
+     B, which in turn inherits from object A. Then A's init-functions
+     are called first, then B's and then C's.
+     Either customize this slot or use `object-add-to-list' function.")
+   
+   (-hostmode
+    :type (or null pm-chunkmode)
+    :documentation
+    "Dynamically populated `pm-chunkmode' object.")
+   (-innermodes
+    :type list
+    :initform '()
+    :documentation
+    "Dynamically populated list of chunkmodes objects that
+    inherit from `pm-hbtchunkmode'.")
+   (-buffers
+    :initform '()
+    :type list
+    :documentation
+    "Holds all buffers associated with current buffer. Dynamically populated.")
+   (-hist
+    :initform '()
+    :type list
+    :documentation "Internal. Used to store various user history
+    values. Use `pm--get-hist' and `pm--put-hist' to place key
+    value pairs into this list."))
+  
+  "Configuration for a polymode. Each polymode buffer contains a local
+variable `pm/polymode' instantiated from this class or a subclass
+of this class.")
+
+(defclass pm-polymode-one (pm-polymode)
+  ((innermode
+    :initarg :innermode
+    :type symbol
+    :custom symbol
+    :documentation
+    "Symbol of the chunkmode. At run time this object is cloned
+     and placed in -innermodes slot."))
+  
+  "Configuration for a simple polymode that allows only one
+innermode. For example noweb.")
+
+(defclass pm-polymode-multi (pm-polymode)
+  ((innermodes
+    :initarg :innermodes
+    :type list
+    :custom list
+    :initform nil
+    :documentation
+    "List of names of the chunkmode objects that are associated
+     with this configuration. At initialization time, all of
+     these are cloned and plased in -innermodes slot."))
+  
+  "Configuration for a polymode that allows multiple (known in
+advance) innermodes.")
+
+(defclass pm-polymode-multi-auto (pm-polymode-multi)
+  ((auto-innermode
+    :initarg :auto-innermode
+    :type symbol
+    :custom symbol
+    :documentation
+    "Name of pm-hbtchunkmode-auto object (a symbol). At run time
+     this object is cloned and placed in -auto-innermodes with
+     coresponding :mode slot initialized at run time.")
+   (-auto-innermodes
+    :type list
+    :initform '()
+    :documentation
+    "List of chunkmode objects that are auto-generated in
+    `pm-get-span' method for this class."))
+  
+  "Configuration for a polymode that allows multiple innermodes
+that are not known in advance. Examples are org-mode and markdown.")
+
+
+
+;;; CHUNKMODE CLASSES
+(defclass pm-chunkmode (pm-root)
+  ((mode :initarg :mode
+    :type symbol
+    :initform nil
+    :custom symbol)
+   (protect-indent-line :initarg :protect-indent-line
+    :type boolean
+    :initform t
+    :custom boolean
+    :documentation
+    "Whether to modify local `indent-line-function' by narrowing
+    to current span first")
+   (indent-offset :initarg :indent-offset
+    :type integer
+    :initform 0
+    :documentation
+    "Offset to add when indenting chunk's line. Takes effect only
+    when :protect-indent-line is non-nil.")
+   (font-lock-narrow :initarg :font-lock-narrow
+    :type boolean
+    :initform t
+    :documentation
+    "Whether to narrow to span during font lock")
+   (adjust-face :initarg :adjust-face
+    :type (or number face list)
+    :custom (or number face list)
+    :initform nil
+    :documentation
+    "Fontification adjustments chunk face. It should be either,
+    nil, number, face or a list of text properties as in
+    `put-text-property' specification. If nil no highlighting
+    occurs. If a face, use that face. If a number, it is a
+    percentage by which to lighten/darken the default chunk
+    background. If positive - lighten the background on dark
+    themes and darken on light thems. If negative - darken in
+    dark thems and lighten in light thems.")
+   
+   (-buffer
+    :type (or null buffer)
+    :initform nil))
+  
+  "Representatioin of the chunkmode object.")
+
+(defclass pm-bchunkmode (pm-chunkmode)
+  ()
+  "Representation of the hostmode objects. Basemodes are the
+  main (parent) modes in the buffer. For example for a the
+  web-mdoe the hostmode is `html-mode', for nowweb mode the host
+  mode is usually `latex-mode', etc.")
+
+(defclass pm-hbtchunkmode (pm-chunkmode)
+  ((head-mode
+    :initarg :head-mode
+    :type symbol
+    :initform 'fundamental-mode
+    :custom symbol
+    :documentation
+    "Chunks' header mode. If set to 'body, the head is considered
+    part of the chunk body. If set to 'host, head is considered
+    part of the including host mode.")
+   (tail-mode
+    :initarg :tail-mode
+    :type symbol
+    :initform nil
+    :custom symbol
+    :documentation
+    "If nil, it is the same as :HEAD-MODE. Otherwise, the same
+    rules as for the :head-mode apply.")
+   (head-reg
+    :initarg :head-reg
+    :initform ""
+    :type (or string symbol)
+    :custom (or string symbol)
+    :documentation "Regexp for the chunk start (aka head), or a
+    function returning the start and end positions of the head.
+    See `pm--default-matcher' for an example function.")
+   (tail-reg
+    :initarg :tail-reg
+    :initform ""
+    :type (or string symbol)
+    :custom (or string symbol)
+    :documentation "Regexp for chunk end (aka tail), or a
+    function returning the start and end positions of the tail.
+    See `pm--default-matcher' for an example function.")
+   (adjust-face
+    :initform 2)
+   (head-adjust-face
+    :initarg :head-adjust-face
+    :initform font-lock-type-face
+    :type (or null number face list)
+    :custom (or null number face list)
+    :documentation
+    "Can be a number, list or face.")
+   (tail-adjust-face
+    :initarg :tail-adjust-face
+    :initform nil
+    :type (or null number face list)
+    :custom (or null number face list)
+    :documentation
+    "Can be a number, list or face. If nil, take the
+    configuration from :head-adjust-face.")
+   
+   (-head-buffer
+    :type (or null buffer)
+    :initform nil
+    :documentation
+    "This buffer is set automatically to -buffer if :head-mode is
+    'body, and to base-buffer if :head-mode is 'host")
+   (-tail-buffer
+    :initform nil
+    :type (or null buffer)))
+  
+  "Representation of an inner chunkmode.")
+
+(defclass pm-hbtchunkmode-auto (pm-hbtchunkmode)
+  ((retriever-regexp :initarg :retriever-regexp
+    :type (or null string)
+    :custom string
+    :initform nil
+    :documentation
+    "Regexp that is used to retrive the modes symbol from the
+    head of the chunkmode chunk. fixme: elaborate")
+   (retriever-num :initarg :retriever-num
+    :type integer
+    :custom integer
+    :initform 1
+    :documentation
+    "Subexpression to be matched by :retriver-regexp")
+   (retriever-function :initarg :retriever-function
+    :type symbol
+    :custom symbol
+    :initform nil
+    :documentation
+    "Function symbol used to retrive the modes symbol from the
+    head of the chunkmode chunk. It is called with no arguments
+    with the point positioned at the beginning of the chunk
+    header. It must return the mode name string or symbol (need
+    not include '-mode' postfix).)"))
+
+  "Representation of an inner chunkmode")
+
+(provide 'polymode-classes)
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-common.el b/emacs.d/elpa/polymode-20151216.533/polymode-common.el
new file mode 100644
index 0000000..e183408
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-common.el
@@ -0,0 +1,351 @@
+;; COMMON INITIALIZATION, UTILITIES and INTERNALS which didn't fit anywhere else
+
+(eval-when-compile
+  (require 'cl))
+(require 'font-lock)
+(require 'color)
+(require 'eieio)
+(require 'eieio-base)
+(require 'eieio-custom)
+(require 'format-spec)
+
+(defcustom polymode-display-process-buffers t
+  "When non-nil, display weaving and exporting process buffers."
+  :group 'polymode
+  :type 'boolean)
+
+;; esential vars
+(defvar-local pm/polymode nil)
+(defvar-local pm/chunkmode nil)
+(defvar-local pm/type nil)
+(defvar-local polymode-major-mode nil)
+(defvar-local pm--fontify-region-original nil)
+(defvar-local pm--indent-line-function-original nil)
+(defvar-local pm--syntax-begin-function-original nil)
+;; (defvar-local pm--killed-once nil)
+(defvar-local polymode-mode nil
+  "This variable is t if current \"mode\" is a polymode.")
+
+;; silence the compiler for now
+(defvar pm--output-file nil)
+(defvar pm--input-buffer nil)
+(defvar pm--input-file nil)
+(defvar pm/type)
+(defvar pm/polymode)
+(defvar pm/chunkmode)
+(defvar *span*)
+
+;; core api from polymode.el, which relies on polymode-methods.el.
+;; fixme: some of these are not api, rename
+(declare-function pm/base-buffer "polymode")
+(declare-function pm/get-innermost-span "polymode")
+(declare-function pm/map-over-spans "polymode")
+(declare-function pm/narrow-to-span "polymode")
+(declare-function pm/fontify-region "polymode")
+(declare-function pm/syntax-begin-function "polymode")
+
+;; methods api from polymode-methods.el
+(declare-function pm-initialize "polymode-methods")
+(declare-function pm-get-buffer "polymode-methods")
+(declare-function pm-select-buffer "polymode-methods")
+(declare-function pm-install-buffer "polymode-methods")
+(declare-function pm-get-adjust-face "polymode-methods")
+(declare-function pm-get-span "polymode-methods")
+(declare-function pm-indent-line "polymode-methods")
+
+;; buffer manipulation function in polymode-methods.el
+;; polymode-common.el:315:1:Warning: the following functions are not known to be defined:
+;; pm--create-indirect-buffer, pm--setup-buffer, pm--span-at-point, polymode-select-buffer
+
+;; temporary debugging facilities
+(defvar pm--dbg-mode-line t)
+(defvar pm--dbg-fontlock t)
+(defvar pm--dbg-hook t)
+
+;; other locals
+(defvar-local pm--process-buffer nil)
+
+
+;;; UTILITIES
+(defun pm--display-file (ofile)
+  (display-buffer (find-file-noselect ofile 'nowarn)))
+
+(defun pm--get-indirect-buffer-of-mode (mode)
+  (loop for bf in (oref pm/polymode -buffers)
+        when (and (buffer-live-p bf)
+                  (eq mode (buffer-local-value 'polymode-major-mode bf)))
+        return bf))
+
+;; ;; This doesn't work in 24.2, pcase bug ((void-variable xcar))
+;; ;; Other pcases in this file don't throw this error
+;; (defun pm--set-chunkmode-buffer (obj type buff)
+;;   (with-slots (buffer head-mode head-buffer tail-mode tail-buffer) obj
+;;     (pcase (list type head-mode tail-mode)
+;;       (`(body body ,(or `nil `body))
+;;        (setq buffer buff
+;;              head-buffer buff
+;;              tail-buffer buff))
+;;       (`(body ,_ body)
+;;        (setq buffer buff
+;;              tail-buffer buff))
+;;       (`(body ,_ ,_ )
+;;        (setq buffer buff))
+;;       (`(head ,_ ,(or `nil `head))
+;;        (setq head-buffer buff
+;;              tail-buffer buff))
+;;       (`(head ,_ ,_)
+;;        (setq head-buffer buff))
+;;       (`(tail ,_ ,(or `nil `head))
+;;        (setq tail-buffer buff
+;;              head-buffer buff))
+;;       (`(tail ,_ ,_)
+;;        (setq tail-buffer buff))
+;;       (_ (error "type must be one of 'body 'head and 'tail")))))
+
+;; a literal transcript of the pcase above
+(defun pm--set-chunkmode-buffer (obj type buff)
+  (with-slots (-buffer head-mode -head-buffer tail-mode -tail-buffer) obj
+    (cond
+     ((and (eq type 'body)
+           (eq head-mode 'body)
+           (or (null tail-mode)
+               (eq tail-mode 'body)))
+      (setq -buffer buff
+            -head-buffer buff
+            -tail-buffer buff))
+     ((and (eq type 'body)
+           (eq tail-mode 'body))
+      (setq -buffer buff
+            -tail-buffer buff))
+     ((eq type 'body)
+      (setq -buffer buff))
+     ((and (eq type 'head)
+           (or (null tail-mode)
+               (eq tail-mode 'head)))
+      (setq -head-buffer buff
+            -tail-buffer buff))
+     ((eq type 'head)
+      (setq -head-buffer buff))
+     ((and (eq type 'tail)
+           (or (null tail-mode)
+               (eq tail-mode 'head)))
+      (setq -tail-buffer buff
+            -head-buffer buff))
+     ((eq type 'tail)
+      (setq -tail-buffer buff))
+     (t (error "type must be one of 'body 'head and 'tail")))))
+
+(defun pm--get-chunkmode-mode (obj type)
+  (with-slots (mode head-mode tail-mode) obj
+    (cond ((or (eq type 'body)
+               (and (eq type 'head)
+                    (eq head-mode 'body))
+               (and (eq type 'tail)
+                    (or (eq tail-mode 'body)
+                        (and (null tail-mode)
+                             (eq head-mode 'body)))))
+           (oref obj :mode))
+          ((or (and (eq type 'head)
+                    (eq head-mode 'host))
+               (and (eq type 'tail)
+                    (or (eq tail-mode 'host)
+                        (and (null tail-mode)
+                             (eq head-mode 'host)))))
+           (oref (oref pm/polymode -hostmode) :mode))
+          ((eq type 'head)
+           (oref obj :head-mode))
+          ((eq type 'tail)
+           (oref obj :tail-mode))
+          (t (error "type must be one of 'head 'tail 'body")))))
+
+(defun pm--create-chunkmode-buffer-maybe (chunkmode type)
+  ;; assumes pm/polymode is set
+  (let ((mode (pm--get-chunkmode-mode chunkmode type)))
+    (or (pm--get-indirect-buffer-of-mode mode)
+        (let ((buff (pm--create-indirect-buffer mode)))
+          (with-current-buffer  buff
+            (setq pm/chunkmode chunkmode)
+            (setq pm/type type)
+            (pm--setup-buffer)
+            (funcall (oref pm/polymode :minor-mode))
+            buff)))))
+
+(defun pm--get-mode-symbol-from-name (str)
+  "Guess and return mode function.
+Return major mode function constructed from STR by appending
+'-mode' if needed. If the constructed symbol is not a function
+return an error."
+  (let* ((str (if (symbolp str)
+		  (symbol-name str)
+		str))
+	 (mname (if (string-match-p "-mode$" str)
+		    str
+		  (concat str "-mode"))))
+    (pm--get-available-mode (intern mname))))
+
+(defun pm--get-available-mode (mode)
+  "Check if MODE symbol is defined and is a valid function.
+If so, return it, otherwise return 'fundamental-mode with a
+warnign."
+  (cond ((fboundp mode) mode)
+        (t (message "Cannot find %s function, using 'fundamental-mode instead" mode)
+           'fundamental-mode)))
+
+(defun pm--oref-with-parents (object slot)
+  "Merge slots SLOT from the OBJECT and all its parent instances."
+  (let (VALS)
+    (while object
+      (setq VALS (append (and (slot-boundp object slot) ; don't cascade
+                              (eieio-oref object slot))
+                         VALS)
+            object (and (slot-boundp object :parent-instance)
+                        (oref object :parent-instance))))
+    VALS))
+
+(defun pm--abrev-names (list abrev-regexp)
+  "Abreviate names in LIST by replacing abrev-regexp with empty
+string."
+  (mapcar (lambda (nm)
+            (let ((str-nm (if (symbolp nm)
+                              (symbol-name nm)
+                            nm)))
+              (propertize (replace-regexp-in-string abrev-regexp "" str-nm)
+                          :orig str-nm)))
+          list))
+
+(defun pm--put-hist (key val)
+  (oset pm/polymode -hist
+        (plist-put (oref pm/polymode -hist) key val)))
+
+(defun pm--get-hist (key)
+  (plist-get (oref pm/polymode -hist) key))
+
+(defun pm--comment-region (beg end)
+  ;; mark as syntactic comment
+  (when (> end 1)
+    (with-silent-modifications
+      (let ((beg (or beg (region-beginning)))
+            (end (or end (region-end))))
+        (let ((ch-beg (char-after beg))
+              (ch-end (char-before end)))
+          (add-text-properties beg (1+ beg)
+                               (list 'syntax-table (cons 11 ch-beg)
+                                     'rear-nonsticky t
+                                     'polymode-comment 'start))
+          (add-text-properties (1- end) end
+                               (list 'syntax-table (cons 12 ch-end)
+                                     'rear-nonsticky t
+                                     'polymode-comment 'end)))))))
+
+(defun pm--uncomment-region (beg end)
+  ;; remove all syntax-table properties. Should not cause any problem as it is
+  ;; always used before font locking
+  (when (> end 1)
+    (with-silent-modifications
+      (let ((props '(syntax-table nil rear-nonsticky nil polymode-comment nil)))
+        (remove-text-properties beg end props)
+        ;; (remove-text-properties beg (1+ beg) props)
+        ;; (remove-text-properties end (1- end) props)
+        ))))
+
+(defun pm--run-command (command sentinel buff-name message)
+  "Run command interactively.
+Run command in a buffer (in comint-shell-mode) so that it accepts
+user interaction."
+  ;; simplified version of TeX-run-TeX
+  (require 'comint)
+  (let* ((buffer (get-buffer-create buff-name))
+         (process nil)
+         (command-buff (current-buffer))
+         (ofile pm--output-file))
+    (with-current-buffer buffer
+      (read-only-mode -1)
+      (erase-buffer)
+      (insert message)
+      (comint-exec buffer buff-name shell-file-name nil
+                   (list shell-command-switch command))
+      (comint-mode)
+      (setq process (get-buffer-process buffer))
+      (set-process-sentinel process sentinel)
+      (setq pm--process-buffer t)
+      ;; for communication with sentinel
+      (set (make-local-variable 'pm--output-file) ofile)
+      (set (make-local-variable 'pm--input-buffer) command-buff)
+      (set-marker (process-mark process) (point-max)))
+    (when polymode-display-process-buffers
+      (display-buffer buffer `(nil . ((inhibit-same-window . ,pop-up-windows)))))
+    nil))
+
+(defun pm--run-command-sentinel (process name message)
+  (let ((buff (process-buffer process)))
+    (with-current-buffer buff
+      ;; fixme: remove this later
+      (sit-for .5)
+      (goto-char (point-min))
+      (let ((case-fold-search t))
+        (if (not (re-search-forward "error" nil 'no-error))
+            pm--output-file
+          (progn
+	    (display-buffer (current-buffer))
+	    (message "Done with %s" message))
+          (error "Bumps while %s (%s)" message name))))))
+
+
+;;; COMPATIBILITY and FIXES
+(defun pm--flyspel-dont-highlight-in-chunkmodes (beg end poss)
+  (or (get-text-property beg 'chunkmode)
+      (get-text-property beg 'chunkmode)))
+
+(defvar object-name)
+(defun pm--object-name (object)
+  (cond ((fboundp 'eieio--object-name)
+	 (eieio--object-name object))
+	((fboundp 'eieio-object-name)
+	 (eieio-object-name object))
+	(t (aref object object-name))))
+
+(defun pm--activate-jit-lock-mode-maybe ()
+  ;; ugly hack for emacs 24.4
+  (when (and (string< "24.4" emacs-version)
+             ;; jit-lock is deactivated after this one is set.
+             jit-lock-functions)
+
+    (setq jit-lock-mode t)
+    ;; Mark the buffer for refontification.
+    (jit-lock-refontify)
+
+    ;; Install an idle timer for stealth fontification.
+    (when (and jit-lock-stealth-time (null jit-lock-stealth-timer))
+      (setq jit-lock-stealth-timer
+            (run-with-idle-timer jit-lock-stealth-time t
+                                 'jit-lock-stealth-fontify)))
+
+    ;; Create, but do not activate, the idle timer for repeated
+    ;; stealth fontification.
+    (when (and jit-lock-stealth-time (null jit-lock-stealth-repeat-timer))
+      (setq jit-lock-stealth-repeat-timer (timer-create))
+      (timer-set-function jit-lock-stealth-repeat-timer
+                          'jit-lock-stealth-fontify '(t)))
+
+    ;; Init deferred fontification timer.
+    (when (and jit-lock-defer-time (null jit-lock-defer-timer))
+      (setq jit-lock-defer-timer
+            (run-with-idle-timer jit-lock-defer-time t
+                                 'jit-lock-deferred-fontify)))
+
+    ;; Initialize contextual fontification if requested.
+    (when (eq jit-lock-contextually t)
+      (unless jit-lock-context-timer
+        (setq jit-lock-context-timer
+              (run-with-idle-timer jit-lock-context-time t
+                                   'jit-lock-context-fontify)))
+      (setq jit-lock-context-unfontify-pos
+            (or jit-lock-context-unfontify-pos (point-max))))
+
+    ;; Setup our hooks.
+    (add-hook 'after-change-functions 'jit-lock-after-change nil t)
+    (add-hook 'fontification-functions 'jit-lock-function)))
+
+
+(provide 'polymode-common)
+
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-configuration.el b/emacs.d/elpa/polymode-20151216.533/polymode-configuration.el
new file mode 100644
index 0000000..749fe8a
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-configuration.el
@@ -0,0 +1,32 @@
+;; Examples of polymode configuration. Choose what suits your needs and place
+;; into your .emacs file.
+
+;;; MARKDOWN
+(add-to-list 'auto-mode-alist '("\\.md" . poly-markdown-mode))
+
+;;; ORG
+(add-to-list 'auto-mode-alist '("\\.org" . poly-org-mode))
+
+;;; R related modes
+(add-to-list 'auto-mode-alist '("\\.Snw" . poly-noweb+r-mode))
+(add-to-list 'auto-mode-alist '("\\.Rnw" . poly-noweb+r-mode))
+(add-to-list 'auto-mode-alist '("\\.Rmd" . poly-markdown+r-mode))
+(add-to-list 'auto-mode-alist '("\\.rapport" . poly-rapport-mode))
+(add-to-list 'auto-mode-alist '("\\.Rhtml" . poly-html+r-mode))
+(add-to-list 'auto-mode-alist '("\\.Rbrew" . poly-brew+r-mode))
+(add-to-list 'auto-mode-alist '("\\.Rcpp" . poly-r+c++-mode))
+(add-to-list 'auto-mode-alist '("\\.cppR" . poly-c++r-mode))
+
+;;; ERB modes
+(add-to-list 'auto-mode-alist '("\\.js.erb$" . poly-javascript-erb-mode))
+(add-to-list 'auto-mode-alist '("\\.coffee.erb$" . poly-coffee-erb-mode))
+(add-to-list 'auto-mode-alist '("\\.html.erb$" . poly-html-erb-mode))
+
+;;; Slim mode
+(add-to-list 'auto-mode-alist '("\\.slim$" . poly-slim-mode))
+
+;; Verilog
+(add-to-list 'auto-mode-alist '("\\.sv" . poly-verilog+perl-mode))
+(add-to-list 'auto-mode-alist '("\\.svh" . poly-verilog+perl-mode))
+
+(provide 'polymode-configuration)
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-export.el b/emacs.d/elpa/polymode-20151216.533/polymode-export.el
new file mode 100644
index 0000000..25c9064
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-export.el
@@ -0,0 +1,322 @@
+(require 'polymode-common)
+(require 'polymode-classes)
+
+(defgroup polymode-export nil
+  "Polymode Exporters"
+  :group 'polymode)
+
+(defcustom polymode-exporter-output-file-format "%s[exported]"
+  "Format of the exported files.
+%s is substituted with the current file name sans extension."
+  :group 'polymode-export
+  :type 'string)
+
+(defclass pm-exporter (pm-root)
+  ((from
+    :initarg :from
+    :initform '()
+    :type list
+    :custom list
+    :documentation
+    "Input specifications. A list of lists of the form (id reg doc commmand).
+	ID is the unique identifier of the spec. REG is a regexp
+	that is used to identify if current file can be exported
+	with this spec. DOC is a short help string shown during
+	interactive export. COMMMAND is the actual exporter
+	specific command. It can contain the following format
+	specs:
+
+	%i - replaced with the input file
+	%o - replaced with the ouput file
+        %O - replaced with the base output file name (no dir, no extension)
+	%t - replaced with the 4th element of the :to spec.
+     ")
+   (to
+    :initarg :to
+    :initform '() 
+    :type list
+    :custom list
+    :documentation
+    "Output specifications. A list of the list of the form (id ext doc %t-spec).
+	EXT is the *exact* extension (not a regexp) of the ouput
+	file. %t-spec is a string what is used to format :from
+	spec commmand.")
+   (function
+    :initarg :function
+    :initform (lambda (command from to)
+                (error "Function not defined for this exporter"))
+    :type (or symbol function)
+    :documentation
+    "Function to process the commmand. Must take 3 arguments
+     COMMAND, FROM-ID and TO-ID. COMMAND is the 4th argument
+     of :from spec with all the formats substituted. FROM-ID is
+     the id of requested :from spec, TO-ID is the id of the :to
+     spec."))
+  "Root exporter class.")
+
+(defclass pm-callback-exporter (pm-exporter)
+  ((callback
+    :initarg :callback
+    :initform (lambda (&optional rest)
+                (error "No callback defined for this exporter."))
+    :type (or symbol function)
+    :documentation
+    "Callback function to be called by :function when a shell
+    call is involved. There is no default callback."))
+  "Class to represent exporters that call processes spanned by
+  emacs. Callback should return the output file name.")
+
+(defclass pm-shell-exporter (pm-exporter)
+  ((function
+    :initform 'pm-default-shell-export-function)
+   (sentinel
+    :initarg :sentinel
+    :initform 'pm-default-export-sentinel
+    :type (or symbol function)
+    :documentation
+    "Sentinel function to be called by :function when a shell
+    call is involved. Sentinel should return the output file
+    name."))
+  "Class to represent exporters that call external processes.")
+
+
+;;; METHODS
+(defgeneric pm-export (exporter from to &optional ifile)
+  "Weave current FILE with EXPORTER.")
+
+(defmethod pm-export ((exporter pm-exporter) from to &optional ifile)
+  (let* ((from-spec (assoc from (oref exporter :from)))
+         (to-spec (assoc to (oref exporter :to)))
+         (ifile (or ifile (file-name-nondirectory buffer-file-name)))
+         (ofile (concat (format polymode-exporter-output-file-format
+                                (file-name-base ifile))
+                        "." (nth 1 to-spec)))
+         (command (format-spec (nth 3 from-spec)
+                               (list (cons ?i (shell-quote-argument ifile))
+                                     (cons ?o (shell-quote-argument ofile))
+                                     (cons ?O (shell-quote-argument
+                                               (file-name-base ofile)))
+                                     (cons ?t (nth 3 to-spec))))))
+    (unless to-spec
+      (error "'to' spec %s is not defined for this exporter '%s'"
+             to (pm--object-name exporter)))
+    ;; compunicate with sentinel and callback with local vars in order to
+    ;; avoid needless clutter
+    ;; fixme: use -hist
+    (set (make-local-variable 'pm--output-file) ofile)
+    (set (make-local-variable 'pm--input-file) ifile)
+    (message "Exporting '%s' with '%s' exporter ..."
+             (file-name-nondirectory ifile) (pm--object-name exporter))
+    (let ((ofile  (funcall (oref exporter :function) command from to)))
+      (and ofile (stringp ofile) (pm--display-file ofile)))))
+
+(defmacro pm--export-wrap-callback (slot)
+  ;; replace exporter's :sentinel or :callback temporally in order to display
+  ;; the output buffer
+  `(let ((sentinel1 (oref exporter ,slot)))
+     (condition-case err
+         (let ((sentinel2 `(lambda (proc name)
+                             (let ((efile (,sentinel1 proc name)))
+                               (pm--display-file efile)
+                               efile))))
+           (oset exporter ,slot sentinel2)
+           (call-next-method exporter from to ifile))
+       (error (oset exporter ,slot sentinel1)
+              (signal (car err) (cdr err))))
+     (oset exporter ,slot sentinel1)))
+
+(defmethod pm-export ((exporter pm-callback-exporter) from to &optional ifile)
+  (pm--export-wrap-callback :callback))
+
+(defmethod pm-export ((exporter pm-shell-exporter) from to &optional ifile)
+  (pm--export-wrap-callback :sentinel))
+
+
+;; UI
+(defvar pm--exporter-hist nil)
+(defvar pm--export:from-hist nil)
+(defvar pm--export:to-hist nil)
+(declare-function polymode-set-weaver "polymode-weave")
+(declare-function pm-weave "polymode-weave")
+
+(defun polymode-export (&optional from to)
+  "Export current file.
+
+FROM and TO are the from-id and to-id in the definition of the
+current exporter. If current exporter hasn't been set yet, call
+`polymode-set-exporter' before exporting.
+
+If called interactively with C-u argument, ask for the FROM type
+interactively, otherwise FROM and TO are determined automatically
+from the current exporter specification and current file
+extension.  See `pm-exporter' for the precise specification.
+
+If called interactively with C-u C-u argument, set new exporter
+first with `polymode-set-exporter'."
+  (interactive "P")
+  ;; todo: '(16) should allow for edditing :from command
+  (let* ((exporter (symbol-value
+                    (if (equal from '(16))
+                        (polymode-set-exporter)
+                      (or (oref pm/polymode :exporter)
+                          (polymode-set-exporter)))))
+         (fname (file-name-nondirectory buffer-file-name))
+         (e:from (oref exporter :from))
+         (e:to (oref exporter :to))
+         (from-opts (mapcar (lambda (el)
+                              (propertize (nth 2 el) :id (car el)))
+                            (oref exporter :from)))
+         (to-opts (mapcar (lambda (el)
+                            (propertize (format "%s (%s)" (nth 2 el) (nth 1 el))
+                                        :id (car el)))
+                          (oref exporter :to)))
+         (from
+          (cond ((or (null from) (equal from '(16)))
+                 (let ((case-fold-search  t))
+                   (or (and (pm--get-hist :export-from)
+                            (get-text-property 0 :id (pm--get-hist :export-from)))
+                       (car (cl-rassoc-if (lambda (el)
+                                            (string-match-p (car el) fname))
+                                          e:from))
+                       ;; guess from weaver and return a cons of (weaver-id . exporter-id)
+                       (let ((weaver (symbol-value (or (oref pm/polymode :weaver)
+                                                       (polymode-set-weaver)))))
+                         (cl-loop for w in (oref weaver :from-to)
+                                  ;; weaver intput extension matches the filename
+                                  if (string-match-p (nth 1 w) fname) 
+                                  return (cl-loop for e in e:from
+                                                  ;; input exporter extensnion matches weaver output extension
+                                                  if (string-match-p (nth 1 e) (concat "dummy." (nth 2 w)))
+                                                  return (cons (car w) (car e)))))
+                       (let* ((prompt (format "No input spec for extension '.%s' in '%s' exporter. Choose one: "
+                                              (file-name-extension fname)
+                                              (pm--object-name exporter)))
+                              (sel (ido-completing-read prompt from-opts nil t nil
+                                                        'pm--export:from-hist
+                                                        (pm--get-hist :export-from))))
+                         (pm--put-hist :export-from sel)
+                         (get-text-property 0 :id sel)))))
+                ;; C-u, force a :from spec
+                ((equal from '(4))
+                 (let ((sel (ido-completing-read "Input type: " from-opts nil t nil
+                                                 'pm--export:from-hist (pm--get-hist :export-from)) ))
+                   (pm--put-hist :export-from sel)
+                   (get-text-property 1 :id sel)))
+                ((stringp from)
+                 (if (assoc from e:from)
+                     from
+                   (error "Cannot find input spec '%s' in %s exporter"
+                          from (pm--object-name exporter))))
+                (t (error "'from' argument must be nil, universal argument or a string"))
+                ))
+         (to
+          (cond ((null to)
+                 (let ((sel (ido-completing-read "Export to: " to-opts nil t nil
+                                                 'pm--export:to-hist (pm--get-hist :export-to))))
+                   (pm--put-hist :export-to sel)
+                   (get-text-property 1 :id sel)))
+                ((stringp to)
+                 (if (assoc to e:to)
+                     to
+                   (error "Cannot find output spec '%s' in %s exporter"
+                          to (pm--object-name exporter))))
+                (t (error "'to' argument must be nil or a string")))))
+    (if (consp from)
+        ;; run through weaver
+        (pm-weave (symbol-value (oref pm/polymode :weaver)) (car from) (cons (cdr from) to))
+      (pm-export exporter from to))))
+
+(defmacro polymode-register-exporter (exporter default? &rest configs)
+  "Add EXPORTER to :exporters slot of all config objects in CONFIGS.
+When DEFAULT? is non-nil, also make EXPORTER the default exporter
+for each polymode in CONFIGS."
+  `(dolist (pm ',configs)
+     (object-add-to-list (symbol-value pm) :exporters ',exporter)
+     (when ,default? (oset (symbol-value pm) :exporter ',exporter))))
+
+(defun polymode-set-exporter ()
+  (interactive)
+  (unless pm/polymode
+    (error "No pm/polymode object found. Not in polymode buffer?"))
+  (let* ((exporters (pm--abrev-names
+                     (delete-dups (pm--oref-with-parents pm/polymode :exporters))
+                     "pm-exporter/"))
+         (sel (ido-completing-read "No default exporter. Choose one: " exporters nil t nil
+                                   'pm--exporter-hist (car pm--exporter-hist)))
+         (out (intern (get-text-property 0 :orig sel))))
+    (oset pm/polymode :exporter out)
+    out))
+
+
+;;; UTILS
+(defun pm-default-export-sentinel (process name)
+  "Default exporter sentinel."
+  (pm--run-command-sentinel process name "exporting"))
+
+(defun pm-default-shell-export-function (command from to)
+  "Run exporting command interactively.
+Run command in a buffer (in comint-shell-mode) so that it accepts
+user interaction. This is a default function in all exporters
+that call a shell command"
+  (pm--run-command command
+                   (oref (symbol-value (oref pm/polymode :exporter)) :sentinel)  
+                   "*polymode export*"
+                   (concat "Exporting " from "-->" to
+                           " with command:\n     " command "\n")))
+
+
+;;; GLOBAL EXPORTERS
+(defcustom pm-exporter/pandoc
+  (pm-shell-exporter "pandoc"
+               :from
+               '(;; ("json"	"\\.json\\'" "JSON native AST"	"pandoc %i -f json -t %t -o %o")
+                 ("markdown"	"\\.md\\'" "pandoc's markdown" 	"pandoc %i -f markdown -t %t -o %o")
+                 ("markdown_strict"	"\\.md\\'" "original markdown"	"pandoc %i -f markdown_strict -t %t -o %o")
+                 ("markdown_phpextra"	"\\.md\\'" "PHP markdown"	"pandoc %i -f markdown_phpextra -t %t -o %o")
+                 ("markdown_phpextra"	"\\.md\\'" "github markdown" 	"pandoc %i -f markdown_phpextra -t %t -o %o")
+                 ("textile"	"\\.textile\\'" "Textile" 		"pandoc %i -f textile -t %t -o %o")
+                 ("rst"		"\\.rst\\'" "reStructuredText"	"pandoc %i -f rst -t %t -o %o")
+                 ("html"	"\\.x?html?\\'" "HTML" 	"pandoc %i -f html -t %t -o %o")
+                 ("doocbook"	"\\.xml\\'" "DocBook" 		"pandoc %i -f doocbook -t %t -o %o")
+                 ("mediawiki"	"\\.wiki\\'" "MediaWiki"		"pandoc %i -f mediawiki -t %t -o %o")
+                 ("latex"	"\\.tex\\'" "LaTeX" 		"pandoc %i -f latex -t %t -o %o")
+                 )
+               :to
+               '(;; ("json"  	"json"  "JSON version of native AST" "json")
+                 ("plain"  	"txt"  "plain text" "plain")
+                 ("markdown"  	"md"  "pandoc's extended markdown" "markdown")
+                 ("markdown_strict"  	"md"  "original markdown" "markdown_strict")
+                 ("markdown_phpextra"  	"md"  "PHP extended markdown" "markdown_phpextra")
+                 ("markdown_github"  	"md"  "github extended markdown" "markdown_github")
+                 ("rst"  	"rst"  "reStructuredText" "rst")
+                 ("html"  	"html"  "XHTML 1" "html")
+                 ("html5"  	"html"  "HTML 5" "html5")
+                 ("latex"  	"tex"  "LaTeX" "latex")
+                 ("beamer"  	"tex"  "LaTeX beamer" "beamer")
+                 ("context"  	"tex"  "ConTeXt" "context")
+                 ("man"  	"man"  "groff man" "man")
+                 ("mediawiki"  	"wiki"  "MediaWiki markup" "mediawiki")
+                 ("textile"  	"textile"  "Textile" "textile")
+                 ("org"  	"org"  "Emacs Org-Mode" "org")
+                 ("texinfo"  	"info"  "GNU Texinfo" "texinfo")
+                 ("docbook"  	"xml"  "DocBook XML" "docbook")
+                 ("opendocument"  	"xml"  "OpenDocument XML" "opendocument")
+                 ("odt"  	"odt"  "OpenOffice text document" "odt")
+                 ("docx"  	"docx"  "Word docx" "docx")
+                 ("epub"  	"epub"  "EPUB book" "epub")
+                 ("epub3"  	"epub"  "EPUB v3" "epub3")
+                 ("fb2"  	"fb"  "FictionBook2 e-book" "fb2")
+                 ("asciidoc"  	"txt"  "AsciiDoc" "asciidoc")
+                 ("slidy"  	"html"  "Slidy HTML slide show" "slidy")
+                 ("slideous"  	"html"  "Slideous HTML slide show" "slideous")
+                 ("dzslides"  	"html"  "HTML5 slide show" "dzslides")
+                 ("s5"  	"html"  "S5 HTML slide show" "s5")
+                 ("rtf"  	"rtf"  "rich text format" "rtf")
+                 )
+               :function 'pm-default-shell-export-function
+               :sentinel 'pm-default-export-sentinel)
+  "Pandoc exporter"
+  :group 'polymode-export
+  :type 'object)
+
+(provide 'polymode-export)
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-methods.el b/emacs.d/elpa/polymode-20151216.533/polymode-methods.el
new file mode 100644
index 0000000..a8f1e1e
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-methods.el
@@ -0,0 +1,712 @@
+(require 'polymode-common)
+
+
+;;; INITIALIZATION
+(defgeneric pm-initialize (config)
+  "Initialize current buffer with CONFIG.
+
+First initialize the -hostmode and -innermodes slots of polymode
+object ...")
+
+(defmethod pm-initialize ((config pm-polymode))
+  ;; fixme: reinstalation leads to infloop of pm--fontify-region-original and others ...
+  ;; On startup with local auto vars emacs reinstals the mode twice .. waf?
+  ;; Temporary fix: don't install twice
+  (unless pm/polymode
+    (let* ((chunkmode (clone (symbol-value (oref config :hostmode))))
+           (_ (oset chunkmode -buffer (current-buffer)))
+           ;; set if nil, to allow unspecified host chunkmodes to be used in minor modes
+           (host-mode (or (oref chunkmode :mode)
+                          (oset chunkmode :mode major-mode))))
+      (unless (or (eq major-mode host-mode)
+                  (eq polymode-major-mode host-mode))
+        (let ((polymode-mode t)) ;;major-modes might check it
+          (funcall host-mode)))
+      ;; fixme: maybe: inconsistencies?
+      ;; 1)  not calling pm-install-buffer on host-buffer
+      ;; But, we are not creating/installing a new buffer here .. so it is a
+      ;; different thing .. and is probably ok
+      ;; 2)  not calling config's :minor-mode (polymode function).
+      ;; But polymode function calls pm-initialize... so I guess it is ok
+      (oset config -hostmode chunkmode)
+      (setq pm/polymode config)
+      (setq pm/chunkmode chunkmode)
+      (setq pm/type 'host)
+      (add-hook 'flyspell-incorrect-hook 'pm--flyspel-dont-highlight-in-chunkmodes nil t)
+      (prog1 (pm--setup-buffer) ; general setup for host and innermode buffers
+        (let ((PI pm/polymode) IFs)
+          ;; aggregate and run hooks; parents first
+          (while PI
+            (setq IFs (append (and (slot-boundp PI :init-functions) ; don't cascade
+                                   (oref PI :init-functions))
+                              IFs)
+                  PI (and (slot-boundp PI :parent-instance)
+                          (oref PI :parent-instance))))
+          (run-hooks 'IFs))))))
+
+(defmethod pm-initialize ((config pm-polymode-one))
+  (call-next-method)
+  (eval `(oset config -innermodes
+               (list (clone ,(oref config :innermode))))))
+
+(defmethod pm-initialize ((config pm-polymode-multi))
+  (call-next-method)
+  (oset config -innermodes
+        (mapcar (lambda (sub-name)
+                  (clone (symbol-value sub-name)))
+                (oref config :innermodes))))
+
+
+
+;;; BUFFERS
+(defgeneric pm-get-buffer (chunkmode &optional span-type)
+  "Get the indirect buffer associated with SUBMODE and
+SPAN-TYPE. Should return nil if buffer has not yet been
+installed. Also see `pm-get-span'.")
+
+(defmethod pm-get-buffer ((chunkmode pm-chunkmode) &optional type)
+  (oref chunkmode -buffer))
+
+(defmethod pm-get-buffer ((chunkmode pm-hbtchunkmode) &optional type)
+  (cond ((eq 'body type) (oref chunkmode -buffer))
+        ((eq 'head type) (oref chunkmode -head-buffer))
+        ((eq 'tail type) (oref chunkmode -tail-buffer))
+        (t (error "Don't know how to select buffer of type '%s' for chunkmode '%s' of class '%s'"
+                  type (pm--object-name chunkmode) (class-of chunkmode)))))
+
+(defgeneric pm-select-buffer (chunkmode span)
+  "Ask SUBMODE to select (make current) its indirect buffer
+corresponding to the type of the SPAN returned by
+`pm-get-span'.")
+
+(defmethod pm-select-buffer ((chunkmode pm-chunkmode) span)
+  "Select the buffer associated with SUBMODE.
+Install a new indirect buffer if it is not already installed. For
+this method to work correctly, SUBMODE's class should define
+`pm-install-buffer' and `pm-get-buffer' methods."
+  (let* ((type (car span))
+         (buff (pm-get-buffer chunkmode type)))
+    (unless (buffer-live-p buff)
+      (pm-install-buffer chunkmode type)
+      (setq buff (pm-get-buffer chunkmode type)))
+    (pm--select-buffer buff)))
+
+(defmethod pm-select-buffer ((chunkmode pm-hbtchunkmode) span)
+  (call-next-method)
+  (pm--transfer-vars-from-base))
+
+(defmethod pm-select-buffer ((config pm-polymode-multi-auto) &optional span)
+  ;; :fixme: pm-get-span on multi configs returns config as last object of
+  ;; span. That's freaking confusing.
+  (if (null (car span))
+      (pm-select-buffer (oref config -hostmode) span)
+    (let ((type (car span))
+          (proto (symbol-value (oref config :auto-innermode)))
+          chunkmode)
+      (save-excursion
+        (goto-char (cadr span))
+        (unless (eq type 'head)
+          (re-search-backward (oref proto :head-reg) nil 'noerr))
+        (let* ((str (or (and (oref proto :retriever-regexp)
+                             (re-search-forward (oref proto :retriever-regexp))
+                             (match-string-no-properties (oref proto :retriever-num)))
+                        (and (oref proto :retriever-function)
+                             (funcall (oref proto :retriever-function)))
+                        (error "retriever subexpression didn't match")))
+               (name (concat "auto-innermode:" str)))
+          (setq chunkmode
+                (or (loop for obj in (oref config -auto-innermodes)
+                          when  (equal name (object-name-string obj))
+                          return obj)
+                    (let ((new-obj (clone proto name
+                                          :mode (pm--get-mode-symbol-from-name str))))
+                      (object-add-to-list config '-auto-innermodes new-obj)
+                      new-obj)))))
+      (pm-select-buffer chunkmode span))))
+
+(defgeneric pm-install-buffer (chunkmode &optional type)
+  "Ask SUBMODE to install an indirect buffer corresponding to
+span TYPE. Should return newly installed/retrieved buffer.")
+
+(defmethod pm-install-buffer ((chunkmode pm-chunkmode) &optional type)
+  "Independently on the TYPE call `pm/create-indirect-buffer'
+create and install a new buffer in slot -buffer of SUBMODE."
+  (oset chunkmode -buffer
+        (pm--create-chunkmode-buffer-maybe chunkmode type)))
+
+(defmethod pm-install-buffer ((chunkmode pm-hbtchunkmode) type)
+  "Depending of the TYPE install an indirect buffer into
+slot -buffer of SUBMODE. Create this buffer if does not exist."
+  (pm--set-chunkmode-buffer chunkmode type
+                          (pm--create-chunkmode-buffer-maybe chunkmode type)))
+
+(defun pm--get-adjusted-background (prop)
+  ;; if > lighten on dark backgroun. Oposite on light.
+  (color-lighten-name (face-background 'default)
+                      (if (eq (frame-parameter nil 'background-mode) 'light)
+                          (- prop) ;; darken
+                        prop)))
+
+(defun pm--adjust-chunk-face (beg end face)
+  ;; propertize 'face of the region by adding chunk specific configuration
+  (interactive "r")
+  (when face
+    (with-current-buffer (current-buffer)
+      (let ((face (or (and (numberp face)
+                           (list (cons 'background-color
+                                       (pm--get-adjusted-background face))))
+                      face))
+            (pchange nil))
+        ;; (while (not (eq pchange end))
+        ;;   (setq pchange (next-single-property-change beg 'face nil end))
+        ;;   (put-text-property beg pchange 'face
+        ;;                      `(,face ,@(get-text-property beg 'face)))
+        ;;   (setq beg pchange))
+        (font-lock-prepend-text-property beg end 'face face)))))
+
+(defun pm--adjust-visual-line-mode (vlm)
+  (when (not (eq visual-line-mode vlm))
+    (if (null vlm)
+        (visual-line-mode -1)
+      (visual-line-mode 1))))
+
+;; move only in post-command hook, after buffer selection
+(defvar pm--can-move-overlays nil)
+(defun pm--move-overlays-to (new-buff)
+  (when pm--can-move-overlays
+    (mapc (lambda (o)
+            (move-overlay o (overlay-start o) (overlay-end o) new-buff))
+          (overlays-in 1 (1+ (buffer-size))))))
+
+(defun pm--transfer-vars-from-base ()
+  (let ((bb (pm/base-buffer)))
+    (dolist (var '(buffer-file-name))
+      (set var (buffer-local-value var bb)))))
+
+(defun pm--select-buffer (buffer)
+  (when (and (not (eq buffer (current-buffer)))
+             (buffer-live-p buffer))
+    (let ((point (point))
+          (window-start (window-start))
+          (visible (pos-visible-in-window-p))
+          (oldbuf (current-buffer))
+          (vlm visual-line-mode)
+          (ractive (region-active-p))
+          (mkt (mark t))
+          (bis buffer-invisibility-spec))
+      (pm--move-overlays-to buffer)
+      (switch-to-buffer buffer)
+      (setq buffer-invisibility-spec bis)
+      (pm--adjust-visual-line-mode vlm)
+      (bury-buffer oldbuf)
+      ;; fixme: wha tis the right way to do this ... activate-mark-hook?
+      (if (not ractive)
+          (deactivate-mark)
+        (set-mark mkt)
+        (activate-mark))
+      (goto-char point)
+      ;; Avoid the display jumping around.
+      (when visible
+        (set-window-start (get-buffer-window buffer t) window-start)))))
+
+(defun pm--setup-buffer (&optional buffer)
+  ;; General buffer setup, should work for indirect and base buffers
+  ;; alike. Assume pm/polymode and pm/chunkmode is already in place. Return
+  ;; the buffer.
+  (let ((buff (or buffer (current-buffer))))
+    (with-current-buffer buff
+      ;; Don't let parse-partial-sexp get fooled by syntax outside
+      ;; the chunk being fontified.
+
+      ;; font-lock, forward-sexp etc should see syntactic comments
+      ;; (set (make-local-variable 'parse-sexp-lookup-properties) t)
+
+      (set (make-local-variable 'font-lock-dont-widen) t)
+
+      (when pm--dbg-fontlock
+        (setq pm--fontify-region-original
+              font-lock-fontify-region-function)
+        (set (make-local-variable 'font-lock-fontify-region-function)
+             #'pm/fontify-region)
+        (setq pm--syntax-begin-function-original
+              syntax-begin-function)
+        (set (make-local-variable 'syntax-begin-function)
+             #'pm/syntax-begin-function))
+
+      (set (make-local-variable 'polymode-mode) t)
+
+      ;; Indentation should first narrow to the chunk.  Modes
+      ;; should normally just bind `indent-line-function' to
+      ;; handle indentation.
+      (when (and indent-line-function ; not that it should ever be nil...
+                 (oref pm/chunkmode :protect-indent-line))
+        (setq pm--indent-line-function-original indent-line-function)
+        (set (make-local-variable 'indent-line-function) 'pm-indent-line-dispatcher))
+
+      (add-hook 'kill-buffer-hook 'pm--kill-indirect-buffer t t)
+
+      (when pm--dbg-hook
+        (add-hook 'post-command-hook 'polymode-select-buffer nil t))
+      (object-add-to-list pm/polymode '-buffers (current-buffer)))
+    buff))
+
+(defvar-local pm--killed-once nil)
+(defun pm--kill-indirect-buffer ()
+  ;; find-alternate-file breaks (https://github.com/vspinu/polymode/issues/79)
+  (let ((base (buffer-base-buffer)))
+	(when  (and base (buffer-live-p base))
+	  ;; 'base' is non-nil in indirect buffers only
+	  (set-buffer-modified-p nil)
+	  (unless (buffer-local-value 'pm--killed-once base)
+		(with-current-buffer base
+		  (setq pm--killed-once t))
+		(kill-buffer base)))))
+
+(defvar pm--ib-prefix "")
+(defun pm--create-indirect-buffer (mode)
+  "Create indirect buffer with major MODE and initialize appropriately.
+
+This is a low lever function which must be called, one way or
+another from `pm/install' method. Among other things store
+`pm/polymode' from the base buffer (must always exist!) in
+the newly created buffer.
+
+Return newlly created buffer."
+  (unless   (buffer-local-value 'pm/polymode (pm/base-buffer))
+    (error "`pm/polymode' not found in the base buffer %s" (pm/base-buffer)))
+
+  (setq mode (pm--get-available-mode mode))
+
+  (with-current-buffer (pm/base-buffer)
+    (let* ((config (buffer-local-value 'pm/polymode (current-buffer)))
+           (new-name
+            (generate-new-buffer-name
+             (format "%s%s[%s]" pm--ib-prefix (buffer-name)
+                     (replace-regexp-in-string "-mode" "" (symbol-name mode)))))
+           (new-buffer (make-indirect-buffer (current-buffer)  new-name))
+           ;; (hook pm/indirect-buffer-hook)
+           (file (buffer-file-name))
+           (base-name (buffer-name))
+           (jit-lock-mode nil)
+           (coding buffer-file-coding-system))
+
+      (with-current-buffer new-buffer
+        (let ((polymode-mode t)) ;;major-modes might check it
+          (funcall mode))
+
+        ;; hopefully temporary hack:
+        (pm--activate-jit-lock-mode-maybe)
+
+        (setq polymode-major-mode mode)
+        ;; Avoid the uniqified name for the indirect buffer in the mode line.
+        (when pm--dbg-mode-line
+          (setq mode-line-buffer-identification
+                (propertized-buffer-identification base-name)))
+        (setq pm/polymode config)
+        (setq buffer-file-coding-system coding)
+        (setq buffer-file-name file)
+        (vc-find-file-hook))
+      new-buffer)))
+
+
+;;; SPAN MANIPULATION
+(defgeneric pm-get-span (chunkmode &optional pos)
+  "Ask the CHUNKMODE for the span at point.
+Return a list of three elements (TYPE BEG END OBJECT) where TYPE
+is a symbol representing the type of the span surrounding
+POS (head, tail, body). BEG and END are the coordinates of the
+span. OBJECT is a sutable object which is 'responsable' for this
+span. This is an object that could be dispached upon with
+`pm-select-buffer',  .. (fixme: complete this list).
+
+Should return nil if there is no SUBMODE specific span around POS.")
+
+(defmethod pm-get-span (chunkmode &optional pos)
+  "Simply return nil. Base mode usually do not compute the span."
+  nil)
+
+(defmethod pm-get-span ((config pm-polymode) &optional pos)
+  "Apply pm-get-span on every element of chunkmodes slot of config object.
+Return a cons (chunkmode . span), for which START is closest to
+POS (and before it); i.e. the innermost span.  POS defaults to
+point."
+  (save-restriction
+    (widen)
+    ;; fixme: host should be last, to take advantage of the chunkmodes computation
+    (let* ((smodes (cons (oref config -hostmode)
+                         (oref config -innermodes)))
+           (start (point-min))
+           (end (point-max))
+           (pos (or pos (point)))
+           (span (list nil start end nil))
+           val)
+
+      (dolist (sm smodes)
+        (setq val (pm-get-span sm pos))
+        (when (and val
+                   (or (> (nth 1 val) start)
+                       (< (nth 2 val) end)))
+          (if (or (car val)
+                  (null span))
+              (setq span val
+                    start (nth 1 val)
+                    end (nth 2 val))
+            ;; nil car means outer chunkmode (usually host). And it can be an
+            ;; intersection of spans returned by 2 different neighbour inner
+            ;; chunkmodes. See rapport mode for an example
+            (setq start (max (nth 1 val)
+                             (nth 1 span))
+                  end (min (nth 2 val)
+                           (nth 2 span)))
+            (setcar (cdr span) start)
+            (setcar (cddr span) end))))
+
+      (unless (and (<= start end) (<= pos end) (>= pos start))
+        (error "Bad polymode selection: span:%s pos:%s"
+               (list start end) pos))
+      (when (null (car span)) ; chunkmodes can compute the host span by returning nil
+        (setcar (last span) (oref config -hostmode)))
+      span)))
+
+;; No need for this one so far. Basic method iterates through -innermodes
+;; anyhow.
+;; (defmethod pm-get-span ((config pm-polymode-multi) &optional pos))
+
+(defmethod pm-get-span ((config pm-polymode-multi-auto) &optional pos)
+  (let ((span-other (call-next-method))
+        (proto (symbol-value (oref config :auto-innermode))))
+    (if (oref proto :head-reg)
+        (let ((span (pm--span-at-point (oref proto :head-reg)
+                                       (oref proto :tail-reg)
+                                       pos)))
+          (if (and span-other
+                   (or (> (nth 1 span-other) (nth 1 span))
+                       (< (nth 2 span-other) (nth 2 span))))
+              ;; treat intersections with the host mode
+              (if (car span-other)
+                  span-other ;not host
+                ;; here, car span should better be nil; no explicit check
+                (setcar (cdr span-other) (max (nth 1 span-other) (nth 1 span)))
+                (setcar (cddr span-other) (min (nth 2 span-other) (nth 2 span)))
+                span-other)
+            (append span (list config)))) ;fixme: this returns config as last object
+      span-other)))
+
+(defmethod pm-get-span ((chunkmode pm-hbtchunkmode) &optional pos)
+  "Return a list of the form (TYPE POS-START POS-END SELF).
+TYPE can be 'body, 'head or 'tail. SELF is just a chunkmode object
+in this case."
+  (with-slots (head-reg tail-reg head-mode tail-mode) chunkmode
+    (let* ((span (pm--span-at-point head-reg tail-reg pos))
+           (type (car span)))
+      (when (or (and (eq type 'head) (eq head-mode 'host))
+                (and (eq type 'tail) (or (eq tail-mode 'host)
+                                         (and (null tail-mode)
+                                              (eq head-mode 'host)))))
+        (setcar span nil))
+      (append span (list chunkmode)))))
+
+(defmacro pm-create-indented-block-matchers (name regex)
+  "Defines 2 functions, each return a list of the start and end points of the
+HEAD and TAIL portions of an indented block of interest, via some regex.
+You can then use these functions in the defcustom pm-inner modes.
+
+e.g.
+(pm-create-indented-block-matchers 'slim-coffee' \"^[^ ]*\\(.*:? *coffee: *\\)$\")
+
+creates the functions
+
+pm-slim-coffee-head-matcher
+pm-slim-coffee-tail-matcher
+
+In the example below,
+
+The head matcher will match against 'coffee:', returning the positions of the
+start and end of 'coffee:'
+The tail matcher will return a list (n, n) of the final characters is the block.
+
+    |<----- Uses this indentation to define the left edge of the 'block'
+    |
+    |<--->|  This region is higlighted by the :head-mode in the block-matchers
+    |     |
+    |     |<----- the head matcher uses this column as the end of the head
+    |     |
+----:-----:-------------- example file -----------------------------------------
+1|  :     :
+2|  coffee:
+3|    myCoffeeCode()
+4|    moreCode ->
+5|      do things
+6|              :
+7|  This is no longer in the block
+8|              :
+----------------:---------------------------------------------------------------
+            --->|<----- this region of 0 width is highlighted by the :tail-mode
+                        the 'block' ends after this column on line 5
+
+
+All the stuff after the -end- of the head and before the start of the tail is
+sent to the new mode for syntax highlighting."
+  (let* ((head-name (intern (format "pm-%s-head-matcher" name)))
+         (tail-name (intern (format "pm-%s-tail-matcher" name))))
+    `(progn
+       (defun ,head-name (ahead)
+         (when (re-search-forward ,regex nil t ahead)
+           (cons (match-beginning 1) (match-end 1))))
+
+       (defun ,tail-name (ahead)
+         (save-excursion
+           ;; (cons (point-max) (point-max)))))))
+           (goto-char (car (,head-name 1)))
+           (let* ((block-col (current-indentation))
+                  (posn (catch 'break
+                          (while (not (eobp))
+                            (forward-line 1)
+                            (when (and (<= (current-indentation) block-col)
+                                       (not (progn
+                                              (beginning-of-line)
+                                              (looking-at "^[[:space:]]*$"))))
+                              (throw 'break (point-at-bol))))
+                          (throw 'break (point-max)))))
+             (cons posn posn)))))))
+
+(defun pm--default-matcher (reg ahead)
+  (if (< ahead 0)
+      (if (re-search-backward reg nil t)
+          (cons (match-beginning 0) (match-end 0)))
+    (if (re-search-forward reg nil t)
+        (cons (match-beginning 0) (match-end 0)))))
+
+;; fixme: there should be a simpler way... check the code and document
+(defun pm--span-at-point-fun-fun (hd-matcher tl-matcher)
+  (save-excursion
+    (let ((pos (point))
+          (posh (funcall hd-matcher -1)))
+      (if (null posh)
+          ;; special first chunk
+          (let ((posh1 (progn (goto-char (point-min))
+                              (funcall hd-matcher 1))))
+            (if (and posh1
+                     (<= (car posh1) pos)
+                     (< pos (cdr posh1)))
+                (list 'head (car posh1) (cdr posh1))
+              (list nil (point-min) (or (car posh1)
+                                        (point-max)))))
+        (let ((post (progn (goto-char (car posh))
+                           (or (funcall tl-matcher 1)
+                               (cons (point-max) (point-max))))))
+          (if (and (<= (cdr posh) pos)
+                   (< pos (car post)))
+              (list 'body (cdr posh) (car post))
+            (if (and (<= (car post) pos)
+                     (< pos (cdr post)))
+                (list 'tail (car post) (cdr post))
+              (if (< pos (cdr post))
+                  ;; might be in the head
+                  (progn
+                    (goto-char (car post))
+                    (let ((posh1 (funcall hd-matcher -1)))
+                      (if (and (<= (car posh1) pos)
+                               (< pos (cdr posh1)))
+                          (list 'head (car posh1) (cdr posh1))
+                        (list nil (cdr posh) (car posh1))))) ;; posh is point min, fixme: not true anymore?
+                (goto-char (cdr post))
+                (let ((posh1 (or (funcall hd-matcher 1)
+                                 (cons (point-max) (point-max)))))
+                  (if (and posh
+                           (<= (car posh1) pos )
+                           (< pos (cdr posh1)))
+                      (list 'head (car posh1) (cdr posh1))
+                    (list nil (cdr post) (car posh1))))))))))))
+
+(defun pm--span-at-point-reg-reg (head-matcher tail-matcher)
+  ;; Guaranteed to produce non-0 length spans. If no span has been found
+  ;; (head-matcher didn't match) return (nil (point-min) (point-max)).
+
+  ;; xxx1 relate to the first ascending search
+  ;; xxx2 relate to the second descending search
+  (save-excursion
+    (let* ((pos (point))
+		   
+		   (head1-beg (and (re-search-backward head-matcher nil t)
+						   (match-beginning 0)))
+		   (head1-end (and head1-beg (match-end 0))))
+	  
+	  (if head1-end
+		  ;; we know that (>= pos head1-end)
+		  ;;            -----------------------
+		  ;; host](head)[body](tail)[host](head)
+		  (let* ((tail1-beg (and (goto-char head1-end)
+								 (re-search-forward tail-matcher nil t)
+								 (match-beginning 0)))
+				 (tail1-end (and tail1-beg (match-end 0)))
+				 (tail1-beg (or tail1-beg (point-max)))
+				 (tail1-end (or tail1-end (point-max))))
+
+			(if (or (< pos tail1-end)
+					(= tail1-end (point-max)))
+				(if (<= pos tail1-beg)
+					;;            ------
+					;; host](head)[body](tail)[host](head))
+					(list 'body head1-end tail1-beg)
+				  ;;                  -----
+				  ;; host](head](body](tail)[host](head)
+				  (list 'tail tail1-beg tail1-end))
+			  
+			  ;;                        ------------
+			  ;; host](head](body](tail)[host](head)
+			  (let* ((head2-beg (or (and (re-search-forward head-matcher nil t)
+										 (match-beginning 0))
+									(point-max))))
+				(if (<= pos head2-beg)
+					;;                        ------
+					;; host](head](body](tail)[host](head)
+					(list nil tail1-end head2-beg)
+				  ;;                              ------
+				  ;; host](head](body](tail)[host](head)
+				  (list 'head head2-beg (match-end 0))))))
+
+		;; -----------
+		;; host](head)[body](tail)[host
+		(let ((head2-beg (and (goto-char (point-min))
+							  (re-search-forward head-matcher nil t)
+							  (match-beginning 0))))
+
+		  (if (null head2-beg)
+			  ;; no span found
+			  (list nil (point-min) (point-max))
+			
+			(if (<= pos head2-beg)
+				;; -----
+				;; host](head)[body](tail)[host
+				(list nil (point-min) head2-beg)
+			  ;;      ------
+			  ;; host](head)[body](tail)[host
+			  (list 'head head2-beg (match-end 0)))))))))
+
+(defun pm--span-at-point (head-matcher tail-matcher &optional pos)
+  "Basic span detector with head/tail.
+
+Either of HEAD-MATCHER and TAIL-MATCHER can be a regexp or a
+function. When a function the matcher must accept one argument
+that can take either values 1 (forwards search) or -1 (backward
+search). This function must return either nil (no match) or
+a (cons BEG END) representing the span of the head or tail
+respectively. See `pm--default-matcher' for an example.
+
+Return (type span-start span-end) where type is one of the
+follwoing symbols:
+
+nil	  - pos is between point-min and head-reg, or between tail-reg and point-max
+body  - pos is between head-reg and tail-reg (exclusively)
+head  - head span
+tail  - tail span"
+  ;; ! start of the span is part of the span !
+  (save-restriction
+    (widen)
+    (goto-char (or pos (point)))
+    (cond ((and (stringp head-matcher)
+                (stringp tail-matcher))
+           (pm--span-at-point-reg-reg head-matcher tail-matcher))
+          ((and (stringp head-matcher)
+                (functionp tail-matcher))
+           (pm--span-at-point-fun-fun
+            (lambda (ahead) (pm--default-matcher head-matcher ahead))
+            tail-matcher))
+          ((and (functionp head-matcher)
+                (stringp tail-matcher))
+           (pm--span-at-point-fun-fun
+            head-matcher
+            (lambda (ahead) (pm--default-matcher tail-matcher ahead))))
+          ((and (functionp head-matcher)
+                (functionp tail-matcher))
+           (pm--span-at-point-fun-fun head-matcher tail-matcher))
+          (t (error "head and tail matchers should be either regexp strings or functions")))))
+
+
+;;; INDENT
+
+(defun pm-indent-line-dispatcher ()
+  "Dispatch methods indent methods on current span."
+  (let ((span (pm/get-innermost-span)))
+    (pm-indent-line (car (last span)) span)))
+
+(defgeneric pm-indent-line (&optional chunkmode span)
+  "Indent current line.
+Protect and call original indentation function associated with
+the chunkmode.")
+
+(defun pm--indent-line (span)
+  ;; istr is auto-indent string
+  (unwind-protect
+      (save-restriction
+        (pm--comment-region  1 (nth 1 span))
+        (pm/narrow-to-span span)
+        (funcall pm--indent-line-function-original))
+    (pm--uncomment-region 1 (nth 1 span))))
+
+(defmethod pm-indent-line ((chunkmode pm-chunkmode) &optional span)
+  (pm--indent-line span))
+
+(defmethod pm-indent-line ((chunkmode pm-hbtchunkmode) &optional span)
+  "Indent line in inner chunkmodes.
+When point is at the beginning of head or tail, use parent chunk
+to indent."
+  ;; sloppy work:
+  ;; Assumes multiline chunks and single-line head/tail.
+  ;; Assumes current buffer is the correct buffer.
+  (let ((pos (point))
+        shift delta)
+    (cond ((or (eq 'head (car span))
+               (eq 'tail (car span)))
+           ;; use parent's indentation function in head and tail
+           (back-to-indentation)
+           (setq delta (- pos (point)))
+           (backward-char)
+           (let ((parent-span (pm/get-innermost-span)))
+             (pm-select-buffer (car (last parent-span)) parent-span)
+             (forward-char)
+             (pm--indent-line parent-span)
+             (when (eq 'tail (car span))
+               (setq shift (pm--get-head-shift parent-span))
+               (indent-to (+ shift (- (point) (point-at-bol))))))
+           (if (> delta 0)
+               (goto-char (+ (point) delta))))
+          (t
+           (setq shift (pm--get-head-shift span))
+           (pm--indent-line span)
+           (when (= (current-column) 0)
+             (setq shift (+ shift (oref chunkmode :indent-offset))))
+           (setq delta (- (point) (point-at-bol)))
+           (beginning-of-line)
+           (indent-to shift)
+           (goto-char (+ (point) delta))))))
+
+;; fixme: This one is nowhere used?
+(defmethod pm-indent-line ((chunkmode pm-polymode-multi-auto) &optional span)
+  (pm-select-buffer chunkmode span)
+  (pm-indent-line pm/chunkmode span))
+
+(defun pm--get-head-shift (span)
+  (save-excursion
+    (goto-char (cadr span))
+    (back-to-indentation)
+    (- (point) (point-at-bol))))
+
+
+
+;;; FACES
+(defgeneric pm-get-adjust-face (chunkmode &optional type))
+(defmethod pm-get-adjust-face ((chunkmode pm-chunkmode) &optional type)
+  (oref chunkmode :adjust-face))
+(defmethod pm-get-adjust-face ((chunkmode pm-hbtchunkmode) &optional type)
+  (setq type (or type pm/type))
+  (cond ((eq type 'head)
+         (oref chunkmode :head-adjust-face))
+        ((eq type 'tail)
+         (if (eq 'head (oref pm/chunkmode :tail-adjust-face))
+             (oref pm/chunkmode :head-adjust-face)
+           (oref pm/chunkmode :tail-adjust-face)))
+        (t (oref pm/chunkmode :adjust-face))))
+
+(provide 'polymode-methods)
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-pkg.el b/emacs.d/elpa/polymode-20151216.533/polymode-pkg.el
new file mode 100644
index 0000000..9870e73
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-pkg.el
@@ -0,0 +1,6 @@
+(define-package "polymode" "20151216.533" "Versatile multiple modes with extensive literate programming support"
+  '((emacs "24"))
+  :url "https://github.com/vitoshka/polymode")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/polymode-20150523.1626/polymode-tangle.el b/emacs.d/elpa/polymode-20151216.533/polymode-tangle.el
similarity index 100%
rename from emacs.d/elpa/polymode-20150523.1626/polymode-tangle.el
rename to emacs.d/elpa/polymode-20151216.533/polymode-tangle.el
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode-weave.el b/emacs.d/elpa/polymode-20151216.533/polymode-weave.el
new file mode 100644
index 0000000..ffd2655
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode-weave.el
@@ -0,0 +1,232 @@
+;;  -*- lexical-binding: t -*-
+(require 'polymode-common)
+(require 'polymode-classes)
+
+(defgroup polymode-weave nil
+  "Polymode Weavers"
+  :group 'polymode)
+
+(defcustom polymode-weave-output-file-format "%s[woven]"
+  "Format of the weaved files.
+%s is substituted with the current file name sans extension."
+  :group 'polymode-weave
+  :type 'string)
+
+(defclass pm-weaver (pm-root)
+  ((from-to
+    :initarg :from-to
+    :initform '()
+    :type list
+    :custom list
+    :documentation
+    "Input specifications. A list of lists of the form
+
+          (id reg-from ext-to doc commmand)
+
+     ID is the unique identifier of the spec. REG-FROM is a regexp
+     that is used to identify if current file can be weaved with this
+     spec. EXT-TO is the *exact* (not regexp) extension of the output
+     file. DOC is a short help string shown during interactive
+     weaving. COMMMAND is the actual weaver specific command. It can
+     contain the following format specs:
+	%i - replaced with the input file
+	%o - replaced with the ouput file.
+        %O - replaced with the base output file name (no dir, no extension)")
+   (function
+    :initarg :function
+    :initform (lambda (command id)
+                (error "No weaving function declared for this weaver"))
+    :type (or symbol function)
+    :documentation
+    "Function to process the commmand. Must take 2 arguments
+     COMMAND, ID. COMMAND is the 5th argument of :from spec with
+     all the formats substituted. ID is the id of requested :from
+     spec."))
+  "Root weaver class.")
+
+(defclass pm-callback-weaver (pm-weaver)
+  ((callback
+    :initarg :callback
+    :initform (lambda (&optional rest)
+                (error "No callback defined for this weaver."))
+    :type (or symbol function)
+    :documentation
+    "Callback function to be called by :function when a shell
+    call is involved. There is no default callback."))
+  "Class to represent weavers that call processes spanned by
+  emacs. Callback should return the output file name.")
+
+(defclass pm-shell-weaver (pm-weaver)
+  ((function
+    :initform 'pm-default-shell-weave-function)
+   (sentinel
+    :initarg :sentinel
+    :initform 'pm-default-shell-weave-sentinel
+    :type (or symbol function)
+    :documentation
+    "Sentinel function to be called by :function when a shell
+    call is involved. Sentinel must return the output file
+    name."))
+  "Class for weavers that call external processes.")
+
+
+;;; METHODS
+(defgeneric pm-weave (weaver from-to &optional export ifile)
+  "Weave current FILE with WEAVER.
+EXPORT must be a list of the form (FROM TO) sutable for call of
+`polymode-export'. If EXPORT is provided corresponding
+exporter (from to) specification will be called.")
+
+(declare-function pm-export "polymode-export")
+(defmethod pm-weave ((weaver pm-weaver) from-to &optional export ifile)
+  (let ((from-to-spec (assoc from-to (oref weaver :from-to))))
+    (if from-to-spec
+        (let* ((ofile (concat (format polymode-weave-output-file-format
+                                      (file-name-base buffer-file-name))
+                              "." (nth 2 from-to-spec)))
+               (ifile (or ifile
+                          (file-name-nondirectory buffer-file-name)))
+               (command (format-spec (nth 4 from-to-spec)
+                                     (list (cons ?i ifile)
+                                           (cons ?O (file-name-base ofile))
+                                           (cons ?o ofile)))))
+          ;; compunicate with sentinel and callback with local vars in order to
+          ;; avoid needless clutter
+          (set (make-local-variable 'pm--output-file) ofile)
+          (set (make-local-variable 'pm--input-file) ifile)
+          (message "Weaving '%s' with '%s' weaver ..."
+                   (file-name-nondirectory ifile) (pm--object-name weaver))
+          (let ((wfile (funcall (oref weaver :function) command from-to)))
+            (when wfile 
+              (if export    
+                  (pm-export (symbol-value (oref pm/polymode :exporter))
+                             (car export) (cdr export) wfile)
+                ;; display the file only when the worker returns the
+                ;; file. Sentinel and callback based weavers return nil.
+                (pm--display-file wfile)
+                wfile))))
+      (error "from-to spec '%s' is not supported by weaver '%s'"
+             from-to (pm--object-name weaver)))))
+
+;; fixme: re-factor into closure
+(defmacro pm--weave-wrap-callback (slot)
+  ;; replace weaver :sentinel or :callback temporally in order to export as a
+  ;; followup step or display the result
+  `(let ((sentinel1 (oref weaver ,slot)))
+    (condition-case err
+        (let ((sentinel2 (if export
+                             `(lambda (proc name)
+                                (let ((wfile (,sentinel1 proc name)))
+                                  ;; fixme: we don't return file here
+                                  (pm-export (symbol-value ',(oref pm/polymode :exporter))
+                                             ,(car export) ,(cdr export)
+                                             wfile)))
+                           `(lambda (proc name)
+                              (let ((wfile (expand-file-name (,sentinel1 proc name),
+							     ,default-directory)))
+                                (pm--display-file wfile)
+                                wfile)))))
+          (oset weaver ,slot sentinel2)
+          ;; don't pass EXPORT argument, it is called from sentinel 
+          (call-next-method weaver from-to nil ifile))
+      (error (oset weaver ,slot sentinel1)
+             (signal (car err) (cdr err))))
+    (oset weaver ,slot sentinel1)))
+
+(defmethod pm-weave ((weaver pm-shell-weaver) from-to &optional export ifile)
+  (pm--weave-wrap-callback :sentinel))
+
+(defmethod pm-weave ((weaver pm-callback-weaver) from-to &optional export ifile)
+  (pm--weave-wrap-callback :callback))
+
+
+;; UI
+(defvar pm--weaver-hist nil)
+(defvar pm--weave:from-to-hist nil)
+
+(defun polymode-weave (&optional from-to)
+  "todo:
+See `pm-weave' generic.
+FROM-TO ignored as yet"
+  (interactive "P")
+  (let* ((weaver (symbol-value (or (oref pm/polymode :weaver)
+                                   (polymode-set-weaver))))
+         (w:from-to (oref weaver :from-to))
+         (opts (mapcar (lambda (el)
+                         (propertize (format "%s" (nth 3 el)) :id (car el)))
+                       w:from-to))
+         (wname (pm--object-name weaver))
+         (from-to
+          (cond ((null from-to)
+                 (let ((fname (file-name-nondirectory buffer-file-name))
+                       (hist-from-to (pm--get-hist :weave-from-to))
+                       (case-fold-search t))
+                   (or (and hist-from-to
+                            (get-text-property 0 :id  hist-from-to))
+                       (car (cl-rassoc-if (lambda (el)
+                                            ;; (dbg (car el) fname)
+                                            (string-match-p (car el) fname))
+                                          w:from-to))
+                       (let* ((prompt (format "No intpu-output spec for extension '.%s' in '%s' weaver. Choose one: "
+                                              (file-name-extension fname)
+                                              wname))
+                              (sel (ido-completing-read prompt opts nil t nil
+                                                        'pm--weave:from-to-hist
+                                                        (pm--get-hist :weave-from-to))))
+                         (pm--put-hist :weave-from-to sel)
+                         (get-text-property 0 :id sel)))))
+                ;; C-u, force a :from-to spec
+                ((equal from-to '(4))
+                 (let ((sel (ido-completing-read "Input type: " opts nil t nil
+                                                 'pm--weave:from-to-hist
+                                                 (pm--get-hist :weave-from-to)) ))
+                   (pm--put-hist :weave-from-to sel)
+                   (get-text-property 0 :id sel)))
+                ((stringp from-to)
+                 (if (assoc from-to w:from-to)
+                     from-to
+                   (error "Cannot find input-output spec '%s' in %s weaver" from-to wname)))
+                (t (error "'from-to' argument must be nil, universal argument or a string")))))
+    (pm-weave weaver from-to)))
+
+(defmacro polymode-register-weaver (weaver default? &rest configs)
+  "Add WEAVER to :weavers slot of all config objects in CONFIGS.
+When DEFAULT? is non-nil, also make weaver the default WEAVER for
+each polymode in CONFIGS."
+  `(dolist (pm ',configs)
+     (object-add-to-list (symbol-value pm) :weavers ',weaver)
+     (when ,default? (oset (symbol-value pm) :weaver ',weaver))))
+
+(defun polymode-set-weaver ()
+  (interactive)
+  (unless pm/polymode
+    (error "No pm/polymode object found. Not in polymode buffer?"))
+  (let* ((weavers (pm--abrev-names
+                     (delete-dups (pm--oref-with-parents pm/polymode :weavers))
+                     "pm-weaver/"))
+         (sel (ido-completing-read "No default weaver. Choose one: " weavers nil t nil
+                                   'pm--weaver-hist (car pm--weaver-hist)))
+         (out (intern (get-text-property 0 :orig sel))))
+    (oset pm/polymode :weaver out)
+    out))
+
+
+
+;; UTILS
+(defun pm-default-shell-weave-sentinel (process name)
+  "Default weaver sentinel."
+  (pm--run-command-sentinel process name "weaving"))
+
+(defun pm-default-shell-weave-function (command from-to)
+  "Run weaving command interactively.
+Run command in a buffer (in comint-shell-mode) so that it accepts
+user interaction. This is a default function in all weavers
+that call a shell command"
+  (pm--run-command command
+                   (oref (symbol-value (oref pm/polymode :weaver))
+                         :sentinel)  
+                   "*polymode weave*"
+                   (concat "weaving " from-to " with command:\n     "
+                           command "\n")))
+
+(provide 'polymode-weave)
diff --git a/emacs.d/elpa/polymode-20151216.533/polymode.el b/emacs.d/elpa/polymode-20151216.533/polymode.el
new file mode 100644
index 0000000..3aaea0e
--- /dev/null
+++ b/emacs.d/elpa/polymode-20151216.533/polymode.el
@@ -0,0 +1,706 @@
+;;; polymode.el --- Versatile multiple modes with extensive literate programming support 
+;;
+;; Filename: polymode.el
+;; Author: Spinu Vitalie
+;; Maintainer: Spinu Vitalie
+;; Copyright (C) 2013-2014, Spinu Vitalie, all rights reserved.
+;; Version: 1.0
+;; Package-Requires: ((emacs "24"))
+;; URL: https://github.com/vitoshka/polymode
+ ;; Keywords: emacs
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This file is *NOT* part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 3, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Commentary:
+;;
+;;  Extensible, fast, objected-oriented multimode specifically designed for
+;;  literate programming. Extensible support for weaving, tangling and export.
+;; 
+;;   Usage: https://github.com/vitoshka/polymode
+;;   
+;;   Design new polymodes: https://github.com/vitoshka/polymode/tree/master/modes
+;;
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;; Code:
+
+(require 'polymode-common)
+(require 'polymode-classes)
+(require 'polymode-methods)
+(require 'polymode-export)
+(require 'polymode-weave)
+;; load all core polymode and host objects
+(require 'poly-base)
+
+(defgroup polymode nil
+  "Object oriented framework for multiple modes based on indirect buffers"
+  :link '(emacs-commentary-link "polymode")
+  :group 'tools)
+
+(defgroup polymodes nil
+  "Polymode Configuration Objects"
+  :group 'polymode)
+
+(defgroup hostmodes nil
+  "Polymode Host Chunkmode Objects"
+  :group 'polymode)
+
+(defgroup innermodes nil
+  "Polymode Chunkmode Objects"
+  :group 'polymode)
+
+(defvar polymode-select-mode-hook nil ;; not used yet
+  "Hook run after a different mode is selected.")
+
+(defvar polymode-indirect-buffer-hook nil ;; not used yet
+  "Hook run by `pm/install-mode' in each indirect buffer.
+It is run after all the indirect buffers have been set up.")
+
+(defcustom polymode-prefix-key "\M-n"
+  "Prefix key for the polymode mode keymap.
+Not effective after loading the polymode library."
+  :group 'polymode
+  :type '(choice string vector))
+
+(defvar polymode-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map polymode-prefix-key
+      (let ((map (make-sparse-keymap)))
+        ;; navigation
+	(define-key map "\C-n" 'polymode-next-chunk)
+	(define-key map "\C-p" 'polymode-previous-chunk)
+        (define-key map "\C-\M-n" 'polymode-next-chunk-same-type)
+	(define-key map "\C-\M-p" 'polymode-previous-chunk-same-type)
+        ;; chunk manipulation
+        (define-key map "\M-k" 'polymode-kill-chunk)
+        (define-key map "\M-m" 'polymode-mark-or-extend-chunk)
+        (define-key map "\C-t" 'polymode-toggle-chunk-narrowing)
+	(define-key map "\M-i" 'polymode-insert-new-chunk)
+        ;; backends
+        (define-key map "e" 'polymode-export)
+        (define-key map "E" 'polymode-set-exporter)
+        (define-key map "w" 'polymode-weave)
+        (define-key map "W" 'polymode-set-weaver)
+        (define-key map "t" 'polymode-tangle)
+        (define-key map "T" 'polymode-set-tangler)
+        (define-key map "$" 'polymode-show-process-buffer)
+        ;; todo: add polymode-goto-process-buffer
+	map))
+    (define-key map [menu-bar Polymode]
+      (cons "Polymode"
+	    (let ((map (make-sparse-keymap "Polymode")))
+              (define-key-after map [next]
+		'(menu-item "Next chunk" polymode-next-chunk))
+	      (define-key-after map [previous]
+		'(menu-item "Previous chunk" polymode-previous-chunk))
+              (define-key-after map [next-same]
+	        '(menu-item "Next chunk same type" polymode-next-chunk-same-type))
+	      (define-key-after map [previous-same]
+	        '(menu-item "Previous chunk same type" polymode-previous-chunk-same-type))
+	      (define-key-after map [mark]
+	        '(menu-item "Mark or extend chunk" polymode-mark-or-extend-chunk))
+	      (define-key-after map [kill]
+	        '(menu-item "Kill chunk" polymode-kill-chunk))
+	      (define-key-after map [insert]
+	        '(menu-item "Insert new chunk" polymode-insert-new-chunk))
+	      map)))
+    map)
+  "The default minor mode keymap that is active in all polymode
+  modes.")
+
+
+;;; COMMANDS
+(defvar *span*)
+(defun polymode-next-chunk (&optional N)
+  "Go COUNT chunks forwards.
+Return, how many chucks actually jumped over."
+  (interactive "p")
+  (let* ((sofar 0)
+         (back (< N 0))
+         (beg (if back (point-min) (point)))
+         (end (if back (point) (point-max)))
+         (N (if back (- N) N)))
+    (condition-case nil
+        (pm/map-over-spans
+         (lambda ()
+           (unless (memq (car *span*) '(head tail))
+             (when (>= sofar N)
+               (signal 'quit nil))
+             (setq sofar (1+ sofar))))
+         beg end nil back)
+      (quit (when (looking-at "\\s *$")
+              (forward-line))))
+    sofar))
+
+;;fixme: problme with long chunks .. point is recentered
+;;todo: merge into next-chunk
+(defun polymode-previous-chunk (&optional N)
+  "Go COUNT chunks backwards .
+Return, how many chucks actually jumped over."
+  (interactive "p")
+  (polymode-next-chunk (- N)))
+  
+(defun polymode-next-chunk-same-type (&optional N)
+  "Go to next COUNT chunk.
+Return, how many chucks actually jumped over."
+  (interactive "p")
+  (let* ((sofar 0)
+         (back (< N 0))
+         (beg (if back (point-min) (point)))
+         (end (if back (point) (point-max)))
+         (N (if back (- N) N))
+         this-type this-class)
+    (condition-case nil
+        (pm/map-over-spans
+         (lambda ()
+           (unless (memq (car *span*) '(head tail))
+             (when (and (equal this-class
+                               (pm--object-name (car (last *span*))))
+                        (eq this-type (car *span*)))
+               (setq sofar (1+ sofar)))
+             (unless this-class
+               (setq this-class (pm--object-name (car (last *span*)))
+                     this-type (car *span*)))
+             (when (>= sofar N)
+               (signal 'quit nil))))
+         beg end nil back)
+      (quit (when (looking-at "\\s *$")
+              (forward-line))))
+    sofar))
+
+(defun polymode-previous-chunk-same-type (&optional N)
+  "Go to previus COUNT chunk.
+Return, how many chucks actually jumped over."
+  (interactive "p")
+  (polymode-next-chunk-same-type (- N)))
+
+(defun pm--kill-span (types)
+  (let ((span (pm/get-innermost-span)))
+    (when (memq (car span) types)
+      (delete-region (nth 1 span) (nth 2 span)))))
+
+(defun polymode-kill-chunk ()
+  "Kill current chunk"
+  (interactive)
+  (pcase (pm/get-innermost-span)
+    (`(,(or `nil `host) ,beg ,end ,_) (delete-region beg end))
+    (`(body ,beg ,end ,_)
+     (goto-char beg)
+     (pm--kill-span '(body))
+     (pm--kill-span '(head tail))
+     (pm--kill-span '(head tail)))
+    (`(tail ,beg ,end ,_)
+     (if (eq beg (point-min))
+         (delete-region beg end)
+       (goto-char (1- beg))
+       (polymode-kill-chunk)))
+    (`(head ,_ ,end ,_)
+     (goto-char end)
+     (polymode-kill-chunk))
+    (_ (error "canoot find chunk to kill"))))
+
+(defun polymode-toggle-chunk-narrowing ()
+  "Toggle narrowing of the current chunk."
+  (interactive)
+  (if (buffer-narrowed-p)
+      (progn (widen) (recenter))
+    (pcase (pm/get-innermost-span)
+      (`(head ,_ ,end ,_)
+       (goto-char end)
+       (pm/narrow-to-span))
+      (`(tail ,beg ,end ,_)
+       (if (eq beg (point-min))
+           (error "Invalid chunk")
+         (goto-char (1- beg))
+         (pm/narrow-to-span)))
+      (_ (pm/narrow-to-span)))))
+
+(defun polymode-mark-or-extend-chunk ()
+  (interactive)
+  (error "Not implemented yet"))
+
+(defun polymode-insert-new-chunk ()
+  (interactive)
+  (error "Not implemented yet"))
+
+(defun polymode-show-process-buffer ()
+  (interactive)
+  (let ((buf (cl-loop for b being the buffers
+                      if (buffer-local-value 'pm--process-buffer b)
+                      return b)))
+    (if buf
+	(pop-to-buffer buf `(nil . ((inhibit-same-window . ,pop-up-windows))))
+      (message "No polymode process buffers found."))))
+
+
+;;; CORE
+(defsubst pm/base-buffer ()
+  ;; fixme: redundant with :base-buffer 
+  "Return base buffer of current buffer, or the current buffer if it's direct."
+  (or (buffer-base-buffer (current-buffer))
+      (current-buffer)))
+
+;; VS[26-08-2012]: Dave's original comment: It would be nice to cache the
+;; results of this on text properties, but that probably won't work well if
+;; chunks can be nested.  In that case, you can't just mark everything between
+;; delimiters -- you have to consider other possible regions between them.  For
+;; now, we do the calculation each time, scanning outwards from point.
+(defun pm/get-innermost-span (&optional pos)
+  (pm-get-span pm/polymode pos))
+
+;; This function is for debug convenience only in order to avoid limited debug
+;; context in polymode-select-buffer
+(defvar pm--ignore-post-command-hook nil)
+(defun pm--sel-buf ()
+  (unless pm--ignore-post-command-hook
+    (let ((*span* (pm/get-innermost-span))
+          (pm--can-move-overlays t))
+	  (save-restriction
+		(widen)
+		(pm-select-buffer (car (last *span*)) *span*)))))
+
+(defun polymode-select-buffer ()
+  "Select the appropriate (indirect) buffer corresponding to point's context.
+This funciton is placed in local post-command hook."
+  (condition-case error
+      (pm--sel-buf)
+    (error (message "polymode error (polymode-select-buffer): %s"
+                    (error-message-string error)))))
+
+(defun pm/map-over-spans (fun beg end &optional count backward?)
+  "For all spans between BEG and END, execute FUN.
+FUN is a function of no args. It is executed with point at the
+beginning of the span and with the buffer narrowed to the
+span. If COUNT is non-nil, jump at most that many times. If
+BACKWARD? is non-nil, map backwards.
+ 
+During the call of FUN, a dynamically bound variable *span* holds
+the current innermost span."
+  (let ((nr 0)
+        *span*)
+    ;; (save-excursion
+    ;;   (save-window-excursion
+    (goto-char (if backward? end beg))
+    (while (and (if backward?
+                    (> (point) beg)
+                  (< (point) end))
+                (or (null count)
+                    (< nr count)))
+      (setq *span* (pm/get-innermost-span)
+            nr (1+ nr))
+      (pm-select-buffer (car (last *span*)) *span*) ;; object and type
+      (goto-char (nth 1 *span*))
+      (funcall fun)
+	  ;; enter next/previous chunk as head-tails don't include their boundaries
+      (if backward?
+          (goto-char (max 1 (1- (nth 1 *span*)))) 
+        (goto-char (min (point-max) (1+ (nth 2 *span*))))))))
+
+(defun pm/narrow-to-span (&optional span)
+  "Narrow to current chunk."
+  (interactive)
+  (unless (= (point-min) (point-max))
+    (let ((span (or span
+                    (pm/get-innermost-span))))
+      (if span
+          (let ((min (nth 1 span))
+                (max (nth 2 span)))
+            (when (boundp 'syntax-ppss-last)
+              (setq syntax-ppss-last
+                    (cons (point-min)
+                          (list 0 nil (point-min) nil nil nil 0 nil nil nil))))
+            (narrow-to-region min max))
+        (error "No span found")))))
+
+(defun pm/fontify-region (beg end &optional verbose)
+  "Polymode font-lock fontification function.
+Fontifies chunk-by chunk within the region. Assigned to
+`font-lock-fontify-region-function'.
+
+A fontification mechanism should call
+`font-lock-fontify-region-function' (`jit-lock-function' does
+that). If it does not, the fontification will probably be screwed
+in polymode buffers."
+  (let* ((buffer-undo-list t)
+	 (inhibit-point-motion-hooks t)
+         (font-lock-dont-widen t)
+         (buff (current-buffer)))
+	(when pm--fontify ;; set by pm-debug-toggle-fontification
+	  (with-silent-modifications
+		(font-lock-unfontify-region beg end)
+		(save-excursion
+		  (save-window-excursion
+			(pm/map-over-spans
+			 (lambda ()
+			   (let ((sbeg (nth 1 *span*))
+					 (send (nth 2 *span*)))
+				 (when (and font-lock-mode font-lock-keywords)
+				   (when parse-sexp-lookup-properties
+					 (pm--comment-region 1 sbeg))
+				   (condition-case err
+					   (if (oref pm/chunkmode :font-lock-narrow)
+						   (save-restriction
+							 ;; fixme: optimization opportunity: Cache chunk state
+							 ;; in text properties. For big chunks font-lock
+							 ;; fontifies it by smaller segments, thus
+							 ;; pm/fontify-region is called multiple times per
+							 ;; chunk and spans are computed each time.
+							 (narrow-to-region sbeg send)
+							 (funcall pm--fontify-region-original
+									  (max sbeg beg) (min send end) verbose))
+						 (funcall pm--fontify-region-original
+								  (max sbeg beg) (min send end) verbose))
+					 (error (message "polymode font-lock error: %s (beg: %s end: %s)"
+									 (error-message-string err) beg end)))
+				   (when parse-sexp-lookup-properties
+					 (pm--uncomment-region 1 sbeg)))
+				 (pm--adjust-chunk-face sbeg send (pm-get-adjust-face pm/chunkmode))
+				 ;; might be needed by external applications like flyspell
+				 ;; fixme: this should be in a more generic place like pm-get-span
+				 (put-text-property sbeg send 'chunkmode
+									(object-of-class-p pm/chunkmode 'pm-hbtchunkmode))
+				 ;; even if failed, set to t to avoid infloop
+				 (put-text-property beg end 'fontified t)))
+			 beg end)
+			;; needed to avoid moving last fontified buffer to second place
+			;; switching displayed buffer invalidates internal emacs assumptions
+			;; bug bug#19511, fixed in emacs ea1c146acf3
+			;; (bury-buffer)
+			))))))
+
+(defun pm/syntax-begin-function ()
+  (goto-char
+   (max (cadr (pm/get-innermost-span))
+        (if pm--syntax-begin-function-original
+            (save-excursion
+              (funcall pm--syntax-begin-function-original)
+              (point))
+          (point-min)))))
+
+
+;;; DEFINE
+;;;###autoload
+(defmacro define-polymode (mode config &optional keymap &rest body)
+  "Define a new polymode MODE.
+This macro defines command MODE and an indicator variable MODE
+that is t when MODE is active and nil othervise.
+
+MODE command is similar to standard emacs major modes and it can
+be used in `auto-mode-alist'. Standard hook MODE-hook is run at
+the end of the initialization of each polymode buffer, indirect
+and base alike. Additionally MODE-map is created based on the
+CONFIG's :map slot and the value of the :keymap argument; see
+below.
+
+CONFIG is a name of a config object representing the mode.
+
+MODE command can also be use as a minor mode. Current major mode
+is not reinitialized if it coincides with the :mode slot of
+CONFIG object or if the :mode slot is nil.
+
+BODY contains code to be executed after the complete
+  initialization of the polymode (`pm-initialize') and before
+  running MODE-hook. Before the actual body code, you can write
+  keyword arguments, i.e. alternating keywords and values.  The
+  following special keywords are supported:
+
+:lighter SPEC   Optional LIGHTER is displayed in the mode line when
+                the mode is on. If omitted, it defaults to
+                the :lighter slot of CONFIG object.
+:keymap MAP	Same as the KEYMAP argument.
+
+                If nil, a new MODE-map keymap is created what
+                directly inherits from the keymap defined by
+                the :map slot of CONFIG object. In most cases it
+                is a simple map inheriting form
+                `polymode-mode-map'. If t or an alist (of
+                bindings suitable to be passed to
+                `easy-mmode-define-keymap') a keymap MODE-MAP is
+                build by mergin this alist with the :map
+                specification of the CONFIG object. If a symbol,
+                it should be a variable whose value is a
+                keymap. No MODE-MAP is automatically created in
+                the latter case and :map slot of the CONFIG
+                object is ignored.
+
+:after-hook     A single lisp form which is evaluated after the mode hooks
+                have been run.  It should not be quoted."
+  (declare 
+   (debug (&define name name
+                   [&optional [&not keywordp] sexp]
+                   [&rest [keywordp sexp]]
+                   def-body)))
+
+  
+  (when (keywordp keymap)
+    (push keymap body)
+    (setq keymap nil))
+
+  (let* ((last-message (make-symbol "last-message"))
+         (mode-name (symbol-name mode))
+         (pretty-name (concat
+                       (replace-regexp-in-string "poly-\\|-mode" "" mode-name)
+                       " polymode"))
+         (keymap-sym (intern (concat mode-name "-map")))
+         (hook (intern (concat mode-name "-hook")))
+	 (extra-keywords nil)
+	 (after-hook nil)
+	 keyw lighter)
+
+    ;; Check keys.
+    (while (keywordp (setq keyw (car body)))
+      (setq body (cdr body))
+      (pcase keyw
+	(`:lighter (setq lighter (purecopy (pop body))))
+	(`:keymap (setq keymap (pop body)))
+	(`:after-hook (setq after-hook (pop body)))
+	(_ (push keyw extra-keywords) (push (pop body) extra-keywords))))
+
+    `(progn
+       :autoload-end
+
+       ;; Define the variable to enable or disable the mode.
+       (defvar ,mode nil ,(format "Non-nil if %s mode is enabled." pretty-name))
+       (make-variable-buffer-local ',mode)
+
+       (let* ((keymap ,keymap)
+              (config ',config)
+              (lighter (or ,lighter
+                           (oref (symbol-value config) :lighter)))
+              key-alist)
+
+         (unless (keymapp keymap)
+           ;; keymap is either nil or list. Iterate through parents' :map slot
+           ;; and gather keys.
+           (setq key-alist keymap)
+           (let* ((pi (symbol-value config))
+                  map mm-name)
+             (while pi
+               (setq map (and (slot-boundp pi :map)
+                              (oref pi :map)))
+               (if (and (symbolp map)
+                        (keymapp (symbol-value map)))
+                   ;; If one of the parent's :map is a keymap, use it as our
+                   ;; keymap and stop further descent.
+                   (setq keymap  (symbol-value map)
+                         pi nil)
+                 ;; Descend to next parent and append the key list to key-alist
+                 (setq pi (and (slot-boundp pi :parent-instance)
+                               (oref pi :parent-instance))
+                       key-alist (append key-alist map))))))
+
+         (unless keymap
+           ;; If we couldn't figure out the original keymap:
+           (setq keymap polymode-mode-map))
+
+         ;; Define the minor-mode keymap:
+         (defvar ,keymap-sym
+           (easy-mmode-define-keymap key-alist nil nil `(:inherit ,keymap))
+           ,(format "Keymap for %s." pretty-name))
+
+         
+         ;; The actual mode function:
+         (defun ,mode (&optional arg) ,(format "%s.\n\n\\{%s}" pretty-name keymap-sym)
+                (interactive)
+                (unless ,mode
+                  (let ((,last-message (current-message)))
+                    (unless pm/polymode ;; don't reinstall for time being
+                      (let ((config (clone ,config)))
+                        (oset config :minor-mode ',mode)
+                        (pm-initialize config)))
+                    ;; set our "minor" mode
+                    (setq ,mode t)
+                    ,@body
+                    (run-hooks ',hook)
+                    ;; Avoid overwriting a message shown by the body,
+                    ;; but do overwrite previous messages.
+                    (when (and (called-interactively-p 'any)
+                               (or (null (current-message))
+                                   (not (equal ,last-message
+                                               (current-message)))))
+                      (message ,(format "%s enabled" pretty-name)))
+                    ,@(when after-hook `(,after-hook))
+                    (force-mode-line-update)))
+                ;; Return the new setting.
+                ,mode)
+         
+         (add-minor-mode ',mode lighter ,keymap-sym)))))
+
+
+(define-minor-mode polymode-minor-mode
+  "Polymode minor mode, used to make everything work."
+  nil " PM" polymode-mode-map)
+
+
+;;; FONT-LOCK
+;; indulge elisp font-lock :) 
+(dolist (mode '(emacs-lisp-mode lisp-interaction-mode))
+  (font-lock-add-keywords
+   mode
+   '(("(\\(define-polymode\\)\\s +\\(\\(\\w\\|\\s_\\)+\\)"
+      (1 font-lock-keyword-face)
+      (2 font-lock-variable-name-face)))))
+
+
+;;; TOOLS for DEBUGGING
+
+(defvar pm--underline-overlay
+  (let ((overlay (make-overlay (point) (point))))
+    (overlay-put overlay 'face  '(:underline (:color "red" :style wave)))
+    overlay)
+  "Overlay used in `pm-debug-mode'.")
+
+(defvar pm--inverse-video-overlay
+  (let ((overlay (make-overlay (point) (point))))
+    (overlay-put overlay 'face  '(:inverse-video t))
+    overlay)
+  "Overlay used by `pm-debug-map-over-spans-and-highlight'.")
+
+(defvar pm-debug-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+	(define-key map (kbd "M-n M-i") 'pm-debug-info-on-span)
+	(define-key map (kbd "M-n M-h") 'pm-debug-map-over-spans-and-highlight)
+	(define-key map (kbd "M-n M-f") 'pm-debug-toggle-fontification)
+	;; (define-key map (kbd "M-n M-t") 'pm-debug-toggle-info-update)
+	map))
+
+(defun pm-debug-minor-mode-on ()
+  ;; activating everywhere (in case font-lock infloops in a polymode buffer )
+  (pm-debug-minor-mode t))
+
+(define-minor-mode pm-debug-minor-mode
+  "Turns on/off useful facilities for debugging polymode.
+
+Key bindings:
+\\{pm-debug-minor-mode-map}"
+  nil
+  " PMDBG"
+  :group 'polymode
+  (interactive)
+  (if pm-debug-minor-mode
+	  (progn
+		;; this is global hook. No need to complicate with local hooks
+		(add-hook 'post-command-hook 'pm-debug-highlight-current-span))
+	(delete-overlay pm--underline-overlay)
+	(delete-overlay pm--inverse-video-overlay)
+	(remove-hook 'post-command-hook 'pm-debug-highlight-current-span)))
+
+(define-globalized-minor-mode pm-debug-mode pm-debug-minor-mode pm-debug-minor-mode-on)
+
+(defun pm-debug-highlight-current-span ()
+  (when polymode-mode
+	(unless (eq this-command 'pm-debug-info-on-span)
+	  (delete-overlay pm--inverse-video-overlay))
+	(condition-case err
+		(let ((span (pm/get-innermost-span)))
+		  (pm--debug-info span)
+		  (move-overlay pm--underline-overlay (nth 1 span) (nth 2 span) (current-buffer)))
+	  (error (message "%s" (error-message-string err))))))
+
+(defgeneric pm-debug-info (chunkmode))
+(defmethod pm-debug-info (chunkmode)
+  (format "class:%s" (eieio-object-class-name chunkmode)))
+(defmethod pm-debug-info ((chunkmode pm-hbtchunkmode))
+  (format "head-reg:\"%s\" tail-reg:\"%s\" %s" 
+		  (oref obj :head-reg) (oref obj :tail-reg)
+		  (call-next-method)))
+(defmethod pm-debug-info ((chunkmode pm-hbtchunkmode))
+  (format "head-reg:\"%s\" tail-reg:\"%s\" %s" 
+		  (oref obj :head-reg) (oref obj :tail-reg)
+		  (call-next-method)))
+(defmethod pm-debug-info ((chunkmode pm-hbtchunkmode-auto))
+		  (call-next-method))
+
+(defun pm--debug-info (&optional span)
+  (let* ((span (or span (pm/get-innermost-span)))
+		 (message-log-max nil)
+		 (beg (nth 1 span))
+		 (end (nth 2 span))
+		 (obj (nth 3 span)))
+	(message "(%s) type:%s span:%s-%s %s"
+			 major-mode (or (car span) 'host) beg end (pm-debug-info obj))))
+
+(defun pm-debug-info-on-span ()
+  (interactive)
+  (if (not polymode-mode)
+	  (message "not in a polymode buffer")
+	(let ((span (pm/get-innermost-span)))
+	  (pm--debug-info span)
+	  (move-overlay pm--inverse-video-overlay (nth 1 span) (nth 2 span) (current-buffer)))))
+
+(defvar pm--fontify t)
+
+(defun pm-debug-toggle-fontification ()
+  (interactive)
+  (if pm--fontify
+	  (progn
+		(message "fontificaiton disabled")
+		(setq pm--fontify nil))
+	(message "fontificaiton enabled")
+	(setq pm--fontify t)))
+
+;; (defvar mp--debug-info-update t)
+;; (defun pm-debug-toggle-info-update ()
+;;   (interactive)
+;;   (if pm--debug-info-update
+;; 	  (progn
+;; 		(message "info disabled")
+;; 		(setq pm--debug-info-update nil))
+;; 	(message "info enabled")
+;; 	(setq pm--debug-info-update t)))
+
+(defun pm--blink-region (start end &optional delay)
+  (move-overlay pm--inverse-video-overlay start end (current-buffer))
+  (run-with-timer (or delay 0.4) nil (lambda () (delete-overlay pm--inverse-video-overlay))))
+
+(defun pm-debug-map-over-spans-and-highlight ()
+  (interactive)
+  (pm/map-over-spans (lambda ()
+                       (let ((start (nth 1 *span*))
+                             (end (nth 2 *span*)))
+                         (pm--blink-region start end)
+                         (sit-for 1)))
+                     (point-min) (point-max)))
+
+(defun pm--highlight-span (&optional hd-matcher tl-matcher)
+  (interactive)
+  (let* ((hd-matcher (or hd-matcher (oref pm/chunkmode :head-reg)))
+         (tl-matcher (or tl-matcher (oref pm/chunkmode :tail-reg)))
+         (span (pm--span-at-point hd-matcher tl-matcher)))
+    (pm--blink-region (nth 1 span) (nth 2 span))
+    (message "span: %s" span)))
+
+(defun pm--run-over-check ()
+  (interactive)
+  (goto-char (point-min))
+  (let ((start (current-time))
+        (count 1))
+    (polymode-select-buffer)
+    (while (< (point) (point-max))
+      (setq count (1+ count))
+      (forward-char)
+      (polymode-select-buffer))
+    (let ((elapsed  (float-time (time-subtract (current-time) start))))
+      (message "elapsed: %s  per-char: %s" elapsed (/ elapsed count)))))
+
+(provide 'polymode)
+;;; polymode.el ends here
diff --git a/emacs.d/elpa/popup-20150609.2145/popup-autoloads.el b/emacs.d/elpa/popup-20150609.2145/popup-autoloads.el
deleted file mode 100644
index 0617554..0000000
--- a/emacs.d/elpa/popup-20150609.2145/popup-autoloads.el
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; popup-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil nil ("popup.el") (21898 47964 236628 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; popup-autoloads.el ends here
diff --git a/emacs.d/elpa/popup-20150609.2145/popup-pkg.el b/emacs.d/elpa/popup-20150609.2145/popup-pkg.el
deleted file mode 100644
index 2b02d43..0000000
--- a/emacs.d/elpa/popup-20150609.2145/popup-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "popup" "20150609.2145" "Visual Popup User Interface" '((cl-lib "0.3")) :keywords '("lisp"))
diff --git a/emacs.d/elpa/popup-20150609.2145/popup.el b/emacs.d/elpa/popup-20150609.2145/popup.el
deleted file mode 100644
index 066c42d..0000000
--- a/emacs.d/elpa/popup-20150609.2145/popup.el
+++ /dev/null
@@ -1,1422 +0,0 @@
-;;; popup.el --- Visual Popup User Interface
-
-;; Copyright (C) 2009-2015  Tomohiro Matsuyama
-
-;; Author: Tomohiro Matsuyama <m2ym.pub@gmail.com>
-;; Keywords: lisp
-;; Package-Version: 20150609.2145
-;; Version: 0.5.3
-;; Package-Requires: ((cl-lib "0.3"))
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; popup.el is a visual popup user interface library for Emacs. This
-;; provides a basic API and common UI widgets such as popup tooltips
-;; and popup menus.
-;; See README.markdown for more information.
-
-;;; Code:
-
-(require 'cl-lib)
-
-(defconst popup-version "0.5.3")
-
-
-
-;;; Utilities
-
-(defun popup-calculate-max-width (max-width)
-  "Determines whether the width desired is
-character or window proportion based, And returns the result."
-  (cl-typecase max-width
-    (integer max-width)
-    (float (* (ceiling (/ (round (* max-width (window-width))) 10.0)) 10))))
-
-(defvar popup-use-optimized-column-computation t
-  "Use the optimized column computation routine.
-If there is a problem, please set it nil.")
-
-(defmacro popup-aif (test then &rest else)
-  "Anaphoric if."
-  (declare (indent 2))
-  `(let ((it ,test))
-     (if it ,then ,@else)))
-
-(defmacro popup-awhen (test &rest body)
-  "Anaphoric when."
-  (declare (indent 1))
-  `(let ((it ,test))
-     (when it ,@body)))
-
-(defun popup-x-to-string (x)
-  "Convert any object to string effeciently.
-This is faster than `prin1-to-string' in many cases."
-  (cl-typecase x
-    (string x)
-    (symbol (symbol-name x))
-    (integer (number-to-string x))
-    (float (number-to-string x))
-    (t (format "%s" x))))
-
-(defun popup-substring-by-width (string width)
-  "Return a cons cell of substring and remaining string by
-splitting with WIDTH."
-  ;; Expand tabs into 4 spaces
-  (setq string (replace-regexp-in-string "\t" "    " string))
-  (cl-loop with len = (length string)
-           with w = 0
-           for l from 0
-           for c in (append string nil)
-           while (<= (cl-incf w (char-width c)) width)
-           finally return
-           (if (< l len)
-               (cons (substring string 0 l) (substring string l))
-             (list string))))
-
-(defun popup-fill-string (string &optional width max-width justify squeeze)
-  "Split STRING into fixed width strings and return a cons cell
-like \(WIDTH . ROWS). Here, the car WIDTH indicates the actual
-maxim width of ROWS.
-
-The argument WIDTH specifies the width of filling each
-paragraph. WIDTH nil means don't perform any justification and
-word wrap. Note that this function doesn't add any padding
-characters at the end of each row.
-
-MAX-WIDTH, if WIDTH is nil, specifies the maximum number of
-columns.
-
-The optional fourth argument JUSTIFY specifies which kind of
-justification to do: `full', `left', `right', `center', or
-`none' (equivalent to nil).  A value of t means handle each
-paragraph as specified by its text properties.
-
-SQUEEZE nil means leave whitespaces other than line breaks
-untouched."
-  (if (eq width 0)
-      (error "Can't fill string with 0 width"))
-  (if width
-      (setq max-width width))
-  (with-temp-buffer
-    (let ((tab-width 4)
-          (fill-column width)
-          (left-margin 0)
-          (kinsoku-limit 1)
-          indent-tabs-mode
-          row rows)
-      (insert string)
-      (untabify (point-min) (point-max))
-      (if width
-          (fill-region (point-min) (point-max) justify (not squeeze)))
-      (goto-char (point-min))
-      (setq width 0)
-      (while (prog2
-                 (let ((line (buffer-substring
-                              (point) (progn (end-of-line) (point)))))
-                   (if max-width
-                       (while (progn
-                                (setq row (truncate-string-to-width line max-width)
-                                      width (max width (string-width row)))
-                                (push row rows)
-                                (if (not (= (length row) (length line)))
-                                    (setq line (substring line (length row))))))
-                     (setq width (max width (string-width line)))
-                     (push line rows)))
-                 (< (point) (point-max))
-               (beginning-of-line 2)))
-      (cons width (nreverse rows)))))
-
-(defmacro popup-save-buffer-state (&rest body)
-  (declare (indent 0))
-  `(save-excursion
-     (let ((buffer-undo-list t)
-           (inhibit-read-only t)
-           (modified (buffer-modified-p)))
-       (unwind-protect
-           (progn ,@body)
-         (set-buffer-modified-p modified)))))
-
-(defun popup-vertical-motion (column direction)
-  "A portable version of `vertical-motion'."
-  (if (>= emacs-major-version 23)
-      (vertical-motion (cons column direction))
-    (vertical-motion direction)
-    (move-to-column (+ (current-column) column))))
-
-(defun popup-last-line-of-buffer-p ()
-  "Return non-nil if the cursor is at the last line of the
-buffer."
-  (save-excursion (end-of-line) (/= (forward-line) 0)))
-
-(defun popup-lookup-key-by-event (function event)
-  (or (funcall function (vector event))
-      (if (symbolp event)
-          (popup-aif (get event 'event-symbol-element-mask)
-              (funcall function
-                       (vector (logior (or (get (car it) 'ascii-character)
-                                           0)
-                                       (cadr it))))))))
-
-
-
-;;; Core
-
-(defgroup popup nil
-  "Visual Popup User Interface"
-  :group 'lisp
-  :prefix "popup-")
-
-(defface popup-face
-  '((t (:background "lightgray" :foreground "black")))
-  "Face for popup."
-  :group 'popup)
-
-(defface popup-summary-face
-  '((t (:inherit popup-face :foreground "dimgray")))
-  "Face for popup summary."
-  :group 'popup)
-
-(defface popup-scroll-bar-foreground-face
-  '((t (:background "black")))
-  "Foreground face for scroll-bar."
-  :group 'popup)
-
-(defface popup-scroll-bar-background-face
-  '((t (:background "gray")))
-  "Background face for scroll-bar."
-  :group 'popup)
-
-(defvar popup-instances nil
-  "Popup instances.")
-
-(defvar popup-scroll-bar-foreground-char
-  (propertize " " 'face 'popup-scroll-bar-foreground-face)
-  "Foreground character for scroll-bar.")
-
-(defvar popup-scroll-bar-background-char
-  (propertize " " 'face 'popup-scroll-bar-background-face)
-  "Background character for scroll-bar.")
-
-(cl-defstruct popup
-  point row column width height min-height direction overlays keymap
-  parent depth
-  face mouse-face selection-face summary-face
-  margin-left margin-right margin-left-cancel scroll-bar symbol
-  cursor offset scroll-top current-height list newlines
-  pattern original-list invis-overlays)
-
-(defun popup-item-propertize (item &rest properties)
-  "Same as `propertize' except that this avoids overriding
-existed value with `nil' property."
-  (cl-loop for (k v) on properties by 'cddr
-           if v append (list k v) into props
-           finally return
-           (apply 'propertize
-                  (popup-x-to-string item)
-                  props)))
-
-(defun popup-item-property (item property)
-  "Same as `get-text-property' except that this returns nil if
-ITEM is not string."
-  (if (stringp item)
-      (get-text-property 0 property item)))
-
-(cl-defun popup-make-item (name
-                           &key
-                           value
-                           face
-                           mouse-face
-                           selection-face
-                           sublist
-                           document
-                           symbol
-                           summary)
-  "Utility function to make popup item. See also
-`popup-item-propertize'."
-  (popup-item-propertize name
-                         'value value
-                         'popup-face face
-                         'popup-mouse-face mouse-face
-                         'selection-face selection-face
-                         'document document
-                         'symbol symbol
-                         'summary summary
-                         'sublist sublist))
-
-(defsubst popup-item-value (item)               (popup-item-property item 'value))
-(defsubst popup-item-value-or-self (item)       (or (popup-item-value item) item))
-(defsubst popup-item-face (item)                (popup-item-property item 'popup-face))
-(defsubst popup-item-mouse-face (item)          (popup-item-property item 'popup-mouse-face))
-(defsubst popup-item-selection-face (item)      (popup-item-property item 'selection-face))
-(defsubst popup-item-document (item)            (popup-item-property item 'document))
-(defsubst popup-item-summary (item)             (popup-item-property item 'summary))
-(defsubst popup-item-symbol (item)              (popup-item-property item 'symbol))
-(defsubst popup-item-sublist (item)             (popup-item-property item 'sublist))
-
-(defun popup-item-documentation (item)
-  (let ((doc (popup-item-document item)))
-    (if (functionp doc)
-        (setq doc (funcall doc (popup-item-value-or-self item))))
-    doc))
-
-(defun popup-item-show-help-1 (item)
-  (let ((doc (popup-item-documentation item)))
-    (when doc
-      (with-current-buffer (get-buffer-create " *Popup Help*")
-        (erase-buffer)
-        (insert doc)
-        (goto-char (point-min))
-        (display-buffer (current-buffer)))
-      t)))
-
-(defun popup-item-show-help-with-event-loop (item)
-  (save-window-excursion
-    (when (popup-item-show-help-1 item)
-      (cl-loop do (clear-this-command-keys)
-               for key = (read-key-sequence-vector nil)
-               do
-               (cl-case (key-binding key)
-                 (scroll-other-window
-                  (scroll-other-window))
-                 (scroll-other-window-down
-                  (scroll-other-window-down nil))
-                 (otherwise
-                  (setq unread-command-events (append key unread-command-events))
-                  (cl-return)))))))
-
-(defun popup-item-show-help (item &optional persist)
-  "Display the documentation of ITEM with `display-buffer'. If
-PERSIST is nil, the documentation buffer will be closed
-automatically, meaning interal event loop ensures the buffer to
-be closed. Otherwise, the buffer will be just displayed as
-usual."
-  (when item
-    (if (not persist)
-        (popup-item-show-help-with-event-loop item)
-      (popup-item-show-help-1 item))))
-
-(defun popup-set-list (popup list)
-  (popup-set-filtered-list popup list)
-  (setf (popup-pattern popup) nil)
-  (setf (popup-original-list popup) list))
-
-(defun popup-set-filtered-list (popup list)
-  (let ((offset
-         (if (> (popup-direction popup) 0)
-             0
-           (max (- (popup-height popup) (length list)) 0))))
-    (setf (popup-list popup) list
-          (popup-offset popup) offset)))
-
-(defun popup-selected-item (popup)
-  (nth (popup-cursor popup) (popup-list popup)))
-
-(defun popup-selected-line (popup)
-  (- (popup-cursor popup) (popup-scroll-top popup)))
-
-(defun popup-line-overlay (popup line)
-  (aref (popup-overlays popup) line))
-
-(defun popup-selected-line-overlay (popup)
-  (popup-line-overlay popup (popup-selected-line popup)))
-
-(defun popup-hide-line (popup line)
-  (let ((overlay (popup-line-overlay popup line)))
-    (overlay-put overlay 'display nil)
-    (overlay-put overlay 'after-string nil)))
-
-(defun popup-line-hidden-p (popup line)
-  (let ((overlay (popup-line-overlay popup line)))
-    (and (eq (overlay-get overlay 'display) nil)
-         (eq (overlay-get overlay 'after-string) nil))))
-
-(cl-defun popup-set-line-item (popup
-                               line
-                               &key
-                               item
-                               face
-                               mouse-face
-                               margin-left
-                               margin-right
-                               scroll-bar-char
-                               symbol
-                               summary
-                               summary-face
-                               keymap)
-  (let* ((overlay (popup-line-overlay popup line))
-         (content (popup-create-line-string popup (popup-x-to-string item)
-                                            :margin-left margin-left
-                                            :margin-right margin-right
-                                            :symbol symbol
-                                            :summary summary
-                                            :summary-face summary-face))
-         (start 0)
-         (prefix (overlay-get overlay 'prefix))
-         (postfix (overlay-get overlay 'postfix))
-         end)
-    (put-text-property 0 (length content) 'popup-item item content)
-    (put-text-property 0 (length content) 'keymap keymap content)
-    ;; Overlap face properties
-    (when (get-text-property start 'face content)
-      (setq start (next-single-property-change start 'face content)))
-    (while (and start (setq end (next-single-property-change start 'face content)))
-      (put-text-property start end 'face face content)
-      (setq start (next-single-property-change end 'face content)))
-    (when start
-      (put-text-property start (length content) 'face face content))
-    (when mouse-face
-      (put-text-property 0 (length content) 'mouse-face mouse-face content))
-    (unless (overlay-get overlay 'dangle)
-      (overlay-put overlay 'display (concat prefix (substring content 0 1)))
-      (setq prefix nil
-            content (concat (substring content 1))))
-    (overlay-put overlay
-                 'after-string
-                 (concat prefix
-                         content
-                         scroll-bar-char
-                         postfix))))
-
-(cl-defun popup-create-line-string (popup
-                                    string
-                                    &key
-                                    margin-left
-                                    margin-right
-                                    symbol
-                                    summary
-                                    summary-face)
-  (let* ((popup-width (popup-width popup))
-         (summary-width (string-width summary))
-         (content-width (max
-                         (min popup-width (string-width string))
-                         (- popup-width
-                            (if (> summary-width 0)
-                                (+ summary-width 2)
-                              0))))
-         (string (car (popup-substring-by-width string content-width)))
-         (string-width (string-width string))
-         (spacing (max (- popup-width string-width summary-width)
-                       (if (> popup-width string-width) 1 0)))
-         (truncated-summary
-          (car (popup-substring-by-width
-                summary (max (- popup-width string-width spacing) 0)))))
-    (when summary-face
-      (put-text-property 0 (length truncated-summary)
-                         'face summary-face truncated-summary))
-    (concat margin-left
-            string
-            (make-string spacing ? )
-            truncated-summary
-            symbol
-            margin-right)))
-
-(defun popup-live-p (popup)
-  "Return non-nil if POPUP is alive."
-  (and popup (popup-overlays popup) t))
-
-(defun popup-child-point (popup &optional offset)
-  (overlay-end
-   (popup-line-overlay
-    popup
-    (or offset
-        (popup-selected-line popup)))))
-
-(defun popup-calculate-direction (height row)
-  "Return a proper direction when displaying a popup on this
-window. HEIGHT is the a height of the popup, and ROW is a line
-number at the point."
-  (let* ((remaining-rows (- (max 1 (- (window-height)
-                                      (if mode-line-format 1 0)
-                                      (if header-line-format 1 0)))
-                            (count-lines (window-start) (point))))
-         (enough-space-above (> row height))
-         (enough-space-below (<= height remaining-rows)))
-    (if (and enough-space-above
-             (not enough-space-below))
-        -1
-      1)))
-
-(cl-defun popup-create (point
-                        width
-                        height
-                        &key
-                        min-height
-                        max-width
-                        around
-                        (face 'popup-face)
-                        mouse-face
-                        (selection-face face)
-                        (summary-face 'popup-summary-face)
-                        scroll-bar
-                        margin-left
-                        margin-right
-                        symbol
-                        parent
-                        parent-offset
-                        keymap)
-  "Create a popup instance at POINT with WIDTH and HEIGHT.
-
-MIN-HEIGHT is a minimal height of the popup. The default value is
-0.
-
-MAX-WIDTH is the maximum width of the popup. The default value is
-nil (no limit). If a floating point, the value refers to the ratio of
-the window. If an integer, limit is in characters.
-
-If AROUND is non-nil, the popup will be displayed around the
-point but not at the point.
-
-FACE is a background face of the popup. The default value is POPUP-FACE.
-
-SELECTION-FACE is a foreground (selection) face of the popup The
-default value is POPUP-FACE.
-
-If SCROLL-BAR is non-nil, the popup will have a scroll bar at the
-right.
-
-If MARGIN-LEFT is non-nil, the popup will have a margin at the
-left.
-
-If MARGIN-RIGHT is non-nil, the popup will have a margin at the
-right.
-
-SYMBOL is a single character which indicates a kind of the item.
-
-PARENT is a parent popup instance. If PARENT is omitted, the
-popup will be a root instance.
-
-PARENT-OFFSET is a row offset from the parent popup.
-
-KEYMAP is a keymap that will be put on the popup contents."
-  (or margin-left (setq margin-left 0))
-  (or margin-right (setq margin-right 0))
-  (unless point
-    (setq point
-          (if parent (popup-child-point parent parent-offset) (point))))
-  (when max-width
-    (setq width (min width (popup-calculate-max-width max-width))))
-  (save-excursion
-    (goto-char point)
-    (let* ((col-row (posn-col-row (posn-at-point)))
-           (row (cdr col-row))
-           (column (car col-row))
-           (overlays (make-vector height nil))
-           (popup-width (+ width
-                           (if scroll-bar 1 0)
-                           margin-left
-                           margin-right
-                           (if symbol 2 0)))
-           margin-left-cancel
-           (window (selected-window))
-           (window-start (window-start))
-           (window-hscroll (window-hscroll))
-           (window-width (window-width))
-           (right (+ column popup-width))
-           (overflow (and (> right window-width)
-                          (>= right popup-width)))
-           (foldable (and (null parent)
-                          (>= column popup-width)))
-           (direction (or
-                       ;; Currently the direction of cascade popup won't be changed
-                       (and parent (popup-direction parent))
-
-                       ;; Calculate direction
-                       (popup-calculate-direction height row)))
-           (depth (if parent (1+ (popup-depth parent)) 0))
-           (newlines (max 0 (+ (- height (count-lines point (point-max))) (if around 1 0))))
-           invis-overlays
-           current-column)
-      ;; Case: no newlines at the end of the buffer
-      (when (> newlines 0)
-        (popup-save-buffer-state
-          (goto-char (point-max))
-          (insert (make-string newlines ?\n))))
-
-      ;; Case: the popup overflows
-      (if overflow
-          (if foldable
-              (progn
-                (cl-decf column (- popup-width margin-left margin-right))
-                (unless around (move-to-column column)))
-            (when (not truncate-lines)
-              ;; Truncate.
-              (let ((d (1+ (- popup-width (- window-width column)))))
-                (cl-decf popup-width d)
-                (cl-decf width d)))
-            (cl-decf column margin-left))
-        (cl-decf column margin-left))
-
-      ;; Case: no space at the left
-      (when (and (null parent)
-                 (< column 0))
-        ;; Cancel margin left
-        (setq column 0)
-        (cl-decf popup-width margin-left)
-        (setq margin-left-cancel t))
-
-      (dotimes (i height)
-        (let (overlay begin w (dangle t) (prefix "") (postfix ""))
-          (when around
-            (popup-vertical-motion column direction))
-          (cl-loop for ov in (overlays-in (save-excursion
-                                            (beginning-of-visual-line)
-                                            (point))
-                                          (save-excursion
-                                            (end-of-visual-line)
-                                            (point)))
-                   when (and (not (overlay-get ov 'popup))
-                             (not (overlay-get ov 'popup-item))
-                             (or (overlay-get ov 'invisible)
-                                 (overlay-get ov 'display)))
-                   do (progn
-                        (push (list ov (overlay-get ov 'display)) invis-overlays)
-                        (overlay-put ov 'display "")))
-          (setq around t)
-          (setq current-column (car (posn-col-row (posn-at-point))))
-
-          (when (< current-column column)
-            ;; Extend short buffer lines by popup prefix (line of spaces)
-            (setq prefix (make-string
-                          (+ (if (= current-column 0)
-                                 (- window-hscroll current-column)
-                               0)
-                             (- column current-column))
-                          ? )))
-
-          (setq begin (point))
-          (setq w (+ popup-width (length prefix)))
-          (while (and (not (eolp)) (> w 0))
-            (setq dangle nil)
-            (cl-decf w (char-width (char-after)))
-            (forward-char))
-          (if (< w 0)
-              (setq postfix (make-string (- w) ? )))
-
-          (setq overlay (make-overlay begin (point)))
-          (overlay-put overlay 'popup t)
-          (overlay-put overlay 'window window)
-          (overlay-put overlay 'dangle dangle)
-          (overlay-put overlay 'prefix prefix)
-          (overlay-put overlay 'postfix postfix)
-          (overlay-put overlay 'width width)
-          (aset overlays
-                (if (> direction 0) i (- height i 1))
-                overlay)))
-      (cl-loop for p from (- 10000 (* depth 1000))
-               for overlay in (nreverse (append overlays nil))
-               do (overlay-put overlay 'priority p))
-      (let ((it (make-popup :point point
-                            :row row
-                            :column column
-                            :width width
-                            :height height
-                            :min-height min-height
-                            :direction direction
-                            :parent parent
-                            :depth depth
-                            :face face
-                            :mouse-face mouse-face
-                            :selection-face selection-face
-                            :summary-face summary-face
-                            :margin-left margin-left
-                            :margin-right margin-right
-                            :margin-left-cancel margin-left-cancel
-                            :scroll-bar scroll-bar
-                            :symbol symbol
-                            :cursor 0
-                            :offset 0
-                            :scroll-top 0
-                            :current-height 0
-                            :list nil
-                            :newlines newlines
-                            :overlays overlays
-                            :invis-overlays invis-overlays
-                            :keymap keymap)))
-        (push it popup-instances)
-        it))))
-
-(defun popup-delete (popup)
-  "Delete POPUP instance."
-  (when (popup-live-p popup)
-    (popup-hide popup)
-    (mapc 'delete-overlay (popup-overlays popup))
-    (setf (popup-overlays popup) nil)
-    (setq popup-instances (delq popup popup-instances))
-    ;; Restore newlines state
-    (let ((newlines (popup-newlines popup)))
-      (when (> newlines 0)
-        (popup-save-buffer-state
-          (goto-char (point-max))
-          (dotimes (i newlines)
-            (if (and (char-before)
-                     (= (char-before) ?\n))
-                (delete-char -1)))))))
-  nil)
-
-(defun popup-draw (popup)
-  "Draw POPUP."
-  (cl-loop for (ov olddisplay) in (popup-invis-overlays popup)
-           do (overlay-put ov 'display ""))
-
-  (cl-loop with height = (popup-height popup)
-           with min-height = (popup-min-height popup)
-           with popup-face = (popup-face popup)
-           with mouse-face = (popup-mouse-face popup)
-           with selection-face = (popup-selection-face popup)
-           with summary-face-0 = (popup-summary-face popup)
-           with list = (popup-list popup)
-           with length = (length list)
-           with thum-size = (max (/ (* height height) (max length 1)) 1)
-           with page-size = (/ (+ 0.0 (max length 1)) height)
-           with scroll-bar = (popup-scroll-bar popup)
-           with margin-left = (make-string (if (popup-margin-left-cancel popup) 0 (popup-margin-left popup)) ? )
-           with margin-right = (make-string (popup-margin-right popup) ? )
-           with symbol = (popup-symbol popup)
-           with cursor = (popup-cursor popup)
-           with scroll-top = (popup-scroll-top popup)
-           with offset = (popup-offset popup)
-           with keymap = (popup-keymap popup)
-           for o from offset
-           for i from scroll-top
-           while (< o height)
-           for item in (nthcdr scroll-top list)
-           for page-index = (* thum-size (/ o thum-size))
-           for face = (if (= i cursor)
-                          (or (popup-item-selection-face item) selection-face)
-                        (or (popup-item-face item) popup-face))
-           for summary-face = (unless (= i cursor) summary-face-0)
-           for empty-char = (propertize " " 'face face)
-           for scroll-bar-char = (if scroll-bar
-                                     (cond
-                                      ((and (not (eq scroll-bar :always))
-                                            (<= page-size 1))
-                                       empty-char)
-                                      ((and (> page-size 1)
-                                            (>= cursor (* page-index page-size))
-                                            (< cursor (* (+ page-index thum-size) page-size)))
-                                       popup-scroll-bar-foreground-char)
-                                      (t
-                                       popup-scroll-bar-background-char))
-                                   "")
-           for sym = (if symbol
-                         (concat " " (or (popup-item-symbol item) " "))
-                       "")
-           for summary = (or (popup-item-summary item) "")
-
-           do
-           ;; Show line and set item to the line
-           (popup-set-line-item popup o
-                                :item item
-                                :face face
-                                :mouse-face mouse-face
-                                :margin-left margin-left
-                                :margin-right margin-right
-                                :scroll-bar-char scroll-bar-char
-                                :symbol sym
-                                :summary summary
-                                :summary-face summary-face
-                                :keymap keymap)
-
-           finally
-           ;; Remember current height
-           (setf (popup-current-height popup) (- o offset))
-
-           ;; Hide remaining lines
-           (let ((scroll-bar-char (if scroll-bar (propertize " " 'face popup-face) ""))
-                 (symbol (if symbol " " "")))
-             (if (> (popup-direction popup) 0)
-                 (progn
-                   (when min-height
-                     (while (< o min-height)
-                       (popup-set-line-item popup o
-                                            :item ""
-                                            :face popup-face
-                                            :margin-left margin-left
-                                            :margin-right margin-right
-                                            :scroll-bar-char scroll-bar-char
-                                            :symbol symbol
-                                            :summary "")
-                       (cl-incf o)))
-                   (while (< o height)
-                     (popup-hide-line popup o)
-                     (cl-incf o)))
-               (cl-loop with h = (if min-height (- height min-height) offset)
-                        for o from 0 below offset
-                        if (< o h)
-                        do (popup-hide-line popup o)
-                        if (>= o h)
-                        do (popup-set-line-item popup o
-                                                :item ""
-                                                :face popup-face
-                                                :margin-left margin-left
-                                                :margin-right margin-right
-                                                :scroll-bar-char scroll-bar-char
-                                                :symbol symbol
-                                                :summary ""))))))
-
-(defun popup-hide (popup)
-  "Hide POPUP."
-  (cl-loop for (ov olddisplay) in (popup-invis-overlays popup)
-           do (overlay-put ov 'display olddisplay))
-  (dotimes (i (popup-height popup))
-    (popup-hide-line popup i)))
-
-(defun popup-hidden-p (popup)
-  "Return non-nil if POPUP is hidden."
-  (let ((hidden t))
-    (when (popup-live-p popup)
-      (dotimes (i (popup-height popup))
-        (unless (popup-line-hidden-p popup i)
-          (setq hidden nil))))
-    hidden))
-
-(defun popup-jump (popup cursor)
-  "Jump to a position specified by CURSOR of POPUP and draw."
-  (let ((scroll-top (popup-scroll-top popup)))
-    ;; Do not change page as much as possible.
-    (unless (and (<= scroll-top cursor)
-                 (< cursor (+ scroll-top (popup-height popup))))
-      (setf (popup-scroll-top popup) cursor))
-    (setf (popup-cursor popup) cursor)
-    (popup-draw popup)))
-
-(defun popup-select (popup i)
-  "Select the item at I of POPUP and draw."
-  (setq i (+ i (popup-offset popup)))
-  (when (and (<= 0 i) (< i (popup-height popup)))
-    (setf (popup-cursor popup) i)
-    (popup-draw popup)
-    t))
-
-(defun popup-next (popup)
-  "Select the next item of POPUP and draw."
-  (let ((height (popup-height popup))
-        (cursor (1+ (popup-cursor popup)))
-        (scroll-top (popup-scroll-top popup))
-        (length (length (popup-list popup))))
-    (cond
-     ((>= cursor length)
-      ;; Back to first page
-      (setq cursor 0
-            scroll-top 0))
-     ((= cursor (+ scroll-top height))
-      ;; Go to next page
-      (setq scroll-top (min (1+ scroll-top) (max (- length height) 0)))))
-    (setf (popup-cursor popup) cursor
-          (popup-scroll-top popup) scroll-top)
-    (popup-draw popup)))
-
-(defun popup-previous (popup)
-  "Select the previous item of POPUP and draw."
-  (let ((height (popup-height popup))
-        (cursor (1- (popup-cursor popup)))
-        (scroll-top (popup-scroll-top popup))
-        (length (length (popup-list popup))))
-    (cond
-     ((< cursor 0)
-      ;; Go to last page
-      (setq cursor (1- length)
-            scroll-top (max (- length height) 0)))
-     ((= cursor (1- scroll-top))
-      ;; Go to previous page
-      (cl-decf scroll-top)))
-    (setf (popup-cursor popup) cursor
-          (popup-scroll-top popup) scroll-top)
-    (popup-draw popup)))
-
-(defun popup-page-next (popup)
-  "Select next item of POPUP per `popup-height' range.
-Pages down through POPUP."
-  (dotimes (counter (1- (popup-height popup)))
-    (popup-next popup)))
-
-(defun popup-page-previous (popup)
-  "Select previous item of POPUP per `popup-height' range.
-Pages up through POPUP."
-  (dotimes (counter (1- (popup-height popup)))
-    (popup-previous popup)))
-
-(defun popup-scroll-down (popup &optional n)
-  "Scroll down N of POPUP and draw."
-  (let ((scroll-top (min (+ (popup-scroll-top popup) (or n 1))
-                         (- (length (popup-list popup)) (popup-height popup)))))
-    (setf (popup-cursor popup) scroll-top
-          (popup-scroll-top popup) scroll-top)
-    (popup-draw popup)))
-
-(defun popup-scroll-up (popup &optional n)
-  "Scroll up N of POPUP and draw."
-  (let ((scroll-top (max (- (popup-scroll-top popup) (or n 1))
-                         0)))
-    (setf (popup-cursor popup) scroll-top
-          (popup-scroll-top popup) scroll-top)
-    (popup-draw popup)))
-
-
-
-;;; Popup Incremental Search
-
-(defface popup-isearch-match
-  '((t (:background "sky blue")))
-  "Popup isearch match face."
-  :group 'popup)
-
-(defvar popup-isearch-cursor-color "blue")
-
-(defvar popup-isearch-keymap
-  (let ((map (make-sparse-keymap)))
-    ;(define-key map "\r"        'popup-isearch-done)
-    (define-key map "\C-g"      'popup-isearch-cancel)
-    (define-key map "\C-b"      'popup-isearch-close)
-    (define-key map [left]      'popup-isearch-close)
-    (define-key map "\C-h"      'popup-isearch-delete)
-    (define-key map (kbd "DEL") 'popup-isearch-delete)
-    map))
-
-(defvar popup-menu-show-quick-help-function 'popup-menu-show-quick-help
-  "Function used for showing quick help by `popup-menu*'.")
-
-(defsubst popup-isearch-char-p (char)
-  (and (integerp char)
-       (<= 32 char)
-       (<= char 126)))
-
-(defun popup-isearch-filter-list (pattern list)
-  (cl-loop with regexp = (regexp-quote pattern)
-           for item in list
-           do
-           (unless (stringp item)
-             (setq item (popup-item-propertize (popup-x-to-string item)
-                                               'value item)))
-           if (string-match regexp item)
-           collect
-           (let ((beg (match-beginning 0))
-                 (end (match-end 0)))
-             (alter-text-property 0 (length item) 'face
-                                  (lambda (prop)
-                                    (unless (eq prop 'popup-isearch-match)
-                                      prop))
-                                  item)
-             (put-text-property beg end
-                                'face 'popup-isearch-match
-                                item)
-             item)))
-
-(defun popup-isearch-prompt (popup pattern)
-  (format "Pattern: %s" (if (= (length (popup-list popup)) 0)
-                            (propertize pattern 'face 'isearch-fail)
-                          pattern)))
-
-(defun popup-isearch-update (popup filter pattern &optional callback)
-  (setf (popup-cursor popup) 0
-        (popup-scroll-top popup) 0
-        (popup-pattern popup) pattern)
-  (let ((list (funcall filter pattern (popup-original-list popup))))
-    (popup-set-filtered-list popup list)
-    (if callback
-        (funcall callback list)))
-  (popup-draw popup))
-
-(cl-defun popup-isearch (popup
-                         &key
-                         (filter 'popup-isearch-filter-list)
-                         (cursor-color popup-isearch-cursor-color)
-                         (keymap popup-isearch-keymap)
-                         callback
-                         help-delay)
-  "Start isearch on POPUP. This function is synchronized, meaning
-event loop waits for quiting of isearch.
-
-FILTER is function with two argumenst to perform popup items filtering.
-
-CURSOR-COLOR is a cursor color during isearch. The default value
-is `popup-isearch-cursor-color'.
-
-KEYMAP is a keymap which is used when processing events during
-event loop. The default value is `popup-isearch-keymap'.
-
-CALLBACK is a function taking one argument. `popup-isearch' calls
-CALLBACK, if specified, after isearch finished or isearch
-canceled. The arguments is whole filtered list of items.
-
-HELP-DELAY is a delay of displaying helps."
-  (let ((list (popup-original-list popup))
-        (pattern (or (popup-pattern popup) ""))
-        (old-cursor-color (frame-parameter (selected-frame) 'cursor-color))
-        prompt key binding)
-    (unwind-protect
-        (cl-block nil
-          (if cursor-color
-              (set-cursor-color cursor-color))
-          (while t
-            (setq prompt (popup-isearch-prompt popup pattern))
-            (setq key (popup-menu-read-key-sequence keymap prompt help-delay))
-            (if (null key)
-                (unless (funcall popup-menu-show-quick-help-function popup nil :prompt prompt)
-                  (clear-this-command-keys)
-                  (push (read-event prompt) unread-command-events))
-              (setq binding (lookup-key keymap key))
-              (cond
-               ((and (stringp key)
-                     (popup-isearch-char-p (aref key 0)))
-                (setq pattern (concat pattern key)))
-               ((eq binding 'popup-isearch-done)
-                (cl-return nil))
-               ((eq binding 'popup-isearch-cancel)
-                (popup-isearch-update popup filter "" callback)
-                (cl-return t))
-               ((eq binding 'popup-isearch-close)
-                (popup-isearch-update popup filter "" callback)
-                (setq unread-command-events
-                      (append (listify-key-sequence key) unread-command-events))
-                (cl-return nil))
-               ((eq binding 'popup-isearch-delete)
-                (if (> (length pattern) 0)
-                    (setq pattern (substring pattern 0 (1- (length pattern))))))
-               (t
-                (setq unread-command-events
-                      (append (listify-key-sequence key) unread-command-events))
-                (cl-return nil)))
-              (popup-isearch-update popup filter pattern callback))))
-      (if old-cursor-color
-          (set-cursor-color old-cursor-color)))))
-
-
-
-;;; Popup Tip
-
-(defface popup-tip-face
-  '((t (:background "khaki1" :foreground "black")))
-  "Face for popup tip."
-  :group 'popup)
-
-(defvar popup-tip-max-width 80)
-
-(cl-defun popup-tip (string
-                     &key
-                     point
-                     (around t)
-                     width
-                     (height 15)
-                     min-height
-                     max-width
-                     truncate
-                     margin
-                     margin-left
-                     margin-right
-                     scroll-bar
-                     parent
-                     parent-offset
-                     nowait
-                     nostrip
-                     prompt
-                     &aux tip lines)
-  "Show a tooltip of STRING at POINT. This function is
-synchronized unless NOWAIT specified. Almost arguments are same
-as `popup-create' except for TRUNCATE, NOWAIT, and PROMPT.
-
-If TRUNCATE is non-nil, the tooltip can be truncated.
-
-If NOWAIT is non-nil, this function immediately returns the
-tooltip instance without entering event loop.
-
-If `NOSTRIP` is non-nil, `STRING` properties are not stripped.
-
-PROMPT is a prompt string when reading events during event loop."
-  (if (bufferp string)
-      (setq string (with-current-buffer string (buffer-string))))
-
-  (unless nostrip
-    ;; TODO strip text (mainly face) properties
-    (setq string (substring-no-properties string)))
-
-  (and (eq margin t) (setq margin 1))
-  (or margin-left (setq margin-left margin))
-  (or margin-right (setq margin-right margin))
-
-  (let ((it (popup-fill-string string width popup-tip-max-width)))
-    (setq width (car it)
-          lines (cdr it)))
-
-  (setq tip (popup-create point width height
-                          :min-height min-height
-                          :max-width max-width
-                          :around around
-                          :margin-left margin-left
-                          :margin-right margin-right
-                          :scroll-bar scroll-bar
-                          :face 'popup-tip-face
-                          :parent parent
-                          :parent-offset parent-offset))
-
-  (unwind-protect
-      (when (> (popup-width tip) 0)                   ; not to be corrupted
-        (when (and (not (eq width (popup-width tip))) ; truncated
-                   (not truncate))
-          ;; Refill once again to lines be fitted to popup width
-          (setq width (popup-width tip))
-          (setq lines (cdr (popup-fill-string string width width))))
-
-        (popup-set-list tip lines)
-        (popup-draw tip)
-        (if nowait
-            tip
-          (clear-this-command-keys)
-          (push (read-event prompt) unread-command-events)
-          t))
-    (unless nowait
-      (popup-delete tip))))
-
-
-
-;;; Popup Menu
-
-(defface popup-menu-face
-  '((t (:inherit popup-face)))
-  "Face for popup menu."
-  :group 'popup)
-
-(defface popup-menu-mouse-face
-  '((t (:background "blue" :foreground "white")))
-  "Face for popup menu."
-  :group 'popup)
-
-(defface popup-menu-selection-face
-  '((t (:background "steelblue" :foreground "white")))
-  "Face for popup menu selection."
-  :group 'popup)
-
-(defface popup-menu-summary-face
-  '((t (:inherit popup-summary-face)))
-  "Face for popup summary."
-  :group 'popup)
-
-(defvar popup-menu-show-tip-function 'popup-tip
-  "Function used for showing tooltip by `popup-menu-show-quick-help'.")
-
-(defun popup-menu-show-help (menu &optional persist item)
-  (popup-item-show-help (or item (popup-selected-item menu)) persist))
-
-(defun popup-menu-documentation (menu &optional item)
-  (popup-item-documentation (or item (popup-selected-item menu))))
-
-(defun popup-menu-show-quick-help (menu &optional item &rest args)
-  (let* ((point (plist-get args :point))
-         (height (or (plist-get args :height) (popup-height menu)))
-         (min-height (min height (popup-current-height menu)))
-         (around nil)
-         (parent-offset (popup-offset menu))
-         (doc (popup-menu-documentation menu item)))
-    (when (stringp doc)
-      (if (popup-hidden-p menu)
-          (setq around t
-                menu nil
-                parent-offset nil)
-        (setq point nil))
-      (let ((popup-use-optimized-column-computation nil)) ; To avoid wrong positioning
-        (apply popup-menu-show-tip-function
-               doc
-               :point point
-               :height height
-               :min-height min-height
-               :around around
-               :parent menu
-               :parent-offset parent-offset
-               args)))))
-
-(defun popup-menu-item-of-mouse-event (event)
-  (when (and (consp event)
-             (memq (cl-first event) '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)))
-    (let* ((position (cl-second event))
-           (object (elt position 4)))
-      (when (consp object)
-        (get-text-property (cdr object) 'popup-item (car object))))))
-
-(defun popup-menu-read-key-sequence (keymap &optional prompt timeout)
-  (catch 'timeout
-    (let ((timer (and timeout
-                      (run-with-timer timeout nil
-                                      (lambda ()
-                                        (if (zerop (length (this-command-keys)))
-                                            (throw 'timeout nil))))))
-          (old-global-map (current-global-map))
-          (temp-global-map (make-sparse-keymap))
-          (overriding-terminal-local-map (make-sparse-keymap)))
-      (substitute-key-definition 'keyboard-quit 'keyboard-quit
-                                 temp-global-map old-global-map)
-      (define-key temp-global-map [menu-bar] (lookup-key old-global-map [menu-bar]))
-      (define-key temp-global-map [tool-bar] (lookup-key old-global-map [tool-bar]))
-      (set-keymap-parent overriding-terminal-local-map keymap)
-      (if (current-local-map)
-          (define-key overriding-terminal-local-map [menu-bar]
-            (lookup-key (current-local-map) [menu-bar])))
-      (unwind-protect
-          (progn
-            (use-global-map temp-global-map)
-            (clear-this-command-keys)
-            (with-temp-message prompt
-              (read-key-sequence nil)))
-        (use-global-map old-global-map)
-        (if timer (cancel-timer timer))))))
-
-(defun popup-menu-fallback (event default))
-
-(cl-defun popup-menu-event-loop (menu
-                                 keymap
-                                 fallback
-                                 &key
-                                 prompt
-                                 help-delay
-                                 isearch
-                                 isearch-filter
-                                 isearch-cursor-color
-                                 isearch-keymap
-                                 isearch-callback
-                                 &aux key binding)
-  (cl-block nil
-    (while (popup-live-p menu)
-      (and isearch
-           (popup-isearch menu
-                          :filter isearch-filter
-                          :cursor-color isearch-cursor-color
-                          :keymap isearch-keymap
-                          :callback isearch-callback
-                          :help-delay help-delay)
-           (keyboard-quit))
-      (setq key (popup-menu-read-key-sequence keymap prompt help-delay))
-      (setq binding (and key (lookup-key keymap key)))
-      (cond
-       ((or (null key) (zerop (length key)))
-        (unless (funcall popup-menu-show-quick-help-function menu nil :prompt prompt)
-          (clear-this-command-keys)
-          (push (read-event prompt) unread-command-events)))
-       ((eq (lookup-key (current-global-map) key) 'keyboard-quit)
-        (keyboard-quit)
-        (cl-return))
-       ((eq binding 'popup-close)
-        (if (popup-parent menu)
-            (cl-return)))
-       ((memq binding '(popup-select popup-open))
-        (let* ((item (or (popup-menu-item-of-mouse-event (elt key 0))
-                         (popup-selected-item menu)))
-               (index (cl-position item (popup-list menu)))
-               (sublist (popup-item-sublist item)))
-          (unless index (cl-return))
-          (if sublist
-              (popup-aif (let (popup-use-optimized-column-computation)
-                           (popup-cascade-menu sublist
-                                               :around nil
-                                               :margin-left (popup-margin-left menu)
-                                               :margin-right (popup-margin-right menu)
-                                               :scroll-bar (popup-scroll-bar menu)
-                                               :parent menu
-                                               :parent-offset index
-                                               :help-delay help-delay
-                                               :isearch isearch
-                                               :isearch-filter isearch-filter
-                                               :isearch-cursor-color isearch-cursor-color
-                                               :isearch-keymap isearch-keymap
-                                               :isearch-callback isearch-callback))
-                  (and it (cl-return it)))
-            (if (eq binding 'popup-select)
-                (cl-return (popup-item-value-or-self item))))))
-       ((eq binding 'popup-next)
-        (popup-next menu))
-       ((eq binding 'popup-previous)
-        (popup-previous menu))
-       ((eq binding 'popup-page-next)
-        (popup-page-next menu))
-       ((eq binding 'popup-page-previous)
-        (popup-page-previous menu))
-       ((eq binding 'popup-help)
-        (popup-menu-show-help menu))
-       ((eq binding 'popup-isearch)
-        (popup-isearch menu
-                       :filter 'isearch-filter
-                       :cursor-color isearch-cursor-color
-                       :keymap isearch-keymap
-                       :callback isearch-callback
-                       :help-delay help-delay))
-       ((commandp binding)
-        (call-interactively binding))
-       (t
-        (funcall fallback key (key-binding key)))))))
-
-(defun popup-preferred-width (list)
-  "Return the preferred width to show LIST beautifully."
-  (cl-loop with tab-width = 4
-           for item in list
-           for summary = (popup-item-summary item)
-           maximize (string-width (popup-x-to-string item)) into width
-           if (stringp summary)
-           maximize (+ (string-width summary) 2) into summary-width
-           finally return
-           (let ((total (+ (or width 0) (or summary-width 0))))
-             (* (ceiling (/ total 10.0)) 10))))
-
-(defvar popup-menu-keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\r"        'popup-select)
-    (define-key map "\C-f"      'popup-open)
-    (define-key map [right]     'popup-open)
-    (define-key map "\C-b"      'popup-close)
-    (define-key map [left]      'popup-close)
-
-    (define-key map "\C-n"      'popup-next)
-    (define-key map [down]      'popup-next)
-    (define-key map "\C-p"      'popup-previous)
-    (define-key map [up]        'popup-previous)
-
-    (define-key map [next]      'popup-page-next)
-    (define-key map [prior]     'popup-page-previous)
-
-    (define-key map [f1]        'popup-help)
-    (define-key map (kbd "\C-?") 'popup-help)
-
-    (define-key map "\C-s"      'popup-isearch)
-
-    (define-key map [mouse-1]   'popup-select)
-    (define-key map [mouse-4]   'popup-previous)
-    (define-key map [mouse-5]   'popup-next)
-    map))
-
-(cl-defun popup-menu* (list
-                       &key
-                       point
-                       (around t)
-                       (width (popup-preferred-width list))
-                       (height 15)
-                       max-width
-                       margin
-                       margin-left
-                       margin-right
-                       scroll-bar
-                       symbol
-                       parent
-                       parent-offset
-                       cursor
-                       (keymap popup-menu-keymap)
-                       (fallback 'popup-menu-fallback)
-                       help-delay
-                       nowait
-                       prompt
-                       isearch
-                       (isearch-filter 'popup-isearch-filter-list)
-                       (isearch-cursor-color popup-isearch-cursor-color)
-                       (isearch-keymap popup-isearch-keymap)
-                       isearch-callback
-                       initial-index
-                       &aux menu event)
-  "Show a popup menu of LIST at POINT. This function returns a
-value of the selected item. Almost arguments are same as
-`popup-create' except for KEYMAP, FALLBACK, HELP-DELAY, PROMPT,
-ISEARCH, ISEARCH-FILTER, ISEARCH-CURSOR-COLOR, ISEARCH-KEYMAP, and
-ISEARCH-CALLBACK.
-
-If KEYMAP is a keymap which is used when processing events during
-event loop.
-
-If FALLBACK is a function taking two arguments; a key and a
-command. FALLBACK is called when no special operation is found on
-the key. The default value is `popup-menu-fallback', which does
-nothing.
-
-HELP-DELAY is a delay of displaying helps.
-
-If NOWAIT is non-nil, this function immediately returns the menu
-instance without entering event loop.
-
-PROMPT is a prompt string when reading events during event loop.
-
-If ISEARCH is non-nil, do isearch as soon as displaying the popup
-menu.
-
-ISEARCH-FILTER is a filtering function taking two arguments:
-search pattern and list of items. Returns a list of matching items.
-
-ISEARCH-CURSOR-COLOR is a cursor color during isearch. The
-default value is `popup-isearch-cursor-color'.
-
-ISEARCH-KEYMAP is a keymap which is used when processing events
-during event loop. The default value is `popup-isearch-keymap'.
-
-ISEARCH-CALLBACK is a function taking one argument.  `popup-menu'
-calls ISEARCH-CALLBACK, if specified, after isearch finished or
-isearch canceled. The arguments is whole filtered list of items.
-
-If `INITIAL-INDEX' is non-nil, this is an initial index value for
-`popup-select'. Only positive integer is valid."
-  (and (eq margin t) (setq margin 1))
-  (or margin-left (setq margin-left margin))
-  (or margin-right (setq margin-right margin))
-  (if (and scroll-bar
-           (integerp margin-right)
-           (> margin-right 0))
-      ;; Make scroll-bar space as margin-right
-      (cl-decf margin-right))
-  (setq menu (popup-create point width height
-                           :max-width max-width
-                           :around around
-                           :face 'popup-menu-face
-                           :mouse-face 'popup-menu-mouse-face
-                           :selection-face 'popup-menu-selection-face
-                           :summary-face 'popup-menu-summary-face
-                           :margin-left margin-left
-                           :margin-right margin-right
-                           :scroll-bar scroll-bar
-                           :symbol symbol
-                           :parent parent
-                           :parent-offset parent-offset))
-  (unwind-protect
-      (progn
-        (popup-set-list menu list)
-        (if cursor
-            (popup-jump menu cursor)
-          (popup-draw menu))
-        (when initial-index
-          (dotimes (_i (min (- (length list) 1) initial-index))
-            (popup-next menu)))
-        (if nowait
-            menu
-          (popup-menu-event-loop menu keymap fallback
-                                 :prompt prompt
-                                 :help-delay help-delay
-                                 :isearch isearch
-                                 :isearch-filter isearch-filter
-                                 :isearch-cursor-color isearch-cursor-color
-                                 :isearch-keymap isearch-keymap
-                                 :isearch-callback isearch-callback)))
-    (unless nowait
-      (popup-delete menu))))
-
-(defun popup-cascade-menu (list &rest args)
-  "Same as `popup-menu' except that an element of LIST can be
-also a sub-menu if the element is a cons cell formed (ITEM
-. SUBLIST) where ITEM is an usual item and SUBLIST is a list of
-the sub menu."
-  (apply 'popup-menu*
-         (mapcar (lambda (item)
-                   (if (consp item)
-                       (popup-make-item (car item)
-                                        :sublist (cdr item)
-                                        :symbol ">")
-                     item))
-                 list)
-         :symbol t
-         args))
-
-(provide 'popup)
-;;; popup.el ends here
diff --git a/emacs.d/elpa/popup-20151222.1339/popup-autoloads.el b/emacs.d/elpa/popup-20151222.1339/popup-autoloads.el
new file mode 100644
index 0000000..b6f81c2
--- /dev/null
+++ b/emacs.d/elpa/popup-20151222.1339/popup-autoloads.el
@@ -0,0 +1,15 @@
+;;; popup-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil nil ("popup.el") (22171 46549 27075 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; popup-autoloads.el ends here
diff --git a/emacs.d/elpa/popup-20151222.1339/popup-pkg.el b/emacs.d/elpa/popup-20151222.1339/popup-pkg.el
new file mode 100644
index 0000000..751942a
--- /dev/null
+++ b/emacs.d/elpa/popup-20151222.1339/popup-pkg.el
@@ -0,0 +1 @@
+(define-package "popup" "20151222.1339" "Visual Popup User Interface" '((cl-lib "0.5")) :keywords '("lisp"))
diff --git a/emacs.d/elpa/popup-20151222.1339/popup.el b/emacs.d/elpa/popup-20151222.1339/popup.el
new file mode 100644
index 0000000..c206c1f
--- /dev/null
+++ b/emacs.d/elpa/popup-20151222.1339/popup.el
@@ -0,0 +1,1428 @@
+;;; popup.el --- Visual Popup User Interface
+
+;; Copyright (C) 2009-2015  Tomohiro Matsuyama
+
+;; Author: Tomohiro Matsuyama <m2ym.pub@gmail.com>
+;; Keywords: lisp
+;; Package-Version: 20151222.1339
+;; Version: 0.5.3
+;; Package-Requires: ((cl-lib "0.5"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; popup.el is a visual popup user interface library for Emacs. This
+;; provides a basic API and common UI widgets such as popup tooltips
+;; and popup menus.
+;; See README.markdown for more information.
+
+;;; Code:
+
+(require 'cl-lib)
+
+(defconst popup-version "0.5.3")
+
+
+
+;;; Utilities
+
+(defun popup-calculate-max-width (max-width)
+  "Determines whether the width desired is
+character or window proportion based, And returns the result."
+  (cl-typecase max-width
+    (integer max-width)
+    (float (* (ceiling (/ (round (* max-width (window-width))) 10.0)) 10))))
+
+(defvar popup-use-optimized-column-computation t
+  "Use the optimized column computation routine.
+If there is a problem, please set it nil.")
+
+(defmacro popup-aif (test then &rest else)
+  "Anaphoric if."
+  (declare (indent 2))
+  `(let ((it ,test))
+     (if it ,then ,@else)))
+
+(defmacro popup-awhen (test &rest body)
+  "Anaphoric when."
+  (declare (indent 1))
+  `(let ((it ,test))
+     (when it ,@body)))
+
+(defun popup-x-to-string (x)
+  "Convert any object to string effeciently.
+This is faster than `prin1-to-string' in many cases."
+  (cl-typecase x
+    (string x)
+    (symbol (symbol-name x))
+    (integer (number-to-string x))
+    (float (number-to-string x))
+    (t (format "%s" x))))
+
+(defun popup-substring-by-width (string width)
+  "Return a cons cell of substring and remaining string by
+splitting with WIDTH."
+  ;; Expand tabs into 4 spaces
+  (setq string (replace-regexp-in-string "\t" "    " string))
+  (cl-loop with len = (length string)
+           with w = 0
+           for l from 0
+           for c in (append string nil)
+           while (<= (cl-incf w (char-width c)) width)
+           finally return
+           (if (< l len)
+               (cons (substring string 0 l) (substring string l))
+             (list string))))
+
+(defun popup-fill-string (string &optional width max-width justify squeeze)
+  "Split STRING into fixed width strings and return a cons cell
+like \(WIDTH . ROWS). Here, the car WIDTH indicates the actual
+maxim width of ROWS.
+
+The argument WIDTH specifies the width of filling each
+paragraph. WIDTH nil means don't perform any justification and
+word wrap. Note that this function doesn't add any padding
+characters at the end of each row.
+
+MAX-WIDTH, if WIDTH is nil, specifies the maximum number of
+columns.
+
+The optional fourth argument JUSTIFY specifies which kind of
+justification to do: `full', `left', `right', `center', or
+`none' (equivalent to nil).  A value of t means handle each
+paragraph as specified by its text properties.
+
+SQUEEZE nil means leave whitespaces other than line breaks
+untouched."
+  (if (eq width 0)
+      (error "Can't fill string with 0 width"))
+  (if width
+      (setq max-width width))
+  (with-temp-buffer
+    (let ((tab-width 4)
+          (fill-column width)
+          (left-margin 0)
+          (kinsoku-limit 1)
+          indent-tabs-mode
+          row rows)
+      (insert string)
+      (untabify (point-min) (point-max))
+      (if width
+          (fill-region (point-min) (point-max) justify (not squeeze)))
+      (goto-char (point-min))
+      (setq width 0)
+      (while (prog2
+                 (let ((line (buffer-substring
+                              (point) (progn (end-of-line) (point)))))
+                   (if max-width
+                       (while (progn
+                                (setq row (truncate-string-to-width line max-width)
+                                      width (max width (string-width row)))
+                                (push row rows)
+                                (if (not (= (length row) (length line)))
+                                    (setq line (substring line (length row))))))
+                     (setq width (max width (string-width line)))
+                     (push line rows)))
+                 (< (point) (point-max))
+               (beginning-of-line 2)))
+      (cons width (nreverse rows)))))
+
+(defmacro popup-save-buffer-state (&rest body)
+  (declare (indent 0))
+  `(save-excursion
+     (let ((buffer-undo-list t)
+           (inhibit-read-only t)
+           (modified (buffer-modified-p)))
+       (unwind-protect
+           (progn ,@body)
+         (set-buffer-modified-p modified)))))
+
+(defun popup-vertical-motion (column direction)
+  "A portable version of `vertical-motion'."
+  (if (>= emacs-major-version 23)
+      (vertical-motion (cons column direction))
+    (vertical-motion direction)
+    (move-to-column (+ (current-column) column))))
+
+(defun popup-last-line-of-buffer-p ()
+  "Return non-nil if the cursor is at the last line of the
+buffer."
+  (save-excursion (end-of-line) (/= (forward-line) 0)))
+
+(defun popup-lookup-key-by-event (function event)
+  (or (funcall function (vector event))
+      (if (symbolp event)
+          (popup-aif (get event 'event-symbol-element-mask)
+              (funcall function
+                       (vector (logior (or (get (car it) 'ascii-character)
+                                           0)
+                                       (cadr it))))))))
+
+
+
+;;; Core
+
+(defgroup popup nil
+  "Visual Popup User Interface"
+  :group 'lisp
+  :prefix "popup-")
+
+(defface popup-face
+  '((t (:background "lightgray" :foreground "black")))
+  "Face for popup."
+  :group 'popup)
+
+(defface popup-summary-face
+  '((t (:inherit popup-face :foreground "dimgray")))
+  "Face for popup summary."
+  :group 'popup)
+
+(defface popup-scroll-bar-foreground-face
+  '((t (:background "black")))
+  "Foreground face for scroll-bar."
+  :group 'popup)
+
+(defface popup-scroll-bar-background-face
+  '((t (:background "gray")))
+  "Background face for scroll-bar."
+  :group 'popup)
+
+(defvar popup-instances nil
+  "Popup instances.")
+
+(defvar popup-scroll-bar-foreground-char
+  (propertize " " 'face 'popup-scroll-bar-foreground-face)
+  "Foreground character for scroll-bar.")
+
+(defvar popup-scroll-bar-background-char
+  (propertize " " 'face 'popup-scroll-bar-background-face)
+  "Background character for scroll-bar.")
+
+(cl-defstruct popup
+  point row column width height min-height direction overlays keymap
+  parent depth
+  face mouse-face selection-face summary-face
+  margin-left margin-right margin-left-cancel scroll-bar symbol
+  cursor offset scroll-top current-height list newlines
+  pattern original-list invis-overlays)
+
+(defun popup-item-propertize (item &rest properties)
+  "Same as `propertize' except that this avoids overriding
+existed value with `nil' property."
+  (cl-loop for (k v) on properties by 'cddr
+           if v append (list k v) into props
+           finally return
+           (apply 'propertize
+                  (popup-x-to-string item)
+                  props)))
+
+(defun popup-item-property (item property)
+  "Same as `get-text-property' except that this returns nil if
+ITEM is not string."
+  (if (stringp item)
+      (get-text-property 0 property item)))
+
+(cl-defun popup-make-item (name
+                           &key
+                           value
+                           face
+                           mouse-face
+                           selection-face
+                           sublist
+                           document
+                           symbol
+                           summary)
+  "Utility function to make popup item. See also
+`popup-item-propertize'."
+  (popup-item-propertize name
+                         'value value
+                         'popup-face face
+                         'popup-mouse-face mouse-face
+                         'selection-face selection-face
+                         'document document
+                         'symbol symbol
+                         'summary summary
+                         'sublist sublist))
+
+(defsubst popup-item-value (item)               (popup-item-property item 'value))
+(defsubst popup-item-value-or-self (item)       (or (popup-item-value item) item))
+(defsubst popup-item-face (item)                (popup-item-property item 'popup-face))
+(defsubst popup-item-mouse-face (item)          (popup-item-property item 'popup-mouse-face))
+(defsubst popup-item-selection-face (item)      (popup-item-property item 'selection-face))
+(defsubst popup-item-document (item)            (popup-item-property item 'document))
+(defsubst popup-item-summary (item)             (popup-item-property item 'summary))
+(defsubst popup-item-symbol (item)              (popup-item-property item 'symbol))
+(defsubst popup-item-sublist (item)             (popup-item-property item 'sublist))
+
+(defun popup-item-documentation (item)
+  (let ((doc (popup-item-document item)))
+    (if (functionp doc)
+        (setq doc (funcall doc (popup-item-value-or-self item))))
+    doc))
+
+(defun popup-item-show-help-1 (item)
+  (let ((doc (popup-item-documentation item)))
+    (when doc
+      (with-current-buffer (get-buffer-create " *Popup Help*")
+        (erase-buffer)
+        (insert doc)
+        (goto-char (point-min))
+        (display-buffer (current-buffer)))
+      t)))
+
+(defun popup-item-show-help-with-event-loop (item)
+  (save-window-excursion
+    (when (popup-item-show-help-1 item)
+      (cl-loop do (clear-this-command-keys)
+               for key = (read-key-sequence-vector nil)
+               do
+               (cl-case (key-binding key)
+                 (scroll-other-window
+                  (scroll-other-window))
+                 (scroll-other-window-down
+                  (scroll-other-window-down nil))
+                 (otherwise
+                  (setq unread-command-events (append key unread-command-events))
+                  (cl-return)))))))
+
+(defun popup-item-show-help (item &optional persist)
+  "Display the documentation of ITEM with `display-buffer'. If
+PERSIST is nil, the documentation buffer will be closed
+automatically, meaning interal event loop ensures the buffer to
+be closed. Otherwise, the buffer will be just displayed as
+usual."
+  (when item
+    (if (not persist)
+        (popup-item-show-help-with-event-loop item)
+      (popup-item-show-help-1 item))))
+
+(defun popup-set-list (popup list)
+  (popup-set-filtered-list popup list)
+  (setf (popup-pattern popup) nil)
+  (setf (popup-original-list popup) list))
+
+(defun popup-set-filtered-list (popup list)
+  (let ((offset
+         (if (> (popup-direction popup) 0)
+             0
+           (max (- (popup-height popup) (length list)) 0))))
+    (setf (popup-list popup) list
+          (popup-offset popup) offset)))
+
+(defun popup-selected-item (popup)
+  (nth (popup-cursor popup) (popup-list popup)))
+
+(defun popup-selected-line (popup)
+  (- (popup-cursor popup) (popup-scroll-top popup)))
+
+(defun popup-line-overlay (popup line)
+  (aref (popup-overlays popup) line))
+
+(defun popup-selected-line-overlay (popup)
+  (popup-line-overlay popup (popup-selected-line popup)))
+
+(defun popup-hide-line (popup line)
+  (let ((overlay (popup-line-overlay popup line)))
+    (overlay-put overlay 'display nil)
+    (overlay-put overlay 'after-string nil)))
+
+(defun popup-line-hidden-p (popup line)
+  (let ((overlay (popup-line-overlay popup line)))
+    (and (eq (overlay-get overlay 'display) nil)
+         (eq (overlay-get overlay 'after-string) nil))))
+
+(cl-defun popup-set-line-item (popup
+                               line
+                               &key
+                               item
+                               face
+                               mouse-face
+                               margin-left
+                               margin-right
+                               scroll-bar-char
+                               symbol
+                               summary
+                               summary-face
+                               keymap)
+  (let* ((overlay (popup-line-overlay popup line))
+         (content (popup-create-line-string popup (popup-x-to-string item)
+                                            :margin-left margin-left
+                                            :margin-right margin-right
+                                            :symbol symbol
+                                            :summary summary
+                                            :summary-face summary-face))
+         (start 0)
+         (prefix (overlay-get overlay 'prefix))
+         (postfix (overlay-get overlay 'postfix))
+         end)
+    (put-text-property 0 (length content) 'popup-item item content)
+    (put-text-property 0 (length content) 'keymap keymap content)
+    ;; Overlap face properties
+    (when (get-text-property start 'face content)
+      (setq start (next-single-property-change start 'face content)))
+    (while (and start (setq end (next-single-property-change start 'face content)))
+      (put-text-property start end 'face face content)
+      (setq start (next-single-property-change end 'face content)))
+    (when start
+      (put-text-property start (length content) 'face face content))
+    (when mouse-face
+      (put-text-property 0 (length content) 'mouse-face mouse-face content))
+    (let ((prop (if (overlay-get overlay 'dangle)
+                    'after-string
+                  'display)))
+      (overlay-put overlay
+                   prop
+                   (concat prefix
+                           content
+                           scroll-bar-char
+                           postfix)))))
+
+(cl-defun popup-create-line-string (popup
+                                    string
+                                    &key
+                                    margin-left
+                                    margin-right
+                                    symbol
+                                    summary
+                                    summary-face)
+  (let* ((popup-width (popup-width popup))
+         (summary-width (string-width summary))
+         (content-width (max
+                         (min popup-width (string-width string))
+                         (- popup-width
+                            (if (> summary-width 0)
+                                (+ summary-width 2)
+                              0))))
+         (string (car (popup-substring-by-width string content-width)))
+         (string-width (string-width string))
+         (spacing (max (- popup-width string-width summary-width)
+                       (if (> popup-width string-width) 1 0)))
+         (truncated-summary
+          (car (popup-substring-by-width
+                summary (max (- popup-width string-width spacing) 0)))))
+    (when summary-face
+      (put-text-property 0 (length truncated-summary)
+                         'face summary-face truncated-summary))
+    (concat margin-left
+            string
+            (make-string spacing ? )
+            truncated-summary
+            symbol
+            margin-right)))
+
+(defun popup-live-p (popup)
+  "Return non-nil if POPUP is alive."
+  (and popup (popup-overlays popup) t))
+
+(defun popup-child-point (popup &optional offset)
+  (overlay-end
+   (popup-line-overlay
+    popup
+    (or offset
+        (popup-selected-line popup)))))
+
+(defun popup-calculate-direction (height row)
+  "Return a proper direction when displaying a popup on this
+window. HEIGHT is the a height of the popup, and ROW is a line
+number at the point."
+  (let* ((remaining-rows (- (max 1 (- (window-height)
+                                      (if mode-line-format 1 0)
+                                      (if header-line-format 1 0)))
+                            (count-lines (window-start) (point))))
+         (enough-space-above (> row height))
+         (enough-space-below (<= height remaining-rows)))
+    (if (and enough-space-above
+             (not enough-space-below))
+        -1
+      1)))
+
+(cl-defun popup-create (point
+                        width
+                        height
+                        &key
+                        min-height
+                        max-width
+                        around
+                        (face 'popup-face)
+                        mouse-face
+                        (selection-face face)
+                        (summary-face 'popup-summary-face)
+                        scroll-bar
+                        margin-left
+                        margin-right
+                        symbol
+                        parent
+                        parent-offset
+                        keymap)
+  "Create a popup instance at POINT with WIDTH and HEIGHT.
+
+MIN-HEIGHT is a minimal height of the popup. The default value is
+0.
+
+MAX-WIDTH is the maximum width of the popup. The default value is
+nil (no limit). If a floating point, the value refers to the ratio of
+the window. If an integer, limit is in characters.
+
+If AROUND is non-nil, the popup will be displayed around the
+point but not at the point.
+
+FACE is a background face of the popup. The default value is POPUP-FACE.
+
+SELECTION-FACE is a foreground (selection) face of the popup The
+default value is POPUP-FACE.
+
+If SCROLL-BAR is non-nil, the popup will have a scroll bar at the
+right.
+
+If MARGIN-LEFT is non-nil, the popup will have a margin at the
+left.
+
+If MARGIN-RIGHT is non-nil, the popup will have a margin at the
+right.
+
+SYMBOL is a single character which indicates a kind of the item.
+
+PARENT is a parent popup instance. If PARENT is omitted, the
+popup will be a root instance.
+
+PARENT-OFFSET is a row offset from the parent popup.
+
+KEYMAP is a keymap that will be put on the popup contents."
+  (or margin-left (setq margin-left 0))
+  (or margin-right (setq margin-right 0))
+  (unless point
+    (setq point
+          (if parent (popup-child-point parent parent-offset) (point))))
+  (when max-width
+    (setq width (min width (popup-calculate-max-width max-width))))
+  (save-excursion
+    (goto-char point)
+    (let* ((col-row (posn-col-row (posn-at-point)))
+           (row (cdr col-row))
+           (column (car col-row))
+           (overlays (make-vector height nil))
+           (popup-width (+ width
+                           (if scroll-bar 1 0)
+                           margin-left
+                           margin-right
+                           (if symbol 2 0)))
+           margin-left-cancel
+           (window (selected-window))
+           (window-start (window-start))
+           (window-hscroll (window-hscroll))
+           (window-width (window-width))
+           (right (+ column popup-width))
+           (overflow (and (> right window-width)
+                          (>= right popup-width)))
+           (foldable (and (null parent)
+                          (>= column popup-width)))
+           (direction (or
+                       ;; Currently the direction of cascade popup won't be changed
+                       (and parent (popup-direction parent))
+
+                       ;; Calculate direction
+                       (popup-calculate-direction height row)))
+           (depth (if parent (1+ (popup-depth parent)) 0))
+           (newlines (max 0 (+ (- height (count-lines point (point-max))) (if around 1 0))))
+           invis-overlays
+           current-column)
+      ;; Case: no newlines at the end of the buffer
+      (when (> newlines 0)
+        (popup-save-buffer-state
+          (goto-char (point-max))
+          (insert (make-string newlines ?\n))))
+
+      ;; Case: the popup overflows
+      (if overflow
+          (if foldable
+              (progn
+                (cl-decf column (- popup-width margin-left margin-right))
+                (unless around (move-to-column column)))
+            (when (not truncate-lines)
+              ;; Truncate.
+              (let ((d (1+ (- popup-width (- window-width column)))))
+                (cl-decf popup-width d)
+                (cl-decf width d)))
+            (cl-decf column margin-left))
+        (cl-decf column margin-left))
+
+      ;; Case: no space at the left
+      (when (and (null parent)
+                 (< column 0))
+        ;; Cancel margin left
+        (setq column 0)
+        (cl-decf popup-width margin-left)
+        (setq margin-left-cancel t))
+
+      (dotimes (i height)
+        (let (overlay begin w (dangle t) (prefix "") (postfix ""))
+          (when around
+            (popup-vertical-motion column direction))
+          (cl-loop for ov in (overlays-in (save-excursion
+                                            (beginning-of-visual-line)
+                                            (point))
+                                          (save-excursion
+                                            (end-of-visual-line)
+                                            (point)))
+                   when (and (not (overlay-get ov 'popup))
+                             (not (overlay-get ov 'popup-item))
+                             (or (overlay-get ov 'invisible)
+                                 (overlay-get ov 'display)))
+                   do (progn
+                        (push (list ov (overlay-get ov 'display)) invis-overlays)
+                        (overlay-put ov 'display "")))
+          (setq around t)
+          (setq current-column (car (posn-col-row (posn-at-point))))
+
+          (when (< current-column column)
+            ;; Extend short buffer lines by popup prefix (line of spaces)
+            (setq prefix (make-string
+                          (+ (if (= current-column 0)
+                                 (- window-hscroll current-column)
+                               0)
+                             (- column current-column))
+                          ? )))
+
+          (setq begin (point))
+          (setq w (+ popup-width (length prefix)))
+          (while (and (not (eolp)) (> w 0))
+            (setq dangle nil)
+            (cl-decf w (char-width (char-after)))
+            (forward-char))
+          (if (< w 0)
+              (setq postfix (make-string (- w) ? )))
+
+          (setq overlay (make-overlay begin (point)))
+          (overlay-put overlay 'popup t)
+          (overlay-put overlay 'window window)
+          (overlay-put overlay 'dangle dangle)
+          (overlay-put overlay 'prefix prefix)
+          (overlay-put overlay 'postfix postfix)
+          (overlay-put overlay 'width width)
+          (aset overlays
+                (if (> direction 0) i (- height i 1))
+                overlay)))
+      (cl-loop for p from (- 10000 (* depth 1000))
+               for overlay in (nreverse (append overlays nil))
+               do (overlay-put overlay 'priority p))
+      (let ((it (make-popup :point point
+                            :row row
+                            :column column
+                            :width width
+                            :height height
+                            :min-height min-height
+                            :direction direction
+                            :parent parent
+                            :depth depth
+                            :face face
+                            :mouse-face mouse-face
+                            :selection-face selection-face
+                            :summary-face summary-face
+                            :margin-left margin-left
+                            :margin-right margin-right
+                            :margin-left-cancel margin-left-cancel
+                            :scroll-bar scroll-bar
+                            :symbol symbol
+                            :cursor 0
+                            :offset 0
+                            :scroll-top 0
+                            :current-height 0
+                            :list nil
+                            :newlines newlines
+                            :overlays overlays
+                            :invis-overlays invis-overlays
+                            :keymap keymap)))
+        (push it popup-instances)
+        it))))
+
+(defun popup-delete (popup)
+  "Delete POPUP instance."
+  (when (popup-live-p popup)
+    (popup-hide popup)
+    (mapc 'delete-overlay (popup-overlays popup))
+    (setf (popup-overlays popup) nil)
+    (setq popup-instances (delq popup popup-instances))
+    ;; Restore newlines state
+    (let ((newlines (popup-newlines popup)))
+      (when (> newlines 0)
+        (popup-save-buffer-state
+          (goto-char (point-max))
+          (dotimes (i newlines)
+            (if (and (char-before)
+                     (= (char-before) ?\n))
+                (delete-char -1)))))))
+  nil)
+
+(defun popup-draw (popup)
+  "Draw POPUP."
+  (cl-loop for (ov olddisplay) in (popup-invis-overlays popup)
+           do (overlay-put ov 'display ""))
+
+  (cl-loop with height = (popup-height popup)
+           with min-height = (popup-min-height popup)
+           with popup-face = (popup-face popup)
+           with mouse-face = (popup-mouse-face popup)
+           with selection-face = (popup-selection-face popup)
+           with summary-face-0 = (popup-summary-face popup)
+           with list = (popup-list popup)
+           with length = (length list)
+           with thum-size = (max (/ (* height height) (max length 1)) 1)
+           with page-size = (/ (+ 0.0 (max length 1)) height)
+           with scroll-bar = (popup-scroll-bar popup)
+           with margin-left = (make-string (if (popup-margin-left-cancel popup) 0 (popup-margin-left popup)) ? )
+           with margin-right = (make-string (popup-margin-right popup) ? )
+           with symbol = (popup-symbol popup)
+           with cursor = (popup-cursor popup)
+           with scroll-top = (popup-scroll-top popup)
+           with offset = (popup-offset popup)
+           with keymap = (popup-keymap popup)
+           for o from offset
+           for i from scroll-top
+           while (< o height)
+           for item in (nthcdr scroll-top list)
+           for page-index = (* thum-size (/ o thum-size))
+           for face = (if (= i cursor)
+                          (or (popup-item-selection-face item) selection-face)
+                        (or (popup-item-face item) popup-face))
+           for summary-face = (unless (= i cursor) summary-face-0)
+           for empty-char = (propertize " " 'face face)
+           for scroll-bar-char = (if scroll-bar
+                                     (cond
+                                      ((and (not (eq scroll-bar :always))
+                                            (<= page-size 1))
+                                       empty-char)
+                                      ((and (> page-size 1)
+                                            (>= cursor (* page-index page-size))
+                                            (< cursor (* (+ page-index thum-size) page-size)))
+                                       popup-scroll-bar-foreground-char)
+                                      (t
+                                       popup-scroll-bar-background-char))
+                                   "")
+           for sym = (if symbol
+                         (concat " " (or (popup-item-symbol item) " "))
+                       "")
+           for summary = (or (popup-item-summary item) "")
+
+           do
+           ;; Show line and set item to the line
+           (popup-set-line-item popup o
+                                :item item
+                                :face face
+                                :mouse-face mouse-face
+                                :margin-left margin-left
+                                :margin-right margin-right
+                                :scroll-bar-char scroll-bar-char
+                                :symbol sym
+                                :summary summary
+                                :summary-face summary-face
+                                :keymap keymap)
+
+           finally
+           ;; Remember current height
+           (setf (popup-current-height popup) (- o offset))
+
+           ;; Hide remaining lines
+           (let ((scroll-bar-char (if scroll-bar (propertize " " 'face popup-face) ""))
+                 (symbol (if symbol " " "")))
+             (if (> (popup-direction popup) 0)
+                 (progn
+                   (when min-height
+                     (while (< o min-height)
+                       (popup-set-line-item popup o
+                                            :item ""
+                                            :face popup-face
+                                            :margin-left margin-left
+                                            :margin-right margin-right
+                                            :scroll-bar-char scroll-bar-char
+                                            :symbol symbol
+                                            :summary "")
+                       (cl-incf o)))
+                   (while (< o height)
+                     (popup-hide-line popup o)
+                     (cl-incf o)))
+               (cl-loop with h = (if min-height (- height min-height) offset)
+                        for o from 0 below offset
+                        if (< o h)
+                        do (popup-hide-line popup o)
+                        if (>= o h)
+                        do (popup-set-line-item popup o
+                                                :item ""
+                                                :face popup-face
+                                                :margin-left margin-left
+                                                :margin-right margin-right
+                                                :scroll-bar-char scroll-bar-char
+                                                :symbol symbol
+                                                :summary ""))))))
+
+(defun popup-hide (popup)
+  "Hide POPUP."
+  (cl-loop for (ov olddisplay) in (popup-invis-overlays popup)
+           do (overlay-put ov 'display olddisplay))
+  (dotimes (i (popup-height popup))
+    (popup-hide-line popup i)))
+
+(defun popup-hidden-p (popup)
+  "Return non-nil if POPUP is hidden."
+  (let ((hidden t))
+    (when (popup-live-p popup)
+      (dotimes (i (popup-height popup))
+        (unless (popup-line-hidden-p popup i)
+          (setq hidden nil))))
+    hidden))
+
+(defun popup-jump (popup cursor)
+  "Jump to a position specified by CURSOR of POPUP and draw."
+  (let ((scroll-top (popup-scroll-top popup)))
+    ;; Do not change page as much as possible.
+    (unless (and (<= scroll-top cursor)
+                 (< cursor (+ scroll-top (popup-height popup))))
+      (setf (popup-scroll-top popup) cursor))
+    (setf (popup-cursor popup) cursor)
+    (popup-draw popup)))
+
+(defun popup-select (popup i)
+  "Select the item at I of POPUP and draw."
+  (setq i (+ i (popup-offset popup)))
+  (when (and (<= 0 i) (< i (popup-height popup)))
+    (setf (popup-cursor popup) i)
+    (popup-draw popup)
+    t))
+
+(defun popup-next (popup)
+  "Select the next item of POPUP and draw."
+  (let ((height (popup-height popup))
+        (cursor (1+ (popup-cursor popup)))
+        (scroll-top (popup-scroll-top popup))
+        (length (length (popup-list popup))))
+    (cond
+     ((>= cursor length)
+      ;; Back to first page
+      (setq cursor 0
+            scroll-top 0))
+     ((= cursor (+ scroll-top height))
+      ;; Go to next page
+      (setq scroll-top (min (1+ scroll-top) (max (- length height) 0)))))
+    (setf (popup-cursor popup) cursor
+          (popup-scroll-top popup) scroll-top)
+    (popup-draw popup)))
+
+(defun popup-previous (popup)
+  "Select the previous item of POPUP and draw."
+  (let ((height (popup-height popup))
+        (cursor (1- (popup-cursor popup)))
+        (scroll-top (popup-scroll-top popup))
+        (length (length (popup-list popup))))
+    (cond
+     ((< cursor 0)
+      ;; Go to last page
+      (setq cursor (1- length)
+            scroll-top (max (- length height) 0)))
+     ((= cursor (1- scroll-top))
+      ;; Go to previous page
+      (cl-decf scroll-top)))
+    (setf (popup-cursor popup) cursor
+          (popup-scroll-top popup) scroll-top)
+    (popup-draw popup)))
+
+(defun popup-page-next (popup)
+  "Select next item of POPUP per `popup-height' range.
+Pages down through POPUP."
+  (dotimes (counter (1- (popup-height popup)))
+    (popup-next popup)))
+
+(defun popup-page-previous (popup)
+  "Select previous item of POPUP per `popup-height' range.
+Pages up through POPUP."
+  (dotimes (counter (1- (popup-height popup)))
+    (popup-previous popup)))
+
+(defun popup-scroll-down (popup &optional n)
+  "Scroll down N of POPUP and draw."
+  (let ((scroll-top (min (+ (popup-scroll-top popup) (or n 1))
+                         (- (length (popup-list popup)) (popup-height popup)))))
+    (setf (popup-cursor popup) scroll-top
+          (popup-scroll-top popup) scroll-top)
+    (popup-draw popup)))
+
+(defun popup-scroll-up (popup &optional n)
+  "Scroll up N of POPUP and draw."
+  (let ((scroll-top (max (- (popup-scroll-top popup) (or n 1))
+                         0)))
+    (setf (popup-cursor popup) scroll-top
+          (popup-scroll-top popup) scroll-top)
+    (popup-draw popup)))
+
+
+
+;;; Popup Incremental Search
+
+(defface popup-isearch-match
+  '((t (:background "sky blue")))
+  "Popup isearch match face."
+  :group 'popup)
+
+(defvar popup-isearch-cursor-color "blue")
+
+(defvar popup-isearch-keymap
+  (let ((map (make-sparse-keymap)))
+    ;(define-key map "\r"        'popup-isearch-done)
+    (define-key map "\C-g"      'popup-isearch-cancel)
+    (define-key map "\C-b"      'popup-isearch-close)
+    (define-key map [left]      'popup-isearch-close)
+    (define-key map "\C-h"      'popup-isearch-delete)
+    (define-key map (kbd "DEL") 'popup-isearch-delete)
+    map))
+
+(defvar popup-menu-show-quick-help-function 'popup-menu-show-quick-help
+  "Function used for showing quick help by `popup-menu*'.")
+
+(defcustom popup-isearch-regexp-builder-function #'regexp-quote
+  "Function used to construct a regexp from a pattern. You may for instance
+  provide a function that replaces spaces by '.+' if you like helm or ivy style
+  of completion."
+  :type 'function)
+
+(defsubst popup-isearch-char-p (char)
+  (and (integerp char)
+       (<= 32 char)
+       (<= char 126)))
+
+(defun popup-isearch-filter-list (pattern list)
+  (cl-loop with regexp = (funcall popup-isearch-regexp-builder-function pattern)
+           for item in list
+           do
+           (unless (stringp item)
+             (setq item (popup-item-propertize (popup-x-to-string item)
+                                               'value item)))
+           if (string-match regexp item)
+           collect
+           (let ((beg (match-beginning 0))
+                 (end (match-end 0)))
+             (alter-text-property 0 (length item) 'face
+                                  (lambda (prop)
+                                    (unless (eq prop 'popup-isearch-match)
+                                      prop))
+                                  item)
+             (put-text-property beg end
+                                'face 'popup-isearch-match
+                                item)
+             item)))
+
+(defun popup-isearch-prompt (popup pattern)
+  (format "Pattern: %s" (if (= (length (popup-list popup)) 0)
+                            (propertize pattern 'face 'isearch-fail)
+                          pattern)))
+
+(defun popup-isearch-update (popup filter pattern &optional callback)
+  (setf (popup-cursor popup) 0
+        (popup-scroll-top popup) 0
+        (popup-pattern popup) pattern)
+  (let ((list (funcall filter pattern (popup-original-list popup))))
+    (popup-set-filtered-list popup list)
+    (if callback
+        (funcall callback list)))
+  (popup-draw popup))
+
+(cl-defun popup-isearch (popup
+                         &key
+                         (filter 'popup-isearch-filter-list)
+                         (cursor-color popup-isearch-cursor-color)
+                         (keymap popup-isearch-keymap)
+                         callback
+                         help-delay)
+  "Start isearch on POPUP. This function is synchronized, meaning
+event loop waits for quiting of isearch.
+
+FILTER is function with two argumenst to perform popup items filtering.
+
+CURSOR-COLOR is a cursor color during isearch. The default value
+is `popup-isearch-cursor-color'.
+
+KEYMAP is a keymap which is used when processing events during
+event loop. The default value is `popup-isearch-keymap'.
+
+CALLBACK is a function taking one argument. `popup-isearch' calls
+CALLBACK, if specified, after isearch finished or isearch
+canceled. The arguments is whole filtered list of items.
+
+HELP-DELAY is a delay of displaying helps."
+  (let ((list (popup-original-list popup))
+        (pattern (or (popup-pattern popup) ""))
+        (old-cursor-color (frame-parameter (selected-frame) 'cursor-color))
+        prompt key binding)
+    (unwind-protect
+        (cl-block nil
+          (if cursor-color
+              (set-cursor-color cursor-color))
+          (while t
+            (setq prompt (popup-isearch-prompt popup pattern))
+            (setq key (popup-menu-read-key-sequence keymap prompt help-delay))
+            (if (null key)
+                (unless (funcall popup-menu-show-quick-help-function popup nil :prompt prompt)
+                  (clear-this-command-keys)
+                  (push (read-event prompt) unread-command-events))
+              (setq binding (lookup-key keymap key))
+              (cond
+               ((and (stringp key)
+                     (popup-isearch-char-p (aref key 0)))
+                (setq pattern (concat pattern key)))
+               ((eq binding 'popup-isearch-done)
+                (cl-return nil))
+               ((eq binding 'popup-isearch-cancel)
+                (popup-isearch-update popup filter "" callback)
+                (cl-return t))
+               ((eq binding 'popup-isearch-close)
+                (popup-isearch-update popup filter "" callback)
+                (setq unread-command-events
+                      (append (listify-key-sequence key) unread-command-events))
+                (cl-return nil))
+               ((eq binding 'popup-isearch-delete)
+                (if (> (length pattern) 0)
+                    (setq pattern (substring pattern 0 (1- (length pattern))))))
+               (t
+                (setq unread-command-events
+                      (append (listify-key-sequence key) unread-command-events))
+                (cl-return nil)))
+              (popup-isearch-update popup filter pattern callback))))
+      (if old-cursor-color
+          (set-cursor-color old-cursor-color)))))
+
+
+
+;;; Popup Tip
+
+(defface popup-tip-face
+  '((t (:background "khaki1" :foreground "black")))
+  "Face for popup tip."
+  :group 'popup)
+
+(defvar popup-tip-max-width 80)
+
+(cl-defun popup-tip (string
+                     &key
+                     point
+                     (around t)
+                     width
+                     (height 15)
+                     min-height
+                     max-width
+                     truncate
+                     margin
+                     margin-left
+                     margin-right
+                     scroll-bar
+                     parent
+                     parent-offset
+                     nowait
+                     nostrip
+                     prompt
+                     &aux tip lines)
+  "Show a tooltip of STRING at POINT. This function is
+synchronized unless NOWAIT specified. Almost all arguments are
+the same as in `popup-create', except for TRUNCATE, NOWAIT, and
+PROMPT.
+
+If TRUNCATE is non-nil, the tooltip can be truncated.
+
+If NOWAIT is non-nil, this function immediately returns the
+tooltip instance without entering event loop.
+
+If `NOSTRIP` is non-nil, `STRING` properties are not stripped.
+
+PROMPT is a prompt string when reading events during event loop."
+  (if (bufferp string)
+      (setq string (with-current-buffer string (buffer-string))))
+
+  (unless nostrip
+    ;; TODO strip text (mainly face) properties
+    (setq string (substring-no-properties string)))
+
+  (and (eq margin t) (setq margin 1))
+  (or margin-left (setq margin-left margin))
+  (or margin-right (setq margin-right margin))
+
+  (let ((it (popup-fill-string string width popup-tip-max-width)))
+    (setq width (car it)
+          lines (cdr it)))
+
+  (setq tip (popup-create point width height
+                          :min-height min-height
+                          :max-width max-width
+                          :around around
+                          :margin-left margin-left
+                          :margin-right margin-right
+                          :scroll-bar scroll-bar
+                          :face 'popup-tip-face
+                          :parent parent
+                          :parent-offset parent-offset))
+
+  (unwind-protect
+      (when (> (popup-width tip) 0)                   ; not to be corrupted
+        (when (and (not (eq width (popup-width tip))) ; truncated
+                   (not truncate))
+          ;; Refill once again to lines be fitted to popup width
+          (setq width (popup-width tip))
+          (setq lines (cdr (popup-fill-string string width width))))
+
+        (popup-set-list tip lines)
+        (popup-draw tip)
+        (if nowait
+            tip
+          (clear-this-command-keys)
+          (push (read-event prompt) unread-command-events)
+          t))
+    (unless nowait
+      (popup-delete tip))))
+
+
+
+;;; Popup Menu
+
+(defface popup-menu-face
+  '((t (:inherit popup-face)))
+  "Face for popup menu."
+  :group 'popup)
+
+(defface popup-menu-mouse-face
+  '((t (:background "blue" :foreground "white")))
+  "Face for popup menu."
+  :group 'popup)
+
+(defface popup-menu-selection-face
+  '((t (:background "steelblue" :foreground "white")))
+  "Face for popup menu selection."
+  :group 'popup)
+
+(defface popup-menu-summary-face
+  '((t (:inherit popup-summary-face)))
+  "Face for popup summary."
+  :group 'popup)
+
+(defvar popup-menu-show-tip-function 'popup-tip
+  "Function used for showing tooltip by `popup-menu-show-quick-help'.")
+
+(defun popup-menu-show-help (menu &optional persist item)
+  (popup-item-show-help (or item (popup-selected-item menu)) persist))
+
+(defun popup-menu-documentation (menu &optional item)
+  (popup-item-documentation (or item (popup-selected-item menu))))
+
+(defun popup-menu-show-quick-help (menu &optional item &rest args)
+  (let* ((point (plist-get args :point))
+         (height (or (plist-get args :height) (popup-height menu)))
+         (min-height (min height (popup-current-height menu)))
+         (around nil)
+         (parent-offset (popup-offset menu))
+         (doc (popup-menu-documentation menu item)))
+    (when (stringp doc)
+      (if (popup-hidden-p menu)
+          (setq around t
+                menu nil
+                parent-offset nil)
+        (setq point nil))
+      (let ((popup-use-optimized-column-computation nil)) ; To avoid wrong positioning
+        (apply popup-menu-show-tip-function
+               doc
+               :point point
+               :height height
+               :min-height min-height
+               :around around
+               :parent menu
+               :parent-offset parent-offset
+               args)))))
+
+(defun popup-menu-item-of-mouse-event (event)
+  (when (and (consp event)
+             (memq (cl-first event) '(mouse-1 mouse-2 mouse-3 mouse-4 mouse-5)))
+    (let* ((position (cl-second event))
+           (object (elt position 4)))
+      (when (consp object)
+        (get-text-property (cdr object) 'popup-item (car object))))))
+
+(defun popup-menu-read-key-sequence (keymap &optional prompt timeout)
+  (catch 'timeout
+    (let ((timer (and timeout
+                      (run-with-timer timeout nil
+                                      (lambda ()
+                                        (if (zerop (length (this-command-keys)))
+                                            (throw 'timeout nil))))))
+          (old-global-map (current-global-map))
+          (temp-global-map (make-sparse-keymap))
+          (overriding-terminal-local-map (make-sparse-keymap)))
+      (substitute-key-definition 'keyboard-quit 'keyboard-quit
+                                 temp-global-map old-global-map)
+      (define-key temp-global-map [menu-bar] (lookup-key old-global-map [menu-bar]))
+      (define-key temp-global-map [tool-bar] (lookup-key old-global-map [tool-bar]))
+      (set-keymap-parent overriding-terminal-local-map keymap)
+      (if (current-local-map)
+          (define-key overriding-terminal-local-map [menu-bar]
+            (lookup-key (current-local-map) [menu-bar])))
+      (unwind-protect
+          (progn
+            (use-global-map temp-global-map)
+            (clear-this-command-keys)
+            (with-temp-message prompt
+              (read-key-sequence nil)))
+        (use-global-map old-global-map)
+        (if timer (cancel-timer timer))))))
+
+(defun popup-menu-fallback (event default))
+
+(cl-defun popup-menu-event-loop (menu
+                                 keymap
+                                 fallback
+                                 &key
+                                 prompt
+                                 help-delay
+                                 isearch
+                                 isearch-filter
+                                 isearch-cursor-color
+                                 isearch-keymap
+                                 isearch-callback
+                                 &aux key binding)
+  (cl-block nil
+    (while (popup-live-p menu)
+      (and isearch
+           (popup-isearch menu
+                          :filter isearch-filter
+                          :cursor-color isearch-cursor-color
+                          :keymap isearch-keymap
+                          :callback isearch-callback
+                          :help-delay help-delay)
+           (keyboard-quit))
+      (setq key (popup-menu-read-key-sequence keymap prompt help-delay))
+      (setq binding (and key (lookup-key keymap key)))
+      (cond
+       ((or (null key) (zerop (length key)))
+        (unless (funcall popup-menu-show-quick-help-function menu nil :prompt prompt)
+          (clear-this-command-keys)
+          (push (read-event prompt) unread-command-events)))
+       ((eq (lookup-key (current-global-map) key) 'keyboard-quit)
+        (keyboard-quit)
+        (cl-return))
+       ((eq binding 'popup-close)
+        (if (popup-parent menu)
+            (cl-return)))
+       ((memq binding '(popup-select popup-open))
+        (let* ((item (or (popup-menu-item-of-mouse-event (elt key 0))
+                         (popup-selected-item menu)))
+               (index (cl-position item (popup-list menu)))
+               (sublist (popup-item-sublist item)))
+          (unless index (cl-return))
+          (if sublist
+              (popup-aif (let (popup-use-optimized-column-computation)
+                           (popup-cascade-menu sublist
+                                               :around nil
+                                               :margin-left (popup-margin-left menu)
+                                               :margin-right (popup-margin-right menu)
+                                               :scroll-bar (popup-scroll-bar menu)
+                                               :parent menu
+                                               :parent-offset index
+                                               :help-delay help-delay
+                                               :isearch isearch
+                                               :isearch-filter isearch-filter
+                                               :isearch-cursor-color isearch-cursor-color
+                                               :isearch-keymap isearch-keymap
+                                               :isearch-callback isearch-callback))
+                  (and it (cl-return it)))
+            (if (eq binding 'popup-select)
+                (cl-return (popup-item-value-or-self item))))))
+       ((eq binding 'popup-next)
+        (popup-next menu))
+       ((eq binding 'popup-previous)
+        (popup-previous menu))
+       ((eq binding 'popup-page-next)
+        (popup-page-next menu))
+       ((eq binding 'popup-page-previous)
+        (popup-page-previous menu))
+       ((eq binding 'popup-help)
+        (popup-menu-show-help menu))
+       ((eq binding 'popup-isearch)
+        (popup-isearch menu
+                       :filter 'isearch-filter
+                       :cursor-color isearch-cursor-color
+                       :keymap isearch-keymap
+                       :callback isearch-callback
+                       :help-delay help-delay))
+       ((commandp binding)
+        (call-interactively binding))
+       (t
+        (funcall fallback key (key-binding key)))))))
+
+(defun popup-preferred-width (list)
+  "Return the preferred width to show LIST beautifully."
+  (cl-loop with tab-width = 4
+           for item in list
+           for summary = (popup-item-summary item)
+           maximize (string-width (popup-x-to-string item)) into width
+           if (stringp summary)
+           maximize (+ (string-width summary) 2) into summary-width
+           finally return
+           (let ((total (+ (or width 0) (or summary-width 0))))
+             (* (ceiling (/ total 10.0)) 10))))
+
+(defvar popup-menu-keymap
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\r"        'popup-select)
+    (define-key map "\C-f"      'popup-open)
+    (define-key map [right]     'popup-open)
+    (define-key map "\C-b"      'popup-close)
+    (define-key map [left]      'popup-close)
+
+    (define-key map "\C-n"      'popup-next)
+    (define-key map [down]      'popup-next)
+    (define-key map "\C-p"      'popup-previous)
+    (define-key map [up]        'popup-previous)
+
+    (define-key map [next]      'popup-page-next)
+    (define-key map [prior]     'popup-page-previous)
+
+    (define-key map [f1]        'popup-help)
+    (define-key map (kbd "\C-?") 'popup-help)
+
+    (define-key map "\C-s"      'popup-isearch)
+
+    (define-key map [mouse-1]   'popup-select)
+    (define-key map [mouse-4]   'popup-previous)
+    (define-key map [mouse-5]   'popup-next)
+    map))
+
+(cl-defun popup-menu* (list
+                       &key
+                       point
+                       (around t)
+                       (width (popup-preferred-width list))
+                       (height 15)
+                       max-width
+                       margin
+                       margin-left
+                       margin-right
+                       scroll-bar
+                       symbol
+                       parent
+                       parent-offset
+                       cursor
+                       (keymap popup-menu-keymap)
+                       (fallback 'popup-menu-fallback)
+                       help-delay
+                       nowait
+                       prompt
+                       isearch
+                       (isearch-filter 'popup-isearch-filter-list)
+                       (isearch-cursor-color popup-isearch-cursor-color)
+                       (isearch-keymap popup-isearch-keymap)
+                       isearch-callback
+                       initial-index
+                       &aux menu event)
+  "Show a popup menu of LIST at POINT. This function returns a
+value of the selected item. Almost all arguments are the same as in
+`popup-create', except for KEYMAP, FALLBACK, HELP-DELAY, PROMPT,
+ISEARCH, ISEARCH-FILTER, ISEARCH-CURSOR-COLOR, ISEARCH-KEYMAP, and
+ISEARCH-CALLBACK.
+
+If KEYMAP is a keymap which is used when processing events during
+event loop.
+
+If FALLBACK is a function taking two arguments; a key and a
+command. FALLBACK is called when no special operation is found on
+the key. The default value is `popup-menu-fallback', which does
+nothing.
+
+HELP-DELAY is a delay of displaying helps.
+
+If NOWAIT is non-nil, this function immediately returns the menu
+instance without entering event loop.
+
+PROMPT is a prompt string when reading events during event loop.
+
+If ISEARCH is non-nil, do isearch as soon as displaying the popup
+menu.
+
+ISEARCH-FILTER is a filtering function taking two arguments:
+search pattern and list of items. Returns a list of matching items.
+
+ISEARCH-CURSOR-COLOR is a cursor color during isearch. The
+default value is `popup-isearch-cursor-color'.
+
+ISEARCH-KEYMAP is a keymap which is used when processing events
+during event loop. The default value is `popup-isearch-keymap'.
+
+ISEARCH-CALLBACK is a function taking one argument.  `popup-menu'
+calls ISEARCH-CALLBACK, if specified, after isearch finished or
+isearch canceled. The arguments is whole filtered list of items.
+
+If `INITIAL-INDEX' is non-nil, this is an initial index value for
+`popup-select'. Only positive integer is valid."
+  (and (eq margin t) (setq margin 1))
+  (or margin-left (setq margin-left margin))
+  (or margin-right (setq margin-right margin))
+  (if (and scroll-bar
+           (integerp margin-right)
+           (> margin-right 0))
+      ;; Make scroll-bar space as margin-right
+      (cl-decf margin-right))
+  (setq menu (popup-create point width height
+                           :max-width max-width
+                           :around around
+                           :face 'popup-menu-face
+                           :mouse-face 'popup-menu-mouse-face
+                           :selection-face 'popup-menu-selection-face
+                           :summary-face 'popup-menu-summary-face
+                           :margin-left margin-left
+                           :margin-right margin-right
+                           :scroll-bar scroll-bar
+                           :symbol symbol
+                           :parent parent
+                           :parent-offset parent-offset))
+  (unwind-protect
+      (progn
+        (popup-set-list menu list)
+        (if cursor
+            (popup-jump menu cursor)
+          (popup-draw menu))
+        (when initial-index
+          (dotimes (_i (min (- (length list) 1) initial-index))
+            (popup-next menu)))
+        (if nowait
+            menu
+          (popup-menu-event-loop menu keymap fallback
+                                 :prompt prompt
+                                 :help-delay help-delay
+                                 :isearch isearch
+                                 :isearch-filter isearch-filter
+                                 :isearch-cursor-color isearch-cursor-color
+                                 :isearch-keymap isearch-keymap
+                                 :isearch-callback isearch-callback)))
+    (unless nowait
+      (popup-delete menu))))
+
+(defun popup-cascade-menu (list &rest args)
+  "Same as `popup-menu' except that an element of LIST can be
+also a sub-menu if the element is a cons cell formed (ITEM
+. SUBLIST) where ITEM is an usual item and SUBLIST is a list of
+the sub menu."
+  (apply 'popup-menu*
+         (mapcar (lambda (item)
+                   (if (consp item)
+                       (popup-make-item (car item)
+                                        :sublist (cdr item)
+                                        :symbol ">")
+                     item))
+                 list)
+         :symbol t
+         args))
+
+(provide 'popup)
+;;; popup.el ends here
diff --git a/emacs.d/elpa/powerline-20150602.1413/powerline-autoloads.el b/emacs.d/elpa/powerline-20150602.1413/powerline-autoloads.el
deleted file mode 100644
index 49c9a2e..0000000
--- a/emacs.d/elpa/powerline-20150602.1413/powerline-autoloads.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; powerline-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "powerline" "powerline.el" (21898 47963 0 0))
-;;; Generated autoloads from powerline.el
-
-(autoload 'powerline-hud "powerline" "\
-Return an XPM of relative buffer location using FACE1 and FACE2 of optional WIDTH.
-
-\(fn FACE1 FACE2 &optional WIDTH)" nil nil)
-
-(autoload 'powerline-mouse "powerline" "\
-Return mouse handler for CLICK-GROUP given CLICK-TYPE and STRING.
-
-\(fn CLICK-GROUP CLICK-TYPE STRING)" nil nil)
-
-(autoload 'powerline-concat "powerline" "\
-Concatonate STRINGS and pad sides by spaces.
-
-\(fn &rest STRINGS)" nil nil)
-
-(autoload 'defpowerline "powerline" "\
-Create function NAME by wrapping BODY with powerline padding an propetization.
-
-\(fn NAME BODY)" nil t)
-
-(autoload 'powerline-raw "powerline" "\
-Render STR as mode-line data using FACE and optionally PAD import on left (l) or right (r).
-
-\(fn STR &optional FACE PAD)" nil nil)
-
-(autoload 'powerline-fill "powerline" "\
-Return empty space using FACE and leaving RESERVE space on the right.
-
-\(fn FACE RESERVE)" nil nil)
- (autoload 'powerline-major-mode "powerline")
- (autoload 'powerline-minor-modes "powerline")
- (autoload 'powerline-narrow "powerline")
- (autoload 'powerline-vc "powerline")
- (autoload 'powerline-buffer-size "powerline")
- (autoload 'powerline-buffer-id "powerline")
- (autoload 'powerline-process "powerline")
- (autoload 'powerline-selected-window-active "powerline")
-
-;;;***
-
-;;;### (autoloads nil "powerline-themes" "powerline-themes.el" (21898
-;;;;;;  47963 0 0))
-;;; Generated autoloads from powerline-themes.el
-
-(autoload 'powerline-default-theme "powerline-themes" "\
-Setup the default mode-line.
-
-\(fn)" t nil)
-
-(autoload 'powerline-center-theme "powerline-themes" "\
-Setup a mode-line with major and minor modes centered.
-
-\(fn)" t nil)
-
-(autoload 'powerline-vim-theme "powerline-themes" "\
-Setup a Vim-like mode-line.
-
-\(fn)" t nil)
-
-(autoload 'powerline-nano-theme "powerline-themes" "\
-Setup a nano-like mode-line.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("powerline-pkg.el" "powerline-separators.el")
-;;;;;;  (21898 47963 630890 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; powerline-autoloads.el ends here
diff --git a/emacs.d/elpa/powerline-20150602.1413/powerline-pkg.el b/emacs.d/elpa/powerline-20150602.1413/powerline-pkg.el
deleted file mode 100644
index 3f159aa..0000000
--- a/emacs.d/elpa/powerline-20150602.1413/powerline-pkg.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(define-package "powerline" "20150602.1413" "Rewrite of Powerline"
-  '((cl-lib "0.2"))
-  :url "http://github.com/milkypostman/powerline/" :keywords
-  '("mode-line"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/powerline-20150602.1413/powerline-separators.el b/emacs.d/elpa/powerline-20150602.1413/powerline-separators.el
deleted file mode 100644
index 4a14ebf..0000000
--- a/emacs.d/elpa/powerline-20150602.1413/powerline-separators.el
+++ /dev/null
@@ -1,341 +0,0 @@
-;;; powerline-separators.el --- Separators for Powerline
-
-;; Copyright (C) 2012-2013 Donald Ephraim Curtis
-;; Copyright (C) 2013 Jason Milkins
-;; Copyright (C) 2012 Nicolas Rougier
-
-;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
-;; URL: http://github.com/milkypostman/powerline/
-;; Version: 2.0
-;; Keywords: mode-line
-
-;;; Commentary:
-;;
-;; Separators for Powerline.
-;; Included separators: alternate, arrow, arrow-fade, bar, box, brace, butt,
-;; chamfer, contour, curve, rounded, roundstub, slant, wave, zigzag, and nil.
-;;
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'color)
-
-(defun pl/interpolate (color1 color2)
-  "Interpolate between COLOR1 and COLOR2.
-
-COLOR1 and COLOR2 must be supplied as hex strings with a leading #."
-  (let* ((c1 (color-name-to-rgb color1))
-         (c2 (color-name-to-rgb color2))
-         (red (/ (+ (nth 0 c1) (nth 0 c2)) 2))
-         (green (/ (+ (nth 1 c1) (nth 1 c2)) 2))
-         (blue (/ (+ (nth 2 c1) (nth 2 c2)) 2)))
-    (color-rgb-to-hex red green blue)))
-
-(defun pl/hex-color (color)
-  "Get the hexadecimal value of COLOR."
-  (when color
-    (apply 'color-rgb-to-hex (color-name-to-rgb color))))
-
-(defun pl/pattern (lst)
-  "Turn LST into an infinite pattern."
-  (when lst
-    (let ((pattern (cl-copy-list lst)))
-      (setcdr (last pattern) pattern))))
-
-(defun pl/pattern-to-string (pattern)
-  "Convert a PATTERN into a string that can be used in an XPM."
-  (concat "\"" (mapconcat 'number-to-string pattern "") "\","))
-
-(defun pl/reverse-pattern (pattern)
-  "Reverse each line in PATTERN."
-  (mapcar 'reverse pattern))
-
-(defun pl/row-pattern (fill total &optional fade)
-  "Make a list that has FILL 0s out of TOTAL 1s with FADE 2s to the right of the fill."
-  (unless fade
-    (setq fade 0))
-  (let ((fill (min fill total))
-        (fade (min fade (max (- total fill) 0))))
-    (append (make-list fill 0)
-            (make-list fade 2)
-            (make-list (- total fill fade) 1))))
-
-
-(defun pl/pattern-defun (name dir width &rest patterns)
-  "Create a powerline function of NAME in DIR with WIDTH for PATTERNS.
-
-PATTERNS is of the form (PATTERN HEADER FOOTER SECOND-PATTERN CENTER).
-PATTERN is required, all other components are optional.
-
-All generated functions generate the form:
-HEADER
-PATTERN ...
-CENTER
-SECOND-PATTERN ...
-FOOTER
-
-PATTERN and SECOND-PATTERN repeat infinitely to fill the space needed to generate a full height XPM.
-
-PATTERN, HEADER, FOOTER, SECOND-PATTERN, CENTER are of the form ((COLOR ...) (COLOR ...) ...).
-
-COLOR can be one of 0, 1, or 2, where 0 is the source color, 1 is the
-destination color, and 2 is the interpolated color between 0 and 1."
-  (when (eq dir 'right)
-    (setq patterns (mapcar 'pl/reverse-pattern patterns)))
-  (let* ((pattern (pl/pattern (mapcar 'pl/pattern-to-string (car patterns))))
-         (header (mapcar 'pl/pattern-to-string (nth 1 patterns)))
-         (footer (mapcar 'pl/pattern-to-string (nth 2 patterns)))
-         (second-pattern (pl/pattern (mapcar 'pl/pattern-to-string (nth 3 patterns))))
-         (center (mapcar 'pl/pattern-to-string (nth 4 patterns)))
-         (reserve (+ (length header) (length footer) (length center))))
-    (pl/wrap-defun name dir width
-                   `((pattern-height (max (- height ,reserve) 0))
-                     (second-pattern-height (/ pattern-height 2))
-                     (pattern-height ,(if second-pattern '(ceiling pattern-height 2) 'pattern-height)))
-                   `((mapconcat 'identity ',header "")
-                     (mapconcat 'identity (cl-subseq ',pattern 0 pattern-height) "")
-                     (mapconcat 'identity ',center "")
-                     (mapconcat 'identity (cl-subseq ',second-pattern 0 second-pattern-height) "")
-                     (mapconcat 'identity ',footer "")))))
-
-(defun pl/background-color (face)
-  (face-attribute face
-                  (if (face-attribute face :inverse-video nil 'default)
-                      :foreground
-                    :background)
-                  nil
-                  'default))
-
-(defun pl/wrap-defun (name dir width let-vars body)
-  "Generate a powerline function of NAME in DIR with WIDTH using LET-VARS and BODY."
-  (let* ((src-face (if (eq dir 'left) 'face1 'face2))
-         (dst-face (if (eq dir 'left) 'face2 'face1)))
-    `(defun ,(intern (format "powerline-%s-%s" name (symbol-name dir)))
-       (face1 face2 &optional height)
-       (when window-system
-         (unless height (setq height (pl/separator-height)))
-         (let* ,(append `((color1 (when ,src-face
-                                    (pl/hex-color (pl/background-color ,src-face))))
-                          (color2 (when ,dst-face
-                                    (pl/hex-color (pl/background-color ,dst-face))))
-                          (colori (when (and color1 color2) (pl/interpolate color1 color2)))
-                          (color1 (or color1 "None"))
-                          (color2 (or color2 "None"))
-                          (colori (or colori "None")))
-                        let-vars)
-           (create-image ,(append `(concat (format "/* XPM */ static char * %s_%s[] = { \"%s %s 3 1\", \"0 c %s\", \"1 c %s\", \"2 c %s\","
-                                                   ,(replace-regexp-in-string "-" "_" name)
-                                                   (symbol-name ',dir)
-                                                   ,width
-                                                   height
-                                                   color1
-                                                   color2
-                                                   colori))
-                                  body
-                                  '("};"))
-                         'xpm t
-                         :ascent 'center
-                         :face (when (and face1 face2)
-                                 ,dst-face)))))))
-
-
-(defmacro pl/alternate (dir)
-  "Generate an alternating pattern XPM function for DIR."
-  (pl/pattern-defun "alternate" dir 4
-                    '((2 2 1 1)
-                      (0 0 2 2))))
-
-(defmacro pl/arrow (dir)
-  "Generate an arrow XPM function for DIR."
-  (let ((row-modifier (if (eq dir 'left) 'identity 'reverse)))
-    (pl/wrap-defun "arrow" dir 'middle-width
-                   '((width (1- (/ height 2)))
-                     (middle-width (1- (ceiling height 2))))
-                   `((cl-loop for i from 0 to width
-                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width))))
-                     (when (cl-oddp height)
-                       (pl/pattern-to-string (make-list middle-width 0)))
-                     (cl-loop for i from width downto 0
-                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width))))))))
-
-(defmacro pl/arrow-fade (dir)
-  "Generate an arrow-fade XPM function for DIR."
-  (let* ((row-modifier (if (eq dir 'left) 'identity 'reverse)))
-    (pl/wrap-defun "arrow-fade" dir 'middle-width
-                   '((width (1- (/ height 2)))
-                     (middle-width (1+ (ceiling height 2))))
-                   `((cl-loop for i from 0 to width
-                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width 2))))
-                     (when (cl-oddp height)
-                       (pl/pattern-to-string (,row-modifier (pl/row-pattern (1+ width) middle-width 2))))
-                     (cl-loop for i from width downto 0
-                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width 2))))))))
-
-(defmacro pl/bar (dir)
-  "Generate a bar XPM function for DIR."
-  (pl/pattern-defun "bar" dir 2
-                    '((2 2))))
-
-(defmacro pl/box (dir)
-  "Generate a box XPM function for DIR."
-  (pl/pattern-defun "box" dir 2
-                    '((0 0)
-                      (0 0)
-                      (1 1)
-                      (1 1))))
-
-(defmacro pl/brace (dir)
-  "Generate a brace XPM function for DIR."
-  (pl/pattern-defun "brace" dir 4
-                    '((0 1 1 1))
-                    '((1 1 1 1)
-                      (2 1 1 1))
-                    '((2 1 1 1)
-                      (1 1 1 1))
-                    '((0 1 1 1))
-                    '((0 2 1 1)
-                      (0 2 1 1)
-                      (0 0 2 1)
-                      (0 0 0 0)
-                      (0 0 2 1)
-                      (0 2 1 1)
-                      (0 2 1 1))))
-
-(defmacro pl/butt (dir)
-  "Generate a butt XPM function for DIR."
-  (pl/pattern-defun "butt" dir 3
-                    '((0 0 0))
-                    '((1 1 1)
-                      (0 1 1)
-                      (0 0 1))
-                    '((0 0 1)
-                      (0 1 1)
-                      (1 1 1))))
-
-(defmacro pl/chamfer (dir)
-  "Generate a chamfer XPM function for DIR."
-  (pl/pattern-defun "chamfer" dir 3
-                    '((0 0 0))
-                    '((1 1 1)
-                      (0 1 1)
-                      (0 0 1))))
-
-(defmacro pl/contour (dir)
-  "Generate a contour XPM function for DIR."
-  (pl/pattern-defun "contour" dir 10
-                    '((0 0 0 0 0 1 1 1 1 1))
-                    '((1 1 1 1 1 1 1 1 1 1)
-                      (0 2 1 1 1 1 1 1 1 1)
-                      (0 0 2 1 1 1 1 1 1 1)
-                      (0 0 0 2 1 1 1 1 1 1)
-                      (0 0 0 0 1 1 1 1 1 1)
-                      (0 0 0 0 2 1 1 1 1 1))
-                    '((0 0 0 0 0 2 1 1 1 1)
-                      (0 0 0 0 0 0 1 1 1 1)
-                      (0 0 0 0 0 0 2 1 1 1)
-                      (0 0 0 0 0 0 0 2 1 1)
-                      (0 0 0 0 0 0 0 0 0 0))))
-
-(defmacro pl/curve (dir)
-  "Generate a curve XPM function for DIR."
-  (pl/pattern-defun "curve" dir 4
-                    '((0 0 0 0))
-                    '((1 1 1 1)
-                      (2 1 1 1)
-                      (0 0 1 1)
-                      (0 0 2 1)
-                      (0 0 0 1)
-                      (0 0 0 2))
-                    '((0 0 0 2)
-                      (0 0 0 1)
-                      (0 0 2 1)
-                      (0 0 1 1)
-                      (2 1 1 1)
-                      (1 1 1 1))))
-
-(defmacro pl/rounded (dir)
-  "Generate a rounded XPM function for DIR."
-  (pl/pattern-defun "rounded" dir 6
-                    '((0 0 0 0 0 0))
-                    '((2 1 1 1 1 1)
-                      (0 0 2 1 1 1)
-                      (0 0 0 0 1 1)
-                      (0 0 0 0 2 1)
-                      (0 0 0 0 0 1)
-                      (0 0 0 0 0 2))))
-
-(defmacro pl/roundstub (dir)
-  "Generate a roundstub XPM function for DIR."
-  (pl/pattern-defun "roundstub" dir 3
-                    '((0 0 0))
-                    '((1 1 1)
-                      (0 0 1)
-                      (0 0 2))
-                    '((0 0 2)
-                      (0 0 1)
-                      (1 1 1))))
-
-(defmacro pl/slant (dir)
-  "Generate a slant XPM function for DIR."
-  (let* ((row-modifier (if (eq dir 'left) 'identity 'reverse)))
-    (pl/wrap-defun "slant" dir 'width
-                   '((width (1- (ceiling height 2))))
-                   `((cl-loop for i from 0 to height
-                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern (/ i 2) width))))))))
-
-(defmacro pl/wave (dir)
-  "Generate a wave XPM function for DIR."
-  (pl/pattern-defun "wave" dir 11
-                    '((0 0 0 0 0 0 1 1 1 1 1))
-                    '((2 1 1 1 1 1 1 1 1 1 1)
-                      (0 0 1 1 1 1 1 1 1 1 1)
-                      (0 0 0 1 1 1 1 1 1 1 1)
-                      (0 0 0 2 1 1 1 1 1 1 1)
-                      (0 0 0 0 1 1 1 1 1 1 1)
-                      (0 0 0 0 2 1 1 1 1 1 1)
-                      (0 0 0 0 0 1 1 1 1 1 1)
-                      (0 0 0 0 0 1 1 1 1 1 1)
-                      (0 0 0 0 0 2 1 1 1 1 1))
-                    '((0 0 0 0 0 0 2 1 1 1 1)
-                      (0 0 0 0 0 0 0 1 1 1 1)
-                      (0 0 0 0 0 0 0 1 1 1 1)
-                      (0 0 0 0 0 0 0 2 1 1 1)
-                      (0 0 0 0 0 0 0 0 1 1 1)
-                      (0 0 0 0 0 0 0 0 2 1 1)
-                      (0 0 0 0 0 0 0 0 0 0 2))))
-
-(defmacro pl/zigzag (dir)
-  "Generate a zigzag pattern XPM function for DIR."
-  (pl/pattern-defun "zigzag" dir 3
-                    '((1 1 1)
-                      (0 1 1)
-                      (0 0 1)
-                      (0 0 0)
-                      (0 0 1)
-                      (0 1 1))))
-
-(defmacro pl/nil (dir)
-  "Generate a XPM function that returns nil for DIR."
-  `(defun ,(intern (format "powerline-nil-%s" (symbol-name dir)))
-     (face1 face2 &optional height)
-     nil))
-
-(defmacro pl/utf-8 (dir)
-  "Generate function that returns raw utf-8 symbols."
-  (let ((dir-name (symbol-name dir))
-	(src-face (if (eq dir 'left) 'face1 'face2))
-	(dst-face (if (eq dir 'left) 'face2 'face1)))
-    `(defun ,(intern (format "powerline-utf-8-%s" dir-name))
-       (face1 face2 &optional height)
-       (powerline-raw
-	(char-to-string ,(intern (format "powerline-utf-8-separator-%s"
-					 dir-name)))
-        (list :foreground (pl/background-color ,src-face)
-              :background (pl/background-color ,dst-face)
-              :inverse-video nil)))))
-
-
-(provide 'powerline-separators)
-
-;;; powerline-separators.el ends here
diff --git a/emacs.d/elpa/powerline-20150602.1413/powerline-themes.el b/emacs.d/elpa/powerline-20150602.1413/powerline-themes.el
deleted file mode 100644
index 157c29f..0000000
--- a/emacs.d/elpa/powerline-20150602.1413/powerline-themes.el
+++ /dev/null
@@ -1,266 +0,0 @@
-;;; powerline-themes.el --- Themes for Powerline
-
-;; Copyright (C) 2012-2013 Donald Ephraim Curtis
-;; Copyright (C) 2013 Jason Milkins
-;; Copyright (C) 2012 Nicolas Rougier
-
-;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
-;; URL: http://github.com/milkypostman/powerline/
-;; Version: 2.0
-;; Keywords: mode-line
-
-;;; Commentary:
-;;
-;; Themes for Powerline.
-;; Included themes: default, center, center-evil, vim, and nano.
-;;
-
-;;; Code:
-
-(defcustom powerline-display-buffer-size t
-  "When non-nil, display the buffer size."
-  :type 'boolean)
-
-(defcustom powerline-display-mule-info t
-  "When non-nil, display the mule info."
-  :type 'boolean)
-
-(defcustom powerline-display-hud t
-  "When non-nil, display the hud."
-  :type 'boolean)
-
-;;;###autoload
-(defun powerline-default-theme ()
-  "Setup the default mode-line."
-  (interactive)
-  (setq-default mode-line-format
-                '("%e"
-                  (:eval
-                   (let* ((active (powerline-selected-window-active))
-                          (mode-line (if active 'mode-line 'mode-line-inactive))
-                          (face1 (if active 'powerline-active1 'powerline-inactive1))
-                          (face2 (if active 'powerline-active2 'powerline-inactive2))
-                          (separator-left (intern (format "powerline-%s-%s"
-							  (powerline-current-separator)
-                                                          (car powerline-default-separator-dir))))
-                          (separator-right (intern (format "powerline-%s-%s"
-                                                           (powerline-current-separator)
-                                                           (cdr powerline-default-separator-dir))))
-                          (lhs (list (powerline-raw "%*" nil 'l)
-                                     (when powerline-display-buffer-size
-                                       (powerline-buffer-size nil 'l))
-                                     (when powerline-display-mule-info
-                                       (powerline-raw mode-line-mule-info nil 'l))
-                                     (powerline-buffer-id nil 'l)
-                                     (when (and (boundp 'which-func-mode) which-func-mode)
-                                       (powerline-raw which-func-format nil 'l))
-                                     (powerline-raw " ")
-                                     (funcall separator-left mode-line face1)
-                                     (when (boundp 'erc-modified-channels-object)
-                                       (powerline-raw erc-modified-channels-object face1 'l))
-                                     (powerline-major-mode face1 'l)
-                                     (powerline-process face1)
-                                     (powerline-minor-modes face1 'l)
-                                     (powerline-narrow face1 'l)
-                                     (powerline-raw " " face1)
-                                     (funcall separator-left face1 face2)
-                                     (powerline-vc face2 'r)
-                                     (when (bound-and-true-p nyan-mode)
-                                       (powerline-raw (list (nyan-create)) face2 'l))))
-                          (rhs (list (powerline-raw global-mode-string face2 'r)
-                                     (funcall separator-right face2 face1)
-				     (unless window-system
-				       (powerline-raw (char-to-string #xe0a1) face1 'l))
-				     (powerline-raw "%4l" face1 'l)
-				     (powerline-raw ":" face1 'l)
-				     (powerline-raw "%3c" face1 'r)
-				     (funcall separator-right face1 mode-line)
-				     (powerline-raw " ")
-				     (powerline-raw "%6p" nil 'r)
-                                     (when powerline-display-hud
-                                       (powerline-hud face2 face1)))))
-		     (concat (powerline-render lhs)
-			     (powerline-fill face2 (powerline-width rhs))
-			     (powerline-render rhs)))))))
-
-;;;###autoload
-(defun powerline-center-theme ()
-  "Setup a mode-line with major and minor modes centered."
-  (interactive)
-  (setq-default mode-line-format
-		'("%e"
-		  (:eval
-		   (let* ((active (powerline-selected-window-active))
-			  (mode-line (if active 'mode-line 'mode-line-inactive))
-			  (face1 (if active 'powerline-active1 'powerline-inactive1))
-			  (face2 (if active 'powerline-active2 'powerline-inactive2))
-			  (separator-left (intern (format "powerline-%s-%s"
-							  (powerline-current-separator)
-							  (car powerline-default-separator-dir))))
-			  (separator-right (intern (format "powerline-%s-%s"
-							   (powerline-current-separator)
-							   (cdr powerline-default-separator-dir))))
-			  (lhs (list (powerline-raw "%*" nil 'l)
-				     (powerline-buffer-size nil 'l)
-				     (powerline-buffer-id nil 'l)
-				     (powerline-raw " ")
-				     (funcall separator-left mode-line face1)
-				     (powerline-narrow face1 'l)
-				     (powerline-vc face1)))
-			  (rhs (list (powerline-raw global-mode-string face1 'r)
-				     (powerline-raw "%4l" face1 'r)
-				     (powerline-raw ":" face1)
-				     (powerline-raw "%3c" face1 'r)
-				     (funcall separator-right face1 mode-line)
-				     (powerline-raw " ")
-				     (powerline-raw "%6p" nil 'r)
-				     (powerline-hud face2 face1)))
-			  (center (list (powerline-raw " " face1)
-					(funcall separator-left face1 face2)
-					(when (boundp 'erc-modified-channels-object)
-					  (powerline-raw erc-modified-channels-object face2 'l))
-					(powerline-major-mode face2 'l)
-					(powerline-process face2)
-					(powerline-raw " :" face2)
-					(powerline-minor-modes face2 'l)
-					(powerline-raw " " face2)
-					(funcall separator-right face2 face1))))
-		     (concat (powerline-render lhs)
-			     (powerline-fill-center face1 (/ (powerline-width center) 2.0))
-			     (powerline-render center)
-			     (powerline-fill face1 (powerline-width rhs))
-			     (powerline-render rhs)))))))
-
-(defun powerline-center-evil-theme ()
-  "Setup a mode-line with major, evil, and minor modes centered."
-  (interactive)
-  (setq-default mode-line-format
-		'("%e"
-		  (:eval
-		   (let* ((active (powerline-selected-window-active))
-			  (mode-line (if active 'mode-line 'mode-line-inactive))
-			  (face1 (if active 'powerline-active1 'powerline-inactive1))
-			  (face2 (if active 'powerline-active2 'powerline-inactive2))
-			  (separator-left (intern (format "powerline-%s-%s"
-							  (powerline-current-separator)
-							  (car powerline-default-separator-dir))))
-			  (separator-right (intern (format "powerline-%s-%s"
-							   (powerline-current-separator)
-							   (cdr powerline-default-separator-dir))))
-			  (lhs (list (powerline-raw "%*" nil 'l)
-				     (powerline-buffer-size nil 'l)
-				     (powerline-buffer-id nil 'l)
-				     (powerline-raw " ")
-				     (funcall separator-left mode-line face1)
-				     (powerline-narrow face1 'l)
-				     (powerline-vc face1)))
-			  (rhs (list (powerline-raw global-mode-string face1 'r)
-				     (powerline-raw "%4l" face1 'r)
-				     (powerline-raw ":" face1)
-				     (powerline-raw "%3c" face1 'r)
-				     (funcall separator-right face1 mode-line)
-				     (powerline-raw " ")
-				     (powerline-raw "%6p" nil 'r)
-				     (powerline-hud face2 face1)))
-			  (center (append (list (powerline-raw " " face1)
-						(funcall separator-left face1 face2)
-						(when (boundp 'erc-modified-channels-object)
-						  (powerline-raw erc-modified-channels-object face2 'l))
-						(powerline-major-mode face2 'l)
-						(powerline-process face2)
-						(powerline-raw " " face2))
-					  (if (split-string (format-mode-line minor-mode-alist))
-					      (append (if evil-mode
-							  (list (funcall separator-right face2 face1)
-								(powerline-raw evil-mode-line-tag face1 'l)
-								(powerline-raw " " face1)
-								(funcall separator-left face1 face2)))
-						      (list (powerline-minor-modes face2 'l)
-							    (powerline-raw " " face2)
-							    (funcall separator-right face2 face1)))
-					    (list (powerline-raw evil-mode-line-tag face2)
-						  (funcall separator-right face2 face1))))))
-		     (concat (powerline-render lhs)
-			     (powerline-fill-center face1 (/ (powerline-width center) 2.0))
-			     (powerline-render center)
-			     (powerline-fill face1 (powerline-width rhs))
-			     (powerline-render rhs)))))))
-
-;;;###autoload
-(defun powerline-vim-theme ()
-  "Setup a Vim-like mode-line."
-  (interactive)
-  (setq-default mode-line-format
-		'("%e"
-		  (:eval
-		   (let* ((active (powerline-selected-window-active))
-			  (mode-line (if active 'mode-line 'mode-line-inactive))
-			  (face1 (if active 'powerline-active1 'powerline-inactive1))
-			  (face2 (if active 'powerline-active2 'powerline-inactive2))
-			  (separator-left (intern (format "powerline-%s-%s"
-							  (powerline-current-separator)
-							  (car powerline-default-separator-dir))))
-			  (separator-right (intern (format "powerline-%s-%s"
-							   (powerline-current-separator)
-							   (cdr powerline-default-separator-dir))))
-			  (lhs (list (powerline-buffer-id `(mode-line-buffer-id ,mode-line) 'l)
-				     (powerline-raw "[" mode-line 'l)
-				     (powerline-major-mode mode-line)
-				     (powerline-process mode-line)
-				     (powerline-raw "]" mode-line)
-				     (when (buffer-modified-p)
-				       (powerline-raw "[+]" mode-line))
-				     (when buffer-read-only
-				       (powerline-raw "[RO]" mode-line))
-				     (powerline-raw "[%z]" mode-line)
-				     ;; (powerline-raw (concat "[" (mode-line-eol-desc) "]") mode-line)
-				     (when (and (boundp 'which-func-mode) which-func-mode)
-				       (powerline-raw which-func-format nil 'l))
-				     (when (boundp 'erc-modified-channels-object)
-				       (powerline-raw erc-modified-channels-object face1 'l))
-				     (powerline-raw "[" mode-line 'l)
-				     (powerline-minor-modes mode-line)
-				     (powerline-raw "%n" mode-line)
-				     (powerline-raw "]" mode-line)
-				     (when (and vc-mode buffer-file-name)
-				       (let ((backend (vc-backend buffer-file-name)))
-					 (when backend
-					   (concat (powerline-raw "[" mode-line 'l)
-						   (powerline-raw (format "%s / %s" backend (vc-working-revision buffer-file-name backend)))
-						   (powerline-raw "]" mode-line)))))))
-			  (rhs (list (powerline-raw '(10 "%i"))
-				     (powerline-raw global-mode-string mode-line 'r)
-				     (powerline-raw "%l," mode-line 'l)
-				     (powerline-raw (format-mode-line '(10 "%c")))
-				     (powerline-raw (replace-regexp-in-string  "%" "%%" (format-mode-line '(-3 "%p"))) mode-line 'r))))
-		     (concat (powerline-render lhs)
-			     (powerline-fill mode-line (powerline-width rhs))
-			     (powerline-render rhs)))))))
-
-;;;###autoload
-(defun powerline-nano-theme ()
-  "Setup a nano-like mode-line."
-  (interactive)
-  (setq-default mode-line-format
-		'("%e"
-		  (:eval
-		   (let* ((active (powerline-selected-window-active))
-			  (lhs (list (powerline-raw (concat "GNU Emacs "
-							    (number-to-string
-							     emacs-major-version)
-							    "."
-							    (number-to-string
-							     emacs-minor-version))
-						    nil 'l)))
-			  (rhs (list (if (buffer-modified-p) (powerline-raw "Modified" nil 'r))))
-			  (center (list (powerline-raw "%b" nil))))
-		     (concat (powerline-render lhs)
-			     (powerline-fill-center nil (/ (powerline-width center) 2.0))
-			     (powerline-render center)
-			     (powerline-fill nil (powerline-width rhs))
-			     (powerline-render rhs)))))))
-
-
-(provide 'powerline-themes)
-
-;;; powerline-themes.el ends here
diff --git a/emacs.d/elpa/powerline-20150602.1413/powerline.el b/emacs.d/elpa/powerline-20150602.1413/powerline.el
deleted file mode 100644
index 530c290..0000000
--- a/emacs.d/elpa/powerline-20150602.1413/powerline.el
+++ /dev/null
@@ -1,552 +0,0 @@
-;;; powerline.el --- Rewrite of Powerline
-
-;; Copyright (C) 2012-2013 Donald Ephraim Curtis
-;; Copyright (C) 2013 Jason Milkins
-;; Copyright (C) 2012 Nicolas Rougier
-
-;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
-;; URL: http://github.com/milkypostman/powerline/
-;; Version: 2.3
-;; Keywords: mode-line
-;; Package-Requires: ((cl-lib "0.2"))
-
-;;; Commentary:
-;;
-;; Powerline is a library for customizing the mode-line that is based on the Vim
-;; Powerline. A collection of predefined themes comes with the package.
-;;
-
-;;; Code:
-
-(eval-and-compile (require 'powerline-themes))
-(eval-and-compile (require 'powerline-separators))
-
-(require 'cl-lib)
-
-(defface powerline-active1 '((t (:background "grey22" :inherit mode-line)))
-  "Powerline face 1."
-  :group 'powerline)
-
-(defface powerline-active2 '((t (:background "grey40" :inherit mode-line)))
-  "Powerline face 2."
-  :group 'powerline)
-
-(defface powerline-inactive1
-  '((t (:background "grey11" :inherit mode-line-inactive)))
-  "Powerline face 1."
-  :group 'powerline)
-
-(defface powerline-inactive2
-  '((t (:background "grey20" :inherit mode-line-inactive)))
-  "Powerline face 2."
-  :group 'powerline)
-
-(defcustom powerline-default-separator 'arrow
-  "The separator to use for the default theme.
-
-Valid Values: arrow, slant, chamfer, wave, brace, roundstub,
-zigzag, butt, rounded, contour, curve"
-  :group 'powerline
-  :type '(choice (const alternate)
-                 (const arrow)
-                 (const arrow-fade)
-                 (const bar)
-                 (const box)
-                 (const brace)
-                 (const butt)
-                 (const chamfer)
-                 (const contour)
-                 (const curve)
-                 (const rounded)
-                 (const roundstub)
-                 (const slant)
-                 (const wave)
-                 (const zigzag)
-		 (const utf-8)
-                 (const nil)))
-
-(defcustom powerline-utf-8-separator-left #xe0b0
-  "The unicode character number for the left facing separator"
-  :group 'powerline
-  :type  '(choice integer (const nil)))
-
-(defcustom powerline-utf-8-separator-right #xe0b2
-  "The unicode character number for the right facing separator"
-  :group 'powerline
-  :type  '(choice integer (const nil)))
-
-(defcustom powerline-default-separator-dir '(left . right)
-  "The separator direction to use for the default theme.
-
-CONS of the form (DIR . DIR) denoting the lean of the
-separators for the left and right side of the powerline.
-
-DIR must be one of: left, right"
-  :group 'powerline
-  :type '(cons (choice :tag "Left Hand Side" (const left) (const right))
-               (choice :tag "Right Hand Side" (const left) (const right))))
-
-(defcustom powerline-height nil
-  "Override the mode-line height."
-  :group 'powerline
-  :type '(choice integer (const nil)))
-
-(defcustom powerline-text-scale-factor nil
-  "Scale of mode-line font size to default text size.
-
-Smaller mode-line fonts will be a float value less that 1.
-Larger mode-line fonts require a float value greater than 1.
-
-This is needed to make sure that text is properly aligned."
-  :group 'powerline
-  :type '(choice float integer (const nil)))
-
-(defcustom powerline-buffer-size-suffix t
-  "Display the buffer size suffix."
-  :group 'powerline
-  :type 'boolean)
-
-(defun pl/create-or-get-cache ()
-  "Return a frame-local hash table that acts as a memoization cache for powerline. Create one if the frame doesn't have one yet."
-  (let ((table (frame-parameter nil 'powerline-cache)))
-    (if (hash-table-p table) table (pl/reset-cache))))
-
-(defun pl/reset-cache ()
-  "Reset and return the frame-local hash table used for a memoization cache."
-  (let ((table (make-hash-table :test 'equal)))
-    ;; Store it as a frame-local variable
-    (modify-frame-parameters nil `((powerline-cache . ,table)))
-    table))
-
-(defun powerline-current-separator ()
-  "Get the current default separator. Always returns utf-8 in non-gui mode."
-  (if window-system
-      powerline-default-separator
-    'utf-8))
-
-;;
-;; the frame-local powerline cache causes problems if included in a saved desktop,
-;; so delete it before the desktop is saved.
-;;
-;; see https://github.com/milkypostman/powerline/issues/58
-;;
-;; It is better to put the following code into your init file for Emacs 24.4 or later.
-;; (require 'frameset)
-;; (push '(powerline-cache . :never) frameset-filter-alist)
-;;
-(defun powerline-delete-cache (&optional frame)
-  "Set the FRAME cache to nil."
-  (set-frame-parameter frame 'powerline-cache nil))
-
-(defun powerline-desktop-save-delete-cache ()
-  "Set all caches to nil unless `frameset-filter-alist' has :never for powerline-cache."
-  (unless (and (boundp 'frameset-filter-alist)
-               (eq (cdr (assq 'powerline-cache frameset-filter-alist))
-                   :never))
-    (dolist (fr (frame-list)) (powerline-delete-cache fr))))
-
-(add-hook 'desktop-save-hook 'powerline-desktop-save-delete-cache)
-
-;; from memoize.el @ http://nullprogram.com/blog/2010/07/26/
-(defun pl/memoize (func)
-  "Memoize FUNC.
-If argument is a symbol then install the memoized function over
-the original function.  Use frame-local memoization."
-  (cl-typecase func
-    (symbol (fset func (pl/memoize-wrap-frame-local (symbol-function func))) func)
-    (function (pl/memoize-wrap-frame-local func))))
-
-(defun pl/memoize-wrap-frame-local (func)
-  "Return the memoized version of FUNC.
-The memoization cache is frame-local."
-  (let ((funcid (cl-gensym)))
-    `(lambda (&rest args)
-       ,(concat (documentation func) (format "\n(memoized function %s)" funcid))
-       (let* ((cache (pl/create-or-get-cache))
-              (key (cons ',funcid args))
-              (val (gethash key cache)))
-         (if val
-             val
-           (puthash key (apply ,func args) cache))))))
-
-(defun pl/separator-height ()
-  "Get default height for rendering separators."
-  (or powerline-height (frame-char-height)))
-
-(defun powerline-reset ()
-  "Reset memoized functions."
-  (interactive)
-  (pl/memoize (pl/alternate left))
-  (pl/memoize (pl/alternate right))
-  (pl/memoize (pl/arrow left))
-  (pl/memoize (pl/arrow right))
-  (pl/memoize (pl/arrow-fade left))
-  (pl/memoize (pl/arrow-fade right))
-  (pl/memoize (pl/bar left))
-  (pl/memoize (pl/bar right))
-  (pl/memoize (pl/box left))
-  (pl/memoize (pl/box right))
-  (pl/memoize (pl/brace left))
-  (pl/memoize (pl/brace right))
-  (pl/memoize (pl/butt left))
-  (pl/memoize (pl/butt right))
-  (pl/memoize (pl/chamfer left))
-  (pl/memoize (pl/chamfer right))
-  (pl/memoize (pl/contour left))
-  (pl/memoize (pl/contour right))
-  (pl/memoize (pl/curve left))
-  (pl/memoize (pl/curve right))
-  (pl/memoize (pl/rounded left))
-  (pl/memoize (pl/rounded right))
-  (pl/memoize (pl/roundstub left))
-  (pl/memoize (pl/roundstub right))
-  (pl/memoize (pl/slant left))
-  (pl/memoize (pl/slant right))
-  (pl/memoize (pl/wave left))
-  (pl/memoize (pl/wave right))
-  (pl/memoize (pl/zigzag left))
-  (pl/memoize (pl/zigzag right))
-  (pl/memoize (pl/nil left))
-  (pl/memoize (pl/nil right))
-  (pl/utf-8 left)
-  (pl/utf-8 right)
-  (pl/reset-cache))
-
-(powerline-reset)
-
-(defun pl/make-xpm (name color1 color2 data)
-  "Return an XPM image with NAME using COLOR1 for enabled and COLOR2 for disabled bits specified in DATA."
-  (when window-system
-    (create-image
-     (concat
-      (format "/* XPM */
-static char * %s[] = {
-\"%i %i 2 1\",
-\". c %s\",
-\"  c %s\",
-"
-              (downcase (replace-regexp-in-string " " "_" name))
-              (length (car data))
-              (length data)
-              (or (pl/hex-color color1) "None")
-              (or (pl/hex-color color2) "None"))
-      (let ((len  (length data))
-            (idx  0))
-        (apply 'concat
-               (mapcar #'(lambda (dl)
-                           (setq idx (+ idx 1))
-                           (concat
-                            "\""
-                            (concat
-                             (mapcar #'(lambda (d)
-                                         (if (eq d 0)
-                                             (string-to-char " ")
-                                           (string-to-char ".")))
-                                     dl))
-                            (if (eq idx len)
-                                "\"};"
-                              "\",\n")))
-                       data))))
-     'xpm t :ascent 'center)))
-
-(defun pl/percent-xpm
-  (height pmax pmin winend winstart width color1 color2)
-  "Generate percentage xpm of HEIGHT for PMAX to PMIN given WINEND and WINSTART with WIDTH and COLOR1 and COLOR2."
-  (let* ((height- (1- height))
-         (fillstart (round (* height- (/ (float winstart) (float pmax)))))
-         (fillend (round (* height- (/ (float winend) (float pmax)))))
-         (data nil)
-         (i 0))
-    (while (< i height)
-      (setq data (cons
-                  (if (and (<= fillstart i)
-                           (<= i fillend))
-                      (append (make-list width 1))
-                    (append (make-list width 0)))
-                  data))
-      (setq i (+ i 1)))
-    (pl/make-xpm "percent" color1 color2 (reverse data))))
-
-(pl/memoize 'pl/percent-xpm)
-
-;;;###autoload
-(defun powerline-hud (face1 face2 &optional width)
-  "Return an XPM of relative buffer location using FACE1 and FACE2 of optional WIDTH."
-  (unless width (setq width 2))
-  (let ((color1 (if face1 (face-background face1) "None"))
-        (color2 (if face2 (face-background face2) "None"))
-        (height (or powerline-height (frame-char-height)))
-        pmax
-        pmin
-        (ws (window-start))
-        (we (window-end)))
-    (save-restriction
-      (widen)
-      (setq pmax (point-max))
-      (setq pmin (point-min)))
-    (pl/percent-xpm height pmax pmin we ws
-                    (* (frame-char-width) width) color1 color2)))
-
-;;;###autoload
-(defun powerline-mouse (click-group click-type string)
-  "Return mouse handler for CLICK-GROUP given CLICK-TYPE and STRING."
-  (cond ((eq click-group 'minor)
-         (cond ((eq click-type 'menu)
-                `(lambda (event)
-                   (interactive "@e")
-                   (minor-mode-menu-from-indicator ,string)))
-               ((eq click-type 'help)
-                `(lambda (event)
-                   (interactive "@e")
-                   (describe-minor-mode-from-indicator ,string)))
-               (t
-                `(lambda (event)
-                   (interactive "@e")
-                   nil))))
-        (t
-         `(lambda (event)
-            (interactive "@e")
-            nil))))
-
-;;;###autoload
-(defun powerline-concat (&rest strings)
-  "Concatonate STRINGS and pad sides by spaces."
-  (concat
-   " "
-   (mapconcat 'identity (delq nil strings) " ")
-   " "))
-
-;;;###autoload
-(defmacro defpowerline (name body)
-  "Create function NAME by wrapping BODY with powerline padding an propetization."
-  `(defun ,name
-     (&optional face pad)
-     (powerline-raw ,body face pad)))
-
-(defun pl/property-substrings (str prop)
-  "Return a list of substrings of STR when PROP change."
-  (let ((beg 0) (end 0)
-        (len (length str))
-        (out))
-    (while (< end (length str))
-      (setq end (or (next-single-property-change beg prop str) len))
-      (setq out (append out (list (substring str beg (setq beg end))))))
-    out))
-
-(defun pl/assure-list (item)
-  "Assure that ITEM is a list."
-  (if (listp item)
-      item
-    (list item)))
-
-(defun pl/add-text-property (str prop val)
-  (mapconcat
-   (lambda (mm)
-     (let ((cur (pl/assure-list (get-text-property 0 'face mm))))
-       (propertize mm 'face (append cur (list val)))))
-   (pl/property-substrings str prop)
-   ""))
-
-;;;###autoload
-(defun powerline-raw (str &optional face pad)
-  "Render STR as mode-line data using FACE and optionally PAD import on left (l) or right (r)."
-  (when str
-    (let* ((rendered-str (format-mode-line str))
-           (padded-str (concat
-                        (when (and (> (length rendered-str) 0) (eq pad 'l)) " ")
-                        (if (listp str) rendered-str str)
-                        (when (and (> (length rendered-str) 0) (eq pad 'r)) " "))))
-
-      (if face
-          (pl/add-text-property padded-str 'face face)
-        padded-str))))
-
-;;;###autoload
-(defun powerline-fill (face reserve)
-  "Return empty space using FACE and leaving RESERVE space on the right."
-  (unless reserve
-    (setq reserve 20))
-  (when powerline-text-scale-factor
-    (setq reserve (* powerline-text-scale-factor reserve)))
-  (when (and window-system (eq 'right (get-scroll-bar-mode)))
-    (setq reserve (- reserve 3)))
-  (propertize " "
-              'display `((space :align-to (- (+ right right-fringe right-margin) ,reserve)))
-              'face face))
-
-(defun powerline-fill-center (face reserve)
-  "Return empty space using FACE to the center of remaining space leaving RESERVE space on the right."
-  (unless reserve
-    (setq reserve 20))
-  (when powerline-text-scale-factor
-    (setq reserve (* powerline-text-scale-factor reserve)))
-  (propertize " "
-              'display `((space :align-to (- (+ center (.5 . right-margin)) ,reserve
-                                             (.5 . left-margin))))
-              'face face))
-
-;;;###autoload (autoload 'powerline-major-mode "powerline")
-(defpowerline powerline-major-mode
-  (propertize (format-mode-line mode-name)
-              'mouse-face 'mode-line-highlight
-              'help-echo "Major mode\n\ mouse-1: Display major mode menu\n\ mouse-2: Show help for major mode\n\ mouse-3: Toggle minor modes"
-              'local-map (let ((map (make-sparse-keymap)))
-                           (define-key map [mode-line down-mouse-1]
-                             `(menu-item ,(purecopy "Menu Bar") ignore
-                                         :filter (lambda (_) (mouse-menu-major-mode-map))))
-                           (define-key map [mode-line mouse-2] 'describe-mode)
-                           (define-key map [mode-line down-mouse-3] mode-line-mode-menu)
-                           map)))
-
-;;;###autoload (autoload 'powerline-minor-modes "powerline")
-(defpowerline powerline-minor-modes
-  (mapconcat (lambda (mm)
-               (propertize mm
-                           'mouse-face 'mode-line-highlight
-                           'help-echo "Minor mode\n mouse-1: Display minor mode menu\n mouse-2: Show help for minor mode\n mouse-3: Toggle minor modes"
-                           'local-map (let ((map (make-sparse-keymap)))
-                                        (define-key map
-                                          [mode-line down-mouse-1]
-                                          (powerline-mouse 'minor 'menu mm))
-                                        (define-key map
-                                          [mode-line mouse-2]
-                                          (powerline-mouse 'minor 'help mm))
-                                        (define-key map
-                                          [mode-line down-mouse-3]
-                                          (powerline-mouse 'minor 'menu mm))
-                                        (define-key map
-                                          [header-line down-mouse-3]
-                                          (powerline-mouse 'minor 'menu mm))
-                                        map)))
-             (split-string (format-mode-line minor-mode-alist))
-             (propertize " " 'face face)))
-
-;;;###autoload (autoload 'powerline-narrow "powerline")
-(defpowerline powerline-narrow
-  (let (real-point-min real-point-max)
-    (save-excursion
-      (save-restriction
-        (widen)
-        (setq real-point-min (point-min) real-point-max (point-max))))
-    (when (or (/= real-point-min (point-min))
-              (/= real-point-max (point-max)))
-      (propertize "Narrow"
-                  'mouse-face 'mode-line-highlight
-                  'help-echo "mouse-1: Remove narrowing from the current buffer"
-                  'local-map (make-mode-line-mouse-map
-                              'mouse-1 'mode-line-widen)))))
-
-;;;###autoload (autoload 'powerline-vc "powerline")
-(defpowerline powerline-vc
-  (when (and (buffer-file-name (current-buffer)) vc-mode)
-    (if window-system
-	(format-mode-line '(vc-mode vc-mode))
-      (let ((backend (vc-backend (buffer-file-name (current-buffer)))))
-	(when backend
-	  (format " %s %s"
-		  (char-to-string #xe0a0)
-		  (vc-working-revision (buffer-file-name (current-buffer)) backend)))))))
-
-;;;###autoload (autoload 'powerline-buffer-size "powerline")
-(defpowerline powerline-buffer-size
-  (propertize
-   (if powerline-buffer-size-suffix
-       "%I"
-     "%i")
-   'mouse-face 'mode-line-highlight
-   'local-map (make-mode-line-mouse-map
-               'mouse-1 (lambda () (interactive)
-                          (setq powerline-buffer-size-suffix
-                                (not powerline-buffer-size-suffix))
-                          (force-mode-line-update)))))
-
-(defsubst powerline-trim (s)
-  "Remove whitespace at the beginning and the end of string S."
-  (replace-regexp-in-string
-   "\\`[ \t\n\r]+" ""
-   (replace-regexp-in-string "[ \t\n\r]+\\'" "" s)))
-
-;;;###autoload (autoload 'powerline-buffer-id "powerline")
-(defpowerline powerline-buffer-id
-    (powerline-trim (format-mode-line mode-line-buffer-identification)))
-
-;;;###autoload (autoload 'powerline-process "powerline")
-(defpowerline powerline-process
-  (cond
-   ((symbolp mode-line-process) (symbol-value mode-line-process))
-   ((listp mode-line-process) (format-mode-line mode-line-process))
-   (t mode-line-process)))
-
-(defvar pl/default-mode-line mode-line-format)
-
-(defvar pl/minibuffer-selected-window-list '())
-
-(defun pl/minibuffer-selected-window ()
-  "Return the selected window when entereing the minibuffer."
-  (when pl/minibuffer-selected-window-list
-    (car pl/minibuffer-selected-window-list)))
-
-(defun pl/minibuffer-setup ()
-  "Save the `minibuffer-selected-window' to `pl/minibuffer-selected-window'."
-  (push (minibuffer-selected-window) pl/minibuffer-selected-window-list))
-
-(add-hook 'minibuffer-setup-hook 'pl/minibuffer-setup)
-
-(defun pl/minibuffer-exit ()
-  "Set `pl/minibuffer-selected-window' to nil."
-  (pop pl/minibuffer-selected-window-list))
-
-(add-hook 'minibuffer-exit-hook 'pl/minibuffer-exit)
-
-(defvar powerline-selected-window (frame-selected-window))
-(defun powerline-set-selected-window ()
-  "sets the variable `powerline-selected-window` appropriately"
-  (when (not (minibuffer-window-active-p (frame-selected-window)))
-    (setq powerline-selected-window (frame-selected-window))))
-
-(add-hook 'window-configuration-change-hook 'powerline-set-selected-window)
-(add-hook 'focus-in-hook 'powerline-set-selected-window)
-(add-hook 'focus-out-hook 'powerline-set-selected-window)
-
-(defadvice select-window (after powerline-select-window activate)
-  "makes powerline aware of window changes"
-  (powerline-set-selected-window))
-
-;;;###autoload (autoload 'powerline-selected-window-active "powerline")
-(defun powerline-selected-window-active ()
-  "Return whether the current window is active."
-  (eq powerline-selected-window (selected-window)))
-
-(defun powerline-revert ()
-  "Revert to the default Emacs mode-line."
-  (interactive)
-  (setq-default mode-line-format pl/default-mode-line))
-
-(defun pl/render (item)
-  "Render a powerline ITEM."
-  (cond
-   ((and (listp item) (eq 'image (car item)))
-    (propertize " " 'display item
-                'face (plist-get (cdr item) :face)))
-   (item item)))
-
-(defun powerline-render (values)
-  "Render a list of powerline VALUES."
-  (mapconcat 'pl/render values ""))
-
-(defun powerline-width (values)
-  "Get the length of VALUES."
-  (if values
-      (let ((val (car values)))
-        (+ (cond
-            ((stringp val) (length (format-mode-line val)))
-            ((and (listp val) (eq 'image (car val)))
-             (car (image-size val)))
-            (t 0))
-           (powerline-width (cdr values))))
-    0))
-
-
-(provide 'powerline)
-
-;;; powerline.el ends here
diff --git a/emacs.d/elpa/powerline-20151008.1449/powerline-autoloads.el b/emacs.d/elpa/powerline-20151008.1449/powerline-autoloads.el
new file mode 100644
index 0000000..6b68bae
--- /dev/null
+++ b/emacs.d/elpa/powerline-20151008.1449/powerline-autoloads.el
@@ -0,0 +1,85 @@
+;;; powerline-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "powerline" "powerline.el" (22171 46548 0 0))
+;;; Generated autoloads from powerline.el
+
+(autoload 'powerline-hud "powerline" "\
+Return an XPM of relative buffer location using FACE1 and FACE2 of optional WIDTH.
+
+\(fn FACE1 FACE2 &optional WIDTH)" nil nil)
+
+(autoload 'powerline-mouse "powerline" "\
+Return mouse handler for CLICK-GROUP given CLICK-TYPE and STRING.
+
+\(fn CLICK-GROUP CLICK-TYPE STRING)" nil nil)
+
+(autoload 'powerline-concat "powerline" "\
+Concatonate STRINGS and pad sides by spaces.
+
+\(fn &rest STRINGS)" nil nil)
+
+(autoload 'defpowerline "powerline" "\
+Create function NAME by wrapping BODY with powerline padding an propetization.
+
+\(fn NAME BODY)" nil t)
+
+(autoload 'powerline-raw "powerline" "\
+Render STR as mode-line data using FACE and optionally PAD import on left (l) or right (r).
+
+\(fn STR &optional FACE PAD)" nil nil)
+
+(autoload 'powerline-fill "powerline" "\
+Return empty space using FACE and leaving RESERVE space on the right.
+
+\(fn FACE RESERVE)" nil nil)
+ (autoload 'powerline-major-mode "powerline")
+ (autoload 'powerline-minor-modes "powerline")
+ (autoload 'powerline-narrow "powerline")
+ (autoload 'powerline-vc "powerline")
+ (autoload 'powerline-buffer-size "powerline")
+ (autoload 'powerline-buffer-id "powerline")
+ (autoload 'powerline-process "powerline")
+ (autoload 'powerline-selected-window-active "powerline")
+
+;;;***
+
+;;;### (autoloads nil "powerline-themes" "powerline-themes.el" (22171
+;;;;;;  46548 0 0))
+;;; Generated autoloads from powerline-themes.el
+
+(autoload 'powerline-default-theme "powerline-themes" "\
+Setup the default mode-line.
+
+\(fn)" t nil)
+
+(autoload 'powerline-center-theme "powerline-themes" "\
+Setup a mode-line with major and minor modes centered.
+
+\(fn)" t nil)
+
+(autoload 'powerline-vim-theme "powerline-themes" "\
+Setup a Vim-like mode-line.
+
+\(fn)" t nil)
+
+(autoload 'powerline-nano-theme "powerline-themes" "\
+Setup a nano-like mode-line.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("powerline-pkg.el" "powerline-separators.el")
+;;;;;;  (22171 46548 535540 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; powerline-autoloads.el ends here
diff --git a/emacs.d/elpa/powerline-20151008.1449/powerline-pkg.el b/emacs.d/elpa/powerline-20151008.1449/powerline-pkg.el
new file mode 100644
index 0000000..ddc56ac
--- /dev/null
+++ b/emacs.d/elpa/powerline-20151008.1449/powerline-pkg.el
@@ -0,0 +1,7 @@
+(define-package "powerline" "20151008.1449" "Rewrite of Powerline"
+  '((cl-lib "0.2"))
+  :url "http://github.com/milkypostman/powerline/" :keywords
+  '("mode-line"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/powerline-20151008.1449/powerline-separators.el b/emacs.d/elpa/powerline-20151008.1449/powerline-separators.el
new file mode 100644
index 0000000..9b6e71f
--- /dev/null
+++ b/emacs.d/elpa/powerline-20151008.1449/powerline-separators.el
@@ -0,0 +1,341 @@
+;;; powerline-separators.el --- Separators for Powerline
+
+;; Copyright (C) 2012-2013 Donald Ephraim Curtis
+;; Copyright (C) 2013 Jason Milkins
+;; Copyright (C) 2012 Nicolas Rougier
+
+;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
+;; URL: http://github.com/milkypostman/powerline/
+;; Version: 2.0
+;; Keywords: mode-line
+
+;;; Commentary:
+;;
+;; Separators for Powerline.
+;; Included separators: alternate, arrow, arrow-fade, bar, box, brace, butt,
+;; chamfer, contour, curve, rounded, roundstub, slant, wave, zigzag, and nil.
+;;
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'color)
+
+(defun pl/interpolate (color1 color2)
+  "Interpolate between COLOR1 and COLOR2.
+
+COLOR1 and COLOR2 must be supplied as hex strings with a leading #."
+  (let* ((c1 (color-name-to-rgb color1))
+         (c2 (color-name-to-rgb color2))
+         (red (/ (+ (nth 0 c1) (nth 0 c2)) 2))
+         (green (/ (+ (nth 1 c1) (nth 1 c2)) 2))
+         (blue (/ (+ (nth 2 c1) (nth 2 c2)) 2)))
+    (color-rgb-to-hex red green blue)))
+
+(defun pl/hex-color (color)
+  "Get the hexadecimal value of COLOR."
+  (when color
+    (apply 'color-rgb-to-hex (color-name-to-rgb color))))
+
+(defun pl/pattern (lst)
+  "Turn LST into an infinite pattern."
+  (when lst
+    (let ((pattern (cl-copy-list lst)))
+      (setcdr (last pattern) pattern))))
+
+(defun pl/pattern-to-string (pattern)
+  "Convert a PATTERN into a string that can be used in an XPM."
+  (concat "\"" (mapconcat 'number-to-string pattern "") "\","))
+
+(defun pl/reverse-pattern (pattern)
+  "Reverse each line in PATTERN."
+  (mapcar 'reverse pattern))
+
+(defun pl/row-pattern (fill total &optional fade)
+  "Make a list that has FILL 0s out of TOTAL 1s with FADE 2s to the right of the fill."
+  (unless fade
+    (setq fade 0))
+  (let ((fill (min fill total))
+        (fade (min fade (max (- total fill) 0))))
+    (append (make-list fill 0)
+            (make-list fade 2)
+            (make-list (- total fill fade) 1))))
+
+
+(defun pl/pattern-defun (name dir width &rest patterns)
+  "Create a powerline function of NAME in DIR with WIDTH for PATTERNS.
+
+PATTERNS is of the form (PATTERN HEADER FOOTER SECOND-PATTERN CENTER).
+PATTERN is required, all other components are optional.
+
+All generated functions generate the form:
+HEADER
+PATTERN ...
+CENTER
+SECOND-PATTERN ...
+FOOTER
+
+PATTERN and SECOND-PATTERN repeat infinitely to fill the space needed to generate a full height XPM.
+
+PATTERN, HEADER, FOOTER, SECOND-PATTERN, CENTER are of the form ((COLOR ...) (COLOR ...) ...).
+
+COLOR can be one of 0, 1, or 2, where 0 is the source color, 1 is the
+destination color, and 2 is the interpolated color between 0 and 1."
+  (when (eq dir 'right)
+    (setq patterns (mapcar 'pl/reverse-pattern patterns)))
+  (let* ((pattern (pl/pattern (mapcar 'pl/pattern-to-string (car patterns))))
+         (header (mapcar 'pl/pattern-to-string (nth 1 patterns)))
+         (footer (mapcar 'pl/pattern-to-string (nth 2 patterns)))
+         (second-pattern (pl/pattern (mapcar 'pl/pattern-to-string (nth 3 patterns))))
+         (center (mapcar 'pl/pattern-to-string (nth 4 patterns)))
+         (reserve (+ (length header) (length footer) (length center))))
+    (pl/wrap-defun name dir width
+                   `((pattern-height (max (- height ,reserve) 0))
+                     (second-pattern-height (/ pattern-height 2))
+                     (pattern-height ,(if second-pattern '(ceiling pattern-height 2) 'pattern-height)))
+                   (list (when header `(mapconcat 'identity ',header ""))
+                         `(mapconcat 'identity (cl-subseq ',pattern 0 pattern-height) "")
+                         (when center `(mapconcat 'identity ',center ""))
+                         (when second-pattern `(mapconcat 'identity (cl-subseq ',second-pattern 0 second-pattern-height) ""))
+                         (when footer `(mapconcat 'identity ',footer ""))))))
+
+(defun pl/background-color (face)
+  (face-attribute face
+                  (if (face-attribute face :inverse-video nil 'default)
+                      :foreground
+                    :background)
+                  nil
+                  'default))
+
+(defun pl/wrap-defun (name dir width let-vars body)
+  "Generate a powerline function of NAME in DIR with WIDTH using LET-VARS and BODY."
+  (let* ((src-face (if (eq dir 'left) 'face1 'face2))
+         (dst-face (if (eq dir 'left) 'face2 'face1)))
+    `(defun ,(intern (format "powerline-%s-%s" name (symbol-name dir)))
+       (face1 face2 &optional height)
+       (when window-system
+         (unless height (setq height (pl/separator-height)))
+         (let* ,(append `((color1 (when ,src-face
+                                    (pl/hex-color (pl/background-color ,src-face))))
+                          (color2 (when ,dst-face
+                                    (pl/hex-color (pl/background-color ,dst-face))))
+                          (colori (when (and color1 color2) (pl/interpolate color1 color2)))
+                          (color1 (or color1 "None"))
+                          (color2 (or color2 "None"))
+                          (colori (or colori "None")))
+                        let-vars)
+           (create-image ,(append `(concat (format "/* XPM */ static char * %s_%s[] = { \"%s %s 3 1\", \"0 c %s\", \"1 c %s\", \"2 c %s\","
+                                                   ,(replace-regexp-in-string "-" "_" name)
+                                                   (symbol-name ',dir)
+                                                   ,width
+                                                   height
+                                                   color1
+                                                   color2
+                                                   colori))
+                                  body
+                                  '("};"))
+                         'xpm t
+                         :ascent 'center
+                         :face (when (and face1 face2)
+                                 ,dst-face)))))))
+
+
+(defmacro pl/alternate (dir)
+  "Generate an alternating pattern XPM function for DIR."
+  (pl/pattern-defun "alternate" dir 4
+                    '((2 2 1 1)
+                      (0 0 2 2))))
+
+(defmacro pl/arrow (dir)
+  "Generate an arrow XPM function for DIR."
+  (let ((row-modifier (if (eq dir 'left) 'identity 'reverse)))
+    (pl/wrap-defun "arrow" dir 'middle-width
+                   '((width (1- (/ height 2)))
+                     (middle-width (1- (ceiling height 2))))
+                   `((cl-loop for i from 0 to width
+                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width))))
+                     (when (cl-oddp height)
+                       (pl/pattern-to-string (make-list middle-width 0)))
+                     (cl-loop for i from width downto 0
+                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width))))))))
+
+(defmacro pl/arrow-fade (dir)
+  "Generate an arrow-fade XPM function for DIR."
+  (let* ((row-modifier (if (eq dir 'left) 'identity 'reverse)))
+    (pl/wrap-defun "arrow-fade" dir 'middle-width
+                   '((width (1- (/ height 2)))
+                     (middle-width (1+ (ceiling height 2))))
+                   `((cl-loop for i from 0 to width
+                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width 2))))
+                     (when (cl-oddp height)
+                       (pl/pattern-to-string (,row-modifier (pl/row-pattern (1+ width) middle-width 2))))
+                     (cl-loop for i from width downto 0
+                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern i middle-width 2))))))))
+
+(defmacro pl/bar (dir)
+  "Generate a bar XPM function for DIR."
+  (pl/pattern-defun "bar" dir 2
+                    '((2 2))))
+
+(defmacro pl/box (dir)
+  "Generate a box XPM function for DIR."
+  (pl/pattern-defun "box" dir 2
+                    '((0 0)
+                      (0 0)
+                      (1 1)
+                      (1 1))))
+
+(defmacro pl/brace (dir)
+  "Generate a brace XPM function for DIR."
+  (pl/pattern-defun "brace" dir 4
+                    '((0 1 1 1))
+                    '((1 1 1 1)
+                      (2 1 1 1))
+                    '((2 1 1 1)
+                      (1 1 1 1))
+                    '((0 1 1 1))
+                    '((0 2 1 1)
+                      (0 2 1 1)
+                      (0 0 2 1)
+                      (0 0 0 0)
+                      (0 0 2 1)
+                      (0 2 1 1)
+                      (0 2 1 1))))
+
+(defmacro pl/butt (dir)
+  "Generate a butt XPM function for DIR."
+  (pl/pattern-defun "butt" dir 3
+                    '((0 0 0))
+                    '((1 1 1)
+                      (0 1 1)
+                      (0 0 1))
+                    '((0 0 1)
+                      (0 1 1)
+                      (1 1 1))))
+
+(defmacro pl/chamfer (dir)
+  "Generate a chamfer XPM function for DIR."
+  (pl/pattern-defun "chamfer" dir 3
+                    '((0 0 0))
+                    '((1 1 1)
+                      (0 1 1)
+                      (0 0 1))))
+
+(defmacro pl/contour (dir)
+  "Generate a contour XPM function for DIR."
+  (pl/pattern-defun "contour" dir 10
+                    '((0 0 0 0 0 1 1 1 1 1))
+                    '((1 1 1 1 1 1 1 1 1 1)
+                      (0 2 1 1 1 1 1 1 1 1)
+                      (0 0 2 1 1 1 1 1 1 1)
+                      (0 0 0 2 1 1 1 1 1 1)
+                      (0 0 0 0 1 1 1 1 1 1)
+                      (0 0 0 0 2 1 1 1 1 1))
+                    '((0 0 0 0 0 2 1 1 1 1)
+                      (0 0 0 0 0 0 1 1 1 1)
+                      (0 0 0 0 0 0 2 1 1 1)
+                      (0 0 0 0 0 0 0 2 1 1)
+                      (0 0 0 0 0 0 0 0 0 0))))
+
+(defmacro pl/curve (dir)
+  "Generate a curve XPM function for DIR."
+  (pl/pattern-defun "curve" dir 4
+                    '((0 0 0 0))
+                    '((1 1 1 1)
+                      (2 1 1 1)
+                      (0 0 1 1)
+                      (0 0 2 1)
+                      (0 0 0 1)
+                      (0 0 0 2))
+                    '((0 0 0 2)
+                      (0 0 0 1)
+                      (0 0 2 1)
+                      (0 0 1 1)
+                      (2 1 1 1)
+                      (1 1 1 1))))
+
+(defmacro pl/rounded (dir)
+  "Generate a rounded XPM function for DIR."
+  (pl/pattern-defun "rounded" dir 6
+                    '((0 0 0 0 0 0))
+                    '((2 1 1 1 1 1)
+                      (0 0 2 1 1 1)
+                      (0 0 0 0 1 1)
+                      (0 0 0 0 2 1)
+                      (0 0 0 0 0 1)
+                      (0 0 0 0 0 2))))
+
+(defmacro pl/roundstub (dir)
+  "Generate a roundstub XPM function for DIR."
+  (pl/pattern-defun "roundstub" dir 3
+                    '((0 0 0))
+                    '((1 1 1)
+                      (0 0 1)
+                      (0 0 2))
+                    '((0 0 2)
+                      (0 0 1)
+                      (1 1 1))))
+
+(defmacro pl/slant (dir)
+  "Generate a slant XPM function for DIR."
+  (let* ((row-modifier (if (eq dir 'left) 'identity 'reverse)))
+    (pl/wrap-defun "slant" dir 'width
+                   '((width (1- (ceiling height 2))))
+                   `((cl-loop for i from 0 to height
+                              concat (pl/pattern-to-string (,row-modifier (pl/row-pattern (/ i 2) width))))))))
+
+(defmacro pl/wave (dir)
+  "Generate a wave XPM function for DIR."
+  (pl/pattern-defun "wave" dir 11
+                    '((0 0 0 0 0 0 1 1 1 1 1))
+                    '((2 1 1 1 1 1 1 1 1 1 1)
+                      (0 0 1 1 1 1 1 1 1 1 1)
+                      (0 0 0 1 1 1 1 1 1 1 1)
+                      (0 0 0 2 1 1 1 1 1 1 1)
+                      (0 0 0 0 1 1 1 1 1 1 1)
+                      (0 0 0 0 2 1 1 1 1 1 1)
+                      (0 0 0 0 0 1 1 1 1 1 1)
+                      (0 0 0 0 0 1 1 1 1 1 1)
+                      (0 0 0 0 0 2 1 1 1 1 1))
+                    '((0 0 0 0 0 0 2 1 1 1 1)
+                      (0 0 0 0 0 0 0 1 1 1 1)
+                      (0 0 0 0 0 0 0 1 1 1 1)
+                      (0 0 0 0 0 0 0 2 1 1 1)
+                      (0 0 0 0 0 0 0 0 1 1 1)
+                      (0 0 0 0 0 0 0 0 2 1 1)
+                      (0 0 0 0 0 0 0 0 0 0 2))))
+
+(defmacro pl/zigzag (dir)
+  "Generate a zigzag pattern XPM function for DIR."
+  (pl/pattern-defun "zigzag" dir 3
+                    '((1 1 1)
+                      (0 1 1)
+                      (0 0 1)
+                      (0 0 0)
+                      (0 0 1)
+                      (0 1 1))))
+
+(defmacro pl/nil (dir)
+  "Generate a XPM function that returns nil for DIR."
+  `(defun ,(intern (format "powerline-nil-%s" (symbol-name dir)))
+     (face1 face2 &optional height)
+     nil))
+
+(defmacro pl/utf-8 (dir)
+  "Generate function that returns raw utf-8 symbols."
+  (let ((dir-name (symbol-name dir))
+	(src-face (if (eq dir 'left) 'face1 'face2))
+	(dst-face (if (eq dir 'left) 'face2 'face1)))
+    `(defun ,(intern (format "powerline-utf-8-%s" dir-name))
+       (face1 face2 &optional height)
+       (powerline-raw
+	(char-to-string ,(intern (format "powerline-utf-8-separator-%s"
+					 dir-name)))
+        (list :foreground (pl/background-color ,src-face)
+              :background (pl/background-color ,dst-face)
+              :inverse-video nil)))))
+
+
+(provide 'powerline-separators)
+
+;;; powerline-separators.el ends here
diff --git a/emacs.d/elpa/powerline-20151008.1449/powerline-themes.el b/emacs.d/elpa/powerline-20151008.1449/powerline-themes.el
new file mode 100644
index 0000000..f519808
--- /dev/null
+++ b/emacs.d/elpa/powerline-20151008.1449/powerline-themes.el
@@ -0,0 +1,269 @@
+;;; powerline-themes.el --- Themes for Powerline
+
+;; Copyright (C) 2012-2013 Donald Ephraim Curtis
+;; Copyright (C) 2013 Jason Milkins
+;; Copyright (C) 2012 Nicolas Rougier
+
+;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
+;; URL: http://github.com/milkypostman/powerline/
+;; Version: 2.0
+;; Keywords: mode-line
+
+;;; Commentary:
+;;
+;; Themes for Powerline.
+;; Included themes: default, center, center-evil, vim, and nano.
+;;
+
+;;; Code:
+
+(defcustom powerline-display-buffer-size t
+  "When non-nil, display the buffer size."
+  :group 'powerline
+  :type 'boolean)
+
+(defcustom powerline-display-mule-info t
+  "When non-nil, display the mule info."
+  :group 'powerline
+  :type 'boolean)
+
+(defcustom powerline-display-hud t
+  "When non-nil, display the hud."
+  :group 'powerline
+  :type 'boolean)
+
+;;;###autoload
+(defun powerline-default-theme ()
+  "Setup the default mode-line."
+  (interactive)
+  (setq-default mode-line-format
+                '("%e"
+                  (:eval
+                   (let* ((active (powerline-selected-window-active))
+                          (mode-line (if active 'mode-line 'mode-line-inactive))
+                          (face1 (if active 'powerline-active1 'powerline-inactive1))
+                          (face2 (if active 'powerline-active2 'powerline-inactive2))
+                          (separator-left (intern (format "powerline-%s-%s"
+							  (powerline-current-separator)
+                                                          (car powerline-default-separator-dir))))
+                          (separator-right (intern (format "powerline-%s-%s"
+                                                           (powerline-current-separator)
+                                                           (cdr powerline-default-separator-dir))))
+                          (lhs (list (powerline-raw "%*" nil 'l)
+                                     (when powerline-display-buffer-size
+                                       (powerline-buffer-size nil 'l))
+                                     (when powerline-display-mule-info
+                                       (powerline-raw mode-line-mule-info nil 'l))
+                                     (powerline-buffer-id nil 'l)
+                                     (when (and (boundp 'which-func-mode) which-func-mode)
+                                       (powerline-raw which-func-format nil 'l))
+                                     (powerline-raw " ")
+                                     (funcall separator-left mode-line face1)
+                                     (when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode)
+                                       (powerline-raw erc-modified-channels-object face1 'l))
+                                     (powerline-major-mode face1 'l)
+                                     (powerline-process face1)
+                                     (powerline-minor-modes face1 'l)
+                                     (powerline-narrow face1 'l)
+                                     (powerline-raw " " face1)
+                                     (funcall separator-left face1 face2)
+                                     (powerline-vc face2 'r)
+                                     (when (bound-and-true-p nyan-mode)
+                                       (powerline-raw (list (nyan-create)) face2 'l))))
+                          (rhs (list (powerline-raw global-mode-string face2 'r)
+                                     (funcall separator-right face2 face1)
+				     (unless window-system
+				       (powerline-raw (char-to-string #xe0a1) face1 'l))
+				     (powerline-raw "%4l" face1 'l)
+				     (powerline-raw ":" face1 'l)
+				     (powerline-raw "%3c" face1 'r)
+				     (funcall separator-right face1 mode-line)
+				     (powerline-raw " ")
+				     (powerline-raw "%6p" nil 'r)
+                                     (when powerline-display-hud
+                                       (powerline-hud face2 face1)))))
+		     (concat (powerline-render lhs)
+			     (powerline-fill face2 (powerline-width rhs))
+			     (powerline-render rhs)))))))
+
+;;;###autoload
+(defun powerline-center-theme ()
+  "Setup a mode-line with major and minor modes centered."
+  (interactive)
+  (setq-default mode-line-format
+		'("%e"
+		  (:eval
+		   (let* ((active (powerline-selected-window-active))
+			  (mode-line (if active 'mode-line 'mode-line-inactive))
+			  (face1 (if active 'powerline-active1 'powerline-inactive1))
+			  (face2 (if active 'powerline-active2 'powerline-inactive2))
+			  (separator-left (intern (format "powerline-%s-%s"
+							  (powerline-current-separator)
+							  (car powerline-default-separator-dir))))
+			  (separator-right (intern (format "powerline-%s-%s"
+							   (powerline-current-separator)
+							   (cdr powerline-default-separator-dir))))
+			  (lhs (list (powerline-raw "%*" nil 'l)
+				     (powerline-buffer-size nil 'l)
+				     (powerline-buffer-id nil 'l)
+				     (powerline-raw " ")
+				     (funcall separator-left mode-line face1)
+				     (powerline-narrow face1 'l)
+				     (powerline-vc face1)))
+			  (rhs (list (powerline-raw global-mode-string face1 'r)
+				     (powerline-raw "%4l" face1 'r)
+				     (powerline-raw ":" face1)
+				     (powerline-raw "%3c" face1 'r)
+				     (funcall separator-right face1 mode-line)
+				     (powerline-raw " ")
+				     (powerline-raw "%6p" nil 'r)
+				     (powerline-hud face2 face1)))
+			  (center (list (powerline-raw " " face1)
+					(funcall separator-left face1 face2)
+					(when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode)
+					  (powerline-raw erc-modified-channels-object face2 'l))
+					(powerline-major-mode face2 'l)
+					(powerline-process face2)
+					(powerline-raw " :" face2)
+					(powerline-minor-modes face2 'l)
+					(powerline-raw " " face2)
+					(funcall separator-right face2 face1))))
+		     (concat (powerline-render lhs)
+			     (powerline-fill-center face1 (/ (powerline-width center) 2.0))
+			     (powerline-render center)
+			     (powerline-fill face1 (powerline-width rhs))
+			     (powerline-render rhs)))))))
+
+(defun powerline-center-evil-theme ()
+  "Setup a mode-line with major, evil, and minor modes centered."
+  (interactive)
+  (setq-default mode-line-format
+		'("%e"
+		  (:eval
+		   (let* ((active (powerline-selected-window-active))
+			  (mode-line (if active 'mode-line 'mode-line-inactive))
+			  (face1 (if active 'powerline-active1 'powerline-inactive1))
+			  (face2 (if active 'powerline-active2 'powerline-inactive2))
+			  (separator-left (intern (format "powerline-%s-%s"
+							  (powerline-current-separator)
+							  (car powerline-default-separator-dir))))
+			  (separator-right (intern (format "powerline-%s-%s"
+							   (powerline-current-separator)
+							   (cdr powerline-default-separator-dir))))
+			  (lhs (list (powerline-raw "%*" nil 'l)
+				     (powerline-buffer-size nil 'l)
+				     (powerline-buffer-id nil 'l)
+				     (powerline-raw " ")
+				     (funcall separator-left mode-line face1)
+				     (powerline-narrow face1 'l)
+				     (powerline-vc face1)))
+			  (rhs (list (powerline-raw global-mode-string face1 'r)
+				     (powerline-raw "%4l" face1 'r)
+				     (powerline-raw ":" face1)
+				     (powerline-raw "%3c" face1 'r)
+				     (funcall separator-right face1 mode-line)
+				     (powerline-raw " ")
+				     (powerline-raw "%6p" nil 'r)
+				     (powerline-hud face2 face1)))
+			  (center (append (list (powerline-raw " " face1)
+						(funcall separator-left face1 face2)
+						(when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode)
+						  (powerline-raw erc-modified-channels-object face2 'l))
+						(powerline-major-mode face2 'l)
+						(powerline-process face2)
+						(powerline-raw " " face2))
+					  (if (split-string (format-mode-line minor-mode-alist))
+					      (append (if evil-mode
+							  (list (funcall separator-right face2 face1)
+								(powerline-raw evil-mode-line-tag face1 'l)
+								(powerline-raw " " face1)
+								(funcall separator-left face1 face2)))
+						      (list (powerline-minor-modes face2 'l)
+							    (powerline-raw " " face2)
+							    (funcall separator-right face2 face1)))
+					    (list (powerline-raw evil-mode-line-tag face2)
+						  (funcall separator-right face2 face1))))))
+		     (concat (powerline-render lhs)
+			     (powerline-fill-center face1 (/ (powerline-width center) 2.0))
+			     (powerline-render center)
+			     (powerline-fill face1 (powerline-width rhs))
+			     (powerline-render rhs)))))))
+
+;;;###autoload
+(defun powerline-vim-theme ()
+  "Setup a Vim-like mode-line."
+  (interactive)
+  (setq-default mode-line-format
+		'("%e"
+		  (:eval
+		   (let* ((active (powerline-selected-window-active))
+			  (mode-line (if active 'mode-line 'mode-line-inactive))
+			  (face1 (if active 'powerline-active1 'powerline-inactive1))
+			  (face2 (if active 'powerline-active2 'powerline-inactive2))
+			  (separator-left (intern (format "powerline-%s-%s"
+							  (powerline-current-separator)
+							  (car powerline-default-separator-dir))))
+			  (separator-right (intern (format "powerline-%s-%s"
+							   (powerline-current-separator)
+							   (cdr powerline-default-separator-dir))))
+			  (lhs (list (powerline-buffer-id `(mode-line-buffer-id ,mode-line) 'l)
+				     (powerline-raw "[" mode-line 'l)
+				     (powerline-major-mode mode-line)
+				     (powerline-process mode-line)
+				     (powerline-raw "]" mode-line)
+				     (when (buffer-modified-p)
+				       (powerline-raw "[+]" mode-line))
+				     (when buffer-read-only
+				       (powerline-raw "[RO]" mode-line))
+				     (powerline-raw "[%z]" mode-line)
+				     ;; (powerline-raw (concat "[" (mode-line-eol-desc) "]") mode-line)
+				     (when (and (boundp 'which-func-mode) which-func-mode)
+				       (powerline-raw which-func-format nil 'l))
+				     (when (and (boundp 'erc-track-minor-mode) erc-track-minor-mode)
+				       (powerline-raw erc-modified-channels-object face1 'l))
+				     (powerline-raw "[" mode-line 'l)
+				     (powerline-minor-modes mode-line)
+				     (powerline-raw "%n" mode-line)
+				     (powerline-raw "]" mode-line)
+				     (when (and vc-mode buffer-file-name)
+				       (let ((backend (vc-backend buffer-file-name)))
+					 (when backend
+					   (concat (powerline-raw "[" mode-line 'l)
+						   (powerline-raw (format "%s / %s" backend (vc-working-revision buffer-file-name backend)))
+						   (powerline-raw "]" mode-line)))))))
+			  (rhs (list (powerline-raw '(10 "%i"))
+				     (powerline-raw global-mode-string mode-line 'r)
+				     (powerline-raw "%l," mode-line 'l)
+				     (powerline-raw (format-mode-line '(10 "%c")))
+				     (powerline-raw (replace-regexp-in-string  "%" "%%" (format-mode-line '(-3 "%p"))) mode-line 'r))))
+		     (concat (powerline-render lhs)
+			     (powerline-fill mode-line (powerline-width rhs))
+			     (powerline-render rhs)))))))
+
+;;;###autoload
+(defun powerline-nano-theme ()
+  "Setup a nano-like mode-line."
+  (interactive)
+  (setq-default mode-line-format
+		'("%e"
+		  (:eval
+		   (let* ((active (powerline-selected-window-active))
+			  (lhs (list (powerline-raw (concat "GNU Emacs "
+							    (number-to-string
+							     emacs-major-version)
+							    "."
+							    (number-to-string
+							     emacs-minor-version))
+						    nil 'l)))
+			  (rhs (list (if (buffer-modified-p) (powerline-raw "Modified" nil 'r))))
+			  (center (list (powerline-raw "%b" nil))))
+		     (concat (powerline-render lhs)
+			     (powerline-fill-center nil (/ (powerline-width center) 2.0))
+			     (powerline-render center)
+			     (powerline-fill nil (powerline-width rhs))
+			     (powerline-render rhs)))))))
+
+
+(provide 'powerline-themes)
+
+;;; powerline-themes.el ends here
diff --git a/emacs.d/elpa/powerline-20151008.1449/powerline.el b/emacs.d/elpa/powerline-20151008.1449/powerline.el
new file mode 100644
index 0000000..3b86fc8
--- /dev/null
+++ b/emacs.d/elpa/powerline-20151008.1449/powerline.el
@@ -0,0 +1,553 @@
+;;; powerline.el --- Rewrite of Powerline
+
+;; Copyright (C) 2012-2013 Donald Ephraim Curtis
+;; Copyright (C) 2013 Jason Milkins
+;; Copyright (C) 2012 Nicolas Rougier
+
+;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
+;; URL: http://github.com/milkypostman/powerline/
+;; Version: 2.3
+;; Keywords: mode-line
+;; Package-Requires: ((cl-lib "0.2"))
+
+;;; Commentary:
+;;
+;; Powerline is a library for customizing the mode-line that is based on the Vim
+;; Powerline. A collection of predefined themes comes with the package.
+;;
+
+;;; Code:
+
+(eval-and-compile (require 'powerline-themes))
+(eval-and-compile (require 'powerline-separators))
+
+(require 'cl-lib)
+
+(defface powerline-active1 '((t (:background "grey22" :inherit mode-line)))
+  "Powerline face 1."
+  :group 'powerline)
+
+(defface powerline-active2 '((t (:background "grey40" :inherit mode-line)))
+  "Powerline face 2."
+  :group 'powerline)
+
+(defface powerline-inactive1
+  '((t (:background "grey11" :inherit mode-line-inactive)))
+  "Powerline face 1."
+  :group 'powerline)
+
+(defface powerline-inactive2
+  '((t (:background "grey20" :inherit mode-line-inactive)))
+  "Powerline face 2."
+  :group 'powerline)
+
+(defcustom powerline-default-separator 'arrow
+  "The separator to use for the default theme.
+
+Valid Values: alternate, arrow, arrow-fade, bar, box, brace,
+butt, chamfer, contour, curve, rounded, roundstub, wave, zigzag,
+utf-8."
+  :group 'powerline
+  :type '(choice (const alternate)
+                 (const arrow)
+                 (const arrow-fade)
+                 (const bar)
+                 (const box)
+                 (const brace)
+                 (const butt)
+                 (const chamfer)
+                 (const contour)
+                 (const curve)
+                 (const rounded)
+                 (const roundstub)
+                 (const slant)
+                 (const wave)
+                 (const zigzag)
+		 (const utf-8)
+                 (const nil)))
+
+(defcustom powerline-utf-8-separator-left #xe0b0
+  "The unicode character number for the left facing separator"
+  :group 'powerline
+  :type  '(choice integer (const nil)))
+
+(defcustom powerline-utf-8-separator-right #xe0b2
+  "The unicode character number for the right facing separator"
+  :group 'powerline
+  :type  '(choice integer (const nil)))
+
+(defcustom powerline-default-separator-dir '(left . right)
+  "The separator direction to use for the default theme.
+
+CONS of the form (DIR . DIR) denoting the lean of the
+separators for the left and right side of the powerline.
+
+DIR must be one of: left, right"
+  :group 'powerline
+  :type '(cons (choice :tag "Left Hand Side" (const left) (const right))
+               (choice :tag "Right Hand Side" (const left) (const right))))
+
+(defcustom powerline-height nil
+  "Override the mode-line height."
+  :group 'powerline
+  :type '(choice integer (const nil)))
+
+(defcustom powerline-text-scale-factor nil
+  "Scale of mode-line font size to default text size.
+
+Smaller mode-line fonts will be a float value less that 1.
+Larger mode-line fonts require a float value greater than 1.
+
+This is needed to make sure that text is properly aligned."
+  :group 'powerline
+  :type '(choice float integer (const nil)))
+
+(defcustom powerline-buffer-size-suffix t
+  "Display the buffer size suffix."
+  :group 'powerline
+  :type 'boolean)
+
+(defun pl/create-or-get-cache ()
+  "Return a frame-local hash table that acts as a memoization cache for powerline. Create one if the frame doesn't have one yet."
+  (let ((table (frame-parameter nil 'powerline-cache)))
+    (if (hash-table-p table) table (pl/reset-cache))))
+
+(defun pl/reset-cache ()
+  "Reset and return the frame-local hash table used for a memoization cache."
+  (let ((table (make-hash-table :test 'equal)))
+    ;; Store it as a frame-local variable
+    (modify-frame-parameters nil `((powerline-cache . ,table)))
+    table))
+
+(defun powerline-current-separator ()
+  "Get the current default separator. Always returns utf-8 in non-gui mode."
+  (if window-system
+      powerline-default-separator
+    'utf-8))
+
+;;
+;; the frame-local powerline cache causes problems if included in a saved desktop,
+;; so delete it before the desktop is saved.
+;;
+;; see https://github.com/milkypostman/powerline/issues/58
+;;
+;; It is better to put the following code into your init file for Emacs 24.4 or later.
+;; (require 'frameset)
+;; (push '(powerline-cache . :never) frameset-filter-alist)
+;;
+(defun powerline-delete-cache (&optional frame)
+  "Set the FRAME cache to nil."
+  (set-frame-parameter frame 'powerline-cache nil))
+
+(defun powerline-desktop-save-delete-cache ()
+  "Set all caches to nil unless `frameset-filter-alist' has :never for powerline-cache."
+  (unless (and (boundp 'frameset-filter-alist)
+               (eq (cdr (assq 'powerline-cache frameset-filter-alist))
+                   :never))
+    (dolist (fr (frame-list)) (powerline-delete-cache fr))))
+
+(add-hook 'desktop-save-hook 'powerline-desktop-save-delete-cache)
+
+;; from memoize.el @ http://nullprogram.com/blog/2010/07/26/
+(defun pl/memoize (func)
+  "Memoize FUNC.
+If argument is a symbol then install the memoized function over
+the original function.  Use frame-local memoization."
+  (cl-typecase func
+    (symbol (fset func (pl/memoize-wrap-frame-local (symbol-function func))) func)
+    (function (pl/memoize-wrap-frame-local func))))
+
+(defun pl/memoize-wrap-frame-local (func)
+  "Return the memoized version of FUNC.
+The memoization cache is frame-local."
+  (let ((funcid (cl-gensym)))
+    `(lambda (&rest args)
+       ,(concat (documentation func) (format "\n(memoized function %s)" funcid))
+       (let* ((cache (pl/create-or-get-cache))
+              (key (cons ',funcid args))
+              (val (gethash key cache)))
+         (if val
+             val
+           (puthash key (apply ,func args) cache))))))
+
+(defun pl/separator-height ()
+  "Get default height for rendering separators."
+  (or powerline-height (frame-char-height)))
+
+(defun powerline-reset ()
+  "Reset memoized functions."
+  (interactive)
+  (pl/memoize (pl/alternate left))
+  (pl/memoize (pl/alternate right))
+  (pl/memoize (pl/arrow left))
+  (pl/memoize (pl/arrow right))
+  (pl/memoize (pl/arrow-fade left))
+  (pl/memoize (pl/arrow-fade right))
+  (pl/memoize (pl/bar left))
+  (pl/memoize (pl/bar right))
+  (pl/memoize (pl/box left))
+  (pl/memoize (pl/box right))
+  (pl/memoize (pl/brace left))
+  (pl/memoize (pl/brace right))
+  (pl/memoize (pl/butt left))
+  (pl/memoize (pl/butt right))
+  (pl/memoize (pl/chamfer left))
+  (pl/memoize (pl/chamfer right))
+  (pl/memoize (pl/contour left))
+  (pl/memoize (pl/contour right))
+  (pl/memoize (pl/curve left))
+  (pl/memoize (pl/curve right))
+  (pl/memoize (pl/rounded left))
+  (pl/memoize (pl/rounded right))
+  (pl/memoize (pl/roundstub left))
+  (pl/memoize (pl/roundstub right))
+  (pl/memoize (pl/slant left))
+  (pl/memoize (pl/slant right))
+  (pl/memoize (pl/wave left))
+  (pl/memoize (pl/wave right))
+  (pl/memoize (pl/zigzag left))
+  (pl/memoize (pl/zigzag right))
+  (pl/memoize (pl/nil left))
+  (pl/memoize (pl/nil right))
+  (pl/utf-8 left)
+  (pl/utf-8 right)
+  (pl/reset-cache))
+
+(powerline-reset)
+
+(defun pl/make-xpm (name color1 color2 data)
+  "Return an XPM image with NAME using COLOR1 for enabled and COLOR2 for disabled bits specified in DATA."
+  (when window-system
+    (create-image
+     (concat
+      (format "/* XPM */
+static char * %s[] = {
+\"%i %i 2 1\",
+\". c %s\",
+\"  c %s\",
+"
+              (downcase (replace-regexp-in-string " " "_" name))
+              (length (car data))
+              (length data)
+              (or (pl/hex-color color1) "None")
+              (or (pl/hex-color color2) "None"))
+      (let ((len  (length data))
+            (idx  0))
+        (apply 'concat
+               (mapcar #'(lambda (dl)
+                           (setq idx (+ idx 1))
+                           (concat
+                            "\""
+                            (concat
+                             (mapcar #'(lambda (d)
+                                         (if (eq d 0)
+                                             (string-to-char " ")
+                                           (string-to-char ".")))
+                                     dl))
+                            (if (eq idx len)
+                                "\"};"
+                              "\",\n")))
+                       data))))
+     'xpm t :ascent 'center)))
+
+(defun pl/percent-xpm
+  (height pmax pmin winend winstart width color1 color2)
+  "Generate percentage xpm of HEIGHT for PMAX to PMIN given WINEND and WINSTART with WIDTH and COLOR1 and COLOR2."
+  (let* ((height- (1- height))
+         (fillstart (round (* height- (/ (float winstart) (float pmax)))))
+         (fillend (round (* height- (/ (float winend) (float pmax)))))
+         (data nil)
+         (i 0))
+    (while (< i height)
+      (setq data (cons
+                  (if (and (<= fillstart i)
+                           (<= i fillend))
+                      (append (make-list width 1))
+                    (append (make-list width 0)))
+                  data))
+      (setq i (+ i 1)))
+    (pl/make-xpm "percent" color1 color2 (reverse data))))
+
+(pl/memoize 'pl/percent-xpm)
+
+;;;###autoload
+(defun powerline-hud (face1 face2 &optional width)
+  "Return an XPM of relative buffer location using FACE1 and FACE2 of optional WIDTH."
+  (unless width (setq width 2))
+  (let ((color1 (if face1 (face-background face1) "None"))
+        (color2 (if face2 (face-background face2) "None"))
+        (height (or powerline-height (frame-char-height)))
+        pmax
+        pmin
+        (ws (window-start))
+        (we (window-end)))
+    (save-restriction
+      (widen)
+      (setq pmax (point-max))
+      (setq pmin (point-min)))
+    (pl/percent-xpm height pmax pmin we ws
+                    (* (frame-char-width) width) color1 color2)))
+
+;;;###autoload
+(defun powerline-mouse (click-group click-type string)
+  "Return mouse handler for CLICK-GROUP given CLICK-TYPE and STRING."
+  (cond ((eq click-group 'minor)
+         (cond ((eq click-type 'menu)
+                `(lambda (event)
+                   (interactive "@e")
+                   (minor-mode-menu-from-indicator ,string)))
+               ((eq click-type 'help)
+                `(lambda (event)
+                   (interactive "@e")
+                   (describe-minor-mode-from-indicator ,string)))
+               (t
+                `(lambda (event)
+                   (interactive "@e")
+                   nil))))
+        (t
+         `(lambda (event)
+            (interactive "@e")
+            nil))))
+
+;;;###autoload
+(defun powerline-concat (&rest strings)
+  "Concatonate STRINGS and pad sides by spaces."
+  (concat
+   " "
+   (mapconcat 'identity (delq nil strings) " ")
+   " "))
+
+;;;###autoload
+(defmacro defpowerline (name body)
+  "Create function NAME by wrapping BODY with powerline padding an propetization."
+  `(defun ,name
+     (&optional face pad)
+     (powerline-raw ,body face pad)))
+
+(defun pl/property-substrings (str prop)
+  "Return a list of substrings of STR when PROP change."
+  (let ((beg 0) (end 0)
+        (len (length str))
+        (out))
+    (while (< end (length str))
+      (setq end (or (next-single-property-change beg prop str) len))
+      (setq out (append out (list (substring str beg (setq beg end))))))
+    out))
+
+(defun pl/assure-list (item)
+  "Assure that ITEM is a list."
+  (if (listp item)
+      item
+    (list item)))
+
+(defun pl/add-text-property (str prop val)
+  (mapconcat
+   (lambda (mm)
+     (let ((cur (pl/assure-list (get-text-property 0 'face mm))))
+       (propertize mm 'face (append cur (list val)))))
+   (pl/property-substrings str prop)
+   ""))
+
+;;;###autoload
+(defun powerline-raw (str &optional face pad)
+  "Render STR as mode-line data using FACE and optionally PAD import on left (l) or right (r)."
+  (when str
+    (let* ((rendered-str (format-mode-line str))
+           (padded-str (concat
+                        (when (and (> (length rendered-str) 0) (eq pad 'l)) " ")
+                        (if (listp str) rendered-str str)
+                        (when (and (> (length rendered-str) 0) (eq pad 'r)) " "))))
+
+      (if face
+          (pl/add-text-property padded-str 'face face)
+        padded-str))))
+
+;;;###autoload
+(defun powerline-fill (face reserve)
+  "Return empty space using FACE and leaving RESERVE space on the right."
+  (unless reserve
+    (setq reserve 20))
+  (when powerline-text-scale-factor
+    (setq reserve (* powerline-text-scale-factor reserve)))
+  (when (and window-system (eq 'right (get-scroll-bar-mode)))
+    (setq reserve (- reserve 3)))
+  (propertize " "
+              'display `((space :align-to (- (+ right right-fringe right-margin) ,reserve)))
+              'face face))
+
+(defun powerline-fill-center (face reserve)
+  "Return empty space using FACE to the center of remaining space leaving RESERVE space on the right."
+  (unless reserve
+    (setq reserve 20))
+  (when powerline-text-scale-factor
+    (setq reserve (* powerline-text-scale-factor reserve)))
+  (propertize " "
+              'display `((space :align-to (- (+ center (.5 . right-margin)) ,reserve
+                                             (.5 . left-margin))))
+              'face face))
+
+;;;###autoload (autoload 'powerline-major-mode "powerline")
+(defpowerline powerline-major-mode
+  (propertize (format-mode-line mode-name)
+              'mouse-face 'mode-line-highlight
+              'help-echo "Major mode\n\ mouse-1: Display major mode menu\n\ mouse-2: Show help for major mode\n\ mouse-3: Toggle minor modes"
+              'local-map (let ((map (make-sparse-keymap)))
+                           (define-key map [mode-line down-mouse-1]
+                             `(menu-item ,(purecopy "Menu Bar") ignore
+                                         :filter (lambda (_) (mouse-menu-major-mode-map))))
+                           (define-key map [mode-line mouse-2] 'describe-mode)
+                           (define-key map [mode-line down-mouse-3] mode-line-mode-menu)
+                           map)))
+
+;;;###autoload (autoload 'powerline-minor-modes "powerline")
+(defpowerline powerline-minor-modes
+  (mapconcat (lambda (mm)
+               (propertize mm
+                           'mouse-face 'mode-line-highlight
+                           'help-echo "Minor mode\n mouse-1: Display minor mode menu\n mouse-2: Show help for minor mode\n mouse-3: Toggle minor modes"
+                           'local-map (let ((map (make-sparse-keymap)))
+                                        (define-key map
+                                          [mode-line down-mouse-1]
+                                          (powerline-mouse 'minor 'menu mm))
+                                        (define-key map
+                                          [mode-line mouse-2]
+                                          (powerline-mouse 'minor 'help mm))
+                                        (define-key map
+                                          [mode-line down-mouse-3]
+                                          (powerline-mouse 'minor 'menu mm))
+                                        (define-key map
+                                          [header-line down-mouse-3]
+                                          (powerline-mouse 'minor 'menu mm))
+                                        map)))
+             (split-string (format-mode-line minor-mode-alist))
+             (propertize " " 'face face)))
+
+;;;###autoload (autoload 'powerline-narrow "powerline")
+(defpowerline powerline-narrow
+  (let (real-point-min real-point-max)
+    (save-excursion
+      (save-restriction
+        (widen)
+        (setq real-point-min (point-min) real-point-max (point-max))))
+    (when (or (/= real-point-min (point-min))
+              (/= real-point-max (point-max)))
+      (propertize "Narrow"
+                  'mouse-face 'mode-line-highlight
+                  'help-echo "mouse-1: Remove narrowing from the current buffer"
+                  'local-map (make-mode-line-mouse-map
+                              'mouse-1 'mode-line-widen)))))
+
+;;;###autoload (autoload 'powerline-vc "powerline")
+(defpowerline powerline-vc
+  (when (and (buffer-file-name (current-buffer)) vc-mode)
+    (if window-system
+	(format-mode-line '(vc-mode vc-mode))
+      (let ((backend (vc-backend (buffer-file-name (current-buffer)))))
+	(when backend
+	  (format " %s %s"
+		  (char-to-string #xe0a0)
+		  (vc-working-revision (buffer-file-name (current-buffer)) backend)))))))
+
+;;;###autoload (autoload 'powerline-buffer-size "powerline")
+(defpowerline powerline-buffer-size
+  (propertize
+   (if powerline-buffer-size-suffix
+       "%I"
+     "%i")
+   'mouse-face 'mode-line-highlight
+   'local-map (make-mode-line-mouse-map
+               'mouse-1 (lambda () (interactive)
+                          (setq powerline-buffer-size-suffix
+                                (not powerline-buffer-size-suffix))
+                          (force-mode-line-update)))))
+
+(defsubst powerline-trim (s)
+  "Remove whitespace at the beginning and the end of string S."
+  (replace-regexp-in-string
+   "\\`[ \t\n\r]+" ""
+   (replace-regexp-in-string "[ \t\n\r]+\\'" "" s)))
+
+;;;###autoload (autoload 'powerline-buffer-id "powerline")
+(defpowerline powerline-buffer-id
+    (powerline-trim (format-mode-line mode-line-buffer-identification)))
+
+;;;###autoload (autoload 'powerline-process "powerline")
+(defpowerline powerline-process
+  (cond
+   ((symbolp mode-line-process) (symbol-value mode-line-process))
+   ((listp mode-line-process) (format-mode-line mode-line-process))
+   (t mode-line-process)))
+
+(defvar pl/default-mode-line mode-line-format)
+
+(defvar pl/minibuffer-selected-window-list '())
+
+(defun pl/minibuffer-selected-window ()
+  "Return the selected window when entereing the minibuffer."
+  (when pl/minibuffer-selected-window-list
+    (car pl/minibuffer-selected-window-list)))
+
+(defun pl/minibuffer-setup ()
+  "Save the `minibuffer-selected-window' to `pl/minibuffer-selected-window'."
+  (push (minibuffer-selected-window) pl/minibuffer-selected-window-list))
+
+(add-hook 'minibuffer-setup-hook 'pl/minibuffer-setup)
+
+(defun pl/minibuffer-exit ()
+  "Set `pl/minibuffer-selected-window' to nil."
+  (pop pl/minibuffer-selected-window-list))
+
+(add-hook 'minibuffer-exit-hook 'pl/minibuffer-exit)
+
+(defvar powerline-selected-window (frame-selected-window))
+(defun powerline-set-selected-window ()
+  "sets the variable `powerline-selected-window` appropriately"
+  (when (not (minibuffer-window-active-p (frame-selected-window)))
+    (setq powerline-selected-window (frame-selected-window))))
+
+(add-hook 'window-configuration-change-hook 'powerline-set-selected-window)
+(add-hook 'focus-in-hook 'powerline-set-selected-window)
+(add-hook 'focus-out-hook 'powerline-set-selected-window)
+
+(defadvice select-window (after powerline-select-window activate)
+  "makes powerline aware of window changes"
+  (powerline-set-selected-window))
+
+;;;###autoload (autoload 'powerline-selected-window-active "powerline")
+(defun powerline-selected-window-active ()
+  "Return whether the current window is active."
+  (eq powerline-selected-window (selected-window)))
+
+(defun powerline-revert ()
+  "Revert to the default Emacs mode-line."
+  (interactive)
+  (setq-default mode-line-format pl/default-mode-line))
+
+(defun pl/render (item)
+  "Render a powerline ITEM."
+  (cond
+   ((and (listp item) (eq 'image (car item)))
+    (propertize " " 'display item
+                'face (plist-get (cdr item) :face)))
+   (item item)))
+
+(defun powerline-render (values)
+  "Render a list of powerline VALUES."
+  (mapconcat 'pl/render values ""))
+
+(defun powerline-width (values)
+  "Get the length of VALUES."
+  (if values
+      (let ((val (car values)))
+        (+ (cond
+            ((stringp val) (length (format-mode-line val)))
+            ((and (listp val) (eq 'image (car val)))
+             (car (image-size val)))
+            (t 0))
+           (powerline-width (cdr values))))
+    0))
+
+
+(provide 'powerline)
+
+;;; powerline.el ends here
diff --git a/emacs.d/elpa/projectile-20150622.1237/projectile-autoloads.el b/emacs.d/elpa/projectile-20150622.1237/projectile-autoloads.el
deleted file mode 100644
index 80391de..0000000
--- a/emacs.d/elpa/projectile-20150622.1237/projectile-autoloads.el
+++ /dev/null
@@ -1,256 +0,0 @@
-;;; projectile-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "projectile" "projectile.el" (21898 47963 0
-;;;;;;  0))
-;;; Generated autoloads from projectile.el
-
-(autoload 'projectile-cache-current-file "projectile" "\
-Add the currently visited file to the cache.
-
-\(fn)" t nil)
-
-(autoload 'projectile-switch-to-buffer "projectile" "\
-Switch to a project buffer.
-
-\(fn)" t nil)
-
-(autoload 'projectile-switch-to-buffer-other-window "projectile" "\
-Switch to a project buffer and show it in another window.
-
-\(fn)" t nil)
-
-(autoload 'projectile-display-buffer "projectile" "\
-Display a project buffer in another window without selecting it.
-
-\(fn)" t nil)
-
-(autoload 'projectile-project-buffers-other-buffer "projectile" "\
-Switch to the most recently selected buffer project buffer.
-Only buffers not visible in windows are returned.
-
-\(fn)" t nil)
-
-(autoload 'projectile-multi-occur "projectile" "\
-Do a `multi-occur' in the project's buffers.
-
-\(fn)" t nil)
-
-(autoload 'projectile-find-file-dwim "projectile" "\
-Jump to a project's files using completion based on context.
-
-With a prefix ARG invalidates the cache first.
-
-If point is on a filename, Projectile first tries to search for that
-file in project:
-
-- If it finds just a file, it switches to that file instantly.  This works even
-if the filename is incomplete, but there's only a single file in the current project
-that matches the filename at point.  For example, if there's only a single file named
-\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
-`projectile-find-file' still switches to \"projectile/projectile.el\" immediately
- because this is the only filename that matches.
-
-- If it finds a list of files, the list is displayed for selecting.  A list of
-files is displayed when a filename appears more than one in the project or the
-filename at point is a prefix of more than two files in a project.  For example,
-if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
-the content of that directory.  If it is executed on a partial filename like
- \"projectile/a\", a list of files with character 'a' in that directory is presented.
-
-- If it finds nothing, display a list of all files in project for selecting.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'projectile-find-file-dwim-other-window "projectile" "\
-Jump to a project's files using completion based on context in other window.
-
-With a prefix ARG invalidates the cache first.
-
-If point is on a filename, Projectile first tries to search for that
-file in project:
-
-- If it finds just a file, it switches to that file instantly.  This works even
-if the filename is incomplete, but there's only a single file in the current project
-that matches the filename at point.  For example, if there's only a single file named
-\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
-`projectile-find-file' still switches to \"projectile/projectile.el\"
-immediately because this is the only filename that matches.
-
-- If it finds a list of files, the list is displayed for selecting.  A list of
-files is displayed when a filename appears more than one in the project or the
-filename at point is a prefix of more than two files in a project.  For example,
-if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
-the content of that directory.  If it is executed on a partial filename
-like \"projectile/a\", a list of files with character 'a' in that directory
-is presented.
-
-- If it finds nothing, display a list of all files in project for selecting.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'projectile-find-file "projectile" "\
-Jump to a project's file using completion.
-With a prefix ARG invalidates the cache first.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'projectile-find-file-other-window "projectile" "\
-Jump to a project's file using completion and show it in another window.
-
-With a prefix ARG invalidates the cache first.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'projectile-find-implementation-or-test-other-window "projectile" "\
-Open matching implementation or test file in other window.
-
-\(fn)" t nil)
-
-(autoload 'projectile-toggle-between-implementation-and-test "projectile" "\
-Toggle between an implementation file and its test file.
-
-\(fn)" t nil)
-
-(autoload 'projectile-regenerate-tags "projectile" "\
-Regenerate the project's [e|g]tags.
-
-\(fn)" t nil)
-
-(autoload 'projectile-find-tag "projectile" "\
-Find tag in project.
-
-\(fn)" t nil)
-
-(autoload 'projectile-run-command-in-root "projectile" "\
-Invoke `execute-extended-command' in the project's root.
-
-\(fn)" t nil)
-
-(autoload 'projectile-run-shell-command-in-root "projectile" "\
-Invoke `shell-command' in the project's root.
-
-\(fn)" t nil)
-
-(autoload 'projectile-run-async-shell-command-in-root "projectile" "\
-Invoke `async-shell-command' in the project's root.
-
-\(fn)" t nil)
-
-(autoload 'projectile-kill-buffers "projectile" "\
-Kill all project buffers.
-
-\(fn)" t nil)
-
-(autoload 'projectile-save-project-buffers "projectile" "\
-Save all project buffers.
-
-\(fn)" t nil)
-
-(autoload 'projectile-dired "projectile" "\
-Open `dired' at the root of the project.
-
-\(fn)" t nil)
-
-(autoload 'projectile-vc "projectile" "\
-Open `vc-dir' at the root of the project.
-
-For git projects `magit-status-internal' is used if available.
-
-\(fn &optional PROJECT-ROOT)" t nil)
-
-(autoload 'projectile-recentf "projectile" "\
-Show a list of recently visited files in a project.
-
-\(fn)" t nil)
-
-(autoload 'projectile-find-file-in-known-projects "projectile" "\
-Jump to a file in any of the known projects.
-
-\(fn)" t nil)
-
-(autoload 'projectile-cleanup-known-projects "projectile" "\
-Remove known projects that don't exist anymore.
-
-\(fn)" t nil)
-
-(autoload 'projectile-clear-known-projects "projectile" "\
-Clear both `projectile-known-projects' and `projectile-known-projects-file'.
-
-\(fn)" t nil)
-
-(autoload 'projectile-remove-current-project-from-known-projects "projectile" "\
-Remove the current project from the list of known projects.
-
-\(fn)" t nil)
-
-(autoload 'projectile-commander "projectile" "\
-Execute a Projectile command with a single letter.
-The user is prompted for a single character indicating the action to invoke.
-The `?' character describes then
-available actions.
-
-See `def-projectile-commander-method' for defining new methods.
-
-\(fn)" t nil)
-
-(defvar projectile-mode-line '(:eval (format " Projectile[%s]" (projectile-project-name))) "\
-Mode line lighter for Projectile.
-
-The value of this variable is a mode line template as in
-`mode-line-format'.  See Info Node `(elisp)Mode Line Format' for
-details about mode line templates.
-
-Customize this variable to change how Projectile displays its
-status in the mode line.  The default value displays the project
-name.  Set this variable to nil to disable the mode line
-entirely.")
-
-(custom-autoload 'projectile-mode-line "projectile" t)
-
-(autoload 'projectile-mode "projectile" "\
-Minor mode to assist project management and navigation.
-
-When called interactively, toggle `projectile-mode'.  With prefix
-ARG, enable `projectile-mode' if ARG is positive, otherwise disable
-it.
-
-When called from Lisp, enable `projectile-mode' if ARG is omitted,
-nil or positive.  If ARG is `toggle', toggle `projectile-mode'.
-Otherwise behave as if called interactively.
-
-\\{projectile-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-(defvar projectile-global-mode nil "\
-Non-nil if Projectile-Global mode is enabled.
-See the command `projectile-global-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `projectile-global-mode'.")
-
-(custom-autoload 'projectile-global-mode "projectile" nil)
-
-(autoload 'projectile-global-mode "projectile" "\
-Toggle Projectile mode in all buffers.
-With prefix ARG, enable Projectile-Global mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Projectile mode is enabled in all buffers where
-`projectile-mode' would do it.
-See `projectile-mode' for more information on Projectile mode.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; projectile-autoloads.el ends here
diff --git a/emacs.d/elpa/projectile-20150622.1237/projectile-pkg.el b/emacs.d/elpa/projectile-20150622.1237/projectile-pkg.el
deleted file mode 100644
index 5bb74ea..0000000
--- a/emacs.d/elpa/projectile-20150622.1237/projectile-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "projectile" "20150622.1237" "Manage and navigate projects in Emacs easily" '((dash "1.5.0") (pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
diff --git a/emacs.d/elpa/projectile-20150622.1237/projectile.el b/emacs.d/elpa/projectile-20150622.1237/projectile.el
deleted file mode 100644
index 89bceec..0000000
--- a/emacs.d/elpa/projectile-20150622.1237/projectile.el
+++ /dev/null
@@ -1,2701 +0,0 @@
-;;; projectile.el --- Manage and navigate projects in Emacs easily -*- lexical-binding: t -*-
-
-;; Copyright © 2011-2015 Bozhidar Batsov <bozhidar@batsov.com>
-
-;; Author: Bozhidar Batsov <bozhidar@batsov.com>
-;; URL: https://github.com/bbatsov/projectile
-;; Package-Version: 20150622.1237
-;; Keywords: project, convenience
-;; Version: 0.13.0-cvs
-;; Package-Requires: ((dash "1.5.0") (pkg-info "0.4"))
-
-;; This file is NOT part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-;;
-;; This library provides easy project management and navigation.  The
-;; concept of a project is pretty basic - just a folder containing
-;; special file.  Currently git, mercurial and bazaar repos are
-;; considered projects by default.  If you want to mark a folder
-;; manually as a project just create an empty .projectile file in
-;; it.  See the README for more details.
-;;
-;;; Code:
-
-(require 'thingatpt)
-(require 'dash)
-(require 'ibuffer)
-(require 'ibuf-ext)
-
-(eval-when-compile
-  (defvar ggtags-completion-table)
-  (defvar tags-completion-table))
-
-(declare-function ggtags-ensure-project "ggtags")
-(declare-function ggtags-update-tags "ggtags")
-(declare-function pkg-info-version-info "pkg-info")
-(declare-function tags-completion-table "etags")
-
-;;;; Compatibility
-(eval-and-compile
-  ;; Added in Emacs 24.3.
-  (unless (fboundp 'defvar-local)
-    (defmacro defvar-local (var val &optional docstring)
-      "Define VAR as a buffer-local variable with default value VAL.
-Like `defvar' but additionally marks the variable as being automatically
-buffer-local wherever it is set."
-      (declare (debug defvar) (doc-string 3))
-      `(progn
-         (defvar ,var ,val ,docstring)
-         (make-variable-buffer-local ',var))))
-
-  ;; Added in Emacs 24.4
-  (unless (fboundp 'string-suffix-p)
-    (defun string-suffix-p (suffix string  &optional ignore-case)
-      "Return non-nil if SUFFIX is a suffix of STRING.
-If IGNORE-CASE is non-nil, the comparison is done without paying
-attention to case differences."
-      (let ((start-pos (- (length string) (length suffix))))
-        (and (>= start-pos 0)
-             (eq t (compare-strings suffix nil nil
-                                    string start-pos nil ignore-case))))))
-  )
-
-(defun projectile-trim-string (string)
-  "Remove whitespace at the beginning and end of STRING."
-  (->> string
-       (replace-regexp-in-string "\\`[ \t\n\r]+" "")
-       (replace-regexp-in-string "[ \t\n\r]+\\'" "")))
-
-
-;;; Customization
-(defgroup projectile nil
-  "Manage and navigate projects easily."
-  :group 'tools
-  :group 'convenience)
-
-(defcustom projectile-indexing-method (if (eq system-type 'windows-nt) 'native 'alien)
-  "Specifies the indexing method used by Projectile.
-
-There are two indexing methods - native and alien.
-
-The native method is implemented in Emacs Lisp (therefore it is
-native to Emacs).  It's advantage is that is portable and will
-work everywhere that Emacs does.  It's disadvantage is that is a
-bit slow (especially for large projects).  Generally it's a good
-idea to pair the native indexing method with caching.
-
-The alien indexing method uses external tools (e.g. git, find,
-etc) to speed up the indexing process.  The disadvantage of this
-method is that it's not well supported on Windows systems.
-
-By default alien indexing is the default on all operating
-systems, except Windows."
-  :group 'projectile
-  :type '(radio
-          (const :tag "Native" native)
-          (const :tag "Alien" alien)))
-
-(defcustom projectile-enable-caching (eq projectile-indexing-method 'native)
-  "When t enables project files caching.
-
-Project caching is automatically enabled by default if you're
-using the native indexing method."
-  :group 'projectile
-  :type 'boolean)
-
-(defcustom projectile-file-exists-local-cache-expire nil
-  "Number of seconds before file existence cache expires for a
-file on a local file system.
-
- A value of nil disables this cache."
-
-  :group 'projectile
-  :type '(choice (const :tag "Disabled" nil)
-                 (integer :tag "Seconds")))
-
-(defcustom projectile-file-exists-remote-cache-expire (* 5 60)
-  "Number of seconds before file existence cache expires for a
-file on a remote file system such as tramp.
-
- A value of nil disables this cache."
-  :group 'projectile
-  :type '(choice (const :tag "Disabled" nil)
-                 (integer :tag "Seconds")))
-
-(defcustom projectile-require-project-root t
-  "Require the presence of a project root to operate when true.
-Otherwise consider the current directory the project root."
-  :group 'projectile
-  :type 'boolean)
-
-(defcustom projectile-completion-system 'ido
-  "The completion system to be used by Projectile."
-  :group 'projectile
-  :type '(radio
-          (const :tag "Ido" ido)
-          (const :tag "Grizzl" grizzl)
-          (const :tag "Helm" helm)
-          (const :tag "Ivy" ivy)
-          (const :tag "Default" default)
-          (function :tag "Custom function")))
-
-(defcustom projectile-keymap-prefix (kbd "C-c p")
-  "Projectile keymap prefix."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-cache-file
-  (expand-file-name "projectile.cache" user-emacs-directory)
-  "The name of Projectile's cache file."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-tags-file-name "TAGS"
-  "The tags filename Projectile's going to use."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-tags-command "ctags -Re -f \"%s\" %s"
-  "The command Projectile's going to use to generate a TAGS file."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-sort-order 'default
-  "The sort order used for a project's files."
-  :group 'projectile
-  :type '(radio
-          (const :tag "default" default)
-          (const :tag "recentf" recentf)
-          (const :tag "recently active" recently-active)
-          (const :tag "access time" access-time)
-          (const :tag "modification time" modification-time)))
-
-(defcustom projectile-verbose t
-  "Echo messages that are not errors."
-  :group 'projectile
-  :type 'boolean)
-
-(defcustom projectile-buffers-filter-function nil
-  "A function used to filter the buffers in `projectile-project-buffers'.
-
-The function should accept and return a list of Emacs buffers.
-Two example filter functions are shipped by default - `projectile-buffers-with-file'
-and `projectile-buffers-with-file-or-process'."
-  :group 'projectile
-  :type 'symbol)
-
-(defcustom projectile-project-root-files
-  '("rebar.config"       ; Rebar project file
-    "project.clj"        ; Leiningen project file
-    "SConstruct"         ; Scons project file
-    "pom.xml"            ; Maven project file
-    "build.sbt"          ; SBT project file
-    "build.gradle"       ; Gradle project file
-    "Gemfile"            ; Bundler file
-    "requirements.txt"   ; Pip file
-    "setup.py"           ; Setuptools file
-    "tox.ini"            ; Tox file
-    "package.json"       ; npm package file
-    "gulpfile.js"        ; Gulp build file
-    "Gruntfile.js"       ; Grunt project file
-    "bower.json"         ; Bower project file
-    "composer.json"      ; Composer project file
-    "Cargo.toml"         ; Cargo project file
-    "mix.exs"            ; Elixir mix project file
-    )
-  "A list of files considered to mark the root of a project.
-The topmost match has precedence."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-project-root-files-bottom-up
-  '(".projectile" ; projectile project marker
-    ".git"        ; Git VCS root dir
-    ".hg"         ; Mercurial VCS root dir
-    ".fslckout"   ; Fossil VCS root dir
-    ".bzr"        ; Bazaar VCS root dir
-    "_darcs"      ; Darcs VCS root dir
-    )
-  "A list of files considered to mark the root of a project.
-The bottommost (parentmost) match has precedence."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-project-root-files-top-down-recurring
-  '(".svn" ; Svn VCS root dir
-    "CVS"  ; Csv VCS root dir
-    "Makefile")
-  "A list of files considered to mark the root of a project.
-The search starts at the top and descends down till a directory
-that contains a match file but its parent does not.  Thus, it's a
-bottommost match in the topmost sequence of directories
-containing a root file."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-project-root-files-functions
-  '(projectile-root-bottom-up
-    projectile-root-top-down
-    projectile-root-top-down-recurring)
-  "A list of functions for finding project roots."
-  :group 'projectile
-  :type '(repeat function))
-
-(defcustom projectile-globally-ignored-files
-  (list projectile-tags-file-name)
-  "A list of files globally ignored by projectile."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-globally-ignored-file-suffixes
-  nil
-  "A list of file suffixes globally ignored by projectile."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-globally-ignored-directories
-  '(".idea"
-    ".eunit"
-    ".git"
-    ".hg"
-    ".fslckout"
-    ".bzr"
-    "_darcs"
-    ".tox"
-    ".svn")
-  "A list of directories globally ignored by projectile."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-globally-ignored-modes
-  '("erc-mode"
-    "help-mode"
-    "completion-list-mode"
-    "Buffer-menu-mode"
-    "gnus-.*-mode"
-    "occur-mode")
-  "A list of regular expressions for major modes ignored by projectile.
-
-If a buffer is using a given major mode, projectile will ignore
-it for functions working with buffers."
-  :group 'projectile
-  :type '(repeat string))
-
-(defcustom projectile-globally-ignored-buffers nil
-  "A list of buffer-names ignored by projectile.
-
-If a buffer is in the list projectile will ignore
-it for functions working with buffers."
-  :group 'projectile
-  :type '(repeat string)
-  :package-version '(projectile . "0.12.0"))
-
-(defcustom projectile-find-file-hook nil
-  "Hooks run when a file is opened with `projectile-find-file'."
-  :group 'projectile
-  :type 'hook)
-
-(defcustom projectile-find-dir-hook nil
-  "Hooks run when a directory is opened with `projectile-find-dir'."
-  :group 'projectile
-  :type 'hook)
-
-(defcustom projectile-switch-project-action 'projectile-find-file
-  "Action invoked after switching projects with `projectile-switch-project'.
-
-Any function that does not take arguments will do."
-  :group 'projectile
-  :type 'symbol)
-
-(defcustom projectile-find-dir-includes-top-level nil
-  "If true, add top-level dir to options offered by `projectile-find-dir'."
-  :group 'projectile
-  :type 'boolean)
-
-(defcustom projectile-use-git-grep nil
-  "If true, use `vc-git-grep' in git projects."
-  :group 'projectile
-  :type 'boolean)
-
-;;; Idle Timer
-(defvar projectile-idle-timer nil
-  "The timer object created when `projectile-enable-idle-timer' is non-nil.")
-
-(defcustom projectile-idle-timer-seconds 30
-  "The idle period to use when `projectile-enable-idle-timer' is non-nil."
-  :group 'projectile
-  :type 'number)
-
-(defcustom projectile-idle-timer-hook '(projectile-regenerate-tags)
-  "The hook run when `projectile-enable-idle-timer' is non-nil."
-  :group 'projectile
-  :type '(repeat symbol))
-
-(defcustom projectile-enable-idle-timer nil
-  "Enables idle timer hook `projectile-idle-timer-functions'.
-
-When `projectile-enable-idle-timer' is non-nil, the hook
-`projectile-idle-timer-hook' is run each time Emacs has been idle
-for `projectile-idle-timer-seconds' seconds and we're in a
-project."
-  :group 'projectile
-  :set (lambda (symbol value)
-         (set symbol value)
-         (when projectile-idle-timer
-           (cancel-timer projectile-idle-timer))
-         (setq projectile-idle-timer nil)
-         (when projectile-enable-idle-timer
-           (setq projectile-idle-timer (run-with-idle-timer
-                                        projectile-idle-timer-seconds t
-                                        (lambda ()
-                                          (when (projectile-project-p)
-                                            (run-hooks 'projectile-idle-timer-hook)))))))
-  :type 'boolean)
-
-;;; Serialization
-(defun projectile-serialize (data filename)
-  "Serialize DATA to FILENAME.
-
-The saved data can be restored with `projectile-unserialize'."
-  (when (file-writable-p filename)
-    (with-temp-file filename
-      (insert (let (print-length) (prin1-to-string data))))))
-
-(defun projectile-unserialize (filename)
-  "Read data serialized by `projectile-serialize' from FILENAME."
-  (when (file-exists-p filename)
-    (with-temp-buffer
-      (insert-file-contents filename)
-      (read (buffer-string)))))
-
-(defvar projectile-projects-cache nil
-  "A hashmap used to cache project file names to speed up related operations.")
-
-(defvar projectile-project-root-cache (make-hash-table :test 'equal)
-  "Cached value of function `projectile-project-root`.")
-
-(defvar projectile-known-projects nil
-  "List of locations where we have previously seen projects.
-The list of projects is ordered by the time they have been accessed.")
-
-(defvar projectile-known-projects-on-file nil
-  "List of known projects reference point.
-
-Contains a copy of `projectile-known-projects' when it was last
-synchronized with `projectile-known-projects-file'.")
-
-(defcustom projectile-known-projects-file
-  (expand-file-name "projectile-bookmarks.eld"
-                    user-emacs-directory)
-  "Name and location of the Projectile's known projects file."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-ignored-projects nil
-  "A list of projects not to be added to `projectile-known-projects'."
-  :group 'projectile
-  :type '(repeat :tag "Project list" directory)
-  :package-version '(projectile . "0.11.0"))
-
-(defcustom projectile-ignored-project-function nil
-  "Function to decide if a project is added to `projectile-known-projects'.
-
-Can be either nil, or a function that takes the truename of the
-project root as argument and returns non-nil if the project is to
-be ignored or nil otherwise.
-
-This function is only called if the project is not listed in
-`projectile-ignored-projects'.
-
-A suitable candidate would be `file-remote-p' to ignore remote
-projects."
-  :group 'projectile
-  :type '(choice
-          (const :tag "Nothing" nil)
-          (const :tag "Remote files" file-remote-p)
-          function)
-  :package-version '(projectile . "0.13.0"))
-
-
-;;; Version information
-
-(defun projectile-version (&optional show-version)
-  "Get the Projectile version as string.
-
-If called interactively or if SHOW-VERSION is non-nil, show the
-version in the echo area and the messages buffer.
-
-The returned string includes both, the version from package.el
-and the library version, if both a present and different.
-
-If the version number could not be determined, signal an error,
-if called interactively, or if SHOW-VERSION is non-nil, otherwise
-just return nil."
-  (interactive (list t))
-  (if (require 'pkg-info nil t)
-      (let ((version (pkg-info-version-info 'projectile)))
-        (when show-version
-          (message "Projectile version: %s" version))
-        version)
-    (error "Cannot determine version without package pkg-info")))
-
-
-;;; Caching
-(defvar projectile-file-exists-cache
-  (make-hash-table :test 'equal)
-  "Cached `projectile-file-exists-p' results.")
-
-(defvar projectile-file-exists-cache-timer nil
-  "Timer for scheduling`projectile-file-exists-cache-cleanup'.")
-
-(defun projectile-file-exists-cache-cleanup ()
-  "Removed timed out cache entries and reschedules or remove the
-timer if no more items are in the cache."
-  (let ((now (current-time)))
-    (maphash (lambda (key value)
-               (if (time-less-p (cdr value) now)
-                   (remhash key projectile-file-exists-cache)))
-             projectile-file-exists-cache)
-    (setq projectile-file-exists-cache-timer
-          (if (> (hash-table-count projectile-file-exists-cache) 0)
-              (run-with-timer 10 nil 'projectile-file-exists-cache-cleanup)))))
-
-(defun projectile-file-exists-p (filename)
-  "Return t if file FILENAME exist.
-A wrapper around `file-exists-p' with additional caching support."
-  (let* ((file-remote (file-remote-p filename))
-         (expire-seconds
-          (if file-remote
-              (and projectile-file-exists-remote-cache-expire
-                   (> projectile-file-exists-remote-cache-expire 0)
-                   projectile-file-exists-remote-cache-expire)
-            (and projectile-file-exists-local-cache-expire
-                 (> projectile-file-exists-local-cache-expire 0)
-                 projectile-file-exists-local-cache-expire)))
-         (remote-file-name-inhibit-cache (if expire-seconds
-                                             expire-seconds
-                                           remote-file-name-inhibit-cache)))
-    (if (not expire-seconds)
-        (file-exists-p filename)
-      (let* ((current-time (current-time))
-             (cached (gethash filename projectile-file-exists-cache))
-             (cached-value (if cached (car cached)))
-             (cached-expire (if cached (cdr cached)))
-             (cached-expired (if cached (time-less-p cached-expire current-time) t))
-             (value (or (and (not cached-expired) cached-value)
-                        (if (file-exists-p filename) 'found 'notfound))))
-        (when (or (not cached) cached-expired)
-          (puthash filename
-                   (cons value (time-add current-time (seconds-to-time expire-seconds)))
-                   projectile-file-exists-cache))
-        (unless projectile-file-exists-cache-timer
-          (setq projectile-file-exists-cache-timer
-                (run-with-timer 10 nil 'projectile-file-exists-cache-cleanup)))
-        (equal value 'found)))))
-
-(defun projectile-invalidate-cache (arg)
-  "Remove the current project's files from `projectile-projects-cache'.
-
-With a prefix argument ARG prompts for the name of the project whose cache
-to invalidate."
-  (interactive "P")
-  (let ((project-root
-         (if arg
-             (completing-read "Remove cache for: "
-                              (projectile-hash-keys projectile-projects-cache))
-           (projectile-project-root))))
-    (setq projectile-project-root-cache (make-hash-table :test 'equal))
-    (remhash project-root projectile-projects-cache)
-    (projectile-serialize-cache)
-    (when projectile-verbose
-      (message "Invalidated Projectile cache for %s."
-               (propertize project-root 'face 'font-lock-keyword-face))))
-  (when (fboundp 'recentf-cleanup)
-    (recentf-cleanup)))
-
-(defun projectile-cache-project (project files)
-  "Cache PROJECTs FILES.
-The cache is created both in memory and on the hard drive."
-  (when projectile-enable-caching
-    (message "Empty cache. Projectile is initializing cache...")
-    (puthash project files projectile-projects-cache)
-    (projectile-serialize-cache)))
-
-(defun projectile-purge-file-from-cache (file)
-  "Purge FILE from the cache of the current project."
-  (interactive
-   (list (projectile-completing-read
-          "Remove file from cache: "
-          (projectile-current-project-files))))
-  (let* ((project-root (projectile-project-root))
-         (project-cache (gethash project-root projectile-projects-cache)))
-    (if (projectile-file-cached-p file project-root)
-        (progn
-          (puthash project-root (remove file project-cache) projectile-projects-cache)
-          (projectile-serialize-cache)
-          (when projectile-verbose
-            (message "%s removed from cache" file)))
-      (error "%s is not in the cache" file))))
-
-(defun projectile-purge-dir-from-cache (dir)
-  "Purge DIR from the cache of the current project."
-  (interactive
-   (list (projectile-completing-read
-          "Remove directory from cache: "
-          (projectile-current-project-dirs))))
-  (let* ((project-root (projectile-project-root))
-         (project-cache (gethash project-root projectile-projects-cache)))
-    (puthash project-root
-             (--filter (string-prefix-p dir it) project-cache)
-             projectile-projects-cache)))
-
-(defun projectile-file-cached-p (file project)
-  "Check if FILE is already in PROJECT cache."
-  (member file (gethash project projectile-projects-cache)))
-
-;;;###autoload
-(defun projectile-cache-current-file ()
-  "Add the currently visited file to the cache."
-  (interactive)
-  (let ((current-project (projectile-project-root)))
-    (when (gethash (projectile-project-root) projectile-projects-cache)
-      (let* ((abs-current-file (file-truename (buffer-file-name (current-buffer))))
-            (current-file (file-relative-name abs-current-file current-project)))
-      (unless (or (projectile-file-cached-p current-file current-project)
-                  (projectile-ignored-directory-p (file-name-directory abs-current-file))
-                  (projectile-ignored-file-p abs-current-file))
-        (puthash current-project
-                 (cons current-file (gethash current-project projectile-projects-cache))
-                 projectile-projects-cache)
-        (projectile-serialize-cache)
-        (message "File %s added to project %s cache."
-                 (propertize current-file 'face 'font-lock-keyword-face)
-                 (propertize current-project 'face 'font-lock-keyword-face)))))))
-
-;; cache opened files automatically to reduce the need for cache invalidation
-(defun projectile-cache-files-find-file-hook ()
-  "Function for caching files with `find-file-hook'."
-  (when (and projectile-enable-caching (projectile-project-p))
-    (projectile-cache-current-file)))
-
-(defun projectile-cache-projects-find-file-hook ()
-  "Function for caching projects with `find-file-hook'."
-  (when (projectile-project-p)
-    (let ((known-projects (and (sequencep projectile-known-projects)
-                               (copy-sequence projectile-known-projects))))
-      (projectile-add-known-project (projectile-project-root))
-      (unless (equal known-projects projectile-known-projects)
-        (projectile-merge-known-projects)))))
-
-
-(defun projectile-maybe-invalidate-cache (force)
-  "Invalidate if FORCE or project's dirconfig newer than cache."
-  (when (or force (file-newer-than-file-p (projectile-dirconfig-file)
-                                          projectile-cache-file))
-    (projectile-invalidate-cache nil)))
-
-
-(defadvice delete-file (before purge-from-projectile-cache (filename &optional trash))
-  (if (and projectile-enable-caching (projectile-project-p))
-      (let* ((project-root (projectile-project-root))
-             (true-filename (file-truename filename))
-             (relative-filename (file-relative-name true-filename project-root)))
-        (if (projectile-file-cached-p relative-filename project-root)
-            (projectile-purge-file-from-cache relative-filename)))))
-
-
-;;; Project root related utilities
-(defun projectile-parent (path)
-  "Return the parent directory of PATH.
-PATH may be a file or directory and directory paths may end with a slash."
-  (directory-file-name (file-name-directory (directory-file-name (expand-file-name path)))))
-
-(defun projectile-locate-dominating-file (file name)
-  "Look up the directory hierarchy from FILE for a directory containing NAME.
-Stop at the first parent directory containing a file NAME,
-and return the directory.  Return nil if not found.
-Instead of a string, NAME can also be a predicate taking one argument
-\(a directory) and returning a non-nil value if that directory is the one for
-which we're looking."
-  ;; copied from files.el (stripped comments) emacs-24 bzr branch 2014-03-28 10:20
-  (setq file (abbreviate-file-name file))
-  (let ((root nil)
-        try)
-    (while (not (or root
-                    (null file)
-                    (string-match locate-dominating-stop-dir-regexp file)))
-      (setq try (if (stringp name)
-                    (projectile-file-exists-p (expand-file-name name file))
-                  (funcall name file)))
-      (cond (try (setq root file))
-            ((equal file (setq file (file-name-directory
-                                     (directory-file-name file))))
-             (setq file nil))))
-    (and root (expand-file-name (file-name-as-directory root)))))
-
-(defun projectile-root-top-down (dir &optional list)
-  "Identify a project root in DIR by top-down search for files in LIST.
-If LIST is nil, use `projectile-project-root-files' instead.
-Return the first (topmost) matched directory or nil if not found."
-  (projectile-locate-dominating-file
-   dir
-   (lambda (dir)
-     (--first (projectile-file-exists-p (expand-file-name it dir))
-              (or list projectile-project-root-files)))))
-
-(defun projectile-root-bottom-up (dir &optional list)
-  "Identify a project root in DIR by bottom-up search for files in LIST.
-If LIST is nil, use `projectile-project-root-files-bottom-up' instead.
-Return the first (bottommost) matched directory or nil if not found."
-  (--some (projectile-locate-dominating-file dir it)
-          (or list projectile-project-root-files-bottom-up)))
-
-(defun projectile-root-top-down-recurring (dir &optional list)
-  "Identify a project root in DIR by recurring top-down search for files in LIST.
-If LIST is nil, use `projectile-project-root-files-top-down-recurring'
-instead.  Return the last (bottommost) matched directory in the
-topmost sequence of matched directories.  Nil otherwise."
-  (--some (projectile-locate-dominating-file
-           dir
-           (lambda (dir)
-             (and (projectile-file-exists-p (expand-file-name it dir))
-                  (or (string-match locate-dominating-stop-dir-regexp (projectile-parent dir))
-                      (not (projectile-file-exists-p (expand-file-name it (projectile-parent dir))))))))
-          (or list projectile-project-root-files-top-down-recurring)))
-
-(defun projectile-project-root ()
-  "Retrieves the root directory of a project if available.
-The current directory is assumed to be the project's root otherwise."
-  (let ((dir default-directory))
-    (or (--some (let* ((cache-key (format "%s-%s" it dir))
-                       (cache-value (gethash cache-key projectile-project-root-cache)))
-                  (if cache-value
-                      (if (eq cache-value 'no-project-root)
-                          nil
-                        cache-value)
-                    (let ((value (funcall it (file-truename dir))))
-                      (puthash cache-key (or value 'no-project-root) projectile-project-root-cache)
-                      value)))
-                projectile-project-root-files-functions)
-        (if projectile-require-project-root
-            (error "You're not in a project")
-          default-directory))))
-
-(defun projectile-file-truename (file-name)
-  "Return the truename of FILE-NAME.
-A thin wrapper around `file-truename' that handles nil."
-  (when file-name
-    (file-truename file-name)))
-
-(defun projectile-project-p ()
-  "Check if we're in a project."
-  (condition-case nil
-      (projectile-project-root)
-    (error nil)))
-
-(defun projectile-project-name ()
-  "Return project name."
-  (let ((project-root
-         (condition-case nil
-             (projectile-project-root)
-           (error nil))))
-    (if project-root
-        (file-name-nondirectory (directory-file-name project-root))
-      "-")))
-
-
-;;; Project indexing
-(defun projectile-get-project-directories ()
-  "Get the list of project directories that are of interest to the user."
-  (-map (lambda (subdir) (concat (projectile-project-root) subdir))
-        (or (car (projectile-parse-dirconfig-file)) '(""))))
-
-(defun projectile-dir-files (directory)
-  "List the files in DIRECTORY and in its sub-directories.
-Files are returned as relative paths to the project root."
-  ;; check for a cache hit first if caching is enabled
-  (let ((files-list (and projectile-enable-caching
-                         (gethash directory projectile-projects-cache)))
-        (root (projectile-project-root)))
-    ;; cache disabled or cache miss
-    (or files-list
-        (if (eq projectile-indexing-method 'native)
-            (projectile-dir-files-native root directory)
-          ;; use external tools to get the project files
-          (projectile-remove-ignored (projectile-dir-files-external root directory))))))
-
-(defun projectile-dir-files-native (root directory)
-  "Get the files for ROOT under DIRECTORY using just Emacs Lisp."
-  (let ((progress-reporter
-         (make-progress-reporter
-          (format "Projectile is indexing %s"
-                  (propertize directory 'face 'font-lock-keyword-face)))))
-    ;; we need the files with paths relative to the project root
-    (-map (lambda (file) (file-relative-name file root))
-          (projectile-index-directory directory (projectile-patterns-to-ignore)
-                                      progress-reporter))))
-
-(defun projectile-dir-files-external (root directory)
-  "Get the files for ROOT under DIRECTORY using external tools."
-  (let ((default-directory directory))
-    (-map (lambda (file)
-            (file-relative-name (expand-file-name file directory) root))
-          (projectile-get-repo-files))))
-
-(defcustom projectile-git-command "git ls-files -zco --exclude-standard"
-  "Command used by projectile to get the files in a git project."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-git-submodule-command "git submodule --quiet foreach 'echo $path' | tr '\\n' '\\0'"
-  "Command used by projectile to get the files in git submodules."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-hg-command "hg locate -0 -I ."
-  "Command used by projectile to get the files in a hg project."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-fossil-command "fossil ls"
-  "Command used by projectile to get the files in a fossil project."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-bzr-command "bzr ls -R --versioned -0"
-  "Command used by projectile to get the files in a bazaar project."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-darcs-command "darcs show files -0 . "
-  "Command used by projectile to get the files in a darcs project."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-svn-command "svn list -R . | grep -v '$/' | tr '\\n' '\\0'"
-  "Command used by projectile to get the files in a svn project."
-  :group 'projectile
-  :type 'string)
-
-(defcustom projectile-generic-command "find . -type f -print0"
-  "Command used by projectile to get the files in a generic project."
-  :group 'projectile
-  :type 'string)
-
-(defun projectile-get-ext-command ()
-  "Determine which external command to invoke based on the project's VCS."
-  (let ((vcs (projectile-project-vcs)))
-    (cond
-     ((eq vcs 'git) projectile-git-command)
-     ((eq vcs 'hg) projectile-hg-command)
-     ((eq vcs 'fossil) projectile-fossil-command)
-     ((eq vcs 'bzr) projectile-bzr-command)
-     ((eq vcs 'darcs) projectile-darcs-command)
-     ((eq vcs 'svn) projectile-svn-command)
-     (t projectile-generic-command))))
-
-(defun projectile-get-sub-projects-command ()
-  (let ((vcs (projectile-project-vcs)))
-    (cond
-     ((eq vcs 'git) projectile-git-submodule-command)
-     (t ""))))
-
-(defun projectile-get-all-sub-projects (project)
-  "Get all sub-projects for a given projects.
-PROJECT is base directory to start search recursively."
-  (let* ((default-directory project)
-         ;; search for sub-projects under current project `project'
-         (submodules (mapcar
-                      (lambda (s)
-                        (file-name-as-directory (expand-file-name s default-directory)))
-                      (projectile-files-via-ext-command (projectile-get-sub-projects-command)))))
-
-    (cond
-     ((null submodules)
-      nil)
-     (t
-      (nconc submodules (-flatten
-                         ;; recursively get sub-projects of each sub-project
-                         (mapcar (lambda (s)
-                                   (projectile-get-all-sub-projects s)) submodules)))))))
-
-(defun projectile-get-sub-projects-files ()
-  "Get files from sub-projects recursively."
-  (-flatten
-   (mapcar (lambda (s)
-             (let ((default-directory s))
-               (mapcar (lambda (f)
-                         (concat s f))
-                       (projectile-files-via-ext-command projectile-git-command))))
-           (condition-case nil
-               (projectile-get-all-sub-projects (projectile-project-root))
-             (error nil)))))
-
-(defun projectile-get-repo-files ()
-  "Get a list of the files in the project, including sub-projects."
-  (cond
-   ((eq (projectile-project-vcs) 'git)
-    (nconc (projectile-files-via-ext-command (projectile-get-ext-command))
-           (projectile-get-sub-projects-files)))
-   (t (projectile-files-via-ext-command (projectile-get-ext-command)))))
-
-(defun projectile-files-via-ext-command (command)
-  "Get a list of relative file names in the project root by executing COMMAND."
-  (split-string (shell-command-to-string command) "\0" t))
-
-(defun projectile-index-directory (directory patterns progress-reporter)
-  "Index DIRECTORY taking into account PATTERNS.
-The function calls itself recursively until all sub-directories
-have been indexed.  The PROGRESS-REPORTER is updated while the
-function is executing."
-  (--mapcat
-   (unless (or (and patterns (projectile-ignored-rel-p it directory patterns))
-               (member (file-name-nondirectory (directory-file-name it))
-                       '("." ".." ".svn" ".cvs")))
-     (progress-reporter-update progress-reporter)
-     (if (file-directory-p it)
-         (unless (projectile-ignored-directory-p
-                  (file-name-as-directory it))
-           (projectile-index-directory it patterns progress-reporter))
-       (unless (projectile-ignored-file-p it)
-         (list it))))
-   (directory-files directory t)))
-
-(defun projectile-remove-ignored (files)
-  "Remove ignored files and folders from FILES.
-
-Operates on filenames relative to the project root."
-  (let ((ignored (append (projectile-ignored-files-rel)
-                         (projectile-ignored-directories-rel))))
-    (-remove (lambda (file)
-               (or (--any-p (string-prefix-p it file) ignored)
-                   (--any-p (string-suffix-p it file) projectile-globally-ignored-file-suffixes)))
-             files)))
-
-
-(defun projectile-buffers-with-file (buffers)
-  "Return only those BUFFERS backed by files."
-  (--filter (buffer-file-name it) buffers))
-
-(defun projectile-buffers-with-file-or-process (buffers)
-  "Return only those BUFFERS backed by files or processes."
-  (--filter (or (buffer-file-name it)
-                (get-buffer-process it)) buffers))
-
-(defun projectile-project-buffers ()
-  "Get a list of project buffers."
-  (let* ((project-root (projectile-project-root))
-         (all-buffers (-filter (lambda (buffer)
-                                 (projectile-project-buffer-p buffer project-root))
-                               (buffer-list))))
-    (if projectile-buffers-filter-function
-        (funcall projectile-buffers-filter-function all-buffers)
-      all-buffers)))
-
-(defun projectile-process-current-project-buffers (action)
-  "Process the current project's buffers using ACTION."
-  (let ((project-buffers (projectile-project-buffers)))
-    (dolist (buffer project-buffers)
-      (funcall action buffer))))
-
-(defun projectile-project-buffer-files ()
-  "Get a list of project buffer files."
-  (let ((project-root (projectile-project-root)))
-    (->> (projectile-buffers-with-file (projectile-project-buffers))
-         (-map (lambda (buffer)
-                 (file-relative-name (buffer-file-name buffer) project-root))))))
-
-(defun projectile-project-buffer-p (buffer project-root)
-  "Check if BUFFER is under PROJECT-ROOT."
-  (with-current-buffer buffer
-    (and (not (string-prefix-p " " (buffer-name buffer)))
-         (not (projectile-ignored-buffer-p buffer))
-         (string-equal (file-remote-p default-directory)
-                       (file-remote-p project-root))
-         (not (string-match-p "^http\\(s\\)?://" default-directory))
-         (string-prefix-p project-root (file-truename default-directory)))))
-
-(defun projectile-ignored-buffer-p (buffer)
-  "Check if BUFFER should be ignored."
-  (or
-   (member (buffer-name buffer) projectile-globally-ignored-buffers)
-   (with-current-buffer buffer
-     (--any-p (string-match-p (concat "^" it "$")
-                              (symbol-name major-mode))
-              projectile-globally-ignored-modes))))
-
-(defun projectile-recently-active-files ()
-  "Get list of recently active files.
-
-Files are ordered by recently active buffers, and then recently
-opened through use of recentf."
-  (let ((project-buffer-files (projectile-project-buffer-files)))
-    (append project-buffer-files
-            (-difference (projectile-recentf-files)
-                         project-buffer-files))))
-
-(defun projectile-project-buffer-names ()
-  "Get a list of project buffer names."
-  (-map #'buffer-name (projectile-project-buffers)))
-
-(defun projectile-prepend-project-name (string)
-  "Prepend the current project's name to STRING."
-  (format "[%s] %s" (projectile-project-name) string))
-
-;;;###autoload
-(defun projectile-switch-to-buffer ()
-  "Switch to a project buffer."
-  (interactive)
-  (switch-to-buffer
-   (projectile-completing-read
-    "Switch to buffer: "
-    (projectile-project-buffer-names))))
-
-;;;###autoload
-(defun projectile-switch-to-buffer-other-window ()
-  "Switch to a project buffer and show it in another window."
-  (interactive)
-  (switch-to-buffer-other-window
-   (projectile-completing-read
-    "Switch to buffer: "
-    (projectile-project-buffer-names))))
-
-;;;###autoload
-(defun projectile-display-buffer ()
-  "Display a project buffer in another window without selecting it."
-  (interactive)
-  (display-buffer
-   (projectile-completing-read
-    "Display buffer: "
-    (projectile-project-buffer-names))))
-
-;;;###autoload
-(defun projectile-project-buffers-other-buffer ()
-  "Switch to the most recently selected buffer project buffer.
-Only buffers not visible in windows are returned."
-  (interactive)
-  (switch-to-buffer (car (projectile-project-buffers-non-visible))) nil t)
-
-(defun projectile-project-buffers-non-visible ()
-  "Get a list of non visible project buffers."
-  (-filter (lambda (buffer)
-             (not (get-buffer-window buffer 'visible)))
-           (projectile-project-buffers)))
-
-;;;###autoload
-(defun projectile-multi-occur ()
-  "Do a `multi-occur' in the project's buffers."
-  (interactive)
-  (multi-occur (projectile-project-buffers)
-               (car (occur-read-primary-args))))
-
-(defun projectile-ignored-directory-p (directory)
-  "Check if DIRECTORY should be ignored."
-  (member directory (projectile-ignored-directories)))
-
-(defun projectile-ignored-file-p (file)
-  "Check if FILE should be ignored."
-  (member file (projectile-ignored-files)))
-
-(defun projectile-ignored-rel-p (file directory patterns)
-  "Check if FILE should be ignored relative to DIRECTORY according to PATTERNS."
-  (let ((default-directory directory))
-    (--any-p (or (string-suffix-p (directory-file-name it)
-                                  (directory-file-name file))
-                 (member file (file-expand-wildcards it t)))
-             patterns)))
-
-(defun projectile-ignored-files ()
-  "Return list of ignored files."
-  (-map
-   #'projectile-expand-root
-   (append
-    projectile-globally-ignored-files
-    (projectile-project-ignored-files))))
-
-(defun projectile-ignored-directories ()
-  "Return list of ignored directories."
-  (-map
-   #'file-name-as-directory
-   (-map
-    #'projectile-expand-root
-    (append
-     projectile-globally-ignored-directories
-     (projectile-project-ignored-directories)))))
-
-(defun projectile-ignored-directories-rel ()
-  "Return list of ignored directories, relative to the root."
-  (let ((project-root (projectile-project-root)))
-    (--map (file-relative-name it project-root) (projectile-ignored-directories))))
-
-(defun projectile-ignored-files-rel ()
-  "Return list of ignored files, relative to the root."
-  (let ((project-root (projectile-project-root)))
-    (--map (file-relative-name it project-root) (projectile-ignored-files))))
-
-(defun projectile-project-ignored-files ()
-  "Return list of project ignored files."
-  (-remove 'file-directory-p (projectile-project-ignored)))
-
-(defun projectile-project-ignored-directories ()
-  "Return list of project ignored directories."
-  (-filter 'file-directory-p (projectile-project-ignored)))
-
-(defun projectile-paths-to-ignore ()
-  "Return a list of ignored project paths."
-  (-non-nil (--map (and (string-prefix-p "/" it)
-                        ;; remove the leading /
-                        (substring it 1))
-                   (cdr (projectile-parse-dirconfig-file)))))
-
-(defun projectile-patterns-to-ignore ()
-  "Return a list of relative file patterns."
-  (--remove (string-prefix-p "/" it)
-            (cdr (projectile-parse-dirconfig-file))))
-
-(defun projectile-project-ignored ()
-  "Return list of project ignored files/directories."
-  (let ((paths (projectile-paths-to-ignore))
-        (default-directory (projectile-project-root)))
-    (-flatten (-map
-               (lambda (pattern)
-                 (or (file-expand-wildcards pattern t)
-                     (projectile-expand-root pattern)))
-               paths))))
-
-(defun projectile-dirconfig-file ()
-  "Return the absolute path to the project's dirconfig file."
-  (expand-file-name ".projectile" (projectile-project-root)))
-
-(defun projectile-parse-dirconfig-file ()
-  "Parse project ignore file and return directories to ignore and keep.
-
-The return value will be a cons, the car being the list of
-directories to keep, and the cdr being the list of files or
-directories to ignore.
-
-Strings starting with + will be added to the list of directories
-to keep, and strings starting with - will be added to the list of
-directories to ignore.  For backward compatibility, without a
-prefix the string will be assumed to be an ignore string."
-  (let (keep ignore (dirconfig (projectile-dirconfig-file)))
-    (when (projectile-file-exists-p dirconfig)
-      (with-temp-buffer
-        (insert-file-contents-literally dirconfig)
-        (while (not (eobp))
-          (pcase (char-after)
-            (?+ (push (buffer-substring (1+ (point)) (line-end-position)) keep))
-            (?- (push (buffer-substring (1+ (point)) (line-end-position)) ignore))
-            (_  (push (buffer-substring     (point)  (line-end-position)) ignore)))
-          (forward-line)))
-      (cons (--map (file-name-as-directory (projectile-trim-string it))
-                   (delete "" (reverse keep)))
-            (-map  #'projectile-trim-string
-                   (delete "" (reverse ignore)))))))
-
-(defun projectile-expand-root (name)
-  "Expand NAME to project root.
-
-Never use on many files since it's going to recalculate the
-project-root for every file."
-  (expand-file-name name (projectile-project-root)))
-
-(defun projectile-completing-read (prompt choices &optional initial-input)
-  "Present a project tailored PROMPT with CHOICES."
-  (let ((prompt (projectile-prepend-project-name prompt)))
-    (cond
-     ((eq projectile-completion-system 'ido)
-      (ido-completing-read prompt choices nil nil initial-input))
-     ((eq projectile-completion-system 'default)
-      (completing-read prompt choices nil nil initial-input))
-     ((eq projectile-completion-system 'helm)
-      (if (fboundp 'helm-comp-read)
-          (helm-comp-read prompt choices
-                          :initial-input initial-input
-                          :candidates-in-buffer t
-                          :must-match 'confirm)
-        (user-error "Please install helm from \
-https://github.com/emacs-helm/helm")))
-     ((eq projectile-completion-system 'grizzl)
-      (if (and (fboundp 'grizzl-completing-read)
-               (fboundp 'grizzl-make-index))
-          (grizzl-completing-read prompt (grizzl-make-index choices))
-        (user-error "Please install grizzl from \
-https://github.com/d11wtq/grizzl")))
-     ((eq projectile-completion-system 'ivy)
-      (if (fboundp 'ivy-completing-read)
-          (ivy-completing-read prompt choices nil nil initial-input)
-        (user-error "Please install ivy from \
-https://github.com/abo-abo/swiper")))
-     (t (funcall projectile-completion-system prompt choices)))))
-
-(defun projectile-current-project-files ()
-  "Return a list of files for the current project."
-  (let ((files (and projectile-enable-caching
-                    (gethash (projectile-project-root) projectile-projects-cache))))
-    ;; nothing is cached
-    (unless files
-      (setq files (-mapcat #'projectile-dir-files
-                           (projectile-get-project-directories)))
-      ;; cache the resulting list of files
-      (when projectile-enable-caching
-        (projectile-cache-project (projectile-project-root) files)))
-    (projectile-sort-files files)))
-
-(defun projectile-process-current-project-files (action)
-  "Process the current project's files using ACTION."
-  (let ((project-files (projectile-current-project-files))
-        (default-directory (projectile-project-root)))
-    (dolist (filename project-files)
-      (funcall action filename))))
-
-(defun projectile-current-project-dirs ()
-  "Return a list of dirs for the current project."
-  (-remove #'null (-distinct
-                  (-map #'file-name-directory
-                        (projectile-current-project-files)))))
-
-(defun projectile-hash-keys (hash)
-  "Return a list of all HASH keys."
-  (let (allkeys)
-    (maphash (lambda (k _v) (setq allkeys (cons k allkeys))) hash)
-    allkeys))
-
-
-;;; Interactive commands
-(defcustom projectile-other-file-alist
-  '(;; handle C/C++ extensions
-    ("cpp" . ("h" "hpp" "ipp"))
-    ("ipp" . ("h" "hpp" "cpp"))
-    ("hpp" . ("h" "ipp" "cpp"))
-    ("cxx" . ("hxx" "ixx"))
-    ("ixx" . ("cxx" "hxx"))
-    ("hxx" . ("ixx" "cxx"))
-    ("c" . ("h"))
-    ("m" . ("h"))
-    ("mm" . ("h"))
-    ("h" . ("c" "cpp" "ipp" "hpp" "m" "mm"))
-    ("cc" . ("hh"))
-    ("hh" . ("cc"))
-
-    ;; vertex shader and fragment shader extensions in glsl
-    ("vert" . ("frag"))
-    ("frag" . ("vert"))
-
-    ;; handle files with no extension
-    (nil . ("lock" "gpg"))
-    ("lock" . (""))
-    ("gpg" . (""))
-    )
-  "Alist of extensions for switching to file with the same name, using other extensions based on the extension of current file.")
-
-(defun projectile-find-other-file (&optional flex-matching)
-  "Switch between files with the same name but different extensions.
-With FLEX-MATCHING, match any file that contains the base name of current file.
-Other file extensions can be customized with the variable `projectile-other-file-alist'."
-  (interactive "P")
-  (-if-let (other-files (projectile-get-other-files (buffer-file-name) (projectile-current-project-files) flex-matching))
-      (if (= (length other-files) 1)
-          (find-file (expand-file-name (car other-files) (projectile-project-root)))
-        (find-file (expand-file-name (projectile-completing-read "Switch to: " other-files) (projectile-project-root))))
-    (error "No other file found")))
-
-(defun projectile-find-other-file-other-window (&optional flex-matching)
-  "Switch between files with the same name but different extensions in other window.
-With FLEX-MATCHING, match any file that contains the base name of current file.
-Other file extensions can be customized with the variable `projectile-other-file-alist'."
-  (interactive "P")
-  (-if-let (other-files (projectile-get-other-files (buffer-file-name) (projectile-current-project-files) flex-matching))
-      (if (= (length other-files) 1)
-          (find-file-other-window (expand-file-name (car other-files) (projectile-project-root)))
-        (find-file-other-window (expand-file-name (projectile-completing-read "Switch to: " other-files) (projectile-project-root))))
-    (error "No other file found")))
-
-(defun projectile-get-other-files (current-file project-file-list &optional flex-matching)
-  "Narrow to files with the same names but different extensions.
-Returns a list of possible files for users to choose.
-
-With FLEX-MATCHING, match any file that contains the base name of current file"
-  (let* ((file-ext-list (cdr (assoc (file-name-extension current-file) projectile-other-file-alist)))
-         (fulldirname  (if (file-name-directory current-file)
-                           (file-name-directory current-file) "./"))
-         (dirname  (file-name-nondirectory (directory-file-name fulldirname)))
-         (filename (file-name-base current-file))
-         (file-list (mapcar (lambda (ext)
-                              (if flex-matching
-                                  (concat ".*" filename ".*" "\." ext "\\'")
-                                (concat "^" filename
-                                        (unless (equal ext "")
-                                          (concat  "\." ext))
-                                        "\\'")))
-                            file-ext-list))
-         (candidates (-filter (lambda (project-file)
-                                (string-match filename project-file))
-                              project-file-list))
-         (candidates
-          (-flatten (mapcar
-                     (lambda (file)
-                       (-filter (lambda (project-file)
-                                  (string-match file
-                                                (concat (file-name-base project-file)
-                                                        (unless (equal (file-name-extension project-file) nil)
-                                                          (concat  "\." (file-name-extension project-file))))))
-                                candidates))
-                     file-list)))
-         (candidates
-          (-sort (lambda (file _)
-                   (let ((candidate-dirname (file-name-nondirectory (directory-file-name (file-name-directory file)))))
-                     (unless (equal fulldirname (file-name-directory file))
-                     (equal dirname candidate-dirname))))
-                 candidates)))
-    candidates))
-
-(defun projectile-select-files (project-files &optional arg)
-  "Select a list of files based on filename at point.
-
-With a prefix ARG invalidates the cache first."
-  (projectile-maybe-invalidate-cache arg)
-  (let* ((file (if (region-active-p)
-                   (buffer-substring (region-beginning) (region-end))
-                 (or (thing-at-point 'filename) "")))
-         (file (if (string-match "\\.?\\./" file)
-                   (file-relative-name (file-truename file) (projectile-project-root))
-                 file))
-         (files (if file
-                    (-filter (lambda (project-file)
-                               (string-match file project-file))
-                             project-files)
-                  nil)))
-    files))
-
-;;;###autoload
-(defun projectile-find-file-dwim (&optional arg)
-  "Jump to a project's files using completion based on context.
-
-With a prefix ARG invalidates the cache first.
-
-If point is on a filename, Projectile first tries to search for that
-file in project:
-
-- If it finds just a file, it switches to that file instantly.  This works even
-if the filename is incomplete, but there's only a single file in the current project
-that matches the filename at point.  For example, if there's only a single file named
-\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
-`projectile-find-file' still switches to \"projectile/projectile.el\" immediately
- because this is the only filename that matches.
-
-- If it finds a list of files, the list is displayed for selecting.  A list of
-files is displayed when a filename appears more than one in the project or the
-filename at point is a prefix of more than two files in a project.  For example,
-if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
-the content of that directory.  If it is executed on a partial filename like
- \"projectile/a\", a list of files with character 'a' in that directory is presented.
-
-- If it finds nothing, display a list of all files in project for selecting."
-  (interactive "P")
-  (let* ((project-files (projectile-current-project-files))
-         (files (projectile-select-files project-files arg)))
-    (cond
-     ((= (length files) 1)
-      (find-file (expand-file-name (car files) (projectile-project-root))))
-     ((> (length files) 1)
-      (find-file (expand-file-name (projectile-completing-read "Switch to: " files) (projectile-project-root))))
-     (t (find-file (expand-file-name (projectile-completing-read "Switch to: " project-files) (projectile-project-root)))))
-    (run-hooks 'projectile-find-file-hook)))
-
-;;;###autoload
-(defun projectile-find-file-dwim-other-window (&optional arg)
-  "Jump to a project's files using completion based on context in other window.
-
-With a prefix ARG invalidates the cache first.
-
-If point is on a filename, Projectile first tries to search for that
-file in project:
-
-- If it finds just a file, it switches to that file instantly.  This works even
-if the filename is incomplete, but there's only a single file in the current project
-that matches the filename at point.  For example, if there's only a single file named
-\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
-`projectile-find-file' still switches to \"projectile/projectile.el\"
-immediately because this is the only filename that matches.
-
-- If it finds a list of files, the list is displayed for selecting.  A list of
-files is displayed when a filename appears more than one in the project or the
-filename at point is a prefix of more than two files in a project.  For example,
-if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
-the content of that directory.  If it is executed on a partial filename
-like \"projectile/a\", a list of files with character 'a' in that directory
-is presented.
-
-- If it finds nothing, display a list of all files in project for selecting."
-  (interactive "P")
-  (let* ((project-files (projectile-current-project-files))
-         (files (projectile-select-files project-files arg)))
-    (cond
-     ((= (length files) 1)
-      (find-file-other-window (expand-file-name (car files) (projectile-project-root))))
-     ((> (length files) 1)
-      (find-file-other-window (expand-file-name (projectile-completing-read "Switch to: " files) (projectile-project-root))))
-     (t (find-file-other-window (expand-file-name (projectile-completing-read "Switch to: " project-files) (projectile-project-root)))))
-    (run-hooks 'projectile-find-file-hook)))
-
-;;;###autoload
-(defun projectile-find-file (&optional arg)
-  "Jump to a project's file using completion.
-With a prefix ARG invalidates the cache first."
-  (interactive "P")
-  (projectile-maybe-invalidate-cache arg)
-  (let ((file (projectile-completing-read "Find file: "
-                                          (projectile-current-project-files))))
-    (find-file (expand-file-name file (projectile-project-root)))
-    (run-hooks 'projectile-find-file-hook)))
-
-;;;###autoload
-(defun projectile-find-file-other-window (&optional arg)
-  "Jump to a project's file using completion and show it in another window.
-
-With a prefix ARG invalidates the cache first."
-  (interactive "P")
-  (projectile-maybe-invalidate-cache arg)
-  (let ((file (projectile-completing-read "Find file: "
-                                          (projectile-current-project-files))))
-    (find-file-other-window (expand-file-name file (projectile-project-root)))
-    (run-hooks 'projectile-find-file-hook)))
-
-(defun projectile-sort-files (files)
-  "Sort FILES according to `projectile-sort-order'."
-  (pcase projectile-sort-order
-    (`default files)
-    (`recentf (projectile-sort-by-recentf-first files))
-    (`recently-active (projectile-sort-by-recently-active-first files))
-    (`modification-time (projectile-sort-by-modification-time files))
-    (`access-time (projectile-sort-by-access-time files))))
-
-(defun projectile-sort-by-recentf-first (files)
-  "Sort FILES by a recent first scheme."
-  (let ((project-recentf-files (projectile-recentf-files)))
-    (append project-recentf-files
-            (-difference files project-recentf-files))))
-
-(defun projectile-sort-by-recently-active-first (files)
-  "Sort FILES by most recently active buffers or opened files."
-  (let ((project-recently-active-files (projectile-recently-active-files)))
-    (append project-recently-active-files
-            (-difference files project-recently-active-files))))
-
-(defun projectile-sort-by-modification-time (files)
-  "Sort FILES by modification time."
-  (let ((default-directory (projectile-project-root)))
-    (-sort (lambda (file1 file2)
-             (let ((file1-mtime (nth 5 (file-attributes file1)))
-                   (file2-mtime (nth 5 (file-attributes file2))))
-               (not (time-less-p file1-mtime file2-mtime))))
-           files)))
-
-(defun projectile-sort-by-access-time (files)
-  "Sort FILES by access time."
-  (let ((default-directory (projectile-project-root)))
-    (-sort (lambda (file1 file2)
-             (let ((file1-atime (nth 4 (file-attributes file1)))
-                   (file2-atime (nth 4 (file-attributes file2))))
-               (not (time-less-p file1-atime file2-atime))))
-           files)))
-
-(defun projectile-find-dir (&optional arg)
-  "Jump to a project's directory using completion.
-
-With a prefix ARG invalidates the cache first."
-  (interactive "P")
-  (projectile-maybe-invalidate-cache arg)
-  (let ((dir (projectile-complete-dir)))
-    (dired (expand-file-name dir (projectile-project-root)))
-    (run-hooks 'projectile-find-dir-hook)))
-
-(defun projectile-find-dir-other-window (&optional arg)
-  "Jump to a project's directory in other window using completion.
-
-With a prefix ARG invalidates the cache first."
-  (interactive "P")
-  (when arg
-    (projectile-invalidate-cache nil))
-  (let ((dir (projectile-complete-dir)))
-    (dired-other-window (expand-file-name dir (projectile-project-root)))
-    (run-hooks 'projectile-find-dir-hook)))
-
-(defun projectile-complete-dir ()
-  (projectile-completing-read
-   "Find dir: "
-   (if projectile-find-dir-includes-top-level
-       (append '("./") (projectile-current-project-dirs))
-     (projectile-current-project-dirs))))
-
-(defun projectile-find-test-file (&optional arg)
-  "Jump to a project's test file using completion.
-
-With a prefix ARG invalidates the cache first."
-  (interactive "P")
-  (projectile-maybe-invalidate-cache arg)
-  (let ((file (projectile-completing-read "Find test file: "
-                                          (projectile-current-project-test-files))))
-    (find-file (expand-file-name file (projectile-project-root)))))
-
-(defun projectile-test-files (files)
-  "Return only the test FILES."
-  (-filter 'projectile-test-file-p files))
-
-(defun projectile-test-file-p (file)
-  "Check if FILE is a test file."
-  (or (--any? (string-prefix-p it (file-name-nondirectory file))
-              (-non-nil (list (funcall projectile-test-prefix-function (projectile-project-type)))))
-      (--any? (string-suffix-p it (file-name-nondirectory file))
-              (-non-nil (list (funcall projectile-test-suffix-function (projectile-project-type)))))))
-
-(defun projectile-current-project-test-files ()
-  "Return a list of test files for the current project."
-  (projectile-test-files (projectile-current-project-files)))
-
-(defvar projectile-rails-rspec '("Gemfile" "app" "lib" "db" "config" "spec"))
-(defvar projectile-rails-test '("Gemfile" "app" "lib" "db" "config" "test"))
-(defvar projectile-symfony '("composer.json" "app" "src" "vendor"))
-(defvar projectile-ruby-rspec '("Gemfile" "lib" "spec"))
-(defvar projectile-ruby-test '("Gemfile" "lib" "test"))
-(defvar projectile-django '("manage.py"))
-(defvar projectile-python-pip '("requirements.txt"))
-(defvar projectile-python-pkg '("setup.py"))
-(defvar projectile-python-tox '("tox.ini"))
-(defvar projectile-scons '("SConstruct"))
-(defvar projectile-maven '("pom.xml"))
-(defvar projectile-gradle '("build.gradle"))
-(defvar projectile-grails '("application.properties" "grails-app"))
-(defvar projectile-lein-test '("project.clj"))
-(defvar projectile-lein-midje '("project.clj" ".midje.clj"))
-(defvar projectile-rebar '("rebar"))
-(defvar projectile-sbt '("build.sbt"))
-(defvar projectile-make '("Makefile"))
-(defvar projectile-grunt '("Gruntfile.js"))
-(defvar projectile-gulp '("gulpfile.js"))
-(defvar projectile-haskell-cabal '("*.cabal"))
-(defvar projectile-rust-cargo '("Cargo.toml"))
-(defvar projectile-r '("DESCRIPTION"))
-
-(defun projectile-go ()
-  "Check if a project contains Go source files."
-  (-any? (lambda (file)
-           (string= (file-name-extension file) "go"))
-         (projectile-current-project-files)))
-
-(defcustom projectile-go-function 'projectile-go
-  "Function to determine if project's type is go."
-  :group 'projectile
-  :type 'function)
-
-(defvar-local projectile-project-type nil
-  "Buffer local var for overriding the auto-detected project type.
-Normally you'd set this from .dir-locals.el.")
-
-(defun projectile-project-type ()
-  "Determine the project's type based on its structure."
-  (cond
-   (projectile-project-type projectile-project-type)
-   ((projectile-verify-files projectile-rails-rspec) 'rails-rspec)
-   ((projectile-verify-files projectile-rails-test) 'rails-test)
-   ((projectile-verify-files projectile-ruby-rspec) 'ruby-rspec)
-   ((projectile-verify-files projectile-ruby-test) 'ruby-test)
-   ((projectile-verify-files projectile-django) 'django)
-   ((projectile-verify-files projectile-python-tox) 'python-tox)
-   ((projectile-verify-files projectile-python-pip)'python)
-   ((projectile-verify-files projectile-python-pkg) 'python)
-   ((projectile-verify-files projectile-symfony) 'symfony)
-   ((projectile-verify-files projectile-lein-midje) 'lein-midje)
-   ((projectile-verify-files projectile-lein-test) 'lein-test)
-   ((projectile-verify-files projectile-scons) 'scons)
-   ((projectile-verify-files projectile-maven) 'maven)
-   ((projectile-verify-files projectile-gradle) 'gradle)
-   ((projectile-verify-files projectile-grails) 'grails)
-   ((projectile-verify-files projectile-rebar) 'rebar)
-   ((projectile-verify-files projectile-sbt) 'sbt)
-   ((projectile-verify-files projectile-make) 'make)
-   ((projectile-verify-files projectile-gulp) 'gulp)
-   ((projectile-verify-files projectile-grunt) 'grunt)
-   ((projectile-verify-files projectile-haskell-cabal) 'haskell-cabal)
-   ((projectile-verify-files projectile-rust-cargo) 'rust-cargo)
-   ((projectile-verify-files projectile-r) 'r)
-   ((funcall projectile-go-function) 'go)
-   (t 'generic)))
-
-(defun projectile-project-info ()
-  "Display info for current project."
-  (interactive)
-  (message "Project dir: %s ## Project VCS: %s ## Project type: %s"
-           (projectile-project-root)
-           (projectile-project-vcs)
-           (projectile-project-type)))
-
-(defun projectile-verify-files (files)
-  "Check whether all FILES exist in the current project."
-  (-all? 'projectile-verify-file files))
-
-(defun projectile-verify-file (file)
-  "Check whether FILE exists in the current project.
-Expands wildcards using `file-expand-wildcards' before checking."
-  (file-expand-wildcards (projectile-expand-root file)))
-
-(defun projectile-project-vcs (&optional project-root)
-  "Determine the VCS used by the project if any.
-PROJECT-ROOT is the targeted directory.  If nil, use
-`projectile-project-root'."
-  (or project-root (setq project-root (projectile-project-root)))
-  (cond
-   ((projectile-file-exists-p (expand-file-name ".git" project-root)) 'git)
-   ((projectile-file-exists-p (expand-file-name ".hg" project-root)) 'hg)
-   ((projectile-file-exists-p (expand-file-name ".fossil" project-root)) 'fossil)
-   ((projectile-file-exists-p (expand-file-name ".bzr" project-root)) 'bzr)
-   ((projectile-file-exists-p (expand-file-name "_darcs" project-root)) 'darcs)
-   ((projectile-file-exists-p (expand-file-name ".svn" project-root)) 'svn)
-   ((projectile-locate-dominating-file project-root ".git") 'git)
-   ((projectile-locate-dominating-file project-root ".hg") 'hg)
-   ((projectile-locate-dominating-file project-root ".fossil") 'fossil)
-   ((projectile-locate-dominating-file project-root ".bzr") 'bzr)
-   ((projectile-locate-dominating-file project-root "_darcs") 'darcs)
-   ((projectile-locate-dominating-file project-root ".svn") 'svn)
-   (t 'none)))
-
-(defun projectile--test-name-for-impl-name (impl-file-path)
-  (let* ((project-type (projectile-project-type))
-         (impl-file-name (file-name-sans-extension (file-name-nondirectory impl-file-path)))
-         (impl-file-ext (file-name-extension impl-file-path))
-         (test-prefix (funcall projectile-test-prefix-function project-type))
-         (test-suffix (funcall projectile-test-suffix-function project-type)))
-    (cond
-     (test-prefix (concat test-prefix impl-file-name "." impl-file-ext))
-     (test-suffix (concat impl-file-name test-suffix "." impl-file-ext))
-     (t (error "Project type not supported!")))))
-
-(defun projectile-create-test-file-for (impl-file-path)
-  (let* ((test-file (projectile--test-name-for-impl-name impl-file-path))
-         (test-dir (replace-regexp-in-string "src/" "test/" (file-name-directory impl-file-path))))
-    (unless (file-exists-p (expand-file-name test-file test-dir))
-      (progn (unless (file-exists-p test-dir)
-               (make-directory test-dir :create-parents))
-             (concat test-dir test-file)))))
-
-(defcustom projectile-create-missing-test-files nil
-  "During toggling, if non-nil enables creating test files if not found.
-
-When not-nil, every call to projectile-find-implementation-or-test-*
-creates test files if not found on the file system. Defaults to nil.
-It assumes the test/ folder is at the same level as src/."
-  :group 'projectile
-  :type 'boolean)
-
-(defun projectile-find-implementation-or-test (file-name)
-  "Given a FILE-NAME return the matching implementation or test filename."
-  (unless file-name (error "The current buffer is not visiting a file"))
-  (if (projectile-test-file-p file-name)
-      ;; find the matching impl file
-      (let ((impl-file (projectile-find-matching-file file-name)))
-        (if impl-file
-            (projectile-expand-root impl-file)
-          (error "No matching source file found")))
-    ;; find the matching test file
-    (let ((test-file (projectile-find-matching-test file-name)))
-      (if test-file
-          (projectile-expand-root test-file)
-        (if projectile-create-missing-test-files
-            (projectile-create-test-file-for file-name)
-          (error "No matching test file found"))))))
-
-;;;###autoload
-(defun projectile-find-implementation-or-test-other-window ()
-  "Open matching implementation or test file in other window."
-  (interactive)
-  (find-file-other-window
-   (projectile-find-implementation-or-test (buffer-file-name))))
-
-;;;###autoload
-(defun projectile-toggle-between-implementation-and-test ()
-  "Toggle between an implementation file and its test file."
-  (interactive)
-  (find-file
-   (projectile-find-implementation-or-test (buffer-file-name))))
-
-(defcustom projectile-test-prefix-function 'projectile-test-prefix
-  "Function to find test files prefix based on PROJECT-TYPE."
-  :group 'projectile
-  :type 'function)
-
-(defcustom projectile-test-suffix-function 'projectile-test-suffix
-  "Function to find test files suffix based on PROJECT-TYPE."
-  :group 'projectile
-  :type 'function)
-
-(defun projectile-test-affix (project-type)
-  "Find test files affix based on PROJECT-TYPE."
-  (or (funcall projectile-test-prefix-function project-type)
-      (funcall projectile-test-suffix-function project-type)
-      (error "Project type not supported!")))
-
-(defun projectile-test-prefix (project-type)
-  "Find default test files prefix based on PROJECT-TYPE."
-  (cond
-   ((member project-type '(django python)) "test_")
-   ((member project-type '(lein-midje)) "t_")))
-
-(defun projectile-test-suffix (project-type)
-  "Find default test files suffix based on PROJECT-TYPE."
-  (cond
-   ((member project-type '(rails-rspec ruby-rspec)) "_spec")
-   ((member project-type '(rails-test ruby-test lein-test go)) "_test")
-   ((member project-type '(scons)) "test")
-   ((member project-type '(maven symfony)) "Test")
-   ((member project-type '(gradle grails)) "Spec")))
-
-(defun projectile-dirname-matching-count (a b)
-  "Count matching dirnames ascending file paths."
-  (setq a (reverse (split-string (file-name-directory a) "/" t))
-        b (reverse (split-string (file-name-directory b) "/" t)))
-  (let ((common 0))
-    (while (and a b (string-equal (pop a) (pop b)))
-      (setq common (1+ common)))
-    common))
-
-(defun projectile-group-file-candidates (file candidates)
-  "Group file candidates by dirname matching count."
-  (--sort (> (car it) (car other))
-          (--group-by (projectile-dirname-matching-count file it) candidates)))
-
-(defun projectile-find-matching-test (file)
-  "Compute the name of the test matching FILE."
-  (let* ((basename (file-name-nondirectory (file-name-sans-extension file)))
-         (test-affix (projectile-test-affix (projectile-project-type)))
-         (candidates
-          (-filter (lambda (current-file)
-                     (let ((name (file-name-nondirectory
-                                  (file-name-sans-extension current-file))))
-                       (or (string-equal name (concat test-affix basename))
-                           (string-equal name (concat basename test-affix)))))
-                   (projectile-current-project-files))))
-    (cond
-     ((null candidates) nil)
-     ((= (length candidates) 1) (car candidates))
-     (t (let ((grouped-candidates (projectile-group-file-candidates file candidates)))
-          (if (= (length (car grouped-candidates)) 2)
-              (-last-item (car grouped-candidates))
-            (projectile-completing-read "Switch to: " (--mapcat (cdr it) grouped-candidates))))))))
-
-(defun projectile-find-matching-file (test-file)
-  "Compute the name of a file matching TEST-FILE."
-  (let* ((basename (file-name-nondirectory (file-name-sans-extension test-file)))
-         (test-affix (projectile-test-affix (projectile-project-type)))
-         (candidates
-          (-filter (lambda (current-file)
-                     (let ((name (file-name-nondirectory
-                                  (file-name-sans-extension current-file))))
-                       (or (string-equal (concat test-affix name) basename)
-                           (string-equal (concat name test-affix) basename))))
-                   (projectile-current-project-files))))
-    (cond
-     ((null candidates) nil)
-     ((= (length candidates) 1) (car candidates))
-     (t (let ((grouped-candidates (projectile-group-file-candidates test-file candidates)))
-          (if (= (length (car grouped-candidates)) 2)
-              (-last-item (car grouped-candidates))
-            (projectile-completing-read "Switch to: " (--mapcat (cdr it) grouped-candidates))))))))
-
-(defun projectile-grep-default-files ()
-  "Try to find a default pattern for `projectile-grep'.
-This is a subset of `grep-read-files', where either a matching entry from
-`grep-files-aliases' or file name extension pattern is returned."
-  (when buffer-file-name
-    (let* ((fn (file-name-nondirectory buffer-file-name))
-           (default-alias
-             (let ((aliases (remove (assoc "all" grep-files-aliases)
-                                    grep-files-aliases))
-                   alias)
-               (while aliases
-                 (setq alias (car aliases)
-                       aliases (cdr aliases))
-                 (if (string-match (mapconcat
-                                    #'wildcard-to-regexp
-                                    (split-string (cdr alias) nil t)
-                                    "\\|")
-                                   fn)
-                     (setq aliases nil)
-                   (setq alias nil)))
-               (cdr alias)))
-           (default-extension
-             (let ((ext (file-name-extension fn)))
-               (and ext (concat "*." ext)))))
-      (or default-alias default-extension))))
-
-(defun projectile-grep (&optional arg)
-  "Perform rgrep in the project.
-
-With a prefix ARG asks for files (globbing-aware) which to grep in.
-With prefix ARG of `-' (such as `M--'), default the files (without prompt),
-to `projectile-grep-default-files'."
-  (interactive "P")
-  (require 'grep) ;; for `rgrep'
-  (let* ((roots (projectile-get-project-directories))
-         (search-regexp (if (and transient-mark-mode mark-active)
-                            (buffer-substring (region-beginning) (region-end))
-                          (read-string (projectile-prepend-project-name "Grep for: ")
-                                       (projectile-symbol-at-point))))
-         (files (and arg (or (and (equal current-prefix-arg '-)
-                                  (projectile-grep-default-files))
-                             (read-string (projectile-prepend-project-name "Grep in: ")
-                                          (projectile-grep-default-files))))))
-    (dolist (root-dir roots)
-      (require 'vc-git) ;; for `vc-git-grep'
-      ;; in git projects users have the option to use `vc-git-grep' instead of `rgrep'
-      (if (and (eq (projectile-project-vcs) 'git)
-               projectile-use-git-grep
-               (fboundp 'vc-git-grep))
-          (vc-git-grep search-regexp (or files "") root-dir)
-        ;; paths for find-grep should relative and without trailing /
-        (let ((grep-find-ignored-directories
-               (-union (--map (directory-file-name (file-relative-name it root-dir))
-                              (projectile-ignored-directories))
-                       grep-find-ignored-directories))
-              (grep-find-ignored-files
-               (-union (-map (lambda (file)
-                               (file-relative-name file root-dir))
-                             (projectile-ignored-files))
-                       grep-find-ignored-files)))
-          (grep-compute-defaults)
-          (rgrep search-regexp (or files "* .*") root-dir))))))
-
-(defun projectile-ag (search-term &optional arg)
-  "Run an ag search with SEARCH-TERM in the project.
-
-With an optional prefix argument ARG SEARCH-TERM is interpreted as a
-regular expression."
-  (interactive
-   (list (read-from-minibuffer
-          (projectile-prepend-project-name (format "Ag %ssearch for: " (if current-prefix-arg "regexp " "")))
-          (projectile-symbol-at-point))
-         current-prefix-arg))
-  (if (fboundp 'ag-regexp)
-      (let ((ag-command (if arg 'ag-regexp 'ag))
-            ;; reset the prefix arg, otherwise it will affect the ag-command
-            (current-prefix-arg nil))
-        (funcall ag-command search-term (projectile-project-root)))
-    (error "Ag is not available")))
-
-(defun projectile-tags-exclude-patterns ()
-  "Return a string with exclude patterns for ctags."
-  (mapconcat (lambda (pattern) (format "--exclude=\"%s\""
-                                       (directory-file-name pattern)))
-             (projectile-ignored-directories-rel) " "))
-
-;;;###autoload
-(defun projectile-regenerate-tags ()
-  "Regenerate the project's [e|g]tags."
-  (interactive)
-  (if (boundp 'ggtags-mode)
-      (progn
-        (let* ((ggtags-project-root (projectile-project-root))
-               (default-directory ggtags-project-root))
-          (ggtags-ensure-project)
-          (ggtags-update-tags t)))
-    (let* ((project-root (projectile-project-root))
-           (tags-exclude (projectile-tags-exclude-patterns))
-           (default-directory project-root)
-           (tags-file (expand-file-name projectile-tags-file-name))
-           (command (format projectile-tags-command tags-file tags-exclude))
-           shell-output exit-code)
-      (with-temp-buffer
-        (setq exit-code
-              (call-process-shell-command command nil (current-buffer))
-              shell-output (projectile-trim-string
-                            (buffer-substring (point-min) (point-max)))))
-      (unless (zerop exit-code)
-        (error shell-output))
-      (visit-tags-table tags-file))))
-
-(defun projectile-visit-project-tags-table ()
-  "Visit the current project's tags table."
-  (when (projectile-project-p)
-    (let ((tags-file (projectile-expand-root projectile-tags-file-name)))
-      (when (file-exists-p tags-file)
-        (with-demoted-errors "Error loading tags-file: %s"
-          (visit-tags-table tags-file t))))))
-
-;;;###autoload
-(defun projectile-find-tag ()
-  "Find tag in project."
-  (interactive)
-  (let ((find-tag-function (if (boundp 'ggtags-mode) 'ggtags-find-tag 'find-tag))
-        (tags (if (boundp 'ggtags-mode)
-                  (projectile--tags (all-completions "" ggtags-completion-table))
-                (require 'etags)
-                ;; we have to manually reset the tags-completion-table every time
-                (setq tags-completion-table nil)
-                (tags-completion-table)
-                (projectile--tags tags-completion-table))))
-    (funcall find-tag-function (projectile-completing-read "Find tag: "
-                                                           tags
-                                                           (projectile-symbol-at-point)))))
-
-(defun projectile--tags (completion-table)
-  "Find tags using COMPLETION-TABLE."
-  (-reject #'null
-           (-map (lambda (x)
-                   (unless (integerp x)
-                     (prin1-to-string x t)))
-                 completion-table)))
-
-(defmacro projectile-with-default-dir (dir &rest body)
-  "Invoke in DIR the BODY."
-  (declare (debug t) (indent 1))
-  `(let ((default-directory ,dir))
-     ,@body))
-
-;;;###autoload
-(defun projectile-run-command-in-root ()
-  "Invoke `execute-extended-command' in the project's root."
-  (interactive)
-  (projectile-with-default-dir (projectile-project-root)
-    (call-interactively 'execute-extended-command)))
-
-;;;###autoload
-(defun projectile-run-shell-command-in-root ()
-  "Invoke `shell-command' in the project's root."
-  (interactive)
-  (projectile-with-default-dir (projectile-project-root)
-    (call-interactively 'shell-command)))
-
-;;;###autoload
-(defun projectile-run-async-shell-command-in-root ()
-  "Invoke `async-shell-command' in the project's root."
-  (interactive)
-  (projectile-with-default-dir (projectile-project-root)
-    (call-interactively 'async-shell-command)))
-
-(defun projectile-files-in-project-directory (directory)
-  "Return a list of files in DIRECTORY."
-  (let ((dir (file-relative-name (expand-file-name directory)
-                                 (projectile-project-root))))
-    (--filter (string-prefix-p dir it)
-              (projectile-current-project-files))))
-
-(defun projectile-unixy-system-p ()
-  "Check to see if unixy text utilities are installed."
-  (--all? (executable-find it) '("grep" "cut" "uniq")))
-
-(defun projectile-files-from-cmd (cmd directory)
-  "Use a grep-like CMD to search for files within DIRECTORY.
-
-CMD should include the necessary search params and should output
-equivalently to grep -HlI (only unique matching filenames).
-Returns a list of expanded filenames."
-  (let ((default-directory directory))
-    (--map (concat directory
-                   (if (string-prefix-p "./" it) (substring it 2) it))
-           (-> (shell-command-to-string cmd)
-               projectile-trim-string
-               (split-string "\n+" t)))))
-
-(defun projectile-files-with-string (string directory)
-  "Return a list of all files containing STRING in DIRECTORY.
-
-Tries to use ag, ack, git-grep, and grep in that order.  If those
-are impossible (for instance on Windows), returns a list of all
-files in the project."
-  (if (projectile-unixy-system-p)
-      (let* ((search-term (shell-quote-argument string))
-             (cmd (cond ((executable-find "ag")
-                         (concat "ag --literal --nocolor --noheading -l -- "
-                                 search-term))
-                        ((executable-find "ack")
-                         (concat "ack --noheading --nocolor -l -- "
-                                 search-term))
-                        ((and (executable-find "git")
-                              (eq (projectile-project-vcs) 'git))
-                         (concat "git grep -HlI "
-                                 search-term))
-                        (t
-                         (concat "grep -rHlI "
-                                 search-term
-                                 " .")))))
-        (projectile-files-from-cmd cmd directory))
-    ;; we have to reject directories as a workaround to work with git submodules
-    (-reject #'file-directory-p
-             (-map #'projectile-expand-root (projectile-dir-files directory)))))
-
-(defun projectile-replace (&optional arg)
-  "Replace a string in the project using `tags-query-replace'.
-
-With a prefix argument ARG prompts you for a directory on which
-to run the replacement."
-  (interactive "P")
-  (let* ((old-text (read-string
-                    (projectile-prepend-project-name "Replace: ")
-                    (projectile-symbol-at-point)))
-         (new-text (read-string
-                    (projectile-prepend-project-name
-                     (format "Replace %s with: " old-text))))
-         (directory (if arg
-                        (file-name-as-directory
-                         (read-directory-name "Replace in directory: "))
-                      (projectile-project-root)))
-         (files (projectile-files-with-string old-text directory)))
-    (tags-query-replace old-text new-text nil (cons 'list files))))
-
-(defun projectile-symbol-at-point ()
-  "Get the symbol at point and strip its properties."
-  (substring-no-properties (or (thing-at-point 'symbol) "")))
-
-;;;###autoload
-(defun projectile-kill-buffers ()
-  "Kill all project buffers."
-  (interactive)
-  (let ((name (projectile-project-name))
-        (buffers (projectile-project-buffers)))
-    (if (yes-or-no-p
-         (format "Are you sure you want to kill %d buffer(s) for '%s'? "
-                 (length buffers) name))
-        ;; we take care not to kill indirect buffers directly
-        ;; as we might encounter them after their base buffers are killed
-        (mapc #'kill-buffer (-remove 'buffer-base-buffer buffers)))))
-
-;;;###autoload
-(defun projectile-save-project-buffers ()
-  "Save all project buffers."
-  (interactive)
-  (--each (projectile-project-buffers)
-    (with-current-buffer it
-      (when buffer-file-name
-        (save-buffer)))))
-
-;;;###autoload
-(defun projectile-dired ()
-  "Open `dired' at the root of the project."
-  (interactive)
-  (dired (projectile-project-root)))
-
-;;;###autoload
-(defun projectile-vc (&optional project-root)
-  "Open `vc-dir' at the root of the project.
-
-For git projects `magit-status-internal' is used if available."
-  (interactive)
-  (or project-root (setq project-root (projectile-project-root)))
-  (if (eq (projectile-project-vcs project-root) 'git)
-      (cond ((fboundp 'magit-status-internal)
-             (magit-status-internal project-root))
-            ((fboundp 'magit-status)
-             (with-no-warnings (magit-status project-root)))
-            (t
-             (vc-dir project-root)))
-    (vc-dir project-root)))
-
-;;;###autoload
-(defun projectile-recentf ()
-  "Show a list of recently visited files in a project."
-  (interactive)
-  (if (boundp 'recentf-list)
-      (find-file (projectile-expand-root (projectile-completing-read "Recently visited files: " (projectile-recentf-files))))
-    (message "recentf is not enabled")))
-
-(defun projectile-recentf-files ()
-  "Return a list of recently visited files in a project."
-  (and (boundp 'recentf-list)
-       (let ((project-root (projectile-project-root)))
-         (->> recentf-list
-              (--filter (string-prefix-p project-root it))
-              (--map (file-relative-name it project-root))))))
-
-(defun projectile-serialize-cache ()
-  "Serializes the memory cache to the hard drive."
-  (projectile-serialize projectile-projects-cache projectile-cache-file))
-
-(defvar projectile-rails-compile-cmd "bundle exec rails server")
-(defvar projectile-ruby-compile-cmd "bundle exec rake build")
-(defvar projectile-ruby-test-cmd "bundle exec rake test")
-(defvar projectile-ruby-rspec-cmd "bundle exec rspec")
-(defvar projectile-django-compile-cmd "python manage.py runserver")
-(defvar projectile-django-test-cmd "python manage.py test")
-(defvar projectile-python-compile-cmd "python setup.py build")
-(defvar projectile-python-test-cmd "python -m unittest discover")
-(defvar projectile-python-tox-test-cmd "tox")
-(defvar projectile-symfony-compile-cmd "app/console server:run")
-(defvar projectile-symfony-test-cmd "phpunit -c app ")
-(defvar projectile-scons-compile-cmd "scons")
-(defvar projectile-scons-test-cmd "scons test")
-(defvar projectile-maven-compile-cmd "mvn clean install")
-(defvar projectile-maven-test-cmd "mvn test")
-(defvar projectile-gradle-compile-cmd "gradle build")
-(defvar projectile-gradle-test-cmd "gradle test")
-(defvar projectile-grails-compile-cmd "grails package")
-(defvar projectile-grails-test-cmd "grails test-app")
-(defvar projectile-lein-compile-cmd "lein compile")
-(defvar projectile-lein-test-cmd "lein test")
-(defvar projectile-lein-midje-test-cmd "lein midje")
-(defvar projectile-rebar-compile-cmd "rebar")
-(defvar projectile-rebar-test-cmd "rebar eunit")
-(defvar projectile-sbt-compile-cmd "sbt compile")
-(defvar projectile-sbt-test-cmd "sbt test")
-(defvar projectile-make-compile-cmd "make")
-(defvar projectile-make-test-cmd "make test")
-(defvar projectile-grunt-compile-cmd "grunt")
-(defvar projectile-grunt-test-cmd "grunt test")
-(defvar projectile-gulp-compile-cmd "gulp")
-(defvar projectile-gulp-test-cmd "gulp test")
-(defvar projectile-go-compile-cmd "go build ./...")
-(defvar projectile-go-test-cmd "go test ./...")
-(defvar projectile-haskell-cabal-compile-cmd "cabal build")
-(defvar projectile-haskell-cabal-test-cmd "cabal test")
-(defvar projectile-rust-cargo-compile-cmd "cargo build")
-(defvar projectile-rust-cargo-test-cmd "cargo test")
-(defvar projectile-r-compile-cmd "R CMD INSTALL .")
-(defvar projectile-r-test-cmd (concat "R CMD check -o "
-                                      temporary-file-directory " ."))
-
-(--each '(projectile-rails-compile-cmd
-          projectile-ruby-compile-cmd
-          projectile-ruby-test-cmd
-          projectile-ruby-rspec-cmd
-          projectile-django-compile-cmd
-          projectile-django-test-cmd
-          projectile-python-compile-cmd
-          projectile-python-test-cmd
-          projectile-python-tox-test-cmd
-          projectile-symfony-compile-cmd
-          projectile-symfony-test-cmd
-          projectile-scons-compile-cmd
-          projectile-scons-test-cmd
-          projectile-maven-compile-cmd
-          projectile-maven-test-cmd
-          projectile-lein-compile-cmd
-          projectile-lein-test-cmd
-          projectile-lein-midje-test-cmd
-          projectile-rebar-compile-cmd
-          projectile-rebar-test-cmd
-          projectile-sbt-compile-cmd
-          projectile-sbt-test-cmd
-          projectile-make-compile-cmd
-          projectile-make-test-cmd
-          projectile-grunt-compile-cmd
-          projectile-grunt-test-cmd
-          projectile-haskell-cabal-compile-cmd
-          projectile-haskell-cabal-test-cmd
-          projectile-rust-cargo-compile-cmd
-          projectile-rust-cargo-test-cmd
-          projectile-r-compile-cmd
-          projectile-r-test-cmd)
-  (put it 'safe-local-variable #'stringp))
-
-
-(defvar projectile-compilation-cmd-map
-  (make-hash-table :test 'equal)
-  "A mapping between projects and the last compilation command used on them.")
-(defvar projectile-test-cmd-map
-  (make-hash-table :test 'equal)
-  "A mapping between projects and the last test command used on them.")
-
-(defun projectile-default-compilation-command (project-type)
-  "Retrieve default compilation command for PROJECT-TYPE."
-  (cond
-   ((member project-type '(rails-rspec rails-test)) projectile-rails-compile-cmd)
-   ((member project-type '(ruby-rspec ruby-test)) projectile-ruby-compile-cmd)
-   ((eq project-type 'django) projectile-django-compile-cmd)
-   ((eq project-type 'python) projectile-python-compile-cmd)
-   ((eq project-type 'symfony) projectile-symfony-compile-cmd)
-   ((member project-type '(lein-test lein-midje)) projectile-lein-compile-cmd)
-   ((eq project-type 'make) projectile-make-compile-cmd)
-   ((eq project-type 'rebar) projectile-rebar-compile-cmd)
-   ((eq project-type 'scons) projectile-scons-compile-cmd)
-   ((eq project-type 'maven) projectile-maven-compile-cmd)
-   ((eq project-type 'gradle) projectile-gradle-compile-cmd)
-   ((eq project-type 'grails) projectile-grails-compile-cmd)
-   ((eq project-type 'sbt) projectile-sbt-compile-cmd)
-   ((eq project-type 'grunt) projectile-grunt-compile-cmd)
-   ((eq project-type 'gulp) projectile-gulp-compile-cmd)
-   ((eq project-type 'go) projectile-go-compile-cmd)
-   ((eq project-type 'haskell-cabal) projectile-haskell-cabal-compile-cmd)
-   ((eq project-type 'rust-cargo) projectile-rust-cargo-compile-cmd)
-   ((eq project-type 'r) projectile-r-compile-cmd)
-   (t projectile-make-compile-cmd)))
-
-(defun projectile-default-test-command (project-type)
-  "Retrieve default test command for PROJECT-TYPE."
-  (cond
-   ((member project-type '(rails-rspec ruby-rspec)) projectile-ruby-rspec-cmd)
-   ((member project-type '(rails-test ruby-test)) projectile-ruby-test-cmd)
-   ((eq project-type 'django) projectile-django-test-cmd)
-   ((eq project-type 'python-tox) projectile-python-tox-test-cmd)
-   ((eq project-type 'python) projectile-python-test-cmd)
-   ((eq project-type 'symfony) projectile-symfony-test-cmd)
-   ((eq project-type 'lein-test) projectile-lein-test-cmd)
-   ((eq project-type 'lein-midje) projectile-lein-midje-test-cmd)
-   ((eq project-type 'make) projectile-make-test-cmd)
-   ((eq project-type 'rebar) projectile-rebar-test-cmd)
-   ((eq project-type 'scons) projectile-scons-test-cmd)
-   ((eq project-type 'maven) projectile-maven-test-cmd)
-   ((eq project-type 'gradle) projectile-gradle-test-cmd)
-   ((eq project-type 'grails) projectile-grails-test-cmd)
-   ((eq project-type 'sbt) projectile-sbt-test-cmd)
-   ((eq project-type 'grunt) projectile-grunt-test-cmd)
-   ((eq project-type 'gulp) projectile-gulp-test-cmd)
-   ((eq project-type 'go) projectile-go-test-cmd)
-   ((eq project-type 'haskell-cabal) projectile-haskell-cabal-test-cmd)
-   ((eq project-type 'rust-cargo) projectile-rust-cargo-test-cmd)
-   ((eq project-type 'r) projectile-r-test-cmd)
-   (t projectile-make-test-cmd)))
-
-(defun projectile-compilation-command (project)
-  "Retrieve the compilation command for PROJECT."
-  (or (gethash project projectile-compilation-cmd-map)
-      (projectile-default-compilation-command (projectile-project-type))))
-
-(defun projectile-test-command (project)
-  "Retrieve the test command for PROJECT."
-  (or (gethash project projectile-test-cmd-map)
-      (projectile-default-test-command (projectile-project-type))))
-
-(defun projectile-compile-project (arg &optional dir)
-  "Run project compilation command.
-
-Normally you'll be prompted for a compilation command, unless
-variable `compilation-read-command'.  You can force the prompt
-with a prefix ARG."
-  (interactive "P")
-  (let* ((project-root (if dir
-                           dir
-                         (projectile-project-root)))
-         (default-directory project-root)
-         (default-cmd (projectile-compilation-command project-root))
-         (compilation-cmd (if (or compilation-read-command arg)
-                              (compilation-read-command default-cmd)
-                            default-cmd)))
-    (puthash project-root compilation-cmd projectile-compilation-cmd-map)
-    (save-some-buffers (not compilation-ask-about-save)
-                       (lambda ()
-                         (projectile-project-buffer-p (current-buffer)
-                                                      project-root)))
-    (compilation-start compilation-cmd)))
-
-(defadvice compilation-find-file (around projectile-compilation-find-file)
-  "Try to find a buffer for FILENAME, if we cannot find it,
-fallback to the original function."
-  (let ((filename (ad-get-arg 1)))
-    (setf ad-return-value
-          (or
-           (if (file-exists-p (expand-file-name filename))
-               (find-file-noselect filename))
-           ;; Try to find the filename using projectile
-           (and (projectile-project-p)
-                (let ((root (projectile-project-root))
-                      (dirs (cons "" (projectile-current-project-dirs))))
-                  (-when-let (full-filename (->> dirs
-                                                 (--map (expand-file-name filename (expand-file-name it root)))
-                                                 (-filter #'file-exists-p)
-                                                 (-first-item)))
-                    (find-file-noselect full-filename))))
-           ;; Fall back to the old function `compilation-find-file'
-           ad-do-it))))
-
-;; TODO - factor this duplication out
-(defun projectile-test-project (arg)
-  "Run project test command.
-
-Normally you'll be prompted for a compilation command, unless
-variable `compilation-read-command'.  You can force the prompt
-with a prefix ARG."
-  (interactive "P")
-  (let* ((project-root (projectile-project-root))
-         (default-cmd (projectile-test-command project-root))
-         (test-cmd (if (or compilation-read-command arg)
-                       (compilation-read-command default-cmd)
-                     default-cmd))
-         (default-directory project-root))
-    (puthash project-root test-cmd projectile-test-cmd-map)
-    (compilation-start test-cmd)))
-
-(defun projectile-relevant-known-projects ()
-  "Return a list of known projects except the current one (if present)."
-  (if (projectile-project-p)
-      (-difference projectile-known-projects
-                   (list (abbreviate-file-name (projectile-project-root))))
-    projectile-known-projects))
-
-(defun projectile-switch-project (&optional arg)
-  "Switch to a project we have visited before.
-Invokes the command referenced by `projectile-switch-project-action' on switch.
-With a prefix ARG invokes `projectile-commander' instead of
-`projectile-switch-project-action.'"
-  (interactive "P")
-  (-if-let (projects (projectile-relevant-known-projects))
-      (projectile-switch-project-by-name
-       (projectile-completing-read "Switch to project: " projects)
-       arg)
-    (error "There are no known projects")))
-
-(defun projectile-switch-project-by-name (project-to-switch &optional arg)
-  "Switch to project by project name PROJECT-TO-SWITCH.
-Invokes the command referenced by `projectile-switch-project-action' on switch.
-With a prefix ARG invokes `projectile-commander' instead of
-`projectile-switch-project-action.'"
-  (let* ((default-directory project-to-switch)
-         (switch-project-action (if arg
-                                    'projectile-commander
-                                  projectile-switch-project-action)))
-    (funcall switch-project-action)
-    (run-hooks 'projectile-switch-project-hook)))
-
-
-(defun projectile-find-file-in-directory (&optional directory)
-  "Jump to a file in a (maybe regular) DIRECTORY.
-
-This command will first prompt for the directory the file is in."
-  (interactive "DFind file in directory: ")
-  (let ((default-directory directory)
-        (projectile-require-project-root nil))
-    (if (projectile-project-p)
-        ;; target directory is in a project
-        (let ((file (projectile-completing-read "Find file: "
-                                                (projectile-dir-files directory))))
-          (find-file (expand-file-name file (projectile-project-root)))
-          (run-hooks 'projectile-find-file-hook))
-      ;; target directory is not in a project
-      (projectile-find-file))))
-
-(defun projectile-all-project-files ()
-  "Get a list of all files in all projects."
-  (-mapcat (lambda (project)
-             (when (file-exists-p project)
-               (let ((default-directory project))
-                 (-map (lambda (file)
-                         (expand-file-name file project))
-                       (projectile-current-project-files)))))
-           projectile-known-projects))
-
-;;;###autoload
-(defun projectile-find-file-in-known-projects ()
-  "Jump to a file in any of the known projects."
-  (interactive)
-  (let ((projectile-require-project-root nil))
-    (find-file (projectile-completing-read "Find file in projects: " (projectile-all-project-files)))))
-
-(defcustom projectile-switch-project-hook nil
-  "Hooks run when project is switched."
-  :group 'projectile
-  :type 'hook)
-
-(defun projectile-keep-project-p (project)
-  "Determine wether we should cleanup this project or not.
-
-It handles the case of remote files as well. See `projectile-cleanup-known-projects'."
-  ;; Taken from from `recentf-keep-default-predicate'
-  (cond
-   ((file-remote-p project nil t) (file-readable-p project))
-   ((file-remote-p project))
-   ((file-readable-p project))))
-
-;;;###autoload
-(defun projectile-cleanup-known-projects ()
-  "Remove known projects that don't exist anymore."
-  (interactive)
-  (projectile-merge-known-projects)
-  (let* ((separated-projects
-          (-separate #'projectile-keep-project-p projectile-known-projects))
-         (projects-kept (car separated-projects))
-         (projects-removed (cadr separated-projects)))
-    (setq projectile-known-projects projects-kept)
-    (projectile-merge-known-projects)
-    (if projects-removed
-        (message "Projects removed: %s"
-                 (mapconcat #'identity projects-removed ", "))
-      (message "No projects needed to be removed."))))
-
-;;;###autoload
-(defun projectile-clear-known-projects ()
-  "Clear both `projectile-known-projects' and `projectile-known-projects-file'."
-  (interactive)
-  (setq projectile-known-projects nil)
-  (projectile-save-known-projects))
-
-(defun projectile-remove-known-project (&optional project)
-  "Remove PROJECT from the list of known projects."
-  (interactive (list (projectile-completing-read "Remove from known projects: "
-                                                 projectile-known-projects)))
-  (setq projectile-known-projects
-        (--reject (string= project it) projectile-known-projects))
-  (projectile-merge-known-projects)
-  (when projectile-verbose
-    (message "Project %s removed from the list of known projects." project)))
-
-;;;###autoload
-(defun projectile-remove-current-project-from-known-projects ()
-  "Remove the current project from the list of known projects."
-  (interactive)
-  (projectile-remove-known-project (abbreviate-file-name (projectile-project-root))))
-
-(defun projectile-ignored-projects ()
-  "A list of projects that should not be save in `projectile-known-projects'."
-  (-map #'file-truename projectile-ignored-projects))
-
-(defun projectile-ignored-project-p (project-root)
-  "Return t if PROJECT-ROOT should not be added to `projectile-known-projects'."
-  (or (member project-root (projectile-ignored-projects))
-      (and (functionp projectile-ignored-project-function)
-           (funcall projectile-ignored-project-function project-root))))
-
-(defun projectile-add-known-project (project-root)
-  "Add PROJECT-ROOT to the list of known projects."
-  (unless (projectile-ignored-project-p project-root)
-    (setq projectile-known-projects
-          (-distinct
-           (cons (abbreviate-file-name project-root)
-                 projectile-known-projects)))))
-
-(defun projectile-load-known-projects ()
-  "Load saved projects from `projectile-known-projects-file'.
-Also set `projectile-known-projects'."
-  (setq projectile-known-projects
-        (projectile-unserialize projectile-known-projects-file))
-  (setq projectile-known-projects-on-file
-        (and (sequencep projectile-known-projects)
-             (copy-sequence projectile-known-projects))))
-
-;; load the known projects
-(projectile-load-known-projects)
-
-(defun projectile-save-known-projects ()
-  "Save PROJECTILE-KNOWN-PROJECTS to PROJECTILE-KNOWN-PROJECTS-FILE."
-  (projectile-serialize projectile-known-projects
-                        projectile-known-projects-file)
-  (setq projectile-known-projects-on-file
-        (and (sequencep projectile-known-projects)
-             (copy-sequence projectile-known-projects))))
-
-(defun projectile-merge-known-projects ()
-  "Merge any change from `projectile-known-projects-file' and save to disk.
-
-This enables multiple Emacs processes to make changes without
-overwriting each other's changes."
-  (let* ((known-now projectile-known-projects)
-         (known-on-last-sync projectile-known-projects-on-file)
-         (known-on-file
-          (projectile-unserialize projectile-known-projects-file))
-         (removed-after-sync (-difference known-on-last-sync known-now))
-         (removed-in-other-process
-          (-difference known-on-last-sync known-on-file))
-         (result (-distinct
-                  (-difference
-                   (-concat known-now known-on-file)
-                   (-concat removed-after-sync removed-in-other-process)))))
-    (setq projectile-known-projects result)
-    (projectile-save-known-projects)))
-
-(define-ibuffer-filter projectile-files
-  "Show Ibuffer with all buffers in the current project."
-  (:reader (read-directory-name "Project root: " (ignore-errors (projectile-project-root)))
-           :description nil)
-  (with-current-buffer buf
-    (equal (file-name-as-directory (expand-file-name qualifier))
-           (ignore-errors (projectile-project-root)))))
-
-(defun projectile-ibuffer-by-project (project-root)
-  "Open an IBuffer window showing all buffers in PROJECT-ROOT."
-  (let ((project-name (file-name-nondirectory (directory-file-name project-root))))
-    (ibuffer nil (format "*%s Buffers*" project-name)
-             (list (cons 'projectile-files project-root)))))
-
-(defun projectile-ibuffer (prefix)
-  "Open an IBuffer window showing all buffers in the current project.
-
-Let user choose another project when PREFIX is supplied."
-  (interactive "p")
-  (let ((project-root (if (= prefix 4)
-                          (projectile-completing-read
-                           "Project name: "
-                           (projectile-relevant-known-projects))
-                        (projectile-project-root))))
-
-    (projectile-ibuffer-by-project project-root)))
-
-;;;; projectile-commander
-
-(defconst projectile-commander-help-buffer "*Commander Help*")
-
-(defvar projectile-commander-methods nil
-  "List of file-selection methods for the `projectile-commander' command.
-Each element is a list (KEY DESCRIPTION FUNCTION).
-DESCRIPTION is a one-line description of what the key selects.")
-
-;;;###autoload
-(defun projectile-commander ()
-  "Execute a Projectile command with a single letter.
-The user is prompted for a single character indicating the action to invoke.
-The `?' character describes then
-available actions.
-
-See `def-projectile-commander-method' for defining new methods."
-  (interactive)
-  (-let* ((choices (-map #'car projectile-commander-methods))
-          (prompt (concat "Commander [" choices "]: "))
-          (ch (read-char-choice prompt choices))
-          ((_ _ fn) (assq ch projectile-commander-methods)))
-    (funcall fn)))
-
-(defmacro def-projectile-commander-method (key description &rest body)
-  "Define a new `projectile-commander' method.
-
-KEY is the key the user will enter to choose this method.
-
-DESCRIPTION is a one-line sentence describing how the method.
-
-BODY is a series of forms which are evaluated when the find
-is chosen."
-  (let ((method `(lambda ()
-                   ,@body)))
-    `(setq projectile-commander-methods
-           (--sort (< (car it) (car other))
-                   (cons (list ,key ,description ,method)
-                         (assq-delete-all ,key projectile-commander-methods))))))
-
-(def-projectile-commander-method ?? "Commander help buffer."
-  (ignore-errors (kill-buffer projectile-commander-help-buffer))
-  (with-current-buffer (get-buffer-create projectile-commander-help-buffer)
-    (insert "Projectile Commander Methods:\n\n")
-    (--each projectile-commander-methods
-      (-let [(key line _) it]
-        (insert (format "%c:\t%s\n" key line))))
-    (goto-char (point-min))
-    (help-mode)
-    (display-buffer (current-buffer) t))
-  (projectile-commander))
-
-(defun projectile-commander-bindings ()
-  (def-projectile-commander-method ?A
-    "Find ag on project."
-    (call-interactively 'projectile-ag))
-
-  (def-projectile-commander-method ?f
-    "Find file in project."
-    (projectile-find-file))
-
-  (def-projectile-commander-method ?T
-    "Find test file in project."
-    (projectile-find-test-file))
-
-  (def-projectile-commander-method ?b
-    "Switch to project buffer."
-    (projectile-switch-to-buffer))
-
-  (def-projectile-commander-method ?d
-    "Find directory in project."
-    (projectile-find-dir))
-
-  (def-projectile-commander-method ?D
-    "Open project root in dired."
-    (projectile-dired))
-
-  (def-projectile-commander-method ?v
-    "Open project root in vc-dir or magit."
-    (projectile-vc))
-
-  (def-projectile-commander-method ?r
-    "Replace a string in the project."
-    (projectile-replace))
-
-  (def-projectile-commander-method ?R
-    "Regenerate the project's [e|g]tags."
-    (projectile-regenerate-tags))
-
-  (def-projectile-commander-method ?g
-    "Run grep on project."
-    (projectile-grep))
-
-  (def-projectile-commander-method ?s
-    "Switch project."
-    (projectile-switch-project))
-
-  (def-projectile-commander-method ?o
-    "Run multi-occur on project buffers."
-    (projectile-multi-occur))
-
-  (def-projectile-commander-method ?j
-    "Find tag in project."
-    (projectile-find-tag))
-
-  (def-projectile-commander-method ?k
-    "Kill all project buffers."
-    (projectile-kill-buffers))
-
-  (def-projectile-commander-method ?e
-    "Find recently visited file in project."
-    (projectile-recentf)))
-
-(projectile-commander-bindings)
-
-;;; Minor mode
-(defvar projectile-command-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "4 a") #'projectile-find-other-file-other-window)
-    (define-key map (kbd "4 b") #'projectile-switch-to-buffer-other-window)
-    (define-key map (kbd "4 C-o") #'projectile-display-buffer)
-    (define-key map (kbd "4 d") #'projectile-find-dir-other-window)
-    (define-key map (kbd "4 f") #'projectile-find-file-other-window)
-    (define-key map (kbd "4 g") #'projectile-find-file-dwim-other-window)
-    (define-key map (kbd "4 t") #'projectile-find-implementation-or-test-other-window)
-    (define-key map (kbd "!") #'projectile-run-shell-command-in-root)
-    (define-key map (kbd "&") #'projectile-run-async-shell-command-in-root)
-    (define-key map (kbd "a") #'projectile-find-other-file)
-    (define-key map (kbd "b") #'projectile-switch-to-buffer)
-    (define-key map (kbd "c") #'projectile-compile-project)
-    (define-key map (kbd "d") #'projectile-find-dir)
-    (define-key map (kbd "D") #'projectile-dired)
-    (define-key map (kbd "e") #'projectile-recentf)
-    (define-key map (kbd "f") #'projectile-find-file)
-    (define-key map (kbd "g") #'projectile-find-file-dwim)
-    (define-key map (kbd "F") #'projectile-find-file-in-known-projects)
-    (define-key map (kbd "i") #'projectile-invalidate-cache)
-    (define-key map (kbd "I") #'projectile-ibuffer)
-    (define-key map (kbd "j") #'projectile-find-tag)
-    (define-key map (kbd "k") #'projectile-kill-buffers)
-    (define-key map (kbd "l") #'projectile-find-file-in-directory)
-    (define-key map (kbd "m") #'projectile-commander)
-    (define-key map (kbd "o") #'projectile-multi-occur)
-    (define-key map (kbd "p") #'projectile-switch-project)
-    (define-key map (kbd "P") #'projectile-test-project)
-    (define-key map (kbd "r") #'projectile-replace)
-    (define-key map (kbd "R") #'projectile-regenerate-tags)
-    (define-key map (kbd "s g") #'projectile-grep)
-    (define-key map (kbd "s s") #'projectile-ag)
-    (define-key map (kbd "S") #'projectile-save-project-buffers)
-    (define-key map (kbd "t") #'projectile-toggle-between-implementation-and-test)
-    (define-key map (kbd "T") #'projectile-find-test-file)
-    (define-key map (kbd "v") #'projectile-vc)
-    (define-key map (kbd "z") #'projectile-cache-current-file)
-    (define-key map (kbd "ESC") #'projectile-project-buffers-other-buffer)
-    map)
-  "Keymap for Projectile commands after `projectile-keymap-prefix'.")
-(fset 'projectile-command-map projectile-command-map)
-
-(defvar projectile-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map projectile-keymap-prefix 'projectile-command-map)
-    map)
-  "Keymap for Projectile mode.")
-
-(easy-menu-change
- '("Tools") "Projectile"
- '(["Find file" projectile-find-file]
-   ["Find file in known projects" projectile-find-file-in-known-projects]
-   ["Find test file" projectile-find-test-file]
-   ["Find directory" projectile-find-dir]
-   ["Find file in directory" projectile-find-file-in-directory]
-   ["Find other file" projectile-find-other-file]
-   ["Switch to buffer" projectile-switch-to-buffer]
-   ["Jump between implementation file and test file" projectile-toggle-between-implementation-and-test]
-   ["Kill project buffers" projectile-kill-buffers]
-   ["Recent files" projectile-recentf]
-   "--"
-   ["Open project in dired" projectile-dired]
-   ["Switch to project" projectile-switch-project]
-   ["Search in project (grep)" projectile-grep]
-   ["Search in project (ag)" projectile-ag]
-   ["Replace in project" projectile-replace]
-   ["Multi-occur in project" projectile-multi-occur]
-   "--"
-   ["Cache current file" projectile-cache-current-file]
-   ["Invalidate cache" projectile-invalidate-cache]
-   ["Regenerate [e|g]tags" projectile-regenerate-tags]
-   "--"
-   ["Compile project" projectile-compile-project]
-   ["Test project" projectile-test-project]
-   "--"
-   ["Project info" projectile-project-info]
-   ["About" projectile-version])
- "Search Files (Grep)...")
-
-(easy-menu-change '("Tools") "--" nil "Search Files (Grep)...")
-
-;;;###autoload
-(defcustom projectile-mode-line
-  '(:eval (format " Projectile[%s]" (projectile-project-name)))
-  "Mode line lighter for Projectile.
-
-The value of this variable is a mode line template as in
-`mode-line-format'.  See Info Node `(elisp)Mode Line Format' for
-details about mode line templates.
-
-Customize this variable to change how Projectile displays its
-status in the mode line.  The default value displays the project
-name.  Set this variable to nil to disable the mode line
-entirely."
-  :group 'projectile
-  :type 'sexp
-  :risky t
-  :package-version '(projectile "0.12.0"))
-
-;;;###autoload
-(define-minor-mode projectile-mode
-  "Minor mode to assist project management and navigation.
-
-When called interactively, toggle `projectile-mode'.  With prefix
-ARG, enable `projectile-mode' if ARG is positive, otherwise disable
-it.
-
-When called from Lisp, enable `projectile-mode' if ARG is omitted,
-nil or positive.  If ARG is `toggle', toggle `projectile-mode'.
-Otherwise behave as if called interactively.
-
-\\{projectile-mode-map}"
-  :lighter projectile-mode-line
-  :keymap projectile-mode-map
-  :group 'projectile
-  :require 'projectile
-  (cond
-   (projectile-mode
-    ;; initialize the projects cache if needed
-    (unless projectile-projects-cache
-      (setq projectile-projects-cache
-            (or (projectile-unserialize projectile-cache-file)
-                (make-hash-table :test 'equal))))
-    (add-hook 'find-file-hook #'projectile-cache-files-find-file-hook t t)
-    (add-hook 'find-file-hook #'projectile-cache-projects-find-file-hook t t)
-    (add-hook 'projectile-find-dir-hook #'projectile-cache-projects-find-file-hook)
-    (add-hook 'find-file-hook #'projectile-visit-project-tags-table t t)
-    (add-hook 'dired-before-readin-hook #'projectile-cache-projects-find-file-hook t t)
-    (ad-activate 'compilation-find-file)
-    (ad-activate 'delete-file))
-   (t
-    (remove-hook 'find-file-hook #'projectile-cache-files-find-file-hook t)
-    (remove-hook 'find-file-hook #'projectile-cache-projects-find-file-hook t)
-    (remove-hook 'find-file-hook #'projectile-visit-project-tags-table t)
-    (remove-hook 'dired-before-readin-hook #'projectile-cache-projects-find-file-hook t)
-    (ad-deactivate 'compilation-find-file)
-    (ad-deactivate 'delete-file))))
-
-;;;###autoload
-(define-globalized-minor-mode projectile-global-mode
-  projectile-mode
-  projectile-mode)
-
-(provide 'projectile)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
-;;; projectile.el ends here
diff --git a/emacs.d/elpa/projectile-20160115.23/projectile-autoloads.el b/emacs.d/elpa/projectile-20160115.23/projectile-autoloads.el
new file mode 100644
index 0000000..c8c63b6
--- /dev/null
+++ b/emacs.d/elpa/projectile-20160115.23/projectile-autoloads.el
@@ -0,0 +1,257 @@
+;;; projectile-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "projectile" "projectile.el" (22171 46547 0
+;;;;;;  0))
+;;; Generated autoloads from projectile.el
+
+(autoload 'projectile-cache-current-file "projectile" "\
+Add the currently visited file to the cache.
+
+\(fn)" t nil)
+
+(autoload 'projectile-switch-to-buffer "projectile" "\
+Switch to a project buffer.
+
+\(fn)" t nil)
+
+(autoload 'projectile-switch-to-buffer-other-window "projectile" "\
+Switch to a project buffer and show it in another window.
+
+\(fn)" t nil)
+
+(autoload 'projectile-display-buffer "projectile" "\
+Display a project buffer in another window without selecting it.
+
+\(fn)" t nil)
+
+(autoload 'projectile-project-buffers-other-buffer "projectile" "\
+Switch to the most recently selected buffer project buffer.
+Only buffers not visible in windows are returned.
+
+\(fn)" t nil)
+
+(autoload 'projectile-multi-occur "projectile" "\
+Do a `multi-occur' in the project's buffers.
+
+\(fn)" t nil)
+
+(autoload 'projectile-find-file-dwim "projectile" "\
+Jump to a project's files using completion based on context.
+
+With a prefix ARG invalidates the cache first.
+
+If point is on a filename, Projectile first tries to search for that
+file in project:
+
+- If it finds just a file, it switches to that file instantly.  This works even
+if the filename is incomplete, but there's only a single file in the current project
+that matches the filename at point.  For example, if there's only a single file named
+\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
+`projectile-find-file' still switches to \"projectile/projectile.el\" immediately
+ because this is the only filename that matches.
+
+- If it finds a list of files, the list is displayed for selecting.  A list of
+files is displayed when a filename appears more than one in the project or the
+filename at point is a prefix of more than two files in a project.  For example,
+if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
+the content of that directory.  If it is executed on a partial filename like
+ \"projectile/a\", a list of files with character 'a' in that directory is presented.
+
+- If it finds nothing, display a list of all files in project for selecting.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'projectile-find-file-dwim-other-window "projectile" "\
+Jump to a project's files using completion based on context in other window.
+
+With a prefix ARG invalidates the cache first.
+
+If point is on a filename, Projectile first tries to search for that
+file in project:
+
+- If it finds just a file, it switches to that file instantly.  This works even
+if the filename is incomplete, but there's only a single file in the current project
+that matches the filename at point.  For example, if there's only a single file named
+\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
+`projectile-find-file' still switches to \"projectile/projectile.el\"
+immediately because this is the only filename that matches.
+
+- If it finds a list of files, the list is displayed for selecting.  A list of
+files is displayed when a filename appears more than one in the project or the
+filename at point is a prefix of more than two files in a project.  For example,
+if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
+the content of that directory.  If it is executed on a partial filename
+like \"projectile/a\", a list of files with character 'a' in that directory
+is presented.
+
+- If it finds nothing, display a list of all files in project for selecting.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'projectile-find-file "projectile" "\
+Jump to a project's file using completion.
+With a prefix ARG invalidates the cache first.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'projectile-find-file-other-window "projectile" "\
+Jump to a project's file using completion and show it in another window.
+
+With a prefix ARG invalidates the cache first.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'projectile-find-implementation-or-test-other-window "projectile" "\
+Open matching implementation or test file in other window.
+
+\(fn)" t nil)
+
+(autoload 'projectile-toggle-between-implementation-and-test "projectile" "\
+Toggle between an implementation file and its test file.
+
+\(fn)" t nil)
+
+(autoload 'projectile-regenerate-tags "projectile" "\
+Regenerate the project's [e|g]tags.
+
+\(fn)" t nil)
+
+(autoload 'projectile-find-tag "projectile" "\
+Find tag in project.
+
+\(fn)" t nil)
+
+(autoload 'projectile-run-command-in-root "projectile" "\
+Invoke `execute-extended-command' in the project's root.
+
+\(fn)" t nil)
+
+(autoload 'projectile-run-shell-command-in-root "projectile" "\
+Invoke `shell-command' in the project's root.
+
+\(fn)" t nil)
+
+(autoload 'projectile-run-async-shell-command-in-root "projectile" "\
+Invoke `async-shell-command' in the project's root.
+
+\(fn)" t nil)
+
+(autoload 'projectile-kill-buffers "projectile" "\
+Kill all project buffers.
+
+\(fn)" t nil)
+
+(autoload 'projectile-save-project-buffers "projectile" "\
+Save all project buffers.
+
+\(fn)" t nil)
+
+(autoload 'projectile-dired "projectile" "\
+Open `dired' at the root of the project.
+
+\(fn)" t nil)
+
+(autoload 'projectile-vc "projectile" "\
+Open `vc-dir' at the root of the project.
+
+For git projects `magit-status-internal' is used if available.
+For hg projects `monky-status' is used if available.
+
+\(fn &optional PROJECT-ROOT)" t nil)
+
+(autoload 'projectile-recentf "projectile" "\
+Show a list of recently visited files in a project.
+
+\(fn)" t nil)
+
+(autoload 'projectile-find-file-in-known-projects "projectile" "\
+Jump to a file in any of the known projects.
+
+\(fn)" t nil)
+
+(autoload 'projectile-cleanup-known-projects "projectile" "\
+Remove known projects that don't exist anymore.
+
+\(fn)" t nil)
+
+(autoload 'projectile-clear-known-projects "projectile" "\
+Clear both `projectile-known-projects' and `projectile-known-projects-file'.
+
+\(fn)" t nil)
+
+(autoload 'projectile-remove-current-project-from-known-projects "projectile" "\
+Remove the current project from the list of known projects.
+
+\(fn)" t nil)
+
+(autoload 'projectile-commander "projectile" "\
+Execute a Projectile command with a single letter.
+The user is prompted for a single character indicating the action to invoke.
+The `?' character describes then
+available actions.
+
+See `def-projectile-commander-method' for defining new methods.
+
+\(fn)" t nil)
+
+(defvar projectile-mode-line '(:eval (if (file-remote-p default-directory) " Projectile" (format " Projectile[%s]" (projectile-project-name)))) "\
+Mode line lighter for Projectile.
+
+The value of this variable is a mode line template as in
+`mode-line-format'.  See Info Node `(elisp)Mode Line Format' for
+details about mode line templates.
+
+Customize this variable to change how Projectile displays its
+status in the mode line.  The default value displays the project
+name.  Set this variable to nil to disable the mode line
+entirely.")
+
+(custom-autoload 'projectile-mode-line "projectile" t)
+
+(autoload 'projectile-mode "projectile" "\
+Minor mode to assist project management and navigation.
+
+When called interactively, toggle `projectile-mode'.  With prefix
+ARG, enable `projectile-mode' if ARG is positive, otherwise disable
+it.
+
+When called from Lisp, enable `projectile-mode' if ARG is omitted,
+nil or positive.  If ARG is `toggle', toggle `projectile-mode'.
+Otherwise behave as if called interactively.
+
+\\{projectile-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar projectile-global-mode nil "\
+Non-nil if Projectile-Global mode is enabled.
+See the command `projectile-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `projectile-global-mode'.")
+
+(custom-autoload 'projectile-global-mode "projectile" nil)
+
+(autoload 'projectile-global-mode "projectile" "\
+Toggle Projectile mode in all buffers.
+With prefix ARG, enable Projectile-Global mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Projectile mode is enabled in all buffers where
+`projectile-mode' would do it.
+See `projectile-mode' for more information on Projectile mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; projectile-autoloads.el ends here
diff --git a/emacs.d/elpa/projectile-20160115.23/projectile-pkg.el b/emacs.d/elpa/projectile-20160115.23/projectile-pkg.el
new file mode 100644
index 0000000..5f150bd
--- /dev/null
+++ b/emacs.d/elpa/projectile-20160115.23/projectile-pkg.el
@@ -0,0 +1 @@
+(define-package "projectile" "20160115.23" "Manage and navigate projects in Emacs easily" '((dash "2.11.0") (pkg-info "0.4")) :url "https://github.com/bbatsov/projectile" :keywords '("project" "convenience"))
diff --git a/emacs.d/elpa/projectile-20160115.23/projectile.el b/emacs.d/elpa/projectile-20160115.23/projectile.el
new file mode 100644
index 0000000..7c4ab3a
--- /dev/null
+++ b/emacs.d/elpa/projectile-20160115.23/projectile.el
@@ -0,0 +1,2801 @@
+;;; projectile.el --- Manage and navigate projects in Emacs easily -*- lexical-binding: t -*-
+
+;; Copyright © 2011-2016 Bozhidar Batsov <bozhidar@batsov.com>
+
+;; Author: Bozhidar Batsov <bozhidar@batsov.com>
+;; URL: https://github.com/bbatsov/projectile
+;; Package-Version: 20160115.23
+;; Keywords: project, convenience
+;; Version: 0.13.0
+;; Package-Requires: ((dash "2.11.0") (pkg-info "0.4"))
+
+;; This file is NOT part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This library provides easy project management and navigation.  The
+;; concept of a project is pretty basic - just a folder containing
+;; special file.  Currently git, mercurial and bazaar repos are
+;; considered projects by default.  If you want to mark a folder
+;; manually as a project just create an empty .projectile file in
+;; it.  See the README for more details.
+;;
+;;; Code:
+
+(require 'thingatpt)
+(require 'dash)
+(require 'ibuffer)
+(require 'ibuf-ext)
+(require 'compile)
+(require 'grep)
+
+(eval-when-compile
+  (defvar ag-ignore-list)
+  (defvar ggtags-completion-table)
+  (defvar tags-completion-table))
+
+(declare-function ggtags-ensure-project "ggtags")
+(declare-function ggtags-update-tags "ggtags")
+(declare-function pkg-info-version-info "pkg-info")
+(declare-function tags-completion-table "etags")
+
+(defvar grep-files-aliases)
+(defvar grep-find-ignored-directories)
+(defvar grep-find-ignored-files)
+
+;;;; Compatibility
+(eval-and-compile
+  ;; Added in Emacs 24.3.
+  (unless (fboundp 'defvar-local)
+    (defmacro defvar-local (var val &optional docstring)
+      "Define VAR as a buffer-local variable with default value VAL.
+Like `defvar' but additionally marks the variable as being automatically
+buffer-local wherever it is set."
+      (declare (debug defvar) (doc-string 3))
+      `(progn
+         (defvar ,var ,val ,docstring)
+         (make-variable-buffer-local ',var))))
+
+  ;; Added in Emacs 24.4
+  (unless (fboundp 'string-suffix-p)
+    (defun string-suffix-p (suffix string  &optional ignore-case)
+      "Return non-nil if SUFFIX is a suffix of STRING.
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+      (let ((start-pos (- (length string) (length suffix))))
+        (and (>= start-pos 0)
+             (eq t (compare-strings suffix nil nil
+                                    string start-pos nil ignore-case))))))
+  )
+
+(defun projectile-trim-string (string)
+  "Remove whitespace at the beginning and end of STRING."
+  (->> string
+       (replace-regexp-in-string "\\`[ \t\n\r]+" "")
+       (replace-regexp-in-string "[ \t\n\r]+\\'" "")))
+
+
+;;; Customization
+(defgroup projectile nil
+  "Manage and navigate projects easily."
+  :group 'tools
+  :group 'convenience)
+
+(defcustom projectile-indexing-method (if (eq system-type 'windows-nt) 'native 'alien)
+  "Specifies the indexing method used by Projectile.
+
+There are two indexing methods - native and alien.
+
+The native method is implemented in Emacs Lisp (therefore it is
+native to Emacs).  It's advantage is that is portable and will
+work everywhere that Emacs does.  It's disadvantage is that is a
+bit slow (especially for large projects).  Generally it's a good
+idea to pair the native indexing method with caching.
+
+The alien indexing method uses external tools (e.g. git, find,
+etc) to speed up the indexing process.  The disadvantage of this
+method is that it's not well supported on Windows systems.
+
+By default alien indexing is the default on all operating
+systems, except Windows."
+  :group 'projectile
+  :type '(radio
+          (const :tag "Native" native)
+          (const :tag "Alien" alien)))
+
+(defcustom projectile-enable-caching (eq projectile-indexing-method 'native)
+  "When t enables project files caching.
+
+Project caching is automatically enabled by default if you're
+using the native indexing method."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-file-exists-local-cache-expire nil
+  "Number of seconds before file existence cache expires for a
+file on a local file system.
+
+ A value of nil disables this cache."
+
+  :group 'projectile
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds")))
+
+(defcustom projectile-file-exists-remote-cache-expire (* 5 60)
+  "Number of seconds before file existence cache expires for a
+file on a remote file system such as tramp.
+
+ A value of nil disables this cache."
+  :group 'projectile
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds")))
+
+(defcustom projectile-require-project-root t
+  "Require the presence of a project root to operate when true.
+Otherwise consider the current directory the project root."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-completion-system 'ido
+  "The completion system to be used by Projectile."
+  :group 'projectile
+  :type '(radio
+          (const :tag "Ido" ido)
+          (const :tag "Grizzl" grizzl)
+          (const :tag "Helm" helm)
+          (const :tag "Ivy" ivy)
+          (const :tag "Default" default)
+          (function :tag "Custom function")))
+
+(defcustom projectile-keymap-prefix (kbd "C-c p")
+  "Projectile keymap prefix."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-cache-file
+  (expand-file-name "projectile.cache" user-emacs-directory)
+  "The name of Projectile's cache file."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-tags-file-name "TAGS"
+  "The tags filename Projectile's going to use."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-tags-command "ctags -Re -f \"%s\" %s"
+  "The command Projectile's going to use to generate a TAGS file."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-sort-order 'default
+  "The sort order used for a project's files."
+  :group 'projectile
+  :type '(radio
+          (const :tag "default" default)
+          (const :tag "recentf" recentf)
+          (const :tag "recently active" recently-active)
+          (const :tag "access time" access-time)
+          (const :tag "modification time" modification-time)))
+
+(defcustom projectile-verbose t
+  "Echo messages that are not errors."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-buffers-filter-function nil
+  "A function used to filter the buffers in `projectile-project-buffers'.
+
+The function should accept and return a list of Emacs buffers.
+Two example filter functions are shipped by default -
+`projectile-buffers-with-file' and
+`projectile-buffers-with-file-or-process'."
+  :group 'projectile
+  :type 'symbol)
+
+(defcustom projectile-project-name nil
+  "If this value is non-nil, it will be used as project name.
+
+It has precedence over function `projectile-project-name-function'."
+  :group 'projectile
+  :type 'string
+  :package-version '(projectile . "0.14.0"))
+
+(defcustom projectile-project-name-function 'projectile-default-project-name
+  "A function that receives the project-root and returns the project name.
+
+If variable `projectile-project-name' is non-nil, this function will not be used."
+  :group 'projectile
+  :type 'symbol
+  :package-version '(projectile . "0.14.0"))
+
+(defcustom projectile-project-root-files
+  '("rebar.config"       ; Rebar project file
+    "project.clj"        ; Leiningen project file
+    "build.boot"         ; Boot-clj project file
+    "SConstruct"         ; Scons project file
+    "pom.xml"            ; Maven project file
+    "build.sbt"          ; SBT project file
+    "gradlew"            ; Gradle wrapper script
+    "build.gradle"       ; Gradle project file
+    "Gemfile"            ; Bundler file
+    "requirements.txt"   ; Pip file
+    "setup.py"           ; Setuptools file
+    "tox.ini"            ; Tox file
+    "package.json"       ; npm package file
+    "gulpfile.js"        ; Gulp build file
+    "Gruntfile.js"       ; Grunt project file
+    "bower.json"         ; Bower project file
+    "composer.json"      ; Composer project file
+    "Cargo.toml"         ; Cargo project file
+    "mix.exs"            ; Elixir mix project file
+    "stack.yaml"         ; Haskell's stack tool based project
+    "TAGS"               ; etags/ctags are usually in the root of project
+    "GTAGS"              ; GNU Global tags
+    )
+  "A list of files considered to mark the root of a project.
+The topmost match has precedence."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-project-root-files-bottom-up
+  '(".projectile" ; projectile project marker
+    ".git"        ; Git VCS root dir
+    ".hg"         ; Mercurial VCS root dir
+    ".fslckout"   ; Fossil VCS root dir
+    ".bzr"        ; Bazaar VCS root dir
+    "_darcs"      ; Darcs VCS root dir
+    )
+  "A list of files considered to mark the root of a project.
+The bottommost (parentmost) match has precedence."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-project-root-files-top-down-recurring
+  '(".svn" ; Svn VCS root dir
+    "CVS"  ; Csv VCS root dir
+    "Makefile")
+  "A list of files considered to mark the root of a project.
+The search starts at the top and descends down till a directory
+that contains a match file but its parent does not.  Thus, it's a
+bottommost match in the topmost sequence of directories
+containing a root file."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-project-root-files-functions
+  '(projectile-root-bottom-up
+    projectile-root-top-down
+    projectile-root-top-down-recurring)
+  "A list of functions for finding project roots."
+  :group 'projectile
+  :type '(repeat function))
+
+(defcustom projectile-globally-ignored-files
+  (list projectile-tags-file-name)
+  "A list of files globally ignored by projectile."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-globally-ignored-file-suffixes
+  nil
+  "A list of file suffixes globally ignored by projectile."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-globally-ignored-directories
+  '(".idea"
+    ".eunit"
+    ".git"
+    ".hg"
+    ".fslckout"
+    ".bzr"
+    "_darcs"
+    ".tox"
+    ".svn"
+    ".stack-work")
+  "A list of directories globally ignored by projectile."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-globally-ignored-modes
+  '("erc-mode"
+    "help-mode"
+    "completion-list-mode"
+    "Buffer-menu-mode"
+    "gnus-.*-mode"
+    "occur-mode")
+  "A list of regular expressions for major modes ignored by projectile.
+
+If a buffer is using a given major mode, projectile will ignore
+it for functions working with buffers."
+  :group 'projectile
+  :type '(repeat string))
+
+(defcustom projectile-globally-ignored-buffers nil
+  "A list of buffer-names ignored by projectile.
+
+If a buffer is in the list projectile will ignore
+it for functions working with buffers."
+  :group 'projectile
+  :type '(repeat string)
+  :package-version '(projectile . "0.12.0"))
+
+(defcustom projectile-find-file-hook nil
+  "Hooks run when a file is opened with `projectile-find-file'."
+  :group 'projectile
+  :type 'hook)
+
+(defcustom projectile-find-dir-hook nil
+  "Hooks run when a directory is opened with `projectile-find-dir'."
+  :group 'projectile
+  :type 'hook)
+
+(defcustom projectile-switch-project-action 'projectile-find-file
+  "Action invoked after switching projects with `projectile-switch-project'.
+
+Any function that does not take arguments will do."
+  :group 'projectile
+  :type 'symbol)
+
+(defcustom projectile-find-dir-includes-top-level nil
+  "If true, add top-level dir to options offered by `projectile-find-dir'."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-use-git-grep nil
+  "If true, use `vc-git-grep' in git projects."
+  :group 'projectile
+  :type 'boolean)
+
+(defcustom projectile-test-prefix-function 'projectile-test-prefix
+  "Function to find test files prefix based on PROJECT-TYPE."
+  :group 'projectile
+  :type 'function)
+
+(defcustom projectile-test-suffix-function 'projectile-test-suffix
+  "Function to find test files suffix based on PROJECT-TYPE."
+  :group 'projectile
+  :type 'function)
+
+
+;;; Idle Timer
+(defvar projectile-idle-timer nil
+  "The timer object created when `projectile-enable-idle-timer' is non-nil.")
+
+(defcustom projectile-idle-timer-seconds 30
+  "The idle period to use when `projectile-enable-idle-timer' is non-nil."
+  :group 'projectile
+  :type 'number)
+
+(defcustom projectile-idle-timer-hook '(projectile-regenerate-tags)
+  "The hook run when `projectile-enable-idle-timer' is non-nil."
+  :group 'projectile
+  :type '(repeat symbol))
+
+(defcustom projectile-enable-idle-timer nil
+  "Enables idle timer hook `projectile-idle-timer-functions'.
+
+When `projectile-enable-idle-timer' is non-nil, the hook
+`projectile-idle-timer-hook' is run each time Emacs has been idle
+for `projectile-idle-timer-seconds' seconds and we're in a
+project."
+  :group 'projectile
+  :set (lambda (symbol value)
+         (set symbol value)
+         (when projectile-idle-timer
+           (cancel-timer projectile-idle-timer))
+         (setq projectile-idle-timer nil)
+         (when projectile-enable-idle-timer
+           (setq projectile-idle-timer (run-with-idle-timer
+                                        projectile-idle-timer-seconds t
+                                        (lambda ()
+                                          (when (projectile-project-p)
+                                            (run-hooks 'projectile-idle-timer-hook)))))))
+  :type 'boolean)
+
+;;; Serialization
+(defun projectile-serialize (data filename)
+  "Serialize DATA to FILENAME.
+
+The saved data can be restored with `projectile-unserialize'."
+  (when (file-writable-p filename)
+    (with-temp-file filename
+      (insert (let (print-length) (prin1-to-string data))))))
+
+(defun projectile-unserialize (filename)
+  "Read data serialized by `projectile-serialize' from FILENAME."
+  (with-demoted-errors
+      "Error during file deserialization: %S"
+      (when (file-exists-p filename)
+        (with-temp-buffer
+          (insert-file-contents filename)
+          ;; this will blow up if the contents of the file aren't
+          ;; lisp data structures
+          (read (buffer-string))))))
+
+(defvar projectile-projects-cache nil
+  "A hashmap used to cache project file names to speed up related operations.")
+
+(defvar projectile-project-root-cache (make-hash-table :test 'equal)
+  "Cached value of function `projectile-project-root`.")
+
+(defvar projectile-project-type-cache (make-hash-table :test 'equal)
+  "A hashmap used to cache project type to speed up related operations.")
+
+(defvar projectile-known-projects nil
+  "List of locations where we have previously seen projects.
+The list of projects is ordered by the time they have been accessed.")
+
+(defvar projectile-known-projects-on-file nil
+  "List of known projects reference point.
+
+Contains a copy of `projectile-known-projects' when it was last
+synchronized with `projectile-known-projects-file'.")
+
+(defcustom projectile-known-projects-file
+  (expand-file-name "projectile-bookmarks.eld"
+                    user-emacs-directory)
+  "Name and location of the Projectile's known projects file."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-ignored-projects nil
+  "A list of projects not to be added to `projectile-known-projects'."
+  :group 'projectile
+  :type '(repeat :tag "Project list" directory)
+  :package-version '(projectile . "0.11.0"))
+
+(defcustom projectile-ignored-project-function nil
+  "Function to decide if a project is added to `projectile-known-projects'.
+
+Can be either nil, or a function that takes the truename of the
+project root as argument and returns non-nil if the project is to
+be ignored or nil otherwise.
+
+This function is only called if the project is not listed in
+`projectile-ignored-projects'.
+
+A suitable candidate would be `file-remote-p' to ignore remote
+projects."
+  :group 'projectile
+  :type '(choice
+          (const :tag "Nothing" nil)
+          (const :tag "Remote files" file-remote-p)
+          function)
+  :package-version '(projectile . "0.13.0"))
+
+
+;;; Version information
+
+(defun projectile-version (&optional show-version)
+  "Get the Projectile version as string.
+
+If called interactively or if SHOW-VERSION is non-nil, show the
+version in the echo area and the messages buffer.
+
+The returned string includes both, the version from package.el
+and the library version, if both a present and different.
+
+If the version number could not be determined, signal an error,
+if called interactively, or if SHOW-VERSION is non-nil, otherwise
+just return nil."
+  (interactive (list t))
+  (if (require 'pkg-info nil t)
+      (let ((version (pkg-info-version-info 'projectile)))
+        (when show-version
+          (message "Projectile version: %s" version))
+        version)
+    (error "Cannot determine version without package pkg-info")))
+
+
+;;; Caching
+(defvar projectile-file-exists-cache
+  (make-hash-table :test 'equal)
+  "Cached `projectile-file-exists-p' results.")
+
+(defvar projectile-file-exists-cache-timer nil
+  "Timer for scheduling`projectile-file-exists-cache-cleanup'.")
+
+(defun projectile-file-exists-cache-cleanup ()
+  "Removed timed out cache entries and reschedules or remove the
+timer if no more items are in the cache."
+  (let ((now (current-time)))
+    (maphash (lambda (key value)
+               (if (time-less-p (cdr value) now)
+                   (remhash key projectile-file-exists-cache)))
+             projectile-file-exists-cache)
+    (setq projectile-file-exists-cache-timer
+          (if (> (hash-table-count projectile-file-exists-cache) 0)
+              (run-with-timer 10 nil 'projectile-file-exists-cache-cleanup)))))
+
+(defun projectile-file-exists-p (filename)
+  "Return t if file FILENAME exist.
+A wrapper around `file-exists-p' with additional caching support."
+  (let* ((file-remote (file-remote-p filename))
+         (expire-seconds
+          (if file-remote
+              (and projectile-file-exists-remote-cache-expire
+                   (> projectile-file-exists-remote-cache-expire 0)
+                   projectile-file-exists-remote-cache-expire)
+            (and projectile-file-exists-local-cache-expire
+                 (> projectile-file-exists-local-cache-expire 0)
+                 projectile-file-exists-local-cache-expire)))
+         (remote-file-name-inhibit-cache (if expire-seconds
+                                             expire-seconds
+                                           remote-file-name-inhibit-cache)))
+    (if (not expire-seconds)
+        (file-exists-p filename)
+      (let* ((current-time (current-time))
+             (cached (gethash filename projectile-file-exists-cache))
+             (cached-value (if cached (car cached)))
+             (cached-expire (if cached (cdr cached)))
+             (cached-expired (if cached (time-less-p cached-expire current-time) t))
+             (value (or (and (not cached-expired) cached-value)
+                        (if (file-exists-p filename) 'found 'notfound))))
+        (when (or (not cached) cached-expired)
+          (puthash filename
+                   (cons value (time-add current-time (seconds-to-time expire-seconds)))
+                   projectile-file-exists-cache))
+        (unless projectile-file-exists-cache-timer
+          (setq projectile-file-exists-cache-timer
+                (run-with-timer 10 nil 'projectile-file-exists-cache-cleanup)))
+        (equal value 'found)))))
+
+(defun projectile-invalidate-cache (arg)
+  "Remove the current project's files from `projectile-projects-cache'.
+
+With a prefix argument ARG prompts for the name of the project whose cache
+to invalidate."
+  (interactive "P")
+  (let ((project-root
+         (if arg
+             (completing-read "Remove cache for: "
+                              (projectile-hash-keys projectile-projects-cache))
+           (projectile-project-root))))
+    (setq projectile-project-root-cache (make-hash-table :test 'equal))
+    (remhash project-root projectile-project-type-cache)
+    (remhash project-root projectile-projects-cache)
+    (projectile-serialize-cache)
+    (when projectile-verbose
+      (message "Invalidated Projectile cache for %s."
+               (propertize project-root 'face 'font-lock-keyword-face))))
+  (when (fboundp 'recentf-cleanup)
+    (recentf-cleanup)))
+
+(defun projectile-cache-project (project files)
+  "Cache PROJECTs FILES.
+The cache is created both in memory and on the hard drive."
+  (when projectile-enable-caching
+    (puthash project files projectile-projects-cache)
+    (projectile-serialize-cache)))
+
+(defun projectile-purge-file-from-cache (file)
+  "Purge FILE from the cache of the current project."
+  (interactive
+   (list (projectile-completing-read
+          "Remove file from cache: "
+          (projectile-current-project-files))))
+  (let* ((project-root (projectile-project-root))
+         (project-cache (gethash project-root projectile-projects-cache)))
+    (if (projectile-file-cached-p file project-root)
+        (progn
+          (puthash project-root (remove file project-cache) projectile-projects-cache)
+          (projectile-serialize-cache)
+          (when projectile-verbose
+            (message "%s removed from cache" file)))
+      (error "%s is not in the cache" file))))
+
+(defun projectile-purge-dir-from-cache (dir)
+  "Purge DIR from the cache of the current project."
+  (interactive
+   (list (projectile-completing-read
+          "Remove directory from cache: "
+          (projectile-current-project-dirs))))
+  (let* ((project-root (projectile-project-root))
+         (project-cache (gethash project-root projectile-projects-cache)))
+    (puthash project-root
+             (--filter (string-prefix-p dir it) project-cache)
+             projectile-projects-cache)))
+
+(defun projectile-file-cached-p (file project)
+  "Check if FILE is already in PROJECT cache."
+  (member file (gethash project projectile-projects-cache)))
+
+;;;###autoload
+(defun projectile-cache-current-file ()
+  "Add the currently visited file to the cache."
+  (interactive)
+  (let ((current-project (projectile-project-root)))
+    (when (gethash (projectile-project-root) projectile-projects-cache)
+      (let* ((abs-current-file (file-truename (buffer-file-name (current-buffer))))
+            (current-file (file-relative-name abs-current-file current-project)))
+      (unless (or (projectile-file-cached-p current-file current-project)
+                  (projectile-ignored-directory-p (file-name-directory abs-current-file))
+                  (projectile-ignored-file-p abs-current-file))
+        (puthash current-project
+                 (cons current-file (gethash current-project projectile-projects-cache))
+                 projectile-projects-cache)
+        (projectile-serialize-cache)
+        (message "File %s added to project %s cache."
+                 (propertize current-file 'face 'font-lock-keyword-face)
+                 (propertize current-project 'face 'font-lock-keyword-face)))))))
+
+;; cache opened files automatically to reduce the need for cache invalidation
+(defun projectile-cache-files-find-file-hook ()
+  "Function for caching files with `find-file-hook'."
+  (when (and projectile-enable-caching (projectile-project-p))
+    (projectile-cache-current-file)))
+
+(defun projectile-cache-projects-find-file-hook ()
+  "Function for caching projects with `find-file-hook'."
+  (when (projectile-project-p)
+    (let ((known-projects (and (sequencep projectile-known-projects)
+                               (copy-sequence projectile-known-projects))))
+      (projectile-add-known-project (projectile-project-root))
+      (unless (equal known-projects projectile-known-projects)
+        (projectile-merge-known-projects)))))
+
+
+(defun projectile-maybe-invalidate-cache (force)
+  "Invalidate if FORCE or project's dirconfig newer than cache."
+  (when (or force (file-newer-than-file-p (projectile-dirconfig-file)
+                                          projectile-cache-file))
+    (projectile-invalidate-cache nil)))
+
+
+(defadvice delete-file (before purge-from-projectile-cache (filename &optional trash))
+  (if (and projectile-enable-caching (projectile-project-p))
+      (let* ((project-root (projectile-project-root))
+             (true-filename (file-truename filename))
+             (relative-filename (file-relative-name true-filename project-root)))
+        (if (projectile-file-cached-p relative-filename project-root)
+            (projectile-purge-file-from-cache relative-filename)))))
+
+
+;;; Project root related utilities
+(defun projectile-parent (path)
+  "Return the parent directory of PATH.
+PATH may be a file or directory and directory paths may end with a slash."
+  (directory-file-name (file-name-directory (directory-file-name (expand-file-name path)))))
+
+(defun projectile-locate-dominating-file (file name)
+  "Look up the directory hierarchy from FILE for a directory containing NAME.
+Stop at the first parent directory containing a file NAME,
+and return the directory.  Return nil if not found.
+Instead of a string, NAME can also be a predicate taking one argument
+\(a directory) and returning a non-nil value if that directory is the one for
+which we're looking."
+  ;; copied from files.el (stripped comments) emacs-24 bzr branch 2014-03-28 10:20
+  (setq file (abbreviate-file-name file))
+  (let ((root nil)
+        try)
+    (while (not (or root
+                    (null file)
+                    (string-match locate-dominating-stop-dir-regexp file)))
+      (setq try (if (stringp name)
+                    (projectile-file-exists-p (expand-file-name name file))
+                  (funcall name file)))
+      (cond (try (setq root file))
+            ((equal file (setq file (file-name-directory
+                                     (directory-file-name file))))
+             (setq file nil))))
+    (and root (expand-file-name (file-name-as-directory root)))))
+
+(defun projectile-root-top-down (dir &optional list)
+  "Identify a project root in DIR by top-down search for files in LIST.
+If LIST is nil, use `projectile-project-root-files' instead.
+Return the first (topmost) matched directory or nil if not found."
+  (projectile-locate-dominating-file
+   dir
+   (lambda (dir)
+     (--first (projectile-file-exists-p (expand-file-name it dir))
+              (or list projectile-project-root-files)))))
+
+(defun projectile-root-bottom-up (dir &optional list)
+  "Identify a project root in DIR by bottom-up search for files in LIST.
+If LIST is nil, use `projectile-project-root-files-bottom-up' instead.
+Return the first (bottommost) matched directory or nil if not found."
+  (--some (projectile-locate-dominating-file dir it)
+          (or list projectile-project-root-files-bottom-up)))
+
+(defun projectile-root-top-down-recurring (dir &optional list)
+  "Identify a project root in DIR by recurring top-down search for files in LIST.
+If LIST is nil, use `projectile-project-root-files-top-down-recurring'
+instead.  Return the last (bottommost) matched directory in the
+topmost sequence of matched directories.  Nil otherwise."
+  (--some (projectile-locate-dominating-file
+           dir
+           (lambda (dir)
+             (and (projectile-file-exists-p (expand-file-name it dir))
+                  (or (string-match locate-dominating-stop-dir-regexp (projectile-parent dir))
+                      (not (projectile-file-exists-p (expand-file-name it (projectile-parent dir))))))))
+          (or list projectile-project-root-files-top-down-recurring)))
+
+(defun projectile-project-root ()
+  "Retrieves the root directory of a project if available.
+The current directory is assumed to be the project's root otherwise."
+  (let ((dir default-directory))
+    (or (--some (let* ((cache-key (format "%s-%s" it dir))
+                       (cache-value (gethash cache-key projectile-project-root-cache)))
+                  (if cache-value
+                      cache-value
+                    (let ((value (funcall it (file-truename dir))))
+                      (puthash cache-key value projectile-project-root-cache)
+                      value)))
+                projectile-project-root-files-functions)
+        (if projectile-require-project-root
+            (error "You're not in a project")
+          default-directory))))
+
+(defun projectile-file-truename (file-name)
+  "Return the truename of FILE-NAME.
+A thin wrapper around `file-truename' that handles nil."
+  (when file-name
+    (file-truename file-name)))
+
+(defun projectile-project-p ()
+  "Check if we're in a project."
+  (condition-case nil
+      (projectile-project-root)
+    (error nil)))
+
+(defun projectile-default-project-name (project-root)
+  "Default function used create project name to be displayed based on the value of PROJECT-ROOT."
+  (file-name-nondirectory (directory-file-name project-root)))
+
+(defun projectile-project-name ()
+  "Return project name."
+  (if projectile-project-name
+      projectile-project-name
+    (let ((project-root
+           (condition-case nil
+               (projectile-project-root)
+             (error nil))))
+      (if project-root
+          (funcall projectile-project-name-function project-root)
+        "-"))))
+
+
+;;; Project indexing
+(defun projectile-get-project-directories ()
+  "Get the list of project directories that are of interest to the user."
+  (-map (lambda (subdir) (concat (projectile-project-root) subdir))
+        (or (car (projectile-parse-dirconfig-file)) '(""))))
+
+(defun projectile-dir-files (directory)
+  "List the files in DIRECTORY and in its sub-directories.
+Files are returned as relative paths to the project root."
+  ;; check for a cache hit first if caching is enabled
+  (let ((files-list (and projectile-enable-caching
+                         (gethash directory projectile-projects-cache)))
+        (root (projectile-project-root)))
+    ;; cache disabled or cache miss
+    (or files-list
+        (if (eq projectile-indexing-method 'native)
+            (projectile-dir-files-native root directory)
+          ;; use external tools to get the project files
+          (projectile-remove-ignored (projectile-dir-files-external root directory))))))
+
+(defun projectile-dir-files-native (root directory)
+  "Get the files for ROOT under DIRECTORY using just Emacs Lisp."
+  (let ((progress-reporter
+         (make-progress-reporter
+          (format "Projectile is indexing %s"
+                  (propertize directory 'face 'font-lock-keyword-face)))))
+    ;; we need the files with paths relative to the project root
+    (-map (lambda (file) (file-relative-name file root))
+          (projectile-index-directory directory (projectile-patterns-to-ignore)
+                                      progress-reporter))))
+
+(defun projectile-dir-files-external (root directory)
+  "Get the files for ROOT under DIRECTORY using external tools."
+  (let ((default-directory directory))
+    (-map (lambda (file)
+            (file-relative-name (expand-file-name file directory) root))
+          (projectile-get-repo-files))))
+
+(defcustom projectile-git-command "git ls-files -zco --exclude-standard"
+  "Command used by projectile to get the files in a git project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-git-submodule-command "git submodule --quiet foreach 'echo $path' | tr '\\n' '\\0'"
+  "Command used by projectile to get the files in git submodules."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-hg-command "hg locate -0 -I ."
+  "Command used by projectile to get the files in a hg project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-fossil-command "fossil ls"
+  "Command used by projectile to get the files in a fossil project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-bzr-command "bzr ls -R --versioned -0"
+  "Command used by projectile to get the files in a bazaar project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-darcs-command "darcs show files -0 . "
+  "Command used by projectile to get the files in a darcs project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-svn-command "svn list -R . | grep -v '$/' | tr '\\n' '\\0'"
+  "Command used by projectile to get the files in a svn project."
+  :group 'projectile
+  :type 'string)
+
+(defcustom projectile-generic-command "find . -type f -print0"
+  "Command used by projectile to get the files in a generic project."
+  :group 'projectile
+  :type 'string)
+
+(defun projectile-get-ext-command ()
+  "Determine which external command to invoke based on the project's VCS."
+  (let ((vcs (projectile-project-vcs)))
+    (cond
+     ((eq vcs 'git) projectile-git-command)
+     ((eq vcs 'hg) projectile-hg-command)
+     ((eq vcs 'fossil) projectile-fossil-command)
+     ((eq vcs 'bzr) projectile-bzr-command)
+     ((eq vcs 'darcs) projectile-darcs-command)
+     ((eq vcs 'svn) projectile-svn-command)
+     (t projectile-generic-command))))
+
+(defun projectile-get-sub-projects-command ()
+  (let ((vcs (projectile-project-vcs)))
+    (cond
+     ((eq vcs 'git) projectile-git-submodule-command)
+     (t ""))))
+
+(defun projectile-get-all-sub-projects (project)
+  "Get all sub-projects for a given projects.
+PROJECT is base directory to start search recursively."
+  (let* ((default-directory project)
+         ;; search for sub-projects under current project `project'
+         (submodules (mapcar
+                      (lambda (s)
+                        (file-name-as-directory (expand-file-name s default-directory)))
+                      (projectile-files-via-ext-command (projectile-get-sub-projects-command)))))
+
+    (cond
+     ((null submodules)
+      nil)
+     (t
+      (nconc submodules (-flatten
+                         ;; recursively get sub-projects of each sub-project
+                         (mapcar (lambda (s)
+                                   (projectile-get-all-sub-projects s)) submodules)))))))
+
+(defun projectile-get-sub-projects-files ()
+  "Get files from sub-projects recursively."
+  (-flatten
+   (mapcar (lambda (s)
+             (let ((default-directory s))
+               (mapcar (lambda (f)
+                         (concat s f))
+                       (projectile-files-via-ext-command projectile-git-command))))
+           (condition-case nil
+               (projectile-get-all-sub-projects (projectile-project-root))
+             (error nil)))))
+
+(defun projectile-get-repo-files ()
+  "Get a list of the files in the project, including sub-projects."
+  (cond
+   ((eq (projectile-project-vcs) 'git)
+    (nconc (projectile-files-via-ext-command (projectile-get-ext-command))
+           (projectile-get-sub-projects-files)))
+   (t (projectile-files-via-ext-command (projectile-get-ext-command)))))
+
+(defun projectile-files-via-ext-command (command)
+  "Get a list of relative file names in the project root by executing COMMAND."
+  (split-string (shell-command-to-string command) "\0" t))
+
+(defun projectile-index-directory (directory patterns progress-reporter)
+  "Index DIRECTORY taking into account PATTERNS.
+The function calls itself recursively until all sub-directories
+have been indexed.  The PROGRESS-REPORTER is updated while the
+function is executing."
+  (--mapcat
+   (unless (or (and patterns (projectile-ignored-rel-p it directory patterns))
+               (member (file-name-nondirectory (directory-file-name it))
+                       '("." ".." ".svn" ".cvs")))
+     (progress-reporter-update progress-reporter)
+     (if (file-directory-p it)
+         (unless (projectile-ignored-directory-p
+                  (file-name-as-directory it))
+           (projectile-index-directory it patterns progress-reporter))
+       (unless (projectile-ignored-file-p it)
+         (list it))))
+   (directory-files directory t)))
+
+(defun projectile-remove-ignored (files)
+  "Remove ignored files and folders from FILES.
+
+Operates on filenames relative to the project root."
+  (let ((ignored (append (projectile-ignored-files-rel)
+                         (projectile-ignored-directories-rel))))
+    (-remove (lambda (file)
+               (or (--any-p (string-prefix-p it file) ignored)
+                   (--any-p (string-suffix-p it file) projectile-globally-ignored-file-suffixes)))
+             files)))
+
+
+(defun projectile-buffers-with-file (buffers)
+  "Return only those BUFFERS backed by files."
+  (--filter (buffer-file-name it) buffers))
+
+(defun projectile-buffers-with-file-or-process (buffers)
+  "Return only those BUFFERS backed by files or processes."
+  (--filter (or (buffer-file-name it)
+                (get-buffer-process it)) buffers))
+
+(defun projectile-project-buffers ()
+  "Get a list of project buffers."
+  (let* ((project-root (projectile-project-root))
+         (all-buffers (-filter (lambda (buffer)
+                                 (projectile-project-buffer-p buffer project-root))
+                               (buffer-list))))
+    (if projectile-buffers-filter-function
+        (funcall projectile-buffers-filter-function all-buffers)
+      all-buffers)))
+
+(defun projectile-process-current-project-buffers (action)
+  "Process the current project's buffers using ACTION."
+  (let ((project-buffers (projectile-project-buffers)))
+    (dolist (buffer project-buffers)
+      (funcall action buffer))))
+
+(defun projectile-project-buffer-files ()
+  "Get a list of project buffer files."
+  (let ((project-root (projectile-project-root)))
+    (->> (projectile-buffers-with-file (projectile-project-buffers))
+         (-map (lambda (buffer)
+                 (file-relative-name (buffer-file-name buffer) project-root))))))
+
+(defun projectile-project-buffer-p (buffer project-root)
+  "Check if BUFFER is under PROJECT-ROOT."
+  (with-current-buffer buffer
+    (and (not (string-prefix-p " " (buffer-name buffer)))
+         (not (projectile-ignored-buffer-p buffer))
+         (string-equal (file-remote-p default-directory)
+                       (file-remote-p project-root))
+         (not (string-match-p "^http\\(s\\)?://" default-directory))
+         (string-prefix-p project-root (file-truename default-directory)))))
+
+(defun projectile-ignored-buffer-p (buffer)
+  "Check if BUFFER should be ignored."
+  (or
+   (member (buffer-name buffer) projectile-globally-ignored-buffers)
+   (with-current-buffer buffer
+     (--any-p (string-match-p (concat "^" it "$")
+                              (symbol-name major-mode))
+              projectile-globally-ignored-modes))))
+
+(defun projectile-recently-active-files ()
+  "Get list of recently active files.
+
+Files are ordered by recently active buffers, and then recently
+opened through use of recentf."
+  (let ((project-buffer-files (projectile-project-buffer-files)))
+    (append project-buffer-files
+            (-difference (projectile-recentf-files)
+                         project-buffer-files))))
+
+(defun projectile-project-buffer-names ()
+  "Get a list of project buffer names."
+  (-map #'buffer-name (projectile-project-buffers)))
+
+(defun projectile-prepend-project-name (string)
+  "Prepend the current project's name to STRING."
+  (format "[%s] %s" (projectile-project-name) string))
+
+(defun projectile-read-buffer-to-switch (prompt)
+  "Read the name of a buffer to switch to, prompting with PROMPT.
+
+This function excludes the current buffer from the offered
+choices."
+  (projectile-completing-read
+   prompt
+   (-remove-item (buffer-name (current-buffer))
+                 (projectile-project-buffer-names))))
+
+;;;###autoload
+(defun projectile-switch-to-buffer ()
+  "Switch to a project buffer."
+  (interactive)
+  (switch-to-buffer
+   (projectile-read-buffer-to-switch "Switch to buffer: ")))
+
+;;;###autoload
+(defun projectile-switch-to-buffer-other-window ()
+  "Switch to a project buffer and show it in another window."
+  (interactive)
+  (switch-to-buffer-other-window
+   (projectile-read-buffer-to-switch "Switch to buffer: ")))
+
+;;;###autoload
+(defun projectile-display-buffer ()
+  "Display a project buffer in another window without selecting it."
+  (interactive)
+  (display-buffer
+   (projectile-completing-read
+    "Display buffer: "
+    (projectile-project-buffer-names))))
+
+;;;###autoload
+(defun projectile-project-buffers-other-buffer ()
+  "Switch to the most recently selected buffer project buffer.
+Only buffers not visible in windows are returned."
+  (interactive)
+  (switch-to-buffer (car (projectile-project-buffers-non-visible))) nil t)
+
+(defun projectile-project-buffers-non-visible ()
+  "Get a list of non visible project buffers."
+  (-filter (lambda (buffer)
+             (not (get-buffer-window buffer 'visible)))
+           (projectile-project-buffers)))
+
+;;;###autoload
+(defun projectile-multi-occur ()
+  "Do a `multi-occur' in the project's buffers."
+  (interactive)
+  (multi-occur (projectile-project-buffers)
+               (car (occur-read-primary-args))))
+
+(defun projectile-ignored-directory-p (directory)
+  "Check if DIRECTORY should be ignored."
+  (member directory (projectile-ignored-directories)))
+
+(defun projectile-ignored-file-p (file)
+  "Check if FILE should be ignored."
+  (member file (projectile-ignored-files)))
+
+(defun projectile-ignored-rel-p (file directory patterns)
+  "Check if FILE should be ignored relative to DIRECTORY according to PATTERNS."
+  (let ((default-directory directory))
+    (--any-p (or (string-suffix-p (directory-file-name it)
+                                  (directory-file-name file))
+                 (member file (file-expand-wildcards it t)))
+             patterns)))
+
+(defun projectile-ignored-files ()
+  "Return list of ignored files."
+  (-map
+   #'projectile-expand-root
+   (append
+    projectile-globally-ignored-files
+    (projectile-project-ignored-files))))
+
+(defun projectile-ignored-directories ()
+  "Return list of ignored directories."
+  (-map
+   #'file-name-as-directory
+   (-map
+    #'projectile-expand-root
+    (append
+     projectile-globally-ignored-directories
+     (projectile-project-ignored-directories)))))
+
+(defun projectile-ignored-directories-rel ()
+  "Return list of ignored directories, relative to the root."
+  (let ((project-root (projectile-project-root)))
+    (--map (file-relative-name it project-root) (projectile-ignored-directories))))
+
+(defun projectile-ignored-files-rel ()
+  "Return list of ignored files, relative to the root."
+  (let ((project-root (projectile-project-root)))
+    (--map (file-relative-name it project-root) (projectile-ignored-files))))
+
+(defun projectile-project-ignored-files ()
+  "Return list of project ignored files."
+  (-remove 'file-directory-p (projectile-project-ignored)))
+
+(defun projectile-project-ignored-directories ()
+  "Return list of project ignored directories."
+  (-filter 'file-directory-p (projectile-project-ignored)))
+
+(defun projectile-paths-to-ignore ()
+  "Return a list of ignored project paths."
+  (-non-nil (--map (and (string-prefix-p "/" it)
+                        ;; remove the leading /
+                        (substring it 1))
+                   (cdr (projectile-parse-dirconfig-file)))))
+
+(defun projectile-patterns-to-ignore ()
+  "Return a list of relative file patterns."
+  (--remove (string-prefix-p "/" it)
+            (cdr (projectile-parse-dirconfig-file))))
+
+(defun projectile-project-ignored ()
+  "Return list of project ignored files/directories."
+  (let ((paths (projectile-paths-to-ignore))
+        (default-directory (projectile-project-root)))
+    (-flatten (-map
+               (lambda (pattern)
+                 (or (file-expand-wildcards pattern t)
+                     (projectile-expand-root pattern)))
+               paths))))
+
+(defun projectile-dirconfig-file ()
+  "Return the absolute path to the project's dirconfig file."
+  (expand-file-name ".projectile" (projectile-project-root)))
+
+(defun projectile-parse-dirconfig-file ()
+  "Parse project ignore file and return directories to ignore and keep.
+
+The return value will be a cons, the car being the list of
+directories to keep, and the cdr being the list of files or
+directories to ignore.
+
+Strings starting with + will be added to the list of directories
+to keep, and strings starting with - will be added to the list of
+directories to ignore.  For backward compatibility, without a
+prefix the string will be assumed to be an ignore string."
+  (let (keep ignore (dirconfig (projectile-dirconfig-file)))
+    (when (projectile-file-exists-p dirconfig)
+      (with-temp-buffer
+        (insert-file-contents dirconfig)
+        (while (not (eobp))
+          (pcase (char-after)
+            (?+ (push (buffer-substring (1+ (point)) (line-end-position)) keep))
+            (?- (push (buffer-substring (1+ (point)) (line-end-position)) ignore))
+            (_  (push (buffer-substring     (point)  (line-end-position)) ignore)))
+          (forward-line)))
+      (cons (--map (file-name-as-directory (projectile-trim-string it))
+                   (delete "" (reverse keep)))
+            (-map  #'projectile-trim-string
+                   (delete "" (reverse ignore)))))))
+
+(defun projectile-expand-root (name)
+  "Expand NAME to project root.
+
+Never use on many files since it's going to recalculate the
+project-root for every file."
+  (expand-file-name name (projectile-project-root)))
+
+(defun projectile-completing-read (prompt choices &optional initial-input)
+  "Present a project tailored PROMPT with CHOICES."
+  (let ((prompt (projectile-prepend-project-name prompt)))
+    (cond
+     ((eq projectile-completion-system 'ido)
+      (ido-completing-read prompt choices nil nil initial-input))
+     ((eq projectile-completion-system 'default)
+      (completing-read prompt choices nil nil initial-input))
+     ((eq projectile-completion-system 'helm)
+      (if (fboundp 'helm-comp-read)
+          (helm-comp-read prompt choices
+                          :initial-input initial-input
+                          :candidates-in-buffer t
+                          :must-match 'confirm)
+        (user-error "Please install helm from \
+https://github.com/emacs-helm/helm")))
+     ((eq projectile-completion-system 'grizzl)
+      (if (and (fboundp 'grizzl-completing-read)
+               (fboundp 'grizzl-make-index))
+          (grizzl-completing-read prompt (grizzl-make-index choices))
+        (user-error "Please install grizzl from \
+https://github.com/d11wtq/grizzl")))
+     ((eq projectile-completion-system 'ivy)
+      (if (fboundp 'ivy-completing-read)
+          (ivy-completing-read prompt choices nil nil initial-input)
+        (user-error "Please install ivy from \
+https://github.com/abo-abo/swiper")))
+     (t (funcall projectile-completion-system prompt choices)))))
+
+(defun projectile-current-project-files ()
+  "Return a list of files for the current project."
+  (let ((files (and projectile-enable-caching
+                    (gethash (projectile-project-root) projectile-projects-cache))))
+    ;; nothing is cached
+    (unless files
+      (when projectile-enable-caching
+        (message "Empty cache. Projectile is initializing cache..."))
+      (setq files (-mapcat #'projectile-dir-files
+                           (projectile-get-project-directories)))
+      ;; cache the resulting list of files
+      (when projectile-enable-caching
+        (projectile-cache-project (projectile-project-root) files)))
+    (projectile-sort-files files)))
+
+(defun projectile-process-current-project-files (action)
+  "Process the current project's files using ACTION."
+  (let ((project-files (projectile-current-project-files))
+        (default-directory (projectile-project-root)))
+    (dolist (filename project-files)
+      (funcall action filename))))
+
+(defun projectile-current-project-dirs ()
+  "Return a list of dirs for the current project."
+  (-remove #'null (-distinct
+                   (-map #'file-name-directory
+                         (projectile-current-project-files)))))
+
+(defun projectile-hash-keys (hash)
+  "Return a list of all HASH keys."
+  (let (allkeys)
+    (maphash (lambda (k _v) (setq allkeys (cons k allkeys))) hash)
+    allkeys))
+
+
+;;; Interactive commands
+(defcustom projectile-other-file-alist
+  '(;; handle C/C++ extensions
+    ("cpp" . ("h" "hpp" "ipp"))
+    ("ipp" . ("h" "hpp" "cpp"))
+    ("hpp" . ("h" "ipp" "cpp"))
+    ("cxx" . ("h" "hxx" "ixx"))
+    ("ixx" . ("h" "hxx" "cxx"))
+    ("hxx" . ("h" "ixx" "cxx"))
+    ("c" . ("h"))
+    ("m" . ("h"))
+    ("mm" . ("h"))
+    ("h" . ("c" "cpp" "ipp" "hpp" "cxx" "ixx" "hxx" "m" "mm"))
+    ("cc" . ("hh"))
+    ("hh" . ("cc"))
+
+    ;; vertex shader and fragment shader extensions in glsl
+    ("vert" . ("frag"))
+    ("frag" . ("vert"))
+
+    ;; handle files with no extension
+    (nil . ("lock" "gpg"))
+    ("lock" . (""))
+    ("gpg" . (""))
+    )
+  "Alist of extensions for switching to file with the same name, using other extensions based on the extension of current file.")
+
+(defun projectile-find-other-file (&optional flex-matching)
+  "Switch between files with the same name but different extensions.
+With FLEX-MATCHING, match any file that contains the base name of current file.
+Other file extensions can be customized with the variable `projectile-other-file-alist'."
+  (interactive "P")
+  (-if-let (other-files (projectile-get-other-files (buffer-file-name) (projectile-current-project-files) flex-matching))
+      (if (= (length other-files) 1)
+          (find-file (expand-file-name (car other-files) (projectile-project-root)))
+        (find-file (expand-file-name (projectile-completing-read "Switch to: " other-files) (projectile-project-root))))
+    (error "No other file found")))
+
+(defun projectile-find-other-file-other-window (&optional flex-matching)
+  "Switch between files with the same name but different extensions in other window.
+With FLEX-MATCHING, match any file that contains the base name of current file.
+Other file extensions can be customized with the variable `projectile-other-file-alist'."
+  (interactive "P")
+  (-if-let (other-files (projectile-get-other-files (buffer-file-name) (projectile-current-project-files) flex-matching))
+      (if (= (length other-files) 1)
+          (find-file-other-window (expand-file-name (car other-files) (projectile-project-root)))
+        (find-file-other-window (expand-file-name (projectile-completing-read "Switch to: " other-files) (projectile-project-root))))
+    (error "No other file found")))
+
+(defun projectile--file-name-sans-extensions (file-name)
+  "Return FILE-NAME sans any extensions.
+The extensions, in a filename, are what follows the first '.', with the exception of a leading '.'"
+  (setq file-name (file-name-nondirectory file-name))
+  (substring file-name 0 (string-match "\\..*" file-name 1)))
+
+(defun projectile--file-name-extensions (file-name)
+  "Return FILE-NAME's extensions.
+The extensions, in a filename, are what follows the first '.', with the exception of a leading '.'"
+  ;;would it make sense to return nil instead of an empty string if no extensions are found?
+  (setq file-name (file-name-nondirectory file-name))
+  (substring file-name (-if-let (extensions-start (string-match "\\..*" file-name 1)) (1+ extensions-start) (length file-name))))
+
+(defun projectile-associated-file-name-extensions (file-name)
+  "Return projectile-other-file-extensions associated to FILE-NAME's extensions.
+If no associated other-file-extensions for the complete (nested) extension are found, remove subextensions from FILENAME's extensions until a match is found."
+  (let ((current-extensions (projectile--file-name-extensions (file-name-nondirectory file-name))))
+    (catch 'break
+      (while (not (string= "" current-extensions))
+        (-if-let (associated-extensions (cdr (assoc current-extensions projectile-other-file-alist)))
+            (throw 'break associated-extensions))
+        (setq current-extensions (projectile--file-name-extensions current-extensions))))))
+
+(defun projectile-get-other-files (current-file project-file-list &optional flex-matching)
+  "Narrow to files with the same names but different extensions.
+Returns a list of possible files for users to choose.
+
+With FLEX-MATCHING, match any file that contains the base name of current file"
+  (let* ((file-ext-list (projectile-associated-file-name-extensions current-file))
+         (fulldirname  (if (file-name-directory current-file)
+                           (file-name-directory current-file) "./"))
+         (dirname  (file-name-nondirectory (directory-file-name fulldirname)))
+         (filename (projectile--file-name-sans-extensions current-file))
+         (file-list (mapcar (lambda (ext)
+                              (if flex-matching
+                                  (concat ".*" filename ".*" "\." ext "\\'")
+                                (concat "^" filename
+                                        (unless (equal ext "")
+                                          (concat  "\." ext))
+                                        "\\'")))
+                            file-ext-list))
+         (candidates (-filter (lambda (project-file)
+                                (string-match filename project-file))
+                              project-file-list))
+         (candidates
+          (-flatten (mapcar
+                     (lambda (file)
+                       (-filter (lambda (project-file)
+                                  (string-match file
+                                                (concat (file-name-base project-file)
+                                                        (unless (equal (file-name-extension project-file) nil)
+                                                          (concat  "\." (file-name-extension project-file))))))
+                                candidates))
+                     file-list)))
+         (candidates
+          (-sort (lambda (file _)
+                   (let ((candidate-dirname (file-name-nondirectory (directory-file-name (file-name-directory file)))))
+                     (unless (equal fulldirname (file-name-directory file))
+                       (equal dirname candidate-dirname))))
+                 candidates)))
+    candidates))
+
+(defun projectile-select-files (project-files &optional arg)
+  "Select a list of files based on filename at point.
+
+With a prefix ARG invalidates the cache first."
+  (projectile-maybe-invalidate-cache arg)
+  (let* ((file (if (region-active-p)
+                   (buffer-substring (region-beginning) (region-end))
+                 (or (thing-at-point 'filename) "")))
+         (file (if (string-match "\\.?\\./" file)
+                   (file-relative-name (file-truename file) (projectile-project-root))
+                 file))
+         (files (if file
+                    (-filter (lambda (project-file)
+                               (string-match file project-file))
+                             project-files)
+                  nil)))
+    files))
+
+;;;###autoload
+(defun projectile-find-file-dwim (&optional arg)
+  "Jump to a project's files using completion based on context.
+
+With a prefix ARG invalidates the cache first.
+
+If point is on a filename, Projectile first tries to search for that
+file in project:
+
+- If it finds just a file, it switches to that file instantly.  This works even
+if the filename is incomplete, but there's only a single file in the current project
+that matches the filename at point.  For example, if there's only a single file named
+\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
+`projectile-find-file' still switches to \"projectile/projectile.el\" immediately
+ because this is the only filename that matches.
+
+- If it finds a list of files, the list is displayed for selecting.  A list of
+files is displayed when a filename appears more than one in the project or the
+filename at point is a prefix of more than two files in a project.  For example,
+if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
+the content of that directory.  If it is executed on a partial filename like
+ \"projectile/a\", a list of files with character 'a' in that directory is presented.
+
+- If it finds nothing, display a list of all files in project for selecting."
+  (interactive "P")
+  (let* ((project-files (projectile-current-project-files))
+         (files (projectile-select-files project-files arg)))
+    (cond
+     ((= (length files) 1)
+      (find-file (expand-file-name (car files) (projectile-project-root))))
+     ((> (length files) 1)
+      (find-file (expand-file-name (projectile-completing-read "Switch to: " files) (projectile-project-root))))
+     (t (find-file (expand-file-name (projectile-completing-read "Switch to: " project-files) (projectile-project-root)))))
+    (run-hooks 'projectile-find-file-hook)))
+
+;;;###autoload
+(defun projectile-find-file-dwim-other-window (&optional arg)
+  "Jump to a project's files using completion based on context in other window.
+
+With a prefix ARG invalidates the cache first.
+
+If point is on a filename, Projectile first tries to search for that
+file in project:
+
+- If it finds just a file, it switches to that file instantly.  This works even
+if the filename is incomplete, but there's only a single file in the current project
+that matches the filename at point.  For example, if there's only a single file named
+\"projectile/projectile.el\" but the current filename is \"projectile/proj\" (incomplete),
+`projectile-find-file' still switches to \"projectile/projectile.el\"
+immediately because this is the only filename that matches.
+
+- If it finds a list of files, the list is displayed for selecting.  A list of
+files is displayed when a filename appears more than one in the project or the
+filename at point is a prefix of more than two files in a project.  For example,
+if `projectile-find-file' is executed on a filepath like \"projectile/\", it lists
+the content of that directory.  If it is executed on a partial filename
+like \"projectile/a\", a list of files with character 'a' in that directory
+is presented.
+
+- If it finds nothing, display a list of all files in project for selecting."
+  (interactive "P")
+  (let* ((project-files (projectile-current-project-files))
+         (files (projectile-select-files project-files arg)))
+    (cond
+     ((= (length files) 1)
+      (find-file-other-window (expand-file-name (car files) (projectile-project-root))))
+     ((> (length files) 1)
+      (find-file-other-window (expand-file-name (projectile-completing-read "Switch to: " files) (projectile-project-root))))
+     (t (find-file-other-window (expand-file-name (projectile-completing-read "Switch to: " project-files) (projectile-project-root)))))
+    (run-hooks 'projectile-find-file-hook)))
+
+;;;###autoload
+(defun projectile-find-file (&optional arg)
+  "Jump to a project's file using completion.
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((file (projectile-completing-read "Find file: "
+                                          (projectile-current-project-files))))
+    (find-file (expand-file-name file (projectile-project-root)))
+    (run-hooks 'projectile-find-file-hook)))
+
+;;;###autoload
+(defun projectile-find-file-other-window (&optional arg)
+  "Jump to a project's file using completion and show it in another window.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((file (projectile-completing-read "Find file: "
+                                          (projectile-current-project-files))))
+    (find-file-other-window (expand-file-name file (projectile-project-root)))
+    (run-hooks 'projectile-find-file-hook)))
+
+(defun projectile-sort-files (files)
+  "Sort FILES according to `projectile-sort-order'."
+  (pcase projectile-sort-order
+    (`default files)
+    (`recentf (projectile-sort-by-recentf-first files))
+    (`recently-active (projectile-sort-by-recently-active-first files))
+    (`modification-time (projectile-sort-by-modification-time files))
+    (`access-time (projectile-sort-by-access-time files))))
+
+(defun projectile-sort-by-recentf-first (files)
+  "Sort FILES by a recent first scheme."
+  (let ((project-recentf-files (projectile-recentf-files)))
+    (append project-recentf-files
+            (-difference files project-recentf-files))))
+
+(defun projectile-sort-by-recently-active-first (files)
+  "Sort FILES by most recently active buffers or opened files."
+  (let ((project-recently-active-files (projectile-recently-active-files)))
+    (append project-recently-active-files
+            (-difference files project-recently-active-files))))
+
+(defun projectile-sort-by-modification-time (files)
+  "Sort FILES by modification time."
+  (let ((default-directory (projectile-project-root)))
+    (-sort (lambda (file1 file2)
+             (let ((file1-mtime (nth 5 (file-attributes file1)))
+                   (file2-mtime (nth 5 (file-attributes file2))))
+               (not (time-less-p file1-mtime file2-mtime))))
+           files)))
+
+(defun projectile-sort-by-access-time (files)
+  "Sort FILES by access time."
+  (let ((default-directory (projectile-project-root)))
+    (-sort (lambda (file1 file2)
+             (let ((file1-atime (nth 4 (file-attributes file1)))
+                   (file2-atime (nth 4 (file-attributes file2))))
+               (not (time-less-p file1-atime file2-atime))))
+           files)))
+
+(defun projectile-find-dir (&optional arg)
+  "Jump to a project's directory using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((dir (projectile-complete-dir)))
+    (dired (expand-file-name dir (projectile-project-root)))
+    (run-hooks 'projectile-find-dir-hook)))
+
+(defun projectile-find-dir-other-window (&optional arg)
+  "Jump to a project's directory in other window using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (when arg
+    (projectile-invalidate-cache nil))
+  (let ((dir (projectile-complete-dir)))
+    (dired-other-window (expand-file-name dir (projectile-project-root)))
+    (run-hooks 'projectile-find-dir-hook)))
+
+(defun projectile-complete-dir ()
+  (projectile-completing-read
+   "Find dir: "
+   (if projectile-find-dir-includes-top-level
+       (append '("./") (projectile-current-project-dirs))
+     (projectile-current-project-dirs))))
+
+(defun projectile-find-test-file (&optional arg)
+  "Jump to a project's test file using completion.
+
+With a prefix ARG invalidates the cache first."
+  (interactive "P")
+  (projectile-maybe-invalidate-cache arg)
+  (let ((file (projectile-completing-read "Find test file: "
+                                          (projectile-current-project-test-files))))
+    (find-file (expand-file-name file (projectile-project-root)))))
+
+(defun projectile-test-files (files)
+  "Return only the test FILES."
+  (-filter 'projectile-test-file-p files))
+
+(defun projectile-test-file-p (file)
+  "Check if FILE is a test file."
+  (or (--any? (string-prefix-p it (file-name-nondirectory file))
+              (-non-nil (list (funcall projectile-test-prefix-function (projectile-project-type)))))
+      (--any? (string-suffix-p it (file-name-sans-extension (file-name-nondirectory file)))
+              (-non-nil (list (funcall projectile-test-suffix-function (projectile-project-type)))))))
+
+(defun projectile-current-project-test-files ()
+  "Return a list of test files for the current project."
+  (projectile-test-files (projectile-current-project-files)))
+
+(defvar projectile-project-types (make-hash-table)
+  "A hash table holding all project types that are known to Projectile.")
+
+(defun projectile-register-project-type
+    (project-type marker-files &optional compile-cmd test-cmd run-cmd)
+  "Register a project type with projectile.
+
+A project type is defined by PROJECT-TYPE, a set of MARKER-FILES,
+a COMPILE-CMD, a TEST-CMD, and a RUN-CMD."
+  (puthash project-type (list 'marker-files marker-files
+                              'compile-command compile-cmd
+                              'test-command test-cmd
+                              'run-command run-cmd)
+           projectile-project-types))
+
+(projectile-register-project-type 'emacs-cask '("Cask") "cask install")
+(projectile-register-project-type 'rails-rspec '("Gemfile" "app" "lib" "db" "config" "spec") "bundle exec rails server" "bundle exec rspec")
+(projectile-register-project-type 'rails-test '("Gemfile" "app" "lib" "db" "config" "test") "bundle exec rails server" "bundle exec rake test")
+(projectile-register-project-type 'symfony '("composer.json" "app" "src" "vendor") "app/console server:run" "phpunit -c app ")
+(projectile-register-project-type 'ruby-rspec '("Gemfile" "lib" "spec") "bundle exec rake" "bundle exec rspec")
+(projectile-register-project-type 'ruby-test '("Gemfile" "lib" "test") "bundle exec rake" "bundle exec rake test")
+(projectile-register-project-type 'django '("manage.py") "python manage.py runserver" "python manage.py test")
+(projectile-register-project-type 'python-pip '("requirements.txt") "python setup.by build" "python -m unittest discover")
+(projectile-register-project-type 'python-pkg '("setup.py") "python setup.py build" "python -m unittest discover")
+(projectile-register-project-type 'python-tox '("tox.ini") nil "tox")
+(projectile-register-project-type 'scons '("SConstruct") "scons" "scons test")
+(projectile-register-project-type 'maven '("pom.xml") "mvn clean install" "mvn test")
+(projectile-register-project-type 'gradle '("build.gradle") "gradle build" "gradle test")
+(projectile-register-project-type 'gradlew '("gradlew") "./gradlew build" "./gradlew test")
+(projectile-register-project-type 'grails '("application.properties" "grails-app") "grails package" "grails test-app")
+(projectile-register-project-type 'lein-test '("project.clj") "lein compile" "lein test")
+(projectile-register-project-type 'lein-midje '("project.clj" ".midje.clj") "lein compile" "lein midje")
+(projectile-register-project-type 'boot-clj '("build.boot") "boot aot" "boot test")
+(projectile-register-project-type 'rebar '("rebar") "rebar" "rebar eunit")
+(projectile-register-project-type 'sbt '("build.sbt") "sbt compile" "sbt test")
+(projectile-register-project-type 'make '("Makefile") "make" "make test")
+(projectile-register-project-type 'grunt '("Gruntfile.js") "grunt" "grunt test")
+(projectile-register-project-type 'gulp '("gulpfile.js") "gulp" "gulp test")
+(projectile-register-project-type 'haskell-stack '("stack.yaml") "stack build" "stack build --test")
+(projectile-register-project-type 'haskell-cabal #'projectile-cabal "cabal build" "cabal test")
+(projectile-register-project-type 'rust-cargo '("Cargo.toml") "cargo build" "cargo test")
+(projectile-register-project-type 'r '("DESCRIPTION") "R CMD INSTALL ." (concat "R CMD check -o " temporary-file-directory " ."))
+(projectile-register-project-type 'go #'projectile-go "go build ./..." "go test ./...")
+
+(defun projectile-cabal ()
+  "Check if a project contains *.cabal files but no stack.yaml file."
+  (and (projectile-verify-file "*.cabal")
+       (not (projectile-verify-file "stack.yaml"))))
+
+(defun projectile-go ()
+  "Check if a project contains Go source files."
+  (-any? (lambda (file)
+           (string= (file-name-extension file) "go"))
+         (projectile-current-project-files)))
+
+(defcustom projectile-go-function 'projectile-go
+  "Function to determine if project's type is go."
+  :group 'projectile
+  :type 'function)
+
+(defvar-local projectile-project-type nil
+  "Buffer local var for overriding the auto-detected project type.
+Normally you'd set this from .dir-locals.el.")
+
+(defun projectile-detect-project-type ()
+  "Detect the type of the current project."
+  (let ((project-type (-first (lambda (project-type)
+                                (let ((marker (plist-get (gethash project-type projectile-project-types) 'marker-files)))
+                                  (if (listp marker)
+                                      (and (projectile-verify-files marker) project-type)
+                                    (and (funcall marker) project-type))))
+                              (projectile-hash-keys projectile-project-types))))
+    (when project-type
+      (puthash (projectile-project-root) project-type projectile-project-type-cache))
+    project-type))
+
+(defun projectile-project-type ()
+  "Determine the project's type based on its structure."
+  (if projectile-project-type
+      projectile-project-type
+    (or (gethash (projectile-project-root) projectile-project-type-cache)
+        (projectile-detect-project-type)
+        'generic)))
+
+(defun projectile-project-info ()
+  "Display info for current project."
+  (interactive)
+  (message "Project dir: %s ## Project VCS: %s ## Project type: %s"
+           (projectile-project-root)
+           (projectile-project-vcs)
+           (projectile-project-type)))
+
+(defun projectile-verify-files (files)
+  "Check whether all FILES exist in the current project."
+  (-all? 'projectile-verify-file files))
+
+(defun projectile-verify-file (file)
+  "Check whether FILE exists in the current project.
+Expands wildcards using `file-expand-wildcards' before checking."
+  (file-expand-wildcards (projectile-expand-root file)))
+
+(defun projectile-project-vcs (&optional project-root)
+  "Determine the VCS used by the project if any.
+PROJECT-ROOT is the targeted directory.  If nil, use
+`projectile-project-root'."
+  (or project-root (setq project-root (projectile-project-root)))
+  (cond
+   ((projectile-file-exists-p (expand-file-name ".git" project-root)) 'git)
+   ((projectile-file-exists-p (expand-file-name ".hg" project-root)) 'hg)
+   ((projectile-file-exists-p (expand-file-name ".fossil" project-root)) 'fossil)
+   ((projectile-file-exists-p (expand-file-name ".bzr" project-root)) 'bzr)
+   ((projectile-file-exists-p (expand-file-name "_darcs" project-root)) 'darcs)
+   ((projectile-file-exists-p (expand-file-name ".svn" project-root)) 'svn)
+   ((projectile-locate-dominating-file project-root ".git") 'git)
+   ((projectile-locate-dominating-file project-root ".hg") 'hg)
+   ((projectile-locate-dominating-file project-root ".fossil") 'fossil)
+   ((projectile-locate-dominating-file project-root ".bzr") 'bzr)
+   ((projectile-locate-dominating-file project-root "_darcs") 'darcs)
+   ((projectile-locate-dominating-file project-root ".svn") 'svn)
+   (t 'none)))
+
+(defun projectile--test-name-for-impl-name (impl-file-path)
+  (let* ((project-type (projectile-project-type))
+         (impl-file-name (file-name-sans-extension (file-name-nondirectory impl-file-path)))
+         (impl-file-ext (file-name-extension impl-file-path))
+         (test-prefix (funcall projectile-test-prefix-function project-type))
+         (test-suffix (funcall projectile-test-suffix-function project-type)))
+    (cond
+     (test-prefix (concat test-prefix impl-file-name "." impl-file-ext))
+     (test-suffix (concat impl-file-name test-suffix "." impl-file-ext))
+     (t (error "Project type not supported!")))))
+
+(defun projectile-create-test-file-for (impl-file-path)
+  (let* ((test-file (projectile--test-name-for-impl-name impl-file-path))
+         (test-dir (replace-regexp-in-string "src/" "test/" (file-name-directory impl-file-path))))
+    (unless (file-exists-p (expand-file-name test-file test-dir))
+      (progn (unless (file-exists-p test-dir)
+               (make-directory test-dir :create-parents))
+             (concat test-dir test-file)))))
+
+(defcustom projectile-create-missing-test-files nil
+  "During toggling, if non-nil enables creating test files if not found.
+
+When not-nil, every call to projectile-find-implementation-or-test-*
+creates test files if not found on the file system. Defaults to nil.
+It assumes the test/ folder is at the same level as src/."
+  :group 'projectile
+  :type 'boolean)
+
+(defun projectile-find-implementation-or-test (file-name)
+  "Given a FILE-NAME return the matching implementation or test filename."
+  (unless file-name (error "The current buffer is not visiting a file"))
+  (if (projectile-test-file-p file-name)
+      ;; find the matching impl file
+      (let ((impl-file (projectile-find-matching-file file-name)))
+        (if impl-file
+            (projectile-expand-root impl-file)
+          (error "No matching source file found")))
+    ;; find the matching test file
+    (let ((test-file (projectile-find-matching-test file-name)))
+      (if test-file
+          (projectile-expand-root test-file)
+        (if projectile-create-missing-test-files
+            (projectile-create-test-file-for file-name)
+          (error "No matching test file found"))))))
+
+;;;###autoload
+(defun projectile-find-implementation-or-test-other-window ()
+  "Open matching implementation or test file in other window."
+  (interactive)
+  (find-file-other-window
+   (projectile-find-implementation-or-test (buffer-file-name))))
+
+;;;###autoload
+(defun projectile-toggle-between-implementation-and-test ()
+  "Toggle between an implementation file and its test file."
+  (interactive)
+  (find-file
+   (projectile-find-implementation-or-test (buffer-file-name))))
+
+(defun projectile-test-prefix (project-type)
+  "Find default test files prefix based on PROJECT-TYPE."
+  (cond
+   ((member project-type '(django python-pip python-pkg python-tox)) "test_")
+   ((member project-type '(emacs-cask)) "test-")
+   ((member project-type '(lein-midje)) "t_")))
+
+(defun projectile-test-suffix (project-type)
+  "Find default test files suffix based on PROJECT-TYPE."
+  (cond
+   ((member project-type '(emacs-cask)) "-test")
+   ((member project-type '(rails-rspec ruby-rspec)) "_spec")
+   ((member project-type '(rails-test ruby-test lein-test boot-clj go)) "_test")
+   ((member project-type '(scons)) "test")
+   ((member project-type '(maven symfony)) "Test")
+   ((member project-type '(gradle gradlew grails)) "Spec")))
+
+(defun projectile-dirname-matching-count (a b)
+  "Count matching dirnames ascending file paths."
+  (setq a (reverse (split-string (file-name-directory a) "/" t))
+        b (reverse (split-string (file-name-directory b) "/" t)))
+  (let ((common 0))
+    (while (and a b (string-equal (pop a) (pop b)))
+      (setq common (1+ common)))
+    common))
+
+(defun projectile-group-file-candidates (file candidates)
+  "Group file candidates by dirname matching count."
+  (--sort (> (car it) (car other))
+          (--group-by (projectile-dirname-matching-count file it) candidates)))
+
+(defun projectile-find-matching-test (file)
+  "Compute the name of the test matching FILE."
+  (let* ((basename (file-name-nondirectory (file-name-sans-extension file)))
+         (test-prefix (projectile-test-prefix (projectile-project-type)))
+         (test-suffix (projectile-test-suffix (projectile-project-type)))
+         (candidates
+          (-filter (lambda (current-file)
+                     (let ((name (file-name-nondirectory
+                                  (file-name-sans-extension current-file))))
+                       (or (when test-prefix
+                             (string-equal name (concat test-prefix basename)))
+                           (when test-suffix
+                             (string-equal name (concat basename test-suffix))))))
+                   (projectile-current-project-files))))
+    (cond
+     ((null candidates) nil)
+     ((= (length candidates) 1) (car candidates))
+     (t (let ((grouped-candidates (projectile-group-file-candidates file candidates)))
+          (if (= (length (car grouped-candidates)) 2)
+              (-last-item (car grouped-candidates))
+            (projectile-completing-read "Switch to: " (--mapcat (cdr it) grouped-candidates))))))))
+
+(defun projectile-find-matching-file (test-file)
+  "Compute the name of a file matching TEST-FILE."
+  (let* ((basename (file-name-nondirectory (file-name-sans-extension test-file)))
+         (test-prefix (projectile-test-prefix (projectile-project-type)))
+         (test-suffix (projectile-test-suffix (projectile-project-type)))
+         (candidates
+          (-filter (lambda (current-file)
+                     (let ((name (file-name-nondirectory
+                                  (file-name-sans-extension current-file))))
+                       (or (when test-prefix
+                             (string-equal (concat test-prefix name) basename))
+                           (when test-suffix
+                             (string-equal (concat name test-suffix) basename)))))
+                   (projectile-current-project-files))))
+    (cond
+     ((null candidates) nil)
+     ((= (length candidates) 1) (car candidates))
+     (t (let ((grouped-candidates (projectile-group-file-candidates test-file candidates)))
+          (if (= (length (car grouped-candidates)) 2)
+              (-last-item (car grouped-candidates))
+            (projectile-completing-read "Switch to: " (--mapcat (cdr it) grouped-candidates))))))))
+
+(defun projectile-grep-default-files ()
+  "Try to find a default pattern for `projectile-grep'.
+This is a subset of `grep-read-files', where either a matching entry from
+`grep-files-aliases' or file name extension pattern is returned."
+  (when buffer-file-name
+    (let* ((fn (file-name-nondirectory buffer-file-name))
+           (default-alias
+             (let ((aliases (remove (assoc "all" grep-files-aliases)
+                                    grep-files-aliases))
+                   alias)
+               (while aliases
+                 (setq alias (car aliases)
+                       aliases (cdr aliases))
+                 (if (string-match (mapconcat
+                                    #'wildcard-to-regexp
+                                    (split-string (cdr alias) nil t)
+                                    "\\|")
+                                   fn)
+                     (setq aliases nil)
+                   (setq alias nil)))
+               (cdr alias)))
+           (default-extension
+             (let ((ext (file-name-extension fn)))
+               (and ext (concat "*." ext)))))
+      (or default-alias default-extension))))
+
+(defun projectile-grep (&optional regexp arg)
+  "Perform rgrep in the project.
+
+With a prefix ARG asks for files (globbing-aware) which to grep in.
+With prefix ARG of `-' (such as `M--'), default the files (without prompt),
+to `projectile-grep-default-files'.
+
+With REGEXP given, don't query the user for a regexp."
+  (interactive "i\nP")
+  (require 'grep) ;; for `rgrep'
+  (let* ((roots (projectile-get-project-directories))
+         (search-regexp (or regexp
+                            (read-string (projectile-prepend-project-name "Grep for: ")
+                                         (projectile-symbol-or-selection-at-point))))
+         (files (and arg (or (and (equal current-prefix-arg '-)
+                                  (projectile-grep-default-files))
+                             (read-string (projectile-prepend-project-name "Grep in: ")
+                                          (projectile-grep-default-files))))))
+    (dolist (root-dir roots)
+      (require 'vc-git) ;; for `vc-git-grep'
+      ;; in git projects users have the option to use `vc-git-grep' instead of `rgrep'
+      (if (and (eq (projectile-project-vcs) 'git)
+               projectile-use-git-grep
+               (fboundp 'vc-git-grep))
+          (vc-git-grep search-regexp (or files "") root-dir)
+        ;; paths for find-grep should relative and without trailing /
+        (let ((grep-find-ignored-directories
+               (-union (--map (directory-file-name (file-relative-name it root-dir))
+                              (projectile-ignored-directories))
+                       grep-find-ignored-directories))
+              (grep-find-ignored-files
+               (-union (-map (lambda (file)
+                               (file-relative-name file root-dir))
+                             (projectile-ignored-files))
+                       grep-find-ignored-files)))
+          (grep-compute-defaults)
+          (rgrep search-regexp (or files "* .*") root-dir))))))
+
+(defun projectile-ag (search-term &optional arg)
+  "Run an ag search with SEARCH-TERM in the project.
+
+With an optional prefix argument ARG SEARCH-TERM is interpreted as a
+regular expression."
+  (interactive
+   (list (read-from-minibuffer
+          (projectile-prepend-project-name (format "Ag %ssearch for: " (if current-prefix-arg "regexp " "")))
+          (projectile-symbol-or-selection-at-point))
+         current-prefix-arg))
+  (if (require 'ag nil 'noerror)
+      (let ((ag-command (if arg 'ag-regexp 'ag))
+            (ag-ignore-list (unless (eq (projectile-project-vcs) 'git)
+                              ;; ag supports git ignore files
+                              (-union ag-ignore-list
+                                      (append
+                                       (projectile-ignored-files-rel) (projectile-ignored-directories-rel)
+                                       grep-find-ignored-files grep-find-ignored-directories))))
+            ;; reset the prefix arg, otherwise it will affect the ag-command
+            (current-prefix-arg nil))
+        (funcall ag-command search-term (projectile-project-root)))
+    (error "Package 'ag' is not available")))
+
+(defun projectile-tags-exclude-patterns ()
+  "Return a string with exclude patterns for ctags."
+  (mapconcat (lambda (pattern) (format "--exclude=\"%s\""
+                                       (directory-file-name pattern)))
+             (projectile-ignored-directories-rel) " "))
+
+;;;###autoload
+(defun projectile-regenerate-tags ()
+  "Regenerate the project's [e|g]tags."
+  (interactive)
+  (if (boundp 'ggtags-mode)
+      (progn
+        (let* ((ggtags-project-root (projectile-project-root))
+               (default-directory ggtags-project-root))
+          (ggtags-ensure-project)
+          (ggtags-update-tags t)))
+    (let* ((project-root (projectile-project-root))
+           (tags-exclude (projectile-tags-exclude-patterns))
+           (default-directory project-root)
+           (tags-file (expand-file-name projectile-tags-file-name))
+           (command (format projectile-tags-command tags-file tags-exclude))
+           shell-output exit-code)
+      (with-temp-buffer
+        (setq exit-code
+              (call-process-shell-command command nil (current-buffer))
+              shell-output (projectile-trim-string
+                            (buffer-substring (point-min) (point-max)))))
+      (unless (zerop exit-code)
+        (error shell-output))
+      (visit-tags-table tags-file))))
+
+(defun projectile-visit-project-tags-table ()
+  "Visit the current project's tags table."
+  (when (projectile-project-p)
+    (let ((tags-file (projectile-expand-root projectile-tags-file-name)))
+      (when (file-exists-p tags-file)
+        (with-demoted-errors "Error loading tags-file: %s"
+          (visit-tags-table tags-file t))))))
+
+;;;###autoload
+(defun projectile-find-tag ()
+  "Find tag in project."
+  (interactive)
+  (projectile-visit-project-tags-table)
+  ;; Auto-discover the user's preference for tags
+  (let ((find-tag-fn (cond
+                      ((fboundp 'ggtags-find-tag-dwim)
+                       'ggtags-find-tag-dwim)
+                      ((fboundp 'etags-select-find-tag)
+                       'etags-select-find-tag)
+                      (t
+                       'find-tag))))
+    (call-interactively find-tag-fn)))
+
+(defmacro projectile-with-default-dir (dir &rest body)
+  "Invoke in DIR the BODY."
+  (declare (debug t) (indent 1))
+  `(let ((default-directory ,dir))
+     ,@body))
+
+;;;###autoload
+(defun projectile-run-command-in-root ()
+  "Invoke `execute-extended-command' in the project's root."
+  (interactive)
+  (projectile-with-default-dir (projectile-project-root)
+    (call-interactively 'execute-extended-command)))
+
+;;;###autoload
+(defun projectile-run-shell-command-in-root ()
+  "Invoke `shell-command' in the project's root."
+  (interactive)
+  (projectile-with-default-dir (projectile-project-root)
+    (call-interactively 'shell-command)))
+
+;;;###autoload
+(defun projectile-run-async-shell-command-in-root ()
+  "Invoke `async-shell-command' in the project's root."
+  (interactive)
+  (projectile-with-default-dir (projectile-project-root)
+    (call-interactively 'async-shell-command)))
+
+(defun projectile-files-in-project-directory (directory)
+  "Return a list of files in DIRECTORY."
+  (let ((dir (file-relative-name (expand-file-name directory)
+                                 (projectile-project-root))))
+    (--filter (string-prefix-p dir it)
+              (projectile-current-project-files))))
+
+(defun projectile-unixy-system-p ()
+  "Check to see if unixy text utilities are installed."
+  (--all? (executable-find it) '("grep" "cut" "uniq")))
+
+(defun projectile-files-from-cmd (cmd directory)
+  "Use a grep-like CMD to search for files within DIRECTORY.
+
+CMD should include the necessary search params and should output
+equivalently to grep -HlI (only unique matching filenames).
+Returns a list of expanded filenames."
+  (let ((default-directory directory))
+    (--map (concat directory
+                   (if (string-prefix-p "./" it) (substring it 2) it))
+           (-> (shell-command-to-string cmd)
+               projectile-trim-string
+               (split-string "\n+" t)))))
+
+(defun projectile-files-with-string (string directory)
+  "Return a list of all files containing STRING in DIRECTORY.
+
+Tries to use ag, ack, git-grep, and grep in that order.  If those
+are impossible (for instance on Windows), returns a list of all
+files in the project."
+  (if (projectile-unixy-system-p)
+      (let* ((search-term (shell-quote-argument string))
+             (cmd (cond ((executable-find "ag")
+                         (concat "ag --literal --nocolor --noheading -l -- "
+                                 search-term))
+                        ((executable-find "ack")
+                         (concat "ack --noheading --nocolor -l -- "
+                                 search-term))
+                        ((and (executable-find "git")
+                              (eq (projectile-project-vcs) 'git))
+                         (concat "git grep -HlI "
+                                 search-term))
+                        (t
+                         (concat "grep -rHlI "
+                                 search-term
+                                 " .")))))
+        (projectile-files-from-cmd cmd directory))
+    ;; we have to reject directories as a workaround to work with git submodules
+    (-reject #'file-directory-p
+             (-map #'projectile-expand-root (projectile-dir-files directory)))))
+
+(defun projectile-replace (&optional arg)
+  "Replace a string in the project using `tags-query-replace'.
+
+With a prefix argument ARG prompts you for a directory on which
+to run the replacement."
+  (interactive "P")
+  (let* ((old-text (read-string
+                    (projectile-prepend-project-name "Replace: ")
+                    (projectile-symbol-or-selection-at-point)))
+         (new-text (read-string
+                    (projectile-prepend-project-name
+                     (format "Replace %s with: " old-text))))
+         (directory (if arg
+                        (file-name-as-directory
+                         (read-directory-name "Replace in directory: "))
+                      (projectile-project-root)))
+         (files (projectile-files-with-string old-text directory)))
+    (tags-query-replace old-text new-text nil (cons 'list files))))
+
+(defun projectile-symbol-or-selection-at-point ()
+  "Get the symbol or selected text at point."
+  (if (use-region-p)
+      (buffer-substring-no-properties (region-beginning) (region-end))
+    (projectile-symbol-at-point)))
+
+(defun projectile-symbol-at-point ()
+  "Get the symbol at point and strip its properties."
+  (substring-no-properties (or (thing-at-point 'symbol) "")))
+
+;;;###autoload
+(defun projectile-kill-buffers ()
+  "Kill all project buffers."
+  (interactive)
+  (let ((name (projectile-project-name))
+        (buffers (projectile-project-buffers)))
+    (if (yes-or-no-p
+         (format "Are you sure you want to kill %d buffer(s) for '%s'? "
+                 (length buffers) name))
+        ;; we take care not to kill indirect buffers directly
+        ;; as we might encounter them after their base buffers are killed
+        (mapc #'kill-buffer (-remove 'buffer-base-buffer buffers)))))
+
+;;;###autoload
+(defun projectile-save-project-buffers ()
+  "Save all project buffers."
+  (interactive)
+  (--each (projectile-project-buffers)
+    (with-current-buffer it
+      (when buffer-file-name
+        (save-buffer)))))
+
+;;;###autoload
+(defun projectile-dired ()
+  "Open `dired' at the root of the project."
+  (interactive)
+  (dired (projectile-project-root)))
+
+;;;###autoload
+(defun projectile-vc (&optional project-root)
+  "Open `vc-dir' at the root of the project.
+
+For git projects `magit-status-internal' is used if available.
+For hg projects `monky-status' is used if available."
+  (interactive)
+  (or project-root (setq project-root (projectile-project-root)))
+  (let ((vcs (projectile-project-vcs project-root)))
+    (pcase vcs
+      (`git
+       (cond ((fboundp 'magit-status-internal)
+              (magit-status-internal project-root))
+             ((fboundp 'magit-status)
+              (with-no-warnings (magit-status project-root)))
+             (t
+              (vc-dir project-root))))
+      (`hg
+       (if (fboundp 'monky-status)
+           (monky-status project-root)
+         (vc-dir project-root)))
+      (_ (vc-dir project-root)))))
+
+;;;###autoload
+(defun projectile-recentf ()
+  "Show a list of recently visited files in a project."
+  (interactive)
+  (if (boundp 'recentf-list)
+      (find-file (projectile-expand-root (projectile-completing-read "Recently visited files: " (projectile-recentf-files))))
+    (message "recentf is not enabled")))
+
+(defun projectile-recentf-files ()
+  "Return a list of recently visited files in a project."
+  (and (boundp 'recentf-list)
+       (let ((project-root (projectile-project-root)))
+         (->> recentf-list
+              (--filter (string-prefix-p project-root it))
+              (--map (file-relative-name it project-root))))))
+
+(defun projectile-serialize-cache ()
+  "Serializes the memory cache to the hard drive."
+  (projectile-serialize projectile-projects-cache projectile-cache-file))
+
+(defvar projectile-compilation-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last compilation command used on them.")
+
+(defvar projectile-test-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last test command used on them.")
+
+(defvar projectile-run-cmd-map
+  (make-hash-table :test 'equal)
+  "A mapping between projects and the last run command used on them.")
+
+(defvar projectile-project-compilation-cmd nil
+  "The command to use with `projectile-compile-project'.
+It takes precedence over the default command for the project type when set.
+Should be set via .dir-locals.el.")
+
+(defvar projectile-project-compilation-dir nil
+  "The directory to use with `projectile-compile-project'.
+The directory path is relative to the project root.
+Should be set via .dir-locals.el.")
+
+(defvar projectile-project-test-cmd nil
+  "The command to use with `projectile-test-project'.
+It takes precedence over the default command for the project type when set.
+Should be set via .dir-locals.el.")
+
+(defvar projectile-project-run-cmd nil
+  "The command to use with `projectile-run-project'.
+It takes precedence over the default command for the project type when set.
+Should be set via .dir-locals.el.")
+
+(defun projectile-default-compilation-command (project-type)
+  "Retrieve default compilation command for PROJECT-TYPE."
+  (plist-get (gethash project-type projectile-project-types) 'compile-command))
+
+(defun projectile-default-test-command (project-type)
+  "Retrieve default test command for PROJECT-TYPE."
+  (plist-get (gethash project-type projectile-project-types) 'test-command))
+
+(defun projectile-default-run-command (project-type)
+  "Retrieve default run command for PROJECT-TYPE."
+  (plist-get (gethash project-type projectile-project-types) 'run-command))
+
+(defun projectile-compilation-command (compile-dir)
+  "Retrieve the compilation command for COMPILE-DIR."
+  (or (gethash compile-dir projectile-compilation-cmd-map)
+      projectile-project-compilation-cmd
+      (projectile-default-compilation-command (projectile-project-type))))
+
+(defun projectile-test-command (project)
+  "Retrieve the test command for PROJECT."
+  (or (gethash project projectile-test-cmd-map)
+      projectile-project-test-cmd
+      (projectile-default-test-command (projectile-project-type))))
+
+(defun projectile-run-command (project)
+  "Retrieve the run command for PROJECT."
+  (or (gethash project projectile-run-cmd-map)
+      projectile-project-run-cmd
+      (projectile-default-run-command (projectile-project-type))))
+
+(defun projectile-read-command (prompt command)
+  "Adapted from `compilation-read-command'."
+  (read-shell-command prompt command
+                      (if (equal (car compile-history) command)
+                          '(compile-history . 1)
+                        'compile-history)))
+
+(defun projectile-compilation-dir ()
+  "Choose the directory to use for project compilation."
+  (if projectile-project-compilation-dir
+      (file-truename
+       (concat (file-name-as-directory (projectile-project-root))
+               (file-name-as-directory projectile-project-compilation-dir)))
+    (projectile-project-root)))
+
+(defun projectile-maybe-read-command (arg default-cmd prompt)
+  "Prompt user for command unless DEFAULT-CMD is an Elisp function."
+  (if (and (or (stringp default-cmd) (null default-cmd))
+           (or compilation-read-command arg))
+      (projectile-read-command prompt default-cmd)
+    default-cmd))
+
+(defun projectile-run-compilation (cmd)
+  "Run external or Elisp compilation command CMD."
+  (if (functionp cmd)
+      (funcall cmd)
+    (compilation-start cmd)))
+
+(defun projectile-compile-project (arg &optional dir)
+  "Run project compilation command.
+
+Normally you'll be prompted for a compilation command, unless
+variable `compilation-read-command'.  You can force the prompt
+with a prefix ARG."
+  (interactive "P")
+  (let* ((project-root (projectile-project-root))
+         (default-directory (or dir (projectile-compilation-dir)))
+         (default-cmd (projectile-compilation-command default-directory))
+         (compilation-cmd (projectile-maybe-read-command arg default-cmd "Compile command: ")))
+    (puthash default-directory compilation-cmd projectile-compilation-cmd-map)
+    (save-some-buffers (not compilation-ask-about-save)
+                       (lambda ()
+                         (projectile-project-buffer-p (current-buffer)
+                                                      project-root)))
+    (projectile-run-compilation compilation-cmd)))
+
+(defadvice compilation-find-file (around projectile-compilation-find-file)
+  "Try to find a buffer for FILENAME, if we cannot find it,
+fallback to the original function."
+  (let ((filename (ad-get-arg 1)))
+    (ad-set-arg 1
+                (or
+                 (if (file-exists-p (expand-file-name filename))
+                     filename)
+                 ;; Try to find the filename using projectile
+                 (and (projectile-project-p)
+                      (let ((root (projectile-project-root))
+                            (dirs (cons "" (projectile-current-project-dirs))))
+                        (-when-let (full-filename (->> dirs
+                                                       (--map (expand-file-name filename (expand-file-name it root)))
+                                                       (-filter #'file-exists-p)
+                                                       (-first-item)))
+                          full-filename)))
+                 ;; Fall back to the old argument
+                 filename))
+    ad-do-it))
+
+;; TODO - factor this duplication out
+(defun projectile-test-project (arg)
+  "Run project test command.
+
+Normally you'll be prompted for a compilation command, unless
+variable `compilation-read-command'.  You can force the prompt
+with a prefix ARG."
+  (interactive "P")
+  (let* ((project-root (projectile-project-root))
+         (default-cmd (projectile-test-command project-root))
+         (test-cmd (projectile-maybe-read-command arg default-cmd "Test command: "))
+         (default-directory project-root))
+    (puthash project-root test-cmd projectile-test-cmd-map)
+    (projectile-run-compilation test-cmd)))
+
+(defun projectile-run-project (arg)
+  "Run project run command.
+
+Normally you'll be prompted for a compilation command, unless
+variable `compilation-read-command'.  You can force the prompt
+with a prefix ARG."
+  (interactive "P")
+  (let* ((project-root (projectile-project-root))
+         (default-cmd (projectile-run-command project-root))
+         (run-cmd (projectile-maybe-read-command arg default-cmd "Run command: "))
+         (default-directory project-root))
+    (puthash project-root run-cmd projectile-run-cmd-map)
+    (projectile-run-compilation run-cmd)))
+
+(defun projectile-open-projects ()
+  "Return a list of all open projects.
+An open project is a project with any open buffers."
+  (-distinct
+   (-non-nil
+    (-map (lambda (buffer)
+                      (with-current-buffer buffer
+                        (when (projectile-project-p)
+                          (abbreviate-file-name (projectile-project-root)))))
+          (buffer-list)))))
+
+(defun projectile--remove-current-project (projects)
+  "Remove the current project (if any) from the list of PROJECTS."
+  (if (projectile-project-p)
+      (-difference projects
+                   (list (abbreviate-file-name (projectile-project-root))))
+    projects))
+
+(defun projectile-relevant-known-projects ()
+  "Return a list of known projects except the current one (if present)."
+  (projectile--remove-current-project projectile-known-projects))
+
+(defun projectile-relevant-open-projects ()
+  "Return a list of open projects except the current one (if present)."
+  (projectile--remove-current-project (projectile-open-projects)))
+
+(defun projectile-switch-project (&optional arg)
+  "Switch to a project we have visited before.
+Invokes the command referenced by `projectile-switch-project-action' on switch.
+With a prefix ARG invokes `projectile-commander' instead of
+`projectile-switch-project-action.'"
+  (interactive "P")
+  (-if-let (projects (projectile-relevant-known-projects))
+      (projectile-switch-project-by-name
+       (projectile-completing-read "Switch to project: " projects)
+       arg)
+    (error "There are no known projects")))
+
+(defun projectile-switch-open-project (&optional arg)
+  "Switch to a project we have currently opened.
+Invokes the command referenced by `projectile-switch-project-action' on switch.
+With a prefix ARG invokes `projectile-commander' instead of
+`projectile-switch-project-action.'"
+  (interactive "P")
+  (-if-let (projects (projectile-relevant-open-projects))
+      (projectile-switch-project-by-name
+       (projectile-completing-read "Switch to open project: " projects)
+       arg)
+    (error "There are no open projects")))
+
+(defun projectile-switch-project-by-name (project-to-switch &optional arg)
+  "Switch to project by project name PROJECT-TO-SWITCH.
+Invokes the command referenced by `projectile-switch-project-action' on switch.
+With a prefix ARG invokes `projectile-commander' instead of
+`projectile-switch-project-action.'"
+  (let* ((default-directory project-to-switch)
+         (switch-project-action (if arg
+                                    'projectile-commander
+                                  projectile-switch-project-action)))
+    (run-hooks 'projectile-before-switch-project-hook)
+    (funcall switch-project-action)
+    (run-hooks 'projectile-after-switch-project-hook)))
+
+
+(defun projectile-find-file-in-directory (&optional directory)
+  "Jump to a file in a (maybe regular) DIRECTORY.
+
+This command will first prompt for the directory the file is in."
+  (interactive "DFind file in directory: ")
+  (let ((default-directory directory)
+        (projectile-require-project-root nil))
+    (if (projectile-project-p)
+        ;; target directory is in a project
+        (let ((file (projectile-completing-read "Find file: "
+                                                (projectile-dir-files directory))))
+          (find-file (expand-file-name file (projectile-project-root)))
+          (run-hooks 'projectile-find-file-hook))
+      ;; target directory is not in a project
+      (projectile-find-file))))
+
+(defun projectile-all-project-files ()
+  "Get a list of all files in all projects."
+  (-mapcat (lambda (project)
+             (when (file-exists-p project)
+               (let ((default-directory project))
+                 (-map (lambda (file)
+                         (expand-file-name file project))
+                       (projectile-current-project-files)))))
+           projectile-known-projects))
+
+;;;###autoload
+(defun projectile-find-file-in-known-projects ()
+  "Jump to a file in any of the known projects."
+  (interactive)
+  (let ((projectile-require-project-root nil))
+    (find-file (projectile-completing-read "Find file in projects: " (projectile-all-project-files)))))
+
+(defcustom projectile-after-switch-project-hook nil
+  "Hooks run right after project is switched."
+  :group 'projectile
+  :type 'hook)
+
+(defcustom projectile-before-switch-project-hook nil
+  "Hooks run when right before project is switched."
+  :group 'projectile
+  :type 'hook)
+
+(defun projectile-keep-project-p (project)
+  "Determine whether we should cleanup (remove) PROJECT or not.
+
+It handles the case of remote projects as well.
+See `projectile-cleanup-known-projects'."
+  ;; Taken from from `recentf-keep-default-predicate'
+  (cond
+   ((file-remote-p project nil t) (file-readable-p project))
+   ((file-remote-p project))
+   ((file-readable-p project))))
+
+;;;###autoload
+(defun projectile-cleanup-known-projects ()
+  "Remove known projects that don't exist anymore."
+  (interactive)
+  (projectile-merge-known-projects)
+  (let* ((separated-projects
+          (-separate #'projectile-keep-project-p projectile-known-projects))
+         (projects-kept (car separated-projects))
+         (projects-removed (cadr separated-projects)))
+    (setq projectile-known-projects projects-kept)
+    (projectile-merge-known-projects)
+    (if projects-removed
+        (message "Projects removed: %s"
+                 (mapconcat #'identity projects-removed ", "))
+      (message "No projects needed to be removed."))))
+
+;;;###autoload
+(defun projectile-clear-known-projects ()
+  "Clear both `projectile-known-projects' and `projectile-known-projects-file'."
+  (interactive)
+  (setq projectile-known-projects nil)
+  (projectile-save-known-projects))
+
+(defun projectile-remove-known-project (&optional project)
+  "Remove PROJECT from the list of known projects."
+  (interactive (list (projectile-completing-read "Remove from known projects: "
+                                                 projectile-known-projects)))
+  (setq projectile-known-projects
+        (--reject (string= project it) projectile-known-projects))
+  (projectile-merge-known-projects)
+  (when projectile-verbose
+    (message "Project %s removed from the list of known projects." project)))
+
+;;;###autoload
+(defun projectile-remove-current-project-from-known-projects ()
+  "Remove the current project from the list of known projects."
+  (interactive)
+  (projectile-remove-known-project (abbreviate-file-name (projectile-project-root))))
+
+(defun projectile-ignored-projects ()
+  "A list of projects that should not be save in `projectile-known-projects'."
+  (-map #'file-truename projectile-ignored-projects))
+
+(defun projectile-ignored-project-p (project-root)
+  "Return t if PROJECT-ROOT should not be added to `projectile-known-projects'."
+  (or (member project-root (projectile-ignored-projects))
+      (and (functionp projectile-ignored-project-function)
+           (funcall projectile-ignored-project-function project-root))))
+
+(defun projectile-add-known-project (project-root)
+  "Add PROJECT-ROOT to the list of known projects."
+  (unless (projectile-ignored-project-p project-root)
+    (setq projectile-known-projects
+          (-distinct
+           (cons (abbreviate-file-name project-root)
+                 projectile-known-projects)))))
+
+(defun projectile-load-known-projects ()
+  "Load saved projects from `projectile-known-projects-file'.
+Also set `projectile-known-projects'."
+  (setq projectile-known-projects
+        (projectile-unserialize projectile-known-projects-file))
+  (setq projectile-known-projects-on-file
+        (and (sequencep projectile-known-projects)
+             (copy-sequence projectile-known-projects))))
+
+;; load the known projects
+(projectile-load-known-projects)
+
+(defun projectile-save-known-projects ()
+  "Save PROJECTILE-KNOWN-PROJECTS to PROJECTILE-KNOWN-PROJECTS-FILE."
+  (projectile-serialize projectile-known-projects
+                        projectile-known-projects-file)
+  (setq projectile-known-projects-on-file
+        (and (sequencep projectile-known-projects)
+             (copy-sequence projectile-known-projects))))
+
+(defun projectile-merge-known-projects ()
+  "Merge any change from `projectile-known-projects-file' and save to disk.
+
+This enables multiple Emacs processes to make changes without
+overwriting each other's changes."
+  (let* ((known-now projectile-known-projects)
+         (known-on-last-sync projectile-known-projects-on-file)
+         (known-on-file
+          (projectile-unserialize projectile-known-projects-file))
+         (removed-after-sync (-difference known-on-last-sync known-now))
+         (removed-in-other-process
+          (-difference known-on-last-sync known-on-file))
+         (result (-distinct
+                  (-difference
+                   (-concat known-now known-on-file)
+                   (-concat removed-after-sync removed-in-other-process)))))
+    (setq projectile-known-projects result)
+    (projectile-save-known-projects)))
+
+(define-ibuffer-filter projectile-files
+  "Show Ibuffer with all buffers in the current project."
+  (:reader (read-directory-name "Project root: " (ignore-errors (projectile-project-root)))
+           :description nil)
+  (with-current-buffer buf
+    (equal (file-name-as-directory (expand-file-name qualifier))
+           (ignore-errors (projectile-project-root)))))
+
+(defun projectile-ibuffer-by-project (project-root)
+  "Open an IBuffer window showing all buffers in PROJECT-ROOT."
+  (let ((project-name (funcall projectile-project-name-function project-root)))
+    (ibuffer nil (format "*%s Buffers*" project-name)
+             (list (cons 'projectile-files project-root)))))
+
+(defun projectile-ibuffer (prefix)
+  "Open an IBuffer window showing all buffers in the current project.
+
+Let user choose another project when PREFIX is supplied."
+  (interactive "p")
+  (let ((project-root (if (= prefix 4)
+                          (projectile-completing-read
+                           "Project name: "
+                           (projectile-relevant-known-projects))
+                        (projectile-project-root))))
+
+    (projectile-ibuffer-by-project project-root)))
+
+;;;; projectile-commander
+
+(defconst projectile-commander-help-buffer "*Commander Help*")
+
+(defvar projectile-commander-methods nil
+  "List of file-selection methods for the `projectile-commander' command.
+Each element is a list (KEY DESCRIPTION FUNCTION).
+DESCRIPTION is a one-line description of what the key selects.")
+
+;;;###autoload
+(defun projectile-commander ()
+  "Execute a Projectile command with a single letter.
+The user is prompted for a single character indicating the action to invoke.
+The `?' character describes then
+available actions.
+
+See `def-projectile-commander-method' for defining new methods."
+  (interactive)
+  (-let* ((choices (-map #'car projectile-commander-methods))
+          (prompt (concat "Commander [" choices "]: "))
+          (ch (read-char-choice prompt choices))
+          ((_ _ fn) (assq ch projectile-commander-methods)))
+    (funcall fn)))
+
+(defmacro def-projectile-commander-method (key description &rest body)
+  "Define a new `projectile-commander' method.
+
+KEY is the key the user will enter to choose this method.
+
+DESCRIPTION is a one-line sentence describing how the method.
+
+BODY is a series of forms which are evaluated when the find
+is chosen."
+  (let ((method `(lambda ()
+                   ,@body)))
+    `(setq projectile-commander-methods
+           (--sort (< (car it) (car other))
+                   (cons (list ,key ,description ,method)
+                         (assq-delete-all ,key projectile-commander-methods))))))
+
+(def-projectile-commander-method ?? "Commander help buffer."
+  (ignore-errors (kill-buffer projectile-commander-help-buffer))
+  (with-current-buffer (get-buffer-create projectile-commander-help-buffer)
+    (insert "Projectile Commander Methods:\n\n")
+    (--each projectile-commander-methods
+      (-let [(key line _) it]
+        (insert (format "%c:\t%s\n" key line))))
+    (goto-char (point-min))
+    (help-mode)
+    (display-buffer (current-buffer) t))
+  (projectile-commander))
+
+(defun projectile-commander-bindings ()
+  (def-projectile-commander-method ?A
+    "Find ag on project."
+    (call-interactively 'projectile-ag))
+
+  (def-projectile-commander-method ?f
+    "Find file in project."
+    (projectile-find-file))
+
+  (def-projectile-commander-method ?T
+    "Find test file in project."
+    (projectile-find-test-file))
+
+  (def-projectile-commander-method ?b
+    "Switch to project buffer."
+    (projectile-switch-to-buffer))
+
+  (def-projectile-commander-method ?d
+    "Find directory in project."
+    (projectile-find-dir))
+
+  (def-projectile-commander-method ?D
+    "Open project root in dired."
+    (projectile-dired))
+
+  (def-projectile-commander-method ?v
+    "Open project root in vc-dir or magit."
+    (projectile-vc))
+
+  (def-projectile-commander-method ?r
+    "Replace a string in the project."
+    (projectile-replace))
+
+  (def-projectile-commander-method ?R
+    "Regenerate the project's [e|g]tags."
+    (projectile-regenerate-tags))
+
+  (def-projectile-commander-method ?g
+    "Run grep on project."
+    (projectile-grep))
+
+  (def-projectile-commander-method ?s
+    "Switch project."
+    (projectile-switch-project))
+
+  (def-projectile-commander-method ?o
+    "Run multi-occur on project buffers."
+    (projectile-multi-occur))
+
+  (def-projectile-commander-method ?j
+    "Find tag in project."
+    (projectile-find-tag))
+
+  (def-projectile-commander-method ?k
+    "Kill all project buffers."
+    (projectile-kill-buffers))
+
+  (def-projectile-commander-method ?e
+    "Find recently visited file in project."
+    (projectile-recentf)))
+
+(projectile-commander-bindings)
+
+;;; Minor mode
+(defvar projectile-command-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "4 a") #'projectile-find-other-file-other-window)
+    (define-key map (kbd "4 b") #'projectile-switch-to-buffer-other-window)
+    (define-key map (kbd "4 C-o") #'projectile-display-buffer)
+    (define-key map (kbd "4 d") #'projectile-find-dir-other-window)
+    (define-key map (kbd "4 f") #'projectile-find-file-other-window)
+    (define-key map (kbd "4 g") #'projectile-find-file-dwim-other-window)
+    (define-key map (kbd "4 t") #'projectile-find-implementation-or-test-other-window)
+    (define-key map (kbd "!") #'projectile-run-shell-command-in-root)
+    (define-key map (kbd "&") #'projectile-run-async-shell-command-in-root)
+    (define-key map (kbd "a") #'projectile-find-other-file)
+    (define-key map (kbd "b") #'projectile-switch-to-buffer)
+    (define-key map (kbd "c") #'projectile-compile-project)
+    (define-key map (kbd "d") #'projectile-find-dir)
+    (define-key map (kbd "D") #'projectile-dired)
+    (define-key map (kbd "e") #'projectile-recentf)
+    (define-key map (kbd "f") #'projectile-find-file)
+    (define-key map (kbd "g") #'projectile-find-file-dwim)
+    (define-key map (kbd "F") #'projectile-find-file-in-known-projects)
+    (define-key map (kbd "i") #'projectile-invalidate-cache)
+    (define-key map (kbd "I") #'projectile-ibuffer)
+    (define-key map (kbd "j") #'projectile-find-tag)
+    (define-key map (kbd "k") #'projectile-kill-buffers)
+    (define-key map (kbd "l") #'projectile-find-file-in-directory)
+    (define-key map (kbd "m") #'projectile-commander)
+    (define-key map (kbd "o") #'projectile-multi-occur)
+    (define-key map (kbd "p") #'projectile-switch-project)
+    (define-key map (kbd "q") #'projectile-switch-open-project)
+    (define-key map (kbd "P") #'projectile-test-project)
+    (define-key map (kbd "r") #'projectile-replace)
+    (define-key map (kbd "R") #'projectile-regenerate-tags)
+    (define-key map (kbd "s g") #'projectile-grep)
+    (define-key map (kbd "s s") #'projectile-ag)
+    (define-key map (kbd "S") #'projectile-save-project-buffers)
+    (define-key map (kbd "t") #'projectile-toggle-between-implementation-and-test)
+    (define-key map (kbd "T") #'projectile-find-test-file)
+    (define-key map (kbd "u") #'projectile-run-project)
+    (define-key map (kbd "v") #'projectile-vc)
+    (define-key map (kbd "z") #'projectile-cache-current-file)
+    (define-key map (kbd "ESC") #'projectile-project-buffers-other-buffer)
+    map)
+  "Keymap for Projectile commands after `projectile-keymap-prefix'.")
+(fset 'projectile-command-map projectile-command-map)
+
+(defvar projectile-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map projectile-keymap-prefix 'projectile-command-map)
+    map)
+  "Keymap for Projectile mode.")
+
+(easy-menu-change
+ '("Tools") "Projectile"
+ '(["Find file" projectile-find-file]
+   ["Find file in known projects" projectile-find-file-in-known-projects]
+   ["Find test file" projectile-find-test-file]
+   ["Find directory" projectile-find-dir]
+   ["Find file in directory" projectile-find-file-in-directory]
+   ["Find other file" projectile-find-other-file]
+   ["Switch to buffer" projectile-switch-to-buffer]
+   ["Jump between implementation file and test file" projectile-toggle-between-implementation-and-test]
+   ["Kill project buffers" projectile-kill-buffers]
+   ["Recent files" projectile-recentf]
+   "--"
+   ["Open project in dired" projectile-dired]
+   ["Switch to project" projectile-switch-project]
+   ["Switch to open project" projectile-switch-open-project]
+   ["Search in project (grep)" projectile-grep]
+   ["Search in project (ag)" projectile-ag]
+   ["Replace in project" projectile-replace]
+   ["Multi-occur in project" projectile-multi-occur]
+   "--"
+   ["Cache current file" projectile-cache-current-file]
+   ["Invalidate cache" projectile-invalidate-cache]
+   ["Regenerate [e|g]tags" projectile-regenerate-tags]
+   "--"
+   ["Compile project" projectile-compile-project]
+   ["Test project" projectile-test-project]
+   ["Run project" projectile-run-project]
+   "--"
+   ["Project info" projectile-project-info]
+   ["About" projectile-version])
+ "Search Files (Grep)...")
+
+(easy-menu-change '("Tools") "--" nil "Search Files (Grep)...")
+
+;;;###autoload
+(defcustom projectile-mode-line
+  '(:eval (if (file-remote-p default-directory)
+              " Projectile"
+            (format " Projectile[%s]" (projectile-project-name))))
+  "Mode line lighter for Projectile.
+
+The value of this variable is a mode line template as in
+`mode-line-format'.  See Info Node `(elisp)Mode Line Format' for
+details about mode line templates.
+
+Customize this variable to change how Projectile displays its
+status in the mode line.  The default value displays the project
+name.  Set this variable to nil to disable the mode line
+entirely."
+  :group 'projectile
+  :type 'sexp
+  :risky t
+  :package-version '(projectile "0.12.0"))
+
+;;;###autoload
+(define-minor-mode projectile-mode
+  "Minor mode to assist project management and navigation.
+
+When called interactively, toggle `projectile-mode'.  With prefix
+ARG, enable `projectile-mode' if ARG is positive, otherwise disable
+it.
+
+When called from Lisp, enable `projectile-mode' if ARG is omitted,
+nil or positive.  If ARG is `toggle', toggle `projectile-mode'.
+Otherwise behave as if called interactively.
+
+\\{projectile-mode-map}"
+  :lighter projectile-mode-line
+  :keymap projectile-mode-map
+  :group 'projectile
+  :require 'projectile
+  (cond
+   (projectile-mode
+    ;; initialize the projects cache if needed
+    (unless projectile-projects-cache
+      (setq projectile-projects-cache
+            (or (projectile-unserialize projectile-cache-file)
+                (make-hash-table :test 'equal))))
+    (add-hook 'find-file-hook #'projectile-cache-files-find-file-hook t t)
+    (add-hook 'find-file-hook #'projectile-cache-projects-find-file-hook t t)
+    (add-hook 'projectile-find-dir-hook #'projectile-cache-projects-find-file-hook)
+    (add-hook 'find-file-hook #'projectile-visit-project-tags-table t t)
+    (add-hook 'dired-before-readin-hook #'projectile-cache-projects-find-file-hook t t)
+    (ad-activate 'compilation-find-file)
+    (ad-activate 'delete-file))
+   (t
+    (remove-hook 'find-file-hook #'projectile-cache-files-find-file-hook t)
+    (remove-hook 'find-file-hook #'projectile-cache-projects-find-file-hook t)
+    (remove-hook 'find-file-hook #'projectile-visit-project-tags-table t)
+    (remove-hook 'dired-before-readin-hook #'projectile-cache-projects-find-file-hook t)
+    (ad-deactivate 'compilation-find-file)
+    (ad-deactivate 'delete-file))))
+
+;;;###autoload
+(define-globalized-minor-mode projectile-global-mode
+  projectile-mode
+  projectile-mode)
+
+(provide 'projectile)
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+
+;;; projectile.el ends here
diff --git a/emacs.d/elpa/pyvenv-20150503.941/pyvenv-autoloads.el b/emacs.d/elpa/pyvenv-20150503.941/pyvenv-autoloads.el
deleted file mode 100644
index 4e27739..0000000
--- a/emacs.d/elpa/pyvenv-20150503.941/pyvenv-autoloads.el
+++ /dev/null
@@ -1,71 +0,0 @@
-;;; pyvenv-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "pyvenv" "pyvenv.el" (21837 24191 0 0))
-;;; Generated autoloads from pyvenv.el
-
-(autoload 'pyvenv-activate "pyvenv" "\
-Activate the virtual environment in DIRECTORY.
-
-\(fn DIRECTORY)" t nil)
-
-(autoload 'pyvenv-deactivate "pyvenv" "\
-Deactivate any current virtual environment.
-
-\(fn)" t nil)
-
-(autoload 'pyvenv-workon "pyvenv" "\
-Activate a virtual environment from $WORKON_HOME.
-
-\(fn NAME)" t nil)
-
-(defvar pyvenv-mode nil "\
-Non-nil if Pyvenv mode is enabled.
-See the command `pyvenv-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 `pyvenv-mode'.")
-
-(custom-autoload 'pyvenv-mode "pyvenv" nil)
-
-(autoload 'pyvenv-mode "pyvenv" "\
-Global minor mode for pyvenv.
-
-Will show the current virtualenv in the mode line, and respect a
-`pyvenv-workon' setting in files.
-
-\(fn &optional ARG)" t nil)
-
-(defvar pyvenv-tracking-mode nil "\
-Non-nil if Pyvenv-Tracking mode is enabled.
-See the command `pyvenv-tracking-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 `pyvenv-tracking-mode'.")
-
-(custom-autoload 'pyvenv-tracking-mode "pyvenv" nil)
-
-(autoload 'pyvenv-tracking-mode "pyvenv" "\
-Global minor mode to track the current virtualenv.
-
-When this mode is active, pyvenv will activate a buffer-specific
-virtualenv whenever the user switches to a buffer with a
-buffer-local `pyvenv-workon' or `pyvenv-activate' variable.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'pyvenv-restart-python "pyvenv" "\
-Restart Python inferior processes.
-
-\(fn)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; pyvenv-autoloads.el ends here
diff --git a/emacs.d/elpa/pyvenv-20150503.941/pyvenv-pkg.el b/emacs.d/elpa/pyvenv-20150503.941/pyvenv-pkg.el
deleted file mode 100644
index c0013a6..0000000
--- a/emacs.d/elpa/pyvenv-20150503.941/pyvenv-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "pyvenv" "20150503.941" "Python virtual environment interface" 'nil :url "http://github.com/jorgenschaefer/pyvenv" :keywords '("python" "virtualenv" "tools"))
diff --git a/emacs.d/elpa/pyvenv-20150503.941/pyvenv.el b/emacs.d/elpa/pyvenv-20150503.941/pyvenv.el
deleted file mode 100644
index b68cbb6..0000000
--- a/emacs.d/elpa/pyvenv-20150503.941/pyvenv.el
+++ /dev/null
@@ -1,459 +0,0 @@
-;;; pyvenv.el --- Python virtual environment interface -*- lexical-binding: t -*-
-
-;; Copyright (C) 2013-2015  Jorgen Schaefer <contact@jorgenschaefer.de>
-
-;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
-;; URL: http://github.com/jorgenschaefer/pyvenv
-;; Package-Version: 20150503.941
-;; Version: 1.7
-;; Keywords: Python, Virtualenv, Tools
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 3
-;; of the License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This is a simple global minor mode which will replicate the changes
-;; done by virtualenv activation inside Emacs.
-
-;; The main entry points are `pyvenv-activate', which queries the user
-;; for a virtual environment directory to activate, and
-;; `pyvenv-workon', which queries for a virtual environment in
-;; $WORKON_HOME (from virtualenvwrapper.sh).
-
-;; If you want your inferior Python processes to be restarted
-;; automatically when you switch your virtual environment, add
-;; `pyvenv-restart-python' to `pyvenv-post-activate-hooks'.
-
-;;; Code:
-
-(require 'json)
-
-;; User customization
-
-(defgroup pyvenv nil
-  "Python Virtual Environment Interface."
-  :prefix "pyvenv-"
-  :group 'languages)
-
-(defcustom pyvenv-workon nil
-  "The intended virtualenv in the virtualenvwrapper directory.
-
-This is rarely useful to set globally. Rather, set this in file-
-or directory-local variables using \\[add-file-local-variable] or
-\\[add-dir-local-variable].
-
-When `pyvenv-mode' is enabled, pyvenv will switch to this
-virtualenv. If a virtualenv is already enabled, it will ask first."
-  :type 'pyvenv-workon
-  :safe #'stringp
-  :group 'pyvenv)
-
-(defcustom pyvenv-activate nil
-  "The intended virtualenv directory.
-
-This is rarely useful to set globally. Rather, set this in file-
-or directory-local variables using \\[add-file-local-variable] or
-\\[add-dir-local-variable].
-
-When `pyvenv-mode' is enabled, pyvenv will switch to this
-virtualenv. If a virtualenv is already enabled, it will ask first."
-  :type 'directory
-  :safe #'stringp
-  :group 'pyvenv)
-
-(defcustom pyvenv-tracking-ask-before-change nil
-  "Non-nil means pyvenv will ask before automatically changing a virtualenv.
-
-This can happen when a new file is opened with a buffer-local
-value (from file-local or directory-local variables) for
-`pyvenv-workon' or `pyvenv-workon', or if `pyvenv-tracking-mode'
-is active, after every command."
-  :type 'boolean
-  :group 'pyvenv)
-
-(defcustom pyvenv-virtualenvwrapper-python
-  (or (getenv "VIRTUALENVWRAPPER_PYTHON")
-      (executable-find "python"))
-  "The python process which has access to the virtualenvwrapper module.
-
-This should be $VIRTUALENVWRAPPER_PYTHON outside of Emacs, but
-virtualenvwrapper.sh does not export that variable. We make an
-educated guess, but that can be off."
-  :type '(file :must-match t)
-  :safe #'file-directory-p
-  :group 'pyvenv)
-
-;; API for other libraries
-
-(defvar pyvenv-virtual-env nil
-  "The current virtual environment.
-
-Do not set this variable directly; use `pyvenv-activate' or
-`pyvenv-workon'.")
-
-(defvar pyvenv-virtual-env-name nil
-  "The name of the current virtual environment.
-
-This is usually the base name of `pyvenv-virtual-env'.")
-
-(defvar pyvenv-pre-activate-hooks nil
-  "Hooks run before a virtual environment is activated.
-
-`pyvenv-virtual-env' is already set.")
-
-(defvar pyvenv-post-activate-hooks nil
-  "Hooks run after a virtual environment is activated.
-
-`pyvenv-virtual-env' is set.")
-
-(defvar pyvenv-pre-deactivate-hooks nil
-  "Hooks run before a virtual environment is deactivated.
-
-`pyvenv-virtual-env' is set.")
-
-(defvar pyvenv-post-deactivate-hooks nil
-  "Hooks run after a virtual environment is deactivated.
-
-`pyvenv-virtual-env' is still set.")
-
-(defvar pyvenv-mode-line-indicator '(pyvenv-virtual-env-name
-                                     ("[" pyvenv-virtual-env-name "] "))
-  "How `pyvenv-mode' will indicate the current environment in the mode line.")
-
-;; Internal code.
-
-(defvar pyvenv-old-process-environment nil
-  "The old process environment before the last activate.")
-
-(defvar pyvenv-old-exec-path nil
-  "The old exec path before the last activate.")
-
-;;;###autoload
-(defun pyvenv-activate (directory)
-  "Activate the virtual environment in DIRECTORY."
-  (interactive "DActivate venv: ")
-  (setq directory (expand-file-name directory))
-  (pyvenv-deactivate)
-  (setq pyvenv-virtual-env directory
-        pyvenv-virtual-env-name (file-name-nondirectory directory)
-        python-shell-virtualenv-path directory
-        python-shell-virtualenv-root directory)
-  ;; Preserve variables from being overwritten.
-  (let ((old-exec-path exec-path)
-        (old-process-environment process-environment))
-    (unwind-protect
-        (pyvenv-run-virtualenvwrapper-hook "pre_activate" pyvenv-virtual-env)
-      (setq exec-path old-exec-path
-            process-environment old-process-environment)))
-  (run-hooks 'pyvenv-pre-activate-hooks)
-  (setq pyvenv-old-exec-path exec-path
-        pyvenv-old-process-environment process-environment
-        ;; For some reason, Emacs adds some directories to `exec-path'
-        ;; but not to `process-environment'?
-        exec-path (if (file-exists-p (format "%s/Scripts" directory))
-                      (cons (format "%s/Scripts" directory) exec-path)
-                    (cons (format "%s/bin" directory) exec-path))
-        process-environment (append
-                             (list
-                              (format "VIRTUAL_ENV=%s" directory)
-                              (format "PATH=%s" (mapconcat (lambda (x)
-                                                             (or x "."))
-                                                           exec-path
-                                                           path-separator))
-                              ;; No "=" means to unset
-                              "PYTHONHOME")
-                             process-environment)
-        )
-  (pyvenv-run-virtualenvwrapper-hook "post_activate")
-  (run-hooks 'pyvenv-post-activate-hooks))
-
-;;;###autoload
-(defun pyvenv-deactivate ()
-  "Deactivate any current virtual environment."
-  (interactive)
-  (when pyvenv-virtual-env
-    (pyvenv-run-virtualenvwrapper-hook "pre_deactivate")
-    (run-hooks 'pyvenv-pre-deactivate-hooks))
-  (when pyvenv-old-process-environment
-    (setq process-environment pyvenv-old-process-environment
-          pyvenv-old-process-environment nil))
-  (when pyvenv-old-exec-path
-    (setq exec-path pyvenv-old-exec-path
-          pyvenv-old-exec-path nil))
-  (when pyvenv-virtual-env
-    ;; Make sure this does not change `exec-path', as $PATH is
-    ;; different
-    (let ((old-exec-path exec-path)
-          (old-process-environment process-environment))
-      (unwind-protect
-          (pyvenv-run-virtualenvwrapper-hook "post_deactivate"
-                                             pyvenv-virtual-env)
-        (setq exec-path old-exec-path
-              process-environment old-process-environment)))
-    (run-hooks 'pyvenv-post-deactivate-hooks))
-  (setq pyvenv-virtual-env nil
-        pyvenv-virtual-env-name nil
-        python-shell-virtualenv-root nil
-        python-shell-virtualenv-path nil))
-
-(defvar pyvenv-workon-history nil
-  "Prompt history for `pyvenv-workon'.")
-
-;;;###autoload
-(defun pyvenv-workon (name)
-  "Activate a virtual environment from $WORKON_HOME."
-  (interactive
-   (list
-    (completing-read "Work on: " (pyvenv-virtualenv-list)
-                     nil t nil 'pyvenv-workon-history nil nil)))
-  (when (not (or (equal name "")
-                 ;; Some completion frameworks can return nil for the
-                 ;; default, see
-                 ;; https://github.com/jorgenschaefer/elpy/issues/144
-                 (equal name nil)))
-    (pyvenv-activate (format "%s/%s"
-                             (pyvenv-workon-home)
-                             name))))
-
-(defun pyvenv-virtualenv-list (&optional noerror)
-  "Prompt the user for a name in $WORKON_HOME.
-
-If NOERROR is set, do not raise an error if WORKON_HOME is not
-configured."
-  (let ((workon-home (pyvenv-workon-home))
-        (result nil))
-    (if (not (file-directory-p workon-home))
-        (when (not noerror)
-          (error "Can't find a workon home directory, set $WORKON_HOME"))
-      (dolist (name (directory-files workon-home))
-        (when (or (file-exists-p (format "%s/%s/bin/activate"
-                                         workon-home name))
-                  (file-exists-p (format "%s/%s/Scripts/activate.bat"
-                                         workon-home name)))
-          (setq result (cons name result))))
-      (sort result (lambda (a b)
-                     (string-lessp (downcase a)
-                                   (downcase b)))))))
-
-(define-widget 'pyvenv-workon 'choice
-  "Select an available virtualenv from virtualenvwrapper."
-  :convert-widget
-  (lambda (widget)
-    (setq widget (widget-copy widget))
-    (widget-put widget
-                :args (cons '(const :tag "None" nil)
-                            (mapcar (lambda (env)
-                                      (list 'const env))
-                                    (pyvenv-virtualenv-list t))))
-    (widget-types-convert-widget widget))
-
-  :prompt-value (lambda (widget prompt value unbound)
-                  (let ((name (completing-read
-                               prompt
-                               (cons "None"
-                                     (pyvenv-virtualenv-list t))
-                               nil t)))
-                    (if (equal name "None")
-                        nil
-                      name))))
-
-(defvar pyvenv-mode-map (make-sparse-keymap)
-  "The mode keymap for `pyvenv-mode'.")
-
-(easy-menu-define pyvenv-menu pyvenv-mode-map
-  "Pyvenv Menu"
-  '("Virtual Envs"
-    :visible pyvenv-mode
-    ("Workon"
-     :help "Activate a virtualenvwrapper environment"
-     :filter (lambda (&optional ignored)
-               (mapcar (lambda (venv)
-                         (vector venv `(pyvenv-workon ,venv)
-                                 :style 'radio
-                                 :selected `(equal pyvenv-virtual-env-name
-                                                   ,venv)))
-                       (pyvenv-virtualenv-list t))))
-    ["Activate" pyvenv-activate
-     :help "Activate a virtual environment by directory"]
-    ["Deactivate" pyvenv-deactivate
-     :help "Deactivate the current virtual environment"
-     :active pyvenv-virtual-env
-     :suffix pyvenv-virtual-env-name]
-    ["Restart Python Processes" pyvenv-restart-python
-     :help "Restart all Python processes to use the current environment"]))
-
-;;;###autoload
-(define-minor-mode pyvenv-mode
-  "Global minor mode for pyvenv.
-
-Will show the current virtualenv in the mode line, and respect a
-`pyvenv-workon' setting in files."
-  :global t
-  (cond
-   (pyvenv-mode
-    (add-to-list 'mode-line-misc-info '(pyvenv-mode pyvenv-mode-line-indicator))
-    (add-hook 'hack-local-variables-hook #'pyvenv-track-virtualenv))
-   ((not pyvenv-mode)
-    (setq mode-line-misc-info (delete '(pyvenv-mode pyvenv-mode-line-indicator)
-                                      mode-line-misc-info))
-    (remove-hook 'hack-local-variables-hook #'pyvenv-track-virtualenv))))
-
-;;;###autoload
-(define-minor-mode pyvenv-tracking-mode
-  "Global minor mode to track the current virtualenv.
-
-When this mode is active, pyvenv will activate a buffer-specific
-virtualenv whenever the user switches to a buffer with a
-buffer-local `pyvenv-workon' or `pyvenv-activate' variable."
-  :global t
-  (if pyvenv-tracking-mode
-      (add-hook 'post-command-hook 'pyvenv-track-virtualenv)
-    (remove-hook 'post-command-hook 'pyvenv-track-virtualenv)))
-
-(defun pyvenv-track-virtualenv ()
-  "Set a virtualenv as specified for the current buffer.
-
-If either `pyvenv-activate' or `pyvenv-workon' are specified, and
-they specify a virtualenv different from the current one, switch
-to that virtualenv."
-  (cond
-   (pyvenv-activate
-    (when (and (not (equal pyvenv-activate pyvenv-virtual-env))
-               (or (not pyvenv-tracking-ask-before-change)
-                   (y-or-n-p (format "Switch to virtualenv %s (currently %s)"
-                                     pyvenv-activate pyvenv-virtual-env))))
-      (pyvenv-activate pyvenv-activate)))
-   (pyvenv-workon
-    (when (and (not (equal pyvenv-workon pyvenv-virtual-env-name))
-               (or (not pyvenv-tracking-ask-before-change)
-                   (y-or-n-p (format "Switch to virtualenv %s (currently %s)"
-                                     pyvenv-workon pyvenv-virtual-env-name))))
-      (pyvenv-workon pyvenv-workon)))))
-
-(defun pyvenv-run-virtualenvwrapper-hook (hook &rest args)
-  "Run a virtualenvwrapper hook, and update the environment.
-
-This will run a virtualenvwrapper hook and update the local
-environment accordingly.
-
-CAREFUL! This will modify your `process-environment' and
-`exec-path'."
-  (when (pyvenv-hook-dir)
-    (with-temp-buffer
-      (let ((tmpfile (make-temp-file "pyvenv-virtualenvwrapper-")))
-        (unwind-protect
-            (progn
-              (apply #'call-process
-                     pyvenv-virtualenvwrapper-python
-                     nil t nil
-                     "-c"
-                     "from virtualenvwrapper.hook_loader import main; main()"
-                     "--script" tmpfile
-                     (if (getenv "HOOK_VERBOSE_OPTION")
-                         (cons (getenv "HOOK_VERBOSE_OPTION")
-                               (cons hook args))
-                       (cons hook args)))
-              (call-process-shell-command
-               (format ". '%s' ; echo ; echo =-=-= ; python -c \"import os, json ; print(json.dumps(dict(os.environ)))\""
-                       tmpfile)
-               nil t nil))
-          (delete-file tmpfile)))
-      (goto-char (point-min))
-      (when (and (not (re-search-forward "ImportError: No module named virtualenvwrapper" nil t))
-                 (re-search-forward "\n=-=-=\n" nil t))
-        (let ((output (buffer-substring (point-min)
-                                        (match-beginning 0))))
-          (when (> (length output) 0)
-            (with-help-window "*Virtualenvwrapper Hook Output*"
-              (with-current-buffer "*Virtualenvwrapper Hook Output*"
-                (let ((inhibit-read-only t))
-                  (erase-buffer)
-                  (insert
-                   (format
-                    "Output from the virtualenvwrapper hook %s:\n\n"
-                    hook)
-                   output))))))
-        (dolist (binding (json-read))
-          (let ((env (format "%s=%s" (car binding) (cdr binding))))
-            (when (not (member env process-environment))
-              (setq process-environment (cons env process-environment))))
-          (when (eq (car binding) 'PATH)
-            (setq exec-path (split-string (cdr binding) ":"))))))))
-
-;;;###autoload
-(defun pyvenv-restart-python ()
-  "Restart Python inferior processes."
-  (interactive)
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (when (and (eq major-mode 'inferior-python-mode)
-                 (get-buffer-process buf))
-        (let ((cmd (combine-and-quote-strings (process-command
-                                               (get-buffer-process buf))))
-              (dedicated (if (string-match "\\[.*\\]$" (buffer-name buf))
-                             t
-                           nil))
-              (show nil))
-          (delete-process (get-buffer-process buf))
-          (goto-char (point-max))
-          (insert "\n\n"
-                  "###\n"
-                  (format "### Restarting in virtualenv %s (%s)\n"
-                          pyvenv-virtual-env-name pyvenv-virtual-env)
-                  "###\n"
-                  "\n\n")
-          (run-python cmd dedicated show)
-          (goto-char (point-max)))))))
-
-(defun pyvenv-hook-dir ()
-  "Return the current hook directory.
-
-This is usually the value of $VIRTUALENVWRAPPER_HOOK_DIR, but
-virtualenvwrapper has stopped exporting that variable, so we go
-back to the default of $WORKON_HOME or even just ~/.virtualenvs/."
-  (or (getenv "VIRTUALENVWRAPPER_HOOK_DIR")
-      (pyvenv-workon-home)))
-
-(defun pyvenv-workon-home ()
-  "Return the current workon home.
-
-This is the value of $WORKON_HOME or ~/.virtualenvs."
-  (or (getenv "WORKON_HOME")
-      (expand-file-name "~/.virtualenvs")))
-
-;;; Compatibility
-
-(when (not (fboundp 'file-name-base))
-  ;; Emacs 24.3
-  (defun file-name-base (&optional filename)
-    "Return the base name of the FILENAME: no directory, no extension.
-FILENAME defaults to `buffer-file-name'."
-    (file-name-sans-extension
-     (file-name-nondirectory (or filename (buffer-file-name)))))
-  )
-
-(when (not (boundp 'mode-line-misc-info))
-  (defvar mode-line-misc-info nil
-    "Compatibility variable for 24.3+")
-  (let ((line mode-line-format))
-    (while line
-      (when (eq 'which-func-mode
-                (car-safe (car-safe (cdr line))))
-        (setcdr line (cons 'mode-line-misc-format
-                           (cdr line)))
-        (setq line (cdr line)))
-      (setq line (cdr line)))))
-
-(provide 'pyvenv)
-;;; pyvenv.el ends here
diff --git a/emacs.d/elpa/pyvenv-20160108.28/pyvenv-autoloads.el b/emacs.d/elpa/pyvenv-20160108.28/pyvenv-autoloads.el
new file mode 100644
index 0000000..6ae11a9
--- /dev/null
+++ b/emacs.d/elpa/pyvenv-20160108.28/pyvenv-autoloads.el
@@ -0,0 +1,71 @@
+;;; pyvenv-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "pyvenv" "pyvenv.el" (22171 46547 0 0))
+;;; Generated autoloads from pyvenv.el
+
+(autoload 'pyvenv-activate "pyvenv" "\
+Activate the virtual environment in DIRECTORY.
+
+\(fn DIRECTORY)" t nil)
+
+(autoload 'pyvenv-deactivate "pyvenv" "\
+Deactivate any current virtual environment.
+
+\(fn)" t nil)
+
+(autoload 'pyvenv-workon "pyvenv" "\
+Activate a virtual environment from $WORKON_HOME.
+
+\(fn NAME)" t nil)
+
+(defvar pyvenv-mode nil "\
+Non-nil if Pyvenv mode is enabled.
+See the command `pyvenv-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 `pyvenv-mode'.")
+
+(custom-autoload 'pyvenv-mode "pyvenv" nil)
+
+(autoload 'pyvenv-mode "pyvenv" "\
+Global minor mode for pyvenv.
+
+Will show the current virtualenv in the mode line, and respect a
+`pyvenv-workon' setting in files.
+
+\(fn &optional ARG)" t nil)
+
+(defvar pyvenv-tracking-mode nil "\
+Non-nil if Pyvenv-Tracking mode is enabled.
+See the command `pyvenv-tracking-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 `pyvenv-tracking-mode'.")
+
+(custom-autoload 'pyvenv-tracking-mode "pyvenv" nil)
+
+(autoload 'pyvenv-tracking-mode "pyvenv" "\
+Global minor mode to track the current virtualenv.
+
+When this mode is active, pyvenv will activate a buffer-specific
+virtualenv whenever the user switches to a buffer with a
+buffer-local `pyvenv-workon' or `pyvenv-activate' variable.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'pyvenv-restart-python "pyvenv" "\
+Restart Python inferior processes.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; pyvenv-autoloads.el ends here
diff --git a/emacs.d/elpa/pyvenv-20160108.28/pyvenv-pkg.el b/emacs.d/elpa/pyvenv-20160108.28/pyvenv-pkg.el
new file mode 100644
index 0000000..6820ae7
--- /dev/null
+++ b/emacs.d/elpa/pyvenv-20160108.28/pyvenv-pkg.el
@@ -0,0 +1 @@
+(define-package "pyvenv" "20160108.28" "Python virtual environment interface" 'nil :url "http://github.com/jorgenschaefer/pyvenv" :keywords '("python" "virtualenv" "tools"))
diff --git a/emacs.d/elpa/pyvenv-20160108.28/pyvenv.el b/emacs.d/elpa/pyvenv-20160108.28/pyvenv.el
new file mode 100644
index 0000000..84b12e7
--- /dev/null
+++ b/emacs.d/elpa/pyvenv-20160108.28/pyvenv.el
@@ -0,0 +1,462 @@
+;;; pyvenv.el --- Python virtual environment interface -*- lexical-binding: t -*-
+
+;; Copyright (C) 2013-2015  Jorgen Schaefer <contact@jorgenschaefer.de>
+
+;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
+;; URL: http://github.com/jorgenschaefer/pyvenv
+;; Package-Version: 20160108.28
+;; Version: 1.9
+;; Keywords: Python, Virtualenv, Tools
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This is a simple global minor mode which will replicate the changes
+;; done by virtualenv activation inside Emacs.
+
+;; The main entry points are `pyvenv-activate', which queries the user
+;; for a virtual environment directory to activate, and
+;; `pyvenv-workon', which queries for a virtual environment in
+;; $WORKON_HOME (from virtualenvwrapper.sh).
+
+;; If you want your inferior Python processes to be restarted
+;; automatically when you switch your virtual environment, add
+;; `pyvenv-restart-python' to `pyvenv-post-activate-hooks'.
+
+;;; Code:
+
+(require 'json)
+
+;; User customization
+
+(defgroup pyvenv nil
+  "Python Virtual Environment Interface."
+  :prefix "pyvenv-"
+  :group 'languages)
+
+(defcustom pyvenv-workon nil
+  "The intended virtualenv in the virtualenvwrapper directory.
+
+This is rarely useful to set globally. Rather, set this in file-
+or directory-local variables using \\[add-file-local-variable] or
+\\[add-dir-local-variable].
+
+When `pyvenv-mode' is enabled, pyvenv will switch to this
+virtualenv. If a virtualenv is already enabled, it will ask first."
+  :type 'pyvenv-workon
+  :safe #'stringp
+  :group 'pyvenv)
+
+(defcustom pyvenv-activate nil
+  "The intended virtualenv directory.
+
+This is rarely useful to set globally. Rather, set this in file-
+or directory-local variables using \\[add-file-local-variable] or
+\\[add-dir-local-variable].
+
+When `pyvenv-mode' is enabled, pyvenv will switch to this
+virtualenv. If a virtualenv is already enabled, it will ask first."
+  :type 'directory
+  :safe #'stringp
+  :group 'pyvenv)
+
+(defcustom pyvenv-tracking-ask-before-change nil
+  "Non-nil means pyvenv will ask before automatically changing a virtualenv.
+
+This can happen when a new file is opened with a buffer-local
+value (from file-local or directory-local variables) for
+`pyvenv-workon' or `pyvenv-workon', or if `pyvenv-tracking-mode'
+is active, after every command."
+  :type 'boolean
+  :group 'pyvenv)
+
+(defcustom pyvenv-virtualenvwrapper-python
+  (or (getenv "VIRTUALENVWRAPPER_PYTHON")
+      (executable-find "python")
+      "python")
+  "The python process which has access to the virtualenvwrapper module.
+
+This should be $VIRTUALENVWRAPPER_PYTHON outside of Emacs, but
+virtualenvwrapper.sh does not export that variable. We make an
+educated guess, but that can be off."
+  :type '(file :must-match t)
+  :safe #'file-directory-p
+  :group 'pyvenv)
+
+;; API for other libraries
+
+(defvar pyvenv-virtual-env nil
+  "The current virtual environment.
+
+Do not set this variable directly; use `pyvenv-activate' or
+`pyvenv-workon'.")
+
+(defvar pyvenv-virtual-env-name nil
+  "The name of the current virtual environment.
+
+This is usually the base name of `pyvenv-virtual-env'.")
+
+(defvar pyvenv-pre-activate-hooks nil
+  "Hooks run before a virtual environment is activated.
+
+`pyvenv-virtual-env' is already set.")
+
+(defvar pyvenv-post-activate-hooks nil
+  "Hooks run after a virtual environment is activated.
+
+`pyvenv-virtual-env' is set.")
+
+(defvar pyvenv-pre-deactivate-hooks nil
+  "Hooks run before a virtual environment is deactivated.
+
+`pyvenv-virtual-env' is set.")
+
+(defvar pyvenv-post-deactivate-hooks nil
+  "Hooks run after a virtual environment is deactivated.
+
+`pyvenv-virtual-env' is still set.")
+
+(defvar pyvenv-mode-line-indicator '(pyvenv-virtual-env-name
+                                     ("[" pyvenv-virtual-env-name "] "))
+  "How `pyvenv-mode' will indicate the current environment in the mode line.")
+
+;; Internal code.
+
+(defvar pyvenv-old-process-environment nil
+  "The old process environment before the last activate.")
+
+(defvar pyvenv-old-exec-path nil
+  "The old exec path before the last activate.")
+
+;;;###autoload
+(defun pyvenv-activate (directory)
+  "Activate the virtual environment in DIRECTORY."
+  (interactive "DActivate venv: ")
+  (setq directory (expand-file-name directory))
+  (pyvenv-deactivate)
+  (setq pyvenv-virtual-env (file-name-as-directory directory)
+        pyvenv-virtual-env-name (file-name-nondirectory
+                                 (directory-file-name directory))
+        python-shell-virtualenv-path directory
+        python-shell-virtualenv-root directory)
+  ;; Preserve variables from being overwritten.
+  (let ((old-exec-path exec-path)
+        (old-process-environment process-environment))
+    (unwind-protect
+        (pyvenv-run-virtualenvwrapper-hook "pre_activate" pyvenv-virtual-env)
+      (setq exec-path old-exec-path
+            process-environment old-process-environment)))
+  (run-hooks 'pyvenv-pre-activate-hooks)
+  (setq pyvenv-old-exec-path exec-path
+        pyvenv-old-process-environment process-environment
+        ;; For some reason, Emacs adds some directories to `exec-path'
+        ;; but not to `process-environment'?
+        exec-path (if (file-exists-p (format "%s/Scripts" directory))
+                      (cons (format "%s/Scripts" directory) exec-path)
+                    (cons (format "%s/bin" directory) exec-path))
+        process-environment (append
+                             (list
+                              (format "VIRTUAL_ENV=%s" directory)
+                              (format "PATH=%s" (mapconcat (lambda (x)
+                                                             (or x "."))
+                                                           exec-path
+                                                           path-separator))
+                              ;; No "=" means to unset
+                              "PYTHONHOME")
+                             process-environment)
+        )
+  (pyvenv-run-virtualenvwrapper-hook "post_activate")
+  (run-hooks 'pyvenv-post-activate-hooks))
+
+;;;###autoload
+(defun pyvenv-deactivate ()
+  "Deactivate any current virtual environment."
+  (interactive)
+  (when pyvenv-virtual-env
+    (pyvenv-run-virtualenvwrapper-hook "pre_deactivate")
+    (run-hooks 'pyvenv-pre-deactivate-hooks))
+  (when pyvenv-old-process-environment
+    (setq process-environment pyvenv-old-process-environment
+          pyvenv-old-process-environment nil))
+  (when pyvenv-old-exec-path
+    (setq exec-path pyvenv-old-exec-path
+          pyvenv-old-exec-path nil))
+  (when pyvenv-virtual-env
+    ;; Make sure this does not change `exec-path', as $PATH is
+    ;; different
+    (let ((old-exec-path exec-path)
+          (old-process-environment process-environment))
+      (unwind-protect
+          (pyvenv-run-virtualenvwrapper-hook "post_deactivate"
+                                             pyvenv-virtual-env)
+        (setq exec-path old-exec-path
+              process-environment old-process-environment)))
+    (run-hooks 'pyvenv-post-deactivate-hooks))
+  (setq pyvenv-virtual-env nil
+        pyvenv-virtual-env-name nil
+        python-shell-virtualenv-root nil
+        python-shell-virtualenv-path nil))
+
+(defvar pyvenv-workon-history nil
+  "Prompt history for `pyvenv-workon'.")
+
+;;;###autoload
+(defun pyvenv-workon (name)
+  "Activate a virtual environment from $WORKON_HOME."
+  (interactive
+   (list
+    (completing-read "Work on: " (pyvenv-virtualenv-list)
+                     nil t nil 'pyvenv-workon-history nil nil)))
+  (when (not (or (equal name "")
+                 ;; Some completion frameworks can return nil for the
+                 ;; default, see
+                 ;; https://github.com/jorgenschaefer/elpy/issues/144
+                 (equal name nil)))
+    (pyvenv-activate (format "%s/%s"
+                             (pyvenv-workon-home)
+                             name))))
+
+(defun pyvenv-virtualenv-list (&optional noerror)
+  "Prompt the user for a name in $WORKON_HOME.
+
+If NOERROR is set, do not raise an error if WORKON_HOME is not
+configured."
+  (let ((workon-home (pyvenv-workon-home))
+        (result nil))
+    (if (not (file-directory-p workon-home))
+        (when (not noerror)
+          (error "Can't find a workon home directory, set $WORKON_HOME"))
+      (dolist (name (directory-files workon-home))
+        (when (or (file-exists-p (format "%s/%s/bin/activate"
+                                         workon-home name))
+                  (file-exists-p (format "%s/%s/Scripts/activate.bat"
+                                         workon-home name)))
+          (setq result (cons name result))))
+      (sort result (lambda (a b)
+                     (string-lessp (downcase a)
+                                   (downcase b)))))))
+
+(define-widget 'pyvenv-workon 'choice
+  "Select an available virtualenv from virtualenvwrapper."
+  :convert-widget
+  (lambda (widget)
+    (setq widget (widget-copy widget))
+    (widget-put widget
+                :args (cons '(const :tag "None" nil)
+                            (mapcar (lambda (env)
+                                      (list 'const env))
+                                    (pyvenv-virtualenv-list t))))
+    (widget-types-convert-widget widget))
+
+  :prompt-value (lambda (widget prompt value unbound)
+                  (let ((name (completing-read
+                               prompt
+                               (cons "None"
+                                     (pyvenv-virtualenv-list t))
+                               nil t)))
+                    (if (equal name "None")
+                        nil
+                      name))))
+
+(defvar pyvenv-mode-map (make-sparse-keymap)
+  "The mode keymap for `pyvenv-mode'.")
+
+(easy-menu-define pyvenv-menu pyvenv-mode-map
+  "Pyvenv Menu"
+  '("Virtual Envs"
+    :visible pyvenv-mode
+    ("Workon"
+     :help "Activate a virtualenvwrapper environment"
+     :filter (lambda (&optional ignored)
+               (mapcar (lambda (venv)
+                         (vector venv `(pyvenv-workon ,venv)
+                                 :style 'radio
+                                 :selected `(equal pyvenv-virtual-env-name
+                                                   ,venv)))
+                       (pyvenv-virtualenv-list t))))
+    ["Activate" pyvenv-activate
+     :help "Activate a virtual environment by directory"]
+    ["Deactivate" pyvenv-deactivate
+     :help "Deactivate the current virtual environment"
+     :active pyvenv-virtual-env
+     :suffix pyvenv-virtual-env-name]
+    ["Restart Python Processes" pyvenv-restart-python
+     :help "Restart all Python processes to use the current environment"]))
+
+;;;###autoload
+(define-minor-mode pyvenv-mode
+  "Global minor mode for pyvenv.
+
+Will show the current virtualenv in the mode line, and respect a
+`pyvenv-workon' setting in files."
+  :global t
+  (cond
+   (pyvenv-mode
+    (add-to-list 'mode-line-misc-info '(pyvenv-mode pyvenv-mode-line-indicator))
+    (add-hook 'hack-local-variables-hook #'pyvenv-track-virtualenv))
+   ((not pyvenv-mode)
+    (setq mode-line-misc-info (delete '(pyvenv-mode pyvenv-mode-line-indicator)
+                                      mode-line-misc-info))
+    (remove-hook 'hack-local-variables-hook #'pyvenv-track-virtualenv))))
+
+;;;###autoload
+(define-minor-mode pyvenv-tracking-mode
+  "Global minor mode to track the current virtualenv.
+
+When this mode is active, pyvenv will activate a buffer-specific
+virtualenv whenever the user switches to a buffer with a
+buffer-local `pyvenv-workon' or `pyvenv-activate' variable."
+  :global t
+  (if pyvenv-tracking-mode
+      (add-hook 'post-command-hook 'pyvenv-track-virtualenv)
+    (remove-hook 'post-command-hook 'pyvenv-track-virtualenv)))
+
+(defun pyvenv-track-virtualenv ()
+  "Set a virtualenv as specified for the current buffer.
+
+If either `pyvenv-activate' or `pyvenv-workon' are specified, and
+they specify a virtualenv different from the current one, switch
+to that virtualenv."
+  (cond
+   (pyvenv-activate
+    (when (and (not (equal (file-name-as-directory pyvenv-activate)
+                           pyvenv-virtual-env))
+               (or (not pyvenv-tracking-ask-before-change)
+                   (y-or-n-p (format "Switch to virtualenv %s (currently %s)"
+                                     pyvenv-activate pyvenv-virtual-env))))
+      (pyvenv-activate pyvenv-activate)))
+   (pyvenv-workon
+    (when (and (not (equal pyvenv-workon pyvenv-virtual-env-name))
+               (or (not pyvenv-tracking-ask-before-change)
+                   (y-or-n-p (format "Switch to virtualenv %s (currently %s)"
+                                     pyvenv-workon pyvenv-virtual-env-name))))
+      (pyvenv-workon pyvenv-workon)))))
+
+(defun pyvenv-run-virtualenvwrapper-hook (hook &rest args)
+  "Run a virtualenvwrapper hook, and update the environment.
+
+This will run a virtualenvwrapper hook and update the local
+environment accordingly.
+
+CAREFUL! This will modify your `process-environment' and
+`exec-path'."
+  (when (pyvenv-hook-dir)
+    (with-temp-buffer
+      (let ((tmpfile (make-temp-file "pyvenv-virtualenvwrapper-")))
+        (unwind-protect
+            (progn
+              (apply #'call-process
+                     pyvenv-virtualenvwrapper-python
+                     nil t nil
+                     "-c"
+                     "from virtualenvwrapper.hook_loader import main; main()"
+                     "--script" tmpfile
+                     (if (getenv "HOOK_VERBOSE_OPTION")
+                         (cons (getenv "HOOK_VERBOSE_OPTION")
+                               (cons hook args))
+                       (cons hook args)))
+              (call-process-shell-command
+               (format ". '%s' ; python -c 'import os, json; print(\"\\n=-=-=\"); print(json.dumps(dict(os.environ)))'"
+                       tmpfile)
+               nil t nil))
+          (delete-file tmpfile)))
+      (goto-char (point-min))
+      (when (and (not (re-search-forward "ImportError: No module named '?virtualenvwrapper'?" nil t))
+                 (re-search-forward "\n=-=-=\n" nil t))
+        (let ((output (buffer-substring (point-min)
+                                        (match-beginning 0))))
+          (when (> (length output) 0)
+            (with-help-window "*Virtualenvwrapper Hook Output*"
+              (with-current-buffer "*Virtualenvwrapper Hook Output*"
+                (let ((inhibit-read-only t))
+                  (erase-buffer)
+                  (insert
+                   (format
+                    "Output from the virtualenvwrapper hook %s:\n\n"
+                    hook)
+                   output))))))
+        (dolist (binding (json-read))
+          (let ((env (format "%s=%s" (car binding) (cdr binding))))
+            (when (not (member env process-environment))
+              (setq process-environment (cons env process-environment))))
+          (when (eq (car binding) 'PATH)
+            (setq exec-path (split-string (cdr binding) ":"))))))))
+
+;;;###autoload
+(defun pyvenv-restart-python ()
+  "Restart Python inferior processes."
+  (interactive)
+  (dolist (buf (buffer-list))
+    (with-current-buffer buf
+      (when (and (eq major-mode 'inferior-python-mode)
+                 (get-buffer-process buf))
+        (let ((cmd (combine-and-quote-strings (process-command
+                                               (get-buffer-process buf))))
+              (dedicated (if (string-match "\\[.*\\]$" (buffer-name buf))
+                             t
+                           nil))
+              (show nil))
+          (delete-process (get-buffer-process buf))
+          (goto-char (point-max))
+          (insert "\n\n"
+                  "###\n"
+                  (format "### Restarting in virtualenv %s (%s)\n"
+                          pyvenv-virtual-env-name pyvenv-virtual-env)
+                  "###\n"
+                  "\n\n")
+          (run-python cmd dedicated show)
+          (goto-char (point-max)))))))
+
+(defun pyvenv-hook-dir ()
+  "Return the current hook directory.
+
+This is usually the value of $VIRTUALENVWRAPPER_HOOK_DIR, but
+virtualenvwrapper has stopped exporting that variable, so we go
+back to the default of $WORKON_HOME or even just ~/.virtualenvs/."
+  (or (getenv "VIRTUALENVWRAPPER_HOOK_DIR")
+      (pyvenv-workon-home)))
+
+(defun pyvenv-workon-home ()
+  "Return the current workon home.
+
+This is the value of $WORKON_HOME or ~/.virtualenvs."
+  (or (getenv "WORKON_HOME")
+      (expand-file-name "~/.virtualenvs")))
+
+;;; Compatibility
+
+(when (not (fboundp 'file-name-base))
+  ;; Emacs 24.3
+  (defun file-name-base (&optional filename)
+    "Return the base name of the FILENAME: no directory, no extension.
+FILENAME defaults to `buffer-file-name'."
+    (file-name-sans-extension
+     (file-name-nondirectory (or filename (buffer-file-name)))))
+  )
+
+(when (not (boundp 'mode-line-misc-info))
+  (defvar mode-line-misc-info nil
+    "Compatibility variable for 24.3+")
+  (let ((line mode-line-format))
+    (while line
+      (when (eq 'which-func-mode
+                (car-safe (car-safe (cdr line))))
+        (setcdr line (cons 'mode-line-misc-format
+                           (cdr line)))
+        (setq line (cdr line)))
+      (setq line (cdr line)))))
+
+(provide 'pyvenv)
+;;; pyvenv.el ends here
diff --git a/emacs.d/elpa/rich-minority-20150305.516/rich-minority-autoloads.el b/emacs.d/elpa/rich-minority-20150305.516/rich-minority-autoloads.el
deleted file mode 100644
index e133efb..0000000
--- a/emacs.d/elpa/rich-minority-20150305.516/rich-minority-autoloads.el
+++ /dev/null
@@ -1,40 +0,0 @@
-;;; rich-minority-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "rich-minority" "rich-minority.el" (21837 24191
-;;;;;;  0 0))
-;;; Generated autoloads from rich-minority.el
-
-(autoload 'rm--mode-list-as-string-list "rich-minority" "\
-Return `minor-mode-list' as a simple list of strings.
-
-\(fn)" nil nil)
-
-(defvar rich-minority-mode nil "\
-Non-nil if Rich minority mode is enabled.
-See the command `rich-minority-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 `rich-minority-mode'.")
-
-(custom-autoload 'rich-minority-mode "rich-minority" nil)
-
-(autoload 'rich-minority-mode "rich-minority" "\
-Toggle Rich minority mode on or off.
-With a prefix argument ARG, enable Rich minority mode if ARG is
-positive, and disable it otherwise.  If called from Lisp, enable
-the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
-\\{rich-minority-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; rich-minority-autoloads.el ends here
diff --git a/emacs.d/elpa/rich-minority-20150305.516/rich-minority-pkg.el b/emacs.d/elpa/rich-minority-20150305.516/rich-minority-pkg.el
deleted file mode 100644
index 8d1a07b..0000000
--- a/emacs.d/elpa/rich-minority-20150305.516/rich-minority-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "rich-minority" "20150305.516" "Clean-up and Beautify the list of minor-modes." '((cl-lib "0.5")) :url "http://github.com/Bruce-Connor/rich-minority" :keywords '("mode-line" "faces"))
diff --git a/emacs.d/elpa/rich-minority-20150305.516/rich-minority.el b/emacs.d/elpa/rich-minority-20150305.516/rich-minority.el
deleted file mode 100644
index 4aacae6..0000000
--- a/emacs.d/elpa/rich-minority-20150305.516/rich-minority.el
+++ /dev/null
@@ -1,282 +0,0 @@
-;;; rich-minority.el --- Clean-up and Beautify the list of minor-modes.
-
-;; Copyright (C) 2014  <bruce.connor.am@gmail.com>
-
-;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
-;; URL: http://github.com/Bruce-Connor/rich-minority
-;; Package-Version: 20150305.516
-;; Package-Requires: ((cl-lib "0.5"))
-;; Version: 0.2
-;; Keywords: mode-line faces
-;; Prefix: rm
-;; Separator: -
-
-;;; Commentary:
-;;
-;;   Emacs package for hiding and/or highlighting the list of minor-modes
-;;   in the mode-line.
-;;
-;;
-;; Usage
-;; ─────
-;;
-;;   To activate the enrichment of your minor-modes list, call `M-x
-;;   rich-minority-mode', or add this to your init file:
-;;
-;;   ┌────
-;;   │ (rich-minority-mode 1)
-;;   └────
-;;
-;;   By default, this has a couple of small effects (provided as examples)
-;;   it is up to you to customize it to your liking with the following
-;;   three variables:
-;;
-;;   `rm-blacklist': List of minor mode names that will be hidden from the
-;;                   minor-modes list. Use this to hide *only* a few modes
-;;                   that are always active and don’t really contribute
-;;                   information.
-;;   `rm-whitelist': List of minor mode names that are allowed on the
-;;                   minor-modes list. Use this to hide *all but* a few
-;;                   modes.
-;;   `rm-text-properties': List text properties to apply to each minor-mode
-;;                         lighter. For instance, by default we highlight
-;;                         `Ovwrt' with a red face, so you always know if
-;;                         you’re in `overwrite-mode'.
-;;
-;;
-;; Comparison to Diminish
-;; ──────────────────────
-;;
-;;   Diminish is an established player in the mode-line world, who also
-;;   handles the minor-modes list. What can rich-minority /offer in
-;;   contrast/?
-;;
-;;   • rich-minority is more versatile:
-;;     1. It accepts *regexps*, instead of having to specify each
-;;        minor-mode individually;
-;;     2. It also offers a *whitelist* behaviour, in addition to the
-;;        blacklist;
-;;     3. It supports *highlighting* specific minor-modes with completely
-;;        arbitrary text properties.
-;;   • rich-minority takes a cleaner, functional approach. It doesn’t hack
-;;     into the `minor-mode-alist' variable.
-;;
-;;   What is rich-minority /missing/?
-;;
-;;   1. It doesn’t have a quick and simple replacement functionality yet.
-;;      Although you can set the `display' property of a minor-mode to
-;;      whatever string you want and that will function as a replacement.
-;;   2. Its source comments lack [Will Mengarini’s poetry]. :-)
-;;
-;;
-;;   [Will Mengarini’s poetry] http://www.eskimo.com/~seldon/diminish.el
-;;
-;;
-;; Installation
-;; ────────────
-;;
-;;   This package is available fom Melpa, you may install it by calling
-;;   `M-x package-install'.
-
-
-;;; Code:
-(require 'cl-lib)
-
-(defconst rich-minority-version "0.2")
-
-(defun rm-bug-report ()
-  "Opens github issues page in a web browser. Please send any bugs you find.
-Please include your Emacs and rich-minority versions."
-  (interactive)
-  (message "Your rm-version is: %s, and your emacs version is: %s.\nPlease include this in your report!"
-           rich-minority-version emacs-version)
-  (browse-url "https://github.com/Bruce-Connor/rich-minority/issues/new"))
-(defun rm-customize ()
-  "Open the customization menu in the `rich-minority' group."
-  (interactive)
-  (customize-group 'rich-minority t))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Customization variables.
-(defcustom rm-blacklist '(" hl-p")
-  "List of minor modes you want to hide from the mode-line.
-
-Has three possible values:
-
-- nil: All minor modes are shown in the mode-line (but see also
-  `rm-whitelist').
-
-- List of strings: Represents a list of minor mode names that
-  will be hidden from the minor-modes list.
-
-- A string: If this variable is set to a single string, this
-  string must be a regexp. This regexp will be compared to each
-  minor-mode lighter, and those which match are hidden from the
-  minor-mode list.
-
-If you'd like to use a list of regexps, simply use something like the following:
-    (setq rm-blacklist (mapconcat 'identity list-of-regexps \"\\\\|\"))
-
-Don't forget to start each string with a blank space, as most
-minor-mode lighters start with a space."
-  :type '(choice (repeat string)
-                 (regexp :tag "Regular expression."))
-  :group 'rich-minority
-  :package-version '(rich-minority . "0.1.1"))
-(define-obsolete-variable-alias 'rm-excluded-modes 'rm-blacklist "0.1.1")
-(define-obsolete-variable-alias 'rm-hidden-modes 'rm-blacklist "0.1.1")
-
-(defcustom rm-whitelist nil
-  "List of minor modes you want to include in the mode-line.
-
-- nil: All minor modes are shown in the mode-line (but see also
-  `rm-blacklist').
-
-- List of strings: Represents a list of minor mode names that are
-  allowed on the minor-modes list. Any minor-mode whose lighter
-  is not in this list will NOT be displayed.
-
-- A string: If this variable is set to a single string, this
-  string must be a regexp. This regexp will be compared to each
-  minor-mode lighter, and only those which match are displayed on
-  the minor-mode list.
-
-If you'd like to use a list of regexps, simply use something like the following:
-    (setq rm-whitelist (mapconcat 'identity list-of-regexps \"\\\\|\"))
-
-Don't forget to start each string with a blank space, as most
-minor-mode lighters start with a space."
-  :type '(choice (repeat string)
-                 (regexp :tag "Regular expression."))
-  :group 'rich-minority
-  :package-version '(rich-minority . "0.1.1"))
-(define-obsolete-variable-alias 'rm-included-modes 'rm-whitelist "0.1.1")
-
-(defcustom rm-text-properties
-  '(("\\` Ovwrt\\'" 'face 'font-lock-warning-face))
-  "Alist of text properties to be applied to minor-mode lighters.
-The car of each element must be a regexp, and the cdr must be a
-list of text properties.
-
-    (REGEXP PROPERTY-NAME PROPERTY-VALUE ...)
-
-If the regexp matches a minor mode lighter, the text properties
-are applied to it. They are tested in order, and search stops at
-the first match.
-
-These properties take priority over those defined in
-`rm-base-text-properties'."
-  :type '(repeat (cons regexp (repeat sexp)))
-  :group 'rich-minority
-  :package-version '(rich-minority . "0.1"))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Functions and Defvars
-(defconst rm--help-echo-bottom
-  "Mouse-1: Mode Menu.\nMouse-2: Mode Help.\nMouse-3: Toggle Minor Modes.")
-
-;;;###autoload
-(defun rm--mode-list-as-string-list ()
-  "Return `minor-mode-list' as a simple list of strings."
-  (let ((full-list (delete "" (mapcar #'format-mode-line minor-mode-alist))))
-    (setq rm--help-echo
-          (format "Full list:\n   %s\n\n%s"
-            (mapconcat 'identity full-list "\n   ")
-            rm--help-echo-bottom))
-    (mapcar #'rm--propertize
-      (rm--remove-hidden-modes full-list))))
-
-(defvar-local rm--help-echo nil
-  "Used to set the help-echo string dynamically.")
-
-(defcustom rm-base-text-properties
-  '('help-echo 'rm--help-echo
-               'mouse-face 'mode-line-highlight
-               'local-map mode-line-minor-mode-keymap)
-  "List of text propeties to apply to every minor mode."
-  :type '(repeat sexp)
-  :group 'rich-minority
-  :package-version '(rich-minority . "0.1"))
-
-(defun rm--propertize (mode)
-  "Propertize the string MODE according to `rm-text-properties'."
-  (if (null (stringp mode))
-      `(:propertize ,mode ,@rm-base-text-properties)
-    (let ((al rm-text-properties)
-          done prop)
-      (while (and (null done) al)
-        (setq done (pop al))
-        (if (string-match (car done) mode)
-            (setq prop (cdr done))
-          (setq done nil)))
-      (eval `(propertize ,mode ,@prop ,@rm-base-text-properties)))))
-
-(defun rm--remove-hidden-modes (li)
-  "Remove from LI elements that match `rm-blacklist' or don't match `rm-whitelist'."
-  (let ((pred (if (listp rm-blacklist) #'member #'rm--string-match))
-        (out li))
-    (when rm-blacklist
-      (setq out
-            (remove nil
-                    (mapcar
-                     (lambda (x) (unless (and (stringp x)
-                                         (funcall pred x rm-blacklist))
-                              x))
-                     out))))
-    (when rm-whitelist
-      (setq pred (if (listp rm-whitelist) #'member #'rm--string-match))
-      (setq out
-            (remove nil
-                    (mapcar
-                     (lambda (x) (unless (and (stringp x)
-                                         (null (funcall pred x rm-whitelist)))
-                              x))
-                     out))))
-    out))
-
-(defun rm--string-match (string regexp)
-  "Like `string-match', but arg STRING comes before REGEXP."
-  (string-match regexp string))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; minor-mode
-(defvar rm--mode-line-construct
-  '(:eval (rm--mode-list-as-string-list))
-  "Construct used to replace `minor-mode-alist'.")
-
-(defvar rm--warning-absent-element
-  "Couldn't find %S inside `mode-line-modes'. If you didn't change it yourself, please file a bug report with M-x rm-bug-report"
-  "Warning message used when something wasn't found.")
-
-(defvar rm--backup-construct nil
-  "Construct containing `minor-mode-alist' which we removed from the mode-line.")
-
-;;;###autoload
-(define-minor-mode rich-minority-mode nil nil " $"
-  :global t
-  (if rich-minority-mode
-      (let ((place (or (member 'minor-mode-alist mode-line-modes)
-                       (cl-member-if
-                        (lambda (x) (and (listp x)
-                                    (equal (car x) :propertize)
-                                    (equal (cadr x) '("" minor-mode-alist))))
-                        mode-line-modes))))
-        (if place
-            (progn
-              (setq rm--backup-construct (car place))
-              (setcar place rm--mode-line-construct))
-          (setq rich-minority-mode nil)
-          (if (member 'sml/pos-id-separator mode-line-format)
-              (message "You don't need to activate rich-minority-mode if you're using smart-mode-line")
-            (warn rm--warning-absent-element 'minor-mode-alist))))
-    (let ((place (member rm--mode-line-construct mode-line-modes)))
-      (if place
-          (setcar place rm--backup-construct)
-        (warn rm--warning-absent-element rm--mode-line-construct)))))
-
-(provide 'rich-minority)
-
-;;; rich-minority.el ends here
diff --git a/emacs.d/elpa/rich-minority-20151201.400/rich-minority-autoloads.el b/emacs.d/elpa/rich-minority-20151201.400/rich-minority-autoloads.el
new file mode 100644
index 0000000..80c202a
--- /dev/null
+++ b/emacs.d/elpa/rich-minority-20151201.400/rich-minority-autoloads.el
@@ -0,0 +1,40 @@
+;;; rich-minority-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "rich-minority" "rich-minority.el" (22171 46547
+;;;;;;  0 0))
+;;; Generated autoloads from rich-minority.el
+
+(autoload 'rm--mode-list-as-string-list "rich-minority" "\
+Return `minor-mode-list' as a simple list of strings.
+
+\(fn)" nil nil)
+
+(defvar rich-minority-mode nil "\
+Non-nil if Rich minority mode is enabled.
+See the command `rich-minority-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 `rich-minority-mode'.")
+
+(custom-autoload 'rich-minority-mode "rich-minority" nil)
+
+(autoload 'rich-minority-mode "rich-minority" "\
+Toggle Rich minority mode on or off.
+With a prefix argument ARG, enable Rich minority mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
+\\{rich-minority-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; rich-minority-autoloads.el ends here
diff --git a/emacs.d/elpa/rich-minority-20151201.400/rich-minority-pkg.el b/emacs.d/elpa/rich-minority-20151201.400/rich-minority-pkg.el
new file mode 100644
index 0000000..cb2ce38
--- /dev/null
+++ b/emacs.d/elpa/rich-minority-20151201.400/rich-minority-pkg.el
@@ -0,0 +1 @@
+(define-package "rich-minority" "20151201.400" "Clean-up and Beautify the list of minor-modes." '((cl-lib "0.5")) :url "https://github.com/Malabarba/rich-minority" :keywords '("mode-line" "faces"))
diff --git a/emacs.d/elpa/rich-minority-20151201.400/rich-minority.el b/emacs.d/elpa/rich-minority-20151201.400/rich-minority.el
new file mode 100644
index 0000000..82cbfa1
--- /dev/null
+++ b/emacs.d/elpa/rich-minority-20151201.400/rich-minority.el
@@ -0,0 +1,284 @@
+;;; rich-minority.el --- Clean-up and Beautify the list of minor-modes.
+
+;; Copyright (C) 2014, 2015 Free Software Foundation, Inc.
+
+;; Author: Artur Malabarba <emacs@endlessparentheses.com>
+;; URL: https://github.com/Malabarba/rich-minority
+;; Package-Version: 20151201.400
+;; Package-Requires: ((cl-lib "0.5"))
+;; Version: 1.0.1
+;; Keywords: mode-line faces
+
+;;; Commentary:
+;;
+;;   Emacs package for hiding and/or highlighting the list of minor-modes
+;;   in the mode-line.
+;;
+;;
+;; Usage
+;; ─────
+;;
+;;   To activate the enrichment of your minor-modes list, call `M-x
+;;   rich-minority-mode', or add this to your init file:
+;;
+;;   ┌────
+;;   │ (rich-minority-mode 1)
+;;   └────
+;;
+;;   By default, this has a couple of small effects (provided as examples)
+;;   it is up to you to customize it to your liking with the following
+;;   three variables:
+;;
+;;   `rm-blacklist': List of minor mode names that will be hidden from the
+;;                   minor-modes list. Use this to hide *only* a few modes
+;;                   that are always active and don’t really contribute
+;;                   information.
+;;   `rm-whitelist': List of minor mode names that are allowed on the
+;;                   minor-modes list. Use this to hide *all but* a few
+;;                   modes.
+;;   `rm-text-properties': List text properties to apply to each minor-mode
+;;                         lighter. For instance, by default we highlight
+;;                         `Ovwrt' with a red face, so you always know if
+;;                         you’re in `overwrite-mode'.
+;;
+;;
+;; Comparison to Diminish
+;; ──────────────────────
+;;
+;;   Diminish is an established player in the mode-line world, who also
+;;   handles the minor-modes list. What can rich-minority /offer in
+;;   contrast/?
+;;
+;;   • rich-minority is more versatile:
+;;     1. It accepts *regexps*, instead of having to specify each
+;;        minor-mode individually;
+;;     2. It also offers a *whitelist* behaviour, in addition to the
+;;        blacklist;
+;;     3. It supports *highlighting* specific minor-modes with completely
+;;        arbitrary text properties.
+;;   • rich-minority takes a cleaner, functional approach. It doesn’t hack
+;;     into the `minor-mode-alist' variable.
+;;
+;;   What is rich-minority /missing/?
+;;
+;;   1. It doesn’t have a quick and simple replacement functionality yet.
+;;      Although you can set the `display' property of a minor-mode to
+;;      whatever string you want and that will function as a replacement.
+;;   2. Its source comments lack [Will Mengarini’s poetry]. :-)
+;;
+;;
+;;   [Will Mengarini’s poetry] http://www.eskimo.com/~seldon/diminish.el
+;;
+;;
+;; Installation
+;; ────────────
+;;
+;;   This package is available fom Melpa, you may install it by calling
+;;   `M-x package-install'.
+
+
+;;; Code:
+(require 'cl-lib)
+
+(declare-function lm-version "lisp-mnt")
+(defun rm-bug-report ()
+  "Opens github issues page in a web browser. Please send any bugs you find.
+Please include your Emacs and rich-minority versions."
+  (interactive)
+  (require 'lisp-mnt)
+  (message "Your rm-version is: %s, and your emacs version is: %s.\nPlease include this in your report!"
+           (lm-version "rich-minority.el") emacs-version)
+  (browse-url "https://github.com/Malabarba/rich-minority/issues/new"))
+(defun rm-customize ()
+  "Open the customization menu in the `rich-minority' group."
+  (interactive)
+  (customize-group 'rich-minority t))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Customization variables.
+(defcustom rm-blacklist '(" hl-p")
+  "List of minor modes you want to hide from the mode-line.
+
+Has three possible values:
+
+- nil: All minor modes are shown in the mode-line (but see also
+  `rm-whitelist').
+
+- List of strings: Represents a list of minor mode names that
+  will be hidden from the minor-modes list.
+
+- A string: If this variable is set to a single string, this
+  string must be a regexp. This regexp will be compared to each
+  minor-mode lighter, and those which match are hidden from the
+  minor-mode list.
+
+If you'd like to use a list of regexps, simply use something like the following:
+    (setq rm-blacklist (mapconcat 'identity list-of-regexps \"\\\\|\"))
+
+Don't forget to start each string with a blank space, as most
+minor-mode lighters start with a space."
+  :type '(choice (repeat string)
+                 (regexp :tag "Regular expression."))
+  :group 'rich-minority
+  :package-version '(rich-minority . "0.1.1"))
+(define-obsolete-variable-alias 'rm-excluded-modes 'rm-blacklist "0.1.1")
+(define-obsolete-variable-alias 'rm-hidden-modes 'rm-blacklist "0.1.1")
+
+(defcustom rm-whitelist nil
+  "List of minor modes you want to include in the mode-line.
+
+- nil: All minor modes are shown in the mode-line (but see also
+  `rm-blacklist').
+
+- List of strings: Represents a list of minor mode names that are
+  allowed on the minor-modes list. Any minor-mode whose lighter
+  is not in this list will NOT be displayed.
+
+- A string: If this variable is set to a single string, this
+  string must be a regexp. This regexp will be compared to each
+  minor-mode lighter, and only those which match are displayed on
+  the minor-mode list.
+
+If you'd like to use a list of regexps, simply use something like the following:
+    (setq rm-whitelist (mapconcat 'identity list-of-regexps \"\\\\|\"))
+
+Don't forget to start each string with a blank space, as most
+minor-mode lighters start with a space."
+  :type '(choice (repeat string)
+                 (regexp :tag "Regular expression."))
+  :group 'rich-minority
+  :package-version '(rich-minority . "0.1.1"))
+(define-obsolete-variable-alias 'rm-included-modes 'rm-whitelist "0.1.1")
+
+(defcustom rm-text-properties
+  '(("\\` Ovwrt\\'" 'face 'font-lock-warning-face))
+  "Alist of text properties to be applied to minor-mode lighters.
+The car of each element must be a regexp, and the cdr must be a
+list of text properties.
+
+    (REGEXP PROPERTY-NAME PROPERTY-VALUE ...)
+
+If the regexp matches a minor mode lighter, the text properties
+are applied to it. They are tested in order, and search stops at
+the first match.
+
+These properties take priority over those defined in
+`rm-base-text-properties'."
+  :type '(repeat (cons regexp (repeat sexp)))
+  :group 'rich-minority
+  :package-version '(rich-minority . "0.1"))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Functions and Defvars
+(defconst rm--help-echo-bottom
+  "Mouse-1: Mode Menu.\nMouse-2: Mode Help.\nMouse-3: Toggle Minor Modes.")
+
+(defvar-local rm--help-echo nil
+  "Used to set the help-echo string dynamically.")
+
+;;;###autoload
+(defun rm--mode-list-as-string-list ()
+  "Return `minor-mode-list' as a simple list of strings."
+  (let ((full-list (delete "" (mapcar #'format-mode-line minor-mode-alist))))
+    (setq rm--help-echo
+          (format "Full list:\n   %s\n\n%s"
+                  (mapconcat 'identity full-list "\n   ")
+                  rm--help-echo-bottom))
+    (mapcar #'rm--propertize
+            (rm--remove-hidden-modes full-list))))
+
+(defcustom rm-base-text-properties
+  '('help-echo 'rm--help-echo
+               'mouse-face 'mode-line-highlight
+               'local-map mode-line-minor-mode-keymap)
+  "List of text propeties to apply to every minor mode."
+  :type '(repeat sexp)
+  :group 'rich-minority
+  :package-version '(rich-minority . "0.1"))
+
+(defun rm--propertize (mode)
+  "Propertize the string MODE according to `rm-text-properties'."
+  (if (null (stringp mode))
+      `(:propertize ,mode ,@rm-base-text-properties)
+    (let ((al rm-text-properties)
+          done prop)
+      (while (and (null done) al)
+        (setq done (pop al))
+        (if (string-match (car done) mode)
+            (setq prop (cdr done))
+          (setq done nil)))
+      (eval `(propertize ,mode ,@prop ,@rm-base-text-properties)))))
+
+(defun rm--remove-hidden-modes (li)
+  "Remove from LI elements that match `rm-blacklist' or don't match `rm-whitelist'."
+  (let ((pred (if (listp rm-blacklist) #'member #'rm--string-match))
+        (out li))
+    (when rm-blacklist
+      (setq out
+            (remove nil
+                    (mapcar
+                     (lambda (x) (unless (and (stringp x)
+                                         (funcall pred x rm-blacklist))
+                              x))
+                     out))))
+    (when rm-whitelist
+      (setq pred (if (listp rm-whitelist) #'member #'rm--string-match))
+      (setq out
+            (remove nil
+                    (mapcar
+                     (lambda (x) (unless (and (stringp x)
+                                         (null (funcall pred x rm-whitelist)))
+                              x))
+                     out))))
+    out))
+
+(defun rm--string-match (string regexp)
+  "Like `string-match', but arg STRING comes before REGEXP."
+  (string-match regexp string))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; minor-mode
+(defvar rm--mode-line-construct
+  '(:eval (rm--mode-list-as-string-list))
+  "Construct used to replace `minor-mode-alist'.")
+
+(defvar rm--warning-absent-element
+  "Couldn't find %S inside `mode-line-modes'. If you didn't change it yourself, please file a bug report with M-x rm-bug-report"
+  "Warning message used when something wasn't found.")
+
+(defvar rm--backup-construct nil
+  "Construct containing `minor-mode-alist' which we removed from the mode-line.")
+
+;;;###autoload
+(define-minor-mode rich-minority-mode nil nil " $"
+  :global t
+  (if rich-minority-mode
+      (let ((place (or (member 'minor-mode-alist mode-line-modes)
+                       (cl-member-if
+                        (lambda (x) (and (listp x)
+                                    (equal (car x) :propertize)
+                                    (equal (cadr x) '("" minor-mode-alist))))
+                        mode-line-modes))))
+        (if place
+            (progn
+              (setq rm--backup-construct (car place))
+              (setcar place rm--mode-line-construct))
+          (setq rich-minority-mode nil)
+          (if (member 'sml/pos-id-separator mode-line-format)
+              (message "You don't need to activate rich-minority-mode if you're using smart-mode-line")
+            (warn rm--warning-absent-element 'minor-mode-alist))))
+    (let ((place (member rm--mode-line-construct mode-line-modes)))
+      (if place
+          (setcar place rm--backup-construct)
+        (warn rm--warning-absent-element rm--mode-line-construct)))))
+
+(provide 'rich-minority)
+
+;;; rich-minority.el ends here
+
+;; Local Variables:
+;; nameless-current-name: "rm"
+;; End:
diff --git a/emacs.d/elpa/s-20140910.334/s-autoloads.el b/emacs.d/elpa/s-20140910.334/s-autoloads.el
deleted file mode 100644
index c08f033..0000000
--- a/emacs.d/elpa/s-20140910.334/s-autoloads.el
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; s-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil nil ("s.el") (21570 23223 957519 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; s-autoloads.el ends here
diff --git a/emacs.d/elpa/s-20140910.334/s-pkg.el b/emacs.d/elpa/s-20140910.334/s-pkg.el
deleted file mode 100644
index 4118e50..0000000
--- a/emacs.d/elpa/s-20140910.334/s-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "s" "20140910.334" "The long lost Emacs string manipulation library." 'nil :keywords '("strings"))
diff --git a/emacs.d/elpa/s-20140910.334/s.el b/emacs.d/elpa/s-20140910.334/s.el
deleted file mode 100644
index e216d54..0000000
--- a/emacs.d/elpa/s-20140910.334/s.el
+++ /dev/null
@@ -1,605 +0,0 @@
-;;; s.el --- The long lost Emacs string manipulation library.
-
-;; Copyright (C) 2012 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 20140910.334
-;; X-Original-Version: 1.9.0
-;; Keywords: strings
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; The long lost Emacs string manipulation library.
-;;
-;; See documentation on https://github.com/magnars/s.el#functions
-
-;;; Code:
-
-(require 'ucs-normalize)
-
-(defun s-trim-left (s)
-  "Remove whitespace at the beginning of S."
-  (if (string-match "\\`[ \t\n\r]+" s)
-      (replace-match "" t t s)
-    s))
-
-(defun s-trim-right (s)
-  "Remove whitespace at the end of S."
-  (if (string-match "[ \t\n\r]+\\'" s)
-      (replace-match "" t t s)
-    s))
-
-(defun s-trim (s)
-  "Remove whitespace at the beginning and end of S."
-  (s-trim-left (s-trim-right s)))
-
-(defun s-collapse-whitespace (s)
-  "Convert all adjacent whitespace characters to a single space."
-  (replace-regexp-in-string "[ \t\n\r]+" " " s))
-
-(defun s-split (separator s &optional omit-nulls)
-  "Split S into substrings bounded by matches for regexp SEPARATOR.
-If OMIT-NULLS is non-nil, zero-length substrings are omitted.
-
-This is a simple wrapper around the built-in `split-string'."
-  (split-string s separator omit-nulls))
-
-(defun s-split-up-to (separator s n &optional omit-nulls)
-  "Split S up to N times into substrings bounded by matches for regexp SEPARATOR.
-
-If OMIT-NULLS is non-nil, zero-length substrings are omitted.
-
-See also `s-split'."
-  (save-match-data
-    (let ((op 0)
-          (r nil))
-      (with-temp-buffer
-        (insert s)
-        (setq op (goto-char (point-min)))
-        (while (and (re-search-forward separator nil t)
-                    (< 0 n))
-          (let ((sub (buffer-substring-no-properties op (match-beginning 0))))
-            (unless (and omit-nulls
-                         (equal sub ""))
-              (push sub r)))
-          (setq op (goto-char (match-end 0)))
-          (setq n (1- n)))
-        (if (/= (point) (point-max))
-            (push (buffer-substring-no-properties op (point-max)) r)
-          (unless omit-nulls
-            (push "" r))))
-      (nreverse r))))
-
-(defun s-lines (s)
-  "Splits S into a list of strings on newline characters."
-  (s-split "\\(\r\n\\|[\n\r]\\)" s))
-
-(defun s-join (separator strings)
-  "Join all the strings in STRINGS with SEPARATOR in between."
-  (mapconcat 'identity strings separator))
-
-(defun s-concat (&rest strings)
-  "Join all the string arguments into one string."
-  (apply 'concat strings))
-
-(defun s-prepend (prefix s)
-  "Concatenate PREFIX and S."
-  (concat prefix s))
-
-(defun s-append (suffix s)
-  "Concatenate S and SUFFIX."
-  (concat s suffix))
-
-(defun s-repeat (num s)
-  "Make a string of S repeated NUM times."
-  (let (ss)
-    (while (> num 0)
-      (setq ss (cons s ss))
-      (setq num (1- num)))
-    (apply 'concat ss)))
-
-(defun s-chop-suffix (suffix s)
-  "Remove SUFFIX if it is at end of S."
-  (let ((pos (- (length suffix))))
-    (if (and (>= (length s) (length suffix))
-             (string= suffix (substring s pos)))
-        (substring s 0 pos)
-      s)))
-
-(defun s-chop-suffixes (suffixes s)
-  "Remove SUFFIXES one by one in order, if they are at the end of S."
-  (while suffixes
-    (setq s (s-chop-suffix (car suffixes) s))
-    (setq suffixes (cdr suffixes)))
-  s)
-
-(defun s-chop-prefix (prefix s)
-  "Remove PREFIX if it is at the start of S."
-  (let ((pos (length prefix)))
-    (if (and (>= (length s) (length prefix))
-             (string= prefix (substring s 0 pos)))
-        (substring s pos)
-      s)))
-
-(defun s-chop-prefixes (prefixes s)
-  "Remove PREFIXES one by one in order, if they are at the start of S."
-  (while prefixes
-    (setq s (s-chop-prefix (car prefixes) s))
-    (setq prefixes (cdr prefixes)))
-  s)
-
-(defun s-shared-start (s1 s2)
-  "Returns the longest prefix S1 and S2 have in common."
-  (let ((search-length (min (length s1) (length s2)))
-        (i 0))
-    (while (and (< i search-length)
-                (= (aref s1 i) (aref s2 i)))
-      (setq i (1+ i)))
-    (substring s1 0 i)))
-
-(defun s-shared-end (s1 s2)
-  "Returns the longest suffix S1 and S2 have in common."
-  (let* ((l1 (length s1))
-         (l2 (length s2))
-         (search-length (min l1 l2))
-         (i 0))
-    (while (and (< i search-length)
-                (= (aref s1 (- l1 i 1)) (aref s2 (- l2 i 1))))
-      (setq i (1+ i)))
-    ;; If I is 0, then it means that there's no common suffix between
-    ;; S1 and S2.
-    ;;
-    ;; However, since (substring s (- 0)) will return the whole
-    ;; string, `s-shared-end' should simply return the empty string
-    ;; when I is 0.
-    (if (zerop i)
-        ""
-      (substring s1 (- i)))))
-
-(defun s-chomp (s)
-  "Remove one trailing `\\n`, `\\r` or `\\r\\n` from S."
-  (s-chop-suffixes '("\n" "\r") s))
-
-(defun s-truncate (len s)
-  "If S is longer than LEN, cut it down to LEN - 3 and add ... at the end."
-  (if (> (length s) len)
-      (format "%s..." (substring s 0 (- len 3)))
-    s))
-
-(defun s-word-wrap (len s)
-  "If S is longer than LEN, wrap the words with newlines."
-  (with-temp-buffer
-    (insert s)
-    (let ((fill-column len))
-      (fill-region (point-min) (point-max)))
-    (buffer-substring-no-properties (point-min) (point-max))))
-
-(defun s-center (len s)
-  "If S is shorter than LEN, pad it with spaces so it is centered."
-  (let ((extra (max 0 (- len (length s)))))
-    (concat
-     (make-string (ceiling extra 2) ? )
-     s
-     (make-string (floor extra 2) ? ))))
-
-(defun s-pad-left (len padding s)
-  "If S is shorter than LEN, pad it with PADDING on the left."
-  (let ((extra (max 0 (- len (length s)))))
-    (concat (make-string extra (string-to-char padding))
-            s)))
-
-(defun s-pad-right (len padding s)
-  "If S is shorter than LEN, pad it with PADDING on the right."
-  (let ((extra (max 0 (- len (length s)))))
-    (concat s
-            (make-string extra (string-to-char padding)))))
-
-(defun s-left (len s)
-  "Returns up to the LEN first chars of S."
-  (if (> (length s) len)
-      (substring s 0 len)
-    s))
-
-(defun s-right (len s)
-  "Returns up to the LEN last chars of S."
-  (let ((l (length s)))
-    (if (> l len)
-        (substring s (- l len) l)
-      s)))
-
-(defun s-ends-with? (suffix s &optional ignore-case)
-  "Does S end with SUFFIX?
-
-If IGNORE-CASE is non-nil, the comparison is done without paying
-attention to case differences.
-
-Alias: `s-suffix?'"
-  (let ((start-pos (- (length s) (length suffix))))
-    (and (>= start-pos 0)
-         (eq t (compare-strings suffix nil nil
-                                s start-pos nil ignore-case)))))
-
-(defalias 's-ends-with-p 's-ends-with?)
-
-(defun s-starts-with? (prefix s &optional ignore-case)
-  "Does S start with PREFIX?
-
-If IGNORE-CASE is non-nil, the comparison is done without paying
-attention to case differences.
-
-Alias: `s-prefix?'. This is a simple wrapper around the built-in
-`string-prefix-p'."
-  (string-prefix-p prefix s ignore-case))
-
-(defalias 's-starts-with-p 's-starts-with?)
-
-(defalias 's-suffix? 's-ends-with?)
-(defalias 's-prefix? 's-starts-with?)
-(defalias 's-suffix-p 's-ends-with?)
-(defalias 's-prefix-p 's-starts-with?)
-
-(defun s--truthy? (val)
-  (not (null val)))
-
-(defun s-contains? (needle s &optional ignore-case)
-  "Does S contain NEEDLE?
-
-If IGNORE-CASE is non-nil, the comparison is done without paying
-attention to case differences."
-  (let ((case-fold-search ignore-case))
-    (s--truthy? (string-match-p (regexp-quote needle) s))))
-
-(defalias 's-contains-p 's-contains?)
-
-(defun s-equals? (s1 s2)
-  "Is S1 equal to S2?
-
-This is a simple wrapper around the built-in `string-equal'."
-  (string-equal s1 s2))
-
-(defalias 's-equals-p 's-equals?)
-
-(defun s-less? (s1 s2)
-  "Is S1 less than S2?
-
-This is a simple wrapper around the built-in `string-lessp'."
-  (string-lessp s1 s2))
-
-(defalias 's-less-p 's-less?)
-
-(defun s-matches? (regexp s &optional start)
-  "Does REGEXP match S?
-If START is non-nil the search starts at that index.
-
-This is a simple wrapper around the built-in `string-match-p'."
-  (s--truthy? (string-match-p regexp s start)))
-
-(defalias 's-matches-p 's-matches?)
-
-(defun s-blank? (s)
-  "Is S nil or the empty string?"
-  (or (null s) (string= "" s)))
-
-(defun s-present? (s)
-  "Is S anything but nil or the empty string?"
-  (not (s-blank? s)))
-
-(defun s-presence (s)
-  "Return S if it's `s-present?', otherwise return nil."
-  (and (s-present? s) s))
-
-(defun s-lowercase? (s)
-  "Are all the letters in S in lower case?"
-  (let ((case-fold-search nil))
-    (not (string-match-p "[[:upper:]]" s))))
-
-(defun s-uppercase? (s)
-  "Are all the letters in S in upper case?"
-  (let ((case-fold-search nil))
-    (not (string-match-p "[[:lower:]]" s))))
-
-(defun s-mixedcase? (s)
-  "Are there both lower case and upper case letters in S?"
-  (let ((case-fold-search nil))
-    (s--truthy?
-     (and (string-match-p "[[:lower:]]" s)
-          (string-match-p "[[:upper:]]" s)))))
-
-(defun s-capitalized? (s)
-  "In S, is the first letter upper case, and all other letters lower case?"
-  (let ((case-fold-search nil))
-    (s--truthy?
-     (string-match-p "^[[:upper:]][^[:upper:]]*$" s))))
-
-(defun s-numeric? (s)
-  "Is S a number?"
-  (s--truthy?
-   (string-match-p "^[0-9]+$" s)))
-
-(defun s-replace (old new s)
-  "Replaces OLD with NEW in S."
-  (replace-regexp-in-string (regexp-quote old) new s t t))
-
-(defun s--aget (alist key)
-  (cdr (assoc key alist)))
-
-(defun s-replace-all (replacements s)
-  "REPLACEMENTS is a list of cons-cells. Each `car` is replaced with `cdr` in S."
-  (replace-regexp-in-string (regexp-opt (mapcar 'car replacements))
-                            (lambda (it) (s--aget replacements it))
-                            s))
-
-(defun s-downcase (s)
-  "Convert S to lower case.
-
-This is a simple wrapper around the built-in `downcase'."
-  (downcase s))
-
-(defun s-upcase (s)
-  "Convert S to upper case.
-
-This is a simple wrapper around the built-in `upcase'."
-  (upcase s))
-
-(defun s-capitalize (s)
-  "Convert the first word's first character to upper case and the rest to lower case in S."
-  (concat (upcase (substring s 0 1)) (downcase (substring s 1))))
-
-(defun s-titleize (s)
-  "Convert each word's first character to upper case and the rest to lower case in S.
-
-This is a simple wrapper around the built-in `capitalize'."
-  (capitalize s))
-
-(defmacro s-with (s form &rest more)
-  "Threads S through the forms. Inserts S as the last item
-in the first form, making a list of it if it is not a list
-already. If there are more forms, inserts the first form as the
-last item in second form, etc."
-  (declare (debug (form &rest [&or (function &rest form) fboundp])))
-  (if (null more)
-      (if (listp form)
-          `(,(car form) ,@(cdr form) ,s)
-        (list form s))
-    `(s-with (s-with ,s ,form) ,@more)))
-
-(put 's-with 'lisp-indent-function 1)
-
-(defun s-index-of (needle s &optional ignore-case)
-  "Returns first index of NEEDLE in S, or nil.
-
-If IGNORE-CASE is non-nil, the comparison is done without paying
-attention to case differences."
-  (let ((case-fold-search ignore-case))
-    (string-match-p (regexp-quote needle) s)))
-
-(defun s-reverse (s)
-  "Return the reverse of S."
-  (if (multibyte-string-p s)
-      (let ((input (string-to-list s))
-            (output ()))
-        (while input
-          ;; Handle entire grapheme cluster as a single unit
-          (let ((grapheme (list (pop input))))
-            (while (memql (car input) ucs-normalize-combining-chars)
-              (push (pop input) grapheme))
-            (setq output (nconc (nreverse grapheme) output))))
-        (concat output))
-    (concat (nreverse (string-to-list s)))))
-
-(defun s-match-strings-all (regex string)
-  "Return a list of matches for REGEX in STRING.
-
-Each element itself is a list of matches, as per
-`match-string'. Multiple matches at the same position will be
-ignored after the first."
-  (let ((all-strings ())
-        (i 0))
-    (while (and (< i (length string))
-                (string-match regex string i))
-      (setq i (1+ (match-beginning 0)))
-      (let (strings
-            (num-matches (/ (length (match-data)) 2))
-            (match 0))
-        (while (/= match num-matches)
-          (push (match-string match string) strings)
-          (setq match (1+ match)))
-        (push (nreverse strings) all-strings)))
-    (nreverse all-strings)))
-
-(defun s-match (regexp s &optional start)
-  "When the given expression matches the string, this function returns a list
-of the whole matching string and a string for each matched subexpressions.
-If it did not match the returned value is an empty list (nil).
-
-When START is non-nil the search will start at that index."
-  (save-match-data
-    (if (string-match regexp s start)
-        (let ((match-data-list (match-data))
-              result)
-          (while match-data-list
-            (let* ((beg (car match-data-list))
-                   (end (cadr match-data-list))
-                   (subs (if (and beg end) (substring s beg end) nil)))
-              (setq result (cons subs result))
-              (setq match-data-list
-                    (cddr match-data-list))))
-          (nreverse result)))))
-
-(defun s-slice-at (regexp s)
-  "Slices S up at every index matching REGEXP."
-  (save-match-data
-    (let (i)
-      (setq i (string-match regexp s 1))
-      (if i
-          (cons (substring s 0 i)
-                (s-slice-at regexp (substring s i)))
-        (list s)))))
-
-(defun s-split-words (s)
-  "Split S into list of words."
-  (s-split
-   "[^[:word:]0-9]+"
-   (let ((case-fold-search nil))
-     (replace-regexp-in-string
-      "\\([[:lower:]]\\)\\([[:upper:]]\\)" "\\1 \\2"
-      (replace-regexp-in-string "\\([[:upper:]]\\)\\([[:upper:]][0-9[:lower:]]\\)" "\\1 \\2" s)))
-   t))
-
-(defun s--mapcar-head (fn-head fn-rest list)
-  "Like MAPCAR, but applies a different function to the first element."
-  (if list
-      (cons (funcall fn-head (car list)) (mapcar fn-rest (cdr list)))))
-
-(defun s-lower-camel-case (s)
-  "Convert S to lowerCamelCase."
-  (s-join "" (s--mapcar-head 'downcase 'capitalize (s-split-words s))))
-
-(defun s-upper-camel-case (s)
-  "Convert S to UpperCamelCase."
-  (s-join "" (mapcar 'capitalize (s-split-words s))))
-
-(defun s-snake-case (s)
-  "Convert S to snake_case."
-  (s-join "_" (mapcar 'downcase (s-split-words s))))
-
-(defun s-dashed-words (s)
-  "Convert S to dashed-words."
-  (s-join "-" (mapcar 'downcase (s-split-words s))))
-
-(defun s-capitalized-words (s)
-  "Convert S to Capitalized words."
-  (let ((words (s-split-words s)))
-    (s-join " " (cons (capitalize (car words)) (mapcar 'downcase (cdr words))))))
-
-(defun s-titleized-words (s)
-  "Convert S to Titleized Words."
-  (s-join " " (mapcar 's-titleize (s-split-words s))))
-
-(defun s-word-initials (s)
-  "Convert S to its initials."
-  (s-join "" (mapcar (lambda (ss) (substring ss 0 1))
-                     (s-split-words s))))
-
-;; Errors for s-format
-(progn
-  (put 's-format-resolve
-       'error-conditions
-       '(error s-format s-format-resolve))
-  (put 's-format-resolve
-       'error-message
-       "Cannot resolve a template to values"))
-
-(defun s-format (template replacer &optional extra)
-  "Format TEMPLATE with the function REPLACER.
-
-REPLACER takes an argument of the format variable and optionally
-an extra argument which is the EXTRA value from the call to
-`s-format'.
-
-Several standard `s-format' helper functions are recognized and
-adapted for this:
-
-    (s-format \"${name}\" 'gethash hash-table)
-    (s-format \"${name}\" 'aget alist)
-    (s-format \"$0\" 'elt sequence)
-
-The REPLACER function may be used to do any other kind of
-transformation."
-  (let ((saved-match-data (match-data)))
-    (unwind-protect
-        (replace-regexp-in-string
-         "\\$\\({\\([^}]+\\)}\\|[0-9]+\\)"
-         (lambda (md)
-           (let ((var
-                  (let ((m (match-string 2 md)))
-                    (if m m
-                      (string-to-number (match-string 1 md)))))
-                 (replacer-match-data (match-data)))
-             (unwind-protect
-                 (let ((v
-                        (cond
-                         ((eq replacer 'gethash)
-                          (funcall replacer var extra))
-                         ((eq replacer 'aget)
-                          (funcall 's--aget extra var))
-                         ((eq replacer 'elt)
-                          (funcall replacer extra var))
-                         (t
-                          (set-match-data saved-match-data)
-                          (if extra
-                              (funcall replacer var extra)
-                            (funcall replacer var))))))
-                   (if v v (signal 's-format-resolve md)))
-               (set-match-data replacer-match-data)))) template
-               ;; Need literal to make sure it works
-               t t)
-      (set-match-data saved-match-data))))
-
-(defvar s-lex-value-as-lisp nil
-  "If `t' interpolate lisp values as lisp.
-
-`s-lex-format' inserts values with (format \"%S\").")
-
-(defun s-lex-fmt|expand (fmt)
-  "Expand FMT into lisp."
-  (list 's-format fmt (quote 'aget)
-        (append '(list)
-                (mapcar
-                 (lambda (matches)
-                   (list
-                    'cons
-                    (cadr matches)
-                    `(format
-                      (if s-lex-value-as-lisp "%S" "%s")
-                      ,(intern (cadr matches)))))
-                 (s-match-strings-all "${\\([^}]+\\)}" fmt)))))
-
-(defmacro s-lex-format (format-str)
-  "`s-format` with the current environment.
-
-FORMAT-STR may use the `s-format' variable reference to refer to
-any variable:
-
- (let ((x 1))
-   (s-lex-format \"x is: ${x}\"))
-
-The values of the variables are interpolated with \"%s\" unless
-the variable `s-lex-value-as-lisp' is `t' and then they are
-interpolated with \"%S\"."
-  (declare (debug (form)))
-  (s-lex-fmt|expand format-str))
-
-(defun s-count-matches (regexp s &optional start end)
-  "Count occurrences of `regexp' in `s'.
-
-`start', inclusive, and `end', exclusive, delimit the part of `s'
-to match. "
-  (with-temp-buffer
-    (insert s)
-    (goto-char (point-min))
-    (count-matches regexp (or start 1) (or end (point-max)))))
-
-(defun s-wrap (s prefix &optional suffix)
-  "Wrap string S with PREFIX and optionally SUFFIX.
-
-Return string S with PREFIX prepended.  If SUFFIX is present, it
-is appended, otherwise PREFIX is used as both prefix and
-suffix."
-  (concat prefix s (or suffix prefix)))
-
-(provide 's)
-;;; s.el ends here
diff --git a/emacs.d/elpa/s-20160115.58/s-autoloads.el b/emacs.d/elpa/s-20160115.58/s-autoloads.el
new file mode 100644
index 0000000..1d26489
--- /dev/null
+++ b/emacs.d/elpa/s-20160115.58/s-autoloads.el
@@ -0,0 +1,15 @@
+;;; s-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil nil ("s.el") (22171 46546 426184 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; s-autoloads.el ends here
diff --git a/emacs.d/elpa/s-20160115.58/s-pkg.el b/emacs.d/elpa/s-20160115.58/s-pkg.el
new file mode 100644
index 0000000..f8c3991
--- /dev/null
+++ b/emacs.d/elpa/s-20160115.58/s-pkg.el
@@ -0,0 +1 @@
+(define-package "s" "20160115.58" "The long lost Emacs string manipulation library." 'nil :keywords '("strings"))
diff --git a/emacs.d/elpa/s-20160115.58/s.el b/emacs.d/elpa/s-20160115.58/s.el
new file mode 100644
index 0000000..8652ad1
--- /dev/null
+++ b/emacs.d/elpa/s-20160115.58/s.el
@@ -0,0 +1,618 @@
+;;; s.el --- The long lost Emacs string manipulation library.
+
+;; Copyright (C) 2012-2015 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 1.10.0
+;; Package-Version: 20160115.58
+;; Keywords: strings
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; The long lost Emacs string manipulation library.
+;;
+;; See documentation on https://github.com/magnars/s.el#functions
+
+;;; Code:
+
+(require 'ucs-normalize)
+
+(defun s-trim-left (s)
+  "Remove whitespace at the beginning of S."
+  (if (string-match "\\`[ \t\n\r]+" s)
+      (replace-match "" t t s)
+    s))
+
+(defun s-trim-right (s)
+  "Remove whitespace at the end of S."
+  (if (string-match "[ \t\n\r]+\\'" s)
+      (replace-match "" t t s)
+    s))
+
+(defun s-trim (s)
+  "Remove whitespace at the beginning and end of S."
+  (s-trim-left (s-trim-right s)))
+
+(defun s-collapse-whitespace (s)
+  "Convert all adjacent whitespace characters to a single space."
+  (replace-regexp-in-string "[ \t\n\r]+" " " s))
+
+(defun s-split (separator s &optional omit-nulls)
+  "Split S into substrings bounded by matches for regexp SEPARATOR.
+If OMIT-NULLS is non-nil, zero-length substrings are omitted.
+
+This is a simple wrapper around the built-in `split-string'."
+  (split-string s separator omit-nulls))
+
+(defun s-split-up-to (separator s n &optional omit-nulls)
+  "Split S up to N times into substrings bounded by matches for regexp SEPARATOR.
+
+If OMIT-NULLS is non-nil, zero-length substrings are omitted.
+
+See also `s-split'."
+  (save-match-data
+    (let ((op 0)
+          (r nil))
+      (with-temp-buffer
+        (insert s)
+        (setq op (goto-char (point-min)))
+        (while (and (re-search-forward separator nil t)
+                    (< 0 n))
+          (let ((sub (buffer-substring-no-properties op (match-beginning 0))))
+            (unless (and omit-nulls
+                         (equal sub ""))
+              (push sub r)))
+          (setq op (goto-char (match-end 0)))
+          (setq n (1- n)))
+        (let ((sub (buffer-substring-no-properties op (point-max))))
+          (unless (and omit-nulls
+                       (equal sub ""))
+            (push sub r))))
+      (nreverse r))))
+
+(defun s-lines (s)
+  "Splits S into a list of strings on newline characters."
+  (s-split "\\(\r\n\\|[\n\r]\\)" s))
+
+(defun s-join (separator strings)
+  "Join all the strings in STRINGS with SEPARATOR in between."
+  (mapconcat 'identity strings separator))
+
+(defun s-concat (&rest strings)
+  "Join all the string arguments into one string."
+  (apply 'concat strings))
+
+(defun s-prepend (prefix s)
+  "Concatenate PREFIX and S."
+  (concat prefix s))
+
+(defun s-append (suffix s)
+  "Concatenate S and SUFFIX."
+  (concat s suffix))
+
+(defun s-repeat (num s)
+  "Make a string of S repeated NUM times."
+  (let (ss)
+    (while (> num 0)
+      (setq ss (cons s ss))
+      (setq num (1- num)))
+    (apply 'concat ss)))
+
+(defun s-chop-suffix (suffix s)
+  "Remove SUFFIX if it is at end of S."
+  (let ((pos (- (length suffix))))
+    (if (and (>= (length s) (length suffix))
+             (string= suffix (substring s pos)))
+        (substring s 0 pos)
+      s)))
+
+(defun s-chop-suffixes (suffixes s)
+  "Remove SUFFIXES one by one in order, if they are at the end of S."
+  (while suffixes
+    (setq s (s-chop-suffix (car suffixes) s))
+    (setq suffixes (cdr suffixes)))
+  s)
+
+(defun s-chop-prefix (prefix s)
+  "Remove PREFIX if it is at the start of S."
+  (let ((pos (length prefix)))
+    (if (and (>= (length s) (length prefix))
+             (string= prefix (substring s 0 pos)))
+        (substring s pos)
+      s)))
+
+(defun s-chop-prefixes (prefixes s)
+  "Remove PREFIXES one by one in order, if they are at the start of S."
+  (while prefixes
+    (setq s (s-chop-prefix (car prefixes) s))
+    (setq prefixes (cdr prefixes)))
+  s)
+
+(defun s-shared-start (s1 s2)
+  "Returns the longest prefix S1 and S2 have in common."
+  (let ((search-length (min (length s1) (length s2)))
+        (i 0))
+    (while (and (< i search-length)
+                (= (aref s1 i) (aref s2 i)))
+      (setq i (1+ i)))
+    (substring s1 0 i)))
+
+(defun s-shared-end (s1 s2)
+  "Returns the longest suffix S1 and S2 have in common."
+  (let* ((l1 (length s1))
+         (l2 (length s2))
+         (search-length (min l1 l2))
+         (i 0))
+    (while (and (< i search-length)
+                (= (aref s1 (- l1 i 1)) (aref s2 (- l2 i 1))))
+      (setq i (1+ i)))
+    ;; If I is 0, then it means that there's no common suffix between
+    ;; S1 and S2.
+    ;;
+    ;; However, since (substring s (- 0)) will return the whole
+    ;; string, `s-shared-end' should simply return the empty string
+    ;; when I is 0.
+    (if (zerop i)
+        ""
+      (substring s1 (- i)))))
+
+(defun s-chomp (s)
+  "Remove one trailing `\\n`, `\\r` or `\\r\\n` from S."
+  (s-chop-suffixes '("\n" "\r") s))
+
+(defun s-truncate (len s)
+  "If S is longer than LEN, cut it down to LEN - 3 and add ... at the end."
+  (if (> (length s) len)
+      (format "%s..." (substring s 0 (- len 3)))
+    s))
+
+(defun s-word-wrap (len s)
+  "If S is longer than LEN, wrap the words with newlines."
+  (with-temp-buffer
+    (insert s)
+    (let ((fill-column len))
+      (fill-region (point-min) (point-max)))
+    (buffer-substring-no-properties (point-min) (point-max))))
+
+(defun s-center (len s)
+  "If S is shorter than LEN, pad it with spaces so it is centered."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat
+     (make-string (ceiling extra 2) ? )
+     s
+     (make-string (floor extra 2) ? ))))
+
+(defun s-pad-left (len padding s)
+  "If S is shorter than LEN, pad it with PADDING on the left."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat (make-string extra (string-to-char padding))
+            s)))
+
+(defun s-pad-right (len padding s)
+  "If S is shorter than LEN, pad it with PADDING on the right."
+  (let ((extra (max 0 (- len (length s)))))
+    (concat s
+            (make-string extra (string-to-char padding)))))
+
+(defun s-left (len s)
+  "Returns up to the LEN first chars of S."
+  (if (> (length s) len)
+      (substring s 0 len)
+    s))
+
+(defun s-right (len s)
+  "Returns up to the LEN last chars of S."
+  (let ((l (length s)))
+    (if (> l len)
+        (substring s (- l len) l)
+      s)))
+
+(defun s-ends-with? (suffix s &optional ignore-case)
+  "Does S end with SUFFIX?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences.
+
+Alias: `s-suffix?'"
+  (let ((start-pos (- (length s) (length suffix))))
+    (and (>= start-pos 0)
+         (eq t (compare-strings suffix nil nil
+                                s start-pos nil ignore-case)))))
+
+(defalias 's-ends-with-p 's-ends-with?)
+
+(defun s-starts-with? (prefix s &optional ignore-case)
+  "Does S start with PREFIX?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences.
+
+Alias: `s-prefix?'. This is a simple wrapper around the built-in
+`string-prefix-p'."
+  (string-prefix-p prefix s ignore-case))
+
+(defalias 's-starts-with-p 's-starts-with?)
+
+(defalias 's-suffix? 's-ends-with?)
+(defalias 's-prefix? 's-starts-with?)
+(defalias 's-suffix-p 's-ends-with?)
+(defalias 's-prefix-p 's-starts-with?)
+
+(defun s--truthy? (val)
+  (not (null val)))
+
+(defun s-contains? (needle s &optional ignore-case)
+  "Does S contain NEEDLE?
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+  (let ((case-fold-search ignore-case))
+    (s--truthy? (string-match-p (regexp-quote needle) s))))
+
+(defalias 's-contains-p 's-contains?)
+
+(defun s-equals? (s1 s2)
+  "Is S1 equal to S2?
+
+This is a simple wrapper around the built-in `string-equal'."
+  (string-equal s1 s2))
+
+(defalias 's-equals-p 's-equals?)
+
+(defun s-less? (s1 s2)
+  "Is S1 less than S2?
+
+This is a simple wrapper around the built-in `string-lessp'."
+  (string-lessp s1 s2))
+
+(defalias 's-less-p 's-less?)
+
+(defun s-matches? (regexp s &optional start)
+  "Does REGEXP match S?
+If START is non-nil the search starts at that index.
+
+This is a simple wrapper around the built-in `string-match-p'."
+  (s--truthy? (string-match-p regexp s start)))
+
+(defalias 's-matches-p 's-matches?)
+
+(defun s-blank? (s)
+  "Is S nil or the empty string?"
+  (or (null s) (string= "" s)))
+
+(defun s-present? (s)
+  "Is S anything but nil or the empty string?"
+  (not (s-blank? s)))
+
+(defun s-presence (s)
+  "Return S if it's `s-present?', otherwise return nil."
+  (and (s-present? s) s))
+
+(defun s-lowercase? (s)
+  "Are all the letters in S in lower case?"
+  (let ((case-fold-search nil))
+    (not (string-match-p "[[:upper:]]" s))))
+
+(defun s-uppercase? (s)
+  "Are all the letters in S in upper case?"
+  (let ((case-fold-search nil))
+    (not (string-match-p "[[:lower:]]" s))))
+
+(defun s-mixedcase? (s)
+  "Are there both lower case and upper case letters in S?"
+  (let ((case-fold-search nil))
+    (s--truthy?
+     (and (string-match-p "[[:lower:]]" s)
+          (string-match-p "[[:upper:]]" s)))))
+
+(defun s-capitalized? (s)
+  "In S, is the first letter upper case, and all other letters lower case?"
+  (let ((case-fold-search nil))
+    (s--truthy?
+     (string-match-p "^[[:upper:]][^[:upper:]]*$" s))))
+
+(defun s-numeric? (s)
+  "Is S a number?"
+  (s--truthy?
+   (string-match-p "^[0-9]+$" s)))
+
+(defun s-replace (old new s)
+  "Replaces OLD with NEW in S."
+  (replace-regexp-in-string (regexp-quote old) new s t t))
+
+(defun s--aget (alist key)
+  (cdr (assoc key alist)))
+
+(defun s-replace-all (replacements s)
+  "REPLACEMENTS is a list of cons-cells. Each `car` is replaced with `cdr` in S."
+  (replace-regexp-in-string (regexp-opt (mapcar 'car replacements))
+                            (lambda (it) (s--aget replacements it))
+                            s))
+
+(defun s-downcase (s)
+  "Convert S to lower case.
+
+This is a simple wrapper around the built-in `downcase'."
+  (downcase s))
+
+(defun s-upcase (s)
+  "Convert S to upper case.
+
+This is a simple wrapper around the built-in `upcase'."
+  (upcase s))
+
+(defun s-capitalize (s)
+  "Convert the first word's first character to upper case and the rest to lower case in S."
+  (concat (upcase (substring s 0 1)) (downcase (substring s 1))))
+
+(defun s-titleize (s)
+  "Convert each word's first character to upper case and the rest to lower case in S.
+
+This is a simple wrapper around the built-in `capitalize'."
+  (capitalize s))
+
+(defmacro s-with (s form &rest more)
+  "Threads S through the forms. Inserts S as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, inserts the first form as the
+last item in second form, etc."
+  (declare (debug (form &rest [&or (function &rest form) fboundp])))
+  (if (null more)
+      (if (listp form)
+          `(,(car form) ,@(cdr form) ,s)
+        (list form s))
+    `(s-with (s-with ,s ,form) ,@more)))
+
+(put 's-with 'lisp-indent-function 1)
+
+(defun s-index-of (needle s &optional ignore-case)
+  "Returns first index of NEEDLE in S, or nil.
+
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+  (let ((case-fold-search ignore-case))
+    (string-match-p (regexp-quote needle) s)))
+
+(defun s-reverse (s)
+  "Return the reverse of S."
+  (if (multibyte-string-p s)
+      (let ((input (string-to-list s))
+            (output ()))
+        (while input
+          ;; Handle entire grapheme cluster as a single unit
+          (let ((grapheme (list (pop input))))
+            (while (memql (car input) ucs-normalize-combining-chars)
+              (push (pop input) grapheme))
+            (setq output (nconc (nreverse grapheme) output))))
+        (concat output))
+    (concat (nreverse (string-to-list s)))))
+
+(defun s-match-strings-all (regex string)
+  "Return a list of matches for REGEX in STRING.
+
+Each element itself is a list of matches, as per
+`match-string'. Multiple matches at the same position will be
+ignored after the first."
+  (let ((all-strings ())
+        (i 0))
+    (while (and (< i (length string))
+                (string-match regex string i))
+      (setq i (1+ (match-beginning 0)))
+      (let (strings
+            (num-matches (/ (length (match-data)) 2))
+            (match 0))
+        (while (/= match num-matches)
+          (push (match-string match string) strings)
+          (setq match (1+ match)))
+        (push (nreverse strings) all-strings)))
+    (nreverse all-strings)))
+
+(defun s-matched-positions-all (regexp string &optional subexp-depth)
+  "Return a list of matched positions for REGEXP in STRING.
+SUBEXP-DEPTH is 0 by default."
+  (if (null subexp-depth)
+      (setq subexp-depth 0))
+  (let ((pos 0) result)
+    (while (and (string-match regexp string pos)
+                (< pos (length string)))
+      (let ((m (match-end subexp-depth)))
+        (push (cons (match-beginning subexp-depth) (match-end subexp-depth)) result)
+        (setq pos m)))
+    (nreverse result)))
+
+(defun s-match (regexp s &optional start)
+  "When the given expression matches the string, this function returns a list
+of the whole matching string and a string for each matched subexpressions.
+If it did not match the returned value is an empty list (nil).
+
+When START is non-nil the search will start at that index."
+  (save-match-data
+    (if (string-match regexp s start)
+        (let ((match-data-list (match-data))
+              result)
+          (while match-data-list
+            (let* ((beg (car match-data-list))
+                   (end (cadr match-data-list))
+                   (subs (if (and beg end) (substring s beg end) nil)))
+              (setq result (cons subs result))
+              (setq match-data-list
+                    (cddr match-data-list))))
+          (nreverse result)))))
+
+(defun s-slice-at (regexp s)
+  "Slices S up at every index matching REGEXP."
+  (save-match-data
+    (let (i)
+      (setq i (string-match regexp s 1))
+      (if i
+          (cons (substring s 0 i)
+                (s-slice-at regexp (substring s i)))
+        (list s)))))
+
+(defun s-split-words (s)
+  "Split S into list of words."
+  (s-split
+   "[^[:word:]0-9]+"
+   (let ((case-fold-search nil))
+     (replace-regexp-in-string
+      "\\([[:lower:]]\\)\\([[:upper:]]\\)" "\\1 \\2"
+      (replace-regexp-in-string "\\([[:upper:]]\\)\\([[:upper:]][0-9[:lower:]]\\)" "\\1 \\2" s)))
+   t))
+
+(defun s--mapcar-head (fn-head fn-rest list)
+  "Like MAPCAR, but applies a different function to the first element."
+  (if list
+      (cons (funcall fn-head (car list)) (mapcar fn-rest (cdr list)))))
+
+(defun s-lower-camel-case (s)
+  "Convert S to lowerCamelCase."
+  (s-join "" (s--mapcar-head 'downcase 'capitalize (s-split-words s))))
+
+(defun s-upper-camel-case (s)
+  "Convert S to UpperCamelCase."
+  (s-join "" (mapcar 'capitalize (s-split-words s))))
+
+(defun s-snake-case (s)
+  "Convert S to snake_case."
+  (s-join "_" (mapcar 'downcase (s-split-words s))))
+
+(defun s-dashed-words (s)
+  "Convert S to dashed-words."
+  (s-join "-" (mapcar 'downcase (s-split-words s))))
+
+(defun s-capitalized-words (s)
+  "Convert S to Capitalized words."
+  (let ((words (s-split-words s)))
+    (s-join " " (cons (capitalize (car words)) (mapcar 'downcase (cdr words))))))
+
+(defun s-titleized-words (s)
+  "Convert S to Titleized Words."
+  (s-join " " (mapcar 's-titleize (s-split-words s))))
+
+(defun s-word-initials (s)
+  "Convert S to its initials."
+  (s-join "" (mapcar (lambda (ss) (substring ss 0 1))
+                     (s-split-words s))))
+
+;; Errors for s-format
+(progn
+  (put 's-format-resolve
+       'error-conditions
+       '(error s-format s-format-resolve))
+  (put 's-format-resolve
+       'error-message
+       "Cannot resolve a template to values"))
+
+(defun s-format (template replacer &optional extra)
+  "Format TEMPLATE with the function REPLACER.
+
+REPLACER takes an argument of the format variable and optionally
+an extra argument which is the EXTRA value from the call to
+`s-format'.
+
+Several standard `s-format' helper functions are recognized and
+adapted for this:
+
+    (s-format \"${name}\" 'gethash hash-table)
+    (s-format \"${name}\" 'aget alist)
+    (s-format \"$0\" 'elt sequence)
+
+The REPLACER function may be used to do any other kind of
+transformation."
+  (let ((saved-match-data (match-data)))
+    (unwind-protect
+        (replace-regexp-in-string
+         "\\$\\({\\([^}]+\\)}\\|[0-9]+\\)"
+         (lambda (md)
+           (let ((var
+                  (let ((m (match-string 2 md)))
+                    (if m m
+                      (string-to-number (match-string 1 md)))))
+                 (replacer-match-data (match-data)))
+             (unwind-protect
+                 (let ((v
+                        (cond
+                         ((eq replacer 'gethash)
+                          (funcall replacer var extra))
+                         ((eq replacer 'aget)
+                          (funcall 's--aget extra var))
+                         ((eq replacer 'elt)
+                          (funcall replacer extra var))
+                         (t
+                          (set-match-data saved-match-data)
+                          (if extra
+                              (funcall replacer var extra)
+                            (funcall replacer var))))))
+                   (if v v (signal 's-format-resolve md)))
+               (set-match-data replacer-match-data)))) template
+               ;; Need literal to make sure it works
+               t t)
+      (set-match-data saved-match-data))))
+
+(defvar s-lex-value-as-lisp nil
+  "If `t' interpolate lisp values as lisp.
+
+`s-lex-format' inserts values with (format \"%S\").")
+
+(defun s-lex-fmt|expand (fmt)
+  "Expand FMT into lisp."
+  (list 's-format fmt (quote 'aget)
+        (append '(list)
+                (mapcar
+                 (lambda (matches)
+                   (list
+                    'cons
+                    (cadr matches)
+                    `(format
+                      (if s-lex-value-as-lisp "%S" "%s")
+                      ,(intern (cadr matches)))))
+                 (s-match-strings-all "${\\([^}]+\\)}" fmt)))))
+
+(defmacro s-lex-format (format-str)
+  "`s-format` with the current environment.
+
+FORMAT-STR may use the `s-format' variable reference to refer to
+any variable:
+
+ (let ((x 1))
+   (s-lex-format \"x is: ${x}\"))
+
+The values of the variables are interpolated with \"%s\" unless
+the variable `s-lex-value-as-lisp' is `t' and then they are
+interpolated with \"%S\"."
+  (declare (debug (form)))
+  (s-lex-fmt|expand format-str))
+
+(defun s-count-matches (regexp s &optional start end)
+  "Count occurrences of `regexp' in `s'.
+
+`start', inclusive, and `end', exclusive, delimit the part of `s'
+to match. "
+  (with-temp-buffer
+    (insert s)
+    (goto-char (point-min))
+    (count-matches regexp (or start 1) (or end (point-max)))))
+
+(defun s-wrap (s prefix &optional suffix)
+  "Wrap string S with PREFIX and optionally SUFFIX.
+
+Return string S with PREFIX prepended.  If SUFFIX is present, it
+is appended, otherwise PREFIX is used as both prefix and
+suffix."
+  (concat prefix s (or suffix prefix)))
+
+(provide 's)
+;;; s.el ends here
diff --git a/emacs.d/elpa/sass-mode-20150508.2012/sass-mode-autoloads.el b/emacs.d/elpa/sass-mode-20150508.2012/sass-mode-autoloads.el
new file mode 100644
index 0000000..c41249a
--- /dev/null
+++ b/emacs.d/elpa/sass-mode-20150508.2012/sass-mode-autoloads.el
@@ -0,0 +1,25 @@
+;;; sass-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "sass-mode" "sass-mode.el" (22139 28318 0 0))
+;;; Generated autoloads from sass-mode.el
+
+(autoload 'sass-mode "sass-mode" "\
+Major mode for editing Sass files.
+
+\\{sass-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.sass\\'" . sass-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; sass-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/sass-mode-20150508.2012/sass-mode-pkg.el b/emacs.d/elpa/sass-mode-20150508.2012/sass-mode-pkg.el
new file mode 100644
index 0000000..310a0bc
--- /dev/null
+++ b/emacs.d/elpa/sass-mode-20150508.2012/sass-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "sass-mode" "20150508.2012" "Major mode for editing Sass files" '((haml-mode "3.0.15") (cl-lib "0.5")) :url "http://github.com/nex3/haml/tree/master" :keywords '("markup" "language" "css"))
diff --git a/emacs.d/elpa/sass-mode-20150508.2012/sass-mode.el b/emacs.d/elpa/sass-mode-20150508.2012/sass-mode.el
new file mode 100644
index 0000000..fa859e3
--- /dev/null
+++ b/emacs.d/elpa/sass-mode-20150508.2012/sass-mode.el
@@ -0,0 +1,244 @@
+;;; sass-mode.el --- Major mode for editing Sass files
+
+;; Copyright (c) 2007, 2008 Natalie Weizenbaum
+
+;; Author: Natalie Weizenbaum
+;; URL: http://github.com/nex3/haml/tree/master
+;; Package-Version: 20150508.2012
+;; Version: 3.0.16
+;; Created: 2007-03-15
+;; By: Natalie Weizenbaum
+;; Keywords: markup, language, css
+;; Package-Requires: ((haml-mode "3.0.15") (cl-lib "0.5"))
+
+;;; Commentary:
+
+;; Because Sass's indentation schema is similar
+;; to that of YAML and Python, many indentation-related
+;; functions are similar to those in yaml-mode and python-mode.
+
+;; To install, save this on your load path and add the following to
+;; your .emacs file:
+;;
+;; (require 'sass-mode)
+
+;; sass-mode requires haml-mode, which can be found at http://github.com/nex3/haml-mode.
+
+;;; Code:
+
+(require 'haml-mode)
+(require 'cl-lib)
+
+;; User definable variables
+
+(defgroup sass nil
+  "Support for the Sass template language."
+  :group 'languages
+  :prefix "sass-")
+
+(defcustom sass-mode-hook nil
+  "Hook run when entering Sass mode."
+  :type 'hook
+  :group 'sass)
+
+(defcustom sass-indent-offset 2
+  "Amount of offset per level of indentation."
+  :type 'integer
+  :group 'sass)
+
+(defvar sass-non-block-openers
+  '("^.*,$" ;; Continued selectors
+    "^ *@\\(extend\\|debug\\|warn\\|include\\|import\\)" ;; Single-line mixins
+    "^ *[$!]" ;; Variables
+    "^ *[[:alnum:]\\-]+ *:" ;; Plain attribute values
+    )
+  "A list of regexps that match lines of Sass that couldn't have
+text nested beneath them.")
+
+;; Font lock
+
+(defconst sass-selector-font-lock-keywords
+  '(;; Attribute selectors (e.g. p[foo=bar])
+    ("\\[\\([^]=]+\\)" (1 font-lock-variable-name-face)
+     ("[~|$^*]?=\\([^]=]+\\)" nil nil (1 font-lock-string-face)))
+    ("&"       0 font-lock-constant-face)
+    ("\\.\\w+" 0 font-lock-type-face)
+    ("#\\w+"   0 font-lock-keyword-face)
+    ;; Pseudo-selectors, optionally with arguments (e.g. :first, :nth-child(12))
+    ("\\(::?\\w+\\)" (1 font-lock-function-name-face)
+     ("(\\([^)]+\\))" nil nil (1 font-lock-string-face)))))
+
+(defconst sass-script-font-lock-keywords
+  `(("\"\\([^\"\\\\]\\|\\\\.\\)*\"" 0 font-lock-string-face)
+    ("!\\(\\w\\|_\\)+" 0 font-lock-variable-name-face)
+    ("#[0-9a-fA-F]\\{0,6\\}" 0 font-lock-preprocessor-face)
+    (,(regexp-opt
+       '("true" "false" "black" "silver" "gray" "white" "maroon" "red"
+         "purple" "fuchsia" "green" "lime" "olive" "yellow" "navy"
+         "blue" "teal" "aqua"))
+     0 font-lock-constant-face)
+    (,(regexp-opt '("and" "or" "not")) 0 font-lock-keyword-face)))
+
+(defconst sass-syntax-table
+  (let ((st (make-syntax-table)))
+    (modify-syntax-entry ?- "w" st)
+    (modify-syntax-entry ?_ "w" st)
+    st))
+
+(defconst sass-script-syntax-table
+  (let ((st (make-syntax-table sass-syntax-table)))
+    (modify-syntax-entry ?- "." st)
+    st))
+
+(defconst sass-font-lock-keywords
+  '((sass-highlight-line 1 nil nil t)))
+
+(defconst sass-line-keywords
+  '(("@\\(\\w+\\)"    0 font-lock-keyword-face sass-highlight-directive)
+    ("/[/*].*"  0 font-lock-comment-face)
+    ("[=+]\\w+" 0 font-lock-function-name-face sass-highlight-script-after-match)
+    ("!\\w+"    0 font-lock-variable-name-face sass-highlight-script-after-match)
+    (":\\w+"    0 font-lock-variable-name-face)
+    ("\\w+\s*:" 0 font-lock-variable-name-face)
+    ("\\(\\w+\\)\s*="  1 font-lock-variable-name-face sass-highlight-script-after-match)
+    ("\\(:\\w+\\)\s*=" 1 font-lock-variable-name-face sass-highlight-script-after-match)
+    (".*"      sass-highlight-selector))
+  "A list of full-line Sass syntax to highlight, used by `sass-highlight-line'.
+
+Each item is either of the form (REGEXP SUBEXP FACE), (REGEXP FN),
+or (REGEXP SUBEXP FACE FN).  Each REGEXP is run successively on the
+beginning of non-whitespace on the current line until one matches.
+If it has SUBEXP and FACE, then SUBEXP is highlighted using FACE.
+If it has FN, FN is run.")
+
+(defun sass-highlight-line (limit)
+  "Highlight a single line using some Sass single-line syntax.
+This syntax is taken from `sass-line-keywords'.
+LIMIT is the limit of the search."
+  (save-match-data
+    (when (re-search-forward "^ *\\(.+\\)$" limit t)
+      (goto-char (match-beginning 1))
+      (dolist (keyword sass-line-keywords)
+        (cl-destructuring-bind
+            (keyword subexp-or-fn &optional face fn) keyword
+          (when (looking-at keyword)
+            (if (integerp subexp-or-fn)
+                (put-text-property (match-beginning subexp-or-fn)
+                                   (match-end subexp-or-fn)
+                                   'face face)
+              (setq fn subexp-or-fn))
+            (when fn (funcall fn))
+            (end-of-line)
+            (cl-return t)))))))
+
+(defun sass-highlight-selector ()
+  "Highlight a CSS selector starting at `point' and ending at `end-of-line'."
+  (let ((font-lock-keywords sass-selector-font-lock-keywords)
+        font-lock-multiline)
+    (font-lock-fontify-region
+     (point) (progn (end-of-line) (point))))
+  t)
+
+(defun sass-highlight-script (beg end)
+  "Highlight a section of SassScript between BEG and END."
+  (save-match-data
+    (with-syntax-table sass-script-syntax-table
+      (let ((font-lock-keywords sass-script-font-lock-keywords)
+            font-lock-syntax-table
+            font-lock-extend-region-functions)
+        (font-lock-fontify-region beg end)))))
+
+(defun sass-highlight-script-after-match ()
+  "Highlight a section of SassScript after the last match."
+  (end-of-line)
+  (sass-highlight-script (match-end 0) (point)))
+
+(defun sass-highlight-directive ()
+  "Highlight a Sass directive."
+  (goto-char (match-end 0))
+  (cl-block nil
+    (cl-case (intern (match-string 1))
+      (for
+       (unless (looking-at " +!\\w+") (cl-return))
+       (put-text-property (match-beginning 0) (match-end 0)
+                          'face font-lock-variable-name-face)
+       (goto-char (match-end 0))
+       (unless (looking-at " +from") (cl-return))
+       (put-text-property (match-beginning 0) (match-end 0)
+                          'face font-lock-keyword-face)
+       (goto-char (match-end 0))
+       (when (looking-at " +\\(.+?\\) +\\(to\\|through\\)")
+         (sass-highlight-script (match-beginning 1) (match-end 1))
+         (put-text-property (match-beginning 2) (match-end 2)
+                            'face font-lock-keyword-face))
+       (sass-highlight-script-after-match))
+
+      (else
+       (unless (looking-at " +if") (cl-return))
+       (put-text-property (match-beginning 0) (match-end 0)
+                          'face font-lock-keyword-face)
+       (sass-highlight-script-after-match))
+
+      ((if while debug) (sass-highlight-script-after-match)))))
+
+;; Constants
+
+;; Mode setup
+
+(defvar sass-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-c\C-r" 'sass-output-region)
+    (define-key map "\C-c\C-l" 'sass-output-buffer)
+    map))
+
+;;;###autoload
+(define-derived-mode sass-mode haml-mode "Sass"
+  "Major mode for editing Sass files.
+
+\\{sass-mode-map}"
+  (set-syntax-table sass-syntax-table)
+  (setq font-lock-extend-region-functions
+        '(font-lock-extend-region-wholelines font-lock-extend-region-multiline))
+  (set (make-local-variable 'font-lock-multiline) nil)
+  (set (make-local-variable 'comment-start) "/*")
+  (set (make-local-variable 'comment-start-skip) "/[/*]\s*")
+  (set (make-local-variable 'haml-indent-function) 'sass-indent-p)
+  (set (make-local-variable 'haml-indent-offset) sass-indent-offset)
+  (setq font-lock-defaults '(sass-font-lock-keywords t t)))
+
+;; Indentation
+
+(defun sass-indent-p ()
+  "Return non-nil if the current line can have lines nested beneath it."
+  (cl-loop for opener in sass-non-block-openers
+           if (looking-at opener) return nil
+           finally return t))
+
+;; Command
+
+(defun sass-output-region (start end)
+  "Displays the CSS output for the current block of Sass code.
+Called from a program, START and END specify the region to indent."
+  (interactive "r")
+  (let ((output-buffer "*sass-output*")
+        (errors-buffer "*sass-errors*"))
+    (shell-command-on-region start end "sass --stdin"
+                             output-buffer
+                             nil
+                             errors-buffer)
+    (when (fboundp 'css-mode)
+      (with-current-buffer output-buffer
+        (css-mode)))
+    (switch-to-buffer-other-window output-buffer)))
+
+(defun sass-output-buffer ()
+  "Displays the CSS output for entire buffer."
+  (interactive)
+  (sass-output-region (point-min) (point-max)))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.sass\\'" . sass-mode))
+
+;; Setup/Activation
+(provide 'sass-mode)
+;;; sass-mode.el ends here
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-everything.user.js b/emacs.d/elpa/skewer-mode-20150422.1818/skewer-everything.user.js
deleted file mode 100644
index ad0158d..0000000
--- a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-everything.user.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// ==UserScript==
-// @name         Skewer Everything
-// @description  Add a toggle button to run Skewer on the current page
-// @lastupdated  2013-01-24
-// @version      1.1
-// @license      Public Domain
-// @include      /^https?:///
-// ==/UserScript==
-
-var host = 'http://localhost:8080';
-
-var toggle = document.createElement('div');
-toggle.onclick = inject;
-toggle.style.width = '0px';
-toggle.style.height = '0px';
-toggle.style.borderStyle = 'solid';
-toggle.style.borderWidth = '0 12px 12px 0';
-toggle.style.borderColor = 'transparent #F00 transparent transparent';
-toggle.style.position = 'absolute';
-toggle.style.right = 0;
-toggle.style.top = 0;
-toggle.style.zIndex = 214748364;
-
-var injected = false;
-
-function inject() {
-    if (!injected) {
-        var script = document.createElement('script');
-        script.src = host + '/skewer';
-        document.body.appendChild(script);
-        toggle.style.borderRightColor = '#0F0';
-    } else {
-        /* break skewer to disable it */
-        if (unsafeWindow.skewer) { // Greasemonkey
-            unsafeWindow.skewer.fn = null;
-        } else if (unsafeWindow.window.skewer) { // Tampermonkey
-            unsafeWindow.window.skewer.fn = null;
-        }
-        toggle.style.borderRightColor = '#F00';
-    }
-    injected = !injected;
-    GM_setValue('auto.' + location, injected);
-}
-
-/* Don't use on iframes. */
-if (window.top === window.self) {
-    document.body.appendChild(toggle);
-    if (GM_getValue('auto.' + location)) {
-        inject();
-    }
-}
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode-autoloads.el b/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode-autoloads.el
deleted file mode 100644
index 3c9dbbc..0000000
--- a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode-autoloads.el
+++ /dev/null
@@ -1,110 +0,0 @@
-;;; skewer-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "skewer-bower" "skewer-bower.el" (21836 47293
-;;;;;;  0 0))
-;;; Generated autoloads from skewer-bower.el
-
-(autoload 'skewer-bower-refresh "skewer-bower" "\
-Update the package listing and packages synchronously.
-
-\(fn)" t nil)
-
-(autoload 'skewer-bower-load "skewer-bower" "\
-Dynamically load a library from bower into the current page.
-
-\(fn PACKAGE &optional VERSION)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "skewer-css" "skewer-css.el" (21836 47293 0
-;;;;;;  0))
-;;; Generated autoloads from skewer-css.el
-
-(autoload 'skewer-css-mode "skewer-css" "\
-Minor mode for interactively loading new CSS rules.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "skewer-html" "skewer-html.el" (21836 47293
-;;;;;;  0 0))
-;;; Generated autoloads from skewer-html.el
-
-(autoload 'skewer-html-mode "skewer-html" "\
-Minor mode for interactively loading new HTML.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "skewer-mode" "skewer-mode.el" (21836 47293
-;;;;;;  0 0))
-;;; Generated autoloads from skewer-mode.el
-
-(autoload 'list-skewer-clients "skewer-mode" "\
-List the attached browsers in a buffer.
-
-\(fn)" t nil)
-
-(autoload 'skewer-mode "skewer-mode" "\
-Minor mode for interacting with a browser.
-
-\(fn &optional ARG)" t nil)
-
-(autoload 'run-skewer "skewer-mode" "\
-Attach a browser to Emacs for a skewer JavaScript REPL. Uses
-`browse-url' to launch a browser.
-
-\(fn)" t nil)
-
-(autoload 'skewer-run-phantomjs "skewer-mode" "\
-Connect an inferior PhantomJS process to Skewer, returning the process.
-
-\(fn)" t nil)
-
-;;;***
-
-;;;### (autoloads nil "skewer-repl" "skewer-repl.el" (21836 47293
-;;;;;;  0 0))
-;;; Generated autoloads from skewer-repl.el
-
-(autoload 'skewer-repl--response-hook "skewer-repl" "\
-Catches all browser messages logging some to the REPL.
-
-\(fn RESPONSE)" nil nil)
-
-(autoload 'skewer-repl "skewer-repl" "\
-Start a JavaScript REPL to be evaluated in the visiting browser.
-
-\(fn)" t nil)
-
-(eval-after-load 'skewer-mode '(progn (add-hook 'skewer-response-hook #'skewer-repl--response-hook) (add-hook 'skewer-repl-mode-hook #'skewer-repl-mode-compilation-shell-hook) (define-key skewer-mode-map (kbd "C-c C-z") #'skewer-repl)))
-
-;;;***
-
-;;;### (autoloads nil "skewer-setup" "skewer-setup.el" (21836 47293
-;;;;;;  0 0))
-;;; Generated autoloads from skewer-setup.el
-
-(autoload 'skewer-setup "skewer-setup" "\
-Fully integrate Skewer into js2-mode, css-mode, and html-mode buffers.
-
-\(fn)" nil nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("cache-table.el" "skewer-mode-pkg.el")
-;;;;;;  (21836 47293 128442 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; skewer-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode-pkg.el b/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode-pkg.el
deleted file mode 100644
index 580593b..0000000
--- a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode-pkg.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(define-package "skewer-mode" "20150422.1818" "live browser JavaScript, CSS, and HTML interaction"
-  '((simple-httpd "1.4.0")
-    (js2-mode "20090723")
-    (emacs "24")))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/cache-table.el b/emacs.d/elpa/skewer-mode-20150914.1304/cache-table.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/cache-table.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/cache-table.el
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/example.html b/emacs.d/elpa/skewer-mode-20150914.1304/example.html
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/example.html
rename to emacs.d/elpa/skewer-mode-20150914.1304/example.html
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-bower.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-bower.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer-bower.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer-bower.el
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-css.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-css.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer-css.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer-css.el
diff --git a/emacs.d/elpa/skewer-mode-20150914.1304/skewer-everything.user.js b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-everything.user.js
new file mode 100644
index 0000000..6a2d9cd
--- /dev/null
+++ b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-everything.user.js
@@ -0,0 +1,48 @@
+// ==UserScript==
+// @name         Skewer Everything
+// @description  Add a toggle button to run Skewer on the current page
+// @lastupdated  2015-09-14
+// @version      1.2
+// @license      Public Domain
+// @include      /^https?:///
+// @grant        none
+// ==/UserScript==
+
+var host = 'http://localhost:8080';
+
+var toggle = document.createElement('div');
+toggle.onclick = inject;
+toggle.style.width = '0px';
+toggle.style.height = '0px';
+toggle.style.borderStyle = 'solid';
+toggle.style.borderWidth = '0 12px 12px 0';
+toggle.style.borderColor = 'transparent #F00 transparent transparent';
+toggle.style.position = 'absolute';
+toggle.style.right = 0;
+toggle.style.top = 0;
+toggle.style.zIndex = 214748364;
+
+var injected = false;
+
+function inject() {
+    if (!injected) {
+        var script = document.createElement('script');
+        script.src = host + '/skewer';
+        document.body.appendChild(script);
+        toggle.style.borderRightColor = '#0F0';
+    } else {
+        /* break skewer to disable it */
+        skewer.fn = null;
+        toggle.style.borderRightColor = '#F00';
+    }
+    injected = !injected;
+    localStorage._autoskewered = JSON.stringify(injected);
+}
+
+/* Don't use on iframes. */
+if (window.top === window.self) {
+    document.body.appendChild(toggle);
+    if (JSON.parse(localStorage._autoskewered || 'false')) {
+        inject();
+    }
+}
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-html.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-html.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer-html.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer-html.el
diff --git a/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode-autoloads.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode-autoloads.el
new file mode 100644
index 0000000..7fa54cd
--- /dev/null
+++ b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode-autoloads.el
@@ -0,0 +1,110 @@
+;;; skewer-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "skewer-bower" "skewer-bower.el" (22171 46545
+;;;;;;  0 0))
+;;; Generated autoloads from skewer-bower.el
+
+(autoload 'skewer-bower-refresh "skewer-bower" "\
+Update the package listing and packages synchronously.
+
+\(fn)" t nil)
+
+(autoload 'skewer-bower-load "skewer-bower" "\
+Dynamically load a library from bower into the current page.
+
+\(fn PACKAGE &optional VERSION)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "skewer-css" "skewer-css.el" (22171 46545 0
+;;;;;;  0))
+;;; Generated autoloads from skewer-css.el
+
+(autoload 'skewer-css-mode "skewer-css" "\
+Minor mode for interactively loading new CSS rules.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "skewer-html" "skewer-html.el" (22171 46545
+;;;;;;  0 0))
+;;; Generated autoloads from skewer-html.el
+
+(autoload 'skewer-html-mode "skewer-html" "\
+Minor mode for interactively loading new HTML.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "skewer-mode" "skewer-mode.el" (22171 46545
+;;;;;;  0 0))
+;;; Generated autoloads from skewer-mode.el
+
+(autoload 'list-skewer-clients "skewer-mode" "\
+List the attached browsers in a buffer.
+
+\(fn)" t nil)
+
+(autoload 'skewer-mode "skewer-mode" "\
+Minor mode for interacting with a browser.
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'run-skewer "skewer-mode" "\
+Attach a browser to Emacs for a skewer JavaScript REPL. Uses
+`browse-url' to launch a browser.
+
+\(fn)" t nil)
+
+(autoload 'skewer-run-phantomjs "skewer-mode" "\
+Connect an inferior PhantomJS process to Skewer, returning the process.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "skewer-repl" "skewer-repl.el" (22171 46545
+;;;;;;  0 0))
+;;; Generated autoloads from skewer-repl.el
+
+(autoload 'skewer-repl--response-hook "skewer-repl" "\
+Catches all browser messages logging some to the REPL.
+
+\(fn RESPONSE)" nil nil)
+
+(autoload 'skewer-repl "skewer-repl" "\
+Start a JavaScript REPL to be evaluated in the visiting browser.
+
+\(fn)" t nil)
+
+(eval-after-load 'skewer-mode '(progn (add-hook 'skewer-response-hook #'skewer-repl--response-hook) (add-hook 'skewer-repl-mode-hook #'skewer-repl-mode-compilation-shell-hook) (define-key skewer-mode-map (kbd "C-c C-z") #'skewer-repl)))
+
+;;;***
+
+;;;### (autoloads nil "skewer-setup" "skewer-setup.el" (22171 46545
+;;;;;;  0 0))
+;;; Generated autoloads from skewer-setup.el
+
+(autoload 'skewer-setup "skewer-setup" "\
+Fully integrate Skewer into js2-mode, css-mode, and html-mode buffers.
+
+\(fn)" nil nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("cache-table.el" "skewer-mode-pkg.el")
+;;;;;;  (22171 46545 442173 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; skewer-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode-pkg.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode-pkg.el
new file mode 100644
index 0000000..daba75d
--- /dev/null
+++ b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode-pkg.el
@@ -0,0 +1,7 @@
+(define-package "skewer-mode" "20150914.1304" "live browser JavaScript, CSS, and HTML interaction"
+  '((simple-httpd "1.4.0")
+    (js2-mode "20090723")
+    (emacs "24")))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer-mode.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer-mode.el
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-repl.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-repl.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer-repl.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer-repl.el
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer-setup.el b/emacs.d/elpa/skewer-mode-20150914.1304/skewer-setup.el
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer-setup.el
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer-setup.el
diff --git a/emacs.d/elpa/skewer-mode-20150422.1818/skewer.js b/emacs.d/elpa/skewer-mode-20150914.1304/skewer.js
similarity index 100%
rename from emacs.d/elpa/skewer-mode-20150422.1818/skewer.js
rename to emacs.d/elpa/skewer-mode-20150914.1304/skewer.js
diff --git a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-autoloads.el b/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-autoloads.el
deleted file mode 100644
index 41f5213..0000000
--- a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-autoloads.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; smart-mode-line-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "smart-mode-line" "smart-mode-line.el" (21837
-;;;;;;  24191 0 0))
-;;; Generated autoloads from smart-mode-line.el
-
-(when load-file-name (let ((dir (file-name-as-directory (file-name-directory load-file-name)))) (add-to-list 'custom-theme-load-path dir) (when (file-directory-p (file-name-as-directory (concat dir "themes"))) (add-to-list 'custom-theme-load-path (file-name-as-directory (concat dir "themes"))))))
-
-(autoload 'sml/setup "smart-mode-line" "\
-Setup the mode-line to be smart and sexy.
-
-ARG is ignored. Just call this function in your init file, and
-the mode-line will be setup.
-
-\(fn &optional ARG)" t nil)
-
-(defalias 'smart-mode-line-enable #'sml/setup)
-
-;;;***
-
-;;;### (autoloads nil "smart-mode-line-dark-theme" "smart-mode-line-dark-theme.el"
-;;;;;;  (21837 24191 0 0))
-;;; Generated autoloads from smart-mode-line-dark-theme.el
-
-(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
-
-;;;***
-
-;;;### (autoloads nil "smart-mode-line-light-theme" "smart-mode-line-light-theme.el"
-;;;;;;  (21837 24191 0 0))
-;;; Generated autoloads from smart-mode-line-light-theme.el
-
-(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
-
-;;;***
-
-;;;### (autoloads nil "smart-mode-line-respectful-theme" "smart-mode-line-respectful-theme.el"
-;;;;;;  (21837 24191 0 0))
-;;; Generated autoloads from smart-mode-line-respectful-theme.el
-
-(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
-
-;;;***
-
-;;;### (autoloads nil nil ("smart-mode-line-pkg.el") (21837 24191
-;;;;;;  125827 0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; smart-mode-line-autoloads.el ends here
diff --git a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-pkg.el b/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-pkg.el
deleted file mode 100644
index a81d5ea..0000000
--- a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-(define-package "smart-mode-line" "20150426.910" "A color coded smart mode-line."
-  '((emacs "24.3")
-    (rich-minority "0.1.1"))
-  :url "http://github.com/Malabarba/smart-mode-line" :keywords
-  '("mode-line" "faces" "themes"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line.el b/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line.el
deleted file mode 100755
index f0e2aae..0000000
--- a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line.el
+++ /dev/null
@@ -1,1713 +0,0 @@
-;;; smart-mode-line.el --- A color coded smart mode-line.
-
-;; Copyright (C) 2012 Artur Malabarba <emacs@endlessparentheses.com>
-
-;; Author: Artur Malabarba <emacs@endlessparentheses.com>
-;; URL: http://github.com/Malabarba/smart-mode-line
-;; Version: 2.8
-;; Package-Requires: ((emacs "24.3") (rich-minority "0.1.1"))
-;; Keywords: mode-line faces themes
-;; Prefix: sml
-;; Separator: /
-
-;;; Commentary:
-;;
-;; Smart Mode Line is a sexy mode-line for Emacs. It aims to be easy to
-;; read from small to large monitors by using *colors*, a *prefix feature*, and
-;; *smart truncation*.
-;;
-;; New in v2.5
-;; ===========
-;; - Emacs 24.4 compatible.
-;; - Integration with [Projectile](https://github.com/bbatsov/projectile)!
-;; - Display `current-directory' in Shell and eshell.
-;; - New value for `sml/theme': `automatic' (highly recommended).
-;; - `sml/apply-theme' is interactive and has completion.
-;; - Smart-mode-line themes are now regular themes.
-;;
-;; Installation
-;; ===
-;; **smart-mode-line** is available on Melpa, and that's the recommended
-;; way of installing it. If you do that, you can simply activate it with:
-;;
-;;     (sml/setup)
-;;
-;; To set the color theme, do one of the following BEFORE `sml/setup`:
-;;
-;;     (setq sml/theme 'dark)
-;;     (setq sml/theme 'light)
-;;     (setq sml/theme 'respectful)
-;;
-;; Features
-;; ===
-;; Its main features include:
-;;
-;;  1. **Color coded**:
-;;     Highlights the most important information for you
-;;     (buffer name, modified state, line number). Don't
-;;     like the colors? See item *5.*!
-;;
-;;  2. **Fixed width** (if you want):
-;;     Lets you set a maxium width for the path name and mode names, and
-;;     truncates them intelligently (truncates the directory, not the
-;;     buffer name). Also let's you **right indent** strings in the
-;;     mode-line (see `sml/mode-width').
-;;
-;;  3. **Directory as Prefixes**:
-;;     Prefix feature saves a LOT of space. e.g. *"~/.emacs.d/"*
-;;     is translated to *":ED:"* in the path (open a file inside
-;;     this folder to see it in action). Long path names you
-;;     are commmonly working on are displayed as short
-;;     abbreviations. Set your own prefixes to make best use
-;;     of it (by configuring `sml/replacer-regexp-list'). Mousing
-;;     over the abbreviated path will show you the full
-;;     path. See below for examples.
-;;
-;;  4. **Hide or Highlight minor-modes**:
-;;     The [rich-minority](https://github.com/Malabarba/rich-minority)
-;;     package saves even more space. Select which minor modes you don't
-;;     want to see listed by adding them to the variable
-;;     `rm-excluded-modes', or even highlight the modes that are more
-;;     important with the variable `rm-text-properties'. This will filter
-;;     out the modes you don't care about and unclutter the modes list
-;;     (mousing over the modes list still shows the full list).
-;;
-;;  4. **Hide minor-modes**:
-;;     Hidden-modes feature saves even more space. Select
-;;     which minor modes you don't want to see listed by
-;;     customizing the `rm-blacklist' variable. This will
-;;     filter out the modes you don't care about and unclutter
-;;     the modes list (mousing over the modes list still shows
-;;     the full list).
-;;
-;;  5. **Very easy to configure**:
-;;     All colors and variables are customizable. You can change the
-;;     whole theme with `sml/apply-theme', or just customize anything
-;;     manually with `sml/customize' and `sml/customize-faces'. There are
-;;     *DOZENS* of variables to customize your mode-line, just pop over
-;;     there and have a look!
-;;
-;;  6. **Compatible with absolutely anything**:
-;;     I'm serious. Versions 2.0 and above should be compatible with
-;;     **any** other packages that display information in the mode-line
-;;     (evil, nyan-mode, elscreen, display-battery-mode, etc). If you
-;;     find *ANYTHING* that does not appear as it should, file a bug report
-;;     and I'll get to it.
-;;
-;; Important Variables:
-;; ===
-;; All variables can be edited by running `sml/customize', and the
-;; documentations are mostly self explanatory, I list here only the
-;; most important ones.
-;;
-;;  1. `sml/theme'
-;;   Choose what theme you want to use for the mode-line colors. For now
-;;   there are 3 different themes: `dark', `light', and `respectful'.
-;;
-;;  1. `sml/shorten-directory' and `sml/shorten-modes'
-;;   Setting both of these to `t' garantees a fixed width mode-line
-;;   (directory name and minor-modes list will be truncated to fit). To
-;;   actually define the width, see below.
-;;
-;;  2. `sml/name-width' and `sml/mode-width'
-;;   Customize these according to the width of your Emacs frame. I set
-;;   them to `40' and `full' respectively, and the mode-line fits
-;;   perfectly when the frame is split in two even on my laptop's small
-;;   17" monitor. `full' means everything after the minor-modes will be
-;;   right-indented.
-;;
-;;  3. `sml/replacer-regexp-list'
-;;   This variable is a list of (REGEXP REPLACEMENT) that is used
-;;   to parse the path. The replacements are applied
-;;   sequentially. This allows you to greatly abbreviate the path
-;;   that's shown in the mode-line. If this abbreviation is of
-;;   the form *":SOMETHING:"*, it is considered a prefix and get's
-;;   a different color (you can change what's considered a prefix
-;;   by customizing `sml/prefix-regexp').
-;;   For example, if you do a lot of work on a folder called
-;;   *"~/Dropbox/Projects/In-Development/"* almost half the
-;;   mode-line would be occupied just by the folder name, which
-;;   is much less important than the buffer name. But, you can't
-;;   just hide the folder name, since editting a file in
-;;   *"~/Dropbox/Projects/In-Development/Source"* is VERY different
-;;   from editting a file in *"~/Dropbox/Projects/Source"*. By
-;;   setting up a prefix for your commonly used folders, you get
-;;   all that information without wasting all that space. In this
-;;   example you could set the replacement to *":ProjDev:"* or just
-;;   *":InDev:"*, so the path shown in the mode-line will be
-;;   *":ProjDev:Source/"* (saves a lot of space without hiding
-;;   information).
-;;
-;; Here go some more useful examples:
-;;
-;;     (add-to-list 'sml/replacer-regexp-list '("^~/Dropbox/Projects/In-Development/" ":ProjDev:") t)
-;;     (add-to-list 'sml/replacer-regexp-list '("^~/Documents/Work/" ":Work:") t)
-;;
-;;     ;; Added in the right order, they even work sequentially:
-;;     (add-to-list 'sml/replacer-regexp-list '("^~/Dropbox/" ":DB:") t)
-;;     (add-to-list 'sml/replacer-regexp-list '("^:DB:Documents" ":DDocs:") t)
-;;     (add-to-list 'sml/replacer-regexp-list '("^~/Git-Projects/" ":Git:") t)
-;;     (add-to-list 'sml/replacer-regexp-list '("^:Git:\\(.*\\)/src/main/java/" ":G/\\1/SMJ:") t)
-
-;;; License:
-;;
-;; This file is NOT part of GNU Emacs.
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 2
-;; of the License, or (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-
-;;; Change Log:
-;; 2.6     - 2014/08/15 - Allow for sml/name-width to have different mininum and maximum values.
-;; 2.6     - 2014/08/15 - Delegated minor-mode filtering to rich-minority package.
-;; 2.5.3   - 2014/06/18 - Fix custom-theme-load-path for manual installations.
-;; 2.5.2   - 2014/06/16 - sml/no-confirm-load-theme variable to skip theme confirmation.
-;; 2.5.1   - 2014/06/16 - sml/apply-theme no-confirm in daemon mode.
-;; 2.5     - 2014/05/15 - sml/theme: New possible values: 'automatic (highly recommended) or nil.
-;; 2.5     - 2014/05/14 - sml/mode-width: New possible value: 'right.
-;; 2.5     - 2014/05/14 - Themes engine completely redone.
-;; 2.5     - 2014/05/14 - sml/apply-theme is interactive.
-;; 2.4.5   - 2014/04/24 - Changed default value of sml/mode-width back to 'full.
-;; 2.4.3   - 2014/03/25 - sml/mode-line-buffer-identification fix for ggtags.
-;; 2.4.2   - 2014/03/13 - Perspective support simplified to sml/apply-theme.
-;; 2.4.2   - 2014/03/13 - Projectile integration only applies after the user replacements (to change, see sml/use-projectile-p).
-;; 2.4.1   - 2014/03/11 - Small fix to dired-mode with uniquify.
-;; 2.4     - 2014/03/10 - Projectile integration! To disable it, set sml/use-projectile-p.
-;; 2.4     - 2014/03/10 - Change the order of line/column numbers with sml/order-of-line-and-column.
-;; 2.4     - 2014/03/10 - Take over dired's buffer-identification. We will undo this if dired ever does anything special with this variable.
-;; 2.4     - 2014/03/10 - Show current-directory in Shell and eshell.
-;; 2.4     - 2014/03/10 - Tested against 24.4.
-;; 2.4     - 2014/03/10 - Ditch total number of lines count.
-;; 2.3.13  - 2014/03/05 - sml/apply-theme forces our foreground/background colors.
-;; 2.3.12  - 2014/03/05 - Use sml/show-remote to hide/show the "@" symbol. .
-;; 2.3.12  - 2014/03/05 - Support showing tramp state (remote buffer).
-;; 2.3.12  - 2014/02/27 - sml/apply-theme avoids nesting.
-;; 2.3.11  - 2014/02/15 - Silent sml/apply-theme.
-;; 2.3.10  - 2014/02/15 - Fix sml/setup ignoring sml/theme.
-;; 2.3.9   - 2014/02/10 - sml/hidden-modes allows regexps.
-;; 2.3.8   - 2014/02/07 - Buffer identification width auto-updates when sml/name-width changes.
-;; 2.3.8   - 2014/02/07 - sml/apply-theme customizes helm-candidate-number.
-;; 2.3.7   - 2014/01/21 - Adapt sml/generate-buffer-identification.
-;; 2.3.6   - 2013/12/16 - sml/replacer follows symlinks.
-;; 2.3.6   - 2013/12/16 - Fix filling and name on the very first update of non-file buffers.
-;; 2.3.5   - 2013/12/14 - sml/generate-position-help runs less often now.
-;; 2.3.4   - 2013/12/14 - Remove lag-inducing advice.
-;; 2.3.3   - 2013/12/09 - Fix sml/get-directory for files attached to mails - Thanks tsdh.
-;; 2.3.2   - 2013/12/07 - Fix for themes which set :inverse-video t in the mode-line.
-;; 2.3.1   - 2013/12/04 - sml/show-frame-identification now always defaults to nil.
-;; 2.3.1   - 2013/12/04 - Fix for sml/show-client not working.
-;; 2.3     - 2013/12/04 - sml/show-frame-identification only t for terminals.
-;; 2.3     - 2013/12/03 - Mark boolean's as safe-local-variables.
-;; 2.2.3   - 2013/12/03 - Fix possible recursion in sml/apply-theme.
-;; 2.2.2   - 2013/11/27 - Fix sml/apply-theme to consider saved faces.
-;; 2.2.1   - 2013/11/27 - Fix doc for sml/show-frame-identification.
-;; 2.2     - 2013/11/26 - Better minor list and some fixes.
-;; 2.0.5   - 2013/11/24 - sml/revert no longer available.
-;; 2.0.4   - 2013/11/24 - Improved faces a little.
-;; 2.0.3.4 - 2013/11/15 - Workaround to prevent core dump.
-;; 2.0.3.3 - 2013/11/13 - Small fix on sml/generate-buffer-identification for man pages.
-;; 2.0.3.2 - 2013/11/12 - sml/filter-mode-line-list now uses remove nil.
-;; 2.0.3.1 - 2013/11/08 - Quick fix sml/get-directory.
-;; 2.0.3   - 2013/11/07 - sml/show-frame-identification.
-;; 2.0.3   - 2013/11/07 - Improvements to sml/parse-mode-line-elements.
-;; 2.0.3   - 2013/11/07 - sml/compile-position-construct.
-;; 2.0.3   - 2013/11/07 - Line-number removed from sml/generate-position-help.
-;; 2.0.3   - 2013/11/07 - Position optimization with sml/position-construct.
-;; 2.0.3   - 2013/11/07 - Performance optimization thanks to sml/buffer-identification.
-;; 2.0.2   - 2013/11/05 - better sml/replacer-regexp-list.
-;; 2.0.2   - 2013/11/05 - sml/mule-info also hides input system.
-;; 2.0.2   - 2013/11/05 - show-encoding is now alias for sml/mule-info.
-;; 2.0.2   - 2013/11/05 - Removed anchors.
-;; 2.0.1   - 2013/11/04 - Slight fix on sml/apply-theme
-;; 2.0     - 2013/11/04 - Remove unnecessary functions.
-;; 2.0     - 2013/11/04 - Many other internal improvements.
-;; 2.0     - 2013/11/02 - Remove sml/mode-line-format
-;; 2.0     - 2013/11/02 - Reduce huge spaces in mode-line-format
-;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-mule-info.
-;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-client.
-;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-modified.
-;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-remote.
-;; 2.0     - 2013/11/02 - Manually edits mode-line-front-space.
-;; 2.0     - 2013/11/02 - Manually edits mode-line-frame-identification.
-;; 2.0     - 2013/11/02 - Manually edits mode-line-buffer-identification.
-;; 2.0     - 2013/11/02 - Manually edits mode-line-end-spaces.
-;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-modes.
-;; 2.0     - 2013/11/01 - Redesign the format to use mode-line-position.
-;; 1.30.1  - 2013/10/21 - eval-when-compile cl
-;; 1.30    - 2013/10/13 - Click mode list to toggle minor-mode hiding.
-;; 1.29.2  - 2013/10/02 - Different default position-percentage face.
-;; 1.29.1  - 2013/08/22 - Fix hang introduced with last update.
-;; 1.29    - 2013/08/11 - Fixed lag with remote files.
-;; 1.28.1  - 2013/08/11 - Fix for the erc fix.
-;; 1.28    - 2013/08/11 - Fixing erc notifications.
-;; 1.27    - 2013/08/10 - Changed default value of sml/mode-width to a number. 'full didn't work for everyone.
-;; 1.27    - 2013/08/10 - Doc bug.
-;; 1.26    - 2013/07/18 - Fix for % in the process string.
-;; 1.25    - 2013/07/16 - sml/override-theme also tries to set good colors for the text (not just the background).
-;; 1.24    - 2013/07/16 - sml/mule-info face changed to be less important.
-;; 1.23.2  - 2013/07/15 - Changed doc of sml/replacer-regexp-list.
-;; 1.23.1  - 2013/07/15 - moved perspective variable to eval-after-load.
-;; 1.23    - 2013/07/15 - added an icon to mew-format.
-;; 1.23    - 2013/07/15 - obsolete sml/show-time.
-;; 1.23    - 2013/07/15 - fixed a bug which required emacs restart for changes to take effect.
-;; 1.22    - 2013/07/15 - sml/vc-mode-show-backend implemented.
-;; 1.22    - 2013/07/15 - move mew-support variable.
-;; 1.22    - 2013/07/15 - Changed default value of sml/replacer-regexp-list.
-;; 1.21    - 2013/07/14 - Encoding description.
-;; 1.21    - 2013/07/14 - Reestructured some of the present functions.
-;; 1.21    - 2013/07/14 - New position indicator.
-;; 1.20    - 2013/07/14 - vc-mode support.
-;; 1.19    - 2013/07/14 - Reorganized groups.
-;; 1.18    - 2013/07/12 - mew variables only get created if mew is loaded.
-;; 1.18    - 2013/07/12 - Reformulated the simplified mode-line.
-;; 1.18    - 2013/07/12 - Added number of lines to mouse tooltip of position.
-;; 1.17    - 2013/07/10 - Fallback 'modified' string.
-;; 1.16    - 2013/07/08 - Changed implementation of battery display.
-;; 1.16    - 2013/07/08 - Fixed battery-display.
-;; 1.15    - 2013/07/06 - Implemented sml-modeline support.
-;; 1.14    - 2013/06/25 - Slightly reduced the default value of extra-filler.
-;; 1.13    - 2013/06/10 - removed 'cl requirement.
-;; 1.13    - 2013/06/10 - Advice to mew-biff-clear.
-;; 1.12    - 2013/06/06 - Gigantic typo fix. Sorry about that.
-;; 1.11    - 2013/06/05 - Added biff support.
-;; 1.10    - 2013/05/24 - Fix for buffer name with '%'.
-;; 1.9     - 2013/05/13 - Now uses file name instead of buffer-name by default, controled by `sml/show-file-name'.
-;; 1.9     - 2013/05/13 - When showing buffer name, can strip the <N> part by setting `sml/show-trailing-N'.
-;; 1.8.3   - 2013/04/21 - Fixed first line of docs.
-;; 1.8.2   - 2013/04/18 - added empty anchors throughout the mode-line.
-;; 1.8.2   - 2013/04/18 - evil-mode support.
-;; 1.8.1   - 2013/04/17 - sml/bug-report function.
-;; 1.8.1   - 2013/04/17 - sml/override-theme variable.
-;; 1.8.1   - 2013/04/17 - Changed install instruction to override theme settings.
-;; 1.8     - 2013/04/14 - sml/mode-width can now be 'full.
-;; 1.7.1   - 2012/11/17 - Perspective support.
-;; 1.7     - 2012/11/14 - Fixed some modes not showing in the minor mode list - Thanks Constantin.
-;; 1.7     - 2012/11/14 - Fixed infinite loop.  - Thanks Constantin.
-;; 1.7     - 2012/11/14 - Fixed for dired-mode.
-;; 1.7     - 2012/11/14 - Added parent customize groups.
-;; 1.6.2   - 2012/07/13 - Fixed mode shortenning.
-;; 1.6.1   - 2012/07/12 - NEW FEATURE: Modes list now fully supports clicking.
-;; 1.6.1   - 2012/07/12 - NEW FEATURE: `sml/version' constant.
-;; 1.6.1   - 2012/07/12 - `sml/hidden-modes' is now a list of strings (not regexps).
-;; 1.6     - 2012/07/09 - NEW FEATURE: Customizable faces for the prefix, see `sml/prefix-face-list'.
-;; 1.5.4   - 2012/06/28 - Optimized regexp-replacer.
-;; 1.5.3   - 2012/06/20 - Remove prefix and folder for non-files. Color the :Git prefix.
-;; 1.5.2   - 2012/06/14 - Saner default widths and mode-name fix for Term.
-;; 1.5.1   - 2012/06/12 - Fixed battery font for corner cases.
-;; 1.5     - 2012/06/11 - Added support for display-battery-mode. See the description for more.
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'custom)
-(require 'cus-face)
-(require 'rich-minority)
-
-(defconst sml/version "2.8" "Version of the smart-mode-line.el package.")
-(defun sml/bug-report ()
-  "Opens github issues page in a web browser. Please send me any bugs you find, and please inclue your Emacs and sml versions."
-  (interactive)
-  (browse-url "https://github.com/Malabarba/smart-mode-line/issues/new")
-  (message "Your sml/version is: %s, and your emacs version is: %s.\nPlease include this in your report!" sml/version emacs-version))
-(defun sml/customize ()
-  "Open the customization group for the `smart-mode-line' package."
-  (interactive)
-  (customize-group 'smart-mode-line t))
-(defun sml/customize-faces ()
-  "Open the customization group for faces used by the `smart-mode-line' package."
-  (interactive)
-  (customize-group 'smart-mode-line-faces t))
-
-(defgroup smart-mode-line '()
-  "Customization group for the `smart-mode-line' package."
-  :group 'convenience
-  :prefix 'sml)
-(defgroup smart-mode-line-position '()
-  "Showing the point position in the smart mode line."
-  :group 'smart-mode-line
-  :prefix 'sml)
-(defgroup smart-mode-line-path-and-prefix '()
-  "Showing the path, buffer-name, and prefix in the smart mode line."
-  :group 'smart-mode-line
-  :prefix 'sml)
-(defgroup smart-mode-line-mode-list '()
-  "Showing major/minor modes in the smart mode line."
-  :group 'smart-mode-line
-  :prefix 'sml)
-(defgroup smart-mode-line-others '()
-  "Showing other data in the smart mode line."
-  :group 'smart-mode-line
-  :prefix 'sml)
-
-(defgroup smart-mode-line-faces '()
-  "Font (face) colors for the `smart-mode-line.el' package.
-
-You can fully customize any of the fonts to match the color you
-want. You can also set properties like bold with ':weight bold'.
-
-Note that, by default, smart-mode-line overrides your theme's
-settings for the background and foreground color of the modeline
-face. We need to override, otherwise some elements become
-unreadable on lighter themes. If you'd rather configure these
-unreadable colors yourself and keep your theme's settings, just
-set `sml/override-theme' to nil."
-  :prefix 'sml
-  :group 'smart-mode-line
-  :group 'faces)
-
-
-;;; Actual Code
-(defvar erc-track-position-in-mode-line)
-(defvar sml/simplified nil
-  "Temporary dynamic variable. Used for filling.")
-
-(defvar sml/-debug nil
-  "Whether debugging information should be printed.")
-
-(defmacro sml/-debug (fmt &rest r)
-  "If variable `sml/-debug' is non-nil, describe FMT.
-If FMT is a string, this is essentially the same as `message'.
-If FMT is anything else, this is essentially:
-    (message \"%s is: %s\" 'FMT FMT)"
-  (when (and (boundp 'sml/-debug) sml/-debug)
-    (if (stringp fmt)
-        `(apply #'message (concat "[sml/debug] " ,fmt) ,r)
-      `(message "[sml/debug] %s is: %s" ',fmt ,fmt))))
-
-(defvar sml/shortener-func 'sml/do-shorten-directory
-  "Function used to shorten the directory name.
-
-Value is a funcallable symbol that takes two arguments: the
-string to be shortened and the maximum size. This is set
-automatically when `sml/shorten-directory' is changed via the
-customization menu or via the `sml/toggle-shorten-directory'
-function (which are the only ways you should change it).")
-
-(defun sml/set-shortener-func (sym val)
-  "Configure `sml/shortener-func' according to `sml/shorten-directory'.
-Set SYM to VAL."
-  (set-default sym val)
-  (if val (setq sml/shortener-func 'sml/do-shorten-directory)
-    (setq sml/shortener-func 'sml/not-shorten-directory)))
-
-(define-obsolete-variable-alias 'sml/time-format 'display-time-format)
-(define-obsolete-variable-alias 'sml/show-time 'display-time-mode)
-(define-obsolete-variable-alias 'sml/override-theme 'sml/theme)
-
-(defcustom sml/theme 'automatic
-  "Defines which theme `smart-mode-line' should use.
-
-This is usually one of the symbols:
-'automatic, 'respectful, 'dark, 'light or nil;
-but it can be something else if there are other smart-mode-line
-themes defined.
-
-Setting this to 'light and 'dark will apply some predefined
-colors to the mode-line, which are designed to be easy to read.
-
-Setting this to nil will apply almost no colors. Use this if your
-global color theme already customizes sml faces (flatui-theme is
-an example).
-
-Setting this to 'automatic will let sml decide between 'light or
-'dark or nil, to best match the global theme that is active when
-`sml/setup' is called.
-
-Setting it to 'respectful will try to use the colors defined by
-your current Emacs theme (emphasis on the \"try\"). Use this if
-you color theme does NOT customize sml faces, AND if you're not
-happy with 'light or 'dark.
-This option will make the mode-line colors more consistent with
-buffer colors (when compared to 'light or 'dark, which have fixed
-colors) , but it's a bit of a shot in the dark. The result will
-vary for each color theme, and you may get colors that don't read
-well.
-
-But don't forget, ALL COLORS ARE CUSTOMIZABLE!
-`sml/customize-faces'
-Any color you change manually won't get affected by this
-variable.
-
-Setting this variable via `setq' only has effect BEFORE calling
-`sml/setup'. If smart-mode-line is already loaded, use
- `sml/apply-theme' instead (or the customization interface)."
-  :type '(choice (const :tag "Automatically choose between 'light, 'dark, or nil during setup. (Default and Recommended)" automatic)
-                 (const :tag "Don't use a theme." nil)
-                 (const :tag "Use a dark color-theme." dark)
-                 (const :tag "Use a light color-theme." light)
-                 (const :tag "Respect the color-theme's colors." respectful)
-                 (symbol :tag "Other smart-mode-line theme you installed."))
-  :set 'sml/apply-theme
-  :initialize 'custom-initialize-default
-  :group 'smart-mode-line-faces :group 'smart-mode-line)
-
-(defcustom sml/position-percentage-format "%p"
-  "Format used to display position in the buffer.
-
-Set it to nil to hide the number."
-  :type 'string
-  :group 'smart-mode-line-position
-  :package-version '(smart-mode-line . "2.0"))
-(put 'sml/position-percentage-format 'risky-local-variable t)
-
-(defcustom sml/line-number-format "%3l"
-  "Format used to display line number.
-
-Empty it or disable `line-number-mode' to hide the number."
-  :type 'string
-  :group 'smart-mode-line-position
-  :set 'sml/compile-position-construct
-  :initialize 'custom-initialize-default)
-(put 'sml/line-number-format 'risky-local-variable t)
-
-(defcustom sml/size-indication-format "%I "
-  "Format to display buffer size when `size-indication-mode' is on."
-  :type 'string
-  :group 'smart-mode-line-position
-  :package-version '(smart-mode-line . "2.0")
-  :set 'sml/compile-position-construct
-  :initialize 'custom-initialize-default)
-(put 'sml/size-indication-format 'risky-local-variable t)
-
-(defcustom sml/col-number-format "%2c"
-  "Format used to display column number.
-
-Empty it or disable `column-number-mode' to hide the number."
-  :type 'string
-  :group 'smart-mode-line-position
-  :set 'sml/compile-position-construct
-  :initialize 'custom-initialize-default)
-(put 'sml/col-number-format 'risky-local-variable t)
-
-(defcustom sml/numbers-separator ":"
-  "Separator between line and column number.
-
-Since we use different faces for line and column number, you can
-just set this to \"\" to save an extra char of space."
-  :type 'string
-  :group 'smart-mode-line-position)
-
-(defcustom sml/show-remote t
-  "Whether to show an \"@\" for remote buffers."
-  :type 'boolean
-  :group 'smart-mode-line-others)
-(put 'sml/show-remote 'safe-local-variable 'booleanp)
-
-(defcustom sml/show-client nil
-  "Whether to show an \"@\" for emacsclient frames."
-  :type 'boolean
-  :group 'smart-mode-line-others)
-(put 'sml/show-client 'safe-local-variable 'booleanp)
-
-(defcustom sml/modified-char (char-to-string (if (char-displayable-p ?×) ?× ?*))
-  "String that indicates if buffer is modified. Should be one SINGLE char."
-  :type 'string
-  :group 'smart-mode-line-others
-  :package-version '(smart-mode-line . "1.16"))
-
-(defcustom sml/show-trailing-N t
-  "Whether the \"<N>\" suffix in buffer names should be displayed in the mode-line."
-  :type 'boolean
-  :group 'smart-mode-line-path-and-prefix)
-(put 'sml/show-trailing-N 'safe-local-variable 'booleanp)
-
-(defcustom sml/show-file-name t
-  "Unless nil: show file name instead of buffer name on the mode-line."
-  :type 'boolean
-  :group 'smart-mode-line-path-and-prefix)
-(put 'sml/show-file-name 'safe-local-variable 'booleanp)
-
-(defcustom sml/fill-char ?\s
-  "The char to be used for filling."
-  :type 'char
-  :group 'smart-mode-line-path-and-prefix)
-
-(defcustom sml/replacer-regexp-list
-  `((,(concat "^" (if (boundp 'org-directory) (regexp-quote org-directory) "~/org/")) ":Org:")
-    ("^~/\\.emacs\\.d/" ":ED:")
-    ("^/sudo:.*:" ":SU:")
-    ("^~/Documents/" ":Doc:")
-    ("^~/Dropbox/" ":DB:")
-    ("^:\\([^:]*\\):Documento?s/" ":\\1/Doc:")
-    ("^~/[Gg]it/" ":Git:")
-    ("^~/[Gg]it[Hh]ub/" ":Git:")
-    ("^~/[Gg]it\\([Hh]ub\\|\\)-?[Pp]rojects/" ":Git:"))
-  "List of pairs of strings used (by `sml/replacer') to create prefixes.
-
-The first string of each pair is a regular expression, the second
-is a replacement. These pairs are sequentially applied on the
-file path to replace portions of it, turning them into prefixes.
-For instance, \"~/.emacs.d/\" is replaced by \":ED:\", which is
-shorter but easily identified.
-
-The replacement strings can really be anything, but to be colored
-as a prefix a string must start and end with \":\" (see the
-default as an example, as an exception \"~/\" is also a prefix).
-
-Replacement doesn't stop on first match, so you can have stacking replacements:
-
-    (add-to-list 'sml/replacer-regexp-list '(\"^:DB:Org/\" \":Org:\") t)
-
-Remember that `add-to-list' adds items to the FRONT, and you'll
-usually want to add them to the back (thus the t at the end).
-
-You can also set custom colors (faces) for these prefixes, just
-set `sml/prefix-face-list' accordingly."
-  :type '(repeat (list regexp string))
-  :group 'smart-mode-line-path-and-prefix
-  :package-version '(smart-mode-line . "1.22"))
-
-(defcustom sml/prefix-regexp '(":\\(.*:\\)" "~/")
-  "List of Regexps used to identify prefixes.
-
-A prefix is anything at the begining of a line that matches any
-of these regexps. Don't start these regexps with \"^\", the
-parser applies that for you."
-  :type '(repeat regexp)
-  :group 'smart-mode-line-path-and-prefix)
-
-(defcustom sml/prefix-face-list '((":SU:" sml/sudo)
-                                  (":G" sml/git)
-                                  ("" sml/prefix))
-  "List of (STRING FACE) pairs used by `sml/propertize-prefix'.
-
-After the file path is constructed, the prefix contained in it is
-colored according to this list. The elements are checked one by
-one and, if the prefix contains the STRING part of the pair, then
-FACE is applied to it (and checking stops there)."
-  :type '(repeat (list string face))
-  :group 'smart-mode-line-path-and-prefix)
-
-(defcustom sml/name-width 44
-  "Minimum and maximum size of the file name in the mode-line.
-
-If `sml/shorten-directory' is nil, this is the minimum width.
-Otherwise, this is both the minimum and maximum width.
-
-Alternatively, you can set the minimum and maximum widths
-separately, by setting this variable to a cons cell of integers:
-    (MIN-WIDTH . MAX-WIDTH)
-"
-  :type '(choice integer (cons (integer :tag "Minimum width")
-                               (integer :tag "Maximum width")))
-  :group 'smart-mode-line-path-and-prefix)
-
-(defcustom sml/shorten-directory t
-  "Should directory name be shortened to fit width?
-
-When the buffer+directory name is longer than
-`sml/name-width':
-    if nil the rest of the mode-line is pushed right;
-    otherwise the directory name is shortened to fit."
-  :type 'boolean
-  :group 'smart-mode-line-path-and-prefix
-  :set 'sml/set-shortener-func)
-(put 'sml/shorten-directory 'safe-local-variable 'booleanp)
-
-(defcustom sml/full-mode-string " +"
-  "String that's appended to the minor-mode list when it's full."
-  :type 'string
-  :group 'smart-mode-line-mode-list)
-
-(defcustom sml/shorten-mode-string " -"
-  "String that's appended to the minor-mode list when all modes are displayed."
-  :type 'string
-  :group 'smart-mode-line-mode-list)
-
-(defcustom sml/shorten-modes t
-  "Should modes list be shortened to fit width?
-
-When the modes list is longer than `sml/mode-width':
-    if nil the rest of the mode-line is pushed right;
-    otherwise the list is shortened to fit."
-  :type 'boolean
-  :group 'smart-mode-line-mode-list)
-(put 'sml/shorten-modes 'safe-local-variable 'booleanp)
-
-(defun sml/toggle-shorten-directory (&rest val)
-  "Toggle the variable `sml/shorten-directory'.
-
-If given an argument VAL, the variable is set to the argument,
-otherwise it is toggled. This can be used as an alternative to
-customizing the variable with `customize-group'. Setting the
-variable with `setq' will NOT work and should be avoided."
-  (interactive)
-  (sml/set-shortener-func 'sml/shorten-directory
-                          (if val (car-safe val)
-                            (not sml/shorten-directory))))
-
-(defun sml/toggle-shorten-modes (&rest val)
-  "Toggle the variable `sml/shorten-modes'.
-
-If given an argument VAL, the variable is set to the argument,
-otherwise it is toggled. This can be used as an alternative to
-customizing the variable with `customize-group'. Equivalent to
-setting the variable with `setq'."
-  (interactive)
-  (setq sml/shorten-modes (if val (car val)
-                            (not sml/shorten-modes)))
-  (force-mode-line-update))
-
-(defcustom sml/mode-width 'full
-  "Maximum and/or minimum size of the modes list in the mode-line.
-
-If it is an integer, then the modes list width is that many
-characters.
-
-If it is the symbol `full', then the mode-list fills all the
-empty space is available in the mode-line (this has the effect of
-indenting right anything after the mode-list).
-
-If it is the symbol `right', then it behaves like `full', but the
-minor-modes list is moved al the way to the right.
-
-If `sml/shorten-modes' is nil, this is the minimum width.
-Otherwise, this is both the minimum and maximum width."
-  :type '(choice integer symbol)
-  :group 'smart-mode-line-mode-list
-  :package-version '(smart-mode-line . "2.4.5"))
-
-(defcustom sml/battery-format " %p"
-  "Format used to display the battery in the mode-line.
-
-Only relevant if using `display-battery-mode'. See that function
-for the syntax."
-  :type 'string
-  :group 'smart-mode-line-others)
-
-(defcustom sml/modified-time-string "Modified on %T %Y-%m-%d."
-  "String format used for displaying the modified time.
-
-This is shown in the tooltip when hovering over the \"modified
-file\" character (which is usually a * right before the file
-name."
-  :type 'string
-  :group 'smart-mode-line-others)
-
-(defcustom sml/extra-filler 0
-  "The number of extra filling chars to use.
-It comes into play when `sml/mode-width' is set to 'full.
-
-This is necessary because the mode-line width (which we need but
-don't have acess to) is larger than `window-total-width' (which
-we have access to).
-
-Decrease this if right indentation seems to be going too far (or
-if you just want to fine-tune it)."
-  :type 'integer
-  :group 'smart-mode-line-mode-list)
-
-;; Face definitions
-(defface sml/global           '((t :inverse-video nil)) "" :group 'smart-mode-line-faces)
-(defface sml/modes            '((t :inherit sml/global)) "" :group 'smart-mode-line-faces)
-(defface sml/minor-modes      '((t :inherit sml/global)) "" :group 'smart-mode-line-faces)
-(defface sml/filename         '((t :inherit sml/global :weight bold)) "" :group 'smart-mode-line-faces)
-(defface sml/prefix           '((t :inherit sml/global)) "" :group 'smart-mode-line-faces)
-(defface sml/read-only        '((t :inherit sml/not-modified)) "" :group 'smart-mode-line-faces)
-(defface sml/modified         '((t :inherit sml/not-modified :foreground "Red" :weight bold))
-  "" :group 'smart-mode-line-faces)
-(defface sml/outside-modified '((t :inherit sml/not-modified :foreground "#ffffff" :background "#c82829"))
-  "" :group 'smart-mode-line-faces)
-
-(defface sml/line-number         '((t :inherit sml/modes :weight bold))               "" :group 'smart-mode-line-faces)
-(defface sml/remote              '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
-(defface sml/name-filling        '((t :inherit sml/position-percentage))              "" :group 'smart-mode-line-faces)
-(defface sml/position-percentage '((t :inherit sml/prefix :weight normal))            "" :group 'smart-mode-line-faces)
-(defface sml/col-number          '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
-(defface sml/numbers-separator   '((t :inherit sml/col-number))                       "" :group 'smart-mode-line-faces)
-(defface sml/client              '((t :inherit sml/prefix))                           "" :group 'smart-mode-line-faces)
-(defface sml/not-modified        '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
-(defface sml/mule-info           '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
-(defface sml/sudo                '((t :inherit sml/outside-modified))                 "" :group 'smart-mode-line-faces)
-(defface sml/git                 '((t :inherit (sml/read-only sml/prefix)))           "" :group 'smart-mode-line-faces)
-(defface sml/folder              '((t :inherit sml/global :weight normal))            "" :group 'smart-mode-line-faces)
-(defface sml/process             '((t :inherit sml/prefix))                           "" :group 'smart-mode-line-faces)
-(defface sml/vc                  '((t :inherit sml/git))                              "" :group 'smart-mode-line-faces)
-(defface sml/vc-edited           '((t :inherit sml/prefix))                           "" :group 'smart-mode-line-faces)
-(defface sml/charging            '((t :inherit sml/global :foreground "ForestGreen")) "" :group 'smart-mode-line-faces)
-(defface sml/discharging         '((t :inherit sml/global :foreground "Red"))         "" :group 'smart-mode-line-faces)
-(defface sml/time                '((t :inherit sml/modes))                            "" :group 'smart-mode-line-faces)
-
-(defvar sml/-apply-theme-is-running nil "Avoid nesting in `sml/apply-theme'.")
-
-(defcustom sml/no-confirm-load-theme nil
-  "If non-nil, `sml/apply-theme' will pass the NO-CONFIRM flag to `load-theme'.
-If you're having problems with Emacs always asking for permission
-to load a theme (and not remembering your choice), you can set
-this to t to workaround the problem. But it's recommended that
-you try the problem instead."
-  :type 'boolean
-  :group 'smart-mode-line-faces
-  :package-version '(smart-mode-line . "2.5.2"))
-
-;;;###autoload
-(when load-file-name
-  (let ((dir (file-name-as-directory (file-name-directory load-file-name))))
-    (add-to-list 'custom-theme-load-path dir)
-    (when (file-directory-p (file-name-as-directory (concat dir "themes")))
-      (add-to-list 'custom-theme-load-path
-                   (file-name-as-directory (concat dir "themes"))))))
-
-(defun sml/apply-theme (theme &optional value silent)
-  "Apply the theme called smart-mode-line-THEME.
-
-THEME is usually one of the symbols: respectful, dark, or light;
-but it can be something else if there are other smart-mode-line
-themes defined.
-See the `sml/theme' variable for the meaning of each symbol.
-
-This function will call `disable-theme' on any enabled themes
-whose name starts with \"smart-mode-line-\", then it will call
-`load-theme' on the theme called \"smart-mode-line-THEME\".
-
-This also sets the `sml/theme' variable, see its documentation
-for more information on each value.
-
-The second argument (VALUE) is for internal use only, DON'T USE IT.
-
-Third argument SILENT prevents messages."
-  (interactive
-   (list
-    (intern
-     (completing-read
-      "Load smart-mode-line theme: "
-      (cons
-       'automatic
-       (mapcar
-        (lambda (x) (replace-regexp-in-string "\\`smart-mode-line-" "" (symbol-name x)))
-        (cl-remove-if-not #'sml/theme-p (custom-available-themes))))))
-    nil nil))
-  (sml/-debug "Entering apply-theme")
-  (when (eq theme (intern "")) (setq theme nil))
-  (sml/-debug theme)
-  (sml/-debug sml/theme)
-  (unless silent (message "[sml] %s set to %s" 'sml/theme (or value theme)))
-  (sml/-debug sml/-apply-theme-is-running)
-  (unless sml/-apply-theme-is-running
-    (let ((sml/-apply-theme-is-running t)) ;Avoid nesting.
-      ;; Set the variable
-      (setq-default sml/theme (or value theme))
-      (sml/-debug sml/theme)
-
-      ;; Disable any previous smart-mode-line themes.
-      (sml/-debug custom-enabled-themes)
-      (mapc (lambda (x) (when (sml/theme-p x) (disable-theme x)))
-            custom-enabled-themes)
-      (sml/-debug custom-enabled-themes)
-
-      ;; Load the theme requested.
-      (sml/-debug sml/theme)
-      (when (eq sml/theme 'automatic)
-        (setq sml/theme (sml/-automatically-decide-theme)))
-      (sml/-debug sml/theme)
-      (when sml/theme
-        (let ((theme-name
-               (if (sml/theme-p sml/theme) sml/theme
-                 (intern (format "smart-mode-line-%s" sml/theme)))))
-          (sml/-debug theme-name)
-          (load-theme theme-name sml/no-confirm-load-theme))))))
-
-(defadvice enable-theme (after sml/after-enable-theme-advice (theme) activate)
-  "Make sure smart-mode-line themes take priority over global themes that don't customize sml faces."
-  (unless (or (eq theme 'user) (sml/faces-from-theme theme))
-    (mapc #'enable-theme
-          (reverse (cl-remove-if-not #'sml/theme-p custom-enabled-themes)))))
-
-(defun sml/theme-p (theme)
-  "Return non-nil if theme named THEME is a smart-mode-line theme.
-Takes symbols and strings."
-  (string-match "\\`smart-mode-line-" (if (symbolp theme) (symbol-name theme) theme)))
-
-(defvaralias 'sml/show-encoding 'sml/mule-info)
-
-(defcustom sml/show-eol nil
-  "Whether to display the buffer EOL in the mode-line."
-  :type 'boolean
-  :group 'smart-mode-line-others)
-(put 'sml/show-eol 'safe-local-variable 'booleanp)
-
-(defcustom sml/outside-modified-char "M"
-  "Char to display if buffer needs to be reverted."
-  :type 'string
-  :group 'smart-mode-line-others
-  :package-version '(smart-mode-line . "1.20"))
-
-(defvaralias 'sml/encoding-format 'sml/mule-info)
-(defcustom sml/mule-info "%z"
-  "Format for multilingual information. Set this to nil to hide buffer encoding."
-  :type '(choice string (const :tag "Don't display." nil))
-  :group 'smart-mode-line-others
-  :package-version '(smart-mode-line . "2.0"))
-
-(defcustom sml/read-only-char "R"
-  "Displayed when buffer is readonly."
-  :type 'string
-  :group 'smart-mode-line-others
-  :package-version '(smart-mode-line . "1.20"))
-
-(defcustom sml/show-frame-identification nil
-  "Whether to show frame identification or not.
-
-In some systems this doesn't even display anything. It's most useful
-on terminals, but you might want to disable it anyway.
-
-Just set this to nil, and frame identification won't be displayed."
-  :type 'boolean
-  :group 'smart-mode-line-others
-  :package-version '(smart-mode-line . "2.0.3"))
-(put 'sml/show-frame-identification 'safe-local-variable 'booleanp)
-
-(defcustom sml/vc-mode-show-backend nil
-  "Whether to show or not the backend in vc-mode's mode-line description.
-
-I think most people only use one backend, so this defaults to nil.
-If you want it to show the backend, just set it to t."
-  :type 'boolean
-  :group 'smart-mode-line-others
-  :package-version '(smart-mode-line . "1.22"))
-(put 'sml/vc-mode-show-backend 'safe-local-variable 'booleanp)
-
-
-(defvar sml/position-construct nil "Used for recycling position information.")
-(put 'sml/position-construct 'risky-local-variable t)
-
-(defvar sml/position-help-text nil "Help-text for position information.")
-(make-variable-buffer-local 'sml/position-help-text)
-
-;;; Buffer Identification
-(defvar sml/buffer-identification-filling nil
-  "Filling generated by `sml/fill-for-buffer-identification'.")
-(make-variable-buffer-local 'sml/buffer-identification-filling)
-(put 'sml/buffer-identification-filling 'risky-local-variable t)
-
-(defvar sml/buffer-identification nil
-  "Used for recycling buffer identification without having to recompute it.")
-(make-variable-buffer-local 'sml/buffer-identification)
-(put 'sml/buffer-identification 'risky-local-variable t)
-
-(defadvice rename-buffer (after sml/after-rename-buffer-advice ())
-  "Regenerate buffer-identification after `rename-buffer'."
-  (sml/generate-buffer-identification))
-(defadvice set-visited-file-name (after sml/after-set-visited-file-name-advice ())
-  "Regenerate buffer-identification after `set-visited-file-name'."
-  (sml/generate-buffer-identification))
-
-(defvar sml/name-width-old nil "Used for recalculating buffer identification filling only when necessary.")
-(make-variable-buffer-local 'sml/name-width-old)
-(defvar sml/shorten-directory-old nil "Used for recalculating buffer identification filling only when necessary.")
-(make-variable-buffer-local 'sml/shorten-directory-old)
-(defun sml/generate-buffer-identification-if-necessary ()
-  "Call `sml/generate-buffer-identification' only if `sml/name-width' has changed."
-  (unless (and (equal sml/name-width-old sml/name-width)
-               (equal sml/shorten-directory-old sml/shorten-directory))
-    (setq sml/name-width-old sml/name-width)
-    (setq sml/shorten-directory-old sml/shorten-directory)
-    (sml/generate-buffer-identification))
-  nil)
-
-(defvar sml/mode-line-client
-  `(sml/show-client
-    (:eval (if (frame-parameter nil 'client)
-               ,(propertize "@" 'face 'sml/client 'help-echo (purecopy "emacsclient frame"))
-             " ")))
-  "Construct that replaces `mode-line-client'.")
-
-(defvar sml/mode-line-buffer-identification
-  '("" (sml/buffer-identification
-        sml/buffer-identification
-        (:eval (sml/generate-buffer-identification))))
-  "Replace the default `mode-line-buffer-identification' with our own.")
-
-(defvar sml/projectile-replacement-format)
-(defvar sml/use-projectile-p)
-(defvar sml/projectile-loaded-p nil "Non-nil if projectile has been loaded.")
-
-(defcustom sml/pos-id-separator " "
-  "Miscellaneous mode-line construct.")
-(put 'sml/pos-id-separator 'risky-local-variable t)
-(defcustom sml/pre-modes-separator " "
-  "Miscellaneous mode-line construct.")
-(put 'sml/pre-modes-separator 'risky-local-variable t)
-(defcustom sml/pre-id-separator ""
-  "Miscellaneous mode-line construct.")
-(put 'sml/pre-id-separator 'risky-local-variable t)
-(defcustom sml/pre-minor-modes-separator ""
-  "Miscellaneous mode-line construct.")
-(put 'sml/pre-minor-modes-separator 'risky-local-variable t)
-(defcustom sml/pos-minor-modes-separator ""
-  "Miscellaneous mode-line construct.")
-(put 'sml/pos-minor-modes-separator 'risky-local-variable t)
-
-(defun sml/-automatically-decide-theme ()
-  "Return the most appropriate sml theme, based on global theme."
-  (sml/-debug "Entering -automatically-decide-theme")
-  (sml/-debug (sml/global-theme-support-sml-p))
-  (unless (sml/global-theme-support-sml-p)
-    (sml/-debug (face-background 'mode-line nil t))
-    (sml/-debug (face-background 'default nil t))
-    (let ((bg (ignore-errors
-                (or (face-background 'mode-line nil t)
-                    (face-background 'default nil t)))))
-      (if (ignore-errors
-            (and (stringp bg)
-                 (> (color-distance "white" bg)
-                    (color-distance "black" bg))))
-          'dark 'light))))
-
-(defun sml/-setup-theme ()
-  "Decide what theme to use and apply it.
-Used during initialization."
-  (sml/-debug "Entering -setup-theme")
-  (sml/-debug sml/theme)
-  (when sml/theme
-    (when (eq sml/theme 'automatic)
-      (setq sml/theme (sml/-automatically-decide-theme)))
-    (sml/-debug "chosen theme:")
-    (sml/-debug sml/theme)
-    (sml/apply-theme sml/theme nil :silent)))
-
-(defvar battery-mode-line-format)
-
-
-;;;###autoload
-(defun sml/setup (&optional arg)
-  "Setup the mode-line to be smart and sexy.
-
-ARG is ignored. Just call this function in your init file, and
-the mode-line will be setup."
-  (interactive)
-  (sml/-debug "Entering setup")
-  (sml/-debug custom-enabled-themes)
-
-  ;; Just a couple of useful variables
-  (setq sml/simplified nil)
-  (setq battery-mode-line-format sml/battery-format)
-
-  ;; Activate rich-minority, and configure it for us.
-  (setq rm-base-text-properties
-        (append rm-base-text-properties '('face 'sml/minor-modes)))
-
-  ;; Set the theme the user requested.
-  (sml/-setup-theme)
-
-  ;;;; And this is where the magic happens.
-  ;; Remove elements we implement separately, and improve the ones not removed.
-  (sml/filter-mode-line-list 'mode-line-mule-info)
-  (setq-default mode-line-client sml/mode-line-client)
-  (sml/filter-mode-line-list 'mode-line-modified)
-  (sml/filter-mode-line-list 'mode-line-remote)
-  (setq-default mode-line-frame-identification
-                '("" (sml/show-frame-identification "%F")
-                  sml/pre-id-separator))
-
-  ;; (setq-default mode-line-buffer-identification '("%b"))
-
-  (setq-default mode-line-buffer-identification
-                sml/mode-line-buffer-identification)
-  (sml/filter-mode-line-list 'mode-line-position)
-  (sml/filter-mode-line-list 'mode-line-modes)
-  (setq-default mode-line-end-spaces nil)
-
-  ;; Add position descriptions on the left (they were already removed
-  ;; from the middle). Since this is the very first symbol to be
-  ;; evaluated, we also use it for calculating variables that need to
-  ;; be updated
-  (setq-default mode-line-front-space '((:eval (sml/generate-buffer-identification-if-necessary))
-                                        (sml/position-help-text
-                                         nil
-                                         (:eval (let ((sml/-this-buffer-changed-p t))
-                                                  (sml/generate-position-help))))
-                                        (sml/position-construct
-                                         sml/position-construct
-                                         (:eval (sml/compile-position-construct)))))
-
-  (add-hook 'after-save-hook 'sml/generate-buffer-identification)
-  (ad-activate 'rename-buffer)
-  (ad-activate 'set-visited-file-name)
-  (add-hook 'clone-indirect-buffer-hook 'sml/generate-buffer-identification)
-  ;; (ad-activate 'set-buffer-modified-p)
-  (add-hook 'after-change-functions 'sml/-this-buffer-changed)
-  (add-hook 'post-command-hook 'sml/generate-position-help)
-
-  ;; This is to ensure fixed name width. The reason we do this manually
-  ;; is that some major-modes change `mode-line-buffer-identification'
-  ;; (so we can't fill inside the variable), and we want this
-  ;; symbol to be an element in `mode-line-format' for compatibility
-  ;; with other packages which hack into the mode-line.
-
-  (add-to-list 'mode-line-position
-               '(sml/buffer-identification-filling
-                 sml/buffer-identification-filling
-                 (:eval (setq sml/buffer-identification-filling
-                              (sml/fill-for-buffer-identification)))))
-
-  ;; Remove some annoying big spaces
-  (setq-default mode-line-format
-                (mapcar
-                 (lambda (x) (cond
-                         ;; ((eq x 'mode-line-buffer-identification)
-                         ;;  '(:propertize mode-line-buffer-identification face sml/id))
-                         ((and (stringp x) (string= x "   "))
-                          'sml/pos-id-separator)
-                         ((and (stringp x) (string= x "  "))
-                          'sml/pre-modes-separator)
-                         (t x)))
-                 mode-line-format))
-
-      ;;;; And here comes support for a bunch of extra stuff. Some of
-      ;;;; these are just needed for coloring.
-
-  ;; Shell and eshell support
-  (add-hook 'comint-output-filter-functions 'sml/generate-buffer-identification)
-  (add-hook 'eshell-directory-change-hook 'sml/generate-buffer-identification)
-
-  ;; Dired overrides the buffer-identification (which we would
-  ;; normally respect) but doesn't actually do anything useful with
-  ;; it, so we overoverride back.
-  (add-hook 'dired-mode-hook 'sml/set-buffer-identification)
-
-  ;; Display time
-  (add-hook 'display-time-hook 'sml/propertize-time-string)
-
-  ;; Battery support
-  (eval-after-load 'battery
-    '(defadvice battery-update (after sml/after-battery-update-advice () activate)
-       "Change battery color."
-       (when battery-mode-line-string
-         (setq battery-mode-line-string
-               (propertize battery-mode-line-string
-                           'face 'sml/battery)))))
-
-  ;; Projectile support
-  (eval-after-load "projectile"
-    '(progn
-       (setq sml/projectile-loaded-p t)
-       (defcustom sml/projectile-replacement-format "[P/%s]"
-         "Format used for replacements derived from projectile."
-         :type 'string
-         :group 'smart-mode-line-others
-         :package-version '(smart-mode-line . "2.4"))
-       (defcustom sml/use-projectile-p 'after-prefixes
-         "Whether we should use projectile to guess path prefixes.
-
-If this is non-nil, and if current buffer is inside a project (as
-defined by projectile), we use the project's name as a
-prefix (with the `sml/projectile-replacement-format' variable).
-
-If this is 'after-prefix, then this replacement will only be used
-if no other prefixes (defined in `sml/replacer-regexp-list') were
-found to match the current file path."
-         :type '(choice (const :tag "Use projectile only if current path doesn't match any prefixes." after-prefixes)
-                        (const :tag "Use projectile before checking prefixes." before-prefixes)
-                        (const :tag "Don't use projectile." nil))
-         :group 'smart-mode-line-others
-         :package-version '(smart-mode-line . "2.4.1"))
-       (defface sml/projectile '((t :inherit sml/git)) "" :group 'smart-mode-line-faces)
-       (add-to-list 'sml/prefix-regexp (format (regexp-quote sml/projectile-replacement-format) ".*"))
-       (add-to-list 'sml/prefix-face-list
-                    (list (format (regexp-quote sml/projectile-replacement-format) ".*")
-                          'sml/projectile))))
-
-  ;; vc-mode
-  (eval-after-load "vc-hooks"
-    '(defadvice vc-mode-line (after sml/after-vc-mode-line-advice () activate)
-       "Color `vc-mode'."
-       (when (stringp vc-mode)
-         (let ((noback (replace-regexp-in-string (format "^ %s" (vc-backend buffer-file-name)) " " vc-mode)))
-           (setq vc-mode
-                 (propertize (if sml/vc-mode-show-backend vc-mode noback)
-                             'face (cond ((string-match "^ -" noback)    'sml/vc)
-                                         ((string-match "^ [:@]" noback) 'sml/vc-edited)
-                                         ((string-match "^ [!\\?]" noback) 'sml/modified))))))))
-
-  ;; Mew support
-  (eval-after-load "mew-net"
-    '(progn
-       (defgroup smart-mode-line-mew '() "Group for editing the mew-support variables." :group 'smart-mode-line)
-       (defcustom sml/mew-support t
-         "Whether to flash the mode-line when mew detects new mail."
-         :type 'boolean :group 'smart-mode-line-mew
-         :package-version '(smart-mode-line . "1.11"))
-       (defcustom sml/new-mail-background-color "#110000"
-         "When new mail arrives, mode-line background will be tinted this color.
-
-Only works with mew-biff. Right now it stays colored until you
-read the mail, so this color should probably be something sutil.
-Might implement a quick flash eventually."
-         :type 'color :group 'smart-mode-line-mew
-         :package-version '(smart-mode-line . "1.11"))
-       (defcustom sml/mew-biff-format (concat "%2d" (if (char-displayable-p ?✉) "✉" "M"))
-         "Format used for new-mail notifications if you use mew with biff."
-         :type 'string :group 'smart-mode-line-mew
-         :package-version '(smart-mode-line . "1.11"))
-       (defadvice mew-biff-clear (around sml/mew-biff-clear-advice activate)
-         "Advice used to customize mew-biff-bark to fit sml's style."
-         ad-do-it
-         (when sml/mew-support
-           ;; Remove the color
-           (set-face-attribute 'mode-line nil :background sml/active-background-color)))
-       (defadvice mew-biff-bark (around sml/mew-biff-bark-advice (n) activate)
-         "Advice used to customize mew-biff-bark to fit sml's style."
-         ad-do-it
-         (when sml/mew-support
-           ;; Remove the color if mail has been read.
-           (if (= n 0) (set-face-attribute 'mode-line nil :background sml/active-background-color)
-             ;; Apply color if there's mail. (mew-biff-bark 100)
-             (set-face-attribute 'mode-line nil :background sml/new-mail-background-color)
-             (setq mew-biff-string (format sml/mew-biff-format n)))))))
-
-  (unless (and (boundp 'erc-track-position-in-mode-line)
-               (null erc-track-position-in-mode-line))
-    (setq erc-track-position-in-mode-line t)))
-
-;;;###autoload
-(defalias 'smart-mode-line-enable #'sml/setup)
-
-(defun sml/global-theme-support-sml-p ()
-  "Non-nil if any of the enabled themes supports smart-mode-line."
-  (cl-remove-if
-   #'sml/theme-p
-   (cl-remove-if-not #'sml/faces-from-theme custom-enabled-themes)))
-
-(defun sml/faces-from-theme (theme)
-  "Return the sml faces that THEME customizes."
-  (cl-remove-if-not
-   (lambda (it) (string-match "\\`sml/" (symbol-name it)))
-   (mapcar #'cadr (get theme 'theme-settings))))
-
-(defun sml/set-buffer-identification (&rest ignored)
-  "Setq the buffer-identification of this buffer back to ours.
-
-Currently, we only this for dired. For other modes (like info) we
-respect their changes.
-
-Argument IGNORED is obsolete."
-  (setq mode-line-buffer-identification sml/mode-line-buffer-identification))
-
-(defvar sml/-this-buffer-changed-p nil
-  "t if buffer was changed since last help-text update.")
-(make-variable-buffer-local 'sml/-this-buffer-changed-p)
-
-(defun sml/-this-buffer-changed (&rest ignored)
-  "Set variable `sml/-this-buffer-changed-p' to t.
-Argument IGNORED is ignored."
-  (setq sml/-this-buffer-changed-p t) nil)
-
-(defun sml/generate-position-help (&rest ignored)
-  "Set the string describing various buffer content information.
-Argument IGNORED is ignored."
-  (when (and sml/-this-buffer-changed-p
-             (get-buffer-window (current-buffer)))
-    (setq sml/-this-buffer-changed-p nil)
-    (setq sml/position-help-text
-          (format-mode-line
-           (concat "Buffer size:\n\t%IB\n"
-                   ;; ;; This is way too slow, unfortunately.
-                   ;; "Number of Lines:\n\t"
-                   ;; (int-to-string (line-number-at-pos (point-max)))
-                   "\nmouse-1: Display Line and Column Mode Menu")))
-    nil))
-
-(defcustom sml/order-of-line-and-column nil
-  "Decide the order of line-number and column-number display.
-
-When both `line-number-mode' and `column-number-mode' are
-enabled, this variable decides which gets displayed on the left,
-and which gets displayed on the right. If either one of the modes
-is not enabled, this variable has no effect (obviously).
-
-It can only be t or nil.
-    t means column-number:line-number
-    nil means line-number:column-number"
-  :type '(choice (const :tag "column-number:line-number" t)
-                 (const :tag "line-number:column-number" nil))
-  :group 'smart-mode-line-position
-  :package-version '(smart-mode-line . "2.4"))
-
-(defun sml/compile-position-construct (&optional symbol value)
-  "Recompile the `sml/position-construct' after one of the formats was edited.
-Also sets SYMBOL to VALUE."
-  (when (and symbol value) (set symbol value))
-  (sml/generate-position-help)
-  (setq sml/position-construct
-        `((size-indication-mode
-           ,(propertize sml/size-indication-format
-                        'face 'sml/col-number
-                        'help-echo 'sml/position-help-text
-                        'mouse-face 'mode-line-highlight
-                        'local-map mode-line-column-line-number-mode-map))
-          (sml/order-of-line-and-column
-           (column-number-mode
-            ,(propertize sml/col-number-format
-                         'face 'sml/col-number
-                         'help-echo 'sml/position-help-text
-                         'mouse-face 'mode-line-highlight
-                         'local-map mode-line-column-line-number-mode-map))
-           (line-number-mode
-            ,(propertize sml/line-number-format
-                         'face 'sml/line-number
-                         'help-echo 'sml/position-help-text
-                         'mouse-face 'mode-line-highlight
-                         'local-map mode-line-column-line-number-mode-map)))
-          (column-number-mode
-           (line-number-mode
-            ,(propertize sml/numbers-separator
-                         'face 'sml/numbers-separator
-                         'help-echo 'sml/position-help-text
-                         'mouse-face 'mode-line-highlight
-                         'local-map mode-line-column-line-number-mode-map)))
-          (sml/order-of-line-and-column
-           (line-number-mode
-            ,(propertize sml/line-number-format
-                         'face 'sml/line-number
-                         'help-echo 'sml/position-help-text
-                         'mouse-face 'mode-line-highlight
-                         'local-map mode-line-column-line-number-mode-map))
-           (column-number-mode
-            ,(propertize sml/col-number-format
-                         'face 'sml/col-number
-                         'help-echo 'sml/position-help-text
-                         'mouse-face 'mode-line-highlight
-                         'local-map mode-line-column-line-number-mode-map))))))
-
-(defun sml/generate-modified-status ()
-  "Return a string describing the modified status of the buffer."
-  (cond
-   ((not (or (and (buffer-file-name) (file-remote-p buffer-file-name))
-             (verify-visited-file-modtime (current-buffer))))
-    (propertize sml/outside-modified-char 'face 'sml/outside-modified
-                'help-echo "Modified outside Emacs!\nRevert first!"))
-   ((buffer-modified-p)
-    (propertize (if buffer-read-only
-                    sml/read-only-char
-                  sml/modified-char)
-                'face 'sml/modified
-                'help-echo (if (and (buffer-file-name) (not (file-remote-p buffer-file-name)))
-                               (format-time-string
-                                sml/modified-time-string
-                                (nth 5 (file-attributes (buffer-file-name))))
-                             "Buffer Modified")
-                'local-map '(keymap (mode-line keymap (mouse-1 . save-buffer)))))
-   (buffer-read-only (propertize sml/read-only-char
-                                 'face 'sml/read-only
-                                 'help-echo "Read-Only Buffer"))
-   (t (propertize " " 'face 'sml/not-modified))))
-
-(defmacro sml/propertize-position (s face help)
-  "Propertize string S as a line/column number, using FACE and help-echo HELP."
-  `(propertize ,s
-               'face ,face
-               'help-echo ,help
-               'mouse-face 'mode-line-highlight
-               'local-map mode-line-column-line-number-mode-map))
-
-(defun sml/propertize-time-string ()
-  "Function to be added to `display-time-hook' to propertize the string."
-  (when (and (boundp 'display-time-string) (stringp display-time-string))
-    (setq display-time-string
-          (propertize display-time-string
-                      'face 'sml/time))))
-
-(defun sml/filter-mode-line-list (l)
-  "Filter some elements of L and propertize the ones not filtered.
-
-L must be a symbol! We asign right back to it"
-  (if (and (symbolp l) (listp (eval l)))
-      (set-default l
-       (remove nil (mapcar 'sml/parse-mode-line-elements (eval l))))
-    (error "l must be a symbol to a list!")))
-
-(defun sml/fill-for-buffer-identification ()
-  "Return a string such that `mode-line-buffer-identification' is fixed-width.
-In buffers where `mode-line-buffer-identification' is nil, we
-don't do any filling. That's because the given mode probably
-doesn't want any buffer-id."
-  (if mode-line-buffer-identification
-      (propertize
-       (make-string (max (- (or (car-safe sml/name-width) sml/name-width)
-                            (length (format-mode-line mode-line-buffer-identification)))
-                         0)
-                    sml/fill-char)
-       'face 'sml/name-filling)
-    ""))
-
-(defun sml/generate-buffer-identification (&rest ignored)
-  "Return fully propertized prefix+path+buffername.
-Argument IGNORED is ignored."
-  (setq sml/name-width-old sml/name-width)
-  (setq sml/buffer-identification-filling nil)
-  (when (or ;; Only calculate all this if it will actually be used
-         (equal sml/mode-line-buffer-identification mode-line-buffer-identification)
-         (member (cadr sml/mode-line-buffer-identification) mode-line-buffer-identification)
-         (member sml/mode-line-buffer-identification mode-line-buffer-identification))
-    (setq sml/buffer-identification
-          (let* ((dir (sml/replacer (abbreviate-file-name (sml/get-directory))))
-                 (sml/use-projectile-p (unless (or (not sml/projectile-loaded-p)
-                                                   (and (buffer-file-name)
-                                                        (file-remote-p (buffer-file-name))))
-                                         sml/use-projectile-p))
-                 (prefix (sml/get-prefix dir))
-                 (bufname (sml/buffer-name))
-                 (dirsize (max 0 (- (abs (or (cdr-safe sml/name-width) sml/name-width))
-                                    (length prefix) (length bufname))))
-                 (dirstring (funcall sml/shortener-func dir dirsize)))
-
-            (propertize (concat (sml/propertize-prefix (replace-regexp-in-string "%" "%%" prefix))
-                                (propertize (replace-regexp-in-string "%" "%%" dirstring) 'face 'sml/folder)
-                                (propertize (replace-regexp-in-string "%" "%%" bufname) 'face 'sml/filename))
-                        'help-echo (format "%s\n\nmouse-1: Previous buffer\nmouse-3: Next buffer"
-                                     (or (buffer-file-name) (buffer-name)))
-                        'mouse-face 'mode-line-highlight
-                        'local-map   mode-line-buffer-identification-keymap)))))
-
-(defun sml/parse-mode-line-elements (el)
-  "Propertize or delete EL.
-
-To be used in mapcar and accumulate results."
-  (cond
-   ;; These are implemented separately
-   ((member el '("%[" "%]" "%1+" "(" ")" (t erc-modified-channels-object)
-                 (:eval (if (display-graphic-p) " " "-"))
-                 (:eval (unless (display-graphic-p) "-%-"))
-                 (:eval (mode-line-frame-control))))
-    nil)
-   ((member (car-safe el) '(line-number-mode column-number-mode size-indication-mode current-input-method)) nil)
-   ;; mode-line-remote
-   ((and (stringp el) (string= el "%1@"))
-    `(sml/show-remote
-      (:propertize ,el face sml/remote)))
-   ;; mode-line-client
-   ((equal el '("" (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
-                                help-echo "emacsclient frame")))
-    `(sml/show-client
-      (:eval (if (frame-parameter nil 'client)
-                 ,(propertize "@" 'face 'sml/client 'help-echo (purecopy "emacsclient frame"))
-               " "))))
-
-   ;; mode-line-modified
-   ((and (stringp el) (string-match "%[0-9-]*\\*" el))
-    '(:eval (sml/generate-modified-status)))
-
-   ;;;; mode-line-position
-   ;; Color the position percentage
-   ((sml/is-%p-p el)
-    `(sml/position-percentage-format
-      (-3 (:propertize (:eval sml/position-percentage-format)
-                       local-map ,mode-line-column-line-number-mode-map
-                       mouse-face mode-line-highlight
-                       face sml/position-percentage
-                       help-echo "Buffer Relative Position\n\
-mouse-1: Display Line and Column Mode Menu"))))
-
-   ;;;; mode-line-mule-info
-   ;; Partially hide some MULE info
-   ((and (stringp el) (string-match "\\s-*%[-0-9]*z" el))
-    `(sml/mule-info ((1 (:propertize
-                         (current-input-method
-                          ("" current-input-method-title)
-                          " ")
-                         face sml/mule-info
-                         help-echo (concat
-                                    ,(purecopy "Current input method: ")
-                                    current-input-method
-                                    ,(purecopy "\n\
-mouse-2: Disable input method\n\
-mouse-3: Describe current input method"))
-                         local-map ,mode-line-input-method-map
-                         mouse-face mode-line-highlight))
-                     (:propertize (:eval sml/mule-info)
-                                  face sml/mule-info
-                                  help-echo mode-line-mule-info-help-echo
-                                  mouse-face mode-line-highlight
-                                  local-map ,mode-line-coding-system-map))))
-   ;; Make EOL optional
-   ((equal el '(:eval (mode-line-eol-desc)))
-    '(sml/show-eol (:eval (mode-line-eol-desc))))
-
-   ;;;; mode-line-modes
-   ;; Color the mode line process
-   ((or (equal el '("" mode-line-process))
-        (equal (car (cdr-safe el)) '("" mode-line-process)))
-    `(:propertize ("" mode-line-process) face sml/process))
-   ;; Color the mode name, without changing other properties
-   ((and (listp el)
-         (equal (car el) :propertize)
-         (equal (cadr el) '("" mode-name)))
-    (setf (cadr el) '("" "%[" mode-name "%]"))
-    (append el '(face sml/modes)))
-   ;; Completely replace the minor modes (so we can truncate)
-   ((and (listp el)
-         (equal (car el) :propertize)
-         (equal (cadr el) '("" minor-mode-alist)))
-    '(:eval (sml/generate-minor-modes)))
-
-   ;; ;;; Propertize misc-info
-   ;; ((memq (car-safe el) '(which-func-mode global-mode-string))
-   ;;  `(:eval (add-text-properties (format-mode-line ',el))))
-
-   ;; If it's something we don't recognize, just leave it as-is.
-   (t el)))
-
-(defun sml/is-%p-p (x)
-  "Non-nil if X matches \"%p\" in a very subjective sense."
-  (or (and (listp x)
-           (cl-remove-if-not
-            (lambda (y) (string-match ".*%p.*" y))
-            (cl-remove-if-not #'stringp x)))
-      (and (stringp x)
-           (string-match ".*%p.*" x))))
-
-(defun sml/buffer-name ()
-  "Return either buffer name or file name to be shown on the mode-line.
-Uses `sml/show-file-name' to decide between the two.
-
-Unless `sml/show-trailing-N' is nil, prevents the \"<N>\" (used in
-duplicated buffer names) from being displayed."
-  (cond ((buffer-base-buffer)
-         (buffer-name))
-        ((and sml/show-file-name (buffer-file-name))
-         (file-name-nondirectory (buffer-file-name)))
-        ((derived-mode-p 'dired-mode)
-         (file-name-nondirectory (directory-file-name default-directory)))
-        (sml/show-trailing-N
-         (buffer-name))
-        (t (replace-regexp-in-string "<[0-9]+>$" "" (buffer-name)))))
-
-(defun sml/fill-width-available ()
-  "Return the size available for filling."
-  (max 0
-       (+ sml/extra-filler
-          (- (window-total-width)
-             (let ((sml/simplified t))
-               (length (format-mode-line mode-line-format)))))))
-
-(defconst sml/propertized-shorten-mode-string
-  '(:propertize sml/shorten-mode-string
-                face sml/minor-modes
-                help-echo "mouse-1: Shorten minor modes"
-                local-map (keymap (mode-line keymap (mouse-1 . sml/toggle-shorten-modes)))
-                mouse-face mode-line-highlight))
-(defconst sml/propertized-full-mode-string
-  '(:propertize sml/full-mode-string
-                face sml/minor-modes
-                help-echo "mouse-1: Show all modes"
-                local-map (keymap (mode-line keymap (mouse-1 . sml/toggle-shorten-modes)))
-                mouse-face mode-line-highlight))
-
-(defun sml/count-occurrences-starting-at (regex string start)
-  "Count occurrences of REGEX in STRING starting at index START."
-  (if (string-match regex string start)
-      (+ 1 (sml/count-occurrences-starting-at regex string (match-end 0)))
-    0))
-
-;;; Patch, in case the user is using the wrong variable.
-(when (boundp 'sml/hidden-modes)
-  (message "[smart-mode-line] Warning: `sml/hidden-modes' is obsolete, use `rm-blacklist' instead")
-  (setq rm-blacklist sml/hidden-modes))
-(define-obsolete-variable-alias 'sml/hidden-modes 'rm-blacklist)
-
-(defun sml/generate-minor-modes ()
-  "Extracts all rich strings necessary for the minor mode list."
-  (if sml/simplified
-      ""
-    (let* (;; The minor-mode-alist
-           (nameList (rm--mode-list-as-string-list))
-           ;; The size available
-           (size (if (member sml/mode-width '(full right))
-                     ;; Calculate how much width is available
-                     (sml/fill-width-available)
-                   ;; or use what the user requested.
-                   sml/mode-width))
-           ;; Used for counting size.
-           (finalNameList (mapconcat 'identity  nameList ""))
-           needs-removing filling)
-
-      ;; Calculate whether truncation is necessary.
-      (when (and sml/shorten-modes (> (length finalNameList) size))
-        ;; We need to remove 1+ "the number of spaces found".
-        (setq needs-removing
-              (1+
-               (sml/count-occurrences-starting-at
-                " " finalNameList
-                (- size (string-width sml/full-mode-string))))))
-      ;; Add truncation string if necessary
-      (when needs-removing
-        (setcdr (last nameList (1+ needs-removing))
-                (list t sml/propertized-full-mode-string)))
-      ;; If we're not shortenning, add " -" at the end.
-      (unless sml/shorten-modes
-        (add-to-list 'nameList sml/propertized-shorten-mode-string t))
-
-      ;; Padding
-      (setq filling (- size (length (format-mode-line nameList))))
-      (setq filling (make-string (max 0 filling) sml/fill-char))
-
-      (if (eq sml/mode-width 'right)
-          (list (propertize filling 'face 'sml/modes)
-                'sml/pre-minor-modes-separator nameList
-                'sml/pos-minor-modes-separator)
-        (list "" 'sml/pre-minor-modes-separator nameList
-              'sml/pos-minor-modes-separator filling)))))
-
-(defun sml/propertize-prefix (prefix)
-  "Set the color of PREFIX according to its contents."
-  (cl-loop for pair in sml/prefix-face-list
-           if (string-match (car pair) prefix)
-           return (propertize prefix 'face (car (cdr pair)))))
-
-(defun sml/get-directory ()
-  "Decide if we want directory shown. If so, return it."
-  (abbreviate-file-name
-   (cond
-    ;; In email attachments, buffer-file-name is non-nil, but
-    ;; file-name-directory returns nil
-    ((buffer-file-name) (or (file-name-directory (buffer-file-name)) ""))
-    ((eq major-mode 'dired-mode)
-     (replace-regexp-in-string "/[^/]*/$" "/" default-directory))
-    ((and (symbolp major-mode)
-          (member major-mode '(shell-mode eshell-mode)))
-     default-directory)
-    ;; In indirect buffers, buffer-file-name is nil. The correct value is
-    ;; retrieved from the base buffer.
-    ((buffer-base-buffer)
-     (with-current-buffer (buffer-base-buffer) (sml/get-directory)))
-    (t ""))))
-
-(defun sml/set-battery-font ()
-  "Set `sml/battery' face depending on battery state."
-  (let ((data (and (boundp 'battery-status-function)
-                   battery-status-function
-                   (funcall battery-status-function))))
-    (if  (string-equal "AC" (cdr (assoc 76 data)))
-        (copy-face 'sml/charging 'sml/battery)
-      (copy-face 'sml/discharging 'sml/battery))))
-
-(defadvice battery-update (before sml/set-battery-font activate)
-  "Fontify the battery display."
-  (sml/set-battery-font))
-
-(defun sml/replacer (in)
-  "Run on string IN the replacements from `sml/replacer-regexp-list'.
-Runs first on the given path, and if that doesn't have any affect,
-runs them again on a version of the given path with all symlinks
-expanded via `file-truename'.  If neither run succeeds in making
-any replacements, returns the path originally given.
-
-Used by `sml/strip-prefix' and `sml/get-prefix'."
-  ;; First try replacing on the original path
-  (if (string= in "")
-      in
-    (sml/replacer-raw in)))
-
-(defun sml/replacer-raw (in)
-  "Run on the string IN the replacements from `sml/replacer-regexp-list'.
-
-If projectile is loaded, also performs replacements specified by
-project name first."
-  (let ((out in)
-        proj)
-    ;; Maybe try projectile
-    (when (and sml/projectile-loaded-p
-               (eq sml/use-projectile-p 'before-prefixes))
-      (setq out (sml/perform-projectile-replacement out)))
-    ;; Try regular replacements
-    (when (string= out in)
-      (dolist (cur sml/replacer-regexp-list)
-        (setq out (replace-regexp-in-string (car cur) (car (cdr cur)) out))))
-    ;; Try truename replacements
-    (when (string= out in)
-      (let* ((true-in (abbreviate-file-name (file-truename in)))
-             (true-out true-in))
-        (dolist (cur sml/replacer-regexp-list)
-          (setq true-out (replace-regexp-in-string
-                          (car cur) (car (cdr cur)) true-out)))
-        (unless (string= true-in true-out)
-          (setq out true-out))))
-    ;; Maybe try projectile later
-    (when (and sml/projectile-loaded-p
-               (eq sml/use-projectile-p 'after-prefixes)
-               (string= out in))
-      (setq out (sml/perform-projectile-replacement out)))
-    out))
-
-(declare-function projectile-project-p "projectile")
-(declare-function projectile-project-name "projectile")
-(defun sml/perform-projectile-replacement (in)
-  "If path IN is inside a project, use its name as a prefix."
-  (let ((proj (projectile-project-p)))
-    (if (stringp proj)
-        (let* ((replacement
-                (format sml/projectile-replacement-format
-                  (projectile-project-name)))
-               (short (replace-regexp-in-string
-                       (concat "^" (regexp-quote (abbreviate-file-name proj)))
-                       replacement
-                       in)))
-          (if (string= short in)
-              (let* ((true-in (abbreviate-file-name (file-truename in)))
-                     (true-short
-                      (replace-regexp-in-string
-                       (concat "^" (regexp-quote (abbreviate-file-name (file-truename proj))))
-                       replacement true-in)))
-                (if (string= true-in true-short) in true-short))
-            short))
-      in)))
-
-(defun sml/regexp-composer (getter)
-  "Prepare the actual regexp using `sml/prefix-regexp'.
-If GETTER is non-nil, result regexp also accepts empty match."
-  (let ((left "^\\(")
-        (right (if getter "\\|\\).*" "\\)")))
-    (if (stringp sml/prefix-regexp)
-        (if (string-match "\\(" sml/prefix-regexp)
-            sml/prefix-regexp
-          (concat left sml/prefix-regexp right))
-      (concat left (mapconcat 'identity sml/prefix-regexp "\\|") right))))
-
-(defun sml/strip-prefix (path)
-  "Remove prefix from string PATH.
-
-A prefix is anything at the begining of the line that matches a
-regexp in `sml/prefix-regexp'."
-  (replace-regexp-in-string (sml/regexp-composer nil) "" path))
-
-(defun sml/get-prefix (path)
-  "Get prefix from string PATH.
-
-A prefix is anything at the begining of the line that matches a
-regexp in `sml/prefix-regexp'."
-  (replace-regexp-in-string (sml/regexp-composer t) "\\1" path))
-
-(defun sml/not-shorten-directory (dir ml)
-  "Return DIR, abbreviated and prefixed.
-ML isn't used."
-  (sml/strip-prefix dir))
-
-(defun sml/do-shorten-directory (dir max-length)
-  "Show up to MAX-LENGTH characters of a directory name DIR."
-  (let ((longname (sml/strip-prefix dir)))
-    ;; If it fits, return the string.
-    (if (<= (length longname) max-length) longname
-      ;; If it doesn't, shorten it
-      (let ((path (reverse (split-string longname "/")))
-            (output ""))
-        (when (and path (equal "" (car path)))
-          (setq path (cdr path)))
-        ;; Concat as many levels as possible, leaving 4 chars for safety.
-        (while (and path (< (length (concat (car path) "/" output)) (- max-length 3)))
-          (setq output (concat (car path) "/" output))
-          (setq path (cdr path)))
-        ;; If we had to shorten, prepend .../
-        (when path
-          (setq output (concat ".../" output)))
-        output))))
-
-(provide 'smart-mode-line)
-;;; smart-mode-line.el ends here
diff --git a/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-autoloads.el b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-autoloads.el
new file mode 100644
index 0000000..77dc939
--- /dev/null
+++ b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-autoloads.el
@@ -0,0 +1,58 @@
+;;; smart-mode-line-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "smart-mode-line" "smart-mode-line.el" (22171
+;;;;;;  46544 0 0))
+;;; Generated autoloads from smart-mode-line.el
+
+(when load-file-name (let ((dir (file-name-as-directory (file-name-directory load-file-name)))) (add-to-list 'custom-theme-load-path dir) (when (file-directory-p (file-name-as-directory (concat dir "themes"))) (add-to-list 'custom-theme-load-path (file-name-as-directory (concat dir "themes"))))))
+
+(autoload 'sml/setup "smart-mode-line" "\
+Setup the mode-line to be smart and sexy.
+
+ARG is ignored. Just call this function in your init file, and
+the mode-line will be setup.
+
+\(fn &optional ARG)" t nil)
+
+(defalias 'smart-mode-line-enable #'sml/setup)
+
+;;;***
+
+;;;### (autoloads nil "smart-mode-line-dark-theme" "smart-mode-line-dark-theme.el"
+;;;;;;  (22171 46544 0 0))
+;;; Generated autoloads from smart-mode-line-dark-theme.el
+
+(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
+
+;;;***
+
+;;;### (autoloads nil "smart-mode-line-light-theme" "smart-mode-line-light-theme.el"
+;;;;;;  (22171 46544 0 0))
+;;; Generated autoloads from smart-mode-line-light-theme.el
+
+(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
+
+;;;***
+
+;;;### (autoloads nil "smart-mode-line-respectful-theme" "smart-mode-line-respectful-theme.el"
+;;;;;;  (22171 46544 0 0))
+;;; Generated autoloads from smart-mode-line-respectful-theme.el
+
+(when load-file-name (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name))))
+
+;;;***
+
+;;;### (autoloads nil nil ("smart-mode-line-pkg.el") (22171 46544
+;;;;;;  857933 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; smart-mode-line-autoloads.el ends here
diff --git a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-dark-theme.el b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-dark-theme.el
similarity index 100%
rename from emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-dark-theme.el
rename to emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-dark-theme.el
diff --git a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-light-theme.el b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-light-theme.el
similarity index 100%
rename from emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-light-theme.el
rename to emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-light-theme.el
diff --git a/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-pkg.el b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-pkg.el
new file mode 100644
index 0000000..0c95870
--- /dev/null
+++ b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-pkg.el
@@ -0,0 +1,8 @@
+(define-package "smart-mode-line" "20160111.934" "A color coded smart mode-line."
+  '((emacs "24.3")
+    (rich-minority "0.1.1"))
+  :url "http://github.com/Malabarba/smart-mode-line" :keywords
+  '("mode-line" "faces" "themes"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-respectful-theme.el b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-respectful-theme.el
similarity index 100%
rename from emacs.d/elpa/smart-mode-line-20150426.910/smart-mode-line-respectful-theme.el
rename to emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line-respectful-theme.el
diff --git a/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line.el b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line.el
new file mode 100755
index 0000000..df54335
--- /dev/null
+++ b/emacs.d/elpa/smart-mode-line-20160111.934/smart-mode-line.el
@@ -0,0 +1,1727 @@
+;;; smart-mode-line.el --- A color coded smart mode-line.
+
+;; Copyright (C) 2012 Artur Malabarba <emacs@endlessparentheses.com>
+
+;; Author: Artur Malabarba <emacs@endlessparentheses.com>
+;; URL: http://github.com/Malabarba/smart-mode-line
+;; Version: 2.10
+;; Package-Requires: ((emacs "24.3") (rich-minority "0.1.1"))
+;; Keywords: mode-line faces themes
+;; Prefix: sml
+;; Separator: /
+
+;;; Commentary:
+;;
+;; Smart Mode Line is a sexy mode-line for Emacs. It aims to be easy to
+;; read from small to large monitors by using *colors*, a *prefix feature*, and
+;; *smart truncation*.
+;;
+;; New in v2.5
+;; ===========
+;; - Emacs 24.4 compatible.
+;; - Integration with [Projectile](https://github.com/bbatsov/projectile)!
+;; - Display `current-directory' in Shell and eshell.
+;; - New value for `sml/theme': `automatic' (highly recommended).
+;; - `sml/apply-theme' is interactive and has completion.
+;; - Smart-mode-line themes are now regular themes.
+;;
+;; Installation
+;; ===
+;; **smart-mode-line** is available on Melpa, and that's the recommended
+;; way of installing it. If you do that, you can simply activate it with:
+;;
+;;     (sml/setup)
+;;
+;; To set the color theme, do one of the following BEFORE `sml/setup`:
+;;
+;;     (setq sml/theme 'dark)
+;;     (setq sml/theme 'light)
+;;     (setq sml/theme 'respectful)
+;;
+;; Features
+;; ===
+;; Its main features include:
+;;
+;;  1. **Color coded**:
+;;     Highlights the most important information for you
+;;     (buffer name, modified state, line number). Don't
+;;     like the colors? See item *5.*!
+;;
+;;  2. **Fixed width** (if you want):
+;;     Lets you set a maxium width for the path name and mode names, and
+;;     truncates them intelligently (truncates the directory, not the
+;;     buffer name). Also let's you **right indent** strings in the
+;;     mode-line (see `sml/mode-width').
+;;
+;;  3. **Directory as Prefixes**:
+;;     Prefix feature saves a LOT of space. e.g. *"~/.emacs.d/"*
+;;     is translated to *":ED:"* in the path (open a file inside
+;;     this folder to see it in action). Long path names you
+;;     are commonly working on are displayed as short
+;;     abbreviations. Set your own prefixes to make best use
+;;     of it (by configuring `sml/replacer-regexp-list'). Mousing
+;;     over the abbreviated path will show you the full
+;;     path. See below for examples.
+;;
+;;  4. **Hide or Highlight minor-modes**:
+;;     The [rich-minority](https://github.com/Malabarba/rich-minority)
+;;     package saves even more space. Select which minor modes you don't
+;;     want to see listed by adding them to the variable
+;;     `rm-excluded-modes', or even highlight the modes that are more
+;;     important with the variable `rm-text-properties'. This will filter
+;;     out the modes you don't care about and unclutter the modes list
+;;     (mousing over the modes list still shows the full list).
+;;
+;;  4. **Hide minor-modes**:
+;;     Hidden-modes feature saves even more space. Select
+;;     which minor modes you don't want to see listed by
+;;     customizing the `rm-blacklist' variable. This will
+;;     filter out the modes you don't care about and unclutter
+;;     the modes list (mousing over the modes list still shows
+;;     the full list).
+;;
+;;  5. **Very easy to configure**:
+;;     All colors and variables are customizable. You can change the
+;;     whole theme with `sml/apply-theme', or just customize anything
+;;     manually with `sml/customize' and `sml/customize-faces'. There are
+;;     *DOZENS* of variables to customize your mode-line, just pop over
+;;     there and have a look!
+;;
+;;  6. **Compatible with absolutely anything**:
+;;     I'm serious. Versions 2.0 and above should be compatible with
+;;     **any** other packages that display information in the mode-line
+;;     (evil, nyan-mode, elscreen, display-battery-mode, etc). If you
+;;     find *ANYTHING* that does not appear as it should, file a bug report
+;;     and I'll get to it.
+;;
+;; Important Variables:
+;; ===
+;; All variables can be edited by running `sml/customize', and the
+;; documentations are mostly self explanatory, I list here only the
+;; most important ones.
+;;
+;;  1. `sml/theme'
+;;   Choose what theme you want to use for the mode-line colors. For now
+;;   there are 3 different themes: `dark', `light', and `respectful'.
+;;
+;;  1. `sml/shorten-directory' and `sml/shorten-modes'
+;;   Setting both of these to `t' guarantees a fixed width mode-line
+;;   (directory name and minor-modes list will be truncated to fit). To
+;;   actually define the width, see below.
+;;
+;;  2. `sml/name-width' and `sml/mode-width'
+;;   Customize these according to the width of your Emacs frame. I set
+;;   them to `40' and `full' respectively, and the mode-line fits
+;;   perfectly when the frame is split in two even on my laptop's small
+;;   17" monitor. `full' means everything after the minor-modes will be
+;;   right-indented.
+;;
+;;  3. `sml/replacer-regexp-list'
+;;   This variable is a list of (REGEXP REPLACEMENT) that is used
+;;   to parse the path. The replacements are applied
+;;   sequentially. This allows you to greatly abbreviate the path
+;;   that's shown in the mode-line. If this abbreviation is of
+;;   the form *":SOMETHING:"*, it is considered a prefix and get's
+;;   a different color (you can change what's considered a prefix
+;;   by customizing `sml/prefix-regexp').
+;;   For example, if you do a lot of work on a folder called
+;;   *"~/Dropbox/Projects/In-Development/"* almost half the
+;;   mode-line would be occupied just by the folder name, which
+;;   is much less important than the buffer name. But, you can't
+;;   just hide the folder name, since editing a file in
+;;   *"~/Dropbox/Projects/In-Development/Source"* is VERY different
+;;   from editting a file in *"~/Dropbox/Projects/Source"*. By
+;;   setting up a prefix for your commonly used folders, you get
+;;   all that information without wasting all that space. In this
+;;   example you could set the replacement to *":ProjDev:"* or just
+;;   *":InDev:"*, so the path shown in the mode-line will be
+;;   *":ProjDev:Source/"* (saves a lot of space without hiding
+;;   information).
+;;
+;; Here go some more useful examples:
+;;
+;;     (add-to-list 'sml/replacer-regexp-list '("^~/Dropbox/Projects/In-Development/" ":ProjDev:") t)
+;;     (add-to-list 'sml/replacer-regexp-list '("^~/Documents/Work/" ":Work:") t)
+;;
+;;     ;; Added in the right order, they even work sequentially:
+;;     (add-to-list 'sml/replacer-regexp-list '("^~/Dropbox/" ":DB:") t)
+;;     (add-to-list 'sml/replacer-regexp-list '("^:DB:Documents" ":DDocs:") t)
+;;     (add-to-list 'sml/replacer-regexp-list '("^~/Git-Projects/" ":Git:") t)
+;;     (add-to-list 'sml/replacer-regexp-list '("^:Git:\\(.*\\)/src/main/java/" ":G/\\1/SMJ:") t)
+
+;;; License:
+;;
+;; This file is NOT part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 2
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+
+;;; Change Log:
+;; 2.6     - 2014/08/15 - Allow for sml/name-width to have different mininum and maximum values.
+;; 2.6     - 2014/08/15 - Delegated minor-mode filtering to rich-minority package.
+;; 2.5.3   - 2014/06/18 - Fix custom-theme-load-path for manual installations.
+;; 2.5.2   - 2014/06/16 - sml/no-confirm-load-theme variable to skip theme confirmation.
+;; 2.5.1   - 2014/06/16 - sml/apply-theme no-confirm in daemon mode.
+;; 2.5     - 2014/05/15 - sml/theme: New possible values: 'automatic (highly recommended) or nil.
+;; 2.5     - 2014/05/14 - sml/mode-width: New possible value: 'right.
+;; 2.5     - 2014/05/14 - Themes engine completely redone.
+;; 2.5     - 2014/05/14 - sml/apply-theme is interactive.
+;; 2.4.5   - 2014/04/24 - Changed default value of sml/mode-width back to 'full.
+;; 2.4.3   - 2014/03/25 - sml/mode-line-buffer-identification fix for ggtags.
+;; 2.4.2   - 2014/03/13 - Perspective support simplified to sml/apply-theme.
+;; 2.4.2   - 2014/03/13 - Projectile integration only applies after the user replacements (to change, see sml/use-projectile-p).
+;; 2.4.1   - 2014/03/11 - Small fix to dired-mode with uniquify.
+;; 2.4     - 2014/03/10 - Projectile integration! To disable it, set sml/use-projectile-p.
+;; 2.4     - 2014/03/10 - Change the order of line/column numbers with sml/order-of-line-and-column.
+;; 2.4     - 2014/03/10 - Take over dired's buffer-identification. We will undo this if dired ever does anything special with this variable.
+;; 2.4     - 2014/03/10 - Show current-directory in Shell and eshell.
+;; 2.4     - 2014/03/10 - Tested against 24.4.
+;; 2.4     - 2014/03/10 - Ditch total number of lines count.
+;; 2.3.13  - 2014/03/05 - sml/apply-theme forces our foreground/background colors.
+;; 2.3.12  - 2014/03/05 - Use sml/show-remote to hide/show the "@" symbol. .
+;; 2.3.12  - 2014/03/05 - Support showing tramp state (remote buffer).
+;; 2.3.12  - 2014/02/27 - sml/apply-theme avoids nesting.
+;; 2.3.11  - 2014/02/15 - Silent sml/apply-theme.
+;; 2.3.10  - 2014/02/15 - Fix sml/setup ignoring sml/theme.
+;; 2.3.9   - 2014/02/10 - sml/hidden-modes allows regexps.
+;; 2.3.8   - 2014/02/07 - Buffer identification width auto-updates when sml/name-width changes.
+;; 2.3.8   - 2014/02/07 - sml/apply-theme customizes helm-candidate-number.
+;; 2.3.7   - 2014/01/21 - Adapt sml/generate-buffer-identification.
+;; 2.3.6   - 2013/12/16 - sml/replacer follows symlinks.
+;; 2.3.6   - 2013/12/16 - Fix filling and name on the very first update of non-file buffers.
+;; 2.3.5   - 2013/12/14 - sml/generate-position-help runs less often now.
+;; 2.3.4   - 2013/12/14 - Remove lag-inducing advice.
+;; 2.3.3   - 2013/12/09 - Fix sml/get-directory for files attached to mails - Thanks tsdh.
+;; 2.3.2   - 2013/12/07 - Fix for themes which set :inverse-video t in the mode-line.
+;; 2.3.1   - 2013/12/04 - sml/show-frame-identification now always defaults to nil.
+;; 2.3.1   - 2013/12/04 - Fix for sml/show-client not working.
+;; 2.3     - 2013/12/04 - sml/show-frame-identification only t for terminals.
+;; 2.3     - 2013/12/03 - Mark boolean's as safe-local-variables.
+;; 2.2.3   - 2013/12/03 - Fix possible recursion in sml/apply-theme.
+;; 2.2.2   - 2013/11/27 - Fix sml/apply-theme to consider saved faces.
+;; 2.2.1   - 2013/11/27 - Fix doc for sml/show-frame-identification.
+;; 2.2     - 2013/11/26 - Better minor list and some fixes.
+;; 2.0.5   - 2013/11/24 - sml/revert no longer available.
+;; 2.0.4   - 2013/11/24 - Improved faces a little.
+;; 2.0.3.4 - 2013/11/15 - Workaround to prevent core dump.
+;; 2.0.3.3 - 2013/11/13 - Small fix on sml/generate-buffer-identification for man pages.
+;; 2.0.3.2 - 2013/11/12 - sml/filter-mode-line-list now uses remove nil.
+;; 2.0.3.1 - 2013/11/08 - Quick fix sml/get-directory.
+;; 2.0.3   - 2013/11/07 - sml/show-frame-identification.
+;; 2.0.3   - 2013/11/07 - Improvements to sml/parse-mode-line-elements.
+;; 2.0.3   - 2013/11/07 - sml/compile-position-construct.
+;; 2.0.3   - 2013/11/07 - Line-number removed from sml/generate-position-help.
+;; 2.0.3   - 2013/11/07 - Position optimization with sml/position-construct.
+;; 2.0.3   - 2013/11/07 - Performance optimization thanks to sml/buffer-identification.
+;; 2.0.2   - 2013/11/05 - better sml/replacer-regexp-list.
+;; 2.0.2   - 2013/11/05 - sml/mule-info also hides input system.
+;; 2.0.2   - 2013/11/05 - show-encoding is now alias for sml/mule-info.
+;; 2.0.2   - 2013/11/05 - Removed anchors.
+;; 2.0.1   - 2013/11/04 - Slight fix on sml/apply-theme
+;; 2.0     - 2013/11/04 - Remove unnecessary functions.
+;; 2.0     - 2013/11/04 - Many other internal improvements.
+;; 2.0     - 2013/11/02 - Remove sml/mode-line-format
+;; 2.0     - 2013/11/02 - Reduce huge spaces in mode-line-format
+;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-mule-info.
+;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-client.
+;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-modified.
+;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-remote.
+;; 2.0     - 2013/11/02 - Manually edits mode-line-front-space.
+;; 2.0     - 2013/11/02 - Manually edits mode-line-frame-identification.
+;; 2.0     - 2013/11/02 - Manually edits mode-line-buffer-identification.
+;; 2.0     - 2013/11/02 - Manually edits mode-line-end-spaces.
+;; 2.0     - 2013/11/02 - Redesign the format to use mode-line-modes.
+;; 2.0     - 2013/11/01 - Redesign the format to use mode-line-position.
+;; 1.30.1  - 2013/10/21 - eval-when-compile cl
+;; 1.30    - 2013/10/13 - Click mode list to toggle minor-mode hiding.
+;; 1.29.2  - 2013/10/02 - Different default position-percentage face.
+;; 1.29.1  - 2013/08/22 - Fix hang introduced with last update.
+;; 1.29    - 2013/08/11 - Fixed lag with remote files.
+;; 1.28.1  - 2013/08/11 - Fix for the erc fix.
+;; 1.28    - 2013/08/11 - Fixing erc notifications.
+;; 1.27    - 2013/08/10 - Changed default value of sml/mode-width to a number. 'full didn't work for everyone.
+;; 1.27    - 2013/08/10 - Doc bug.
+;; 1.26    - 2013/07/18 - Fix for % in the process string.
+;; 1.25    - 2013/07/16 - sml/override-theme also tries to set good colors for the text (not just the background).
+;; 1.24    - 2013/07/16 - sml/mule-info face changed to be less important.
+;; 1.23.2  - 2013/07/15 - Changed doc of sml/replacer-regexp-list.
+;; 1.23.1  - 2013/07/15 - moved perspective variable to eval-after-load.
+;; 1.23    - 2013/07/15 - added an icon to mew-format.
+;; 1.23    - 2013/07/15 - obsolete sml/show-time.
+;; 1.23    - 2013/07/15 - fixed a bug which required emacs restart for changes to take effect.
+;; 1.22    - 2013/07/15 - sml/vc-mode-show-backend implemented.
+;; 1.22    - 2013/07/15 - move mew-support variable.
+;; 1.22    - 2013/07/15 - Changed default value of sml/replacer-regexp-list.
+;; 1.21    - 2013/07/14 - Encoding description.
+;; 1.21    - 2013/07/14 - Reestructured some of the present functions.
+;; 1.21    - 2013/07/14 - New position indicator.
+;; 1.20    - 2013/07/14 - vc-mode support.
+;; 1.19    - 2013/07/14 - Reorganized groups.
+;; 1.18    - 2013/07/12 - mew variables only get created if mew is loaded.
+;; 1.18    - 2013/07/12 - Reformulated the simplified mode-line.
+;; 1.18    - 2013/07/12 - Added number of lines to mouse tooltip of position.
+;; 1.17    - 2013/07/10 - Fallback 'modified' string.
+;; 1.16    - 2013/07/08 - Changed implementation of battery display.
+;; 1.16    - 2013/07/08 - Fixed battery-display.
+;; 1.15    - 2013/07/06 - Implemented sml-modeline support.
+;; 1.14    - 2013/06/25 - Slightly reduced the default value of extra-filler.
+;; 1.13    - 2013/06/10 - removed 'cl requirement.
+;; 1.13    - 2013/06/10 - Advice to mew-biff-clear.
+;; 1.12    - 2013/06/06 - Gigantic typo fix. Sorry about that.
+;; 1.11    - 2013/06/05 - Added biff support.
+;; 1.10    - 2013/05/24 - Fix for buffer name with '%'.
+;; 1.9     - 2013/05/13 - Now uses file name instead of buffer-name by default, controled by `sml/show-file-name'.
+;; 1.9     - 2013/05/13 - When showing buffer name, can strip the <N> part by setting `sml/show-trailing-N'.
+;; 1.8.3   - 2013/04/21 - Fixed first line of docs.
+;; 1.8.2   - 2013/04/18 - added empty anchors throughout the mode-line.
+;; 1.8.2   - 2013/04/18 - evil-mode support.
+;; 1.8.1   - 2013/04/17 - sml/bug-report function.
+;; 1.8.1   - 2013/04/17 - sml/override-theme variable.
+;; 1.8.1   - 2013/04/17 - Changed install instruction to override theme settings.
+;; 1.8     - 2013/04/14 - sml/mode-width can now be 'full.
+;; 1.7.1   - 2012/11/17 - Perspective support.
+;; 1.7     - 2012/11/14 - Fixed some modes not showing in the minor mode list - Thanks Constantin.
+;; 1.7     - 2012/11/14 - Fixed infinite loop.  - Thanks Constantin.
+;; 1.7     - 2012/11/14 - Fixed for dired-mode.
+;; 1.7     - 2012/11/14 - Added parent customize groups.
+;; 1.6.2   - 2012/07/13 - Fixed mode shortenning.
+;; 1.6.1   - 2012/07/12 - NEW FEATURE: Modes list now fully supports clicking.
+;; 1.6.1   - 2012/07/12 - NEW FEATURE: `sml/version' constant.
+;; 1.6.1   - 2012/07/12 - `sml/hidden-modes' is now a list of strings (not regexps).
+;; 1.6     - 2012/07/09 - NEW FEATURE: Customizable faces for the prefix, see `sml/prefix-face-list'.
+;; 1.5.4   - 2012/06/28 - Optimized regexp-replacer.
+;; 1.5.3   - 2012/06/20 - Remove prefix and folder for non-files. Color the :Git prefix.
+;; 1.5.2   - 2012/06/14 - Saner default widths and mode-name fix for Term.
+;; 1.5.1   - 2012/06/12 - Fixed battery font for corner cases.
+;; 1.5     - 2012/06/11 - Added support for display-battery-mode. See the description for more.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'custom)
+(require 'cus-face)
+(require 'rich-minority)
+
+(defconst sml/version "2.10" "Version of the smart-mode-line.el package.")
+(defun sml/bug-report ()
+  "Opens github issues page in a web browser. Please send me any bugs you find, and please include your Emacs and sml versions."
+  (interactive)
+  (browse-url "https://github.com/Malabarba/smart-mode-line/issues/new")
+  (message "Your sml/version is: %s, and your emacs version is: %s.\nPlease include this in your report!" sml/version emacs-version))
+(defun sml/customize ()
+  "Open the customization group for the `smart-mode-line' package."
+  (interactive)
+  (customize-group 'smart-mode-line t))
+(defun sml/customize-faces ()
+  "Open the customization group for faces used by the `smart-mode-line' package."
+  (interactive)
+  (customize-group 'smart-mode-line-faces t))
+
+(defgroup smart-mode-line '()
+  "Customization group for the `smart-mode-line' package."
+  :group 'convenience
+  :prefix 'sml)
+(defgroup smart-mode-line-position '()
+  "Showing the point position in the smart mode line."
+  :group 'smart-mode-line
+  :prefix 'sml)
+(defgroup smart-mode-line-path-and-prefix '()
+  "Showing the path, buffer-name, and prefix in the smart mode line."
+  :group 'smart-mode-line
+  :prefix 'sml)
+(defgroup smart-mode-line-mode-list '()
+  "Showing major/minor modes in the smart mode line."
+  :group 'smart-mode-line
+  :prefix 'sml)
+(defgroup smart-mode-line-others '()
+  "Showing other data in the smart mode line."
+  :group 'smart-mode-line
+  :prefix 'sml)
+
+(defgroup smart-mode-line-faces '()
+  "Font (face) colors for the `smart-mode-line.el' package.
+
+You can fully customize any of the fonts to match the color you
+want. You can also set properties like bold with ':weight bold'.
+
+Note that, by default, smart-mode-line overrides your theme's
+settings for the background and foreground color of the modeline
+face. We need to override, otherwise some elements become
+unreadable on lighter themes. If you'd rather configure these
+unreadable colors yourself and keep your theme's settings, just
+set `sml/override-theme' to nil."
+  :prefix 'sml
+  :group 'smart-mode-line
+  :group 'faces)
+
+
+;;; Actual Code
+(defvar erc-track-position-in-mode-line)
+(defvar sml/simplified nil
+  "Temporary dynamic variable. Used for filling.")
+
+(defvar sml/-debug nil
+  "Whether debugging information should be printed.")
+
+(defmacro sml/-debug (fmt &rest r)
+  "If variable `sml/-debug' is non-nil, describe FMT.
+If FMT is a string, this is essentially the same as `message'.
+If FMT is anything else, this is essentially:
+    (message \"%s is: %s\" 'FMT FMT)"
+  (when (and (boundp 'sml/-debug) sml/-debug)
+    (if (stringp fmt)
+        `(apply #'message (concat "[sml/debug] " ,fmt) ,r)
+      `(message "[sml/debug] %s is: %s" ',fmt ,fmt))))
+
+(defvar sml/shortener-func 'sml/do-shorten-directory
+  "Function used to shorten the directory name.
+
+Value is a funcallable symbol that takes two arguments: the
+string to be shortened and the maximum size. This is set
+automatically when `sml/shorten-directory' is changed via the
+customization menu or via the `sml/toggle-shorten-directory'
+function (which are the only ways you should change it).")
+
+(defun sml/set-shortener-func (sym val)
+  "Configure `sml/shortener-func' according to `sml/shorten-directory'.
+Set SYM to VAL."
+  (set-default sym val)
+  (if val (setq sml/shortener-func 'sml/do-shorten-directory)
+    (setq sml/shortener-func 'sml/not-shorten-directory)))
+
+(define-obsolete-variable-alias 'sml/time-format 'display-time-format)
+(define-obsolete-variable-alias 'sml/show-time 'display-time-mode)
+(define-obsolete-variable-alias 'sml/override-theme 'sml/theme)
+
+(defcustom sml/theme 'automatic
+  "Defines which theme `smart-mode-line' should use.
+
+This is usually one of the symbols:
+'automatic, 'respectful, 'dark, 'light or nil;
+but it can be something else if there are other smart-mode-line
+themes defined.
+
+Setting this to 'light and 'dark will apply some predefined
+colors to the mode-line, which are designed to be easy to read.
+
+Setting this to nil will apply almost no colors. Use this if your
+global color theme already customizes sml faces (flatui-theme is
+an example).
+
+Setting this to 'automatic will let sml decide between 'light or
+'dark or nil, to best match the global theme that is active when
+`sml/setup' is called.
+
+Setting it to 'respectful will try to use the colors defined by
+your current Emacs theme (emphasis on the \"try\"). Use this if
+you color theme does NOT customize sml faces, AND if you're not
+happy with 'light or 'dark.
+This option will make the mode-line colors more consistent with
+buffer colors (when compared to 'light or 'dark, which have fixed
+colors) , but it's a bit of a shot in the dark. The result will
+vary for each color theme, and you may get colors that don't read
+well.
+
+But don't forget, ALL COLORS ARE CUSTOMIZABLE!
+`sml/customize-faces'
+Any color you change manually won't get affected by this
+variable.
+
+Setting this variable via `setq' only has effect BEFORE calling
+`sml/setup'. If smart-mode-line is already loaded, use
+ `sml/apply-theme' instead (or the customization interface)."
+  :type '(choice (const :tag "Automatically choose between 'light, 'dark, or nil during setup. (Default and Recommended)" automatic)
+                 (const :tag "Don't use a theme." nil)
+                 (const :tag "Use a dark color-theme." dark)
+                 (const :tag "Use a light color-theme." light)
+                 (const :tag "Respect the color-theme's colors." respectful)
+                 (symbol :tag "Other smart-mode-line theme you installed."))
+  :set 'sml/apply-theme
+  :initialize 'custom-initialize-default
+  :group 'smart-mode-line-faces :group 'smart-mode-line)
+
+(defcustom sml/position-percentage-format "%p"
+  "Format used to display position in the buffer.
+
+Set it to nil to hide the number."
+  :type 'string
+  :group 'smart-mode-line-position
+  :package-version '(smart-mode-line . "2.0"))
+(put 'sml/position-percentage-format 'risky-local-variable t)
+
+(defcustom sml/line-number-format "%3l"
+  "Format used to display line number.
+
+Empty it or disable `line-number-mode' to hide the number."
+  :type 'string
+  :group 'smart-mode-line-position
+  :set 'sml/compile-position-construct
+  :initialize 'custom-initialize-default)
+(put 'sml/line-number-format 'risky-local-variable t)
+
+(defcustom sml/size-indication-format "%I "
+  "Format to display buffer size when `size-indication-mode' is on."
+  :type 'string
+  :group 'smart-mode-line-position
+  :package-version '(smart-mode-line . "2.0")
+  :set 'sml/compile-position-construct
+  :initialize 'custom-initialize-default)
+(put 'sml/size-indication-format 'risky-local-variable t)
+
+(defcustom sml/col-number-format "%2c"
+  "Format used to display column number.
+
+Empty it or disable `column-number-mode' to hide the number."
+  :type 'string
+  :group 'smart-mode-line-position
+  :set 'sml/compile-position-construct
+  :initialize 'custom-initialize-default)
+(put 'sml/col-number-format 'risky-local-variable t)
+
+(defcustom sml/numbers-separator ":"
+  "Separator between line and column number.
+
+Since we use different faces for line and column number, you can
+just set this to \"\" to save an extra char of space."
+  :type 'string
+  :group 'smart-mode-line-position)
+
+(defcustom sml/show-remote t
+  "Whether to show an \"@\" for remote buffers."
+  :type 'boolean
+  :group 'smart-mode-line-others)
+(put 'sml/show-remote 'safe-local-variable 'booleanp)
+
+(defcustom sml/show-client nil
+  "Whether to show an \"@\" for emacsclient frames."
+  :type 'boolean
+  :group 'smart-mode-line-others)
+(put 'sml/show-client 'safe-local-variable 'booleanp)
+
+(defcustom sml/modified-char (char-to-string (if (char-displayable-p ?×) ?× ?*))
+  "String that indicates if buffer is modified. Should be one SINGLE char."
+  :type 'string
+  :group 'smart-mode-line-others
+  :package-version '(smart-mode-line . "1.16"))
+
+(defcustom sml/show-trailing-N t
+  "Whether the \"<N>\" suffix in buffer names should be displayed in the mode-line."
+  :type 'boolean
+  :group 'smart-mode-line-path-and-prefix)
+(put 'sml/show-trailing-N 'safe-local-variable 'booleanp)
+
+(defcustom sml/show-file-name t
+  "Unless nil: show file name instead of buffer name on the mode-line."
+  :type 'boolean
+  :group 'smart-mode-line-path-and-prefix)
+(put 'sml/show-file-name 'safe-local-variable 'booleanp)
+
+(defcustom sml/fill-char ?\s
+  "The char to be used for filling."
+  :type 'char
+  :group 'smart-mode-line-path-and-prefix)
+
+(defcustom sml/replacer-regexp-list
+  `((,(concat "^" (if (boundp 'org-directory) (regexp-quote org-directory) "~/org/")) ":Org:")
+    ("^~/\\.emacs\\.d/" ":ED:")
+    ("^/sudo:.*:" ":SU:")
+    ("^~/Documents/" ":Doc:")
+    ("^~/Dropbox/" ":DB:")
+    ("^:\\([^:]*\\):Documento?s/" ":\\1/Doc:")
+    ("^~/[Gg]it/" ":Git:")
+    ("^~/[Gg]it[Hh]ub/" ":Git:")
+    ("^~/[Gg]it\\([Hh]ub\\|\\)-?[Pp]rojects/" ":Git:"))
+  "List of pairs of strings used (by `sml/replacer') to create prefixes.
+
+The first string of each pair is a regular expression, the second
+is a replacement. These pairs are sequentially applied on the
+file path to replace portions of it, turning them into prefixes.
+For instance, \"~/.emacs.d/\" is replaced by \":ED:\", which is
+shorter but easily identified.
+
+The replacement strings can really be anything, but to be colored
+as a prefix a string must start and end with \":\" (see the
+default as an example, as an exception \"~/\" is also a prefix).
+
+Replacement doesn't stop on first match, so you can have stacking replacements:
+
+    (add-to-list 'sml/replacer-regexp-list '(\"^:DB:Org/\" \":Org:\") t)
+
+Remember that `add-to-list' adds items to the FRONT, and you'll
+usually want to add them to the back (thus the t at the end).
+
+You can also set custom colors (faces) for these prefixes, just
+set `sml/prefix-face-list' accordingly."
+  :type '(repeat (list regexp string))
+  :group 'smart-mode-line-path-and-prefix
+  :package-version '(smart-mode-line . "1.22"))
+
+(defcustom sml/prefix-regexp '(":\\(.*:\\)" "~/")
+  "List of Regexps used to identify prefixes.
+
+A prefix is anything at the beginning of a line that matches any
+of these regexps. Don't start these regexps with \"^\", the
+parser applies that for you."
+  :type '(repeat regexp)
+  :group 'smart-mode-line-path-and-prefix)
+
+(defcustom sml/prefix-face-list '((":SU:" sml/sudo)
+                                  (":G" sml/git)
+                                  ("" sml/prefix))
+  "List of (STRING FACE) pairs used by `sml/propertize-prefix'.
+
+After the file path is constructed, the prefix contained in it is
+colored according to this list. The elements are checked one by
+one and, if the prefix contains the STRING part of the pair, then
+FACE is applied to it (and checking stops there)."
+  :type '(repeat (list string face))
+  :group 'smart-mode-line-path-and-prefix)
+
+(defcustom sml/name-width 44
+  "Minimum and maximum size of the file name in the mode-line.
+
+If `sml/shorten-directory' is nil, this is the minimum width.
+Otherwise, this is both the minimum and maximum width.
+
+Alternatively, you can set the minimum and maximum widths
+separately, by setting this variable to a cons cell of integers:
+    (MIN-WIDTH . MAX-WIDTH)
+"
+  :type '(choice integer (cons (integer :tag "Minimum width")
+                               (integer :tag "Maximum width")))
+  :group 'smart-mode-line-path-and-prefix)
+
+(defcustom sml/shorten-directory t
+  "Should directory name be shortened to fit width?
+
+When the buffer+directory name is longer than
+`sml/name-width':
+    if nil the rest of the mode-line is pushed right;
+    otherwise the directory name is shortened to fit."
+  :type 'boolean
+  :group 'smart-mode-line-path-and-prefix
+  :set 'sml/set-shortener-func)
+(put 'sml/shorten-directory 'safe-local-variable 'booleanp)
+
+(defcustom sml/full-mode-string " +"
+  "String that's appended to the minor-mode list when it's full."
+  :type 'string
+  :group 'smart-mode-line-mode-list)
+
+(defcustom sml/shorten-mode-string " -"
+  "String that's appended to the minor-mode list when all modes are displayed."
+  :type 'string
+  :group 'smart-mode-line-mode-list)
+
+(defcustom sml/shorten-modes t
+  "Should modes list be shortened to fit width?
+
+When the modes list is longer than `sml/mode-width':
+    if nil the rest of the mode-line is pushed right;
+    otherwise the list is shortened to fit."
+  :type 'boolean
+  :group 'smart-mode-line-mode-list)
+(put 'sml/shorten-modes 'safe-local-variable 'booleanp)
+
+(defun sml/toggle-shorten-directory (&rest val)
+  "Toggle the variable `sml/shorten-directory'.
+
+If given an argument VAL, the variable is set to the argument,
+otherwise it is toggled. This can be used as an alternative to
+customizing the variable with `customize-group'. Setting the
+variable with `setq' will NOT work and should be avoided."
+  (interactive)
+  (sml/set-shortener-func 'sml/shorten-directory
+                          (if val (car-safe val)
+                            (not sml/shorten-directory))))
+
+(defun sml/toggle-shorten-modes (&rest val)
+  "Toggle the variable `sml/shorten-modes'.
+
+If given an argument VAL, the variable is set to the argument,
+otherwise it is toggled. This can be used as an alternative to
+customizing the variable with `customize-group'. Equivalent to
+setting the variable with `setq'."
+  (interactive)
+  (setq sml/shorten-modes (if val (car val)
+                            (not sml/shorten-modes)))
+  (force-mode-line-update))
+
+(defcustom sml/mode-width 'full
+  "Maximum and/or minimum size of the modes list in the mode-line.
+
+If it is an integer, then the modes list width is that many
+characters.
+
+If it is the symbol `full', then the mode-list fills all the
+empty space is available in the mode-line (this has the effect of
+indenting right anything after the mode-list).
+
+If it is the symbol `right', then it behaves like `full', but the
+minor-modes list is moved all the way to the right.
+
+If `sml/shorten-modes' is nil, this is the minimum width.
+Otherwise, this is both the minimum and maximum width."
+  :type '(choice integer symbol)
+  :group 'smart-mode-line-mode-list
+  :package-version '(smart-mode-line . "2.4.5"))
+
+(defcustom sml/battery-format " %p"
+  "Format used to display the battery in the mode-line.
+
+Only relevant if using `display-battery-mode'. See that function
+for the syntax."
+  :type 'string
+  :group 'smart-mode-line-others)
+
+(defcustom sml/modified-time-string "Modified on %T %Y-%m-%d."
+  "String format used for displaying the modified time.
+
+This is shown in the tooltip when hovering over the \"modified
+file\" character (which is usually a * right before the file
+name."
+  :type 'string
+  :group 'smart-mode-line-others)
+
+(defcustom sml/extra-filler 0
+  "The number of extra filling chars to use.
+It comes into play when `sml/mode-width' is set to 'full.
+
+This is necessary because the mode-line width (which we need but
+don't have access to) is larger than `window-total-width' (which
+we have access to).
+
+Decrease this if right indentation seems to be going too far (or
+if you just want to fine-tune it)."
+  :type 'integer
+  :group 'smart-mode-line-mode-list)
+
+;; Face definitions
+(defface sml/global           '((t :inverse-video nil)) "" :group 'smart-mode-line-faces)
+(defface sml/modes            '((t :inherit sml/global)) "" :group 'smart-mode-line-faces)
+(defface sml/minor-modes      '((t :inherit sml/global)) "" :group 'smart-mode-line-faces)
+(defface sml/filename         '((t :inherit sml/global :weight bold)) "" :group 'smart-mode-line-faces)
+(defface sml/prefix           '((t :inherit sml/global)) "" :group 'smart-mode-line-faces)
+(defface sml/read-only        '((t :inherit sml/not-modified)) "" :group 'smart-mode-line-faces)
+(defface sml/modified         '((t :inherit sml/not-modified :foreground "Red" :weight bold))
+  "" :group 'smart-mode-line-faces)
+(defface sml/outside-modified '((t :inherit sml/not-modified :foreground "#ffffff" :background "#c82829"))
+  "" :group 'smart-mode-line-faces)
+
+(defface sml/line-number         '((t :inherit sml/modes :weight bold))               "" :group 'smart-mode-line-faces)
+(defface sml/remote              '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
+(defface sml/name-filling        '((t :inherit sml/position-percentage))              "" :group 'smart-mode-line-faces)
+(defface sml/position-percentage '((t :inherit sml/prefix :weight normal))            "" :group 'smart-mode-line-faces)
+(defface sml/col-number          '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
+(defface sml/numbers-separator   '((t :inherit sml/col-number))                       "" :group 'smart-mode-line-faces)
+(defface sml/client              '((t :inherit sml/prefix))                           "" :group 'smart-mode-line-faces)
+(defface sml/not-modified        '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
+(defface sml/mule-info           '((t :inherit sml/global))                           "" :group 'smart-mode-line-faces)
+(defface sml/sudo                '((t :inherit sml/outside-modified))                 "" :group 'smart-mode-line-faces)
+(defface sml/git                 '((t :inherit (sml/read-only sml/prefix)))           "" :group 'smart-mode-line-faces)
+(defface sml/folder              '((t :inherit sml/global :weight normal))            "" :group 'smart-mode-line-faces)
+(defface sml/process             '((t :inherit sml/prefix))                           "" :group 'smart-mode-line-faces)
+(defface sml/vc                  '((t :inherit sml/git))                              "" :group 'smart-mode-line-faces)
+(defface sml/vc-edited           '((t :inherit sml/prefix))                           "" :group 'smart-mode-line-faces)
+(defface sml/charging            '((t :inherit sml/global :foreground "ForestGreen")) "" :group 'smart-mode-line-faces)
+(defface sml/discharging         '((t :inherit sml/global :foreground "Red"))         "" :group 'smart-mode-line-faces)
+(defface sml/time                '((t :inherit sml/modes))                            "" :group 'smart-mode-line-faces)
+
+(defvar sml/-apply-theme-is-running nil "Avoid nesting in `sml/apply-theme'.")
+
+(defcustom sml/no-confirm-load-theme nil
+  "If non-nil, `sml/apply-theme' will pass the NO-CONFIRM flag to `load-theme'.
+If you're having problems with Emacs always asking for permission
+to load a theme (and not remembering your choice), you can set
+this to t to workaround the problem. But it's recommended that
+you try the problem instead."
+  :type 'boolean
+  :group 'smart-mode-line-faces
+  :package-version '(smart-mode-line . "2.5.2"))
+
+;;;###autoload
+(when load-file-name
+  (let ((dir (file-name-as-directory (file-name-directory load-file-name))))
+    (add-to-list 'custom-theme-load-path dir)
+    (when (file-directory-p (file-name-as-directory (concat dir "themes")))
+      (add-to-list 'custom-theme-load-path
+                   (file-name-as-directory (concat dir "themes"))))))
+
+(defun sml/apply-theme (theme &optional value silent)
+  "Apply the theme called smart-mode-line-THEME.
+
+THEME is usually one of the symbols: respectful, dark, or light;
+but it can be something else if there are other smart-mode-line
+themes defined.
+See the `sml/theme' variable for the meaning of each symbol.
+
+This function will call `disable-theme' on any enabled themes
+whose name starts with \"smart-mode-line-\", then it will call
+`load-theme' on the theme called \"smart-mode-line-THEME\".
+
+This also sets the `sml/theme' variable, see its documentation
+for more information on each value.
+
+The second argument (VALUE) is for internal use only, DON'T USE IT.
+
+Third argument SILENT prevents messages."
+  (interactive
+   (list
+    (intern
+     (completing-read
+      "Load smart-mode-line theme: "
+      (cons
+       'automatic
+       (mapcar
+        (lambda (x) (replace-regexp-in-string "\\`smart-mode-line-" "" (symbol-name x)))
+        (cl-remove-if-not #'sml/theme-p (custom-available-themes))))))
+    nil nil))
+  (sml/-debug "Entering apply-theme")
+  (when (eq theme (intern "")) (setq theme nil))
+  (sml/-debug theme)
+  (sml/-debug sml/theme)
+  (unless silent (message "[sml] %s set to %s" 'sml/theme (or value theme)))
+  (sml/-debug sml/-apply-theme-is-running)
+  (unless sml/-apply-theme-is-running
+    (let ((sml/-apply-theme-is-running t)) ;Avoid nesting.
+      ;; Set the variable
+      (setq-default sml/theme (or value theme))
+      (sml/-debug sml/theme)
+
+      ;; Disable any previous smart-mode-line themes.
+      (sml/-debug custom-enabled-themes)
+      (mapc (lambda (x) (when (sml/theme-p x) (disable-theme x)))
+            custom-enabled-themes)
+      (sml/-debug custom-enabled-themes)
+
+      ;; Load the theme requested.
+      (sml/-debug sml/theme)
+      (when (eq sml/theme 'automatic)
+        (setq sml/theme (sml/-automatically-decide-theme)))
+      (sml/-debug sml/theme)
+      (when sml/theme
+        (let ((theme-name
+               (if (sml/theme-p sml/theme) sml/theme
+                 (intern (format "smart-mode-line-%s" sml/theme)))))
+          (sml/-debug theme-name)
+          (load-theme theme-name sml/no-confirm-load-theme))))))
+
+(defadvice enable-theme (after sml/after-enable-theme-advice (theme) activate)
+  "Make sure smart-mode-line themes take priority over global themes that don't customize sml faces."
+  (unless (or (eq theme 'user) (sml/faces-from-theme theme))
+    (mapc #'enable-theme
+          (reverse (cl-remove-if-not #'sml/theme-p custom-enabled-themes)))))
+
+(defun sml/theme-p (theme)
+  "Return non-nil if theme named THEME is a smart-mode-line theme.
+Takes symbols and strings."
+  (string-match "\\`smart-mode-line-" (if (symbolp theme) (symbol-name theme) theme)))
+
+(defvaralias 'sml/show-encoding 'sml/mule-info)
+
+(defcustom sml/show-eol nil
+  "Whether to display the buffer EOL in the mode-line."
+  :type 'boolean
+  :group 'smart-mode-line-others)
+(put 'sml/show-eol 'safe-local-variable 'booleanp)
+
+(defcustom sml/outside-modified-char "M"
+  "Char to display if buffer needs to be reverted."
+  :type 'string
+  :group 'smart-mode-line-others
+  :package-version '(smart-mode-line . "1.20"))
+
+(defvaralias 'sml/encoding-format 'sml/mule-info)
+(defcustom sml/mule-info "%z"
+  "Format for multilingual information. Set this to nil to hide buffer encoding."
+  :type '(choice string (const :tag "Don't display." nil))
+  :group 'smart-mode-line-others
+  :package-version '(smart-mode-line . "2.0"))
+
+(defcustom sml/read-only-char "R"
+  "Displayed when buffer is readonly."
+  :type 'string
+  :group 'smart-mode-line-others
+  :package-version '(smart-mode-line . "1.20"))
+
+(defcustom sml/show-frame-identification nil
+  "Whether to show frame identification or not.
+
+In some systems this doesn't even display anything. It's most useful
+on terminals, but you might want to disable it anyway.
+
+Just set this to nil, and frame identification won't be displayed."
+  :type 'boolean
+  :group 'smart-mode-line-others
+  :package-version '(smart-mode-line . "2.0.3"))
+(put 'sml/show-frame-identification 'safe-local-variable 'booleanp)
+
+(defcustom sml/vc-mode-show-backend nil
+  "Whether to show or not the backend in vc-mode's mode-line description.
+
+I think most people only use one backend, so this defaults to nil.
+If you want it to show the backend, just set it to t."
+  :type 'boolean
+  :group 'smart-mode-line-others
+  :package-version '(smart-mode-line . "1.22"))
+(put 'sml/vc-mode-show-backend 'safe-local-variable 'booleanp)
+
+
+(defvar sml/position-construct nil "Used for recycling position information.")
+(put 'sml/position-construct 'risky-local-variable t)
+
+(defvar sml/position-help-text nil "Help-text for position information.")
+(make-variable-buffer-local 'sml/position-help-text)
+
+;;; Buffer Identification
+(defvar sml/buffer-identification-filling nil
+  "Filling generated by `sml/fill-for-buffer-identification'.")
+(make-variable-buffer-local 'sml/buffer-identification-filling)
+(put 'sml/buffer-identification-filling 'risky-local-variable t)
+
+(defvar sml/buffer-identification nil
+  "Used for recycling buffer identification without having to recompute it.")
+(make-variable-buffer-local 'sml/buffer-identification)
+(put 'sml/buffer-identification 'risky-local-variable t)
+
+(defadvice rename-buffer (after sml/after-rename-buffer-advice ())
+  "Regenerate buffer-identification after `rename-buffer'."
+  (sml/generate-buffer-identification))
+(defadvice set-visited-file-name (after sml/after-set-visited-file-name-advice ())
+  "Regenerate buffer-identification after `set-visited-file-name'."
+  (sml/generate-buffer-identification))
+
+(defvar sml/name-width-old nil "Used for recalculating buffer identification filling only when necessary.")
+(make-variable-buffer-local 'sml/name-width-old)
+(defvar sml/shorten-directory-old nil "Used for recalculating buffer identification filling only when necessary.")
+(make-variable-buffer-local 'sml/shorten-directory-old)
+(defun sml/generate-buffer-identification-if-necessary ()
+  "Call `sml/generate-buffer-identification' only if `sml/name-width' has changed."
+  (unless (and (equal sml/name-width-old sml/name-width)
+               (equal sml/shorten-directory-old sml/shorten-directory))
+    (setq sml/name-width-old sml/name-width)
+    (setq sml/shorten-directory-old sml/shorten-directory)
+    (sml/generate-buffer-identification))
+  nil)
+
+(defvar sml/mode-line-client
+  `(sml/show-client
+    (:eval (if (frame-parameter nil 'client)
+               ,(propertize "@" 'face 'sml/client 'help-echo (purecopy "emacsclient frame"))
+             " ")))
+  "Construct that replaces `mode-line-client'.")
+
+(defvar sml/mode-line-buffer-identification
+  '("" (sml/buffer-identification
+        sml/buffer-identification
+        (:eval (sml/generate-buffer-identification))))
+  "Replace the default `mode-line-buffer-identification' with our own.")
+
+(defvar sml/projectile-replacement-format)
+(defvar sml/use-projectile-p)
+(defvar sml/projectile-loaded-p nil "Non-nil if projectile has been loaded.")
+
+(defcustom sml/pos-id-separator " "
+  "Miscellaneous mode-line construct.")
+(put 'sml/pos-id-separator 'risky-local-variable t)
+(defcustom sml/pre-modes-separator " "
+  "Miscellaneous mode-line construct.")
+(put 'sml/pre-modes-separator 'risky-local-variable t)
+(defcustom sml/pre-id-separator ""
+  "Miscellaneous mode-line construct.")
+(put 'sml/pre-id-separator 'risky-local-variable t)
+(defcustom sml/pre-minor-modes-separator ""
+  "Miscellaneous mode-line construct.")
+(put 'sml/pre-minor-modes-separator 'risky-local-variable t)
+(defcustom sml/pos-minor-modes-separator ""
+  "Miscellaneous mode-line construct.")
+(put 'sml/pos-minor-modes-separator 'risky-local-variable t)
+
+(defun sml/-automatically-decide-theme ()
+  "Return the most appropriate sml theme, based on global theme."
+  (sml/-debug "Entering -automatically-decide-theme")
+  (sml/-debug (sml/global-theme-support-sml-p))
+  (unless (sml/global-theme-support-sml-p)
+    (sml/-debug (face-background 'mode-line nil t))
+    (sml/-debug (face-background 'default nil t))
+    (let ((bg (ignore-errors
+                (or (face-background 'mode-line nil t)
+                    (face-background 'default nil t)))))
+      (if (ignore-errors
+            (and (stringp bg)
+                 (> (color-distance "white" bg)
+                    (color-distance "black" bg))))
+          'dark 'light))))
+
+(defun sml/-setup-theme ()
+  "Decide what theme to use and apply it.
+Used during initialization."
+  (sml/-debug "Entering -setup-theme")
+  (sml/-debug sml/theme)
+  (when sml/theme
+    (when (eq sml/theme 'automatic)
+      (setq sml/theme (sml/-automatically-decide-theme)))
+    (sml/-debug "chosen theme:")
+    (sml/-debug sml/theme)
+    (sml/apply-theme sml/theme nil :silent)))
+
+(defvar battery-mode-line-format)
+
+
+;;;###autoload
+(defun sml/setup (&optional arg)
+  "Setup the mode-line to be smart and sexy.
+
+ARG is ignored. Just call this function in your init file, and
+the mode-line will be setup."
+  (interactive)
+  (sml/-debug "Entering setup")
+  (sml/-debug custom-enabled-themes)
+
+  ;; Just a couple of useful variables
+  (setq sml/simplified nil)
+  (setq battery-mode-line-format sml/battery-format)
+
+  ;; Activate rich-minority, and configure it for us.
+  (setq rm-base-text-properties
+        (append rm-base-text-properties '('face 'sml/minor-modes)))
+
+  ;; Set the theme the user requested.
+  (sml/-setup-theme)
+
+  ;;;; And this is where the magic happens.
+  ;; Remove elements we implement separately, and improve the ones not removed.
+  (sml/filter-mode-line-list 'mode-line-mule-info)
+  (setq-default mode-line-client sml/mode-line-client)
+  (sml/filter-mode-line-list 'mode-line-modified)
+  (sml/filter-mode-line-list 'mode-line-remote)
+  (setq-default mode-line-frame-identification
+                '("" (sml/show-frame-identification "%F")
+                  sml/pre-id-separator))
+
+  ;; (setq-default mode-line-buffer-identification '("%b"))
+
+  (setq-default mode-line-buffer-identification
+                sml/mode-line-buffer-identification)
+  (sml/filter-mode-line-list 'mode-line-position)
+  (sml/filter-mode-line-list 'mode-line-modes)
+  (setq-default mode-line-end-spaces nil)
+
+  ;; Add position descriptions on the left (they were already removed
+  ;; from the middle). Since this is the very first symbol to be
+  ;; evaluated, we also use it for calculating variables that need to
+  ;; be updated
+  (setq-default mode-line-front-space '((:eval (sml/generate-buffer-identification-if-necessary))
+                                        (sml/position-help-text
+                                         nil
+                                         (:eval (let ((sml/-this-buffer-changed-p t))
+                                                  (sml/generate-position-help))))
+                                        (sml/position-construct
+                                         sml/position-construct
+                                         (:eval (sml/compile-position-construct)))))
+
+  (add-hook 'after-save-hook 'sml/generate-buffer-identification)
+  (ad-activate 'rename-buffer)
+  (ad-activate 'set-visited-file-name)
+  (add-hook 'clone-indirect-buffer-hook 'sml/generate-buffer-identification)
+  ;; (ad-activate 'set-buffer-modified-p)
+  (add-hook 'after-change-functions 'sml/-this-buffer-changed)
+  (add-hook 'post-command-hook 'sml/generate-position-help)
+
+  ;; This is to ensure fixed name width. The reason we do this manually
+  ;; is that some major-modes change `mode-line-buffer-identification'
+  ;; (so we can't fill inside the variable), and we want this
+  ;; symbol to be an element in `mode-line-format' for compatibility
+  ;; with other packages which hack into the mode-line.
+
+  (add-to-list 'mode-line-position
+               '(sml/buffer-identification-filling
+                 sml/buffer-identification-filling
+                 (:eval (setq sml/buffer-identification-filling
+                              (sml/fill-for-buffer-identification)))))
+
+  ;; Remove some annoying big spaces
+  (setq-default mode-line-format
+                (mapcar
+                 (lambda (x) (cond
+                         ;; ((eq x 'mode-line-buffer-identification)
+                         ;;  '(:propertize mode-line-buffer-identification face sml/id))
+                         ((and (stringp x) (string= x "   "))
+                          'sml/pos-id-separator)
+                         ((and (stringp x) (string= x "  "))
+                          'sml/pre-modes-separator)
+                         (t x)))
+                 mode-line-format))
+
+      ;;;; And here comes support for a bunch of extra stuff. Some of
+      ;;;; these are just needed for coloring.
+
+  ;; Shell and eshell support
+  (add-hook 'comint-output-filter-functions 'sml/generate-buffer-identification)
+  (add-hook 'eshell-directory-change-hook 'sml/generate-buffer-identification)
+
+  ;; Dired overrides the buffer-identification (which we would
+  ;; normally respect) but doesn't actually do anything useful with
+  ;; it, so we overoverride back.
+  (add-hook 'dired-mode-hook 'sml/set-buffer-identification)
+
+  ;; Display time
+  (add-hook 'display-time-hook 'sml/propertize-time-string)
+
+  ;; Battery support
+  (eval-after-load 'battery
+    '(defadvice battery-update (after sml/after-battery-update-advice () activate)
+       "Change battery color."
+       (when battery-mode-line-string
+         (setq battery-mode-line-string
+               (propertize battery-mode-line-string
+                           'face 'sml/battery)))))
+
+  ;; Projectile support
+  (eval-after-load "projectile"
+    '(progn
+       (setq sml/projectile-loaded-p t)
+       (defcustom sml/projectile-replacement-format "[%s]"
+         "Format used for replacements derived from projectile."
+         :type 'string
+         :group 'smart-mode-line-others
+         :package-version '(smart-mode-line . "2.4"))
+       (defcustom sml/use-projectile-p 'after-prefixes
+         "Whether we should use projectile to guess path prefixes.
+
+If this is non-nil, and if current buffer is inside a project (as
+defined by projectile), we use the project's name as a
+prefix (with the `sml/projectile-replacement-format' variable).
+
+If this is 'after-prefix, then this replacement will only be used
+if no other prefixes (defined in `sml/replacer-regexp-list') were
+found to match the current file path."
+         :type '(choice (const :tag "Use projectile only if current path doesn't match any prefixes." after-prefixes)
+                        (const :tag "Use projectile before checking prefixes." before-prefixes)
+                        (const :tag "Don't use projectile." nil))
+         :group 'smart-mode-line-others
+         :package-version '(smart-mode-line . "2.4.1"))
+       (defface sml/projectile '((t :inherit sml/git)) "" :group 'smart-mode-line-faces)
+       (add-to-list 'sml/prefix-regexp (format (regexp-quote sml/projectile-replacement-format) ".*"))
+       (add-to-list 'sml/prefix-face-list
+                    (list (format (regexp-quote sml/projectile-replacement-format) ".*")
+                          'sml/projectile))))
+
+  ;; vc-mode
+  (eval-after-load "vc-hooks"
+    '(defadvice vc-mode-line (after sml/after-vc-mode-line-advice () activate)
+       "Color `vc-mode'."
+       (when (stringp vc-mode)
+         (let ((noback (replace-regexp-in-string (format "^ %s" (vc-backend buffer-file-name)) " " vc-mode)))
+           (setq vc-mode
+                 (propertize (if sml/vc-mode-show-backend vc-mode noback)
+                             'face (cond ((string-match "^ -" noback)    'sml/vc)
+                                         ((string-match "^ [:@]" noback) 'sml/vc-edited)
+                                         ((string-match "^ [!\\?]" noback) 'sml/modified))))))))
+
+  ;; Mew support
+  (eval-after-load "mew-net"
+    '(progn
+       (defgroup smart-mode-line-mew '() "Group for editing the mew-support variables." :group 'smart-mode-line)
+       (defcustom sml/mew-support t
+         "Whether to flash the mode-line when mew detects new mail."
+         :type 'boolean :group 'smart-mode-line-mew
+         :package-version '(smart-mode-line . "1.11"))
+       (defcustom sml/new-mail-background-color "#110000"
+         "When new mail arrives, mode-line background will be tinted this color.
+
+Only works with mew-biff. Right now it stays colored until you
+read the mail, so this color should probably be something sutil.
+Might implement a quick flash eventually."
+         :type 'color :group 'smart-mode-line-mew
+         :package-version '(smart-mode-line . "1.11"))
+       (defcustom sml/mew-biff-format (concat "%2d" (if (char-displayable-p ?✉) "✉" "M"))
+         "Format used for new-mail notifications if you use mew with biff."
+         :type 'string :group 'smart-mode-line-mew
+         :package-version '(smart-mode-line . "1.11"))
+       (defadvice mew-biff-clear (around sml/mew-biff-clear-advice activate)
+         "Advice used to customize mew-biff-bark to fit sml's style."
+         ad-do-it
+         (when sml/mew-support
+           ;; Remove the color
+           (set-face-attribute 'mode-line nil :background sml/active-background-color)))
+       (defadvice mew-biff-bark (around sml/mew-biff-bark-advice (n) activate)
+         "Advice used to customize mew-biff-bark to fit sml's style."
+         ad-do-it
+         (when sml/mew-support
+           ;; Remove the color if mail has been read.
+           (if (= n 0) (set-face-attribute 'mode-line nil :background sml/active-background-color)
+             ;; Apply color if there's mail. (mew-biff-bark 100)
+             (set-face-attribute 'mode-line nil :background sml/new-mail-background-color)
+             (setq mew-biff-string (format sml/mew-biff-format n)))))))
+
+  (unless (and (boundp 'erc-track-position-in-mode-line)
+               (null erc-track-position-in-mode-line))
+    (setq erc-track-position-in-mode-line t)))
+
+;;;###autoload
+(defalias 'smart-mode-line-enable #'sml/setup)
+
+(defun sml/global-theme-support-sml-p ()
+  "Non-nil if any of the enabled themes supports smart-mode-line."
+  (cl-remove-if
+   #'sml/theme-p
+   (cl-remove-if-not #'sml/faces-from-theme custom-enabled-themes)))
+
+(defun sml/faces-from-theme (theme)
+  "Return the sml faces that THEME customizes."
+  (cl-remove-if-not
+   (lambda (it) (string-match "\\`sml/" (symbol-name it)))
+   (mapcar #'cadr (get theme 'theme-settings))))
+
+(defun sml/set-buffer-identification (&rest ignored)
+  "Setq the buffer-identification of this buffer back to ours.
+
+Currently, we only this for dired. For other modes (like info) we
+respect their changes.
+
+Argument IGNORED is obsolete."
+  (setq mode-line-buffer-identification sml/mode-line-buffer-identification))
+
+(defvar sml/-this-buffer-changed-p nil
+  "t if buffer was changed since last help-text update.")
+(make-variable-buffer-local 'sml/-this-buffer-changed-p)
+
+(defun sml/-this-buffer-changed (&rest ignored)
+  "Set variable `sml/-this-buffer-changed-p' to t.
+Argument IGNORED is ignored."
+  (setq sml/-this-buffer-changed-p t) nil)
+
+(defun sml/generate-position-help (&rest ignored)
+  "Set the string describing various buffer content information.
+Argument IGNORED is ignored."
+  (when (and sml/-this-buffer-changed-p
+             (get-buffer-window (current-buffer)))
+    (setq sml/-this-buffer-changed-p nil)
+    (setq sml/position-help-text
+          (format-mode-line
+           (concat "Buffer size:\n\t%IB\n"
+                   ;; ;; This is way too slow, unfortunately.
+                   ;; "Number of Lines:\n\t"
+                   ;; (int-to-string (line-number-at-pos (point-max)))
+                   "\nmouse-1: Display Line and Column Mode Menu")))
+    nil))
+
+(defcustom sml/order-of-line-and-column nil
+  "Decide the order of line-number and column-number display.
+
+When both `line-number-mode' and `column-number-mode' are
+enabled, this variable decides which gets displayed on the left,
+and which gets displayed on the right. If either one of the modes
+is not enabled, this variable has no effect (obviously).
+
+It can only be t or nil.
+    t means column-number:line-number
+    nil means line-number:column-number"
+  :type '(choice (const :tag "column-number:line-number" t)
+                 (const :tag "line-number:column-number" nil))
+  :group 'smart-mode-line-position
+  :package-version '(smart-mode-line . "2.4"))
+
+(defun sml/compile-position-construct (&optional symbol value)
+  "Recompile the `sml/position-construct' after one of the formats was edited.
+Also sets SYMBOL to VALUE."
+  (when (and symbol value) (set symbol value))
+  (sml/generate-position-help)
+  (setq sml/position-construct
+        `((size-indication-mode
+           ,(propertize sml/size-indication-format
+                        'face 'sml/col-number
+                        'help-echo 'sml/position-help-text
+                        'mouse-face 'mode-line-highlight
+                        'local-map mode-line-column-line-number-mode-map))
+          (sml/order-of-line-and-column
+           (column-number-mode
+            ,(propertize sml/col-number-format
+                         'face 'sml/col-number
+                         'help-echo 'sml/position-help-text
+                         'mouse-face 'mode-line-highlight
+                         'local-map mode-line-column-line-number-mode-map))
+           (line-number-mode
+            ,(propertize sml/line-number-format
+                         'face 'sml/line-number
+                         'help-echo 'sml/position-help-text
+                         'mouse-face 'mode-line-highlight
+                         'local-map mode-line-column-line-number-mode-map)))
+          (column-number-mode
+           (line-number-mode
+            ,(propertize sml/numbers-separator
+                         'face 'sml/numbers-separator
+                         'help-echo 'sml/position-help-text
+                         'mouse-face 'mode-line-highlight
+                         'local-map mode-line-column-line-number-mode-map)))
+          (sml/order-of-line-and-column
+           (line-number-mode
+            ,(propertize sml/line-number-format
+                         'face 'sml/line-number
+                         'help-echo 'sml/position-help-text
+                         'mouse-face 'mode-line-highlight
+                         'local-map mode-line-column-line-number-mode-map))
+           (column-number-mode
+            ,(propertize sml/col-number-format
+                         'face 'sml/col-number
+                         'help-echo 'sml/position-help-text
+                         'mouse-face 'mode-line-highlight
+                         'local-map mode-line-column-line-number-mode-map))))))
+
+(defun sml/generate-modified-status ()
+  "Return a string describing the modified status of the buffer."
+  (cond
+   ((not (or (and (buffer-file-name) (file-remote-p buffer-file-name))
+             (verify-visited-file-modtime (current-buffer))))
+    (propertize sml/outside-modified-char 'face 'sml/outside-modified
+                'help-echo "Modified outside Emacs!\nRevert first!"))
+   ((buffer-modified-p)
+    (propertize (if buffer-read-only
+                    sml/read-only-char
+                  sml/modified-char)
+                'face 'sml/modified
+                'help-echo (if (and (buffer-file-name) (not (file-remote-p buffer-file-name)))
+                               (format-time-string
+                                sml/modified-time-string
+                                (nth 5 (file-attributes (buffer-file-name))))
+                             "Buffer Modified")
+                'local-map '(keymap (mode-line keymap (mouse-1 . save-buffer)))))
+   (buffer-read-only (propertize sml/read-only-char
+                                 'face 'sml/read-only
+                                 'help-echo "Read-Only Buffer"))
+   (t (propertize " " 'face 'sml/not-modified))))
+
+(defmacro sml/propertize-position (s face help)
+  "Propertize string S as a line/column number, using FACE and help-echo HELP."
+  `(propertize ,s
+               'face ,face
+               'help-echo ,help
+               'mouse-face 'mode-line-highlight
+               'local-map mode-line-column-line-number-mode-map))
+
+(defun sml/propertize-time-string ()
+  "Function to be added to `display-time-hook' to propertize the string."
+  (when (and (boundp 'display-time-string) (stringp display-time-string))
+    (setq display-time-string
+          (propertize display-time-string
+                      'face 'sml/time))))
+
+(defun sml/filter-mode-line-list (l)
+  "Filter some elements of L and propertize the ones not filtered.
+
+L must be a symbol! We assign right back to it"
+  (if (and (symbolp l) (listp (eval l)))
+      (set-default l
+                   (remove nil (mapcar 'sml/parse-mode-line-elements (eval l))))
+    (error "l must be a symbol to a list!")))
+
+(defun sml/fill-for-buffer-identification ()
+  "Return a string such that `mode-line-buffer-identification' is fixed-width.
+In buffers where `mode-line-buffer-identification' is nil, we
+don't do any filling. That's because the given mode probably
+doesn't want any buffer-id."
+  (if mode-line-buffer-identification
+      (propertize
+       (make-string (max (- (or (car-safe sml/name-width) sml/name-width)
+                            (length (format-mode-line mode-line-buffer-identification)))
+                         0)
+                    sml/fill-char)
+       'face 'sml/name-filling)
+    ""))
+
+(defun sml/generate-buffer-identification (&rest ignored)
+  "Return fully propertized prefix+path+buffername.
+Argument IGNORED is ignored."
+  (setq sml/name-width-old sml/name-width)
+  (setq sml/buffer-identification-filling nil)
+  (when (or ;; Only calculate all this if it will actually be used
+         (equal sml/mode-line-buffer-identification mode-line-buffer-identification)
+         (member (cadr sml/mode-line-buffer-identification) mode-line-buffer-identification)
+         (member sml/mode-line-buffer-identification mode-line-buffer-identification))
+    (setq sml/buffer-identification
+          (let* ((dir (sml/replacer (abbreviate-file-name (sml/get-directory))))
+                 (sml/use-projectile-p (unless (or (not sml/projectile-loaded-p)
+                                                   (and (buffer-file-name)
+                                                        (file-remote-p (buffer-file-name))))
+                                         sml/use-projectile-p))
+                 (prefix (sml/get-prefix dir))
+                 (bufname (sml/buffer-name))
+                 (dirsize (max 0 (- (abs (or (cdr-safe sml/name-width) sml/name-width))
+                                    (length prefix) (length bufname))))
+                 (dirstring (funcall sml/shortener-func dir dirsize)))
+
+            (propertize (concat (sml/propertize-prefix (replace-regexp-in-string "%" "%%" prefix))
+                                (propertize (replace-regexp-in-string "%" "%%" dirstring) 'face 'sml/folder)
+                                (propertize (replace-regexp-in-string "%" "%%" bufname) 'face 'sml/filename))
+                        'help-echo (format "%s\n\nmouse-1: Previous buffer\nmouse-3: Next buffer"
+                                     (or (buffer-file-name) (buffer-name)))
+                        'mouse-face 'mode-line-highlight
+                        'local-map   mode-line-buffer-identification-keymap)))))
+
+(defun sml/parse-mode-line-elements (el)
+  "Propertize or delete EL.
+
+To be used in mapcar and accumulate results."
+  (cond
+   ;; These are implemented separately
+   ((member el '("%[" "%]" "%1+" "(" ")" (t erc-modified-channels-object)
+                 (:eval (if (display-graphic-p) " " "-"))
+                 (:eval (unless (display-graphic-p) "-%-"))
+                 (:eval (mode-line-frame-control))))
+    nil)
+   ((member (car-safe el) '(line-number-mode column-number-mode size-indication-mode current-input-method)) nil)
+   ;; mode-line-remote
+   ((and (stringp el) (string= el "%1@"))
+    `(sml/show-remote
+      (:propertize ,el face sml/remote)))
+   ;; mode-line-client
+   ((equal el '("" (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
+                                help-echo "emacsclient frame")))
+    `(sml/show-client
+      (:eval (if (frame-parameter nil 'client)
+                 ,(propertize "@" 'face 'sml/client 'help-echo (purecopy "emacsclient frame"))
+               " "))))
+
+   ;; mode-line-modified
+   ((and (stringp el) (string-match "%[0-9-]*\\*" el))
+    '(:eval (sml/generate-modified-status)))
+
+   ;;;; mode-line-position
+   ;; Color the position percentage
+   ((sml/is-%p-p el)
+    `(sml/position-percentage-format
+      (-3 (:propertize (:eval sml/position-percentage-format)
+                       local-map ,mode-line-column-line-number-mode-map
+                       mouse-face mode-line-highlight
+                       face sml/position-percentage
+                       help-echo "Buffer Relative Position\n\
+mouse-1: Display Line and Column Mode Menu"))))
+
+   ;;;; mode-line-mule-info
+   ;; Partially hide some MULE info
+   ((and (stringp el) (string-match "\\s-*%[-0-9]*z" el))
+    `(sml/mule-info ((1 (:propertize
+                         (current-input-method
+                          ("" current-input-method-title)
+                          " ")
+                         face sml/mule-info
+                         help-echo (concat
+                                    ,(purecopy "Current input method: ")
+                                    current-input-method
+                                    ,(purecopy "\n\
+mouse-2: Disable input method\n\
+mouse-3: Describe current input method"))
+                         local-map ,mode-line-input-method-map
+                         mouse-face mode-line-highlight))
+                     (:propertize (:eval sml/mule-info)
+                                  face sml/mule-info
+                                  help-echo mode-line-mule-info-help-echo
+                                  mouse-face mode-line-highlight
+                                  local-map ,mode-line-coding-system-map))))
+   ;; Make EOL optional
+   ((equal el '(:eval (mode-line-eol-desc)))
+    '(sml/show-eol (:eval (mode-line-eol-desc))))
+
+   ;;;; mode-line-modes
+   ;; Color the mode line process
+   ((or (equal el '("" mode-line-process))
+        (equal (car (cdr-safe el)) '("" mode-line-process)))
+    `(:propertize ("" mode-line-process) face sml/process))
+   ;; Color the mode name, without changing other properties
+   ((and (listp el)
+         (equal (car el) :propertize)
+         (equal (cadr el) '("" mode-name)))
+    (setf (cadr el) '("" "%[" mode-name "%]"))
+    (append el '(face sml/modes)))
+   ;; Completely replace the minor modes (so we can truncate)
+   ((and (listp el)
+         (equal (car el) :propertize)
+         (equal (cadr el) '("" minor-mode-alist)))
+    '(:eval (sml/generate-minor-modes)))
+
+   ;; ;;; Propertize misc-info
+   ;; ((memq (car-safe el) '(which-func-mode global-mode-string))
+   ;;  `(:eval (add-text-properties (format-mode-line ',el))))
+
+   ;; If it's something we don't recognize, just leave it as-is.
+   (t el)))
+
+(defun sml/is-%p-p (x)
+  "Non-nil if X matches \"%p\" in a very subjective sense."
+  (or (and (listp x)
+           (cl-remove-if-not
+            (lambda (y) (string-match ".*%p.*" y))
+            (cl-remove-if-not #'stringp x)))
+      (and (stringp x)
+           (string-match ".*%p.*" x))))
+
+(defun sml/buffer-name ()
+  "Return either buffer name or file name to be shown on the mode-line.
+Uses `sml/show-file-name' to decide between the two.
+
+Unless `sml/show-trailing-N' is nil, prevents the \"<N>\" (used in
+duplicated buffer names) from being displayed."
+  (cond ((buffer-base-buffer)
+         (buffer-name))
+        ((and sml/show-file-name (buffer-file-name))
+         (file-name-nondirectory (buffer-file-name)))
+        ((derived-mode-p 'dired-mode)
+         (file-name-nondirectory (directory-file-name default-directory)))
+        (sml/show-trailing-N
+         (buffer-name))
+        (t (replace-regexp-in-string "<[0-9]+>$" "" (buffer-name)))))
+
+(defun sml/fill-width-available ()
+  "Return the size available for filling."
+  (max 0
+       (+ sml/extra-filler
+          (- (window-total-width)
+             (let ((sml/simplified t))
+               (length (format-mode-line mode-line-format)))))))
+
+(defconst sml/propertized-shorten-mode-string
+  '(:propertize sml/shorten-mode-string
+                face sml/minor-modes
+                help-echo "mouse-1: Shorten minor modes"
+                local-map (keymap (mode-line keymap (mouse-1 . sml/toggle-shorten-modes)))
+                mouse-face mode-line-highlight))
+(defconst sml/propertized-full-mode-string
+  '(:propertize sml/full-mode-string
+                face sml/minor-modes
+                help-echo "mouse-1: Show all modes"
+                local-map (keymap (mode-line keymap (mouse-1 . sml/toggle-shorten-modes)))
+                mouse-face mode-line-highlight))
+
+(defun sml/count-occurrences-starting-at (regex string start)
+  "Count occurrences of REGEX in STRING starting at index START."
+  (if (string-match regex string start)
+      (+ 1 (sml/count-occurrences-starting-at regex string (match-end 0)))
+    0))
+
+;;; Patch, in case the user is using the wrong variable.
+(when (boundp 'sml/hidden-modes)
+  (message "[smart-mode-line] Warning: `sml/hidden-modes' is obsolete, use `rm-blacklist' instead")
+  (setq rm-blacklist sml/hidden-modes))
+(define-obsolete-variable-alias 'sml/hidden-modes 'rm-blacklist)
+
+(defun sml/generate-minor-modes ()
+  "Extracts all rich strings necessary for the minor mode list."
+  (if sml/simplified
+      ""
+    (let* (;; The minor-mode-alist
+           (nameList (rm--mode-list-as-string-list))
+           ;; The size available
+           (size (if (member sml/mode-width '(full right))
+                     ;; Calculate how much width is available
+                     (sml/fill-width-available)
+                   ;; or use what the user requested.
+                   sml/mode-width))
+           ;; Used for counting size.
+           (finalNameList (mapconcat 'identity  nameList ""))
+           needs-removing filling)
+
+      ;; Calculate whether truncation is necessary.
+      (when (and sml/shorten-modes (> (length finalNameList) size))
+        ;; We need to remove 1+ "the number of spaces found".
+        (setq needs-removing
+              (1+
+               (sml/count-occurrences-starting-at
+                " " finalNameList
+                (- size (string-width sml/full-mode-string))))))
+      ;; Add truncation string if necessary
+      (when needs-removing
+        (setcdr (last nameList (1+ needs-removing))
+                (list t sml/propertized-full-mode-string)))
+      ;; If we're not shortenning, add " -" at the end.
+      (unless sml/shorten-modes
+        (add-to-list 'nameList sml/propertized-shorten-mode-string t))
+
+      ;; Padding
+      (setq filling (- size (length (format-mode-line
+                                     (list ""
+                                           'sml/pre-minor-modes-separator
+                                           nameList
+                                           'sml/pos-minor-modes-separator)))))
+      (setq filling (make-string (max 0 filling) sml/fill-char))
+
+      (if (eq sml/mode-width 'right)
+          (list (propertize filling 'face 'sml/modes)
+                'sml/pre-minor-modes-separator nameList
+                'sml/pos-minor-modes-separator)
+        (list "" 'sml/pre-minor-modes-separator nameList
+              'sml/pos-minor-modes-separator filling)))))
+
+(defun sml/propertize-prefix (prefix)
+  "Set the color of PREFIX according to its contents."
+  (cl-loop for pair in sml/prefix-face-list
+           if (string-match (car pair) prefix)
+           return (propertize prefix 'face (car (cdr pair)))))
+
+(defun sml/get-directory ()
+  "Decide if we want directory shown. If so, return it."
+  (abbreviate-file-name
+   (cond
+    ;; In email attachments, buffer-file-name is non-nil, but
+    ;; file-name-directory returns nil
+    ((buffer-file-name) (or (file-name-directory (buffer-file-name)) ""))
+    ((eq major-mode 'dired-mode)
+     (replace-regexp-in-string "/[^/]*/$" "/" default-directory))
+    ((and (symbolp major-mode)
+          (member major-mode '(shell-mode eshell-mode)))
+     default-directory)
+    ;; In indirect buffers, buffer-file-name is nil. The correct value is
+    ;; retrieved from the base buffer.
+    ((buffer-base-buffer)
+     (with-current-buffer (buffer-base-buffer) (sml/get-directory)))
+    (t ""))))
+
+(defun sml/set-battery-font ()
+  "Set `sml/battery' face depending on battery state."
+  (let ((data (and (boundp 'battery-status-function)
+                   battery-status-function
+                   (funcall battery-status-function))))
+    (if  (string-equal "AC" (cdr (assoc 76 data)))
+        (copy-face 'sml/charging 'sml/battery)
+      (copy-face 'sml/discharging 'sml/battery))))
+
+(defadvice battery-update (before sml/set-battery-font activate)
+  "Fontify the battery display."
+  (sml/set-battery-font))
+
+(defun sml/replacer (in)
+  "Run on string IN the replacements from `sml/replacer-regexp-list'.
+Runs first on the given path, and if that doesn't have any affect,
+runs them again on a version of the given path with all symlinks
+expanded via `file-truename'.  If neither run succeeds in making
+any replacements, returns the path originally given.
+
+Used by `sml/strip-prefix' and `sml/get-prefix'."
+  ;; First try replacing on the original path
+  (if (string= in "")
+      in
+    (sml/replacer-raw in)))
+
+(defun sml/replacer-raw (in)
+  "Run on the string IN the replacements from `sml/replacer-regexp-list'.
+
+If projectile is loaded, also performs replacements specified by
+project name first."
+  (let ((out in)
+        proj)
+    ;; Maybe try projectile
+    (when (and sml/projectile-loaded-p
+               (eq sml/use-projectile-p 'before-prefixes))
+      (setq out (sml/perform-projectile-replacement out)))
+    ;; Try regular replacements
+    (when (string= out in)
+      (dolist (cur sml/replacer-regexp-list)
+        (setq out (replace-regexp-in-string (car cur) (car (cdr cur)) out))))
+    ;; Try truename replacements
+    (when (string= out in)
+      (let* ((true-in (abbreviate-file-name (file-truename in)))
+             (true-out true-in))
+        (dolist (cur sml/replacer-regexp-list)
+          (setq true-out (replace-regexp-in-string
+                          (car cur) (car (cdr cur)) true-out)))
+        (unless (string= true-in true-out)
+          (setq out true-out))))
+    ;; Maybe try projectile later
+    (when (and sml/projectile-loaded-p
+               (eq sml/use-projectile-p 'after-prefixes)
+               (string= out in))
+      (setq out (sml/perform-projectile-replacement out)))
+    out))
+
+(declare-function projectile-project-p "projectile")
+(declare-function projectile-project-name "projectile")
+(defun sml/perform-projectile-replacement (in)
+  "If path IN is inside a project, use its name as a prefix."
+  (let ((proj (projectile-project-p)))
+    (if (stringp proj)
+        (let* ((replacement
+                (format sml/projectile-replacement-format
+                  (projectile-project-name)))
+               (short (replace-regexp-in-string
+                       (concat "^" (regexp-quote (abbreviate-file-name proj)))
+                       replacement
+                       in)))
+          (if (string= short in)
+              (let* ((true-in (abbreviate-file-name (file-truename in)))
+                     (true-short
+                      (replace-regexp-in-string
+                       (concat "^" (regexp-quote (abbreviate-file-name (file-truename proj))))
+                       replacement true-in)))
+                (if (string= true-in true-short) in true-short))
+            short))
+      in)))
+
+(defun sml/regexp-composer (getter)
+  "Prepare the actual regexp using `sml/prefix-regexp'.
+If GETTER is non-nil, result regexp also accepts empty match."
+  (let ((left "^\\(")
+        (right (if getter "\\|\\).*" "\\)")))
+    (if (stringp sml/prefix-regexp)
+        (if (string-match "\\(" sml/prefix-regexp)
+            sml/prefix-regexp
+          (concat left sml/prefix-regexp right))
+      (concat left (mapconcat 'identity sml/prefix-regexp "\\|") right))))
+
+(defun sml/strip-prefix (path)
+  "Remove prefix from string PATH.
+
+A prefix is anything at the beginning of the line that matches a
+regexp in `sml/prefix-regexp'."
+  (replace-regexp-in-string (sml/regexp-composer nil) "" path))
+
+(defun sml/get-prefix (path)
+  "Get prefix from string PATH.
+
+A prefix is anything at the beginning of the line that matches a
+regexp in `sml/prefix-regexp'."
+  (replace-regexp-in-string (sml/regexp-composer t) "\\1" path))
+
+(defun sml/not-shorten-directory (dir ml)
+  "Return DIR, abbreviated and prefixed.
+ML isn't used."
+  (sml/strip-prefix dir))
+
+(defcustom sml/directory-truncation-string (if (char-displayable-p ?…) "…/" ".../")
+  "String used when truncating part of the file path.
+Set this to nil or an empty string if you don't want any
+indication of a truncated path."
+  :type 'string
+  :group 'smart-mode-line
+  :package-version '(smart-mode-line . "2.10"))
+
+(defun sml/do-shorten-directory (dir max-length)
+  "Show up to MAX-LENGTH characters of a directory name DIR."
+  (let ((longname (sml/strip-prefix dir)))
+    ;; If it fits, return the string.
+    (if (<= (length longname) max-length) longname
+      ;; If it doesn't, shorten it
+      (let ((path (reverse (split-string longname "/")))
+            (output ""))
+        (when (and path (equal "" (car path)))
+          (setq path (cdr path)))
+        (let ((max (- max-length (string-width sml/directory-truncation-string))))
+          ;; Concat as many levels as possible, leaving 4 chars for safety.
+          (while (and path (<= (length (concat (car path) "/" output))
+                               max))
+            (setq output (concat (car path) "/" output))
+            (setq path (cdr path))))
+        ;; If we had to shorten, prepend .../
+        (when path
+          (setq output (concat sml/directory-truncation-string output)))
+        output))))
+
+(provide 'smart-mode-line)
+;;; smart-mode-line.el ends here
diff --git a/emacs.d/elpa/swiper-20160115.800/colir.el b/emacs.d/elpa/swiper-20160115.800/colir.el
new file mode 100644
index 0000000..e11ef7d
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/colir.el
@@ -0,0 +1,102 @@
+;;; colir.el --- Color blending library -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel <ohwoeowho@gmail.com>
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This 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.
+
+;; For a full copy of the GNU General Public License
+;; see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This package solves the problem of adding a face with a background
+;; to text which may already have a background.  In all conflicting
+;; areas, instead of choosing either the original or the new
+;; background face, their blended sum is used.
+;;
+;; The blend mode functions are taken from http://en.wikipedia.org/wiki/Blend_modes.
+
+;;; Code:
+
+(require 'color)
+
+(defcustom colir-compose-method 'colir-compose-alpha
+  "Select a method to compose two color channels."
+  :type '(choice
+          (const colir-compose-alpha)
+          (const colir-compose-overlay)
+          (const colir-compose-soft-light))
+  :group 'ivy)
+
+(defun colir-compose-soft-light (a b)
+  "Compose A and B channels."
+  (if (< b 0.5)
+      (+ (* 2 a b) (* a a (- 1 b b)))
+    (+ (* 2 a (- 1 b)) (* (sqrt a) (- (* 2 b) 1)))))
+
+(defun colir-compose-overlay (a b)
+  "Compose A and B channels."
+  (if (< a 0.5)
+      (* 2 a b)
+    (- 1 (* 2 (- 1 a) (- 1 b)))))
+
+(defun colir-compose-alpha (a b &optional alpha gamma)
+  "Compose A and B channels."
+  (setq alpha (or alpha 0.5))
+  (setq gamma (or gamma 2.2))
+  (+ (* (expt a gamma) alpha) (* (expt b gamma) (- 1 alpha))))
+
+(defun colir-blend (c1 c2)
+  "Blend the two colors C1 and C2 using `colir-compose-method'.
+C1 and C2 are triples of floats in [0.0 1.0] range."
+  (apply #'color-rgb-to-hex
+         (cl-mapcar
+          (if (eq (frame-parameter nil 'background-mode) 'dark)
+              ;; this method works nicely for dark themes
+              'colir-compose-soft-light
+            colir-compose-method)
+          c1 c2)))
+
+(defun colir-blend-face-background (start end face &optional object)
+  "Append to the face property of the text from START to END the face FACE.
+When the text already has a face with a non-plain background,
+blend it with the background of FACE.
+Optional argument OBJECT is the string or buffer containing the text.
+See also `font-lock-append-text-property'."
+  (let (next prev)
+    (while (/= start end)
+      (setq next (next-single-property-change start 'face object end)
+            prev (get-text-property start 'face object))
+      (when (listp prev)
+        (setq prev (cl-find-if #'atom prev)))
+      (if prev
+          (let ((background-prev (face-background prev)))
+            (progn
+              (put-text-property
+               start next 'face
+               (if background-prev
+                   (cons `(background-color
+                           . ,(colir-blend
+                               (color-name-to-rgb background-prev)
+                               (color-name-to-rgb (face-background face nil t))))
+                         prev)
+                 (list face prev))
+               object)))
+        (put-text-property start next 'face face object))
+      (setq start next))))
+
+(provide 'colir)
+
+;;; colir.el ends here
diff --git a/emacs.d/elpa/swiper-20160115.800/dir b/emacs.d/elpa/swiper-20160115.800/dir
new file mode 100644
index 0000000..2347cbc
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/dir
@@ -0,0 +1,18 @@
+This is the file .../info/dir, which contains the
+topmost node of the Info hierarchy, called (dir)Top.
+The first time you invoke Info you start off looking at this node.
+
+File: dir,	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics.
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs manual, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu:
+
+Emacs
+* Ivy: (ivy).                   Using Ivy for completion.
diff --git a/emacs.d/elpa/swiper-20160115.800/ivy-hydra.el b/emacs.d/elpa/swiper-20160115.800/ivy-hydra.el
new file mode 100644
index 0000000..63755da
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/ivy-hydra.el
@@ -0,0 +1,90 @@
+;;; ivy-hydra.el --- Additional key bindings for Ivy  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This 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.
+
+;; For a full copy of the GNU General Public License
+;; see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This package provides the `hydra-ivy/body' command, which is a
+;; quasi-prefix map, with many useful bindings.  These bindings are
+;; shorter than usual, using mostly unprefixed keys.
+
+;;; Code:
+(require 'hydra nil t)
+(require 'ivy)
+
+(eval-when-compile
+  (unless (or (featurep 'hydra) (package-installed-p 'hydra))
+    (defmacro defhydra (name &rest _)
+      "This is a stub for the uninstalled `hydra' package."
+      `(defun ,(intern (format "%S/body" name)) ()
+         (interactive)
+         (let ((enable-recursive-minibuffers t))
+           (if (yes-or-no-p "Package `hydra' not installed. Install?")
+               (progn
+                 (package-install 'hydra)
+                 (save-window-excursion
+                   (find-library "ivy-hydra")
+                   (byte-compile-file (buffer-file-name) t)))
+             (error "Please install `hydra' and recompile/reinstall `ivy-hydra'")))))))
+
+(defun ivy--matcher-desc ()
+  (if (eq ivy--regex-function
+          'ivy--regex-fuzzy)
+      "fuzzy"
+    "ivy"))
+
+(defhydra hydra-ivy (:hint nil
+                     :color pink)
+  "
+^^^^^^          ^Yes^    ^^      ^No^     ^Maybe^            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Action^               ^
+^^^^^^^^^^^^^^^----------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------------
+^ ^ _k_ ^ ^     _f_ollow occ_u_r _i_nsert _c_: calling %-5s(if ivy-calling \"on\" \"off\") _w_/_s_/_a_: %-14s(ivy-action-name)
+_h_ ^+^ _l_     _d_one      ^ ^  _o_ops   _m_: matcher %-5s(ivy--matcher-desc)^^^^^^^^^^^^ _C_ase-fold: %-10`ivy-case-fold-search
+^ ^ _j_ ^ ^     _g_o        ^ ^  ^ ^      _<_/_>_: shrink/grow^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _t_runcate: %-11`truncate-lines
+"
+  ;; arrows
+  ("h" ivy-beginning-of-buffer)
+  ("j" ivy-next-line)
+  ("k" ivy-previous-line)
+  ("l" ivy-end-of-buffer)
+  ;; actions
+  ("o" keyboard-escape-quit :exit t)
+  ("C-g" keyboard-escape-quit :exit t)
+  ("i" nil)
+  ("C-o" nil)
+  ("f" ivy-alt-done :exit nil)
+  ("C-j" ivy-alt-done :exit nil)
+  ("d" ivy-done :exit t)
+  ("g" ivy-call)
+  ("C-m" ivy-done :exit t)
+  ("c" ivy-toggle-calling)
+  ("m" ivy-toggle-fuzzy)
+  (">" ivy-minibuffer-grow)
+  ("<" ivy-minibuffer-shrink)
+  ("w" ivy-prev-action)
+  ("s" ivy-next-action)
+  ("a" ivy-read-action)
+  ("t" (setq truncate-lines (not truncate-lines)))
+  ("C" ivy-toggle-case-fold)
+  ("u" ivy-occur :exit t))
+
+(provide 'ivy-hydra)
+
+;;; ivy-hydra.el ends here
diff --git a/emacs.d/elpa/swiper-20160115.800/ivy.el b/emacs.d/elpa/swiper-20160115.800/ivy.el
new file mode 100644
index 0000000..d43f60f
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/ivy.el
@@ -0,0 +1,2593 @@
+;;; ivy.el --- Incremental Vertical completYon -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel <ohwoeowho@gmail.com>
+;; URL: https://github.com/abo-abo/swiper
+;; Package-Requires: ((emacs "24.1"))
+;; Keywords: matching
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This 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.
+
+;; For a full copy of the GNU General Public License
+;; see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This package provides `ivy-read' as an alternative to
+;; `completing-read' and similar functions.
+;;
+;; There's no intricate code to determine the best candidate.
+;; Instead, the user can navigate to it with `ivy-next-line' and
+;; `ivy-previous-line'.
+;;
+;; The matching is done by splitting the input text by spaces and
+;; re-building it into a regex.
+;; So "for example" is transformed into "\\(for\\).*\\(example\\)".
+
+;;; Code:
+(require 'cl-lib)
+(require 'ffap)
+
+;;* Customization
+(defgroup ivy nil
+  "Incremental vertical completion."
+  :group 'convenience)
+
+(defgroup ivy-faces nil
+  "Font-lock faces for `ivy'."
+  :group 'ivy)
+
+(defface ivy-current-match
+  '((((class color) (background light))
+     :background "#1a4b77" :foreground "white")
+    (((class color) (background dark))
+     :background "#65a7e2" :foreground "black"))
+  "Face used by Ivy for highlighting the current match.")
+
+(defface ivy-minibuffer-match-face-1
+  '((((class color) (background light))
+     :background "#d3d3d3")
+    (((class color) (background dark))
+     :background "#555555"))
+  "The background face for `ivy' minibuffer matches.")
+
+(defface ivy-minibuffer-match-face-2
+  '((((class color) (background light))
+     :background "#e99ce8" :weight bold)
+    (((class color) (background dark))
+     :background "#777777" :weight bold))
+  "Face for `ivy' minibuffer matches modulo 1.")
+
+(defface ivy-minibuffer-match-face-3
+  '((((class color) (background light))
+     :background "#bbbbff" :weight bold)
+    (((class color) (background dark))
+     :background "#7777ff" :weight bold))
+  "Face for `ivy' minibuffer matches modulo 2.")
+
+(defface ivy-minibuffer-match-face-4
+  '((((class color) (background light))
+     :background "#ffbbff" :weight bold)
+    (((class color) (background dark))
+     :background "#8a498a" :weight bold))
+  "Face for `ivy' minibuffer matches modulo 3.")
+
+(defface ivy-confirm-face
+  '((t :foreground "ForestGreen" :inherit minibuffer-prompt))
+  "Face used by Ivy for a confirmation prompt.")
+
+(defface ivy-match-required-face
+  '((t :foreground "red" :inherit minibuffer-prompt))
+  "Face used by Ivy for a match required prompt.")
+
+(setcdr (assoc load-file-name custom-current-group-alist) 'ivy)
+
+(defface ivy-subdir
+  '((t (:inherit 'dired-directory)))
+  "Face used by Ivy for highlighting subdirs in the alternatives.")
+
+(defface ivy-modified-buffer
+  '((t :inherit 'default))
+  "Face used by Ivy for highlighting modified file visiting buffers.")
+
+(defface ivy-remote
+  '((t (:foreground "#110099")))
+  "Face used by Ivy for highlighting remotes in the alternatives.")
+
+(defface ivy-virtual
+  '((t :inherit font-lock-builtin-face))
+  "Face used by Ivy for matching virtual buffer names.")
+
+(defcustom ivy-height 10
+  "Number of lines for the minibuffer window."
+  :type 'integer)
+
+(defcustom ivy-count-format "%-4d "
+  "The style to use for displaying the current candidate count for `ivy-read'.
+Set this to \"\" to suppress the count visibility.
+Set this to \"(%d/%d) \" to display both the index and the count."
+  :type '(choice
+          (const :tag "Count disabled" "")
+          (const :tag "Count matches" "%-4d ")
+          (const :tag "Count matches and show current match" "(%d/%d) ")
+          string))
+
+(defcustom ivy-wrap nil
+  "When non-nil, wrap around after the first and the last candidate."
+  :type 'boolean)
+
+(defcustom ivy-display-style (unless (version< emacs-version "24.5") 'fancy)
+  "The style for formatting the minibuffer.
+
+By default, the matched strings are copied as is.
+
+The fancy display style highlights matching parts of the regexp,
+a behavior similar to `swiper'.
+
+This setting depends on `add-face-text-property' - a C function
+available as of Emacs 24.5. Fancy style will render poorly in
+earlier versions of Emacs."
+  :type '(choice
+          (const :tag "Plain" nil)
+          (const :tag "Fancy" fancy)))
+
+(defcustom ivy-on-del-error-function 'minibuffer-keyboard-quit
+  "The handler for when `ivy-backward-delete-char' throws.
+Usually a quick exit out of the minibuffer."
+  :type 'function)
+
+(defcustom ivy-extra-directories '("../" "./")
+  "Add this to the front of the list when completing file names.
+Only \"./\" and \"../\" apply here. They appear in reverse order."
+  :type '(repeat :tag "Dirs"
+          (choice
+           (const :tag "Parent Directory" "../")
+           (const :tag "Current Directory" "./"))))
+
+(defcustom ivy-use-virtual-buffers nil
+  "When non-nil, add `recentf-mode' and bookmarks to `ivy-switch-buffer'."
+  :type 'boolean)
+
+(defvar ivy--actions-list nil
+  "A list of extra actions per command.")
+
+(defun ivy-set-actions (cmd actions)
+  "Set CMD extra exit points to ACTIONS."
+  (setq ivy--actions-list
+        (plist-put ivy--actions-list cmd actions)))
+
+;;* Keymap
+(require 'delsel)
+(defvar ivy-minibuffer-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-m") 'ivy-done)
+    (define-key map (kbd "C-M-m") 'ivy-call)
+    (define-key map (kbd "C-j") 'ivy-alt-done)
+    (define-key map (kbd "C-M-j") 'ivy-immediate-done)
+    (define-key map (kbd "TAB") 'ivy-partial-or-done)
+    (define-key map (kbd "C-n") 'ivy-next-line)
+    (define-key map (kbd "C-p") 'ivy-previous-line)
+    (define-key map (kbd "<down>") 'ivy-next-line)
+    (define-key map (kbd "<up>") 'ivy-previous-line)
+    (define-key map (kbd "C-s") 'ivy-next-line-or-history)
+    (define-key map (kbd "C-r") 'ivy-reverse-i-search)
+    (define-key map (kbd "SPC") 'self-insert-command)
+    (define-key map (kbd "DEL") 'ivy-backward-delete-char)
+    (define-key map (kbd "M-DEL") 'ivy-backward-kill-word)
+    (define-key map (kbd "C-d") 'ivy-delete-char)
+    (define-key map (kbd "C-f") 'ivy-forward-char)
+    (define-key map (kbd "M-d") 'ivy-kill-word)
+    (define-key map (kbd "M-<") 'ivy-beginning-of-buffer)
+    (define-key map (kbd "M->") 'ivy-end-of-buffer)
+    (define-key map (kbd "M-n") 'ivy-next-history-element)
+    (define-key map (kbd "M-p") 'ivy-previous-history-element)
+    (define-key map (kbd "C-g") 'minibuffer-keyboard-quit)
+    (define-key map (kbd "C-v") 'ivy-scroll-up-command)
+    (define-key map (kbd "M-v") 'ivy-scroll-down-command)
+    (define-key map (kbd "C-M-n") 'ivy-next-line-and-call)
+    (define-key map (kbd "C-M-p") 'ivy-previous-line-and-call)
+    (define-key map (kbd "M-q") 'ivy-toggle-regexp-quote)
+    (define-key map (kbd "M-j") 'ivy-yank-word)
+    (define-key map (kbd "M-i") 'ivy-insert-current)
+    (define-key map (kbd "C-o") 'hydra-ivy/body)
+    (define-key map (kbd "M-o") 'ivy-dispatching-done)
+    (define-key map (kbd "C-M-o") 'ivy-dispatching-call)
+    (define-key map (kbd "C-k") 'ivy-kill-line)
+    (define-key map (kbd "S-SPC") 'ivy-restrict-to-matches)
+    (define-key map (kbd "M-w") 'ivy-kill-ring-save)
+    (define-key map (kbd "C-'") 'ivy-avy)
+    (define-key map (kbd "C-M-a") 'ivy-read-action)
+    (define-key map (kbd "C-c C-o") 'ivy-occur)
+    map)
+  "Keymap used in the minibuffer.")
+(autoload 'hydra-ivy/body "ivy-hydra" "" t)
+
+(defvar ivy-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [remap switch-to-buffer] 'ivy-switch-buffer)
+    map)
+  "Keymap for `ivy-mode'.")
+
+;;* Globals
+(cl-defstruct ivy-state
+  prompt collection
+  predicate require-match initial-input
+  history preselect keymap update-fn sort
+  ;; The window in which `ivy-read' was called
+  window
+  ;; The buffer in which `ivy-read' was called
+  buffer
+  ;; The value of `ivy-text' to be used by `ivy-occur'
+  text
+  action
+  unwind
+  re-builder
+  matcher
+  ;; When this is non-nil, call it for each input change to get new candidates
+  dynamic-collection
+  caller)
+
+(defvar ivy-last nil
+  "The last parameters passed to `ivy-read'.
+
+This should eventually become a stack so that you could use
+`ivy-read' recursively.")
+
+(defsubst ivy-set-action (action)
+  (setf (ivy-state-action ivy-last) action))
+
+(defvar ivy-history nil
+  "History list of candidates entered in the minibuffer.
+
+Maximum length of the history list is determined by the value
+of `history-length'.")
+
+(defvar ivy--directory nil
+  "Current directory when completing file names.")
+
+(defvar ivy--length 0
+  "Store the amount of viable candidates.")
+
+(defvar ivy-text ""
+  "Store the user's string as it is typed in.")
+
+(defvar ivy--current ""
+  "Current candidate.")
+
+(defvar ivy--index 0
+  "Store the index of the current candidate.")
+
+(defvar ivy-exit nil
+  "Store 'done if the completion was successfully selected.
+Otherwise, store nil.")
+
+(defvar ivy--all-candidates nil
+  "Store the candidates passed to `ivy-read'.")
+
+(defvar ivy--default nil
+  "Default initial input.")
+
+(defvar ivy--prompt nil
+  "Store the format-style prompt.
+When non-nil, it should contain at least one %d.")
+
+(defvar ivy--prompt-extra ""
+  "Temporary modifications to the prompt.")
+
+(defvar ivy--old-re nil
+  "Store the old regexp.")
+
+(defvar ivy--old-cands nil
+  "Store the candidates matched by `ivy--old-re'.")
+
+(defvar ivy--regex-function 'ivy--regex
+  "Current function for building a regex.")
+
+(defvar ivy--subexps 0
+  "Number of groups in the current `ivy--regex'.")
+
+(defvar ivy--full-length nil
+  "When :dynamic-collection is non-nil, this can be the total amount of candidates.")
+
+(defvar ivy--old-text ""
+  "Store old `ivy-text' for dynamic completion.")
+
+(defvar ivy-case-fold-search 'auto
+  "Store the current overriding `case-fold-search'.")
+
+(defvar Info-current-file)
+
+(defmacro ivy-quit-and-run (&rest body)
+  "Quit the minibuffer and run BODY afterwards."
+  `(progn
+     (put 'quit 'error-message "")
+     (run-at-time nil nil
+                  (lambda ()
+                    (put 'quit 'error-message "Quit")
+                    ,@body))
+     (minibuffer-keyboard-quit)))
+
+(defun ivy-exit-with-action (action)
+  "Quit the minibuffer and call ACTION afterwards."
+  (ivy-set-action
+   `(lambda (x)
+      (funcall ',action x)
+      (ivy-set-action ',(ivy-state-action ivy-last))))
+  (setq ivy-exit 'done)
+  (exit-minibuffer))
+
+(defmacro with-ivy-window (&rest body)
+  "Execute BODY in the window from which `ivy-read' was called."
+  (declare (indent 0)
+           (debug t))
+  `(with-selected-window (ivy--get-window ivy-last)
+     ,@body))
+
+(defun ivy--done (text)
+  "Insert TEXT and exit minibuffer."
+  (if (and ivy--directory
+           (not (eq (ivy-state-history ivy-last) 'grep-files-history)))
+      (insert (setq ivy--current (expand-file-name
+                                  text ivy--directory)))
+    (insert (setq ivy--current text)))
+  (setq ivy-exit 'done)
+  (exit-minibuffer))
+
+;;* Commands
+(defun ivy-done ()
+  "Exit the minibuffer with the selected candidate."
+  (interactive)
+  (delete-minibuffer-contents)
+  (cond ((> ivy--length 0)
+         (ivy--done ivy--current))
+        ((memq (ivy-state-collection ivy-last)
+               '(read-file-name-internal internal-complete-buffer))
+         (if (or (not (eq confirm-nonexistent-file-or-buffer t))
+                 (equal " (confirm)" ivy--prompt-extra))
+             (ivy--done ivy-text)
+           (setq ivy--prompt-extra " (confirm)")
+           (insert ivy-text)
+           (ivy--exhibit)))
+        ((memq (ivy-state-require-match ivy-last)
+               '(nil confirm confirm-after-completion))
+         (ivy--done ivy-text))
+        (t
+         (setq ivy--prompt-extra " (match required)")
+         (insert ivy-text)
+         (ivy--exhibit))))
+
+(defun ivy-read-action ()
+  "Change the action to one of the available ones."
+  (interactive)
+  (let ((actions (ivy-state-action ivy-last)))
+    (unless (null (ivy--actionp actions))
+      (let* ((hint (concat (if (eq this-command 'ivy-read-action)
+                               "Select action: "
+                             ivy--current)
+                           "\n"
+                           (mapconcat
+                            (lambda (x)
+                              (format "%s: %s"
+                                      (propertize
+                                       (car x)
+                                       'face 'font-lock-builtin-face)
+                                      (nth 2 x)))
+                            (cdr actions)
+                            "\n")
+                           "\n"))
+             (key (string (read-key hint)))
+             (action-idx (cl-position-if
+                          (lambda (x) (equal (car x) key))
+                          (cdr actions))))
+        (cond ((string= key ""))
+              ((null action-idx)
+               (error "%s is not bound" key))
+              (t
+               (message "")
+               (setcar actions (1+ action-idx))
+               (ivy-set-action actions)))))))
+
+(defun ivy-dispatching-done ()
+  "Select one of the available actions and call `ivy-done'."
+  (interactive)
+  (ivy-read-action)
+  (ivy-done))
+
+(defun ivy-dispatching-call ()
+  "Select one of the available actions and call `ivy-call'."
+  (interactive)
+  (let ((actions (copy-sequence (ivy-state-action ivy-last))))
+    (unwind-protect
+         (when (ivy-read-action)
+           (ivy-call))
+      (ivy-set-action actions))))
+
+(defun ivy-build-tramp-name (x)
+  "Reconstruct X into a path.
+Is is a cons cell, related to `tramp-get-completion-function'."
+  (let ((user (car x))
+        (domain (cadr x)))
+    (if user
+        (concat user "@" domain)
+      domain)))
+
+(declare-function tramp-get-completion-function "tramp")
+(declare-function Info-find-node "info")
+
+(defun ivy-alt-done (&optional arg)
+  "Exit the minibuffer with the selected candidate.
+When ARG is t, exit with current text, ignoring the candidates."
+  (interactive "P")
+  (cond (arg
+         (ivy-immediate-done))
+        (ivy--directory
+         (ivy--directory-done))
+        ((eq (ivy-state-collection ivy-last) 'Info-read-node-name-1)
+         (if (or (equal ivy--current "(./)")
+                 (equal ivy--current "(../)"))
+             (ivy-quit-and-run
+              (ivy-read "Go to file: " 'read-file-name-internal
+                        :action (lambda (x)
+                                  (Info-find-node
+                                   (expand-file-name x ivy--directory)
+                                   "Top"))))
+           (ivy-done)))
+        (t
+         (ivy-done))))
+
+(defun ivy--directory-done ()
+  "Handle exit from the minibuffer when completing file names."
+  (let (dir)
+    (cond
+      ((equal ivy-text "/sudo::")
+       (setq dir (concat ivy-text ivy--directory))
+       (ivy--cd dir)
+       (ivy--exhibit))
+      ((or
+        (and
+         (not (equal ivy-text ""))
+         (ignore-errors
+           (file-directory-p
+            (setq dir
+                  (file-name-as-directory
+                   (expand-file-name
+                    ivy-text ivy--directory))))))
+        (and
+         (not (string= ivy--current "./"))
+         (cl-plusp ivy--length)
+         (ignore-errors
+           (file-directory-p
+            (setq dir (file-name-as-directory
+                       (expand-file-name
+                        ivy--current ivy--directory)))))))
+       (ivy--cd dir)
+       (ivy--exhibit))
+      ((or (and (equal ivy--directory "/")
+                (string-match "\\`[^/]+:.*:.*\\'" ivy-text))
+           (string-match "\\`/[^/]+:.*:.*\\'" ivy-text))
+       (ivy-done))
+      ((or (and (equal ivy--directory "/")
+                (cond ((string-match
+                        "\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
+                        ivy-text))
+                      ((string-match
+                        "\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
+                        ivy--current)
+                       (setq ivy-text ivy--current))))
+           (string-match
+            "\\`/\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
+            ivy-text))
+       (let ((method (match-string 1 ivy-text))
+             (user (match-string 2 ivy-text))
+             (rest (match-string 3 ivy-text))
+             res)
+         (require 'tramp)
+         (dolist (x (tramp-get-completion-function method))
+           (setq res (append res (funcall (car x) (cadr x)))))
+         (setq res (delq nil res))
+         (when user
+           (dolist (x res)
+             (setcar x user)))
+         (setq res (cl-delete-duplicates res :test #'equal))
+         (let* ((old-ivy-last ivy-last)
+                (enable-recursive-minibuffers t)
+                (host (ivy-read "user@host: "
+                                (mapcar #'ivy-build-tramp-name res)
+                                :initial-input rest)))
+           (setq ivy-last old-ivy-last)
+           (when host
+             (setq ivy--directory "/")
+             (ivy--cd (concat "/" method ":" host ":"))))))
+      (t
+       (ivy-done)))))
+
+(defcustom ivy-tab-space nil
+  "When non-nil, `ivy-partial-or-done' should insert a space."
+  :type 'boolean)
+
+(defun ivy-partial-or-done ()
+  "Complete the minibuffer text as much as possible.
+If the text hasn't changed as a result, forward to `ivy-alt-done'."
+  (interactive)
+  (if (and (eq (ivy-state-collection ivy-last) #'read-file-name-internal)
+           (or (and (equal ivy--directory "/")
+                    (string-match "\\`[^/]+:.*\\'" ivy-text))
+               (string-match "\\`/" ivy-text)))
+      (let ((default-directory ivy--directory))
+        (minibuffer-complete)
+        (setq ivy-text (ivy--input))
+        (when (file-directory-p
+               (expand-file-name ivy-text ivy--directory))
+          (ivy--cd (file-name-as-directory
+                    (expand-file-name ivy-text ivy--directory)))))
+    (or (ivy-partial)
+        (when (or (eq this-command last-command)
+                  (eq ivy--length 1))
+          (ivy-alt-done)))))
+
+(defun ivy-partial ()
+  "Complete the minibuffer text as much as possible."
+  (interactive)
+  (let* ((parts (or (split-string ivy-text " " t) (list "")))
+         (postfix (car (last parts)))
+         (completion-ignore-case t)
+         (startp (string-match "^\\^" postfix))
+         (new (try-completion (if startp
+                                  (substring postfix 1)
+                                postfix)
+                              (mapcar (lambda (str)
+                                        (let ((i (string-match postfix str)))
+                                          (when i
+                                            (substring str i))))
+                                      ivy--old-cands))))
+    (cond ((eq new t) nil)
+          ((string= new ivy-text) nil)
+          (new
+           (delete-region (minibuffer-prompt-end) (point-max))
+           (setcar (last parts)
+                   (if startp
+                       (concat "^" new)
+                     new))
+           (insert (mapconcat #'identity parts " ")
+                   (if ivy-tab-space " " ""))
+           t))))
+
+(defun ivy-immediate-done ()
+  "Exit the minibuffer with the current input."
+  (interactive)
+  (delete-minibuffer-contents)
+  (insert (setq ivy--current
+                (if ivy--directory
+                    (expand-file-name ivy-text ivy--directory)
+                  ivy-text)))
+  (setq ivy-exit 'done)
+  (exit-minibuffer))
+
+;;;###autoload
+(defun ivy-resume ()
+  "Resume the last completion session."
+  (interactive)
+  (when (eq (ivy-state-caller ivy-last) 'swiper)
+    (switch-to-buffer (ivy-state-buffer ivy-last)))
+  (with-current-buffer (ivy-state-buffer ivy-last)
+    (ivy-read
+     (ivy-state-prompt ivy-last)
+     (ivy-state-collection ivy-last)
+     :predicate (ivy-state-predicate ivy-last)
+     :require-match (ivy-state-require-match ivy-last)
+     :initial-input ivy-text
+     :history (ivy-state-history ivy-last)
+     :preselect (unless (eq (ivy-state-collection ivy-last)
+                            'read-file-name-internal)
+                  ivy--current)
+     :keymap (ivy-state-keymap ivy-last)
+     :update-fn (ivy-state-update-fn ivy-last)
+     :sort (ivy-state-sort ivy-last)
+     :action (ivy-state-action ivy-last)
+     :unwind (ivy-state-unwind ivy-last)
+     :re-builder (ivy-state-re-builder ivy-last)
+     :matcher (ivy-state-matcher ivy-last)
+     :dynamic-collection (ivy-state-dynamic-collection ivy-last)
+     :caller (ivy-state-caller ivy-last))))
+
+(defvar ivy-calling nil
+  "When non-nil, call the current action when `ivy--index' changes.")
+
+(defun ivy-set-index (index)
+  "Set `ivy--index' to INDEX."
+  (setq ivy--index index)
+  (when ivy-calling
+    (ivy--exhibit)
+    (ivy-call)))
+
+(defun ivy-beginning-of-buffer ()
+  "Select the first completion candidate."
+  (interactive)
+  (ivy-set-index 0))
+
+(defun ivy-end-of-buffer ()
+  "Select the last completion candidate."
+  (interactive)
+  (ivy-set-index (1- ivy--length)))
+
+(defun ivy-scroll-up-command ()
+  "Scroll the candidates upward by the minibuffer height."
+  (interactive)
+  (ivy-set-index (min (1- (+ ivy--index ivy-height))
+                      (1- ivy--length))))
+
+(defun ivy-scroll-down-command ()
+  "Scroll the candidates downward by the minibuffer height."
+  (interactive)
+  (ivy-set-index (max (1+ (- ivy--index ivy-height))
+                      0)))
+
+(defun ivy-minibuffer-grow ()
+  "Grow the minibuffer window by 1 line."
+  (interactive)
+  (setq-local max-mini-window-height
+              (cl-incf ivy-height)))
+
+(defun ivy-minibuffer-shrink ()
+  "Shrink the minibuffer window by 1 line."
+  (interactive)
+  (unless (<= ivy-height 2)
+    (setq-local max-mini-window-height
+                (cl-decf ivy-height))
+    (window-resize (selected-window) -1)))
+
+(defun ivy-next-line (&optional arg)
+  "Move cursor vertically down ARG candidates."
+  (interactive "p")
+  (setq arg (or arg 1))
+  (let ((index (+ ivy--index arg)))
+    (if (> index (1- ivy--length))
+        (if ivy-wrap
+            (ivy-beginning-of-buffer)
+          (ivy-set-index (1- ivy--length)))
+      (ivy-set-index index))))
+
+(defun ivy-next-line-or-history (&optional arg)
+  "Move cursor vertically down ARG candidates.
+If the input is empty, select the previous history element instead."
+  (interactive "p")
+  (when (string= ivy-text "")
+    (ivy-previous-history-element 1))
+  (ivy-next-line arg))
+
+(defun ivy-previous-line (&optional arg)
+  "Move cursor vertically up ARG candidates."
+  (interactive "p")
+  (setq arg (or arg 1))
+  (let ((index (- ivy--index arg)))
+    (if (< index 0)
+        (if ivy-wrap
+            (ivy-end-of-buffer)
+          (ivy-set-index 0))
+      (ivy-set-index index))))
+
+(defun ivy-previous-line-or-history (arg)
+  "Move cursor vertically up ARG candidates.
+If the input is empty, select the previous history element instead."
+  (interactive "p")
+  (when (string= ivy-text "")
+    (ivy-previous-history-element 1))
+  (ivy-previous-line arg))
+
+(defun ivy-toggle-calling ()
+  "Flip `ivy-calling'."
+  (interactive)
+  (when (setq ivy-calling (not ivy-calling))
+    (ivy-call)))
+
+(defun ivy--get-action (state)
+  "Get the action function from STATE."
+  (let ((action (ivy-state-action state)))
+    (when action
+      (if (functionp action)
+          action
+        (cadr (nth (car action) action))))))
+
+(defun ivy--get-window (state)
+  "Get the window from STATE."
+  (if (ivy-state-p state)
+      (let ((window (ivy-state-window state)))
+        (if (window-live-p window)
+            window
+          (if (= (length (window-list)) 1)
+              (selected-window)
+            (next-window))))
+    (selected-window)))
+
+(defun ivy--actionp (x)
+  "Return non-nil when X is a list of actions."
+  (and x (listp x) (not (eq (car x) 'closure))))
+
+(defun ivy-next-action ()
+  "When the current action is a list, scroll it forwards."
+  (interactive)
+  (let ((action (ivy-state-action ivy-last)))
+    (when (ivy--actionp action)
+      (unless (>= (car action) (1- (length action)))
+        (cl-incf (car action))))))
+
+(defun ivy-prev-action ()
+  "When the current action is a list, scroll it backwards."
+  (interactive)
+  (let ((action (ivy-state-action ivy-last)))
+    (when (ivy--actionp action)
+      (unless (<= (car action) 1)
+        (cl-decf (car action))))))
+
+(defun ivy-action-name ()
+  "Return the name associated with the current action."
+  (let ((action (ivy-state-action ivy-last)))
+    (if (ivy--actionp action)
+        (format "[%d/%d] %s"
+                (car action)
+                (1- (length action))
+                (nth 2 (nth (car action) action)))
+      "[1/1] default")))
+
+(defun ivy-call ()
+  "Call the current action without exiting completion."
+  (interactive)
+  (let ((action (ivy--get-action ivy-last)))
+    (when action
+      (let* ((collection (ivy-state-collection ivy-last))
+             (x (if (and (consp collection)
+                         (consp (car collection)))
+                    (cdr (assoc ivy--current collection))
+                  (if (equal ivy--current "")
+                      ivy-text
+                    ivy--current))))
+        (prog1 (funcall action x)
+          (unless (or (eq ivy-exit 'done)
+                      (equal (selected-window)
+                             (active-minibuffer-window))
+                      (null (active-minibuffer-window)))
+            (select-window (active-minibuffer-window))))))))
+
+(defun ivy-next-line-and-call (&optional arg)
+  "Move cursor vertically down ARG candidates.
+Call the permanent action if possible."
+  (interactive "p")
+  (ivy-next-line arg)
+  (ivy--exhibit)
+  (ivy-call))
+
+(defun ivy-previous-line-and-call (&optional arg)
+  "Move cursor vertically down ARG candidates.
+Call the permanent action if possible."
+  (interactive "p")
+  (ivy-previous-line arg)
+  (ivy--exhibit)
+  (ivy-call))
+
+(defun ivy-previous-history-element (arg)
+  "Forward to `previous-history-element' with ARG."
+  (interactive "p")
+  (previous-history-element arg)
+  (ivy--cd-maybe)
+  (move-end-of-line 1)
+  (ivy--maybe-scroll-history))
+
+(defun ivy-next-history-element (arg)
+  "Forward to `next-history-element' with ARG."
+  (interactive "p")
+  (next-history-element arg)
+  (ivy--cd-maybe)
+  (move-end-of-line 1)
+  (ivy--maybe-scroll-history))
+
+(defun ivy--cd-maybe ()
+  "Check if the current input points to a different directory.
+If so, move to that directory, while keeping only the file name."
+  (when ivy--directory
+    (let ((input (ivy--input))
+          url)
+      (if (setq url (ffap-url-p input))
+          (ivy-exit-with-action
+           (lambda (_)
+             (funcall ffap-url-fetcher url)))
+        (setq input (expand-file-name input))
+        (let ((file (file-name-nondirectory input))
+              (dir (expand-file-name (file-name-directory input))))
+          (if (string= dir ivy--directory)
+              (progn
+                (delete-minibuffer-contents)
+                (insert file))
+            (ivy--cd dir)
+            (insert file)))))))
+
+(defun ivy--maybe-scroll-history ()
+  "If the selected history element has an index, scroll there."
+  (let ((idx (ignore-errors
+               (get-text-property
+                (minibuffer-prompt-end)
+                'ivy-index))))
+    (when idx
+      (ivy--exhibit)
+      (setq ivy--index idx))))
+
+(defun ivy--cd (dir)
+  "When completing file names, move to directory DIR."
+  (if (null ivy--directory)
+      (error "Unexpected")
+    (setq ivy--old-cands nil)
+    (setq ivy--old-re nil)
+    (setq ivy--index 0)
+    (setq ivy--all-candidates
+          (ivy--sorted-files (setq ivy--directory dir)))
+    (setq ivy-text "")
+    (delete-minibuffer-contents)))
+
+(defun ivy-backward-delete-char ()
+  "Forward to `backward-delete-char'.
+On error (read-only), call `ivy-on-del-error-function'."
+  (interactive)
+  (if (and ivy--directory (= (minibuffer-prompt-end) (point)))
+      (progn
+        (ivy--cd (file-name-directory
+                  (directory-file-name
+                   (expand-file-name
+                    ivy--directory))))
+        (ivy--exhibit))
+    (condition-case nil
+        (backward-delete-char 1)
+      (error
+       (when ivy-on-del-error-function
+         (funcall ivy-on-del-error-function))))))
+
+(defun ivy-delete-char (arg)
+  "Forward to `delete-char' ARG."
+  (interactive "p")
+  (unless (= (point) (line-end-position))
+    (delete-char arg)))
+
+(defun ivy-forward-char (arg)
+  "Forward to `forward-char' ARG."
+  (interactive "p")
+  (unless (= (point) (line-end-position))
+    (forward-char arg)))
+
+(defun ivy-kill-word (arg)
+  "Forward to `kill-word' ARG."
+  (interactive "p")
+  (unless (= (point) (line-end-position))
+    (kill-word arg)))
+
+(defun ivy-kill-line ()
+  "Forward to `kill-line'."
+  (interactive)
+  (if (eolp)
+      (kill-region (minibuffer-prompt-end) (point))
+    (kill-line)))
+
+(defun ivy-backward-kill-word ()
+  "Forward to `backward-kill-word'."
+  (interactive)
+  (if (and ivy--directory (= (minibuffer-prompt-end) (point)))
+      (progn
+        (ivy--cd (file-name-directory
+                  (directory-file-name
+                   (expand-file-name
+                    ivy--directory))))
+        (ivy--exhibit))
+    (ignore-errors
+      (let ((pt (point)))
+        (forward-word -1)
+        (delete-region (point) pt)))))
+
+(defvar ivy--regexp-quote 'regexp-quote
+  "Store the regexp quoting state.")
+
+(defun ivy-toggle-regexp-quote ()
+  "Toggle the regexp quoting."
+  (interactive)
+  (setq ivy--old-re nil)
+  (cl-rotatef ivy--regex-function ivy--regexp-quote))
+
+(defvar avy-all-windows)
+(defvar avy-action)
+(defvar avy-keys)
+(defvar avy-keys-alist)
+(defvar avy-style)
+(defvar avy-styles-alist)
+(declare-function avy--process "ext:avy")
+(declare-function avy--style-fn "ext:avy")
+
+(eval-after-load 'avy
+  '(add-to-list 'avy-styles-alist '(ivy-avy . pre)))
+
+(defun ivy-avy ()
+  "Jump to one of the current ivy candidates."
+  (interactive)
+  (unless (require 'avy nil 'noerror)
+    (error "Package avy isn't installed"))
+  (let* ((avy-all-windows nil)
+         (avy-keys (or (cdr (assq 'ivy-avy avy-keys-alist))
+                       avy-keys))
+         (avy-style (or (cdr (assq 'ivy-avy
+                                   avy-styles-alist))
+                        avy-style))
+         (candidate
+          (let ((candidates))
+            (save-excursion
+              (save-restriction
+                (narrow-to-region
+                 (window-start)
+                 (window-end))
+                (goto-char (point-min))
+                (forward-line)
+                (while (< (point) (point-max))
+                  (push
+                   (cons (point)
+                         (selected-window))
+                   candidates)
+                  (forward-line))))
+            (setq avy-action #'identity)
+            (avy--process
+             (nreverse candidates)
+             (avy--style-fn avy-style)))))
+    (ivy-set-index (- (line-number-at-pos candidate) 2))
+    (ivy--exhibit)
+    (ivy-done)))
+
+(defun ivy-sort-file-function-default (x y)
+  "Compare two files X and Y.
+Prioritize directories."
+  (if (get-text-property 0 'dirp x)
+      (if (get-text-property 0 'dirp y)
+          (string< x y)
+        t)
+    (if (get-text-property 0 'dirp y)
+        nil
+      (string< x y))))
+
+(defcustom ivy-sort-functions-alist
+  '((read-file-name-internal . ivy-sort-file-function-default)
+    (internal-complete-buffer . nil)
+    (counsel-git-grep-function . nil)
+    (Man-goto-section . nil)
+    (org-refile . nil)
+    (t . string-lessp))
+  "An alist of sorting functions for each collection function.
+Interactive functions that call completion fit in here as well.
+
+Nil means no sorting, which is useful to turn off the sorting for
+functions that have candidates in the natural buffer order, like
+`org-refile' or `Man-goto-section'.
+
+The entry associated with t is used for all fall-through cases.
+
+See also `ivy-sort-max-size'."
+  :type
+  '(alist
+    :key-type (choice
+               (const :tag "All other functions" t)
+               (symbol :tag "Function"))
+    :value-type (choice
+                 (const :tag "plain sort" string-lessp)
+                 (const :tag "file sort" ivy-sort-file-function-default)
+                 (const :tag "no sort" nil)))
+  :group 'ivy)
+
+(defvar ivy-index-functions-alist
+  '((swiper . ivy-recompute-index-swiper)
+    (swiper-multi . ivy-recompute-index-swiper)
+    (counsel-git-grep . ivy-recompute-index-swiper)
+    (counsel-grep . ivy-recompute-index-swiper-async)
+    (t . ivy-recompute-index-zero))
+  "An alist of index recomputing functions for each collection function.
+When the input changes, the appropriate function returns an
+integer - the index of the matched candidate that should be
+selected.")
+
+(defvar ivy-re-builders-alist
+  '((t . ivy--regex-plus))
+  "An alist of regex building functions for each collection function.
+
+Each key is (in order of priority):
+1. The actual collection function, e.g. `read-file-name-internal'.
+2. The symbol passed by :caller into `ivy-read'.
+3. `this-command'.
+4. t.
+
+Each value is a function that should take a string and return a
+valid regex or a regex sequence (see below).
+
+Possible choices: `ivy--regex', `regexp-quote',
+`ivy--regex-plus', `ivy--regex-fuzzy'.
+
+If a function returns a list, it should format like this:
+'((\"matching-regexp\" . t) (\"non-matching-regexp\") ...).
+
+The matches will be filtered in a sequence, you can mix the
+regexps that should match and that should not match as you
+like.")
+
+(defvar ivy-initial-inputs-alist
+  '((org-refile . "^")
+    (org-agenda-refile . "^")
+    (org-capture-refile . "^")
+    (counsel-M-x . "^")
+    (counsel-describe-function . "^")
+    (counsel-describe-variable . "^")
+    (man . "^")
+    (woman . "^"))
+  "Command to initial input table.")
+
+(defcustom ivy-sort-max-size 30000
+  "Sorting won't be done for collections larger than this."
+  :type 'integer)
+
+(defun ivy--sorted-files (dir)
+  "Return the list of files in DIR.
+Directories come first."
+  (let* ((default-directory dir)
+         (seq (all-completions "" 'read-file-name-internal))
+         sort-fn)
+    (if (equal dir "/")
+        seq
+      (setq seq (delete "./" (delete "../" seq)))
+      (when (eq (setq sort-fn (cdr (assoc 'read-file-name-internal
+                                          ivy-sort-functions-alist)))
+                #'ivy-sort-file-function-default)
+        (setq seq (mapcar (lambda (x)
+                            (propertize x 'dirp (string-match-p "/\\'" x)))
+                          seq)))
+      (when sort-fn
+        (setq seq (cl-sort seq sort-fn)))
+      (dolist (dir ivy-extra-directories)
+        (push dir seq))
+      seq)))
+
+(defvar ivy-recursive-restore t
+  "When non-nil, restore the above state when exiting the minibuffer.
+This variable is let-bound to nil by functions that take care of
+the restoring themselves.")
+
+;;** Entry Point
+(cl-defun ivy-read (prompt collection
+                           &key predicate require-match initial-input
+                           history preselect keymap update-fn sort
+                           action unwind re-builder matcher dynamic-collection caller)
+  "Read a string in the minibuffer, with completion.
+
+PROMPT is a format string, normally ending in a colon and a
+space; %d anywhere in the string is replaced by the current
+number of matching candidates. For the literal % character,
+escape it with %%. See also `ivy-count-format'.
+
+COLLECTION is either a list of strings, a function, an alist, or
+a hash table.
+
+If INITIAL-INPUT is not nil, then insert that input in the
+minibuffer initially.
+
+KEYMAP is composed with `ivy-minibuffer-map'.
+
+If PRESELECT is not nil, then select the corresponding candidate
+out of the ones that match the INITIAL-INPUT.
+
+UPDATE-FN is called each time the current candidate(s) is changed.
+
+When SORT is t, use `ivy-sort-functions-alist' for sorting.
+
+ACTION is a lambda function to call after selecting a result. It
+takes a single string argument.
+
+UNWIND is a lambda function to call before exiting.
+
+RE-BUILDER is a lambda function to call to transform text into a
+regex pattern.
+
+MATCHER is to override matching.
+
+DYNAMIC-COLLECTION is a boolean to specify if the list of
+candidates is updated after each input by calling COLLECTION.
+
+CALLER is a symbol to uniquely identify the caller to `ivy-read'.
+It is used, along with COLLECTION, to determine which
+customizations apply to the current completion session."
+  (let ((extra-actions (append (plist-get ivy--actions-list t)
+                               (plist-get ivy--actions-list this-command))))
+    (when extra-actions
+      (setq action
+            (if (functionp action)
+                `(1
+                  ("o" ,action "default")
+                  ,@extra-actions)
+              (delete-dups (append action extra-actions))))))
+  (let ((recursive-ivy-last (and (active-minibuffer-window) ivy-last)))
+    (setq ivy-last
+          (make-ivy-state
+           :prompt prompt
+           :collection collection
+           :predicate predicate
+           :require-match require-match
+           :initial-input initial-input
+           :history history
+           :preselect preselect
+           :keymap keymap
+           :update-fn update-fn
+           :sort sort
+           :action action
+           :window (selected-window)
+           :buffer (current-buffer)
+           :unwind unwind
+           :re-builder re-builder
+           :matcher matcher
+           :dynamic-collection dynamic-collection
+           :caller caller))
+    (ivy--reset-state ivy-last)
+    (prog1
+        (unwind-protect
+            (minibuffer-with-setup-hook
+                #'ivy--minibuffer-setup
+              (let* ((hist (or history 'ivy-history))
+                     (minibuffer-completion-table collection)
+                     (minibuffer-completion-predicate predicate)
+                     (resize-mini-windows (cond
+                                           ((display-graphic-p) nil)
+                                           ((null resize-mini-windows) 'grow-only)
+                                           (t resize-mini-windows))))
+                (read-from-minibuffer
+                 prompt
+                 (ivy-state-initial-input ivy-last)
+                 (make-composed-keymap keymap ivy-minibuffer-map)
+                 nil
+                 hist)
+                (when (eq ivy-exit 'done)
+                  (let ((item (if ivy--directory
+                                  ivy--current
+                                ivy-text)))
+                    (unless (equal item "")
+                      (set hist (cons (propertize item 'ivy-index ivy--index)
+                                      (delete item
+                                              (cdr (symbol-value hist))))))))
+                ivy--current))
+          (remove-hook 'post-command-hook #'ivy--exhibit)
+          (when (setq unwind (ivy-state-unwind ivy-last))
+            (funcall unwind))
+          (unless (eq ivy-exit 'done)
+            (when recursive-ivy-last
+              (ivy--reset-state (setq ivy-last recursive-ivy-last)))))
+      (ivy-call)
+      (when (and recursive-ivy-last
+                 ivy-recursive-restore)
+        (ivy--reset-state (setq ivy-last recursive-ivy-last))))))
+
+(defun ivy--reset-state (state)
+  "Reset the ivy to STATE.
+This is useful for recursive `ivy-read'."
+  (let ((prompt (or (ivy-state-prompt state) ""))
+        (collection (ivy-state-collection state))
+        (predicate (ivy-state-predicate state))
+        (history (ivy-state-history state))
+        (preselect (ivy-state-preselect state))
+        (sort (ivy-state-sort state))
+        (re-builder (ivy-state-re-builder state))
+        (dynamic-collection (ivy-state-dynamic-collection state))
+        (initial-input (ivy-state-initial-input state))
+        (require-match (ivy-state-require-match state))
+        (caller (ivy-state-caller state)))
+    (unless initial-input
+      (setq initial-input (cdr (assoc this-command
+                                      ivy-initial-inputs-alist))))
+    (setq ivy--directory nil)
+    (setq ivy-case-fold-search 'auto)
+    (setq ivy--regex-function
+          (or re-builder
+              (and (functionp collection)
+                   (cdr (assoc collection ivy-re-builders-alist)))
+              (and caller
+                   (cdr (assoc caller ivy-re-builders-alist)))
+              (cdr (assoc this-command ivy-re-builders-alist))
+              (cdr (assoc t ivy-re-builders-alist))
+              'ivy--regex))
+    (setq ivy--subexps 0)
+    (setq ivy--regexp-quote 'regexp-quote)
+    (setq ivy--old-text "")
+    (setq ivy--full-length nil)
+    (setq ivy-text "")
+    (setq ivy-calling nil)
+    (let (coll sort-fn)
+      (cond ((eq collection 'Info-read-node-name-1)
+             (if (equal Info-current-file "dir")
+                 (setq coll
+                       (mapcar (lambda (x) (format "(%s)" x))
+                               (cl-delete-duplicates
+                                (all-completions "(" collection predicate)
+                                :test #'equal)))
+               (setq coll (all-completions "" collection predicate))))
+            ((eq collection 'read-file-name-internal)
+             (setq ivy--directory default-directory)
+             (require 'dired)
+             (when preselect
+               (let ((preselect-directory (file-name-directory preselect)))
+                 (unless (or (null preselect-directory)
+                             (string= preselect-directory
+                                      default-directory))
+                   (setq ivy--directory preselect-directory))
+                 (setf
+                  (ivy-state-preselect state)
+                  (setq preselect (file-name-nondirectory preselect)))))
+             (setq coll (ivy--sorted-files ivy--directory))
+             (when initial-input
+               (unless (or require-match
+                           (equal initial-input default-directory)
+                           (equal initial-input ""))
+                 (setq coll (cons initial-input coll)))
+               (unless (ivy-state-action ivy-last)
+                 (setq initial-input nil))))
+            ((eq collection 'internal-complete-buffer)
+             (setq coll (ivy--buffer-list "" ivy-use-virtual-buffers)))
+            ((or (functionp collection)
+                 (byte-code-function-p collection)
+                 (vectorp collection)
+                 (and (consp collection) (listp (car collection)))
+                 (hash-table-p collection))
+             (setq coll (all-completions "" collection predicate)))
+            (t
+             (setq coll collection)))
+      (when sort
+        (if (and (functionp collection)
+                 (setq sort-fn (assoc collection ivy-sort-functions-alist)))
+            (when (and (setq sort-fn (cdr sort-fn))
+                       (not (eq collection 'read-file-name-internal)))
+              (setq coll (cl-sort coll sort-fn)))
+          (unless (eq history 'org-refile-history)
+            (if (and (setq sort-fn (cdr (assoc t ivy-sort-functions-alist)))
+                     (<= (length coll) ivy-sort-max-size))
+                (setq coll (cl-sort (copy-sequence coll) sort-fn))))))
+      (when preselect
+        (unless (or (and require-match
+                         (not (eq collection 'internal-complete-buffer)))
+                    dynamic-collection
+                    (let ((re (regexp-quote preselect)))
+                      (cl-find-if (lambda (x) (string-match re x))
+                                  coll)))
+          (setq coll (cons preselect coll))))
+      (setq ivy--old-re nil)
+      (setq ivy--old-cands nil)
+      (when (integerp preselect)
+        (setq ivy--old-re "")
+        (setq ivy--index preselect))
+      (when initial-input
+        ;; Needed for anchor to work
+        (setq ivy--old-cands coll)
+        (setq ivy--old-cands (ivy--filter initial-input coll)))
+      (setq ivy--all-candidates coll)
+      (unless (integerp preselect)
+        (setq ivy--index (or
+                          (and dynamic-collection
+                               ivy--index)
+                          (and preselect
+                               (ivy--preselect-index
+                                preselect
+                                (if initial-input
+                                    ivy--old-cands
+                                  coll)))
+                          0))))
+    (setq ivy-exit nil)
+    (setq ivy--default (or
+                        (thing-at-point 'url)
+                        (thing-at-point 'symbol)
+                        ""))
+    (setq ivy--prompt
+          (cond ((string-match "%.*d" prompt)
+                 prompt)
+                ((null ivy-count-format)
+                 (error
+                  "`ivy-count-format' can't be nil.  Set it to an empty string instead"))
+                ((string-match "%d.*%d" ivy-count-format)
+                 (let ((w (length (number-to-string
+                                   (length ivy--all-candidates))))
+                       (s (copy-sequence ivy-count-format)))
+                   (string-match "%d" s)
+                   (match-end 0)
+                   (string-match "%d" s (match-end 0))
+                   (setq s (replace-match (format "%%-%dd" w) nil nil s))
+                   (string-match "%d" s)
+                   (concat (replace-match (format "%%%dd" w) nil nil s)
+                           prompt)))
+                ((string-match "%.*d" ivy-count-format)
+                 (concat ivy-count-format prompt))
+                (ivy--directory
+                 prompt)
+                (t
+                 nil)))
+    (setf (ivy-state-initial-input ivy-last) initial-input)))
+
+;;;###autoload
+(defun ivy-completing-read (prompt collection
+                            &optional predicate require-match initial-input
+                              history def inherit-input-method)
+  "Read a string in the minibuffer, with completion.
+
+This interface conforms to `completing-read' and can be used for
+`completing-read-function'.
+
+PROMPT is a string to prompt with; normally it ends in a colon and a space.
+COLLECTION can be a list of strings, an alist, an obarray or a hash table.
+PREDICATE limits completion to a subset of COLLECTION.
+REQUIRE-MATCH is specified with a boolean value.  See `completing-read'.
+INITIAL-INPUT is a string that can be inserted into the minibuffer initially.
+HISTORY is a list of previously selected inputs.
+DEF is the default value.
+INHERIT-INPUT-METHOD is currently ignored."
+  (if (memq this-command '(tmm-menubar tmm-shortcut))
+      (completing-read-default prompt collection
+                               predicate require-match
+                               initial-input history
+                               def inherit-input-method)
+    ;; See the doc of `completing-read'.
+    (when (consp history)
+      (when (numberp (cdr history))
+        (setq initial-input (nth (1- (cdr history))
+                                 (symbol-value (car history)))))
+      (setq history (car history)))
+    (ivy-read (replace-regexp-in-string "%" "%%" prompt)
+              collection
+              :predicate predicate
+              :require-match require-match
+              :initial-input (if (consp initial-input)
+                                 (car initial-input)
+                               (if (and (stringp initial-input)
+                                        (string-match "\\+" initial-input))
+                                   (replace-regexp-in-string
+                                    "\\+" "\\\\+" initial-input)
+                                 initial-input))
+              :preselect (if (listp def) (car def) def)
+              :history history
+              :keymap nil
+              :sort
+              (let ((sort (assoc this-command ivy-sort-functions-alist)))
+                (if sort
+                    (cdr sort)
+                  t)))))
+
+(defvar ivy-completion-beg nil
+  "Completion bounds start.")
+
+(defvar ivy-completion-end nil
+  "Completion bounds end.")
+
+(defun ivy-completion-in-region-action (str)
+  "Insert STR, erasing the previous one.
+The previous string is between `ivy-completion-beg' and `ivy-completion-end'."
+  (when (stringp str)
+    (with-ivy-window
+      (when ivy-completion-beg
+        (delete-region
+         ivy-completion-beg
+         ivy-completion-end))
+      (setq ivy-completion-beg
+            (move-marker (make-marker) (point)))
+      (insert str)
+      (setq ivy-completion-end
+            (move-marker (make-marker) (point))))))
+
+(defun ivy-completion-common-length (str)
+  "Return the length of the first 'completions-common-part face in STR."
+  (let ((pos 0)
+        (len (length str)))
+    (while (and (<= pos len)
+                (let ((prop (get-text-property pos 'face str)))
+                  (not (eq 'completions-common-part
+                           (if (listp prop) (car prop) prop)))))
+      (setq pos (1+ pos)))
+    (if (< pos len)
+        (or (next-single-property-change pos 'face str) len)
+      0)))
+
+(defun ivy-completion-in-region (start end collection &optional predicate)
+  "An Ivy function suitable for `completion-in-region-function'."
+  (let* ((enable-recursive-minibuffers t)
+         (str (buffer-substring-no-properties start end))
+         (comps
+          (completion-all-completions str collection predicate (- end start))))
+    (if (null comps)
+        (message "No matches")
+      (nconc comps nil)
+      (setq ivy-completion-beg (- end (ivy-completion-common-length (car comps))))
+      (setq ivy-completion-end end)
+      (if (null (cdr comps))
+          (if (string= str (car comps))
+              (message "Sole match")
+            (setf (ivy-state-window ivy-last) (selected-window))
+            (ivy-completion-in-region-action
+             (substring-no-properties
+              (car comps))))
+        (let* ((w (1+ (floor (log (length comps) 10))))
+               (ivy-count-format (if (string= ivy-count-format "")
+                                     ivy-count-format
+                                   (format "%%-%dd " w)))
+               (prompt (format "(%s): " str)))
+          (and
+           (ivy-read (if (string= ivy-count-format "")
+                         prompt
+                       (replace-regexp-in-string "%" "%%" prompt))
+                     ;; remove 'completions-first-difference face
+                     (mapcar #'substring-no-properties comps)
+                     :predicate predicate
+                     :action #'ivy-completion-in-region-action
+                     :require-match t)
+           t))))))
+
+;;;###autoload
+(define-minor-mode ivy-mode
+  "Toggle Ivy mode on or off.
+Turn Ivy mode on if ARG is positive, off otherwise.
+Turning on Ivy mode sets `completing-read-function' to
+`ivy-completing-read'.
+
+Global bindings:
+\\{ivy-mode-map}
+
+Minibuffer bindings:
+\\{ivy-minibuffer-map}"
+  :group 'ivy
+  :global t
+  :keymap ivy-mode-map
+  :lighter " ivy"
+  (if ivy-mode
+      (progn
+        (setq completing-read-function 'ivy-completing-read)
+        (setq completion-in-region-function 'ivy-completion-in-region))
+    (setq completing-read-function 'completing-read-default)
+    (setq completion-in-region-function 'completion--in-region)))
+
+(defun ivy--preselect-index (preselect candidates)
+  "Return the index of PRESELECT in CANDIDATES."
+  (cond ((integerp preselect)
+         preselect)
+        ((cl-position preselect candidates :test #'equal))
+        ((stringp preselect)
+         (let ((re (regexp-quote preselect)))
+           (cl-position-if
+            (lambda (x)
+              (string-match re x))
+            candidates)))))
+
+;;* Implementation
+;;** Regex
+(defvar ivy--regex-hash
+  (make-hash-table :test #'equal)
+  "Store pre-computed regex.")
+
+(defun ivy--split (str)
+  "Split STR into a list by single spaces.
+The remaining spaces stick to their left.
+This allows to \"quote\" N spaces by inputting N+1 spaces."
+  (let ((len (length str))
+        start0
+        (start1 0)
+        res s
+        match-len)
+    (while (and (string-match " +" str start1)
+                (< start1 len))
+      (setq match-len (- (match-end 0) (match-beginning 0)))
+      (if (= match-len 1)
+          (progn
+            (when start0
+              (setq start1 start0)
+              (setq start0 nil))
+            (push (substring str start1 (match-beginning 0)) res)
+            (setq start1 (match-end 0)))
+        (setq str (replace-match
+                   (make-string (1- match-len) ?\ )
+                   nil nil str))
+        (setq start0 (or start0 start1))
+        (setq start1 (1- (match-end 0)))))
+    (if start0
+        (push (substring str start0) res)
+      (setq s (substring str start1))
+      (unless (= (length s) 0)
+        (push s res)))
+    (nreverse res)))
+
+(defun ivy--regex (str &optional greedy)
+  "Re-build regex pattern from STR in case it has a space.
+When GREEDY is non-nil, join words in a greedy way."
+  (let ((hashed (unless greedy
+                  (gethash str ivy--regex-hash))))
+    (if hashed
+        (prog1 (cdr hashed)
+          (setq ivy--subexps (car hashed)))
+      (when (string-match "\\([^\\]\\|^\\)\\\\$" str)
+        (setq str (substring str 0 -1)))
+      (cdr (puthash str
+                    (let ((subs (ivy--split str)))
+                      (if (= (length subs) 1)
+                          (cons
+                           (setq ivy--subexps 0)
+                           (car subs))
+                        (cons
+                         (setq ivy--subexps (length subs))
+                         (mapconcat
+                          (lambda (x)
+                            (if (string-match "\\`\\\\(.*\\\\)\\'" x)
+                                x
+                              (format "\\(%s\\)" x)))
+                          subs
+                          (if greedy
+                              ".*"
+                            ".*?")))))
+                    ivy--regex-hash)))))
+
+(defun ivy--regex-ignore-order--part (str &optional discard)
+  "Re-build regex from STR by splitting at spaces.
+Ignore the order of each group."
+  (let* ((subs (split-string str " +" t))
+         (len (length subs)))
+    (cl-case len
+      (0
+       "")
+      (t
+       (mapcar (lambda (x) (cons x (not discard)))
+               subs)))))
+
+(defun ivy--regex-ignore-order (str)
+  "Re-build regex from STR by splitting at spaces.
+Ignore the order of each group. Everything before \"!\" should
+match. Everything after \"!\" should not match."
+  (let ((parts (split-string str "!" t)))
+    (cl-case (length parts)
+      (0
+       "")
+      (1
+       (if (string= (substring str 0 1) "!")
+           (list (cons "" t)
+                 (ivy--regex-ignore-order--part (car parts) t))
+         (ivy--regex-ignore-order--part (car parts))))
+      (2
+       (append
+        (ivy--regex-ignore-order--part (car parts))
+        (ivy--regex-ignore-order--part (cadr parts) t)))
+      (t (error "Unexpected: use only one !")))))
+
+(defun ivy--regex-plus (str)
+  "Build a regex sequence from STR.
+Spaces are wild card characters, everything before \"!\" should
+match. Everything after \"!\" should not match."
+  (let ((parts (split-string str "!" t)))
+    (cl-case (length parts)
+      (0
+       "")
+      (1
+       (if (string= (substring str 0 1) "!")
+           (list (cons "" t)
+                 (list (ivy--regex (car parts))))
+         (ivy--regex (car parts))))
+      (2
+       (cons
+        (cons (ivy--regex (car parts)) t)
+        (mapcar #'list (split-string (cadr parts) " " t))))
+      (t (error "Unexpected: use only one !")))))
+
+(defun ivy--regex-fuzzy (str)
+  "Build a regex sequence from STR.
+Insert .* between each char."
+  (if (string-match "\\`\\(\\^?\\)\\(.*?\\)\\(\\$?\\)\\'" str)
+      (prog1
+          (concat (match-string 1 str)
+                  (mapconcat
+                   (lambda (x)
+                     (format "\\(%c\\)" x))
+                   (string-to-list (match-string 2 str)) ".*")
+                  (match-string 3 str))
+        (setq ivy--subexps (length (match-string 2 str))))
+    str))
+
+;;** Rest
+(defun ivy--minibuffer-setup ()
+  "Setup ivy completion in the minibuffer."
+  (set (make-local-variable 'completion-show-inline-help) nil)
+  (set (make-local-variable 'minibuffer-default-add-function)
+       (lambda ()
+         (list ivy--default)))
+  (when (display-graphic-p)
+    (setq truncate-lines t))
+  (setq-local max-mini-window-height ivy-height)
+  (add-hook 'post-command-hook #'ivy--exhibit nil t)
+  ;; show completions with empty input
+  (ivy--exhibit))
+
+(defun ivy--input ()
+  "Return the current minibuffer input."
+  ;; assume one-line minibuffer input
+  (buffer-substring-no-properties
+   (minibuffer-prompt-end)
+   (line-end-position)))
+
+(defun ivy--cleanup ()
+  "Delete the displayed completion candidates."
+  (save-excursion
+    (goto-char (minibuffer-prompt-end))
+    (delete-region (line-end-position) (point-max))))
+
+(defun ivy--insert-prompt ()
+  "Update the prompt according to `ivy--prompt'."
+  (when ivy--prompt
+    (unless (memq this-command '(ivy-done ivy-alt-done ivy-partial-or-done
+                                          counsel-find-symbol))
+      (setq ivy--prompt-extra ""))
+    (let (head tail)
+      (if (string-match "\\(.*\\): \\'" ivy--prompt)
+          (progn
+            (setq head (match-string 1 ivy--prompt))
+            (setq tail ": "))
+        (setq head (substring ivy--prompt 0 -1))
+        (setq tail " "))
+      (let ((inhibit-read-only t)
+            (std-props '(front-sticky t rear-nonsticky t field t read-only t))
+            (n-str
+             (concat
+              (if (and (bound-and-true-p minibuffer-depth-indicate-mode)
+                       (> (minibuffer-depth) 1))
+                  (format "[%d] " (minibuffer-depth))
+                "")
+              (concat
+               (if (string-match "%d.*%d" ivy-count-format)
+                   (format head
+                           (1+ ivy--index)
+                           (or (and (ivy-state-dynamic-collection ivy-last)
+                                    ivy--full-length)
+                               ivy--length))
+                 (format head
+                         (or (and (ivy-state-dynamic-collection ivy-last)
+                                  ivy--full-length)
+                             ivy--length)))
+               ivy--prompt-extra
+               tail)))
+            (d-str (if ivy--directory
+                       (abbreviate-file-name ivy--directory)
+                     "")))
+        (save-excursion
+          (goto-char (point-min))
+          (delete-region (point-min) (minibuffer-prompt-end))
+          (if (> (+ (mod (+ (length n-str) (length d-str)) (window-width))
+                    (length ivy-text))
+                 (window-width))
+              (setq n-str (concat n-str "\n" d-str))
+            (setq n-str (concat n-str d-str)))
+          (let ((regex (format "\\([^\n]\\{%d\\}\\)[^\n]" (window-width))))
+            (while (string-match regex n-str)
+              (setq n-str (replace-match (concat (match-string 1 n-str) "\n") nil t n-str 1))))
+          (set-text-properties 0 (length n-str)
+                               `(face minibuffer-prompt ,@std-props)
+                               n-str)
+          (ivy--set-match-props n-str "confirm"
+                                `(face ivy-confirm-face ,@std-props))
+          (ivy--set-match-props n-str "match required"
+                                `(face ivy-match-required-face ,@std-props))
+          (insert n-str))
+        ;; get out of the prompt area
+        (constrain-to-field nil (point-max))))))
+
+(defun ivy--set-match-props (str match props)
+  "Set STR text properties that match MATCH to PROPS."
+  (when (string-match match str)
+    (set-text-properties
+     (match-beginning 0)
+     (match-end 0)
+     props
+     str)))
+
+(defvar inhibit-message)
+
+(defun ivy--sort-maybe (collection)
+  "Sort COLLECTION if needed."
+  (let ((sort (ivy-state-sort ivy-last))
+        entry)
+    (if (null sort)
+        collection
+      (let ((sort-fn (cond ((functionp sort)
+                            sort)
+                           ((setq entry (assoc (ivy-state-collection ivy-last)
+                                               ivy-sort-functions-alist))
+                            (cdr entry))
+                           (t
+                            (cdr (assoc t ivy-sort-functions-alist))))))
+        (if (functionp sort-fn)
+            (cl-sort (copy-sequence collection) sort-fn)
+          collection)))))
+
+(defun ivy--exhibit ()
+  "Insert Ivy completions display.
+Should be run via minibuffer `post-command-hook'."
+  (when (memq 'ivy--exhibit post-command-hook)
+    (let ((inhibit-field-text-motion nil))
+      (constrain-to-field nil (point-max)))
+    (setq ivy-text (ivy--input))
+    (if (ivy-state-dynamic-collection ivy-last)
+        ;; while-no-input would cause annoying
+        ;; "Waiting for process to die...done" message interruptions
+        (let ((inhibit-message t))
+          (unless (equal ivy--old-text ivy-text)
+            (while-no-input
+              (setq ivy--all-candidates
+                    (ivy--sort-maybe
+                     (funcall (ivy-state-collection ivy-last) ivy-text)))
+              (setq ivy--old-text ivy-text)))
+          (when ivy--all-candidates
+            (ivy--insert-minibuffer
+             (ivy--format ivy--all-candidates))))
+      (cond (ivy--directory
+             (if (string-match "/\\'" ivy-text)
+                 (if (member ivy-text ivy--all-candidates)
+                     (ivy--cd (expand-file-name ivy-text ivy--directory))
+                   (when (string-match "//\\'" ivy-text)
+                     (if (and default-directory
+                              (string-match "\\`[[:alpha:]]:/" default-directory))
+                         (ivy--cd (match-string 0 default-directory))
+                       (ivy--cd "/")))
+                   (when (string-match "[[:alpha:]]:/$" ivy-text)
+                     (let ((drive-root (match-string 0 ivy-text)))
+                       (when (file-exists-p drive-root)
+                         (ivy--cd drive-root)))))
+               (if (string-match "\\`~\\'" ivy-text)
+                   (ivy--cd (expand-file-name "~/")))))
+            ((eq (ivy-state-collection ivy-last) 'internal-complete-buffer)
+             (when (or (and (string-match "\\` " ivy-text)
+                            (not (string-match "\\` " ivy--old-text)))
+                       (and (string-match "\\` " ivy--old-text)
+                            (not (string-match "\\` " ivy-text))))
+               (setq ivy--all-candidates
+                     (if (and (> (length ivy-text) 0)
+                              (eq (aref ivy-text 0)
+                                  ?\ ))
+                         (ivy--buffer-list " ")
+                       (ivy--buffer-list "" ivy-use-virtual-buffers)))
+               (setq ivy--old-re nil))))
+      (ivy--insert-minibuffer
+       (with-current-buffer (ivy-state-buffer ivy-last)
+         (ivy--format
+          (ivy--filter ivy-text ivy--all-candidates))))
+      (setq ivy--old-text ivy-text))))
+
+(defun ivy--insert-minibuffer (text)
+  "Insert TEXT into minibuffer with appropriate cleanup."
+  (let ((resize-mini-windows nil)
+        (update-fn (ivy-state-update-fn ivy-last))
+        deactivate-mark)
+    (ivy--cleanup)
+    (when update-fn
+      (funcall update-fn))
+    (ivy--insert-prompt)
+    ;; Do nothing if while-no-input was aborted.
+    (when (stringp text)
+      (let ((buffer-undo-list t))
+        (save-excursion
+          (forward-line 1)
+          (insert text))))
+    (when (display-graphic-p)
+      (ivy--resize-minibuffer-to-fit))))
+
+(defun ivy--resize-minibuffer-to-fit ()
+  "Resize the minibuffer window size to fit the text in the minibuffer."
+  (with-selected-window (minibuffer-window)
+    (if (fboundp 'window-text-pixel-size)
+        (let ((text-height (cdr (window-text-pixel-size)))
+              (body-height (window-body-height nil t)))
+          (when (> text-height body-height)
+            ;; Note: the size increment needs to be at least frame-char-height,
+            ;; otherwise resizing won't do anything.
+            (let ((delta (max (- text-height body-height) (frame-char-height))))
+              (window-resize nil delta nil t t))))
+      (let ((text-height (count-screen-lines))
+            (body-height (window-body-height)))
+        (when (> text-height body-height)
+          (window-resize nil (- text-height body-height) nil t))))))
+
+(declare-function colir-blend-face-background "ext:colir")
+
+(defun ivy--add-face (str face)
+  "Propertize STR with FACE.
+`font-lock-append-text-property' is used, since it's better than
+`propertize' or `add-face-text-property' in this case."
+  (require 'colir)
+  (condition-case nil
+      (progn
+        (colir-blend-face-background 0 (length str) face str)
+        (let ((foreground (face-foreground face)))
+          (when foreground
+            (add-face-text-property
+             0 (length str)
+             `(:foreground ,foreground)
+             nil
+             str))))
+    (error
+     (ignore-errors
+       (font-lock-append-text-property 0 (length str) 'face face str))))
+  str)
+
+(declare-function flx-make-string-cache "ext:flx")
+(declare-function flx-score "ext:flx")
+
+(defvar ivy--flx-cache nil)
+
+(eval-after-load 'flx
+  '(setq ivy--flx-cache (flx-make-string-cache)))
+
+(defun ivy-toggle-case-fold ()
+  "Toggle the case folding between nil and auto.
+In any completion session, the case folding starts in auto:
+
+- when the input is all lower case, `case-fold-search' is t
+- otherwise nil.
+
+You can toggle this to make `case-fold-search' nil regardless of input."
+  (interactive)
+  (setq ivy-case-fold-search
+        (if ivy-case-fold-search
+            nil
+          'auto))
+  ;; reset cache so that the candidate list updates
+  (setq ivy--old-re nil))
+
+(defun ivy--re-filter (re candidates)
+  "Return all RE matching CANDIDATES.
+RE is a list of cons cells, with a regexp car and a boolean cdr.
+When the cdr is t, the car must match.
+Otherwise, the car must not match."
+  (let ((re-list (if (stringp re) (list (cons re t)) re))
+        (res candidates))
+    (dolist (re re-list)
+      (setq res
+            (ignore-errors
+              (funcall
+               (if (cdr re)
+                   #'cl-remove-if-not
+                 #'cl-remove-if)
+               (let ((re-str (car re)))
+                 (lambda (x) (string-match re-str x)))
+               res))))
+    res))
+
+(defun ivy--filter (name candidates)
+  "Return all items that match NAME in CANDIDATES.
+CANDIDATES are assumed to be static."
+  (let ((re (funcall ivy--regex-function name)))
+    (if (and (equal re ivy--old-re)
+             ivy--old-cands)
+        ;; quick caching for "C-n", "C-p" etc.
+        ivy--old-cands
+      (let* ((re-str (if (listp re) (caar re) re))
+             (matcher (ivy-state-matcher ivy-last))
+             (case-fold-search
+              (and ivy-case-fold-search
+                   (string= name (downcase name))))
+             (cands (cond
+                      (matcher
+                       (funcall matcher re candidates))
+                      ((and ivy--old-re
+                            (stringp re)
+                            (stringp ivy--old-re)
+                            (not (string-match "\\\\" ivy--old-re))
+                            (not (equal ivy--old-re ""))
+                            (memq (cl-search
+                                   (if (string-match "\\\\)\\'" ivy--old-re)
+                                       (substring ivy--old-re 0 -2)
+                                     ivy--old-re)
+                                   re)
+                                  '(0 2)))
+                       (ignore-errors
+                         (cl-remove-if-not
+                          (lambda (x) (string-match re x))
+                          ivy--old-cands)))
+                      (t
+                       (ivy--re-filter re candidates)))))
+        (ivy--recompute-index name re-str cands)
+        (setq ivy--old-re
+              (if (eq ivy--regex-function 'ivy--regex-ignore-order)
+                  re
+                (if cands
+                    re-str
+                  "")))
+        (setq ivy--old-cands (ivy--sort name cands))))))
+
+(defcustom ivy-sort-matches-functions-alist '((t . nil))
+  "An alist of functions used to sort the matching candidates.
+
+This is different from `ivy-sort-functions-alist', which is used
+to sort the whole collection only once.  The functions taken from
+here are instead used on each input change, but they are used
+only on already matching candidates, not on all of them.
+
+The alist KEY is a collection function or t to match previously
+not matched collection functions.
+
+The alist VAL is a sorting function with the signature of
+`ivy--prefix-sort'.")
+
+(defun ivy--sort-files-by-date (_name candidates)
+  "Re-soft CANDIDATES according to file modification date."
+  (let ((default-directory ivy--directory))
+    (cl-sort (copy-sequence candidates)
+             (lambda (f1 f2)
+               (time-less-p
+                (nth 5 (file-attributes f2))
+                (nth 5 (file-attributes f1)))))))
+
+(defun ivy--sort (name candidates)
+  "Re-sort CANDIDATES by NAME.
+All CANDIDATES are assumed to match NAME."
+  (let ((key (or (ivy-state-caller ivy-last)
+                 (when (functionp (ivy-state-collection ivy-last))
+                   (ivy-state-collection ivy-last))))
+        fun)
+    (cond ((and (require 'flx nil 'noerror)
+                (eq ivy--regex-function 'ivy--regex-fuzzy))
+           (ivy--flx-sort name candidates))
+          ((setq fun (cdr (or (assoc key ivy-sort-matches-functions-alist)
+                              (assoc t ivy-sort-matches-functions-alist))))
+           (funcall fun name candidates))
+          (t
+           candidates))))
+
+(defun ivy--prefix-sort (name candidates)
+  "Re-sort CANDIDATES.
+Prefix matches to NAME are put ahead of the list."
+  (if (or (string-match "^\\^" name) (string= name ""))
+      candidates
+    (let ((re-prefix (concat "^" (funcall ivy--regex-function name)))
+          res-prefix
+          res-noprefix)
+      (dolist (s candidates)
+        (if (string-match re-prefix s)
+            (push s res-prefix)
+          (push s res-noprefix)))
+      (nconc
+       (nreverse res-prefix)
+       (nreverse res-noprefix)))))
+
+(defun ivy--recompute-index (name re-str cands)
+  (let* ((caller (ivy-state-caller ivy-last))
+         (func (or (and caller (cdr (assoc caller ivy-index-functions-alist)))
+                   (cdr (assoc t ivy-index-functions-alist))
+                   #'ivy-recompute-index-zero)))
+    (unless (eq this-command 'ivy-resume)
+      (setq ivy--index
+            (or
+             (cl-position (if (and (> (length name) 0)
+                                   (eq ?^ (aref name 0)))
+                              (substring name 1)
+                            name) cands
+                            :test #'equal)
+             (and ivy--directory
+                  (cl-position
+                   (concat re-str "/") cands
+                   :test #'equal))
+             (and (not (string= name ""))
+                  (not (and (require 'flx nil 'noerror)
+                            (eq ivy--regex-function 'ivy--regex-fuzzy)
+                            (< (length cands) 200)))
+
+                  (cl-position (nth ivy--index ivy--old-cands)
+                               cands))
+             (funcall func re-str cands))))
+    (when (and (or (string= name "")
+                   (string= name "^"))
+               (not (equal ivy--old-re "")))
+      (setq ivy--index
+            (or (ivy--preselect-index
+                 (ivy-state-preselect ivy-last)
+                 cands)
+                ivy--index)))))
+
+(defun ivy-recompute-index-swiper (_re-str cands)
+  (let ((tail (nthcdr ivy--index ivy--old-cands))
+        idx)
+    (if (and tail ivy--old-cands (not (equal "^" ivy--old-re)))
+        (progn
+          (while (and tail (null idx))
+            ;; Compare with eq to handle equal duplicates in cands
+            (setq idx (cl-position (pop tail) cands)))
+          (or idx 0))
+      (if ivy--old-cands
+          ivy--index
+        ;; already in ivy-state-buffer
+        (let ((n (line-number-at-pos))
+              (res 0)
+              (i 0))
+          (dolist (c cands)
+            (when (eq n (read (get-text-property 0 'display c)))
+              (setq res i))
+            (cl-incf i))
+          res)))))
+
+(defun ivy-recompute-index-swiper-async (_re-str cands)
+  (let ((tail (nthcdr ivy--index ivy--old-cands))
+        idx)
+    (if (and tail ivy--old-cands (not (equal "^" ivy--old-re)))
+        (progn
+          (while (and tail (null idx))
+            ;; Compare with `equal', since the collection is re-created
+            ;; each time with `split-string'
+            (setq idx (cl-position (pop tail) cands :test #'equal)))
+          (or idx 0))
+      ivy--index)))
+
+(defun ivy-recompute-index-zero (_re-str _cands)
+  0)
+
+(defcustom ivy-minibuffer-faces
+  '(ivy-minibuffer-match-face-1
+    ivy-minibuffer-match-face-2
+    ivy-minibuffer-match-face-3
+    ivy-minibuffer-match-face-4)
+  "List of `ivy' faces for minibuffer group matches.")
+
+(defvar ivy-flx-limit 200
+  "Used to conditionally turn off flx sorting.
+When the amount of matching candidates is larger than this
+number, no sorting will be done.")
+
+(defun ivy--flx-sort (name cands)
+  "Sort according to closeness to string NAME the string list CANDS."
+  (condition-case nil
+      (if (and cands
+               (< (length cands) ivy-flx-limit))
+          (let* ((flx-name (if (string-match "^\\^" name)
+                               (substring name 1)
+                             name))
+                 (cands-with-score
+                  (delq nil
+                        (mapcar
+                         (lambda (x)
+                           (let ((score (flx-score x flx-name ivy--flx-cache)))
+                             (and score
+                                  (cons score x))))
+                         cands))))
+            (if cands-with-score
+                (mapcar (lambda (x)
+                          (let ((str (copy-sequence (cdr x)))
+                                (i 0)
+                                (last-j -2))
+                            (dolist (j (cdar x))
+                              (unless (eq j (1+ last-j))
+                                (cl-incf i))
+                              (setq last-j j)
+                              (ivy-add-face-text-property
+                               j (1+ j)
+                               (nth (1+ (mod (+ i 2) (1- (length ivy-minibuffer-faces))))
+                                    ivy-minibuffer-faces)
+                               str))
+                            str))
+                        (sort cands-with-score
+                              (lambda (x y)
+                                (> (caar x) (caar y)))))
+              cands))
+        cands)
+    (error
+     cands)))
+
+(defcustom ivy-format-function 'ivy-format-function-default
+  "Function to transform the list of candidates into a string.
+This string is inserted into the minibuffer."
+  :type '(choice
+          (const :tag "Default" ivy-format-function-default)
+          (const :tag "Arrow prefix" ivy-format-function-arrow)
+          (const :tag "Full line" ivy-format-function-line)))
+
+(defun ivy--truncate-string (str width)
+  "Truncate STR to WIDTH."
+  (if (> (string-width str) width)
+      (concat (substring str 0 (min (- width 3)
+                                    (- (length str) 3))) "...")
+    str))
+
+(defun ivy--format-function-generic (selected-fn other-fn cand-pairs separator)
+  "Transform CAND-PAIRS into a string for minibuffer.
+SELECTED-FN and OTHER-FN each take two string arguments.
+SEPARATOR is used to join the candidates."
+  (let ((i -1))
+    (mapconcat
+     (lambda (pair)
+       (let ((str (car pair))
+             (extra (cdr pair))
+             (curr (eq (cl-incf i) ivy--index)))
+         (if curr
+             (funcall selected-fn str extra)
+           (funcall other-fn str extra))))
+     cand-pairs
+     separator)))
+
+(defun ivy-format-function-default (cand-pairs)
+  "Transform CAND-PAIRS into a string for minibuffer."
+  (ivy--format-function-generic
+   (lambda (str extra)
+     (concat (ivy--add-face str 'ivy-current-match) extra))
+   #'concat
+   cand-pairs
+   "\n"))
+
+(defun ivy-format-function-arrow (cand-pairs)
+  "Transform CAND-PAIRS into a string for minibuffer."
+  (ivy--format-function-generic
+   (lambda (str extra)
+     (concat "> " (ivy--add-face str 'ivy-current-match) extra))
+   (lambda (str extra)
+     (concat "  " str extra))
+   cand-pairs
+   "\n"))
+
+(defun ivy-format-function-line (cand-pairs)
+  "Transform CAND-PAIRS into a string for minibuffer."
+  (ivy--format-function-generic
+   (lambda (str extra)
+     (ivy--add-face (concat str extra "\n") 'ivy-current-match))
+   (lambda (str extra)
+     (concat str extra "\n"))
+   cand-pairs
+   ""))
+
+(defun ivy-add-face-text-property (start end face str)
+  (if (fboundp 'add-face-text-property)
+      (add-face-text-property
+       start end face nil str)
+    (font-lock-append-text-property
+     start end 'face face str)))
+
+(defun ivy--format-minibuffer-line (str)
+  (let ((start 0)
+        (str (copy-sequence str)))
+    (cond ((eq ivy--regex-function 'ivy--regex-ignore-order)
+           (when (consp ivy--old-re)
+             (let ((i 1))
+               (dolist (re ivy--old-re)
+                 (when (string-match (car re) str)
+                   (ivy-add-face-text-property
+                    (match-beginning 0) (match-end 0)
+                    (nth (1+ (mod (+ i 2) (1- (length ivy-minibuffer-faces))))
+                         ivy-minibuffer-faces)
+                    str))
+                 (cl-incf i)))))
+          ((and (eq ivy-display-style 'fancy)
+                (not (eq ivy--regex-function 'ivy--regex-fuzzy)))
+           (unless ivy--old-re
+             (setq ivy--old-re (funcall ivy--regex-function ivy-text)))
+           (while (and (string-match ivy--old-re str start)
+                       (> (- (match-end 0) (match-beginning 0)) 0))
+             (setq start (match-end 0))
+             (let ((i 0))
+               (while (<= i ivy--subexps)
+                 (let ((face
+                        (cond ((zerop ivy--subexps)
+                               (cadr ivy-minibuffer-faces))
+                              ((zerop i)
+                               (car ivy-minibuffer-faces))
+                              (t
+                               (nth (1+ (mod (+ i 2) (1- (length ivy-minibuffer-faces))))
+                                    ivy-minibuffer-faces)))))
+                   (ivy-add-face-text-property
+                    (match-beginning i) (match-end i)
+                    face str))
+                 (cl-incf i))))))
+    str))
+
+(defun ivy--format (cands)
+  "Return a string for CANDS suitable for display in the minibuffer.
+CANDS is a list of strings."
+  (setq ivy--length (length cands))
+  (when (>= ivy--index ivy--length)
+    (setq ivy--index (max (1- ivy--length) 0)))
+  (if (null cands)
+      (setq ivy--current "")
+    (let* ((half-height (/ ivy-height 2))
+           (start (max 0 (- ivy--index half-height)))
+           (end (min (+ start (1- ivy-height)) ivy--length))
+           (start (max 0 (min start (- end (1- ivy-height)))))
+           (cands (cl-subseq cands start end))
+           (index (- ivy--index start)))
+      (cond (ivy--directory
+             (setq cands (mapcar (lambda (x)
+                                   (if (string-match-p "/\\'" x)
+                                       (propertize x 'face 'ivy-subdir)
+                                     x))
+                                 cands)))
+            ((eq (ivy-state-collection ivy-last) 'internal-complete-buffer)
+             (setq cands (mapcar (lambda (x)
+                                   (let ((b (get-buffer x)))
+                                     (if (and b
+                                              (buffer-file-name b)
+                                              (buffer-modified-p b))
+                                         (propertize x 'face 'ivy-modified-buffer)
+                                       x)))
+                                 cands))))
+      (setq ivy--current (copy-sequence (nth index cands)))
+      (let* ((ivy--index index)
+             (cand-pairs (mapcar
+                          (lambda (cand)
+                            (cons (ivy--format-minibuffer-line cand) nil)) cands))
+             (res (concat "\n" (funcall ivy-format-function cand-pairs))))
+        (put-text-property 0 (length res) 'read-only nil res)
+        res))))
+
+(defvar ivy--virtual-buffers nil
+  "Store the virtual buffers alist.")
+
+(defvar recentf-list)
+
+(defcustom ivy-virtual-abbreviate 'name
+  "The mode of abbreviation for virtual buffer names."
+  :type '(choice
+          (const :tag "Only name" name)
+          (const :tag "Full path" full)
+          ;; eventually, uniquify
+          ))
+
+(defun ivy--virtual-buffers ()
+  "Adapted from `ido-add-virtual-buffers-to-list'."
+  (unless recentf-mode
+    (recentf-mode 1))
+  (let ((bookmarks (and (boundp 'bookmark-alist)
+                        bookmark-alist))
+        virtual-buffers name)
+    (dolist (head (append
+                   recentf-list
+                   (delete "   - no file -"
+                           (delq nil (mapcar (lambda (bookmark)
+                                               (cdr (assoc 'filename bookmark)))
+                                             bookmarks)))))
+      (setq name
+            (if (eq ivy-virtual-abbreviate 'name)
+                (file-name-nondirectory head)
+              (expand-file-name head)))
+      (when (equal name "")
+        (setq name (file-name-nondirectory (directory-file-name head))))
+      (when (equal name "")
+        (setq name head))
+      (and (not (equal name ""))
+           (null (get-file-buffer head))
+           (not (assoc name virtual-buffers))
+           (push (cons name head) virtual-buffers)))
+    (when virtual-buffers
+      (dolist (comp virtual-buffers)
+        (put-text-property 0 (length (car comp))
+                           'face 'ivy-virtual
+                           (car comp)))
+      (setq ivy--virtual-buffers (nreverse virtual-buffers))
+      (mapcar #'car ivy--virtual-buffers))))
+
+(defun ivy--buffer-list (str &optional virtual)
+  "Return the buffers that match STR.
+When VIRTUAL is non-nil, add virtual buffers."
+  (delete-dups
+   (append
+    (mapcar
+     (lambda (x)
+       (if (with-current-buffer x
+             (file-remote-p
+              (abbreviate-file-name default-directory)))
+           (propertize x 'face 'ivy-remote)
+         x))
+     (all-completions str 'internal-complete-buffer))
+    (and virtual
+         (ivy--virtual-buffers)))))
+
+(defun ivy--switch-buffer-action (buffer)
+  "Switch to BUFFER.
+BUFFER may be a string or nil."
+  (with-ivy-window
+    (if (zerop (length buffer))
+        (switch-to-buffer
+         ivy-text nil 'force-same-window)
+      (let ((virtual (assoc buffer ivy--virtual-buffers)))
+        (if (and virtual
+                 (not (get-buffer buffer)))
+            (find-file (cdr virtual))
+          (switch-to-buffer
+           buffer nil 'force-same-window))))))
+
+(defun ivy--switch-buffer-other-window-action (buffer)
+  "Switch to BUFFER in other window.
+BUFFER may be a string or nil."
+  (if (zerop (length buffer))
+      (switch-to-buffer-other-window ivy-text)
+    (let ((virtual (assoc buffer ivy--virtual-buffers)))
+      (if (and virtual
+               (not (get-buffer buffer)))
+          (find-file-other-window (cdr virtual))
+        (switch-to-buffer-other-window buffer)))))
+
+(defun ivy--rename-buffer-action (buffer)
+  "Rename BUFFER."
+  (let ((new-name (read-string "Rename buffer (to new name): ")))
+    (with-current-buffer buffer
+      (rename-buffer new-name))))
+
+(defvar ivy-switch-buffer-map (make-sparse-keymap))
+
+(ivy-set-actions
+ 'ivy-switch-buffer
+ '(("k"
+    (lambda (x)
+      (kill-buffer x)
+      (ivy--reset-state ivy-last))
+    "kill")
+   ("j"
+    ivy--switch-buffer-other-window-action
+    "other")
+   ("r"
+    ivy--rename-buffer-action
+    "rename")))
+
+;;;###autoload
+(defun ivy-switch-buffer ()
+  "Switch to another buffer."
+  (interactive)
+  (if (not ivy-mode)
+      (call-interactively 'switch-to-buffer)
+    (let ((this-command 'ivy-switch-buffer))
+      (ivy-read "Switch to buffer: " 'internal-complete-buffer
+                :preselect (buffer-name (other-buffer (current-buffer)))
+                :action #'ivy--switch-buffer-action
+                :keymap ivy-switch-buffer-map))))
+
+;;;###autoload
+(defun ivy-recentf ()
+  "Find a file on `recentf-list'."
+  (interactive)
+  (ivy-read "Recentf: " recentf-list
+            :action
+            (lambda (f)
+              (with-ivy-window
+                (find-file f)))))
+
+(defun ivy-yank-word ()
+  "Pull next word from buffer into search string."
+  (interactive)
+  (let (amend)
+    (with-ivy-window
+      (let ((pt (point))
+            (le (line-end-position)))
+        (forward-word 1)
+        (if (> (point) le)
+            (goto-char pt)
+          (setq amend (buffer-substring-no-properties pt (point))))))
+    (when amend
+      (insert (replace-regexp-in-string "  +" " " amend)))))
+
+(defun ivy-kill-ring-save ()
+  "Store the current candidates into the kill ring.
+If the region is active, forward to `kill-ring-save' instead."
+  (interactive)
+  (if (region-active-p)
+      (call-interactively 'kill-ring-save)
+    (kill-new
+     (mapconcat
+      #'identity
+      ivy--old-cands
+      "\n"))))
+
+(defun ivy-insert-current ()
+  "Make the current candidate into current input.
+Don't finish completion."
+  (interactive)
+  (delete-minibuffer-contents)
+  (if (and ivy--directory
+           (string-match "/$" ivy--current))
+      (insert (substring ivy--current 0 -1))
+    (insert ivy--current)))
+
+(defun ivy-toggle-fuzzy ()
+  "Toggle the re builder between `ivy--regex-fuzzy' and `ivy--regex-plus'."
+  (interactive)
+  (setq ivy--old-re nil)
+  (if (eq ivy--regex-function 'ivy--regex-fuzzy)
+      (setq ivy--regex-function 'ivy--regex-plus)
+    (setq ivy--regex-function 'ivy--regex-fuzzy)))
+
+(defun ivy-reverse-i-search ()
+  "Enter a recursive `ivy-read' session using the current history.
+The selected history element will be inserted into the minibuffer."
+  (interactive)
+  (let ((enable-recursive-minibuffers t)
+        (history (symbol-value (ivy-state-history ivy-last)))
+        (old-last ivy-last)
+        (ivy-recursive-restore nil))
+    (ivy-read "Reverse-i-search: "
+              history
+              :action (lambda (x)
+                        (ivy--reset-state
+                         (setq ivy-last old-last))
+                        (delete-minibuffer-contents)
+                        (insert (substring-no-properties x))
+                        (ivy--cd-maybe)))))
+
+(defun ivy-restrict-to-matches ()
+  "Restrict candidates to current matches and erase input."
+  (interactive)
+  (delete-minibuffer-contents)
+  (setq ivy--all-candidates
+        (ivy--filter ivy-text ivy--all-candidates)))
+
+;;* Occur
+(defvar-local ivy-occur-last nil
+  "Buffer-local value of `ivy-last'.
+Can't re-use `ivy-last' because using e.g. `swiper' in the same
+buffer would modify `ivy-last'.")
+
+(defvar ivy-occur-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [mouse-1] 'ivy-occur-click)
+    (define-key map (kbd "RET") 'ivy-occur-press)
+    (define-key map (kbd "j") 'next-line)
+    (define-key map (kbd "k") 'previous-line)
+    (define-key map (kbd "h") 'backward-char)
+    (define-key map (kbd "l") 'forward-char)
+    (define-key map (kbd "g") 'ivy-occur-press)
+    (define-key map (kbd "a") 'ivy-occur-read-action)
+    (define-key map (kbd "o") 'ivy-occur-dispatch)
+    (define-key map (kbd "q") 'quit-window)
+    map)
+  "Keymap for Ivy Occur mode.")
+
+(define-derived-mode ivy-occur-mode fundamental-mode "Ivy-Occur"
+  "Major mode for output from \\[ivy-occur].
+
+\\{ivy-occur-mode-map}")
+
+(defvar ivy-occur-grep-mode-map
+  (let ((map (copy-keymap ivy-occur-mode-map)))
+    (define-key map (kbd "C-x C-q") 'ivy-wgrep-change-to-wgrep-mode)
+    map)
+  "Keymap for Ivy Occur Grep mode.")
+
+(define-derived-mode ivy-occur-grep-mode grep-mode "Ivy-Occur"
+  "Major mode for output from \\[ivy-occur].
+
+\\{ivy-occur-grep-mode-map}")
+
+(defvar counsel-git-grep-cmd)
+
+(defun ivy-occur ()
+  "Stop completion and put the current matches into a new buffer.
+
+The new buffer remembers current action(s).
+
+While in the *ivy-occur* buffer, selecting a candidate with RET or
+a mouse click will call the appropriate action for that candidate.
+
+There is no limit on the number of *ivy-occur* buffers."
+  (interactive)
+  (let ((buffer
+         (generate-new-buffer
+          (format "*ivy-occur%s \"%s\"*"
+                  (let (caller)
+                    (if (setq caller (ivy-state-caller ivy-last))
+                        (concat " " (prin1-to-string caller))
+                      ""))
+                  ivy-text)))
+        (do-grep (eq (ivy-state-caller ivy-last) 'counsel-git-grep)))
+    (with-current-buffer buffer
+      (if do-grep
+          (progn
+            (setq ivy--old-cands
+                  (split-string
+                   (shell-command-to-string
+                    (format counsel-git-grep-cmd
+                            (if (stringp ivy--old-re)
+                                ivy--old-re
+                              (caar ivy--old-re))))
+                   "\n"
+                   t))
+            (ivy-occur-grep-mode))
+        (ivy-occur-mode))
+      (setf (ivy-state-text ivy-last) ivy-text)
+      (setq ivy-occur-last ivy-last)
+      (setq-local ivy--directory ivy--directory)
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (when do-grep
+          ;; Need precise number of header lines for `wgrep' to work.
+          (insert (format "-*- mode:grep; default-directory: %S -*-\n\n\n"
+                          default-directory)))
+        (insert (format "%d candidates:\n" (length ivy--old-cands)))
+        (dolist (cand ivy--old-cands)
+          (let ((str (if do-grep
+                         (concat "./" cand)
+                       (concat "    " cand))))
+            (add-text-properties
+             0 (length str)
+             `(mouse-face
+               highlight
+               help-echo "mouse-1: call ivy-action")
+             str)
+            (insert str "\n")))))
+    (ivy-exit-with-action
+     `(lambda (_) (pop-to-buffer ,buffer)))))
+
+(declare-function wgrep-change-to-wgrep-mode "ext:wgrep")
+
+(defun ivy-wgrep-change-to-wgrep-mode ()
+  "Forward to `wgrep-change-to-wgrep-mode'."
+  (interactive)
+  (if (require 'wgrep nil 'noerror)
+      (wgrep-change-to-wgrep-mode)
+    (error "Package wgrep isn't installed")))
+
+(defun ivy-occur-read-action ()
+  "Select one of the available actions as the current one."
+  (interactive)
+  (let ((ivy-last ivy-occur-last))
+    (ivy-read-action)))
+
+(defun ivy-occur-dispatch ()
+  "Call one of the available actions on the current item."
+  (interactive)
+  (let* ((state-action (ivy-state-action ivy-occur-last))
+         (actions (if (symbolp state-action)
+                      state-action
+                    (copy-sequence state-action))))
+    (unwind-protect
+         (progn
+           (ivy-occur-read-action)
+           (ivy-occur-press))
+      (setf (ivy-state-action ivy-occur-last) actions))))
+
+(defun ivy-occur-click (event)
+  "Execute action for the current candidate.
+EVENT gives the mouse position."
+  (interactive "e")
+  (let ((window (posn-window (event-end event)))
+        (pos (posn-point (event-end event))))
+    (with-current-buffer (window-buffer window)
+      (goto-char pos)
+      (ivy-occur-press))))
+
+(declare-function swiper--cleanup "swiper")
+(declare-function swiper--add-overlays "swiper")
+
+(defun ivy-occur-press ()
+  "Execute action for the current candidate."
+  (interactive)
+  (require 'pulse)
+  (when (save-excursion
+          (beginning-of-line)
+          (looking-at "\\(?:./\\|    \\)\\(.*\\)$"))
+    (let* ((ivy-last ivy-occur-last)
+           (ivy-text (ivy-state-text ivy-last))
+           (str (buffer-substring
+                 (match-beginning 1)
+                 (match-end 1)))
+           (coll (ivy-state-collection ivy-last))
+           (action (ivy--get-action ivy-last))
+           (ivy-exit 'done))
+      (with-ivy-window
+        (funcall action
+                 (if (and (consp coll)
+                          (consp (car coll)))
+                     (cdr (assoc str coll))
+                   str))
+        (if (memq (ivy-state-caller ivy-last)
+                  '(swiper counsel-git-grep))
+            (with-current-buffer (window-buffer (selected-window))
+              (swiper--cleanup)
+              (swiper--add-overlays
+               (ivy--regex ivy-text)
+               (line-beginning-position)
+               (line-end-position)
+               (selected-window))
+              (run-at-time 0.5 nil 'swiper--cleanup))
+          (pulse-momentary-highlight-one-line (point)))))))
+
+(provide 'ivy)
+
+;;; ivy.el ends here
diff --git a/emacs.d/elpa/swiper-20160115.800/ivy.info b/emacs.d/elpa/swiper-20160115.800/ivy.info
new file mode 100644
index 0000000..85e3b66
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/ivy.info
@@ -0,0 +1,654 @@
+This is ivy.info, produced by makeinfo version 5.2 from ivy.texi.
+
+Ivy manual, version 0.7.0
+
+   Ivy is an interactive interface for completion in Emacs.  Emacs uses
+completion mechanism in a variety of contexts: code, menus, commands,
+variables, functions, etc.  Completion entails listing, sorting,
+filtering, previewing, and applying actions on selected items.  When
+active, ‘ivy-mode’ completes the selection process by narrowing
+available choices while previewing in the minibuffer.  Selecting the
+final candidate is either through simple keyboard character inputs or
+through powerful regular expressions.
+
+   Copyright © 2015 Free Software Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.3 or any later version published by the Free Software
+     Foundation; with no Invariant Sections, with the Front-Cover Texts
+     being “A GNU Manual,” and with the Back-Cover Texts as in (a)
+     below.  A copy of the license is included in the section entitled
+     “GNU Free Documentation License.”
+
+     (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
+     modify this GNU manual.”
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Ivy: (ivy).           Using Ivy for completion.
+END-INFO-DIR-ENTRY
+
+
+File: ivy.info,  Node: Top,  Next: Introduction,  Up: (dir)
+
+Ivy User Manual
+***************
+
+Ivy manual, version 0.7.0
+
+   Ivy is an interactive interface for completion in Emacs.  Emacs uses
+completion mechanism in a variety of contexts: code, menus, commands,
+variables, functions, etc.  Completion entails listing, sorting,
+filtering, previewing, and applying actions on selected items.  When
+active, ‘ivy-mode’ completes the selection process by narrowing
+available choices while previewing in the minibuffer.  Selecting the
+final candidate is either through simple keyboard character inputs or
+through powerful regular expressions.
+
+   Copyright © 2015 Free Software Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.3 or any later version published by the Free Software
+     Foundation; with no Invariant Sections, with the Front-Cover Texts
+     being “A GNU Manual,” and with the Back-Cover Texts as in (a)
+     below.  A copy of the license is included in the section entitled
+     “GNU Free Documentation License.”
+
+     (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
+     modify this GNU manual.”
+
+* Menu:
+
+* Introduction::
+* Installation::
+* Getting started::
+* Key bindings::
+* Completion styles::
+* Variable Index::
+
+— The Detailed Node Listing —
+
+Installation
+
+* Installing from Emacs Package Manager::
+* Installing from the Git repository::
+
+Getting started
+
+* Basic customization::
+
+Key bindings
+
+* Global key bindings::
+* Minibuffer key bindings::
+
+Minibuffer key bindings
+
+* Key bindings for navigation::
+* Key bindings for single selection, action, then exit minibuffer: Key bindings for single selection action then exit minibuffer.
+* Key bindings for multiple selections and actions, keep minibuffer open: Key bindings for multiple selections and actions keep minibuffer open.
+* Key bindings that alter minibuffer input::
+* Other key bindings::
+* Hydra in the minibuffer::
+* Saving the current completion session to a buffer::
+Completion styles
+
+* ivy--regex-plus::
+* ivy--regex-ignore-order::
+* ivy--regex-fuzzy::
+
+
+File: ivy.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
+
+1 Introduction
+**************
+
+Ivy is for quick and easy selection from a list.  When Emacs prompts for
+a string from a list of several possible choices, Ivy springs into
+action to assist in narrowing and picking the right string from a vast
+number of choices.
+
+   Ivy strives for minimalism, simplicity, customizability and
+discoverability.
+
+Minimalism
+..........
+
+Uncluttered minibuffer is minimalism.  Ivy shows the completion
+defaults, the number of matches, and 10 candidate matches below the
+input line.  Customize ‘ivy-length’ to adjust the number of candidate
+matches displayed in the minibuffer.
+
+Simplicity
+..........
+
+Simplicity is about Ivy’s behavior in the minibuffer.  It is also about
+the code interface to extend Ivy’s functionality.  The minibuffer area
+behaves as close to ‘fundamental-mode’ as possible.  ‘SPC’ inserts a
+space, for example, instead of being bound to the more complex
+‘minibuffer-complete-word’.  Ivy’s code uses easy-to-examine global
+variables; avoids needless complications with branch-introducing custom
+macros.
+
+Customizability
+...............
+
+Customizability is about being able to use different methods and
+interfaces of completion to tailor the selection process.  For example,
+adding a custom display function that points to a selected candidate
+with ‘->’, instead of highlighting the selected candidate with the
+‘ivy-current-match’ face.  Or take the customization of actions, say
+after the candidate function is selected.  ‘RET’ uses
+‘counsel-describe-function’ to describe the function, whereas ‘M-o d’
+jumps to that function’s definition in the code.  The ‘M-o’ prefix can
+be uniformly used with characters like ‘d’ to group similar actions.
+
+Discoverability
+...............
+
+Ivy displays easily discoverable commands through the hydra facility.
+‘C-o’ in the minibuffer displays a hydra menu.  It opens up within an
+expanded minibuffer area.  Each menu item comes with short documentation
+strings and highlighted one-key completions.  So discovering even seldom
+used keys is simply a matter of ‘C-o’ in the minibuffer while in the
+midst of the Ivy interaction.  This discoverability minimizes exiting
+Ivy interface for documentation look-ups.
+
+
+File: ivy.info,  Node: Installation,  Next: Getting started,  Prev: Introduction,  Up: Top
+
+2 Installation
+**************
+
+Install Ivy automatically through Emacs’s package manager, or manually
+from Ivy’s development repository.
+* Menu:
+
+* Installing from Emacs Package Manager::
+* Installing from the Git repository::
+
+
+File: ivy.info,  Node: Installing from Emacs Package Manager,  Next: Installing from the Git repository,  Up: Installation
+
+2.1 Installing from Emacs Package Manager
+=========================================
+
+‘M-x’ ‘package-install’ ‘RET’ ‘swiper’ ‘RET’
+
+   Ivy is installed as part of ‘swiper’ package.  ‘swiper’ is available
+from two different package archives, GNU ELPA and MELPA. For the latest
+stable version, use the GNU ELPA archives using the above M-x command.
+
+   For current hourly builds, use the MELPA archives.  See the code
+below for adding MELPA to the list of package archives:
+
+     (require 'package)
+     (add-to-list 'package-archives
+                  '("melpa" . "http://melpa.org/packages/"))
+
+   After this do ‘M-x’ ‘package-refresh-contents’ ‘RET’, followed by
+‘M-x’ ‘package-install’ ‘RET’ ‘swiper’ ‘RET’.
+
+   For package manager details, see *note (emacs)Packages::.
+
+
+File: ivy.info,  Node: Installing from the Git repository,  Prev: Installing from Emacs Package Manager,  Up: Installation
+
+2.2 Installing from the Git repository
+======================================
+
+Why install from Git?
+
+   • No need to wait for MELPA’s hourly builds
+   • Easy to revert to previous versions
+   • Contribute to Ivy’s development; send patches; pull requests
+
+   *Configuration steps*
+
+   First clone the Swiper repository:
+
+     cd ~/git && git clone https://github.com/abo-abo/swiper
+     cd swiper && make compile
+
+   Then add this to Emacs init:
+
+     (add-to-list 'load-path "~/git/swiper/")
+     (require 'ivy)
+
+   To update the code:
+
+     git pull
+     make
+
+
+File: ivy.info,  Node: Getting started,  Next: Key bindings,  Prev: Installation,  Up: Top
+
+3 Getting started
+*****************
+
+First enable Ivy completion everywhere:
+
+     (ivy-mode 1)
+
+   Note: ‘ivy-mode’ can be toggled on and off with ‘M-x’ ‘ivy-mode’.
+* Menu:
+
+* Basic customization::
+
+
+File: ivy.info,  Node: Basic customization,  Up: Getting started
+
+3.1 Basic customization
+=======================
+
+Here are some basic settings particularly useful for new Ivy users:
+
+     (setq ivy-use-virtual-buffers t)
+     (setq ivy-height 10)
+     (setq ivy-display-style 'fancy)
+     (setq ivy-count-format "(%d/%d) ")
+
+   For additional customizations, refer to ‘M-x describe-variable’
+documentation.
+
+
+File: ivy.info,  Node: Key bindings,  Next: Completion styles,  Prev: Getting started,  Up: Top
+
+4 Key bindings
+**************
+
+* Menu:
+
+* Global key bindings::
+* Minibuffer key bindings::
+
+
+File: ivy.info,  Node: Global key bindings,  Next: Minibuffer key bindings,  Up: Key bindings
+
+4.1 Global key bindings
+=======================
+
+Recommended key bindings are:
+
+Ivy-based interface to standard commands
+........................................
+
+     (global-set-key (kbd "C-s") 'swiper)
+     (global-set-key (kbd "M-x") 'counsel-M-x)
+     (global-set-key (kbd "C-x C-f") 'counsel-find-file)
+     (global-set-key (kbd "<f1> f") 'counsel-describe-function)
+     (global-set-key (kbd "<f1> v") 'counsel-describe-variable)
+     (global-set-key (kbd "<f1> l") 'counsel-load-library)
+     (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
+     (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
+
+Ivy-based interface to shell and system tools
+.............................................
+
+     (global-set-key (kbd "C-c g") 'counsel-git)
+     (global-set-key (kbd "C-c j") 'counsel-git-grep)
+     (global-set-key (kbd "C-c k") 'counsel-ag)
+     (global-set-key (kbd "C-x l") 'counsel-locate)
+     (global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
+
+Ivy-resume and other commands
+.............................
+
+‘ivy-resume’ resumes the last Ivy-based completion.
+
+     (global-set-key (kbd "C-c C-r") 'ivy-resume)
+
+
+File: ivy.info,  Node: Minibuffer key bindings,  Prev: Global key bindings,  Up: Key bindings
+
+4.2 Minibuffer key bindings
+===========================
+
+Ivy includes several minibuffer bindings, which are defined in the
+‘ivy-minibuffer-map’ keymap variable.  The most frequently used ones are
+described here.
+
+   ‘swiper’ or ‘counsel-M-x’ add more through the ‘keymap’ argument to
+‘ivy-read’.  These keys, also active in the minibuffer, are described
+under their respective commands.
+* Menu:
+
+* Key bindings for navigation::
+* Key bindings for single selection, action, then exit minibuffer: Key bindings for single selection action then exit minibuffer.
+* Key bindings for multiple selections and actions, keep minibuffer open: Key bindings for multiple selections and actions keep minibuffer open.
+* Key bindings that alter minibuffer input::
+* Other key bindings::
+* Hydra in the minibuffer::
+* Saving the current completion session to a buffer::
+
+
+File: ivy.info,  Node: Key bindings for navigation,  Next: Key bindings for single selection action then exit minibuffer,  Up: Minibuffer key bindings
+
+4.2.1 Key bindings for navigation
+---------------------------------
+
+   • ‘C-n’ (‘ivy-next-line’) selects the next candidate
+   • ‘C-p’ (‘ivy-previous-line’) selects the previous candidate
+   • ‘M-<’ (‘ivy-beginning-of-buffer’) selects the first candidate
+   • ‘M->’ (‘ivy-end-of-buffer’) selects the last candidate
+   • ‘C-v’ (‘ivy-scroll-up-command’) scrolls up by ‘ivy-height’ lines
+   • ‘M-v’ (‘ivy-scroll-down-command’) scrolls down by ‘ivy-height’
+     lines
+
+ -- User Option: ivy-wrap
+     This user option allows to get the wrap-around behavior for ‘C-n’
+     and ‘C-p’.  When set to ‘t’, ‘ivy-next-line’ and
+     ‘ivy-previous-line’ will cycle past the last and the first
+     candidates respectively.
+
+     This behavior is off by default.
+
+ -- User Option: ivy-height
+     Use this variable to adjust the minibuffer height, and therefore
+     the scroll size for ‘C-v’ and ‘M-v’.
+
+
+File: ivy.info,  Node: Key bindings for single selection action then exit minibuffer,  Next: Key bindings for multiple selections and actions keep minibuffer open,  Prev: Key bindings for navigation,  Up: Minibuffer key bindings
+
+4.2.2 Key bindings for single selection, action, then exit minibuffer
+---------------------------------------------------------------------
+
+Ivy can offer several actions from which to choose which action to run.
+This "calling an action" operates on the selected candidate.  For
+example, when viewing a list of files, one action could open it for
+editing, one to view it, another to invoke a special function, and so
+on.  Custom actions can be added to this interface.  The precise action
+to call on the selected candidate can be delayed until after the
+narrowing is completed.  No need to exit the interface if unsure which
+action to run.  This delayed flexibility and customization of actions
+extends usability of lists in Emacs.
+
+   ‘C-m’ or ‘RET’ (‘ivy-done’) calls the default action and exits the
+minibuffer.
+
+   ‘M-o’ (‘ivy-dispatching-done’) presents all available valid actions
+from which to choose.  When there is only one action available, there is
+no difference between ‘M-o’ and ‘C-m’.
+
+   ‘C-j’ (‘ivy-alt-done’) calls the alternate action, such as completing
+a directory name in a file list whereas ‘C-m’ will select that directory
+and exit the minibuffer.
+
+   Exiting the minibuffer also closes the Ivy window (as specified by
+‘ivy-height’).  This closing and exiting sequence is conveniently off
+when applying multiple actions.  Multiple actions and multiple
+selections as covered in the next section of this manual.
+
+   ‘TAB’ (‘ivy-partial-or-done’) attempts partial completion, extending
+current input as much as possible.
+
+   ‘TAB TAB’ is the same as ‘C-j’.
+
+   ‘C-M-j’ (‘ivy-immediate-done’) is useful when there is no match for
+the given input.  Or there is an incorrect partial match.  ‘C-M-j’ with
+‘find-file’ lists ignores the partial match and instead takes the
+current input to create a new directory with ‘dired-create-directory’.
+
+   ‘ivy-immediate-done’ illustrates how Ivy distinguishes between
+calling an action on the _currently selected_ candidate and calling an
+action on the _current input_.
+
+   Invoking avy completion with ‘C-'’ (‘ivy-avy’).  ‘C-`’ uses avy’s
+visible jump mechanism, which can further reduce Ivy’s line-by-line
+scrolling that requires multiple ‘C-n’ or ‘C-p’ keystrokes.
+
+
+File: ivy.info,  Node: Key bindings for multiple selections and actions keep minibuffer open,  Next: Key bindings that alter minibuffer input,  Prev: Key bindings for single selection action then exit minibuffer,  Up: Minibuffer key bindings
+
+4.2.3 Key bindings for multiple selections and actions, keep minibuffer open
+----------------------------------------------------------------------------
+
+For repeatedly applying multiple actions or acting on multiple
+candidates, Ivy does not close the minibuffer between commands.  It
+keeps the minibuffer open for applying subsequent actions.
+
+   Adding an extra meta key to the normal key chord invokes the special
+version of the regular commands that enables applying multiple actions.
+
+   ‘C-M-m’ (‘ivy-call’) is the non-exiting version of the default
+action, ‘C-m’ (‘ivy-done’).  Instead of closing the minibuffer, ‘C-M-m’
+allows selecting another candidate or another action.  For example,
+‘C-M-m’ on functions list invokes ‘describe-function’.  When combined
+with ‘C-n’, function descriptions can be invoked quickly in succession.
+
+   ‘RET’ exits the minibuffer.
+
+   ‘ivy-resume’ recalls the state of the completion session just before
+its last exit.  Useful after an accidental ‘C-m’ (‘ivy-done’).
+
+   ‘C-M-o’ (‘ivy-dispatching-call’) is a non-exiting version of ‘M-o’
+(‘ivy-dispatching-done’) that can accumulate candidates into a queue.
+For example, for playback in ‘counsel-rhythmbox’, ‘C-M-o e’ en-queues
+the selected candidate, and ‘C-n C-m’ plays the next one in the queue.
+
+   ‘C-M-n’ (‘ivy-next-line-and-call’) combines ‘C-n’ and ‘C-M-m’.
+Applies an action and moves to next line.  Comes in handy when opening
+multiple files from ‘counsel-find-file’, ‘counsel-git-grep’,
+‘counsel-ag’, or ‘counsel-locate’ lists.  Just hold ‘C-M-n’ for
+rapid-fire default action on each successive element of the list.
+
+   ‘C-M-p’ (‘ivy-previous-line-and-call’) combines ‘C-p’ and ‘C-M-m’.
+Is the same as above except that it moves through the list in the other
+direction.
+
+
+File: ivy.info,  Node: Key bindings that alter minibuffer input,  Next: Other key bindings,  Prev: Key bindings for multiple selections and actions keep minibuffer open,  Up: Minibuffer key bindings
+
+4.2.4 Key bindings that alter minibuffer input
+----------------------------------------------
+
+‘M-n’ (‘ivy-next-history-element’) and ‘M-p’
+(‘ivy-previous-history-element’) cycle through the Ivy command history.
+Ivy updates an internal history list after each action.  When this
+history list is empty, ‘M-n’ inserts symbol (or URL) at point into the
+minibuffer.
+
+   ‘M-i’ (‘ivy-insert-current’) inserts the current candidate into the
+minibuffer.  Useful for copying and renaming files, for example: ‘M-i’
+to insert the original file name string, edit it, and then ‘C-m’ to
+complete the renaming.
+
+   ‘M-j’ (‘ivy-yank-word’) inserts sub-word at point into minibuffer.
+This is similar to ‘C-s C-w’ with ‘isearch’.  Ivy reserves ‘C-w’ for
+‘kill-region’.
+
+   ‘S-SPC’ (‘ivy-restrict-to-matches’) deletes the current input, and
+resets the candidates list to the currently restricted matches.  This is
+how Ivy provides narrowing in successive tiers.
+
+   ‘C-r’ (‘ivy-reverse-i-search’) works just like ‘C-r’ at bash command
+prompt, where the completion candidates are the history items.  Upon
+completion, the selected candidate string is inserted into the
+minibuffer.
+
+
+File: ivy.info,  Node: Other key bindings,  Next: Hydra in the minibuffer,  Prev: Key bindings that alter minibuffer input,  Up: Minibuffer key bindings
+
+4.2.5 Other key bindings
+------------------------
+
+‘M-w’ (‘ivy-kill-ring-save’) copies selected candidates to the kill
+ring; when the region is active, copies active region.
+
+
+File: ivy.info,  Node: Hydra in the minibuffer,  Next: Saving the current completion session to a buffer,  Prev: Other key bindings,  Up: Minibuffer key bindings
+
+4.2.6 Hydra in the minibuffer
+-----------------------------
+
+‘C-o’ (‘hydra-ivy/body’) invokes Hydra menus with key shortcuts.
+
+   ‘C-o’ or ‘i’ resumes editing.
+
+   Hydra reduces key strokes, for example: ‘C-n C-n C-n C-n’ is ‘C-o
+jjjj’ in Hydra.  Hydra has other benefits besides certain shorter key
+bindings:
+   • ‘<’ and ‘>’ to adjust height of minibuffer,
+   • describes the current completion state, such as case folding and
+     the current action.
+
+   Minibuffer editing is disabled when Hydra is active.
+
+
+File: ivy.info,  Node: Saving the current completion session to a buffer,  Prev: Hydra in the minibuffer,  Up: Minibuffer key bindings
+
+4.2.7 Saving the current completion session to a buffer
+-------------------------------------------------------
+
+‘C-c C-o’ (‘ivy-occur’) saves the current candidates to a new buffer;
+the list is active in the new buffer.
+
+   ‘RET’ or ‘mouse-1’ in the new buffer calls the appropriate action on
+the selected candidate.
+
+   Ivy has no limit on the number of active buffers like these.
+
+   Ivy takes care of making these buffer names unique.  It applies
+descriptive names, for example: ‘*ivy-occur counsel-describe-variable
+"function$*’.
+
+
+File: ivy.info,  Node: Completion styles,  Next: Variable Index,  Prev: Key bindings,  Up: Top
+
+5 Completion styles
+*******************
+
+Ivy’s completion functions rely on the highly configurable regex
+builder.
+
+   The default is:
+
+     (setq ivy-re-builders-alist
+           '((t . ivy--regex-plus)))
+
+   The default ‘ivy--regex-plus’ narrowing is always invoked unless
+specified otherwise.  For example, file name completion may have a
+custom completion function:
+
+     (setq ivy-re-builders-alist
+           '((read-file-name-internal . ivy--regex-fuzzy)
+             (t . ivy--regex-plus)))
+
+   Ivy’s flexibility extends to using different styles of completion
+mechanics (regex-builders) for different types of lists.  Despite this
+flexibility, Ivy operates within a consistent and uniform interface.
+The main regex-builders currently in Ivy are:
+* Menu:
+
+* ivy--regex-plus::
+* ivy--regex-ignore-order::
+* ivy--regex-fuzzy::
+
+
+File: ivy.info,  Node: ivy--regex-plus,  Next: ivy--regex-ignore-order,  Up: Completion styles
+
+5.1 ivy–regex-plus
+==================
+
+‘ivy--regex-plus’ is Ivy’s default completion method.
+
+   ‘ivy--regex-plus’ matches by splitting the input by spaces and
+rebuilding it into a regex.
+
+   As the search string is typed in Ivy’s minibuffer, it is transformed
+into proper regex syntax.  If the string is "for example", it is
+transformed into
+
+"\\(for\\).*\\(example\\)"
+
+   which in regex terminology matches "for" followed by a wild card and
+then "example".  Note how Ivy uses the space character to build wild
+cards.  For literal white space matching in Ivy, use an extra space: to
+match one space type two spaces, to match two spaces type three spaces,
+and so on.
+
+   As Ivy transforms typed characters into regex strings, it provides an
+intuitive feedback through font highlights.
+
+   Ivy supports regexp negation with "!".  For example, "define key !
+ivy quit" first selects everything matching "define.*key", then removes
+everything matching "ivy", and finally removes everything matching
+"quit".  What remains is the final result set of the negation regexp.
+
+Standard regexp identifiers work:
+
+"^", "$", "\b" or "[a-z]"
+
+   Since Ivy treats minibuffer input as a regexp, standard regexp
+identifiers work as usual.  The exceptions are spaces, which translate
+to ".*", and "!"  that signal the beginning of a negation group.
+
+
+File: ivy.info,  Node: ivy--regex-ignore-order,  Next: ivy--regex-fuzzy,  Prev: ivy--regex-plus,  Up: Completion styles
+
+5.2 ivy–regex-ignore-order
+==========================
+
+‘ivy--regex-ignore-order’ ignores the order of regexp tokens when
+searching for matching candidates.  For instance, the input "for
+example" will match "example test for".  Otherwise ‘ivy--regex-plus’
+normal behavior is to honor the order of regexp tokens.
+
+
+File: ivy.info,  Node: ivy--regex-fuzzy,  Prev: ivy--regex-ignore-order,  Up: Completion styles
+
+5.3 ivy–regex-fuzzy
+===================
+
+‘ivy--regex-fuzzy’ splits each character with a wild card.  Searching
+for "for" returns all "f.*o.*r" matches, resulting in a large number of
+hits.  Yet some searches need these extra hits.  Ivy sorts such large
+lists using ‘flx’ package’s scoring mechanism, if it’s installed.
+
+
+File: ivy.info,  Node: Variable Index,  Prev: Completion styles,  Up: Top
+
+6 Variable Index
+****************
+
+[index]
+* Menu:
+
+* ivy-height:                            Key bindings for navigation.
+                                                               (line 22)
+* ivy-wrap:                              Key bindings for navigation.
+                                                               (line 14)
+
+
+
+Tag Table:
+Node: Top1354
+Node: Introduction3557
+Node: Installation5893
+Node: Installing from Emacs Package Manager6219
+Node: Installing from the Git repository7177
+Node: Getting started7877
+Node: Basic customization8183
+Node: Key bindings8598
+Node: Global key bindings8790
+Node: Minibuffer key bindings10029
+Node: Key bindings for navigation11001
+Node: Key bindings for single selection action then exit minibuffer12143
+Node: Key bindings for multiple selections and actions keep minibuffer open14709
+Node: Key bindings that alter minibuffer input16855
+Node: Other key bindings18298
+Node: Hydra in the minibuffer18637
+Node: Saving the current completion session to a buffer19350
+Node: Completion styles20044
+Node: ivy--regex-plus20984
+Node: ivy--regex-ignore-order22428
+Node: ivy--regex-fuzzy22873
+Node: Variable Index23306
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/emacs.d/elpa/swiper-20160115.800/swiper-autoloads.el b/emacs.d/elpa/swiper-20160115.800/swiper-autoloads.el
new file mode 100644
index 0000000..9216671
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/swiper-autoloads.el
@@ -0,0 +1,97 @@
+;;; swiper-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "ivy" "ivy.el" (22171 46572 0 0))
+;;; Generated autoloads from ivy.el
+
+(autoload 'ivy-resume "ivy" "\
+Resume the last completion session.
+
+\(fn)" t nil)
+
+(autoload 'ivy-completing-read "ivy" "\
+Read a string in the minibuffer, with completion.
+
+This interface conforms to `completing-read' and can be used for
+`completing-read-function'.
+
+PROMPT is a string to prompt with; normally it ends in a colon and a space.
+COLLECTION can be a list of strings, an alist, an obarray or a hash table.
+PREDICATE limits completion to a subset of COLLECTION.
+REQUIRE-MATCH is specified with a boolean value.  See `completing-read'.
+INITIAL-INPUT is a string that can be inserted into the minibuffer initially.
+HISTORY is a list of previously selected inputs.
+DEF is the default value.
+INHERIT-INPUT-METHOD is currently ignored.
+
+\(fn PROMPT COLLECTION &optional PREDICATE REQUIRE-MATCH INITIAL-INPUT HISTORY DEF INHERIT-INPUT-METHOD)" nil nil)
+
+(defvar ivy-mode nil "\
+Non-nil if Ivy mode is enabled.
+See the command `ivy-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 `ivy-mode'.")
+
+(custom-autoload 'ivy-mode "ivy" nil)
+
+(autoload 'ivy-mode "ivy" "\
+Toggle Ivy mode on or off.
+Turn Ivy mode on if ARG is positive, off otherwise.
+Turning on Ivy mode sets `completing-read-function' to
+`ivy-completing-read'.
+
+Global bindings:
+\\{ivy-mode-map}
+
+Minibuffer bindings:
+\\{ivy-minibuffer-map}
+
+\(fn &optional ARG)" t nil)
+
+(autoload 'ivy-switch-buffer "ivy" "\
+Switch to another buffer.
+
+\(fn)" t nil)
+
+(autoload 'ivy-recentf "ivy" "\
+Find a file on `recentf-list'.
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "swiper" "swiper.el" (22171 46572 0 0))
+;;; Generated autoloads from swiper.el
+
+(autoload 'swiper-avy "swiper" "\
+Jump to one of the current swiper candidates.
+
+\(fn)" t nil)
+
+(autoload 'swiper-mc "swiper" "\
+
+
+\(fn)" t nil)
+
+(autoload 'swiper "swiper" "\
+`isearch' with an overview.
+When non-nil, INITIAL-INPUT is the initial search pattern.
+
+\(fn &optional INITIAL-INPUT)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("colir.el" "ivy-hydra.el" "swiper-pkg.el")
+;;;;;;  (22171 46572 174033 0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; swiper-autoloads.el ends here
diff --git a/emacs.d/elpa/swiper-20160115.800/swiper-pkg.el b/emacs.d/elpa/swiper-20160115.800/swiper-pkg.el
new file mode 100644
index 0000000..13f5c7c
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/swiper-pkg.el
@@ -0,0 +1,7 @@
+(define-package "swiper" "20160115.800" "Isearch with an overview. Oh, man!"
+  '((emacs "24.1"))
+  :url "https://github.com/abo-abo/swiper" :keywords
+  '("matching"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/swiper-20160115.800/swiper.el b/emacs.d/elpa/swiper-20160115.800/swiper.el
new file mode 100644
index 0000000..6ac16c5
--- /dev/null
+++ b/emacs.d/elpa/swiper-20160115.800/swiper.el
@@ -0,0 +1,667 @@
+;;; swiper.el --- Isearch with an overview. Oh, man! -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel <ohwoeowho@gmail.com>
+;; URL: https://github.com/abo-abo/swiper
+;; Version: 0.7.0
+;; Package-Requires: ((emacs "24.1"))
+;; Keywords: matching
+
+;; This file is part of GNU Emacs.
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; This 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.
+
+;; For a full copy of the GNU General Public License
+;; see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This package gives an overview of the current regex search
+;; candidates.  The search regex can be split into groups with a
+;; space.  Each group is highlighted with a different face.
+;;
+;; It can double as a quick `regex-builder', although only single
+;; lines will be matched.
+;;
+;; It also provides `ivy-mode': a global minor mode that uses the
+;; matching back end of `swiper' for all matching on your system,
+;; including file matching. You can use it in place of `ido-mode'
+;; (can't have both on at once).
+
+;;; Code:
+(require 'ivy)
+
+(defgroup swiper nil
+  "`isearch' with an overview."
+  :group 'matching
+  :prefix "swiper-")
+
+(defface swiper-match-face-1
+  '((t (:inherit isearch-lazy-highlight-face)))
+  "The background face for `swiper' matches.")
+
+(defface swiper-match-face-2
+  '((t (:inherit isearch)))
+  "Face for `swiper' matches modulo 1.")
+
+(defface swiper-match-face-3
+  '((t (:inherit match)))
+  "Face for `swiper' matches modulo 2.")
+
+(defface swiper-match-face-4
+  '((t (:inherit isearch-fail)))
+  "Face for `swiper' matches modulo 3.")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-1
+    'ivy-minibuffer-match-face-1 "0.6.0")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-2
+    'ivy-minibuffer-match-face-2 "0.6.0")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-3
+    'ivy-minibuffer-match-face-3 "0.6.0")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-4
+    'ivy-minibuffer-match-face-4 "0.6.0")
+
+(defface swiper-line-face
+  '((t (:inherit highlight)))
+  "Face for current `swiper' line.")
+
+(defcustom swiper-faces '(swiper-match-face-1
+                          swiper-match-face-2
+                          swiper-match-face-3
+                          swiper-match-face-4)
+  "List of `swiper' faces for group matches.")
+
+(defcustom swiper-min-highlight 2
+  "Only highlight matches for regexps at least this long."
+  :type 'integer)
+
+(defvar swiper-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "M-q") 'swiper-query-replace)
+    (define-key map (kbd "C-l") 'swiper-recenter-top-bottom)
+    (define-key map (kbd "C-'") 'swiper-avy)
+    (define-key map (kbd "C-7") 'swiper-mc)
+    (define-key map (kbd "C-c C-f") 'swiper-toggle-face-matching)
+    map)
+  "Keymap for swiper.")
+
+(defun swiper-query-replace ()
+  "Start `query-replace' with string to replace from last search string."
+  (interactive)
+  (if (null (window-minibuffer-p))
+      (user-error "Should only be called in the minibuffer through `swiper-map'")
+    (let* ((enable-recursive-minibuffers t)
+           (from (ivy--regex ivy-text))
+           (to (query-replace-read-to from "Query replace" t)))
+      (swiper--cleanup)
+      (ivy-exit-with-action
+       (lambda (_)
+         (with-ivy-window
+           (move-beginning-of-line 1)
+           (perform-replace from to
+                            t t nil)))))))
+
+(defvar avy-background)
+(defvar avy-all-windows)
+(defvar avy-style)
+(defvar avy-keys)
+(declare-function avy--regex-candidates "ext:avy")
+(declare-function avy--process "ext:avy")
+(declare-function avy--overlay-post "ext:avy")
+(declare-function avy-action-goto "ext:avy")
+(declare-function avy--done "ext:avy")
+(declare-function avy--make-backgrounds "ext:avy")
+(declare-function avy-window-list "ext:avy")
+(declare-function avy-read "ext:avy")
+(declare-function avy-read-de-bruijn "ext:avy")
+(declare-function avy-tree "ext:avy")
+(declare-function avy-push-mark "ext:avy")
+(declare-function avy--remove-leading-chars "ext:avy")
+
+;;;###autoload
+(defun swiper-avy ()
+  "Jump to one of the current swiper candidates."
+  (interactive)
+  (unless (string= ivy-text "")
+    (let* ((avy-all-windows nil)
+           (candidates (append
+                        (with-ivy-window
+                          (avy--regex-candidates
+                           (ivy--regex ivy-text)))
+                        (save-excursion
+                          (save-restriction
+                            (narrow-to-region (window-start) (window-end))
+                            (goto-char (point-min))
+                            (forward-line)
+                            (let ((cands))
+                              (while (< (point) (point-max))
+                                (push (cons (1+ (point))
+                                            (selected-window))
+                                      cands)
+                                (forward-line))
+                              cands)))))
+           (candidate (unwind-protect
+                          (prog2
+                              (avy--make-backgrounds
+                               (append (avy-window-list)
+                                       (list  (ivy-state-window ivy-last))))
+                              (if (eq avy-style 'de-bruijn)
+                                  (avy-read-de-bruijn
+                                   candidates avy-keys)
+                                (avy-read (avy-tree candidates avy-keys)
+                                          #'avy--overlay-post
+                                          #'avy--remove-leading-chars))
+                            (avy-push-mark))
+                        (avy--done))))
+      (if (window-minibuffer-p (cdr candidate))
+          (progn
+            (ivy-set-index (- (line-number-at-pos (car candidate)) 2))
+            (ivy--exhibit)
+            (ivy-done)
+            (ivy-call))
+        (ivy-quit-and-run
+         (avy-action-goto (caar candidate)))))))
+
+(declare-function mc/create-fake-cursor-at-point "ext:multiple-cursors-core")
+(declare-function multiple-cursors-mode "ext:multiple-cursors-core")
+
+;;;###autoload
+(defun swiper-mc ()
+  (interactive)
+  (unless (require 'multiple-cursors nil t)
+    (error "multiple-cursors isn't installed"))
+  (let ((cands (nreverse ivy--old-cands)))
+    (unless (string= ivy-text "")
+      (ivy-exit-with-action
+       (lambda (_)
+         (let (cand)
+           (while (setq cand (pop cands))
+             (swiper--action cand)
+             (when cands
+               (mc/create-fake-cursor-at-point))))
+         (multiple-cursors-mode 1))))))
+
+(defun swiper-recenter-top-bottom (&optional arg)
+  "Call (`recenter-top-bottom' ARG)."
+  (interactive "P")
+  (with-ivy-window
+    (recenter-top-bottom arg)))
+
+(defvar swiper-font-lock-exclude
+  '(package-menu-mode
+    gnus-summary-mode
+    gnus-article-mode
+    gnus-group-mode
+    emms-playlist-mode
+    emms-stream-mode
+    erc-mode
+    org-agenda-mode
+    dired-mode
+    jabber-chat-mode
+    elfeed-search-mode
+    elfeed-show-mode
+    fundamental-mode
+    Man-mode
+    woman-mode
+    mu4e-view-mode
+    mu4e-headers-mode
+    help-mode
+    debbugs-gnu-mode
+    occur-mode
+    occur-edit-mode
+    bongo-mode
+    bongo-library-mode
+    bongo-playlist-mode
+    eww-mode
+    twittering-mode
+    vc-dir-mode
+    rcirc-mode
+    sauron-mode
+    w3m-mode)
+  "List of major-modes that are incompatible with font-lock-ensure.")
+
+(defun swiper-font-lock-ensure-p ()
+  "Return non-nil if we should font-lock-ensure."
+  (or (derived-mode-p 'magit-mode)
+              (bound-and-true-p magit-blame-mode)
+              (memq major-mode swiper-font-lock-exclude)))
+
+(defun swiper-font-lock-ensure ()
+  "Ensure the entired buffer is highlighted."
+  (unless (swiper-font-lock-ensure-p)
+    (unless (> (buffer-size) 100000)
+      (if (fboundp 'font-lock-ensure)
+          (font-lock-ensure)
+        (with-no-warnings (font-lock-fontify-buffer))))))
+
+(defvar swiper--format-spec ""
+  "Store the current candidates format spec.")
+
+(defvar swiper--width nil
+  "Store the amount of digits needed for the longest line nubmer.")
+
+(defvar swiper-use-visual-line nil
+  "When non-nil, use `line-move' instead of `forward-line'.")
+
+(declare-function outline-show-all "outline")
+
+(defun swiper--candidates (&optional numbers-width)
+  "Return a list of this buffer lines.
+
+NUMBERS-WIDTH, when specified, is used for line numbers width
+spec, instead of calculating it as the log of the buffer line
+count."
+  (if (and visual-line-mode
+           ;; super-slow otherwise
+           (< (buffer-size) 20000))
+      (progn
+        (when (eq major-mode 'org-mode)
+          (require 'outline)
+          (if (fboundp 'outline-show-all)
+              (outline-show-all)
+            (with-no-warnings
+              (show-all))))
+        (setq swiper-use-visual-line t))
+    (setq swiper-use-visual-line nil))
+  (let ((n-lines (count-lines (point-min) (point-max))))
+    (unless (zerop n-lines)
+      (setq swiper--width (or numbers-width
+                              (1+ (floor (log n-lines 10)))))
+      (setq swiper--format-spec
+            (format "%%-%dd " swiper--width))
+      (let ((line-number 0)
+            (advancer (if swiper-use-visual-line
+                          (lambda (arg) (line-move arg t))
+                        #'forward-line))
+            candidates)
+        (save-excursion
+          (goto-char (point-min))
+          (swiper-font-lock-ensure)
+          (while (< (point) (point-max))
+            (let ((str (concat
+                        " "
+                        (replace-regexp-in-string
+                         "\t" "    "
+                         (if swiper-use-visual-line
+                             (buffer-substring
+                              (save-excursion
+                                (beginning-of-visual-line)
+                                (point))
+                              (save-excursion
+                                (end-of-visual-line)
+                                (point)))
+                           (buffer-substring
+                            (point)
+                            (line-end-position)))))))
+              (when (eq major-mode 'twittering-mode)
+                (remove-text-properties 0 (length str) '(field) str))
+              (put-text-property 0 1 'display
+                                 (format swiper--format-spec
+                                         (cl-incf line-number))
+                                 str)
+              (push str candidates))
+            (funcall advancer 1))
+          (nreverse candidates))))))
+
+(defvar swiper--opoint 1
+  "The point when `swiper' starts.")
+
+;;;###autoload
+(defun swiper (&optional initial-input)
+  "`isearch' with an overview.
+When non-nil, INITIAL-INPUT is the initial search pattern."
+  (interactive)
+  (swiper--ivy initial-input))
+
+(declare-function evil-jumper--set-jump "ext:evil-jumper")
+
+(defvar swiper--current-line nil)
+(defvar swiper--current-match-start nil)
+
+(defun swiper--init ()
+  "Perform initialization common to both completion methods."
+  (setq swiper--current-line nil)
+  (setq swiper--current-match-start nil)
+  (setq swiper--opoint (point))
+  (when (bound-and-true-p evil-jumper-mode)
+    (evil-jumper--set-jump)))
+
+(defun swiper--re-builder (str)
+  "Transform STR into a swiper regex.
+This is the regex used in the minibuffer, since the candidates
+there have line numbers. In the buffer, `ivy--regex' should be used."
+  (cond
+    ((equal str "")
+     "")
+    ((equal str "^")
+     (setq ivy--subexps 0)
+     ".")
+    ((string-match "^\\^" str)
+     (setq ivy--old-re "")
+     (let ((re (ivy--regex-plus (substring str 1))))
+       (if (zerop ivy--subexps)
+           (prog1 (format "^ ?\\(%s\\)" re)
+             (setq ivy--subexps 1))
+         (format "^ %s" re))))
+    (t
+     (ivy--regex-plus str))))
+
+(defvar swiper-history nil
+  "History for `swiper'.")
+
+(defvar swiper-invocation-face nil
+  "The face at the point of invocation of `swiper'.")
+
+(defun swiper--ivy (&optional initial-input)
+  "`isearch' with an overview using `ivy'.
+When non-nil, INITIAL-INPUT is the initial search pattern."
+  (interactive)
+  (swiper--init)
+  (setq swiper-invocation-face
+        (plist-get (text-properties-at (point)) 'face))
+  (let ((candidates (swiper--candidates))
+        (preselect
+         (if swiper-use-visual-line
+             (count-screen-lines
+              (point-min)
+              (save-excursion (beginning-of-visual-line) (point)))
+           (1- (line-number-at-pos))))
+        (minibuffer-allow-text-properties t)
+        res)
+    (unwind-protect
+         (setq res
+               (ivy-read
+                "Swiper: "
+                candidates
+                :initial-input initial-input
+                :keymap swiper-map
+                :preselect preselect
+                :require-match t
+                :update-fn #'swiper--update-input-ivy
+                :unwind #'swiper--cleanup
+                :action #'swiper--action
+                :re-builder #'swiper--re-builder
+                :history 'swiper-history
+                :caller 'swiper))
+      (unless res
+        (goto-char swiper--opoint)))))
+
+(defun swiper-toggle-face-matching ()
+  "Toggle matching only the candidates with `swiper-invocation-face'."
+  (interactive)
+  (setf (ivy-state-matcher ivy-last)
+        (if (ivy-state-matcher ivy-last)
+            nil
+          #'swiper--face-matcher))
+  (setq ivy--old-re nil))
+
+(defun swiper--face-matcher (regexp candidates)
+  "Return REGEXP-matching CANDIDATES.
+Matched candidates should have `swiper-invocation-face'."
+  (cl-remove-if-not
+   (lambda (x)
+     (and
+      (string-match regexp x)
+      (let ((s (match-string 0 x))
+            (i 0))
+        (while (and (< i (length s))
+                    (text-property-any
+                     i (1+ i)
+                     'face swiper-invocation-face
+                     s))
+          (cl-incf i))
+        (eq i (length s)))))
+   candidates))
+
+(defun swiper--ensure-visible ()
+  "Remove overlays hiding point."
+  (let ((overlays (overlays-at (point)))
+        ov expose)
+    (while (setq ov (pop overlays))
+      (if (and (invisible-p (overlay-get ov 'invisible))
+               (setq expose (overlay-get ov 'isearch-open-invisible)))
+          (funcall expose ov)))))
+
+(defvar swiper--overlays nil
+  "Store overlays.")
+
+(defun swiper--cleanup ()
+  "Clean up the overlays."
+  (while swiper--overlays
+    (delete-overlay (pop swiper--overlays)))
+  (save-excursion
+    (goto-char (point-min))
+    (isearch-clean-overlays)))
+
+(defun swiper--update-input-ivy ()
+  "Called when `ivy' input is updated."
+  (with-ivy-window
+    (swiper--cleanup)
+    (when (> (length ivy--current) 0)
+      (let* ((re (funcall ivy--regex-function ivy-text))
+             (re (if (stringp re) re (caar re)))
+             (str (get-text-property 0 'display ivy--current))
+             (num (if (string-match "^[0-9]+" str)
+                      (string-to-number (match-string 0 str))
+                    0)))
+        (unless (eq this-command 'ivy-yank-word)
+          (when (cl-plusp num)
+            (unless (if swiper--current-line
+                        (eq swiper--current-line num)
+                      (eq (line-number-at-pos) num))
+              (goto-char (point-min))
+              (if swiper-use-visual-line
+                  (line-move (1- num))
+                (forward-line (1- num))))
+            (if (and (equal ivy-text "")
+                     (>= swiper--opoint (line-beginning-position))
+                     (<= swiper--opoint (line-end-position)))
+                (goto-char swiper--opoint)
+              (if (eq swiper--current-line num)
+                  (when swiper--current-match-start
+                    (goto-char swiper--current-match-start))
+                (setq swiper--current-line num))
+              (re-search-forward re (line-end-position) t)
+              (setq swiper--current-match-start (match-beginning 0)))
+            (isearch-range-invisible (line-beginning-position)
+                                     (line-end-position))
+            (unless (and (>= (point) (window-start))
+                         (<= (point) (window-end (ivy-state-window ivy-last) t)))
+              (recenter))))
+        (swiper--add-overlays re)))))
+
+(defun swiper--add-overlays (re &optional beg end wnd)
+  "Add overlays for RE regexp in visible part of the current buffer.
+BEG and END, when specified, are the point bounds.
+WND, when specified is the window."
+  (setq wnd (or wnd (ivy-state-window ivy-last)))
+  (let ((ov (if visual-line-mode
+                (make-overlay
+                 (save-excursion
+                   (beginning-of-visual-line)
+                   (point))
+                 (save-excursion
+                   (end-of-visual-line)
+                   (point)))
+              (make-overlay
+               (line-beginning-position)
+               (1+ (line-end-position))))))
+    (overlay-put ov 'face 'swiper-line-face)
+    (overlay-put ov 'window wnd)
+    (push ov swiper--overlays)
+    (let* ((wh (window-height))
+           (beg (or beg (save-excursion
+                          (forward-line (- wh))
+                          (point))))
+           (end (or end (save-excursion
+                          (forward-line wh)
+                          (point)))))
+      (when (>= (length re) swiper-min-highlight)
+        (save-excursion
+          (goto-char beg)
+          ;; RE can become an invalid regexp
+          (while (and (ignore-errors (re-search-forward re end t))
+                      (> (- (match-end 0) (match-beginning 0)) 0))
+            (let ((i 0))
+              (while (<= i ivy--subexps)
+                (when (match-beginning i)
+                  (let ((overlay (make-overlay (match-beginning i)
+                                               (match-end i)))
+                        (face
+                         (cond ((zerop ivy--subexps)
+                                (cadr swiper-faces))
+                               ((zerop i)
+                                (car swiper-faces))
+                               (t
+                                (nth (1+ (mod (+ i 2) (1- (length swiper-faces))))
+                                     swiper-faces)))))
+                    (push overlay swiper--overlays)
+                    (overlay-put overlay 'face face)
+                    (overlay-put overlay 'window wnd)
+                    (overlay-put overlay 'priority i)))
+                (cl-incf i)))))))))
+
+(defun swiper--action (x)
+  "Goto line X."
+  (if (null x)
+      (user-error "No candidates")
+    (with-ivy-window
+      (unless (equal (current-buffer)
+                     (ivy-state-buffer ivy-last))
+        (switch-to-buffer (ivy-state-buffer ivy-last)))
+      (goto-char (point-min))
+      (funcall (if swiper-use-visual-line
+                   #'line-move
+                 #'forward-line)
+               (1- (read (get-text-property 0 'display x))))
+      (re-search-forward
+       (ivy--regex ivy-text) (line-end-position) t)
+      (swiper--ensure-visible)
+      (when (/= (point) swiper--opoint)
+        (unless (and transient-mark-mode mark-active)
+          (when (eq ivy-exit 'done)
+            (push-mark swiper--opoint t)
+            (message "Mark saved where search started")))))))
+
+;; (define-key isearch-mode-map (kbd "C-o") 'swiper-from-isearch)
+(defun swiper-from-isearch ()
+  "Invoke `swiper' from isearch."
+  (interactive)
+  (let ((query (if isearch-regexp
+                   isearch-string
+                 (regexp-quote isearch-string))))
+    (isearch-exit)
+    (swiper query)))
+
+(defvar swiper-multi-buffers nil
+  "Store the current list of buffers.")
+
+(defvar swiper-multi-candidates nil
+  "Store the list of candidates for `swiper-multi'.")
+
+(defun swiper-multi-prompt ()
+  (format "Buffers (%s): "
+          (mapconcat #'identity swiper-multi-buffers ", ")))
+
+(defun swiper-multi ()
+  "Select one or more buffers.
+Run `swiper' for those buffers."
+  (interactive)
+  (setq swiper-multi-buffers nil)
+  (ivy-read (swiper-multi-prompt)
+            'internal-complete-buffer
+            :action 'swiper-multi-action-1)
+  (ivy-read "Swiper: " swiper-multi-candidates
+            :action 'swiper-multi-action-2
+            :unwind #'swiper--cleanup
+            :caller 'swiper-multi))
+
+(defun swiper-all ()
+  "Run `swiper' for all opened buffers."
+  (interactive)
+  (ivy-read "Swiper: " (swiper--multi-candidates
+                        (cl-remove-if-not
+                         #'buffer-file-name
+                         (buffer-list)))
+            :action 'swiper-multi-action-2
+            :unwind #'swiper--cleanup
+            :caller 'swiper-multi))
+
+(defun swiper--multi-candidates (buffers)
+  (let* ((ww (window-width))
+         (res nil)
+         (column-2 (apply #'max
+                          (mapcar
+                           (lambda (b)
+                             (length (buffer-name b)))
+                           buffers)))
+         (column-1 (- ww 4 column-2 1)))
+    (dolist (buf buffers)
+      (with-current-buffer buf
+        (setq res
+              (append
+               (mapcar
+                (lambda (s)
+                  (setq s (concat (ivy--truncate-string s column-1) " "))
+                  (let ((len (length s)))
+                    (put-text-property
+                     (1- len) len 'display
+                     (concat
+                      (make-string
+                       (- ww (string-width s) (length (buffer-name)) 3)
+                       ?\ )
+                      (buffer-name))
+                     s)
+                    s))
+                (swiper--candidates 4))
+               res))
+        nil))
+    res))
+
+(defun swiper-multi-action-1 (x)
+  (if (member x swiper-multi-buffers)
+      (progn
+        (setq swiper-multi-buffers (delete x swiper-multi-buffers)))
+    (unless (equal x "")
+      (setq swiper-multi-buffers (append swiper-multi-buffers (list x)))))
+  (let ((prompt (swiper-multi-prompt)))
+    (setf (ivy-state-prompt ivy-last) prompt)
+    (setq ivy--prompt (concat "%-4d " prompt)))
+  (cond ((memq this-command '(ivy-done
+                              ivy-alt-done
+                              ivy-immediate-done))
+         (setq swiper-multi-candidates
+               (swiper--multi-candidates
+                (mapcar #'get-buffer swiper-multi-buffers))))
+        ((eq this-command 'ivy-call)
+         (delete-minibuffer-contents))))
+
+(defun swiper-multi-action-2 (x)
+  (let ((buf-space (get-text-property (1- (length x)) 'display x)))
+    (with-ivy-window
+      (when (string-match "\\` *\\([^ ]+\\)\\'" buf-space)
+        (switch-to-buffer (match-string 1 buf-space))
+        (goto-char (point-min))
+        (forward-line (1- (read (get-text-property 0 'display x))))
+        (re-search-forward
+         (ivy--regex ivy-text)
+         (line-end-position) t)
+        (unless (eq ivy-exit 'done)
+          (swiper--cleanup)
+          (swiper--add-overlays (ivy--regex ivy-text)))))))
+
+(provide 'swiper)
+
+;;; swiper.el ends here
diff --git a/emacs.d/elpa/web-mode-20150618.1109/web-mode-autoloads.el b/emacs.d/elpa/web-mode-20150618.1109/web-mode-autoloads.el
deleted file mode 100644
index 12eba2a..0000000
--- a/emacs.d/elpa/web-mode-20150618.1109/web-mode-autoloads.el
+++ /dev/null
@@ -1,21 +0,0 @@
-;;; web-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "web-mode" "web-mode.el" (21898 47959 0 0))
-;;; Generated autoloads from web-mode.el
-
-(autoload 'web-mode "web-mode" "\
-Major mode for editing web templates.
-
-\(fn)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; web-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/web-mode-20150618.1109/web-mode-pkg.el b/emacs.d/elpa/web-mode-20150618.1109/web-mode-pkg.el
deleted file mode 100644
index 5e27ff2..0000000
--- a/emacs.d/elpa/web-mode-20150618.1109/web-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "web-mode" "20150618.1109" "major mode for editing web templates" 'nil :url "http://web-mode.org" :keywords '("languages"))
diff --git a/emacs.d/elpa/web-mode-20150618.1109/web-mode.el b/emacs.d/elpa/web-mode-20150618.1109/web-mode.el
deleted file mode 100644
index 8bdf22a..0000000
--- a/emacs.d/elpa/web-mode-20150618.1109/web-mode.el
+++ /dev/null
@@ -1,11223 +0,0 @@
-;;; web-mode.el --- major mode for editing web templates
-;;; -*- coding: utf-8 -*-
-
-;; Copyright 2011-2015 François-Xavier Bois
-
-;; Version: 11.2.9
-;; Package-Version: 20150618.1109
-;; Author: François-Xavier Bois <fxbois AT Google Mail Service>
-;; Maintainer: François-Xavier Bois
-;; Created: July 2011
-;; Keywords: languages
-;; Homepage: http://web-mode.org
-;; Repository: http://github.com/fxbois/web-mode
-;; License: GNU General Public License >= 2
-;; Distribution: This file is not part of Emacs
-
-;;==============================================================================
-;; WEB-MODE is sponsored by Kernix : Great Digital Agency (Web&Mobile) in Paris
-;;==============================================================================
-
-;; Code goes here
-
-;;---- TODO --------------------------------------------------------------------
-
-;; v12 : invert path and XX (web-mode-engines-alist,
-;;       web-mode-content-types-alist) for more consistency
-
-;;---- CONSTS ------------------------------------------------------------------
-
-(defconst web-mode-version "11.2.9"
-  "Web Mode version.")
-
-;;---- GROUPS ------------------------------------------------------------------
-
-(defgroup web-mode nil
-  "Major mode for editing web templates"
-  :group 'languages
-  :prefix "web-"
-  :link '(url-link :tag "Site" "http://web-mode.org")
-  :link '(url-link :tag "Repository" "https://github.com/fxbois/web-mode"))
-
-(defgroup web-mode-faces nil
-  "Faces for syntax highlighting."
-  :group 'web-mode
-  :group 'faces)
-
-;;---- CUSTOMS -----------------------------------------------------------------
-
-(defcustom web-mode-script-padding 1
-  "Script element left padding."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-style-padding 1
-  "Style element left padding."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-block-padding 0
-  "Multi-line block (php, ruby, java, python, asp, etc.) left padding."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-attr-indent-offset nil
-  "Html attribute indentation level."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-markup-indent-offset
-  (if (and (boundp 'standard-indent) standard-indent) standard-indent 2)
-  "Html indentation level."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-css-indent-offset
-  (if (and (boundp 'standard-indent) standard-indent) standard-indent 2)
-  "CSS indentation level."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-code-indent-offset
-  (if (and (boundp 'standard-indent) standard-indent) standard-indent 2)
-  "Code (javascript, php, etc.) indentation level."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-sql-indent-offset 4
-  "Sql (inside strings) indentation level."
-  :type 'integer
-  :group 'web-mode)
-
-(defcustom web-mode-enable-css-colorization (display-graphic-p)
-  "In a CSS part, set background according to the color: #xxx, rgb(x,x,x)."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-auto-indentation (display-graphic-p)
-  "Auto-indentation."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-auto-closing (display-graphic-p)
-  "Auto-closing."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-auto-pairing (display-graphic-p)
-  "Auto-pairing."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-auto-opening (display-graphic-p)
-  "Html element auto-opening."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-auto-quoting (display-graphic-p)
-  "Add double quotes after the character = in a tag."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-auto-expanding nil
-  "e.g. s/ expands to <span>|</span>."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-control-block-indentation t
-  "Control blocks increase indentation."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-current-element-highlight nil
-  "Disable element highlight."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-current-column-highlight nil
-  "Show column for current element."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-whitespace-fontification nil
-  "Enable whitespaces."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-block-face nil
-  "Enable block face (useful for setting a background for example).
-See web-mode-block-face."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-part-face nil
-  "Enable part face (useful for setting a background for example).
-See web-mode-part-face."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-inlays nil
-  "Enable inlays (e.g. LaTeX) highlighting."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-sexp-functions t
-  "Enable specific sexp functions."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-string-interpolation t
-  "Enable string interpolation fontification (php and erb)."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-heredoc-fontification t
-  "Enable heredoc fontification. The identifier should contain JS, JAVASCRIPT, CSS or HTML."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-element-content-fontification nil
-  "Enable element content fontification. The content of an element can have a face associated."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-element-tag-fontification nil
-  "Enable tag name fontification."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-engine-detection nil
-  "Detect such directive -*- engine: ENGINE -*- at the top of the file."
-  :type 'boolean
-  :group 'web-mode)
-
-(defcustom web-mode-enable-comment-keywords '()
-  "Enable highlight of keywords like FIXME, TODO, etc. in comments."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-comment-style 1
-  "Comment style : 1 = default, 2 = force server comments outside a block."
-  :group 'web-mode
-  :type '(choice (const :tag "default" 1)
-                 (const :tag "force engine comments" 2)))
-
-(defcustom web-mode-indent-style 2
-  "Indentation style."
-  :group 'web-mode
-  :type '(choice (const :tag "default (all lines are indented)" 2)
-                 (const :tag "text at the beginning of line is not indented" 1)))
-
-(defcustom web-mode-auto-close-style 1
-  "Auto-close style."
-  :group 'web-mode
-  :type '(choice (const :tag "Auto-close on </" 1)
-                 (const :tag "Auto-close on > and </" 2)))
-
-(defcustom web-mode-extra-expanders '()
-  "A list of additional expanders."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-extra-auto-pairs '()
-  "A list of additional snippets."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-extra-snippets '()
-  "A list of additional snippets."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-extra-builtins '()
-  "A list of additional builtins."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-extra-constants '()
-  "A list of additional constants."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-extra-keywords '()
-  "A list of additional keywords."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-extra-types '()
-  "A list of additional types."
-  :type 'list
-  :group 'web-mode)
-
-(defcustom web-mode-tests-directory (concat default-directory "tests/")
-  "Directory containing all the unit tests."
-  :type 'list
-  :group 'web-mode)
-
-;;---- FACES -------------------------------------------------------------------
-
-(defface web-mode-error-face
-  '((t :background "red"))
-  "Face for warning."
-  :group 'web-mode-faces)
-
-(defface web-mode-warning-face
-  '((t :inherit font-lock-warning-face))
-  "Face for warning."
-  :group 'web-mode-faces)
-
-(defface web-mode-preprocessor-face
-  '((t :inherit font-lock-preprocessor-face))
-  "Face for preprocessor."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-delimiter-face
-  '((t :inherit font-lock-preprocessor-face))
-  "Face for block delimiters."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-control-face
-  '((t :inherit font-lock-preprocessor-face))
-  "Face for preprocessor."
-  :group 'web-mode-faces)
-
-(defface web-mode-builtin-face
-  '((t :inherit font-lock-builtin-face))
-  "Face for builtins."
-  :group 'web-mode-faces)
-
-(defface web-mode-symbol-face
-  '((t :foreground "gold"))
-  "Face for symbols."
-  :group 'web-mode-faces)
-
-(defface web-mode-doctype-face
-  '((t :foreground "Grey"))
-  "Face for html doctype."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-tag-face
-  '((((class color) (min-colors 88) (background dark))  :foreground "Snow4")
-    (((class color) (min-colors 88) (background light)) :foreground "Snow4")
-    (((class color) (min-colors 16) (background dark))  :foreground "Snow4")
-    (((class color) (min-colors 16) (background light)) :foreground "Grey15")
-    (((class color) (min-colors 8))                     :foreground "Snow4")
-    (((type tty) (class mono))                          :inverse-video t)
-    (t                                                  :foreground "Snow4"))
-  "Face for html tags."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-tag-custom-face
-  '((t :inherit web-mode-html-tag-face))
-  "Face for html custom tags (e.g. <polymer-element>)."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-tag-bracket-face
-  '((((class color) (min-colors 88) (background dark))  :foreground "Snow3")
-    (((class color) (min-colors 88) (background light)) :foreground "Grey14")
-    (((class color) (min-colors 16) (background dark))  :foreground "Snow3")
-    (((class color) (min-colors 16) (background light)) :foreground "Grey14")
-    (((class color) (min-colors 8))                     :foreground "Snow3")
-    (((type tty) (class mono))                          :inverse-video t)
-    (t                                                  :foreground "Snow3"))
-  "Face for html tags angle brackets (<, > and />)."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-attr-name-face
-  '((((class color) (min-colors 88) (background dark))  :foreground "Snow3")
-    (((class color) (min-colors 88) (background light)) :foreground "Snow4")
-    (((class color) (min-colors 16) (background dark))  :foreground "Snow3")
-    (((class color) (min-colors 16) (background light)) :foreground "Grey13")
-    (((class color) (min-colors 8))                     :foreground "Snow3")
-    (((type tty) (class mono))                          :inverse-video t)
-    (t                                                  :foreground "Snow4"))
-  "Face for html attribute names."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-attr-custom-face
-  '((t :inherit web-mode-html-attr-name-face))
-  "Face for custom attribute names (e.g. data-*)."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-attr-engine-face
-  '((t :inherit web-mode-block-delimiter-face))
-  "Face for custom engine attribute names (e.g. ng-*)."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-attr-equal-face
-  '((t :inherit web-mode-html-attr-name-face))
-  "Face for the = character between name and value."
-  :group 'web-mode-faces)
-
-(defface web-mode-html-attr-value-face
-  '((t :inherit font-lock-string-face))
-  "Face for html attribute values."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-attr-name-face
-  '((t :foreground "#8fbc8f"))
-  "Face for block attribute names."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-attr-value-face
-  '((t :foreground "#5f9ea0"))
-  "Face for block attribute values."
-  :group 'web-mode-faces)
-
-(defface web-mode-variable-name-face
-  '((t :inherit font-lock-variable-name-face))
-  "Face for variable names."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-selector-face
-  '((t :inherit font-lock-keyword-face))
-  "Face for CSS rules."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-pseudo-class-face
-  '((t :inherit font-lock-builtin-face))
-  "Face for CSS pseudo-classes."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-at-rule-face
-  '((t :inherit font-lock-constant-face))
-  "Face for CSS at-rules."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-property-name-face
-  '((t :inherit font-lock-variable-name-face))
-  "Face for CSS props."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-color-face
-  '((t :inherit font-lock-builtin-face))
-  "Face for CSS colors (#xxx)."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-priority-face
-  '((t :inherit font-lock-builtin-face))
-  "Face for CSS priority (!important)."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-function-face
-  '((t :inherit font-lock-builtin-face))
-  "Face for CSS functions."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-variable-face
-  '((t :inherit web-mode-variable-name-face :slant italic))
-  "Face for CSS vars."
-  :group 'web-mode-faces)
-
-(defface web-mode-function-name-face
-  '((t :inherit font-lock-function-name-face))
-  "Face for function names."
-  :group 'web-mode-faces)
-
-(defface web-mode-filter-face
-  '((t :inherit font-lock-function-name-face))
-  "Face for function names."
-  :group 'web-mode-faces)
-
-(defface web-mode-function-call-face
-  '((t :inherit font-lock-function-name-face))
-  "Face for function calls."
-  :group 'web-mode-faces)
-
-(defface web-mode-string-face
-  '((t :inherit font-lock-string-face))
-  "Face for strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-string-face
-  '((t :inherit web-mode-string-face))
-  "Face for block strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-part-string-face
-  '((t :inherit web-mode-string-face))
-  "Face for part strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-javascript-string-face
-  '((t :inherit web-mode-string-face))
-  "Face for javascript strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-string-face
-  '((t :inherit web-mode-string-face))
-  "Face for css strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-json-key-face
-  '((t :foreground "plum"))
-  "Face for json key strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-json-context-face
-  '((t :foreground "orchid3"))
-  "Face for json context strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-json-string-face
-  '((t :inherit web-mode-string-face))
-  "Face for json strings."
-  :group 'web-mode-faces)
-
-(defface web-mode-comment-face
-  '((t :inherit font-lock-comment-face))
-  "Face for comments."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-comment-face
-  '((t :inherit web-mode-comment-face))
-  "Face for server comments."
-  :group 'web-mode-faces)
-
-(defface web-mode-part-comment-face
-  '((t :inherit web-mode-comment-face))
-  "Face for part comments."
-  :group 'web-mode-faces)
-
-(defface web-mode-json-comment-face
-  '((t :inherit web-mode-comment-face))
-  "Face for json comments."
-  :group 'web-mode-faces)
-
-(defface web-mode-javascript-comment-face
-  '((t :inherit web-mode-comment-face))
-  "Face for javascript comments."
-  :group 'web-mode-faces)
-
-(defface web-mode-css-comment-face
-  '((t :inherit web-mode-comment-face))
-  "Face for css comments."
-  :group 'web-mode-faces)
-
-(defface web-mode-constant-face
-  '((t :inherit font-lock-constant-face))
-  "Face for language constants."
-  :group 'web-mode-faces)
-
-(defface web-mode-type-face
-  '((t :inherit font-lock-type-face))
-  "Face for language types."
-  :group 'web-mode-faces)
-
-(defface web-mode-keyword-face
-  '((t :inherit font-lock-keyword-face))
-  "Face for language keywords."
-  :group 'web-mode-faces)
-
-(defface web-mode-param-name-face
-  '((t :foreground "Snow3"))
-  "Face for server attribute names."
-  :group 'web-mode-faces)
-
-(defface web-mode-whitespace-face
-  '((t :background "DarkOrchid4"))
-  "Face for whitespaces."
-  :group 'web-mode-faces)
-
-(defface web-mode-inlay-face
-  '((((class color) (min-colors 88) (background dark))  :background "Black")
-    (((class color) (min-colors 88) (background light)) :background "LightYellow1")
-    (((class color) (min-colors 16) (background dark))  :background "Brey18")
-    (((class color) (min-colors 16) (background light)) :background "LightYellow1")
-    (((class color) (min-colors 8))                     :background "Black")
-    (((type tty) (class mono))                          :inverse-video t)
-    (t                                                  :background "Grey"))
-  "Face for inlays. Must be used in conjunction with web-mode-enable-inlays."
-  :group 'web-mode-faces)
-
-(defface web-mode-block-face
-  '((((class color) (min-colors 88) (background dark))  :background "Black")
-    (((class color) (min-colors 88) (background light)) :background "LightYellow1")
-    (((class color) (min-colors 16) (background dark))  :background "Grey18")
-    (((class color) (min-colors 16) (background light)) :background "LightYellow1")
-    (((class color) (min-colors 8))                     :background "Black")
-    (((type tty) (class mono))                          :inverse-video t)
-    (t                                                  :background "Grey"))
-  "Face for blocks (useful for setting a background for example).
-Must be used in conjunction with web-mode-enable-block-face."
-  :group 'web-mode-faces)
-
-(defface web-mode-part-face
-  '((t :inherit web-mode-block-face))
-  "Face for parts."
-  :group 'web-mode-faces)
-
-(defface web-mode-script-face
-  '((t :inherit web-mode-part-face))
-  "Face for javascript inside a script element."
-  :group 'web-mode-faces)
-
-(defface web-mode-style-face
-  '((t :inherit web-mode-part-face))
-  "Face for css inside a style element."
-  :group 'web-mode-faces)
-
-(defface web-mode-folded-face
-  '((t :underline t))
-  "Overlay face for folded."
-  :group 'web-mode-faces)
-
-(defface web-mode-bold-face
-  '((t :weight bold))
-  "bold face."
-  :group 'web-mode-faces)
-
-(defface web-mode-italic-face
-  '((t :slant italic))
-  "bold face."
-  :group 'web-mode-faces)
-
-(defface web-mode-underline-face
-  '((t :underline t))
-  "bold face."
-  :group 'web-mode-faces)
-
-(defface web-mode-current-element-highlight-face
-  '((t :background "#000000"))
-  "Overlay face for element highlight."
-  :group 'web-mode-faces)
-
-(defface web-mode-current-column-highlight-face
-  '((t :background "#3e3c36"))
-  "Overlay face for current column."
-  :group 'web-mode-faces)
-
-(defface web-mode-comment-keyword-face
-  '((t :weight bold :box t))
-  "Comment keywords."
-  :group 'web-mode-faces)
-
-(defface web-mode-sql-keyword-face
-  '((t :weight bold :slant italic))
-  "Sql keywords."
-  :group 'web-mode-faces)
-
-;;---- VARS --------------------------------------------------------------------
-
-(defvar font-lock-beg)
-(defvar font-lock-end)
-
-(defvar web-mode-auto-pairs nil)
-(defvar web-mode-block-regexp nil)
-(defvar web-mode-chunk-length 64)
-(defvar web-mode-column-overlays nil)
-(defvar web-mode-comments-invisible nil)
-(defvar web-mode-content-type "")
-(defvar web-mode-inhibit-fontification nil)
-(defvar web-mode-end-tag-overlay nil)
-(defvar web-mode-engine nil)
-(defvar web-mode-engine-attr-regexp nil)
-(defvar web-mode-engine-font-lock-keywords nil)
-(defvar web-mode-engine-token-regexp nil)
-(defvar web-mode-expand-initial-pos nil)
-(defvar web-mode-expand-initial-scroll nil)
-(defvar web-mode-expand-previous-state "")
-(defvar web-mode-font-lock-keywords '(web-mode-font-lock-highlight))
-(defvar web-mode-change-beg nil)
-(defvar web-mode-change-end nil)
-(defvar web-mode-hook nil)
-(defvar web-mode-inlay-regexp nil)
-(defvar web-mode-is-scratch nil)
-(defvar web-mode-jshint-errors 0)
-(defvar web-mode-obarray nil)
-(defvar web-mode-snippets nil)
-(defvar web-mode-start-tag-overlay nil)
-(defvar web-mode-minor-engine nil)
-(defvar web-mode-time (current-time))
-
-(defvar web-mode-pre-elements '("code" "pre" "textarea"))
-
-(defvar web-mode-void-elements
-  '("area" "base" "br" "col" "command" "embed" "hr" "img" "input" "keygen"
-    "link" "meta" "param" "source" "track" "wbr"))
-
-(defvar web-mode-part-content-types '("css" "javascript" "json" "jsx"))
-
-(defvar web-mode-javascript-languages '("javascript" "jsx" "ejs"))
-
-;; NOTE: without 'syntax-table forward-word fails (bug#377)
-(defvar web-mode-scan-properties
-  (list 'tag-beg 'tag-end 'tag-name 'tag-type 'tag-attr 'tag-attr-end
-        'part-side 'part-token 'part-element 'part-expr
-        'block-side 'block-token 'block-controls 'block-beg 'block-end
-        'syntax-table)
-  "Text properties used for code regions/tokens and html nodes.")
-
-(defvar web-mode-start-tag-regexp "<\\([[:alpha:]][[:alnum:]-]*\\)"
-  "Regular expression for HTML/XML start tag.")
-
-(defvar web-mode-whitespaces-regexp
-  "^[ \t]\\{2,\\}$\\| \t\\|\t \\|[ \t]+$\\|^[ \n\t]+\\'\\|^[ \t]?[\n]\\{2,\\}"
-  "Regular expression for whitespaces.")
-
-(defvar web-mode-imenu-regexp-list
-  '(("<\\(h[1-9]\\)\\([^>]*\\)>\\([^<]*\\)" 1 3 ">")
-    ("^[ \t]*<\\([@a-z]+\\)[^>]*>? *$" 1 "id=\"\\([a-zA-Z0-9_]+\\)\"" "#" ">"))
-  "Regexps to match imenu items (see http://web-mode.org/doc/imenu.txt)")
-
-(defvar web-mode-indentation-params
-  '(("lineup-args"    . t)
-    ("lineup-calls"   . t)
-    ("lineup-concats" . t)
-    ))
-
-(defvar web-mode-engines
-  '(("angular"          . ("angularjs" "angular.js"))
-    ("asp"              . ())
-    ("aspx"             . ())
-    ("blade"            . ("laravel"))
-    ("cl-emb"           . ())
-    ("clip"             . ())
-    ("closure"          . ("soy"))
-    ("ctemplate"        . ("mustache" "handlebars" "hapax" "ngtemplate" "ember"
-                           "kite" "meteor" "blaze" "ractive"))
-    ("django"           . ("dtl" "twig" "swig" "jinja" "erlydtl" "liquid"
-                           "clabango" "selmer" "nunjucks"))
-    ("dust"             . ("dustjs"))
-    ("ejs"              . ())
-    ("elixir"           . ())
-    ("erb"              . ("eruby" "erubis"))
-    ("freemarker"       . ())
-    ("go"               . ("gtl"))
-    ("jsp"              . ("grails"))
-    ("mako"             . ())
-    ("mason"            . ("poet"))
-    ("lsp"              . ("lisp"))
-    ("mojolicious"      . ())
-    ("php"              . ())
-    ("python"           . ())
-    ("razor"            . ("play" "play2"))
-    ("template-toolkit" . ())
-    ("smarty"           . ())
-    ("thymeleaf"        . ())
-    ("underscore"       . ("underscore.js"))
-    ("velocity"         . ("vtl" "cheetah" "ssp"))
-    ("web2py"           . ()))
-  "Engine name aliases")
-
-(defvar web-mode-content-types
-  '(("css"        . "\\.\\(s?css\\|css\\.erb\\)\\'")
-    ("javascript" . "\\.\\(js\\|js\\.erb\\)\\'")
-    ("json"       . "\\.\\(api\\|json\\|jsonld\\)\\'")
-    ("jsx"        . "\\.jsx\\'")
-    ("xml"        . "\\.xml\\'")
-    ("html"       . "."))
-  "content types")
-
-(defvar web-mode-engine-attr-regexps
-  '(("angular"   . "ng-")
-    ("thymeleaf" . "th:"))
-  "Engine custom attributes")
-
-(defvar web-mode-last-enabled-feature nil)
-
-(defvar web-mode-features
-  '(("css-colorization"          . web-mode-enable-css-colorization)
-    ("element-highlight"         . web-mode-enable-current-element-highlight)
-    ("column-highlight"          . web-mode-enable-current-column-highlight)
-    ("whitespace-fontification"  . web-mode-enable-whitespace-fontification)
-    ("element-tag-fontification" . web-mode-enable-element-tag-fontification)
-    ("block-face"                . web-mode-enable-block-face)
-    ("part-face"                 . web-mode-enable-part-face)))
-
-(defvar web-mode-comment-formats
-  '(("java"       . "/*")
-    ("javascript" . "/*")
-    ("php"        . "/*")
-    ))
-
-(defvar web-mode-engine-file-regexps
-  '(("asp"              . "\\.asp\\'")
-    ("aspx"             . "\\.as[cp]x\\'")
-    ("blade"            . "\\.blade\\.php\\'")
-    ("cl-emb"           . "\\.clemb\\'")
-    ("clip"             . "\\.ctml\\'")
-    ("closure"          . "\\.soy\\'")
-    ("ctemplate"        . "\\.\\(chtml\\|mustache\\)\\'")
-    ("django"           . "\\.\\(djhtml\\|tmpl\\|dtl\\|liquid\\|j2\\)\\'")
-    ("dust"             . "\\.dust\\'")
-    ("elixir"           . "\\.eex\\'")
-    ("ejs"              . "\\.ejs\\'")
-    ("erb"              . "\\.\\(erb\\|rhtml\\|erb\\.html\\)\\'")
-    ("freemarker"       . "\\.ftl\\'")
-    ("go"               . "\\.go\\(html\\|tmpl\\)\\'")
-    ("handlebars"       . "\\.\\(hb\\.html\\|hbs\\)\\'")
-    ("jinja"            . "\\.jinja\\'")
-    ("jsp"              . "\\.[gj]sp\\'")
-    ("lsp"              . "\\.lsp\\'")
-    ("mako"             . "\\.mako?\\'")
-    ("mason"            . "\\.mas\\'")
-    ("mojolicious"      . "\\.epl?\\'")
-    ("php"              . "\\.\\(p[hs]p\\|ctp\\|inc\\)\\'")
-    ("python"           . "\\.pml\\'")
-    ("razor"            . "\\.\\(cs\\|vb\\)html\\'")
-    ("smarty"           . "\\.tpl\\'")
-    ("template-toolkit" . "\\.tt.?\\'")
-    ("thymeleaf"        . "\\.thtml\\'")
-    ("velocity"         . "\\.v\\(sl\\|tl\\|m\\)\\'")
-
-    ("django"           . "[st]wig")
-    ("razor"            . "scala")
-
-    )
-  "Engine file extensions.")
-
-(defvar web-mode-smart-quotes
-  '("«" . "»")
-  "Preferred smart quotes")
-
-(defvar web-mode-xml-chars
-  '((?\& . "&amp;")
-    (?\< . "&lt;")
-    (?\> . "&gt;"))
-  "XML chars")
-
-(defvar web-mode-html-entities
-  '(("AElig" . 198) ("Aacute" . 193) ("Acirc" . 194) ("Agrave" . 192)
-    ("Alpha" . 913) ("Aring" . 197) ("Atilde" . 195) ("Auml" . 196)
-    ("Beta" . 914)
-    ("Ccedil" . 199) ("Chi" . 935)
-    ("Dagger" . 8225) ("Delta" . 916)
-    ("ETH" . 208) ("Eacute" . 201) ("Ecirc" . 202) ("Egrave" . 200)
-    ("Epsilon" . 917) ("Eta" . 919) ("Euml" . 203)
-    ("Gamma" . 915)
-    ("Iacute" . 205) ("Icirc" . 206) ("Igrave" . 204) ("Iota" . 921)
-    ("Iuml" . 207)
-    ("Kappa" . 922)
-    ("Lambda" . 923)
-    ("Mu" . 924)
-    ("Ntilde" . 209) ("Nu" . 925)
-    ("OElig" . 338) ("Oacute" . 211) ("Ocirc" . 212) ("Ograve" . 210)
-    ("Omega" . 937) ("Omicron" . 927) ("Oslash" . 216) ("Otilde" . 213)
-    ("Ouml" . 214)
-    ("Phi" . 934) ("Pi" . 928) ("Prime" . 8243) ("Psi" . 936)
-    ("Rho" . 929)
-    ("Scaron" . 352) ("Sigma" . 931)
-    ("THORN" . 222) ("Tau" . 932) ("Theta" . 920)
-    ("UArr" . 8657) ("Uacute" . 218) ("Uacute" . 250) ("Ucirc" . 219)
-    ("Ugrave" . 217)  ("Upsih" . 978)
-    ("Upsilon" . 933) ("Uuml" . 220) ("Uuml" . 252)
-    ("Xi" . 926)
-    ("Yacute" . 221) ("Yuml" . 376)
-    ("Zeta" . 918)
-    ("aacute" . 225) ("acirc" . 226) ("acute" . 180) ("aelig" . 230)
-    ("agrave" . 224) ("alefsym" . 8501) ("alpha" . 945) ("amp" . 38)
-    ("ang" . 8736) ("apos" . 39) ("aring" . 229) ("asymp" . 8776)
-    ("atilde" . 227) ("auml" . 228)
-    ("bdquo" . 8222) ("beta" . 946) ("brvbar" . 166) ("bull" . 8226)
-    ("cap" . 8745) ("ccedil" . 231) ("cedil" . 184) ("cent" . 162)
-    ("chi" . 967) ("circ" . 710) ("clubs" . 9827) ("cong" . 8773)
-    ("copy" . 169) ("crarr"  . 8629) ("cup" . 8746) ("curren" . 164)
-    ("dArr" . 8659) ("dagger" . 8224) ("darr" . 8595) ("deg" . 176)
-    ("delta" . 948) ("diams" . 9830) ("divide" . 247)
-    ("eacute" . 233) ("ecirc"  . 234) ("egrave" . 232) ("empty" . 8709)
-    ("emsp" . 8195) ("ensp" . 8194) ("epsilon" . 949) ("equiv" . 8801)
-    ("eta" . 951) ("eth" . 240) ("euml" . 235) ("euro" . 8364) ("exist" . 8707)
-    ("fnof" . 402) ("forall" . 8704) ("frac12" . 189) ("frac14" . 188)
-    ("frac34" . 190) ("frasl" . 8260)
-    ("gamma" . 947) ("ge" . 8805) ("gt" . 62)
-    ("hArr" . 8660) ("harr" . 8596) ("hearts" . 9829) ("hellip" . 8230)
-    ("iacute" . 237) ("icirc" . 238) ("iexcl" . 161) ("igrave" . 236)
-    ("image" . 8465) ("infin" . 8734) ("int" . 8747) ("iota" . 953)
-    ("iquest" . 191) ("isin" . 8712) ("iuml" . 239)
-    ("kappa" . 954)
-    ("lArr" . 8656) ("lambda" . 955) ("lang" . 9001) ("laquo" . 171)
-    ("larr" . 8592) ("lceil" . 8968) ("ldquo" . 8220) ("le" . 8804)
-    ("lfloor" . 8970) ("lowast" . 8727) ("loz" . 9674) ("lrm" . 8206)
-    ("lsaquo" . 8249) ("lsquo" . 8249) ("lt" . 60)
-    ("macr" . 175) ("mdash" . 8212) ("micro" . 181) ("middot" . 183)
-    ("minus" . 8722) ("mu" . 956)
-    ("nabla" . 8711) ("nbsp" . 160) ("ndash" . 8211) ("ne" . 8800)
-    ("ni" . 8715) ("not" . 172) ("notin" . 8713) ("nsub" . 8836)
-    ("ntilde" . 241) ("nu" . 957) ("oacute" . 243) ("ocirc" . 244)
-    ("oelig" . 339) ("ograve" . 242) ("oline" . 8254) ("omega" . 969)
-    ("omicron" . 959) ("oplus" . 8853) ("or" . 8744) ("ordf" . 170)
-    ("ordm" . 186) ("oslash" . 248) ("otilde" . 245) ("otimes" . 8855)
-    ("ouml" . 246)
-    ("para" . 182) ("part" . 8706) ("permil" . 8240) ("perp" . 8869)
-    ("phi" . 966) ("pi" . 960) ("piv" . 982) ("plusmn" . 177) ("pound" . 163)
-    ("prime" . 8242) ("prod" . 8719) ("prop" . 8733) ("psi" . 968)
-    ("quot" . 34)
-    ("rArr" . 8658) ("radic" . 8730) ("rang" . 9002) ("raquo" . 187)
-    ("rarr" . 8594) ("rceil" . 8969) ("rdquo" . 8221) ("real" . 8476)
-    ("reg" . 174) ("rfloor" . 8971) ("rho" . 961) ("rlm" . 8207)
-    ("rsaquo" . 8250) ("rsquo" . 8250) ("sbquo" . 8218)
-    ("scaron" . 353) ("sdot" . 8901) ("sect" . 167) ("shy" . 173)
-    ("sigma" . 963) ("sigmaf" . 962) ("sim" . 8764) ("spades" . 9824)
-    ("sub" . 8834) ("sube" . 8838) ("sum" . 8721) ("sup" . 8835)
-    ("sup1" . 185) ("sup2" . 178) ("sup3" . 179) ("supe" . 8839)
-    ("szlig" . 223)
-    ("tau" . 964) ("there4" . 8756) ("theta" . 952) ("thetasym" . 977)
-    ("thinsp" . 8201) ("thorn" . 254) ("tilde" . 732) ("times" . 215)
-    ("trade" . 8482)
-    ("uarr" . 8593) ("ucirc" . 251) ("ugrave" . 249) ("uml" . 168)
-    ("upsilon" . 965)
-    ("weierp" . 8472)
-    ("xi" . 958)
-    ("yacute" . 253) ("yen" . 165) ("yuml" . 255)
-    ("zeta" . 950) ("zwj" . 8205) ("zwnj" . 8204)))
-
-;; http://webdesign.about.com/od/localization/l/blhtmlcodes-ascii.htm
-(defvar web-mode-display-table
-  (let ((table (make-display-table)))
-    (aset table 9  (vector ?\xBB ?\t)) ;tab
-    (aset table 10 (vector ?\xB6 ?\n)) ;line feed
-    (aset table 32 (vector ?\xB7))
-    table)
-  "Display table used when switching to the whitespace visualization.")
-
-(defvar web-mode-expanders
-  '(("a/" . "<a href=\"|\"></a>")
-    ("b/" . "<table><tbody><tr><td>|</td><td></td></tr></tbody></table>")
-    ("c/" . "<div class=\"|\"></div>")
-    ("d/" . "<div>|</div>")
-    ("e/" . "<em>|</em>")
-    ("f/" . "<form>|</form>")
-    ("g/" . "<strong>|</strong>")
-    ("h/" . "<h1>|</h1>")
-    ("i/" . "<img src=\"|\" />")
-    ("j/" . "<script>|</script>")
-    ("l/" . "<li>|</li>")
-    ("m/" . "<main>|</main>")
-    ("n/" . "<input type=\"|\" />")
-    ("p/" . "<p>|</p>")
-    ("q/" . "<quote>|</quote>")
-    ("s/" . "<span>|</span>")
-    ("t/" . "<td>|</td>")
-    ("u/" . "<ul><li>|</li><li></li></ul>")
-    ("x/" . "<textarea>|</textarea>")
-    ("2/" . "<h2>|</h2>")
-    ("3/" . "<h3>|</h3>")
-    ("?/" . "<?php | ?>")))
-
-(defvar web-mode-engines-auto-pairs
-  '(("angular"          . (("{{ " . " }}")))
-    ("asp"              . (("<% " . " %>")))
-    ("aspx"             . (("<% " . " %>")
-                           ("<%=" . "%>")
-                           ("<%#" . "%>")
-                           ("<%$" . "%>")
-                           ("<%@" . "%>")
-                           ("<%:" . "%>")
-                           ("<%-" . "- | --%>")))
-    ("blade"            . (("{{{" . " | }}}")
-                           ("{{ " . " }}")
-                           ("{!!" . " | !!}")
-                           ("@{{" . " | }}")
-                           ("{{-" . "- | --}}")))
-    ("cl-emb"           . (("<% " . " %>")
-                           ("<%=" . " | %>")
-                           ("<%#" . " | %>")))
-    ("ctemplate"        . (("{{ " . "| }}")
-                           ("{{{" . " | }}}")
-                           ("{~{" . " | }}")
-                           ("{{~" . "{ | }}}")
-                           ("{{!" . "-- | --}}")
-                           ("{{/" . "}}")
-                           ("{{#" . "}}")))
-    ("django"           . (("{{ " . " }}")
-                           ("{% " . " %}")
-                           ("{%-" . " | %}")
-                           ("{# " . " #}")))
-    ("elixir"           . (("<% " . " %>")
-                           ("<%=" . " | %>")
-                           ("<%%" . " | %>")
-                           ("<%#" . " | %>")))
-    ("ejs"              . (("<% " . " %>")
-                           ("<%=" . "%>")
-                           ("<%#" . "%>")
-                           ("<%-" . "%>")))
-    ("erb"              . (("<% " . " %>")
-                           ("<%=" . "%>")
-                           ("<%#" . "%>")
-                           ("<%-" . "%>")))
-    ("freemarker"       . (("<% " . " %>")
-                           ("${ " . " }")
-                           ("[% " . " %]")
-                           ("[# " . " #]")
-                           ("[#-" . "- | --]")))
-    ("jsp"              . (("<% " . " %>")
-                           ("<%-" . "- | %>")
-                           ("<%=" . "%>")
-                           ("<%!" . "%>")
-                           ("<%@" . "%>")
-                           ("${ " . " }")))
-    ("lsp"              . (("<% " . " %>")
-                           ("<%%" . " | %>")
-                           ("<%#" . " | %>")))
-    ("mako"             . (("<% " . " %>")
-                           ("<%!" . " | %>")
-                           ("${ " . " }")))
-    ("mason"            . (("<% " . " %>")
-                           ("<& " . " &>")))
-    ("mojolicious"      . (("<% " . " %>")
-                           ("<%=" . " | %>")
-                           ("<%%" . " | %>")
-                           ("<%#" . " | %>")))
-    ("php"              . (("<?p" . "hp | ?>")
-                           ("<? " . " ?>")
-                           ("<?=" . "?>")))
-    ("template-toolkit" . (("[% " . " %]")
-                           ("[%-" . " | %]")
-                           ("[%#" . " | %]")))
-    ("underscore"       . (("<% " . " %>")))
-    ("web2py"           . (("{{ " . " }}")
-                           ("{{=" . "}}")))
-    (nil                . (("<!-" . "- | -->")))
-    ))
-
-(defvar web-mode-engines-snippets
-  '(("ejs" . (("for"     . "<% for (|) { %>\n\n<% } %>")
-              ("if"      . "<% if (|) { %>\n\n<% } %>")
-              ))
-    ("erb" . (("each"    . "<% |.each do  %>\n\n<% end %>")
-              ("if"      . "<% if | %>\n\n<% end %>")
-              ("when"    . "<% when | %>\n\n<% end %>")
-              ("unless"  . "<% unless | %>\n\n<% end %>")
-              ))
-    ("php" . (("if"      . "<?php if (|): ?>\n\n<?php endif; ?>")
-              ("while"   . "<?php while (|): ?>\n\n<?php endwhile; ?>")
-              ("for"     . "<?php for (| ; ; ): ?>\n\n<?php endfor; ?>")
-              ("foreach" . "<?php foreach (| as ): ?>\n\n<?php endforeach; ?>")
-              ("each"    . "<?php foreach (| as ): ?>\n\n<?php endforeach; ?>")
-              ("switch"  . "<?php switch (|): ?>\n<?php case 1: ?>\n\n<?php break ;?>\n<?php case 2: ?>\n\n<?php break ;?>\n<?php endswitch;?>")
-              ))
-    ("django" . (("block"      . "{% block | %}\n\n{% endblock %}")
-                 ("comment"    . "{% comment | %}\n\n{% endcomment %}")
-                 ("cycle"      . "{% cycle | as  %}\n\n{% endcycle  %}")
-                 ("filter"     . "{% filter | %}\n\n{% endfilter %}")
-                 ("for"        . "{% for | in  %}\n\n{% endfor %}")
-                 ("if"         . "{% if | %}\n\n{% endif %}")
-                 ("ifequal"    . "{% ifequal | %}\n\n{% endifequal %}")
-                 ("ifnotequal" . "{% ifnotequal | %}\n\n{% endifnotequal %}")
-                 ("safe"       . "{% safe | %}\n\n{% endsafe %}")
-                 ))
-    ("template-toolkit" . (("if"      . "[% IF | %]\n\n[% END %]")
-                           ))
-    (nil . (("html5" . "<!doctype html>\n<html>\n<head>\n<title></title>\n<meta charset=\"utf-8\" />\n</head>\n<body>\n|\n</body>\n</html>")
-            ("table" . "<table><tbody>\n<tr>\n<td>|</td>\n<td></td>\n</tr>\n</tbody></table>")
-            ("ul"    . "<ul>\n<li>|</li>\n<li></li>\n</ul>")
-            ))
-    ))
-
-(defvar web-mode-engine-token-regexps
-  (list
-   '("asp"         . "//\\|/\\*\\|\"\\|'")
-   '("ejs"         . "//\\|/\\*\\|\"\\|'")
-   '("erb"         . "\"\\|'\\|#\\|<<[-]?['\"]?\\([[:alnum:]_]+\\)['\"]?")
-   '("lsp"         . "\"\\|#|\\|;")
-   '("mako"        . "\"\\|'\\|#")
-   '("mason"       . "\"\\|'\\|#")
-   '("mojolicious" . "\"\\|'")
-   '("php"         . "//\\|/\\*\\|#\\|\"\\|'\\|<<<['\"]?\\([[:alnum:]]+\\)['\"]?")
-   '("python"      . "\"\\|'\\|#")
-   '("web2py"      . "\"\\|'"))
-  "Engine regexps used to identify tokens (strings / comments) in blocks.")
-
-(defvar web-mode-engine-open-delimiter-regexps
-  (list
-   '("angular"          . "{{")
-   '("asp"              . "<%\\|</?[[:alpha:]]+:[[:alpha:]]+\\|</?[[:alpha:]]+Template")
-   '("aspx"             . "<%.")
-   '("blade"            . "{{.\\|{!!\\|@{{\\|^[ \t]*@[[:alpha:]]")
-   '("cl-emb"           . "<%")
-   '("closure"          . "{.\\|/\\*\\| //")
-   '("clip"             . "</?c:[[:alpha:]-]+")
-   '("ctemplate"        . "[$]?{[{~].")
-   '("django"           . "{[#{%]")
-   '("dust"             . "{.")
-   '("elixir"           . "<%.")
-   '("ejs"              . "<%")
-   '("erb"              . "<%\\|^%.")
-   '("freemarker"       . "<%\\|${\\|</?[[:alpha:]]+:[[:alpha:]]\\|</?[@#]\\|\\[/?[@#].")
-   '("go"               . "{{.")
-   '("jsp"              . "<%\\|${\\|</?[[:alpha:]]+:[[:alpha:]]+")
-   '("lsp"              . "<%")
-   '("mako"             . "</?%\\|${\\|^[ \t]*%.\\|^[ \t]*##")
-   '("mason"            . "</?[&%]\\|^%.")
-   '("mojolicious"      . "<%\\|^[ \t]*%.")
-   '("php"              . "<\\?")
-   '("python"           . "<\\?")
-   '("razor"            . "@.\\|^[ \t]*}")
-   '("smarty"           . "{[[:alpha:]#$/*\"]")
-   '("template-toolkit" . "\\[%.")
-   '("underscore"       . "<%")
-   '("velocity"         . "^[ \t]*#[[:alpha:]#*]\\|$[[:alpha:]!{]")
-   '("web2py"           . "{{"))
-  "Engine regexps used to identify blocks.")
-
-(defvar web-mode-normalization-rules
-  '(("tag-case"          . "lower-case")
-    ("attr-case"         . "lower-case")
-    ("special-chars"     . "unicode") ; "unicode" "entities"
-    ("css-indentation"   . t)
-    ("smart-apostrophes" . t)
-    ("smart-quotes"      . t)
-    ("whitespaces"       . t)
-    ("indentation"       . t))
-  "Normalization rules")
-
-(defvar web-mode-element-tag-faces
-  (list
-   '("h1"     . web-mode-underline-face)
-   '("h2"     . web-mode-underline-face)
-   '("h3"     . web-mode-underline-face)
-   '("h4"     . web-mode-underline-face)
-   '("title"  . web-mode-underline-face)
-   '("em"     . web-mode-italic-face)
-   '("strong" . web-mode-bold-face)
-   ))
-
-(defvar web-mode-element-content-faces
-  (list
-   '("h1"     . web-mode-underline-face)
-   '("h2"     . web-mode-underline-face)
-   '("h3"     . web-mode-underline-face)
-   '("h4"     . web-mode-underline-face)
-   '("title"  . web-mode-underline-face)
-   '("em"     . web-mode-italic-face)
-   '("strong" . web-mode-bold-face)
-   ))
-
-(defvar web-mode-comment-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "comment" web-mode-extra-keywords))
-    '("FIXME" "TODO" "BUG" "KLUDGE" "WORKAROUND" "OPTIMIZE" "HACK" "REFACTOR" "REVIEW"))))
-
-(defvar web-mode-sql-queries
-  (regexp-opt
-   '("SELECT" "INSERT" "UPDATE" "DELETE")))
-
-(defvar web-mode-sql-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "sql" web-mode-extra-keywords))
-    '("SELECT" "INSERT" "UPDATE" "DELETE"
-      "FROM" "WHERE" "GROUP BY" "LIMIT" "HAVING" "JOIN" "LEFT" "INNER"
-      "FULL" "OUTER" "VALUES" "ORDER BY" "SEPARATOR" "ASC" "DESC"
-      "AND" "OR" "ON"))))
-
-(defvar web-mode-python-constants
-  (regexp-opt
-   (append
-    (cdr (assoc "python" web-mode-extra-constants))
-    '("True" "False" "None" "__debug__" "NotImplemented" "Ellipsis"))))
-
-(defvar web-mode-erlang-constants
-  (regexp-opt
-   (append
-    (cdr (assoc "erlang" web-mode-extra-constants))
-    '("true" "false"))))
-
-(defvar web-mode-erlang-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "erlang" web-mode-extra-keywords))
-    '("else" "if" "do" "end"))))
-
-(defvar web-mode-cl-emb-constants
-  (regexp-opt
-   '("nil" "t" "raw" "escape")))
-
-(defvar web-mode-cl-emb-keywords
-  (regexp-opt
-   '("if" "else" "endif" "unless" "endunless" "var" "repeat"
-     "endrepeat" "loop" "endloop" "include" "call" "with"
-     "endwith" "set" "genloop" "endgenloop" "insert")))
-
-(defvar web-mode-lsp-constants
-  (regexp-opt
-   '("nil" "t")))
-
-(defvar web-mode-lsp-keywords
-  (regexp-opt
-   '("dolist" "let" "while" "cond" "when" "progn" "if"
-     "dotimes" "unless" "lambda"
-     "loop" "for" "and" "or" "in" "do" "defun")))
-
-(defvar web-mode-php-constants
-  (regexp-opt
-   (append
-    (cdr (assoc "php" web-mode-extra-constants))
-    '("TRUE" "FALSE" "NULL" "true" "false" "null"
-      "STR_PAD_LEFT" "STR_PAD_RIGHT"
-      "ENT_COMPAT" "ENT_QUOTES" "ENT_NOQUOTES" "ENT_IGNORE"
-      "ENT_SUBSTITUTE" "ENT_DISALLOWED" "ENT_HTML401" "ENT_XML1"
-      "ENT_XHTML" "ENT_HTML5" "JSON_PRETTY_PRINT"
-      "LIBXML_NOBLANKS"))))
-
-(defvar web-mode-php-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "php" web-mode-extra-keywords))
-    '("and" "array" "as" "break"
-      "callable" "case" "catch"  "catch all" "class" "const" "continue"
-      "default" "die" "do" "echo" "else" "elseif" "empty"
-      "endfor" "endforeach" "endif" "endswitch" "endwhile" "exit" "extends"
-      "finally" "for" "foreach" "function" "global" "goto"
-      "if" "include" "include_once" "instanceof" "interface" "isset"
-      "list" "next" "new" "or" "private" "protected" "public"
-      "require" "require_once" "return" "static" "switch" "try" "throw"
-      "unset" "use" "var" "when" "while" "xor" "yield"))))
-
-(defvar web-mode-php-types
-  (eval-when-compile
-    (regexp-opt
-     '("array" "bool" "boolean" "char" "const" "double" "float"
-       "int" "integer" "long" "mixed" "object" "real" "string"))))
-
-(defvar web-mode-css-at-rules
-  (eval-when-compile
-    (regexp-opt
-     '("charset" "import" "media" "page" "font-face"
-       "namespace" "supports" "document"
-       "keyframes" "-moz-keyframes" "-webkit-keyframes"
-       "mixin"))))
-
-(defvar web-mode-css-pseudo-classes
-  (eval-when-compile
-    (regexp-opt
-     '("active" "after" "before" "checked" "disabled" "empty" "enabled"
-       "first" "first-child" "first-letter" "first-line" "first-of-type" "focus"
-       "hover" "lang" "last-child" "last-of-type" "left" "link"
-       "not" "nth-child" "nth-last-child" "nth-last-of-type" "nth-of-type"
-       "only-child" "only-of-type"
-       "right" "root" "selection" "target" "visited"))))
-
-(defvar web-mode-python-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "python" web-mode-extra-keywords))
-    '("and" "as" "assert" "break" "class" "continue" "def" "del"
-      "elif" "else" "except" "finally" "for" "from" "global"
-      "if" "import" "in" "is" "lambda" "nonlocal" "not" "or" "pass"
-      "raise" "return" "try" "while" "with" "yield"))))
-
-(defvar web-mode-jsp-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "jsp" web-mode-extra-keywords))
-    '("case" "catch" "do" "else" "end" "false" "for" "function"
-      "if" "in" "include"
-      "new" "package" "page" "private" "protected" "public"
-      "return" "tag" "taglib" "throw" "throws" "true" "try" "void" "while"))))
-
-(defvar web-mode-erb-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "erb" web-mode-extra-keywords))
-    '("alias" "and" "begin" "break" "case" "class" "def" "defined?" "do"
-      "elsif" "else" "end" "ensure" "fail" "for" "if" "in"
-      "module" "next" "not" "or" "redo" "rescue" "retry" "return"
-      "then" "super" "unless" "undef" "until" "when" "while" "yield"
-      "__ENCODING__" "__FILE__" "__LINE__"))))
-
-(defvar web-mode-mason-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "mason" web-mode-extra-keywords))
-    '("and" "base" "close" "die" "each" "else" "elsif" "eval" "exists"
-      "foreach" "grep" "if" "length" "local" "my" "next" "open" "or"
-      "package" "pop" "ref" "return" "stat" "sub" "tie"
-      "undef" "unless" "use" "while"))))
-
-(defvar web-mode-erb-builtins
-  (regexp-opt
-   (append
-    (cdr (assoc "erb" web-mode-extra-builtins))
-
-    '("__callee__" "__dir__" "__method__"
-      "abort" "at_exit" "autoload" "autoload?"
-      "binding" "block_given?" "caller" "catch"
-      "eval" "exec" "exit" "exit!" "fail" "fork" "format"
-      "lambda" "load" "loop" "open"
-      "p" "print" "printf" "proc" "putc" "puts"
-      "raise" "rand" "readline" "readlines" "require" "require_relative"
-      "sleep" "spawn" "sprintf" "srand" "syscall" "system"
-      "throw" "trap" "warn"
-      "alias_method" "attr" "attr_accessor" "attr_reader" "attr_writer"
-      "define_method" "extend" "include" "module_function"
-      "prepend" "private" "protected" "public"
-      "refine" "using"
-
-      "error_message_on" "error_messages_for" "form" "input"
-      "auto_discovery_link_tag" "image_tag" "javascript_include_tag"
-      "stylesheet_link_tag" "image_path" "path_to_image"" "
-      "javascript_path" "path_to_javascript" "register_javascript_expansion"
-      "register_javascript_include_default" "register_stylesheet_expansion"
-      "stylesheet_path" "path_to_stylesheet" "atom_feed" "entry" "updated"
-      "benchmark" "cache" "capture" "content_for" "distance_of_time_in_words"
-      "distance_of_time_in_words_to_now" "time_ago_in_words" "date_select"
-      "datetime_select" "time_select" "select_date" "select_datetime"
-      "select_day" "select_hour" "select_minute" "select_month" "select_second"
-      "select_time" "select_year" "debug"
-      "check_box" "fields_for" "file_field" "form_for" "hidden_field"
-      "label" "password_field" "radio_button" "text_area" "text_field"
-      "check_box_tag" "field_set_tag" "file_field_tag" "form_tag"
-      "hidden_field_tag" "image_submit_tag" "label_tag" "password_field_tag"
-      "radio_button_tag" "select_tag" "submit_tag" "text_area_tag"
-      "text_field_tag"
-      "collection_select" "country_options_for_select" "country_select"
-      "option_groups_from_collection_for_select" "options_for_select"
-      "options_from_collection_for_select" "select"
-      "time_zone_options_for_select"
-      "time_zone_select" "button_to_function" "define_javascript_functions"
-      "escape_javascript" "javascript_tag" "link_to_function"" "
-      "number_to_currency" "number_to_human_size" "number_to_percentage"
-      "number_to_phone" "number_with_delimiter" "number_with_precision"
-      "evaluate_remote_response" "form_remote_for" "form_remote_tag"
-      "link_to_remote" "observe_field" "observe_field"
-      "periodically_call_remote"
-      "remote_form_for" "remote_function" "submit_to_remote" "update_page"
-      "update_page_tag" "dom_class" "dom_id" "partial_path" "sanitize"
-      "sanitize_css" "strip_links" "strip_tags"
-      "cdata_section" "content_tag" "escape_once" "tag"
-      "auto_link" "concat" "cycle" "excerpt" "highlight" "markdown" "pluralize"
-      "reset_cycle" "simple_format" "textilize" "textilize_without_paragraph"
-      "truncate" "word_wrap" "button_to" "current_page?" "link_to" "link_to_if"
-      "link_to_unless" "link_to_unless_current" "mail_to" "url_for"
-      "action_name" "atom_feed" "audio_path" "audio_tag"
-      "content_tag_for" "controller" "controller_name" "action_name"
-      "controller_path" "convert_to_model" "cookies" "csrf_meta_tag"
-      "csrf_meta_tags" "headers"
-      "current_cycle" "div_for" "email_field" "email_field_tag"
-      "favicon_link_tag" "flash" "l" "button_tag"
-      "grouped_collection_select" "grouped_options_for_select"
-      "image_alt" "j" "javascript_cdata_section"
-      "localize" "logger" "number_field"
-      "number_field_tag" "number_to_human" "params" "path_to_audio"
-      "path_to_video" "phone_field" "phone_field_tag" "provide"
-      "range_field" "range_field_tag" "raw" "render" "request"
-      "request_forgery_protection_token" "response" "safe_concat"
-      "safe_join" "search_field" "search_field_tag"
-      "session" "t" "telephone_field" "telephone_field_tag"
-      "time_tag" "translate" "url_field" "url_field_tag"
-      "url_options" "video_path" "video_tag" "simple_form_for"
-
-      ))))
-
-(defvar web-mode-asp-constants
-  (regexp-opt
-   (append
-    (cdr (assoc "asp" web-mode-extra-constants))
-    '("adAsyncExecute" "adAsyncFetch" "adAsyncFetchNonBlocking" "adCmdFile"
-      "adCmdStoredProc" "adCmdTable" "adCmdTableDirect" "adCmdText" "adCmdUnknown"
-      "adCmdUnspecified" "adExecuteNoRecords" "adExecuteRecord" "adExecuteStream"
-      "adLockBatchOptimistic" "adLockOptimistic" "adLockPessimistic"
-      "adLockReadOnly" "adLockUnspecified" "adOpenDynamic" "adOpenForwardOnly"
-      "adOpenKeyset" "adOpenStatic" "adOpenUnspecified" "adOptionUnspecified"
-      "Empty" "Nothing" "Null" "True" "False"
-      "vbBack" "vbCr" "vbCrLf" "vbFormFeed" "vbLf" "vbNewLine" "vbNullChar"
-      "vbNullString" "vbObjectError" "vbScript" "vbTab" "vbVerticalTab"))))
-
-(defvar web-mode-asp-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "asp" web-mode-extra-keywords))
-    '("Abs" "And" "Array" "Asc" "Atn"
-      "CBool" "CByte" "CCur" "CDate" "CDbl" "CInt" "CLng" "CSng" "CStr"
-      "Call" "Case" "Chr" "Class" "Const" "Cos" "CreateObject"
-      "Date" "DateAdd" "DateDiff" "DatePart" "DateSerial" "DateValue"
-      "Day" "Dim" "Do"
-      "Each" "Else" "ElseIf" "End" "Erase" "Err" "Eval" "Exit" "Exp"
-      "Explicit"
-      "Filter" "Fix" "For" "FormatCurrency" "FormatDateTime"
-      "FormatNumber" "FormatPercent" "Function"
-      "GetLocale" "GetObject" "GetRef" "Hex" "Hour"
-      "If" "In" "InStr" "InStrRev" "InputBox" "Int" "IsArray" "IsDate"
-      "IsEmpty" "IsNull" "IsNumeric" "IsObject" "Join"
-      "LBound" "LCase" "LTrim" "Language" "Left" "Len" "Let"
-      "LoadPicture" "Log" "Loop"
-      "Mid" "Minute" "Month" "MonthName" "MsgBox"
-      "New" "Next" "Not" "Now"
-      "Oct" "On" "Option" "Or" "Preserve" "Private" "Public"
-      "RGB" "RTrim" "Redim" "Rem" "Replace" "Right" "Rnd" "Round"
-      "ScriptEngine" "ScriptEngineBuildVersion"
-      "ScriptEngineMajorVersion" "ScriptEngineMinorVersion"
-      "Second" "Select" "Set" "SetLocale" "Sgn" "Sin" "Space" "Split"
-      "Sqr" "StrComp" "StrReverse" "String" "Sub"
-      "Tan" "Then" "Time" "TimeSerial" "TimeValue" "Timer" "To" "Trim"
-      "TypeName"
-      "UBound" "UCase" "Until" "VarType"
-      "Weekday" "WeekdayName" "Wend" "With" "While" "Year"))))
-
-(defvar web-mode-asp-types
-  (regexp-opt
-   (append
-    (cdr (assoc "asp" web-mode-extra-types))
-    '("Application" "ASPError" "Request" "Response" "Server" "Session"))))
-
-(defvar web-mode-aspx-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "aspx" web-mode-extra-keywords))
-    '("case" "catch" "do" "else" "end" "for" "foreach" "function"
-      "if" "in" "include" "new" "package" "page" "return"
-      "tag" "throw" "throws" "try" "while"))))
-
-(defvar web-mode-smarty-keywords
-  (regexp-opt '("as")))
-
-(defvar web-mode-velocity-keywords
-  (eval-when-compile
-    (regexp-opt '("in"))))
-
-(defvar web-mode-freemarker-keywords
-  (eval-when-compile
-    (regexp-opt '("as" "list"))))
-
-(defvar web-mode-go-keywords
-  (eval-when-compile
-    (regexp-opt
-     '("define" "else" "end" "if" "pipeline" "range" "template" "with"))))
-
-(defvar web-mode-go-functions
-  (eval-when-compile
-    (regexp-opt
-     '("and" "call" "html" "index" "js" "len" "not" "or"
-       "print" "printf" "println" "urlquery"))))
-
-(defvar web-mode-closure-keywords
-  (eval-when-compile
-    (regexp-opt '("in" "and" "not" "or"))))
-
-(defvar web-mode-django-control-blocks
-  '("assets" "autoescape"
-    "block" "blocktrans"
-    "cache" "call" "capture" "comment"
-    "draw"
-    "embed"
-    "filter" "for" "foreach" "form"
-    "if" "ifchanged" "ifequal" "ifnotequal"
-    "macro"
-    "random" "raw"
-    "safe" "sandbox" "spaceless"
-    "tablerow"
-    "unless"
-    "verbatim"
-    "with"
-
-    "endassets" "endautoescape"
-    "endblock" "endblocktrans"
-    "endcache" "endcall" "endcapture" "endcomment"
-    "draw"
-    "endembed"
-    "endfilter" "endfor" "endforeach" "endform"
-    "endif" "endifchanged" "endifequal" "endifnotequal"
-    "endmacro"
-    "endrandom" "endraw"
-    "endsafe" "endsandbox"  "endspaceless"
-    "endtablerow"
-    "endunless"
-    "endverbatim"
-    "endwith"
-
-    ;; "set" "endset" ;#504
-
-    "csrf_token" "cycle" "debug"
-    "elif" "else" "elseif" "elsif" "empty" "extends"
-    "firstof" "include" "load" "lorem" "now" "regroup" "ssi"
-    "trans" "templatetag" "url" "widthratio"
-
-    ))
-
-(defvar web-mode-django-control-blocks-regexp
-  (regexp-opt web-mode-django-control-blocks t))
-
-(defvar web-mode-django-keywords
-  (eval-when-compile
-    (regexp-opt
-     '("and" "as" "assign"
-       "break"
-       "cache" "call" "case" "context" "continue"
-       "do"
-       "flush" "from"
-       "ignore" "import" "in" "is"
-       "layout" "load"
-       "missing"
-       "none" "not"
-       "or"
-       "pluralize"
-       "random"
-       "set" ;#504
-       "unless" "use"
-       "var"
-       ))))
-
-(defvar web-mode-django-types
-  (eval-when-compile
-    (regexp-opt '("null" "false" "true"))))
-
-(defvar web-mode-directives
-  (eval-when-compile
-    (regexp-opt
-     '("include" "page" "taglib"
-       "Assembly" "Control" "Implements" "Import"
-       "Master" "OutputCache" "Page" "Reference" "Register"))))
-
-(defvar web-mode-template-toolkit-keywords
-  (regexp-opt
-   '("block" "call" "case" "catch" "clear" "default" "do"
-     "else" "elsif" "end" "filter" "final" "for"
-     "foreach" "get" "if" "in" "include" "insert" "is" "last"
-     "macro" "meta" "or" "perl" "process" "rawperl" "return"
-     "set" "stop" "switch" "tags" "throw" "try"
-     "unless" "use" "while" "wrapper")))
-
-(defvar web-mode-perl-keywords
-  (regexp-opt
-   '("__DATA__" "__END__" "__FILE__" "__LINE__" "__PACKAGE__"
-     "and" "cmp" "continue" "CORE" "do" "else" "elsif" "eq" "exp"
-     "for" "foreach" "ge" "gt" "if" "le" "lock" "lt" "m" "ne" "no"
-     "or" "package" "q" "qq" "qr" "qw" "qx" "s" "sub"
-     "tr" "unless" "until" "while" "xor" "y"
-     "my" "use" "print" "say")))
-
-(defvar web-mode-javascript-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "javascript" web-mode-extra-keywords))
-    '("break" "case" "catch" "class" "const" "continue"
-      "debugger" "default" "delete" "do" "else" "enum" "eval"
-      "export" "extends" "finally" "for" "function" "if"
-      "implements" "import" "in" "instanceof" "interface" "let"
-      "new" "package" "private" "protected" "public"
-      "return" "static" "super" "switch" "throw"
-      "try" "typeof" "var" "void" "while" "with" "yield"))))
-
-(defvar web-mode-javascript-constants
-  (regexp-opt
-   '("false" "null" "undefined" "Infinity" "NaN" "true" "arguments" "this")))
-
-(defvar web-mode-razor-keywords
-  (regexp-opt
-   (append
-    (cdr (assoc "razor" web-mode-extra-keywords))
-    '("false" "true" "foreach" "if" "else" "in" "var" "for" "display"
-      "match" "case"
-      "Html"))))
-
-(defvar web-mode-selector-font-lock-keywords
-  (list
-   '("$[[:alnum:]-]+" 0 'web-mode-css-variable-face)
-   (cons (concat "@\\(" web-mode-css-at-rules "\\)\\>")
-         '(0 'web-mode-css-at-rule-face))
-   '("\\<\\(all\|braille\\|embossed\\|handheld\\|print\\|projection\\|screen\\|speech\\|tty\\|tv\\|and\\|or\\)\\>"
-     1 'web-mode-keyword-face)
-   '("[^,]+" 0 'web-mode-css-selector-face)
-   (cons (concat ":\\(" web-mode-css-pseudo-classes "\\)\\(([^)]*)\\)?")
-         '(0 'web-mode-css-pseudo-class-face t t))
-   ))
-
-(defvar web-mode-declaration-font-lock-keywords
-  (list
-   '("--[[:alnum:]-]+" 0 'web-mode-css-variable-face)
-   '("$[[:alnum:]-]+" 0 'web-mode-css-variable-face)
-   (cons (concat "@\\(" web-mode-css-at-rules "\\)\\>")
-         '(1 'web-mode-css-at-rule-face))
-   '("\\([[:alpha:]-]+\\)[ ]?:" 0 'web-mode-css-property-name-face)
-   '("\\([[:alpha:]-]+\\)[ ]?(" 1 'web-mode-css-function-face)
-   '("#[[:alnum:]]\\{1,6\\}" 0 'web-mode-css-color-face t t)
-   '("![ ]?important" 0 'web-mode-css-priority-face t t)
-   '("\\([^,]+\\)[ ]+{" 1 'web-mode-css-selector-face)
-   '("'[^']*'\\|\"[^\"]*\"" 0 'web-mode-string-face t t)
-   ))
-
-(defvar web-mode-html-font-lock-keywords
-  (list
-   '("</?[[:alnum:]]+[ >]\\|>" 0 'web-mode-html-tag-face t)
-   '(" \\([[:alnum:]-]+=\\)\\(\"[^\"]+\"\\)"
-     (1 'web-mode-html-attr-name-face)
-     (2 'web-mode-html-attr-value-face))
-   ))
-
-(defvar web-mode-javascript-font-lock-keywords
-  (list
-   '("@\\([[:alnum:]_]+\\)\\>" 0 'web-mode-keyword-face)
-   (cons (concat "\\<\\(" web-mode-javascript-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-javascript-constants "\\)\\>")
-         '(0 'web-mode-constant-face))
-   '("\\<\\(new\\|instanceof\\|class\\|extends\\) \\([[:alnum:]_.]+\\)\\>" 2 'web-mode-type-face)
-   '("\\<\\([[:alnum:]_]+\\):[ ]*function[ ]*(" 1 'web-mode-function-name-face)
-   '("\\<function[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
-   '("\\<\\([[:alnum:]_]+\\)([^)]*)[ ]*{" 1 'web-mode-function-name-face)
-   '("\\<\\(var\\|let\\|const\\)[ ]+\\([[:alnum:]_]+\\)" 2 'web-mode-variable-name-face)
-   '("\\<\\(function\\)[ ]*("
-     (1 'web-mode-keyword-face)
-     ("\\([[:alnum:]_]+\\)\\([ ]*=[^,)]*\\)?[,)]" nil nil (1 'web-mode-variable-name-face)))
-   '("\\([[:alnum:]_]+\\):" 1 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-html-tag-font-lock-keywords
-  (list
-   '("\\(</?\\)\\([[:alnum:]]+\\)"
-     (1 'web-mode-html-tag-bracket-face)
-     (2 'web-mode-html-tag-face))
-   '("\"[^\"]*\"" 0 'web-mode-html-attr-value-face)
-   '("\\([[:alnum:]]+\\)" 1 'web-mode-html-attr-name-face)
-   '("/?>" 0 'web-mode-html-tag-bracket-face)
-  ))
-
-(defvar web-mode-dust-font-lock-keywords
-  (list
-   '("{[#:/?@><+^]\\([[:alpha:]_.]+\\)" 1 'web-mode-block-control-face)
-   '(":\\([[:alpha:]]+\\)" 1 'web-mode-keyword-face)
-   '("\\<\\([[:alnum:]_]+=\\)\\(\"[^\"]*\"\\|[[:alnum:]_]*\\)"
-     (1 'web-mode-block-attr-name-face)
-     (2 'web-mode-block-attr-value-face))
-   '("\\\([[:alnum:]_.]+\\)" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-template-toolkit-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-template-toolkit-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   '("\\\([[:alpha:]][[:alnum:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("\\\([[:alpha:]][[:alnum:]_]+\\)" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-smarty-font-lock-keywords
-  (list
-   (cons (concat "[ ]\\(" web-mode-smarty-keywords "\\)[ ]")
-         '(1 'web-mode-keyword-face))
-   '("{/?\\([[:alpha:]_]+\\)" 1 'web-mode-block-control-face)
-   '("\\([}{]\\)" 0 'web-mode-block-delimiter-face)
-   '("\\<\\([$]\\)\\([[:alnum:]_]+\\)" (1 nil) (2 'web-mode-variable-name-face))
-   '("\\<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '(" \\(\\sw+[ ]?=\\)" 1 'web-mode-param-name-face)
-   '(" \\(\\sw+\\)[ }]" 1 'web-mode-param-name-face)
-   '("|\\([[:alnum:]_]+\\)" 1 'web-mode-function-call-face)
-   '("\\(->\\)\\(\\sw+\\)" (1 nil) (2 'web-mode-variable-name-face))
-   '("[.]\\([[:alnum:]_-]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[.]\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
-   '("#\\([[:alnum:]_]+\\)#" 1 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-velocity-font-lock-keywords
-  (list
-   '("#\\([[:alpha:]_]+\\)\\>" (1 'web-mode-block-control-face))
-   (cons (concat "[ ]\\(" web-mode-velocity-keywords "\\)[ ]") '(1 'web-mode-keyword-face t t))
-   '("#macro([ ]*\\([[:alpha:]]+\\)[ ]+" 1 'web-mode-function-name-face)
-   '("[.]\\([[:alnum:]_-]+\\)" 1 'web-mode-variable-name-face)
-   '("\\<\\($[!]?[{]?\\)\\([[:alnum:]_-]+\\)[}]?" (1 nil) (2 'web-mode-variable-name-face))
-   ))
-
-(defvar web-mode-mako-tag-font-lock-keywords
-  (list
-   '("</?%\\([[:alpha:]:]+\\)" 1 'web-mode-block-control-face)
-   '("\\<\\([[:alpha:]]+=\\)\\(\"[^\"]*\"\\)"
-     (1 'web-mode-block-attr-name-face t t)
-     (2 'web-mode-block-attr-value-face t t))
-   ))
-
-(defvar web-mode-mako-block-font-lock-keywords
-  (list
-   '("\\<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
-   (cons (concat "\\<\\(" web-mode-python-constants "\\)\\>")
-         '(1 'web-mode-constant-face))
-   (cons (concat "\\<\\(" web-mode-python-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   (cons (concat "\\<\\(endfor\\|endif\\|endwhile\\)\\>")
-         '(1 'web-mode-keyword-face))
-   ))
-
-(defvar web-mode-web2py-font-lock-keywords
-  (list
-   '("\\<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
-   (cons (concat "\\<\\(" web-mode-python-constants "\\)\\>")
-         '(1 'web-mode-constant-face))
-   (cons (concat "\\<\\(" web-mode-python-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   (cons (concat "\\<\\(block\\|extend\\|super\\|end\\|include\\)\\>")
-         '(1 'web-mode-keyword-face))
-   ))
-
-(defvar web-mode-django-expr-font-lock-keywords
-  (list
-   '("|[ ]?\\([[:alpha:]_]+\\)\\>" 1 'web-mode-filter-face)
-   (cons (concat "\\<\\(" web-mode-django-types "\\)\\>")
-         '(1 'web-mode-type-face))
-   '("\\<\\([[:alpha:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[[:alnum:]_]+" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-django-code-font-lock-keywords
-  (list
-   (cons (concat "{%[ ]*\\(" web-mode-django-control-blocks-regexp "\\)\\>")
-         '(1 'web-mode-block-control-face))
-   '("{%[ ]*\\(end[[:alpha:]]+\\)\\>" 1 'web-mode-block-control-face) ;#504
-   (cons (concat "\\<\\(" web-mode-django-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-django-types "\\)\\>")
-         '(1 'web-mode-type-face))
-   '("|[ ]?\\([[:alpha:]_]+\\)\\>" 1 'web-mode-function-call-face)
-   '("\\<\\([[:alpha:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[[:alnum:]_.]+" 0 'web-mode-variable-name-face)
-   '("[[:alnum:]_]+\\([.][[:alnum:]_]+\\)+" 0 'web-mode-variable-name-face t t)
-   ))
-
-(defvar web-mode-ctemplate-font-lock-keywords
-  (list
-   '("{[~]?{[#/>]?[ ]*\\([[:alnum:]_-]+\\)" 1 'web-mode-block-control-face)
-   '("[ \t]+\\([[:alnum:]_]+\\)=\\([[:alnum:]_.]+\\|\"[^\"]+\"\\)"
-     (1 'web-mode-block-attr-name-face)
-     (2 'web-mode-block-attr-value-face))
-   '("\"[^\"]+\"" 0 'web-mode-block-string-face)
-   ))
-
-(defvar web-mode-razor-font-lock-keywords
-  (list
-   '("@\\([[:alnum:]_.]+\\)[ ]*[({]" 1 'web-mode-block-control-face)
-   (cons (concat "\\<\\(" web-mode-razor-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   '("@\\([[:alnum:]_.]+\\)" 1 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-closure-font-lock-keywords
-  (list
-   '("{/?\\([[:alpha:]]+\\)" 1 'web-mode-block-control-face)
-   '("{param[ ]+\\([[:alnum:]]+\\)" 1 'web-mode-symbol-face)
-   '("\\<\\(true\\|false\\|null\\)\\>" 1 'web-mode-type-face)
-   (cons (concat "\\<\\(" web-mode-closure-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   '("{\\(alias\\|call\\|delcall\\|delpackage\\|deltemplate\\|namespace\\|template\\)[ ]+\\([[:alnum:].]+\\)" 2 'web-mode-constant-face)
-   '("\\(allowemptydefault\\|data\\|desc\\|meaning\\|autoescape\\|private\\|variant\\)=" 0 'web-mode-block-attr-name-face)
-   '("|\\([[:alpha:]]+\\)" 1 'web-mode-function-call-face)
-   '("\\<\\([[:alnum:]]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("$\\([[:alnum:]._]+\\)" 1 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-go-font-lock-keywords
-  (list
-   '("{{[ ]*\\([[:alpha:]]+\\)" 1 'web-mode-block-control-face)
-   (cons (concat "\\<\\(" web-mode-go-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-go-functions "\\)\\>")
-         '(1 'web-mode-function-call-face))
-   '("[$.]\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face t t)
-   ))
-
-(defvar web-mode-expression-font-lock-keywords
-  (list
-   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-angular-font-lock-keywords
-  (list
-   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-underscore-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-javascript-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   '("\\<\\(_\.[[:alpha:]]+\\)(" 1 'web-mode-function-call-face)
-   '("\\<new \\([[:alnum:]_.]+\\)\\>" 1 'web-mode-type-face)
-   '("\\<\\([[:alnum:]_]+\\):[ ]*function[ ]*(" 1 'web-mode-function-name-face)
-   '("\\<\\(var\\)\\>[ ]+\\([[:alnum:]_]+\\)"
-     (1 'web-mode-keyword-face)
-     (2 'web-mode-variable-name-face))
-   ))
-
-(defvar web-mode-engine-tag-font-lock-keywords
-  (list
-   '("</?\\([[:alpha:]]+\\(?:Template\\|:[[:alpha:]-]+\\)\\)" 1 'web-mode-block-control-face)
-   '("\\<\\([[:alpha:]-]+=\\)\\(\"[^\"]*\"\\)"
-     (1 'web-mode-block-attr-name-face t t)
-     (2 'web-mode-block-attr-value-face t t))
-   '("\\<\\([[:alpha:]-]+=\\)\\('[^']*\'\\)"
-     (1 'web-mode-block-attr-name-face t t)
-     (2 'web-mode-block-attr-value-face t t))
-   ))
-
-(defvar web-mode-jsp-font-lock-keywords
-  (list
-   '("\\(throws\\|new\\|extends\\)[ ]+\\([[:alnum:].]+\\)" 2 'web-mode-type-face)
-   (cons (concat "\\<\\(" web-mode-jsp-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   '("\\<\\([[:alnum:]._]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("@\\(\\sw*\\)" 1 'web-mode-variable-name-face)
-   '("\\<\\([[:alnum:].]+\\)[ ]+[{[:alpha:]]+" 1 'web-mode-type-face)
-   ))
-
-(defvar web-mode-asp-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-asp-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-asp-types "\\)\\>")
-         '(0 'web-mode-type-face))
-   (cons (concat "\\<\\(" web-mode-asp-constants "\\)\\>")
-         '(0 'web-mode-constant-face))
-   '("\\(Class\\|new\\) \\([[:alnum:]_]+\\)" 2 'web-mode-type-face)
-   '("Const \\([[:alnum:]_]+\\)" 1 'web-mode-constant-face)
-   '("\\<dim\\>"
-     (0 'web-mode-keyword-face)
-     ("[[:alnum:]_]+" nil nil (0 'web-mode-variable-name-face)))
-   '("\\<\\(public\\|private\\|sub\\|function\\)\\> \\([[:alnum:]_]+\\)[ ]*("
-     2 'web-mode-function-name-face)
-   '("\\<\\(public\\|private\\|dim\\)\\> \\([[:alnum:]_]+\\)"
-     2 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-aspx-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-aspx-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   '("\\<\\([[:alnum:].]+\\)[ ]+[[:alpha:]]+" 1 'web-mode-type-face)
-   ))
-
-(defvar web-mode-uel-font-lock-keywords
-  (list
-   '("[$#{]{\\|}" 0 'web-mode-preprocessor-face)
-   '("\\([[:alpha:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("|[ ]*\\(trim\\|x\\|u\\)" 1 'web-mode-function-call-face)
-   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-php-var-interpolation-font-lock-keywords
-  (list
-   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
-   '("\".+\"\\|'.*'" 0 'web-mode-string-face)
-   ))
-
-(defvar web-mode-freemarker-square-font-lock-keywords
-  (list
-   '("\\[/?[#@]\\([[:alpha:]_.]*\\)" 1 'web-mode-block-control-face)
-   '("#\\(macro\\|function\\) \\([[:alpha:]]+\\)" 2 'web-mode-function-name-face)
-   (cons (concat "\\<\\(" web-mode-freemarker-keywords "\\)\\>")
-         '(1 'web-mode-keyword-face))
-   '("\\<\\([[:alnum:]._]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[[:alpha:]]\\([[:alnum:]_]+\\)?" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-freemarker-font-lock-keywords
-  (list
-   '("</?[#@]\\([[:alpha:]_.]*\\)" 1 'web-mode-block-control-face)
-   '("#\\(macro\\|function\\) \\([[:alpha:]]+\\)" 2 'web-mode-function-name-face)
-   (cons (concat "\\<\\(" web-mode-freemarker-keywords "\\)\\>") '(1 'web-mode-keyword-face))
-   '("\\<\\([[:alnum:]._]+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[[:alpha:]]\\([[:alnum:]_]+\\)?" 0 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-directive-font-lock-keywords
-  (list
-   '("<%@[ ]*\\([[:alpha:]]+\\)[ ]+" 1 'web-mode-block-control-face)
-   '("\\<\\([[:alpha:]]+=\\)\\(\"[^\"]*\"\\)"
-     (1 'web-mode-block-attr-name-face t t)
-     (2 'web-mode-block-attr-value-face t t))
-   ))
-
-(defvar web-mode-erb-font-lock-keywords
-  (list
-   '("[^:]\\(:[[:alnum:]_]+\\)" 1 'web-mode-symbol-face)
-   '("\\([[:alnum:]_]+:\\)[ ]+" 1 'web-mode-symbol-face)
-   (cons (concat "\\<\\(" web-mode-erb-builtins "\\)\\>")
-         '(0 'web-mode-builtin-face))
-   (cons (concat "\\<\\(" web-mode-erb-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   '("\\<\\(self\\|true\\|false\\|nil\\)\\>" 0 'web-mode-variable-name-face)
-   '("[@$]@?\\([[:alnum:]_]+\\)" 0 'web-mode-variable-name-face)
-   '("class[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-type-face)
-   '("def[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
-   '("\\(?:\\_<\\|::\\)\\([A-Z]+[[:alnum:]_]+\\)" 1 (unless (eq (char-after) ?\() 'web-mode-type-face))
-   '("/[^/]+/" 0 'web-mode-string-face)
-   ))
-
-(defvar web-mode-ejs-font-lock-keywords
-  web-mode-javascript-font-lock-keywords)
-
-(defvar web-mode-python-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-python-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   ))
-
-(defvar web-mode-erlang-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-erlang-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-erlang-constants "\\)\\>")
-         '(0 'web-mode-constant-face))
-   '("@\\([[:alnum:]_]+\\)" 0 'web-mode-variable-name-face)
-   '("[ ]\\(:[[:alnum:]-_]+\\)" 1 'web-mode-symbol-face)
-   ))
-
-(defvar web-mode-mason-code-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-mason-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   '("sub[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
-;;   '(" | \\([hun]+\\) " 1 'web-mode-function-name-face)
-   '("\\<\\([[:alnum:]_]+\\)[ ]?::" 1 'web-mode-type-face)
-   '("\\([@]\\)\\([[:alnum:]#_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
-   '("\\<\\([$%]\\)\\([[:alnum:]@#_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
-   '("{\\([[:alnum:]_]+\\)}" 1 'web-mode-variable-name-face)
-   '("\\<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[[:alnum:]_][ ]?::[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
-   '("->[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
-   '("\\(?:method\\|def\\) \\([[:alnum:]._]+\\)" 1 'web-mode-function-name-face)
-   '("|[ ]*\\([[:alnum:],]+\\)[ ]*%>" 1 'web-mode-filter-face)
-   ))
-
-(defvar web-mode-mason-block-font-lock-keywords
-  (list
-   '("<[/]?%\\([[:alpha:]]+\\)" 1 'web-mode-block-control-face)
-   '("[[:alpha:]]" 0 'web-mode-block-attr-value-face)
-   ))
-
-(defvar web-mode-mojolicious-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-perl-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   '("\\<\\(begin\\|end\\)\\>" 1 'web-mode-constant-face)
-   '("\\<\\([$]\\)\\([[:alnum:]_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
-   ))
-
-(defvar web-mode-lsp-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-lsp-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-lsp-constants "\\)\\>")
-         '(1 'web-mode-constant-face))
-   '("[ ]\\(:[[:alnum:]-_]+\\)" 1 'web-mode-symbol-face)
-   '("(defun \\([[:alnum:]-:]+\\)" 1 'web-mode-function-name-face)
-   '("(defvar \\([[:alnum:]-:]+\\)" 1 'web-mode-variable-name-face)
-   ))
-
-(defvar web-mode-cl-emb-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-cl-emb-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   (cons (concat "\\<\\(" web-mode-cl-emb-constants "\\)\\>")
-         '(0 'web-mode-constant-face))
-   '("\\(@\\)" 1 'web-mode-function-call-face)
-   (list (concat "\\(@" web-mode-cl-emb-keywords "\\)[ ]+\\([[:alnum:]_]+\\)")
-         '(1 'web-mode-keyword-face)
-         '(2 'web-mode-variable-name-face))
-   ))
-
-(defvar web-mode-php-font-lock-keywords
-  (list
-   (cons (concat "\\<\\(" web-mode-php-keywords "\\)\\>")
-         '(0 'web-mode-keyword-face))
-   (cons (concat "(\\<\\(" web-mode-php-types "\\)\\>")
-         '(1 'web-mode-type-face))
-   (cons (concat "\\<\\(" web-mode-php-constants "\\)\\>")
-         '(0 'web-mode-constant-face))
-   '("function[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
-   '("\\<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
-   '("[[:alnum:]_][ ]?::[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-constant-face)
-   '("->[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
-   '("\\<\\([[:alnum:]_]+\\)[ ]?::" 1 'web-mode-type-face)
-   '("\\<\\(instanceof\\|class\\|extends\\|new\\)[ ]+\\([[:alnum:]_]+\\)" 2 'web-mode-type-face)
-   '("\\<\\([$]\\)\\([[:alnum:]_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
-   ))
-
-(defvar web-mode-latex-font-lock-keywords
-  (list
-   '("[[:alnum:]_]+" 0 'web-mode-function-name-face t t)
-   ))
-
-(defvar web-mode-blade-font-lock-keywords
-  (append
-   (list
-    '("@\\([[:alpha:]_]+\\)" (1 'web-mode-block-control-face)))
-   web-mode-php-font-lock-keywords))
-
-(defvar web-mode-engines-font-lock-keywords
-  '(("angular"          . web-mode-angular-font-lock-keywords)
-;;    ("asp"              . web-mode-asp-font-lock-keywords)
-    ("blade"            . web-mode-blade-font-lock-keywords)
-    ("cl-emb"           . web-mode-cl-emb-font-lock-keywords)
-    ("closure"          . web-mode-closure-font-lock-keywords)
-    ("ctemplate"        . web-mode-ctemplate-font-lock-keywords)
-    ("dust"             . web-mode-dust-font-lock-keywords)
-    ("elixir"           . web-mode-erlang-font-lock-keywords)
-    ("ejs"              . web-mode-ejs-font-lock-keywords)
-    ("erb"              . web-mode-erb-font-lock-keywords)
-    ("go"               . web-mode-go-font-lock-keywords)
-    ("lsp"              . web-mode-lsp-font-lock-keywords)
-;;    ("mason"            . web-mode-mason-font-lock-keywords)
-    ("mojolicious"      . web-mode-mojolicious-font-lock-keywords)
-    ("php"              . web-mode-php-font-lock-keywords)
-    ("python"           . web-mode-python-font-lock-keywords)
-    ("razor"            . web-mode-razor-font-lock-keywords)
-    ("smarty"           . web-mode-smarty-font-lock-keywords)
-    ("template-toolkit" . web-mode-template-toolkit-font-lock-keywords)
-    ("underscore"       . web-mode-underscore-font-lock-keywords)
-    ("web2py"           . web-mode-web2py-font-lock-keywords)
-    ("velocity"         . web-mode-velocity-font-lock-keywords))
-  "Engines font-lock keywords")
-
-(defvar web-mode-before-auto-complete-hooks nil
-  "List of functions to run before triggering the auto-complete library.
-
-Auto-complete sources will sometimes need some tweaking to work
-nicely with web-mode. This hook gives users the chance to adjust
-the environment as needed for ac-sources, right before they're used.")
-
-(defvar web-mode-ac-sources-alist nil
-  "alist mapping language names to ac-sources for that language.")
-
-(defvar web-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (modify-syntax-entry ?_ "w" table)
-    (modify-syntax-entry ?< "." table)
-    (modify-syntax-entry ?> "." table)
-    (modify-syntax-entry ?& "." table)
-    (modify-syntax-entry ?/ "." table)
-    (modify-syntax-entry ?= "." table)
-    (modify-syntax-entry ?% "." table)
-    table)
-  "Syntax table used to reveal whitespaces.")
-
-(defvar web-mode-map
-  (let ((map (make-sparse-keymap)))
-
-    (define-key map [menu-bar wm]             (cons "Web-Mode" (make-sparse-keymap)))
-    (define-key map [menu-bar wm dom]         (cons "Dom" (make-sparse-keymap)))
-    (define-key map [menu-bar wm blk]         (cons "Block" (make-sparse-keymap)))
-    (define-key map [menu-bar wm attr]        (cons "Html Attr" (make-sparse-keymap)))
-    (define-key map [menu-bar wm tag]         (cons "Html Tag" (make-sparse-keymap)))
-    (define-key map [menu-bar wm elt]         (cons "Html Element" (make-sparse-keymap)))
-
-    (define-key map [menu-bar wm sep-1]       '(menu-item "--"))
-
-    (define-key map [menu-bar wm dom dom-xpa] '(menu-item "XPath" web-mode-dom-xpath))
-    (define-key map [menu-bar wm dom dom-tra] '(menu-item "Traverse" web-mode-dom-traverse))
-    (define-key map [menu-bar wm dom dom-err] '(menu-item "Show error(s)" web-mode-dom-errors-show))
-    (define-key map [menu-bar wm dom dom-ent] '(menu-item "Replace html entities" web-mode-dom-entities-replace))
-    (define-key map [menu-bar wm dom dom-quo] '(menu-item "Replace dumb quotes" web-mode-dom-quotes-replace))
-    (define-key map [menu-bar wm dom dom-apo] '(menu-item "Replace apostrophes" web-mode-dom-apostrophes-replace))
-    (define-key map [menu-bar wm dom dom-nor] '(menu-item "Normalise" web-mode-dom-normalize))
-
-    (define-key map [menu-bar wm blk blk-sel] '(menu-item "Select" web-mode-block-select))
-    (define-key map [menu-bar wm blk blk-pre] '(menu-item "Previous" web-mode-block-previous))
-    (define-key map [menu-bar wm blk blk-nex] '(menu-item "Next" web-mode-block-next))
-    (define-key map [menu-bar wm blk blk-kil] '(menu-item "Kill" web-mode-block-kill))
-    (define-key map [menu-bar wm blk blk-end] '(menu-item "End" web-mode-block-end))
-    (define-key map [menu-bar wm blk blk-clo] '(menu-item "Close" web-mode-block-close))
-    (define-key map [menu-bar wm blk blk-beg] '(menu-item "Beginning" web-mode-block-beginning))
-
-    (define-key map [menu-bar wm attr attr-ins] '(menu-item "Insert" web-mode-attribute-insert))
-    (define-key map [menu-bar wm attr attr-end] '(menu-item "End" web-mode-attribute-end))
-    (define-key map [menu-bar wm attr attr-beg] '(menu-item "Beginning" web-mode-attribute-beginning))
-    (define-key map [menu-bar wm attr attr-sel] '(menu-item "Select" web-mode-attribute-select))
-    (define-key map [menu-bar wm attr attr-kil] '(menu-item "Kill" web-mode-attribute-kill))
-    (define-key map [menu-bar wm attr attr-nex] '(menu-item "Next" web-mode-attribute-next))
-    (define-key map [menu-bar wm attr attr-pre] '(menu-item "Previous" web-mode-attribute-previous))
-    (define-key map [menu-bar wm attr attr-tra] '(menu-item "Transpose" web-mode-attribute-transpose))
-
-    (define-key map [menu-bar wm tag tag-beg] '(menu-item "Sort Attributes" web-mode-tag-attributes-sort))
-    (define-key map [menu-bar wm tag tag-sel] '(menu-item "Select" web-mode-tag-select))
-    (define-key map [menu-bar wm tag tag-pre] '(menu-item "Previous" web-mode-tag-previous))
-    (define-key map [menu-bar wm tag tag-nex] '(menu-item "Next" web-mode-tag-next))
-    (define-key map [menu-bar wm tag tag-end] '(menu-item "End" web-mode-tag-end))
-    (define-key map [menu-bar wm tag tag-beg] '(menu-item "Beginning" web-mode-tag-beginning))
-
-    (define-key map [menu-bar wm elt elt-wra] '(menu-item "Wrap" web-mode-element-wrap))
-    (define-key map [menu-bar wm elt elt-van] '(menu-item "Vanish" web-mode-element-vanish))
-    (define-key map [menu-bar wm elt elt-exc] '(menu-item "Transpose" web-mode-element-transpose))
-    (define-key map [menu-bar wm elt elt-sel] '(menu-item "Select" web-mode-element-select))
-    (define-key map [menu-bar wm elt elt-ren] '(menu-item "Rename" web-mode-element-rename))
-    (define-key map [menu-bar wm elt elt-pre] '(menu-item "Previous" web-mode-element-previous))
-    (define-key map [menu-bar wm elt elt-par] '(menu-item "Parent" web-mode-element-parent))
-    (define-key map [menu-bar wm elt elt-nex] '(menu-item "Next" web-mode-element-next))
-    (define-key map [menu-bar wm elt elt-mut] '(menu-item "Mute blanks" web-mode-element-mute-blanks))
-    (define-key map [menu-bar wm elt elt-del] '(menu-item "Kill" web-mode-element-kill))
-    (define-key map [menu-bar wm elt elt-end] '(menu-item "End" web-mode-element-end))
-    (define-key map [menu-bar wm elt elt-inn] '(menu-item "Content (select)" web-mode-element-content-select))
-    (define-key map [menu-bar wm elt elt-clo] '(menu-item "Close" web-mode-element-close))
-    (define-key map [menu-bar wm elt elt-ins] '(menu-item "Insert" web-mode-element-insert))
-    (define-key map [menu-bar wm elt elt-dup] '(menu-item "Clone" web-mode-element-clone))
-    (define-key map [menu-bar wm elt elt-cfo] '(menu-item "Children fold" web-mode-element-children-fold-or-unfold))
-    (define-key map [menu-bar wm elt elt-chi] '(menu-item "Child" web-mode-element-child))
-    (define-key map [menu-bar wm elt elt-beg] '(menu-item "Beginning" web-mode-element-beginning))
-
-    (define-key map [menu-bar wm fol]         '(menu-item "Fold/Unfold" web-mode-fold-or-unfold))
-    (define-key map [menu-bar wm hig]         '(menu-item "Highlight buffer" web-mode-buffer-highlight))
-    (define-key map [menu-bar wm ind]         '(menu-item "Indent buffer" web-mode-buffer-indent))
-    (define-key map [menu-bar wm nav]         '(menu-item "Tag/Block navigation" web-mode-navigate))
-    (define-key map [menu-bar wm exp]         '(menu-item "Mark and Expand" web-mode-mark-and-expand))
-    (define-key map [menu-bar wm spa]         '(menu-item "Toggle whitespaces" web-mode-whitespaces-show))
-    (define-key map [menu-bar wm sni]         '(menu-item "Insert snippet" web-mode-snippet-insert))
-
-    ;;--------------------------------------------------------------------------
-    ;; "C-c <LETTER>" are reserved for users
-
-    (define-key map (kbd "C-c C-a b") 'web-mode-attribute-beginning)
-    (define-key map (kbd "C-c C-a e") 'web-mode-attribute-end)
-    (define-key map (kbd "C-c C-a i") 'web-mode-attribute-insert)
-    (define-key map (kbd "C-c C-a n") 'web-mode-attribute-next)
-    (define-key map (kbd "C-c C-a s") 'web-mode-attribute-select)
-    (define-key map (kbd "C-c C-a k") 'web-mode-attribute-kill)
-    (define-key map (kbd "C-c C-a p") 'web-mode-attribute-previous)
-    (define-key map (kbd "C-c C-a t") 'web-mode-attribute-transpose)
-
-    (define-key map (kbd "C-c C-b b") 'web-mode-block-beginning)
-    (define-key map (kbd "C-c C-b c") 'web-mode-block-close)
-    (define-key map (kbd "C-c C-b e") 'web-mode-block-end)
-    (define-key map (kbd "C-c C-b k") 'web-mode-block-kill)
-    (define-key map (kbd "C-c C-b n") 'web-mode-block-next)
-    (define-key map (kbd "C-c C-b p") 'web-mode-block-previous)
-    (define-key map (kbd "C-c C-b s") 'web-mode-block-select)
-
-    (define-key map (kbd "C-c C-d a") 'web-mode-dom-apostrophes-replace)
-    (define-key map (kbd "C-c C-d d") 'web-mode-dom-errors-show)
-    (define-key map (kbd "C-c C-d e") 'web-mode-dom-entities-replace)
-    (define-key map (kbd "C-c C-d n") 'web-mode-dom-normalize)
-    (define-key map (kbd "C-c C-d q") 'web-mode-dom-quotes-replace)
-    (define-key map (kbd "C-c C-d t") 'web-mode-dom-traverse)
-    (define-key map (kbd "C-c C-d x") 'web-mode-dom-xpath)
-
-    (define-key map (kbd "C-c C-e /") 'web-mode-element-close)
-    (define-key map (kbd "C-c C-e a") 'web-mode-element-content-select)
-    (define-key map (kbd "C-c C-e b") 'web-mode-element-beginning)
-    (define-key map (kbd "C-c C-e c") 'web-mode-element-clone)
-    (define-key map (kbd "C-c C-e d") 'web-mode-element-child)
-    (define-key map (kbd "C-c C-e e") 'web-mode-element-end)
-    (define-key map (kbd "C-c C-e f") 'web-mode-element-children-fold-or-unfold)
-    (define-key map (kbd "C-c C-e i") 'web-mode-element-insert)
-    (define-key map (kbd "C-c C-e k") 'web-mode-element-kill)
-    (define-key map (kbd "C-c C-e m") 'web-mode-element-mute-blanks)
-    (define-key map (kbd "C-c C-e n") 'web-mode-element-next)
-    (define-key map (kbd "C-c C-e p") 'web-mode-element-previous)
-    (define-key map (kbd "C-c C-e r") 'web-mode-element-rename)
-    (define-key map (kbd "C-c C-e s") 'web-mode-element-select)
-    (define-key map (kbd "C-c C-e t") 'web-mode-element-transpose)
-    (define-key map (kbd "C-c C-e u") 'web-mode-element-parent)
-    (define-key map (kbd "C-c C-e v") 'web-mode-element-vanish)
-    (define-key map (kbd "C-c C-e w") 'web-mode-element-wrap)
-
-    (define-key map (kbd "C-c C-t a") 'web-mode-tag-attributes-sort)
-    (define-key map (kbd "C-c C-t b") 'web-mode-tag-beginning)
-    (define-key map (kbd "C-c C-t e") 'web-mode-tag-end)
-    (define-key map (kbd "C-c C-t m") 'web-mode-tag-match)
-    (define-key map (kbd "C-c C-t n") 'web-mode-tag-next)
-    (define-key map (kbd "C-c C-t p") 'web-mode-tag-previous)
-    (define-key map (kbd "C-c C-t s") 'web-mode-tag-select)
-
-    ;;--------------------------------------------------------------------------
-
-    (define-key map (kbd "M-;")       'web-mode-comment-or-uncomment)
-
-    ;;C-c C-a : attribute
-    ;;C-c C-b : block
-    ;;C-c C-d : dom
-    ;;C-c C-e : element
-    (define-key map (kbd "C-c C-f")   'web-mode-fold-or-unfold)
-    (define-key map (kbd "C-c C-h")   'web-mode-buffer-highlight)
-    (define-key map (kbd "C-c C-i")   'web-mode-buffer-indent)
-    (define-key map (kbd "C-c C-j")   'web-mode-jshint)
-    (define-key map (kbd "C-c C-m")   'web-mode-mark-and-expand)
-    (define-key map (kbd "C-c C-n")   'web-mode-navigate)
-    (define-key map (kbd "C-c C-r")   'web-mode-reload)
-    (define-key map (kbd "C-c C-s")   'web-mode-snippet-insert)
-    ;;C-c C-t : tag
-    (define-key map (kbd "C-c C-w")   'web-mode-whitespaces-show)
-
-    map)
-  "Keymap for `web-mode'.")
-
-;;---- COMPATIBILITY -----------------------------------------------------------
-
-(eval-and-compile
-
-  (defalias 'web-mode-prog-mode
-    (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
-
-  ;; compatibility with emacs < 23.3
-  (if (fboundp 'with-silent-modifications)
-      (defalias 'web-mode-with-silent-modifications 'with-silent-modifications)
-    (defmacro web-mode-with-silent-modifications (&rest body)
-      `(let ((old-modified-p (buffer-modified-p))
-             (inhibit-modification-hooks t)
-             (buffer-undo-list t))
-         (unwind-protect
-             ,@body
-           (set-buffer-modified-p old-modified-p)))))
-
-  ;; compatibility with emacs < 24.3
-  (defun web-mode-buffer-narrowed-p ()
-    (if (fboundp 'buffer-narrowed-p)
-        (buffer-narrowed-p)
-      (/= (- (point-max) (point-min)) (buffer-size))))
-
-  ;; compatibility with emacs 22
-  (defun web-mode-string-match-p (regexp string &optional start)
-    "Same as `string-match' except it does not change the match data."
-    (let ((inhibit-changing-match-data t))
-      (string-match regexp string start)))
-
-  (unless (fboundp 'string-match-p)
-    (fset 'string-match-p (symbol-function 'web-mode-string-match-p)))
-
-  ;; compatibility with emacs < 24.3
-  (unless (fboundp 'setq-local)
-    (defmacro setq-local (var val)
-    `(set (make-local-variable ',var) ,val)))
-
-  ) ;eval-and-compile
-
-;;---- MAJOR MODE --------------------------------------------------------------
-
-;;;###autoload
-(define-derived-mode web-mode web-mode-prog-mode "Web"
-  "Major mode for editing web templates."
-
-  (make-local-variable 'web-mode-attr-indent-offset)
-  (make-local-variable 'web-mode-auto-pairs)
-  (make-local-variable 'web-mode-block-regexp)
-  (make-local-variable 'web-mode-change-beg)
-  (make-local-variable 'web-mode-change-end)
-  (make-local-variable 'web-mode-code-indent-offset)
-  (make-local-variable 'web-mode-column-overlays)
-  (make-local-variable 'web-mode-comment-style)
-  (make-local-variable 'web-mode-content-type)
-  (make-local-variable 'web-mode-css-indent-offset)
-  (make-local-variable 'web-mode-inhibit-fontification)
-  (make-local-variable 'web-mode-display-table)
-  (make-local-variable 'web-mode-enable-block-face)
-  (make-local-variable 'web-mode-enable-inlays)
-  (make-local-variable 'web-mode-enable-part-face)
-  (make-local-variable 'web-mode-enable-sexp-functions)
-  (make-local-variable 'web-mode-end-tag-overlay)
-  (make-local-variable 'web-mode-engine)
-  (make-local-variable 'web-mode-engine-attr-regexp)
-  (make-local-variable 'web-mode-engine-file-regexps)
-  (make-local-variable 'web-mode-engine-open-delimiter-regexps)
-  (make-local-variable 'web-mode-engine-token-regexp)
-  (make-local-variable 'web-mode-expand-initial-pos)
-  (make-local-variable 'web-mode-expand-initial-scroll)
-  (make-local-variable 'web-mode-expand-previous-state)
-  (make-local-variable 'web-mode-indent-style)
-  (make-local-variable 'web-mode-is-scratch)
-  (make-local-variable 'web-mode-jshint-errors)
-  (make-local-variable 'web-mode-last-enabled-feature)
-  (make-local-variable 'web-mode-markup-indent-offset)
-  (make-local-variable 'web-mode-sql-indent-offset)
-  (make-local-variable 'web-mode-start-tag-overlay)
-  (make-local-variable 'web-mode-minor-engine)
-  (make-local-variable 'web-mode-time)
-
-  (make-local-variable 'web-mode-django-control-blocks)
-  (make-local-variable 'web-mode-django-control-blocks-regexp)
-
-  (make-local-variable 'comment-end)
-  (make-local-variable 'comment-start)
-  (make-local-variable 'fill-paragraph-function)
-  (make-local-variable 'font-lock-beg)
-  (make-local-variable 'font-lock-defaults)
-  (make-local-variable 'font-lock-extend-region-functions)
-  (make-local-variable 'font-lock-end)
-  (make-local-variable 'font-lock-support-mode)
-  (make-local-variable 'font-lock-unfontify-region-function)
-  (make-local-variable 'imenu-case-fold-search)
-  (make-local-variable 'imenu-create-index-function)
-  (make-local-variable 'imenu-generic-expression)
-  (make-local-variable 'indent-line-function)
-  (make-local-variable 'parse-sexp-lookup-properties)
-;;  (make-local-variable 'syntax-propertize-function)
-  (make-local-variable 'yank-excluded-properties)
-
-  ;; NOTE: required for block-code-beg|end
-  ;;(make-local-variable 'text-property-default-nonsticky)
-  ;;(add-to-list 'text-property-default-nonsticky '(block-token . t))
-  ;;(message "%S" text-property-default-nonsticky)
-
-  (setq comment-end "-->"
-        comment-start "<!--"
-        fill-paragraph-function 'web-mode-fill-paragraph
-        font-lock-defaults '(web-mode-font-lock-keywords t)
-        font-lock-extend-region-functions '(web-mode-extend-region)
-        font-lock-support-mode nil
-        font-lock-unfontify-region-function 'web-mode-unfontify-region
-        imenu-case-fold-search t
-        imenu-create-index-function 'web-mode-imenu-index
-        indent-line-function 'web-mode-indent-line
-        parse-sexp-lookup-properties t
-;;        syntax-propertize-function nil
-        yank-excluded-properties t)
-
-  (add-hook 'after-change-functions 'web-mode-on-after-change nil t)
-  (add-hook 'after-save-hook        'web-mode-on-after-save t t)
-  (add-hook 'change-major-mode-hook 'web-mode-on-exit nil t)
-  (add-hook 'post-command-hook      'web-mode-on-post-command nil t)
-
-  (cond
-   ((boundp 'yas-after-exit-snippet-hook)
-    (add-hook 'yas-after-exit-snippet-hook
-              'web-mode-yasnippet-exit-hook
-              t t))
-   ((boundp 'yas/after-exit-snippet-hook)
-    (add-hook 'yas/after-exit-snippet-hook
-              'web-mode-yasnippet-exit-hook
-              t t))
-   )
-
-  (when web-mode-enable-whitespace-fontification
-    (web-mode-whitespaces-on))
-
-  (when (and (boundp 'indent-tabs-mode) indent-tabs-mode)
-    (web-mode-use-tabs))
-
-  (when web-mode-enable-sexp-functions
-    (setq-local forward-sexp-function 'web-mode-forward-sexp))
-
-  (web-mode-guess-engine-and-content-type)
-  (setq web-mode-change-beg (point-min)
-        web-mode-change-end (point-max))
-  (when (> (point-max) 256000)
-    (web-mode-buffer-highlight))
-
-  (when (and (boundp 'hs-special-modes-alist)
-             (not (assoc major-mode hs-special-modes-alist)))
-    (add-to-list 'hs-special-modes-alist '(web-mode "{" "}" "/[*/]" web-mode-forward-sexp nil))
-    ) ;when
-
-  ;;(web-mode-trace "buffer loaded")
-
-  )
-
-;;---- DEFUNS ------------------------------------------------------------------
-
-(defun web-mode-scan-region (beg end &optional content-type)
-  "Identify nodes/parts/blocks and syntactic symbols (strings/comments)."
-  ;;(message "scan-region: beg(%d) end(%d) content-type(%S)" beg end content-type)
-  (web-mode-with-silent-modifications
-   (save-excursion
-     (save-restriction
-       (save-match-data
-         (let ((inhibit-point-motion-hooks t)
-               (inhibit-quit t))
-           (remove-list-of-text-properties beg end web-mode-scan-properties)
-           (cond
-            ((and content-type (string= content-type "php"))
-;;             (web-mode-block-scan beg end)
-             )
-            ((and content-type
-                  (member content-type web-mode-part-content-types))
-             (put-text-property beg end 'part-side
-                                (cond
-                                 ((string= content-type "javascript") 'javascript)
-                                 ((string= content-type "json") 'json)
-                                 ((string= content-type "jsx") 'jsx)
-                                 ((string= content-type "css") 'css)
-                                 ))
-             (web-mode-scan-blocks beg end)
-             (web-mode-part-scan beg end content-type))
-            ((member web-mode-content-type web-mode-part-content-types)
-             (web-mode-scan-blocks beg end)
-             (web-mode-part-scan beg end))
-            ((string= web-mode-engine "none")
-             (web-mode-scan-elements beg end)
-             (web-mode-process-parts beg end 'web-mode-part-scan))
-            (t
-             (web-mode-scan-blocks beg end)
-             (web-mode-scan-elements beg end)
-             (web-mode-process-parts beg end 'web-mode-part-scan))
-            ) ;cond
-           (cons beg end)
-           ))))))
-
-(defun web-mode-scan-blocks (reg-beg reg-end)
-  "Identifies blocks (with block-side, block-beg, block-end text properties)."
-  (save-excursion
-
-    (let ((i 0) open close closing-string start sub1 sub2 pos tagopen tmp delim-open delim-close part-beg part-end tagclose)
-
-      (goto-char reg-beg)
-
-      ;;(message "%S: %Sx%S" (point) reg-beg reg-end)
-      ;;(message "regexp=%S" web-mode-block-regexp)
-      (while (and (< i 2000)
-                  (> reg-end (point))
-                  web-mode-block-regexp
-                  (re-search-forward web-mode-block-regexp reg-end t)
-                  (not (eobp)))
-
-        (setq i (1+ i)
-              closing-string nil
-              close nil
-              tagopen (match-string 0)
-              open (match-beginning 0)
-              delim-open nil
-              delim-close nil
-              pos nil)
-
-        (let ((l (length tagopen)))
-          (when (member (string-to-char tagopen) '(?\s ?\t))
-            (setq tagopen (replace-regexp-in-string "\\`[ \t]*" "" tagopen))
-            (setq open (+ open (- l (length tagopen))))
-            (setq l (length tagopen))
-            )
-          (setq sub1 (substring tagopen 0 1)
-                sub2 (substring tagopen 0 (if (>= l 2) 2 1)))
-          )
-
-        (cond
-
-         ((string= web-mode-engine "php")
-          (unless (member (char-after) '(?x ?X))
-            (setq closing-string '("<\\?". "\\?>")))
-          (cond
-           ((looking-at-p "<?php")
-            (setq delim-open "<?php"))
-           ((eq (char-after) ?\=)
-            (setq delim-open "<?="))
-           (t
-            (setq delim-open "<?"))
-           ) ;cond
-          (setq delim-close "?>")
-          ) ;php
-
-         ((string= web-mode-engine "django")
-          (cond
-           ((string= sub2 "{{")
-            (setq closing-string '("{{" . "}}")
-                  delim-open "{{"
-                  delim-close "}}"))
-           ((string= sub2 "{%")
-            (setq closing-string "%}"
-                  delim-open "{%[+-]?"
-                  delim-close "[-]?%}"))
-           (t
-            (setq closing-string "#}"))
-           )
-          ) ;django
-
-         ((string= web-mode-engine "ejs")
-          (setq closing-string "%>"
-                delim-open "<%[=-]?"
-                delim-close "[-]?%>")
-          ) ;ejs
-
-         ((string= web-mode-engine "erb")
-          (cond
-           ((string= sub2 "<%")
-            (setq closing-string "%>"
-                  delim-open "<%[=-]?"
-                  delim-close "[-]?%>")
-            )
-           (t
-            (setq closing-string "EOL"
-                  delim-open "%"))
-           )
-          ) ;erb
-
-         ((string= web-mode-engine "lsp")
-          (setq closing-string "%>"
-                delim-open "<%[%#]?"
-                delim-close "%>")
-          ) ;lsp
-
-         ((string= web-mode-engine "mako")
-          (cond
-           ((and (string= tagopen "<%")
-                 (member (char-after) '(?\s ?\n ?\!)))
-            (setq closing-string "%>"
-                  delim-open "<%[!]?"
-                  delim-close "%>"))
-           ((member sub2 '("<%" "</"))
-            (setq closing-string ">"
-                  delim-open "</?%"
-                  delim-close "/?>"))
-           ((string= sub2 "${")
-            (setq closing-string "}"
-                  delim-open "${"
-                  delim-close "}"))
-           (t
-            (setq closing-string "EOL"
-                  delim-open "%"))
-           )
-          ) ;mako
-
-         ((string= web-mode-engine "cl-emb")
-          (cond
-           ((string= tagopen "<%#")
-            (setq closing-string "#%>"))
-           ((string= sub2 "<%")
-            (setq closing-string "%>"
-                  delim-open "<%[=%]?"
-                  delim-close "%>"))
-           )
-          ) ;cl-emb
-
-         ((string= web-mode-engine "elixir")
-          (cond
-           ((string= tagopen "<%#")
-            (setq closing-string "%>"))
-           ((string= sub2 "<%")
-            (setq closing-string "%>"
-                  delim-open "<%[=%]?"
-                  delim-close "%>"))
-           )
-          ) ;elixir
-
-         ((string= web-mode-engine "mojolicious")
-          (cond
-           ((string= tagopen "<%#")
-            (setq closing-string "%>"))
-           ((string= sub2 "<%")
-            (setq closing-string "%>"
-                  delim-open "<%\\(==\\|[=%]\\)?"
-                  delim-close "%>"))
-           ((string= sub2 "%#")
-            (setq closing-string "EOL"))
-           (t
-            (setq closing-string "EOL"
-                  delim-open "%\\(==\\|[=%]\\)?"))
-           )
-          ) ;mojolicious
-
-         ((string= web-mode-engine "ctemplate")
-          ;;(message "ctemplate")
-          (cond
-           ((member tagopen '("{{{" "{{~"))
-            (setq closing-string "}~?}}"
-                  delim-open "{{~?{"
-                  delim-close "}~?}}")
-            )
-           ((string= tagopen "{~{")
-            (setq closing-string "}~?}"
-                  delim-open "{~{"
-                  delim-close "}~?}")
-            )
-           ((string= tagopen "{{!")
-            (setq closing-string (if (looking-at-p "--") "--}}" "}}"))
-            )
-           ((string= sub2 "{{")
-            (setq closing-string "}~?}"
-                  delim-open "{{[>#/%^&]?"
-                  delim-close "}~?}"))
-           (t
-            (setq closing-string "}}"
-                  delim-open "${{"
-                  delim-close "}}"))
-           )
-          ) ;ctemplate
-
-         ((string= web-mode-engine "aspx")
-          (setq closing-string "%>"
-                delim-open "<%[:=#@$]?"
-                delim-close "%>")
-          ) ;aspx
-
-         ((string= web-mode-engine "asp")
-          (cond
-           ((string= sub2 "<%")
-            (setq closing-string "%>"
-                  delim-open "<%[:=#@$]?"
-                  delim-close "%>"))
-           (t
-            (setq closing-string ">"
-                  delim-open "</?"
-                  delim-close "/?>"))
-           )
-          ) ;asp
-
-         ((string= web-mode-engine "jsp")
-          (cond
-           ((string= sub2 "<%")
-            (setq closing-string "%>"
-                  delim-open "<%\\([!=@]\\|#=\\)?"
-                  delim-close "[-]?%>"))
-           ((string= sub2 "${")
-            (setq closing-string "}"
-                  delim-open "${"
-                  delim-close "}"))
-           (t
-            (setq closing-string ">"
-                  delim-open "</?"
-                  delim-close "/?>"))
-           )
-          ) ;jsp
-
-         ((string= web-mode-engine "clip")
-          (setq closing-string ">"
-                delim-open "</?"
-                delim-close "/?>")
-          ) ;clip
-
-         ((string= web-mode-engine "blade")
-          (cond
-           ((string= tagopen "{{-")
-            (setq closing-string "--}}"))
-           ((string= tagopen "{!!")
-            (setq closing-string "!!}"
-                  delim-open "{!!"
-                  delim-close "!!}"))
-           ((string= tagopen "@{{")
-            (setq closing-string nil))
-           ((string= tagopen "{{{")
-            (setq closing-string "}}}"
-                  delim-open "{{{"
-                  delim-close "}}}"))
-           ((string= sub2 "{{")
-            (setq closing-string "}}"
-                  delim-open "{{"
-                  delim-close "}}"))
-           ((string= sub1 "@")
-            (setq closing-string "EOL"
-                  delim-open "@"))
-           )
-          ) ;blade
-
-         ((string= web-mode-engine "smarty")
-          (cond
-           ((string= tagopen "{*")
-            (setq closing-string "*}")
-            )
-           ((string= tagopen "{#")
-            (setq closing-string "#}"
-                  delim-open "{#"
-                  delim-close "#}")
-            )
-           (t
-            (setq closing-string (cons "{" "}")
-                  delim-open "{/?"
-                  delim-close "}")
-            ) ;t
-           ) ;cond
-          ) ;smarty
-
-         ((string= web-mode-engine "web2py")
-          (setq closing-string "}}"
-                delim-open "{{[=]?"
-                delim-close "}}")
-          ) ;web2py
-
-         ((string= web-mode-engine "dust")
-          (cond
-           ((string= sub2 "{!")
-            (setq closing-string "!}"))
-           (t
-            (setq closing-string '("{". "}") ;;closing-string "}"
-                  delim-open "{[#/:?@><+^]?"
-                  delim-close "/?}")
-            )
-           )
-          ) ;dust
-
-         ((string= web-mode-engine "closure")
-          (cond
-           ((string= sub2 "//")
-            (setq closing-string "EOL")
-            )
-           ((string= sub2 "/*")
-            (setq closing-string "*/")
-            )
-           (t
-            (setq closing-string "}"
-                  delim-open "{/?"
-                  delim-close "/?}")
-            )
-           )
-          ) ;closure
-
-         ((string= web-mode-engine "go")
-          (setq closing-string "}}"
-                delim-open "{{"
-                delim-close "}}")
-          ) ;go
-
-         ((string= web-mode-engine "angular")
-          (setq closing-string "}}"
-                delim-open "{{"
-                delim-close "}}")
-          ) ;angular
-
-         ((string= web-mode-engine "mason")
-          (cond
-           ((and (member sub2 '("<%" "</"))
-                 (looking-at "[[:alpha:]]+"))
-            (if (member (match-string-no-properties 0) '("after" "around" "augment" "before" "def" "filter" "method" "override"))
-                (setq closing-string ">"
-                      delim-open "<[/]?%"
-                      delim-close ">")
-              (setq closing-string (concat "</%" (match-string-no-properties 0) ">")
-                    delim-open "<[^>]+>"
-                    delim-close "<[^>]+>")
-              ) ;if
-            )
-           ((and (string= sub2 "<%")
-                 (eq (char-after) ?\s))
-            (setq closing-string "%>"
-                  delim-open "<%"
-                  delim-close "%>"))
-           ((string= tagopen "</&")
-            (setq closing-string ">"
-                  delim-open "</&"
-                  delim-close ">")
-            )
-           ((string= sub2 "<&")
-            (setq closing-string "&>"
-                  delim-open "<&[|]?"
-                  delim-close "&>"))
-           (t
-            (setq closing-string "EOL"
-                  delim-open "%"))
-           )
-          ) ;mason
-
-         ((string= web-mode-engine "underscore")
-          (setq closing-string "%>"
-                delim-open "<%"
-                delim-close "%>")
-          ) ;underscore
-
-         ((string= web-mode-engine "template-toolkit")
-          (cond
-           ((string= tagopen "[%#")
-            (setq closing-string "%]"))
-           (t
-            (setq closing-string "%]"
-                  delim-open "\\[%[-+]?"
-                  delim-close "[-=+]?%\\]"))
-           )
-          ) ;template-toolkit
-
-         ((string= web-mode-engine "freemarker")
-          (cond
-           ((string= sub1 "<")
-            (setq closing-string ">"
-                  delim-open "</?[#@]"
-                  delim-close "/?>"))
-           ((string= sub1 "[")
-            (setq closing-string "]"
-                  delim-open "\\[/?[#@]"
-                  delim-close "/?\\]"))
-           (t
-            (setq closing-string "}"
-                  delim-open "${"
-                  delim-close "}"))
-           )
-          ) ;freemarker
-
-         ((string= web-mode-engine "velocity")
-          (cond
-           ((string= sub2 "##")
-            (setq closing-string "EOL"))
-           ((string= sub2 "#*")
-            (setq closing-string "*#"))
-           (t
-            (setq closing-string "EOV"
-                  delim-open "#"))
-           )
-          ) ;velocity
-
-         ((string= web-mode-engine "razor")
-          (cond
-           ((string= sub2 "@@")
-            (forward-char 2)
-            (setq closing-string nil))
-           ((string= sub2 "@*")
-            (setq closing-string "*@"))
-           ((string= sub1 "@")
-            (setq closing-string "EOR"
-                  delim-open "@"))
-           ((string= sub1 "}")
-            (save-excursion
-              (let (paren-pos)
-                (setq paren-pos (web-mode-opening-paren-position (1- (point))))
-                (if (and paren-pos (get-text-property paren-pos 'block-side))
-                    (setq closing-string "EOR")
-                  (setq closing-string nil)
-                  ) ;if
-                ) ;let
-              ) ;let
-            ) ; case }
-           ) ;cond
-          ) ;razor
-
-         ) ;cond
-
-        (when closing-string
-
-          (cond
-
-           ((listp closing-string)
-            (cond
-             ((web-mode-rsf-balanced (car closing-string) (cdr closing-string) reg-end t)
-              (setq close (match-end 0)
-                    pos (point))
-              )
-             ((and (string= web-mode-engine "php")
-                   (string= "<?" sub2))
-
-              (if (or (text-property-not-all (1+ open) (point-max) 'tag-beg nil)
-                      (text-property-not-all (1+ open) (point-max) 'block-beg nil)
-                      (looking-at-p "[ \t\n]*<"))
-
-                    (setq close nil
-                          delim-close nil
-                          pos (point))
-
-                  ;; (setq close (line-end-position)
-                  ;;       delim-close nil
-                  ;;       pos (line-end-position))
-
-                (setq close (point-max)
-                      delim-close nil
-                      pos (point-max))
-                ) ;if
-              ) ;case
-             ) ;cond
-            ) ;case listp
-
-           ((and (string= web-mode-engine "smarty")
-                 (string= closing-string "}"))
-            (goto-char open)
-            (setq tmp (web-mode-closing-delimiter-position
-                       "}"
-                       (point)
-                       (line-end-position)))
-            (if tmp
-                (setq tmp (1+ tmp))
-              (setq tmp (line-end-position)))
-            (goto-char tmp)
-            (setq close (point)
-                  pos (point))
-            )
-
-           ((and (member web-mode-engine '("closure"))
-                 (string= closing-string "}"))
-            (goto-char open)
-            (setq tmp (web-mode-closing-paren-position (point) (line-end-position)))
-            (if tmp
-                (setq tmp (1+ tmp))
-              (setq tmp (line-end-position)))
-            (goto-char tmp)
-            (setq close (point)
-                  pos (point))
-            )
-
-           ((string= closing-string "EOL")
-            (end-of-line)
-            (setq close (point)
-                  pos (point)))
-
-           ((string= closing-string "EOR")
-            (web-mode-razor-skip-forward open)
-            (setq close (if (> (point) reg-end) reg-end (point))
-                  pos (if (> (point) reg-end) reg-end (point)))
-            (goto-char pos))
-
-           ((string= closing-string "EOV")
-            (web-mode-velocity-skip-forward open)
-            (setq close (point)
-                  pos (point)))
-
-           ((and (member web-mode-engine '("ctemplate"))
-                 (re-search-forward closing-string reg-end t))
-            (setq close (match-end 0)
-                  pos (point)))
-
-           ((search-forward closing-string reg-end t)
-            (setq close (match-end 0)
-                  pos (point)))
-           ) ;cond
-
-          (when (and close (>= reg-end pos))
-            ;;(message "pos(%S) : open(%S) close(%S)" pos open close)
-            (put-text-property open (1+ open) 'block-beg 0)
-            (put-text-property open (1+ open) 'block-controls 0)
-            (if nil ;;(= close (point-max))
-                (progn
-                  (put-text-property open (1+ close) 'block-side t)
-                  (put-text-property close (1+ close) 'block-end t))
-              (put-text-property open close 'block-side t)
-              (put-text-property (1- close) close 'block-end t)
-              )
-            (when delim-open
-              (web-mode-block-delimiters-set open close delim-open delim-close))
-            (web-mode-block-scan open close)
-            ;;(message "tagopen=%s %S" tagopen (point))
-            (when (and (string= web-mode-engine "erb")
-                       (looking-at-p "<%= javascript_tag do %>"))
-              (setq tagopen "<%= javascript_tag do %>")
-              )
-            (when (and (member tagopen '("<r:script" "<r:style"
-                                         "<c:js" "<c:css"
-                                         "<%= javascript_tag do %>"))
-                       (setq part-beg close)
-                       (setq tagclose
-                             (cond
-                              ((string= tagopen "<r:script") "</r:script")
-                              ((string= tagopen "<r:style") "</r:style")
-                              ((string= tagopen "<c:js") "</c:js")
-                              ((string= tagopen "<c:css") "</c:css")
-                              ((string= tagopen "<%= javascript_tag do %>") "<% end %>")
-                              ))
-                       (web-mode-sf tagclose) ;; reg-end)
-                       (setq part-end (match-beginning 0))
-                       (> part-end part-beg))
-              (put-text-property part-beg part-end
-                                 'part-side
-                                 (cond
-                                  ((member tagopen '("<r:style" "<c:css")) 'css)
-                                  (t 'javascript)))
-              ;;                (goto-char part-end)
-              (setq pos part-beg
-                    part-beg nil
-                    part-end nil)
-              ) ;when
-            ) ;when close
-
-          (if pos (goto-char pos))
-
-          ) ;when closing-string
-
-        ) ;while
-
-      (cond
-       ((>= i 2000)
-        (message "scan-blocks ** warning (%S) **" i))
-       ((string= web-mode-engine "razor")
-        (web-mode-process-blocks reg-beg reg-end 'web-mode-block-scan))
-       ((string= web-mode-engine "django")
-        (web-mode-scan-engine-comments reg-beg reg-end
-                                       "{% comment %}" "{% endcomment %}"))
-       ((string= web-mode-engine "mako")
-        (web-mode-scan-engine-comments reg-beg reg-end
-                                       "<%doc>" "</%doc>"))
-       ((string= web-mode-engine "mason")
-        (web-mode-scan-engine-comments reg-beg reg-end
-                                       "<%doc>" "</%doc>"))
-       ) ;cond
-
-      )))
-
-(defun web-mode-block-delimiters-set (reg-beg reg-end delim-open delim-close)
-  "Set text-property 'block-token to 'delimiter-(beg|end) on block delimiters (e.g. <?php ?>)"
-  ;;(message "reg-beg(%S) reg-end(%S) delim-open(%S) delim-close(%S)" reg-beg reg-end delim-open delim-close)
-  (when (member web-mode-engine
-                '("asp" "aspx" "cl-emb" "clip" "closure" "ctemplate" "django" "dust"
-                  "elixir" "ejs" "erb" "freemarker" "jsp" "lsp" "mako" "mason" "mojolicious"
-                  "smarty" "template-toolkit" "web2py"))
-    (save-excursion
-      (when delim-open
-        (goto-char reg-beg)
-        (looking-at delim-open)
-        (setq delim-open (match-string-no-properties 0)))
-      (when delim-close
-        (goto-char reg-end)
-        (looking-back delim-close reg-beg t)
-        (setq delim-close (match-string-no-properties 0)))
-      ))
-  (when delim-open
-    (put-text-property reg-beg (+ reg-beg (length delim-open))
-                       'block-token 'delimiter-beg))
-  (when delim-close
-    (put-text-property (- reg-end (length delim-close)) reg-end
-                       'block-token 'delimiter-end))
-  )
-
-(defun web-mode-process-blocks (reg-beg reg-end func)
-  (let ((i 0) (continue t) (block-beg reg-beg) (block-end nil))
-    (while continue
-      (setq block-end nil)
-      (unless (get-text-property block-beg 'block-beg)
-        (setq block-beg (web-mode-block-next-position block-beg)))
-      (when (and block-beg (< block-beg reg-end))
-        (setq block-end (web-mode-block-end-position block-beg)))
-      (cond
-       ((> (setq i (1+ i)) 2000)
-        (message "process-blocks ** warning (%S) **" (point))
-        (setq continue nil))
-       ((or (null block-end) (> block-end reg-end))
-        (setq continue nil))
-       (t
-        (setq block-end (1+ block-end))
-        (funcall func block-beg block-end)
-        (setq block-beg block-end)
-        ) ;t
-       ) ;cond
-      ) ;while
-    ))
-
-(defun web-mode-process-parts (reg-beg reg-end func)
-  (let ((i 0) (continue t) (part-beg reg-beg) (part-end nil))
-    (while continue
-      (setq part-end nil)
-      (unless (get-text-property part-beg 'part-side)
-        (setq part-beg (web-mode-part-next-position part-beg)))
-      (when (and part-beg (< part-beg reg-end))
-        (setq part-end (web-mode-part-end-position part-beg)))
-      (cond
-       ((> (setq i (1+ i)) 100)
-        (message "process-parts ** warning (%S) **" (point))
-        (setq continue nil))
-       ((or (null part-end) (> part-end reg-end))
-        (setq continue nil))
-       (t
-        (setq part-end (1+ part-end))
-        (funcall func part-beg part-end)
-        (setq part-beg part-end)
-        )
-       ) ;cond
-      ) ;while
-    ))
-
-(defun web-mode-block-scan (block-beg block-end)
-  (let (sub1 sub2 sub3 regexp token-type)
-
-    ;;(message "block-beg=%S block-end=%S" block-beg block-end)
-    ;;(remove-text-properties block-beg block-end web-mode-scan-properties)
-
-    (goto-char block-beg)
-
-    (cond
-     ((>= (point-max) (+ block-beg 3))
-      (setq sub3 (buffer-substring-no-properties block-beg (+ block-beg 3))
-            sub2 (buffer-substring-no-properties block-beg (+ block-beg 2))
-            sub1 (buffer-substring-no-properties block-beg (+ block-beg 1)))
-      )
-     ((>= (point-max) (+ block-beg 2))
-      (setq sub3 (buffer-substring-no-properties block-beg (+ block-beg 2))
-            sub2 (buffer-substring-no-properties block-beg (+ block-beg 2))
-            sub1 (buffer-substring-no-properties block-beg (+ block-beg 1)))
-      )
-     (t
-      (setq sub1 (buffer-substring-no-properties block-beg (+ block-beg 1)))
-      (setq sub2 sub1
-            sub3 sub1)
-      )
-     )
-
-    (cond
-
-     ((member web-mode-engine '("php" "lsp" "python" "web2py" "mason"))
-      (setq regexp web-mode-engine-token-regexp))
-
-     ((string= web-mode-engine "mako")
-      (cond
-       ((string= sub2 "##")
-        (setq token-type 'comment)
-        )
-       (t
-        (setq regexp web-mode-engine-token-regexp))
-       )
-      ) ;mako
-
-     ((string= web-mode-engine "django")
-      (cond
-       ((member sub2 '("{{" "{%"))
-        (setq regexp "\"\\|'"))
-       ((string= sub2 "{#")
-        (setq token-type 'comment))
-       )
-      ) ;django
-
-     ((string= web-mode-engine "ctemplate")
-      (cond
-       ((string= sub3 "{{!")
-        (setq token-type 'comment)
-        )
-       ((member sub2 '("{{"))
-        ;;(setq regexp "\"\\|'")
-        )
-       )
-      ) ;ctemplate
-
-     ((string= web-mode-engine "go")
-      (cond
-       ((string= sub3 "{{/")
-        (setq token-type 'comment))
-       ((string= sub2 "{{")
-        (setq regexp "\"\\|'"))
-       )
-      ) ;go
-
-     ((string= web-mode-engine "razor")
-      (cond
-       ((string= sub2 "@*")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "//\\|@\\*\\|\"\\|'"))
-       )
-      ) ;razor
-
-     ((string= web-mode-engine "blade")
-      (cond
-       ((string= sub3 "{{-")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'"))
-       )
-      ) ;blade
-
-     ((string= web-mode-engine "cl-emb")
-      (cond
-       ((string= sub3 "<%#")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'"))
-       )
-      ) ;cl-emb
-
-     ((string= web-mode-engine "elixir")
-      (cond
-       ((string= sub3 "<%#")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'"))
-       )
-      ) ;elixir
-
-     ((string= web-mode-engine "mojolicious")
-      (cond
-       ((or (string= sub2 "%#") (string= sub3 "<%#"))
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'"))
-       )
-      ) ;mojolicious
-
-     ((string= web-mode-engine "velocity")
-      (cond
-       ((member sub2 '("##" "#*"))
-        (setq token-type 'comment))
-       ((member sub1 '("$" "#"))
-        (setq regexp "\"\\|'"))
-       )
-      ) ;velocity
-
-     ((string= web-mode-engine "jsp")
-      (cond
-       ((string= sub3 "<%-")
-        (setq token-type 'comment))
-       ((string= sub3 "<%@")
-        (setq regexp "/\\*"))
-       ((member sub2 '("${" "#{"))
-        (setq regexp "\"\\|'"))
-       ((string= sub2 "<%")
-        (setq regexp "//\\|/\\*\\|\"\\|'"))
-       )
-      ) ;jsp
-
-     ((string= web-mode-engine "clip")
-      (setq regexp nil)
-      ) ;clip
-
-     ((and (string= web-mode-engine "asp")
-           (string= sub2 "<%"))
-      (setq regexp "//\\|/\\*\\|\"\\|'")
-      ) ; asp
-
-     ((string= web-mode-engine "aspx")
-      (cond
-       ((string= sub3 "<%-")
-        (setq token-type 'comment))
-       ((string= sub3 "<%@")
-        (setq regexp "/\\*"))
-       ((string= sub3 "<%$")
-        (setq regexp "\"\\|'"))
-       (t
-        (setq regexp "//\\|/\\*\\|\"\\|'"))
-       )
-      ) ;aspx
-
-     ((string= web-mode-engine "freemarker")
-      (cond
-       ((member sub3 '("<#-" "[#-"))
-        (setq token-type 'comment))
-       ((member sub2 '("${" "#{"))
-        (setq regexp "\"\\|'"))
-       ((or (member sub2 '("<@" "[@" "<#" "[#"))
-            (member sub3 '("</@" "[/@" "</#" "[/#")))
-        (setq regexp "\"\\|'"))
-       )
-      ) ;freemarker
-
-     ((member web-mode-engine '("ejs" "erb"))
-      (cond
-       ((string= sub3 "<%#")
-        (setq token-type 'comment))
-       (t
-        (setq regexp web-mode-engine-token-regexp))
-       )
-      ) ;erb
-
-     ((string= web-mode-engine "template-toolkit")
-      (cond
-       ((string= sub3 "[%#")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "#\\|\"\\|'"))
-       )
-      ) ;template-toolkit
-
-     ((string= web-mode-engine "underscore")
-      (setq regexp "/\\*\\|\"\\|'")
-      ) ;underscore
-
-     ((string= web-mode-engine "angular")
-      ) ;angular
-
-     ((string= web-mode-engine "smarty")
-      (cond
-       ((string= sub2 "{*")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'")))
-      ) ;smarty
-
-     ((string= web-mode-engine "dust")
-      (cond
-       ((string= sub2 "{!")
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'"))
-       )
-      ) ;dust
-
-     ((string= web-mode-engine "closure")
-      (cond
-       ((member sub2 '("/*" "//"))
-        (setq token-type 'comment))
-       (t
-        (setq regexp "\"\\|'"))
-       )
-      ) ;closure
-
-     ) ;cond
-
-    (cond
-     (token-type
-      (put-text-property block-beg block-end 'block-token token-type))
-     ((and regexp
-           (> (- block-end block-beg) 6))
-      (web-mode-block-tokenize
-       (web-mode-block-code-beginning-position block-beg)
-       (web-mode-block-code-end-position block-beg)
-       regexp)
-      )
-     ) ;cond
-
-    ))
-
-(defun web-mode-block-tokenize (reg-beg reg-end &optional regexp)
-  (unless regexp (setq regexp web-mode-engine-token-regexp))
-  ;;(message "tokenize: reg-beg(%S) reg-end(%S) regexp(%S)" reg-beg reg-end regexp)
-  ;;(message "tokenize: reg-beg(%S) reg-end(%S) command(%S)" reg-beg reg-end this-command)
-  ;;(message "%S>%S : %S" reg-beg reg-end (buffer-substring-no-properties reg-beg reg-end))
-  (save-excursion
-    (let ((pos reg-beg) beg end char match continue (flags 0) token-type token-end)
-
-      (remove-list-of-text-properties reg-beg reg-end '(block-token))
-
-      ;; TODO : vérifier la cohérence
-      (put-text-property reg-beg reg-end 'block-side t)
-
-      (goto-char reg-beg)
-
-      (when (> reg-beg reg-end)
-        (message "block-tokenize ** reg-beg(%S) reg-end(%S) **" reg-beg reg-end))
-
-      (while (and (< reg-beg reg-end) (re-search-forward regexp reg-end t))
-        (setq beg (match-beginning 0)
-              match (match-string 0)
-              continue t
-              token-type 'comment
-              token-end (if (< reg-end (line-end-position)) reg-end (line-end-position))
-              char (aref match 0))
-        (cond
-
-         ((and (string= web-mode-engine "asp")
-               (eq char ?\'))
-          (goto-char token-end))
-
-         ((eq char ?\')
-          (setq token-type 'string)
-          (while (and continue (search-forward "'" reg-end t))
-            (if (looking-back "\\\\+'" reg-beg t)
-                (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0))
-              (setq continue nil))))
-
-         ((eq char ?\")
-          (setq token-type 'string)
-          (while (and continue (search-forward "\"" reg-end t))
-            (if (looking-back "\\\\+\"" reg-beg t)
-                (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0))
-              (setq continue nil))))
-
-         ((string= match "//")
-          (goto-char token-end))
-
-         ((eq char ?\;)
-          (goto-char token-end))
-
-         ((string= match "#|")
-          (unless (search-forward "|#" reg-end t)
-            (goto-char token-end)))
-
-         ((eq char ?\#)
-          (goto-char token-end))
-
-         ((string= match "/*")
-          (unless (search-forward "*/" reg-end t)
-            ;;(message "*/ found: %S [%c] [%c] %S" (point) (char-before) (char-after) reg-end)
-            (goto-char token-end))
-          ;;(unless (search-forward "*/" reg-end t)
-          ;;  (goto-char token-end))
-          ;;(message "*/ %S" (point))
-          )
-
-         ((string= match "@*")
-          (unless (search-forward "*@" reg-end t)
-            (goto-char token-end)))
-
-         ((eq char ?\<)
-          (setq token-type 'string)
-          (re-search-forward (concat "^[ ]*" (match-string 1)) reg-end t))
-
-         (t
-          (message "block-tokenize ** token end (%S) **" beg)
-          (setq token-type nil))
-
-         ) ;cond
-
-        ;;(when (eq token-type 'comment) (message "comment: %S %S" beg (point)))
-
-        (put-text-property beg (point) 'block-token token-type)
-
-        (when (eq token-type 'comment)
-          (put-text-property beg (1+ beg) 'syntax-table (string-to-syntax "<"))
-          (if (or (< (point) (line-end-position)) (= (point) (point-max)))
-              (put-text-property (1- (point)) (point) 'syntax-table (string-to-syntax ">")) ;#445 #480
-            (put-text-property (point) (1+ (point)) 'syntax-table (string-to-syntax ">")) ;#377
-            )
-          )
-
-        ) ;while
-
-      (web-mode-block-controls-unset pos)
-
-      )))
-
-(defun web-mode-set-php-controls (reg-beg reg-end)
-  (goto-char reg-beg)
-  (let (match controls
-        (continue t)
-        (regexp "endif\\|endforeach\\|endfor\\|endwhile\\|elseif\\|else\\|if\\|foreach\\|for\\|while"))
-    (while continue
-      (if (not (web-mode-block-rsf regexp reg-end))
-          (setq continue nil)
-        (setq match (match-string-no-properties 0))
-;;        (message "%S %S" match (point))
-        (cond
-         ((and (member match '("else" "elseif"))
-               (looking-at-p "[ ]*[:(]"))
-          (setq controls (append controls (list (cons 'inside "if"))))
-          )
-         ((and (>= (length match) 3)
-               (string= (substring match 0 3) "end"))
-          (setq controls (append controls (list (cons 'close (substring match 3)))))
-          )
-         ((and (progn (skip-chars-forward "[ ]") t)
-               (eq (char-after) ?\()
-               (web-mode-closing-paren reg-end)
-;;               (progn (message "ixi%S" (point)))
-               (looking-at-p ")[ ]*:"))
-          (setq controls (append controls (list (cons 'open match))))
-          )
-         ) ; cond
-        ) ;if
-      ) ;while
-    ;;(message "%S-%S %S" reg-beg reg-end controls)
-    (when (and controls (> (length controls) 1))
-      (setq controls (web-mode-block-controls-reduce controls)))
-    controls))
-
-;; todo : clean
-;; <?php if (): echo $x; endif; ?>
-;; ((open . "if") (close . "if"))
-;; -> nil
-(defun web-mode-block-controls-reduce (controls)
-  (when (and (eq (car (car controls)) 'open)
-             (member (cons 'close (cdr (car controls))) controls))
-    (setq controls nil))
-  controls)
-
-(defun web-mode-block-controls-unset (pos)
-  (cond
-   ((null (get-text-property pos 'block-side))
-    (message "block-controls-unset ** invalid value (%S) **" pos))
-   ((or (get-text-property pos 'block-beg)
-        (setq pos (web-mode-block-beginning-position pos)))
-    (put-text-property pos (1+ pos) 'block-controls 0))
-   (t
-    (message "block-controls-unset ** failure (%S) **" (point)))
-   ))
-
-(defun web-mode-block-controls-get (pos)
-  (web-mode-with-silent-modifications
-   (let ((controls nil))
-     (cond
-      ((null (get-text-property pos 'block-side))
-       (message "block-controls-get ** invalid value (%S) **" pos))
-      ((or (get-text-property pos 'block-beg)
-           (setq pos (web-mode-block-beginning-position pos)))
-       (setq controls (get-text-property pos 'block-controls))
-       (when (integerp controls)
-         (web-mode-block-controls-set pos (web-mode-block-end-position pos))
-         (setq controls (get-text-property pos 'block-controls))
-         ;;        (message "controls=%S" controls)
-         )
-       )
-      (t
-       (message "block-controls-get ** failure (%S) **" (point)))
-      ) ;cond
-     controls)))
-
-(defun web-mode-block-controls-set (reg-beg reg-end)
-  (save-excursion
-    (goto-char reg-beg)
-    (let (controls pos type control)
-
-      (cond
-
-       ((null web-mode-engine)
-        (message "block-controls-set ** unknown engine (%S) **" web-mode-engine)
-        )
-
-       ((string= web-mode-engine "php")
-        (setq controls (web-mode-set-php-controls reg-beg reg-end))
-        (when (web-mode-block-starts-with "}" reg-beg)
-          (setq controls (append controls (list (cons 'close "{")))))
-        (when (web-mode-block-ends-with (cons "{" "}") reg-beg)
-          (setq controls (append controls (list (cons 'open "{")))))
-        ) ; php
-
-       ((string= web-mode-engine "ejs")
-        (cond
-         ((web-mode-block-ends-with "}[ ]*else[ ]*{" reg-beg)
-          (setq controls (append controls (list (cons 'inside "{")))))
-         ((web-mode-block-starts-with "}" reg-beg)
-          (setq controls (append controls (list (cons 'close "{")))))
-         ((web-mode-block-ends-with "{" reg-beg)
-          (setq controls (append controls (list (cons 'open "{")))))
-         )
-        ) ; ejs
-
-       ((string= web-mode-engine "erb")
-        (cond
-         ((web-mode-block-starts-with "else\\|elsif\\|when" reg-beg)
-          (setq controls (append controls (list (cons 'inside "ctrl")))))
-         ((web-mode-block-starts-with "end" reg-beg)
-          (setq controls (append controls (list (cons 'close "ctrl")))))
-         ((web-mode-block-ends-with " do\\( |.*|\\)?" reg-beg)
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         ((and (web-mode-block-starts-with "\\(for\\|if\\|unless\\|case\\)\\>" reg-beg)
-               ;;((and (web-mode-block-starts-with "\\(.* do\\|for\\|if\\|unless\\|case\\)\\>" reg-beg)
-               (not (web-mode-block-ends-with "end" reg-end)))
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         )
-        ) ; erb
-
-       ((string= web-mode-engine "django")
-        (when (eq (char-after (1+ reg-beg)) ?\%)
-          (cond
-           ((and (string= web-mode-minor-engine "jinja") ;#504
-                 (web-mode-block-starts-with "else\\>" reg-beg))
-            (let ((continue t)
-                  (pos reg-beg)
-                  (ctrl nil))
-              (while continue
-                (cond
-                 ((null (setq pos (web-mode-block-control-previous-position 'open pos)))
-                  (setq continue nil))
-                 ((member (setq ctrl (cdr (car (get-text-property pos 'block-controls)))) '("if" "ifequal" "ifnotequal" "for"))
-                  (setq continue nil)
-                  )
-                 ) ;cond
-                )
-              (setq controls (append controls (list (cons 'inside (or ctrl "if")))))
-              )
-            )
-           ((web-mode-block-starts-with "\\(else\\|els?if\\)" reg-beg)
-            (let ((continue t)
-                  (pos reg-beg)
-                  (ctrl nil))
-              (while continue
-                (cond
-                 ((null (setq pos (web-mode-block-control-previous-position 'open pos)))
-                  (setq continue nil))
-                 ((member (setq ctrl (cdr (car (get-text-property pos 'block-controls)))) '("if" "ifequal" "ifnotequal"))
-                  (setq continue nil)
-                  )
-                 ) ;cond
-                ) ;while
-              (setq controls (append controls (list (cons 'inside (or ctrl "if")))))
-              ) ;let
-            ) ;case else
-           ((web-mode-block-starts-with "\\(empty\\)" reg-beg)
-            (setq controls (append controls (list (cons 'inside "for")))))
-           ((web-mode-block-starts-with "end\\([[:alpha:]]+\\)" reg-beg)
-            (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
-           ((web-mode-block-starts-with (concat web-mode-django-control-blocks-regexp "\\>") reg-beg)
-            (let (control)
-              (setq control (match-string-no-properties 1))
-              ;;(message "%S %S %S" control (concat "end" control) web-mode-django-control-blocks)
-              (when (member (concat "end" control) web-mode-django-control-blocks)
-                (setq controls (append controls (list (cons 'open control)))))
-              ) ;let
-            ) ;case
-           ) ;cond
-          ) ;when
-        ) ;django
-
-       ((string= web-mode-engine "smarty")
-        (cond
-         ((and (eq (char-after (1+ reg-beg)) ?\/)
-               (web-mode-block-starts-with "\\([[:alpha:]]+\\)" reg-beg))
-          (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
-         ((web-mode-block-starts-with "\\(else\\|elseif\\)" reg-beg)
-          (setq controls (append controls (list (cons 'inside "if")))))
-         ((web-mode-block-starts-with "\\(block\\|foreach\\|for\\|if\\|section\\|while\\)")
-          (setq controls (append controls (list (cons 'open (match-string-no-properties 1))))))
-         )
-        ) ;smarty
-
-       ((string= web-mode-engine "web2py")
-        (cond
-         ((web-mode-block-starts-with "def" reg-beg)
-          (setq controls (append controls (list (cons 'open "def")))))
-         ((web-mode-block-starts-with "return" reg-beg)
-          (setq controls (append controls (list (cons 'close "def")))))
-         ((web-mode-block-starts-with "block" reg-beg)
-          (setq controls (append controls (list (cons 'open "block")))))
-         ((web-mode-block-starts-with "end" reg-beg)
-          (setq controls (append controls (list (cons 'close "block")))))
-         ((web-mode-block-starts-with "pass" reg-beg)
-          (setq controls (append controls (list (cons 'close "ctrl")))))
-         ((web-mode-block-starts-with "\\(except\\|finally\\|els\\)" reg-beg)
-          (setq controls (append controls (list (cons 'inside "ctrl")))))
-         ((web-mode-block-starts-with "\\(if\\|for\\|try\\|while\\)")
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         )
-        ) ;web2py
-
-       ((string= web-mode-engine "dust")
-        (cond
-         ((eq (char-after (1- reg-end)) ?\/)
-          )
-         ((eq (char-after (1+ reg-beg)) ?\:)
-          (setq pos (web-mode-block-control-previous-position 'open reg-beg))
-          (when pos
-            (setq controls (append controls
-                                   (list
-                                    (cons 'inside
-                                          (cdr (car (web-mode-block-controls-get pos))))))))
-          )
-         ((looking-at "{/\\([[:alpha:].]+\\)")
-          (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
-         ((looking-at "{[#?@><+^]\\([[:alpha:].]+\\)")
-          (setq controls (append controls (list (cons 'open (match-string-no-properties 1))))))
-         )
-        ) ;dust
-
-       ((member web-mode-engine '("mojolicious"))
-        (cond
-         ((web-mode-block-ends-with "begin" reg-beg)
-          (setq controls (append controls (list (cons 'open "begin")))))
-         ((web-mode-block-starts-with "end" reg-beg)
-          (setq controls (append controls (list (cons 'close "begin")))))
-         ((web-mode-block-starts-with "}[ ]*else[ ]*{" reg-beg)
-          (setq controls (append controls (list (cons 'inside "{")))))
-         ((web-mode-block-starts-with "}" reg-beg)
-          (setq controls (append controls (list (cons 'close "{")))))
-         ((web-mode-block-ends-with "{" reg-beg)
-          (setq controls (append controls (list (cons 'open "{")))))
-         )
-        ) ;mojolicious
-
-       ((member web-mode-engine '("aspx" "underscore"))
-        (cond
-         ((web-mode-block-starts-with "}" reg-beg)
-          (setq controls (append controls (list (cons 'close "{")))))
-         ((web-mode-block-ends-with "{" reg-beg)
-          (setq controls (append controls (list (cons 'open "{")))))
-         )
-        ) ;aspx underscore
-
-       ((member web-mode-engine '("jsp" "asp" "clip"))
-        (cond
-         ((eq (char-after (1- reg-end)) ?\/)
-          )
-         ((looking-at "</?\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)\\|[[:alpha:]]+Template\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-          (when (not (member control '("h:inputtext" "jsp:usebean" "jsp:forward" "struts:property")))
-            (setq controls (append controls (list (cons type control)))))
-          )
-         (t
-          (when (web-mode-block-starts-with "}" reg-beg)
-            (setq controls (append controls (list (cons 'close "{")))))
-          ;; todo : bug qd <% } else { %>
-          (when (web-mode-block-ends-with "{" reg-beg)
-            (setq controls (append controls (list (cons 'open "{")))))
-          )
-         )
-        ) ;jsp asp
-
-       ((string= web-mode-engine "mako")
-        (cond
-         ((looking-at "</?%\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)?\\)")
-          (cond
-           ((eq (char-after (- (web-mode-block-end-position reg-beg) 1)) ?\/)
-            )
-           (t
-            (setq control (match-string-no-properties 1)
-                  type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-            (setq controls (append controls (list (cons type control)))))
-           )
-          )
-         ((web-mode-block-starts-with "\\(else\\|elif\\)" reg-beg)
-          (setq controls (append controls (list (cons 'inside "if")))))
-         ((web-mode-block-starts-with "end\\(if\\|for\\)" reg-beg)
-          (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
-         ((and (web-mode-block-starts-with "if\\|for" reg-beg)
-               (web-mode-block-ends-with ":" reg-beg))
-          (setq controls (append controls (list (cons 'open (match-string-no-properties 0))))))
-         )
-        ) ;mako
-
-       ((string= web-mode-engine "mason")
-        (cond
-         ((looking-at "</?%\\(after\\|around\\|augment\\|before\\|def\\|filter\\|method\\|override\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         ) ;mason
-        )
-
-       ((string= web-mode-engine "ctemplate")
-        (cond
-         ((looking-at-p "{{else")
-          (setq controls (append controls (list (cons 'inside "if")))))
-         ((looking-at "{{[#^/][ ]*\\([[:alpha:]-]+\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 2) ?\/) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         )
-        ) ;ctemplate
-
-       ((string= web-mode-engine "blade")
-        (cond
-         ((not (eq (char-after) ?\@))
-          )
-         ((web-mode-block-starts-with
-           "\\(?:end\\)?\\(foreach\\|forelse\\|for\\|if\\|section\\|unless\\|while\\)"
-           reg-beg)
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 0) ?e) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         ((web-mode-block-starts-with "stop\\|show\\|overwrite" reg-beg)
-          (setq controls (append controls (list (cons 'close "section")))))
-         ((web-mode-block-starts-with "else\\|elseif" reg-beg)
-          (setq controls (append controls (list (cons 'inside "if")))))
-         ((web-mode-block-starts-with "empty" reg-beg)
-          (setq controls (append controls (list (cons 'inside "forelse")))))
-         )
-        ) ;blade
-
-       ((string= web-mode-engine "closure")
-        (cond
-         ((eq (char-after (1- reg-end)) ?\/)
-          )
-         ((looking-at "alias\\|namespace")
-          )
-         ((web-mode-block-starts-with "ifempty" reg-beg)
-          (setq controls (append controls (list (cons 'inside "foreach")))))
-         ((web-mode-block-starts-with "else\\|elseif" reg-beg)
-          (setq controls (append controls (list (cons 'inside "if")))))
-         ((web-mode-block-starts-with "case\\|default" reg-beg)
-          (setq controls (append controls (list (cons 'inside "switch")))))
-         ((looking-at
-           "{/?\\(call\\|deltemplate\\|for\\|foreach\\|if\\|let\\|literal\\|msg\\|param\\|switch\\|template\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         )
-        ) ;closure
-
-       ((string= web-mode-engine "go")
-        (cond
-         ((web-mode-block-starts-with "end\\>" reg-beg)
-          (setq controls (append controls (list (cons 'close "ctrl")))))
-         ((web-mode-block-starts-with "else\\>" reg-beg)
-          (setq controls (append controls (list (cons 'inside "ctrl")))))
-         ((web-mode-block-starts-with "\\(range\\|with\\|if\\)\\>" reg-beg)
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         )
-        ) ;go
-
-       ((string= web-mode-engine "template-toolkit")
-        (cond
-         ((web-mode-block-starts-with "end" reg-beg)
-          (setq controls (append controls (list (cons 'close "ctrl")))))
-         ((web-mode-block-starts-with "els" reg-beg)
-          (setq controls (append controls (list (cons 'inside "ctrl")))))
-         ((web-mode-block-starts-with "if\\|foreach\\|filter" reg-beg)
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         )
-        ) ;template-toolkit
-
-       ((string= web-mode-engine "cl-emb")
-        (cond
-         ((web-mode-block-starts-with "@else" reg-beg)
-          (setq controls (append controls (list (cons 'inside "if")))))
-         ((web-mode-block-starts-with "@\\(?:end\\)?\\(if\\|unless\\|repeat\\|loop\\|with\\|genloop\\)" reg-beg)
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?e) 'close 'open))
-          (setq controls (append controls (list (cons type control)))))
-         )
-        ) ;cl-emb
-
-       ((string= web-mode-engine "elixir")
-        (cond
-         ((web-mode-block-starts-with "end" reg-beg)
-          (setq controls (append controls (list (cons 'close "ctrl")))))
-         ((web-mode-block-starts-with "else" reg-beg)
-          (setq controls (append controls (list (cons 'inside "ctrl")))))
-         ((web-mode-block-starts-with "if\\|for\\|while" reg-beg)
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         )
-        ) ;elixir
-
-       ((string= web-mode-engine "velocity")
-        (cond
-         ((web-mode-block-starts-with "end" reg-beg)
-          (setq controls (append controls (list (cons 'close "ctrl")))))
-         ((web-mode-block-starts-with "els" reg-beg)
-          (setq controls (append controls (list (cons 'inside "ctrl")))))
-         ((web-mode-block-starts-with "define\\|if\\|for\\|foreach\\|macro" reg-beg)
-          (setq controls (append controls (list (cons 'open "ctrl")))))
-         )
-        ) ;velocity
-
-       ((string= web-mode-engine "freemarker")
-        (cond
-         ((looking-at "<#\\(import\\|assign\\|return\\|local\\)")
-          )
-         ((eq (char-after (1- reg-end)) ?\/)
-          )
-         ((looking-at "[<[]#\\(break\\|case\\|default\\)")
-          (setq controls (append controls (list (cons 'inside "switch"))))
-          )
-         ((looking-at "[<[]#els")
-          (setq controls (append controls (list (cons 'inside "if"))))
-          )
-         ((looking-at "</?\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)?\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         ((looking-at "</?\\(@\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         ((looking-at "[<[]/?#\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)?\\)")
-          (setq control (match-string-no-properties 1)
-                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
-          (setq controls (append controls (list (cons type control))))
-          )
-         (t
-          (when (web-mode-block-starts-with "}" reg-beg)
-            (setq controls (append controls (list (cons 'close "{")))))
-          ;; todo : bug qd <% } else { %>
-          (when (web-mode-block-ends-with "{" reg-beg)
-            (setq controls (append controls (list (cons 'open "{")))))
-          )
-         )
-        ) ;freemarker
-
-       ((string= web-mode-engine "razor")
-        (when (web-mode-block-starts-with "}" reg-beg)
-          (setq controls (append controls (list (cons 'close "{")))))
-        (when (web-mode-block-ends-with "{" reg-beg)
-          (setq controls (append controls (list (cons 'open "{")))))
-        ) ;razor
-
-       ((string= web-mode-engine "lsp")
-        (when (web-mode-block-starts-with ")" reg-beg)
-          (setq controls (append controls (list (cons 'close "(")))))
-        (when (web-mode-block-is-opened-sexp reg-beg reg-end)
-          (setq controls (append controls (list (cons 'open "(")))))
-        ) ;lsp
-
-       ) ;cond engine
-
-      (put-text-property reg-beg (1+ reg-beg) 'block-controls controls)
-      ;;      (message "(%S) controls=%S" reg-beg controls)
-
-      )))
-
-(defun web-mode-block-is-opened-sexp (reg-beg reg-end)
-  (let ((n 0))
-    (save-excursion
-      (goto-char reg-beg)
-      (while (web-mode-block-rsf "[()]" reg-end)
-        (if (eq (char-before) ?\() (setq n (1+ n)) (setq n (1- n)))))
-    (> n 0)))
-
-(defvar web-mode-regexp1 "<\\(/?[[:alpha:]][[:alnum:]-]*\\|!--\\|!\\[CDATA\\[\\|!doctype\\|!DOCTYPE\\|\?xml\\)")
-
-(defvar web-mode-regexp2 "<\\(/?[[:alpha:]][[:alnum:]-]*\\|!--\\|!\\[CDATA\\[\\)")
-
-(defun web-mode-scan-elements (reg-beg reg-end)
-  (save-excursion
-    (let (part-beg part-end flags limit close-expr props tname tbeg tend element-content-type (regexp web-mode-regexp1) part-close-tag char)
-
-      (goto-char reg-beg)
-
-      (while (web-mode-dom-rsf regexp reg-end)
-
-        (setq flags 0
-              tname (downcase (match-string-no-properties 1))
-              char (aref tname 0)
-              tbeg (match-beginning 0)
-              tend nil
-              element-content-type nil
-              limit reg-end
-              part-beg nil
-              part-end nil
-              props nil
-              close-expr nil
-              part-close-tag nil)
-
-        (cond
-         ((not (member char '(?\! ?\?)))
-          (when (string-match-p "-" tname)
-            (setq flags (logior flags 2)))
-          (cond
-           ((eq char ?\/)
-            (setq props (list 'tag-name (substring tname 1) 'tag-type 'end)
-                  flags (logior flags 4)
-                  limit (if (> reg-end (line-end-position)) (line-end-position) reg-end))
-            )
-           ((web-mode-element-is-void tname)
-            (setq props (list 'tag-name tname 'tag-type 'void)))
-           (t
-            (setq props (list 'tag-name tname 'tag-type 'start)))
-           ) ;cond
-          )
-         ((and (eq char ?\!) (eq (aref tname 1) ?\-))
-          (setq close-expr "-->"
-                props '(tag-type comment)))
-         ((string= tname "?xml")
-          (setq regexp web-mode-regexp2
-                close-expr "?>"
-                props '(tag-type declaration)))
-         ((string= tname "![cdata[")
-          (setq close-expr "]]>"
-                props '(tag-type cdata)))
-         ((string= tname "!doctype")
-          (setq regexp web-mode-regexp2
-                props '(tag-type doctype)))
-         ) ;cond
-
-        (cond
-         ((and (null close-expr) (eq (char-after) ?\>))
-          (setq flags (logior flags 16)
-                tend (1+ (point))))
-         ((null close-expr)
-          (setq flags (logior flags (web-mode-attr-skip reg-end)))
-          (when (> (logand flags 8) 0)
-            (setq props (plist-put props 'tag-type 'void)))
-          (setq tend (point)))
-         ((web-mode-dom-sf close-expr limit t)
-          (setq tend (point)))
-         (t
-          (setq tend (line-end-position)))
-         )
-
-        (cond
-         ((string= tname "style")
-          (setq element-content-type "css"
-                part-close-tag "</style>"))
-         ((string= tname "script")
-          (let (script)
-            (setq script (buffer-substring-no-properties tbeg tend)
-                  part-close-tag "</script>")
-            (cond
-             ((string-match-p " type[ ]*=[ ]*[\"']text/jsx" script)
-              (setq element-content-type "jsx"))
-             ((string-match-p " type[ ]*=[ ]*[\"']text/\\(x-handlebars\\|html\\|ng-template\\|template\\|mustache\\)" script)
-              (setq element-content-type "html"
-                    part-close-tag nil))
-             ((string-match-p " type[ ]*=[ ]*[\"']application/\\(ld\\+json\\|json\\)" script)
-              (setq element-content-type "json"))
-             (t
-              (setq element-content-type "javascript"))
-             ) ;cond
-            ) ;let
-          ) ;script
-         )
-
-        (add-text-properties tbeg tend props)
-        (put-text-property tbeg (1+ tbeg) 'tag-beg flags)
-        (put-text-property (1- tend) tend 'tag-end t)
-
-        (when (and part-close-tag
-                   (web-mode-dom-sf part-close-tag reg-end t)
-                   (setq part-beg tend)
-                   (setq part-end (match-beginning 0))
-                   (> part-end part-beg))
-          (put-text-property part-beg part-end 'part-side
-                             (intern element-content-type web-mode-obarray))
-          (setq tend part-end)
-          ) ;when
-
-        (goto-char tend)
-
-        ) ;while
-
-      )))
-
-;; tag flags
-;; (1)attrs (2)custom (4)slash-beg (8)slash-end (16)bracket-end
-
-;; attr flags
-;; (1)custom-attr (2)engine-attr (3)spread-attr[jsx]
-
-;; attr states
-;; (0)nil (1)space (2)name (3)space-before (4)equal (5)space-after
-;; (6)value-uq (7)value-sq (8)value-dq (9)value-bq : jsx attr={}
-
-(defun web-mode-attr-skip (limit)
-
-  (let ((tag-flags 0) (attr-flags 0) (continue t) (attrs 0) (counter 0) (brace-depth 0)
-        (pos-ori (point)) (state 0) (equal-offset 0) (go-back nil)
-        (is-jsx (string= web-mode-content-type "jsx"))
-        name-beg name-end val-beg char pos escaped spaced quoted)
-
-    (while continue
-
-      (setq pos (point)
-            char (char-after)
-            spaced (eq char ?\s))
-
-      (when quoted (setq quoted (1+ quoted)))
-
-      (cond
-
-       ((>= pos limit)
-        (setq continue nil)
-        (setq go-back t)
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        )
-
-       ((or (and (= state 8) (not (member char '(?\" ?\\))))
-            (and (= state 7) (not (member char '(?\' ?\\))))
-            (and (= state 9) (not (member char '(?} ?\\))))
-            )
-        (when (and (= state 9) (eq char ?\{))
-          (setq brace-depth (1+ brace-depth)))
-        )
-
-       ((and (= state 9) (eq char ?\}) (> brace-depth 1))
-        (setq brace-depth (1- brace-depth)))
-
-       ((get-text-property pos 'block-side)
-        (when (= state 2)
-          (setq name-end pos))
-        )
-
-       ((or (and (= state 8) (eq ?\" char) (not escaped))
-            (and (= state 7) (eq ?\' char) (not escaped))
-            (and (= state 9) (eq ?\} char) (= brace-depth 1))
-            )
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        (setq state 0
-              attr-flags 0
-              equal-offset 0
-              name-beg nil
-              name-end nil
-              val-beg nil)
-        )
-
-       ((and (member state '(4 5)) (member char '(?\' ?\" ?\{)))
-        (setq val-beg pos)
-        (setq quoted 1)
-        (setq state (cond ((eq ?\' char) 7)
-                          ((eq ?\" char) 8)
-                          (t             9)))
-        (when (= state 9)
-          (setq brace-depth 1))
-        )
-
-       ((and (eq ?\= char) (member state '(2 3)))
-        (setq equal-offset (- pos name-beg))
-        (setq state 4)
-        )
-
-       ((and spaced (= state 0))
-        (setq state 1)
-        )
-
-       ((and (eq char ?\<) (not (member state '(7 8 9))))
-        (setq continue nil)
-        (setq go-back t)
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        )
-
-       ((and (eq char ?\>) (not (member state '(7 8 9))))
-        (setq tag-flags (logior tag-flags 16))
-        (when (eq (char-before) ?\/)
-          (setq tag-flags (logior tag-flags 8))
-          )
-        (setq continue nil)
-        (when name-beg
-          (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset))))
-        )
-
-       ((and spaced (member state '(1 3 5)))
-        )
-
-       ((and spaced (= state 2))
-        (setq state 3)
-        )
-
-       ((and (eq char ?\/) (member state '(4 5)))
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        (setq state 1
-              attr-flags 0
-              equal-offset 0
-              name-beg nil
-              name-end nil
-              val-beg nil)
-        )
-
-       ((and (eq char ?\/) (member state '(0 1)))
-        )
-
-       ((and spaced (= state 4))
-        (setq state 5)
-        )
-
-       ((and (= state 3)
-             (or (and (>= char 97) (<= char 122)) ;a - z
-                 (and (>= char 65) (<= char 90)) ;A - Z
-                 (eq char ?\-)))
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        (setq state 2
-              attr-flags 0
-              equal-offset 0
-              name-beg pos
-              name-end pos
-              val-beg nil)
-        )
-
-       ((and (eq char ?\n) (not (member state '(7 8 9))))
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        (setq state 1
-              attr-flags 0
-              equal-offset 0
-              name-beg nil
-              name-end nil
-              val-beg nil)
-        )
-
-       ((and (= state 6) (member char '(?\s ?\n ?\/)))
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        (setq state 1
-              attr-flags 0
-              equal-offset 0
-              name-beg nil
-              name-end nil
-              val-beg nil)
-        )
-
-       ((and quoted (= quoted 2) (member char '(?\s ?\n ?\>)))
-        (when (eq char ?\>)
-          (setq tag-flags (logior tag-flags 16))
-          (setq continue nil))
-        (setq state 6)
-        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
-        (setq state 1
-              attr-flags 0
-              equal-offset 0
-              name-beg nil
-              name-end nil
-              val-beg nil)
-        )
-
-       ((and (not spaced) (= state 1))
-        (setq state 2)
-        (setq name-beg pos
-              name-end pos)
-        )
-
-       ((member state '(4 5))
-        (setq val-beg pos)
-        (setq state 6)
-        )
-
-       ((= state 1)
-        (setq state 2)
-        )
-
-       ((= state 2)
-        (setq name-end pos)
-        (when (and (= attr-flags 0) (member char '(?\- ?\:))) ;;(= (logand attr-flags 1) 1)
-          (let (attr)
-            (setq attr (buffer-substring-no-properties name-beg (1+ name-end)))
-            (cond
-             ((member attr '("http-equiv"))
-              (setq attr-flags (1- attr-flags))
-              )
-             ((and web-mode-engine-attr-regexp
-                   (string-match-p web-mode-engine-attr-regexp attr))
-              ;;(message "%S: %S" pos web-mode-engine-attr-regexp)
-              (setq attr-flags (logior attr-flags 2))
-              ;;(setq attr-flags (1- attr-flags))
-              )
-             ((and (eq char ?\-) (not (string= attr "http-")))
-              (setq attr-flags (logior attr-flags 1)))
-             ) ;cond
-            ) ;let
-          ) ;when attr-flags = 1
-        ) ;state=2
-
-       ) ;cond
-
-      ;;(message "point(%S) end(%S) state(%S) c(%S) name-beg(%S) name-end(%S) val-beg(%S) attr-flags(%S) equal-offset(%S)" pos end state char name-beg name-end val-beg attr-flags equal-offset)
-
-      (when (and quoted (>= quoted 2))
-        (setq quoted nil))
-
-      (setq escaped (eq ?\\ char))
-      (when (null go-back)
-        (forward-char))
-
-      ;;(when (> (setq counter (1+ counter)) 10000000000) ;;3200)
-      ;;  (message "attr-skip ** too much attr ** pos-ori(%S) limit(%S)" pos-ori limit)
-      ;;  (setq continue nil))
-
-      ) ;while
-
-    (when (> attrs 0) (setq tag-flags (logior tag-flags 1)))
-
-    tag-flags))
-
-(defun web-mode-attr-scan (state char name-beg name-end val-beg flags equal-offset)
-;;  (message "point(%S) state(%S) c(%c) name-beg(%S) name-end(%S) val-beg(%S) flags(%S) equal-offset(%S)"
-;;           (point) state char name-beg name-end val-beg flags equal-offset)
-  (if (null flags) (setq flags 0))
-  (cond
-   ((null name-beg)
-;;    (message "name-beg is null (%S)" (point))
-    0)
-   ((or (and (= state 8) (not (eq ?\" char)))
-        (and (= state 7) (not (eq ?\' char))))
-    (put-text-property name-beg val-beg 'tag-attr flags)
-    (put-text-property (1- val-beg) val-beg 'tag-attr-end equal-offset)
-    1)
-   ((and (member state '(4 5)) (null val-beg))
-    (put-text-property name-beg (+ name-beg equal-offset 1) 'tag-attr flags)
-    (put-text-property (+ name-beg equal-offset) (+ name-beg equal-offset 1) 'tag-attr-end equal-offset)
-    1)
-   (t
-    (let (val-end)
-      (if (null val-beg)
-          (setq val-end name-end)
-        (setq val-end (point))
-        (when (or (null char) (member char '(?\s ?\n ?\> ?\/)))
-          (setq val-end (1- val-end))
-;;          (message "val-end=%S" val-end)
-          )
-        ) ;if
-      (put-text-property name-beg (1+ val-end) 'tag-attr flags)
-      (put-text-property val-end (1+ val-end) 'tag-attr-end equal-offset)
-      ) ;let
-    1) ;t
-   (t
-    0)
-   ) ;cond
-  )
-
-(defun web-mode-part-scan (reg-beg reg-end &optional content-type)
-  (save-excursion
-    (let (token-re ch-before ch-at ch-next token-type beg end continue)
-
-      (cond
-       (content-type
-        )
-       ((member web-mode-content-type web-mode-part-content-types)
-        (setq content-type web-mode-content-type))
-       (t
-        (setq content-type (symbol-name (get-text-property reg-beg 'part-side))))
-       ) ;cond
-
-      (goto-char reg-beg)
-
-      (cond
-       ((member content-type '("javascript" "json"))
-        (setq token-re "//\\|/\\*\\|\"\\|'\\|`"))
-       ((member content-type '("jsx"))
-        (setq token-re "//\\|/\\*\\|\"\\|'\\|`\\|</?[[:alpha:]]"))
-       ((string= content-type "css")
-        (setq token-re "/\\*"))
-       (t
-        (setq token-re "/\\*\\|\"\\|'"))
-       )
-
-      (while (and token-re (< (point) reg-end) (web-mode-dom-rsf token-re reg-end t))
-        (setq beg (match-beginning 0)
-              end nil
-              token-type nil
-              continue t
-              ch-at (char-after beg)
-              ch-next (or (char-after (1+ beg)) ?\d)
-              ch-before (or (char-before beg) ?\d))
-        (cond
-
-         ((eq ?\' ch-at)
-          (while (and continue (search-forward "'" reg-end t))
-            (cond
-             ((get-text-property (1- (point)) 'block-side)
-              (setq continue t))
-             ((looking-back "\\\\+'" reg-beg t)
-              (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0)))
-             (t
-              (setq continue nil))
-             )
-            ) ;while
-          (setq token-type 'string))
-
-         ((eq ?\` ch-at)
-          (while (and continue (search-forward "`" reg-end t))
-            (cond
-             ((get-text-property (1- (point)) 'block-side)
-              (setq continue t))
-             ((looking-back "\\\\+`" reg-beg t)
-              (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0)))
-             (t
-              (setq continue nil))
-             )
-            ) ;while
-          (setq token-type 'string))
-
-         ((eq ?\" ch-at)
-          (while (and continue (search-forward "\"" reg-end t))
-            (cond
-             ((get-text-property (1- (point)) 'block-side)
-              (setq continue t))
-             ((looking-back "\\\\+\"" reg-beg t)
-              (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0)))
-             (t
-              (setq continue nil))
-             )
-            )
-          (cond
-           ((string= content-type "json")
-            (if (looking-at-p "[ ]*:")
-                (cond
-                 ((eq ?\@ (char-after (1+ beg)))
-                  (setq token-type 'context))
-                 (t
-                  (setq token-type 'key))
-                 )
-              (setq token-type 'string))
-            )
-           (t
-            (setq token-type 'string))
-           ) ;cond
-          )
-
-         ((eq ?\< ch-at)
-          (when (web-mode-jsx-skip-forward reg-end)
-            (setq end (point))
-            (put-text-property beg end 'part-element t)
-            (web-mode-scan-elements beg end)
-            (web-mode-scan-expr-literal beg end)
-            (goto-char beg)
-            (let (token-beg token-end)
-              (while (web-mode-part-sf "/*" end t)
-                (goto-char (match-beginning 0))
-                (setq token-beg (point))
-                (if (not (web-mode-part-sf "*/" end t))
-                    (goto-char end)
-                  (setq token-end (point))
-                  (put-text-property token-beg token-end 'part-token 'comment)
-                  ) ;if
-                ) ;while
-              ) ;let
-            (goto-char end)
-            ) ;when
-          )
-
-         ((eq ?\/ ch-next)
-          (unless (eq ?\\ ch-before)
-            (setq token-type 'comment)
-            (goto-char (if (< reg-end (line-end-position)) reg-end (line-end-position)))
-            )
-          )
-
-         ((eq ?\* ch-next)
-          (cond
-           ((and (member content-type '("javascript" "jsx"))
-                 (looking-back "[(=][ ]*..")
-                 (looking-at-p "[^*]*/[gimy]*"))
-            (setq token-type 'string)
-            (re-search-forward "/[gimy]*" reg-end t))
-           ;; ((unless (eq ?\\ ch-before))
-           ;;  (message "la%S" (point))
-           ;;  (setq token-type 'comment)
-           ;;  (search-forward "*/" reg-end t)
-           ;;  ) ;unless
-           ((search-forward "*/" reg-end t)
-            (setq token-type 'comment))
-           (t
-            (forward-char))
-           ) ;cond
-          )
-
-         ((and (member content-type '("javascript" "jsx"))
-               (eq ?\/ ch-at)
-               (progn (or (bobp) (backward-char)) t)
-               (looking-back "[(=][ ]*/")
-               (looking-at-p ".+/"))
-          (while (and continue (search-forward "/" reg-end t))
-            (setq continue (or (get-text-property (1- (point)) 'block-side)
-                               (eq ?\\ (char-before (1- (point))))))
-            )
-          (setq token-type 'string)
-          (skip-chars-forward "gimy")
-          )
-
-         ) ;cond
-
-        (when (and beg (>= reg-end (point)) token-type)
-          (put-text-property beg (point) 'part-token token-type)
-          (when (eq token-type 'comment)
-            (put-text-property beg (1+ beg) 'syntax-table (string-to-syntax "<"))
-            (when (< (point) (point-max))
-              (if (< (point) (line-end-position))
-                  (put-text-property (1- (point)) (point) 'syntax-table (string-to-syntax ">")) ;#445
-                (put-text-property (point) (1+ (point)) 'syntax-table (string-to-syntax ">")) ;#377
-                )
-              )
-            )
-          )
-
-        (when (> (point) reg-end)
-          (message "reg-beg(%S) reg-end(%S) token-type(%S) point(%S)"
-                   reg-beg reg-end token-type (point)))
-
-        ) ;while
-
-      )))
-
-(defun web-mode-velocity-skip-forward (pos)
-  (goto-char pos)
-  (let ((continue t) (i 0))
-    (when (eq ?\# (char-after))
-      (forward-char))
-    (when (member (char-after) '(?\$ ?\@))
-      (forward-char))
-    (when (member (char-after) '(?\!))
-      (forward-char))
-    (if (member (char-after) '(?\{))
-        (search-forward "}")
-      (setq continue t)
-      (while continue
-        (skip-chars-forward "a-zA-Z0-9_-")
-        (when (> (setq i (1+ i)) 500)
-          (message "velocity-skip-forward ** warning (%S) **" pos)
-          (setq continue nil))
-        (when (member (char-after) '(?\())
-          (search-forward ")" nil t))
-        (if (member (char-after) '(?\.))
-            (forward-char)
-          (setq continue nil))
-        ) ;while
-      ) ;if
-    ))
-
-(defun web-mode-razor-skip-forward (pos)
-  (goto-char pos)
-  (let ((continue t) (i 0))
-    (while continue
-      (skip-chars-forward " =@a-zA-Z0-9_-")
-      (cond
-       ((> (setq i (1+ i)) 500)
-        (message "razor-skip-forward ** warning **")
-        (setq continue nil))
-       ((and (eq (char-after) ?\*)
-             (eq (char-before) ?@))
-        (when (not (search-forward "*@" nil t))
-          (setq continue nil))
-        )
-       ((looking-at-p "@[({]")
-        (forward-char)
-        (when (setq pos (web-mode-closing-paren-position (point)))
-          (goto-char pos))
-        (forward-char)
-        )
-       ((and (not (eobp)) (eq ?\( (char-after)))
-        (if (looking-at-p "[ \n]*<")
-            (setq continue nil)
-          (when (setq pos (web-mode-closing-paren-position))
-            (goto-char pos))
-          (forward-char)
-          ) ;if
-        )
-       ((and (not (eobp)) (eq ?\. (char-after)))
-        (forward-char))
-       ((looking-at-p "[ \n]*{")
-        (search-forward "{")
-        (if (looking-at-p "[ \n]*<")
-            (setq continue nil)
-          (backward-char)
-          (when (setq pos (web-mode-closing-paren-position))
-            (goto-char pos))
-          (forward-char)
-          ) ;if
-        )
-       ((looking-at-p "}")
-        (forward-char))
-       (t
-        (setq continue nil))
-       ) ;cond
-      ) ;while
-    ))
-
-(defun web-mode-jsx-skip-forward (reg-end)
-  (let ((continue t) (pos nil) (i 0))
-    (save-excursion
-      (while continue
-        ;;(message "pt=%S" (point))
-        (cond
-         ((> (setq i (1+ i)) 100)
-          (message "jsx-skip-forward ** warning **")
-          (setq continue nil))
-         ((not (web-mode-dom-rsf ">\\([ \t\n]*[\];,)']\\)\\|{" reg-end))
-          (setq continue nil)
-          (when (string= web-mode-content-type "jsx")
-            (setq pos (point-max)))
-          )
-         ((eq (char-before) ?\{)
-          (backward-char)
-          (if (web-mode-closing-paren reg-end)
-              (forward-char)
-            ;;(setq continue nil)
-            (forward-char)
-            ) ;if
-          )
-         (t
-          (setq continue nil)
-          (setq pos (match-beginning 1))
-          ) ;t
-         ) ;cond
-        ) ;while
-      ) ;save-excursion
-    (when pos (goto-char pos))
-    ;;(message "jsx-skip: %S" pos)
-    pos))
-
-(defun web-mode-scan-expr-literal (reg-beg reg-end)
-  (let ((continue t) beg end)
-    (save-excursion
-      (goto-char reg-beg)
-      ;;(message "reg-beg=%S reg-end=%S" reg-beg reg-end)
-      (while (and continue (search-forward "{" reg-end t))
-        (backward-char)
-        (setq beg (point)
-              end (web-mode-closing-paren reg-end))
-        (if (not end)
-            (setq continue nil)
-          (setq end (1+ end))
-          ;; NOTE: keeping { and } as part-token is useful for indentation
-          (put-text-property (1+ beg) (1- end) 'part-token nil)
-          (put-text-property beg end 'part-expr t)
-          (web-mode-part-scan (1+ beg) (1- end) "javascript")
-          )
-        )
-      )))
-
-;; css rule = selector(s) + declaration (properties)
-(defun web-mode-css-rule-next (limit)
-  (let (at-rule sel-beg sel-end dec-beg dec-end chunk)
-    (skip-chars-forward "\n\t ")
-    (setq sel-beg (point))
-    (when (and (< (point) limit)
-               (web-mode-part-rsf "[{;]" limit))
-      (setq sel-end (1- (point)))
-      (cond
-       ((eq (char-before) ?\{)
-        (setq dec-beg (point))
-        (setq dec-end (web-mode-closing-paren-position (1- dec-beg) limit))
-        (if dec-end
-            (progn
-              (goto-char dec-end)
-              (forward-char))
-          (setq dec-end limit)
-          (goto-char limit))
-        )
-       (t
-        )
-       ) ;cond
-      (setq chunk (buffer-substring-no-properties sel-beg sel-end))
-      (when (string-match "@\\([[:alpha:]-]+\\)" chunk)
-        (setq at-rule (match-string-no-properties 1 chunk))
-;;        (message "%S at-rule=%S" chunk at-rule)
-        )
-      ) ;when
-    (if (not sel-end)
-        (progn (goto-char limit) nil)
-      (list :at-rule at-rule
-            :sel-beg sel-beg
-            :sel-end sel-end
-            :dec-beg dec-beg
-            :dec-end dec-end)
-      ) ;if
-    ))
-
-(defun web-mode-css-rule-current (&optional pos part-beg part-end)
-  "Current CSS rule boundaries."
-  (unless pos (setq pos (point)))
-  (unless part-beg (setq part-beg (web-mode-part-beginning-position pos)))
-  (unless part-end (setq part-end (web-mode-part-end-position pos)))
-  (save-excursion
-    (let (beg end)
-      (goto-char pos)
-      (if (not (web-mode-part-sb "{" part-beg))
-          (progn
-            (setq beg part-beg)
-            (if (web-mode-part-sf ";" part-end)
-                (setq end (1+ (point)))
-              (setq end part-end))
-            ) ;progn
-        (setq beg (point))
-        (setq end (web-mode-closing-paren-position beg part-end))
-        (if end
-            (setq end (1+ end))
-          (setq end (line-end-position)))
-;;        (message "%S >>beg%S >>end%S" pos beg end)
-        (if (> pos end)
-
-            ;;selectors
-            (progn
-              (goto-char pos)
-              (if (web-mode-part-rsb "[};]" part-beg)
-                  (setq beg (1+ (point)))
-                (setq beg part-beg)
-                ) ;if
-              (goto-char pos)
-              (if (web-mode-part-rsf "[{;]" part-end)
-                  (cond
-                   ((eq (char-before) ?\;)
-                    (setq end (point))
-                    )
-                   (t
-                    (setq end (web-mode-closing-paren-position (1- (point)) part-end))
-                    (if end
-                        (setq end (1+ end))
-                      (setq end part-end))
-                    )
-                   ) ;cond
-                (setq end part-end)
-                )
-              ) ;progn selectors
-
-          ;; declaration
-          (goto-char beg)
-          (if (web-mode-part-rsb "[}{;]" part-beg)
-              (setq beg (1+ (point)))
-            (setq beg part-beg)
-            ) ;if
-          ) ; if > pos end
-        )
-;;      (message "beg(%S) end(%S)" beg end)
-      (when (eq (char-after beg) ?\n)
-        (setq beg (1+ beg)))
-      (cons beg end)
-      )))
-
-(defun web-mode-scan-engine-comments (reg-beg reg-end tag-start tag-end)
-  "Scan engine comments (mako, django)."
-  (save-excursion
-    (let (beg end (continue t))
-      (goto-char reg-beg)
-      (while (and continue
-                  (< (point) reg-end)
-                  (re-search-forward tag-start reg-end t))
-        (goto-char (match-beginning 0))
-        (setq beg (point))
-        (if (not (re-search-forward tag-end reg-end t))
-            (setq continue nil)
-          (setq end (point))
-          (remove-list-of-text-properties beg end web-mode-scan-properties)
-          (add-text-properties beg end '(block-side t block-token comment))
-          (put-text-property beg (1+ beg) 'block-beg 0)
-          (put-text-property (1- end) end 'block-end t)
-          ) ;if
-        ) ;while
-      )))
-
-(defun web-mode-propertize (&optional beg end)
-
-  (unless beg (setq beg web-mode-change-beg))
-  (unless end (setq end web-mode-change-end))
-
-;;  (message "propertize: beg(%S) end(%S)" web-mode-change-beg web-mode-change-end)
-
-  (when (and end (> end (point-max)))
-    (setq end (point-max)))
-
-;;  (remove-text-properties beg end '(font-lock-face nil))
-
-  (setq web-mode-change-beg nil
-        web-mode-change-end nil)
-  (cond
-
-   ((or (null beg) (null end))
-    ;;      (message "nothing todo")
-    nil)
-
-   ((and (member web-mode-engine '("php" "asp"))
-         (get-text-property beg 'block-side)
-         (get-text-property end 'block-side)
-         (> beg (point-min))
-         (not (eq (get-text-property (1- beg) 'block-token) 'delimiter-beg))
-         (not (eq (get-text-property end 'block-token) 'delimiter-end)))
-    ;;(message "invalidate block")
-    (web-mode-invalidate-block-region beg end))
-
-   ((and (or (member web-mode-content-type '("css" "jsx" "javascript"))
-             (and (get-text-property beg 'part-side)
-                  (get-text-property end 'part-side)
-                  (> beg (point-min))
-                  (get-text-property (1- beg) 'part-side)
-                  (get-text-property end 'part-side))
-             ))
-    ;; (not (looking-back "\\*/\\|</"))
-    ;; (progn
-    ;;   (setq chunk (buffer-substring-no-properties beg end))
-    ;;   (not (string-match-p "\\*/\\|</" chunk))
-    ;;   )
-    ;;(message "invalidate part (%S > %S)" beg end)
-    (web-mode-invalidate-part-region beg end))
-
-   (t
-    ;;(message "%S %S" beg end)
-    (web-mode-invalidate-region beg end))
-
-   ) ;cond
-
-  )
-
-;; NOTE: il est important d'identifier des caractères en fin de ligne
-;; web-mode-block-tokenize travaille en effet sur les fins de lignes pour
-;; les commentaires de type //
-(defun web-mode-invalidate-block-region (pos-beg pos-end)
-  ;;  (message "pos-beg(%S) pos-end(%S)" pos-beg pos-end)
-  (save-excursion
-    (let (beg end code-beg code-end)
-      ;;(message "invalidate-block-region: pos-beg(%S)=%S" pos-beg (get-text-property pos 'block-side))
-      ;;(message "code-beg(%S) code-end(%S) pos-beg(%S) pos-end(%S)" code-beg code-end pos-beg pos-end)
-      (cond
-       ((not (and (setq code-beg (web-mode-block-code-beginning-position pos-beg))
-                  (setq code-end (web-mode-block-code-end-position pos-beg))
-                  (>= pos-beg code-beg)
-                  (<= pos-end code-end)
-                  (> code-end code-beg)))
-        (web-mode-invalidate-region pos-beg pos-end))
-       ((member web-mode-engine '("asp"))
-        (goto-char pos-beg)
-        (forward-line -1)
-        (setq beg (line-beginning-position))
-        (when (> code-beg beg)
-          (setq beg code-beg))
-        (goto-char pos-beg)
-        (forward-line)
-        (setq end (line-end-position))
-        (when (< code-end end)
-          (setq end code-end))
-        ;; ?? pas de (web-mode-block-tokenize beg end) ?
-        (cons beg end)
-        ) ; asp
-       (t
-        (goto-char pos-beg)
-        (if (web-mode-block-rsb "[;{}(][ ]*\n" code-beg)
-            (setq beg (match-end 0))
-          (setq beg code-beg))
-        (goto-char pos-end)
-        (if (web-mode-block-rsf "[;{})][ ]*\n" code-end)
-            (setq end (1- (match-end 0)))
-          (setq end code-end))
-        (web-mode-block-tokenize beg end)
-        ;;(message "beg(%S) end(%S)" beg end)
-        (cons beg end)
-        )
-       ) ;cond
-      )))
-
-(defun web-mode-invalidate-part-region (pos-beg pos-end)
-  (save-excursion
-    (let (beg end part-beg part-end language)
-      (if (member web-mode-content-type '("css" "javascript" "json" "jsx"))
-          (setq language web-mode-content-type)
-        (setq language (symbol-name (get-text-property pos-beg 'part-side))))
-      (setq part-beg (web-mode-part-beginning-position pos-beg)
-            part-end (web-mode-part-end-position pos-beg))
-      ;;(message "language(%S) pos-beg(%S) pos-end(%S) part-beg(%S) part-end(%S)"
-      ;;       language pos-beg pos-end part-beg part-end)
-      (goto-char pos-beg)
-      (cond
-       ((not (and part-beg part-end
-                  (>= pos-beg part-beg)
-                  (<= pos-end part-end)
-                  (> part-end part-beg)))
-        (web-mode-invalidate-region pos-beg pos-end))
-       ((member language '("javascript" "json" "jsx"))
-        (if (web-mode-javascript-rsb "[;{}(][ ]*\n" part-beg)
-            (setq beg (match-end 0))
-          (setq beg part-beg))
-        (goto-char pos-end)
-        (if (web-mode-javascript-rsf "[;{})][ ]*\n" part-end)
-            (setq end (match-end 0))
-          (setq end part-end))
-        (web-mode-scan-region beg end language))
-       ((string= language "css")
-        (let (rule1 rule2)
-          (setq rule1 (web-mode-css-rule-current pos-beg))
-          (setq rule2 rule1)
-          (when (> pos-end (cdr rule1))
-            (setq rule2 (web-mode-css-rule-current pos-end)))
-          (setq beg (car rule1)
-                end (cdr rule2))
-          )
-        (web-mode-scan-region beg end language))
-       (t
-        (setq beg part-beg
-              end part-end)
-        (web-mode-scan-region beg end language))
-       ) ;cond
-      )))
-
-(defun web-mode-invalidate-region (reg-beg reg-end)
-  (setq reg-beg (web-mode-invalidate-region-beginning-position reg-beg)
-        reg-end (web-mode-invalidate-region-end-position reg-end))
-  ;;(message "invalidate-region: reg-beg(%S) reg-end(%S)" reg-beg reg-end)
-  (web-mode-scan-region reg-beg reg-end))
-
-(defun web-mode-invalidate-region-beginning-position (pos)
-  (save-excursion
-    (goto-char pos)
-    (when (and (bolp) (not (bobp)))
-      (backward-char))
-    (beginning-of-line)
-    ;;(message "pos=%S %S" (point) (text-properties-at (point)))
-    (setq pos (point-min))
-    (let ((continue (not (bobp))))
-      (while continue
-        (cond
-         ((bobp)
-          (setq continue nil))
-         ;; NOTE: Going back to the previous start tag is necessary
-         ;; when inserting a part end tag (e.g. </script>).
-         ;; Indeed, parts must be identified asap.
-         ((and (progn (back-to-indentation) t)
-               (get-text-property (point) 'tag-beg)
-               (eq (get-text-property (point) 'tag-type) 'start))
-          (setq pos (point)
-                continue nil))
-         (t
-          (forward-line -1))
-         ) ;cond
-        ) ;while
-      ;;(message "pos=%S" pos)
-      pos)))
-
-(defun web-mode-invalidate-region-end-position (pos)
-  (save-excursion
-    (goto-char pos)
-    (setq pos (point-max))
-    (let ((continue (not (eobp))))
-      (while continue
-        (end-of-line)
-        (cond
-         ((eobp)
-          (setq continue nil))
-         ((and (not (get-text-property (point) 'tag-type))
-               (not (get-text-property (point) 'part-side))
-               (not (get-text-property (point) 'block-side)))
-          (setq pos (point)
-                continue nil))
-         (t
-          (forward-line))
-         ) ;cond
-        ) ;while
-      pos)))
-
-(defun web-mode-buffer-scan ()
-  "Scan entine buffer."
-  (interactive)
-  (web-mode-scan-region (point-min) (point-max)))
-
-;;---- HIGHLIGHTING ------------------------------------------------------------
-
-(defun web-mode-font-lock-highlight (limit)
-  ;;(message "font-lock-highlight: point(%S) limit(%S) change-beg(%S) change-end(%S)" (point) limit web-mode-change-beg web-mode-change-end)
-  (cond
-   (web-mode-inhibit-fontification
-    nil)
-   (t
-    (web-mode-highlight-region (point) limit)
-    nil)
-   ))
-
-(defun web-mode-buffer-highlight ()
-  (interactive)
-  ;;(setq web-mode-change-beg (point-min)
-  ;;      web-mode-change-end (point-max))
-  ;;  (web-mode-font-lock-highlight (point-max))
-  (if (fboundp 'font-lock-flush)
-      (font-lock-flush)
-    (font-lock-fontify-buffer)))
-
-(defun web-mode-extend-region ()
-  ;;(message "extend-region: flb(%S) fle(%S) wmcb(%S) wmce(%S)" font-lock-beg font-lock-end web-mode-change-beg web-mode-change-end)
-  ;;  (setq font-lock-beg web-mode-change-beg
-  ;;        font-lock-end web-mode-change-end)
-  (cond
-   (web-mode-inhibit-fontification
-    nil)
-   (t ;;(and web-mode-change-beg web-mode-change-end)
-    (when (or (null web-mode-change-beg) (< font-lock-beg web-mode-change-beg))
-      ;;(message "font-lock-beg(%S) < web-mode-change-beg(%S)" font-lock-beg web-mode-change-beg)
-      (setq web-mode-change-beg font-lock-beg))
-    (when (or (null web-mode-change-end) (> font-lock-end web-mode-change-end))
-      ;;(message "font-lock-end(%S) > web-mode-change-end(%S)" font-lock-end web-mode-change-end)
-      (setq web-mode-change-end font-lock-end))
-    (let ((region (web-mode-propertize web-mode-change-beg web-mode-change-end)))
-      (when region
-        ;;(message "region: %S" region)
-        (setq font-lock-beg (car region)
-              font-lock-end (cdr region)
-              ;;web-mode-change-beg (car region)
-              ;;web-mode-change-end (cdr region)
-              )
-        ) ;when
-      ) ;let
-    nil) ;t
-   ))
-
-(defun web-mode-unfontify-region (beg end)
-  ;;(message "unfontify: %S %S" beg end)
-  )
-
-(defun web-mode-highlight-region (&optional beg end) ;; content-type)
-;;  (message "highlight-region: beg(%S) end(%S) ct(%S)" beg end content-type)
-  (web-mode-with-silent-modifications
-   (save-excursion
-     (save-restriction
-       (save-match-data
-         (let (
-               (buffer-undo-list t)
-               ;;(inhibit-modification-hooks t)
-               (inhibit-point-motion-hooks t)
-               (inhibit-quit t))
-           (remove-list-of-text-properties beg end '(font-lock-face face))
-           (cond
-            ((and (get-text-property beg 'block-side)
-                  (not (get-text-property beg 'block-beg)))
-             (web-mode-block-highlight beg end))
-            ((or (member web-mode-content-type web-mode-part-content-types)
-                 ;;(member content-type web-mode-part-content-types)
-                 (get-text-property beg 'part-side))
-             (web-mode-part-highlight beg end)
-             (web-mode-process-blocks beg end 'web-mode-block-highlight))
-            ((string= web-mode-engine "none")
-             (web-mode-highlight-tags beg end)
-             (web-mode-process-parts beg end 'web-mode-part-highlight))
-            (t
-             (web-mode-highlight-tags beg end)
-             (web-mode-process-parts beg end 'web-mode-part-highlight)
-             (web-mode-process-blocks beg end 'web-mode-block-highlight))
-            ) ;cond
-           (when web-mode-enable-element-content-fontification
-             (web-mode-highlight-elements beg end))
-           (when web-mode-enable-whitespace-fontification
-             (web-mode-highlight-whitespaces beg end))
-           ;;(message "%S %S" font-lock-keywords font-lock-keywords-alist)
-           ))))))
-
-(defun web-mode-highlight-tags (reg-beg reg-end)
-  (let ((continue t))
-    (goto-char reg-beg)
-    (when (and (not (get-text-property (point) 'tag-beg))
-               (not (web-mode-tag-next)))
-      (setq continue nil))
-    (when (and continue (>= (point) reg-end))
-      (setq continue nil))
-    (while continue
-      (web-mode-tag-highlight)
-      (when (or (not (web-mode-tag-next))
-                (>= (point) reg-end))
-        (setq continue nil))
-      ) ;while
-    (when web-mode-enable-inlays
-      (when (null web-mode-inlay-regexp)
-        (setq web-mode-inlay-regexp (regexp-opt '("\\[" "\\(" "\\begin{align}"))))
-      (let (beg end expr)
-        (goto-char reg-beg)
-        (while (web-mode-dom-rsf web-mode-inlay-regexp reg-end)
-          (setq beg (match-beginning 0)
-                end nil
-                expr (substring (match-string-no-properties 0) 0 2))
-          (setq expr (cond
-                      ((string= expr "\\[") "\\]")
-                      ((string= expr "\\(") "\\)")
-                      (t "\\end{align}")))
-          (when (and (web-mode-dom-sf expr reg-end)
-                     (setq end (match-end 0))
-                     (not (text-property-any beg end 'tag-end t)))
-            (font-lock-append-text-property beg end 'font-lock-face 'web-mode-inlay-face)
-            ) ;when
-          ) ;while
-        ) ;let
-      ) ;when
-    ))
-
-(defun web-mode-tag-highlight (&optional beg end)
-  (unless beg (setq beg (point)))
-  (unless end (setq end (1+ (web-mode-tag-end-position beg))))
-  (let (name type face flags slash-beg slash-end bracket-end)
-    (setq flags (get-text-property beg 'tag-beg)
-          type (get-text-property beg 'tag-type)
-          name (get-text-property beg 'tag-name))
-    (cond
-     ((eq type 'comment)
-      (put-text-property beg end 'font-lock-face 'web-mode-comment-face)
-      (when (and web-mode-enable-comment-keywords (> (- end beg) 5))
-        (web-mode-interpolate-comment beg end nil)))
-     ((eq type 'cdata)
-      (put-text-property beg end 'font-lock-face 'web-mode-doctype-face))
-     ((eq type 'doctype)
-      (put-text-property beg end 'font-lock-face 'web-mode-doctype-face))
-     ((eq type 'declaration)
-      (put-text-property beg end 'font-lock-face 'web-mode-doctype-face))
-     (name
-      (setq face (cond
-                  ((and web-mode-enable-element-tag-fontification
-                        (setq face (cdr (assoc name web-mode-element-tag-faces))))
-                   face)
-                  ((> (logand flags 2) 0) 'web-mode-html-tag-custom-face)
-                  (t                      'web-mode-html-tag-face))
-            slash-beg (> (logand flags 4) 0)
-            slash-end (> (logand flags 8) 0)
-            bracket-end (> (logand flags 16) 0))
-      (put-text-property beg
-                         (+ beg (if slash-beg 2 1))
-                         'font-lock-face 'web-mode-html-tag-bracket-face)
-      (put-text-property (+ beg (if slash-beg 2 1))
-                         (+ beg (if slash-beg 2 1) (length name))
-                         'font-lock-face face)
-      (when (or slash-end bracket-end)
-        (put-text-property (- end (if slash-end 2 1)) end 'font-lock-face 'web-mode-html-tag-bracket-face)
-        ) ;when
-      (when (> (logand flags 1) 0)
-        (web-mode-highlight-attrs beg end))
-      ) ;case name
-     ) ;cond
-    ))
-
-(defun web-mode-highlight-attrs (reg-beg reg-end)
-  (let ((continue t) (pos reg-beg) beg end flags offset face)
-    (while continue
-      (setq beg (next-single-property-change pos 'tag-attr))
-      (if (and beg (< beg reg-end))
-          (progn
-            (setq flags (or (get-text-property beg 'tag-attr) 0))
-            (setq face (cond
-                        ((= (logand flags 1) 1) 'web-mode-html-attr-custom-face)
-                        ((= (logand flags 2) 2) 'web-mode-html-attr-engine-face)
-                        (t                      'web-mode-html-attr-name-face)))
-            (if (get-text-property beg 'tag-attr-end)
-                (setq end beg)
-              (setq end (next-single-property-change beg 'tag-attr-end)))
-            (if (and end (< end reg-end))
-                (progn
-                  (setq offset (get-text-property end 'tag-attr-end))
-                  (if (= offset 0)
-                      (put-text-property beg (1+ end) 'font-lock-face face)
-                    (put-text-property beg (+ beg offset) 'font-lock-face face)
-                    (put-text-property (+ beg offset) (+ beg offset 1)
-                                       'font-lock-face
-                                       'web-mode-html-attr-equal-face)
-                    (put-text-property (+ beg offset 1) (1+ end)
-                                       'font-lock-face
-                                       (if (get-text-property (+ beg offset 1) 'part-expr)
-                                           nil
-                                         'web-mode-html-attr-value-face))
-                    ) ;if offset
-                  (setq pos (1+ end))
-                  ) ;progn
-              (setq continue nil)
-              ) ;if end
-            ) ;progn beg
-        (setq continue nil)
-        ) ;if beg
-      ) ;while
-    ))
-
-(defun web-mode-block-highlight (reg-beg reg-end)
-  (let (sub1 sub2 sub3 continue char keywords token-type face beg end (buffer (current-buffer)))
-    ;;(message "reg-beg=%S reg-end=%S" reg-beg reg-end)
-
-    ;; NOTE: required for block inside tag attr
-    (remove-list-of-text-properties reg-beg reg-end '(font-lock-face))
-
-    (goto-char reg-beg)
-
-    (when (null web-mode-engine-font-lock-keywords)
-      (setq sub1 (buffer-substring-no-properties
-                  reg-beg (+ reg-beg 1))
-            sub2 (buffer-substring-no-properties
-                  reg-beg (+ reg-beg 2))
-            sub3 (buffer-substring-no-properties
-                  reg-beg (+ reg-beg (if (>= (point-max) (+ reg-beg 3)) 3 2))))
-      )
-
-    (cond
-
-     ((and (get-text-property reg-beg 'block-beg)
-           (eq (get-text-property reg-beg 'block-token) 'comment))
-      (put-text-property reg-beg reg-end 'font-lock-face 'web-mode-comment-face)
-      ) ;comment block
-
-     (web-mode-engine-font-lock-keywords
-      (setq keywords web-mode-engine-font-lock-keywords)
-      )
-
-     ((string= web-mode-engine "django")
-      (cond
-       ((string= sub2 "{{")
-        (setq keywords web-mode-django-expr-font-lock-keywords))
-       ((string= sub2 "{%")
-        (setq keywords web-mode-django-code-font-lock-keywords))
-       )) ;django
-
-     ((string= web-mode-engine "mako")
-      (cond
-       ((member sub3 '("<% " "<%\n" "<%!"))
-        (setq keywords web-mode-mako-block-font-lock-keywords))
-       ((eq (aref sub2 0) ?\%)
-        (setq keywords web-mode-mako-block-font-lock-keywords))
-       ((member sub2 '("<%" "</"))
-        (setq keywords web-mode-mako-tag-font-lock-keywords))
-       ((member sub2 '("${"))
-        (setq keywords web-mode-uel-font-lock-keywords))
-       )) ;mako
-
-     ((string= web-mode-engine "mason")
-      ;;(message "%S %S" sub2 sub3)
-      (cond
-       ((member sub3 '("<% " "<%\n" "<&|"))
-        (setq keywords web-mode-mason-code-font-lock-keywords))
-       ((eq (aref sub2 0) ?\%)
-        (setq keywords web-mode-mason-code-font-lock-keywords))
-       ((and (or (string= sub2 "<%") (string= sub3 "</%"))
-             (not (member sub3 '("<%c" "<%i" "<%p"))))
-        (setq keywords web-mode-mason-block-font-lock-keywords))
-       (t
-        (setq keywords web-mode-mason-code-font-lock-keywords))
-       )) ;mason
-
-     ((string= web-mode-engine "jsp")
-      (cond
-       ((string= sub3 "<%@")
-        (setq keywords web-mode-directive-font-lock-keywords))
-       ((member sub2 '("${" "#{"))
-        (setq keywords web-mode-uel-font-lock-keywords))
-       ((string= sub2 "<%")
-        (setq keywords web-mode-jsp-font-lock-keywords))
-       (t
-        (setq keywords web-mode-engine-tag-font-lock-keywords))
-       )) ;jsp
-
-     ((string= web-mode-engine "asp")
-      (cond
-       ((or (string= sub2 "<%")
-            (not (string= sub1 "<")))
-        (setq keywords web-mode-asp-font-lock-keywords))
-       (t
-        (setq keywords web-mode-engine-tag-font-lock-keywords))
-       )) ;asp
-
-     ((string= web-mode-engine "clip")
-      (setq keywords web-mode-engine-tag-font-lock-keywords)
-      ) ;clip
-
-     ((string= web-mode-engine "aspx")
-      (cond
-       ((string= sub3 "<%@")
-        (setq keywords web-mode-directive-font-lock-keywords))
-       ((string= sub3 "<%$")
-        (setq keywords web-mode-expression-font-lock-keywords))
-       (t
-        (setq keywords web-mode-aspx-font-lock-keywords))
-       )) ;aspx
-
-     ((string= web-mode-engine "freemarker")
-      (cond
-       ((member sub2 '("${" "#{"))
-        (setq keywords web-mode-uel-font-lock-keywords))
-       ((or (member sub2 '("<@" "[@" "<#" "[#"))
-            (member sub3 '("</@" "[/@" "</#" "[/#")))
-        (setq keywords (if (eq ?\[ (aref sub2 0))
-                           web-mode-freemarker-square-font-lock-keywords
-                         web-mode-freemarker-font-lock-keywords)))
-       (t
-        (setq keywords web-mode-engine-tag-font-lock-keywords))
-       )) ;freemarker
-
-     ) ;cond
-
-    (when keywords
-      (web-mode-fontify-region reg-beg reg-end keywords)
-      (setq continue t)
-      (setq end reg-beg)
-      (while continue
-        (if (get-text-property end 'block-token)
-            (setq beg end)
-          (setq beg (next-single-property-change end 'block-token buffer reg-end)))
-        (setq end nil)
-        (when beg (setq char (char-after beg)))
-        (if (and beg (< beg reg-end))
-            (progn
-              (setq token-type (get-text-property beg 'block-token))
-              (setq face (cond
-                          ((eq token-type 'string)  'web-mode-block-string-face)
-                          ((eq token-type 'comment) 'web-mode-block-comment-face)
-                          (t                        'web-mode-block-delimiter-face)))
-              (setq end (next-single-property-change beg 'block-token buffer reg-end))
-;;              (message "end=%S" end)
-              (if (and end (<= end reg-end))
-                  (progn
-                    ;;(message "%S > %S face(%S)" beg end face)
-                    (remove-list-of-text-properties beg end '(face))
-                    (put-text-property beg end 'font-lock-face face)
-                    )
-                (setq continue nil
-                      end nil)
-                ) ;if end
-              ) ;progn beg
-          (setq continue nil
-                end nil)
-          ) ;if beg
-        (when (and beg end)
-          (save-match-data
-            (when (and web-mode-enable-heredoc-fontification
-                       (eq char ?\<)
-                       (> (- end beg) 8)
-                       (string-match-p "JS\\|JAVASCRIPT\\|HTM\\|CSS" (buffer-substring-no-properties beg end)))
-              (setq keywords (if (eq ?H (char-after (+ beg 3)))
-                                 web-mode-html-font-lock-keywords
-                               web-mode-javascript-font-lock-keywords))
-              (web-mode-fontify-region beg end keywords)
-            ))
-;;          (message "%S %c %S beg=%S end=%S" web-mode-enable-string-interpolation char web-mode-engine beg end)
-          (when (and web-mode-enable-string-interpolation
-                     (member char '(?\" ?\<))
-                     (member web-mode-engine '("php" "erb"))
-                     (> (- end beg) 4))
-            (web-mode-interpolate-block-string beg end)
-            ) ;when
-          (when (and web-mode-enable-comment-keywords
-                     (eq token-type 'comment)
-                     (> (- end beg) 3))
-            (web-mode-interpolate-comment beg end t)
-            ) ;when
-          (when (and (eq token-type 'string)
-                     (> (- end beg) 6)
-                     (web-mode-looking-at-p (concat "[ \n]*" web-mode-sql-queries) (1+ beg)))
-            (web-mode-interpolate-sql-string beg end)
-            ) ;when
-          ) ;when beg end
-        ) ;while continue
-      ) ;when keywords
-
-    (when (and (member web-mode-engine '("jsp" "mako"))
-               (> (- reg-end reg-beg) 12)
-               (eq ?\< (char-after reg-beg)))
-      (web-mode-interpolate-block-tag reg-beg reg-end))
-
-    (when web-mode-enable-block-face
-;;      (message "block-face %S %S" reg-beg reg-end)
-      (font-lock-append-text-property reg-beg reg-end 'face 'web-mode-block-face))
-
-    ))
-
-(defun web-mode-part-highlight (reg-beg reg-end)
-  (save-excursion
-    (let (start continue token-type face beg end string-face comment-face content-type)
-;;      (message "part-highlight: reg-beg(%S) reg-end(%S)" reg-beg reg-end)
-      (if (member web-mode-content-type web-mode-part-content-types)
-          (setq content-type web-mode-content-type)
-        (setq content-type (symbol-name (get-text-property reg-beg 'part-side))))
-      (goto-char reg-beg)
-      (cond
-       ((member content-type '("javascript" "jsx"))
-        (setq string-face 'web-mode-javascript-string-face
-              comment-face 'web-mode-javascript-comment-face)
-        (web-mode-fontify-region reg-beg reg-end web-mode-javascript-font-lock-keywords)
-        )
-       ((string= content-type "json")
-        (setq string-face 'web-mode-json-string-face
-              comment-face 'web-mode-json-comment-face)
-        (web-mode-fontify-region reg-beg reg-end web-mode-javascript-font-lock-keywords))
-       ((string= content-type "css")
-        (setq string-face 'web-mode-css-string-face
-              comment-face 'web-mode-css-comment-face)
-        (web-mode-css-rules-highlight reg-beg reg-end)
-        )
-       (t
-        (setq string-face 'web-mode-part-string-face
-              comment-face 'web-mode-part-comment-face)
-        )
-       )
-      (when (string= content-type "jsx") (web-mode-highlight-tags reg-beg reg-end))
-      (setq continue t
-            end reg-beg)
-      (while continue
-        (if (and (= reg-beg end)
-                 (get-text-property end 'part-token))
-            (setq beg reg-beg)
-          (setq beg (next-single-property-change end 'part-token)))
-        (setq end nil)
-        (if (and beg (< beg reg-end))
-            (progn
-              (setq token-type (get-text-property beg 'part-token))
-              (setq face (cond
-                          ((eq token-type 'string)  string-face)
-                          ((eq token-type 'comment) comment-face)
-                          ((eq token-type 'context) 'web-mode-json-context-face)
-                          ((eq token-type 'key)     'web-mode-json-key-face)
-                          (t                        nil)))
-              (setq end (or (next-single-property-change beg 'part-token) (point-max)))
-              (if (<= end reg-end)
-                  (cond
-                   (face
-                    (remove-list-of-text-properties beg end '(face))
-                    (put-text-property beg end 'font-lock-face face)
-                    (when (and web-mode-enable-string-interpolation
-                               (string= content-type "javascript")
-                               (>= (- end beg) 6))
-                      (web-mode-interpolate-javascript-string beg end))
-                    ) ;face
-                   ) ;cond
-                (setq continue nil
-                      end nil)
-                ) ;if end
-              ) ;progn beg
-          (setq continue nil
-                end nil)
-          ) ;if beg
-        (when (and beg end
-                   web-mode-enable-comment-keywords
-                   (eq token-type 'comment)
-                   (> (- end beg) 3))
-          (web-mode-interpolate-comment beg end t))
-        ) ;while
-      (when (and (string= web-mode-content-type "html") web-mode-enable-part-face)
-        (font-lock-append-text-property reg-beg reg-end 'face
-                                        (if (string= content-type "javascript")
-                                            'web-mode-script-face
-                                          'web-mode-style-face))
-        )
-      (when (string= content-type "jsx")
-        (goto-char reg-beg)
-        ;;(web-mode-highlight-tags reg-beg reg-end)
-        (setq continue t
-              end reg-beg)
-        (while continue
-          (setq beg (next-single-property-change end 'part-expr)
-                end nil)
-;;          (message "beg=%S reg-end=%S" beg reg-end)
-          (if (and beg (< beg reg-end))
-              (progn
-                (setq end (next-single-property-change beg 'part-expr))
-;;                (message "bounds %S %S"  beg end)
-                (if (and end (< end reg-end))
-                    (progn
-;;                      (remove-text-properties beg end '(face nil))
-                      (put-text-property beg (1+ beg) 'font-lock-face
-                                         'web-mode-block-delimiter-face)
-                      (put-text-property (1- end) end 'font-lock-face
-                                         'web-mode-block-delimiter-face)
-                      (web-mode-fontify-region (1+ beg) (1- end)
-                                               web-mode-javascript-font-lock-keywords)
-                      ) ;progn
-                  (setq continue nil
-                        end nil))
-                ) ;progn
-            (setq continue nil
-                  end nil))
-          ) ;while
-        ) ;when jsx
-      )))
-
-(defun web-mode-css-rules-highlight (part-beg part-end)
-  (save-excursion
-    (goto-char part-beg)
-    (let (rule (continue t) (i 0) (at-rule nil))
-      (while continue
-        (setq rule (web-mode-css-rule-next part-end))
-        ;;(message "rule=%S" rule)
-        (cond
-         ((> (setq i (1+ i)) 1000)
-          (message "css-rules-highlight ** too much rules **")
-          (setq continue nil))
-         ((null rule)
-          (setq continue nil))
-         ((and (setq at-rule (plist-get rule :at-rule))
-               (not (member at-rule '("charset" "font-face" "import")))
-               (plist-get rule :dec-end))
-          (web-mode-css-rule-highlight (plist-get rule :sel-beg)
-                                       (plist-get rule :sel-end)
-                                       nil nil)
-          (web-mode-css-rules-highlight (plist-get rule :dec-beg)
-                                        (plist-get rule :dec-end)))
-         (t
-          (web-mode-css-rule-highlight (plist-get rule :sel-beg)
-                                       (plist-get rule :sel-end)
-                                       (plist-get rule :dec-beg)
-                                       (plist-get rule :dec-end)))
-         ) ;cond
-        ) ;while
-      ) ;let
-    ))
-
-(defun web-mode-css-rule-highlight (sel-beg sel-end dec-beg dec-end)
-  (save-excursion
-;;    (message "sel-beg=%S sel-end=%S dec-beg=%S dec-end=%S" sel-beg sel-end dec-beg dec-end)
-    (web-mode-fontify-region sel-beg sel-end
-                             web-mode-selector-font-lock-keywords)
-    (when (and dec-beg dec-end)
-      (web-mode-fontify-region dec-beg dec-end
-                               web-mode-declaration-font-lock-keywords)
-      (goto-char dec-beg)
-      (while (and web-mode-enable-css-colorization
-                  (re-search-forward "#[0-9a-fA-F]\\{6\\}\\|#[0-9a-fA-F]\\{3\\}\\|rgb([ ]*\\([[:digit:]]\\{1,3\\}\\)[ ]*,[ ]*\\([[:digit:]]\\{1,3\\}\\)[ ]*,[ ]*\\([[:digit:]]\\{1,3\\}\\)\\(.*?\\))" dec-end t)
-                  (< (point) dec-end))
-        (web-mode-colorize (match-beginning 0) (match-end 0))
-        )
-      )))
-
-(defun web-mode-fontify-region (beg end keywords)
-;;  (message "beg=%S end=%S" beg end);; (symbol-name keywords))
-  (save-excursion
-    (let ((font-lock-keywords keywords)
-          (font-lock-multiline nil)
-          (font-lock-keywords-case-fold-search
-           (member web-mode-engine '("asp" "template-toolkit")))
-          (font-lock-keywords-only t)
-          (font-lock-extend-region-functions nil))
-      ;;      (message "%S" keywords)
-      (when (listp font-lock-keywords)
-        (font-lock-fontify-region beg end)
-        )
-      )
-    ))
-
-(defun web-mode-colorize-foreground (color)
-  (let* ((values (x-color-values color))
-	 (r (car values))
-	 (g (cadr values))
-	 (b (car (cdr (cdr values)))))
-    (if (> 128.0 (floor (+ (* .3 r) (* .59 g) (* .11 b)) 256))
-	"white" "black")))
-
-(defun web-mode-colorize (beg end)
-  (let (str plist len)
-    (setq str (buffer-substring-no-properties beg end))
-    (setq len (length str))
-    (cond
-     ((string= (substring str 0 1) "#")
-      (setq plist (list :background str
-                        :foreground (web-mode-colorize-foreground str)))
-      (put-text-property beg end 'face plist))
-     ((string= (substring str 0 4) "rgb(")
-      (setq str (format "#%02X%02X%02X"
-                        (string-to-number (match-string-no-properties 1))
-                        (string-to-number (match-string-no-properties 2))
-                        (string-to-number (match-string-no-properties 3))))
-      (setq plist (list :background str
-                        :foreground (web-mode-colorize-foreground str)))
-      (put-text-property beg end 'face plist))
-     ) ;cond
-    ))
-
-(defun web-mode-interpolate-block-tag (beg end)
-  (save-excursion
-    (goto-char (+ 4 beg))
-    (setq end (1- end))
-    (while (re-search-forward "${.*?}" end t)
-      (remove-list-of-text-properties (match-beginning 0) (match-end 0) '(face))
-      (web-mode-fontify-region (match-beginning 0) (match-end 0)
-                               web-mode-uel-font-lock-keywords))
-    ))
-
-(defun web-mode-interpolate-javascript-string (beg end)
-  (save-excursion
-    (goto-char (1+ beg))
-    (setq end (1- end))
-    (while (re-search-forward "${.*?}" end t)
-      (put-text-property (match-beginning 0) (match-end 0)
-                         'font-lock-face
-                         'web-mode-variable-name-face)
-      )
-    ))
-
-;; todo : parsing plus compliqué: {$obj->values[3]->name}
-(defun web-mode-interpolate-block-string (beg end)
-  (save-excursion
-    (goto-char (1+ beg))
-    (setq end (1- end))
-    (cond
-     ((string= web-mode-engine "php")
-      (while (re-search-forward "$[[:alnum:]_]+\\(->[[:alnum:]_]+\\)*\\|{[ ]*$.+?}" end t)
-;;        (message "%S > %S" (match-beginning 0) (match-end 0))
-        (remove-list-of-text-properties (match-beginning 0) (match-end 0) '(font-lock-face))
-        (web-mode-fontify-region (match-beginning 0) (match-end 0)
-                                 web-mode-php-var-interpolation-font-lock-keywords)
-        ))
-     ((string= web-mode-engine "erb")
-      (while (re-search-forward "#{.*?}" end t)
-        (remove-list-of-text-properties (match-beginning 0) (match-end 0) '(font-lock-face))
-        (put-text-property (match-beginning 0) (match-end 0)
-                           'font-lock-face 'web-mode-variable-name-face)
-        ))
-     ) ;cond
-    ))
-
-(defun web-mode-interpolate-comment (beg end block-side)
-  (save-excursion
-    (let ((regexp (concat "\\<\\(" web-mode-comment-keywords "\\)\\>")))
-      (goto-char beg)
-      (while (re-search-forward regexp end t)
-        (font-lock-prepend-text-property (match-beginning 1) (match-end 1)
-                                         'font-lock-face
-                                         'web-mode-comment-keyword-face)
-        ) ;while
-      )))
-
-(defun web-mode-interpolate-sql-string (beg end)
-  (save-excursion
-    (let ((regexp (concat "\\<\\(" web-mode-sql-keywords "\\)\\>")))
-      (goto-char beg)
-      (while (re-search-forward regexp end t)
-        (font-lock-prepend-text-property (match-beginning 1) (match-end 1)
-                                         'font-lock-face
-                                         'web-mode-sql-keyword-face)
-        ) ;while
-      )))
-
-(defun web-mode-fill-paragraph (&optional justify)
-  (save-excursion
-    (let ((pos (point)) fill-coll
-          prop pair beg end delim-beg delim-end chunk fill-col)
-      (cond
-       ((or (eq (get-text-property pos 'part-token) 'comment)
-            (eq (get-text-property pos 'block-token) 'comment))
-        (setq prop
-              (if (get-text-property pos 'part-token) 'part-token 'block-token))
-        (setq pair (web-mode-property-boundaries prop pos))
-        (when (and pair (> (- (cdr pair) (car pair)) 6))
-          (setq fill-coll (if (< fill-column 10) 70 fill-column))
-          (setq beg (car pair)
-                end (cdr pair))
-          (goto-char beg)
-          (setq chunk (buffer-substring-no-properties beg (+ beg 2)))
-          (cond
-           ((string= chunk "//")
-            (setq delim-beg "//"
-                  delim-end "EOL"))
-           ((string= chunk "/*")
-            (setq delim-beg "/*"
-                  delim-end "*/"))
-           ((string= chunk "{#")
-            (setq delim-beg "{#"
-                  delim-end "#}"))
-           ((string= chunk "<!")
-            (setq delim-beg "<!--"
-                  delim-end "-->"))
-           )
-          )
-        ) ;comment - case
-
-       ((web-mode-is-content)
-        (setq pair (web-mode-content-boundaries pos))
-        (setq beg (car pair)
-              end (cdr pair))
-        )
-
-       ) ;cond
-;;      (message "beg(%S) end(%S)" beg end)
-      (when (and beg end)
-        (fill-region beg end))
-      t)))
-
-(defun web-mode-property-boundaries (prop &optional pos)
-  "property boundaries (cdr is 1+)"
-  (unless pos (setq pos (point)))
-  (let (beg end val)
-    (setq val (get-text-property pos prop))
-    (if (null val)
-        val
-      (if (or (bobp)
-              (not (eq (get-text-property (1- pos) prop) val)))
-          (setq beg pos)
-        (setq beg (previous-single-property-change pos prop))
-        (when (null beg) (setq beg (point-min))))
-      (if (or (eobp)
-              (not (eq (get-text-property (1+ pos) prop) val)))
-          (setq end pos)
-        (setq end (next-single-property-change pos prop))
-        (when (null end) (setq end (point-min))))
-      (cons beg end))))
-
-;; verifier avec text-property-any si 'block-side
-(defun web-mode-content-apply (&optional fun)
-  (save-excursion
-    (let ((beg nil) (i 0) (continue t))
-      (goto-char (point-min))
-      (when (get-text-property (point) 'tag-type)
-        (web-mode-tag-end)
-        (setq beg (point)))
-      (while (and continue
-                  (or (get-text-property (point) 'tag-beg)
-                      (web-mode-tag-next)))
-        (when (> (setq i (1+ i)) 2000)
-          (message "content-apply ** warning **")
-          (setq continue nil))
-        (when (and beg (> (point) beg))
-          (message "content-apply ** beg(%S) > pt(%S) **" beg (point)))
-        (if (web-mode-tag-end)
-            (setq beg (point))
-          (setq continue nil))
-        ) ;while
-      )))
-
-(defun web-mode-content-boundaries (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (beg end)
-    (setq beg (or (previous-property-change pos (current-buffer))
-                  (point-max)))
-    (setq end (or (next-property-change pos (current-buffer))
-                  (point-min)))
-    (while (and (< beg end) (member (char-after beg) '(?\s ?\n)))
-      (setq beg (1+ beg)))
-    (while (and (> end beg) (member (char-after (1- end)) '(?\s ?\n)))
-      (setq end (1- end)))
-;;    (message "beg(%S) end(%S)" beg end)
-    (cons beg end)
-    ))
-
-(defun web-mode-engine-syntax-check ()
-  (interactive)
-  (let ((proc nil)
-        (errors nil)
-        (file (concat temporary-file-directory "emacs-web-mode-tmp")))
-    (write-region (point-min) (point-max) file)
-    (cond
-     ;;       ((null (buffer-file-name))
-     ;;        )
-     ((string= web-mode-engine "php")
-      (setq proc (start-process "php-proc" nil "php" "-l" file))
-      (set-process-filter proc
-                          (lambda (proc output)
-                            (cond
-                             ((string-match-p "No syntax errors" output)
-                              (message "No syntax errors")
-                              )
-                             (t
-;;                              (setq output (replace-regexp-in-string temporary-file-directory "" output))
-;;                              (message output)
-                              (message "Syntax error")
-                              (setq errors t))
-                             ) ;cond
-;;                            (delete-file file)
-                            ) ;lambda
-                          )
-      ) ;php
-     (t
-      (message "no syntax checker found")
-      ) ;t
-     ) ;cond
-    errors))
-
-(defun web-mode-jshint ()
-  "Run JSHint on all the JavaScript parts."
-  (interactive)
-  (let (proc lines)
-    (when (buffer-file-name)
-      (setq proc (start-process
-                  "jshint-proc"
-                  nil
-                  (or (executable-find "jshint") "/usr/local/bin/jshint")
-                  "--extract=auto"
-                  (buffer-file-name)))
-      (setq web-mode-jshint-errors 0)
-      (set-process-filter proc
-                          (lambda (proc output)
-                            (let ((offset 0) overlay pos (old 0) msg)
-                              (remove-overlays (point-min) (point-max) 'font-lock-face 'web-mode-error-face)
-                              (while (string-match
-                                      "line \\([[:digit:]]+\\), col \\([[:digit:]]+\\), \\(.+\\)\\.$"
-                                      output offset)
-                                (setq web-mode-jshint-errors (1+ web-mode-jshint-errors))
-                                (setq offset (match-end 0))
-                                (setq pos (web-mode-coord-position
-                                           (match-string-no-properties 1 output)
-                                           (match-string-no-properties 2 output)))
-                                (when (get-text-property pos 'tag-beg)
-                                  (setq pos (1- pos)))
-                                (when (not (= pos old))
-                                  (setq old pos)
-                                  (setq overlay (make-overlay pos (1+ pos)))
-                                  (overlay-put overlay 'font-lock-face 'web-mode-error-face)
-                                  )
-                                (setq msg (or (overlay-get overlay 'help-echo)
-                                               (concat "line="
-                                                       (match-string-no-properties 1 output)
-                                                       " column="
-                                                       (match-string-no-properties 2 output)
-                                                       )))
-                                (overlay-put overlay 'help-echo
-                                             (concat msg " ## " (match-string-no-properties 3 output)))
-                                ) ;while
-                              ))
-                          )
-      ) ;when
-    ))
-
-(defun web-mode-dom-errors-show ()
-  "Show unclosed tags."
-  (interactive)
-  (let (beg end tag pos l n tags i cont cell overlay overlays first
-            (ori (point))
-            (errors 0)
-            (continue t)
-        )
-    (setq overlays (overlays-in (point-min) (point-max)))
-    (when overlays
-      (dolist (overlay overlays)
-        (when (eq (overlay-get overlay 'face) 'web-mode-warning-face)
-          (delete-overlay overlay)
-          )
-        )
-      )
-    (goto-char (point-min))
-    (when (not (or (get-text-property (point) 'tag-beg)
-                   (web-mode-tag-next)))
-      (setq continue nil))
-    (while continue
-      (setq pos (point))
-      (setq tag (get-text-property pos 'tag-name))
-      (cond
-       ((eq (get-text-property (point) 'tag-type) 'start)
-        (setq tags (add-to-list 'tags (list tag pos)))
-;;        (message "(%S) opening %S" pos tag)
-        )
-       ((eq (get-text-property (point) 'tag-type) 'end)
-        (setq i 0
-              l (length tags)
-              cont t)
-        (while (and (< i l) cont)
-          (setq cell (nth i tags))
-;;          (message "cell=%S" cell)
-          (setq i (1+ i))
-          (cond
-           ((string= tag (nth 0 cell))
-            (setq cont nil)
-            )
-           (t
-            (setq errors (1+ errors))
-            (setq beg (nth 1 cell))
-            (setq end (web-mode-tag-end-position beg))
-            (unless first
-              (setq first beg))
-            (setq overlay (make-overlay beg (1+ end)))
-            (overlay-put overlay 'font-lock-face 'web-mode-warning-face)
-;;            (message "invalid <%S> at %S" (nth 0 cell) (nth 1 cell))
-            )
-           ) ;cond
-          ) ;while
-
-        (dotimes (i i)
-          (setq tags (cdr tags)))
-
-        )
-       ) ;cond
-      (when (not (web-mode-tag-next))
-        (setq continue nil))
-      ) ;while
-    (message "%S error(s) detected" errors)
-    (if (< errors 1)
-        (goto-char ori)
-      (goto-char first)
-      (recenter))
-    ;;    (message "%S" tags)
-    ))
-
-(defun web-mode-highlight-elements (beg end)
-  (save-excursion
-    (goto-char beg)
-    (let ((continue (or (get-text-property (point) 'tag-beg) (web-mode-tag-next)))
-          (i 0) (ctx nil) (face nil))
-      (while continue
-        (cond
-         ((> (setq i (1+ i)) 1000)
-          (message "highlight-elements ** too much tags **")
-          (setq continue nil))
-         ((> (point) end)
-          (setq continue nil))
-         ((not (get-text-property (point) 'tag-beg))
-          (setq continue nil))
-         ((eq (get-text-property (point) 'tag-type) 'start)
-          (when (and (setq ctx (web-mode-element-boundaries (point)))
-                     (<= (car (cdr ctx)) end)
-                     (setq face (cdr (assoc (get-text-property (point) 'tag-name) web-mode-element-content-faces))))
-            (font-lock-prepend-text-property (1+ (cdr (car ctx))) (car (cdr ctx))
-                                             'font-lock-face face))
-          )
-         ) ;cond
-        (when (not (web-mode-tag-next))
-          (setq continue nil))
-        ) ;while
-      )))
-
-(defun web-mode-enable (feature)
-  "Enable one feature."
-  (interactive
-   (list (completing-read
-          "Feature: "
-          (let (features)
-            (dolist (elt web-mode-features)
-              (setq features (append features (list (car elt)))))
-            features))))
-  (when (and (or (not feature) (< (length feature) 1)) web-mode-last-enabled-feature)
-    (setq feature web-mode-last-enabled-feature))
-  (when feature
-    (setq web-mode-last-enabled-feature feature)
-    (setq feature (cdr (assoc feature web-mode-features)))
-    (cond
-     ((eq feature 'web-mode-enable-current-column-highlight)
-      (web-mode-column-show))
-     ((eq feature 'web-mode-enable-current-element-highlight)
-      (when (not web-mode-enable-current-element-highlight)
-        (web-mode-toggle-current-element-highlight))
-      )
-     ((eq feature 'web-mode-enable-whitespace-fontification)
-      (web-mode-whitespaces-on))
-     (t
-      (set feature t)
-      (web-mode-buffer-highlight))
-     )
-    ) ;when
-  )
-
-(defun web-mode-disable (feature)
-  "Disable one feature."
-  (interactive
-   (list (completing-read
-          "Feature: "
-          (let (features)
-            (dolist (elt web-mode-features)
-              (setq features (append features (list (car elt)))))
-            features))))
-  (when (and (or (not feature) (< (length feature) 1)) web-mode-last-enabled-feature)
-    (setq feature web-mode-last-enabled-feature))
-  (when feature
-    (setq feature (cdr (assoc feature web-mode-features)))
-    (cond
-     ((eq feature 'web-mode-enable-current-column-highlight)
-      (web-mode-column-hide))
-     ((eq feature 'web-mode-enable-current-element-highlight)
-      (when web-mode-enable-current-element-highlight
-        (web-mode-toggle-current-element-highlight))
-      )
-     ((eq feature 'web-mode-enable-whitespace-fontification)
-      (web-mode-whitespaces-off))
-     (t
-      (set feature nil)
-      (web-mode-buffer-highlight))
-     )
-    ) ;when
-  )
-
-(defun web-mode-make-tag-overlays ()
-  (unless web-mode-start-tag-overlay
-    (setq web-mode-start-tag-overlay (make-overlay 1 1)
-          web-mode-end-tag-overlay (make-overlay 1 1))
-    (overlay-put web-mode-start-tag-overlay
-                 'font-lock-face
-                 'web-mode-current-element-highlight-face)
-    (overlay-put web-mode-end-tag-overlay
-                 'font-lock-face
-                 'web-mode-current-element-highlight-face)))
-
-(defun web-mode-delete-tag-overlays ()
-  (when web-mode-start-tag-overlay
-    (delete-overlay web-mode-start-tag-overlay)
-    (delete-overlay web-mode-end-tag-overlay)))
-
-(defun web-mode-column-overlay-factory (index)
-  (let (overlay)
-    (when (null web-mode-column-overlays)
-      (dotimes (i 100)
-        (setq overlay (make-overlay 1 1))
-        (overlay-put overlay 'font-lock-face 'web-mode-current-column-highlight-face)
-        (setq web-mode-column-overlays (append web-mode-column-overlays (list overlay)))
-        )
-      )
-    (setq overlay (nth index web-mode-column-overlays))
-    (when (null overlay)
-;;      (message "new overlay(%S)" index)
-      (setq overlay (make-overlay 1 1))
-      (overlay-put overlay 'font-lock-face 'web-mode-current-column-highlight-face)
-      (setq web-mode-column-overlays (append web-mode-column-overlays (list overlay)))
-      ) ;when
-    overlay))
-
-(defun web-mode-column-hide ()
-  (setq web-mode-enable-current-column-highlight nil)
-  (remove-overlays (point-min) (point-max)
-                   'font-lock-face
-                   'web-mode-current-column-highlight-face))
-
-(defun web-mode-column-show ()
-  (let ((index 0) overlay diff column line-to line-from)
-    (web-mode-column-hide)
-    (setq web-mode-enable-current-column-highlight t)
-    (save-excursion
-      (back-to-indentation)
-      (setq column (current-column)
-            line-to (web-mode-line-number))
-      (when (and (get-text-property (point) 'tag-beg)
-                 (member (get-text-property (point) 'tag-type) '(start end))
-                 (web-mode-tag-match)
-                 (setq line-from (web-mode-line-number))
-                 (not (= line-from line-to)))
-        (when (> line-from line-to)
-          (let (tmp)
-            (setq tmp line-from)
-            (setq line-from line-to)
-            (setq line-to tmp))
-          ) ;when
-        ;;(message "column(%S) line-from(%S) line-to(%S)" column line-from line-to)
-        (goto-char (point-min))
-        (when (> line-from 1)
-          (forward-line (1- line-from)))
-        (while (<= line-from line-to)
-          (setq overlay (web-mode-column-overlay-factory index))
-          (setq diff (- (line-end-position) (point)))
-          (cond
-           ((or (and (= column 0) (= diff 0))
-                (> column diff))
-            (end-of-line)
-            (move-overlay overlay (point) (point))
-            (overlay-put overlay
-                         'after-string
-                         (concat
-                          (if (> column diff) (make-string (- column diff) ?\s) "")
-                          (propertize " "
-                                      'font-lock-face
-                                      'web-mode-current-column-highlight-face)
-                          ) ;concat
-                         )
-            )
-           (t
-            (move-to-column column)
-            (overlay-put overlay 'after-string nil)
-            (move-overlay overlay (point) (1+ (point)))
-            )
-           ) ;cond
-          (setq line-from (1+ line-from))
-          (forward-line)
-          (setq index (1+ index))
-          ) ;while
-        ) ;when
-      ) ;save-excursion
-    ) ;let
-  )
-
-(defun web-mode-highlight-current-element ()
-  (let ((ctx (web-mode-element-boundaries)))
-    ;;    (message "%S" ctx)
-    (if (null ctx)
-        (web-mode-delete-tag-overlays)
-      (web-mode-make-tag-overlays)
-      (move-overlay web-mode-start-tag-overlay (caar ctx) (1+ (cdar ctx)))
-      (move-overlay web-mode-end-tag-overlay (cadr ctx) (1+ (cddr ctx))))
-    ))
-
-(defun web-mode-highlight-whitespaces (beg end)
-  (save-excursion
-    (goto-char beg)
-    (while (re-search-forward web-mode-whitespaces-regexp end t)
-      (add-text-properties (match-beginning 0) (match-end 0)
-                           '(face web-mode-whitespace-face))
-      ) ;while
-    ))
-
-(defun web-mode-whitespaces-show ()
-  "Toggle whitespaces."
-  (interactive)
-  (if web-mode-enable-whitespace-fontification
-      (web-mode-whitespaces-off)
-    (web-mode-whitespaces-on)))
-
-(defun web-mode-whitespaces-on ()
-  "Show whitespaces."
-  (interactive)
-  (when web-mode-display-table
-    (setq buffer-display-table web-mode-display-table))
-  (setq web-mode-enable-whitespace-fontification t))
-
-(defun web-mode-whitespaces-off ()
-  (setq buffer-display-table nil)
-  (setq web-mode-enable-whitespace-fontification nil))
-
-(defun web-mode-use-tabs ()
-  "Tweaks vars to be compatible with TAB indentation."
-  (let (offset)
-    (setq web-mode-block-padding 0)
-    (setq web-mode-script-padding 0)
-    (setq web-mode-style-padding 0)
-    (setq offset
-          (cond
-           ((and (boundp 'tab-width) tab-width) tab-width)
-           ((and (boundp 'standard-indent) standard-indent) standard-indent)
-           (t 4)))
-    ;;    (message "offset(%S)" offset)
-    (setq web-mode-attr-indent-offset offset)
-    (setq web-mode-code-indent-offset offset)
-    (setq web-mode-css-indent-offset offset)
-    (setq web-mode-markup-indent-offset offset)
-    (setq web-mode-sql-indent-offset offset)
-    (add-to-list 'web-mode-indentation-params '("lineup-args" . nil))
-    (add-to-list 'web-mode-indentation-params '("lineup-calls" . nil))
-    (add-to-list 'web-mode-indentation-params '("lineup-concats" . nil))
-    ))
-
-(defun web-mode-buffer-indent ()
-  "Indent all buffer."
-  (interactive)
-  (indent-region (point-min) (point-max))
-  (delete-trailing-whitespace))
-
-(defun web-mode-buffer-change-tag-case (&optional type)
-  "Change html tag case."
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (let ((continue t) f)
-      (setq f (if (member type '("upper" "uppercase" "upper-case")) 'uppercase 'downcase))
-      (when (and (not (get-text-property (point) 'tag-beg))
-                 (not (web-mode-tag-next)))
-        (setq continue nil))
-      (while continue
-        (skip-chars-forward "<!/")
-        (if (looking-at "\\([[:alnum:]-]+\\)")
-            (replace-match (funcall f (match-string 0)) t))
-;;        (message "tag: %S (%S)"
-;;                 (get-text-property (point) 'tag-name)
-;;                 (point))
-        (unless (web-mode-tag-next)
-          (setq continue nil))
-        ) ;while
-      )))
-
-(defun web-mode-buffer-change-attr-case (&optional type)
-  "Change case of html attribute names."
-  (interactive)
-  (unless type (setq type "downcase"))
-  (save-excursion
-    (goto-char (point-min))
-    (let ((continue t)
-          (fun (if (eq (aref (downcase type) 0) ?u) 'uppercase 'downcase)))
-      (while continue
-        (cond
-         ((not (web-mode-attribute-next))
-          (setq continue nil))
-         ((looking-at "\\([[:alnum:]-]+\\)")
-          (replace-match (funcall fun (match-string 0)) t)
-          )
-         ) ;cond
-        ) ;while
-      )))
-
-;; todo : passer de règle en règle et mettre un \n à la fin
-(defun web-mode-css-indent ()
-  (save-excursion
-    (goto-char (point-min))
-    (let ((continue t) rule part-end)
-      (while continue
-        (cond
-         ((not (web-mode-part-next))
-          (setq continue nil))
-         ((eq (get-text-property (point) 'part-side) 'css)
-          (setq part-end (web-mode-part-end-position))
-          (while (setq rule (web-mode-css-rule-next part-end))
-            (when (not (looking-at-p "[[:space:]]*\\($\\|<\\)"))
-              (newline)
-              (indent-according-to-mode)
-              (setq part-end (web-mode-part-end-position)))
-            )
-          )
-         ) ;cond
-        )
-      )))
-
-;; tag-case=lower|upper-case , attr-case=lower|upper-case
-;; special-chars=unicode|html-entities
-;; smart-apostrophes=bool , smart-quotes=bool , indentation=bool
-(defun web-mode-dom-normalize ()
-  "Normalize buffer"
-  (interactive)
-  (save-excursion
-    (let ((rules web-mode-normalization-rules) elt)
-      (when (setq elt (cdr (assoc "tag-case" rules)))
-        (web-mode-buffer-change-tag-case elt))
-      (when (setq elt (cdr (assoc "attr-case" rules)))
-        (web-mode-buffer-change-attr-case elt))
-      (when (setq elt (cdr (assoc "css-indentation" rules)))
-        (web-mode-css-indent))
-      (when (setq elt (cdr (assoc "smart-apostrophes" rules)))
-        (web-mode-dom-apostrophes-replace))
-      (when (setq elt (cdr (assoc "smart-quotes" rules)))
-        (web-mode-dom-quotes-replace))
-      (when (setq elt (cdr (assoc "special-chars" rules)))
-        (if (string= elt "entities")
-            (web-mode-dom-entities-encode)
-          (web-mode-dom-entities-replace)))
-      (when (setq elt (cdr (assoc "whitespaces" rules)))
-        (goto-char (point-min))
-        (while (not (eobp))
-          (forward-line)
-          (delete-blank-lines))
-        (delete-trailing-whitespace)
-        (untabify (point-min) (point-max)))
-      (when (setq elt (cdr (assoc "indentation" rules)))
-        (web-mode-buffer-indent))
-      )))
-
-;;---- INDENTATION -------------------------------------------------------------
-
-(defun web-mode-point-context (pos)
-  "POS should be at the beginning of the indentation."
-  (save-excursion
-    (let (curr-char curr-indentation curr-line
-          language
-          reg-beg reg-col
-          prev-char prev-indentation prev-line
-          token)
-
-      (setq reg-beg (point-min)
-            reg-col 0
-            token "live"
-            language ""
-            prev-line ""
-            prev-char 0)
-      (cond
-
-       ((bobp)
-        (setq language "html")
-        )
-
-       ((string= web-mode-content-type "css")
-        (setq language "css"
-              curr-indentation web-mode-css-indent-offset))
-
-       ((member web-mode-content-type '("javascript" "json"))
-        (setq language "javascript"
-              curr-indentation web-mode-code-indent-offset))
-
-       ((member web-mode-content-type '("jsx"))
-        (setq language "jsx"
-              curr-indentation web-mode-code-indent-offset)
-        (when (and (> pos (point-min))
-                   (get-text-property pos 'part-expr)
-                   (get-text-property (1- pos) 'part-expr))
-          (setq language "javascript")
-          (setq reg-beg (1+ (previous-single-property-change pos 'part-expr)))
-          (goto-char reg-beg)
-          (setq reg-col (current-column))
-          )
-        )
-
-       ((string= web-mode-content-type "php")
-        (setq language "php"
-              curr-indentation web-mode-code-indent-offset))
-
-       ((or (string= web-mode-content-type "xml"))
-        (setq language "xml"
-              curr-indentation web-mode-markup-indent-offset))
-
-       ((and (get-text-property pos 'tag-beg)
-             (get-text-property pos 'tag-name)
-             (not (get-text-property pos 'part-side)))
-        (setq language "html"
-              curr-indentation web-mode-markup-indent-offset)
-        )
-
-       ((and (get-text-property pos 'block-side)
-             (not (get-text-property pos 'block-beg)))
-
-        (setq reg-beg (or (web-mode-block-beginning-position pos) (point-min)))
-        ;;(message "reg-beg=%S" reg-beg)
-        (goto-char reg-beg)
-        (setq reg-col (current-column))
-        (setq language web-mode-engine)
-        (setq curr-indentation web-mode-code-indent-offset)
-
-        (cond
-         ((string= web-mode-engine "blade")
-          (save-excursion
-            (when (web-mode-rsf "{{[ ]*")
-              (setq reg-col (current-column))))
-          (setq reg-beg (+ reg-beg 2))
-          ;;(message "beg=%S" reg-beg)
-          ;;reg-col (+ reg-col 2)
-          )
-         ((string= web-mode-engine "razor")
-          (setq reg-beg (+ reg-beg 2))
-          )
-         ;; tests/demo.chtml
-         ((string= web-mode-engine "ctemplate")
-          (save-excursion
-            (when (web-mode-rsf "{{#?")
-              (setq reg-col (current-column))))
-          )
-         ((string= web-mode-engine "dust")
-          (save-excursion
-            (when (web-mode-rsf "{@")
-              (setq reg-col (current-column))))
-          )
-         ((string= web-mode-engine "template-toolkit")
-          (setq reg-beg (+ reg-beg 3)
-                reg-col (+ reg-col 3))
-          )
-         ((and (string= web-mode-engine "jsp")
-               (web-mode-looking-at "<%@\\|<[[:alpha:]]" reg-beg))
-          (save-excursion
-            (goto-char reg-beg)
-            (looking-at "<%@[ ]*[[:alpha:]]+[ ]+\\|</?[[:alpha:]]+:[[:alpha:]]+[ ]+")
-            (goto-char (match-end 0))
-            (setq reg-col (current-column))
-            )
-          )
-         ((and (string= web-mode-engine "freemarker")
-               (web-mode-looking-at "<@\\|<%@\\|<[[:alpha:]]" reg-beg))
-          (save-excursion
-            (goto-char reg-beg)
-            (looking-at "<@[[:alpha:].]+[ ]+\\|<%@[ ]*[[:alpha:]]+[ ]+\\|<[[:alpha:]]+:[[:alpha:]]+[ ]+")
-            (goto-char (match-end 0))
-            (setq reg-col (current-column))
-            )
-          )
-         ) ;cond
-        ) ;block-side
-
-       ((get-text-property pos 'part-side)
-;;        (message "pos-min=%S reg-beg=%S part-beg=%S" pos-min reg-beg (web-mode-part-beginning-position pos))
-        (setq reg-beg (web-mode-part-beginning-position pos))
-;;        (message "reg-beg %S" reg-beg)
-        (setq reg-beg (or reg-beg (point-min)))
-        (goto-char reg-beg)
-        (search-backward "<" nil t)
-        (setq reg-col (current-column))
-        (setq language (symbol-name (get-text-property pos 'part-side)))
-        (cond
-         ((string= language "css")
-          (setq curr-indentation web-mode-css-indent-offset)
-          )
-         ((string= language "jsx")
-          (setq curr-indentation web-mode-code-indent-offset)
-          )
-         (t
-          (setq language "javascript"
-                curr-indentation web-mode-code-indent-offset)
-          )
-         )
-        ) ;part-side
-
-       (t
-        (setq language "html"
-              curr-indentation web-mode-markup-indent-offset)
-        )
-
-       ) ;cond
-
-      (cond
-       ((or (and (> pos (point-min))
-                 (eq (get-text-property pos 'part-token) 'comment)
-                 (eq (get-text-property (1- pos) 'part-token) 'comment)
-                 (progn
-                   (setq reg-beg (previous-single-property-change pos 'part-token))
-                   t))
-            (and (> pos (point-min))
-                 (eq (get-text-property pos 'block-token) 'comment)
-                 (eq (get-text-property (1- pos) 'block-token) 'comment)
-                 (progn
-                   (setq reg-beg (previous-single-property-change pos 'block-token))
-                   t))
-            (and (> pos (point-min))
-                 (eq (get-text-property pos 'tag-type) 'comment)
-                 (not (get-text-property pos 'tag-beg))
-                 (progn
-                   (setq reg-beg (web-mode-tag-beginning-position pos))
-                   t))
-            )
-        (setq token "comment"))
-       ((or (and (> pos (point-min))
-                 (member (get-text-property pos 'part-token)
-                         '(string context key))
-                 (member (get-text-property (1- pos) 'part-token)
-                         '(string context key)))
-            (and (eq (get-text-property pos 'block-token) 'string)
-                 (eq (get-text-property (1- pos) 'block-token) 'string)))
-        (setq token "string"))
-       )
-
-      (goto-char pos)
-      (setq curr-line (web-mode-trim
-                       (buffer-substring-no-properties
-                        (line-beginning-position)
-                        (line-end-position))))
-      (setq curr-char (if (string= curr-line "") 0 (aref curr-line 0)))
-
-      (when (or (member language '("php" "blade" "javascript" "jsx" "razor"))
-                (and (member language '("html" "xml"))
-                     (not (eq ?\< curr-char))))
-        (let (prev)
-          (cond
-           ((member language '("html" "xml" "javascript" "jsx"))
-            (when (setq prev (web-mode-part-previous-live-line))
-              (setq prev-line (car prev)
-                    prev-indentation (cdr prev))
-              (setq prev-line (web-mode-clean-part-line prev-line)))
-            )
-           ((setq prev (web-mode-block-previous-live-line))
-            (setq prev-line (car prev)
-                  prev-indentation (cdr prev))
-            (setq prev-line (web-mode-clean-block-line prev-line)))
-           ) ;cond
-
-          ) ;let
-        (when (>= (length prev-line) 1)
-          (setq prev-char (aref prev-line (1- (length prev-line))))
-          (setq prev-line (substring-no-properties prev-line))
-          )
-        )
-
-      (cond
-       ((not (member web-mode-content-type '("html" "xml")))
-        )
-       ((member language '("javascript" "jsx"))
-        (setq reg-col (+ reg-col web-mode-script-padding)))
-       ((string= language "css")
-        (setq reg-col (+ reg-col web-mode-style-padding)))
-       ((not (member language '("html" "xml" "razor")))
-        (setq reg-col (+ reg-col web-mode-block-padding)))
-       )
-
-      (list :curr-char curr-char
-            :curr-indentation curr-indentation
-            :curr-line curr-line
-            :language language
-            :prev-char prev-char
-            :prev-indentation prev-indentation
-            :prev-line prev-line
-            :reg-beg reg-beg
-            :reg-col reg-col
-            :token token)
-      )))
-
-(defun web-mode-indent-line ()
-
-  (web-mode-propertize)
-
-  (let ((offset nil)
-        (char nil)
-        (inhibit-modification-hooks t))
-
-    (save-excursion
-      (back-to-indentation)
-      (setq char (char-after))
-      (let* ((pos (point))
-             (ctx (web-mode-point-context pos))
-             (curr-char (plist-get ctx :curr-char))
-             (curr-indentation (plist-get ctx :curr-indentation))
-             (curr-line (plist-get ctx :curr-line))
-             (language (plist-get ctx :language))
-             (prev-char (plist-get ctx :prev-char))
-             (prev-indentation (plist-get ctx :prev-indentation))
-             (prev-line (plist-get ctx :prev-line))
-             (reg-beg (plist-get ctx :reg-beg))
-             (reg-col (plist-get ctx :reg-col))
-             (token (plist-get ctx :token))
-             (chars (list curr-char prev-char)))
-
-        ;;(message "%S" ctx)
-        ;;(message "%c %S %c" curr-char prev-line prev-char)
-
-        (cond
-
-         ((or (bobp) (= (line-number-at-pos pos) 1))
-          (setq offset 0))
-
-         ((string= token "string")
-          (cond
-           ((web-mode-block-token-starts-with (concat "[ \n]*" web-mode-sql-queries))
-            (save-excursion
-              (let (col)
-                (web-mode-block-string-beginning)
-                (skip-chars-forward "[ \"'\n]")
-                (setq col (current-column))
-                (goto-char pos)
-                (if (looking-at-p "\\(SELECT\\|INSERT\\|DELETE\\|UPDATE\\|FROM\\|LEFT\\|JOIN\\|WHERE\\|GROUP BY\\|LIMIT\\|HAVING\\|\)\\)")
-                    (setq offset col)
-                  (setq offset (+ col web-mode-sql-indent-offset)))
-                )
-              ) ;save-excursion
-            )
-           (t
-            (setq offset nil))
-           ) ;cond
-          ) ;case string
-
-         ((string= token "comment")
-          (if (eq (get-text-property pos 'tag-type) 'comment)
-              (web-mode-tag-beginning)
-            (goto-char (car
-                        (web-mode-property-boundaries
-                         (if (eq (get-text-property pos 'part-token) 'comment)
-                             'part-token
-                           'block-token)
-                         pos))))
-          (setq offset (current-column))
-          (cond
-           ((member (buffer-substring-no-properties (point) (+ (point) 2)) '("/*" "{*" "@*"))
-            (cond
-             ((eq ?\* curr-char)
-              (setq offset (+ offset 1)))
-             (t
-              (setq offset (+ offset 3)))
-             ) ;cond
-            )
-           ((and (string= web-mode-engine "django") (looking-back "{% comment %}"))
-            (setq offset (- offset 12)))
-           ((and (string= web-mode-engine "mako") (looking-back "<%doc%>"))
-            (setq offset (- offset 6)))
-           ((and (string= web-mode-engine "mason") (looking-back "<%doc%>"))
-            (setq offset (- offset 6)))
-           ) ;cond
-          ) ;case comment
-
-         ((and (string= web-mode-engine "mason")
-               (string-match-p "^%" curr-line))
-          (setq offset 0))
-
-         ((and (get-text-property pos 'block-beg)
-               (or (web-mode-block-is-close pos)
-                   (web-mode-block-is-inside pos)))
-          (when (web-mode-block-match)
-            (setq offset (current-indentation))))
-
-         ((eq (get-text-property pos 'block-token) 'delimiter-end)
-          (when (web-mode-block-beginning)
-            (setq reg-col (current-indentation)) ;; TODO: bad hack
-            (setq offset (current-column))))
-
-         ((and (get-text-property pos 'tag-beg)
-               (eq (get-text-property pos 'tag-type) 'end))
-          (when (web-mode-tag-match)
-            (setq offset (current-indentation))))
-
-         ((and (member language '("html" "xml" "jsx"))
-               (get-text-property pos 'tag-type)
-               (not (get-text-property pos 'tag-beg)))
-          (cond
-           ((and (get-text-property pos 'tag-attr)
-                 (get-text-property (1- pos) 'tag-attr)
-                 (web-mode-attribute-beginning)
-                 (web-mode-dom-rsf "=[ ]*[\"']?" pos))
-            (setq offset (current-column))
-            )
-           ((not (web-mode-tag-beginning))
-            )
-           (web-mode-attr-indent-offset
-            (setq offset (+ (current-column) web-mode-attr-indent-offset)))
-           ((string-match-p "^/>" curr-line)
-            (setq offset (current-column)))
-           (t
-            (let ((skip (next-single-property-change (point) 'tag-attr)))
-              (when skip
-                (goto-char skip)
-                (setq offset (current-column)))
-              ) ;let
-            ) ;t
-           ))
-
-         ((member language '("html" "xml"))
-          (cond
-           ((and (get-text-property pos 'tag-beg)
-                 ;;(not (get-text-property pos 'part-side))
-                 ;; Est ce que cette derniere ligne est utile ?
-                 ;;(not (member web-mode-content-type '("jsx")))
-                 )
-            (setq offset (web-mode-markup-indentation pos))
-            )
-           ((and web-mode-pre-elements
-                 (null (get-text-property pos 'block-side))
-                 (null (get-text-property pos 'part-side))
-                 (and (null (get-text-property pos 'tag-beg))
-                      (save-excursion
-                        (and (web-mode-element-parent)
-                             (member (get-text-property (point) 'tag-name) web-mode-pre-elements))))
-                 )
-            (setq offset nil))
-           ((or (eq (length curr-line) 0)
-                (= web-mode-indent-style 2)
-                (get-text-property pos 'tag-beg)
-                (get-text-property pos 'reg-beg))
-            (setq offset (web-mode-markup-indentation pos))
-            )
-           )
-          )
-
-         ((string= language "ctemplate")
-          (setq offset reg-col))
-
-         ((string= language "erb")
-          (setq offset (web-mode-ruby-indentation pos
-                                                  curr-line
-                                                  reg-col
-                                                  curr-indentation
-                                                  reg-beg)))
-
-         ((member language '("mako" "web2py"))
-          (setq offset (web-mode-python-indentation pos
-                                                    curr-line
-                                                    reg-col
-                                                    curr-indentation
-                                                    reg-beg)))
-
-         ((string= language "asp")
-          (setq offset (web-mode-asp-indentation pos
-                                                 curr-line
-                                                 reg-col
-                                                 curr-indentation
-                                                 reg-beg)))
-
-         ((member language '("lsp" "cl-emb"))
-          (setq offset (web-mode-lisp-indentation pos ctx)))
-
-         ((member curr-char '(?\} ?\) ?\]))
-          (let ((ori (web-mode-opening-paren-position pos)))
-            (cond
-             ((null ori)
-              (message "indent-line ** invalid closing bracket (%S) **" pos)
-              (setq offset reg-col))
-             ((and (looking-back ")[ ]*") ;; peut-on se passer du looking-back ?
-                   (re-search-backward ")[ ]*" nil t)
-                   (web-mode-block-opening-paren reg-beg))
-              (back-to-indentation)
-              (setq offset (current-indentation))
-              )
-             (t
-              (goto-char ori)
-              (back-to-indentation)
-              (setq offset (current-indentation))
-              ) ;t
-             ) ;cond
-            ) ;let
-          )
-
-         ((string= language "css")
-          (setq offset (car (web-mode-css-indentation pos
-                                                      reg-col
-                                                      curr-indentation
-                                                      language
-                                                      reg-beg))))
-
-         ((and (string= language "razor")
-               (string-match-p "^\\." curr-line)
-               (string-match-p "^\\." prev-line))
-          (setq offset prev-indentation))
-
-         ((and (string= language "razor")
-               (string-match-p "^case " curr-line)
-               (string-match-p "^case " prev-line))
-          (search-backward "case ")
-          (setq offset (current-column)))
-
-         ;;((and (member language '("javascript" "jsx" "ejs"))
-         ;;      (string-match-p "^@[[:alpha:]]+" prev-line))
-         ;; (setq offset prev-indentation)
-         ;; )
-
-         ((and (member language '("javascript" "jsx" "ejs" "php"))
-               (or (eq prev-char ?\))
-                   (string-match-p "^else$" prev-line))
-               (not (string-match-p "^\\([{.]\\|->\\)" curr-line)))
-          (cond
-           ((member language '("javascript" "jsx" "ejs"))
-            (setq offset
-                  (+ (car (web-mode-javascript-indentation pos
-                                                           reg-col
-                                                           curr-indentation
-                                                           language
-                                                           reg-beg))
-                     web-mode-code-indent-offset))
-            )
-           (t
-            (setq offset (+ prev-indentation web-mode-code-indent-offset))
-            )
-           )
-          )
-
-         ((and (member language '("javascript" "jsx" "ejs")) (member ?\. chars))
-          (when (web-mode-javascript-calls-beginning pos reg-beg)
-            (cond
-             ((cdr (assoc "lineup-calls" web-mode-indentation-params))
-              (search-forward ".")
-              (setq offset (current-column))
-              (when (eq curr-char ?\.)
-                (goto-char pos)
-                (looking-at "\\.[ \t\n]*")
-                (setq offset (- offset (length (match-string-no-properties 0)))))
-              )
-             (t
-              (setq offset (+ (current-indentation) web-mode-code-indent-offset))
-              ) ;t
-             ) ;cond
-            ) ;when
-          )
-
-         ((and (member language '("javascript" "jsx" "ejs")) (member ?\+ chars))
-          (cond
-           ((not (web-mode-javascript-string-beginning pos reg-beg))
-            )
-           ((null (cdr (assoc "lineup-concats" web-mode-indentation-params)))
-            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
-           ((not (eq curr-char ?\+))
-            (setq offset (current-column)))
-           (t
-            (setq offset (current-column))
-            (goto-char pos)
-            (looking-at "\\+[ \t\n]*")
-            (setq offset (- offset (length (match-string-no-properties 0))))
-            )
-           )
-          )
-
-         ;; #446
-         ((and (member language '("javascript" "jsx" "ejs" "php"))
-               (or (string-match-p "[+-&|?:]$" prev-line)
-                   (string-match-p "^[+-&|?:]" curr-line))
-               (not (get-text-property pos 'part-element))
-               (not (and (eq prev-char ?\:)
-                         (string-match-p "^\\(case\\|default\\)" prev-line))))
-          (when (funcall (if (member language '("javascript" "jsx" "ejs"))
-                             'web-mode-javascript-statement-beginning
-                           'web-mode-block-statement-beginning)
-                         pos reg-beg)
-            (setq offset (current-column))
-            (when (member curr-char '(?\+ ?\- ?\& ?\| ?\? ?\:))
-              (goto-char pos)
-              (looking-at "\\(||\\|&&\\|[+-&|?:]\\)[ \t\n]*")
-              (setq offset (- offset (length (match-string-no-properties 0)))))
-            ) ;when
-          )
-
-         ((and (member language '("javascript" "jsx" "ejs"))
-               (or (member ?\, chars)
-                   (member prev-char '(?\( ?\[ ?\{))))
-          (cond
-           ((not (web-mode-javascript-args-beginning pos reg-beg))
-            (message "no js args beg")
-            )
-           ((or (not (cdr (assoc "lineup-args" web-mode-indentation-params)))
-                (looking-at-p "\n"))
-            ;;(message "pos1=%S" pos)
-            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
-           ((not (eq curr-char ?\,))
-            ;;(message "pos2=%S" pos)
-            (setq offset (current-column)))
-           (t
-            ;;(message "pos3=%S" pos)
-            (setq offset (current-column))
-            (goto-char pos)
-            (looking-at ",[ \t\n]*")
-            (setq offset (- offset (length (match-string-no-properties 0)))))
-           ))
-
-
-         ((and (string= language "php") (string-match-p "^->" curr-line))
-          (cond
-           ((not (web-mode-block-calls-beginning pos reg-beg))
-            )
-           ((cdr (assoc "lineup-calls" web-mode-indentation-params))
-            (search-forward "->")
-            (setq offset (- (current-column) 2)))
-           (t
-            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
-           ))
-
-         ((member ?\, chars)
-          (cond
-           ((not (web-mode-block-args-beginning pos reg-beg))
-            )
-           ((cdr (assoc "lineup-args" web-mode-indentation-params))
-            (setq offset (current-column))
-            (when (eq curr-char ?\,)
-              (goto-char pos)
-              (looking-at ",[ \t\n]*")
-              (setq offset (- offset (length (match-string-no-properties 0)))))
-            )
-           (t
-            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
-           ))
-
-         ((and (string= language "php") (member ?\. chars))
-          (cond
-           ((not (web-mode-block-string-beginning pos reg-beg))
-            )
-           ((null (cdr (assoc "lineup-concats" web-mode-indentation-params)))
-            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
-           ((not (eq curr-char ?\.))
-            (setq offset (current-column)))
-           (t
-            (setq offset (current-column))
-            (goto-char pos)
-            (looking-at "\\.[ \t\n]*")
-            (setq offset (- offset (length (match-string-no-properties 0)))))
-           ))
-
-         ((and (string= language "jsx")
-               (get-text-property pos 'part-element)
-               (get-text-property (1- pos) 'part-element)
-               (not (and (get-text-property pos 'part-expr)
-                         (get-text-property (1- pos) 'part-expr))))
-          (setq offset (web-mode-markup-indentation pos)))
-
-         ((member language '("javascript" "jsx" "ejs"))
-          (setq offset (car (web-mode-javascript-indentation pos
-                                                             reg-col
-                                                             curr-indentation
-                                                             language
-                                                             reg-beg))))
-
-         (t
-          ;;(message "point-context=%S" ctx)
-          (setq offset (car (web-mode-bracket-indentation pos
-                                                          reg-col
-                                                          curr-indentation
-                                                          language
-                                                          reg-beg))))
-
-         ) ;cond
-
-        ;;(message "offset=%S" offset)
-        (when (and offset reg-col (< offset reg-col)) (setq offset reg-col))
-        ;;(message "offset=%S" offset)
-
-        ) ;let
-      ) ;save-excursion
-
-    (when offset
-      (let ((diff (- (current-column) (current-indentation))))
-        (when (not (= offset (current-indentation)))
-          (setq web-mode-change-beg (line-beginning-position)
-                web-mode-change-end (+ web-mode-change-beg offset)))
-        (setq offset (max 0 offset))
-        (indent-line-to offset)
-        (if (> diff 0) (move-to-column (+ (current-column) diff)))
-        (when (and (string= web-mode-engine "mason")
-                   (= offset 0)
-                   (eq char ?\%))
-          ;;(web-mode-highlight-region (line-beginning-position) (line-end-position))
-          (save-excursion
-            (font-lock-fontify-region (line-beginning-position) (line-end-position)))
-          ) ;when
-        ) ;let
-      ) ;when
-
-    ))
-
-(defun web-mode-markup-indentation (pos)
-  (save-excursion
-    (goto-char pos)
-    (let ((offset 0) beg ret)
-      (when (setq beg (web-mode-markup-indentation-origin))
-        (goto-char beg)
-        (setq ret (web-mode-element-is-opened beg pos))
-        (cond
-         ((null ret)
-          ;;(message "ind=%S col=%S" (current-indentation) (current-column))
-          (setq offset (current-indentation)))
-         ((eq ret t)
-          (setq offset (+ (current-indentation) web-mode-markup-indent-offset)))
-         (t
-          (setq offset ret))
-         ) ;cond
-        ) ;when
-      offset)))
-
-(defun web-mode-css-indentation (pos initial-column language-offset language &optional limit)
-  (let ((open-ctx (web-mode-bracket-up pos language limit)) offset)
-    (cond
-     ((or (null open-ctx) (null (plist-get open-ctx :pos)))
-      (setq offset initial-column))
-     (t
-      (setq offset (+ (plist-get open-ctx :indentation) language-offset)))
-     ) ;cond
-    (cons (if (< offset initial-column) initial-column offset) open-ctx)
-    ))
-
-(defun web-mode-javascript-indentation (pos initial-column language-offset language &optional limit)
-  (let ((open-ctx (web-mode-bracket-up pos language limit)) offset)
-    ;;    (message "pos(%S) initial-column(%S) language-offset(%S) language(%S) limit(%S)" pos initial-column language-offset language limit)
-    ;;(message "javascript-indentation: %S" open-ctx)
-    (cond
-     ((or (null open-ctx) (null (plist-get open-ctx :pos)))
-      (setq offset initial-column))
-     ((and (member language '("javascript" "jsx" "ejs"))
-           (eq (plist-get open-ctx :char) ?\{)
-           (web-mode-looking-back "switch[ ]*(.*)[ ]*" (plist-get open-ctx :pos))
-           (not (looking-at-p "case\\|default")))
-      (setq offset (+ (plist-get open-ctx :indentation) (* language-offset 2))))
-     (t
-      (setq offset (+ (plist-get open-ctx :indentation) language-offset)))
-     ) ;cond
-    (cons (if (< offset initial-column) initial-column offset) open-ctx)
-    ))
-
-(defun web-mode-bracket-indentation (pos initial-column language-offset language &optional limit)
-  (save-excursion
-    (let* ((ctx (web-mode-bracket-up pos language limit))
-           (char (plist-get ctx :char))
-           (pos (plist-get ctx :pos))
-           (indentation (plist-get ctx :indentation)))
-      ;;(message "pos(%S) initial-column(%S) language-offset(%S) language(%S) limit(%S)" pos initial-column language-offset language limit)
-      ;;(message "bracket-up: %S, %c" ctx char)
-      (cond
-       ((null pos)
-        (setq indentation initial-column))
-       ((and (member language '("php"))
-             (eq char ?\{)
-             (web-mode-looking-back "switch[ ]*(.*)[ ]*" pos)
-             (not (looking-at-p "case\\|default")))
-        (setq indentation (+ indentation (* language-offset 2)))
-        )
-       ((and (member language '("php"))
-             (eq char ?\{)
-             (goto-char pos)
-             (web-mode-looking-back "[)][ ]*" pos)
-             (search-backward ")")
-             (web-mode-block-opening-paren limit))
-        (setq indentation (+ (current-indentation) language-offset))
-        )
-       (t
-        (setq indentation (+ indentation language-offset))
-        )
-       )
-      (cons (if (< indentation initial-column) initial-column indentation) ctx)
-      )))
-
-(defun web-mode-ruby-indentation (pos line initial-column language-offset limit)
-  (unless limit (setq limit nil))
-  (let (h offset prev-line prev-indentation open-ctx)
-    (setq open-ctx (web-mode-bracket-up pos "ruby" limit))
-    (if (plist-get open-ctx :pos)
-        (setq offset (1+ (plist-get open-ctx :column)))
-      (setq h (web-mode-previous-line pos limit))
-      (setq offset initial-column)
-      (when h
-        (setq prev-line (car h))
-        (setq prev-indentation (cdr h))
-        (cond
-         ((string-match-p "^\\(end\\|else\\|elsif\\|when\\)" line)
-          (setq offset (- prev-indentation language-offset))
-          )
-         ((string-match-p "\\(when\\|if\\|else\\|elsif\\|unless\\|for\\|while\\|def\\|class\\)" prev-line)
-          (setq offset (+ prev-indentation language-offset))
-          )
-         (t
-          (setq offset prev-indentation)
-          )
-         )
-        ) ;when
-      ) ;if
-    offset))
-
-(defun web-mode-python-indentation (pos line initial-column language-offset limit)
-  (unless limit (setq limit nil))
-  (let (h out prev-line prev-indentation ctx)
-    (setq h (web-mode-previous-line pos limit))
-    (setq out initial-column)
-    (when h
-      (setq prev-line (car h))
-      (setq prev-indentation (cdr h))
-      (cond
-       ((string-match-p "^\\(pass\\|else\\|elif\\|when\\)" line)
-        (setq out (- prev-indentation language-offset))
-        )
-       ((string-match-p "\\(if\\|else\\|elif\\|for\\|while\\)" prev-line)
-        (setq out (+ prev-indentation language-offset))
-        )
-       (t
-        (setq out prev-indentation)
-        )
-       ) ;cond
-      ) ;when
-    ;;out
-    (if (< out initial-column) initial-column out)
-    ))
-
-(defun web-mode-lisp-indentation (pos point-ctx)
-  (let (offset open-ctx)
-    (setq open-ctx (web-mode-bracket-up pos "lsp" (plist-get point-ctx :reg-beg)))
-    ;;(message "point-ctx=%S" point-ctx)
-    ;;(message "open-ctx=%S" open-ctx)
-    (cond
-     ((null (plist-get open-ctx :pos))
-      (setq offset (plist-get point-ctx :reg-col)))
-     ((member (plist-get point-ctx :curr-char) '(?\( ?\)))
-      (if (web-mode-looking-at-p "((" (plist-get open-ctx :pos))
-          (setq offset (+ (plist-get open-ctx :column) 1))
-        (setq offset (+ (plist-get open-ctx :column) web-mode-code-indent-offset)))
-      )
-     (t
-      (goto-char (plist-get open-ctx :pos))
-      (forward-char)
-      (web-mode-rsf "[[:alnum:]-:]+ ")
-      (setq offset (current-column))
-      )
-     ) ;cond
-    offset))
-
-(defun web-mode-asp-indentation (pos line initial-column language-offset limit)
-  (unless limit (setq limit nil))
-  (let (h out prev-line prev-indentation)
-    (setq h (web-mode-previous-line pos limit))
-    (setq out initial-column)
-    (when h
-      (setq prev-line (car h))
-      (setq prev-indentation (cdr h))
-      (cond
-       ;; ----------------------------------------------------------------------
-       ;; unindent
-       ((string-match-p "\\<\\(\\(end \\(if\\|function\\|class\\|sub\\|with\\)\\)\\|else\\|elseif\\|next\\|loop\\)\\>" line)
-        (setq out (- prev-indentation language-offset)))
-       ;; ----------------------------------------------------------------------
-       ;; select case statement
-       ((string-match-p "\\<\\(select case\\)\\>" line)
-        (setq out (- prev-indentation 0)))
-       ((string-match-p "\\<\\(end select\\)" line)
-        (setq out (- prev-indentation (* 2 language-offset))))
-       ((and (string-match-p "\\<\\(case\\)\\>" line) (not (string-match-p "\\<\\(select case\\)\\>" prev-line)))
-        (setq out (- prev-indentation language-offset)))
-       ;; ----------------------------------------------------------------------
-       ;; do nothing
-       ((string-match-p "\\<\\(\\(end \\(if\\|function\\|class\\|sub\\|select\\|with\\)\\)\\|loop\\( until\\| while\\)?\\)\\>" prev-line)
-        (setq out (+ prev-indentation 0)))
-       ;; indent
-       ((string-match-p "\\<\\(\\(select \\)?case\\|else\\|elseif\\|unless\\|for\\|class\\|with\\|do\\( until\\| while\\)?\\|while\\|\\(public \\|private \\)?\\(function\\|sub\\|class\\)\\)\\>" prev-line)
-        (setq out (+ prev-indentation language-offset)))
-       ;; single line if statement
-       ((string-match-p "\\<if\\>.*\\<then\\>[ \t]*[[:alpha:]]+" prev-line)
-        (setq out (+ prev-indentation 0)))
-       ;; normal if statement
-       ((string-match-p "\\<\\if\\>" prev-line)
-        (setq out (+ prev-indentation language-offset)))
-       (t
-        (setq out prev-indentation))
-       )
-      ) ;when
-    out))
-
-(defun web-mode-block-previous-live-line ()
-  (save-excursion
-    (let ((continue t) (line "") (pos (point)))
-      (beginning-of-line)
-      (while (and continue (not (bobp)) (forward-line -1))
-        (when (not (web-mode-block-is-token-line))
-          (setq line (web-mode-trim (buffer-substring (point) (line-end-position)))))
-        (when (not (string= line ""))
-          (setq continue nil))
-        ) ;while
-      (if (string= line "")
-          (progn (goto-char pos) nil)
-        (cons line (current-indentation)))
-      )))
-
-(defun web-mode-part-previous-live-line ()
-  (save-excursion
-    (let ((continue t) (line "") (pos (point)))
-      (beginning-of-line)
-      (while (and continue (not (bobp)) (forward-line -1))
-        (if (not (web-mode-part-is-token-line))
-            (setq line (web-mode-trim (buffer-substring (point) (line-end-position)))))
-        (when (not (string= line "")) (setq continue nil))
-        )
-      (if (string= line "")
-          (progn (goto-char pos) nil)
-        (cons line (current-indentation)))
-      )))
-
-(defun web-mode-in-code-block (open close &optional prop)
-  "Detect if point is in a block delimited by open and close."
-  (save-excursion
-    (let ((pos (point)) pos-open pos-close start end ret)
-      (when prop
-        (setq start pos
-              end pos)
-        (when (eq (get-text-property pos prop) (get-text-property (1- pos) prop))
-          (setq start (or (previous-single-property-change pos prop) (point-min))))
-        (when (eq (get-text-property pos prop) (get-text-property (1+ pos) prop))
-          (setq end (next-single-property-change pos prop)))
-        ;;        (message "start(%S) end(%S)" start end)
-        )
-      (setq ret (and (web-mode-sb open start t)
-                     (setq pos-open (point))
-                     (web-mode-sf close end t)
-                     (setq pos-close (point))
-                     (>= pos-close pos)))
-      (if ret
-          (cons pos-open pos-close)
-        ret)
-      )))
-
-(defun web-mode-clean-part-line (input)
-  "Remove comments and server scripts."
-  (let ((out "")
-        (beg 0)
-        (keep t)
-        (n (length input)))
-    (dotimes (i n)
-      (if (or (get-text-property i 'block-side input)
-              (eq (get-text-property i 'part-token input) 'comment)
-              (eq (get-text-property i 'tag-type input) 'comment))
-          (when keep
-            (setq out (concat out (substring input beg i))
-                  beg 0
-                  keep nil))
-        (when (null keep)
-          (setq beg i
-                keep t))
-        ) ;if
-      ) ;dotimes
-    (if (> beg 0) (setq out (concat out (substring input beg n))))
-    (setq out (if (= (length out) 0) input out))
-    (web-mode-trim out)
-    ;;    (message "%S [%s] > [%s]" beg input out)
-    ))
-
-(defun web-mode-clean-block-line (input)
-  (let ((out "")
-        (beg 0)
-        (keep t)
-        (n (length input)))
-    (dotimes (i n)
-      (if (or (not (get-text-property i 'block-side input))
-              (member (get-text-property i 'block-token input)
-                      '(comment delimiter-beg delimiter-end)))
-          (when keep
-            (setq out (concat out (substring input beg i))
-                  beg 0
-                  keep nil))
-        (when (null keep)
-          (setq beg i
-                keep t))
-        ) ;if
-      ) ;dotimes
-    (if (> beg 0) (setq out (concat out (substring input beg n))))
-    (setq out (if (= (length out) 0) input out))
-    (web-mode-trim out)
-    ;;    (message "%S [%s] > [%s]" beg input out)
-    ))
-
-(defun web-mode-language-at-pos (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((get-text-property pos 'block-side)
-    web-mode-engine)
-   ((get-text-property pos 'part-side)
-    (symbol-name (get-text-property pos 'part-side)))
-   (t
-    web-mode-content-type)
-   ) ;cond
-  )
-
-(defun web-mode-coord-position (line column)
-  (save-excursion
-    (when (stringp line) (setq line (string-to-number line)))
-    (when (stringp column) (setq column (string-to-number column)))
-    (goto-char (point-min))
-    (forward-line (1- line))
-    (move-to-column (1- column))
-    (point)))
-
-(defun web-mode-column-at-pos (&optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (goto-char pos)
-    (current-column)))
-
-(defun web-mode-is-single-line-block (pos)
-  (= (web-mode-line-number (web-mode-block-beginning-position pos))
-     (web-mode-line-number (web-mode-block-end-position pos))))
-
-(defun web-mode-line-number (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (ret)
-    (setq ret (+ (count-lines 1 pos)
-                 (if (= (web-mode-column-at-pos pos) 0) 1 0)))))
-
-(defun web-mode-block-is-control (pos)
-  (save-excursion
-    (let (control state controls pair)
-      (goto-char pos)
-      (setq controls (web-mode-block-controls-get pos))
-      (setq pair (car controls))
-      (cond
-       ((eq (car pair) 'inside)
-        )
-       ((eq (car pair) 'open)
-        (setq state t
-              control (cdr pair)))
-       ((eq (car pair) 'close)
-        (setq state nil
-              control (cdr pair)))
-       ) ;cond
-      ;;      (message "engine=%S control=%S state=%S" web-mode-engine control state)
-      (if control (cons control state) nil)
-      )))
-
-(defun web-mode-block-is-opening-control (pos)
-  (save-excursion
-    (let (controls pair)
-      (goto-char pos)
-      (if (and (setq controls (web-mode-block-controls-get pos))
-               (= (length controls) 1)
-               (setq pair (car controls))
-               (eq (car pair) 'open))
-          (cdr pair)
-        nil)
-      )))
-
-(defun web-mode-markup-indentation-origin ()
-  (let* ((continue (not (bobp)))
-         (pos (point))
-         (part-side (not (null (get-text-property pos 'part-side)))) ;part-side at the origin
-         (types '(start end void)))
-    (while continue
-      (forward-line -1)
-      (back-to-indentation)
-      (setq pos (point))
-      (setq continue (not (or (bobp)
-                              (and (null part-side)
-                                   (null (get-text-property pos 'part-side))
-                                   (get-text-property pos 'tag-beg)
-                                   (member (get-text-property pos 'tag-type) types)
-                                   (null (get-text-property (1- pos) 'invisible)))
-                              (and part-side
-                                   (get-text-property pos 'part-side)
-                                   (get-text-property pos 'tag-beg)
-                                   (member (get-text-property pos 'tag-type) types)
-                                   (null (get-text-property (1- pos) 'invisible)))
-                              (and (get-text-property pos 'block-beg)
-                                   (not (get-text-property pos 'tag-type))
-                                   (web-mode-block-is-control pos)
-                                   (not (looking-at-p "{% comment"))))))
-      ) ;while
-    ;;(message "indent-origin=%S" pos)
-    pos))
-
-;;TODO : prendre en compte part-token
-;; state=t <=> start tag
-(defun web-mode-element-is-opened (pos limit)
-  (let (tag
-        last-end-tag
-        tag-pos block-pos
-        state
-        n
-        ret
-        (continue t)
-        controls
-        control
-        (buffer (current-buffer))
-        (h (make-hash-table :test 'equal))
-        (h2 (make-hash-table :test 'equal)))
-
-;;    (message "pos-ori=%S limit=%S" pos limit)
-
-    (while continue
-      (setq control nil
-            controls nil
-            last-end-tag nil
-            tag nil)
-
-      (cond
-       ((get-text-property pos 'tag-beg)
-        (when (member (get-text-property pos 'tag-type) '(start end))
-          (setq tag (get-text-property pos 'tag-name)
-                state (eq (get-text-property pos 'tag-type) 'start))
-          (if (null state) (setq last-end-tag (cons tag pos)))
-          (setq n (gethash tag h 0))
-          (if (null state)
-              (progn
-                (when (> n 0) (puthash tag (1- n) h))
-                (puthash tag (1- n) h2))
-            (puthash tag (1+ n) h)
-            (puthash tag (1+ n) h2))
-          ) ;when
-        (when (setq pos (web-mode-tag-end-position pos))
-          (setq tag-pos nil)
-          (when (and block-pos (> pos block-pos))
-            (setq block-pos nil))
-          ) ;when
-        )
-       ((and web-mode-enable-control-block-indentation
-             (get-text-property pos 'block-beg))
-        (when (setq controls (web-mode-block-controls-get pos))
-          (dolist (control controls)
-            (setq tag (cdr control))
-            (setq n (gethash tag h 0))
-            (cond
-             ((eq (car control) 'inside)
-              )
-             ((eq (car control) 'open)
-              (puthash tag (1+ n) h))
-             ((> n 0)
-              (puthash tag (1- n) h))
-             ) ;cond
-            ) ;dolist
-          )
-        (when (setq pos (web-mode-block-end-position pos))
-          (setq block-pos nil)
-          (when (and tag-pos (> pos tag-pos))
-            (setq tag-pos nil))
-          )
-        )
-       ) ;cond
-
-;;      (message "tag=%S end-pos=%S" tag pos)
-
-      (when (and pos (< pos limit))
-        (when (or (null tag-pos) (>= pos tag-pos))
-          (setq tag-pos (web-mode-tag-next-position pos limit))
-;;          (message "from=%S tag-next-pos=%S" pos tag-pos)
-          )
-        (when (or (null block-pos) (>= pos block-pos))
-          (setq block-pos (web-mode-block-next-position pos limit))
-;;          (message "from=%S block-next-pos=%S" pos block-pos)
-          )
-        )
-
-      (cond
-       ((null pos)
-        )
-       ((and (null tag-pos)
-             (null block-pos))
-        (setq pos nil))
-       ((and tag-pos block-pos)
-        (if (< tag-pos block-pos)
-            (progn
-              (setq pos tag-pos)
-              (setq tag-pos nil))
-          (setq pos block-pos)
-          (setq block-pos nil))
-        )
-       ((null tag-pos)
-        (setq pos block-pos)
-        (setq block-pos nil))
-       (t
-        (setq pos tag-pos)
-        (setq tag-pos nil))
-       )
-
-      (when (or (null pos)
-                (>= pos limit))
-        (setq continue nil))
-      ) ;while
-
-;;    (message "hashtable=%S" h)
-    (maphash (lambda (k v) (if (> v 0) (setq ret t))) h)
-
-    (when (and (null ret)
-               last-end-tag
-               (> (hash-table-count h2) 1)
-               (< (gethash (car last-end-tag) h2) 0))
-;;      (message "last-end-tag=%S" last-end-tag)
-      (save-excursion
-        (goto-char (cdr last-end-tag))
-        (web-mode-tag-match)
-        (when (not (= (point) (cdr last-end-tag)))
-          (setq n (point))
-          (back-to-indentation)
-          (if (= n (point)) (setq ret (current-indentation))))
-        ))
-
-    ret))
-
-(defun web-mode-previous-line (pos limit)
-  (save-excursion
-    (let (beg end line (continue t))
-      (goto-char pos)
-      (while continue
-        (forward-line -1)
-        (setq end (line-end-position))
-        (setq line (buffer-substring-no-properties (point) end))
-        (when (or (not (string-match-p "^[ \t]*$" line))
-                  (bobp)
-                  (<= (point) limit))
-          (setq continue nil))
-        )
-      (if (<= (point) limit)
-          ;;todo : affiner (le + 3 n est pas générique cf. <?php <% <%- etc.)
-          (setq beg (if (< (+ limit 3) end) (+ limit 3) end))
-        (setq beg (line-beginning-position))
-        ) ;if
-      (setq line (buffer-substring-no-properties beg end))
-      (cons line (current-indentation))
-      )))
-
-(defun web-mode-bracket-up (pos language &optional limit)
-  (unless limit (setq limit nil))
-  ;;(message "pos(%S) language(%S) limit(%S)" pos language limit)
-  (save-excursion
-    (goto-char pos)
-    (let ((continue t)
-          (regexp "[\]\[}{)(]")
-          (key nil)
-          (char nil)
-          (n 0)
-          (queue nil)
-          (searcher (if (get-text-property pos 'block-side) 'web-mode-block-rsb 'web-mode-part-rsb)))
-      (while (and continue (funcall searcher regexp limit))
-        (setq char (aref (match-string-no-properties 0) 0))
-        (setq key (cond ((eq char ?\)) ?\()
-                        ((eq char ?\}) ?\{)
-                        ((eq char ?\]) ?\[)
-                        (t             char)))
-        (setq n (or (plist-get queue key) 0))
-        (setq n (if (member char '(?\( ?\{ ?\[)) (1+ n) (1- n)))
-        (setq queue (plist-put queue key n))
-        (setq continue (< n 1))
-        ;;(message "pos=%S char=%c key=%c n=%S queue=%S" (point) char key n queue)
-        ) ;while
-      (list :pos (if (> n 0) (point) nil)
-            :char char
-            :column (current-column)
-            :indentation (current-indentation))
-      ) ;let
-    ))
-
-(defun web-mode-count-char-in-string (char string)
-  (let ((n 0))
-    (dotimes (i (length string))
-      (if (eq (elt string i) char)
-          (setq n (1+ n))))
-    n))
-
-(defun web-mode-mark-and-expand ()
-  "Mark and expand."
-  (interactive)
-  (web-mode-mark (point)))
-
-(defun web-mode-mark (pos)
-  (let ((beg pos) (end pos) prop reg-beg boundaries)
-
-    (if mark-active
-        (setq reg-beg (region-beginning))
-      (setq web-mode-expand-initial-pos (point)
-            web-mode-expand-initial-scroll (window-start))
-      )
-
-    ;; (message "regs=%S %S %S %S" (region-beginning) (region-end) (point-min) (point-max))
-    ;; (message "before=%S" web-mode-expand-previous-state)
-
-    (cond
-
-     ((and mark-active
-           (= (region-beginning) (point-min))
-           (or (= (region-end) (point-max))
-               (= (1+ (region-end)) (point-max))))
-      (deactivate-mark)
-      (goto-char (or web-mode-expand-initial-pos (point-min)))
-      (setq web-mode-expand-previous-state nil)
-      (when web-mode-expand-initial-scroll
-        (set-window-start (selected-window) web-mode-expand-initial-scroll))
-      )
-
-     ((string= web-mode-expand-previous-state "elt-content")
-      (web-mode-element-parent)
-      ;;(message "pos=%S" (point))
-      (web-mode-element-select)
-      (setq web-mode-expand-previous-state "html-parent"))
-
-     ((and (member (get-text-property pos 'block-token) '(comment string))
-           (not (member web-mode-expand-previous-state '("block-token" "block-body" "block-side"))))
-      (when (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token))
-        (setq beg (or (previous-single-property-change pos 'block-token) (point-min))))
-      (when (eq (get-text-property pos 'block-token) (get-text-property (1+ pos) 'block-token))
-        (setq end (next-single-property-change pos 'block-token)))
-      (set-mark beg)
-      (goto-char end)
-      (exchange-point-and-mark)
-      (setq web-mode-expand-previous-state "block-token"))
-
-     ((and (get-text-property pos 'block-side)
-           (not (member web-mode-expand-previous-state '("block-body" "block-side")))
-           (not (member web-mode-engine '(django go)))
-           (setq boundaries (web-mode-in-code-block "{" "}" 'block-side)))
-      (set-mark (car boundaries))
-      (goto-char (cdr boundaries))
-      (exchange-point-and-mark)
-      (setq web-mode-expand-previous-state "block-body"))
-
-     ((and (get-text-property pos 'block-side)
-           (not (member web-mode-expand-previous-state '("block-side"))))
-      (set-mark (web-mode-block-beginning-position pos))
-      (goto-char (1+ (web-mode-block-end-position pos)))
-      (exchange-point-and-mark)
-      (setq web-mode-expand-previous-state "block-side"))
-
-     ((and (get-text-property pos 'part-token)
-           (not (string= web-mode-expand-previous-state "part-token")))
-      (when (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token))
-        (setq beg (previous-single-property-change pos 'part-token)))
-      (when (eq (get-text-property pos 'part-token) (get-text-property (1+ pos) 'part-token))
-        (setq end (next-single-property-change pos 'part-token)))
-      (set-mark beg)
-      (goto-char end)
-      (exchange-point-and-mark)
-      (setq web-mode-expand-previous-state "part-token"))
-
-     ((and (get-text-property pos 'part-side)
-           (not (string= web-mode-expand-previous-state "client-part"))
-           (setq boundaries (web-mode-in-code-block "{" "}" 'part-side)))
-      (set-mark (car boundaries))
-      (goto-char (cdr boundaries))
-      (exchange-point-and-mark)
-      (setq web-mode-expand-previous-state "client-part"))
-
-     ((and (get-text-property pos 'part-side)
-           (not (string= web-mode-expand-previous-state "part-side")))
-      (when (eq (get-text-property pos 'part-side) (get-text-property (1- pos) 'part-side))
-        (setq beg (previous-single-property-change pos 'part-side)))
-      (when (eq (get-text-property pos 'part-side) (get-text-property (1+ pos) 'part-side))
-        (setq end (next-single-property-change pos 'part-side)))
-      (when (eq (char-after beg) ?\n)
-        (setq beg (1+ beg)))
-      (set-mark beg)
-      (goto-char end)
-      (when (looking-back "^[ \t]+")
-        (beginning-of-line))
-      (exchange-point-and-mark)
-      (setq web-mode-expand-previous-state "part-side"))
-
-     ((and (get-text-property pos 'tag-attr)
-           (not (member web-mode-expand-previous-state '("html-attr" "html-tag"))))
-      (web-mode-attribute-select pos)
-      (setq web-mode-expand-previous-state "html-attr"))
-
-     ((and (eq (get-text-property pos 'tag-type) 'comment)
-           (not (member web-mode-expand-previous-state '("html-tag" "html-comment" "html-elt" "html-parent"))))
-      (web-mode-tag-select)
-      (setq web-mode-expand-previous-state "html-comment"))
-
-     ((and (get-text-property pos 'tag-name)
-           (not (member web-mode-expand-previous-state '("html-tag" "html-elt" "html-parent"))))
-      (web-mode-tag-select)
-      (setq web-mode-expand-previous-state "html-tag"))
-
-     ((and (get-text-property pos 'tag-beg)
-           (string= web-mode-expand-previous-state "html-tag"))
-      (web-mode-element-select)
-      (setq web-mode-expand-previous-state "html-elt"))
-
-     (t
-      ;; (web-mode-element-parent)
-      ;; (if (and reg-beg (= reg-beg (region-beginning)))
-      ;;     (progn
-      ;;       (push-mark (point))
-      ;;       (push-mark (point-max) nil t)
-      ;;       (goto-char (point-min))
-      ;;       (setq web-mode-expand-previous-state "mark-whole"))
-      ;;   (web-mode-element-select)
-      ;;   (setq web-mode-expand-previous-state "html-parent")
-      ;;   )
-      (cond
-       ((not (web-mode-element-parent))
-        (push-mark (point))
-        (push-mark (point-max) nil t)
-        (goto-char (point-min))
-        (setq web-mode-expand-previous-state "mark-whole"))
-       ((not (= (web-mode-tag-end-position (point)) (1- beg)))
-        (web-mode-element-content-select)
-        (setq web-mode-expand-previous-state "elt-content"))
-       (t
-        (web-mode-element-select)
-        (setq web-mode-expand-previous-state "html-parent"))
-       )
-      ) ;t
-
-     ) ;cond
-
-    ;;(message "w=%S" (window-end))
-    ;;(message "after=%S" web-mode-expand-previous-state)
-
-    ))
-
-(defun web-mode-block-kill ()
-  "Kill the current block."
-  (interactive)
-  (web-mode-block-select)
-  (when mark-active
-    (kill-region (region-beginning) (region-end))))
-
-(defun web-mode-block-select ()
-  "Select the current block."
-  (interactive)
-  (let (beg)
-    (when (setq beg (web-mode-block-beginning-position (point)))
-      (goto-char beg)
-      (set-mark (point))
-      (web-mode-block-end)
-      (exchange-point-and-mark))
-    beg))
-
-(defun web-mode-tag-select ()
-  "Select the current html tag."
-  (interactive)
-  (let (beg)
-    (when (setq beg (web-mode-tag-beginning-position (point)))
-      (goto-char beg)
-      (set-mark (point))
-      (web-mode-tag-end)
-      (exchange-point-and-mark))
-    beg))
-
-(defun web-mode-element-content-select ()
-  "Select the content of a html element."
-  (interactive)
-  (let (pos beg end)
-    (web-mode-element-select)
-    (when mark-active
-      (setq pos (point))
-      (deactivate-mark)
-      (web-mode-tag-match)
-      (setq end (point))
-      (goto-char pos)
-      (web-mode-tag-end)
-      (set-mark (point))
-      (goto-char end)
-      (exchange-point-and-mark)
-      )))
-
-(defun web-mode-element-select ()
-  "Select the current html element (including opening and closing tags)."
-  (interactive)
-  (let* ((pos (point))
-         (type (get-text-property pos 'tag-type)))
-    (if type
-        (cond
-         ((member type '(start void))
-          (web-mode-tag-beginning)
-          (set-mark (point))
-          (web-mode-tag-match)
-          (web-mode-tag-end)
-          (exchange-point-and-mark))
-         (t
-          (web-mode-tag-match)
-          (set-mark (point))
-          (web-mode-tag-match)
-          (web-mode-tag-end)
-          (exchange-point-and-mark))
-         ) ;cond
-      (web-mode-element-parent)
-      (unless (= (point) pos) (web-mode-element-select))
-      ) ;if
-    ))
-
-(defun web-mode-element-is-collapsed (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (boundaries)
-    (and (setq boundaries (web-mode-element-boundaries pos))
-         (or (= (car (car boundaries)) (car (cdr boundaries)))
-             (= (cdr (car boundaries)) (1- (car (cdr boundaries)))))
-         )))
-
-(defun web-mode-element-transpose ()
-  "Transpose two html elements."
-  (interactive)
-  (let (pos start1 end1 start2 end2)
-    (save-excursion
-      (setq pos (point))
-      (cond
-       ((get-text-property pos 'tag-type)
-        (setq start1 (web-mode-element-beginning-position pos)
-              end1 (1+ (web-mode-element-end-position pos)))
-        )
-       ((setq start1 (web-mode-element-parent-position pos))
-        (setq end1 (1+ (web-mode-element-end-position pos)))
-        )
-       ) ;cond
-      (when (and start1 end1 (> end1 0))
-        (goto-char end1)
-        (unless (get-text-property (point) 'tag-beg)
-          (skip-chars-forward "\n\t "))
-        (when (get-text-property (point) 'tag-beg)
-          (setq start2 (web-mode-element-beginning-position (point))
-                end2 (1+ (web-mode-element-end-position (point))))
-          )
-        )
-      ;;      (message "start1(%S) end1(%S) start2(%S) end2(%S)"
-;;               start1 end1 start2 end2)
-      (transpose-regions start1 end1 start2 end2)
-      ) ;save-excursion
-    start2))
-
-(defun web-mode-element-children-fold-or-unfold (&optional pos)
-  "Fold/Unfold all the children of the current html element."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (dolist (child (reverse (web-mode-element-children pos)))
-      (goto-char child)
-      (web-mode-fold-or-unfold))
-    ))
-
-(defun web-mode-element-mute-blanks ()
-  "Mute blanks."
-  (interactive)
-  (let (pos parent beg end children elt)
-    (setq pos (point))
-    (save-excursion
-      (when (and (setq parent (web-mode-element-boundaries pos))
-                 (web-mode-element-child-position (point)))
-        (setq children (reverse (web-mode-element-children)))
-        ;;        (message "%S %S" parent children)
-        ;;        (setq end (car (cdr parent)))
-        ;;        (message "end=%S" end)
-        (goto-char (car (cdr parent)))
-        (dolist (child children)
-          (setq elt (web-mode-element-boundaries child))
-          ;;          (message "child=%S elt=%S" child elt)
-          (when (> (point) (1+ (cddr elt)))
-            ;;(message "%S-->" (point))
-            ;;(message "%S<!--" (1+ (cddr elt)))
-            (when (and (not (eq (get-text-property (point) 'part-token) 'comment))
-                       (not (eq (get-text-property (1+ (cddr elt)) 'part-token) 'comment)))
-              (web-mode-insert-text-at-pos "-->" (point))
-              (web-mode-insert-text-at-pos "<!--" (1+ (cddr elt))))
-            )
-          (goto-char child)
-          )
-        (when (and (> (point) (1+ (cdr (car parent))))
-                   (not (eq (get-text-property (point) 'part-token) 'comment))
-                   (not (eq (get-text-property (1+ (cdr (car parent))) 'part-token) 'comment)))
-          (web-mode-insert-text-at-pos "-->" (point))
-          (web-mode-insert-text-at-pos "<!--" (1+ (cdr (car parent)))))
-
-        ) ;when
-      )))
-
-(defun web-mode-element-children (&optional pos)
-  (unless pos (setq pos (point)))
-  (let ((continue t) (i 0) child children)
-    (save-excursion
-      (when (and (member (get-text-property pos 'tag-type) '(start end))
-                 (setq child (web-mode-element-child-position pos)))
-        (while continue
-          (cond
-           ((> (setq i (1+ i)) 100)
-            (setq continue nil)
-            (message "element-children ** warning **"))
-           ((= i 1)
-            (goto-char child))
-           ((web-mode-element-sibling-next)
-            )
-           (t
-            (setq continue nil))
-           ) ;cond
-          (when continue
-            (setq children (append children (list (point)))))
-          ) ;while
-        ) ;when
-      ) ;save-excursion
-    children))
-
-(defun web-mode-element-boundaries (&optional pos)
-  "Return ((start-tag-beg . start-tag-end) . (end-tag-beg . end-tag-end))
-First level car and cdr are the same with void elements.
-Pos should be in a tag."
-  (unless pos (setq pos (point)))
-  (let (start-tag-beg start-tag-end end-tag-beg end-tag-end)
-    (cond
-     ((eq (get-text-property pos 'tag-type) 'start)
-      (setq start-tag-beg (web-mode-tag-beginning-position pos)
-            start-tag-end (web-mode-tag-end-position pos))
-      (when (setq pos (web-mode-tag-match-position pos))
-        (setq end-tag-beg pos
-              end-tag-end (web-mode-tag-end-position pos)))
-      )
-     ((eq (get-text-property pos 'tag-type) 'end)
-      (setq end-tag-beg (web-mode-tag-beginning-position pos)
-            end-tag-end (web-mode-tag-end-position pos))
-      (when (setq pos (web-mode-tag-match-position pos))
-        (setq start-tag-beg pos
-              start-tag-end (web-mode-tag-end-position pos)))
-      )
-     ((eq (get-text-property pos 'tag-type) 'void)
-      (setq start-tag-beg (web-mode-tag-beginning-position pos)
-            start-tag-end (web-mode-tag-end-position pos))
-      (setq end-tag-beg start-tag-beg
-            end-tag-end start-tag-end)
-      )
-     ) ;cond
-    (if (and start-tag-beg start-tag-end end-tag-beg end-tag-end)
-        (cons (cons start-tag-beg start-tag-end) (cons end-tag-beg end-tag-end))
-      nil)
-    ))
-
-(defun web-mode-surround ()
-  "Surround each line of the current REGION with a start/end tag."
-  (interactive)
-  (when mark-active
-    (let (beg end line-beg line-end pos tag tag-start tag-end)
-      (save-excursion
-        (setq tag (read-from-minibuffer "Tag name? ")
-              tag-start (concat "<" tag ">")
-              tag-end (concat "</" tag ">")
-              pos (point)
-              beg (region-beginning)
-              end (region-end)
-              line-beg (web-mode-line-number beg)
-              line-end (web-mode-line-number end))
-        (goto-char end)
-        (unless (bolp)
-          (insert tag-end)
-          (back-to-indentation)
-          (when (> beg (point))
-            (goto-char beg))
-          (insert tag-start))
-        (while (> line-end line-beg)
-          (forward-line -1)
-          (setq line-end (1- line-end))
-          (unless (looking-at-p "[[:space:]]*$")
-            (end-of-line)
-            (insert tag-end)
-            (back-to-indentation)
-            (when (> beg (point))
-              (goto-char beg))
-            (insert tag-start))
-          ) ;while
-        (deactivate-mark)
-        ))))
-
-(defun web-mode-element-wrap ()
-  "Wrap current REGION with start and end tags."
-  (interactive)
-  (let (beg end pos tag sep)
-    (save-excursion
-      (setq tag (read-from-minibuffer "Tag name? "))
-      (setq pos (point))
-      (cond
-       (mark-active
-        (setq beg (region-beginning)
-              end (region-end)))
-       ((get-text-property pos 'tag-type)
-        (setq beg (web-mode-element-beginning-position pos)
-              end (1+ (web-mode-element-end-position pos))))
-       ((setq beg (web-mode-element-parent-position pos))
-        (setq end (1+ (web-mode-element-end-position pos))))
-       )
-      ;;      (message "beg(%S) end(%S)" beg end)
-      (when (and beg end (> end 0))
-        (setq sep (if (get-text-property beg 'tag-beg) "\n" ""))
-        (web-mode-insert-text-at-pos (concat sep "</" tag ">") end)
-        (web-mode-insert-text-at-pos (concat "<" tag ">" sep) beg)
-        (when (string= sep "\n") (indent-region beg (+ end (* (+ 3 (length tag)) 2))))
-        )
-      ) ;save-excursion
-    (web-mode-go beg)))
-
-(defun web-mode-element-vanish (&optional arg)
-  "Vanish the current html element. The content of the element is kept."
-  (interactive "p")
-  (let (type (pos (point)) start-b start-e end-b end-e)
-    (while (>= arg 1)
-      (setq type (get-text-property pos 'tag-type))
-      (when type
-        (cond
-         ((member type '(void))
-          (web-mode-element-kill)
-          (set-mark (point))
-          (web-mode-tag-match)
-          (web-mode-tag-end)
-          (exchange-point-and-mark))
-         ((member type '(start))
-          (setq start-b (web-mode-tag-beginning-position)
-                start-e (web-mode-tag-end-position))
-          (when (web-mode-tag-match)
-            (setq end-b (web-mode-tag-beginning-position)
-                  end-e (web-mode-tag-end-position)))
-          )
-         (t
-          (setq end-b (web-mode-tag-beginning-position)
-                end-e (web-mode-tag-end-position))
-          (when (web-mode-tag-match)
-            (setq start-b (web-mode-tag-beginning-position)
-                  start-e (web-mode-tag-end-position)))
-          ) ;t
-         ) ;cond
-        (when (and start-b end-b)
-          (goto-char end-b)
-          (delete-region end-b (1+ end-e))
-          (delete-blank-lines)
-          (goto-char start-b)
-          (delete-region start-b (1+ start-e))
-          (delete-blank-lines)
-          (web-mode-buffer-indent)
-          )
-        ;;        (message "start %S %S - end %S %S" start-b start-e end-b end-e))
-        ) ;when
-      (skip-chars-forward "[:space:]")
-      (setq arg (1- arg))
-      ) ;while
-    ) ;let
-  )
-
-(defun web-mode-element-kill (&optional arg)
-  "Kill the current html element."
-  (interactive "p")
-  (while (>= arg 1)
-    (setq arg (1- arg))
-    (web-mode-element-select)
-    (when mark-active
-      (kill-region (region-beginning) (region-end)))
-    ) ;while
-  )
-
-(defun web-mode-element-clone (&optional arg)
-  "Clone the current html element."
-  (interactive "p")
-  (let (col pos)
-    (while (>= arg 1)
-      (setq arg (1- arg)
-            col 0)
-      (web-mode-element-select)
-      (when mark-active
-        (save-excursion
-          (goto-char (region-beginning))
-          (setq col (current-column)))
-        (kill-region (region-beginning) (region-end))
-        (yank)
-        (newline)
-        (indent-line-to col)
-        (setq pos (point))
-        (yank)
-        (goto-char pos))
-      )
-    ) ;let
-  )
-
-(defun web-mode-element-insert ()
-  "Insert an html element."
-  (interactive)
-  (let (tag-name)
-    (cond
-     ((and (get-text-property (point) 'tag-type)
-           (not (get-text-property (point) 'tag-beg)))
-      (message "element-insert ** invalid context **"))
-     ((not (and (setq tag-name (read-from-minibuffer "Tag name? "))
-                (> (length tag-name) 0)))
-      (message "element-insert ** failure **"))
-     ((web-mode-element-is-void tag-name)
-      (insert (concat "<" tag-name "/>"))
-      )
-     (mark-active
-      (let ((beg (region-beginning)) (end (region-end)))
-        (deactivate-mark)
-        (goto-char end)
-        (insert "</" tag-name ">")
-        (goto-char beg)
-        (insert "<" tag-name ">")
-        )
-      )
-     (t
-      (insert (concat "<" tag-name ">" "</" tag-name ">"))
-      (web-mode-sb "</")
-      )
-     ) ;cond
-    ))
-
-(defun web-mode-element-rename ()
-  "Rename the current html element."
-  (interactive)
-  (save-excursion
-    (let (pos tag-name)
-      (setq tag-name (read-from-minibuffer "New tag name? "))
-      (when (and (> (length tag-name) 0)
-                 (web-mode-element-beginning)
-                 (looking-at "<\\([[:alnum:]]+\\(:?[-][[:alpha:]]+\\)?\\)"))
-        (setq pos (point))
-        (unless (web-mode-element-is-void)
-            (save-match-data
-              (web-mode-tag-match)
-              (if (looking-at "</[ ]*\\([[:alnum:]]+\\(:?[-][[:alpha:]]+\\)?\\)")
-                  (replace-match (concat "</" tag-name))
-                )))
-        (goto-char pos)
-        (replace-match (concat "<" tag-name))
-        ))))
-
-(defun web-mode-current-trimmed-line ()
-  (web-mode-trim (buffer-substring-no-properties
-                  (line-beginning-position)
-                  (line-end-position))))
-
-(defun web-mode-trim (string)
-  (replace-regexp-in-string "\\`[ \t\n]*" "" (replace-regexp-in-string "[ \t\n]*\\'" "" string)))
-
-(defun web-mode-block-is-token-line ()
-  (save-excursion
-    (let ((continue t) (counter 0))
-      (beginning-of-line)
-      (back-to-indentation)
-      (while (and continue (not (eolp)))
-        (cond
-         ((get-text-property (point) 'block-token)
-          (setq counter (1+ counter)))
-         ((not (eq ?\s (following-char)))
-          (setq continue nil
-                counter 0))
-         ) ;cond
-        (forward-char)
-        ) ;while
-      (> counter 0)
-      )))
-
-(defun web-mode-part-is-token-line ()
-  (save-excursion
-    (let ((continue t)
-          (counter 0))
-      (beginning-of-line)
-      (setq continue (not (eolp)))
-      (while continue
-        (forward-char)
-        (cond
-         ((eolp)
-          (setq continue nil))
-         ((or (get-text-property (point) 'block-side)
-              (member (get-text-property (point) 'part-token) '(comment string)))
-          (setq counter (1+ counter)))
-         ((eq ?\s (following-char))
-          )
-         (t
-          (setq continue nil
-                counter 0))
-         )
-        ) ;while
-      (> counter 0))))
-
-(defun web-mode-is-content (&optional pos)
-  (unless pos (setq pos (point)))
-  (not (or (get-text-property pos 'part-side)
-           (get-text-property pos 'tag-type)
-           (get-text-property pos 'block-side)
-           )))
-
-(defun web-mode-is-comment-or-string (&optional pos)
-  (unless pos (setq pos (point)))
-  (not (null (or (eq (get-text-property pos 'tag-type) 'comment)
-                 (member (get-text-property pos 'block-token) '(comment string))
-                 (member (get-text-property pos 'part-token) '(comment string))))))
-
-;; on regarde le dernier
-(defun web-mode-block-is-open (&optional pos)
-  (unless pos (setq pos (point))))
-
-;; on regarde le premier
-(defun web-mode-block-is-close (&optional pos)
-  (unless pos (setq pos (point)))
-  (and (get-text-property pos 'block-side)
-       (eq (caar (web-mode-block-controls-get pos)) 'close)))
-
-;; on regarde le premier
-(defun web-mode-block-is-inside (&optional pos)
-  (unless pos (setq pos (point)))
-  (and (get-text-property pos 'block-side)
-       (eq (caar (web-mode-block-controls-get pos)) 'inside)))
-
-(defun web-mode-element-is-void (&optional tag)
-  (cond
-   ((and tag (member tag '("div" "li" "a" "p")))
-    nil)
-   (tag
-    (car (member (downcase tag) web-mode-void-elements)))
-   (t
-    (eq (get-text-property (point) 'tag-type) 'void))
-   ))
-
-(defun web-mode-toggle-current-element-highlight ()
-  "Toggle highlighting of the current html element."
-  (interactive)
-  (if web-mode-enable-current-element-highlight
-      (progn
-        (web-mode-delete-tag-overlays)
-        (setq web-mode-enable-current-element-highlight nil))
-    (setq web-mode-enable-current-element-highlight t)
-    ))
-
-(defun web-mode-fold-or-unfold (&optional pos)
-  "Toggle folding on an html element or a control block."
-  (interactive)
-  (web-mode-propertize)
-  (web-mode-with-silent-modifications
-   (save-excursion
-     (if pos (goto-char pos))
-     (let (beg-inside beg-outside end-inside end-outside overlay overlays regexp)
-       (when (looking-back "^[\t ]*")
-         (back-to-indentation))
-       (setq overlays (overlays-at (point)))
-       (dolist (elt overlays)
-         (when (and (not overlay)
-                    (eq (overlay-get elt 'font-lock-face) 'web-mode-folded-face))
-           (setq overlay elt)))
-       (cond
-        ;; *** unfolding
-        (overlay
-         ;;(setq overlay (car overlays))
-         (setq beg-inside (overlay-start overlay)
-               end-inside (overlay-end overlay))
-         (remove-overlays beg-inside end-inside)
-         (put-text-property beg-inside end-inside 'invisible nil)
-         )
-        ;; *** tag folding
-        ((member (get-text-property (point) 'tag-type) '(start end))
-         (when (not (web-mode-element-is-collapsed (point)))
-           (web-mode-tag-beginning)
-           (when (eq (get-text-property (point) 'tag-type) 'end)
-             (web-mode-tag-match))
-           (setq beg-outside (point))
-           (web-mode-tag-end)
-           (setq beg-inside (point))
-           (goto-char beg-outside)
-           (when (web-mode-tag-match)
-             (setq end-inside (point))
-             (web-mode-tag-end)
-             (setq end-outside (point)))
-           )
-         )
-        ;; *** block folding
-        ((cdr (web-mode-block-is-control (point)))
-         (setq beg-outside (web-mode-block-beginning-position (point)))
-         (setq beg-inside (1+ (web-mode-block-end-position (point))))
-         (when (web-mode-block-match)
-           (setq end-inside (point))
-           (setq end-outside (1+ (web-mode-block-end-position (point)))))
-         ) ;block-control
-        ) ;cond
-       (when (and beg-inside beg-outside end-inside end-outside)
-         ;;(message "beg-out(%d) beg-in(%d) end-in(%d) end-out(%d)" beg-outside beg-inside end-inside end-outside)
-         (setq overlay (make-overlay beg-outside end-outside))
-         (overlay-put overlay 'font-lock-face 'web-mode-folded-face)
-         (put-text-property beg-inside end-inside 'invisible t)
-         )
-       ))))
-
-(defun web-mode-toggle-comments ()
-  "Toggle comments visbility."
-  (interactive)
-  (save-excursion
-    (if web-mode-comments-invisible
-        (remove-overlays))
-    (setq web-mode-comments-invisible (null web-mode-comments-invisible))
-    (let ((continue t)
-          (pos (point-min))
-          (visibility web-mode-comments-invisible)
-          overlay end)
-      (while continue
-        (setq pos (next-single-property-change pos 'font-lock-face))
-        (if (null pos)
-            (setq continue nil)
-          (when (eq (get-text-property pos 'font-lock-face) 'web-mode-comment-face)
-            (setq end (next-single-property-change pos 'font-lock-face))
-            (put-text-property pos end 'invisible visibility)
-            (when visibility
-              (setq overlay (make-overlay pos end)))
-            (goto-char pos)
-            )
-          )
-        )
-      ) ;let
-    ))
-
-(defun web-mode-comment-or-uncomment-region (beg end)
-  (interactive)
-  (save-excursion
-    (push-mark end)
-    (goto-char beg)
-    (setq mark-active t)
-    (web-mode-comment-or-uncomment)
-    (pop-mark)))
-
-(defun web-mode-comment-or-uncomment ()
-  "Comment or uncomment line(s), block or region at POS."
-  (interactive)
-  ;; TODO : if mark is at eol, mark--
-  (if (and (not mark-active) (looking-at-p "[[:space:]]*$"))
-      (web-mode-comment-insert)
-    (when (and (use-region-p) (eq (point) (region-end)))
-      (if (bolp) (backward-char))
-      (exchange-point-and-mark))
-    (skip-chars-forward "[:space:]" (line-end-position))
-    (cond
-     ((or (eq (get-text-property (point) 'tag-type) 'comment)
-          (eq (get-text-property (point) 'block-token) 'comment)
-          (eq (get-text-property (point) 'part-token) 'comment))
-      (web-mode-uncomment (point)))
-     (t
-      (web-mode-comment (point)))
-     )
-    ) ;if
-  )
-
-(defun web-mode-comment-insert ()
-  (cond
-   ((get-text-property (point) 'block-side)
-    (insert "/*  */")
-    (search-backward " */"))
-   ((get-text-property (point) 'part-side)
-    (insert "/*  */")
-    (search-backward " */"))
-   (t
-    (insert "<!--  -->")
-    (search-backward " -->"))
-   )
-  )
-
-(defun web-mode-comment (pos)
-    (let (ctx language sel beg end tmp block-side single-line-block pos-after content)
-
-      (setq pos-after pos)
-
-      (setq block-side (get-text-property pos 'block-side))
-      (setq single-line-block (web-mode-is-single-line-block pos))
-
-      (cond
-
-       ((and single-line-block
-             block-side
-             (intern-soft (concat "web-mode-comment-" web-mode-engine "-block")))
-        (funcall (intern (concat "web-mode-comment-" web-mode-engine "-block")) pos)
-        )
-
-       (t
-        (setq ctx (web-mode-point-context
-                   (if mark-active (region-beginning) (line-beginning-position))))
-        (setq language (plist-get ctx :language))
-        (cond
-         (mark-active
-          )
-         ((and (member language '("html" "xml"))
-               (get-text-property (progn (back-to-indentation) (point)) 'tag-beg))
-          (web-mode-element-select))
-         (t
-          (end-of-line)
-          (set-mark (line-beginning-position)))
-         ) ;cond
-
-        (setq beg (region-beginning)
-              end (region-end))
-
-        ;;(message "%S %S" beg end)
-
-        (when (> (point) (mark))
-          (exchange-point-and-mark))
-
-        (if (and (eq (char-before end) ?\n)
-                 (not (eq (char-after end) ?\n)))
-            (setq end (1- end)))
-
-;;        (setq sel (web-mode-trim (buffer-substring-no-properties beg end)))
-        (setq sel (buffer-substring-no-properties beg end))
-
-        ;;(web-mode-with-silent-modifications
-        ;; (delete-region beg end))
-        ;;(deactivate-mark)
-
-        (cond
-
-         ((member language '("html" "xml"))
-          (cond
-           ((and (= web-mode-comment-style 2) (string= web-mode-engine "django"))
-            (setq content (concat "{# " sel " #}")))
-           ((and (= web-mode-comment-style 2) (member web-mode-engine '("ejs" "erb")))
-            (setq content (concat "<%# " sel " %>")))
-           ((and (= web-mode-comment-style 2) (string= web-mode-engine "aspx"))
-            (setq content (concat "<%-- " sel " --%>")))
-           ((and (= web-mode-comment-style 2) (string= web-mode-engine "smarty"))
-            (setq content (concat "{* " sel " *}")))
-           ((and (= web-mode-comment-style 2) (string= web-mode-engine "blade"))
-            (setq content (concat "{{-- " sel " --}}")))
-           ((and (= web-mode-comment-style 2) (string= web-mode-engine "razor"))
-            (setq content (concat "@* " sel " *@")))
-           (t
-            (setq content (concat "<!-- " sel " -->"))
-            (when (< (length sel) 1)
-              (search-backward " -->")
-              (setq pos-after nil))
-            ))
-          ) ;case html
-
-         ((member language '("php" "javascript" "java" "jsx"))
-          (let (alt)
-            (setq alt (cdr (assoc language web-mode-comment-formats)))
-            (if (and alt (not (string= alt "/*")))
-                (setq content (replace-regexp-in-string "^[ ]*" alt sel))
-              ;;(message "before")
-              (setq content (concat "/* " sel " */"))
-              ;;(message "after")
-              ) ;if
-            )
-          )
-
-         ((member language '("erb"))
-          (setq content (replace-regexp-in-string "^[ ]*" "#" sel)))
-
-         ((member language '("asp"))
-          (setq content (replace-regexp-in-string "^[ ]*" "''" sel)))
-
-         (t
-          (setq content (concat "/* " sel " */")))
-
-         ) ;cond
-
-        ) ;t
-       ) ;cond
-
-      ;;(web-mode-with-silent-modifications
-      (delete-region beg end)
-      (deactivate-mark)
-      ;;)
-      ;;(web-mode-insert-and-indent content)
-      (let (beg end)
-        (setq beg (point-at-bol))
-        (insert content)
-        (setq end (point-at-eol))
-        (indent-region beg end)
-        )
-
-      ;;(when content (web-mode-insert-and-indent content))
-
-      (when pos-after (goto-char pos-after))
-
-      ;;      (message "END")
-
-      ))
-
-(defun web-mode-comment-boundaries (&optional pos)
-  (interactive)
-  (unless pos (setq pos (point)))
-  (let ((beg pos) (end pos) prop)
-    (save-excursion
-      (goto-char pos)
-      (setq prop
-            (cond
-             ((eq (get-text-property pos 'block-token) 'comment) 'block-token)
-             ((eq (get-text-property pos 'tag-type) 'comment) 'tag-type)
-             ((eq (get-text-property pos 'part-token) 'comment) 'part-token)
-             (t nil)
-             ))
-      (if (null prop)
-          (setq beg nil
-                end nil)
-        (when (and (not (bobp))
-                   (eq (get-text-property pos prop) (get-text-property (1- pos) prop)))
-          (setq beg (or (previous-single-property-change pos prop) (point-min))))
-        (when (and (not (eobp))
-                   (eq (get-text-property pos prop) (get-text-property (1+ pos) prop)))
-          (setq end (or (next-single-property-change pos prop) (point-max)))))
-      (when (and beg (string= (buffer-substring-no-properties beg (+ beg 2)) "//"))
-        (goto-char end)
-        (while (and (looking-at-p "\n[ ]*//")
-                    (not (eobp)))
-          (search-forward "//")
-          (backward-char 2)
-          ;;(message "%S" (point))
-          (setq end (next-single-property-change (point) prop))
-          (goto-char end)
-          ;;(message "%S" (point))
-          ) ;while
-        ) ;when
-      (when end (setq end (1- end)))
-      ) ; save-excursion
-    ;;(message "beg=%S end=%S" beg end)
-    (if (and beg end) (cons beg end) nil)
-    ))
-
-(defun web-mode-uncomment (pos)
-  (let ((beg pos) (end pos) (sub2 "") comment boundaries)
-    (save-excursion
-      (cond
-       ((and (get-text-property pos 'block-side)
-             (intern-soft (concat "web-mode-uncomment-" web-mode-engine "-block")))
-        (funcall (intern (concat "web-mode-uncomment-" web-mode-engine "-block")) pos))
-       ((and (setq boundaries (web-mode-comment-boundaries pos))
-             (setq beg (car boundaries))
-             (setq end (1+ (cdr boundaries)))
-             (> (- end beg) 4))
-        ;;(message "beg(%S) end(%S)" beg end)
-        (setq comment (buffer-substring-no-properties beg end))
-        (setq sub2 (substring comment 0 2))
-        (cond
-         ((member sub2 '("<!" "<%"))
-          (setq comment (replace-regexp-in-string "\\(^<[!%]--[ ]?\\|[ ]?--[%]?>$\\)" "" comment)))
-         ((string= sub2 "{#")
-          (setq comment (replace-regexp-in-string "\\(^{#[ ]?\\|[ ]?#}$\\)" "" comment)))
-         ((string= sub2 "/*")
-          (setq comment (replace-regexp-in-string "\\(^/\\*[ ]?\\|[ ]?\\*/$\\)" "" comment)))
-         ((string= sub2 "//")
-          ;;(setq comment (replace-regexp-in-string "\\(^//\\)" "" comment))
-          (setq comment (replace-regexp-in-string "\\(//\\)" "" comment)))
-         ) ;cond
-        (delete-region beg end)
-        (web-mode-insert-and-indent comment)
-        (goto-char beg)
-        )
-       ) ;cond
-      (indent-according-to-mode))))
-
-(defun web-mode-comment-ejs-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "//" (+ beg 2))))
-
-(defun web-mode-comment-erb-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "#" (+ beg 2))))
-
-(defun web-mode-comment-django-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "#" end)
-    (web-mode-insert-text-at-pos "#" (1+ beg))))
-
-(defun web-mode-comment-dust-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "!" end)
-    (web-mode-insert-text-at-pos "!" (1+ beg))))
-
-(defun web-mode-comment-aspx-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "#" end)
-    (web-mode-insert-text-at-pos "#" (1+ beg))))
-
-(defun web-mode-comment-jsp-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "--" (+ beg 2))))
-
-(defun web-mode-comment-go-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "/" (+ beg 2))))
-
-(defun web-mode-comment-php-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-insert-text-at-pos "*/" (- end 1))
-    (web-mode-insert-text-at-pos "/*" (+ beg (if (web-mode-looking-at "<\\?php" beg) 5 3)))))
-
-(defun web-mode-uncomment-ejs-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 1 (+ beg 2))))
-
-(defun web-mode-uncomment-erb-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 1 (+ beg 2))))
-
-(defun web-mode-uncomment-django-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 2 (1- end))
-    (web-mode-remove-text-at-pos 2 beg)))
-
-(defun web-mode-uncomment-dust-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 1 (1- end))
-    (web-mode-remove-text-at-pos 1 (1+ beg))))
-
-(defun web-mode-uncomment-aspx-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 1 (1- end))
-    (web-mode-remove-text-at-pos 1 (1+ beg))))
-
-(defun web-mode-uncomment-jsp-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 2 (+ beg 2))))
-
-(defun web-mode-uncomment-go-block (pos)
-  (let (beg end)
-    (setq beg (web-mode-block-beginning-position pos)
-          end (web-mode-block-end-position pos))
-    (web-mode-remove-text-at-pos 1 (+ beg 2))))
-
-(defun web-mode-snippet-names ()
-  (let (codes)
-    (dolist (snippet web-mode-snippets)
-      (add-to-list 'codes (car snippet) t))
-    codes))
-
-(defun web-mode-snippet-insert (code)
-  "Insert a snippet."
-  (interactive
-   (list (completing-read "Snippet: " (web-mode-snippet-names))))
-  (let (beg
-        (continue t)
-        (counter 0)
-        end
-        sel
-        snippet
-        (l (length web-mode-snippets))
-        pos)
-    (when mark-active
-      (setq sel (web-mode-trim (buffer-substring-no-properties
-                                (region-beginning) (region-end))))
-      (delete-region (region-beginning) (region-end)))
-    (while (and continue (< counter l))
-      (setq snippet (nth counter web-mode-snippets))
-      (when (string= (car snippet) code)
-        (setq continue nil))
-      (setq counter (1+ counter)))
-    (when snippet
-      (setq snippet (cdr snippet))
-      (setq beg (point-at-bol))
-      (insert snippet)
-      (setq pos (point)
-            end (point))
-      (when (string-match-p "|" snippet)
-        (search-backward "|")
-        (delete-char 1)
-        (setq pos (point)
-              end (1- end)))
-      (when sel
-        (insert sel)
-        (setq pos (point)
-              end (+ end (length sel))))
-      (goto-char end)
-      (setq end (point-at-eol))
-      (unless sel (goto-char pos))
-      (indent-region beg end))
-    ))
-
-(defun web-mode-looking-at (regexp pos)
-  (save-excursion
-    (goto-char pos)
-    (looking-at regexp)))
-
-(defun web-mode-looking-at-p (regexp pos)
-  (save-excursion
-    (goto-char pos)
-    (looking-at-p regexp)))
-
-(defun web-mode-looking-back (regexp pos)
-  (save-excursion
-    (goto-char pos)
-    (looking-back regexp)))
-
-(defun web-mode-insert-text-at-pos (text pos)
-  (let ((mem web-mode-enable-auto-pairing))
-    (setq web-mode-enable-auto-pairing nil)
-    (save-excursion
-      (goto-char pos)
-      (insert text)
-      (setq web-mode-enable-auto-pairing mem)
-      )))
-
-(defun web-mode-remove-text-at-pos (n &optional pos)
-  (unless pos (setq pos (point)))
-  (delete-region pos (+ pos n)))
-
-(defun web-mode-insert-and-indent (text)
-  (let (beg end)
-    (setq beg (point-at-bol))
-    (insert text)
-    (setq end (point-at-eol))
-    (indent-region beg end)
-    ))
-
-(defun web-mode-navigate (&optional pos)
-  "Move point to the matching opening/closing tag/block."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (let (init)
-    (goto-char pos)
-    (setq init (point))
-    (when (> (current-indentation) (current-column))
-      (back-to-indentation))
-    (setq pos (point))
-    (cond
-     ((and (get-text-property pos 'block-side)
-           (web-mode-block-beginning)
-           (web-mode-block-controls-get (point)))
-      (web-mode-block-match))
-     ((member (get-text-property pos 'tag-type) '(start end))
-      (web-mode-tag-beginning)
-      (web-mode-tag-match))
-     (t
-      (goto-char init))
-     )
-    ))
-
-(defun web-mode-block-match (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (pos-ori controls control (counter 1) type (continue t) pair)
-    (setq pos-ori pos)
-    (goto-char pos)
-    (setq controls (web-mode-block-controls-get pos))
-;;    (message "controls=%S" controls)
-    (cond
-     (controls
-      (setq pair (car controls))
-      (setq control (cdr pair))
-      (setq type (car pair))
-      (when (eq type 'inside) (setq type 'close))
-      (while continue
-        (cond
-         ((and (> pos-ori 1) (bobp))
-          (setq continue nil))
-         ((or (and (eq type 'open) (not (web-mode-block-next)))
-              (and (eq type 'close) (not (web-mode-block-previous))))
-          (setq continue nil)
-          )
-         ((null (setq controls (web-mode-block-controls-get (point))))
-          )
-         (t
-          ;; TODO : est il nécessaire de faire un reverse sur controls si on doit matcher backward
-          (dolist (pair controls)
-            (cond
-             ((not (string= (cdr pair) control))
-              )
-             ((eq (car pair) 'inside)
-              )
-             ((eq (car pair) type)
-              (setq counter (1+ counter)))
-             (t
-              (setq counter (1- counter)))
-             )
-            ) ;dolist
-          (when (= counter 0)
-            (setq continue nil))
-          ) ;t
-         ) ;cond
-        ) ;while
-      (if (= counter 0) (point) nil)
-      ) ;controls
-     (t
-      (goto-char pos-ori)
-      nil
-      ) ;controls = nul
-     ) ;conf
-    ))
-
-(defun web-mode-tag-match (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (regexp)
-    (setq regexp (concat "</?" (get-text-property pos 'tag-name)))
-    (when (member (get-text-property pos 'tag-type) '(start end))
-      (web-mode-tag-beginning)
-      (setq pos (point)))
-    (if (eq (get-text-property pos 'tag-type) 'end)
-        (web-mode-tag-fetch-opening regexp pos)
-      (web-mode-tag-fetch-closing regexp pos))
-    t))
-
-(defun web-mode-tag-fetch-opening (regexp pos)
-  (let ((counter 1) (n 0) (type nil))
-    (goto-char pos)
-    (while (and (> counter 0) (re-search-backward regexp nil t))
-      (when (and (get-text-property (point) 'tag-beg)
-                 (member (get-text-property (point) 'tag-type) '(start end)))
-        (setq n (1+ n))
-        (cond
-         ((eq (get-text-property (point) 'tag-type) 'end)
-          (setq counter (1+ counter)))
-         (t
-          (setq counter (1- counter))
-          )
-         )
-        )
-      )
-    (if (= n 0) (goto-char pos))
-    ))
-
-(defun web-mode-tag-fetch-closing (regexp pos)
-  (let ((counter 1) (n 0))
-    (goto-char pos)
-    (web-mode-tag-end)
-    (while (and (> counter 0) (re-search-forward regexp nil t))
-      (when (get-text-property (match-beginning 0) 'tag-beg)
-        (setq n (1+ n))
-        (if (eq (get-text-property (point) 'tag-type) 'end)
-            (setq counter (1- counter))
-          (setq counter (1+ counter))))
-      )
-    (if (> n 0)
-        (web-mode-tag-beginning)
-      (goto-char pos))
-    ))
-
-(defun web-mode-element-tag-name (&optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (goto-char pos)
-    (if (and (web-mode-tag-beginning)
-             (looking-at "<\\(/?[[:alpha:]][[:alnum:]-]*\\)"))
-        (match-string-no-properties 1)
-      nil)))
-
-(defun web-mode-element-close ()
-  "Close html element."
-  (interactive)
-  (let (jump epp ins tag)
-    (setq epp (web-mode-element-parent-position))
-    (when epp
-;;      (setq tag (get-text-property epp 'tag-name))
-      (setq tag (web-mode-element-tag-name epp))
-      (cond
-       ((null tag)
-        (setq epp nil))
-       ((looking-back "</")
-        (setq ins tag))
-       ((looking-back "<")
-        (setq ins (concat "/" tag)))
-       (t
-        ;; auto-close-style = 2
-;;        (message "%S %c" (point) (char-after))
-        (when (and (looking-at-p "[[:alpha:]]") (> (length tag) 4))
-          (dolist (elt '("div" "span" "strong" "pre" "li"))
-            (when (and (string-match-p (concat "^" elt) tag) (not (string= tag elt)))
-              (setq tag elt)
-              (put-text-property epp (point) 'tag-name tag))
-            )
-          ) ;when
-        (if (web-mode-element-is-void (get-text-property (point) 'tag-name))
-            (setq ins nil
-                  epp nil)
-          (setq ins (concat "</" tag)))
-        )
-       ) ;cond
-      (when ins
-        ;;        (message "ins=%S" ins)
-        (unless (looking-at-p "[ ]*>")
-          (setq ins (concat ins ">")))
-        (insert ins)
-        (save-excursion
-          (search-backward "<")
-          (setq jump (and (eq (char-before) ?\>)
-                          (string= (get-text-property (1- (point)) 'tag-name) tag)))
-          (if jump (setq jump (point)))
-          ;;        (setq jump (looking-back (concat "<" tag ">")))
-          ) ;save-excursion
-        (if jump (goto-char jump))
-        ) ;when not ins
-      ) ;when epp
-    epp
-    ))
-
-(defun web-mode-detect-content-type ()
-  (cond
-   ((and (string= web-mode-engine "none")
-         (< (point) 16)
-         (eq (char-after 1) ?\#)
-         (string-match-p "php" (buffer-substring-no-properties
-                                (line-beginning-position)
-                                (line-end-position))))
-    (web-mode-set-engine "php"))
-   ((and (string= web-mode-content-type "javascript")
-         (< (point) web-mode-chunk-length)
-         (eq (char-after (point-min)) ?\/)
-         (string-match-p "@jsx" (buffer-substring-no-properties
-                                 (line-beginning-position)
-                                 (line-end-position))))
-    (web-mode-set-content-type "jsx"))
-   ))
-
-(defun web-mode-on-after-change (beg end len)
-;;  (message "after-change: pos=%d, beg=%d, end=%d, len=%d, ocmd=%S, cmd=%S" (point) beg end len this-original-command this-command)
-  ;;  (backtrace)
-;;  (message "this-command=%S" this-command)
-  (when (eq this-original-command 'yank)
-    (setq web-mode-inhibit-fontification t))
-  (when (or (null web-mode-change-beg) (< beg web-mode-change-beg))
-    (setq web-mode-change-beg beg))
-  (when (or (null web-mode-change-end) (> end web-mode-change-end))
-    (setq web-mode-change-end end))
-  )
-
-(defun web-mode-complete ()
-  "Autocomple at point."
-  (interactive)
-  (let ((pos (point))
-        (char (char-before))
-        (chunk (buffer-substring-no-properties (- (point) 2) (point)))
-        (auto-closed   nil)
-        (auto-expanded nil)
-        (auto-paired   nil)
-        (auto-quoted   nil)
-        expanders)
-
-    ;;-- auto-closing
-    (when (and web-mode-enable-auto-closing
-               (>= pos 4)
-               (or (string= "</" chunk)
-                   (and (= web-mode-auto-close-style 2)
-                        (not (get-text-property pos 'part-side))
-                        (string-match-p "[[:alnum:]'\"]>" chunk)))
-               (not (get-text-property (- pos 2) 'block-side))
-               (web-mode-element-close))
-      (setq auto-closed t))
-
-    ;;-- auto-pairing
-    (when (and web-mode-enable-auto-pairing
-               (>= pos 4)
-               (not auto-closed))
-      (let ((i 0) expr after pos-end (l (length web-mode-auto-pairs)))
-        (setq pos-end (if (> (+ pos 32) (line-end-position))
-                          (line-end-position)
-                        (+ pos 10)))
-        (setq chunk (buffer-substring-no-properties (- pos 3) pos)
-              after (buffer-substring-no-properties pos pos-end))
-        (while (and (< i l) (not auto-paired))
-          (setq expr (elt web-mode-auto-pairs i)
-                i (1+ i))
-          ;;(message "chunk=%S expr=%S after=%S" chunk expr after)
-          (when (and (string= (car expr) chunk)
-                     (not (string-match-p (regexp-quote (cdr expr)) after)))
-            (setq auto-paired t)
-            (insert (cdr expr))
-            (if (string-match-p "|" (cdr expr))
-                (progn
-                  (search-backward "|")
-                  (delete-char 1))
-              (goto-char pos))
-            ) ;when
-          ) ;while
-        ) ;let
-      )
-
-    ;;-- auto-expanding
-    (when (and web-mode-enable-auto-expanding
-               (not auto-closed)
-               (not auto-paired)
-               (eq char ?\/)
-               (not (get-text-property (1- pos) 'tag-type))
-               (not (get-text-property (1- pos) 'part-side))
-               (not (get-text-property (1- pos) 'block-side))
-               (looking-back "\\(^\\|[[:punct:][:space:]>]\\)./"))
-      (setq expanders (append web-mode-expanders web-mode-extra-expanders))
-      (let ((i 0) pair (l (length expanders)))
-        (setq chunk (buffer-substring-no-properties (- pos 2) pos))
-        ;;(message "%S" chunk)
-        (while (and (< i l) (not auto-expanded))
-          (setq pair (elt expanders i)
-                i (1+ i))
-          (when (string= (car pair) chunk)
-            (setq auto-expanded t)
-            (delete-char -2)
-            (insert (cdr pair))
-            (when (string-match-p "|" (cdr pair))
-              (search-backward "|")
-              (delete-char 1))
-            ) ;when
-          ) ;while
-        ) ; let
-      )
-
-    ;;-- auto-quoting
-    (when (and web-mode-enable-auto-quoting
-               (>= pos 4)
-               (not (get-text-property pos 'block-side))
-               (not auto-closed)
-               (not auto-paired)
-               (not auto-expanded)
-               (get-text-property (- pos 2) 'tag-attr)
-               ;;(not (get-text-property pos 'part-element))
-               )
-      (cond
-       ((and (eq char ?\=)
-             (not (looking-at-p "[ ]*[\"']")))
-        (insert "\"\"")
-        (backward-char)
-        (setq auto-quoted t))
-       ((and (eq char ?\")
-             (not (looking-at-p "[ ]*[\"]")))
-        (insert "\"")
-        (backward-char)
-        (setq auto-quoted t))
-       ((and (eq char ?\")
-             (eq (char-after) ?\"))
-        (if (looking-back "=\"\"")
-            (progn
-              (delete-char 1)
-              (backward-char))
-          (delete-char 1)
-          ;;(message "%c" (char-after))
-          (if (eq (char-after) ?\s)
-              (forward-char)
-            (insert " "))
-          )
-        )
-       )
-      )
-
-    ;;--
-    (cond
-     ((or auto-closed auto-paired auto-expanded auto-quoted)
-      (when (and web-mode-change-end
-                 (>= (line-end-position) web-mode-change-end))
-        (setq web-mode-change-end (line-end-position)))
-      (list :auto-closed auto-closed
-            :auto-paired auto-paired
-            :auto-expanded auto-expanded
-            :auto-quoted auto-quoted))
-     (t
-      nil)
-     )
-
-    ))
-
-(defun web-mode-on-post-command ()
-  (let (ctx n char)
-
-    ;;(message "this-command=%S (%S)" this-command web-mode-expand-previous-state)
-    ;;(message "%S: %S %S" this-command web-mode-change-beg web-mode-change-end)
-
-    (when (and web-mode-expand-previous-state
-               (not (member this-command '(web-mode-mark-and-expand
-                                           er/expand-region))))
-      (when (eq this-command 'keyboard-quit)
-        (goto-char web-mode-expand-initial-pos))
-      (deactivate-mark)
-      (when web-mode-expand-initial-scroll
-        (set-window-start (selected-window) web-mode-expand-initial-scroll)
-        )
-      (setq web-mode-expand-previous-state nil
-            web-mode-expand-initial-pos nil
-            web-mode-expand-initial-scroll nil))
-
-    (when (member this-command '(yank))
-      (setq web-mode-inhibit-fontification nil)
-      ;;(web-mode-font-lock-highlight web-mode-change-end)
-      (when (and web-mode-change-beg web-mode-change-end)
-        (save-excursion
-          (font-lock-fontify-region web-mode-change-beg web-mode-change-end)
-          ))
-      )
-
-    (when (< (point) 16)
-      (web-mode-detect-content-type))
-
-    (when (and web-mode-enable-engine-detection
-               (or (null web-mode-engine) (string= web-mode-engine "none"))
-               (< (point) web-mode-chunk-length)
-               (web-mode-detect-engine))
-      (web-mode-on-engine-setted)
-      (web-mode-buffer-highlight))
-
-    (when (> (point) 1)
-      (setq char (char-before)))
-
-    (cond
-
-     ((null char)
-      )
-
-     ((and (>= (point) 3)
-           (member this-command '(self-insert-command))
-           (not (member (get-text-property (point) 'part-token) '(comment string))))
-      (setq ctx (web-mode-complete)))
-
-     ((and web-mode-enable-auto-opening
-           (member this-command '(newline electric-newline-and-maybe-indent))
-           (or (and (not (eobp))
-                    (eq (char-after) ?\<)
-                    (eq (get-text-property (point) 'tag-type) 'end)
-                    (looking-back ">\n[ \t]*")
-                    (setq n (length (match-string-no-properties 0)))
-                    (eq (get-text-property (- (point) n) 'tag-type) 'start)
-                    (string= (get-text-property (- (point) n) 'tag-name)
-                             (get-text-property (point) 'tag-name))
-                    )
-               (and (get-text-property (1- (point)) 'block-side)
-                    (string= web-mode-engine "php")
-                    (looking-back "<\\?php[ ]*\n")
-                    (looking-at-p "[ ]*\\?>"))))
-      (newline-and-indent)
-      (forward-line -1)
-      (indent-according-to-mode)
-      )
-     ) ;cond
-
-    (when (and web-mode-enable-auto-indentation
-               (member this-command '(self-insert-command))
-               (or (and ctx
-                        (or (plist-get ctx :auto-closed)
-                            (plist-get ctx :auto-expanded)))
-                   (and (> (point) (point-min))
-                        (get-text-property (1- (point)) 'tag-end)
-                        (get-text-property (line-beginning-position) 'tag-beg))))
-      (indent-according-to-mode)
-      (when (and web-mode-change-end (> web-mode-change-end (point-max)))
-        (message "post-command: enlarge web-mode-change-end")
-        (setq web-mode-change-end (point-max))
-        )
-      ) ; when auto-indent
-
-    (when web-mode-enable-current-element-highlight
-      (web-mode-highlight-current-element))
-
-    (when (and web-mode-enable-current-column-highlight
-               (not (web-mode-buffer-narrowed-p)))
-      (web-mode-column-show))
-
-    ;;(message "post-command (%S) (%S)" web-mode-change-end web-mode-change-end)
-
-    ))
-
-(defun web-mode-dom-apostrophes-replace ()
-  "Replace char(') with char(’) in the html contents of the buffer."
-  (interactive)
-  (save-excursion
-    (let ((min (point-min)) (max (point-max)))
-      (when mark-active
-        (setq min (region-beginning)
-              max (region-end))
-        (deactivate-mark))
-      (goto-char min)
-      (while (web-mode-content-rsf "\\([[:alpha:]]\\)'\\([[:alpha:]]\\)" max)
-        (replace-match "\\1’\\2"))
-      )))
-
-(defun web-mode-dom-entities-encode ()
-  (save-excursion
-    (let (regexp ms elt (min (point-min)) (max (point-max)))
-      (when mark-active
-        (setq min (region-beginning)
-              max (region-end))
-        (deactivate-mark))
-      (goto-char min)
-      (setq regexp "[")
-      (dolist (pair web-mode-html-entities)
-        (setq regexp (concat regexp (char-to-string (cdr pair))))
-        )
-      (setq regexp (concat regexp "]"))
-      (while (web-mode-content-rsf regexp max)
-        (setq elt (match-string-no-properties 0))
-        (setq elt (aref elt 0))
-        (setq elt (car (rassoc elt web-mode-html-entities)))
-        (replace-match (concat "&" elt ";"))
-        ) ;while
-      )))
-
-(defun web-mode-dom-entities-replace ()
-  "Replace html entities (e.g. &eacute; &#233; or &#x00E9; become é)"
-  (interactive)
-  (save-excursion
-    (let (ms pair elt (min (point-min)) (max (point-max)))
-      (when mark-active
-        (setq min (region-beginning)
-              max (region-end))
-        (deactivate-mark))
-      (goto-char min)
-      (while (web-mode-content-rsf "&\\([#]?[[:alnum:]]\\{2,8\\}\\);" max)
-        (setq elt nil)
-        (setq ms (match-string-no-properties 1))
-        (cond
-         ((not (eq (aref ms 0) ?\#))
-          (and (setq pair (assoc ms web-mode-html-entities))
-               (setq elt (cdr pair))
-               (setq elt (char-to-string elt))))
-         ((eq (aref ms 1) ?x)
-          (setq elt (substring ms 2))
-          (setq elt (downcase elt))
-          (setq elt (string-to-number elt 16))
-          (setq elt (char-to-string elt)))
-         (t
-          (setq elt (substring ms 1))
-          (setq elt (char-to-string (string-to-number elt))))
-         ) ;cond
-        (when elt (replace-match elt))
-        ) ;while
-      )))
-
-(defun web-mode-dom-xml-replace ()
-  "Replace &, > and < in html content."
-  (interactive)
-  (save-excursion
-    (let (expr (min (point-min)) (max (point-max)))
-      (when mark-active
-        (setq min (region-beginning)
-              max (region-end))
-        (deactivate-mark))
-      (goto-char min)
-      (while (web-mode-content-rsf "[&<>]" max)
-        (replace-match (cdr (assq (char-before) web-mode-xml-chars)) t t))
-      )))
-
-(defun web-mode-dom-quotes-replace ()
-  "Replace dumb quotes."
-  (interactive)
-  (save-excursion
-    (let (expr (min (point-min)) (max (point-max)))
-      (when mark-active
-        (setq min (region-beginning)
-              max (region-end))
-        (deactivate-mark))
-      (goto-char min)
-      (setq expr (concat (car web-mode-smart-quotes) "\\2" (cdr web-mode-smart-quotes)))
-      (while (web-mode-content-rsf "\\(\"\\)\\(.\\{1,200\\}\\)\\(\"\\)" max)
-        (replace-match expr)
-        ) ;while
-      )))
-
-(defun web-mode-dom-xpath (&optional pos)
-  "Display html path."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (goto-char pos)
-    (let (path)
-      (while (web-mode-element-parent)
-        (setq path (cons (get-text-property (point) 'tag-name) path))
-        )
-      (message "/%s" (mapconcat 'identity path "/"))
-      )))
-
-(defun web-mode-block-ends-with (regexp &optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (goto-char pos)
-    (save-match-data
-      (if (stringp regexp)
-          (and (web-mode-block-end)
-               (progn (backward-char) t)
-               (web-mode-block-skip-blank-backward)
-               (progn (forward-char) t)
-               (looking-back regexp))
-        (let ((pair regexp)
-              (block-beg (web-mode-block-beginning-position pos))
-              (block-end (web-mode-block-end-position pos)))
-          (and (web-mode-block-end)
-               (web-mode-block-sb (car pair) block-beg)
-               (not (web-mode-sf (cdr pair) block-end)))
-          ) ;let
-        ) ;if
-      )))
-
-(defun web-mode-block-token-starts-with (regexp &optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (and (goto-char pos)
-         (web-mode-block-token-beginning)
-         (skip-chars-forward "[\"']")
-         (looking-at regexp))
-    ))
-
-(defun web-mode-block-starts-with (regexp &optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (and (web-mode-block-beginning)
-         (web-mode-block-skip-blank-forward)
-         (looking-at regexp))
-    ))
-
-(defun web-mode-block-skip-blank-backward (&optional pos)
-  (unless pos (setq pos (point)))
-  (let ((continue t))
-    (goto-char pos)
-    (while continue
-      (if (and (get-text-property (point) 'block-side)
-               (not (bobp))
-               (or (member (char-after) '(?\s ?\n))
-                   (member (get-text-property (point) 'block-token)
-                           '(delimiter-beg delimiter-end comment))))
-          (backward-char)
-        (setq continue nil))
-      ) ;while
-    (point)))
-
-(defun web-mode-block-skip-blank-forward (&optional pos)
-  (unless pos (setq pos (point)))
-  (let ((continue t))
-    (goto-char pos)
-    (while continue
-      (if (and (get-text-property (point) 'block-side)
-               (or (member (char-after) '(?\s ?\n ?\t))
-                   (member (get-text-property (point) 'block-token)
-                           '(delimiter-beg delimiter-end comment))))
-          (forward-char)
-        (setq continue nil))
-      ) ;while
-;;    (message "pt=%S" (point))
-    (point)))
-
-(defun web-mode-tag-attributes-sort (&optional pos)
-  "Sort the attributes inside the current html tag."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (let (attrs (continue t) min max tag-beg tag-end attr attr-name attr-beg attr-end indent indentation sorter ins)
-      (if (not (member (get-text-property pos 'tag-type) '(start void)))
-          nil
-        (setq tag-beg (web-mode-tag-beginning-position pos)
-              tag-end (web-mode-tag-end-position))
-;;        (message "%S %S" tag-beg tag-end)
-        (goto-char tag-beg)
-        (while continue
-          (if (or (not (web-mode-attribute-next))
-                  (>= (point) tag-end))
-              (setq continue nil)
-            ;;(message "attr=%S" (point))
-            (setq attr-beg (web-mode-attribute-beginning-position)
-                  attr-end (1+ (web-mode-attribute-end-position)))
-            (when (null min)
-              (setq min attr-beg))
-            (setq max attr-end)
-            (goto-char attr-beg)
-            (setq attr (buffer-substring-no-properties attr-beg attr-end))
-            (if (string-match "^\\([[:alnum:]-]+\\)=" attr)
-                (setq attr-name (match-string-no-properties 1 attr))
-              (setq attr-name attr))
-            (setq indent (looking-back "^[ \t]*"))
-            (setq attrs (append attrs (list (list attr-beg attr-end attr-name attr indent))))
-            ) ;if
-          ) ;while
-        ) ;if in tag
-      (when attrs
-        (setq sorter (function
-                      (lambda (elt1 elt2)
-                        (string< (nth 2 elt1) (nth 2 elt2))
-                        )))
-        (setq attrs (sort attrs sorter))
-        (delete-region (1- min) max)
-        (setq ins "")
-        (dolist (elt attrs)
-          (if (and (nth 4 elt) (> (length ins) 1))
-              (setq ins (concat ins "\n"))
-            (setq ins (concat ins " ")))
-          (setq ins (concat ins (nth 3 elt)))
-          )
-        (goto-char (1- min))
-        (insert ins)
-        (web-mode-tag-beginning)
-        (setq min (line-beginning-position))
-        (web-mode-tag-end)
-        (setq max (line-end-position))
-        (indent-region min max)
-        )
-      ;;(message "attrs=%S" attrs)
-      )))
-
-(defun web-mode-attribute-insert ()
-  "Insert an attribute inside current tag."
-  (interactive)
-  (let (attr attr-name attr-value)
-    (cond
-     ((not (eq (get-text-property (point) 'tag-type) 'start))
-      (message "attribute-insert ** invalid context **"))
-     ((not (and (setq attr-name (read-from-minibuffer "Attribute name? "))
-                (> (length attr-name) 0)))
-      (message "attribute-insert ** failure **"))
-     (t
-      (setq attr (concat " " attr-name))
-      (when (setq attr-value (read-from-minibuffer "Attribute value? "))
-        (setq attr (concat attr "=\"" attr-value "\"")))
-      (web-mode-tag-end)
-      (re-search-backward "/?>")
-      (insert attr)
-      )
-     ) ;cond
-    ))
-
-(defun web-mode-attribute-transpose (&optional pos)
-  "Transpose the current html attribute."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (let (ret attr-beg attr-end next-beg next-end tag-end)
-    (when (and (get-text-property pos 'tag-attr)
-               (setq next-beg (web-mode-attribute-next-position pos))
-               (setq next-end (web-mode-attribute-end-position next-beg))
-               (setq tag-end (web-mode-tag-end-position pos))
-               (> tag-end next-end))
-      (setq attr-beg (web-mode-attribute-beginning-position pos)
-            attr-end (web-mode-attribute-end-position pos))
-      ;;      (message "%S %S - %S %S" attr-beg attr-end next-beg next-end)
-      (transpose-regions attr-beg (1+ attr-end) next-beg (1+ next-end))
-      )))
-
-(defun web-mode-attribute-select (&optional pos)
-  "Select the current html attribute."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (if (null (get-text-property pos 'tag-attr))
-      nil
-    (goto-char pos)
-    (web-mode-attribute-beginning)
-    (set-mark (point))
-    (web-mode-attribute-end)
-    (point)
-    ))
-
-(defun web-mode-attribute-kill (&optional arg)
-  "Kill the current html attribute."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (while (>= arg 1)
-    (setq arg (1- arg))
-    (web-mode-attribute-select)
-    (when mark-active
-      (let ((beg (region-beginning)) (end (region-end)))
-        (save-excursion
-          (goto-char end)
-          (when (looking-at "[ \n\t]*")
-            (setq end (+ end (length (match-string-no-properties 0)))))
-          ) ;save-excursion
-        (kill-region beg end)
-        ) ;let
-      ) ;when
-    ) ;while
-  )
-
-(defun web-mode-block-close (&optional pos)
-  "Close the first unclosed control block."
-  (interactive)
-  (unless pos (setq pos (point)))
-  (let ((continue t)
-        (h (make-hash-table :test 'equal)) ctx ctrl n closing-block)
-    (save-excursion
-      (while (and continue (web-mode-block-previous))
-        (when (setq ctx (web-mode-block-is-control (point)))
-          (setq ctrl (car ctx))
-          (setq n (gethash ctrl h 0))
-          (if (cdr ctx)
-              (puthash ctrl (1+ n) h)
-            (puthash ctrl (1- n) h))
-          (when (> (gethash ctrl h) 0)
-            (setq continue nil))
-          )
-        ) ;while
-      ) ;save-excursion
-    (when (and (null continue)
-               (setq closing-block (web-mode-closing-block ctrl)))
-      (insert closing-block)
-      (indent-according-to-mode)
-      ;;      (indent-for-tab-command)
-      )
-    ))
-
-(defun web-mode-closing-block (type)
-  (cond
-   ((string= web-mode-engine "php")       (concat "<?php end" type "; ?>"))
-   ((string= web-mode-engine "django")    (concat "{% end" type " %}"))
-   ((string= web-mode-engine "ctemplate") (concat "{{/" type "}}"))
-   ((string= web-mode-engine "blade")
-    (if (string= type "section")
-        (concat "@show")
-      (concat "@end" type)))
-   ((string= web-mode-engine "dust")      (concat "{/" type "}"))
-   ((string= web-mode-engine "mako")      (concat "% end" type))
-   ((string= web-mode-engine "closure")   (concat "{/" type "}"))
-   ((string= web-mode-engine "smarty")    (concat "{/" type "}"))
-   ((string= web-mode-engine "underscore")        "<% } %>")
-   ((string= web-mode-engine "lsp")               "<% ) %>")
-   ((string= web-mode-engine "erb")               "<% } %>")
-   ((string= web-mode-engine "erb")               "<% end %>")
-   ((string= web-mode-engine "go")                "{{end}}")
-   ((string= web-mode-engine "velocity")          "#end")
-   ((string= web-mode-engine "template-toolkit")  "[% end %]")
-   ((member web-mode-engine '("asp" "jsp"))
-    (if (string-match-p ":" type) (concat "</" type ">") "<% } %>")
-    )
-   (t nil)
-   ;;(t (cdr (assoc type web-mode-closing-blocks)))
-   ) ;cond
-  )
-
-;;---- POSITION ----------------------------------------------------------------
-
-(defun web-mode-comment-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (car (web-mode-comment-boundaries pos)))
-
-(defun web-mode-comment-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cdr (web-mode-comment-boundaries pos)))
-
-(defun web-mode-opening-paren-position (&optional pos limit)
-  (save-restriction
-    (unless pos (setq pos (point)))
-    (unless limit (setq limit nil))
-    (goto-char pos)
-    (let* ((n -1)
-           (block-side (and (get-text-property pos 'block-side)
-                            (not (string= web-mode-engine "razor"))))
-           (paren (char-after))
-           (pairs '((?\) . "[)(]")
-                    (?\] . "[\]\[]")
-                    (?\} . "[}{]")
-                    (?\> . "[><]")))
-           (regexp (cdr (assoc paren pairs)))
-           (continue (not (null regexp)))
-           (counter 0))
-      (while (and continue (re-search-backward regexp limit t))
-        (cond
-         ((> (setq counter (1+ counter)) 500)
-          (message "opening-paren-position ** warning **")
-          (setq continue nil))
-         ((or (web-mode-is-comment-or-string)
-              (and block-side (not (get-text-property (point) 'block-side))))
-          )
-         ((eq (char-after) paren)
-          (setq n (1- n)))
-         (t
-          (setq n (1+ n))
-          (setq continue (not (= n 0))))
-         )
-        )
-      (if (= n 0) (point) nil)
-      )))
-
-(defun web-mode-closing-paren-position (&optional pos limit)
-  (save-excursion
-    (unless pos (setq pos (point)))
-    (unless limit (setq limit nil))
-    (goto-char pos)
-    (let* ((n 0)
-           (block-side (and (get-text-property pos 'block-side)
-                            (not (string= web-mode-engine "razor"))))
-           (paren (char-after))
-           (pairs '((?\( . "[)(]")
-                    (?\[ . "[\]\[]")
-                    (?\{ . "[}{]")
-                    (?\< . "[><]")))
-           (regexp (cdr (assoc paren pairs)))
-           (continue (not (null regexp))))
-      (while (and continue (re-search-forward regexp limit t))
-        (cond
-         ((or (web-mode-is-comment-or-string (1- (point)))
-              (and block-side (not (get-text-property (point) 'block-side))))
-          ;;(message "pt=%S" (point))
-          )
-         ((eq (char-before) paren)
-          (setq n (1+ n)))
-         (t
-          (setq n (1- n))
-          (setq continue (not (= n 0)))
-          )
-         ) ;cond
-        ) ;while
-      (if (= n 0) (1- (point)) nil)
-      )))
-
-(defun web-mode-closing-delimiter-position (delimiter &optional pos limit)
-  (unless pos (setq pos (point)))
-  (unless limit (setq limit nil))
-  (save-excursion
-    (goto-char pos)
-    (setq pos nil)
-    (let ((continue t))
-      (while (and continue (re-search-forward delimiter limit t))
-        (setq continue nil
-              pos (1- (point)))
-        ) ;while
-      pos)))
-
-(defun web-mode-tag-match-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (web-mode-tag-match pos)
-    (if (= pos (point)) nil (point))))
-
-(defun web-mode-tag-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (beg)
-    (cond
-     ((get-text-property pos 'tag-beg)
-      (setq beg pos))
-     ((and (> pos 1) (get-text-property (1- pos) 'tag-beg))
-      (setq beg (1- pos)))
-     ((get-text-property pos 'tag-type)
-      (setq beg (1- (previous-single-property-change pos 'tag-beg)))
-      (when (not (get-text-property beg 'tag-beg))
-        (setq beg nil)))
-     (t
-      (setq beg nil))
-     ) ;cond
-    beg))
-
-(defun web-mode-tag-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (end)
-    (cond
-     ((null pos)
-      (setq end nil))
-     ((get-text-property pos 'tag-end)
-      (setq end pos))
-     ((get-text-property pos 'tag-type)
-      (setq end (next-single-property-change pos 'tag-end))
-      (when (not (get-text-property end 'tag-end))
-        (setq end nil)))
-     (t
-      (setq end nil))
-     ) ;cond
-    end))
-
-(defun web-mode-tag-next-position (&optional pos limit)
-  (unless pos (setq pos (point)))
-  (unless limit (setq limit (point-max)))
-  (save-excursion
-    (goto-char pos)
-    (cond
-     ((eobp) nil)
-     (t
-      (when (get-text-property pos 'tag-beg) (setq pos (1+ pos)))
-      (setq pos (next-single-property-change pos 'tag-beg))
-      (if (and pos (<= pos limit)) pos nil))
-     )
-    ))
-
-(defun web-mode-tag-previous-position (&optional pos limit)
-  (unless pos (setq pos (point)))
-  (unless limit (setq limit (point-min)))
-  (save-excursion
-    (goto-char pos)
-    (cond
-     ((bobp) nil)
-     (t
-      (when (get-text-property pos 'tag-beg) (setq pos (1- pos)))
-      (web-mode-go (previous-single-property-change pos 'tag-beg) -1))
-     )
-    ))
-
-(defun web-mode-attribute-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((null (get-text-property pos 'tag-attr))
-    nil)
-   ((null (get-text-property (1- pos) 'tag-attr))
-    pos)
-   (t
-    (previous-single-property-change pos 'tag-attr))
-   ))
-
-(defun web-mode-attribute-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (let (end)
-    (cond
-     ((null pos)
-      (setq end nil))
-     ((get-text-property pos 'tag-attr-end)
-      (setq end pos))
-     ((get-text-property pos 'tag-attr)
-      (setq end (next-single-property-change pos 'tag-attr-end))
-      (when (not (get-text-property end 'tag-attr-end))
-        (setq end nil)))
-     (t
-      (setq end nil))
-     ) ;cond
-    end))
-
-(defun web-mode-attribute-next-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (let ((continue t))
-    (while continue
-      (setq pos (next-single-property-change pos 'tag-attr))
-      (cond
-       ((null pos)
-        (setq continue nil
-              pos nil))
-       ((get-text-property pos 'tag-attr)
-        (setq continue nil))
-       )
-      ) ;while
-    pos))
-
-(defun web-mode-attribute-previous-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (let ((continue t))
-    (while continue
-      (setq pos (previous-single-property-change pos 'tag-attr))
-      (cond
-       ((null pos)
-        (setq continue nil
-              pos nil))
-       ((get-text-property pos 'tag-attr)
-        (setq continue nil))
-       )
-      ) ;while
-    (when pos (setq pos (web-mode-attribute-beginning-position pos)))
-    pos))
-
-(defun web-mode-element-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((null (get-text-property pos 'tag-type))
-    (setq pos (web-mode-element-parent-position)))
-   ((eq (get-text-property pos 'tag-type) 'end)
-    (setq pos (web-mode-tag-match-position pos))
-    (setq pos (if (get-text-property pos 'tag-beg) pos nil)))
-   ((member (get-text-property pos 'tag-type) '(start void))
-    (setq pos (web-mode-tag-beginning-position pos)))
-   (t
-    (setq pos nil))
-   ) ;cond
-  pos)
-
-(defun web-mode-element-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((null (get-text-property pos 'tag-type))
-    (setq pos (web-mode-element-parent-position pos))
-    (when pos
-      (setq pos (web-mode-tag-match-position pos))
-      (when pos (setq pos (web-mode-tag-end-position pos)))
-      )
-    )
-   ((member (get-text-property pos 'tag-type) '(end void))
-    (setq pos (web-mode-tag-end-position pos))
-    )
-   ((member (get-text-property pos 'tag-type) '(start))
-    (setq pos (web-mode-tag-match-position pos))
-    (when pos (setq pos (web-mode-tag-end-position pos))))
-   (t
-    (setq pos nil))
-   ) ;cond
-  pos)
-
-(defun web-mode-element-child-position (&optional pos)
-  (save-excursion
-    (let (child close)
-      (unless pos (setq pos (point)))
-      (goto-char pos)
-      (cond
-       ((eq (get-text-property pos 'tag-type) 'start)
-        (web-mode-tag-match)
-        (setq close (point))
-        (goto-char pos)
-        )
-       ((eq (get-text-property pos 'tag-type) 'void)
-        )
-       ((eq (get-text-property pos 'tag-type) 'end)
-        (web-mode-tag-beginning)
-        (setq close (point))
-        (web-mode-tag-match)
-        )
-       ((web-mode-element-parent-position pos)
-        (setq pos (point))
-        (web-mode-tag-match)
-        (setq close (point))
-        (goto-char pos)
-        )
-       ) ;cond
-      (when (and close
-                 (web-mode-element-next)
-                 (< (point) close))
-        (setq child (point))
-        )
-      child)))
-
-(defun web-mode-element-parent-position (&optional pos)
-  (let (n tag-type tag-name (continue t) (tags (make-hash-table :test 'equal)))
-    (save-excursion
-      (if pos (goto-char pos))
-      (while (and continue (web-mode-tag-previous))
-        (setq pos (point)
-              tag-type (get-text-property pos 'tag-type)
-              tag-name (get-text-property pos 'tag-name)
-              n (gethash tag-name tags 0))
-        (when (member tag-type '(end start))
-          (if (eq tag-type 'end)
-              (puthash tag-name (1- n) tags)
-            (puthash tag-name (1+ n) tags)
-            (when (= n 0) (setq continue nil))
-            ) ;if
-          ) ;when
-        ) ;while
-      ) ;save-excursion
-    (if (null continue) pos nil)
-    ))
-
-(defun web-mode-element-previous-position (&optional pos limit)
-  (unless pos (setq pos (point)))
-  (unless limit (setq limit (point-min)))
-  (save-excursion
-    (goto-char pos)
-    (let ((continue (not (bobp)))
-          (props '(start void comment)))
-      (while continue
-        (setq pos (web-mode-tag-previous))
-        (cond
-         ((or (null pos) (< (point) limit))
-          (setq continue nil
-                pos nil))
-         ((member (get-text-property (point) 'tag-type) props)
-          (setq continue nil))
-         )
-        ) ;while
-      pos)))
-
-(defun web-mode-element-next-position (&optional pos limit)
-  (unless pos (setq pos (point)))
-  (unless limit (setq limit (point-max)))
-  (save-excursion
-    (goto-char pos)
-    (let ((continue (not (eobp)))
-          (props '(start void comment)))
-      (while continue
-        (setq pos (web-mode-tag-next))
-        (cond
-         ((or (null pos) (> (point) limit))
-          (setq continue nil
-                pos nil))
-         ((member (get-text-property (point) 'tag-type) props)
-          (setq continue nil))
-         )
-        ) ;while
-;;      (message "pos=%S" pos)
-      pos)))
-
-(defun web-mode-part-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((member web-mode-content-type web-mode-part-content-types)
-    (setq pos (point-max)))
-   ((not (get-text-property pos 'part-side))
-    (setq pos nil))
-   ((= pos (point-max))
-    (setq pos nil))
-   ((not (get-text-property (1+ pos) 'part-side))
-    pos)
-   (t
-    (setq pos (next-single-property-change pos 'part-side)))
-   ) ;cond
-  pos)
-
-(defun web-mode-part-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((member web-mode-content-type web-mode-part-content-types)
-    (setq pos (point-min)))
-   ((not (get-text-property pos 'part-side))
-    (setq pos nil))
-   ((= pos (point-min))
-    (setq pos nil))
-   ((not (get-text-property (1- pos) 'part-side))
-    pos)
-   (t
-    (setq pos (previous-single-property-change pos 'part-side)))
-   ) ;cond
-  pos)
-
-(defun web-mode-part-next-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((and (= pos (point-min)) (get-text-property pos 'part-side))
-    )
-   ((not (get-text-property pos 'part-side))
-    (setq pos (next-single-property-change pos 'part-side)))
-   ((and (setq pos (web-mode-part-end-position pos)) (>= pos (point-max)))
-    (setq pos nil))
-   ((and (setq pos (1+ pos)) (not (get-text-property pos 'part-side)))
-    (setq pos (next-single-property-change pos 'part-side)))
-   ) ;cond
-  pos)
-
-(defun web-mode-block-match-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (save-excursion
-    (web-mode-block-match pos)
-    (if (= pos (point)) nil (point))))
-
-(defun web-mode-block-control-previous-position (type &optional pos)
-  (unless pos (setq pos (point)))
-  (let ((continue t) controls)
-    (while continue
-      (setq pos (web-mode-block-previous-position pos))
-      (cond
-       ((null pos)
-        (setq continue nil
-              pos nil))
-       ((and (setq controls (web-mode-block-controls-get pos))
-             (eq (car (car controls)) type))
-        (setq continue nil))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-block-opening-paren-position (pos limit)
-  (save-excursion
-    (goto-char pos)
-    (let (c
-          n
-          pt
-          (continue t)
-          (pairs '((")" . "(")
-                   ("]" . "[")
-                   ("}" . "{")))
-          (h (make-hash-table :test 'equal))
-          (regexp "[\]\[)(}{]"))
-      (while (and continue (re-search-backward regexp limit t))
-        (unless (web-mode-is-comment-or-string)
-          (setq c (string (char-after)))
-          (cond
-           ((member c '("(" "{" "["))
-            (setq n (gethash c h 0))
-            (if (= n 0)
-                (setq continue nil
-                      pt (point))
-              (puthash c (1+ n) h)
-              ))
-           (t
-            (setq c (cdr (assoc c pairs)))
-            (setq n (gethash c h 0))
-            (puthash c (1- n) h))
-           ) ;cond
-          ) ;unless
-        ) ;while
-      pt)))
-
-(defun web-mode-block-code-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (when (and (setq pos (web-mode-block-beginning-position pos))
-             (eq (get-text-property pos 'block-token) 'delimiter-beg))
-    (setq pos (next-single-property-change pos 'block-token)))
-  pos)
-
-(defun web-mode-block-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((or (and (get-text-property pos 'block-side) (= pos (point-min)))
-        (get-text-property pos 'block-beg))
-    )
-   ((and (> pos (point-min)) (get-text-property (1- pos) 'block-beg))
-    (setq pos (1- pos)))
-   ((get-text-property pos 'block-side)
-    (setq pos (previous-single-property-change pos 'block-beg))
-    (setq pos (if (and pos (> pos (point-min))) (1- pos) (point-min))))
-   (t
-    (setq pos nil))
-   ) ;cond
-  pos)
-
-(defun web-mode-block-string-beginning-position (pos &optional block-beg)
-  (unless pos (setq pos (point)))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (let (char (continue (not (null pos))))
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((< pos block-beg)
-        (setq continue nil
-              pos block-beg))
-       ((and (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos))
-        ;;(setq pos (1- pos))
-        )
-       ((member char '(?\) ?\]))
-        (setq pos (web-mode-block-opening-paren-position pos block-beg))
-        (setq pos (1- pos))
-        )
-       ((member char '(?\( ?\= ?\[ ?\? ?\: ?\; ?\, ?\`))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0))))
-        )
-       ((web-mode-looking-back "\\<\\(return\\|echo\\|include\\|print\\)[ \n\t]*" pos)
-        (setq ;;pos (point)
-              continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-block-statement-beginning-position (pos &optional block-beg)
-  (unless pos (setq pos (point)))
-  (setq pos (1- pos))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (let (char (continue (not (null pos))))
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((< pos block-beg)
-        (setq continue nil
-              pos block-beg))
-       ((and (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos))
-        ;;(setq pos (1- pos))
-        )
-       ((member char '(?\) ?\] ?\}))
-        (setq pos (web-mode-block-opening-paren-position pos block-beg))
-        (setq pos (1- pos))
-        )
-       ((member char '(?\( ?\[ ?\{ ?\=))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0))))
-        )
-       ((web-mode-looking-back "\\<\\(return\\|echo\\|include\\|print\\)[ \n\t]*" pos)
-        (setq ;;pos (point)
-              continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-block-args-beginning-position (pos &optional block-beg)
-  ;;(unless pos (setq pos (point)))
-  (unless pos (setq pos (point)))
-  (setq pos (1- pos)) ; #0512
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (let (char (continue (not (null pos))))
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((< pos block-beg)
-        (message "block-args-beginning-position ** failure **")
-        (setq continue nil
-              pos block-beg))
-       ((and (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos)))
-       ((member char '(?\) ?\] ?\}))
-        (setq pos (web-mode-opening-paren-position pos block-beg))
-        (setq pos (1- pos)))
-       ((member char '(?\( ?\[ ?\{))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))))
-       ((and (string= web-mode-engine "php")
-             (web-mode-looking-back "\\<\\(extends\\|implements\\)[ \n\t]*" pos))
-        (setq continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-block-calls-beginning-position (pos &optional block-beg)
-  (unless pos (setq pos (point)))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (let (char (continue (not (null pos))))
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((< pos block-beg)
-        (message "block-calls-beginning-position ** failure **")
-        (setq continue nil
-              pos block-beg))
-       ((and (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos)))
-       ((member char '(?\) ?\]))
-        (setq pos (web-mode-opening-paren-position pos block-beg))
-        (setq pos (1- pos)))
-       ((member char '(?\( ?\[ ?\{ ?\} ?\= ?\? ?\: ?\; ?\,))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))))
-       ((web-mode-looking-back "\\(return\\|else\\)[ \n\t]*" pos)
-        (setq ;;pos (point)
-              continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-javascript-string-beginning-position (pos &optional reg-beg)
-  (unless pos (setq pos (point)))
-  (let ((char nil)
-        (blockside (get-text-property pos 'block-side))
-        (i 0)
-        (continue (not (null pos))))
-    (unless reg-beg
-      (if blockside
-          (setq reg-beg (web-mode-block-beginning-position pos))
-        (setq reg-beg (web-mode-part-beginning-position pos)))
-      )
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((> (setq i (1+ i)) 20000)
-        (message "javascript-string-beginning-position ** warning (%S) **" pos)
-        (setq continue nil
-              pos nil))
-       ((null pos)
-        (message "javascript-string-beginning-position ** invalid pos **")
-        (setq continue nil))
-       ((< pos reg-beg)
-        (message "javascript-string-beginning-position ** failure **")
-        (setq continue nil
-              pos reg-beg))
-       ((and blockside
-             (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos)))
-       ((and (not blockside)
-             (member (get-text-property pos 'part-token) '(string comment))
-             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
-        (setq pos (web-mode-part-token-beginning-position pos)))
-       ((and (not blockside)
-             (get-text-property pos 'block-side))
-        (when (setq pos (web-mode-block-beginning-position pos))
-          (setq pos (1- pos))))
-       ((member char '(?\) ?\] ?\}))
-        (setq pos (web-mode-opening-paren-position pos reg-beg))
-        (setq pos (1- pos)))
-       ((member char '(?\( ?\{ ?\[ ?\= ?\? ?\: ?\; ?\, ?\& ?\|))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))))
-       ((web-mode-looking-back "\\(return\\)[ \n\t]*" pos)
-        (setq continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-javascript-statement-beginning-position (pos &optional reg-beg)
-  (unless pos (setq pos (point)))
-  (setq pos (1- pos))
-  (let ((char nil)
-        (blockside (get-text-property pos 'block-side))
-        (i 0)
-        (continue (not (null pos))))
-    (unless reg-beg
-      (if blockside
-          (setq reg-beg (web-mode-block-beginning-position pos))
-        (setq reg-beg (web-mode-part-beginning-position pos)))
-      )
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((> (setq i (1+ i)) 20000)
-        (message "javascript-statement-beginning-position ** warning (%S) **" pos)
-        (setq continue nil
-              pos nil))
-       ((null pos)
-        (message "javascript-statement-beginning-position ** invalid pos **")
-        (setq continue nil))
-       ((< pos reg-beg)
-        (message "javascript-statement-beginning-position ** failure **")
-        (setq continue nil
-              pos reg-beg))
-       ((and blockside
-             (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos)))
-       ((and (not blockside)
-             (member (get-text-property pos 'part-token) '(string comment))
-             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
-        (setq pos (web-mode-part-token-beginning-position pos)))
-       ((and (not blockside)
-             (get-text-property pos 'block-side))
-        (when (setq pos (web-mode-block-beginning-position pos))
-          (setq pos (1- pos))))
-       ((member char '(?\) ?\] ?\}))
-        (setq pos (web-mode-opening-paren-position pos reg-beg))
-        (setq pos (1- pos)))
-       ((member char '(?\( ?\{ ?\[ ?\=))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))))
-       ((web-mode-looking-back "\\<\\(return\\)[ \n\t]*" pos)
-        (setq continue nil)
-        (web-mode-looking-at "[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-javascript-args-beginning-position (pos &optional reg-beg)
-  (unless pos (setq pos (point)))
-  (setq pos (1- pos))
-  (let ((char nil)
-        (blockside (get-text-property pos 'block-side))
-        (i 0)
-        (continue (not (null pos))))
-    (unless reg-beg
-      (if blockside
-          (setq reg-beg (web-mode-block-beginning-position pos))
-        (setq reg-beg (web-mode-part-beginning-position pos)))
-      )
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((> (setq i (1+ i)) 20000)
-        (message "javascript-args-beginning-position ** warning (%S) **" pos)
-        (setq continue nil
-              pos nil))
-       ((null pos)
-        (message "javascript-args-beginning-position ** invalid pos **")
-        (setq continue nil))
-       ((< pos reg-beg)
-        (message "javascript-args-beginning-position ** failure **")
-        (setq continue nil
-              pos reg-beg))
-       ((and blockside
-             (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos)))
-       ((and (not blockside)
-             (member (get-text-property pos 'part-token) '(string comment))
-             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
-        (setq pos (web-mode-part-token-beginning-position pos)))
-       ((and (not blockside)
-             (get-text-property pos 'block-side))
-        (when (setq pos (web-mode-block-beginning-position pos))
-          (setq pos (1- pos)))
-        )
-       ((member char '(?\) ?\] ?\}))
-        (when (setq pos (web-mode-opening-paren-position pos reg-beg))
-          (setq pos (1- pos))))
-       ((member char '(?\( ?\[ ?\{))
-;;        (web-mode-looking-at ".[ \t\n]*" pos)
-        (web-mode-looking-at ".[ ]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))
-              continue nil)
-;;        (message "=>%S" pos)
-        )
-       ((web-mode-looking-back "\\<\\(var\\|let\\|return\\|const\\)[ \n\t]+" pos)
-;;        (web-mode-looking-at "[ \t\n]*" pos)
-        (web-mode-looking-at "[ \t]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))
-              continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    ;;(message "=%S" pos)
-    pos))
-
-(defun web-mode-javascript-calls-beginning-position (pos &optional reg-beg)
-  (unless pos (setq pos (point)))
-  (let ((char nil)
-        (blockside (get-text-property pos 'block-side))
-        (i 0)
-        (continue (not (null pos))))
-    (unless reg-beg
-      (if blockside
-          (setq reg-beg (web-mode-block-beginning-position pos))
-        (setq reg-beg (web-mode-part-beginning-position pos)))
-      )
-    (while continue
-      (setq char (char-after pos))
-      (cond
-       ((> (setq i (1+ i)) 20000)
-        (message "javascript-calls-beginning-position ** warning (%S) **" pos)
-        (setq continue nil
-              pos nil))
-       ((null pos)
-        (message "javascript-calls-beginning-position ** invalid pos **")
-        (setq continue nil))
-       ((< pos reg-beg)
-        ;;(message "pos(%S) reg-beg(%S)" pos reg-beg)
-        ;;(message "javascript-calls-beginning-position ** failure **")
-        (setq continue nil
-              pos reg-beg))
-       ((and blockside
-             (member (get-text-property pos 'block-token) '(string comment))
-             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
-        (setq pos (web-mode-block-token-beginning-position pos)))
-       ((and (not blockside)
-             (member (get-text-property pos 'part-token) '(string comment))
-             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
-        (setq pos (web-mode-part-token-beginning-position pos)))
-       ((and (not blockside)
-             (get-text-property pos 'block-side))
-        (when (setq pos (web-mode-block-beginning-position pos))
-          (setq pos (1- pos))))
-       ((member char '(?\) ?\] ?\}))
-        (when (setq pos (web-mode-opening-paren-position pos reg-beg))
-          (setq pos (1- pos))))
-       ((member char '(?\( ?\{ ?\[ ?\= ?\? ?\: ?\; ?\, ?\& ?\|))
-        (setq continue nil)
-        (web-mode-looking-at ".[ \t\n]*" pos)
-        (setq pos (+ pos (length (match-string-no-properties 0)))))
-       ((web-mode-looking-back "\\<\\(return\\|else\\)[ \n\t]*" pos)
-        (setq continue nil))
-       (t
-        (setq pos (1- pos)))
-       ) ;cond
-      ) ;while
-    pos))
-
-(defun web-mode-part-token-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((not (get-text-property pos 'part-token))
-    nil)
-   ((or (= pos (point-min))
-        (and (> pos (point-min))
-             (not (get-text-property (1- pos) 'part-token))))
-    pos)
-   (t
-    (setq pos (previous-single-property-change pos 'part-token))
-    (if (and pos (> pos (point-min))) pos (point-min)))
-   ))
-
-(defun web-mode-part-token-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((not (get-text-property pos 'part-token))
-    nil)
-   ((or (= pos (point-max))
-        (not (get-text-property (1+ pos) 'part-token)))
-    pos)
-   (t
-    (1- (next-single-property-change pos 'part-token)))
-   ))
-
-(defun web-mode-block-token-beginning-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((not (get-text-property pos 'block-token))
-    nil)
-   ((or (= pos (point-min))
-        (and (> pos (point-min))
-             (not (get-text-property (1- pos) 'block-token))))
-    pos)
-   (t
-    (setq pos (previous-single-property-change pos 'block-token))
-    (if (and pos (> pos (point-min))) pos (point-min)))
-   ))
-
-(defun web-mode-block-token-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((not (get-text-property pos 'block-token))
-    nil)
-   ((or (= pos (point-max))
-        (not (get-text-property (1+ pos) 'block-token)))
-    pos)
-   (t
-    (1- (next-single-property-change pos 'block-token)))
-   ))
-
-(defun web-mode-block-code-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (setq pos (web-mode-block-end-position pos))
-  (cond
-   ((not pos)
-    nil)
-   ((and (eq (get-text-property pos 'block-token) 'delimiter-end)
-         (eq (get-text-property (1- pos) 'block-token) 'delimiter-end))
-    (previous-single-property-change pos 'block-token))
-   ((= pos (1- (point-max))) ;; TODO: comparer plutot avec line-end-position
-    (point-max))
-   (t
-    pos)
-   ))
-
-(defun web-mode-block-end-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((get-text-property pos 'block-end)
-    pos)
-   ((get-text-property pos 'block-side)
-    (or (next-single-property-change pos 'block-end)
-        (point-max)))
-   (t
-    nil)
-   ))
-
-(defun web-mode-block-previous-position (&optional pos)
-  (unless pos (setq pos (point)))
-  (cond
-   ((= pos (point-min))
-    (setq pos nil))
-   ((get-text-property pos 'block-side)
-    (setq pos (web-mode-block-beginning-position pos))
-    (cond
-     ((or (null pos) (= pos (point-min)))
-      (setq pos nil)
-      )
-     ((and (setq pos (previous-single-property-change pos 'block-beg))
-           (> pos (point-min)))
-      (setq pos (1- pos))
-      )
-     )
-    ) ;block-side
-   ((get-text-property (1- pos) 'block-side)
-    (setq pos (web-mode-block-beginning-position (1- pos)))
-    )
-   (t
-    (setq pos (previous-single-property-change pos 'block-side))
-    (cond
-     ((and (null pos) (get-text-property (point-min) 'block-beg))
-      (setq pos (point-min)))
-     ((and pos (> pos (point-min)))
-      (setq pos (web-mode-block-beginning-position (1- pos))))
-     )
-    )
-   ) ;conf
-  pos)
-
-(defun web-mode-block-next-position (&optional pos limit)
-  (unless pos (setq pos (point)))
-  (unless limit (setq limit (point-max)))
-  (cond
-   ((and (get-text-property pos 'block-side)
-         (setq pos (web-mode-block-end-position pos))
-         (< pos (point-max))
-         (setq pos (1+ pos)))
-    (unless (get-text-property pos 'block-beg)
-      (setq pos (next-single-property-change pos 'block-side)))
-    )
-   (t
-    (setq pos (next-single-property-change pos 'block-side)))
-   ) ;cond
-  (if (and pos (<= pos limit)) pos nil))
-
-;;---- EXCURSION ---------------------------------------------------------------
-
-(defun web-mode-backward-sexp (n)
-  (interactive "p")
-  (if (< n 0) (web-mode-forward-sexp (- n))
-    (let (pos)
-      (dotimes (_ n)
-        (skip-chars-backward "[:space:]")
-        (setq pos (point))
-        (cond
-         ((bobp) nil)
-         ((get-text-property (1- pos) 'block-end)
-          (backward-char 1)
-          (web-mode-block-beginning))
-         ((get-text-property (1- pos) 'block-token)
-          (backward-char 1)
-          (web-mode-block-token-beginning))
-         ((get-text-property (1- pos) 'part-token)
-          (backward-char 1)
-          (web-mode-part-token-beginning))
-         ((get-text-property (1- pos) 'tag-end)
-          (backward-char 1)
-          (web-mode-element-beginning))
-         ((get-text-property (1- pos) 'tag-attr)
-          (backward-char 1)
-          (web-mode-attribute-beginning))
-         ((get-text-property (1- pos) 'tag-type)
-          (backward-char 1)
-          (web-mode-tag-beginning))
-         (t
-          (let ((forward-sexp-function nil))
-            (backward-sexp))
-          ) ;case t
-         ) ;cond
-        ) ;dotimes
-      ))) ;let if defun
-
-(defun web-mode-forward-sexp (n)
-  (interactive "p")
-  (if (< n 0) (web-mode-backward-sexp (- n))
-    (let (pos)
-      (dotimes (_ n)
-        (skip-chars-forward "[:space:]")
-        (setq pos (point))
-        (cond
-         ((eobp) nil)
-         ((get-text-property pos 'block-beg)
-          (web-mode-block-end))
-         ((get-text-property pos 'block-token)
-          (web-mode-block-token-end))
-         ((get-text-property pos 'part-token)
-          (web-mode-part-token-end))
-         ((get-text-property pos 'tag-beg)
-          (web-mode-element-end))
-         ((get-text-property pos 'tag-attr)
-          (web-mode-attribute-end))
-         ((get-text-property pos 'tag-type)
-          (web-mode-tag-end))
-         (t
-          (let ((forward-sexp-function nil))
-            (forward-sexp))
-          ) ;case t
-         ) ;cond
-        ) ;dotimes
-      ))) ;let if defun
-
-(defun web-mode-comment-beginning ()
-  "Fetch current comment beg."
-  (interactive)
-  (web-mode-go (web-mode-comment-beginning-position (point))))
-
-(defun web-mode-comment-end ()
-  "Fetch current comment end."
-  (interactive)
-  (web-mode-go (web-mode-comment-end-position (point)) 1))
-
-(defun web-mode-tag-beginning ()
-  "Fetch current html tag beg."
-  (interactive)
-  (web-mode-go (web-mode-tag-beginning-position (point))))
-
-(defun web-mode-tag-end ()
-  "Fetch current html tag end."
-  (interactive)
-  (web-mode-go (web-mode-tag-end-position (point)) 1))
-
-(defun web-mode-tag-previous ()
-  "Fetch previous tag."
-  (interactive)
-  (web-mode-go (web-mode-tag-previous-position (point))))
-
-(defun web-mode-tag-next ()
-  "Fetch next tag. Might be html comment or server tag (e.g. jsp)."
-  (interactive)
-  (web-mode-go (web-mode-tag-next-position (point))))
-
-(defun web-mode-attribute-beginning ()
-  "Fetch html attribute beginning."
-  (interactive)
-  (web-mode-go (web-mode-attribute-beginning-position (point))))
-
-(defun web-mode-attribute-end ()
-  "Fetch html attribute end."
-  (interactive)
-  (web-mode-go (web-mode-attribute-end-position (point)) 1))
-
-(defun web-mode-attribute-next (&optional arg)
-  "Fetch next attribute."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (cond
-   ((= arg 1) (web-mode-go (web-mode-attribute-next-position (point))))
-   ((< arg 1) (web-mode-element-previous (* arg -1)))
-   (t
-    (while (>= arg 1)
-      (setq arg (1- arg))
-      (web-mode-go (web-mode-attribute-next-position (point)))
-      )
-    )
-   )
-  )
-
-(defun web-mode-attribute-previous (&optional arg)
-  "Fetch previous attribute."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (unless arg (setq arg 1))
-  (cond
-   ((= arg 1) (web-mode-go (web-mode-attribute-previous-position (point))))
-   ((< arg 1) (web-mode-element-next (* arg -1)))
-   (t
-    (while (>= arg 1)
-      (setq arg (1- arg))
-      (web-mode-go (web-mode-attribute-previous-position (point)))
-      )
-    )
-   )
-  )
-
-(defun web-mode-element-previous (&optional arg)
-  "Fetch previous element."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (cond
-   ((= arg 1) (web-mode-go (web-mode-element-previous-position (point))))
-   ((< arg 1) (web-mode-element-next (* arg -1)))
-   (t
-    (while (>= arg 1)
-      (setq arg (1- arg))
-      (web-mode-go (web-mode-element-previous-position (point)))
-      ) ;while
-    ) ;t
-   ) ;cond
-  )
-
-;; (let ((continue (not (bobp)))
-;;       (ret)
-;;       (pos (point))
-;;       (props '(start void)))
-;;   (while continue
-;;     (setq ret (web-mode-tag-previous))
-;;     (when (or (null ret)
-;;               (member (get-text-property (point) 'tag-type) props))
-;;       (setq continue nil))
-;;     ) ;while
-;;   (unless ret (goto-char pos))
-;;   ret))
-
-(defun web-mode-element-next (&optional arg)
-  "Fetch next element."
-  (interactive "p")
-  (unless arg (setq arg 1))
-  (cond
-   ((= arg 1) (web-mode-go (web-mode-element-next-position (point))))
-   ((< arg 1) (web-mode-element-previous (* arg -1)))
-   (t
-    (while (>= arg 1)
-      (setq arg (1- arg))
-      (web-mode-go (web-mode-element-next-position (point)))
-      ) ;while
-    ) ;t
-   ) ;cond
-  )
-
-(defun web-mode-element-sibling-next ()
-  "Fetch next sibling element."
-  (interactive)
-  (let ((pos (point)))
-    (save-excursion
-      (cond
-       ((not (get-text-property pos 'tag-type))
-        (if (and (web-mode-element-parent)
-                 (web-mode-tag-match)
-                 (web-mode-element-next))
-            (setq pos (point))
-          (setq pos nil))
-        )
-       ((eq (get-text-property pos 'tag-type) 'start)
-        (if (and (web-mode-tag-match)
-                 (web-mode-element-next))
-            (setq pos (point))
-          (setq pos nil))
-        )
-       ((web-mode-element-next)
-        (setq pos (point)))
-       (t
-        (setq pos nil))
-       ) ;cond
-      ) ;save-excursion
-    (web-mode-go pos)))
-
-(defun web-mode-element-sibling-previous ()
-  "Fetch previous sibling element."
-  (interactive)
-  (let ((pos (point)))
-    (save-excursion
-      (cond
-       ((not (get-text-property pos 'tag-type))
-        (if (and (web-mode-element-parent)
-                 (web-mode-tag-previous)
-                 (web-mode-element-beginning))
-            (setq pos (point))
-          (setq pos nil))
-        )
-       ((eq (get-text-property pos 'tag-type) 'start)
-        (if (and (web-mode-tag-beginning)
-                 (web-mode-tag-previous)
-                 (web-mode-element-beginning))
-            (setq pos (point))
-          (setq pos nil))
-        )
-       ((and (web-mode-element-beginning)
-             (web-mode-tag-previous)
-             (web-mode-element-beginning))
-        (setq pos (point)))
-       (t
-        (setq pos nil))
-       ) ;cond
-      ) ;save-excursion
-    (web-mode-go pos)))
-
-(defun web-mode-element-beginning ()
-  "Move to beginning of element."
-  (interactive)
-  (web-mode-go (web-mode-element-beginning-position (point))))
-
-(defun web-mode-element-end ()
-  "Move to end of element."
-  (interactive)
-  (web-mode-go (web-mode-element-end-position (point)) 1))
-
-(defun web-mode-element-parent ()
-  "Fetch parent element."
-  (interactive)
-  (web-mode-go (web-mode-element-parent-position (point))))
-
-(defun web-mode-element-child ()
-  "Fetch child element."
-  (interactive)
-  (web-mode-go (web-mode-element-child-position (point))))
-
-(defun web-mode-dom-traverse ()
-  "Traverse html dom tree."
-  (interactive)
-  (cond
-   ((web-mode-element-child)
-    )
-   ((web-mode-element-sibling-next)
-    )
-   ((and (web-mode-element-parent)
-         (not (web-mode-element-sibling-next)))
-    (goto-char (point-min)))
-   (t
-    (goto-char (point-min)))
-   ) ;cond
-  )
-
-(defun web-mode-closing-paren (limit)
-  (let ((pos (web-mode-closing-paren-position (point) limit)))
-    (if (or (null pos) (> pos limit))
-        nil
-      (goto-char pos)
-      pos)
-    ))
-
-(defun web-mode-part-next ()
-  "Move point to the beginning of the next part."
-  (interactive)
-  (web-mode-go (web-mode-part-next-position (point))))
-
-(defun web-mode-part-beginning ()
-  "Move point to the beginning of the current part."
-  (interactive)
-  (web-mode-go (web-mode-part-beginning-position (point))))
-
-(defun web-mode-part-end ()
-  "Move point to the end of the current part."
-  (interactive)
-  (web-mode-go (web-mode-part-end-position (point)) 1))
-
-(defun web-mode-block-previous ()
-  "Move point to the beginning of the previous block."
-  (interactive)
-  (web-mode-go (web-mode-block-previous-position (point))))
-
-(defun web-mode-block-next ()
-  "Move point to the beginning of the next block."
-  (interactive)
-  (web-mode-go (web-mode-block-next-position (point))))
-
-(defun web-mode-block-beginning ()
-  "Move point to the beginning of the current block."
-  (interactive)
-  (web-mode-go (web-mode-block-beginning-position (point))))
-
-(defun web-mode-block-end ()
-  "Move point to the end of the current block."
-  (interactive)
-  (web-mode-go (web-mode-block-end-position (point)) 1))
-
-(defun web-mode-block-token-beginning ()
-  (web-mode-go (web-mode-block-token-beginning-position (point))))
-
-(defun web-mode-block-token-end ()
-  (web-mode-go (web-mode-block-token-end-position (point)) 1))
-
-(defun web-mode-part-token-beginning ()
-  (web-mode-go (web-mode-part-token-beginning-position (point))))
-
-(defun web-mode-part-token-end ()
-  (web-mode-go (web-mode-part-token-end-position (point)) 1))
-
-(defun web-mode-block-opening-paren (limit)
-  (web-mode-go (web-mode-block-opening-paren-position (point) limit)))
-
-(defun web-mode-block-string-beginning (&optional pos block-beg)
-  (unless pos (setq pos (point)))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (web-mode-go (web-mode-block-string-beginning-position pos block-beg)))
-
-(defun web-mode-block-statement-beginning (&optional pos block-beg)
-  (unless pos (setq pos (point)))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (web-mode-go (web-mode-block-statement-beginning-position pos block-beg)))
-
-(defun web-mode-block-args-beginning (&optional pos block-beg)
-  (unless pos (setq pos (point)))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (web-mode-go (web-mode-block-args-beginning-position pos block-beg)))
-
-(defun web-mode-block-calls-beginning (&optional pos block-beg)
-  (unless pos (setq pos (point)))
-  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
-  (web-mode-go (web-mode-block-calls-beginning-position pos block-beg)))
-
-(defun web-mode-javascript-string-beginning (&optional pos reg-beg)
-  (unless pos (setq pos (point)))
-  (unless reg-beg
-    (if (get-text-property pos 'block-side)
-        (setq reg-beg (web-mode-block-beginning-position pos))
-      (setq reg-beg (web-mode-part-beginning-position pos))))
-  (web-mode-go (web-mode-javascript-string-beginning-position pos reg-beg)))
-
-(defun web-mode-javascript-statement-beginning (&optional pos reg-beg)
-  (unless pos (setq pos (point)))
-  (unless reg-beg
-    (if (get-text-property pos 'block-side)
-        (setq reg-beg (web-mode-block-beginning-position pos))
-      (setq reg-beg (web-mode-part-beginning-position pos))))
-  (web-mode-go (web-mode-javascript-statement-beginning-position pos reg-beg)))
-
-(defun web-mode-javascript-args-beginning (&optional pos reg-beg)
-  (unless pos (setq pos (point)))
-  (unless reg-beg
-    (if (get-text-property pos 'block-side)
-        (setq reg-beg (web-mode-block-beginning-position pos))
-      (setq reg-beg (web-mode-part-beginning-position pos))))
-  (web-mode-go (web-mode-javascript-args-beginning-position pos reg-beg)))
-
-(defun web-mode-javascript-calls-beginning (&optional pos reg-beg)
-  (unless pos (setq pos (point)))
-  (unless reg-beg
-    (if (get-text-property pos 'block-side)
-        (setq reg-beg (web-mode-block-beginning-position pos))
-      (setq reg-beg (web-mode-part-beginning-position pos))))
-  (web-mode-go (web-mode-javascript-calls-beginning-position pos reg-beg)))
-
-(defun web-mode-go (pos &optional offset)
-  (unless offset (setq offset 0))
-  (when pos
-    (cond
-     ((and (> offset 0)
-           (<= (+ pos offset) (point-max)))
-      (setq pos (+ pos offset)))
-     ((and (< offset 0)
-           (>= (+ pos offset) (point-min)))
-      (setq pos (+ pos offset)))
-     ) ;cond
-    (goto-char pos))
-  pos)
-
-;;---- SEARCH ------------------------------------------------------------------
-
-(defun web-mode-rsf-balanced (regexp-open regexp-close &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t)
-        (level 1)
-        (pos (point))
-        ret
-        (regexp (concat regexp-open "\\|" regexp-close)))
-    (while continue
-      (setq ret (re-search-forward regexp limit noerror))
-      (cond
-       ((null ret)
-        (setq continue nil)
-        )
-       (t
-        (if (string-match-p regexp-open (match-string-no-properties 0))
-            (setq level (1+ level))
-          (setq level (1- level)))
-        (when (< level 1)
-          (setq continue nil)
-          )
-        ) ;t
-       ) ;cond
-      ) ;while
-    (when (not (= level 0)) (goto-char pos))
-    ret))
-
-(defun web-mode-block-sb (expr &optional limit noerror)
-  (unless limit (setq limit (web-mode-block-beginning-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-backward expr limit noerror))
-      (when (or (null ret)
-                (not (get-text-property (point) 'block-token)))
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-block-sf (expr &optional limit noerror)
-  (unless limit (setq limit (web-mode-block-end-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-forward expr limit noerror))
-      (when (or (null ret)
-                (not (get-text-property (point) 'block-token)))
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-block-rsb (regexp &optional limit noerror)
-  (unless limit (setq limit (web-mode-block-beginning-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-backward regexp limit noerror))
-      (when (or (null ret)
-                (not (get-text-property (point) 'block-token)))
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-block-rsf (regexp &optional limit noerror)
-  (unless limit (setq limit (web-mode-block-end-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-forward regexp limit noerror))
-      (when (or (null ret)
-                (not (get-text-property (point) 'block-token)))
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-part-sb (expr &optional limit noerror)
-  (unless limit (setq limit (web-mode-part-beginning-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-backward expr limit noerror))
-      (when (or (null ret)
-                (and (not (get-text-property (point) 'part-token))
-                     (not (get-text-property (point) 'block-side)))
-                )
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-part-sf (expr &optional limit noerror)
-  (unless limit (setq limit (web-mode-part-end-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-forward expr limit noerror))
-      (when (or (null ret)
-                (and (not (get-text-property (point) 'part-token))
-                     (not (get-text-property (point) 'block-side)))
-                )
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-part-rsb (regexp &optional limit noerror)
-  (unless limit (setq limit (web-mode-part-beginning-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-backward regexp limit noerror))
-      (when (or (null ret)
-                (and (not (get-text-property (point) 'part-token))
-                     (not (get-text-property (point) 'block-side)))
-                )
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-part-rsf (regexp &optional limit noerror)
-  (unless limit (setq limit (web-mode-part-end-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-forward regexp limit t))
-      (when (or (null ret)
-                (and (not (get-text-property (point) 'part-token))
-                     (not (get-text-property (point) 'block-side)))
-                )
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-javascript-rsb (regexp &optional limit noerror)
-  (unless limit (setq limit (web-mode-part-beginning-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-backward regexp limit noerror))
-      (when (or (null ret)
-                (and (not (get-text-property (point) 'part-token))
-                     (not (get-text-property (point) 'part-element))
-                     (not (get-text-property (point) 'block-side)))
-                )
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-javascript-rsf (regexp &optional limit noerror)
-  (unless limit (setq limit (web-mode-part-end-position (point))))
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-forward regexp limit t))
-      (when (or (null ret)
-                (and (not (get-text-property (point) 'part-token))
-                     (not (get-text-property (point) 'part-element))
-                     (not (get-text-property (point) 'block-side))
-                     ;;(not (get-text-property (point) 'part-element))
-                     )
-                )
-        (setq continue nil)
-        ) ;when
-      ) ;while
-    ret))
-
-(defun web-mode-dom-sf (expr &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-forward expr limit noerror))
-      (if (or (null ret)
-              (not (get-text-property (- (point) (length expr)) 'block-side)))
-          (setq continue nil))
-      )
-    ret))
-
-(defun web-mode-dom-rsf (regexp &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) (ret nil))
-    (while continue
-      (setq ret (re-search-forward regexp limit noerror))
-      ;;      (message "ret=%S point=%S limit=%S i=%S" ret (point) limit 0)
-      (when (or (null ret)
-                (not (get-text-property (match-beginning 0) 'block-side)))
-        (setq continue nil))
-      ) ;while
-    ret))
-
-(defun web-mode-rsb (regexp &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-backward regexp limit noerror))
-      (if (or (null ret)
-              (not (web-mode-is-comment-or-string)))
-          (setq continue nil)))
-    ret))
-
-(defun web-mode-rsf (regexp &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (re-search-forward regexp limit noerror))
-      (if (or (null ret)
-              (not (web-mode-is-comment-or-string)))
-          (setq continue nil))
-      )
-    ret))
-
-(defun web-mode-sb (expr &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-backward expr limit noerror))
-      (if (or (null ret)
-              (not (web-mode-is-comment-or-string)))
-          (setq continue nil)))
-    ret))
-
-(defun web-mode-sf (expr &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret)
-    (while continue
-      (setq ret (search-forward expr limit noerror))
-      (if (or (null ret)
-              (not (web-mode-is-comment-or-string)))
-          (setq continue nil)))
-    ret))
-
-(defun web-mode-content-rsf (regexp &optional limit noerror)
-  (unless noerror (setq noerror t))
-  (let ((continue t) ret beg end)
-    (while continue
-      (setq ret (re-search-forward regexp limit noerror)
-            beg (if (null ret) (point) (match-beginning 0))
-            end (if (null ret) (point) (1- (match-end 0))))
-      (if (or (null ret)
-              (and (web-mode-is-content beg)
-                   (web-mode-is-content end)))
-          (setq continue nil)))
-    ret))
-
-;;---- ADVICES -----------------------------------------------------------------
-
-(defadvice ac-start (before web-mode-set-up-ac-sources activate)
-  "Set `ac-sources' based on current language before running auto-complete."
-  (if (equal major-mode 'web-mode)
-      (progn
-        (run-hooks 'web-mode-before-auto-complete-hooks)
-        (when web-mode-ac-sources-alist
-          (let ((new-web-mode-ac-sources
-                 (assoc (web-mode-language-at-pos)
-                        web-mode-ac-sources-alist)))
-            (setq ac-sources (cdr new-web-mode-ac-sources)))))))
-
-;;---- MINOR MODE ADDONS -------------------------------------------------------
-
-(defun web-mode-yasnippet-exit-hook ()
-  "Yasnippet exit hook"
-  (when (and (boundp 'yas-snippet-beg) (boundp 'yas-snippet-end))
-    (indent-region yas-snippet-beg yas-snippet-end)))
-
-(defun web-mode-imenu-index ()
-  (interactive)
-  "Returns imenu items."
-  (let (toc-index
-        line)
-    (save-excursion
-      (goto-char (point-min))
-      (while (not (eobp))
-        (setq line (buffer-substring-no-properties
-                    (line-beginning-position)
-                    (line-end-position)))
-        (let (found
-              (i 0)
-              item
-              regexp
-              type
-              type-idx
-              content
-              content-idx
-              content-regexp
-              close-tag-regexp
-              concat-str
-              jumpto
-              str)
-          (while (and (not found ) (< i (length web-mode-imenu-regexp-list)))
-            (setq item (nth i web-mode-imenu-regexp-list))
-            (setq regexp (nth 0 item))
-            (setq type-idx (nth 1 item))
-            (setq content-idx (nth 2 item))
-            (setq concat-str (nth 3 item))
-            (when (not (numberp content-idx))
-              (setq content-regexp (nth 2 item)
-                    close-tag-regexp (nth 4 item)
-                    content-idx nil))
-
-            (when (string-match regexp line)
-
-              (cond
-               (content-idx
-                (setq type (match-string type-idx line))
-                (setq content (match-string content-idx line))
-                (setq str (concat type concat-str content))
-                (setq jumpto (line-beginning-position)))
-               (t
-                (let (limit)
-                  (setq type (match-string type-idx line))
-                  (goto-char (line-beginning-position))
-                  (save-excursion
-                    (setq limit (re-search-forward close-tag-regexp (point-max) t)))
-
-                  (when limit
-                    (when (re-search-forward content-regexp limit t)
-                      (setq content (match-string 1))
-                      (setq str (concat type concat-str content))
-                      (setq jumpto (line-beginning-position))
-                      )
-                    )))
-               )
-              (when str (setq toc-index
-                              (cons (cons str jumpto)
-                                    toc-index)
-                              )
-                    (setq found t))
-              )
-            (setq i (1+ i))))
-        (forward-line)
-        (goto-char (line-end-position)) ;; make sure we are at eobp
-        ))
-    (nreverse toc-index)))
-
-;;---- UNIT TESTING ------------------------------------------------------------
-
-(defun web-mode-test ()
-  "Executes web-mode unit tests. See `web-mode-tests-directory'."
-  (interactive)
-  (let (files ret regexp)
-    (setq regexp "^[[:alnum:]][[:alnum:]._]+\\'")
-    (setq files (directory-files web-mode-tests-directory t regexp))
-    (dolist (file files)
-      (cond
-       ((eq (string-to-char (file-name-nondirectory file)) ?\_)
-        (delete-file file))
-       (t
-        (setq ret (web-mode-test-process file)))
-       ) ;cond
-      ) ;dolist
-    ))
-
-(defun web-mode-test-process (file)
-  (with-temp-buffer
-    (let (out sig1 sig2 success err)
-      (setq-default indent-tabs-mode nil)
-      (insert-file-contents file)
-      (set-visited-file-name file)
-      (web-mode)
-      (setq sig1 (md5 (current-buffer)))
-      (delete-horizontal-space)
-      (while (not (eobp))
-        (forward-line)
-        (delete-horizontal-space)
-        (end-of-line))
-      (web-mode-buffer-indent)
-      (setq sig2 (md5 (current-buffer)))
-      (setq success (string= sig1 sig2))
-      (setq out (concat (if success "ok" "ko") " : " (file-name-nondirectory file)))
-      (message out)
-      (setq err (concat (file-name-directory file) "_err." (file-name-nondirectory file)))
-      (if success
-          (when (file-readable-p err)
-            (delete-file err))
-        (write-file err)
-        (message "[%s]" (buffer-string))
-        ) ;if
-      out)))
-
-;;---- MISC --------------------------------------------------------------------
-
-(defun web-mode-set-engine (engine)
-  "Set the engine for the current buffer."
-  (interactive
-   (list (completing-read
-          "Engine: "
-          (let (engines)
-            (dolist (elt web-mode-engines)
-              (setq engines (append engines (list (car elt)))))
-            engines))))
-  (setq web-mode-content-type "html"
-        web-mode-engine (web-mode-engine-canonical-name engine)
-        web-mode-minor-engine engine)
-  (web-mode-on-engine-setted)
-  (web-mode-buffer-highlight))
-
-(defun web-mode-set-content-type (content-type)
-  (setq web-mode-content-type content-type)
-  (web-mode-buffer-highlight))
-
-(defun web-mode-on-engine-setted ()
-  (let (elt elts engines)
-
-    (when (string= web-mode-engine "razor") (setq web-mode-enable-block-face t))
-    (setq web-mode-engine-attr-regexp (cdr (assoc web-mode-engine web-mode-engine-attr-regexps)))
-    (setq web-mode-engine-token-regexp (cdr (assoc web-mode-engine web-mode-engine-token-regexps)))
-
-    ;;(message "%S %S" web-mode-engine-attr-regexp web-mode-engine)
-
-    (when (null web-mode-minor-engine)
-      (setq web-mode-minor-engine "none"))
-
-    (setq elt (assoc web-mode-engine web-mode-engine-open-delimiter-regexps))
-    (if elt
-        (setq web-mode-block-regexp (cdr elt))
-      (setq web-mode-engine "none"))
-
-    (unless (boundp 'web-mode-extra-auto-pairs)
-      (setq web-mode-extra-auto-pairs nil))
-
-    (setq web-mode-auto-pairs
-          (append
-           (cdr (assoc web-mode-engine web-mode-engines-auto-pairs))
-           (cdr (assoc nil web-mode-engines-auto-pairs))
-           (cdr (assoc web-mode-engine web-mode-extra-auto-pairs))
-           (cdr (assoc nil web-mode-extra-auto-pairs))))
-
-    (unless (boundp 'web-mode-extra-snippets)
-      (setq web-mode-extra-snippets nil))
-
-    (setq elts
-          (append
-           (cdr (assoc web-mode-engine web-mode-extra-snippets))
-           (cdr (assoc nil             web-mode-extra-snippets))
-           (cdr (assoc web-mode-engine web-mode-engines-snippets))
-           (cdr (assoc nil             web-mode-engines-snippets))))
-
-    (dolist (elt elts)
-      (unless (assoc (car elt) web-mode-snippets)
-        (setq web-mode-snippets (append (list elt) web-mode-snippets)))
-      )
-
-    (setq web-mode-engine-font-lock-keywords
-          (symbol-value (cdr (assoc web-mode-engine web-mode-engines-font-lock-keywords))))
-
-    (when (and (string= web-mode-minor-engine "jinja")
-               (not (member "endtrans" web-mode-django-control-blocks)))
-      (add-to-list 'web-mode-django-control-blocks "endtrans")
-      (setq web-mode-django-control-blocks-regexp
-            (regexp-opt web-mode-django-control-blocks t))
-      )
-
-;;    (message "%S" (symbol-value (cdr (assoc web-mode-engine web-mode-engines-font-lock-keywords))))
-
-    ))
-
-(defun web-mode-detect-engine ()
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward "-\\*- engine:[ ]*\\([[:alnum:]-]+\\)[ ]*-\\*-" web-mode-chunk-length t)
-      (setq web-mode-minor-engine (match-string-no-properties 1))
-      (setq web-mode-engine (web-mode-engine-canonical-name web-mode-minor-engine)))
-    web-mode-minor-engine))
-
-(defun web-mode-guess-engine-and-content-type ()
-  (let (buff-name elt found)
-
-    (setq buff-name (buffer-file-name))
-    (unless buff-name (setq buff-name (buffer-name)))
-    (setq web-mode-is-scratch (string= buff-name "*scratch*"))
-    (setq web-mode-content-type nil)
-
-    (when (boundp 'web-mode-content-types-alist)
-      (setq found nil)
-      (dolist (elt web-mode-content-types-alist)
-        (when (and (not found) (string-match-p (cdr elt) buff-name))
-          (setq web-mode-content-type (car elt)
-                found t))
-        ) ;dolist
-      ) ;when
-
-    (unless web-mode-content-type
-      (setq found nil)
-      (dolist (elt web-mode-content-types)
-        (when (and (not found) (string-match-p (cdr elt) buff-name))
-          (setq web-mode-content-type (car elt)
-                found t))
-        ) ;dolist
-      ) ;unless
-
-    (when (boundp 'web-mode-engines-alist)
-      (setq found nil)
-      (dolist (elt web-mode-engines-alist)
-        (cond
-         ((stringp (cdr elt))
-          (when (string-match-p (cdr elt) buff-name)
-            (setq web-mode-engine (car elt))))
-         ((functionp (cdr elt))
-          (when (funcall (cdr elt))
-            (setq web-mode-engine (car elt))))
-         ) ;cond
-        ) ;dolist
-      ) ;when
-
-    (unless web-mode-engine
-      (setq found nil)
-      (dolist (elt web-mode-engine-file-regexps)
-        ;;(message "%S %S" (cdr elt) buff-name)
-        (when (and (not found) (string-match-p (cdr elt) buff-name))
-          (setq web-mode-engine (car elt)
-                found t))
-        )
-      )
-
-    ;; (unless web-mode-engine
-    ;;   (setq found nil)
-    ;;   (dolist (elt web-mode-engines)
-    ;;     (when (and (not found) (string-match-p (car elt) buff-name))
-    ;;       (setq web-mode-engine (car elt)
-    ;;             found t))
-    ;;     )
-    ;;   )
-
-    (when (and (or (null web-mode-engine) (string= web-mode-engine "none"))
-               (string-match-p "php" (buffer-substring-no-properties
-                                      (line-beginning-position)
-                                      (line-end-position))))
-      (setq web-mode-engine "php"))
-
-    (when (and (string= web-mode-content-type "javascript")
-               (string-match-p "@jsx"
-                               (buffer-substring-no-properties
-                                (point-min)
-                                (if (< (point-max) web-mode-chunk-length)
-                                    (point-max)
-                                  web-mode-chunk-length)
-                                )))
-      (setq web-mode-content-type "jsx"))
-
-    (when web-mode-engine
-      (setq web-mode-minor-engine web-mode-engine
-            web-mode-engine (web-mode-engine-canonical-name web-mode-engine))
-      )
-
-    (when (and (or (null web-mode-engine)
-                   (string= web-mode-engine "none"))
-               web-mode-enable-engine-detection)
-      (web-mode-detect-engine))
-
-    (web-mode-on-engine-setted)
-
-    ))
-
-(defun web-mode-engine-canonical-name (name)
-  (let (engine)
-    (cond
-     ((null name)
-      nil)
-     ((assoc name web-mode-engines)
-      name)
-     (t
-      (dolist (elt web-mode-engines)
-        (when (and (null engine) (member name (cdr elt)))
-          (setq engine (car elt)))
-        ) ;dolist
-      engine)
-     )))
-
-(defun web-mode-on-after-save ()
-  (when web-mode-is-scratch
-    (web-mode-guess-engine-and-content-type)
-    (web-mode-buffer-highlight))
-  nil)
-
-(defun web-mode-on-exit ()
-  (web-mode-with-silent-modifications
-   (put-text-property (point-min) (point-max) 'invisible nil)
-   (remove-overlays)
-   (remove-hook 'change-major-mode-hook 'web-mode-on-exit t)
-   ))
-
-(defun web-mode-reload ()
-  "Reload web-mode."
-  (interactive)
-  (web-mode-with-silent-modifications
-    (put-text-property (point-min) (point-max) 'invisible nil)
-    (remove-overlays)
-    (setq font-lock-unfontify-region-function 'font-lock-default-unfontify-region)
-    (load "web-mode.el")
-    (setq web-mode-change-beg nil
-          web-mode-change-end nil)
-    (web-mode)
-    ))
-
-(defun web-mode-trace (msg)
-  (let (sub)
-    ;;      (when (null web-mode-time) (setq web-mode-time (current-time)))
-    (setq sub (time-subtract (current-time) web-mode-time))
-    (when nil
-      (save-excursion
-        (let ((n 0))
-          (goto-char (point-min))
-          (while (web-mode-tag-next)
-            (setq n (1+ n))
-            )
-          (message "%S tags found" n)
-          )))
-    (message "%18s: time elapsed = %Ss %9Sµs" msg (nth 1 sub) (nth 2 sub))
-    ))
-
-(defun web-mode-reveal ()
-  "Display text properties at point."
-  (interactive)
-  (let (symbols out)
-    (setq out (format
-               "[point=%S engine=%S minor=%S content-type=%S language-at-pos=%S]\n"
-               (point)
-               web-mode-engine
-               web-mode-minor-engine
-               web-mode-content-type
-               (web-mode-language-at-pos (point))))
-    (setq symbols (append web-mode-scan-properties '(font-lock-face face)))
-    (dolist (symbol symbols)
-      (when symbol
-        (setq out (concat out (format "%s(%S) " (symbol-name symbol) (get-text-property (point) symbol)))))
-      )
-    (message "%s\n" out)
-    ;;(message "syntax-class=%S" (syntax-class (syntax-after (point))))
-    (message nil)))
-
-(defun web-mode-debug ()
-  "Display informations useful for debugging."
-  (interactive)
-  (let ((modes nil)
-        (customs '(web-mode-enable-current-column-highlight web-mode-enable-current-element-highlight indent-tabs-mode))
-        (ignore '(abbrev-mode auto-composition-mode auto-compression-mode auto-encryption-mode auto-insert-mode blink-cursor-mode column-number-mode delete-selection-mode display-time-mode electric-indent-mode file-name-shadow-mode font-lock-mode global-font-lock-mode global-hl-line-mode line-number-mode menu-bar-mode mouse-wheel-mode recentf-mode show-point-mode tool-bar-mode tooltip-mode transient-mark-mode)))
-    (message "\n")
-    (message "--- WEB-MODE DEBUG BEG ---")
-    (message "versions: emacs(%S.%S) web-mode(%S)"
-             emacs-major-version emacs-minor-version web-mode-version)
-    (message "vars: engine(%S) minor(%S) content-type(%S) file(%S)"
-             web-mode-engine
-             web-mode-minor-engine
-             web-mode-content-type
-             (or (buffer-file-name) (buffer-name)))
-    (message "system: window(%S) config(%S)" window-system system-configuration)
-    (message "colors: fg(%S) bg(%S) "
-             (cdr (assoc 'foreground-color default-frame-alist))
-             (cdr (assoc 'background-color default-frame-alist)))
-    (mapc (lambda (mode)
-            (condition-case nil
-                (if (and (symbolp mode) (symbol-value mode) (not (member mode ignore)))
-                    (add-to-list 'modes mode))
-              (error nil))
-            ) ;lambda
-          minor-mode-list)
-    (message "minor modes: %S" modes)
-    (message "vars:")
-    (dolist (custom customs)
-      (message (format "%s=%S " (symbol-name custom) (symbol-value custom))))
-    (message "--- WEB-MODE DEBUG END ---")
-    (switch-to-buffer "*Messages*")
-    (goto-char (point-max))
-    (recenter)
-  ))
-
-(provide 'web-mode)
-
-;;; web-mode.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; End:
diff --git a/emacs.d/elpa/web-mode-20160114.1306/web-mode-autoloads.el b/emacs.d/elpa/web-mode-20160114.1306/web-mode-autoloads.el
new file mode 100644
index 0000000..a037487
--- /dev/null
+++ b/emacs.d/elpa/web-mode-20160114.1306/web-mode-autoloads.el
@@ -0,0 +1,21 @@
+;;; web-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "web-mode" "web-mode.el" (22171 46541 0 0))
+;;; Generated autoloads from web-mode.el
+
+(autoload 'web-mode "web-mode" "\
+Major mode for editing web templates.
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; web-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/web-mode-20160114.1306/web-mode-pkg.el b/emacs.d/elpa/web-mode-20160114.1306/web-mode-pkg.el
new file mode 100644
index 0000000..f8e8ee2
--- /dev/null
+++ b/emacs.d/elpa/web-mode-20160114.1306/web-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "web-mode" "20160114.1306" "major mode for editing web templates" 'nil :url "http://web-mode.org" :keywords '("languages"))
diff --git a/emacs.d/elpa/web-mode-20160114.1306/web-mode.el b/emacs.d/elpa/web-mode-20160114.1306/web-mode.el
new file mode 100644
index 0000000..3d6cd92
--- /dev/null
+++ b/emacs.d/elpa/web-mode-20160114.1306/web-mode.el
@@ -0,0 +1,11653 @@
+;;; web-mode.el --- major mode for editing web templates
+;;; -*- coding: utf-8 -*-
+
+;; Copyright 2011-2016 François-Xavier Bois
+
+;; Version: 13.1.2
+;; Package-Version: 20160114.1306
+;; Author: François-Xavier Bois <fxbois AT Google Mail Service>
+;; Maintainer: François-Xavier Bois
+;; Created: July 2011
+;; Keywords: languages
+;; Homepage: http://web-mode.org
+;; Repository: http://github.com/fxbois/web-mode
+;; License: GNU General Public License >= 2
+;; Distribution: This file is not part of Emacs
+
+;;==============================================================================
+;; WEB-MODE is sponsored by Kernix : ultimate DigitalFactory & DataLab in Paris
+;;==============================================================================
+
+;; Code goes here
+
+;;---- CONSTS ------------------------------------------------------------------
+
+(defconst web-mode-version "13.1.2"
+  "Web Mode version.")
+
+;;---- GROUPS ------------------------------------------------------------------
+
+(defgroup web-mode nil
+  "Major mode for editing web templates"
+  :group 'languages
+  :prefix "web-"
+  :link '(url-link :tag "Site" "http://web-mode.org")
+  :link '(url-link :tag "Repository" "https://github.com/fxbois/web-mode"))
+
+(defgroup web-mode-faces nil
+  "Faces for syntax highlighting."
+  :group 'web-mode
+  :group 'faces)
+
+;;---- CUSTOMS -----------------------------------------------------------------
+
+(defcustom web-mode-script-padding 1
+  "Script element left padding."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-style-padding 1
+  "Style element left padding."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-block-padding 0
+  "Multi-line block (php, ruby, java, python, asp, etc.) left padding."
+  :type 'integer
+  :group 'web-mode)
+
+;;(defcustom web-mode-jsx-expression-padding 0
+;;  "Multi-line jsx expression left padding."
+;;  :type 'integer
+;;  :group 'web-mode)
+
+(defcustom web-mode-attr-indent-offset nil
+  "Html attribute indentation level."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-markup-indent-offset
+  (if (and (boundp 'standard-indent) standard-indent) standard-indent 2)
+  "Html indentation level."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-css-indent-offset
+  (if (and (boundp 'standard-indent) standard-indent) standard-indent 2)
+  "CSS indentation level."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-code-indent-offset
+  (if (and (boundp 'standard-indent) standard-indent) standard-indent 2)
+  "Code (javascript, php, etc.) indentation level."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-sql-indent-offset 4
+  "Sql (inside strings) indentation level."
+  :type 'integer
+  :group 'web-mode)
+
+(defcustom web-mode-enable-css-colorization (display-graphic-p)
+  "In a CSS part, set background according to the color: #xxx, rgb(x,x,x)."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-auto-indentation (display-graphic-p)
+  "Auto-indentation."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-auto-closing (display-graphic-p)
+  "Auto-closing."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-auto-pairing (display-graphic-p)
+  "Auto-pairing."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-auto-opening (display-graphic-p)
+  "Html element auto-opening."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-auto-quoting (display-graphic-p)
+  "Add double quotes after the character = in a tag."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-auto-expanding nil
+  "e.g. s/ expands to <span>|</span>."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-control-block-indentation t
+  "Control blocks increase indentation."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-current-element-highlight nil
+  "Disable element highlight."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-current-column-highlight nil
+  "Show column for current element."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-whitespace-fontification nil
+  "Enable whitespaces."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-html-entities-fontification nil
+  "Enable html entities fontification."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-block-face nil
+  "Enable block face (useful for setting a background for example).
+See web-mode-block-face."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-part-face nil
+  "Enable part face (useful for setting background of <style> or <script>
+ elements for example). See web-mode-part-face."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-inlays nil
+  "Enable inlays (e.g. LaTeX) highlighting."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-sexp-functions t
+  "Enable specific sexp functions."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-comment-interpolation t
+  "Enable highlight of keywords like FIXME, TODO, etc. in comments."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-enable-string-interpolation t
+  "Enable string interpolation fontification (php and erb)."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-sql-detection nil
+  "Enable fontification and indentation of sql queries in strings."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-heredoc-fontification t
+  "Enable heredoc fontification. The identifier should contain JS, JAVASCRIPT, CSS or HTML."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-element-content-fontification nil
+  "Enable element content fontification. The content of an element can have a face associated."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-element-tag-fontification nil
+  "Enable tag name fontification."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-enable-engine-detection nil
+  "Detect such directive -*- engine: ENGINE -*- at the top of the file."
+  :type 'boolean
+  :group 'web-mode)
+
+(defcustom web-mode-comment-style 1
+  "Comment style : 1 = default, 2 = force server comments outside a block."
+  :group 'web-mode
+  :type '(choice (const :tag "default" 1)
+                 (const :tag "force engine comments" 2)))
+
+(defcustom web-mode-indent-style 2
+  "Indentation style."
+  :group 'web-mode
+  :type '(choice (const :tag "default (all lines are indented)" 2)
+                 (const :tag "text at the beginning of line is not indented" 1)))
+
+(defcustom web-mode-auto-close-style 1
+  "Auto-close style."
+  :group 'web-mode
+  :type '(choice (const :tag "Auto-close on </" 1)
+                 (const :tag "Auto-close on > and </" 2)))
+
+(defcustom web-mode-extra-expanders '()
+  "A list of additional expanders."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-extra-auto-pairs '()
+  "A list of additional snippets."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-extra-snippets '()
+  "A list of additional snippets."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-extra-builtins '()
+  "A list of additional builtins."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-extra-constants '()
+  "A list of additional constants."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-extra-keywords '()
+  "A list of additional keywords."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-extra-types '()
+  "A list of additional types."
+  :type 'list
+  :group 'web-mode)
+
+(defcustom web-mode-tests-directory (concat default-directory "tests/")
+  "Directory containing all the unit tests."
+  :type 'list
+  :group 'web-mode)
+
+;;---- FACES -------------------------------------------------------------------
+
+(defface web-mode-error-face
+  '((t :background "red"))
+  "Face for warning."
+  :group 'web-mode-faces)
+
+(defface web-mode-warning-face
+  '((t :inherit font-lock-warning-face))
+  "Face for warning."
+  :group 'web-mode-faces)
+
+(defface web-mode-preprocessor-face
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for preprocessor."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-delimiter-face
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for block delimiters."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-control-face
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for preprocessor."
+  :group 'web-mode-faces)
+
+(defface web-mode-builtin-face
+  '((t :inherit font-lock-builtin-face))
+  "Face for builtins."
+  :group 'web-mode-faces)
+
+(defface web-mode-symbol-face
+  '((t :foreground "gold"))
+  "Face for symbols."
+  :group 'web-mode-faces)
+
+(defface web-mode-doctype-face
+  '((t :foreground "Grey"))
+  "Face for html doctype."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-tag-face
+  '((((class color) (min-colors 88) (background dark))  :foreground "Snow4")
+    (((class color) (min-colors 88) (background light)) :foreground "Snow4")
+    (((class color) (min-colors 16) (background dark))  :foreground "Snow4")
+    (((class color) (min-colors 16) (background light)) :foreground "Grey15")
+    (((class color) (min-colors 8))                     :foreground "Snow4")
+    (((type tty) (class mono))                          :inverse-video t)
+    (t                                                  :foreground "Snow4"))
+  "Face for html tags."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-tag-custom-face
+  '((t :inherit web-mode-html-tag-face))
+  "Face for html custom tags (e.g. <polymer-element>)."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-tag-bracket-face
+  '((((class color) (min-colors 88) (background dark))  :foreground "Snow3")
+    (((class color) (min-colors 88) (background light)) :foreground "Grey14")
+    (((class color) (min-colors 16) (background dark))  :foreground "Snow3")
+    (((class color) (min-colors 16) (background light)) :foreground "Grey14")
+    (((class color) (min-colors 8))                     :foreground "Snow3")
+    (((type tty) (class mono))                          :inverse-video t)
+    (t                                                  :foreground "Snow3"))
+  "Face for html tags angle brackets (<, > and />)."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-attr-name-face
+  '((((class color) (min-colors 88) (background dark))  :foreground "Snow3")
+    (((class color) (min-colors 88) (background light)) :foreground "Snow4")
+    (((class color) (min-colors 16) (background dark))  :foreground "Snow3")
+    (((class color) (min-colors 16) (background light)) :foreground "Grey13")
+    (((class color) (min-colors 8))                     :foreground "Snow3")
+    (((type tty) (class mono))                          :inverse-video t)
+    (t                                                  :foreground "Snow4"))
+  "Face for html attribute names."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-attr-custom-face
+  '((t :inherit web-mode-html-attr-name-face))
+  "Face for custom attribute names (e.g. data-*)."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-attr-engine-face
+  '((t :inherit web-mode-block-delimiter-face))
+  "Face for custom engine attribute names (e.g. ng-*)."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-attr-equal-face
+  '((t :inherit web-mode-html-attr-name-face))
+  "Face for the = character between name and value."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-attr-value-face
+  '((t :inherit font-lock-string-face))
+  "Face for html attribute values."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-attr-name-face
+  '((t :foreground "#8fbc8f"))
+  "Face for block attribute names."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-attr-value-face
+  '((t :foreground "#5f9ea0"))
+  "Face for block attribute values."
+  :group 'web-mode-faces)
+
+(defface web-mode-variable-name-face
+  '((t :inherit font-lock-variable-name-face))
+  "Face for variable names."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-selector-face
+  '((t :inherit font-lock-keyword-face))
+  "Face for CSS rules."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-pseudo-class-face
+  '((t :inherit font-lock-builtin-face))
+  "Face for CSS pseudo-classes."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-at-rule-face
+  '((t :inherit font-lock-constant-face))
+  "Face for CSS at-rules."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-property-name-face
+  '((t :inherit font-lock-variable-name-face))
+  "Face for CSS props."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-color-face
+  '((t :inherit font-lock-builtin-face))
+  "Face for CSS colors (#xxx)."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-priority-face
+  '((t :inherit font-lock-builtin-face))
+  "Face for CSS priority (!important)."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-function-face
+  '((t :inherit font-lock-builtin-face))
+  "Face for CSS functions."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-variable-face
+  '((t :inherit web-mode-variable-name-face :slant italic))
+  "Face for CSS vars."
+  :group 'web-mode-faces)
+
+(defface web-mode-function-name-face
+  '((t :inherit font-lock-function-name-face))
+  "Face for function names."
+  :group 'web-mode-faces)
+
+(defface web-mode-filter-face
+  '((t :inherit font-lock-function-name-face))
+  "Face for function names."
+  :group 'web-mode-faces)
+
+(defface web-mode-function-call-face
+  '((t :inherit font-lock-function-name-face))
+  "Face for function calls."
+  :group 'web-mode-faces)
+
+(defface web-mode-string-face
+  '((t :inherit font-lock-string-face))
+  "Face for strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-string-face
+  '((t :inherit web-mode-string-face))
+  "Face for block strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-part-string-face
+  '((t :inherit web-mode-string-face))
+  "Face for part strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-javascript-string-face
+  '((t :inherit web-mode-string-face))
+  "Face for javascript strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-string-face
+  '((t :inherit web-mode-string-face))
+  "Face for css strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-json-key-face
+  '((t :foreground "plum"))
+  "Face for json key strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-json-context-face
+  '((t :foreground "orchid3"))
+  "Face for json context strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-json-string-face
+  '((t :inherit web-mode-string-face))
+  "Face for json strings."
+  :group 'web-mode-faces)
+
+(defface web-mode-comment-face
+  '((t :inherit font-lock-comment-face))
+  "Face for comments."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-comment-face
+  '((t :inherit web-mode-comment-face))
+  "Face for server comments."
+  :group 'web-mode-faces)
+
+(defface web-mode-part-comment-face
+  '((t :inherit web-mode-comment-face))
+  "Face for part comments."
+  :group 'web-mode-faces)
+
+(defface web-mode-json-comment-face
+  '((t :inherit web-mode-comment-face))
+  "Face for json comments."
+  :group 'web-mode-faces)
+
+(defface web-mode-javascript-comment-face
+  '((t :inherit web-mode-comment-face))
+  "Face for javascript comments."
+  :group 'web-mode-faces)
+
+(defface web-mode-css-comment-face
+  '((t :inherit web-mode-comment-face))
+  "Face for css comments."
+  :group 'web-mode-faces)
+
+(defface web-mode-constant-face
+  '((t :inherit font-lock-constant-face))
+  "Face for language constants."
+  :group 'web-mode-faces)
+
+(defface web-mode-type-face
+  '((t :inherit font-lock-type-face))
+  "Face for language types."
+  :group 'web-mode-faces)
+
+(defface web-mode-keyword-face
+  '((t :inherit font-lock-keyword-face))
+  "Face for language keywords."
+  :group 'web-mode-faces)
+
+(defface web-mode-param-name-face
+  '((t :foreground "Snow3"))
+  "Face for server attribute names."
+  :group 'web-mode-faces)
+
+(defface web-mode-whitespace-face
+  '((t :background "DarkOrchid4"))
+  "Face for whitespaces."
+  :group 'web-mode-faces)
+
+(defface web-mode-inlay-face
+  '((((class color) (min-colors 88) (background dark))  :background "Black")
+    (((class color) (min-colors 88) (background light)) :background "LightYellow1")
+    (((class color) (min-colors 16) (background dark))  :background "Brey18")
+    (((class color) (min-colors 16) (background light)) :background "LightYellow1")
+    (((class color) (min-colors 8))                     :background "Black")
+    (((type tty) (class mono))                          :inverse-video t)
+    (t                                                  :background "Grey"))
+  "Face for inlays. Must be used in conjunction with web-mode-enable-inlays."
+  :group 'web-mode-faces)
+
+(defface web-mode-block-face
+  '((((class color) (min-colors 88) (background dark))  :background "Black")
+    (((class color) (min-colors 88) (background light)) :background "LightYellow1")
+    (((class color) (min-colors 16) (background dark))  :background "Grey18")
+    (((class color) (min-colors 16) (background light)) :background "LightYellow1")
+    (((class color) (min-colors 8))                     :background "Black")
+    (((type tty) (class mono))                          :inverse-video t)
+    (t                                                  :background "Grey"))
+  "Face for blocks (useful for setting a background for example).
+Must be used in conjunction with web-mode-enable-block-face."
+  :group 'web-mode-faces)
+
+(defface web-mode-part-face
+  '((t :inherit web-mode-block-face))
+  "Face for parts."
+  :group 'web-mode-faces)
+
+(defface web-mode-script-face
+  '((t :inherit web-mode-part-face))
+  "Face for javascript inside a script element."
+  :group 'web-mode-faces)
+
+(defface web-mode-style-face
+  '((t :inherit web-mode-part-face))
+  "Face for css inside a style element."
+  :group 'web-mode-faces)
+
+(defface web-mode-folded-face
+  '((t :underline t))
+  "Overlay face for folded."
+  :group 'web-mode-faces)
+
+(defface web-mode-bold-face
+  '((t :weight bold))
+  "bold face."
+  :group 'web-mode-faces)
+
+(defface web-mode-italic-face
+  '((t :slant italic))
+  "bold face."
+  :group 'web-mode-faces)
+
+(defface web-mode-underline-face
+  '((t :underline t))
+  "bold face."
+  :group 'web-mode-faces)
+
+(defface web-mode-current-element-highlight-face
+  '((t :background "#000000"))
+  "Overlay face for element highlight."
+  :group 'web-mode-faces)
+
+(defface web-mode-current-column-highlight-face
+  '((t :background "#3e3c36"))
+  "Overlay face for current column."
+  :group 'web-mode-faces)
+
+(defface web-mode-comment-keyword-face
+  '((t :weight bold :box t))
+  "Comment keywords."
+  :group 'web-mode-faces)
+
+(defface web-mode-sql-keyword-face
+  '((t :weight bold :slant italic))
+  "Sql keywords."
+  :group 'web-mode-faces)
+
+(defface web-mode-html-entity-face
+  '((t :slant italic))
+  "Face html entities (e.g. &#8211;, &eacute;)."
+  :group 'web-mode-faces)
+
+
+;;---- VARS --------------------------------------------------------------------
+
+(defvar font-lock-beg)
+(defvar font-lock-end)
+
+(defvar web-mode-auto-pairs nil)
+(defvar web-mode-block-regexp nil)
+(defvar web-mode-change-beg nil)
+(defvar web-mode-change-end nil)
+(defvar web-mode-chunk-length 64)
+(defvar web-mode-column-overlays nil)
+(defvar web-mode-comments-invisible nil)
+(defvar web-mode-content-type "")
+(defvar web-mode-engine nil)
+(defvar web-mode-engine-attr-regexp nil)
+(defvar web-mode-engine-font-lock-keywords nil)
+(defvar web-mode-engine-token-regexp nil)
+(defvar web-mode-expand-initial-pos nil)
+(defvar web-mode-expand-initial-scroll nil)
+(defvar web-mode-expand-previous-state "")
+(defvar web-mode-font-lock-keywords '(web-mode-font-lock-highlight))
+(defvar web-mode-inhibit-fontification nil)
+(defvar web-mode-inlay-regexp nil)
+(defvar web-mode-is-scratch nil)
+(defvar web-mode-jshint-errors 0)
+(defvar web-mode-minor-engine nil)
+(defvar web-mode-obarray nil)
+(defvar web-mode-overlay-tag-start nil)
+(defvar web-mode-overlay-tag-end nil)
+(defvar web-mode-snippets nil)
+(defvar web-mode-time (current-time))
+
+(defvar web-mode-pre-elements
+  '("code" "pre" "textarea"))
+
+(defvar web-mode-void-elements
+  '("area" "base" "br" "col" "command" "embed" "hr" "img" "input" "keygen"
+    "link" "meta" "param" "source" "track" "wbr"))
+
+(defvar web-mode-part-content-types '("css" "javascript" "json" "jsx"))
+
+(defvar web-mode-javascript-languages '("javascript" "jsx" "ejs"))
+
+;; NOTE: without 'syntax-table forward-word fails (#377)
+(defvar web-mode-scan-properties
+  (list 'tag-beg 'tag-end 'tag-name 'tag-type
+        'tag-attr 'tag-attr-beg 'tag-attr-end
+        'part-side 'part-token
+        'jsx-beg 'jsx-end 'jsx-depth
+        'block-side 'block-token 'block-controls 'block-beg 'block-end
+        'syntax-table)
+  "Text properties used for code regions/tokens and html nodes.")
+
+(defvar web-mode-start-tag-regexp "<\\([[:alpha:]][[:alnum:]:-]*\\)"
+  "Regular expression for HTML/XML start tag.")
+
+(defvar web-mode-whitespaces-regexp
+  "^[ \t]\\{2,\\}$\\| \t\\|\t \\|[ \t]+$\\|^[ \n\t]+\\'\\|^[ \t]?[\n]\\{2,\\}"
+  "Regular expression for whitespaces.")
+
+(defvar web-mode-imenu-regexp-list
+  '(("<\\(h[1-9]\\)\\([^>]*\\)>\\([^<]*\\)" 1 3 ">")
+    ("^[ \t]*<\\([@a-z]+\\)[^>]*>? *$" 1 "id=\"\\([a-zA-Z0-9_]+\\)\"" "#" ">"))
+  "Regexps to match imenu items (see http://web-mode.org/doc/imenu.txt)")
+
+(defvar web-mode-indentation-params
+  '(("lineup-args"       . t)
+    ("lineup-calls"      . t)
+    ("lineup-concats"    . t)
+    ("lineup-quotes"     . t)
+    ("lineup-ternary"    . t)
+    ("case-extra-offset" . t)
+    ))
+
+(defvar web-mode-engines
+  '(("angular"          . ("angularjs" "angular.js"))
+    ("asp"              . ())
+    ("aspx"             . ())
+    ("blade"            . ("laravel"))
+    ("cl-emb"           . ())
+    ("clip"             . ())
+    ("closure"          . ("soy"))
+    ("ctemplate"        . ("mustache" "handlebars" "hapax" "ngtemplate" "ember"
+                           "kite" "meteor" "blaze" "ractive"))
+    ("django"           . ("dtl" "twig" "swig" "jinja" "erlydtl" "liquid"
+                           "clabango" "selmer" "nunjucks"))
+    ("dust"             . ("dustjs"))
+    ("ejs"              . ())
+    ("elixir"           . ("phoenix"))
+    ("erb"              . ("eruby" "erubis"))
+    ("freemarker"       . ())
+    ("go"               . ("gtl"))
+    ("jsp"              . ("grails"))
+    ("mako"             . ())
+    ("mason"            . ("poet"))
+    ("lsp"              . ("lisp"))
+    ("mojolicious"      . ())
+    ("php"              . ())
+    ("python"           . ())
+    ("razor"            . ("play" "play2"))
+    ("template-toolkit" . ())
+    ("smarty"           . ())
+    ("thymeleaf"        . ())
+    ("underscore"       . ("underscore.js"))
+    ("velocity"         . ("vtl" "cheetah" "ssp"))
+    ("web2py"           . ()))
+  "Engine name aliases")
+
+(defvar web-mode-content-types
+  '(("css"        . "\\.\\(s?css\\|css\\.erb\\)\\'")
+    ("javascript" . "\\.\\([jt]s\\|[jt]s\\.erb\\)\\'")
+    ("json"       . "\\.\\(api\\|json\\|jsonld\\)\\'")
+    ("jsx"        . "\\.[jt]sx\\'")
+    ("xml"        . "\\.xml\\'")
+    ("html"       . "."))
+  "content types")
+
+(defvar web-mode-engine-attr-regexps
+  '(("angular"   . "ng-")
+    ("thymeleaf" . "th:"))
+  "Engine custom attributes")
+
+(defvar web-mode-last-enabled-feature nil)
+
+(defvar web-mode-features
+  '(("css-colorization"          . web-mode-enable-css-colorization)
+    ("element-highlight"         . web-mode-enable-current-element-highlight)
+    ("column-highlight"          . web-mode-enable-current-column-highlight)
+    ("whitespace-fontification"  . web-mode-enable-whitespace-fontification)
+    ("element-tag-fontification" . web-mode-enable-element-tag-fontification)
+    ("block-face"                . web-mode-enable-block-face)
+    ("part-face"                 . web-mode-enable-part-face)))
+
+(defvar web-mode-comment-formats
+  '(("java"       . "/*")
+    ("javascript" . "/*")
+    ("php"        . "/*")
+    ))
+
+(defvar web-mode-engine-file-regexps
+  '(("asp"              . "\\.asp\\'")
+    ("aspx"             . "\\.as[cp]x\\'")
+    ("blade"            . "\\.blade\\.php\\'")
+    ("cl-emb"           . "\\.clemb\\'")
+    ("clip"             . "\\.ctml\\'")
+    ("closure"          . "\\.soy\\'")
+    ("ctemplate"        . "\\.\\(chtml\\|mustache\\)\\'")
+    ("django"           . "\\.\\(djhtml\\|tmpl\\|dtl\\|liquid\\|j2\\)\\'")
+    ("dust"             . "\\.dust\\'")
+    ("elixir"           . "\\.eex\\'")
+    ("ejs"              . "\\.ejs\\'")
+    ("erb"              . "\\.\\(erb\\|rhtml\\|erb\\.html\\)\\'")
+    ("freemarker"       . "\\.ftl\\'")
+    ("go"               . "\\.go\\(html\\|tmpl\\)\\'")
+    ("handlebars"       . "\\.\\(hb\\.html\\|hbs\\)\\'")
+    ("jinja"            . "\\.jinja\\'")
+    ("jsp"              . "\\.[gj]sp\\'")
+    ("lsp"              . "\\.lsp\\'")
+    ("mako"             . "\\.mako?\\'")
+    ("mason"            . "\\.mas\\'")
+    ("mojolicious"      . "\\.epl?\\'")
+    ("php"              . "\\.\\(p[hs]p\\|ctp\\|inc\\)\\'")
+    ("python"           . "\\.pml\\'")
+    ("razor"            . "\\.\\(cs\\|vb\\)html\\'")
+    ("smarty"           . "\\.tpl\\'")
+    ("template-toolkit" . "\\.tt.?\\'")
+    ("thymeleaf"        . "\\.thtml\\'")
+    ("velocity"         . "\\.v\\(sl\\|tl\\|m\\)\\'")
+
+    ("django"           . "[st]wig")
+    ("razor"            . "scala")
+
+    )
+  "Engine file extensions.")
+
+(defvar web-mode-smart-quotes
+  '("«" . "»")
+  "Preferred smart quotes")
+
+(defvar web-mode-xml-chars
+  '((?\& . "&amp;")
+    (?\< . "&lt;")
+    (?\> . "&gt;"))
+  "XML chars")
+
+(defvar web-mode-html-entities
+  '(("AElig" . 198) ("Aacute" . 193) ("Acirc" . 194) ("Agrave" . 192)
+    ("Alpha" . 913) ("Aring" . 197) ("Atilde" . 195) ("Auml" . 196)
+    ("Beta" . 914)
+    ("Ccedil" . 199) ("Chi" . 935)
+    ("Dagger" . 8225) ("Delta" . 916)
+    ("ETH" . 208) ("Eacute" . 201) ("Ecirc" . 202) ("Egrave" . 200)
+    ("Epsilon" . 917) ("Eta" . 919) ("Euml" . 203)
+    ("Gamma" . 915)
+    ("Iacute" . 205) ("Icirc" . 206) ("Igrave" . 204) ("Iota" . 921)
+    ("Iuml" . 207)
+    ("Kappa" . 922)
+    ("Lambda" . 923)
+    ("Mu" . 924)
+    ("Ntilde" . 209) ("Nu" . 925)
+    ("OElig" . 338) ("Oacute" . 211) ("Ocirc" . 212) ("Ograve" . 210)
+    ("Omega" . 937) ("Omicron" . 927) ("Oslash" . 216) ("Otilde" . 213)
+    ("Ouml" . 214)
+    ("Phi" . 934) ("Pi" . 928) ("Prime" . 8243) ("Psi" . 936)
+    ("Rho" . 929)
+    ("Scaron" . 352) ("Sigma" . 931)
+    ("THORN" . 222) ("Tau" . 932) ("Theta" . 920)
+    ("UArr" . 8657) ("Uacute" . 218) ("Uacute" . 250) ("Ucirc" . 219)
+    ("Ugrave" . 217)  ("Upsih" . 978)
+    ("Upsilon" . 933) ("Uuml" . 220) ("Uuml" . 252)
+    ("Xi" . 926)
+    ("Yacute" . 221) ("Yuml" . 376)
+    ("Zeta" . 918)
+    ("aacute" . 225) ("acirc" . 226) ("acute" . 180) ("aelig" . 230)
+    ("agrave" . 224) ("alefsym" . 8501) ("alpha" . 945) ("amp" . 38)
+    ("ang" . 8736) ("apos" . 39) ("aring" . 229) ("asymp" . 8776)
+    ("atilde" . 227) ("auml" . 228)
+    ("bdquo" . 8222) ("beta" . 946) ("brvbar" . 166) ("bull" . 8226)
+    ("cap" . 8745) ("ccedil" . 231) ("cedil" . 184) ("cent" . 162)
+    ("chi" . 967) ("circ" . 710) ("clubs" . 9827) ("cong" . 8773)
+    ("copy" . 169) ("crarr"  . 8629) ("cup" . 8746) ("curren" . 164)
+    ("dArr" . 8659) ("dagger" . 8224) ("darr" . 8595) ("deg" . 176)
+    ("delta" . 948) ("diams" . 9830) ("divide" . 247)
+    ("eacute" . 233) ("ecirc"  . 234) ("egrave" . 232) ("empty" . 8709)
+    ("emsp" . 8195) ("ensp" . 8194) ("epsilon" . 949) ("equiv" . 8801)
+    ("eta" . 951) ("eth" . 240) ("euml" . 235) ("euro" . 8364) ("exist" . 8707)
+    ("fnof" . 402) ("forall" . 8704) ("frac12" . 189) ("frac14" . 188)
+    ("frac34" . 190) ("frasl" . 8260)
+    ("gamma" . 947) ("ge" . 8805) ("gt" . 62)
+    ("hArr" . 8660) ("harr" . 8596) ("hearts" . 9829) ("hellip" . 8230)
+    ("iacute" . 237) ("icirc" . 238) ("iexcl" . 161) ("igrave" . 236)
+    ("image" . 8465) ("infin" . 8734) ("int" . 8747) ("iota" . 953)
+    ("iquest" . 191) ("isin" . 8712) ("iuml" . 239)
+    ("kappa" . 954)
+    ("lArr" . 8656) ("lambda" . 955) ("lang" . 9001) ("laquo" . 171)
+    ("larr" . 8592) ("lceil" . 8968) ("ldquo" . 8220) ("le" . 8804)
+    ("lfloor" . 8970) ("lowast" . 8727) ("loz" . 9674) ("lrm" . 8206)
+    ("lsaquo" . 8249) ("lsquo" . 8249) ("lt" . 60)
+    ("macr" . 175) ("mdash" . 8212) ("micro" . 181) ("middot" . 183)
+    ("minus" . 8722) ("mu" . 956)
+    ("nabla" . 8711) ("nbsp" . 160) ("ndash" . 8211) ("ne" . 8800)
+    ("ni" . 8715) ("not" . 172) ("notin" . 8713) ("nsub" . 8836)
+    ("ntilde" . 241) ("nu" . 957) ("oacute" . 243) ("ocirc" . 244)
+    ("oelig" . 339) ("ograve" . 242) ("oline" . 8254) ("omega" . 969)
+    ("omicron" . 959) ("oplus" . 8853) ("or" . 8744) ("ordf" . 170)
+    ("ordm" . 186) ("oslash" . 248) ("otilde" . 245) ("otimes" . 8855)
+    ("ouml" . 246)
+    ("para" . 182) ("part" . 8706) ("permil" . 8240) ("perp" . 8869)
+    ("phi" . 966) ("pi" . 960) ("piv" . 982) ("plusmn" . 177) ("pound" . 163)
+    ("prime" . 8242) ("prod" . 8719) ("prop" . 8733) ("psi" . 968)
+    ("quot" . 34)
+    ("rArr" . 8658) ("radic" . 8730) ("rang" . 9002) ("raquo" . 187)
+    ("rarr" . 8594) ("rceil" . 8969) ("rdquo" . 8221) ("real" . 8476)
+    ("reg" . 174) ("rfloor" . 8971) ("rho" . 961) ("rlm" . 8207)
+    ("rsaquo" . 8250) ("rsquo" . 8250) ("sbquo" . 8218)
+    ("scaron" . 353) ("sdot" . 8901) ("sect" . 167) ("shy" . 173)
+    ("sigma" . 963) ("sigmaf" . 962) ("sim" . 8764) ("spades" . 9824)
+    ("sub" . 8834) ("sube" . 8838) ("sum" . 8721) ("sup" . 8835)
+    ("sup1" . 185) ("sup2" . 178) ("sup3" . 179) ("supe" . 8839)
+    ("szlig" . 223)
+    ("tau" . 964) ("there4" . 8756) ("theta" . 952) ("thetasym" . 977)
+    ("thinsp" . 8201) ("thorn" . 254) ("tilde" . 732) ("times" . 215)
+    ("trade" . 8482)
+    ("uarr" . 8593) ("ucirc" . 251) ("ugrave" . 249) ("uml" . 168)
+    ("upsilon" . 965)
+    ("weierp" . 8472)
+    ("xi" . 958)
+    ("yacute" . 253) ("yen" . 165) ("yuml" . 255)
+    ("zeta" . 950) ("zwj" . 8205) ("zwnj" . 8204)))
+
+;; http://webdesign.about.com/od/localization/l/blhtmlcodes-ascii.htm
+(defvar web-mode-display-table
+  (let ((table (make-display-table)))
+    (aset table 9  (vector ?\xBB ?\t))
+    (aset table 10 (vector ?\xB6 ?\n))
+    (aset table 32 (vector ?\xB7))
+    table)
+  "Display table used when switching to the whitespace visualization.")
+
+(defvar web-mode-expanders
+  '(("a/" . "<a href=\"|\"></a>")
+    ("b/" . "<table><tbody><tr><td>|</td><td></td></tr></tbody></table>")
+    ("c/" . "<div class=\"|\"></div>")
+    ("d/" . "<div>|</div>")
+    ("e/" . "<em>|</em>")
+    ("f/" . "<form>|</form>")
+    ("g/" . "<strong>|</strong>")
+    ("h/" . "<h1>|</h1>")
+    ("i/" . "<img src=\"|\" />")
+    ("j/" . "<script>|</script>")
+    ("l/" . "<li>|</li>")
+    ("m/" . "<main>|</main>")
+    ("n/" . "<input type=\"|\" />")
+    ("p/" . "<p>|</p>")
+    ("q/" . "<quote>|</quote>")
+    ("s/" . "<span>|</span>")
+    ("t/" . "<td>|</td>")
+    ("u/" . "<ul><li>|</li><li></li></ul>")
+    ("x/" . "<textarea>|</textarea>")
+    ("2/" . "<h2>|</h2>")
+    ("3/" . "<h3>|</h3>")
+    ("?/" . "<?php | ?>")))
+
+(defvar web-mode-engines-auto-pairs
+  '(("angular"          . (("{{ " . " }}")))
+    ("asp"              . (("<% " . " %>")))
+    ("aspx"             . (("<% " . " %>")
+                           ("<%=" . "%>")
+                           ("<%#" . "%>")
+                           ("<%$" . "%>")
+                           ("<%@" . "%>")
+                           ("<%:" . "%>")
+                           ("<%-" . "- | --%>")))
+    ("blade"            . (("{{{" . " | }}}")
+                           ("{{ " . " }}")
+                           ("{!!" . " | !!}")
+                           ("@{{" . " | }}")
+                           ("{{-" . "- | --}}")))
+    ("cl-emb"           . (("<% " . " %>")
+                           ("<%=" . " | %>")
+                           ("<%#" . " | %>")))
+    ("ctemplate"        . (("{{ " . "| }}")
+                           ("{{{" . " | }}}")
+                           ("{~{" . " | }}")
+                           ("{{~" . "{ | }}}")
+                           ("{{!" . "-- | --}}")
+                           ("{{/" . "}}")
+                           ("{{#" . "}}")))
+    ("django"           . (("{{ " . " }}")
+                           ("{% " . " %}")
+                           ("{%-" . " | %}")
+                           ("{# " . " #}")))
+    ("elixir"           . (("<% " . " %>")
+                           ("<%=" . " | %>")
+                           ("<%%" . " | %>")
+                           ("<%#" . " | %>")))
+    ("ejs"              . (("<% " . " %>")
+                           ("<%=" . "%>")
+                           ("<%#" . "%>")
+                           ("<%-" . "%>")))
+    ("erb"              . (("<% " . " %>")
+                           ("<%=" . "%>")
+                           ("<%#" . "%>")
+                           ("<%-" . "%>")))
+    ("freemarker"       . (("<% " . " %>")
+                           ("${ " . " }")
+                           ("[% " . " %]")
+                           ("[# " . " #]")
+                           ("[#-" . "- | --]")))
+    ("jsp"              . (("<% " . " %>")
+                           ("<%-" . "- | --%>")
+                           ("<%=" . "%>")
+                           ("<%!" . "%>")
+                           ("<%@" . "%>")
+                           ("${ " . " }")))
+    ("lsp"              . (("<% " . " %>")
+                           ("<%%" . " | %>")
+                           ("<%#" . " | %>")))
+    ("mako"             . (("<% " . " %>")
+                           ("<%!" . " | %>")
+                           ("${ " . " }")))
+    ("mason"            . (("<% " . " %>")
+                           ("<& " . " &>")))
+    ("mojolicious"      . (("<% " . " %>")
+                           ("<%=" . " | %>")
+                           ("<%%" . " | %>")
+                           ("<%#" . " | %>")))
+    ("php"              . (("<?p" . "hp | ?>")
+                           ("<? " . " ?>")
+                           ("<?=" . "?>")))
+    ("template-toolkit" . (("[% " . " %]")
+                           ("[%-" . " | %]")
+                           ("[%#" . " | %]")))
+    ("underscore"       . (("<% " . " %>")))
+    ("web2py"           . (("{{ " . " }}")
+                           ("{{=" . "}}")))
+    (nil                . (("<!-" . "- | -->")))
+    ))
+
+(defvar web-mode-engines-snippets
+  '(("ejs" . (("for"     . "<% for (|) { %>\n\n<% } %>")
+              ("if"      . "<% if (|) { %>\n\n<% } %>")))
+    ("erb" . (("each"    . "<% |.each do  %>\n\n<% end %>")
+              ("if"      . "<% if | %>\n\n<% end %>")
+              ("when"    . "<% when | %>\n\n<% end %>")
+              ("unless"  . "<% unless | %>\n\n<% end %>")))
+    ("php" . (("if"      . "<?php if (|): ?>\n\n<?php endif; ?>")
+              ("while"   . "<?php while (|): ?>\n\n<?php endwhile; ?>")
+              ("for"     . "<?php for (| ; ; ): ?>\n\n<?php endfor; ?>")
+              ("foreach" . "<?php foreach (| as ): ?>\n\n<?php endforeach; ?>")
+              ("each"    . "<?php foreach (| as ): ?>\n\n<?php endforeach; ?>")
+              ("switch"  . "<?php switch (|): ?>\n<?php case 1: ?>\n\n<?php break ;?>\n<?php case 2: ?>\n\n<?php break ;?>\n<?php endswitch;?>")))
+    ("django" . (("block"      . "{% block | %}\n\n{% endblock %}")
+                 ("comment"    . "{% comment | %}\n\n{% endcomment %}")
+                 ("cycle"      . "{% cycle | as  %}\n\n{% endcycle  %}")
+                 ("filter"     . "{% filter | %}\n\n{% endfilter %}")
+                 ("for"        . "{% for | in  %}\n\n{% endfor %}")
+                 ("if"         . "{% if | %}\n\n{% endif %}")
+                 ("ifequal"    . "{% ifequal | %}\n\n{% endifequal %}")
+                 ("ifnotequal" . "{% ifnotequal | %}\n\n{% endifnotequal %}")
+                 ("safe"       . "{% safe | %}\n\n{% endsafe %}")))
+    ("template-toolkit" . (("if"      . "[% IF | %]\n\n[% END %]")))
+    (nil . (("html5" . "<!doctype html>\n<html>\n<head>\n<title></title>\n<meta charset=\"utf-8\" />\n</head>\n<body>\n|\n</body>\n</html>")
+            ("table" . "<table><tbody>\n<tr>\n<td>|</td>\n<td></td>\n</tr>\n</tbody></table>")
+            ("ul"    . "<ul>\n<li>|</li>\n<li></li>\n</ul>")))
+    ))
+
+(defvar web-mode-engine-token-regexps
+  (list
+   '("asp"         . "//\\|/\\*\\|\"\\|'")
+   '("ejs"         . "//\\|/\\*\\|\"\\|'")
+   '("erb"         . "\"\\|'\\|#\\|<<[-]?['\"]?\\([[:alnum:]_]+\\)['\"]?")
+   '("lsp"         . "\"\\|#|\\|;")
+   '("mako"        . "\"\\|'\\|#")
+   '("mason"       . "\"\\|'\\|#")
+   '("mojolicious" . "\"\\|'")
+   '("php"         . "//\\|/\\*\\|#\\|\"\\|'\\|<<<['\"]?\\([[:alnum:]]+\\)['\"]?")
+   '("python"      . "\"\\|'\\|#")
+   '("web2py"      . "\"\\|'"))
+  "Engine regexps used to identify tokens (strings / comments) in blocks.")
+
+(defvar web-mode-engine-open-delimiter-regexps
+  (list
+   '("angular"          . "{{")
+   '("asp"              . "<%\\|</?[[:alpha:]]+:[[:alpha:]]+\\|</?[[:alpha:]]+Template")
+   '("aspx"             . "<%.")
+   '("blade"            . "{{.\\|{!!\\|@{{\\|@[[:alpha:]]")
+   '("cl-emb"           . "<%")
+   '("closure"          . "{.\\|/\\*\\| //")
+   '("clip"             . "</?c:[[:alpha:]-]+")
+   '("ctemplate"        . "[$]?{[{~].")
+   '("django"           . "{[#{%]")
+   '("dust"             . "{.")
+   '("elixir"           . "<%.")
+   '("ejs"              . "<%")
+   '("erb"              . "<%\\|^%.")
+   '("freemarker"       . "<%\\|${\\|</?[[:alpha:]]+:[[:alpha:]]\\|</?[@#]\\|\\[/?[@#].")
+   '("go"               . "{{.")
+   '("jsp"              . "<%\\|${\\|</?[[:alpha:]]+[:.][[:alpha:]]+")
+   '("lsp"              . "<%")
+   '("mako"             . "</?%\\|${\\|^[ \t]*%.\\|^[ \t]*##")
+   '("mason"            . "</?[&%]\\|^%.")
+   '("mojolicious"      . "<%\\|^[ \t]*%.")
+   '("php"              . "<\\?")
+   '("python"           . "<\\?")
+   '("razor"            . "@.\\|^[ \t]*}")
+   '("smarty"           . "{[[:alpha:]#$/*\"]")
+   '("template-toolkit" . "\\[%.\\|%%#")
+   '("underscore"       . "<%")
+   '("velocity"         . "#[[:alpha:]#*]\\|$[[:alpha:]!{]")
+   '("web2py"           . "{{"))
+  "Engine regexps used to identify blocks.")
+
+(defvar web-mode-normalization-rules
+  '(("tag-case"          . "lower-case")
+    ("attr-case"         . "lower-case")
+    ("special-chars"     . "unicode") ; "unicode" "entities"
+    ("css-indentation"   . t)
+    ("smart-apostrophes" . t)
+    ("smart-quotes"      . t)
+    ("whitespaces"       . t)
+    ("indentation"       . t))
+  "Normalization rules")
+
+(defvar web-mode-element-tag-faces
+  (list
+   '("h1"     . web-mode-underline-face)
+   '("h2"     . web-mode-underline-face)
+   '("h3"     . web-mode-underline-face)
+   '("h4"     . web-mode-underline-face)
+   '("title"  . web-mode-underline-face)
+   '("em"     . web-mode-italic-face)
+   '("strong" . web-mode-bold-face)
+   ))
+
+(defvar web-mode-element-content-faces
+  (list
+   '("h1"     . web-mode-underline-face)
+   '("h2"     . web-mode-underline-face)
+   '("h3"     . web-mode-underline-face)
+   '("h4"     . web-mode-underline-face)
+   '("title"  . web-mode-underline-face)
+   '("em"     . web-mode-italic-face)
+   '("strong" . web-mode-bold-face)
+   ))
+
+(defvar web-mode-comment-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "comment" web-mode-extra-keywords))
+    '("FIXME" "TODO" "BUG" "KLUDGE" "WORKAROUND" "OPTIMIZE" "HACK" "REFACTOR" "REVIEW"))))
+
+(defvar web-mode-sql-queries
+  (regexp-opt
+   '("SELECT" "INSERT" "UPDATE" "DELETE" "select" "insert" "update" "delete")))
+
+(defvar web-mode-sql-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "sql" web-mode-extra-keywords))
+    '("SELECT" "INSERT" "UPDATE" "DELETE"
+      "FROM" "WHERE" "GROUP BY" "LIMIT" "HAVING" "JOIN" "LEFT" "INNER"
+      "FULL" "OUTER" "VALUES" "ORDER BY" "SEPARATOR" "ASC" "DESC"
+      "AND" "OR" "ON"))))
+
+(defvar web-mode-python-constants
+  (regexp-opt
+   (append
+    (cdr (assoc "python" web-mode-extra-constants))
+    '("True" "False" "None" "__debug__" "NotImplemented" "Ellipsis"))))
+
+(defvar web-mode-erlang-constants
+  (regexp-opt
+   (append
+    (cdr (assoc "erlang" web-mode-extra-constants))
+    '("true" "false"))))
+
+(defvar web-mode-erlang-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "erlang" web-mode-extra-keywords))
+    '("else" "if" "do" "end"))))
+
+(defvar web-mode-cl-emb-constants
+  (regexp-opt
+   '("nil" "t" "raw" "escape")))
+
+(defvar web-mode-cl-emb-keywords
+  (regexp-opt
+   '("if" "else" "endif" "unless" "endunless" "var" "repeat"
+     "endrepeat" "loop" "endloop" "include" "call" "with"
+     "endwith" "set" "genloop" "endgenloop" "insert")))
+
+(defvar web-mode-lsp-constants
+  (regexp-opt
+   '("nil" "t")))
+
+(defvar web-mode-lsp-keywords
+  (regexp-opt
+   '("dolist" "let" "while" "cond" "when" "progn" "if"
+     "dotimes" "unless" "lambda"
+     "loop" "for" "and" "or" "in" "do" "defun")))
+
+(defvar web-mode-php-constants
+  (regexp-opt
+   (append
+    (cdr (assoc "php" web-mode-extra-constants))
+    '("TRUE" "FALSE" "NULL" "true" "false" "null"
+      "STR_PAD_LEFT" "STR_PAD_RIGHT"
+      "ENT_COMPAT" "ENT_QUOTES" "ENT_NOQUOTES" "ENT_IGNORE"
+      "ENT_SUBSTITUTE" "ENT_DISALLOWED" "ENT_HTML401" "ENT_XML1"
+      "ENT_XHTML" "ENT_HTML5" "JSON_PRETTY_PRINT"
+      "LIBXML_NOBLANKS"))))
+
+(defvar web-mode-php-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "php" web-mode-extra-keywords))
+    '("and" "array" "as" "break"
+      "callable" "case" "catch"  "catch all" "class" "const" "continue"
+      "default" "die" "do" "echo" "else" "elseif" "empty"
+      "endfor" "endforeach" "endif" "endswitch" "endwhile" "exit" "extends"
+      "finally" "for" "foreach" "function" "global" "goto"
+      "if" "include" "include_once" "instanceof" "interface" "isset"
+      "list" "next" "new" "or" "private" "protected" "public"
+      "require" "require_once" "return" "static" "switch" "try" "throw"
+      "unset" "use" "var" "when" "while" "xor" "yield"))))
+
+(defvar web-mode-php-types
+  (eval-when-compile
+    (regexp-opt
+     '("array" "bool" "boolean" "char" "const" "double" "float"
+       "int" "integer" "long" "mixed" "object" "real" "string"))))
+
+(defvar web-mode-css-at-rules
+  (eval-when-compile
+    (regexp-opt
+     '("charset" "import" "media" "page" "font-face"
+       "namespace" "supports" "document"
+       "keyframes" "-moz-keyframes" "-webkit-keyframes"
+       "mixin"))))
+
+(defvar web-mode-css-pseudo-classes
+  (eval-when-compile
+    (regexp-opt
+     '("active" "after" "before" "checked" "disabled" "empty" "enabled"
+       "first" "first-child" "first-letter" "first-line" "first-of-type" "focus"
+       "hover" "lang" "last-child" "last-of-type" "left" "link"
+       "not" "nth-child" "nth-last-child" "nth-last-of-type" "nth-of-type"
+       "only-child" "only-of-type"
+       "right" "root" "selection" "target" "visited"))))
+
+(defvar web-mode-python-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "python" web-mode-extra-keywords))
+    '("and" "as" "assert" "break" "class" "continue" "def" "del"
+      "elif" "else" "except" "finally" "for" "from" "global"
+      "if" "import" "in" "is" "lambda" "nonlocal" "not" "or" "pass"
+      "raise" "return" "try" "while" "with" "yield"))))
+
+(defvar web-mode-jsp-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "jsp" web-mode-extra-keywords))
+    '("case" "catch" "do" "else" "end" "false" "for" "function"
+      "if" "in" "include"
+      "new" "package" "page" "private" "protected" "public"
+      "return" "tag" "taglib" "throw" "throws" "true" "try" "void" "while"))))
+
+(defvar web-mode-erb-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "erb" web-mode-extra-keywords))
+    '("alias" "and" "begin" "break" "case" "class" "def" "defined?" "do"
+      "elsif" "else" "end" "ensure" "fail" "for" "if" "in"
+      "module" "next" "not" "or" "redo" "rescue" "retry" "return"
+      "then" "super" "unless" "undef" "until" "when" "while" "yield"
+      "__ENCODING__" "__FILE__" "__LINE__"))))
+
+(defvar web-mode-mason-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "mason" web-mode-extra-keywords))
+    '("and" "base" "close" "die" "each" "else" "elsif" "eval" "exists"
+      "foreach" "grep" "if" "length" "local" "my" "next" "open" "or"
+      "package" "pop" "ref" "return" "stat" "sub" "tie"
+      "undef" "unless" "use" "while"))))
+
+(defvar web-mode-erb-builtins
+  (regexp-opt
+   (append
+    (cdr (assoc "erb" web-mode-extra-builtins))
+
+    '("__callee__" "__dir__" "__method__"
+      "abort" "at_exit" "autoload" "autoload?"
+      "binding" "block_given?" "caller" "catch"
+      "eval" "exec" "exit" "exit!" "fail" "fork" "format"
+      "lambda" "load" "loop" "open"
+      "p" "print" "printf" "proc" "putc" "puts"
+      "raise" "rand" "readline" "readlines" "require" "require_relative"
+      "sleep" "spawn" "sprintf" "srand" "syscall" "system"
+      "throw" "trap" "warn"
+      "alias_method" "attr" "attr_accessor" "attr_reader" "attr_writer"
+      "define_method" "extend" "include" "module_function"
+      "prepend" "private" "protected" "public"
+      "refine" "using"
+
+      "error_message_on" "error_messages_for" "form" "input"
+      "auto_discovery_link_tag" "image_tag" "javascript_include_tag"
+      "stylesheet_link_tag" "image_path" "path_to_image"" "
+      "javascript_path" "path_to_javascript" "register_javascript_expansion"
+      "register_javascript_include_default" "register_stylesheet_expansion"
+      "stylesheet_path" "path_to_stylesheet" "atom_feed" "entry" "updated"
+      "benchmark" "cache" "capture" "content_for" "distance_of_time_in_words"
+      "distance_of_time_in_words_to_now" "time_ago_in_words" "date_select"
+      "datetime_select" "time_select" "select_date" "select_datetime"
+      "select_day" "select_hour" "select_minute" "select_month" "select_second"
+      "select_time" "select_year" "debug"
+      "check_box" "fields_for" "file_field" "form_for" "hidden_field"
+      "label" "password_field" "radio_button" "text_area" "text_field"
+      "check_box_tag" "field_set_tag" "file_field_tag" "form_tag"
+      "hidden_field_tag" "image_submit_tag" "label_tag" "password_field_tag"
+      "radio_button_tag" "select_tag" "submit_tag" "text_area_tag"
+      "text_field_tag"
+      "collection_select" "country_options_for_select" "country_select"
+      "option_groups_from_collection_for_select" "options_for_select"
+      "options_from_collection_for_select" "select"
+      "time_zone_options_for_select"
+      "time_zone_select" "button_to_function" "define_javascript_functions"
+      "escape_javascript" "javascript_tag" "link_to_function"" "
+      "number_to_currency" "number_to_human_size" "number_to_percentage"
+      "number_to_phone" "number_with_delimiter" "number_with_precision"
+      "evaluate_remote_response" "form_remote_for" "form_remote_tag"
+      "link_to_remote" "observe_field" "observe_field"
+      "periodically_call_remote"
+      "remote_form_for" "remote_function" "submit_to_remote" "update_page"
+      "update_page_tag" "dom_class" "dom_id" "partial_path" "sanitize"
+      "sanitize_css" "strip_links" "strip_tags"
+      "cdata_section" "content_tag" "escape_once" "tag"
+      "auto_link" "concat" "cycle" "excerpt" "highlight" "markdown" "pluralize"
+      "reset_cycle" "simple_format" "textilize" "textilize_without_paragraph"
+      "truncate" "word_wrap" "button_to" "current_page?" "link_to" "link_to_if"
+      "link_to_unless" "link_to_unless_current" "mail_to" "url_for"
+      "action_name" "atom_feed" "audio_path" "audio_tag"
+      "content_tag_for" "controller" "controller_name" "action_name"
+      "controller_path" "convert_to_model" "cookies" "csrf_meta_tag"
+      "csrf_meta_tags" "headers"
+      "current_cycle" "div_for" "email_field" "email_field_tag"
+      "favicon_link_tag" "flash" "l" "button_tag"
+      "grouped_collection_select" "grouped_options_for_select"
+      "image_alt" "j" "javascript_cdata_section"
+      "localize" "logger" "number_field"
+      "number_field_tag" "number_to_human" "params" "path_to_audio"
+      "path_to_video" "phone_field" "phone_field_tag" "provide"
+      "range_field" "range_field_tag" "raw" "render" "request"
+      "request_forgery_protection_token" "response" "safe_concat"
+      "safe_join" "search_field" "search_field_tag"
+      "session" "t" "telephone_field" "telephone_field_tag"
+      "time_tag" "translate" "url_field" "url_field_tag"
+      "url_options" "video_path" "video_tag" "simple_form_for"
+
+      ))))
+
+(defvar web-mode-asp-constants
+  (regexp-opt
+   (append
+    (cdr (assoc "asp" web-mode-extra-constants))
+    '("adAsyncExecute" "adAsyncFetch" "adAsyncFetchNonBlocking" "adCmdFile"
+      "adCmdStoredProc" "adCmdTable" "adCmdTableDirect" "adCmdText" "adCmdUnknown"
+      "adCmdUnspecified" "adExecuteNoRecords" "adExecuteRecord" "adExecuteStream"
+      "adLockBatchOptimistic" "adLockOptimistic" "adLockPessimistic"
+      "adLockReadOnly" "adLockUnspecified" "adOpenDynamic" "adOpenForwardOnly"
+      "adOpenKeyset" "adOpenStatic" "adOpenUnspecified" "adOptionUnspecified"
+      "Empty" "Nothing" "Null" "True" "False"
+      "vbBack" "vbCr" "vbCrLf" "vbFormFeed" "vbLf" "vbNewLine" "vbNullChar"
+      "vbNullString" "vbObjectError" "vbScript" "vbTab" "vbVerticalTab"))))
+
+(defvar web-mode-asp-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "asp" web-mode-extra-keywords))
+    '("Abs" "And" "Array" "Asc" "Atn"
+      "CBool" "CByte" "CCur" "CDate" "CDbl" "CInt" "CLng" "CSng" "CStr"
+      "Call" "Case" "Chr" "Class" "Const" "Cos" "CreateObject"
+      "Date" "DateAdd" "DateDiff" "DatePart" "DateSerial" "DateValue"
+      "Day" "Dim" "Do"
+      "Each" "Else" "ElseIf" "End" "Erase" "Err" "Eval" "Exit" "Exp"
+      "Explicit"
+      "Filter" "Fix" "For" "FormatCurrency" "FormatDateTime"
+      "FormatNumber" "FormatPercent" "Function"
+      "GetLocale" "GetObject" "GetRef" "Hex" "Hour"
+      "If" "In" "InStr" "InStrRev" "InputBox" "Int" "IsArray" "IsDate"
+      "IsEmpty" "IsNull" "IsNumeric" "IsObject" "Join"
+      "LBound" "LCase" "LTrim" "Language" "Left" "Len" "Let"
+      "LoadPicture" "Log" "Loop"
+      "Mid" "Minute" "Month" "MonthName" "MsgBox"
+      "New" "Next" "Not" "Now"
+      "Oct" "On" "Option" "Or" "Preserve" "Private" "Public"
+      "RGB" "RTrim" "Redim" "Rem" "Replace" "Right" "Rnd" "Round"
+      "ScriptEngine" "ScriptEngineBuildVersion"
+      "ScriptEngineMajorVersion" "ScriptEngineMinorVersion"
+      "Second" "Select" "Set" "SetLocale" "Sgn" "Sin" "Space" "Split"
+      "Sqr" "StrComp" "StrReverse" "String" "Sub"
+      "Tan" "Then" "Time" "TimeSerial" "TimeValue" "Timer" "To" "Trim"
+      "TypeName"
+      "UBound" "UCase" "Until" "VarType"
+      "Weekday" "WeekdayName" "Wend" "With" "While" "Year"))))
+
+(defvar web-mode-asp-types
+  (regexp-opt
+   (append
+    (cdr (assoc "asp" web-mode-extra-types))
+    '("Application" "ASPError" "Request" "Response" "Server" "Session"))))
+
+(defvar web-mode-aspx-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "aspx" web-mode-extra-keywords))
+    '("case" "catch" "do" "else" "end" "for" "foreach" "function"
+      "if" "in" "include" "new" "package" "page" "return"
+      "tag" "throw" "throws" "try" "while"))))
+
+(defvar web-mode-smarty-keywords
+  (regexp-opt '("as")))
+
+(defvar web-mode-velocity-keywords
+  (eval-when-compile
+    (regexp-opt '("in" "true" "false"))))
+
+(defvar web-mode-freemarker-keywords
+  (eval-when-compile
+    (regexp-opt '("as" "list"))))
+
+(defvar web-mode-go-keywords
+  (eval-when-compile
+    (regexp-opt
+     '("define" "else" "end" "if" "pipeline" "range" "template" "with"))))
+
+(defvar web-mode-go-functions
+  (eval-when-compile
+    (regexp-opt
+     '("and" "call" "html" "index" "js" "len" "not" "or"
+       "print" "printf" "println" "urlquery"))))
+
+(defvar web-mode-closure-keywords
+  (eval-when-compile
+    (regexp-opt '("in" "and" "not" "or"))))
+
+(defvar web-mode-django-control-blocks
+  '(
+
+    "assets" "autoescape"
+    "block" "blocktrans"
+    "cache" "call" "capture" "comment"
+    "draw"
+    "embed"
+    "filter" "for" "foreach" "form"
+    "if" "ifchanged" "ifequal" "ifnotequal"
+    "macro"
+    "random" "raw"
+    "safe" "sandbox" "spaceless"
+    "tablerow"
+    "unless"
+    "verbatim"
+    "with"
+
+    "endassets" "endautoescape"
+    "endblock" "endblocktrans"
+    "endcache" "endcall" "endcapture" "endcomment"
+    "draw"
+    "endembed"
+    "endfilter" "endfor" "endforeach" "endform"
+    "endif" "endifchanged" "endifequal" "endifnotequal"
+    "endmacro"
+    "endrandom" "endraw"
+    "endsafe" "endsandbox"  "endspaceless"
+    "endtablerow"
+    "endunless"
+    "endverbatim"
+    "endwith"
+
+    ;; "set" "endset" ;#504
+
+    "csrf_token" "cycle" "debug"
+    "elif" "else" "elseif" "elsif" "empty" "extends"
+    "firstof" "include" "load" "lorem" "now" "regroup" "ssi"
+    "trans" "templatetag" "url" "widthratio"
+
+    ))
+
+(defvar web-mode-django-control-blocks-regexp
+  (regexp-opt web-mode-django-control-blocks t))
+
+(defvar web-mode-django-keywords
+  (eval-when-compile
+    (regexp-opt
+     '("and" "as" "assign"
+       "break"
+       "cache" "call" "case" "context" "continue"
+       "do"
+       "flush" "from"
+       "ignore" "import" "in" "is"
+       "layout" "load"
+       "missing"
+       "none" "not"
+       "or"
+       "pluralize"
+       "random"
+       "set" ;#504
+       "unless" "use"
+       "var"
+       ))))
+
+(defvar web-mode-django-types
+  (eval-when-compile
+    (regexp-opt '("null" "false" "true"))))
+
+(defvar web-mode-directives
+  (eval-when-compile
+    (regexp-opt
+     '("include" "page" "taglib"
+       "Assembly" "Control" "Implements" "Import"
+       "Master" "OutputCache" "Page" "Reference" "Register"))))
+
+(defvar web-mode-template-toolkit-keywords
+  (regexp-opt
+   '("block" "call" "case" "catch" "clear" "default" "do"
+     "else" "elsif" "end" "filter" "final" "for"
+     "foreach" "get" "if" "in" "include" "insert" "is" "last"
+     "macro" "meta" "or" "perl" "process" "rawperl" "return"
+     "set" "stop" "switch" "tags" "throw" "try"
+     "unless" "use" "while" "wrapper")))
+
+(defvar web-mode-perl-keywords
+  (regexp-opt
+   '("__DATA__" "__END__" "__FILE__" "__LINE__" "__PACKAGE__"
+     "and" "cmp" "continue" "CORE" "do" "else" "elsif" "eq" "exp"
+     "for" "foreach" "ge" "gt" "if" "le" "lock" "lt" "m" "ne" "no"
+     "or" "package" "q" "qq" "qr" "qw" "qx" "s" "sub"
+     "tr" "unless" "until" "while" "xor" "y"
+     "my" "use" "print" "say")))
+
+(defvar web-mode-javascript-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "javascript" web-mode-extra-keywords))
+    '("break" "case" "catch" "class" "const" "continue"
+      "debugger" "default" "delete" "do" "else" "enum" "eval"
+      "export" "extends" "finally" "for" "from" "function" "get" "if"
+      "implements" "import" "in" "instanceof" "interface" "let"
+      "new" "package" "private" "protected" "public"
+      "return" "set" "static" "super" "switch"
+      "throw" "try" "typeof" "var" "void" "while" "with" "yield"))))
+
+(defvar web-mode-javascript-constants
+  (regexp-opt
+   '("false" "null" "undefined" "Infinity" "NaN" "true" "arguments" "this")))
+
+(defvar web-mode-razor-keywords
+  (regexp-opt
+   (append
+    (cdr (assoc "razor" web-mode-extra-keywords))
+    '("false" "true" "foreach" "if" "else" "in" "var" "for" "display"
+      "match" "case"
+      "Html"))))
+
+(defvar web-mode-selector-font-lock-keywords
+  (list
+   '("$[[:alnum:]-]+" 0 'web-mode-css-variable-face)
+   (cons (concat "@\\(" web-mode-css-at-rules "\\)\\_>")
+         '(0 'web-mode-css-at-rule-face))
+   '("\\_<\\(all\|braille\\|embossed\\|handheld\\|print\\|projection\\|screen\\|speech\\|tty\\|tv\\|and\\|or\\)\\_>"
+     1 'web-mode-keyword-face)
+   '("[^,]+" 0 'web-mode-css-selector-face)
+   (cons (concat ":\\(" web-mode-css-pseudo-classes "\\)\\(([^)]*)\\)?")
+         '(0 'web-mode-css-pseudo-class-face t t))
+   ))
+
+(defvar web-mode-declaration-font-lock-keywords
+  (list
+   '("--[[:alnum:]-]+" 0 'web-mode-css-variable-face)
+   '("$[[:alnum:]-]+" 0 'web-mode-css-variable-face)
+   (cons (concat "@\\(" web-mode-css-at-rules "\\)\\_>") '(1 'web-mode-css-at-rule-face))
+   '("\\([[:alpha:]-]+\\)[ ]?:" 0 'web-mode-css-property-name-face)
+   '("\\([[:alpha:]-]+\\)[ ]?(" 1 'web-mode-css-function-face)
+   '("#[[:alnum:]]\\{1,6\\}" 0 'web-mode-css-color-face t t)
+   '("![ ]?important" 0 'web-mode-css-priority-face t t)
+   '("\\([^,]+\\)[ ]+{" 1 'web-mode-css-selector-face)
+   '("'[^']*'\\|\"[^\"]*\"" 0 'web-mode-string-face t t)
+   ))
+
+(defvar web-mode-html-font-lock-keywords
+  (list
+   '("</?[[:alnum:]]+[ >]\\|>" 0 'web-mode-html-tag-face t)
+   '(" \\([[:alnum:]-]+=\\)\\(\"[^\"]+\"\\)"
+     (1 'web-mode-html-attr-name-face)
+     (2 'web-mode-html-attr-value-face))
+   ))
+
+(defvar web-mode-javascript-font-lock-keywords
+  (list
+   '("@\\([[:alnum:]_]+\\)\\_>" 0 'web-mode-keyword-face)
+   (cons (concat "\\_<\\(" web-mode-javascript-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-javascript-constants "\\)\\_>") '(0 'web-mode-constant-face))
+   '("\\_<\\(new\\|instanceof\\|class\\|extends\\) \\([[:alnum:]_.]+\\)\\_>" 2 'web-mode-type-face)
+   '("\\_<\\([[:alnum:]_]+\\):[ ]*function[ ]*(" 1 'web-mode-function-name-face)
+   '("\\_<\\(function\\|get\\|set\\)[ ]+\\([[:alnum:]_]+\\)"
+     (1 'web-mode-keyword-face)
+     (2 'web-mode-function-name-face))
+   '("([ ]*\\([[:alnum:]_]+\\)[ ]*=>" 1 'web-mode-function-name-face)
+   '("[ ]*\\([[:alnum:]_]+\\)[ ]*=[ ]*([^)]*)[ ]*=>[ ]*{" 1 'web-mode-function-name-face)
+   '("\\_<\\(var\\|let\\|const\\)[ ]+\\([[:alnum:]_]+\\)" 2 'web-mode-variable-name-face)
+   '("\\([[:alnum:]_]+\\)[ ]*=> [{(]" 1 'web-mode-variable-name-face)
+   '("\\(function\\|[,=]\\|^\\)[ ]*("
+     ("\\([[:alnum:]_]+\\)\\([ ]*=[^,)]*\\)?[,)]" nil nil (1 'web-mode-variable-name-face)))
+   '("\\([[:alnum:]_]+\\):" 1 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-html-tag-font-lock-keywords
+  (list
+   '("\\(</?\\)\\([[:alnum:]]+\\)"
+     (1 'web-mode-html-tag-bracket-face)
+     (2 'web-mode-html-tag-face))
+   '("\"[^\"]*\"" 0 'web-mode-html-attr-value-face)
+   '("\\([[:alnum:]]+\\)" 1 'web-mode-html-attr-name-face)
+   '("/?>" 0 'web-mode-html-tag-bracket-face)
+  ))
+
+(defvar web-mode-dust-font-lock-keywords
+  (list
+   '("{[#:/?@><+^]\\([[:alpha:]_.]+\\)" 1 'web-mode-block-control-face)
+   '(":\\([[:alpha:]]+\\)" 1 'web-mode-keyword-face)
+   '("\\_<\\([[:alnum:]_]+=\\)\\(\"[^\"]*\"\\|[[:alnum:]_]*\\)"
+     (1 'web-mode-block-attr-name-face)
+     (2 'web-mode-block-attr-value-face))
+   '("\\\([[:alnum:]_.]+\\)" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-template-toolkit-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-template-toolkit-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   '("\\\([[:alpha:]][[:alnum:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("\\\([[:alpha:]][[:alnum:]_]+\\)" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-smarty-font-lock-keywords
+  (list
+   (cons (concat "[ ]\\(" web-mode-smarty-keywords "\\)[ ]") '(1 'web-mode-keyword-face))
+   '("{/?\\([[:alpha:]_]+\\)" 1 'web-mode-block-control-face)
+   '("\\([}{]\\)" 0 'web-mode-block-delimiter-face)
+   '("\\_<\\([$]\\)\\([[:alnum:]_]+\\)" (1 nil) (2 'web-mode-variable-name-face))
+   '("\\_<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '(" \\(\\sw+[ ]?=\\)" 1 'web-mode-param-name-face)
+   '(" \\(\\sw+\\)[ }]" 1 'web-mode-param-name-face)
+   '("|\\([[:alnum:]_]+\\)" 1 'web-mode-function-call-face)
+   '("\\(->\\)\\(\\sw+\\)" (1 nil) (2 'web-mode-variable-name-face))
+   '("[.]\\([[:alnum:]_-]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[.]\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
+   '("#\\([[:alnum:]_]+\\)#" 1 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-velocity-font-lock-keywords
+  (list
+   '("#{?\\([[:alpha:]_]+\\)\\_>" (1 'web-mode-block-control-face))
+   (cons (concat "\\_<\\(" web-mode-velocity-keywords "\\)\\_>") '(1 'web-mode-keyword-face t t))
+   '("#macro([ ]*\\([[:alpha:]]+\\)[ ]+" 1 'web-mode-function-name-face)
+   '("[.]\\([[:alnum:]_-]+\\)" 1 'web-mode-variable-name-face)
+   '("\\_<\\($[!]?[{]?\\)\\([[:alnum:]_-]+\\)[}]?" (1 nil) (2 'web-mode-variable-name-face))
+   ))
+
+(defvar web-mode-mako-tag-font-lock-keywords
+  (list
+   '("</?%\\([[:alpha:]:]+\\)" 1 'web-mode-block-control-face)
+   '("\\_<\\([[:alpha:]]+=\\)\\(\"[^\"]*\"\\)"
+     (1 'web-mode-block-attr-name-face t t)
+     (2 'web-mode-block-attr-value-face t t))
+   ))
+
+(defvar web-mode-mako-block-font-lock-keywords
+  (list
+   '("\\_<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
+   (cons (concat "\\_<\\(" web-mode-python-constants "\\)\\_>") '(1 'web-mode-constant-face))
+   (cons (concat "\\_<\\(" web-mode-python-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(endfor\\|endif\\|endwhile\\)\\_>") '(1 'web-mode-keyword-face))
+   ))
+
+(defvar web-mode-web2py-font-lock-keywords
+  (list
+   '("\\_<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
+   (cons (concat "\\_<\\(" web-mode-python-constants "\\)\\_>") '(1 'web-mode-constant-face))
+   (cons (concat "\\_<\\(" web-mode-python-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(block\\|extend\\|super\\|end\\|include\\)\\_>") '(1 'web-mode-keyword-face))
+   ))
+
+(defvar web-mode-django-expr-font-lock-keywords
+  (list
+   '("|[ ]?\\([[:alpha:]_]+\\)\\_>" 1 'web-mode-filter-face)
+   (cons (concat "\\_<\\(" web-mode-django-types "\\)\\_>") '(1 'web-mode-type-face))
+   '("\\_<\\([[:alpha:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[[:alnum:]_]+" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-django-code-font-lock-keywords
+  (list
+   (cons (concat "{%[ ]*\\(" web-mode-django-control-blocks-regexp "\\)[ %]") '(1 'web-mode-block-control-face))
+   '("{%[ ]*\\(end[[:alpha:]]+\\)\\_>" 1 'web-mode-block-control-face) ;#504
+   (cons (concat "\\_<\\(" web-mode-django-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-django-types "\\)\\_>") '(1 'web-mode-type-face))
+   '("|[ ]?\\([[:alpha:]_]+\\)\\_>" 1 'web-mode-function-call-face)
+   '("\\_<\\([[:alpha:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[[:alnum:]_.]+" 0 'web-mode-variable-name-face)
+   '("[[:alnum:]_]+\\([.][[:alnum:]_]+\\)+" 0 'web-mode-variable-name-face t t)
+   ))
+
+(defvar web-mode-ctemplate-font-lock-keywords
+  (list
+   '("{[~]?{[#/>]?[ ]*\\([[:alnum:]_-]+\\)" 1 'web-mode-block-control-face)
+   '("[ \t]+\\([[:alnum:]_]+\\)=\\([[:alnum:]_.]+\\|\"[^\"]+\"\\|\([^)]+\)\\)"
+     (1 'web-mode-block-attr-name-face)
+     (2 'web-mode-block-attr-value-face))
+   '("\"[^\"]+\"" 0 'web-mode-block-string-face)
+   ))
+
+(defvar web-mode-razor-font-lock-keywords
+  (list
+   '("@\\([[:alnum:]_.]+\\)[ ]*[({]" 1 'web-mode-block-control-face)
+   (cons (concat "\\_<\\(" web-mode-razor-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   '("@\\([[:alnum:]_.]+\\)" 1 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-closure-font-lock-keywords
+  (list
+   '("{/?\\([[:alpha:]]+\\)" 1 'web-mode-block-control-face)
+   '("{param[ ]+\\([[:alnum:]]+\\)" 1 'web-mode-symbol-face)
+   '("\\_<\\(true\\|false\\|null\\)\\_>" 1 'web-mode-type-face)
+   (cons (concat "\\_<\\(" web-mode-closure-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   '("{\\(alias\\|call\\|delcall\\|delpackage\\|deltemplate\\|namespace\\|template\\)[ ]+\\([[:alnum:].]+\\)" 2 'web-mode-constant-face)
+   '("\\(allowemptydefault\\|data\\|desc\\|meaning\\|autoescape\\|private\\|variant\\)=" 0 'web-mode-block-attr-name-face)
+   '("|\\([[:alpha:]]+\\)" 1 'web-mode-function-call-face)
+   '("\\_<\\([[:alnum:]]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("$\\([[:alnum:]._]+\\)" 1 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-go-font-lock-keywords
+  (list
+   '("{{[ ]*\\([[:alpha:]]+\\)" 1 'web-mode-block-control-face)
+   (cons (concat "\\_<\\(" web-mode-go-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-go-functions "\\)\\_>") '(1 'web-mode-function-call-face))
+   '("[$.]\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face t t)
+   ))
+
+(defvar web-mode-expression-font-lock-keywords
+  (list
+   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-angular-font-lock-keywords
+  (list
+   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-underscore-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-javascript-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   '("\\_<\\(_\.[[:alpha:]]+\\)(" 1 'web-mode-function-call-face)
+   '("\\_<new \\([[:alnum:]_.]+\\)\\_>" 1 'web-mode-type-face)
+   '("\\_<\\([[:alnum:]_]+\\):[ ]*function[ ]*(" 1 'web-mode-function-name-face)
+   '("\\_<\\(var\\)\\_>[ ]+\\([[:alnum:]_]+\\)"
+     (1 'web-mode-keyword-face)
+     (2 'web-mode-variable-name-face))
+   ))
+
+(defvar web-mode-engine-tag-font-lock-keywords
+  (list
+   '("</?\\([[:alpha:]]+\\(?:Template\\|[:.][[:alpha:]-]+\\)\\)" 1 'web-mode-block-control-face)
+   '("\\_<\\([[:alpha:]-]+=\\)\\(\"[^\"]*\"\\)"
+     (1 'web-mode-block-attr-name-face t t)
+     (2 'web-mode-block-attr-value-face t t))
+   '("\\_<\\([[:alpha:]-]+=\\)\\('[^']*\'\\)"
+     (1 'web-mode-block-attr-name-face t t)
+     (2 'web-mode-block-attr-value-face t t))
+   ))
+
+(defvar web-mode-jsp-font-lock-keywords
+  (list
+   '("\\(throws\\|new\\|extends\\)[ ]+\\([[:alnum:].]+\\)" 2 'web-mode-type-face)
+   (cons (concat "\\_<\\(" web-mode-jsp-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   '("\\_<\\([[:alnum:]._]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("@\\(\\sw*\\)" 1 'web-mode-variable-name-face)
+   '("\\_<\\([[:alnum:].]+\\)[ ]+[{[:alpha:]]+" 1 'web-mode-type-face)
+   ))
+
+(defvar web-mode-asp-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-asp-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-asp-types "\\)\\_>") '(0 'web-mode-type-face))
+   (cons (concat "\\_<\\(" web-mode-asp-constants "\\)\\_>") '(0 'web-mode-constant-face))
+   '("\\(Class\\|new\\) \\([[:alnum:]_]+\\)" 2 'web-mode-type-face)
+   '("Const \\([[:alnum:]_]+\\)" 1 'web-mode-constant-face)
+   '("\\_<dim\\_>"
+     (0 'web-mode-keyword-face)
+     ("[[:alnum:]_]+" nil nil (0 'web-mode-variable-name-face)))
+   '("\\_<\\(public\\|private\\|sub\\|function\\)\\_> \\([[:alnum:]_]+\\)[ ]*(" 2 'web-mode-function-name-face)
+   '("\\_<\\(public\\|private\\|dim\\)\\_> \\([[:alnum:]_]+\\)" 2 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-aspx-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-aspx-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   '("\\_<\\([[:alnum:].]+\\)[ ]+[[:alpha:]]+" 1 'web-mode-type-face)
+   ))
+
+(defvar web-mode-uel-font-lock-keywords
+  (list
+   '("[$#{]{\\|}" 0 'web-mode-preprocessor-face)
+   '("\\([[:alpha:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("|[ ]*\\(trim\\|x\\|u\\)" 1 'web-mode-function-call-face)
+   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-php-var-interpolation-font-lock-keywords
+  (list
+   '("[[:alpha:]_]" 0 'web-mode-variable-name-face)
+   '("\".+\"\\|'.*'" 0 'web-mode-string-face)
+   ))
+
+(defvar web-mode-freemarker-square-font-lock-keywords
+  (list
+   '("\\[/?[#@]\\([[:alpha:]_.]*\\)" 1 'web-mode-block-control-face)
+   '("#\\(macro\\|function\\) \\([[:alpha:]]+\\)" 2 'web-mode-function-name-face)
+   (cons (concat "\\_<\\(" web-mode-freemarker-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   '("\\_<\\([[:alnum:]._]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[[:alpha:]]\\([[:alnum:]_]+\\)?" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-freemarker-font-lock-keywords
+  (list
+   '("</?[#@]\\([[:alpha:]_.]*\\)" 1 'web-mode-block-control-face)
+   '("#\\(macro\\|function\\) \\([[:alpha:]]+\\)" 2 'web-mode-function-name-face)
+   (cons (concat "\\_<\\(" web-mode-freemarker-keywords "\\)\\_>") '(1 'web-mode-keyword-face))
+   '("\\_<\\([[:alnum:]._]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[[:alpha:]]\\([[:alnum:]_]+\\)?" 0 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-directive-font-lock-keywords
+  (list
+   '("<%@[ ]*\\([[:alpha:]]+\\)[ ]+" 1 'web-mode-block-control-face)
+   '("\\_<\\([[:alpha:]]+=\\)\\(\"[^\"]*\"\\)"
+     (1 'web-mode-block-attr-name-face t t)
+     (2 'web-mode-block-attr-value-face t t))
+   ))
+
+(defvar web-mode-erb-font-lock-keywords
+  (list
+   '("[^:]\\(:[[:alnum:]_]+\\)" 1 'web-mode-symbol-face)
+   '("\\([[:alnum:]_]+:\\)[ ]+" 1 'web-mode-symbol-face)
+   (cons (concat "\\_<\\(" web-mode-erb-builtins "\\)\\_>") '(0 'web-mode-builtin-face))
+   (cons (concat "\\_<\\(" web-mode-erb-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   '("\\_<\\(self\\|true\\|false\\|nil\\)\\_>" 0 'web-mode-variable-name-face)
+   '("[@$]@?\\([[:alnum:]_]+\\)" 0 'web-mode-variable-name-face)
+   '("class[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-type-face)
+   '("def[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
+   '("\\(?:\\_<\\|::\\)\\([A-Z]+[[:alnum:]_]+\\)" 1 (unless (eq (char-after) ?\() 'web-mode-type-face))
+   '("/[^/]+/" 0 'web-mode-string-face)
+   ))
+
+(defvar web-mode-ejs-font-lock-keywords
+  web-mode-javascript-font-lock-keywords)
+
+(defvar web-mode-python-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-python-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   ))
+
+(defvar web-mode-erlang-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-erlang-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-erlang-constants "\\)\\_>") '(0 'web-mode-constant-face))
+   '("@\\([[:alnum:]_]+\\)" 0 'web-mode-variable-name-face)
+   '("[ ]\\(:[[:alnum:]-_]+\\)" 1 'web-mode-symbol-face)
+   ))
+
+(defvar web-mode-mason-code-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-mason-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   '("sub[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
+   '("\\_<\\([[:alnum:]_]+\\)[ ]?::" 1 'web-mode-type-face)
+   '("\\([@]\\)\\([[:alnum:]#_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
+   '("\\_<\\([$%]\\)\\([[:alnum:]@#_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
+   '("{\\([[:alnum:]_]+\\)}" 1 'web-mode-variable-name-face)
+   '("\\_<\\(\\sw+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[[:alnum:]_][ ]?::[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
+   '("->[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
+   '("\\(?:method\\|def\\) \\([[:alnum:]._]+\\)" 1 'web-mode-function-name-face)
+   '("|[ ]*\\([[:alnum:],]+\\)[ ]*%>" 1 'web-mode-filter-face)
+   ))
+
+(defvar web-mode-mason-block-font-lock-keywords
+  (list
+   '("<[/]?%\\([[:alpha:]]+\\)" 1 'web-mode-block-control-face)
+   '("[[:alpha:]]" 0 'web-mode-block-attr-value-face)
+   ))
+
+(defvar web-mode-mojolicious-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-perl-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   '("\\_<\\(begin\\|end\\)\\_>" 1 'web-mode-constant-face)
+   '("\\_<\\([$]\\)\\([[:alnum:]_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
+   ))
+
+(defvar web-mode-lsp-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-lsp-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-lsp-constants "\\)\\_>") '(1 'web-mode-constant-face))
+   '("[ ]\\(:[[:alnum:]-_]+\\)" 1 'web-mode-symbol-face)
+   '("(defun \\([[:alnum:]-:]+\\)" 1 'web-mode-function-name-face)
+   '("(defvar \\([[:alnum:]-:]+\\)" 1 'web-mode-variable-name-face)
+   ))
+
+(defvar web-mode-cl-emb-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-cl-emb-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   (cons (concat "\\_<\\(" web-mode-cl-emb-constants "\\)\\_>") '(0 'web-mode-constant-face))
+   '("\\(@\\)" 1 'web-mode-function-call-face)
+   (list (concat "\\(@" web-mode-cl-emb-keywords "\\)[ ]+\\([[:alnum:]_]+\\)")
+         '(1 'web-mode-keyword-face)
+         '(2 'web-mode-variable-name-face))
+   ))
+
+(defvar web-mode-php-font-lock-keywords
+  (list
+   (cons (concat "\\_<\\(" web-mode-php-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
+   (cons (concat "(\\_<\\(" web-mode-php-types "\\)\\_>") '(1 'web-mode-type-face))
+   (cons (concat "\\_<\\(" web-mode-php-constants "\\)\\_>") '(0 'web-mode-constant-face))
+   '("function[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
+   '("\\_<\\([[:alnum:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
+   '("[[:alnum:]_][ ]?::[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-constant-face)
+   '("->[ ]?\\([[:alnum:]_]+\\)" 1 'web-mode-variable-name-face)
+   '("\\_<\\([[:alnum:]_]+\\)[ ]?::" 1 'web-mode-type-face)
+   '("\\_<\\(instanceof\\|class\\|extends\\|new\\)[ ]+\\([[:alnum:]_]+\\)" 2 'web-mode-type-face)
+   '("\\_<\\([$]\\)\\([[:alnum:]_]*\\)" (1 nil) (2 'web-mode-variable-name-face))
+   ))
+
+(defvar web-mode-latex-font-lock-keywords
+  (list
+   '("[[:alnum:]_]+" 0 'web-mode-function-name-face t t)
+   ))
+
+(defvar web-mode-blade-font-lock-keywords
+  (append
+   (list
+    '("@\\([[:alpha:]_]+\\)" (1 'web-mode-block-control-face)))
+   web-mode-php-font-lock-keywords))
+
+(defvar web-mode-engines-font-lock-keywords
+  '(("angular"          . web-mode-angular-font-lock-keywords)
+    ("blade"            . web-mode-blade-font-lock-keywords)
+    ("cl-emb"           . web-mode-cl-emb-font-lock-keywords)
+    ("closure"          . web-mode-closure-font-lock-keywords)
+    ("ctemplate"        . web-mode-ctemplate-font-lock-keywords)
+    ("dust"             . web-mode-dust-font-lock-keywords)
+    ("elixir"           . web-mode-erlang-font-lock-keywords)
+    ("ejs"              . web-mode-ejs-font-lock-keywords)
+    ("erb"              . web-mode-erb-font-lock-keywords)
+    ("go"               . web-mode-go-font-lock-keywords)
+    ("lsp"              . web-mode-lsp-font-lock-keywords)
+    ("mojolicious"      . web-mode-mojolicious-font-lock-keywords)
+    ("php"              . web-mode-php-font-lock-keywords)
+    ("python"           . web-mode-python-font-lock-keywords)
+    ("razor"            . web-mode-razor-font-lock-keywords)
+    ("smarty"           . web-mode-smarty-font-lock-keywords)
+    ("template-toolkit" . web-mode-template-toolkit-font-lock-keywords)
+    ("underscore"       . web-mode-underscore-font-lock-keywords)
+    ("web2py"           . web-mode-web2py-font-lock-keywords)
+    ("velocity"         . web-mode-velocity-font-lock-keywords))
+  "Engines font-lock keywords")
+
+(defvar web-mode-before-auto-complete-hooks nil
+  "List of functions to run before triggering the auto-complete library.
+
+Auto-complete sources will sometimes need some tweaking to work
+nicely with web-mode. This hook gives users the chance to adjust
+the environment as needed for ac-sources, right before they're used.")
+
+(defvar web-mode-ignore-ac-start-advice nil
+  "If not nil 'defadvice' for 'ac-start' will be ignored.
+
+Can be set inside a hook in 'web-mode-before-auto-complete-hooks' to
+non nil to ignore the defadvice which sets ac-sources according to current
+language. This is needed if the corresponding auto-completion triggers
+another auto-completion with different ac-sources (e.g. ac-php)")
+
+(defvar web-mode-ac-sources-alist nil
+  "alist mapping language names to ac-sources for that language.")
+
+(defvar web-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?- "_" table)
+    (modify-syntax-entry ?_ "_" table) ;; #563
+    (modify-syntax-entry ?< "." table)
+    (modify-syntax-entry ?> "." table)
+    (modify-syntax-entry ?& "." table)
+    (modify-syntax-entry ?/ "." table)
+    (modify-syntax-entry ?= "." table)
+    (modify-syntax-entry ?% "." table)
+    table)
+  "Syntax table used to reveal whitespaces.")
+
+(defvar web-mode-map
+  (let ((map (make-sparse-keymap)))
+
+    (define-key map [menu-bar wm]             (cons "Web-Mode" (make-sparse-keymap)))
+    (define-key map [menu-bar wm dom]         (cons "Dom" (make-sparse-keymap)))
+    (define-key map [menu-bar wm blk]         (cons "Block" (make-sparse-keymap)))
+    (define-key map [menu-bar wm attr]        (cons "Html Attr" (make-sparse-keymap)))
+    (define-key map [menu-bar wm tag]         (cons "Html Tag" (make-sparse-keymap)))
+    (define-key map [menu-bar wm elt]         (cons "Html Element" (make-sparse-keymap)))
+
+    (define-key map [menu-bar wm sep-1]       '(menu-item "--"))
+
+    (define-key map [menu-bar wm dom dom-xpa] '(menu-item "XPath" web-mode-dom-xpath))
+    (define-key map [menu-bar wm dom dom-tra] '(menu-item "Traverse" web-mode-dom-traverse))
+    (define-key map [menu-bar wm dom dom-err] '(menu-item "Show error(s)" web-mode-dom-errors-show))
+    (define-key map [menu-bar wm dom dom-ent] '(menu-item "Replace html entities" web-mode-dom-entities-replace))
+    (define-key map [menu-bar wm dom dom-quo] '(menu-item "Replace dumb quotes" web-mode-dom-quotes-replace))
+    (define-key map [menu-bar wm dom dom-apo] '(menu-item "Replace apostrophes" web-mode-dom-apostrophes-replace))
+    (define-key map [menu-bar wm dom dom-nor] '(menu-item "Normalise" web-mode-dom-normalize))
+
+    (define-key map [menu-bar wm blk blk-sel] '(menu-item "Select" web-mode-block-select))
+    (define-key map [menu-bar wm blk blk-pre] '(menu-item "Previous" web-mode-block-previous))
+    (define-key map [menu-bar wm blk blk-nex] '(menu-item "Next" web-mode-block-next))
+    (define-key map [menu-bar wm blk blk-kil] '(menu-item "Kill" web-mode-block-kill))
+    (define-key map [menu-bar wm blk blk-end] '(menu-item "End" web-mode-block-end))
+    (define-key map [menu-bar wm blk blk-clo] '(menu-item "Close" web-mode-block-close))
+    (define-key map [menu-bar wm blk blk-beg] '(menu-item "Beginning" web-mode-block-beginning))
+
+    (define-key map [menu-bar wm attr attr-ins] '(menu-item "Insert" web-mode-attribute-insert))
+    (define-key map [menu-bar wm attr attr-end] '(menu-item "End" web-mode-attribute-end))
+    (define-key map [menu-bar wm attr attr-beg] '(menu-item "Beginning" web-mode-attribute-beginning))
+    (define-key map [menu-bar wm attr attr-sel] '(menu-item "Select" web-mode-attribute-select))
+    (define-key map [menu-bar wm attr attr-kil] '(menu-item "Kill" web-mode-attribute-kill))
+    (define-key map [menu-bar wm attr attr-nex] '(menu-item "Next" web-mode-attribute-next))
+    (define-key map [menu-bar wm attr attr-pre] '(menu-item "Previous" web-mode-attribute-previous))
+    (define-key map [menu-bar wm attr attr-tra] '(menu-item "Transpose" web-mode-attribute-transpose))
+
+    (define-key map [menu-bar wm tag tag-beg] '(menu-item "Sort Attributes" web-mode-tag-attributes-sort))
+    (define-key map [menu-bar wm tag tag-sel] '(menu-item "Select" web-mode-tag-select))
+    (define-key map [menu-bar wm tag tag-pre] '(menu-item "Previous" web-mode-tag-previous))
+    (define-key map [menu-bar wm tag tag-nex] '(menu-item "Next" web-mode-tag-next))
+    (define-key map [menu-bar wm tag tag-end] '(menu-item "End" web-mode-tag-end))
+    (define-key map [menu-bar wm tag tag-beg] '(menu-item "Beginning" web-mode-tag-beginning))
+
+    (define-key map [menu-bar wm elt elt-wra] '(menu-item "Wrap" web-mode-element-wrap))
+    (define-key map [menu-bar wm elt elt-van] '(menu-item "Vanish" web-mode-element-vanish))
+    (define-key map [menu-bar wm elt elt-exc] '(menu-item "Transpose" web-mode-element-transpose))
+    (define-key map [menu-bar wm elt elt-sel] '(menu-item "Select" web-mode-element-select))
+    (define-key map [menu-bar wm elt elt-ren] '(menu-item "Rename" web-mode-element-rename))
+    (define-key map [menu-bar wm elt elt-pre] '(menu-item "Previous" web-mode-element-previous))
+    (define-key map [menu-bar wm elt elt-par] '(menu-item "Parent" web-mode-element-parent))
+    (define-key map [menu-bar wm elt elt-nex] '(menu-item "Next" web-mode-element-next))
+    (define-key map [menu-bar wm elt elt-mut] '(menu-item "Mute blanks" web-mode-element-mute-blanks))
+    (define-key map [menu-bar wm elt elt-del] '(menu-item "Kill" web-mode-element-kill))
+    (define-key map [menu-bar wm elt elt-end] '(menu-item "End" web-mode-element-end))
+    (define-key map [menu-bar wm elt elt-inn] '(menu-item "Content (select)" web-mode-element-content-select))
+    (define-key map [menu-bar wm elt elt-clo] '(menu-item "Close" web-mode-element-close))
+    (define-key map [menu-bar wm elt elt-ins] '(menu-item "Insert" web-mode-element-insert))
+    (define-key map [menu-bar wm elt elt-dup] '(menu-item "Clone" web-mode-element-clone))
+    (define-key map [menu-bar wm elt elt-cfo] '(menu-item "Children fold" web-mode-element-children-fold-or-unfold))
+    (define-key map [menu-bar wm elt elt-chi] '(menu-item "Child" web-mode-element-child))
+    (define-key map [menu-bar wm elt elt-beg] '(menu-item "Beginning" web-mode-element-beginning))
+
+    (define-key map [menu-bar wm fol]         '(menu-item "Fold/Unfold" web-mode-fold-or-unfold))
+    (define-key map [menu-bar wm hig]         '(menu-item "Highlight buffer" web-mode-buffer-highlight))
+    (define-key map [menu-bar wm ind]         '(menu-item "Indent buffer" web-mode-buffer-indent))
+    (define-key map [menu-bar wm nav]         '(menu-item "Tag/Block navigation" web-mode-navigate))
+    (define-key map [menu-bar wm exp]         '(menu-item "Mark and Expand" web-mode-mark-and-expand))
+    (define-key map [menu-bar wm spa]         '(menu-item "Toggle whitespaces" web-mode-whitespaces-show))
+    (define-key map [menu-bar wm sni]         '(menu-item "Insert snippet" web-mode-snippet-insert))
+
+    ;;--------------------------------------------------------------------------
+    ;; "C-c <LETTER>" are reserved for users
+
+    (define-key map (kbd "C-c C-a b") 'web-mode-attribute-beginning)
+    (define-key map (kbd "C-c C-a e") 'web-mode-attribute-end)
+    (define-key map (kbd "C-c C-a i") 'web-mode-attribute-insert)
+    (define-key map (kbd "C-c C-a n") 'web-mode-attribute-next)
+    (define-key map (kbd "C-c C-a s") 'web-mode-attribute-select)
+    (define-key map (kbd "C-c C-a k") 'web-mode-attribute-kill)
+    (define-key map (kbd "C-c C-a p") 'web-mode-attribute-previous)
+    (define-key map (kbd "C-c C-a t") 'web-mode-attribute-transpose)
+
+    (define-key map (kbd "C-c C-b b") 'web-mode-block-beginning)
+    (define-key map (kbd "C-c C-b c") 'web-mode-block-close)
+    (define-key map (kbd "C-c C-b e") 'web-mode-block-end)
+    (define-key map (kbd "C-c C-b k") 'web-mode-block-kill)
+    (define-key map (kbd "C-c C-b n") 'web-mode-block-next)
+    (define-key map (kbd "C-c C-b p") 'web-mode-block-previous)
+    (define-key map (kbd "C-c C-b s") 'web-mode-block-select)
+
+    (define-key map (kbd "C-c C-d a") 'web-mode-dom-apostrophes-replace)
+    (define-key map (kbd "C-c C-d d") 'web-mode-dom-errors-show)
+    (define-key map (kbd "C-c C-d e") 'web-mode-dom-entities-replace)
+    (define-key map (kbd "C-c C-d n") 'web-mode-dom-normalize)
+    (define-key map (kbd "C-c C-d q") 'web-mode-dom-quotes-replace)
+    (define-key map (kbd "C-c C-d t") 'web-mode-dom-traverse)
+    (define-key map (kbd "C-c C-d x") 'web-mode-dom-xpath)
+
+    (define-key map (kbd "C-c C-e /") 'web-mode-element-close)
+    (define-key map (kbd "C-c C-e a") 'web-mode-element-content-select)
+    (define-key map (kbd "C-c C-e b") 'web-mode-element-beginning)
+    (define-key map (kbd "C-c C-e c") 'web-mode-element-clone)
+    (define-key map (kbd "C-c C-e d") 'web-mode-element-child)
+    (define-key map (kbd "C-c C-e e") 'web-mode-element-end)
+    (define-key map (kbd "C-c C-e f") 'web-mode-element-children-fold-or-unfold)
+    (define-key map (kbd "C-c C-e i") 'web-mode-element-insert)
+    (define-key map (kbd "C-c C-e k") 'web-mode-element-kill)
+    (define-key map (kbd "C-c C-e m") 'web-mode-element-mute-blanks)
+    (define-key map (kbd "C-c C-e n") 'web-mode-element-next)
+    (define-key map (kbd "C-c C-e p") 'web-mode-element-previous)
+    (define-key map (kbd "C-c C-e r") 'web-mode-element-rename)
+    (define-key map (kbd "C-c C-e s") 'web-mode-element-select)
+    (define-key map (kbd "C-c C-e t") 'web-mode-element-transpose)
+    (define-key map (kbd "C-c C-e u") 'web-mode-element-parent)
+    (define-key map (kbd "C-c C-e v") 'web-mode-element-vanish)
+    (define-key map (kbd "C-c C-e w") 'web-mode-element-wrap)
+
+    (define-key map (kbd "C-c C-t a") 'web-mode-tag-attributes-sort)
+    (define-key map (kbd "C-c C-t b") 'web-mode-tag-beginning)
+    (define-key map (kbd "C-c C-t e") 'web-mode-tag-end)
+    (define-key map (kbd "C-c C-t m") 'web-mode-tag-match)
+    (define-key map (kbd "C-c C-t n") 'web-mode-tag-next)
+    (define-key map (kbd "C-c C-t p") 'web-mode-tag-previous)
+    (define-key map (kbd "C-c C-t s") 'web-mode-tag-select)
+
+    ;;--------------------------------------------------------------------------
+
+    (define-key map (kbd "M-;")       'web-mode-comment-or-uncomment)
+
+    ;;C-c C-a : attribute
+    ;;C-c C-b : block
+    ;;C-c C-d : dom
+    ;;C-c C-e : element
+    (define-key map (kbd "C-c C-f")   'web-mode-fold-or-unfold)
+    (define-key map (kbd "C-c C-h")   'web-mode-buffer-highlight)
+    (define-key map (kbd "C-c C-i")   'web-mode-buffer-indent)
+    (define-key map (kbd "C-c C-j")   'web-mode-jshint)
+    (define-key map (kbd "C-c C-m")   'web-mode-mark-and-expand)
+    (define-key map (kbd "C-c C-n")   'web-mode-navigate)
+    (define-key map (kbd "C-c C-r")   'web-mode-reload)
+    (define-key map (kbd "C-c C-s")   'web-mode-snippet-insert)
+    ;;C-c C-t : tag
+    (define-key map (kbd "C-c C-w")   'web-mode-whitespaces-show)
+
+    map)
+  "Keymap for `web-mode'.")
+
+;;---- COMPATIBILITY -----------------------------------------------------------
+
+(eval-and-compile
+
+  ;; compatibility with emacs 22
+  (defun web-mode-string-match-p (regexp string &optional start)
+    "Same as `string-match' except it does not change the match data."
+    (let ((inhibit-changing-match-data t))
+      (string-match regexp string start)))
+
+  (unless (fboundp 'string-match-p)
+    (fset 'string-match-p (symbol-function 'web-mode-string-match-p)))
+
+  ;; compatibility with emacs < 23.3
+  (if (fboundp 'with-silent-modifications)
+      (defalias 'web-mode-with-silent-modifications 'with-silent-modifications)
+    (defmacro web-mode-with-silent-modifications (&rest body)
+      `(let ((old-modified-p (buffer-modified-p))
+             (inhibit-modification-hooks t)
+             (buffer-undo-list t))
+         (unwind-protect
+             ,@body
+           (set-buffer-modified-p old-modified-p)))))
+
+  ;; compatibility with emacs < 24
+  (defalias 'web-mode-prog-mode
+    (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
+
+  ;; compatibility with emacs < 24.3
+  (defun web-mode-buffer-narrowed-p ()
+    (if (fboundp 'buffer-narrowed-p)
+        (buffer-narrowed-p)
+      (/= (- (point-max) (point-min)) (buffer-size))))
+
+  ;; compatibility with emacs < 24.3
+  (unless (fboundp 'setq-local)
+    (defmacro setq-local (var val)
+    `(set (make-local-variable ',var) ,val)))
+
+  ) ;eval-and-compile
+
+;;---- MAJOR MODE --------------------------------------------------------------
+
+;;;###autoload
+(define-derived-mode web-mode web-mode-prog-mode "Web"
+  "Major mode for editing web templates."
+
+  (make-local-variable 'web-mode-attr-indent-offset)
+  (make-local-variable 'web-mode-auto-pairs)
+  (make-local-variable 'web-mode-block-regexp)
+  (make-local-variable 'web-mode-change-beg)
+  (make-local-variable 'web-mode-change-end)
+  (make-local-variable 'web-mode-code-indent-offset)
+  (make-local-variable 'web-mode-column-overlays)
+  (make-local-variable 'web-mode-comment-style)
+  (make-local-variable 'web-mode-content-type)
+  (make-local-variable 'web-mode-css-indent-offset)
+  (make-local-variable 'web-mode-display-table)
+  (make-local-variable 'web-mode-django-control-blocks)
+  (make-local-variable 'web-mode-django-control-blocks-regexp)
+  (make-local-variable 'web-mode-enable-block-face)
+  (make-local-variable 'web-mode-enable-inlays)
+  (make-local-variable 'web-mode-enable-part-face)
+  (make-local-variable 'web-mode-enable-sexp-functions)
+  (make-local-variable 'web-mode-engine)
+  (make-local-variable 'web-mode-engine-attr-regexp)
+  (make-local-variable 'web-mode-engine-file-regexps)
+  (make-local-variable 'web-mode-engine-open-delimiter-regexps)
+  (make-local-variable 'web-mode-engine-token-regexp)
+  (make-local-variable 'web-mode-expand-initial-pos)
+  (make-local-variable 'web-mode-expand-initial-scroll)
+  (make-local-variable 'web-mode-expand-previous-state)
+  (make-local-variable 'web-mode-indent-style)
+  (make-local-variable 'web-mode-inhibit-fontification)
+  (make-local-variable 'web-mode-is-scratch)
+  (make-local-variable 'web-mode-jshint-errors)
+  (make-local-variable 'web-mode-last-enabled-feature)
+  (make-local-variable 'web-mode-markup-indent-offset)
+  (make-local-variable 'web-mode-minor-engine)
+  (make-local-variable 'web-mode-overlay-tag-end)
+  (make-local-variable 'web-mode-overlay-tag-start)
+  (make-local-variable 'web-mode-sql-indent-offset)
+  (make-local-variable 'web-mode-time)
+
+  (make-local-variable 'comment-end)
+  (make-local-variable 'comment-region-function)
+  (make-local-variable 'comment-start)
+  (make-local-variable 'fill-paragraph-function)
+  (make-local-variable 'font-lock-beg)
+  (make-local-variable 'font-lock-defaults)
+  (make-local-variable 'font-lock-extend-region-functions)
+  (make-local-variable 'font-lock-end)
+  (make-local-variable 'font-lock-support-mode)
+  (make-local-variable 'font-lock-unfontify-region-function)
+  (make-local-variable 'imenu-case-fold-search)
+  (make-local-variable 'imenu-create-index-function)
+  (make-local-variable 'imenu-generic-expression)
+  (make-local-variable 'indent-line-function)
+  (make-local-variable 'parse-sexp-lookup-properties)
+  (make-local-variable 'uncomment-region-function)
+  (make-local-variable 'yank-excluded-properties)
+
+  (setq comment-end "-->"
+        comment-region-function 'web-mode-comment-or-uncomment-region
+        comment-start "<!--"
+        fill-paragraph-function 'web-mode-fill-paragraph
+        font-lock-defaults '(web-mode-font-lock-keywords t)
+        font-lock-extend-region-functions '(web-mode-extend-region)
+        font-lock-support-mode nil
+        font-lock-unfontify-region-function 'web-mode-unfontify-region
+        imenu-case-fold-search t
+        imenu-create-index-function 'web-mode-imenu-index
+        indent-line-function 'web-mode-indent-line
+        parse-sexp-lookup-properties t
+        yank-excluded-properties t
+        uncomment-region-function 'web-mode-comment-or-uncomment-region)
+
+  (add-hook 'after-change-functions 'web-mode-on-after-change nil t)
+  (add-hook 'after-save-hook        'web-mode-on-after-save t t)
+  (add-hook 'change-major-mode-hook 'web-mode-on-exit nil t)
+  (add-hook 'post-command-hook      'web-mode-on-post-command nil t)
+
+  (cond
+   ((boundp 'yas-after-exit-snippet-hook)
+    (add-hook 'yas-after-exit-snippet-hook
+              'web-mode-yasnippet-exit-hook
+              t t))
+   ((boundp 'yas/after-exit-snippet-hook)
+    (add-hook 'yas/after-exit-snippet-hook
+              'web-mode-yasnippet-exit-hook
+              t t))
+   )
+
+  (when web-mode-enable-whitespace-fontification
+    (web-mode-whitespaces-on))
+
+  ;;(when (and (boundp 'indent-tabs-mode) indent-tabs-mode)
+  ;;  (web-mode-use-tabs))
+
+  (when web-mode-enable-sexp-functions
+    (setq-local forward-sexp-function 'web-mode-forward-sexp))
+
+  (web-mode-guess-engine-and-content-type)
+  (setq web-mode-change-beg (point-min)
+        web-mode-change-end (point-max))
+  (when (> (point-max) 256000)
+    (web-mode-buffer-highlight))
+
+  (when (and (boundp 'hs-special-modes-alist)
+             (not (assoc major-mode hs-special-modes-alist)))
+    (add-to-list 'hs-special-modes-alist '(web-mode "{" "}" "/[*/]" web-mode-forward-sexp nil))
+    ) ;when
+
+  )
+
+;;---- DEFUNS ------------------------------------------------------------------
+
+(defun web-mode-scan-region (beg end &optional content-type)
+  "Identify nodes/parts/blocks and syntactic symbols (strings/comments)."
+  ;;(message "scan-region: beg(%d) end(%d) content-type(%S)" beg end content-type)
+  (web-mode-with-silent-modifications
+   (save-excursion
+     (save-restriction
+       (save-match-data
+         (let ((inhibit-point-motion-hooks t)
+               (inhibit-quit t))
+           (remove-list-of-text-properties beg end web-mode-scan-properties)
+           (cond
+            ((and content-type (string= content-type "php"))
+;;             (web-mode-block-scan beg end)
+             )
+            ((and content-type (member content-type web-mode-part-content-types))
+             (put-text-property beg end 'part-side
+                                (cond
+                                 ((string= content-type "javascript") 'javascript)
+                                 ((string= content-type "json") 'json)
+                                 ((string= content-type "jsx") 'jsx)
+                                 ((string= content-type "css") 'css)
+                                 ))
+             (web-mode-scan-blocks beg end)
+             (web-mode-part-scan beg end content-type))
+            ((member web-mode-content-type web-mode-part-content-types)
+             (web-mode-scan-blocks beg end)
+             (web-mode-part-scan beg end))
+            ((string= web-mode-engine "none")
+             (web-mode-scan-elements beg end)
+             (web-mode-process-parts beg end 'web-mode-part-scan))
+            (t
+             (web-mode-scan-blocks beg end)
+             (web-mode-scan-elements beg end)
+             (web-mode-process-parts beg end 'web-mode-part-scan))
+            ) ;cond
+           (cons beg end)
+           ))))))
+
+(defun web-mode-scan-blocks (reg-beg reg-end)
+  "Identifies blocks (with block-side, block-beg, block-end text properties)."
+  (save-excursion
+
+    (let ((i 0) open close closing-string start sub1 sub2 pos tagopen tmp delim-open delim-close part-beg part-end tagclose)
+
+      (goto-char reg-beg)
+
+      ;;(message "%S: %Sx%S" (point) reg-beg reg-end)
+      ;;(message "regexp=%S" web-mode-block-regexp)
+      (while (and (< i 2000)
+                  (> reg-end (point))
+                  web-mode-block-regexp
+                  (re-search-forward web-mode-block-regexp reg-end t)
+                  (not (eobp)))
+
+        (setq i (1+ i)
+              closing-string nil
+              close nil
+              tagopen (match-string 0)
+              open (match-beginning 0)
+              delim-open nil
+              delim-close nil
+              pos nil)
+
+        (let ((l (length tagopen)))
+          (when (member (string-to-char tagopen) '(?\s ?\t))
+            (setq tagopen (replace-regexp-in-string "\\`[ \t]*" "" tagopen))
+            (setq open (+ open (- l (length tagopen))))
+            (setq l (length tagopen))
+            )
+          (setq sub1 (substring tagopen 0 1)
+                sub2 (substring tagopen 0 (if (>= l 2) 2 1)))
+          )
+
+        (cond
+
+         ((string= web-mode-engine "php")
+          (unless (member (char-after) '(?x ?X))
+            (setq closing-string '("<\\?". "\\?>")))
+          (cond
+           ((looking-at-p "<?php")
+            (setq delim-open "<?php"))
+           ((eq (char-after) ?\=)
+            (setq delim-open "<?="))
+           (t
+            (setq delim-open "<?"))
+           ) ;cond
+          (setq delim-close "?>")
+          ) ;php
+
+         ((string= web-mode-engine "erb")
+          (cond
+           ((string= sub2 "<%")
+            (setq closing-string '("<%". "%>")
+                  delim-open "<%[=-]?"
+                  delim-close "[-]?%>")
+            )
+           (t
+            (setq closing-string "EOL"
+                  delim-open "%"))
+           )
+          ) ;erb
+
+         ((string= web-mode-engine "django")
+          (cond
+           ((string= sub2 "{{")
+            (setq closing-string '("{{" . "}}")
+                  delim-open "{{"
+                  delim-close "}}"))
+           ((string= sub2 "{%")
+            (setq closing-string "%}"
+                  delim-open "{%[+-]?"
+                  delim-close "[-]?%}"))
+           (t
+            (setq closing-string "#}"))
+           )
+          ) ;django
+
+         ((string= web-mode-engine "ejs")
+          (setq closing-string "%>"
+                delim-open "<%[=-]?"
+                delim-close "[-]?%>")
+          ) ;ejs
+
+         ((string= web-mode-engine "lsp")
+          (setq closing-string "%>"
+                delim-open "<%[%#]?"
+                delim-close "%>")
+          ) ;lsp
+
+         ((string= web-mode-engine "mako")
+          (cond
+           ((and (string= tagopen "<%")
+                 (member (char-after) '(?\s ?\n ?\!)))
+            (setq closing-string "%>"
+                  delim-open "<%[!]?"
+                  delim-close "%>"))
+           ((member sub2 '("<%" "</"))
+            (setq closing-string ">"
+                  delim-open "</?%"
+                  delim-close "/?>"))
+           ((string= sub2 "${")
+            (setq closing-string "}"
+                  delim-open "${"
+                  delim-close "}"))
+           (t
+            (setq closing-string "EOL"
+                  delim-open "%"))
+           )
+          ) ;mako
+
+         ((string= web-mode-engine "cl-emb")
+          (cond
+           ((string= tagopen "<%#")
+            (setq closing-string "#%>"))
+           ((string= sub2 "<%")
+            (setq closing-string "%>"
+                  delim-open "<%[=%]?"
+                  delim-close "%>"))
+           )
+          ) ;cl-emb
+
+         ((string= web-mode-engine "elixir")
+          (cond
+           ((string= tagopen "<%#")
+            (setq closing-string "%>"))
+           ((string= sub2 "<%")
+            (setq closing-string "%>"
+                  delim-open "<%[=%]?"
+                  delim-close "%>"))
+           )
+          ) ;elixir
+
+         ((string= web-mode-engine "mojolicious")
+          (cond
+           ((string= tagopen "<%#")
+            (setq closing-string "%>"))
+           ((string= sub2 "<%")
+            (setq closing-string "%>"
+                  delim-open "<%\\(==\\|[=%]\\)?"
+                  delim-close "%>"))
+           ((string= sub2 "%#")
+            (setq closing-string "EOL"))
+           (t
+            (setq closing-string "EOL"
+                  delim-open "%\\(==\\|[=%]\\)?"))
+           )
+          ) ;mojolicious
+
+         ((string= web-mode-engine "ctemplate")
+          (cond
+           ((member tagopen '("{{{" "{{~"))
+            (setq closing-string "}~?}}"
+                  delim-open "{{~?{"
+                  delim-close "}~?}}")
+            )
+           ((string= tagopen "{~{")
+            (setq closing-string "}~?}"
+                  delim-open "{~{"
+                  delim-close "}~?}")
+            )
+           ((string= tagopen "{{!")
+            (setq closing-string (if (looking-at-p "--") "--}}" "}}"))
+            )
+           ((string= sub2 "{{")
+            (setq closing-string "}~?}"
+                  delim-open "{{[>#/%^&]?"
+                  delim-close "}~?}"))
+           (t
+            (setq closing-string "}}"
+                  delim-open "${{"
+                  delim-close "}}"))
+           )
+          ) ;ctemplate
+
+         ((string= web-mode-engine "aspx")
+          (setq closing-string "%>"
+                delim-open "<%[:=#@$]?"
+                delim-close "%>")
+          ) ;aspx
+
+         ((string= web-mode-engine "asp")
+          (cond
+           ((string= sub2 "<%")
+            (setq closing-string "%>"
+                  delim-open "<%[:=#@$]?"
+                  delim-close "%>"))
+           (t
+            (setq closing-string ">"
+                  delim-open "</?"
+                  delim-close "/?>"))
+           )
+          ) ;asp
+
+         ((string= web-mode-engine "jsp")
+          (cond
+           ((looking-at-p "--")
+            (setq closing-string "--%>"))
+           ((string= sub2 "<%")
+            (setq closing-string "%>"
+                  delim-open "<%\\([!=@]\\|#=\\)?"
+                  delim-close "[-]?%>"))
+           ((string= sub2 "${")
+            (setq closing-string "}"
+                  delim-open "${"
+                  delim-close "}"))
+           (t
+            (setq closing-string ">"
+                  delim-open "</?"
+                  delim-close "/?>"))
+           )
+          ) ;jsp
+
+         ((string= web-mode-engine "clip")
+          (setq closing-string ">"
+                delim-open "</?"
+                delim-close "/?>")
+          ) ;clip
+
+         ((string= web-mode-engine "blade")
+          (cond
+           ((string= tagopen "{{-")
+            (setq closing-string "--}}"))
+           ((string= tagopen "{!!")
+            (setq closing-string "!!}"
+                  delim-open "{!!"
+                  delim-close "!!}"))
+           ((string= tagopen "@{{")
+            (setq closing-string nil))
+           ((string= tagopen "{{{")
+            (setq closing-string "}}}"
+                  delim-open "{{{"
+                  delim-close "}}}"))
+           ((string= sub2 "{{")
+            (setq closing-string "}}"
+                  delim-open "{{"
+                  delim-close "}}"))
+           ((looking-at-p "[[:alnum:]]+\\.[[:alpha:]]+")
+            )
+           ((string= sub2 "@y")
+            (setq closing-string ")"
+                  delim-open "@"))
+           ((string= sub1 "@")
+            (setq closing-string "EOL"
+                  delim-open "@"))
+           )
+          ) ;blade
+
+         ((string= web-mode-engine "smarty")
+          (cond
+           ((string= tagopen "{*")
+            (setq closing-string "*}")
+            )
+           ((string= tagopen "{#")
+            (setq closing-string "#}"
+                  delim-open "{#"
+                  delim-close "#}")
+            )
+           (t
+            (setq closing-string (cons "{" "}")
+                  delim-open "{/?"
+                  delim-close "}")
+            ) ;t
+           ) ;cond
+          ) ;smarty
+
+         ((string= web-mode-engine "web2py")
+          (setq closing-string "}}"
+                delim-open "{{[=]?"
+                delim-close "}}")
+          ) ;web2py
+
+         ((string= web-mode-engine "dust")
+          (cond
+           ((string= sub2 "{!")
+            (setq closing-string "!}"))
+           (t
+            (setq closing-string '("{". "}") ;;closing-string "}"
+                  delim-open "{[#/:?@><+^]?"
+                  delim-close "/?}")
+            )
+           )
+          ) ;dust
+
+         ((string= web-mode-engine "closure")
+          (cond
+           ((string= sub2 "//")
+            (setq closing-string "EOL")
+            )
+           ((string= sub2 "/*")
+            (setq closing-string "*/")
+            )
+           (t
+            (setq closing-string "}"
+                  delim-open "{/?"
+                  delim-close "/?}")
+            )
+           )
+          ) ;closure
+
+         ((string= web-mode-engine "go")
+          (setq closing-string "}}"
+                delim-open "{{"
+                delim-close "}}")
+          ) ;go
+
+         ((string= web-mode-engine "angular")
+          (setq closing-string "}}"
+                delim-open "{{"
+                delim-close "}}")
+          ) ;angular
+
+         ((string= web-mode-engine "mason")
+          (cond
+           ((and (member sub2 '("<%" "</"))
+                 (looking-at "[[:alpha:]]+"))
+            (if (member (match-string-no-properties 0) '("after" "around" "augment" "before" "def" "filter" "method" "override"))
+                (setq closing-string ">"
+                      delim-open "<[/]?%"
+                      delim-close ">")
+              (setq closing-string (concat "</%" (match-string-no-properties 0) ">")
+                    delim-open "<[^>]+>"
+                    delim-close "<[^>]+>")
+              ) ;if
+            )
+           ((and (string= sub2 "<%")
+                 (eq (char-after) ?\s))
+            (setq closing-string "%>"
+                  delim-open "<%"
+                  delim-close "%>"))
+           ((string= tagopen "</&")
+            (setq closing-string ">"
+                  delim-open "</&"
+                  delim-close ">")
+            )
+           ((string= sub2 "<&")
+            (setq closing-string "&>"
+                  delim-open "<&[|]?"
+                  delim-close "&>"))
+           (t
+            (setq closing-string "EOL"
+                  delim-open "%"))
+           )
+          ) ;mason
+
+         ((string= web-mode-engine "underscore")
+          (setq closing-string "%>"
+                delim-open "<%"
+                delim-close "%>")
+          ) ;underscore
+
+         ((string= web-mode-engine "template-toolkit")
+          (cond
+           ((string= tagopen "%%#")
+            (setq closing-string "EOL"))
+           ((string= tagopen "[%#")
+            (setq closing-string "%]"))
+           (t
+            (setq closing-string "%]"
+                  delim-open "\\[%[-+]?"
+                  delim-close "[-=+]?%\\]"))
+           )
+          ) ;template-toolkit
+
+         ((string= web-mode-engine "freemarker")
+          (cond
+           ((string= sub1 "<")
+            (setq closing-string ">"
+                  delim-open "</?[#@]"
+                  delim-close "/?>"))
+           ((string= sub1 "[")
+            (setq closing-string "]"
+                  delim-open "\\[/?[#@]"
+                  delim-close "/?\\]"))
+           (t
+            (setq closing-string "}"
+                  delim-open "${"
+                  delim-close "}"))
+           )
+          ) ;freemarker
+
+         ((string= web-mode-engine "velocity")
+          (cond
+           ((string= sub2 "##")
+            (setq closing-string "EOL"))
+           ((string= sub2 "#*")
+            (setq closing-string "*#"))
+           (t
+            (setq closing-string "EOV"
+                  delim-open "#"))
+           )
+          ) ;velocity
+
+         ((string= web-mode-engine "razor")
+          (cond
+           ((string= sub2 "@@")
+            (forward-char 2)
+            (setq closing-string nil))
+           ((string= sub2 "@*")
+            (setq closing-string "*@"))
+           ((string= sub1 "@")
+            (setq closing-string "EOR"
+                  delim-open "@"))
+           ((string= sub1 "}")
+            (save-excursion
+              (let (paren-pos)
+                (setq paren-pos (web-mode-part-opening-paren-position (1- (point))))
+                (if (and paren-pos (get-text-property paren-pos 'block-side))
+                    (setq closing-string "EOR")
+                  (setq closing-string nil)
+                  ) ;if
+                ) ;let
+              ) ;let
+            ) ; case }
+           ) ;cond
+          ) ;razor
+
+         ) ;cond
+
+        (when closing-string
+
+          (cond
+
+           ((listp closing-string)
+            (cond
+             ((web-mode-rsf-balanced (car closing-string) (cdr closing-string) reg-end t)
+              (setq close (match-end 0)
+                    pos (point))
+              )
+             ((and (string= web-mode-engine "php")
+                   (string= "<?" sub2))
+
+              (if (or (text-property-not-all (1+ open) (point-max) 'tag-beg nil)
+                      (text-property-not-all (1+ open) (point-max) 'block-beg nil)
+                      (looking-at-p "[ \t\n]*<"))
+                  (setq close nil
+                        delim-close nil
+                        pos (point))
+                (setq close (point-max)
+                      delim-close nil
+                      pos (point-max))
+                ) ;if
+              ) ;case
+             ) ;cond
+            ) ;case listp
+
+           ((and (string= web-mode-engine "smarty")
+                 (string= closing-string "}"))
+            (goto-char open)
+            (setq tmp (web-mode-closing-delimiter-position
+                       "}"
+                       (point)
+                       (line-end-position)))
+            (if tmp
+                (setq tmp (1+ tmp))
+              (setq tmp (line-end-position)))
+            (goto-char tmp)
+            (setq close (point)
+                  pos (point))
+            )
+
+           ((and (member web-mode-engine '("closure"))
+                 (string= closing-string "}"))
+            (goto-char open)
+            (setq tmp (web-mode-closing-paren-position (point) (line-end-position)))
+            (if tmp
+                (setq tmp (1+ tmp))
+              (setq tmp (line-end-position)))
+            (goto-char tmp)
+            (setq close (point)
+                  pos (point))
+            )
+
+           ((string= closing-string "EOL")
+            (end-of-line)
+            (setq close (point)
+                  pos (point)))
+
+           ((string= closing-string "EOR")
+            (web-mode-razor-skip open)
+            (setq close (if (> (point) reg-end) reg-end (point))
+                  pos (if (> (point) reg-end) reg-end (point)))
+            (goto-char pos))
+
+           ((string= closing-string "EOV")
+            (web-mode-velocity-skip open)
+            (setq close (point)
+                  pos (point)))
+
+           ((and (member web-mode-engine '("ctemplate"))
+                 (re-search-forward closing-string reg-end t))
+            (setq close (match-end 0)
+                  pos (point)))
+
+           ((search-forward closing-string reg-end t)
+            (setq close (match-end 0)
+                  pos (point)))
+           ) ;cond
+
+          (when (and close (>= reg-end pos))
+            ;;(message "pos(%S) : open(%S) close(%S)" pos open close)
+            (put-text-property open (1+ open) 'block-beg 0)
+            (put-text-property open (1+ open) 'block-controls 0)
+            (put-text-property open close 'block-side t)
+            (put-text-property (1- close) close 'block-end t)
+            (when delim-open
+              (web-mode-block-delimiters-set open close delim-open delim-close))
+            (web-mode-block-scan open close)
+            (when (and (string= web-mode-engine "erb")
+                       (looking-at-p "<%= javascript_tag do %>"))
+              (setq tagopen "<%= javascript_tag do %>"))
+            (when (and (member tagopen '("<r:script" "<r:style"
+                                         "<c:js" "<c:css"
+                                         "<%= javascript_tag do %>"))
+                       (setq part-beg close)
+                       (setq tagclose
+                             (cond
+                              ((string= tagopen "<r:script") "</r:script")
+                              ((string= tagopen "<r:style") "</r:style")
+                              ((string= tagopen "<c:js") "</c:js")
+                              ((string= tagopen "<c:css") "</c:css")
+                              ((string= tagopen "<%= javascript_tag do %>") "<% end %>")
+                              ))
+                       (web-mode-sf tagclose)
+                       (setq part-end (match-beginning 0))
+                       (> part-end part-beg))
+              (put-text-property part-beg part-end
+                                 'part-side
+                                 (cond
+                                  ((member tagopen '("<r:style" "<c:css")) 'css)
+                                  (t 'javascript)))
+              (setq pos part-beg
+                    part-beg nil
+                    part-end nil)
+              ) ;when
+            ) ;when close
+
+          (if pos (goto-char pos))
+
+          ) ;when closing-string
+
+        ) ;while
+
+      (cond
+       ((>= i 2000)
+        (message "scan-blocks ** warning (%S) **" i))
+       ((string= web-mode-engine "razor")
+        (web-mode-process-blocks reg-beg reg-end 'web-mode-block-scan))
+       ((string= web-mode-engine "django")
+        (web-mode-scan-engine-comments reg-beg reg-end
+                                       "{% comment %}" "{% endcomment %}"))
+       ((string= web-mode-engine "mako")
+        (web-mode-scan-engine-comments reg-beg reg-end
+                                       "<%doc>" "</%doc>"))
+       ((string= web-mode-engine "mason")
+        (web-mode-scan-engine-comments reg-beg reg-end
+                                       "<%doc>" "</%doc>"))
+       ) ;cond
+
+      )))
+
+(defun web-mode-block-delimiters-set (reg-beg reg-end delim-open delim-close)
+  "Set text-property 'block-token to 'delimiter-(beg|end) on block delimiters (e.g. <?php ?>)"
+  ;;(message "reg-beg(%S) reg-end(%S) delim-open(%S) delim-close(%S)" reg-beg reg-end delim-open delim-close)
+  (when (member web-mode-engine
+                '("asp" "aspx" "cl-emb" "clip" "closure" "ctemplate" "django" "dust"
+                  "elixir" "ejs" "erb" "freemarker" "jsp" "lsp" "mako" "mason" "mojolicious"
+                  "smarty" "template-toolkit" "web2py"))
+    (save-excursion
+      (when delim-open
+        (goto-char reg-beg)
+        (looking-at delim-open)
+        (setq delim-open (match-string-no-properties 0)))
+      (when delim-close
+        (goto-char reg-end)
+        (looking-back delim-close reg-beg t)
+        (setq delim-close (match-string-no-properties 0)))
+      ))
+  (when delim-open
+    (put-text-property reg-beg (+ reg-beg (length delim-open))
+                       'block-token 'delimiter-beg))
+  (when delim-close
+    (put-text-property (- reg-end (length delim-close)) reg-end
+                       'block-token 'delimiter-end))
+  )
+
+(defun web-mode-process-blocks (reg-beg reg-end func)
+  (let ((i 0) (continue t) (block-beg reg-beg) (block-end nil))
+    (while continue
+      (setq block-end nil)
+      (unless (get-text-property block-beg 'block-beg)
+        (setq block-beg (web-mode-block-next-position block-beg)))
+      (when (and block-beg (< block-beg reg-end))
+        (setq block-end (web-mode-block-end-position block-beg)))
+      (cond
+       ((> (setq i (1+ i)) 2000)
+        (message "process-blocks ** warning (%S) **" (point))
+        (setq continue nil))
+       ((or (null block-end) (> block-end reg-end))
+        (setq continue nil))
+       (t
+        (setq block-end (1+ block-end))
+        (funcall func block-beg block-end)
+        (setq block-beg block-end)
+        ) ;t
+       ) ;cond
+      ) ;while
+    ))
+
+(defun web-mode-process-parts (reg-beg reg-end func)
+  (let ((i 0) (continue t) (part-beg reg-beg) (part-end nil))
+    (while continue
+      (setq part-end nil)
+      (unless (get-text-property part-beg 'part-side)
+        (setq part-beg (web-mode-part-next-position part-beg)))
+      (when (and part-beg (< part-beg reg-end))
+        (setq part-end (web-mode-part-end-position part-beg)))
+      (cond
+       ((> (setq i (1+ i)) 100)
+        (message "process-parts ** warning (%S) **" (point))
+        (setq continue nil))
+       ((or (null part-end) (> part-end reg-end))
+        (setq continue nil))
+       (t
+        (setq part-end (1+ part-end))
+        (funcall func part-beg part-end)
+        (setq part-beg part-end)
+        )
+       ) ;cond
+      ) ;while
+    ))
+
+(defun web-mode-block-scan (block-beg block-end)
+  (let (sub1 sub2 sub3 regexp token-type)
+
+    ;;(message "block-beg=%S block-end=%S" block-beg block-end)
+    ;;(remove-text-properties block-beg block-end web-mode-scan-properties)
+
+    (goto-char block-beg)
+
+    (cond
+     ((>= (point-max) (+ block-beg 3))
+      (setq sub3 (buffer-substring-no-properties block-beg (+ block-beg 3))
+            sub2 (buffer-substring-no-properties block-beg (+ block-beg 2))
+            sub1 (buffer-substring-no-properties block-beg (+ block-beg 1)))
+      )
+     ((>= (point-max) (+ block-beg 2))
+      (setq sub3 (buffer-substring-no-properties block-beg (+ block-beg 2))
+            sub2 (buffer-substring-no-properties block-beg (+ block-beg 2))
+            sub1 (buffer-substring-no-properties block-beg (+ block-beg 1)))
+      )
+     (t
+      (setq sub1 (buffer-substring-no-properties block-beg (+ block-beg 1)))
+      (setq sub2 sub1
+            sub3 sub1)
+      )
+     )
+
+    (cond
+
+     ((member web-mode-engine '("php" "lsp" "python" "web2py" "mason"))
+      (setq regexp web-mode-engine-token-regexp))
+
+     ((string= web-mode-engine "mako")
+      (cond
+       ((string= sub2 "##")
+        (setq token-type 'comment)
+        )
+       (t
+        (setq regexp web-mode-engine-token-regexp))
+       )
+      ) ;mako
+
+     ((string= web-mode-engine "django")
+      (cond
+       ((member sub2 '("{{" "{%"))
+        (setq regexp "\"\\|'"))
+       ((string= sub2 "{#")
+        (setq token-type 'comment))
+       )
+      ) ;django
+
+     ((string= web-mode-engine "ctemplate")
+      (cond
+       ((string= sub3 "{{!")
+        (setq token-type 'comment))
+       ((member sub2 '("{{"))
+        )
+       )
+      ) ;ctemplate
+
+     ((string= web-mode-engine "go")
+      (cond
+       ((string= sub3 "{{/")
+        (setq token-type 'comment))
+       ((string= sub2 "{{")
+        (setq regexp "\"\\|'"))
+       )
+      ) ;go
+
+     ((string= web-mode-engine "razor")
+      (cond
+       ((string= sub2 "@*")
+        (setq token-type 'comment))
+       (t
+        (setq regexp "//\\|@\\*\\|\"\\|'"))
+       )
+      ) ;razor
+
+     ((string= web-mode-engine "blade")
+      (cond
+       ((string= sub3 "{{-")
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'"))
+       )
+      ) ;blade
+
+     ((string= web-mode-engine "cl-emb")
+      (cond
+       ((string= sub3 "<%#")
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'"))
+       )
+      ) ;cl-emb
+
+     ((string= web-mode-engine "elixir")
+      (cond
+       ((string= sub3 "<%#")
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'"))
+       )
+      ) ;elixir
+
+     ((string= web-mode-engine "mojolicious")
+      (cond
+       ((or (string= sub2 "%#") (string= sub3 "<%#"))
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'"))
+       )
+      ) ;mojolicious
+
+     ((string= web-mode-engine "velocity")
+      (cond
+       ((member sub2 '("##" "#*"))
+        (setq token-type 'comment))
+       ((member sub1 '("$" "#"))
+        (setq regexp "\"\\|'"))
+       )
+      ) ;velocity
+
+     ((string= web-mode-engine "jsp")
+      (cond
+       ((string= sub3 "<%-")
+        (setq token-type 'comment))
+       ((string= sub3 "<%@")
+        (setq regexp "/\\*"))
+       ((member sub2 '("${" "#{"))
+        (setq regexp "\"\\|'"))
+       ((string= sub2 "<%")
+        (setq regexp "//\\|/\\*\\|\"\\|'"))
+       )
+      ) ;jsp
+
+     ((string= web-mode-engine "clip")
+      (setq regexp nil)
+      ) ;clip
+
+     ((and (string= web-mode-engine "asp")
+           (string= sub2 "<%"))
+      (setq regexp "//\\|/\\*\\|\"\\|'")
+      ) ; asp
+
+     ((string= web-mode-engine "aspx")
+      (cond
+       ((string= sub3 "<%-")
+        (setq token-type 'comment))
+       ((string= sub3 "<%@")
+        (setq regexp "/\\*"))
+       ((string= sub3 "<%$")
+        (setq regexp "\"\\|'"))
+       (t
+        (setq regexp "//\\|/\\*\\|\"\\|'"))
+       )
+      ) ;aspx
+
+     ((string= web-mode-engine "freemarker")
+      (cond
+       ((member sub3 '("<#-" "[#-"))
+        (setq token-type 'comment))
+       ((member sub2 '("${" "#{"))
+        (setq regexp "\"\\|'"))
+       ((or (member sub2 '("<@" "[@" "<#" "[#"))
+            (member sub3 '("</@" "[/@" "</#" "[/#")))
+        (setq regexp "\"\\|'"))
+       )
+      ) ;freemarker
+
+     ((member web-mode-engine '("ejs" "erb"))
+      (cond
+       ((string= sub3 "<%#")
+        (setq token-type 'comment))
+       (t
+        (setq regexp web-mode-engine-token-regexp))
+       )
+      ) ;erb
+
+     ((string= web-mode-engine "template-toolkit")
+      (cond
+       ((member sub3 '("[%#" "%%#"))
+        (setq token-type 'comment))
+       (t
+        (setq regexp "#\\|\"\\|'"))
+       )
+      ) ;template-toolkit
+
+     ((string= web-mode-engine "underscore")
+      (setq regexp "/\\*\\|\"\\|'")
+      ) ;underscore
+
+     ((string= web-mode-engine "angular")
+      ) ;angular
+
+     ((string= web-mode-engine "smarty")
+      (cond
+       ((string= sub2 "{*")
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'")))
+      ) ;smarty
+
+     ((string= web-mode-engine "dust")
+      (cond
+       ((string= sub2 "{!")
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'"))
+       )
+      ) ;dust
+
+     ((string= web-mode-engine "closure")
+      (cond
+       ((member sub2 '("/*" "//"))
+        (setq token-type 'comment))
+       (t
+        (setq regexp "\"\\|'"))
+       )
+      ) ;closure
+
+     ) ;cond
+
+    (cond
+     (token-type
+      (put-text-property block-beg block-end 'block-token token-type))
+     ((and regexp
+           (> (- block-end block-beg) 6))
+      (web-mode-block-tokenize
+       (web-mode-block-code-beginning-position block-beg)
+       (web-mode-block-code-end-position block-beg)
+       regexp)
+      )
+     ) ;cond
+
+    ))
+
+(defun web-mode-block-tokenize (reg-beg reg-end &optional regexp)
+  (unless regexp (setq regexp web-mode-engine-token-regexp))
+  ;;(message "tokenize: reg-beg(%S) reg-end(%S) regexp(%S)" reg-beg reg-end regexp)
+  ;;(message "tokenize: reg-beg(%S) reg-end(%S) command(%S)" reg-beg reg-end this-command)
+  ;;(message "%S>%S : %S" reg-beg reg-end (buffer-substring-no-properties reg-beg reg-end))
+  (save-excursion
+    (let ((pos reg-beg) beg end char match continue (flags 0) token-type token-end)
+
+      (remove-list-of-text-properties reg-beg reg-end '(block-token))
+
+      ;; TODO : vérifier la cohérence
+      (put-text-property reg-beg reg-end 'block-side t)
+
+      (goto-char reg-beg)
+
+      (when (> reg-beg reg-end)
+        (message "block-tokenize ** reg-beg(%S) reg-end(%S) **" reg-beg reg-end))
+
+      (while (and (< reg-beg reg-end) (re-search-forward regexp reg-end t))
+        (setq beg (match-beginning 0)
+              match (match-string 0)
+              continue t
+              token-type 'comment
+              token-end (if (< reg-end (line-end-position)) reg-end (line-end-position))
+              char (aref match 0))
+        (cond
+
+         ((and (string= web-mode-engine "asp")
+               (eq char ?\'))
+          (goto-char token-end))
+
+         ((eq char ?\')
+          (setq token-type 'string)
+          (while (and continue (search-forward "'" reg-end t))
+            (if (looking-back "\\\\+'" reg-beg t)
+                (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0))
+              (setq continue nil))))
+
+         ((eq char ?\")
+          (setq token-type 'string)
+          (while (and continue (search-forward "\"" reg-end t))
+            (if (looking-back "\\\\+\"" reg-beg t)
+                (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0))
+              (setq continue nil))))
+
+         ((string= match "//")
+          (goto-char token-end))
+
+         ((eq char ?\;)
+          (goto-char token-end))
+
+         ((string= match "#|")
+          (unless (search-forward "|#" reg-end t)
+            (goto-char token-end)))
+
+         ((eq char ?\#)
+          (goto-char token-end))
+
+         ((string= match "/*")
+          (unless (search-forward "*/" reg-end t)
+            (goto-char token-end))
+          )
+
+         ((string= match "@*")
+          (unless (search-forward "*@" reg-end t)
+            (goto-char token-end)))
+
+         ((eq char ?\<)
+          (setq token-type 'string)
+          (re-search-forward (concat "^[ ]*" (match-string 1)) reg-end t))
+
+         (t
+          (message "block-tokenize ** token end (%S) **" beg)
+          (setq token-type nil))
+
+         ) ;cond
+
+        ;;(when (eq token-type 'comment) (message "comment: %S %S" beg (point)))
+
+        (put-text-property beg (point) 'block-token token-type)
+
+        (when (eq token-type 'comment)
+          (put-text-property beg (1+ beg) 'syntax-table (string-to-syntax "<"))
+          (if (or (< (point) (line-end-position)) (= (point) (point-max)))
+              (put-text-property (1- (point)) (point) 'syntax-table (string-to-syntax ">")) ;#445 #480
+            (put-text-property (point) (1+ (point)) 'syntax-table (string-to-syntax ">")) ;#377
+            )
+          )
+
+        ) ;while
+
+      (web-mode-block-controls-unset pos)
+
+      )))
+
+(defun web-mode-set-php-controls (reg-beg reg-end)
+  (goto-char reg-beg)
+  (let (match controls
+        (continue t)
+        (regexp "endif\\|endforeach\\|endfor\\|endwhile\\|elseif\\|else\\|if\\|foreach\\|for\\|while"))
+    (while continue
+      (if (not (web-mode-block-rsf regexp reg-end))
+          (setq continue nil)
+        (setq match (match-string-no-properties 0))
+;;        (message "%S %S" match (point))
+        (cond
+         ((and (member match '("else" "elseif"))
+               (looking-at-p "[ ]*[:(]"))
+          (setq controls (append controls (list (cons 'inside "if"))))
+          )
+         ((and (>= (length match) 3)
+               (string= (substring match 0 3) "end"))
+          (setq controls (append controls (list (cons 'close (substring match 3)))))
+          )
+         ((and (progn (skip-chars-forward "[ ]") t)
+               (eq (char-after) ?\()
+               (web-mode-closing-paren reg-end)
+;;               (progn (message "ixi%S" (point)))
+               (looking-at-p ")[ ]*:"))
+          (setq controls (append controls (list (cons 'open match))))
+          )
+         ) ; cond
+        ) ;if
+      ) ;while
+    ;;(message "%S-%S %S" reg-beg reg-end controls)
+    (when (and controls (> (length controls) 1))
+      (setq controls (web-mode-block-controls-reduce controls)))
+    controls))
+
+(defun web-mode-block-controls-reduce (controls)
+  (when (and (eq (car (car controls)) 'open)
+             (member (cons 'close (cdr (car controls))) controls))
+    (setq controls nil))
+  controls)
+
+(defun web-mode-block-controls-unset (pos)
+  (cond
+   ((null (get-text-property pos 'block-side))
+    (message "block-controls-unset ** invalid value (%S) **" pos))
+   ((or (get-text-property pos 'block-beg)
+        (setq pos (web-mode-block-beginning-position pos)))
+    (put-text-property pos (1+ pos) 'block-controls 0))
+   (t
+    (message "block-controls-unset ** failure (%S) **" (point)))
+   ))
+
+(defun web-mode-block-controls-get (pos)
+  (web-mode-with-silent-modifications
+   (let ((controls nil))
+     (cond
+      ((null (get-text-property pos 'block-side))
+       (message "block-controls-get ** invalid value (%S) **" pos))
+      ((or (get-text-property pos 'block-beg)
+           (setq pos (web-mode-block-beginning-position pos)))
+       (setq controls (get-text-property pos 'block-controls))
+       (when (integerp controls)
+         (web-mode-block-controls-set pos (web-mode-block-end-position pos))
+         (setq controls (get-text-property pos 'block-controls))
+         )
+       )
+      (t
+       (message "block-controls-get ** failure (%S) **" (point)))
+      ) ;cond
+     controls)))
+
+(defun web-mode-block-controls-set (reg-beg reg-end)
+  (save-excursion
+    (goto-char reg-beg)
+    (let (controls pos type control)
+
+      (cond
+
+       ((null web-mode-engine)
+        (message "block-controls-set ** unknown engine (%S) **" web-mode-engine)
+        )
+
+       ((string= web-mode-engine "php")
+        (setq controls (web-mode-set-php-controls reg-beg reg-end))
+        (when (web-mode-block-starts-with "}" reg-beg)
+          (setq controls (append controls (list (cons 'close "{")))))
+        (when (web-mode-block-ends-with (cons "{" "}") reg-beg)
+          (setq controls (append controls (list (cons 'open "{")))))
+        ) ; php
+
+       ((string= web-mode-engine "ejs")
+        (cond
+         ((web-mode-block-ends-with "}[ ]*else[ ]*{" reg-beg)
+          (setq controls (append controls (list (cons 'inside "{")))))
+         ((web-mode-block-starts-with "}" reg-beg)
+          (setq controls (append controls (list (cons 'close "{")))))
+         ((web-mode-block-ends-with "{" reg-beg)
+          (setq controls (append controls (list (cons 'open "{")))))
+         )
+        ) ; ejs
+
+       ((string= web-mode-engine "erb")
+        (cond
+         ((web-mode-block-starts-with "else\\|elsif\\|when" reg-beg)
+          (setq controls (append controls (list (cons 'inside "ctrl")))))
+         ((web-mode-block-starts-with "end" reg-beg)
+          (setq controls (append controls (list (cons 'close "ctrl")))))
+         ((web-mode-block-ends-with " do\\( |.*|\\)?" reg-beg)
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         ((and (web-mode-block-starts-with "\\(for\\|if\\|unless\\|case\\)\\_>" reg-beg)
+               (not (web-mode-block-ends-with "end" reg-end)))
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         )
+        ) ; erb
+
+       ((string= web-mode-engine "django")
+        (when (eq (char-after (1+ reg-beg)) ?\%)
+          (cond
+           ((and (string= web-mode-minor-engine "jinja") ;#504
+                 (web-mode-block-starts-with "else\\_>" reg-beg))
+            (let ((continue t)
+                  (pos reg-beg)
+                  (ctrl nil))
+              (while continue
+                (cond
+                 ((null (setq pos (web-mode-block-control-previous-position 'open pos)))
+                  (setq continue nil))
+                 ((member (setq ctrl (cdr (car (get-text-property pos 'block-controls)))) '("if" "ifequal" "ifnotequal" "for"))
+                  (setq continue nil)
+                  )
+                 ) ;cond
+                )
+              (setq controls (append controls (list (cons 'inside (or ctrl "if")))))
+              )
+            )
+           ((web-mode-block-starts-with "\\(else\\|els?if\\)" reg-beg)
+            (let ((continue t)
+                  (pos reg-beg)
+                  (ctrl nil))
+              (while continue
+                (cond
+                 ((null (setq pos (web-mode-block-control-previous-position 'open pos)))
+                  (setq continue nil))
+                 ((member (setq ctrl (cdr (car (get-text-property pos 'block-controls)))) '("if" "ifequal" "ifnotequal"))
+                  (setq continue nil)
+                  )
+                 ) ;cond
+                ) ;while
+              (setq controls (append controls (list (cons 'inside (or ctrl "if")))))
+              ) ;let
+            ) ;case else
+           ((web-mode-block-starts-with "\\(empty\\)" reg-beg)
+            (setq controls (append controls (list (cons 'inside "for")))))
+           ((web-mode-block-starts-with "end\\([[:alpha:]]+\\)" reg-beg)
+            (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
+           ((web-mode-block-starts-with (concat web-mode-django-control-blocks-regexp "[ %]") reg-beg)
+            (let (control)
+              (setq control (match-string-no-properties 1))
+              ;;(message "%S %S %S" control (concat "end" control) web-mode-django-control-blocks)
+              (when (member (concat "end" control) web-mode-django-control-blocks)
+                (setq controls (append controls (list (cons 'open control)))))
+              ) ;let
+            ) ;case
+           ) ;cond
+          ) ;when
+        ) ;django
+
+       ((string= web-mode-engine "smarty")
+        (cond
+         ((and (eq (char-after (1+ reg-beg)) ?\/)
+               (web-mode-block-starts-with "\\([[:alpha:]]+\\)" reg-beg))
+          (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
+         ((web-mode-block-starts-with "\\(else\\|elseif\\)" reg-beg)
+          (setq controls (append controls (list (cons 'inside "if")))))
+         ((web-mode-block-starts-with "\\(block\\|foreach\\|for\\|if\\|section\\|while\\)")
+          (setq controls (append controls (list (cons 'open (match-string-no-properties 1))))))
+         )
+        ) ;smarty
+
+       ((string= web-mode-engine "web2py")
+        (cond
+         ((web-mode-block-starts-with "def" reg-beg)
+          (setq controls (append controls (list (cons 'open "def")))))
+         ((web-mode-block-starts-with "return" reg-beg)
+          (setq controls (append controls (list (cons 'close "def")))))
+         ((web-mode-block-starts-with "block" reg-beg)
+          (setq controls (append controls (list (cons 'open "block")))))
+         ((web-mode-block-starts-with "end" reg-beg)
+          (setq controls (append controls (list (cons 'close "block")))))
+         ((web-mode-block-starts-with "pass" reg-beg)
+          (setq controls (append controls (list (cons 'close "ctrl")))))
+         ((web-mode-block-starts-with "\\(except\\|finally\\|els\\)" reg-beg)
+          (setq controls (append controls (list (cons 'inside "ctrl")))))
+         ((web-mode-block-starts-with "\\(if\\|for\\|try\\|while\\)")
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         )
+        ) ;web2py
+
+       ((string= web-mode-engine "dust")
+        (cond
+         ((eq (char-after (1- reg-end)) ?\/)
+          )
+         ((eq (char-after (1+ reg-beg)) ?\:)
+          (setq pos (web-mode-block-control-previous-position 'open reg-beg))
+          (when pos
+            (setq controls (append controls
+                                   (list
+                                    (cons 'inside
+                                          (cdr (car (web-mode-block-controls-get pos))))))))
+          )
+         ((looking-at "{/\\([[:alpha:].]+\\)")
+          (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
+         ((looking-at "{[#?@><+^]\\([[:alpha:].]+\\)")
+          (setq controls (append controls (list (cons 'open (match-string-no-properties 1))))))
+         )
+        ) ;dust
+
+       ((member web-mode-engine '("mojolicious"))
+        (cond
+         ((web-mode-block-ends-with "begin" reg-beg)
+          (setq controls (append controls (list (cons 'open "begin")))))
+         ((web-mode-block-starts-with "end" reg-beg)
+          (setq controls (append controls (list (cons 'close "begin")))))
+         ((web-mode-block-starts-with "}[ ]*else[ ]*{" reg-beg)
+          (setq controls (append controls (list (cons 'inside "{")))))
+         ((web-mode-block-starts-with "}" reg-beg)
+          (setq controls (append controls (list (cons 'close "{")))))
+         ((web-mode-block-ends-with "{" reg-beg)
+          (setq controls (append controls (list (cons 'open "{")))))
+         )
+        ) ;mojolicious
+
+       ((member web-mode-engine '("aspx" "underscore"))
+        (cond
+         ((web-mode-block-starts-with "}" reg-beg)
+          (setq controls (append controls (list (cons 'close "{")))))
+         ((web-mode-block-ends-with "{" reg-beg)
+          (setq controls (append controls (list (cons 'open "{")))))
+         )
+        ) ;aspx underscore
+
+       ((member web-mode-engine '("jsp" "asp" "clip"))
+        (cond
+         ((eq (char-after (1- reg-end)) ?\/)
+          )
+         ((looking-at "</?\\([[:alpha:]]+\\(?:[:.][[:alpha:]]+\\)\\|[[:alpha:]]+Template\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+          (when (not (member control '("h:inputtext" "jsp:usebean" "jsp:forward" "struts:property")))
+            (setq controls (append controls (list (cons type control)))))
+          )
+         (t
+          (when (web-mode-block-starts-with "}" reg-beg)
+            (setq controls (append controls (list (cons 'close "{")))))
+          (when (web-mode-block-ends-with "{" reg-beg)
+            (setq controls (append controls (list (cons 'open "{")))))
+          )
+         )
+        ) ;jsp asp
+
+       ((string= web-mode-engine "mako")
+        (cond
+         ((looking-at "</?%\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)?\\)")
+          (cond
+           ((eq (char-after (- (web-mode-block-end-position reg-beg) 1)) ?\/)
+            )
+           (t
+            (setq control (match-string-no-properties 1)
+                  type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+            (setq controls (append controls (list (cons type control)))))
+           )
+          )
+         ((web-mode-block-starts-with "\\(else\\|elif\\)" reg-beg)
+          (setq controls (append controls (list (cons 'inside "if")))))
+         ((web-mode-block-starts-with "end\\(if\\|for\\)" reg-beg)
+          (setq controls (append controls (list (cons 'close (match-string-no-properties 1))))))
+         ((and (web-mode-block-starts-with "if\\|for" reg-beg)
+               (web-mode-block-ends-with ":" reg-beg))
+          (setq controls (append controls (list (cons 'open (match-string-no-properties 0))))))
+         )
+        ) ;mako
+
+       ((string= web-mode-engine "mason")
+        (cond
+         ((looking-at "</?%\\(after\\|around\\|augment\\|before\\|def\\|filter\\|method\\|override\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         ) ;mason
+        )
+
+       ((string= web-mode-engine "ctemplate")
+        (cond
+         ((looking-at-p "{{else")
+          (setq controls (append controls (list (cons 'inside "if")))))
+         ((looking-at "{{[#^/][ ]*\\([[:alpha:]-]+\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 2) ?\/) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         )
+        ) ;ctemplate
+
+       ((string= web-mode-engine "blade")
+        (cond
+         ((not (eq (char-after) ?\@))
+          )
+         ((web-mode-block-starts-with
+           "\\(?:end\\)?\\(foreach\\|forelse\\|for\\|if\\|section\\|unless\\|while\\)"
+           reg-beg)
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 0) ?e) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         ((web-mode-block-starts-with "stop\\|show\\|overwrite" reg-beg)
+          (setq controls (append controls (list (cons 'close "section")))))
+         ((web-mode-block-starts-with "else\\|elseif" reg-beg)
+          (setq controls (append controls (list (cons 'inside "if")))))
+         ((web-mode-block-starts-with "empty" reg-beg)
+          (setq controls (append controls (list (cons 'inside "forelse")))))
+         )
+        ) ;blade
+
+       ((string= web-mode-engine "closure")
+        (cond
+         ((eq (char-after (1- reg-end)) ?\/)
+          )
+         ((looking-at "alias\\|namespace")
+          )
+         ((web-mode-block-starts-with "ifempty" reg-beg)
+          (setq controls (append controls (list (cons 'inside "foreach")))))
+         ((web-mode-block-starts-with "else\\|elseif" reg-beg)
+          (setq controls (append controls (list (cons 'inside "if")))))
+         ((web-mode-block-starts-with "case\\|default" reg-beg)
+          (setq controls (append controls (list (cons 'inside "switch")))))
+         ((looking-at
+           "{/?\\(call\\|deltemplate\\|for\\|foreach\\|if\\|let\\|literal\\|msg\\|param\\|switch\\|template\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         )
+        ) ;closure
+
+       ((string= web-mode-engine "go")
+        (cond
+         ((web-mode-block-starts-with "end\\_>" reg-beg)
+          (setq controls (append controls (list (cons 'close "ctrl")))))
+         ((web-mode-block-starts-with "else\\_>" reg-beg)
+          (setq controls (append controls (list (cons 'inside "ctrl")))))
+         ((web-mode-block-starts-with "\\(range\\|with\\|if\\)\\_>" reg-beg)
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         )
+        ) ;go
+
+       ((string= web-mode-engine "template-toolkit")
+        (cond
+         ((web-mode-block-starts-with "end" reg-beg)
+          (setq controls (append controls (list (cons 'close "ctrl")))))
+         ((web-mode-block-starts-with "els" reg-beg)
+          (setq controls (append controls (list (cons 'inside "ctrl")))))
+         ((web-mode-block-starts-with "if\\|foreach\\|filter" reg-beg)
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         )
+        ) ;template-toolkit
+
+       ((string= web-mode-engine "cl-emb")
+        (cond
+         ((web-mode-block-starts-with "@else" reg-beg)
+          (setq controls (append controls (list (cons 'inside "if")))))
+         ((web-mode-block-starts-with "@\\(?:end\\)?\\(if\\|unless\\|repeat\\|loop\\|with\\|genloop\\)" reg-beg)
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?e) 'close 'open))
+          (setq controls (append controls (list (cons type control)))))
+         )
+        ) ;cl-emb
+
+       ((string= web-mode-engine "elixir")
+        (cond
+         ((web-mode-block-starts-with "end" reg-beg)
+          (setq controls (append controls (list (cons 'close "ctrl")))))
+         ((web-mode-block-starts-with "else" reg-beg)
+          (setq controls (append controls (list (cons 'inside "ctrl")))))
+         ((web-mode-block-starts-with "if\\|for\\|while" reg-beg)
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         )
+        ) ;elixir
+
+       ((string= web-mode-engine "velocity")
+        (cond
+         ((web-mode-block-starts-with "{?end" reg-beg)
+          (setq controls (append controls (list (cons 'close "ctrl")))))
+         ((web-mode-block-starts-with "{?els" reg-beg)
+          (setq controls (append controls (list (cons 'inside "ctrl")))))
+         ((web-mode-block-starts-with "{?\\(define\\|if\\|for\\|foreach\\|macro\\)" reg-beg)
+          (setq controls (append controls (list (cons 'open "ctrl")))))
+         )
+        ) ;velocity
+
+       ((string= web-mode-engine "freemarker")
+        (cond
+         ((looking-at "<#\\(import\\|assign\\|return\\|local\\)")
+          )
+         ((eq (char-after (1- reg-end)) ?\/)
+          )
+         ((looking-at "[<[]#\\(break\\|case\\|default\\)")
+          (setq controls (append controls (list (cons 'inside "switch"))))
+          )
+         ((looking-at "[<[]#els")
+          (setq controls (append controls (list (cons 'inside "if"))))
+          )
+         ((looking-at "</?\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)?\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         ((looking-at "</?\\(@\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         ((looking-at "[<[]/?#\\([[:alpha:]]+\\(?:[:][[:alpha:]]+\\)?\\)")
+          (setq control (match-string-no-properties 1)
+                type (if (eq (aref (match-string-no-properties 0) 1) ?\/) 'close 'open))
+          (setq controls (append controls (list (cons type control))))
+          )
+         (t
+          (when (web-mode-block-starts-with "}" reg-beg)
+            (setq controls (append controls (list (cons 'close "{")))))
+          (when (web-mode-block-ends-with "{" reg-beg)
+            (setq controls (append controls (list (cons 'open "{")))))
+          )
+         )
+        ) ;freemarker
+
+       ((string= web-mode-engine "razor")
+        (when (web-mode-block-starts-with "}" reg-beg)
+          (setq controls (append controls (list (cons 'close "{")))))
+        (when (web-mode-block-ends-with "{" reg-beg)
+          (setq controls (append controls (list (cons 'open "{")))))
+        ) ;razor
+
+       ((string= web-mode-engine "lsp")
+        (when (web-mode-block-starts-with ")" reg-beg)
+          (setq controls (append controls (list (cons 'close "(")))))
+        (when (web-mode-block-is-opened-sexp reg-beg reg-end)
+          (setq controls (append controls (list (cons 'open "(")))))
+        ) ;lsp
+
+       ) ;cond engine
+
+      (put-text-property reg-beg (1+ reg-beg) 'block-controls controls)
+      ;;      (message "(%S) controls=%S" reg-beg controls)
+
+      )))
+
+(defun web-mode-block-is-opened-sexp (reg-beg reg-end)
+  (let ((n 0))
+    (save-excursion
+      (goto-char reg-beg)
+      (while (web-mode-block-rsf "[()]" reg-end)
+        (if (eq (char-before) ?\() (setq n (1+ n)) (setq n (1- n)))))
+    (> n 0)))
+
+(defvar web-mode-regexp1 "<\\(/?[[:alpha:]][[:alnum:]:-]*\\|!--\\|!\\[CDATA\\[\\|!doctype\\|!DOCTYPE\\|\?xml\\)")
+
+(defvar web-mode-regexp2 "<\\(/?[[:alpha:]][[:alnum:]:-]*\\|!--\\|!\\[CDATA\\[\\)")
+
+(defun web-mode-scan-elements (reg-beg reg-end)
+  (save-excursion
+    (let (part-beg part-end flags limit close-expr props tname tbeg tend element-content-type (regexp web-mode-regexp1) part-close-tag char)
+
+      (goto-char reg-beg)
+
+      (while (web-mode-dom-rsf regexp reg-end)
+
+        (setq flags 0
+              tname (downcase (match-string-no-properties 1))
+              char (aref tname 0)
+              tbeg (match-beginning 0)
+              tend nil
+              element-content-type nil
+              limit reg-end
+              part-beg nil
+              part-end nil
+              props nil
+              close-expr nil
+              part-close-tag nil)
+
+        (cond
+         ((not (member char '(?\! ?\?)))
+          (when (string-match-p "-" tname)
+            (setq flags (logior flags 2)))
+          (cond
+           ((eq char ?\/)
+            (setq props (list 'tag-name (substring tname 1) 'tag-type 'end)
+                  flags (logior flags 4)
+                  limit (if (> reg-end (line-end-position)) (line-end-position) reg-end))
+            )
+           ((web-mode-element-is-void tname)
+            (setq props (list 'tag-name tname 'tag-type 'void)))
+           (t
+            (setq props (list 'tag-name tname 'tag-type 'start)))
+           ) ;cond
+          )
+         ((and (eq char ?\!) (eq (aref tname 1) ?\-))
+          (setq close-expr "-->"
+                props '(tag-type comment)))
+         ((string= tname "?xml")
+          (setq regexp web-mode-regexp2
+                close-expr "?>"
+                props '(tag-type declaration)))
+         ((string= tname "![cdata[")
+          (setq close-expr "]]>"
+                props '(tag-type cdata)))
+         ((string= tname "!doctype")
+          (setq regexp web-mode-regexp2
+                props '(tag-type doctype)))
+         ) ;cond
+
+        (cond
+         ((and (null close-expr) (eq (char-after) ?\>))
+          (setq flags (logior flags 16)
+                tend (1+ (point))))
+         ((null close-expr)
+          (setq flags (logior flags (web-mode-attr-skip reg-end)))
+          (when (> (logand flags 8) 0)
+            (setq props (plist-put props 'tag-type 'void)))
+          (setq tend (point)))
+         ((web-mode-dom-sf close-expr limit t)
+          (setq tend (point)))
+         (t
+          (setq tend (line-end-position)))
+         )
+
+        (cond
+         ((string= tname "style")
+          (setq element-content-type "css"
+                part-close-tag "</style>"))
+         ((string= tname "script")
+          (let (script)
+            (setq script (buffer-substring-no-properties tbeg tend)
+                  part-close-tag "</script>")
+            (cond
+             ((string-match-p " type[ ]*=[ ]*[\"']text/\\(jsx\\|babel\\)" script)
+              (setq element-content-type "jsx"))
+             ((string-match-p " type[ ]*=[ ]*[\"']text/\\(x-handlebars\\|x-jquery-tmpl\\|html\\|ng-template\\|template\\|mustache\\)" script)
+              (setq element-content-type "html"
+                    part-close-tag nil))
+             ((string-match-p " type[ ]*=[ ]*[\"']application/\\(ld\\+json\\|json\\)" script)
+              (setq element-content-type "json"))
+             (t
+              (setq element-content-type "javascript"))
+             ) ;cond
+            ) ;let
+          ) ;script
+         )
+
+        (add-text-properties tbeg tend props)
+        (put-text-property tbeg (1+ tbeg) 'tag-beg flags)
+        (put-text-property (1- tend) tend 'tag-end t)
+
+        (when (and part-close-tag
+                   (web-mode-dom-sf part-close-tag reg-end t)
+                   (setq part-beg tend)
+                   (setq part-end (match-beginning 0))
+                   (> part-end part-beg))
+          (put-text-property part-beg part-end 'part-side
+                             (intern element-content-type web-mode-obarray))
+          (setq tend part-end)
+          ) ;when
+
+        (goto-char tend)
+
+        ) ;while
+
+      )))
+
+;; tag flags
+;; (1)attrs (2)custom (4)slash-beg (8)slash-end (16)bracket-end
+;; (32)prefix
+
+;; attr flags
+;; (1)custom-attr (2)engine-attr (4)spread-attr[jsx]
+
+;; attr states
+;; (0)nil (1)space (2)name (3)space-before (4)equal (5)space-after
+;; (6)value-uq (7)value-sq (8)value-dq (9)value-bq : jsx attr={}
+
+(defun web-mode-attr-skip (limit)
+
+  (let ((tag-flags 0) (attr-flags 0) (continue t) (attrs 0) (counter 0) (brace-depth 0)
+        (pos-ori (point)) (state 0) (equal-offset 0) (go-back nil)
+        (is-jsx (string= web-mode-content-type "jsx"))
+        name-beg name-end val-beg char pos escaped spaced quoted)
+
+    (while continue
+
+      (setq pos (point)
+            char (char-after)
+            spaced (eq char ?\s))
+
+      (when quoted (setq quoted (1+ quoted)))
+
+      (cond
+
+       ((>= pos limit)
+        (setq continue nil)
+        (setq go-back t)
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        )
+
+       ((or (and (= state 8) (not (member char '(?\" ?\\))))
+            (and (= state 7) (not (member char '(?\' ?\\))))
+            (and (= state 9) (not (member char '(?} ?\\))))
+            )
+        (when (and (= state 9) (eq char ?\{))
+          (setq brace-depth (1+ brace-depth)))
+        )
+
+       ((and (= state 9) (eq char ?\}) (> brace-depth 1))
+        (setq brace-depth (1- brace-depth)))
+
+       ((get-text-property pos 'block-side)
+        (when (= state 2)
+          (setq name-end pos))
+        )
+
+       ((and (= state 2) is-jsx (eq char ?\}) (eq attr-flags 4))
+        (setq name-end pos)
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 0
+              attr-flags 0
+              equal-offset 0
+              name-beg nil
+              name-end nil
+              val-beg nil)
+        )
+
+       ((or (and (= state 8) (eq ?\" char) (not escaped))
+            (and (= state 7) (eq ?\' char) (not escaped))
+            (and (= state 9) (eq ?\} char) (= brace-depth 1))
+            )
+
+        ;;(message "%S %S" (point) attr-flags)
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 0
+              attr-flags 0
+              equal-offset 0
+              name-beg nil
+              name-end nil
+              val-beg nil)
+        )
+
+       ((and (member state '(4 5)) (member char '(?\' ?\" ?\{)))
+        (setq val-beg pos)
+        (setq quoted 1)
+        (setq state (cond ((eq ?\' char) 7)
+                          ((eq ?\" char) 8)
+                          (t             9)))
+        (when (= state 9)
+          (setq brace-depth 1))
+        )
+
+       ((and (eq ?\= char) (member state '(2 3)))
+        (setq equal-offset (- pos name-beg))
+        (setq state 4)
+        )
+
+       ((and spaced (= state 0))
+        (setq state 1)
+        )
+
+       ((and (eq char ?\<) (not (member state '(7 8 9))))
+        (setq continue nil)
+        (setq go-back t)
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        )
+
+       ((and (eq char ?\>) (not (member state '(7 8 9))))
+        (setq tag-flags (logior tag-flags 16))
+        (when (eq (char-before) ?\/)
+          (setq tag-flags (logior tag-flags 8))
+          )
+        (setq continue nil)
+        (when name-beg
+          (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset))))
+        )
+
+       ((and spaced (member state '(1 3 5)))
+        )
+
+       ((and spaced (= state 2))
+        (setq state 3)
+        )
+
+       ((and (eq char ?\/) (member state '(4 5)))
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 1
+              attr-flags 0
+              equal-offset 0
+              name-beg nil
+              name-end nil
+              val-beg nil)
+        )
+
+       ((and (eq char ?\/) (member state '(0 1)))
+        )
+
+       ((and spaced (= state 4))
+        (setq state 5)
+        )
+
+       ((and (= state 3)
+             (or (and (>= char 97) (<= char 122)) ;a - z
+                 (and (>= char 65) (<= char 90)) ;A - Z
+                 (eq char ?\-)))
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 2
+              attr-flags 0
+              equal-offset 0
+              name-beg pos
+              name-end pos
+              val-beg nil)
+        )
+
+       ((and (eq char ?\n) (not (member state '(7 8 9))))
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 1
+              attr-flags 0
+              equal-offset 0
+              name-beg nil
+              name-end nil
+              val-beg nil)
+        )
+
+       ((and (= state 6) (member char '(?\s ?\n ?\/)))
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 1
+              attr-flags 0
+              equal-offset 0
+              name-beg nil
+              name-end nil
+              val-beg nil)
+        )
+
+       ((and quoted (= quoted 2) (member char '(?\s ?\n ?\>)))
+        (when (eq char ?\>)
+          (setq tag-flags (logior tag-flags 16))
+          (setq continue nil))
+        (setq state 6)
+        (setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
+        (setq state 1
+              attr-flags 0
+              equal-offset 0
+              name-beg nil
+              name-end nil
+              val-beg nil)
+        )
+
+       ((and (not spaced) (= state 1))
+        (when (and is-jsx (eq char ?\{))
+          (setq attr-flags 4))
+        (setq state 2)
+        (setq name-beg pos
+              name-end pos)
+        )
+
+       ((member state '(4 5))
+        (setq val-beg pos)
+        (setq state 6)
+        )
+
+       ((= state 1)
+        (setq state 2)
+        )
+
+       ((= state 2)
+        (setq name-end pos)
+        (when (and (= attr-flags 0) (member char '(?\- ?\:))) ;;(= (logand attr-flags 1) 1)
+          (let (attr)
+            (setq attr (buffer-substring-no-properties name-beg (1+ name-end)))
+            (cond
+             ((member attr '("http-equiv"))
+              (setq attr-flags (1- attr-flags))
+              )
+             ((and web-mode-engine-attr-regexp
+                   (string-match-p web-mode-engine-attr-regexp attr))
+              ;;(message "%S: %S" pos web-mode-engine-attr-regexp)
+              (setq attr-flags (logior attr-flags 2))
+              ;;(setq attr-flags (1- attr-flags))
+              )
+             ((and (eq char ?\-) (not (string= attr "http-")))
+              (setq attr-flags (logior attr-flags 1)))
+             ) ;cond
+            ) ;let
+          ) ;when attr-flags = 1
+        ) ;state=2
+
+       ) ;cond
+
+      ;;(message "point(%S) end(%S) state(%S) c(%S) name-beg(%S) name-end(%S) val-beg(%S) attr-flags(%S) equal-offset(%S)" pos end state char name-beg name-end val-beg attr-flags equal-offset)
+
+      (when (and quoted (>= quoted 2))
+        (setq quoted nil))
+
+      (setq escaped (eq ?\\ char))
+      (when (null go-back)
+        (forward-char))
+
+      ) ;while
+
+    (when (> attrs 0) (setq tag-flags (logior tag-flags 1)))
+
+    tag-flags))
+
+(defun web-mode-attr-scan (state char name-beg name-end val-beg flags equal-offset)
+;;  (message "point(%S) state(%S) c(%c) name-beg(%S) name-end(%S) val-beg(%S) flags(%S) equal-offset(%S)"
+;;           (point) state char name-beg name-end val-beg flags equal-offset)
+  (if (null flags) (setq flags 0))
+  (cond
+   ((null name-beg)
+;;    (message "name-beg is null (%S)" (point))
+    0)
+   ((or (and (= state 8) (not (eq ?\" char)))
+        (and (= state 7) (not (eq ?\' char))))
+    (put-text-property name-beg (1+ name-beg) 'tag-attr-beg flags)
+    (put-text-property name-beg val-beg 'tag-attr t)
+    (put-text-property (1- val-beg) val-beg 'tag-attr-end equal-offset)
+    1)
+   ((and (member state '(4 5)) (null val-beg))
+    (put-text-property name-beg (1+ name-beg) 'tag-attr-beg flags)
+    (put-text-property name-beg (+ name-beg equal-offset 1) 'tag-attr t)
+    (put-text-property (+ name-beg equal-offset) (+ name-beg equal-offset 1) 'tag-attr-end equal-offset)
+    1)
+   (t
+    (let (val-end)
+      (if (null val-beg)
+          (setq val-end name-end)
+        (setq val-end (point))
+        (when (or (null char) (member char '(?\s ?\n ?\> ?\/)))
+          (setq val-end (1- val-end))
+          )
+        ) ;if
+      (put-text-property name-beg (1+ name-beg) 'tag-attr-beg flags)
+      (put-text-property name-beg (1+ val-end) 'tag-attr t)
+      (put-text-property val-end (1+ val-end) 'tag-attr-end equal-offset)
+      ) ;let
+    1) ;t
+   ) ;cond
+  )
+
+(defun web-mode-part-scan (reg-beg reg-end &optional content-type depth)
+  (save-excursion
+    (let (token-re ch-before ch-at ch-next token-type beg continue)
+      ;;(message "%S %S" reg-beg reg-end)
+      (cond
+       (content-type
+        )
+       ((member web-mode-content-type web-mode-part-content-types)
+        (setq content-type web-mode-content-type))
+       (t
+        (setq content-type (symbol-name (get-text-property reg-beg 'part-side))))
+       ) ;cond
+
+      (goto-char reg-beg)
+
+      (cond
+       ((member content-type '("javascript" "json"))
+        (setq token-re "/\\|\"\\|'\\|`"))
+       ((member content-type '("jsx"))
+        (setq token-re "/\\|\"\\|'\\|`\\|</?[[:alpha:]]"))
+       ((string= web-mode-content-type "css")
+        (setq token-re "\"\\|'\\|/\\*\\|//"))
+       ((string= content-type "css")
+        (setq token-re "\"\\|'\\|/\\*"))
+       (t
+        (setq token-re "/\\*\\|\"\\|'"))
+       )
+
+      (while (and token-re (< (point) reg-end) (web-mode-dom-rsf token-re reg-end t))
+
+        (setq beg (match-beginning 0)
+              token-type nil
+              continue t
+              ch-at (char-after beg)
+              ch-next (or (char-after (1+ beg)) ?\d)
+              ch-before (or (char-before beg) ?\d))
+
+        ;;(message "[%S>%S|%S] %S %c %c %c" reg-beg reg-end depth beg ch-before ch-at ch-next)
+
+        (cond
+
+         ((eq ?\' ch-at)
+          (while (and continue (search-forward "'" reg-end t))
+            (cond
+             ((get-text-property (1- (point)) 'block-side)
+              (setq continue t))
+             ((looking-back "\\\\+'" reg-beg t)
+              (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0))
+              )
+             (t
+              (setq continue nil))
+             )
+            ) ;while
+          (setq token-type 'string))
+
+         ((eq ?\` ch-at)
+          (while (and continue (search-forward "`" reg-end t))
+            (cond
+             ((get-text-property (1- (point)) 'block-side)
+              (setq continue t))
+             ((looking-back "\\\\+`" reg-beg t)
+              (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0)))
+             (t
+              (setq continue nil))
+             )
+            ) ;while
+          (setq token-type 'string))
+
+         ((eq ?\" ch-at)
+          (while (and continue (search-forward "\"" reg-end t))
+            (cond
+             ((get-text-property (1- (point)) 'block-side)
+              (setq continue t))
+             ((looking-back "\\\\+\"" reg-beg t)
+              (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0)))
+             (t
+              (setq continue nil))
+             ) ;cond
+            ) ;while
+          (cond
+           ((string= content-type "json")
+            (if (looking-at-p "[ ]*:")
+                (cond
+                 ((eq ?\@ (char-after (1+ beg)))
+                  (setq token-type 'context))
+                 (t
+                  (setq token-type 'key))
+                 )
+              (setq token-type 'string))
+            ) ;json
+           (t
+            (setq token-type 'string))
+           ) ;cond
+          )
+
+         ((eq ?\< ch-at)
+          ;;(message "before [%S>%S|%S] pt=%S" reg-beg reg-end depth (point))
+          (if (web-mode-jsx-skip reg-end)
+              (web-mode-jsx-scan-element beg (point) depth)
+            (forward-char))
+          ;;(message "after [%S>%S|%S] pt=%S" reg-beg reg-end depth (point))
+          )
+
+         ((and (eq ?\/ ch-at) (member content-type '("javascript" "jsx")))
+          (cond
+           ((eq ?\\ ch-before)
+            )
+           ((eq ?\* ch-next)
+            ;;(message "--> %S %S" (point) reg-end)
+            (when (search-forward "*/" reg-end t)
+              (setq token-type 'comment))
+            )
+           ((eq ?\/ ch-next)
+            (setq token-type 'comment)
+            (goto-char (if (< reg-end (line-end-position)) reg-end (line-end-position)))
+            )
+           ((and (looking-at-p ".*/")
+                 (looking-back "[[(,=:!&|?{};][ ]*/"))
+                 ;;(re-search-forward "/[gimyu]*" reg-end t))
+            (let ((eol (line-end-position)))
+              (while (and continue (search-forward "/" eol t))
+                (cond
+                 ((get-text-property (1- (point)) 'block-side)
+                  (setq continue t))
+                 ((looking-back "\\\\+/" reg-beg t)
+                  (setq continue (= (mod (- (point) (match-beginning 0)) 2) 0)))
+                 (t
+                  (re-search-forward "[gimyu]*" eol t)
+                  (setq token-type 'string)
+                  (setq continue nil))
+                 )
+                ) ;while
+              ) ;let
+            )
+           ) ;cond
+          )
+
+         ((eq ?\/ ch-next)
+          (unless (eq ?\\ ch-before)
+            (setq token-type 'comment)
+            (goto-char (if (< reg-end (line-end-position)) reg-end (line-end-position)))
+            )
+          )
+
+         ((eq ?\* ch-next)
+          (cond
+           ((search-forward "*/" reg-end t)
+            (setq token-type 'comment))
+           ((not (eobp))
+            (forward-char))
+           ) ;cond
+          )
+
+         ) ;cond
+
+        (when (and beg (>= reg-end (point)) token-type)
+          (put-text-property beg (point) 'part-token token-type)
+          (cond
+           ((eq token-type 'comment)
+            (put-text-property beg (1+ beg) 'syntax-table (string-to-syntax "<"))
+            (when (< (point) (point-max))
+              (if (< (point) (line-end-position))
+                  (put-text-property (1- (point)) (point) 'syntax-table (string-to-syntax ">")) ;#445
+                (put-text-property (point) (1+ (point)) 'syntax-table (string-to-syntax ">")) ;#377
+                )
+              ) ;when
+            ) ;comment
+           ((eq token-type 'string)
+            (put-text-property beg (1+ beg) 'syntax-table (string-to-syntax "|"))
+            (when (< (point) (point-max))
+              (if (< (point) (line-end-position))
+                  (put-text-property (1- (point)) (point) 'syntax-table (string-to-syntax "|"))
+                (put-text-property (point) (1+ (point)) 'syntax-table (string-to-syntax "|"))
+                )
+              ) ;when
+            ) ;string
+           ) ;cond
+          ) ;when
+
+        (when (> (point) reg-end)
+          (message "reg-beg(%S) reg-end(%S) token-type(%S) point(%S)" reg-beg reg-end token-type (point)))
+
+        ;;(message "#[%S>%S|%S] %S %c %c %c | (%S)" reg-beg reg-end depth beg ch-before ch-at ch-next (point))
+
+        ) ;while
+
+      )))
+
+(defun web-mode-jsx-skip (reg-end)
+  (let ((continue t) (pos nil) (i 0))
+    (save-excursion
+      (while continue
+        (cond
+         ((> (setq i (1+ i)) 100)
+          (message "jsx-skip ** warning **")
+          (setq continue nil))
+         ((not (web-mode-dom-rsf ">\\([ \t\n]*[\];,)':}]\\)\\|{" reg-end))
+          (setq continue nil)
+          )
+         ((eq (char-before) ?\{)
+          (backward-char)
+          (web-mode-closing-paren reg-end)
+          (forward-char)
+          )
+         (t
+          (setq continue nil)
+          (setq pos (match-beginning 1))
+          ) ;t
+         ) ;cond
+        ) ;while
+      ) ;save-excursion
+    (when pos (goto-char pos))
+    ;;(message "jsx-skip: %S" pos)
+    pos))
+
+;; http://facebook.github.io/jsx/
+;; https://github.com/facebook/jsx/blob/master/AST.md
+(defun web-mode-jsx-scan-element (reg-beg reg-end depth)
+  (unless depth (setq depth 1))
+  (save-excursion
+    (let (token-beg token-end regexp)
+      (goto-char reg-beg)
+      (put-text-property reg-beg (1+ reg-beg) 'jsx-beg depth)
+      (put-text-property (1- reg-end) reg-end 'jsx-end depth)
+      (put-text-property reg-beg reg-end 'jsx-depth depth)
+      (goto-char reg-beg)
+      (while (web-mode-part-sf "/*" reg-end t)
+        (goto-char (match-beginning 0))
+        (if (looking-back "{")
+            (progn
+              (backward-char)
+              (setq regexp "*/}"))
+          (setq regexp "*/"))
+        (setq token-beg (point))
+        (if (not (web-mode-part-sf regexp reg-end t))
+            (goto-char reg-end)
+          (setq token-end (point))
+          (put-text-property token-beg token-end 'part-token 'comment)
+          ) ;if
+        ) ;while
+      (web-mode-scan-elements reg-beg reg-end)
+      (web-mode-jsx-scan-expression reg-beg reg-end (1+ depth))
+      )))
+
+(defun web-mode-jsx-scan-expression (reg-beg reg-end depth)
+  (let ((continue t) beg end)
+    (save-excursion
+      (goto-char reg-beg)
+      ;;(message "reg-beg=%S reg-end=%S" reg-beg reg-end)
+      (while (and continue (search-forward "{" reg-end t))
+        (backward-char)
+        (setq beg (point)
+              end (web-mode-closing-paren reg-end))
+        (cond
+         ((eq (get-text-property beg 'part-token) 'comment)
+          (forward-char))
+         ((not end)
+          (setq continue nil))
+         (t
+          (setq end (1+ end))
+          (put-text-property beg end 'jsx-depth depth)
+          (put-text-property beg (1+ beg) 'jsx-beg depth)
+          (put-text-property (1- end) end 'jsx-end depth)
+          (web-mode-part-scan beg end "jsx" (1+ depth))
+          ) ;t
+         ) ;cond
+        )
+      )
+    ))
+
+(defun web-mode-jsx-is-html (&optional pos)
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let ((depth (get-text-property pos 'jsx-depth)))
+    (cond
+     ((or (null depth) (<= pos 2))
+      (setq pos nil))
+     ((and (= depth 1) (get-text-property pos 'jsx-beg))
+      (setq pos nil))
+     ((get-text-property pos 'jsx-beg)
+      (setq pos (null (get-text-property pos 'tag-beg))))
+     ((setq pos (web-mode-jsx-depth-beginning-position pos))
+      (setq pos (not (null (get-text-property pos 'tag-beg)))))
+     (t
+      (setq pos nil))
+     ) ;cond
+    ;;(message "is-html: %S (depth=%S)" pos depth)
+    pos))
+
+(defun web-mode-jsx-depth-beginning-position (&optional pos target-depth)
+  (interactive)
+  (unless pos (setq pos (point)))
+  (unless target-depth (setq target-depth (get-text-property pos 'jsx-depth)))
+  (cond
+   ((or (null target-depth) (bobp))
+    (setq pos nil))
+   ((and (get-text-property pos 'jsx-beg) (= target-depth (get-text-property pos 'jsx-depth)))
+    )
+   (t
+    (let ((continue t) depth)
+      (while continue
+        (setq pos (previous-single-property-change pos 'jsx-depth))
+        (cond
+         ((or (null pos)
+              (null (setq depth (get-text-property pos 'jsx-depth))))
+          (setq continue nil
+                pos nil))
+         ((and (get-text-property pos 'jsx-beg) (= target-depth depth))
+          (setq continue nil))
+         ) ;cond
+        ) ;while
+      ) ;let
+    ) ;t
+   ) ;cond
+  ;;(message "beg: %S" pos)
+  pos)
+
+(defun web-mode-velocity-skip (pos)
+  (goto-char pos)
+  (let ((continue t) (i 0))
+    (when (eq ?\# (char-after))
+      (forward-char))
+    (when (member (char-after) '(?\$ ?\@))
+      (forward-char))
+    (when (member (char-after) '(?\!))
+      (forward-char))
+    (if (member (char-after) '(?\{))
+        (search-forward "}")
+      (setq continue t)
+      (while continue
+        (skip-chars-forward "a-zA-Z0-9_-")
+        (when (> (setq i (1+ i)) 500)
+          (message "velocity-skip ** warning (%S) **" pos)
+          (setq continue nil))
+        (when (member (char-after) '(?\())
+          (search-forward ")" nil t))
+        (if (member (char-after) '(?\.))
+            (forward-char)
+          (setq continue nil))
+        ) ;while
+      ) ;if
+    ))
+
+(defun web-mode-razor-skip (pos)
+  (goto-char pos)
+  (let ((continue t) (i 0))
+    (while continue
+      (skip-chars-forward " =@a-zA-Z0-9_-")
+      (cond
+       ((> (setq i (1+ i)) 500)
+        (message "razor-skip ** warning **")
+        (setq continue nil))
+       ((and (eq (char-after) ?\*)
+             (eq (char-before) ?@))
+        (when (not (search-forward "*@" nil t))
+          (setq continue nil))
+        )
+       ((looking-at-p "@[({]")
+        (forward-char)
+        (when (setq pos (web-mode-closing-paren-position (point)))
+          (goto-char pos))
+        (forward-char)
+        )
+       ((and (not (eobp)) (eq ?\( (char-after)))
+        (if (looking-at-p "[ \n]*<")
+            (setq continue nil)
+          (when (setq pos (web-mode-closing-paren-position))
+            (goto-char pos))
+          (forward-char)
+          ) ;if
+        )
+       ((and (not (eobp)) (eq ?\. (char-after)))
+        (forward-char))
+       ((looking-at-p "[ \n]*{")
+        (search-forward "{")
+        (if (looking-at-p "[ \n]*<")
+            (setq continue nil)
+          (backward-char)
+          (when (setq pos (web-mode-closing-paren-position))
+            (goto-char pos))
+          (forward-char)
+          ) ;if
+        )
+       ((looking-at-p "}")
+        (forward-char))
+       (t
+        (setq continue nil))
+       ) ;cond
+      ) ;while
+    ))
+
+;; css rule = selector(s) + declaration (properties)
+(defun web-mode-css-rule-next (limit)
+  (let (at-rule sel-beg sel-end dec-beg dec-end chunk)
+    (skip-chars-forward "\n\t ")
+    (setq sel-beg (point))
+    (when (and (< (point) limit)
+               (web-mode-part-rsf "[{;]" limit))
+      (setq sel-end (1- (point)))
+      (cond
+       ((eq (char-before) ?\{)
+        (setq dec-beg (point))
+        (setq dec-end (web-mode-closing-paren-position (1- dec-beg) limit))
+        (if dec-end
+            (progn
+              (goto-char dec-end)
+              (forward-char))
+          (setq dec-end limit)
+          (goto-char limit))
+        )
+       (t
+        )
+       ) ;cond
+      (setq chunk (buffer-substring-no-properties sel-beg sel-end))
+      (when (string-match "@\\([[:alpha:]-]+\\)" chunk)
+        (setq at-rule (match-string-no-properties 1 chunk)))
+      ) ;when
+    (if (not sel-end)
+        (progn (goto-char limit) nil)
+      (list :at-rule at-rule
+            :sel-beg sel-beg
+            :sel-end sel-end
+            :dec-beg dec-beg
+            :dec-end dec-end)
+      ) ;if
+    ))
+
+(defun web-mode-css-rule-current (&optional pos part-beg part-end)
+  "Current CSS rule boundaries."
+  (unless pos (setq pos (point)))
+  (unless part-beg (setq part-beg (web-mode-part-beginning-position pos)))
+  (unless part-end (setq part-end (web-mode-part-end-position pos)))
+  (save-excursion
+    (let (beg end)
+      (goto-char pos)
+      (if (not (web-mode-part-sb "{" part-beg))
+          (progn
+            (setq beg part-beg)
+            (if (web-mode-part-sf ";" part-end)
+                (setq end (1+ (point)))
+              (setq end part-end))
+            ) ;progn
+        (setq beg (point))
+        (setq end (web-mode-closing-paren-position beg part-end))
+        (if end
+            (setq end (1+ end))
+          (setq end (line-end-position)))
+;;        (message "%S >>beg%S >>end%S" pos beg end)
+        (if (> pos end)
+
+            ;;selectors
+            (progn
+              (goto-char pos)
+              (if (web-mode-part-rsb "[};]" part-beg)
+                  (setq beg (1+ (point)))
+                (setq beg part-beg)
+                ) ;if
+              (goto-char pos)
+              (if (web-mode-part-rsf "[{;]" part-end)
+                  (cond
+                   ((eq (char-before) ?\;)
+                    (setq end (point))
+                    )
+                   (t
+                    (setq end (web-mode-closing-paren-position (1- (point)) part-end))
+                    (if end
+                        (setq end (1+ end))
+                      (setq end part-end))
+                    )
+                   ) ;cond
+                (setq end part-end)
+                )
+              ) ;progn selectors
+
+          ;; declaration
+          (goto-char beg)
+          (if (web-mode-part-rsb "[}{;]" part-beg)
+              (setq beg (1+ (point)))
+            (setq beg part-beg)
+            ) ;if
+          ) ; if > pos end
+        )
+;;      (message "beg(%S) end(%S)" beg end)
+      (when (eq (char-after beg) ?\n)
+        (setq beg (1+ beg)))
+      (cons beg end)
+      )))
+
+(defun web-mode-scan-engine-comments (reg-beg reg-end tag-start tag-end)
+  "Scan engine comments (mako, django)."
+  (save-excursion
+    (let (beg end (continue t))
+      (goto-char reg-beg)
+      (while (and continue
+                  (< (point) reg-end)
+                  (re-search-forward tag-start reg-end t))
+        (goto-char (match-beginning 0))
+        (setq beg (point))
+        (if (not (re-search-forward tag-end reg-end t))
+            (setq continue nil)
+          (setq end (point))
+          (remove-list-of-text-properties beg end web-mode-scan-properties)
+          (add-text-properties beg end '(block-side t block-token comment))
+          (put-text-property beg (1+ beg) 'block-beg 0)
+          (put-text-property (1- end) end 'block-end t)
+          ) ;if
+        ) ;while
+      )))
+
+(defun web-mode-propertize (&optional beg end)
+
+  (unless beg (setq beg web-mode-change-beg))
+  (unless end (setq end web-mode-change-end))
+
+;;  (message "propertize: beg(%S) end(%S)" web-mode-change-beg web-mode-change-end)
+
+  (when (and end (> end (point-max)))
+    (setq end (point-max)))
+
+;;  (remove-text-properties beg end '(font-lock-face nil))
+
+  (setq web-mode-change-beg nil
+        web-mode-change-end nil)
+  (cond
+
+   ((or (null beg) (null end))
+    nil)
+
+   ((and (member web-mode-engine '("php" "asp"))
+         (get-text-property beg 'block-side)
+         (get-text-property end 'block-side)
+         (> beg (point-min))
+         (not (eq (get-text-property (1- beg) 'block-token) 'delimiter-beg))
+         (not (eq (get-text-property end 'block-token) 'delimiter-end)))
+    ;;(message "invalidate block")
+    (web-mode-invalidate-block-region beg end))
+
+   ((and (or (member web-mode-content-type '("css" "jsx" "javascript"))
+             (and (get-text-property beg 'part-side)
+                  (get-text-property end 'part-side)
+                  (> beg (point-min))
+                  (get-text-property (1- beg) 'part-side)
+                  (get-text-property end 'part-side))
+             ))
+    ;;(message "invalidate part (%S > %S)" beg end)
+    (web-mode-invalidate-part-region beg end))
+
+   (t
+    ;;(message "%S %S" beg end)
+    (web-mode-invalidate-region beg end))
+
+   ) ;cond
+
+  )
+
+;; NOTE: il est important d'identifier des caractères en fin de ligne
+;; web-mode-block-tokenize travaille en effet sur les fins de lignes pour
+;; les commentaires de type //
+(defun web-mode-invalidate-block-region (pos-beg pos-end)
+  ;;  (message "pos-beg(%S) pos-end(%S)" pos-beg pos-end)
+  (save-excursion
+    (let (beg end code-beg code-end)
+      ;;(message "invalidate-block-region: pos-beg(%S)=%S" pos-beg (get-text-property pos 'block-side))
+      ;;(message "code-beg(%S) code-end(%S) pos-beg(%S) pos-end(%S)" code-beg code-end pos-beg pos-end)
+      (cond
+       ((not (and (setq code-beg (web-mode-block-code-beginning-position pos-beg))
+                  (setq code-end (web-mode-block-code-end-position pos-beg))
+                  (>= pos-beg code-beg)
+                  (<= pos-end code-end)
+                  (> code-end code-beg)))
+        (web-mode-invalidate-region pos-beg pos-end))
+       ((member web-mode-engine '("asp"))
+        (goto-char pos-beg)
+        (forward-line -1)
+        (setq beg (line-beginning-position))
+        (when (> code-beg beg)
+          (setq beg code-beg))
+        (goto-char pos-beg)
+        (forward-line)
+        (setq end (line-end-position))
+        (when (< code-end end)
+          (setq end code-end))
+        ;; ?? pas de (web-mode-block-tokenize beg end) ?
+        (cons beg end)
+        ) ; asp
+       (t
+        (goto-char pos-beg)
+        (when (string= web-mode-engine "php")
+          (cond
+           ((and (looking-back "\*")
+                 (looking-at-p "/"))
+            (search-backward "/*" code-beg))
+           ) ;cond
+          )
+        (if (web-mode-block-rsb "[;{}(][ ]*\n" code-beg)
+            (setq beg (match-end 0))
+          (setq beg code-beg))
+        (goto-char pos-end)
+        (if (web-mode-block-rsf "[;{})][ ]*\n" code-end)
+            (setq end (1- (match-end 0)))
+          (setq end code-end))
+        (web-mode-block-tokenize beg end)
+        ;;(message "beg(%S) end(%S)" beg end)
+        (cons beg end)
+        )
+       ) ;cond
+      )))
+
+(defun web-mode-invalidate-part-region (pos-beg pos-end)
+  (save-excursion
+    (let (beg end part-beg part-end language)
+      (if (member web-mode-content-type '("css" "javascript" "json" "jsx"))
+          (setq language web-mode-content-type)
+        (setq language (symbol-name (get-text-property pos-beg 'part-side))))
+      (setq part-beg (web-mode-part-beginning-position pos-beg)
+            part-end (web-mode-part-end-position pos-beg))
+      ;;(message "language(%S) pos-beg(%S) pos-end(%S) part-beg(%S) part-end(%S)"
+      ;;       language pos-beg pos-end part-beg part-end)
+      (goto-char pos-beg)
+      (cond
+       ((not (and part-beg part-end
+                  (>= pos-beg part-beg)
+                  (<= pos-end part-end)
+                  (> part-end part-beg)))
+        (web-mode-invalidate-region pos-beg pos-end))
+       ((member language '("javascript" "json" "jsx"))
+        (if (web-mode-javascript-rsb "[;{}(][ ]*\n" part-beg)
+            (setq beg (match-end 0))
+          (setq beg part-beg))
+        (goto-char pos-end)
+        (if (web-mode-javascript-rsf "[;{})][ ]*\n" part-end)
+            (setq end (match-end 0))
+          (setq end part-end))
+        (web-mode-scan-region beg end language))
+       ((string= language "css")
+        (let (rule1 rule2)
+          (setq rule1 (web-mode-css-rule-current pos-beg))
+          (setq rule2 rule1)
+          (when (> pos-end (cdr rule1))
+            (setq rule2 (web-mode-css-rule-current pos-end)))
+          (setq beg (car rule1)
+                end (cdr rule2))
+          )
+        (web-mode-scan-region beg end language))
+       (t
+        (setq beg part-beg
+              end part-end)
+        (web-mode-scan-region beg end language))
+       ) ;cond
+      )))
+
+(defun web-mode-invalidate-region (reg-beg reg-end)
+  ;;(message "%S | reg-beg(%S) reg-end(%S)" (point) reg-beg reg-end)
+  (setq reg-beg (web-mode-invalidate-region-beginning-position reg-beg)
+        reg-end (web-mode-invalidate-region-end-position reg-end))
+  ;;(message "invalidate-region: reg-beg(%S) reg-end(%S)" reg-beg reg-end)
+  (web-mode-scan-region reg-beg reg-end))
+
+(defun web-mode-invalidate-region-beginning-position (pos)
+  (save-excursion
+    (goto-char pos)
+    (when (and (bolp) (not (bobp)))
+      (backward-char))
+    (beginning-of-line)
+    ;;(message "pos=%S %S" (point) (text-properties-at (point)))
+    (setq pos (point-min))
+    (let ((continue (not (bobp))))
+      (while continue
+        (cond
+         ((bobp)
+          (setq continue nil))
+         ;; NOTE: Going back to the previous start tag is necessary
+         ;; when inserting a part endtag (e.g. </script>).
+         ;; Indeed, parts must be identified asap.
+         ((and (progn (back-to-indentation) t)
+               (get-text-property (point) 'tag-beg)
+               (eq (get-text-property (point) 'tag-type) 'start))
+          (setq pos (point)
+                continue nil))
+         (t
+          (forward-line -1))
+         ) ;cond
+        ) ;while
+      ;;(message "pos=%S" pos)
+      pos)))
+
+(defun web-mode-invalidate-region-end-position (pos)
+  (save-excursion
+    (goto-char pos)
+    ;;(message "pos=%S %S" pos (get-text-property pos 'block-token))
+    (when (string= web-mode-engine "jsp")
+      (cond
+       ((and (looking-back "<%")
+             (looking-at-p "--"))
+        (search-forward "--%>"))
+       ((and (looking-back "-- %")
+             (looking-at-p ">"))
+        (search-forward "--%>"))
+       ) ;cond
+      ) ;when
+
+    (setq pos (point-max))
+    (let ((continue (not (eobp))))
+      (while continue
+        (end-of-line)
+        ;;(message "%S %S" (point) (get-text-property (point) 'block-token))
+        (cond
+         ((eobp)
+          (setq continue nil))
+         ;;()
+         ((and (not (get-text-property (point) 'tag-type))
+               (not (get-text-property (point) 'part-side))
+               (not (get-text-property (point) 'block-side)))
+          (setq pos (point)
+                continue nil))
+         (t
+          (forward-line))
+         ) ;cond
+        ) ;while
+      pos)))
+
+(defun web-mode-buffer-scan ()
+  "Scan entine buffer."
+  (interactive)
+  (web-mode-scan-region (point-min) (point-max)))
+
+;;---- FONTIFICATION -----------------------------------------------------------
+
+(defun web-mode-font-lock-highlight (limit)
+  ;;(message "font-lock-highlight: point(%S) limit(%S) change-beg(%S) change-end(%S)" (point) limit web-mode-change-beg web-mode-change-end)
+  (cond
+   (web-mode-inhibit-fontification
+    nil)
+   (t
+    (web-mode-highlight-region (point) limit)
+    nil)
+   ))
+
+(defun web-mode-buffer-highlight ()
+  (interactive)
+  (if (fboundp 'font-lock-flush)
+      (font-lock-flush)
+    (font-lock-fontify-buffer)))
+
+(defun web-mode-extend-region ()
+  ;;(message "extend-region: flb(%S) fle(%S) wmcb(%S) wmce(%S)" font-lock-beg font-lock-end web-mode-change-beg web-mode-change-end)
+  ;;  (setq font-lock-beg web-mode-change-beg
+  ;;        font-lock-end web-mode-change-end)
+  (cond
+   (web-mode-inhibit-fontification
+    nil)
+   (t ;;(and web-mode-change-beg web-mode-change-end)
+    (when (or (null web-mode-change-beg) (< font-lock-beg web-mode-change-beg))
+      ;;(message "font-lock-beg(%S) < web-mode-change-beg(%S)" font-lock-beg web-mode-change-beg)
+      (setq web-mode-change-beg font-lock-beg))
+    (when (or (null web-mode-change-end) (> font-lock-end web-mode-change-end))
+      ;;(message "font-lock-end(%S) > web-mode-change-end(%S)" font-lock-end web-mode-change-end)
+      (setq web-mode-change-end font-lock-end))
+    (let ((region (web-mode-propertize web-mode-change-beg web-mode-change-end)))
+      (when region
+        ;;(message "region: %S" region)
+        (setq font-lock-beg (car region)
+              font-lock-end (cdr region)
+              ;;web-mode-change-beg (car region)
+              ;;web-mode-change-end (cdr region)
+              )
+        ) ;when
+      ) ;let
+    nil) ;t
+   ))
+
+(defun web-mode-unfontify-region (beg end)
+  ;;(message "unfontify: %S %S" beg end)
+  )
+
+(defun web-mode-highlight-region (&optional beg end) ;; content-type)
+  ;;(message "highlight-region: beg(%S) end(%S)" beg end)
+  (web-mode-with-silent-modifications
+   (save-excursion
+     (save-restriction
+       (save-match-data
+         (let ((buffer-undo-list t)
+               ;;(inhibit-modification-hooks t)
+               (inhibit-point-motion-hooks t)
+               (inhibit-quit t))
+           (remove-list-of-text-properties beg end '(font-lock-face face))
+           (cond
+            ((and (get-text-property beg 'block-side)
+                  (not (get-text-property beg 'block-beg)))
+             (web-mode-block-highlight beg end))
+            ((or (member web-mode-content-type web-mode-part-content-types)
+                 ;;(member content-type web-mode-part-content-types)
+                 (get-text-property beg 'part-side))
+             (web-mode-part-highlight beg end)
+             (web-mode-process-blocks beg end 'web-mode-block-highlight))
+            ((string= web-mode-engine "none")
+             (web-mode-highlight-tags beg end)
+             (web-mode-process-parts beg end 'web-mode-part-highlight))
+            (t
+             (web-mode-highlight-tags beg end)
+             (web-mode-process-parts beg end 'web-mode-part-highlight)
+             (web-mode-process-blocks beg end 'web-mode-block-highlight))
+            ) ;cond
+           (when web-mode-enable-element-content-fontification
+             (web-mode-highlight-elements beg end))
+           (when web-mode-enable-whitespace-fontification
+             (web-mode-highlight-whitespaces beg end))
+           ;;(message "%S %S" font-lock-keywords font-lock-keywords-alist)
+           ))))))
+
+(defun web-mode-highlight-tags (reg-beg reg-end &optional depth)
+  (let ((continue t))
+    (goto-char reg-beg)
+    (when (and (not (get-text-property (point) 'tag-beg))
+               (not (web-mode-tag-next)))
+      (setq continue nil))
+    (when (and continue (>= (point) reg-end))
+      (setq continue nil))
+    (while continue
+      (cond
+       (depth
+        (when (eq depth (get-text-property (point) 'jsx-depth))
+          (web-mode-tag-highlight)))
+       (t
+        (web-mode-tag-highlight))
+       ) ;cond
+      (when (or (not (web-mode-tag-next))
+                (>= (point) reg-end))
+        (setq continue nil))
+      ) ;while
+    (when web-mode-enable-inlays
+      (when (null web-mode-inlay-regexp)
+        (setq web-mode-inlay-regexp (regexp-opt '("\\[" "\\(" "\\begin{align}"))))
+      (let (beg end expr)
+        (goto-char reg-beg)
+        (while (web-mode-dom-rsf web-mode-inlay-regexp reg-end)
+          (setq beg (match-beginning 0)
+                end nil
+                expr (substring (match-string-no-properties 0) 0 2))
+          (setq expr (cond
+                      ((string= expr "\\[") "\\]")
+                      ((string= expr "\\(") "\\)")
+                      (t "\\end{align}")))
+          (when (and (web-mode-dom-sf expr reg-end)
+                     (setq end (match-end 0))
+                     (not (text-property-any beg end 'tag-end t)))
+            (font-lock-append-text-property beg end 'font-lock-face 'web-mode-inlay-face)
+            ) ;when
+          ) ;while
+        ) ;let
+      ) ;when
+    (when web-mode-enable-html-entities-fontification
+      (let (beg end)
+        (goto-char reg-beg)
+        (while (web-mode-dom-rsf "&\\([#]?[[:alnum:]]\\{2,8\\}\\);" reg-end)
+          (setq beg (match-beginning 0)
+                end (match-end 0))
+          (when (not (text-property-any beg end 'tag-end t))
+            (font-lock-append-text-property beg end 'font-lock-face 'web-mode-html-entity-face)
+            ) ;when
+          ) ;while
+        ) ;let
+      ) ;when
+    ))
+
+(defun web-mode-tag-highlight (&optional beg end)
+  (unless beg (setq beg (point)))
+  (unless end (setq end (1+ (web-mode-tag-end-position beg))))
+  (let (name type face flags slash-beg slash-end bracket-end)
+    (setq flags (get-text-property beg 'tag-beg)
+          type (get-text-property beg 'tag-type)
+          name (get-text-property beg 'tag-name))
+    (cond
+     ((eq type 'comment)
+      (put-text-property beg end 'font-lock-face 'web-mode-comment-face)
+      (when (and web-mode-enable-comment-interpolation (> (- end beg) 5))
+        (web-mode-interpolate-comment beg end nil)))
+     ((eq type 'cdata)
+      (put-text-property beg end 'font-lock-face 'web-mode-doctype-face))
+     ((eq type 'doctype)
+      (put-text-property beg end 'font-lock-face 'web-mode-doctype-face))
+     ((eq type 'declaration)
+      (put-text-property beg end 'font-lock-face 'web-mode-doctype-face))
+     (name
+      (setq face (cond
+                  ((and web-mode-enable-element-tag-fontification
+                        (setq face (cdr (assoc name web-mode-element-tag-faces))))
+                   face)
+                  ((> (logand flags 2) 0) 'web-mode-html-tag-custom-face)
+                  (t                      'web-mode-html-tag-face))
+            slash-beg (> (logand flags 4) 0)
+            slash-end (> (logand flags 8) 0)
+            bracket-end (> (logand flags 16) 0))
+      (put-text-property beg (+ beg (if slash-beg 2 1))
+                         'font-lock-face 'web-mode-html-tag-bracket-face)
+      (put-text-property (+ beg (if slash-beg 2 1)) (+ beg (if slash-beg 2 1) (length name))
+                         'font-lock-face face)
+      (when (or slash-end bracket-end)
+        (put-text-property (- end (if slash-end 2 1)) end 'font-lock-face 'web-mode-html-tag-bracket-face)
+        ) ;when
+      (when (> (logand flags 1) 0)
+        ;;(message "%S>%S" beg end)
+        (web-mode-highlight-attrs beg end))
+      ) ;case name
+     ) ;cond
+    ))
+
+(defun web-mode-highlight-attrs (reg-beg reg-end)
+  (let ((continue t) (pos reg-beg) beg end flags offset face)
+    ;;(message "highlight-attrs %S>%S" reg-beg reg-end)
+    (while continue
+      (setq beg (web-mode-attribute-next-position pos reg-end))
+      (cond
+       ((or (null beg) (>= beg reg-end))
+        (setq continue nil))
+       (t
+        (setq flags (or (get-text-property beg 'tag-attr-beg) 0))
+        (setq face (cond
+                    ((= (logand flags 1) 1) 'web-mode-html-attr-custom-face)
+                    ((= (logand flags 2) 2) 'web-mode-html-attr-engine-face)
+                    ((= (logand flags 4) 4) nil)
+                    (t                      'web-mode-html-attr-name-face)))
+        ;;(setq end (if (get-text-property beg 'tag-attr-end) beg (web-mode-attribute-end-position beg)))
+        (setq end (web-mode-attribute-end-position beg))
+        (cond
+         ((or (null end) (>= end reg-end))
+          (setq continue nil))
+         (t
+          (setq offset (get-text-property end 'tag-attr-end))
+          (if (= offset 0)
+              (put-text-property beg (1+ end) 'font-lock-face face)
+            (put-text-property beg (+ beg offset) 'font-lock-face face)
+            (put-text-property (+ beg offset) (+ beg offset 1)
+                               'font-lock-face
+                               'web-mode-html-attr-equal-face)
+            (when (not (get-text-property (+ beg offset 1) 'jsx-beg))
+              (put-text-property (+ beg offset 1) (1+ end)
+                                 'font-lock-face
+                                 'web-mode-html-attr-value-face)
+              )
+            ) ;if offset
+          (setq pos (1+ end))
+          ) ;t
+         ) ;cond
+        ) ;t
+       );cond
+      ) ;while
+    ))
+
+(defun web-mode-block-highlight (reg-beg reg-end)
+  (let (sub1 sub2 sub3 continue char keywords token-type face beg end (buffer (current-buffer)))
+    ;;(message "reg-beg=%S reg-end=%S" reg-beg reg-end)
+
+    ;; NOTE: required for block inside tag attr
+    (remove-list-of-text-properties reg-beg reg-end '(font-lock-face))
+
+    (goto-char reg-beg)
+
+    (when (null web-mode-engine-font-lock-keywords)
+      (setq sub1 (buffer-substring-no-properties
+                  reg-beg (+ reg-beg 1))
+            sub2 (buffer-substring-no-properties
+                  reg-beg (+ reg-beg 2))
+            sub3 (buffer-substring-no-properties
+                  reg-beg (+ reg-beg (if (>= (point-max) (+ reg-beg 3)) 3 2))))
+      )
+
+    (cond
+
+     ((and (get-text-property reg-beg 'block-beg)
+           (eq (get-text-property reg-beg 'block-token) 'comment))
+      (put-text-property reg-beg reg-end 'font-lock-face 'web-mode-comment-face)
+      ) ;comment block
+
+     (web-mode-engine-font-lock-keywords
+      (setq keywords web-mode-engine-font-lock-keywords)
+      )
+
+     ((string= web-mode-engine "django")
+      (cond
+       ((string= sub2 "{{")
+        (setq keywords web-mode-django-expr-font-lock-keywords))
+       ((string= sub2 "{%")
+        (setq keywords web-mode-django-code-font-lock-keywords))
+       )) ;django
+
+     ((string= web-mode-engine "mako")
+      (cond
+       ((member sub3 '("<% " "<%\n" "<%!"))
+        (setq keywords web-mode-mako-block-font-lock-keywords))
+       ((eq (aref sub2 0) ?\%)
+        (setq keywords web-mode-mako-block-font-lock-keywords))
+       ((member sub2 '("<%" "</"))
+        (setq keywords web-mode-mako-tag-font-lock-keywords))
+       ((member sub2 '("${"))
+        (setq keywords web-mode-uel-font-lock-keywords))
+       )) ;mako
+
+     ((string= web-mode-engine "mason")
+      ;;(message "%S %S" sub2 sub3)
+      (cond
+       ((member sub3 '("<% " "<%\n" "<&|"))
+        (setq keywords web-mode-mason-code-font-lock-keywords))
+       ((eq (aref sub2 0) ?\%)
+        (setq keywords web-mode-mason-code-font-lock-keywords))
+       ((and (or (string= sub2 "<%") (string= sub3 "</%"))
+             (not (member sub3 '("<%c" "<%i" "<%p"))))
+        (setq keywords web-mode-mason-block-font-lock-keywords))
+       (t
+        (setq keywords web-mode-mason-code-font-lock-keywords))
+       )) ;mason
+
+     ((string= web-mode-engine "jsp")
+      (cond
+       ((string= sub3 "<%@")
+        (setq keywords web-mode-directive-font-lock-keywords))
+       ((member sub2 '("${" "#{"))
+        (setq keywords web-mode-uel-font-lock-keywords))
+       ((string= sub2 "<%")
+        (setq keywords web-mode-jsp-font-lock-keywords))
+       (t
+        (setq keywords web-mode-engine-tag-font-lock-keywords))
+       )) ;jsp
+
+     ((string= web-mode-engine "asp")
+      (cond
+       ((or (string= sub2 "<%")
+            (not (string= sub1 "<")))
+        (setq keywords web-mode-asp-font-lock-keywords))
+       (t
+        (setq keywords web-mode-engine-tag-font-lock-keywords))
+       )) ;asp
+
+     ((string= web-mode-engine "clip")
+      (setq keywords web-mode-engine-tag-font-lock-keywords)
+      ) ;clip
+
+     ((string= web-mode-engine "aspx")
+      (cond
+       ((string= sub3 "<%@")
+        (setq keywords web-mode-directive-font-lock-keywords))
+       ((string= sub3 "<%$")
+        (setq keywords web-mode-expression-font-lock-keywords))
+       (t
+        (setq keywords web-mode-aspx-font-lock-keywords))
+       )) ;aspx
+
+     ((string= web-mode-engine "freemarker")
+      (cond
+       ((member sub2 '("${" "#{"))
+        (setq keywords web-mode-uel-font-lock-keywords))
+       ((or (member sub2 '("<@" "[@" "<#" "[#"))
+            (member sub3 '("</@" "[/@" "</#" "[/#")))
+        (setq keywords (if (eq ?\[ (aref sub2 0))
+                           web-mode-freemarker-square-font-lock-keywords
+                         web-mode-freemarker-font-lock-keywords)))
+       (t
+        (setq keywords web-mode-engine-tag-font-lock-keywords))
+       )) ;freemarker
+
+     ) ;cond
+
+    (when keywords
+      (web-mode-fontify-region reg-beg reg-end keywords)
+      (setq continue t)
+      (setq end reg-beg)
+      (while continue
+        (if (get-text-property end 'block-token)
+            (setq beg end)
+          (setq beg (next-single-property-change end 'block-token buffer reg-end)))
+        (setq end nil)
+        (when beg (setq char (char-after beg)))
+        (if (and beg (< beg reg-end))
+            (progn
+              (setq token-type (get-text-property beg 'block-token))
+              (setq face (cond
+                          ((eq token-type 'string)  'web-mode-block-string-face)
+                          ((eq token-type 'comment) 'web-mode-block-comment-face)
+                          (t                        'web-mode-block-delimiter-face)))
+              (setq end (next-single-property-change beg 'block-token buffer reg-end))
+;;              (message "end=%S" end)
+              (if (and end (<= end reg-end))
+                  (progn
+                    ;;(message "%S > %S face(%S)" beg end face)
+                    (remove-list-of-text-properties beg end '(face))
+                    (put-text-property beg end 'font-lock-face face)
+                    )
+                (setq continue nil
+                      end nil)
+                ) ;if end
+              ) ;progn beg
+          (setq continue nil
+                end nil)
+          ) ;if beg
+        (when (and beg end)
+          (save-match-data
+            (when (and web-mode-enable-heredoc-fontification
+                       (eq char ?\<)
+                       (> (- end beg) 8)
+                       ;;(progn (message "%S" (buffer-substring-no-properties beg end)) t)
+                       (string-match-p "JS\\|JAVASCRIPT\\|HTM\\|CSS" (buffer-substring-no-properties beg end)))
+              (setq keywords
+                    (cond
+                     ((string-match-p "H" (buffer-substring-no-properties beg (+ beg 8)))
+                      web-mode-html-font-lock-keywords)
+                     (t
+                      web-mode-javascript-font-lock-keywords)
+                     ))
+              (web-mode-fontify-region beg end keywords)
+            ))
+;;          (message "%S %c %S beg=%S end=%S" web-mode-enable-string-interpolation char web-mode-engine beg end)
+          (when (and web-mode-enable-string-interpolation
+                     (member char '(?\" ?\<))
+                     (member web-mode-engine '("php" "erb"))
+                     (> (- end beg) 4))
+            (web-mode-interpolate-block-string beg end)
+            ) ;when
+          (when (and web-mode-enable-comment-interpolation
+                     (eq token-type 'comment)
+                     (> (- end beg) 3))
+            (web-mode-interpolate-comment beg end t)
+            ) ;when
+          (when (and web-mode-enable-sql-detection
+                     (eq token-type 'string)
+                     (> (- end beg) 6)
+                     ;;(eq char ?\<)
+                     ;;(web-mode-looking-at-p (concat "[ \n]*" web-mode-sql-queries) (1+ beg))
+                     (web-mode-looking-at-p (concat "\\(.\\|<<<[[:alnum:]]+\\)[ \n]*" web-mode-sql-queries) beg)
+                     )
+            (web-mode-interpolate-sql-string beg end)
+            ) ;when
+          ) ;when beg end
+        ) ;while continue
+      ) ;when keywords
+
+    (when (and (member web-mode-engine '("jsp" "mako"))
+               (> (- reg-end reg-beg) 12)
+               (eq ?\< (char-after reg-beg)))
+      (web-mode-interpolate-block-tag reg-beg reg-end))
+
+    (when web-mode-enable-block-face
+;;      (message "block-face %S %S" reg-beg reg-end)
+      (font-lock-append-text-property reg-beg reg-end 'face 'web-mode-block-face))
+
+    ))
+
+(defun web-mode-part-highlight (reg-beg reg-end &optional depth)
+  (unless depth
+    (when (string= web-mode-content-type "jsx") (setq depth 0))
+    )
+  (save-excursion
+    (let (start continue token-type face pos beg end string-face comment-face content-type)
+      ;;(message "part-highlight: reg-beg(%S) reg-end(%S)" reg-beg reg-end)
+      (if (member web-mode-content-type web-mode-part-content-types)
+          (setq content-type web-mode-content-type)
+        (setq content-type (symbol-name (get-text-property reg-beg 'part-side))))
+      (cond
+       ((member content-type '("javascript" "jsx"))
+        (setq string-face 'web-mode-javascript-string-face
+              comment-face 'web-mode-javascript-comment-face)
+        (web-mode-fontify-region reg-beg reg-end web-mode-javascript-font-lock-keywords))
+       ((string= content-type "json")
+        (setq string-face 'web-mode-json-string-face
+              comment-face 'web-mode-json-comment-face)
+        (web-mode-fontify-region reg-beg reg-end web-mode-javascript-font-lock-keywords))
+       ((string= content-type "css")
+        (setq string-face 'web-mode-css-string-face
+              comment-face 'web-mode-css-comment-face)
+        (web-mode-css-rules-highlight reg-beg reg-end))
+       (t
+        (setq string-face 'web-mode-part-string-face
+              comment-face 'web-mode-part-comment-face))
+       )
+
+      (goto-char reg-beg)
+
+      ;;(when (string= content-type "jsx") (web-mode-highlight-tags reg-beg reg-end))
+      ;;(setq continue (and pos (< pos reg-end)))
+      (setq continue t
+            pos reg-beg)
+      (while continue
+        (if (get-text-property pos 'part-token)
+            (setq beg pos)
+          (setq beg (next-single-property-change pos 'part-token)))
+        (cond
+         ((or (null beg) (>= beg reg-end))
+          (setq continue nil
+                end nil))
+         ((and (eq depth 0) (get-text-property beg 'jsx-depth))
+          (setq pos (or (next-single-property-change beg 'jsx-depth) (point-max))))
+         (t
+          (setq token-type (get-text-property beg 'part-token))
+          (setq face (cond
+                      ((eq token-type 'string)  string-face)
+                      ((eq token-type 'comment) comment-face)
+                      ((eq token-type 'context) 'web-mode-json-context-face)
+                      ((eq token-type 'key)     'web-mode-json-key-face)
+                      (t                        nil)))
+          (setq end (or (next-single-property-change beg 'part-token) (point-max))
+                pos end)
+          (cond
+           ((or (null end) (> end reg-end))
+            (setq continue nil
+                  end nil))
+           (t
+            (when face
+              (remove-list-of-text-properties beg end '(face))
+              (put-text-property beg end 'font-lock-face face))
+            (cond
+             ((< (- end beg) 6)
+              )
+             ((eq token-type 'string)
+              (when (and web-mode-enable-string-interpolation
+                         (member content-type '("javascript" "jsx")))
+                (web-mode-interpolate-javascript-string beg end)))
+             ((eq token-type 'comment)
+              (when web-mode-enable-comment-interpolation
+                (web-mode-interpolate-comment beg end t)))
+             ) ;cond
+            ) ;t
+           ) ;cond
+          ) ;t
+         ) ;cond
+        ) ;while
+
+      (when (and (string= web-mode-content-type "html") web-mode-enable-part-face)
+        (font-lock-append-text-property reg-beg reg-end 'face
+                                        (if (string= content-type "javascript")
+                                            'web-mode-script-face
+                                          'web-mode-style-face))
+        )
+
+      (when (and (eq depth 0) (string= content-type "jsx"))
+        (let (pair elt-beg elt-end exp-beg exp-end exp-depth)
+          (goto-char reg-beg)
+          (while (setq pair (web-mode-jsx-element-next reg-end))
+            ;;(message "elt-pair=%S" pair)
+            (setq elt-beg (car pair)
+                  elt-end (cdr pair))
+            (remove-list-of-text-properties elt-beg (1+ elt-end) '(face))
+            (web-mode-highlight-tags elt-beg elt-end 1)
+            (goto-char elt-beg)
+            (while (setq pair (web-mode-jsx-expression-next elt-end))
+              ;;(message "exp-pair=%S elt-end=%S" pair elt-end)
+              (setq exp-beg (car pair)
+                    exp-end (cdr pair))
+              (when (eq (char-after exp-beg) ?\{)
+                (setq exp-depth (get-text-property exp-beg 'jsx-depth))
+                (remove-list-of-text-properties exp-beg exp-end '(font-lock-face))
+                (put-text-property exp-beg (1+ exp-beg) 'font-lock-face 'web-mode-block-delimiter-face)
+                (when (and (eq (get-text-property exp-beg 'tag-attr-beg) 4) (web-mode-looking-at-p "\.\.\." (1+ exp-beg)))
+                  (put-text-property exp-beg (+ exp-beg 4) 'font-lock-face 'web-mode-block-delimiter-face))
+                (put-text-property exp-end (1+ exp-end) 'font-lock-face 'web-mode-block-delimiter-face)
+                (web-mode-highlight-tags (1+ exp-beg) exp-end (1+ exp-depth))
+                (web-mode-part-highlight (1+ exp-beg) exp-end exp-depth)
+                (web-mode-fontify-region (1+ exp-beg) exp-end web-mode-javascript-font-lock-keywords)
+                )
+              (goto-char (1+ exp-beg))
+              ) ;while exp
+            (goto-char (1+ elt-end))
+            ) ;while elt
+          ) ;let
+        ) ;when
+
+      )))
+
+(defun web-mode-jsx-element-next (reg-end)
+  (let (continue beg end)
+    (setq beg (point))
+    (unless (get-text-property beg 'jsx-depth)
+      (setq beg (next-single-property-change beg 'jsx-beg)))
+    (setq continue (and beg (< beg reg-end))
+          end beg)
+    (while continue
+      (setq end (next-single-property-change end 'jsx-end))
+      (cond
+       ((or (null end) (> end reg-end))
+        (setq continue nil
+              end nil))
+       ((eq (get-text-property end 'jsx-depth) 1)
+        (setq continue nil))
+       (t
+        (setq end (1+ end)))
+       ) ;cond
+      ) ;while
+    ;;(message "beg=%S end=%S" beg end)
+    (if (and beg end (< beg end)) (cons beg end) nil)))
+
+(defun web-mode-jsx-expression-next (reg-end)
+  (let (beg end depth continue pos)
+    (setq beg (point))
+    ;;(message "pt=%S" beg)
+    (unless (and (get-text-property beg 'jsx-beg) (null (get-text-property beg 'tag-beg)))
+      ;;(setq beg (next-single-property-change beg 'jsx-beg))
+      (setq continue t
+            pos (1+ beg))
+      (while continue
+        (setq pos (next-single-property-change pos 'jsx-beg))
+        (cond
+         ((null pos)
+          (setq continue nil
+                beg nil))
+         ((> pos reg-end)
+          (setq continue nil
+                beg nil))
+         ((null (get-text-property pos 'jsx-beg))
+          )
+         ((null (get-text-property pos 'tag-beg))
+          (setq continue nil
+                beg pos))
+         ;;(t
+         ;; (setq pos (1+ pos)))
+         ) ;cond
+        ) ;while
+      ) ;unless
+    ;;(message "beg=%S" beg)
+    (when (and beg (< beg reg-end))
+      (setq depth (get-text-property beg 'jsx-beg)
+            continue (not (null depth))
+            pos beg)
+      ;;(message "beg=%S" beg)
+      (while continue
+        (setq pos (next-single-property-change pos 'jsx-end))
+        ;;(message "pos=%S" pos)
+        (cond
+         ((null pos)
+          (setq continue nil))
+         ((> pos reg-end)
+          (setq continue nil))
+         ((eq depth (get-text-property pos 'jsx-end))
+          (setq continue nil
+                end pos))
+         (t
+          ;;(setq pos (1+ pos))
+          )
+         ) ;cond
+        ) ;while
+      ) ;when
+    ;;(message "%S > %S" beg end)
+    (if (and beg end) (cons beg end) nil)))
+
+(defun web-mode-css-rules-highlight (part-beg part-end)
+  (save-excursion
+    (goto-char part-beg)
+    (let (rule (continue t) (i 0) (at-rule nil))
+      (while continue
+        (setq rule (web-mode-css-rule-next part-end))
+        ;;(message "rule=%S" rule)
+        (cond
+         ((> (setq i (1+ i)) 1000)
+          (message "css-rules-highlight ** too much rules **")
+          (setq continue nil))
+         ((null rule)
+          (setq continue nil))
+         ((and (setq at-rule (plist-get rule :at-rule))
+               (not (member at-rule '("charset" "font-face" "import")))
+               (plist-get rule :dec-end))
+          (web-mode-css-rule-highlight (plist-get rule :sel-beg)
+                                       (plist-get rule :sel-end)
+                                       nil nil)
+          (web-mode-css-rules-highlight (plist-get rule :dec-beg)
+                                        (plist-get rule :dec-end)))
+         (t
+          (web-mode-css-rule-highlight (plist-get rule :sel-beg)
+                                       (plist-get rule :sel-end)
+                                       (plist-get rule :dec-beg)
+                                       (plist-get rule :dec-end)))
+         ) ;cond
+        ) ;while
+      ) ;let
+    ))
+
+(defun web-mode-css-rule-highlight (sel-beg sel-end dec-beg dec-end)
+  (save-excursion
+;;    (message "sel-beg=%S sel-end=%S dec-beg=%S dec-end=%S" sel-beg sel-end dec-beg dec-end)
+    (web-mode-fontify-region sel-beg sel-end
+                             web-mode-selector-font-lock-keywords)
+    (when (and dec-beg dec-end)
+      (web-mode-fontify-region dec-beg dec-end
+                               web-mode-declaration-font-lock-keywords)
+      (goto-char dec-beg)
+      (while (and web-mode-enable-css-colorization
+                  (re-search-forward "#[0-9a-fA-F]\\{6\\}\\|#[0-9a-fA-F]\\{3\\}\\|rgba?([ ]*\\([[:digit:]]\\{1,3\\}\\)[ ]*,[ ]*\\([[:digit:]]\\{1,3\\}\\)[ ]*,[ ]*\\([[:digit:]]\\{1,3\\}\\)\\(.*?\\))" dec-end t)
+                  (< (point) dec-end))
+        (web-mode-colorize (match-beginning 0) (match-end 0))
+        )
+      )))
+
+(defun web-mode-fontify-region (beg end keywords)
+;;  (message "beg=%S end=%S" beg end);; (symbol-name keywords))
+  (save-excursion
+    (let ((font-lock-keywords keywords)
+          (font-lock-multiline nil)
+          (font-lock-keywords-case-fold-search
+           (member web-mode-engine '("asp" "template-toolkit")))
+          (font-lock-keywords-only t)
+          (font-lock-extend-region-functions nil))
+      ;;      (message "%S" keywords)
+      (when (listp font-lock-keywords)
+        (font-lock-fontify-region beg end)
+        )
+      )
+    ))
+
+(defun web-mode-colorize-foreground (color)
+  (let* ((values (x-color-values color))
+	 (r (car values))
+	 (g (cadr values))
+	 (b (car (cdr (cdr values)))))
+    (if (> 128.0 (floor (+ (* .3 r) (* .59 g) (* .11 b)) 256))
+	"white" "black")))
+
+(defun web-mode-colorize (beg end)
+  (let (str plist len)
+    (setq str (buffer-substring-no-properties beg end))
+    (setq len (length str))
+    (cond
+     ((string= (substring str 0 1) "#")
+      (setq plist (list :background str
+                        :foreground (web-mode-colorize-foreground str)))
+      (put-text-property beg end 'face plist))
+     ((string= (substring str 0 4) "rgb(")
+      (setq str (format "#%02X%02X%02X"
+                        (string-to-number (match-string-no-properties 1))
+                        (string-to-number (match-string-no-properties 2))
+                        (string-to-number (match-string-no-properties 3))))
+      (setq plist (list :background str
+                        :foreground (web-mode-colorize-foreground str)))
+      (put-text-property beg end 'face plist))
+     ) ;cond
+    ))
+
+(defun web-mode-interpolate-block-tag (beg end)
+  (save-excursion
+    (goto-char (+ 4 beg))
+    (setq end (1- end))
+    (while (re-search-forward "${.*?}" end t)
+      (remove-list-of-text-properties (match-beginning 0) (match-end 0) '(face))
+      (web-mode-fontify-region (match-beginning 0) (match-end 0)
+                               web-mode-uel-font-lock-keywords))
+    ))
+
+(defun web-mode-interpolate-javascript-string (beg end)
+  (save-excursion
+    (goto-char (1+ beg))
+    (setq end (1- end))
+    (while (re-search-forward "${.*?}" end t)
+      (put-text-property (match-beginning 0) (match-end 0)
+                         'font-lock-face
+                         'web-mode-variable-name-face)
+      )
+    ))
+
+;; todo : parsing plus compliqué: {$obj->values[3]->name}
+(defun web-mode-interpolate-block-string (beg end)
+  (save-excursion
+    (goto-char (1+ beg))
+    (setq end (1- end))
+    (cond
+     ((string= web-mode-engine "php")
+      (while (re-search-forward "$[[:alnum:]_]+\\(->[[:alnum:]_]+\\)*\\|{[ ]*$.+?}" end t)
+;;        (message "%S > %S" (match-beginning 0) (match-end 0))
+        (remove-list-of-text-properties (match-beginning 0) (match-end 0) '(font-lock-face))
+        (web-mode-fontify-region (match-beginning 0) (match-end 0)
+                                 web-mode-php-var-interpolation-font-lock-keywords)
+        ))
+     ((string= web-mode-engine "erb")
+      (while (re-search-forward "#{.*?}" end t)
+        (remove-list-of-text-properties (match-beginning 0) (match-end 0) '(font-lock-face))
+        (put-text-property (match-beginning 0) (match-end 0)
+                           'font-lock-face 'web-mode-variable-name-face)
+        ))
+     ) ;cond
+    ))
+
+(defun web-mode-interpolate-comment (beg end block-side)
+  (save-excursion
+    (let ((regexp (concat "\\_<\\(" web-mode-comment-keywords "\\)\\_>")))
+      (goto-char beg)
+      (while (re-search-forward regexp end t)
+        (font-lock-prepend-text-property (match-beginning 1) (match-end 1)
+                                         'font-lock-face
+                                         'web-mode-comment-keyword-face)
+        ) ;while
+      )))
+
+(defun web-mode-interpolate-sql-string (beg end)
+  (save-excursion
+    (let ((case-fold-search t)
+          (regexp (concat "\\_<\\(" web-mode-sql-keywords "\\)\\_>")))
+      (goto-char beg)
+      (while (re-search-forward regexp end t)
+        (font-lock-prepend-text-property (match-beginning 1) (match-end 1)
+                                         'font-lock-face
+                                         'web-mode-sql-keyword-face)
+        ) ;while
+      )))
+
+(defun web-mode-fill-paragraph (&optional justify)
+  (save-excursion
+    (let ((pos (point)) fill-coll
+          prop pair beg end delim-beg delim-end chunk fill-col)
+      (cond
+       ((or (eq (get-text-property pos 'part-token) 'comment)
+            (eq (get-text-property pos 'block-token) 'comment))
+        (setq prop
+              (if (get-text-property pos 'part-token) 'part-token 'block-token))
+        (setq pair (web-mode-property-boundaries prop pos))
+        (when (and pair (> (- (cdr pair) (car pair)) 6))
+          (setq fill-coll (if (< fill-column 10) 70 fill-column))
+          (setq beg (car pair)
+                end (cdr pair))
+          (goto-char beg)
+          (setq chunk (buffer-substring-no-properties beg (+ beg 2)))
+          (cond
+           ((string= chunk "//")
+            (setq delim-beg "//"
+                  delim-end "EOL"))
+           ((string= chunk "/*")
+            (setq delim-beg "/*"
+                  delim-end "*/"))
+           ((string= chunk "{#")
+            (setq delim-beg "{#"
+                  delim-end "#}"))
+           ((string= chunk "<!")
+            (setq delim-beg "<!--"
+                  delim-end "-->"))
+           )
+          )
+        ) ;comment - case
+
+       ((web-mode-is-content)
+        (setq pair (web-mode-content-boundaries pos))
+        (setq beg (car pair)
+              end (cdr pair))
+        )
+
+       ) ;cond
+;;      (message "beg(%S) end(%S)" beg end)
+      (when (and beg end)
+        (fill-region beg end))
+      t)))
+
+(defun web-mode-property-boundaries (prop &optional pos)
+  "property boundaries (cdr is 1+)"
+  (unless pos (setq pos (point)))
+  (let (beg end val)
+    (setq val (get-text-property pos prop))
+    (if (null val)
+        val
+      (if (or (bobp)
+              (not (eq (get-text-property (1- pos) prop) val)))
+          (setq beg pos)
+        (setq beg (previous-single-property-change pos prop))
+        (when (null beg) (setq beg (point-min))))
+      (if (or (eobp)
+              (not (eq (get-text-property (1+ pos) prop) val)))
+          (setq end pos)
+        (setq end (next-single-property-change pos prop))
+        (when (null end) (setq end (point-min))))
+      (cons beg end))))
+
+(defun web-mode-content-boundaries (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (beg end)
+    (setq beg (or (previous-property-change pos (current-buffer))
+                  (point-max)))
+    (setq end (or (next-property-change pos (current-buffer))
+                  (point-min)))
+    (while (and (< beg end) (member (char-after beg) '(?\s ?\n)))
+      (setq beg (1+ beg)))
+    (while (and (> end beg) (member (char-after (1- end)) '(?\s ?\n)))
+      (setq end (1- end)))
+;;    (message "beg(%S) end(%S)" beg end)
+    (cons beg end)
+    ))
+
+(defun web-mode-engine-syntax-check ()
+  (interactive)
+  (let ((proc nil)
+        (errors nil)
+        (file (concat temporary-file-directory "emacs-web-mode-tmp")))
+    (write-region (point-min) (point-max) file)
+    (cond
+     ;;       ((null (buffer-file-name))
+     ;;        )
+     ((string= web-mode-engine "php")
+      (setq proc (start-process "php-proc" nil "php" "-l" file))
+      (set-process-filter proc
+                          (lambda (proc output)
+                            (cond
+                             ((string-match-p "No syntax errors" output)
+                              (message "No syntax errors")
+                              )
+                             (t
+;;                              (setq output (replace-regexp-in-string temporary-file-directory "" output))
+;;                              (message output)
+                              (message "Syntax error")
+                              (setq errors t))
+                             ) ;cond
+;;                            (delete-file file)
+                            ) ;lambda
+                          )
+      ) ;php
+     (t
+      (message "no syntax checker found")
+      ) ;t
+     ) ;cond
+    errors))
+
+(defun web-mode-jshint ()
+  "Run JSHint on all the JavaScript parts."
+  (interactive)
+  (let (proc lines)
+    (when (buffer-file-name)
+      (setq proc (start-process
+                  "jshint-proc"
+                  nil
+                  (or (executable-find "jshint") "/usr/local/bin/jshint")
+                  "--extract=auto"
+                  (buffer-file-name)))
+      (setq web-mode-jshint-errors 0)
+      (set-process-filter proc
+                          (lambda (proc output)
+                            (let ((offset 0) overlay pos (old 0) msg)
+                              (remove-overlays (point-min) (point-max) 'font-lock-face 'web-mode-error-face)
+                              (while (string-match
+                                      "line \\([[:digit:]]+\\), col \\([[:digit:]]+\\), \\(.+\\)\\.$"
+                                      output offset)
+                                (setq web-mode-jshint-errors (1+ web-mode-jshint-errors))
+                                (setq offset (match-end 0))
+                                (setq pos (web-mode-coord-position
+                                           (match-string-no-properties 1 output)
+                                           (match-string-no-properties 2 output)))
+                                (when (get-text-property pos 'tag-beg)
+                                  (setq pos (1- pos)))
+                                (when (not (= pos old))
+                                  (setq old pos)
+                                  (setq overlay (make-overlay pos (1+ pos)))
+                                  (overlay-put overlay 'font-lock-face 'web-mode-error-face)
+                                  )
+                                (setq msg (or (overlay-get overlay 'help-echo)
+                                               (concat "line="
+                                                       (match-string-no-properties 1 output)
+                                                       " column="
+                                                       (match-string-no-properties 2 output)
+                                                       )))
+                                (overlay-put overlay 'help-echo
+                                             (concat msg " ## " (match-string-no-properties 3 output)))
+                                ) ;while
+                              ))
+                          )
+      ) ;when
+    ))
+
+(defun web-mode-dom-errors-show ()
+  "Show unclosed tags."
+  (interactive)
+  (let (beg end tag pos l n tags i cont cell overlay overlays first
+            (ori (point))
+            (errors 0)
+            (continue t)
+        )
+    (setq overlays (overlays-in (point-min) (point-max)))
+    (when overlays
+      (dolist (overlay overlays)
+        (when (eq (overlay-get overlay 'face) 'web-mode-warning-face)
+          (delete-overlay overlay)
+          )
+        )
+      )
+    (goto-char (point-min))
+    (when (not (or (get-text-property (point) 'tag-beg)
+                   (web-mode-tag-next)))
+      (setq continue nil))
+    (while continue
+      (setq pos (point))
+      (setq tag (get-text-property pos 'tag-name))
+      (cond
+       ((eq (get-text-property (point) 'tag-type) 'start)
+        (setq tags (add-to-list 'tags (list tag pos)))
+;;        (message "(%S) opening %S" pos tag)
+        )
+       ((eq (get-text-property (point) 'tag-type) 'end)
+        (setq i 0
+              l (length tags)
+              cont t)
+        (while (and (< i l) cont)
+          (setq cell (nth i tags))
+;;          (message "cell=%S" cell)
+          (setq i (1+ i))
+          (cond
+           ((string= tag (nth 0 cell))
+            (setq cont nil)
+            )
+           (t
+            (setq errors (1+ errors))
+            (setq beg (nth 1 cell))
+            (setq end (web-mode-tag-end-position beg))
+            (unless first
+              (setq first beg))
+            (setq overlay (make-overlay beg (1+ end)))
+            (overlay-put overlay 'font-lock-face 'web-mode-warning-face)
+;;            (message "invalid <%S> at %S" (nth 0 cell) (nth 1 cell))
+            )
+           ) ;cond
+          ) ;while
+
+        (dotimes (i i)
+          (setq tags (cdr tags)))
+
+        )
+       ) ;cond
+      (when (not (web-mode-tag-next))
+        (setq continue nil))
+      ) ;while
+    (message "%S error(s) detected" errors)
+    (if (< errors 1)
+        (goto-char ori)
+      (goto-char first)
+      (recenter))
+    ;;    (message "%S" tags)
+    ))
+
+(defun web-mode-highlight-elements (beg end)
+  (save-excursion
+    (goto-char beg)
+    (let ((continue (or (get-text-property (point) 'tag-beg) (web-mode-tag-next)))
+          (i 0) (ctx nil) (face nil))
+      (while continue
+        (cond
+         ((> (setq i (1+ i)) 1000)
+          (message "highlight-elements ** too much tags **")
+          (setq continue nil))
+         ((> (point) end)
+          (setq continue nil))
+         ((not (get-text-property (point) 'tag-beg))
+          (setq continue nil))
+         ((eq (get-text-property (point) 'tag-type) 'start)
+          (when (and (setq ctx (web-mode-element-boundaries (point)))
+                     (<= (car (cdr ctx)) end)
+                     (setq face (cdr (assoc (get-text-property (point) 'tag-name) web-mode-element-content-faces))))
+            (font-lock-prepend-text-property (1+ (cdr (car ctx))) (car (cdr ctx))
+                                             'font-lock-face face))
+          )
+         ) ;cond
+        (when (not (web-mode-tag-next))
+          (setq continue nil))
+        ) ;while
+      )))
+
+(defun web-mode-enable (feature)
+  "Enable one feature."
+  (interactive
+   (list (completing-read
+          "Feature: "
+          (let (features)
+            (dolist (elt web-mode-features)
+              (setq features (append features (list (car elt)))))
+            features))))
+  (when (and (or (not feature) (< (length feature) 1)) web-mode-last-enabled-feature)
+    (setq feature web-mode-last-enabled-feature))
+  (when feature
+    (setq web-mode-last-enabled-feature feature)
+    (setq feature (cdr (assoc feature web-mode-features)))
+    (cond
+     ((eq feature 'web-mode-enable-current-column-highlight)
+      (web-mode-column-show))
+     ((eq feature 'web-mode-enable-current-element-highlight)
+      (when (not web-mode-enable-current-element-highlight)
+        (web-mode-toggle-current-element-highlight))
+      )
+     ((eq feature 'web-mode-enable-whitespace-fontification)
+      (web-mode-whitespaces-on))
+     (t
+      (set feature t)
+      (web-mode-buffer-highlight))
+     )
+    ) ;when
+  )
+
+(defun web-mode-disable (feature)
+  "Disable one feature."
+  (interactive
+   (list (completing-read
+          "Feature: "
+          (let (features)
+            (dolist (elt web-mode-features)
+              (setq features (append features (list (car elt)))))
+            features))))
+  (when (and (or (not feature) (< (length feature) 1)) web-mode-last-enabled-feature)
+    (setq feature web-mode-last-enabled-feature))
+  (when feature
+    (setq feature (cdr (assoc feature web-mode-features)))
+    (cond
+     ((eq feature 'web-mode-enable-current-column-highlight)
+      (web-mode-column-hide))
+     ((eq feature 'web-mode-enable-current-element-highlight)
+      (when web-mode-enable-current-element-highlight
+        (web-mode-toggle-current-element-highlight))
+      )
+     ((eq feature 'web-mode-enable-whitespace-fontification)
+      (web-mode-whitespaces-off))
+     (t
+      (set feature nil)
+      (web-mode-buffer-highlight))
+     )
+    ) ;when
+  )
+
+(defun web-mode-make-tag-overlays ()
+  (unless web-mode-overlay-tag-start
+    (setq web-mode-overlay-tag-start (make-overlay 1 1)
+          web-mode-overlay-tag-end (make-overlay 1 1))
+    (overlay-put web-mode-overlay-tag-start
+                 'font-lock-face
+                 'web-mode-current-element-highlight-face)
+    (overlay-put web-mode-overlay-tag-end
+                 'font-lock-face
+                 'web-mode-current-element-highlight-face)))
+
+(defun web-mode-delete-tag-overlays ()
+  (when web-mode-overlay-tag-start
+    (delete-overlay web-mode-overlay-tag-start)
+    (delete-overlay web-mode-overlay-tag-end)))
+
+(defun web-mode-column-overlay-factory (index)
+  (let (overlay)
+    (when (null web-mode-column-overlays)
+      (dotimes (i 100)
+        (setq overlay (make-overlay 1 1))
+        (overlay-put overlay 'font-lock-face 'web-mode-current-column-highlight-face)
+        (setq web-mode-column-overlays (append web-mode-column-overlays (list overlay)))
+        )
+      ) ;when
+    (setq overlay (nth index web-mode-column-overlays))
+    (when (null overlay)
+      (setq overlay (make-overlay 1 1))
+      (overlay-put overlay 'font-lock-face 'web-mode-current-column-highlight-face)
+      (setq web-mode-column-overlays (append web-mode-column-overlays (list overlay)))
+      ) ;when
+    overlay))
+
+(defun web-mode-column-hide ()
+  (setq web-mode-enable-current-column-highlight nil)
+  (remove-overlays (point-min) (point-max)
+                   'font-lock-face
+                   'web-mode-current-column-highlight-face))
+
+(defun web-mode-column-show ()
+  (let ((index 0) overlay diff column line-to line-from)
+    (web-mode-column-hide)
+    (setq web-mode-enable-current-column-highlight t)
+    (save-excursion
+      (back-to-indentation)
+      (setq column (current-column)
+            line-to (web-mode-line-number))
+      (when (and (get-text-property (point) 'tag-beg)
+                 (member (get-text-property (point) 'tag-type) '(start end))
+                 (web-mode-tag-match)
+                 (setq line-from (web-mode-line-number))
+                 (not (= line-from line-to)))
+        (when (> line-from line-to)
+          (let (tmp)
+            (setq tmp line-from)
+            (setq line-from line-to)
+            (setq line-to tmp))
+          ) ;when
+        ;;(message "column(%S) line-from(%S) line-to(%S)" column line-from line-to)
+        (goto-char (point-min))
+        (when (> line-from 1)
+          (forward-line (1- line-from)))
+        (while (<= line-from line-to)
+          (setq overlay (web-mode-column-overlay-factory index))
+          (setq diff (- (line-end-position) (point)))
+          (cond
+           ((or (and (= column 0) (= diff 0))
+                (> column diff))
+            (end-of-line)
+            (move-overlay overlay (point) (point))
+            (overlay-put overlay
+                         'after-string
+                         (concat
+                          (if (> column diff) (make-string (- column diff) ?\s) "")
+                          (propertize " "
+                                      'font-lock-face
+                                      'web-mode-current-column-highlight-face)
+                          ) ;concat
+                         )
+            )
+           (t
+            (move-to-column column)
+            (overlay-put overlay 'after-string nil)
+            (move-overlay overlay (point) (1+ (point)))
+            )
+           ) ;cond
+          (setq line-from (1+ line-from))
+          (forward-line)
+          (setq index (1+ index))
+          ) ;while
+        ) ;when
+      ) ;save-excursion
+    ) ;let
+  )
+
+(defun web-mode-highlight-current-element ()
+  (let ((ctx (web-mode-element-boundaries)) len)
+    (cond
+     ((null ctx)
+      (web-mode-delete-tag-overlays))
+     (t
+      (web-mode-make-tag-overlays)
+      (setq len (length (get-text-property (caar ctx) 'tag-name)))
+      (move-overlay web-mode-overlay-tag-start (+ (caar ctx) 1) (+ (caar ctx) 1 len))
+      (move-overlay web-mode-overlay-tag-end (+ (cadr ctx) 2) (+ (cadr ctx) 2 len))
+      ) ;t
+     ) ;cond
+    ))
+
+(defun web-mode-highlight-whitespaces (beg end)
+  (save-excursion
+    (goto-char beg)
+    (while (re-search-forward web-mode-whitespaces-regexp end t)
+      (add-text-properties (match-beginning 0) (match-end 0)
+                           '(face web-mode-whitespace-face))
+      ) ;while
+    ))
+
+(defun web-mode-whitespaces-show ()
+  "Toggle whitespaces."
+  (interactive)
+  (if web-mode-enable-whitespace-fontification
+      (web-mode-whitespaces-off)
+    (web-mode-whitespaces-on)))
+
+(defun web-mode-whitespaces-on ()
+  "Show whitespaces."
+  (interactive)
+  (when web-mode-display-table
+    (setq buffer-display-table web-mode-display-table))
+  (setq web-mode-enable-whitespace-fontification t))
+
+(defun web-mode-whitespaces-off ()
+  (setq buffer-display-table nil)
+  (setq web-mode-enable-whitespace-fontification nil))
+
+(defun web-mode-use-tabs ()
+  "Tweaks vars to be compatible with TAB indentation."
+  (let (offset)
+    (setq web-mode-block-padding 0)
+    (setq web-mode-script-padding 0)
+    (setq web-mode-style-padding 0)
+    (setq offset
+          (cond
+           ((and (boundp 'tab-width) tab-width) tab-width)
+           ((and (boundp 'standard-indent) standard-indent) standard-indent)
+           (t 4)))
+    ;;    (message "offset(%S)" offset)
+    (setq web-mode-attr-indent-offset offset)
+    (setq web-mode-code-indent-offset offset)
+    (setq web-mode-css-indent-offset offset)
+    (setq web-mode-markup-indent-offset offset)
+    (setq web-mode-sql-indent-offset offset)
+    (add-to-list 'web-mode-indentation-params '("lineup-args" . nil))
+    (add-to-list 'web-mode-indentation-params '("lineup-calls" . nil))
+    (add-to-list 'web-mode-indentation-params '("lineup-concats" . nil))
+    (add-to-list 'web-mode-indentation-params '("lineup-ternary" . nil))
+    ))
+
+(defun web-mode-buffer-indent ()
+  "Indent all buffer."
+  (interactive)
+  (indent-region (point-min) (point-max))
+  (delete-trailing-whitespace))
+
+(defun web-mode-buffer-change-tag-case (&optional type)
+  "Change html tag case."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (let ((continue t) f)
+      (setq f (if (member type '("upper" "uppercase" "upper-case")) 'uppercase 'downcase))
+      (when (and (not (get-text-property (point) 'tag-beg))
+                 (not (web-mode-tag-next)))
+        (setq continue nil))
+      (while continue
+        (skip-chars-forward "<!/")
+        (if (looking-at "\\([[:alnum:]:-]+\\)")
+            (replace-match (funcall f (match-string 0)) t))
+;;        (message "tag: %S (%S)"
+;;                 (get-text-property (point) 'tag-name)
+;;                 (point))
+        (unless (web-mode-tag-next)
+          (setq continue nil))
+        ) ;while
+      )))
+
+(defun web-mode-buffer-change-attr-case (&optional type)
+  "Change case of html attribute names."
+  (interactive)
+  (unless type (setq type "downcase"))
+  (save-excursion
+    (goto-char (point-min))
+    (let ((continue t)
+          (fun (if (eq (aref (downcase type) 0) ?u) 'uppercase 'downcase)))
+      (while continue
+        (cond
+         ((not (web-mode-attribute-next))
+          (setq continue nil))
+         ((looking-at "\\([[:alnum:]-]+\\)")
+          (replace-match (funcall fun (match-string 0)) t)
+          )
+         ) ;cond
+        ) ;while
+      )))
+
+;; todo : passer de règle en règle et mettre un \n à la fin
+(defun web-mode-css-indent ()
+  (save-excursion
+    (goto-char (point-min))
+    (let ((continue t) rule part-end)
+      (while continue
+        (cond
+         ((not (web-mode-part-next))
+          (setq continue nil))
+         ((eq (get-text-property (point) 'part-side) 'css)
+          (setq part-end (web-mode-part-end-position))
+          (while (setq rule (web-mode-css-rule-next part-end))
+            (when (not (looking-at-p "[[:space:]]*\\($\\|<\\)"))
+              (newline)
+              (indent-according-to-mode)
+              (setq part-end (web-mode-part-end-position)))
+            )
+          )
+         ) ;cond
+        )
+      )))
+
+;; tag-case=lower|upper-case , attr-case=lower|upper-case
+;; special-chars=unicode|html-entities
+;; smart-apostrophes=bool , smart-quotes=bool , indentation=bool
+(defun web-mode-dom-normalize ()
+  "Normalize buffer"
+  (interactive)
+  (save-excursion
+    (let ((rules web-mode-normalization-rules) elt)
+      (when (setq elt (cdr (assoc "tag-case" rules)))
+        (web-mode-buffer-change-tag-case elt))
+      (when (setq elt (cdr (assoc "attr-case" rules)))
+        (web-mode-buffer-change-attr-case elt))
+      (when (setq elt (cdr (assoc "css-indentation" rules)))
+        (web-mode-css-indent))
+      (when (setq elt (cdr (assoc "smart-apostrophes" rules)))
+        (web-mode-dom-apostrophes-replace))
+      (when (setq elt (cdr (assoc "smart-quotes" rules)))
+        (web-mode-dom-quotes-replace))
+      (when (setq elt (cdr (assoc "special-chars" rules)))
+        (if (string= elt "entities")
+            (web-mode-dom-entities-encode)
+          (web-mode-dom-entities-replace)))
+      (when (setq elt (cdr (assoc "whitespaces" rules)))
+        (goto-char (point-min))
+        (while (not (eobp))
+          (forward-line)
+          (delete-blank-lines))
+        (delete-trailing-whitespace)
+        (untabify (point-min) (point-max)))
+      (when (setq elt (cdr (assoc "indentation" rules)))
+        (web-mode-buffer-indent))
+      )))
+
+;;---- INDENTATION -------------------------------------------------------------
+
+(defun web-mode-point-context (pos)
+  "POS should be at the beginning of the indentation."
+  (save-excursion
+    (let (curr-char curr-indentation curr-line
+          language
+          options
+          reg-beg reg-col
+          prev-char prev-indentation prev-line
+          token
+          part-language
+          depth)
+
+      (setq reg-beg (point-min)
+            reg-col 0
+            token "live"
+            options ""
+            language ""
+            prev-line ""
+            prev-char 0)
+
+      (when (get-text-property pos 'part-side)
+        (setq part-language (symbol-name (get-text-property pos 'part-side))))
+
+      (cond
+
+       ((and (bobp) (member web-mode-content-type '("html" "xml")))
+        (setq language web-mode-content-type)
+        )
+
+       ((string= web-mode-content-type "css")
+        (setq language "css"
+              curr-indentation web-mode-css-indent-offset))
+
+       ((member web-mode-content-type '("javascript" "json"))
+        (setq language "javascript"
+              curr-indentation web-mode-code-indent-offset))
+
+       ((or (string= web-mode-content-type "jsx")
+            (and part-language (string= part-language "jsx")))
+        (setq language "jsx"
+              curr-indentation web-mode-code-indent-offset)
+        (cond
+         ((web-mode-jsx-is-html pos)
+          (setq curr-indentation web-mode-markup-indent-offset
+                options "is-html"))
+         ((and (setq depth (get-text-property pos 'jsx-depth)) (> depth 1))
+          (when (get-text-property pos 'jsx-beg)
+            (setq depth (1- depth)))
+          (setq reg-beg (web-mode-jsx-depth-beginning-position pos depth))
+          (setq reg-beg (1+ reg-beg))
+          (save-excursion
+            (goto-char reg-beg)
+            (cond
+             ((and (not (looking-at-p "[ ]*$"))
+                   (looking-back "^[[:space:]]*{"))
+              (setq reg-col (+ (current-indentation) 1
+                               (cond
+                                ((looking-at "[ ]+") (length (match-string-no-properties 0)))
+                                (t 0))
+                               ))
+              )
+             ((looking-at-p "[ ]*\\[[ ]*$") ;; #0659
+              (setq reg-col (current-indentation))
+             )
+             (t
+              ;;(message "%S %S : %S %S" (point) (current-indentation) web-mode-code-indent-offset)
+              ;;(setq reg-col (+ (current-indentation) web-mode-code-indent-offset web-mode-jsx-expression-padding)))
+              (setq reg-col (+ (current-indentation) web-mode-code-indent-offset)))
+             )
+
+            ;;(message "%S %S %S" (point) (current-indentation) reg-col)
+            ) ;save-excursion
+          )
+         ((string= web-mode-content-type "jsx")
+          (setq reg-beg (point-min)))
+         (t
+          (setq reg-beg (or (web-mode-part-beginning-position pos) (point-min)))
+          (save-excursion
+            (goto-char reg-beg)
+            (search-backward "<" nil t)
+            (setq reg-col (current-column))
+            ) ;save-excursion
+          )
+         ) ;cond
+        ;;(message "jsx reg-beg=%S" reg-beg)
+        ) ;jsx
+
+       ((string= web-mode-content-type "php")
+        (setq language "php"
+              curr-indentation web-mode-code-indent-offset))
+
+       ((or (string= web-mode-content-type "xml"))
+        (setq language "xml"
+              curr-indentation web-mode-markup-indent-offset))
+
+       ;; TODO: est ce util ?
+       ((and (get-text-property pos 'tag-beg)
+             (get-text-property pos 'tag-name)
+             ;;(not (get-text-property pos 'part-side))
+             )
+        (setq language "html"
+              curr-indentation web-mode-markup-indent-offset))
+
+       ((and (get-text-property pos 'block-side)
+             (not (get-text-property pos 'block-beg)))
+
+        (setq reg-beg (or (web-mode-block-beginning-position pos) (point-min)))
+        (goto-char reg-beg)
+        (setq reg-col (current-column))
+        (setq language web-mode-engine)
+        (setq curr-indentation web-mode-code-indent-offset)
+
+        (cond
+         ((string= web-mode-engine "blade")
+          (save-excursion
+            (when (web-mode-rsf "{[{!]+[ ]*")
+              (setq reg-col (current-column))))
+          (setq reg-beg (+ reg-beg 2))
+          )
+         ((string= web-mode-engine "razor")
+          (setq reg-beg (+ reg-beg 2))
+          )
+         ;; tests/demo.chtml
+         ((string= web-mode-engine "ctemplate")
+          (save-excursion
+            (when (web-mode-rsf "{{#?")
+              (setq reg-col (current-column))))
+          )
+         ((string= web-mode-engine "dust")
+          (save-excursion
+            (when (web-mode-rsf "{@")
+              (setq reg-col (current-column))))
+          )
+         ((string= web-mode-engine "template-toolkit")
+          (setq reg-beg (+ reg-beg 3)
+                reg-col (+ reg-col 3))
+          )
+         ((and (string= web-mode-engine "jsp")
+               (web-mode-looking-at "<%@\\|<[[:alpha:]]" reg-beg))
+          (save-excursion
+            (goto-char reg-beg)
+            (looking-at "<%@[ ]*[[:alpha:]]+[ ]+\\|</?[[:alpha:]]+[:.][[:alpha:]]+[ ]+")
+            (goto-char (match-end 0))
+            (setq reg-col (current-column))
+            )
+          )
+         ((and (string= web-mode-engine "freemarker")
+               (web-mode-looking-at "<@\\|<%@\\|<[[:alpha:]]" reg-beg))
+          (save-excursion
+            (goto-char reg-beg)
+            (looking-at "<@[[:alpha:].]+[ ]+\\|<%@[ ]*[[:alpha:]]+[ ]+\\|<[[:alpha:]]+:[[:alpha:]]+[ ]+")
+            (goto-char (match-end 0))
+            (setq reg-col (current-column))
+            )
+          )
+         ) ;cond
+        ) ;block-side
+
+       ((and part-language (member part-language '("css" "javascript")))
+        (setq reg-beg (or (web-mode-part-beginning-position pos) (point-min)))
+        (goto-char reg-beg)
+        (search-backward "<" nil t)
+        (setq reg-col (current-column))
+        (setq language part-language)
+        (cond
+         ((string= language "css")
+          (setq curr-indentation web-mode-css-indent-offset))
+         (t
+          (setq language "javascript"
+                curr-indentation web-mode-code-indent-offset))
+         )
+        ) ;part-side
+
+       (t
+        (setq language "html"
+              curr-indentation web-mode-markup-indent-offset)
+        )
+
+       ) ;cond
+
+      (cond
+       ((or (and (> pos (point-min))
+                 (eq (get-text-property pos 'part-token) 'comment)
+                 (eq (get-text-property (1- pos) 'part-token) 'comment)
+                 (progn
+                   (setq reg-beg (previous-single-property-change pos 'part-token))
+                   t))
+            (and (> pos (point-min))
+                 (eq (get-text-property pos 'block-token) 'comment)
+                 (eq (get-text-property (1- pos) 'block-token) 'comment)
+                 (progn
+                   (setq reg-beg (previous-single-property-change pos 'block-token))
+                   t))
+            (and (> pos (point-min))
+                 (eq (get-text-property pos 'tag-type) 'comment)
+                 (not (get-text-property pos 'tag-beg))
+                 (progn
+                   (setq reg-beg (web-mode-tag-beginning-position pos))
+                   t))
+            )
+        (setq token "comment"))
+       ((or (and (> pos (point-min))
+                 (member (get-text-property pos 'part-token)
+                         '(string context key))
+                 (member (get-text-property (1- pos) 'part-token)
+                         '(string context key)))
+            (and (eq (get-text-property pos 'block-token) 'string)
+                 (eq (get-text-property (1- pos) 'block-token) 'string)))
+        (setq token "string"))
+       )
+
+      (goto-char pos)
+      (setq curr-line (web-mode-trim
+                       (buffer-substring-no-properties
+                        (line-beginning-position)
+                        (line-end-position))))
+      (setq curr-char (if (string= curr-line "") 0 (aref curr-line 0)))
+
+      (when (or (member language '("php" "blade" "javascript" "jsx" "razor"))
+                (and (member language '("html" "xml"))
+                     (not (eq ?\< curr-char))))
+        (let (prev)
+          (cond
+           ((member language '("html" "xml" "javascript" "jsx"))
+            (when (setq prev (web-mode-part-previous-live-line reg-beg))
+              (setq prev-line (car prev)
+                    prev-indentation (cdr prev))
+              (setq prev-line (web-mode-clean-part-line prev-line)))
+            )
+           ((setq prev (web-mode-block-previous-live-line))
+            (setq prev-line (car prev)
+                  prev-indentation (cdr prev))
+            (setq prev-line (web-mode-clean-block-line prev-line)))
+           ) ;cond
+          ) ;let
+        (when (>= (length prev-line) 1)
+          (setq prev-char (aref prev-line (1- (length prev-line))))
+          (setq prev-line (substring-no-properties prev-line))
+          )
+        )
+
+      (cond
+       ((not (member web-mode-content-type '("html" "xml")))
+        )
+       ((member language '("javascript" "jsx"))
+        (setq reg-col (+ reg-col web-mode-script-padding)))
+       ((member language '("css"))
+        (setq reg-col (+ reg-col web-mode-style-padding)))
+       ((not (member language '("html" "xml" "razor")))
+        (setq reg-col (+ reg-col web-mode-block-padding)))
+       )
+
+      (list :curr-char curr-char
+            :curr-indentation curr-indentation
+            :curr-line curr-line
+            :language language
+            :options options
+            :prev-char prev-char
+            :prev-indentation prev-indentation
+            :prev-line prev-line
+            :reg-beg reg-beg
+            :reg-col reg-col
+            :token token)
+      )))
+
+(defun web-mode-indent-line ()
+
+  (web-mode-propertize)
+
+  (let ((offset nil)
+        (char nil)
+        (inhibit-modification-hooks t)
+        (adjust t))
+
+    (save-excursion
+      (back-to-indentation)
+      (setq char (char-after))
+      (let* ((pos (point))
+             (ctx (web-mode-point-context pos))
+             (curr-char (plist-get ctx :curr-char))
+             (curr-indentation (plist-get ctx :curr-indentation))
+             (curr-line (plist-get ctx :curr-line))
+             (language (plist-get ctx :language))
+             (prev-char (plist-get ctx :prev-char))
+             (prev-indentation (plist-get ctx :prev-indentation))
+             (prev-line (plist-get ctx :prev-line))
+             (reg-beg (plist-get ctx :reg-beg))
+             (reg-col (plist-get ctx :reg-col))
+             (token (plist-get ctx :token))
+             (options (plist-get ctx :options))
+             (chars (list curr-char prev-char)))
+
+        ;;(message "curr-char=[%c] prev-char=[%c]\n%S" curr-char prev-char ctx)
+
+        (cond
+
+         ((or (bobp) (= (line-number-at-pos pos) 1))
+          (setq offset 0))
+
+         ((string= token "string")
+          (cond
+           ((and web-mode-enable-sql-detection
+                 (web-mode-block-token-starts-with (concat "[ \n]*" web-mode-sql-queries)))
+            (save-excursion
+              (let (col)
+                (web-mode-block-string-beginning)
+                (skip-chars-forward "[ \"'\n]")
+                (setq col (current-column))
+                (goto-char pos)
+                (if (looking-at-p "\\(SELECT\\|INSERT\\|DELETE\\|UPDATE\\|FROM\\|LEFT\\|JOIN\\|WHERE\\|GROUP BY\\|LIMIT\\|HAVING\\|\)\\)")
+                    (setq offset col)
+                  (setq offset (+ col web-mode-sql-indent-offset)))
+                )
+              ) ;save-excursion
+            )
+           (t
+            (setq offset nil))
+           ) ;cond
+          ) ;case string
+
+         ((string= token "comment")
+          (if (eq (get-text-property pos 'tag-type) 'comment)
+              (web-mode-tag-beginning)
+            (goto-char (car
+                        (web-mode-property-boundaries
+                         (if (eq (get-text-property pos 'part-token) 'comment)
+                             'part-token
+                           'block-token)
+                         pos))))
+          (setq offset (current-column))
+          ;;(message "%S %S" (point) offset)
+          (cond
+           ((member (buffer-substring-no-properties (point) (+ (point) 2)) '("/*" "{*" "@*"))
+            (cond
+             ((eq ?\* curr-char)
+              (setq offset (+ offset 1)))
+             (t
+              (setq offset (+ offset 3)))
+             ) ;cond
+            )
+           ((string= (buffer-substring-no-properties (point) (+ (point) 4)) "<!--")
+            (cond
+             ((string-match-p "^<!\\[endif" curr-line)
+              )
+             ((looking-at-p "<!--\\[if")
+              (setq offset (+ offset web-mode-markup-indent-offset)))
+             ((eq ?\- curr-char)
+              (setq offset (+ offset 3)))
+             (t
+              (setq offset (+ offset 5)))
+             ) ;cond
+            )
+           ((and (string= web-mode-engine "django") (looking-back "{% comment %}"))
+            (setq offset (- offset 12)))
+           ((and (string= web-mode-engine "mako") (looking-back "<%doc%>"))
+            (setq offset (- offset 6)))
+           ((and (string= web-mode-engine "mason") (looking-back "<%doc%>"))
+            (setq offset (- offset 6)))
+           ) ;cond
+          ) ;case comment
+
+         ((and (string= web-mode-engine "mason")
+               (string-match-p "^%" curr-line))
+          (setq offset 0))
+
+         ((and (get-text-property pos 'block-beg)
+               (or (web-mode-block-is-close pos)
+                   (web-mode-block-is-inside pos)))
+          (when (web-mode-block-match)
+            (setq offset (current-indentation))))
+
+         ((eq (get-text-property pos 'block-token) 'delimiter-end)
+          (when (web-mode-block-beginning)
+            (setq reg-col (current-indentation))
+            (setq offset (current-column))))
+
+         ((and (get-text-property pos 'tag-beg)
+               (eq (get-text-property pos 'tag-type) 'end))
+          (when (web-mode-tag-match)
+            (setq offset (current-indentation))))
+
+         ((and (member language '("jsx"))
+               (eq curr-char ?\})
+               (get-text-property pos 'jsx-end))
+          (web-mode-go (1- reg-beg))
+          (setq reg-col nil)
+          (setq offset (current-column)))
+
+         ((and (member language '("html" "xml" "javascript" "jsx"))
+               (get-text-property pos 'tag-type)
+               (not (get-text-property pos 'tag-beg))
+               (or (not (string= language "jsx"))
+                   (string= options "is-html")))
+          ;;(message "html-attr")
+          (cond
+           ((and (get-text-property pos 'tag-attr)
+                 (get-text-property (1- pos) 'tag-attr)
+                 (web-mode-attribute-beginning)
+                 (web-mode-dom-rsf "=[ ]*[\"']?" pos))
+            (setq offset (current-column))
+            )
+           ((not (web-mode-tag-beginning))
+            )
+           ((string-match-p "^/?>" curr-line)
+            (setq offset (current-column)))
+           (web-mode-attr-indent-offset
+            (setq offset (+ (current-column) web-mode-attr-indent-offset)))
+           ((looking-at-p (concat web-mode-start-tag-regexp "[ ]*\n"))
+            (setq offset (+ (current-column) (or web-mode-attr-indent-offset 4))))
+           ((web-mode-attribute-next)
+            (setq offset (current-column)))
+           ) ;cond
+          )
+
+         ((or (member language '("html" "xml"))
+              (and (member language '("jsx"))
+                   (string= options "is-html")))
+          ;;(message "html")
+          (cond
+           ((get-text-property pos 'tag-beg)
+            (setq offset (web-mode-markup-indentation pos))
+            )
+           ((and web-mode-pre-elements
+                 (not (string= language "jsx"))
+                 (null (get-text-property pos 'block-side))
+                 (null (get-text-property pos 'part-side))
+                 (and (null (get-text-property pos 'tag-beg))
+                      (save-excursion
+                        (and (web-mode-element-parent)
+                             (member (get-text-property (point) 'tag-name) web-mode-pre-elements))))
+                 )
+            (setq offset nil))
+           ((or (eq (length curr-line) 0)
+                (= web-mode-indent-style 2)
+                (get-text-property pos 'tag-beg)
+                (get-text-property pos 'reg-beg))
+            (setq offset (web-mode-markup-indentation pos))
+            )
+           )
+          )
+
+         ((string= language "ctemplate")
+          (setq offset reg-col))
+
+         ((member language '("mako" "web2py"))
+          (setq offset (web-mode-python-indentation pos
+                                                    curr-line
+                                                    reg-col
+                                                    curr-indentation
+                                                    reg-beg)))
+
+         ((string= language "asp")
+          (setq offset (web-mode-asp-indentation pos
+                                                 curr-line
+                                                 reg-col
+                                                 curr-indentation
+                                                 reg-beg)))
+
+         ((member language '("lsp" "cl-emb"))
+          (setq offset (web-mode-lisp-indentation pos ctx)))
+
+         ((member curr-char '(?\} ?\) ?]))
+          (let (ori)
+            (if (get-text-property pos 'block-side)
+                (setq ori (web-mode-block-opening-paren-position pos reg-beg))
+              (setq ori (web-mode-part-opening-paren-position pos reg-beg)))
+            (cond
+             ((null ori)
+              (setq offset reg-col))
+             ((and (goto-char ori)
+                   (looking-back ")[ ]*") ;; peut-on se passer du looking-back ?
+                   (re-search-backward ")[ ]*" nil t)
+                   (web-mode-block-opening-paren reg-beg))
+              (back-to-indentation)
+              (setq offset (current-indentation))
+              )
+             (t
+              (goto-char ori)
+              (back-to-indentation)
+              (setq offset (current-indentation))
+              (when (get-text-property pos 'jsx-end)
+                (setq adjust nil))
+              ) ;t
+             ) ;cond
+            ) ;let
+          )
+
+         ((string= language "erb")
+          (setq offset (web-mode-ruby-indentation pos
+                                                  curr-line
+                                                  reg-col
+                                                  curr-indentation
+                                                  reg-beg)))
+
+         ((string= language "css")
+          (setq offset (car (web-mode-css-indentation pos
+                                                      reg-col
+                                                      curr-indentation
+                                                      language
+                                                      reg-beg))))
+
+         ((and (string= language "razor")
+               (string-match-p "^\\." curr-line)
+               (string-match-p "^\\." prev-line))
+          (setq offset prev-indentation))
+
+         ((and (string= language "razor")
+               (string-match-p "^case " curr-line)
+               (string-match-p "^case " prev-line))
+          (search-backward "case ")
+          (setq offset (current-column)))
+
+         ((and (member language '("javascript" "jsx" "ejs" "php"))
+               (or (eq prev-char ?\))
+                   (string-match-p "^else$" prev-line))
+               (not (string-match-p "^\\([{.]\\|->\\)" curr-line)))
+          ;;(message "ici")
+          (cond
+           ((member language '("javascript" "jsx" "ejs"))
+            (setq offset
+                  (+ (car (web-mode-javascript-indentation pos
+                                                           reg-col
+                                                           curr-indentation
+                                                           language
+                                                           reg-beg))
+                     web-mode-code-indent-offset))
+            )
+           (t
+            (setq offset (+ prev-indentation web-mode-code-indent-offset))
+            )
+           )
+          )
+
+         ((and (member language '("javascript" "jsx" "ejs"))
+               (member ?\. chars)
+               (not (string-match-p "^\\.\\.\\." curr-line))
+               )
+          (when (web-mode-javascript-calls-beginning pos reg-beg)
+            (cond
+             ((cdr (assoc "lineup-calls" web-mode-indentation-params))
+              (search-forward ".")
+              (setq offset (current-column))
+              (when (eq curr-char ?\.)
+                (goto-char pos)
+                (looking-at "\\.[ \t\n]*")
+                (setq offset (- offset (length (match-string-no-properties 0)))))
+              )
+             (t
+              (setq offset (+ (current-indentation) web-mode-code-indent-offset))
+              ) ;t
+             ) ;cond
+            ) ;when
+          )
+
+         ((and (member language '("javascript" "jsx" "ejs")) (member ?\+ chars))
+          ;;(message "js-concat")
+          (cond
+           ((not (web-mode-javascript-string-beginning pos reg-beg))
+            )
+           ((null (cdr (assoc "lineup-concats" web-mode-indentation-params)))
+            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
+           ((not (eq curr-char ?\+))
+            (setq offset (current-column)))
+           (t
+            (setq offset (current-column))
+            (goto-char pos)
+            (looking-at "\\+[ \t\n]*")
+            (setq offset (- offset (length (match-string-no-properties 0))))
+            )
+           )
+          )
+
+         ;; #579
+         ((and (member language '("javascript" "jsx" "ejs" "php"))
+               (string-match-p "=>$" prev-line))
+          (setq offset (+ prev-indentation web-mode-code-indent-offset))
+          ;;(message "ici%S" offset)
+          )
+
+         ;; #446, #638
+         ((and (member language '("javascript" "jsx" "ejs" "php"))
+               (or (string-match-p "[&|?:+-]$" prev-line)
+                   (string-match-p "^[&|?:+-]" curr-line))
+               (not (and (string= language "php")
+                         (string-match-p "^->" curr-line)))
+               (not (and (eq prev-char ?\:)
+                         (string-match-p "^\\(case\\|default\\)" prev-line))))
+          (cond
+           ((not (funcall (if (member language '("javascript" "jsx" "ejs"))
+                              'web-mode-javascript-statement-beginning
+                            'web-mode-block-statement-beginning)
+                          pos reg-beg))
+            )
+           ((null (cdr (assoc "lineup-ternary" web-mode-indentation-params)))
+            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
+           (t
+            (setq offset (current-column))
+            (when (member curr-char '(?\+ ?\- ?\& ?\| ?\? ?\:))
+              (goto-char pos)
+              (looking-at "\\(||\\|&&\\|[&|?:+-]\\)[ \t\n]*")
+              (setq offset (- offset (length (match-string-no-properties 0)))))
+            )
+           ) ;cond
+          )
+
+         ((and (member language '("javascript" "jsx" "ejs"))
+               (or (member ?\, chars)
+                   (member prev-char '(?\( ?\[))))
+          (cond
+           ((not (web-mode-javascript-args-beginning pos reg-beg))
+            (message "no js args beg")
+            )
+           ((or (not (cdr (assoc "lineup-args" web-mode-indentation-params)))
+                (looking-at-p "\n"))
+            (if (and reg-col (> reg-col (current-indentation)))
+                (setq offset (+ reg-col web-mode-code-indent-offset))
+              (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
+            )
+           ((not (eq curr-char ?\,))
+            (setq offset (current-column)))
+           (t
+            (setq offset (current-column))
+            (goto-char pos)
+            (looking-at ",[ \t\n]*")
+            (setq offset (- offset (length (match-string-no-properties 0)))))
+           ))
+
+         ((and (member language '("php" "blade")) (string-match-p "^->" curr-line))
+          (cond
+           ((not (web-mode-block-calls-beginning pos reg-beg))
+            )
+           ((cdr (assoc "lineup-calls" web-mode-indentation-params))
+            ;;(message "point=%S" (point))
+            (if (looking-back "::[ ]*")
+                (progn
+                  (re-search-backward "::[ ]*")
+                  (setq offset (current-column))
+                  ;;(message "ici%S offset=%S" (point) offset)
+                  )
+              (search-forward "->")
+              (setq offset (- (current-column) 2)))
+            )
+           (t
+            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
+           ))
+
+         ((member ?\, chars)
+          (cond
+           ((not (web-mode-block-args-beginning pos reg-beg))
+            )
+           ((cdr (assoc "lineup-args" web-mode-indentation-params))
+            (setq offset (current-column))
+            (when (eq curr-char ?\,)
+              (goto-char pos)
+              (looking-at ",[ \t\n]*")
+              (setq offset (- offset (length (match-string-no-properties 0)))))
+            )
+           (t
+            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
+           ))
+
+         ((and (string= language "php") (member ?\. chars))
+          (cond
+           ((not (web-mode-block-string-beginning pos reg-beg))
+            )
+           ((null (cdr (assoc "lineup-concats" web-mode-indentation-params)))
+            (setq offset (+ (current-indentation) web-mode-code-indent-offset)))
+           ((not (eq curr-char ?\.))
+            ;;(message "%S" (point))
+            (setq offset (current-column)))
+           (t
+            (setq offset (current-column))
+            (goto-char pos)
+            (when (cdr (assoc "lineup-quotes" web-mode-indentation-params))
+              (looking-at "\\.[ \t\n]*")
+              (setq offset (- offset (length (match-string-no-properties 0)))))
+            )))
+
+         ((member language '("javascript" "jsx" "ejs" "underscore"))
+          ;;(message "js-indent")
+          (setq offset (car (web-mode-javascript-indentation pos
+                                                             reg-col
+                                                             curr-indentation
+                                                             language
+                                                             reg-beg))))
+
+         (t
+          (setq offset (car (web-mode-bracket-indentation pos
+                                                          reg-col
+                                                          curr-indentation
+                                                          language
+                                                          reg-beg))))
+
+         ) ;cond
+
+        (when (and offset reg-col adjust (< offset reg-col)) (setq offset reg-col))
+
+        ) ;let
+      ) ;save-excursion
+
+    (when offset
+      (let ((diff (- (current-column) (current-indentation))))
+        (when (not (= offset (current-indentation)))
+          (setq web-mode-change-beg (line-beginning-position)
+                web-mode-change-end (+ web-mode-change-beg offset)))
+        (setq offset (max 0 offset))
+        (indent-line-to offset)
+        (if (> diff 0) (move-to-column (+ (current-column) diff)))
+        (when (and (string= web-mode-engine "mason")
+                   (= offset 0)
+                   (eq char ?\%))
+          (save-excursion
+            (font-lock-fontify-region (line-beginning-position) (line-end-position)))
+          ) ;when
+        ) ;let
+      ) ;when
+
+    ))
+
+(defun web-mode-markup-indentation (pos)
+  (let ((offset 0) beg ret)
+    (when (setq beg (web-mode-markup-indentation-origin pos))
+      (when (and (get-text-property pos 'jsx-depth)
+                 (not (get-text-property beg 'jsx-depth)))
+        (setq beg (web-mode-jsx-depth-beginning-position pos)))
+      (cond
+       ((null (setq ret (web-mode-element-is-opened beg pos)))
+        (setq offset (web-mode-indentation-at-pos beg)))
+       ((eq ret t)
+        (setq offset (+ (web-mode-indentation-at-pos beg) web-mode-markup-indent-offset)))
+       (t
+        (setq offset ret))
+       ) ;cond
+      ) ;when beg
+    offset))
+
+(defun web-mode-css-indentation (pos initial-column language-offset language &optional limit)
+  (let ((open-ctx (web-mode-bracket-up pos language limit)) offset)
+    (cond
+     ((or (null open-ctx) (null (plist-get open-ctx :pos)))
+      (setq offset initial-column))
+     (t
+      (setq offset (+ (plist-get open-ctx :indentation) language-offset)))
+     ) ;cond
+    (cons (if (< offset initial-column) initial-column offset) open-ctx)
+    ))
+
+(defun web-mode-javascript-indentation (pos initial-column language-offset language &optional limit)
+  (let ((open-ctx (web-mode-bracket-up pos language limit)) indentation offset sub)
+    ;;(message "pos(%S) initial-column(%S) language-offset(%S) language(%S) limit(%S)" pos initial-column language-offset language limit)
+    ;;(message "javascript-indentation: %S\nchar=%c" open-ctx (plist-get open-ctx :char))
+    (setq indentation (plist-get open-ctx :indentation))
+    (when (and initial-column (> initial-column indentation))
+      (setq indentation initial-column)
+      )
+    (cond
+     ((or (null open-ctx) (null (plist-get open-ctx :pos)))
+      (setq offset initial-column))
+     ((and (member language '("javascript" "jsx" "ejs"))
+           (eq (plist-get open-ctx :char) ?\{)
+           (web-mode-looking-back "switch[ ]*(.*)[ ]*" (plist-get open-ctx :pos)))
+      (setq sub (if (cdr (assoc "case-extra-offset" web-mode-indentation-params)) 0 1))
+      (cond
+       ((looking-at-p "case\\|default")
+        (setq offset (+ indentation (* language-offset (- 1 sub)))))
+       (t
+        (setq offset (+ indentation (* language-offset (- 2 sub)))))
+       ) ;cond switch
+      )
+     (t
+      (setq offset (+ indentation language-offset)))
+     ) ;cond
+    (cons (if (< offset initial-column) initial-column offset) open-ctx)
+    ))
+
+(defun web-mode-bracket-indentation (pos initial-column language-offset language &optional limit)
+  (save-excursion
+    (let* ((ctx (web-mode-bracket-up pos language limit))
+           (char (plist-get ctx :char))
+           (pos (plist-get ctx :pos))
+           (indentation (plist-get ctx :indentation)))
+      ;;(message "pos(%S) initial-column(%S) language-offset(%S) language(%S) limit(%S)" pos initial-column language-offset language limit)
+      ;;(message "bracket-up: %S, %c" ctx char)
+      (cond
+       ((null pos)
+        (setq indentation initial-column))
+       ((and (member language '("php"))
+             (eq char ?\{)
+             (web-mode-looking-back "switch[ ]*(.*)[ ]*" pos)
+             (not (looking-at-p "case\\|default")))
+        (setq indentation (+ indentation (* language-offset 2)))
+        )
+       ((and (member language '("php"))
+             (eq char ?\{)
+             (goto-char pos)
+             (web-mode-looking-back "[)][ ]*" pos)
+             (search-backward ")")
+             (web-mode-block-opening-paren limit))
+        (setq indentation (+ (current-indentation) language-offset))
+        )
+       (t
+        (setq indentation (+ indentation language-offset))
+        )
+       )
+      (cons (if (< indentation initial-column) initial-column indentation) ctx)
+      )))
+
+(defun web-mode-ruby-indentation (pos line initial-column language-offset limit)
+  (unless limit (setq limit nil))
+  (let (h offset prev-line prev-indentation open-ctx)
+    (setq open-ctx (web-mode-bracket-up pos "ruby" limit))
+    ;;(message "%S" open-ctx)
+    (if (plist-get open-ctx :pos)
+
+        (cond
+         ((web-mode-looking-at-p ".[ \t\n]+" (plist-get open-ctx :pos))
+          ;;(message "ici %S" (plist-get open-ctx :pos))
+          (setq offset (+ (plist-get open-ctx :indentation) language-offset)))
+         (t
+          (setq offset (1+ (plist-get open-ctx :column))))
+         )
+
+      (setq h (web-mode-previous-line pos limit))
+      (setq offset initial-column)
+      (when h
+        (setq prev-line (car h))
+        ;;(message "%S" prev-line)
+        (setq prev-indentation (cdr h))
+        (cond
+         ((string-match-p "^\\(end\\|else\\|elsif\\|when\\)" line)
+          (setq offset (- prev-indentation language-offset))
+          )
+         ((string-match-p "\\(when\\|if\\|else\\|elsif\\|unless\\|for\\|while\\|def\\|class\\)" prev-line)
+          (setq offset (+ prev-indentation language-offset))
+          )
+         (t
+          (setq offset prev-indentation)
+          )
+         )
+        ) ;when
+      ) ;if
+    offset))
+
+(defun web-mode-python-indentation (pos line initial-column language-offset limit)
+  (unless limit (setq limit nil))
+  (let (h out prev-line prev-indentation ctx)
+    (setq h (web-mode-previous-line pos limit))
+    (setq out initial-column)
+    (when h
+      (setq prev-line (car h))
+      (setq prev-indentation (cdr h))
+      (cond
+       ((string-match-p "^\\(pass\\|else\\|elif\\|when\\)" line)
+        (setq out (- prev-indentation language-offset))
+        )
+       ((string-match-p "\\(if\\|else\\|elif\\|for\\|while\\)" prev-line)
+        (setq out (+ prev-indentation language-offset))
+        )
+       (t
+        (setq out prev-indentation)
+        )
+       ) ;cond
+      ) ;when
+    ;;out
+    (if (< out initial-column) initial-column out)
+    ))
+
+(defun web-mode-lisp-indentation (pos point-ctx)
+  (let (offset open-ctx)
+    (setq open-ctx (web-mode-bracket-up pos "lsp" (plist-get point-ctx :reg-beg)))
+    ;;(message "point-ctx=%S" point-ctx)
+    ;;(message "open-ctx=%S" open-ctx)
+    (cond
+     ((null (plist-get open-ctx :pos))
+      (setq offset (plist-get point-ctx :reg-col)))
+     ((member (plist-get point-ctx :curr-char) '(?\( ?\)))
+      (if (web-mode-looking-at-p "((" (plist-get open-ctx :pos))
+          (setq offset (+ (plist-get open-ctx :column) 1))
+        (setq offset (+ (plist-get open-ctx :column) web-mode-code-indent-offset)))
+      )
+     (t
+      (goto-char (plist-get open-ctx :pos))
+      (forward-char)
+      (web-mode-rsf "[[:alnum:]-:]+ ")
+      (setq offset (current-column))
+      )
+     ) ;cond
+    offset))
+
+(defun web-mode-asp-indentation (pos line initial-column language-offset limit)
+  (unless limit (setq limit nil))
+  (let (h out prev-line prev-indentation)
+    (setq h (web-mode-previous-line pos limit))
+    (setq out initial-column)
+    (when h
+      (setq prev-line (car h))
+      (setq prev-indentation (cdr h))
+      (cond
+       ;; ----------------------------------------------------------------------
+       ;; unindent
+       ((string-match-p "\\_<\\(\\(end \\(if\\|function\\|class\\|sub\\|with\\)\\)\\|else\\|elseif\\|next\\|loop\\)\\_>" line)
+        (setq out (- prev-indentation language-offset)))
+       ;; ----------------------------------------------------------------------
+       ;; select case statement
+       ((string-match-p "\\_<\\(select case\\)\\_>" line)
+        (setq out (- prev-indentation 0)))
+       ((string-match-p "\\_<\\(end select\\)" line)
+        (setq out (- prev-indentation (* 2 language-offset))))
+       ((and (string-match-p "\\_<\\(case\\)\\_>" line) (not (string-match-p "\\_<\\(select case\\)\\_>" prev-line)))
+        (setq out (- prev-indentation language-offset)))
+       ;; ----------------------------------------------------------------------
+       ;; do nothing
+       ((string-match-p "\\_<\\(\\(end \\(if\\|function\\|class\\|sub\\|select\\|with\\)\\)\\|loop\\( until\\| while\\)?\\)\\_>" prev-line)
+        (setq out (+ prev-indentation 0)))
+       ;; indent
+       ((string-match-p "\\_<\\(\\(select \\)?case\\|else\\|elseif\\|unless\\|for\\|class\\|with\\|do\\( until\\| while\\)?\\|while\\|\\(public \\|private \\)?\\(function\\|sub\\|class\\)\\)\\_>" prev-line)
+        (setq out (+ prev-indentation language-offset)))
+       ;; single line if statement
+       ((string-match-p "\\_<if\\_>.*\\_<then\\_>[ \t]*[[:alpha:]]+" prev-line)
+        (setq out (+ prev-indentation 0)))
+       ;; normal if statement
+       ((string-match-p "\\_<\\if\\_>" prev-line)
+        (setq out (+ prev-indentation language-offset)))
+       (t
+        (setq out prev-indentation))
+       )
+      ) ;when
+    out))
+
+(defun web-mode-block-previous-live-line ()
+  (save-excursion
+    (let ((continue t) (line "") (pos (point)))
+      (beginning-of-line)
+      (while (and continue (not (bobp)) (forward-line -1))
+        (when (not (web-mode-block-is-token-line))
+          (setq line (web-mode-trim (buffer-substring (point) (line-end-position)))))
+        (when (not (string= line ""))
+          (setq continue nil))
+        ) ;while
+      (if (string= line "")
+          (progn (goto-char pos) nil)
+        (cons line (current-indentation)))
+      )))
+
+(defun web-mode-part-previous-live-line (reg-beg)
+  (unless reg-beg (setq reg-beg (point-min)))
+  ;;(message "reg-beg=%S" reg-beg)
+  (save-excursion
+    (let ((continue (> (point) reg-beg))
+          (line "")
+          bol-pos
+          eol-pos)
+      (beginning-of-line)
+      (while (and continue (> (point) reg-beg) (forward-line -1))
+        (setq bol-pos (point)
+              eol-pos (line-end-position))
+        (when (> reg-beg bol-pos)
+          (setq bol-pos reg-beg))
+        (when (not (web-mode-part-is-token-line bol-pos))
+          (setq line (web-mode-trim (buffer-substring bol-pos eol-pos)))
+          (when (not (string= line "")) (setq continue nil))
+          )
+        ) ;while
+      (if (string= line "")
+          nil
+          ;;(progn (goto-char pos) nil)
+        (cons line (current-indentation)))
+      )))
+
+(defun web-mode-in-code-block (open close &optional prop)
+  (save-excursion
+    (let ((pos (point)) pos-open pos-close start end ret)
+      (when prop
+        (setq start pos
+              end pos)
+        (when (eq (get-text-property pos prop) (get-text-property (1- pos) prop))
+          (setq start (or (previous-single-property-change pos prop) (point-min))))
+        (when (eq (get-text-property pos prop) (get-text-property (1+ pos) prop))
+          (setq end (next-single-property-change pos prop)))
+        ;;        (message "start(%S) end(%S)" start end)
+        )
+      (setq ret (and (web-mode-sb open start t)
+                     (setq pos-open (point))
+                     (web-mode-sf close end t)
+                     (setq pos-close (point))
+                     (>= pos-close pos)))
+      (if ret
+          (cons pos-open pos-close)
+        ret)
+      )))
+
+(defun web-mode-clean-part-line (input)
+  (let ((out "")
+        (beg 0)
+        (keep t)
+        (n (length input)))
+    (dotimes (i n)
+      (if (or (get-text-property i 'block-side input)
+              (eq (get-text-property i 'part-token input) 'comment)
+              (eq (get-text-property i 'tag-type input) 'comment))
+          (when keep
+            (setq out (concat out (substring input beg i))
+                  beg 0
+                  keep nil))
+        (when (null keep)
+          (setq beg i
+                keep t))
+        ) ;if
+      ) ;dotimes
+    (if (> beg 0) (setq out (concat out (substring input beg n))))
+    (setq out (if (= (length out) 0) input out))
+    (web-mode-trim out)
+    ))
+
+(defun web-mode-clean-block-line (input)
+  (let ((out "")
+        (beg 0)
+        (keep t)
+        (n (length input)))
+    (dotimes (i n)
+      (if (or (not (get-text-property i 'block-side input))
+              (member (get-text-property i 'block-token input)
+                      '(comment delimiter-beg delimiter-end)))
+          (when keep
+            (setq out (concat out (substring input beg i))
+                  beg 0
+                  keep nil))
+        (when (null keep)
+          (setq beg i
+                keep t))
+        ) ;if
+      ) ;dotimes
+    (if (> beg 0) (setq out (concat out (substring input beg n))))
+    (setq out (if (= (length out) 0) input out))
+    (web-mode-trim out)
+    ;;    (message "%S [%s] > [%s]" beg input out)
+    ))
+
+(defun web-mode-language-at-pos (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((get-text-property pos 'block-side)
+    web-mode-engine)
+   ((get-text-property pos 'part-side)
+    (symbol-name (get-text-property pos 'part-side)))
+   (t
+    web-mode-content-type)
+   ) ;cond
+  )
+
+(defun web-mode-coord-position (line column)
+  (save-excursion
+    (when (stringp line) (setq line (string-to-number line)))
+    (when (stringp column) (setq column (string-to-number column)))
+    (goto-char (point-min))
+    (forward-line (1- line))
+    (move-to-column (1- column))
+    (point)))
+
+(defun web-mode-column-at-pos (&optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (goto-char pos)
+    (current-column)))
+
+(defun web-mode-is-single-line-block (pos)
+  (= (web-mode-line-number (web-mode-block-beginning-position pos))
+     (web-mode-line-number (web-mode-block-end-position pos))))
+
+(defun web-mode-line-number (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (ret)
+    (setq ret (+ (count-lines 1 pos)
+                 (if (= (web-mode-column-at-pos pos) 0) 1 0)))))
+
+(defun web-mode-block-is-control (pos)
+  (save-excursion
+    (let (control state controls pair)
+      (goto-char pos)
+      (setq controls (web-mode-block-controls-get pos))
+      (setq pair (car controls))
+      (cond
+       ((eq (car pair) 'inside)
+        )
+       ((eq (car pair) 'open)
+        (setq state t
+              control (cdr pair)))
+       ((eq (car pair) 'close)
+        (setq state nil
+              control (cdr pair)))
+       ) ;cond
+      ;;      (message "engine=%S control=%S state=%S" web-mode-engine control state)
+      (if control (cons control state) nil)
+      )))
+
+(defun web-mode-block-is-opening-control (pos)
+  (save-excursion
+    (let (controls pair)
+      (goto-char pos)
+      (if (and (setq controls (web-mode-block-controls-get pos))
+               (= (length controls) 1)
+               (setq pair (car controls))
+               (eq (car pair) 'open))
+          (cdr pair)
+        nil)
+      )))
+
+(defun web-mode-markup-indentation-origin (pos)
+  (save-excursion
+    (let* ((continue (not (bobp)))
+           ;;         (pos (point))
+           (part-side (not (null (get-text-property pos 'part-side)))) ;part-side at the origin
+           (types '(start end void)))
+      (while continue
+        (forward-line -1)
+        (if (bobp)
+            (setq pos (point)
+                  continue nil)
+          (back-to-indentation)
+          (setq pos (point))
+          (setq continue (not (or (and (null part-side)
+                                       (null (get-text-property pos 'part-side))
+                                       (get-text-property pos 'tag-beg)
+                                       (member (get-text-property pos 'tag-type) types)
+                                       (null (get-text-property (1- pos) 'invisible)))
+                                  (and part-side
+                                       (get-text-property pos 'part-side)
+                                       (get-text-property pos 'tag-beg)
+                                       (member (get-text-property pos 'tag-type) types)
+                                       (null (get-text-property (1- pos) 'invisible)))
+                                  (and (get-text-property pos 'block-beg)
+                                       (not (get-text-property pos 'tag-type))
+                                       (web-mode-block-is-control pos)
+                                       (not (looking-at-p "{% comment"))))))
+          ) ;if
+        ) ;while
+      ;;(message "indent-origin=%S" pos)
+      pos)))
+
+;;TODO : prendre en compte part-token
+;; state=t <=> start tag
+(defun web-mode-element-is-opened (pos limit)
+  (let (tag
+        last-end-tag
+        tag-pos block-pos
+        state
+        n
+        ret
+        (continue t)
+        controls
+        control
+        (buffer (current-buffer))
+        (h (make-hash-table :test 'equal))
+        (h2 (make-hash-table :test 'equal)))
+
+;;    (message "pos-ori=%S limit=%S" pos limit)
+
+    (while continue
+      (setq control nil
+            controls nil
+            last-end-tag nil
+            tag nil)
+
+      (cond
+       ((get-text-property pos 'tag-beg)
+        (when (member (get-text-property pos 'tag-type) '(start end))
+          (setq tag (get-text-property pos 'tag-name)
+                state (eq (get-text-property pos 'tag-type) 'start))
+          (if (null state) (setq last-end-tag (cons tag pos)))
+          (setq n (gethash tag h 0))
+          (if (null state)
+              (progn
+                (when (> n 0) (puthash tag (1- n) h))
+                (puthash tag (1- n) h2))
+            (puthash tag (1+ n) h)
+            (puthash tag (1+ n) h2))
+          ) ;when
+        (when (setq pos (web-mode-tag-end-position pos))
+          (setq tag-pos nil)
+          (when (and block-pos (> pos block-pos))
+            (setq block-pos nil))
+          ) ;when
+        )
+       ((and web-mode-enable-control-block-indentation
+             (get-text-property pos 'block-beg))
+        (when (setq controls (web-mode-block-controls-get pos))
+          (dolist (control controls)
+            (setq tag (cdr control))
+            (setq n (gethash tag h 0))
+            (cond
+             ((eq (car control) 'inside)
+              )
+             ((eq (car control) 'open)
+              (puthash tag (1+ n) h))
+             ((> n 0)
+              (puthash tag (1- n) h))
+             ) ;cond
+            ) ;dolist
+          )
+        (when (setq pos (web-mode-block-end-position pos))
+          (setq block-pos nil)
+          (when (and tag-pos (> pos tag-pos))
+            (setq tag-pos nil))
+          )
+        )
+       ) ;cond
+
+;;      (message "tag=%S end-pos=%S" tag pos)
+
+      (when (and pos (< pos limit))
+        (when (or (null tag-pos) (>= pos tag-pos))
+          (setq tag-pos (web-mode-tag-next-position pos limit))
+;;          (message "from=%S tag-next-pos=%S" pos tag-pos)
+          )
+        (when (or (null block-pos) (>= pos block-pos))
+          (setq block-pos (web-mode-block-next-position pos limit))
+;;          (message "from=%S block-next-pos=%S" pos block-pos)
+          )
+        )
+
+      (cond
+       ((null pos)
+        )
+       ((and (null tag-pos)
+             (null block-pos))
+        (setq pos nil))
+       ((and tag-pos block-pos)
+        (if (< tag-pos block-pos)
+            (progn
+              (setq pos tag-pos)
+              (setq tag-pos nil))
+          (setq pos block-pos)
+          (setq block-pos nil))
+        )
+       ((null tag-pos)
+        (setq pos block-pos)
+        (setq block-pos nil))
+       (t
+        (setq pos tag-pos)
+        (setq tag-pos nil))
+       )
+
+      (when (or (null pos)
+                (>= pos limit))
+        (setq continue nil))
+      ) ;while
+
+;;    (message "hashtable=%S" h)
+    (maphash (lambda (k v) (if (> v 0) (setq ret t))) h)
+
+    (when (and (null ret)
+               last-end-tag
+               (> (hash-table-count h2) 1)
+               (< (gethash (car last-end-tag) h2) 0))
+;;      (message "last-end-tag=%S" last-end-tag)
+      (save-excursion
+        (goto-char (cdr last-end-tag))
+        (web-mode-tag-match)
+        (when (not (= (point) (cdr last-end-tag)))
+          (setq n (point))
+          (back-to-indentation)
+          (if (= n (point)) (setq ret (current-indentation))))
+        ))
+
+    ret))
+
+(defun web-mode-previous-line (pos limit)
+  (save-excursion
+    (let (beg end line (continue t))
+      (goto-char pos)
+      (while continue
+        (forward-line -1)
+        (setq end (line-end-position))
+        (setq line (buffer-substring-no-properties (point) end))
+        (when (or (not (string-match-p "^[ \t]*$" line))
+                  (bobp)
+                  (<= (point) limit))
+          (setq continue nil))
+        )
+      (if (<= (point) limit)
+          ;;todo : affiner (le + 3 n est pas générique cf. <?php <% <%- etc.)
+          (setq beg (if (< (+ limit 3) end) (+ limit 3) end))
+        (setq beg (line-beginning-position))
+        ) ;if
+      (setq line (buffer-substring-no-properties beg end))
+      (cons line (current-indentation))
+      )))
+
+(defun web-mode-bracket-up (pos language &optional limit)
+  (unless limit (setq limit nil))
+  ;;(message "pos(%S) language(%S) limit(%S)" pos language limit)
+  (save-excursion
+    (goto-char pos)
+    (let ((continue t)
+          (regexp "[\]\[}{)(]")
+          (char nil)
+          (map nil)
+          (key nil)
+          (value 0)
+          (searcher (if (get-text-property pos 'block-side) 'web-mode-block-rsb 'web-mode-part-rsb)))
+      (while (and continue (funcall searcher regexp limit))
+        (setq char (aref (match-string-no-properties 0) 0))
+        (setq key (cond ((eq char ?\)) ?\()
+                        ((eq char ?\}) ?\{)
+                        ((eq char ?\]) ?\[)
+                        (t             char)))
+        (setq value (or (plist-get map key) 0))
+        (setq value (if (member char '(?\( ?\{ ?\[)) (1+ value) (1- value)))
+        (setq map (plist-put map key value))
+        (setq continue (< value 1))
+        ;;(message "pos=%S char=%c key=%c value=%S map=%S" (point) char key value map)
+        ) ;while
+      (list :pos (if (> value 0) (point) nil)
+            :char char
+            :column (current-column)
+            :indentation (current-indentation))
+      ) ;let
+    ))
+
+(defun web-mode-count-char-in-string (char string)
+  (let ((n 0))
+    (dotimes (i (length string))
+      (if (eq (elt string i) char)
+          (setq n (1+ n))))
+    n))
+
+(defun web-mode-mark-and-expand ()
+  "Mark and expand."
+  (interactive)
+  (web-mode-mark (point)))
+
+(defun web-mode-mark (pos)
+  (let ((beg pos) (end pos) prop reg-beg boundaries)
+
+    (if mark-active
+        (setq reg-beg (region-beginning))
+      (setq web-mode-expand-initial-pos (point)
+            web-mode-expand-initial-scroll (window-start))
+      )
+
+    ;; (message "regs=%S %S %S %S" (region-beginning) (region-end) (point-min) (point-max))
+    ;; (message "before=%S" web-mode-expand-previous-state)
+
+    (cond
+
+     ((and mark-active
+           (= (region-beginning) (point-min))
+           (or (= (region-end) (point-max))
+               (= (1+ (region-end)) (point-max))))
+      (deactivate-mark)
+      (goto-char (or web-mode-expand-initial-pos (point-min)))
+      (setq web-mode-expand-previous-state nil)
+      (when web-mode-expand-initial-scroll
+        (set-window-start (selected-window) web-mode-expand-initial-scroll))
+      )
+
+     ((string= web-mode-expand-previous-state "elt-content")
+      (web-mode-element-parent)
+      ;;(message "pos=%S" (point))
+      (web-mode-element-select)
+      (setq web-mode-expand-previous-state "html-parent"))
+
+     ((and (member (get-text-property pos 'block-token) '(comment string))
+           (not (member web-mode-expand-previous-state '("block-token" "block-body" "block-side"))))
+      (when (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token))
+        (setq beg (or (previous-single-property-change pos 'block-token) (point-min))))
+      (when (eq (get-text-property pos 'block-token) (get-text-property (1+ pos) 'block-token))
+        (setq end (next-single-property-change pos 'block-token)))
+      (set-mark beg)
+      (goto-char end)
+      (exchange-point-and-mark)
+      (setq web-mode-expand-previous-state "block-token"))
+
+     ((and (get-text-property pos 'block-side)
+           (not (member web-mode-expand-previous-state '("block-body" "block-side")))
+           (not (member web-mode-engine '(django go)))
+           (setq boundaries (web-mode-in-code-block "{" "}" 'block-side)))
+      (set-mark (car boundaries))
+      (goto-char (cdr boundaries))
+      (exchange-point-and-mark)
+      (setq web-mode-expand-previous-state "block-body"))
+
+     ((and (get-text-property pos 'block-side)
+           (not (member web-mode-expand-previous-state '("block-side"))))
+      (set-mark (web-mode-block-beginning-position pos))
+      (goto-char (1+ (web-mode-block-end-position pos)))
+      (exchange-point-and-mark)
+      (setq web-mode-expand-previous-state "block-side"))
+
+     ((and (get-text-property pos 'part-token)
+           (not (string= web-mode-expand-previous-state "part-token")))
+      (when (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token))
+        (setq beg (previous-single-property-change pos 'part-token)))
+      (when (eq (get-text-property pos 'part-token) (get-text-property (1+ pos) 'part-token))
+        (setq end (next-single-property-change pos 'part-token)))
+      (set-mark beg)
+      (goto-char end)
+      (exchange-point-and-mark)
+      (setq web-mode-expand-previous-state "part-token"))
+
+     ((and (get-text-property pos 'part-side)
+           (not (string= web-mode-expand-previous-state "client-part"))
+           (setq boundaries (web-mode-in-code-block "{" "}" 'part-side)))
+      (set-mark (car boundaries))
+      (goto-char (cdr boundaries))
+      (exchange-point-and-mark)
+      (setq web-mode-expand-previous-state "client-part"))
+
+     ((and (get-text-property pos 'part-side)
+           (not (string= web-mode-expand-previous-state "part-side")))
+      (when (eq (get-text-property pos 'part-side) (get-text-property (1- pos) 'part-side))
+        (setq beg (previous-single-property-change pos 'part-side)))
+      (when (eq (get-text-property pos 'part-side) (get-text-property (1+ pos) 'part-side))
+        (setq end (next-single-property-change pos 'part-side)))
+      (when (eq (char-after beg) ?\n)
+        (setq beg (1+ beg)))
+      (set-mark beg)
+      (goto-char end)
+      (when (looking-back "^[ \t]+")
+        (beginning-of-line))
+      (exchange-point-and-mark)
+      (setq web-mode-expand-previous-state "part-side"))
+
+     ((and (get-text-property pos 'tag-attr)
+           (not (member web-mode-expand-previous-state '("html-attr" "html-tag"))))
+      (web-mode-attribute-select pos)
+      (setq web-mode-expand-previous-state "html-attr"))
+
+     ((and (eq (get-text-property pos 'tag-type) 'comment)
+           (not (member web-mode-expand-previous-state '("html-tag" "html-comment" "html-elt" "html-parent"))))
+      (web-mode-tag-select)
+      (setq web-mode-expand-previous-state "html-comment"))
+
+     ((and (get-text-property pos 'tag-name)
+           (not (member web-mode-expand-previous-state '("html-tag" "html-elt" "html-parent"))))
+      (web-mode-tag-select)
+      (setq web-mode-expand-previous-state "html-tag"))
+
+     ((and (get-text-property pos 'tag-beg)
+           (string= web-mode-expand-previous-state "html-tag"))
+      (web-mode-element-select)
+      (setq web-mode-expand-previous-state "html-elt"))
+
+     (t
+      (cond
+       ((not (web-mode-element-parent))
+        (push-mark (point))
+        (push-mark (point-max) nil t)
+        (goto-char (point-min))
+        (setq web-mode-expand-previous-state "mark-whole"))
+       ((not (= (web-mode-tag-end-position (point)) (1- beg)))
+        (web-mode-element-content-select)
+        (setq web-mode-expand-previous-state "elt-content"))
+       (t
+        (web-mode-element-select)
+        (setq web-mode-expand-previous-state "html-parent"))
+       )
+      ) ;t
+
+     ) ;cond
+
+    ;;(message "w=%S" (window-end))
+    ;;(message "after=%S" web-mode-expand-previous-state)
+
+    ))
+
+(defun web-mode-block-kill ()
+  "Kill the current block."
+  (interactive)
+  (web-mode-block-select)
+  (when mark-active
+    (kill-region (region-beginning) (region-end))))
+
+(defun web-mode-block-select ()
+  "Select the current block."
+  (interactive)
+  (let (beg)
+    (when (setq beg (web-mode-block-beginning-position (point)))
+      (goto-char beg)
+      (set-mark (point))
+      (web-mode-block-end)
+      (exchange-point-and-mark))
+    beg))
+
+(defun web-mode-tag-select ()
+  "Select the current html tag."
+  (interactive)
+  (let (beg)
+    (when (setq beg (web-mode-tag-beginning-position (point)))
+      (goto-char beg)
+      (set-mark (point))
+      (web-mode-tag-end)
+      (exchange-point-and-mark))
+    beg))
+
+(defun web-mode-element-content-select ()
+  "Select the content of a html element."
+  (interactive)
+  (let (pos beg end)
+    (web-mode-element-select)
+    (when mark-active
+      (setq pos (point))
+      (deactivate-mark)
+      (web-mode-tag-match)
+      (setq end (point))
+      (goto-char pos)
+      (web-mode-tag-end)
+      (set-mark (point))
+      (goto-char end)
+      (exchange-point-and-mark)
+      )))
+
+(defun web-mode-element-select ()
+  "Select the current html element (including opening and closing tags)."
+  (interactive)
+  (let* ((pos (point))
+         (type (get-text-property pos 'tag-type)))
+    (if type
+        (cond
+         ((member type '(start void))
+          (web-mode-tag-beginning)
+          (set-mark (point))
+          (web-mode-tag-match)
+          (web-mode-tag-end)
+          (exchange-point-and-mark))
+         (t
+          (web-mode-tag-match)
+          (set-mark (point))
+          (web-mode-tag-match)
+          (web-mode-tag-end)
+          (exchange-point-and-mark))
+         ) ;cond
+      (web-mode-element-parent)
+      (unless (= (point) pos) (web-mode-element-select))
+      ) ;if
+    ))
+
+(defun web-mode-element-is-collapsed (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (boundaries)
+    (and (setq boundaries (web-mode-element-boundaries pos))
+         (or (= (car (car boundaries)) (car (cdr boundaries)))
+             (= (cdr (car boundaries)) (1- (car (cdr boundaries)))))
+         )))
+
+(defun web-mode-element-transpose ()
+  "Transpose two html elements."
+  (interactive)
+  (let (pos start1 end1 start2 end2)
+    (save-excursion
+      (setq pos (point))
+      (cond
+       ((get-text-property pos 'tag-type)
+        (setq start1 (web-mode-element-beginning-position pos)
+              end1 (1+ (web-mode-element-end-position pos)))
+        )
+       ((setq start1 (web-mode-element-parent-position pos))
+        (setq end1 (1+ (web-mode-element-end-position pos)))
+        )
+       ) ;cond
+      (when (and start1 end1 (> end1 0))
+        (goto-char end1)
+        (unless (get-text-property (point) 'tag-beg)
+          (skip-chars-forward "\n\t "))
+        (when (get-text-property (point) 'tag-beg)
+          (setq start2 (web-mode-element-beginning-position (point))
+                end2 (1+ (web-mode-element-end-position (point))))
+          )
+        )
+      (transpose-regions start1 end1 start2 end2)
+      ) ;save-excursion
+    start2))
+
+(defun web-mode-element-children-fold-or-unfold (&optional pos)
+  "Fold/Unfold all the children of the current html element."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (dolist (child (reverse (web-mode-element-children pos)))
+      (goto-char child)
+      (web-mode-fold-or-unfold))
+    ))
+
+(defun web-mode-element-mute-blanks ()
+  "Mute blanks."
+  (interactive)
+  (let (pos parent beg end children elt)
+    (setq pos (point))
+    (save-excursion
+      (when (and (setq parent (web-mode-element-boundaries pos))
+                 (web-mode-element-child-position (point)))
+        (setq children (reverse (web-mode-element-children)))
+        (goto-char (car (cdr parent)))
+        (dolist (child children)
+          (setq elt (web-mode-element-boundaries child))
+          (when (> (point) (1+ (cddr elt)))
+            (when (and (not (eq (get-text-property (point) 'part-token) 'comment))
+                       (not (eq (get-text-property (1+ (cddr elt)) 'part-token) 'comment)))
+              (web-mode-insert-text-at-pos "-->" (point))
+              (web-mode-insert-text-at-pos "<!--" (1+ (cddr elt))))
+            )
+          (goto-char child)
+          )
+        (when (and (> (point) (1+ (cdr (car parent))))
+                   (not (eq (get-text-property (point) 'part-token) 'comment))
+                   (not (eq (get-text-property (1+ (cdr (car parent))) 'part-token) 'comment)))
+          (web-mode-insert-text-at-pos "-->" (point))
+          (web-mode-insert-text-at-pos "<!--" (1+ (cdr (car parent)))))
+        ) ;when
+      )))
+
+(defun web-mode-element-children (&optional pos)
+  (unless pos (setq pos (point)))
+  (let ((continue t) (i 0) child children)
+    (save-excursion
+      (when (and (member (get-text-property pos 'tag-type) '(start end))
+                 (setq child (web-mode-element-child-position pos)))
+        (while continue
+          (cond
+           ((> (setq i (1+ i)) 100)
+            (setq continue nil)
+            (message "element-children ** warning **"))
+           ((= i 1)
+            (goto-char child))
+           ((web-mode-element-sibling-next)
+            )
+           (t
+            (setq continue nil))
+           ) ;cond
+          (when continue
+            (setq children (append children (list (point)))))
+          ) ;while
+        ) ;when
+      ) ;save-excursion
+    children))
+
+(defun web-mode-element-boundaries (&optional pos)
+  "Return ((start-tag-beg . start-tag-end) . (end-tag-beg . end-tag-end))
+First level car and cdr are the same with void elements.
+Pos should be in a tag."
+  (unless pos (setq pos (point)))
+  (let (start-tag-beg start-tag-end end-tag-beg end-tag-end)
+    (cond
+     ((eq (get-text-property pos 'tag-type) 'start)
+      (setq start-tag-beg (web-mode-tag-beginning-position pos)
+            start-tag-end (web-mode-tag-end-position pos))
+      (when (setq pos (web-mode-tag-match-position pos))
+        (setq end-tag-beg pos
+              end-tag-end (web-mode-tag-end-position pos)))
+      )
+     ((eq (get-text-property pos 'tag-type) 'end)
+      (setq end-tag-beg (web-mode-tag-beginning-position pos)
+            end-tag-end (web-mode-tag-end-position pos))
+      (when (setq pos (web-mode-tag-match-position pos))
+        (setq start-tag-beg pos
+              start-tag-end (web-mode-tag-end-position pos)))
+      )
+     ((eq (get-text-property pos 'tag-type) 'void)
+      (setq start-tag-beg (web-mode-tag-beginning-position pos)
+            start-tag-end (web-mode-tag-end-position pos))
+      (setq end-tag-beg start-tag-beg
+            end-tag-end start-tag-end)
+      )
+     ) ;cond
+    (if (and start-tag-beg start-tag-end end-tag-beg end-tag-end)
+        (cons (cons start-tag-beg start-tag-end) (cons end-tag-beg end-tag-end))
+      nil)
+    ))
+
+(defun web-mode-surround ()
+  "Surround each line of the current REGION with a start/end tag."
+  (interactive)
+  (when mark-active
+    (let (beg end line-beg line-end pos tag tag-start tag-end)
+      (save-excursion
+        (setq tag (read-from-minibuffer "Tag name? ")
+              tag-start (concat "<" tag ">")
+              tag-end (concat "</" tag ">")
+              pos (point)
+              beg (region-beginning)
+              end (region-end)
+              line-beg (web-mode-line-number beg)
+              line-end (web-mode-line-number end))
+        (goto-char end)
+        (unless (bolp)
+          (insert tag-end)
+          (back-to-indentation)
+          (when (> beg (point))
+            (goto-char beg))
+          (insert tag-start))
+        (while (> line-end line-beg)
+          (forward-line -1)
+          (setq line-end (1- line-end))
+          (unless (looking-at-p "[[:space:]]*$")
+            (end-of-line)
+            (insert tag-end)
+            (back-to-indentation)
+            (when (> beg (point))
+              (goto-char beg))
+            (insert tag-start))
+          ) ;while
+        (deactivate-mark)
+        ))))
+
+(defun web-mode-element-wrap (&optional tag-name)
+  "Wrap current REGION with start and end tags.
+Prompt user if TAG-NAME isn't provided."
+  (interactive)
+  (let (beg end pos tag sep)
+    (save-excursion
+      (setq tag (or tag-name (read-from-minibuffer "Tag name? ")))
+      (setq pos (point))
+      (cond
+       (mark-active
+        (setq beg (region-beginning)
+              end (region-end)))
+       ((get-text-property pos 'tag-type)
+        (setq beg (web-mode-element-beginning-position pos)
+              end (1+ (web-mode-element-end-position pos))))
+       ((setq beg (web-mode-element-parent-position pos))
+        (setq end (1+ (web-mode-element-end-position pos))))
+       )
+      ;;      (message "beg(%S) end(%S)" beg end)
+      (when (and beg end (> end 0))
+        (setq sep (if (get-text-property beg 'tag-beg) "\n" ""))
+        (web-mode-insert-text-at-pos (concat sep "</" tag ">") end)
+        (web-mode-insert-text-at-pos (concat "<" tag ">" sep) beg)
+        (when (string= sep "\n") (indent-region beg (+ end (* (+ 3 (length tag)) 2))))
+        )
+      ) ;save-excursion
+    (web-mode-go beg)))
+
+(defun web-mode-element-vanish (&optional arg)
+  "Vanish the current html element. The content of the element is kept."
+  (interactive "p")
+  (let (type (pos (point)) start-b start-e end-b end-e)
+    (while (>= arg 1)
+      (setq type (get-text-property pos 'tag-type))
+      (when type
+        (cond
+         ((member type '(void))
+          (web-mode-element-kill)
+          (set-mark (point))
+          (web-mode-tag-match)
+          (web-mode-tag-end)
+          (exchange-point-and-mark))
+         ((member type '(start))
+          (setq start-b (web-mode-tag-beginning-position)
+                start-e (web-mode-tag-end-position))
+          (when (web-mode-tag-match)
+            (setq end-b (web-mode-tag-beginning-position)
+                  end-e (web-mode-tag-end-position)))
+          )
+         (t
+          (setq end-b (web-mode-tag-beginning-position)
+                end-e (web-mode-tag-end-position))
+          (when (web-mode-tag-match)
+            (setq start-b (web-mode-tag-beginning-position)
+                  start-e (web-mode-tag-end-position)))
+          ) ;t
+         ) ;cond
+        (when (and start-b end-b)
+          (goto-char end-b)
+          (delete-region end-b (1+ end-e))
+          (delete-blank-lines)
+          (goto-char start-b)
+          (delete-region start-b (1+ start-e))
+          (delete-blank-lines)
+          (web-mode-buffer-indent)
+          )
+        ;;        (message "start %S %S - end %S %S" start-b start-e end-b end-e))
+        ) ;when
+      (skip-chars-forward "[:space:]")
+      (setq arg (1- arg))
+      ) ;while
+    ) ;let
+  )
+
+(defun web-mode-element-kill (&optional arg)
+  "Kill the current html element."
+  (interactive "p")
+  (while (>= arg 1)
+    (setq arg (1- arg))
+    (web-mode-element-select)
+    (when mark-active
+      (kill-region (region-beginning) (region-end)))
+    ) ;while
+  )
+
+(defun web-mode-element-clone (&optional arg)
+  "Clone the current html element."
+  (interactive "p")
+  (let (col pos)
+    (while (>= arg 1)
+      (setq arg (1- arg)
+            col 0)
+      (web-mode-element-select)
+      (when mark-active
+        (save-excursion
+          (goto-char (region-beginning))
+          (setq col (current-column)))
+        (kill-region (region-beginning) (region-end))
+        (yank)
+        (newline)
+        (indent-line-to col)
+        (setq pos (point))
+        (yank)
+        (goto-char pos))
+      )
+    ) ;let
+  )
+
+(defun web-mode-element-insert ()
+  "Insert an html element."
+  (interactive)
+  (let (tag-name)
+    (cond
+     ((and (get-text-property (point) 'tag-type)
+           (not (get-text-property (point) 'tag-beg)))
+      (message "element-insert ** invalid context **"))
+     ((not (and (setq tag-name (read-from-minibuffer "Tag name? "))
+                (> (length tag-name) 0)))
+      (message "element-insert ** failure **"))
+     ((web-mode-element-is-void tag-name)
+      (insert (concat "<" tag-name "/>"))
+      )
+     (mark-active
+      (let ((beg (region-beginning)) (end (region-end)))
+        (deactivate-mark)
+        (goto-char end)
+        (insert "</" tag-name ">")
+        (goto-char beg)
+        (insert "<" tag-name ">")
+        )
+      )
+     (t
+      (insert (concat "<" tag-name ">" "</" tag-name ">"))
+      (web-mode-sb "</")
+      )
+     ) ;cond
+    ))
+
+(defun web-mode-element-rename ()
+  "Rename the current html element."
+  (interactive)
+  (save-excursion
+    (let (pos tag-name)
+      (setq tag-name (read-from-minibuffer "New tag name? "))
+      (when (and (> (length tag-name) 0)
+                 (web-mode-element-beginning)
+                 (looking-at "<\\([[:alnum:]]+\\(:?[-][[:alpha:]]+\\)?\\)"))
+        (setq pos (point))
+        (unless (web-mode-element-is-void)
+            (save-match-data
+              (web-mode-tag-match)
+              (if (looking-at "</[ ]*\\([[:alnum:]]+\\(:?[-][[:alpha:]]+\\)?\\)")
+                  (replace-match (concat "</" tag-name))
+                )))
+        (goto-char pos)
+        (replace-match (concat "<" tag-name))
+        ))))
+
+(defun web-mode-current-trimmed-line ()
+  (web-mode-trim (buffer-substring-no-properties
+                  (line-beginning-position)
+                  (line-end-position))))
+
+(defun web-mode-trim (string)
+  (replace-regexp-in-string "\\`[ \t\n]*" "" (replace-regexp-in-string "[ \t\n]*\\'" "" string)))
+
+(defun web-mode-block-is-token-line ()
+  (save-excursion
+    (let ((continue t) (counter 0))
+      (beginning-of-line)
+      (back-to-indentation)
+      (while (and continue (not (eolp)))
+        (cond
+         ((get-text-property (point) 'block-token)
+          (setq counter (1+ counter)))
+         ((not (eq ?\s (following-char)))
+          (setq continue nil
+                counter 0))
+         ) ;cond
+        (forward-char)
+        ) ;while
+      (> counter 0)
+      )))
+
+(defun web-mode-part-is-token-line (pos)
+  (save-excursion
+    (let ((continue t)
+          (counter 0))
+      (goto-char pos)
+      (setq continue (not (eolp)))
+      (while continue
+        (forward-char)
+        (cond
+         ((eolp)
+          (setq continue nil))
+         ((or (get-text-property (point) 'block-side)
+              (member (get-text-property (point) 'part-token) '(comment string)))
+          (setq counter (1+ counter)))
+         ((eq ?\s (following-char))
+          )
+         (t
+          (setq continue nil
+                counter 0))
+         )
+        ) ;while
+      (> counter 0))))
+
+(defun web-mode-is-content (&optional pos)
+  (unless pos (setq pos (point)))
+  (not (or (get-text-property pos 'part-side)
+           (get-text-property pos 'tag-type)
+           (get-text-property pos 'block-side)
+           )))
+
+(defun web-mode-is-comment-or-string (&optional pos)
+  (unless pos (setq pos (point)))
+  (not (null (or (eq (get-text-property pos 'tag-type) 'comment)
+                 (member (get-text-property pos 'block-token) '(comment string))
+                 (member (get-text-property pos 'part-token) '(comment string))))))
+
+;; NOTE: we look at the firt one
+(defun web-mode-block-is-open (&optional pos)
+  (unless pos (setq pos (point))))
+
+;; NOTE: we look at the last one
+(defun web-mode-block-is-close (&optional pos)
+  (unless pos (setq pos (point)))
+  (and (get-text-property pos 'block-side)
+       (eq (caar (web-mode-block-controls-get pos)) 'close)))
+
+;; NOTE: we look at the first one
+(defun web-mode-block-is-inside (&optional pos)
+  (unless pos (setq pos (point)))
+  (and (get-text-property pos 'block-side)
+       (eq (caar (web-mode-block-controls-get pos)) 'inside)))
+
+(defun web-mode-element-is-void (&optional tag)
+  (cond
+   ((and tag (member tag '("div" "li" "a" "p")))
+    nil)
+   ((and tag (string= web-mode-content-type "jsx"))
+    (member (downcase tag) '("img" "br" "hr")))
+   (tag
+    (car (member (downcase tag) web-mode-void-elements)))
+   (t
+    (eq (get-text-property (point) 'tag-type) 'void))
+   ))
+
+(defun web-mode-toggle-current-element-highlight ()
+  "Toggle highlighting of the current html element."
+  (interactive)
+  (if web-mode-enable-current-element-highlight
+      (progn
+        (web-mode-delete-tag-overlays)
+        (setq web-mode-enable-current-element-highlight nil))
+    (setq web-mode-enable-current-element-highlight t)
+    ))
+
+(defun web-mode-fold-or-unfold (&optional pos)
+  "Toggle folding on an html element or a control block."
+  (interactive)
+  (web-mode-propertize)
+  (web-mode-with-silent-modifications
+   (save-excursion
+     (if pos (goto-char pos))
+     (let (beg-inside beg-outside end-inside end-outside overlay overlays regexp)
+       (when (looking-back "^[\t ]*")
+         (back-to-indentation))
+       (setq overlays (overlays-at (point)))
+       (dolist (elt overlays)
+         (when (and (not overlay)
+                    (eq (overlay-get elt 'font-lock-face) 'web-mode-folded-face))
+           (setq overlay elt)))
+       (cond
+        ;; *** unfolding
+        (overlay
+         (setq beg-inside (overlay-start overlay)
+               end-inside (overlay-end overlay))
+         (remove-overlays beg-inside end-inside)
+         (put-text-property beg-inside end-inside 'invisible nil)
+         )
+        ;; *** tag folding
+        ((member (get-text-property (point) 'tag-type) '(start end))
+         (when (not (web-mode-element-is-collapsed (point)))
+           (web-mode-tag-beginning)
+           (when (eq (get-text-property (point) 'tag-type) 'end)
+             (web-mode-tag-match))
+           (setq beg-outside (point))
+           (web-mode-tag-end)
+           (setq beg-inside (point))
+           (goto-char beg-outside)
+           (when (web-mode-tag-match)
+             (setq end-inside (point))
+             (web-mode-tag-end)
+             (setq end-outside (point)))
+           )
+         )
+        ;; *** block folding
+        ((cdr (web-mode-block-is-control (point)))
+         (setq beg-outside (web-mode-block-beginning-position (point)))
+         (setq beg-inside (1+ (web-mode-block-end-position (point))))
+         (when (web-mode-block-match)
+           (setq end-inside (point))
+           (setq end-outside (1+ (web-mode-block-end-position (point)))))
+         )
+        ) ;cond
+       (when (and beg-inside beg-outside end-inside end-outside)
+         (setq overlay (make-overlay beg-outside end-outside))
+         (overlay-put overlay 'font-lock-face 'web-mode-folded-face)
+         (put-text-property beg-inside end-inside 'invisible t))
+       ))))
+
+(defun web-mode-toggle-comments ()
+  "Toggle comments visbility."
+  (interactive)
+  (save-excursion
+    (if web-mode-comments-invisible
+        (remove-overlays))
+    (setq web-mode-comments-invisible (null web-mode-comments-invisible))
+    (let ((continue t)
+          (pos (point-min))
+          (visibility web-mode-comments-invisible)
+          overlay end)
+      (while continue
+        (setq pos (next-single-property-change pos 'font-lock-face))
+        (if (null pos)
+            (setq continue nil)
+          (when (eq (get-text-property pos 'font-lock-face) 'web-mode-comment-face)
+            (setq end (next-single-property-change pos 'font-lock-face))
+            (put-text-property pos end 'invisible visibility)
+            (when visibility
+              (setq overlay (make-overlay pos end)))
+            (goto-char pos)
+            )
+          )
+        )
+      ) ;let
+    ))
+
+(defun web-mode-comment-or-uncomment-region (beg end &optional arg)
+  (interactive)
+  (save-excursion
+    (push-mark end)
+    (goto-char beg)
+    (setq mark-active t)
+    (web-mode-comment-or-uncomment)
+    (pop-mark)))
+
+(defun web-mode-comment-or-uncomment ()
+  "Comment or uncomment line(s), block or region at POS."
+  (interactive)
+  ;; TODO : if mark is at eol, mark--
+  (if (and (not mark-active) (looking-at-p "[[:space:]]*$"))
+      (web-mode-comment-insert)
+    (when (and (use-region-p) (eq (point) (region-end)))
+      (if (bolp) (backward-char))
+      (exchange-point-and-mark))
+    (skip-chars-forward "[:space:]" (line-end-position))
+    (cond
+     ((or (eq (get-text-property (point) 'tag-type) 'comment)
+          (eq (get-text-property (point) 'block-token) 'comment)
+          (eq (get-text-property (point) 'part-token) 'comment))
+      (web-mode-uncomment (point)))
+     (t
+      (web-mode-comment (point)))
+     )
+    ) ;if
+  )
+
+(defun web-mode-comment-insert ()
+  (cond
+   ((get-text-property (point) 'block-side)
+    (insert "/*  */")
+    (search-backward " */"))
+   ((get-text-property (point) 'part-side)
+    (insert "/*  */")
+    (search-backward " */"))
+   (t
+    (insert "<!--  -->")
+    (search-backward " -->"))
+   )
+  )
+
+(defun web-mode-comment (pos)
+    (let (ctx language sel beg end tmp block-side single-line-block pos-after content)
+
+      (setq pos-after pos)
+
+      (setq block-side (get-text-property pos 'block-side))
+      (setq single-line-block (web-mode-is-single-line-block pos))
+
+      (cond
+
+       ((and single-line-block block-side
+             (intern-soft (concat "web-mode-comment-" web-mode-engine "-block")))
+        (funcall (intern (concat "web-mode-comment-" web-mode-engine "-block")) pos)
+        )
+
+       (t
+        (setq ctx (web-mode-point-context
+                   (if mark-active (region-beginning) (line-beginning-position))))
+        (setq language (plist-get ctx :language))
+        (cond
+         (mark-active
+          )
+         ((and (member language '("html" "xml"))
+               (get-text-property (progn (back-to-indentation) (point)) 'tag-beg))
+          (web-mode-element-select))
+         (t
+          (end-of-line)
+          (set-mark (line-beginning-position)))
+         ) ;cond
+
+        (setq beg (region-beginning)
+              end (region-end))
+
+        (when (> (point) (mark))
+          (exchange-point-and-mark))
+
+        (if (and (eq (char-before end) ?\n)
+                 (not (eq (char-after end) ?\n)))
+            (setq end (1- end)))
+
+        (setq sel (buffer-substring-no-properties beg end))
+
+        (cond
+
+         ((member language '("html" "xml"))
+          (cond
+           ((and (= web-mode-comment-style 2) (string= web-mode-engine "django"))
+            (setq content (concat "{# " sel " #}")))
+           ((and (= web-mode-comment-style 2) (member web-mode-engine '("ejs" "erb")))
+            (setq content (concat "<%# " sel " %>")))
+           ((and (= web-mode-comment-style 2) (string= web-mode-engine "aspx"))
+            (setq content (concat "<%-- " sel " --%>")))
+           ((and (= web-mode-comment-style 2) (string= web-mode-engine "smarty"))
+            (setq content (concat "{* " sel " *}")))
+           ((and (= web-mode-comment-style 2) (string= web-mode-engine "blade"))
+            (setq content (concat "{{-- " sel " --}}")))
+           ((and (= web-mode-comment-style 2) (string= web-mode-engine "razor"))
+            (setq content (concat "@* " sel " *@")))
+           (t
+            (setq content (concat "<!-- " sel " -->"))
+            (when (< (length sel) 1)
+              (search-backward " -->")
+              (setq pos-after nil))
+            ))
+          ) ;case html
+
+         ((member language '("php" "javascript" "java" "jsx"))
+          (let (alt)
+            (cond
+             ((get-text-property pos 'jsx-depth)
+              (setq content (concat "{/* " sel " */}"))
+              ;;(message "%S" pos)
+              )
+             ((and (setq alt (cdr (assoc language web-mode-comment-formats)))
+                   (string= alt "//"))
+              (setq content (replace-regexp-in-string "^[ ]*" alt sel)))
+             (t
+              (setq content (concat "/* " sel " */")))
+              ) ;cond
+            )
+          )
+
+         ((member language '("erb"))
+          (setq content (replace-regexp-in-string "^[ ]*" "#" sel)))
+
+         ((member language '("asp"))
+          (setq content (replace-regexp-in-string "^[ ]*" "''" sel)))
+
+         (t
+          (setq content (concat "/* " sel " */")))
+
+         ) ;cond
+
+        (when content
+          (delete-region beg end)
+          (deactivate-mark)
+          (let (beg end)
+            (setq beg (point-at-bol))
+            (insert content)
+            (setq end (point-at-eol))
+            (indent-region beg end)
+            )
+          ) ;when
+
+        ) ;t
+       ) ;cond
+
+      (when pos-after (goto-char pos-after))
+
+      ))
+
+(defun web-mode-comment-ejs-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "//" (+ beg 2))))
+
+(defun web-mode-comment-erb-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "#" (+ beg 2))))
+
+(defun web-mode-comment-django-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "#" end)
+    (web-mode-insert-text-at-pos "#" (1+ beg))))
+
+(defun web-mode-comment-dust-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "!" end)
+    (web-mode-insert-text-at-pos "!" (1+ beg))))
+
+(defun web-mode-comment-aspx-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "#" end)
+    (web-mode-insert-text-at-pos "#" (1+ beg))))
+
+(defun web-mode-comment-jsp-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "--" (+ beg 2))))
+
+(defun web-mode-comment-go-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "/" (+ beg 2))))
+
+(defun web-mode-comment-php-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-insert-text-at-pos "*/" (- end 1))
+    (web-mode-insert-text-at-pos "/*" (+ beg (if (web-mode-looking-at "<\\?php" beg) 5 3)))))
+
+(defun web-mode-comment-boundaries (&optional pos)
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let ((beg pos) (end pos) prop)
+    (save-excursion
+      (goto-char pos)
+      (setq prop
+            (cond
+             ((eq (get-text-property pos 'block-token) 'comment) 'block-token)
+             ((eq (get-text-property pos 'tag-type) 'comment) 'tag-type)
+             ((eq (get-text-property pos 'part-token) 'comment) 'part-token)
+             (t nil)
+             ))
+      (if (null prop)
+          (setq beg nil
+                end nil)
+        (when (and (not (bobp))
+                   (eq (get-text-property pos prop) (get-text-property (1- pos) prop)))
+          (setq beg (or (previous-single-property-change pos prop) (point-min))))
+        (when (and (not (eobp))
+                   (eq (get-text-property pos prop) (get-text-property (1+ pos) prop)))
+          (setq end (or (next-single-property-change pos prop) (point-max)))))
+      (when (and beg (string= (buffer-substring-no-properties beg (+ beg 2)) "//"))
+        (goto-char end)
+        (while (and (looking-at-p "\n[ ]*//")
+                    (not (eobp)))
+          (search-forward "//")
+          (backward-char 2)
+          ;;(message "%S" (point))
+          (setq end (next-single-property-change (point) prop))
+          (goto-char end)
+          ;;(message "%S" (point))
+          ) ;while
+        ) ;when
+      (when end (setq end (1- end)))
+      ) ; save-excursion
+    ;;(message "beg=%S end=%S" beg end)
+    (if (and beg end) (cons beg end) nil)
+    ))
+
+(defun web-mode-uncomment (pos)
+  (let ((beg pos) (end pos) (sub2 "") comment boundaries)
+    (save-excursion
+      (cond
+       ((and (get-text-property pos 'block-side)
+             (intern-soft (concat "web-mode-uncomment-" web-mode-engine "-block")))
+        (funcall (intern (concat "web-mode-uncomment-" web-mode-engine "-block")) pos))
+       ((and (setq boundaries (web-mode-comment-boundaries pos))
+             (setq beg (car boundaries))
+             (setq end (1+ (cdr boundaries)))
+             (> (- end beg) 4))
+        ;;(message "beg(%S) end(%S)" beg end)
+        (setq comment (buffer-substring-no-properties beg end))
+        (setq sub2 (substring comment 0 2))
+        (cond
+         ((member sub2 '("<!" "<%"))
+          (setq comment (replace-regexp-in-string "\\(^<[!%]--[ ]?\\|[ ]?--[%]?>$\\)" "" comment)))
+         ((string= sub2 "{#")
+          (setq comment (replace-regexp-in-string "\\(^{#[ ]?\\|[ ]?#}$\\)" "" comment)))
+         ((string= sub2 "{/") ;;jsx comments
+          (setq comment (replace-regexp-in-string "\\(^{/\\*[ ]?\\|[ ]?\\*/}$\\)" "" comment)))
+         ((string= sub2 "/*")
+          (setq comment (replace-regexp-in-string "\\(^/\\*[ ]?\\|[ ]?\\*/$\\)" "" comment)))
+         ((string= sub2 "//")
+          (setq comment (replace-regexp-in-string "\\(//\\)" "" comment)))
+         ) ;cond
+        (delete-region beg end)
+        (web-mode-insert-and-indent comment)
+        (goto-char beg)
+        )
+       ) ;cond
+      (indent-according-to-mode))))
+
+(defun web-mode-uncomment-erb-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (if (string-match-p "<[%[:alpha:]]" (buffer-substring-no-properties (+ beg 2) (- end 2)))
+        (progn
+          (web-mode-remove-text-at-pos 2 (1- end))
+          (web-mode-remove-text-at-pos 3 beg))
+      (web-mode-remove-text-at-pos 1 (+ beg 2))
+      ) ;if
+    )
+  )
+
+(defun web-mode-uncomment-ejs-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-remove-text-at-pos 1 (+ beg 2))))
+
+(defun web-mode-uncomment-django-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-remove-text-at-pos 2 (1- end))
+    (web-mode-remove-text-at-pos 2 beg)))
+
+(defun web-mode-uncomment-dust-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-remove-text-at-pos 1 (1- end))
+    (web-mode-remove-text-at-pos 1 (1+ beg))))
+
+(defun web-mode-uncomment-aspx-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-remove-text-at-pos 1 (1- end))
+    (web-mode-remove-text-at-pos 1 (1+ beg))))
+
+(defun web-mode-uncomment-jsp-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-remove-text-at-pos 2 (+ beg 2))))
+
+(defun web-mode-uncomment-go-block (pos)
+  (let (beg end)
+    (setq beg (web-mode-block-beginning-position pos)
+          end (web-mode-block-end-position pos))
+    (web-mode-remove-text-at-pos 1 (+ beg 2))))
+
+(defun web-mode-snippet-names ()
+  (let (codes)
+    (dolist (snippet web-mode-snippets)
+      (add-to-list 'codes (car snippet) t))
+    codes))
+
+(defun web-mode-snippet-insert (code)
+  "Insert a snippet."
+  (interactive
+   (list (completing-read "Snippet: " (web-mode-snippet-names))))
+  (let (beg
+        (continue t)
+        (counter 0)
+        end
+        sel
+        snippet
+        (l (length web-mode-snippets))
+        pos)
+    (when mark-active
+      (setq sel (web-mode-trim (buffer-substring-no-properties
+                                (region-beginning) (region-end))))
+      (delete-region (region-beginning) (region-end)))
+    (while (and continue (< counter l))
+      (setq snippet (nth counter web-mode-snippets))
+      (when (string= (car snippet) code)
+        (setq continue nil))
+      (setq counter (1+ counter)))
+    (when snippet
+      (setq snippet (cdr snippet))
+      (setq beg (point-at-bol))
+      (insert snippet)
+      (setq pos (point)
+            end (point))
+      (when (string-match-p "|" snippet)
+        (search-backward "|")
+        (delete-char 1)
+        (setq pos (point)
+              end (1- end)))
+      (when sel
+        (insert sel)
+        (setq pos (point)
+              end (+ end (length sel))))
+      (goto-char end)
+      (setq end (point-at-eol))
+      (unless sel (goto-char pos))
+      (indent-region beg end))
+    ))
+
+(defun web-mode-looking-at (regexp pos)
+  (save-excursion
+    (goto-char pos)
+    (looking-at regexp)))
+
+(defun web-mode-looking-at-p (regexp pos)
+  (save-excursion
+    (goto-char pos)
+    (looking-at-p regexp)))
+
+(defun web-mode-looking-back (regexp pos &optional limit greedy)
+  (save-excursion
+    (goto-char pos)
+    (if limit
+        (looking-back regexp limit greedy)
+      (looking-back regexp))))
+
+(defun web-mode-insert-text-at-pos (text pos)
+  (let ((mem web-mode-enable-auto-pairing))
+    (setq web-mode-enable-auto-pairing nil)
+    (save-excursion
+      (goto-char pos)
+      (insert text)
+      (setq web-mode-enable-auto-pairing mem)
+      )))
+
+(defun web-mode-remove-text-at-pos (n &optional pos)
+  (unless pos (setq pos (point)))
+  (delete-region pos (+ pos n)))
+
+(defun web-mode-insert-and-indent (text)
+  (let (beg end)
+    (setq beg (point-at-bol))
+    (insert text)
+    (setq end (point-at-eol))
+    (indent-region beg end)
+    ))
+
+(defun web-mode-indentation-at-pos (pos)
+  (save-excursion
+    (goto-char pos)
+    (current-indentation)))
+
+(defun web-mode-navigate (&optional pos)
+  "Move point to the matching opening/closing tag/block."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let (init)
+    (goto-char pos)
+    (setq init (point))
+    (when (> (current-indentation) (current-column))
+      (back-to-indentation))
+    (setq pos (point))
+    (cond
+     ((and (get-text-property pos 'block-side)
+           (web-mode-block-beginning)
+           (web-mode-block-controls-get (point)))
+      (web-mode-block-match))
+     ((member (get-text-property pos 'tag-type) '(start end))
+      (web-mode-tag-beginning)
+      (web-mode-tag-match))
+     (t
+      (goto-char init))
+     )
+    ))
+
+(defun web-mode-block-match (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (pos-ori controls control (counter 1) type (continue t) pair)
+    (setq pos-ori pos)
+    (goto-char pos)
+    (setq controls (web-mode-block-controls-get pos))
+;;    (message "controls=%S" controls)
+    (cond
+     (controls
+      (setq pair (car controls))
+      (setq control (cdr pair))
+      (setq type (car pair))
+      (when (eq type 'inside) (setq type 'close))
+      (while continue
+        (cond
+         ((and (> pos-ori 1) (bobp))
+          (setq continue nil))
+         ((or (and (eq type 'open) (not (web-mode-block-next)))
+              (and (eq type 'close) (not (web-mode-block-previous))))
+          (setq continue nil)
+          )
+         ((null (setq controls (web-mode-block-controls-get (point))))
+          )
+         (t
+          ;; TODO : est il nécessaire de faire un reverse sur controls si on doit matcher backward
+          (dolist (pair controls)
+            (cond
+             ((not (string= (cdr pair) control))
+              )
+             ((eq (car pair) 'inside)
+              )
+             ((eq (car pair) type)
+              (setq counter (1+ counter)))
+             (t
+              (setq counter (1- counter)))
+             )
+            ) ;dolist
+          (when (= counter 0)
+            (setq continue nil))
+          ) ;t
+         ) ;cond
+        ) ;while
+      (if (= counter 0) (point) nil)
+      ) ;controls
+     (t
+      (goto-char pos-ori)
+      nil
+      ) ;controls = nul
+     ) ;conf
+    ))
+
+(defun web-mode-tag-match (&optional pos)
+  "Move point to the matching opening/closing tag."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let (regexp)
+    (setq regexp (concat "</?" (get-text-property pos 'tag-name)))
+    (when (member (get-text-property pos 'tag-type) '(start end))
+      (web-mode-tag-beginning)
+      (setq pos (point)))
+    (if (eq (get-text-property pos 'tag-type) 'end)
+        (web-mode-tag-fetch-opening regexp pos)
+      (web-mode-tag-fetch-closing regexp pos))
+    t))
+
+(defun web-mode-tag-fetch-opening (regexp pos)
+  (let ((counter 1) (n 0) (type nil))
+    (goto-char pos)
+    (while (and (> counter 0) (re-search-backward regexp nil t))
+      (when (and (get-text-property (point) 'tag-beg)
+                 (member (get-text-property (point) 'tag-type) '(start end)))
+        (setq n (1+ n))
+        (cond
+         ((eq (get-text-property (point) 'tag-type) 'end)
+          (setq counter (1+ counter)))
+         (t
+          (setq counter (1- counter))
+          )
+         )
+        )
+      )
+    (if (= n 0) (goto-char pos))
+    ))
+
+(defun web-mode-tag-fetch-closing (regexp pos)
+  (let ((counter 1) (n 0))
+    (goto-char pos)
+    (web-mode-tag-end)
+    (while (and (> counter 0) (re-search-forward regexp nil t))
+      (when (get-text-property (match-beginning 0) 'tag-beg)
+        (setq n (1+ n))
+        (if (eq (get-text-property (point) 'tag-type) 'end)
+            (setq counter (1- counter))
+          (setq counter (1+ counter))))
+      )
+    (if (> n 0)
+        (web-mode-tag-beginning)
+      (goto-char pos))
+    ))
+
+(defun web-mode-element-tag-name (&optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (goto-char pos)
+    (if (and (web-mode-tag-beginning)
+             (looking-at "<\\(/?[[:alpha:]][[:alnum:]:-]*\\)"))
+        (match-string-no-properties 1)
+      nil)))
+
+(defun web-mode-element-close ()
+  "Close html element."
+  (interactive)
+  (let (jump epp ins tag)
+    (setq epp (web-mode-element-parent-position))
+    (when epp
+;;      (setq tag (get-text-property epp 'tag-name))
+      (setq tag (web-mode-element-tag-name epp))
+      (cond
+       ((null tag)
+        (setq epp nil))
+       ((looking-back "</")
+        (setq ins tag))
+       ((looking-back "<")
+        (setq ins (concat "/" tag)))
+       (t
+        ;; auto-close-style = 2
+;;        (message "%S %c" (point) (char-after))
+        (when (and (looking-at-p "[[:alpha:]]") (> (length tag) 4))
+          (dolist (elt '("div" "span" "strong" "pre" "li"))
+            (when (and (string-match-p (concat "^" elt) tag) (not (string= tag elt)))
+              (setq tag elt)
+              (put-text-property epp (point) 'tag-name tag))
+            )
+          ) ;when
+        (if (web-mode-element-is-void (get-text-property (point) 'tag-name))
+            (setq ins nil
+                  epp nil)
+          (setq ins (concat "</" tag)))
+        )
+       ) ;cond
+      (when ins
+        ;;        (message "ins=%S" ins)
+        (unless (looking-at-p "[ ]*>")
+          (setq ins (concat ins ">")))
+        (insert ins)
+        (save-excursion
+          (search-backward "<")
+          (setq jump (and (eq (char-before) ?\>)
+                          (string= (get-text-property (1- (point)) 'tag-name) tag)))
+          (if jump (setq jump (point)))
+          ;;        (setq jump (looking-back (concat "<" tag ">")))
+          ) ;save-excursion
+        (if jump (goto-char jump))
+        ) ;when not ins
+      ) ;when epp
+    epp
+    ))
+
+(defun web-mode-detect-content-type ()
+  (cond
+   ((and (string= web-mode-engine "none")
+         (< (point) 16)
+         (eq (char-after 1) ?\#)
+         (string-match-p "php" (buffer-substring-no-properties
+                                (line-beginning-position)
+                                (line-end-position))))
+    (web-mode-set-engine "php"))
+   ((and (string= web-mode-content-type "javascript")
+         (< (point) web-mode-chunk-length)
+         (eq (char-after (point-min)) ?\/)
+         (string-match-p "@jsx" (buffer-substring-no-properties
+                                 (line-beginning-position)
+                                 (line-end-position))))
+    (web-mode-set-content-type "jsx"))
+   ))
+
+(defun web-mode-on-after-change (beg end len)
+;;  (message "after-change: pos=%d, beg=%d, end=%d, len=%d, ocmd=%S, cmd=%S" (point) beg end len this-original-command this-command)
+  ;;  (backtrace)
+;;  (message "this-command=%S" this-command)
+  (when (eq this-original-command 'yank)
+    (setq web-mode-inhibit-fontification t))
+  (when (or (null web-mode-change-beg) (< beg web-mode-change-beg))
+    (setq web-mode-change-beg beg))
+  (when (or (null web-mode-change-end) (> end web-mode-change-end))
+    (setq web-mode-change-end end))
+  )
+
+(defun web-mode-complete ()
+  "Autocomple at point."
+  (interactive)
+  (let ((pos (point))
+        (char (char-before))
+        (chunk (buffer-substring-no-properties (- (point) 2) (point)))
+        (auto-closed   nil)
+        (auto-expanded nil)
+        (auto-paired   nil)
+        (auto-quoted   nil)
+        expanders)
+
+    ;;-- auto-closing
+    (when (and web-mode-enable-auto-closing
+               (>= pos 4)
+               (or (string= "</" chunk)
+                   (and (= web-mode-auto-close-style 2)
+                        (or (string= web-mode-content-type "jsx")
+                            (not (get-text-property pos 'part-side)))
+                        (string-match-p "[[:alnum:]'\"]>" chunk)))
+               (not (get-text-property (- pos 2) 'block-side))
+               (web-mode-element-close))
+      (setq auto-closed t))
+
+    ;;-- auto-pairing
+    (when (and web-mode-enable-auto-pairing
+               (>= pos 4)
+               (not auto-closed))
+      (let ((i 0) expr after pos-end (l (length web-mode-auto-pairs)))
+        (setq pos-end (if (> (+ pos 32) (line-end-position))
+                          (line-end-position)
+                        (+ pos 10)))
+        (setq chunk (buffer-substring-no-properties (- pos 3) pos)
+              after (buffer-substring-no-properties pos pos-end))
+        (while (and (< i l) (not auto-paired))
+          (setq expr (elt web-mode-auto-pairs i)
+                i (1+ i))
+          ;;(message "chunk=%S expr=%S after=%S" chunk expr after)
+          (when (and (string= (car expr) chunk)
+                     (not (string-match-p (regexp-quote (cdr expr)) after)))
+            (setq auto-paired t)
+            (insert (cdr expr))
+            (if (string-match-p "|" (cdr expr))
+                (progn
+                  (search-backward "|")
+                  (delete-char 1))
+              (goto-char pos))
+            ) ;when
+          ) ;while
+        ) ;let
+      )
+
+    ;;-- auto-expanding
+    (when (and web-mode-enable-auto-expanding
+               (not auto-closed)
+               (not auto-paired)
+               (eq char ?\/)
+               (not (get-text-property (1- pos) 'tag-type))
+               (not (get-text-property (1- pos) 'part-side))
+               (not (get-text-property (1- pos) 'block-side))
+               (looking-back "\\(^\\|[[:punct:][:space:]>]\\)./"))
+      (setq expanders (append web-mode-expanders web-mode-extra-expanders))
+      (let ((i 0) pair (l (length expanders)))
+        (setq chunk (buffer-substring-no-properties (- pos 2) pos))
+        ;;(message "%S" chunk)
+        (while (and (< i l) (not auto-expanded))
+          (setq pair (elt expanders i)
+                i (1+ i))
+          (when (string= (car pair) chunk)
+            (setq auto-expanded t)
+            (delete-char -2)
+            (insert (cdr pair))
+            (when (string-match-p "|" (cdr pair))
+              (search-backward "|")
+              (delete-char 1))
+            ) ;when
+          ) ;while
+        ) ; let
+      )
+
+    ;;-- auto-quoting
+    (when (and web-mode-enable-auto-quoting
+               (>= pos 4)
+               (not (get-text-property pos 'block-side))
+               (not auto-closed)
+               (not auto-paired)
+               (not auto-expanded)
+               (get-text-property (- pos 2) 'tag-attr)
+               )
+      (cond
+       ((and (eq char ?\=)
+             (not (looking-at-p "[ ]*[\"']")))
+        (insert "\"\"")
+        (backward-char)
+        (setq auto-quoted t))
+       ((and (eq char ?\")
+             (looking-back "=[ ]*\"")
+             (not (looking-at-p "[ ]*[\"]")))
+        (insert "\"")
+        (backward-char)
+        (setq auto-quoted t))
+       ((and (eq char ?\')
+             (looking-back "=[ ]*'")
+             (not (looking-at-p "[ ]*[']")))
+        (insert "'")
+        (backward-char)
+        (setq auto-quoted t))
+       ((and (eq char ?\")
+             (eq (char-after) ?\"))
+        (delete-char 1)
+        (cond
+         ((looking-back "=\"\"")
+          (backward-char))
+         ((eq (char-after) ?\s)
+          (forward-char))
+         (t
+          (insert " "))
+         ) ;cond
+        )
+       ) ;cond
+      ) ;when
+
+    ;;--
+    (cond
+     ((or auto-closed auto-paired auto-expanded auto-quoted)
+      (when (and web-mode-change-end
+                 (>= (line-end-position) web-mode-change-end))
+        (setq web-mode-change-end (line-end-position)))
+      (list :auto-closed auto-closed
+            :auto-paired auto-paired
+            :auto-expanded auto-expanded
+            :auto-quoted auto-quoted))
+     (t
+      nil)
+     )
+
+    ))
+
+(defun web-mode-on-post-command ()
+  (let (ctx n char)
+
+    ;;(message "this-command=%S (%S)" this-command web-mode-expand-previous-state)
+    ;;(message "%S: %S %S" this-command web-mode-change-beg web-mode-change-end)
+
+    (when (and web-mode-expand-previous-state
+               (not (member this-command '(web-mode-mark-and-expand
+                                           er/expand-region
+                                           mc/mark-next-like-this))))
+      (when (eq this-command 'keyboard-quit)
+        (goto-char web-mode-expand-initial-pos))
+      (deactivate-mark)
+      (when web-mode-expand-initial-scroll
+        (set-window-start (selected-window) web-mode-expand-initial-scroll)
+        )
+      (setq web-mode-expand-previous-state nil
+            web-mode-expand-initial-pos nil
+            web-mode-expand-initial-scroll nil))
+
+    (when (member this-command '(yank))
+      (let ((beg web-mode-change-beg) (end web-mode-change-end))
+        (setq web-mode-inhibit-fontification nil)
+        (when (and web-mode-change-beg web-mode-change-end)
+          (save-excursion
+            (font-lock-fontify-region web-mode-change-beg web-mode-change-end))
+          (when web-mode-enable-auto-indentation
+            (indent-region beg end))
+          ) ; and
+        )
+      )
+
+    (when (< (point) 16)
+      (web-mode-detect-content-type))
+
+    (when (and web-mode-enable-engine-detection
+               (or (null web-mode-engine) (string= web-mode-engine "none"))
+               (< (point) web-mode-chunk-length)
+               (web-mode-detect-engine))
+      (web-mode-on-engine-setted)
+      (web-mode-buffer-highlight))
+
+    (when (> (point) 1)
+      (setq char (char-before)))
+
+    (cond
+
+     ((null char)
+      )
+
+     ((and (>= (point) 3)
+           (member this-command '(self-insert-command))
+           (not (member (get-text-property (point) 'part-token) '(comment string))))
+      (setq ctx (web-mode-complete)))
+
+     ((and web-mode-enable-auto-opening
+           (member this-command '(newline electric-newline-and-maybe-indent))
+           (or (and (not (eobp))
+                    (eq (char-after) ?\<)
+                    (eq (get-text-property (point) 'tag-type) 'end)
+                    (looking-back ">\n[ \t]*")
+                    (setq n (length (match-string-no-properties 0)))
+                    (eq (get-text-property (- (point) n) 'tag-type) 'start)
+                    (string= (get-text-property (- (point) n) 'tag-name)
+                             (get-text-property (point) 'tag-name))
+                    )
+               (and (get-text-property (1- (point)) 'block-side)
+                    (string= web-mode-engine "php")
+                    (looking-back "<\\?php[ ]*\n")
+                    (looking-at-p "[ ]*\\?>"))))
+      (newline-and-indent)
+      (forward-line -1)
+      (indent-according-to-mode)
+      )
+     ) ;cond
+
+    (when (and web-mode-enable-auto-indentation
+               (member this-command '(self-insert-command))
+               (or (and ctx
+                        (or (plist-get ctx :auto-closed)
+                            (plist-get ctx :auto-expanded)))
+                   (and (> (point) (point-min))
+                        (get-text-property (1- (point)) 'tag-end)
+                        (get-text-property (line-beginning-position) 'tag-beg))))
+      (indent-according-to-mode)
+      (when (and web-mode-change-end (> web-mode-change-end (point-max)))
+        (message "post-command: enlarge web-mode-change-end")
+        (setq web-mode-change-end (point-max))
+        )
+      ) ; when auto-indent
+
+    (when web-mode-enable-current-element-highlight
+      (web-mode-highlight-current-element))
+
+    (when (and web-mode-enable-current-column-highlight
+               (not (web-mode-buffer-narrowed-p)))
+      (web-mode-column-show))
+
+    ;;(message "post-command (%S) (%S)" web-mode-change-end web-mode-change-end)
+
+    ))
+
+(defun web-mode-dom-apostrophes-replace ()
+  "Replace char(') with char(’) in the html contents of the buffer."
+  (interactive)
+  (save-excursion
+    (let ((min (point-min)) (max (point-max)))
+      (when mark-active
+        (setq min (region-beginning)
+              max (region-end))
+        (deactivate-mark))
+      (goto-char min)
+      (while (web-mode-content-rsf "\\([[:alpha:]]\\)'\\([[:alpha:]]\\)" max)
+        (replace-match "\\1’\\2"))
+      )))
+
+(defun web-mode-dom-entities-encode ()
+  (save-excursion
+    (let (regexp ms elt (min (point-min)) (max (point-max)))
+      (when mark-active
+        (setq min (region-beginning)
+              max (region-end))
+        (deactivate-mark))
+      (goto-char min)
+      (setq regexp "[")
+      (dolist (pair web-mode-html-entities)
+        (setq regexp (concat regexp (char-to-string (cdr pair))))
+        )
+      (setq regexp (concat regexp "]"))
+      (while (web-mode-content-rsf regexp max)
+        (setq elt (match-string-no-properties 0))
+        (setq elt (aref elt 0))
+        (setq elt (car (rassoc elt web-mode-html-entities)))
+        (replace-match (concat "&" elt ";"))
+        ) ;while
+      )))
+
+(defun web-mode-dom-entities-replace ()
+  "Replace html entities (e.g. &eacute; &#233; or &#x00E9; become é)"
+  (interactive)
+  (save-excursion
+    (let (ms pair elt (min (point-min)) (max (point-max)))
+      (when mark-active
+        (setq min (region-beginning)
+              max (region-end))
+        (deactivate-mark))
+      (goto-char min)
+      (while (web-mode-content-rsf "&\\([#]?[[:alnum:]]\\{2,8\\}\\);" max)
+        (setq elt nil)
+        (setq ms (match-string-no-properties 1))
+        (cond
+         ((not (eq (aref ms 0) ?\#))
+          (and (setq pair (assoc ms web-mode-html-entities))
+               (setq elt (cdr pair))
+               (setq elt (char-to-string elt))))
+         ((eq (aref ms 1) ?x)
+          (setq elt (substring ms 2))
+          (setq elt (downcase elt))
+          (setq elt (string-to-number elt 16))
+          (setq elt (char-to-string elt)))
+         (t
+          (setq elt (substring ms 1))
+          (setq elt (char-to-string (string-to-number elt))))
+         ) ;cond
+        (when elt (replace-match elt))
+        ) ;while
+      )))
+
+(defun web-mode-dom-xml-replace ()
+  "Replace &, > and < in html content."
+  (interactive)
+  (save-excursion
+    (let (expr (min (point-min)) (max (point-max)))
+      (when mark-active
+        (setq min (region-beginning)
+              max (region-end))
+        (deactivate-mark))
+      (goto-char min)
+      (while (web-mode-content-rsf "[&<>]" max)
+        (replace-match (cdr (assq (char-before) web-mode-xml-chars)) t t))
+      )))
+
+(defun web-mode-dom-quotes-replace ()
+  "Replace dumb quotes."
+  (interactive)
+  (save-excursion
+    (let (expr (min (point-min)) (max (point-max)))
+      (when mark-active
+        (setq min (region-beginning)
+              max (region-end))
+        (deactivate-mark))
+      (goto-char min)
+      (setq expr (concat (car web-mode-smart-quotes) "\\2" (cdr web-mode-smart-quotes)))
+      (while (web-mode-content-rsf "\\(\"\\)\\(.\\{1,200\\}\\)\\(\"\\)" max)
+        (replace-match expr)
+        ) ;while
+      )))
+
+(defun web-mode-dom-xpath (&optional pos)
+  "Display html path."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (goto-char pos)
+    (let (path)
+      (while (web-mode-element-parent)
+        (setq path (cons (get-text-property (point) 'tag-name) path))
+        )
+      (message "/%s" (mapconcat 'identity path "/"))
+      )))
+
+(defun web-mode-block-ends-with (regexp &optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (goto-char pos)
+    (save-match-data
+      (if (stringp regexp)
+          (and (web-mode-block-end)
+               (progn (backward-char) t)
+               (web-mode-block-skip-blank-backward)
+               (progn (forward-char) t)
+               (looking-back regexp))
+        (let ((pair regexp)
+              (block-beg (web-mode-block-beginning-position pos))
+              (block-end (web-mode-block-end-position pos)))
+          (and (web-mode-block-end)
+               (web-mode-block-sb (car pair) block-beg)
+               (not (web-mode-sf (cdr pair) block-end)))
+          ) ;let
+        ) ;if
+      )))
+
+(defun web-mode-block-token-starts-with (regexp &optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (and (goto-char pos)
+         (web-mode-block-token-beginning)
+         (skip-chars-forward "[\"']")
+         (looking-at regexp))
+    ))
+
+(defun web-mode-block-starts-with (regexp &optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (and (web-mode-block-beginning)
+         (web-mode-block-skip-blank-forward)
+         (looking-at regexp))
+    ))
+
+(defun web-mode-block-skip-blank-backward (&optional pos)
+  (unless pos (setq pos (point)))
+  (let ((continue t))
+    (goto-char pos)
+    (while continue
+      (if (and (get-text-property (point) 'block-side)
+               (not (bobp))
+               (or (member (char-after) '(?\s ?\n))
+                   (member (get-text-property (point) 'block-token)
+                           '(delimiter-beg delimiter-end comment))))
+          (backward-char)
+        (setq continue nil))
+      ) ;while
+    (point)))
+
+(defun web-mode-block-skip-blank-forward (&optional pos)
+  (unless pos (setq pos (point)))
+  (let ((continue t))
+    (goto-char pos)
+    (while continue
+      (if (and (get-text-property (point) 'block-side)
+               (or (member (char-after) '(?\s ?\n ?\t))
+                   (member (get-text-property (point) 'block-token)
+                           '(delimiter-beg delimiter-end comment))))
+          (forward-char)
+        (setq continue nil))
+      ) ;while
+;;    (message "pt=%S" (point))
+    (point)))
+
+(defun web-mode-tag-attributes-sort (&optional pos)
+  "Sort the attributes inside the current html tag."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (let (attrs (continue t) min max tag-beg tag-end attr attr-name attr-beg attr-end indent indentation sorter ins)
+      (if (not (member (get-text-property pos 'tag-type) '(start void)))
+          nil
+        (setq tag-beg (web-mode-tag-beginning-position pos)
+              tag-end (web-mode-tag-end-position))
+;;        (message "%S %S" tag-beg tag-end)
+        (goto-char tag-beg)
+        (while continue
+          (if (or (not (web-mode-attribute-next))
+                  (>= (point) tag-end))
+              (setq continue nil)
+            ;;(message "attr=%S" (point))
+            (setq attr-beg (web-mode-attribute-beginning-position)
+                  attr-end (1+ (web-mode-attribute-end-position)))
+            (when (null min)
+              (setq min attr-beg))
+            (setq max attr-end)
+            (goto-char attr-beg)
+            (setq attr (buffer-substring-no-properties attr-beg attr-end))
+            (if (string-match "^\\([[:alnum:]-]+\\)=" attr)
+                (setq attr-name (match-string-no-properties 1 attr))
+              (setq attr-name attr))
+            (setq indent (looking-back "^[ \t]*"))
+            (setq attrs (append attrs (list (list attr-beg attr-end attr-name attr indent))))
+            ) ;if
+          ) ;while
+        ) ;if in tag
+      (when attrs
+        (setq sorter (function
+                      (lambda (elt1 elt2)
+                        (string< (nth 2 elt1) (nth 2 elt2))
+                        )))
+        (setq attrs (sort attrs sorter))
+        (delete-region (1- min) max)
+        (setq ins "")
+        (dolist (elt attrs)
+          (if (and (nth 4 elt) (> (length ins) 1))
+              (setq ins (concat ins "\n"))
+            (setq ins (concat ins " ")))
+          (setq ins (concat ins (nth 3 elt)))
+          )
+        (goto-char (1- min))
+        (insert ins)
+        (web-mode-tag-beginning)
+        (setq min (line-beginning-position))
+        (web-mode-tag-end)
+        (setq max (line-end-position))
+        (indent-region min max)
+        )
+      ;;(message "attrs=%S" attrs)
+      )))
+
+(defun web-mode-attribute-insert ()
+  "Insert an attribute inside current tag."
+  (interactive)
+  (let (attr attr-name attr-value)
+    (cond
+     ((not (eq (get-text-property (point) 'tag-type) 'start))
+      (message "attribute-insert ** invalid context **"))
+     ((not (and (setq attr-name (read-from-minibuffer "Attribute name? "))
+                (> (length attr-name) 0)))
+      (message "attribute-insert ** failure **"))
+     (t
+      (setq attr (concat " " attr-name))
+      (when (setq attr-value (read-from-minibuffer "Attribute value? "))
+        (setq attr (concat attr "=\"" attr-value "\"")))
+      (web-mode-tag-end)
+      (re-search-backward "/?>")
+      (insert attr)
+      )
+     ) ;cond
+    ))
+
+(defun web-mode-attribute-transpose (&optional pos)
+  "Transpose the current html attribute."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let (ret attr-beg attr-end next-beg next-end tag-end)
+    (when (and (get-text-property pos 'tag-attr)
+               (setq next-beg (web-mode-attribute-next-position pos))
+               (setq next-end (web-mode-attribute-end-position next-beg))
+               (setq tag-end (web-mode-tag-end-position pos))
+               (> tag-end next-end))
+      (setq attr-beg (web-mode-attribute-beginning-position pos)
+            attr-end (web-mode-attribute-end-position pos))
+      ;;      (message "%S %S - %S %S" attr-beg attr-end next-beg next-end)
+      (transpose-regions attr-beg (1+ attr-end) next-beg (1+ next-end))
+      )))
+
+(defun web-mode-attribute-select (&optional pos)
+  "Select the current html attribute."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (if (null (get-text-property pos 'tag-attr))
+      nil
+    (goto-char pos)
+    (web-mode-attribute-beginning)
+    (set-mark (point))
+    (web-mode-attribute-end)
+    (point)
+    ))
+
+(defun web-mode-attribute-kill (&optional arg)
+  "Kill the current html attribute."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (while (>= arg 1)
+    (setq arg (1- arg))
+    (web-mode-attribute-select)
+    (when mark-active
+      (let ((beg (region-beginning)) (end (region-end)))
+        (save-excursion
+          (goto-char end)
+          (when (looking-at "[ \n\t]*")
+            (setq end (+ end (length (match-string-no-properties 0)))))
+          ) ;save-excursion
+        (kill-region beg end)
+        ) ;let
+      ) ;when
+    ) ;while
+  )
+
+(defun web-mode-block-close (&optional pos)
+  "Close the first unclosed control block."
+  (interactive)
+  (unless pos (setq pos (point)))
+  (let ((continue t)
+        (h (make-hash-table :test 'equal)) ctx ctrl n closing-block)
+    (save-excursion
+      (while (and continue (web-mode-block-previous))
+        (when (setq ctx (web-mode-block-is-control (point)))
+          (setq ctrl (car ctx))
+          (setq n (gethash ctrl h 0))
+          (if (cdr ctx)
+              (puthash ctrl (1+ n) h)
+            (puthash ctrl (1- n) h))
+          (when (> (gethash ctrl h) 0)
+            (setq continue nil))
+          )
+        ) ;while
+      ) ;save-excursion
+    (when (and (null continue)
+               (setq closing-block (web-mode-closing-block ctrl)))
+      (insert closing-block)
+      (indent-according-to-mode)
+      ;;      (indent-for-tab-command)
+      )
+    ))
+
+(defun web-mode-closing-block (type)
+  (cond
+   ((string= web-mode-engine "php")       (concat "<?php end" type "; ?>"))
+   ((string= web-mode-engine "django")    (concat "{% end" type " %}"))
+   ((string= web-mode-engine "ctemplate") (concat "{{/" type "}}"))
+   ((string= web-mode-engine "blade")
+    (if (string= type "section") (concat "@show") (concat "@end" type)))
+   ((string= web-mode-engine "dust")      (concat "{/" type "}"))
+   ((string= web-mode-engine "mako")      (concat "% end" type))
+   ((string= web-mode-engine "closure")   (concat "{/" type "}"))
+   ((string= web-mode-engine "smarty")    (concat "{/" type "}"))
+   ((string= web-mode-engine "underscore")        "<% } %>")
+   ((string= web-mode-engine "lsp")               "<% ) %>")
+   ((string= web-mode-engine "erb")               "<% } %>")
+   ((string= web-mode-engine "erb")               "<% end %>")
+   ((string= web-mode-engine "go")                "{{end}}")
+   ((string= web-mode-engine "velocity")          "#end")
+   ((string= web-mode-engine "velocity")          "#{end}")
+   ((string= web-mode-engine "template-toolkit")  "[% end %]")
+   ((member web-mode-engine '("asp" "jsp"))
+    (if (string-match-p "[:.]" type) (concat "</" type ">") "<% } %>"))
+   (t nil)
+   ) ;cond
+  )
+
+;;---- POSITION ----------------------------------------------------------------
+
+(defun web-mode-comment-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (car (web-mode-comment-boundaries pos)))
+
+(defun web-mode-comment-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cdr (web-mode-comment-boundaries pos)))
+
+(defun web-mode-part-opening-paren-position (pos &optional limit)
+  (save-restriction
+    (unless limit (setq limit nil))
+    (goto-char pos)
+    (let* ((n -1)
+           (paren (char-after))
+           (pairs '((?\) . "[)(]")
+                    (?\] . "[\]\[]")
+                    (?\} . "[}{]")
+                    (?\> . "[><]")))
+           (regexp (cdr (assoc paren pairs)))
+           (continue (not (null regexp)))
+           (counter 0))
+      (while (and continue (re-search-backward regexp limit t))
+        (cond
+         ((> (setq counter (1+ counter)) 500)
+          (message "part-opening-paren-position ** warning **")
+          (setq continue nil))
+         ((or (web-mode-is-comment-or-string)
+              (get-text-property (point) 'block-side))
+          )
+         ((eq (char-after) paren)
+          (setq n (1- n)))
+         (t
+          (setq n (1+ n))
+          (setq continue (not (= n 0))))
+         )
+        ) ;while
+      (if (= n 0) (point) nil)
+      )))
+
+(defun web-mode-closing-paren-position (&optional pos limit)
+  (save-excursion
+    (unless pos (setq pos (point)))
+    (unless limit (setq limit nil))
+    (goto-char pos)
+    (let* ((n 0)
+           (block-side (and (get-text-property pos 'block-side)
+                            (not (string= web-mode-engine "razor"))))
+           (paren (char-after))
+           (pairs '((?\( . "[)(]")
+                    (?\[ . "[\]\[]")
+                    (?\{ . "[}{]")
+                    (?\< . "[><]")))
+           (regexp (cdr (assoc paren pairs)))
+           (continue (not (null regexp))))
+      (while (and continue (re-search-forward regexp limit t))
+        (cond
+         ((or (web-mode-is-comment-or-string (1- (point)))
+              (and block-side (not (get-text-property (point) 'block-side))))
+          ;;(message "pt=%S" (point))
+          )
+         ((eq (char-before) paren)
+          (setq n (1+ n)))
+         (t
+          (setq n (1- n))
+          (setq continue (not (= n 0)))
+          )
+         ) ;cond
+        ) ;while
+      (if (= n 0) (1- (point)) nil)
+      )))
+
+(defun web-mode-closing-delimiter-position (delimiter &optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit nil))
+  (save-excursion
+    (goto-char pos)
+    (setq pos nil)
+    (let ((continue t))
+      (while (and continue (re-search-forward delimiter limit t))
+        (setq continue nil
+              pos (1- (point)))
+        ) ;while
+      pos)))
+
+(defun web-mode-tag-match-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (web-mode-tag-match pos)
+    (if (= pos (point)) nil (point))))
+
+(defun web-mode-tag-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (beg end depth)
+    (setq depth (get-text-property pos 'jsx-depth))
+    (when (and depth (get-text-property pos 'tag-attr-beg))
+       (setq depth (get-text-property (1- pos) 'jsx-depth)))
+    (cond
+     ((null pos)
+      (setq end nil))
+     ((get-text-property pos 'tag-beg)
+      (setq beg pos))
+     ((and (> pos 1) (get-text-property (1- pos) 'tag-beg))
+      (setq beg (1- pos)))
+     ((get-text-property pos 'tag-type)
+      (setq beg (previous-single-property-change pos 'tag-beg))
+      (when beg (setq beg (1- beg)))
+      (cond
+       ((not (get-text-property beg 'tag-beg))
+        (setq beg nil))
+       ((and depth (not (eq depth (get-text-property beg 'jsx-depth))))
+        (let ((continue (> beg (point-min))))
+          (while continue
+            (setq beg (previous-single-property-change beg 'tag-beg))
+            (when beg (setq beg (1- beg)))
+            (cond
+             ((null beg)
+              (setq continue nil))
+             ((not (get-text-property beg 'tag-beg))
+              (setq continue nil
+                    beg nil))
+             ((eq depth (get-text-property beg 'jsx-depth))
+              (setq continue nil))
+             ) ;cond
+            ) ;while
+          ) ;let
+        )
+       ) ;cond
+      )
+     (t
+      (setq beg nil))
+     ) ;cond
+    beg))
+
+(defun web-mode-tag-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (end depth)
+    (setq depth (get-text-property pos 'jsx-depth))
+    (when (and depth (get-text-property pos 'tag-attr-beg))
+      (setq depth (get-text-property (1- pos) 'jsx-depth)))
+    (cond
+     ((null pos)
+      (setq end nil))
+     ((get-text-property pos 'tag-end)
+      (setq end pos))
+     ((get-text-property pos 'tag-type)
+      (setq end (next-single-property-change pos 'tag-end))
+      (cond
+       ((not (get-text-property end 'tag-end))
+        (setq end nil))
+       ((and depth (not (eq depth (get-text-property end 'jsx-depth))))
+        (let ((continue (< end (point-max))))
+          (while continue
+            (setq end (1+ end))
+            (setq end (next-single-property-change end 'tag-end))
+            (cond
+             ((null end)
+              (setq continue nil))
+             ((not (get-text-property end 'tag-end))
+              (setq continue nil
+                    end nil))
+             ((eq depth (get-text-property end 'jsx-depth))
+              (setq continue nil))
+             ) ;cond
+            ) ;while
+          ) ;let
+        )
+       ) ;cond
+      )
+     (t
+      (setq end nil))
+     ) ;cond
+    end))
+
+;; TODO: prendre en compte jsx-depth
+(defun web-mode-tag-next-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-max)))
+  (cond
+   ((or (>= pos (point-max)) (>= pos limit)) nil)
+   (t
+    (when (get-text-property pos 'tag-beg) (setq pos (1+ pos)))
+    (setq pos (next-single-property-change pos 'tag-beg))
+    (if (and pos (<= pos limit)) pos nil))
+   ))
+
+;; TODO: prendre en compte jsx-depth
+(defun web-mode-tag-previous-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-min)))
+  (cond
+   ((or (<= pos (point-min)) (<= pos limit)) nil)
+   (t
+    (when (get-text-property pos 'tag-beg) (setq pos (1- pos)))
+    (web-mode-go (previous-single-property-change pos 'tag-beg) -1))
+   ))
+
+;; TODO: prendre en compte jsx-depth
+(defun web-mode-attribute-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((null (get-text-property pos 'tag-attr))
+    nil)
+   ((get-text-property pos 'tag-attr-beg)
+    pos)
+   (t
+    (setq pos (previous-single-property-change pos 'tag-attr-beg))
+    (setq pos (1- pos)))
+   ))
+
+;; TODO: retoucher en incluant un param limit et en s'inspirant de
+;;       web-mode-attribute-next-position
+(defun web-mode-attribute-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (let (end depth)
+    (setq depth (get-text-property pos 'jsx-depth))
+    (cond
+     ((null pos)
+      (setq end nil))
+     ((get-text-property pos 'tag-attr-end)
+      (setq end pos))
+     ((get-text-property pos 'tag-attr)
+      (setq end (next-single-property-change pos 'tag-attr-end))
+      (cond
+       ((not (get-text-property end 'tag-attr-end))
+        (setq end nil))
+       ((and depth
+             (eq depth (get-text-property end 'jsx-depth))
+             (not (eq depth (get-text-property end 'jsx-end))))
+        )
+       ((and depth (eq (1+ depth) (get-text-property end 'jsx-depth)))
+        )
+       ((and depth (not (eq (1+ depth) (get-text-property end 'jsx-depth))))
+        (let ((continue (< end (point-max))))
+          (while continue
+            (setq end (1+ end))
+            (setq end (next-single-property-change end 'tag-attr-end))
+            (cond
+             ((null end)
+              (setq continue nil))
+             ((not (get-text-property end 'tag-attr-end))
+              (setq continue nil
+                    end nil))
+             ((eq (1+ depth) (get-text-property end 'jsx-depth))
+              (setq continue nil))
+             ) ;cond
+            ) ;while
+          ) ;let
+        )
+       ) ;cond
+      )
+     (t
+      (setq end nil))
+     ) ;cond
+    end))
+
+(defun web-mode-attribute-next-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-max)))
+  (let (continue depth)
+    (when (get-text-property pos 'tag-attr-beg)
+      (setq pos (1+ pos)))
+    (if (< pos limit)
+        (setq continue t
+              depth (get-text-property pos 'jsx-depth))
+      (setq continue nil
+            pos nil))
+    (while continue
+      (setq pos (next-single-property-change pos 'tag-attr-beg))
+      (cond
+       ((null pos)
+        (setq continue nil))
+       ((>= pos limit)
+        (setq continue nil
+              pos nil))
+       ((null depth)
+        (setq continue nil))
+       ((eq depth (get-text-property pos 'jsx-depth))
+        (setq continue nil))
+       (t
+        (setq pos (1+ pos)
+              continue (< pos limit)))
+       )
+      ) ;while
+    pos))
+
+(defun web-mode-attribute-previous-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-min)))
+  (let (continue depth)
+    (when (get-text-property pos 'tag-attr-beg)
+      (setq pos (1- pos)))
+    (if (> pos limit)
+        (setq continue t
+              depth (get-text-property pos 'jsx-depth))
+      (setq continue nil
+            pos nil))
+    (while continue
+      (setq pos (previous-single-property-change pos 'tag-attr-beg))
+      (cond
+       ((null pos)
+        (setq continue nil))
+       ((< pos limit)
+        (setq continue nil
+              pos nil))
+       ((null depth)
+        (setq continue nil))
+       ((eq depth (get-text-property pos 'jsx-depth))
+        (setq continue nil))
+       (t
+        (setq pos (1- pos)
+              continue (> pos limit)))
+       ) ;cond
+      ) ;while
+    pos))
+
+;; TODO: prendre en compte jsx-depth
+(defun web-mode-element-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((null (get-text-property pos 'tag-type))
+    (setq pos (web-mode-element-parent-position)))
+   ((eq (get-text-property pos 'tag-type) 'end)
+    (setq pos (web-mode-tag-match-position pos))
+    (setq pos (if (get-text-property pos 'tag-beg) pos nil)))
+   ((member (get-text-property pos 'tag-type) '(start void))
+    (setq pos (web-mode-tag-beginning-position pos)))
+   (t
+    (setq pos nil))
+   ) ;cond
+  pos)
+
+;; TODO: prendre en compte jsx-depth
+(defun web-mode-element-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((null (get-text-property pos 'tag-type))
+    (setq pos (web-mode-element-parent-position pos))
+    (when pos
+      (setq pos (web-mode-tag-match-position pos))
+      (when pos (setq pos (web-mode-tag-end-position pos)))
+      )
+    )
+   ((member (get-text-property pos 'tag-type) '(end void))
+    (setq pos (web-mode-tag-end-position pos))
+    )
+   ((member (get-text-property pos 'tag-type) '(start))
+    (setq pos (web-mode-tag-match-position pos))
+    (when pos (setq pos (web-mode-tag-end-position pos))))
+   (t
+    (setq pos nil))
+   ) ;cond
+  pos)
+
+(defun web-mode-element-child-position (&optional pos)
+  (save-excursion
+    (let (child close)
+      (unless pos (setq pos (point)))
+      (goto-char pos)
+      (cond
+       ((eq (get-text-property pos 'tag-type) 'start)
+        (web-mode-tag-match)
+        (setq close (point))
+        (goto-char pos)
+        )
+       ((eq (get-text-property pos 'tag-type) 'void)
+        )
+       ((eq (get-text-property pos 'tag-type) 'end)
+        (web-mode-tag-beginning)
+        (setq close (point))
+        (web-mode-tag-match)
+        )
+       ((web-mode-element-parent-position pos)
+        (setq pos (point))
+        (web-mode-tag-match)
+        (setq close (point))
+        (goto-char pos)
+        )
+       ) ;cond
+      (when (and close
+                 (web-mode-element-next)
+                 (< (point) close))
+        (setq child (point))
+        )
+      child)))
+
+(defun web-mode-element-parent-position (&optional pos)
+  (let (n tag-type tag-name (continue t) (tags (make-hash-table :test 'equal)))
+    (save-excursion
+      (if pos (goto-char pos))
+      (while (and continue (web-mode-tag-previous))
+        (setq pos (point)
+              tag-type (get-text-property pos 'tag-type)
+              tag-name (get-text-property pos 'tag-name)
+              n (gethash tag-name tags 0))
+        (when (member tag-type '(end start))
+          (if (eq tag-type 'end)
+              (puthash tag-name (1- n) tags)
+            (puthash tag-name (1+ n) tags)
+            (when (= n 0) (setq continue nil))
+            ) ;if
+          ) ;when
+        ) ;while
+      ) ;save-excursion
+    (if (null continue) pos nil)))
+
+(defun web-mode-element-previous-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-min)))
+  (save-excursion
+    (goto-char pos)
+    (let ((continue (not (bobp)))
+          (props '(start void comment)))
+      (while continue
+        (setq pos (web-mode-tag-previous))
+        (cond
+         ((or (null pos) (< (point) limit))
+          (setq continue nil
+                pos nil))
+         ((member (get-text-property (point) 'tag-type) props)
+          (setq continue nil))
+         )
+        ) ;while
+      pos)))
+
+(defun web-mode-element-next-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-max)))
+  (save-excursion
+    (goto-char pos)
+    (let ((continue (not (eobp)))
+          (props '(start void comment)))
+      (while continue
+        (setq pos (web-mode-tag-next))
+        (cond
+         ((or (null pos) (> (point) limit))
+          (setq continue nil
+                pos nil))
+         ((member (get-text-property (point) 'tag-type) props)
+          (setq continue nil))
+         )
+        ) ;while
+;;      (message "pos=%S" pos)
+      pos)))
+
+(defun web-mode-part-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((member web-mode-content-type web-mode-part-content-types)
+    (setq pos (point-max)))
+   ((not (get-text-property pos 'part-side))
+    (setq pos nil))
+   ((= pos (point-max))
+    (setq pos nil))
+   ((not (get-text-property (1+ pos) 'part-side))
+    pos)
+   (t
+    (setq pos (next-single-property-change pos 'part-side)))
+   ) ;cond
+  pos)
+
+(defun web-mode-part-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((member web-mode-content-type web-mode-part-content-types)
+    (setq pos (point-min)))
+   ((not (get-text-property pos 'part-side))
+    (setq pos nil))
+   ((= pos (point-min))
+    (setq pos nil))
+   ((not (get-text-property (1- pos) 'part-side))
+    pos)
+   (t
+    (setq pos (previous-single-property-change pos 'part-side)))
+   ) ;cond
+  pos)
+
+(defun web-mode-part-next-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((and (= pos (point-min)) (get-text-property pos 'part-side))
+    )
+   ((not (get-text-property pos 'part-side))
+    (setq pos (next-single-property-change pos 'part-side)))
+   ((and (setq pos (web-mode-part-end-position pos)) (>= pos (point-max)))
+    (setq pos nil))
+   ((and (setq pos (1+ pos)) (not (get-text-property pos 'part-side)))
+    (setq pos (next-single-property-change pos 'part-side)))
+   ) ;cond
+  pos)
+
+(defun web-mode-block-match-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (save-excursion
+    (web-mode-block-match pos)
+    (if (= pos (point)) nil (point))))
+
+(defun web-mode-block-control-previous-position (type &optional pos)
+  (unless pos (setq pos (point)))
+  (let ((continue t) controls)
+    (while continue
+      (setq pos (web-mode-block-previous-position pos))
+      (cond
+       ((null pos)
+        (setq continue nil
+              pos nil))
+       ((and (setq controls (web-mode-block-controls-get pos))
+             (eq (car (car controls)) type))
+        (setq continue nil))
+       ) ;cond
+      ) ;while
+    pos))
+
+;; (defun web-mode-block-opening-paren-position2 (pos limit)
+;;   (save-excursion
+;;     (when (> limit pos)
+;;       (message "block-opening-paren-position: limit(%S) > pos(%S)" limit pos))
+;;     (goto-char pos)
+;;     (let (c
+;;           n
+;;           pt
+;;           (continue (> pos limit))
+;;           (pairs '((")" . "(")
+;;                    ("]" . "[")
+;;                    ("}" . "{")))
+;;           (h (make-hash-table :test 'equal))
+;;           (regexp "[\]\[)(}{]"))
+;;       (while (and continue (re-search-backward regexp limit t))
+;;         (cond
+;;          ((web-mode-is-comment-or-string)
+;;           )
+;;          (t
+;;           (setq c (string (char-after)))
+;;           (cond
+;;            ((member c '("(" "{" "["))
+;;             (setq n (gethash c h 0))
+;;             (if (= n 0)
+;;                 (setq continue nil
+;;                       pt (point))
+;;               (puthash c (1+ n) h)
+;;               ))
+;;            (t
+;;             (setq c (cdr (assoc c pairs)))
+;;             (setq n (gethash c h 0))
+;;             (puthash c (1- n) h))
+;;            ) ;cond
+;;           ) ;t
+;;          ) ;cond
+;;         ) ;while
+;;       pt)))
+
+(defun web-mode-block-opening-paren-position (pos limit)
+  (save-excursion
+    (when (> limit pos)
+      (message "block-opening-paren-position: limit(%S) > pos(%S)" limit pos))
+    (goto-char pos)
+    (let (c
+          n
+          pt
+          (continue (> pos limit))
+          (pairs '((?\) . ?\()
+                   (?\] . ?\[)
+                   (?\} . ?\{)))
+          (h (make-hash-table :test 'equal))
+          (regexp "[\]\[)(}{]"))
+      (while (and continue (re-search-backward regexp limit t))
+        (cond
+         ((web-mode-is-comment-or-string)
+          )
+         (t
+          (setq c (char-after))
+          (cond
+           ((member c '(?\( ?\{ ?\[))
+            (setq n (gethash c h 0))
+            (if (= n 0)
+                (setq continue nil
+                      pt (point))
+              (puthash c (1+ n) h)
+              ))
+           (t
+            (setq c (cdr (assoc c pairs)))
+            (setq n (gethash c h 0))
+            (puthash c (1- n) h))
+           ) ;cond
+          ) ;t
+         ) ;cond
+        ) ;while
+      pt)))
+
+(defun web-mode-block-code-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (when (and (setq pos (web-mode-block-beginning-position pos))
+             (eq (get-text-property pos 'block-token) 'delimiter-beg))
+    (setq pos (next-single-property-change pos 'block-token)))
+  pos)
+
+(defun web-mode-block-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((or (and (get-text-property pos 'block-side) (= pos (point-min)))
+        (get-text-property pos 'block-beg))
+    )
+   ((and (> pos (point-min)) (get-text-property (1- pos) 'block-beg))
+    (setq pos (1- pos)))
+   ((get-text-property pos 'block-side)
+    (setq pos (previous-single-property-change pos 'block-beg))
+    (setq pos (if (and pos (> pos (point-min))) (1- pos) (point-min))))
+   (t
+    (setq pos nil))
+   ) ;cond
+  pos)
+
+(defun web-mode-block-string-beginning-position (pos &optional block-beg)
+  (unless pos (setq pos (point)))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (let (char (ori pos) (continue (not (null pos))))
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((< pos block-beg)
+        (setq continue nil
+              pos block-beg))
+       ((and (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos))
+        )
+       ((member char '(?\) ?\]))
+        (setq pos (web-mode-block-opening-paren-position pos block-beg))
+        (setq pos (1- pos))
+        )
+       ((and (> ori pos) (member char '(?\( ?\= ?\[ ?\? ?\: ?\; ?\, ?\`)))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0))))
+        )
+       ((web-mode-looking-back "\\_<\\(return\\|echo\\|include\\|print\\)[ \n\t]*" pos)
+        (setq continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    ;;(message "pos=%S" pos)
+    pos))
+
+(defun web-mode-block-statement-beginning-position (pos &optional block-beg)
+  (unless pos (setq pos (point)))
+  (setq pos (1- pos))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (let (char (continue (not (null pos))))
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((< pos block-beg)
+        (setq continue nil
+              pos block-beg))
+       ((and (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((member char '(?\) ?\] ?\}))
+        (setq pos (web-mode-block-opening-paren-position pos block-beg))
+        (setq pos (1- pos)))
+       ((member char '(?\( ?\[ ?\{ ?\=))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       ((web-mode-looking-back "\\_<\\(return\\|echo\\|include\\|print\\)[ \n\t]*" pos)
+        (setq continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    pos))
+
+(defun web-mode-block-args-beginning-position (pos &optional block-beg)
+  (unless pos (setq pos (point)))
+  (setq pos (1- pos)) ; #512
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (let (char (continue (not (null pos))))
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((< pos block-beg)
+        (message "block-args-beginning-position ** failure **")
+        (setq continue nil
+              pos block-beg))
+       ((and (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((member char '(?\) ?\] ?\}))
+        (setq pos (web-mode-block-opening-paren-position pos block-beg))
+        (setq pos (1- pos)))
+       ((member char '(?\( ?\[ ?\{))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       ((and (string= web-mode-engine "php")
+             (web-mode-looking-back "\\_<\\(extends\\|implements\\)[ \n\t]*" pos))
+        (setq continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    pos))
+
+(defun web-mode-block-calls-beginning-position (pos &optional block-beg)
+  (unless pos (setq pos (point)))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (let (char (continue (not (null pos))))
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((< pos block-beg)
+        (message "block-calls-beginning-position ** failure **")
+        (setq continue nil
+              pos block-beg))
+       ((and (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((member char '(?\) ?\]))
+        (setq pos (web-mode-block-opening-paren-position pos block-beg))
+        (setq pos (1- pos)))
+       ((member char '(?\( ?\[ ?\{ ?\} ?\= ?\? ?\: ?\; ?\,))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       ((web-mode-looking-back "\\(return\\|else\\)[ \n\t]*" pos)
+        (setq ;;pos (point)
+              continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    pos))
+
+(defun web-mode-javascript-string-beginning-position (pos &optional reg-beg)
+  (unless pos (setq pos (point)))
+  (let ((char nil)
+        (blockside (get-text-property pos 'block-side))
+        (i 0)
+        (continue (not (null pos))))
+    (unless reg-beg
+      (if blockside
+          (setq reg-beg (web-mode-block-beginning-position pos))
+        (setq reg-beg (web-mode-part-beginning-position pos)))
+      )
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((> (setq i (1+ i)) 20000)
+        (message "javascript-string-beginning-position ** warning (%S) **" pos)
+        (setq continue nil
+              pos nil))
+       ((null pos)
+        (message "javascript-string-beginning-position ** invalid pos **")
+        (setq continue nil))
+       ((< pos reg-beg)
+        (message "javascript-string-beginning-position ** failure **")
+        (setq continue nil
+              pos reg-beg))
+       ((and blockside
+             (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((and (not blockside)
+             (member (get-text-property pos 'part-token) '(string comment))
+             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
+        (setq pos (web-mode-part-token-beginning-position pos)))
+       ((and (not blockside)
+             (get-text-property pos 'block-side))
+        (when (setq pos (web-mode-block-beginning-position pos))
+          (setq pos (1- pos))))
+       ((member char '(?\) ?\] ?\}))
+        (setq pos (web-mode-part-opening-paren-position pos reg-beg))
+        (setq pos (1- pos)))
+       ((member char '(?\( ?\{ ?\[ ?\= ?\? ?\: ?\; ?\, ?\& ?\|))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       ((web-mode-looking-back "\\(return\\)[ \n\t]*" pos)
+        (setq continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    ;;(message "js-statement-beg:%S" pos)
+    pos))
+
+;; TODO: reg-beg : jsx-beg
+;; TODO: skipper les expr dont la depth est superieure
+
+;; NOTE: blockside is useful for ejs
+(defun web-mode-javascript-statement-beginning-position (pos &optional reg-beg)
+  (unless pos (setq pos (point)))
+  (setq pos (1- pos))
+  (let ((char nil)
+        (blockside (get-text-property pos 'block-side))
+        (i 0)
+        (is-jsx (string= web-mode-content-type "jsx"))
+        (depth-o nil) (depth-l nil)
+        (continue (not (null pos))))
+    (setq depth-o (get-text-property pos 'jsx-depth))
+    (unless reg-beg
+      (cond
+       (blockside
+        (setq reg-beg (web-mode-block-beginning-position pos)))
+       (is-jsx
+        (setq reg-beg (web-mode-jsx-depth-beginning-position pos)))
+       (t
+        (setq reg-beg (web-mode-part-beginning-position pos)))
+       ) ;cond
+      ) ;unless
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((> (setq i (1+ i)) 20000)
+        (message "javascript-statement-beginning-position ** warning (%S) **" pos)
+        (setq continue nil
+              pos nil))
+       ((null pos)
+        (message "javascript-statement-beginning-position ** invalid pos **")
+        (setq continue nil))
+       ((< pos reg-beg)
+        (when (not is-jsx)
+          (message "javascript-statement-beginning-position ** failure **"))
+        (setq continue nil
+              pos reg-beg))
+       ((and is-jsx
+             (progn (setq depth-l (get-text-property pos 'jsx-depth)))
+             (not (eq depth-l depth-o)))
+        ;;(message "%S > depth-o(%S) depth-l(%S)" pos depth-o depth-l)
+        (setq pos (previous-single-property-change pos 'jsx-depth))
+        (setq pos (1- pos))
+        ;;(message "--> %S %S" pos (get-text-property pos 'jsx-depth))
+        )
+       ((and blockside
+             (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((and (not blockside)
+             (member (get-text-property pos 'part-token) '(string comment))
+             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
+        (setq pos (web-mode-part-token-beginning-position pos)))
+       ((and (not blockside)
+             (get-text-property pos 'block-side))
+        (when (setq pos (web-mode-block-beginning-position pos))
+          (setq pos (1- pos))))
+       ((member char '(?\) ?\] ?\}))
+        (setq pos (web-mode-part-opening-paren-position pos reg-beg))
+        (setq pos (1- pos)))
+       ((and (eq char ?\=)
+             (web-mode-looking-back "[<>!=]+" pos reg-beg t))
+        (setq pos (- pos 1 (length (match-string-no-properties 0))))
+        ;;(setq pos (1- pos))
+        ;;(message "%S pos=%S" (match-string-no-properties 0) pos)
+        )
+       ((member char '(?\( ?\{ ?\[ ?\=))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       ((web-mode-looking-back "\\_<\\(return\\)[ \n\t]*" pos)
+        (setq continue nil)
+        (web-mode-looking-at "[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    ;;(message "%S -------" pos)
+    pos))
+
+(defun web-mode-javascript-args-beginning-position (pos &optional reg-beg)
+  (unless pos (setq pos (point)))
+  (setq pos (1- pos))
+  (let ((char nil)
+        (blockside (get-text-property pos 'block-side))
+        (i 0)
+        (continue (not (null pos))))
+    (unless reg-beg
+      (if blockside
+          (setq reg-beg (web-mode-block-beginning-position pos))
+        (setq reg-beg (web-mode-part-beginning-position pos)))
+      )
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((> (setq i (1+ i)) 20000)
+        (message "javascript-args-beginning-position ** warning (%S) **" pos)
+        (setq continue nil
+              pos nil))
+       ((null pos)
+        (message "javascript-args-beginning-position ** invalid pos **")
+        (setq continue nil))
+       ((< pos reg-beg)
+        (message "javascript-args-beginning-position ** failure **")
+        (setq continue nil
+              pos reg-beg))
+       ((and blockside
+             (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((and (not blockside)
+             (member (get-text-property pos 'part-token) '(string comment))
+             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
+        (setq pos (web-mode-part-token-beginning-position pos)))
+       ((and (not blockside)
+             (get-text-property pos 'block-side))
+        (when (setq pos (web-mode-block-beginning-position pos))
+          (setq pos (1- pos)))
+        )
+       ((member char '(?\) ?\] ?\}))
+        (when (setq pos (web-mode-part-opening-paren-position pos reg-beg))
+          (setq pos (1- pos))))
+       ((member char '(?\( ?\[ ?\{))
+;;        (web-mode-looking-at ".[ \t\n]*" pos)
+        (web-mode-looking-at ".[ ]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))
+              continue nil)
+;;        (message "=>%S" pos)
+        )
+       ((web-mode-looking-back "\\_<\\(var\\|let\\|return\\|const\\)[ \n\t]+" pos)
+;;        (web-mode-looking-at "[ \t\n]*" pos)
+        (web-mode-looking-at "[ \t]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))
+              continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    ;;(message "=%S" pos)
+    pos))
+
+(defun web-mode-javascript-calls-beginning-position (pos &optional reg-beg)
+  (unless pos (setq pos (point)))
+  (let ((char nil)
+        (blockside (get-text-property pos 'block-side))
+        (i 0)
+        (continue (not (null pos))))
+    (unless reg-beg
+      (if blockside
+          (setq reg-beg (web-mode-block-beginning-position pos))
+        (setq reg-beg (web-mode-part-beginning-position pos)))
+      )
+    (while continue
+      (setq char (char-after pos))
+      (cond
+       ((> (setq i (1+ i)) 20000)
+        (message "javascript-calls-beginning-position ** warning (%S) **" pos)
+        (setq continue nil
+              pos nil))
+       ((null pos)
+        (message "javascript-calls-beginning-position ** invalid pos **")
+        (setq continue nil))
+       ((< pos reg-beg)
+        ;;(message "pos(%S) reg-beg(%S)" pos reg-beg)
+        ;;(message "javascript-calls-beginning-position ** failure **")
+        (setq continue nil
+              pos reg-beg))
+       ((and blockside
+             (member (get-text-property pos 'block-token) '(string comment))
+             (eq (get-text-property pos 'block-token) (get-text-property (1- pos) 'block-token)))
+        (setq pos (web-mode-block-token-beginning-position pos)))
+       ((and (not blockside)
+             (member (get-text-property pos 'part-token) '(string comment))
+             (eq (get-text-property pos 'part-token) (get-text-property (1- pos) 'part-token)))
+        (setq pos (web-mode-part-token-beginning-position pos)))
+       ((and (not blockside)
+             (get-text-property pos 'block-side))
+        (when (setq pos (web-mode-block-beginning-position pos))
+          (setq pos (1- pos))))
+       ((member char '(?\) ?\] ?\}))
+        (when (setq pos (web-mode-part-opening-paren-position pos reg-beg))
+          (setq pos (1- pos))))
+       ((member char '(?\( ?\{ ?\[ ?\= ?\? ?\: ?\; ?\, ?\& ?\|))
+        (setq continue nil)
+        (web-mode-looking-at ".[ \t\n]*" pos)
+        (setq pos (+ pos (length (match-string-no-properties 0)))))
+       ((web-mode-looking-back "\\_<\\(return\\|else\\)[ \n\t]*" pos)
+        (setq continue nil))
+       (t
+        (setq pos (1- pos)))
+       ) ;cond
+      ) ;while
+    pos))
+
+(defun web-mode-part-token-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((not (get-text-property pos 'part-token))
+    nil)
+   ((or (= pos (point-min))
+        (and (> pos (point-min))
+             (not (get-text-property (1- pos) 'part-token))))
+    pos)
+   (t
+    (setq pos (previous-single-property-change pos 'part-token))
+    (if (and pos (> pos (point-min))) pos (point-min)))
+   ))
+
+(defun web-mode-part-token-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((not (get-text-property pos 'part-token))
+    nil)
+   ((or (= pos (point-max))
+        (not (get-text-property (1+ pos) 'part-token)))
+    pos)
+   (t
+    (1- (next-single-property-change pos 'part-token)))
+   ))
+
+(defun web-mode-block-token-beginning-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((not (get-text-property pos 'block-token))
+    nil)
+   ((or (= pos (point-min))
+        (and (> pos (point-min))
+             (not (get-text-property (1- pos) 'block-token))))
+    pos)
+   (t
+    (setq pos (previous-single-property-change pos 'block-token))
+    (if (and pos (> pos (point-min))) pos (point-min)))
+   ))
+
+(defun web-mode-block-token-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((not (get-text-property pos 'block-token))
+    nil)
+   ((or (= pos (point-max))
+        (not (get-text-property (1+ pos) 'block-token)))
+    pos)
+   (t
+    (1- (next-single-property-change pos 'block-token)))
+   ))
+
+(defun web-mode-block-code-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (setq pos (web-mode-block-end-position pos))
+  (cond
+   ((not pos)
+    nil)
+   ((and (eq (get-text-property pos 'block-token) 'delimiter-end)
+         (eq (get-text-property (1- pos) 'block-token) 'delimiter-end))
+    (previous-single-property-change pos 'block-token))
+   ((= pos (1- (point-max))) ;; TODO: comparer plutot avec line-end-position
+    (point-max))
+   (t
+    pos)
+   ))
+
+(defun web-mode-block-end-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((get-text-property pos 'block-end)
+    pos)
+   ((get-text-property pos 'block-side)
+    (or (next-single-property-change pos 'block-end)
+        (point-max)))
+   (t
+    nil)
+   ))
+
+(defun web-mode-block-previous-position (&optional pos)
+  (unless pos (setq pos (point)))
+  (cond
+   ((= pos (point-min))
+    (setq pos nil))
+   ((get-text-property pos 'block-side)
+    (setq pos (web-mode-block-beginning-position pos))
+    (cond
+     ((or (null pos) (= pos (point-min)))
+      (setq pos nil)
+      )
+     ((and (setq pos (previous-single-property-change pos 'block-beg))
+           (> pos (point-min)))
+      (setq pos (1- pos))
+      )
+     )
+    ) ;block-side
+   ((get-text-property (1- pos) 'block-side)
+    (setq pos (web-mode-block-beginning-position (1- pos)))
+    )
+   (t
+    (setq pos (previous-single-property-change pos 'block-side))
+    (cond
+     ((and (null pos) (get-text-property (point-min) 'block-beg))
+      (setq pos (point-min)))
+     ((and pos (> pos (point-min)))
+      (setq pos (web-mode-block-beginning-position (1- pos))))
+     )
+    )
+   ) ;conf
+  pos)
+
+(defun web-mode-block-next-position (&optional pos limit)
+  (unless pos (setq pos (point)))
+  (unless limit (setq limit (point-max)))
+  (cond
+   ((and (get-text-property pos 'block-side)
+         (setq pos (web-mode-block-end-position pos))
+         (< pos (point-max))
+         (setq pos (1+ pos)))
+    (unless (get-text-property pos 'block-beg)
+      (setq pos (next-single-property-change pos 'block-side)))
+    )
+   (t
+    (setq pos (next-single-property-change pos 'block-side)))
+   ) ;cond
+  (if (and pos (<= pos limit)) pos nil))
+
+;;---- EXCURSION ---------------------------------------------------------------
+
+(defun web-mode-backward-sexp (n)
+  (interactive "p")
+  (if (< n 0) (web-mode-forward-sexp (- n))
+    (let (pos)
+      (dotimes (_ n)
+        (skip-chars-backward "[:space:]")
+        (setq pos (point))
+        (cond
+         ((bobp) nil)
+         ((get-text-property (1- pos) 'block-end)
+          (backward-char 1)
+          (web-mode-block-beginning))
+         ((get-text-property (1- pos) 'block-token)
+          (backward-char 1)
+          (web-mode-block-token-beginning))
+         ((get-text-property (1- pos) 'part-token)
+          (backward-char 1)
+          (web-mode-part-token-beginning))
+         ((get-text-property (1- pos) 'tag-end)
+          (backward-char 1)
+          (web-mode-element-beginning))
+         ((get-text-property (1- pos) 'tag-attr)
+          (backward-char 1)
+          (web-mode-attribute-beginning))
+         ((get-text-property (1- pos) 'tag-type)
+          (backward-char 1)
+          (web-mode-tag-beginning))
+         (t
+          (let ((forward-sexp-function nil))
+            (backward-sexp))
+          ) ;case t
+         ) ;cond
+        ) ;dotimes
+      ))) ;let if defun
+
+(defun web-mode-forward-sexp (n)
+  (interactive "p")
+  (if (< n 0) (web-mode-backward-sexp (- n))
+    (let (pos)
+      (dotimes (_ n)
+        (skip-chars-forward "[:space:]")
+        (setq pos (point))
+        (cond
+         ((eobp) nil)
+         ((get-text-property pos 'block-beg)
+          (web-mode-block-end))
+         ((get-text-property pos 'block-token)
+          (web-mode-block-token-end))
+         ((get-text-property pos 'part-token)
+          (web-mode-part-token-end))
+         ((get-text-property pos 'tag-beg)
+          (web-mode-element-end))
+         ((get-text-property pos 'tag-attr)
+          (web-mode-attribute-end))
+         ((get-text-property pos 'tag-type)
+          (web-mode-tag-end))
+         (t
+          (let ((forward-sexp-function nil))
+            (forward-sexp))
+          ) ;case t
+         ) ;cond
+        ) ;dotimes
+      ))) ;let if defun
+
+(defun web-mode-comment-beginning ()
+  "Fetch current comment beg."
+  (interactive)
+  (web-mode-go (web-mode-comment-beginning-position (point))))
+
+(defun web-mode-comment-end ()
+  "Fetch current comment end."
+  (interactive)
+  (web-mode-go (web-mode-comment-end-position (point)) 1))
+
+(defun web-mode-tag-beginning ()
+  "Fetch current html tag beg."
+  (interactive)
+  (web-mode-go (web-mode-tag-beginning-position (point))))
+
+(defun web-mode-tag-end ()
+  "Fetch current html tag end."
+  (interactive)
+  (web-mode-go (web-mode-tag-end-position (point)) 1))
+
+(defun web-mode-tag-previous ()
+  "Fetch previous tag."
+  (interactive)
+  (web-mode-go (web-mode-tag-previous-position (point))))
+
+(defun web-mode-tag-next ()
+  "Fetch next tag. Might be html comment or server tag (e.g. jsp)."
+  (interactive)
+  (web-mode-go (web-mode-tag-next-position (point))))
+
+(defun web-mode-attribute-beginning ()
+  "Fetch html attribute beginning."
+  (interactive)
+  (web-mode-go (web-mode-attribute-beginning-position (point))))
+
+(defun web-mode-attribute-end ()
+  "Fetch html attribute end."
+  (interactive)
+  (web-mode-go (web-mode-attribute-end-position (point)) 1))
+
+(defun web-mode-attribute-next (&optional arg)
+  "Fetch next attribute."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (cond
+   ((= arg 1) (web-mode-go (web-mode-attribute-next-position (point))))
+   ((< arg 1) (web-mode-element-previous (* arg -1)))
+   (t
+    (while (>= arg 1)
+      (setq arg (1- arg))
+      (web-mode-go (web-mode-attribute-next-position (point)))
+      )
+    )
+   )
+  )
+
+(defun web-mode-attribute-previous (&optional arg)
+  "Fetch previous attribute."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (unless arg (setq arg 1))
+  (cond
+   ((= arg 1) (web-mode-go (web-mode-attribute-previous-position (point))))
+   ((< arg 1) (web-mode-element-next (* arg -1)))
+   (t
+    (while (>= arg 1)
+      (setq arg (1- arg))
+      (web-mode-go (web-mode-attribute-previous-position (point)))
+      )
+    )
+   )
+  )
+
+(defun web-mode-element-previous (&optional arg)
+  "Fetch previous element."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (cond
+   ((= arg 1) (web-mode-go (web-mode-element-previous-position (point))))
+   ((< arg 1) (web-mode-element-next (* arg -1)))
+   (t
+    (while (>= arg 1)
+      (setq arg (1- arg))
+      (web-mode-go (web-mode-element-previous-position (point)))
+      ) ;while
+    ) ;t
+   ) ;cond
+  )
+
+(defun web-mode-element-next (&optional arg)
+  "Fetch next element."
+  (interactive "p")
+  (unless arg (setq arg 1))
+  (cond
+   ((= arg 1) (web-mode-go (web-mode-element-next-position (point))))
+   ((< arg 1) (web-mode-element-previous (* arg -1)))
+   (t
+    (while (>= arg 1)
+      (setq arg (1- arg))
+      (web-mode-go (web-mode-element-next-position (point)))
+      ) ;while
+    ) ;t
+   ) ;cond
+  )
+
+(defun web-mode-element-sibling-next ()
+  "Fetch next sibling element."
+  (interactive)
+  (let ((pos (point)))
+    (save-excursion
+      (cond
+       ((not (get-text-property pos 'tag-type))
+        (if (and (web-mode-element-parent)
+                 (web-mode-tag-match)
+                 (web-mode-element-next))
+            (setq pos (point))
+          (setq pos nil))
+        )
+       ((eq (get-text-property pos 'tag-type) 'start)
+        (if (and (web-mode-tag-match)
+                 (web-mode-element-next))
+            (setq pos (point))
+          (setq pos nil))
+        )
+       ((web-mode-element-next)
+        (setq pos (point)))
+       (t
+        (setq pos nil))
+       ) ;cond
+      ) ;save-excursion
+    (web-mode-go pos)))
+
+(defun web-mode-element-sibling-previous ()
+  "Fetch previous sibling element."
+  (interactive)
+  (let ((pos (point)))
+    (save-excursion
+      (cond
+       ((not (get-text-property pos 'tag-type))
+        (if (and (web-mode-element-parent)
+                 (web-mode-tag-previous)
+                 (web-mode-element-beginning))
+            (setq pos (point))
+          (setq pos nil))
+        )
+       ((eq (get-text-property pos 'tag-type) 'start)
+        (if (and (web-mode-tag-beginning)
+                 (web-mode-tag-previous)
+                 (web-mode-element-beginning))
+            (setq pos (point))
+          (setq pos nil))
+        )
+       ((and (web-mode-element-beginning)
+             (web-mode-tag-previous)
+             (web-mode-element-beginning))
+        (setq pos (point)))
+       (t
+        (setq pos nil))
+       ) ;cond
+      ) ;save-excursion
+    (web-mode-go pos)))
+
+(defun web-mode-element-beginning ()
+  "Move to beginning of element."
+  (interactive)
+  (web-mode-go (web-mode-element-beginning-position (point))))
+
+(defun web-mode-element-end ()
+  "Move to end of element."
+  (interactive)
+  (web-mode-go (web-mode-element-end-position (point)) 1))
+
+(defun web-mode-element-parent ()
+  "Fetch parent element."
+  (interactive)
+  (web-mode-go (web-mode-element-parent-position (point))))
+
+(defun web-mode-element-child ()
+  "Fetch child element."
+  (interactive)
+  (web-mode-go (web-mode-element-child-position (point))))
+
+(defun web-mode-dom-traverse ()
+  "Traverse html dom tree."
+  (interactive)
+  (cond
+   ((web-mode-element-child)
+    )
+   ((web-mode-element-sibling-next)
+    )
+   ((and (web-mode-element-parent)
+         (not (web-mode-element-sibling-next)))
+    (goto-char (point-min)))
+   (t
+    (goto-char (point-min)))
+   ) ;cond
+  )
+
+(defun web-mode-closing-paren (limit)
+  (let ((pos (web-mode-closing-paren-position (point) limit)))
+    (if (or (null pos) (> pos limit))
+        nil
+      (goto-char pos)
+      pos)
+    ))
+
+(defun web-mode-part-next ()
+  "Move point to the beginning of the next part."
+  (interactive)
+  (web-mode-go (web-mode-part-next-position (point))))
+
+(defun web-mode-part-beginning ()
+  "Move point to the beginning of the current part."
+  (interactive)
+  (web-mode-go (web-mode-part-beginning-position (point))))
+
+(defun web-mode-part-end ()
+  "Move point to the end of the current part."
+  (interactive)
+  (web-mode-go (web-mode-part-end-position (point)) 1))
+
+(defun web-mode-block-previous ()
+  "Move point to the beginning of the previous block."
+  (interactive)
+  (web-mode-go (web-mode-block-previous-position (point))))
+
+(defun web-mode-block-next ()
+  "Move point to the beginning of the next block."
+  (interactive)
+  (web-mode-go (web-mode-block-next-position (point))))
+
+(defun web-mode-block-beginning ()
+  "Move point to the beginning of the current block."
+  (interactive)
+  (web-mode-go (web-mode-block-beginning-position (point))))
+
+(defun web-mode-block-end ()
+  "Move point to the end of the current block."
+  (interactive)
+  (web-mode-go (web-mode-block-end-position (point)) 1))
+
+(defun web-mode-block-token-beginning ()
+  (web-mode-go (web-mode-block-token-beginning-position (point))))
+
+(defun web-mode-block-token-end ()
+  (web-mode-go (web-mode-block-token-end-position (point)) 1))
+
+(defun web-mode-part-token-beginning ()
+  (web-mode-go (web-mode-part-token-beginning-position (point))))
+
+(defun web-mode-part-token-end ()
+  (web-mode-go (web-mode-part-token-end-position (point)) 1))
+
+(defun web-mode-block-opening-paren (limit)
+  (web-mode-go (web-mode-block-opening-paren-position (point) limit)))
+
+(defun web-mode-block-string-beginning (&optional pos block-beg)
+  (unless pos (setq pos (point)))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (web-mode-go (web-mode-block-string-beginning-position pos block-beg)))
+
+(defun web-mode-block-statement-beginning (&optional pos block-beg)
+  (unless pos (setq pos (point)))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (web-mode-go (web-mode-block-statement-beginning-position pos block-beg)))
+
+(defun web-mode-block-args-beginning (&optional pos block-beg)
+  (unless pos (setq pos (point)))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (web-mode-go (web-mode-block-args-beginning-position pos block-beg)))
+
+(defun web-mode-block-calls-beginning (&optional pos block-beg)
+  (unless pos (setq pos (point)))
+  (unless block-beg (setq block-beg (web-mode-block-beginning-position pos)))
+  (web-mode-go (web-mode-block-calls-beginning-position pos block-beg)))
+
+(defun web-mode-javascript-string-beginning (&optional pos reg-beg)
+  (unless pos (setq pos (point)))
+  (unless reg-beg
+    (if (get-text-property pos 'block-side)
+        (setq reg-beg (web-mode-block-beginning-position pos))
+      (setq reg-beg (web-mode-part-beginning-position pos))))
+  (web-mode-go (web-mode-javascript-string-beginning-position pos reg-beg)))
+
+(defun web-mode-javascript-statement-beginning (&optional pos reg-beg)
+  (unless pos (setq pos (point)))
+  (unless reg-beg
+    (if (get-text-property pos 'block-side)
+        (setq reg-beg (web-mode-block-beginning-position pos))
+      (setq reg-beg (web-mode-part-beginning-position pos))))
+  (web-mode-go (web-mode-javascript-statement-beginning-position pos reg-beg)))
+
+(defun web-mode-javascript-args-beginning (&optional pos reg-beg)
+  (unless pos (setq pos (point)))
+  (unless reg-beg
+    (if (get-text-property pos 'block-side)
+        (setq reg-beg (web-mode-block-beginning-position pos))
+      (setq reg-beg (web-mode-part-beginning-position pos))))
+  (web-mode-go (web-mode-javascript-args-beginning-position pos reg-beg)))
+
+(defun web-mode-javascript-calls-beginning (&optional pos reg-beg)
+  (unless pos (setq pos (point)))
+  (unless reg-beg
+    (if (get-text-property pos 'block-side)
+        (setq reg-beg (web-mode-block-beginning-position pos))
+      (setq reg-beg (web-mode-part-beginning-position pos))))
+  (web-mode-go (web-mode-javascript-calls-beginning-position pos reg-beg)))
+
+(defun web-mode-go (pos &optional offset)
+  (unless offset (setq offset 0))
+  (when pos
+    (cond
+     ((and (> offset 0) (<= (+ pos offset) (point-max)))
+      (setq pos (+ pos offset)))
+     ((and (< offset 0) (>= (+ pos offset) (point-min)))
+      (setq pos (+ pos offset)))
+     ) ;cond
+    (goto-char pos))
+  pos)
+
+;;---- SEARCH ------------------------------------------------------------------
+
+(defun web-mode-rsf-balanced (regexp-open regexp-close &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t)
+        (level 1)
+        (pos (point))
+        ret
+        (regexp (concat regexp-open "\\|" regexp-close)))
+    (while continue
+      (setq ret (re-search-forward regexp limit noerror))
+      (cond
+       ((null ret)
+        (setq continue nil)
+        )
+       (t
+        (if (string-match-p regexp-open (match-string-no-properties 0))
+            (setq level (1+ level))
+          (setq level (1- level)))
+        (when (< level 1)
+          (setq continue nil)
+          )
+        ) ;t
+       ) ;cond
+      ) ;while
+    (when (not (= level 0)) (goto-char pos))
+    ret))
+
+(defun web-mode-block-sb (expr &optional limit noerror)
+  (unless limit (setq limit (web-mode-block-beginning-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-backward expr limit noerror))
+      (when (or (null ret)
+                (not (get-text-property (point) 'block-token)))
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-block-sf (expr &optional limit noerror)
+  (unless limit (setq limit (web-mode-block-end-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-forward expr limit noerror))
+      (when (or (null ret)
+                (not (get-text-property (point) 'block-token)))
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-block-rsb (regexp &optional limit noerror)
+  (unless limit (setq limit (web-mode-block-beginning-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-backward regexp limit noerror))
+      (when (or (null ret)
+                (not (get-text-property (point) 'block-token)))
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-block-rsf (regexp &optional limit noerror)
+  (unless limit (setq limit (web-mode-block-end-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-forward regexp limit noerror))
+      (when (or (null ret)
+                (not (get-text-property (point) 'block-token)))
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-part-sb (expr &optional limit noerror)
+  (unless limit (setq limit (web-mode-part-beginning-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-backward expr limit noerror))
+      (when (or (null ret)
+                (and (not (get-text-property (point) 'part-token))
+                     (not (get-text-property (point) 'block-side)))
+                )
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-part-sf (expr &optional limit noerror)
+  (unless limit (setq limit (web-mode-part-end-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-forward expr limit noerror))
+      (when (or (null ret)
+                (and (not (get-text-property (point) 'part-token))
+                     (not (get-text-property (point) 'block-side)))
+                )
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-part-rsb (regexp &optional limit noerror)
+  (unless limit (setq limit (web-mode-part-beginning-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-backward regexp limit noerror))
+      (when (or (null ret)
+                (and (not (get-text-property (point) 'part-token))
+                     (not (get-text-property (point) 'block-side)))
+                )
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-part-rsf (regexp &optional limit noerror)
+  (unless limit (setq limit (web-mode-part-end-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-forward regexp limit t))
+      (when (or (null ret)
+                (and (not (get-text-property (point) 'part-token))
+                     (not (get-text-property (point) 'block-side)))
+                )
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-javascript-rsb (regexp &optional limit noerror)
+  (unless limit (setq limit (web-mode-part-beginning-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-backward regexp limit noerror))
+      (when (or (null ret)
+                (and (not (get-text-property (point) 'part-token))
+                     (not (get-text-property (point) 'block-side))
+                     (not (get-text-property (point) 'jsx-depth)))
+                )
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-javascript-rsf (regexp &optional limit noerror)
+  (unless limit (setq limit (web-mode-part-end-position (point))))
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-forward regexp limit t))
+      (when (or (null ret)
+                (and (not (get-text-property (point) 'part-token))
+                     (not (get-text-property (point) 'block-side))
+                     (not (get-text-property (point) 'jsx-depth)))
+                )
+        (setq continue nil)
+        ) ;when
+      ) ;while
+    ret))
+
+(defun web-mode-dom-sf (expr &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-forward expr limit noerror))
+      (if (or (null ret)
+              (not (get-text-property (- (point) (length expr)) 'block-side)))
+          (setq continue nil))
+      )
+    ret))
+
+(defun web-mode-dom-rsf (regexp &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) (ret nil))
+    (while continue
+      (setq ret (re-search-forward regexp limit noerror))
+      ;;      (message "ret=%S point=%S limit=%S i=%S" ret (point) limit 0)
+      (cond
+       ((null ret)
+        (setq continue nil))
+       ((or (get-text-property (match-beginning 0) 'block-side)
+            (get-text-property (match-beginning 0) 'part-token))
+        )
+       (t
+        (setq continue nil))
+       ) ;cond
+      ) ;while
+    ret))
+
+(defun web-mode-rsb (regexp &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-backward regexp limit noerror))
+      (if (or (null ret)
+              (not (web-mode-is-comment-or-string)))
+          (setq continue nil)))
+    ret))
+
+(defun web-mode-rsf (regexp &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (re-search-forward regexp limit noerror))
+      (if (or (null ret)
+              (not (web-mode-is-comment-or-string)))
+          (setq continue nil))
+      )
+    ret))
+
+(defun web-mode-sb (expr &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-backward expr limit noerror))
+      (if (or (null ret)
+              (not (web-mode-is-comment-or-string)))
+          (setq continue nil)))
+    ret))
+
+(defun web-mode-sf (expr &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret)
+    (while continue
+      (setq ret (search-forward expr limit noerror))
+      (if (or (null ret)
+              (not (web-mode-is-comment-or-string)))
+          (setq continue nil)))
+    ret))
+
+(defun web-mode-content-rsf (regexp &optional limit noerror)
+  (unless noerror (setq noerror t))
+  (let ((continue t) ret beg end)
+    (while continue
+      (setq ret (re-search-forward regexp limit noerror)
+            beg (if (null ret) (point) (match-beginning 0))
+            end (if (null ret) (point) (1- (match-end 0))))
+      (if (or (null ret)
+              (and (web-mode-is-content beg)
+                   (web-mode-is-content end)))
+          (setq continue nil)))
+    ret))
+
+;;---- ADVICES -----------------------------------------------------------------
+
+(defadvice ac-start (before web-mode-set-up-ac-sources activate)
+  "Set `ac-sources' based on current language before running auto-complete."
+  (when (equal major-mode 'web-mode)
+    ;; set ignore each time to nil. User has to implement a hook to change it
+    ;; for each completion
+    (setq web-mode-ignore-ac-start-advice nil)
+    (run-hooks 'web-mode-before-auto-complete-hooks)
+    (unless web-mode-ignore-ac-start-advice
+      (when web-mode-ac-sources-alist
+        (let ((new-web-mode-ac-sources
+               (assoc (web-mode-language-at-pos)
+                      web-mode-ac-sources-alist)))
+          (setq ac-sources (cdr new-web-mode-ac-sources)))))))
+
+;;---- MINOR MODE ADDONS -------------------------------------------------------
+
+(defun web-mode-yasnippet-exit-hook ()
+  "Yasnippet exit hook"
+  (when (and (boundp 'yas-snippet-beg) (boundp 'yas-snippet-end))
+    (indent-region yas-snippet-beg yas-snippet-end)))
+
+(defun web-mode-imenu-index ()
+  (interactive)
+  "Returns imenu items."
+  (let (toc-index
+        line)
+    (save-excursion
+      (goto-char (point-min))
+      (while (not (eobp))
+        (setq line (buffer-substring-no-properties
+                    (line-beginning-position)
+                    (line-end-position)))
+        (let (found
+              (i 0)
+              item
+              regexp
+              type
+              type-idx
+              content
+              content-idx
+              content-regexp
+              close-tag-regexp
+              concat-str
+              jumpto
+              str)
+          (while (and (not found ) (< i (length web-mode-imenu-regexp-list)))
+            (setq item (nth i web-mode-imenu-regexp-list))
+            (setq regexp (nth 0 item))
+            (setq type-idx (nth 1 item))
+            (setq content-idx (nth 2 item))
+            (setq concat-str (nth 3 item))
+            (when (not (numberp content-idx))
+              (setq content-regexp (nth 2 item)
+                    close-tag-regexp (nth 4 item)
+                    content-idx nil))
+
+            (when (string-match regexp line)
+
+              (cond
+               (content-idx
+                (setq type (match-string type-idx line))
+                (setq content (match-string content-idx line))
+                (setq str (concat type concat-str content))
+                (setq jumpto (line-beginning-position)))
+               (t
+                (let (limit)
+                  (setq type (match-string type-idx line))
+                  (goto-char (line-beginning-position))
+                  (save-excursion
+                    (setq limit (re-search-forward close-tag-regexp (point-max) t)))
+
+                  (when limit
+                    (when (re-search-forward content-regexp limit t)
+                      (setq content (match-string 1))
+                      (setq str (concat type concat-str content))
+                      (setq jumpto (line-beginning-position))
+                      )
+                    )))
+               )
+              (when str (setq toc-index
+                              (cons (cons str jumpto)
+                                    toc-index)
+                              )
+                    (setq found t))
+              )
+            (setq i (1+ i))))
+        (forward-line)
+        (goto-char (line-end-position)) ;; make sure we are at eobp
+        ))
+    (nreverse toc-index)))
+
+;;---- UNIT TESTING ------------------------------------------------------------
+
+(defun web-mode-test ()
+  "Executes web-mode unit tests. See `web-mode-tests-directory'."
+  (interactive)
+  (let (files ret regexp)
+    (setq regexp "^[[:alnum:]][[:alnum:]._]+\\'")
+    (setq files (directory-files web-mode-tests-directory t regexp))
+    (dolist (file files)
+      (cond
+       ((eq (string-to-char (file-name-nondirectory file)) ?\_)
+        (delete-file file))
+       (t
+        (setq ret (web-mode-test-process file)))
+       ) ;cond
+      ) ;dolist
+    ))
+
+(defun web-mode-test-process (file)
+  (with-temp-buffer
+    (let (out sig1 sig2 success err)
+      (setq-default indent-tabs-mode nil)
+      (if (string-match-p "sql" file)
+          (setq web-mode-enable-sql-detection t)
+        (setq web-mode-enable-sql-detection nil))
+      (insert-file-contents file)
+      (set-visited-file-name file)
+      (web-mode)
+      (setq sig1 (md5 (current-buffer)))
+      (delete-horizontal-space)
+      (while (not (eobp))
+        (forward-line)
+        (delete-horizontal-space)
+        (end-of-line))
+      (web-mode-buffer-indent)
+      (setq sig2 (md5 (current-buffer)))
+      (setq success (string= sig1 sig2))
+      (setq out (concat (if success "ok" "ko") " : " (file-name-nondirectory file)))
+      (message out)
+      (setq err (concat (file-name-directory file) "_err." (file-name-nondirectory file)))
+      (if success
+          (when (file-readable-p err)
+            (delete-file err))
+        (write-file err)
+        (message "[%s]" (buffer-string))
+        ) ;if
+      out)))
+
+;;---- MISC --------------------------------------------------------------------
+
+(defun web-mode-set-engine (engine)
+  "Set the engine for the current buffer."
+  (interactive
+   (list (completing-read
+          "Engine: "
+          (let (engines)
+            (dolist (elt web-mode-engines)
+              (setq engines (append engines (list (car elt)))))
+            engines))))
+  (setq web-mode-content-type "html"
+        web-mode-engine (web-mode-engine-canonical-name engine)
+        web-mode-minor-engine engine)
+  (web-mode-on-engine-setted)
+  (web-mode-buffer-highlight))
+
+(defun web-mode-set-content-type (content-type)
+  "Set the content-type for the current buffer"
+  (interactive (list (completing-read "Content-type: " web-mode-part-content-types)))
+  (setq web-mode-content-type content-type)
+  (when (called-interactively-p 'any)
+    )
+  (web-mode-buffer-highlight))
+
+(defun web-mode-on-engine-setted ()
+  (let (elt elts engines)
+
+    (when (string= web-mode-engine "razor") (setq web-mode-enable-block-face t))
+    (setq web-mode-engine-attr-regexp (cdr (assoc web-mode-engine web-mode-engine-attr-regexps)))
+    (setq web-mode-engine-token-regexp (cdr (assoc web-mode-engine web-mode-engine-token-regexps)))
+
+    ;;(message "%S %S" web-mode-engine-attr-regexp web-mode-engine)
+
+    (when (null web-mode-minor-engine)
+      (setq web-mode-minor-engine "none"))
+
+    (setq elt (assoc web-mode-engine web-mode-engine-open-delimiter-regexps))
+    (if elt
+        (setq web-mode-block-regexp (cdr elt))
+      (setq web-mode-engine "none"))
+
+    (unless (boundp 'web-mode-extra-auto-pairs)
+      (setq web-mode-extra-auto-pairs nil))
+
+    (setq web-mode-auto-pairs
+          (append
+           (cdr (assoc web-mode-engine web-mode-engines-auto-pairs))
+           (cdr (assoc nil web-mode-engines-auto-pairs))
+           (cdr (assoc web-mode-engine web-mode-extra-auto-pairs))
+           (cdr (assoc nil web-mode-extra-auto-pairs))))
+
+    (unless (boundp 'web-mode-extra-snippets)
+      (setq web-mode-extra-snippets nil))
+
+    (setq elts
+          (append
+           (cdr (assoc web-mode-engine web-mode-extra-snippets))
+           (cdr (assoc nil             web-mode-extra-snippets))
+           (cdr (assoc web-mode-engine web-mode-engines-snippets))
+           (cdr (assoc nil             web-mode-engines-snippets))))
+
+    (dolist (elt elts)
+      (unless (assoc (car elt) web-mode-snippets)
+        (setq web-mode-snippets (append (list elt) web-mode-snippets)))
+      )
+
+    (setq web-mode-engine-font-lock-keywords
+          (symbol-value (cdr (assoc web-mode-engine web-mode-engines-font-lock-keywords))))
+
+    (when (and (string= web-mode-minor-engine "jinja")
+               (not (member "endtrans" web-mode-django-control-blocks)))
+      (add-to-list 'web-mode-django-control-blocks "endtrans")
+      (setq web-mode-django-control-blocks-regexp
+            (regexp-opt web-mode-django-control-blocks t))
+      )
+
+;;    (message "%S" (symbol-value (cdr (assoc web-mode-engine web-mode-engines-font-lock-keywords))))
+
+    ))
+
+(defun web-mode-detect-engine ()
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward "-\\*- engine:[ ]*\\([[:alnum:]-]+\\)[ ]*-\\*-" web-mode-chunk-length t)
+      (setq web-mode-minor-engine (match-string-no-properties 1))
+      (setq web-mode-engine (web-mode-engine-canonical-name web-mode-minor-engine)))
+    web-mode-minor-engine))
+
+(defun web-mode-guess-engine-and-content-type ()
+  (let (buff-name elt found)
+
+    (setq buff-name (buffer-file-name))
+    (unless buff-name (setq buff-name (buffer-name)))
+    (setq web-mode-is-scratch (string= buff-name "*scratch*"))
+    (setq web-mode-content-type nil)
+
+    (when (boundp 'web-mode-content-types-alist)
+      (setq found nil)
+      (dolist (elt web-mode-content-types-alist)
+        (when (and (not found) (string-match-p (cdr elt) buff-name))
+          (setq web-mode-content-type (car elt)
+                found t))
+        ) ;dolist
+      ) ;when
+
+    (unless web-mode-content-type
+      (setq found nil)
+      (dolist (elt web-mode-content-types)
+        (when (and (not found) (string-match-p (cdr elt) buff-name))
+          (setq web-mode-content-type (car elt)
+                found t))
+        ) ;dolist
+      ) ;unless
+
+    (when (boundp 'web-mode-engines-alist)
+      (setq found nil)
+      (dolist (elt web-mode-engines-alist)
+        (cond
+         ((stringp (cdr elt))
+          (when (string-match-p (cdr elt) buff-name)
+            (setq web-mode-engine (car elt))))
+         ((functionp (cdr elt))
+          (when (funcall (cdr elt))
+            (setq web-mode-engine (car elt))))
+         ) ;cond
+        ) ;dolist
+      ) ;when
+
+    (unless web-mode-engine
+      (setq found nil)
+      (dolist (elt web-mode-engine-file-regexps)
+        ;;(message "%S %S" (cdr elt) buff-name)
+        (when (and (not found) (string-match-p (cdr elt) buff-name))
+          (setq web-mode-engine (car elt)
+                found t))
+        )
+      )
+
+    (when (and (or (null web-mode-engine) (string= web-mode-engine "none"))
+               (string-match-p "php" (buffer-substring-no-properties
+                                      (line-beginning-position)
+                                      (line-end-position))))
+      (setq web-mode-engine "php"))
+
+    (when (and (string= web-mode-content-type "javascript")
+               (string-match-p "@jsx"
+                               (buffer-substring-no-properties
+                                (point-min)
+                                (if (< (point-max) web-mode-chunk-length)
+                                    (point-max)
+                                  web-mode-chunk-length)
+                                )))
+      (setq web-mode-content-type "jsx"))
+
+    (when web-mode-engine
+      (setq web-mode-minor-engine web-mode-engine
+            web-mode-engine (web-mode-engine-canonical-name web-mode-engine))
+      )
+
+    (when (and (or (null web-mode-engine)
+                   (string= web-mode-engine "none"))
+               web-mode-enable-engine-detection)
+      (web-mode-detect-engine))
+
+    (web-mode-on-engine-setted)
+
+    ))
+
+(defun web-mode-engine-canonical-name (name)
+  (let (engine)
+    (cond
+     ((null name)
+      nil)
+     ((assoc name web-mode-engines)
+      name)
+     (t
+      (dolist (elt web-mode-engines)
+        (when (and (null engine) (member name (cdr elt)))
+          (setq engine (car elt)))
+        ) ;dolist
+      engine)
+     )))
+
+(defun web-mode-on-after-save ()
+  (when web-mode-is-scratch
+    (web-mode-guess-engine-and-content-type)
+    (web-mode-buffer-highlight))
+  nil)
+
+(defun web-mode-on-exit ()
+  (web-mode-with-silent-modifications
+   (put-text-property (point-min) (point-max) 'invisible nil)
+   (remove-overlays)
+   (remove-hook 'change-major-mode-hook 'web-mode-on-exit t)
+   ))
+
+(defun web-mode-reload ()
+  "Reload web-mode."
+  (interactive)
+  (web-mode-with-silent-modifications
+    (put-text-property (point-min) (point-max) 'invisible nil)
+    (remove-overlays)
+    (setq font-lock-unfontify-region-function 'font-lock-default-unfontify-region)
+    (load "web-mode.el")
+    (setq web-mode-change-beg nil
+          web-mode-change-end nil)
+    (web-mode)
+    ))
+
+(defun web-mode-trace (msg)
+  (let (sub)
+    ;;      (when (null web-mode-time) (setq web-mode-time (current-time)))
+    (setq sub (time-subtract (current-time) web-mode-time))
+    (when nil
+      (save-excursion
+        (let ((n 0))
+          (goto-char (point-min))
+          (while (web-mode-tag-next)
+            (setq n (1+ n))
+            )
+          (message "%S tags found" n)
+          )))
+    (message "%18s: time elapsed = %Ss %9Sµs" msg (nth 1 sub) (nth 2 sub))
+    ))
+
+(defun web-mode-reveal ()
+  "Display text properties at point."
+  (interactive)
+  (let (symbols out)
+    (setq out (format
+               "[point=%S engine=%S minor=%S content-type=%S language-at-pos=%S]\n"
+               (point)
+               web-mode-engine
+               web-mode-minor-engine
+               web-mode-content-type
+               (web-mode-language-at-pos (point))))
+    (setq symbols (append web-mode-scan-properties '(font-lock-face face)))
+    (dolist (symbol symbols)
+      (when symbol
+        (setq out (concat out (format "%s(%S) " (symbol-name symbol) (get-text-property (point) symbol)))))
+      )
+    (message "%s\n" out)
+    ;;(message "syntax-class=%S" (syntax-class (syntax-after (point))))
+    (message nil)))
+
+(defun web-mode-debug ()
+  "Display informations useful for debugging."
+  (interactive)
+  (let ((modes nil)
+        (customs '(web-mode-enable-current-column-highlight web-mode-enable-current-element-highlight indent-tabs-mode))
+        (ignore '(abbrev-mode auto-composition-mode auto-compression-mode auto-encryption-mode auto-insert-mode blink-cursor-mode column-number-mode delete-selection-mode display-time-mode electric-indent-mode file-name-shadow-mode font-lock-mode global-font-lock-mode global-hl-line-mode line-number-mode menu-bar-mode mouse-wheel-mode recentf-mode show-point-mode tool-bar-mode tooltip-mode transient-mark-mode)))
+    (message "\n")
+    (message "--- WEB-MODE DEBUG BEG ---")
+    (message "versions: emacs(%S.%S) web-mode(%S)"
+             emacs-major-version emacs-minor-version web-mode-version)
+    (message "vars: engine(%S) minor(%S) content-type(%S) file(%S)"
+             web-mode-engine
+             web-mode-minor-engine
+             web-mode-content-type
+             (or (buffer-file-name) (buffer-name)))
+    (message "system: window(%S) config(%S)" window-system system-configuration)
+    (message "colors: fg(%S) bg(%S) "
+             (cdr (assoc 'foreground-color default-frame-alist))
+             (cdr (assoc 'background-color default-frame-alist)))
+    (mapc (lambda (mode)
+            (condition-case nil
+                (if (and (symbolp mode) (symbol-value mode) (not (member mode ignore)))
+                    (add-to-list 'modes mode))
+              (error nil))
+            ) ;lambda
+          minor-mode-list)
+    (message "minor modes: %S" modes)
+    (message "vars:")
+    (dolist (custom customs)
+      (message (format "%s=%S " (symbol-name custom) (symbol-value custom))))
+    (message "--- WEB-MODE DEBUG END ---")
+    (switch-to-buffer "*Messages*")
+    (goto-char (point-max))
+    (recenter)
+  ))
+
+(provide 'web-mode)
+
+;;; web-mode.el ends here
+
+;; Local Variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
diff --git a/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode-autoloads.el b/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode-autoloads.el
deleted file mode 100644
index 3f85843..0000000
--- a/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode-autoloads.el
+++ /dev/null
@@ -1,27 +0,0 @@
-;;; yaml-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (21837 24188 0 0))
-;;; Generated autoloads from yaml-mode.el
-
-(let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads))))
-
-(autoload 'yaml-mode "yaml-mode" "\
-Simple mode to edit YAML.
-
-\\{yaml-mode-map}
-
-\(fn)" t nil)
-
-(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; yaml-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode-pkg.el b/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode-pkg.el
deleted file mode 100644
index cb7eaba..0000000
--- a/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "yaml-mode" "20141125.37" "Major mode for editing YAML files" 'nil :keywords '("data" "yaml"))
diff --git a/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode.el b/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode.el
deleted file mode 100644
index 81cafa4..0000000
--- a/emacs.d/elpa/yaml-mode-20141125.37/yaml-mode.el
+++ /dev/null
@@ -1,413 +0,0 @@
-;;; yaml-mode.el --- Major mode for editing YAML files
-
-;; Copyright (C) 2010-2014 Yoshiki Kurihara
-
-;; Author: Yoshiki Kurihara <clouder@gmail.com>
-;;         Marshall T. Vandegrift <llasram@gmail.com>
-;; Keywords: data yaml
-;; Package-Version: 20141125.37
-;; Version: 0.0.11
-
-;; This file is not part of Emacs
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; This is a major mode for editing files in the YAML data
-;; serialization format.  It was initially developed by Yoshiki
-;; Kurihara and many features were added by Marshall Vandegrift.  As
-;; YAML and Python share the fact that indentation determines
-;; structure, this mode provides indentation and indentation command
-;; behavior very similar to that of python-mode.
-
-;;; Installation:
-
-;; To install, just drop this file into a directory in your
-;; `load-path' and (optionally) byte-compile it.  To automatically
-;; handle files ending in '.yml', add something like:
-;;
-;;    (require 'yaml-mode)
-;;    (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
-;;
-;; to your .emacs file.
-;;
-;; Unlike python-mode, this mode follows the Emacs convention of not
-;; binding the ENTER key to `newline-and-indent'.  To get this
-;; behavior, add the key definition to `yaml-mode-hook':
-;;
-;;    (add-hook 'yaml-mode-hook
-;;     '(lambda ()
-;;        (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
-
-;;; Known Bugs:
-
-;; YAML is easy to write but complex to parse, and this mode doesn't
-;; even really try.  Indentation and highlighting will break on
-;; abnormally complicated structures.
-
-;;; Code:
-
-
-;; User definable variables
-
-;;;###autoload
-(defgroup yaml nil
-  "Support for the YAML serialization format"
-  :group 'languages
-  :prefix "yaml-")
-
-(defcustom yaml-mode-hook nil
-  "*Hook run by `yaml-mode'."
-  :type 'hook
-  :group 'yaml)
-
-(defcustom yaml-indent-offset 2
-  "*Amount of offset per level of indentation."
-  :type 'integer
-  :group 'yaml)
-
-(defcustom yaml-backspace-function 'backward-delete-char-untabify
-  "*Function called by `yaml-electric-backspace' when deleting backwards.
-It will receive one argument, the numeric prefix value."
-  :type 'function
-  :group 'yaml)
-
-(defcustom yaml-block-literal-search-lines 100
-  "*Maximum number of lines to search for start of block literals."
-  :type 'integer
-  :group 'yaml)
-
-(defcustom yaml-block-literal-electric-alist
-  '((?| . "") (?> . "-"))
-  "*Characters for which to provide electric behavior.
-The association list key should be a key code and the associated value
-should be a string containing additional characters to insert when
-that key is pressed to begin a block literal."
-  :type 'alist
-  :group 'yaml)
-
-(defface yaml-tab-face
-   '((((class color)) (:background "red" :foreground "red" :bold t))
-     (t (:reverse-video t)))
-  "Face to use for highlighting tabs in YAML files."
-  :group 'faces
-  :group 'yaml)
-
-(defcustom yaml-imenu-generic-expression
-  '((nil  "^\\(:?[a-zA-Z_-]+\\):"          1))
-  "The imenu regex to parse an outline of the yaml file."
-  :type 'string
-  :group 'yaml)
-
-
-;; Constants
-
-(defconst yaml-mode-version "0.0.11" "Version of `yaml-mode'.")
-
-(defconst yaml-blank-line-re "^ *$"
-  "Regexp matching a line containing only (valid) whitespace.")
-
-(defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)"
-  "Regexp matching a line contatining a YAML directive.")
-
-(defconst yaml-document-delimiter-re "^ *\\(?:---\\|[.][.][.]\\)"
-  "Rexexp matching a YAML document delimiter line.")
-
-(defconst yaml-node-anchor-alias-re "[&*][a-zA-Z0-9_-]+"
-  "Regexp matching a YAML node anchor or alias.")
-
-(defconst yaml-tag-re "!!?[^ \n]+"
-  "Rexexp matching a YAML tag.")
-
-(defconst yaml-bare-scalar-re
-  "\\(?:[^-:,#!\n{\\[ ]\\|[^#!\n{\\[ ]\\S-\\)[^#\n]*?"
-  "Rexexp matching a YAML bare scalar.")
-
-(defconst yaml-hash-key-re
-  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
-          "\\(?:" yaml-tag-re " +\\)?"
-          "\\(" yaml-bare-scalar-re "\\) *:"
-          "\\(?: +\\|$\\)")
-  "Regexp matching a single YAML hash key.")
-
-(defconst yaml-scalar-context-re
-  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
-          "\\(?:" yaml-bare-scalar-re " *: \\)?")
-  "Regexp indicating the begininng of a scalar context.")
-
-(defconst yaml-nested-map-re
-  (concat ".*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
-  "Regexp matching a line beginning a YAML nested structure.")
-
-(defconst yaml-block-literal-base-re " *[>|][-+0-9]* *\\(?:\n\\|\\'\\)"
-  "Regexp matching the substring start of a block literal.")
-
-(defconst yaml-block-literal-re
-  (concat yaml-scalar-context-re
-          "\\(?:" yaml-tag-re "\\)?"
-          yaml-block-literal-base-re)
-  "Regexp matching a line beginning a YAML block literal.")
-
-(defconst yaml-nested-sequence-re
-  (concat "^\\(?: *- +\\)+"
-          "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$")
-  "Regexp matching a line containing one or more nested YAML sequences.")
-
-(defconst yaml-constant-scalars-re
-  (concat "\\(?:^\\|\\(?::\\|-\\|,\\|{\\|\\[\\) +\\) *"
-          (regexp-opt
-           '("~" "null" "Null" "NULL"
-             ".nan" ".NaN" ".NAN"
-             ".inf" ".Inf" ".INF"
-             "-.inf" "-.Inf" "-.INF"
-             "y" "Y" "yes" "Yes" "YES" "n" "N" "no" "No" "NO"
-             "true" "True" "TRUE" "false" "False" "FALSE"
-             "on" "On" "ON" "off" "Off" "OFF") t)
-          " *$")
-  "Regexp matching certain scalar constants in scalar context.")
-
-
-;; Mode setup
-
-(defvar yaml-mode-map ()
-  "Keymap used in `yaml-mode' buffers.")
-(if yaml-mode-map
-    nil
-  (setq yaml-mode-map (make-sparse-keymap))
-  (define-key yaml-mode-map "|" 'yaml-electric-bar-and-angle)
-  (define-key yaml-mode-map ">" 'yaml-electric-bar-and-angle)
-  (define-key yaml-mode-map "-" 'yaml-electric-dash-and-dot)
-  (define-key yaml-mode-map "." 'yaml-electric-dash-and-dot)
-  (define-key yaml-mode-map [backspace] 'yaml-electric-backspace))
-
-(defvar yaml-mode-syntax-table nil
-  "Syntax table in use in `yaml-mode' buffers.")
-(if yaml-mode-syntax-table
-    nil
-  (setq yaml-mode-syntax-table (make-syntax-table))
-  (modify-syntax-entry ?\' "\"" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\" "\"" yaml-mode-syntax-table)
-  (modify-syntax-entry ?# "<" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\n ">" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\\ "\\" yaml-mode-syntax-table)
-  (modify-syntax-entry ?- "w" yaml-mode-syntax-table)
-  (modify-syntax-entry ?_ "_" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\( "." yaml-mode-syntax-table)
-  (modify-syntax-entry ?\) "." yaml-mode-syntax-table)
-  (modify-syntax-entry ?\{ "(}" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\} "){" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\[ "(]" yaml-mode-syntax-table)
-  (modify-syntax-entry ?\] ")[" yaml-mode-syntax-table))
-
-;;;###autoload
-(define-derived-mode yaml-mode fundamental-mode "YAML"
-  "Simple mode to edit YAML.
-
-\\{yaml-mode-map}"
-  :syntax-table yaml-mode-syntax-table
-  (set (make-local-variable 'comment-start) "# ")
-  (set (make-local-variable 'comment-start-skip) "#+ *")
-  (set (make-local-variable 'indent-line-function) 'yaml-indent-line)
-  (set (make-local-variable 'indent-tabs-mode) nil)
-  (set (make-local-variable 'font-lock-defaults)
-       '(yaml-font-lock-keywords
-         nil nil nil nil
-         (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords)))
-  (font-lock-fontify-buffer))
-
-
-;; Font-lock support
-
-(defvar yaml-font-lock-keywords
-   (list
-    (cons yaml-constant-scalars-re '(1 font-lock-constant-face))
-    (cons yaml-tag-re '(0 font-lock-type-face))
-    (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face))
-    (cons yaml-hash-key-re '(1 font-lock-variable-name-face))
-    (cons yaml-document-delimiter-re '(0 font-lock-comment-face))
-    (cons yaml-directive-re '(1 font-lock-builtin-face))
-    '(yaml-font-lock-block-literals 0 font-lock-string-face)
-    '("^[\t]+" 0 'yaml-tab-face t))
-   "Additional expressions to highlight in YAML mode.")
-
-(defvar yaml-font-lock-syntactic-keywords
-  (list '(yaml-syntactic-block-literals 0 "."))
-  "Additional syntax features to highlight in YAML mode.")
-
-
-(defun yaml-font-lock-block-literals (bound)
-  "Find lines within block literals.
-Find the next line of the first (if any) block literal after point and
-prior to BOUND.  Returns the beginning and end of the block literal
-line in the match data, as consumed by `font-lock-keywords' matcher
-functions.  The function begins by searching backwards to determine
-whether or not the current line is within a block literal.  This could
-be time-consuming in large buffers, so the number of lines searched is
-artificially limitted to the value of
-`yaml-block-literal-search-lines'."
-  (if (eolp) (goto-char (1+ (point))))
-  (unless (or (eobp) (>= (point) bound))
-    (let ((begin (point))
-          (end (min (1+ (point-at-eol)) bound)))
-      (goto-char (point-at-bol))
-      (while (and (looking-at yaml-blank-line-re) (not (bobp)))
-        (forward-line -1))
-      (let ((nlines yaml-block-literal-search-lines)
-            (min-level (current-indentation)))
-      (forward-line -1)
-      (while (and (/= nlines 0)
-                  (/= min-level 0)
-                  (not (looking-at yaml-block-literal-re))
-                  (not (bobp)))
-        (set 'nlines (1- nlines))
-        (unless (looking-at yaml-blank-line-re)
-          (set 'min-level (min min-level (current-indentation))))
-        (forward-line -1))
-      (cond
-       ((and (< (current-indentation) min-level)
-             (looking-at yaml-block-literal-re))
-          (goto-char end) (set-match-data (list begin end)) t)
-         ((progn
-            (goto-char begin)
-            (re-search-forward (concat yaml-block-literal-re
-                                       " *\\(.*\\)\n")
-                               bound t))
-          (set-match-data (nthcdr 2 (match-data))) t))))))
-
-(defun yaml-syntactic-block-literals (bound)
-  "Find quote characters within block literals.
-Finds the first quote character within a block literal (if any) after
-point and prior to BOUND.  Returns the position of the quote character
-in the match data, as consumed by matcher functions in
-`font-lock-syntactic-keywords'.  This allows the mode to treat ['\"]
-characters in block literals as punctuation syntax instead of string
-syntax, preventing unmatched quotes in block literals from painting
-the entire buffer in `font-lock-string-face'."
-  (let ((found nil))
-    (while (and (not found)
-                (/= (point) bound)
-                (yaml-font-lock-block-literals bound))
-      (let ((begin (match-beginning 0)) (end (match-end 0)))
-        (goto-char begin)
-        (cond
-         ((re-search-forward "['\"]" end t) (setq found t))
-         ((goto-char end)))))
-    found))
-
-
-;; Indentation and electric keys
-
-(defun yaml-compute-indentation ()
-  "Calculate the maximum sensible indentation for the current line."
-  (save-excursion
-    (beginning-of-line)
-    (if (looking-at yaml-document-delimiter-re) 0
-      (forward-line -1)
-      (while (and (looking-at yaml-blank-line-re)
-                  (> (point) (point-min)))
-        (forward-line -1))
-      (+ (current-indentation)
-         (if (looking-at yaml-nested-map-re) yaml-indent-offset 0)
-         (if (looking-at yaml-nested-sequence-re) yaml-indent-offset 0)
-         (if (looking-at yaml-block-literal-re) yaml-indent-offset 0)))))
-
-(defun yaml-indent-line ()
-  "Indent the current line.
-The first time this command is used, the line will be indented to the
-maximum sensible indentation.  Each immediately subsequent usage will
-back-dent the line by `yaml-indent-offset' spaces.  On reaching column
-0, it will cycle back to the maximum sensible indentation."
-  (interactive "*")
-  (let ((ci (current-indentation))
-        (cc (current-column))
-        (need (yaml-compute-indentation)))
-    (save-excursion
-      (beginning-of-line)
-      (delete-horizontal-space)
-      (if (and (equal last-command this-command) (/= ci 0))
-          (indent-to (* (/ (- ci 1) yaml-indent-offset) yaml-indent-offset))
-        (indent-to need)))
-      (if (< (current-column) (current-indentation))
-          (forward-to-indentation 0))))
-
-(defun yaml-electric-backspace (arg)
-  "Delete characters or back-dent the current line.
-If invoked following only whitespace on a line, will back-dent to the
-immediately previous multiple of `yaml-indent-offset' spaces."
-  (interactive "*p")
-  (if (or (/= (current-indentation) (current-column)) (bolp))
-      (funcall yaml-backspace-function arg)
-    (let ((ci (current-column)))
-      (beginning-of-line)
-      (delete-horizontal-space)
-      (indent-to (* (/ (- ci (* arg yaml-indent-offset))
-                       yaml-indent-offset)
-                    yaml-indent-offset)))))
-
-(defun yaml-electric-bar-and-angle (arg)
-  "Insert the bound key and possibly begin a block literal.
-Inserts the bound key.  If inserting the bound key causes the current
-line to match the initial line of a block literal, then inserts the
-matching string from `yaml-block-literal-electric-alist', a newline,
-and indents appropriately."
-  (interactive "*P")
-  (self-insert-command (prefix-numeric-value arg))
-  (let ((extra-chars
-         (assoc last-command-event
-                yaml-block-literal-electric-alist)))
-    (cond
-     ((and extra-chars (not arg) (eolp)
-           (save-excursion
-             (beginning-of-line)
-             (looking-at yaml-block-literal-re)))
-      (insert (cdr extra-chars))
-      (newline-and-indent)))))
-
-(defun yaml-electric-dash-and-dot (arg)
-  "Insert the bound key and possibly de-dent line.
-Inserts the bound key.  If inserting the bound key causes the current
-line to match a document delimiter, de-dent the line to the left
-margin."
-  (interactive "*P")
-  (self-insert-command (prefix-numeric-value arg))
-  (save-excursion
-    (beginning-of-line)
-    (if (and (not arg) (looking-at yaml-document-delimiter-re))
-        (delete-horizontal-space))))
-
-
-(defun yaml-set-imenu-generic-expression ()
-  (make-local-variable 'imenu-generic-expression)
-  (make-local-variable 'imenu-create-index-function)
-  (setq imenu-create-index-function 'imenu-default-create-index-function)
-  (setq imenu-generic-expression yaml-imenu-generic-expression))
-
-(add-hook 'yaml-mode-hook 'yaml-set-imenu-generic-expression)
-
-
-(defun yaml-mode-version ()
-  "Diplay version of `yaml-mode'."
-  (interactive)
-  (message "yaml-mode %s" yaml-mode-version)
-  yaml-mode-version)
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode))
-
-(provide 'yaml-mode)
-
-;;; yaml-mode.el ends here
diff --git a/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode-autoloads.el b/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode-autoloads.el
new file mode 100644
index 0000000..18a7fe7
--- /dev/null
+++ b/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode-autoloads.el
@@ -0,0 +1,27 @@
+;;; yaml-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (22171 46540 0 0))
+;;; Generated autoloads from yaml-mode.el
+
+(let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads))))
+
+(autoload 'yaml-mode "yaml-mode" "\
+Simple mode to edit YAML.
+
+\\{yaml-mode-map}
+
+\(fn)" t nil)
+
+(add-to-list 'auto-mode-alist '("\\.e?ya?ml$" . yaml-mode))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; yaml-mode-autoloads.el ends here
diff --git a/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode-pkg.el b/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode-pkg.el
new file mode 100644
index 0000000..bda61c6
--- /dev/null
+++ b/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "yaml-mode" "20160101.921" "Major mode for editing YAML files" '((emacs "24.1")) :keywords '("data" "yaml"))
diff --git a/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode.el b/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode.el
new file mode 100644
index 0000000..de5f134
--- /dev/null
+++ b/emacs.d/elpa/yaml-mode-20160101.921/yaml-mode.el
@@ -0,0 +1,458 @@
+;;; yaml-mode.el --- Major mode for editing YAML files
+
+;; Copyright (C) 2010-2014 Yoshiki Kurihara
+
+;; Author: Yoshiki Kurihara <clouder@gmail.com>
+;;         Marshall T. Vandegrift <llasram@gmail.com>
+;; Maintainer: Vasilij Schneidermann <v.schneidermann@gmail.com>
+;; Package-Requires: ((emacs "24.1"))
+;; Keywords: data yaml
+;; Package-Version: 20160101.921
+;; Version: 0.0.12
+
+;; This file is not part of Emacs
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License along
+;; with this program; if not, write to the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+;;; Commentary:
+
+;; This is a major mode for editing files in the YAML data
+;; serialization format.  It was initially developed by Yoshiki
+;; Kurihara and many features were added by Marshall Vandegrift.  As
+;; YAML and Python share the fact that indentation determines
+;; structure, this mode provides indentation and indentation command
+;; behavior very similar to that of python-mode.
+
+;;; Installation:
+
+;; To install, just drop this file into a directory in your
+;; `load-path' and (optionally) byte-compile it.  To automatically
+;; handle files ending in '.yml', add something like:
+;;
+;;    (require 'yaml-mode)
+;;    (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+;;
+;; to your .emacs file.
+;;
+;; Unlike python-mode, this mode follows the Emacs convention of not
+;; binding the ENTER key to `newline-and-indent'.  To get this
+;; behavior, add the key definition to `yaml-mode-hook':
+;;
+;;    (add-hook 'yaml-mode-hook
+;;     '(lambda ()
+;;        (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
+
+;;; Known Bugs:
+
+;; YAML is easy to write but complex to parse, and this mode doesn't
+;; even really try.  Indentation and highlighting will break on
+;; abnormally complicated structures.
+
+;;; Code:
+
+
+;; User definable variables
+
+;;;###autoload
+(defgroup yaml nil
+  "Support for the YAML serialization format"
+  :group 'languages
+  :prefix "yaml-")
+
+(defcustom yaml-mode-hook nil
+  "*Hook run by `yaml-mode'."
+  :type 'hook
+  :group 'yaml)
+
+(defcustom yaml-indent-offset 2
+  "*Amount of offset per level of indentation."
+  :type 'integer
+  :group 'yaml)
+
+(defcustom yaml-backspace-function 'backward-delete-char-untabify
+  "*Function called by `yaml-electric-backspace' when deleting backwards.
+It will receive one argument, the numeric prefix value."
+  :type 'function
+  :group 'yaml)
+
+(defcustom yaml-block-literal-search-lines 100
+  "*Maximum number of lines to search for start of block literals."
+  :type 'integer
+  :group 'yaml)
+
+(defcustom yaml-block-literal-electric-alist
+  '((?| . "") (?> . "-"))
+  "*Characters for which to provide electric behavior.
+The association list key should be a key code and the associated value
+should be a string containing additional characters to insert when
+that key is pressed to begin a block literal."
+  :type 'alist
+  :group 'yaml)
+
+(defface yaml-tab-face
+   '((((class color)) (:background "red" :foreground "red" :bold t))
+     (t (:reverse-video t)))
+  "Face to use for highlighting tabs in YAML files."
+  :group 'faces
+  :group 'yaml)
+
+(defcustom yaml-imenu-generic-expression
+  '((nil  "^\\(:?[a-zA-Z_-]+\\):"          1))
+  "The imenu regex to parse an outline of the yaml file."
+  :type 'string
+  :group 'yaml)
+
+
+;; Constants
+
+(defconst yaml-mode-version "0.0.12" "Version of `yaml-mode'.")
+
+(defconst yaml-blank-line-re "^ *$"
+  "Regexp matching a line containing only (valid) whitespace.")
+
+(defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)"
+  "Regexp matching a line contatining a YAML directive.")
+
+(defconst yaml-document-delimiter-re "^ *\\(?:---\\|[.][.][.]\\)"
+  "Rexexp matching a YAML document delimiter line.")
+
+(defconst yaml-node-anchor-alias-re "[&*][a-zA-Z0-9_-]+"
+  "Regexp matching a YAML node anchor or alias.")
+
+(defconst yaml-tag-re "!!?[^ \n]+"
+  "Rexexp matching a YAML tag.")
+
+(defconst yaml-bare-scalar-re
+  "\\(?:[^-:,#!\n{\\[ ]\\|[^#!\n{\\[ ]\\S-\\)[^#\n]*?"
+  "Rexexp matching a YAML bare scalar.")
+
+(defconst yaml-hash-key-re
+  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
+          "\\(?:" yaml-tag-re " +\\)?"
+          "\\(" yaml-bare-scalar-re "\\) *:"
+          "\\(?: +\\|$\\)")
+  "Regexp matching a single YAML hash key.")
+
+(defconst yaml-scalar-context-re
+  (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?: *[-,] +\\)+\\) *"
+          "\\(?:" yaml-bare-scalar-re " *: \\)?")
+  "Regexp indicating the begininng of a scalar context.")
+
+(defconst yaml-nested-map-re
+  (concat ".*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$")
+  "Regexp matching a line beginning a YAML nested structure.")
+
+(defconst yaml-block-literal-base-re " *[>|][-+0-9]* *\\(?:\n\\|\\'\\)"
+  "Regexp matching the substring start of a block literal.")
+
+(defconst yaml-block-literal-re
+  (concat yaml-scalar-context-re
+          "\\(?:" yaml-tag-re "\\)?"
+          yaml-block-literal-base-re)
+  "Regexp matching a line beginning a YAML block literal.")
+
+(defconst yaml-nested-sequence-re
+  (concat "^\\(?:\\(?: *- +\\)+\\|\\(:? *-$\\)\\)"
+          "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$")
+  "Regexp matching a line containing one or more nested YAML sequences.")
+
+(defconst yaml-constant-scalars-re
+  (concat "\\(?:^\\|\\(?::\\|-\\|,\\|{\\|\\[\\) +\\) *"
+          (regexp-opt
+           '("~" "null" "Null" "NULL"
+             ".nan" ".NaN" ".NAN"
+             ".inf" ".Inf" ".INF"
+             "-.inf" "-.Inf" "-.INF"
+             "y" "Y" "yes" "Yes" "YES" "n" "N" "no" "No" "NO"
+             "true" "True" "TRUE" "false" "False" "FALSE"
+             "on" "On" "ON" "off" "Off" "OFF") t)
+          " *$")
+  "Regexp matching certain scalar constants in scalar context.")
+
+
+;; Mode setup
+
+(defvar yaml-mode-map ()
+  "Keymap used in `yaml-mode' buffers.")
+(if yaml-mode-map
+    nil
+  (setq yaml-mode-map (make-sparse-keymap))
+  (define-key yaml-mode-map "|" 'yaml-electric-bar-and-angle)
+  (define-key yaml-mode-map ">" 'yaml-electric-bar-and-angle)
+  (define-key yaml-mode-map "-" 'yaml-electric-dash-and-dot)
+  (define-key yaml-mode-map "." 'yaml-electric-dash-and-dot)
+  (define-key yaml-mode-map [backspace] 'yaml-electric-backspace))
+
+(defvar yaml-mode-syntax-table nil
+  "Syntax table in use in `yaml-mode' buffers.")
+(if yaml-mode-syntax-table
+    nil
+  (setq yaml-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?\' "\"" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\" "\"" yaml-mode-syntax-table)
+  (modify-syntax-entry ?# "<" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\n ">" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\\ "\\" yaml-mode-syntax-table)
+  (modify-syntax-entry ?- "w" yaml-mode-syntax-table)
+  (modify-syntax-entry ?_ "_" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\( "." yaml-mode-syntax-table)
+  (modify-syntax-entry ?\) "." yaml-mode-syntax-table)
+  (modify-syntax-entry ?\{ "(}" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\} "){" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\[ "(]" yaml-mode-syntax-table)
+  (modify-syntax-entry ?\] ")[" yaml-mode-syntax-table))
+
+;;;###autoload
+(define-derived-mode yaml-mode text-mode "YAML"
+  "Simple mode to edit YAML.
+
+\\{yaml-mode-map}"
+  :syntax-table yaml-mode-syntax-table
+  (set (make-local-variable 'comment-start) "# ")
+  (set (make-local-variable 'comment-start-skip) "#+ *")
+  (set (make-local-variable 'indent-line-function) 'yaml-indent-line)
+  (set (make-local-variable 'indent-tabs-mode) nil)
+  (set (make-local-variable 'fill-paragraph-function) 'yaml-fill-paragraph)
+  (set (make-local-variable 'font-lock-defaults)
+       '(yaml-font-lock-keywords
+         nil nil nil nil
+         (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords)))
+  (if (fboundp 'font-lock-flush)
+      (font-lock-flush)
+    (with-no-warnings
+      (font-lock-fontify-buffer))))
+
+
+;; Font-lock support
+
+(defvar yaml-font-lock-keywords
+   (list
+    (cons yaml-constant-scalars-re '(1 font-lock-constant-face))
+    (cons yaml-tag-re '(0 font-lock-type-face))
+    (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face))
+    (cons yaml-hash-key-re '(1 font-lock-variable-name-face))
+    (cons yaml-document-delimiter-re '(0 font-lock-comment-face))
+    (cons yaml-directive-re '(1 font-lock-builtin-face))
+    '(yaml-font-lock-block-literals 0 font-lock-string-face)
+    '("^[\t]+" 0 'yaml-tab-face t))
+   "Additional expressions to highlight in YAML mode.")
+
+(defvar yaml-font-lock-syntactic-keywords
+  (list '(yaml-syntactic-block-literals 0 "."))
+  "Additional syntax features to highlight in YAML mode.")
+
+
+(defun yaml-font-lock-block-literals (bound)
+  "Find lines within block literals.
+Find the next line of the first (if any) block literal after point and
+prior to BOUND.  Returns the beginning and end of the block literal
+line in the match data, as consumed by `font-lock-keywords' matcher
+functions.  The function begins by searching backwards to determine
+whether or not the current line is within a block literal.  This could
+be time-consuming in large buffers, so the number of lines searched is
+artificially limitted to the value of
+`yaml-block-literal-search-lines'."
+  (if (eolp) (goto-char (1+ (point))))
+  (unless (or (eobp) (>= (point) bound))
+    (let ((begin (point))
+          (end (min (1+ (point-at-eol)) bound)))
+      (goto-char (point-at-bol))
+      (while (and (looking-at yaml-blank-line-re) (not (bobp)))
+        (forward-line -1))
+      (let ((nlines yaml-block-literal-search-lines)
+            (min-level (current-indentation)))
+      (forward-line -1)
+      (while (and (/= nlines 0)
+                  (/= min-level 0)
+                  (not (looking-at yaml-block-literal-re))
+                  (not (bobp)))
+        (set 'nlines (1- nlines))
+        (unless (looking-at yaml-blank-line-re)
+          (set 'min-level (min min-level (current-indentation))))
+        (forward-line -1))
+      (cond
+       ((and (< (current-indentation) min-level)
+             (looking-at yaml-block-literal-re))
+          (goto-char end) (set-match-data (list begin end)) t)
+         ((progn
+            (goto-char begin)
+            (re-search-forward (concat yaml-block-literal-re
+                                       " *\\(.*\\)\n")
+                               bound t))
+          (set-match-data (nthcdr 2 (match-data))) t))))))
+
+(defun yaml-syntactic-block-literals (bound)
+  "Find quote characters within block literals.
+Finds the first quote character within a block literal (if any) after
+point and prior to BOUND.  Returns the position of the quote character
+in the match data, as consumed by matcher functions in
+`font-lock-syntactic-keywords'.  This allows the mode to treat ['\"]
+characters in block literals as punctuation syntax instead of string
+syntax, preventing unmatched quotes in block literals from painting
+the entire buffer in `font-lock-string-face'."
+  (let ((found nil))
+    (while (and (not found)
+                (/= (point) bound)
+                (yaml-font-lock-block-literals bound))
+      (let ((begin (match-beginning 0)) (end (match-end 0)))
+        (goto-char begin)
+        (cond
+         ((re-search-forward "['\"]" end t) (setq found t))
+         ((goto-char end)))))
+    found))
+
+
+;; Indentation and electric keys
+
+(defun yaml-compute-indentation ()
+  "Calculate the maximum sensible indentation for the current line."
+  (save-excursion
+    (beginning-of-line)
+    (if (looking-at yaml-document-delimiter-re) 0
+      (forward-line -1)
+      (while (and (looking-at yaml-blank-line-re)
+                  (> (point) (point-min)))
+        (forward-line -1))
+      (+ (current-indentation)
+         (if (looking-at yaml-nested-map-re) yaml-indent-offset 0)
+         (if (looking-at yaml-nested-sequence-re) yaml-indent-offset 0)
+         (if (looking-at yaml-block-literal-re) yaml-indent-offset 0)))))
+
+(defun yaml-indent-line ()
+  "Indent the current line.
+The first time this command is used, the line will be indented to the
+maximum sensible indentation.  Each immediately subsequent usage will
+back-dent the line by `yaml-indent-offset' spaces.  On reaching column
+0, it will cycle back to the maximum sensible indentation."
+  (interactive "*")
+  (let ((ci (current-indentation))
+        (cc (current-column))
+        (need (yaml-compute-indentation)))
+    (save-excursion
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (if (and (equal last-command this-command) (/= ci 0))
+          (indent-to (* (/ (- ci 1) yaml-indent-offset) yaml-indent-offset))
+        (indent-to need)))
+      (if (< (current-column) (current-indentation))
+          (forward-to-indentation 0))))
+
+(defun yaml-electric-backspace (arg)
+  "Delete characters or back-dent the current line.
+If invoked following only whitespace on a line, will back-dent to the
+immediately previous multiple of `yaml-indent-offset' spaces."
+  (interactive "*p")
+  (if (or (/= (current-indentation) (current-column)) (bolp))
+      (funcall yaml-backspace-function arg)
+    (let ((ci (current-column)))
+      (beginning-of-line)
+      (delete-horizontal-space)
+      (indent-to (* (/ (- ci (* arg yaml-indent-offset))
+                       yaml-indent-offset)
+                    yaml-indent-offset)))))
+
+(defun yaml-electric-bar-and-angle (arg)
+  "Insert the bound key and possibly begin a block literal.
+Inserts the bound key.  If inserting the bound key causes the current
+line to match the initial line of a block literal, then inserts the
+matching string from `yaml-block-literal-electric-alist', a newline,
+and indents appropriately."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (let ((extra-chars
+         (assoc last-command-event
+                yaml-block-literal-electric-alist)))
+    (cond
+     ((and extra-chars (not arg) (eolp)
+           (save-excursion
+             (beginning-of-line)
+             (looking-at yaml-block-literal-re)))
+      (insert (cdr extra-chars))
+      (newline-and-indent)))))
+
+(defun yaml-electric-dash-and-dot (arg)
+  "Insert the bound key and possibly de-dent line.
+Inserts the bound key.  If inserting the bound key causes the current
+line to match a document delimiter, de-dent the line to the left
+margin."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (save-excursion
+    (beginning-of-line)
+    (if (and (not arg) (looking-at yaml-document-delimiter-re))
+        (delete-horizontal-space))))
+
+(defun yaml-narrow-to-block-literal ()
+  "Narrow the buffer to block literal if the point is in it,
+otherwise do nothing."
+  (interactive)
+  (save-excursion
+    (goto-char (point-at-bol))
+    (while (and (looking-at-p yaml-blank-line-re) (not (bobp)))
+      (forward-line -1))
+    (let ((nlines yaml-block-literal-search-lines)
+	  (min-level (current-indentation))
+	  beg)
+      (forward-line -1)
+      (while (and (/= nlines 0)
+		  (/= min-level 0)
+		  (not (looking-at-p yaml-block-literal-re))
+		  (not (bobp)))
+	(set 'nlines (1- nlines))
+	(unless (looking-at-p yaml-blank-line-re)
+	  (set 'min-level (min min-level (current-indentation))))
+	(forward-line -1))
+      (when (and (< (current-indentation) min-level)
+		  (looking-at-p yaml-block-literal-re))
+	(set 'min-level (current-indentation))
+	(forward-line)
+	(setq beg (point))
+	(while (and (not (eobp))
+		    (or (looking-at-p yaml-blank-line-re)
+			(> (current-indentation) min-level)))
+	  (forward-line))
+	(narrow-to-region beg (point))))))
+
+(defun yaml-fill-paragraph (&optional justify region)
+  "Fill paragraph.
+This behaves as `fill-paragraph' except that filling does not
+cross boundaries of block literals."
+  (interactive "*P")
+  (save-restriction
+    (yaml-narrow-to-block-literal)
+    (let ((fill-paragraph-function nil))
+      (fill-paragraph justify region))))
+
+(defun yaml-set-imenu-generic-expression ()
+  (make-local-variable 'imenu-generic-expression)
+  (make-local-variable 'imenu-create-index-function)
+  (setq imenu-create-index-function 'imenu-default-create-index-function)
+  (setq imenu-generic-expression yaml-imenu-generic-expression))
+
+(add-hook 'yaml-mode-hook 'yaml-set-imenu-generic-expression)
+
+
+(defun yaml-mode-version ()
+  "Diplay version of `yaml-mode'."
+  (interactive)
+  (message "yaml-mode %s" yaml-mode-version)
+  yaml-mode-version)
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.e?ya?ml$" . yaml-mode))
+
+(provide 'yaml-mode)
+
+;;; yaml-mode.el ends here
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/README.md b/emacs.d/elpa/yasnippet-20150415.244/snippets/README.md
deleted file mode 100644
index 5195d7d..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-In this repository there is a colletion of my personal [yasnippet](http://github.com/capitaomorte/yasnippet)
-snippets for many different Emacs modes.
-
-
-# How to use
-
-1. install yasnippet
-3. add to your .emacs the following
-   - (add-to-list 'yas/root-directory "$DIRECTORY_WHERE_YOU_CLONED")
-   - (yas/initialize)
-4. M-x yas/reload-all to activate them
-
-# Contributing
-
-This repository has now become the default snippets repository (as a submodule) in yasnippet.
-So if you have any useful snippets for any language or framework please feel free to contribute.
-
-To study the current snippets I suggest to use M-x yas/describe-tables
-which will gave a table representation of all the snippets available in the current mode.
-
-
-# Guidelines
-
-Snippets need to be generic enough to be useful for everyone, and not contain anything specific to your own system.
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/beginend b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/beginend
deleted file mode 100644
index 590c708..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/beginend
+++ /dev/null
@@ -1,4 +0,0 @@
-#name : v.begin(), v.end()
-# key: beginend
-# --
-${1:v}.begin(), $1.end
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cout b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cout
deleted file mode 100644
index 37cb8fa..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cout
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: cout
-# key: cout
-# --
-std::cout << ${1:string} $0<< std::endl;
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/namespace b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/namespace
deleted file mode 100644
index 44faf68..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/namespace
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: namespace
-# key: ns
-# --
-namespace ${1:Namespace} {
-          
-          `yas/selected-text`
-
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator!= b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator!=
deleted file mode 100644
index ed69ba1..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator!=
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator!=
-# key: !=
-# group: operator overloading
-# --
-bool ${1:MyClass}::operator!=(const $1 &other) const {
-    return !(*this == other);
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator= b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator=
deleted file mode 100644
index d5cb053..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator=
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator=
-# key: =
-# where this is a reference to myself
-# group: operator overloading
-# --
-${1:MyClass}& $1::operator=(const $1 &rhs) {
-    // Check for self-assignment!
-    if (this == &rhs)
-      return *this;
-    $0
-    return *this;
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator== b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator==
deleted file mode 100644
index 27f9ee5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator==
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator==
-# key: ==
-# group: operator overloading
-# --
-bool ${1:MyClass}::operator==(const $1 &other) const {
-     $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator_istream b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator_istream
deleted file mode 100644
index 5986507..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator_istream
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator>>
-# key: >>
-# group: operator overloading
-# --
-istream& operator>>(istream& s, const ${1:type}& ${2:c})
-{
-         $0
-}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator_ostream b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator_ostream
deleted file mode 100644
index c5b2ae7..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator_ostream
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator<<
-# key: <<
-# group: operator overloading
-# --
-std::ostream& operator<<(std::ostream& s, const ${1:type}& ${2:c})
-{
-         $0
-         return s;
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/pack b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/pack
deleted file mode 100644
index add5420..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/pack
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: pack
-# key: pack
-# --
-void cNetCommBuffer::pack(${1:type}) {
-
-}
-
-$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test_main b/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test_main
deleted file mode 100644
index 59ef65f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test_main
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_main
-# key: test_main
-# group: testing
-# --
-int main(int argc, char **argv) {
-      ::testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/fopen b/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/fopen
deleted file mode 100644
index 0e48c21..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/fopen
+++ /dev/null
@@ -1,4 +0,0 @@
-#name : FILE *fp = fopen(..., ...);
-# key: fopen
-# --
-FILE *${fp} = fopen(${"file"}, "${r}");
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/switch b/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/switch
deleted file mode 100644
index 0916059..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/switch
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: switch
-# key: case
-# --
-switch (${1:ch}) {
-       case ${2:const}:
-       ${3:a = b};
-       break;
-       ${4:default:
-       ${5:action}}
-}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/if b/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/if
deleted file mode 100644
index a52bee9..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/if
+++ /dev/null
@@ -1,7 +0,0 @@
-#name : if (...) { ... }
-# key: cc-modeif
-# --
-if (${1:condition})
-{
-    $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/inc b/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/inc
deleted file mode 100644
index 3186ad6..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#name : #include "..."
-#key  : inc
-# --
-#include "$1"
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/inc.1 b/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/inc.1
deleted file mode 100644
index f54377b..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/inc.1
+++ /dev/null
@@ -1,4 +0,0 @@
-#name : #include <...>
-#key  : inc
-# --
-#include <$1>
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/v b/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/v
deleted file mode 100644
index ec2e5c7..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/v
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: -vendor-prefix
-# contributor: Prateek Saxena
-# key: -v
-# binding: direct-keybinding
-# --
-$1: $2;
--webkit-$1: $2;
--moz-$1: $2;
--ms-$1: $2;
--o-$1: $2;
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/au b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/au
deleted file mode 100644
index 1f0af73..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/au
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : automatic
-# --
-automatic $0 
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/eq b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/eq
deleted file mode 100644
index 0c6d09f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/eq
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : equivalence
-# --
-equivalence $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ib b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ib
deleted file mode 100644
index 9275a12..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ib
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : implicit byte
-# --
-implicit byte $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ic b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ic
deleted file mode 100644
index 79842ea..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ic
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : implicit complex
-# --
-implicit complex $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ich b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ich
deleted file mode 100644
index 53c7f81..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ich
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : implicit character
-# --
-implicit character $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ii b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ii
deleted file mode 100644
index 4b1fee5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ii
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : implicit integer 
-# --
-implicit integer $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/il b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/il
deleted file mode 100644
index 8658af5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/il
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : implicit logical
-# --
-implicit logical $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ir b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ir
deleted file mode 100644
index fb37082..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ir
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : implicit real
-# --
-implicit real $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pr b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pr
deleted file mode 100644
index 24fc8c9..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pr
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jonas Kalderstam <jonas@kalderstam.se>
-# name: program ... end program ...
-# key: pr
-# --
-program ${1:name}
-  ${2:implicit none}
-
-  $0
-
-end program $1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/purefunc b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/purefunc
deleted file mode 100644
index eeb3a06..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/purefunc
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jonas Kalderstam <jonas@kalderstam.se>
-# name: pure function .. end function
-# key: pure function
-# --
-pure function ${1:name} (${2:arg})
-  ${3:real} :: $1
-  ${4:real, intent(in)} :: $2
-
-  $0
-
-end function $1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/puresub b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/puresub
deleted file mode 100644
index cc908d0..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/puresub
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jonas Kalderstam <jonas@kalderstam.se>
-# name: pure subroutine ... end subroutine ...
-# key: pure sub
-# --
-pure subroutine ${1:name} (${2:arg})
-  ${3:real, intent(in) :: $2}
-
-  $0
-end subroutine $1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/st b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/st
deleted file mode 100644
index 23ae7d0..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/st
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor: Li Zhu <http://www.zhuli.name>
-#name : structure
-# --
-structure $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/su b/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/su
deleted file mode 100644
index 63fea4a..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/su
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jonas Kalderstam <jonas@kalderstam.se>
-# name: subroutine ... end subroutine ...
-# key: su
-# --
-subroutine ${1:name} (${2:arg})
-  ${3:real, intent(in) :: $2}
-
-  $0
-end subroutine $1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/func b/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/func
deleted file mode 100644
index 3b2e0f5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/func
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: func
-# key: func
-# --
-//
-func ${1:name}(${2:args}) $3 {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/main b/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/main
deleted file mode 100644
index 6b9f03a..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/main
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# --
-main = do $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/.yas-parents b/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/.yas-parents
deleted file mode 100644
index 917ade6..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-nxml-mode
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dov b/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dov
deleted file mode 100644
index e8341ea..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dov
+++ /dev/null
@@ -1,11 +0,0 @@
-#name : <dov...>...</dov>
-# --
-a mirror up here $3
-
-
-<dov ${1:id="${2:some_id and here comes another nested field: ${3:nested_shit}}"}>
-    $0
-</dov>
-<dov $1>
-    actually some other shit and $3
-</dov>
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/meta.http-equiv b/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/meta.http-equiv
deleted file mode 100644
index c059a44..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/meta.http-equiv
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <meta http-equiv="..." content="..." />
-#group : meta
-# --
-<meta name="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/method b/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/method
deleted file mode 100644
index 740a7d8..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/method
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: method
-# --
-${1:public }${2:void} ${3:name} (${4:args}) {
-           $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/return b/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/return
deleted file mode 100644
index 7ac0f8a..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/return
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: ret
-# --
-@return ${1:description}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/this b/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/this
deleted file mode 100644
index c7beeb4..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/this
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: this
-# key: .
-# --
-this.$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/def b/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/def
deleted file mode 100644
index 1c0c692..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/def
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#name : function
-# --
-${1:name}: function($2) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/f b/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/f
deleted file mode 100644
index 0cbaf77..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/f
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#name : anonymous function
-# --
-function($1) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js2-mode/.yas-parents b/emacs.d/elpa/yasnippet-20150415.244/snippets/js2-mode/.yas-parents
deleted file mode 100644
index 6d4bce1..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/js2-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-js-mode
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/itemize b/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/itemize
deleted file mode 100644
index 58610e1..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/itemize
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: itemize
-# key: it
-# --
-\begin{itemize}
-$0
-\end{itemize}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/blog b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/blog
deleted file mode 100644
index 35f8fe1..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/blog
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: blog
-# key: blog
-# --
-#+STARTUP: showall indent
-#+STARTUP: hidestars
-#+BEGIN_HTML
----
-layout: default
-title: ${1:title}
-excerpt: ${2:excerpt}
----
-$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/code b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/code
deleted file mode 100644
index ee44661..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/code
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: code
-# key: code
-# --
-#+begin_${1:lang} ${2:options}
-$0
-#+end_$1
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/dot b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/dot
deleted file mode 100644
index 3e61452..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/dot
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: dot
-# key: dot
-# --
-#+begin_src dot :file ${1:file} :cmdline -T${2:pdf} :exports none :results silent
-            $0
-#+end_src
-
-[[file:$1]]
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/elisp b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/elisp
deleted file mode 100644
index 6dcc947..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/elisp
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: elisp
-# key: elisp
-# --
-#+begin_src emacs-lisp :tangle yes
-$0
-#+end_src
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/embedded b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/embedded
deleted file mode 100644
index 5a30be4..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/embedded
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: embedded
-# key: emb
-# --
-src_${1:lang}${2:[${3:where}]}{${4:code}}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/entry b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/entry
deleted file mode 100644
index 6322d66..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/entry
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: entry
-# key: entry
-# --
-#+begin_html
----
-layout: ${1:default}
-title: ${2:title}
----
-#+end_html
-$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/figure b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/figure
deleted file mode 100644
index 6aed9d5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/figure
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: figure
-# key: fig
-# --
-#+CAPTION: ${1:caption}
-#+ATTR_LaTeX: ${2:scale=0.75}
-#+LABEL: fig:${3:label}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/img b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/img
deleted file mode 100644
index fc5d289..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/img
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: img
-# key: img
-# --
-<img src="$1"
- alt="$2" align="${3:left}"
- title="${4:image title}"
- class="img"
-</img>
-$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/latex b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/latex
deleted file mode 100644
index 31dc3b5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/latex
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: latex
-# key: latex
-# --
-#+BEGIN_LaTeX
-$0
-#+END_LaTeX
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/matrix b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/matrix
deleted file mode 100644
index 3402b9e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/matrix
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: matrix
-# key: matrix
-# possible improvement, compute the number of lines from the argument to array
-# --
-\left \(
-\begin{array}{${1:ccc}}
-${2:v1 & v2} \\
-$0
-\end{array}
-\right \)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/src b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/src
deleted file mode 100644
index 3ea8615..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/src
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: src
-# key: src
-# --
-#+begin_src ${1:language}
-$0
-#+end_src
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/srcname b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/srcname
deleted file mode 100644
index 93b00a2..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/srcname
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: srcname
-# key: name
-# --
-#+srcname: $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/verse b/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/verse
deleted file mode 100644
index 648b270..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/org-mode/verse
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: verse
-# key: verse
-# --
-#+begin_verse
-        $0
-#+end_verse
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/fixme b/emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/fixme
deleted file mode 100644
index a7ee00e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/fixme
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: fixme
-# key: fi
-# --
-`(yas-with-comment "FIXME: ")`
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/cls b/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/cls
deleted file mode 100644
index 9f8b27c..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/cls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: cls
-# key: cls
-# group: object oriented
-# --
-class ${1:class}:
-    $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/logger_name b/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/logger_name
deleted file mode 100644
index a1bef9b..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/logger_name
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: logger_name
-# key: ln
-# --
-logger = logging.getLogger(__name__)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/act b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/act
deleted file mode 100644
index 931387c..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/act
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def act = { ..}
-# key: act
-# --
-def act = {
-  loop {
-    react {
-      $0
-    }
-  }
-}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/act.arg b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/act.arg
deleted file mode 100644
index 5a382db..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/act.arg
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def act(arg: T) = { ..}
-# key: act
-# --
-def act(${1:arg}: ${2:type}) = {
-  loop {
-    react {
-      $0
-    }
-  }
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/actor b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/actor
deleted file mode 100644
index 6dd647c..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/actor
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val a = actor { ..}
-# key: actor
-# --
-val a = actor {
-  loop {
-    react {
-      $0
-    }
-  }
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ano b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ano
deleted file mode 100644
index 977cb35..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ano
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : (args) => ...
-# key: =>
-# --
-($1) => ${2:body} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/arr.new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/arr.new
deleted file mode 100644
index 20a3f07..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/arr.new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : Array[T](..)
-# key: arr.new
-# --
-Array[${1:value}](${2:args}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/arr.val-new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/arr.val-new
deleted file mode 100644
index 73bc1be..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/arr.val-new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val a = Array[T](..)
-# key: arr.new
-# --
-val ${1:arr} = Array[${2:value}](${3:args}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/asof b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/asof
deleted file mode 100644
index c63d143..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/asof
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : asInstanceOf[T] 
-# key: asof
-# --
-asInstanceOf[${1:type}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ass b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ass
deleted file mode 100644
index 8c6a011..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ass
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : assert(x === y)
-# key: ass
-# --
-assert(${1:x} === ${2:y}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ass.true b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ass.true
deleted file mode 100644
index b2af602..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ass.true
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : assert(true)
-# key: ass
-# --
-assert(true) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.author b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.author
deleted file mode 100644
index 476bd80..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.author
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : @author name
-# key: at.author
-# --
-@author ${1:name} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.param b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.param
deleted file mode 100644
index 38a22b6..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.param
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : @param name description
-# key: at
-# --
-@param ${1:name} ${2:description} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.return b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.return
deleted file mode 100644
index f8113b8..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.return
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : @return description
-# key: at
-# --
-@return ${1:description} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.version b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.version
deleted file mode 100644
index 4bfe358..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/at.version
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : @version number
-# key: at
-# --
-@version ${1:0.1} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/bang b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/bang
deleted file mode 100644
index 403f92e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/bang
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : actor ! message
-# key: !
-# --
-${1:actor} ! ${2:message} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/case b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/case
deleted file mode 100644
index 07bb83d..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/case
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : case pattern => 
-# key: case
-# --
-case ${1:pattern} => $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/case.match-all b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/case.match-all
deleted file mode 100644
index b3f61a8..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/case.match-all
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : case _ =>
-# key: case
-# --
-case _ => $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cast b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cast
deleted file mode 100644
index 0d9f957..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cast
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : asInstanceOf[T] 
-# key: cast
-# --
-asInstanceOf[${1:type}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cc b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cc
deleted file mode 100644
index b7e0457..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cc
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : case class T(arg: A)
-# key: cc
-# --
-case class ${1:name}(${2:arg}: ${3:type}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl
deleted file mode 100644
index 6ef5f41..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : class T { .. }
-# key: cl
-# --
-class ${1:name} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.abs b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.abs
deleted file mode 100644
index 6865f31..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.abs
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : abstract class T { .. }
-# key: cl
-# --
-abstract class ${1:name} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.abs-arg b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.abs-arg
deleted file mode 100644
index 3c71147..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.abs-arg
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : abstract class T(args) { .. }
-# key: cl
-# --
-abstract class ${1:name}(${2:args}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.arg b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.arg
deleted file mode 100644
index e5432c7..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cl.arg
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : class T(args) { .. }
-# key: cl
-# --
-class ${1:name}(${2:args}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/clof b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/clof
deleted file mode 100644
index 4335b0f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/clof
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : classOf[T] 
-# key: clof
-# --
-classOf[${1:type}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cons.nil b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cons.nil
deleted file mode 100644
index 719b4c9..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cons.nil
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : element1 :: Nil
-# key: cons
-# --
-${1:element1} :: Nil $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg
deleted file mode 100644
index 9db761a..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f(arg: T) = ...
-# key: def
-# --
-def ${1:name}(${2:args}) = $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-body b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-body
deleted file mode 100644
index 189a05e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-body
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f(arg: T) = {...}
-# key: def
-# --
-def ${1:name}(${2:args}) = {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-ret b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-ret
deleted file mode 100644
index 8f26674..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-ret
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f(arg: T): R = ...
-# key: def
-# --
-def ${1:name}(${2:args}): ${3:Unit} = $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.body b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.body
deleted file mode 100644
index 1ee0c83..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.body
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f = {...}
-# key: def
-# --
-def ${1:name} = {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.ret b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.ret
deleted file mode 100644
index 8e261bf..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.ret
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f: R = ...
-# key: def
-# --
-def ${1:name}: ${2:Unit} = $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.ret-body b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.ret-body
deleted file mode 100644
index de45cc4..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.ret-body
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f: R = {...}
-# key: def
-# --
-def ${1:name}: ${3:Unit} = {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.simple b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.simple
deleted file mode 100644
index db37cea..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.simple
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : def f = ...
-# key: def
-# --
-def ${1:name} = $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.class b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.class
deleted file mode 100644
index 3c3a26e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.class
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : /** cls/trt/obj name */
-# key: doc
-# --
-/**
- * `(scala-mode-find-clstrtobj-name-doc)`
- * ${1:description}
- * $0
- */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.def b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.def
deleted file mode 100644
index 072cf5e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.def
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : /** method name */
-# key: doc
-# --
-/**
- * `(scala-mode-def-and-args-doc)`
- */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file
deleted file mode 100644
index 5d3f101..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : /** file name */
-# key: doc.file
-# --
-/**
- * `(scala-mode-file-doc)`
- * $0
- * @author ${1:name}
- * @version ${2:0.1} 
- */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file-scala b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file-scala
deleted file mode 100644
index 7814b26..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file-scala
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : /** scala file */
-# key: doc.file-scala
-# --
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala $3                               **
-**    / __/ __// _ | / /  / _ |    (c) 2005-`(format-time-string "%Y")` , LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-/** 
- * $0
- * @author ${1:name} 
- * @version ${2:0.1}
- * $Id$
- */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file-scala-api b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file-scala-api
deleted file mode 100644
index 67bf231..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.file-scala-api
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : /** scala api file */
-# key: doc.file-scala-api
-# --
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2005-`(format-time-string "%Y")`, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-/** 
- * $0
- * @author ${1:name} 
- * @version ${2:0.1}
- * $Id$
- */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.scaladoc b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.scaladoc
deleted file mode 100644
index 2cd2903..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/doc.scaladoc
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : /** ... */
-# key: doc.scaladoc
-# --
-/**
- * ${1:description}
- * $0
- */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/expect b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/expect
deleted file mode 100644
index 3240a47..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : expect(value) { ..}
-# key: expect
-# --
-expect(${1:reply}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ext b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ext
deleted file mode 100644
index 1887169..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ext
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : extends T
-# key: ext
-# --
-extends $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.extract b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.extract
deleted file mode 100644
index fac0447..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.extract
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : x <- xs
-# key: for.extract
-# --
-${1:x} <- ${2:xs}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.if b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.if
deleted file mode 100644
index 15e4b7a..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.if
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : for (x <- xs if guard) { ... }
-# key: for
-# --
-for (${1:x} <- ${2:xs} if ${3:guard}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.loop b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.loop
deleted file mode 100644
index 8dff38f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.loop
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : for (x <- xs) { ... }
-# key: for
-# --
-for (${1:x} <- ${2:xs}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.multi b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.multi
deleted file mode 100644
index 26cac86..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/for.multi
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : for {x <- xs \ y <- ys} { yield }
-# key: for
-# --
-for {
-  ${1:x} <- ${2:xs}
-  ${3:x} <- ${4:xs}
-} {
-  yield $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/foreach b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/foreach
deleted file mode 100644
index 0b7946f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/foreach
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : foreach(x => ..)
-# key: foreach
-# --
-foreach(${1:x} => ${2:body}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hmap.new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hmap.new
deleted file mode 100644
index 3311255..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hmap.new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : new HashMap[K, V]
-# key: hmap.new
-# --
-new HashMap[${1:key}, ${2:value}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hmap.val-new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hmap.val-new
deleted file mode 100644
index 35544c6..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hmap.val-new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val m = new HashMap[K, V]
-# key: hmap.val-new
-# --
-val ${1:m} = new HashMap[${2:key}, ${3:value}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hset.new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hset.new
deleted file mode 100644
index 249742f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hset.new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : new HashSet[K]
-# key: hset.new
-# --
-new HashSet[${1:key}] $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hset.val-new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hset.val-new
deleted file mode 100644
index 98ae6e3..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/hset.val-new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val m = new HashSet[K]
-# key: hset.val-new
-# --
-val ${1:m} = new HashSet[${2:key}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/if.else b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/if.else
deleted file mode 100644
index e3c0bb3..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/if.else
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : if (cond) { .. } else { .. }
-# key: if
-# --
-if (${1:condition}) {
-  $2
-} else {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/imp b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/imp
deleted file mode 100644
index ff679b8..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/imp
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : import ..
-# key: imp
-# --
-import $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/intercept b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/intercept
deleted file mode 100644
index 1ac150e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/intercept
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : intercept(classOf[T]) { ..}
-# key: intercept
-# --
-intercept(classOf[${1:Exception]}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/isof b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/isof
deleted file mode 100644
index 43aef58..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/isof
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : isInstanceOf[T] 
-# key: isof
-# --
-isInstanceOf[${1:type}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ls.val-new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ls.val-new
deleted file mode 100644
index d24109f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ls.val-new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val l = List(..)
-# key: ls
-# --
-val ${1:l} = List(${2:args}, ${3:args}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/map b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/map
deleted file mode 100644
index 546f162..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/map
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : map(x => ..)
-# key: map
-# --
-map(${1:x} => ${2:body}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/map.new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/map.new
deleted file mode 100644
index cc3d43f..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/map.new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : Map(key -> value)
-# key: map
-# --
-Map(${1:key} -> ${2:value}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match.can b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match.can
deleted file mode 100644
index aa4f9f5..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match.can
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : can match { case Full(res) => .. }
-# key: match
-# --
-${1:option} match {
-  case Full(res) => $0
-
-  case Empty =>
-
-  case Failure(msg, _, _) =>
-
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match.option b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match.option
deleted file mode 100644
index 134bc53..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match.option
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : option match { case None => .. }
-# key: match
-# --
-${1:option} match {
-  case None => $0
-  case Some(res) =>
-
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/mix b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/mix
deleted file mode 100644
index d61eb51..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/mix
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : trait T { .. }
-# key: mix
-# --
-trait ${1:name} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pac b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pac
deleted file mode 100644
index b36509c..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pac
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : package ..
-# key: pac
-# --
-package $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.newline b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.newline
deleted file mode 100644
index 5f805fc..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.newline
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : println(..)
-# key: pr.newline
-# --
-println(${1:obj}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.simple b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.simple
deleted file mode 100644
index c676790..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.simple
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : print(..)
-# key: pr
-# --
-print(${1:obj}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.string b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.string
deleted file mode 100644
index ded8178..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.string
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : println("..")
-# key: pr
-# --
-println("${1:msg}") $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.trace b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.trace
deleted file mode 100644
index 9ec9e79..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pr.trace
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : println("obj: " + obj)
-# key: pr
-# --
-println("${1:obj}: " + ${1:obj}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pri b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pri
deleted file mode 100644
index 42a2561..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pri
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : private
-# key: pri
-# --
-private $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pri.param b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pri.param
deleted file mode 100644
index b887cad..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pri.param
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : private[this]
-# key: pri.param
-# --
-private[${1:this}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pro b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pro
deleted file mode 100644
index ca7009c..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pro
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : protected
-# key: pro
-# --
-protected $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pro.param b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pro.param
deleted file mode 100644
index c399064..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/pro.param
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : protected[this]
-# key: prno
-# --
-protected[${1:this}] $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/suite b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/suite
deleted file mode 100644
index 8cad2c4..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/suite
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : class T extends Suite { .. }
-# key: suite
-# --
-import org.scalatest._
-
-class ${1:name} extends Suite {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/test b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/test
deleted file mode 100644
index a8a3f00..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/test
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : @Test def testX = ...
-# key: test
-# --
-//@Test
-def test${1:name} = {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr
deleted file mode 100644
index 10c5cf3..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : trait T { .. }
-# key: tr
-# --
-trait ${1:name} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.ext b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.ext
deleted file mode 100644
index 684af94..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.ext
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : trait T extends C { .. }
-# key: tr
-# --
-trait ${1:name} extends ${2:class} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.ext-with b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.ext-with
deleted file mode 100644
index 99b75ee..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.ext-with
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : trait T1 extends C with T2 { .. }
-# key: tr
-# --
-trait ${1:name} extends ${2:class} with ${3:trait} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.with b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.with
deleted file mode 100644
index c513c6d..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tr.with
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
-#name : trait T1 with T2 { .. }
-# key: tr.with
-# --
-trait ${1:name} with ${2:trait} {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try
deleted file mode 100644
index b218af1..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : try { .. } catch { case e => ..}
-# key: try
-# --
-try {
-  $0
-} catch {
-  case ${1:e}: ${2:Exception} => 
-    ${1:println(\"ERROR: \" + e) // TODO: handle exception}\n}
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try.catch-finally b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try.catch-finally
deleted file mode 100644
index dc23e69..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try.catch-finally
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : try { .. } catch { case e => ..} finally { ..}
-# key: try
-# --
-try {
-  $0
-} catch {
-  case ${1:e}: ${2:Exception} =>
-    ${1:println(\"ERROR: \" + e) // TODO: handle exception}\n}
-} finally {
-
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try.finally b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try.finally
deleted file mode 100644
index f61f37b..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/try.finally
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : try { .. } finally { .. }
-# key: try
-# --
-try {
-
-} finally {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tup.arrow b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tup.arrow
deleted file mode 100644
index 8eded66..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tup.arrow
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : element1 -> element2
-# key: tup.arrow
-# --
-${1:element1} -> ${2:element2} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tup.paren b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tup.paren
deleted file mode 100644
index f56801d..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/tup.paren
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : (element1, element2)
-# key: tup.paren
-# --
-(${1:element1}, ${2:element2}) $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val
deleted file mode 100644
index e8e43f8..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val name = ..
-# key: val
-# --
-val ${1:name} = ${2:obj} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val.new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val.new
deleted file mode 100644
index e419690..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val.new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val name = new ..
-# key: val
-# --
-val ${1:name} = new ${2:obj} $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val.ret b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val.ret
deleted file mode 100644
index f8d8788..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/val.ret
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : val name: T = ..
-# key: val
-# --
-val ${1:name}: ${2:T} = ${3:obj} $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var
deleted file mode 100644
index 5d78444..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : var name = ..
-# key: var
-# --
-var ${1:name} = ${2:obj} $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var.new b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var.new
deleted file mode 100644
index c22a15c..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var.new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : var name = new ..
-# key: var.new
-# --
-var ${1:name} = new ${2:obj} $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var.ret b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var.ret
deleted file mode 100644
index af5f860..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/var.ret
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : var name: T = ..
-# key: var.ret
-# --
-var ${1:name}: ${2:T} = ${3:obj} $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/whi b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/whi
deleted file mode 100644
index 141efa1..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/whi
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : while(cond) { .. }
-# key: whi
-# --
-while (${1:condition}) {
-  $0
-}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/with b/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/with
deleted file mode 100644
index 19f5dea..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/with
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-#Author : Jonas Bonèr <jonas@jonasboner.com>
-#name : with T
-# key: with
-# --
-with $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/bang b/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/bang
deleted file mode 100644
index ad1d20e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/bang
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: bang
-# key: !
-# --
-#!/bin/bash
-$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/yasnippet-autoloads.el b/emacs.d/elpa/yasnippet-20150415.244/yasnippet-autoloads.el
deleted file mode 100644
index b88b849..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/yasnippet-autoloads.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; yasnippet-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "yasnippet" "yasnippet.el" (21837 24187 0 0))
-;;; Generated autoloads from yasnippet.el
-
-(autoload 'yas-minor-mode "yasnippet" "\
-Toggle YASnippet mode.
-
-When YASnippet mode is enabled, `yas-expand', normally bound to
-the TAB key, expands snippets of code depending on the major
-mode.
-
-With no argument, this command toggles the mode.
-positive prefix argument turns on the mode.
-Negative prefix argument turns off the mode.
-
-Key bindings:
-\\{yas-minor-mode-map}
-
-\(fn &optional ARG)" t nil)
-
-(defvar yas-global-mode nil "\
-Non-nil if Yas-Global mode is enabled.
-See the command `yas-global-mode' for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `yas-global-mode'.")
-
-(custom-autoload 'yas-global-mode "yasnippet" nil)
-
-(autoload 'yas-global-mode "yasnippet" "\
-Toggle Yas minor mode in all buffers.
-With prefix ARG, enable Yas-Global mode if ARG is positive;
-otherwise, disable it.  If called from Lisp, enable the mode if
-ARG is omitted or nil.
-
-Yas minor mode is enabled in all buffers where
-`yas-minor-mode-on' would do it.
-See `yas-minor-mode' for more information on Yas minor mode.
-
-\(fn &optional ARG)" t nil)
-
-;;;***
-
-;;;### (autoloads nil nil ("yasnippet-pkg.el") (21837 24187 76505
-;;;;;;  0))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; yasnippet-autoloads.el ends here
diff --git a/emacs.d/elpa/yasnippet-20150415.244/yasnippet-pkg.el b/emacs.d/elpa/yasnippet-20150415.244/yasnippet-pkg.el
deleted file mode 100644
index 34bd58e..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/yasnippet-pkg.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(define-package "yasnippet" "20150415.244" "Yet another snippet extension for Emacs." 'nil :url "http://github.com/capitaomorte/yasnippet" :keywords
-  '("convenience" "emulation"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs.d/elpa/yasnippet-20150415.244/yasnippet.el b/emacs.d/elpa/yasnippet-20150415.244/yasnippet.el
deleted file mode 100644
index 305bb95..0000000
--- a/emacs.d/elpa/yasnippet-20150415.244/yasnippet.el
+++ /dev/null
@@ -1,4582 +0,0 @@
-;;; yasnippet.el --- Yet another snippet extension for Emacs.
-
-;; Copyright (C) 2008-2013, 2015 Free Software Foundation, Inc.
-;; Authors: pluskid <pluskid@gmail.com>,  João Távora <joaotavora@gmail.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
-;; Version: 0.8.1
-;; Package-version: 0.8.0
-;; X-URL: http://github.com/capitaomorte/yasnippet
-;; Keywords: convenience, emulation
-;; URL: http://github.com/capitaomorte/yasnippet
-;; EmacsWiki: YaSnippetMode
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;;   Basic steps to setup:
-;;
-;;    (add-to-list 'load-path
-;;                 "~/path-to-yasnippet")
-;;    (require 'yasnippet)
-;;    (yas-global-mode 1)
-;;
-;;
-;;   Interesting variables are:
-;;
-;;       `yas-snippet-dirs'
-;;
-;;           The directory where user-created snippets are to be
-;;           stored.  Can also be a list of directories.  In that case,
-;;           when used for bulk (re)loading of snippets (at startup or
-;;           via `yas-reload-all'), directories appearing earlier in
-;;           the list override other dir's snippets.  Also, the first
-;;           directory is taken as the default for storing the user's
-;;           new snippets.
-;;
-;;           The deprecated `yas/root-directory' aliases this variable
-;;           for backward-compatibility.
-;;
-;;
-;;   Major commands are:
-;;
-;;       M-x yas-expand
-;;
-;;           Try to expand snippets before point.  In `yas-minor-mode',
-;;           this is normally bound to TAB, but you can customize it in
-;;           `yas-minor-mode-map'.
-;;
-;;       M-x yas-load-directory
-;;
-;;           Prompts you for a directory hierarchy of snippets to load.
-;;
-;;       M-x yas-activate-extra-mode
-;;
-;;           Prompts you for an extra mode to add snippets for in the
-;;           current buffer.
-;;
-;;       M-x yas-insert-snippet
-;;
-;;           Prompts you for possible snippet expansion if that is
-;;           possible according to buffer-local and snippet-local
-;;           expansion conditions.  With prefix argument, ignore these
-;;           conditions.
-;;
-;;       M-x yas-visit-snippet-file
-;;
-;;           Prompts you for possible snippet expansions like
-;;           `yas-insert-snippet', but instead of expanding it, takes
-;;           you directly to the snippet definition's file, if it
-;;           exists.
-;;
-;;       M-x yas-new-snippet
-;;
-;;           Lets you create a new snippet file in the correct
-;;           subdirectory of `yas-snippet-dirs', according to the
-;;           active major mode.
-;;
-;;       M-x yas-load-snippet-buffer
-;;
-;;           When editing a snippet, this loads the snippet.  This is
-;;           bound to "C-c C-c" while in the `snippet-mode' editing
-;;           mode.
-;;
-;;       M-x yas-tryout-snippet
-;;
-;;           When editing a snippet, this opens a new empty buffer,
-;;           sets it to the appropriate major mode and inserts the
-;;           snippet there, so you can see what it looks like.  This is
-;;           bound to "C-c C-t" while in `snippet-mode'.
-;;
-;;       M-x yas-describe-tables
-;;
-;;           Lists known snippets in a separate buffer.  User is
-;;           prompted as to whether only the currently active tables
-;;           are to be displayed, or all the tables for all major
-;;           modes.
-;;
-;;   If you have `dropdown-list' installed, you can optionally use it
-;;   as the preferred "prompting method", putting in your .emacs file,
-;;   for example:
-;;
-;;       (require 'dropdown-list)
-;;       (setq yas-prompt-functions '(yas-dropdown-prompt
-;;                                    yas-ido-prompt
-;;                                    yas-completing-prompt))
-;;
-;;   Also check out the customization group
-;;
-;;        M-x customize-group RET yasnippet RET
-;;
-;;   If you use the customization group to set variables
-;;   `yas-snippet-dirs' or `yas-global-mode', make sure the path to
-;;   "yasnippet.el" is present in the `load-path' *before* the
-;;   `custom-set-variables' is executed in your .emacs file.
-;;
-;;   For more information and detailed usage, refer to the project page:
-;;      http://github.com/capitaomorte/yasnippet
-
-;;; Code:
-
-(require 'cl)
-(require 'cl-lib)
-(require 'easymenu)
-(require 'help-mode)
-
-(defvar yas--editing-template)
-(defvar yas--guessed-modes)
-(defvar yas--indent-original-column)
-(defvar yas--scheduled-jit-loads)
-(defvar yas-keymap)
-(defvar yas-selected-text)
-(defvar yas-verbosity)
-(defvar yas--current-template)
-
-
-;;; User customizable variables
-
-(defgroup yasnippet nil
-  "Yet Another Snippet extension"
-  :prefix "yas-"
-  :group 'editing)
-
-(defvar yas-installed-snippets-dir nil)
-(setq yas-installed-snippets-dir
-      (when load-file-name
-        (concat (file-name-directory load-file-name) "snippets")))
-
-(defcustom yas-snippet-dirs (remove nil
-                                    (list "~/.emacs.d/snippets"
-                                          'yas-installed-snippets-dir))
-  "List of top-level snippet directories.
-
-Each element, a string or a symbol whose value is a string,
-designates a top-level directory where per-mode snippet
-directories can be found.
-
-Elements appearing earlier in the list override later elements'
-snippets.
-
-The first directory is taken as the default for storing snippet's
-created with `yas-new-snippet'. "
-  :type '(choice (string :tag "Single directory (string)")
-                 (repeat :args (string) :tag "List of directories (strings)"))
-  :group 'yasnippet
-  :require 'yasnippet
-  :set #'(lambda (symbol new)
-           (let ((old (and (boundp symbol)
-                           (symbol-value symbol))))
-             (set-default symbol new)
-             (unless (or (not (fboundp 'yas-reload-all))
-                         (equal old new))
-               (yas-reload-all)))))
-
-(defun yas-snippet-dirs ()
-  "Return variable `yas-snippet-dirs' as list of strings."
-  (cl-loop for e in (if (listp yas-snippet-dirs)
-                        yas-snippet-dirs
-                      (list yas-snippet-dirs))
-           collect
-           (cond ((stringp e) e)
-                 ((and (symbolp e)
-                       (boundp e)
-                       (stringp (symbol-value e)))
-                  (symbol-value e))
-                 (t
-                  (error "[yas] invalid element %s in `yas-snippet-dirs'" e)))))
-
-(defvaralias 'yas/root-directory 'yas-snippet-dirs)
-
-(defcustom yas-new-snippet-default "\
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: $1
-# key: ${2:${1:$(yas--key-from-desc yas-text)}}${3:
-# binding: ${4:direct-keybinding}}
-# --
-$0"
-  "Default snippet to use when creating a new snippet.
-If nil, don't use any snippet."
-  :type 'string
-  :group 'yasnippet)
-
-(defcustom yas-prompt-functions '(yas-x-prompt
-                                  yas-dropdown-prompt
-                                  yas-completing-prompt
-                                  yas-ido-prompt
-                                  yas-no-prompt)
-  "Functions to prompt for keys, templates, etc interactively.
-
-These functions are called with the following arguments:
-
-- PROMPT: A string to prompt the user
-
-- CHOICES: a list of strings or objects.
-
-- optional DISPLAY-FN : A function that, when applied to each of
-the objects in CHOICES will return a string.
-
-The return value of any function you put here should be one of
-the objects in CHOICES, properly formatted with DISPLAY-FN (if
-that is passed).
-
-- To signal that your particular style of prompting is
-unavailable at the moment, you can also have the function return
-nil.
-
-- To signal that the user quit the prompting process, you can
-signal `quit' with
-
-  (signal 'quit \"user quit!\")."
-  :type '(repeat function)
-  :group 'yasnippet)
-
-(defcustom yas-indent-line 'auto
-  "Controls indenting applied to a recent snippet expansion.
-
-The following values are possible:
-
-- `fixed' Indent the snippet to the current column;
-
-- `auto' Indent each line of the snippet with `indent-according-to-mode'
-
-Every other value means don't apply any snippet-side indentation
-after expansion (the manual per-line \"$>\" indentation still
-applies)."
-  :type '(choice (const :tag "Nothing"  nothing)
-                 (const :tag "Fixed"    fixed)
-                 (const :tag "Auto"     auto))
-  :group 'yasnippet)
-
-(defcustom yas-also-auto-indent-first-line nil
-  "Non-nil means also auto indent first line according to mode.
-
-Naturally this is only valid when `yas-indent-line' is `auto'"
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-snippet-revival t
-  "Non-nil means re-activate snippet fields after undo/redo."
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-triggers-in-field nil
-  "If non-nil, allow stacked expansions (snippets inside snippets).
-
-Otherwise `yas-next-field-or-maybe-expand' just moves on to the
-next field"
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-fallback-behavior 'call-other-command
-  "How to act when `yas-expand' does *not* expand a snippet.
-
-- `call-other-command' means try to temporarily disable YASnippet
-    and call the next command bound to whatever key was used to
-    invoke `yas-expand'.
-
-- nil or the symbol `return-nil' mean do nothing. (and
-  `yas-expand' returns nil)
-
-- A Lisp form (apply COMMAND . ARGS) means interactively call
-  COMMAND. If ARGS is non-nil, call COMMAND non-interactively
-  with ARGS as arguments."
-  :type '(choice (const :tag "Call previous command"  call-other-command)
-                 (const :tag "Do nothing"             return-nil))
-  :group 'yasnippet)
-
-(defcustom yas-choose-keys-first nil
-  "If non-nil, prompt for snippet key first, then for template.
-
-Otherwise prompts for all possible snippet names.
-
-This affects `yas-insert-snippet' and `yas-visit-snippet-file'."
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-choose-tables-first nil
-  "If non-nil, and multiple eligible snippet tables, prompts user for tables first.
-
-Otherwise, user chooses between the merging together of all
-eligible tables.
-
-This affects `yas-insert-snippet', `yas-visit-snippet-file'"
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-use-menu 'abbreviate
-  "Display a YASnippet menu in the menu bar.
-
-When non-nil, submenus for each snippet table will be listed
-under the menu \"Yasnippet\".
-
-- If set to `abbreviate', only the current major-mode
-menu and the modes set in `yas--extra-modes' are listed.
-
-- If set to `full', every submenu is listed
-
-- If set to `nil', hide the menu.
-
-Any other non-nil value, every submenu is listed."
-  :type '(choice (const :tag "Full"  full)
-                 (const :tag "Abbreviate" abbreviate)
-                 (const :tag "No menu" nil))
-  :group 'yasnippet)
-
-(defcustom yas-trigger-symbol (or (and (eq window-system 'mac)
-                                       (ignore-errors
-                                         (char-to-string ?\x21E5))) ;; little ->| sign
-                                  " =>")
-  "The text that will be used in menu to represent the trigger."
-  :type 'string
-  :group 'yasnippet)
-
-(defcustom yas-wrap-around-region nil
-  "If non-nil, snippet expansion wraps around selected region.
-
-The wrapping occurs just before the snippet's exit marker.  This
-can be overridden on a per-snippet basis."
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-good-grace t
-  "If non-nil, don't raise errors in inline elisp evaluation.
-
-An error string \"[yas] error\" is returned instead."
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-visit-from-menu nil
-  "If non-nil visit snippets's files from menu, instead of expanding them.
-
-This can only work when snippets are loaded from files."
-  :type 'boolean
-  :group 'yasnippet)
-
-(defcustom yas-expand-only-for-last-commands nil
-  "List of `last-command' values to restrict tab-triggering to, or nil.
-
-Leave this set at nil (the default) to be able to trigger an
-expansion simply by placing the cursor after a valid tab trigger,
-using whichever commands.
-
-Optionally, set this to something like '(self-insert-command) if
-you to wish restrict expansion to only happen when the last
-letter of the snippet tab trigger was typed immediately before
-the trigger key itself."
-  :type '(repeat function)
-  :group 'yasnippet)
-
-;; Only two faces, and one of them shouldn't even be used...
-;;
-(defface yas-field-highlight-face
-  '((t (:inherit 'region)))
-  "The face used to highlight the currently active field of a snippet"
-  :group 'yasnippet)
-
-(defface yas--field-debug-face
-  '()
-  "The face used for debugging some overlays normally hidden"
-  :group 'yasnippet)
-
-
-;;; User-visible variables
-
-(defvar yas-keymap  (let ((map (make-sparse-keymap)))
-                      (define-key map [(tab)]       'yas-next-field-or-maybe-expand)
-                      (define-key map (kbd "TAB")   'yas-next-field-or-maybe-expand)
-                      (define-key map [(shift tab)] 'yas-prev-field)
-                      (define-key map [backtab]     'yas-prev-field)
-                      (define-key map (kbd "C-g")   'yas-abort-snippet)
-                      (define-key map (kbd "C-d")   'yas-skip-and-clear-or-delete-char)
-                      map)
-  "The active keymap while a snippet expansion is in progress.")
-
-(defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()"
-                               #'yas-try-key-from-whitespace)
-  "Syntaxes and functions to help look for trigger keys before point.
-
-Each element in this list specifies how to skip buffer positions
-backwards and look for the start of a trigger key.
-
-Each element can be either a string or a function receiving the
-original point as an argument. A string element is simply passed
-to `skip-syntax-backward' whereas a function element is called
-with no arguments and should also place point before the original
-position.
-
-The string between the resulting buffer position and the original
-point is matched against the trigger keys in the active snippet
-tables.
-
-If no expandable snippets are found, the next element is the list
-is tried, unless a function element returned the symbol `again',
-in which case it is called again from the previous position and
-may once more reposition point.
-
-For example, if `yas-key-syntaxes'' value is '(\"w\" \"w_\"),
-trigger keys composed exclusively of \"word\"-syntax characters
-are looked for first. Failing that, longer keys composed of
-\"word\" or \"symbol\" syntax are looked for. Therefore,
-triggering after
-
-foo-bar
-
-will, according to the \"w\" element first try \"barbaz\". If
-that isn't a trigger key, \"foo-barbaz\" is tried, respecting the
-second \"w_\" element. Notice that even if \"baz\" is a trigger
-key for an active snippet, it won't be expanded, unless a
-function is added to `yas-key-syntaxes' that eventually places
-point between \"bar\" and \"baz\".
-
-See also Info node `(elisp) Syntax Descriptors'.")
-
-(defvar yas-after-exit-snippet-hook
-  '()
-  "Hooks to run after a snippet exited.
-
-The hooks will be run in an environment where some variables bound to
-proper values:
-
-`yas-snippet-beg' : The beginning of the region of the snippet.
-
-`yas-snippet-end' : Similar to beg.
-
-Attention: These hooks are not run when exiting nested/stacked snippet expansion!")
-
-(defvar yas-before-expand-snippet-hook
-  '()
-  "Hooks to run just before expanding a snippet.")
-
-(defvar yas-buffer-local-condition
-  '(if (and (or (fourth (syntax-ppss))
-                (fifth (syntax-ppss)))
-	    this-command
-            (eq this-command 'yas-expand-from-trigger-key))
-       '(require-snippet-condition . force-in-comment)
-     t)
-  "Snippet expanding condition.
-
-This variable is a Lisp form which is evaluated every time a
-snippet expansion is attempted:
-
-    * If it evaluates to nil, no snippets can be expanded.
-
-    * If it evaluates to the a cons (require-snippet-condition
-      . REQUIREMENT)
-
-       * Snippets bearing no \"# condition:\" directive are not
-         considered
-
-       * Snippets bearing conditions that evaluate to nil (or
-         produce an error) won't be considered.
-
-       * If the snippet has a condition that evaluates to non-nil
-         RESULT:
-
-          * If REQUIREMENT is t, the snippet is considered
-
-          * If REQUIREMENT is `eq' RESULT, the snippet is
-            considered
-
-          * Otherwise, the snippet is not considered.
-
-    * If it evaluates to the symbol 'always, all snippets are
-      considered for expansion, regardless of any conditions.
-
-    * If it evaluates to t or some other non-nil value
-
-       * Snippet bearing no conditions, or conditions that
-         evaluate to non-nil, are considered for expansion.
-
-       * Otherwise, the snippet is not considered.
-
-Here's an example preventing snippets from being expanded from
-inside comments, in `python-mode' only, with the exception of
-snippets returning the symbol 'force-in-comment in their
-conditions.
-
- (add-hook 'python-mode-hook
-           '(lambda ()
-              (setq yas-buffer-local-condition
-                    '(if (python-in-string/comment)
-                         '(require-snippet-condition . force-in-comment)
-                       t))))
-
-The default value is similar, it filters out potential snippet
-expansions inside comments and string literals, unless the
-snippet itself contains a condition that returns the symbol
-`force-in-comment'.")
-
-
-;;; Internal variables
-
-(defvar yas--version "0.8.0beta")
-
-(defvar yas--menu-table (make-hash-table)
-  "A hash table of MAJOR-MODE symbols to menu keymaps.")
-
-(defvar yas--escaped-characters
-  '(?\\ ?` ?\" ?' ?$ ?} ?{ ?\( ?\))
-  "List of characters which *might* need to be escaped.")
-
-(defconst yas--field-regexp
-  "${\\([0-9]+:\\)?\\([^}]*\\)}"
-  "A regexp to *almost* recognize a field.")
-
-(defconst yas--multi-dollar-lisp-expression-regexp
-  "$+[ \t\n]*\\(([^)]*)\\)"
-  "A regexp to *almost* recognize a \"$(...)\" expression.")
-
-(defconst yas--backquote-lisp-expression-regexp
-  "`\\([^`]*\\)`"
-  "A regexp to recognize a \"`lisp-expression`\" expression." )
-
-(defconst yas--transform-mirror-regexp
-  "${\\(?:\\([0-9]+\\):\\)?$\\([ \t\n]*([^}]*\\)"
-  "A regexp to *almost* recognize a mirror with a transform.")
-
-(defconst yas--simple-mirror-regexp
-  "$\\([0-9]+\\)"
-  "A regexp to recognize a simple mirror.")
-
-(defvar yas--snippet-id-seed 0
-  "Contains the next id for a snippet.")
-
-(defun yas--snippet-next-id ()
-  (let ((id yas--snippet-id-seed))
-    (cl-incf yas--snippet-id-seed)
-    id))
-
-
-;;; Minor mode stuff
-
-;; XXX: `last-buffer-undo-list' is somehow needed in Carbon Emacs for MacOSX
-(defvar last-buffer-undo-list nil)
-
-(defvar yas--minor-mode-menu nil
-  "Holds the YASnippet menu.")
-
-(defvar yas-minor-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [(tab)]     'yas-expand)
-    (define-key map (kbd "TAB") 'yas-expand)
-    (define-key map "\C-c&\C-s" 'yas-insert-snippet)
-    (define-key map "\C-c&\C-n" 'yas-new-snippet)
-    (define-key map "\C-c&\C-v" 'yas-visit-snippet-file)
-    map)
-  "The keymap used when `yas-minor-mode' is active.")
-
-(easy-menu-define yas--minor-mode-menu
-      yas-minor-mode-map
-      "Menu used when `yas-minor-mode' is active."
-  '("YASnippet" :visible yas-use-menu
-    "----"
-    ["Expand trigger" yas-expand
-     :help "Possibly expand tab trigger before point"]
-    ["Insert at point..." yas-insert-snippet
-     :help "Prompt for an expandable snippet and expand it at point"]
-    ["New snippet..." yas-new-snippet
-     :help "Create a new snippet in an appropriate directory"]
-    ["Visit snippet file..." yas-visit-snippet-file
-     :help "Prompt for an expandable snippet and find its file"]
-    "----"
-    ("Snippet menu behaviour"
-     ["Visit snippets" (setq yas-visit-from-menu t)
-      :help "Visit snippets from the menu"
-      :active t :style radio   :selected yas-visit-from-menu]
-     ["Expand snippets" (setq yas-visit-from-menu nil)
-      :help "Expand snippets from the menu"
-      :active t :style radio :selected (not yas-visit-from-menu)]
-     "----"
-     ["Show all known modes" (setq yas-use-menu 'full)
-      :help "Show one snippet submenu for each loaded table"
-      :active t :style radio   :selected (eq yas-use-menu 'full)]
-     ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
-      :help "Show only snippet submenus for the current active modes"
-      :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
-    ("Indenting"
-     ["Auto" (setq yas-indent-line 'auto)
-      :help "Indent each line of the snippet with `indent-according-to-mode'"
-      :active t :style radio   :selected (eq yas-indent-line 'auto)]
-     ["Fixed" (setq yas-indent-line 'fixed)
-      :help "Indent the snippet to the current column"
-      :active t :style radio   :selected (eq yas-indent-line 'fixed)]
-     ["None" (setq yas-indent-line 'none)
-      :help "Don't apply any particular snippet indentation after expansion"
-      :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
-     "----"
-     ["Also auto indent first line" (setq yas-also-auto-indent-first-line
-                                          (not yas-also-auto-indent-first-line))
-      :help "When auto-indenting also, auto indent the first line menu"
-      :active (eq yas-indent-line 'auto)
-      :style toggle :selected yas-also-auto-indent-first-line]
-     )
-    ("Prompting method"
-     ["System X-widget" (setq yas-prompt-functions
-                              (cons 'yas-x-prompt
-                                    (remove 'yas-x-prompt
-                                            yas-prompt-functions)))
-      :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-x-prompt)]
-     ["Dropdown-list" (setq yas-prompt-functions
-                            (cons 'yas-dropdown-prompt
-                                  (remove 'yas-dropdown-prompt
-                                          yas-prompt-functions)))
-      :help "Use a special dropdown list"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-dropdown-prompt)]
-     ["Ido" (setq yas-prompt-functions
-                  (cons 'yas-ido-prompt
-                        (remove 'yas-ido-prompt
-                                yas-prompt-functions)))
-      :help "Use an ido-style minibuffer prompt"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-ido-prompt)]
-     ["Completing read" (setq yas-prompt-functions
-                              (cons 'yas-completing-prompt
-                                    (remove 'yas-completing-prompt
-                                            yas-prompt-functions)))
-      :help "Use a normal minibuffer prompt"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-completing-prompt)]
-     )
-    ("Misc"
-     ["Wrap region in exit marker"
-      (setq yas-wrap-around-region
-            (not yas-wrap-around-region))
-      :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
-      :style toggle :selected yas-wrap-around-region]
-     ["Allow stacked expansions "
-      (setq yas-triggers-in-field
-            (not yas-triggers-in-field))
-      :help "If non-nil allow snippets to be triggered inside other snippet fields"
-      :style toggle :selected yas-triggers-in-field]
-     ["Revive snippets on undo "
-      (setq yas-snippet-revival
-            (not yas-snippet-revival))
-      :help "If non-nil allow snippets to become active again after undo"
-      :style toggle :selected yas-snippet-revival]
-     ["Good grace "
-      (setq yas-good-grace
-            (not yas-good-grace))
-      :help "If non-nil don't raise errors in bad embedded elisp in snippets"
-      :style toggle :selected yas-good-grace]
-     )
-    "----"
-    ["Load snippets..."  yas-load-directory
-     :help "Load snippets from a specific directory"]
-    ["Reload everything" yas-reload-all
-     :help "Cleanup stuff, reload snippets, rebuild menus"]
-    ["About"            yas-about
-     :help "Display some information about YASnippet"]))
-
-(defvar yas--extra-modes nil
-  "An internal list of modes for which to also lookup snippets.
-
-This variable probably makes more sense as buffer-local, so
-ensure your use `make-local-variable' when you set it.")
-(define-obsolete-variable-alias 'yas-extra-modes 'yas--extra-modes "0.8.1")
-
-(defvar yas--tables (make-hash-table)
-  "A hash table of mode symbols to `yas--table' objects.")
-
-(defvar yas--parents (make-hash-table)
-  "A hash table of mode symbols do lists of direct parent mode symbols.
-
-This list is populated when reading the \".yas-parents\" files
-found when traversing snippet directories with
-`yas-load-directory'.
-
-There might be additional parenting information stored in the
-`derived-mode-parent' property of some mode symbols, but that is
-not recorded here.")
-
-(defvar yas--direct-keymaps (list)
-  "Keymap alist supporting direct snippet keybindings.
-
-This variable is placed in `emulation-mode-map-alists'.
-
-Its elements looks like (TABLE-NAME . KEYMAP).  They're
-instantiated on `yas-reload-all' but KEYMAP is added to only when
-loading snippets.  `yas--direct-TABLE-NAME' is then a variable set
-buffer-locally when entering `yas-minor-mode'.  KEYMAP binds all
-defined direct keybindings to the command
-`yas-expand-from-keymap' which then which snippet to expand.")
-
-(defun yas-direct-keymaps-reload ()
-  "Force reload the direct keybinding for active snippet tables."
-  (interactive)
-  (setq yas--direct-keymaps nil)
-  (maphash #'(lambda (name table)
-               (push (cons (intern (format "yas--direct-%s" name))
-                           (yas--table-direct-keymap table))
-                     yas--direct-keymaps))
-           yas--tables))
-
-(defun yas--modes-to-activate ()
-  "Compute list of mode symbols that are active for `yas-expand'
-and friends."
-  (let (dfs)
-    (setq dfs (lambda (mode &optional explored)
-                (push mode explored)
-                (cons mode
-                      (loop for neighbour
-                            in (cl-list* (get mode 'derived-mode-parent)
-                                         (ignore-errors (symbol-function mode))
-                                         (gethash mode yas--parents))
-                            when (and neighbour
-                                      (not (memq neighbour explored))
-                                      (symbolp neighbour))
-                            append (funcall dfs neighbour explored)))))
-    (remove-duplicates (append yas--extra-modes
-                               (funcall dfs major-mode)))))
-
-(defvar yas-minor-mode-hook nil
-  "Hook run when `yas-minor-mode' is turned on.")
-
-;;;###autoload
-(define-minor-mode yas-minor-mode
-  "Toggle YASnippet mode.
-
-When YASnippet mode is enabled, `yas-expand', normally bound to
-the TAB key, expands snippets of code depending on the major
-mode.
-
-With no argument, this command toggles the mode.
-positive prefix argument turns on the mode.
-Negative prefix argument turns off the mode.
-
-Key bindings:
-\\{yas-minor-mode-map}"
-  nil
-  ;; The indicator for the mode line.
-  " yas"
-  :group 'yasnippet
-  (cond (yas-minor-mode
-         ;; Install the direct keymaps in `emulation-mode-map-alists'
-         ;; (we use `add-hook' even though it's not technically a hook,
-         ;; but it works). Then define variables named after modes to
-         ;; index `yas--direct-keymaps'.
-         ;;
-         ;; Also install the post-command-hook.
-         ;;
-         (add-hook 'emulation-mode-map-alists 'yas--direct-keymaps)
-         (add-hook 'post-command-hook 'yas--post-command-handler nil t)
-         ;; Set the `yas--direct-%s' vars for direct keymap expansion
-         ;;
-         (dolist (mode (yas--modes-to-activate))
-           (let ((name (intern (format "yas--direct-%s" mode))))
-             (set-default name nil)
-             (set (make-local-variable name) t)))
-         ;; Perform JIT loads
-         ;;
-         (yas--load-pending-jits))
-        (t
-         ;; Uninstall the direct keymaps and the post-command hook
-         ;;
-         (remove-hook 'post-command-hook 'yas--post-command-handler t)
-         (remove-hook 'emulation-mode-map-alists 'yas--direct-keymaps))))
-
-(defun yas-activate-extra-mode (mode)
-  "Activates the snippets for the given `mode' in the buffer.
-
-The function can be called in the hook of a minor mode to
-activate snippets associated with that mode."
-  (interactive
-   (let (modes
-         symbol)
-     (maphash (lambda (k _)
-                (setq modes (cons (list k) modes)))
-              yas--parents)
-     (setq symbol (completing-read
-                   "Activate mode: " modes nil t))
-     (list
-      (when (not (string= "" symbol))
-        (intern symbol)))))
-  (when mode
-    (add-to-list (make-local-variable 'yas--extra-modes) mode)
-    (yas--load-pending-jits)))
-
-(defun yas-deactivate-extra-mode (mode)
-  "Deactivates the snippets for the given `mode' in the buffer."
-  (interactive
-   (list (intern
-          (completing-read
-           "Deactivate mode: " (mapcar #'list yas--extra-modes) nil t))))
-  (set (make-local-variable 'yas--extra-modes)
-       (remove mode
-               yas--extra-modes)))
-
-(defvar yas-dont-activate '(minibufferp)
-  "If non-nil don't let `yas-global-mode' affect some buffers.
-
-If a function of zero arguments, then its result is used.
-
-If a list of functions, then all functions must return nil to
-activate yas for this buffer.
-
-In Emacsen <= 23, this variable is buffer-local.  Because
-`yas-minor-mode-on' is called by `yas-global-mode' after
-executing the buffer's major mode hook, setting this variable
-there is an effective way to define exceptions to the \"global\"
-activation behaviour.
-
-In Emacsen > 23, only the global value is used.  To define
-per-mode exceptions to the \"global\" activation behaviour, call
-`yas-minor-mode' with a negative argument directily in the major
-mode's hook.")
-(unless (> emacs-major-version 23)
-  (with-no-warnings
-    (make-variable-buffer-local 'yas-dont-activate)))
-
-
-(defun yas-minor-mode-on ()
-  "Turn on YASnippet minor mode.
-
-Honour `yas-dont-activate', which see."
-  (interactive)
-  ;; Check `yas-dont-activate'
-  (unless (cond ((functionp yas-dont-activate)
-                 (funcall yas-dont-activate))
-                ((consp yas-dont-activate)
-                 (some #'funcall yas-dont-activate))
-                (yas-dont-activate))
-    (yas-minor-mode 1)))
-
-;;;###autoload
-(define-globalized-minor-mode yas-global-mode yas-minor-mode yas-minor-mode-on
-  :group 'yasnippet
-  :require 'yasnippet)
-
-(defun yas--global-mode-reload-with-jit-maybe ()
-  "Run `yas-reload-all' when `yas-global-mode' is on."
-  (when yas-global-mode (yas-reload-all)))
-
-(add-hook 'yas-global-mode-hook 'yas--global-mode-reload-with-jit-maybe)
-
-
-;;; Major mode stuff
-
-(defvar yas--font-lock-keywords
-  (append '(("^#.*$" . font-lock-comment-face))
-          lisp-font-lock-keywords-2
-          '(("$\\([0-9]+\\)"
-             (0 font-lock-keyword-face)
-             (1 font-lock-string-face t))
-            ("${\\([0-9]+\\):?"
-             (0 font-lock-keyword-face)
-             (1 font-lock-warning-face t))
-            ("${" . font-lock-keyword-face)
-            ("$[0-9]+?" . font-lock-preprocessor-face)
-            ("\\(\\$(\\)" 1 font-lock-preprocessor-face)
-            ("}"
-             (0 font-lock-keyword-face)))))
-
-(defvar snippet-mode-map
-  (let ((map (make-sparse-keymap)))
-    (easy-menu-define nil
-      map
-      "Menu used when snippet-mode is active."
-      (cons "Snippet"
-            (mapcar #'(lambda (ent)
-                        (when (third ent)
-                          (define-key map (third ent) (second ent)))
-                        (vector (first ent) (second ent) t))
-                    '(("Load this snippet" yas-load-snippet-buffer "\C-c\C-l")
-                      ("Load and quit window" yas-load-snippet-buffer-and-close "\C-c\C-c")
-                      ("Try out this snippet" yas-tryout-snippet "\C-c\C-t")))))
-    map)
-  "The keymap used when `snippet-mode' is active.")
-
-
-(define-derived-mode snippet-mode text-mode "Snippet"
-  "A mode for editing yasnippets"
-  (setq font-lock-defaults '(yas--font-lock-keywords))
-  (set (make-local-variable 'require-final-newline) nil)
-  (set (make-local-variable 'comment-start) "#")
-  (set (make-local-variable 'comment-start-skip) "#+[\t ]*"))
-
-
-
-;;; Internal structs for template management
-
-(defstruct (yas--template (:constructor yas--make-template))
-  "A template for a snippet."
-  key
-  content
-  name
-  condition
-  expand-env
-  file
-  keybinding
-  uuid
-  menu-binding-pair
-  group      ;; as dictated by the #group: directive or .yas-make-groups
-  perm-group ;; as dictated by `yas-define-menu'
-  table
-  )
-
-(defstruct (yas--table (:constructor yas--make-snippet-table (name)))
-  "A table to store snippets for a particular mode.
-
-Has the following fields:
-
-`yas--table-name'
-
-  A symbol name normally corresponding to a major mode, but can
-  also be a pseudo major-mode to be used in
-  `yas-activate-extra-mode', for example.
-
-`yas--table-hash'
-
-  A hash table (KEY . NAMEHASH), known as the \"keyhash\". KEY is
-  a string or a vector, where the former is the snippet's trigger
-  and the latter means it's a direct keybinding. NAMEHASH is yet
-  another hash of (NAME . TEMPLATE) where NAME is the snippet's
-  name and TEMPLATE is a `yas--template' object.
-
-`yas--table-direct-keymap'
-
-  A keymap for the snippets in this table that have direct
-  keybindings. This is kept in sync with the keyhash, i.e., all
-  the elements of the keyhash that are vectors appear here as
-  bindings to `yas-expand-from-keymap'.
-
-`yas--table-uuidhash'
-
-  A hash table mapping snippets uuid's to the same `yas--template'
-  objects. A snippet uuid defaults to the snippet's name."
-  name
-  (hash (make-hash-table :test 'equal))
-  (uuidhash (make-hash-table :test 'equal))
-  (parents nil)
-  (direct-keymap (make-sparse-keymap)))
-
-(defun yas--get-template-by-uuid (mode uuid)
-  "Find the snippet template in MODE by its UUID."
-  (let* ((table (gethash mode yas--tables mode)))
-    (when table
-      (gethash uuid (yas--table-uuidhash table)))))
-
-;; Apropos storing/updating in TABLE, this works in two steps:
-;;
-;; 1. `yas--remove-template-by-uuid' removes any
-;;    keyhash-namehash-template mappings from TABLE, grabbing the
-;;    snippet by its uuid. Also removes mappings from TABLE's
-;;    `yas--table-direct-keymap' (FIXME: and should probably take care
-;;    of potentially stale menu bindings right?.)
-;;
-;; 2. `yas--add-template' adds this all over again.
-;;
-;;    Create a new or add to an existing keyhash-namehash mapping.
-;;
-;;  For reference on understanding this, consider three snippet
-;;  definitions:
-;;
-;;  A:   # name: The Foo
-;;       # key: foo
-;;       # binding: C-c M-l
-;;
-;;  B:   # name: Mrs Foo
-;;       # key: foo
-;;
-;;  C:   # name: The Bar
-;;       # binding: C-c M-l
-;;
-;;  D:   # name: Baz
-;;       # key: baz
-;;
-;;  keyhash       namehashes(3)      yas--template structs(4)
-;;  -----------------------------------------------------
-;;                                            __________
-;;                                           /          \
-;;  "foo"      --->  "The Foo" --->  [yas--template A]   |
-;;                   "Mrs Foo" --->  [yas--template B]   |
-;;                                                      |
-;;  [C-c M-l]  --->  "The Foo" -------------------------/
-;;                   "The Bar" --->  [yas--template C]
-;;
-;;  "baz"      --->  "Baz"     --->  [yas--template D]
-;;
-;; Additionally, since uuid defaults to the name, we have a
-;; `yas--table-uuidhash' for TABLE
-;;
-;; uuidhash       yas--template structs
-;; -------------------------------
-;; "The Foo" ---> [yas--template A]
-;; "Mrs Foo" ---> [yas--template B]
-;; "The Bar" ---> [yas--template C]
-;; "Baz"     ---> [yas--template D]
-;;
-;; FIXME: the more I look at this data-structure the more I think I'm
-;; stupid. There has to be an easier way (but beware lots of code
-;; depends on this).
-;;
-(defun yas--remove-template-by-uuid (table uuid)
-  "Remove from TABLE a template identified by UUID."
-  (let ((template (gethash uuid (yas--table-uuidhash table))))
-    (when template
-      (let* ((name                (yas--template-name template))
-             (empty-keys          nil))
-        ;; Remove the name from each of the targeted namehashes
-        ;;
-        (maphash #'(lambda (k v)
-                     (let ((template (gethash name v)))
-                       (when (and template
-                                  (eq uuid (yas--template-uuid template)))
-                         (remhash name v)
-                         (when (zerop (hash-table-count v))
-                           (push k empty-keys)))))
-                 (yas--table-hash table))
-        ;; Remove the namehash themselves if they've become empty
-        ;;
-        (dolist (key empty-keys)
-          (when (vectorp key)
-            (define-key (yas--table-direct-keymap table) key nil))
-          (remhash key (yas--table-hash table)))
-
-        ;; Finally, remove the uuid from the uuidhash
-        ;;
-        (remhash uuid (yas--table-uuidhash table))))))
-
-(defun yas--add-template (table template)
-  "Store in TABLE the snippet template TEMPLATE.
-
-KEY can be a string (trigger key) of a vector (direct
-keybinding)."
-  (let ((name (yas--template-name template))
-        (key (yas--template-key template))
-        (keybinding (yas--template-keybinding template))
-        (_menu-binding-pair (yas--template-menu-binding-pair-get-create template)))
-    (dolist (k (remove nil (list key keybinding)))
-      (puthash name
-               template
-               (or (gethash k
-                            (yas--table-hash table))
-                   (puthash k
-                            (make-hash-table :test 'equal)
-                            (yas--table-hash table))))
-      (when (vectorp k)
-        (define-key (yas--table-direct-keymap table) k 'yas-expand-from-keymap)))
-
-    ;; Update TABLE's `yas--table-uuidhash'
-    (puthash (yas--template-uuid template)
-             template
-             (yas--table-uuidhash table))))
-
-(defun yas--update-template (table template)
-  "Add or update TEMPLATE in TABLE.
-
-Also takes care of adding and updating to the associated menu."
-  ;; Remove from table by uuid
-  ;;
-  (yas--remove-template-by-uuid table (yas--template-uuid template))
-  ;; Add to table again
-  ;;
-  (yas--add-template table template)
-  ;; Take care of the menu
-  ;;
-  (yas--update-template-menu table template))
-
-(defun yas--update-template-menu (table template)
-  "Update every menu-related for TEMPLATE."
-  (let ((menu-binding-pair (yas--template-menu-binding-pair-get-create template))
-        (key (yas--template-key template))
-        (keybinding (yas--template-keybinding template)))
-    ;; The snippet might have changed name or keys, so update
-    ;; user-visible strings
-    ;;
-    (unless (eq (cdr menu-binding-pair) :none)
-      ;; the menu item name
-      ;;
-      (setf (cadar menu-binding-pair) (yas--template-name template))
-      ;; the :keys information (also visible to the user)
-      (setf (getf (cdr (car menu-binding-pair)) :keys)
-            (or (and keybinding (key-description keybinding))
-                (and key (concat key yas-trigger-symbol))))))
-  (unless (yas--template-menu-managed-by-yas-define-menu template)
-    (let ((menu-keymap
-           (yas--menu-keymap-get-create (yas--table-mode table)
-                                        (mapcar #'yas--table-mode
-                                                (yas--table-parents table))))
-          (group (yas--template-group template)))
-      ;; Remove from menu keymap
-      ;;
-      (assert menu-keymap)
-      (yas--delete-from-keymap menu-keymap (yas--template-uuid template))
-
-      ;; Add necessary subgroups as necessary.
-      ;;
-      (dolist (subgroup group)
-        (let ((subgroup-keymap (lookup-key menu-keymap (vector (make-symbol subgroup)))))
-          (unless (and subgroup-keymap
-                       (keymapp subgroup-keymap))
-            (setq subgroup-keymap (make-sparse-keymap))
-            (define-key menu-keymap (vector (make-symbol subgroup))
-              `(menu-item ,subgroup ,subgroup-keymap)))
-          (setq menu-keymap subgroup-keymap)))
-
-      ;; Add this entry to the keymap
-      ;;
-      (define-key menu-keymap
-        (vector (make-symbol (yas--template-uuid template)))
-        (car (yas--template-menu-binding-pair template))))))
-
-(defun yas--namehash-templates-alist (namehash)
-  "Return NAMEHASH as an alist."
-  (let (alist)
-    (maphash #'(lambda (k v)
-                 (push (cons k v) alist))
-             namehash)
-    alist))
-
-(defun yas--fetch (table key)
-  "Fetch templates in TABLE by KEY.
-
-Return a list of cons (NAME . TEMPLATE) where NAME is a
-string and TEMPLATE is a `yas--template' structure."
-  (let* ((keyhash (yas--table-hash table))
-         (namehash (and keyhash (gethash key keyhash))))
-    (when namehash
-      (yas--filter-templates-by-condition (yas--namehash-templates-alist namehash)))))
-
-
-;;; Filtering/condition logic
-
-(defun yas--eval-condition (condition)
-  (condition-case err
-      (save-excursion
-        (save-restriction
-          (save-match-data
-            (eval condition))))
-    (error (progn
-             (yas--message 1 "Error in condition evaluation: %s" (error-message-string err))
-             nil))))
-
-
-(defun yas--filter-templates-by-condition (templates)
-  "Filter the templates using the applicable condition.
-
-TEMPLATES is a list of cons (NAME . TEMPLATE) where NAME is a
-string and TEMPLATE is a `yas--template' structure.
-
-This function implements the rules described in
-`yas-buffer-local-condition'.  See that variables documentation."
-  (let ((requirement (yas--require-template-specific-condition-p)))
-    (if (eq requirement 'always)
-        templates
-      (remove-if-not #'(lambda (pair)
-                         (yas--template-can-expand-p
-                          (yas--template-condition (cdr pair)) requirement))
-                     templates))))
-
-(defun yas--require-template-specific-condition-p ()
-  "Decide if this buffer requests/requires snippet-specific
-conditions to filter out potential expansions."
-  (if (eq 'always yas-buffer-local-condition)
-      'always
-    (let ((local-condition (or (and (consp yas-buffer-local-condition)
-                                    (yas--eval-condition yas-buffer-local-condition))
-                               yas-buffer-local-condition)))
-      (when local-condition
-        (if (eq local-condition t)
-            t
-          (and (consp local-condition)
-               (eq 'require-snippet-condition (car local-condition))
-               (symbolp (cdr local-condition))
-               (cdr local-condition)))))))
-
-(defun yas--template-can-expand-p (condition requirement)
-  "Evaluate CONDITION and REQUIREMENT and return a boolean."
-  (let* ((result (or (null condition)
-                     (yas--eval-condition condition))))
-    (cond ((eq requirement t)
-           result)
-          (t
-           (eq requirement result)))))
-
-(defun yas--table-templates (table)
-  (when table
-    (let ((acc (list)))
-      (maphash #'(lambda (_key namehash)
-                   (maphash #'(lambda (name template)
-                                (push (cons name template) acc))
-                            namehash))
-               (yas--table-hash table))
-      (yas--filter-templates-by-condition acc))))
-
-(defun yas--templates-for-key-at-point ()
-  "Find `yas--template' objects for any trigger keys preceding point.
-Returns (TEMPLATES START END). This function respects
-`yas-key-syntaxes', which see."
-  (save-excursion
-    (let ((original (point))
-          (methods yas-key-syntaxes)
-          (templates)
-          (method))
-      (while (and methods
-                  (not templates))
-        (unless (eq method (car methods))
-          ;; TRICKY: `eq'-ness test means we can only be here if
-          ;; `method' is a function that returned `again', and hence
-          ;; don't revert back to original position as per
-          ;; `yas-key-syntaxes'.
-          (goto-char original))
-        (setq method (car methods))
-        (cond ((stringp method)
-               (skip-syntax-backward method)
-               (setq methods (cdr methods)))
-              ((functionp method)
-               (unless (eq (funcall method original)
-                           'again)
-                 (setq methods (cdr methods))))
-              (t
-               (yas--warning "Warning invalid element %s in `yas-key-syntaxes'" method)))
-        (let ((possible-key (buffer-substring-no-properties (point) original)))
-          (save-excursion
-            (goto-char original)
-            (setq templates
-                  (mapcan #'(lambda (table)
-                              (yas--fetch table possible-key))
-                          (yas--get-snippet-tables))))))
-      (when templates
-        (list templates (point) original)))))
-
-(defun yas--table-all-keys (table)
-  "Get trigger keys of all active snippets in TABLE."
-  (let ((acc))
-    (maphash #'(lambda (key namehash)
-                 (when (yas--filter-templates-by-condition (yas--namehash-templates-alist namehash))
-                   (push key acc)))
-             (yas--table-hash table))
-    acc))
-
-(defun yas--table-mode (table)
-  (intern (yas--table-name table)))
-
-
-;;; Internal functions and macros:
-
-(defun yas--handle-error (err)
-  "Handle error depending on value of `yas-good-grace'."
-  (let ((msg (yas--format "elisp error: %s" (error-message-string err))))
-    (if yas-good-grace msg
-      (error "%s" msg))))
-
-(defun yas--eval-lisp (form)
-  "Evaluate FORM and convert the result to string."
-  (let ((retval (catch 'yas--exception
-                  (condition-case err
-                      (save-excursion
-                        (save-restriction
-                          (save-match-data
-                            (widen)
-                            (let ((result (eval form)))
-                              (when result
-                                (format "%s" result))))))
-                    (error (yas--handle-error err))))))
-    (when (and (consp retval)
-               (eq 'yas--exception (car retval)))
-      (error (cdr retval)))
-    retval))
-
-(defun yas--eval-lisp-no-saves (form)
-  (condition-case err
-      (eval form)
-    (error (message "%s" (yas--handle-error err)))))
-
-(defun yas--read-lisp (string &optional nil-on-error)
-  "Read STRING as a elisp expression and return it.
-
-In case STRING in an invalid expression and NIL-ON-ERROR is nil,
-return an expression that when evaluated will issue an error."
-  (condition-case err
-      (read string)
-    (error (and (not nil-on-error)
-                `(error (error-message-string ,err))))))
-
-(defun yas--read-keybinding (keybinding)
-  "Read KEYBINDING as a snippet keybinding, return a vector."
-  (when (and keybinding
-             (not (string-match "keybinding" keybinding)))
-    (condition-case err
-        (let ((res (or (and (string-match "^\\[.*\\]$" keybinding)
-                            (read keybinding))
-                       (read-kbd-macro keybinding 'need-vector))))
-          res)
-      (error
-       (yas--message 3 "warning: keybinding \"%s\" invalid since %s."
-                keybinding (error-message-string err))
-       nil))))
-
-(defun yas--table-get-create (mode)
-  "Get or create the snippet table corresponding to MODE."
-  (let ((table (gethash mode
-                        yas--tables)))
-    (unless table
-      (setq table (yas--make-snippet-table (symbol-name mode)))
-      (puthash mode table yas--tables)
-      (push (cons (intern (format "yas--direct-%s" mode))
-                  (yas--table-direct-keymap table))
-            yas--direct-keymaps))
-    table))
-
-(defun yas--get-snippet-tables ()
-  "Get snippet tables for current buffer.
-
-Return a list of `yas--table' objects.  The list of modes to
-consider is returned by `yas--modes-to-activate'"
-  (remove nil
-          (mapcar #'(lambda (name)
-                      (gethash name yas--tables))
-                  (yas--modes-to-activate))))
-
-(defun yas--menu-keymap-get-create (mode &optional parents)
-  "Get or create the menu keymap for MODE and its PARENTS.
-
-This may very well create a plethora of menu keymaps and arrange
-them all in `yas--menu-table'"
-  (let* ((menu-keymap (or (gethash mode yas--menu-table)
-                          (puthash mode (make-sparse-keymap) yas--menu-table))))
-    (mapc #'yas--menu-keymap-get-create parents)
-    (define-key yas--minor-mode-menu (vector mode)
-        `(menu-item ,(symbol-name mode) ,menu-keymap
-                    :visible (yas--show-menu-p ',mode)))
-    menu-keymap))
-
-
-(defmacro yas--called-interactively-p (&optional kind)
-  "A backward-compatible version of `called-interactively-p'.
-
-Optional KIND is as documented at `called-interactively-p'
-in GNU Emacs 24.1 or higher."
-  (if (string< emacs-version "24.1")
-      '(called-interactively-p)
-    `(called-interactively-p ,kind)))
-
-
-;;; Template-related and snippet loading functions
-
-(defun yas--parse-template (&optional file)
-  "Parse the template in the current buffer.
-
-Optional FILE is the absolute file name of the file being
-parsed.
-
-Optional GROUP is the group where the template is to go,
-otherwise we attempt to calculate it from FILE.
-
-Return a snippet-definition, i.e. a list
-
- (KEY TEMPLATE NAME CONDITION GROUP VARS FILE KEYBINDING UUID)
-
-If the buffer contains a line of \"# --\" then the contents above
-this line are ignored. Directives can set most of these with the syntax:
-
-# directive-name : directive-value
-
-Here's a list of currently recognized directives:
-
- * type
- * name
- * contributor
- * condition
- * group
- * key
- * expand-env
- * binding
- * uuid"
-  (goto-char (point-min))
-  (let* ((type 'snippet)
-         (name (and file
-                    (file-name-nondirectory file)))
-         (key nil)
-         template
-         bound
-         condition
-         (group (and file
-                     (yas--calculate-group file)))
-         expand-env
-         binding
-         uuid)
-    (if (re-search-forward "^# --\n" nil t)
-        (progn (setq template
-                     (buffer-substring-no-properties (point)
-                                                     (point-max)))
-               (setq bound (point))
-               (goto-char (point-min))
-               (while (re-search-forward "^# *\\([^ ]+?\\) *: *\\(.*\\)$" bound t)
-                 (when (string= "uuid" (match-string-no-properties 1))
-                   (setq uuid (match-string-no-properties 2)))
-                 (when (string= "type" (match-string-no-properties 1))
-                   (setq type (if (string= "command" (match-string-no-properties 2))
-                                  'command
-                                'snippet)))
-                 (when (string= "key" (match-string-no-properties 1))
-                   (setq key (match-string-no-properties 2)))
-                 (when (string= "name" (match-string-no-properties 1))
-                   (setq name (match-string-no-properties 2)))
-                 (when (string= "condition" (match-string-no-properties 1))
-                   (setq condition (yas--read-lisp (match-string-no-properties 2))))
-                 (when (string= "group" (match-string-no-properties 1))
-                   (setq group (match-string-no-properties 2)))
-                 (when (string= "expand-env" (match-string-no-properties 1))
-                   (setq expand-env (yas--read-lisp (match-string-no-properties 2)
-                                                   'nil-on-error)))
-                 (when (string= "binding" (match-string-no-properties 1))
-                   (setq binding (match-string-no-properties 2)))))
-      (setq template
-            (buffer-substring-no-properties (point-min) (point-max))))
-    (unless (or key binding)
-      (setq key (and file (file-name-nondirectory file))))
-    (when (eq type 'command)
-      (setq template (yas--read-lisp (concat "(progn" template ")"))))
-    (when group
-      (setq group (split-string group "\\.")))
-    (list key template name condition group expand-env file binding uuid)))
-
-(defun yas--calculate-group (file)
-  "Calculate the group for snippet file path FILE."
-  (let* ((dominating-dir (locate-dominating-file file
-                                                 ".yas-make-groups"))
-         (extra-path (and dominating-dir
-                          (replace-regexp-in-string (concat "^"
-                                                            (expand-file-name dominating-dir))
-                                                    ""
-                                                    (expand-file-name file))))
-         (extra-dir (and extra-path
-                         (file-name-directory extra-path)))
-         (group (and extra-dir
-                     (replace-regexp-in-string "/"
-                                               "."
-                                               (directory-file-name extra-dir)))))
-    group))
-
-(defun yas--subdirs (directory &optional filep)
-  "Return subdirs or files of DIRECTORY according to FILEP."
-  (remove-if (lambda (file)
-               (or (string-match "^\\."
-                                 (file-name-nondirectory file))
-                   (string-match "^#.*#$"
-                                 (file-name-nondirectory file))
-                   (string-match "~$"
-                                 (file-name-nondirectory file))
-                   (if filep
-                       (file-directory-p file)
-                     (not (file-directory-p file)))))
-             (directory-files directory t)))
-
-(defun yas--make-menu-binding (template)
-  (let ((mode (yas--table-mode (yas--template-table template))))
-    `(lambda () (interactive) (yas--expand-or-visit-from-menu ',mode ,(yas--template-uuid template)))))
-
-(defun yas--expand-or-visit-from-menu (mode uuid)
-  (let* ((table (yas--table-get-create mode))
-         (yas--current-template (and table
-                                    (gethash uuid (yas--table-uuidhash table)))))
-    (when yas--current-template
-      (if yas-visit-from-menu
-          (yas--visit-snippet-file-1 yas--current-template)
-        (let ((where (if (region-active-p)
-                         (cons (region-beginning) (region-end))
-                       (cons (point) (point)))))
-          (yas-expand-snippet (yas--template-content yas--current-template)
-                              (car where)
-                              (cdr where)
-                              (yas--template-expand-env yas--current-template)))))))
-
-(defun yas--key-from-desc (text)
-  "Return a yasnippet key from a description string TEXT."
-  (replace-regexp-in-string "\\(\\w+\\).*" "\\1" text))
-
-
-;;; Popping up for keys and templates
-
-(defun yas--prompt-for-template (templates &optional prompt)
-  "Interactively choose a template from the list TEMPLATES.
-
-TEMPLATES is a list of `yas--template'.
-
-Optional PROMPT sets the prompt to use."
-  (when templates
-    (setq templates
-          (sort templates #'(lambda (t1 t2)
-                              (< (length (yas--template-name t1))
-                                 (length (yas--template-name t2))))))
-    (some #'(lambda (fn)
-              (funcall fn (or prompt "Choose a snippet: ")
-                       templates
-                       #'yas--template-name))
-          yas-prompt-functions)))
-
-(defun yas--prompt-for-keys (keys &optional prompt)
-  "Interactively choose a template key from the list KEYS.
-
-Optional PROMPT sets the prompt to use."
-  (when keys
-    (some #'(lambda (fn)
-              (funcall fn (or prompt "Choose a snippet key: ") keys))
-          yas-prompt-functions)))
-
-(defun yas--prompt-for-table (tables &optional prompt)
-  "Interactively choose a table from the list TABLES.
-
-Optional PROMPT sets the prompt to use."
-  (when tables
-    (some #'(lambda (fn)
-              (funcall fn (or prompt "Choose a snippet table: ")
-                       tables
-                       #'yas--table-name))
-          yas-prompt-functions)))
-
-(defun yas-x-prompt (prompt choices &optional display-fn)
-  "Display choices in a x-window prompt."
-  (when (and window-system choices)
-    (or
-     (x-popup-menu
-      (if (fboundp 'posn-at-point)
-          (let ((x-y (posn-x-y (posn-at-point (point)))))
-            (list (list (+ (car x-y) 10)
-                        (+ (cdr x-y) 20))
-                  (selected-window)))
-        t)
-      `(,prompt ("title"
-                 ,@(mapcar* (lambda (c d) `(,(concat "   " d) . ,c))
-                            choices
-                            (if display-fn (mapcar display-fn choices) choices)))))
-     (keyboard-quit))))
-
-(defun yas-ido-prompt (prompt choices &optional display-fn)
-  (when (and (fboundp 'ido-completing-read)
-	     (or (>= emacs-major-version 24)
-		 ido-mode))
-    (yas-completing-prompt prompt choices display-fn #'ido-completing-read)))
-
-(defun yas-dropdown-prompt (_prompt choices &optional display-fn)
-  (when (fboundp 'dropdown-list)
-    (let* ((formatted-choices
-            (if display-fn (mapcar display-fn choices) choices))
-           (n (dropdown-list formatted-choices)))
-      (if n (nth n choices)
-        (keyboard-quit)))))
-
-(defun yas-completing-prompt (prompt choices &optional display-fn completion-fn)
-  (let* ((formatted-choices
-          (if display-fn (mapcar display-fn choices) choices))
-         (chosen (funcall (or completion-fn #'completing-read)
-                          prompt formatted-choices
-                          nil 'require-match nil nil)))
-    (if (eq choices formatted-choices)
-        chosen
-      (nth (or (position chosen formatted-choices :test #'string=) 0)
-           choices))))
-
-(defun yas-no-prompt (_prompt choices &optional _display-fn)
-  (first choices))
-
-
-;;; Defining snippets
-;; This consists of creating and registering `yas--template' objects in the
-;; correct tables.
-;;
-
-(defvar yas--creating-compiled-snippets nil)
-
-(defun yas--define-snippets-1 (snippet snippet-table)
-  "Helper for `yas-define-snippets'."
-  ;; X) Calculate some more defaults on the values returned by
-  ;; `yas--parse-template'.
-  ;;
-  (let* ((file (seventh snippet))
-         (key (car snippet))
-         (name (or (third snippet)
-                   (and file
-                        (file-name-directory file))))
-         (condition (fourth snippet))
-         (group (fifth snippet))
-         (keybinding (yas--read-keybinding (eighth snippet)))
-         (uuid (or (ninth snippet)
-                  name))
-         (template (or (gethash uuid (yas--table-uuidhash snippet-table))
-                       (yas--make-template :uuid uuid
-                                           :table snippet-table))))
-    ;; X) populate the template object
-    ;;
-    (setf (yas--template-key template)        key)
-    (setf (yas--template-content template)    (second snippet))
-    (setf (yas--template-name template)       (or name key))
-    (setf (yas--template-group template)      group)
-    (setf (yas--template-condition template)  condition)
-    (setf (yas--template-expand-env template) (sixth snippet))
-    (setf (yas--template-file template)       (seventh snippet))
-    (setf (yas--template-keybinding template) keybinding)
-
-    ;; X) Update this template in the appropriate table. This step
-    ;;    also will take care of adding the key indicators in the
-    ;;    templates menu entry, if any
-    ;;
-    (yas--update-template snippet-table template)
-    ;; X) Return the template
-    ;;
-    ;;
-    template))
-
-(defun yas-define-snippets (mode snippets)
-  "Define SNIPPETS for MODE.
-
-SNIPPETS is a list of snippet definitions, each taking the
-following form
-
- (KEY TEMPLATE NAME CONDITION GROUP EXPAND-ENV FILE KEYBINDING UUID)
-
-Within these, only KEY and TEMPLATE are actually mandatory.
-
-TEMPLATE might be a Lisp form or a string, depending on whether
-this is a snippet or a snippet-command.
-
-CONDITION, EXPAND-ENV and KEYBINDING are Lisp forms, they have
-been `yas--read-lisp'-ed and will eventually be
-`yas--eval-lisp'-ed.
-
-The remaining elements are strings.
-
-FILE is probably of very little use if you're programatically
-defining snippets.
-
-UUID is the snippet's \"unique-id\". Loading a second snippet
-file with the same uuid would replace the previous snippet.
-
-You can use `yas--parse-template' to return such lists based on
-the current buffers contents."
-  (if yas--creating-compiled-snippets
-      (progn
-        (insert ";;; Snippet definitions:\n;;;\n")
-        (let ((literal-snippets (list))
-              (print-length nil))
-          (dolist (snippet snippets)
-            (let ((key                    (nth 0 snippet))
-                  (template-content       (nth 1 snippet))
-                  (name                   (nth 2 snippet))
-                  (condition              (nth 3 snippet))
-                  (group                  (nth 4 snippet))
-                  (expand-env             (nth 5 snippet))
-                  (file                   nil) ;; omit on purpose
-                  (binding                (nth 7 snippet))
-                  (uuid                   (nth 8 snippet)))
-              (push `(,key
-                      ,template-content
-                      ,name
-                      ,condition
-                      ,group
-                      ,expand-env
-                      ,file
-                      ,binding
-                      ,uuid)
-                    literal-snippets)))
-          (insert (pp-to-string
-                   `(yas-define-snippets ',mode ',literal-snippets)))
-          (insert "\n\n")))
-    ;; Normal case.
-    (let ((snippet-table (yas--table-get-create mode))
-          (template nil))
-      (dolist (snippet snippets)
-        (setq template (yas--define-snippets-1 snippet
-                                               snippet-table)))
-      template)))
-
-
-;;; Loading snippets from files
-
-(defun yas--load-yas-setup-file (file)
-  (if (not yas--creating-compiled-snippets)
-      ;; Normal case.
-      (load file 'noerror (<= yas-verbosity 2))
-    (let ((elfile (concat file ".el")))
-      (when (file-exists-p elfile)
-        (insert ";;; contents of the .yas-setup.el support file:\n;;;\n")
-        (insert-file-contents elfile)
-        (goto-char (point-max))))))
-
-(defun yas--define-parents (mode parents)
-  "Add PARENTS to the list of MODE's parents."
-  (puthash mode (remove-duplicates
-                 (append parents
-                         (gethash mode yas--parents)))
-           yas--parents))
-
-(defun yas-load-directory (top-level-dir &optional use-jit interactive)
-  "Load snippets in directory hierarchy TOP-LEVEL-DIR.
-
-Below TOP-LEVEL-DIR each directory should be a mode name.
-
-With prefix argument USE-JIT do jit-loading of snippets."
-  (interactive
-   (list (read-directory-name "Select the root directory: " nil nil t)
-         current-prefix-arg t))
-  (unless yas-snippet-dirs
-    (setq yas-snippet-dirs top-level-dir))
-  (let ((impatient-buffers))
-    (dolist (dir (yas--subdirs top-level-dir))
-      (let* ((major-mode-and-parents (yas--compute-major-mode-and-parents
-                                      (concat dir "/dummy")))
-             (mode-sym (car major-mode-and-parents))
-             (parents (cdr major-mode-and-parents)))
-        ;; Attention: The parents and the menus are already defined
-        ;; here, even if the snippets are later jit-loaded.
-        ;;
-        ;; * We need to know the parents at this point since entering a
-        ;;   given mode should jit load for its parents
-        ;;   immediately. This could be reviewed, the parents could be
-        ;;   discovered just-in-time-as well
-        ;;
-        ;; * We need to create the menus here to support the `full'
-        ;;   option to `yas-use-menu' (all known snippet menus are shown to the user)
-        ;;
-        (yas--define-parents mode-sym parents)
-        (yas--menu-keymap-get-create mode-sym)
-        (let ((fun `(lambda () ;; FIXME: Simulating lexical-binding.
-                      (yas--load-directory-1 ',dir ',mode-sym))))
-          (if use-jit
-              (yas--schedule-jit mode-sym fun)
-            (funcall fun)))
-        ;; Look for buffers that are already in `mode-sym', and so
-        ;; need the new snippets immediately...
-        ;; 
-        (when use-jit 
-          (cl-loop for buffer in (buffer-list)
-                   do (with-current-buffer buffer
-                        (when (eq major-mode mode-sym)
-                          (yas--message 3 "Discovered there was already %s in %s" buffer mode-sym)
-                          (push buffer impatient-buffers)))))))
-    ;; ...after TOP-LEVEL-DIR has been completely loaded, call
-    ;; `yas--load-pending-jits' in these impatient buffers.
-    ;; 
-    (cl-loop for buffer in impatient-buffers
-             do (with-current-buffer buffer (yas--load-pending-jits))))
-  (when interactive
-    (yas--message 3 "Loaded snippets from %s." top-level-dir)))
-
-(defun yas--load-directory-1 (directory mode-sym)
-  "Recursively load snippet templates from DIRECTORY."
-  (if yas--creating-compiled-snippets
-      (let ((output-file (expand-file-name ".yas-compiled-snippets.el"
-                                           directory)))
-        (with-temp-file output-file
-          (insert (format ";;; Compiled snippets and support files for `%s'\n"
-                          mode-sym))
-          (yas--load-directory-2 directory mode-sym)
-          (insert (format ";;; Do not edit! File generated at %s\n"
-                          (current-time-string)))))
-    ;; Normal case.
-    (unless (file-exists-p (concat directory "/" ".yas-skip"))
-      (if (and (progn (yas--message 2 "Loading compiled snippets from %s" directory) t)
-               (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror (<= yas-verbosity 3)))
-          (yas--message 2 "Loading snippet files from %s" directory)
-        (yas--load-directory-2 directory mode-sym)))))
-
-(defun yas--load-directory-2 (directory mode-sym)
-  ;; Load .yas-setup.el files wherever we find them
-  ;;
-  (yas--load-yas-setup-file (expand-file-name ".yas-setup" directory))
-  (let* ((default-directory directory)
-         (snippet-defs nil))
-    ;; load the snippet files
-    ;;
-    (with-temp-buffer
-      (dolist (file (yas--subdirs directory 'no-subdirs-just-files))
-        (when (file-readable-p file)
-          (insert-file-contents file nil nil nil t)
-          (push (yas--parse-template file)
-                snippet-defs))))
-    (when snippet-defs
-      (yas-define-snippets mode-sym
-                           snippet-defs))
-    ;; now recurse to a lower level
-    ;;
-    (dolist (subdir (yas--subdirs directory))
-      (yas--load-directory-2 subdir
-                            mode-sym))))
-
-(defun yas--load-snippet-dirs (&optional nojit)
-  "Reload the directories listed in `yas-snippet-dirs' or
-prompt the user to select one."
-  (let (errors)
-    (if yas-snippet-dirs
-        (dolist (directory (reverse (yas-snippet-dirs)))
-          (cond ((file-directory-p directory)
-                 (yas-load-directory directory (not nojit))
-                 (if nojit
-                     (yas--message 3 "Loaded %s" directory)
-                   (yas--message 3 "Prepared just-in-time loading for %s" directory)))
-                (t
-                 (push (yas--message 0 "Check your `yas-snippet-dirs': %s is not a directory" directory) errors))))
-      (call-interactively 'yas-load-directory))
-    errors))
-
-(defun yas-reload-all (&optional no-jit interactive)
-  "Reload all snippets and rebuild the YASnippet menu.
-
-When NO-JIT is non-nil force immediate reload of all known
-snippets under `yas-snippet-dirs', otherwise use just-in-time
-loading.
-
-When called interactively, use just-in-time loading when given a
-prefix argument."
-  (interactive (list (not current-prefix-arg) t))
-  (catch 'abort
-    (let ((errors)
-          (snippet-editing-buffers
-           (remove-if-not #'(lambda (buffer)
-                              (with-current-buffer buffer yas--editing-template))
-                          (buffer-list))))
-      ;; Warn if there are buffers visiting snippets, since reloading will break
-      ;; any on-line editing of those buffers.
-      ;;
-      (when snippet-editing-buffers
-          (if interactive
-              (if (y-or-n-p "Some buffers editing live snippets, close them and proceed with reload? ")
-                  (mapc #'kill-buffer snippet-editing-buffers)
-                (yas--message 1 "Aborted reload...")
-                (throw 'abort nil))
-            ;; in a non-interactive use, at least set
-            ;; `yas--editing-template' to nil, make it guess it next time around
-            (mapc #'(lambda (buffer)
-                      (with-current-buffer buffer
-                        (kill-local-variable 'yas--editing-template)))
-                  (buffer-list))))
-
-      ;; Empty all snippet tables and parenting info
-      ;;
-      (setq yas--tables (make-hash-table))
-      (setq yas--parents (make-hash-table))
-
-      ;; Before killing `yas--menu-table' use its keys to cleanup the
-      ;; mode menu parts of `yas--minor-mode-menu' (thus also cleaning
-      ;; up `yas-minor-mode-map', which points to it)
-      ;;
-      (maphash #'(lambda (menu-symbol _keymap)
-                   (define-key yas--minor-mode-menu (vector menu-symbol) nil))
-               yas--menu-table)
-      ;; Now empty `yas--menu-table' as well
-      (setq yas--menu-table (make-hash-table))
-
-      ;; Cancel all pending 'yas--scheduled-jit-loads'
-      ;;
-      (setq yas--scheduled-jit-loads (make-hash-table))
-
-      ;; Reload the directories listed in `yas-snippet-dirs' or prompt
-      ;; the user to select one.
-      ;;
-      (setq errors (yas--load-snippet-dirs no-jit))
-      ;; Reload the direct keybindings
-      ;;
-      (yas-direct-keymaps-reload)
-
-      (run-hooks 'yas-after-reload-hook)
-      (yas--message 3 "Reloaded everything%s...%s."
-                   (if no-jit "" " (snippets will load just-in-time)")
-                   (if errors " (some errors, check *Messages*)" "")))))
-
-(defvar yas-after-reload-hook nil
-  "Hooks run after `yas-reload-all'.")
-
-(defun yas--load-pending-jits ()
-  (dolist (mode (yas--modes-to-activate))
-    (let ((funs (reverse (gethash mode yas--scheduled-jit-loads))))
-      ;; must reverse to maintain coherence with `yas-snippet-dirs'
-      (dolist (fun funs)
-        (yas--message  3 "Loading for `%s', just-in-time: %s!" mode fun)
-        (funcall fun))
-      (remhash mode yas--scheduled-jit-loads))))
-
-;; (when (<= emacs-major-version 22)
-;;   (add-hook 'after-change-major-mode-hook 'yas--load-pending-jits))
-
-(defun yas--quote-string (string)
-  "Escape and quote STRING.
-foo\"bar\\! -> \"foo\\\"bar\\\\!\""
-  (concat "\""
-          (replace-regexp-in-string "[\\\"]"
-                                    "\\\\\\&"
-                                    string
-                                    t)
-          "\""))
-
-;;; Snippet compilation function
-
-(defun yas-compile-directory (top-level-dir)
-  "Create .yas-compiled-snippets.el files under subdirs of TOP-LEVEL-DIR.
-
-This works by stubbing a few functions, then calling
-`yas-load-directory'."
-  (interactive "DTop level snippet directory?")
-  (let ((yas--creating-compiled-snippets t))
-    (yas-load-directory top-level-dir nil)))
-
-(defun yas-recompile-all ()
-  "Compile every dir in `yas-snippet-dirs'."
-  (interactive)
-  (mapc #'yas-compile-directory (yas-snippet-dirs)))
-
-
-;;; JIT loading
-;;;
-
-(defvar yas--scheduled-jit-loads (make-hash-table)
-  "Alist of mode-symbols to forms to be evaled when `yas-minor-mode' kicks in.")
-
-(defun yas--schedule-jit (mode fun)
-  (push fun (gethash mode yas--scheduled-jit-loads)))
-
-
-
-;;; Some user level functions
-
-(defun yas-about ()
-  (interactive)
-  (message (concat "yasnippet (version "
-                   yas--version
-                   ") -- pluskid <pluskid@gmail.com>/joaotavora <joaotavora@gmail.com>")))
-
-
-;;; Apropos snippet menu:
-;;
-;; The snippet menu keymaps are store by mode in hash table called
-;; `yas--menu-table'. They are linked to the main menu in
-;; `yas--menu-keymap-get-create' and are initially created empty,
-;; reflecting the table hierarchy.
-;;
-;; They can be populated in two mutually exclusive ways: (1) by
-;; reading `yas--template-group', which in turn is populated by the "#
-;; group:" directives of the snippets or the ".yas-make-groups" file
-;; or (2) by using a separate `yas-define-menu' call, which declares a
-;; menu structure based on snippets uuids.
-;;
-;; Both situations are handled in `yas--update-template-menu', which
-;; uses the predicate `yas--template-menu-managed-by-yas-define-menu'
-;; that can tell between the two situations.
-;;
-;; Note:
-;;
-;; * if `yas-define-menu' is used it must run before
-;;   `yas-define-snippets' and the UUIDS must match, otherwise we get
-;;   duplicate entries. The `yas--template' objects are created in
-;;   `yas-define-menu', holding nothing but the menu entry,
-;;   represented by a pair of ((menu-item NAME :keys KEYS) TYPE) and
-;;   stored in `yas--template-menu-binding-pair'. The (menu-item ...)
-;;   part is then stored in the menu keymap itself which make the item
-;;   appear to the user. These limitations could probably be revised.
-;;
-;; * The `yas--template-perm-group' slot is only used in
-;;   `yas-describe-tables'.
-;;
-(defun yas--template-menu-binding-pair-get-create (template &optional type)
-  "Get TEMPLATE's menu binding or assign it a new one.
-
-TYPE may be `:stay', signaling this menu binding should be
-static in the menu."
-  (or (yas--template-menu-binding-pair template)
-      (let (;; (key (yas--template-key template))
-            ;; (keybinding (yas--template-keybinding template))
-            )
-        (setf (yas--template-menu-binding-pair template)
-              (cons `(menu-item ,(or (yas--template-name template)
-                                     (yas--template-uuid template))
-                                ,(yas--make-menu-binding template)
-                                :keys ,nil)
-                    type)))))
-(defun yas--template-menu-managed-by-yas-define-menu (template)
-  "Non-nil if TEMPLATE's menu entry was included in a `yas-define-menu' call."
-  (cdr (yas--template-menu-binding-pair template)))
-
-
-(defun yas--show-menu-p (mode)
-  (cond ((eq yas-use-menu 'abbreviate)
-         (find mode
-               (mapcar #'(lambda (table)
-                           (yas--table-mode table))
-                       (yas--get-snippet-tables))))
-        (yas-use-menu t)))
-
-(defun yas--delete-from-keymap (keymap uuid)
-  "Recursively delete items with UUID from KEYMAP and its submenus."
-
-  ;; XXX: This used to skip any submenus named \"parent mode\"
-  ;;
-  ;; First of all, recursively enter submenus, i.e. the tree is
-  ;; searched depth first so that stale submenus can be found in the
-  ;; higher passes.
-  ;;
-  (mapc #'(lambda (item)
-            (when (and (listp (cdr item))
-                       (keymapp (third (cdr item))))
-              (yas--delete-from-keymap (third (cdr item)) uuid)))
-        (rest keymap))
-  ;; Set the uuid entry to nil
-  ;;
-  (define-key keymap (vector (make-symbol uuid)) nil)
-  ;; Destructively modify keymap
-  ;;
-  (setcdr keymap (delete-if #'(lambda (item)
-                                (or (null (cdr item))
-                                    (and (keymapp (third (cdr item)))
-                                         (null (cdr (third (cdr item)))))))
-                            (rest keymap))))
-
-(defun yas-define-menu (mode menu &optional omit-items)
-  "Define a snippet menu for MODE according to MENU, omitting OMIT-ITEMS.
-
-MENU is a list, its elements can be:
-
-- (yas-item UUID) : Creates an entry the snippet identified with
-  UUID.  The menu entry for a snippet thus identified is
-  permanent, i.e. it will never move (be reordered) in the menu.
-
-- (yas-separator) : Creates a separator
-
-- (yas-submenu NAME SUBMENU) : Creates a submenu with NAME,
-  SUBMENU has the same form as MENU.  NAME is also added to the
-  list of groups of the snippets defined thereafter.
-
-OMIT-ITEMS is a list of snippet uuid's that will always be
-omitted from MODE's menu, even if they're manually loaded."
-  (let* ((table (yas--table-get-create mode))
-         (hash (yas--table-uuidhash table)))
-    (yas--define-menu-1 table
-                        (yas--menu-keymap-get-create mode)
-                        menu
-                        hash)
-    (dolist (uuid omit-items)
-      (let ((template (or (gethash uuid hash)
-                          (puthash uuid
-                                   (yas--make-template :table table
-                                                       :uuid uuid)
-                                   hash))))
-        (setf (yas--template-menu-binding-pair template) (cons nil :none))))))
-
-(defun yas--define-menu-1 (table menu-keymap menu uuidhash &optional group-list)
-  "Helper for `yas-define-menu'."
-  (dolist (e (reverse menu))
-    (cond ((eq (first e) 'yas-item)
-           (let ((template (or (gethash (second e) uuidhash)
-                               (puthash (second e)
-                                        (yas--make-template
-                                         :table table
-                                         :perm-group group-list
-                                         :uuid (second e))
-                                        uuidhash))))
-             (define-key menu-keymap (vector (gensym))
-               (car (yas--template-menu-binding-pair-get-create template :stay)))))
-          ((eq (first e) 'yas-submenu)
-           (let ((subkeymap (make-sparse-keymap)))
-             (define-key menu-keymap (vector (gensym))
-               `(menu-item ,(second e) ,subkeymap))
-             (yas--define-menu-1 table
-                                subkeymap
-                                (third e)
-                                uuidhash
-                                (append group-list (list (second e))))))
-          ((eq (first e) 'yas-separator)
-           (define-key menu-keymap (vector (gensym))
-             '(menu-item "----")))
-          (t
-           (yas--message 3 "Don't know anything about menu entry %s" (first e))))))
-
-(defun yas--define (mode key template &optional name condition group)
-  "Define a snippet.  Expanding KEY into TEMPLATE.
-
-NAME is a description to this template.  Also update the menu if
-`yas-use-menu' is t.  CONDITION is the condition attached to
-this snippet.  If you attach a condition to a snippet, then it
-will only be expanded when the condition evaluated to non-nil."
-  (yas-define-snippets mode
-                       (list (list key template name condition group))))
-
-(defun yas-hippie-try-expand (first-time?)
-  "Integrate with hippie expand.
-
-Just put this function in `hippie-expand-try-functions-list'."
-  (when yas-minor-mode
-    (if (not first-time?)
-        (let ((yas-fallback-behavior 'return-nil))
-          (yas-expand))
-      (undo 1)
-      nil)))
-
-
-;;; Apropos condition-cache:
-;;;
-;;;
-;;;
-;;;
-(defvar yas--condition-cache-timestamp nil)
-(defmacro yas-define-condition-cache (func doc &rest body)
-  "Define a function FUNC with doc DOC and body BODY.
-BODY is executed at most once every snippet expansion attempt, to check
-expansion conditions.
-
-It doesn't make any sense to call FUNC programatically."
-  `(defun ,func () ,(if (and doc
-                             (stringp doc))
-                        (concat doc
-"\n\nFor use in snippets' conditions. Within each
-snippet-expansion routine like `yas-expand', computes actual
-value for the first time then always returns a cached value.")
-                      (setq body (cons doc body))
-                      nil)
-     (let ((timestamp-and-value (get ',func 'yas--condition-cache)))
-       (if (equal (car timestamp-and-value) yas--condition-cache-timestamp)
-           (cdr timestamp-and-value)
-         (let ((new-value (progn
-                            ,@body
-                            )))
-           (put ',func 'yas--condition-cache (cons yas--condition-cache-timestamp new-value))
-           new-value)))))
-
-(defalias 'yas-expand 'yas-expand-from-trigger-key)
-(defun yas-expand-from-trigger-key (&optional field)
-  "Expand a snippet before point.
-
-If no snippet expansion is possible, fall back to the behaviour
-defined in `yas-fallback-behavior'.
-
-Optional argument FIELD is for non-interactive use and is an
-object satisfying `yas--field-p' to restrict the expansion to."
-  (interactive)
-  (setq yas--condition-cache-timestamp (current-time))
-  (let (templates-and-pos)
-    (unless (and yas-expand-only-for-last-commands
-                 (not (member last-command yas-expand-only-for-last-commands)))
-      (setq templates-and-pos (if field
-                                  (save-restriction
-                                    (narrow-to-region (yas--field-start field)
-                                                      (yas--field-end field))
-                                    (yas--templates-for-key-at-point))
-                                (yas--templates-for-key-at-point))))
-    (if templates-and-pos
-        (yas--expand-or-prompt-for-template (first templates-and-pos)
-                                            (second templates-and-pos)
-                                            (third templates-and-pos))
-      (yas--fallback))))
-
-(defun yas-expand-from-keymap ()
-  "Directly expand some snippets, searching `yas--direct-keymaps'.
-
-If expansion fails, execute the previous binding for this key"
-  (interactive)
-  (setq yas--condition-cache-timestamp (current-time))
-  (let* ((vec (subseq (this-command-keys-vector) (if current-prefix-arg
-                                                     (length (this-command-keys))
-                                                   0)))
-         (templates (mapcan #'(lambda (table)
-                                (yas--fetch table vec))
-                            (yas--get-snippet-tables))))
-    (if templates
-        (yas--expand-or-prompt-for-template templates)
-      (let ((yas-fallback-behavior 'call-other-command))
-        (yas--fallback)))))
-
-(defun yas--expand-or-prompt-for-template (templates &optional start end)
-  "Expand one of TEMPLATES from START to END.
-
-Prompt the user if TEMPLATES has more than one element, else
-expand immediately.  Common gateway for
-`yas-expand-from-trigger-key' and `yas-expand-from-keymap'."
-  (let ((yas--current-template (or (and (rest templates) ;; more than one
-                                        (yas--prompt-for-template (mapcar #'cdr templates)))
-                                   (cdar templates))))
-    (when yas--current-template
-      (yas-expand-snippet (yas--template-content yas--current-template)
-                          start
-                          end
-                          (yas--template-expand-env yas--current-template)))))
-
-;; Apropos the trigger key and the fallback binding:
-;;
-;; When `yas-minor-mode-map' binds <tab>, that correctly overrides
-;; org-mode's <tab>, for example and searching for fallbacks correctly
-;; returns `org-cycle'. However, most other modes bind "TAB". TODO,
-;; improve this explanation.
-;;
-(defun yas--fallback ()
-  "Fallback after expansion has failed.
-
-Common gateway for `yas-expand-from-trigger-key' and
-`yas-expand-from-keymap'."
-  (cond ((eq yas-fallback-behavior 'return-nil)
-         ;; return nil
-         nil)
-        ((eq yas-fallback-behavior 'yas--fallback)
-         (error (concat "yasnippet fallback loop!\n"
-                        "This can happen when you bind `yas-expand' "
-                        "outside of the `yas-minor-mode-map'.")))
-        ((eq yas-fallback-behavior 'call-other-command)
-         (let* ((yas-fallback-behavior 'yas--fallback)
-                ;; Also bind `yas-minor-mode' to prevent fallback
-                ;; loops when other extensions use mechanisms similar
-                ;; to `yas--keybinding-beyond-yasnippet'. (github #525
-                ;; and #526)
-                ;; 
-                (yas-minor-mode nil)
-                (beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
-           (yas--message 4 "Falling back to %s"  beyond-yasnippet)
-           (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
-           (setq this-original-command beyond-yasnippet)
-           (when beyond-yasnippet
-             (call-interactively beyond-yasnippet))))
-        ((and (listp yas-fallback-behavior)
-              (cdr yas-fallback-behavior)
-              (eq 'apply (car yas-fallback-behavior)))
-         (let ((command-or-fn (cadr yas-fallback-behavior))
-               (args (cddr yas-fallback-behavior))
-               (yas-fallback-behavior 'yas--fallback)
-               (yas-minor-mode nil))
-           (if args
-               (apply command-or-fn args)
-             (when (commandp command-or-fn)
-               (setq this-command command-or-fn)
-               (call-interactively command-or-fn)))))
-        (t
-         ;; also return nil if all the other fallbacks have failed
-         nil)))
-
-(defun yas--keybinding-beyond-yasnippet ()
-  "Get current keys's binding as if YASsnippet didn't exist."
-  (let* ((yas-minor-mode nil)
-         (yas--direct-keymaps nil)
-         (keys (this-single-command-keys)))
-    (or (key-binding keys t)
-        (key-binding (yas--fallback-translate-input keys) t))))
-
-(defun yas--fallback-translate-input (keys)
-  "Emulate `read-key-sequence', at least what I think it does.
-
-Keys should be an untranslated key vector.  Returns a translated
-vector of keys.  FIXME not thoroughly tested."
-  (let ((retval [])
-        (i 0))
-    (while (< i (length keys))
-      (let ((j i)
-            (translated local-function-key-map))
-        (while (and (< j (length keys))
-                    translated
-                    (keymapp translated))
-          (setq translated (cdr (assoc (aref keys j) (remove 'keymap translated)))
-                j (1+ j)))
-        (setq retval (vconcat retval (cond ((symbolp translated)
-                                            `[,translated])
-                                           ((vectorp translated)
-                                            translated)
-                                           (t
-                                            (substring keys i j)))))
-        (setq i j)))
-    retval))
-
-
-;;; Utils for snippet development:
-
-(defun yas--all-templates (tables)
-  "Get `yas--template' objects in TABLES, applicable for buffer and point.
-
-Honours `yas-choose-tables-first', `yas-choose-keys-first' and
-`yas-buffer-local-condition'"
-  (when yas-choose-tables-first
-    (setq tables (list (yas--prompt-for-table tables))))
-  (mapcar #'cdr
-          (if yas-choose-keys-first
-              (let ((key (yas--prompt-for-keys
-                          (mapcan #'yas--table-all-keys tables))))
-                (when key
-                  (mapcan #'(lambda (table)
-                              (yas--fetch table key))
-                          tables)))
-            (remove-duplicates (mapcan #'yas--table-templates tables)
-                               :test #'equal))))
-
-(defun yas-insert-snippet (&optional no-condition)
-  "Choose a snippet to expand, pop-up a list of choices according
-to `yas-prompt-functions'.
-
-With prefix argument NO-CONDITION, bypass filtering of snippets
-by condition."
-  (interactive "P")
-  (setq yas--condition-cache-timestamp (current-time))
-  (let* ((yas-buffer-local-condition (or (and no-condition
-                                              'always)
-                                         yas-buffer-local-condition))
-         (templates (yas--all-templates (yas--get-snippet-tables)))
-         (yas--current-template (and templates
-                                    (or (and (rest templates) ;; more than one template for same key
-                                             (yas--prompt-for-template templates))
-                                        (car templates))))
-         (where (if (region-active-p)
-                    (cons (region-beginning) (region-end))
-                  (cons (point) (point)))))
-    (if yas--current-template
-        (yas-expand-snippet (yas--template-content yas--current-template)
-                            (car where)
-                            (cdr where)
-                            (yas--template-expand-env yas--current-template))
-      (yas--message 3 "No snippets can be inserted here!"))))
-
-(defun yas-visit-snippet-file ()
-  "Choose a snippet to edit, selection like `yas-insert-snippet'.
-
-Only success if selected snippet was loaded from a file.  Put the
-visited file in `snippet-mode'."
-  (interactive)
-  (let* ((yas-buffer-local-condition 'always)
-         (templates (yas--all-templates (yas--get-snippet-tables)))
-         (yas-prompt-functions '(yas-ido-prompt yas-completing-prompt))
-         (template (and templates
-                        (or (yas--prompt-for-template templates
-                                                     "Choose a snippet template to edit: ")
-                            (car templates)))))
-
-    (if template
-        (yas--visit-snippet-file-1 template)
-      (message "No snippets tables active!"))))
-
-(defun yas--visit-snippet-file-1 (template)
-  "Helper for `yas-visit-snippet-file'."
-  (let ((file (yas--template-file template)))
-    (cond ((and file (file-readable-p file))
-           (find-file-other-window file)
-           (snippet-mode)
-           (set (make-local-variable 'yas--editing-template) template))
-          (file
-           (message "Original file %s no longer exists!" file))
-          (t
-           (switch-to-buffer (format "*%s*"(yas--template-name template)))
-           (let ((type 'snippet))
-             (when (listp (yas--template-content template))
-               (insert (format "# type: command\n"))
-               (setq type 'command))
-             (insert (format "# key: %s\n" (yas--template-key template)))
-             (insert (format "# name: %s\n" (yas--template-name template)))
-             (when (yas--template-keybinding template)
-               (insert (format "# binding: %s\n" (yas--template-keybinding template))))
-             (when (yas--template-expand-env template)
-               (insert (format "# expand-env: %s\n" (yas--template-expand-env template))))
-             (when (yas--template-condition template)
-               (insert (format "# condition: %s\n" (yas--template-condition template))))
-             (insert "# --\n")
-             (insert (if (eq type 'command)
-                         (pp-to-string (yas--template-content template))
-                       (yas--template-content template))))
-           (snippet-mode)
-           (set (make-local-variable 'yas--editing-template) template)))))
-
-(defun yas--guess-snippet-directories-1 (table)
-  "Guess possible snippet subdirectories for TABLE."
-  (cons (yas--table-name table)
-        (mapcan #'(lambda (parent)
-                    (yas--guess-snippet-directories-1
-                     parent))
-                (yas--table-parents table))))
-
-(defun yas--guess-snippet-directories (&optional table)
-  "Try to guess suitable directories based on the current active
-tables (or optional TABLE).
-
-Returns a list of elements (TABLE . DIRS) where TABLE is a
-`yas--table' object and DIRS is a list of all possible directories
-where snippets of table might exist."
-  (let ((main-dir (replace-regexp-in-string
-                   "/+$" ""
-                   (or (first (or (yas-snippet-dirs)
-                                  (setq yas-snippet-dirs '("~/.emacs.d/snippets")))))))
-        (tables (or (and table
-                         (list table))
-                    (yas--get-snippet-tables))))
-    ;; HACK! the snippet table created here is actually registered!
-    ;;
-    (unless (or table (gethash major-mode yas--tables))
-      (push (yas--table-get-create major-mode)
-            tables))
-
-    (mapcar #'(lambda (table)
-                (cons table
-                      (mapcar #'(lambda (subdir)
-                                  (concat main-dir "/" subdir))
-                              (yas--guess-snippet-directories-1 table))))
-            tables)))
-
-(defun yas--make-directory-maybe (table-and-dirs &optional main-table-string)
-  "Return a dir inside TABLE-AND-DIRS, prompts for creation if none exists."
-  (or (some #'(lambda (dir) (when (file-directory-p dir) dir)) (cdr table-and-dirs))
-      (let ((candidate (first (cdr table-and-dirs))))
-        (unless (file-writable-p (file-name-directory candidate))
-          (error (yas--format "%s is not writable." candidate)))
-        (if (y-or-n-p (format "Guessed directory (%s) for%s%s table \"%s\" does not exist! Create? "
-                              candidate
-                              (if (gethash (yas--table-mode (car table-and-dirs))
-                                           yas--tables)
-                                  ""
-                                " brand new")
-                              (or main-table-string
-                                  "")
-                              (yas--table-name (car table-and-dirs))))
-            (progn
-              (make-directory candidate 'also-make-parents)
-              ;; create the .yas-parents file here...
-              candidate)))))
-
-(defun yas-new-snippet (&optional no-template)
-  "Pops a new buffer for writing a snippet.
-
-Expands a snippet-writing snippet, unless the optional prefix arg
-NO-TEMPLATE is non-nil."
-  (interactive "P")
-  (let ((guessed-directories (yas--guess-snippet-directories)))
-
-    (switch-to-buffer "*new snippet*")
-    (erase-buffer)
-    (kill-all-local-variables)
-    (snippet-mode)
-    (yas-minor-mode 1)
-    (set (make-local-variable 'yas--guessed-modes) (mapcar #'(lambda (d)
-                                                              (yas--table-mode (car d)))
-                                                          guessed-directories))
-    (if (and (not no-template) yas-new-snippet-default)
-        (yas-expand-snippet yas-new-snippet-default))))
-
-(defun yas--compute-major-mode-and-parents (file)
-  "Given FILE, find the nearest snippet directory for a given mode.
-
-Returns a list (MODE-SYM PARENTS), the mode's symbol and a list
-representing one or more of the mode's parents.
-
-Note that MODE-SYM need not be the symbol of a real major mode,
-neither do the elements of PARENTS."
-  (let* ((file-dir (and file
-                        (directory-file-name (or (some #'(lambda (special)
-                                                           (locate-dominating-file file special))
-                                                       '(".yas-setup.el"
-                                                         ".yas-make-groups"
-                                                         ".yas-parents"))
-                                                 (directory-file-name (file-name-directory file))))))
-         (parents-file-name (concat file-dir "/.yas-parents"))
-         (major-mode-name (and file-dir
-                               (file-name-nondirectory file-dir)))
-         (major-mode-sym (or (and major-mode-name
-                                  (intern major-mode-name))))
-         (parents (when (file-readable-p parents-file-name)
-                         (mapcar #'intern
-                                 (split-string
-                                  (with-temp-buffer
-                                    (insert-file-contents parents-file-name)
-                                    (buffer-substring-no-properties (point-min)
-                                                                    (point-max))))))))
-    (when major-mode-sym
-      (cons major-mode-sym (remove major-mode-sym parents)))))
-
-(defvar yas--editing-template nil
-  "Supporting variable for `yas-load-snippet-buffer' and `yas--visit-snippet'.")
-
-(defvar yas--current-template nil
-  "Holds the current template being expanded into a snippet.")
-
-(defvar yas--guessed-modes nil
-  "List of guessed modes supporting `yas-load-snippet-buffer'.")
-
-(defun yas--read-table ()
-  "Ask user for a snippet table, help with some guessing."
-  (let ((prompt (if (and (featurep 'ido)
-                         ido-mode)
-                    'ido-completing-read 'completing-read)))
-    (unless yas--guessed-modes
-      (set (make-local-variable 'yas--guessed-modes)
-           (or (yas--compute-major-mode-and-parents buffer-file-name))))
-    (intern
-     (funcall prompt (format "Choose or enter a table (yas guesses %s): "
-                             (if yas--guessed-modes
-                                 (first yas--guessed-modes)
-                               "nothing"))
-              (mapcar #'symbol-name yas--guessed-modes)
-              nil
-              nil
-              nil
-              nil
-              (if (first yas--guessed-modes)
-                  (symbol-name (first yas--guessed-modes)))))))
-
-(defun yas-load-snippet-buffer (table &optional interactive)
-  "Parse and load current buffer's snippet definition into TABLE.
-
-TABLE is a symbol naming a passed to `yas--table-get-create'.
-
-When called interactively, prompt for the table name."
-  (interactive (list (yas--read-table) t))
-  (cond
-   ;;  We have `yas--editing-template', this buffer's content comes from a
-   ;;  template which is already loaded and neatly positioned,...
-   ;;
-   (yas--editing-template
-    (yas--define-snippets-1 (yas--parse-template (yas--template-file yas--editing-template))
-                           (yas--template-table yas--editing-template)))
-   ;; Try to use `yas--guessed-modes'. If we don't have that use the
-   ;; value from `yas--compute-major-mode-and-parents'
-   ;;
-   (t
-    (unless yas--guessed-modes
-      (set (make-local-variable 'yas--guessed-modes) (or (yas--compute-major-mode-and-parents buffer-file-name))))
-    (let* ((table (yas--table-get-create table)))
-      (set (make-local-variable 'yas--editing-template)
-           (yas--define-snippets-1 (yas--parse-template buffer-file-name)
-                                  table)))))
-  (when interactive
-    (yas--message 3 "Snippet \"%s\" loaded for %s."
-                  (yas--template-name yas--editing-template)
-                  (yas--table-name (yas--template-table yas--editing-template)))))
-
-(defun yas-load-snippet-buffer-and-close (table &optional kill)
-  "Load the snippet with `yas-load-snippet-buffer', possibly
-  save, then `quit-window' if saved.
-
-If the snippet is new, ask the user whether (and where) to save
-it. If the snippet already has a file, just save it.
-
-The prefix argument KILL is passed to `quit-window'.
-
-Don't use this from a Lisp program, call `yas-load-snippet-buffer'
-and `kill-buffer' instead."
-  (interactive (list (yas--read-table) current-prefix-arg))
-  (yas-load-snippet-buffer table t)
-  (when (and (or
-              ;; Only offer to save this if it looks like a library or new
-              ;; snippet (loaded from elisp, from a dir in `yas-snippet-dirs'
-              ;; which is not the first, or from an unwritable file)
-              ;;
-              (not (yas--template-file yas--editing-template))
-              (not (file-writable-p (yas--template-file yas--editing-template)))
-              (and (listp yas-snippet-dirs)
-                   (second yas-snippet-dirs)
-                   (not (string-match (expand-file-name (first yas-snippet-dirs))
-                                      (yas--template-file yas--editing-template)))))
-             (y-or-n-p (yas--format "Looks like a library or new snippet. Save to new file? ")))
-    (let* ((option (first (yas--guess-snippet-directories (yas--template-table yas--editing-template))))
-           (chosen (and option
-                        (yas--make-directory-maybe option))))
-      (when chosen
-        (let ((default-file-name (or (and (yas--template-file yas--editing-template)
-                                          (file-name-nondirectory (yas--template-file yas--editing-template)))
-                                     (yas--template-name yas--editing-template))))
-          (write-file (concat chosen "/"
-                              (read-from-minibuffer (format "File name to create in %s? " chosen)
-                                                    default-file-name)))
-          (setf (yas--template-file yas--editing-template) buffer-file-name)))))
-  (when buffer-file-name
-    (save-buffer)
-    (quit-window kill)))
-
-(defun yas-tryout-snippet (&optional debug)
-  "Test current buffer's snippet template in other buffer."
-  (interactive "P")
-  (let* ((major-mode-and-parent (yas--compute-major-mode-and-parents buffer-file-name))
-         (parsed (yas--parse-template))
-         (test-mode (or (and (car major-mode-and-parent)
-                             (fboundp (car major-mode-and-parent))
-                             (car major-mode-and-parent))
-                        (first yas--guessed-modes)
-                        (intern (read-from-minibuffer (yas--format "Please input a mode: ")))))
-         (yas--current-template
-          (and parsed
-               (fboundp test-mode)
-               (yas--make-template :table       nil ;; no tables for ephemeral snippets
-                                   :key         (first parsed)
-                                   :content     (second parsed)
-                                   :name        (third parsed)
-                                   :expand-env  (sixth parsed)))))
-    (cond (yas--current-template
-           (let ((buffer-name (format "*testing snippet: %s*" (yas--template-name yas--current-template))))
-             (kill-buffer (get-buffer-create buffer-name))
-             (switch-to-buffer (get-buffer-create buffer-name))
-             (setq buffer-undo-list nil)
-             (condition-case nil (funcall test-mode) (error nil))
-	     (yas-minor-mode 1)
-             (setq buffer-read-only nil)
-             (yas-expand-snippet (yas--template-content yas--current-template)
-                                 (point-min)
-                                 (point-max)
-                                 (yas--template-expand-env yas--current-template))
-             (when (and debug
-                        (require 'yasnippet-debug nil t))
-               (add-hook 'post-command-hook 'yas-debug-snippet-vars nil t))))
-          (t
-           (yas--message 3 "Cannot test snippet for unknown major mode")))))
-
-(defun yas-active-keys ()
-  "Return all active trigger keys for current buffer and point."
-  (remove-duplicates
-   (remove-if-not #'stringp (mapcan #'yas--table-all-keys (yas--get-snippet-tables)))
-   :test #'string=))
-
-(defun yas--template-fine-group (template)
-  (car (last (or (yas--template-group template)
-                 (yas--template-perm-group template)))))
-
-(defun yas-describe-tables (&optional choose)
-  "Display snippets for each table."
-  (interactive "P")
-  (let* ((by-name-hash (and choose
-                            (y-or-n-p "Show by namehash? ")))
-         (buffer (get-buffer-create "*YASnippet tables*"))
-         (active-tables (yas--get-snippet-tables))
-         (remain-tables (let ((all))
-                          (maphash #'(lambda (_k v)
-                                       (unless (find v active-tables)
-                                         (push v all)))
-                                   yas--tables)
-                          all))
-         (table-lists (list active-tables remain-tables))
-         (original-buffer (current-buffer))
-         (continue t)
-         (yas--condition-cache-timestamp (current-time)))
-    (with-current-buffer buffer
-      (setq buffer-read-only nil)
-      (erase-buffer)
-      (cond ((not by-name-hash)
-             (insert "YASnippet tables: \n")
-             (while (and table-lists
-                         continue)
-               (dolist (table (car table-lists))
-                 (yas--describe-pretty-table table original-buffer))
-               (setq table-lists (cdr table-lists))
-               (when table-lists
-                 (yas--create-snippet-xrefs)
-                 (display-buffer buffer)
-                 (setq continue (and choose (y-or-n-p "Show also non-active tables? ")))))
-             (yas--create-snippet-xrefs)
-             (help-mode)
-             (goto-char 1))
-            (t
-             (insert "\n\nYASnippet tables by NAMEHASH: \n")
-             (dolist (table (append active-tables remain-tables))
-               (insert (format "\nSnippet table `%s':\n\n" (yas--table-name table)))
-               (let ((keys))
-                 (maphash #'(lambda (k _v)
-                              (push k keys))
-                          (yas--table-hash table))
-                 (dolist (key keys)
-                   (insert (format "   key %s maps snippets: %s\n" key
-                                   (let ((names))
-                                     (maphash #'(lambda (k _v)
-                                                  (push k names))
-                                              (gethash key (yas--table-hash table)))
-                                     names))))))))
-      (goto-char 1)
-      (setq buffer-read-only t))
-    (display-buffer buffer)))
-
-(defun yas--describe-pretty-table (table &optional original-buffer)
-  (insert (format "\nSnippet table `%s'"
-                  (yas--table-name table)))
-  (if (yas--table-parents table)
-      (insert (format " parents: %s\n"
-                      (mapcar #'yas--table-name
-                              (yas--table-parents table))))
-    (insert "\n"))
-  (insert (make-string 100 ?-) "\n")
-  (insert "group                   state name                                    key             binding\n")
-  (let ((groups-hash (make-hash-table :test #'equal)))
-    (maphash #'(lambda (_k v)
-                 (let ((group (or (yas--template-fine-group v)
-                                  "(top level)")))
-                   (when (yas--template-name v)
-                     (puthash group
-                              (cons v (gethash group groups-hash))
-                              groups-hash))))
-             (yas--table-uuidhash table))
-    (maphash
-     #'(lambda (group templates)
-         (setq group (truncate-string-to-width group 25 0 ?  "..."))
-         (insert (make-string 100 ?-) "\n")
-         (dolist (p templates)
-           (let ((name (truncate-string-to-width (propertize (format "\\\\snippet `%s'" (yas--template-name p))
-                                                             'yasnippet p)
-                                                 50 0 ? "..."))
-                 (group (prog1 group
-                          (setq group (make-string (length group) ? ))))
-                 (condition-string (let ((condition (yas--template-condition p)))
-                                     (if (and condition
-                                              original-buffer)
-                                         (with-current-buffer original-buffer
-                                           (if (yas--eval-condition condition)
-                                               "(y)"
-                                             "(s)"))
-                                       "(a)"))))
-             (insert group " ")
-             (insert condition-string " ")
-             (insert name
-                     (if (string-match "\\.\\.\\.$" name)
-                         "'"
-                       " ")
-                     " ")
-             (insert (truncate-string-to-width (or (yas--template-key p) "")
-                                               15 0 ?  "...") " ")
-             (insert (truncate-string-to-width (key-description (yas--template-keybinding p))
-                                               15 0 ?  "...") " ")
-             (insert "\n"))))
-     groups-hash)))
-
-
-
-;;; User convenience functions, for using in `yas-key-syntaxes'
-
-(defun yas-try-key-from-whitespace (_start-point)
-  "As `yas-key-syntaxes' element, look for whitespace delimited key.
-
-A newline will be considered whitespace even if the mode syntax
-marks it as something else (typically comment ender)."
-  (skip-chars-backward "^[:space:]\n"))
-
-(defun yas-shortest-key-until-whitespace (_start-point)
-  "Like `yas-longest-key-from-whitespace' but take the shortest key."
-  (when (/= (skip-chars-backward "^[:space:]\n" (1- (point))) 0)
-    'again))
-
-(defun yas-longest-key-from-whitespace (start-point)
-  "As `yas-key-syntaxes' element, look for longest key between point and whitespace.
-
-A newline will be considered whitespace even if the mode syntax
-marks it as something else (typically comment ender)."
-  (if (= (point) start-point)
-      (yas-try-key-from-whitespace start-point)
-    (forward-char))
-  (unless (<= start-point (1+ (point)))
-    'again))
-
-
-
-;;; User convenience functions, for using in snippet definitions
-
-(defvar yas-modified-p nil
-  "Non-nil if field has been modified by user or transformation.")
-
-(defvar yas-moving-away-p nil
-  "Non-nil if user is about to exit field.")
-
-(defvar yas-text nil
-  "Contains current field text.")
-
-(defun yas-substr (str pattern &optional subexp)
-  "Search PATTERN in STR and return SUBEXPth match.
-
-If found, the content of subexp group SUBEXP (default 0) is
-  returned, or else the original STR will be returned."
-  (let ((grp (or subexp 0)))
-    (save-match-data
-      (if (string-match pattern str)
-          (match-string-no-properties grp str)
-        str))))
-
-(defun yas-choose-value (&rest possibilities)
-  "Prompt for a string in POSSIBILITIES and return it.
-
-The last element of POSSIBILITIES may be a list of strings."
-  (unless (or yas-moving-away-p
-              yas-modified-p)
-    (let* ((last-link (last possibilities))
-           (last-elem (car last-link)))
-      (when (listp last-elem)
-        (setcar last-link (car last-elem))
-        (setcdr last-link (cdr last-elem))))
-    (some #'(lambda (fn)
-              (funcall fn "Choose: " possibilities))
-          yas-prompt-functions)))
-
-(defun yas-key-to-value (alist)
-  (unless (or yas-moving-away-p
-              yas-modified-p)
-    (let ((key (read-key-sequence "")))
-      (when (stringp key)
-        (or (cdr (find key alist :key #'car :test #'string=))
-            key)))))
-
-(defun yas-throw (text)
-  "Throw a yas--exception with TEXT as the reason."
-  (throw 'yas--exception (cons 'yas--exception text)))
-
-(defun yas-verify-value (possibilities)
-  "Verify that the current field value is in POSSIBILITIES.
-
-Otherwise throw exception."
-  (when (and yas-moving-away-p (notany #'(lambda (pos) (string= pos yas-text)) possibilities))
-    (yas-throw (yas--format "Field only allows %s" possibilities))))
-
-(defun yas-field-value (number)
-  "Get the string for field with NUMBER.
-
-Use this in primary and mirror transformations to tget."
-  (let* ((snippet (car (yas--snippets-at-point)))
-         (field (and snippet
-                     (yas--snippet-find-field snippet number))))
-    (when field
-      (yas--field-text-for-display field))))
-
-(defun yas-text ()
-  "Return `yas-text' if that exists and is non-empty, else nil."
-  (if (and yas-text
-           (not (string= "" yas-text)))
-      yas-text))
-
-(defun yas-selected-text ()
-  "Return `yas-selected-text' if that exists and is non-empty, else nil."
-  (if (and yas-selected-text
-           (not (string= "" yas-selected-text)))
-      yas-selected-text))
-
-(defun yas--get-field-once (number &optional transform-fn)
-  (unless yas-modified-p
-    (if transform-fn
-        (funcall transform-fn (yas-field-value number))
-      (yas-field-value number))))
-
-(defun yas-default-from-field (number)
-  (unless yas-modified-p
-    (yas-field-value number)))
-
-(defun yas-inside-string ()
-  "Return non-nil if the point is inside a string according to font-lock."
-  (equal 'font-lock-string-face (get-char-property (1- (point)) 'face)))
-
-(defun yas-unimplemented (&optional missing-feature)
-  (if yas--current-template
-      (if (y-or-n-p (format "This snippet is unimplemented (missing %s) Visit the snippet definition? "
-                            (or missing-feature
-                                "something")))
-          (yas--visit-snippet-file-1 yas--current-template))
-    (message "No implementation. Missing %s" (or missing-feature "something"))))
-
-
-;;; Snippet expansion and field management
-
-(defvar yas--active-field-overlay nil
-  "Overlays the currently active field.")
-
-(defvar yas--field-protection-overlays nil
-  "Two overlays protect the current active field.")
-
-(defvar yas-selected-text nil
-  "The selected region deleted on the last snippet expansion.")
-
-(defvar yas--start-column nil
-  "The column where the snippet expansion started.")
-
-(make-variable-buffer-local 'yas--active-field-overlay)
-(make-variable-buffer-local 'yas--field-protection-overlays)
-(put 'yas--active-field-overlay 'permanent-local t)
-(put 'yas--field-protection-overlays 'permanent-local t)
-
-(defstruct (yas--snippet (:constructor yas--make-snippet ()))
-  "A snippet.
-
-..."
-  (fields '())
-  (exit nil)
-  (id (yas--snippet-next-id) :read-only t)
-  (control-overlay nil)
-  active-field
-  ;; stacked expansion: the `previous-active-field' slot saves the
-  ;; active field where the child expansion took place
-  previous-active-field
-  force-exit)
-
-(defstruct (yas--field (:constructor yas--make-field (number start end parent-field)))
-  "A field.
-
-NUMBER is the field number.
-START and END are mostly buffer markers, but see \"apropos markers-to-points\".
-PARENT-FIELD is a `yas--field' this field is nested under, or nil.
-MIRRORS is a list of `yas--mirror's
-TRANSFORM is a lisp form.
-MODIFIED-P is a boolean set to true once user inputs text.
-NEXT is another `yas--field' or `yas--mirror' or `yas--exit'.
-"
-  number
-  start end
-  parent-field
-  (mirrors '())
-  (transform nil)
-  (modified-p nil)
-  next)
-
-
-(defstruct (yas--mirror (:constructor yas--make-mirror (start end transform)))
-  "A mirror.
-
-START and END are mostly buffer markers, but see \"apropos markers-to-points\".
-TRANSFORM is a lisp form.
-PARENT-FIELD is a `yas--field' this mirror is nested under, or nil.
-NEXT is another `yas--field' or `yas--mirror' or `yas--exit'
-DEPTH is a count of how many nested mirrors can affect this mirror"
-  start end
-  (transform nil)
-  parent-field
-  next
-  depth)
-
-(defstruct (yas--exit (:constructor yas--make-exit (marker)))
-  marker
-  next)
-
-(defun yas--apply-transform (field-or-mirror field &optional empty-on-nil-p)
-  "Calculate transformed string for FIELD-OR-MIRROR from FIELD.
-
-If there is no transform for ht field, return nil.
-
-If there is a transform but it returns nil, return the empty
-string iff EMPTY-ON-NIL-P is true."
-  (let* ((yas-text (yas--field-text-for-display field))
-         (yas-modified-p (yas--field-modified-p field))
-         (yas-moving-away-p nil)
-         (transform (if (yas--mirror-p field-or-mirror)
-                        (yas--mirror-transform field-or-mirror)
-                      (yas--field-transform field-or-mirror)))
-         (start-point (if (yas--mirror-p field-or-mirror)
-                          (yas--mirror-start field-or-mirror)
-                        (yas--field-start field-or-mirror)))
-         (transformed (and transform
-                           (save-excursion
-                             (goto-char start-point)
-                             (let ((ret (yas--eval-lisp transform)))
-                               (or ret (and empty-on-nil-p "")))))))
-    transformed))
-
-(defsubst yas--replace-all (from to &optional text)
-  "Replace all occurrences from FROM to TO.
-
-With optional string TEXT do it in that string."
-  (if text
-      (replace-regexp-in-string (regexp-quote from) to text t t)
-    (goto-char (point-min))
-    (while (search-forward from nil t)
-      (replace-match to t t text))))
-
-(defun yas--snippet-find-field (snippet number)
-  (find-if #'(lambda (field)
-               (eq number (yas--field-number field)))
-           (yas--snippet-fields snippet)))
-
-(defun yas--snippet-sort-fields (snippet)
-  "Sort the fields of SNIPPET in navigation order."
-  (setf (yas--snippet-fields snippet)
-        (sort (yas--snippet-fields snippet)
-              #'yas--snippet-field-compare)))
-
-(defun yas--snippet-field-compare (field1 field2)
-  "Compare FIELD1 and FIELD2.
-
-The field with a number is sorted first.  If they both have a
-number, compare through the number.  If neither have, compare
-through the field's start point"
-  (let ((n1 (yas--field-number field1))
-        (n2 (yas--field-number field2)))
-    (if n1
-        (if n2
-            (or (zerop n2) (and (not (zerop n1))
-                                (< n1 n2)))
-          (not (zerop n1)))
-      (if n2
-          (zerop n2)
-        (< (yas--field-start field1)
-           (yas--field-start field2))))))
-
-(defun yas--field-probably-deleted-p (snippet field)
-  "Guess if SNIPPET's FIELD should be skipped."
-  (and
-   ;; field must be zero length
-   ;;
-   (zerop (- (yas--field-start field) (yas--field-end field)))
-   ;; field must have been modified
-   ;;
-   (yas--field-modified-p field)
-   ;; either:
-   (or
-    ;;  1) it's a nested field
-    ;;
-    (yas--field-parent-field field)
-    ;;  2) ends just before the snippet end
-    ;;
-    (and (eq field (car (last (yas--snippet-fields snippet))))
-         (= (yas--field-start field) (overlay-end (yas--snippet-control-overlay snippet)))))
-   ;; the field numbered 0, just before the exit marker, should
-   ;; never be skipped
-   ;;
-   (not (and (yas--field-number field)
-             (zerop (yas--field-number field))))))
-
-(defun yas--snippets-at-point (&optional all-snippets)
-  "Return a sorted list of snippets at point.
-
-The most recently-inserted snippets are returned first."
-  (sort
-   (remove nil (remove-duplicates (mapcar #'(lambda (ov)
-                                              (overlay-get ov 'yas--snippet))
-                                          (if all-snippets
-                                              (overlays-in (point-min) (point-max))
-                                            (nconc (overlays-at (point)) (overlays-at (1- (point))))))))
-   #'(lambda (s1 s2)
-       (<= (yas--snippet-id s2) (yas--snippet-id s1)))))
-
-(defun yas-next-field-or-maybe-expand ()
-  "Try to expand a snippet at a key before point.
-
-Otherwise delegate to `yas-next-field'."
-  (interactive)
-  (if yas-triggers-in-field
-      (let ((yas-fallback-behavior 'return-nil)
-            (active-field (overlay-get yas--active-field-overlay 'yas--field)))
-        (when active-field
-          (unless (yas-expand-from-trigger-key active-field)
-            (yas-next-field))))
-    (yas-next-field)))
-
-(defun yas-next-field (&optional arg)
-  "Navigate to the ARGth next field.
-
-If there's none, exit the snippet."
-  (interactive)
-  (let* ((arg (or arg
-                  1))
-         (snippet (first (yas--snippets-at-point)))
-         (active-field (overlay-get yas--active-field-overlay 'yas--field))
-         (live-fields (remove-if #'(lambda (field)
-                                     (and (not (eq field active-field))
-                                          (yas--field-probably-deleted-p snippet field)))
-                                 (yas--snippet-fields snippet)))
-         (active-field-pos (position active-field live-fields))
-         (target-pos (and active-field-pos (+ arg active-field-pos)))
-         (target-field (and target-pos (nth target-pos live-fields))))
-    ;; First check if we're moving out of a field with a transform
-    ;;
-    (when (and active-field
-               (yas--field-transform active-field))
-      (let* ((yas-moving-away-p t)
-             (yas-text (yas--field-text-for-display active-field))
-             (yas-modified-p (yas--field-modified-p active-field)))
-        ;; primary field transform: exit call to field-transform
-        (yas--eval-lisp (yas--field-transform active-field))))
-    ;; Now actually move...
-    (cond ((and target-pos (>= target-pos (length live-fields)))
-           (yas-exit-snippet snippet))
-          (target-field
-           (yas--move-to-field snippet target-field))
-          (t
-           nil))))
-
-(defun yas--place-overlays (snippet field)
-  "Correctly place overlays for SNIPPET's FIELD."
-  (yas--make-move-field-protection-overlays snippet field)
-  (yas--make-move-active-field-overlay snippet field))
-
-(defun yas--move-to-field (snippet field)
-  "Update SNIPPET to move to field FIELD.
-
-Also create some protection overlays"
-  (goto-char (yas--field-start field))
-  (yas--place-overlays snippet field)
-  (overlay-put yas--active-field-overlay 'yas--field field)
-  (let ((number (yas--field-number field)))
-    ;; check for the special ${0: ...} field
-    (if (and number (zerop number))
-        (progn
-          (set-mark (yas--field-end field))
-          (setf (yas--snippet-force-exit snippet)
-                (or (yas--field-transform field)
-                    t)))
-      ;; make this field active
-      (setf (yas--snippet-active-field snippet) field)
-      ;; primary field transform: first call to snippet transform
-      (unless (yas--field-modified-p field)
-        (if (yas--field-update-display field)
-            (yas--update-mirrors snippet)
-          (setf (yas--field-modified-p field) nil))))))
-
-(defun yas-prev-field ()
-  "Navigate to prev field.  If there's none, exit the snippet."
-  (interactive)
-  (yas-next-field -1))
-
-(defun yas-abort-snippet (&optional snippet)
-  (interactive)
-  (let ((snippet (or snippet
-                     (car (yas--snippets-at-point)))))
-    (when snippet
-      (setf (yas--snippet-force-exit snippet) t))))
-
-(defun yas-exit-snippet (snippet)
-  "Goto exit-marker of SNIPPET."
-  (interactive (list (first (yas--snippets-at-point))))
-  (when snippet
-    (setf (yas--snippet-force-exit snippet) t)
-    (goto-char (if (yas--snippet-exit snippet)
-                   (yas--exit-marker (yas--snippet-exit snippet))
-                 (overlay-end (yas--snippet-control-overlay snippet))))))
-
-(defun yas-exit-all-snippets ()
-  "Exit all snippets."
-  (interactive)
-  (mapc #'(lambda (snippet)
-            (yas-exit-snippet snippet)
-            (yas--check-commit-snippet))
-        (yas--snippets-at-point 'all-snippets)))
-
-
-;;; Some low level snippet-routines:
-
-(defvar yas--inhibit-overlay-hooks nil
-  "Bind this temporarily to non-nil to prevent running `yas--on-*-modification'.")
-
-(defmacro yas--inhibit-overlay-hooks (&rest body)
-  "Run BODY with `yas--inhibit-overlay-hooks' set to t."
-  (declare (indent 0))
-  `(let ((yas--inhibit-overlay-hooks t))
-     ,@body))
-
-(defvar yas-snippet-beg nil "Beginning position of the last snippet committed.")
-(defvar yas-snippet-end nil "End position of the last snippet committed.")
-
-(defun yas--commit-snippet (snippet)
-  "Commit SNIPPET, but leave point as it is.
-
-This renders the snippet as ordinary text."
-
-  (let ((control-overlay (yas--snippet-control-overlay snippet)))
-    ;;
-    ;; Save the end of the moribund snippet in case we need to revive it
-    ;; its original expansion.
-    ;;
-    (when (and control-overlay
-               (overlay-buffer control-overlay))
-      (setq yas-snippet-beg (overlay-start control-overlay))
-      (setq yas-snippet-end (overlay-end control-overlay))
-      (delete-overlay control-overlay))
-
-    (yas--inhibit-overlay-hooks
-      (when yas--active-field-overlay
-        (delete-overlay yas--active-field-overlay))
-      (when yas--field-protection-overlays
-        (mapc #'delete-overlay yas--field-protection-overlays)))
-
-    ;; stacked expansion: if the original expansion took place from a
-    ;; field, make sure we advance it here at least to
-    ;; `yas-snippet-end'...
-    ;;
-    (let ((previous-field (yas--snippet-previous-active-field snippet)))
-      (when (and yas-snippet-end previous-field)
-        (yas--advance-end-maybe previous-field yas-snippet-end)))
-
-    ;; Convert all markers to points,
-    ;;
-    (yas--markers-to-points snippet)
-
-    ;; Take care of snippet revival
-    ;;
-    (if yas-snippet-revival
-        (push `(apply yas--snippet-revive ,yas-snippet-beg ,yas-snippet-end ,snippet)
-              buffer-undo-list)
-      ;; Dismember the snippet... this is useful if we get called
-      ;; again from `yas--take-care-of-redo'....
-      (setf (yas--snippet-fields snippet) nil)))
-
-  (yas--message 3 "Snippet %s exited." (yas--snippet-id snippet)))
-
-(defun yas--safely-run-hooks (hook-var)
-  (condition-case error
-      (run-hooks hook-var)
-    (error
-     (yas--message 3 "%s error: %s" hook-var (error-message-string error)))))
-
-
-(defun yas--check-commit-snippet ()
-  "Check if point exited the currently active field of the snippet.
-
-If so cleans up the whole snippet up."
-  (let* ((snippets (yas--snippets-at-point 'all-snippets))
-         (snippets-left snippets)
-         (snippet-exit-transform))
-    (dolist (snippet snippets)
-      (let ((active-field (yas--snippet-active-field snippet)))
-        (setq snippet-exit-transform (yas--snippet-force-exit snippet))
-        (cond ((or snippet-exit-transform
-                   (not (and active-field (yas--field-contains-point-p active-field))))
-               (setq snippets-left (delete snippet snippets-left))
-               (setf (yas--snippet-force-exit snippet) nil)
-               (yas--commit-snippet snippet))
-              ((and active-field
-                    (or (not yas--active-field-overlay)
-                        (not (overlay-buffer yas--active-field-overlay))))
-               ;;
-               ;; stacked expansion: this case is mainly for recent
-               ;; snippet exits that place us back int the field of
-               ;; another snippet
-               ;;
-               (save-excursion
-                 (yas--move-to-field snippet active-field)
-                 (yas--update-mirrors snippet)))
-              (t
-               nil))))
-    (unless (or (null snippets) snippets-left)
-      (if snippet-exit-transform
-          (yas--eval-lisp-no-saves snippet-exit-transform))
-      (yas--safely-run-hooks 'yas-after-exit-snippet-hook))))
-
-;; Apropos markers-to-points:
-;;
-;; This was found useful for performance reasons, so that an
-;; excessive number of live markers aren't kept around in the
-;; `buffer-undo-list'. However, in `markers-to-points', the
-;; set-to-nil markers can't simply be discarded and replaced with
-;; fresh ones in `points-to-markers'. The original marker that was
-;; just set to nil has to be reused.
-;;
-;; This shouldn't bring horrible problems with undo/redo, but it
-;; you never know
-;;
-(defun yas--markers-to-points (snippet)
-  "Convert all markers in SNIPPET to a cons (POINT . MARKER)
-where POINT is the original position of the marker and MARKER is
-the original marker object with the position set to nil."
-  (dolist (field (yas--snippet-fields snippet))
-    (let ((start (marker-position (yas--field-start field)))
-          (end (marker-position (yas--field-end field))))
-      (set-marker (yas--field-start field) nil)
-      (set-marker (yas--field-end field) nil)
-      (setf (yas--field-start field) (cons start (yas--field-start field)))
-      (setf (yas--field-end field) (cons end (yas--field-end field))))
-    (dolist (mirror (yas--field-mirrors field))
-      (let ((start (marker-position (yas--mirror-start mirror)))
-            (end (marker-position (yas--mirror-end mirror))))
-        (set-marker (yas--mirror-start mirror) nil)
-        (set-marker (yas--mirror-end mirror) nil)
-        (setf (yas--mirror-start mirror) (cons start (yas--mirror-start mirror)))
-        (setf (yas--mirror-end mirror) (cons end (yas--mirror-end mirror))))))
-  (let ((snippet-exit (yas--snippet-exit snippet)))
-    (when snippet-exit
-      (let ((exit (marker-position (yas--exit-marker snippet-exit))))
-        (set-marker (yas--exit-marker snippet-exit) nil)
-        (setf (yas--exit-marker snippet-exit) (cons exit (yas--exit-marker snippet-exit)))))))
-
-(defun yas--points-to-markers (snippet)
-  "Convert all cons (POINT . MARKER) in SNIPPET to markers.
-
-This is done by setting MARKER to POINT with `set-marker'."
-  (dolist (field (yas--snippet-fields snippet))
-    (setf (yas--field-start field) (set-marker (cdr (yas--field-start field))
-                                              (car (yas--field-start field))))
-    (setf (yas--field-end field) (set-marker (cdr (yas--field-end field))
-                                            (car (yas--field-end field))))
-    (dolist (mirror (yas--field-mirrors field))
-      (setf (yas--mirror-start mirror) (set-marker (cdr (yas--mirror-start mirror))
-                                                  (car (yas--mirror-start mirror))))
-      (setf (yas--mirror-end mirror) (set-marker (cdr (yas--mirror-end mirror))
-                                                (car (yas--mirror-end mirror))))))
-  (let ((snippet-exit (yas--snippet-exit snippet)))
-    (when snippet-exit
-      (setf (yas--exit-marker snippet-exit) (set-marker (cdr (yas--exit-marker snippet-exit))
-                                                       (car (yas--exit-marker snippet-exit)))))))
-
-(defun yas--field-contains-point-p (field &optional point)
-  (let ((point (or point
-                   (point))))
-    (and (>= point (yas--field-start field))
-         (<= point (yas--field-end field)))))
-
-(defun yas--field-text-for-display (field)
-  "Return the propertized display text for field FIELD."
-  (buffer-substring (yas--field-start field) (yas--field-end field)))
-
-(defun yas--undo-in-progress ()
-  "True if some kind of undo is in progress."
-  (or undo-in-progress
-      (eq this-command 'undo)
-      (eq this-command 'redo)))
-
-(defun yas--make-control-overlay (snippet start end)
-  "Create the control overlay that surrounds the snippet and
-holds the keymap."
-  (let ((overlay (make-overlay start
-                               end
-                               nil
-                               nil
-                               t)))
-    (overlay-put overlay 'keymap yas-keymap)
-    (overlay-put overlay 'priority 100)
-    (overlay-put overlay 'yas--snippet snippet)
-    overlay))
-
-(defun yas-skip-and-clear-or-delete-char (&optional field)
-  "Clears unmodified field if at field start, skips to next tab.
-
-Otherwise deletes a character normally by calling `delete-char'."
-  (interactive)
-  (let ((field (or field
-                   (and yas--active-field-overlay
-                        (overlay-buffer yas--active-field-overlay)
-                        (overlay-get yas--active-field-overlay 'yas--field)))))
-    (cond ((and field
-                (not (yas--field-modified-p field))
-                (eq (point) (marker-position (yas--field-start field))))
-           (yas--skip-and-clear field)
-           (yas-next-field 1))
-          (t
-           (call-interactively 'delete-char)))))
-
-(defun yas--skip-and-clear (field)
-  "Deletes the region of FIELD and sets it's modified state to t."
-  ;; Just before skipping-and-clearing the field, mark its children
-  ;; fields as modified, too. If the children have mirrors-in-fields
-  ;; this prevents them from updating erroneously (we're skipping and
-  ;; deleting!).
-  ;;
-  (yas--mark-this-and-children-modified field)
-  (delete-region (yas--field-start field) (yas--field-end field)))
-
-(defun yas--mark-this-and-children-modified (field)
-  (setf (yas--field-modified-p field) t)
-  (let ((fom (yas--field-next field)))
-    (while (and fom
-                (yas--fom-parent-field fom))
-      (when (and (eq (yas--fom-parent-field fom) field)
-                 (yas--field-p fom))
-        (yas--mark-this-and-children-modified fom))
-      (setq fom (yas--fom-next fom)))))
-
-(defun yas--make-move-active-field-overlay (snippet field)
-  "Place the active field overlay in SNIPPET's FIELD.
-
-Move the overlay, or create it if it does not exit."
-  (if (and yas--active-field-overlay
-           (overlay-buffer yas--active-field-overlay))
-      (move-overlay yas--active-field-overlay
-                    (yas--field-start field)
-                    (yas--field-end field))
-    (setq yas--active-field-overlay
-          (make-overlay (yas--field-start field)
-                        (yas--field-end field)
-                        nil nil t))
-    (overlay-put yas--active-field-overlay 'priority 100)
-    (overlay-put yas--active-field-overlay 'face 'yas-field-highlight-face)
-    (overlay-put yas--active-field-overlay 'yas--snippet snippet)
-    (overlay-put yas--active-field-overlay 'modification-hooks '(yas--on-field-overlay-modification))
-    (overlay-put yas--active-field-overlay 'insert-in-front-hooks
-                 '(yas--on-field-overlay-modification))
-    (overlay-put yas--active-field-overlay 'insert-behind-hooks
-                 '(yas--on-field-overlay-modification))))
-
-(defun yas--on-field-overlay-modification (overlay after? _beg _end &optional _length)
-  "Clears the field and updates mirrors, conditionally.
-
-Only clears the field if it hasn't been modified and it point it
-at field start.  This hook doesn't do anything if an undo is in
-progress."
-  (unless (or yas--inhibit-overlay-hooks
-              (yas--undo-in-progress))
-    (let* ((field (overlay-get overlay 'yas--field))
-           (snippet (overlay-get yas--active-field-overlay 'yas--snippet)))
-      (cond (after?
-             (yas--advance-end-maybe field (overlay-end overlay))
-             (save-excursion
-               (yas--field-update-display field))
-             (yas--update-mirrors snippet))
-            (field
-             (when (and (not after?)
-                        (not (yas--field-modified-p field))
-                        (eq (point) (if (markerp (yas--field-start field))
-                                        (marker-position (yas--field-start field))
-                                      (yas--field-start field))))
-               (yas--skip-and-clear field))
-             (setf (yas--field-modified-p field) t))))))
-
-;;; Apropos protection overlays:
-;;
-;; These exist for nasty users who will try to delete parts of the
-;; snippet outside the active field. Actual protection happens in
-;; `yas--on-protection-overlay-modification'.
-;;
-;; As of github #537 this no longer inhibits the command by issuing an
-;; error: all the snippets at point, including nested snippets, are
-;; automatically commited and the current command can proceed.
-;; 
-(defun yas--make-move-field-protection-overlays (snippet field)
-  "Place protection overlays surrounding SNIPPET's FIELD.
-
-Move the overlays, or create them if they do not exit."
-  (let ((start (yas--field-start field))
-        (end (yas--field-end field)))
-    ;; First check if the (1+ end) is contained in the buffer,
-    ;; otherwise we'll have to do a bit of cheating and silently
-    ;; insert a newline. the `(1+ (buffer-size))' should prevent this
-    ;; when using stacked expansion
-    ;;
-    (when (< (buffer-size) end)
-      (save-excursion
-        (yas--inhibit-overlay-hooks
-          (goto-char (point-max))
-          (newline))))
-    ;; go on to normal overlay creation/moving
-    ;;
-    (cond ((and yas--field-protection-overlays
-                (every #'overlay-buffer yas--field-protection-overlays))
-           (move-overlay (first yas--field-protection-overlays) (1- start) start)
-           (move-overlay (second yas--field-protection-overlays) end (1+ end)))
-          (t
-           (setq yas--field-protection-overlays
-                 (list (make-overlay (1- start) start nil t nil)
-                       (make-overlay end (1+ end) nil t nil)))
-           (dolist (ov yas--field-protection-overlays)
-             (overlay-put ov 'face 'yas--field-debug-face)
-             (overlay-put ov 'yas--snippet snippet)
-             ;; (overlay-put ov 'evaporate t)
-             (overlay-put ov 'modification-hooks '(yas--on-protection-overlay-modification)))))))
-
-(defun yas--on-protection-overlay-modification (_overlay after? _beg _end &optional _length)
-  "Signals a snippet violation, then issues error.
-
-The error should be ignored in `debug-ignored-errors'"
-  (unless (or yas--inhibit-overlay-hooks
-              after?
-              (yas--undo-in-progress))
-    (let ((snippets (yas--snippets-at-point)))
-      (yas--message 3 "Comitting snippets. Action would destroy a protection overlay.")
-      (cl-loop for snippet in snippets
-               do (yas--commit-snippet snippet)))))
-
-(add-to-list 'debug-ignored-errors "^Exit the snippet first!$")
-
-
-;;; Snippet expansion and "stacked" expansion:
-;;
-;; Stacked expansion is when you try to expand a snippet when already
-;; inside a snippet expansion.
-;;
-;; The parent snippet does not run its fields modification hooks
-;; (`yas--on-field-overlay-modification' and
-;; `yas--on-protection-overlay-modification') while the child snippet
-;; is active. This means, among other things, that the mirrors of the
-;; parent snippet are not updated, this only happening when one exits
-;; the child snippet.
-;;
-;; Unfortunately, this also puts some ugly (and not fully-tested)
-;; bits of code in `yas-expand-snippet' and
-;; `yas--commit-snippet'. I've tried to mark them with "stacked
-;; expansion:".
-;;
-;; This was thought to be safer in an undo/redo perspective, but
-;; maybe the correct implementation is to make the globals
-;; `yas--active-field-overlay' and `yas--field-protection-overlays' be
-;; snippet-local and be active even while the child snippet is
-;; running. This would mean a lot of overlay modification hooks
-;; running, but if managed correctly (including overlay priorities)
-;; they should account for all situations...
-;;
-(defun yas-expand-snippet (content &optional start end expand-env)
-  "Expand snippet CONTENT at current point.
-
-Text between START and END will be deleted before inserting
-template.  EXPAND-ENV is a list of (SYM VALUE) let-style dynamic bindings
-considered when expanding the snippet."
-  (cl-assert (and yas-minor-mode
-                  (memq 'yas--post-command-handler post-command-hook))
-             nil
-             "[yas] `yas-expand-snippet' needs properly setup `yas-minor-mode'")
-  (run-hooks 'yas-before-expand-snippet-hook)
-
-  ;;
-  (let* ((yas-selected-text (or yas-selected-text
-                                (and (region-active-p)
-                                     (buffer-substring-no-properties (region-beginning)
-                                                                     (region-end)))))
-         (start (or start
-                    (and (region-active-p)
-                         (region-beginning))
-                    (point)))
-         (end (or end
-                  (and (region-active-p)
-                       (region-end))
-                  (point)))
-         (to-delete (and start
-                         end
-                         (buffer-substring-no-properties start end)))
-         snippet)
-    (goto-char start)
-    (setq yas--indent-original-column (current-column))
-    ;; Delete the region to delete, this *does* get undo-recorded.
-    ;;
-    (when (and to-delete
-               (> end start))
-      (delete-region start end))
-
-    (cond ((listp content)
-           ;; x) This is a snippet-command
-           ;;
-           (yas--eval-lisp-no-saves content))
-          (t
-           ;; x) This is a snippet-snippet :-)
-           ;;
-           ;;    Narrow the region down to the content, shoosh the
-           ;;    `buffer-undo-list', and create the snippet, the new
-           ;;    snippet updates its mirrors once, so we are left with
-           ;;    some plain text.  The undo action for deleting this
-           ;;    plain text will get recorded at the end.
-           ;;
-           ;;    stacked expansion: also shoosh the overlay modification hooks
-           (let ((buffer-undo-list t))
-             ;; snippet creation might evaluate users elisp, which
-             ;; might generate errors, so we have to be ready to catch
-             ;; them mostly to make the undo information
-             ;;
-             (setq yas--start-column (current-column))
-             (yas--inhibit-overlay-hooks
-               (setq snippet
-                     (if expand-env
-                         (eval `(let* ,expand-env
-                                  (insert content)
-                                  (yas--snippet-create start (point))))
-                       (insert content)
-                       (yas--snippet-create start (point))))))
-
-           ;; stacked-expansion: This checks for stacked expansion, save the
-           ;; `yas--previous-active-field' and advance its boundary.
-           ;;
-           (let ((existing-field (and yas--active-field-overlay
-                                      (overlay-buffer yas--active-field-overlay)
-                                      (overlay-get yas--active-field-overlay 'yas--field))))
-             (when existing-field
-               (setf (yas--snippet-previous-active-field snippet) existing-field)
-               (yas--advance-end-maybe existing-field (overlay-end yas--active-field-overlay))))
-
-           ;; Exit the snippet immediately if no fields
-           ;;
-           (unless (yas--snippet-fields snippet)
-             (yas-exit-snippet snippet))
-
-           ;; Push two undo actions: the deletion of the inserted contents of
-           ;; the new snippet (without the "key") followed by an apply of
-           ;; `yas--take-care-of-redo' on the newly inserted snippet boundaries
-           ;;
-           ;; A small exception, if `yas-also-auto-indent-first-line'
-           ;; is t and `yas--indent' decides to indent the line to a
-           ;; point before the actual expansion point, undo would be
-           ;; messed up. We call the early point "newstart"".  case,
-           ;; and attempt to fix undo.
-           ;;
-           (let ((newstart (overlay-start (yas--snippet-control-overlay snippet)))
-                 (end (overlay-end (yas--snippet-control-overlay snippet))))
-             (when (< newstart start)
-               (push (cons (make-string (- start newstart) ? ) newstart) buffer-undo-list))
-             (push (cons newstart end) buffer-undo-list)
-             (push `(apply yas--take-care-of-redo ,start ,end ,snippet)
-                   buffer-undo-list))
-           ;; Now, schedule a move to the first field
-           ;;
-           (let ((first-field (car (yas--snippet-fields snippet))))
-             (when first-field
-               (sit-for 0) ;; fix issue 125
-               (yas--move-to-field snippet first-field)))
-           (yas--message 3 "snippet expanded.")
-           t))))
-
-(defun yas--take-care-of-redo (_beg _end snippet)
-  "Commits SNIPPET, which in turn pushes an undo action for reviving it.
-
-Meant to exit in the `buffer-undo-list'."
-  ;; slightly optimize: this action is only needed for snippets with
-  ;; at least one field
-  (when (yas--snippet-fields snippet)
-    (yas--commit-snippet snippet)))
-
-(defun yas--snippet-revive (beg end snippet)
-  "Revives SNIPPET and creates a control overlay from BEG to END.
-
-BEG and END are, we hope, the original snippets boundaries.
-All the markers/points exiting existing inside SNIPPET should point
-to their correct locations *at the time the snippet is revived*.
-
-After revival, push the `yas--take-care-of-redo' in the
-`buffer-undo-list'"
-  ;; Reconvert all the points to markers
-  ;;
-  (yas--points-to-markers snippet)
-  ;; When at least one editable field existed in the zombie snippet,
-  ;; try to revive the whole thing...
-  ;;
-  (let ((target-field (or (yas--snippet-active-field snippet)
-                          (car (yas--snippet-fields snippet)))))
-    (when target-field
-      (setf (yas--snippet-control-overlay snippet) (yas--make-control-overlay snippet beg end))
-      (overlay-put (yas--snippet-control-overlay snippet) 'yas--snippet snippet)
-
-      (yas--move-to-field snippet target-field)
-
-      (push `(apply yas--take-care-of-redo ,beg ,end ,snippet)
-            buffer-undo-list))))
-
-(defun yas--snippet-create (begin end)
-  "Create a snippet from a template inserted at BEGIN to END.
-
-Returns the newly created snippet."
-  (save-restriction
-    (narrow-to-region begin end)
-    (let ((snippet (yas--make-snippet)))
-      (goto-char begin)
-      (yas--snippet-parse-create snippet)
-
-      ;; Sort and link each field
-      (yas--snippet-sort-fields snippet)
-
-      ;; Create keymap overlay for snippet
-      (setf (yas--snippet-control-overlay snippet)
-            (yas--make-control-overlay snippet (point-min) (point-max)))
-
-      ;; Move to end
-      (goto-char (point-max))
-
-      snippet)))
-
-
-;;; Apropos adjacencies and "fom's":
-;;
-;; Once the $-constructs bits like "$n" and "${:n" are deleted in the
-;; recently expanded snippet, we might actually have many fields,
-;; mirrors (and the snippet exit) in the very same position in the
-;; buffer. Therefore we need to single-link the
-;; fields-or-mirrors-or-exit (which I have abbreviated to "fom")
-;; according to their original positions in the buffer.
-;;
-;; Then we have operation `yas--advance-end-maybe' and
-;; `yas--advance-start-maybe', which conditionally push the starts and
-;; ends of these foms down the chain.
-;;
-;; This allows for like the printf with the magic ",":
-;;
-;;   printf ("${1:%s}\\n"${1:$(if (string-match "%" text) "," "\);")}  \
-;;   $2${1:$(if (string-match "%" text) "\);" "")}$0
-;;
-(defun yas--fom-start (fom)
-  (cond ((yas--field-p fom)
-         (yas--field-start fom))
-        ((yas--mirror-p fom)
-         (yas--mirror-start fom))
-        (t
-         (yas--exit-marker fom))))
-
-(defun yas--fom-end (fom)
-  (cond ((yas--field-p fom)
-         (yas--field-end fom))
-        ((yas--mirror-p fom)
-         (yas--mirror-end fom))
-        (t
-         (yas--exit-marker fom))))
-
-(defun yas--fom-next (fom)
-  (cond ((yas--field-p fom)
-         (yas--field-next fom))
-        ((yas--mirror-p fom)
-         (yas--mirror-next fom))
-        (t
-         (yas--exit-next fom))))
-
-(defun yas--fom-parent-field (fom)
-  (cond ((yas--field-p fom)
-         (yas--field-parent-field fom))
-        ((yas--mirror-p fom)
-         (yas--mirror-parent-field fom))
-        (t
-         nil)))
-
-(defun yas--calculate-adjacencies (snippet)
-  "Calculate adjacencies for fields or mirrors of SNIPPET.
-
-This is according to their relative positions in the buffer, and
-has to be called before the $-constructs are deleted."
-  (let* ((fom-set-next-fom
-         (lambda (fom nextfom)
-           (cond ((yas--field-p fom)
-                  (setf (yas--field-next fom) nextfom))
-                 ((yas--mirror-p fom)
-                  (setf (yas--mirror-next fom) nextfom))
-                 (t
-                  (setf (yas--exit-next fom) nextfom)))))
-        (compare-fom-begs
-         (lambda (fom1 fom2)
-           (if (= (yas--fom-start fom2) (yas--fom-start fom1))
-               (yas--mirror-p fom2)
-             (>= (yas--fom-start fom2) (yas--fom-start fom1)))))
-        (link-foms fom-set-next-fom))
-    ;; make some yas--field, yas--mirror and yas--exit soup
-    (let ((soup))
-      (when (yas--snippet-exit snippet)
-        (push (yas--snippet-exit snippet) soup))
-      (dolist (field (yas--snippet-fields snippet))
-        (push field soup)
-        (dolist (mirror (yas--field-mirrors field))
-          (push mirror soup)))
-      (setq soup
-            (sort soup compare-fom-begs))
-      (when soup
-        (reduce link-foms soup)))))
-
-(defun yas--calculate-mirrors-in-fields (snippet mirror)
-  "Attempt to assign a parent field of SNIPPET to the mirror MIRROR.
-
-Use the tightest containing field if more than one field contains
-the mirror.  Intended to be called *before* the dollar-regions are
-deleted."
-  (let ((min (point-min))
-        (max (point-max)))
-    (dolist (field (yas--snippet-fields snippet))
-      (when (and (<= (yas--field-start field) (yas--mirror-start mirror))
-                 (<= (yas--mirror-end mirror) (yas--field-end field))
-               (< min (yas--field-start field))
-               (< (yas--field-end field) max))
-          (setq min (yas--field-start field)
-                max (yas--field-end field))
-          (setf (yas--mirror-parent-field mirror) field)))))
-
-(defun yas--advance-end-maybe (fom newend)
-  "Maybe advance FOM's end to NEWEND if it needs it.
-
-If it does, also:
-
-* call `yas--advance-start-maybe' on FOM's next fom.
-
-* in case FOM is field call `yas--advance-end-maybe' on its parent
-  field
-
-Also, if FOM is an exit-marker, always call
-`yas--advance-start-maybe' on its next fom.  This is because
-exit-marker have identical start and end markers."
-  (cond ((and fom (< (yas--fom-end fom) newend))
-         (set-marker (yas--fom-end fom) newend)
-         (yas--advance-start-maybe (yas--fom-next fom) newend)
-         (yas--advance-end-of-parents-maybe (yas--fom-parent-field fom) newend))
-        ((yas--exit-p fom)
-         (yas--advance-start-maybe (yas--fom-next fom) newend))))
-
-(defun yas--advance-start-maybe (fom newstart)
-  "Maybe advance FOM's start to NEWSTART if it needs it.
-
-If it does, also call `yas--advance-end-maybe' on FOM."
-  (when (and fom (< (yas--fom-start fom) newstart))
-    (set-marker (yas--fom-start fom) newstart)
-    (yas--advance-end-maybe fom newstart)))
-
-(defun yas--advance-end-of-parents-maybe (field newend)
-  "Like `yas--advance-end-maybe' but for parent fields.
-
-Only works for fields and doesn't care about the start of the
-next FOM.  Works its way up recursively for parents of parents."
-  (when (and field
-             (< (yas--field-end field) newend))
-    (set-marker (yas--field-end field) newend)
-    (yas--advance-end-of-parents-maybe (yas--field-parent-field field) newend)))
-
-(defvar yas--dollar-regions nil
-  "When expanding the snippet the \"parse-create\" functions add
-cons cells to this var.")
-
-(defvar yas--backquote-markers-and-strings nil
-  "List of (MARKER . STRING) marking where the values from
-backquoted Lisp expressions should be inserted at the end of
-expansion.")
-
-(defun yas--snippet-parse-create (snippet)
-  "Parse a recently inserted snippet template, creating all
-necessary fields, mirrors and exit points.
-
-Meant to be called in a narrowed buffer, does various passes"
-  (let ((parse-start (point)))
-    ;; Reset the yas--dollar-regions
-    ;;
-    (setq yas--dollar-regions nil)
-    ;; protect just the backquotes
-    ;;
-    (yas--protect-escapes nil '(?`))
-    ;; replace all backquoted expressions
-    ;;
-    (goto-char parse-start)
-    (yas--save-backquotes)
-    ;; protect escaped characters
-    ;;
-    (yas--protect-escapes)
-    ;; parse fields with {}
-    ;;
-    (goto-char parse-start)
-    (yas--field-parse-create snippet)
-    ;; parse simple mirrors and fields
-    ;;
-    (goto-char parse-start)
-    (yas--simple-mirror-parse-create snippet)
-    ;; parse mirror transforms
-    ;;
-    (goto-char parse-start)
-    (yas--transform-mirror-parse-create snippet)
-    ;; calculate adjacencies of fields and mirrors
-    ;;
-    (yas--calculate-adjacencies snippet)
-    ;; Delete $-constructs
-    ;;
-    (save-restriction (widen) (yas--delete-regions yas--dollar-regions))
-    ;; restore backquoted expression values
-    ;;
-    (yas--restore-backquotes)
-    ;; restore escapes
-    ;;
-    (goto-char parse-start)
-    (yas--restore-escapes)
-    ;; update mirrors for the first time
-    ;;
-    (yas--update-mirrors snippet)
-    ;; indent the best we can
-    ;;
-    (goto-char parse-start)
-    (yas--indent snippet)))
-
-(defun yas--indent-according-to-mode (snippet-markers)
-  "Indent current line according to mode, preserving SNIPPET-MARKERS."
-  ;;; Apropos indenting problems....
-  ;;
-  ;; `indent-according-to-mode' uses whatever `indent-line-function'
-  ;; is available. Some implementations of these functions delete text
-  ;; before they insert. If there happens to be a marker just after
-  ;; the text being deleted, the insertion actually happens after the
-  ;; marker, which misplaces it.
-  ;;
-  ;; This would also happen if we had used overlays with the
-  ;; `front-advance' property set to nil.
-  ;;
-  ;; This is why I have these `trouble-markers', they are the ones at
-  ;; they are the ones at the first non-whitespace char at the line
-  ;; (i.e. at `yas--real-line-beginning'. After indentation takes place
-  ;; we should be at the correct to restore them to. All other
-  ;; non-trouble-markers have been *pushed* and don't need special
-  ;; attention.
-  ;;
-  (goto-char (yas--real-line-beginning))
-  (let ((trouble-markers (remove-if-not #'(lambda (marker)
-                                            (= marker (point)))
-                                        snippet-markers)))
-    (save-restriction
-      (widen)
-      (condition-case _
-          (indent-according-to-mode)
-        (error (yas--message 3 "Warning: `yas--indent-according-to-mode' having problems running %s" indent-line-function)
-               nil)))
-    (mapc #'(lambda (marker)
-              (set-marker marker (point)))
-          trouble-markers)))
-
-(defvar yas--indent-original-column nil)
-(defun yas--indent (snippet)
-  (let ((snippet-markers (yas--collect-snippet-markers snippet)))
-    ;; Look for those $>
-    (save-excursion
-      (while (re-search-forward "$>" nil t)
-        (delete-region (match-beginning 0) (match-end 0))
-        (when (not (eq yas-indent-line 'auto))
-          (yas--indent-according-to-mode snippet-markers))))
-    ;; Now do stuff for 'fixed and 'auto
-    (save-excursion
-      (cond ((eq yas-indent-line 'fixed)
-             (while (and (zerop (forward-line))
-                         (zerop (current-column)))
-               (indent-to-column yas--indent-original-column)))
-            ((eq yas-indent-line 'auto)
-             (let ((end (set-marker (make-marker) (point-max)))
-                   (indent-first-line-p yas-also-auto-indent-first-line))
-               (while (and (zerop (if indent-first-line-p
-                                      (prog1
-                                          (forward-line 0)
-                                        (setq indent-first-line-p nil))
-                                    (forward-line 1)))
-                           (not (eobp))
-                           (<= (point) end))
-                 (yas--indent-according-to-mode snippet-markers))))
-            (t
-             nil)))))
-
-(defun yas--collect-snippet-markers (snippet)
-  "Make a list of all the markers used by SNIPPET."
-  (let (markers)
-    (dolist (field (yas--snippet-fields snippet))
-      (push (yas--field-start field) markers)
-      (push (yas--field-end field) markers)
-      (dolist (mirror (yas--field-mirrors field))
-        (push (yas--mirror-start mirror) markers)
-        (push (yas--mirror-end mirror) markers)))
-    (let ((snippet-exit (yas--snippet-exit snippet)))
-      (when (and snippet-exit
-                 (marker-buffer (yas--exit-marker snippet-exit)))
-        (push (yas--exit-marker snippet-exit) markers)))
-    markers))
-
-(defun yas--real-line-beginning ()
-  (let ((c (char-after (line-beginning-position)))
-        (n (line-beginning-position)))
-    (while (or (eql c ?\ )
-               (eql c ?\t))
-      (cl-incf n)
-      (setq c (char-after n)))
-    n))
-
-(defun yas--escape-string (escaped)
-  (concat "YASESCAPE" (format "%d" escaped) "PROTECTGUARD"))
-
-(defun yas--protect-escapes (&optional text escaped)
-  "Protect all escaped characters with their numeric ASCII value.
-
-With optional string TEXT do it in string instead of buffer."
-  (let ((changed-text text)
-        (text-provided-p text))
-    (mapc #'(lambda (escaped)
-              (setq changed-text
-                    (yas--replace-all (concat "\\" (char-to-string escaped))
-                                     (yas--escape-string escaped)
-                                     (when text-provided-p changed-text))))
-          (or escaped yas--escaped-characters))
-    changed-text))
-
-(defun yas--restore-escapes (&optional text escaped)
-  "Restore all escaped characters from their numeric ASCII value.
-
-With optional string TEXT do it in string instead of the buffer."
-  (let ((changed-text text)
-        (text-provided-p text))
-    (mapc #'(lambda (escaped)
-              (setq changed-text
-                    (yas--replace-all (yas--escape-string escaped)
-                                     (char-to-string escaped)
-                                     (when text-provided-p changed-text))))
-          (or escaped yas--escaped-characters))
-    changed-text))
-
-(defun yas--save-backquotes ()
-  "Save all the \"`(lisp-expression)`\"-style expressions
-with their evaluated value into `yas--backquote-markers-and-strings'."
-  (while (re-search-forward yas--backquote-lisp-expression-regexp nil t)
-    (let ((current-string (match-string-no-properties 1)) transformed)
-      (save-restriction (widen)
-                        (delete-region (match-beginning 0) (match-end 0)))
-      (setq transformed (yas--eval-lisp (yas--read-lisp (yas--restore-escapes current-string '(?`)))))
-      (goto-char (match-beginning 0))
-      (when transformed
-        (let ((marker (make-marker)))
-          (save-restriction
-            (widen)
-            (insert "Y") ;; quite horrendous, I love it :)
-            (set-marker marker (point))
-            (insert "Y"))
-          (push (cons marker transformed) yas--backquote-markers-and-strings))))))
-
-(defun yas--restore-backquotes ()
-  "Replace markers in `yas--backquote-markers-and-strings' with their values."
-  (while yas--backquote-markers-and-strings
-    (let* ((marker-and-string (pop yas--backquote-markers-and-strings))
-           (marker (car marker-and-string))
-           (string (cdr marker-and-string)))
-      (save-excursion
-        (goto-char marker)
-        (save-restriction
-          (widen)
-          (delete-char -1)
-          (insert string)
-          (delete-char 1))
-        (set-marker marker nil)))))
-
-(defun yas--scan-sexps (from count)
-  (condition-case _
-      (with-syntax-table (standard-syntax-table)
-        (scan-sexps from count))
-    (error
-     nil)))
-
-(defun yas--make-marker (pos)
-  "Create a marker at POS with nil `marker-insertion-type'."
-  (let ((marker (set-marker (make-marker) pos)))
-    (set-marker-insertion-type marker nil)
-    marker))
-
-(defun yas--field-parse-create (snippet &optional parent-field)
-  "Parse most field expressions in SNIPPET, except for the simple one \"$n\".
-
-The following count as a field:
-
-* \"${n: text}\", for a numbered field with default text, as long as N is not 0;
-
-* \"${n: text$(expression)}, the same with a Lisp expression;
-  this is caught with the curiously named `yas--multi-dollar-lisp-expression-regexp'
-
-* the same as above but unnumbered, (no N:) and number is calculated automatically.
-
-When multiple expressions are found, only the last one counts."
-  ;;
-  (save-excursion
-    (while (re-search-forward yas--field-regexp nil t)
-      (let* ((real-match-end-0 (yas--scan-sexps (1+ (match-beginning 0)) 1))
-             (number (and (match-string-no-properties 1)
-                          (string-to-number (match-string-no-properties 1))))
-             (brand-new-field (and real-match-end-0
-                                   ;; break if on "$(" immediately
-                                   ;; after the ":", this will be
-                                   ;; caught as a mirror with
-                                   ;; transform later.
-                                   (not (save-match-data
-                                          (eq (string-match "$[ \t\n]*("
-                                                            (match-string-no-properties 2)) 0)))
-                                   ;; allow ${0: some exit text}
-                                   ;; (not (and number (zerop number)))
-                                   (yas--make-field number
-                                                   (yas--make-marker (match-beginning 2))
-                                                   (yas--make-marker (1- real-match-end-0))
-                                                   parent-field))))
-        (when brand-new-field
-          (goto-char real-match-end-0)
-          (push (cons (1- real-match-end-0) real-match-end-0)
-                yas--dollar-regions)
-          (push (cons (match-beginning 0) (match-beginning 2))
-                yas--dollar-regions)
-          (push brand-new-field (yas--snippet-fields snippet))
-          (save-excursion
-            (save-restriction
-              (narrow-to-region (yas--field-start brand-new-field) (yas--field-end brand-new-field))
-              (goto-char (point-min))
-              (yas--field-parse-create snippet brand-new-field)))))))
-  ;; if we entered from a parent field, now search for the
-  ;; `yas--multi-dollar-lisp-expression-regexp'. This is used for
-  ;; primary field transformations
-  ;;
-  (when parent-field
-    (save-excursion
-      (while (re-search-forward yas--multi-dollar-lisp-expression-regexp nil t)
-        (let* ((real-match-end-1 (yas--scan-sexps (match-beginning 1) 1)))
-          ;; commit the primary field transformation if:
-          ;;
-          ;; 1. we don't find it in yas--dollar-regions (a subnested
-          ;; field) might have already caught it.
-          ;;
-          ;; 2. we really make sure we have either two '$' or some
-          ;; text and a '$' after the colon ':'. This is a FIXME: work
-          ;; my regular expressions and end these ugly hacks.
-          ;;
-          (when (and real-match-end-1
-                     (not (member (cons (match-beginning 0)
-                                        real-match-end-1)
-                                  yas--dollar-regions))
-                     (not (eq ?:
-                              (char-before (1- (match-beginning 1))))))
-            (let ((lisp-expression-string (buffer-substring-no-properties (match-beginning 1)
-                                                                          real-match-end-1)))
-              (setf (yas--field-transform parent-field)
-                    (yas--read-lisp (yas--restore-escapes lisp-expression-string))))
-            (push (cons (match-beginning 0) real-match-end-1)
-                  yas--dollar-regions)))))))
-
-(defun yas--transform-mirror-parse-create (snippet)
-  "Parse the \"${n:$(lisp-expression)}\" mirror transformations in SNIPPET."
-  (while (re-search-forward yas--transform-mirror-regexp nil t)
-    (let* ((real-match-end-0 (yas--scan-sexps (1+ (match-beginning 0)) 1))
-           (number (string-to-number (match-string-no-properties 1)))
-           (field (and number
-                       (not (zerop number))
-                       (yas--snippet-find-field snippet number)))
-           (brand-new-mirror
-            (and real-match-end-0
-                 field
-                 (yas--make-mirror (yas--make-marker (match-beginning 0))
-                                  (yas--make-marker (match-beginning 0))
-                                  (yas--read-lisp
-                                   (yas--restore-escapes
-                                    (buffer-substring-no-properties (match-beginning 2)
-                                                                    (1- real-match-end-0))))))))
-      (when brand-new-mirror
-        (push brand-new-mirror
-              (yas--field-mirrors field))
-        (yas--calculate-mirrors-in-fields snippet brand-new-mirror)
-        (push (cons (match-beginning 0) real-match-end-0) yas--dollar-regions)))))
-
-(defun yas--simple-mirror-parse-create (snippet)
-  "Parse the simple \"$n\" fields/mirrors/exitmarkers in SNIPPET."
-  (while (re-search-forward yas--simple-mirror-regexp nil t)
-    (let ((number (string-to-number (match-string-no-properties 1))))
-      (cond ((zerop number)
-
-             (setf (yas--snippet-exit snippet)
-                   (yas--make-exit (yas--make-marker (match-end 0))))
-             (save-excursion
-               (goto-char (match-beginning 0))
-               (when yas-wrap-around-region
-                 (cond (yas-selected-text
-                        (insert yas-selected-text))
-                       ((and (eq yas-wrap-around-region 'cua)
-                             cua-mode
-                             (get-register ?0))
-                        (insert (prog1 (get-register ?0)
-                                  (set-register ?0 nil))))))
-               (push (cons (point) (yas--exit-marker (yas--snippet-exit snippet)))
-                     yas--dollar-regions)))
-            (t
-             (let ((field (yas--snippet-find-field snippet number)))
-               (if field
-                   (let ((brand-new-mirror (yas--make-mirror
-                                            (yas--make-marker (match-beginning 0))
-                                            (yas--make-marker (match-beginning 0))
-                                            nil)))
-                     (push brand-new-mirror
-                           (yas--field-mirrors field))
-                     (yas--calculate-mirrors-in-fields snippet brand-new-mirror))
-                 (push (yas--make-field number
-                                       (yas--make-marker (match-beginning 0))
-                                       (yas--make-marker (match-beginning 0))
-                                       nil)
-                       (yas--snippet-fields snippet))))
-             (push (cons (match-beginning 0) (match-end 0))
-                   yas--dollar-regions))))))
-
-(defun yas--delete-regions (regions)
-  "Sort disjuct REGIONS by start point, then delete from the back."
-  (mapc #'(lambda (reg)
-            (delete-region (car reg) (cdr reg)))
-        (sort regions
-              #'(lambda (r1 r2)
-                  (>= (car r1) (car r2))))))
-
-(defun yas--calculate-mirror-depth (mirror &optional traversed)
-  (let* ((parent (yas--mirror-parent-field mirror))
-         (parents-mirrors (and parent
-                               (yas--field-mirrors parent))))
-    (or (yas--mirror-depth mirror)
-        (setf (yas--mirror-depth mirror)
-              (cond ((memq mirror traversed)
-                     0)
-                    ((and parent parents-mirrors)
-                     (1+ (reduce #'max
-                                 (mapcar #'(lambda (m)
-                                             (yas--calculate-mirror-depth m
-                                                                          (cons mirror
-                                                                                traversed)))
-                                         parents-mirrors))))
-                    (parent
-                     1)
-                    (t
-                     0))))))
-
-(defun yas--update-mirrors (snippet)
-  "Update all the mirrors of SNIPPET."
-  (save-excursion
-    (dolist (field-and-mirror (sort
-                               ;; make a list of ((F1 . M1) (F1 . M2) (F2 . M3) (F2 . M4) ...)
-                               ;; where F is the field that M is mirroring
-                               ;;
-                               (mapcan #'(lambda (field)
-                                           (mapcar #'(lambda (mirror)
-                                                       (cons field mirror))
-                                                   (yas--field-mirrors field)))
-                                       (yas--snippet-fields snippet))
-                               ;; then sort this list so that entries with mirrors with parent
-                               ;; fields appear before. This was important for fixing #290, and
-                               ;; luckily also handles the case where a mirror in a field causes
-                               ;; another mirror to need reupdating
-                               ;;
-                               #'(lambda (field-and-mirror1 field-and-mirror2)
-                                   (> (yas--calculate-mirror-depth (cdr field-and-mirror1))
-                                      (yas--calculate-mirror-depth (cdr field-and-mirror2))))))
-      (let* ((field (car field-and-mirror))
-             (mirror (cdr field-and-mirror))
-             (parent-field (yas--mirror-parent-field mirror)))
-        ;; before updating a mirror with a parent-field, maybe advance
-        ;; its start (#290)
-        ;;
-        (when parent-field
-          (yas--advance-start-maybe mirror (yas--fom-start parent-field)))
-        ;; update this mirror
-        ;;
-        (yas--mirror-update-display mirror field)
-        ;; `yas--place-overlays' is needed if the active field and
-        ;; protected overlays have been changed because of insertions
-        ;; in `yas--mirror-update-display'
-        ;;
-        (when (eq field (yas--snippet-active-field snippet))
-          (yas--place-overlays snippet field))))))
-
-(defun yas--mirror-update-display (mirror field)
-  "Update MIRROR according to FIELD (and mirror transform)."
-
-  (let* ((mirror-parent-field (yas--mirror-parent-field mirror))
-         (reflection (and (not (and mirror-parent-field
-                                    (yas--field-modified-p mirror-parent-field)))
-                          (or (yas--apply-transform mirror field 'empty-on-nil)
-                              (yas--field-text-for-display field)))))
-    (when (and reflection
-               (not (string= reflection (buffer-substring-no-properties (yas--mirror-start mirror)
-                                                                        (yas--mirror-end mirror)))))
-      (goto-char (yas--mirror-start mirror))
-      (yas--inhibit-overlay-hooks
-        (insert reflection))
-      (if (> (yas--mirror-end mirror) (point))
-          (delete-region (point) (yas--mirror-end mirror))
-        (set-marker (yas--mirror-end mirror) (point))
-        (yas--advance-start-maybe (yas--mirror-next mirror) (point))
-        ;; super-special advance
-        (yas--advance-end-of-parents-maybe mirror-parent-field (point))))))
-
-(defun yas--field-update-display (field)
-  "Much like `yas--mirror-update-display', but for fields."
-  (when (yas--field-transform field)
-    (let ((transformed (and (not (eq (yas--field-number field) 0))
-                            (yas--apply-transform field field))))
-      (when (and transformed
-                 (not (string= transformed (buffer-substring-no-properties (yas--field-start field)
-                                                                           (yas--field-end field)))))
-        (setf (yas--field-modified-p field) t)
-        (goto-char (yas--field-start field))
-        (yas--inhibit-overlay-hooks
-          (insert transformed)
-          (if (> (yas--field-end field) (point))
-              (delete-region (point) (yas--field-end field))
-            (set-marker (yas--field-end field) (point))
-            (yas--advance-start-maybe (yas--field-next field) (point)))
-          t)))))
-
-
-;;; Post-command hook:
-;;
-(defun yas--post-command-handler ()
-  "Handles various yasnippet conditions after each command."
-  (cond ((eq 'undo this-command)
-         ;;
-         ;; After undo revival the correct field is sometimes not
-         ;; restored correctly, this condition handles that
-         ;;
-         (let* ((snippet (car (yas--snippets-at-point)))
-                (target-field (and snippet
-                                   (find-if-not #'(lambda (field)
-                                                    (yas--field-probably-deleted-p snippet field))
-                                                (remove nil
-                                                        (cons (yas--snippet-active-field snippet)
-                                                              (yas--snippet-fields snippet)))))))
-           (when target-field
-             (yas--move-to-field snippet target-field))))
-        ((not (yas--undo-in-progress))
-         ;; When not in an undo, check if we must commit the snippet
-         ;; (user exited it).
-         (yas--check-commit-snippet))))
-
-;;; Fancy docs:
-;;
-;; The docstrings for some functions are generated dynamically
-;; depending on the context.
-;;
-(put 'yas-expand  'function-documentation
-     '(yas--expand-from-trigger-key-doc t))
-(defun yas--expand-from-trigger-key-doc (context)
-  "A doc synthesizer for `yas--expand-from-trigger-key-doc'."
-  (let* ((yas-fallback-behavior (and context yas-fallback-behavior))
-         (fallback-description
-          (cond ((eq yas-fallback-behavior 'call-other-command)
-                 (let* ((fallback (yas--keybinding-beyond-yasnippet)))
-                   (or (and fallback
-                            (format "call command `%s'."
-                                    (pp-to-string fallback)))
-                       "do nothing (`yas-expand' doesn't override\nanything).")))
-                ((eq yas-fallback-behavior 'return-nil)
-                 "do nothing.")
-                (t "defer to `yas-fallback-behavior' (which see)."))))
-    (concat "Expand a snippet before point. If no snippet
-expansion is possible, "
-            fallback-description
-            "\n\nOptional argument FIELD is for non-interactive use and is an
-object satisfying `yas--field-p' to restrict the expansion to.")))
-
-(put 'yas-expand-from-keymap 'function-documentation
-     '(yas--expand-from-keymap-doc t))
-(defun yas--expand-from-keymap-doc (context)
-  "A doc synthesizer for `yas--expand-from-keymap-doc'."
-  (add-hook 'temp-buffer-show-hook 'yas--snippet-description-finish-runonce)
-  (concat "Expand/run snippets from keymaps, possibly falling back to original binding.\n"
-          (when (and context (eq this-command 'describe-key))
-            (let* ((vec (this-single-command-keys))
-                   (templates (mapcan #'(lambda (table)
-                                          (yas--fetch table vec))
-                                      (yas--get-snippet-tables)))
-                   (yas--direct-keymaps nil)
-                   (fallback (key-binding vec)))
-              (concat "In this case, "
-                      (when templates
-                        (concat "these snippets are bound to this key:\n"
-                                (yas--template-pretty-list templates)
-                                "\n\nIf none of these expands, "))
-                      (or (and fallback
-                               (format "fallback `%s' will be called." (pp-to-string fallback)))
-                          "no fallback keybinding is called."))))))
-
-(defun yas--template-pretty-list (templates)
-  (let ((acc)
-        (yas-buffer-local-condition 'always))
-    (dolist (plate templates)
-      (setq acc (concat acc "\n*) "
-                        (propertize (concat "\\\\snippet `" (car plate) "'")
-                                    'yasnippet (cdr plate)))))
-    acc))
-
-(define-button-type 'help-snippet-def
-  :supertype 'help-xref
-  'help-function (lambda (template) (yas--visit-snippet-file-1 template))
-  'help-echo (purecopy "mouse-2, RET: find snippets's definition"))
-
-(defun yas--snippet-description-finish-runonce ()
-  "Final adjustments for the help buffer when snippets are concerned."
-  (yas--create-snippet-xrefs)
-  (remove-hook 'temp-buffer-show-hook 'yas--snippet-description-finish-runonce))
-
-(defun yas--create-snippet-xrefs ()
-  (save-excursion
-    (goto-char (point-min))
-    (while (search-forward-regexp "\\\\\\\\snippet[ \s\t]+`\\([^']+\\)'" nil t)
-      (let ((template (get-text-property (match-beginning 1)
-                                         'yasnippet)))
-        (when template
-          (help-xref-button 1 'help-snippet-def template)
-          (kill-region (match-end 1) (match-end 0))
-          (kill-region (match-beginning 0) (match-beginning 1)))))))
-
-;;; Utils
-
-(defvar yas-verbosity 4
-  "Log level for `yas--message' 4 means trace most anything, 0 means nothing.")
-
-(defun yas--message (level message &rest args)
-  "When LEVEL is above `yas-verbosity-level', log MESSAGE and ARGS."
-  (when (> yas-verbosity level)
-    (message "%s" (apply #'yas--format message args))))
-
-(defun yas--warning (format-control &rest format-args)
-  (let ((msg (apply #'format format-control format-args)))
-    (display-warning 'yasnippet msg :warning)
-    (yas--message 1 msg)))
-
-(defun yas--format (format-control &rest format-args)
-  (apply #'format (concat "[yas] " format-control) format-args))
-
-
-;;; Some hacks:
-;;
-;; The functions
-;;
-;; `locate-dominating-file'
-;; `region-active-p'
-;;
-;; added for compatibility in emacsen < 23
-(unless (>= emacs-major-version 23)
-  (unless (fboundp 'region-active-p)
-    (defun region-active-p ()  (and transient-mark-mode mark-active)))
-
-  (unless (fboundp 'locate-dominating-file)
-    (defvar locate-dominating-stop-dir-regexp
-      "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'"
-      "Regexp of directory names which stop the search in `locate-dominating-file'.
-Any directory whose name matches this regexp will be treated like
-a kind of root directory by `locate-dominating-file' which will stop its search
-when it bumps into it.
-The default regexp prevents fruitless and time-consuming attempts to find
-special files in directories in which filenames are interpreted as hostnames,
-or mount points potentially requiring authentication as a different user.")
-
-    (defun locate-dominating-file (file name)
-      "Look up the directory hierarchy from FILE for a file named NAME.
-Stop at the first parent directory containing a file NAME,
-and return the directory.  Return nil if not found."
-      ;; We used to use the above locate-dominating-files code, but the
-      ;; directory-files call is very costly, so we're much better off doing
-      ;; multiple calls using the code in here.
-      ;;
-      ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
-      ;; `name' in /home or in /.
-      (setq file (abbreviate-file-name file))
-      (let ((root nil)
-            try)
-        (while (not (or root
-                        (null file)
-                        ;; FIXME: Disabled this heuristic because it is sometimes
-                        ;; inappropriate.
-                        ;; As a heuristic, we stop looking up the hierarchy of
-                        ;; directories as soon as we find a directory belonging
-                        ;; to another user.  This should save us from looking in
-                        ;; things like /net and /afs.  This assumes that all the
-                        ;; files inside a project belong to the same user.
-                        ;; (let ((prev-user user))
-                        ;;   (setq user (nth 2 (file-attributes file)))
-                        ;;   (and prev-user (not (equal user prev-user))))
-                        (string-match locate-dominating-stop-dir-regexp file)))
-          (setq try (file-exists-p (expand-file-name name file)))
-          (cond (try (setq root file))
-                ((equal file (setq file (file-name-directory
-                                         (directory-file-name file))))
-                 (setq file nil))))
-        root))))
-
-
-;;; Backward compatibility to yasnippet <= 0.7
-
-(defun yas-initialize ()
-  "For backward compatibility, enable `yas-minor-mode' globally."
-  (declare (obsolete "Use (yas-global-mode 1) instead." "0.8"))
-  (yas-global-mode 1))
-
-(defvar yas--backported-syms '(;; `defcustom's
-                             ;;
-                             yas-snippet-dirs
-                             yas-prompt-functions
-                             yas-indent-line
-                             yas-also-auto-indent-first-line
-                             yas-snippet-revival
-                             yas-triggers-in-field
-                             yas-fallback-behavior
-                             yas-choose-keys-first
-                             yas-choose-tables-first
-                             yas-use-menu
-                             yas-trigger-symbol
-                             yas-wrap-around-region
-                             yas-good-grace
-                             yas-visit-from-menu
-                             yas-expand-only-for-last-commands
-                             yas-field-highlight-face
-
-                             ;; these vars can be customized as well
-                             ;;
-                             yas-keymap
-                             yas-verbosity
-                             yas-extra-modes
-                             yas-key-syntaxes
-                             yas-after-exit-snippet-hook
-                             yas-before-expand-snippet-hook
-                             yas-buffer-local-condition
-                             yas-dont-activate
-
-                             ;; prompting functions
-                             ;;
-                             yas-x-prompt
-                             yas-ido-prompt
-                             yas-no-prompt
-                             yas-completing-prompt
-                             yas-dropdown-prompt
-
-                             ;; interactive functions
-                             ;;
-                             yas-expand
-                             yas-minor-mode
-                             yas-global-mode
-                             yas-direct-keymaps-reload
-                             yas-minor-mode-on
-                             yas-load-directory
-                             yas-reload-all
-                             yas-compile-directory
-                             yas-recompile-all
-                             yas-about
-                             yas-expand-from-trigger-key
-                             yas-expand-from-keymap
-                             yas-insert-snippet
-                             yas-visit-snippet-file
-                             yas-new-snippet
-                             yas-load-snippet-buffer
-                             yas-tryout-snippet
-                             yas-describe-tables
-                             yas-next-field-or-maybe-expand
-                             yas-next-field
-                             yas-prev-field
-                             yas-abort-snippet
-                             yas-exit-snippet
-                             yas-exit-all-snippets
-                             yas-skip-and-clear-or-delete-char
-                             yas-initialize
-
-                             ;; symbols that I "exported" for use
-                             ;; in snippets and hookage
-                             ;;
-                             yas-expand-snippet
-                             yas-define-snippets
-                             yas-define-menu
-                             yas-snippet-beg
-                             yas-snippet-end
-                             yas-modified-p
-                             yas-moving-away-p
-                             yas-substr
-                             yas-choose-value
-                             yas-key-to-value
-                             yas-throw
-                             yas-verify-value
-                             yas-field-value
-                             yas-text
-                             yas-selected-text
-                             yas-default-from-field
-                             yas-inside-string
-                             yas-unimplemented
-                             yas-define-condition-cache
-                             yas-hippie-try-expand
-
-                             ;; debug definitions
-                             ;; yas-debug-snippet-vars
-                             ;; yas-exterminate-package
-                             ;; yas-debug-test
-
-                             ;; testing definitions
-                             ;; yas-should-expand
-                             ;; yas-should-not-expand
-                             ;; yas-mock-insert
-                             ;; yas-make-file-or-dirs
-                             ;; yas-variables
-                             ;; yas-saving-variables
-                             ;; yas-call-with-snippet-dirs
-                             ;; yas-with-snippet-dirs
-)
-  "Backported yasnippet symbols.
-
-They are mapped to \"yas/*\" variants.")
-
-(dolist (sym yas--backported-syms)
-  (let ((backported (intern (replace-regexp-in-string "^yas-" "yas/" (symbol-name sym)))))
-    (when (boundp sym)
-      (make-obsolete-variable backported sym "yasnippet 0.8")
-      (defvaralias backported sym))
-    (when (fboundp sym)
-      (make-obsolete backported sym "yasnippet 0.8")
-      (defalias backported sym))))
-
-(defvar yas--exported-syms
-  (let (exported)
-    (mapatoms (lambda (atom)
-                (if (and (or (and (boundp atom)
-                                  (not (get atom 'byte-obsolete-variable)))
-                             (and (fboundp atom)
-                                  (not (get atom 'byte-obsolete-info))))
-                         (string-match-p "^yas-[^-]" (symbol-name atom)))
-                    (push atom exported))))
-    exported)
-  "Exported yasnippet symbols.
-
-i.e. the ones with \"yas-\" single dash prefix. I will try to
-keep them in future yasnippet versions and other elisp libraries
-can more or less safely rely upon them.")
-
-
-(provide 'yasnippet)
-;; Local Variables:
-;; coding: utf-8
-;; indent-tabs-mode: nil
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-;;; yasnippet.el ends here
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/.gitignore b/emacs.d/elpa/yasnippet-20160104.129/snippets/.gitignore
new file mode 100644
index 0000000..8ab45ff
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/.gitignore
@@ -0,0 +1 @@
+**/.yas-compiled-snippets.el
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/.nosearch b/emacs.d/elpa/yasnippet-20160104.129/snippets/.nosearch
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/.nosearch
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/.nosearch
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/CONTRIBUTORS.txt b/emacs.d/elpa/yasnippet-20160104.129/snippets/CONTRIBUTORS.txt
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/CONTRIBUTORS.txt
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/CONTRIBUTORS.txt
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/LICENSE b/emacs.d/elpa/yasnippet-20160104.129/snippets/LICENSE
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/LICENSE
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/LICENSE
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/README.md b/emacs.d/elpa/yasnippet-20160104.129/snippets/README.md
new file mode 100644
index 0000000..194bea4
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/README.md
@@ -0,0 +1,40 @@
+# Yasnippet official snippet collections
+
+[![Join the chat at https://gitter.im/AndreaCrotti/yasnippet-snippets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AndreaCrotti/yasnippet-snippets?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+This repository contains the official snippets for [yasnippet](http://github.com/capitaomorte/yasnippet), as you can see from the git submodules link.
+
+# How to install
+
+There are two options, if you have checked out *yasnippet* already, the only thing you need to do is to run `git submodule update --init`
+and it will checkout automatically this repository, at the last version it was synchronized too.
+
+Otherwise if you want the latest and greatest snippets collection proceed as follows:
+
+1. clone this repository
+2. add to your .emacs the following
+   - `(add-to-list 'yas-snippet-dirs "$$DIRECTORY_WHERE_YOU_CLONED")`
+   - and in case you want to enable yasnippet globally: `(yas-global-mode t)`
+
+3. `M-x yas-reload-all` to activate them
+
+# Contributing
+
+This repository has now become the default snippets repository (as a submodule) in yasnippet.
+So if you have any useful snippets for any language or framework please feel free to contribute.
+
+To study the current snippets I suggest to use `M-x yas-describe-tables`
+which will gave a table representation of all the snippets available in the current mode.
+
+
+# Guidelines
+
+Snippets need to be generic enough to be useful for everyone, and not contain anything specific to your own system.
+
+# Various notes
+
+## HTML snippets
+
+Until September 1st 2014 there were a lot of HTML snippets in the repository, which were sometimes useful but I came to the conclusion that yasnippet was not the right fool for them, so they were removed in this pull request:
+https://github.com/AndreaCrotti/yasnippet-snippets/pull/49
+
+To everyone writing a lot of HTML I suggest using [emmet mode](https://github.com/smihica/emmet-mode) instead, which is a much more powerful mode for writing HTML tags.
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/antlr-mode/project b/emacs.d/elpa/yasnippet-20160104.129/snippets/antlr-mode/project
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/antlr-mode/project
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/antlr-mode/project
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/antlr-mode/property b/emacs.d/elpa/yasnippet-20160104.129/snippets/antlr-mode/property
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/antlr-mode/property
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/antlr-mode/property
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/antlr-mode/target b/emacs.d/elpa/yasnippet-20160104.129/snippets/antlr-mode/target
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/antlr-mode/target
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/antlr-mode/target
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/applescript-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/applescript-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/applescript-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/applescript-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/assert b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/assert
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/assert
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/assert
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/beginend b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/beginend
new file mode 100644
index 0000000..51748ae
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/beginend
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name : v.begin(), v.end()
+# key: beginend
+# --
+${1:v}.begin(), $1.end
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/boost_require b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/boost_require
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/boost_require
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/boost_require
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cerr b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cerr
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cerr
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cerr
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cin b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cin
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cin
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cin
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/class b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/const_[] b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/const_[]
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/const_[]
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/const_[]
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/constructor b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/constructor
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/constructor
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/constructor
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cout b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cout
new file mode 100644
index 0000000..6975775
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cout
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor: York Zhao <gtdplatform@gmail.com>
+# name: cout
+# key: cout
+# --
+`(progn (save-excursion) (goto-char (point-min)) (unless (re-search-forward
+"^using\\s-+namespace std;" nil 'no-errer) "std::"))
+`cout << $0${1: << "${2:\n}"};
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cpp b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cpp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cpp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cpp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cstd b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cstd
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/cstd
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/cstd
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d+= b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d+=
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d+=
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d+=
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d_operator b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d_operator
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d_operator[] b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator[]
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d_operator[]
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator[]
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d_operator[]_const b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator[]_const
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/d_operator[]_const
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator[]_const
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator_istream b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator_istream
new file mode 100644
index 0000000..36f88e0
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator_istream
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: d_operator>>
+# key: >>
+# --
+friend std::istream& operator>>(std::istream&, const ${1:Class}&);
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator_ostream b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator_ostream
new file mode 100644
index 0000000..c7f40fc
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/d_operator_ostream
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: d_operator<<
+# key: <<
+# --
+friend std::ostream& operator<<(std::ostream&, const ${1:Class}&);
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/delete b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/delete
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/delete
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/delete
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/delete[] b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/delete[]
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/delete[]
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/delete[]
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/doc b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/doc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/doc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/doc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/dynamic_casting b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/dynamic_casting
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/dynamic_casting
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/dynamic_casting
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/enum b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/enum
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/enum
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/enum
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/fixture b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/fixture
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/fixture
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/fixture
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/fori b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/fori
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/fori
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/fori
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/friend b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/friend
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/friend
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/friend
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/fun_declaration b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/fun_declaration
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/fun_declaration
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/fun_declaration
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/gtest b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/gtest
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/gtest
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/gtest
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/ignore b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/ignore
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/ignore
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/ignore
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/inline b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/inline
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/inline
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/inline
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/io b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/io
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/io
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/io
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/iterator b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/iterator
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/iterator
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/iterator
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/map b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/map
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/map
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/map
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/module b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/module
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/module
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/module
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/namespace b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/namespace
new file mode 100644
index 0000000..5f702d8
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/namespace
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: namespace
+# key: ns
+# --
+namespace ${1:Namespace} {
+
+          `yas/selected-text`
+
+}  // $1
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/ns b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/ns
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/ns
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/ns
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator!= b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator!=
new file mode 100644
index 0000000..0b9c3c3
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator!=
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: operator!=
+# key: !=
+# group: operator overloading
+# --
+bool ${1:MyClass}::operator!=(const $1 &other) const
+{
+    return !(*this == other);
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator+ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator+
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator+
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator+
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator+= b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator+=
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator+=
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator+=
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator= b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator=
new file mode 100644
index 0000000..272af5d
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator=
@@ -0,0 +1,14 @@
+# -*- mode: snippet -*-
+# name: operator=
+# key: =
+# where this is a reference to myself
+# group: operator overloading
+# --
+${1:MyClass}& $1::operator=(const $1 &rhs)
+{
+    // Check for self-assignment!
+    if (this == &rhs)
+      return *this;
+    $0
+    return *this;
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator== b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator==
new file mode 100644
index 0000000..f8fb3e9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator==
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: operator==
+# key: ==
+# group: operator overloading
+# --
+bool ${1:MyClass}::operator==(const $1 &other) const
+{
+     $0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator[] b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator[]
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/operator[]
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator[]
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator_istream b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator_istream
new file mode 100644
index 0000000..e2296ab
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator_istream
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: operator>>
+# key: >>
+# group: operator overloading
+# --
+std::istream& operator>>(std::istream& is, const ${1:Class}& ${2:c})
+{
+         $0
+	 return is;
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator_ostream b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator_ostream
new file mode 100644
index 0000000..cd77eb4
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/operator_ostream
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: operator<<
+# key: <<
+# group: operator overloading
+# --
+std::ostream& operator<<(std::ostream& os, const ${1:Class}& ${2:c})
+{
+         $0
+         return os;
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/ostream b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/ostream
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/ostream
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/ostream
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/pack b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/pack
new file mode 100644
index 0000000..5172bb9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/pack
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: pack
+# key: pack
+# --
+void cNetCommBuffer::pack(${1:type})
+{
+
+}
+
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/private b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/private
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/private
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/private
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/protected b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/protected
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/protected
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/protected
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/public b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/public
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/public
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/public
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/sstream b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/sstream
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/sstream
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/sstream
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/std b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/std
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/std
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/std
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/std_colon b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/std_colon
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/std_colon
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/std_colon
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/str b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/str
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/str
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/str
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/template b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/template
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/template
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/template
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test case b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test case
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test case
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test case
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test_main b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test_main
new file mode 100644
index 0000000..9321cf3
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test_main
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: test_main
+# key: test_main
+# group: testing
+# --
+int main(int argc, char **argv)
+{
+      ::testing::InitGoogleTest(&argc, argv);
+       return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test_suite b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test_suite
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/test_suite
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/test_suite
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/this b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/this
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/this
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/this
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/throw b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/throw
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/throw
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/throw
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/try
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/try
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/try
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/tryw b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/tryw
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/tryw
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/tryw
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/using b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/using
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/using
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/using
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/vector b/emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/vector
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c++-mode/vector
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c++-mode/vector
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/assert b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/assert
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/assert
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/assert
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/compile b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/compile
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/compile
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/compile
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/define b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/define
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/define
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/define
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/malloc b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/malloc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/malloc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/malloc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/packed b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/packed
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/packed
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/packed
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/printf b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/printf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/printf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/printf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/stdio b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/stdio
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/stdio
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/stdio
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/stdlib b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/stdlib
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/stdlib
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/stdlib
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/string b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/string
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/string
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/string
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/union b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/union
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/union
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/union
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/unistd b/emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/unistd
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/c-mode/unistd
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/c-mode/unistd
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/case b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/case
new file mode 100644
index 0000000..0b3dc36
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/case
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name : case : {...}
+# key: case
+# --
+`(indent-region (- (point) 20) (+ (point) 20) nil)`case ${2:constexpr}:${3: \{}
+    $0
+    break;
+${3:$(if (string-match "\{" yas-text) "\}" "")}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/do b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/do
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/do
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/do
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/else b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/else
new file mode 100644
index 0000000..99e006d
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/else
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name : else { ... }
+# key: else
+# --
+else${1: {
+    $0
+}}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/file_description b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/file_description
new file mode 100644
index 0000000..5b3a1ee
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/file_description
@@ -0,0 +1,13 @@
+# -*- mode: snippet -*-
+#cotributor: Henrique Jung <henriquenj@gmail.com>
+#name: File description
+#key: \file
+#group: doxygen
+# --
+/**
+ *   \file ${1:`(file-name-nondirectory(buffer-file-name))`}
+ *   \brief ${2:A Documented file.}
+ ${3:*
+ *  ${4:Detailed description}
+ *
+}*/
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/fopen b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/fopen
new file mode 100644
index 0000000..f41cf62
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/fopen
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: FILE *fp = fopen(..., ...);
+# key: fopen
+# --
+FILE *${fp} = fopen(${"file"}, "${r}");
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/for
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/for_n b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/for_n
new file mode 100644
index 0000000..014d8ff
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/for_n
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor: York Zhao
+# name: for_n
+# key: forn
+# --
+for (${1:auto }${2:i} = ${3:0}; $2 < ${4:MAXIMUM}; ++$2) {
+    $0
+}
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/function_description b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/function_description
new file mode 100644
index 0000000..1ff27ff
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/function_description
@@ -0,0 +1,14 @@
+# -*- mode: snippet -*-
+#cotributor: Henrique Jung <henriquenj@gmail.com>
+#name: Function description
+#key: \brief
+#group: doxygen
+# --
+/**
+ *  \brief ${1:function description}
+ ${2:*
+ *  ${3:Detailed description}
+ *
+ }*  \param ${4:param}
+ *  \return ${5:return type}
+ */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/if
new file mode 100644
index 0000000..751c6f5
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/if
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name : if (...) { ... }
+# key: if
+# --
+if (${1:condition}) ${2:{
+    $0
+}}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/ifdef b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/ifdef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/ifdef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/ifdef
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/inc b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/inc
new file mode 100644
index 0000000..96beaa7
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/inc
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name : #include <...>
+# key  : inc
+# --
+#include <$1>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/inc.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/inc.1
new file mode 100644
index 0000000..64a8653
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/inc.1
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name : #include "..."
+# key  : inc
+# --
+#include "$1"
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/main
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/main
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/main
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/math b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/math
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/math
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/math
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/member_description b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/member_description
new file mode 100644
index 0000000..54f3406
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/member_description
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+#cotributor: Henrique Jung <henriquenj@gmail.com>
+#name: Member description
+#key: !<
+#group: doxygen
+# --
+/*!< ${1:Detailed description after the member} */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/once b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/once
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/once
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/once
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/printf b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/printf
new file mode 100644
index 0000000..1e276ec
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/printf
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: printf
+# key: printf
+# --
+printf("${1:%s}\\n"${1:$(if (string-match "%" yas-text) ", " "\);")
+}$2${1:$(if (string-match "%" yas-text) "\);" "")}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/struct b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/struct
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/struct
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/struct
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/switch b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/switch
new file mode 100644
index 0000000..6827bba
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/switch
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# name : switch (...) { case : ... default: ...}
+# key: switch
+# --
+switch (${1:expr}) {
+case ${2:constexpr}:${3: \{}
+    $0
+    break;
+${3:$(if (string-match "\{" yas-text) "\}\n" "")}default:
+    break;
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/ternary b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/ternary
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/ternary
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/ternary
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/typedef b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/typedef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/typedef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/typedef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cc-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cc-mode/while
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/action b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/action
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/action
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/action
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/bash b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/bash
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/bash
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/bash
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/cookbook_file b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/cookbook_file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/cookbook_file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/cookbook_file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/cron b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/cron
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/cron
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/cron
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/cronf b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/cronf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/cronf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/cronf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/deploy b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/deploy
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/deploy
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/deploy
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/directory b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/directory
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/directory
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/directory
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/directoryf b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/directoryf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/directoryf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/directoryf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/env b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/env
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/env
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/env
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/execute b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/execute
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/execute
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/execute
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/executef b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/executef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/executef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/executef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/file b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/filef b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/filef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/filef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/filef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/git b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/git
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/git
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/git
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/group b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/group
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/group
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/group
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/http_request b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/http_request
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/http_request
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/http_request
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/http_requestp b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/http_requestp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/http_requestp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/http_requestp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/ignore_failure b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/ignore_failure
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/ignore_failure
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/ignore_failure
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/inc b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/inc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/inc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/inc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/link b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/link
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/link
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/link
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/linkf b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/linkf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/linkf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/linkf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/log b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/log
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/log
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/log
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/machine b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/machine
new file mode 100644
index 0000000..fb9ed43
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/machine
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: machine
+# key: machine
+# --
+machine "${1:name}" do
+  role '${2:web}'
+  recipe '${3:web}'
+  chef_environment '${4:_default}'
+  converge true
+end
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/meta b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/meta
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/meta
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/meta
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/not_if b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/not_if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/not_if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/not_if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/notifies b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/notifies
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/notifies
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/notifies
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/only_if b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/only_if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/only_if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/only_if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/pac b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/pac
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/pac
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/pac
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/pak b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/pak
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/pak
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/pak
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/provider b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/provider
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/provider
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/provider
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/python b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/python
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/python
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/python
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/remote_file b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/remote_file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/remote_file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/remote_file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/retries b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/retries
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/retries
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/retries
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/role b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/role
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/role
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/role
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/ruby b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/ruby
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/ruby
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/ruby
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/script b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/script
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/script
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/script
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/service b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/service
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/service
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/service
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/servicep b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/servicep
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/servicep
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/servicep
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/subscribes b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/subscribes
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/subscribes
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/subscribes
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/supports b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/supports
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/supports
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/supports
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/template b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/template
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/template
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/template
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/templatev b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/templatev
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/templatev
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/templatev
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/user b/emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/user
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/chef-mode/user
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/chef-mode/user
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ensime-mode b/emacs.d/elpa/yasnippet-20160104.129/snippets/cider-repl-mode
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ensime-mode
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cider-repl-mode
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/bench b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/bench
new file mode 100644
index 0000000..fd4e151
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/bench
@@ -0,0 +1,7 @@
+# name: bench
+# key: bench
+# --
+(dotimes [_ 5 ]$>
+  (time (dotimes [i 1000000]$>
+  $0$>
+  )))$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/bp b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/bp
new file mode 100644
index 0000000..5760865
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/bp
@@ -0,0 +1,4 @@
+# name: bp
+# key: bp
+# --
+(swank.core/break)
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/def b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/def
new file mode 100644
index 0000000..7ac6697
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/def
@@ -0,0 +1,4 @@
+# name: def
+# key: def
+# --
+(def $0)
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defm b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defm
new file mode 100644
index 0000000..1f6bb7c
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defm
@@ -0,0 +1,7 @@
+# name: defmacro
+# key: defm
+# --
+(defmacro $1
+  "$2"$>
+  [$3]$>
+  $0)$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defn b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defn
new file mode 100644
index 0000000..f68b48e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defn
@@ -0,0 +1,7 @@
+# name: defn
+# key: defn
+# --
+(defn $1
+  "$2"$>
+  [$3]$>
+  $0)$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defr b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defr
new file mode 100644
index 0000000..101a0e9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/defr
@@ -0,0 +1,8 @@
+# name: defrecord
+# key: defr
+# --
+(defrecord
+  ^{"$1"}$>
+  $2$>
+  [$3]$>
+  $0)$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/deft b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/deft
new file mode 100644
index 0000000..3337e9a
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/deft
@@ -0,0 +1,8 @@
+# name: deftype
+# key: deft
+# --
+(deftype
+  ^{"$1"}$>
+  $2$>
+  [$3]$>
+  $0)$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/doseq b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/doseq
new file mode 100644
index 0000000..9a7d3aa
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/doseq
@@ -0,0 +1,6 @@
+# name: doseq
+# key: doseq
+# --
+(doseq [$1 $2]
+  $3)$>
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/fn b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/fn
new file mode 100644
index 0000000..e949ed8
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/fn
@@ -0,0 +1,5 @@
+# name: fn
+# key: fn
+# --
+(fn [$1]
+  $0)$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/for
new file mode 100644
index 0000000..6ff8781
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/for
@@ -0,0 +1,5 @@
+# name: for
+# key: for
+# --
+(for [$1 $2]
+  $3)$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/if
new file mode 100644
index 0000000..e3a0bd3
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/if
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# name: if
+# key: if
+# --
+(if $1
+  $2$>
+  $3)$>
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/ifl b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/ifl
new file mode 100644
index 0000000..a8df766
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/ifl
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# name: ifl
+# key: ifl
+# --
+(if-let [$1 $2]
+  $3)$>
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/import b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/import
new file mode 100644
index 0000000..a7929d1
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/import
@@ -0,0 +1,4 @@
+# name: import
+# key: import
+# --
+(:import ($1))$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/is b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/is
new file mode 100644
index 0000000..6a8e54a
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/is
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# name: is
+# key: is
+# --
+(is (= $1 $2))
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/let b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/let
new file mode 100644
index 0000000..9d83ae2
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/let
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# name: let
+# key: let
+# --
+(let [$1 $2]$>
+  $3)$>
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/map b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/map
new file mode 100644
index 0000000..a699c4a
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/map
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# name: map
+# key: map
+# --
+(map $1 $2)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/map.lambda b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/map.lambda
new file mode 100644
index 0000000..9771706
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/map.lambda
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# name: map lambda
+# key: map
+# --
+(map #($1) $2)$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/mdoc b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/mdoc
new file mode 100644
index 0000000..0917228
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/mdoc
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# name: mdoc
+# key: mdoc
+# --
+^{:doc "$1"}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/ns b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/ns
new file mode 100644
index 0000000..1d8982e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/ns
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# name: ns
+# key: ns
+# --
+(ns `(flet ((try-src-prefix
+	  (path src-pfx)
+	  (let ((parts (split-string path src-pfx)))
+	    (if (= 2 (length parts))
+		(second parts)
+	      nil))))
+    (let* ((p (buffer-file-name))
+           (p2 (first
+		(remove-if-not '(lambda (x) x)
+			       (mapcar
+				'(lambda (pfx)
+				   (try-src-prefix p pfx))
+				'("/src/cljs/" "/src/clj/" "/src/")))))
+	   (p3 (file-name-sans-extension p2))
+	   (p4 (mapconcat '(lambda (x) x)
+		 (split-string p3 "/")
+		 ".")))
+      (replace-regexp-in-string "_" "-" p4)))`)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/opts b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/opts
new file mode 100644
index 0000000..4e04fa0
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/opts
@@ -0,0 +1,6 @@
+# key: opts
+# name: opts
+# --
+{:keys [$1]$>
+ :or {$2}$>
+ :as $3}$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/pr b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/pr
new file mode 100644
index 0000000..6d98a41
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/pr
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# name: pr
+# key: pr
+# --
+(prn $1)
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/print b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/print
new file mode 100644
index 0000000..a23c1c8
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/print
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# name: print
+# key: print
+# --
+(println $1)
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/reduce b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/reduce
new file mode 100644
index 0000000..68f7375
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/reduce
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# name: reduce
+# key: reduce
+# --
+(reduce ${1:(fn [p n] $0)} $2)
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/require b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/require
new file mode 100644
index 0000000..29c584e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/require
@@ -0,0 +1,4 @@
+# name: require
+# key: require
+# --
+(:require [$1 :as $2])$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/test b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/test
new file mode 100644
index 0000000..0d7751d
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/test
@@ -0,0 +1,6 @@
+# name: test
+# key: test
+# --
+(deftest $1
+  (is (= $2))$>
+  $0)$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/try
new file mode 100644
index 0000000..397cc6c
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/try
@@ -0,0 +1,7 @@
+# name: try
+# key: try
+# --
+(try
+$1$>
+(catch ${2:Exception} e$>
+$3$>))$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/use b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/use
new file mode 100644
index 0000000..67a7be1
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/use
@@ -0,0 +1,4 @@
+# name: use
+# key: use
+# --
+(:use [$1 :refer [$2]])$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/when b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/when
new file mode 100644
index 0000000..e17bb6b
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/when
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# name: when
+# key: when
+# --
+(when $1
+      $2)$>
+$0$>
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/whenl b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/whenl
new file mode 100644
index 0000000..929019e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/clojure-mode/whenl
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# name: whenl
+# key: whenl
+# --
+(when-let [$1 $2]
+  $3)$>
+  $0$>
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/add_executable b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/add_executable
new file mode 100644
index 0000000..34e1546
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/add_executable
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: add_executable
+# key: exe
+# --
+add_executable($1 ${2:main.cpp})
+target_link_libraries($1 $3)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/add_library b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/add_library
new file mode 100644
index 0000000..55c3def
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/add_library
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: add_library
+# key: lib
+# --
+add_library($1 ${2:class.cpp})
+target_link_libraries($1 $3)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/cmake_minimum_required b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/cmake_minimum_required
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/cmake_minimum_required
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/cmake_minimum_required
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/foreach b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/foreach
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/foreach
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/foreach
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/ifelse b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/ifelse
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/ifelse
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/ifelse
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/include b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/include
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/include
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/include
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/macro b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/macro
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/macro
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/macro
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/message b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/message
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/message
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/message
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/option b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/option
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/option
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/option
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/project b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/project
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/project
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/project
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/set b/emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/set
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cmake-mode/set
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cmake-mode/set
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/conf-unix-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/conf-unix-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/conf-unix-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/conf-unix-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/conf-unix-mode/section b/emacs.d/elpa/yasnippet-20160104.129/snippets/conf-unix-mode/section
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/conf-unix-mode/section
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/conf-unix-mode/section
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cperl-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/cperl-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cperl-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cperl-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/EV b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/EV
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/EV
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/EV
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/emit_signal b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/emit_signal
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/emit_signal
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/emit_signal
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/intuniform b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/intuniform
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/intuniform
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/intuniform
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/math b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/math
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/math
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/math
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/nan b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/nan
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/nan
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/nan
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/omnet b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/omnet
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/omnet
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/omnet
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/parameter_omnetpp b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/parameter_omnetpp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/parameter_omnetpp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/parameter_omnetpp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/scheduleAt b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/scheduleAt
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/scheduleAt
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/scheduleAt
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/uniform b/emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/uniform
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/cpp-omnet-mode/uniform
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/cpp-omnet-mode/uniform
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/attrib b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/attrib
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/attrib
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/attrib
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/attrib.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/attrib.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/attrib.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/attrib.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/attrib.2 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/attrib.2
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/attrib.2
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/attrib.2
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/class b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment.2 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment.2
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment.2
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment.2
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment.3 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment.3
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/comment.3
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/comment.3
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/method b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/method
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/method
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/method
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/namespace b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/namespace
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/namespace
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/namespace
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/prop b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/prop
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/prop
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/prop
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/region b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/region
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/region
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/region
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/using b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/using
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/using
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/using
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/using.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/using.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/using.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/using.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/using.2 b/emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/using.2
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/csharp-mode/using.2
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/csharp-mode/using.2
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/bg b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/bg
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/bg
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/bg
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/bg.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/bg.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/bg.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/bg.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/bor b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/bor
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/bor
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/bor
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/cl b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/cl
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/cl
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/cl
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/disp.block b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/disp.block
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/disp.block
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/disp.block
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/disp.inline b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/disp.inline
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/disp.inline
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/disp.inline
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/disp.none b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/disp.none
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/disp.none
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/disp.none
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/ff b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/ff
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/ff
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/ff
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/fs b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/fs
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/fs
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/fs
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.bottom b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.bottom
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.bottom
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.bottom
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.left b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.left
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.left
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.left
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.mar b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.mar
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.mar
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.mar
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.margin b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.margin
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.margin
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.margin
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.right b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.right
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.right
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.right
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.top b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.top
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/mar.top
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/mar.top
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.bottom b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.bottom
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.bottom
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.bottom
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.left b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.left
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.left
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.left
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.pad b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.pad
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.pad
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.pad
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.padding b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.padding
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.padding
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.padding
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.right b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.right
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.right
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.right
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.top b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.top
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/css-mode/pad.top
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/pad.top
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/v b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/v
new file mode 100644
index 0000000..fec5bd5
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/css-mode/v
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: -vendor-prefix
+# contributor: Prateek Saxena
+# key: -v
+# --
+$1: $2;
+-webkit-$1: $2;
+-moz-$1: $2;
+-ms-$1: $2;
+-o-$1: $2;
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/.yas-parents
new file mode 100644
index 0000000..75d003f
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/.yas-parents
@@ -0,0 +1 @@
+prog-mode
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/case b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/case
new file mode 100644
index 0000000..1630d2e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/case
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: case
+# key: case
+# --
+case $1 do
+  $0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/cond b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/cond
new file mode 100644
index 0000000..40934ff
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/cond
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: cond
+# key: cond
+# --
+cond do
+  $0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/def b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/def
new file mode 100644
index 0000000..e680262
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/def
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: def
+# key: def
+# --
+def ${1:method}${2:(${3:args})} do
+  $0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmacro b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmacro
new file mode 100644
index 0000000..63ab988
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmacro
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: defmacro
+# key: defmacro
+# --
+defmacro $1 do
+	$0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmacrop b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmacrop
new file mode 100644
index 0000000..3f4cf98
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmacrop
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: defmacrop
+# key: defmacrop
+# --
+defmacrop $1 do
+	$0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmodule b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmodule
new file mode 100644
index 0000000..4e33ab0
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defmodule
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: defmodule
+# key: defmodule
+# --
+defmodule $1 do
+	$0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defp b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defp
new file mode 100644
index 0000000..0fd90e9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/defp
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: defp
+# key: defp
+# --
+defp $1 do
+	$0
+end
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/doc b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/doc
new file mode 100644
index 0000000..c23f906
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/doc
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: doc
+# key: doc
+# --
+@doc """
+$0
+"""
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/mdoc b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/mdoc
new file mode 100644
index 0000000..c0cc4f2
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/elixir-mode/mdoc
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: moduledoc
+# key: mdoc
+# --
+@moduledoc """
+$0
+"""
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/.read_me b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/.read_me
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/.read_me
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/.read_me
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/add-hook b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/add-hook
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/add-hook
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/add-hook
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/and b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/and
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/and
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/and
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/append b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/append
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/append
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/append
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/apply b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/apply
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/apply
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/apply
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/aref b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/aref
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/aref
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/aref
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/aset b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/aset
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/aset
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/aset
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/assq b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/assq
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/assq
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/assq
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/autoload b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/autoload
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/autoload
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/autoload
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/backward-char b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/backward-char
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/backward-char
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/backward-char
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/beginning-of-line b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/beginning-of-line
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/beginning-of-line
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/beginning-of-line
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/bounds-of-thing-at-point b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/bounds-of-thing-at-point
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/bounds-of-thing-at-point
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/bounds-of-thing-at-point
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-file-name b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-file-name
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-file-name
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-file-name
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-modified-p b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-modified-p
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-modified-p
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-modified-p
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-substring b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-substring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-substring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-substring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-substring-no-properties b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-substring-no-properties
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/buffer-substring-no-properties
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/buffer-substring-no-properties
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/car b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/car
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/car
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/car
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/cdr b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/cdr
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/cdr
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/cdr
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/concat b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/concat
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/concat
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/concat
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/cond b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/cond
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/cond
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/cond
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/condition-case b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/condition-case
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/condition-case
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/condition-case
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/cons b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/cons
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/cons
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/cons
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/consp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/consp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/consp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/consp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/copy-directory b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/copy-directory
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/copy-directory
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/copy-directory
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/copy-file b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/copy-file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/copy-file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/copy-file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/current-buffer b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/current-buffer
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/current-buffer
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/current-buffer
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/custom-autoload b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/custom-autoload
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/custom-autoload
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/custom-autoload
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defalias b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defalias
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defalias
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defalias
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defcustom b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defcustom
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defcustom
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defcustom
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/define-key b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/define-key
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/define-key
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/define-key
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defsubst b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defsubst
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defsubst
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defsubst
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defun b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defun
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defun
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defun
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defvar b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defvar
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/defvar
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/defvar
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-char b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-char
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-char
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-char
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-directory b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-directory
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-directory
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-directory
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-file b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-region b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-region
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/delete-region
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/delete-region
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/directory-files b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/directory-files
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/directory-files
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/directory-files
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/dired.process_marked b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/dired.process_marked
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/dired.process_marked
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/dired.process_marked
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/dolist b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/dolist
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/dolist
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/dolist
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/end-of-line b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/end-of-line
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/end-of-line
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/end-of-line
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/eq b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/eq
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/eq
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/eq
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/equal b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/equal
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/equal
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/equal
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/error b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/error
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/error
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/error
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/ert-deftest b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/ert-deftest
new file mode 100644
index 0000000..0ccdb73
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/ert-deftest
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+#contributor: Raghav Kumar Gautam
+#name: ert-deftest
+#key: edt
+# --
+(ert-deftest ${1:test-name} ()
+  $0)
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/expand-file-name b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/expand-file-name
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/expand-file-name
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/expand-file-name
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/f b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/f
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/f
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/f
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/fboundp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/fboundp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/fboundp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/fboundp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-directory b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-directory
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-directory
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-directory
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-extension b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-extension
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-extension
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-extension
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-nondirectory b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-nondirectory
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-nondirectory
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-nondirectory
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-sans-extension b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-sans-extension
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-name-sans-extension
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-name-sans-extension
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-relative-name b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-relative-name
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file-relative-name
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file-relative-name
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file.process b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file.process
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file.process
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file.process
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file.read-lines b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file.read-lines
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/file.read-lines
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/file.read-lines
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/find-file b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/find-file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/find-file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/find-file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/find-replace b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/find-replace
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/find-replace
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/find-replace
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/format b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/format
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/format
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/format
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/forward-char b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/forward-char
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/forward-char
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/forward-char
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/forward-line b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/forward-line
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/forward-line
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/forward-line
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/funcall b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/funcall
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/funcall
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/funcall
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/get b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/get
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/get
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/get
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/global-set-key b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/global-set-key
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/global-set-key
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/global-set-key
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/goto-char b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/goto-char
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/goto-char
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/goto-char
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/grabstring b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/grabstring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/grabstring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/grabstring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/grabthing b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/grabthing
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/grabthing
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/grabthing
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/hash b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/hash
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/hash
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/hash
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/insert b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/insert
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/insert
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/insert
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/insert-file-contents b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/insert-file-contents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/insert-file-contents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/insert-file-contents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/interactive b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/interactive
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/interactive
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/interactive
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/kbd b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/kbd
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/kbd
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/kbd
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/kill-buffer b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/kill-buffer
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/kill-buffer
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/kill-buffer
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/lambda b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/lambda
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/lambda
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/lambda
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/length b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/length
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/length
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/length
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/let b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/let
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/let
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/let
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/line-beginning-position b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/line-beginning-position
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/line-beginning-position
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/line-beginning-position
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/line-end-position b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/line-end-position
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/line-end-position
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/line-end-position
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/list b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/list
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/list
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/list
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/looking-at b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/looking-at
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/looking-at
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/looking-at
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/make-directory b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/make-directory
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/make-directory
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/make-directory
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/make-local-variable b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/make-local-variable
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/make-local-variable
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/make-local-variable
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/mapc b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/mapc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/mapc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/mapc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/mapcar b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/mapcar
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/mapcar
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/mapcar
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/match-beginning b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/match-beginning
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/match-beginning
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/match-beginning
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/match-end b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/match-end
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/match-end
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/match-end
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/match-string b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/match-string
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/match-string
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/match-string
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/memq b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/memq
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/memq
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/memq
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/message b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/message
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/message
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/message
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/minor_mode b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/minor_mode
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/minor_mode
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/minor_mode
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/not b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/not
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/not
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/not
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/nth b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/nth
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/nth
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/nth
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/null b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/null
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/null
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/null
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/number-to-string b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/number-to-string
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/number-to-string
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/number-to-string
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/or b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/or
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/or
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/or
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/point b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/point
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/point
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/point
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/point-max b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/point-max
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/point-max
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/point-max
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/point-min b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/point-min
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/point-min
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/point-min
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/princ b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/princ
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/princ
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/princ
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/print b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/print
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/print
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/print
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/progn b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/progn
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/progn
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/progn
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/push b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/push
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/push
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/push
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/put b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/put
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/put
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/put
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/re-search-backward b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/re-search-backward
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/re-search-backward
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/re-search-backward
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/re-search-forward b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/re-search-forward
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/re-search-forward
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/re-search-forward
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/region-active-p b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/region-active-p
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/region-active-p
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/region-active-p
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/region-beginning b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/region-beginning
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/region-beginning
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/region-beginning
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/region-end b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/region-end
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/region-end
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/region-end
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/rename-file b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/rename-file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/rename-file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/rename-file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/repeat b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/repeat
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/repeat
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/repeat
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/replace-regexp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/replace-regexp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/replace-regexp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/replace-regexp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/replace-regexp-in-string b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/replace-regexp-in-string
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/replace-regexp-in-string
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/replace-regexp-in-string
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/require b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/require
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/require
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/require
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/save-buffer b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/save-buffer
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/save-buffer
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/save-buffer
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/save-excursion b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/save-excursion
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/save-excursion
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/save-excursion
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-backward b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-backward
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-backward
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-backward
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-backward-regexp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-backward-regexp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-backward-regexp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-backward-regexp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-forward b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-forward
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-forward
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-forward
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-forward-regexp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-forward-regexp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/search-forward-regexp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/search-forward-regexp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set-buffer b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set-buffer
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set-buffer
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set-buffer
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set-file-modes b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set-file-modes
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set-file-modes
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set-file-modes
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set-mark b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set-mark
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/set-mark
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/set-mark
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/setq b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/setq
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/setq
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/setq
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/should b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/should
new file mode 100644
index 0000000..29748a2
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/should
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+#contributor: Raghav Kumar Gautam
+#name: should
+#key: sh
+# --
+(should $0)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/skip-chars-backward b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/skip-chars-backward
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/skip-chars-backward
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/skip-chars-backward
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/skip-chars-forward b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/skip-chars-forward
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/skip-chars-forward
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/skip-chars-forward
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/split-string b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/split-string
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/split-string
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/split-string
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string-match b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string-match
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string-match
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string-match
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string-to-number b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string-to-number
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string-to-number
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string-to-number
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string= b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string=
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/string=
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/string=
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/stringp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/stringp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/stringp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/stringp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/substring b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/substring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/substring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/substring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/thing-at-point b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/thing-at-point
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/thing-at-point
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/thing-at-point
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/traverse_dir b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/traverse_dir
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/traverse_dir
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/traverse_dir
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/unless b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/unless
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/unless
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/unless
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/vector b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/vector
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/vector
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/vector
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/when b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/when
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/when
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/when
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/while
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/widget-get b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/widget-get
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/widget-get
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/widget-get
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/with-current-buffer b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/with-current-buffer
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/with-current-buffer
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/with-current-buffer
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/word-or-region b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/word-or-region
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/word-or-region
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/word-or-region
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/word_regexp b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/word_regexp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/word_regexp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/word_regexp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-dired.process_marked b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-dired.process_marked
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-dired.process_marked
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-dired.process_marked
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-file.process b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-file.process
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-file.process
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-file.process
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-file.read-lines b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-file.read-lines
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-file.read-lines
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-file.read-lines
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-find-replace b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-find-replace
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-find-replace
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-find-replace
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-grabstring b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-grabstring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-grabstring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-grabstring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-grabthing b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-grabthing
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-grabthing
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-grabthing
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-traverse_dir b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-traverse_dir
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-traverse_dir
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-traverse_dir
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-word-or-region b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-word-or-region
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/x-word-or-region
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/x-word-or-region
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/y-or-n-p b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/y-or-n-p
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/y-or-n-p
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/y-or-n-p
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/yes-or-no-p b/emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/yes-or-no-p
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/emacs-lisp-mode/yes-or-no-p
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/emacs-lisp-mode/yes-or-no-p
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/typerex-mode b/emacs.d/elpa/yasnippet-20160104.129/snippets/enh-ruby-mode
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/typerex-mode
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/enh-ruby-mode
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/ensime-mode b/emacs.d/elpa/yasnippet-20160104.129/snippets/ensime-mode
new file mode 100755
index 0000000..e69de29
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erc-mode/blist b/emacs.d/elpa/yasnippet-20160104.129/snippets/erc-mode/blist
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erc-mode/blist
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erc-mode/blist
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erc-mode/help b/emacs.d/elpa/yasnippet-20160104.129/snippets/erc-mode/help
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erc-mode/help
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erc-mode/help
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/after b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/after
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/after
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/after
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/begin b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/begin
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/begin
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/begin
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/beh b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/beh
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/beh
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/beh
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/case b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/case
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/case
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/case
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/compile b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/compile
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/compile
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/compile
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/def b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/def
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/def
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/def
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/exp b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/exp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/exp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/exp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/fun b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/fun
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/fun
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/fun
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/ifdef b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/ifdef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/ifdef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/ifdef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/ifndef b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/ifndef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/ifndef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/ifndef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/imp b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/imp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/imp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/imp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/inc b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/inc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/inc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/inc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/inc.lib b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/inc.lib
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/inc.lib
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/inc.lib
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/loop b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/loop
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/loop
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/loop
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/mod b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/mod
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/mod
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/mod
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/rcv b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/rcv
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/rcv
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/rcv
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/rcv.after b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/rcv.after
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/rcv.after
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/rcv.after
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/rec b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/rec
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/rec
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/rec
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/try
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/try
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/try
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/undef b/emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/undef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/erlang-mode/undef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/erlang-mode/undef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/bd b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/bd
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/bd
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/bd
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/c b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/c
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/c
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/c
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ch b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/ch
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/ch
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/ch
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/cx b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/cx
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/cx
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/cx
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/dc b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/dc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/dc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/dc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/do b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/do
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/do
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/do
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/dp b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/dp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/dp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/dp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/forall b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/forall
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/forall
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/forall
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/in b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/in
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/in
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/in
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/inc b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/inc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/inc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/inc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/intr b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/intr
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/intr
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/intr
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/l b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/l
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/l
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/l
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/module b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/module
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/module
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/module
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pa b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/pa
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pa
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/pa
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/program b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/program
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/program
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/program
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/puref b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/puref
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/puref
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/puref
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pures b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/pures
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/pures
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/pures
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/re b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/re
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/re
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/re
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/subroutine b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/subroutine
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/subroutine
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/subroutine
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/until b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/until
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/until
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/until
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/where b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/where
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/where
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/where
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/while
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/wr b/emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/wr
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/f90-mode/wr
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/f90-mode/wr
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/fundamental-mode/.yas-setup.el b/emacs.d/elpa/yasnippet-20160104.129/snippets/fundamental-mode/.yas-setup.el
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/fundamental-mode/.yas-setup.el
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/fundamental-mode/.yas-setup.el
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/git-commit-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/git-commit-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/git-commit-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/git-commit-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/git-commit-mode/fixes b/emacs.d/elpa/yasnippet-20160104.129/snippets/git-commit-mode/fixes
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/git-commit-mode/fixes
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/git-commit-mode/fixes
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/git-commit-mode/references b/emacs.d/elpa/yasnippet-20160104.129/snippets/git-commit-mode/references
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/git-commit-mode/references
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/git-commit-mode/references
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/benchmark b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/benchmark
new file mode 100644
index 0000000..ef669a8
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/benchmark
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: benchmark
+# key: bench
+# contributor : @atotto
+# --
+func Benchmark$1(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		$0
+	}
+}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/const b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/const
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/const
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/const
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/const( b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/const(
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/const(
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/const(
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/dd b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/dd
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/dd
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/dd
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/default b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/default
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/default
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/default
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/else b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/else
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/else
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/else
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/error b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/error
new file mode 100644
index 0000000..85c539a
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/error
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: error
+# key: err
+# contributor : @atotto
+# --
+if err != nil {
+	$0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/example b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/example
new file mode 100644
index 0000000..acfb75d
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/example
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: example
+# key: example
+# contributor : @atotto
+# --
+func Example$1() {
+	$0
+}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/for
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/forrange b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/forrange
new file mode 100644
index 0000000..9d889eb
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/forrange
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: for range
+# key: range
+# contributor : @atotto
+# --
+for ${3:key}, ${2:value} := range ${1:target} {
+	$0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/func b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/func
new file mode 100644
index 0000000..9b1649f
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/func
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: func
+# key: func
+# --
+// $1 ${4:...}
+func ${1:name}(${2:args}) $3 {
+  $0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/iferr b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/iferr
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/iferr
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/iferr
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/import b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/import
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/import
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/import
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/import( b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/import(
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/import(
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/import(
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/lambda b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/lambda
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/lambda
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/lambda
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/main
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/main
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/main
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/map b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/map
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/map
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/map
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/printf b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/printf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/printf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/printf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/select b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/select
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/select
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/select
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/switch b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/switch
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/switch
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/switch
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/test b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/test
new file mode 100644
index 0000000..8baf8c9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/test
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: test
+# key: at
+# contributor : @atotto
+# --
+func Test$1(t *testing.T) {
+	$0
+}
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/testmain b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/testmain
new file mode 100644
index 0000000..5f208da
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/testmain
@@ -0,0 +1,21 @@
+# -*- mode: snippet -*-
+# name: testmain
+# key: testmain
+# contributor : @atotto
+# --
+func TestMain(m *testing.M) {
+	setup()
+	ret := m.Run()
+	if ret == 0 {
+		teardown()
+	}
+	os.Exit(ret)
+}
+
+func setup() {
+	$1
+}
+
+func teardown() {
+	$2
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/type b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/type
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/type
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/type
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/var b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/var
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/var
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/var
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/var( b/emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/var(
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/go-mode/var(
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/go-mode/var(
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/class b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/def b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/def
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/def
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/def
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/dict b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/dict
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/dict
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/dict
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/println b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/println
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/println
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/println
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/times b/emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/times
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/groovy-mode/times
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/groovy-mode/times
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/case b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/case
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/case
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/case
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/data b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/data
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/data
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/data
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/doc b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/doc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/doc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/doc
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/efix b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/efix
new file mode 100644
index 0000000..e8714f3
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/efix
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: fixme dummy
+# key: efix
+# expand-env: ((yas-indent-line 'fixed))
+# --
+(error "FIXME: $0")
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/function
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/functione b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/functione
new file mode 100644
index 0000000..22276e7
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/functione
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: fune
+# key: fune
+# --
+${1:function-name} :: ${2:type}
+$1 = $0error "Not implemented: $1"
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/import b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/import
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/import
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/import
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/instance b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/instance
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/instance
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/instance
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/main
new file mode 100644
index 0000000..5ab76ba
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/main
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: main function
+# key: main
+# expand-env: ((yas-indent-line 'fixed))
+# --
+main :: IO ()
+main = do $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/module b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/module
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/module
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/module
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/new class b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/new class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/new class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/new class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/pragma b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/pragma
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/pragma
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/pragma
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/print b/emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/print
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/haskell-mode/print
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/haskell-mode/print
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/.yas-parents
new file mode 100644
index 0000000..74c3dd5
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/.yas-parents
@@ -0,0 +1 @@
+nxml-mode
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dd b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/dd
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dd
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/dd
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dl b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/dl
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dl
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/dl
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.html5 b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.html5
new file mode 100644
index 0000000..a892472
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.html5
@@ -0,0 +1,4 @@
+#name : Doctype HTML 5
+#group : meta
+# --
+<!DOCTYPE html>
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhml1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhml1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhtml1_1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1_1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhtml1_1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1_1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhtml1_strict b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1_strict
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhtml1_strict
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1_strict
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhtml1_transitional b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1_transitional
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/doctype.xhtml1_transitional
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/doctype.xhtml1_transitional
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dt b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/dt
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/dt
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/dt
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/form b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/form
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/form
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/form
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/html b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/html
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/html
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/html
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/html.xmlns b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/html.xmlns
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/html.xmlns
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/html.xmlns
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/link.stylesheet b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/link.stylesheet
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/link.stylesheet
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/link.stylesheet
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/link.stylesheet-ie b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/link.stylesheet-ie
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/link.stylesheet-ie
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/link.stylesheet-ie
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/mailto b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/mailto
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/mailto
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/mailto
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/meta b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/meta
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/meta
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/meta
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/meta.http-equiv b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/meta.http-equiv
new file mode 100644
index 0000000..9913652
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/meta.http-equiv
@@ -0,0 +1,5 @@
+#contributor : Jimmy Wu <frozenthrone88@gmail.com>
+#name : <meta http-equiv="..." content="..." />
+#group : meta
+# --
+<meta http-equiv="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/script.javascript b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/script.javascript
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/script.javascript
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/script.javascript
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/script.javascript-src b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/script.javascript-src
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/script.javascript-src
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/script.javascript-src
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/textarea b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/textarea
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/textarea
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/textarea
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/th b/emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/th
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/html-mode/th
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/html-mode/th
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/apr_assert b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/apr_assert
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/apr_assert
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/apr_assert
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/assert b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/assert
new file mode 100644
index 0000000..686ffea
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/assert
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: assert
+# key: as
+# --
+assert ${1:expression};
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/assertEquals b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/assertEquals
new file mode 100644
index 0000000..ce23dae
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/assertEquals
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: assertEquals
+# key: ae
+# group: test
+# --
+Assert.assertEquals($1, $2);
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/cls b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/cls
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/cls
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/cls
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/constructor b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/constructor
new file mode 100644
index 0000000..602e496
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/constructor
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: constructor
+# key: c
+# --
+public ${1:Class} (${2:args}) {
+       $0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/define test method b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/define test method
new file mode 100644
index 0000000..fd9daf6
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/define test method	
@@ -0,0 +1,8 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: define test method
+# key: dt
+# --
+@Test
+public void test${1:Name}() throws Exception {
+    $0
+}
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/doc b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/doc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/doc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/doc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/equals b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/equals
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/equals
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/equals
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/file_class b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/file_class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/file_class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/file_class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/fori b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/fori
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/fori
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/fori
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/getter b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/getter
new file mode 100644
index 0000000..747f9f4
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/getter
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: getter
+# key: g
+# --
+public ${1:int} get${2:Field}() {
+       return ${3:field};
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/ife b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/ife
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/ife
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/ife
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/import b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/import
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/import
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/import
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/iterator b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/iterator
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/iterator
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/iterator
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/javadoc b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/javadoc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/javadoc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/javadoc
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/lambda b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/lambda
new file mode 100644
index 0000000..a73a7a5
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/lambda
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: lambda
+# key: \
+# --
+(${1:args}) -> ${2:expression};
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/main
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/main
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/main
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/main_class b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/main_class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/main_class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/main_class
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/method b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/method
new file mode 100644
index 0000000..7a6b9ed
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/method
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: method
+# key: m
+# --
+${1:public} ${2:void} ${3:name}(${4:args}) {
+            $0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/new b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/new
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/new
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/new
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/override b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/override
new file mode 100644
index 0000000..9878c85
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/override
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: override
+# key: o
+# --
+@Override
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/param b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/param
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/param
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/param
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/printf b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/printf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/printf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/printf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/println b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/println
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/println
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/println
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/return b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/return
new file mode 100644
index 0000000..5712e0c
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/return
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: return
+# key: r
+# --
+return $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/test b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/test
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/test
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/test
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/testClass b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/testClass
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/testClass
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/testClass
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/this b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/this
new file mode 100644
index 0000000..45201b4
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/this
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: this
+# key: .
+# --
+this.$1 = $1;
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/toString b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/toString
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/toString
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/toString
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/try
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/java-mode/try
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/try
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/value b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/value
new file mode 100644
index 0000000..7ec38ef
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/java-mode/value
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: value
+# key: val
+# --
+final ${1:int} ${2:n} = $0;
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/al b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/al
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/al
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/al
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/class b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/com b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/com
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/com
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/com
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/debugger b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/debugger
new file mode 100644
index 0000000..09af6eb
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/debugger
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: debugger
+# key: dbg
+# --
+debugger;
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/each b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/each
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/each
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/each
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/el b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/el
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/el
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/el
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/ev.add b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/ev.add
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/ev.add
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/ev.add
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/ev.fire b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/ev.fire
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/ev.fire
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/ev.fire
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/for
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/function
new file mode 100644
index 0000000..96621b6
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/function
@@ -0,0 +1,7 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: function
+# key: f
+# --
+function ${1:name}(${2:arg}) {
+         $0
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/init b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/init
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/init
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/init
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/log b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/log
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/log
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/log
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/req.html b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/req.html
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/req.html
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/req.html
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/req.json b/emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/req.json
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/js-mode/req.json
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/js-mode/req.json
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/js2-mode b/emacs.d/elpa/yasnippet-20160104.129/snippets/js2-mode
new file mode 100755
index 0000000..e69de29
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/acronym b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/acronym
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/acronym
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/acronym
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/alertblock b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/alertblock
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/alertblock
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/alertblock
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/alg b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/alg
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/alg
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/alg
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/begin b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/begin
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/begin
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/begin
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/block b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/block
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/block
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/block
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/capgls b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/capgls
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/capgls
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/capgls
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/caption b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/caption
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/caption
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/caption
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/cite b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/cite
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/cite
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/cite
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/code b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/code
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/code
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/code
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/columns b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/columns
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/columns
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/columns
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/emph b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/emph
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/emph
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/emph
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/enumerate b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/enumerate
new file mode 100644
index 0000000..d49ce37
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/enumerate
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: enumerate
+# key: enum
+# --
+\begin{enumerate}
+\item $0
+\end{enumerate}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/figure b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/figure
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/figure
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/figure
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/frac b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/frac
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/frac
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/frac
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/frame b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/frame
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/frame
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/frame
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/gls b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/gls
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/gls
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/gls
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/glspl b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/glspl
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/glspl
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/glspl
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/includegraphics b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/includegraphics
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/includegraphics
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/includegraphics
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/item b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/item
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/item
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/item
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/itemize b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/itemize
new file mode 100644
index 0000000..09a848f
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/itemize
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: itemize
+# key: it
+# --
+\begin{itemize}
+\item $0
+\end{itemize}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/label b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/label
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/label
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/label
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/listing b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/listing
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/listing
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/listing
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/movie b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/movie
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/movie
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/movie
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/newcommand b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/newcommand
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/newcommand
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/newcommand
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/newglossaryentry b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/newglossaryentry
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/newglossaryentry
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/newglossaryentry
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/note b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/note
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/note
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/note
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/python b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/python
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/python
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/python
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/question b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/question
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/question
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/question
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/section b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/section
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/section
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/section
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/subf b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/subf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/subf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/subf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/subfigure b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/subfigure
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/subfigure
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/subfigure
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/subsec b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/subsec
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/subsec
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/subsec
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/textbf b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/textbf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/textbf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/textbf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/usepackage b/emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/usepackage
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/latex-mode/usepackage
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/latex-mode/usepackage
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/lisp-interaction-mode/defun b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-interaction-mode/defun
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/lisp-interaction-mode/defun
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-interaction-mode/defun
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/class b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/class
new file mode 100644
index 0000000..bc5eec9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/class
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: class
+# key: cls
+# --
+(defclass ${1:name} (${2:inherits})
+   (${4:slot})
+   (:documentation "${3:doc}"))
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/comment b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/comment
new file mode 100644
index 0000000..107fad9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/comment
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: comment
+# key: /*
+# --
+#|${1:type the comment here}|#
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/defpackage b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/defpackage
new file mode 100644
index 0000000..2e44ac2
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/defpackage
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: defpackage
+# key: defp
+# --
+(defpackage #:${1:name}
+   (:nicknames #:${2:nick})
+   (:use #:cl #:closer-mop #:${3:package})
+   (:shadow :${4.symbol})
+   (:shadowing-import-from #:${5:package} #:${6:symbol})
+   (:export :$0))
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/do b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/do
new file mode 100644
index 0000000..6f90064
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/do
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: do
+# key: do
+# --
+(do ((${1:var1} ${2:init-form} ${3:step-form})
+     (${4:var2} ${5:init-form} ${6:step-form}))  
+    (${7:condition} ${8:return-value})
+    (${9:body}))
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/for
new file mode 100644
index 0000000..de8f644
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/for
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: do
+# key: for
+# --
+(dotimes (${1:var} ${2:count-form})
+         ${3:body})
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/foreach b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/foreach
new file mode 100644
index 0000000..a993bf1
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/foreach
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: do
+# key: foreach
+# --
+(dolist (${1:var} ${2:list-form})
+        ${3:body})
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/format b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/format
new file mode 100644
index 0000000..d4f10ad
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/format
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: format
+# key: print
+# --
+(format t "~& $0 ~%")
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/if
new file mode 100644
index 0000000..cd57e3d
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/if
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: if
+# key: if
+# --
+(when (${1:condition})
+      (${2:then-do-this}))
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/ifelse b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/ifelse
new file mode 100644
index 0000000..91854d8
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/ifelse
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: ifelse (...) (...) (...) ...
+# key: ifelse
+# --
+
+(if (${1:condition})
+    (${2:then})
+    (${3:else}))
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/ifnot b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/ifnot
new file mode 100644
index 0000000..467636e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/ifnot
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: ifnot (...) (...)  ...
+# key: ifnot
+# --
+
+(unless (${1:condition})
+        (${2:then-do-this}))
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/slot b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/slot
new file mode 100644
index 0000000..2a51f64
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/slot
@@ -0,0 +1,13 @@
+# -*- mode: snippet -*-
+# name: slot
+# key: slot
+# --
+(${1:name} :initarg :${1:$(yas/substr yas-text "[^: ]*")}
+           :initform (error ":${1:$(yas/substr yas-text "[^: ]*")} must be specified")
+           ;; :accessor ${1:$(yas/substr yas-text "[^: ]*")}
+           :reader ${1:$(yas/substr yas-text "[^: ]*")}-changed
+           :writer set-${1:$(yas/substr yas-text "[^: ]*")}
+           :type
+           :allocation ${3::class :instance}
+           :documentation "${2:about-slot}")
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/switch b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/switch
new file mode 100644
index 0000000..6d002dd
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/switch
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: switch
+# key: switch
+# --
+
+(cond (${1:case1} (${2:do-this}))
+      (${3:case2} (${4:do-this}))     
+      (t ${5:default}))
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/typecast b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/typecast
new file mode 100644
index 0000000..4856e93
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/lisp-mode/typecast
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: typecast
+# name: cast
+# --
+(coerce ${1:object} ${2:type})
+$0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/lua-mode/fun b/emacs.d/elpa/yasnippet-20160104.129/snippets/lua-mode/fun
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/lua-mode/fun
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/lua-mode/fun
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/m4-mode/def b/emacs.d/elpa/yasnippet-20160104.129/snippets/m4-mode/def
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/m4-mode/def
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/m4-mode/def
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-automake-mode/noinst_HEADERS b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-automake-mode/noinst_HEADERS
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-automake-mode/noinst_HEADERS
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-automake-mode/noinst_HEADERS
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/PHONY b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/PHONY
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/PHONY
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/PHONY
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/echo b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/echo
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/echo
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/echo
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/gen b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/gen
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/gen
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/gen
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/var b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/var
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-bsdmake-mode/var
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-bsdmake-mode/var
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/abspath b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/abspath
new file mode 100644
index 0000000..e02c55c
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/abspath
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: abspath
+# contributor: gbalats
+# key: abs
+# --
+\$(abspath ${1:\$(${2:paths})})$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/addprefix b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/addprefix
new file mode 100644
index 0000000..2edc1e3
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/addprefix
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: addprefix
+# contributor: gbalats
+# key: ap
+# --
+\$(addprefix ${1:\$(${2:dir})/},${3:\$(${4:items})})$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/addsuffix b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/addsuffix
new file mode 100644
index 0000000..6a3ebe4
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/addsuffix
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: addsuffix
+# contributor: gbalats
+# key: as
+# --
+\$(addsuffix ${1:.suffix},${2:\$(${3:items})})$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/dir b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/dir
new file mode 100644
index 0000000..bc3561b
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/dir
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: dir
+# contributor: gbalats
+# key: d
+# --
+\$(dir ${1:\$(${2:paths})})$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/make b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/make
new file mode 100644
index 0000000..16c49ce
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/make
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: make
+# contributor: gbalats
+# key: make
+# --
+\$(MAKE) --directory=${1:\$@}
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/notdir b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/notdir
new file mode 100644
index 0000000..d5e82d5
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/notdir
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: notdir
+# contributor: gbalats
+# key: nd
+# --
+\$(notdir ${1:\$(${2:paths})})$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-gmake-mode/patsubst b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/patsubst
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-gmake-mode/patsubst
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/patsubst
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-gmake-mode/phony b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/phony
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-gmake-mode/phony
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/phony
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/shell b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/shell
new file mode 100644
index 0000000..b550475
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/shell
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: shell
+# key: sh
+# --
+\$(shell ${1:command})$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/special b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/special
new file mode 100644
index 0000000..775021f
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/special
@@ -0,0 +1,6 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: special targets
+# contributor: gbalats
+# key: .
+# --
+.${1:PHONY$(upcase yas-text)}: $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/template b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/template
new file mode 100644
index 0000000..285624d
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/template
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: template
+# contributor: gbalats
+# binding: C-c C-t
+# --
+define ${1:PROGRAM$(upcase yas-text)}_template
+$0
+endef
+
+\$(foreach ${2:${1:$(downcase yas-text)}},\$(${3:$1S}),\$(eval \$(call $1_template,\$($2))))
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-gmake-mode/wildcard b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/wildcard
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-gmake-mode/wildcard
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-gmake-mode/wildcard
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-mode/all b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-mode/all
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/makefile-mode/all
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-mode/all
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-mode/clean b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-mode/clean
new file mode 100644
index 0000000..7ade5eb
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/makefile-mode/clean
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: clean
+# contributor: gbalats
+# expand-env: ((yas-indent-line 'fixed))
+# key: cl
+# --
+clean:
+	${1:rm -r ${2:\$(${3:OUTDIR})}}
+$0
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/malabar-mode/variable b/emacs.d/elpa/yasnippet-20160104.129/snippets/malabar-mode/variable
new file mode 100644
index 0000000..16ec628
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/malabar-mode/variable
@@ -0,0 +1,5 @@
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: variable
+# key: var
+# --
+${1:int} ${2:n} = $0;
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/+ b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/+
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/+
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/+
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/- b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/-
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/-
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/-
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/_ b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/_
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/_
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/_
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/` b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/`
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/`
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/`
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h1.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h1.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h1.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h1.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h1.2 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h1.2
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h1.2
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h1.2
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h2.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h2.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h2.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h2.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h2.2 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h2.2
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h2.2
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h2.2
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h3 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h3
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h3
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h3
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h4 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h4
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h4
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h4
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h5 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h5
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h5
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h5
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h6 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h6
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/h6
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/h6
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/highlight b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/highlight
new file mode 100644
index 0000000..f1bce71
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/highlight
@@ -0,0 +1,6 @@
+#name : Highlight
+#contributor: nguyenvinhlinh <nguyenvinhlinh93@gmail.com>
+# --
+{% highlight ${1:language} %}
+${0:content}
+{% endhighlight %}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/hr.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/hr.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/hr.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/hr.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/hr.2 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/hr.2
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/hr.2
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/hr.2
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/img b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/img
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/img
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/img
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/link b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/link
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/link
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/link
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/ol b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/ol
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/ol
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/ol
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/rimg b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/rimg
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/rimg
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/rimg
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/rlb b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/rlb
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/rlb
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/rlb
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/rlink b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/rlink
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/rlink
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/rlink
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/utf8 b/emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/utf8
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/markdown-mode/utf8
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/markdown-mode/utf8
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/chan b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/chan
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/chan
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/chan
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/connections b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/connections
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/connections
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/connections
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/import b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/import
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/import
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/import
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/network b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/network
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/network
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/network
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/simple b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/simple
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/simple
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/simple
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/submodules b/emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/submodules
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ned-mode/submodules
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ned-mode/submodules
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/TOSSIM b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/TOSSIM
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/TOSSIM
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/TOSSIM
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/command b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/command
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/command
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/command
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/dbg b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/dbg
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/dbg
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/dbg
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/event b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/event
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/event
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/event
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/ifdef b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/ifdef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/ifdef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/ifdef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/interface b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/interface
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/interface
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/interface
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/module b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/module
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/module
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/module
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/nx b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/nx
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/nx
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/nx
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/provides b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/provides
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/provides
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/provides
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/sim b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/sim
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/sim
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/sim
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/uint8_t b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/uint8_t
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/uint8_t
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/uint8_t
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/uses b/emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/uses
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nesc-mode/uses
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nesc-mode/uses
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/define b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/define
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/define
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/define
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/include b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/include
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/include
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/include
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/insert_macro b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/insert_macro
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/insert_macro
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/insert_macro
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/instdir b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/instdir
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/instdir
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/instdir
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/macro b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/macro
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/macro
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/macro
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/message b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/message
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/message
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/message
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/outdir b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/outdir
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/outdir
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/outdir
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/outfile b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/outfile
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/outfile
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/outfile
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/section b/emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/section
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nsis-mode/section
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nsis-mode/section
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/body b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/body
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/body
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/body
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/br b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/br
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/br
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/br
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/doctype b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/doctype
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/doctype
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/doctype
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/doctype_xhtml1_strict b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/doctype_xhtml1_strict
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/doctype_xhtml1_strict
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/doctype_xhtml1_strict
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/doctype_xhtml1_transitional b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/doctype_xhtml1_transitional
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/doctype_xhtml1_transitional
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/doctype_xhtml1_transitional
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/form b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/form
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/form
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/form
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/href b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/href
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/href
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/href
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/html b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/html
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/html
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/html
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/img b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/img
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/img
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/img
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/input b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/input
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/input
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/input
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/link b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/link
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/link
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/link
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/meta b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/meta
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/meta
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/meta
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/name b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/name
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/name
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/name
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/quote b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/quote
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/quote
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/quote
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/style b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/style
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/style
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/style
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/tag b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/tag
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/tag
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/tag
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/tag_closing b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/tag_closing
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/tag_closing
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/tag_closing
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/tag_newline b/emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/tag_newline
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/nxml-mode/tag_newline
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/nxml-mode/tag_newline
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/octave-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/octave-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/octave-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/octave-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/octave-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/octave-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/octave-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/octave-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/octave-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/octave-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/octave-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/octave-mode/if
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/code b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/code
new file mode 100644
index 0000000..89a94ff
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/code
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: code
+# key: code_
+# --
+#+begin_${1:lang} ${2:options}
+$0
+#+end_$1
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/dot b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/dot
new file mode 100644
index 0000000..e9e76a1
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/dot
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: dot
+# key: dot_
+# --
+#+begin_src dot :file ${1:file} :cmdline -T${2:pdf} :exports none :results silent
+            $0
+#+end_src
+
+[[file:$1]]
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/elisp b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/elisp
new file mode 100644
index 0000000..c96251e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/elisp
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: elisp
+# key: elisp_
+# --
+#+begin_src emacs-lisp :tangle yes
+$0
+#+end_src
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/embedded b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/embedded
new file mode 100644
index 0000000..5e74820
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/embedded
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: embedded
+# key: emb_
+# --
+src_${1:lang}${2:[${3:where}]}{${4:code}}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/entry b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/entry
new file mode 100644
index 0000000..51d680a
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/entry
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# name: entry
+# key: entry_
+# --
+#+begin_html
+---
+layout: ${1:default}
+title: ${2:title}
+---
+#+end_html
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/figure b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/figure
new file mode 100644
index 0000000..6c01df8
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/figure
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: figure
+# key: fig_
+# --
+#+CAPTION: ${1:caption}
+#+ATTR_LaTeX: ${2:scale=0.75}
+#+LABEL: fig:${3:label}
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/img b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/img
new file mode 100644
index 0000000..9da54ba
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/img
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: img
+# key: img_
+# --
+<img src="$1"
+ alt="$2" align="${3:left}"
+ title="${4:image title}"
+ class="img"
+</img>
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/latex b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/latex
new file mode 100644
index 0000000..66541c2
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/latex
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: latex
+# key: latex_
+# --
+#+BEGIN_LaTeX
+$0
+#+END_LaTeX
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/matrix b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/matrix
new file mode 100644
index 0000000..01f28c0
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/matrix
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# name: matrix
+# key: matrix_
+# possible improvement, compute the number of lines from the argument to array
+# --
+\left \(
+\begin{array}{${1:ccc}}
+${2:v1 & v2} \\
+$0
+\end{array}
+\right \)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/verse b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/verse
new file mode 100644
index 0000000..02c691e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/org-mode/verse
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: verse
+# key: verse_
+# --
+#+begin_verse
+        $0
+#+end_verse
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/eval b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/eval
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/eval
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/eval
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/fore b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/fore
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/fore
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/fore
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/ife b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/ife
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/ife
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/ife
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/ifee b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/ifee
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/ifee
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/ifee
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/sub b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/sub
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/sub
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/sub
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/unless b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/unless
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/unless
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/unless
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/while
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xfore b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xfore
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xfore
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xfore
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xif b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xif
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xif
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xif
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xunless b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xunless
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xunless
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xunless
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xwhile b/emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xwhile
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/perl-mode/xwhile
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/perl-mode/xwhile
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/.yas-setup.el b/emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/.yas-setup.el
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/.yas-setup.el
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/.yas-setup.el
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/fixme b/emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/fixme
new file mode 100644
index 0000000..146db8b
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/fixme
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: fixme
+# key: fi
+# condition: (not (eq major-mode 'sh-mode))
+# --
+`(yas-with-comment "FIXME: ")`
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/todo b/emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/todo
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/todo
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/todo
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/xxx b/emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/xxx
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/prog-mode/xxx
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/prog-mode/xxx
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/.yas-parents
new file mode 100644
index 0000000..75d003f
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/.yas-parents
@@ -0,0 +1 @@
+prog-mode
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/.yas-setup.el b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/.yas-setup.el
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/.yas-setup.el
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/.yas-setup.el
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__contains__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__contains__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__contains__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__contains__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__enter__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__enter__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__enter__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__enter__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__exit__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__exit__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__exit__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__exit__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__getitem__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__getitem__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__getitem__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__getitem__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__len__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__len__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__len__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__len__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__new__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__new__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__new__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__new__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__setitem__ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__setitem__
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/__setitem__
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/__setitem__
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/all b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/all
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/all
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/all
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/arg b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/arg
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/arg
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/arg
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/arg_positional b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/arg_positional
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/arg_positional
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/arg_positional
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ass b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ass
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ass
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ass
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertEqual b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertEqual
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertEqual
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertEqual
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertFalse b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertFalse
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertFalse
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertFalse
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertIn b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertIn
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertIn
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertIn
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertNotEqual b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertNotEqual
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertNotEqual
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertNotEqual
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assetNotIn b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertNotIn
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assetNotIn
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertNotIn
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertRaises b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertRaises
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertRaises
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertRaises
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertRaises.with b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertRaises.with
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertRaises.with
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertRaises.with
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertTrue b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertTrue
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/assertTrue
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/assertTrue
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/celery_pdb b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/celery_pdb
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/celery_pdb
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/celery_pdb
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/classmethod b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/classmethod
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/classmethod
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/classmethod
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/cls b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/cls
new file mode 100644
index 0000000..f857cdb
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/cls
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: class
+# key: cls
+# group: object oriented
+# --
+class ${1:class}:
+    $0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/dec b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/dec
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/dec
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/dec
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/deftest b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/deftest
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/deftest
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/deftest
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/django_test_class b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/django_test_class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/django_test_class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/django_test_class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/doc b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/doc
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/doc
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/doc
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/doctest b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/doctest
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/doctest
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/doctest
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/eq b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/eq
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/eq
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/eq
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/from b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/from
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/from
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/from
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/function_docstring b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/function_docstring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/function_docstring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/function_docstring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ife b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ife
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ife
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ife
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ifmain b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ifmain
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ifmain
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ifmain
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/import b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/import
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/import
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/import
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/init b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/init
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/init
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/init
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/init_docstring b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/init_docstring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/init_docstring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/init_docstring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/interact b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/interact
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/interact
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/interact
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ipdbdebug b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ipdbdebug
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/ipdbdebug
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/ipdbdebug
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/iter b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/iter
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/iter
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/iter
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/lambda b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/lambda
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/lambda
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/lambda
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/list b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/list
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/list
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/list
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/logger_name b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/logger_name
new file mode 100644
index 0000000..9759dd9
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/logger_name
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: logger_name
+# key: ln
+# --
+logger = logging.getLogger(${1:__name__})
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/logging b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/logging
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/logging
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/logging
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/main
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/main
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/main
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/metaclass b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/metaclass
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/metaclass
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/metaclass
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/method b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/method
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/method
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/method
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/method_docstring b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/method_docstring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/method_docstring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/method_docstring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/not_impl b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/not_impl
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/not_impl
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/not_impl
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/np b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/np
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/np
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/np
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/parse_args b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/parse_args
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/parse_args
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/parse_args
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/parser b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/parser
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/parser
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/parser
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/pass b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/pass
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/pass
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/pass
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/pl b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/pl
new file mode 100644
index 0000000..29d905c
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/pl
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: Import pyplot
+# key: pl
+# group : general
+# --
+import matplotlib.pyplot as pl
+$0
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/print b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/print
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/print
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/print
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/prop b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/prop
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/prop
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/prop
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/reg b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/reg
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/reg
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/reg
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/repr b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/repr
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/repr
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/repr
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/return b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/return
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/return
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/return
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/script b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/script
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/script
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/script
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/self b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/self
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/self
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/self
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/self_without_dot b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/self_without_dot
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/self_without_dot
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/self_without_dot
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/selfassign b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/selfassign
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/selfassign
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/selfassign
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/setdef b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/setdef
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/setdef
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/setdef
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/setup b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/setup
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/setup
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/setup
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/size b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/size
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/size
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/size
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/static b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/static
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/static
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/static
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/str b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/str
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/str
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/str
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/super b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/super
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/super
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/super
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/test_class b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/test_class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/test_class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/test_class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/test_file b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/test_file
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/test_file
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/test_file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/trace b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/trace
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/trace
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/trace
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/try
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/try
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/try
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/tryelse b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/tryelse
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/tryelse
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/tryelse
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/unicode b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/unicode
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/unicode
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/unicode
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/utf8 b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/utf8
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/utf8
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/utf8
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/while
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/with b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/with
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/with
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/with
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/with_statement b/emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/with_statement
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/python-mode/with_statement
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/python-mode/with_statement
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rename_add_contr.py b/emacs.d/elpa/yasnippet-20160104.129/snippets/rename_add_contr.py
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rename_add_contr.py
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rename_add_contr.py
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/autoclass b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/autoclass
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/autoclass
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/autoclass
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/autofunction b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/autofunction
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/autofunction
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/autofunction
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/automodule b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/automodule
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/automodule
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/automodule
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/class b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/code b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/code
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/code
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/code
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/digraph b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/digraph
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/digraph
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/digraph
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/graph b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/graph
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/graph
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/graph
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/graphviz b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/graphviz
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/graphviz
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/graphviz
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/image b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/image
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/image
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/image
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/inheritance b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/inheritance
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/inheritance
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/inheritance
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/literal_include b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/literal_include
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/literal_include
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/literal_include
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/meta b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/meta
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/meta
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/meta
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/module b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/module
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/module
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/module
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/parsed_literal b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/parsed_literal
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/parsed_literal
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/parsed_literal
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/pause b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/pause
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/pause
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/pause
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/term b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/term
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/term
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/term
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/url b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/url
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/url
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/url
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/verbatim b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/verbatim
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/verbatim
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/verbatim
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/warning b/emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/warning
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/rst-mode/warning
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/rst-mode/warning
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/# b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/#
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/#
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/#
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/=b b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/=b
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/=b
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/=b
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/Comp b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/Comp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/Comp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/Comp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/GLOB b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/GLOB
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/GLOB
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/GLOB
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/all b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/all
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/all
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/all
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/am b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/am
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/am
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/am
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/any b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/any
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/any
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/any
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/app b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/app
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/app
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/app
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/attribute b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/attribute
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/attribute
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/attribute
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/bench b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/bench
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/bench
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/bench
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/bm b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/bm
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/bm
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/bm
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/case b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/case
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/case
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/case
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/cla b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/cla
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/cla
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/cla
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/cls b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/cls
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/cls
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/cls
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/collect b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/collect
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/collect
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/collect
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/dee b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/dee
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/dee
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/dee
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/def b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/def
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/def
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/def
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/deli b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/deli
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/deli
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/deli
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/det b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/det
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/det
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/det
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/dow b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/dow
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/dow
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/dow
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/ea b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/ea
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/ea
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/ea
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eac b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eac
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eac
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eac
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eai b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eai
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eai
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eai
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eav b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eav
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eav
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eav
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eawi b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eawi
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/eawi
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/eawi
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/forin b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/forin
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/forin
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/forin
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/formula b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/formula
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/formula
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/formula
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/ife b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/ife
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/ife
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/ife
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/init b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/init
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/init
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/init
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/inject b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/inject
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/inject
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/inject
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/map b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/map
new file mode 100644
index 0000000..dbe4dbc
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/map
@@ -0,0 +1,4 @@
+#name : map { |...| ... }
+#group : collections
+# --
+map { |${e}| $0 }
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/mm b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/mm
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/mm
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/mm
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/r b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/r
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/r
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/r
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/rb b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/rb
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/rb
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/rb
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/red b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/red
new file mode 100644
index 0000000..6318e0b
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/red
@@ -0,0 +1,4 @@
+#name : reduce(...) { |...| ... }
+#group : collections
+# --
+reduce(${1:0}) { |${2:accumulator}, ${3:element}| $0 }
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/reject b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/reject
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/reject
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/reject
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/rel b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/rel
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/rel
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/rel
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/req b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/req
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/req
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/req
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/rw b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/rw
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/rw
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/rw
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/select b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/select
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/select
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/select
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/str b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/str
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/str
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/str
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/test class b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/test class
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/test class
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/test class
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/tim b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/tim
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/tim
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/tim
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/to_ b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/to_
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/to_
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/to_
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/tu b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/tu
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/tu
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/tu
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/until b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/until
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/until
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/until
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/upt b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/upt
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/upt
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/upt
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/w b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/w
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/w
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/w
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/when b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/when
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/when
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/when
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/while
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/y b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/y
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/y
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/y
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/zip b/emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/zip
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/ruby-mode/zip
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/ruby-mode/zip
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/app b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/app
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/app
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/app
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/case b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/case
new file mode 100644
index 0000000..b16dcae
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/case
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+#Author : Jonas Bonèr <jonas@jonasboner.com>
+#name : case pattern => 
+# key: case
+# --
+case ${1:_} => $0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/cc b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/cc
new file mode 100644
index 0000000..3eedbc7
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/cc
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+#Author : Sam Halliday
+#name : case class T(arg: A)
+# key: cc
+# --
+case class ${1:Name}(
+  ${2:arg}: ${3:Type}
+)
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/co b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/co
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/co
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/co
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cons b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/cons
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/cons
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/cons
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-ret-body b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/def
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/def.arg-ret-body
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/def
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/doc b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/doc
new file mode 100644
index 0000000..60b5007
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/doc
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+#Author : Anders Bach Nielsen <andersbach.nielsen@epfl.ch>
+#name : /** ... */
+# key: doc
+# --
+/**
+ * ${1:description}
+ * $0
+ */
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/for
new file mode 100644
index 0000000..44a4253
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/for
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+#Author : Sam Halliday
+#name : for { x <- xs } yield
+#key: for
+# --
+for {
+  ${1:x} <- ${2:xs}
+} yield ${3:x}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ls.new b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/ls
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ls.new
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/ls
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/main
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/main
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/main
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/match
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/match
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/match
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ob b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/ob
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/ob
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/ob
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/throw b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/throw
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/scala-mode/throw
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/throw
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/try
new file mode 100644
index 0000000..d0c8d04
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/scala-mode/try
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+#Author : Sam Halliday
+#name : try { .. } catch { case e => ..}
+# key: try
+# --
+try {
+  $0
+} catch {
+  case e: ${1:Throwable} => 
+    ${2:// TODO: handle exception}
+}
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/args b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/args
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/args
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/args
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/bang b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/bang
new file mode 100644
index 0000000..5e11f0e
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/bang
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: bang
+# key: !
+# --
+#!/usr/bin/env bash
+$0
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/for loop b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/for loop
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/for loop
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/for loop
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/function b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/function
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/function
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/function
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/if b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/if
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/if
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/if
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/ife b/emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/ife
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sh-mode/ife
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sh-mode/ife
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/cont b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/cont
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/cont
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/cont
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/elisp b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/elisp
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/elisp
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/elisp
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/field b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/field
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/field
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/field
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/group b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/group
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/group
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/group
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/mirror b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/mirror
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/mirror
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/mirror
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/vars b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/vars
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/snippet-mode/vars
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/snippet-mode/vars
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/snippets/ruby-mode/definitions/mod b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippets/ruby-mode/definitions/mod
new file mode 100644
index 0000000..118400c
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/snippets/snippets/ruby-mode/definitions/mod
@@ -0,0 +1,13 @@
+# name: module ... end
+# contributor: hitesh <hitesh.jasani@gmail.com>, jimeh <contact@jimeh.me>
+# key: mod
+# --
+module ${1:`(let ((fn (capitalize (file-name-nondirectory
+                                 (file-name-sans-extension
+         (or (buffer-file-name)
+             (buffer-name (current-buffer))))))))
+           (cond
+             ((string-match "_" fn) (replace-match "" nil nil fn))
+              (t fn)))`}
+  $0
+end
\ No newline at end of file
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/column b/emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/column
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/column
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/column
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/constraint b/emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/constraint
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/constraint
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/constraint
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/constraint.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/constraint.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/constraint.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/constraint.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/create b/emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/create
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/create
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/create
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/create.1 b/emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/create.1
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/create.1
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/create.1
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/references b/emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/references
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/sql-mode/references
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/sql-mode/references
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/text-mode/.yas-parents b/emacs.d/elpa/yasnippet-20160104.129/snippets/text-mode/.yas-parents
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/text-mode/.yas-parents
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/text-mode/.yas-parents
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/assert b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/assert
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/assert
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/assert
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/docstring b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/docstring
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/docstring
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/docstring
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/for b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/for
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/for
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/for
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/fun b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/fun
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/fun
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/fun
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/guard b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/guard
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/guard
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/guard
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/ifthen b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/ifthen
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/ifthen
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/ifthen
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/ifthenelse b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/ifthenelse
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/ifthenelse
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/ifthenelse
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/let b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/let
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/let
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/let
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/list_comprehension b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/list_comprehension
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/list_comprehension
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/list_comprehension
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/main b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/main
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/main
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/main
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/match b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/match
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/match
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/match
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/module b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/module
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/module
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/module
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/open b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/open
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/open
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/open
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/printf b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/printf
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/printf
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/printf
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/rec b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/rec
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/rec
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/rec
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/try b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/try
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/try
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/try
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/type b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/type
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/type
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/type
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/type_type b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/type_type
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/type_type
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/type_type
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/val b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/val
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/val
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/val
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/while b/emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/while
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/tuareg-mode/while
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/tuareg-mode/while
diff --git a/emacs.d/elpa/yasnippet-20160104.129/snippets/typerex-mode b/emacs.d/elpa/yasnippet-20160104.129/snippets/typerex-mode
new file mode 100755
index 0000000..e69de29
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/ENV b/emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/ENV
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/ENV
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/ENV
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/GOTO b/emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/GOTO
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/GOTO
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/GOTO
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/KERNEL b/emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/KERNEL
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/KERNEL
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/KERNEL
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/add b/emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/add
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/add
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/add
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/env$ b/emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/env$
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/env$
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/env$
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/run b/emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/run
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/udev-mode/run
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/udev-mode/run
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/yaml-mode/entry b/emacs.d/elpa/yasnippet-20160104.129/snippets/yaml-mode/entry
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/yaml-mode/entry
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/yaml-mode/entry
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/yaml-mode/list b/emacs.d/elpa/yasnippet-20160104.129/snippets/yaml-mode/list
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/yaml-mode/list
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/yaml-mode/list
diff --git a/emacs.d/elpa/yasnippet-20150415.244/snippets/yaml-mode/section b/emacs.d/elpa/yasnippet-20160104.129/snippets/yaml-mode/section
similarity index 100%
rename from emacs.d/elpa/yasnippet-20150415.244/snippets/yaml-mode/section
rename to emacs.d/elpa/yasnippet-20160104.129/snippets/yaml-mode/section
diff --git a/emacs.d/elpa/yasnippet-20160104.129/yasnippet-autoloads.el b/emacs.d/elpa/yasnippet-20160104.129/yasnippet-autoloads.el
new file mode 100644
index 0000000..127aca6
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/yasnippet-autoloads.el
@@ -0,0 +1,58 @@
+;;; yasnippet-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
+
+;;;### (autoloads nil "yasnippet" "yasnippet.el" (22171 46539 0 0))
+;;; Generated autoloads from yasnippet.el
+
+(autoload 'yas-minor-mode "yasnippet" "\
+Toggle YASnippet mode.
+
+When YASnippet mode is enabled, `yas-expand', normally bound to
+the TAB key, expands snippets of code depending on the major
+mode.
+
+With no argument, this command toggles the mode.
+positive prefix argument turns on the mode.
+Negative prefix argument turns off the mode.
+
+Key bindings:
+\\{yas-minor-mode-map}
+
+\(fn &optional ARG)" t nil)
+
+(defvar yas-global-mode nil "\
+Non-nil if Yas-Global mode is enabled.
+See the command `yas-global-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `yas-global-mode'.")
+
+(custom-autoload 'yas-global-mode "yasnippet" nil)
+
+(autoload 'yas-global-mode "yasnippet" "\
+Toggle Yas minor mode in all buffers.
+With prefix ARG, enable Yas-Global mode if ARG is positive;
+otherwise, disable it.  If called from Lisp, enable the mode if
+ARG is omitted or nil.
+
+Yas minor mode is enabled in all buffers where
+`yas-minor-mode-on' would do it.
+See `yas-minor-mode' for more information on Yas minor mode.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("yasnippet-pkg.el") (22171 46539 450937
+;;;;;;  0))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; yasnippet-autoloads.el ends here
diff --git a/emacs.d/elpa/yasnippet-20160104.129/yasnippet-pkg.el b/emacs.d/elpa/yasnippet-20160104.129/yasnippet-pkg.el
new file mode 100644
index 0000000..c7513ae
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/yasnippet-pkg.el
@@ -0,0 +1,5 @@
+(define-package "yasnippet" "20160104.129" "Yet another snippet extension for Emacs." 'nil :url "http://github.com/capitaomorte/yasnippet" :keywords
+  '("convenience" "emulation"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs.d/elpa/yasnippet-20160104.129/yasnippet.el b/emacs.d/elpa/yasnippet-20160104.129/yasnippet.el
new file mode 100644
index 0000000..98cec83
--- /dev/null
+++ b/emacs.d/elpa/yasnippet-20160104.129/yasnippet.el
@@ -0,0 +1,4583 @@
+;;; yasnippet.el --- Yet another snippet extension for Emacs.
+
+;; Copyright (C) 2008-2013, 2015 Free Software Foundation, Inc.
+;; Authors: pluskid <pluskid@gmail.com>,  João Távora <joaotavora@gmail.com>, Noam Postavsky <npostavs@gmail.com>
+;; Maintainer: Noam Postavsky <npostavs@gmail.com>
+;; Version: 0.8.1
+;; Package-version: 0.8.0
+;; X-URL: http://github.com/capitaomorte/yasnippet
+;; Keywords: convenience, emulation
+;; URL: http://github.com/capitaomorte/yasnippet
+;; EmacsWiki: YaSnippetMode
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;;   Basic steps to setup:
+;;
+;;    (add-to-list 'load-path
+;;                 "~/path-to-yasnippet")
+;;    (require 'yasnippet)
+;;    (yas-global-mode 1)
+;;
+;;
+;;   Interesting variables are:
+;;
+;;       `yas-snippet-dirs'
+;;
+;;           The directory where user-created snippets are to be
+;;           stored.  Can also be a list of directories.  In that case,
+;;           when used for bulk (re)loading of snippets (at startup or
+;;           via `yas-reload-all'), directories appearing earlier in
+;;           the list override other dir's snippets.  Also, the first
+;;           directory is taken as the default for storing the user's
+;;           new snippets.
+;;
+;;           The deprecated `yas/root-directory' aliases this variable
+;;           for backward-compatibility.
+;;
+;;
+;;   Major commands are:
+;;
+;;       M-x yas-expand
+;;
+;;           Try to expand snippets before point.  In `yas-minor-mode',
+;;           this is normally bound to TAB, but you can customize it in
+;;           `yas-minor-mode-map'.
+;;
+;;       M-x yas-load-directory
+;;
+;;           Prompts you for a directory hierarchy of snippets to load.
+;;
+;;       M-x yas-activate-extra-mode
+;;
+;;           Prompts you for an extra mode to add snippets for in the
+;;           current buffer.
+;;
+;;       M-x yas-insert-snippet
+;;
+;;           Prompts you for possible snippet expansion if that is
+;;           possible according to buffer-local and snippet-local
+;;           expansion conditions.  With prefix argument, ignore these
+;;           conditions.
+;;
+;;       M-x yas-visit-snippet-file
+;;
+;;           Prompts you for possible snippet expansions like
+;;           `yas-insert-snippet', but instead of expanding it, takes
+;;           you directly to the snippet definition's file, if it
+;;           exists.
+;;
+;;       M-x yas-new-snippet
+;;
+;;           Lets you create a new snippet file in the correct
+;;           subdirectory of `yas-snippet-dirs', according to the
+;;           active major mode.
+;;
+;;       M-x yas-load-snippet-buffer
+;;
+;;           When editing a snippet, this loads the snippet.  This is
+;;           bound to "C-c C-c" while in the `snippet-mode' editing
+;;           mode.
+;;
+;;       M-x yas-tryout-snippet
+;;
+;;           When editing a snippet, this opens a new empty buffer,
+;;           sets it to the appropriate major mode and inserts the
+;;           snippet there, so you can see what it looks like.  This is
+;;           bound to "C-c C-t" while in `snippet-mode'.
+;;
+;;       M-x yas-describe-tables
+;;
+;;           Lists known snippets in a separate buffer.  User is
+;;           prompted as to whether only the currently active tables
+;;           are to be displayed, or all the tables for all major
+;;           modes.
+;;
+;;   If you have `dropdown-list' installed, you can optionally use it
+;;   as the preferred "prompting method", putting in your .emacs file,
+;;   for example:
+;;
+;;       (require 'dropdown-list)
+;;       (setq yas-prompt-functions '(yas-dropdown-prompt
+;;                                    yas-ido-prompt
+;;                                    yas-completing-prompt))
+;;
+;;   Also check out the customization group
+;;
+;;        M-x customize-group RET yasnippet RET
+;;
+;;   If you use the customization group to set variables
+;;   `yas-snippet-dirs' or `yas-global-mode', make sure the path to
+;;   "yasnippet.el" is present in the `load-path' *before* the
+;;   `custom-set-variables' is executed in your .emacs file.
+;;
+;;   For more information and detailed usage, refer to the project page:
+;;      http://github.com/capitaomorte/yasnippet
+
+;;; Code:
+
+(require 'cl)
+(require 'cl-lib)
+(require 'easymenu)
+(require 'help-mode)
+
+(defvar yas--editing-template)
+(defvar yas--guessed-modes)
+(defvar yas--indent-original-column)
+(defvar yas--scheduled-jit-loads)
+(defvar yas-keymap)
+(defvar yas-selected-text)
+(defvar yas-verbosity)
+(defvar yas--current-template)
+
+
+;;; User customizable variables
+
+(defgroup yasnippet nil
+  "Yet Another Snippet extension"
+  :prefix "yas-"
+  :group 'editing)
+
+(defvar yas-installed-snippets-dir nil)
+(setq yas-installed-snippets-dir
+      (when load-file-name
+        (concat (file-name-directory load-file-name) "snippets")))
+
+(defconst yas--default-user-snippets-dir
+  (concat user-emacs-directory "snippets"))
+
+(defcustom yas-snippet-dirs (remove nil
+                                    (list yas--default-user-snippets-dir
+                                          'yas-installed-snippets-dir))
+  "List of top-level snippet directories.
+
+Each element, a string or a symbol whose value is a string,
+designates a top-level directory where per-mode snippet
+directories can be found.
+
+Elements appearing earlier in the list override later elements'
+snippets.
+
+The first directory is taken as the default for storing snippet's
+created with `yas-new-snippet'. "
+  :type '(choice (string :tag "Single directory (string)")
+                 (repeat :args (string) :tag "List of directories (strings)"))
+  :group 'yasnippet
+  :require 'yasnippet
+  :set #'(lambda (symbol new)
+           (let ((old (and (boundp symbol)
+                           (symbol-value symbol))))
+             (set-default symbol new)
+             (unless (or (not (fboundp 'yas-reload-all))
+                         (equal old new))
+               (yas-reload-all)))))
+
+(defun yas-snippet-dirs ()
+  "Return variable `yas-snippet-dirs' as list of strings."
+  (cl-loop for e in (if (listp yas-snippet-dirs)
+                        yas-snippet-dirs
+                      (list yas-snippet-dirs))
+           collect
+           (cond ((stringp e) e)
+                 ((and (symbolp e)
+                       (boundp e)
+                       (stringp (symbol-value e)))
+                  (symbol-value e))
+                 (t
+                  (error "[yas] invalid element %s in `yas-snippet-dirs'" e)))))
+
+(defvaralias 'yas/root-directory 'yas-snippet-dirs)
+
+(defcustom yas-new-snippet-default "\
+# -*- mode: snippet; require-final-newline: nil -*-
+# name: $1
+# key: ${2:${1:$(yas--key-from-desc yas-text)}}${3:
+# binding: ${4:direct-keybinding}}
+# --
+$0"
+  "Default snippet to use when creating a new snippet.
+If nil, don't use any snippet."
+  :type 'string
+  :group 'yasnippet)
+
+(defcustom yas-prompt-functions '(yas-x-prompt
+                                  yas-dropdown-prompt
+                                  yas-completing-prompt
+                                  yas-maybe-ido-prompt
+                                  yas-no-prompt)
+  "Functions to prompt for keys, templates, etc interactively.
+
+These functions are called with the following arguments:
+
+- PROMPT: A string to prompt the user
+
+- CHOICES: a list of strings or objects.
+
+- optional DISPLAY-FN : A function that, when applied to each of
+the objects in CHOICES will return a string.
+
+The return value of any function you put here should be one of
+the objects in CHOICES, properly formatted with DISPLAY-FN (if
+that is passed).
+
+- To signal that your particular style of prompting is
+unavailable at the moment, you can also have the function return
+nil.
+
+- To signal that the user quit the prompting process, you can
+signal `quit' with
+
+  (signal 'quit \"user quit!\")."
+  :type '(repeat function)
+  :group 'yasnippet)
+
+(defcustom yas-indent-line 'auto
+  "Controls indenting applied to a recent snippet expansion.
+
+The following values are possible:
+
+- `fixed' Indent the snippet to the current column;
+
+- `auto' Indent each line of the snippet with `indent-according-to-mode'
+
+Every other value means don't apply any snippet-side indentation
+after expansion (the manual per-line \"$>\" indentation still
+applies)."
+  :type '(choice (const :tag "Nothing"  nothing)
+                 (const :tag "Fixed"    fixed)
+                 (const :tag "Auto"     auto))
+  :group 'yasnippet)
+
+(defcustom yas-also-auto-indent-first-line nil
+  "Non-nil means also auto indent first line according to mode.
+
+Naturally this is only valid when `yas-indent-line' is `auto'"
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-snippet-revival t
+  "Non-nil means re-activate snippet fields after undo/redo."
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-triggers-in-field nil
+  "If non-nil, allow stacked expansions (snippets inside snippets).
+
+Otherwise `yas-next-field-or-maybe-expand' just moves on to the
+next field"
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-fallback-behavior 'call-other-command
+  "How to act when `yas-expand' does *not* expand a snippet.
+
+- `call-other-command' means try to temporarily disable YASnippet
+    and call the next command bound to whatever key was used to
+    invoke `yas-expand'.
+
+- nil or the symbol `return-nil' mean do nothing. (and
+  `yas-expand' returns nil)
+
+- A Lisp form (apply COMMAND . ARGS) means interactively call
+  COMMAND. If ARGS is non-nil, call COMMAND non-interactively
+  with ARGS as arguments."
+  :type '(choice (const :tag "Call previous command"  call-other-command)
+                 (const :tag "Do nothing"             return-nil))
+  :group 'yasnippet)
+
+(defcustom yas-choose-keys-first nil
+  "If non-nil, prompt for snippet key first, then for template.
+
+Otherwise prompts for all possible snippet names.
+
+This affects `yas-insert-snippet' and `yas-visit-snippet-file'."
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-choose-tables-first nil
+  "If non-nil, and multiple eligible snippet tables, prompts user for tables first.
+
+Otherwise, user chooses between the merging together of all
+eligible tables.
+
+This affects `yas-insert-snippet', `yas-visit-snippet-file'"
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-use-menu 'abbreviate
+  "Display a YASnippet menu in the menu bar.
+
+When non-nil, submenus for each snippet table will be listed
+under the menu \"Yasnippet\".
+
+- If set to `abbreviate', only the current major-mode
+menu and the modes set in `yas--extra-modes' are listed.
+
+- If set to `full', every submenu is listed
+
+- If set to `nil', hide the menu.
+
+Any other non-nil value, every submenu is listed."
+  :type '(choice (const :tag "Full"  full)
+                 (const :tag "Abbreviate" abbreviate)
+                 (const :tag "No menu" nil))
+  :group 'yasnippet)
+
+(defcustom yas-trigger-symbol (or (and (eq window-system 'mac)
+                                       (ignore-errors
+                                         (char-to-string ?\x21E5))) ;; little ->| sign
+                                  " =>")
+  "The text that will be used in menu to represent the trigger."
+  :type 'string
+  :group 'yasnippet)
+
+(defcustom yas-wrap-around-region nil
+  "If non-nil, snippet expansion wraps around selected region.
+
+The wrapping occurs just before the snippet's exit marker.  This
+can be overridden on a per-snippet basis."
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-good-grace t
+  "If non-nil, don't raise errors in inline elisp evaluation.
+
+An error string \"[yas] error\" is returned instead."
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-visit-from-menu nil
+  "If non-nil visit snippets's files from menu, instead of expanding them.
+
+This can only work when snippets are loaded from files."
+  :type 'boolean
+  :group 'yasnippet)
+
+(defcustom yas-expand-only-for-last-commands nil
+  "List of `last-command' values to restrict tab-triggering to, or nil.
+
+Leave this set at nil (the default) to be able to trigger an
+expansion simply by placing the cursor after a valid tab trigger,
+using whichever commands.
+
+Optionally, set this to something like '(self-insert-command) if
+you to wish restrict expansion to only happen when the last
+letter of the snippet tab trigger was typed immediately before
+the trigger key itself."
+  :type '(repeat function)
+  :group 'yasnippet)
+
+;; Only two faces, and one of them shouldn't even be used...
+;;
+(defface yas-field-highlight-face
+  '((t (:inherit 'region)))
+  "The face used to highlight the currently active field of a snippet"
+  :group 'yasnippet)
+
+(defface yas--field-debug-face
+  '()
+  "The face used for debugging some overlays normally hidden"
+  :group 'yasnippet)
+
+
+;;; User-visible variables
+
+(defvar yas-keymap  (let ((map (make-sparse-keymap)))
+                      (define-key map [(tab)]       'yas-next-field-or-maybe-expand)
+                      (define-key map (kbd "TAB")   'yas-next-field-or-maybe-expand)
+                      (define-key map [(shift tab)] 'yas-prev-field)
+                      (define-key map [backtab]     'yas-prev-field)
+                      (define-key map (kbd "C-g")   'yas-abort-snippet)
+                      (define-key map (kbd "C-d")   'yas-skip-and-clear-or-delete-char)
+                      map)
+  "The active keymap while a snippet expansion is in progress.")
+
+(defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()"
+                               #'yas-try-key-from-whitespace)
+  "Syntaxes and functions to help look for trigger keys before point.
+
+Each element in this list specifies how to skip buffer positions
+backwards and look for the start of a trigger key.
+
+Each element can be either a string or a function receiving the
+original point as an argument. A string element is simply passed
+to `skip-syntax-backward' whereas a function element is called
+with no arguments and should also place point before the original
+position.
+
+The string between the resulting buffer position and the original
+point is matched against the trigger keys in the active snippet
+tables.
+
+If no expandable snippets are found, the next element is the list
+is tried, unless a function element returned the symbol `again',
+in which case it is called again from the previous position and
+may once more reposition point.
+
+For example, if `yas-key-syntaxes'' value is '(\"w\" \"w_\"),
+trigger keys composed exclusively of \"word\"-syntax characters
+are looked for first. Failing that, longer keys composed of
+\"word\" or \"symbol\" syntax are looked for. Therefore,
+triggering after
+
+foo-bar
+
+will, according to the \"w\" element first try \"barbaz\". If
+that isn't a trigger key, \"foo-barbaz\" is tried, respecting the
+second \"w_\" element. Notice that even if \"baz\" is a trigger
+key for an active snippet, it won't be expanded, unless a
+function is added to `yas-key-syntaxes' that eventually places
+point between \"bar\" and \"baz\".
+
+See also Info node `(elisp) Syntax Descriptors'.")
+
+(defvar yas-after-exit-snippet-hook
+  '()
+  "Hooks to run after a snippet exited.
+
+The hooks will be run in an environment where some variables bound to
+proper values:
+
+`yas-snippet-beg' : The beginning of the region of the snippet.
+
+`yas-snippet-end' : Similar to beg.
+
+Attention: These hooks are not run when exiting nested/stacked snippet expansion!")
+
+(defvar yas-before-expand-snippet-hook
+  '()
+  "Hooks to run just before expanding a snippet.")
+
+(defvar yas-buffer-local-condition
+  '(if (and (let ((ppss (syntax-ppss)))
+              (or (nth 3 ppss) (nth 4 ppss)))
+            (memq this-command '(yas-expand yas-expand-from-trigger-key
+                                            yas-expand-from-keymap)))
+       '(require-snippet-condition . force-in-comment)
+     t)
+  "Snippet expanding condition.
+
+This variable is a Lisp form which is evaluated every time a
+snippet expansion is attempted:
+
+    * If it evaluates to nil, no snippets can be expanded.
+
+    * If it evaluates to the a cons (require-snippet-condition
+      . REQUIREMENT)
+
+       * Snippets bearing no \"# condition:\" directive are not
+         considered
+
+       * Snippets bearing conditions that evaluate to nil (or
+         produce an error) won't be considered.
+
+       * If the snippet has a condition that evaluates to non-nil
+         RESULT:
+
+          * If REQUIREMENT is t, the snippet is considered
+
+          * If REQUIREMENT is `eq' RESULT, the snippet is
+            considered
+
+          * Otherwise, the snippet is not considered.
+
+    * If it evaluates to the symbol 'always, all snippets are
+      considered for expansion, regardless of any conditions.
+
+    * If it evaluates to t or some other non-nil value
+
+       * Snippet bearing no conditions, or conditions that
+         evaluate to non-nil, are considered for expansion.
+
+       * Otherwise, the snippet is not considered.
+
+Here's an example preventing snippets from being expanded from
+inside comments, in `python-mode' only, with the exception of
+snippets returning the symbol 'force-in-comment in their
+conditions.
+
+ (add-hook 'python-mode-hook
+           '(lambda ()
+              (setq yas-buffer-local-condition
+                    '(if (python-in-string/comment)
+                         '(require-snippet-condition . force-in-comment)
+                       t))))
+
+The default value is similar, it filters out potential snippet
+expansions inside comments and string literals, unless the
+snippet itself contains a condition that returns the symbol
+`force-in-comment'.")
+
+
+;;; Internal variables
+
+(defvar yas--version "0.8.0beta")
+
+(defvar yas--menu-table (make-hash-table)
+  "A hash table of MAJOR-MODE symbols to menu keymaps.")
+
+(defvar yas--escaped-characters
+  '(?\\ ?` ?\" ?' ?$ ?} ?{ ?\( ?\))
+  "List of characters which *might* need to be escaped.")
+
+(defconst yas--field-regexp
+  "${\\([0-9]+:\\)?\\([^}]*\\)}"
+  "A regexp to *almost* recognize a field.")
+
+(defconst yas--multi-dollar-lisp-expression-regexp
+  "$+[ \t\n]*\\(([^)]*)\\)"
+  "A regexp to *almost* recognize a \"$(...)\" expression.")
+
+(defconst yas--backquote-lisp-expression-regexp
+  "`\\([^`]*\\)`"
+  "A regexp to recognize a \"`lisp-expression`\" expression." )
+
+(defconst yas--transform-mirror-regexp
+  "${\\(?:\\([0-9]+\\):\\)?$\\([ \t\n]*([^}]*\\)"
+  "A regexp to *almost* recognize a mirror with a transform.")
+
+(defconst yas--simple-mirror-regexp
+  "$\\([0-9]+\\)"
+  "A regexp to recognize a simple mirror.")
+
+(defvar yas--snippet-id-seed 0
+  "Contains the next id for a snippet.")
+
+(defun yas--snippet-next-id ()
+  (let ((id yas--snippet-id-seed))
+    (cl-incf yas--snippet-id-seed)
+    id))
+
+
+;;; Minor mode stuff
+
+;; XXX: `last-buffer-undo-list' is somehow needed in Carbon Emacs for MacOSX
+(defvar last-buffer-undo-list nil)
+
+(defvar yas--minor-mode-menu nil
+  "Holds the YASnippet menu.")
+
+(defvar yas-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [(tab)]     'yas-expand)
+    (define-key map (kbd "TAB") 'yas-expand)
+    (define-key map "\C-c&\C-s" 'yas-insert-snippet)
+    (define-key map "\C-c&\C-n" 'yas-new-snippet)
+    (define-key map "\C-c&\C-v" 'yas-visit-snippet-file)
+    map)
+  "The keymap used when `yas-minor-mode' is active.")
+
+(easy-menu-define yas--minor-mode-menu
+      yas-minor-mode-map
+      "Menu used when `yas-minor-mode' is active."
+  '("YASnippet" :visible yas-use-menu
+    "----"
+    ["Expand trigger" yas-expand
+     :help "Possibly expand tab trigger before point"]
+    ["Insert at point..." yas-insert-snippet
+     :help "Prompt for an expandable snippet and expand it at point"]
+    ["New snippet..." yas-new-snippet
+     :help "Create a new snippet in an appropriate directory"]
+    ["Visit snippet file..." yas-visit-snippet-file
+     :help "Prompt for an expandable snippet and find its file"]
+    "----"
+    ("Snippet menu behaviour"
+     ["Visit snippets" (setq yas-visit-from-menu t)
+      :help "Visit snippets from the menu"
+      :active t :style radio   :selected yas-visit-from-menu]
+     ["Expand snippets" (setq yas-visit-from-menu nil)
+      :help "Expand snippets from the menu"
+      :active t :style radio :selected (not yas-visit-from-menu)]
+     "----"
+     ["Show all known modes" (setq yas-use-menu 'full)
+      :help "Show one snippet submenu for each loaded table"
+      :active t :style radio   :selected (eq yas-use-menu 'full)]
+     ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
+      :help "Show only snippet submenus for the current active modes"
+      :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
+    ("Indenting"
+     ["Auto" (setq yas-indent-line 'auto)
+      :help "Indent each line of the snippet with `indent-according-to-mode'"
+      :active t :style radio   :selected (eq yas-indent-line 'auto)]
+     ["Fixed" (setq yas-indent-line 'fixed)
+      :help "Indent the snippet to the current column"
+      :active t :style radio   :selected (eq yas-indent-line 'fixed)]
+     ["None" (setq yas-indent-line 'none)
+      :help "Don't apply any particular snippet indentation after expansion"
+      :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
+     "----"
+     ["Also auto indent first line" (setq yas-also-auto-indent-first-line
+                                          (not yas-also-auto-indent-first-line))
+      :help "When auto-indenting also, auto indent the first line menu"
+      :active (eq yas-indent-line 'auto)
+      :style toggle :selected yas-also-auto-indent-first-line]
+     )
+    ("Prompting method"
+     ["System X-widget" (setq yas-prompt-functions
+                              (cons 'yas-x-prompt
+                                    (remove 'yas-x-prompt
+                                            yas-prompt-functions)))
+      :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-x-prompt)]
+     ["Dropdown-list" (setq yas-prompt-functions
+                            (cons 'yas-dropdown-prompt
+                                  (remove 'yas-dropdown-prompt
+                                          yas-prompt-functions)))
+      :help "Use a special dropdown list"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-dropdown-prompt)]
+     ["Ido" (setq yas-prompt-functions
+                  (cons 'yas-ido-prompt
+                        (remove 'yas-ido-prompt
+                                yas-prompt-functions)))
+      :help "Use an ido-style minibuffer prompt"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-ido-prompt)]
+     ["Completing read" (setq yas-prompt-functions
+                              (cons 'yas-completing-prompt
+                                    (remove 'yas-completing-prompt
+                                            yas-prompt-functions)))
+      :help "Use a normal minibuffer prompt"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-completing-prompt)]
+     )
+    ("Misc"
+     ["Wrap region in exit marker"
+      (setq yas-wrap-around-region
+            (not yas-wrap-around-region))
+      :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
+      :style toggle :selected yas-wrap-around-region]
+     ["Allow stacked expansions "
+      (setq yas-triggers-in-field
+            (not yas-triggers-in-field))
+      :help "If non-nil allow snippets to be triggered inside other snippet fields"
+      :style toggle :selected yas-triggers-in-field]
+     ["Revive snippets on undo "
+      (setq yas-snippet-revival
+            (not yas-snippet-revival))
+      :help "If non-nil allow snippets to become active again after undo"
+      :style toggle :selected yas-snippet-revival]
+     ["Good grace "
+      (setq yas-good-grace
+            (not yas-good-grace))
+      :help "If non-nil don't raise errors in bad embedded elisp in snippets"
+      :style toggle :selected yas-good-grace]
+     )
+    "----"
+    ["Load snippets..."  yas-load-directory
+     :help "Load snippets from a specific directory"]
+    ["Reload everything" yas-reload-all
+     :help "Cleanup stuff, reload snippets, rebuild menus"]
+    ["About"            yas-about
+     :help "Display some information about YASnippet"]))
+
+(defvar yas--extra-modes nil
+  "An internal list of modes for which to also lookup snippets.
+
+This variable probably makes more sense as buffer-local, so
+ensure your use `make-local-variable' when you set it.")
+(define-obsolete-variable-alias 'yas-extra-modes 'yas--extra-modes "0.8.1")
+
+(defvar yas--tables (make-hash-table)
+  "A hash table of mode symbols to `yas--table' objects.")
+
+(defvar yas--parents (make-hash-table)
+  "A hash table of mode symbols do lists of direct parent mode symbols.
+
+This list is populated when reading the \".yas-parents\" files
+found when traversing snippet directories with
+`yas-load-directory'.
+
+There might be additional parenting information stored in the
+`derived-mode-parent' property of some mode symbols, but that is
+not recorded here.")
+
+(defvar yas--direct-keymaps (list)
+  "Keymap alist supporting direct snippet keybindings.
+
+This variable is placed in `emulation-mode-map-alists'.
+
+Its elements looks like (TABLE-NAME . KEYMAP).  They're
+instantiated on `yas-reload-all' but KEYMAP is added to only when
+loading snippets.  `yas--direct-TABLE-NAME' is then a variable set
+buffer-locally when entering `yas-minor-mode'.  KEYMAP binds all
+defined direct keybindings to the command
+`yas-expand-from-keymap' which then which snippet to expand.")
+
+(defun yas-direct-keymaps-reload ()
+  "Force reload the direct keybinding for active snippet tables."
+  (interactive)
+  (setq yas--direct-keymaps nil)
+  (maphash #'(lambda (name table)
+               (push (cons (intern (format "yas--direct-%s" name))
+                           (yas--table-direct-keymap table))
+                     yas--direct-keymaps))
+           yas--tables))
+
+(defun yas--modes-to-activate (&optional mode)
+  "Compute list of mode symbols that are active for `yas-expand'
+and friends."
+  (let* ((explored (if mode (list mode) ; Building up list in reverse.
+                     (cons major-mode (reverse yas--extra-modes))))
+         (dfs
+          (lambda (mode)
+            (cl-loop for neighbour
+                     in (cl-list* (get mode 'derived-mode-parent)
+                                  (ignore-errors (symbol-function mode))
+                                  (gethash mode yas--parents))
+                     when (and neighbour
+                               (not (memq neighbour explored))
+                               (symbolp neighbour))
+                     do (push neighbour explored)
+                     (funcall dfs neighbour)))))
+    (mapcar dfs explored)
+    (nreverse explored)))
+
+(defvar yas-minor-mode-hook nil
+  "Hook run when `yas-minor-mode' is turned on.")
+
+;;;###autoload
+(define-minor-mode yas-minor-mode
+  "Toggle YASnippet mode.
+
+When YASnippet mode is enabled, `yas-expand', normally bound to
+the TAB key, expands snippets of code depending on the major
+mode.
+
+With no argument, this command toggles the mode.
+positive prefix argument turns on the mode.
+Negative prefix argument turns off the mode.
+
+Key bindings:
+\\{yas-minor-mode-map}"
+  nil
+  ;; The indicator for the mode line.
+  " yas"
+  :group 'yasnippet
+  (cond (yas-minor-mode
+         ;; Install the direct keymaps in `emulation-mode-map-alists'
+         ;; (we use `add-hook' even though it's not technically a hook,
+         ;; but it works). Then define variables named after modes to
+         ;; index `yas--direct-keymaps'.
+         ;;
+         ;; Also install the post-command-hook.
+         ;;
+         (add-hook 'emulation-mode-map-alists 'yas--direct-keymaps)
+         (add-hook 'post-command-hook 'yas--post-command-handler nil t)
+         ;; Set the `yas--direct-%s' vars for direct keymap expansion
+         ;;
+         (dolist (mode (yas--modes-to-activate))
+           (let ((name (intern (format "yas--direct-%s" mode))))
+             (set-default name nil)
+             (set (make-local-variable name) t)))
+         ;; Perform JIT loads
+         ;;
+         (yas--load-pending-jits))
+        (t
+         ;; Uninstall the direct keymaps and the post-command hook
+         ;;
+         (remove-hook 'post-command-hook 'yas--post-command-handler t)
+         (remove-hook 'emulation-mode-map-alists 'yas--direct-keymaps))))
+
+(defun yas-activate-extra-mode (mode)
+  "Activates the snippets for the given `mode' in the buffer.
+
+The function can be called in the hook of a minor mode to
+activate snippets associated with that mode."
+  (interactive
+   (let (modes
+         symbol)
+     (maphash (lambda (k _)
+                (setq modes (cons (list k) modes)))
+              yas--parents)
+     (setq symbol (completing-read
+                   "Activate mode: " modes nil t))
+     (list
+      (when (not (string= "" symbol))
+        (intern symbol)))))
+  (when mode
+    (add-to-list (make-local-variable 'yas--extra-modes) mode)
+    (yas--load-pending-jits)))
+
+(defun yas-deactivate-extra-mode (mode)
+  "Deactivates the snippets for the given `mode' in the buffer."
+  (interactive
+   (list (intern
+          (completing-read
+           "Deactivate mode: " (mapcar #'list yas--extra-modes) nil t))))
+  (set (make-local-variable 'yas--extra-modes)
+       (remove mode
+               yas--extra-modes)))
+
+(defvar yas-dont-activate '(minibufferp)
+  "If non-nil don't let `yas-global-mode' affect some buffers.
+
+If a function of zero arguments, then its result is used.
+
+If a list of functions, then all functions must return nil to
+activate yas for this buffer.
+
+In Emacsen <= 23, this variable is buffer-local.  Because
+`yas-minor-mode-on' is called by `yas-global-mode' after
+executing the buffer's major mode hook, setting this variable
+there is an effective way to define exceptions to the \"global\"
+activation behaviour.
+
+In Emacsen > 23, only the global value is used.  To define
+per-mode exceptions to the \"global\" activation behaviour, call
+`yas-minor-mode' with a negative argument directily in the major
+mode's hook.")
+(unless (> emacs-major-version 23)
+  (with-no-warnings
+    (make-variable-buffer-local 'yas-dont-activate)))
+
+
+(defun yas-minor-mode-on ()
+  "Turn on YASnippet minor mode.
+
+Honour `yas-dont-activate', which see."
+  (interactive)
+  ;; Check `yas-dont-activate'
+  (unless (cond ((functionp yas-dont-activate)
+                 (funcall yas-dont-activate))
+                ((consp yas-dont-activate)
+                 (some #'funcall yas-dont-activate))
+                (yas-dont-activate))
+    (yas-minor-mode 1)))
+
+;;;###autoload
+(define-globalized-minor-mode yas-global-mode yas-minor-mode yas-minor-mode-on
+  :group 'yasnippet
+  :require 'yasnippet)
+
+(defun yas--global-mode-reload-with-jit-maybe ()
+  "Run `yas-reload-all' when `yas-global-mode' is on."
+  (when yas-global-mode (yas-reload-all)))
+
+(add-hook 'yas-global-mode-hook 'yas--global-mode-reload-with-jit-maybe)
+
+
+;;; Major mode stuff
+
+(defvar yas--font-lock-keywords
+  (append '(("^#.*$" . font-lock-comment-face))
+          lisp-font-lock-keywords-2
+          '(("$\\([0-9]+\\)"
+             (0 font-lock-keyword-face)
+             (1 font-lock-string-face t))
+            ("${\\([0-9]+\\):?"
+             (0 font-lock-keyword-face)
+             (1 font-lock-warning-face t))
+            ("${" . font-lock-keyword-face)
+            ("$[0-9]+?" . font-lock-preprocessor-face)
+            ("\\(\\$(\\)" 1 font-lock-preprocessor-face)
+            ("}"
+             (0 font-lock-keyword-face)))))
+
+(defvar snippet-mode-map
+  (let ((map (make-sparse-keymap)))
+    (easy-menu-define nil
+      map
+      "Menu used when snippet-mode is active."
+      (cons "Snippet"
+            (mapcar #'(lambda (ent)
+                        (when (third ent)
+                          (define-key map (third ent) (second ent)))
+                        (vector (first ent) (second ent) t))
+                    '(("Load this snippet" yas-load-snippet-buffer "\C-c\C-l")
+                      ("Load and quit window" yas-load-snippet-buffer-and-close "\C-c\C-c")
+                      ("Try out this snippet" yas-tryout-snippet "\C-c\C-t")))))
+    map)
+  "The keymap used when `snippet-mode' is active.")
+
+
+(define-derived-mode snippet-mode text-mode "Snippet"
+  "A mode for editing yasnippets"
+  (setq font-lock-defaults '(yas--font-lock-keywords))
+  (set (make-local-variable 'require-final-newline) nil)
+  (set (make-local-variable 'comment-start) "#")
+  (set (make-local-variable 'comment-start-skip) "#+[\t ]*"))
+
+
+
+;;; Internal structs for template management
+
+(cl-defstruct (yas--template
+               (:constructor yas--make-template)
+               ;; Handles `yas-define-snippets' format, plus the
+               ;; initial TABLE argument.
+               (:constructor
+                yas--define-snippets-2
+                (table
+                 key content
+                 &optional xname condition group
+                 expand-env load-file xkeybinding xuuid save-file
+                 &aux
+                 (name (or xname
+                           ;; A little redundant: we always get a name
+                           ;; from `yas--parse-template' except when
+                           ;; there isn't a file.
+                           (and load-file (file-name-nondirectory load-file))
+                           (and save-file (file-name-nondirectory save-file))
+                           key))
+                 (keybinding (yas--read-keybinding xkeybinding))
+                 (uuid (or xuuid name))
+                 (old (gethash uuid (yas--table-uuidhash table)))
+                 (menu-binding-pair
+                  (and old (yas--template-menu-binding-pair old)))
+                 (perm-group
+                  (and old (yas--template-perm-group old))))))
+  "A template for a snippet."
+  key
+  content
+  name
+  condition
+  expand-env
+  load-file
+  save-file
+  keybinding
+  uuid
+  menu-binding-pair
+  group      ;; as dictated by the #group: directive or .yas-make-groups
+  perm-group ;; as dictated by `yas-define-menu'
+  table
+  )
+
+(defstruct (yas--table (:constructor yas--make-snippet-table (name)))
+  "A table to store snippets for a particular mode.
+
+Has the following fields:
+
+`yas--table-name'
+
+  A symbol name normally corresponding to a major mode, but can
+  also be a pseudo major-mode to be used in
+  `yas-activate-extra-mode', for example.
+
+`yas--table-hash'
+
+  A hash table (KEY . NAMEHASH), known as the \"keyhash\". KEY is
+  a string or a vector, where the former is the snippet's trigger
+  and the latter means it's a direct keybinding. NAMEHASH is yet
+  another hash of (NAME . TEMPLATE) where NAME is the snippet's
+  name and TEMPLATE is a `yas--template' object.
+
+`yas--table-direct-keymap'
+
+  A keymap for the snippets in this table that have direct
+  keybindings. This is kept in sync with the keyhash, i.e., all
+  the elements of the keyhash that are vectors appear here as
+  bindings to `yas-expand-from-keymap'.
+
+`yas--table-uuidhash'
+
+  A hash table mapping snippets uuid's to the same `yas--template'
+  objects. A snippet uuid defaults to the snippet's name."
+  name
+  (hash (make-hash-table :test 'equal))
+  (uuidhash (make-hash-table :test 'equal))
+  (parents nil)
+  (direct-keymap (make-sparse-keymap)))
+
+(defun yas--get-template-by-uuid (mode uuid)
+  "Find the snippet template in MODE by its UUID."
+  (let* ((table (gethash mode yas--tables mode)))
+    (when table
+      (gethash uuid (yas--table-uuidhash table)))))
+
+;; Apropos storing/updating in TABLE, this works in two steps:
+;;
+;; 1. `yas--remove-template-by-uuid' removes any
+;;    keyhash-namehash-template mappings from TABLE, grabbing the
+;;    snippet by its uuid. Also removes mappings from TABLE's
+;;    `yas--table-direct-keymap' (FIXME: and should probably take care
+;;    of potentially stale menu bindings right?.)
+;;
+;; 2. `yas--add-template' adds this all over again.
+;;
+;;    Create a new or add to an existing keyhash-namehash mapping.
+;;
+;;  For reference on understanding this, consider three snippet
+;;  definitions:
+;;
+;;  A:   # name: The Foo
+;;       # key: foo
+;;       # binding: C-c M-l
+;;
+;;  B:   # name: Mrs Foo
+;;       # key: foo
+;;
+;;  C:   # name: The Bar
+;;       # binding: C-c M-l
+;;
+;;  D:   # name: Baz
+;;       # key: baz
+;;
+;;  keyhash       namehashes(3)      yas--template structs(4)
+;;  -----------------------------------------------------
+;;                                            __________
+;;                                           /          \
+;;  "foo"      --->  "The Foo" --->  [yas--template A]   |
+;;                   "Mrs Foo" --->  [yas--template B]   |
+;;                                                      |
+;;  [C-c M-l]  --->  "The Foo" -------------------------/
+;;                   "The Bar" --->  [yas--template C]
+;;
+;;  "baz"      --->  "Baz"     --->  [yas--template D]
+;;
+;; Additionally, since uuid defaults to the name, we have a
+;; `yas--table-uuidhash' for TABLE
+;;
+;; uuidhash       yas--template structs
+;; -------------------------------
+;; "The Foo" ---> [yas--template A]
+;; "Mrs Foo" ---> [yas--template B]
+;; "The Bar" ---> [yas--template C]
+;; "Baz"     ---> [yas--template D]
+;;
+;; FIXME: the more I look at this data-structure the more I think I'm
+;; stupid. There has to be an easier way (but beware lots of code
+;; depends on this).
+;;
+(defun yas--remove-template-by-uuid (table uuid)
+  "Remove from TABLE a template identified by UUID."
+  (let ((template (gethash uuid (yas--table-uuidhash table))))
+    (when template
+      (let* ((name                (yas--template-name template))
+             (empty-keys          nil))
+        ;; Remove the name from each of the targeted namehashes
+        ;;
+        (maphash #'(lambda (k v)
+                     (let ((template (gethash name v)))
+                       (when (and template
+                                  (eq uuid (yas--template-uuid template)))
+                         (remhash name v)
+                         (when (zerop (hash-table-count v))
+                           (push k empty-keys)))))
+                 (yas--table-hash table))
+        ;; Remove the namehash themselves if they've become empty
+        ;;
+        (dolist (key empty-keys)
+          (when (vectorp key)
+            (define-key (yas--table-direct-keymap table) key nil))
+          (remhash key (yas--table-hash table)))
+
+        ;; Finally, remove the uuid from the uuidhash
+        ;;
+        (remhash uuid (yas--table-uuidhash table))))))
+
+(defun yas--add-template (table template)
+  "Store in TABLE the snippet template TEMPLATE.
+
+KEY can be a string (trigger key) of a vector (direct
+keybinding)."
+  (let ((name (yas--template-name template))
+        (key (yas--template-key template))
+        (keybinding (yas--template-keybinding template))
+        (_menu-binding-pair (yas--template-menu-binding-pair-get-create template)))
+    (dolist (k (remove nil (list key keybinding)))
+      (puthash name
+               template
+               (or (gethash k
+                            (yas--table-hash table))
+                   (puthash k
+                            (make-hash-table :test 'equal)
+                            (yas--table-hash table))))
+      (when (vectorp k)
+        (define-key (yas--table-direct-keymap table) k 'yas-expand-from-keymap)))
+
+    ;; Update TABLE's `yas--table-uuidhash'
+    (puthash (yas--template-uuid template)
+             template
+             (yas--table-uuidhash table))))
+
+(defun yas--update-template (table template)
+  "Add or update TEMPLATE in TABLE.
+
+Also takes care of adding and updating to the associated menu.
+Return TEMPLATE."
+  ;; Remove from table by uuid
+  ;;
+  (yas--remove-template-by-uuid table (yas--template-uuid template))
+  ;; Add to table again
+  ;;
+  (yas--add-template table template)
+  ;; Take care of the menu
+  ;;
+  (yas--update-template-menu table template)
+  template)
+
+(defun yas--update-template-menu (table template)
+  "Update every menu-related for TEMPLATE."
+  (let ((menu-binding-pair (yas--template-menu-binding-pair-get-create template))
+        (key (yas--template-key template))
+        (keybinding (yas--template-keybinding template)))
+    ;; The snippet might have changed name or keys, so update
+    ;; user-visible strings
+    ;;
+    (unless (eq (cdr menu-binding-pair) :none)
+      ;; the menu item name
+      ;;
+      (setf (cadar menu-binding-pair) (yas--template-name template))
+      ;; the :keys information (also visible to the user)
+      (setf (getf (cdr (car menu-binding-pair)) :keys)
+            (or (and keybinding (key-description keybinding))
+                (and key (concat key yas-trigger-symbol))))))
+  (unless (yas--template-menu-managed-by-yas-define-menu template)
+    (let ((menu-keymap
+           (yas--menu-keymap-get-create (yas--table-mode table)
+                                        (mapcar #'yas--table-mode
+                                                (yas--table-parents table))))
+          (group (yas--template-group template)))
+      ;; Remove from menu keymap
+      ;;
+      (assert menu-keymap)
+      (yas--delete-from-keymap menu-keymap (yas--template-uuid template))
+
+      ;; Add necessary subgroups as necessary.
+      ;;
+      (dolist (subgroup group)
+        (let ((subgroup-keymap (lookup-key menu-keymap (vector (make-symbol subgroup)))))
+          (unless (and subgroup-keymap
+                       (keymapp subgroup-keymap))
+            (setq subgroup-keymap (make-sparse-keymap))
+            (define-key menu-keymap (vector (make-symbol subgroup))
+              `(menu-item ,subgroup ,subgroup-keymap)))
+          (setq menu-keymap subgroup-keymap)))
+
+      ;; Add this entry to the keymap
+      ;;
+      (define-key menu-keymap
+        (vector (make-symbol (yas--template-uuid template)))
+        (car (yas--template-menu-binding-pair template))))))
+
+(defun yas--namehash-templates-alist (namehash)
+  "Return NAMEHASH as an alist."
+  (let (alist)
+    (maphash #'(lambda (k v)
+                 (push (cons k v) alist))
+             namehash)
+    alist))
+
+(defun yas--fetch (table key)
+  "Fetch templates in TABLE by KEY.
+
+Return a list of cons (NAME . TEMPLATE) where NAME is a
+string and TEMPLATE is a `yas--template' structure."
+  (let* ((keyhash (yas--table-hash table))
+         (namehash (and keyhash (gethash key keyhash))))
+    (when namehash
+      (yas--filter-templates-by-condition (yas--namehash-templates-alist namehash)))))
+
+
+;;; Filtering/condition logic
+
+(defun yas--eval-condition (condition)
+  (condition-case err
+      (save-excursion
+        (save-restriction
+          (save-match-data
+            (eval condition))))
+    (error (progn
+             (yas--message 1 "Error in condition evaluation: %s" (error-message-string err))
+             nil))))
+
+
+(defun yas--filter-templates-by-condition (templates)
+  "Filter the templates using the applicable condition.
+
+TEMPLATES is a list of cons (NAME . TEMPLATE) where NAME is a
+string and TEMPLATE is a `yas--template' structure.
+
+This function implements the rules described in
+`yas-buffer-local-condition'.  See that variables documentation."
+  (let ((requirement (yas--require-template-specific-condition-p)))
+    (if (eq requirement 'always)
+        templates
+      (remove-if-not #'(lambda (pair)
+                         (yas--template-can-expand-p
+                          (yas--template-condition (cdr pair)) requirement))
+                     templates))))
+
+(defun yas--require-template-specific-condition-p ()
+  "Decide if this buffer requests/requires snippet-specific
+conditions to filter out potential expansions."
+  (if (eq 'always yas-buffer-local-condition)
+      'always
+    (let ((local-condition (or (and (consp yas-buffer-local-condition)
+                                    (yas--eval-condition yas-buffer-local-condition))
+                               yas-buffer-local-condition)))
+      (when local-condition
+        (if (eq local-condition t)
+            t
+          (and (consp local-condition)
+               (eq 'require-snippet-condition (car local-condition))
+               (symbolp (cdr local-condition))
+               (cdr local-condition)))))))
+
+(defun yas--template-can-expand-p (condition requirement)
+  "Evaluate CONDITION and REQUIREMENT and return a boolean."
+  (let* ((result (or (null condition)
+                     (yas--eval-condition condition))))
+    (cond ((eq requirement t)
+           result)
+          (t
+           (eq requirement result)))))
+
+(defun yas--table-templates (table)
+  (when table
+    (let ((acc (list)))
+      (maphash #'(lambda (_key namehash)
+                   (maphash #'(lambda (name template)
+                                (push (cons name template) acc))
+                            namehash))
+               (yas--table-hash table))
+      (yas--filter-templates-by-condition acc))))
+
+(defun yas--templates-for-key-at-point ()
+  "Find `yas--template' objects for any trigger keys preceding point.
+Returns (TEMPLATES START END). This function respects
+`yas-key-syntaxes', which see."
+  (save-excursion
+    (let ((original (point))
+          (methods yas-key-syntaxes)
+          (templates)
+          (method))
+      (while (and methods
+                  (not templates))
+        (unless (eq method (car methods))
+          ;; TRICKY: `eq'-ness test means we can only be here if
+          ;; `method' is a function that returned `again', and hence
+          ;; don't revert back to original position as per
+          ;; `yas-key-syntaxes'.
+          (goto-char original))
+        (setq method (car methods))
+        (cond ((stringp method)
+               (skip-syntax-backward method)
+               (setq methods (cdr methods)))
+              ((functionp method)
+               (unless (eq (funcall method original)
+                           'again)
+                 (setq methods (cdr methods))))
+              (t
+               (setq methods (cdr methods))
+               (yas--warning "Invalid element `%s' in `yas-key-syntaxes'" method)))
+        (let ((possible-key (buffer-substring-no-properties (point) original)))
+          (save-excursion
+            (goto-char original)
+            (setq templates
+                  (mapcan #'(lambda (table)
+                              (yas--fetch table possible-key))
+                          (yas--get-snippet-tables))))))
+      (when templates
+        (list templates (point) original)))))
+
+(defun yas--table-all-keys (table)
+  "Get trigger keys of all active snippets in TABLE."
+  (let ((acc))
+    (maphash #'(lambda (key namehash)
+                 (when (yas--filter-templates-by-condition (yas--namehash-templates-alist namehash))
+                   (push key acc)))
+             (yas--table-hash table))
+    acc))
+
+(defun yas--table-mode (table)
+  (intern (yas--table-name table)))
+
+
+;;; Internal functions and macros:
+
+(defun yas--handle-error (err)
+  "Handle error depending on value of `yas-good-grace'."
+  (let ((msg (yas--format "elisp error: %s" (error-message-string err))))
+    (if yas-good-grace msg
+      (error "%s" msg))))
+
+(defun yas--eval-lisp (form)
+  "Evaluate FORM and convert the result to string."
+  (let ((retval (catch 'yas--exception
+                  (condition-case err
+                      (save-excursion
+                        (save-restriction
+                          (save-match-data
+                            (widen)
+                            (let ((result (eval form)))
+                              (when result
+                                (format "%s" result))))))
+                    (error (yas--handle-error err))))))
+    (when (and (consp retval)
+               (eq 'yas--exception (car retval)))
+      (error (cdr retval)))
+    retval))
+
+(defun yas--eval-lisp-no-saves (form)
+  (condition-case err
+      (eval form)
+    (error (message "%s" (yas--handle-error err)))))
+
+(defun yas--read-lisp (string &optional nil-on-error)
+  "Read STRING as a elisp expression and return it.
+
+In case STRING in an invalid expression and NIL-ON-ERROR is nil,
+return an expression that when evaluated will issue an error."
+  (condition-case err
+      (read string)
+    (error (and (not nil-on-error)
+                `(error (error-message-string ,err))))))
+
+(defun yas--read-keybinding (keybinding)
+  "Read KEYBINDING as a snippet keybinding, return a vector."
+  (when (and keybinding
+             (not (string-match "keybinding" keybinding)))
+    (condition-case err
+        (let ((res (or (and (string-match "^\\[.*\\]$" keybinding)
+                            (read keybinding))
+                       (read-kbd-macro keybinding 'need-vector))))
+          res)
+      (error
+       (yas--message 3 "warning: keybinding \"%s\" invalid since %s."
+                keybinding (error-message-string err))
+       nil))))
+
+(defun yas--table-get-create (mode)
+  "Get or create the snippet table corresponding to MODE."
+  (let ((table (gethash mode
+                        yas--tables)))
+    (unless table
+      (setq table (yas--make-snippet-table (symbol-name mode)))
+      (puthash mode table yas--tables)
+      (push (cons (intern (format "yas--direct-%s" mode))
+                  (yas--table-direct-keymap table))
+            yas--direct-keymaps))
+    table))
+
+(defun yas--get-snippet-tables (&optional mode)
+  "Get snippet tables for MODE.
+
+MODE defaults to the current buffer's `major-mode'.
+
+Return a list of `yas--table' objects.  The list of modes to
+consider is returned by `yas--modes-to-activate'"
+  (remove nil
+          (mapcar #'(lambda (name)
+                      (gethash name yas--tables))
+                  (yas--modes-to-activate mode))))
+
+(defun yas--menu-keymap-get-create (mode &optional parents)
+  "Get or create the menu keymap for MODE and its PARENTS.
+
+This may very well create a plethora of menu keymaps and arrange
+them all in `yas--menu-table'"
+  (let* ((menu-keymap (or (gethash mode yas--menu-table)
+                          (puthash mode (make-sparse-keymap) yas--menu-table))))
+    (mapc #'yas--menu-keymap-get-create parents)
+    (define-key yas--minor-mode-menu (vector mode)
+        `(menu-item ,(symbol-name mode) ,menu-keymap
+                    :visible (yas--show-menu-p ',mode)))
+    menu-keymap))
+
+
+;;; Template-related and snippet loading functions
+
+(defun yas--parse-template (&optional file)
+  "Parse the template in the current buffer.
+
+Optional FILE is the absolute file name of the file being
+parsed.
+
+Optional GROUP is the group where the template is to go,
+otherwise we attempt to calculate it from FILE.
+
+Return a snippet-definition, i.e. a list
+
+ (KEY TEMPLATE NAME CONDITION GROUP VARS LOAD-FILE KEYBINDING UUID)
+
+If the buffer contains a line of \"# --\" then the contents above
+this line are ignored. Directives can set most of these with the syntax:
+
+# directive-name : directive-value
+
+Here's a list of currently recognized directives:
+
+ * type
+ * name
+ * contributor
+ * condition
+ * group
+ * key
+ * expand-env
+ * binding
+ * uuid"
+  (goto-char (point-min))
+  (let* ((type 'snippet)
+         (name (and file
+                    (file-name-nondirectory file)))
+         (key nil)
+         template
+         bound
+         condition
+         (group (and file
+                     (yas--calculate-group file)))
+         expand-env
+         binding
+         uuid)
+    (if (re-search-forward "^# --\n" nil t)
+        (progn (setq template
+                     (buffer-substring-no-properties (point)
+                                                     (point-max)))
+               (setq bound (point))
+               (goto-char (point-min))
+               (while (re-search-forward "^# *\\([^ ]+?\\) *: *\\(.*?\\)[[:space:]]*$" bound t)
+                 (when (string= "uuid" (match-string-no-properties 1))
+                   (setq uuid (match-string-no-properties 2)))
+                 (when (string= "type" (match-string-no-properties 1))
+                   (setq type (if (string= "command" (match-string-no-properties 2))
+                                  'command
+                                'snippet)))
+                 (when (string= "key" (match-string-no-properties 1))
+                   (setq key (match-string-no-properties 2)))
+                 (when (string= "name" (match-string-no-properties 1))
+                   (setq name (match-string-no-properties 2)))
+                 (when (string= "condition" (match-string-no-properties 1))
+                   (setq condition (yas--read-lisp (match-string-no-properties 2))))
+                 (when (string= "group" (match-string-no-properties 1))
+                   (setq group (match-string-no-properties 2)))
+                 (when (string= "expand-env" (match-string-no-properties 1))
+                   (setq expand-env (yas--read-lisp (match-string-no-properties 2)
+                                                   'nil-on-error)))
+                 (when (string= "binding" (match-string-no-properties 1))
+                   (setq binding (match-string-no-properties 2)))))
+      (setq template
+            (buffer-substring-no-properties (point-min) (point-max))))
+    (unless (or key binding)
+      (setq key (and file (file-name-nondirectory file))))
+    (when (eq type 'command)
+      (setq template (yas--read-lisp (concat "(progn" template ")"))))
+    (when group
+      (setq group (split-string group "\\.")))
+    (list key template name condition group expand-env file binding uuid)))
+
+(defun yas--calculate-group (file)
+  "Calculate the group for snippet file path FILE."
+  (let* ((dominating-dir (locate-dominating-file file
+                                                 ".yas-make-groups"))
+         (extra-path (and dominating-dir
+                          (replace-regexp-in-string (concat "^"
+                                                            (expand-file-name dominating-dir))
+                                                    ""
+                                                    (expand-file-name file))))
+         (extra-dir (and extra-path
+                         (file-name-directory extra-path)))
+         (group (and extra-dir
+                     (replace-regexp-in-string "/"
+                                               "."
+                                               (directory-file-name extra-dir)))))
+    group))
+
+(defun yas--subdirs (directory &optional filep)
+  "Return subdirs or files of DIRECTORY according to FILEP."
+  (remove-if (lambda (file)
+               (or (string-match "^\\."
+                                 (file-name-nondirectory file))
+                   (string-match "^#.*#$"
+                                 (file-name-nondirectory file))
+                   (string-match "~$"
+                                 (file-name-nondirectory file))
+                   (if filep
+                       (file-directory-p file)
+                     (not (file-directory-p file)))))
+             (directory-files directory t)))
+
+(defun yas--make-menu-binding (template)
+  (let ((mode (yas--table-mode (yas--template-table template))))
+    `(lambda () (interactive) (yas--expand-or-visit-from-menu ',mode ,(yas--template-uuid template)))))
+
+(defun yas--expand-or-visit-from-menu (mode uuid)
+  (let* ((table (yas--table-get-create mode))
+         (yas--current-template (and table
+                                    (gethash uuid (yas--table-uuidhash table)))))
+    (when yas--current-template
+      (if yas-visit-from-menu
+          (yas--visit-snippet-file-1 yas--current-template)
+        (let ((where (if (region-active-p)
+                         (cons (region-beginning) (region-end))
+                       (cons (point) (point)))))
+          (yas-expand-snippet (yas--template-content yas--current-template)
+                              (car where)
+                              (cdr where)
+                              (yas--template-expand-env yas--current-template)))))))
+
+(defun yas--key-from-desc (text)
+  "Return a yasnippet key from a description string TEXT."
+  (replace-regexp-in-string "\\(\\w+\\).*" "\\1" text))
+
+
+;;; Popping up for keys and templates
+
+(defun yas--prompt-for-template (templates &optional prompt)
+  "Interactively choose a template from the list TEMPLATES.
+
+TEMPLATES is a list of `yas--template'.
+
+Optional PROMPT sets the prompt to use."
+  (when templates
+    (setq templates
+          (sort templates #'(lambda (t1 t2)
+                              (< (length (yas--template-name t1))
+                                 (length (yas--template-name t2))))))
+    (some #'(lambda (fn)
+              (funcall fn (or prompt "Choose a snippet: ")
+                       templates
+                       #'yas--template-name))
+          yas-prompt-functions)))
+
+(defun yas--prompt-for-keys (keys &optional prompt)
+  "Interactively choose a template key from the list KEYS.
+
+Optional PROMPT sets the prompt to use."
+  (when keys
+    (some #'(lambda (fn)
+              (funcall fn (or prompt "Choose a snippet key: ") keys))
+          yas-prompt-functions)))
+
+(defun yas--prompt-for-table (tables &optional prompt)
+  "Interactively choose a table from the list TABLES.
+
+Optional PROMPT sets the prompt to use."
+  (when tables
+    (some #'(lambda (fn)
+              (funcall fn (or prompt "Choose a snippet table: ")
+                       tables
+                       #'yas--table-name))
+          yas-prompt-functions)))
+
+(defun yas-x-prompt (prompt choices &optional display-fn)
+  "Display choices in a x-window prompt."
+  (when (and window-system choices)
+    ;; Let window position be recalculated to ensure that
+    ;; `posn-at-point' returns non-nil.
+    (redisplay)
+    (or
+     (x-popup-menu
+      (if (fboundp 'posn-at-point)
+          (let ((x-y (posn-x-y (posn-at-point (point)))))
+            (list (list (+ (car x-y) 10)
+                        (+ (cdr x-y) 20))
+                  (selected-window)))
+        t)
+      `(,prompt ("title"
+                 ,@(mapcar* (lambda (c d) `(,(concat "   " d) . ,c))
+                            choices
+                            (if display-fn (mapcar display-fn choices) choices)))))
+     (keyboard-quit))))
+
+(defun yas-maybe-ido-prompt (prompt choices &optional display-fn)
+  (when (bound-and-true-p ido-mode)
+    (yas-ido-prompt prompt choices display-fn)))
+
+(defun yas-ido-prompt (prompt choices &optional display-fn)
+  (require 'ido)
+  (yas-completing-prompt prompt choices display-fn #'ido-completing-read))
+
+(defun yas-dropdown-prompt (_prompt choices &optional display-fn)
+  (when (fboundp 'dropdown-list)
+    (let* ((formatted-choices
+            (if display-fn (mapcar display-fn choices) choices))
+           (n (dropdown-list formatted-choices)))
+      (if n (nth n choices)
+        (keyboard-quit)))))
+
+(defun yas-completing-prompt (prompt choices &optional display-fn completion-fn)
+  (let* ((formatted-choices
+          (if display-fn (mapcar display-fn choices) choices))
+         (chosen (funcall (or completion-fn #'completing-read)
+                          prompt formatted-choices
+                          nil 'require-match nil nil)))
+    (if (eq choices formatted-choices)
+        chosen
+      (nth (or (position chosen formatted-choices :test #'string=) 0)
+           choices))))
+
+(defun yas-no-prompt (_prompt choices &optional _display-fn)
+  (first choices))
+
+
+;;; Defining snippets
+;; This consists of creating and registering `yas--template' objects in the
+;; correct tables.
+;;
+
+(defvar yas--creating-compiled-snippets nil)
+
+(defun yas--define-snippets-1 (snippet snippet-table)
+  "Helper for `yas-define-snippets'."
+  ;; Update the appropriate table.  Also takes care of adding the
+  ;; key indicators in the templates menu entry, if any.
+  (yas--update-template
+   snippet-table (apply #'yas--define-snippets-2 snippet-table snippet)))
+
+(defun yas-define-snippets (mode snippets)
+  "Define SNIPPETS for MODE.
+
+SNIPPETS is a list of snippet definitions, each taking the
+following form
+
+ (KEY TEMPLATE NAME CONDITION GROUP EXPAND-ENV LOAD-FILE KEYBINDING UUID SAVE-FILE)
+
+Within these, only KEY and TEMPLATE are actually mandatory.
+
+TEMPLATE might be a Lisp form or a string, depending on whether
+this is a snippet or a snippet-command.
+
+CONDITION, EXPAND-ENV and KEYBINDING are Lisp forms, they have
+been `yas--read-lisp'-ed and will eventually be
+`yas--eval-lisp'-ed.
+
+The remaining elements are strings.
+
+FILE is probably of very little use if you're programatically
+defining snippets.
+
+UUID is the snippet's \"unique-id\". Loading a second snippet
+file with the same uuid would replace the previous snippet.
+
+You can use `yas--parse-template' to return such lists based on
+the current buffers contents."
+  (if yas--creating-compiled-snippets
+      (let ((print-length nil))
+        (insert ";;; Snippet definitions:\n;;;\n")
+        (dolist (snippet snippets)
+          ;; Fill in missing elements with nil.
+          (setq snippet (append snippet (make-list (- 10 (length snippet)) nil)))
+          ;; Move LOAD-FILE to SAVE-FILE because we will load from the
+          ;; compiled file, not LOAD-FILE.
+          (let ((load-file (nth 6 snippet)))
+            (setcar (nthcdr 6 snippet) nil)
+            (setcar (nthcdr 9 snippet) load-file)))
+        (insert (pp-to-string
+                 `(yas-define-snippets ',mode ',snippets)))
+        (insert "\n\n"))
+    ;; Normal case.
+    (let ((snippet-table (yas--table-get-create mode))
+          (template nil))
+      (dolist (snippet snippets)
+        (setq template (yas--define-snippets-1 snippet
+                                               snippet-table)))
+      template)))
+
+
+;;; Loading snippets from files
+
+(defun yas--template-get-file (template)
+  "Return TEMPLATE's LOAD-FILE or SAVE-FILE."
+  (or (yas--template-load-file template)
+      (let ((file (yas--template-save-file template)))
+        (when file
+          (yas--message 2 "%s has no load file, use save file, %s, instead."
+                        (yas--template-name template) file))
+        file)))
+
+(defun yas--load-yas-setup-file (file)
+  (if (not yas--creating-compiled-snippets)
+      ;; Normal case.
+      (load file 'noerror (<= yas-verbosity 2))
+    (let ((elfile (concat file ".el")))
+      (when (file-exists-p elfile)
+        (insert ";;; contents of the .yas-setup.el support file:\n;;;\n")
+        (insert-file-contents elfile)
+        (goto-char (point-max))))))
+
+(defun yas--define-parents (mode parents)
+  "Add PARENTS to the list of MODE's parents."
+  (puthash mode (remove-duplicates
+                 (append parents
+                         (gethash mode yas--parents)))
+           yas--parents))
+
+(defun yas-load-directory (top-level-dir &optional use-jit interactive)
+  "Load snippets in directory hierarchy TOP-LEVEL-DIR.
+
+Below TOP-LEVEL-DIR each directory should be a mode name.
+
+With prefix argument USE-JIT do jit-loading of snippets."
+  (interactive
+   (list (read-directory-name "Select the root directory: " nil nil t)
+         current-prefix-arg t))
+  (unless yas-snippet-dirs
+    (setq yas-snippet-dirs top-level-dir))
+  (let ((impatient-buffers))
+    (dolist (dir (yas--subdirs top-level-dir))
+      (let* ((major-mode-and-parents (yas--compute-major-mode-and-parents
+                                      (concat dir "/dummy")))
+             (mode-sym (car major-mode-and-parents))
+             (parents (cdr major-mode-and-parents)))
+        ;; Attention: The parents and the menus are already defined
+        ;; here, even if the snippets are later jit-loaded.
+        ;;
+        ;; * We need to know the parents at this point since entering a
+        ;;   given mode should jit load for its parents
+        ;;   immediately. This could be reviewed, the parents could be
+        ;;   discovered just-in-time-as well
+        ;;
+        ;; * We need to create the menus here to support the `full'
+        ;;   option to `yas-use-menu' (all known snippet menus are shown to the user)
+        ;;
+        (yas--define-parents mode-sym parents)
+        (yas--menu-keymap-get-create mode-sym)
+        (let ((fun `(lambda () ;; FIXME: Simulating lexical-binding.
+                      (yas--load-directory-1 ',dir ',mode-sym))))
+          (if use-jit
+              (yas--schedule-jit mode-sym fun)
+            (funcall fun)))
+        ;; Look for buffers that are already in `mode-sym', and so
+        ;; need the new snippets immediately...
+        ;;
+        (when use-jit
+          (cl-loop for buffer in (buffer-list)
+                   do (with-current-buffer buffer
+                        (when (eq major-mode mode-sym)
+                          (yas--message 3 "Discovered there was already %s in %s" buffer mode-sym)
+                          (push buffer impatient-buffers)))))))
+    ;; ...after TOP-LEVEL-DIR has been completely loaded, call
+    ;; `yas--load-pending-jits' in these impatient buffers.
+    ;;
+    (cl-loop for buffer in impatient-buffers
+             do (with-current-buffer buffer (yas--load-pending-jits))))
+  (when interactive
+    (yas--message 3 "Loaded snippets from %s." top-level-dir)))
+
+(defun yas--load-directory-1 (directory mode-sym)
+  "Recursively load snippet templates from DIRECTORY."
+  (if yas--creating-compiled-snippets
+      (let ((output-file (expand-file-name ".yas-compiled-snippets.el"
+                                           directory)))
+        (with-temp-file output-file
+          (insert (format ";;; Compiled snippets and support files for `%s'\n"
+                          mode-sym))
+          (yas--load-directory-2 directory mode-sym)
+          (insert (format ";;; Do not edit! File generated at %s\n"
+                          (current-time-string)))))
+    ;; Normal case.
+    (unless (file-exists-p (concat directory "/" ".yas-skip"))
+      (unless (and (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror (<= yas-verbosity 3))
+                   (progn (yas--message 2 "Loaded compiled snippets from %s" directory) t))
+        (yas--message 2 "Loading snippet files from %s" directory)
+        (yas--load-directory-2 directory mode-sym)))))
+
+(defun yas--load-directory-2 (directory mode-sym)
+  ;; Load .yas-setup.el files wherever we find them
+  ;;
+  (yas--load-yas-setup-file (expand-file-name ".yas-setup" directory))
+  (let* ((default-directory directory)
+         (snippet-defs nil))
+    ;; load the snippet files
+    ;;
+    (with-temp-buffer
+      (dolist (file (yas--subdirs directory 'no-subdirs-just-files))
+        (when (file-readable-p file)
+          (insert-file-contents file nil nil nil t)
+          (push (yas--parse-template file)
+                snippet-defs))))
+    (when snippet-defs
+      (yas-define-snippets mode-sym
+                           snippet-defs))
+    ;; now recurse to a lower level
+    ;;
+    (dolist (subdir (yas--subdirs directory))
+      (yas--load-directory-2 subdir
+                            mode-sym))))
+
+(defun yas--load-snippet-dirs (&optional nojit)
+  "Reload the directories listed in `yas-snippet-dirs' or
+prompt the user to select one."
+  (let (errors)
+    (if yas-snippet-dirs
+        (dolist (directory (reverse (yas-snippet-dirs)))
+          (cond ((file-directory-p directory)
+                 (yas-load-directory directory (not nojit))
+                 (if nojit
+                     (yas--message 3 "Loaded %s" directory)
+                   (yas--message 3 "Prepared just-in-time loading for %s" directory)))
+                (t
+                 (push (yas--message 0 "Check your `yas-snippet-dirs': %s is not a directory" directory) errors))))
+      (call-interactively 'yas-load-directory))
+    errors))
+
+(defun yas-reload-all (&optional no-jit interactive)
+  "Reload all snippets and rebuild the YASnippet menu.
+
+When NO-JIT is non-nil force immediate reload of all known
+snippets under `yas-snippet-dirs', otherwise use just-in-time
+loading.
+
+When called interactively, use just-in-time loading when given a
+prefix argument."
+  (interactive (list (not current-prefix-arg) t))
+  (catch 'abort
+    (let ((errors)
+          (snippet-editing-buffers
+           (remove-if-not #'(lambda (buffer)
+                              (with-current-buffer buffer yas--editing-template))
+                          (buffer-list))))
+      ;; Warn if there are buffers visiting snippets, since reloading will break
+      ;; any on-line editing of those buffers.
+      ;;
+      (when snippet-editing-buffers
+          (if interactive
+              (if (y-or-n-p "Some buffers editing live snippets, close them and proceed with reload? ")
+                  (mapc #'kill-buffer snippet-editing-buffers)
+                (yas--message 1 "Aborted reload...")
+                (throw 'abort nil))
+            ;; in a non-interactive use, at least set
+            ;; `yas--editing-template' to nil, make it guess it next time around
+            (mapc #'(lambda (buffer)
+                      (with-current-buffer buffer
+                        (kill-local-variable 'yas--editing-template)))
+                  (buffer-list))))
+
+      ;; Empty all snippet tables and parenting info
+      ;;
+      (setq yas--tables (make-hash-table))
+      (setq yas--parents (make-hash-table))
+
+      ;; Before killing `yas--menu-table' use its keys to cleanup the
+      ;; mode menu parts of `yas--minor-mode-menu' (thus also cleaning
+      ;; up `yas-minor-mode-map', which points to it)
+      ;;
+      (maphash #'(lambda (menu-symbol _keymap)
+                   (define-key yas--minor-mode-menu (vector menu-symbol) nil))
+               yas--menu-table)
+      ;; Now empty `yas--menu-table' as well
+      (setq yas--menu-table (make-hash-table))
+
+      ;; Cancel all pending 'yas--scheduled-jit-loads'
+      ;;
+      (setq yas--scheduled-jit-loads (make-hash-table))
+
+      ;; Reload the directories listed in `yas-snippet-dirs' or prompt
+      ;; the user to select one.
+      ;;
+      (setq errors (yas--load-snippet-dirs no-jit))
+      ;; Reload the direct keybindings
+      ;;
+      (yas-direct-keymaps-reload)
+
+      (run-hooks 'yas-after-reload-hook)
+      (yas--message 3 "Reloaded everything%s...%s."
+                   (if no-jit "" " (snippets will load just-in-time)")
+                   (if errors " (some errors, check *Messages*)" "")))))
+
+(defvar yas-after-reload-hook nil
+  "Hooks run after `yas-reload-all'.")
+
+(defun yas--load-pending-jits ()
+  (dolist (mode (yas--modes-to-activate))
+    (let ((funs (reverse (gethash mode yas--scheduled-jit-loads))))
+      ;; must reverse to maintain coherence with `yas-snippet-dirs'
+      (dolist (fun funs)
+        (yas--message  3 "Loading for `%s', just-in-time: %s!" mode fun)
+        (funcall fun))
+      (remhash mode yas--scheduled-jit-loads))))
+
+;; (when (<= emacs-major-version 22)
+;;   (add-hook 'after-change-major-mode-hook 'yas--load-pending-jits))
+
+(defun yas--quote-string (string)
+  "Escape and quote STRING.
+foo\"bar\\! -> \"foo\\\"bar\\\\!\""
+  (concat "\""
+          (replace-regexp-in-string "[\\\"]"
+                                    "\\\\\\&"
+                                    string
+                                    t)
+          "\""))
+
+;;; Snippet compilation function
+
+(defun yas-compile-directory (top-level-dir)
+  "Create .yas-compiled-snippets.el files under subdirs of TOP-LEVEL-DIR.
+
+This works by stubbing a few functions, then calling
+`yas-load-directory'."
+  (interactive "DTop level snippet directory?")
+  (let ((yas--creating-compiled-snippets t))
+    (yas-load-directory top-level-dir nil)))
+
+(defun yas-recompile-all ()
+  "Compile every dir in `yas-snippet-dirs'."
+  (interactive)
+  (mapc #'yas-compile-directory (yas-snippet-dirs)))
+
+
+;;; JIT loading
+;;;
+
+(defvar yas--scheduled-jit-loads (make-hash-table)
+  "Alist of mode-symbols to forms to be evaled when `yas-minor-mode' kicks in.")
+
+(defun yas--schedule-jit (mode fun)
+  (push fun (gethash mode yas--scheduled-jit-loads)))
+
+
+
+;;; Some user level functions
+
+(defun yas-about ()
+  (interactive)
+  (message (concat "yasnippet (version "
+                   yas--version
+                   ") -- pluskid/joaotavora/npostavs")))
+
+
+;;; Apropos snippet menu:
+;;
+;; The snippet menu keymaps are store by mode in hash table called
+;; `yas--menu-table'. They are linked to the main menu in
+;; `yas--menu-keymap-get-create' and are initially created empty,
+;; reflecting the table hierarchy.
+;;
+;; They can be populated in two mutually exclusive ways: (1) by
+;; reading `yas--template-group', which in turn is populated by the "#
+;; group:" directives of the snippets or the ".yas-make-groups" file
+;; or (2) by using a separate `yas-define-menu' call, which declares a
+;; menu structure based on snippets uuids.
+;;
+;; Both situations are handled in `yas--update-template-menu', which
+;; uses the predicate `yas--template-menu-managed-by-yas-define-menu'
+;; that can tell between the two situations.
+;;
+;; Note:
+;;
+;; * if `yas-define-menu' is used it must run before
+;;   `yas-define-snippets' and the UUIDS must match, otherwise we get
+;;   duplicate entries. The `yas--template' objects are created in
+;;   `yas-define-menu', holding nothing but the menu entry,
+;;   represented by a pair of ((menu-item NAME :keys KEYS) TYPE) and
+;;   stored in `yas--template-menu-binding-pair'. The (menu-item ...)
+;;   part is then stored in the menu keymap itself which make the item
+;;   appear to the user. These limitations could probably be revised.
+;;
+;; * The `yas--template-perm-group' slot is only used in
+;;   `yas-describe-tables'.
+;;
+(defun yas--template-menu-binding-pair-get-create (template &optional type)
+  "Get TEMPLATE's menu binding or assign it a new one.
+
+TYPE may be `:stay', signaling this menu binding should be
+static in the menu."
+  (or (yas--template-menu-binding-pair template)
+      (let (;; (key (yas--template-key template))
+            ;; (keybinding (yas--template-keybinding template))
+            )
+        (setf (yas--template-menu-binding-pair template)
+              (cons `(menu-item ,(or (yas--template-name template)
+                                     (yas--template-uuid template))
+                                ,(yas--make-menu-binding template)
+                                :keys ,nil)
+                    type)))))
+(defun yas--template-menu-managed-by-yas-define-menu (template)
+  "Non-nil if TEMPLATE's menu entry was included in a `yas-define-menu' call."
+  (cdr (yas--template-menu-binding-pair template)))
+
+
+(defun yas--show-menu-p (mode)
+  (cond ((eq yas-use-menu 'abbreviate)
+         (find mode
+               (mapcar #'(lambda (table)
+                           (yas--table-mode table))
+                       (yas--get-snippet-tables))))
+        (yas-use-menu t)))
+
+(defun yas--delete-from-keymap (keymap uuid)
+  "Recursively delete items with UUID from KEYMAP and its submenus."
+
+  ;; XXX: This used to skip any submenus named \"parent mode\"
+  ;;
+  ;; First of all, recursively enter submenus, i.e. the tree is
+  ;; searched depth first so that stale submenus can be found in the
+  ;; higher passes.
+  ;;
+  (mapc #'(lambda (item)
+            (when (and (listp (cdr item))
+                       (keymapp (third (cdr item))))
+              (yas--delete-from-keymap (third (cdr item)) uuid)))
+        (rest keymap))
+  ;; Set the uuid entry to nil
+  ;;
+  (define-key keymap (vector (make-symbol uuid)) nil)
+  ;; Destructively modify keymap
+  ;;
+  (setcdr keymap (delete-if #'(lambda (item)
+                                (or (null (cdr item))
+                                    (and (keymapp (third (cdr item)))
+                                         (null (cdr (third (cdr item)))))))
+                            (rest keymap))))
+
+(defun yas-define-menu (mode menu &optional omit-items)
+  "Define a snippet menu for MODE according to MENU, omitting OMIT-ITEMS.
+
+MENU is a list, its elements can be:
+
+- (yas-item UUID) : Creates an entry the snippet identified with
+  UUID.  The menu entry for a snippet thus identified is
+  permanent, i.e. it will never move (be reordered) in the menu.
+
+- (yas-separator) : Creates a separator
+
+- (yas-submenu NAME SUBMENU) : Creates a submenu with NAME,
+  SUBMENU has the same form as MENU.  NAME is also added to the
+  list of groups of the snippets defined thereafter.
+
+OMIT-ITEMS is a list of snippet uuid's that will always be
+omitted from MODE's menu, even if they're manually loaded."
+  (let* ((table (yas--table-get-create mode))
+         (hash (yas--table-uuidhash table)))
+    (yas--define-menu-1 table
+                        (yas--menu-keymap-get-create mode)
+                        menu
+                        hash)
+    (dolist (uuid omit-items)
+      (let ((template (or (gethash uuid hash)
+                          (puthash uuid
+                                   (yas--make-template :table table
+                                                       :uuid uuid)
+                                   hash))))
+        (setf (yas--template-menu-binding-pair template) (cons nil :none))))))
+
+(defun yas--define-menu-1 (table menu-keymap menu uuidhash &optional group-list)
+  "Helper for `yas-define-menu'."
+  (dolist (e (reverse menu))
+    (cond ((eq (first e) 'yas-item)
+           (let ((template (or (gethash (second e) uuidhash)
+                               (puthash (second e)
+                                        (yas--make-template
+                                         :table table
+                                         :perm-group group-list
+                                         :uuid (second e))
+                                        uuidhash))))
+             (define-key menu-keymap (vector (gensym))
+               (car (yas--template-menu-binding-pair-get-create template :stay)))))
+          ((eq (first e) 'yas-submenu)
+           (let ((subkeymap (make-sparse-keymap)))
+             (define-key menu-keymap (vector (gensym))
+               `(menu-item ,(second e) ,subkeymap))
+             (yas--define-menu-1 table
+                                subkeymap
+                                (third e)
+                                uuidhash
+                                (append group-list (list (second e))))))
+          ((eq (first e) 'yas-separator)
+           (define-key menu-keymap (vector (gensym))
+             '(menu-item "----")))
+          (t
+           (yas--message 3 "Don't know anything about menu entry %s" (first e))))))
+
+(defun yas--define (mode key template &optional name condition group)
+  "Define a snippet.  Expanding KEY into TEMPLATE.
+
+NAME is a description to this template.  Also update the menu if
+`yas-use-menu' is t.  CONDITION is the condition attached to
+this snippet.  If you attach a condition to a snippet, then it
+will only be expanded when the condition evaluated to non-nil."
+  (yas-define-snippets mode
+                       (list (list key template name condition group))))
+
+(defun yas-hippie-try-expand (first-time?)
+  "Integrate with hippie expand.
+
+Just put this function in `hippie-expand-try-functions-list'."
+  (when yas-minor-mode
+    (if (not first-time?)
+        (let ((yas-fallback-behavior 'return-nil))
+          (yas-expand))
+      (undo 1)
+      nil)))
+
+
+;;; Apropos condition-cache:
+;;;
+;;;
+;;;
+;;;
+(defvar yas--condition-cache-timestamp nil)
+(defmacro yas-define-condition-cache (func doc &rest body)
+  "Define a function FUNC with doc DOC and body BODY.
+BODY is executed at most once every snippet expansion attempt, to check
+expansion conditions.
+
+It doesn't make any sense to call FUNC programatically."
+  `(defun ,func () ,(if (and doc
+                             (stringp doc))
+                        (concat doc
+"\n\nFor use in snippets' conditions. Within each
+snippet-expansion routine like `yas-expand', computes actual
+value for the first time then always returns a cached value.")
+                      (setq body (cons doc body))
+                      nil)
+     (let ((timestamp-and-value (get ',func 'yas--condition-cache)))
+       (if (equal (car timestamp-and-value) yas--condition-cache-timestamp)
+           (cdr timestamp-and-value)
+         (let ((new-value (progn
+                            ,@body
+                            )))
+           (put ',func 'yas--condition-cache (cons yas--condition-cache-timestamp new-value))
+           new-value)))))
+
+(defalias 'yas-expand 'yas-expand-from-trigger-key)
+(defun yas-expand-from-trigger-key (&optional field)
+  "Expand a snippet before point.
+
+If no snippet expansion is possible, fall back to the behaviour
+defined in `yas-fallback-behavior'.
+
+Optional argument FIELD is for non-interactive use and is an
+object satisfying `yas--field-p' to restrict the expansion to."
+  (interactive)
+  (setq yas--condition-cache-timestamp (current-time))
+  (let (templates-and-pos)
+    (unless (and yas-expand-only-for-last-commands
+                 (not (member last-command yas-expand-only-for-last-commands)))
+      (setq templates-and-pos (if field
+                                  (save-restriction
+                                    (narrow-to-region (yas--field-start field)
+                                                      (yas--field-end field))
+                                    (yas--templates-for-key-at-point))
+                                (yas--templates-for-key-at-point))))
+    (if templates-and-pos
+        (yas--expand-or-prompt-for-template (first templates-and-pos)
+                                            (second templates-and-pos)
+                                            (third templates-and-pos))
+      (yas--fallback))))
+
+(defun yas-expand-from-keymap ()
+  "Directly expand some snippets, searching `yas--direct-keymaps'.
+
+If expansion fails, execute the previous binding for this key"
+  (interactive)
+  (setq yas--condition-cache-timestamp (current-time))
+  (let* ((vec (subseq (this-command-keys-vector) (if current-prefix-arg
+                                                     (length (this-command-keys))
+                                                   0)))
+         (templates (mapcan #'(lambda (table)
+                                (yas--fetch table vec))
+                            (yas--get-snippet-tables))))
+    (if templates
+        (yas--expand-or-prompt-for-template templates)
+      (let ((yas-fallback-behavior 'call-other-command))
+        (yas--fallback)))))
+
+(defun yas--expand-or-prompt-for-template (templates &optional start end)
+  "Expand one of TEMPLATES from START to END.
+
+Prompt the user if TEMPLATES has more than one element, else
+expand immediately.  Common gateway for
+`yas-expand-from-trigger-key' and `yas-expand-from-keymap'."
+  (let ((yas--current-template (or (and (rest templates) ;; more than one
+                                        (yas--prompt-for-template (mapcar #'cdr templates)))
+                                   (cdar templates))))
+    (when yas--current-template
+      (yas-expand-snippet (yas--template-content yas--current-template)
+                          start
+                          end
+                          (yas--template-expand-env yas--current-template)))))
+
+;; Apropos the trigger key and the fallback binding:
+;;
+;; When `yas-minor-mode-map' binds <tab>, that correctly overrides
+;; org-mode's <tab>, for example and searching for fallbacks correctly
+;; returns `org-cycle'. However, most other modes bind "TAB". TODO,
+;; improve this explanation.
+;;
+(defun yas--fallback ()
+  "Fallback after expansion has failed.
+
+Common gateway for `yas-expand-from-trigger-key' and
+`yas-expand-from-keymap'."
+  (cond ((eq yas-fallback-behavior 'return-nil)
+         ;; return nil
+         nil)
+        ((eq yas-fallback-behavior 'yas--fallback)
+         (error (concat "yasnippet fallback loop!\n"
+                        "This can happen when you bind `yas-expand' "
+                        "outside of the `yas-minor-mode-map'.")))
+        ((eq yas-fallback-behavior 'call-other-command)
+         (let* ((yas-fallback-behavior 'yas--fallback)
+                ;; Also bind `yas-minor-mode' to prevent fallback
+                ;; loops when other extensions use mechanisms similar
+                ;; to `yas--keybinding-beyond-yasnippet'. (github #525
+                ;; and #526)
+                ;;
+                (yas-minor-mode nil)
+                (beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
+           (yas--message 4 "Falling back to %s"  beyond-yasnippet)
+           (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
+           (setq this-command beyond-yasnippet)
+           (when beyond-yasnippet
+             (call-interactively beyond-yasnippet))))
+        ((and (listp yas-fallback-behavior)
+              (cdr yas-fallback-behavior)
+              (eq 'apply (car yas-fallback-behavior)))
+         (let ((command-or-fn (cadr yas-fallback-behavior))
+               (args (cddr yas-fallback-behavior))
+               (yas-fallback-behavior 'yas--fallback)
+               (yas-minor-mode nil))
+           (if args
+               (apply command-or-fn args)
+             (when (commandp command-or-fn)
+               (setq this-command command-or-fn)
+               (call-interactively command-or-fn)))))
+        (t
+         ;; also return nil if all the other fallbacks have failed
+         nil)))
+
+(defun yas--keybinding-beyond-yasnippet ()
+  "Get current keys's binding as if YASsnippet didn't exist."
+  (let* ((yas-minor-mode nil)
+         (yas--direct-keymaps nil)
+         (keys (this-single-command-keys)))
+    (or (key-binding keys t)
+        (key-binding (yas--fallback-translate-input keys) t))))
+
+(defun yas--fallback-translate-input (keys)
+  "Emulate `read-key-sequence', at least what I think it does.
+
+Keys should be an untranslated key vector.  Returns a translated
+vector of keys.  FIXME not thoroughly tested."
+  (let ((retval [])
+        (i 0))
+    (while (< i (length keys))
+      (let ((j i)
+            (translated local-function-key-map))
+        (while (and (< j (length keys))
+                    translated
+                    (keymapp translated))
+          (setq translated (cdr (assoc (aref keys j) (remove 'keymap translated)))
+                j (1+ j)))
+        (setq retval (vconcat retval (cond ((symbolp translated)
+                                            `[,translated])
+                                           ((vectorp translated)
+                                            translated)
+                                           (t
+                                            (substring keys i j)))))
+        (setq i j)))
+    retval))
+
+
+;;; Utils for snippet development:
+
+(defun yas--all-templates (tables)
+  "Get `yas--template' objects in TABLES, applicable for buffer and point.
+
+Honours `yas-choose-tables-first', `yas-choose-keys-first' and
+`yas-buffer-local-condition'"
+  (when yas-choose-tables-first
+    (setq tables (list (yas--prompt-for-table tables))))
+  (mapcar #'cdr
+          (if yas-choose-keys-first
+              (let ((key (yas--prompt-for-keys
+                          (mapcan #'yas--table-all-keys tables))))
+                (when key
+                  (mapcan #'(lambda (table)
+                              (yas--fetch table key))
+                          tables)))
+            (remove-duplicates (mapcan #'yas--table-templates tables)
+                               :test #'equal))))
+
+(defun yas--lookup-snippet-1 (name mode)
+  "Get the snippet called NAME in MODE's tables."
+  (let ((yas-choose-tables-first nil)   ; avoid prompts
+        (yas-choose-keys-first nil))
+    (cl-find name (yas--all-templates
+                   (yas--get-snippet-tables mode))
+             :key #'yas--template-name :test #'string=)))
+
+(defun yas-lookup-snippet (name &optional mode noerror)
+  "Get the snippet content for the snippet NAME in MODE's tables.
+
+MODE defaults to the current buffer's `major-mode'.  If NOERROR
+is non-nil, then don't signal an error if there isn't any snippet
+called NAME.
+
+Honours `yas-buffer-local-condition'."
+  (let ((snippet (yas--lookup-snippet-1 name mode)))
+    (cond
+     (snippet (yas--template-content snippet))
+     (noerror nil)
+     (t (error "No snippet named: %s" name)))))
+
+(defun yas-insert-snippet (&optional no-condition)
+  "Choose a snippet to expand, pop-up a list of choices according
+to `yas-prompt-functions'.
+
+With prefix argument NO-CONDITION, bypass filtering of snippets
+by condition."
+  (interactive "P")
+  (setq yas--condition-cache-timestamp (current-time))
+  (let* ((yas-buffer-local-condition (or (and no-condition
+                                              'always)
+                                         yas-buffer-local-condition))
+         (templates (yas--all-templates (yas--get-snippet-tables)))
+         (yas--current-template (and templates
+                                    (or (and (rest templates) ;; more than one template for same key
+                                             (yas--prompt-for-template templates))
+                                        (car templates))))
+         (where (if (region-active-p)
+                    (cons (region-beginning) (region-end))
+                  (cons (point) (point)))))
+    (if yas--current-template
+        (yas-expand-snippet (yas--template-content yas--current-template)
+                            (car where)
+                            (cdr where)
+                            (yas--template-expand-env yas--current-template))
+      (yas--message 3 "No snippets can be inserted here!"))))
+
+(defun yas-visit-snippet-file ()
+  "Choose a snippet to edit, selection like `yas-insert-snippet'.
+
+Only success if selected snippet was loaded from a file.  Put the
+visited file in `snippet-mode'."
+  (interactive)
+  (let* ((yas-buffer-local-condition 'always)
+         (templates (yas--all-templates (yas--get-snippet-tables)))
+         (template (and templates
+                        (or (yas--prompt-for-template templates
+                                                     "Choose a snippet template to edit: ")
+                            (car templates)))))
+
+    (if template
+        (yas--visit-snippet-file-1 template)
+      (message "No snippets tables active!"))))
+
+(defun yas--visit-snippet-file-1 (template)
+  "Helper for `yas-visit-snippet-file'."
+  (let ((file (yas--template-get-file template)))
+    (cond ((and file (file-readable-p file))
+           (find-file-other-window file)
+           (snippet-mode)
+           (set (make-local-variable 'yas--editing-template) template))
+          (file
+           (message "Original file %s no longer exists!" file))
+          (t
+           (switch-to-buffer (format "*%s*"(yas--template-name template)))
+           (let ((type 'snippet))
+             (when (listp (yas--template-content template))
+               (insert (format "# type: command\n"))
+               (setq type 'command))
+             (insert (format "# key: %s\n" (yas--template-key template)))
+             (insert (format "# name: %s\n" (yas--template-name template)))
+             (when (yas--template-keybinding template)
+               (insert (format "# binding: %s\n" (yas--template-keybinding template))))
+             (when (yas--template-expand-env template)
+               (insert (format "# expand-env: %s\n" (yas--template-expand-env template))))
+             (when (yas--template-condition template)
+               (insert (format "# condition: %s\n" (yas--template-condition template))))
+             (insert "# --\n")
+             (insert (if (eq type 'command)
+                         (pp-to-string (yas--template-content template))
+                       (yas--template-content template))))
+           (snippet-mode)
+           (set (make-local-variable 'yas--editing-template) template)))))
+
+(defun yas--guess-snippet-directories-1 (table)
+  "Guess possible snippet subdirectories for TABLE."
+  (cons (yas--table-name table)
+        (mapcan #'(lambda (parent)
+                    (yas--guess-snippet-directories-1
+                     parent))
+                (yas--table-parents table))))
+
+(defun yas--guess-snippet-directories (&optional table)
+  "Try to guess suitable directories based on the current active
+tables (or optional TABLE).
+
+Returns a list of elements (TABLE . DIRS) where TABLE is a
+`yas--table' object and DIRS is a list of all possible directories
+where snippets of table might exist."
+  (let ((main-dir (replace-regexp-in-string
+                   "/+$" ""
+                   (or (first (or (yas-snippet-dirs)
+                                  (setq yas-snippet-dirs (list yas--default-user-snippets-dir)))))))
+        (tables (or (and table
+                         (list table))
+                    (yas--get-snippet-tables))))
+    ;; HACK! the snippet table created here is actually registered!
+    ;;
+    (unless (or table (gethash major-mode yas--tables))
+      (push (yas--table-get-create major-mode)
+            tables))
+
+    (mapcar #'(lambda (table)
+                (cons table
+                      (mapcar #'(lambda (subdir)
+                                  (concat main-dir "/" subdir))
+                              (yas--guess-snippet-directories-1 table))))
+            tables)))
+
+(defun yas--make-directory-maybe (table-and-dirs &optional main-table-string)
+  "Return a dir inside TABLE-AND-DIRS, prompts for creation if none exists."
+  (or (some #'(lambda (dir) (when (file-directory-p dir) dir)) (cdr table-and-dirs))
+      (let ((candidate (first (cdr table-and-dirs))))
+        (unless (file-writable-p (file-name-directory candidate))
+          (error (yas--format "%s is not writable." candidate)))
+        (if (y-or-n-p (format "Guessed directory (%s) for%s%s table \"%s\" does not exist! Create? "
+                              candidate
+                              (if (gethash (yas--table-mode (car table-and-dirs))
+                                           yas--tables)
+                                  ""
+                                " brand new")
+                              (or main-table-string
+                                  "")
+                              (yas--table-name (car table-and-dirs))))
+            (progn
+              (make-directory candidate 'also-make-parents)
+              ;; create the .yas-parents file here...
+              candidate)))))
+
+(defun yas-new-snippet (&optional no-template)
+  "Pops a new buffer for writing a snippet.
+
+Expands a snippet-writing snippet, unless the optional prefix arg
+NO-TEMPLATE is non-nil."
+  (interactive "P")
+  (let ((guessed-directories (yas--guess-snippet-directories)))
+
+    (switch-to-buffer "*new snippet*")
+    (erase-buffer)
+    (kill-all-local-variables)
+    (snippet-mode)
+    (yas-minor-mode 1)
+    (set (make-local-variable 'yas--guessed-modes) (mapcar #'(lambda (d)
+                                                              (yas--table-mode (car d)))
+                                                          guessed-directories))
+    (if (and (not no-template) yas-new-snippet-default)
+        (yas-expand-snippet yas-new-snippet-default))))
+
+(defun yas--compute-major-mode-and-parents (file)
+  "Given FILE, find the nearest snippet directory for a given mode.
+
+Returns a list (MODE-SYM PARENTS), the mode's symbol and a list
+representing one or more of the mode's parents.
+
+Note that MODE-SYM need not be the symbol of a real major mode,
+neither do the elements of PARENTS."
+  (let* ((file-dir (and file
+                        (directory-file-name (or (some #'(lambda (special)
+                                                           (locate-dominating-file file special))
+                                                       '(".yas-setup.el"
+                                                         ".yas-make-groups"
+                                                         ".yas-parents"))
+                                                 (directory-file-name (file-name-directory file))))))
+         (parents-file-name (concat file-dir "/.yas-parents"))
+         (major-mode-name (and file-dir
+                               (file-name-nondirectory file-dir)))
+         (major-mode-sym (or (and major-mode-name
+                                  (intern major-mode-name))))
+         (parents (when (file-readable-p parents-file-name)
+                         (mapcar #'intern
+                                 (split-string
+                                  (with-temp-buffer
+                                    (insert-file-contents parents-file-name)
+                                    (buffer-substring-no-properties (point-min)
+                                                                    (point-max))))))))
+    (when major-mode-sym
+      (cons major-mode-sym (remove major-mode-sym parents)))))
+
+(defvar yas--editing-template nil
+  "Supporting variable for `yas-load-snippet-buffer' and `yas--visit-snippet'.")
+
+(defvar yas--current-template nil
+  "Holds the current template being expanded into a snippet.")
+
+(defvar yas--guessed-modes nil
+  "List of guessed modes supporting `yas-load-snippet-buffer'.")
+
+(defun yas--read-table ()
+  "Ask user for a snippet table, help with some guessing."
+  (let ((prompt (if (and (featurep 'ido)
+                         ido-mode)
+                    'ido-completing-read 'completing-read)))
+    (unless yas--guessed-modes
+      (set (make-local-variable 'yas--guessed-modes)
+           (or (yas--compute-major-mode-and-parents buffer-file-name))))
+    (intern
+     (funcall prompt (format "Choose or enter a table (yas guesses %s): "
+                             (if yas--guessed-modes
+                                 (first yas--guessed-modes)
+                               "nothing"))
+              (mapcar #'symbol-name yas--guessed-modes)
+              nil
+              nil
+              nil
+              nil
+              (if (first yas--guessed-modes)
+                  (symbol-name (first yas--guessed-modes)))))))
+
+(defun yas-load-snippet-buffer (table &optional interactive)
+  "Parse and load current buffer's snippet definition into TABLE.
+
+TABLE is a symbol naming a passed to `yas--table-get-create'.
+
+When called interactively, prompt for the table name."
+  (interactive (list (yas--read-table) t))
+  (cond
+   ;;  We have `yas--editing-template', this buffer's content comes from a
+   ;;  template which is already loaded and neatly positioned,...
+   ;;
+   (yas--editing-template
+    (yas--define-snippets-1 (yas--parse-template (yas--template-load-file yas--editing-template))
+                           (yas--template-table yas--editing-template)))
+   ;; Try to use `yas--guessed-modes'. If we don't have that use the
+   ;; value from `yas--compute-major-mode-and-parents'
+   ;;
+   (t
+    (unless yas--guessed-modes
+      (set (make-local-variable 'yas--guessed-modes) (or (yas--compute-major-mode-and-parents buffer-file-name))))
+    (let* ((table (yas--table-get-create table)))
+      (set (make-local-variable 'yas--editing-template)
+           (yas--define-snippets-1 (yas--parse-template buffer-file-name)
+                                  table)))))
+  (when interactive
+    (yas--message 3 "Snippet \"%s\" loaded for %s."
+                  (yas--template-name yas--editing-template)
+                  (yas--table-name (yas--template-table yas--editing-template)))))
+
+(defun yas-load-snippet-buffer-and-close (table &optional kill)
+  "Load the snippet with `yas-load-snippet-buffer', possibly
+  save, then `quit-window' if saved.
+
+If the snippet is new, ask the user whether (and where) to save
+it. If the snippet already has a file, just save it.
+
+The prefix argument KILL is passed to `quit-window'.
+
+Don't use this from a Lisp program, call `yas-load-snippet-buffer'
+and `kill-buffer' instead."
+  (interactive (list (yas--read-table) current-prefix-arg))
+  (yas-load-snippet-buffer table t)
+  (let ((file (yas--template-get-file yas--editing-template)))
+    (when (and (or
+                ;; Only offer to save this if it looks like a library or new
+                ;; snippet (loaded from elisp, from a dir in `yas-snippet-dirs'
+                ;; which is not the first, or from an unwritable file)
+                ;;
+                (not file)
+                (not (file-writable-p file))
+                (and (cdr-safe yas-snippet-dirs)
+                     (not (string-prefix-p (expand-file-name (car yas-snippet-dirs)) file))))
+               (y-or-n-p (yas--format "Looks like a library or new snippet. Save to new file? ")))
+      (let* ((option (first (yas--guess-snippet-directories (yas--template-table yas--editing-template))))
+             (chosen (and option
+                          (yas--make-directory-maybe option))))
+        (when chosen
+          (let ((default-file-name (or (and file (file-name-nondirectory file))
+                                       (yas--template-name yas--editing-template))))
+            (write-file (concat chosen "/"
+                                (read-from-minibuffer (format "File name to create in %s? " chosen)
+                                                      default-file-name)))
+            (setf (yas--template-load-file yas--editing-template) buffer-file-name))))))
+  (when buffer-file-name
+    (save-buffer)
+    (quit-window kill)))
+
+(defun yas-tryout-snippet (&optional debug)
+  "Test current buffer's snippet template in other buffer."
+  (interactive "P")
+  (let* ((major-mode-and-parent (yas--compute-major-mode-and-parents buffer-file-name))
+         (parsed (yas--parse-template))
+         (test-mode (or (and (car major-mode-and-parent)
+                             (fboundp (car major-mode-and-parent))
+                             (car major-mode-and-parent))
+                        (first yas--guessed-modes)
+                        (intern (read-from-minibuffer (yas--format "Please input a mode: ")))))
+         (yas--current-template
+          (and parsed
+               (fboundp test-mode)
+               (yas--make-template :table       nil ;; no tables for ephemeral snippets
+                                   :key         (first parsed)
+                                   :content     (second parsed)
+                                   :name        (third parsed)
+                                   :expand-env  (sixth parsed)))))
+    (cond (yas--current-template
+           (let ((buffer-name (format "*testing snippet: %s*" (yas--template-name yas--current-template))))
+             (kill-buffer (get-buffer-create buffer-name))
+             (switch-to-buffer (get-buffer-create buffer-name))
+             (setq buffer-undo-list nil)
+             (condition-case nil (funcall test-mode) (error nil))
+	     (yas-minor-mode 1)
+             (setq buffer-read-only nil)
+             (yas-expand-snippet (yas--template-content yas--current-template)
+                                 (point-min)
+                                 (point-max)
+                                 (yas--template-expand-env yas--current-template))
+             (when (and debug
+                        (require 'yasnippet-debug nil t))
+               (add-hook 'post-command-hook 'yas-debug-snippet-vars nil t))))
+          (t
+           (yas--message 3 "Cannot test snippet for unknown major mode")))))
+
+(defun yas-active-keys ()
+  "Return all active trigger keys for current buffer and point."
+  (remove-duplicates
+   (remove-if-not #'stringp (mapcan #'yas--table-all-keys (yas--get-snippet-tables)))
+   :test #'string=))
+
+(defun yas--template-fine-group (template)
+  (car (last (or (yas--template-group template)
+                 (yas--template-perm-group template)))))
+
+(defun yas-describe-tables (&optional choose)
+  "Display snippets for each table."
+  (interactive "P")
+  (let* ((by-name-hash (and choose
+                            (y-or-n-p "Show by namehash? ")))
+         (buffer (get-buffer-create "*YASnippet tables*"))
+         (active-tables (yas--get-snippet-tables))
+         (remain-tables (let ((all))
+                          (maphash #'(lambda (_k v)
+                                       (unless (find v active-tables)
+                                         (push v all)))
+                                   yas--tables)
+                          all))
+         (table-lists (list active-tables remain-tables))
+         (original-buffer (current-buffer))
+         (continue t)
+         (yas--condition-cache-timestamp (current-time)))
+    (with-current-buffer buffer
+      (setq buffer-read-only nil)
+      (erase-buffer)
+      (cond ((not by-name-hash)
+             (insert "YASnippet tables: \n")
+             (while (and table-lists
+                         continue)
+               (dolist (table (car table-lists))
+                 (yas--describe-pretty-table table original-buffer))
+               (setq table-lists (cdr table-lists))
+               (when table-lists
+                 (yas--create-snippet-xrefs)
+                 (display-buffer buffer)
+                 (setq continue (and choose (y-or-n-p "Show also non-active tables? ")))))
+             (yas--create-snippet-xrefs)
+             (help-mode)
+             (goto-char 1))
+            (t
+             (insert "\n\nYASnippet tables by NAMEHASH: \n")
+             (dolist (table (append active-tables remain-tables))
+               (insert (format "\nSnippet table `%s':\n\n" (yas--table-name table)))
+               (let ((keys))
+                 (maphash #'(lambda (k _v)
+                              (push k keys))
+                          (yas--table-hash table))
+                 (dolist (key keys)
+                   (insert (format "   key %s maps snippets: %s\n" key
+                                   (let ((names))
+                                     (maphash #'(lambda (k _v)
+                                                  (push k names))
+                                              (gethash key (yas--table-hash table)))
+                                     names))))))))
+      (goto-char 1)
+      (setq buffer-read-only t))
+    (display-buffer buffer)))
+
+(defun yas--describe-pretty-table (table &optional original-buffer)
+  (insert (format "\nSnippet table `%s'"
+                  (yas--table-name table)))
+  (if (yas--table-parents table)
+      (insert (format " parents: %s\n"
+                      (mapcar #'yas--table-name
+                              (yas--table-parents table))))
+    (insert "\n"))
+  (insert (make-string 100 ?-) "\n")
+  (insert "group                   state name                                    key             binding\n")
+  (let ((groups-hash (make-hash-table :test #'equal)))
+    (maphash #'(lambda (_k v)
+                 (let ((group (or (yas--template-fine-group v)
+                                  "(top level)")))
+                   (when (yas--template-name v)
+                     (puthash group
+                              (cons v (gethash group groups-hash))
+                              groups-hash))))
+             (yas--table-uuidhash table))
+    (maphash
+     #'(lambda (group templates)
+         (setq group (truncate-string-to-width group 25 0 ?  "..."))
+         (insert (make-string 100 ?-) "\n")
+         (dolist (p templates)
+           (let ((name (truncate-string-to-width (propertize (format "\\\\snippet `%s'" (yas--template-name p))
+                                                             'yasnippet p)
+                                                 50 0 ? "..."))
+                 (group (prog1 group
+                          (setq group (make-string (length group) ? ))))
+                 (condition-string (let ((condition (yas--template-condition p)))
+                                     (if (and condition
+                                              original-buffer)
+                                         (with-current-buffer original-buffer
+                                           (if (yas--eval-condition condition)
+                                               "(y)"
+                                             "(s)"))
+                                       "(a)"))))
+             (insert group " ")
+             (insert condition-string " ")
+             (insert name
+                     (if (string-match "\\.\\.\\.$" name)
+                         "'"
+                       " ")
+                     " ")
+             (insert (truncate-string-to-width (or (yas--template-key p) "")
+                                               15 0 ?  "...") " ")
+             (insert (truncate-string-to-width (key-description (yas--template-keybinding p))
+                                               15 0 ?  "...") " ")
+             (insert "\n"))))
+     groups-hash)))
+
+
+
+;;; User convenience functions, for using in `yas-key-syntaxes'
+
+(defun yas-try-key-from-whitespace (_start-point)
+  "As `yas-key-syntaxes' element, look for whitespace delimited key.
+
+A newline will be considered whitespace even if the mode syntax
+marks it as something else (typically comment ender)."
+  (skip-chars-backward "^[:space:]\n"))
+
+(defun yas-shortest-key-until-whitespace (_start-point)
+  "Like `yas-longest-key-from-whitespace' but take the shortest key."
+  (when (/= (skip-chars-backward "^[:space:]\n" (1- (point))) 0)
+    'again))
+
+(defun yas-longest-key-from-whitespace (start-point)
+  "As `yas-key-syntaxes' element, look for longest key between point and whitespace.
+
+A newline will be considered whitespace even if the mode syntax
+marks it as something else (typically comment ender)."
+  (if (= (point) start-point)
+      (yas-try-key-from-whitespace start-point)
+    (forward-char))
+  (unless (<= start-point (1+ (point)))
+    'again))
+
+
+
+;;; User convenience functions, for using in snippet definitions
+
+(defvar yas-modified-p nil
+  "Non-nil if field has been modified by user or transformation.")
+
+(defvar yas-moving-away-p nil
+  "Non-nil if user is about to exit field.")
+
+(defvar yas-text nil
+  "Contains current field text.")
+
+(defun yas-substr (str pattern &optional subexp)
+  "Search PATTERN in STR and return SUBEXPth match.
+
+If found, the content of subexp group SUBEXP (default 0) is
+  returned, or else the original STR will be returned."
+  (let ((grp (or subexp 0)))
+    (save-match-data
+      (if (string-match pattern str)
+          (match-string-no-properties grp str)
+        str))))
+
+(defun yas-choose-value (&rest possibilities)
+  "Prompt for a string in POSSIBILITIES and return it.
+
+The last element of POSSIBILITIES may be a list of strings."
+  (unless (or yas-moving-away-p
+              yas-modified-p)
+    (let* ((last-link (last possibilities))
+           (last-elem (car last-link)))
+      (when (listp last-elem)
+        (setcar last-link (car last-elem))
+        (setcdr last-link (cdr last-elem))))
+    (some #'(lambda (fn)
+              (funcall fn "Choose: " possibilities))
+          yas-prompt-functions)))
+
+(defun yas-key-to-value (alist)
+  (unless (or yas-moving-away-p
+              yas-modified-p)
+    (let ((key (read-key-sequence "")))
+      (when (stringp key)
+        (or (cdr (find key alist :key #'car :test #'string=))
+            key)))))
+
+(defun yas-throw (text)
+  "Throw a yas--exception with TEXT as the reason."
+  (throw 'yas--exception (cons 'yas--exception text)))
+
+(defun yas-verify-value (possibilities)
+  "Verify that the current field value is in POSSIBILITIES.
+
+Otherwise throw exception."
+  (when (and yas-moving-away-p (notany #'(lambda (pos) (string= pos yas-text)) possibilities))
+    (yas-throw (yas--format "Field only allows %s" possibilities))))
+
+(defun yas-field-value (number)
+  "Get the string for field with NUMBER.
+
+Use this in primary and mirror transformations to tget."
+  (let* ((snippet (car (yas--snippets-at-point)))
+         (field (and snippet
+                     (yas--snippet-find-field snippet number))))
+    (when field
+      (yas--field-text-for-display field))))
+
+(defun yas-text ()
+  "Return `yas-text' if that exists and is non-empty, else nil."
+  (if (and yas-text
+           (not (string= "" yas-text)))
+      yas-text))
+
+(defun yas-selected-text ()
+  "Return `yas-selected-text' if that exists and is non-empty, else nil."
+  (if (and yas-selected-text
+           (not (string= "" yas-selected-text)))
+      yas-selected-text))
+
+(defun yas--get-field-once (number &optional transform-fn)
+  (unless yas-modified-p
+    (if transform-fn
+        (funcall transform-fn (yas-field-value number))
+      (yas-field-value number))))
+
+(defun yas-default-from-field (number)
+  (unless yas-modified-p
+    (yas-field-value number)))
+
+(defun yas-inside-string ()
+  "Return non-nil if the point is inside a string according to font-lock."
+  (equal 'font-lock-string-face (get-char-property (1- (point)) 'face)))
+
+(defun yas-unimplemented (&optional missing-feature)
+  (if yas--current-template
+      (if (y-or-n-p (format "This snippet is unimplemented (missing %s) Visit the snippet definition? "
+                            (or missing-feature
+                                "something")))
+          (yas--visit-snippet-file-1 yas--current-template))
+    (message "No implementation. Missing %s" (or missing-feature "something"))))
+
+
+;;; Snippet expansion and field management
+
+(defvar yas--active-field-overlay nil
+  "Overlays the currently active field.")
+
+(defvar yas--field-protection-overlays nil
+  "Two overlays protect the current active field.")
+
+(defvar yas-selected-text nil
+  "The selected region deleted on the last snippet expansion.")
+
+(defvar yas--start-column nil
+  "The column where the snippet expansion started.")
+
+(make-variable-buffer-local 'yas--active-field-overlay)
+(make-variable-buffer-local 'yas--field-protection-overlays)
+(put 'yas--active-field-overlay 'permanent-local t)
+(put 'yas--field-protection-overlays 'permanent-local t)
+
+(defstruct (yas--snippet (:constructor yas--make-snippet ()))
+  "A snippet.
+
+..."
+  (fields '())
+  (exit nil)
+  (id (yas--snippet-next-id) :read-only t)
+  (control-overlay nil)
+  active-field
+  ;; stacked expansion: the `previous-active-field' slot saves the
+  ;; active field where the child expansion took place
+  previous-active-field
+  force-exit)
+
+(defstruct (yas--field (:constructor yas--make-field (number start end parent-field)))
+  "A field.
+
+NUMBER is the field number.
+START and END are mostly buffer markers, but see \"apropos markers-to-points\".
+PARENT-FIELD is a `yas--field' this field is nested under, or nil.
+MIRRORS is a list of `yas--mirror's
+TRANSFORM is a lisp form.
+MODIFIED-P is a boolean set to true once user inputs text.
+NEXT is another `yas--field' or `yas--mirror' or `yas--exit'.
+"
+  number
+  start end
+  parent-field
+  (mirrors '())
+  (transform nil)
+  (modified-p nil)
+  next)
+
+
+(defstruct (yas--mirror (:constructor yas--make-mirror (start end transform)))
+  "A mirror.
+
+START and END are mostly buffer markers, but see \"apropos markers-to-points\".
+TRANSFORM is a lisp form.
+PARENT-FIELD is a `yas--field' this mirror is nested under, or nil.
+NEXT is another `yas--field' or `yas--mirror' or `yas--exit'
+DEPTH is a count of how many nested mirrors can affect this mirror"
+  start end
+  (transform nil)
+  parent-field
+  next
+  depth)
+
+(defstruct (yas--exit (:constructor yas--make-exit (marker)))
+  marker
+  next)
+
+(defun yas--apply-transform (field-or-mirror field &optional empty-on-nil-p)
+  "Calculate transformed string for FIELD-OR-MIRROR from FIELD.
+
+If there is no transform for ht field, return nil.
+
+If there is a transform but it returns nil, return the empty
+string iff EMPTY-ON-NIL-P is true."
+  (let* ((yas-text (yas--field-text-for-display field))
+         (yas-modified-p (yas--field-modified-p field))
+         (yas-moving-away-p nil)
+         (transform (if (yas--mirror-p field-or-mirror)
+                        (yas--mirror-transform field-or-mirror)
+                      (yas--field-transform field-or-mirror)))
+         (start-point (if (yas--mirror-p field-or-mirror)
+                          (yas--mirror-start field-or-mirror)
+                        (yas--field-start field-or-mirror)))
+         (transformed (and transform
+                           (save-excursion
+                             (goto-char start-point)
+                             (let ((ret (yas--eval-lisp transform)))
+                               (or ret (and empty-on-nil-p "")))))))
+    transformed))
+
+(defsubst yas--replace-all (from to &optional text)
+  "Replace all occurrences from FROM to TO.
+
+With optional string TEXT do it in that string."
+  (if text
+      (replace-regexp-in-string (regexp-quote from) to text t t)
+    (goto-char (point-min))
+    (while (search-forward from nil t)
+      (replace-match to t t text))))
+
+(defun yas--snippet-find-field (snippet number)
+  (find-if #'(lambda (field)
+               (eq number (yas--field-number field)))
+           (yas--snippet-fields snippet)))
+
+(defun yas--snippet-sort-fields (snippet)
+  "Sort the fields of SNIPPET in navigation order."
+  (setf (yas--snippet-fields snippet)
+        (sort (yas--snippet-fields snippet)
+              #'yas--snippet-field-compare)))
+
+(defun yas--snippet-field-compare (field1 field2)
+  "Compare FIELD1 and FIELD2.
+
+The field with a number is sorted first.  If they both have a
+number, compare through the number.  If neither have, compare
+through the field's start point"
+  (let ((n1 (yas--field-number field1))
+        (n2 (yas--field-number field2)))
+    (if n1
+        (if n2
+            (or (zerop n2) (and (not (zerop n1))
+                                (< n1 n2)))
+          (not (zerop n1)))
+      (if n2
+          (zerop n2)
+        (< (yas--field-start field1)
+           (yas--field-start field2))))))
+
+(defun yas--field-probably-deleted-p (snippet field)
+  "Guess if SNIPPET's FIELD should be skipped."
+  (and
+   ;; field must be zero length
+   ;;
+   (zerop (- (yas--field-start field) (yas--field-end field)))
+   ;; field must have been modified
+   ;;
+   (yas--field-modified-p field)
+   ;; either:
+   (or
+    ;;  1) it's a nested field
+    ;;
+    (yas--field-parent-field field)
+    ;;  2) ends just before the snippet end
+    ;;
+    (and (eq field (car (last (yas--snippet-fields snippet))))
+         (= (yas--field-start field) (overlay-end (yas--snippet-control-overlay snippet)))))
+   ;; the field numbered 0, just before the exit marker, should
+   ;; never be skipped
+   ;;
+   (not (and (yas--field-number field)
+             (zerop (yas--field-number field))))))
+
+(defun yas--snippets-at-point (&optional all-snippets)
+  "Return a sorted list of snippets at point.
+
+The most recently-inserted snippets are returned first."
+  (sort
+   (delq nil (delete-dups
+              (mapcar (lambda (ov) (overlay-get ov 'yas--snippet))
+                      (if all-snippets (overlays-in (point-min) (point-max))
+                        (nconc (overlays-at (point))
+                               (overlays-at (1- (point))))))))
+   #'(lambda (s1 s2)
+       (<= (yas--snippet-id s2) (yas--snippet-id s1)))))
+
+(defun yas-next-field-or-maybe-expand ()
+  "Try to expand a snippet at a key before point.
+
+Otherwise delegate to `yas-next-field'."
+  (interactive)
+  (if yas-triggers-in-field
+      (let ((yas-fallback-behavior 'return-nil)
+            (active-field (overlay-get yas--active-field-overlay 'yas--field)))
+        (when active-field
+          (unless (yas-expand-from-trigger-key active-field)
+            (yas-next-field))))
+    (yas-next-field)))
+
+(defun yas-next-field (&optional arg)
+  "Navigate to the ARGth next field.
+
+If there's none, exit the snippet."
+  (interactive)
+  (let* ((arg (or arg
+                  1))
+         (snippet (first (yas--snippets-at-point)))
+         (active-field (overlay-get yas--active-field-overlay 'yas--field))
+         (live-fields (remove-if #'(lambda (field)
+                                     (and (not (eq field active-field))
+                                          (yas--field-probably-deleted-p snippet field)))
+                                 (yas--snippet-fields snippet)))
+         (active-field-pos (position active-field live-fields))
+         (target-pos (and active-field-pos (+ arg active-field-pos)))
+         (target-field (and target-pos (nth target-pos live-fields))))
+    ;; First check if we're moving out of a field with a transform
+    ;;
+    (when (and active-field
+               (yas--field-transform active-field))
+      (let* ((yas-moving-away-p t)
+             (yas-text (yas--field-text-for-display active-field))
+             (yas-modified-p (yas--field-modified-p active-field)))
+        ;; primary field transform: exit call to field-transform
+        (yas--eval-lisp (yas--field-transform active-field))))
+    ;; Now actually move...
+    (cond ((and target-pos (>= target-pos (length live-fields)))
+           (yas-exit-snippet snippet))
+          (target-field
+           (yas--move-to-field snippet target-field))
+          (t
+           nil))))
+
+(defun yas--place-overlays (snippet field)
+  "Correctly place overlays for SNIPPET's FIELD."
+  (yas--make-move-field-protection-overlays snippet field)
+  (yas--make-move-active-field-overlay snippet field))
+
+(defun yas--move-to-field (snippet field)
+  "Update SNIPPET to move to field FIELD.
+
+Also create some protection overlays"
+  (goto-char (yas--field-start field))
+  (yas--place-overlays snippet field)
+  (overlay-put yas--active-field-overlay 'yas--field field)
+  (let ((number (yas--field-number field)))
+    ;; check for the special ${0: ...} field
+    (if (and number (zerop number))
+        (progn
+          (set-mark (yas--field-end field))
+          (setf (yas--snippet-force-exit snippet)
+                (or (yas--field-transform field)
+                    t)))
+      ;; make this field active
+      (setf (yas--snippet-active-field snippet) field)
+      ;; primary field transform: first call to snippet transform
+      (unless (yas--field-modified-p field)
+        (if (yas--field-update-display field)
+            (yas--update-mirrors snippet)
+          (setf (yas--field-modified-p field) nil))))))
+
+(defun yas-prev-field ()
+  "Navigate to prev field.  If there's none, exit the snippet."
+  (interactive)
+  (yas-next-field -1))
+
+(defun yas-abort-snippet (&optional snippet)
+  (interactive)
+  (let ((snippet (or snippet
+                     (car (yas--snippets-at-point)))))
+    (when snippet
+      (setf (yas--snippet-force-exit snippet) t))))
+
+(defun yas-exit-snippet (snippet)
+  "Goto exit-marker of SNIPPET."
+  (interactive (list (first (yas--snippets-at-point))))
+  (when snippet
+    (setf (yas--snippet-force-exit snippet) t)
+    (goto-char (if (yas--snippet-exit snippet)
+                   (yas--exit-marker (yas--snippet-exit snippet))
+                 (overlay-end (yas--snippet-control-overlay snippet))))))
+
+(defun yas-exit-all-snippets ()
+  "Exit all snippets."
+  (interactive)
+  (mapc #'(lambda (snippet)
+            (yas-exit-snippet snippet)
+            (yas--check-commit-snippet))
+        (yas--snippets-at-point 'all-snippets)))
+
+
+;;; Some low level snippet-routines:
+
+(defvar yas--inhibit-overlay-hooks nil
+  "Bind this temporarily to non-nil to prevent running `yas--on-*-modification'.")
+
+(defvar yas-snippet-beg nil "Beginning position of the last snippet committed.")
+(defvar yas-snippet-end nil "End position of the last snippet committed.")
+
+(defun yas--commit-snippet (snippet)
+  "Commit SNIPPET, but leave point as it is.
+
+This renders the snippet as ordinary text."
+
+  (let ((control-overlay (yas--snippet-control-overlay snippet)))
+    ;;
+    ;; Save the end of the moribund snippet in case we need to revive it
+    ;; its original expansion.
+    ;;
+    (when (and control-overlay
+               (overlay-buffer control-overlay))
+      (setq yas-snippet-beg (overlay-start control-overlay))
+      (setq yas-snippet-end (overlay-end control-overlay))
+      (delete-overlay control-overlay))
+
+    (let ((yas--inhibit-overlay-hooks t))
+      (when yas--active-field-overlay
+        (delete-overlay yas--active-field-overlay))
+      (when yas--field-protection-overlays
+        (mapc #'delete-overlay yas--field-protection-overlays)))
+
+    ;; stacked expansion: if the original expansion took place from a
+    ;; field, make sure we advance it here at least to
+    ;; `yas-snippet-end'...
+    ;;
+    (let ((previous-field (yas--snippet-previous-active-field snippet)))
+      (when (and yas-snippet-end previous-field)
+        (yas--advance-end-maybe previous-field yas-snippet-end)))
+
+    ;; Convert all markers to points,
+    ;;
+    (yas--markers-to-points snippet)
+
+    ;; Take care of snippet revival
+    ;;
+    (if yas-snippet-revival
+        (push `(apply yas--snippet-revive ,yas-snippet-beg ,yas-snippet-end ,snippet)
+              buffer-undo-list)
+      ;; Dismember the snippet... this is useful if we get called
+      ;; again from `yas--take-care-of-redo'....
+      (setf (yas--snippet-fields snippet) nil)))
+
+  (yas--message 3 "Snippet %s exited." (yas--snippet-id snippet)))
+
+(defun yas--safely-run-hooks (hook-var)
+  (condition-case error
+      (run-hooks hook-var)
+    (error
+     (yas--message 3 "%s error: %s" hook-var (error-message-string error)))))
+
+
+(defun yas--check-commit-snippet ()
+  "Check if point exited the currently active field of the snippet.
+
+If so cleans up the whole snippet up."
+  (let* ((snippets (yas--snippets-at-point 'all-snippets))
+         (snippets-left snippets)
+         (snippet-exit-transform))
+    (dolist (snippet snippets)
+      (let ((active-field (yas--snippet-active-field snippet)))
+        (setq snippet-exit-transform (yas--snippet-force-exit snippet))
+        (cond ((or snippet-exit-transform
+                   (not (and active-field (yas--field-contains-point-p active-field))))
+               (setq snippets-left (delete snippet snippets-left))
+               (setf (yas--snippet-force-exit snippet) nil)
+               (yas--commit-snippet snippet))
+              ((and active-field
+                    (or (not yas--active-field-overlay)
+                        (not (overlay-buffer yas--active-field-overlay))))
+               ;;
+               ;; stacked expansion: this case is mainly for recent
+               ;; snippet exits that place us back int the field of
+               ;; another snippet
+               ;;
+               (save-excursion
+                 (yas--move-to-field snippet active-field)
+                 (yas--update-mirrors snippet)))
+              (t
+               nil))))
+    (unless (or (null snippets) snippets-left)
+      (if snippet-exit-transform
+          (yas--eval-lisp-no-saves snippet-exit-transform))
+      (yas--safely-run-hooks 'yas-after-exit-snippet-hook))))
+
+;; Apropos markers-to-points:
+;;
+;; This was found useful for performance reasons, so that an
+;; excessive number of live markers aren't kept around in the
+;; `buffer-undo-list'. However, in `markers-to-points', the
+;; set-to-nil markers can't simply be discarded and replaced with
+;; fresh ones in `points-to-markers'. The original marker that was
+;; just set to nil has to be reused.
+;;
+;; This shouldn't bring horrible problems with undo/redo, but it
+;; you never know
+;;
+(defun yas--markers-to-points (snippet)
+  "Convert all markers in SNIPPET to a cons (POINT . MARKER)
+where POINT is the original position of the marker and MARKER is
+the original marker object with the position set to nil."
+  (dolist (field (yas--snippet-fields snippet))
+    (let ((start (marker-position (yas--field-start field)))
+          (end (marker-position (yas--field-end field))))
+      (set-marker (yas--field-start field) nil)
+      (set-marker (yas--field-end field) nil)
+      (setf (yas--field-start field) (cons start (yas--field-start field)))
+      (setf (yas--field-end field) (cons end (yas--field-end field))))
+    (dolist (mirror (yas--field-mirrors field))
+      (let ((start (marker-position (yas--mirror-start mirror)))
+            (end (marker-position (yas--mirror-end mirror))))
+        (set-marker (yas--mirror-start mirror) nil)
+        (set-marker (yas--mirror-end mirror) nil)
+        (setf (yas--mirror-start mirror) (cons start (yas--mirror-start mirror)))
+        (setf (yas--mirror-end mirror) (cons end (yas--mirror-end mirror))))))
+  (let ((snippet-exit (yas--snippet-exit snippet)))
+    (when snippet-exit
+      (let ((exit (marker-position (yas--exit-marker snippet-exit))))
+        (set-marker (yas--exit-marker snippet-exit) nil)
+        (setf (yas--exit-marker snippet-exit) (cons exit (yas--exit-marker snippet-exit)))))))
+
+(defun yas--points-to-markers (snippet)
+  "Convert all cons (POINT . MARKER) in SNIPPET to markers.
+
+This is done by setting MARKER to POINT with `set-marker'."
+  (dolist (field (yas--snippet-fields snippet))
+    (setf (yas--field-start field) (set-marker (cdr (yas--field-start field))
+                                              (car (yas--field-start field))))
+    (setf (yas--field-end field) (set-marker (cdr (yas--field-end field))
+                                            (car (yas--field-end field))))
+    (dolist (mirror (yas--field-mirrors field))
+      (setf (yas--mirror-start mirror) (set-marker (cdr (yas--mirror-start mirror))
+                                                  (car (yas--mirror-start mirror))))
+      (setf (yas--mirror-end mirror) (set-marker (cdr (yas--mirror-end mirror))
+                                                (car (yas--mirror-end mirror))))))
+  (let ((snippet-exit (yas--snippet-exit snippet)))
+    (when snippet-exit
+      (setf (yas--exit-marker snippet-exit) (set-marker (cdr (yas--exit-marker snippet-exit))
+                                                       (car (yas--exit-marker snippet-exit)))))))
+
+(defun yas--field-contains-point-p (field &optional point)
+  (let ((point (or point
+                   (point))))
+    (and (>= point (yas--field-start field))
+         (<= point (yas--field-end field)))))
+
+(defun yas--field-text-for-display (field)
+  "Return the propertized display text for field FIELD."
+  (buffer-substring (yas--field-start field) (yas--field-end field)))
+
+(defun yas--undo-in-progress ()
+  "True if some kind of undo is in progress."
+  (or undo-in-progress
+      (eq this-command 'undo)
+      (eq this-command 'redo)))
+
+(defun yas--make-control-overlay (snippet start end)
+  "Create the control overlay that surrounds the snippet and
+holds the keymap."
+  (let ((overlay (make-overlay start
+                               end
+                               nil
+                               nil
+                               t)))
+    (overlay-put overlay 'keymap yas-keymap)
+    (overlay-put overlay 'priority 100)
+    (overlay-put overlay 'yas--snippet snippet)
+    overlay))
+
+(defun yas-skip-and-clear-or-delete-char (&optional field)
+  "Clears unmodified field if at field start, skips to next tab.
+
+Otherwise deletes a character normally by calling `delete-char'."
+  (interactive)
+  (let ((field (or field
+                   (and yas--active-field-overlay
+                        (overlay-buffer yas--active-field-overlay)
+                        (overlay-get yas--active-field-overlay 'yas--field)))))
+    (cond ((and field
+                (not (yas--field-modified-p field))
+                (eq (point) (marker-position (yas--field-start field))))
+           (yas--skip-and-clear field)
+           (yas-next-field 1))
+          (t
+           (call-interactively 'delete-char)))))
+
+(defun yas--skip-and-clear (field)
+  "Deletes the region of FIELD and sets it's modified state to t."
+  ;; Just before skipping-and-clearing the field, mark its children
+  ;; fields as modified, too. If the children have mirrors-in-fields
+  ;; this prevents them from updating erroneously (we're skipping and
+  ;; deleting!).
+  ;;
+  (yas--mark-this-and-children-modified field)
+  (delete-region (yas--field-start field) (yas--field-end field)))
+
+(defun yas--mark-this-and-children-modified (field)
+  (setf (yas--field-modified-p field) t)
+  (let ((fom (yas--field-next field)))
+    (while (and fom
+                (yas--fom-parent-field fom))
+      (when (and (eq (yas--fom-parent-field fom) field)
+                 (yas--field-p fom))
+        (yas--mark-this-and-children-modified fom))
+      (setq fom (yas--fom-next fom)))))
+
+(defun yas--make-move-active-field-overlay (snippet field)
+  "Place the active field overlay in SNIPPET's FIELD.
+
+Move the overlay, or create it if it does not exit."
+  (if (and yas--active-field-overlay
+           (overlay-buffer yas--active-field-overlay))
+      (move-overlay yas--active-field-overlay
+                    (yas--field-start field)
+                    (yas--field-end field))
+    (setq yas--active-field-overlay
+          (make-overlay (yas--field-start field)
+                        (yas--field-end field)
+                        nil nil t))
+    (overlay-put yas--active-field-overlay 'priority 100)
+    (overlay-put yas--active-field-overlay 'face 'yas-field-highlight-face)
+    (overlay-put yas--active-field-overlay 'yas--snippet snippet)
+    (overlay-put yas--active-field-overlay 'modification-hooks '(yas--on-field-overlay-modification))
+    (overlay-put yas--active-field-overlay 'insert-in-front-hooks
+                 '(yas--on-field-overlay-modification))
+    (overlay-put yas--active-field-overlay 'insert-behind-hooks
+                 '(yas--on-field-overlay-modification))))
+
+(defun yas--on-field-overlay-modification (overlay after? _beg _end &optional _length)
+  "Clears the field and updates mirrors, conditionally.
+
+Only clears the field if it hasn't been modified and point is at
+field start.  This hook does nothing if an undo is in progress."
+  (unless (or yas--inhibit-overlay-hooks
+              (not (overlayp yas--active-field-overlay)) ; Avoid Emacs bug #21824.
+              (yas--undo-in-progress))
+    (let* ((field (overlay-get overlay 'yas--field))
+           (snippet (overlay-get yas--active-field-overlay 'yas--snippet)))
+      (cond (after?
+             (yas--advance-end-maybe field (overlay-end overlay))
+             (save-excursion
+               (yas--field-update-display field))
+             (yas--update-mirrors snippet))
+            (field
+             (when (and (eq this-command 'self-insert-command)
+                        (not (yas--field-modified-p field))
+                        (= (point) (yas--field-start field)))
+               (yas--skip-and-clear field))
+             (setf (yas--field-modified-p field) t))))))
+
+;;; Apropos protection overlays:
+;;
+;; These exist for nasty users who will try to delete parts of the
+;; snippet outside the active field. Actual protection happens in
+;; `yas--on-protection-overlay-modification'.
+;;
+;; As of github #537 this no longer inhibits the command by issuing an
+;; error: all the snippets at point, including nested snippets, are
+;; automatically commited and the current command can proceed.
+;;
+(defun yas--make-move-field-protection-overlays (snippet field)
+  "Place protection overlays surrounding SNIPPET's FIELD.
+
+Move the overlays, or create them if they do not exit."
+  (let ((start (yas--field-start field))
+        (end (yas--field-end field)))
+    ;; First check if the (1+ end) is contained in the buffer,
+    ;; otherwise we'll have to do a bit of cheating and silently
+    ;; insert a newline. the `(1+ (buffer-size))' should prevent this
+    ;; when using stacked expansion
+    ;;
+    (when (< (buffer-size) end)
+      (save-excursion
+        (let ((yas--inhibit-overlay-hooks t))
+          (goto-char (point-max))
+          (newline))))
+    ;; go on to normal overlay creation/moving
+    ;;
+    (cond ((and yas--field-protection-overlays
+                (every #'overlay-buffer yas--field-protection-overlays))
+           (move-overlay (first yas--field-protection-overlays) (1- start) start)
+           (move-overlay (second yas--field-protection-overlays) end (1+ end)))
+          (t
+           (setq yas--field-protection-overlays
+                 (list (make-overlay (1- start) start nil t nil)
+                       (make-overlay end (1+ end) nil t nil)))
+           (dolist (ov yas--field-protection-overlays)
+             (overlay-put ov 'face 'yas--field-debug-face)
+             (overlay-put ov 'yas--snippet snippet)
+             ;; (overlay-put ov 'evaporate t)
+             (overlay-put ov 'modification-hooks '(yas--on-protection-overlay-modification)))))))
+
+(defun yas--on-protection-overlay-modification (_overlay after? _beg _end &optional _length)
+  "Signals a snippet violation, then issues error.
+
+The error should be ignored in `debug-ignored-errors'"
+  (unless (or yas--inhibit-overlay-hooks
+              after?
+              (yas--undo-in-progress))
+    (let ((snippets (yas--snippets-at-point)))
+      (yas--message 3 "Comitting snippets. Action would destroy a protection overlay.")
+      (cl-loop for snippet in snippets
+               do (yas--commit-snippet snippet)))))
+
+(add-to-list 'debug-ignored-errors "^Exit the snippet first!$")
+
+
+;;; Snippet expansion and "stacked" expansion:
+;;
+;; Stacked expansion is when you try to expand a snippet when already
+;; inside a snippet expansion.
+;;
+;; The parent snippet does not run its fields modification hooks
+;; (`yas--on-field-overlay-modification' and
+;; `yas--on-protection-overlay-modification') while the child snippet
+;; is active. This means, among other things, that the mirrors of the
+;; parent snippet are not updated, this only happening when one exits
+;; the child snippet.
+;;
+;; Unfortunately, this also puts some ugly (and not fully-tested)
+;; bits of code in `yas-expand-snippet' and
+;; `yas--commit-snippet'. I've tried to mark them with "stacked
+;; expansion:".
+;;
+;; This was thought to be safer in an undo/redo perspective, but
+;; maybe the correct implementation is to make the globals
+;; `yas--active-field-overlay' and `yas--field-protection-overlays' be
+;; snippet-local and be active even while the child snippet is
+;; running. This would mean a lot of overlay modification hooks
+;; running, but if managed correctly (including overlay priorities)
+;; they should account for all situations...
+;;
+(defun yas-expand-snippet (content &optional start end expand-env)
+  "Expand snippet CONTENT at current point.
+
+Text between START and END will be deleted before inserting
+template.  EXPAND-ENV is a list of (SYM VALUE) let-style dynamic bindings
+considered when expanding the snippet."
+  (cl-assert (and yas-minor-mode
+                  (memq 'yas--post-command-handler post-command-hook))
+             nil
+             "[yas] `yas-expand-snippet' needs properly setup `yas-minor-mode'")
+  (run-hooks 'yas-before-expand-snippet-hook)
+
+  ;;
+  (let* ((yas-selected-text (or yas-selected-text
+                                (and (region-active-p)
+                                     (buffer-substring-no-properties (region-beginning)
+                                                                     (region-end)))))
+         (start (or start
+                    (and (region-active-p)
+                         (region-beginning))
+                    (point)))
+         (end (or end
+                  (and (region-active-p)
+                       (region-end))
+                  (point)))
+         (to-delete (and start
+                         end
+                         (buffer-substring-no-properties start end)))
+         snippet)
+    (goto-char start)
+    (setq yas--indent-original-column (current-column))
+    ;; Delete the region to delete, this *does* get undo-recorded.
+    ;;
+    (when (and to-delete
+               (> end start))
+      (delete-region start end))
+
+    (cond ((listp content)
+           ;; x) This is a snippet-command
+           ;;
+           (yas--eval-lisp-no-saves content))
+          (t
+           ;; x) This is a snippet-snippet :-)
+           ;;
+           ;;    Narrow the region down to the content, shoosh the
+           ;;    `buffer-undo-list', and create the snippet, the new
+           ;;    snippet updates its mirrors once, so we are left with
+           ;;    some plain text.  The undo action for deleting this
+           ;;    plain text will get recorded at the end.
+           ;;
+           ;;    stacked expansion: also shoosh the overlay modification hooks
+           (let ((buffer-undo-list t))
+             ;; snippet creation might evaluate users elisp, which
+             ;; might generate errors, so we have to be ready to catch
+             ;; them mostly to make the undo information
+             ;;
+             (setq yas--start-column (current-column))
+             (let ((yas--inhibit-overlay-hooks t))
+               (setq snippet
+                     (if expand-env
+                         (eval `(let* ,expand-env
+                                  (insert content)
+                                  (yas--snippet-create start (point))))
+                       (insert content)
+                       (yas--snippet-create start (point))))))
+
+           ;; stacked-expansion: This checks for stacked expansion, save the
+           ;; `yas--previous-active-field' and advance its boundary.
+           ;;
+           (let ((existing-field (and yas--active-field-overlay
+                                      (overlay-buffer yas--active-field-overlay)
+                                      (overlay-get yas--active-field-overlay 'yas--field))))
+             (when existing-field
+               (setf (yas--snippet-previous-active-field snippet) existing-field)
+               (yas--advance-end-maybe existing-field (overlay-end yas--active-field-overlay))))
+
+           ;; Exit the snippet immediately if no fields
+           ;;
+           (unless (yas--snippet-fields snippet)
+             (yas-exit-snippet snippet))
+
+           ;; Push two undo actions: the deletion of the inserted contents of
+           ;; the new snippet (without the "key") followed by an apply of
+           ;; `yas--take-care-of-redo' on the newly inserted snippet boundaries
+           ;;
+           ;; A small exception, if `yas-also-auto-indent-first-line'
+           ;; is t and `yas--indent' decides to indent the line to a
+           ;; point before the actual expansion point, undo would be
+           ;; messed up. We call the early point "newstart"".  case,
+           ;; and attempt to fix undo.
+           ;;
+           (let ((newstart (overlay-start (yas--snippet-control-overlay snippet)))
+                 (end (overlay-end (yas--snippet-control-overlay snippet))))
+             (when (< newstart start)
+               (push (cons (make-string (- start newstart) ? ) newstart) buffer-undo-list))
+             (push (cons newstart end) buffer-undo-list)
+             (push `(apply yas--take-care-of-redo ,start ,end ,snippet)
+                   buffer-undo-list))
+           ;; Now, schedule a move to the first field
+           ;;
+           (let ((first-field (car (yas--snippet-fields snippet))))
+             (when first-field
+               (sit-for 0) ;; fix issue 125
+               (yas--move-to-field snippet first-field)))
+           (yas--message 3 "snippet expanded.")
+           t))))
+
+(defun yas--take-care-of-redo (_beg _end snippet)
+  "Commits SNIPPET, which in turn pushes an undo action for reviving it.
+
+Meant to exit in the `buffer-undo-list'."
+  ;; slightly optimize: this action is only needed for snippets with
+  ;; at least one field
+  (when (yas--snippet-fields snippet)
+    (yas--commit-snippet snippet)))
+
+(defun yas--snippet-revive (beg end snippet)
+  "Revives SNIPPET and creates a control overlay from BEG to END.
+
+BEG and END are, we hope, the original snippets boundaries.
+All the markers/points exiting existing inside SNIPPET should point
+to their correct locations *at the time the snippet is revived*.
+
+After revival, push the `yas--take-care-of-redo' in the
+`buffer-undo-list'"
+  ;; Reconvert all the points to markers
+  ;;
+  (yas--points-to-markers snippet)
+  ;; When at least one editable field existed in the zombie snippet,
+  ;; try to revive the whole thing...
+  ;;
+  (let ((target-field (or (yas--snippet-active-field snippet)
+                          (car (yas--snippet-fields snippet)))))
+    (when target-field
+      (setf (yas--snippet-control-overlay snippet) (yas--make-control-overlay snippet beg end))
+      (overlay-put (yas--snippet-control-overlay snippet) 'yas--snippet snippet)
+
+      (yas--move-to-field snippet target-field)
+
+      (push `(apply yas--take-care-of-redo ,beg ,end ,snippet)
+            buffer-undo-list))))
+
+(defun yas--snippet-create (begin end)
+  "Create a snippet from a template inserted at BEGIN to END.
+
+Returns the newly created snippet."
+  (save-restriction
+    (narrow-to-region begin end)
+    (let ((snippet (yas--make-snippet)))
+      (goto-char begin)
+      (yas--snippet-parse-create snippet)
+
+      ;; Sort and link each field
+      (yas--snippet-sort-fields snippet)
+
+      ;; Create keymap overlay for snippet
+      (setf (yas--snippet-control-overlay snippet)
+            (yas--make-control-overlay snippet (point-min) (point-max)))
+
+      ;; Move to end
+      (goto-char (point-max))
+
+      snippet)))
+
+
+;;; Apropos adjacencies and "fom's":
+;;
+;; Once the $-constructs bits like "$n" and "${:n" are deleted in the
+;; recently expanded snippet, we might actually have many fields,
+;; mirrors (and the snippet exit) in the very same position in the
+;; buffer. Therefore we need to single-link the
+;; fields-or-mirrors-or-exit (which I have abbreviated to "fom")
+;; according to their original positions in the buffer.
+;;
+;; Then we have operation `yas--advance-end-maybe' and
+;; `yas--advance-start-maybe', which conditionally push the starts and
+;; ends of these foms down the chain.
+;;
+;; This allows for like the printf with the magic ",":
+;;
+;;   printf ("${1:%s}\\n"${1:$(if (string-match "%" text) "," "\);")}  \
+;;   $2${1:$(if (string-match "%" text) "\);" "")}$0
+;;
+(defun yas--fom-start (fom)
+  (cond ((yas--field-p fom)
+         (yas--field-start fom))
+        ((yas--mirror-p fom)
+         (yas--mirror-start fom))
+        (t
+         (yas--exit-marker fom))))
+
+(defun yas--fom-end (fom)
+  (cond ((yas--field-p fom)
+         (yas--field-end fom))
+        ((yas--mirror-p fom)
+         (yas--mirror-end fom))
+        (t
+         (yas--exit-marker fom))))
+
+(defun yas--fom-next (fom)
+  (cond ((yas--field-p fom)
+         (yas--field-next fom))
+        ((yas--mirror-p fom)
+         (yas--mirror-next fom))
+        (t
+         (yas--exit-next fom))))
+
+(defun yas--fom-parent-field (fom)
+  (cond ((yas--field-p fom)
+         (yas--field-parent-field fom))
+        ((yas--mirror-p fom)
+         (yas--mirror-parent-field fom))
+        (t
+         nil)))
+
+(defun yas--calculate-adjacencies (snippet)
+  "Calculate adjacencies for fields or mirrors of SNIPPET.
+
+This is according to their relative positions in the buffer, and
+has to be called before the $-constructs are deleted."
+  (let* ((fom-set-next-fom
+         (lambda (fom nextfom)
+           (cond ((yas--field-p fom)
+                  (setf (yas--field-next fom) nextfom))
+                 ((yas--mirror-p fom)
+                  (setf (yas--mirror-next fom) nextfom))
+                 (t
+                  (setf (yas--exit-next fom) nextfom)))))
+        (compare-fom-begs
+         (lambda (fom1 fom2)
+           (if (= (yas--fom-start fom2) (yas--fom-start fom1))
+               (yas--mirror-p fom2)
+             (>= (yas--fom-start fom2) (yas--fom-start fom1)))))
+        (link-foms fom-set-next-fom))
+    ;; make some yas--field, yas--mirror and yas--exit soup
+    (let ((soup))
+      (when (yas--snippet-exit snippet)
+        (push (yas--snippet-exit snippet) soup))
+      (dolist (field (yas--snippet-fields snippet))
+        (push field soup)
+        (dolist (mirror (yas--field-mirrors field))
+          (push mirror soup)))
+      (setq soup
+            (sort soup compare-fom-begs))
+      (when soup
+        (reduce link-foms soup)))))
+
+(defun yas--calculate-mirrors-in-fields (snippet mirror)
+  "Attempt to assign a parent field of SNIPPET to the mirror MIRROR.
+
+Use the tightest containing field if more than one field contains
+the mirror.  Intended to be called *before* the dollar-regions are
+deleted."
+  (let ((min (point-min))
+        (max (point-max)))
+    (dolist (field (yas--snippet-fields snippet))
+      (when (and (<= (yas--field-start field) (yas--mirror-start mirror))
+                 (<= (yas--mirror-end mirror) (yas--field-end field))
+               (< min (yas--field-start field))
+               (< (yas--field-end field) max))
+          (setq min (yas--field-start field)
+                max (yas--field-end field))
+          (setf (yas--mirror-parent-field mirror) field)))))
+
+(defun yas--advance-end-maybe (fom newend)
+  "Maybe advance FOM's end to NEWEND if it needs it.
+
+If it does, also:
+
+* call `yas--advance-start-maybe' on FOM's next fom.
+
+* in case FOM is field call `yas--advance-end-maybe' on its parent
+  field
+
+Also, if FOM is an exit-marker, always call
+`yas--advance-start-maybe' on its next fom.  This is because
+exit-marker have identical start and end markers."
+  (cond ((and fom (< (yas--fom-end fom) newend))
+         (set-marker (yas--fom-end fom) newend)
+         (yas--advance-start-maybe (yas--fom-next fom) newend)
+         (yas--advance-end-of-parents-maybe (yas--fom-parent-field fom) newend))
+        ((yas--exit-p fom)
+         (yas--advance-start-maybe (yas--fom-next fom) newend))))
+
+(defun yas--advance-start-maybe (fom newstart)
+  "Maybe advance FOM's start to NEWSTART if it needs it.
+
+If it does, also call `yas--advance-end-maybe' on FOM."
+  (when (and fom (< (yas--fom-start fom) newstart))
+    (set-marker (yas--fom-start fom) newstart)
+    (yas--advance-end-maybe fom newstart)))
+
+(defun yas--advance-end-of-parents-maybe (field newend)
+  "Like `yas--advance-end-maybe' but for parent fields.
+
+Only works for fields and doesn't care about the start of the
+next FOM.  Works its way up recursively for parents of parents."
+  (when (and field
+             (< (yas--field-end field) newend))
+    (set-marker (yas--field-end field) newend)
+    (yas--advance-end-of-parents-maybe (yas--field-parent-field field) newend)))
+
+(defvar yas--dollar-regions nil
+  "When expanding the snippet the \"parse-create\" functions add
+cons cells to this var.")
+
+(defvar yas--backquote-markers-and-strings nil
+  "List of (MARKER . STRING) marking where the values from
+backquoted Lisp expressions should be inserted at the end of
+expansion.")
+
+(defun yas--snippet-parse-create (snippet)
+  "Parse a recently inserted snippet template, creating all
+necessary fields, mirrors and exit points.
+
+Meant to be called in a narrowed buffer, does various passes"
+  (let ((parse-start (point)))
+    ;; Reset the yas--dollar-regions
+    ;;
+    (setq yas--dollar-regions nil)
+    ;; protect just the backquotes
+    ;;
+    (yas--protect-escapes nil '(?`))
+    ;; replace all backquoted expressions
+    ;;
+    (goto-char parse-start)
+    (yas--save-backquotes)
+    ;; protect escaped characters
+    ;;
+    (yas--protect-escapes)
+    ;; parse fields with {}
+    ;;
+    (goto-char parse-start)
+    (yas--field-parse-create snippet)
+    ;; parse simple mirrors and fields
+    ;;
+    (goto-char parse-start)
+    (yas--simple-mirror-parse-create snippet)
+    ;; parse mirror transforms
+    ;;
+    (goto-char parse-start)
+    (yas--transform-mirror-parse-create snippet)
+    ;; calculate adjacencies of fields and mirrors
+    ;;
+    (yas--calculate-adjacencies snippet)
+    ;; Delete $-constructs
+    ;;
+    (save-restriction (widen) (yas--delete-regions yas--dollar-regions))
+    ;; restore backquoted expression values
+    ;;
+    (yas--restore-backquotes)
+    ;; restore escapes
+    ;;
+    (goto-char parse-start)
+    (yas--restore-escapes)
+    ;; update mirrors for the first time
+    ;;
+    (yas--update-mirrors snippet)
+    ;; indent the best we can
+    ;;
+    (goto-char parse-start)
+    (yas--indent snippet)))
+
+(defun yas--indent-according-to-mode (snippet-markers)
+  "Indent current line according to mode, preserving SNIPPET-MARKERS."
+  ;;; Apropos indenting problems....
+  ;;
+  ;; `indent-according-to-mode' uses whatever `indent-line-function'
+  ;; is available. Some implementations of these functions delete text
+  ;; before they insert. If there happens to be a marker just after
+  ;; the text being deleted, the insertion actually happens after the
+  ;; marker, which misplaces it.
+  ;;
+  ;; This would also happen if we had used overlays with the
+  ;; `front-advance' property set to nil.
+  ;;
+  ;; This is why I have these `trouble-markers', they are the ones at
+  ;; they are the ones at the first non-whitespace char at the line
+  ;; (i.e. at `yas--real-line-beginning'. After indentation takes place
+  ;; we should be at the correct to restore them to. All other
+  ;; non-trouble-markers have been *pushed* and don't need special
+  ;; attention.
+  ;;
+  (goto-char (yas--real-line-beginning))
+  (let ((trouble-markers (remove-if-not #'(lambda (marker)
+                                            (= marker (point)))
+                                        snippet-markers)))
+    (save-restriction
+      (widen)
+      (condition-case _
+          (indent-according-to-mode)
+        (error (yas--message 3 "Warning: `yas--indent-according-to-mode' having problems running %s" indent-line-function)
+               nil)))
+    (mapc #'(lambda (marker)
+              (set-marker marker (point)))
+          trouble-markers)))
+
+(defvar yas--indent-original-column nil)
+(defun yas--indent (snippet)
+  (let ((snippet-markers (yas--collect-snippet-markers snippet)))
+    ;; Look for those $>
+    (save-excursion
+      (while (re-search-forward "$>" nil t)
+        (delete-region (match-beginning 0) (match-end 0))
+        (when (not (eq yas-indent-line 'auto))
+          (yas--indent-according-to-mode snippet-markers))))
+    ;; Now do stuff for 'fixed and 'auto
+    (save-excursion
+      (cond ((eq yas-indent-line 'fixed)
+             (while (and (zerop (forward-line))
+                         (zerop (current-column)))
+               (indent-to-column yas--indent-original-column)))
+            ((eq yas-indent-line 'auto)
+             (let ((end (set-marker (make-marker) (point-max)))
+                   (indent-first-line-p yas-also-auto-indent-first-line))
+               (while (and (zerop (if indent-first-line-p
+                                      (prog1
+                                          (forward-line 0)
+                                        (setq indent-first-line-p nil))
+                                    (forward-line 1)))
+                           (not (eobp))
+                           (<= (point) end))
+                 (yas--indent-according-to-mode snippet-markers))))
+            (t
+             nil)))))
+
+(defun yas--collect-snippet-markers (snippet)
+  "Make a list of all the markers used by SNIPPET."
+  (let (markers)
+    (dolist (field (yas--snippet-fields snippet))
+      (push (yas--field-start field) markers)
+      (push (yas--field-end field) markers)
+      (dolist (mirror (yas--field-mirrors field))
+        (push (yas--mirror-start mirror) markers)
+        (push (yas--mirror-end mirror) markers)))
+    (let ((snippet-exit (yas--snippet-exit snippet)))
+      (when (and snippet-exit
+                 (marker-buffer (yas--exit-marker snippet-exit)))
+        (push (yas--exit-marker snippet-exit) markers)))
+    markers))
+
+(defun yas--real-line-beginning ()
+  (let ((c (char-after (line-beginning-position)))
+        (n (line-beginning-position)))
+    (while (or (eql c ?\ )
+               (eql c ?\t))
+      (cl-incf n)
+      (setq c (char-after n)))
+    n))
+
+(defun yas--escape-string (escaped)
+  (concat "YASESCAPE" (format "%d" escaped) "PROTECTGUARD"))
+
+(defun yas--protect-escapes (&optional text escaped)
+  "Protect all escaped characters with their numeric ASCII value.
+
+With optional string TEXT do it in string instead of buffer."
+  (let ((changed-text text)
+        (text-provided-p text))
+    (mapc #'(lambda (escaped)
+              (setq changed-text
+                    (yas--replace-all (concat "\\" (char-to-string escaped))
+                                     (yas--escape-string escaped)
+                                     (when text-provided-p changed-text))))
+          (or escaped yas--escaped-characters))
+    changed-text))
+
+(defun yas--restore-escapes (&optional text escaped)
+  "Restore all escaped characters from their numeric ASCII value.
+
+With optional string TEXT do it in string instead of the buffer."
+  (let ((changed-text text)
+        (text-provided-p text))
+    (mapc #'(lambda (escaped)
+              (setq changed-text
+                    (yas--replace-all (yas--escape-string escaped)
+                                     (char-to-string escaped)
+                                     (when text-provided-p changed-text))))
+          (or escaped yas--escaped-characters))
+    changed-text))
+
+(defun yas--save-backquotes ()
+  "Save all the \"`(lisp-expression)`\"-style expressions
+with their evaluated value into `yas--backquote-markers-and-strings'."
+  (while (re-search-forward yas--backquote-lisp-expression-regexp nil t)
+    (let ((current-string (match-string-no-properties 1)) transformed)
+      (save-restriction (widen)
+                        (delete-region (match-beginning 0) (match-end 0)))
+      (setq transformed (yas--eval-lisp (yas--read-lisp (yas--restore-escapes current-string '(?`)))))
+      (goto-char (match-beginning 0))
+      (when transformed
+        (let ((marker (make-marker)))
+          (save-restriction
+            (widen)
+            (insert "Y") ;; quite horrendous, I love it :)
+            (set-marker marker (point))
+            (insert "Y"))
+          (push (cons marker transformed) yas--backquote-markers-and-strings))))))
+
+(defun yas--restore-backquotes ()
+  "Replace markers in `yas--backquote-markers-and-strings' with their values."
+  (while yas--backquote-markers-and-strings
+    (let* ((marker-and-string (pop yas--backquote-markers-and-strings))
+           (marker (car marker-and-string))
+           (string (cdr marker-and-string)))
+      (save-excursion
+        (goto-char marker)
+        (save-restriction
+          (widen)
+          (delete-char -1)
+          (insert string)
+          (delete-char 1))
+        (set-marker marker nil)))))
+
+(defun yas--scan-sexps (from count)
+  (ignore-errors
+    (save-match-data ; `scan-sexps' may modify match data.
+      (with-syntax-table (standard-syntax-table)
+        (scan-sexps from count)))))
+
+(defun yas--make-marker (pos)
+  "Create a marker at POS with nil `marker-insertion-type'."
+  (let ((marker (set-marker (make-marker) pos)))
+    (set-marker-insertion-type marker nil)
+    marker))
+
+(defun yas--field-parse-create (snippet &optional parent-field)
+  "Parse most field expressions in SNIPPET, except for the simple one \"$n\".
+
+The following count as a field:
+
+* \"${n: text}\", for a numbered field with default text, as long as N is not 0;
+
+* \"${n: text$(expression)}, the same with a Lisp expression;
+  this is caught with the curiously named `yas--multi-dollar-lisp-expression-regexp'
+
+* the same as above but unnumbered, (no N:) and number is calculated automatically.
+
+When multiple expressions are found, only the last one counts."
+  ;;
+  (save-excursion
+    (while (re-search-forward yas--field-regexp nil t)
+      (let* ((real-match-end-0 (yas--scan-sexps (1+ (match-beginning 0)) 1))
+             (number (and (match-string-no-properties 1)
+                          (string-to-number (match-string-no-properties 1))))
+             (brand-new-field (and real-match-end-0
+                                   ;; break if on "$(" immediately
+                                   ;; after the ":", this will be
+                                   ;; caught as a mirror with
+                                   ;; transform later.
+                                   (not (string-match-p "\\`\\$[ \t\n]*("
+                                                        (match-string-no-properties 2)))
+                                   ;; allow ${0: some exit text}
+                                   ;; (not (and number (zerop number)))
+                                   (yas--make-field number
+                                                   (yas--make-marker (match-beginning 2))
+                                                   (yas--make-marker (1- real-match-end-0))
+                                                   parent-field))))
+        (when brand-new-field
+          (goto-char real-match-end-0)
+          (push (cons (1- real-match-end-0) real-match-end-0)
+                yas--dollar-regions)
+          (push (cons (match-beginning 0) (match-beginning 2))
+                yas--dollar-regions)
+          (push brand-new-field (yas--snippet-fields snippet))
+          (save-excursion
+            (save-restriction
+              (narrow-to-region (yas--field-start brand-new-field) (yas--field-end brand-new-field))
+              (goto-char (point-min))
+              (yas--field-parse-create snippet brand-new-field)))))))
+  ;; if we entered from a parent field, now search for the
+  ;; `yas--multi-dollar-lisp-expression-regexp'. This is used for
+  ;; primary field transformations
+  ;;
+  (when parent-field
+    (save-excursion
+      (while (re-search-forward yas--multi-dollar-lisp-expression-regexp nil t)
+        (let* ((real-match-end-1 (yas--scan-sexps (match-beginning 1) 1)))
+          ;; commit the primary field transformation if:
+          ;;
+          ;; 1. we don't find it in yas--dollar-regions (a subnested
+          ;; field) might have already caught it.
+          ;;
+          ;; 2. we really make sure we have either two '$' or some
+          ;; text and a '$' after the colon ':'. This is a FIXME: work
+          ;; my regular expressions and end these ugly hacks.
+          ;;
+          (when (and real-match-end-1
+                     (not (member (cons (match-beginning 0)
+                                        real-match-end-1)
+                                  yas--dollar-regions))
+                     (not (eq ?:
+                              (char-before (1- (match-beginning 1))))))
+            (let ((lisp-expression-string (buffer-substring-no-properties (match-beginning 1)
+                                                                          real-match-end-1)))
+              (setf (yas--field-transform parent-field)
+                    (yas--read-lisp (yas--restore-escapes lisp-expression-string))))
+            (push (cons (match-beginning 0) real-match-end-1)
+                  yas--dollar-regions)))))))
+
+(defun yas--transform-mirror-parse-create (snippet)
+  "Parse the \"${n:$(lisp-expression)}\" mirror transformations in SNIPPET."
+  (while (re-search-forward yas--transform-mirror-regexp nil t)
+    (let* ((real-match-end-0 (yas--scan-sexps (1+ (match-beginning 0)) 1))
+           (number (string-to-number (match-string-no-properties 1)))
+           (field (and number
+                       (not (zerop number))
+                       (yas--snippet-find-field snippet number)))
+           (brand-new-mirror
+            (and real-match-end-0
+                 field
+                 (yas--make-mirror (yas--make-marker (match-beginning 0))
+                                  (yas--make-marker (match-beginning 0))
+                                  (yas--read-lisp
+                                   (yas--restore-escapes
+                                    (buffer-substring-no-properties (match-beginning 2)
+                                                                    (1- real-match-end-0))))))))
+      (when brand-new-mirror
+        (push brand-new-mirror
+              (yas--field-mirrors field))
+        (yas--calculate-mirrors-in-fields snippet brand-new-mirror)
+        (push (cons (match-beginning 0) real-match-end-0) yas--dollar-regions)))))
+
+(defun yas--simple-mirror-parse-create (snippet)
+  "Parse the simple \"$n\" fields/mirrors/exitmarkers in SNIPPET."
+  (while (re-search-forward yas--simple-mirror-regexp nil t)
+    (let ((number (string-to-number (match-string-no-properties 1))))
+      (cond ((zerop number)
+
+             (setf (yas--snippet-exit snippet)
+                   (yas--make-exit (yas--make-marker (match-end 0))))
+             (save-excursion
+               (goto-char (match-beginning 0))
+               (when yas-wrap-around-region
+                 (cond (yas-selected-text
+                        (insert yas-selected-text))
+                       ((and (eq yas-wrap-around-region 'cua)
+                             cua-mode
+                             (get-register ?0))
+                        (insert (prog1 (get-register ?0)
+                                  (set-register ?0 nil))))))
+               (push (cons (point) (yas--exit-marker (yas--snippet-exit snippet)))
+                     yas--dollar-regions)))
+            (t
+             (let ((field (yas--snippet-find-field snippet number)))
+               (if field
+                   (let ((brand-new-mirror (yas--make-mirror
+                                            (yas--make-marker (match-beginning 0))
+                                            (yas--make-marker (match-beginning 0))
+                                            nil)))
+                     (push brand-new-mirror
+                           (yas--field-mirrors field))
+                     (yas--calculate-mirrors-in-fields snippet brand-new-mirror))
+                 (push (yas--make-field number
+                                       (yas--make-marker (match-beginning 0))
+                                       (yas--make-marker (match-beginning 0))
+                                       nil)
+                       (yas--snippet-fields snippet))))
+             (push (cons (match-beginning 0) (match-end 0))
+                   yas--dollar-regions))))))
+
+(defun yas--delete-regions (regions)
+  "Sort disjuct REGIONS by start point, then delete from the back."
+  (mapc #'(lambda (reg)
+            (delete-region (car reg) (cdr reg)))
+        (sort regions
+              #'(lambda (r1 r2)
+                  (>= (car r1) (car r2))))))
+
+(defun yas--calculate-mirror-depth (mirror &optional traversed)
+  (let* ((parent (yas--mirror-parent-field mirror))
+         (parents-mirrors (and parent
+                               (yas--field-mirrors parent))))
+    (or (yas--mirror-depth mirror)
+        (setf (yas--mirror-depth mirror)
+              (cond ((memq mirror traversed)
+                     0)
+                    ((and parent parents-mirrors)
+                     (1+ (reduce #'max
+                                 (mapcar #'(lambda (m)
+                                             (yas--calculate-mirror-depth m
+                                                                          (cons mirror
+                                                                                traversed)))
+                                         parents-mirrors))))
+                    (parent
+                     1)
+                    (t
+                     0))))))
+
+(defun yas--update-mirrors (snippet)
+  "Update all the mirrors of SNIPPET."
+  (save-excursion
+    (dolist (field-and-mirror (sort
+                               ;; make a list of ((F1 . M1) (F1 . M2) (F2 . M3) (F2 . M4) ...)
+                               ;; where F is the field that M is mirroring
+                               ;;
+                               (mapcan #'(lambda (field)
+                                           (mapcar #'(lambda (mirror)
+                                                       (cons field mirror))
+                                                   (yas--field-mirrors field)))
+                                       (yas--snippet-fields snippet))
+                               ;; then sort this list so that entries with mirrors with parent
+                               ;; fields appear before. This was important for fixing #290, and
+                               ;; luckily also handles the case where a mirror in a field causes
+                               ;; another mirror to need reupdating
+                               ;;
+                               #'(lambda (field-and-mirror1 field-and-mirror2)
+                                   (> (yas--calculate-mirror-depth (cdr field-and-mirror1))
+                                      (yas--calculate-mirror-depth (cdr field-and-mirror2))))))
+      (let* ((field (car field-and-mirror))
+             (mirror (cdr field-and-mirror))
+             (parent-field (yas--mirror-parent-field mirror)))
+        ;; before updating a mirror with a parent-field, maybe advance
+        ;; its start (#290)
+        ;;
+        (when parent-field
+          (yas--advance-start-maybe mirror (yas--fom-start parent-field)))
+        ;; update this mirror
+        ;;
+        (yas--mirror-update-display mirror field)
+        ;; `yas--place-overlays' is needed if the active field and
+        ;; protected overlays have been changed because of insertions
+        ;; in `yas--mirror-update-display'
+        ;;
+        (when (eq field (yas--snippet-active-field snippet))
+          (yas--place-overlays snippet field))))))
+
+(defun yas--mirror-update-display (mirror field)
+  "Update MIRROR according to FIELD (and mirror transform)."
+
+  (let* ((mirror-parent-field (yas--mirror-parent-field mirror))
+         (reflection (and (not (and mirror-parent-field
+                                    (yas--field-modified-p mirror-parent-field)))
+                          (or (yas--apply-transform mirror field 'empty-on-nil)
+                              (yas--field-text-for-display field)))))
+    (when (and reflection
+               (not (string= reflection (buffer-substring-no-properties (yas--mirror-start mirror)
+                                                                        (yas--mirror-end mirror)))))
+      (goto-char (yas--mirror-start mirror))
+      (let ((yas--inhibit-overlay-hooks t))
+        (insert reflection))
+      (if (> (yas--mirror-end mirror) (point))
+          (delete-region (point) (yas--mirror-end mirror))
+        (set-marker (yas--mirror-end mirror) (point))
+        (yas--advance-start-maybe (yas--mirror-next mirror) (point))
+        ;; super-special advance
+        (yas--advance-end-of-parents-maybe mirror-parent-field (point))))))
+
+(defun yas--field-update-display (field)
+  "Much like `yas--mirror-update-display', but for fields."
+  (when (yas--field-transform field)
+    (let ((transformed (and (not (eq (yas--field-number field) 0))
+                            (yas--apply-transform field field))))
+      (when (and transformed
+                 (not (string= transformed (buffer-substring-no-properties (yas--field-start field)
+                                                                           (yas--field-end field)))))
+        (setf (yas--field-modified-p field) t)
+        (goto-char (yas--field-start field))
+        (let ((yas--inhibit-overlay-hooks t))
+          (insert transformed)
+          (if (> (yas--field-end field) (point))
+              (delete-region (point) (yas--field-end field))
+            (set-marker (yas--field-end field) (point))
+            (yas--advance-start-maybe (yas--field-next field) (point)))
+          t)))))
+
+
+;;; Post-command hook:
+;;
+(defun yas--post-command-handler ()
+  "Handles various yasnippet conditions after each command."
+  (cond ((eq 'undo this-command)
+         ;;
+         ;; After undo revival the correct field is sometimes not
+         ;; restored correctly, this condition handles that
+         ;;
+         (let* ((snippet (car (yas--snippets-at-point)))
+                (target-field (and snippet
+                                   (find-if-not #'(lambda (field)
+                                                    (yas--field-probably-deleted-p snippet field))
+                                                (remove nil
+                                                        (cons (yas--snippet-active-field snippet)
+                                                              (yas--snippet-fields snippet)))))))
+           (when target-field
+             (yas--move-to-field snippet target-field))))
+        ((not (yas--undo-in-progress))
+         ;; When not in an undo, check if we must commit the snippet
+         ;; (user exited it).
+         (yas--check-commit-snippet))))
+
+;;; Fancy docs:
+;;
+;; The docstrings for some functions are generated dynamically
+;; depending on the context.
+;;
+(put 'yas-expand  'function-documentation
+     '(yas--expand-from-trigger-key-doc t))
+(defun yas--expand-from-trigger-key-doc (context)
+  "A doc synthesizer for `yas--expand-from-trigger-key-doc'."
+  (let* ((yas-fallback-behavior (and context yas-fallback-behavior))
+         (fallback-description
+          (cond ((eq yas-fallback-behavior 'call-other-command)
+                 (let* ((fallback (yas--keybinding-beyond-yasnippet)))
+                   (or (and fallback
+                            (format "call command `%s'."
+                                    (pp-to-string fallback)))
+                       "do nothing (`yas-expand' doesn't override\nanything).")))
+                ((eq yas-fallback-behavior 'return-nil)
+                 "do nothing.")
+                (t "defer to `yas-fallback-behavior' (which see)."))))
+    (concat "Expand a snippet before point. If no snippet
+expansion is possible, "
+            fallback-description
+            "\n\nOptional argument FIELD is for non-interactive use and is an
+object satisfying `yas--field-p' to restrict the expansion to.")))
+
+(put 'yas-expand-from-keymap 'function-documentation
+     '(yas--expand-from-keymap-doc t))
+(defun yas--expand-from-keymap-doc (context)
+  "A doc synthesizer for `yas--expand-from-keymap-doc'."
+  (add-hook 'temp-buffer-show-hook 'yas--snippet-description-finish-runonce)
+  (concat "Expand/run snippets from keymaps, possibly falling back to original binding.\n"
+          (when (and context (eq this-command 'describe-key))
+            (let* ((vec (this-single-command-keys))
+                   (templates (mapcan #'(lambda (table)
+                                          (yas--fetch table vec))
+                                      (yas--get-snippet-tables)))
+                   (yas--direct-keymaps nil)
+                   (fallback (key-binding vec)))
+              (concat "In this case, "
+                      (when templates
+                        (concat "these snippets are bound to this key:\n"
+                                (yas--template-pretty-list templates)
+                                "\n\nIf none of these expands, "))
+                      (or (and fallback
+                               (format "fallback `%s' will be called." (pp-to-string fallback)))
+                          "no fallback keybinding is called."))))))
+
+(defun yas--template-pretty-list (templates)
+  (let ((acc)
+        (yas-buffer-local-condition 'always))
+    (dolist (plate templates)
+      (setq acc (concat acc "\n*) "
+                        (propertize (concat "\\\\snippet `" (car plate) "'")
+                                    'yasnippet (cdr plate)))))
+    acc))
+
+(define-button-type 'help-snippet-def
+  :supertype 'help-xref
+  'help-function (lambda (template) (yas--visit-snippet-file-1 template))
+  'help-echo (purecopy "mouse-2, RET: find snippets's definition"))
+
+(defun yas--snippet-description-finish-runonce ()
+  "Final adjustments for the help buffer when snippets are concerned."
+  (yas--create-snippet-xrefs)
+  (remove-hook 'temp-buffer-show-hook 'yas--snippet-description-finish-runonce))
+
+(defun yas--create-snippet-xrefs ()
+  (save-excursion
+    (goto-char (point-min))
+    (while (search-forward-regexp "\\\\\\\\snippet[ \s\t]+`\\([^']+\\)'" nil t)
+      (let ((template (get-text-property (match-beginning 1)
+                                         'yasnippet)))
+        (when template
+          (help-xref-button 1 'help-snippet-def template)
+          (kill-region (match-end 1) (match-end 0))
+          (kill-region (match-beginning 0) (match-beginning 1)))))))
+
+;;; Utils
+
+(defvar yas-verbosity 4
+  "Log level for `yas--message' 4 means trace most anything, 0 means nothing.")
+
+(defun yas--message (level message &rest args)
+  "When LEVEL is above `yas-verbosity-level', log MESSAGE and ARGS."
+  (when (> yas-verbosity level)
+    (message "%s" (apply #'yas--format message args))))
+
+(defun yas--warning (format-control &rest format-args)
+  (let ((msg (apply #'format format-control format-args)))
+    (display-warning 'yasnippet msg :warning)
+    (yas--message 1 msg)))
+
+(defun yas--format (format-control &rest format-args)
+  (apply #'format (concat "[yas] " format-control) format-args))
+
+
+;;; Some hacks:
+;;
+;; The functions
+;;
+;; `locate-dominating-file'
+;; `region-active-p'
+;;
+;; added for compatibility in emacsen < 23
+(unless (>= emacs-major-version 23)
+  (unless (fboundp 'region-active-p)
+    (defun region-active-p ()  (and transient-mark-mode mark-active)))
+
+  (unless (fboundp 'locate-dominating-file)
+    (defvar locate-dominating-stop-dir-regexp
+      "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'"
+      "Regexp of directory names which stop the search in `locate-dominating-file'.
+Any directory whose name matches this regexp will be treated like
+a kind of root directory by `locate-dominating-file' which will stop its search
+when it bumps into it.
+The default regexp prevents fruitless and time-consuming attempts to find
+special files in directories in which filenames are interpreted as hostnames,
+or mount points potentially requiring authentication as a different user.")
+
+    (defun locate-dominating-file (file name)
+      "Look up the directory hierarchy from FILE for a file named NAME.
+Stop at the first parent directory containing a file NAME,
+and return the directory.  Return nil if not found."
+      ;; We used to use the above locate-dominating-files code, but the
+      ;; directory-files call is very costly, so we're much better off doing
+      ;; multiple calls using the code in here.
+      ;;
+      ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
+      ;; `name' in /home or in /.
+      (setq file (abbreviate-file-name file))
+      (let ((root nil)
+            try)
+        (while (not (or root
+                        (null file)
+                        ;; FIXME: Disabled this heuristic because it is sometimes
+                        ;; inappropriate.
+                        ;; As a heuristic, we stop looking up the hierarchy of
+                        ;; directories as soon as we find a directory belonging
+                        ;; to another user.  This should save us from looking in
+                        ;; things like /net and /afs.  This assumes that all the
+                        ;; files inside a project belong to the same user.
+                        ;; (let ((prev-user user))
+                        ;;   (setq user (nth 2 (file-attributes file)))
+                        ;;   (and prev-user (not (equal user prev-user))))
+                        (string-match locate-dominating-stop-dir-regexp file)))
+          (setq try (file-exists-p (expand-file-name name file)))
+          (cond (try (setq root file))
+                ((equal file (setq file (file-name-directory
+                                         (directory-file-name file))))
+                 (setq file nil))))
+        root))))
+
+
+;;; Backward compatibility to yasnippet <= 0.7
+
+(defun yas-initialize ()
+  "For backward compatibility, enable `yas-minor-mode' globally."
+  (declare (obsolete "Use (yas-global-mode 1) instead." "0.8"))
+  (yas-global-mode 1))
+
+(defvar yas--backported-syms '(;; `defcustom's
+                             ;;
+                             yas-snippet-dirs
+                             yas-prompt-functions
+                             yas-indent-line
+                             yas-also-auto-indent-first-line
+                             yas-snippet-revival
+                             yas-triggers-in-field
+                             yas-fallback-behavior
+                             yas-choose-keys-first
+                             yas-choose-tables-first
+                             yas-use-menu
+                             yas-trigger-symbol
+                             yas-wrap-around-region
+                             yas-good-grace
+                             yas-visit-from-menu
+                             yas-expand-only-for-last-commands
+                             yas-field-highlight-face
+
+                             ;; these vars can be customized as well
+                             ;;
+                             yas-keymap
+                             yas-verbosity
+                             yas-extra-modes
+                             yas-key-syntaxes
+                             yas-after-exit-snippet-hook
+                             yas-before-expand-snippet-hook
+                             yas-buffer-local-condition
+                             yas-dont-activate
+
+                             ;; prompting functions
+                             ;;
+                             yas-x-prompt
+                             yas-ido-prompt
+                             yas-no-prompt
+                             yas-completing-prompt
+                             yas-dropdown-prompt
+
+                             ;; interactive functions
+                             ;;
+                             yas-expand
+                             yas-minor-mode
+                             yas-global-mode
+                             yas-direct-keymaps-reload
+                             yas-minor-mode-on
+                             yas-load-directory
+                             yas-reload-all
+                             yas-compile-directory
+                             yas-recompile-all
+                             yas-about
+                             yas-expand-from-trigger-key
+                             yas-expand-from-keymap
+                             yas-insert-snippet
+                             yas-visit-snippet-file
+                             yas-new-snippet
+                             yas-load-snippet-buffer
+                             yas-tryout-snippet
+                             yas-describe-tables
+                             yas-next-field-or-maybe-expand
+                             yas-next-field
+                             yas-prev-field
+                             yas-abort-snippet
+                             yas-exit-snippet
+                             yas-exit-all-snippets
+                             yas-skip-and-clear-or-delete-char
+                             yas-initialize
+
+                             ;; symbols that I "exported" for use
+                             ;; in snippets and hookage
+                             ;;
+                             yas-expand-snippet
+                             yas-define-snippets
+                             yas-define-menu
+                             yas-snippet-beg
+                             yas-snippet-end
+                             yas-modified-p
+                             yas-moving-away-p
+                             yas-substr
+                             yas-choose-value
+                             yas-key-to-value
+                             yas-throw
+                             yas-verify-value
+                             yas-field-value
+                             yas-text
+                             yas-selected-text
+                             yas-default-from-field
+                             yas-inside-string
+                             yas-unimplemented
+                             yas-define-condition-cache
+                             yas-hippie-try-expand
+
+                             ;; debug definitions
+                             ;; yas-debug-snippet-vars
+                             ;; yas-exterminate-package
+                             ;; yas-debug-test
+
+                             ;; testing definitions
+                             ;; yas-should-expand
+                             ;; yas-should-not-expand
+                             ;; yas-mock-insert
+                             ;; yas-make-file-or-dirs
+                             ;; yas-variables
+                             ;; yas-saving-variables
+                             ;; yas-call-with-snippet-dirs
+                             ;; yas-with-snippet-dirs
+)
+  "Backported yasnippet symbols.
+
+They are mapped to \"yas/*\" variants.")
+
+(dolist (sym yas--backported-syms)
+  (let ((backported (intern (replace-regexp-in-string "^yas-" "yas/" (symbol-name sym)))))
+    (when (boundp sym)
+      (make-obsolete-variable backported sym "yasnippet 0.8")
+      (defvaralias backported sym))
+    (when (fboundp sym)
+      (make-obsolete backported sym "yasnippet 0.8")
+      (defalias backported sym))))
+
+(defvar yas--exported-syms
+  (let (exported)
+    (mapatoms (lambda (atom)
+                (if (and (or (and (boundp atom)
+                                  (not (get atom 'byte-obsolete-variable)))
+                             (and (fboundp atom)
+                                  (not (get atom 'byte-obsolete-info))))
+                         (string-match-p "^yas-[^-]" (symbol-name atom)))
+                    (push atom exported))))
+    exported)
+  "Exported yasnippet symbols.
+
+i.e. the ones with \"yas-\" single dash prefix. I will try to
+keep them in future yasnippet versions and other elisp libraries
+can more or less safely rely upon them.")
+
+
+(provide 'yasnippet)
+;; Local Variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+;;; yasnippet.el ends here
diff --git a/emacs.d/manual/jscs.el b/emacs.d/manual/jscs.el
new file mode 100644
index 0000000..dcf50b7
--- /dev/null
+++ b/emacs.d/manual/jscs.el
@@ -0,0 +1,186 @@
+;;; jscs.el --- Consistent JavaScript editing using JSCS  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  papaeye
+
+;; Author: papaeye <papaeye@gmail.com>
+;; Keywords: languages, convenience
+;; Version: 0.1.0
+;; Homepage: https://github.com/papaeye/emacs-jscs
+;; Package-Requires: ((emacs "24.1") (langfmt "0.1.0"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; jscs.el provides consistent JavaScript editing using JSCS.
+;;
+;; Installation:
+;;
+;; 1. Install JSCS <http://jscs.info/>.
+;;
+;; 2. Put jscs.el and langfmt.el <https://github.com/papaeye/go-mode.el>
+;;    somewhere in your `load-path'.
+;;
+;; 3. Add the following code into your .emacs:
+;;
+;;     (autoload 'jscs-indent-apply "jscs" nil t)
+;;     (autoload 'jscs-fix "jscs" nil t)
+;;     (autoload 'jscs-fix-before-save "jscs" nil t)
+;;
+;; Usage:
+;;
+;; To apply JSCS indentation rules to JavaScript modes,
+;; add the following code into your .emacs:
+;;
+;;     (with-eval-after-load 'js
+;;       (add-hook 'js-mode-hook #'jscs-indent-apply))
+;;
+;;     (with-eval-after-load 'js2-mode
+;;       (add-hook 'js2-mode-hook #'jscs-indent-apply))
+;;
+;; To run "jscs --fix" interactively, run \\[jscs-fix].
+;;
+;; To run "jscs --fix" on the current buffer when saving,
+;; add the following code into your .emacs:
+;;
+;;     (add-hook 'before-save-hook #'jscs-fix-before-save)
+
+;;; Code:
+
+(require 'json)
+
+(require 'langfmt)
+
+(defvar js-indent-level)
+(defvar js2-basic-offset)
+
+(defgroup jscs nil
+  "Consistent JavaScript editing using JSCS"
+  :group 'tools)
+
+(defcustom jscs-command "jscs"
+  "The 'jscs' command."
+  :type 'string
+  :group 'jscs)
+
+(defvar jscs--presets-path
+  (expand-file-name "../lib/node_modules/jscs/presets"
+		    (file-name-directory (executable-find jscs-command))))
+
+(defun jscs--read-jscsrc ()
+  (let ((dir (locate-dominating-file default-directory ".jscsrc")))
+    (when dir
+      (json-read-file (expand-file-name ".jscsrc" dir)))))
+
+(defun jscs--read-preset (name)
+  (let ((preset (expand-file-name (concat name ".json") jscs--presets-path)))
+    (if (file-readable-p preset)
+	(json-read-file preset)
+      (error "Preset %s is not found" name))))
+
+(defun jscs--config-list (config)
+  (let ((preset (cdr (assq 'preset config))))
+    (if (stringp preset)
+	(cons config (jscs--config-list (jscs--read-preset preset)))
+      (list config))))
+
+(defun jscs-indent--rule-validate-indentation (config)
+  (let ((indent (cdr (assq 'validateIndentation config))))
+    (prog1 indent
+      (when (listp indent)
+	(setq indent (cdr (assq 'value indent))))
+      (cond
+       ((integerp indent)
+	(cond
+	 ((memq major-mode '(js-mode json-mode))
+	  (setq-local js-indent-level indent))
+	 ((eq major-mode 'js2-mode)
+	  (setq js2-basic-offset indent)))
+	(setq indent-tabs-mode nil))
+       ((string= indent "\t")
+	(setq indent-tabs-mode t))))))
+
+(defun jscs-indent--rule-maximum-line-length (config)
+  (let ((rule (cdr (assq 'maximumLineLength config)))
+	tab-size)
+    (prog1 rule
+      (when (listp rule)
+	(setq tab-size (cdr (assq 'tabSize rule)))
+	(when (integerp tab-size)
+	  (setq tab-width tab-size))))))
+
+(defvar jscs-indent--rule-functions
+  (list #'jscs-indent--rule-validate-indentation
+	#'jscs-indent--rule-maximum-line-length))
+
+(defun jscs-indent--apply (config)
+  (let ((config-list (jscs--config-list config)))
+    (dolist (func jscs-indent--rule-functions)
+      (let ((tail config-list)
+	    done)
+	(while (and (not done) tail)
+	  (setq done (funcall func (car tail)))
+	  (setq tail (cdr tail)))))))
+
+;;;###autoload
+(defun jscs-indent-apply ()
+  (interactive)
+  (let ((jscsrc (jscs--read-jscsrc)))
+    (when jscsrc
+      (jscs-indent--apply jscsrc))))
+
+;;;###autoload (autoload 'jscs-fix "jscs" nil t)
+;;;###autoload (autoload 'jscs-fix-before-save "jscs" nil t)
+(define-langfmt jscs-fix
+  "Format the current buffer according to the JSCS tool."
+  :group 'jscs
+  :modes '(js-mode js2-mode js3-mode)
+  :runner #'jscs-fix--runner
+  :error-filter #'jscs-fix--error-filter)
+
+(defun jscs-fix--runner (tmpfile patchbuf errbuf)
+  (let ((exit (call-process jscs-command nil errbuf nil
+                            "--fix" "--reporter" "inline" tmpfile)))
+    (if (= exit 1)
+        (progn
+          (message "No configuration found")
+          (when errbuf
+            (langfmt-kill-error-buffer errbuf)))
+      (if (zerop (call-process-region (point-min) (point-max) "diff"
+                                      nil patchbuf nil "-n" "-" tmpfile))
+          (message (if (zerop exit)
+                       "Buffer is already jscs-fixed"
+                     "Could not apply jscs-fix"))
+        (langfmt-apply-rcs-patch patchbuf)
+        (message (if (zerop exit)
+                     "Applied jscs-fix"
+                   "Applied jscs-fix partially")))
+      (when errbuf
+        (if (zerop exit)
+            (langfmt-kill-error-buffer errbuf)
+          (jscs-fix--process-errors (buffer-file-name) tmpfile errbuf))))))
+
+(defun jscs-fix--error-filter (filename tmpfile)
+  (while (search-forward-regexp
+          (concat "^\\(?:"
+                  (regexp-quote tmpfile)
+                  "\\): line \\([0-9]+\\), col \\([0-9]+\\), \\(.+\\)")
+          nil t)
+    (replace-match (concat (file-name-nondirectory filename)
+                           ":" (match-string 1) ":" (match-string 2)
+                           ": " (match-string 3))
+                   t t)))
+
+(provide 'jscs)
+;;; jscs.el ends here
diff --git a/emacs.d/manual/langfmt.el b/emacs.d/manual/langfmt.el
new file mode 100644
index 0000000..1fd7875
--- /dev/null
+++ b/emacs.d/manual/langfmt.el
@@ -0,0 +1,179 @@
+;;; langfmt.el --- Fix JavaScript code style using JSCS
+
+;; Copyright 2013 The go-mode Authors. All rights reserved.
+;; Use of this source code is governed by a BSD-style
+;; license that can be found in the LICENSE file.
+
+;; Author: The go-mode Authors
+;; Version: 0.1.0
+;; Keywords: languages, convenience
+;; URL: https://github.com/dominikh/go-mode.el
+;;
+;; This file is not part of GNU Emacs.
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+
+(defun langfmt--delete-whole-line (&optional arg)
+  "Delete the current line without putting it in the `kill-ring'.
+Derived from function `kill-whole-line'.  ARG is defined as for that
+function."
+  (setq arg (or arg 1))
+  (if (and (> arg 0)
+           (eobp)
+           (save-excursion (forward-visible-line 0) (eobp)))
+      (signal 'end-of-buffer nil))
+  (if (and (< arg 0)
+           (bobp)
+           (save-excursion (end-of-visible-line) (bobp)))
+      (signal 'beginning-of-buffer nil))
+  (cond ((zerop arg)
+         (delete-region (progn (forward-visible-line 0) (point))
+                        (progn (end-of-visible-line) (point))))
+        ((< arg 0)
+         (delete-region (progn (end-of-visible-line) (point))
+                        (progn (forward-visible-line (1+ arg))
+                               (unless (bobp)
+                                 (backward-char))
+                               (point))))
+        (t
+         (delete-region (progn (forward-visible-line 0) (point))
+                        (progn (forward-visible-line arg) (point))))))
+
+(defun langfmt-apply-rcs-patch (patch-buffer)
+  "Apply an RCS-formatted diff from PATCH-BUFFER to the current buffer."
+  (let ((target-buffer (current-buffer))
+        ;; Relative offset between buffer line numbers and line numbers
+        ;; in patch.
+        ;;
+        ;; Line numbers in the patch are based on the source file, so
+        ;; we have to keep an offset when making changes to the
+        ;; buffer.
+        ;;
+        ;; Appending lines decrements the offset (possibly making it
+        ;; negative), deleting lines increments it. This order
+        ;; simplifies the forward-line invocations.
+        (line-offset 0))
+    (save-excursion
+      (with-current-buffer patch-buffer
+        (goto-char (point-min))
+        (while (not (eobp))
+          (unless (looking-at "^\\([ad]\\)\\([0-9]+\\) \\([0-9]+\\)")
+            (error "invalid rcs patch or internal error in langfmt-apply-rcs-patch"))
+          (forward-line)
+          (let ((action (match-string 1))
+                (from (string-to-number (match-string 2)))
+                (len  (string-to-number (match-string 3))))
+            (cond
+             ((equal action "a")
+              (let ((start (point)))
+                (forward-line len)
+                (let ((text (buffer-substring start (point))))
+                  (with-current-buffer target-buffer
+                    (decf line-offset len)
+                    (goto-char (point-min))
+                    (forward-line (- from len line-offset))
+                    (insert text)))))
+             ((equal action "d")
+              (with-current-buffer target-buffer
+                (langfmt--goto-line (- from line-offset))
+                (incf line-offset len)
+                (langfmt--delete-whole-line len)))
+             (t
+              (error "invalid rcs patch or internal error in langfmt-apply-rcs-patch")))))))))
+
+(defmacro define-langfmt (symbol docstring &rest properties)
+  (declare (indent 1) (doc-string 2))
+  (let* ((name (symbol-name symbol))
+         (show-errors-var (intern (format "%s-show-errors" name)))
+         (process-errors-func (intern (format "%s--process-errors" name)))
+         (before-save-func (intern (format "%s-before-save" name)))
+         (patchbuf-name (format "*%s patch*" (capitalize name)))
+         (errbuf-name (format "*%s Errors*" (capitalize name)))
+         (group (plist-get properties :group))
+         (modes (plist-get properties :modes))
+         (runner (plist-get properties :runner))
+         (error-filter (plist-get properties :error-filter)))
+
+    `(progn
+
+       (defcustom ,show-errors-var 'buffer
+         ,(format "Where to display %s error output.
+It can either be displayed in its own buffer, in the echo area, or not at all.
+
+Please note that Emacs outputs to the echo area when writing
+files and will overwrite %s's echo output if used from inside
+a `before-save-hook'." name name)
+         :type '(choice
+                 (const :tag "Own buffer" buffer)
+                 (const :tag "Echo area" echo)
+                 (const :tag "None" nil))
+         :group ,group)
+
+       (defun ,process-errors-func (filename tmpfile errbuf)
+         (with-current-buffer errbuf
+           (if (eq ,show-errors-var 'echo)
+               (progn
+                 (message "%s" (buffer-string))
+                 (langfmt-kill-error-buffer errbuf))
+             ;; Convert stderr to something understood by the compilation mode.
+             (goto-char (point-min))
+             (insert ,name " errors:\n")
+             (funcall ,error-filter filename tmpfile)
+             (compilation-mode)
+             (display-buffer errbuf))))
+
+       (defun ,symbol ()
+         ,docstring
+         (interactive)
+         (let* ((tmpfile-suffix (file-name-extension (buffer-file-name) t))
+                (tmpfile (make-temp-file ,name nil tmpfile-suffix))
+                (patchbuf (get-buffer-create ,patchbuf-name))
+                (errbuf (if ,show-errors-var (get-buffer-create ,errbuf-name)))
+                (coding-system-for-read 'utf-8)
+                (coding-system-for-write 'utf-8))
+
+           (save-restriction
+             (widen)
+             (if errbuf
+                 (with-current-buffer errbuf
+                   (setq buffer-read-only nil)
+                   (erase-buffer)))
+             (with-current-buffer patchbuf
+               (erase-buffer))
+
+             (write-region nil nil tmpfile)
+
+             (funcall ,runner tmpfile patchbuf errbuf)
+
+             (kill-buffer patchbuf)
+             (delete-file tmpfile))))
+
+       (defun ,before-save-func ()
+         ,(format
+           "Add this to .emacs to run %s on the current buffer when saving:
+ (add-hook 'before-save-hook '%s).
+
+Note that this will cause %s to get loaded the first time
+you save any file, kind of defeating the point of autoloading."
+           name (symbol-name before-save-func)
+           (mapconcat #'symbol-name (cadr modes) "/"))
+         (interactive)
+         (when (memq major-mode ,modes) (,symbol))))))
+
+(defun langfmt-kill-error-buffer (errbuf)
+  (let ((win (get-buffer-window errbuf)))
+    (if win
+        (quit-window t win)
+      (kill-buffer errbuf))))
+
+(defun langfmt--goto-line (line)
+  (goto-char (point-min))
+  (forward-line (1- line)))
+
+(provide 'langfmt)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; langfmt.el ends here